From 8a91b20addb5712bacd3a566e1e2ba7a4afbef6e Mon Sep 17 00:00:00 2001 From: edwinQQQ Date: Thu, 16 Oct 2025 20:24:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Podfile | 30 +- Podfile.lock | 163 +- YuMi.xcodeproj/project.pbxproj | 11016 +--------------- YuMi/Appdelegate/AppDelegate+ThirdConfig.h | 21 - YuMi/Appdelegate/AppDelegate+ThirdConfig.m | 245 - YuMi/Appdelegate/AppDelegate.m | 160 +- YuMi/Config/ClientConfig.m | 157 +- YuMi/CustomUI/Adbvertise/XPAdvertiseView.m | 73 +- .../Assets.xcassets/Color/Contents.json | 6 - .../InputView/Assets.xcassets/Contents.json | 6 - .../Assets.xcassets/input/Contents.json | 6 - .../Contents.json | 54 - .../chat_icon_emoji_black_l_normal@2x-1.png | Bin 1017 -> 0 bytes .../chat_icon_emoji_black_l_normal@2x.png | Bin 973 -> 0 bytes .../chat_icon_emoji_black_l_normal@3x-1.png | Bin 781 -> 0 bytes .../chat_icon_emoji_black_l_normal@3x.png | Bin 781 -> 0 bytes .../Contents.json | 54 - .../chat_icon_more_black_l_normal@2x-1.png | Bin 3554 -> 0 bytes .../chat_icon_more_black_l_normal@2x.png | Bin 677 -> 0 bytes .../chat_icon_more_black_l_normal@3x-1.png | Bin 2795 -> 0 bytes .../chat_icon_more_black_l_normal@3x.png | Bin 653 -> 0 bytes .../Contents.json | 54 - ...chat_icon_keyboard_black_l_normal@2x-1.png | Bin 986 -> 0 bytes .../chat_icon_keyboard_black_l_normal@2x.png | Bin 1058 -> 0 bytes ...chat_icon_keyboard_black_l_normal@3x-1.png | Bin 856 -> 0 bytes .../chat_icon_keyboard_black_l_normal@3x.png | Bin 971 -> 0 bytes .../Contents.json | 54 - .../chat_icon_voice@2x.png | Bin 1583 -> 0 bytes .../chat_icon_voice@3x.png | Bin 1684 -> 0 bytes .../chat_icon_voice_dark@2x.png | Bin 1194 -> 0 bytes .../chat_icon_voice_dark@3x.png | Bin 1391 -> 0 bytes .../q_emotion_delete.imageset/Contents.json | 22 - .../compose_emotion_delete_highlighted-1.png | Bin 1457 -> 0 bytes .../compose_emotion_delete_highlighted.png | Bin 1190 -> 0 bytes .../q_white_btn.imageset/Contents.json | 52 - .../q_white_btn.imageset/white_btn_dark.png | Bin 543 -> 0 bytes .../q_white_btn.imageset/white_rect.png | Bin 83 -> 0 bytes .../q_white_input_btn.imageset/Contents.json | 52 - .../white_input_btn_dark.png | Bin 542 -> 0 bytes .../q_white_input_btn.imageset/white_rect.png | Bin 83 -> 0 bytes .../Contents.json | 52 - .../white_input_press_btn.png | Bin 3972 -> 0 bytes .../white_input_press_btn_dark.png | Bin 3974 -> 0 bytes .../InputView/Emoji/emoj_s_normal@2x.png | Bin 3155 -> 0 bytes .../InputView/Emoji/emoj_s_pressed@2x.png | Bin 3130 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji.xml | 131 - YuMi/CustomUI/InputView/Emoji/emoji_00@2x.png | Bin 8869 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_01@2x.png | Bin 8313 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_02@2x.png | Bin 8899 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_03@2x.png | Bin 8515 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_04@2x.png | Bin 8629 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_05@2x.png | Bin 9331 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_06@2x.png | Bin 9300 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_07@2x.png | Bin 8724 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_08@2x.png | Bin 9083 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_09@2x.png | Bin 8677 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_100@2x.png | Bin 9372 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_101@2x.png | Bin 6748 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_102@2x.png | Bin 10591 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_103@2x.png | Bin 8005 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_104@2x.png | Bin 7912 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_105@2x.png | Bin 6975 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_106@2x.png | Bin 7378 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_107@2x.png | Bin 8123 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_108@2x.png | Bin 9442 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_109@2x.png | Bin 9851 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_10@2x.png | Bin 8823 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_110@2x.png | Bin 9022 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_111@2x.png | Bin 9271 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_112@2x.png | Bin 7819 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_113@2x.png | Bin 7663 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_114@2x.png | Bin 7758 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_115@2x.png | Bin 10188 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_116@2x.png | Bin 8313 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_117@2x.png | Bin 8791 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_118@2x.png | Bin 8134 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_119@2x.png | Bin 8854 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_11@2x.png | Bin 8248 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_120@2x.png | Bin 8348 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_121@2x.png | Bin 9112 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_122@2x.png | Bin 9235 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_123@2x.png | Bin 9383 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_124@2x.png | Bin 8838 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_125@2x.png | Bin 7760 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_126@2x.png | Bin 9019 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_127@2x.png | Bin 7724 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_128@2x.png | Bin 9237 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_129@2x.png | Bin 11561 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_12@2x.png | Bin 9893 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_130@2x.png | Bin 12776 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_131@2x.png | Bin 10795 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_132@2x.png | Bin 11178 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_133@2x.png | Bin 9968 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_134@2x.png | Bin 9961 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_135@2x.png | Bin 9828 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_136@2x.png | Bin 10299 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_137@2x.png | Bin 7660 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_138@2x.png | Bin 7845 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_139@2x.png | Bin 9210 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_13@2x.png | Bin 8724 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_140@2x.png | Bin 10152 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_141@2x.png | Bin 9107 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_142@2x.png | Bin 10608 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_143@2x.png | Bin 9514 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_144@2x.png | Bin 9838 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_145@2x.png | Bin 7031 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_146@2x.png | Bin 24123 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_147@2x.png | Bin 30723 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_148@2x.png | Bin 31133 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_149@2x.png | Bin 15344 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_14@2x.png | Bin 8600 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_150@2x.png | Bin 20429 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_151@2x.png | Bin 10932 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_152@2x.png | Bin 8743 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_15@2x.png | Bin 8768 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_160@2x.png | Bin 8741 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_161@2x.png | Bin 9202 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_162@2x.png | Bin 9194 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_163@2x.png | Bin 8977 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_164@2x.png | Bin 9937 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_165@2x.png | Bin 9968 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_166@2x.png | Bin 10664 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_16@2x.png | Bin 8263 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_17@2x.png | Bin 8921 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_18@2x.png | Bin 9143 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_19@2x.png | Bin 10230 -> 0 bytes .../CustomUI/InputView/Emoji/emoji_200@2x.png | Bin 6666 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_20@2x.png | Bin 8571 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_21@2x.png | Bin 8775 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_22@2x.png | Bin 8986 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_23@2x.png | Bin 8461 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_24@2x.png | Bin 8418 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_25@2x.png | Bin 8302 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_26@2x.png | Bin 8758 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_27@2x.png | Bin 8313 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_28@2x.png | Bin 9563 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_29@2x.png | Bin 8540 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_30@2x.png | Bin 8503 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_31@2x.png | Bin 9276 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_32@2x.png | Bin 9050 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_33@2x.png | Bin 10026 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_34@2x.png | Bin 8493 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_35@2x.png | Bin 8065 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_36@2x.png | Bin 7929 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_37@2x.png | Bin 8996 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_38@2x.png | Bin 7670 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_39@2x.png | Bin 11291 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_40@2x.png | Bin 10377 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_41@2x.png | Bin 7037 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_42@2x.png | Bin 8402 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_43@2x.png | Bin 7676 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_44@2x.png | Bin 9826 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_45@2x.png | Bin 7155 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_46@2x.png | Bin 8620 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_47@2x.png | Bin 9296 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_48@2x.png | Bin 9815 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_49@2x.png | Bin 9998 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_50@2x.png | Bin 8791 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_51@2x.png | Bin 9015 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_52@2x.png | Bin 9519 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_53@2x.png | Bin 7316 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_54@2x.png | Bin 6106 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_55@2x.png | Bin 9900 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_56@2x.png | Bin 10282 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_57@2x.png | Bin 11178 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_58@2x.png | Bin 6387 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_59@2x.png | Bin 9875 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_60@2x.png | Bin 10012 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_61@2x.png | Bin 8995 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_62@2x.png | Bin 9986 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_63@2x.png | Bin 9604 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_64@2x.png | Bin 8137 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_65@2x.png | Bin 9445 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_66@2x.png | Bin 10171 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_67@2x.png | Bin 10819 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_68@2x.png | Bin 8343 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_69@2x.png | Bin 7669 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_70@2x.png | Bin 9510 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_71@2x.png | Bin 9331 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_72@2x.png | Bin 11049 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_73@2x.png | Bin 8080 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_74@2x.png | Bin 9862 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_75@2x.png | Bin 9475 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_76@2x.png | Bin 9728 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_77@2x.png | Bin 9388 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_78@2x.png | Bin 8630 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_79@2x.png | Bin 9287 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_80@2x.png | Bin 9443 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_81@2x.png | Bin 6860 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_82@2x.png | Bin 7059 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_83@2x.png | Bin 9312 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_84@2x.png | Bin 10767 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_85@2x.png | Bin 10691 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_86@2x.png | Bin 8746 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_87@2x.png | Bin 7636 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_88@2x.png | Bin 8575 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_89@2x.png | Bin 7534 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_90@2x.png | Bin 6796 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_91@2x.png | Bin 5792 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_92@2x.png | Bin 8602 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_93@2x.png | Bin 6873 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_94@2x.png | Bin 6609 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_95@2x.png | Bin 8953 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_96@2x.png | Bin 7838 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_97@2x.png | Bin 9292 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_98@2x.png | Bin 8255 -> 0 bytes YuMi/CustomUI/InputView/Emoji/emoji_99@2x.png | Bin 6270 -> 0 bytes .../InputView/Emoji/emoji_del_normal@2x.png | Bin 1949 -> 0 bytes .../InputView/Emoji/emoji_del_pressed@2x.png | Bin 1862 -> 0 bytes .../InputView/InputView/QEEmotionImageView.h | 16 - .../InputView/InputView/QEEmotionImageView.m | 20 - YuMi/CustomUI/InputView/InputView/QEmotion.h | 35 - YuMi/CustomUI/InputView/InputView/QEmotion.m | 30 - .../InputView/InputView/QEmotionAttachment.h | 19 - .../InputView/InputView/QEmotionAttachment.m | 12 - .../InputView/InputView/QEmotionBoardView.h | 122 - .../InputView/InputView/QEmotionBoardView.m | 575 - .../InputView/InputView/QEmotionHelper.h | 41 - .../InputView/InputView/QEmotionHelper.m | 469 - .../InputView/InputView/QExtendBoardView.h | 67 - .../InputView/InputView/QExtendBoardView.m | 279 - .../InputView/InputView/QInputBarView.h | 122 - .../InputView/InputView/QInputBarView.m | 704 - .../InputView/QInputBarViewConfiguration.h | 61 - .../InputView/QInputBarViewConfiguration.m | 57 - .../InputView/InputView/QInputPhototCell.h | 27 - .../InputView/InputView/QInputPhototCell.m | 128 - .../InputView/QKeyboardBaseManager.h | 21 - .../InputView/QKeyboardBaseManager.m | 102 - .../InputView/InputView/QKeyboardManager.h | 91 - .../InputView/InputView/QKeyboardManager.m | 426 - .../InputView/InputView/QPhotoImageModel.h | 27 - .../InputView/InputView/QPhotoImageModel.m | 12 - .../InputView/InputView/QinputPhotoView.h | 33 - .../InputView/InputView/QinputPhotoView.m | 237 - .../InputView/InputView/UITextView+QEmotion.h | 31 - .../InputView/InputView/UITextView+QEmotion.m | 119 - YuMi/CustomUI/InputView/emoji.plist | 1022 -- YuMi/CustomUI/MoliAvatar.h | 22 - YuMi/CustomUI/MoliAvatar.m | 153 - YuMi/CustomUI/SVGA/XPSVGAPlayer.h | 16 - YuMi/CustomUI/SVGA/XPSVGAPlayer.m | 530 - .../ShareView/Model/XPShareInfoModel.h | 55 - .../ShareView/Model/XPShareInfoModel.m | 12 - YuMi/CustomUI/ShareView/Model/XPShareItem.h | 45 - YuMi/CustomUI/ShareView/Model/XPShareItem.m | 23 - .../CustomUI/ShareView/View/XPShareItemCell.h | 16 - .../CustomUI/ShareView/View/XPShareItemCell.m | 78 - YuMi/CustomUI/ShareView/XPShareView.h | 34 - YuMi/CustomUI/ShareView/XPShareView.m | 329 - YuMi/CustomUI/XNDJTDDLoadingTool.m | 21 - .../Controllers/EPMomentViewController.m | 4 +- YuMi/E-P/NewTabBar/EPTabBarController.swift | 24 - YuMi/Global/BuglyManager.h | 121 - YuMi/Global/BuglyManager.m | 406 - YuMi/Global/GlobalEventManager.h | 71 - YuMi/Global/GlobalEventManager.m | 242 - YuMi/GoogleService-Info.plist | 34 - YuMi/Info.plist | 82 +- .../ShoppingMall/MyDressingDataModel.h | 60 - .../ShoppingMall/MyDressingDataModel.m | 207 - .../ShoppingMall/MyDressingDataPresent.h | 53 - .../ShoppingMall/MyDressingDataPresent.m | 170 - .../ShoppingMall/MyDressingViewController.h | 16 - .../ShoppingMall/MyDressingViewController.m | 534 - .../ShoppingMallCategoryListView.h | 39 - .../ShoppingMallCategoryListView.m | 1275 -- .../ShoppingMall/ShoppingMallDataPresent.h | 26 - .../ShoppingMall/ShoppingMallDataPresent.m | 45 - .../ShoppingMall/ShoppingMallItemPreview.h | 26 - .../ShoppingMall/ShoppingMallItemPreview.m | 395 - .../ShoppingMall/ShoppingMallTagView.h | 27 - .../ShoppingMall/ShoppingMallTagView.m | 104 - .../ShoppingMall/ShoppingMallViewController.h | 16 - .../ShoppingMall/ShoppingMallViewController.m | 506 - YuMi/Modules/YMLogin/Api/PILoginManager.h | 20 - YuMi/Modules/YMLogin/Api/PILoginManager.m | 149 - .../YMLogin/Presenter/LoginPresenter.h | 72 - .../YMLogin/Presenter/LoginPresenter.m | 439 - .../XPLoginVerifBindPhonePresenter.h | 30 - .../XPLoginVerifBindPhonePresenter.m | 53 - .../View/AccountBindingViewController.h | 27 - .../View/AccountBindingViewController.m | 444 - .../View/CustomView/LoginForgetEditView.h | 36 - .../View/CustomView/LoginForgetEditView.m | 207 - .../View/CustomView/LoginInputItemView.h | 48 - .../View/CustomView/LoginInputItemView.m | 386 - .../View/CustomView/LoginVerifCodeView.h | 24 - .../View/CustomView/LoginVerifCodeView.m | 195 - .../YMLogin/View/CustomView/UserPrivacyView.h | 17 - .../YMLogin/View/CustomView/UserPrivacyView.m | 210 - .../View/CustomView/XPLoginBindSuccessView.h | 17 - .../View/CustomView/XPLoginBindSuccessView.m | 126 - .../YMLogin/View/FeedBackViewController.h | 39 - .../YMLogin/View/FeedBackViewController.m | 939 -- .../View/LoginBindPhoneViewController.h | 16 - .../View/LoginBindPhoneViewController.m | 223 - .../View/LoginForgetPasswordViewController.h | 17 - .../View/LoginForgetPasswordViewController.m | 238 - .../View/LoginFullInfoViewController.h | 16 - .../View/LoginFullInfoViewController.m | 650 - .../YMLogin/View/LoginTypesViewController.h | 30 - .../YMLogin/View/LoginTypesViewController.m | 542 - .../View/LoginVerifCodeViewController.h | 28 - .../View/LoginVerifCodeViewController.m | 362 - .../YMLogin/View/LoginViewController.h | 16 - .../YMLogin/View/LoginViewController.m | 509 - .../YMLogin/View/RegionListViewController.h | 23 - .../YMLogin/View/RegionListViewController.m | 521 - .../XPLoginBindPhoneResultViewController.h | 16 - .../XPLoginBindPhoneResultViewController.m | 128 - .../XPLoginVerifBindPhoneViewController.h | 30 - .../XPLoginVerifBindPhoneViewController.m | 289 - YuMi/Modules/YMMessage/Api/Api+Message.h | 22 - YuMi/Modules/YMMessage/Api/Api+Message.m | 26 - .../Modules/YMMessage/Model/AttachmentModel.h | 821 -- .../Modules/YMMessage/Model/AttachmentModel.m | 81 - YuMi/Modules/YMMessage/Model/ChatLimitModel.h | 21 - YuMi/Modules/YMMessage/Model/ChatLimitModel.m | 12 - .../Model/CustomMessage/XPKickUserModel.h | 29 - .../Model/CustomMessage/XPKickUserModel.m | 12 - .../ContentApplicationShareModel.h | 21 - .../ContentApplicationShareModel.m | 12 - .../SessionContent/ContentLevelUpgradeModel.h | 18 - .../SessionContent/ContentLevelUpgradeModel.m | 12 - .../SessionContent/ContentOpenLiveInfoModel.h | 28 - .../SessionContent/ContentOpenLiveInfoModel.m | 18 - .../SessionContent/ContentRistAlertModel.h | 16 - .../SessionContent/ContentRistAlertModel.m | 12 - .../SessionContent/ContentSecretaryModel.h | 56 - .../SessionContent/ContentSecretaryModel.m | 12 - .../SessionContent/ContentShareMonentsModel.h | 35 - .../SessionContent/ContentShareMonentsModel.m | 12 - .../ContentTreasureFairyModel.h | 33 - .../ContentTreasureFairyModel.m | 12 - .../Model/SessionContent/ContentTweetModel.h | 27 - .../Model/SessionContent/ContentTweetModel.m | 12 - .../YMMessage/Model/SessionSettingModel.h | 30 - .../YMMessage/Model/SessionSettingModel.m | 12 - .../Model/SessionToolBar/MessageMenuModel.h | 27 - .../Model/SessionToolBar/MessageMenuModel.m | 12 - .../YMMessage/Presenter/MessagePresenter.h | 30 - .../YMMessage/Presenter/MessagePresenter.m | 79 - .../YMMessage/Protocol/MessageProtocol.h | 33 - .../YMMessage/Tool/CustomAttachmentDecoder.h | 16 - .../YMMessage/Tool/CustomAttachmentDecoder.m | 62 - .../YMMessage/View/FindNew/Api/Api+FindNew.h | 29 - .../YMMessage/View/FindNew/Api/Api+FindNew.m | 41 - .../FindNew/Model/FindNewGreetListModel.h | 31 - .../FindNew/Model/FindNewGreetListModel.m | 24 - .../FindNew/Model/FindNewGreetMessageModel.h | 27 - .../FindNew/Model/FindNewGreetMessageModel.m | 12 - .../View/FindNew/Model/FindNewUserInfoModel.h | 33 - .../View/FindNew/Model/FindNewUserInfoModel.m | 12 - .../Presenter/XPSessionFindNewPresenter.h | 18 - .../Presenter/XPSessionFindNewPresenter.m | 21 - .../Protocol/XPSessionFindNewProtocol.h | 18 - .../Cell/XPSessionFindNewEmptyTableViewCell.h | 16 - .../Cell/XPSessionFindNewEmptyTableViewCell.m | 72 - .../Cell/XPSessionFindNewGreetTableViewCell.h | 25 - .../Cell/XPSessionFindNewGreetTableViewCell.m | 91 - .../View/Cell/XPSessionFindNewTableViewCell.h | 26 - .../View/Cell/XPSessionFindNewTableViewCell.m | 252 - .../View/View/XPSessionFindNewAlertView.h | 16 - .../View/View/XPSessionFindNewAlertView.m | 207 - .../View/View/XPSessionFindNewFiltrateView.h | 23 - .../View/View/XPSessionFindNewFiltrateView.m | 349 - .../View/View/XPSessionFindNewGreetListView.h | 26 - .../View/View/XPSessionFindNewGreetListView.m | 246 - .../View/XPSessionFindNewViewController.h | 16 - .../View/XPSessionFindNewViewController.m | 268 - .../YMMessage/View/MessageAudioCenter.h | 18 - .../YMMessage/View/MessageAudioCenter.m | 74 - YuMi/Modules/YMMessage/View/NIMMessageMaker.h | 34 - YuMi/Modules/YMMessage/View/NIMMessageMaker.m | 129 - YuMi/Modules/YMMessage/View/NIMMessageUtils.h | 22 - YuMi/Modules/YMMessage/View/NIMMessageUtils.m | 96 - YuMi/Modules/YMMessage/View/NIMTimeUtils.h | 20 - YuMi/Modules/YMMessage/View/NIMTimeUtils.m | 118 - .../YMMessage/View/NIMViews/NIMBadgeView.h | 18 - .../YMMessage/View/NIMViews/NIMBadgeView.m | 167 - .../NIMViews/UITableView+NIMScrollToBottom.h | 14 - .../NIMViews/UITableView+NIMScrollToBottom.m | 26 - .../YMMessage/View/NIMViews/UIView+NIM.h | 78 - .../YMMessage/View/NIMViews/UIView+NIM.m | 156 - .../View/SayHello/Api/Api+SayHello.h | 40 - .../View/SayHello/Api/Api+SayHello.m | 51 - .../Model/SessionSayHelloCountModel.h | 19 - .../Model/SessionSayHelloCountModel.m | 14 - .../Model/SessionSayHelloLevelModel.h | 25 - .../Model/SessionSayHelloLevelModel.m | 12 - .../SayHello/Model/SessionSayHelloListModel.h | 36 - .../SayHello/Model/SessionSayHelloListModel.m | 16 - .../Presenter/XPSessionSayHelloPresenter.h | 27 - .../Presenter/XPSessionSayHelloPresenter.m | 53 - .../Protocol/XPSessionSayHelloProtocol.h | 24 - .../XPSessionSayHelloEmptyTableViewCell.h | 16 - .../XPSessionSayHelloEmptyTableViewCell.m | 73 - .../Cell/XPSessionSayHelloTableViewCell.h | 25 - .../Cell/XPSessionSayHelloTableViewCell.m | 266 - .../CustomView/XPSessionSayHelloHeaderView.h | 27 - .../CustomView/XPSessionSayHelloHeaderView.m | 226 - .../View/XPSessionSayHelloViewController.h | 16 - .../View/XPSessionSayHelloViewController.m | 266 - .../Session/Cell/AgentMessageTableViewCell.h | 17 - .../Session/Cell/AgentMessageTableViewCell.m | 379 - .../YMMessage/View/Session/Cell/MessageCell.h | 43 - .../YMMessage/View/Session/Cell/MessageCell.m | 423 - .../Session/Cell/PublicEventTableViewCell.h | 16 - .../Session/Cell/PublicEventTableViewCell.m | 146 - .../Cell/SessionSettingTableViewCell.h | 23 - .../Cell/SessionSettingTableViewCell.m | 166 - .../Cell/SessionUserInfoTableViewCell.h | 25 - .../Cell/SessionUserInfoTableViewCell.m | 458 - .../Session/Content/MessageConentAudioView.h | 16 - .../Session/Content/MessageConentAudioView.m | 151 - .../MessageContentApplicationShareView.h | 16 - .../MessageContentApplicationShareView.m | 142 - .../Content/MessageContentCustomView.h | 32 - .../Content/MessageContentCustomView.m | 56 - .../Content/MessageContentFindNewGreetView.h | 16 - .../Content/MessageContentFindNewGreetView.m | 60 - .../Session/Content/MessageContentGiftView.h | 16 - .../Session/Content/MessageContentGiftView.m | 98 - .../Session/Content/MessageContentGuildView.h | 15 - .../Session/Content/MessageContentGuildView.m | 381 - .../Session/Content/MessageContentImage.h | 17 - .../Session/Content/MessageContentImage.m | 90 - .../Content/MessageContentLevelUpgradeView.h | 16 - .../Content/MessageContentLevelUpgradeView.m | 145 - .../Content/MessageContentMonentsAutoView.h | 16 - .../Content/MessageContentMonentsAutoView.m | 91 - .../Content/MessageContentMonentsView.h | 16 - .../Content/MessageContentMonentsView.m | 118 - .../Content/MessageContentOpenLiveView.h | 16 - .../Content/MessageContentOpenLiveView.m | 152 - .../Session/Content/MessageContentProtocol.h | 26 - .../Content/MessageContentRedPacketView.h | 16 - .../Content/MessageContentRedPacketView.m | 215 - .../Content/MessageContentRevokeView.h | 16 - .../Content/MessageContentRevokeView.m | 52 - .../Content/MessageContentRiskAlertView.h | 16 - .../Content/MessageContentRiskAlertView.m | 53 - .../Content/MessageContentSkillCardView.h | 16 - .../Content/MessageContentSkillCardView.m | 92 - .../View/Session/Content/MessageContentText.h | 17 - .../View/Session/Content/MessageContentText.m | 89 - .../Content/MessageContentTextClickable.h | 17 - .../Content/MessageContentTextClickable.m | 266 - .../Session/Content/MessageContentTweetView.h | 16 - .../Session/Content/MessageContentTweetView.m | 236 - .../Content/MessageContentUnSupportView.h | 16 - .../Content/MessageContentUnSupportView.m | 64 - .../Session/Content/MessageGameOrderView.h | 17 - .../Session/Content/MessageGameOrderView.m | 166 - .../View/Session/Content/MessageTimeView.h | 16 - .../View/Session/Content/MessageTimeView.m | 57 - .../View/Session/Content/MessageTipsView.h | 16 - .../View/Session/Content/MessageTipsView.m | 54 - .../PIMessageContentServiceReplyView.h | 16 - .../PIMessageContentServiceReplyView.m | 179 - .../Content/SesssionModel/AgentMessageModel.h | 34 - .../Content/SesssionModel/AgentMessageModel.m | 60 - .../MessageApplicationShareModel.h | 17 - .../MessageApplicationShareModel.m | 31 - .../Content/SesssionModel/MessageAudioModel.h | 16 - .../Content/SesssionModel/MessageAudioModel.m | 29 - .../Content/SesssionModel/MessageBaseModel.h | 57 - .../Content/SesssionModel/MessageBaseModel.m | 25 - .../SesssionModel/MessageCPNotifyModel.h | 24 - .../SesssionModel/MessageCPNotifyModel.m | 69 - .../SesssionModel/MessageFindNewGreetModel.h | 17 - .../SesssionModel/MessageFindNewGreetModel.m | 48 - .../SesssionModel/MessageGameOrderModel.h | 21 - .../SesssionModel/MessageGameOrderModel.m | 38 - .../Content/SesssionModel/MessageGiftModel.h | 19 - .../Content/SesssionModel/MessageGiftModel.m | 37 - .../Content/SesssionModel/MessageGuildModel.h | 16 - .../Content/SesssionModel/MessageGuildModel.m | 72 - .../SesssionModel/MessageHeadlinesTextModel.h | 21 - .../SesssionModel/MessageHeadlinesTextModel.m | 119 - .../Content/SesssionModel/MessageImageModel.h | 18 - .../Content/SesssionModel/MessageImageModel.m | 48 - .../SesssionModel/MessageLevelUpgradeModel.h | 19 - .../SesssionModel/MessageLevelUpgradeModel.m | 37 - .../SesssionModel/MessageMonentsAutoModel.h | 18 - .../SesssionModel/MessageMonentsAutoModel.m | 46 - .../SesssionModel/MessageMonentsModel.h | 20 - .../SesssionModel/MessageMonentsModel.m | 49 - .../SesssionModel/MessageOpenLiveModel.h | 23 - .../SesssionModel/MessageOpenLiveModel.m | 37 - .../SesssionModel/MessagePublicEventModel.h | 24 - .../SesssionModel/MessagePublicEventModel.m | 53 - .../SesssionModel/MessageRedPacketModel.h | 16 - .../SesssionModel/MessageRedPacketModel.m | 32 - .../SesssionModel/MessageRevokeModel.h | 18 - .../SesssionModel/MessageRevokeModel.m | 31 - .../SesssionModel/MessageRiskAlertModel.h | 17 - .../SesssionModel/MessageRiskAlertModel.m | 56 - .../SesssionModel/MessageSkillCardModel.h | 21 - .../SesssionModel/MessageSkillCardModel.m | 68 - .../SesssionModel/MessageTextClickModel.h | 19 - .../SesssionModel/MessageTextClickModel.m | 67 - .../Content/SesssionModel/MessageTextModel.h | 19 - .../Content/SesssionModel/MessageTextModel.m | 53 - .../Content/SesssionModel/MessageTimeModel.h | 17 - .../Content/SesssionModel/MessageTimeModel.m | 26 - .../Content/SesssionModel/MessageTipsModel.h | 17 - .../Content/SesssionModel/MessageTipsModel.m | 26 - .../Content/SesssionModel/MessageTweetModel.h | 16 - .../Content/SesssionModel/MessageTweetModel.m | 53 - .../SesssionModel/MessageUnSupportModel.h | 16 - .../SesssionModel/MessageUnSupportModel.m | 30 - .../PIMessageContentServiceReplyModel.h | 16 - .../PIMessageContentServiceReplyModel.m | 24 - .../View/Session/SessionInfoViewController.h | 21 - .../View/Session/SessionInfoViewController.m | 246 - .../YMMessage/View/Session/SessionRiskCache.h | 21 - .../YMMessage/View/Session/SessionRiskCache.m | 50 - .../View/Session/SessionViewController.h | 30 - .../View/Session/SessionViewController.m | 1466 -- .../Session/View/SessionAudioRecordView.h | 26 - .../Session/View/SessionAudioRecordView.m | 148 - .../View/Session/View/SessionChatLimitView.h | 19 - .../View/Session/View/SessionChatLimitView.m | 75 - .../View/Session/View/SessionNavLiveView.h | 16 - .../View/Session/View/SessionNavLiveView.m | 79 - .../View/Session/View/SessionNavView.h | 41 - .../View/Session/View/SessionNavView.m | 258 - .../View/Session/View/SessionRiskView.h | 25 - .../View/Session/View/SessionRiskView.m | 91 - .../Session/View/SessionSettingUserView.h | 17 - .../Session/View/SessionSettingUserView.m | 167 - .../Session/XPSessionMainViewController.h | 16 - .../Session/XPSessionMainViewController.m | 336 - .../SessionDiscoverNewTableViewCell.h | 18 - .../SessionDiscoverNewTableViewCell.m | 126 - .../View/SessionList/SessionListCell.h | 20 - .../View/SessionList/SessionListCell.m | 245 - .../SessionList/SessionListViewController.h | 31 - .../SessionList/SessionListViewController.m | 403 - .../Model/XPSessionListFansPartyModel.h | 23 - .../Model/XPSessionListFansPartyModel.m | 12 - .../XPSessionHelloEnterView.h | 17 - .../XPSessionHelloEnterView.m | 118 - .../XPSessionListHeadFriendCell.h | 19 - .../XPSessionListHeadFriendCell.m | 155 - .../XPSessionListHeadItem.h | 28 - .../XPSessionListHeadItem.m | 12 - .../YMMine/Presenter/MedalsPresenter.h | 62 - .../YMMine/Presenter/MedalsPresenter.m | 101 - .../Presenter/XPMineAttentionPresenter.h | 19 - .../Presenter/XPMineAttentionPresenter.m | 31 - .../Presenter/XPMineBlackListPresenter.h | 16 - .../Presenter/XPMineBlackListPresenter.m | 25 - .../XPMineCollectRoomListPresenter.h | 25 - .../XPMineCollectRoomListPresenter.m | 40 - .../YMMine/Presenter/XPMineFansPresenter.h | 23 - .../YMMine/Presenter/XPMineFansPresenter.m | 43 - .../Presenter/XPMineFansTeamPresenter.h | 21 - .../Presenter/XPMineFansTeamPresenter.m | 27 - .../Presenter/XPMineFeedbackPresenter.h | 20 - .../Presenter/XPMineFeedbackPresenter.m | 29 - .../Presenter/XPMineFootPrintPresenter.h | 30 - .../Presenter/XPMineFootPrintPresenter.m | 49 - .../YMMine/Presenter/XPMineFriendPresenter.h | 17 - .../YMMine/Presenter/XPMineFriendPresenter.m | 37 - .../Presenter/XPMineLoginPasswordPresenter.h | 25 - .../Presenter/XPMineLoginPasswordPresenter.m | 43 - .../Presenter/XPMineModifPayPwdPresenter.h | 21 - .../Presenter/XPMineModifPayPwdPresenter.m | 34 - .../Presenter/XPMineNotificaPresenter.h | 22 - .../Presenter/XPMineNotificaPresenter.m | 69 - .../YMMine/Presenter/XPMinePayPwdPresenter.h | 30 - .../YMMine/Presenter/XPMinePayPwdPresenter.m | 42 - YuMi/Modules/YMMine/Presenter/XPMinePresent.h | 36 - YuMi/Modules/YMMine/Presenter/XPMinePresent.m | 149 - .../Presenter/XPMineRechargePresenter.h | 39 - .../Presenter/XPMineRechargePresenter.m | 110 - .../Presenter/XPMineResetLoginPwdPresenter.h | 29 - .../Presenter/XPMineResetLoginPwdPresenter.m | 70 - .../XPMineResetPayPasswordPresenter.h | 20 - .../XPMineResetPayPasswordPresenter.m | 33 - .../YMMine/Presenter/XPMineSettingPresent.h | 34 - .../YMMine/Presenter/XPMineSettingPresent.m | 210 - .../Presenter/XPMineUserDataPresenter.h | 53 - .../Presenter/XPMineUserDataPresenter.m | 160 - .../Presenter/XPMineUserInfoEditPresenter.h | 44 - .../Presenter/XPMineUserInfoEditPresenter.m | 320 - .../XPMineUserInfoGiftWallPresenter.h | 16 - .../XPMineUserInfoGiftWallPresenter.m | 23 - .../Presenter/XPMineUserInfoPresenter.h | 56 - .../Presenter/XPMineUserInfoPresenter.m | 174 - .../Presenter/XPMineUserInfolbumPresenter.h | 29 - .../Presenter/XPMineUserInfolbumPresenter.m | 65 - .../Presenter/XPMineVerifIdentityPresenter.h | 26 - .../Presenter/XPMineVerifIdentityPresenter.m | 47 - .../YMMine/Presenter/XPMineVisitorPresenter.h | 21 - .../YMMine/Presenter/XPMineVisitorPresenter.m | 29 - .../YMMine/View/CPListViewController.h | 16 - .../YMMine/View/CPListViewController.m | 314 - .../XPMineAnchorFansTeamTableViewCell.h | 19 - .../XPMineAnchorFansTeamTableViewCell.m | 103 - .../FootPrint/XPMineFootPrintTableViewCell.h | 19 - .../FootPrint/XPMineFootPrintTableViewCell.m | 136 - .../Friend/XPMineAttentionTableViewCell.h | 27 - .../Friend/XPMineAttentionTableViewCell.m | 317 - .../Cell/Friend/XPMineFansTableViewCell.h | 25 - .../Cell/Friend/XPMineFansTableViewCell.m | 301 - .../Friend/XPMineFriendEmptyTableViewCell.h | 17 - .../Friend/XPMineFriendEmptyTableViewCell.m | 83 - .../Cell/Friend/XPMineFriendTableViewCell.h | 18 - .../Cell/Friend/XPMineFriendTableViewCell.m | 247 - .../Cell/MineInfo/XPMineAlbumTableViewCell.h | 20 - .../Cell/MineInfo/XPMineAlbumTableViewCell.m | 160 - .../MineInfo/XPMineDataClanTableViewCell.h | 36 - .../MineInfo/XPMineDataClanTableViewCell.m | 445 - .../XPMineDataGameMateTableViewCell.h | 21 - .../XPMineDataGameMateTableViewCell.m | 235 - .../XPMineDataGiftCollectionViewCell.h | 31 - .../XPMineDataGiftCollectionViewCell.m | 142 - .../MineInfo/XPMineDataGiftTableViewCell.h | 26 - .../MineInfo/XPMineDataGiftTableViewCell.m | 231 - .../Cell/MineInfo/XPMineGameMateOrderView.h | 21 - .../Cell/MineInfo/XPMineGameMateOrderView.m | 350 - .../Cell/MineInfo/XPMineGiftsTableViewCell.h | 21 - .../Cell/MineInfo/XPMineGiftsTableViewCell.m | 245 - .../Cell/MineInfo/XPMineGuildTableViewCell.h | 18 - .../Cell/MineInfo/XPMineGuildTableViewCell.m | 121 - .../Cell/MineInfo/XPMineMedalsTableViewCell.h | 18 - .../Cell/MineInfo/XPMineMedalsTableViewCell.m | 164 - .../XPMineMultipleContentTableViewCell.h | 29 - .../XPMineMultipleContentTableViewCell.m | 553 - .../XPMineUserInfoAlbumCollectionViewCell.h | 29 - .../XPMineUserInfoAlbumCollectionViewCell.m | 101 - .../MineInfo/XPMineUserInfoEditMainTagView.h | 17 - .../MineInfo/XPMineUserInfoEditMainTagView.m | 47 - .../XPMineUserInfoEditTableViewCell.h | 27 - .../XPMineUserInfoEditTableViewCell.m | 517 - .../Cell/MineInfo/XPMineUserInfoEditTagView.h | 21 - .../Cell/MineInfo/XPMineUserInfoEditTagView.m | 52 - .../XPMineUserInfoEmptyCollectionViewCell.h | 18 - .../XPMineUserInfoEmptyCollectionViewCell.m | 82 - ...XPMineUserInfoGiftWallCollectionViewCell.h | 17 - ...XPMineUserInfoGiftWallCollectionViewCell.m | 160 - .../Recharge/XPMineRechargeTableViewCell.h | 27 - .../Recharge/XPMineRechargeTableViewCell.m | 146 - .../Visitor/XPMineVisitorEmptyTableViewCell.h | 19 - .../Visitor/XPMineVisitorEmptyTableViewCell.m | 82 - .../Cell/Visitor/XPMineVisitorTableViewCell.h | 34 - .../Cell/Visitor/XPMineVisitorTableViewCell.m | 254 - .../View/Cell/XPGameOrdersListTableViewCell.h | 23 - .../View/Cell/XPGameOrdersListTableViewCell.m | 407 - .../View/Cell/XPMIneGameCollectionViewCell.h | 19 - .../View/Cell/XPMIneGameCollectionViewCell.m | 79 - .../View/Cell/XPMineBlackListTableViewCell.h | 17 - .../View/Cell/XPMineBlackListTableViewCell.m | 119 - .../View/Cell/XPMineGameTableViewCell.h | 28 - .../View/Cell/XPMineGameTableViewCell.m | 197 - .../View/Cell/XPMineHeadFunctionItemLayout.h | 16 - .../View/Cell/XPMineHeadFunctionItemLayout.m | 218 - .../Cell/XPMineHeadItemCollectionViewCell.h | 19 - .../Cell/XPMineHeadItemCollectionViewCell.m | 100 - .../View/Cell/XPMineHeadItemTableViewCell.h | 28 - .../View/Cell/XPMineHeadItemTableViewCell.m | 170 - .../Modules/YMMine/View/Cell/XPMineListCell.h | 18 - .../Modules/YMMine/View/Cell/XPMineListCell.m | 165 - .../Cell/XPMineNotificationTableViewCell.h | 25 - .../Cell/XPMineNotificationTableViewCell.m | 106 - .../View/Cell/XPMinePersonalCenterCell.h | 28 - .../View/Cell/XPMinePersonalCenterCell.m | 237 - .../View/Cell/XPMineSettingTableViewCell.h | 20 - .../View/Cell/XPMineSettingTableViewCell.m | 138 - .../View/Cell/XPMineSwitchLanguageCell.h | 16 - .../View/Cell/XPMineSwitchLanguageCell.m | 84 - .../YMMine/View/Cell/XPMineTheGuildCell.h | 17 - .../YMMine/View/Cell/XPMineTheGuildCell.m | 160 - .../CollectRoom/Cell/XPMineCollectRoomCell.h | 19 - .../CollectRoom/Cell/XPMineCollectRoomCell.m | 126 - .../Cell/XPMineCollectRoomEditCell.h | 18 - .../Cell/XPMineCollectRoomEditCell.m | 145 - .../XPMineCollectPartyRoomViewController.h | 41 - .../XPMineCollectPartyRoomViewController.m | 237 - .../YMMine/View/DressUp/Api/Api+DressUp.h | 110 - .../YMMine/View/DressUp/Api/Api+DressUp.m | 156 - .../YMMine/View/DressUp/Model/CarModel.h | 52 - .../YMMine/View/DressUp/Model/CarModel.m | 16 - .../View/DressUp/Model/ChatBubbleModel.h | 32 - .../View/DressUp/Model/ChatBubbleModel.m | 12 - .../View/DressUp/Model/DressUpShopModel.h | 60 - .../View/DressUp/Model/DressUpShopModel.m | 251 - .../YMMine/View/DressUp/Model/HeadwearModel.h | 44 - .../YMMine/View/DressUp/Model/HeadwearModel.m | 16 - .../View/DressUp/Model/NameplateModel.h | 53 - .../View/DressUp/Model/NameplateModel.m | 16 - .../View/DressUp/Model/NobleCardModel.h | 42 - .../View/DressUp/Model/NobleCardModel.m | 12 - .../Presenter/XPDressUpShopPresenter.h | 26 - .../Presenter/XPDressUpShopPresenter.m | 33 - .../Presenter/XPMineDressUpPresenter.h | 41 - .../Presenter/XPMineDressUpPresenter.m | 118 - .../DressUp/Protocol/XPDressUpShopProtocol.h | 55 - .../DressUp/Protocol/XPMineDressUpProtocol.h | 36 - .../Cell/XPDressShopSearchTableViewCell.h | 28 - .../Cell/XPDressShopSearchTableViewCell.m | 232 - .../Cell/XPDressUpShopCardTableViewCell.h | 30 - .../Cell/XPDressUpShopCardTableViewCell.m | 272 - .../Cell/XPDressUpShopCollectionViewCell.h | 31 - .../Cell/XPDressUpShopCollectionViewCell.m | 252 - .../View/Cell/XPMineCarTableViewCell.h | 23 - .../View/Cell/XPMineCarTableViewCell.m | 249 - .../XPMineDressBubbleCollectionViewCell.h | 29 - .../XPMineDressBubbleCollectionViewCell.m | 219 - .../Cell/XPMineDressEmptyCollectionViewCell.h | 19 - .../Cell/XPMineDressEmptyCollectionViewCell.m | 77 - .../View/Cell/XPMineDressEmptyTableViewCell.h | 17 - .../View/Cell/XPMineDressEmptyTableViewCell.m | 78 - .../View/Cell/XPMineHeadwearTableViewCell.h | 24 - .../View/Cell/XPMineHeadwearTableViewCell.m | 304 - .../View/Cell/XPMineNameplateTableViewCell.h | 23 - .../View/Cell/XPMineNameplateTableViewCell.m | 183 - .../View/Cell/XPMineNobleCardTableViewCell.h | 29 - .../View/Cell/XPMineNobleCardTableViewCell.m | 247 - .../View/XPDressSearchViewController.h | 19 - .../View/XPDressSearchViewController.m | 420 - .../View/XPDressUpShopCardViewController.h | 21 - .../View/XPDressUpShopCardViewController.m | 194 - .../View/XPDressUpShopListViewController.h | 21 - .../View/XPDressUpShopListViewController.m | 221 - .../View/XPMineDressUpBubbleViewController.h | 17 - .../View/XPMineDressUpBubbleViewController.m | 147 - .../View/XPMineDressUpListViewController.h | 25 - .../View/XPMineDressUpListViewController.m | 234 - .../Friend/XPMineAttentionViewController.h | 31 - .../Friend/XPMineAttentionViewController.m | 249 - .../View/Friend/XPMineContactViewController.h | 17 - .../View/Friend/XPMineContactViewController.m | 192 - .../View/Friend/XPMineFansViewController.h | 32 - .../View/Friend/XPMineFansViewController.m | 251 - .../View/Friend/XPMineFriendViewController.h | 31 - .../View/Friend/XPMineFriendViewController.m | 230 - .../View/Friend/XPMineShareViewController.h | 24 - .../View/Friend/XPMineShareViewController.m | 232 - .../View/Friend/XPRoomHalfMessageView.h | 20 - .../View/Friend/XPRoomHalfMessageView.m | 95 - .../View/Friend/XPRoomMessageBubbleView.h | 26 - .../View/Friend/XPRoomMessageBubbleView.m | 219 - .../View/GiveDiamond/Api/Api+GiveDiamond.h | 68 - .../View/GiveDiamond/Api/Api+GiveDiamond.m | 45 - .../Model/XPMineGiveDiamondDetailsModel.h | 66 - .../Model/XPMineGiveDiamondDetailsModel.m | 16 - .../Model/XPMineGiveDiamondModel.h | 33 - .../Model/XPMineGiveDiamondModel.m | 16 - .../Model/XPMineGiveDiamondSearchModel.h | 40 - .../Model/XPMineGiveDiamondSearchModel.m | 12 - .../Presenter/XPMineGiveDiamondPresenter.h | 46 - .../Presenter/XPMineGiveDiamondPresenter.m | 134 - .../Protocol/XPMineGiveDiamondProtocol.h | 49 - .../View/Cell/XPIncomeRecordGoldDetailsCell.h | 19 - .../View/Cell/XPIncomeRecordGoldDetailsCell.m | 241 - .../View/Cell/XPMineChooseGiveDiamondView.h | 33 - .../View/Cell/XPMineChooseGiveDiamondView.m | 517 - .../View/Cell/XPMineChooseGiveGiftView.h | 28 - .../View/Cell/XPMineChooseGiveGiftView.m | 274 - .../View/Cell/XPMineChooseGiveGiftViewCell.h | 18 - .../View/Cell/XPMineChooseGiveGiftViewCell.m | 105 - .../View/Cell/XPMineConfirmGiveDiamondView.h | 46 - .../View/Cell/XPMineConfirmGiveDiamondView.m | 349 - .../View/Cell/XPMineGiveDiamondCell.h | 21 - .../View/Cell/XPMineGiveDiamondCell.m | 152 - .../View/Cell/XPMineGiveDiamondDetailsCell.h | 17 - .../View/Cell/XPMineGiveDiamondDetailsCell.m | 209 - .../View/Cell/XPMineGiveDiamondDetailsView.h | 22 - .../View/Cell/XPMineGiveDiamondDetailsView.m | 88 - .../View/Cell/XPMineGiveDiamondPasswordView.h | 19 - .../View/Cell/XPMineGiveDiamondPasswordView.m | 115 - .../View/Cell/XPMineGiveDiamondPwdView.h | 23 - .../View/Cell/XPMineGiveDiamondPwdView.m | 168 - .../View/Cell/XPMineGiveDiamondSearchView.h | 18 - .../View/Cell/XPMineGiveDiamondSearchView.m | 133 - .../GiveDiamond/View/Cell/XPPageControl.h | 18 - .../GiveDiamond/View/Cell/XPPageControl.m | 47 - .../RechargerTransferHistoryViewController.h | 18 - .../RechargerTransferHistoryViewController.m | 544 - .../View/SubRechargersViewController.h | 16 - .../View/SubRechargersViewController.m | 323 - .../View/XPIncomeRecordGoldDetailsHeadView.h | 52 - .../View/XPIncomeRecordGoldDetailsHeadView.m | 527 - .../View/XPMineChooseGiveDiamondVC.h | 30 - .../View/XPMineChooseGiveDiamondVC.m | 267 - .../View/XPMineGiveDiamondDetailsVC.h | 20 - .../View/XPMineGiveDiamondDetailsVC.m | 329 - .../GiveDiamond/View/XPMineGiveDiamondVC.h | 20 - .../GiveDiamond/View/XPMineGiveDiamondVC.m | 712 - .../Modules/YMMine/View/Guild/Api/Api+Guild.h | 224 - .../Modules/YMMine/View/Guild/Api/Api+Guild.m | 281 - .../View/Guild/Model/ClanDetailInfoModel.h | 31 - .../View/Guild/Model/ClanDetailInfoModel.m | 16 - .../YMMine/View/Guild/Model/ClanInfoModel.h | 37 - .../YMMine/View/Guild/Model/ClanInfoModel.m | 15 - .../Guild/Model/ClanMemberDetailInfoModel.h | 45 - .../Guild/Model/ClanMemberDetailInfoModel.m | 25 - .../YMMine/View/Guild/Model/GuildAuthModel.h | 24 - .../YMMine/View/Guild/Model/GuildAuthModel.m | 14 - .../YMMine/View/Guild/Model/GuildInfoModel.h | 46 - .../YMMine/View/Guild/Model/GuildInfoModel.m | 12 - .../View/Guild/Model/GuildMessageModel.h | 78 - .../View/Guild/Model/GuildMessageModel.m | 32 - .../Guild/Model/GuildSearchUserInfoModel.h | 33 - .../Guild/Model/GuildSearchUserInfoModel.m | 12 - .../Model/Income/GuildIncomeDetailModel.h | 25 - .../Model/Income/GuildIncomeDetailModel.m | 12 - .../Model/Income/GuildIncomeRecordModel.h | 37 - .../Model/Income/GuildIncomeRecordModel.m | 24 - .../Income/GuildPersonIncomeRecordModel.h | 58 - .../Income/GuildPersonIncomeRecordModel.m | 26 - .../Model/SuperAdmin/GuildRoomInfoModel.h | 26 - .../Model/SuperAdmin/GuildRoomInfoModel.m | 12 - .../SuperAdmin/GuildSearchSuperAdminModel.h | 28 - .../SuperAdmin/GuildSearchSuperAdminModel.m | 12 - .../SuperAdmin/GuildSuperAdminInfoModel.h | 26 - .../SuperAdmin/GuildSuperAdminInfoModel.m | 14 - .../View/Guild/Model/XPMineGuildListModel.h | 51 - .../View/Guild/Model/XPMineGuildListModel.m | 12 - .../XPMineGuildPersonalBillRecordModel.h | 26 - .../XPMineGuildPersonalBillRecordModel.m | 19 - .../Income/XPGuildIncomeDetailPresenter.h | 16 - .../Income/XPGuildIncomeDetailPresenter.m | 26 - .../Presenter/Income/XPGuildIncomePresenter.h | 40 - .../Presenter/Income/XPGuildIncomePresenter.m | 86 - .../Setting/XPGuildManagerPerPresenter.h | 25 - .../Setting/XPGuildManagerPerPresenter.m | 40 - .../Setting/XPGuildMangerListPresenter.h | 21 - .../Setting/XPGuildMangerListPresenter.m | 31 - .../Setting/XPGuildRemoveMemberPresenter.h | 25 - .../Setting/XPGuildRemoveMemberPresenter.m | 42 - .../Setting/XPGuildSetNamePresenter.h | 17 - .../Setting/XPGuildSetNamePresenter.m | 22 - .../Setting/XPMineManagerSetPresenter.h | 30 - .../Setting/XPMineManagerSetPresenter.m | 52 - .../XPSuperAdminManagerRoomPresenter.h | 25 - .../XPSuperAdminManagerRoomPresenter.m | 36 - .../SuperAdmin/XPSuperAdminSetPresenter.h | 24 - .../SuperAdmin/XPSuperAdminSetPresenter.m | 33 - .../View/Guild/Presenter/XPClanPresenter.h | 34 - .../View/Guild/Presenter/XPClanPresenter.m | 91 - .../View/Guild/Presenter/XPGuildPresenter.h | 41 - .../View/Guild/Presenter/XPGuildPresenter.m | 113 - .../Guild/Presenter/XPGuildSearchPresenter.h | 27 - .../Guild/Presenter/XPGuildSearchPresenter.m | 54 - .../Guild/Presenter/XPMineGuildPresenter.h | 23 - .../Guild/Presenter/XPMineGuildPresenter.m | 51 - .../Income/XPGuildIncomeDetailProtocol.h | 19 - .../Protocol/Income/XPGuildIncomeProtocol.h | 34 - .../Setting/XPGuildManagerListProtocol.h | 18 - .../Setting/XPGuildManagerPerProtocol.h | 22 - .../Setting/XPGuildRemoveMemberProtocol.h | 20 - .../Setting/XPGuildSetManagerProtocol.h | 22 - .../Protocol/Setting/XPGuildSetNameProtocol.h | 18 - .../XPSuperAdminManagerRoomProtocol.h | 21 - .../SuperAdmin/XPSuperAdminSetProtocol.h | 21 - .../View/Guild/Protocol/XPClanProtocol.h | 28 - .../View/Guild/Protocol/XPGuildProtocol.h | 33 - .../Guild/Protocol/XPGuildSearchProtocol.h | 22 - .../View/Guild/Protocol/XPMineGuildProtocol.h | 32 - .../XPMineExchangeAuthorityCell.h | 27 - .../XPMineExchangeAuthorityCell.m | 363 - .../XPMineExchangeAuthorityFooderView.h | 17 - .../XPMineExchangeAuthorityFooderView.m | 54 - .../XPMineExchangeAuthorityHeadView.h | 17 - .../XPMineExchangeAuthorityHeadView.m | 51 - .../ExchangeAuthority/XPMinePromptWindow.h | 20 - .../ExchangeAuthority/XPMinePromptWindow.m | 169 - .../View/Cell/GuildList/XPMineGuildListCell.h | 28 - .../View/Cell/GuildList/XPMineGuildListCell.m | 328 - .../Cell/Income/PIGuildSingleRoomIncomeCell.h | 16 - .../Cell/Income/PIGuildSingleRoomIncomeCell.m | 162 - .../XPGuildIncomeDetailCollectionViewCell.h | 17 - .../XPGuildIncomeDetailCollectionViewCell.m | 153 - .../Income/XPGuildIncomeRecordTableViewCell.h | 19 - .../Income/XPGuildIncomeRecordTableViewCell.m | 423 - .../Income/XPGuildPersonIncomeTableViewCell.h | 17 - .../Income/XPGuildPersonIncomeTableViewCell.m | 186 - .../XPGuildSingleRoomIncomeTableViewCell.h | 18 - .../XPGuildSingleRoomIncomeTableViewCell.m | 199 - .../Cell/Income/XPNewMineHallIncomeCell.h | 19 - .../Cell/Income/XPNewMineHallIncomeCell.m | 219 - .../View/Cell/Setting/XPMaskManagerCell.h | 26 - .../View/Cell/Setting/XPMaskManagerCell.m | 175 - .../XPMineGuildManagerPerTableViewCell.h | 25 - .../XPMineGuildManagerPerTableViewCell.m | 119 - .../XPGuildChooseManagerRoomTableViewCell.h | 31 - .../XPGuildChooseManagerRoomTableViewCell.m | 157 - .../XPGuildSearchSuperAdminTableViewCell.h | 23 - .../XPGuildSearchSuperAdminTableViewCell.m | 184 - .../XPGuildSuperAdminRoomCollectionViewCell.h | 16 - .../XPGuildSuperAdminRoomCollectionViewCell.m | 86 - .../XPGuildSuperAdminSetTableViewCell.h | 23 - .../XPGuildSuperAdminSetTableViewCell.m | 250 - .../View/Cell/XPClanMemberTableViewCell.h | 39 - .../View/Cell/XPClanMemberTableViewCell.m | 472 - .../View/Cell/XPClanRoomCollectionViewCell.h | 16 - .../View/Cell/XPClanRoomCollectionViewCell.m | 86 - .../Cell/XPGuildEmptyCollectionViewCell.h | 17 - .../Cell/XPGuildEmptyCollectionViewCell.m | 79 - .../View/Cell/XPMineGuildEmptyTableViewCell.h | 16 - .../View/Cell/XPMineGuildEmptyTableViewCell.m | 78 - .../XPMineGuildSearchMemberTableViewCell.h | 24 - .../XPMineGuildSearchMemberTableViewCell.m | 219 - .../XPMineClanIncomeStatisViewController.h | 17 - .../XPMineClanIncomeStatisViewController.m | 163 - .../IncomeStatis/XPMineGoldIncomeRecordVC.h | 16 - .../IncomeStatis/XPMineGoldIncomeRecordVC.m | 288 - .../XPMineGuildIncomeDetailViewController.h | 20 - .../XPMineGuildIncomeDetailViewController.m | 174 - .../XPMineGuildIncomeRecordViewController.h | 41 - .../XPMineGuildIncomeRecordViewController.m | 465 - .../XPMineGuildIncomeStatisViewController.h | 18 - .../XPMineGuildIncomeStatisViewController.m | 167 - .../XPMineGuildPersonalBillRecordVC.h | 28 - .../XPMineGuildPersonalBillRecordVC.m | 257 - .../XPMineGuildPersonalBillStatisVC.h | 17 - .../XPMineGuildPersonalBillStatisVC.m | 184 - ...MineHallAnchorIncomeStatisViewController.h | 16 - ...MineHallAnchorIncomeStatisViewController.m | 148 - .../XPMineMainIncomeStatisViewController.h | 16 - .../XPMineMainIncomeStatisViewController.m | 174 - ...XPNewMineGuildIncomeRecordViewController.h | 37 - ...XPNewMineGuildIncomeRecordViewController.m | 446 - .../View/IncomeStatis/XPNewMineHallIncomeVC.h | 19 - .../View/IncomeStatis/XPNewMineHallIncomeVC.m | 358 - .../XPMineGuildManagerPerViewController.h | 19 - .../XPMineGuildManagerPerViewController.m | 321 - .../XPMineGuildManagerSetViewController.h | 16 - .../XPMineGuildManagerSetViewController.m | 270 - .../XPMineGuildRemoveMemberViewController.h | 17 - .../XPMineGuildRemoveMemberViewController.m | 215 - .../XPMineGuildSetNameViewController.h | 19 - .../XPMineGuildSetNameViewController.m | 164 - .../Setting/XPMineMangerListViewController.h | 16 - .../Setting/XPMineMangerListViewController.m | 210 - .../SubViews/PIGuildAnchorIncomeSectionView.h | 16 - .../SubViews/PIGuildAnchorIncomeSectionView.m | 91 - .../View/Guild/View/SubViews/XPClanMenuView.h | 19 - .../View/Guild/View/SubViews/XPClanMenuView.m | 83 - .../Guild/View/SubViews/XPClanSectionView.h | 33 - .../Guild/View/SubViews/XPClanSectionView.m | 183 - .../View/SubViews/XPGoldIncomeSectionView.h | 20 - .../View/SubViews/XPGoldIncomeSectionView.m | 170 - .../SubViews/XPGuildAnchorIncomeSectionView.h | 16 - .../SubViews/XPGuildAnchorIncomeSectionView.m | 193 - .../Guild/View/SubViews/XPGuildHeaderView.h | 40 - .../Guild/View/SubViews/XPGuildHeaderView.m | 403 - .../View/SubViews/XPGuildIncomeHeaderView.h | 31 - .../View/SubViews/XPGuildIncomeHeaderView.m | 281 - .../View/SubViews/XPGuildIncomeSectionView.h | 19 - .../View/SubViews/XPGuildIncomeSectionView.m | 160 - .../View/SubViews/XPGuildSearchNavView.h | 29 - .../View/SubViews/XPGuildSearchNavView.m | 178 - .../View/SubViews/XPGuildSuperAdminMenuView.h | 29 - .../View/SubViews/XPGuildSuperAdminMenuView.m | 139 - .../SubViews/XPGuildTimeMonthPickerView.h | 78 - .../SubViews/XPGuildTimeMonthPickerView.m | 1729 --- .../Guild/View/SubViews/XPGuildTimePickView.h | 40 - .../Guild/View/SubViews/XPGuildTimePickView.m | 407 - .../SubViews/XPMineGiveDiamondSearchView.h | 17 - .../SubViews/XPMineGiveDiamondSearchView.m | 113 - ...XPMineGuildPersonalBillRecordContentView.h | 16 - ...XPMineGuildPersonalBillRecordContentView.m | 191 - .../XPMineGuildPersonalBillRecordHeadView.h | 27 - .../XPMineGuildPersonalBillRecordHeadView.m | 118 - .../XPMineGuildPersonalBillRecordItemView.h | 17 - .../XPMineGuildPersonalBillRecordItemView.m | 66 - .../SubViews/XPNewGuildIncomeHeaderView.h | 29 - .../SubViews/XPNewGuildIncomeHeaderView.m | 263 - .../View/SubViews/XPNewGuildTimePickView.h | 42 - .../View/SubViews/XPNewGuildTimePickView.m | 692 - .../View/SubViews/XPNewMineGuildItemView.h | 18 - .../View/SubViews/XPNewMineGuildItemView.m | 63 - .../XPMineGuildChooseManagerViewController.h | 19 - .../XPMineGuildChooseManagerViewController.m | 262 - .../XPMineGuildSuperAdminSetViewController.h | 17 - .../XPMineGuildSuperAdminSetViewController.m | 208 - .../Guild/View/XPMineClanViewController.h | 17 - .../Guild/View/XPMineClanViewController.m | 371 - .../Guild/View/XPMineExchangeAuthorityVC.h | 16 - .../Guild/View/XPMineExchangeAuthorityVC.m | 168 - .../View/Guild/View/XPMineGuildListVC.h | 19 - .../View/Guild/View/XPMineGuildListVC.m | 294 - .../View/XPMineGuildSearchViewController.h | 40 - .../View/XPMineGuildSearchViewController.m | 305 - .../Guild/View/XPMineGuildViewController.h | 24 - .../Guild/View/XPMineGuildViewController.m | 934 -- .../View/Guild/View/XPMineMainGuildListVC.h | 18 - .../View/Guild/View/XPMineMainGuildListVC.m | 153 - .../Presenter/XPIncomeRecordPresent.h | 24 - .../Presenter/XPIncomeRecordPresent.m | 68 - .../Protocol/XPIncomeRecordProtocol.h | 30 - .../View/IncomeRecord/XPExchangeDiamondsVC.h | 24 - .../View/IncomeRecord/XPExchangeDiamondsVC.m | 161 - .../IncomeRecord/XPExchangeDiamondsView.h | 45 - .../IncomeRecord/XPExchangeDiamondsView.m | 334 - .../XPGoldDetailsChooseRoomCell.h | 17 - .../XPGoldDetailsChooseRoomCell.m | 70 - .../XPGoldDetailsChooseRoomView.h | 25 - .../XPGoldDetailsChooseRoomView.m | 82 - .../XPIncomeRecordGoldDetailsPickViewView.h | 36 - .../XPIncomeRecordGoldDetailsPickViewView.m | 453 - .../XPIncomeRecordGoldDetailsTimeView.h | 26 - .../XPIncomeRecordGoldDetailsTimeView.m | 85 - .../XPIncomeRecordGoldDetailsVC.h | 15 - .../XPIncomeRecordGoldDetailsVC.m | 147 - .../XPIncomeRecordGoldDetailsView.h | 39 - .../XPIncomeRecordGoldDetailsView.m | 318 - .../View/IncomeRecord/XPIncomeRecordVC.h | 17 - .../View/IncomeRecord/XPIncomeRecordVC.m | 319 - .../View/IncomeRecord/XPIncomeRecordView.h | 40 - .../View/IncomeRecord/XPIncomeRecordView.m | 204 - .../YMMine/View/IncomeRecord/XPTextField.h | 17 - .../YMMine/View/IncomeRecord/XPTextField.m | 60 - .../View/Medals/MedalsCollectionViewCell.h | 33 - .../View/Medals/MedalsCollectionViewCell.m | 538 - .../YMMine/View/Medals/MedalsCyclePagerCell.h | 30 - .../YMMine/View/Medals/MedalsCyclePagerCell.m | 404 - .../YMMine/View/Medals/MedalsDetailView.h | 18 - .../YMMine/View/Medals/MedalsDetailView.m | 392 - .../View/Medals/MedalsLevelIndicatorView.h | 54 - .../View/Medals/MedalsLevelIndicatorView.m | 751 -- .../View/Medals/MedalsRankViewController.h | 16 - .../View/Medals/MedalsRankViewController.m | 607 - .../YMMine/View/Medals/MedalsViewController.h | 20 - .../YMMine/View/Medals/MedalsViewController.m | 1255 -- .../MedalsWearingControlCollectionViewCell.h | 24 - .../MedalsWearingControlCollectionViewCell.m | 187 - .../MedalsWearingListCollectionViewCell.h | 25 - .../MedalsWearingListCollectionViewCell.m | 337 - .../View/Medals/MedalsWearingViewController.h | 20 - .../View/Medals/MedalsWearingViewController.m | 401 - .../MineInfo/XPMineSimpleUserInfoHeaderView.h | 33 - .../MineInfo/XPMineSimpleUserInfoHeaderView.m | 429 - .../MineInfo/XPMineUserDataViewController.h | 45 - .../MineInfo/XPMineUserDataViewController.m | 800 -- .../XPMineUserInfoAlbumViewController.h | 16 - .../XPMineUserInfoAlbumViewController.m | 272 - .../XPMineUserInfoDesViewController.h | 25 - .../XPMineUserInfoDesViewController.m | 177 - .../XPMineUserInfoEditViewController.h | 32 - .../XPMineUserInfoEditViewController.m | 768 -- .../XPMineUserInfoGiftWallSubViewController.h | 24 - .../XPMineUserInfoGiftWallSubViewController.m | 159 - .../XPMineUserInfoGiftWallViewController.h | 16 - .../XPMineUserInfoGiftWallViewController.m | 147 - .../XPMineUserInfoNickViewController.h | 24 - .../XPMineUserInfoNickViewController.m | 164 - .../MineInfo/XPMineUserInfoViewController.h | 20 - .../MineInfo/XPMineUserInfoViewController.m | 687 - .../YMMine/View/Noble/Api/Api+NobleCenter.h | 72 - .../YMMine/View/Noble/Api/Api+NobleCenter.m | 102 - .../YMMine/View/Noble/Model/NobleAuthInfo.h | 37 - .../YMMine/View/Noble/Model/NobleAuthInfo.m | 12 - .../View/Noble/Model/NobleCenterModel.h | 31 - .../View/Noble/Model/NobleCenterModel.m | 18 - .../YMMine/View/Noble/Model/NobleInfo.h | 42 - .../YMMine/View/Noble/Model/NobleInfo.m | 18 - .../View/Noble/Model/NobleLevelUpModel.h | 31 - .../View/Noble/Model/NobleLevelUpModel.m | 12 - .../View/Noble/Model/NobleRechargeModel.h | 22 - .../View/Noble/Model/NobleRechargeModel.m | 17 - .../View/Noble/Model/PINobleCenterListModel.h | 18 - .../View/Noble/Model/PINobleCenterListModel.m | 12 - .../View/Noble/Model/PINobleRebateModel.h | 23 - .../View/Noble/Model/PINobleRebateModel.m | 12 - .../Noble/Presenter/XPNobleCenterPresenter.h | 57 - .../Noble/Presenter/XPNobleCenterPresenter.m | 206 - .../Noble/Protocol/XPNobleCenterProtocol.h | 65 - .../View/SubViews/PINobleCenterListCell.h | 21 - .../View/SubViews/PINobleCenterListCell.m | 236 - .../SubViews/PINobleCenterListReusableView.h | 17 - .../SubViews/PINobleCenterListReusableView.m | 52 - .../View/SubViews/PINobleCenterListView.h | 16 - .../View/SubViews/PINobleCenterListView.m | 182 - .../View/SubViews/PINobleCenterTitleCell.h | 17 - .../View/SubViews/PINobleCenterTitleCell.m | 56 - .../View/SubViews/PINobleCenterTitleView.h | 19 - .../View/SubViews/PINobleCenterTitleView.m | 22 - .../View/SubViews/PINoblePrivilegeEmptyCell.h | 16 - .../View/SubViews/PINoblePrivilegeEmptyCell.m | 65 - .../View/SubViews/XPMineCenterAgencyView.h | 18 - .../View/SubViews/XPMineCenterAgencyView.m | 85 - .../View/SubViews/XPNobleAuthorityDescView.h | 19 - .../View/SubViews/XPNobleAuthorityDescView.m | 120 - .../View/SubViews/XPNobleCenterEmptyView.h | 18 - .../View/SubViews/XPNobleCenterEmptyView.m | 82 - .../View/SubViews/XPNobleCenterEntranceView.h | 21 - .../View/SubViews/XPNobleCenterEntranceView.m | 104 - .../View/SubViews/XPNobleCenterNavView.h | 34 - .../View/SubViews/XPNobleCenterNavView.m | 133 - .../View/SubViews/XPNobleCenterPayCell.h | 19 - .../View/SubViews/XPNobleCenterPayCell.m | 99 - .../View/SubViews/XPNobleCenterPayView.h | 31 - .../View/SubViews/XPNobleCenterPayView.m | 210 - .../View/SubViews/XPNobleCenterResidueView.h | 16 - .../View/SubViews/XPNobleCenterResidueView.m | 102 - .../SubViews/XPNobleCenterTableHeadView.h | 28 - .../SubViews/XPNobleCenterTableHeadView.m | 177 - .../Noble/View/SubViews/XPNobleCenterWindow.h | 20 - .../Noble/View/SubViews/XPNobleCenterWindow.m | 111 - .../View/SubViews/XPNoblePrivilegeCell.h | 21 - .../View/SubViews/XPNoblePrivilegeCell.m | 112 - .../SubViews/XPNoblePrivilegeContentCell.h | 21 - .../SubViews/XPNoblePrivilegeContentCell.m | 248 - .../View/SubViews/XPNobleSettingNavView.h | 30 - .../View/SubViews/XPNobleSettingNavView.m | 81 - .../View/SubViews/XPNobleUpgradeLevelView.h | 19 - .../View/SubViews/XPNobleUpgradeLevelView.m | 216 - .../View/Noble/View/ThemeColor+NobleCenter.h | 31 - .../View/Noble/View/ThemeColor+NobleCenter.m | 37 - .../View/Noble/View/VIPCenterViewController.h | 17 - .../View/Noble/View/VIPCenterViewController.m | 1223 -- .../View/XPNobleCenterListViewController.h | 28 - .../View/XPNobleCenterListViewController.m | 162 - .../Noble/View/XPNobleSettingViewController.h | 20 - .../Noble/View/XPNobleSettingViewController.m | 130 - .../YMMine/View/PISwitchingEnvironmentVC.h | 16 - .../YMMine/View/PISwitchingEnvironmentVC.m | 121 - .../Modules/YMMine/View/Recharge/IAPManager.h | 28 - .../Modules/YMMine/View/Recharge/IAPManager.m | 699 - .../XPIAPRechargeCollectionViewCell.h | 21 - .../XPIAPRechargeCollectionViewCell.m | 182 - .../View/Recharge/XPIAPRechargeHeadCell.h | 23 - .../View/Recharge/XPIAPRechargeHeadCell.m | 75 - .../View/Recharge/XPIAPRechargeHeaderView.h | 20 - .../View/Recharge/XPIAPRechargeHeaderView.m | 114 - .../Recharge/XPIAPRechargeViewController.h | 25 - .../Recharge/XPIAPRechargeViewController.m | 409 - .../YMMine/View/Setting/XPMaskManagerVC.h | 16 - .../YMMine/View/Setting/XPMaskManagerVC.m | 166 - .../Setting/XPMineAboutUsViewController.h | 16 - .../Setting/XPMineAboutUsViewController.m | 88 - .../Setting/XPMineBlackListViewController.h | 16 - .../Setting/XPMineBlackListViewController.m | 148 - .../Setting/XPMineFeedbackViewController.h | 16 - .../Setting/XPMineFeedbackViewController.m | 172 - .../XPMineLoginPasswordViewController.h | 22 - .../XPMineLoginPasswordViewController.m | 266 - .../Setting/XPMineModifPayPwdViewController.h | 17 - .../Setting/XPMineModifPayPwdViewController.m | 210 - .../Setting/XPMineNotificaViewController.h | 16 - .../Setting/XPMineNotificaViewController.m | 164 - .../View/Setting/XPMinePayPwdViewController.h | 31 - .../View/Setting/XPMinePayPwdViewController.m | 229 - .../Setting/XPMineResetPayPwdViewController.h | 16 - .../Setting/XPMineResetPayPwdViewController.m | 140 - .../Setting/XPMineSettingViewController.h | 17 - .../Setting/XPMineSettingViewController.m | 498 - .../View/Setting/XPMineSwitchLanguageVC.h | 16 - .../View/Setting/XPMineSwitchLanguageVC.m | 150 - .../YMMine/View/SubViews/CPBindingAnimation.h | 24 - .../YMMine/View/SubViews/CPBindingAnimation.m | 136 - YuMi/Modules/YMMine/View/SubViews/CPCard.h | 23 - YuMi/Modules/YMMine/View/SubViews/CPCard.m | 405 - .../View/SubViews/CPEnterRoomTableViewCell.h | 19 - .../View/SubViews/CPEnterRoomTableViewCell.m | 106 - .../YMMine/View/SubViews/CPGiftBanner.h | 22 - .../YMMine/View/SubViews/CPGiftBanner.m | 243 - .../YMMine/View/SubViews/CPLevelUpAnimation.h | 24 - .../YMMine/View/SubViews/CPLevelUpAnimation.m | 206 - .../View/SubViews/CPRelationshipChangeView.h | 10 - .../View/SubViews/CPRelationshipChangeView.m | 244 - .../View/SubViews/MineInfo/XPBeautIDView.h | 18 - .../View/SubViews/MineInfo/XPBeautIDView.m | 88 - .../MineInfo/XPMineUserInfoCustomNavView.h | 29 - .../MineInfo/XPMineUserInfoCustomNavView.m | 114 - .../MineInfo/XPMineUserInfoDateView.h | 25 - .../MineInfo/XPMineUserInfoDateView.m | 382 - .../MineInfo/XPMineUserInfoEditPickView.h | 38 - .../MineInfo/XPMineUserInfoEditPickView.m | 209 - .../MineInfo/XPMineUserInfoGiftView.h | 17 - .../MineInfo/XPMineUserInfoGiftView.m | 148 - .../MineInfo/XPMineUserInfoHeaderTagCell.h | 21 - .../MineInfo/XPMineUserInfoHeaderTagCell.m | 51 - .../MineInfo/XPMineUserInfoHeaderTagView.h | 25 - .../MineInfo/XPMineUserInfoHeaderTagView.m | 161 - .../MineInfo/XPMineUserInfoHeaderView.h | 46 - .../MineInfo/XPMineUserInfoHeaderView.m | 1775 --- .../XPMineUserInfoIndividualTagView.h | 26 - .../XPMineUserInfoIndividualTagView.m | 184 - .../SubViews/MineInfo/XPMineUserInfoNavView.h | 26 - .../SubViews/MineInfo/XPMineUserInfoNavView.m | 88 - .../MineInfo/XPMineUserInfoTagEmptyView.h | 16 - .../MineInfo/XPMineUserInfoTagEmptyView.m | 58 - .../MineInfo/XPMineUserInfoTagFlowLayout.h | 19 - .../MineInfo/XPMineUserInfoTagFlowLayout.m | 65 - .../MineInfo/XPMineUserInfoTagHeadView.h | 20 - .../MineInfo/XPMineUserInfoTagHeadView.m | 146 - .../MineInfo/XPMineUserInfoTagItemView.h | 28 - .../MineInfo/XPMineUserInfoTagItemView.m | 118 - .../SubViews/MineInfo/XPMineUserInfoTagView.h | 24 - .../SubViews/MineInfo/XPMineUserInfoTagView.m | 135 - .../MineInfo/XPMineUserInfoTagViewCell.h | 22 - .../MineInfo/XPMineUserInfoTagViewCell.m | 118 - .../MineInfo/XPMineUserInfoVoiceCardView.h | 18 - .../MineInfo/XPMineUserInfoVoiceCardView.m | 195 - .../SubViews/MineInfo/XPMineUserViewHeader.h | 16 - .../SubViews/MineInfo/XPMineUserViewHeader.m | 20 - .../SubViews/Recharge/XPMineRechageHeadView.h | 17 - .../SubViews/Recharge/XPMineRechageHeadView.m | 138 - .../SubViews/Recharge/XPMineRechargeNavView.h | 21 - .../SubViews/Recharge/XPMineRechargeNavView.m | 82 - .../View/SubViews/SuperBlockViewController.h | 18 - .../View/SubViews/SuperBlockViewController.m | 356 - .../YMMine/View/SubViews/XPFootPrintNavView.h | 29 - .../YMMine/View/SubViews/XPFootPrintNavView.m | 109 - .../YMMine/View/SubViews/XPMineAccountView.h | 18 - .../YMMine/View/SubViews/XPMineAccountView.m | 76 - .../XPMineDataSkillDataCollectionViewCell.h | 16 - .../XPMineDataSkillDataCollectionViewCell.m | 145 - .../View/SubViews/XPMineFriendNumberView.h | 25 - .../View/SubViews/XPMineFriendNumberView.m | 139 - .../YMMine/View/SubViews/XPMineHeadView.h | 50 - .../YMMine/View/SubViews/XPMineHeadView.m | 722 - .../View/SubViews/XPMineModifPayPwdView.h | 19 - .../View/SubViews/XPMineModifPayPwdView.m | 120 - .../View/SubViews/XPMineNewUserRechargeView.h | 18 - .../View/SubViews/XPMineNewUserRechargeView.m | 169 - .../View/SubViews/XPMinePayPwdInputView.h | 39 - .../View/SubViews/XPMinePayPwdInputView.m | 202 - .../XPMineUserInfoRecordedSoundView.h | 58 - .../XPMineUserInfoRecordedSoundView.m | 525 - .../View/SubViews/XPMineVerifIdentityView.h | 30 - .../View/SubViews/XPMineVerifIdentityView.m | 127 - .../YMMine/View/VipSettingViewController.h | 16 - .../YMMine/View/VipSettingViewController.m | 426 - .../YMMine/View/VisitorListViewController.h | 16 - .../YMMine/View/VisitorListViewController.m | 76 - YuMi/Modules/YMMine/View/XPButton.h | 43 - YuMi/Modules/YMMine/View/XPButton.m | 80 - .../View/XPGameOrdersListViewController.h | 16 - .../View/XPGameOrdersListViewController.m | 354 - .../View/XPGiftUserDataViewController.h | 21 - .../View/XPGiftUserDataViewController.m | 158 - .../XPMineCollectRoomListViewController.h | 16 - .../XPMineCollectRoomListViewController.m | 333 - .../View/XPMineFansTeamViewController.h | 16 - .../View/XPMineFansTeamViewController.m | 135 - .../View/XPMineFootPrintViewController.h | 16 - .../View/XPMineFootPrintViewController.m | 248 - .../YMMine/View/XPMineItemTableViewCell.h | 21 - .../YMMine/View/XPMineItemTableViewCell.m | 195 - .../Modules/YMMine/View/XPMineUserInfoTagVC.h | 25 - .../Modules/YMMine/View/XPMineUserInfoTagVC.m | 140 - .../YMMine/View/XPMineViewController.h | 16 - .../YMMine/View/XPMineViewController.m | 826 -- .../YMMine/View/XPMineVisitorViewController.h | 18 - .../YMMine/View/XPMineVisitorViewController.m | 299 - .../View/XPMomentUserDataViewController.h | 20 - .../View/XPMomentUserDataViewController.m | 280 - .../YMMine/View/XPPermissionsViewController.h | 16 - .../YMMine/View/XPPermissionsViewController.m | 293 - .../YMMine/View/XPPrivacyViewController.h | 16 - .../YMMine/View/XPPrivacyViewController.m | 163 - .../YMMine/View/XPSimpleMineHeaderView.h | 29 - .../YMMine/View/XPSimpleMineHeaderView.m | 355 - .../YMMonents/Model/MomentsTopicModel.h | 30 - .../YMMonents/Model/MomentsTopicModel.m | 16 - .../YMMonents/Model/MonentsCommentModel.h | 42 - .../YMMonents/Model/MonentsCommentModel.m | 22 - .../Model/MonentsCommentReplyModel.h | 51 - .../Model/MonentsCommentReplyModel.m | 34 - .../YMMonents/Model/MonentsInteractiveModel.h | 65 - .../YMMonents/Model/MonentsInteractiveModel.m | 12 - .../YMMonents/Model/MonentsPicResInfo.h | 25 - .../YMMonents/Model/MonentsPicResInfo.m | 12 - .../YMMonents/Model/MonentsUnReadModel.h | 25 - .../YMMonents/Model/MonentsUnReadModel.m | 12 - .../Presenter/XPMomentsLayoutConfig.h | 51 - .../Presenter/XPMomentsLayoutConfig.m | 317 - .../Presenter/XPMomentsRecommendPresenter.h | 40 - .../Presenter/XPMomentsRecommendPresenter.m | 84 - .../Presenter/XPMomentsTopicListPresenter.h | 21 - .../Presenter/XPMomentsTopicListPresenter.m | 39 - .../Presenter/XPMonentDetailPresenter.h | 49 - .../Presenter/XPMonentDetailPresenter.m | 105 - .../Presenter/XPMonentsInteractivePresenter.h | 24 - .../Presenter/XPMonentsInteractivePresenter.m | 40 - .../Cell/XPMomentListCollectionViewCell.h | 20 - .../Cell/XPMomentListCollectionViewCell.m | 161 - .../View/Cell/XPMomentsEmptyTableViewCell.h | 16 - .../View/Cell/XPMomentsEmptyTableViewCell.m | 72 - .../View/Cell/XPMomentsTableViewCell.h | 41 - .../View/Cell/XPMomentsTableViewCell.m | 407 - .../View/Cell/XPMonentsCommentTableViewCell.h | 28 - .../View/Cell/XPMonentsCommentTableViewCell.m | 376 - .../Cell/XPMonentsInteractiveTableViewCell.h | 16 - .../Cell/XPMonentsInteractiveTableViewCell.m | 317 - .../Cell/XPMonentsPublishCollectionViewCell.h | 28 - .../Cell/XPMonentsPublishCollectionViewCell.m | 92 - .../Cell/XPMonentsReplyMoreTableViewCell.h | 25 - .../Cell/XPMonentsReplyMoreTableViewCell.m | 70 - .../View/Cell/XPMonentsReplyTableViewCell.h | 24 - .../View/Cell/XPMonentsReplyTableViewCell.m | 184 - .../Cell/XPMonentsTopicCollectionViewCell.h | 16 - .../Cell/XPMonentsTopicCollectionViewCell.m | 114 - .../View/SubViews/XPMoentsTopicListView.h | 22 - .../View/SubViews/XPMoentsTopicListView.m | 263 - .../View/SubViews/XPMomentsContentView.h | 29 - .../View/SubViews/XPMomentsContentView.m | 202 - .../View/SubViews/XPMomentsPhotoView.h | 26 - .../View/SubViews/XPMomentsPhotoView.m | 364 - .../SubViews/XPMomentsRecommendHeaderView.h | 28 - .../SubViews/XPMomentsRecommendHeaderView.m | 216 - .../View/SubViews/XPMomentsTooBarView.h | 33 - .../View/SubViews/XPMomentsTooBarView.m | 375 - .../View/SubViews/XPMomentsTopicView.h | 16 - .../View/SubViews/XPMomentsTopicView.m | 120 - .../View/SubViews/XPMomentsUserInfoView.h | 32 - .../View/SubViews/XPMomentsUserInfoView.m | 532 - .../SubViews/XPMonentPublishSuccessView.h | 16 - .../SubViews/XPMonentPublishSuccessView.m | 96 - .../View/SubViews/XPMonentsPublishTopicView.h | 27 - .../View/SubViews/XPMonentsPublishTopicView.m | 196 - .../View/SubViews/XPMonentsTopicHeaderView.h | 17 - .../View/SubViews/XPMonentsTopicHeaderView.m | 116 - .../XPMomentTopicContainerViewController.h | 16 - .../XPMomentTopicContainerViewController.m | 235 - .../View/XPMomentsAttentionViewController.h | 16 - .../View/XPMomentsAttentionViewController.m | 301 - .../View/XPMomentsDetailViewController.h | 26 - .../View/XPMomentsDetailViewController.m | 550 - .../View/XPMomentsLatestViewController.h | 16 - .../View/XPMomentsLatestViewController.m | 304 - .../View/XPMomentsMineViewController.h | 17 - .../View/XPMomentsMineViewController.m | 250 - .../View/XPMomentsRecommendViewController.h | 16 - .../View/XPMomentsRecommendViewController.m | 335 - .../YMMonents/View/XPMomentsSimpleDetailNav.h | 31 - .../YMMonents/View/XPMomentsSimpleDetailNav.m | 160 - .../XPMomentsSimpleDetailViewController.h | 23 - .../XPMomentsSimpleDetailViewController.m | 597 - .../View/XPMomentsTopicListViewController.h | 16 - .../View/XPMomentsTopicListViewController.m | 166 - .../YMMonents/View/XPMomentsViewController.h | 16 - .../YMMonents/View/XPMomentsViewController.m | 298 - .../View/XPMonentsInteractiveViewController.h | 16 - .../View/XPMonentsInteractiveViewController.m | 214 - .../View/XPMonentsPublishViewController.h | 16 - .../View/XPMonentsPublishViewController.m | 550 - .../View/XPMonentsTopicLatestViewController.h | 17 - .../View/XPMonentsTopicLatestViewController.m | 342 - .../XPMonentsTopicRecommondViewController.h | 18 - .../XPMonentsTopicRecommondViewController.m | 302 - YuMi/Modules/YMNewHome/Api/Api+EventCenter.h | 82 - YuMi/Modules/YMNewHome/Api/Api+EventCenter.m | 90 - YuMi/Modules/YMNewHome/Api/Api+Home.h | 157 - YuMi/Modules/YMNewHome/Api/Api+Home.m | 202 - .../YMNewHome/Model/EventConfigModel.h | 21 - .../YMNewHome/Model/EventConfigModel.m | 12 - YuMi/Modules/YMNewHome/Model/EventItemModel.h | 42 - YuMi/Modules/YMNewHome/Model/EventItemModel.m | 12 - YuMi/Modules/YMNewHome/Model/EventRoomModel.h | 26 - YuMi/Modules/YMNewHome/Model/EventRoomModel.m | 25 - .../YMNewHome/Model/FirstRechargeModel.h | 31 - .../YMNewHome/Model/FirstRechargeModel.m | 23 - .../YMNewHome/Model/HomeBannerInfoModel.h | 60 - .../YMNewHome/Model/HomeBannerInfoModel.m | 20 - .../YMNewHome/Model/HomeCollectRoomModel.h | 36 - .../YMNewHome/Model/HomeCollectRoomModel.m | 20 - .../YMNewHome/Model/HomeLittleGameRoomModel.h | 44 - .../YMNewHome/Model/HomeLittleGameRoomModel.m | 24 - .../YMNewHome/Model/HomeMenuInfoModel.h | 38 - .../YMNewHome/Model/HomeMenuInfoModel.m | 17 - .../YMNewHome/Model/HomeMenuSourceModel.h | 27 - .../YMNewHome/Model/HomeMenuSourceModel.m | 12 - .../YMNewHome/Model/HomeMineRoomModel.h | 30 - .../YMNewHome/Model/HomeMineRoomModel.m | 18 - .../YMNewHome/Model/HomePlayRoomModel.h | 97 - .../YMNewHome/Model/HomePlayRoomModel.m | 26 - .../YMNewHome/Model/HomeRankAvatarModel.h | 21 - .../YMNewHome/Model/HomeRankAvatarModel.m | 12 - .../YMNewHome/Model/HomeRecommendRoomModel.h | 50 - .../YMNewHome/Model/HomeRecommendRoomModel.m | 12 - YuMi/Modules/YMNewHome/Model/HomeTagModel.h | 20 - YuMi/Modules/YMNewHome/Model/HomeTagModel.m | 16 - .../Model/PIHomeCategoryTitleModel.h | 23 - .../Model/PIHomeCategoryTitleModel.m | 12 - .../Modules/YMNewHome/Model/PIHomeItemModel.h | 36 - .../Modules/YMNewHome/Model/PIHomeItemModel.m | 15 - .../YMNewHome/Model/XPBlankRoomModel.h | 16 - .../YMNewHome/Model/XPBlankRoomModel.m | 12 - .../Presenter/CreateEventPresenter.h | 78 - .../Presenter/CreateEventPresenter.m | 253 - .../Presenter/EventCenterPresenter.h | 16 - .../Presenter/EventCenterPresenter.m | 12 - .../Presenter/XPHomeContainerPresenter.h | 32 - .../Presenter/XPHomeContainerPresenter.m | 157 - .../YMNewHome/Presenter/XPHomeMinePresenter.h | 19 - .../YMNewHome/Presenter/XPHomeMinePresenter.m | 34 - .../YMNewHome/Presenter/XPHomePresenter.h | 32 - .../YMNewHome/Presenter/XPHomePresenter.m | 89 - .../Presenter/XPNewHomeRecommendPresenter.h | 33 - .../Presenter/XPNewHomeRecommendPresenter.m | 203 - .../Protocol/XPHomeContainerProtocol.h | 38 - .../YMNewHome/Protocol/XPHomeMineProtocol.h | 19 - .../YMNewHome/Protocol/XPHomeProtocol.h | 33 - .../Protocol/XPHomeRecommendProtocol.h | 27 - .../Protocol/XPNewHomeRecommendProtocol.h | 37 - .../View/Cell/EventCenterEmptyCell.h | 11 - .../View/Cell/EventCenterEmptyCell.m | 61 - .../View/Cell/EventCenterEventCell.h | 31 - .../View/Cell/EventCenterEventCell.m | 460 - .../View/Cell/EventCenterOfficialCell.h | 21 - .../View/Cell/EventCenterOfficialCell.m | 155 - .../View/Cell/XPHomeBannerTableViewCell.h | 29 - .../View/Cell/XPHomeBannerTableViewCell.m | 97 - .../YMNewHome/View/Cell/XPHomeGameCell.h | 17 - .../YMNewHome/View/Cell/XPHomeGameCell.m | 55 - .../View/Cell/XPNewHomePartyAudioView.h | 30 - .../View/Cell/XPNewHomePartyAudioView.m | 192 - .../Cell/XPNewHomePartyCollectionViewCell.h | 17 - .../Cell/XPNewHomePartyCollectionViewCell.m | 436 - .../View/Cell/XPNewHomePartyTableViewCell.h | 35 - .../View/Cell/XPNewHomePartyTableViewCell.m | 406 - .../View/Cell/XPNewHomePartyTagView.h | 20 - .../View/Cell/XPNewHomePartyTagView.m | 118 - .../Cell/XPNewHomePlayEmptyTableViewCell.h | 26 - .../Cell/XPNewHomePlayEmptyTableViewCell.m | 130 - .../XPNewHomePlayItemCollectionViewCell.h | 16 - .../XPNewHomePlayItemCollectionViewCell.m | 171 - .../View/Cell/XPNewHomePlayTableViewCell.h | 28 - .../View/Cell/XPNewHomePlayTableViewCell.m | 103 - .../Cell/XPNewHomeRecommendTableViewCell.h | 27 - .../Cell/XPNewHomeRecommendTableViewCell.m | 254 - .../Cell/XPPartyRoomItemCollectionViewCell.h | 21 - .../Cell/XPPartyRoomItemCollectionViewCell.m | 342 - .../View/CreateEventPickerContainerView.h | 21 - .../View/CreateEventPickerContainerView.m | 458 - .../CreateEventSelectRoomViewController.h | 18 - .../CreateEventSelectRoomViewController.m | 270 - .../View/CreateEventViewControllerV2.h | 67 - .../View/CreateEventViewControllerV2.m | 826 -- .../YMNewHome/View/CustomView/PIPageControl.h | 19 - .../YMNewHome/View/CustomView/PIPageControl.m | 35 - .../View/CustomView/XPHomeGameView.h | 23 - .../View/CustomView/XPHomeGameView.m | 158 - .../CustomView/XPHomeRecommendOtherRoomView.h | 24 - .../CustomView/XPHomeRecommendOtherRoomView.m | 185 - .../View/CustomView/XPHomeUserView.h | 28 - .../View/CustomView/XPHomeUserView.m | 123 - .../View/CustomView/XPNewHomeHeadView.h | 26 - .../View/CustomView/XPNewHomeHeadView.m | 294 - .../View/CustomView/XPNewHomeItemCell.h | 20 - .../View/CustomView/XPNewHomeItemCell.m | 277 - .../View/CustomView/XPNewHomeNavView.h | 29 - .../View/CustomView/XPNewHomeNavView.m | 152 - .../YMNewHome/View/CustomView/XPNoteView.h | 27 - .../YMNewHome/View/CustomView/XPNoteView.m | 167 - .../View/EventCenterViewController.h | 18 - .../View/EventCenterViewController.m | 816 -- .../YMNewHome/View/MyEventsViewController.h | 16 - .../YMNewHome/View/MyEventsViewController.m | 192 - .../View/PIHoemCategoryCollectionView.h | 25 - .../View/PIHoemCategoryCollectionView.m | 104 - .../YMNewHome/View/PIHoemCategoryTitleCell.h | 18 - .../YMNewHome/View/PIHoemCategoryTitleCell.m | 67 - .../YMNewHome/View/PIHoemCategoryTitleView.h | 21 - .../YMNewHome/View/PIHoemCategoryTitleView.m | 72 - .../Search/Model/HomeEveryOneSearchModel.h | 20 - .../Search/Model/HomeEveryOneSearchModel.m | 16 - .../View/Search/Model/HomeLiveRoomModel.h | 23 - .../View/Search/Model/HomeLiveRoomModel.m | 12 - .../View/Search/Model/HomeSearchResultModel.h | 42 - .../View/Search/Model/HomeSearchResultModel.m | 23 - .../Search/Presenter/XPHomeSearchPresenter.h | 29 - .../Search/Presenter/XPHomeSearchPresenter.m | 70 - .../Presenter/XPInRoomRecordPresenter.h | 25 - .../Presenter/XPInRoomRecordPresenter.m | 48 - .../Search/Protocol/XPHomeSearchProtocol.h | 31 - .../Search/Protocol/XPInRoomRecordProtocol.h | 33 - .../Cell/XPHomeAttentionCollectionViewCell.h | 19 - .../Cell/XPHomeAttentionCollectionViewCell.m | 176 - .../Cell/XPHomeCollectRoomTableViewCell.h | 16 - .../Cell/XPHomeCollectRoomTableViewCell.m | 377 - .../Cell/XPHomeRedommendCollectionViewCell.h | 19 - .../Cell/XPHomeRedommendCollectionViewCell.m | 219 - .../Search/View/Cell/XPHomeSearchRecordCell.h | 18 - .../Search/View/Cell/XPHomeSearchRecordCell.m | 51 - .../View/Cell/XPSearchListTableViewCell.h | 28 - .../View/Cell/XPSearchListTableViewCell.m | 266 - .../Search/View/SubView/XPHomeSearchNavView.h | 31 - .../Search/View/SubView/XPHomeSearchNavView.m | 179 - .../View/SubView/XPHomeSearchRelateView.h | 28 - .../View/SubView/XPHomeSearchRelateView.m | 180 - .../SubView/XPRoomSearchRecommendHeadView.h | 16 - .../SubView/XPRoomSearchRecommendHeadView.m | 68 - .../Search/View/XPHomeSearchViewController.h | 19 - .../Search/View/XPHomeSearchViewController.m | 150 - .../XPRoomSearchContainerViewController.h | 16 - .../XPRoomSearchContainerViewController.m | 300 - .../View/XPRoomSearchRecordViewController.h | 33 - .../View/XPRoomSearchRecordViewController.m | 508 - .../YMNewHome/View/XPHomeMineViewController.h | 16 - .../YMNewHome/View/XPHomeMineViewController.m | 491 - .../View/XPHomePagingViewController.h | 16 - .../View/XPHomePagingViewController.m | 352 - .../View/XPHomePartyViewController.h | 30 - .../View/XPHomePartyViewController.m | 624 - .../YMNewHome/View/XPNewHomeViewController.h | 16 - .../YMNewHome/View/XPNewHomeViewController.m | 982 -- YuMi/Modules/YMRTC/RtcDelegate.h | 20 - YuMi/Modules/YMRTC/RtcImpl/BaseRtcImpl.h | 25 - YuMi/Modules/YMRTC/RtcImpl/BaseRtcImpl.m | 52 - YuMi/Modules/YMRTC/RtcImpl/RtcImplDelegate.h | 22 - YuMi/Modules/YMRTC/RtcImpl/RtcInterface.h | 76 - YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.h | 16 - YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m | 251 - YuMi/Modules/YMRTC/RtcManager.h | 148 - YuMi/Modules/YMRTC/RtcManager.m | 208 - YuMi/Modules/YMRoom/Api/Api+Boom.h | 20 - YuMi/Modules/YMRoom/Api/Api+Boom.m | 25 - .../Modules/YMRoom/Api/Api+CustomBackground.h | 35 - .../Modules/YMRoom/Api/Api+CustomBackground.m | 51 - YuMi/Modules/YMRoom/Api/Api+LuckyPackage.h | 46 - YuMi/Modules/YMRoom/Api/Api+LuckyPackage.m | 70 - YuMi/Modules/YMRoom/Api/Api+Room.h | 240 - YuMi/Modules/YMRoom/Api/Api+Room.m | 334 - YuMi/Modules/YMRoom/Api/Api+SuperAdmin.h | 24 - YuMi/Modules/YMRoom/Api/Api+SuperAdmin.m | 28 - .../Features/Boom/BoomInfoViewController.h | 23 - .../Features/Boom/BoomInfoViewController.m | 1168 -- .../Features/Boom/RoomBoomBannerAnimation.h | 30 - .../Features/Boom/RoomBoomBannerAnimation.m | 242 - .../YMRoom/Features/Boom/RoomBoomEntryView.h | 20 - .../YMRoom/Features/Boom/RoomBoomEntryView.m | 99 - .../Features/Boom/RoomBoomExplosionView.h | 24 - .../Features/Boom/RoomBoomExplosionView.m | 172 - .../YMRoom/Features/Boom/RoomBoomManager.h | 51 - .../YMRoom/Features/Boom/RoomBoomManager.m | 365 - .../YMRoom/Features/Boom/RoomBoomResultView.h | 21 - .../YMRoom/Features/Boom/RoomBoomResultView.m | 283 - .../YMRoom/Manager/GameBannerGestureManager.h | 23 - .../YMRoom/Manager/GameBannerGestureManager.m | 89 - .../YMRoom/Manager/PublicRoomManager.h | 73 - .../YMRoom/Manager/PublicRoomManager.m | 325 - YuMi/Modules/YMRoom/Model/ActivityInfoModel.h | 87 - YuMi/Modules/YMRoom/Model/ActivityInfoModel.m | 24 - YuMi/Modules/YMRoom/Model/BoomInfoModel.h | 109 - YuMi/Modules/YMRoom/Model/BoomInfoModel.m | 53 - .../Model/BravoGiftTabInfomationModel.h | 24 - .../Model/BravoGiftTabInfomationModel.m | 12 - YuMi/Modules/YMRoom/Model/BravoGiftTipModel.h | 26 - YuMi/Modules/YMRoom/Model/BravoGiftTipModel.m | 16 - .../YMRoom/Model/CustomRoomBGItemModel.h | 51 - .../YMRoom/Model/CustomRoomBGItemModel.m | 50 - YuMi/Modules/YMRoom/Model/DatingInfoModel.h | 49 - YuMi/Modules/YMRoom/Model/DatingInfoModel.m | 12 - YuMi/Modules/YMRoom/Model/MicCpInfoModel.h | 20 - YuMi/Modules/YMRoom/Model/MicCpInfoModel.m | 12 - .../YMRoom/Model/RoomBottomEntranceModel.h | 22 - .../YMRoom/Model/RoomBottomEntranceModel.m | 12 - YuMi/Modules/YMRoom/Model/RoomEnterModel.h | 46 - YuMi/Modules/YMRoom/Model/RoomEnterModel.m | 22 - YuMi/Modules/YMRoom/Model/RoomInfoModel.h | 184 - YuMi/Modules/YMRoom/Model/RoomInfoModel.m | 20 - .../Modules/YMRoom/Model/RoomLevelInfoModel.h | 57 - .../Modules/YMRoom/Model/RoomLevelInfoModel.m | 36 - .../YMRoom/Model/RoomLuckyPackageInfoModel.h | 157 - .../YMRoom/Model/RoomLuckyPackageInfoModel.m | 78 - .../YMRoom/Model/RoomNewUserGreetModel.h | 21 - .../YMRoom/Model/RoomNewUserGreetModel.m | 12 - .../YMRoom/Presenter/XPRoomPresenter.h | 91 - .../YMRoom/Presenter/XPRoomPresenter.m | 372 - YuMi/Modules/YMRoom/Protocol/XPRoomProtocol.h | 54 - YuMi/Modules/YMRoom/RoomResourceManager.h | 35 - YuMi/Modules/YMRoom/RoomResourceManager.m | 200 - .../View/AcrossRoomPK/Api/Api+AcrossRoomPK.h | 52 - .../View/AcrossRoomPK/Api/Api+AcrossRoomPK.m | 45 - .../Model/AcrossRoomPKInfoModel.h | 31 - .../Model/AcrossRoomPKInfoModel.m | 12 - .../Model/AcrossRoomPKPanelModel.h | 102 - .../Model/AcrossRoomPKPanelModel.m | 32 - .../Model/AcrossRoomPKPrizeModel.h | 40 - .../Model/AcrossRoomPKPrizeModel.m | 12 - .../Presenter/XPAcrossRoomPKPresenter.h | 24 - .../Presenter/XPAcrossRoomPKPresenter.m | 31 - .../Protocol/XPAcrossRoomProtocol.h | 21 - .../Cell/XPAcrossRoomPKEmptyTableViewCell.h | 16 - .../Cell/XPAcrossRoomPKEmptyTableViewCell.m | 71 - .../View/Cell/XPAcrossRoomPKTableViewCell.h | 22 - .../View/Cell/XPAcrossRoomPKTableViewCell.m | 131 - .../SubViews/XPAcrossRoomPKCountDownView.h | 20 - .../SubViews/XPAcrossRoomPKCountDownView.m | 151 - .../XPAcrossRoomPKForceEndResultView.h | 16 - .../XPAcrossRoomPKForceEndResultView.m | 236 - .../SubViews/XPAcrossRoomPKInviteResultView.h | 18 - .../SubViews/XPAcrossRoomPKInviteResultView.m | 97 - .../View/SubViews/XPAcrossRoomPKInviteView.h | 20 - .../View/SubViews/XPAcrossRoomPKInviteView.m | 372 - .../SubViews/XPAcrossRoomPKPanelUserView.h | 30 - .../SubViews/XPAcrossRoomPKPanelUserView.m | 142 - .../View/SubViews/XPAcrossRoomPKPanelView.h | 34 - .../View/SubViews/XPAcrossRoomPKPanelView.m | 1037 -- .../View/SubViews/XPAcrossRoomPKPrizeView.h | 16 - .../View/SubViews/XPAcrossRoomPKPrizeView.m | 246 - .../View/SubViews/XPAcrossRoomPKResultView.h | 16 - .../View/SubViews/XPAcrossRoomPKResultView.m | 384 - .../View/SubViews/XPAcrossRoomPKRuleView.h | 16 - .../View/SubViews/XPAcrossRoomPKRuleView.m | 106 - .../View/SubViews/XPAnchorPKMatchView.h | 28 - .../View/SubViews/XPAnchorPKMatchView.m | 221 - .../View/XPAcrossRoomPKSelectRoomView.h | 24 - .../View/XPAcrossRoomPKSelectRoomView.m | 369 - .../View/XPAcrossRoomPKViewController.h | 16 - .../View/XPAcrossRoomPKViewController.m | 672 - .../PIRoomActivityChoosePlayCell.h | 16 - .../PIRoomActivityChoosePlayCell.m | 47 - .../PIRoomActivityChoosePlayView.h | 26 - .../PIRoomActivityChoosePlayView.m | 129 - .../PIRoomActivityClickView.h | 25 - .../PIRoomActivityClickView.m | 108 - .../PIRoomActivityWebCell.h | 17 - .../PIRoomActivityWebCell.m | 52 - .../PIRoomActivityWebView.h | 20 - .../PIRoomActivityWebView.m | 157 - .../XPRoomActivityContainerView.h | 33 - .../XPRoomActivityContainerView.m | 833 -- .../AnchorCycleView/AnchorRoomScrollView.h | 39 - .../AnchorCycleView/AnchorRoomScrollView.m | 233 - .../AnchorCycleView/AnchorRoomSrollTipView.h | 16 - .../AnchorCycleView/AnchorRoomSrollTipView.m | 99 - .../YMRoom/View/AnchorPK/Api/Api+AnchorPk.h | 75 - .../YMRoom/View/AnchorPK/Api/Api+AnchorPk.m | 74 - .../AnchorPK/Presenter/XPAnchorPKPresenter.h | 28 - .../AnchorPK/Presenter/XPAnchorPKPresenter.m | 39 - .../AnchorPK/Protocol/XPAnchorPKProtocol.h | 24 - .../View/Cell/XPAnchorPKTableViewCell.h | 26 - .../View/Cell/XPAnchorPKTableViewCell.m | 155 - .../View/SubViews/XPAnchorPKFinishView.h | 19 - .../View/SubViews/XPAnchorPKFinishView.m | 236 - .../View/SubViews/XPAnchorPKInviteView.h | 21 - .../View/SubViews/XPAnchorPKInviteView.m | 359 - .../View/SubViews/XPAnchorPKPanelUserView.h | 33 - .../View/SubViews/XPAnchorPKPanelUserView.m | 143 - .../View/SubViews/XPAnchorPKResultView.h | 19 - .../View/SubViews/XPAnchorPKResultView.m | 438 - .../View/SubViews/XPAnchorPKRuleView.h | 18 - .../View/SubViews/XPAnchorPKRuleView.m | 133 - .../View/SubViews/XPAnchorPkPanelView.h | 41 - .../View/SubViews/XPAnchorPkPanelView.m | 825 -- .../View/SubViews/XPAnchorRandomPKRuleView.h | 17 - .../View/SubViews/XPAnchorRandomPKRuleView.m | 280 - .../AnchorPK/View/XPAnchorPKSelectRoomView.h | 28 - .../AnchorPK/View/XPAnchorPKSelectRoomView.m | 338 - .../View/XPAnchorPKSelectTypeController.h | 18 - .../View/XPAnchorPKSelectTypeController.m | 202 - .../AnchorPK/View/XPAnchorPKViewController.h | 18 - .../AnchorPK/View/XPAnchorPKViewController.m | 650 - .../AnchorView/FansTeam/Api/Api+FansTeam.h | 21 - .../AnchorView/FansTeam/Api/Api+FansTeam.m | 20 - .../FansTeam/Model/XPAnchorFansJoinModel.h | 34 - .../FansTeam/Model/XPAnchorFansJoinModel.m | 18 - .../Model/XPAnchorFansPrivilegeModel.h | 37 - .../Model/XPAnchorFansPrivilegeModel.m | 17 - .../Model/XPAnchorFansRelationModel.h | 29 - .../Model/XPAnchorFansRelationModel.m | 12 - .../Model/XPAnchorFansTaskDetailModel.h | 25 - .../Model/XPAnchorFansTaskDetailModel.m | 12 - .../FansTeam/Model/XPAnchorFansTaskModel.h | 29 - .../FansTeam/Model/XPAnchorFansTaskModel.m | 18 - .../Presenter/XPAnchorFansTeamPresenter.h | 20 - .../Presenter/XPAnchorFansTeamPresenter.m | 22 - .../Protocol/XPAnchorFansTeamProtocol.h | 14 - .../View/XPAnchorFansTaskTableViewCell.h | 19 - .../View/XPAnchorFansTaskTableViewCell.m | 156 - .../View/XPAnchorFansTaskViewController.h | 21 - .../View/XPAnchorFansTaskViewController.m | 598 - .../View/XPAnchorFansTeamEntranceView.h | 21 - .../View/XPAnchorFansTeamEntranceView.m | 157 - .../View/XPAnchorFansTeamViewController.h | 21 - .../View/XPAnchorFansTeamViewController.m | 587 - .../AnchorView/Model/XPAnchorAttentSendInfo.h | 22 - .../AnchorView/Model/XPAnchorAttentSendInfo.m | 25 - .../AnchorView/XPAnchorAudienceUpMicView.h | 24 - .../AnchorView/XPAnchorAudienceUpMicView.m | 220 - .../AnchorView/XPRoomAnchorInfoCardView.h | 24 - .../AnchorView/XPRoomAnchorInfoCardView.m | 215 - .../View/AnimationView/BannerScheduler.h | 146 - .../View/AnimationView/BannerScheduler.m | 230 - .../AnimationView/BravoGiftWinningFlagView.h | 32 - .../AnimationView/BravoGiftWinningFlagView.m | 191 - .../AnimationView/GameUniversalBannerView.h | 26 - .../AnimationView/GameUniversalBannerView.m | 407 - .../View/AnimationView/GestureOptimizer.h | 75 - .../View/AnimationView/GestureOptimizer.m | 163 - .../View/AnimationView/GiftAnimationHelper.h | 29 - .../View/AnimationView/GiftAnimationHelper.m | 338 - .../View/AnimationView/GiftAnimationManager.h | 65 - .../View/AnimationView/GiftAnimationManager.m | 331 - .../LuckyGiftWinningBannerView.h | 26 - .../LuckyGiftWinningBannerView.m | 417 - .../AnimationView/LuckyGiftWinningFlagView.h | 22 - .../AnimationView/LuckyGiftWinningFlagView.m | 212 - .../Model/PIBaseAnimationViewModel.h | 53 - .../Model/PIBaseAnimationViewModel.m | 12 - .../Model/PIUniversalBannerModel.h | 47 - .../Model/PIUniversalBannerModel.m | 17 - .../Model/RoomHalfHourRankModel.h | 27 - .../Model/RoomHalfHourRankModel.m | 12 - .../Model/XPGiftBannerUserInfoModel.h | 19 - .../Model/XPGiftBannerUserInfoModel.m | 12 - .../AnimationView/Model/XPGiftBigPrizeModel.h | 31 - .../AnimationView/Model/XPGiftBigPrizeModel.m | 12 - .../AnimationView/Model/XPGiftCompoundModel.h | 27 - .../AnimationView/Model/XPGiftCompoundModel.m | 12 - .../AnimationView/PIRoomGiftBroadcastWindow.h | 25 - .../AnimationView/PIRoomGiftBroadcastWindow.m | 199 - .../AnimationView/PIUniversalBannerView.h | 28 - .../AnimationView/PIUniversalBannerView.m | 185 - .../View/AnimationView/RoomAnimationView.h | 30 - .../View/AnimationView/RoomAnimationView.m | 4476 ------- .../RoomHighValueGiftBannerAnimation.h | 22 - .../RoomHighValueGiftBannerAnimation.m | 456 - .../AnimationView/TouchAreaCacheManager.h | 105 - .../AnimationView/TouchAreaCacheManager.m | 198 - .../XPRoomAnchorRankBannerView.h | 25 - .../XPRoomAnchorRankBannerView.m | 116 - .../AnimationView/XPRoomAnimationHitView.h | 16 - .../AnimationView/XPRoomAnimationHitView.m | 49 - .../View/AnimationView/XPRoomCandyGiftView.h | 19 - .../View/AnimationView/XPRoomCandyGiftView.m | 152 - .../AnimationView/XPRoomDatingAnimationView.h | 16 - .../AnimationView/XPRoomDatingAnimationView.m | 371 - .../AnimationView/XPRoomEnterHideTipView.h | 16 - .../AnimationView/XPRoomEnterHideTipView.m | 94 - .../AnimationView/XPRoomGiftAnimationParser.h | 20 - .../AnimationView/XPRoomGiftAnimationParser.m | 93 - .../AnimationView/XPRoomGiftBroadcastView.h | 28 - .../AnimationView/XPRoomGiftBroadcastView.m | 302 - .../AnimationView/XPRoomGiftCompoundView.h | 19 - .../AnimationView/XPRoomGiftCompoundView.m | 113 - .../XPRoomGraffitiGiftAnimationView.h | 31 - .../XPRoomGraffitiGiftAnimationView.m | 86 - .../AnimationView/XPRoomLuckyBigPrizeView.h | 25 - .../AnimationView/XPRoomLuckyBigPrizeView.m | 179 - .../AnimationView/XPRoomNobleLevelUpView.h | 21 - .../AnimationView/XPRoomNobleLevelUpView.m | 159 - .../AnimationView/XPRoomYearActivityView.h | 29 - .../AnimationView/XPRoomYearActivityView.m | 214 - .../AnimationView/addMoveAnimationToView.m | 0 .../View/ArrangeMic/Api/Api+ArrangeMic.h | 64 - .../View/ArrangeMic/Api/Api+ArrangeMic.m | 77 - .../View/ArrangeMic/Model/ArrangeMicModel.h | 41 - .../View/ArrangeMic/Model/ArrangeMicModel.m | 23 - .../ArrangeMic/Model/XPArrangeMicInfoModel.h | 43 - .../ArrangeMic/Model/XPArrangeMicInfoModel.m | 12 - .../Presenter/XPArrangeMicPresenter.h | 49 - .../Presenter/XPArrangeMicPresenter.m | 95 - .../Protocol/XPArrangeMicProtocol.h | 28 - .../Cell/XPArrangeMicEmptyTableViewCell.h | 17 - .../Cell/XPArrangeMicEmptyTableViewCell.m | 81 - .../View/Cell/XPArrangeMicTableViewCell.h | 26 - .../View/Cell/XPArrangeMicTableViewCell.m | 205 - .../View/XPArrangeMicViewController.h | 16 - .../View/XPArrangeMicViewController.m | 873 -- .../BackMusic/Model/Music+CoreDataClass.h | 20 - .../BackMusic/Model/Music+CoreDataClass.m | 13 - .../Model/Music+CoreDataProperties.h | 28 - .../Model/Music+CoreDataProperties.m | 34 - .../BackMusic/Presenter/XPCoreDataManager.h | 33 - .../BackMusic/Presenter/XPCoreDataManager.m | 78 - .../xplan-ios.xcdatamodel/contents | 15 - .../XPRoomMusicLibraryEmptyTableViewCell.h | 22 - .../XPRoomMusicLibraryEmptyTableViewCell.m | 100 - .../Cell/XPRoomMusicLibraryTableViewCell.h | 19 - .../Cell/XPRoomMusicLibraryTableViewCell.m | 134 - .../View/SubViews/XPMusicLibraryPlayView.h | 28 - .../View/SubViews/XPMusicLibraryPlayView.m | 123 - .../View/SubViews/XPRoomBackMusicPlayerView.h | 30 - .../View/SubViews/XPRoomBackMusicPlayerView.m | 455 - .../SubViews/XPRoomMusicVoiceSettingView.h | 35 - .../SubViews/XPRoomMusicVoiceSettingView.m | 227 - .../View/XPRoomMusicLibraryViewController.h | 31 - .../View/XPRoomMusicLibraryViewController.m | 355 - .../View/XPRoomTransferMusicViewController.h | 16 - .../View/XPRoomTransferMusicViewController.m | 402 - .../XPRoomAnchorRankEnterView.h | 16 - .../XPRoomAnchorRankEnterView.m | 100 - .../XPRoomBackContainerView.h | 17 - .../XPRoomBackContainerView.m | 178 - .../XPRoomDatingVipUpMicView.h | 16 - .../XPRoomDatingVipUpMicView.m | 107 - .../XPRoomDatingWebAlertView.h | 17 - .../XPRoomDatingWebAlertView.m | 114 - .../XPRoomFunctionContainerView.h | 42 - .../XPRoomFunctionContainerView.m | 1899 --- .../XPRoomRankEntranceView.h | 20 - .../XPRoomRankEntranceView.m | 156 - .../YMRoom/View/CandyTree/Api/Api+CandyTree.h | 44 - .../YMRoom/View/CandyTree/Api/Api+CandyTree.m | 47 - .../View/CandyTree/Model/CandyTreeInfoModel.h | 21 - .../View/CandyTree/Model/CandyTreeInfoModel.m | 12 - .../CandyTree/Model/CandyTreeRecordModel.h | 26 - .../CandyTree/Model/CandyTreeRecordModel.m | 12 - .../CandyTree/Model/CandyTreeResultModel.h | 64 - .../CandyTree/Model/CandyTreeResultModel.m | 22 - .../CandyTree/Model/PICandyTreeSetModel.h | 18 - .../CandyTree/Model/PICandyTreeSetModel.m | 20 - .../Model/XPCandyTreeAnimationModel.h | 33 - .../Model/XPCandyTreeAnimationModel.m | 12 - .../Presenter/XPCandyTreePresenter.h | 25 - .../Presenter/XPCandyTreePresenter.m | 69 - .../CandyTree/Protocol/XPCandyTreeProtocol.h | 27 - .../View/Cell/XPCandyTreeEmptyableViewCell.h | 16 - .../View/Cell/XPCandyTreeEmptyableViewCell.m | 71 - .../View/Cell/XPCandyTreeMoreRuleCell.h | 31 - .../View/Cell/XPCandyTreeMoreRuleCell.m | 119 - .../View/Cell/XPCandyTreeRankTableViewCell.h | 17 - .../View/Cell/XPCandyTreeRankTableViewCell.m | 175 - .../CandyTree/View/XPCandyRankContainerView.h | 24 - .../CandyTree/View/XPCandyRankContainerView.m | 201 - .../View/XPCandyTreeBuySuccessView.h | 16 - .../View/XPCandyTreeBuySuccessView.m | 182 - .../View/CandyTree/View/XPCandyTreeBuyView.h | 21 - .../View/CandyTree/View/XPCandyTreeBuyView.m | 295 - .../View/XPCandyTreeConfirmBuyNumView.h | 23 - .../View/XPCandyTreeConfirmBuyNumView.m | 188 - .../View/XPCandyTreeConfirmBuyView.h | 26 - .../View/XPCandyTreeConfirmBuyView.m | 347 - .../View/CandyTree/View/XPCandyTreeGiftView.h | 17 - .../View/CandyTree/View/XPCandyTreeGiftView.m | 152 - .../View/XPCandyTreeInsufficientBalanceView.h | 24 - .../View/XPCandyTreeInsufficientBalanceView.m | 135 - .../View/CandyTree/View/XPCandyTreeMoreView.h | 19 - .../View/CandyTree/View/XPCandyTreeMoreView.m | 175 - .../View/CandyTree/View/XPCandyTreeRankView.h | 29 - .../View/CandyTree/View/XPCandyTreeRankView.m | 196 - .../View/XPCandyTreeViewController.h | 16 - .../View/XPCandyTreeViewController.m | 658 - .../View/CandyTree/View/XPRoomHalfWebView.h | 29 - .../View/CandyTree/View/XPRoomHalfWebView.m | 218 - .../YMRoom/View/Common/BaseRoomBannerView.h | 36 - .../YMRoom/View/Common/BaseRoomBannerView.m | 119 - .../YMRoom/View/Common/BravoGiftBannerView.h | 18 - .../YMRoom/View/Common/BravoGiftBannerView.m | 324 - .../View/Custom Background/CustomRoomBGCell.h | 30 - .../View/Custom Background/CustomRoomBGCell.m | 548 - .../CustomRoomBGContentViewController.h | 22 - .../CustomRoomBGContentViewController.m | 988 -- .../Custom Background/CustomRoomBGPresenter.h | 41 - .../Custom Background/CustomRoomBGPresenter.m | 165 - .../YMRoom/View/FaceView/Model/ChatFaceVo.h | 28 - .../YMRoom/View/FaceView/Model/ChatFaceVo.m | 20 - .../View/FaceView/Model/RoomFaceInfoModel.h | 70 - .../View/FaceView/Model/RoomFaceInfoModel.m | 21 - .../FaceView/Model/RoomFaceSendInfoModel.h | 28 - .../FaceView/Model/RoomFaceSendInfoModel.m | 12 - .../FaceView/Model/RoomFaceTitleItemModel.h | 29 - .../FaceView/Model/RoomFaceTitleItemModel.m | 12 - .../FaceView/Presenter/XPRoomFacePresenter.h | 21 - .../FaceView/Presenter/XPRoomFacePresenter.m | 93 - .../View/FaceView/Presenter/XPRoomFaceTool.h | 47 - .../View/FaceView/Presenter/XPRoomFaceTool.m | 409 - .../FaceView/Protocol/XPRoomFaceProtocol.h | 22 - .../Cell/XPRoomFaceCollectionFlowLayout.h | 16 - .../Cell/XPRoomFaceCollectionFlowLayout.m | 150 - .../View/Cell/XPRoomFaceCollectionViewCell.h | 23 - .../View/Cell/XPRoomFaceCollectionViewCell.m | 151 - .../Cell/XPRoomFaceTitleCollectionViewCell.h | 16 - .../Cell/XPRoomFaceTitleCollectionViewCell.m | 94 - .../FaceView/View/XPRoomFaceViewController.h | 16 - .../FaceView/View/XPRoomFaceViewController.m | 520 - .../FirstRecharge/Api/Api+FirstRecharge.h | 22 - .../FirstRecharge/Api/Api+FirstRecharge.m | 16 - .../View/SubViews/XPFreeGiftsObtainView.h | 16 - .../View/SubViews/XPFreeGiftsObtainView.m | 148 - .../View/LittleGame/Api/Api+LittleGame.h | 29 - .../View/LittleGame/Api/Api+LittleGame.m | 36 - .../LittleGame/Model/LittleGameInfoModel.h | 30 - .../LittleGame/Model/LittleGameInfoModel.m | 16 - .../LittleGame/Presenter/Category/NSData+RW.h | 104 - .../LittleGame/Presenter/Category/NSData+RW.m | 276 - .../Presenter/Category/NSString+RW.h | 272 - .../Presenter/Category/NSString+RW.m | 530 - .../Presenter/Category/UIColor+RW.h | 93 - .../Presenter/Category/UIColor+RW.m | 81 - .../Presenter/Category/UIImage+RW.h | 322 - .../Presenter/Category/UIImage+RW.m | 1040 -- .../View/LittleGame/Presenter/SudCommon.h | 40 - .../View/LittleGame/Presenter/SudCommon.m | 148 - .../View/LittleGame/Presenter/SudGameConfig.h | 79 - .../XPCreateLittleGameCollectionViewCell.h | 17 - .../XPCreateLittleGameCollectionViewCell.m | 75 - .../View/Cell/XPLittleGameTableViewCell.h | 18 - .../View/Cell/XPLittleGameTableViewCell.m | 74 - .../View/XPLittleGameMiniStageView.h | 28 - .../View/XPLittleGameMiniStageView.m | 161 - .../View/XPLittleGameRoomListView.h | 33 - .../View/XPLittleGameRoomListView.m | 175 - .../View/XPLittleGameRoomOpenView.h | 19 - .../View/XPLittleGameRoomOpenView.m | 327 - .../View/XPRoomLittleGameContainerView.h | 36 - .../View/XPRoomLittleGameContainerView.m | 885 -- .../LuckyPackage/LuckyPackageBannerView.h | 29 - .../LuckyPackage/LuckyPackageBannerView.m | 322 - .../LuckyPackage/LuckyPackageLogicManager.h | 82 - .../LuckyPackage/LuckyPackageLogicManager.m | 331 - .../LuckyPackageMessageTableViewCell.h | 18 - .../LuckyPackageMessageTableViewCell.m | 114 - .../View/LuckyPackage/LuckyPackagePresenter.h | 51 - .../View/LuckyPackage/LuckyPackagePresenter.m | 144 - .../LuckyPackage/LuckyPackageStatusView.h | 20 - .../LuckyPackage/LuckyPackageStatusView.m | 877 -- .../LuckyPackage/LuckyPackageViewController.h | 21 - .../LuckyPackage/LuckyPackageViewController.m | 2342 ---- .../OpenLuckyPackageEntranceView.h | 18 - .../OpenLuckyPackageEntranceView.m | 217 - .../MSRoomOnLineView/MSRoomOnLineAvatarView.h | 17 - .../MSRoomOnLineView/MSRoomOnLineAvatarView.m | 63 - .../View/MSRoomOnLineView/MSRoomOnLineView.h | 17 - .../View/MSRoomOnLineView/MSRoomOnLineView.m | 164 - .../MenuContainerView/MSRoomMenuGameCell.h | 20 - .../MenuContainerView/MSRoomMenuGameCell.m | 86 - .../MSRoomMenuGameEmptyCell.h | 16 - .../MSRoomMenuGameEmptyCell.m | 54 - .../View/MenuContainerView/MSRoomMenuGameVC.h | 26 - .../View/MenuContainerView/MSRoomMenuGameVC.m | 420 - .../MenuContainerView/MSRoomMenuGameView.h | 31 - .../MenuContainerView/MSRoomMenuGameView.m | 196 - .../MenuContainerView/Model/XPRoomMenuItem.h | 31 - .../MenuContainerView/Model/XPRoomMenuItem.m | 12 - .../View/MenuContainerView/RoomMenuBar.h | 20 - .../View/MenuContainerView/RoomMenuBar.m | 35 - .../XPRoomMenuContainerView.h | 27 - .../XPRoomMenuContainerView.m | 917 -- .../MenuContainerView/XPRoomSendTextView.h | 27 - .../MenuContainerView/XPRoomSendTextView.m | 461 - .../Model/PIGeneralPublicScreenModel.h | 28 - .../Model/PIGeneralPublicScreenModel.m | 17 - .../Model/XPMessageDataSourceManager.h | 94 - .../Model/XPMessageDataSourceManager.m | 254 - .../Model/XPMessageInfoModel.h | 55 - .../Model/XPMessageInfoModel.m | 93 - .../Model/XPMessageItem.h | 60 - .../Model/XPMessageItem.m | 99 - .../Model/XPMessageRemoteExtModel.h | 79 - .../Model/XPMessageRemoteExtModel.m | 21 - .../MsRoomMessageMainView.h | 25 - .../MsRoomMessageMainView.m | 241 - .../Tool/XPRoomMessageConstant.h | 25 - .../Tool/XPRoomMessageParser.h | 26 - .../Tool/XPRoomMessageParser.m | 1742 --- .../View/PIRoomMessagePhotoAlbumCell.h | 36 - .../View/PIRoomMessagePhotoAlbumCell.m | 252 - .../View/PIRoomMessagePhotoAlbumView.h | 26 - .../View/PIRoomMessagePhotoAlbumView.m | 211 - .../View/PIRoomMessageUnlockPhotoAlbumView.h | 25 - .../View/PIRoomMessageUnlockPhotoAlbumView.m | 181 - .../MessageContainerView/View/RoomCahtCell.h | 23 - .../MessageContainerView/View/RoomCahtCell.m | 170 - .../View/XPNetImageYYLabel.h | 24 - .../View/XPNetImageYYLabel.m | 190 - .../View/XPRoomMessageHeaderView.h | 19 - .../View/XPRoomMessageHeaderView.m | 121 - .../View/XPRoomMessageTableViewCell.h | 35 - .../View/XPRoomMessageTableViewCell.m | 321 - .../XPRoomMessageContainerView.h | 65 - .../XPRoomMessageContainerView.m | 2024 --- YuMi/Modules/YMRoom/View/MicroQueueProtocol.h | 38 - .../YMRoom/View/MoreView/Action/XPPKAction.h | 54 - .../YMRoom/View/MoreView/Action/XPPKAction.m | 127 - .../MoreView/Action/XPRoomAppManagerAction.h | 16 - .../MoreView/Action/XPRoomAppManagerAction.m | 19 - .../Action/XPRoomBackGroundSettingAction.h | 18 - .../Action/XPRoomBackGroundSettingAction.m | 21 - .../Action/XPRoomCleanMessagesAction.h | 16 - .../Action/XPRoomCleanMessagesAction.m | 21 - .../View/MoreView/Action/XPRoomEffectAction.h | 24 - .../View/MoreView/Action/XPRoomEffectAction.m | 21 - .../MoreView/Action/XPRoomMusicPanelAction.h | 16 - .../MoreView/Action/XPRoomMusicPanelAction.m | 19 - .../MoreView/Action/XPRoomRedPacketAction.h | 16 - .../MoreView/Action/XPRoomRedPacketAction.m | 19 - .../MoreView/Action/XPRoomRoomPhotoAction.h | 16 - .../MoreView/Action/XPRoomRoomPhotoAction.m | 19 - .../MoreView/Action/XPRoomSettingAction.h | 24 - .../MoreView/Action/XPRoomSettingAction.m | 21 - .../MoreView/Action/XPRoomTypeSettingAction.h | 18 - .../MoreView/Action/XPRoomTypeSettingAction.m | 21 - .../View/MoreView/Action/XPSocialAction.h | 28 - .../View/MoreView/Action/XPSocialAction.m | 53 - .../View/MoreView/Action/XPTurboModeAction.h | 38 - .../View/MoreView/Action/XPTurboModeAction.m | 47 - .../YMRoom/View/MoreView/Api/Api+MoreMenu.h | 75 - .../YMRoom/View/MoreView/Api/Api+MoreMenu.m | 103 - .../Factory/XPRoomMoreMenuActionFactory.h | 43 - .../Factory/XPRoomMoreMenuActionFactory.m | 156 - .../MoreView/Manager/TurboModeStateManager.h | 63 - .../MoreView/Manager/TurboModeStateManager.m | 523 - .../MoreView/Manager/XPTurboModeTipsManager.h | 32 - .../MoreView/Manager/XPTurboModeTipsManager.m | 254 - .../View/MoreView/Model/InviteFansModel.h | 21 - .../View/MoreView/Model/InviteFansModel.m | 12 - .../View/MoreView/Model/XPRoomMoreItemModel.h | 91 - .../View/MoreView/Model/XPRoomMoreItemModel.m | 21 - .../MoreView/Model/XPRoomMoreMenuAction.h | 47 - .../MoreView/Model/XPRoomMoreMenuAction.m | 21 - .../Model/XPRoomMoreMenuActionContext.h | 57 - .../Model/XPRoomMoreMenuActionContext.m | 34 - .../MoreView/Presenter/XPMoreMenuPresenter.h | 50 - .../MoreView/Presenter/XPMoreMenuPresenter.m | 163 - .../MoreView/Protocol/XPMoreMenuProtocol.h | 40 - .../AppOfficalManagerActionsViewController.h | 23 - .../AppOfficalManagerActionsViewController.m | 251 - .../Cell/XPRoomMoreMenuCollectionViewCell.h | 17 - .../Cell/XPRoomMoreMenuCollectionViewCell.m | 86 - .../View/XPEffectPanelViewController.h | 23 - .../View/XPEffectPanelViewController.m | 416 - .../View/MoreView/View/XPRoomInviteFansView.h | 18 - .../View/MoreView/View/XPRoomInviteFansView.m | 305 - .../View/XPRoomMoreMenuViewController.h | 16 - .../View/XPRoomMoreMenuViewController.m | 708 - .../View/MoreView/View/XPTurboModeTipsView.h | 30 - .../View/MoreView/View/XPTurboModeTipsView.m | 290 - .../View/MoreView/XPTurboModeConstants.h | 72 - .../View/MoreView/XPTurboModeConstants.m | 33 - .../View/NewUserGift/XPNewUserRoomGiftView.h | 19 - .../View/NewUserGift/XPNewUserRoomGiftView.m | 149 - .../NewUserGreet/XPRoomNewUserGreetView.h | 24 - .../NewUserGreet/XPRoomNewUserGreetView.m | 196 - .../View/NobleTrumpet/Api/Api+RoomTrumpet.h | 19 - .../View/NobleTrumpet/Api/Api+RoomTrumpet.m | 17 - .../NobleTrumpet/Model/XPNobleTrumpetModel.h | 23 - .../NobleTrumpet/Model/XPNobleTrumpetModel.m | 12 - .../Presenter/XPTrumpetPresenter.h | 21 - .../Presenter/XPTrumpetPresenter.m | 23 - .../Protocol/XPRoomTrumpetProtocol.h | 14 - .../NobleTrumpet/View/XPRoomTrumpetView.h | 20 - .../NobleTrumpet/View/XPRoomTrumpetView.m | 176 - .../View/XPRoomTrumpetViewController.h | 21 - .../View/XPRoomTrumpetViewController.m | 446 - .../XPRoomQuickMessageContainView.h | 21 - .../XPRoomQuickMessageContainView.m | 192 - .../QuickMessageView/XPRoomQuidkMessageCell.h | 18 - .../QuickMessageView/XPRoomQuidkMessageCell.m | 68 - .../View/ReleaseRadio/Api/Api+RoomRadio.h | 22 - .../View/ReleaseRadio/Api/Api+RoomRadio.m | 18 - .../ReleaseRadio/Model/XPReleaseRadioModel.h | 32 - .../ReleaseRadio/Model/XPReleaseRadioModel.m | 12 - .../Presenter/XPReleaseRadioPresenter.h | 21 - .../Presenter/XPReleaseRadioPresenter.m | 22 - .../Protocol/XPReleaseRadioProtocol.h | 15 - .../View/Cell/XPReleaseRadioTableViewCell.h | 26 - .../View/Cell/XPReleaseRadioTableViewCell.m | 87 - .../ReleaseRadio/View/XPReleaseRadioView.h | 16 - .../ReleaseRadio/View/XPReleaseRadioView.m | 19 - .../View/XPReleaseRadioViewController.h | 22 - .../View/XPReleaseRadioViewController.m | 516 - .../YMRoom/View/RoomAnimationProtocol.h | 31 - .../View/RoomGame/Api/Api+MSRoomGameApi.h | 26 - .../View/RoomGame/Api/Api+MSRoomGameApi.m | 31 - .../View/RoomGame/Model/MSRoomGameModel.h | 57 - .../View/RoomGame/Model/MSRoomGameModel.m | 22 - .../RoomGame/Model/MSRoomGameResultsModel.h | 20 - .../RoomGame/Model/MSRoomGameResultsModel.m | 12 - .../RoomGame/Model/MSTabbarRoomGameModel.h | 31 - .../RoomGame/Model/MSTabbarRoomGameModel.m | 18 - .../RoomGame/Presenter/MSRoomGamePresenter.h | 29 - .../RoomGame/Presenter/MSRoomGamePresenter.m | 141 - .../RoomGame/Protocol/MSRoomGameProtocol.h | 29 - .../View/Cell/MSRoomGameVictoryCell.h | 16 - .../View/Cell/MSRoomGameVictoryCell.m | 166 - .../RoomGame/View/Cell/MSTabbarRoomGameCell.h | 16 - .../RoomGame/View/Cell/MSTabbarRoomGameCell.m | 48 - .../RoomGame/View/LudoGameViewController.h | 18 - .../RoomGame/View/LudoGameViewController.m | 228 - .../YMRoom/View/RoomGame/View/MSRoomGameVC.h | 18 - .../YMRoom/View/RoomGame/View/MSRoomGameVC.m | 419 - .../View/RoomGame/View/MSTabbarRoomGameVC.h | 18 - .../View/RoomGame/View/MSTabbarRoomGameVC.m | 190 - .../View/SubView/MSRoomGameHeadAvatarView.h | 16 - .../View/SubView/MSRoomGameHeadAvatarView.m | 65 - .../View/SubView/MSRoomGameHeadView.h | 29 - .../View/SubView/MSRoomGameHeadView.m | 239 - .../RoomGame/View/SubView/MSRoomGameMsgView.h | 20 - .../RoomGame/View/SubView/MSRoomGameMsgView.m | 322 - .../View/SubView/MSRoomGameQuitGameView.h | 30 - .../View/SubView/MSRoomGameQuitGameView.m | 142 - .../View/SubView/MSRoomGameSendMsgView.h | 20 - .../View/SubView/MSRoomGameSendMsgView.m | 63 - .../View/SubView/MSRoomGameSendTextView.h | 19 - .../View/SubView/MSRoomGameSendTextView.m | 273 - .../View/SubView/MSRoomGameVictoryView.h | 21 - .../View/SubView/MSRoomGameVictoryView.m | 162 - .../RoomGame/View/SubView/MSRoomGameView.h | 33 - .../RoomGame/View/SubView/MSRoomGameView.m | 692 - .../View/SubView/MSTabbarBeginGameView.h | 23 - .../View/SubView/MSTabbarBeginGameView.m | 175 - .../View/SubView/MSTabbarRoomGameHeadView.h | 25 - .../View/SubView/MSTabbarRoomGameHeadView.m | 146 - .../View/SubView/MSTabbarRoomGameView.h | 24 - .../View/SubView/MSTabbarRoomGameView.m | 87 - YuMi/Modules/YMRoom/View/RoomGuestDelegate.h | 44 - .../View/RoomHeaderView/RoomHeaderView.h | 21 - .../View/RoomHeaderView/RoomHeaderView.m | 568 - YuMi/Modules/YMRoom/View/RoomHostDelegate.h | 62 - .../YMRoom/View/RoomMode/RoomModePresenter.h | 30 - .../YMRoom/View/RoomMode/RoomModePresenter.m | 66 - .../View/RoomMode/RoomModeViewController.h | 18 - .../View/RoomMode/RoomModeViewController.m | 1209 -- .../YMRoom/View/RoomPK/Api/Api+RoomPK.h | 77 - .../YMRoom/View/RoomPK/Api/Api+RoomPK.m | 82 - .../View/RoomPK/Model/RoomPKChooseUserModel.h | 33 - .../View/RoomPK/Model/RoomPKChooseUserModel.m | 31 - .../View/RoomPK/Model/RoomPKDetailInfoModel.h | 19 - .../View/RoomPK/Model/RoomPKDetailInfoModel.m | 12 - .../View/RoomPK/Model/RoomPKInfoModel.h | 49 - .../View/RoomPK/Model/RoomPKInfoModel.m | 16 - .../View/RoomPK/Model/RoomPKRecordModel.h | 26 - .../View/RoomPK/Model/RoomPKRecordModel.m | 16 - .../View/RoomPK/Model/RoomPKTeamModel.h | 39 - .../View/RoomPK/Model/RoomPKTeamModel.m | 23 - .../View/RoomPK/Model/RoomPKTimeItemModel.h | 19 - .../View/RoomPK/Model/RoomPKTimeItemModel.m | 12 - .../View/RoomPK/Presenter/XPRoomPKPresenter.h | 29 - .../View/RoomPK/Presenter/XPRoomPKPresenter.m | 51 - .../Presenter/XPRoomPKRecordPresenter.h | 22 - .../Presenter/XPRoomPKRecordPresenter.m | 26 - .../View/RoomPK/Protocol/XPRoomPKProtocol.h | 25 - .../RoomPK/Protocol/XPRoomPKRecordProtocol.h | 19 - .../View/Cell/XPRoomPKEmptyTableViewCell.h | 16 - .../View/Cell/XPRoomPKEmptyTableViewCell.m | 72 - .../View/Cell/XPRoomPKRecordTableViewCell.h | 17 - .../View/Cell/XPRoomPKRecordTableViewCell.m | 273 - .../View/Cell/XPRoomPKTimeTableViewCell.h | 19 - .../View/Cell/XPRoomPKTimeTableViewCell.m | 92 - .../View/Cell/XPRoomPKTypeTableViewCell.h | 16 - .../View/Cell/XPRoomPKTypeTableViewCell.m | 88 - .../Cell/XPRoomPKUserCollectionViewCell.h | 17 - .../Cell/XPRoomPKUserCollectionViewCell.m | 124 - .../View/Cell/XPRoomPKVoteTableViewCell.h | 26 - .../View/Cell/XPRoomPKVoteTableViewCell.m | 187 - .../View/SubViews/XPRomPKResultTitleLabel.h | 21 - .../View/SubViews/XPRomPKResultTitleLabel.m | 92 - .../View/SubViews/XPRoomPKPaneAvatarView.h | 39 - .../View/SubViews/XPRoomPKPaneAvatarView.m | 122 - .../View/SubViews/XPRoomPKPanelUserView.h | 28 - .../View/SubViews/XPRoomPKPanelUserView.m | 310 - .../View/SubViews/XPRoomPKRecordNickView.h | 17 - .../View/SubViews/XPRoomPKRecordNickView.m | 232 - .../View/SubViews/XPRoomPKSelectUserView.h | 33 - .../View/SubViews/XPRoomPKSelectUserView.m | 435 - .../View/SubViews/XPRoomPKTimePickerView.h | 23 - .../View/SubViews/XPRoomPKTimePickerView.m | 254 - .../RoomPK/View/SubViews/XPRoomPKUserView.h | 24 - .../RoomPK/View/SubViews/XPRoomPKUserView.m | 128 - .../View/RoomPK/View/XPRoomPKPanelView.h | 41 - .../View/RoomPK/View/XPRoomPKPanelView.m | 1451 -- .../View/XPRoomPKRecordViewController.h | 16 - .../View/XPRoomPKRecordViewController.m | 169 - .../View/RoomPK/View/XPRoomPKResultView.h | 16 - .../View/RoomPK/View/XPRoomPKResultView.m | 702 - .../View/RoomPK/View/XPRoomPKViewController.h | 16 - .../View/RoomPK/View/XPRoomPKViewController.m | 514 - .../View/RoomPhotoAlbum/Api/Api+PhotoAlbum.h | 40 - .../View/RoomPhotoAlbum/Api/Api+PhotoAlbum.m | 55 - .../PIRoomPhotoAlbumItemChoosePhotoModel.h | 17 - .../PIRoomPhotoAlbumItemChoosePhotoModel.m | 12 - .../Model/PIRoomPhotoAlbumItemModel.h | 45 - .../Model/PIRoomPhotoAlbumItemModel.m | 15 - .../Presenter/PIRoomPhotoAlbumItemPresenter.h | 35 - .../Presenter/PIRoomPhotoAlbumItemPresenter.m | 73 - .../Protocol/PIRoomPhotoAlbumItemProtocol.h | 29 - .../Cell/PIRoomPhotoAlbumChooseGiftCell.h | 17 - .../Cell/PIRoomPhotoAlbumChooseGiftCell.m | 103 - .../Cell/PIRoomPhotoAlbumChoosePhotoCell.h | 25 - .../Cell/PIRoomPhotoAlbumChoosePhotoCell.m | 106 - .../View/Cell/PIRoomPhotoAlbumItemCell.h | 27 - .../View/Cell/PIRoomPhotoAlbumItemCell.m | 190 - .../View/Cell/PIRoomPhotoAlbumOperateCell.h | 16 - .../View/Cell/PIRoomPhotoAlbumOperateCell.m | 67 - .../View/PIRoomPhotoAlbumItemVC.h | 31 - .../View/PIRoomPhotoAlbumItemVC.m | 486 - .../RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.h | 16 - .../RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.m | 107 - .../SubViews/PIRoomPhotoAlbumChooseGiftView.h | 26 - .../SubViews/PIRoomPhotoAlbumChooseGiftView.m | 184 - .../PIRoomPhotoAlbumChoosePhotoGiftView.h | 25 - .../PIRoomPhotoAlbumChoosePhotoGiftView.m | 160 - .../PIRoomPhotoAlbumChoosePhotoTypeView.h | 25 - .../PIRoomPhotoAlbumChoosePhotoTypeView.m | 106 - .../PIRoomPhotoAlbumChoosePhotoView.h | 30 - .../PIRoomPhotoAlbumChoosePhotoView.m | 318 - .../SubViews/PIRoomPhotoAlbumOperateView.h | 29 - .../SubViews/PIRoomPhotoAlbumOperateView.m | 88 - .../Model/XPRoomRecommendModel.h | 32 - .../Model/XPRoomRecommendModel.m | 12 - .../SubViews/XPRoomInsideOperationCell.h | 19 - .../SubViews/XPRoomInsideOperationCell.m | 70 - .../SubViews/XPRoomInsideRecommendCell.h | 19 - .../SubViews/XPRoomInsideRecommendCell.m | 116 - .../SubViews/XPRoomInsideRecommendEmptyCell.h | 17 - .../SubViews/XPRoomInsideRecommendEmptyCell.m | 57 - .../View/RoomRecommend/XPRoomRecommendView.h | 34 - .../View/RoomRecommend/XPRoomRecommendView.m | 270 - .../YMRoom/View/RoomSideMenu/RoomSideMenu.h | 35 - .../YMRoom/View/RoomSideMenu/RoomSideMenu.m | 1023 -- .../YMRoom/View/Sailing/Api/Api+Sailing.h | 34 - .../YMRoom/View/Sailing/Api/Api+Sailing.m | 44 - .../View/Sailing/Model/RoomSailingInfoModel.h | 17 - .../View/Sailing/Model/RoomSailingInfoModel.m | 12 - .../Sailing/Model/RoomSailingPrizeListModel.h | 21 - .../Sailing/Model/RoomSailingPrizeListModel.m | 15 - .../Sailing/Model/RoomSailingPrizeModel.h | 51 - .../Sailing/Model/RoomSailingPrizeModel.m | 12 - .../View/Sailing/Model/RoomSailingRankModel.h | 24 - .../View/Sailing/Model/RoomSailingRankModel.m | 12 - .../Presenter/Protocol/XPSailingProtocol.h | 21 - .../Sailing/Presenter/XPSailingPresenter.h | 20 - .../Sailing/Presenter/XPSailingPresenter.m | 39 - .../View/Cell/XPSailingEmptyTableViewCell.h | 16 - .../View/Cell/XPSailingEmptyTableViewCell.m | 73 - .../Cell/XPSailingPrizeCollectionViewCell.h | 16 - .../Cell/XPSailingPrizeCollectionViewCell.m | 85 - .../View/Cell/XPSailingRankTableViewCell.h | 16 - .../View/Cell/XPSailingRankTableViewCell.m | 178 - .../Sailing/View/XPSailingAnimationView.h | 15 - .../Sailing/View/XPSailingAnimationView.m | 102 - .../View/Sailing/View/XPSailingBuyFuelView.h | 24 - .../View/Sailing/View/XPSailingBuyFuelView.m | 126 - .../View/Sailing/View/XPSailingGiftView.h | 16 - .../View/Sailing/View/XPSailingGiftView.m | 88 - .../View/Sailing/View/XPSailingPrizeView.h | 17 - .../View/Sailing/View/XPSailingPrizeView.m | 111 - .../View/Sailing/View/XPSailingRankSubView.h | 21 - .../View/Sailing/View/XPSailingRankSubView.m | 177 - .../View/Sailing/View/XPSailingRankView.h | 16 - .../View/Sailing/View/XPSailingRankView.m | 154 - .../Sailing/View/XPSailingViewController.h | 15 - .../Sailing/View/XPSailingViewController.m | 729 - .../YMRoom/View/SendGiftView/Api/Api+Gift.h | 99 - .../YMRoom/View/SendGiftView/Api/Api+Gift.m | 121 - .../View/SendGiftView/GiftComboConfig.h | 40 - .../View/SendGiftView/GiftComboConfig.m | 26 - .../View/SendGiftView/GiftComboManager.h | 138 - .../View/SendGiftView/GiftComboManager.m | 882 -- .../View/SendGiftView/GiftComboTransport.h | 35 - .../View/SendGiftView/GiftComboTransport.m | 85 - .../View/SendGiftView/GiftComboUIAdapter.h | 29 - .../View/SendGiftView/GiftComboUIAdapter.m | 67 - .../View/SendGiftView/Model/GiftInfoModel.h | 168 - .../View/SendGiftView/Model/GiftInfoModel.m | 66 - .../Model/GiftLuckyBroadcastModel.h | 27 - .../Model/GiftLuckyBroadcastModel.m | 14 - .../SendGiftView/Model/GiftNobleInfoModel.h | 23 - .../SendGiftView/Model/GiftNobleInfoModel.m | 12 - .../SendGiftView/Model/GiftReceiveInfoModel.h | 153 - .../SendGiftView/Model/GiftReceiveInfoModel.m | 107 - .../Model/GiftTwelveStarFirstModel.h | 23 - .../Model/GiftTwelveStarFirstModel.m | 12 - .../SendGiftView/Model/GiftValueInfoModel.h | 25 - .../SendGiftView/Model/GiftValueInfoModel.m | 23 - .../View/SendGiftView/Model/XPFreeGiftModel.h | 25 - .../View/SendGiftView/Model/XPFreeGiftModel.m | 12 - .../SendGiftView/Model/XPGiftCountModel.h | 28 - .../SendGiftView/Model/XPGiftCountModel.m | 22 - .../SendGiftView/Model/XPGiftUserInfoModel.h | 28 - .../SendGiftView/Model/XPGiftUserInfoModel.m | 14 - .../Model/XPWeekStarRankUserModel.h | 30 - .../Model/XPWeekStarRankUserModel.m | 12 - .../View/SendGiftView/Model/i18nGiftNameMap.h | 25 - .../View/SendGiftView/Model/i18nGiftNameMap.m | 12 - .../SendGiftView/Presenter/XPGiftPresenter.h | 58 - .../SendGiftView/Presenter/XPGiftPresenter.m | 167 - .../SendGiftView/Presenter/XPGiftStorage.h | 41 - .../SendGiftView/Presenter/XPGiftStorage.m | 191 - .../SendGiftView/Protocol/XPGiftProtocol.h | 40 - .../View/SendGiftView/ThemeColor+SendGift.h | 41 - .../View/SendGiftView/ThemeColor+SendGift.m | 70 - .../Cell/XPGiftCollectionViewFlowLayout.h | 16 - .../Cell/XPGiftCollectionViewFlowLayout.m | 151 - .../View/Cell/XPGiftCountCollectionViewCell.h | 17 - .../View/Cell/XPGiftCountCollectionViewCell.m | 118 - .../View/Cell/XPGiftEmptyCollectionViewCell.h | 16 - .../View/Cell/XPGiftEmptyCollectionViewCell.m | 77 - .../View/Cell/XPGiftFreeItemCell.h | 23 - .../View/Cell/XPGiftFreeItemCell.m | 193 - .../View/Cell/XPGiftItemCollectionViewCell.h | 22 - .../View/Cell/XPGiftItemCollectionViewCell.m | 339 - .../View/Cell/XPGiftUserCollectionViewCell.h | 17 - .../View/Cell/XPGiftUserCollectionViewCell.m | 151 - .../Cell/XPGiftWeekStarCollectionViewCell.h | 27 - .../Cell/XPGiftWeekStarCollectionViewCell.m | 150 - .../SendGiftView/View/CountdownRingView.h | 22 - .../SendGiftView/View/CountdownRingView.m | 243 - .../SendGiftView/View/GiftComboFlagView.h | 28 - .../SendGiftView/View/GiftComboFlagView.m | 277 - .../View/SendGiftView/View/GiftComboView.h | 22 - .../View/SendGiftView/View/GiftComboView.m | 551 - .../View/PIGiftBravoGiftBroadcastView.h | 25 - .../View/PIGiftBravoGiftBroadcastView.m | 390 - .../View/PIGiftInfoSegmentedView.h | 56 - .../View/PIGiftInfoSegmentedView.m | 605 - .../View/PIGiftSuperGiftBroadcastView.h | 22 - .../View/PIGiftSuperGiftBroadcastView.m | 64 - .../View/SendGiftView/View/XPGiftBarView.h | 43 - .../View/SendGiftView/View/XPGiftBarView.m | 586 - .../View/SendGiftView/View/XPGiftCountView.h | 31 - .../View/SendGiftView/View/XPGiftCountView.m | 188 - .../SendGiftView/View/XPGiftHeadTypeView.h | 35 - .../SendGiftView/View/XPGiftHeadTypeView.m | 227 - .../View/SendGiftView/View/XPGiftInfoView.h | 72 - .../View/SendGiftView/View/XPGiftInfoView.m | 347 - .../View/XPGiftLuckyGiftBroadcastView.h | 28 - .../View/XPGiftLuckyGiftBroadcastView.m | 210 - .../View/XPGiftTwelveStarBroadcastView.h | 38 - .../View/XPGiftTwelveStarBroadcastView.m | 251 - .../View/SendGiftView/View/XPGiftUsersView.h | 31 - .../View/SendGiftView/View/XPGiftUsersView.m | 305 - .../SendGiftView/View/XPGraffitiGiftView.h | 37 - .../SendGiftView/View/XPGraffitiGiftView.m | 412 - .../View/SendGiftView/View/XPSendGiftView.h | 47 - .../View/SendGiftView/View/XPSendGiftView.m | 1384 -- .../View/SendRedPacket/Api/Api+RedPacket.h | 33 - .../View/SendRedPacket/Api/Api+RedPacket.m | 22 - .../Cell/PIInputEntireServerScrollingView.h | 16 - .../Cell/PIInputEntireServerScrollingView.m | 78 - .../SendRedPacket/Cell/PIInputRedPacketView.h | 20 - .../SendRedPacket/Cell/PIInputRedPacketView.m | 162 - .../SendRedPacket/Cell/PIInputScrollingView.h | 16 - .../SendRedPacket/Cell/PIInputScrollingView.m | 48 - .../Cell/PIRedPacketChooseTypeCell.h | 18 - .../Cell/PIRedPacketChooseTypeCell.m | 72 - .../Cell/PIRedPacketChooseTypeView.h | 30 - .../Cell/PIRedPacketChooseTypeView.m | 104 - .../SendRedPacket/Cell/XPOpenRedPacketCell.h | 19 - .../SendRedPacket/Cell/XPOpenRedPacketCell.m | 184 - .../Model/XPOpenRedPacketModel.h | 29 - .../Model/XPOpenRedPacketModel.m | 12 - .../Model/XPReceiveRedPacketModel.h | 42 - .../Model/XPReceiveRedPacketModel.m | 12 - .../SendRedPacket/Model/XPRedPacketModel.h | 81 - .../SendRedPacket/Model/XPRedPacketModel.m | 16 - .../Model/XPRedPacketResultModel.h | 54 - .../Model/XPRedPacketResultModel.m | 22 - .../PIReceiveRedPacketSuccessView.h | 24 - .../PIReceiveRedPacketSuccessView.m | 259 - .../SendRedPacket/PIRoomEnterRedPacketView.h | 28 - .../SendRedPacket/PIRoomEnterRedPacketView.m | 297 - .../SendRedPacket/PIRoomSendRedPacketItemVC.h | 29 - .../SendRedPacket/PIRoomSendRedPacketItemVC.m | 408 - .../SendRedPacket/PIRoomSendRedPacketVC.h | 19 - .../SendRedPacket/PIRoomSendRedPacketVC.m | 373 - .../Presenter/XPRoomRedPacketPresenter.h | 32 - .../Presenter/XPRoomRedPacketPresenter.m | 48 - .../Protocol/XPRoomRedPacketProtocol.h | 25 - .../SendRedPacket/XPReceiveRedPacketView.h | 33 - .../SendRedPacket/XPReceiveRedPacketView.m | 603 - .../SendRedPacket/XPRoomRedPacketPwdView.h | 31 - .../SendRedPacket/XPRoomRedPacketPwdView.m | 186 - .../XPRoomSendRedPacketViewController.h | 21 - .../XPRoomSendRedPacketViewController.m | 741 -- .../YMRoom/View/Setting/Api/Api+RoomSetting.h | 94 - .../YMRoom/View/Setting/Api/Api+RoomSetting.m | 127 - .../View/Setting/Model/RoomClassifyModel.h | 27 - .../View/Setting/Model/RoomClassifyModel.m | 16 - .../YMRoom/View/Setting/Model/RoomTagModel.h | 21 - .../YMRoom/View/Setting/Model/RoomTagModel.m | 14 - .../Setting/Model/XPRoomSettingItemModel.h | 55 - .../Setting/Model/XPRoomSettingItemModel.m | 12 - .../Presenter/XPRoomSettingPresenter.h | 76 - .../Presenter/XPRoomSettingPresenter.m | 363 - .../Setting/Presenter/XPRoomTagPresenter.h | 21 - .../Setting/Presenter/XPRoomTagPresenter.m | 34 - .../Setting/Presenter/XPRoomTopicPresenter.h | 17 - .../Setting/Presenter/XPRoomTopicPresenter.m | 72 - .../Setting/Protocol/XPRoomSettingProtocol.h | 43 - .../View/Setting/Protocol/XPRoomTagProtocol.h | 20 - .../Setting/Protocol/XPRoomTopicProtocol.h | 20 - .../View/Cell/MSRoomSetingBackdropCell.h | 17 - .../View/Cell/MSRoomSetingBackdropCell.m | 82 - .../View/Cell/XPRoomOnlineTableViewCell.h | 29 - .../View/Cell/XPRoomOnlineTableViewCell.m | 462 - .../View/Cell/XPRoomRoleEmptyTableViewCell.h | 16 - .../View/Cell/XPRoomRoleEmptyTableViewCell.m | 70 - .../View/Cell/XPRoomRoleTableViewCell.h | 31 - .../View/Cell/XPRoomRoleTableViewCell.m | 157 - .../View/Cell/XPRoomSettingTableViewCell.h | 26 - .../View/Cell/XPRoomSettingTableViewCell.m | 220 - .../Setting/View/Cell/XPRoomSettingTagCell.h | 20 - .../Setting/View/Cell/XPRoomSettingTagCell.m | 80 - .../View/XPRoomInviteUserViewController.h | 28 - .../View/XPRoomInviteUserViewController.m | 462 - .../Setting/View/XPRoomOnLineViewController.h | 17 - .../Setting/View/XPRoomOnLineViewController.m | 337 - .../Setting/View/XPRoomRoleViewController.h | 30 - .../Setting/View/XPRoomRoleViewController.m | 203 - .../Setting/View/XPRoomSettingInputView.h | 44 - .../Setting/View/XPRoomSettingInputView.m | 299 - .../View/XPRoomSettingViewController.h | 16 - .../View/XPRoomSettingViewController.m | 653 - .../View/Setting/View/XPRoomTagListView.h | 30 - .../View/Setting/View/XPRoomTagListView.m | 244 - .../View/XPRoomTagListViewController.h | 29 - .../View/XPRoomTagListViewController.m | 246 - .../View/Setting/View/XPRoomTopicAlertView.h | 19 - .../View/Setting/View/XPRoomTopicAlertView.m | 131 - .../Setting/View/XPRoomTopicViewController.h | 17 - .../Setting/View/XPRoomTopicViewController.m | 253 - .../YMRoom/View/StageView/AnchorPKStageView.h | 19 - .../YMRoom/View/StageView/AnchorPKStageView.m | 352 - .../YMRoom/View/StageView/AnchorStageView.h | 19 - .../YMRoom/View/StageView/AnchorStageView.m | 284 - .../YMRoom/View/StageView/DatingStageView.h | 19 - .../YMRoom/View/StageView/DatingStageView.m | 309 - .../View/StageView/FifteenMicStageView.h | 19 - .../View/StageView/FifteenMicStageView.m | 134 - .../StageView/LittleGameScrollStageView.h | 25 - .../StageView/LittleGameScrollStageView.m | 233 - .../View/StageView/LittleGameStageView.h | 25 - .../View/StageView/LittleGameStageView.m | 134 - .../View/StageView/MicMidpointRectManager.h | 163 - .../View/StageView/MicMidpointRectManager.m | 729 - .../MicroView/Anchor/AnchorMicroView.h | 16 - .../MicroView/Anchor/AnchorMicroView.m | 150 - .../MicroView/Anchor/AnchorPKMicroView.h | 16 - .../MicroView/Anchor/AnchorPKMicroView.m | 152 - .../View/StageView/MicroView/ArabMicroView.h | 16 - .../View/StageView/MicroView/ArabMicroView.m | 48 - .../MicroView/Dating/DatingMicroView.h | 16 - .../MicroView/Dating/DatingMicroView.m | 317 - .../Dating/MicroDatingProgressView.h | 17 - .../Dating/MicroDatingProgressView.m | 108 - .../LittleGame/LittleGameMicroView.h | 16 - .../LittleGame/LittleGameMicroView.m | 107 - .../StageView/MicroView/MicroGiftValueView.h | 17 - .../StageView/MicroView/MicroGiftValueView.m | 105 - .../StageView/MicroView/MicroNobleWaveView.h | 22 - .../StageView/MicroView/MicroNobleWaveView.m | 105 - .../View/StageView/MicroView/MicroView.h | 42 - .../View/StageView/MicroView/MicroView.m | 1192 -- .../StageView/MicroView/MicroViewProtocol.h | 99 - .../View/StageView/MicroView/MicroWaveView.h | 20 - .../View/StageView/MicroView/MicroWaveView.m | 114 - .../StageView/MicroView/SocialMicroView.h | 16 - .../StageView/MicroView/SocialMicroView.m | 48 - .../View/StageView/Model/MicroExtModel.h | 42 - .../View/StageView/Model/MicroExtModel.m | 12 - .../StageView/Model/MicroInviteExtModel.h | 20 - .../StageView/Model/MicroInviteExtModel.m | 12 - .../View/StageView/Model/MicroQueueModel.h | 19 - .../View/StageView/Model/MicroQueueModel.m | 12 - .../View/StageView/Model/MicroStateModel.h | 44 - .../View/StageView/Model/MicroStateModel.m | 21 - .../View/StageView/NineteenMicStageView.h | 19 - .../View/StageView/NineteenMicStageView.m | 193 - .../YMRoom/View/StageView/SocialStageView.h | 23 - .../YMRoom/View/StageView/SocialStageView.m | 169 - .../Modules/YMRoom/View/StageView/StageView.h | 102 - .../Modules/YMRoom/View/StageView/StageView.m | 1550 --- .../YMRoom/View/StageView/TenMicStageView.h | 19 - .../YMRoom/View/StageView/TenMicStageView.m | 102 - .../View/StageView/TwentyMicStageView.h | 21 - .../View/StageView/TwentyMicStageView.m | 113 - YuMi/Modules/YMRoom/View/StageViewManager.h | 60 - YuMi/Modules/YMRoom/View/StageViewManager.m | 169 - .../View/TaskTip/XPTaskCompleteTipView.h | 20 - .../View/TaskTip/XPTaskCompleteTipView.m | 107 - YuMi/Modules/YMRoom/View/ThemeColor+Room.h | 63 - YuMi/Modules/YMRoom/View/ThemeColor+Room.m | 114 - .../YMRoom/View/UserCard/Api/Api+UserCard.h | 71 - .../YMRoom/View/UserCard/Api/Api+UserCard.m | 71 - .../View/UserCard/Model/XPUserCardInfoModel.h | 41 - .../View/UserCard/Model/XPUserCardInfoModel.m | 12 - .../View/UserCard/Model/XPUserCardItemModel.h | 74 - .../View/UserCard/Model/XPUserCardItemModel.m | 20 - .../UserCard/Model/XPUserCardMicroItemModel.h | 38 - .../UserCard/Model/XPUserCardMicroItemModel.m | 12 - .../UserCard/Presenter/XPUserCardPresenter.h | 104 - .../UserCard/Presenter/XPUserCardPresenter.m | 866 -- .../UserCard/Protocol/XPUserCardProtocol.h | 48 - .../View/UserCard/ThemeColor+UserCard.h | 23 - .../View/UserCard/ThemeColor+UserCard.m | 31 - .../Cell/XPUserCardItemCollectionViewCell.h | 17 - .../Cell/XPUserCardItemCollectionViewCell.m | 89 - .../View/UserCard/View/Custom19MicLayout.h | 19 - .../View/UserCard/View/Custom19MicLayout.m | 77 - .../View/UserCard/View/Custom9MicLayout.h | 19 - .../View/UserCard/View/Custom9MicLayout.m | 59 - .../View/SubViews/XPUserCardSkillCardView.h | 18 - .../View/SubViews/XPUserCardSkillCardView.m | 97 - .../XPUserCardSkillCollectionViewCell.h | 19 - .../XPUserCardSkillCollectionViewCell.m | 43 - .../View/UserRoomCardViewController.h | 22 - .../View/UserRoomCardViewController.m | 2283 ---- .../UserCard/View/UserRoomMicPositionCell.h | 23 - .../UserCard/View/UserRoomMicPositionCell.m | 51 - .../UserCard/View/UserRoomMicPositionView.h | 25 - .../UserCard/View/UserRoomMicPositionView.m | 189 - .../UserCard/View/XPUserCardViewController.h | 22 - .../UserCard/View/XPUserCardViewController.m | 1658 --- YuMi/Modules/YMRoom/View/XPMiniRoomView.h | 21 - YuMi/Modules/YMRoom/View/XPMiniRoomView.m | 891 -- YuMi/Modules/YMRoom/View/XPRoomMiniManager.h | 42 - YuMi/Modules/YMRoom/View/XPRoomMiniManager.m | 91 - .../View/XPRoomTypeSelectionViewController.h | 19 - .../View/XPRoomTypeSelectionViewController.m | 295 - .../YMRoom/View/XPRoomViewController.h | 72 - .../YMRoom/View/XPRoomViewController.m | 4604 ------- .../YMTabbar/Model/InviteUserInfoModel.h | 25 - .../YMTabbar/Model/InviteUserInfoModel.m | 12 - .../Model/MineSkillCardListInfoModel.h | 24 - .../Model/MineSkillCardListInfoModel.m | 15 - .../YMTabbar/Model/NewUserGreetModel.h | 33 - .../YMTabbar/Model/NewUserGreetModel.m | 12 - .../YMTabbar/Model/NewUserRechargeModel.h | 21 - .../YMTabbar/Model/NewUserRechargeModel.m | 16 - .../YMTabbar/Model/XPTabAnchorCardModel.h | 30 - .../YMTabbar/Model/XPTabAnchorCardModel.m | 12 - .../YMTabbar/Model/XPVersionUpdateModel.h | 33 - .../YMTabbar/Model/XPVersionUpdateModel.m | 17 - .../YMTabbar/Presenter/MainPresenter.h | 47 - .../YMTabbar/Presenter/MainPresenter.m | 217 - .../View/AnchorCard/XPAnchorCardView.h | 27 - .../View/AnchorCard/XPAnchorCardView.m | 526 - .../YMTabbar/View/TabbarViewController.h | 17 - .../YMTabbar/View/TabbarViewController.m | 1118 -- .../View/VersionUpdate/XPUpgradeView.h | 19 - .../View/VersionUpdate/XPUpgradeView.m | 221 - YuMi/Modules/YMWeb/XPWebViewController.m | 4 +- YuMi/Network/HttpRequestHelper.m | 7 - YuMi/PrivacyInfo.xcprivacy | 74 +- YuMi/Structure/MVP/Model/AccountInfoStorage.m | 2 +- YuMi/Structure/MVP/Model/UserInfoModel.h | 3 +- YuMi/Structure/MVP/Model/UserInfoModel.m | 1 - .../MVP/Presenter/BaseMvpPresenter.m | 30 +- YuMi/Structure/MVP/View/MvpViewController.m | 7 +- YuMi/Structure/PrefixHeader.pch | 2 - YuMi/Tools/Bundle/NSBundle+Localizable.m | 20 +- YuMi/Tools/Bundle/YMLanguageConfig.m | 10 +- .../CardManager/XPSkillCardPlayerManager.h | 82 - .../CardManager/XPSkillCardPlayerManager.m | 204 - .../CocoaHttpServer/Core/Categories/DDData.h | 14 - .../CocoaHttpServer/Core/Categories/DDData.m | 158 - .../Core/Categories/DDNumber.h | 12 - .../Core/Categories/DDNumber.m | 88 - .../CocoaHttpServer/Core/Categories/DDRange.h | 56 - .../CocoaHttpServer/Core/Categories/DDRange.m | 104 - .../Core/HTTPAuthenticationRequest.h | 45 - .../Core/HTTPAuthenticationRequest.m | 194 - .../CocoaHttpServer/Core/HTTPConnection.h | 119 - .../CocoaHttpServer/Core/HTTPConnection.m | 2708 ---- YuMi/Tools/CocoaHttpServer/Core/HTTPLogging.h | 136 - YuMi/Tools/CocoaHttpServer/Core/HTTPMessage.h | 48 - YuMi/Tools/CocoaHttpServer/Core/HTTPMessage.m | 113 - .../Tools/CocoaHttpServer/Core/HTTPResponse.h | 149 - YuMi/Tools/CocoaHttpServer/Core/HTTPServer.h | 215 - YuMi/Tools/CocoaHttpServer/Core/HTTPServer.m | 781 -- .../Core/Mime/MultipartFormDataParser.h | 65 - .../Core/Mime/MultipartFormDataParser.m | 529 - .../Core/Mime/MultipartMessageHeader.h | 33 - .../Core/Mime/MultipartMessageHeader.m | 86 - .../Core/Mime/MultipartMessageHeaderField.h | 23 - .../Core/Mime/MultipartMessageHeaderField.m | 211 - .../Core/Responses/HTTPAsyncFileResponse.h | 75 - .../Core/Responses/HTTPAsyncFileResponse.m | 405 - .../Core/Responses/HTTPDataResponse.h | 13 - .../Core/Responses/HTTPDataResponse.m | 79 - .../Core/Responses/HTTPDynamicFileResponse.h | 52 - .../Core/Responses/HTTPDynamicFileResponse.m | 292 - .../Core/Responses/HTTPErrorResponse.h | 9 - .../Core/Responses/HTTPErrorResponse.m | 38 - .../Core/Responses/HTTPFileResponse.h | 25 - .../Core/Responses/HTTPFileResponse.m | 237 - .../Core/Responses/HTTPRedirectResponse.h | 12 - .../Core/Responses/HTTPRedirectResponse.m | 73 - YuMi/Tools/CocoaHttpServer/Core/WebSocket.h | 105 - YuMi/Tools/CocoaHttpServer/Core/WebSocket.m | 792 -- YuMi/Tools/CocoaHttpServer/MyHTTPConnection.h | 58 - YuMi/Tools/CocoaHttpServer/MyHTTPConnection.m | 208 - YuMi/Tools/CocoaHttpServer/SJXCSMIPHelper.h | 19 - YuMi/Tools/CocoaHttpServer/SJXCSMIPHelper.m | 155 - .../Vendor/CocoaLumberjack/DDASLLogger.h | 41 - .../Vendor/CocoaLumberjack/DDASLLogger.m | 99 - .../DDAbstractDatabaseLogger.h | 102 - .../DDAbstractDatabaseLogger.m | 727 - .../Vendor/CocoaLumberjack/DDFileLogger.h | 334 - .../Vendor/CocoaLumberjack/DDFileLogger.m | 1356 -- .../Vendor/CocoaLumberjack/DDLog.h | 601 - .../Vendor/CocoaLumberjack/DDLog.m | 1083 -- .../Vendor/CocoaLumberjack/DDTTYLogger.h | 167 - .../Vendor/CocoaLumberjack/DDTTYLogger.m | 1479 --- .../Extensions/ContextFilterLogFormatter.h | 65 - .../Extensions/ContextFilterLogFormatter.m | 191 - .../Extensions/DispatchQueueLogFormatter.h | 116 - .../Extensions/DispatchQueueLogFormatter.m | 251 - YuMi/Tools/CocoaHttpServer/Web/css/index.css | 101 - YuMi/Tools/CocoaHttpServer/Web/css/reset.css | 90 - .../CocoaHttpServer/Web/images/attention.png | Bin 441 -> 0 bytes .../CocoaHttpServer/Web/images/button-ar.png | Bin 3186 -> 0 bytes .../CocoaHttpServer/Web/images/button-en.png | Bin 3872 -> 0 bytes .../CocoaHttpServer/Web/images/button-id.png | Bin 3722 -> 0 bytes .../CocoaHttpServer/Web/images/button-tr.png | Bin 3211 -> 0 bytes .../CocoaHttpServer/Web/images/button.png | Bin 5961 -> 0 bytes .../CocoaHttpServer/Web/images/delete.png | Bin 483 -> 0 bytes .../CocoaHttpServer/Web/images/download.png | Bin 358 -> 0 bytes .../CocoaHttpServer/Web/images/header-ar.png | Bin 4028 -> 0 bytes .../CocoaHttpServer/Web/images/header-en.png | Bin 3951 -> 0 bytes .../CocoaHttpServer/Web/images/header-id.png | Bin 4411 -> 0 bytes .../CocoaHttpServer/Web/images/header-tr.png | Bin 27928 -> 0 bytes .../CocoaHttpServer/Web/images/header.png | Bin 29848 -> 0 bytes YuMi/Tools/CocoaHttpServer/Web/index.html | 61 - .../CocoaHttpServer/Web/js/getLanguage.js | 164 - YuMi/Tools/CocoaHttpServer/Web/js/index.js | 67 - .../Web/js/jquery-3.2.1.min.js | 4 - .../Web/js/jquery.fileupload.js | 1486 --- .../Web/js/jquery.iframe-transport.js | 224 - .../Web/js/jquery.ui.widget.js | 572 - .../CocoaHttpServer/Web/js/langHandler.js | 49 - .../CocoaHttpServer/Web/js/vconsole.min.js | 10 - YuMi/Tools/CocoaHttpServer/Web/local/ar.js | 10 - YuMi/Tools/CocoaHttpServer/Web/local/en.js | 10 - YuMi/Tools/CocoaHttpServer/Web/local/id.js | 10 - YuMi/Tools/CocoaHttpServer/Web/local/tr.js | 10 - YuMi/Tools/CocoaHttpServer/Web/local/zh.js | 10 - YuMi/Tools/CocoaHttpServer/Web/upload.html | 9 - YuMi/Tools/FirstCharge/FirstRechargeManager.h | 33 - YuMi/Tools/FirstCharge/FirstRechargeManager.m | 323 - YuMi/Tools/IAPHelper/RechargeStorage.h | 30 - YuMi/Tools/IAPHelper/RechargeStorage.m | 67 - YuMi/Tools/QGVAPlayer/README.md | 1 - .../SVGAParserManager/SVGAParserManager.h | 18 - .../SVGAParserManager/SVGAParserManager.m | 111 - YuMi/Tools/Share/ShareHelder.h | 37 - YuMi/Tools/Share/ShareHelder.m | 271 - YuMi/Tools/Share/ShareProvider.h | 31 - YuMi/Tools/Share/ShareProvider.m | 232 - YuMi/Tools/Share/SocialShareManager.h | 31 - YuMi/Tools/Share/SocialShareManager.m | 126 - .../SpriteSheetImageManager.h | 16 - .../SpriteSheetImageManager.m | 152 - .../YYAnimatedImageView+ImageShow.h | 16 - .../YYAnimatedImageView+ImageShow.m | 34 - .../StatisticsService/StatisticsService.h | 38 - .../StatisticsService/StatisticsService.m | 56 - .../StatisticsServiceHelper.h | 185 - .../StatisticsServiceHelper.m | 205 - YuMi/YMWeb/XPWebViewController.h | 60 + YuMi/YMWeb/XPWebViewController.m | 675 + YuMi/YMWeb/XPWebViewNavView.h | 21 + YuMi/YMWeb/XPWebViewNavView.m | 79 + YuMi/YuMi-Bridging-Header.h | 7 +- YuMi/YuMi.entitlements | 13 +- YuMi/YuMiRelease.entitlements | 13 +- YuMi/ar.lproj/InfoPlist.strings | 7 - YuMi/ar.lproj/Localizable.strings | 4287 ------ YuMi/es.lproj/InfoPlist.strings | 7 - YuMi/es.lproj/Localizable.strings | 4087 ------ YuMi/main.m | 7 - YuMi/pi_app_logo_new_bg.png | Bin 50282 -> 0 bytes YuMi/pi_area_info.json | 976 -- YuMi/pi_login_new_logo.png | Bin 29226 -> 0 bytes YuMi/pt-BR.lproj/InfoPlist.strings | 13 - YuMi/pt-BR.lproj/Localizable.strings | 3368 ----- YuMi/ru.lproj/InfoPlist.strings | 8 - YuMi/ru.lproj/Localizable.strings | 4072 ------ YuMi/tr.lproj/InfoPlist.strings | 7 - YuMi/tr.lproj/Localizable.strings | 3868 ------ YuMi/uz-UZ.lproj/InfoPlist.strings | 7 - YuMi/uz-UZ.lproj/Localizable.strings | 4043 ------ YuMi/zh-Hant.lproj/InfoPlist.strings | 8 - YuMi/zh-Hant.lproj/Localizable.strings | 3878 ------ 2670 files changed, 945 insertions(+), 337245 deletions(-) delete mode 100644 YuMi/Appdelegate/AppDelegate+ThirdConfig.h delete mode 100644 YuMi/Appdelegate/AppDelegate+ThirdConfig.m delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/Color/Contents.json delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/Contents.json delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/Contents.json delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/Contents.json delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/chat_icon_emoji_black_l_normal@2x-1.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/chat_icon_emoji_black_l_normal@2x.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/chat_icon_emoji_black_l_normal@3x-1.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/chat_icon_emoji_black_l_normal@3x.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/Contents.json delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/chat_icon_more_black_l_normal@2x-1.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/chat_icon_more_black_l_normal@2x.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/chat_icon_more_black_l_normal@3x-1.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/chat_icon_more_black_l_normal@3x.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_keyboard_black_normal.imageset/Contents.json delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_keyboard_black_normal.imageset/chat_icon_keyboard_black_l_normal@2x-1.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_keyboard_black_normal.imageset/chat_icon_keyboard_black_l_normal@2x.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_keyboard_black_normal.imageset/chat_icon_keyboard_black_l_normal@3x-1.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_keyboard_black_normal.imageset/chat_icon_keyboard_black_l_normal@3x.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_voice_black_normal.imageset/Contents.json delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_voice_black_normal.imageset/chat_icon_voice@2x.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_voice_black_normal.imageset/chat_icon_voice@3x.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_voice_black_normal.imageset/chat_icon_voice_dark@2x.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_voice_black_normal.imageset/chat_icon_voice_dark@3x.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_emotion_delete.imageset/Contents.json delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_emotion_delete.imageset/compose_emotion_delete_highlighted-1.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/input/q_emotion_delete.imageset/compose_emotion_delete_highlighted.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/q_white_btn.imageset/Contents.json delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/q_white_btn.imageset/white_btn_dark.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/q_white_btn.imageset/white_rect.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/q_white_input_btn.imageset/Contents.json delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/q_white_input_btn.imageset/white_input_btn_dark.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/q_white_input_btn.imageset/white_rect.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/q_white_input_press_btn.imageset/Contents.json delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/q_white_input_press_btn.imageset/white_input_press_btn.png delete mode 100644 YuMi/CustomUI/InputView/Assets.xcassets/q_white_input_press_btn.imageset/white_input_press_btn_dark.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoj_s_normal@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoj_s_pressed@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji.xml delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_00@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_01@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_02@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_03@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_04@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_05@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_06@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_07@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_08@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_09@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_100@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_101@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_102@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_103@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_104@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_105@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_106@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_107@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_108@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_109@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_10@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_110@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_111@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_112@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_113@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_114@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_115@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_116@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_117@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_118@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_119@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_11@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_120@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_121@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_122@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_123@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_124@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_125@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_126@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_127@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_128@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_129@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_12@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_130@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_131@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_132@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_133@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_134@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_135@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_136@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_137@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_138@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_139@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_13@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_140@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_141@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_142@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_143@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_144@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_145@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_146@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_147@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_148@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_149@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_14@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_150@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_151@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_152@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_15@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_160@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_161@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_162@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_163@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_164@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_165@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_166@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_16@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_17@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_18@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_19@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_200@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_20@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_21@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_22@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_23@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_24@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_25@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_26@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_27@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_28@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_29@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_30@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_31@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_32@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_33@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_34@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_35@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_36@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_37@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_38@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_39@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_40@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_41@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_42@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_43@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_44@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_45@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_46@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_47@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_48@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_49@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_50@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_51@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_52@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_53@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_54@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_55@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_56@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_57@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_58@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_59@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_60@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_61@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_62@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_63@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_64@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_65@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_66@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_67@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_68@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_69@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_70@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_71@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_72@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_73@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_74@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_75@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_76@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_77@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_78@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_79@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_80@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_81@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_82@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_83@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_84@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_85@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_86@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_87@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_88@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_89@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_90@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_91@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_92@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_93@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_94@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_95@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_96@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_97@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_98@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_99@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_del_normal@2x.png delete mode 100755 YuMi/CustomUI/InputView/Emoji/emoji_del_pressed@2x.png delete mode 100644 YuMi/CustomUI/InputView/InputView/QEEmotionImageView.h delete mode 100644 YuMi/CustomUI/InputView/InputView/QEEmotionImageView.m delete mode 100644 YuMi/CustomUI/InputView/InputView/QEmotion.h delete mode 100644 YuMi/CustomUI/InputView/InputView/QEmotion.m delete mode 100644 YuMi/CustomUI/InputView/InputView/QEmotionAttachment.h delete mode 100644 YuMi/CustomUI/InputView/InputView/QEmotionAttachment.m delete mode 100644 YuMi/CustomUI/InputView/InputView/QEmotionBoardView.h delete mode 100644 YuMi/CustomUI/InputView/InputView/QEmotionBoardView.m delete mode 100644 YuMi/CustomUI/InputView/InputView/QEmotionHelper.h delete mode 100644 YuMi/CustomUI/InputView/InputView/QEmotionHelper.m delete mode 100755 YuMi/CustomUI/InputView/InputView/QExtendBoardView.h delete mode 100755 YuMi/CustomUI/InputView/InputView/QExtendBoardView.m delete mode 100755 YuMi/CustomUI/InputView/InputView/QInputBarView.h delete mode 100755 YuMi/CustomUI/InputView/InputView/QInputBarView.m delete mode 100644 YuMi/CustomUI/InputView/InputView/QInputBarViewConfiguration.h delete mode 100644 YuMi/CustomUI/InputView/InputView/QInputBarViewConfiguration.m delete mode 100644 YuMi/CustomUI/InputView/InputView/QInputPhototCell.h delete mode 100644 YuMi/CustomUI/InputView/InputView/QInputPhototCell.m delete mode 100755 YuMi/CustomUI/InputView/InputView/QKeyboardBaseManager.h delete mode 100755 YuMi/CustomUI/InputView/InputView/QKeyboardBaseManager.m delete mode 100755 YuMi/CustomUI/InputView/InputView/QKeyboardManager.h delete mode 100755 YuMi/CustomUI/InputView/InputView/QKeyboardManager.m delete mode 100644 YuMi/CustomUI/InputView/InputView/QPhotoImageModel.h delete mode 100644 YuMi/CustomUI/InputView/InputView/QPhotoImageModel.m delete mode 100644 YuMi/CustomUI/InputView/InputView/QinputPhotoView.h delete mode 100644 YuMi/CustomUI/InputView/InputView/QinputPhotoView.m delete mode 100644 YuMi/CustomUI/InputView/InputView/UITextView+QEmotion.h delete mode 100644 YuMi/CustomUI/InputView/InputView/UITextView+QEmotion.m delete mode 100755 YuMi/CustomUI/InputView/emoji.plist delete mode 100644 YuMi/CustomUI/MoliAvatar.h delete mode 100644 YuMi/CustomUI/MoliAvatar.m delete mode 100644 YuMi/CustomUI/SVGA/XPSVGAPlayer.h delete mode 100644 YuMi/CustomUI/SVGA/XPSVGAPlayer.m delete mode 100644 YuMi/CustomUI/ShareView/Model/XPShareInfoModel.h delete mode 100644 YuMi/CustomUI/ShareView/Model/XPShareInfoModel.m delete mode 100644 YuMi/CustomUI/ShareView/Model/XPShareItem.h delete mode 100644 YuMi/CustomUI/ShareView/Model/XPShareItem.m delete mode 100644 YuMi/CustomUI/ShareView/View/XPShareItemCell.h delete mode 100644 YuMi/CustomUI/ShareView/View/XPShareItemCell.m delete mode 100644 YuMi/CustomUI/ShareView/XPShareView.h delete mode 100644 YuMi/CustomUI/ShareView/XPShareView.m delete mode 100644 YuMi/Global/BuglyManager.h delete mode 100644 YuMi/Global/BuglyManager.m delete mode 100644 YuMi/Global/GlobalEventManager.h delete mode 100644 YuMi/Global/GlobalEventManager.m delete mode 100644 YuMi/GoogleService-Info.plist delete mode 100644 YuMi/Modules/ShoppingMall/MyDressingDataModel.h delete mode 100644 YuMi/Modules/ShoppingMall/MyDressingDataModel.m delete mode 100644 YuMi/Modules/ShoppingMall/MyDressingDataPresent.h delete mode 100644 YuMi/Modules/ShoppingMall/MyDressingDataPresent.m delete mode 100644 YuMi/Modules/ShoppingMall/MyDressingViewController.h delete mode 100644 YuMi/Modules/ShoppingMall/MyDressingViewController.m delete mode 100644 YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.h delete mode 100644 YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.m delete mode 100644 YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.h delete mode 100644 YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.m delete mode 100644 YuMi/Modules/ShoppingMall/ShoppingMallItemPreview.h delete mode 100644 YuMi/Modules/ShoppingMall/ShoppingMallItemPreview.m delete mode 100644 YuMi/Modules/ShoppingMall/ShoppingMallTagView.h delete mode 100644 YuMi/Modules/ShoppingMall/ShoppingMallTagView.m delete mode 100644 YuMi/Modules/ShoppingMall/ShoppingMallViewController.h delete mode 100644 YuMi/Modules/ShoppingMall/ShoppingMallViewController.m delete mode 100644 YuMi/Modules/YMLogin/Api/PILoginManager.h delete mode 100644 YuMi/Modules/YMLogin/Api/PILoginManager.m delete mode 100644 YuMi/Modules/YMLogin/Presenter/LoginPresenter.h delete mode 100644 YuMi/Modules/YMLogin/Presenter/LoginPresenter.m delete mode 100644 YuMi/Modules/YMLogin/Presenter/XPLoginVerifBindPhonePresenter.h delete mode 100644 YuMi/Modules/YMLogin/Presenter/XPLoginVerifBindPhonePresenter.m delete mode 100644 YuMi/Modules/YMLogin/View/AccountBindingViewController.h delete mode 100644 YuMi/Modules/YMLogin/View/AccountBindingViewController.m delete mode 100644 YuMi/Modules/YMLogin/View/CustomView/LoginForgetEditView.h delete mode 100644 YuMi/Modules/YMLogin/View/CustomView/LoginForgetEditView.m delete mode 100644 YuMi/Modules/YMLogin/View/CustomView/LoginInputItemView.h delete mode 100644 YuMi/Modules/YMLogin/View/CustomView/LoginInputItemView.m delete mode 100644 YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.h delete mode 100644 YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.m delete mode 100644 YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.h delete mode 100644 YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.m delete mode 100644 YuMi/Modules/YMLogin/View/CustomView/XPLoginBindSuccessView.h delete mode 100644 YuMi/Modules/YMLogin/View/CustomView/XPLoginBindSuccessView.m delete mode 100644 YuMi/Modules/YMLogin/View/FeedBackViewController.h delete mode 100644 YuMi/Modules/YMLogin/View/FeedBackViewController.m delete mode 100644 YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.h delete mode 100644 YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m delete mode 100644 YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.h delete mode 100644 YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.m delete mode 100644 YuMi/Modules/YMLogin/View/LoginFullInfoViewController.h delete mode 100644 YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m delete mode 100644 YuMi/Modules/YMLogin/View/LoginTypesViewController.h delete mode 100644 YuMi/Modules/YMLogin/View/LoginTypesViewController.m delete mode 100644 YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.h delete mode 100644 YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m delete mode 100644 YuMi/Modules/YMLogin/View/LoginViewController.h delete mode 100644 YuMi/Modules/YMLogin/View/LoginViewController.m delete mode 100644 YuMi/Modules/YMLogin/View/RegionListViewController.h delete mode 100644 YuMi/Modules/YMLogin/View/RegionListViewController.m delete mode 100644 YuMi/Modules/YMLogin/View/XPLoginBindPhoneResultViewController.h delete mode 100644 YuMi/Modules/YMLogin/View/XPLoginBindPhoneResultViewController.m delete mode 100644 YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.h delete mode 100644 YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.m delete mode 100644 YuMi/Modules/YMMessage/Api/Api+Message.h delete mode 100644 YuMi/Modules/YMMessage/Api/Api+Message.m delete mode 100644 YuMi/Modules/YMMessage/Model/AttachmentModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/AttachmentModel.m delete mode 100644 YuMi/Modules/YMMessage/Model/ChatLimitModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/ChatLimitModel.m delete mode 100644 YuMi/Modules/YMMessage/Model/CustomMessage/XPKickUserModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/CustomMessage/XPKickUserModel.m delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentApplicationShareModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentApplicationShareModel.m delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentLevelUpgradeModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentLevelUpgradeModel.m delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentOpenLiveInfoModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentOpenLiveInfoModel.m delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentRistAlertModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentRistAlertModel.m delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.m delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentShareMonentsModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentShareMonentsModel.m delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentTreasureFairyModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentTreasureFairyModel.m delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentTweetModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/SessionContent/ContentTweetModel.m delete mode 100644 YuMi/Modules/YMMessage/Model/SessionSettingModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/SessionSettingModel.m delete mode 100644 YuMi/Modules/YMMessage/Model/SessionToolBar/MessageMenuModel.h delete mode 100644 YuMi/Modules/YMMessage/Model/SessionToolBar/MessageMenuModel.m delete mode 100644 YuMi/Modules/YMMessage/Presenter/MessagePresenter.h delete mode 100644 YuMi/Modules/YMMessage/Presenter/MessagePresenter.m delete mode 100644 YuMi/Modules/YMMessage/Protocol/MessageProtocol.h delete mode 100644 YuMi/Modules/YMMessage/Tool/CustomAttachmentDecoder.h delete mode 100644 YuMi/Modules/YMMessage/Tool/CustomAttachmentDecoder.m delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/Api/Api+FindNew.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/Api/Api+FindNew.m delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetListModel.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetListModel.m delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetMessageModel.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetMessageModel.m delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/Model/FindNewUserInfoModel.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/Model/FindNewUserInfoModel.m delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/Presenter/XPSessionFindNewPresenter.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/Presenter/XPSessionFindNewPresenter.m delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/Protocol/XPSessionFindNewProtocol.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.m delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.m delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.m delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.m delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.m delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.h delete mode 100644 YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.m delete mode 100644 YuMi/Modules/YMMessage/View/MessageAudioCenter.h delete mode 100644 YuMi/Modules/YMMessage/View/MessageAudioCenter.m delete mode 100644 YuMi/Modules/YMMessage/View/NIMMessageMaker.h delete mode 100644 YuMi/Modules/YMMessage/View/NIMMessageMaker.m delete mode 100644 YuMi/Modules/YMMessage/View/NIMMessageUtils.h delete mode 100644 YuMi/Modules/YMMessage/View/NIMMessageUtils.m delete mode 100644 YuMi/Modules/YMMessage/View/NIMTimeUtils.h delete mode 100644 YuMi/Modules/YMMessage/View/NIMTimeUtils.m delete mode 100644 YuMi/Modules/YMMessage/View/NIMViews/NIMBadgeView.h delete mode 100644 YuMi/Modules/YMMessage/View/NIMViews/NIMBadgeView.m delete mode 100644 YuMi/Modules/YMMessage/View/NIMViews/UITableView+NIMScrollToBottom.h delete mode 100644 YuMi/Modules/YMMessage/View/NIMViews/UITableView+NIMScrollToBottom.m delete mode 100644 YuMi/Modules/YMMessage/View/NIMViews/UIView+NIM.h delete mode 100644 YuMi/Modules/YMMessage/View/NIMViews/UIView+NIM.m delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/Api/Api+SayHello.h delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/Api/Api+SayHello.m delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloCountModel.h delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloCountModel.m delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloLevelModel.h delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloLevelModel.m delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloListModel.h delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloListModel.m delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/Presenter/XPSessionSayHelloPresenter.h delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/Presenter/XPSessionSayHelloPresenter.m delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/Protocol/XPSessionSayHelloProtocol.h delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.h delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.m delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.h delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.m delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.h delete mode 100644 YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Cell/AgentMessageTableViewCell.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Cell/AgentMessageTableViewCell.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Cell/PublicEventTableViewCell.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Cell/PublicEventTableViewCell.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentCustomView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentCustomView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentFindNewGreetView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentFindNewGreetView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentImage.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentImage.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentProtocol.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentRevokeView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentRevokeView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentRiskAlertView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentRiskAlertView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentText.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentText.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentUnSupportView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageContentUnSupportView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageGameOrderView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageGameOrderView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageTimeView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageTimeView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageTipsView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/MessageTipsView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/AgentMessageModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/AgentMessageModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageApplicationShareModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageApplicationShareModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageAudioModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageAudioModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageBaseModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageBaseModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageCPNotifyModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageCPNotifyModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageFindNewGreetModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageFindNewGreetModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGameOrderModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGameOrderModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGiftModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGiftModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGuildModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGuildModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageHeadlinesTextModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageHeadlinesTextModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageImageModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageImageModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageLevelUpgradeModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageLevelUpgradeModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsAutoModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsAutoModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageOpenLiveModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageOpenLiveModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessagePublicEventModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessagePublicEventModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRedPacketModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRedPacketModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRevokeModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRevokeModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageSkillCardModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageSkillCardModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextClickModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextClickModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTimeModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTimeModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTipsModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTipsModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTweetModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTweetModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageUnSupportModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageUnSupportModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/PIMessageContentServiceReplyModel.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/PIMessageContentServiceReplyModel.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/SessionRiskCache.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/SessionRiskCache.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/SessionViewController.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/SessionViewController.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/View/SessionAudioRecordView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/View/SessionAudioRecordView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/View/SessionNavView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/View/SessionNavView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.m delete mode 100644 YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.h delete mode 100644 YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m delete mode 100644 YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.h delete mode 100644 YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.m delete mode 100644 YuMi/Modules/YMMessage/View/SessionList/SessionListCell.h delete mode 100644 YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m delete mode 100644 YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.h delete mode 100644 YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.m delete mode 100644 YuMi/Modules/YMMessage/View/SessionListHeadView/Model/XPSessionListFansPartyModel.h delete mode 100644 YuMi/Modules/YMMessage/View/SessionListHeadView/Model/XPSessionListFansPartyModel.m delete mode 100644 YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.h delete mode 100644 YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.m delete mode 100644 YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.h delete mode 100644 YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.m delete mode 100644 YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItem.h delete mode 100644 YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItem.m delete mode 100644 YuMi/Modules/YMMine/Presenter/MedalsPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/MedalsPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineAttentionPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineAttentionPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineBlackListPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineBlackListPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineCollectRoomListPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineCollectRoomListPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineFansPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineFansPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineFansTeamPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineFansTeamPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineFeedbackPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineFeedbackPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineFootPrintPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineFootPrintPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineFriendPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineFriendPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineLoginPasswordPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineLoginPasswordPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineModifPayPwdPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineModifPayPwdPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineNotificaPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineNotificaPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMinePresent.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMinePresent.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineRechargePresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineRechargePresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineResetLoginPwdPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineResetLoginPwdPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineResetPayPasswordPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineResetPayPasswordPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineUserDataPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineUserDataPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineUserInfoGiftWallPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineUserInfoGiftWallPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineUserInfoPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineUserInfoPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineUserInfolbumPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineUserInfolbumPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineVerifIdentityPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineVerifIdentityPresenter.m delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineVisitorPresenter.h delete mode 100644 YuMi/Modules/YMMine/Presenter/XPMineVisitorPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/CPListViewController.h delete mode 100644 YuMi/Modules/YMMine/View/CPListViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineAlbumTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineAlbumTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGameMateTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGameMateTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGameMateOrderView.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGameMateOrderView.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGiftsTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGiftsTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGuildTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGuildTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMedalsTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMedalsTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMultipleContentTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMultipleContentTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTagView.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTagView.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPGameOrdersListTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPGameOrdersListTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMIneGameCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMIneGameCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineHeadFunctionItemLayout.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineHeadFunctionItemLayout.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineListCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineListCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineSwitchLanguageCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineSwitchLanguageCell.m delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineTheGuildCell.h delete mode 100644 YuMi/Modules/YMMine/View/Cell/XPMineTheGuildCell.m delete mode 100644 YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomCell.h delete mode 100644 YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomCell.m delete mode 100644 YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomEditCell.h delete mode 100644 YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomEditCell.m delete mode 100644 YuMi/Modules/YMMine/View/CollectRoom/XPMineCollectPartyRoomViewController.h delete mode 100644 YuMi/Modules/YMMine/View/CollectRoom/XPMineCollectPartyRoomViewController.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Model/CarModel.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Model/CarModel.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Model/ChatBubbleModel.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Model/ChatBubbleModel.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Model/HeadwearModel.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Model/HeadwearModel.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Model/NameplateModel.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Model/NameplateModel.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Model/NobleCardModel.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Model/NobleCardModel.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Presenter/XPDressUpShopPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Presenter/XPDressUpShopPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Protocol/XPDressUpShopProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/Protocol/XPMineDressUpProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineHeadwearTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineHeadwearTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNameplateTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNameplateTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/XPDressSearchViewController.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/XPDressSearchViewController.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopCardViewController.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopCardViewController.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopListViewController.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopListViewController.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpBubbleViewController.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpBubbleViewController.m delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpListViewController.h delete mode 100644 YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpListViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPMineAttentionViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPMineAttentionViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPMineFansViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPMineFansViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPMineFriendViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPMineFriendViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPRoomHalfMessageView.h delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPRoomHalfMessageView.m delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPRoomMessageBubbleView.h delete mode 100644 YuMi/Modules/YMMine/View/Friend/XPRoomMessageBubbleView.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/Api/Api+GiveDiamond.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/Api/Api+GiveDiamond.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondDetailsModel.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondDetailsModel.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondModel.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondModel.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondSearchModel.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondSearchModel.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/Presenter/XPMineGiveDiamondPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/Presenter/XPMineGiveDiamondPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/Protocol/XPMineGiveDiamondProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPIncomeRecordGoldDetailsCell.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPIncomeRecordGoldDetailsCell.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondCell.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondCell.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsCell.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsCell.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsView.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsView.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPasswordView.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPasswordView.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPwdView.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPwdView.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPPageControl.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPPageControl.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/RechargerTransferHistoryViewController.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/RechargerTransferHistoryViewController.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/SubRechargersViewController.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/SubRechargersViewController.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineChooseGiveDiamondVC.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineChooseGiveDiamondVC.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.m delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.h delete mode 100644 YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Api/Api+Guild.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Api/Api+Guild.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/ClanDetailInfoModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/ClanDetailInfoModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/ClanInfoModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/ClanInfoModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/ClanMemberDetailInfoModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/ClanMemberDetailInfoModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/GuildAuthModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/GuildAuthModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/GuildInfoModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/GuildInfoModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/GuildMessageModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/GuildMessageModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/GuildSearchUserInfoModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/GuildSearchUserInfoModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeDetailModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeDetailModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeRecordModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeRecordModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/Income/GuildPersonIncomeRecordModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/Income/GuildPersonIncomeRecordModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildRoomInfoModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildRoomInfoModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSearchSuperAdminModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSearchSuperAdminModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSuperAdminInfoModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSuperAdminInfoModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildListModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildListModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildPersonalBillRecordModel.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildPersonalBillRecordModel.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomeDetailPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomeDetailPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomePresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomePresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildManagerPerPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildManagerPerPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildMangerListPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildMangerListPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildRemoveMemberPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildRemoveMemberPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildSetNamePresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildSetNamePresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPMineManagerSetPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPMineManagerSetPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminManagerRoomPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminManagerRoomPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminSetPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminSetPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/XPClanPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/XPClanPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildSearchPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildSearchPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/XPMineGuildPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Presenter/XPMineGuildPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/Income/XPGuildIncomeDetailProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/Income/XPGuildIncomeProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildManagerListProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildManagerPerProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildRemoveMemberProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildSetManagerProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildSetNameProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/SuperAdmin/XPSuperAdminManagerRoomProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/SuperAdmin/XPSuperAdminSetProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/XPClanProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/XPGuildProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/XPGuildSearchProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/Protocol/XPMineGuildProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityFooderView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityFooderView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityHeadView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityHeadView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/GuildList/XPMineGuildListCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/GuildList/XPMineGuildListCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Income/PIGuildSingleRoomIncomeCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Income/PIGuildSingleRoomIncomeCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeDetailCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeDetailCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPNewMineHallIncomeCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPNewMineHallIncomeCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMaskManagerCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMaskManagerCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMineGuildManagerPerTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMineGuildManagerPerTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildChooseManagerRoomTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildChooseManagerRoomTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminRoomCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminRoomCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanRoomCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanRoomCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/XPGuildEmptyCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/XPGuildEmptyCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineClanIncomeStatisViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineClanIncomeStatisViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGoldIncomeRecordVC.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGoldIncomeRecordVC.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeDetailViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeDetailViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillRecordVC.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillRecordVC.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillStatisVC.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillStatisVC.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineHallAnchorIncomeStatisViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineHallAnchorIncomeStatisViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineMainIncomeStatisViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineMainIncomeStatisViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineGuildIncomeRecordViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineGuildIncomeRecordViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerPerViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerPerViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerSetViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerSetViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildRemoveMemberViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildRemoveMemberViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineMangerListViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineMangerListViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/PIGuildAnchorIncomeSectionView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/PIGuildAnchorIncomeSectionView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanMenuView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanMenuView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanSectionView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanSectionView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildAnchorIncomeSectionView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildAnchorIncomeSectionView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildHeaderView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildHeaderView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeHeaderView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeHeaderView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeSectionView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeSectionView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSuperAdminMenuView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSuperAdminMenuView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimeMonthPickerView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimeMonthPickerView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordContentView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordContentView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordHeadView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordHeadView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewMineGuildItemView.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewMineGuildItemView.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildChooseManagerViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildChooseManagerViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildSuperAdminSetViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildSuperAdminSetViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/XPMineExchangeAuthorityVC.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/XPMineExchangeAuthorityVC.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/XPMineMainGuildListVC.h delete mode 100644 YuMi/Modules/YMMine/View/Guild/View/XPMineMainGuildListVC.m delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.m delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/Protocol/XPIncomeRecordProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.m delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomCell.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomCell.m delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomView.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomView.m delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsTimeView.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsTimeView.m delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsVC.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsVC.m delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsView.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsView.m delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPTextField.h delete mode 100644 YuMi/Modules/YMMine/View/IncomeRecord/XPTextField.m delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsCyclePagerCell.h delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsCyclePagerCell.m delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsDetailView.h delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsDetailView.m delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsLevelIndicatorView.h delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsLevelIndicatorView.m delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsRankViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsRankViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsWearingControlCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsWearingControlCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsWearingListCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsWearingListCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsWearingViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Medals/MedalsWearingViewController.m delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.h delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.m delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.h delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoAlbumViewController.h delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoAlbumViewController.m delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.h delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.m delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.h delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.m delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallSubViewController.h delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallSubViewController.m delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.h delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.m delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.h delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.m delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.h delete mode 100644 YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/NobleAuthInfo.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/NobleAuthInfo.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/NobleCenterModel.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/NobleCenterModel.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/NobleLevelUpModel.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/NobleLevelUpModel.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/NobleRechargeModel.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/NobleRechargeModel.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/PINobleCenterListModel.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/PINobleCenterListModel.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/PINobleRebateModel.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/Model/PINobleRebateModel.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/Protocol/XPNobleCenterProtocol.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListReusableView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListReusableView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/PINoblePrivilegeEmptyCell.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/PINoblePrivilegeEmptyCell.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPMineCenterAgencyView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPMineCenterAgencyView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEmptyView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEmptyView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterNavView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterNavView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayCell.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayCell.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterResidueView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterResidueView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterWindow.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterWindow.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeCell.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeCell.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeContentCell.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeContentCell.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleSettingNavView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleSettingNavView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/XPNobleSettingViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Noble/View/XPNobleSettingViewController.m delete mode 100644 YuMi/Modules/YMMine/View/PISwitchingEnvironmentVC.h delete mode 100644 YuMi/Modules/YMMine/View/PISwitchingEnvironmentVC.m delete mode 100644 YuMi/Modules/YMMine/View/Recharge/IAPManager.h delete mode 100644 YuMi/Modules/YMMine/View/Recharge/IAPManager.m delete mode 100644 YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeadCell.h delete mode 100644 YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeadCell.m delete mode 100644 YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeaderView.h delete mode 100644 YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeaderView.m delete mode 100644 YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMaskManagerVC.h delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMaskManagerVC.m delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineBlackListViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineBlackListViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineModifPayPwdViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineModifPayPwdViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMinePayPwdViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMinePayPwdViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.h delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.h delete mode 100644 YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/CPBindingAnimation.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/CPBindingAnimation.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/CPCard.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/CPCard.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/CPEnterRoomTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/CPEnterRoomTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/CPLevelUpAnimation.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/CPLevelUpAnimation.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/CPRelationshipChangeView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/CPRelationshipChangeView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPBeautIDView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPBeautIDView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoGiftView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoGiftView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagCell.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagCell.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoIndividualTagView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoIndividualTagView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoNavView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoNavView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagEmptyView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagEmptyView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagFlowLayout.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagFlowLayout.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagHeadView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagHeadView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagItemView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagItemView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoVoiceCardView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoVoiceCardView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserViewHeader.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserViewHeader.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechageHeadView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechageHeadView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechargeNavView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechargeNavView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/SuperBlockViewController.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/SuperBlockViewController.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPFootPrintNavView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPFootPrintNavView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineDataSkillDataCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineDataSkillDataCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineModifPayPwdView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineModifPayPwdView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineNewUserRechargeView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineNewUserRechargeView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineUserInfoRecordedSoundView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineUserInfoRecordedSoundView.m delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.h delete mode 100644 YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.m delete mode 100644 YuMi/Modules/YMMine/View/VipSettingViewController.h delete mode 100644 YuMi/Modules/YMMine/View/VipSettingViewController.m delete mode 100644 YuMi/Modules/YMMine/View/VisitorListViewController.h delete mode 100644 YuMi/Modules/YMMine/View/VisitorListViewController.m delete mode 100644 YuMi/Modules/YMMine/View/XPButton.h delete mode 100644 YuMi/Modules/YMMine/View/XPButton.m delete mode 100644 YuMi/Modules/YMMine/View/XPGameOrdersListViewController.h delete mode 100644 YuMi/Modules/YMMine/View/XPGameOrdersListViewController.m delete mode 100644 YuMi/Modules/YMMine/View/XPGiftUserDataViewController.h delete mode 100644 YuMi/Modules/YMMine/View/XPGiftUserDataViewController.m delete mode 100644 YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.h delete mode 100644 YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m delete mode 100644 YuMi/Modules/YMMine/View/XPMineFansTeamViewController.h delete mode 100644 YuMi/Modules/YMMine/View/XPMineFansTeamViewController.m delete mode 100644 YuMi/Modules/YMMine/View/XPMineFootPrintViewController.h delete mode 100644 YuMi/Modules/YMMine/View/XPMineFootPrintViewController.m delete mode 100644 YuMi/Modules/YMMine/View/XPMineItemTableViewCell.h delete mode 100644 YuMi/Modules/YMMine/View/XPMineItemTableViewCell.m delete mode 100644 YuMi/Modules/YMMine/View/XPMineUserInfoTagVC.h delete mode 100644 YuMi/Modules/YMMine/View/XPMineUserInfoTagVC.m delete mode 100644 YuMi/Modules/YMMine/View/XPMineViewController.h delete mode 100644 YuMi/Modules/YMMine/View/XPMineViewController.m delete mode 100644 YuMi/Modules/YMMine/View/XPMineVisitorViewController.h delete mode 100644 YuMi/Modules/YMMine/View/XPMineVisitorViewController.m delete mode 100644 YuMi/Modules/YMMine/View/XPMomentUserDataViewController.h delete mode 100644 YuMi/Modules/YMMine/View/XPMomentUserDataViewController.m delete mode 100644 YuMi/Modules/YMMine/View/XPPermissionsViewController.h delete mode 100644 YuMi/Modules/YMMine/View/XPPermissionsViewController.m delete mode 100644 YuMi/Modules/YMMine/View/XPPrivacyViewController.h delete mode 100644 YuMi/Modules/YMMine/View/XPPrivacyViewController.m delete mode 100644 YuMi/Modules/YMMine/View/XPSimpleMineHeaderView.h delete mode 100644 YuMi/Modules/YMMine/View/XPSimpleMineHeaderView.m delete mode 100644 YuMi/Modules/YMMonents/Model/MomentsTopicModel.h delete mode 100644 YuMi/Modules/YMMonents/Model/MomentsTopicModel.m delete mode 100644 YuMi/Modules/YMMonents/Model/MonentsCommentModel.h delete mode 100644 YuMi/Modules/YMMonents/Model/MonentsCommentModel.m delete mode 100644 YuMi/Modules/YMMonents/Model/MonentsCommentReplyModel.h delete mode 100644 YuMi/Modules/YMMonents/Model/MonentsCommentReplyModel.m delete mode 100644 YuMi/Modules/YMMonents/Model/MonentsInteractiveModel.h delete mode 100644 YuMi/Modules/YMMonents/Model/MonentsInteractiveModel.m delete mode 100644 YuMi/Modules/YMMonents/Model/MonentsPicResInfo.h delete mode 100644 YuMi/Modules/YMMonents/Model/MonentsPicResInfo.m delete mode 100644 YuMi/Modules/YMMonents/Model/MonentsUnReadModel.h delete mode 100644 YuMi/Modules/YMMonents/Model/MonentsUnReadModel.m delete mode 100644 YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.h delete mode 100644 YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.m delete mode 100644 YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.h delete mode 100644 YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.m delete mode 100644 YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.h delete mode 100644 YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.m delete mode 100644 YuMi/Modules/YMMonents/Presenter/XPMonentDetailPresenter.h delete mode 100644 YuMi/Modules/YMMonents/Presenter/XPMonentDetailPresenter.m delete mode 100644 YuMi/Modules/YMMonents/Presenter/XPMonentsInteractivePresenter.h delete mode 100644 YuMi/Modules/YMMonents/Presenter/XPMonentsInteractivePresenter.m delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.h delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.m delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.h delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.m delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsInteractiveTableViewCell.h delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsInteractiveTableViewCell.m delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsPublishCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsPublishCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.h delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.m delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.h delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.m delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.h delete mode 100644 YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.m delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.m delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.m delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.m delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.m delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.m delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.m delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.m delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.m delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.m delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.h delete mode 100644 YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsAttentionViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsAttentionViewController.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsLatestViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsLatestViewController.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsMineViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsMineViewController.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMomentsViewController.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.m delete mode 100644 YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.h delete mode 100644 YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.m delete mode 100644 YuMi/Modules/YMNewHome/Api/Api+EventCenter.h delete mode 100644 YuMi/Modules/YMNewHome/Api/Api+EventCenter.m delete mode 100644 YuMi/Modules/YMNewHome/Api/Api+Home.h delete mode 100644 YuMi/Modules/YMNewHome/Api/Api+Home.m delete mode 100644 YuMi/Modules/YMNewHome/Model/EventConfigModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/EventConfigModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/EventItemModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/EventItemModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/EventRoomModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/EventRoomModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/FirstRechargeModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/FirstRechargeModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeBannerInfoModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeBannerInfoModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeCollectRoomModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeCollectRoomModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeLittleGameRoomModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeLittleGameRoomModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeMenuInfoModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeMenuInfoModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeMenuSourceModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeMenuSourceModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeMineRoomModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeMineRoomModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeRankAvatarModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeRankAvatarModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeRecommendRoomModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeRecommendRoomModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeTagModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/HomeTagModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/PIHomeItemModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/PIHomeItemModel.m delete mode 100644 YuMi/Modules/YMNewHome/Model/XPBlankRoomModel.h delete mode 100644 YuMi/Modules/YMNewHome/Model/XPBlankRoomModel.m delete mode 100644 YuMi/Modules/YMNewHome/Presenter/CreateEventPresenter.h delete mode 100644 YuMi/Modules/YMNewHome/Presenter/CreateEventPresenter.m delete mode 100644 YuMi/Modules/YMNewHome/Presenter/EventCenterPresenter.h delete mode 100644 YuMi/Modules/YMNewHome/Presenter/EventCenterPresenter.m delete mode 100644 YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.h delete mode 100644 YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m delete mode 100644 YuMi/Modules/YMNewHome/Presenter/XPHomeMinePresenter.h delete mode 100644 YuMi/Modules/YMNewHome/Presenter/XPHomeMinePresenter.m delete mode 100644 YuMi/Modules/YMNewHome/Presenter/XPHomePresenter.h delete mode 100644 YuMi/Modules/YMNewHome/Presenter/XPHomePresenter.m delete mode 100644 YuMi/Modules/YMNewHome/Presenter/XPNewHomeRecommendPresenter.h delete mode 100644 YuMi/Modules/YMNewHome/Presenter/XPNewHomeRecommendPresenter.m delete mode 100644 YuMi/Modules/YMNewHome/Protocol/XPHomeContainerProtocol.h delete mode 100644 YuMi/Modules/YMNewHome/Protocol/XPHomeMineProtocol.h delete mode 100644 YuMi/Modules/YMNewHome/Protocol/XPHomeProtocol.h delete mode 100644 YuMi/Modules/YMNewHome/Protocol/XPHomeRecommendProtocol.h delete mode 100644 YuMi/Modules/YMNewHome/Protocol/XPNewHomeRecommendProtocol.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/EventCenterEmptyCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/EventCenterEmptyCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/EventCenterEventCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/EventCenterEventCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/EventCenterOfficialCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/EventCenterOfficialCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPHomeGameCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPHomeGameCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyAudioView.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyAudioView.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTagView.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTagView.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayTableViewCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayTableViewCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomeRecommendTableViewCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPNewHomeRecommendTableViewCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPPartyRoomItemCollectionViewCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Cell/XPPartyRoomItemCollectionViewCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/CreateEventPickerContainerView.h delete mode 100644 YuMi/Modules/YMNewHome/View/CreateEventPickerContainerView.m delete mode 100644 YuMi/Modules/YMNewHome/View/CreateEventSelectRoomViewController.h delete mode 100644 YuMi/Modules/YMNewHome/View/CreateEventSelectRoomViewController.m delete mode 100644 YuMi/Modules/YMNewHome/View/CreateEventViewControllerV2.h delete mode 100644 YuMi/Modules/YMNewHome/View/CreateEventViewControllerV2.m delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.h delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.m delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPHomeGameView.h delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPHomeGameView.m delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPHomeRecommendOtherRoomView.h delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPHomeRecommendOtherRoomView.m delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPHomeUserView.h delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPHomeUserView.m delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.h delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.h delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.m delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPNoteView.h delete mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPNoteView.m delete mode 100644 YuMi/Modules/YMNewHome/View/EventCenterViewController.h delete mode 100644 YuMi/Modules/YMNewHome/View/EventCenterViewController.m delete mode 100644 YuMi/Modules/YMNewHome/View/MyEventsViewController.h delete mode 100644 YuMi/Modules/YMNewHome/View/MyEventsViewController.m delete mode 100644 YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.h delete mode 100644 YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.m delete mode 100644 YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.h delete mode 100644 YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/Model/HomeEveryOneSearchModel.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/Model/HomeEveryOneSearchModel.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/Model/HomeLiveRoomModel.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/Model/HomeLiveRoomModel.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/Presenter/XPHomeSearchPresenter.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/Presenter/XPHomeSearchPresenter.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/Presenter/XPInRoomRecordPresenter.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/Presenter/XPInRoomRecordPresenter.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/Protocol/XPHomeSearchProtocol.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/Protocol/XPInRoomRecordProtocol.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeAttentionCollectionViewCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeAttentionCollectionViewCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeCollectRoomTableViewCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeCollectRoomTableViewCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeRedommendCollectionViewCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeRedommendCollectionViewCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeSearchRecordCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeSearchRecordCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchRelateView.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchRelateView.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/XPHomeSearchViewController.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/XPHomeSearchViewController.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.h delete mode 100644 YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m delete mode 100644 YuMi/Modules/YMNewHome/View/XPHomeMineViewController.h delete mode 100644 YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m delete mode 100644 YuMi/Modules/YMNewHome/View/XPHomePagingViewController.h delete mode 100644 YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m delete mode 100644 YuMi/Modules/YMNewHome/View/XPHomePartyViewController.h delete mode 100644 YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m delete mode 100644 YuMi/Modules/YMNewHome/View/XPNewHomeViewController.h delete mode 100644 YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m delete mode 100644 YuMi/Modules/YMRTC/RtcDelegate.h delete mode 100644 YuMi/Modules/YMRTC/RtcImpl/BaseRtcImpl.h delete mode 100644 YuMi/Modules/YMRTC/RtcImpl/BaseRtcImpl.m delete mode 100644 YuMi/Modules/YMRTC/RtcImpl/RtcImplDelegate.h delete mode 100644 YuMi/Modules/YMRTC/RtcImpl/RtcInterface.h delete mode 100644 YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.h delete mode 100644 YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m delete mode 100644 YuMi/Modules/YMRTC/RtcManager.h delete mode 100644 YuMi/Modules/YMRTC/RtcManager.m delete mode 100644 YuMi/Modules/YMRoom/Api/Api+Boom.h delete mode 100644 YuMi/Modules/YMRoom/Api/Api+Boom.m delete mode 100644 YuMi/Modules/YMRoom/Api/Api+CustomBackground.h delete mode 100644 YuMi/Modules/YMRoom/Api/Api+CustomBackground.m delete mode 100644 YuMi/Modules/YMRoom/Api/Api+LuckyPackage.h delete mode 100644 YuMi/Modules/YMRoom/Api/Api+LuckyPackage.m delete mode 100644 YuMi/Modules/YMRoom/Api/Api+Room.h delete mode 100644 YuMi/Modules/YMRoom/Api/Api+Room.m delete mode 100644 YuMi/Modules/YMRoom/Api/Api+SuperAdmin.h delete mode 100644 YuMi/Modules/YMRoom/Api/Api+SuperAdmin.m delete mode 100644 YuMi/Modules/YMRoom/Features/Boom/BoomInfoViewController.h delete mode 100644 YuMi/Modules/YMRoom/Features/Boom/BoomInfoViewController.m delete mode 100644 YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.h delete mode 100644 YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.m delete mode 100644 YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.h delete mode 100644 YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.m delete mode 100644 YuMi/Modules/YMRoom/Features/Boom/RoomBoomExplosionView.h delete mode 100644 YuMi/Modules/YMRoom/Features/Boom/RoomBoomExplosionView.m delete mode 100644 YuMi/Modules/YMRoom/Features/Boom/RoomBoomManager.h delete mode 100644 YuMi/Modules/YMRoom/Features/Boom/RoomBoomManager.m delete mode 100644 YuMi/Modules/YMRoom/Features/Boom/RoomBoomResultView.h delete mode 100644 YuMi/Modules/YMRoom/Features/Boom/RoomBoomResultView.m delete mode 100644 YuMi/Modules/YMRoom/Manager/GameBannerGestureManager.h delete mode 100644 YuMi/Modules/YMRoom/Manager/GameBannerGestureManager.m delete mode 100644 YuMi/Modules/YMRoom/Manager/PublicRoomManager.h delete mode 100644 YuMi/Modules/YMRoom/Manager/PublicRoomManager.m delete mode 100644 YuMi/Modules/YMRoom/Model/ActivityInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/ActivityInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/Model/BoomInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/BoomInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/Model/BravoGiftTabInfomationModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/BravoGiftTabInfomationModel.m delete mode 100644 YuMi/Modules/YMRoom/Model/BravoGiftTipModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/BravoGiftTipModel.m delete mode 100644 YuMi/Modules/YMRoom/Model/CustomRoomBGItemModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/CustomRoomBGItemModel.m delete mode 100644 YuMi/Modules/YMRoom/Model/DatingInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/DatingInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/Model/MicCpInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/MicCpInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/Model/RoomBottomEntranceModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/RoomBottomEntranceModel.m delete mode 100644 YuMi/Modules/YMRoom/Model/RoomEnterModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/RoomEnterModel.m delete mode 100644 YuMi/Modules/YMRoom/Model/RoomInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/RoomInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/Model/RoomLevelInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/RoomLevelInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/Model/RoomLuckyPackageInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/RoomLuckyPackageInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/Model/RoomNewUserGreetModel.h delete mode 100644 YuMi/Modules/YMRoom/Model/RoomNewUserGreetModel.m delete mode 100644 YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.h delete mode 100644 YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m delete mode 100644 YuMi/Modules/YMRoom/Protocol/XPRoomProtocol.h delete mode 100644 YuMi/Modules/YMRoom/RoomResourceManager.h delete mode 100644 YuMi/Modules/YMRoom/RoomResourceManager.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/Api/Api+AcrossRoomPK.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/Api/Api+AcrossRoomPK.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPanelModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPanelModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPrizeModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPrizeModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/Presenter/XPAcrossRoomPKPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/Presenter/XPAcrossRoomPKPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/Protocol/XPAcrossRoomProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKCountDownView.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKCountDownView.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteResultView.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteResultView.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelUserView.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelUserView.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPrizeView.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPrizeView.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAnchorPKMatchView.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAnchorPKMatchView.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.m delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayCell.h delete mode 100644 YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayCell.m delete mode 100644 YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayView.h delete mode 100644 YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayView.m delete mode 100644 YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityClickView.h delete mode 100644 YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityClickView.m delete mode 100644 YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.h delete mode 100644 YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.m delete mode 100644 YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebView.h delete mode 100644 YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebView.m delete mode 100644 YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.h delete mode 100644 YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomScrollView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomScrollView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/Api/Api+AnchorPk.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/Api/Api+AnchorPk.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/Presenter/XPAnchorPKPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/Presenter/XPAnchorPKPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/Protocol/XPAnchorPKProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKFinishView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKFinishView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKPanelUserView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKPanelUserView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKRuleView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKRuleView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Api/Api+FansTeam.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Api/Api+FansTeam.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansJoinModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansJoinModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansPrivilegeModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansPrivilegeModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansRelationModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansRelationModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskDetailModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskDetailModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Presenter/XPAnchorFansTeamPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Presenter/XPAnchorFansTeamPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Protocol/XPAnchorFansTeamProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/Model/XPAnchorAttentSendInfo.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/Model/XPAnchorAttentSendInfo.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/BannerScheduler.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/BannerScheduler.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/BravoGiftWinningFlagView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/BravoGiftWinningFlagView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/GestureOptimizer.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/GestureOptimizer.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationHelper.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationHelper.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationManager.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationManager.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningFlagView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningFlagView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/Model/PIBaseAnimationViewModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/Model/PIBaseAnimationViewModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/Model/PIUniversalBannerModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/Model/PIUniversalBannerModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/Model/RoomHalfHourRankModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/Model/RoomHalfHourRankModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBannerUserInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBannerUserInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBigPrizeModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBigPrizeModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftCompoundModel.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftCompoundModel.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/RoomHighValueGiftBannerAnimation.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/RoomHighValueGiftBannerAnimation.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/TouchAreaCacheManager.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/TouchAreaCacheManager.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnchorRankBannerView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnchorRankBannerView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationHitView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationHitView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomCandyGiftView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomCandyGiftView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftAnimationParser.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftAnimationParser.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftCompoundView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftCompoundView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomGraffitiGiftAnimationView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomGraffitiGiftAnimationView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.h delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.m delete mode 100644 YuMi/Modules/YMRoom/View/AnimationView/addMoveAnimationToView.m delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/Api/Api+ArrangeMic.h delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/Api/Api+ArrangeMic.m delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/Model/ArrangeMicModel.h delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/Model/ArrangeMicModel.m delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/Model/XPArrangeMicInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/Model/XPArrangeMicInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/Presenter/XPArrangeMicPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/Presenter/XPArrangeMicPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/Protocol/XPArrangeMicProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataClass.h delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataClass.m delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataProperties.h delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataProperties.m delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/Presenter/XPCoreDataManager.h delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/Presenter/XPCoreDataManager.m delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/Presenter/YuMi.xcdatamodeld/xplan-ios.xcdatamodel/contents delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.h delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.m delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.h delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.h delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.m delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.h delete mode 100644 YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m delete mode 100644 YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomBackContainerView.h delete mode 100644 YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomBackContainerView.m delete mode 100644 YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.h delete mode 100644 YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.m delete mode 100644 YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingWebAlertView.h delete mode 100644 YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingWebAlertView.m delete mode 100644 YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.h delete mode 100644 YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m delete mode 100644 YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.h delete mode 100644 YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Api/Api+CandyTree.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Api/Api+CandyTree.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeRecordModel.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeRecordModel.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeResultModel.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeResultModel.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Model/PICandyTreeSetModel.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Model/PICandyTreeSetModel.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Model/XPCandyTreeAnimationModel.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Model/XPCandyTreeAnimationModel.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Presenter/XPCandyTreePresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Presenter/XPCandyTreePresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/Protocol/XPCandyTreeProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeEmptyableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeEmptyableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeMoreRuleCell.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeMoreRuleCell.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeRankTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeRankTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyRankContainerView.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyRankContainerView.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeGiftView.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeGiftView.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeInsufficientBalanceView.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeInsufficientBalanceView.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeMoreView.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeMoreView.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeRankView.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeRankView.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPRoomHalfWebView.h delete mode 100644 YuMi/Modules/YMRoom/View/CandyTree/View/XPRoomHalfWebView.m delete mode 100644 YuMi/Modules/YMRoom/View/Common/BaseRoomBannerView.h delete mode 100644 YuMi/Modules/YMRoom/View/Common/BaseRoomBannerView.m delete mode 100644 YuMi/Modules/YMRoom/View/Common/BravoGiftBannerView.h delete mode 100644 YuMi/Modules/YMRoom/View/Common/BravoGiftBannerView.m delete mode 100644 YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGCell.h delete mode 100644 YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGCell.m delete mode 100644 YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGContentViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGContentViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Model/ChatFaceVo.h delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Model/ChatFaceVo.m delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceSendInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceSendInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceTitleItemModel.h delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceTitleItemModel.m delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFacePresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFacePresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFaceTool.h delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFaceTool.m delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/Protocol/XPRoomFaceProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionFlowLayout.h delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionFlowLayout.m delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceTitleCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceTitleCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/FirstRecharge/Api/Api+FirstRecharge.h delete mode 100644 YuMi/Modules/YMRoom/View/FirstRecharge/Api/Api+FirstRecharge.m delete mode 100644 YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.h delete mode 100644 YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Api/Api+LittleGame.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Api/Api+LittleGame.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSData+RW.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSData+RW.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSString+RW.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSString+RW.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIColor+RW.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIColor+RW.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIImage+RW.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIImage+RW.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Presenter/SudCommon.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Presenter/SudCommon.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/Presenter/SudGameConfig.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPCreateLittleGameCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPCreateLittleGameCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPLittleGameTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPLittleGameTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameMiniStageView.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameMiniStageView.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.m delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.h delete mode 100644 YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageBannerView.h delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageBannerView.m delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageLogicManager.h delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageLogicManager.m delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageMessageTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageMessageTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackagePresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackagePresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageStatusView.h delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageStatusView.m delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/OpenLuckyPackageEntranceView.h delete mode 100644 YuMi/Modules/YMRoom/View/LuckyPackage/OpenLuckyPackageEntranceView.m delete mode 100644 YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineAvatarView.h delete mode 100644 YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineAvatarView.m delete mode 100644 YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineView.h delete mode 100644 YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineView.m delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.h delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.m delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameEmptyCell.h delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameEmptyCell.m delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.h delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.m delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameView.h delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameView.m delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/Model/XPRoomMenuItem.h delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/Model/XPRoomMenuItem.m delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/RoomMenuBar.h delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/RoomMenuBar.m delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.h delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.h delete mode 100644 YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Model/PIGeneralPublicScreenModel.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Model/PIGeneralPublicScreenModel.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageDataSourceManager.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageDataSourceManager.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageItem.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageItem.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessageMainView.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessageMainView.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageConstant.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumView.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumView.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessageUnlockPhotoAlbumView.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessageUnlockPhotoAlbumView.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/RoomCahtCell.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/RoomCahtCell.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/XPNetImageYYLabel.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/XPNetImageYYLabel.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.h delete mode 100644 YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m delete mode 100644 YuMi/Modules/YMRoom/View/MicroQueueProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPPKAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPPKAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomAppManagerAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomAppManagerAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomBackGroundSettingAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomBackGroundSettingAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomCleanMessagesAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomCleanMessagesAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomEffectAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomEffectAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomMusicPanelAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomMusicPanelAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRedPacketAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRedPacketAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRoomPhotoAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRoomPhotoAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomSettingAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomSettingAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomTypeSettingAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomTypeSettingAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPSocialAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPSocialAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPTurboModeAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Action/XPTurboModeAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Factory/XPRoomMoreMenuActionFactory.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Factory/XPRoomMoreMenuActionFactory.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Manager/TurboModeStateManager.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Manager/TurboModeStateManager.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Manager/XPTurboModeTipsManager.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Manager/XPTurboModeTipsManager.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Model/InviteFansModel.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Model/InviteFansModel.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreItemModel.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreItemModel.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuAction.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuAction.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuActionContext.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuActionContext.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/Protocol/XPMoreMenuProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/View/AppOfficalManagerActionsViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/View/AppOfficalManagerActionsViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/View/XPEffectPanelViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/View/XPEffectPanelViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/View/XPRoomInviteFansView.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/View/XPRoomInviteFansView.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/View/XPTurboModeTipsView.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/View/XPTurboModeTipsView.m delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/XPTurboModeConstants.h delete mode 100644 YuMi/Modules/YMRoom/View/MoreView/XPTurboModeConstants.m delete mode 100644 YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.h delete mode 100644 YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.m delete mode 100644 YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.h delete mode 100644 YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.m delete mode 100644 YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.h delete mode 100644 YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.m delete mode 100644 YuMi/Modules/YMRoom/View/NobleTrumpet/Model/XPNobleTrumpetModel.h delete mode 100644 YuMi/Modules/YMRoom/View/NobleTrumpet/Model/XPNobleTrumpetModel.m delete mode 100644 YuMi/Modules/YMRoom/View/NobleTrumpet/Presenter/XPTrumpetPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/NobleTrumpet/Presenter/XPTrumpetPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/NobleTrumpet/Protocol/XPRoomTrumpetProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.h delete mode 100644 YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.m delete mode 100644 YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.h delete mode 100644 YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m delete mode 100644 YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuidkMessageCell.h delete mode 100644 YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuidkMessageCell.m delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/Api/Api+RoomRadio.h delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/Api/Api+RoomRadio.m delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/Model/XPReleaseRadioModel.h delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/Model/XPReleaseRadioModel.m delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/Presenter/XPReleaseRadioPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/Presenter/XPReleaseRadioPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/Protocol/XPReleaseRadioProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/View/Cell/XPReleaseRadioTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/View/Cell/XPReleaseRadioTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioView.h delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioView.m delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomAnimationProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameResultsModel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameResultsModel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Model/MSTabbarRoomGameModel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Model/MSTabbarRoomGameModel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Protocol/MSRoomGameProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSRoomGameVictoryCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSRoomGameVictoryCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSTabbarRoomGameCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSTabbarRoomGameCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/LudoGameViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/LudoGameViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendMsgView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendMsgView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameVictoryView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameVictoryView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarBeginGameView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarBeginGameView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameHeadView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameHeadView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomGuestDelegate.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomHostDelegate.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomMode/RoomModePresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomMode/RoomModePresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Api/Api+RoomPK.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Api/Api+RoomPK.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKChooseUserModel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKChooseUserModel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKDetailInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKDetailInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKRecordModel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKRecordModel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTeamModel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTeamModel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTimeItemModel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTimeItemModel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKRecordPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKRecordPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Protocol/XPRoomPKProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/Protocol/XPRoomPKRecordProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTimeTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTimeTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKUserCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKUserCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKVoteTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKVoteTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPaneAvatarView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPaneAvatarView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPanelUserView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPanelUserView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKUserView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKUserView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKRecordViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKRecordViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Api/Api+PhotoAlbum.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Api/Api+PhotoAlbum.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemChoosePhotoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemChoosePhotoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemModel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemModel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Presenter/PIRoomPhotoAlbumItemPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Presenter/PIRoomPhotoAlbumItemPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Protocol/PIRoomPhotoAlbumItemProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChooseGiftCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChooseGiftCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChoosePhotoCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChoosePhotoCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumItemCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumItemCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumOperateCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumOperateCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumItemVC.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumItemVC.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChooseGiftView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChooseGiftView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoGiftView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoGiftView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoTypeView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoTypeView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumOperateView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumOperateView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomRecommend/Model/XPRoomRecommendModel.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomRecommend/Model/XPRoomRecommendModel.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideOperationCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideOperationCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m delete mode 100644 YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.h delete mode 100644 YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Api/Api+Sailing.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Api/Api+Sailing.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeListModel.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeListModel.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeModel.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeModel.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingRankModel.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingRankModel.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Presenter/Protocol/XPSailingProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Presenter/XPSailingPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/Presenter/XPSailingPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingPrizeCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingPrizeCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingRankTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingRankTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingGiftView.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingGiftView.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingPrizeView.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingPrizeView.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankSubView.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankSubView.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.m delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Api/Api+Gift.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Api/Api+Gift.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/GiftComboConfig.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/GiftComboConfig.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/GiftComboTransport.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/GiftComboTransport.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/GiftComboUIAdapter.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/GiftComboUIAdapter.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftLuckyBroadcastModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftLuckyBroadcastModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftTwelveStarFirstModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftTwelveStarFirstModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftValueInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftValueInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/XPFreeGiftModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/XPFreeGiftModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftCountModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftCountModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftUserInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftUserInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/XPWeekStarRankUserModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/XPWeekStarRankUserModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/i18nGiftNameMap.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Model/i18nGiftNameMap.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftStorage.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftStorage.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/Protocol/XPGiftProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/ThemeColor+SendGift.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/ThemeColor+SendGift.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCollectionViewFlowLayout.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCollectionViewFlowLayout.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftEmptyCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftEmptyCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftFreeItemCell.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftFreeItemCell.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftUserCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftUserCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/CountdownRingView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/CountdownRingView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboFlagView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboFlagView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftBravoGiftBroadcastView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftBravoGiftBroadcastView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftSuperGiftBroadcastView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftSuperGiftBroadcastView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftCountView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftCountView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGraffitiGiftView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPGraffitiGiftView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Api/Api+RedPacket.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Api/Api+RedPacket.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputEntireServerScrollingView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputEntireServerScrollingView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputScrollingView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputScrollingView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Cell/XPOpenRedPacketCell.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Cell/XPOpenRedPacketCell.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPOpenRedPacketModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPOpenRedPacketModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPReceiveRedPacketModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPReceiveRedPacketModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketResultModel.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketResultModel.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/PIReceiveRedPacketSuccessView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/PIReceiveRedPacketSuccessView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomEnterRedPacketView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomEnterRedPacketView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Presenter/XPRoomRedPacketPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Presenter/XPRoomRedPacketPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/Protocol/XPRoomRedPacketProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.m delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Api/Api+RoomSetting.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Api/Api+RoomSetting.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Model/RoomClassifyModel.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Model/RoomClassifyModel.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Model/RoomTagModel.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Model/RoomTagModel.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Model/XPRoomSettingItemModel.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Model/XPRoomSettingItemModel.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTagPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTagPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTopicPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTopicPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Protocol/XPRoomSettingProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Protocol/XPRoomTagProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/Protocol/XPRoomTopicProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleEmptyTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleEmptyTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTagCell.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTagCell.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomInviteUserViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomInviteUserViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomRoleViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomRoleViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListView.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListView.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.m delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/AnchorPKStageView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/AnchorPKStageView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/AnchorStageView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/AnchorStageView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/DatingStageView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/DatingStageView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/FifteenMicStageView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/FifteenMicStageView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/LittleGameStageView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/LittleGameStageView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicMidpointRectManager.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicMidpointRectManager.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/ArabMicroView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/ArabMicroView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/DatingMicroView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/DatingMicroView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/MicroDatingProgressView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/MicroDatingProgressView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/LittleGame/LittleGameMicroView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/LittleGame/LittleGameMicroView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/MicroNobleWaveView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/MicroNobleWaveView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/MicroViewProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/MicroWaveView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/MicroWaveView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/Model/MicroExtModel.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/Model/MicroExtModel.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/Model/MicroInviteExtModel.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/Model/MicroInviteExtModel.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/Model/MicroQueueModel.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/Model/MicroQueueModel.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/Model/MicroStateModel.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/Model/MicroStateModel.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/NineteenMicStageView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/NineteenMicStageView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/SocialStageView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/SocialStageView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/StageView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/StageView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/TenMicStageView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/TenMicStageView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageView/TwentyMicStageView.h delete mode 100644 YuMi/Modules/YMRoom/View/StageView/TwentyMicStageView.m delete mode 100644 YuMi/Modules/YMRoom/View/StageViewManager.h delete mode 100644 YuMi/Modules/YMRoom/View/StageViewManager.m delete mode 100644 YuMi/Modules/YMRoom/View/TaskTip/XPTaskCompleteTipView.h delete mode 100644 YuMi/Modules/YMRoom/View/TaskTip/XPTaskCompleteTipView.m delete mode 100644 YuMi/Modules/YMRoom/View/ThemeColor+Room.h delete mode 100644 YuMi/Modules/YMRoom/View/ThemeColor+Room.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/Protocol/XPUserCardProtocol.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/Custom19MicLayout.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/Custom19MicLayout.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/Custom9MicLayout.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/Custom9MicLayout.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionCell.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionCell.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionView.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionView.m delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/XPMiniRoomView.h delete mode 100644 YuMi/Modules/YMRoom/View/XPMiniRoomView.m delete mode 100644 YuMi/Modules/YMRoom/View/XPRoomMiniManager.h delete mode 100644 YuMi/Modules/YMRoom/View/XPRoomMiniManager.m delete mode 100644 YuMi/Modules/YMRoom/View/XPRoomTypeSelectionViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/XPRoomTypeSelectionViewController.m delete mode 100644 YuMi/Modules/YMRoom/View/XPRoomViewController.h delete mode 100644 YuMi/Modules/YMRoom/View/XPRoomViewController.m delete mode 100644 YuMi/Modules/YMTabbar/Model/InviteUserInfoModel.h delete mode 100644 YuMi/Modules/YMTabbar/Model/InviteUserInfoModel.m delete mode 100644 YuMi/Modules/YMTabbar/Model/MineSkillCardListInfoModel.h delete mode 100644 YuMi/Modules/YMTabbar/Model/MineSkillCardListInfoModel.m delete mode 100644 YuMi/Modules/YMTabbar/Model/NewUserGreetModel.h delete mode 100644 YuMi/Modules/YMTabbar/Model/NewUserGreetModel.m delete mode 100644 YuMi/Modules/YMTabbar/Model/NewUserRechargeModel.h delete mode 100644 YuMi/Modules/YMTabbar/Model/NewUserRechargeModel.m delete mode 100644 YuMi/Modules/YMTabbar/Model/XPTabAnchorCardModel.h delete mode 100644 YuMi/Modules/YMTabbar/Model/XPTabAnchorCardModel.m delete mode 100644 YuMi/Modules/YMTabbar/Model/XPVersionUpdateModel.h delete mode 100644 YuMi/Modules/YMTabbar/Model/XPVersionUpdateModel.m delete mode 100644 YuMi/Modules/YMTabbar/Presenter/MainPresenter.h delete mode 100644 YuMi/Modules/YMTabbar/Presenter/MainPresenter.m delete mode 100644 YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.h delete mode 100644 YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m delete mode 100644 YuMi/Modules/YMTabbar/View/TabbarViewController.h delete mode 100644 YuMi/Modules/YMTabbar/View/TabbarViewController.m delete mode 100644 YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.h delete mode 100644 YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m delete mode 100644 YuMi/Tools/CardManager/XPSkillCardPlayerManager.h delete mode 100644 YuMi/Tools/CardManager/XPSkillCardPlayerManager.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Categories/DDData.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Categories/DDData.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Categories/DDNumber.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Categories/DDNumber.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Categories/DDRange.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Categories/DDRange.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/HTTPAuthenticationRequest.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/HTTPAuthenticationRequest.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/HTTPConnection.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/HTTPConnection.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/HTTPLogging.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/HTTPMessage.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/HTTPMessage.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/HTTPResponse.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/HTTPServer.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/HTTPServer.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartFormDataParser.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartFormDataParser.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeader.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeader.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeaderField.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeaderField.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPAsyncFileResponse.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPAsyncFileResponse.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDataResponse.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDataResponse.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDynamicFileResponse.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDynamicFileResponse.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPErrorResponse.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPErrorResponse.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPFileResponse.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPFileResponse.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPRedirectResponse.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPRedirectResponse.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/WebSocket.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Core/WebSocket.m delete mode 100755 YuMi/Tools/CocoaHttpServer/MyHTTPConnection.h delete mode 100755 YuMi/Tools/CocoaHttpServer/MyHTTPConnection.m delete mode 100755 YuMi/Tools/CocoaHttpServer/SJXCSMIPHelper.h delete mode 100755 YuMi/Tools/CocoaHttpServer/SJXCSMIPHelper.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDASLLogger.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDASLLogger.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDFileLogger.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDFileLogger.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDLog.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDLog.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDTTYLogger.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDTTYLogger.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.m delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.h delete mode 100755 YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.m delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/css/index.css delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/css/reset.css delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/attention.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/button-ar.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/button-en.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/button-id.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/button-tr.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/button.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/delete.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/download.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/header-ar.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/header-en.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/header-id.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/header-tr.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/images/header.png delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/index.html delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/js/getLanguage.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/js/index.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/js/jquery-3.2.1.min.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/js/jquery.fileupload.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/js/jquery.iframe-transport.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/js/jquery.ui.widget.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/js/langHandler.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/js/vconsole.min.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/local/ar.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/local/en.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/local/id.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/local/tr.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/local/zh.js delete mode 100644 YuMi/Tools/CocoaHttpServer/Web/upload.html delete mode 100644 YuMi/Tools/FirstCharge/FirstRechargeManager.h delete mode 100644 YuMi/Tools/FirstCharge/FirstRechargeManager.m delete mode 100644 YuMi/Tools/IAPHelper/RechargeStorage.h delete mode 100644 YuMi/Tools/IAPHelper/RechargeStorage.m delete mode 100644 YuMi/Tools/QGVAPlayer/README.md delete mode 100644 YuMi/Tools/SVGAParserManager/SVGAParserManager.h delete mode 100644 YuMi/Tools/SVGAParserManager/SVGAParserManager.m delete mode 100644 YuMi/Tools/Share/ShareHelder.h delete mode 100644 YuMi/Tools/Share/ShareHelder.m delete mode 100644 YuMi/Tools/Share/ShareProvider.h delete mode 100644 YuMi/Tools/Share/ShareProvider.m delete mode 100644 YuMi/Tools/Share/SocialShareManager.h delete mode 100644 YuMi/Tools/Share/SocialShareManager.m delete mode 100644 YuMi/Tools/SpriteSheetManager/SpriteSheetImageManager.h delete mode 100644 YuMi/Tools/SpriteSheetManager/SpriteSheetImageManager.m delete mode 100644 YuMi/Tools/SpriteSheetManager/YYAnimatedImageView+ImageShow.h delete mode 100644 YuMi/Tools/SpriteSheetManager/YYAnimatedImageView+ImageShow.m delete mode 100644 YuMi/Tools/StatisticsService/StatisticsService.h delete mode 100644 YuMi/Tools/StatisticsService/StatisticsService.m delete mode 100644 YuMi/Tools/StatisticsService/StatisticsServiceHelper.h delete mode 100644 YuMi/Tools/StatisticsService/StatisticsServiceHelper.m create mode 100644 YuMi/YMWeb/XPWebViewController.h create mode 100644 YuMi/YMWeb/XPWebViewController.m create mode 100644 YuMi/YMWeb/XPWebViewNavView.h create mode 100644 YuMi/YMWeb/XPWebViewNavView.m delete mode 100644 YuMi/ar.lproj/InfoPlist.strings delete mode 100644 YuMi/ar.lproj/Localizable.strings delete mode 100644 YuMi/es.lproj/InfoPlist.strings delete mode 100644 YuMi/es.lproj/Localizable.strings delete mode 100644 YuMi/pi_app_logo_new_bg.png delete mode 100644 YuMi/pi_area_info.json delete mode 100644 YuMi/pi_login_new_logo.png delete mode 100644 YuMi/pt-BR.lproj/InfoPlist.strings delete mode 100644 YuMi/pt-BR.lproj/Localizable.strings delete mode 100644 YuMi/ru.lproj/InfoPlist.strings delete mode 100644 YuMi/ru.lproj/Localizable.strings delete mode 100644 YuMi/tr.lproj/InfoPlist.strings delete mode 100644 YuMi/tr.lproj/Localizable.strings delete mode 100644 YuMi/uz-UZ.lproj/InfoPlist.strings delete mode 100644 YuMi/uz-UZ.lproj/Localizable.strings delete mode 100644 YuMi/zh-Hant.lproj/InfoPlist.strings delete mode 100644 YuMi/zh-Hant.lproj/Localizable.strings diff --git a/Podfile b/Podfile index 98bdbc3..459034e 100644 --- a/Podfile +++ b/Podfile @@ -1,14 +1,12 @@ # Uncomment the next line to define a global platform for your project platform :ios, '13.0' source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git' + +project 'YuMi.xcodeproj' + target 'YuMi' do use_frameworks! - #pag动画 - pod 'libpag' - pod 'Bugly' - pod 'FBSDKLoginKit' - pod 'FBSDKCoreKit' - pod 'FBSDKShareKit' + # 滑动标签栏 pod 'JXCategoryView' pod 'JXPagingView/Pager' @@ -37,30 +35,16 @@ target 'YuMi' do pod 'MJRefresh', '3.7.9' pod 'IQKeyboardManager' pod 'TZImagePickerController' - #TRTC - pod 'TXLiteAVSDK_TRTC' - #vap礼物动画 - pod 'QGVAPlayer' - #上传音乐 - pod 'CocoaAsyncSocket',:modular_headers => true + #声网 pod 'SSKeychain' pod 'Base64' - #pop动画 + pod 'pop' - #云信 - pod 'NIMSDK_LITE', '~> 10.9.40' + pod 'GKCycleScrollView' - pod 'SVGAPlayer' - pod 'GoogleSignIn' - pod 'mob_linksdk_pro' - pod 'mob_sharesdk' - pod 'mob_sharesdk/ShareSDKPlatforms/Apple' - pod 'mob_sharesdk/ShareSDKExtension' - pod 'UMCommon', '7.5.3' - pod 'UMDevice' pod 'ZLCollectionViewFlowLayout' pod 'TABAnimated' pod 'YuMi',:path=>'yum' diff --git a/Podfile.lock b/Podfile.lock index 6f7d580..f7c96aa 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,78 +14,28 @@ PODS: - AFNetworking/Serialization (4.0.1) - AFNetworking/UIKit (4.0.1): - AFNetworking/NSURLSession - - AppAuth (1.7.6): - - AppAuth/Core (= 1.7.6) - - AppAuth/ExternalUserAgent (= 1.7.6) - - AppAuth/Core (1.7.6) - - AppAuth/ExternalUserAgent (1.7.6): - - AppAuth/Core - Base64 (1.1.2) - - Bugly (2.6.1) - - CocoaAsyncSocket (7.6.5) - - FBAEMKit (14.1.0): - - FBSDKCoreKit_Basics (= 14.1.0) - - FBSDKCoreKit (14.1.0): - - FBAEMKit (= 14.1.0) - - FBSDKCoreKit_Basics (= 14.1.0) - - FBSDKCoreKit_Basics (14.1.0) - - FBSDKLoginKit (14.1.0): - - FBSDKCoreKit (= 14.1.0) - - FBSDKShareKit (14.1.0): - - FBSDKCoreKit (= 14.1.0) - FFPopup (1.1.5) - FLAnimatedImage (1.0.17) - - FlyVerifyCSDK (1.0.7) - GKCycleScrollView (1.2.3) - - GoogleSignIn (7.1.0): - - AppAuth (< 2.0, >= 1.7.3) - - GTMAppAuth (< 5.0, >= 4.1.1) - - GTMSessionFetcher/Core (~> 3.3) - - GTMAppAuth (4.1.1): - - AppAuth/Core (~> 1.7) - - GTMSessionFetcher/Core (< 4.0, >= 3.3) - - GTMSessionFetcher/Core (3.5.0) - IQKeyboardManager (6.5.19) - JXCategoryView (1.6.8) - JXPagingView/Pager (2.1.3) - - libpag (4.4.32) - - MarqueeLabel (4.4.0) + - MarqueeLabel (4.5.3) - Masonry (1.1.0) - MBProgressHUD (1.2.0) - MJExtension (3.4.2) - MJRefresh (3.7.9) - - mob_linksdk_pro (3.3.20): - - MOBFoundation - - mob_sharesdk (4.4.35): - - mob_sharesdk/ShareSDK (= 4.4.35) - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDK (4.4.35): - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKExtension (4.4.35): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Apple (4.4.35): - - mob_sharesdk/ShareSDK - - MOBFoundation (>= 3.2.9) - - MOBFoundation (20250528): - - FlyVerifyCSDK (>= 0.0.7) - - NIMSDK_LITE (10.9.42): - - NIMSDK_LITE/NOS (= 10.9.42) - - YXArtemis_XCFramework - - NIMSDK_LITE/NOS (10.9.42): - - YXArtemis_XCFramework - pop (1.0.12) - - Protobuf (3.29.5) - - QCloudCore (6.4.9): - - QCloudCore/Default (= 6.4.9) - - QCloudCore/Default (6.4.9): - - QCloudTrack/Beacon (= 6.4.9) - - QCloudCOSXML (6.4.9): - - QCloudCOSXML/Default (= 6.4.9) - - QCloudCOSXML/Default (6.4.9): - - QCloudCore (= 6.4.9) - - QCloudTrack/Beacon (6.4.9) - - QGVAPlayer (1.0.19) + - QCloudCore (6.5.1): + - QCloudCore/Default (= 6.5.1) + - QCloudCore/Default (6.5.1): + - QCloudTrack/Beacon (= 6.5.1) + - QCloudCOSXML (6.5.1): + - QCloudCOSXML/Default (= 6.5.1) + - QCloudCOSXML/Default (6.5.1): + - QCloudCore (= 6.5.1) + - QCloudTrack/Beacon (6.5.1) - ReactiveObjC (3.1.1) - SDCycleScrollView (1.82): - SDWebImage (>= 5.0.0) @@ -97,31 +47,15 @@ PODS: - SDWebImage/Core (~> 5.10) - SnapKit (5.7.1) - SSKeychain (1.4.1) - - SSZipArchive (2.4.3) - - SVGAPlayer (2.5.7): - - SVGAPlayer/Core (= 2.5.7) - - SVGAPlayer/ProtoFiles (= 2.5.7) - - SVGAPlayer/Core (2.5.7): - - SSZipArchive (>= 1.8.1) - - SVGAPlayer/ProtoFiles - - SVGAPlayer/ProtoFiles (2.5.7): - - Protobuf (~> 3.4) - SZTextView (1.3.0) - TABAnimated (2.6.6) - - TXLiteAVSDK_TRTC (12.6.18866): - - TXLiteAVSDK_TRTC/TRTC (= 12.6.18866) - - TXLiteAVSDK_TRTC/TRTC (12.6.18866) - TYCyclePagerView (1.2.0) - TZImagePickerController (3.8.9): - TZImagePickerController/Basic (= 3.8.9) - TZImagePickerController/Location (= 3.8.9) - TZImagePickerController/Basic (3.8.9) - TZImagePickerController/Location (3.8.9) - - UMCommon (7.5.3): - - UMDevice - - UMDevice (3.4.0) - YuMi (0.0.1) - - YXArtemis_XCFramework (1.1.6) - YYCache (1.0.4) - YYImage (1.0.4): - YYImage/Core (= 1.0.4) @@ -135,46 +69,29 @@ PODS: DEPENDENCIES: - AFNetworking - Base64 - - Bugly - - CocoaAsyncSocket - - FBSDKCoreKit - - FBSDKLoginKit - - FBSDKShareKit - FFPopup - FLAnimatedImage - GKCycleScrollView - - GoogleSignIn - IQKeyboardManager - JXCategoryView - JXPagingView/Pager - - libpag - MarqueeLabel - Masonry - MBProgressHUD - MJExtension (= 3.4.2) - MJRefresh (= 3.7.9) - - mob_linksdk_pro - - mob_sharesdk - - mob_sharesdk/ShareSDKExtension - - mob_sharesdk/ShareSDKPlatforms/Apple - - NIMSDK_LITE (~> 10.9.40) - pop - QCloudCOSXML - - QGVAPlayer - ReactiveObjC - SDCycleScrollView - SDWebImage (= 5.21.3) - SDWebImageFLPlugin - SnapKit (~> 5.0) - SSKeychain - - SVGAPlayer - SZTextView - TABAnimated - - TXLiteAVSDK_TRTC - TYCyclePagerView - TZImagePickerController - - UMCommon (= 7.5.3) - - UMDevice - YuMi (from `yum`) - YYText - YYWebImage @@ -183,57 +100,32 @@ DEPENDENCIES: SPEC REPOS: https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git: - AFNetworking - - AppAuth - Base64 - - Bugly - - CocoaAsyncSocket - - FBAEMKit - - FBSDKCoreKit - - FBSDKCoreKit_Basics - - FBSDKLoginKit - - FBSDKShareKit - FFPopup - FLAnimatedImage - - FlyVerifyCSDK - GKCycleScrollView - - GoogleSignIn - - GTMAppAuth - - GTMSessionFetcher - IQKeyboardManager - JXCategoryView - JXPagingView - - libpag - MarqueeLabel - Masonry - MBProgressHUD - MJExtension - MJRefresh - - mob_linksdk_pro - - mob_sharesdk - - MOBFoundation - - NIMSDK_LITE - pop - - Protobuf - QCloudCore - QCloudCOSXML - QCloudTrack - - QGVAPlayer - ReactiveObjC - SDCycleScrollView - SDWebImage - SDWebImageFLPlugin - SnapKit - SSKeychain - - SSZipArchive - - SVGAPlayer - SZTextView - TABAnimated - - TXLiteAVSDK_TRTC - TYCyclePagerView - TZImagePickerController - - UMCommon - - UMDevice - - YXArtemis_XCFramework - YYCache - YYImage - YYText @@ -246,64 +138,39 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58 - AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73 Base64: cecfb41a004124895a7bcee567a89bae5a89d49b - Bugly: 217ac2ce5f0f2626d43dbaa4f70764c953a26a31 - CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - FBAEMKit: a899515e45476027f73aef377b5cffadcd56ca3a - FBSDKCoreKit: 24f8bc8d3b5b2a8c5c656a1329492a12e8efa792 - FBSDKCoreKit_Basics: 6e578c9bdc7aa1365dbbbde633c9ebb536bcaa98 - FBSDKLoginKit: 787de205d524c3a4b17d527916f1d066e4361660 - FBSDKShareKit: b9c1cd1fa6a320a50f0f353cf30d589049c8db77 FFPopup: a208dcee8db3e54ec4a88fcd6481f6f5d85b7a83 FLAnimatedImage: bbf914596368867157cc71b38a8ec834b3eeb32b - FlyVerifyCSDK: e0a13f11d4f29aca7fb7fdcff3f27e3b7ba2de5d GKCycleScrollView: 8ed79d2142e62895a701973358b6f94b661b4829 - GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db - GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de - GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485 JXCategoryView: 262d503acea0b1278c79a1c25b7332ffaef4d518 JXPagingView: afdd2e9af09c90160dd232b970d603cc6e7ddd0e - libpag: 6e8253018ee4e7f310c8c07d9d9a89d7ae58ae27 - MarqueeLabel: d2388949ac58d587303178d56a792ba8a001b037 + MarqueeLabel: 0c57d4c6634e04a6d015af79f7c9a175b2309525 Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 MJExtension: e97d164cb411aa9795cf576093a1fa208b4a8dd8 MJRefresh: ff9e531227924c84ce459338414550a05d2aea78 - mob_linksdk_pro: d6ac555e9bb8d2743a8634032a70ea1d34119a50 - mob_sharesdk: 409503324d18f231dd27b4d26428c0c168b20c36 - MOBFoundation: a1f193058aba95440dadeb799fb398ff92cfe45e - NIMSDK_LITE: 67f6815667acefdc8f9969f8c955b5c1fab490df pop: d582054913807fd11fd50bfe6a539d91c7e1a55a - Protobuf: 164aea2ae380c3951abdc3e195220c01d17400e0 - QCloudCore: 0e70cda608d1ac485e039e83be1c4a1197197e6b - QCloudCOSXML: b7f0b9cac61780a03318d40367a879f8d7eb3d86 - QCloudTrack: cc101dd57be7f87bffc3f2fb692a781d5efeda98 - QGVAPlayer: a0bca68c9bd6f1c8de5ac2d10ddf98be6038cce9 + QCloudCore: 6f8c67b96448472d2c6a92b9cfe1bdb5abbb1798 + QCloudCOSXML: 92f50a787b4e8d9a7cb6ea8e626775256b4840a7 + QCloudTrack: 20b79388365b4c8ed150019c82a56f1569f237f8 ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040 SDCycleScrollView: a0d74c3384caa72bdfc81470bdbc8c14b3e1fbcf SDWebImage: 16309af6d214ba3f77a7c6f6fdda888cb313a50a SDWebImageFLPlugin: 72efd2cfbf565bc438421abb426f4bcf7b670754 SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a SSKeychain: 55cc80f66f5c73da827e3077f02e43528897db41 - SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef - SVGAPlayer: 318b85a78b61292d6ae9dfcd651f3f0d1cdadd86 SZTextView: 094dc6acc9beec537685c545d6e3e0d4975174e1 TABAnimated: 75fece541a774193565697c7a11539d3c6f631b3 - TXLiteAVSDK_TRTC: 09552a5bb5571c85c851d8dd858064724639f55e TYCyclePagerView: 2b051dade0615c70784aa34f40c646feeddb7344 TZImagePickerController: 456f470b5dea97b37226ec7a694994a8663340b2 - UMCommon: 3b850836e8bc162b4e7f6b527d30071ed8ea75a1 - UMDevice: dcdf7ec167387837559d149fbc7d793d984faf82 YuMi: 6c5f00f1eccbcea3304feae03cbe659025fdb9cb - YXArtemis_XCFramework: d9a8b9439d7a6c757ed00ada53a6d2dd9b13f9c7 YYCache: 8105b6638f5e849296c71f331ff83891a4942952 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 YYText: 5c461d709e24d55a182d1441c41dc639a18a4849 YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928 ZLCollectionViewFlowLayout: c99024652ce9f0c57d33ab53052c9b85e4a936b7 -PODFILE CHECKSUM: 581cecb560110b972c7e8c7d4b01e24a5deaf833 +PODFILE CHECKSUM: 377abda18823bc4a29b1f0df9b0b4e424bd6f61c COCOAPODS: 1.16.2 diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 783cd26..5d43cc0 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -11,61 +11,20 @@ 1427212C29A757EC00C7C423 /* MomentsListInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427212A29A757EC00C7C423 /* MomentsListInfoModel.m */; }; 1427212F29A7599500C7C423 /* XPMonentsAttentionPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427212D29A7599500C7C423 /* XPMonentsAttentionPresenter.m */; }; 1427213429A75A2600C7C423 /* XPMomentsLatestPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427213329A75A2600C7C423 /* XPMomentsLatestPresenter.m */; }; - 1427218729A75F6F00C7C423 /* MyHTTPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427213729A75F6F00C7C423 /* MyHTTPConnection.m */; }; - 1427218829A75F6F00C7C423 /* HTTPErrorResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427214029A75F6F00C7C423 /* HTTPErrorResponse.m */; }; - 1427218929A75F6F00C7C423 /* HTTPDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427214129A75F6F00C7C423 /* HTTPDataResponse.m */; }; - 1427218A29A75F6F00C7C423 /* HTTPDynamicFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427214329A75F6F00C7C423 /* HTTPDynamicFileResponse.m */; }; - 1427218B29A75F6F00C7C423 /* HTTPFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427214429A75F6F00C7C423 /* HTTPFileResponse.m */; }; - 1427218C29A75F6F00C7C423 /* HTTPAsyncFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427214529A75F6F00C7C423 /* HTTPAsyncFileResponse.m */; }; - 1427218D29A75F6F00C7C423 /* HTTPRedirectResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427214629A75F6F00C7C423 /* HTTPRedirectResponse.m */; }; - 1427218E29A75F6F00C7C423 /* HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427214C29A75F6F00C7C423 /* HTTPMessage.m */; }; - 1427218F29A75F6F00C7C423 /* HTTPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427214D29A75F6F00C7C423 /* HTTPConnection.m */; }; - 1427219029A75F6F00C7C423 /* WebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427214E29A75F6F00C7C423 /* WebSocket.m */; }; - 1427219129A75F6F00C7C423 /* MultipartMessageHeaderField.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427215329A75F6F00C7C423 /* MultipartMessageHeaderField.m */; }; - 1427219229A75F6F00C7C423 /* MultipartFormDataParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427215429A75F6F00C7C423 /* MultipartFormDataParser.m */; }; - 1427219329A75F6F00C7C423 /* MultipartMessageHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427215529A75F6F00C7C423 /* MultipartMessageHeader.m */; }; - 1427219429A75F6F00C7C423 /* HTTPAuthenticationRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427215729A75F6F00C7C423 /* HTTPAuthenticationRequest.m */; }; - 1427219529A75F6F00C7C423 /* DDNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427215929A75F6F00C7C423 /* DDNumber.m */; }; - 1427219629A75F6F00C7C423 /* DDData.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427215A29A75F6F00C7C423 /* DDData.m */; }; - 1427219729A75F6F00C7C423 /* DDRange.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427215D29A75F6F00C7C423 /* DDRange.m */; }; - 1427219829A75F6F00C7C423 /* HTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427215F29A75F6F00C7C423 /* HTTPServer.m */; }; - 142721AF29A75F6F00C7C423 /* SJXCSMIPHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427218629A75F6F00C7C423 /* SJXCSMIPHelper.m */; }; 142721B229A7647F00C7C423 /* XPBlankViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 142721B129A7647F00C7C423 /* XPBlankViewController.m */; }; - 1464C5EA29A45FC300AF7C94 /* XPButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 1464C5E929A45FC300AF7C94 /* XPButton.m */; }; - 1464C5F029A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1464C5EF29A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.m */; }; - 1464C5F329A4C18000AF7C94 /* XPIAPRechargeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1464C5F229A4C18000AF7C94 /* XPIAPRechargeViewController.m */; }; - 1464C5F629A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1464C5F529A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.m */; }; - 1464C5F929A4D00000AF7C94 /* XPIAPRechargeHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1464C5F829A4D00000AF7C94 /* XPIAPRechargeHeaderView.m */; }; - 149839C7299E0B9F00F82CBF /* XPMomentListCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 149839C6299E0B9F00F82CBF /* XPMomentListCollectionViewCell.m */; }; - 14A6034C29A35EE600D2A6A5 /* XPMineItemTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 14A6034B29A35EE600D2A6A5 /* XPMineItemTableViewCell.m */; }; - 14A6034F29A36D8300D2A6A5 /* XPSimpleMineHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 14A6034E29A36D8300D2A6A5 /* XPSimpleMineHeaderView.m */; }; - 14B880E7299A4B62005FCA1B /* XPLoginPhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14B880E6299A4B62005FCA1B /* XPLoginPhoneViewController.m */; }; 14D8767C29A7445C00E1DD7F /* NSObject+AutoCoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D8767B29A7445C00E1DD7F /* NSObject+AutoCoding.m */; }; - 14DCAD08299B36A500A7DD31 /* XPLoginPwdViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14DCAD07299B36A500A7DD31 /* XPLoginPwdViewController.m */; }; - 14DCAD0B299B5D3A00A7DD31 /* XPLoginInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 14DCAD0A299B5D3A00A7DD31 /* XPLoginInputView.m */; }; - 14DCAD0E299B6AD900A7DD31 /* XPForgetPwdViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14DCAD0D299B6AD900A7DD31 /* XPForgetPwdViewController.m */; }; - 14EB640929A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EB640829A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.m */; }; - 14EB640D29A5C16000A4A00B /* XPMomentsSimpleDetailNav.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EB640C29A5C16000A4A00B /* XPMomentsSimpleDetailNav.m */; }; 180116F9279E8C4C00F2CBC0 /* PLTimeUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 180116F8279E8C4C00F2CBC0 /* PLTimeUtil.m */; }; 180116FC279E8CCE00F2CBC0 /* NVDate.m in Sources */ = {isa = PBXBuildFile; fileRef = 180116FA279E8CCE00F2CBC0 /* NVDate.m */; }; - 180806FB2729A354001FD836 /* ThemeColor+Room.m in Sources */ = {isa = PBXBuildFile; fileRef = 180806FA2729A354001FD836 /* ThemeColor+Room.m */; }; - 1808072D2731598F001FD836 /* XPNetImageYYLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1808072C2731598F001FD836 /* XPNetImageYYLabel.m */; }; - 181D7F1B2726CE2A00B7C059 /* StageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 181D7F1A2726CE2A00B7C059 /* StageView.m */; }; - 181D7F212727D9DB00B7C059 /* SocialStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 181D7F202727D9DB00B7C059 /* SocialStageView.m */; }; - 18486213271EA9DA005FC5DC /* RtcManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 18486212271EA9DA005FC5DC /* RtcManager.m */; }; - 18486217271EAB8C005FC5DC /* BaseRtcImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 18486216271EAB8C005FC5DC /* BaseRtcImpl.m */; }; 186A531926FC592100D67B2C /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 186A531826FC591100D67B2C /* libresolv.tbd */; }; 187EEEDC26E89B32002833B2 /* BaseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 187EEEDB26E89B32002833B2 /* BaseModel.m */; }; 187EEEE126E89BFB002833B2 /* AccountModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 187EEEE026E89BFB002833B2 /* AccountModel.m */; }; 187EEEF026E89FE8002833B2 /* AccountInfoStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 187EEEEE26E89FE8002833B2 /* AccountInfoStorage.m */; }; 189DD52E26DE255300AB55B1 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD52D26DE255300AB55B1 /* AppDelegate.m */; }; - 189DD53426DE255300AB55B1 /* TabbarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD53326DE255300AB55B1 /* TabbarViewController.m */; }; 189DD53926DE255600AB55B1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 189DD53826DE255600AB55B1 /* Assets.xcassets */; }; 189DD53F26DE255600AB55B1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD53E26DE255600AB55B1 /* main.m */; }; 189DD54B26DE338800AB55B1 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD54A26DE338800AB55B1 /* BaseViewController.m */; }; 189DD55026DE37F900AB55B1 /* MvpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD54F26DE37F900AB55B1 /* MvpViewController.m */; }; 189DD55A26DE39D200AB55B1 /* BaseMvpPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD55926DE39D200AB55B1 /* BaseMvpPresenter.m */; }; - 189DD58F26DF97E700AB55B1 /* LoginPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD58E26DF97E700AB55B1 /* LoginPresenter.m */; }; 189DD6FF26E20E5900AB55B1 /* HttpRequestHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD6FE26E20E5900AB55B1 /* HttpRequestHelper.m */; }; 189DD73D26E21C3F00AB55B1 /* YYUtility+Device.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD73826E21C3F00AB55B1 /* YYUtility+Device.m */; }; 189DD73E26E21C3F00AB55B1 /* YYUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD73926E21C3F00AB55B1 /* YYUtility.m */; }; @@ -75,150 +34,20 @@ 189DD75026E21D9000AB55B1 /* GCDHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD74E26E21D9000AB55B1 /* GCDHelper.m */; }; 189DD75926E6003C00AB55B1 /* Api.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD75826E6003C00AB55B1 /* Api.m */; }; 189DD76226E60DDC00AB55B1 /* Api+Login.m in Sources */ = {isa = PBXBuildFile; fileRef = 189DD76126E60DDC00AB55B1 /* Api+Login.m */; }; - 18A61BE8274F9CF000A09A54 /* SessionListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 18A61BE7274F9CF000A09A54 /* SessionListViewController.m */; }; - 18AAF3F0279EA59300CD7DAD /* MessageContentTextClickable.m in Sources */ = {isa = PBXBuildFile; fileRef = 18AAF3EF279EA59300CD7DAD /* MessageContentTextClickable.m */; }; - 18E7B1B226E8AF980064BC9B /* MainPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 18E7B1B126E8AF980064BC9B /* MainPresenter.m */; }; 18E7B1B726E8B2D10064BC9B /* Api+Main.m in Sources */ = {isa = PBXBuildFile; fileRef = 18E7B1B626E8B2D10064BC9B /* Api+Main.m */; }; 18E7B31826F097E00064BC9B /* UserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 18E7B31726F097E00064BC9B /* UserInfoModel.m */; }; 18E7B31B26F0982E0064BC9B /* UserExpand.m in Sources */ = {isa = PBXBuildFile; fileRef = 18E7B31A26F0982E0064BC9B /* UserExpand.m */; }; 18E7B31E26F0984C0064BC9B /* UserLevelVo.m in Sources */ = {isa = PBXBuildFile; fileRef = 18E7B31D26F0984C0064BC9B /* UserLevelVo.m */; }; 18E7B32126F098650064BC9B /* UserInfoSkillVo.m in Sources */ = {isa = PBXBuildFile; fileRef = 18E7B32026F098650064BC9B /* UserInfoSkillVo.m */; }; - 18E7B33226F317A20064BC9B /* XPWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 18E7B33126F317A20064BC9B /* XPWebViewController.m */; }; - 18EE3FDF2750C1F700A452BF /* SessionListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 18EE3FDE2750C1F700A452BF /* SessionListCell.m */; }; - 18EE3FE22750C29D00A452BF /* NIMBadgeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 18EE3FE12750C29D00A452BF /* NIMBadgeView.m */; }; - 18EE3FEE2750CE6D00A452BF /* NIMMessageUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 18EE3FED2750CE6D00A452BF /* NIMMessageUtils.m */; }; - 18EE3FF12750D2AD00A452BF /* NIMTimeUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 18EE3FF02750D2AD00A452BF /* NIMTimeUtils.m */; }; - 18EE3FF42750FA3700A452BF /* UIView+NIM.m in Sources */ = {isa = PBXBuildFile; fileRef = 18EE3FF32750FA3700A452BF /* UIView+NIM.m */; }; - 18EE401A2754BA9F00A452BF /* NIMMessageMaker.m in Sources */ = {isa = PBXBuildFile; fileRef = 18EE40182754BA9F00A452BF /* NIMMessageMaker.m */; }; - 18F403CB2758C66800A6C548 /* MessageContentText.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F403CA2758C66800A6C548 /* MessageContentText.m */; }; - 18F403EE2758CF2F00A6C548 /* MessageContentImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F403ED2758CF2F00A6C548 /* MessageContentImage.m */; }; - 18F4043A275E20D900A6C548 /* TRTCRtcImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F40439275E20D900A6C548 /* TRTCRtcImpl.m */; }; - 18F404B7276095D700A6C548 /* SessionChatLimitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F404B6276095D700A6C548 /* SessionChatLimitView.m */; }; - 18F404BB2760982000A6C548 /* ChatLimitModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F404BA2760982000A6C548 /* ChatLimitModel.m */; }; - 18F404C3276098F100A6C548 /* Api+Message.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F404C2276098F100A6C548 /* Api+Message.m */; }; - 18F404C927609A4300A6C548 /* MessagePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F404C827609A4300A6C548 /* MessagePresenter.m */; }; - 2305EEF02AD677F200AD403C /* PIRoomPhotoAlbumVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305EEEF2AD677F200AD403C /* PIRoomPhotoAlbumVC.m */; }; - 2305EEF32AD67A8D00AD403C /* PIRoomPhotoAlbumItemVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305EEF22AD67A8D00AD403C /* PIRoomPhotoAlbumItemVC.m */; }; - 2305EEF62AD67E5500AD403C /* PIRoomPhotoAlbumItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305EEF52AD67E5500AD403C /* PIRoomPhotoAlbumItemCell.m */; }; - 2305EEFB2AD696B400AD403C /* PIRoomPhotoAlbumChoosePhotoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305EEFA2AD696B400AD403C /* PIRoomPhotoAlbumChoosePhotoView.m */; }; - 2305EEFE2AD6978200AD403C /* PIRoomPhotoAlbumChoosePhotoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305EEFD2AD6978200AD403C /* PIRoomPhotoAlbumChoosePhotoCell.m */; }; - 2305EF012AD6A33E00AD403C /* PIRoomPhotoAlbumItemChoosePhotoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305EF002AD6A33E00AD403C /* PIRoomPhotoAlbumItemChoosePhotoModel.m */; }; - 2305EF042AD6B11700AD403C /* PIRoomPhotoAlbumChoosePhotoTypeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305EF032AD6B11700AD403C /* PIRoomPhotoAlbumChoosePhotoTypeView.m */; }; - 2305EF072AD6B51200AD403C /* PIRoomPhotoAlbumChoosePhotoGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305EF062AD6B51200AD403C /* PIRoomPhotoAlbumChoosePhotoGiftView.m */; }; - 2305EF0A2AD7CC7C00AD403C /* PIRoomPhotoAlbumChooseGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305EF092AD7CC7C00AD403C /* PIRoomPhotoAlbumChooseGiftView.m */; }; - 2305EF0D2AD7CC9A00AD403C /* PIRoomPhotoAlbumChooseGiftCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305EF0C2AD7CC9A00AD403C /* PIRoomPhotoAlbumChooseGiftCell.m */; }; - 2305EF102AD8006900AD403C /* PIRoomMessagePhotoAlbumCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305EF0F2AD8006900AD403C /* PIRoomMessagePhotoAlbumCell.m */; }; - 2305EF132AD8036B00AD403C /* PIRoomMessagePhotoAlbumView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305EF122AD8036B00AD403C /* PIRoomMessagePhotoAlbumView.m */; }; - 2305F3382AD9194B00AD403C /* PIRoomMessageUnlockPhotoAlbumView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305F3372AD9194B00AD403C /* PIRoomMessageUnlockPhotoAlbumView.m */; }; - 2305F33B2AD9293D00AD403C /* PIRoomPhotoAlbumOperateView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305F33A2AD9293D00AD403C /* PIRoomPhotoAlbumOperateView.m */; }; - 2305F33E2AD9295800AD403C /* PIRoomPhotoAlbumOperateCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305F33D2AD9295800AD403C /* PIRoomPhotoAlbumOperateCell.m */; }; - 2305F3412AD94D5200AD403C /* XPMaskManagerVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305F33F2AD94D5200AD403C /* XPMaskManagerVC.m */; }; 2305F3442AD94E2700AD403C /* XPMaskManagerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305F3432AD94E2700AD403C /* XPMaskManagerModel.m */; }; - 2305F3472AD94E9D00AD403C /* XPMaskManagerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2305F3462AD94E9C00AD403C /* XPMaskManagerCell.m */; }; 23116B0B2BDB8FDC00F7F97A /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 2368ECD72BC38FED00EDF4C9 /* PrivacyInfo.xcprivacy */; }; - 23194DBB2AD13EAB00649F51 /* PILoginManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DBA2AD13EAB00649F51 /* PILoginManager.m */; }; - 23194DCC2AD14BF000649F51 /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DBD2AD14BF000649F51 /* DDTTYLogger.m */; }; - 23194DCD2AD14BF000649F51 /* DDASLLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DC02AD14BF000649F51 /* DDASLLogger.m */; }; - 23194DCE2AD14BF000649F51 /* ContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DC52AD14BF000649F51 /* ContextFilterLogFormatter.m */; }; - 23194DCF2AD14BF000649F51 /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DC62AD14BF000649F51 /* DispatchQueueLogFormatter.m */; }; - 23194DD02AD14BF000649F51 /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DC72AD14BF000649F51 /* DDLog.m */; }; - 23194DD12AD14BF000649F51 /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DC92AD14BF000649F51 /* DDAbstractDatabaseLogger.m */; }; - 23194DD22AD14BF000649F51 /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DCA2AD14BF000649F51 /* DDFileLogger.m */; }; - 23194DD52AD292F200649F51 /* PIPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 23194DD42AD292F200649F51 /* PIPageControl.m */; }; - 2320F6392BDF732C00227EEB /* MSRoomMenuGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2320F6382BDF732C00227EEB /* MSRoomMenuGameView.m */; }; - 2320F63C2BDF738E00227EEB /* MSRoomMenuGameCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2320F63B2BDF738E00227EEB /* MSRoomMenuGameCell.m */; }; - 2320F63F2BDF8B3000227EEB /* MSRoomMenuGameVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 2320F63E2BDF8B3000227EEB /* MSRoomMenuGameVC.m */; }; - 2320F6422BE0F53F00227EEB /* MSRoomMenuGameEmptyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2320F6412BE0F53F00227EEB /* MSRoomMenuGameEmptyCell.m */; }; 232EBBFF2BD7A25500E8CEAD /* MSParamsDecode.m in Sources */ = {isa = PBXBuildFile; fileRef = 232EBBFE2BD7A25500E8CEAD /* MSParamsDecode.m */; }; - 2331C1632A5EB71000E1D940 /* XPNobleCenterPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1322A5EB71000E1D940 /* XPNobleCenterPresenter.m */; }; - 2331C1642A5EB71000E1D940 /* NobleInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1362A5EB71000E1D940 /* NobleInfo.m */; }; - 2331C1652A5EB71000E1D940 /* NobleRechargeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1392A5EB71000E1D940 /* NobleRechargeModel.m */; }; - 2331C1662A5EB71000E1D940 /* NobleCenterModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C13A2A5EB71000E1D940 /* NobleCenterModel.m */; }; - 2331C1672A5EB71000E1D940 /* NobleLevelUpModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C13C2A5EB71000E1D940 /* NobleLevelUpModel.m */; }; - 2331C1682A5EB71000E1D940 /* NobleAuthInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C13D2A5EB71000E1D940 /* NobleAuthInfo.m */; }; - 2331C1692A5EB71000E1D940 /* XPNobleSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1412A5EB71000E1D940 /* XPNobleSettingViewController.m */; }; - 2331C16C2A5EB71000E1D940 /* XPNobleCenterEmptyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C14C2A5EB71000E1D940 /* XPNobleCenterEmptyView.m */; }; - 2331C16D2A5EB71000E1D940 /* XPNobleSettingNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1522A5EB71000E1D940 /* XPNobleSettingNavView.m */; }; - 2331C16E2A5EB71000E1D940 /* XPNobleAuthorityDescView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1532A5EB71000E1D940 /* XPNobleAuthorityDescView.m */; }; - 2331C16F2A5EB71000E1D940 /* XPNobleCenterNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1542A5EB71000E1D940 /* XPNobleCenterNavView.m */; }; - 2331C1702A5EB71000E1D940 /* XPNoblePrivilegeContentCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1562A5EB71000E1D940 /* XPNoblePrivilegeContentCell.m */; }; - 2331C1712A5EB71000E1D940 /* XPNobleCenterTableHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1572A5EB71000E1D940 /* XPNobleCenterTableHeadView.m */; }; - 2331C1732A5EB71000E1D940 /* XPNoblePrivilegeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1592A5EB71000E1D940 /* XPNoblePrivilegeCell.m */; }; - 2331C1742A5EB71000E1D940 /* XPNobleCenterResidueView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C15A2A5EB71000E1D940 /* XPNobleCenterResidueView.m */; }; - 2331C1752A5EB71000E1D940 /* XPNobleUpgradeLevelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C15B2A5EB71000E1D940 /* XPNobleUpgradeLevelView.m */; }; - 2331C1762A5EB71000E1D940 /* ThemeColor+NobleCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C15D2A5EB71000E1D940 /* ThemeColor+NobleCenter.m */; }; - 2331C1772A5EB71000E1D940 /* XPNobleCenterListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C15E2A5EB71000E1D940 /* XPNobleCenterListViewController.m */; }; - 2331C1782A5EB71000E1D940 /* Api+NobleCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1622A5EB71000E1D940 /* Api+NobleCenter.m */; }; - 2331C17B2A5EB7AB00E1D940 /* XPNobleCenterEntranceView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1792A5EB7AB00E1D940 /* XPNobleCenterEntranceView.m */; }; - 2331C17E2A5ECCF600E1D940 /* XPNobleCenterPayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C17D2A5ECCF600E1D940 /* XPNobleCenterPayView.m */; }; - 2331C1812A5ECD3800E1D940 /* XPNobleCenterPayCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1802A5ECD3800E1D940 /* XPNobleCenterPayCell.m */; }; - 2331C1AA2A60F32D00E1D940 /* XPCandyTreePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1842A60F32D00E1D940 /* XPCandyTreePresenter.m */; }; - 2331C1AB2A60F32D00E1D940 /* CandyTreeResultModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1892A60F32D00E1D940 /* CandyTreeResultModel.m */; }; - 2331C1AC2A60F32D00E1D940 /* CandyTreeRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C18A2A60F32D00E1D940 /* CandyTreeRecordModel.m */; }; - 2331C1AD2A60F32D00E1D940 /* XPCandyTreeAnimationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C18D2A60F32D00E1D940 /* XPCandyTreeAnimationModel.m */; }; - 2331C1AE2A60F32D00E1D940 /* CandyTreeInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1902A60F32D00E1D940 /* CandyTreeInfoModel.m */; }; - 2331C1AF2A60F32D00E1D940 /* XPCandyTreeRankView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1922A60F32D00E1D940 /* XPCandyTreeRankView.m */; }; - 2331C1B02A60F32D00E1D940 /* XPCandyTreeMoreView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1932A60F32D00E1D940 /* XPCandyTreeMoreView.m */; }; - 2331C1B12A60F32D00E1D940 /* XPCandyTreeGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1962A60F32D00E1D940 /* XPCandyTreeGiftView.m */; }; - 2331C1B22A60F32D00E1D940 /* XPCandyTreeEmptyableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C19A2A60F32D00E1D940 /* XPCandyTreeEmptyableViewCell.m */; }; - 2331C1B32A60F32D00E1D940 /* XPCandyTreeMoreRuleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C19B2A60F32D00E1D940 /* XPCandyTreeMoreRuleCell.m */; }; - 2331C1B42A60F32D00E1D940 /* XPCandyTreeRankTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C19C2A60F32D00E1D940 /* XPCandyTreeRankTableViewCell.m */; }; - 2331C1B52A60F32D00E1D940 /* XPCandyTreeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1A12A60F32D00E1D940 /* XPCandyTreeViewController.m */; }; - 2331C1B62A60F32D00E1D940 /* XPCandyTreeInsufficientBalanceView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1A42A60F32D00E1D940 /* XPCandyTreeInsufficientBalanceView.m */; }; - 2331C1B72A60F32D00E1D940 /* XPCandyRankContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1A52A60F32D00E1D940 /* XPCandyRankContainerView.m */; }; - 2331C1B82A60F32D00E1D940 /* XPRoomHalfWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1A62A60F32D00E1D940 /* XPRoomHalfWebView.m */; }; - 2331C1B92A60F32D00E1D940 /* Api+CandyTree.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1A82A60F32D00E1D940 /* Api+CandyTree.m */; }; 2331C1BD2A60F69E00E1D940 /* UILabel+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1BC2A60F69E00E1D940 /* UILabel+Utils.m */; }; - 233423C72AAEE5C600B1253F /* XPCandyTreeBuySuccessView.m in Sources */ = {isa = PBXBuildFile; fileRef = 233423C62AAEE5C600B1253F /* XPCandyTreeBuySuccessView.m */; }; - 233423CA2AAEE97500B1253F /* XPCandyTreeConfirmBuyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 233423C92AAEE97500B1253F /* XPCandyTreeConfirmBuyView.m */; }; - 233423CD2AAEE98200B1253F /* XPCandyTreeConfirmBuyNumView.m in Sources */ = {isa = PBXBuildFile; fileRef = 233423CC2AAEE98200B1253F /* XPCandyTreeConfirmBuyNumView.m */; }; - 233423D02AAEFBC300B1253F /* PICandyTreeSetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 233423CF2AAEFBC300B1253F /* PICandyTreeSetModel.m */; }; - 233423D32AAF0F4F00B1253F /* XPIAPRechargeHeadCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 233423D22AAF0F4F00B1253F /* XPIAPRechargeHeadCell.m */; }; - 233423D62AB0397500B1253F /* PIMessageContentServiceReplyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 233423D52AB0397500B1253F /* PIMessageContentServiceReplyView.m */; }; - 233423D92AB0438400B1253F /* PIMessageContentServiceReplyModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 233423D82AB0438400B1253F /* PIMessageContentServiceReplyModel.m */; }; - 234489082AC3C5DA0070E5D5 /* SudMGP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 234489072AC3C5DA0070E5D5 /* SudMGP.framework */; }; - 234489092AC3C5FF0070E5D5 /* SudMGP.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 234489072AC3C5DA0070E5D5 /* SudMGP.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 234D821E2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 234D821D2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m */; }; 234E50AF2BF7352C005CB6D5 /* NSTextAttachment+MSImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 234E50AE2BF7352C005CB6D5 /* NSTextAttachment+MSImage.m */; }; - 235714892BECC38F004C81D6 /* MessageHeadlinesTextModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 235714882BECC38F004C81D6 /* MessageHeadlinesTextModel.m */; }; - 235714982BEDF54E004C81D6 /* MsRoomMessageMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = 235714972BEDF54E004C81D6 /* MsRoomMessageMainView.m */; }; - 235A451A2B04A352009753F5 /* PIRoomActivityWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 235A45192B04A352009753F5 /* PIRoomActivityWebView.m */; }; - 235A451D2B04A452009753F5 /* PIRoomActivityWebCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 235A451C2B04A452009753F5 /* PIRoomActivityWebCell.m */; }; 235A45232B04BEB6009753F5 /* PIBaseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 235A45222B04BEB6009753F5 /* PIBaseModel.m */; }; - 23630BA62BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23630BA52BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.m */; }; - 236896A02AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 2368969F2AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.m */; }; 2368ECCF2BC38F9800EDF4C9 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2368ECCD2BC38F9800EDF4C9 /* InfoPlist.strings */; }; 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 */; }; - 236B2E432AA07D06003967A8 /* NSString+RW.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E252AA07D06003967A8 /* NSString+RW.m */; }; - 236B2E442AA07D06003967A8 /* UIColor+RW.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E272AA07D06003967A8 /* UIColor+RW.m */; }; - 236B2E452AA07D06003967A8 /* NSData+RW.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E282AA07D06003967A8 /* NSData+RW.m */; }; - 236B2E462AA07D06003967A8 /* UIImage+RW.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E2A2AA07D06003967A8 /* UIImage+RW.m */; }; - 236B2E472AA07D06003967A8 /* LittleGameInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E302AA07D06003967A8 /* LittleGameInfoModel.m */; }; - 236B2E482AA07D06003967A8 /* XPLittleGameMiniStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E332AA07D06003967A8 /* XPLittleGameMiniStageView.m */; }; - 236B2E492AA07D06003967A8 /* XPCreateLittleGameCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E382AA07D06003967A8 /* XPCreateLittleGameCollectionViewCell.m */; }; - 236B2E4A2AA07D06003967A8 /* XPLittleGameTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E3A2AA07D06003967A8 /* XPLittleGameTableViewCell.m */; }; - 236B2E4B2AA07D06003967A8 /* XPLittleGameRoomListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E3C2AA07D06003967A8 /* XPLittleGameRoomListView.m */; }; - 236B2E4C2AA07D06003967A8 /* XPLittleGameRoomOpenView.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E3D2AA07D06003967A8 /* XPLittleGameRoomOpenView.m */; }; - 236B2E4D2AA07D06003967A8 /* XPRoomLittleGameContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E3E2AA07D06003967A8 /* XPRoomLittleGameContainerView.m */; }; - 236B2E4E2AA07D06003967A8 /* Api+LittleGame.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E402AA07D06003967A8 /* Api+LittleGame.m */; }; - 236B2E532AA08757003967A8 /* LittleGameStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E502AA08756003967A8 /* LittleGameStageView.m */; }; - 236B2E542AA08757003967A8 /* LittleGameScrollStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E512AA08756003967A8 /* LittleGameScrollStageView.m */; }; - 236B2E592AA18E13003967A8 /* XPMIneGameCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E552AA18E12003967A8 /* XPMIneGameCollectionViewCell.m */; }; - 236B2E5A2AA18E13003967A8 /* XPMineGameTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E572AA18E12003967A8 /* XPMineGameTableViewCell.m */; }; - 236B2E5D2AA19169003967A8 /* HomeLittleGameRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E5C2AA19169003967A8 /* HomeLittleGameRoomModel.m */; }; - 236BA4982BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 236BA4972BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m */; }; - 237700CF2BC697D500D661F1 /* pi_login_new_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 237700CE2BC697D400D661F1 /* pi_login_new_logo.png */; }; 237700D32BC7CC7C00D661F1 /* NSObject+MJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */; }; 237701082BCF73CE00D661F1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 237701072BCF73CE00D661F1 /* Security.framework */; }; 2377010A2BCF73DD00D661F1 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 237701092BCF73DD00D661F1 /* libiconv.tbd */; }; @@ -226,70 +55,7 @@ 2377010E2BCF73F400D661F1 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2377010D2BCF73F400D661F1 /* CoreGraphics.framework */; }; 237701102BCF740400D661F1 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 2377010F2BCF740400D661F1 /* libsqlite3.tbd */; }; 237701122BCF742C00D661F1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 237701112BCF742C00D661F1 /* libz.tbd */; }; - 237701192BD6143700D661F1 /* pi_happy_egg_smash.svga in Resources */ = {isa = PBXBuildFile; fileRef = 237701182BD6143700D661F1 /* pi_happy_egg_smash.svga */; }; - 237852A12C072D8D00E360AC /* MSRoomGameModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237852A02C072D8D00E360AC /* MSRoomGameModel.m */; }; - 237852A42C082A9800E360AC /* MSRoomGameSendTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 237852A32C082A9800E360AC /* MSRoomGameSendTextView.m */; }; - 237852A72C08764B00E360AC /* MSRoomGameResultsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237852A62C08764B00E360AC /* MSRoomGameResultsModel.m */; }; - 237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */; }; - 237B94BD2A984DA7007853E3 /* XPNobleTrumpetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B32A984DA7007853E3 /* XPNobleTrumpetModel.m */; }; - 237B94BE2A984DA7007853E3 /* XPRoomTrumpetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B72A984DA7007853E3 /* XPRoomTrumpetViewController.m */; }; - 237B94BF2A984DA7007853E3 /* XPRoomTrumpetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B82A984DA7007853E3 /* XPRoomTrumpetView.m */; }; - 237B94C02A984DA7007853E3 /* Api+RoomTrumpet.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94BA2A984DA7007853E3 /* Api+RoomTrumpet.m */; }; - 237FD35D2C0F187B00B5335C /* pi_app_logo_new_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 237FD35C2C0F187B00B5335C /* pi_app_logo_new_bg.png */; }; - 238A90072BA9729200828123 /* PIUniversalBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 238A90062BA9729200828123 /* PIUniversalBannerView.m */; }; - 238A900A2BA9756600828123 /* PIUniversalBannerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 238A90092BA9756600828123 /* PIUniversalBannerModel.m */; }; - 238ED83A2AE2891D0014EF9D /* PIRoomEnterRedPacketView.m in Sources */ = {isa = PBXBuildFile; fileRef = 238ED8392AE2891D0014EF9D /* PIRoomEnterRedPacketView.m */; }; - 239141C62AE129F700322CA9 /* PIInputScrollingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239141C52AE129F700322CA9 /* PIInputScrollingView.m */; }; - 239141C92AE1358F00322CA9 /* PIInputEntireServerScrollingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239141C82AE1358F00322CA9 /* PIInputEntireServerScrollingView.m */; }; - 239141CC2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239141CB2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m */; }; - 23942E912A86424500D0ECC2 /* XPLoginAuthCodeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */; }; 23959FE72BB15C930085A282 /* UploadFileModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23959FE62BB15C930085A282 /* UploadFileModel.m */; }; - 2396FCE42B22BE5D0014021D /* pi_area_info.json in Resources */ = {isa = PBXBuildFile; fileRef = 2396FCE32B22BE5D0014021D /* pi_area_info.json */; }; - 239BEEDB2AA1E058005CDA94 /* PIHoemCategoryTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */; }; - 239D0F962BFB3296002977CE /* MSRoomOnLineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0F952BFB3296002977CE /* MSRoomOnLineView.m */; }; - 239D0F992BFB43BC002977CE /* MSRoomOnLineAvatarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0F982BFB43BC002977CE /* MSRoomOnLineAvatarView.m */; }; - 239D0F9B2BFC9E6C002977CE /* ms_room_gift_svga_icon.svga in Resources */ = {isa = PBXBuildFile; fileRef = 239D0F9A2BFC9E6C002977CE /* ms_room_gift_svga_icon.svga */; }; - 239D0FA82BFCB88D002977CE /* XPRoomBackContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0F9C2BFCB88C002977CE /* XPRoomBackContainerView.m */; }; - 239D0FA92BFCB88D002977CE /* XPRoomDatingVipUpMicView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FA12BFCB88D002977CE /* XPRoomDatingVipUpMicView.m */; }; - 239D0FAA2BFCB88D002977CE /* XPRoomDatingWebAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FA22BFCB88D002977CE /* XPRoomDatingWebAlertView.m */; }; - 239D0FAB2BFCB88D002977CE /* XPRoomFunctionContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FA32BFCB88D002977CE /* XPRoomFunctionContainerView.m */; }; - 239D0FAC2BFCB88D002977CE /* XPRoomRankEntranceView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FA42BFCB88D002977CE /* XPRoomRankEntranceView.m */; }; - 239D0FAD2BFCB88D002977CE /* XPRoomAnchorRankEnterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FA52BFCB88D002977CE /* XPRoomAnchorRankEnterView.m */; }; - 239D0FB32BFD8C67002977CE /* MSRoomSetingBackdropCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FB22BFD8C67002977CE /* MSRoomSetingBackdropCell.m */; }; - 239D0FC92C045F92002977CE /* MSRoomGameVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FC62C045F92002977CE /* MSRoomGameVC.m */; }; - 239D0FCC2C045FC9002977CE /* MSTabbarRoomGameVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FCB2C045FC9002977CE /* MSTabbarRoomGameVC.m */; }; - 239D0FCF2C046048002977CE /* MSTabbarRoomGameHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FCE2C046048002977CE /* MSTabbarRoomGameHeadView.m */; }; - 239D0FD22C046EAD002977CE /* MSTabbarRoomGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FD12C046EAD002977CE /* MSTabbarRoomGameView.m */; }; - 239D0FD52C0475E6002977CE /* MSTabbarBeginGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FD42C0475E6002977CE /* MSTabbarBeginGameView.m */; }; - 239D0FD82C047DD8002977CE /* MSTabbarRoomGameModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FD72C047DD8002977CE /* MSTabbarRoomGameModel.m */; }; - 239D0FDB2C047F24002977CE /* MSTabbarRoomGameCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FDA2C047F24002977CE /* MSTabbarRoomGameCell.m */; }; - 239D0FE12C04850A002977CE /* MSRoomGameHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FE02C04850A002977CE /* MSRoomGameHeadView.m */; }; - 239D0FE42C048700002977CE /* MSRoomGameHeadAvatarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FE32C048700002977CE /* MSRoomGameHeadAvatarView.m */; }; - 239D0FE72C049D61002977CE /* MSRoomGameMsgView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FE62C049D61002977CE /* MSRoomGameMsgView.m */; }; - 239D0FEA2C04A9EE002977CE /* MSRoomGameSendMsgView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FE92C04A9EE002977CE /* MSRoomGameSendMsgView.m */; }; - 239D0FED2C057362002977CE /* Api+MSRoomGameApi.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FEC2C057362002977CE /* Api+MSRoomGameApi.m */; }; - 239D0FF02C057470002977CE /* MSRoomGamePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FEF2C057470002977CE /* MSRoomGamePresenter.m */; }; - 239D0FF42C05B9D2002977CE /* MSRoomGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FF32C05B9D2002977CE /* MSRoomGameView.m */; }; - 239D0FF72C05BD2A002977CE /* MSRoomGameVictoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FF62C05BD2A002977CE /* MSRoomGameVictoryView.m */; }; - 239D0FFA2C05BE9B002977CE /* MSRoomGameVictoryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FF92C05BE9B002977CE /* MSRoomGameVictoryCell.m */; }; - 239D0FFD2C05D086002977CE /* MSRoomGameQuitGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FFC2C05D086002977CE /* MSRoomGameQuitGameView.m */; }; - 23A03F2D2B4408CD0094227A /* pi_room_lucky_gift.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */; }; - 23A439742AA1CF7C002E6039 /* XPNewHomeHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */; }; - 23A7FB692BDDEDFA00411860 /* MSRoomGameWebVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23A7FB682BDDEDFA00411860 /* MSRoomGameWebVC.m */; }; - 23B2AEC12A64E9C200543D17 /* LoginForgetEditView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2AEC02A64E9C200543D17 /* LoginForgetEditView.m */; }; - 23B2AEC42A6516C200543D17 /* LoginForgetPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2AEC22A6516C200543D17 /* LoginForgetPasswordViewController.m */; }; - 23B8D8D82B85F8B900CA472F /* PIHoemCategoryTitleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B8D8D72B85F8B900CA472F /* PIHoemCategoryTitleCell.m */; }; - 23B8D8DB2B85FDDD00CA472F /* PIHomeCategoryTitleModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B8D8DA2B85FDDD00CA472F /* PIHomeCategoryTitleModel.m */; }; - 23B8D8DE2B860B8800CA472F /* PIHoemCategoryCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B8D8DD2B860B8800CA472F /* PIHoemCategoryCollectionView.m */; }; - 23B8D8E12B87715100CA472F /* PIGeneralPublicScreenModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B8D8E02B87715100CA472F /* PIGeneralPublicScreenModel.m */; }; - 23BA165B2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23BA165A2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m */; }; - 23C7C0B72A7CD7B000802205 /* XPNewMineGuildItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C7C0B62A7CD7B000802205 /* XPNewMineGuildItemView.m */; }; - 23C9DFC32B84807A00B51558 /* PIRoomActivityClickView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C9DFC22B84807A00B51558 /* PIRoomActivityClickView.m */; }; - 23C9DFC62B84903500B51558 /* PIRoomActivityChoosePlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C9DFC52B84903500B51558 /* PIRoomActivityChoosePlayView.m */; }; - 23C9DFC92B84917B00B51558 /* PIRoomActivityChoosePlayCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C9DFC82B84917B00B51558 /* PIRoomActivityChoosePlayCell.m */; }; - 23C9DFCC2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C9DFCB2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.m */; }; - 23C9DFCF2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C9DFCE2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.m */; }; - 23CEFB6C2AFB803B00576D89 /* PISwitchingEnvironmentVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFB6B2AFB803B00576D89 /* PISwitchingEnvironmentVC.m */; }; 23CEFC4A2AFB8FC100576D89 /* BSNSStringUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC0C2AFB8FC100576D89 /* BSNSStringUtil.m */; }; 23CEFC4B2AFB8FC100576D89 /* BSUIDemoUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC0D2AFB8FC100576D89 /* BSUIDemoUtil.m */; }; 23CEFC4C2AFB8FC100576D89 /* BS_UIColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC0F2AFB8FC100576D89 /* BS_UIColor.m */; }; @@ -318,211 +84,35 @@ 23CEFC632AFB8FC100576D89 /* BSRealTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC442AFB8FC100576D89 /* BSRealTextView.m */; }; 23CEFC642AFB8FC100576D89 /* BSkObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC472AFB8FC100576D89 /* BSkObject.m */; }; 23CEFC652AFB8FC100576D89 /* BSDrawLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC482AFB8FC100576D89 /* BSDrawLine.m */; }; - 23CEFC682AFCCE7700576D89 /* PIGiftInfoSegmentedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC672AFCCE7700576D89 /* PIGiftInfoSegmentedView.m */; }; - 23D321D22ADD0EBC006B259C /* PIRoomPhotoAlbumItemPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321D12ADD0EBC006B259C /* PIRoomPhotoAlbumItemPresenter.m */; }; - 23D321D52ADD0F05006B259C /* Api+PhotoAlbum.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321D42ADD0F05006B259C /* Api+PhotoAlbum.m */; }; - 23D321D92ADD1B46006B259C /* PIRoomPhotoAlbumItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321D82ADD1B46006B259C /* PIRoomPhotoAlbumItemModel.m */; }; - 23D321DC2ADFBFF6006B259C /* PIInputRedPacketView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321DB2ADFBFF6006B259C /* PIInputRedPacketView.m */; }; - 23D321DF2ADFCEB2006B259C /* PIRedPacketChooseTypeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321DE2ADFCEB2006B259C /* PIRedPacketChooseTypeView.m */; }; - 23D321E22ADFD0FB006B259C /* PIRedPacketChooseTypeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321E12ADFD0FB006B259C /* PIRedPacketChooseTypeCell.m */; }; - 23D321E52ADFE900006B259C /* PIRoomSendRedPacketVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321E42ADFE900006B259C /* PIRoomSendRedPacketVC.m */; }; - 23D321E82ADFED10006B259C /* PIRoomSendRedPacketItemVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321E72ADFED0F006B259C /* PIRoomSendRedPacketItemVC.m */; }; 23D8DEF22AC5633300644637 /* PIIAPRegulate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23D8DEF12AC5633300644637 /* PIIAPRegulate.swift */; }; - 23E45C052AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E45C042AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m */; }; 23E56B3C2B03564B00C8DAC9 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23E56B3B2B03564B00C8DAC9 /* CoreTelephony.framework */; }; - 23E7FE9C2BB6CD42008F6800 /* XPNobleCenterWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E7FE9B2BB6CD42008F6800 /* XPNobleCenterWindow.m */; }; - 23E9E9972A80C3A100B792F2 /* XPMineGuildPersonalBillRecordVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9942A80C39F00B792F2 /* XPMineGuildPersonalBillRecordVC.m */; }; - 23E9E9982A80C3A100B792F2 /* XPMineGuildPersonalBillStatisVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9962A80C3A100B792F2 /* XPMineGuildPersonalBillStatisVC.m */; }; - 23E9E99B2A80C40000B792F2 /* XPMineGuildPersonalBillRecordHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9992A80C3FF00B792F2 /* XPMineGuildPersonalBillRecordHeadView.m */; }; - 23E9E99E2A80C7AF00B792F2 /* XPMineGuildPersonalBillRecordItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E99C2A80C7AE00B792F2 /* XPMineGuildPersonalBillRecordItemView.m */; }; - 23E9E9A12A80C7E000B792F2 /* XPMineGuildPersonalBillRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9A02A80C7E000B792F2 /* XPMineGuildPersonalBillRecordModel.m */; }; - 23E9E9A42A80DEAF00B792F2 /* XPMineGuildPersonalBillRecordContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9A32A80DEAF00B792F2 /* XPMineGuildPersonalBillRecordContentView.m */; }; - 23E9E9A72A80F1C300B792F2 /* XPNewMineHallIncomeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9A62A80F1C300B792F2 /* XPNewMineHallIncomeVC.m */; }; - 23E9E9AA2A80FDF100B792F2 /* XPNewMineHallIncomeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9A92A80FDF100B792F2 /* XPNewMineHallIncomeCell.m */; }; - 23E9E9B72A82200500B792F2 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 23E9E9B62A82200500B792F2 /* GoogleService-Info.plist */; }; - 23E9EA6B2A83808000B792F2 /* ContentTreasureFairyModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EA6A2A83808000B792F2 /* ContentTreasureFairyModel.m */; }; 23E9EA842A84B6FD00B792F2 /* XPMineUserInfoTagModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EA802A84B6FC00B792F2 /* XPMineUserInfoTagModel.m */; }; 23E9EA852A84B6FD00B792F2 /* XPSoundCardModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EA832A84B6FD00B792F2 /* XPSoundCardModel.m */; }; - 23E9EA882A84B75900B792F2 /* XPMineUserInfoHeaderTagView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EA862A84B75900B792F2 /* XPMineUserInfoHeaderTagView.m */; }; - 23E9EA8B2A84B9BD00B792F2 /* XPMineUserInfoTagFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EA8A2A84B9BD00B792F2 /* XPMineUserInfoTagFlowLayout.m */; }; - 23E9EA8E2A84BC9000B792F2 /* XPMineUserInfoHeaderTagCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EA8D2A84BC9000B792F2 /* XPMineUserInfoHeaderTagCell.m */; }; - 23E9EA912A84BD5B00B792F2 /* XPMineUserInfoIndividualTagView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EA8F2A84BD5B00B792F2 /* XPMineUserInfoIndividualTagView.m */; }; - 23E9EA942A84BE4800B792F2 /* XPGiftUserDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EA922A84BE4800B792F2 /* XPGiftUserDataViewController.m */; }; - 23E9EA9A2A84C39700B792F2 /* XPMineUserInfoRecordedSoundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EA992A84C39700B792F2 /* XPMineUserInfoRecordedSoundView.m */; }; 23E9EA9E2A84C42B00B792F2 /* SGYProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EA9D2A84C42B00B792F2 /* SGYProgressView.m */; }; - 23E9EAA32A84C80300B792F2 /* pi_new_loading.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23E9EAA22A84C80300B792F2 /* pi_new_loading.svga */; }; - 23E9EAA62A84C97C00B792F2 /* XPMineUserInfoTagVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EAA52A84C97C00B792F2 /* XPMineUserInfoTagVC.m */; }; - 23E9EAAD2A84C9B800B792F2 /* XPMineUserInfoTagItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EAA82A84C9B700B792F2 /* XPMineUserInfoTagItemView.m */; }; - 23E9EAAE2A84C9B800B792F2 /* XPMineUserInfoTagView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EAAA2A84C9B700B792F2 /* XPMineUserInfoTagView.m */; }; - 23E9EAAF2A84C9B800B792F2 /* XPMineUserInfoTagHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EAAB2A84C9B800B792F2 /* XPMineUserInfoTagHeadView.m */; }; - 23E9EAB22A84C9DE00B792F2 /* XPMineUserInfoTagViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EAB12A84C9DE00B792F2 /* XPMineUserInfoTagViewCell.m */; }; - 23E9EAB52A84CB2700B792F2 /* XPMineUserInfoTagEmptyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EAB32A84CB2600B792F2 /* XPMineUserInfoTagEmptyView.m */; }; - 23E9EABB2A84CCBE00B792F2 /* XPMineDataSkillDataCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EAB92A84CCBD00B792F2 /* XPMineDataSkillDataCollectionViewCell.m */; }; - 23E9EB152A84D02400B792F2 /* XPMineUserInfoEditPickView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EB142A84D02400B792F2 /* XPMineUserInfoEditPickView.m */; }; - 23E9EB182A84D0E700B792F2 /* XPMineUserInfoEditMainTagView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EB162A84D0E700B792F2 /* XPMineUserInfoEditMainTagView.m */; }; - 23E9EB1B2A84D28A00B792F2 /* XPMineUserInfoEditTagView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EB1A2A84D28A00B792F2 /* XPMineUserInfoEditTagView.m */; }; - 23E9EB1E2A84DA5F00B792F2 /* XPMineUserInfoNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9EB1C2A84DA5F00B792F2 /* XPMineUserInfoNavView.m */; }; - 23E9EB242A84E98300B792F2 /* pi_new_mine_info_sound_play.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23E9EB222A84E98300B792F2 /* pi_new_mine_info_sound_play.svga */; }; - 23E9EB252A84E98300B792F2 /* pi_new_mine_info_online.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */; }; - 23EE96F22B9FF6BE00475D69 /* pi_crazy_zoo.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */; }; - 23EE970A2BA2D39C00475D69 /* PIWebViewSavePhotoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23EE97092BA2D39C00475D69 /* PIWebViewSavePhotoView.m */; }; - 23F9636A2BB6919D00F440A6 /* PINobleRebateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F963692BB6919D00F440A6 /* PINobleRebateModel.m */; }; - 23FE47D52BB3C64600F09D23 /* PINobleCenterTitleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47D42BB3C64600F09D23 /* PINobleCenterTitleCell.m */; }; - 23FE47D82BB3CEAF00F09D23 /* PINobleCenterTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47D72BB3CEAF00F09D23 /* PINobleCenterTitleView.m */; }; - 23FE47DB2BB4171C00F09D23 /* PINobleCenterListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47DA2BB4171C00F09D23 /* PINobleCenterListView.m */; }; - 23FE47E12BB41CF200F09D23 /* PINobleCenterListReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47E02BB41CF200F09D23 /* PINobleCenterListReusableView.m */; }; - 23FE47E42BB41EBF00F09D23 /* PINobleCenterListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47E32BB41EBF00F09D23 /* PINobleCenterListCell.m */; }; - 23FE47E72BB4378700F09D23 /* PINobleCenterListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FE47E62BB4378700F09D23 /* PINobleCenterListModel.m */; }; - 23FF255B2AB956D50064E904 /* pi_home_new_pk.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23FF255A2AB956D50064E904 /* pi_home_new_pk.svga */; }; - 23FF25622ABAE6310064E904 /* pi_room_game_fine_love.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */; }; - 23FF25652ABC3B3C0064E904 /* XPHomeGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF25642ABC3B3B0064E904 /* XPHomeGameView.m */; }; - 23FF25682ABC3BC00064E904 /* XPHomeGameCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF25672ABC3BC00064E904 /* XPHomeGameCell.m */; }; - 23FF256E2ABC48810064E904 /* XPSessionMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF256C2ABC48810064E904 /* XPSessionMainViewController.m */; }; - 23FF25702ABD456C0064E904 /* pi_home_new_play.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23FF256F2ABD456C0064E904 /* pi_home_new_play.svga */; }; - 23FF25762ABD66B90064E904 /* XPFreeGiftsObtainView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF25742ABD66B90064E904 /* XPFreeGiftsObtainView.m */; }; - 23FF25792ABD67CD0064E904 /* XPFreeGiftModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF25772ABD67CD0064E904 /* XPFreeGiftModel.m */; }; - 23FF257C2ABD68020064E904 /* XPGiftFreeItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF257B2ABD68020064E904 /* XPGiftFreeItemCell.m */; }; - 23FF42632AA5861E0055733C /* XPNewHomePartyCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42622AA5861E0055733C /* XPNewHomePartyCollectionViewCell.m */; }; - 23FF42672AA5CFBB0055733C /* home_sound_wave.gif in Resources */ = {isa = PBXBuildFile; fileRef = 23FF42662AA5CFBB0055733C /* home_sound_wave.gif */; }; - 23FF426A2AA5DF050055733C /* XPNewHomePartyTagView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42692AA5DF050055733C /* XPNewHomePartyTagView.m */; }; - 23FF426D2AA5E4EE0055733C /* XPNewHomePartyAudioView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF426C2AA5E4EE0055733C /* XPNewHomePartyAudioView.m */; }; - 23FF42702AA6C7CF0055733C /* XPNewHomeItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF426F2AA6C7CF0055733C /* XPNewHomeItemCell.m */; }; - 23FF42732AA6CC480055733C /* PIHomeItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42722AA6CC480055733C /* PIHomeItemModel.m */; }; - 23FF42762AA6E1480055733C /* XPHomeRecommendOtherRoomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42752AA6E1480055733C /* XPHomeRecommendOtherRoomView.m */; }; - 23FF42792AA6E19C0055733C /* HomeMenuSourceModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42782AA6E19C0055733C /* HomeMenuSourceModel.m */; }; - 23FF428E2AAB2D3A0055733C /* XPCandyTreeBuyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF428D2AAB2D3A0055733C /* XPCandyTreeBuyView.m */; }; 4C06427F2E97BD6D00BAF413 /* EPMineHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0642732E97BD6D00BAF413 /* EPMineHeaderView.m */; }; 4C0642802E97BD6D00BAF413 /* EPMomentCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C06427A2E97BD6D00BAF413 /* EPMomentCell.m */; }; 4C0642852E97BD9500BAF413 /* APIConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0642842E97BD9500BAF413 /* APIConfig.swift */; }; - 4C0642882E97BDA300BAF413 /* GlobalEventManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0642872E97BDA300BAF413 /* GlobalEventManager.m */; }; 4C06428B2E98DC5F00BAF413 /* EPTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C06428A2E98DC5F00BAF413 /* EPTabBarController.swift */; }; 4C0642912E98DC8700BAF413 /* EPMomentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0642902E98DC8700BAF413 /* EPMomentViewController.m */; }; 4C0642992E98F77900BAF413 /* EPMomentListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0642982E98F77900BAF413 /* EPMomentListView.m */; }; 4C06429C2E99120600BAF413 /* EPMomentPublishViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C06429B2E99120600BAF413 /* EPMomentPublishViewController.m */; }; - 4C0A5B842E02675300955219 /* MedalsCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A5B832E02675300955219 /* MedalsCollectionViewCell.m */; }; - 4C0A5B872E02BB1100955219 /* MedalsLevelIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A5B862E02BB1100955219 /* MedalsLevelIndicatorView.m */; }; - 4C0A5B8A2E02BC3900955219 /* MedalsDetailView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A5B892E02BC3900955219 /* MedalsDetailView.m */; }; - 4C0A5B902E03EF4B00955219 /* MedalsWearingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A5B8F2E03EF4B00955219 /* MedalsWearingViewController.m */; }; - 4C0B4A3A2E6579C700D67F73 /* XPPKAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0B4A392E6579C700D67F73 /* XPPKAction.m */; }; - 4C0B4A3E2E659A2C00D67F73 /* XPRoomTypeSettingAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0B4A3D2E659A2C00D67F73 /* XPRoomTypeSettingAction.m */; }; - 4C0B4A412E659DC100D67F73 /* XPRoomBackGroundSettingAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0B4A402E659DC100D67F73 /* XPRoomBackGroundSettingAction.m */; }; - 4C0B4A442E65A0D300D67F73 /* XPRoomCleanMessagesAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0B4A432E65A0D300D67F73 /* XPRoomCleanMessagesAction.m */; }; - 4C0B4A472E65A51600D67F73 /* XPRoomRedPacketAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0B4A462E65A51600D67F73 /* XPRoomRedPacketAction.m */; }; - 4C0B4A4A2E65A5D500D67F73 /* XPRoomMusicPanelAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0B4A492E65A5D500D67F73 /* XPRoomMusicPanelAction.m */; }; - 4C0B4A4D2E65A63400D67F73 /* XPRoomRoomPhotoAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0B4A4C2E65A63400D67F73 /* XPRoomRoomPhotoAction.m */; }; - 4C0B4A502E65A68800D67F73 /* XPRoomAppManagerAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0B4A4F2E65A68800D67F73 /* XPRoomAppManagerAction.m */; }; 4C1064882E0014CF007E1586 /* NSMutableArray+Safe.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1064872E0014CF007E1586 /* NSMutableArray+Safe.m */; }; - 4C1119722DD7218300C18416 /* MyEventsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1119712DD7218300C18416 /* MyEventsViewController.m */; }; - 4C1392932D6D963700A6DFB5 /* SubRechargersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1392922D6D963600A6DFB5 /* SubRechargersViewController.m */; }; - 4C1392962D6DA22B00A6DFB5 /* RechargerTransferHistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1392952D6DA22B00A6DFB5 /* RechargerTransferHistoryViewController.m */; }; - 4C13929D2D70441500A6DFB5 /* giftgift.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 4C13929B2D70441500A6DFB5 /* giftgift.mp4 */; }; - 4C1392A12D71675900A6DFB5 /* coincoin.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 4C1392A02D71675900A6DFB5 /* coincoin.mp4 */; }; - 4C1892992CF84349004D4426 /* RoomCahtCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1892982CF84349004D4426 /* RoomCahtCell.m */; }; - 4C1A141B2DCB4AB700B6D0CA /* ChatFaceVo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1A141A2DCB4AB700B6D0CA /* ChatFaceVo.m */; }; 4C1E98BF2E9A3A540031AE79 /* EPMineAPIHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1E98BD2E9A3A540031AE79 /* EPMineAPIHelper.m */; }; 4C1E98C32E9A45160031AE79 /* EPImageUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1E98C02E9A45160031AE79 /* EPImageUploader.swift */; }; 4C1E98C42E9A45160031AE79 /* EPProgressHUD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1E98C12E9A45160031AE79 /* EPProgressHUD.swift */; }; 4C1E98C62E9A45BC0031AE79 /* EPMomentAPISwiftHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1E98C52E9A45BC0031AE79 /* EPMomentAPISwiftHelper.swift */; }; 4C1E98C92E9A4DFD0031AE79 /* EPQCloudConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1E98C72E9A4DFD0031AE79 /* EPQCloudConfig.swift */; }; 4C1E98CA2E9A4DFD0031AE79 /* EPSDKManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C1E98C82E9A4DFD0031AE79 /* EPSDKManager.swift */; }; - 4C3475C42DD1FE590099B984 /* CreateEventSelectRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3475C32DD1FE590099B984 /* CreateEventSelectRoomViewController.m */; }; - 4C3851992DD5F4D50089CFCC /* EventConfigModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3851982DD5F4D50089CFCC /* EventConfigModel.m */; }; - 4C38C2AD2D84064400CFA4A8 /* LoginInputItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C38C2AC2D84064300CFA4A8 /* LoginInputItemView.m */; }; - 4C38C2B02D84070600CFA4A8 /* AccountBindingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C38C2AF2D84070600CFA4A8 /* AccountBindingViewController.m */; }; - 4C4283F62E66C769006779B0 /* XPEffectPanelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4283F52E66C769006779B0 /* XPEffectPanelViewController.m */; }; - 4C44BD5D2D151B5C00F321FA /* RoomSideMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C44BD5C2D151B5C00F321FA /* RoomSideMenu.m */; }; - 4C45C1A52E6825F300E73A44 /* XPTurboModeConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C45C1A42E6825F300E73A44 /* XPTurboModeConstants.m */; }; - 4C45C1A92E6837BF00E73A44 /* TurboModeStateManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C45C1A72E6837BF00E73A44 /* TurboModeStateManager.m */; }; - 4C45C1AC2E68545E00E73A44 /* XPTurboModeTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C45C1AB2E68545E00E73A44 /* XPTurboModeTipsView.m */; }; - 4C45C1AF2E6855F600E73A44 /* XPTurboModeTipsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C45C1AE2E6855F600E73A44 /* XPTurboModeTipsManager.m */; }; 4C4707A52D53430300C8CD24 /* NSData+GZIP.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4707A42D53430300C8CD24 /* NSData+GZIP.m */; }; - 4C51B09C2DA3B4C600D8DFB5 /* LudoGameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C51B09B2DA3B4C600D8DFB5 /* LudoGameViewController.m */; }; - 4C51B09F2DA50FDA00D8DFB5 /* CPRelationshipChangeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C51B09E2DA50FDA00D8DFB5 /* CPRelationshipChangeView.m */; }; - 4C520D852D894E8C0051C784 /* SocialShareManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C520D842D894E8C0051C784 /* SocialShareManager.m */; }; - 4C520D882D89A78C0051C784 /* VisitorListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C520D872D89A78C0051C784 /* VisitorListViewController.m */; }; - 4C5527BC2D1BDCDE00833FFD /* RoomLevelInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5527BB2D1BDCDE00833FFD /* RoomLevelInfoModel.m */; }; - 4C5527BF2D1C099500833FFD /* RoomResourceManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5527BE2D1C099500833FFD /* RoomResourceManager.m */; }; - 4C5C37232D0C1C7900BA9AB8 /* RegionListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5C37222D0C1C7900BA9AB8 /* RegionListViewController.m */; }; 4C6C92C02D1172D9000A4693 /* RegionListInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6C92BF2D1172D9000A4693 /* RegionListInfo.m */; }; - 4C6E1F752CEAEC3C0073D0A3 /* ShoppingMallTagView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6E1F742CEAEC3C0073D0A3 /* ShoppingMallTagView.m */; }; - 4C6E1F7C2CEB25B10073D0A3 /* ShoppingMallItemPreview.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6E1F7B2CEB25B10073D0A3 /* ShoppingMallItemPreview.m */; }; - 4C6E31EC2D35010F00D8EEDD /* RoomAnimationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6E31EB2D35010F00D8EEDD /* RoomAnimationView.m */; }; - 4C6E31EE2D363CA800D8EEDD /* addMoveAnimationToView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6E31ED2D363CA800D8EEDD /* addMoveAnimationToView.m */; }; - 4C7153952E0942F700C9F940 /* MedalsCyclePagerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7153942E0942F700C9F940 /* MedalsCyclePagerCell.m */; }; - 4C71C69F2D069D2B00ECCA24 /* GiftAnimationHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C71C69E2D069D2B00ECCA24 /* GiftAnimationHelper.m */; }; - 4C71C6A22D06DB3D00ECCA24 /* GiftAnimationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C71C6A12D06DB3D00ECCA24 /* GiftAnimationManager.m */; }; - 4C729E4C2E5318AA00E5171E /* GiftComboUIAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C729E4B2E5318AA00E5171E /* GiftComboUIAdapter.m */; }; - 4C729E4D2E5318AA00E5171E /* GiftComboConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C729E472E5318AA00E5171E /* GiftComboConfig.m */; }; - 4C729E4E2E5318AA00E5171E /* GiftComboTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C729E492E5318AA00E5171E /* GiftComboTransport.m */; }; - 4C75472E2E55837300C6E821 /* BannerScheduler.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C75472D2E55837200C6E821 /* BannerScheduler.m */; }; - 4C7547312E55A7ED00C6E821 /* TouchAreaCacheManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7547302E55A7ED00C6E821 /* TouchAreaCacheManager.m */; }; - 4C7547342E55AAB100C6E821 /* GestureOptimizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7547332E55AAB100C6E821 /* GestureOptimizer.m */; }; - 4C75CEFB2D6318FF009147A5 /* RoomEnterModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C75CEFA2D6318FF009147A5 /* RoomEnterModel.m */; }; - 4C75CEFE2D632CD5009147A5 /* CPEnterRoomTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C75CEFD2D632CD5009147A5 /* CPEnterRoomTableViewCell.m */; }; - 4C75CF002D633C27009147A5 /* CP进场.svga in Resources */ = {isa = PBXBuildFile; fileRef = 4C75CEFF2D633C27009147A5 /* CP进场.svga */; }; - 4C7989EF2D195277006AE07B /* RoomModeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7989EE2D195277006AE07B /* RoomModeViewController.m */; }; - 4C7989F32D1952DA006AE07B /* RoomModePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7989F22D1952DA006AE07B /* RoomModePresenter.m */; }; 4C7B8F632E9F6E1300A5E236 /* EPSignatureColorGuideView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B8F622E9F6E1300A5E236 /* EPSignatureColorGuideView.m */; }; 4C7B90982E9F70FC00A5E236 /* ep_splash.png in Resources */ = {isa = PBXBuildFile; fileRef = 4C7B90972E9F70FC00A5E236 /* ep_splash.png */; }; 4C7B909B2E9F822900A5E236 /* EPEmotionColorWheelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B909A2E9F822900A5E236 /* EPEmotionColorWheelView.m */; }; 4C7B91D82EA096DE00A5E236 /* EPEmotionInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B91D72EA096DE00A5E236 /* EPEmotionInfoView.m */; }; - 4C7F2A672E0BE0AB002F5058 /* FirstRechargeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7F2A662E0BE0AB002F5058 /* FirstRechargeModel.m */; }; - 4C7F2A6B2E0BE7E7002F5058 /* FirstRechargeManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7F2A6A2E0BE7E7002F5058 /* FirstRechargeManager.m */; }; - 4C815A172CFEB758002A46A6 /* SuperBlockViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C815A162CFEB758002A46A6 /* SuperBlockViewController.m */; }; - 4C816A7F2E826C7300EA6A45 /* XPMessageItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C816A7E2E826C7300EA6A45 /* XPMessageItem.m */; }; - 4C816A802E826C7300EA6A45 /* XPMessageDataSourceManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C816A7C2E826C7300EA6A45 /* XPMessageDataSourceManager.m */; }; - 4C84A9C22E5ED593002C10FC /* GameBannerGestureManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C84A9C12E5ED593002C10FC /* GameBannerGestureManager.m */; }; - 4C84A9CB2E602B1A002C10FC /* BuglyManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C84A9CA2E602B1A002C10FC /* BuglyManager.m */; }; - 4C85DB812DCDD83E00FD9839 /* CreateEventPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C85DB802DCDD83E00FD9839 /* CreateEventPresenter.m */; }; - 4C85DB842DCDDD6800FD9839 /* CreateEventViewControllerV2.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C85DB832DCDDD6800FD9839 /* CreateEventViewControllerV2.m */; }; - 4C864A022D55F4F600191AE0 /* LuckyPackagePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C864A012D55F4F600191AE0 /* LuckyPackagePresenter.m */; }; - 4C864A052D561E1D00191AE0 /* LuckyPackageLogicManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C864A042D561E1D00191AE0 /* LuckyPackageLogicManager.m */; }; - 4C886BE82E013C55006F0BA7 /* MedalsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C886BE72E013C55006F0BA7 /* MedalsViewController.m */; }; - 4C886BEB2E014AE5006F0BA7 /* MedalsPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C886BEA2E014AE5006F0BA7 /* MedalsPresenter.m */; }; 4C886BEE2E014B6C006F0BA7 /* Api+Medals.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C886BED2E014B6C006F0BA7 /* Api+Medals.m */; }; 4C886BF22E015D61006F0BA7 /* MedalsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C886BF12E015D61006F0BA7 /* MedalsModel.m */; }; - 4C9828132E6EB50000FC6345 /* MicCpInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C9828122E6EB50000FC6345 /* MicCpInfoModel.m */; }; - 4CA532B42D5AEE9400B8F59F /* Api+LuckyPackage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA532B32D5AEE9400B8F59F /* Api+LuckyPackage.m */; }; - 4CA532B72D5B333200B8F59F /* RoomLuckyPackageInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA532B62D5B333200B8F59F /* RoomLuckyPackageInfoModel.m */; }; - 4CA532BA2D5C8EBE00B8F59F /* LuckyPackageBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA532B92D5C8EBE00B8F59F /* LuckyPackageBannerView.m */; }; - 4CA532BD2D5CA49A00B8F59F /* OpenLuckyPackageEntranceView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA532BC2D5CA49A00B8F59F /* OpenLuckyPackageEntranceView.m */; }; - 4CA532C02D5CA4D300B8F59F /* LuckyPackageStatusView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA532BF2D5CA4D300B8F59F /* LuckyPackageStatusView.m */; }; - 4CA532C32D5F37DC00B8F59F /* LuckyPackageMessageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA532C22D5F37DC00B8F59F /* LuckyPackageMessageTableViewCell.m */; }; - 4CA5A3342D93D4AB00CE41D6 /* 大.svga in Resources */ = {isa = PBXBuildFile; fileRef = 4CA5A3332D93D4AB00CE41D6 /* 大.svga */; }; 4CA7410E2E72B8FC00DB6853 /* YMLanguageConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA7410D2E72B8FC00DB6853 /* YMLanguageConfig.m */; }; - 4CACCCE42D9A695000CCB135 /* brove_gift.svga in Resources */ = {isa = PBXBuildFile; fileRef = 4CACCCE32D9A695000CCB135 /* brove_gift.svga */; }; - 4CAE69C52E69922B00A9FC35 /* mic_cp_lv1.svga in Resources */ = {isa = PBXBuildFile; fileRef = 4CAE69C02E69922B00A9FC35 /* mic_cp_lv1.svga */; }; - 4CAE69C62E69922B00A9FC35 /* mic_cp_lv2.svga in Resources */ = {isa = PBXBuildFile; fileRef = 4CAE69C12E69922B00A9FC35 /* mic_cp_lv2.svga */; }; - 4CAE69C72E69922B00A9FC35 /* mic_cp_lv4.svga in Resources */ = {isa = PBXBuildFile; fileRef = 4CAE69C32E69922B00A9FC35 /* mic_cp_lv4.svga */; }; - 4CAE69C82E69922B00A9FC35 /* mic_cp_lv5.svga in Resources */ = {isa = PBXBuildFile; fileRef = 4CAE69C42E69922B00A9FC35 /* mic_cp_lv5.svga */; }; - 4CAE69C92E69922B00A9FC35 /* mic_cp_lv3.svga in Resources */ = {isa = PBXBuildFile; fileRef = 4CAE69C22E69922B00A9FC35 /* mic_cp_lv3.svga */; }; - 4CAE69CC2E69A2DB00A9FC35 /* MicMidpointRectManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAE69CB2E69A2DB00A9FC35 /* MicMidpointRectManager.m */; }; - 4CAFEFF62DD2F21B00CD81DF /* CreateEventPickerContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAFEFF52DD2F21B00CD81DF /* CreateEventPickerContainerView.m */; }; - 4CAFF00A2DD342A400CD81DF /* MessagePublicEventModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAFF0092DD342A400CD81DF /* MessagePublicEventModel.m */; }; - 4CAFF00D2DD343B200CD81DF /* PublicEventTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAFF00C2DD343B200CD81DF /* PublicEventTableViewCell.m */; }; - 4CB41CEC2E053D6300528517 /* MedalsRankViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CB41CEB2E053D6300528517 /* MedalsRankViewController.m */; }; - 4CB753D22D30F10900B13DF5 /* LuckyPackageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CB753D12D30F10900B13DF5 /* LuckyPackageViewController.m */; }; - 4CBBB44C2DA66334001B1C6D /* MessageCPNotifyModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBBB44B2DA66334001B1C6D /* MessageCPNotifyModel.m */; }; - 4CBDC4242DC0B078005A75B9 /* EventCenterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBDC4232DC0B078005A75B9 /* EventCenterViewController.m */; }; - 4CBDC4272DC0B947005A75B9 /* EventCenterPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBDC4262DC0B947005A75B9 /* EventCenterPresenter.m */; }; - 4CBDC42A2DC0BB95005A75B9 /* EventCenterOfficialCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBDC4292DC0BB95005A75B9 /* EventCenterOfficialCell.m */; }; - 4CBDC42D2DC0BBB7005A75B9 /* EventCenterEventCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBDC42C2DC0BBB7005A75B9 /* EventCenterEventCell.m */; }; - 4CC312242D7987A200F57A07 /* ShareHelder.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC312232D7987A200F57A07 /* ShareHelder.m */; }; - 4CC312272D79A10100F57A07 /* ShareProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC312262D79A10100F57A07 /* ShareProvider.m */; }; - 4CC6195A2CEC7770008C1EE8 /* MyDressingDataPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC619592CEC7770008C1EE8 /* MyDressingDataPresent.m */; }; - 4CC6195D2CEC996E008C1EE8 /* MyDressingDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6195C2CEC996E008C1EE8 /* MyDressingDataModel.m */; }; - 4CC77BBD2E66A33C0067DA96 /* XPRoomEffectAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC77BBC2E66A33C0067DA96 /* XPRoomEffectAction.m */; }; - 4CCA0C6E2DDED89F00E30513 /* Custom9MicLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCA0C672DDED89F00E30513 /* Custom9MicLayout.m */; }; - 4CCA0C6F2DDED89F00E30513 /* UserRoomMicPositionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCA0C6D2DDED89F00E30513 /* UserRoomMicPositionView.m */; }; - 4CCA0C702DDED89F00E30513 /* UserRoomMicPositionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCA0C6B2DDED89F00E30513 /* UserRoomMicPositionCell.m */; }; - 4CCA0C712DDED89F00E30513 /* Custom19MicLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCA0C692DDED89F00E30513 /* Custom19MicLayout.m */; }; - 4CCB809F2DD5DFDF00C756D3 /* EventRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCB809E2DD5DFDF00C756D3 /* EventRoomModel.m */; }; - 4CCFDA002DD59038009BD2FD /* EventCenterEmptyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCFD9FF2DD59038009BD2FD /* EventCenterEmptyCell.m */; }; - 4CCFDA032DD59211009BD2FD /* Api+EventCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCFDA022DD59211009BD2FD /* Api+EventCenter.m */; }; - 4CCFDA062DD5C127009BD2FD /* EventItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCFDA052DD5C127009BD2FD /* EventItemModel.m */; }; - 4CD15D912D7E902800D9279F /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD15D902D7E902800D9279F /* LoginViewController.m */; }; 4CD15D922D7EC2AC00D9279F /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23E56B3B2B03564B00C8DAC9 /* CoreTelephony.framework */; }; - 4CD15D952D7FE9E400D9279F /* LoginTypesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD15D942D7FE9E400D9279F /* LoginTypesViewController.m */; }; 4CD19C872E9CB31C0069DAA0 /* EPLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19C7E2E9CB31C0069DAA0 /* EPLoginViewController.swift */; }; 4CD19C882E9CB31C0069DAA0 /* EPLoginState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19C802E9CB31C0069DAA0 /* EPLoginState.swift */; }; 4CD19C892E9CB31C0069DAA0 /* EPLoginTypesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19C7D2E9CB31C0069DAA0 /* EPLoginTypesViewController.swift */; }; @@ -531,201 +121,21 @@ 4CD19C8F2E9CBBC80069DAA0 /* EPLoginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19C8B2E9CBBC80069DAA0 /* EPLoginManager.swift */; }; 4CD19C912E9CBBD30069DAA0 /* EPLoginBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19C902E9CBBD30069DAA0 /* EPLoginBridge.swift */; }; 4CD19C932E9CCF2C0069DAA0 /* EPLoginConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19C922E9CCF2C0069DAA0 /* EPLoginConfig.swift */; }; - 4CD19DCA2E9CDF980069DAA0 /* emoji_124@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D1A2E9CDF980069DAA0 /* emoji_124@2x.png */; }; - 4CD19DCB2E9CDF980069DAA0 /* emoji_36@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CC22E9CDF980069DAA0 /* emoji_36@2x.png */; }; - 4CD19DCC2E9CDF980069DAA0 /* emoji_75@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CE92E9CDF980069DAA0 /* emoji_75@2x.png */; }; - 4CD19DCD2E9CDF980069DAA0 /* emoji_57@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CD72E9CDF980069DAA0 /* emoji_57@2x.png */; }; - 4CD19DCE2E9CDF980069DAA0 /* emoji_164@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D3B2E9CDF980069DAA0 /* emoji_164@2x.png */; }; - 4CD19DCF2E9CDF980069DAA0 /* emoji_04@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CA22E9CDF980069DAA0 /* emoji_04@2x.png */; }; - 4CD19DD02E9CDF980069DAA0 /* emoji_84@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CF22E9CDF980069DAA0 /* emoji_84@2x.png */; }; - 4CD19DD12E9CDF980069DAA0 /* emoji_58@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CD82E9CDF980069DAA0 /* emoji_58@2x.png */; }; - 4CD19DD22E9CDF980069DAA0 /* emoji_41@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CC72E9CDF980069DAA0 /* emoji_41@2x.png */; }; - 4CD19DD32E9CDF980069DAA0 /* emoj_s_normal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19C9B2E9CDF980069DAA0 /* emoj_s_normal@2x.png */; }; - 4CD19DD42E9CDF980069DAA0 /* emoji_60@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CDA2E9CDF980069DAA0 /* emoji_60@2x.png */; }; - 4CD19DD52E9CDF980069DAA0 /* emoji_117@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D132E9CDF980069DAA0 /* emoji_117@2x.png */; }; - 4CD19DD62E9CDF980069DAA0 /* emoji_48@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CCE2E9CDF980069DAA0 /* emoji_48@2x.png */; }; - 4CD19DD72E9CDF980069DAA0 /* emoji_92@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CFA2E9CDF980069DAA0 /* emoji_92@2x.png */; }; - 4CD19DD82E9CDF980069DAA0 /* emoji_104@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D062E9CDF980069DAA0 /* emoji_104@2x.png */; }; - 4CD19DD92E9CDF980069DAA0 /* emoji_53@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CD32E9CDF980069DAA0 /* emoji_53@2x.png */; }; - 4CD19DDA2E9CDF980069DAA0 /* emoji_26@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CB82E9CDF980069DAA0 /* emoji_26@2x.png */; }; - 4CD19DDB2E9CDF980069DAA0 /* emoji_103@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D052E9CDF980069DAA0 /* emoji_103@2x.png */; }; - 4CD19DDC2E9CDF980069DAA0 /* emoji_90@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CF82E9CDF980069DAA0 /* emoji_90@2x.png */; }; - 4CD19DDD2E9CDF980069DAA0 /* emoji_37@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CC32E9CDF980069DAA0 /* emoji_37@2x.png */; }; - 4CD19DDE2E9CDF980069DAA0 /* emoji_132@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D222E9CDF980069DAA0 /* emoji_132@2x.png */; }; - 4CD19DDF2E9CDF980069DAA0 /* emoji_67@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CE12E9CDF980069DAA0 /* emoji_67@2x.png */; }; - 4CD19DE02E9CDF980069DAA0 /* emoji_42@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CC82E9CDF980069DAA0 /* emoji_42@2x.png */; }; - 4CD19DE12E9CDF980069DAA0 /* emoji_99@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D012E9CDF980069DAA0 /* emoji_99@2x.png */; }; - 4CD19DE22E9CDF980069DAA0 /* emoji_165@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D3C2E9CDF980069DAA0 /* emoji_165@2x.png */; }; - 4CD19DE32E9CDF980069DAA0 /* emoji_46@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CCC2E9CDF980069DAA0 /* emoji_46@2x.png */; }; - 4CD19DE42E9CDF980069DAA0 /* emoji.xml in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19C9D2E9CDF980069DAA0 /* emoji.xml */; }; - 4CD19DE52E9CDF980069DAA0 /* emoji_52@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CD22E9CDF980069DAA0 /* emoji_52@2x.png */; }; - 4CD19DE62E9CDF980069DAA0 /* emoji_59@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CD92E9CDF980069DAA0 /* emoji_59@2x.png */; }; - 4CD19DE72E9CDF980069DAA0 /* emoji_25@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CB72E9CDF980069DAA0 /* emoji_25@2x.png */; }; - 4CD19DE82E9CDF980069DAA0 /* emoji_152@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D362E9CDF980069DAA0 /* emoji_152@2x.png */; }; - 4CD19DE92E9CDF980069DAA0 /* emoji_163@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D3A2E9CDF980069DAA0 /* emoji_163@2x.png */; }; - 4CD19DEA2E9CDF980069DAA0 /* emoji_146@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D302E9CDF980069DAA0 /* emoji_146@2x.png */; }; - 4CD19DEB2E9CDF980069DAA0 /* emoji_134@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D242E9CDF980069DAA0 /* emoji_134@2x.png */; }; - 4CD19DEC2E9CDF980069DAA0 /* emoji_19@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CB12E9CDF980069DAA0 /* emoji_19@2x.png */; }; - 4CD19DED2E9CDF980069DAA0 /* emoji_del_pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D402E9CDF980069DAA0 /* emoji_del_pressed@2x.png */; }; - 4CD19DEE2E9CDF980069DAA0 /* emoji.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D602E9CDF980069DAA0 /* emoji.plist */; }; - 4CD19DEF2E9CDF980069DAA0 /* emoji_109@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D0B2E9CDF980069DAA0 /* emoji_109@2x.png */; }; - 4CD19DF02E9CDF980069DAA0 /* emoji_44@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CCA2E9CDF980069DAA0 /* emoji_44@2x.png */; }; - 4CD19DF12E9CDF980069DAA0 /* emoji_123@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D192E9CDF980069DAA0 /* emoji_123@2x.png */; }; - 4CD19DF22E9CDF980069DAA0 /* emoji_122@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D182E9CDF980069DAA0 /* emoji_122@2x.png */; }; - 4CD19DF32E9CDF980069DAA0 /* emoji_64@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CDE2E9CDF980069DAA0 /* emoji_64@2x.png */; }; - 4CD19DF42E9CDF980069DAA0 /* emoji_01@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19C9F2E9CDF980069DAA0 /* emoji_01@2x.png */; }; - 4CD19DF52E9CDF980069DAA0 /* emoji_94@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CFC2E9CDF980069DAA0 /* emoji_94@2x.png */; }; - 4CD19DF62E9CDF980069DAA0 /* emoji_135@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D252E9CDF980069DAA0 /* emoji_135@2x.png */; }; - 4CD19DF72E9CDF980069DAA0 /* emoji_23@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CB52E9CDF980069DAA0 /* emoji_23@2x.png */; }; - 4CD19DF82E9CDF980069DAA0 /* emoji_66@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CE02E9CDF980069DAA0 /* emoji_66@2x.png */; }; - 4CD19DF92E9CDF980069DAA0 /* emoji_55@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CD52E9CDF980069DAA0 /* emoji_55@2x.png */; }; - 4CD19DFA2E9CDF980069DAA0 /* emoji_13@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CAB2E9CDF980069DAA0 /* emoji_13@2x.png */; }; - 4CD19DFB2E9CDF980069DAA0 /* emoji_00@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19C9E2E9CDF980069DAA0 /* emoji_00@2x.png */; }; - 4CD19DFC2E9CDF980069DAA0 /* emoji_12@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CAA2E9CDF980069DAA0 /* emoji_12@2x.png */; }; - 4CD19DFD2E9CDF980069DAA0 /* emoji_71@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CE52E9CDF980069DAA0 /* emoji_71@2x.png */; }; - 4CD19DFE2E9CDF980069DAA0 /* emoji_144@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D2E2E9CDF980069DAA0 /* emoji_144@2x.png */; }; - 4CD19DFF2E9CDF980069DAA0 /* emoji_72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CE62E9CDF980069DAA0 /* emoji_72@2x.png */; }; - 4CD19E002E9CDF980069DAA0 /* emoji_136@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D262E9CDF980069DAA0 /* emoji_136@2x.png */; }; - 4CD19E012E9CDF980069DAA0 /* emoji_127@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D1D2E9CDF980069DAA0 /* emoji_127@2x.png */; }; - 4CD19E022E9CDF980069DAA0 /* emoji_33@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CBF2E9CDF980069DAA0 /* emoji_33@2x.png */; }; - 4CD19E032E9CDF980069DAA0 /* emoji_120@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D162E9CDF980069DAA0 /* emoji_120@2x.png */; }; - 4CD19E042E9CDF980069DAA0 /* emoji_17@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CAF2E9CDF980069DAA0 /* emoji_17@2x.png */; }; - 4CD19E052E9CDF980069DAA0 /* emoji_07@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CA52E9CDF980069DAA0 /* emoji_07@2x.png */; }; - 4CD19E062E9CDF980069DAA0 /* emoji_149@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D332E9CDF980069DAA0 /* emoji_149@2x.png */; }; - 4CD19E072E9CDF980069DAA0 /* emoji_49@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CCF2E9CDF980069DAA0 /* emoji_49@2x.png */; }; - 4CD19E082E9CDF980069DAA0 /* emoji_133@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D232E9CDF980069DAA0 /* emoji_133@2x.png */; }; - 4CD19E092E9CDF980069DAA0 /* emoji_91@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CF92E9CDF980069DAA0 /* emoji_91@2x.png */; }; - 4CD19E0A2E9CDF980069DAA0 /* emoji_148@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D322E9CDF980069DAA0 /* emoji_148@2x.png */; }; - 4CD19E0B2E9CDF980069DAA0 /* emoji_93@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CFB2E9CDF980069DAA0 /* emoji_93@2x.png */; }; - 4CD19E0C2E9CDF980069DAA0 /* emoji_162@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D392E9CDF980069DAA0 /* emoji_162@2x.png */; }; - 4CD19E0D2E9CDF980069DAA0 /* emoji_100@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D022E9CDF980069DAA0 /* emoji_100@2x.png */; }; - 4CD19E0E2E9CDF980069DAA0 /* emoji_115@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D112E9CDF980069DAA0 /* emoji_115@2x.png */; }; - 4CD19E0F2E9CDF980069DAA0 /* emoji_05@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CA32E9CDF980069DAA0 /* emoji_05@2x.png */; }; - 4CD19E102E9CDF980069DAA0 /* emoji_11@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CA92E9CDF980069DAA0 /* emoji_11@2x.png */; }; - 4CD19E112E9CDF980069DAA0 /* emoji_81@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CEF2E9CDF980069DAA0 /* emoji_81@2x.png */; }; - 4CD19E122E9CDF980069DAA0 /* emoji_38@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CC42E9CDF980069DAA0 /* emoji_38@2x.png */; }; - 4CD19E132E9CDF980069DAA0 /* emoji_31@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CBD2E9CDF980069DAA0 /* emoji_31@2x.png */; }; - 4CD19E142E9CDF980069DAA0 /* emoji_35@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CC12E9CDF980069DAA0 /* emoji_35@2x.png */; }; - 4CD19E152E9CDF980069DAA0 /* emoji_126@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D1C2E9CDF980069DAA0 /* emoji_126@2x.png */; }; - 4CD19E162E9CDF980069DAA0 /* emoji_32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CBE2E9CDF980069DAA0 /* emoji_32@2x.png */; }; - 4CD19E172E9CDF980069DAA0 /* emoji_40@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CC62E9CDF980069DAA0 /* emoji_40@2x.png */; }; - 4CD19E182E9CDF980069DAA0 /* emoji_45@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CCB2E9CDF980069DAA0 /* emoji_45@2x.png */; }; - 4CD19E192E9CDF980069DAA0 /* emoji_200@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D3E2E9CDF980069DAA0 /* emoji_200@2x.png */; }; - 4CD19E1A2E9CDF980069DAA0 /* emoji_143@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D2D2E9CDF980069DAA0 /* emoji_143@2x.png */; }; - 4CD19E1B2E9CDF980069DAA0 /* emoji_39@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CC52E9CDF980069DAA0 /* emoji_39@2x.png */; }; - 4CD19E1C2E9CDF980069DAA0 /* emoji_111@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D0D2E9CDF980069DAA0 /* emoji_111@2x.png */; }; - 4CD19E1D2E9CDF980069DAA0 /* emoji_151@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D352E9CDF980069DAA0 /* emoji_151@2x.png */; }; - 4CD19E1E2E9CDF980069DAA0 /* emoji_119@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D152E9CDF980069DAA0 /* emoji_119@2x.png */; }; - 4CD19E1F2E9CDF980069DAA0 /* emoji_101@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D032E9CDF980069DAA0 /* emoji_101@2x.png */; }; - 4CD19E202E9CDF980069DAA0 /* emoji_83@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CF12E9CDF980069DAA0 /* emoji_83@2x.png */; }; - 4CD19E212E9CDF980069DAA0 /* emoji_24@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CB62E9CDF980069DAA0 /* emoji_24@2x.png */; }; - 4CD19E222E9CDF980069DAA0 /* emoji_110@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D0C2E9CDF980069DAA0 /* emoji_110@2x.png */; }; - 4CD19E232E9CDF980069DAA0 /* emoji_02@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CA02E9CDF980069DAA0 /* emoji_02@2x.png */; }; - 4CD19E242E9CDF980069DAA0 /* emoji_61@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CDB2E9CDF980069DAA0 /* emoji_61@2x.png */; }; - 4CD19E252E9CDF980069DAA0 /* emoji_06@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CA42E9CDF980069DAA0 /* emoji_06@2x.png */; }; - 4CD19E262E9CDF980069DAA0 /* emoji_97@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CFF2E9CDF980069DAA0 /* emoji_97@2x.png */; }; - 4CD19E272E9CDF980069DAA0 /* emoji_88@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CF62E9CDF980069DAA0 /* emoji_88@2x.png */; }; - 4CD19E282E9CDF980069DAA0 /* emoji_128@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D1E2E9CDF980069DAA0 /* emoji_128@2x.png */; }; - 4CD19E292E9CDF980069DAA0 /* emoji_166@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D3D2E9CDF980069DAA0 /* emoji_166@2x.png */; }; - 4CD19E2A2E9CDF980069DAA0 /* emoji_50@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CD02E9CDF980069DAA0 /* emoji_50@2x.png */; }; - 4CD19E2B2E9CDF980069DAA0 /* emoji_20@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CB22E9CDF980069DAA0 /* emoji_20@2x.png */; }; - 4CD19E2C2E9CDF980069DAA0 /* emoji_96@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CFE2E9CDF980069DAA0 /* emoji_96@2x.png */; }; - 4CD19E2D2E9CDF980069DAA0 /* emoji_54@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CD42E9CDF980069DAA0 /* emoji_54@2x.png */; }; - 4CD19E2E2E9CDF980069DAA0 /* emoji_140@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D2A2E9CDF980069DAA0 /* emoji_140@2x.png */; }; - 4CD19E2F2E9CDF980069DAA0 /* emoji_62@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CDC2E9CDF980069DAA0 /* emoji_62@2x.png */; }; - 4CD19E302E9CDF980069DAA0 /* emoji_86@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CF42E9CDF980069DAA0 /* emoji_86@2x.png */; }; - 4CD19E312E9CDF980069DAA0 /* emoj_s_pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19C9C2E9CDF980069DAA0 /* emoj_s_pressed@2x.png */; }; - 4CD19E322E9CDF980069DAA0 /* emoji_130@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D202E9CDF980069DAA0 /* emoji_130@2x.png */; }; - 4CD19E332E9CDF980069DAA0 /* emoji_141@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D2B2E9CDF980069DAA0 /* emoji_141@2x.png */; }; - 4CD19E342E9CDF980069DAA0 /* emoji_106@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D082E9CDF980069DAA0 /* emoji_106@2x.png */; }; - 4CD19E352E9CDF980069DAA0 /* emoji_85@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CF32E9CDF980069DAA0 /* emoji_85@2x.png */; }; - 4CD19E362E9CDF980069DAA0 /* emoji_98@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D002E9CDF980069DAA0 /* emoji_98@2x.png */; }; - 4CD19E372E9CDF980069DAA0 /* emoji_69@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CE32E9CDF980069DAA0 /* emoji_69@2x.png */; }; - 4CD19E382E9CDF980069DAA0 /* emoji_107@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D092E9CDF980069DAA0 /* emoji_107@2x.png */; }; - 4CD19E392E9CDF980069DAA0 /* emoji_95@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CFD2E9CDF980069DAA0 /* emoji_95@2x.png */; }; - 4CD19E3A2E9CDF980069DAA0 /* emoji_del_normal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D3F2E9CDF980069DAA0 /* emoji_del_normal@2x.png */; }; - 4CD19E3B2E9CDF980069DAA0 /* emoji_09@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CA72E9CDF980069DAA0 /* emoji_09@2x.png */; }; - 4CD19E3C2E9CDF980069DAA0 /* emoji_08@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CA62E9CDF980069DAA0 /* emoji_08@2x.png */; }; - 4CD19E3D2E9CDF980069DAA0 /* emoji_121@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D172E9CDF980069DAA0 /* emoji_121@2x.png */; }; - 4CD19E3E2E9CDF980069DAA0 /* emoji_113@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D0F2E9CDF980069DAA0 /* emoji_113@2x.png */; }; - 4CD19E3F2E9CDF980069DAA0 /* emoji_15@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CAD2E9CDF980069DAA0 /* emoji_15@2x.png */; }; - 4CD19E402E9CDF980069DAA0 /* emoji_29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CBB2E9CDF980069DAA0 /* emoji_29@2x.png */; }; - 4CD19E412E9CDF980069DAA0 /* emoji_73@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CE72E9CDF980069DAA0 /* emoji_73@2x.png */; }; - 4CD19E422E9CDF980069DAA0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D5F2E9CDF980069DAA0 /* Assets.xcassets */; }; - 4CD19E432E9CDF980069DAA0 /* emoji_51@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CD12E9CDF980069DAA0 /* emoji_51@2x.png */; }; - 4CD19E442E9CDF980069DAA0 /* emoji_137@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D272E9CDF980069DAA0 /* emoji_137@2x.png */; }; - 4CD19E452E9CDF980069DAA0 /* emoji_78@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CEC2E9CDF980069DAA0 /* emoji_78@2x.png */; }; - 4CD19E462E9CDF980069DAA0 /* emoji_74@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CE82E9CDF980069DAA0 /* emoji_74@2x.png */; }; - 4CD19E472E9CDF980069DAA0 /* emoji_68@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CE22E9CDF980069DAA0 /* emoji_68@2x.png */; }; - 4CD19E482E9CDF980069DAA0 /* emoji_112@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D0E2E9CDF980069DAA0 /* emoji_112@2x.png */; }; - 4CD19E492E9CDF980069DAA0 /* emoji_129@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D1F2E9CDF980069DAA0 /* emoji_129@2x.png */; }; - 4CD19E4A2E9CDF980069DAA0 /* emoji_18@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CB02E9CDF980069DAA0 /* emoji_18@2x.png */; }; - 4CD19E4B2E9CDF980069DAA0 /* emoji_150@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D342E9CDF980069DAA0 /* emoji_150@2x.png */; }; - 4CD19E4C2E9CDF980069DAA0 /* emoji_125@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D1B2E9CDF980069DAA0 /* emoji_125@2x.png */; }; - 4CD19E4D2E9CDF980069DAA0 /* emoji_160@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D372E9CDF980069DAA0 /* emoji_160@2x.png */; }; - 4CD19E4E2E9CDF980069DAA0 /* emoji_105@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D072E9CDF980069DAA0 /* emoji_105@2x.png */; }; - 4CD19E4F2E9CDF980069DAA0 /* emoji_131@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D212E9CDF980069DAA0 /* emoji_131@2x.png */; }; - 4CD19E502E9CDF980069DAA0 /* emoji_76@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CEA2E9CDF980069DAA0 /* emoji_76@2x.png */; }; - 4CD19E512E9CDF980069DAA0 /* emoji_79@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CED2E9CDF980069DAA0 /* emoji_79@2x.png */; }; - 4CD19E522E9CDF980069DAA0 /* emoji_16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CAE2E9CDF980069DAA0 /* emoji_16@2x.png */; }; - 4CD19E532E9CDF980069DAA0 /* emoji_22@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CB42E9CDF980069DAA0 /* emoji_22@2x.png */; }; - 4CD19E542E9CDF980069DAA0 /* emoji_30@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CBC2E9CDF980069DAA0 /* emoji_30@2x.png */; }; - 4CD19E552E9CDF980069DAA0 /* emoji_142@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D2C2E9CDF980069DAA0 /* emoji_142@2x.png */; }; - 4CD19E562E9CDF980069DAA0 /* emoji_27@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CB92E9CDF980069DAA0 /* emoji_27@2x.png */; }; - 4CD19E572E9CDF980069DAA0 /* emoji_145@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D2F2E9CDF980069DAA0 /* emoji_145@2x.png */; }; - 4CD19E582E9CDF980069DAA0 /* emoji_70@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CE42E9CDF980069DAA0 /* emoji_70@2x.png */; }; - 4CD19E592E9CDF980069DAA0 /* emoji_139@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D292E9CDF980069DAA0 /* emoji_139@2x.png */; }; - 4CD19E5A2E9CDF980069DAA0 /* emoji_63@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CDD2E9CDF980069DAA0 /* emoji_63@2x.png */; }; - 4CD19E5B2E9CDF980069DAA0 /* emoji_80@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CEE2E9CDF980069DAA0 /* emoji_80@2x.png */; }; - 4CD19E5C2E9CDF980069DAA0 /* emoji_65@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CDF2E9CDF980069DAA0 /* emoji_65@2x.png */; }; - 4CD19E5D2E9CDF980069DAA0 /* emoji_87@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CF52E9CDF980069DAA0 /* emoji_87@2x.png */; }; - 4CD19E5E2E9CDF980069DAA0 /* emoji_108@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D0A2E9CDF980069DAA0 /* emoji_108@2x.png */; }; - 4CD19E5F2E9CDF980069DAA0 /* emoji_03@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CA12E9CDF980069DAA0 /* emoji_03@2x.png */; }; - 4CD19E602E9CDF980069DAA0 /* emoji_102@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D042E9CDF980069DAA0 /* emoji_102@2x.png */; }; - 4CD19E612E9CDF980069DAA0 /* emoji_28@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CBA2E9CDF980069DAA0 /* emoji_28@2x.png */; }; - 4CD19E622E9CDF980069DAA0 /* emoji_56@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CD62E9CDF980069DAA0 /* emoji_56@2x.png */; }; - 4CD19E632E9CDF980069DAA0 /* emoji_89@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CF72E9CDF980069DAA0 /* emoji_89@2x.png */; }; - 4CD19E642E9CDF980069DAA0 /* emoji_14@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CAC2E9CDF980069DAA0 /* emoji_14@2x.png */; }; - 4CD19E652E9CDF980069DAA0 /* emoji_82@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CF02E9CDF980069DAA0 /* emoji_82@2x.png */; }; - 4CD19E662E9CDF980069DAA0 /* emoji_47@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CCD2E9CDF980069DAA0 /* emoji_47@2x.png */; }; - 4CD19E672E9CDF980069DAA0 /* emoji_138@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D282E9CDF980069DAA0 /* emoji_138@2x.png */; }; - 4CD19E682E9CDF980069DAA0 /* emoji_34@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CC02E9CDF980069DAA0 /* emoji_34@2x.png */; }; - 4CD19E692E9CDF980069DAA0 /* emoji_116@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D122E9CDF980069DAA0 /* emoji_116@2x.png */; }; - 4CD19E6A2E9CDF980069DAA0 /* emoji_43@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CC92E9CDF980069DAA0 /* emoji_43@2x.png */; }; - 4CD19E6B2E9CDF980069DAA0 /* emoji_147@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D312E9CDF980069DAA0 /* emoji_147@2x.png */; }; - 4CD19E6C2E9CDF980069DAA0 /* emoji_10@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CA82E9CDF980069DAA0 /* emoji_10@2x.png */; }; - 4CD19E6D2E9CDF980069DAA0 /* emoji_77@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CEB2E9CDF980069DAA0 /* emoji_77@2x.png */; }; - 4CD19E6E2E9CDF980069DAA0 /* emoji_114@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D102E9CDF980069DAA0 /* emoji_114@2x.png */; }; - 4CD19E6F2E9CDF980069DAA0 /* emoji_161@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D382E9CDF980069DAA0 /* emoji_161@2x.png */; }; - 4CD19E702E9CDF980069DAA0 /* emoji_118@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19D142E9CDF980069DAA0 /* emoji_118@2x.png */; }; - 4CD19E712E9CDF980069DAA0 /* emoji_21@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4CD19CB32E9CDF980069DAA0 /* emoji_21@2x.png */; }; 4CD19E722E9CDF980069DAA0 /* UIButton+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D692E9CDF980069DAA0 /* UIButton+MSRTL.m */; }; - 4CD19E732E9CDF980069DAA0 /* XPShareItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D7A2E9CDF980069DAA0 /* XPShareItem.m */; }; 4CD19E742E9CDF980069DAA0 /* TTNewAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DA02E9CDF980069DAA0 /* TTNewAlertView.m */; }; - 4CD19E752E9CDF980069DAA0 /* QPhotoImageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D5B2E9CDF980069DAA0 /* QPhotoImageModel.m */; }; - 4CD19E762E9CDF980069DAA0 /* XPShareInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D782E9CDF980069DAA0 /* XPShareInfoModel.m */; }; 4CD19E772E9CDF980069DAA0 /* UITextView+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D732E9CDF980069DAA0 /* UITextView+MSRTL.m */; }; 4CD19E782E9CDF980069DAA0 /* NSMutableAttributedString+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D672E9CDF980069DAA0 /* NSMutableAttributedString+MSRTL.m */; }; - 4CD19E792E9CDF980069DAA0 /* XPShareItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D7D2E9CDF980069DAA0 /* XPShareItemCell.m */; }; 4CD19E7A2E9CDF980069DAA0 /* SexAgeLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DC42E9CDF980069DAA0 /* SexAgeLabel.m */; }; - 4CD19E7B2E9CDF980069DAA0 /* QKeyboardManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D592E9CDF980069DAA0 /* QKeyboardManager.m */; }; 4CD19E7C2E9CDF980069DAA0 /* TTPopupService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D982E9CDF980069DAA0 /* TTPopupService.m */; }; - 4CD19E7D2E9CDF980069DAA0 /* QInputPhototCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D532E9CDF980069DAA0 /* QInputPhototCell.m */; }; 4CD19E7E2E9CDF980069DAA0 /* XNDJTDDLoadingTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DC82E9CDF980069DAA0 /* XNDJTDDLoadingTool.m */; }; - 4CD19E7F2E9CDF980069DAA0 /* QEmotionBoardView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D492E9CDF980069DAA0 /* QEmotionBoardView.m */; }; 4CD19E802E9CDF980069DAA0 /* TTPopup.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DA32E9CDF980069DAA0 /* TTPopup.m */; }; 4CD19E812E9CDF980069DAA0 /* UIView+GradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DB62E9CDF980069DAA0 /* UIView+GradientLayer.m */; }; 4CD19E822E9CDF980069DAA0 /* TTAlertMessageAttributedConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D8F2E9CDF980069DAA0 /* TTAlertMessageAttributedConfig.m */; }; - 4CD19E832E9CDF980069DAA0 /* QKeyboardBaseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D572E9CDF980069DAA0 /* QKeyboardBaseManager.m */; }; 4CD19E842E9CDF980069DAA0 /* XPAdvertiseView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19C992E9CDF980069DAA0 /* XPAdvertiseView.m */; }; 4CD19E852E9CDF980069DAA0 /* UISwipeGestureRecognizer+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D6F2E9CDF980069DAA0 /* UISwipeGestureRecognizer+MSRTL.m */; }; 4CD19E862E9CDF980069DAA0 /* TTAlertButtonConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D8B2E9CDF980069DAA0 /* TTAlertButtonConfig.m */; }; - 4CD19E872E9CDF980069DAA0 /* QInputBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D4F2E9CDF980069DAA0 /* QInputBarView.m */; }; 4CD19E882E9CDF980069DAA0 /* UIView+Corner.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DB32E9CDF980069DAA0 /* UIView+Corner.m */; }; - 4CD19E892E9CDF980069DAA0 /* QEEmotionImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D432E9CDF980069DAA0 /* QEEmotionImageView.m */; }; 4CD19E8A2E9CDF980069DAA0 /* TTActionSheetConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D892E9CDF980069DAA0 /* TTActionSheetConfig.m */; }; - 4CD19E8B2E9CDF980069DAA0 /* QExtendBoardView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D4D2E9CDF980069DAA0 /* QExtendBoardView.m */; }; - 4CD19E8C2E9CDF980069DAA0 /* QInputBarViewConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D512E9CDF980069DAA0 /* QInputBarViewConfiguration.m */; }; 4CD19E8D2E9CDF980069DAA0 /* NetImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DAE2E9CDF980069DAA0 /* NetImageView.m */; }; 4CD19E8E2E9CDF980069DAA0 /* TTActionSheetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D9C2E9CDF980069DAA0 /* TTActionSheetView.m */; }; 4CD19E8F2E9CDF980069DAA0 /* XPSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D862E9CDF980069DAA0 /* XPSwitch.m */; }; @@ -735,361 +145,62 @@ 4CD19E932E9CDF980069DAA0 /* NetImageConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DAC2E9CDF980069DAA0 /* NetImageConfig.m */; }; 4CD19E942E9CDF980069DAA0 /* UIButton+EnlargeTouchArea.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DA62E9CDF980069DAA0 /* UIButton+EnlargeTouchArea.m */; }; 4CD19E952E9CDF980069DAA0 /* MSBaseRTLFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D632E9CDF980069DAA0 /* MSBaseRTLFlowLayout.m */; }; - 4CD19E962E9CDF980069DAA0 /* XPShareView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D802E9CDF980069DAA0 /* XPShareView.m */; }; - 4CD19E972E9CDF980069DAA0 /* QEmotion.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D452E9CDF980069DAA0 /* QEmotion.m */; }; 4CD19E982E9CDF980069DAA0 /* AdvertiseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19C952E9CDF980069DAA0 /* AdvertiseModel.m */; }; - 4CD19E992E9CDF980069DAA0 /* XPSVGAPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D832E9CDF980069DAA0 /* XPSVGAPlayer.m */; }; - 4CD19E9A2E9CDF980069DAA0 /* QinputPhotoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D552E9CDF980069DAA0 /* QinputPhotoView.m */; }; 4CD19E9B2E9CDF980069DAA0 /* XCCurrentVCStackManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DC62E9CDF980069DAA0 /* XCCurrentVCStackManager.m */; }; 4CD19E9C2E9CDF980069DAA0 /* UIImage+ImageEffects.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DB92E9CDF980069DAA0 /* UIImage+ImageEffects.m */; }; 4CD19E9D2E9CDF980069DAA0 /* UIImage+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DA92E9CDF980069DAA0 /* UIImage+Utils.m */; }; 4CD19E9E2E9CDF980069DAA0 /* UIImage+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D6B2E9CDF980069DAA0 /* UIImage+MSRTL.m */; }; 4CD19E9F2E9CDF980069DAA0 /* TTAlertConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D8D2E9CDF980069DAA0 /* TTAlertConfig.m */; }; 4CD19EA02E9CDF980069DAA0 /* UITextField+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D712E9CDF980069DAA0 /* UITextField+MSRTL.m */; }; - 4CD19EA12E9CDF980069DAA0 /* UITextView+QEmotion.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D5D2E9CDF980069DAA0 /* UITextView+QEmotion.m */; }; 4CD19EA22E9CDF980069DAA0 /* DJDKMIMOMColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DBC2E9CDF980069DAA0 /* DJDKMIMOMColor.m */; }; 4CD19EA32E9CDF980069DAA0 /* EmptyDataView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DBE2E9CDF980069DAA0 /* EmptyDataView.m */; }; 4CD19EA42E9CDF980069DAA0 /* TTPopupManagerService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D942E9CDF980069DAA0 /* TTPopupManagerService.m */; }; 4CD19EA52E9CDF980069DAA0 /* MSBaseTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D652E9CDF980069DAA0 /* MSBaseTextField.m */; }; 4CD19EA62E9CDF980069DAA0 /* XPAdImageTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19C972E9CDF980069DAA0 /* XPAdImageTool.m */; }; - 4CD19EA72E9CDF980069DAA0 /* QEmotionHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D4B2E9CDF980069DAA0 /* QEmotionHelper.m */; }; 4CD19EA82E9CDF980069DAA0 /* UIImageConstant.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DB02E9CDF980069DAA0 /* UIImageConstant.m */; }; - 4CD19EA92E9CDF980069DAA0 /* QEmotionAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19D472E9CDF980069DAA0 /* QEmotionAttachment.m */; }; 4CD19EAA2E9CDF980069DAA0 /* MoliMoneyLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DC22E9CDF980069DAA0 /* MoliMoneyLabel.m */; }; - 4CD19EAB2E9CDF980069DAA0 /* MoliAvatar.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19DC02E9CDF980069DAA0 /* MoliAvatar.m */; }; 4CD19EAE2E9CDFC30069DAA0 /* EPLoginButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19EAC2E9CDFC30069DAA0 /* EPLoginButton.swift */; }; 4CD19EAF2E9CDFC30069DAA0 /* EPLoginInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19EAD2E9CDFC30069DAA0 /* EPLoginInputView.swift */; }; 4CD19EB12E9D12600069DAA0 /* EPEditSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19EB02E9D12600069DAA0 /* EPEditSettingViewController.swift */; }; 4CD19EB42E9D141A0069DAA0 /* EPMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19EB32E9D141A0069DAA0 /* EPMineViewController.m */; }; 4CD19EB52E9D15000069DAA0 /* EPAboutUsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD19EB62E9D15000069DAA0 /* EPAboutUsViewController.swift */; }; - 4CD401472E7183A8003F5009 /* XPPartyRoomItemCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD401462E7183A8003F5009 /* XPPartyRoomItemCollectionViewCell.m */; }; - 4CD4014A2E718E36003F5009 /* XPBlankRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD401492E718E36003F5009 /* XPBlankRoomModel.m */; }; - 4CD47BB52E61514900BCDA46 /* StageViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD47BB42E61514900BCDA46 /* StageViewManager.m */; }; - 4CD47BBE2E619F1700BCDA46 /* XPRoomMoreMenuAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD47BBB2E619F1700BCDA46 /* XPRoomMoreMenuAction.m */; }; - 4CD47BBF2E619F1700BCDA46 /* XPRoomMoreMenuActionContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD47BBD2E619F1700BCDA46 /* XPRoomMoreMenuActionContext.m */; }; - 4CD47BC42E61A4E000BCDA46 /* XPTurboModeAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD47BC32E61A4E000BCDA46 /* XPTurboModeAction.m */; }; - 4CD47BC62E61A4FA00BCDA46 /* XPRoomMoreMenuActionFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD47BC52E61A4FA00BCDA46 /* XPRoomMoreMenuActionFactory.m */; }; - 4CD47BC92E61A78D00BCDA46 /* XPRoomSettingAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD47BC82E61A78D00BCDA46 /* XPRoomSettingAction.m */; }; - 4CD47BCC2E61ADE400BCDA46 /* XPSocialAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD47BCB2E61ADE400BCDA46 /* XPSocialAction.m */; }; - 4CD6FF662D673A5C00262AB7 /* AgentMessageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD6FF652D673A5C00262AB7 /* AgentMessageModel.m */; }; - 4CD6FF692D673F7F00262AB7 /* AgentMessageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD6FF682D673F7F00262AB7 /* AgentMessageTableViewCell.m */; }; 4CDF7F3F2E9E580E00113F54 /* EPEmotionColorStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CDF7F3E2E9E580E00113F54 /* EPEmotionColorStorage.m */; }; 4CDF7F422E9E581900113F54 /* EPEmotionColorPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CDF7F412E9E581900113F54 /* EPEmotionColorPicker.m */; }; 4CE3A9462D22754C003F0796 /* RechargeUserModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE3A9452D22754C003F0796 /* RechargeUserModel.m */; }; - 4CE746C32D9290430094E496 /* RoomBoomManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE746C22D9290430094E496 /* RoomBoomManager.m */; }; - 4CE746C62D9297C30094E496 /* BravoGiftTipModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE746C52D9297C30094E496 /* BravoGiftTipModel.m */; }; - 4CE746CA2D929D500094E496 /* BaseRoomBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE746C82D929D500094E496 /* BaseRoomBannerView.m */; }; - 4CE746D22D92A2660094E496 /* BravoGiftBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE746D12D92A2660094E496 /* BravoGiftBannerView.m */; }; - 4CE746D52D92C1080094E496 /* BravoGiftWinningFlagView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE746D42D92C1080094E496 /* BravoGiftWinningFlagView.m */; }; - 4CEB9EA72D09643E00443480 /* UserRoomCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CEB9EA62D09643E00443480 /* UserRoomCardViewController.m */; }; - 4CEB9EB02D0AF4FE00443480 /* TwentyMicStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CEB9EAF2D0AF4FE00443480 /* TwentyMicStageView.m */; }; - 4CEB9EB32D0AFCE200443480 /* NineteenMicStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CEB9EB22D0AFCE200443480 /* NineteenMicStageView.m */; }; - 4CF3CE2B2E0403500071101F /* MedalsWearingControlCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF3CE2A2E0403500071101F /* MedalsWearingControlCollectionViewCell.m */; }; - 4CF3CE2E2E040EEC0071101F /* MedalsWearingListCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF3CE2D2E040EEC0071101F /* MedalsWearingListCollectionViewCell.m */; }; + 4CF462D42EA10E1B005E96C0 /* XPWebViewNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF462D02EA10E1B005E96C0 /* XPWebViewNavView.m */; }; + 4CF462D52EA10E1B005E96C0 /* XPWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF462CE2EA10E1B005E96C0 /* XPWebViewController.m */; }; 4CF67BA52DF9568C00EE5A28 /* BaseModelVo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF67BA42DF9568C00EE5A28 /* BaseModelVo.m */; }; - 4CFBE0CA2DAD085700A923AF /* BravoGiftTabInfomationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFBE0C92DAD085700A923AF /* BravoGiftTabInfomationModel.m */; }; - 4CFBE0CD2DAD0FC400A923AF /* PIGiftBravoGiftBroadcastView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFBE0CC2DAD0FC400A923AF /* PIGiftBravoGiftBroadcastView.m */; }; - 4CFE7F422E45ECEC00F77776 /* PublicRoomManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE7F402E45ECEC00F77776 /* PublicRoomManager.m */; }; - 4CFFEFCD2D3A4E410035D016 /* AppOfficalManagerActionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFFEFCC2D3A4E410035D016 /* AppOfficalManagerActionsViewController.m */; }; - 4CFFEFD02D3A5E130035D016 /* Api+SuperAdmin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFFEFCF2D3A5E130035D016 /* Api+SuperAdmin.m */; }; - 540EC1D02C89925F00F3BF0D /* GiftComboView.m in Sources */ = {isa = PBXBuildFile; fileRef = 540EC1CF2C89925F00F3BF0D /* GiftComboView.m */; }; - 540EC1D32C89998500F3BF0D /* GiftComboManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 540EC1D22C89998500F3BF0D /* GiftComboManager.m */; }; - 5412E0F42C4E460300FDD668 /* XPMineCenterAgencyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5412E0F32C4E460300FDD668 /* XPMineCenterAgencyView.m */; }; - 5412E0FD2C52512100FDD668 /* RoomBottomEntranceModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 5412E0FC2C52512100FDD668 /* RoomBottomEntranceModel.m */; }; - 541DD9552C1EDEFB00B616C4 /* XPHomePagingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 541DD9542C1EDEFB00B616C4 /* XPHomePagingViewController.m */; }; - 54283CE52CE48A69009729B5 /* ShoppingMallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54283CE42CE48A69009729B5 /* ShoppingMallViewController.m */; }; - 54283CE82CE48ABB009729B5 /* MyDressingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54283CE72CE48ABB009729B5 /* MyDressingViewController.m */; }; - 54283CEB2CE48B71009729B5 /* ShoppingMallCategoryListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54283CEA2CE48B71009729B5 /* ShoppingMallCategoryListView.m */; }; - 54283CEE2CE48B97009729B5 /* ShoppingMallDataPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 54283CED2CE48B97009729B5 /* ShoppingMallDataPresent.m */; }; - 544879EA2CD215F400D58DC1 /* CustomRoomBGCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 544879E92CD215F400D58DC1 /* CustomRoomBGCell.m */; }; - 544879ED2CD22A6B00D58DC1 /* CustomRoomBGPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 544879EC2CD22A6B00D58DC1 /* CustomRoomBGPresenter.m */; }; - 544879F02CD22D4B00D58DC1 /* CustomRoomBGItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 544879EF2CD22D4B00D58DC1 /* CustomRoomBGItemModel.m */; }; - 544A36352C94160F00CA7858 /* RoomMenuBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 544A36342C94160F00CA7858 /* RoomMenuBar.m */; }; - 544B19B02CA1299500885BEB /* CPBindingAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 544B19AF2CA1299500885BEB /* CPBindingAnimation.m */; }; - 544B19B32CA129A800885BEB /* CPLevelUpAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 544B19B22CA129A800885BEB /* CPLevelUpAnimation.m */; }; - 544B19B62CA14A7100885BEB /* CPGiftBanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 544B19B52CA14A7100885BEB /* CPGiftBanner.m */; }; - 544B19BC2CA169BE00885BEB /* level up 3.svga in Resources */ = {isa = PBXBuildFile; fileRef = 544B19B92CA169BE00885BEB /* level up 3.svga */; }; - 544B19BD2CA169BE00885BEB /* level up 4.svga in Resources */ = {isa = PBXBuildFile; fileRef = 544B19BA2CA169BE00885BEB /* level up 4.svga */; }; - 544B19BE2CA169BE00885BEB /* level up 5.svga in Resources */ = {isa = PBXBuildFile; fileRef = 544B19BB2CA169BE00885BEB /* level up 5.svga */; }; - 544B19BF2CA169BE00885BEB /* level up 1.svga in Resources */ = {isa = PBXBuildFile; fileRef = 544B19B72CA169BE00885BEB /* level up 1.svga */; }; - 544B19C02CA169BE00885BEB /* level up 2.svga in Resources */ = {isa = PBXBuildFile; fileRef = 544B19B82CA169BE00885BEB /* level up 2.svga */; }; - 5456F3C82C6EF962000E1805 /* VIPCenterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5456F3C72C6EF962000E1805 /* VIPCenterViewController.m */; }; - 5458319D2C2AE09300364026 /* XPRoomTypeSelectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5458319C2C2AE09300364026 /* XPRoomTypeSelectionViewController.m */; }; - 545831A02C2AEFAF00364026 /* TenMicStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5458319F2C2AEFAF00364026 /* TenMicStageView.m */; }; - 545831A32C2AF01100364026 /* FifteenMicStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545831A22C2AF01100364026 /* FifteenMicStageView.m */; }; - 545831A62C2C085C00364026 /* ArabMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545831A52C2C085C00364026 /* ArabMicroView.m */; }; - 545888332C1AFFB500897585 /* XPRoomPKPanelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545888322C1AFFB500897585 /* XPRoomPKPanelView.m */; }; - 545888362C1C306B00897585 /* XPRoomPKPaneAvatarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */; }; - 546104112CD4B46F00066B21 /* gift_normal_1.svga in Resources */ = {isa = PBXBuildFile; fileRef = 5461040B2CD4B46F00066B21 /* gift_normal_1.svga */; }; - 546104122CD4B46F00066B21 /* gift_normal_3.svga in Resources */ = {isa = PBXBuildFile; fileRef = 5461040D2CD4B46F00066B21 /* gift_normal_3.svga */; }; - 546104132CD4B46F00066B21 /* gift_VIP_2.svga in Resources */ = {isa = PBXBuildFile; fileRef = 5461040F2CD4B46F00066B21 /* gift_VIP_2.svga */; }; - 546104142CD4B46F00066B21 /* gift_normal_2.svga in Resources */ = {isa = PBXBuildFile; fileRef = 5461040C2CD4B46F00066B21 /* gift_normal_2.svga */; }; - 546104152CD4B46F00066B21 /* gift_VIP_1.svga in Resources */ = {isa = PBXBuildFile; fileRef = 5461040E2CD4B46F00066B21 /* gift_VIP_1.svga */; }; - 546104162CD4B46F00066B21 /* gift_VIP_3.svga in Resources */ = {isa = PBXBuildFile; fileRef = 546104102CD4B46F00066B21 /* gift_VIP_3.svga */; }; - 546104192CD4C06400066B21 /* Api+CustomBackground.m in Sources */ = {isa = PBXBuildFile; fileRef = 546104182CD4C06400066B21 /* Api+CustomBackground.m */; }; - 5461041C2CD4D35A00066B21 /* RoomHighValueGiftBannerAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 5461041B2CD4D35A00066B21 /* RoomHighValueGiftBannerAnimation.m */; }; - 5468995D2C8AFE4C0049136A /* GiftComboFlagView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5468995C2C8AFE4C0049136A /* GiftComboFlagView.m */; }; - 547080DB2CD0EEB4009879E5 /* CustomRoomBGContentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 547080DA2CD0EEB4009879E5 /* CustomRoomBGContentViewController.m */; }; - 547853A12C258F2A00F45E60 /* XPMineUserViewHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 547853A02C258F2A00F45E60 /* XPMineUserViewHeader.m */; }; - 547B30F92CB511700041E962 /* RoomBoomEntryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 547B30F82CB511700041E962 /* RoomBoomEntryView.m */; }; - 5484E1FD2CA2897B008E8754 /* IAPManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5484E1FC2CA2897B008E8754 /* IAPManager.m */; }; 548D54202CC208FD0084A2FF /* AlbumResourcePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 548D541F2CC208FD0084A2FF /* AlbumResourcePickerViewController.m */; }; - 548E01C62C3F78360071C83D /* FeedBackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 548E01C42C3F78360071C83D /* FeedBackViewController.m */; }; 548E01C92C3F78600071C83D /* FeedBackConfigModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 548E01C82C3F78600071C83D /* FeedBackConfigModel.m */; }; - 548E01CC2C3FB1C70071C83D /* i18nGiftNameMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 548E01CB2C3FB1C70071C83D /* i18nGiftNameMap.m */; }; - 54ACDCC22C5B31BD0099472C /* XPBeautIDView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54ACDCC12C5B31BD0099472C /* XPBeautIDView.m */; }; - 54AE7E142C9AD9AB006D2BE2 /* CPCard.m in Sources */ = {isa = PBXBuildFile; fileRef = 54AE7E132C9AD9A6006D2BE2 /* CPCard.m */; }; - 54AE7E172C9AE589006D2BE2 /* CPListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54AE7E162C9AE589006D2BE2 /* CPListViewController.m */; }; - 54B9C6E72C9C2CA1003F1CC5 /* XPMineGuildTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54B9C6E62C9C2CA1003F1CC5 /* XPMineGuildTableViewCell.m */; }; 54B9C6EA2C9C2DDC003F1CC5 /* GuildInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 54B9C6E92C9C2DDC003F1CC5 /* GuildInfo.m */; }; - 54B9C6F32C9D27F3003F1CC5 /* XPMineMultipleContentTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54B9C6F22C9D27F3003F1CC5 /* XPMineMultipleContentTableViewCell.m */; }; - 54B9C6F72C9D8D05003F1CC5 /* 4.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 54B9C6F52C9D8D05003F1CC5 /* 4.mp4 */; }; - 54B9C6F82C9D8D05003F1CC5 /* 5.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 54B9C6F62C9D8D05003F1CC5 /* 5.mp4 */; }; - 54B9C6F92C9D8D05003F1CC5 /* 3.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 54B9C6F42C9D8D05003F1CC5 /* 3.mp4 */; }; - 54B9C6FB2C9DA4C4003F1CC5 /* CP绑定.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 54B9C6FA2C9DA4C4003F1CC5 /* CP绑定.mp4 */; }; - 54C3895C2C215F5100FD47B1 /* XPHomeMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C3895B2C215F5100FD47B1 /* XPHomeMineViewController.m */; }; - 54C3895F2C2189DD00FD47B1 /* XPHomeMinePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C3895E2C2189DD00FD47B1 /* XPHomeMinePresenter.m */; }; - 54C389622C23BD1600FD47B1 /* HomeRankAvatarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C389612C23BD1600FD47B1 /* HomeRankAvatarModel.m */; }; - 54C389672C24464600FD47B1 /* HomeMineRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C389662C24464600FD47B1 /* HomeMineRoomModel.m */; }; - 54C608522CBE0BEB003DD5D2 /* game_floating_bg.svga in Resources */ = {isa = PBXBuildFile; fileRef = 54C608502CBE0BEB003DD5D2 /* game_floating_bg.svga */; }; - 54C608552CBE1EC7003DD5D2 /* GameUniversalBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C608542CBE1EC7003DD5D2 /* GameUniversalBannerView.m */; }; - 54C9A10D2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A10C2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m */; }; - 54C9A1102C3D3E1700C6D970 /* XPMineGameMateOrderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A10F2C3D3E1700C6D970 /* XPMineGameMateOrderView.m */; }; - 54C9A1132C3D5A2300C6D970 /* XPGameOrdersListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */; }; - 54C9A1162C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1152C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m */; }; 54C9A11C2C3D9EDD00C6D970 /* Api+GameOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A11B2C3D9EDD00C6D970 /* Api+GameOrder.m */; }; 54C9A11F2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A11E2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m */; }; - 54C9A1222C3E6C3200C6D970 /* MessageGameOrderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1212C3E6C3200C6D970 /* MessageGameOrderModel.m */; }; - 54C9A1252C3E74AE00C6D970 /* MessageGameOrderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1242C3E74AE00C6D970 /* MessageGameOrderView.m */; }; 54CE5EF92CCA4A2600A67898 /* LocationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54CE5EF82CCA4A2600A67898 /* LocationModel.m */; }; - 54E4D5302C9048E1009E1FEA /* LuckyGiftWinningFlagView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E4D52F2C9048E1009E1FEA /* LuckyGiftWinningFlagView.m */; }; - 54E4D5332C90658C009E1FEA /* LuckyGiftWinningBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E4D5322C90658C009E1FEA /* LuckyGiftWinningBannerView.m */; }; - 54E82EA22CA6886700C931D9 /* RoomBoomBannerAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E82EA12CA6886700C931D9 /* RoomBoomBannerAnimation.m */; }; - 54E82EA52CA693FA00C931D9 /* RoomBoomExplosionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E82EA42CA693FA00C931D9 /* RoomBoomExplosionView.m */; }; - 54E82EA82CA6940900C931D9 /* RoomBoomResultView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E82EA72CA6940900C931D9 /* RoomBoomResultView.m */; }; - 54E82EAB2CA9261000C931D9 /* Api+Boom.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E82EAA2CA9261000C931D9 /* Api+Boom.m */; }; - 54E82EAE2CA9293C00C931D9 /* BoomInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E82EAD2CA9293C00C931D9 /* BoomInfoModel.m */; }; - 54E82EB12CA93BE200C931D9 /* BoomInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E82EB02CA93BE200C931D9 /* BoomInfoViewController.m */; }; - 54E8C4D62CC78DA900646C44 /* VipSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54E8C4D52CC78DA900646C44 /* VipSettingViewController.m */; }; - 54F179072C8EA48C00CB5219 /* Combo_Boom.svga in Resources */ = {isa = PBXBuildFile; fileRef = 54F179062C8EA48C00CB5219 /* Combo_Boom.svga */; }; - 54F1790A2C8EDDF400CB5219 /* CountdownRingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F179092C8EDDF400CB5219 /* CountdownRingView.m */; }; - 54F469352C29711400A83655 /* XPMomentUserDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F469342C29711400A83655 /* XPMomentUserDataViewController.m */; }; - 54F469382C29C3B400A83655 /* XPMineAlbumTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F469372C29C3B400A83655 /* XPMineAlbumTableViewCell.m */; }; 54F4693B2C2A984D00A83655 /* MedalModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F4693A2C2A984D00A83655 /* MedalModel.m */; }; - 54F4693E2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F4693D2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m */; }; - 54F469412C2AB56900A83655 /* XPMineGiftsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F469402C2AB56900A83655 /* XPMineGiftsTableViewCell.m */; }; 54FFD37A2C9BCB1900DE61E5 /* RelationUserVO.m in Sources */ = {isa = PBXBuildFile; fileRef = 54FFD3792C9BCB1900DE61E5 /* RelationUserVO.m */; }; - 54FFD3812C9BD12600DE61E5 /* 4.svga in Resources */ = {isa = PBXBuildFile; fileRef = 54FFD37E2C9BD12600DE61E5 /* 4.svga */; }; - 54FFD3822C9BD12600DE61E5 /* 1.svga in Resources */ = {isa = PBXBuildFile; fileRef = 54FFD37B2C9BD12600DE61E5 /* 1.svga */; }; - 54FFD3832C9BD12600DE61E5 /* 5.svga in Resources */ = {isa = PBXBuildFile; fileRef = 54FFD37F2C9BD12600DE61E5 /* 5.svga */; }; - 54FFD3842C9BD12600DE61E5 /* 3.svga in Resources */ = {isa = PBXBuildFile; fileRef = 54FFD37D2C9BD12600DE61E5 /* 3.svga */; }; - 54FFD3852C9BD12600DE61E5 /* 2.svga in Resources */ = {isa = PBXBuildFile; fileRef = 54FFD37C2C9BD12600DE61E5 /* 2.svga */; }; 73FFADDC93E195344047A2EC /* Pods_YuMi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACF623970097D653132D69A /* Pods_YuMi.framework */; }; - 9B0086C627BA392B0032BD2B /* AnchorStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C527BA392B0032BD2B /* AnchorStageView.m */; }; - 9B0086CA27BA4F570032BD2B /* AnchorMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */; }; - 9B044DA0282D32F700DE4859 /* MicroInviteExtModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B044D9F282D32F700DE4859 /* MicroInviteExtModel.m */; }; - 9B0997A127F19D8A00EB8F14 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 9B0997A027F19D8900EB8F14 /* README.md */; }; - 9B0997A327F19DE500EB8F14 /* QGHWDShaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = 9B0997A227F19DE500EB8F14 /* QGHWDShaders.metal */; }; 9B0E1C5926E77022005D4442 /* BaseNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0E1C5826E77022005D4442 /* BaseNavigationController.m */; }; - 9B17F71827BD150600440843 /* SVGAParserManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B17F71727BD150600440843 /* SVGAParserManager.m */; }; - 9B1B7292280010E8003FACE9 /* Api+FansTeam.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1B7291280010E8003FACE9 /* Api+FansTeam.m */; }; - 9B1B729528002099003FACE9 /* XPMineFansTeamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1B729428002099003FACE9 /* XPMineFansTeamViewController.m */; }; - 9B1B729828002147003FACE9 /* XPMineFansTeamPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1B729728002147003FACE9 /* XPMineFansTeamPresenter.m */; }; 9B1B729D28002264003FACE9 /* XPMineAnchorFansTeamModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1B729C28002264003FACE9 /* XPMineAnchorFansTeamModel.m */; }; - 9B1B72A1280023F3003FACE9 /* XPMineAnchorFansTeamTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1B72A0280023F3003FACE9 /* XPMineAnchorFansTeamTableViewCell.m */; }; - 9B1B72AC280031DB003FACE9 /* XPAnchorPKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1B72AB280031DB003FACE9 /* XPAnchorPKViewController.m */; }; - 9B1B72AF280031F8003FACE9 /* XPAnchorPKSelectRoomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1B72AE280031F8003FACE9 /* XPAnchorPKSelectRoomView.m */; }; - 9B1B72B528003664003FACE9 /* Api+AnchorPk.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1B72B428003664003FACE9 /* Api+AnchorPk.m */; }; - 9B1B72B828003772003FACE9 /* XPAnchorPKPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1B72B728003772003FACE9 /* XPAnchorPKPresenter.m */; }; - 9B1B72BC28003E06003FACE9 /* XPAnchorPKTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1B72BB28003E06003FACE9 /* XPAnchorPKTableViewCell.m */; }; - 9B1B72BF2800422E003FACE9 /* XPAnchorPKRuleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1B72BE2800422E003FACE9 /* XPAnchorPKRuleView.m */; }; - 9B1EF3D227E81C0600554295 /* XPMineDressUpBubbleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1EF3D127E81C0600554295 /* XPMineDressUpBubbleViewController.m */; }; - 9B1EF3D527E8294B00554295 /* XPMineDressEmptyCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1EF3D427E8294B00554295 /* XPMineDressEmptyCollectionViewCell.m */; }; - 9B1FC3D527E49A5D006EFFE0 /* ChatBubbleModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1FC3D427E49A5D006EFFE0 /* ChatBubbleModel.m */; }; - 9B1FC3D827E49C36006EFFE0 /* XPMineDressBubbleCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B1FC3D727E49C36006EFFE0 /* XPMineDressBubbleCollectionViewCell.m */; }; - 9B208A362779B50100F9E54A /* GiftNobleInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B208A352779B50100F9E54A /* GiftNobleInfoModel.m */; }; - 9B2489BC27C4C056006CFB85 /* XPMineVisitorEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2489BB27C4C056006CFB85 /* XPMineVisitorEmptyTableViewCell.m */; }; 9B2A12DE2783FEDD00CED41B /* UserVipInfoVo.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2A12DD2783FEDD00CED41B /* UserVipInfoVo.m */; }; - 9B2EA7C02804037700ED17BF /* AnchorPKStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2EA7BF2804037700ED17BF /* AnchorPKStageView.m */; }; - 9B2EA7C32804052E00ED17BF /* AnchorPKMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2EA7C22804052E00ED17BF /* AnchorPKMicroView.m */; }; - 9B2EA7C628041EFC00ED17BF /* XPAnchorPkPanelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2EA7C528041EFC00ED17BF /* XPAnchorPkPanelView.m */; }; - 9B2EA7CC2804245500ED17BF /* XPAnchorPKPanelUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2EA7CB2804245500ED17BF /* XPAnchorPKPanelUserView.m */; }; - 9B2F72D028E45A480000E4FA /* XPRoomQuickMessageContainView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2F72CF28E45A480000E4FA /* XPRoomQuickMessageContainView.m */; }; - 9B2F72D328E45C5A0000E4FA /* XPRoomQuidkMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2F72D228E45C5A0000E4FA /* XPRoomQuidkMessageCell.m */; }; - 9B32A04728881845002009D2 /* XPRoomTagListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B32A04628881845002009D2 /* XPRoomTagListView.m */; }; - 9B335B492925D8A00048A116 /* XPAnchorPKSelectTypeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B335B482925D8A00048A116 /* XPAnchorPKSelectTypeController.m */; }; 9B33E3CB27D85379003B0E62 /* UploadFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B33E3C927D85379003B0E62 /* UploadFile.m */; }; - 9B3A1DF4280571000058E2DD /* XPAnchorPKInviteView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B3A1DF3280571000058E2DD /* XPAnchorPKInviteView.m */; }; - 9B3C181A292CE4FA003AF543 /* XPAnchorPKMatchView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B3C1819292CE4FA003AF543 /* XPAnchorPKMatchView.m */; }; - 9B41D36E282649230048C588 /* XPWeekStarRankUserModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B41D36D282649230048C588 /* XPWeekStarRankUserModel.m */; }; - 9B42868E28C1AE2D009034D2 /* XPReceiveRedPacketView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B42868D28C1AE2D009034D2 /* XPReceiveRedPacketView.m */; }; - 9B42869228C1AED4009034D2 /* XPReceiveRedPacketModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B42869128C1AED4009034D2 /* XPReceiveRedPacketModel.m */; }; - 9B42869528C1E00A009034D2 /* XPRedPacketResultModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B42869428C1E00A009034D2 /* XPRedPacketResultModel.m */; }; - 9B42869828C1E06B009034D2 /* XPRedPacketModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B42869728C1E06B009034D2 /* XPRedPacketModel.m */; }; - 9B42869C28C1FD3D009034D2 /* XPOpenRedPacketCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B42869B28C1FD3D009034D2 /* XPOpenRedPacketCell.m */; }; - 9B4C5B86292F81FA00CEA41B /* XPSessionListFansPartyModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B4C5B85292F81FA00CEA41B /* XPSessionListFansPartyModel.m */; }; - 9B4D449328F15765002572D5 /* XPGiftLuckyGiftBroadcastView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B4D449228F15765002572D5 /* XPGiftLuckyGiftBroadcastView.m */; }; - 9B4E920028E57A620033419E /* XPGiftHeadTypeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B4E91FF28E57A620033419E /* XPGiftHeadTypeView.m */; }; - 9B6B3AAB278C2EA7005551EC /* XPRoomNobleLevelUpView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6B3AAA278C2EA7005551EC /* XPRoomNobleLevelUpView.m */; }; - 9B6E856A281A982A0041A321 /* XPRoomRecommendView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6E8569281A982A0041A321 /* XPRoomRecommendView.m */; }; - 9B6E856E281AABAB0041A321 /* XPRoomRecommendModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6E856D281AABAB0041A321 /* XPRoomRecommendModel.m */; }; - 9B6E8573281AB9B20041A321 /* XPRoomInsideRecommendCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6E8572281AB9B20041A321 /* XPRoomInsideRecommendCell.m */; }; - 9B6E8577281ABECC0041A321 /* XPRoomInsideRecommendEmptyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6E8576281ABECC0041A321 /* XPRoomInsideRecommendEmptyCell.m */; }; - 9B734F73288A787000CBDAA9 /* XPMineAccountView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B734F72288A787000CBDAA9 /* XPMineAccountView.m */; }; 9B734F76288A92FB00CBDAA9 /* XPMineFunctionItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B734F75288A92FB00CBDAA9 /* XPMineFunctionItemModel.m */; }; - 9B7B605B27BB53060070BB72 /* XPAnchorAudienceUpMicView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B7B605A27BB53060070BB72 /* XPAnchorAudienceUpMicView.m */; }; - 9B7B606227BB96E40070BB72 /* XPRoomAnchorInfoCardView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B7B606127BB96E40070BB72 /* XPRoomAnchorInfoCardView.m */; }; - 9B7B606627BBA0EE0070BB72 /* XPAnchorAttentSendInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B7B606527BBA0EE0070BB72 /* XPAnchorAttentSendInfo.m */; }; - 9B7D804A2753783D003DAC0C /* SessionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B7D80492753783D003DAC0C /* SessionViewController.m */; }; - 9B7D804D27537950003DAC0C /* MessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B7D804C27537950003DAC0C /* MessageCell.m */; }; - 9B7D80502753AA9D003DAC0C /* UITableView+NIMScrollToBottom.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B7D804E2753AA9D003DAC0C /* UITableView+NIMScrollToBottom.m */; }; - 9B7D904D287BC5E20033A45E /* AnchorRoomScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B7D904C287BC5E20033A45E /* AnchorRoomScrollView.m */; }; - 9B85B6D7279FDABA00A0A1AC /* XPUserCardSkillCardView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B85B6D6279FDABA00A0A1AC /* XPUserCardSkillCardView.m */; }; - 9B85B6DA279FDC5200A0A1AC /* XPUserCardSkillCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B85B6D9279FDC5200A0A1AC /* XPUserCardSkillCollectionViewCell.m */; }; - 9B85F3532806AB9A006EDF51 /* XPAnchorPKResultView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B85F3522806AB9A006EDF51 /* XPAnchorPKResultView.m */; }; - 9B85F3562806DD8A006EDF51 /* XPAnchorPKFinishView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B85F3552806DD8A006EDF51 /* XPAnchorPKFinishView.m */; }; - 9B86D87A2817DD8400494FCD /* XPRoomEnterHideTipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B86D8792817DD8400494FCD /* XPRoomEnterHideTipView.m */; }; - 9B86D886281942D200494FCD /* SocialMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B86D885281942D200494FCD /* SocialMicroView.m */; }; - 9B87B3CD2926473D00085110 /* XPSessionListHeadFriendCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B87B3CC2926473D00085110 /* XPSessionListHeadFriendCell.m */; }; - 9B88E20C28C5EB8300D26FBA /* MessageContentRedPacketView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B88E20B28C5EB8300D26FBA /* MessageContentRedPacketView.m */; }; - 9B88E20F28C6305400D26FBA /* XPRoomSearchRecordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B88E20E28C6305400D26FBA /* XPRoomSearchRecordViewController.m */; }; - 9B8DE0E1289CF02900FB6EC2 /* XPGiftCompoundModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B8DE0E0289CF02900FB6EC2 /* XPGiftCompoundModel.m */; }; - 9B8DE0E4289CF7AA00FB6EC2 /* XPRoomGiftCompoundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B8DE0E3289CF7AA00FB6EC2 /* XPRoomGiftCompoundView.m */; }; - 9B92A33C2797E38100AD168F /* XPMineHeadItemTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B92A33B2797E38100AD168F /* XPMineHeadItemTableViewCell.m */; }; - 9B9BBF83288FBFB3004E2E74 /* XPNewUserRoomGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B9BBF82288FBFB3004E2E74 /* XPNewUserRoomGiftView.m */; }; - 9BA3B40B293DCDFD0071DF1C /* XPVersionUpdateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BA3B40A293DCDFD0071DF1C /* XPVersionUpdateModel.m */; }; - 9BA3B40F293DD2F90071DF1C /* XPUpgradeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BA3B40E293DD2F90071DF1C /* XPUpgradeView.m */; }; 9BA812D228BF145700783EA7 /* ClientRedPacketModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BA812D128BF145700783EA7 /* ClientRedPacketModel.m */; }; - 9BA812D628BF52E100783EA7 /* XPRoomSendRedPacketViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BA812D528BF52E100783EA7 /* XPRoomSendRedPacketViewController.m */; }; - 9BA812DD28BF6A7300783EA7 /* XPRoomRedPacketPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BA812DC28BF6A7300783EA7 /* XPRoomRedPacketPresenter.m */; }; - 9BA812E028BF6ABB00783EA7 /* Api+RedPacket.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BA812DF28BF6ABB00783EA7 /* Api+RedPacket.m */; }; - 9BA812E428BF70A600783EA7 /* XPRoomRedPacketPwdView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BA812E328BF70A600783EA7 /* XPRoomRedPacketPwdView.m */; }; 9BA8A47527C60D9F000365A3 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BA8A47427C60D9F000365A3 /* AudioToolbox.framework */; }; 9BA8A47727C60DF7000365A3 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BA8A47627C60DF7000365A3 /* AVFoundation.framework */; }; - 9BAA5FED277A1BBE007453F3 /* XPPrivacyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAA5FEC277A1BBE007453F3 /* XPPrivacyViewController.m */; }; - 9BAA5FF0277A23F4007453F3 /* XPPermissionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAA5FEF277A23F4007453F3 /* XPPermissionsViewController.m */; }; - 9BAC92F528E6E63000147DD8 /* XPRoomInsideOperationCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAC92F428E6E63000147DD8 /* XPRoomInsideOperationCell.m */; }; - 9BB89DC327FE7F3A00586A83 /* XPAnchorFansRelationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BB89DC227FE7F3A00586A83 /* XPAnchorFansRelationModel.m */; }; - 9BB89DC627FEB9E100586A83 /* XPAnchorFansTaskViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BB89DC527FEB9E100586A83 /* XPAnchorFansTaskViewController.m */; }; - 9BBC028E2786FA060007C24B /* NobleCardModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BBC028D2786FA060007C24B /* NobleCardModel.m */; }; - 9BBC02912786FC570007C24B /* XPMineNobleCardTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BBC02902786FC570007C24B /* XPMineNobleCardTableViewCell.m */; }; - 9BC5C91C277C8A7B007C8719 /* XPReleaseRadioViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BC5C91B277C8A7B007C8719 /* XPReleaseRadioViewController.m */; }; - 9BC5C91F277C902B007C8719 /* XPReleaseRadioView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BC5C91E277C902B007C8719 /* XPReleaseRadioView.m */; }; - 9BC8C83028090C9200C24F85 /* XPRoomAnchorRankBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BC8C82F28090C9200C24F85 /* XPRoomAnchorRankBannerView.m */; }; - 9BC9DAEF27E33B3F009EE409 /* XPRoomGiftAnimationParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BC9DAEE27E33B3F009EE409 /* XPRoomGiftAnimationParser.m */; }; - 9BCB99A028F571B500466D64 /* XPMineCollectPartyRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BCB999F28F571B500466D64 /* XPMineCollectPartyRoomViewController.m */; }; - 9BCB99A628F582EC00466D64 /* XPMineCollectRoomEditCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BCB99A528F582EC00466D64 /* XPMineCollectRoomEditCell.m */; }; - 9BCD02C72796C02800F396AA /* MicroNobleWaveView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BCD02C62796C02800F396AA /* MicroNobleWaveView.m */; }; - 9BCE6144277D657600CC0358 /* XPReleaseRadioTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BCE6143277D657600CC0358 /* XPReleaseRadioTableViewCell.m */; }; - 9BCFB828289BAC7D0093D863 /* XPMineHeadFunctionItemLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BCFB827289BAC7D0093D863 /* XPMineHeadFunctionItemLayout.m */; }; - 9BD2ECCE288F829600F5CD9A /* XPMineFootPrintViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD2ECCD288F829600F5CD9A /* XPMineFootPrintViewController.m */; }; 9BD2ECD2288F833B00F5CD9A /* XPMineFootPrintModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD2ECD1288F833B00F5CD9A /* XPMineFootPrintModel.m */; }; - 9BD2ECD5288F838200F5CD9A /* XPMineFootPrintPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD2ECD4288F838200F5CD9A /* XPMineFootPrintPresenter.m */; }; - 9BD2ECDA288F867000F5CD9A /* XPMineFootPrintTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD2ECD9288F867000F5CD9A /* XPMineFootPrintTableViewCell.m */; }; - 9BD63FAB277EE885006EB744 /* Api+RoomRadio.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD63FAA277EE885006EB744 /* Api+RoomRadio.m */; }; - 9BD63FAE277EE97A006EB744 /* XPReleaseRadioPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD63FAD277EE97A006EB744 /* XPReleaseRadioPresenter.m */; }; - 9BD63FB4277EF1B3006EB744 /* XPReleaseRadioModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD63FB3277EF1B3006EB744 /* XPReleaseRadioModel.m */; }; - 9BD798B72926362F003E03E6 /* XPSessionListHeadItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD798B62926362F003E03E6 /* XPSessionListHeadItem.m */; }; - 9BD8D4E328911E9900AE03FF /* XPMineCollectRoomListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD8D4E228911E9900AE03FF /* XPMineCollectRoomListViewController.m */; }; - 9BD8D4E628911F7700AE03FF /* XPMineCollectRoomListPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD8D4E528911F7700AE03FF /* XPMineCollectRoomListPresenter.m */; }; - 9BD9A17927A0EC57004186FE /* XPMineVisitorPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD9A17827A0EC57004186FE /* XPMineVisitorPresenter.m */; }; - 9BD9A17C27A0EE24004186FE /* XPMineVisitorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD9A17B27A0EE24004186FE /* XPMineVisitorViewController.m */; }; - 9BD9A18027A0EFC7004186FE /* XPMineVisitorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD9A17F27A0EFC7004186FE /* XPMineVisitorTableViewCell.m */; }; 9BD9A18427A0F128004186FE /* XPMineVisitorItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD9A18327A0F128004186FE /* XPMineVisitorItemModel.m */; }; 9BD9A18727A120FD004186FE /* XPMineVisitorUnReadModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD9A18627A120FD004186FE /* XPMineVisitorUnReadModel.m */; }; - 9BDA3E7727FD41C200517FE6 /* XPAnchorFansTeamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BDA3E7627FD41C200517FE6 /* XPAnchorFansTeamViewController.m */; }; - 9BDA3E7A27FD43EF00517FE6 /* XPAnchorFansTeamEntranceView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BDA3E7927FD43EF00517FE6 /* XPAnchorFansTeamEntranceView.m */; }; - 9BDA3E7D27FD47AB00517FE6 /* XPAnchorFansTeamPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BDA3E7C27FD47AB00517FE6 /* XPAnchorFansTeamPresenter.m */; }; - 9BE01ACE28925F7D00B50299 /* XPMineNewUserRechargeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE01ACD28925F7D00B50299 /* XPMineNewUserRechargeView.m */; }; - 9BE01AD428927E9C00B50299 /* XPDressUpShopListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE01AD328927E9C00B50299 /* XPDressUpShopListViewController.m */; }; - 9BE01ADA289296B500B50299 /* XPDressUpShopPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE01AD9289296B500B50299 /* XPDressUpShopPresenter.m */; }; - 9BE01ADE2892A66D00B50299 /* DressUpShopModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE01ADD2892A66D00B50299 /* DressUpShopModel.m */; }; - 9BE01AE128937DBC00B50299 /* XPDressUpShopCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE01AE028937DBC00B50299 /* XPDressUpShopCardViewController.m */; }; - 9BE01AE428937EDE00B50299 /* XPDressUpShopCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE01AE328937EDE00B50299 /* XPDressUpShopCollectionViewCell.m */; }; - 9BE01AE728938AB600B50299 /* XPDressUpShopCardTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE01AE628938AB600B50299 /* XPDressUpShopCardTableViewCell.m */; }; - 9BE01AEA2893CB4400B50299 /* XPDressSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE01AE92893CB4400B50299 /* XPDressSearchViewController.m */; }; - 9BE01AED2893D0DF00B50299 /* XPDressShopSearchTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE01AEC2893D0DF00B50299 /* XPDressShopSearchTableViewCell.m */; }; - 9BE01AF02893E31700B50299 /* NewUserRechargeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE01AEF2893E31700B50299 /* NewUserRechargeModel.m */; }; - 9BE2FA90288010D300EF3D83 /* AnchorRoomSrollTipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE2FA8F288010D300EF3D83 /* AnchorRoomSrollTipView.m */; }; - 9BE570BC28F65B7200D491A5 /* XPMineCollectRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE570BB28F65B7200D491A5 /* XPMineCollectRoomCell.m */; }; - 9BE9F0F927FED12D00667200 /* XPAnchorFansPrivilegeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE9F0F827FED12D00667200 /* XPAnchorFansPrivilegeModel.m */; }; - 9BE9F0FC27FED2E100667200 /* XPAnchorFansJoinModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE9F0FB27FED2E100667200 /* XPAnchorFansJoinModel.m */; }; - 9BE9F0FF27FED76500667200 /* XPAnchorFansTaskModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE9F0FE27FED76500667200 /* XPAnchorFansTaskModel.m */; }; - 9BE9F10227FEE5C200667200 /* XPAnchorFansTaskDetailModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE9F10127FEE5C200667200 /* XPAnchorFansTaskDetailModel.m */; }; - 9BE9F10527FF04CF00667200 /* XPAnchorFansTaskTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE9F10427FF04CF00667200 /* XPAnchorFansTaskTableViewCell.m */; }; - 9BF4BEBC28D4182E009CF6C2 /* XPOpenRedPacketModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BF4BEBB28D4182E009CF6C2 /* XPOpenRedPacketModel.m */; }; - 9BF5192628801D4700B6BE92 /* XPAcrossRoomPKCountDownView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BF5192528801D4700B6BE92 /* XPAcrossRoomPKCountDownView.m */; }; - 9BFB101F2897CC4300B3985E /* XPAnchorCardView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BFB101E2897CC4300B3985E /* XPAnchorCardView.m */; }; - 9BFB10222897D68400B3985E /* XPTabAnchorCardModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BFB10212897D68400B3985E /* XPTabAnchorCardModel.m */; }; 9BFE0D8E2898C8C300F53C24 /* XPAnchorCardSkillCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BFE0D8D2898C8C300F53C24 /* XPAnchorCardSkillCollectionViewCell.m */; }; - 9BFE0D922899042600F53C24 /* XPTaskCompleteTipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BFE0D912899042600F53C24 /* XPTaskCompleteTipView.m */; }; - 9BFE992E288142FD009DA429 /* RoomClassifyModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BFE992D288142FD009DA429 /* RoomClassifyModel.m */; }; - E801274027E323C800BAC3F2 /* XPRoomPKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E801273F27E323C800BAC3F2 /* XPRoomPKViewController.m */; }; - E801274327E323E500BAC3F2 /* XPRoomPKPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E801274227E323E500BAC3F2 /* XPRoomPKPresenter.m */; }; - E801274727E3241700BAC3F2 /* Api+RoomPK.m in Sources */ = {isa = PBXBuildFile; fileRef = E801274627E3241700BAC3F2 /* Api+RoomPK.m */; }; - E801274B27E327DA00BAC3F2 /* XPRoomPKTypeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E801274A27E327DA00BAC3F2 /* XPRoomPKTypeTableViewCell.m */; }; - E801274E27E3280000BAC3F2 /* XPRoomPKVoteTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E801274D27E3280000BAC3F2 /* XPRoomPKVoteTableViewCell.m */; }; - E801275127E3281100BAC3F2 /* XPRoomPKTimeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E801275027E3281100BAC3F2 /* XPRoomPKTimeTableViewCell.m */; }; - E801275527E3326000BAC3F2 /* XPRoomPKUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E801275427E3326000BAC3F2 /* XPRoomPKUserView.m */; }; - E801275827E347FD00BAC3F2 /* RoomPKRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E801275727E347FD00BAC3F2 /* RoomPKRecordModel.m */; }; - E80487652717DDD9008595F2 /* XPRoomMenuItem.m in Sources */ = {isa = PBXBuildFile; fileRef = E80487642717DDD9008595F2 /* XPRoomMenuItem.m */; }; E8098CA7282E00920090B9F0 /* Api+Moments.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CA6282E00920090B9F0 /* Api+Moments.m */; }; - E8098CAA282E03B40090B9F0 /* XPMomentsRecommendPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CA9282E03B40090B9F0 /* XPMomentsRecommendPresenter.m */; }; - E8098CAE282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CAD282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.m */; }; - E8098CB1282E86EF0090B9F0 /* XPMomentsContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CB0282E86EF0090B9F0 /* XPMomentsContentView.m */; }; - E8098CB4282E97550090B9F0 /* XPMineBlackListPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CB3282E97550090B9F0 /* XPMineBlackListPresenter.m */; }; - E80A086227F2AC190027B30C /* RoomPKDetailInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A086127F2AC190027B30C /* RoomPKDetailInfoModel.m */; }; - E80A63DC28B86B9700690914 /* MessageContentMonentsAutoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A63DB28B86B9700690914 /* MessageContentMonentsAutoView.m */; }; E80B0712280D0A6700A79F63 /* FansInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80B0711280D0A6700A79F63 /* FansInfoModel.m */; }; - E80B0734280D740600A79F63 /* MessageContentGuildView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80B0733280D740600A79F63 /* MessageContentGuildView.m */; }; E80CBDEA27D0C53F001E1EC2 /* XPWeakTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = E80CBDE927D0C53F001E1EC2 /* XPWeakTimer.m */; }; E80E09A92A40B70100CD2BE7 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E80E09AB2A40B70100CD2BE7 /* Localizable.strings */; }; - E80E09AE2A41336500CD2BE7 /* XPWebViewNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80E09AC2A41336500CD2BE7 /* XPWebViewNavView.m */; }; E80E2377299A47F60013FD40 /* AESUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = E80E2376299A47F60013FD40 /* AESUtils.m */; }; - E80E900C27E0358900434B90 /* XPRoomTopicAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80E900B27E0358900434B90 /* XPRoomTopicAlertView.m */; }; - E81060D9298761A300B772F0 /* MessageBaseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060D8298761A300B772F0 /* MessageBaseModel.m */; }; - E81060DC298761F100B772F0 /* MessageTextModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060DB298761F100B772F0 /* MessageTextModel.m */; }; - E81060DF29876D3A00B772F0 /* MessageTimeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060DE29876D3A00B772F0 /* MessageTimeModel.m */; }; - E81060E229876E9100B772F0 /* MessageImageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060E129876E9100B772F0 /* MessageImageModel.m */; }; - E81060E529876FF300B772F0 /* MessageAudioModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060E429876FF300B772F0 /* MessageAudioModel.m */; }; - E81060E82987720F00B772F0 /* MessageUnSupportModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060E72987720F00B772F0 /* MessageUnSupportModel.m */; }; - E81060EB2987BE8300B772F0 /* MessageGiftModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060EA2987BE8300B772F0 /* MessageGiftModel.m */; }; - E81060EE2987C35700B772F0 /* MessageTextClickModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060ED2987C35700B772F0 /* MessageTextClickModel.m */; }; - E81060F12987C52B00B772F0 /* MessageGuildModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060F02987C52B00B772F0 /* MessageGuildModel.m */; }; - E81060F42987C6B200B772F0 /* MessageOpenLiveModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060F32987C6B200B772F0 /* MessageOpenLiveModel.m */; }; - E81060F72987C8A700B772F0 /* MessageApplicationShareModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060F62987C8A700B772F0 /* MessageApplicationShareModel.m */; }; - E81060FD2987CC9100B772F0 /* MessageLevelUpgradeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060FC2987CC9100B772F0 /* MessageLevelUpgradeModel.m */; }; - E81061002987CDCC00B772F0 /* MessageTweetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81060FF2987CDCC00B772F0 /* MessageTweetModel.m */; }; - E81061032987CFCE00B772F0 /* MessageSkillCardModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81061022987CFCE00B772F0 /* MessageSkillCardModel.m */; }; - E811FFF72742367B00918544 /* XPGiftEmptyCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E811FFF62742367B00918544 /* XPGiftEmptyCollectionViewCell.m */; }; - E8133916273E532D00708B66 /* XPGiftItemCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8133915273E532D00708B66 /* XPGiftItemCollectionViewCell.m */; }; - E81366E326F0A1FC0076364C /* LoginBindPhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81366E226F0A1FC0076364C /* LoginBindPhoneViewController.m */; }; E81366E726F0A49E0076364C /* NSString+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = E81366E626F0A49E0076364C /* NSString+Utils.m */; }; - E81366F326F0B7C80076364C /* LoginFullInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81366F226F0B7C80076364C /* LoginFullInfoViewController.m */; }; E81366F626F0C0DF0076364C /* LoginFullInfoPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E81366F526F0C0DF0076364C /* LoginFullInfoPresenter.m */; }; E81366F826F0C12A0076364C /* LoginFullInfoProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E81366F726F0C0F60076364C /* LoginFullInfoProtocol.h */; }; - E816C11527608A7500C84014 /* XPRoomMiniManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E816C11427608A7500C84014 /* XPRoomMiniManager.m */; }; - E818DD1C2A4896EE00F163F7 /* XPLoginAraeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E818DD1B2A4896EE00F163F7 /* XPLoginAraeViewController.m */; }; E818DD1F2A48974300F163F7 /* LoginAreaModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E818DD1E2A48974300F163F7 /* LoginAreaModel.m */; }; - E818DD222A48977F00F163F7 /* XPLoginAreaTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E818DD212A48977F00F163F7 /* XPLoginAreaTableViewCell.m */; }; - E818E348286ECA4B005EDF68 /* XPMonentsPublishViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E818E347286ECA4B005EDF68 /* XPMonentsPublishViewController.m */; }; E818E34B286ECABF005EDF68 /* XPMonentsPublishPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E818E34A286ECABF005EDF68 /* XPMonentsPublishPresenter.m */; }; - E818E34F286EDF72005EDF68 /* XPMonentsPublishCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E818E34E286EDF72005EDF68 /* XPMonentsPublishCollectionViewCell.m */; }; - E81A652B2834E4F600F55894 /* XPMomentsAttentionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A652A2834E4F600F55894 /* XPMomentsAttentionViewController.m */; }; - E81A65312834E53600F55894 /* XPMomentsLatestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A65302834E53600F55894 /* XPMomentsLatestViewController.m */; }; - E81A653F283511BE00F55894 /* XPMonentsInteractiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A653E283511BE00F55894 /* XPMonentsInteractiveViewController.m */; }; - E81A65422835120200F55894 /* XPMonentsInteractivePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A65412835120200F55894 /* XPMonentsInteractivePresenter.m */; }; - E81A6546283519CA00F55894 /* MomentsTopicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A6545283519CA00F55894 /* MomentsTopicModel.m */; }; - E81A654928351B9500F55894 /* XPMomentsRecommendHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A654828351B9500F55894 /* XPMomentsRecommendHeaderView.m */; }; - E81A654C28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A654B28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m */; }; - E81AF32827F1EE69003B9E43 /* XPRoomPKPanelUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81AF32727F1EE69003B9E43 /* XPRoomPKPanelUserView.m */; }; - E81C1B1C27705F6B0020D1E4 /* XPArrangeMicPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B1B27705F6B0020D1E4 /* XPArrangeMicPresenter.m */; }; - E81C1B1F27705F7A0020D1E4 /* XPArrangeMicViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B1E27705F7A0020D1E4 /* XPArrangeMicViewController.m */; }; - E81C1B2227705F950020D1E4 /* Api+ArrangeMic.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B2127705F950020D1E4 /* Api+ArrangeMic.m */; }; - E81C1B262770663B0020D1E4 /* XPArrangeMicTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B252770663B0020D1E4 /* XPArrangeMicTableViewCell.m */; }; - E81C1B29277069DD0020D1E4 /* XPArrangeMicEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B28277069DD0020D1E4 /* XPArrangeMicEmptyTableViewCell.m */; }; - E81C1B2C27706E5C0020D1E4 /* ArrangeMicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B2B27706E5C0020D1E4 /* ArrangeMicModel.m */; }; - E81C1B2F277071670020D1E4 /* XPArrangeMicInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B2E277071670020D1E4 /* XPArrangeMicInfoModel.m */; }; E81C278C26EAFAF60031E639 /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C278926EAFAF60031E639 /* Base64.m */; }; E81C278D26EAFAF60031E639 /* DESEncrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C278B26EAFAF60031E639 /* DESEncrypt.m */; }; E81C279626EB39CC0031E639 /* LoginForgetPasswordPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C279526EB39CC0031E639 /* LoginForgetPasswordPresent.m */; }; @@ -1098,563 +209,51 @@ E81C27A026EEF83D0031E639 /* YUMIHtmlUrl.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C279F26EEF83D0031E639 /* YUMIHtmlUrl.m */; }; E81C27A226EF23490031E639 /* YUMINNNN.h in Sources */ = {isa = PBXBuildFile; fileRef = E81C27A126EF23370031E639 /* YUMINNNN.h */; }; E81C27AB26EF2D920031E639 /* ThirdUserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C27AA26EF2D920031E639 /* ThirdUserInfo.m */; }; - E81C27AE26EF39AB0031E639 /* AppDelegate+ThirdConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C27AD26EF39AB0031E639 /* AppDelegate+ThirdConfig.m */; }; - E81D58822720082A003063FE /* MicroWaveView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81D58812720082A003063FE /* MicroWaveView.m */; }; - E81DCCCD282B63B40039E5C5 /* XPMomentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81DCCCC282B63B40039E5C5 /* XPMomentsViewController.m */; }; - E81DCCD0282B63FD0039E5C5 /* XPMomentsRecommendViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81DCCCF282B63FD0039E5C5 /* XPMomentsRecommendViewController.m */; }; - E821077B2987D4AB00DE7040 /* MessageFindNewGreetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E821077A2987D4AB00DE7040 /* MessageFindNewGreetModel.m */; }; - E821077E2987D67100DE7040 /* MessageRiskAlertModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E821077D2987D67100DE7040 /* MessageRiskAlertModel.m */; }; - E82107812987D7F300DE7040 /* MessageMonentsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E82107802987D7F300DE7040 /* MessageMonentsModel.m */; }; - E82107842987E35300DE7040 /* MessageMonentsAutoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E82107832987E35300DE7040 /* MessageMonentsAutoModel.m */; }; - E82107872987E49100DE7040 /* MessageRedPacketModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E82107862987E49100DE7040 /* MessageRedPacketModel.m */; }; E82109AD26F1C8A000FC3319 /* CountDownHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E82109AC26F1C8A000FC3319 /* CountDownHelper.m */; }; E82109B026F1D83500FC3319 /* LoginBindPhonePresent.m in Sources */ = {isa = PBXBuildFile; fileRef = E82109AF26F1D83500FC3319 /* LoginBindPhonePresent.m */; }; - E82325F2274E2DE6003A3332 /* XPUserCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E82325F1274E2DE6003A3332 /* XPUserCardViewController.m */; }; - E82325F5274E2E09003A3332 /* XPUserCardPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E82325F4274E2E09003A3332 /* XPUserCardPresenter.m */; }; - E82325F9274E2E42003A3332 /* Api+UserCard.m in Sources */ = {isa = PBXBuildFile; fileRef = E82325F8274E2E42003A3332 /* Api+UserCard.m */; }; - E82325FC274E4735003A3332 /* XPUserCardItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E82325FB274E4735003A3332 /* XPUserCardItemModel.m */; }; - E8232600274E48EA003A3332 /* XPUserCardItemCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E82325FF274E48EA003A3332 /* XPUserCardItemCollectionViewCell.m */; }; - E8232603274E4AA0003A3332 /* ThemeColor+UserCard.m in Sources */ = {isa = PBXBuildFile; fileRef = E8232602274E4AA0003A3332 /* ThemeColor+UserCard.m */; }; - E824543526F57D6E00BE8163 /* XPLoginVerifBindPhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E824543426F57D6E00BE8163 /* XPLoginVerifBindPhoneViewController.m */; }; - E824543826F5820A00BE8163 /* XPLoginVerifBindPhonePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E824543726F5820A00BE8163 /* XPLoginVerifBindPhonePresenter.m */; }; E824543A26F5880E00BE8163 /* XPLoginVerifBindPhoneProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E824543926F5822800BE8163 /* XPLoginVerifBindPhoneProtocol.h */; }; - E824543D26F58C3A00BE8163 /* XPLoginBindSuccessView.m in Sources */ = {isa = PBXBuildFile; fileRef = E824543C26F58C3A00BE8163 /* XPLoginBindSuccessView.m */; }; - E824544026F58F9400BE8163 /* XPMinePayPwdViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E824543F26F58F9400BE8163 /* XPMinePayPwdViewController.m */; }; - E824544326F58FCE00BE8163 /* XPMinePayPwdInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = E824544226F58FCE00BE8163 /* XPMinePayPwdInputView.m */; }; - E824544626F5934700BE8163 /* XPMinePayPwdPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E824544526F5934600BE8163 /* XPMinePayPwdPresenter.m */; }; E824544826F5945300BE8163 /* XPMinePayPwdProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E824544726F5940600BE8163 /* XPMinePayPwdProtocol.h */; }; - E824544B26F5BBB800BE8163 /* XPMineModifPayPwdViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E824544A26F5BBB800BE8163 /* XPMineModifPayPwdViewController.m */; }; - E824544E26F5BC1A00BE8163 /* XPMineModifPayPwdView.m in Sources */ = {isa = PBXBuildFile; fileRef = E824544D26F5BC1A00BE8163 /* XPMineModifPayPwdView.m */; }; - E824545126F5CE6E00BE8163 /* XPMineModifPayPwdPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E824545026F5CE6E00BE8163 /* XPMineModifPayPwdPresenter.m */; }; E824545326F5CEAD00BE8163 /* XPMineModifPayProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E824545226F5CE9C00BE8163 /* XPMineModifPayProtocol.h */; }; - E824545926F5E65900BE8163 /* XPMineVerifIdentityView.m in Sources */ = {isa = PBXBuildFile; fileRef = E824545826F5E65900BE8163 /* XPMineVerifIdentityView.m */; }; - E824545C26F5EEBA00BE8163 /* XPMineVerifIdentityPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E824545B26F5EEBA00BE8163 /* XPMineVerifIdentityPresenter.m */; }; E824545E26F5EF2200BE8163 /* XPMineVerifIdentityProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E824545D26F5EEFD00BE8163 /* XPMineVerifIdentityProtocol.h */; }; - E824546126F5F4E400BE8163 /* XPMineResetPayPwdViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E824546026F5F4E400BE8163 /* XPMineResetPayPwdViewController.m */; }; - E824546426F5FF1C00BE8163 /* XPMineResetPayPasswordPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E824546326F5FF1C00BE8163 /* XPMineResetPayPasswordPresenter.m */; }; E824546626F5FF6000BE8163 /* XPMineResetPayPasswordProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E824546526F5FF5100BE8163 /* XPMineResetPayPasswordProtocol.h */; }; - E8252FEE27687DF1002B3164 /* ActivityInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8252FED27687DF1002B3164 /* ActivityInfoModel.m */; }; - E82D5C70276AE60000858D6D /* HeadwearModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E82D5C6F276AE60000858D6D /* HeadwearModel.m */; }; - E82D5C73276AE94800858D6D /* CarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E82D5C72276AE94800858D6D /* CarModel.m */; }; - E82D5C76276AEB5100858D6D /* NameplateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E82D5C75276AEB5100858D6D /* NameplateModel.m */; }; - E82D5C7A276B25D100858D6D /* SpriteSheetImageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E82D5C79276B25D100858D6D /* SpriteSheetImageManager.m */; }; - E82D5C7D276B343300858D6D /* YYAnimatedImageView+ImageShow.m in Sources */ = {isa = PBXBuildFile; fileRef = E82D5C7C276B343300858D6D /* YYAnimatedImageView+ImageShow.m */; }; - E82E75062828E76400C25EF7 /* XPCoreDataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E82E75052828E76400C25EF7 /* XPCoreDataManager.m */; }; - E82EE0F8272FDDFA00D15DC1 /* UserPrivacyView.m in Sources */ = {isa = PBXBuildFile; fileRef = E82EE0F7272FDDFA00D15DC1 /* UserPrivacyView.m */; }; - E833ED0D274FAD1C00A2463B /* XPKickUserModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E833ED0C274FAD1C00A2463B /* XPKickUserModel.m */; }; - E83645682A40A2DC00E0DBE4 /* XPSkillCardPlayerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E83645672A40A2DC00E0DBE4 /* XPSkillCardPlayerManager.m */; }; - E836456B2A40A33300E0DBE4 /* MineSkillCardListInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83645692A40A33300E0DBE4 /* MineSkillCardListInfoModel.m */; }; E83645A82A40AF5400E0DBE4 /* NSBundle+Localizable.m in Sources */ = {isa = PBXBuildFile; fileRef = E83645A72A40AF5400E0DBE4 /* NSBundle+Localizable.m */; }; - E8383697298A598D00112E1C /* MessageTipsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8383696298A598D00112E1C /* MessageTipsModel.m */; }; - E838369A298A59C100112E1C /* MessageTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8383699298A59C100112E1C /* MessageTipsView.m */; }; - E839532D276A030F00CF2F24 /* XPMineDressUpListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E839532C276A030F00CF2F24 /* XPMineDressUpListViewController.m */; }; - E8395331276A03AE00CF2F24 /* Api+DressUp.m in Sources */ = {isa = PBXBuildFile; fileRef = E8395330276A03AE00CF2F24 /* Api+DressUp.m */; }; - E8395334276A03C300CF2F24 /* XPMineDressUpPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8395333276A03C300CF2F24 /* XPMineDressUpPresenter.m */; }; - E8395339276A0CC100CF2F24 /* XPMineHeadwearTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8395338276A0CC100CF2F24 /* XPMineHeadwearTableViewCell.m */; }; - E839533C276A0CCD00CF2F24 /* XPMineCarTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E839533B276A0CCD00CF2F24 /* XPMineCarTableViewCell.m */; }; - E839533F276A0CDB00CF2F24 /* XPMineNameplateTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E839533E276A0CDB00CF2F24 /* XPMineNameplateTableViewCell.m */; }; - E839806B290288660084BFC8 /* XPMessageInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E839806A290288660084BFC8 /* XPMessageInfoModel.m */; }; - E83ABEF6280E9AD800322EE4 /* MessageContentUnSupportView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83ABEF5280E9AD800322EE4 /* MessageContentUnSupportView.m */; }; - E83ABEF9280EAF3F00322EE4 /* MessageContentOpenLiveView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83ABEF8280EAF3F00322EE4 /* MessageContentOpenLiveView.m */; }; - E83ABEFD280EB5E200322EE4 /* ContentOpenLiveInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83ABEFC280EB5E200322EE4 /* ContentOpenLiveInfoModel.m */; }; - E83ABF00280EC45700322EE4 /* MessageContentApplicationShareView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83ABEFF280EC45700322EE4 /* MessageContentApplicationShareView.m */; }; - E83ABF03280EC90C00322EE4 /* ContentApplicationShareModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83ABF02280EC90C00322EE4 /* ContentApplicationShareModel.m */; }; - E83ABF06280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83ABF05280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m */; }; - E83DB47A27462C4500D8CBD1 /* XPGiftBigPrizeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB47927462C4500D8CBD1 /* XPGiftBigPrizeModel.m */; }; - E83DB481274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB480274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m */; }; - E83DB4842746661800D8CBD1 /* XPRoomGiftBroadcastView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83DB4832746661800D8CBD1 /* XPRoomGiftBroadcastView.m */; }; - E8412F9627795E34006E1101 /* XPRoomInviteFansView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8412F9527795E34006E1101 /* XPRoomInviteFansView.m */; }; - E8412F9927799249006E1101 /* InviteFansModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8412F9827799249006E1101 /* InviteFansModel.m */; }; - E8412FA22779BE8F006E1101 /* XPRoomSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8412FA12779BE8F006E1101 /* XPRoomSettingViewController.m */; }; - E8412FA62779BED1006E1101 /* XPRoomSettingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8412FA52779BED1006E1101 /* XPRoomSettingTableViewCell.m */; }; - E8412FA92779C2ED006E1101 /* XPRoomSettingItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8412FA82779C2ED006E1101 /* XPRoomSettingItemModel.m */; }; - E8412FB02779CB4D006E1101 /* XPRoomSettingPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8412FAF2779CB4D006E1101 /* XPRoomSettingPresenter.m */; }; - E8412FB32779E285006E1101 /* Api+RoomSetting.m in Sources */ = {isa = PBXBuildFile; fileRef = E8412FB22779E285006E1101 /* Api+RoomSetting.m */; }; - E84150BF27747BD300A7F548 /* Api+FirstRecharge.m in Sources */ = {isa = PBXBuildFile; fileRef = E84150BE27747BD300A7F548 /* Api+FirstRecharge.m */; }; - E841ED61280FB0BD00904808 /* ContentLevelUpgradeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E841ED60280FB0BD00904808 /* ContentLevelUpgradeModel.m */; }; - E84843AF27F59E7E0050D365 /* XPRoomPKResultView.m in Sources */ = {isa = PBXBuildFile; fileRef = E84843AE27F59E7E0050D365 /* XPRoomPKResultView.m */; }; - E84843B227F5A0740050D365 /* XPRomPKResultTitleLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = E84843B127F5A0740050D365 /* XPRomPKResultTitleLabel.m */; }; - E84A2E892A527DF800D6AF8A /* XPIncomeRecordVC.m in Sources */ = {isa = PBXBuildFile; fileRef = E84A2E812A527DF800D6AF8A /* XPIncomeRecordVC.m */; }; - E84A2E8A2A527DF800D6AF8A /* XPExchangeDiamondsVC.m in Sources */ = {isa = PBXBuildFile; fileRef = E84A2E822A527DF800D6AF8A /* XPExchangeDiamondsVC.m */; }; - E84A2E8B2A527DF800D6AF8A /* XPIncomeRecordGoldDetailsVC.m in Sources */ = {isa = PBXBuildFile; fileRef = E84A2E842A527DF800D6AF8A /* XPIncomeRecordGoldDetailsVC.m */; }; - E84A2E932A527EC800D6AF8A /* XPIncomeRecordPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = E84A2E912A527EC700D6AF8A /* XPIncomeRecordPresent.m */; }; - E84A2E962A5280F900D6AF8A /* XPExchangeDiamondsView.m in Sources */ = {isa = PBXBuildFile; fileRef = E84A2E942A5280F900D6AF8A /* XPExchangeDiamondsView.m */; }; - E84A2E992A52817E00D6AF8A /* XPIncomeRecordView.m in Sources */ = {isa = PBXBuildFile; fileRef = E84A2E982A52817E00D6AF8A /* XPIncomeRecordView.m */; }; - E84A2E9C2A52823900D6AF8A /* XPTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = E84A2E9B2A52823900D6AF8A /* XPTextField.m */; }; - E84A2E9F2A5287D200D6AF8A /* XPIncomeRecordGoldDetailsView.m in Sources */ = {isa = PBXBuildFile; fileRef = E84A2E9D2A5287D200D6AF8A /* XPIncomeRecordGoldDetailsView.m */; }; - E84A2EA22A52883000D6AF8A /* XPIncomeRecordGoldDetailsTimeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E84A2EA02A52883000D6AF8A /* XPIncomeRecordGoldDetailsTimeView.m */; }; - E84A2EA52A5288CB00D6AF8A /* XPGoldDetailsChooseRoomView.m in Sources */ = {isa = PBXBuildFile; fileRef = E84A2EA42A5288CB00D6AF8A /* XPGoldDetailsChooseRoomView.m */; }; - E84A2EA82A5288FD00D6AF8A /* XPGoldDetailsChooseRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E84A2EA72A5288FD00D6AF8A /* XPGoldDetailsChooseRoomCell.m */; }; - E84A2EAB2A528A4100D6AF8A /* XPIncomeRecordGoldDetailsPickViewView.m in Sources */ = {isa = PBXBuildFile; fileRef = E84A2EA92A528A4100D6AF8A /* XPIncomeRecordGoldDetailsPickViewView.m */; }; - E84B0E3F2727EDF6008818C6 /* XPRoomMessageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E84B0E3E2727EDF6008818C6 /* XPRoomMessageTableViewCell.m */; }; - E84B0E422727EE0A008818C6 /* XPRoomMessageHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E84B0E412727EE0A008818C6 /* XPRoomMessageHeaderView.m */; }; - E84B0E462727EF9D008818C6 /* XPRoomMessageParser.m in Sources */ = {isa = PBXBuildFile; fileRef = E84B0E452727EF9D008818C6 /* XPRoomMessageParser.m */; }; - E84BF7CA277AF79D00EF8877 /* XPRoomSettingTagCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E84BF7C9277AF79D00EF8877 /* XPRoomSettingTagCell.m */; }; - E84BF7D1277BFCDD00EF8877 /* RoomTagModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E84BF7D0277BFCDD00EF8877 /* RoomTagModel.m */; }; - E84BF7D4277C383700EF8877 /* XPRoomSettingInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = E84BF7D3277C383700EF8877 /* XPRoomSettingInputView.m */; }; - E84BF7D7277C6E2100EF8877 /* XPRoomRoleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E84BF7D6277C6E2100EF8877 /* XPRoomRoleViewController.m */; }; - E84BF7DA277C72AC00EF8877 /* XPRoomRoleTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E84BF7D9277C72AC00EF8877 /* XPRoomRoleTableViewCell.m */; }; - E84BF7DD277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E84BF7DC277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m */; }; - E84BF7E0277C869A00EF8877 /* XPRoomOnLineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E84BF7DF277C869A00EF8877 /* XPRoomOnLineViewController.m */; }; - E84CBCE128436D3C00D43221 /* XPMineContactViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E84CBCE028436D3C00D43221 /* XPMineContactViewController.m */; }; - E84CBCE4284372D800D43221 /* XPRoomHalfMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = E84CBCE3284372D800D43221 /* XPRoomHalfMessageView.m */; }; - E84CBCE72843807500D43221 /* XPMineFriendPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E84CBCE62843807400D43221 /* XPMineFriendPresenter.m */; }; - E852D73B286317F0001465ED /* XPMomentsDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E852D73A286317F0001465ED /* XPMomentsDetailViewController.m */; }; - E852D73E28631C18001465ED /* XPMonentsCommentTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E852D73D28631C18001465ED /* XPMonentsCommentTableViewCell.m */; }; - E852D7412863249F001465ED /* XPMonentsReplyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E852D7402863249F001465ED /* XPMonentsReplyTableViewCell.m */; }; - E852D74428633A08001465ED /* MonentsCommentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E852D74328633A08001465ED /* MonentsCommentModel.m */; }; - E852D74728633E92001465ED /* MonentsCommentReplyModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E852D74628633E92001465ED /* MonentsCommentReplyModel.m */; }; - E85410352864155A005CFD9F /* XPMonentDetailPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85410342864155A005CFD9F /* XPMonentDetailPresenter.m */; }; - E854103928646A00005CFD9F /* XPMonentsReplyMoreTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E854103828646A00005CFD9F /* XPMonentsReplyMoreTableViewCell.m */; }; E855515B280559FE005F293F /* NSDate+DateUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = E855515A280559FE005F293F /* NSDate+DateUtils.m */; }; - E85E3FA728B7A6F000268DC8 /* MessageContentMonentsView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E3FA628B7A6F000268DC8 /* MessageContentMonentsView.m */; }; - E85E7B012A4EB0D200B6D00A /* XPSuperAdminSetPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A402A4EB0D200B6D00A /* XPSuperAdminSetPresenter.m */; }; - E85E7B022A4EB0D200B6D00A /* XPSuperAdminManagerRoomPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A412A4EB0D200B6D00A /* XPSuperAdminManagerRoomPresenter.m */; }; - E85E7B032A4EB0D200B6D00A /* XPGuildIncomePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A452A4EB0D200B6D00A /* XPGuildIncomePresenter.m */; }; - E85E7B042A4EB0D200B6D00A /* XPGuildIncomeDetailPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A462A4EB0D200B6D00A /* XPGuildIncomeDetailPresenter.m */; }; - E85E7B052A4EB0D200B6D00A /* XPClanPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A492A4EB0D200B6D00A /* XPClanPresenter.m */; }; - E85E7B062A4EB0D200B6D00A /* XPGuildSearchPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A4A2A4EB0D200B6D00A /* XPGuildSearchPresenter.m */; }; - E85E7B072A4EB0D200B6D00A /* XPGuildPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A4B2A4EB0D200B6D00A /* XPGuildPresenter.m */; }; - E85E7B082A4EB0D200B6D00A /* XPMineManagerSetPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A4D2A4EB0D200B6D00A /* XPMineManagerSetPresenter.m */; }; - E85E7B092A4EB0D200B6D00A /* XPGuildRemoveMemberPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A4E2A4EB0D200B6D00A /* XPGuildRemoveMemberPresenter.m */; }; - E85E7B0A2A4EB0D200B6D00A /* XPGuildManagerPerPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A502A4EB0D200B6D00A /* XPGuildManagerPerPresenter.m */; }; - E85E7B0B2A4EB0D200B6D00A /* XPGuildSetNamePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A512A4EB0D200B6D00A /* XPGuildSetNamePresenter.m */; }; - E85E7B0C2A4EB0D200B6D00A /* XPGuildMangerListPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A532A4EB0D200B6D00A /* XPGuildMangerListPresenter.m */; }; - E85E7B0D2A4EB0D200B6D00A /* GuildSuperAdminInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A702A4EB0D200B6D00A /* GuildSuperAdminInfoModel.m */; }; - E85E7B0E2A4EB0D200B6D00A /* GuildSearchSuperAdminModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A712A4EB0D200B6D00A /* GuildSearchSuperAdminModel.m */; }; - E85E7B0F2A4EB0D200B6D00A /* GuildRoomInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A722A4EB0D200B6D00A /* GuildRoomInfoModel.m */; }; - E85E7B102A4EB0D200B6D00A /* GuildIncomeDetailModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A772A4EB0D200B6D00A /* GuildIncomeDetailModel.m */; }; - E85E7B112A4EB0D200B6D00A /* GuildPersonIncomeRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A782A4EB0D200B6D00A /* GuildPersonIncomeRecordModel.m */; }; - E85E7B122A4EB0D200B6D00A /* GuildIncomeRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A792A4EB0D200B6D00A /* GuildIncomeRecordModel.m */; }; - E85E7B132A4EB0D200B6D00A /* GuildSearchUserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A7C2A4EB0D200B6D00A /* GuildSearchUserInfoModel.m */; }; - E85E7B142A4EB0D200B6D00A /* GuildAuthModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A7E2A4EB0D200B6D00A /* GuildAuthModel.m */; }; - E85E7B152A4EB0D200B6D00A /* ClanInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A7F2A4EB0D200B6D00A /* ClanInfoModel.m */; }; - E85E7B162A4EB0D200B6D00A /* GuildInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A802A4EB0D200B6D00A /* GuildInfoModel.m */; }; - E85E7B172A4EB0D200B6D00A /* ClanMemberDetailInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A812A4EB0D200B6D00A /* ClanMemberDetailInfoModel.m */; }; - E85E7B182A4EB0D200B6D00A /* ClanDetailInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A822A4EB0D200B6D00A /* ClanDetailInfoModel.m */; }; - E85E7B192A4EB0D200B6D00A /* GuildMessageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A832A4EB0D200B6D00A /* GuildMessageModel.m */; }; - E85E7B1A2A4EB0D200B6D00A /* XPMineGoldIncomeRecordVC.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A882A4EB0D200B6D00A /* XPMineGoldIncomeRecordVC.m */; }; - E85E7B1B2A4EB0D200B6D00A /* XPMineMainIncomeStatisViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A8A2A4EB0D200B6D00A /* XPMineMainIncomeStatisViewController.m */; }; - E85E7B1C2A4EB0D200B6D00A /* XPMineHallAnchorIncomeStatisViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A8B2A4EB0D200B6D00A /* XPMineHallAnchorIncomeStatisViewController.m */; }; - E85E7B1D2A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A8C2A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.m */; }; - E85E7B1F2A4EB0D300B6D00A /* XPMineGuildIncomeStatisViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A932A4EB0D200B6D00A /* XPMineGuildIncomeStatisViewController.m */; }; - E85E7B202A4EB0D300B6D00A /* XPMineGuildIncomeDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A942A4EB0D200B6D00A /* XPMineGuildIncomeDetailViewController.m */; }; - E85E7B212A4EB0D300B6D00A /* XPNewMineGuildIncomeRecordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A952A4EB0D200B6D00A /* XPNewMineGuildIncomeRecordViewController.m */; }; - E85E7B222A4EB0D300B6D00A /* XPMineGuildIncomeRecordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A982A4EB0D200B6D00A /* XPMineGuildIncomeRecordViewController.m */; }; - E85E7B232A4EB0D300B6D00A /* XPMineClanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A9A2A4EB0D200B6D00A /* XPMineClanViewController.m */; }; - E85E7B242A4EB0D300B6D00A /* XPMineGuildSuperAdminSetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A9E2A4EB0D200B6D00A /* XPMineGuildSuperAdminSetViewController.m */; }; - E85E7B252A4EB0D300B6D00A /* XPMineGuildChooseManagerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7A9F2A4EB0D200B6D00A /* XPMineGuildChooseManagerViewController.m */; }; - E85E7B262A4EB0D300B6D00A /* XPMineGuildViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AA02A4EB0D200B6D00A /* XPMineGuildViewController.m */; }; - E85E7B272A4EB0D300B6D00A /* XPGuildSuperAdminMenuView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AA42A4EB0D200B6D00A /* XPGuildSuperAdminMenuView.m */; }; - E85E7B282A4EB0D300B6D00A /* XPClanMenuView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AA62A4EB0D200B6D00A /* XPClanMenuView.m */; }; - E85E7B292A4EB0D300B6D00A /* XPGuildTimePickView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AA72A4EB0D200B6D00A /* XPGuildTimePickView.m */; }; - E85E7B2A2A4EB0D300B6D00A /* XPGuildTimeMonthPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AAC2A4EB0D200B6D00A /* XPGuildTimeMonthPickerView.m */; }; - E85E7B2B2A4EB0D300B6D00A /* XPNewGuildTimePickView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AAE2A4EB0D200B6D00A /* XPNewGuildTimePickView.m */; }; - E85E7B2C2A4EB0D300B6D00A /* XPClanSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AB12A4EB0D200B6D00A /* XPClanSectionView.m */; }; - E85E7B2D2A4EB0D300B6D00A /* XPGuildHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AB22A4EB0D200B6D00A /* XPGuildHeaderView.m */; }; - E85E7B2E2A4EB0D300B6D00A /* XPGuildSearchNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AB72A4EB0D200B6D00A /* XPGuildSearchNavView.m */; }; - E85E7B2F2A4EB0D300B6D00A /* XPGoldIncomeSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AB82A4EB0D200B6D00A /* XPGoldIncomeSectionView.m */; }; - E85E7B302A4EB0D300B6D00A /* XPGuildIncomeHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AB92A4EB0D200B6D00A /* XPGuildIncomeHeaderView.m */; }; - E85E7B312A4EB0D300B6D00A /* XPNewGuildIncomeHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7ABB2A4EB0D200B6D00A /* XPNewGuildIncomeHeaderView.m */; }; - E85E7B322A4EB0D300B6D00A /* XPGuildAnchorIncomeSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7ABC2A4EB0D200B6D00A /* XPGuildAnchorIncomeSectionView.m */; }; - E85E7B332A4EB0D300B6D00A /* XPGuildIncomeSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7ABD2A4EB0D200B6D00A /* XPGuildIncomeSectionView.m */; }; - E85E7B342A4EB0D300B6D00A /* XPMineMainGuildListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7ABE2A4EB0D200B6D00A /* XPMineMainGuildListVC.m */; }; - E85E7B352A4EB0D300B6D00A /* XPClanMemberTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AC02A4EB0D200B6D00A /* XPClanMemberTableViewCell.m */; }; - E85E7B362A4EB0D300B6D00A /* XPClanRoomCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AC12A4EB0D200B6D00A /* XPClanRoomCollectionViewCell.m */; }; - E85E7B372A4EB0D300B6D00A /* XPMineGuildListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AC32A4EB0D200B6D00A /* XPMineGuildListCell.m */; }; - E85E7B382A4EB0D300B6D00A /* XPMineGuildSearchMemberTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AC52A4EB0D200B6D00A /* XPMineGuildSearchMemberTableViewCell.m */; }; - E85E7B392A4EB0D300B6D00A /* XPGuildChooseManagerRoomTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7ACA2A4EB0D200B6D00A /* XPGuildChooseManagerRoomTableViewCell.m */; }; - E85E7B3A2A4EB0D300B6D00A /* XPGuildSuperAdminSetTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7ACB2A4EB0D200B6D00A /* XPGuildSuperAdminSetTableViewCell.m */; }; - E85E7B3B2A4EB0D300B6D00A /* XPGuildSearchSuperAdminTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7ACC2A4EB0D200B6D00A /* XPGuildSearchSuperAdminTableViewCell.m */; }; - E85E7B3C2A4EB0D300B6D00A /* XPGuildSuperAdminRoomCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7ACD2A4EB0D200B6D00A /* XPGuildSuperAdminRoomCollectionViewCell.m */; }; - E85E7B3D2A4EB0D300B6D00A /* XPGuildIncomeDetailCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AD22A4EB0D200B6D00A /* XPGuildIncomeDetailCollectionViewCell.m */; }; - E85E7B3E2A4EB0D300B6D00A /* XPGuildIncomeRecordTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AD32A4EB0D200B6D00A /* XPGuildIncomeRecordTableViewCell.m */; }; - E85E7B3F2A4EB0D300B6D00A /* XPGuildSingleRoomIncomeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AD52A4EB0D200B6D00A /* XPGuildSingleRoomIncomeTableViewCell.m */; }; - E85E7B402A4EB0D300B6D00A /* XPGuildPersonIncomeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AD72A4EB0D200B6D00A /* XPGuildPersonIncomeTableViewCell.m */; }; - E85E7B412A4EB0D300B6D00A /* XPMineGuildEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7ADC2A4EB0D200B6D00A /* XPMineGuildEmptyTableViewCell.m */; }; - E85E7B422A4EB0D300B6D00A /* XPMinePromptWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AE02A4EB0D200B6D00A /* XPMinePromptWindow.m */; }; - E85E7B432A4EB0D300B6D00A /* XPMineExchangeAuthorityHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AE22A4EB0D200B6D00A /* XPMineExchangeAuthorityHeadView.m */; }; - E85E7B442A4EB0D300B6D00A /* XPMineExchangeAuthorityCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AE32A4EB0D200B6D00A /* XPMineExchangeAuthorityCell.m */; }; - E85E7B452A4EB0D300B6D00A /* XPMineExchangeAuthorityFooderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AE62A4EB0D200B6D00A /* XPMineExchangeAuthorityFooderView.m */; }; - E85E7B462A4EB0D300B6D00A /* XPGuildEmptyCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AE72A4EB0D200B6D00A /* XPGuildEmptyCollectionViewCell.m */; }; - E85E7B472A4EB0D300B6D00A /* XPMineGuildManagerPerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AE92A4EB0D200B6D00A /* XPMineGuildManagerPerTableViewCell.m */; }; - E85E7B492A4EB0D300B6D00A /* XPMineGuildSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AED2A4EB0D200B6D00A /* XPMineGuildSearchViewController.m */; }; - E85E7B4A2A4EB0D300B6D00A /* XPMineMangerListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AF12A4EB0D200B6D00A /* XPMineMangerListViewController.m */; }; - E85E7B4B2A4EB0D300B6D00A /* XPMineGuildManagerSetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AF32A4EB0D200B6D00A /* XPMineGuildManagerSetViewController.m */; }; - E85E7B4C2A4EB0D300B6D00A /* XPMineGuildManagerPerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AF42A4EB0D200B6D00A /* XPMineGuildManagerPerViewController.m */; }; - E85E7B4D2A4EB0D300B6D00A /* XPMineGuildRemoveMemberViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AF62A4EB0D200B6D00A /* XPMineGuildRemoveMemberViewController.m */; }; - E85E7B4E2A4EB0D300B6D00A /* XPMineGuildSetNameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AF82A4EB0D200B6D00A /* XPMineGuildSetNameViewController.m */; }; - E85E7B4F2A4EB0D300B6D00A /* XPMineExchangeAuthorityVC.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AFA2A4EB0D200B6D00A /* XPMineExchangeAuthorityVC.m */; }; - E85E7B502A4EB0D300B6D00A /* XPMineGuildListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AFD2A4EB0D200B6D00A /* XPMineGuildListVC.m */; }; - E85E7B512A4EB0D300B6D00A /* Api+Guild.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7AFF2A4EB0D200B6D00A /* Api+Guild.m */; }; - E85E7B542A4EB4AD00B6D00A /* XPMineGuildListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B532A4EB4AD00B6D00A /* XPMineGuildListModel.m */; }; E85E7B642A4EC35A00B6D00A /* XPIncomeRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B5E2A4EC35A00B6D00A /* XPIncomeRecordModel.m */; }; E85E7B652A4EC35A00B6D00A /* XPExchangeDiamondsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B5F2A4EC35A00B6D00A /* XPExchangeDiamondsModel.m */; }; E85E7B662A4EC35A00B6D00A /* XPIncomeRecordGoldDetailsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B602A4EC35A00B6D00A /* XPIncomeRecordGoldDetailsModel.m */; }; E85E7B6B2A4EC39400B6D00A /* XPMineExchangeAuthorityModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B692A4EC39400B6D00A /* XPMineExchangeAuthorityModel.m */; }; - E85E7B6E2A4EC4AE00B6D00A /* XPMineGuildPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B6C2A4EC4AE00B6D00A /* XPMineGuildPresenter.m */; }; - E85E7B9F2A4EC99300B6D00A /* XPMineGiveDiamondPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B752A4EC99200B6D00A /* XPMineGiveDiamondPresenter.m */; }; - E85E7BA02A4EC99300B6D00A /* XPMineGiveDiamondDetailsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B7A2A4EC99200B6D00A /* XPMineGiveDiamondDetailsModel.m */; }; - E85E7BA12A4EC99300B6D00A /* XPMineGiveDiamondModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B7B2A4EC99200B6D00A /* XPMineGiveDiamondModel.m */; }; - E85E7BA22A4EC99300B6D00A /* XPMineGiveDiamondSearchModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B7F2A4EC99200B6D00A /* XPMineGiveDiamondSearchModel.m */; }; - E85E7BA32A4EC99300B6D00A /* XPMineGiveDiamondDetailsVC.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B832A4EC99200B6D00A /* XPMineGiveDiamondDetailsVC.m */; }; - E85E7BA42A4EC99300B6D00A /* XPMineGiveDiamondCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B862A4EC99200B6D00A /* XPMineGiveDiamondCell.m */; }; - E85E7BA52A4EC99300B6D00A /* XPMineChooseGiveDiamondView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B872A4EC99200B6D00A /* XPMineChooseGiveDiamondView.m */; }; - E85E7BA62A4EC99300B6D00A /* XPMineGiveDiamondSearchView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B892A4EC99200B6D00A /* XPMineGiveDiamondSearchView.m */; }; - E85E7BA72A4EC99300B6D00A /* XPMineGiveDiamondPasswordView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B8A2A4EC99200B6D00A /* XPMineGiveDiamondPasswordView.m */; }; - E85E7BA82A4EC99300B6D00A /* XPMineChooseGiveGiftViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B922A4EC99200B6D00A /* XPMineChooseGiveGiftViewCell.m */; }; - E85E7BA92A4EC99300B6D00A /* XPMineConfirmGiveDiamondView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B952A4EC99200B6D00A /* XPMineConfirmGiveDiamondView.m */; }; - E85E7BAA2A4EC99300B6D00A /* XPMineGiveDiamondPwdView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B962A4EC99200B6D00A /* XPMineGiveDiamondPwdView.m */; }; - E85E7BAB2A4EC99300B6D00A /* XPMineChooseGiveGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B972A4EC99200B6D00A /* XPMineChooseGiveGiftView.m */; }; - E85E7BAC2A4EC99300B6D00A /* XPMineGiveDiamondDetailsView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B982A4EC99200B6D00A /* XPMineGiveDiamondDetailsView.m */; }; - E85E7BAD2A4EC99300B6D00A /* XPMineGiveDiamondDetailsCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B992A4EC99200B6D00A /* XPMineGiveDiamondDetailsCell.m */; }; - E85E7BAE2A4EC99300B6D00A /* XPMineGiveDiamondVC.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B9A2A4EC99200B6D00A /* XPMineGiveDiamondVC.m */; }; - E85E7BAF2A4EC99300B6D00A /* XPMineChooseGiveDiamondVC.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B9B2A4EC99200B6D00A /* XPMineChooseGiveDiamondVC.m */; }; - E85E7BB02A4EC99300B6D00A /* Api+GiveDiamond.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7B9E2A4EC99200B6D00A /* Api+GiveDiamond.m */; }; - E85E7BB32A4ED45300B6D00A /* XPPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7BB22A4ED45300B6D00A /* XPPageControl.m */; }; - E85E7BB62A4ED59900B6D00A /* XPIncomeRecordGoldDetailsCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7BB52A4ED59900B6D00A /* XPIncomeRecordGoldDetailsCell.m */; }; - E85E7BB92A4ED89F00B6D00A /* XPIncomeRecordGoldDetailsHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7BB82A4ED89F00B6D00A /* XPIncomeRecordGoldDetailsHeadView.m */; }; - E85E7BBC2A4EE70B00B6D00A /* XPMineTheGuildCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7BBB2A4EE70B00B6D00A /* XPMineTheGuildCell.m */; }; - E85E7BBF2A4EE7AC00B6D00A /* XPMinePersonalCenterCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7BBE2A4EE7AC00B6D00A /* XPMinePersonalCenterCell.m */; }; - E85E7BC22A4EE82300B6D00A /* XPMineListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E85E7BC12A4EE82300B6D00A /* XPMineListCell.m */; }; - E86507E5281A7D4D006951B0 /* MessageContentTweetView.m in Sources */ = {isa = PBXBuildFile; fileRef = E86507E4281A7D4D006951B0 /* MessageContentTweetView.m */; }; - E86507E8281A8212006951B0 /* ContentTweetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E86507E7281A8212006951B0 /* ContentTweetModel.m */; }; - E86507EB281A88A9006951B0 /* MessageContentSkillCardView.m in Sources */ = {isa = PBXBuildFile; fileRef = E86507EA281A88A9006951B0 /* MessageContentSkillCardView.m */; }; - E86596512701A1C000846EBD /* StatisticsService.m in Sources */ = {isa = PBXBuildFile; fileRef = E86596502701A1C000846EBD /* StatisticsService.m */; }; - E86596542701A55500846EBD /* StatisticsServiceHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E86596532701A55500846EBD /* StatisticsServiceHelper.m */; }; - E8659909273E800D00EE349D /* XPGiftCollectionViewFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = E8659908273E800D00EE349D /* XPGiftCollectionViewFlowLayout.m */; }; - E8664ED027E42238000171BA /* XPRoomPKTimePickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8664ECF27E42238000171BA /* XPRoomPKTimePickerView.m */; }; - E8664ED327E4258A000171BA /* RoomPKTimeItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8664ED227E4258A000171BA /* RoomPKTimeItemModel.m */; }; - E8664ED627E434D5000171BA /* XPRoomPKRecordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8664ED527E434D5000171BA /* XPRoomPKRecordViewController.m */; }; - E8664ED927E4355C000171BA /* XPRoomPKRecordTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8664ED827E4355C000171BA /* XPRoomPKRecordTableViewCell.m */; }; - E8664EDC27E43632000171BA /* XPRoomPKEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8664EDB27E43632000171BA /* XPRoomPKEmptyTableViewCell.m */; }; - E8664EDF27E45EC7000171BA /* XPRoomPKRecordPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8664EDE27E45EC7000171BA /* XPRoomPKRecordPresenter.m */; }; - E8664EE327E47711000171BA /* XPRoomPKRecordNickView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8664EE227E47711000171BA /* XPRoomPKRecordNickView.m */; }; - E8664EE627E482EF000171BA /* RoomPKTeamModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8664EE527E482EF000171BA /* RoomPKTeamModel.m */; }; - E866B6E52759F96F009B002A /* XPMiniRoomView.m in Sources */ = {isa = PBXBuildFile; fileRef = E866B6E42759F96F009B002A /* XPMiniRoomView.m */; }; - E8680718271967B00024F48F /* MicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8680717271967B00024F48F /* MicroView.m */; }; - E86A16BF2856D4D5004228B8 /* XPSessionFindNewGreetListView.m in Sources */ = {isa = PBXBuildFile; fileRef = E86A16BE2856D4D5004228B8 /* XPSessionFindNewGreetListView.m */; }; - E86A16C22856D635004228B8 /* XPSessionFindNewGreetTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E86A16C12856D635004228B8 /* XPSessionFindNewGreetTableViewCell.m */; }; - E86A16C52856DBEC004228B8 /* FindNewGreetListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E86A16C42856DBEC004228B8 /* FindNewGreetListModel.m */; }; - E86E79CD28A4E045006DAF48 /* MessageContentRiskAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = E86E79CC28A4E045006DAF48 /* MessageContentRiskAlertView.m */; }; - E86E79D028A4E0B2006DAF48 /* ContentRistAlertModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E86E79CF28A4E0B2006DAF48 /* ContentRistAlertModel.m */; }; - E86E79D328A4E94E006DAF48 /* SessionRiskView.m in Sources */ = {isa = PBXBuildFile; fileRef = E86E79D228A4E94E006DAF48 /* SessionRiskView.m */; }; - 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 */; }; - 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 */; }; - E873EB0C2809850D0071030D /* MessageContentCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = E873EB0B2809850D0071030D /* MessageContentCustomView.m */; }; - E873EB0F28098D500071030D /* MessageContentGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = E873EB0E28098D500071030D /* MessageContentGiftView.m */; }; - E874B88827215D39003954B9 /* MicroStateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E874B88727215D39003954B9 /* MicroStateModel.m */; }; - E874B88B27215EAF003954B9 /* MicroQueueModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E874B88A27215EAF003954B9 /* MicroQueueModel.m */; }; - E8751E5928A62A390056EF44 /* Api+Sailing.m in Sources */ = {isa = PBXBuildFile; fileRef = E8751E5828A62A390056EF44 /* Api+Sailing.m */; }; - E8751E5C28A62A530056EF44 /* XPSailingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8751E5B28A62A530056EF44 /* XPSailingViewController.m */; }; - E8751E5F28A62A970056EF44 /* XPSailingPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8751E5E28A62A970056EF44 /* XPSailingPresenter.m */; }; - E8751E6328A646400056EF44 /* XPSailingRankView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8751E6228A646400056EF44 /* XPSailingRankView.m */; }; - E8751E6628A6465A0056EF44 /* XPSailingRankSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8751E6528A6465A0056EF44 /* XPSailingRankSubView.m */; }; - E8751E6B28A64C6E0056EF44 /* XPSailingRankTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8751E6A28A64C6E0056EF44 /* XPSailingRankTableViewCell.m */; }; - E8751E6E28A64F990056EF44 /* XPSailingEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8751E6D28A64F990056EF44 /* XPSailingEmptyTableViewCell.m */; }; - E8751E7128A6541B0056EF44 /* RoomSailingRankModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8751E7028A6541B0056EF44 /* RoomSailingRankModel.m */; }; - E8751E7428A665BC0056EF44 /* RoomSailingInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8751E7328A665BC0056EF44 /* RoomSailingInfoModel.m */; }; - E875A1B829755EE200AB1BBD /* SessionUserInfoTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E875A1B729755EE200AB1BBD /* SessionUserInfoTableViewCell.m */; }; E875FA8727D619820086ED04 /* ClientDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E875FA8627D619820086ED04 /* ClientDataModel.m */; }; - E8778AE12988B4C300CF139B /* MessageRevokeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8778AE02988B4C300CF139B /* MessageRevokeModel.m */; }; - E8778AE42988B57B00CF139B /* MessageContentRevokeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8778AE32988B57B00CF139B /* MessageContentRevokeView.m */; }; - E8778AE72988C1E000CF139B /* XPSessionHelloEnterView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8778AE62988C1E000CF139B /* XPSessionHelloEnterView.m */; }; - E8778AF02988EF0600CF139B /* XPSessionSayHelloViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8778AEF2988EF0600CF139B /* XPSessionSayHelloViewController.m */; }; - E8778AF52988EF2B00CF139B /* XPSessionSayHelloTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8778AF42988EF2B00CF139B /* XPSessionSayHelloTableViewCell.m */; }; - E8778AF82988F4E200CF139B /* XPSessionSayHelloHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8778AF72988F4E200CF139B /* XPSessionSayHelloHeaderView.m */; }; - E8778AFB2989034200CF139B /* XPSessionSayHelloEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8778AFA2989034200CF139B /* XPSessionSayHelloEmptyTableViewCell.m */; }; - E877A7EB2783E24700EFACED /* DatingStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = E877A7EA2783E24700EFACED /* DatingStageView.m */; }; - E877A7EE278428FB00EFACED /* MicroDatingProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = E877A7ED278428FB00EFACED /* MicroDatingProgressView.m */; }; - E87888F42738C30E00BF1D57 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E87888F32738C30E00BF1D57 /* StoreKit.framework */; }; - E8788934273A53D700BF1D57 /* XPSendGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8788933273A53D700BF1D57 /* XPSendGiftView.m */; }; - E878893C273A54C300BF1D57 /* Api+Gift.m in Sources */ = {isa = PBXBuildFile; fileRef = E878893B273A54C300BF1D57 /* Api+Gift.m */; }; - E878893F273A54F500BF1D57 /* XPGiftPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E878893E273A54F500BF1D57 /* XPGiftPresenter.m */; }; - E8788942273A55AD00BF1D57 /* XPGiftUsersView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8788941273A55AD00BF1D57 /* XPGiftUsersView.m */; }; - E8788945273A55C200BF1D57 /* XPGiftInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8788944273A55C200BF1D57 /* XPGiftInfoView.m */; }; - E8788948273A55D000BF1D57 /* XPGiftBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8788947273A55D000BF1D57 /* XPGiftBarView.m */; }; - E878894C273A607C00BF1D57 /* XPGiftUserCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E878894B273A607C00BF1D57 /* XPGiftUserCollectionViewCell.m */; }; - E8788950273A699900BF1D57 /* ThemeColor+SendGift.m in Sources */ = {isa = PBXBuildFile; fileRef = E878894F273A699900BF1D57 /* ThemeColor+SendGift.m */; }; - E878B8582835F0D300E22DCF /* MonentsInteractiveModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E878B8572835F0D300E22DCF /* MonentsInteractiveModel.m */; }; - E878B85B2835F3BF00E22DCF /* XPMonentsInteractiveTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E878B85A2835F3BF00E22DCF /* XPMonentsInteractiveTableViewCell.m */; }; - E878B85E283640A500E22DCF /* MonentsUnReadModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E878B85D283640A500E22DCF /* MonentsUnReadModel.m */; }; - E87A24F1272935920086A794 /* XPMessageRemoteExtModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87A24F0272935920086A794 /* XPMessageRemoteExtModel.m */; }; - E87A27032758BC81002DDC7A /* XPRoomSearchContainerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E87A27022758BC81002DDC7A /* XPRoomSearchContainerViewController.m */; }; - E87AE7F9277AABE50037823A /* XPRoomTagListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E87AE7F8277AABE50037823A /* XPRoomTagListViewController.m */; }; - E87AE7FC277AAC450037823A /* XPRoomTagPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E87AE7FB277AAC450037823A /* XPRoomTagPresenter.m */; }; - E87AE8C1284E184300CAFBB3 /* RoomNewUserGreetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87AE8C0284E184300CAFBB3 /* RoomNewUserGreetModel.m */; }; - E87AE8C5284E1A8400CAFBB3 /* XPRoomNewUserGreetView.m in Sources */ = {isa = PBXBuildFile; fileRef = E87AE8C4284E1A8400CAFBB3 /* XPRoomNewUserGreetView.m */; }; - E87C0A9D27D9986700CB2241 /* XPRoomFaceCollectionFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = E87C0A9C27D9986700CB2241 /* XPRoomFaceCollectionFlowLayout.m */; }; - E87C0AA027D9DE6400CB2241 /* RoomFaceSendInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87C0A9F27D9DE6400CB2241 /* RoomFaceSendInfoModel.m */; }; - E87C54BE2823CC5B0051AA11 /* XPMineResetLoginPwdPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E87C54BD2823CC5B0051AA11 /* XPMineResetLoginPwdPresenter.m */; }; - E87DF4BF2A42C8C1009C1185 /* HomeTagModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4BE2A42C8C1009C1185 /* HomeTagModel.m */; }; - E87DF4C22A42C900009C1185 /* XPNoteView.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4C12A42C900009C1185 /* XPNoteView.m */; }; - E87DF4CC2A42C960009C1185 /* HomeBannerInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4CB2A42C960009C1185 /* HomeBannerInfoModel.m */; }; - E87DF4D42A42C9B1009C1185 /* HomeRecommendRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4D32A42C9B1009C1185 /* HomeRecommendRoomModel.m */; }; - E87DF4D72A42C9C3009C1185 /* HomePlayRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4D52A42C9C3009C1185 /* HomePlayRoomModel.m */; }; - E87DF4DA2A42C9D9009C1185 /* HomeCollectRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4D82A42C9D8009C1185 /* HomeCollectRoomModel.m */; }; - E87DF4DD2A42CA12009C1185 /* HomeSearchResultModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4DB2A42CA12009C1185 /* HomeSearchResultModel.m */; }; - E87DF4E42A42CAD2009C1185 /* XPHomeSearchNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4E22A42CAD2009C1185 /* XPHomeSearchNavView.m */; }; - E87DF4E72A42CB00009C1185 /* XPHomePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4E52A42CAFF009C1185 /* XPHomePresenter.m */; }; - E87DF4EC2A42CB60009C1185 /* XPSearchListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4EA2A42CB60009C1185 /* XPSearchListTableViewCell.m */; }; - E87DF4EF2A42CB90009C1185 /* XPHomeCollectRoomTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4EE2A42CB90009C1185 /* XPHomeCollectRoomTableViewCell.m */; }; - E87DF4F22A42CBEC009C1185 /* XPHomeUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4F02A42CBEC009C1185 /* XPHomeUserView.m */; }; - E87DF4F52A42CC49009C1185 /* HomeMenuInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4F42A42CC49009C1185 /* HomeMenuInfoModel.m */; }; - E87DF4F82A42CCAB009C1185 /* XPHomeSearchRelateView.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4F62A42CCAB009C1185 /* XPHomeSearchRelateView.m */; }; - E87DF4FB2A42CCDE009C1185 /* XPHomeRedommendCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4FA2A42CCDE009C1185 /* XPHomeRedommendCollectionViewCell.m */; }; - E87DF4FE2A42CD7E009C1185 /* XPRoomSearchRecommendHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4FC2A42CD7D009C1185 /* XPRoomSearchRecommendHeadView.m */; }; - E87DF5022A42CDF1009C1185 /* XPHomeAttentionCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF5012A42CDF1009C1185 /* XPHomeAttentionCollectionViewCell.m */; }; - E87DF5052A42CE21009C1185 /* XPHomeSearchRecordCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF5042A42CE21009C1185 /* XPHomeSearchRecordCell.m */; }; - E87DF5082A42CE79009C1185 /* XPInRoomRecordPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF5072A42CE79009C1185 /* XPInRoomRecordPresenter.m */; }; - E87DF50B2A42CEC9009C1185 /* HomeEveryOneSearchModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF50A2A42CEC9009C1185 /* HomeEveryOneSearchModel.m */; }; - E87DF50E2A42CF15009C1185 /* HomeLiveRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF50D2A42CF15009C1185 /* HomeLiveRoomModel.m */; }; - E87E545429AA05EA00EBE52B /* XPFootPrintNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E545329AA05EA00EBE52B /* XPFootPrintNavView.m */; }; - E87E62592A3F560B002F68C9 /* XPHomePartyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E62562A3F560A002F68C9 /* XPHomePartyViewController.m */; }; - E87E625D2A3F5622002F68C9 /* XPNewHomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E625C2A3F5622002F68C9 /* XPNewHomeViewController.m */; }; - E87E62622A3F568A002F68C9 /* XPNewHomeNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E62602A3F5689002F68C9 /* XPNewHomeNavView.m */; }; - E87E62682A3F571D002F68C9 /* XPHomeContainerPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E62662A3F571C002F68C9 /* XPHomeContainerPresenter.m */; }; - E87E62742A3F5907002F68C9 /* XPHomeBannerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E626A2A3F5906002F68C9 /* XPHomeBannerTableViewCell.m */; }; - E87E62752A3F5907002F68C9 /* XPNewHomePlayEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E626D2A3F5906002F68C9 /* XPNewHomePlayEmptyTableViewCell.m */; }; - E87E62762A3F5907002F68C9 /* XPNewHomePlayTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E626F2A3F5906002F68C9 /* XPNewHomePlayTableViewCell.m */; }; - E87E62772A3F5907002F68C9 /* XPNewHomeRecommendTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E62702A3F5907002F68C9 /* XPNewHomeRecommendTableViewCell.m */; }; - E87E62782A3F5907002F68C9 /* XPNewHomePartyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E62712A3F5907002F68C9 /* XPNewHomePartyTableViewCell.m */; }; - E87E627B2A3F5A0D002F68C9 /* XPNewHomeRecommendPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E627A2A3F5A0D002F68C9 /* XPNewHomeRecommendPresenter.m */; }; - E87E627F2A3F5D28002F68C9 /* XPNewHomePlayItemCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E627E2A3F5D28002F68C9 /* XPNewHomePlayItemCollectionViewCell.m */; }; - E87E63F729AA1A5600EBE52B /* YuMi.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = E87E63F529AA1A5600EBE52B /* YuMi.xcdatamodeld */; }; - E87E914E2796678D00A7B3F2 /* XPMineDressEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E914D2796678D00A7B3F2 /* XPMineDressEmptyTableViewCell.m */; }; - E87E91522796A15500A7B3F2 /* MicroExtModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E91512796A15500A7B3F2 /* MicroExtModel.m */; }; - E87E91552796B6DE00A7B3F2 /* XPRoomInviteUserViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E87E91542796B6DE00A7B3F2 /* XPRoomInviteUserViewController.m */; }; - E880B39E278BD49E00A83B0D /* XPAcrossRoomPKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E880B39D278BD49E00A83B0D /* XPAcrossRoomPKViewController.m */; }; - E880B3A1278BD60C00A83B0D /* XPAcrossRoomPKSelectRoomView.m in Sources */ = {isa = PBXBuildFile; fileRef = E880B3A0278BD60C00A83B0D /* XPAcrossRoomPKSelectRoomView.m */; }; - E880B3A6278BD69900A83B0D /* XPAcrossRoomPKTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E880B3A5278BD69900A83B0D /* XPAcrossRoomPKTableViewCell.m */; }; - E880B3A9278BD82300A83B0D /* AcrossRoomPKInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E880B3A8278BD82300A83B0D /* AcrossRoomPKInfoModel.m */; }; - E880B3AC278BD98600A83B0D /* XPAcrossRoomPKEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E880B3AB278BD98600A83B0D /* XPAcrossRoomPKEmptyTableViewCell.m */; }; - E880B3AF278BE1D800A83B0D /* Api+AcrossRoomPK.m in Sources */ = {isa = PBXBuildFile; fileRef = E880B3AE278BE1D800A83B0D /* Api+AcrossRoomPK.m */; }; - E880B3B2278C1D1800A83B0D /* XPAcrossRoomPKRuleView.m in Sources */ = {isa = PBXBuildFile; fileRef = E880B3B1278C1D1800A83B0D /* XPAcrossRoomPKRuleView.m */; }; - E880B3B5278C1FE400A83B0D /* XPAcrossRoomPKPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E880B3B4278C1FE400A83B0D /* XPAcrossRoomPKPresenter.m */; }; - E884C36C2743951B00E1EBED /* GiftReceiveInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E884C36B2743951B00E1EBED /* GiftReceiveInfoModel.m */; }; - E884C36F2743AAC800E1EBED /* AttachmentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E884C36E2743AAC800E1EBED /* AttachmentModel.m */; }; - E884C3722743AEDE00E1EBED /* CustomAttachmentDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = E884C3712743AEDE00E1EBED /* CustomAttachmentDecoder.m */; }; - E885D533297798E1004DC088 /* SessionSettingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E885D532297798E1004DC088 /* SessionSettingTableViewCell.m */; }; - E885D5362977CE28004DC088 /* SessionSettingModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E885D5352977CE28004DC088 /* SessionSettingModel.m */; }; - E885D5392977D10E004DC088 /* SessionSettingUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E885D5382977D10E004DC088 /* SessionSettingUserView.m */; }; - E885D53C2977FBFD004DC088 /* MessageTimeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E885D53B2977FBFD004DC088 /* MessageTimeView.m */; }; E88749B6282B8FC600C3C7DB /* MomentsInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E88749B5282B8FC600C3C7DB /* MomentsInfoModel.m */; }; - E88863C6278EAFC3004BCFAB /* XPAcrossRoomPKResultView.m in Sources */ = {isa = PBXBuildFile; fileRef = E88863C5278EAFC3004BCFAB /* XPAcrossRoomPKResultView.m */; }; - E88863C9278EBA43004BCFAB /* XPAcrossRoomPKForceEndResultView.m in Sources */ = {isa = PBXBuildFile; fileRef = E88863C8278EBA43004BCFAB /* XPAcrossRoomPKForceEndResultView.m */; }; - E88863CC278EC336004BCFAB /* AcrossRoomPKPrizeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E88863CB278EC336004BCFAB /* AcrossRoomPKPrizeModel.m */; }; - E88863CF278EC393004BCFAB /* XPAcrossRoomPKPrizeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E88863CE278EC393004BCFAB /* XPAcrossRoomPKPrizeView.m */; }; E88863D3278ED4C0004BCFAB /* Timestamp.m in Sources */ = {isa = PBXBuildFile; fileRef = E88863D2278ED4C0004BCFAB /* Timestamp.m */; }; - E8899C7F27853B6A007944BE /* DatingMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8899C7E27853B6A007944BE /* DatingMicroView.m */; }; - E8899C822785A694007944BE /* DatingInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8899C812785A694007944BE /* DatingInfoModel.m */; }; - E8899C852785CC69007944BE /* XPRoomDatingAnimationView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8899C842785CC69007944BE /* XPRoomDatingAnimationView.m */; }; - E88B5CC126FB407B00DA9178 /* XPMineUserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E88B5CC026FB407B00DA9178 /* XPMineUserInfoViewController.m */; }; - E88B5CC526FB42B000DA9178 /* XPMineUserInfoHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E88B5CC426FB42B000DA9178 /* XPMineUserInfoHeaderView.m */; }; - E88C72912828EA4E0047FB2B /* Music+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = E88C728F2828EA4E0047FB2B /* Music+CoreDataProperties.m */; }; - E88C72922828EA4E0047FB2B /* Music+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = E88C72902828EA4E0047FB2B /* Music+CoreDataClass.m */; }; - E88C72952828F1AD0047FB2B /* XPRoomMusicLibraryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E88C72942828F1AD0047FB2B /* XPRoomMusicLibraryViewController.m */; }; - E88C72992828F3620047FB2B /* XPRoomMusicLibraryTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E88C72982828F3620047FB2B /* XPRoomMusicLibraryTableViewCell.m */; }; - E88C729C2828F37D0047FB2B /* XPRoomMusicLibraryEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E88C729B2828F37D0047FB2B /* XPRoomMusicLibraryEmptyTableViewCell.m */; }; - E88C72A02828FCD40047FB2B /* XPMusicLibraryPlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = E88C729F2828FCD40047FB2B /* XPMusicLibraryPlayView.m */; }; - E88C72A3282917590047FB2B /* XPRoomMusicVoiceSettingView.m in Sources */ = {isa = PBXBuildFile; fileRef = E88C72A2282917590047FB2B /* XPRoomMusicVoiceSettingView.m */; }; - E88C72A6282921D60047FB2B /* XPRoomBackMusicPlayerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E88C72A5282921D60047FB2B /* XPRoomBackMusicPlayerView.m */; }; - E88E4A80297673DC00019A50 /* SessionNavLiveView.m in Sources */ = {isa = PBXBuildFile; fileRef = E88E4A7F297673DC00019A50 /* SessionNavLiveView.m */; }; - E8901CF628B38D89001E9A92 /* XPGraffitiGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8901CF528B38D89001E9A92 /* XPGraffitiGiftView.m */; }; - E890BC04273CF0500007C46B /* XPGiftCountModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E890BC03273CF0500007C46B /* XPGiftCountModel.m */; }; - E890BC07273CF1800007C46B /* XPGiftCountCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E890BC06273CF1800007C46B /* XPGiftCountCollectionViewCell.m */; }; - E890BC0D273D09A50007C46B /* XPGiftCountView.m in Sources */ = {isa = PBXBuildFile; fileRef = E890BC0C273D09A50007C46B /* XPGiftCountView.m */; }; - E890BC10273D23F00007C46B /* GiftInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E890BC0F273D23F00007C46B /* GiftInfoModel.m */; }; - E8950180282CAC49007E459A /* XPMomentsUserInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E895017F282CAC49007E459A /* XPMomentsUserInfoView.m */; }; - E8950183282CAC6A007E459A /* XPMomentsPhotoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8950182282CAC6A007E459A /* XPMomentsPhotoView.m */; }; - E8950186282CAC80007E459A /* XPMomentsTooBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8950185282CAC80007E459A /* XPMomentsTooBarView.m */; }; - E8950189282CFFB1007E459A /* XPMomentsLayoutConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = E8950188282CFFB1007E459A /* XPMomentsLayoutConfig.m */; }; - E895018C282D0701007E459A /* XPMomentsTopicView.m in Sources */ = {isa = PBXBuildFile; fileRef = E895018B282D0701007E459A /* XPMomentsTopicView.m */; }; - E896EF942771AAC100AD2CC1 /* XPMineFansPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EF932771AAC100AD2CC1 /* XPMineFansPresenter.m */; }; - E896EF972771AAE400AD2CC1 /* XPMineAttentionPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EF962771AAE400AD2CC1 /* XPMineAttentionPresenter.m */; }; - E896EF9C2771AE6B00AD2CC1 /* XPMineFansViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EF9B2771AE6B00AD2CC1 /* XPMineFansViewController.m */; }; - E896EF9F2771AE7B00AD2CC1 /* XPMineAttentionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EF9E2771AE7B00AD2CC1 /* XPMineAttentionViewController.m */; }; - E896EFA22771AE9400AD2CC1 /* XPMineFriendViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EFA12771AE9400AD2CC1 /* XPMineFriendViewController.m */; }; - E896EFA62771AEDD00AD2CC1 /* XPMineFansTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EFA52771AEDD00AD2CC1 /* XPMineFansTableViewCell.m */; }; - E896EFA92771AEEC00AD2CC1 /* XPMineAttentionTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EFA82771AEEC00AD2CC1 /* XPMineAttentionTableViewCell.m */; }; - E896EFAC2771AEFE00AD2CC1 /* XPMineFriendTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EFAB2771AEFE00AD2CC1 /* XPMineFriendTableViewCell.m */; }; - E896EFAF2771AF0F00AD2CC1 /* XPMineFriendEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EFAE2771AF0F00AD2CC1 /* XPMineFriendEmptyTableViewCell.m */; }; - E896EFB22771C93B00AD2CC1 /* XPMineFriendNumberView.m in Sources */ = {isa = PBXBuildFile; fileRef = E896EFB12771C93B00AD2CC1 /* XPMineFriendNumberView.m */; }; - E897ABFC28AF2E71003B3587 /* XPSailingGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = E897ABFB28AF2E71003B3587 /* XPSailingGiftView.m */; }; - E897ABFF28AF39B4003B3587 /* XPSailingAnimationView.m in Sources */ = {isa = PBXBuildFile; fileRef = E897ABFE28AF39B4003B3587 /* XPSailingAnimationView.m */; }; - E8998D8028597B0300C68558 /* XPRoomLuckyBigPrizeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8998D7F28597B0300C68558 /* XPRoomLuckyBigPrizeView.m */; }; - E8998D852859B4FA00C68558 /* XPMineUserInfoGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8998D842859B4FA00C68558 /* XPMineUserInfoGiftView.m */; }; - E8998D8B2859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8998D8A2859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.m */; }; - E899C68927508F4E00E189E5 /* XPUserCardInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E899C68827508F4E00E189E5 /* XPUserCardInfoModel.m */; }; - E899C68C275093B800E189E5 /* XPUserCardMicroItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E899C68B275093B800E189E5 /* XPUserCardMicroItemModel.m */; }; - E89BD7D4277D471100E31B19 /* XPRoomOnlineTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E89BD7D3277D471100E31B19 /* XPRoomOnlineTableViewCell.m */; }; - E89D60BA271D643A001F8895 /* Api+Room.m in Sources */ = {isa = PBXBuildFile; fileRef = E89D60B9271D643A001F8895 /* Api+Room.m */; }; - E89D60BD271D647A001F8895 /* XPRoomPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E89D60BC271D647A001F8895 /* XPRoomPresenter.m */; }; - E89D60C1271D64B9001F8895 /* RoomInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E89D60C0271D64B9001F8895 /* RoomInfoModel.m */; }; - E89DA66727006443008483C1 /* RechargeStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = E89DA66627006443008483C1 /* RechargeStorage.m */; }; E89DA67227008D59008483C1 /* WalletInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E89DA67127008D59008483C1 /* WalletInfoModel.m */; }; - E89DA67527009ACD008483C1 /* XPMineRechargeNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = E89DA67427009ACD008483C1 /* XPMineRechargeNavView.m */; }; - E8A03DFF27635F960098D9EA /* XPRoomCandyGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A03DFE27635F960098D9EA /* XPRoomCandyGiftView.m */; }; - E8A30BE328534A28003B4873 /* XPSessionFindNewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A30BE228534A28003B4873 /* XPSessionFindNewViewController.m */; }; - E8A30BE828534A63003B4873 /* XPSessionFindNewTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A30BE728534A63003B4873 /* XPSessionFindNewTableViewCell.m */; }; - E8A30BEB28534A96003B4873 /* XPSessionFindNewFiltrateView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A30BEA28534A96003B4873 /* XPSessionFindNewFiltrateView.m */; }; - E8A30BEE28534AB1003B4873 /* XPSessionFindNewPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A30BED28534AB1003B4873 /* XPSessionFindNewPresenter.m */; }; - E8A30BF328534B17003B4873 /* Api+FindNew.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A30BF228534B17003B4873 /* Api+FindNew.m */; }; - E8A30BF628534B35003B4873 /* FindNewUserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A30BF528534B35003B4873 /* FindNewUserInfoModel.m */; }; - E8A30BF928534E48003B4873 /* XPSessionFindNewEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A30BF828534E48003B4873 /* XPSessionFindNewEmptyTableViewCell.m */; }; - E8A3538528FD67320014A784 /* GiftLuckyBroadcastModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A3538428FD67320014A784 /* GiftLuckyBroadcastModel.m */; }; - E8A73F8728586A6F00FD9CBC /* XPGiftWeekStarCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A73F8628586A6F00FD9CBC /* XPGiftWeekStarCollectionViewCell.m */; }; - E8A88D2727E8193400CA8837 /* XPRoomPKSelectUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A88D2627E8193400CA8837 /* XPRoomPKSelectUserView.m */; }; - E8A88D2A27E81C8600CA8837 /* XPRoomPKUserCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A88D2927E81C8600CA8837 /* XPRoomPKUserCollectionViewCell.m */; }; - E8A88D2D27E81E8700CA8837 /* RoomPKChooseUserModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A88D2C27E81E8700CA8837 /* RoomPKChooseUserModel.m */; }; - E8A88D3027E85EEA00CA8837 /* RoomPKInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8A88D2F27E85EEA00CA8837 /* RoomPKInfoModel.m */; }; - E8AA6EEF27DF1E6B009B4C2B /* XPRoomTopicViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AA6EEE27DF1E6B009B4C2B /* XPRoomTopicViewController.m */; }; - E8AA6EF227DF1E97009B4C2B /* XPRoomTopicPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AA6EF127DF1E97009B4C2B /* XPRoomTopicPresenter.m */; }; - E8AB630D28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB630C28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.m */; }; - E8AB631028ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB630F28ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.m */; }; - E8AB631328ADDCF20023B0D2 /* XPMonentsTopicHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB631228ADDCF20023B0D2 /* XPMonentsTopicHeaderView.m */; }; - E8AB631628ADE2D20023B0D2 /* XPMonentsTopicLatestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB631528ADE2D20023B0D2 /* XPMonentsTopicLatestViewController.m */; }; E8AB631928ADE2F40023B0D2 /* XPMonentsTopicRecommendPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB631828ADE2F40023B0D2 /* XPMonentsTopicRecommendPresenter.m */; }; E8AB631C28ADE30E0023B0D2 /* XPMonentsTopicLatestPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB631B28ADE30E0023B0D2 /* XPMonentsTopicLatestPresenter.m */; }; - E8AB632428AE10310023B0D2 /* XPMomentsTopicListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB632328AE10310023B0D2 /* XPMomentsTopicListViewController.m */; }; - E8AB632728AE13210023B0D2 /* XPMomentsTopicListPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB632628AE13210023B0D2 /* XPMomentsTopicListPresenter.m */; }; - E8AB632C28AE19600023B0D2 /* XPMomentsMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB632B28AE19600023B0D2 /* XPMomentsMineViewController.m */; }; E8AB632F28AE19DE0023B0D2 /* XPMomentMinePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB632E28AE19DE0023B0D2 /* XPMomentMinePresenter.m */; }; - E8AB633328AE51470023B0D2 /* XPSailingPrizeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB633228AE51470023B0D2 /* XPSailingPrizeView.m */; }; - E8AB633628AE54A40023B0D2 /* XPSailingPrizeCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AB633528AE54A40023B0D2 /* XPSailingPrizeCollectionViewCell.m */; }; - E8AC721326F46ADD007D6E91 /* XPMineSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC721226F46ADD007D6E91 /* XPMineSettingViewController.m */; }; - E8AC721626F46B06007D6E91 /* XPMineSettingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC721526F46B06007D6E91 /* XPMineSettingTableViewCell.m */; }; E8AC721926F46E0B007D6E91 /* XPMineSettingItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC721826F46E0B007D6E91 /* XPMineSettingItemModel.m */; }; - E8AC721C26F4720B007D6E91 /* XPMineSettingPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC721B26F4720B007D6E91 /* XPMineSettingPresent.m */; }; E8AC721E26F472BF007D6E91 /* XPMineSettingProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E8AC721D26F4723D007D6E91 /* XPMineSettingProtocol.h */; }; - E8AC722126F47E23007D6E91 /* XPMineAboutUsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC722026F47E23007D6E91 /* XPMineAboutUsViewController.m */; }; - E8AC722426F47E5E007D6E91 /* XPMineFeedbackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC722326F47E5E007D6E91 /* XPMineFeedbackViewController.m */; }; - E8AC722726F482A4007D6E91 /* XPMineFeedbackPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC722626F482A4007D6E91 /* XPMineFeedbackPresenter.m */; }; E8AC722926F488DA007D6E91 /* XPMineFeedbackProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E8AC722826F48889007D6E91 /* XPMineFeedbackProtocol.h */; }; - E8AC722C26F49580007D6E91 /* XPMineNotificaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC722B26F49580007D6E91 /* XPMineNotificaViewController.m */; }; E8AC722F26F49610007D6E91 /* XPMineNotificationItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC722E26F49610007D6E91 /* XPMineNotificationItemModel.m */; }; - E8AC723226F49710007D6E91 /* XPMineNotificationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC723126F49710007D6E91 /* XPMineNotificationTableViewCell.m */; }; - E8AC723526F49939007D6E91 /* XPMineNotificaPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC723426F49939007D6E91 /* XPMineNotificaPresenter.m */; }; E8AC723726F49982007D6E91 /* XPMineNotificaProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E8AC723626F49957007D6E91 /* XPMineNotificaProtocol.h */; }; E8AC723A26F49AAE007D6E91 /* XPMineNotifyStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC723926F49AAE007D6E91 /* XPMineNotifyStatus.m */; }; - E8AC723D26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC723C26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m */; }; - E8AE427327153A3500BEEBB2 /* XPRoomActivityContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AE427227153A3500BEEBB2 /* XPRoomActivityContainerView.m */; }; - E8AEAED6271412EC0017FCE0 /* XPRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAED5271412EC0017FCE0 /* XPRoomViewController.m */; }; - E8AEAEF027141C430017FCE0 /* XPRoomMenuContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEEF27141C430017FCE0 /* XPRoomMenuContainerView.m */; }; - E8AEAEF327141C7C0017FCE0 /* XPRoomMessageContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEF227141C7C0017FCE0 /* XPRoomMessageContainerView.m */; }; - E8AEAEF927141CA30017FCE0 /* RoomHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEF827141CA30017FCE0 /* RoomHeaderView.m */; }; - E8AFF7E3298CA1E500FBDE32 /* SessionSayHelloCountModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AFF7E2298CA1E500FBDE32 /* SessionSayHelloCountModel.m */; }; - E8B3E8092848B871009746AB /* InviteUserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B3E8082848B871009746AB /* InviteUserInfoModel.m */; }; - E8B3E80C2848BA40009746AB /* NewUserGreetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B3E80B2848BA40009746AB /* NewUserGreetModel.m */; }; E8B825C226EA00DF009E8E9F /* LoginVerifCodePresent.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B825C126EA00DF009E8E9F /* LoginVerifCodePresent.m */; }; E8B825C726EA0D9A009E8E9F /* LoginVerifCodeProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E8B825C626EA0995009E8E9F /* LoginVerifCodeProtocol.h */; }; - E8B825CA26EA1231009E8E9F /* LoginVerifCodeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B825C826EA1231009E8E9F /* LoginVerifCodeViewController.m */; }; - E8B846BF26FD827900A777FE /* XPMineUserInfoAlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846BE26FD827900A777FE /* XPMineUserInfoAlbumViewController.m */; }; - E8B846C226FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846C126FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.m */; }; - E8B846C526FDB41A00A777FE /* XPMineUserInfolbumPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846C426FDB41A00A777FE /* XPMineUserInfolbumPresenter.m */; }; E8B846C726FDB45000A777FE /* XPMineUserInfoAlbumProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E8B846C626FDB44100A777FE /* XPMineUserInfoAlbumProtocol.h */; }; - E8B846CF26FDD96100A777FE /* XPMineRechageHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846CE26FDD96100A777FE /* XPMineRechageHeadView.m */; }; - E8B846D326FDDBE600A777FE /* XPMineRechargeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846D226FDDBE600A777FE /* XPMineRechargeTableViewCell.m */; }; - E8B846D626FDE01B00A777FE /* XPMineRechargePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846D526FDE01B00A777FE /* XPMineRechargePresenter.m */; }; E8B846D826FDE17300A777FE /* XPMineRechargeProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E8B846D726FDE16300A777FE /* XPMineRechargeProtocol.h */; }; E8B846DC26FDE24300A777FE /* RechargeListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B846DB26FDE24300A777FE /* RechargeListModel.m */; }; - E8B9842D28AB77F10022D026 /* XPMonentsPublishTopicView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B9842C28AB77F10022D026 /* XPMonentsPublishTopicView.m */; }; - E8B9843028AB90200022D026 /* XPMoentsTopicListView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B9842F28AB90200022D026 /* XPMoentsTopicListView.m */; }; - E8B9843328ABA2FF0022D026 /* MonentsPicResInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B9843228ABA2FF0022D026 /* MonentsPicResInfo.m */; }; - E8B9843628ABA8B40022D026 /* XPMonentPublishSuccessView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8B9843528ABA8B40022D026 /* XPMonentPublishSuccessView.m */; }; - E8BD0F8828A9E9E400DE050D /* RoomSailingPrizeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8BD0F8728A9E9E400DE050D /* RoomSailingPrizeModel.m */; }; - E8BD0F8B28A9EB0A00DE050D /* RoomSailingPrizeListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8BD0F8A28A9EB0A00DE050D /* RoomSailingPrizeListModel.m */; }; - E8C1CD6627D88EF800376F83 /* XPRoomFaceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C1CD6527D88EF800376F83 /* XPRoomFaceViewController.m */; }; - E8C1CD6A27D8937800376F83 /* XPRoomFaceCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C1CD6927D8937800376F83 /* XPRoomFaceCollectionViewCell.m */; }; - E8C1CD6D27D8938C00376F83 /* XPRoomFaceTitleCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C1CD6C27D8938C00376F83 /* XPRoomFaceTitleCollectionViewCell.m */; }; - E8C1CD7027D894B800376F83 /* RoomFaceTitleItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C1CD6F27D894B800376F83 /* RoomFaceTitleItemModel.m */; }; - E8C1CD7327D8A16500376F83 /* XPRoomFaceTool.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C1CD7227D8A16500376F83 /* XPRoomFaceTool.m */; }; - E8C1CD7627D8AE3D00376F83 /* XPRoomFacePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C1CD7527D8AE3D00376F83 /* XPRoomFacePresenter.m */; }; - E8C1CD7A27D8B29E00376F83 /* RoomFaceInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C1CD7927D8B29E00376F83 /* RoomFaceInfoModel.m */; }; - E8C21501274B76F60079E6BF /* XPRoomAnimationHitView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C21500274B76F60079E6BF /* XPRoomAnimationHitView.m */; }; - E8C6FFCC27548120004DC9F0 /* Api+Home.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C6FFC827548120004DC9F0 /* Api+Home.m */; }; - E8C6FFE02754EEF9004DC9F0 /* XPHomeSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C6FFDF2754EEF9004DC9F0 /* XPHomeSearchViewController.m */; }; - E8C6FFE62754FE53004DC9F0 /* XPHomeSearchPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8C6FFE52754FE53004DC9F0 /* XPHomeSearchPresenter.m */; }; E8CEA03D26EA3DE500644B44 /* LoginPasswordPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = E8CEA03C26EA3DE500644B44 /* LoginPasswordPresent.m */; }; - E8D34D4728080295009C4835 /* XPMineUserDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D34D4628080295009C4835 /* XPMineUserDataViewController.m */; }; - E8D34D4D28080351009C4835 /* XPMineDataClanTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D34D4C28080351009C4835 /* XPMineDataClanTableViewCell.m */; }; - E8D34D5028080362009C4835 /* XPMineDataGiftTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D34D4F28080362009C4835 /* XPMineDataGiftTableViewCell.m */; }; - E8D34D5628080393009C4835 /* XPMineDataGiftCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D34D5528080393009C4835 /* XPMineDataGiftCollectionViewCell.m */; }; E8D34D5A28082357009C4835 /* UserGiftWallInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D34D5928082357009C4835 /* UserGiftWallInfoModel.m */; }; - E8D34D6028082BA5009C4835 /* XPMineUserDataPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D34D5F28082BA5009C4835 /* XPMineUserDataPresenter.m */; }; - E8D34D6428084E40009C4835 /* XPMineUserInfoGiftWallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D34D6328084E40009C4835 /* XPMineUserInfoGiftWallViewController.m */; }; - E8D34D6728084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D34D6628084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m */; }; - E8D4824A278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D48249278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m */; }; - E8D4824D278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4824C278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m */; }; - E8D48250278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4824F278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m */; }; - E8D48253278D8228003C1D08 /* AcrossRoomPKPanelModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D48252278D8228003C1D08 /* AcrossRoomPKPanelModel.m */; }; - E8D48256278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D48255278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.m */; }; - E8D4DE442940462C00EC788D /* XPGiftTwelveStarBroadcastView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4DE432940462C00EC788D /* XPGiftTwelveStarBroadcastView.m */; }; - E8D4DE472940473500EC788D /* GiftTwelveStarFirstModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4DE462940473500EC788D /* GiftTwelveStarFirstModel.m */; }; - E8D55C9D28113218006935A5 /* MessageMenuModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D55C9C28113218006935A5 /* MessageMenuModel.m */; }; - E8D55CA0281186D6006935A5 /* SessionAudioRecordView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D55C9F281186D6006935A5 /* SessionAudioRecordView.m */; }; - E8D7D74B282BA1EC0007D7BD /* XPMomentsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D7D74A282BA1EC0007D7BD /* XPMomentsTableViewCell.m */; }; - E8DAC5AC2858305A00012CFD /* XPRoomMessageBubbleView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DAC5AB2858305A00012CFD /* XPRoomMessageBubbleView.m */; }; - E8DACCFB2766EDC60052092C /* MicroGiftValueView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DACCFA2766EDC60052092C /* MicroGiftValueView.m */; }; - E8DACCFE27673F870052092C /* GiftValueInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DACCFD27673F870052092C /* GiftValueInfoModel.m */; }; - E8DBB6FD27B63CE000AA285D /* LittleGameMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DBB6FC27B63CE000AA285D /* LittleGameMicroView.m */; }; - E8DD25DA295583920043C7D5 /* XPAnchorRandomPKRuleView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DD25D9295583920043C7D5 /* XPAnchorRandomPKRuleView.m */; }; E8DEC99527648FA50078CB70 /* ClientConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DEC99427648FA50078CB70 /* ClientConfig.m */; }; - E8DEC99E2764A5B60078CB70 /* XPRoomMoreMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DEC99D2764A5B60078CB70 /* XPRoomMoreMenuViewController.m */; }; - E8DEC9A12764A5D20078CB70 /* XPRoomMoreItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DEC9A02764A5D20078CB70 /* XPRoomMoreItemModel.m */; }; - E8DEC9A42764A6600078CB70 /* XPMoreMenuPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DEC9A32764A6600078CB70 /* XPMoreMenuPresenter.m */; }; - E8DEC9A82764A68B0078CB70 /* Api+MoreMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DEC9A72764A68B0078CB70 /* Api+MoreMenu.m */; }; - E8DEC9AC2764A6CD0078CB70 /* XPRoomMoreMenuCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8DEC9AB2764A6CD0078CB70 /* XPRoomMoreMenuCollectionViewCell.m */; }; - E8E0DAE0285C20E500566A2F /* MessageContentFindNewGreetView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E0DADF285C20E500566A2F /* MessageContentFindNewGreetView.m */; }; - E8E0DAE6285C280E00566A2F /* XPSessionFindNewAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E0DAE5285C280E00566A2F /* XPSessionFindNewAlertView.m */; }; - E8E0DAE9285C2E8C00566A2F /* FindNewGreetMessageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E0DAE8285C2E8C00566A2F /* FindNewGreetMessageModel.m */; }; - E8E20BDB281645300033B688 /* SessionInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E20BDA281645300033B688 /* SessionInfoViewController.m */; }; - E8E20BDE28164D3A0033B688 /* SessionNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E20BDD28164D3A0033B688 /* SessionNavView.m */; }; - E8E20BE2281695800033B688 /* XPMineLoginPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E20BE1281695800033B688 /* XPMineLoginPasswordViewController.m */; }; - E8E20BE828169BDC0033B688 /* XPMineLoginPasswordPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E20BE728169BDC0033B688 /* XPMineLoginPasswordPresenter.m */; }; - E8E20BEC2816A5B90033B688 /* XPMineBlackListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E20BEB2816A5B90033B688 /* XPMineBlackListViewController.m */; }; - E8E20BEF2816A5FC0033B688 /* XPMineBlackListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E20BEE2816A5FC0033B688 /* XPMineBlackListTableViewCell.m */; }; - E8E21A9B28B4BD92008F7C9D /* XPRoomGraffitiGiftAnimationView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E21A9A28B4BD92008F7C9D /* XPRoomGraffitiGiftAnimationView.m */; }; - E8E21A9E28B4DFE8008F7C9D /* XPSailingBuyFuelView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E21A9D28B4DFE8008F7C9D /* XPSailingBuyFuelView.m */; }; - E8E70D7726F2F15100F03460 /* XPMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D7626F2F15100F03460 /* XPMineViewController.m */; }; - E8E70D7A26F2F16600F03460 /* XPMinePresent.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D7926F2F16600F03460 /* XPMinePresent.m */; }; E8E70D7E26F2F19D00F03460 /* Api+Mine.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D7D26F2F19D00F03460 /* Api+Mine.m */; }; - E8E70D8326F2F51A00F03460 /* XPMineHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D8226F2F51A00F03460 /* XPMineHeadView.m */; }; - E8E70D8C26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D8B26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.m */; }; E8E70D9226F2F60C00F03460 /* XPMineItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E70D9126F2F60C00F03460 /* XPMineItemModel.m */; }; - E8E7DAE82744F5EF00C631CC /* XPGiftStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E7DAE72744F5EF00C631CC /* XPGiftStorage.m */; }; - E8E7DAEB2745158500C631CC /* XPGiftUserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E7DAEA2745158500C631CC /* XPGiftUserInfoModel.m */; }; - E8E859E928264F4500EE4857 /* XPRoomTransferMusicViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8E859E828264F4500EE4857 /* XPRoomTransferMusicViewController.m */; }; - E8EE827D272B9A2300A17217 /* XPRoomSendTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EE827C272B9A2300A17217 /* XPRoomSendTextView.m */; }; E8EEB8F226FC2050007C6EBA /* SDPhotoBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB8EC26FC2050007C6EBA /* SDPhotoBrowser.m */; }; E8EEB8F326FC2050007C6EBA /* SDWaitingView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB8ED26FC2050007C6EBA /* SDWaitingView.m */; }; E8EEB8F426FC2050007C6EBA /* SDBrowserImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB8EE26FC2050007C6EBA /* SDBrowserImageView.m */; }; E8EEB8F726FC2673007C6EBA /* UserPhoto.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB8F626FC2673007C6EBA /* UserPhoto.m */; }; - E8EEB8FE26FC2DF8007C6EBA /* XPMineUserInfoCustomNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB8FD26FC2DF8007C6EBA /* XPMineUserInfoCustomNavView.m */; }; - E8EEB90126FC31B6007C6EBA /* XPMineUserInfoPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB90026FC31B6007C6EBA /* XPMineUserInfoPresenter.m */; }; E8EEB90326FC31DC007C6EBA /* XPMineUserInfoProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB90226FC31CE007C6EBA /* XPMineUserInfoProtocol.h */; }; - E8EEB90626FC5772007C6EBA /* XPMineUserInfoEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB90526FC5772007C6EBA /* XPMineUserInfoEditViewController.m */; }; - E8EEB90926FC579A007C6EBA /* XPMineUserInfoEditTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB90826FC579A007C6EBA /* XPMineUserInfoEditTableViewCell.m */; }; E8EEB90C26FC5EBC007C6EBA /* XPMineUserInfoEditModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB90B26FC5EBC007C6EBA /* XPMineUserInfoEditModel.m */; }; - E8EEB90F26FC6AB8007C6EBA /* XPMineUserInfoEditPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB90E26FC6AB8007C6EBA /* XPMineUserInfoEditPresenter.m */; }; E8EEB91126FC6AE2007C6EBA /* XPMineUserInfoEditProtocol.h in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB91026FC6AD3007C6EBA /* XPMineUserInfoEditProtocol.h */; }; - E8EEB91426FC7786007C6EBA /* XPMineUserInfoNickViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB91326FC7786007C6EBA /* XPMineUserInfoNickViewController.m */; }; - E8EEB91726FC7B35007C6EBA /* XPMineUserInfoDesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB91626FC7B35007C6EBA /* XPMineUserInfoDesViewController.m */; }; - E8EEB91D26FC9D58007C6EBA /* XPMineUserInfoDateView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8EEB91C26FC9D58007C6EBA /* XPMineUserInfoDateView.m */; }; - E8F1558D28124D5200EE8C06 /* MessageConentAudioView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F1558C28124D5200EE8C06 /* MessageConentAudioView.m */; }; - E8F1559028125E2D00EE8C06 /* MessageAudioCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F1558F28125E2D00EE8C06 /* MessageAudioCenter.m */; }; - E8F1559328129EBA00EE8C06 /* ContentSecretaryModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F1559228129EBA00EE8C06 /* ContentSecretaryModel.m */; }; E8F6135C291E26BD00E12650 /* NSMutableDictionary+Saft.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F6135B291E26BD00E12650 /* NSMutableDictionary+Saft.m */; }; E8F6135F291E274E00E12650 /* NSArray+Safe.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F6135E291E274E00E12650 /* NSArray+Safe.m */; }; - E8F63CB1298B553500B338BA /* SessionSayHelloLevelModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F63CB0298B553500B338BA /* SessionSayHelloLevelModel.m */; }; - E8F63CB4298B563D00B338BA /* Api+SayHello.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F63CB3298B563D00B338BA /* Api+SayHello.m */; }; - E8F63CB7298B566D00B338BA /* XPSessionSayHelloPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F63CB6298B566D00B338BA /* XPSessionSayHelloPresenter.m */; }; - E8F63CBB298B648300B338BA /* SessionSayHelloListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F63CBA298B648300B338BA /* SessionSayHelloListModel.m */; }; - E8F65C1F286998C9009BB5B9 /* XPMineShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F65C1E286998C9009BB5B9 /* XPMineShareViewController.m */; }; - E8F65C222869A36F009BB5B9 /* ContentShareMonentsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F65C212869A36F009BB5B9 /* ContentShareMonentsModel.m */; }; - F1D8556F2931FC86008C418F /* XPRoomYearActivityView.m in Sources */ = {isa = PBXBuildFile; fileRef = F1D8556E2931FC86008C418F /* XPRoomYearActivityView.m */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -1674,7 +273,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 234489092AC3C5FF0070E5D5 /* SudMGP.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1691,102 +289,16 @@ 1427213129A75A1700C7C423 /* XPMonentsLatestProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMonentsLatestProtocol.h; sourceTree = ""; }; 1427213229A75A2600C7C423 /* XPMomentsLatestPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMomentsLatestPresenter.h; sourceTree = ""; }; 1427213329A75A2600C7C423 /* XPMomentsLatestPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMomentsLatestPresenter.m; sourceTree = ""; }; - 1427213729A75F6F00C7C423 /* MyHTTPConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyHTTPConnection.m; sourceTree = ""; }; - 1427213929A75F6F00C7C423 /* HTTPConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPConnection.h; sourceTree = ""; }; - 1427213A29A75F6F00C7C423 /* HTTPLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPLogging.h; sourceTree = ""; }; - 1427213B29A75F6F00C7C423 /* HTTPMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPMessage.h; sourceTree = ""; }; - 1427213C29A75F6F00C7C423 /* WebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocket.h; sourceTree = ""; }; - 1427213D29A75F6F00C7C423 /* HTTPAuthenticationRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPAuthenticationRequest.h; sourceTree = ""; }; - 1427213F29A75F6F00C7C423 /* HTTPAsyncFileResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPAsyncFileResponse.h; sourceTree = ""; }; - 1427214029A75F6F00C7C423 /* HTTPErrorResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPErrorResponse.m; sourceTree = ""; }; - 1427214129A75F6F00C7C423 /* HTTPDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPDataResponse.m; sourceTree = ""; }; - 1427214229A75F6F00C7C423 /* HTTPRedirectResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPRedirectResponse.h; sourceTree = ""; }; - 1427214329A75F6F00C7C423 /* HTTPDynamicFileResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPDynamicFileResponse.m; sourceTree = ""; }; - 1427214429A75F6F00C7C423 /* HTTPFileResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPFileResponse.m; sourceTree = ""; }; - 1427214529A75F6F00C7C423 /* HTTPAsyncFileResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPAsyncFileResponse.m; sourceTree = ""; }; - 1427214629A75F6F00C7C423 /* HTTPRedirectResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPRedirectResponse.m; sourceTree = ""; }; - 1427214729A75F6F00C7C423 /* HTTPDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPDataResponse.h; sourceTree = ""; }; - 1427214829A75F6F00C7C423 /* HTTPErrorResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPErrorResponse.h; sourceTree = ""; }; - 1427214929A75F6F00C7C423 /* HTTPFileResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPFileResponse.h; sourceTree = ""; }; - 1427214A29A75F6F00C7C423 /* HTTPDynamicFileResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPDynamicFileResponse.h; sourceTree = ""; }; - 1427214B29A75F6F00C7C423 /* HTTPServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPServer.h; sourceTree = ""; }; - 1427214C29A75F6F00C7C423 /* HTTPMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPMessage.m; sourceTree = ""; }; - 1427214D29A75F6F00C7C423 /* HTTPConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPConnection.m; sourceTree = ""; }; - 1427214E29A75F6F00C7C423 /* WebSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebSocket.m; sourceTree = ""; }; - 1427214F29A75F6F00C7C423 /* HTTPResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPResponse.h; sourceTree = ""; }; - 1427215129A75F6F00C7C423 /* MultipartFormDataParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultipartFormDataParser.h; sourceTree = ""; }; - 1427215229A75F6F00C7C423 /* MultipartMessageHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultipartMessageHeader.h; sourceTree = ""; }; - 1427215329A75F6F00C7C423 /* MultipartMessageHeaderField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MultipartMessageHeaderField.m; sourceTree = ""; }; - 1427215429A75F6F00C7C423 /* MultipartFormDataParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MultipartFormDataParser.m; sourceTree = ""; }; - 1427215529A75F6F00C7C423 /* MultipartMessageHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MultipartMessageHeader.m; sourceTree = ""; }; - 1427215629A75F6F00C7C423 /* MultipartMessageHeaderField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultipartMessageHeaderField.h; sourceTree = ""; }; - 1427215729A75F6F00C7C423 /* HTTPAuthenticationRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPAuthenticationRequest.m; sourceTree = ""; }; - 1427215929A75F6F00C7C423 /* DDNumber.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDNumber.m; sourceTree = ""; }; - 1427215A29A75F6F00C7C423 /* DDData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDData.m; sourceTree = ""; }; - 1427215B29A75F6F00C7C423 /* DDRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDRange.h; sourceTree = ""; }; - 1427215C29A75F6F00C7C423 /* DDNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDNumber.h; sourceTree = ""; }; - 1427215D29A75F6F00C7C423 /* DDRange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDRange.m; sourceTree = ""; }; - 1427215E29A75F6F00C7C423 /* DDData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDData.h; sourceTree = ""; }; - 1427215F29A75F6F00C7C423 /* HTTPServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPServer.m; sourceTree = ""; }; - 1427217329A75F6F00C7C423 /* SJXCSMIPHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SJXCSMIPHelper.h; sourceTree = ""; }; - 1427217429A75F6F00C7C423 /* MyHTTPConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyHTTPConnection.h; sourceTree = ""; }; - 1427218629A75F6F00C7C423 /* SJXCSMIPHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SJXCSMIPHelper.m; sourceTree = ""; }; 142721B029A7647F00C7C423 /* XPBlankViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPBlankViewController.h; sourceTree = ""; }; 142721B129A7647F00C7C423 /* XPBlankViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPBlankViewController.m; sourceTree = ""; }; - 1464C5E829A45FC300AF7C94 /* XPButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPButton.h; sourceTree = ""; }; - 1464C5E929A45FC300AF7C94 /* XPButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPButton.m; sourceTree = ""; }; - 1464C5EE29A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineSimpleUserInfoHeaderView.h; sourceTree = ""; }; - 1464C5EF29A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineSimpleUserInfoHeaderView.m; sourceTree = ""; }; - 1464C5F129A4C18000AF7C94 /* XPIAPRechargeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPIAPRechargeViewController.h; sourceTree = ""; }; - 1464C5F229A4C18000AF7C94 /* XPIAPRechargeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPIAPRechargeViewController.m; sourceTree = ""; }; - 1464C5F429A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPIAPRechargeCollectionViewCell.h; sourceTree = ""; }; - 1464C5F529A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPIAPRechargeCollectionViewCell.m; sourceTree = ""; }; - 1464C5F729A4D00000AF7C94 /* XPIAPRechargeHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPIAPRechargeHeaderView.h; sourceTree = ""; }; - 1464C5F829A4D00000AF7C94 /* XPIAPRechargeHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPIAPRechargeHeaderView.m; sourceTree = ""; }; - 149839C5299E0B9F00F82CBF /* XPMomentListCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentListCollectionViewCell.h; sourceTree = ""; }; - 149839C6299E0B9F00F82CBF /* XPMomentListCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentListCollectionViewCell.m; sourceTree = ""; }; - 14A6034A29A35EE600D2A6A5 /* XPMineItemTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineItemTableViewCell.h; sourceTree = ""; }; - 14A6034B29A35EE600D2A6A5 /* XPMineItemTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineItemTableViewCell.m; sourceTree = ""; }; - 14A6034D29A36D8300D2A6A5 /* XPSimpleMineHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSimpleMineHeaderView.h; sourceTree = ""; }; - 14A6034E29A36D8300D2A6A5 /* XPSimpleMineHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSimpleMineHeaderView.m; sourceTree = ""; }; - 14B880E5299A4B62005FCA1B /* XPLoginPhoneViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginPhoneViewController.h; sourceTree = ""; }; - 14B880E6299A4B62005FCA1B /* XPLoginPhoneViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginPhoneViewController.m; sourceTree = ""; }; 14D8767A29A7445C00E1DD7F /* NSObject+AutoCoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+AutoCoding.h"; sourceTree = ""; }; 14D8767B29A7445C00E1DD7F /* NSObject+AutoCoding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+AutoCoding.m"; sourceTree = ""; }; - 14DCAD06299B36A500A7DD31 /* XPLoginPwdViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginPwdViewController.h; sourceTree = ""; }; - 14DCAD07299B36A500A7DD31 /* XPLoginPwdViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginPwdViewController.m; sourceTree = ""; }; - 14DCAD09299B5D3A00A7DD31 /* XPLoginInputView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginInputView.h; sourceTree = ""; }; - 14DCAD0A299B5D3A00A7DD31 /* XPLoginInputView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginInputView.m; sourceTree = ""; }; - 14DCAD0C299B6AD900A7DD31 /* XPForgetPwdViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPForgetPwdViewController.h; sourceTree = ""; }; - 14DCAD0D299B6AD900A7DD31 /* XPForgetPwdViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPForgetPwdViewController.m; sourceTree = ""; }; - 14EB640729A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsSimpleDetailViewController.h; sourceTree = ""; }; - 14EB640829A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsSimpleDetailViewController.m; sourceTree = ""; }; 14EB640A29A5BEE800A4A00B /* XPMomentsDetailViewControllerDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsDetailViewControllerDelegate.h; sourceTree = ""; }; - 14EB640B29A5C16000A4A00B /* XPMomentsSimpleDetailNav.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsSimpleDetailNav.h; sourceTree = ""; }; - 14EB640C29A5C16000A4A00B /* XPMomentsSimpleDetailNav.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsSimpleDetailNav.m; sourceTree = ""; }; 180116F7279E8C4C00F2CBC0 /* PLTimeUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLTimeUtil.h; sourceTree = ""; }; 180116F8279E8C4C00F2CBC0 /* PLTimeUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLTimeUtil.m; sourceTree = ""; }; 180116FA279E8CCE00F2CBC0 /* NVDate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NVDate.m; sourceTree = ""; }; 180116FB279E8CCE00F2CBC0 /* NVDate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NVDate.h; sourceTree = ""; }; - 180806DA27297269001FD836 /* MicroViewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroViewProtocol.h; sourceTree = ""; }; - 180806F827298F9B001FD836 /* RoomGuestDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomGuestDelegate.h; sourceTree = ""; }; - 180806F92729A354001FD836 /* ThemeColor+Room.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ThemeColor+Room.h"; sourceTree = ""; }; - 180806FA2729A354001FD836 /* ThemeColor+Room.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "ThemeColor+Room.m"; sourceTree = ""; }; - 1808072B2731598F001FD836 /* XPNetImageYYLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNetImageYYLabel.h; sourceTree = ""; }; - 1808072C2731598F001FD836 /* XPNetImageYYLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNetImageYYLabel.m; sourceTree = ""; }; - 181D7F192726CE2A00B7C059 /* StageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StageView.h; sourceTree = ""; }; - 181D7F1A2726CE2A00B7C059 /* StageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StageView.m; sourceTree = ""; }; - 181D7F1F2727D9DB00B7C059 /* SocialStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SocialStageView.h; sourceTree = ""; }; - 181D7F202727D9DB00B7C059 /* SocialStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SocialStageView.m; sourceTree = ""; }; - 181D7F222727DB1E00B7C059 /* RoomHostDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomHostDelegate.h; sourceTree = ""; }; - 1845C6412790320E00016EAC /* RoomAnimationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomAnimationProtocol.h; sourceTree = ""; }; - 18486211271EA9DA005FC5DC /* RtcManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RtcManager.h; sourceTree = ""; }; - 18486212271EA9DA005FC5DC /* RtcManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RtcManager.m; sourceTree = ""; }; - 18486214271EAA03005FC5DC /* RtcDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RtcDelegate.h; sourceTree = ""; }; - 18486215271EAB8C005FC5DC /* BaseRtcImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseRtcImpl.h; sourceTree = ""; }; - 18486216271EAB8C005FC5DC /* BaseRtcImpl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BaseRtcImpl.m; sourceTree = ""; }; 186A531826FC591100D67B2C /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; - 186F8B472733F2AE007A17BC /* MicroQueueProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroQueueProtocol.h; sourceTree = ""; }; 187EEEDA26E89B32002833B2 /* BaseModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseModel.h; sourceTree = ""; }; 187EEEDB26E89B32002833B2 /* BaseModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BaseModel.m; sourceTree = ""; }; 187EEEDF26E89BFB002833B2 /* AccountModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AccountModel.h; sourceTree = ""; }; @@ -1796,8 +308,6 @@ 189DD52926DE255300AB55B1 /* YuMi.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YuMi.app; sourceTree = BUILT_PRODUCTS_DIR; }; 189DD52C26DE255300AB55B1 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 189DD52D26DE255300AB55B1 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 189DD53226DE255300AB55B1 /* TabbarViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TabbarViewController.h; sourceTree = ""; }; - 189DD53326DE255300AB55B1 /* TabbarViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TabbarViewController.m; sourceTree = ""; }; 189DD53826DE255600AB55B1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 189DD53D26DE255600AB55B1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 189DD53E26DE255600AB55B1 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -1808,8 +318,6 @@ 189DD55826DE39D200AB55B1 /* BaseMvpPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseMvpPresenter.h; sourceTree = ""; }; 189DD55926DE39D200AB55B1 /* BaseMvpPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BaseMvpPresenter.m; sourceTree = ""; }; 189DD55E26DE3BBE00AB55B1 /* BaseMvpProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseMvpProtocol.h; sourceTree = ""; }; - 189DD58D26DF97E700AB55B1 /* LoginPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginPresenter.h; sourceTree = ""; }; - 189DD58E26DF97E700AB55B1 /* LoginPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginPresenter.m; sourceTree = ""; }; 189DD59426DF986300AB55B1 /* LoginProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginProtocol.h; sourceTree = ""; }; 189DD6FD26E20E5900AB55B1 /* HttpRequestHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HttpRequestHelper.h; sourceTree = ""; }; 189DD6FE26E20E5900AB55B1 /* HttpRequestHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HttpRequestHelper.m; sourceTree = ""; }; @@ -1827,13 +335,7 @@ 189DD75826E6003C00AB55B1 /* Api.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Api.m; sourceTree = ""; }; 189DD76026E60DDC00AB55B1 /* Api+Login.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Login.h"; sourceTree = ""; }; 189DD76126E60DDC00AB55B1 /* Api+Login.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Login.m"; sourceTree = ""; }; - 18A61BE6274F9CF000A09A54 /* SessionListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionListViewController.h; sourceTree = ""; }; - 18A61BE7274F9CF000A09A54 /* SessionListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionListViewController.m; sourceTree = ""; }; - 18AAF3EE279EA59300CD7DAD /* MessageContentTextClickable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentTextClickable.h; sourceTree = ""; }; - 18AAF3EF279EA59300CD7DAD /* MessageContentTextClickable.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentTextClickable.m; sourceTree = ""; }; 18E7B1AE26E8AD760064BC9B /* MainProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MainProtocol.h; sourceTree = ""; }; - 18E7B1B026E8AF980064BC9B /* MainPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MainPresenter.h; sourceTree = ""; }; - 18E7B1B126E8AF980064BC9B /* MainPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MainPresenter.m; sourceTree = ""; }; 18E7B1B526E8B2D10064BC9B /* Api+Main.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Main.h"; sourceTree = ""; }; 18E7B1B626E8B2D10064BC9B /* Api+Main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Main.m"; sourceTree = ""; }; 18E7B31626F097E00064BC9B /* UserInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserInfoModel.h; sourceTree = ""; }; @@ -1844,274 +346,23 @@ 18E7B31D26F0984C0064BC9B /* UserLevelVo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserLevelVo.m; sourceTree = ""; }; 18E7B31F26F098650064BC9B /* UserInfoSkillVo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserInfoSkillVo.h; sourceTree = ""; }; 18E7B32026F098650064BC9B /* UserInfoSkillVo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserInfoSkillVo.m; sourceTree = ""; }; - 18E7B33026F317A20064BC9B /* XPWebViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPWebViewController.h; sourceTree = ""; }; - 18E7B33126F317A20064BC9B /* XPWebViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPWebViewController.m; sourceTree = ""; }; - 18EE3FDD2750C1F700A452BF /* SessionListCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionListCell.h; sourceTree = ""; }; - 18EE3FDE2750C1F700A452BF /* SessionListCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionListCell.m; sourceTree = ""; }; - 18EE3FE02750C29D00A452BF /* NIMBadgeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NIMBadgeView.h; sourceTree = ""; }; - 18EE3FE12750C29D00A452BF /* NIMBadgeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NIMBadgeView.m; sourceTree = ""; }; - 18EE3FEC2750CE6D00A452BF /* NIMMessageUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NIMMessageUtils.h; sourceTree = ""; }; - 18EE3FED2750CE6D00A452BF /* NIMMessageUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NIMMessageUtils.m; sourceTree = ""; }; - 18EE3FEF2750D2AD00A452BF /* NIMTimeUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NIMTimeUtils.h; sourceTree = ""; }; - 18EE3FF02750D2AD00A452BF /* NIMTimeUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NIMTimeUtils.m; sourceTree = ""; }; - 18EE3FF22750FA3700A452BF /* UIView+NIM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+NIM.h"; sourceTree = ""; }; - 18EE3FF32750FA3700A452BF /* UIView+NIM.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+NIM.m"; sourceTree = ""; }; - 18EE40182754BA9F00A452BF /* NIMMessageMaker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NIMMessageMaker.m; sourceTree = ""; }; - 18EE40192754BA9F00A452BF /* NIMMessageMaker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NIMMessageMaker.h; sourceTree = ""; }; - 18F403A32758B5F900A6C548 /* MessageContentProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentProtocol.h; sourceTree = ""; }; - 18F403C92758C66800A6C548 /* MessageContentText.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentText.h; sourceTree = ""; }; - 18F403CA2758C66800A6C548 /* MessageContentText.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentText.m; sourceTree = ""; }; - 18F403EC2758CF2F00A6C548 /* MessageContentImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentImage.h; sourceTree = ""; }; - 18F403ED2758CF2F00A6C548 /* MessageContentImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentImage.m; sourceTree = ""; }; - 18F40438275E20D900A6C548 /* TRTCRtcImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRTCRtcImpl.h; sourceTree = ""; }; - 18F40439275E20D900A6C548 /* TRTCRtcImpl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TRTCRtcImpl.m; sourceTree = ""; }; - 18F404B5276095D700A6C548 /* SessionChatLimitView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionChatLimitView.h; sourceTree = ""; }; - 18F404B6276095D700A6C548 /* SessionChatLimitView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionChatLimitView.m; sourceTree = ""; }; - 18F404B92760982000A6C548 /* ChatLimitModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ChatLimitModel.h; sourceTree = ""; }; - 18F404BA2760982000A6C548 /* ChatLimitModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ChatLimitModel.m; sourceTree = ""; }; - 18F404C1276098F100A6C548 /* Api+Message.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Message.h"; sourceTree = ""; }; - 18F404C2276098F100A6C548 /* Api+Message.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Message.m"; sourceTree = ""; }; - 18F404C6276099DF00A6C548 /* MessageProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageProtocol.h; sourceTree = ""; }; - 18F404C727609A4300A6C548 /* MessagePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessagePresenter.h; sourceTree = ""; }; - 18F404C827609A4300A6C548 /* MessagePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessagePresenter.m; sourceTree = ""; }; - 2305EEEE2AD677F200AD403C /* PIRoomPhotoAlbumVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumVC.h; sourceTree = ""; }; - 2305EEEF2AD677F200AD403C /* PIRoomPhotoAlbumVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumVC.m; sourceTree = ""; }; - 2305EEF12AD67A8D00AD403C /* PIRoomPhotoAlbumItemVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumItemVC.h; sourceTree = ""; }; - 2305EEF22AD67A8D00AD403C /* PIRoomPhotoAlbumItemVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumItemVC.m; sourceTree = ""; }; - 2305EEF42AD67E5500AD403C /* PIRoomPhotoAlbumItemCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumItemCell.h; sourceTree = ""; }; - 2305EEF52AD67E5500AD403C /* PIRoomPhotoAlbumItemCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumItemCell.m; sourceTree = ""; }; - 2305EEF92AD696B400AD403C /* PIRoomPhotoAlbumChoosePhotoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumChoosePhotoView.h; sourceTree = ""; }; - 2305EEFA2AD696B400AD403C /* PIRoomPhotoAlbumChoosePhotoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumChoosePhotoView.m; sourceTree = ""; }; - 2305EEFC2AD6978200AD403C /* PIRoomPhotoAlbumChoosePhotoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumChoosePhotoCell.h; sourceTree = ""; }; - 2305EEFD2AD6978200AD403C /* PIRoomPhotoAlbumChoosePhotoCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumChoosePhotoCell.m; sourceTree = ""; }; - 2305EEFF2AD6A33E00AD403C /* PIRoomPhotoAlbumItemChoosePhotoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumItemChoosePhotoModel.h; sourceTree = ""; }; - 2305EF002AD6A33E00AD403C /* PIRoomPhotoAlbumItemChoosePhotoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumItemChoosePhotoModel.m; sourceTree = ""; }; - 2305EF022AD6B11700AD403C /* PIRoomPhotoAlbumChoosePhotoTypeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumChoosePhotoTypeView.h; sourceTree = ""; }; - 2305EF032AD6B11700AD403C /* PIRoomPhotoAlbumChoosePhotoTypeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumChoosePhotoTypeView.m; sourceTree = ""; }; - 2305EF052AD6B51200AD403C /* PIRoomPhotoAlbumChoosePhotoGiftView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumChoosePhotoGiftView.h; sourceTree = ""; }; - 2305EF062AD6B51200AD403C /* PIRoomPhotoAlbumChoosePhotoGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumChoosePhotoGiftView.m; sourceTree = ""; }; - 2305EF082AD7CC7C00AD403C /* PIRoomPhotoAlbumChooseGiftView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumChooseGiftView.h; sourceTree = ""; }; - 2305EF092AD7CC7C00AD403C /* PIRoomPhotoAlbumChooseGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumChooseGiftView.m; sourceTree = ""; }; - 2305EF0B2AD7CC9A00AD403C /* PIRoomPhotoAlbumChooseGiftCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumChooseGiftCell.h; sourceTree = ""; }; - 2305EF0C2AD7CC9A00AD403C /* PIRoomPhotoAlbumChooseGiftCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumChooseGiftCell.m; sourceTree = ""; }; - 2305EF0E2AD8006900AD403C /* PIRoomMessagePhotoAlbumCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomMessagePhotoAlbumCell.h; sourceTree = ""; }; - 2305EF0F2AD8006900AD403C /* PIRoomMessagePhotoAlbumCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomMessagePhotoAlbumCell.m; sourceTree = ""; }; - 2305EF112AD8036B00AD403C /* PIRoomMessagePhotoAlbumView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomMessagePhotoAlbumView.h; sourceTree = ""; }; - 2305EF122AD8036B00AD403C /* PIRoomMessagePhotoAlbumView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomMessagePhotoAlbumView.m; sourceTree = ""; }; - 2305F3362AD9194B00AD403C /* PIRoomMessageUnlockPhotoAlbumView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomMessageUnlockPhotoAlbumView.h; sourceTree = ""; }; - 2305F3372AD9194B00AD403C /* PIRoomMessageUnlockPhotoAlbumView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomMessageUnlockPhotoAlbumView.m; sourceTree = ""; }; - 2305F3392AD9293D00AD403C /* PIRoomPhotoAlbumOperateView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumOperateView.h; sourceTree = ""; }; - 2305F33A2AD9293D00AD403C /* PIRoomPhotoAlbumOperateView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumOperateView.m; sourceTree = ""; }; - 2305F33C2AD9295800AD403C /* PIRoomPhotoAlbumOperateCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumOperateCell.h; sourceTree = ""; }; - 2305F33D2AD9295800AD403C /* PIRoomPhotoAlbumOperateCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumOperateCell.m; sourceTree = ""; }; - 2305F33F2AD94D5200AD403C /* XPMaskManagerVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMaskManagerVC.m; sourceTree = ""; }; - 2305F3402AD94D5200AD403C /* XPMaskManagerVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMaskManagerVC.h; sourceTree = ""; }; 2305F3422AD94E2700AD403C /* XPMaskManagerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMaskManagerModel.h; sourceTree = ""; }; 2305F3432AD94E2700AD403C /* XPMaskManagerModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMaskManagerModel.m; sourceTree = ""; }; - 2305F3452AD94E9C00AD403C /* XPMaskManagerCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMaskManagerCell.h; sourceTree = ""; }; - 2305F3462AD94E9C00AD403C /* XPMaskManagerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMaskManagerCell.m; sourceTree = ""; }; - 23194DB92AD13EAB00649F51 /* PILoginManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PILoginManager.h; sourceTree = ""; }; - 23194DBA2AD13EAB00649F51 /* PILoginManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PILoginManager.m; sourceTree = ""; }; - 23194DBD2AD14BF000649F51 /* DDTTYLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDTTYLogger.m; sourceTree = ""; }; - 23194DBE2AD14BF000649F51 /* DDLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDLog.h; sourceTree = ""; }; - 23194DBF2AD14BF000649F51 /* DDAbstractDatabaseLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDAbstractDatabaseLogger.h; sourceTree = ""; }; - 23194DC02AD14BF000649F51 /* DDASLLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDASLLogger.m; sourceTree = ""; }; - 23194DC12AD14BF000649F51 /* DDFileLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDFileLogger.h; sourceTree = ""; }; - 23194DC32AD14BF000649F51 /* ContextFilterLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextFilterLogFormatter.h; sourceTree = ""; }; - 23194DC42AD14BF000649F51 /* DispatchQueueLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DispatchQueueLogFormatter.h; sourceTree = ""; }; - 23194DC52AD14BF000649F51 /* ContextFilterLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContextFilterLogFormatter.m; sourceTree = ""; }; - 23194DC62AD14BF000649F51 /* DispatchQueueLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DispatchQueueLogFormatter.m; sourceTree = ""; }; - 23194DC72AD14BF000649F51 /* DDLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDLog.m; sourceTree = ""; }; - 23194DC82AD14BF000649F51 /* DDTTYLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDTTYLogger.h; sourceTree = ""; }; - 23194DC92AD14BF000649F51 /* DDAbstractDatabaseLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDAbstractDatabaseLogger.m; sourceTree = ""; }; - 23194DCA2AD14BF000649F51 /* DDFileLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDFileLogger.m; sourceTree = ""; }; - 23194DCB2AD14BF000649F51 /* DDASLLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDASLLogger.h; sourceTree = ""; }; - 23194DD32AD292F200649F51 /* PIPageControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIPageControl.h; sourceTree = ""; }; - 23194DD42AD292F200649F51 /* PIPageControl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIPageControl.m; sourceTree = ""; }; - 2320F6372BDF732C00227EEB /* MSRoomMenuGameView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomMenuGameView.h; sourceTree = ""; }; - 2320F6382BDF732C00227EEB /* MSRoomMenuGameView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomMenuGameView.m; sourceTree = ""; }; - 2320F63A2BDF738E00227EEB /* MSRoomMenuGameCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomMenuGameCell.h; sourceTree = ""; }; - 2320F63B2BDF738E00227EEB /* MSRoomMenuGameCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomMenuGameCell.m; sourceTree = ""; }; - 2320F63D2BDF8B3000227EEB /* MSRoomMenuGameVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomMenuGameVC.h; sourceTree = ""; }; - 2320F63E2BDF8B3000227EEB /* MSRoomMenuGameVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomMenuGameVC.m; sourceTree = ""; }; - 2320F6402BE0F53F00227EEB /* MSRoomMenuGameEmptyCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomMenuGameEmptyCell.h; sourceTree = ""; }; - 2320F6412BE0F53F00227EEB /* MSRoomMenuGameEmptyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomMenuGameEmptyCell.m; sourceTree = ""; }; 232EBBFD2BD7A25500E8CEAD /* MSParamsDecode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSParamsDecode.h; sourceTree = ""; }; 232EBBFE2BD7A25500E8CEAD /* MSParamsDecode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSParamsDecode.m; sourceTree = ""; }; - 2331C1312A5EB71000E1D940 /* XPNobleCenterPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterPresenter.h; sourceTree = ""; }; - 2331C1322A5EB71000E1D940 /* XPNobleCenterPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNobleCenterPresenter.m; sourceTree = ""; }; - 2331C1342A5EB71000E1D940 /* XPNobleCenterProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterProtocol.h; sourceTree = ""; }; - 2331C1362A5EB71000E1D940 /* NobleInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NobleInfo.m; sourceTree = ""; }; - 2331C1372A5EB71000E1D940 /* NobleLevelUpModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NobleLevelUpModel.h; sourceTree = ""; }; - 2331C1382A5EB71000E1D940 /* NobleAuthInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NobleAuthInfo.h; sourceTree = ""; }; - 2331C1392A5EB71000E1D940 /* NobleRechargeModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NobleRechargeModel.m; sourceTree = ""; }; - 2331C13A2A5EB71000E1D940 /* NobleCenterModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NobleCenterModel.m; sourceTree = ""; }; - 2331C13B2A5EB71000E1D940 /* NobleInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NobleInfo.h; sourceTree = ""; }; - 2331C13C2A5EB71000E1D940 /* NobleLevelUpModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NobleLevelUpModel.m; sourceTree = ""; }; - 2331C13D2A5EB71000E1D940 /* NobleAuthInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NobleAuthInfo.m; sourceTree = ""; }; - 2331C13E2A5EB71000E1D940 /* NobleCenterModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NobleCenterModel.h; sourceTree = ""; }; - 2331C13F2A5EB71000E1D940 /* NobleRechargeModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NobleRechargeModel.h; sourceTree = ""; }; - 2331C1412A5EB71000E1D940 /* XPNobleSettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNobleSettingViewController.m; sourceTree = ""; }; - 2331C1422A5EB71000E1D940 /* ThemeColor+NobleCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ThemeColor+NobleCenter.h"; sourceTree = ""; }; - 2331C1432A5EB71000E1D940 /* XPNobleCenterListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterListViewController.h; sourceTree = ""; }; - 2331C1462A5EB71000E1D940 /* XPNobleAuthorityDescView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleAuthorityDescView.h; sourceTree = ""; }; - 2331C1472A5EB71000E1D940 /* XPNobleSettingNavView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleSettingNavView.h; sourceTree = ""; }; - 2331C14A2A5EB71000E1D940 /* XPNobleCenterTableHeadView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterTableHeadView.h; sourceTree = ""; }; - 2331C14B2A5EB71000E1D940 /* XPNoblePrivilegeContentCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNoblePrivilegeContentCell.h; sourceTree = ""; }; - 2331C14C2A5EB71000E1D940 /* XPNobleCenterEmptyView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNobleCenterEmptyView.m; sourceTree = ""; }; - 2331C14D2A5EB71000E1D940 /* XPNobleCenterNavView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterNavView.h; sourceTree = ""; }; - 2331C14E2A5EB71000E1D940 /* XPNobleUpgradeLevelView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleUpgradeLevelView.h; sourceTree = ""; }; - 2331C14F2A5EB71000E1D940 /* XPNobleCenterResidueView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterResidueView.h; sourceTree = ""; }; - 2331C1502A5EB71000E1D940 /* XPNoblePrivilegeCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNoblePrivilegeCell.h; sourceTree = ""; }; - 2331C1522A5EB71000E1D940 /* XPNobleSettingNavView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNobleSettingNavView.m; sourceTree = ""; }; - 2331C1532A5EB71000E1D940 /* XPNobleAuthorityDescView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNobleAuthorityDescView.m; sourceTree = ""; }; - 2331C1542A5EB71000E1D940 /* XPNobleCenterNavView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNobleCenterNavView.m; sourceTree = ""; }; - 2331C1552A5EB71000E1D940 /* XPNobleCenterEmptyView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterEmptyView.h; sourceTree = ""; }; - 2331C1562A5EB71000E1D940 /* XPNoblePrivilegeContentCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNoblePrivilegeContentCell.m; sourceTree = ""; }; - 2331C1572A5EB71000E1D940 /* XPNobleCenterTableHeadView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNobleCenterTableHeadView.m; sourceTree = ""; }; - 2331C1592A5EB71000E1D940 /* XPNoblePrivilegeCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNoblePrivilegeCell.m; sourceTree = ""; }; - 2331C15A2A5EB71000E1D940 /* XPNobleCenterResidueView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNobleCenterResidueView.m; sourceTree = ""; }; - 2331C15B2A5EB71000E1D940 /* XPNobleUpgradeLevelView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNobleUpgradeLevelView.m; sourceTree = ""; }; - 2331C15C2A5EB71000E1D940 /* XPNobleSettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleSettingViewController.h; sourceTree = ""; }; - 2331C15D2A5EB71000E1D940 /* ThemeColor+NobleCenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ThemeColor+NobleCenter.m"; sourceTree = ""; }; - 2331C15E2A5EB71000E1D940 /* XPNobleCenterListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNobleCenterListViewController.m; sourceTree = ""; }; - 2331C1612A5EB71000E1D940 /* Api+NobleCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+NobleCenter.h"; sourceTree = ""; }; - 2331C1622A5EB71000E1D940 /* Api+NobleCenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+NobleCenter.m"; sourceTree = ""; }; - 2331C1792A5EB7AB00E1D940 /* XPNobleCenterEntranceView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNobleCenterEntranceView.m; sourceTree = ""; }; - 2331C17A2A5EB7AB00E1D940 /* XPNobleCenterEntranceView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterEntranceView.h; sourceTree = ""; }; - 2331C17C2A5ECCF600E1D940 /* XPNobleCenterPayView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterPayView.h; sourceTree = ""; }; - 2331C17D2A5ECCF600E1D940 /* XPNobleCenterPayView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNobleCenterPayView.m; sourceTree = ""; }; - 2331C17F2A5ECD3800E1D940 /* XPNobleCenterPayCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterPayCell.h; sourceTree = ""; }; - 2331C1802A5ECD3800E1D940 /* XPNobleCenterPayCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNobleCenterPayCell.m; sourceTree = ""; }; - 2331C1842A60F32D00E1D940 /* XPCandyTreePresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreePresenter.m; sourceTree = ""; }; - 2331C1852A60F32D00E1D940 /* XPCandyTreePresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCandyTreePresenter.h; sourceTree = ""; }; - 2331C1872A60F32D00E1D940 /* XPCandyTreeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeProtocol.h; sourceTree = ""; }; - 2331C1892A60F32D00E1D940 /* CandyTreeResultModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CandyTreeResultModel.m; sourceTree = ""; }; - 2331C18A2A60F32D00E1D940 /* CandyTreeRecordModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CandyTreeRecordModel.m; sourceTree = ""; }; - 2331C18B2A60F32D00E1D940 /* XPCandyTreeAnimationModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeAnimationModel.h; sourceTree = ""; }; - 2331C18C2A60F32D00E1D940 /* CandyTreeInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CandyTreeInfoModel.h; sourceTree = ""; }; - 2331C18D2A60F32D00E1D940 /* XPCandyTreeAnimationModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeAnimationModel.m; sourceTree = ""; }; - 2331C18E2A60F32D00E1D940 /* CandyTreeRecordModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CandyTreeRecordModel.h; sourceTree = ""; }; - 2331C18F2A60F32D00E1D940 /* CandyTreeResultModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CandyTreeResultModel.h; sourceTree = ""; }; - 2331C1902A60F32D00E1D940 /* CandyTreeInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CandyTreeInfoModel.m; sourceTree = ""; }; - 2331C1922A60F32D00E1D940 /* XPCandyTreeRankView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeRankView.m; sourceTree = ""; }; - 2331C1932A60F32D00E1D940 /* XPCandyTreeMoreView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeMoreView.m; sourceTree = ""; }; - 2331C1942A60F32D00E1D940 /* XPCandyTreeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeViewController.h; sourceTree = ""; }; - 2331C1952A60F32D00E1D940 /* XPCandyTreeInsufficientBalanceView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeInsufficientBalanceView.h; sourceTree = ""; }; - 2331C1962A60F32D00E1D940 /* XPCandyTreeGiftView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeGiftView.m; sourceTree = ""; }; - 2331C1972A60F32D00E1D940 /* XPRoomHalfWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomHalfWebView.h; sourceTree = ""; }; - 2331C1982A60F32D00E1D940 /* XPCandyRankContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCandyRankContainerView.h; sourceTree = ""; }; - 2331C19A2A60F32D00E1D940 /* XPCandyTreeEmptyableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeEmptyableViewCell.m; sourceTree = ""; }; - 2331C19B2A60F32D00E1D940 /* XPCandyTreeMoreRuleCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeMoreRuleCell.m; sourceTree = ""; }; - 2331C19C2A60F32D00E1D940 /* XPCandyTreeRankTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeRankTableViewCell.m; sourceTree = ""; }; - 2331C19D2A60F32D00E1D940 /* XPCandyTreeMoreRuleCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeMoreRuleCell.h; sourceTree = ""; }; - 2331C19E2A60F32D00E1D940 /* XPCandyTreeEmptyableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeEmptyableViewCell.h; sourceTree = ""; }; - 2331C19F2A60F32D00E1D940 /* XPCandyTreeRankTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeRankTableViewCell.h; sourceTree = ""; }; - 2331C1A02A60F32D00E1D940 /* XPCandyTreeRankView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeRankView.h; sourceTree = ""; }; - 2331C1A12A60F32D00E1D940 /* XPCandyTreeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeViewController.m; sourceTree = ""; }; - 2331C1A22A60F32D00E1D940 /* XPCandyTreeMoreView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeMoreView.h; sourceTree = ""; }; - 2331C1A32A60F32D00E1D940 /* XPCandyTreeGiftView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeGiftView.h; sourceTree = ""; }; - 2331C1A42A60F32D00E1D940 /* XPCandyTreeInsufficientBalanceView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeInsufficientBalanceView.m; sourceTree = ""; }; - 2331C1A52A60F32D00E1D940 /* XPCandyRankContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCandyRankContainerView.m; sourceTree = ""; }; - 2331C1A62A60F32D00E1D940 /* XPRoomHalfWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomHalfWebView.m; sourceTree = ""; }; - 2331C1A82A60F32D00E1D940 /* Api+CandyTree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+CandyTree.m"; sourceTree = ""; }; - 2331C1A92A60F32D00E1D940 /* Api+CandyTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+CandyTree.h"; sourceTree = ""; }; 2331C1BB2A60F69E00E1D940 /* UILabel+Utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UILabel+Utils.h"; sourceTree = ""; }; 2331C1BC2A60F69E00E1D940 /* UILabel+Utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UILabel+Utils.m"; sourceTree = ""; }; - 233423C52AAEE5C600B1253F /* XPCandyTreeBuySuccessView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeBuySuccessView.h; sourceTree = ""; }; - 233423C62AAEE5C600B1253F /* XPCandyTreeBuySuccessView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeBuySuccessView.m; sourceTree = ""; }; - 233423C82AAEE97500B1253F /* XPCandyTreeConfirmBuyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeConfirmBuyView.h; sourceTree = ""; }; - 233423C92AAEE97500B1253F /* XPCandyTreeConfirmBuyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeConfirmBuyView.m; sourceTree = ""; }; - 233423CB2AAEE98200B1253F /* XPCandyTreeConfirmBuyNumView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeConfirmBuyNumView.h; sourceTree = ""; }; - 233423CC2AAEE98200B1253F /* XPCandyTreeConfirmBuyNumView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeConfirmBuyNumView.m; sourceTree = ""; }; - 233423CE2AAEFBC300B1253F /* PICandyTreeSetModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PICandyTreeSetModel.h; sourceTree = ""; }; - 233423CF2AAEFBC300B1253F /* PICandyTreeSetModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PICandyTreeSetModel.m; sourceTree = ""; }; - 233423D12AAF0F4F00B1253F /* XPIAPRechargeHeadCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPIAPRechargeHeadCell.h; sourceTree = ""; }; - 233423D22AAF0F4F00B1253F /* XPIAPRechargeHeadCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPIAPRechargeHeadCell.m; sourceTree = ""; }; - 233423D42AB0397500B1253F /* PIMessageContentServiceReplyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIMessageContentServiceReplyView.h; sourceTree = ""; }; - 233423D52AB0397500B1253F /* PIMessageContentServiceReplyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIMessageContentServiceReplyView.m; sourceTree = ""; }; - 233423D72AB0438400B1253F /* PIMessageContentServiceReplyModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIMessageContentServiceReplyModel.h; sourceTree = ""; }; - 233423D82AB0438400B1253F /* PIMessageContentServiceReplyModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIMessageContentServiceReplyModel.m; sourceTree = ""; }; - 234489072AC3C5DA0070E5D5 /* SudMGP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SudMGP.framework; sourceTree = ""; }; 234D821C2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "YYTextAsyncLayer+PITextAsyncLayer.h"; path = "YuMi/Appdelegate/YYTextAsyncLayer+PITextAsyncLayer.h"; sourceTree = SOURCE_ROOT; }; 234D821D2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "YYTextAsyncLayer+PITextAsyncLayer.m"; path = "YuMi/Appdelegate/YYTextAsyncLayer+PITextAsyncLayer.m"; sourceTree = SOURCE_ROOT; }; 234E50AD2BF7352C005CB6D5 /* NSTextAttachment+MSImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSTextAttachment+MSImage.h"; sourceTree = ""; }; 234E50AE2BF7352C005CB6D5 /* NSTextAttachment+MSImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSTextAttachment+MSImage.m"; sourceTree = ""; }; - 235714872BECC38F004C81D6 /* MessageHeadlinesTextModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageHeadlinesTextModel.h; sourceTree = ""; }; - 235714882BECC38F004C81D6 /* MessageHeadlinesTextModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageHeadlinesTextModel.m; sourceTree = ""; }; - 235714962BEDF54E004C81D6 /* MsRoomMessageMainView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MsRoomMessageMainView.h; sourceTree = ""; }; - 235714972BEDF54E004C81D6 /* MsRoomMessageMainView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MsRoomMessageMainView.m; sourceTree = ""; }; - 235A45182B04A352009753F5 /* PIRoomActivityWebView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomActivityWebView.h; sourceTree = ""; }; - 235A45192B04A352009753F5 /* PIRoomActivityWebView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomActivityWebView.m; sourceTree = ""; }; - 235A451B2B04A452009753F5 /* PIRoomActivityWebCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomActivityWebCell.h; sourceTree = ""; }; - 235A451C2B04A452009753F5 /* PIRoomActivityWebCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomActivityWebCell.m; sourceTree = ""; }; 235A45212B04BEB6009753F5 /* PIBaseModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIBaseModel.h; sourceTree = ""; }; 235A45222B04BEB6009753F5 /* PIBaseModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIBaseModel.m; sourceTree = ""; }; - 23630BA42BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIGiftSuperGiftBroadcastView.h; sourceTree = ""; }; - 23630BA52BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIGiftSuperGiftBroadcastView.m; sourceTree = ""; }; - 2368969E2AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomGiftBroadcastWindow.h; sourceTree = ""; }; - 2368969F2AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomGiftBroadcastWindow.m; sourceTree = ""; }; - 2368ECC92BC38F6400EDF4C9 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = ""; }; 2368ECCA2BC38F6F00EDF4C9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; - 2368ECCE2BC38F9800EDF4C9 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InfoPlist.strings; sourceTree = ""; }; 2368ECD02BC38FA900EDF4C9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - 2368ECD22BC38FC500EDF4C9 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = ""; }; 2368ECD42BC38FDA00EDF4C9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = "Base.lproj/Launch Screen.storyboard"; sourceTree = ""; }; 2368ECD62BC38FDA00EDF4C9 /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = "mul.lproj/Launch Screen.xcstrings"; sourceTree = ""; }; 2368ECD72BC38FED00EDF4C9 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; - 2368ECD82BC3C02800EDF4C9 /* XPMineSwitchLanguageVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineSwitchLanguageVC.h; sourceTree = ""; }; - 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 = ""; }; - 236B2E222AA07D06003967A8 /* SudGameConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SudGameConfig.h; sourceTree = ""; }; - 236B2E232AA07D06003967A8 /* SudCommon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SudCommon.m; sourceTree = ""; }; - 236B2E252AA07D06003967A8 /* NSString+RW.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+RW.m"; sourceTree = ""; }; - 236B2E262AA07D06003967A8 /* UIImage+RW.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+RW.h"; sourceTree = ""; }; - 236B2E272AA07D06003967A8 /* UIColor+RW.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+RW.m"; sourceTree = ""; }; - 236B2E282AA07D06003967A8 /* NSData+RW.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+RW.m"; sourceTree = ""; }; - 236B2E292AA07D06003967A8 /* NSString+RW.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+RW.h"; sourceTree = ""; }; - 236B2E2A2AA07D06003967A8 /* UIImage+RW.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+RW.m"; sourceTree = ""; }; - 236B2E2B2AA07D06003967A8 /* UIColor+RW.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+RW.h"; sourceTree = ""; }; - 236B2E2C2AA07D06003967A8 /* NSData+RW.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+RW.h"; sourceTree = ""; }; - 236B2E2D2AA07D06003967A8 /* SudCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SudCommon.h; sourceTree = ""; }; - 236B2E2F2AA07D06003967A8 /* LittleGameInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LittleGameInfoModel.h; sourceTree = ""; }; - 236B2E302AA07D06003967A8 /* LittleGameInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LittleGameInfoModel.m; sourceTree = ""; }; - 236B2E322AA07D06003967A8 /* XPLittleGameRoomListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPLittleGameRoomListView.h; sourceTree = ""; }; - 236B2E332AA07D06003967A8 /* XPLittleGameMiniStageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPLittleGameMiniStageView.m; sourceTree = ""; }; - 236B2E342AA07D06003967A8 /* XPRoomLittleGameContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomLittleGameContainerView.h; sourceTree = ""; }; - 236B2E352AA07D06003967A8 /* XPLittleGameRoomOpenView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPLittleGameRoomOpenView.h; sourceTree = ""; }; - 236B2E372AA07D06003967A8 /* XPLittleGameTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPLittleGameTableViewCell.h; sourceTree = ""; }; - 236B2E382AA07D06003967A8 /* XPCreateLittleGameCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPCreateLittleGameCollectionViewCell.m; sourceTree = ""; }; - 236B2E392AA07D06003967A8 /* XPCreateLittleGameCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCreateLittleGameCollectionViewCell.h; sourceTree = ""; }; - 236B2E3A2AA07D06003967A8 /* XPLittleGameTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPLittleGameTableViewCell.m; sourceTree = ""; }; - 236B2E3B2AA07D06003967A8 /* XPLittleGameMiniStageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPLittleGameMiniStageView.h; sourceTree = ""; }; - 236B2E3C2AA07D06003967A8 /* XPLittleGameRoomListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPLittleGameRoomListView.m; sourceTree = ""; }; - 236B2E3D2AA07D06003967A8 /* XPLittleGameRoomOpenView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPLittleGameRoomOpenView.m; sourceTree = ""; }; - 236B2E3E2AA07D06003967A8 /* XPRoomLittleGameContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomLittleGameContainerView.m; sourceTree = ""; }; - 236B2E402AA07D06003967A8 /* Api+LittleGame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+LittleGame.m"; sourceTree = ""; }; - 236B2E412AA07D06003967A8 /* Api+LittleGame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+LittleGame.h"; sourceTree = ""; }; - 236B2E4F2AA08756003967A8 /* LittleGameScrollStageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LittleGameScrollStageView.h; sourceTree = ""; }; - 236B2E502AA08756003967A8 /* LittleGameStageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LittleGameStageView.m; sourceTree = ""; }; - 236B2E512AA08756003967A8 /* LittleGameScrollStageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LittleGameScrollStageView.m; sourceTree = ""; }; - 236B2E522AA08757003967A8 /* LittleGameStageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LittleGameStageView.h; sourceTree = ""; }; - 236B2E552AA18E12003967A8 /* XPMIneGameCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMIneGameCollectionViewCell.m; sourceTree = ""; }; - 236B2E562AA18E12003967A8 /* XPMineGameTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGameTableViewCell.h; sourceTree = ""; }; - 236B2E572AA18E12003967A8 /* XPMineGameTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGameTableViewCell.m; sourceTree = ""; }; - 236B2E582AA18E12003967A8 /* XPMIneGameCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMIneGameCollectionViewCell.h; sourceTree = ""; }; - 236B2E5B2AA19168003967A8 /* HomeLittleGameRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeLittleGameRoomModel.h; sourceTree = ""; }; - 236B2E5C2AA19169003967A8 /* HomeLittleGameRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeLittleGameRoomModel.m; sourceTree = ""; }; - 236BA4962BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINoblePrivilegeEmptyCell.h; sourceTree = ""; }; - 236BA4972BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINoblePrivilegeEmptyCell.m; sourceTree = ""; }; - 237700CE2BC697D400D661F1 /* pi_login_new_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_login_new_logo.png; sourceTree = ""; }; 237700D12BC7CC7C00D661F1 /* NSObject+MJExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+MJExtension.h"; sourceTree = ""; }; 237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+MJExtension.m"; sourceTree = ""; }; 237701072BCF73CE00D661F1 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; @@ -2120,131 +371,8 @@ 2377010D2BCF73F400D661F1 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 2377010F2BCF740400D661F1 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 237701112BCF742C00D661F1 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; - 237701182BD6143700D661F1 /* pi_happy_egg_smash.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_happy_egg_smash.svga; sourceTree = ""; }; - 2378529F2C072D8D00E360AC /* MSRoomGameModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameModel.h; sourceTree = ""; }; - 237852A02C072D8D00E360AC /* MSRoomGameModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameModel.m; sourceTree = ""; }; - 237852A22C082A9800E360AC /* MSRoomGameSendTextView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameSendTextView.h; sourceTree = ""; }; - 237852A32C082A9800E360AC /* MSRoomGameSendTextView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameSendTextView.m; sourceTree = ""; }; - 237852A52C08764B00E360AC /* MSRoomGameResultsModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameResultsModel.h; sourceTree = ""; }; - 237852A62C08764B00E360AC /* MSRoomGameResultsModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameResultsModel.m; sourceTree = ""; }; - 237B94AD2A984DA7007853E3 /* XPTrumpetPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTrumpetPresenter.h; sourceTree = ""; }; - 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPTrumpetPresenter.m; sourceTree = ""; }; - 237B94B02A984DA7007853E3 /* XPRoomTrumpetProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetProtocol.h; sourceTree = ""; }; - 237B94B22A984DA7007853E3 /* XPNobleTrumpetModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleTrumpetModel.h; sourceTree = ""; }; - 237B94B32A984DA7007853E3 /* XPNobleTrumpetModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNobleTrumpetModel.m; sourceTree = ""; }; - 237B94B52A984DA7007853E3 /* XPRoomTrumpetViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetViewController.h; sourceTree = ""; }; - 237B94B62A984DA7007853E3 /* XPRoomTrumpetView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetView.h; sourceTree = ""; }; - 237B94B72A984DA7007853E3 /* XPRoomTrumpetViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomTrumpetViewController.m; sourceTree = ""; }; - 237B94B82A984DA7007853E3 /* XPRoomTrumpetView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomTrumpetView.m; sourceTree = ""; }; - 237B94BA2A984DA7007853E3 /* Api+RoomTrumpet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+RoomTrumpet.m"; sourceTree = ""; }; - 237B94BB2A984DA7007853E3 /* Api+RoomTrumpet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+RoomTrumpet.h"; sourceTree = ""; }; - 237FD35C2C0F187B00B5335C /* pi_app_logo_new_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_app_logo_new_bg.png; sourceTree = ""; }; - 238A90052BA9729200828123 /* PIUniversalBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIUniversalBannerView.h; sourceTree = ""; }; - 238A90062BA9729200828123 /* PIUniversalBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIUniversalBannerView.m; sourceTree = ""; }; - 238A90082BA9756600828123 /* PIUniversalBannerModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIUniversalBannerModel.h; sourceTree = ""; }; - 238A90092BA9756600828123 /* PIUniversalBannerModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIUniversalBannerModel.m; sourceTree = ""; }; - 238ED8382AE2891D0014EF9D /* PIRoomEnterRedPacketView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomEnterRedPacketView.h; sourceTree = ""; }; - 238ED8392AE2891D0014EF9D /* PIRoomEnterRedPacketView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomEnterRedPacketView.m; sourceTree = ""; }; - 239141C42AE129F700322CA9 /* PIInputScrollingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIInputScrollingView.h; sourceTree = ""; }; - 239141C52AE129F700322CA9 /* PIInputScrollingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIInputScrollingView.m; sourceTree = ""; }; - 239141C72AE1358F00322CA9 /* PIInputEntireServerScrollingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIInputEntireServerScrollingView.h; sourceTree = ""; }; - 239141C82AE1358F00322CA9 /* PIInputEntireServerScrollingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIInputEntireServerScrollingView.m; sourceTree = ""; }; - 239141CA2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIReceiveRedPacketSuccessView.h; sourceTree = ""; }; - 239141CB2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIReceiveRedPacketSuccessView.m; sourceTree = ""; }; - 23942E8F2A86424500D0ECC2 /* XPLoginAuthCodeVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginAuthCodeVC.h; sourceTree = ""; }; - 23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginAuthCodeVC.m; sourceTree = ""; }; 23959FE52BB15C930085A282 /* UploadFileModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UploadFileModel.h; sourceTree = ""; }; 23959FE62BB15C930085A282 /* UploadFileModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UploadFileModel.m; sourceTree = ""; }; - 2396FCE32B22BE5D0014021D /* pi_area_info.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = pi_area_info.json; sourceTree = ""; }; - 239BEED92AA1E058005CDA94 /* PIHoemCategoryTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHoemCategoryTitleView.h; sourceTree = ""; }; - 239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHoemCategoryTitleView.m; sourceTree = ""; }; - 239D0F942BFB3296002977CE /* MSRoomOnLineView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomOnLineView.h; sourceTree = ""; }; - 239D0F952BFB3296002977CE /* MSRoomOnLineView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomOnLineView.m; sourceTree = ""; }; - 239D0F972BFB43BC002977CE /* MSRoomOnLineAvatarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomOnLineAvatarView.h; sourceTree = ""; }; - 239D0F982BFB43BC002977CE /* MSRoomOnLineAvatarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomOnLineAvatarView.m; sourceTree = ""; }; - 239D0F9A2BFC9E6C002977CE /* ms_room_gift_svga_icon.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = ms_room_gift_svga_icon.svga; sourceTree = ""; }; - 239D0F9C2BFCB88C002977CE /* XPRoomBackContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomBackContainerView.m; sourceTree = ""; }; - 239D0F9D2BFCB88C002977CE /* XPRoomDatingWebAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomDatingWebAlertView.h; sourceTree = ""; }; - 239D0F9E2BFCB88C002977CE /* XPRoomFunctionContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomFunctionContainerView.h; sourceTree = ""; }; - 239D0F9F2BFCB88C002977CE /* XPRoomAnchorRankEnterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomAnchorRankEnterView.h; sourceTree = ""; }; - 239D0FA02BFCB88D002977CE /* XPRoomDatingVipUpMicView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomDatingVipUpMicView.h; sourceTree = ""; }; - 239D0FA12BFCB88D002977CE /* XPRoomDatingVipUpMicView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomDatingVipUpMicView.m; sourceTree = ""; }; - 239D0FA22BFCB88D002977CE /* XPRoomDatingWebAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomDatingWebAlertView.m; sourceTree = ""; }; - 239D0FA32BFCB88D002977CE /* XPRoomFunctionContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomFunctionContainerView.m; sourceTree = ""; }; - 239D0FA42BFCB88D002977CE /* XPRoomRankEntranceView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomRankEntranceView.m; sourceTree = ""; }; - 239D0FA52BFCB88D002977CE /* XPRoomAnchorRankEnterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnchorRankEnterView.m; sourceTree = ""; }; - 239D0FA62BFCB88D002977CE /* XPRoomRankEntranceView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomRankEntranceView.h; sourceTree = ""; }; - 239D0FA72BFCB88D002977CE /* XPRoomBackContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomBackContainerView.h; sourceTree = ""; }; - 239D0FB12BFD8C67002977CE /* MSRoomSetingBackdropCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomSetingBackdropCell.h; sourceTree = ""; }; - 239D0FB22BFD8C67002977CE /* MSRoomSetingBackdropCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomSetingBackdropCell.m; sourceTree = ""; }; - 239D0FC52C045F92002977CE /* MSRoomGameVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSRoomGameVC.h; sourceTree = ""; }; - 239D0FC62C045F92002977CE /* MSRoomGameVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameVC.m; sourceTree = ""; }; - 239D0FCA2C045FC9002977CE /* MSTabbarRoomGameVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSTabbarRoomGameVC.h; sourceTree = ""; }; - 239D0FCB2C045FC9002977CE /* MSTabbarRoomGameVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSTabbarRoomGameVC.m; sourceTree = ""; }; - 239D0FCD2C046048002977CE /* MSTabbarRoomGameHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSTabbarRoomGameHeadView.h; sourceTree = ""; }; - 239D0FCE2C046048002977CE /* MSTabbarRoomGameHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSTabbarRoomGameHeadView.m; sourceTree = ""; }; - 239D0FD02C046EAD002977CE /* MSTabbarRoomGameView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSTabbarRoomGameView.h; sourceTree = ""; }; - 239D0FD12C046EAD002977CE /* MSTabbarRoomGameView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSTabbarRoomGameView.m; sourceTree = ""; }; - 239D0FD32C0475E6002977CE /* MSTabbarBeginGameView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSTabbarBeginGameView.h; sourceTree = ""; }; - 239D0FD42C0475E6002977CE /* MSTabbarBeginGameView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSTabbarBeginGameView.m; sourceTree = ""; }; - 239D0FD62C047DD8002977CE /* MSTabbarRoomGameModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSTabbarRoomGameModel.h; sourceTree = ""; }; - 239D0FD72C047DD8002977CE /* MSTabbarRoomGameModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSTabbarRoomGameModel.m; sourceTree = ""; }; - 239D0FD92C047F24002977CE /* MSTabbarRoomGameCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSTabbarRoomGameCell.h; sourceTree = ""; }; - 239D0FDA2C047F24002977CE /* MSTabbarRoomGameCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSTabbarRoomGameCell.m; sourceTree = ""; }; - 239D0FDF2C04850A002977CE /* MSRoomGameHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameHeadView.h; sourceTree = ""; }; - 239D0FE02C04850A002977CE /* MSRoomGameHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameHeadView.m; sourceTree = ""; }; - 239D0FE22C048700002977CE /* MSRoomGameHeadAvatarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameHeadAvatarView.h; sourceTree = ""; }; - 239D0FE32C048700002977CE /* MSRoomGameHeadAvatarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameHeadAvatarView.m; sourceTree = ""; }; - 239D0FE52C049D61002977CE /* MSRoomGameMsgView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameMsgView.h; sourceTree = ""; }; - 239D0FE62C049D61002977CE /* MSRoomGameMsgView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameMsgView.m; sourceTree = ""; }; - 239D0FE82C04A9EE002977CE /* MSRoomGameSendMsgView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameSendMsgView.h; sourceTree = ""; }; - 239D0FE92C04A9EE002977CE /* MSRoomGameSendMsgView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameSendMsgView.m; sourceTree = ""; }; - 239D0FEB2C057362002977CE /* Api+MSRoomGameApi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+MSRoomGameApi.h"; sourceTree = ""; }; - 239D0FEC2C057362002977CE /* Api+MSRoomGameApi.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+MSRoomGameApi.m"; sourceTree = ""; }; - 239D0FEE2C057470002977CE /* MSRoomGamePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGamePresenter.h; sourceTree = ""; }; - 239D0FEF2C057470002977CE /* MSRoomGamePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGamePresenter.m; sourceTree = ""; }; - 239D0FF12C057D2E002977CE /* MSRoomGameProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameProtocol.h; sourceTree = ""; }; - 239D0FF22C05B9D2002977CE /* MSRoomGameView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameView.h; sourceTree = ""; }; - 239D0FF32C05B9D2002977CE /* MSRoomGameView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameView.m; sourceTree = ""; }; - 239D0FF52C05BD2A002977CE /* MSRoomGameVictoryView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameVictoryView.h; sourceTree = ""; }; - 239D0FF62C05BD2A002977CE /* MSRoomGameVictoryView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameVictoryView.m; sourceTree = ""; }; - 239D0FF82C05BE9B002977CE /* MSRoomGameVictoryCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameVictoryCell.h; sourceTree = ""; }; - 239D0FF92C05BE9B002977CE /* MSRoomGameVictoryCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameVictoryCell.m; sourceTree = ""; }; - 239D0FFB2C05D086002977CE /* MSRoomGameQuitGameView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameQuitGameView.h; sourceTree = ""; }; - 239D0FFC2C05D086002977CE /* MSRoomGameQuitGameView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameQuitGameView.m; sourceTree = ""; }; - 23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_lucky_gift.svga; sourceTree = ""; }; - 23A439722AA1CF7C002E6039 /* XPNewHomeHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeHeadView.h; sourceTree = ""; }; - 23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeHeadView.m; sourceTree = ""; }; - 23A7FB672BDDEDFA00411860 /* MSRoomGameWebVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameWebVC.h; sourceTree = ""; }; - 23A7FB682BDDEDFA00411860 /* MSRoomGameWebVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameWebVC.m; sourceTree = ""; }; - 23B2AEBF2A64E9C200543D17 /* LoginForgetEditView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginForgetEditView.h; sourceTree = ""; }; - 23B2AEC02A64E9C200543D17 /* LoginForgetEditView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginForgetEditView.m; sourceTree = ""; }; - 23B2AEC22A6516C200543D17 /* LoginForgetPasswordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginForgetPasswordViewController.m; sourceTree = ""; }; - 23B2AEC32A6516C200543D17 /* LoginForgetPasswordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginForgetPasswordViewController.h; sourceTree = ""; }; - 23B8D8D62B85F8B900CA472F /* PIHoemCategoryTitleCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHoemCategoryTitleCell.h; sourceTree = ""; }; - 23B8D8D72B85F8B900CA472F /* PIHoemCategoryTitleCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHoemCategoryTitleCell.m; sourceTree = ""; }; - 23B8D8D92B85FDDD00CA472F /* PIHomeCategoryTitleModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHomeCategoryTitleModel.h; sourceTree = ""; }; - 23B8D8DA2B85FDDD00CA472F /* PIHomeCategoryTitleModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHomeCategoryTitleModel.m; sourceTree = ""; }; - 23B8D8DC2B860B8800CA472F /* PIHoemCategoryCollectionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHoemCategoryCollectionView.h; sourceTree = ""; }; - 23B8D8DD2B860B8800CA472F /* PIHoemCategoryCollectionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHoemCategoryCollectionView.m; sourceTree = ""; }; - 23B8D8DF2B87715100CA472F /* PIGeneralPublicScreenModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIGeneralPublicScreenModel.h; sourceTree = ""; }; - 23B8D8E02B87715100CA472F /* PIGeneralPublicScreenModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIGeneralPublicScreenModel.m; sourceTree = ""; }; - 23BA16592A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIBaseAnimationViewModel.h; sourceTree = ""; }; - 23BA165A2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIBaseAnimationViewModel.m; sourceTree = ""; }; - 23C7C0B52A7CD7B000802205 /* XPNewMineGuildItemView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewMineGuildItemView.h; sourceTree = ""; }; - 23C7C0B62A7CD7B000802205 /* XPNewMineGuildItemView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewMineGuildItemView.m; sourceTree = ""; }; - 23C9DFC12B84807A00B51558 /* PIRoomActivityClickView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomActivityClickView.h; sourceTree = ""; }; - 23C9DFC22B84807A00B51558 /* PIRoomActivityClickView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomActivityClickView.m; sourceTree = ""; }; - 23C9DFC42B84903500B51558 /* PIRoomActivityChoosePlayView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomActivityChoosePlayView.h; sourceTree = ""; }; - 23C9DFC52B84903500B51558 /* PIRoomActivityChoosePlayView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomActivityChoosePlayView.m; sourceTree = ""; }; - 23C9DFC72B84917B00B51558 /* PIRoomActivityChoosePlayCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomActivityChoosePlayCell.h; sourceTree = ""; }; - 23C9DFC82B84917B00B51558 /* PIRoomActivityChoosePlayCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomActivityChoosePlayCell.m; sourceTree = ""; }; - 23C9DFCA2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIGuildAnchorIncomeSectionView.h; sourceTree = ""; }; - 23C9DFCB2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIGuildAnchorIncomeSectionView.m; sourceTree = ""; }; - 23C9DFCD2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIGuildSingleRoomIncomeCell.h; sourceTree = ""; }; - 23C9DFCE2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIGuildSingleRoomIncomeCell.m; sourceTree = ""; }; - 23CEFB6A2AFB803B00576D89 /* PISwitchingEnvironmentVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PISwitchingEnvironmentVC.h; sourceTree = ""; }; - 23CEFB6B2AFB803B00576D89 /* PISwitchingEnvironmentVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PISwitchingEnvironmentVC.m; sourceTree = ""; }; 23CEFC0B2AFB8FC100576D89 /* BSXWDateUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSXWDateUtil.h; sourceTree = ""; }; 23CEFC0C2AFB8FC100576D89 /* BSNSStringUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSNSStringUtil.m; sourceTree = ""; }; 23CEFC0D2AFB8FC100576D89 /* BSUIDemoUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSUIDemoUtil.m; sourceTree = ""; }; @@ -2295,149 +423,19 @@ 23CEFC472AFB8FC100576D89 /* BSkObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSkObject.m; sourceTree = ""; }; 23CEFC482AFB8FC100576D89 /* BSDrawLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSDrawLine.m; sourceTree = ""; }; 23CEFC492AFB8FC100576D89 /* BSkObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSkObject.h; sourceTree = ""; }; - 23CEFC662AFCCE7700576D89 /* PIGiftInfoSegmentedView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIGiftInfoSegmentedView.h; sourceTree = ""; }; - 23CEFC672AFCCE7700576D89 /* PIGiftInfoSegmentedView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIGiftInfoSegmentedView.m; sourceTree = ""; }; - 23D321D02ADD0EBC006B259C /* PIRoomPhotoAlbumItemPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumItemPresenter.h; sourceTree = ""; }; - 23D321D12ADD0EBC006B259C /* PIRoomPhotoAlbumItemPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumItemPresenter.m; sourceTree = ""; }; - 23D321D32ADD0F05006B259C /* Api+PhotoAlbum.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+PhotoAlbum.h"; sourceTree = ""; }; - 23D321D42ADD0F05006B259C /* Api+PhotoAlbum.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+PhotoAlbum.m"; sourceTree = ""; }; - 23D321D62ADD0F2C006B259C /* PIRoomPhotoAlbumItemProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumItemProtocol.h; sourceTree = ""; }; - 23D321D72ADD1B46006B259C /* PIRoomPhotoAlbumItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumItemModel.h; sourceTree = ""; }; - 23D321D82ADD1B46006B259C /* PIRoomPhotoAlbumItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumItemModel.m; sourceTree = ""; }; - 23D321DA2ADFBFF6006B259C /* PIInputRedPacketView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIInputRedPacketView.h; sourceTree = ""; }; - 23D321DB2ADFBFF6006B259C /* PIInputRedPacketView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIInputRedPacketView.m; sourceTree = ""; }; - 23D321DD2ADFCEB2006B259C /* PIRedPacketChooseTypeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRedPacketChooseTypeView.h; sourceTree = ""; }; - 23D321DE2ADFCEB2006B259C /* PIRedPacketChooseTypeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRedPacketChooseTypeView.m; sourceTree = ""; }; - 23D321E02ADFD0FB006B259C /* PIRedPacketChooseTypeCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRedPacketChooseTypeCell.h; sourceTree = ""; }; - 23D321E12ADFD0FB006B259C /* PIRedPacketChooseTypeCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRedPacketChooseTypeCell.m; sourceTree = ""; }; - 23D321E32ADFE900006B259C /* PIRoomSendRedPacketVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomSendRedPacketVC.h; sourceTree = ""; }; - 23D321E42ADFE900006B259C /* PIRoomSendRedPacketVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomSendRedPacketVC.m; sourceTree = ""; }; - 23D321E62ADFED0F006B259C /* PIRoomSendRedPacketItemVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomSendRedPacketItemVC.h; sourceTree = ""; }; - 23D321E72ADFED0F006B259C /* PIRoomSendRedPacketItemVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomSendRedPacketItemVC.m; sourceTree = ""; }; 23D8DEF12AC5633300644637 /* PIIAPRegulate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PIIAPRegulate.swift; sourceTree = ""; }; - 23E45C032AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionDiscoverNewTableViewCell.h; sourceTree = ""; }; - 23E45C042AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SessionDiscoverNewTableViewCell.m; sourceTree = ""; }; 23E56B3B2B03564B00C8DAC9 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; - 23E7FE9A2BB6CD42008F6800 /* XPNobleCenterWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterWindow.h; sourceTree = ""; }; - 23E7FE9B2BB6CD42008F6800 /* XPNobleCenterWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNobleCenterWindow.m; sourceTree = ""; }; - 23E9E9932A80C39E00B792F2 /* XPMineGuildPersonalBillStatisVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildPersonalBillStatisVC.h; sourceTree = ""; }; - 23E9E9942A80C39F00B792F2 /* XPMineGuildPersonalBillRecordVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildPersonalBillRecordVC.m; sourceTree = ""; }; - 23E9E9952A80C3A000B792F2 /* XPMineGuildPersonalBillRecordVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildPersonalBillRecordVC.h; sourceTree = ""; }; - 23E9E9962A80C3A100B792F2 /* XPMineGuildPersonalBillStatisVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildPersonalBillStatisVC.m; sourceTree = ""; }; - 23E9E9992A80C3FF00B792F2 /* XPMineGuildPersonalBillRecordHeadView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildPersonalBillRecordHeadView.m; sourceTree = ""; }; - 23E9E99A2A80C40000B792F2 /* XPMineGuildPersonalBillRecordHeadView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildPersonalBillRecordHeadView.h; sourceTree = ""; }; - 23E9E99C2A80C7AE00B792F2 /* XPMineGuildPersonalBillRecordItemView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildPersonalBillRecordItemView.m; sourceTree = ""; }; - 23E9E99D2A80C7AF00B792F2 /* XPMineGuildPersonalBillRecordItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildPersonalBillRecordItemView.h; sourceTree = ""; }; - 23E9E99F2A80C7DF00B792F2 /* XPMineGuildPersonalBillRecordModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildPersonalBillRecordModel.h; sourceTree = ""; }; - 23E9E9A02A80C7E000B792F2 /* XPMineGuildPersonalBillRecordModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildPersonalBillRecordModel.m; sourceTree = ""; }; - 23E9E9A22A80DEAF00B792F2 /* XPMineGuildPersonalBillRecordContentView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGuildPersonalBillRecordContentView.h; sourceTree = ""; }; - 23E9E9A32A80DEAF00B792F2 /* XPMineGuildPersonalBillRecordContentView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildPersonalBillRecordContentView.m; sourceTree = ""; }; - 23E9E9A52A80F1C300B792F2 /* XPNewMineHallIncomeVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewMineHallIncomeVC.h; sourceTree = ""; }; - 23E9E9A62A80F1C300B792F2 /* XPNewMineHallIncomeVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewMineHallIncomeVC.m; sourceTree = ""; }; - 23E9E9A82A80FDF100B792F2 /* XPNewMineHallIncomeCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewMineHallIncomeCell.h; sourceTree = ""; }; - 23E9E9A92A80FDF100B792F2 /* XPNewMineHallIncomeCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewMineHallIncomeCell.m; sourceTree = ""; }; - 23E9E9B62A82200500B792F2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; - 23E9EA692A83808000B792F2 /* ContentTreasureFairyModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentTreasureFairyModel.h; sourceTree = ""; }; - 23E9EA6A2A83808000B792F2 /* ContentTreasureFairyModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContentTreasureFairyModel.m; sourceTree = ""; }; 23E9EA802A84B6FC00B792F2 /* XPMineUserInfoTagModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoTagModel.m; sourceTree = ""; }; 23E9EA812A84B6FC00B792F2 /* XPSoundCardModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPSoundCardModel.h; sourceTree = ""; }; 23E9EA822A84B6FC00B792F2 /* XPMineUserInfoTagModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoTagModel.h; sourceTree = ""; }; 23E9EA832A84B6FD00B792F2 /* XPSoundCardModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPSoundCardModel.m; sourceTree = ""; }; - 23E9EA862A84B75900B792F2 /* XPMineUserInfoHeaderTagView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoHeaderTagView.m; sourceTree = ""; }; - 23E9EA872A84B75900B792F2 /* XPMineUserInfoHeaderTagView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoHeaderTagView.h; sourceTree = ""; }; - 23E9EA892A84B9BD00B792F2 /* XPMineUserInfoTagFlowLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoTagFlowLayout.h; sourceTree = ""; }; - 23E9EA8A2A84B9BD00B792F2 /* XPMineUserInfoTagFlowLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoTagFlowLayout.m; sourceTree = ""; }; - 23E9EA8C2A84BC8F00B792F2 /* XPMineUserInfoHeaderTagCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoHeaderTagCell.h; sourceTree = ""; }; - 23E9EA8D2A84BC9000B792F2 /* XPMineUserInfoHeaderTagCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoHeaderTagCell.m; sourceTree = ""; }; - 23E9EA8F2A84BD5B00B792F2 /* XPMineUserInfoIndividualTagView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoIndividualTagView.m; sourceTree = ""; }; - 23E9EA902A84BD5B00B792F2 /* XPMineUserInfoIndividualTagView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoIndividualTagView.h; sourceTree = ""; }; - 23E9EA922A84BE4800B792F2 /* XPGiftUserDataViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGiftUserDataViewController.m; sourceTree = ""; }; - 23E9EA932A84BE4800B792F2 /* XPGiftUserDataViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGiftUserDataViewController.h; sourceTree = ""; }; - 23E9EA982A84C39600B792F2 /* XPMineUserInfoRecordedSoundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoRecordedSoundView.h; sourceTree = ""; }; - 23E9EA992A84C39700B792F2 /* XPMineUserInfoRecordedSoundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoRecordedSoundView.m; sourceTree = ""; }; 23E9EA9C2A84C42B00B792F2 /* SGYProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SGYProgressView.h; sourceTree = ""; }; 23E9EA9D2A84C42B00B792F2 /* SGYProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SGYProgressView.m; sourceTree = ""; }; - 23E9EAA22A84C80300B792F2 /* pi_new_loading.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_new_loading.svga; sourceTree = ""; }; - 23E9EAA42A84C97C00B792F2 /* XPMineUserInfoTagVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoTagVC.h; sourceTree = ""; }; - 23E9EAA52A84C97C00B792F2 /* XPMineUserInfoTagVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoTagVC.m; sourceTree = ""; }; - 23E9EAA72A84C9B700B792F2 /* XPMineUserInfoTagItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoTagItemView.h; sourceTree = ""; }; - 23E9EAA82A84C9B700B792F2 /* XPMineUserInfoTagItemView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoTagItemView.m; sourceTree = ""; }; - 23E9EAA92A84C9B700B792F2 /* XPMineUserInfoTagView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoTagView.h; sourceTree = ""; }; - 23E9EAAA2A84C9B700B792F2 /* XPMineUserInfoTagView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoTagView.m; sourceTree = ""; }; - 23E9EAAB2A84C9B800B792F2 /* XPMineUserInfoTagHeadView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoTagHeadView.m; sourceTree = ""; }; - 23E9EAAC2A84C9B800B792F2 /* XPMineUserInfoTagHeadView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoTagHeadView.h; sourceTree = ""; }; - 23E9EAB02A84C9DD00B792F2 /* XPMineUserInfoTagViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoTagViewCell.h; sourceTree = ""; }; - 23E9EAB12A84C9DE00B792F2 /* XPMineUserInfoTagViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoTagViewCell.m; sourceTree = ""; }; - 23E9EAB32A84CB2600B792F2 /* XPMineUserInfoTagEmptyView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoTagEmptyView.m; sourceTree = ""; }; - 23E9EAB42A84CB2600B792F2 /* XPMineUserInfoTagEmptyView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoTagEmptyView.h; sourceTree = ""; }; - 23E9EAB92A84CCBD00B792F2 /* XPMineDataSkillDataCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineDataSkillDataCollectionViewCell.m; sourceTree = ""; }; - 23E9EABA2A84CCBE00B792F2 /* XPMineDataSkillDataCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineDataSkillDataCollectionViewCell.h; sourceTree = ""; }; - 23E9EB132A84D02400B792F2 /* XPMineUserInfoEditPickView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoEditPickView.h; sourceTree = ""; }; - 23E9EB142A84D02400B792F2 /* XPMineUserInfoEditPickView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoEditPickView.m; sourceTree = ""; }; - 23E9EB162A84D0E700B792F2 /* XPMineUserInfoEditMainTagView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoEditMainTagView.m; sourceTree = ""; }; - 23E9EB172A84D0E700B792F2 /* XPMineUserInfoEditMainTagView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoEditMainTagView.h; sourceTree = ""; }; - 23E9EB192A84D28900B792F2 /* XPMineUserInfoEditTagView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoEditTagView.h; sourceTree = ""; }; - 23E9EB1A2A84D28A00B792F2 /* XPMineUserInfoEditTagView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoEditTagView.m; sourceTree = ""; }; - 23E9EB1C2A84DA5F00B792F2 /* XPMineUserInfoNavView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoNavView.m; sourceTree = ""; }; - 23E9EB1D2A84DA5F00B792F2 /* XPMineUserInfoNavView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoNavView.h; sourceTree = ""; }; - 23E9EB222A84E98300B792F2 /* pi_new_mine_info_sound_play.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_new_mine_info_sound_play.svga; sourceTree = ""; }; - 23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_new_mine_info_online.svga; sourceTree = ""; }; - 23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_crazy_zoo.svga; sourceTree = ""; }; - 23EE97082BA2D39C00475D69 /* PIWebViewSavePhotoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIWebViewSavePhotoView.h; sourceTree = ""; }; - 23EE97092BA2D39C00475D69 /* PIWebViewSavePhotoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIWebViewSavePhotoView.m; sourceTree = ""; }; - 23F963682BB6919D00F440A6 /* PINobleRebateModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleRebateModel.h; sourceTree = ""; }; - 23F963692BB6919D00F440A6 /* PINobleRebateModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleRebateModel.m; sourceTree = ""; }; - 23FE47D32BB3C64600F09D23 /* PINobleCenterTitleCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleCenterTitleCell.h; sourceTree = ""; }; - 23FE47D42BB3C64600F09D23 /* PINobleCenterTitleCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleCenterTitleCell.m; sourceTree = ""; }; - 23FE47D62BB3CEAF00F09D23 /* PINobleCenterTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleCenterTitleView.h; sourceTree = ""; }; - 23FE47D72BB3CEAF00F09D23 /* PINobleCenterTitleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleCenterTitleView.m; sourceTree = ""; }; - 23FE47D92BB4171C00F09D23 /* PINobleCenterListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleCenterListView.h; sourceTree = ""; }; - 23FE47DA2BB4171C00F09D23 /* PINobleCenterListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleCenterListView.m; sourceTree = ""; }; - 23FE47DF2BB41CF200F09D23 /* PINobleCenterListReusableView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleCenterListReusableView.h; sourceTree = ""; }; - 23FE47E02BB41CF200F09D23 /* PINobleCenterListReusableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleCenterListReusableView.m; sourceTree = ""; }; - 23FE47E22BB41EBF00F09D23 /* PINobleCenterListCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleCenterListCell.h; sourceTree = ""; }; - 23FE47E32BB41EBF00F09D23 /* PINobleCenterListCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleCenterListCell.m; sourceTree = ""; }; - 23FE47E52BB4378700F09D23 /* PINobleCenterListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PINobleCenterListModel.h; sourceTree = ""; }; - 23FE47E62BB4378700F09D23 /* PINobleCenterListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINobleCenterListModel.m; sourceTree = ""; }; - 23FF255A2AB956D50064E904 /* pi_home_new_pk.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_home_new_pk.svga; sourceTree = ""; }; - 23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_game_fine_love.svga; sourceTree = ""; }; - 23FF25632ABC3B3B0064E904 /* XPHomeGameView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeGameView.h; sourceTree = ""; }; - 23FF25642ABC3B3B0064E904 /* XPHomeGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeGameView.m; sourceTree = ""; }; - 23FF25662ABC3BC00064E904 /* XPHomeGameCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeGameCell.h; sourceTree = ""; }; - 23FF25672ABC3BC00064E904 /* XPHomeGameCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeGameCell.m; sourceTree = ""; }; - 23FF256C2ABC48810064E904 /* XPSessionMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPSessionMainViewController.m; sourceTree = ""; }; - 23FF256D2ABC48810064E904 /* XPSessionMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPSessionMainViewController.h; sourceTree = ""; }; - 23FF256F2ABD456C0064E904 /* pi_home_new_play.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_home_new_play.svga; sourceTree = ""; }; - 23FF25742ABD66B90064E904 /* XPFreeGiftsObtainView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPFreeGiftsObtainView.m; sourceTree = ""; }; - 23FF25752ABD66B90064E904 /* XPFreeGiftsObtainView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPFreeGiftsObtainView.h; sourceTree = ""; }; - 23FF25772ABD67CD0064E904 /* XPFreeGiftModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPFreeGiftModel.m; sourceTree = ""; }; - 23FF25782ABD67CD0064E904 /* XPFreeGiftModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPFreeGiftModel.h; sourceTree = ""; }; - 23FF257A2ABD68020064E904 /* XPGiftFreeItemCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGiftFreeItemCell.h; sourceTree = ""; }; - 23FF257B2ABD68020064E904 /* XPGiftFreeItemCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGiftFreeItemCell.m; sourceTree = ""; }; - 23FF42612AA5861E0055733C /* XPNewHomePartyCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomePartyCollectionViewCell.h; sourceTree = ""; }; - 23FF42622AA5861E0055733C /* XPNewHomePartyCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomePartyCollectionViewCell.m; sourceTree = ""; }; - 23FF42662AA5CFBB0055733C /* home_sound_wave.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = home_sound_wave.gif; sourceTree = ""; }; - 23FF42682AA5DF050055733C /* XPNewHomePartyTagView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomePartyTagView.h; sourceTree = ""; }; - 23FF42692AA5DF050055733C /* XPNewHomePartyTagView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomePartyTagView.m; sourceTree = ""; }; - 23FF426B2AA5E4EE0055733C /* XPNewHomePartyAudioView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomePartyAudioView.h; sourceTree = ""; }; - 23FF426C2AA5E4EE0055733C /* XPNewHomePartyAudioView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomePartyAudioView.m; sourceTree = ""; }; - 23FF426E2AA6C7CF0055733C /* XPNewHomeItemCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeItemCell.h; sourceTree = ""; }; - 23FF426F2AA6C7CF0055733C /* XPNewHomeItemCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeItemCell.m; sourceTree = ""; }; - 23FF42712AA6CC480055733C /* PIHomeItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHomeItemModel.h; sourceTree = ""; }; - 23FF42722AA6CC480055733C /* PIHomeItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHomeItemModel.m; sourceTree = ""; }; - 23FF42742AA6E1480055733C /* XPHomeRecommendOtherRoomView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeRecommendOtherRoomView.h; sourceTree = ""; }; - 23FF42752AA6E1480055733C /* XPHomeRecommendOtherRoomView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeRecommendOtherRoomView.m; sourceTree = ""; }; - 23FF42772AA6E19C0055733C /* HomeMenuSourceModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeMenuSourceModel.h; sourceTree = ""; }; - 23FF42782AA6E19C0055733C /* HomeMenuSourceModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeMenuSourceModel.m; sourceTree = ""; }; - 23FF428C2AAB2D3A0055733C /* XPCandyTreeBuyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeBuyView.h; sourceTree = ""; }; - 23FF428D2AAB2D3A0055733C /* XPCandyTreeBuyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeBuyView.m; sourceTree = ""; }; 4C0642722E97BD6D00BAF413 /* EPMineHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EPMineHeaderView.h; sourceTree = ""; }; 4C0642732E97BD6D00BAF413 /* EPMineHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EPMineHeaderView.m; sourceTree = ""; }; 4C0642792E97BD6D00BAF413 /* EPMomentCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EPMomentCell.h; sourceTree = ""; }; 4C06427A2E97BD6D00BAF413 /* EPMomentCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EPMomentCell.m; sourceTree = ""; }; 4C0642842E97BD9500BAF413 /* APIConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIConfig.swift; sourceTree = ""; }; - 4C0642862E97BDA300BAF413 /* GlobalEventManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GlobalEventManager.h; sourceTree = ""; }; - 4C0642872E97BDA300BAF413 /* GlobalEventManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GlobalEventManager.m; sourceTree = ""; }; 4C0642892E97BDC900BAF413 /* YuMi-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YuMi-Bridging-Header.h"; sourceTree = ""; }; 4C06428A2E98DC5F00BAF413 /* EPTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPTabBarController.swift; sourceTree = ""; }; 4C06428F2E98DC8700BAF413 /* EPMomentViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EPMomentViewController.h; sourceTree = ""; }; @@ -2446,44 +444,8 @@ 4C0642982E98F77900BAF413 /* EPMomentListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EPMomentListView.m; sourceTree = ""; }; 4C06429A2E99120600BAF413 /* EPMomentPublishViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EPMomentPublishViewController.h; sourceTree = ""; }; 4C06429B2E99120600BAF413 /* EPMomentPublishViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EPMomentPublishViewController.m; sourceTree = ""; }; - 4C0A5B822E02675300955219 /* MedalsCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalsCollectionViewCell.h; sourceTree = ""; }; - 4C0A5B832E02675300955219 /* MedalsCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalsCollectionViewCell.m; sourceTree = ""; }; - 4C0A5B852E02BB1100955219 /* MedalsLevelIndicatorView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalsLevelIndicatorView.h; sourceTree = ""; }; - 4C0A5B862E02BB1100955219 /* MedalsLevelIndicatorView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalsLevelIndicatorView.m; sourceTree = ""; }; - 4C0A5B882E02BC3900955219 /* MedalsDetailView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalsDetailView.h; sourceTree = ""; }; - 4C0A5B892E02BC3900955219 /* MedalsDetailView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalsDetailView.m; sourceTree = ""; }; - 4C0A5B8E2E03EF4B00955219 /* MedalsWearingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalsWearingViewController.h; sourceTree = ""; }; - 4C0A5B8F2E03EF4B00955219 /* MedalsWearingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalsWearingViewController.m; sourceTree = ""; }; - 4C0B4A382E6579C700D67F73 /* XPPKAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPKAction.h; sourceTree = ""; }; - 4C0B4A392E6579C700D67F73 /* XPPKAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPKAction.m; sourceTree = ""; }; - 4C0B4A3C2E659A2C00D67F73 /* XPRoomTypeSettingAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTypeSettingAction.h; sourceTree = ""; }; - 4C0B4A3D2E659A2C00D67F73 /* XPRoomTypeSettingAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTypeSettingAction.m; sourceTree = ""; }; - 4C0B4A3F2E659DC100D67F73 /* XPRoomBackGroundSettingAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomBackGroundSettingAction.h; sourceTree = ""; }; - 4C0B4A402E659DC100D67F73 /* XPRoomBackGroundSettingAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomBackGroundSettingAction.m; sourceTree = ""; }; - 4C0B4A422E65A0D300D67F73 /* XPRoomCleanMessagesAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomCleanMessagesAction.h; sourceTree = ""; }; - 4C0B4A432E65A0D300D67F73 /* XPRoomCleanMessagesAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomCleanMessagesAction.m; sourceTree = ""; }; - 4C0B4A452E65A51600D67F73 /* XPRoomRedPacketAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRedPacketAction.h; sourceTree = ""; }; - 4C0B4A462E65A51600D67F73 /* XPRoomRedPacketAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomRedPacketAction.m; sourceTree = ""; }; - 4C0B4A482E65A5D500D67F73 /* XPRoomMusicPanelAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMusicPanelAction.h; sourceTree = ""; }; - 4C0B4A492E65A5D500D67F73 /* XPRoomMusicPanelAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMusicPanelAction.m; sourceTree = ""; }; - 4C0B4A4B2E65A63400D67F73 /* XPRoomRoomPhotoAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRoomPhotoAction.h; sourceTree = ""; }; - 4C0B4A4C2E65A63400D67F73 /* XPRoomRoomPhotoAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomRoomPhotoAction.m; sourceTree = ""; }; - 4C0B4A4E2E65A68800D67F73 /* XPRoomAppManagerAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomAppManagerAction.h; sourceTree = ""; }; - 4C0B4A4F2E65A68800D67F73 /* XPRoomAppManagerAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomAppManagerAction.m; sourceTree = ""; }; 4C1064862E0014CF007E1586 /* NSMutableArray+Safe.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+Safe.h"; sourceTree = ""; }; 4C1064872E0014CF007E1586 /* NSMutableArray+Safe.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSMutableArray+Safe.m"; sourceTree = ""; }; - 4C1119702DD7218300C18416 /* MyEventsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyEventsViewController.h; sourceTree = ""; }; - 4C1119712DD7218300C18416 /* MyEventsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyEventsViewController.m; sourceTree = ""; }; - 4C1392912D6D963600A6DFB5 /* SubRechargersViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SubRechargersViewController.h; sourceTree = ""; }; - 4C1392922D6D963600A6DFB5 /* SubRechargersViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SubRechargersViewController.m; sourceTree = ""; }; - 4C1392942D6DA22B00A6DFB5 /* RechargerTransferHistoryViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RechargerTransferHistoryViewController.h; sourceTree = ""; }; - 4C1392952D6DA22B00A6DFB5 /* RechargerTransferHistoryViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RechargerTransferHistoryViewController.m; sourceTree = ""; }; - 4C13929B2D70441500A6DFB5 /* giftgift.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = giftgift.mp4; sourceTree = ""; }; - 4C1392A02D71675900A6DFB5 /* coincoin.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = coincoin.mp4; sourceTree = ""; }; - 4C1892972CF84349004D4426 /* RoomCahtCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomCahtCell.h; sourceTree = ""; }; - 4C1892982CF84349004D4426 /* RoomCahtCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomCahtCell.m; sourceTree = ""; }; - 4C1A14192DCB4AB700B6D0CA /* ChatFaceVo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ChatFaceVo.h; sourceTree = ""; }; - 4C1A141A2DCB4AB700B6D0CA /* ChatFaceVo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ChatFaceVo.m; sourceTree = ""; }; 4C1E98BC2E9A3A540031AE79 /* EPMineAPIHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EPMineAPIHelper.h; sourceTree = ""; }; 4C1E98BD2E9A3A540031AE79 /* EPMineAPIHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EPMineAPIHelper.m; sourceTree = ""; }; 4C1E98C02E9A45160031AE79 /* EPImageUploader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPImageUploader.swift; sourceTree = ""; }; @@ -2491,80 +453,10 @@ 4C1E98C52E9A45BC0031AE79 /* EPMomentAPISwiftHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPMomentAPISwiftHelper.swift; sourceTree = ""; }; 4C1E98C72E9A4DFD0031AE79 /* EPQCloudConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPQCloudConfig.swift; sourceTree = ""; }; 4C1E98C82E9A4DFD0031AE79 /* EPSDKManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPSDKManager.swift; sourceTree = ""; }; - 4C3475C22DD1FE590099B984 /* CreateEventSelectRoomViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CreateEventSelectRoomViewController.h; sourceTree = ""; }; - 4C3475C32DD1FE590099B984 /* CreateEventSelectRoomViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CreateEventSelectRoomViewController.m; sourceTree = ""; }; - 4C3851972DD5F4D50089CFCC /* EventConfigModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EventConfigModel.h; sourceTree = ""; }; - 4C3851982DD5F4D50089CFCC /* EventConfigModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EventConfigModel.m; sourceTree = ""; }; - 4C38C2AB2D84064300CFA4A8 /* LoginInputItemView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginInputItemView.h; sourceTree = ""; }; - 4C38C2AC2D84064300CFA4A8 /* LoginInputItemView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginInputItemView.m; sourceTree = ""; }; - 4C38C2AE2D84070600CFA4A8 /* AccountBindingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AccountBindingViewController.h; sourceTree = ""; }; - 4C38C2AF2D84070600CFA4A8 /* AccountBindingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AccountBindingViewController.m; sourceTree = ""; }; - 4C4283F42E66C769006779B0 /* XPEffectPanelViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPEffectPanelViewController.h; sourceTree = ""; }; - 4C4283F52E66C769006779B0 /* XPEffectPanelViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPEffectPanelViewController.m; sourceTree = ""; }; - 4C44BD5B2D151B5C00F321FA /* RoomSideMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomSideMenu.h; sourceTree = ""; }; - 4C44BD5C2D151B5C00F321FA /* RoomSideMenu.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomSideMenu.m; sourceTree = ""; }; - 4C45C1A32E6825F300E73A44 /* XPTurboModeConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPTurboModeConstants.h; sourceTree = ""; }; - 4C45C1A42E6825F300E73A44 /* XPTurboModeConstants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPTurboModeConstants.m; sourceTree = ""; }; - 4C45C1A62E6837BF00E73A44 /* TurboModeStateManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TurboModeStateManager.h; sourceTree = ""; }; - 4C45C1A72E6837BF00E73A44 /* TurboModeStateManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TurboModeStateManager.m; sourceTree = ""; }; - 4C45C1AA2E68545E00E73A44 /* XPTurboModeTipsView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPTurboModeTipsView.h; sourceTree = ""; }; - 4C45C1AB2E68545E00E73A44 /* XPTurboModeTipsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPTurboModeTipsView.m; sourceTree = ""; }; - 4C45C1AD2E6855F600E73A44 /* XPTurboModeTipsManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPTurboModeTipsManager.h; sourceTree = ""; }; - 4C45C1AE2E6855F600E73A44 /* XPTurboModeTipsManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPTurboModeTipsManager.m; sourceTree = ""; }; 4C4707A32D53430300C8CD24 /* NSData+GZIP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+GZIP.h"; sourceTree = ""; }; 4C4707A42D53430300C8CD24 /* NSData+GZIP.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+GZIP.m"; sourceTree = ""; }; - 4C4DE6442E2513DA00122763 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/InfoPlist.strings"; sourceTree = ""; }; - 4C4DE6452E2513DB00122763 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = ""; }; - 4C51B09A2DA3B4C600D8DFB5 /* LudoGameViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LudoGameViewController.h; sourceTree = ""; }; - 4C51B09B2DA3B4C600D8DFB5 /* LudoGameViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LudoGameViewController.m; sourceTree = ""; }; - 4C51B09D2DA50FDA00D8DFB5 /* CPRelationshipChangeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPRelationshipChangeView.h; sourceTree = ""; }; - 4C51B09E2DA50FDA00D8DFB5 /* CPRelationshipChangeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPRelationshipChangeView.m; sourceTree = ""; }; - 4C520D832D894E8C0051C784 /* SocialShareManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SocialShareManager.h; sourceTree = ""; }; - 4C520D842D894E8C0051C784 /* SocialShareManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SocialShareManager.m; sourceTree = ""; }; - 4C520D862D89A78C0051C784 /* VisitorListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VisitorListViewController.h; sourceTree = ""; }; - 4C520D872D89A78C0051C784 /* VisitorListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VisitorListViewController.m; sourceTree = ""; }; - 4C5527BA2D1BDCDE00833FFD /* RoomLevelInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomLevelInfoModel.h; sourceTree = ""; }; - 4C5527BB2D1BDCDE00833FFD /* RoomLevelInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomLevelInfoModel.m; sourceTree = ""; }; - 4C5527BD2D1C099500833FFD /* RoomResourceManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomResourceManager.h; sourceTree = ""; }; - 4C5527BE2D1C099500833FFD /* RoomResourceManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomResourceManager.m; sourceTree = ""; }; - 4C5C37212D0C1C7900BA9AB8 /* RegionListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RegionListViewController.h; sourceTree = ""; }; - 4C5C37222D0C1C7900BA9AB8 /* RegionListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RegionListViewController.m; sourceTree = ""; }; 4C6C92BE2D1172D9000A4693 /* RegionListInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RegionListInfo.h; sourceTree = ""; }; 4C6C92BF2D1172D9000A4693 /* RegionListInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RegionListInfo.m; sourceTree = ""; }; - 4C6E1F732CEAEC3C0073D0A3 /* ShoppingMallTagView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShoppingMallTagView.h; sourceTree = ""; }; - 4C6E1F742CEAEC3C0073D0A3 /* ShoppingMallTagView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShoppingMallTagView.m; sourceTree = ""; }; - 4C6E1F7A2CEB25B10073D0A3 /* ShoppingMallItemPreview.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShoppingMallItemPreview.h; sourceTree = ""; }; - 4C6E1F7B2CEB25B10073D0A3 /* ShoppingMallItemPreview.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShoppingMallItemPreview.m; sourceTree = ""; }; - 4C6E31EA2D35010F00D8EEDD /* RoomAnimationView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomAnimationView.h; sourceTree = ""; }; - 4C6E31EB2D35010F00D8EEDD /* RoomAnimationView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomAnimationView.m; sourceTree = ""; }; - 4C6E31ED2D363CA800D8EEDD /* addMoveAnimationToView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = addMoveAnimationToView.m; sourceTree = ""; }; - 4C7153932E0942F700C9F940 /* MedalsCyclePagerCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalsCyclePagerCell.h; sourceTree = ""; }; - 4C7153942E0942F700C9F940 /* MedalsCyclePagerCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalsCyclePagerCell.m; sourceTree = ""; }; - 4C71C69D2D069D2B00ECCA24 /* GiftAnimationHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftAnimationHelper.h; sourceTree = ""; }; - 4C71C69E2D069D2B00ECCA24 /* GiftAnimationHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftAnimationHelper.m; sourceTree = ""; }; - 4C71C6A02D06DB3D00ECCA24 /* GiftAnimationManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftAnimationManager.h; sourceTree = ""; }; - 4C71C6A12D06DB3D00ECCA24 /* GiftAnimationManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftAnimationManager.m; sourceTree = ""; }; - 4C729E462E5318AA00E5171E /* GiftComboConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftComboConfig.h; sourceTree = ""; }; - 4C729E472E5318AA00E5171E /* GiftComboConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftComboConfig.m; sourceTree = ""; }; - 4C729E482E5318AA00E5171E /* GiftComboTransport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftComboTransport.h; sourceTree = ""; }; - 4C729E492E5318AA00E5171E /* GiftComboTransport.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftComboTransport.m; sourceTree = ""; }; - 4C729E4A2E5318AA00E5171E /* GiftComboUIAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftComboUIAdapter.h; sourceTree = ""; }; - 4C729E4B2E5318AA00E5171E /* GiftComboUIAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftComboUIAdapter.m; sourceTree = ""; }; - 4C75472C2E55837200C6E821 /* BannerScheduler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BannerScheduler.h; sourceTree = ""; }; - 4C75472D2E55837200C6E821 /* BannerScheduler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BannerScheduler.m; sourceTree = ""; }; - 4C75472F2E55A7ED00C6E821 /* TouchAreaCacheManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TouchAreaCacheManager.h; sourceTree = ""; }; - 4C7547302E55A7ED00C6E821 /* TouchAreaCacheManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TouchAreaCacheManager.m; sourceTree = ""; }; - 4C7547322E55AAB100C6E821 /* GestureOptimizer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GestureOptimizer.h; sourceTree = ""; }; - 4C7547332E55AAB100C6E821 /* GestureOptimizer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GestureOptimizer.m; sourceTree = ""; }; - 4C75CEF92D6318FF009147A5 /* RoomEnterModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomEnterModel.h; sourceTree = ""; }; - 4C75CEFA2D6318FF009147A5 /* RoomEnterModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomEnterModel.m; sourceTree = ""; }; - 4C75CEFC2D632CD5009147A5 /* CPEnterRoomTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPEnterRoomTableViewCell.h; sourceTree = ""; }; - 4C75CEFD2D632CD5009147A5 /* CPEnterRoomTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPEnterRoomTableViewCell.m; sourceTree = ""; }; - 4C75CEFF2D633C27009147A5 /* CP进场.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = "CP进场.svga"; sourceTree = ""; }; - 4C7989ED2D195277006AE07B /* RoomModeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomModeViewController.h; sourceTree = ""; }; - 4C7989EE2D195277006AE07B /* RoomModeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomModeViewController.m; sourceTree = ""; }; - 4C7989F12D1952DA006AE07B /* RoomModePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomModePresenter.h; sourceTree = ""; }; - 4C7989F22D1952DA006AE07B /* RoomModePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomModePresenter.m; sourceTree = ""; }; 4C7B8F612E9F6E1300A5E236 /* EPSignatureColorGuideView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EPSignatureColorGuideView.h; sourceTree = ""; }; 4C7B8F622E9F6E1300A5E236 /* EPSignatureColorGuideView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EPSignatureColorGuideView.m; sourceTree = ""; }; 4C7B90972E9F70FC00A5E236 /* ep_splash.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ep_splash.png; sourceTree = ""; }; @@ -2572,117 +464,12 @@ 4C7B909A2E9F822900A5E236 /* EPEmotionColorWheelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EPEmotionColorWheelView.m; sourceTree = ""; }; 4C7B91D62EA096DE00A5E236 /* EPEmotionInfoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EPEmotionInfoView.h; sourceTree = ""; }; 4C7B91D72EA096DE00A5E236 /* EPEmotionInfoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EPEmotionInfoView.m; sourceTree = ""; }; - 4C7F2A652E0BE0AB002F5058 /* FirstRechargeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirstRechargeModel.h; sourceTree = ""; }; - 4C7F2A662E0BE0AB002F5058 /* FirstRechargeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FirstRechargeModel.m; sourceTree = ""; }; - 4C7F2A692E0BE7E7002F5058 /* FirstRechargeManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirstRechargeManager.h; sourceTree = ""; }; - 4C7F2A6A2E0BE7E7002F5058 /* FirstRechargeManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FirstRechargeManager.m; sourceTree = ""; }; - 4C815A152CFEB758002A46A6 /* SuperBlockViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SuperBlockViewController.h; sourceTree = ""; }; - 4C815A162CFEB758002A46A6 /* SuperBlockViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SuperBlockViewController.m; sourceTree = ""; }; - 4C816A7B2E826C7300EA6A45 /* XPMessageDataSourceManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMessageDataSourceManager.h; sourceTree = ""; }; - 4C816A7C2E826C7300EA6A45 /* XPMessageDataSourceManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMessageDataSourceManager.m; sourceTree = ""; }; - 4C816A7D2E826C7300EA6A45 /* XPMessageItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMessageItem.h; sourceTree = ""; }; - 4C816A7E2E826C7300EA6A45 /* XPMessageItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMessageItem.m; sourceTree = ""; }; - 4C84A9C02E5ED593002C10FC /* GameBannerGestureManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GameBannerGestureManager.h; sourceTree = ""; }; - 4C84A9C12E5ED593002C10FC /* GameBannerGestureManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GameBannerGestureManager.m; sourceTree = ""; }; - 4C84A9C92E602B1A002C10FC /* BuglyManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BuglyManager.h; sourceTree = ""; }; - 4C84A9CA2E602B1A002C10FC /* BuglyManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BuglyManager.m; sourceTree = ""; }; - 4C85DB7F2DCDD83E00FD9839 /* CreateEventPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CreateEventPresenter.h; sourceTree = ""; }; - 4C85DB802DCDD83E00FD9839 /* CreateEventPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CreateEventPresenter.m; sourceTree = ""; }; - 4C85DB822DCDDD6800FD9839 /* CreateEventViewControllerV2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CreateEventViewControllerV2.h; sourceTree = ""; }; - 4C85DB832DCDDD6800FD9839 /* CreateEventViewControllerV2.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CreateEventViewControllerV2.m; sourceTree = ""; }; - 4C864A002D55F4F600191AE0 /* LuckyPackagePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LuckyPackagePresenter.h; sourceTree = ""; }; - 4C864A012D55F4F600191AE0 /* LuckyPackagePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LuckyPackagePresenter.m; sourceTree = ""; }; - 4C864A032D561E1D00191AE0 /* LuckyPackageLogicManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LuckyPackageLogicManager.h; sourceTree = ""; }; - 4C864A042D561E1D00191AE0 /* LuckyPackageLogicManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LuckyPackageLogicManager.m; sourceTree = ""; }; - 4C886BE62E013C55006F0BA7 /* MedalsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalsViewController.h; sourceTree = ""; }; - 4C886BE72E013C55006F0BA7 /* MedalsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalsViewController.m; sourceTree = ""; }; - 4C886BE92E014AE5006F0BA7 /* MedalsPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalsPresenter.h; sourceTree = ""; }; - 4C886BEA2E014AE5006F0BA7 /* MedalsPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalsPresenter.m; sourceTree = ""; }; 4C886BEC2E014B6C006F0BA7 /* Api+Medals.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Medals.h"; sourceTree = ""; }; 4C886BED2E014B6C006F0BA7 /* Api+Medals.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Medals.m"; sourceTree = ""; }; 4C886BF02E015D61006F0BA7 /* MedalsModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalsModel.h; sourceTree = ""; }; 4C886BF12E015D61006F0BA7 /* MedalsModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalsModel.m; sourceTree = ""; }; - 4C9828112E6EB50000FC6345 /* MicCpInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicCpInfoModel.h; sourceTree = ""; }; - 4C9828122E6EB50000FC6345 /* MicCpInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicCpInfoModel.m; sourceTree = ""; }; - 4CA532B22D5AEE9400B8F59F /* Api+LuckyPackage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+LuckyPackage.h"; sourceTree = ""; }; - 4CA532B32D5AEE9400B8F59F /* Api+LuckyPackage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+LuckyPackage.m"; sourceTree = ""; }; - 4CA532B52D5B333200B8F59F /* RoomLuckyPackageInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomLuckyPackageInfoModel.h; sourceTree = ""; }; - 4CA532B62D5B333200B8F59F /* RoomLuckyPackageInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomLuckyPackageInfoModel.m; sourceTree = ""; }; - 4CA532B82D5C8EBE00B8F59F /* LuckyPackageBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LuckyPackageBannerView.h; sourceTree = ""; }; - 4CA532B92D5C8EBE00B8F59F /* LuckyPackageBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LuckyPackageBannerView.m; sourceTree = ""; }; - 4CA532BB2D5CA49A00B8F59F /* OpenLuckyPackageEntranceView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenLuckyPackageEntranceView.h; sourceTree = ""; }; - 4CA532BC2D5CA49A00B8F59F /* OpenLuckyPackageEntranceView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OpenLuckyPackageEntranceView.m; sourceTree = ""; }; - 4CA532BE2D5CA4D300B8F59F /* LuckyPackageStatusView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LuckyPackageStatusView.h; sourceTree = ""; }; - 4CA532BF2D5CA4D300B8F59F /* LuckyPackageStatusView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LuckyPackageStatusView.m; sourceTree = ""; }; - 4CA532C12D5F37DC00B8F59F /* LuckyPackageMessageTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LuckyPackageMessageTableViewCell.h; sourceTree = ""; }; - 4CA532C22D5F37DC00B8F59F /* LuckyPackageMessageTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LuckyPackageMessageTableViewCell.m; sourceTree = ""; }; - 4CA5A3332D93D4AB00CE41D6 /* 大.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = "大.svga"; sourceTree = ""; }; 4CA7410C2E72B8FC00DB6853 /* YMLanguageConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YMLanguageConfig.h; sourceTree = ""; }; 4CA7410D2E72B8FC00DB6853 /* YMLanguageConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YMLanguageConfig.m; sourceTree = ""; }; - 4CA7410F2E72B9E600DB6853 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = ""; }; - 4CA741102E72B9E600DB6853 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = ""; }; - 4CA741112E72BA3700DB6853 /* uz-UZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "uz-UZ"; path = "uz-UZ.lproj/InfoPlist.strings"; sourceTree = ""; }; - 4CA741122E72BA3800DB6853 /* uz-UZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "uz-UZ"; path = "uz-UZ.lproj/Localizable.strings"; sourceTree = ""; }; - 4CA741132E72BA5300DB6853 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = ""; }; - 4CA741142E72BA5600DB6853 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; - 4CACCCE32D9A695000CCB135 /* brove_gift.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = brove_gift.svga; sourceTree = ""; }; - 4CAE69C02E69922B00A9FC35 /* mic_cp_lv1.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = mic_cp_lv1.svga; sourceTree = ""; }; - 4CAE69C12E69922B00A9FC35 /* mic_cp_lv2.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = mic_cp_lv2.svga; sourceTree = ""; }; - 4CAE69C22E69922B00A9FC35 /* mic_cp_lv3.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = mic_cp_lv3.svga; sourceTree = ""; }; - 4CAE69C32E69922B00A9FC35 /* mic_cp_lv4.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = mic_cp_lv4.svga; sourceTree = ""; }; - 4CAE69C42E69922B00A9FC35 /* mic_cp_lv5.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = mic_cp_lv5.svga; sourceTree = ""; }; - 4CAE69CA2E69A2DB00A9FC35 /* MicMidpointRectManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicMidpointRectManager.h; sourceTree = ""; }; - 4CAE69CB2E69A2DB00A9FC35 /* MicMidpointRectManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicMidpointRectManager.m; sourceTree = ""; }; - 4CAFEFF42DD2F21B00CD81DF /* CreateEventPickerContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CreateEventPickerContainerView.h; sourceTree = ""; }; - 4CAFEFF52DD2F21B00CD81DF /* CreateEventPickerContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CreateEventPickerContainerView.m; sourceTree = ""; }; - 4CAFF0082DD342A400CD81DF /* MessagePublicEventModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessagePublicEventModel.h; sourceTree = ""; }; - 4CAFF0092DD342A400CD81DF /* MessagePublicEventModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessagePublicEventModel.m; sourceTree = ""; }; - 4CAFF00B2DD343B200CD81DF /* PublicEventTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PublicEventTableViewCell.h; sourceTree = ""; }; - 4CAFF00C2DD343B200CD81DF /* PublicEventTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PublicEventTableViewCell.m; sourceTree = ""; }; - 4CB41CEA2E053D6300528517 /* MedalsRankViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalsRankViewController.h; sourceTree = ""; }; - 4CB41CEB2E053D6300528517 /* MedalsRankViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalsRankViewController.m; sourceTree = ""; }; - 4CB753D02D30F10900B13DF5 /* LuckyPackageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LuckyPackageViewController.h; sourceTree = ""; }; - 4CB753D12D30F10900B13DF5 /* LuckyPackageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LuckyPackageViewController.m; sourceTree = ""; }; - 4CBBB44A2DA66334001B1C6D /* MessageCPNotifyModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageCPNotifyModel.h; sourceTree = ""; }; - 4CBBB44B2DA66334001B1C6D /* MessageCPNotifyModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageCPNotifyModel.m; sourceTree = ""; }; - 4CBDC4222DC0B078005A75B9 /* EventCenterViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EventCenterViewController.h; sourceTree = ""; }; - 4CBDC4232DC0B078005A75B9 /* EventCenterViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EventCenterViewController.m; sourceTree = ""; }; - 4CBDC4252DC0B947005A75B9 /* EventCenterPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EventCenterPresenter.h; sourceTree = ""; }; - 4CBDC4262DC0B947005A75B9 /* EventCenterPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EventCenterPresenter.m; sourceTree = ""; }; - 4CBDC4282DC0BB95005A75B9 /* EventCenterOfficialCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EventCenterOfficialCell.h; sourceTree = ""; }; - 4CBDC4292DC0BB95005A75B9 /* EventCenterOfficialCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EventCenterOfficialCell.m; sourceTree = ""; }; - 4CBDC42B2DC0BBB7005A75B9 /* EventCenterEventCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EventCenterEventCell.h; sourceTree = ""; }; - 4CBDC42C2DC0BBB7005A75B9 /* EventCenterEventCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EventCenterEventCell.m; sourceTree = ""; }; - 4CC312222D7987A200F57A07 /* ShareHelder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareHelder.h; sourceTree = ""; }; - 4CC312232D7987A200F57A07 /* ShareHelder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareHelder.m; sourceTree = ""; }; - 4CC312252D79A10100F57A07 /* ShareProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareProvider.h; sourceTree = ""; }; - 4CC312262D79A10100F57A07 /* ShareProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareProvider.m; sourceTree = ""; }; - 4CC619582CEC7770008C1EE8 /* MyDressingDataPresent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyDressingDataPresent.h; sourceTree = ""; }; - 4CC619592CEC7770008C1EE8 /* MyDressingDataPresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyDressingDataPresent.m; sourceTree = ""; }; - 4CC6195B2CEC996E008C1EE8 /* MyDressingDataModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyDressingDataModel.h; sourceTree = ""; }; - 4CC6195C2CEC996E008C1EE8 /* MyDressingDataModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyDressingDataModel.m; sourceTree = ""; }; - 4CC77BBB2E66A33C0067DA96 /* XPRoomEffectAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomEffectAction.h; sourceTree = ""; }; - 4CC77BBC2E66A33C0067DA96 /* XPRoomEffectAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomEffectAction.m; sourceTree = ""; }; - 4CCA0C662DDED89F00E30513 /* Custom9MicLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Custom9MicLayout.h; sourceTree = ""; }; - 4CCA0C672DDED89F00E30513 /* Custom9MicLayout.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Custom9MicLayout.m; sourceTree = ""; }; - 4CCA0C682DDED89F00E30513 /* Custom19MicLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Custom19MicLayout.h; sourceTree = ""; }; - 4CCA0C692DDED89F00E30513 /* Custom19MicLayout.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Custom19MicLayout.m; sourceTree = ""; }; - 4CCA0C6A2DDED89F00E30513 /* UserRoomMicPositionCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserRoomMicPositionCell.h; sourceTree = ""; }; - 4CCA0C6B2DDED89F00E30513 /* UserRoomMicPositionCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserRoomMicPositionCell.m; sourceTree = ""; }; - 4CCA0C6C2DDED89F00E30513 /* UserRoomMicPositionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserRoomMicPositionView.h; sourceTree = ""; }; - 4CCA0C6D2DDED89F00E30513 /* UserRoomMicPositionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserRoomMicPositionView.m; sourceTree = ""; }; - 4CCB809D2DD5DFDF00C756D3 /* EventRoomModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EventRoomModel.h; sourceTree = ""; }; - 4CCB809E2DD5DFDF00C756D3 /* EventRoomModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EventRoomModel.m; sourceTree = ""; }; - 4CCFD9FE2DD59038009BD2FD /* EventCenterEmptyCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EventCenterEmptyCell.h; sourceTree = ""; }; - 4CCFD9FF2DD59038009BD2FD /* EventCenterEmptyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EventCenterEmptyCell.m; sourceTree = ""; }; - 4CCFDA012DD59211009BD2FD /* Api+EventCenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+EventCenter.h"; sourceTree = ""; }; - 4CCFDA022DD59211009BD2FD /* Api+EventCenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+EventCenter.m"; sourceTree = ""; }; - 4CCFDA042DD5C127009BD2FD /* EventItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EventItemModel.h; sourceTree = ""; }; - 4CCFDA052DD5C127009BD2FD /* EventItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EventItemModel.m; sourceTree = ""; }; - 4CD15D8F2D7E902800D9279F /* LoginViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = ""; }; - 4CD15D902D7E902800D9279F /* LoginViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = ""; }; - 4CD15D932D7FE9E400D9279F /* LoginTypesViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginTypesViewController.h; sourceTree = ""; }; - 4CD15D942D7FE9E400D9279F /* LoginTypesViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginTypesViewController.m; sourceTree = ""; }; 4CD19C7D2E9CB31C0069DAA0 /* EPLoginTypesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPLoginTypesViewController.swift; sourceTree = ""; }; 4CD19C7E2E9CB31C0069DAA0 /* EPLoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPLoginViewController.swift; sourceTree = ""; }; 4CD19C802E9CB31C0069DAA0 /* EPLoginState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPLoginState.swift; sourceTree = ""; }; @@ -2697,202 +484,6 @@ 4CD19C972E9CDF980069DAA0 /* XPAdImageTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAdImageTool.m; sourceTree = ""; }; 4CD19C982E9CDF980069DAA0 /* XPAdvertiseView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAdvertiseView.h; sourceTree = ""; }; 4CD19C992E9CDF980069DAA0 /* XPAdvertiseView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAdvertiseView.m; sourceTree = ""; }; - 4CD19C9B2E9CDF980069DAA0 /* emoj_s_normal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoj_s_normal@2x.png"; sourceTree = ""; }; - 4CD19C9C2E9CDF980069DAA0 /* emoj_s_pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoj_s_pressed@2x.png"; sourceTree = ""; }; - 4CD19C9D2E9CDF980069DAA0 /* emoji.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = emoji.xml; sourceTree = ""; }; - 4CD19C9E2E9CDF980069DAA0 /* emoji_00@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_00@2x.png"; sourceTree = ""; }; - 4CD19C9F2E9CDF980069DAA0 /* emoji_01@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_01@2x.png"; sourceTree = ""; }; - 4CD19CA02E9CDF980069DAA0 /* emoji_02@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_02@2x.png"; sourceTree = ""; }; - 4CD19CA12E9CDF980069DAA0 /* emoji_03@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_03@2x.png"; sourceTree = ""; }; - 4CD19CA22E9CDF980069DAA0 /* emoji_04@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_04@2x.png"; sourceTree = ""; }; - 4CD19CA32E9CDF980069DAA0 /* emoji_05@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_05@2x.png"; sourceTree = ""; }; - 4CD19CA42E9CDF980069DAA0 /* emoji_06@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_06@2x.png"; sourceTree = ""; }; - 4CD19CA52E9CDF980069DAA0 /* emoji_07@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_07@2x.png"; sourceTree = ""; }; - 4CD19CA62E9CDF980069DAA0 /* emoji_08@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_08@2x.png"; sourceTree = ""; }; - 4CD19CA72E9CDF980069DAA0 /* emoji_09@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_09@2x.png"; sourceTree = ""; }; - 4CD19CA82E9CDF980069DAA0 /* emoji_10@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_10@2x.png"; sourceTree = ""; }; - 4CD19CA92E9CDF980069DAA0 /* emoji_11@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_11@2x.png"; sourceTree = ""; }; - 4CD19CAA2E9CDF980069DAA0 /* emoji_12@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_12@2x.png"; sourceTree = ""; }; - 4CD19CAB2E9CDF980069DAA0 /* emoji_13@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_13@2x.png"; sourceTree = ""; }; - 4CD19CAC2E9CDF980069DAA0 /* emoji_14@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_14@2x.png"; sourceTree = ""; }; - 4CD19CAD2E9CDF980069DAA0 /* emoji_15@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_15@2x.png"; sourceTree = ""; }; - 4CD19CAE2E9CDF980069DAA0 /* emoji_16@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_16@2x.png"; sourceTree = ""; }; - 4CD19CAF2E9CDF980069DAA0 /* emoji_17@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_17@2x.png"; sourceTree = ""; }; - 4CD19CB02E9CDF980069DAA0 /* emoji_18@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_18@2x.png"; sourceTree = ""; }; - 4CD19CB12E9CDF980069DAA0 /* emoji_19@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_19@2x.png"; sourceTree = ""; }; - 4CD19CB22E9CDF980069DAA0 /* emoji_20@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_20@2x.png"; sourceTree = ""; }; - 4CD19CB32E9CDF980069DAA0 /* emoji_21@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_21@2x.png"; sourceTree = ""; }; - 4CD19CB42E9CDF980069DAA0 /* emoji_22@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_22@2x.png"; sourceTree = ""; }; - 4CD19CB52E9CDF980069DAA0 /* emoji_23@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_23@2x.png"; sourceTree = ""; }; - 4CD19CB62E9CDF980069DAA0 /* emoji_24@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_24@2x.png"; sourceTree = ""; }; - 4CD19CB72E9CDF980069DAA0 /* emoji_25@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_25@2x.png"; sourceTree = ""; }; - 4CD19CB82E9CDF980069DAA0 /* emoji_26@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_26@2x.png"; sourceTree = ""; }; - 4CD19CB92E9CDF980069DAA0 /* emoji_27@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_27@2x.png"; sourceTree = ""; }; - 4CD19CBA2E9CDF980069DAA0 /* emoji_28@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_28@2x.png"; sourceTree = ""; }; - 4CD19CBB2E9CDF980069DAA0 /* emoji_29@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_29@2x.png"; sourceTree = ""; }; - 4CD19CBC2E9CDF980069DAA0 /* emoji_30@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_30@2x.png"; sourceTree = ""; }; - 4CD19CBD2E9CDF980069DAA0 /* emoji_31@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_31@2x.png"; sourceTree = ""; }; - 4CD19CBE2E9CDF980069DAA0 /* emoji_32@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_32@2x.png"; sourceTree = ""; }; - 4CD19CBF2E9CDF980069DAA0 /* emoji_33@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_33@2x.png"; sourceTree = ""; }; - 4CD19CC02E9CDF980069DAA0 /* emoji_34@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_34@2x.png"; sourceTree = ""; }; - 4CD19CC12E9CDF980069DAA0 /* emoji_35@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_35@2x.png"; sourceTree = ""; }; - 4CD19CC22E9CDF980069DAA0 /* emoji_36@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_36@2x.png"; sourceTree = ""; }; - 4CD19CC32E9CDF980069DAA0 /* emoji_37@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_37@2x.png"; sourceTree = ""; }; - 4CD19CC42E9CDF980069DAA0 /* emoji_38@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_38@2x.png"; sourceTree = ""; }; - 4CD19CC52E9CDF980069DAA0 /* emoji_39@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_39@2x.png"; sourceTree = ""; }; - 4CD19CC62E9CDF980069DAA0 /* emoji_40@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_40@2x.png"; sourceTree = ""; }; - 4CD19CC72E9CDF980069DAA0 /* emoji_41@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_41@2x.png"; sourceTree = ""; }; - 4CD19CC82E9CDF980069DAA0 /* emoji_42@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_42@2x.png"; sourceTree = ""; }; - 4CD19CC92E9CDF980069DAA0 /* emoji_43@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_43@2x.png"; sourceTree = ""; }; - 4CD19CCA2E9CDF980069DAA0 /* emoji_44@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_44@2x.png"; sourceTree = ""; }; - 4CD19CCB2E9CDF980069DAA0 /* emoji_45@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_45@2x.png"; sourceTree = ""; }; - 4CD19CCC2E9CDF980069DAA0 /* emoji_46@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_46@2x.png"; sourceTree = ""; }; - 4CD19CCD2E9CDF980069DAA0 /* emoji_47@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_47@2x.png"; sourceTree = ""; }; - 4CD19CCE2E9CDF980069DAA0 /* emoji_48@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_48@2x.png"; sourceTree = ""; }; - 4CD19CCF2E9CDF980069DAA0 /* emoji_49@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_49@2x.png"; sourceTree = ""; }; - 4CD19CD02E9CDF980069DAA0 /* emoji_50@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_50@2x.png"; sourceTree = ""; }; - 4CD19CD12E9CDF980069DAA0 /* emoji_51@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_51@2x.png"; sourceTree = ""; }; - 4CD19CD22E9CDF980069DAA0 /* emoji_52@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_52@2x.png"; sourceTree = ""; }; - 4CD19CD32E9CDF980069DAA0 /* emoji_53@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_53@2x.png"; sourceTree = ""; }; - 4CD19CD42E9CDF980069DAA0 /* emoji_54@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_54@2x.png"; sourceTree = ""; }; - 4CD19CD52E9CDF980069DAA0 /* emoji_55@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_55@2x.png"; sourceTree = ""; }; - 4CD19CD62E9CDF980069DAA0 /* emoji_56@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_56@2x.png"; sourceTree = ""; }; - 4CD19CD72E9CDF980069DAA0 /* emoji_57@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_57@2x.png"; sourceTree = ""; }; - 4CD19CD82E9CDF980069DAA0 /* emoji_58@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_58@2x.png"; sourceTree = ""; }; - 4CD19CD92E9CDF980069DAA0 /* emoji_59@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_59@2x.png"; sourceTree = ""; }; - 4CD19CDA2E9CDF980069DAA0 /* emoji_60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_60@2x.png"; sourceTree = ""; }; - 4CD19CDB2E9CDF980069DAA0 /* emoji_61@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_61@2x.png"; sourceTree = ""; }; - 4CD19CDC2E9CDF980069DAA0 /* emoji_62@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_62@2x.png"; sourceTree = ""; }; - 4CD19CDD2E9CDF980069DAA0 /* emoji_63@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_63@2x.png"; sourceTree = ""; }; - 4CD19CDE2E9CDF980069DAA0 /* emoji_64@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_64@2x.png"; sourceTree = ""; }; - 4CD19CDF2E9CDF980069DAA0 /* emoji_65@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_65@2x.png"; sourceTree = ""; }; - 4CD19CE02E9CDF980069DAA0 /* emoji_66@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_66@2x.png"; sourceTree = ""; }; - 4CD19CE12E9CDF980069DAA0 /* emoji_67@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_67@2x.png"; sourceTree = ""; }; - 4CD19CE22E9CDF980069DAA0 /* emoji_68@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_68@2x.png"; sourceTree = ""; }; - 4CD19CE32E9CDF980069DAA0 /* emoji_69@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_69@2x.png"; sourceTree = ""; }; - 4CD19CE42E9CDF980069DAA0 /* emoji_70@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_70@2x.png"; sourceTree = ""; }; - 4CD19CE52E9CDF980069DAA0 /* emoji_71@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_71@2x.png"; sourceTree = ""; }; - 4CD19CE62E9CDF980069DAA0 /* emoji_72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_72@2x.png"; sourceTree = ""; }; - 4CD19CE72E9CDF980069DAA0 /* emoji_73@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_73@2x.png"; sourceTree = ""; }; - 4CD19CE82E9CDF980069DAA0 /* emoji_74@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_74@2x.png"; sourceTree = ""; }; - 4CD19CE92E9CDF980069DAA0 /* emoji_75@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_75@2x.png"; sourceTree = ""; }; - 4CD19CEA2E9CDF980069DAA0 /* emoji_76@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_76@2x.png"; sourceTree = ""; }; - 4CD19CEB2E9CDF980069DAA0 /* emoji_77@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_77@2x.png"; sourceTree = ""; }; - 4CD19CEC2E9CDF980069DAA0 /* emoji_78@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_78@2x.png"; sourceTree = ""; }; - 4CD19CED2E9CDF980069DAA0 /* emoji_79@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_79@2x.png"; sourceTree = ""; }; - 4CD19CEE2E9CDF980069DAA0 /* emoji_80@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_80@2x.png"; sourceTree = ""; }; - 4CD19CEF2E9CDF980069DAA0 /* emoji_81@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_81@2x.png"; sourceTree = ""; }; - 4CD19CF02E9CDF980069DAA0 /* emoji_82@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_82@2x.png"; sourceTree = ""; }; - 4CD19CF12E9CDF980069DAA0 /* emoji_83@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_83@2x.png"; sourceTree = ""; }; - 4CD19CF22E9CDF980069DAA0 /* emoji_84@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_84@2x.png"; sourceTree = ""; }; - 4CD19CF32E9CDF980069DAA0 /* emoji_85@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_85@2x.png"; sourceTree = ""; }; - 4CD19CF42E9CDF980069DAA0 /* emoji_86@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_86@2x.png"; sourceTree = ""; }; - 4CD19CF52E9CDF980069DAA0 /* emoji_87@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_87@2x.png"; sourceTree = ""; }; - 4CD19CF62E9CDF980069DAA0 /* emoji_88@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_88@2x.png"; sourceTree = ""; }; - 4CD19CF72E9CDF980069DAA0 /* emoji_89@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_89@2x.png"; sourceTree = ""; }; - 4CD19CF82E9CDF980069DAA0 /* emoji_90@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_90@2x.png"; sourceTree = ""; }; - 4CD19CF92E9CDF980069DAA0 /* emoji_91@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_91@2x.png"; sourceTree = ""; }; - 4CD19CFA2E9CDF980069DAA0 /* emoji_92@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_92@2x.png"; sourceTree = ""; }; - 4CD19CFB2E9CDF980069DAA0 /* emoji_93@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_93@2x.png"; sourceTree = ""; }; - 4CD19CFC2E9CDF980069DAA0 /* emoji_94@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_94@2x.png"; sourceTree = ""; }; - 4CD19CFD2E9CDF980069DAA0 /* emoji_95@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_95@2x.png"; sourceTree = ""; }; - 4CD19CFE2E9CDF980069DAA0 /* emoji_96@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_96@2x.png"; sourceTree = ""; }; - 4CD19CFF2E9CDF980069DAA0 /* emoji_97@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_97@2x.png"; sourceTree = ""; }; - 4CD19D002E9CDF980069DAA0 /* emoji_98@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_98@2x.png"; sourceTree = ""; }; - 4CD19D012E9CDF980069DAA0 /* emoji_99@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_99@2x.png"; sourceTree = ""; }; - 4CD19D022E9CDF980069DAA0 /* emoji_100@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_100@2x.png"; sourceTree = ""; }; - 4CD19D032E9CDF980069DAA0 /* emoji_101@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_101@2x.png"; sourceTree = ""; }; - 4CD19D042E9CDF980069DAA0 /* emoji_102@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_102@2x.png"; sourceTree = ""; }; - 4CD19D052E9CDF980069DAA0 /* emoji_103@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_103@2x.png"; sourceTree = ""; }; - 4CD19D062E9CDF980069DAA0 /* emoji_104@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_104@2x.png"; sourceTree = ""; }; - 4CD19D072E9CDF980069DAA0 /* emoji_105@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_105@2x.png"; sourceTree = ""; }; - 4CD19D082E9CDF980069DAA0 /* emoji_106@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_106@2x.png"; sourceTree = ""; }; - 4CD19D092E9CDF980069DAA0 /* emoji_107@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_107@2x.png"; sourceTree = ""; }; - 4CD19D0A2E9CDF980069DAA0 /* emoji_108@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_108@2x.png"; sourceTree = ""; }; - 4CD19D0B2E9CDF980069DAA0 /* emoji_109@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_109@2x.png"; sourceTree = ""; }; - 4CD19D0C2E9CDF980069DAA0 /* emoji_110@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_110@2x.png"; sourceTree = ""; }; - 4CD19D0D2E9CDF980069DAA0 /* emoji_111@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_111@2x.png"; sourceTree = ""; }; - 4CD19D0E2E9CDF980069DAA0 /* emoji_112@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_112@2x.png"; sourceTree = ""; }; - 4CD19D0F2E9CDF980069DAA0 /* emoji_113@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_113@2x.png"; sourceTree = ""; }; - 4CD19D102E9CDF980069DAA0 /* emoji_114@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_114@2x.png"; sourceTree = ""; }; - 4CD19D112E9CDF980069DAA0 /* emoji_115@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_115@2x.png"; sourceTree = ""; }; - 4CD19D122E9CDF980069DAA0 /* emoji_116@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_116@2x.png"; sourceTree = ""; }; - 4CD19D132E9CDF980069DAA0 /* emoji_117@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_117@2x.png"; sourceTree = ""; }; - 4CD19D142E9CDF980069DAA0 /* emoji_118@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_118@2x.png"; sourceTree = ""; }; - 4CD19D152E9CDF980069DAA0 /* emoji_119@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_119@2x.png"; sourceTree = ""; }; - 4CD19D162E9CDF980069DAA0 /* emoji_120@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_120@2x.png"; sourceTree = ""; }; - 4CD19D172E9CDF980069DAA0 /* emoji_121@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_121@2x.png"; sourceTree = ""; }; - 4CD19D182E9CDF980069DAA0 /* emoji_122@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_122@2x.png"; sourceTree = ""; }; - 4CD19D192E9CDF980069DAA0 /* emoji_123@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_123@2x.png"; sourceTree = ""; }; - 4CD19D1A2E9CDF980069DAA0 /* emoji_124@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_124@2x.png"; sourceTree = ""; }; - 4CD19D1B2E9CDF980069DAA0 /* emoji_125@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_125@2x.png"; sourceTree = ""; }; - 4CD19D1C2E9CDF980069DAA0 /* emoji_126@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_126@2x.png"; sourceTree = ""; }; - 4CD19D1D2E9CDF980069DAA0 /* emoji_127@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_127@2x.png"; sourceTree = ""; }; - 4CD19D1E2E9CDF980069DAA0 /* emoji_128@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_128@2x.png"; sourceTree = ""; }; - 4CD19D1F2E9CDF980069DAA0 /* emoji_129@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_129@2x.png"; sourceTree = ""; }; - 4CD19D202E9CDF980069DAA0 /* emoji_130@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_130@2x.png"; sourceTree = ""; }; - 4CD19D212E9CDF980069DAA0 /* emoji_131@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_131@2x.png"; sourceTree = ""; }; - 4CD19D222E9CDF980069DAA0 /* emoji_132@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_132@2x.png"; sourceTree = ""; }; - 4CD19D232E9CDF980069DAA0 /* emoji_133@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_133@2x.png"; sourceTree = ""; }; - 4CD19D242E9CDF980069DAA0 /* emoji_134@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_134@2x.png"; sourceTree = ""; }; - 4CD19D252E9CDF980069DAA0 /* emoji_135@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_135@2x.png"; sourceTree = ""; }; - 4CD19D262E9CDF980069DAA0 /* emoji_136@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_136@2x.png"; sourceTree = ""; }; - 4CD19D272E9CDF980069DAA0 /* emoji_137@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_137@2x.png"; sourceTree = ""; }; - 4CD19D282E9CDF980069DAA0 /* emoji_138@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_138@2x.png"; sourceTree = ""; }; - 4CD19D292E9CDF980069DAA0 /* emoji_139@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_139@2x.png"; sourceTree = ""; }; - 4CD19D2A2E9CDF980069DAA0 /* emoji_140@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_140@2x.png"; sourceTree = ""; }; - 4CD19D2B2E9CDF980069DAA0 /* emoji_141@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_141@2x.png"; sourceTree = ""; }; - 4CD19D2C2E9CDF980069DAA0 /* emoji_142@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_142@2x.png"; sourceTree = ""; }; - 4CD19D2D2E9CDF980069DAA0 /* emoji_143@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_143@2x.png"; sourceTree = ""; }; - 4CD19D2E2E9CDF980069DAA0 /* emoji_144@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_144@2x.png"; sourceTree = ""; }; - 4CD19D2F2E9CDF980069DAA0 /* emoji_145@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_145@2x.png"; sourceTree = ""; }; - 4CD19D302E9CDF980069DAA0 /* emoji_146@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_146@2x.png"; sourceTree = ""; }; - 4CD19D312E9CDF980069DAA0 /* emoji_147@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_147@2x.png"; sourceTree = ""; }; - 4CD19D322E9CDF980069DAA0 /* emoji_148@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_148@2x.png"; sourceTree = ""; }; - 4CD19D332E9CDF980069DAA0 /* emoji_149@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_149@2x.png"; sourceTree = ""; }; - 4CD19D342E9CDF980069DAA0 /* emoji_150@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_150@2x.png"; sourceTree = ""; }; - 4CD19D352E9CDF980069DAA0 /* emoji_151@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_151@2x.png"; sourceTree = ""; }; - 4CD19D362E9CDF980069DAA0 /* emoji_152@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_152@2x.png"; sourceTree = ""; }; - 4CD19D372E9CDF980069DAA0 /* emoji_160@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_160@2x.png"; sourceTree = ""; }; - 4CD19D382E9CDF980069DAA0 /* emoji_161@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_161@2x.png"; sourceTree = ""; }; - 4CD19D392E9CDF980069DAA0 /* emoji_162@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_162@2x.png"; sourceTree = ""; }; - 4CD19D3A2E9CDF980069DAA0 /* emoji_163@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_163@2x.png"; sourceTree = ""; }; - 4CD19D3B2E9CDF980069DAA0 /* emoji_164@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_164@2x.png"; sourceTree = ""; }; - 4CD19D3C2E9CDF980069DAA0 /* emoji_165@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_165@2x.png"; sourceTree = ""; }; - 4CD19D3D2E9CDF980069DAA0 /* emoji_166@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_166@2x.png"; sourceTree = ""; }; - 4CD19D3E2E9CDF980069DAA0 /* emoji_200@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_200@2x.png"; sourceTree = ""; }; - 4CD19D3F2E9CDF980069DAA0 /* emoji_del_normal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_del_normal@2x.png"; sourceTree = ""; }; - 4CD19D402E9CDF980069DAA0 /* emoji_del_pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emoji_del_pressed@2x.png"; sourceTree = ""; }; - 4CD19D422E9CDF980069DAA0 /* QEEmotionImageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QEEmotionImageView.h; sourceTree = ""; }; - 4CD19D432E9CDF980069DAA0 /* QEEmotionImageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QEEmotionImageView.m; sourceTree = ""; }; - 4CD19D442E9CDF980069DAA0 /* QEmotion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QEmotion.h; sourceTree = ""; }; - 4CD19D452E9CDF980069DAA0 /* QEmotion.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QEmotion.m; sourceTree = ""; }; - 4CD19D462E9CDF980069DAA0 /* QEmotionAttachment.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QEmotionAttachment.h; sourceTree = ""; }; - 4CD19D472E9CDF980069DAA0 /* QEmotionAttachment.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QEmotionAttachment.m; sourceTree = ""; }; - 4CD19D482E9CDF980069DAA0 /* QEmotionBoardView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QEmotionBoardView.h; sourceTree = ""; }; - 4CD19D492E9CDF980069DAA0 /* QEmotionBoardView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QEmotionBoardView.m; sourceTree = ""; }; - 4CD19D4A2E9CDF980069DAA0 /* QEmotionHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QEmotionHelper.h; sourceTree = ""; }; - 4CD19D4B2E9CDF980069DAA0 /* QEmotionHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QEmotionHelper.m; sourceTree = ""; }; - 4CD19D4C2E9CDF980069DAA0 /* QExtendBoardView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QExtendBoardView.h; sourceTree = ""; }; - 4CD19D4D2E9CDF980069DAA0 /* QExtendBoardView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QExtendBoardView.m; sourceTree = ""; }; - 4CD19D4E2E9CDF980069DAA0 /* QInputBarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QInputBarView.h; sourceTree = ""; }; - 4CD19D4F2E9CDF980069DAA0 /* QInputBarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QInputBarView.m; sourceTree = ""; }; - 4CD19D502E9CDF980069DAA0 /* QInputBarViewConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QInputBarViewConfiguration.h; sourceTree = ""; }; - 4CD19D512E9CDF980069DAA0 /* QInputBarViewConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QInputBarViewConfiguration.m; sourceTree = ""; }; - 4CD19D522E9CDF980069DAA0 /* QInputPhototCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QInputPhototCell.h; sourceTree = ""; }; - 4CD19D532E9CDF980069DAA0 /* QInputPhototCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QInputPhototCell.m; sourceTree = ""; }; - 4CD19D542E9CDF980069DAA0 /* QinputPhotoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QinputPhotoView.h; sourceTree = ""; }; - 4CD19D552E9CDF980069DAA0 /* QinputPhotoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QinputPhotoView.m; sourceTree = ""; }; - 4CD19D562E9CDF980069DAA0 /* QKeyboardBaseManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QKeyboardBaseManager.h; sourceTree = ""; }; - 4CD19D572E9CDF980069DAA0 /* QKeyboardBaseManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QKeyboardBaseManager.m; sourceTree = ""; }; - 4CD19D582E9CDF980069DAA0 /* QKeyboardManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QKeyboardManager.h; sourceTree = ""; }; - 4CD19D592E9CDF980069DAA0 /* QKeyboardManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QKeyboardManager.m; sourceTree = ""; }; - 4CD19D5A2E9CDF980069DAA0 /* QPhotoImageModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QPhotoImageModel.h; sourceTree = ""; }; - 4CD19D5B2E9CDF980069DAA0 /* QPhotoImageModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QPhotoImageModel.m; sourceTree = ""; }; - 4CD19D5C2E9CDF980069DAA0 /* UITextView+QEmotion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UITextView+QEmotion.h"; sourceTree = ""; }; - 4CD19D5D2E9CDF980069DAA0 /* UITextView+QEmotion.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UITextView+QEmotion.m"; sourceTree = ""; }; - 4CD19D5F2E9CDF980069DAA0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 4CD19D602E9CDF980069DAA0 /* emoji.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = emoji.plist; sourceTree = ""; }; 4CD19D622E9CDF980069DAA0 /* MSBaseRTLFlowLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSBaseRTLFlowLayout.h; sourceTree = ""; }; 4CD19D632E9CDF980069DAA0 /* MSBaseRTLFlowLayout.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSBaseRTLFlowLayout.m; sourceTree = ""; }; 4CD19D642E9CDF980069DAA0 /* MSBaseTextField.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSBaseTextField.h; sourceTree = ""; }; @@ -2913,16 +504,6 @@ 4CD19D732E9CDF980069DAA0 /* UITextView+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UITextView+MSRTL.m"; sourceTree = ""; }; 4CD19D742E9CDF980069DAA0 /* YYLabel+MSRTL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YYLabel+MSRTL.h"; sourceTree = ""; }; 4CD19D752E9CDF980069DAA0 /* YYLabel+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "YYLabel+MSRTL.m"; sourceTree = ""; }; - 4CD19D772E9CDF980069DAA0 /* XPShareInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPShareInfoModel.h; sourceTree = ""; }; - 4CD19D782E9CDF980069DAA0 /* XPShareInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPShareInfoModel.m; sourceTree = ""; }; - 4CD19D792E9CDF980069DAA0 /* XPShareItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPShareItem.h; sourceTree = ""; }; - 4CD19D7A2E9CDF980069DAA0 /* XPShareItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPShareItem.m; sourceTree = ""; }; - 4CD19D7C2E9CDF980069DAA0 /* XPShareItemCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPShareItemCell.h; sourceTree = ""; }; - 4CD19D7D2E9CDF980069DAA0 /* XPShareItemCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPShareItemCell.m; sourceTree = ""; }; - 4CD19D7F2E9CDF980069DAA0 /* XPShareView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPShareView.h; sourceTree = ""; }; - 4CD19D802E9CDF980069DAA0 /* XPShareView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPShareView.m; sourceTree = ""; }; - 4CD19D822E9CDF980069DAA0 /* XPSVGAPlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSVGAPlayer.h; sourceTree = ""; }; - 4CD19D832E9CDF980069DAA0 /* XPSVGAPlayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSVGAPlayer.m; sourceTree = ""; }; 4CD19D852E9CDF980069DAA0 /* XPSwitch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSwitch.h; sourceTree = ""; }; 4CD19D862E9CDF980069DAA0 /* XPSwitch.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSwitch.m; sourceTree = ""; }; 4CD19D882E9CDF980069DAA0 /* TTActionSheetConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TTActionSheetConfig.h; sourceTree = ""; }; @@ -2968,8 +549,6 @@ 4CD19DBC2E9CDF980069DAA0 /* DJDKMIMOMColor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DJDKMIMOMColor.m; sourceTree = ""; }; 4CD19DBD2E9CDF980069DAA0 /* EmptyDataView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EmptyDataView.h; sourceTree = ""; }; 4CD19DBE2E9CDF980069DAA0 /* EmptyDataView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EmptyDataView.m; sourceTree = ""; }; - 4CD19DBF2E9CDF980069DAA0 /* MoliAvatar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MoliAvatar.h; sourceTree = ""; }; - 4CD19DC02E9CDF980069DAA0 /* MoliAvatar.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MoliAvatar.m; sourceTree = ""; }; 4CD19DC12E9CDF980069DAA0 /* MoliMoneyLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MoliMoneyLabel.h; sourceTree = ""; }; 4CD19DC22E9CDF980069DAA0 /* MoliMoneyLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MoliMoneyLabel.m; sourceTree = ""; }; 4CD19DC32E9CDF980069DAA0 /* SexAgeLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SexAgeLabel.h; sourceTree = ""; }; @@ -2982,657 +561,86 @@ 4CD19EAD2E9CDFC30069DAA0 /* EPLoginInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPLoginInputView.swift; sourceTree = ""; }; 4CD19EB02E9D12600069DAA0 /* EPEditSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPEditSettingViewController.swift; sourceTree = ""; }; 4CD19EB22E9D141A0069DAA0 /* EPMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EPMineViewController.h; sourceTree = ""; }; - 4CD19EB62E9D15000069DAA0 /* EPAboutUsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPAboutUsViewController.swift; sourceTree = ""; }; 4CD19EB32E9D141A0069DAA0 /* EPMineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EPMineViewController.m; sourceTree = ""; }; - 4CD401452E7183A8003F5009 /* XPPartyRoomItemCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPartyRoomItemCollectionViewCell.h; sourceTree = ""; }; - 4CD401462E7183A8003F5009 /* XPPartyRoomItemCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPartyRoomItemCollectionViewCell.m; sourceTree = ""; }; - 4CD401482E718E36003F5009 /* XPBlankRoomModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPBlankRoomModel.h; sourceTree = ""; }; - 4CD401492E718E36003F5009 /* XPBlankRoomModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPBlankRoomModel.m; sourceTree = ""; }; - 4CD47BB32E61514900BCDA46 /* StageViewManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StageViewManager.h; sourceTree = ""; }; - 4CD47BB42E61514900BCDA46 /* StageViewManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StageViewManager.m; sourceTree = ""; }; - 4CD47BB62E619F0B00BCDA46 /* XPTurboModeAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPTurboModeAction.h; sourceTree = ""; }; - 4CD47BB82E619F0B00BCDA46 /* XPRoomMoreMenuActionFactory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMoreMenuActionFactory.h; sourceTree = ""; }; - 4CD47BBA2E619F1700BCDA46 /* XPRoomMoreMenuAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMoreMenuAction.h; sourceTree = ""; }; - 4CD47BBB2E619F1700BCDA46 /* XPRoomMoreMenuAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMoreMenuAction.m; sourceTree = ""; }; - 4CD47BBC2E619F1700BCDA46 /* XPRoomMoreMenuActionContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMoreMenuActionContext.h; sourceTree = ""; }; - 4CD47BBD2E619F1700BCDA46 /* XPRoomMoreMenuActionContext.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMoreMenuActionContext.m; sourceTree = ""; }; - 4CD47BC32E61A4E000BCDA46 /* XPTurboModeAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPTurboModeAction.m; sourceTree = ""; }; - 4CD47BC52E61A4FA00BCDA46 /* XPRoomMoreMenuActionFactory.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMoreMenuActionFactory.m; sourceTree = ""; }; - 4CD47BC72E61A78D00BCDA46 /* XPRoomSettingAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSettingAction.h; sourceTree = ""; }; - 4CD47BC82E61A78D00BCDA46 /* XPRoomSettingAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSettingAction.m; sourceTree = ""; }; - 4CD47BCA2E61ADE400BCDA46 /* XPSocialAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSocialAction.h; sourceTree = ""; }; - 4CD47BCB2E61ADE400BCDA46 /* XPSocialAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSocialAction.m; sourceTree = ""; }; - 4CD6FF642D673A5C00262AB7 /* AgentMessageModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AgentMessageModel.h; sourceTree = ""; }; - 4CD6FF652D673A5C00262AB7 /* AgentMessageModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AgentMessageModel.m; sourceTree = ""; }; - 4CD6FF672D673F7F00262AB7 /* AgentMessageTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AgentMessageTableViewCell.h; sourceTree = ""; }; - 4CD6FF682D673F7F00262AB7 /* AgentMessageTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AgentMessageTableViewCell.m; sourceTree = ""; }; + 4CD19EB62E9D15000069DAA0 /* EPAboutUsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EPAboutUsViewController.swift; sourceTree = ""; }; 4CDF7F3D2E9E580E00113F54 /* EPEmotionColorStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EPEmotionColorStorage.h; sourceTree = ""; }; 4CDF7F3E2E9E580E00113F54 /* EPEmotionColorStorage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EPEmotionColorStorage.m; sourceTree = ""; }; 4CDF7F402E9E581900113F54 /* EPEmotionColorPicker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EPEmotionColorPicker.h; sourceTree = ""; }; 4CDF7F412E9E581900113F54 /* EPEmotionColorPicker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EPEmotionColorPicker.m; sourceTree = ""; }; 4CE3A9442D22754C003F0796 /* RechargeUserModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RechargeUserModel.h; sourceTree = ""; }; 4CE3A9452D22754C003F0796 /* RechargeUserModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RechargeUserModel.m; sourceTree = ""; }; - 4CE746C12D9290430094E496 /* RoomBoomManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomBoomManager.h; sourceTree = ""; }; - 4CE746C22D9290430094E496 /* RoomBoomManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomBoomManager.m; sourceTree = ""; }; - 4CE746C42D9297C30094E496 /* BravoGiftTipModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BravoGiftTipModel.h; sourceTree = ""; }; - 4CE746C52D9297C30094E496 /* BravoGiftTipModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BravoGiftTipModel.m; sourceTree = ""; }; - 4CE746C72D929D500094E496 /* BaseRoomBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseRoomBannerView.h; sourceTree = ""; }; - 4CE746C82D929D500094E496 /* BaseRoomBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BaseRoomBannerView.m; sourceTree = ""; }; - 4CE746D02D92A2660094E496 /* BravoGiftBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BravoGiftBannerView.h; sourceTree = ""; }; - 4CE746D12D92A2660094E496 /* BravoGiftBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BravoGiftBannerView.m; sourceTree = ""; }; - 4CE746D32D92C1080094E496 /* BravoGiftWinningFlagView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BravoGiftWinningFlagView.h; sourceTree = ""; }; - 4CE746D42D92C1080094E496 /* BravoGiftWinningFlagView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BravoGiftWinningFlagView.m; sourceTree = ""; }; - 4CEB9EA52D09643E00443480 /* UserRoomCardViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserRoomCardViewController.h; sourceTree = ""; }; - 4CEB9EA62D09643E00443480 /* UserRoomCardViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserRoomCardViewController.m; sourceTree = ""; }; - 4CEB9EAE2D0AF4FE00443480 /* TwentyMicStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TwentyMicStageView.h; sourceTree = ""; }; - 4CEB9EAF2D0AF4FE00443480 /* TwentyMicStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TwentyMicStageView.m; sourceTree = ""; }; - 4CEB9EB12D0AFCE200443480 /* NineteenMicStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NineteenMicStageView.h; sourceTree = ""; }; - 4CEB9EB22D0AFCE200443480 /* NineteenMicStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NineteenMicStageView.m; sourceTree = ""; }; - 4CF3CE292E0403500071101F /* MedalsWearingControlCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalsWearingControlCollectionViewCell.h; sourceTree = ""; }; - 4CF3CE2A2E0403500071101F /* MedalsWearingControlCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalsWearingControlCollectionViewCell.m; sourceTree = ""; }; - 4CF3CE2C2E040EEC0071101F /* MedalsWearingListCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalsWearingListCollectionViewCell.h; sourceTree = ""; }; - 4CF3CE2D2E040EEC0071101F /* MedalsWearingListCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalsWearingListCollectionViewCell.m; sourceTree = ""; }; + 4CF462CD2EA10E1B005E96C0 /* XPWebViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPWebViewController.h; sourceTree = ""; }; + 4CF462CE2EA10E1B005E96C0 /* XPWebViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPWebViewController.m; sourceTree = ""; }; + 4CF462CF2EA10E1B005E96C0 /* XPWebViewNavView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPWebViewNavView.h; sourceTree = ""; }; + 4CF462D02EA10E1B005E96C0 /* XPWebViewNavView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPWebViewNavView.m; sourceTree = ""; }; 4CF67BA32DF9568C00EE5A28 /* BaseModelVo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseModelVo.h; sourceTree = ""; }; 4CF67BA42DF9568C00EE5A28 /* BaseModelVo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BaseModelVo.m; sourceTree = ""; }; - 4CFBE0C82DAD085700A923AF /* BravoGiftTabInfomationModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BravoGiftTabInfomationModel.h; sourceTree = ""; }; - 4CFBE0C92DAD085700A923AF /* BravoGiftTabInfomationModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BravoGiftTabInfomationModel.m; sourceTree = ""; }; - 4CFBE0CB2DAD0FC400A923AF /* PIGiftBravoGiftBroadcastView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIGiftBravoGiftBroadcastView.h; sourceTree = ""; }; - 4CFBE0CC2DAD0FC400A923AF /* PIGiftBravoGiftBroadcastView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIGiftBravoGiftBroadcastView.m; sourceTree = ""; }; - 4CFE7F3F2E45ECEC00F77776 /* PublicRoomManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PublicRoomManager.h; sourceTree = ""; }; - 4CFE7F402E45ECEC00F77776 /* PublicRoomManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PublicRoomManager.m; sourceTree = ""; }; - 4CFFEFCB2D3A4E410035D016 /* AppOfficalManagerActionsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppOfficalManagerActionsViewController.h; sourceTree = ""; }; - 4CFFEFCC2D3A4E410035D016 /* AppOfficalManagerActionsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppOfficalManagerActionsViewController.m; sourceTree = ""; }; - 4CFFEFCE2D3A5E130035D016 /* Api+SuperAdmin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+SuperAdmin.h"; sourceTree = ""; }; - 4CFFEFCF2D3A5E130035D016 /* Api+SuperAdmin.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+SuperAdmin.m"; sourceTree = ""; }; - 540EC1CE2C89925F00F3BF0D /* GiftComboView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftComboView.h; sourceTree = ""; }; - 540EC1CF2C89925F00F3BF0D /* GiftComboView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftComboView.m; sourceTree = ""; }; - 540EC1D12C89998500F3BF0D /* GiftComboManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftComboManager.h; sourceTree = ""; }; - 540EC1D22C89998500F3BF0D /* GiftComboManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftComboManager.m; sourceTree = ""; }; - 5412E0F22C4E460300FDD668 /* XPMineCenterAgencyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineCenterAgencyView.h; sourceTree = ""; }; - 5412E0F32C4E460300FDD668 /* XPMineCenterAgencyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineCenterAgencyView.m; sourceTree = ""; }; - 5412E0FB2C52512100FDD668 /* RoomBottomEntranceModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomBottomEntranceModel.h; sourceTree = ""; }; - 5412E0FC2C52512100FDD668 /* RoomBottomEntranceModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomBottomEntranceModel.m; sourceTree = ""; }; - 541DD9532C1EDEFB00B616C4 /* XPHomePagingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomePagingViewController.h; sourceTree = ""; }; - 541DD9542C1EDEFB00B616C4 /* XPHomePagingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomePagingViewController.m; sourceTree = ""; }; - 54283CE32CE48A69009729B5 /* ShoppingMallViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShoppingMallViewController.h; sourceTree = ""; }; - 54283CE42CE48A69009729B5 /* ShoppingMallViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShoppingMallViewController.m; sourceTree = ""; }; - 54283CE62CE48ABB009729B5 /* MyDressingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyDressingViewController.h; sourceTree = ""; }; - 54283CE72CE48ABB009729B5 /* MyDressingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyDressingViewController.m; sourceTree = ""; }; - 54283CE92CE48B71009729B5 /* ShoppingMallCategoryListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShoppingMallCategoryListView.h; sourceTree = ""; }; - 54283CEA2CE48B71009729B5 /* ShoppingMallCategoryListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShoppingMallCategoryListView.m; sourceTree = ""; }; - 54283CEC2CE48B97009729B5 /* ShoppingMallDataPresent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShoppingMallDataPresent.h; sourceTree = ""; }; - 54283CED2CE48B97009729B5 /* ShoppingMallDataPresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShoppingMallDataPresent.m; sourceTree = ""; }; - 54435F2C2CC89D4600F4884B /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = ""; }; - 54435F2D2CC89D4600F4884B /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = ""; }; - 544879E82CD215F400D58DC1 /* CustomRoomBGCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CustomRoomBGCell.h; sourceTree = ""; }; - 544879E92CD215F400D58DC1 /* CustomRoomBGCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomRoomBGCell.m; sourceTree = ""; }; - 544879EB2CD22A6B00D58DC1 /* CustomRoomBGPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CustomRoomBGPresenter.h; sourceTree = ""; }; - 544879EC2CD22A6B00D58DC1 /* CustomRoomBGPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomRoomBGPresenter.m; sourceTree = ""; }; - 544879EE2CD22D4B00D58DC1 /* CustomRoomBGItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CustomRoomBGItemModel.h; sourceTree = ""; }; - 544879EF2CD22D4B00D58DC1 /* CustomRoomBGItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomRoomBGItemModel.m; sourceTree = ""; }; - 544A36332C94160F00CA7858 /* RoomMenuBar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomMenuBar.h; sourceTree = ""; }; - 544A36342C94160F00CA7858 /* RoomMenuBar.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomMenuBar.m; sourceTree = ""; }; - 544B19AE2CA1299500885BEB /* CPBindingAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPBindingAnimation.h; sourceTree = ""; }; - 544B19AF2CA1299500885BEB /* CPBindingAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPBindingAnimation.m; sourceTree = ""; }; - 544B19B12CA129A800885BEB /* CPLevelUpAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPLevelUpAnimation.h; sourceTree = ""; }; - 544B19B22CA129A800885BEB /* CPLevelUpAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPLevelUpAnimation.m; sourceTree = ""; }; - 544B19B42CA14A7100885BEB /* CPGiftBanner.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPGiftBanner.h; sourceTree = ""; }; - 544B19B52CA14A7100885BEB /* CPGiftBanner.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPGiftBanner.m; sourceTree = ""; }; - 544B19B72CA169BE00885BEB /* level up 1.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = "level up 1.svga"; sourceTree = ""; }; - 544B19B82CA169BE00885BEB /* level up 2.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = "level up 2.svga"; sourceTree = ""; }; - 544B19B92CA169BE00885BEB /* level up 3.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = "level up 3.svga"; sourceTree = ""; }; - 544B19BA2CA169BE00885BEB /* level up 4.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = "level up 4.svga"; sourceTree = ""; }; - 544B19BB2CA169BE00885BEB /* level up 5.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = "level up 5.svga"; sourceTree = ""; }; - 5456F3C62C6EF962000E1805 /* VIPCenterViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VIPCenterViewController.h; sourceTree = ""; }; - 5456F3C72C6EF962000E1805 /* VIPCenterViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VIPCenterViewController.m; sourceTree = ""; }; - 5458319B2C2AE09300364026 /* XPRoomTypeSelectionViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTypeSelectionViewController.h; sourceTree = ""; }; - 5458319C2C2AE09300364026 /* XPRoomTypeSelectionViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTypeSelectionViewController.m; sourceTree = ""; }; - 5458319E2C2AEFAF00364026 /* TenMicStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TenMicStageView.h; sourceTree = ""; }; - 5458319F2C2AEFAF00364026 /* TenMicStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TenMicStageView.m; sourceTree = ""; }; - 545831A12C2AF01100364026 /* FifteenMicStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FifteenMicStageView.h; sourceTree = ""; }; - 545831A22C2AF01100364026 /* FifteenMicStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FifteenMicStageView.m; sourceTree = ""; }; - 545831A42C2C085C00364026 /* ArabMicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ArabMicroView.h; sourceTree = ""; }; - 545831A52C2C085C00364026 /* ArabMicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ArabMicroView.m; sourceTree = ""; }; - 545888312C1AFFB500897585 /* XPRoomPKPanelView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPanelView.h; sourceTree = ""; }; - 545888322C1AFFB500897585 /* XPRoomPKPanelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPanelView.m; sourceTree = ""; }; - 545888342C1C306B00897585 /* XPRoomPKPaneAvatarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPaneAvatarView.h; sourceTree = ""; }; - 545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPaneAvatarView.m; sourceTree = ""; }; - 5461040B2CD4B46F00066B21 /* gift_normal_1.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = gift_normal_1.svga; sourceTree = ""; }; - 5461040C2CD4B46F00066B21 /* gift_normal_2.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = gift_normal_2.svga; sourceTree = ""; }; - 5461040D2CD4B46F00066B21 /* gift_normal_3.svga */ = {isa = PBXFileReference; lastKnownFileType = text; path = gift_normal_3.svga; sourceTree = ""; }; - 5461040E2CD4B46F00066B21 /* gift_VIP_1.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = gift_VIP_1.svga; sourceTree = ""; }; - 5461040F2CD4B46F00066B21 /* gift_VIP_2.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = gift_VIP_2.svga; sourceTree = ""; }; - 546104102CD4B46F00066B21 /* gift_VIP_3.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = gift_VIP_3.svga; sourceTree = ""; }; - 546104172CD4C06400066B21 /* Api+CustomBackground.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+CustomBackground.h"; sourceTree = ""; }; - 546104182CD4C06400066B21 /* Api+CustomBackground.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+CustomBackground.m"; sourceTree = ""; }; - 5461041A2CD4D35A00066B21 /* RoomHighValueGiftBannerAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomHighValueGiftBannerAnimation.h; sourceTree = ""; }; - 5461041B2CD4D35A00066B21 /* RoomHighValueGiftBannerAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomHighValueGiftBannerAnimation.m; sourceTree = ""; }; - 5468995B2C8AFE4C0049136A /* GiftComboFlagView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftComboFlagView.h; sourceTree = ""; }; - 5468995C2C8AFE4C0049136A /* GiftComboFlagView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftComboFlagView.m; sourceTree = ""; }; - 547080D92CD0EEB4009879E5 /* CustomRoomBGContentViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CustomRoomBGContentViewController.h; sourceTree = ""; }; - 547080DA2CD0EEB4009879E5 /* CustomRoomBGContentViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomRoomBGContentViewController.m; sourceTree = ""; }; - 5478539F2C258F2A00F45E60 /* XPMineUserViewHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserViewHeader.h; sourceTree = ""; }; - 547853A02C258F2A00F45E60 /* XPMineUserViewHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserViewHeader.m; sourceTree = ""; }; - 547B30F72CB511700041E962 /* RoomBoomEntryView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomBoomEntryView.h; sourceTree = ""; }; - 547B30F82CB511700041E962 /* RoomBoomEntryView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomBoomEntryView.m; sourceTree = ""; }; - 5484E1FB2CA2897B008E8754 /* IAPManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IAPManager.h; sourceTree = ""; }; - 5484E1FC2CA2897B008E8754 /* IAPManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IAPManager.m; sourceTree = ""; }; 548D541E2CC208FD0084A2FF /* AlbumResourcePickerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AlbumResourcePickerViewController.h; sourceTree = ""; }; 548D541F2CC208FD0084A2FF /* AlbumResourcePickerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AlbumResourcePickerViewController.m; sourceTree = ""; }; - 548E01C32C3F78360071C83D /* FeedBackViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeedBackViewController.h; sourceTree = ""; }; - 548E01C42C3F78360071C83D /* FeedBackViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeedBackViewController.m; sourceTree = ""; }; 548E01C72C3F78600071C83D /* FeedBackConfigModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeedBackConfigModel.h; sourceTree = ""; }; 548E01C82C3F78600071C83D /* FeedBackConfigModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeedBackConfigModel.m; sourceTree = ""; }; - 548E01CA2C3FB1C70071C83D /* i18nGiftNameMap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = i18nGiftNameMap.h; sourceTree = ""; }; - 548E01CB2C3FB1C70071C83D /* i18nGiftNameMap.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = i18nGiftNameMap.m; sourceTree = ""; }; - 54ACDCC02C5B31BD0099472C /* XPBeautIDView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPBeautIDView.h; sourceTree = ""; }; - 54ACDCC12C5B31BD0099472C /* XPBeautIDView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPBeautIDView.m; sourceTree = ""; }; - 54AE7E122C9AD98C006D2BE2 /* CPCard.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPCard.h; sourceTree = ""; }; - 54AE7E132C9AD9A6006D2BE2 /* CPCard.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPCard.m; sourceTree = ""; }; - 54AE7E152C9AE589006D2BE2 /* CPListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPListViewController.h; sourceTree = ""; }; - 54AE7E162C9AE589006D2BE2 /* CPListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPListViewController.m; sourceTree = ""; }; - 54B9C6E52C9C2CA1003F1CC5 /* XPMineGuildTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGuildTableViewCell.h; sourceTree = ""; }; - 54B9C6E62C9C2CA1003F1CC5 /* XPMineGuildTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildTableViewCell.m; sourceTree = ""; }; 54B9C6E82C9C2DDC003F1CC5 /* GuildInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GuildInfo.h; sourceTree = ""; }; 54B9C6E92C9C2DDC003F1CC5 /* GuildInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GuildInfo.m; sourceTree = ""; }; - 54B9C6F12C9D27F3003F1CC5 /* XPMineMultipleContentTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineMultipleContentTableViewCell.h; sourceTree = ""; }; - 54B9C6F22C9D27F3003F1CC5 /* XPMineMultipleContentTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineMultipleContentTableViewCell.m; sourceTree = ""; }; - 54B9C6F42C9D8D05003F1CC5 /* 3.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = 3.mp4; sourceTree = ""; }; - 54B9C6F52C9D8D05003F1CC5 /* 4.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = 4.mp4; sourceTree = ""; }; - 54B9C6F62C9D8D05003F1CC5 /* 5.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = 5.mp4; sourceTree = ""; }; - 54B9C6FA2C9DA4C4003F1CC5 /* CP绑定.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "CP绑定.mp4"; sourceTree = ""; }; - 54C3895A2C215F5100FD47B1 /* XPHomeMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMineViewController.h; sourceTree = ""; }; - 54C3895B2C215F5100FD47B1 /* XPHomeMineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeMineViewController.m; sourceTree = ""; }; - 54C3895D2C2189DD00FD47B1 /* XPHomeMinePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMinePresenter.h; sourceTree = ""; }; - 54C3895E2C2189DD00FD47B1 /* XPHomeMinePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeMinePresenter.m; sourceTree = ""; }; - 54C389602C23BD1600FD47B1 /* HomeRankAvatarModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeRankAvatarModel.h; sourceTree = ""; }; - 54C389612C23BD1600FD47B1 /* HomeRankAvatarModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeRankAvatarModel.m; sourceTree = ""; }; - 54C389642C24448900FD47B1 /* XPHomeMineProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMineProtocol.h; sourceTree = ""; }; - 54C389652C24464600FD47B1 /* HomeMineRoomModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeMineRoomModel.h; sourceTree = ""; }; - 54C389662C24464600FD47B1 /* HomeMineRoomModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeMineRoomModel.m; sourceTree = ""; }; - 54C608502CBE0BEB003DD5D2 /* game_floating_bg.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = game_floating_bg.svga; sourceTree = ""; }; - 54C608532CBE1EC7003DD5D2 /* GameUniversalBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GameUniversalBannerView.h; sourceTree = ""; }; - 54C608542CBE1EC7003DD5D2 /* GameUniversalBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GameUniversalBannerView.m; sourceTree = ""; }; - 54C9A10B2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDataGameMateTableViewCell.h; sourceTree = ""; }; - 54C9A10C2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDataGameMateTableViewCell.m; sourceTree = ""; }; - 54C9A10E2C3D3E1700C6D970 /* XPMineGameMateOrderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGameMateOrderView.h; sourceTree = ""; }; - 54C9A10F2C3D3E1700C6D970 /* XPMineGameMateOrderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGameMateOrderView.m; sourceTree = ""; }; - 54C9A1112C3D5A2300C6D970 /* XPGameOrdersListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGameOrdersListViewController.h; sourceTree = ""; }; - 54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGameOrdersListViewController.m; sourceTree = ""; }; - 54C9A1142C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGameOrdersListTableViewCell.h; sourceTree = ""; }; - 54C9A1152C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGameOrdersListTableViewCell.m; sourceTree = ""; }; 54C9A11A2C3D9EDD00C6D970 /* Api+GameOrder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+GameOrder.h"; sourceTree = ""; }; 54C9A11B2C3D9EDD00C6D970 /* Api+GameOrder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+GameOrder.m"; sourceTree = ""; }; 54C9A11D2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGamePartnerInfoModel.h; sourceTree = ""; }; 54C9A11E2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGamePartnerInfoModel.m; sourceTree = ""; }; - 54C9A1202C3E6C3200C6D970 /* MessageGameOrderModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageGameOrderModel.h; sourceTree = ""; }; - 54C9A1212C3E6C3200C6D970 /* MessageGameOrderModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageGameOrderModel.m; sourceTree = ""; }; - 54C9A1232C3E74AE00C6D970 /* MessageGameOrderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageGameOrderView.h; sourceTree = ""; }; - 54C9A1242C3E74AE00C6D970 /* MessageGameOrderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageGameOrderView.m; sourceTree = ""; }; 54CE5EF72CCA4A2600A67898 /* LocationModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocationModel.h; sourceTree = ""; }; 54CE5EF82CCA4A2600A67898 /* LocationModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LocationModel.m; sourceTree = ""; }; - 54E4D52E2C9048E1009E1FEA /* LuckyGiftWinningFlagView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LuckyGiftWinningFlagView.h; sourceTree = ""; }; - 54E4D52F2C9048E1009E1FEA /* LuckyGiftWinningFlagView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LuckyGiftWinningFlagView.m; sourceTree = ""; }; - 54E4D5312C90658C009E1FEA /* LuckyGiftWinningBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LuckyGiftWinningBannerView.h; sourceTree = ""; }; - 54E4D5322C90658C009E1FEA /* LuckyGiftWinningBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LuckyGiftWinningBannerView.m; sourceTree = ""; }; - 54E82EA02CA6886700C931D9 /* RoomBoomBannerAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomBoomBannerAnimation.h; sourceTree = ""; }; - 54E82EA12CA6886700C931D9 /* RoomBoomBannerAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomBoomBannerAnimation.m; sourceTree = ""; }; - 54E82EA32CA693FA00C931D9 /* RoomBoomExplosionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomBoomExplosionView.h; sourceTree = ""; }; - 54E82EA42CA693FA00C931D9 /* RoomBoomExplosionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomBoomExplosionView.m; sourceTree = ""; }; - 54E82EA62CA6940900C931D9 /* RoomBoomResultView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomBoomResultView.h; sourceTree = ""; }; - 54E82EA72CA6940900C931D9 /* RoomBoomResultView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomBoomResultView.m; sourceTree = ""; }; - 54E82EA92CA9261000C931D9 /* Api+Boom.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Boom.h"; sourceTree = ""; }; - 54E82EAA2CA9261000C931D9 /* Api+Boom.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Boom.m"; sourceTree = ""; }; - 54E82EAC2CA9293C00C931D9 /* BoomInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BoomInfoModel.h; sourceTree = ""; }; - 54E82EAD2CA9293C00C931D9 /* BoomInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BoomInfoModel.m; sourceTree = ""; }; - 54E82EAF2CA93BE200C931D9 /* BoomInfoViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BoomInfoViewController.h; sourceTree = ""; }; - 54E82EB02CA93BE200C931D9 /* BoomInfoViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BoomInfoViewController.m; sourceTree = ""; }; - 54E8C4D42CC78DA900646C44 /* VipSettingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VipSettingViewController.h; sourceTree = ""; }; - 54E8C4D52CC78DA900646C44 /* VipSettingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VipSettingViewController.m; sourceTree = ""; }; - 54F179062C8EA48C00CB5219 /* Combo_Boom.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = Combo_Boom.svga; sourceTree = ""; }; - 54F179082C8EDDF400CB5219 /* CountdownRingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CountdownRingView.h; sourceTree = ""; }; - 54F179092C8EDDF400CB5219 /* CountdownRingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CountdownRingView.m; sourceTree = ""; }; - 54F469332C29711400A83655 /* XPMomentUserDataViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentUserDataViewController.h; sourceTree = ""; }; - 54F469342C29711400A83655 /* XPMomentUserDataViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentUserDataViewController.m; sourceTree = ""; }; - 54F469362C29C3B400A83655 /* XPMineAlbumTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAlbumTableViewCell.h; sourceTree = ""; }; - 54F469372C29C3B400A83655 /* XPMineAlbumTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineAlbumTableViewCell.m; sourceTree = ""; }; 54F469392C2A984D00A83655 /* MedalModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MedalModel.h; sourceTree = ""; }; 54F4693A2C2A984D00A83655 /* MedalModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MedalModel.m; sourceTree = ""; }; - 54F4693C2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineMedalsTableViewCell.h; sourceTree = ""; }; - 54F4693D2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineMedalsTableViewCell.m; sourceTree = ""; }; - 54F4693F2C2AB56900A83655 /* XPMineGiftsTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGiftsTableViewCell.h; sourceTree = ""; }; - 54F469402C2AB56900A83655 /* XPMineGiftsTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGiftsTableViewCell.m; sourceTree = ""; }; 54FFD3782C9BCB1900DE61E5 /* RelationUserVO.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RelationUserVO.h; sourceTree = ""; }; 54FFD3792C9BCB1900DE61E5 /* RelationUserVO.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RelationUserVO.m; sourceTree = ""; }; - 54FFD37B2C9BD12600DE61E5 /* 1.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = 1.svga; sourceTree = ""; }; - 54FFD37C2C9BD12600DE61E5 /* 2.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = 2.svga; sourceTree = ""; }; - 54FFD37D2C9BD12600DE61E5 /* 3.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = 3.svga; sourceTree = ""; }; - 54FFD37E2C9BD12600DE61E5 /* 4.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = 4.svga; sourceTree = ""; }; - 54FFD37F2C9BD12600DE61E5 /* 5.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = 5.svga; sourceTree = ""; }; 7DB00EC07F1D0ADFF900B38D /* Pods-YuMi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YuMi.debug.xcconfig"; path = "Target Support Files/Pods-YuMi/Pods-YuMi.debug.xcconfig"; sourceTree = ""; }; - 9B0086C427BA392B0032BD2B /* AnchorStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorStageView.h; sourceTree = ""; }; - 9B0086C527BA392B0032BD2B /* AnchorStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorStageView.m; sourceTree = ""; }; - 9B0086C827BA4F570032BD2B /* AnchorMicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorMicroView.h; sourceTree = ""; }; - 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorMicroView.m; sourceTree = ""; }; - 9B044D9E282D32F700DE4859 /* MicroInviteExtModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroInviteExtModel.h; sourceTree = ""; }; - 9B044D9F282D32F700DE4859 /* MicroInviteExtModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroInviteExtModel.m; sourceTree = ""; }; - 9B0997A027F19D8900EB8F14 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; - 9B0997A227F19DE500EB8F14 /* QGHWDShaders.metal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.metal; name = QGHWDShaders.metal; path = Pods/QGVAPlayer/iOS/QGVAPlayer/QGVAPlayer/Shaders/QGHWDShaders.metal; sourceTree = SOURCE_ROOT; }; 9B0E1C5726E77022005D4442 /* BaseNavigationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseNavigationController.h; sourceTree = ""; }; 9B0E1C5826E77022005D4442 /* BaseNavigationController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BaseNavigationController.m; sourceTree = ""; }; - 9B17F71627BD150600440843 /* SVGAParserManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAParserManager.h; sourceTree = ""; }; - 9B17F71727BD150600440843 /* SVGAParserManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVGAParserManager.m; sourceTree = ""; }; - 9B1B7290280010E8003FACE9 /* Api+FansTeam.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+FansTeam.h"; sourceTree = ""; }; - 9B1B7291280010E8003FACE9 /* Api+FansTeam.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+FansTeam.m"; sourceTree = ""; }; - 9B1B729328002099003FACE9 /* XPMineFansTeamViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFansTeamViewController.h; sourceTree = ""; }; - 9B1B729428002099003FACE9 /* XPMineFansTeamViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFansTeamViewController.m; sourceTree = ""; }; - 9B1B729628002147003FACE9 /* XPMineFansTeamPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFansTeamPresenter.h; sourceTree = ""; }; - 9B1B729728002147003FACE9 /* XPMineFansTeamPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFansTeamPresenter.m; sourceTree = ""; }; 9B1B7299280021E7003FACE9 /* XPMineAnchorFansTeamProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAnchorFansTeamProtocol.h; sourceTree = ""; }; 9B1B729B28002264003FACE9 /* XPMineAnchorFansTeamModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAnchorFansTeamModel.h; sourceTree = ""; }; 9B1B729C28002264003FACE9 /* XPMineAnchorFansTeamModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineAnchorFansTeamModel.m; sourceTree = ""; }; - 9B1B729F280023F3003FACE9 /* XPMineAnchorFansTeamTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAnchorFansTeamTableViewCell.h; sourceTree = ""; }; - 9B1B72A0280023F3003FACE9 /* XPMineAnchorFansTeamTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineAnchorFansTeamTableViewCell.m; sourceTree = ""; }; - 9B1B72AA280031DB003FACE9 /* XPAnchorPKViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPKViewController.h; sourceTree = ""; }; - 9B1B72AB280031DB003FACE9 /* XPAnchorPKViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKViewController.m; sourceTree = ""; }; - 9B1B72AD280031F8003FACE9 /* XPAnchorPKSelectRoomView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPKSelectRoomView.h; sourceTree = ""; }; - 9B1B72AE280031F8003FACE9 /* XPAnchorPKSelectRoomView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKSelectRoomView.m; sourceTree = ""; }; - 9B1B72B328003664003FACE9 /* Api+AnchorPk.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+AnchorPk.h"; sourceTree = ""; }; - 9B1B72B428003664003FACE9 /* Api+AnchorPk.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+AnchorPk.m"; sourceTree = ""; }; - 9B1B72B628003772003FACE9 /* XPAnchorPKPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPKPresenter.h; sourceTree = ""; }; - 9B1B72B728003772003FACE9 /* XPAnchorPKPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKPresenter.m; sourceTree = ""; }; - 9B1B72B9280037C5003FACE9 /* XPAnchorPKProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPKProtocol.h; sourceTree = ""; }; - 9B1B72BA28003E06003FACE9 /* XPAnchorPKTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPKTableViewCell.h; sourceTree = ""; }; - 9B1B72BB28003E06003FACE9 /* XPAnchorPKTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKTableViewCell.m; sourceTree = ""; }; - 9B1B72BD2800422E003FACE9 /* XPAnchorPKRuleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPKRuleView.h; sourceTree = ""; }; - 9B1B72BE2800422E003FACE9 /* XPAnchorPKRuleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKRuleView.m; sourceTree = ""; }; - 9B1EF3D027E81C0600554295 /* XPMineDressUpBubbleViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDressUpBubbleViewController.h; sourceTree = ""; }; - 9B1EF3D127E81C0600554295 /* XPMineDressUpBubbleViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDressUpBubbleViewController.m; sourceTree = ""; }; - 9B1EF3D327E8294B00554295 /* XPMineDressEmptyCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDressEmptyCollectionViewCell.h; sourceTree = ""; }; - 9B1EF3D427E8294B00554295 /* XPMineDressEmptyCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDressEmptyCollectionViewCell.m; sourceTree = ""; }; - 9B1FC3D327E49A5D006EFFE0 /* ChatBubbleModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ChatBubbleModel.h; sourceTree = ""; }; - 9B1FC3D427E49A5D006EFFE0 /* ChatBubbleModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ChatBubbleModel.m; sourceTree = ""; }; - 9B1FC3D627E49C36006EFFE0 /* XPMineDressBubbleCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDressBubbleCollectionViewCell.h; sourceTree = ""; }; - 9B1FC3D727E49C36006EFFE0 /* XPMineDressBubbleCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDressBubbleCollectionViewCell.m; sourceTree = ""; }; - 9B208A342779B50100F9E54A /* GiftNobleInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftNobleInfoModel.h; sourceTree = ""; }; - 9B208A352779B50100F9E54A /* GiftNobleInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftNobleInfoModel.m; sourceTree = ""; }; - 9B2489BA27C4C056006CFB85 /* XPMineVisitorEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineVisitorEmptyTableViewCell.h; sourceTree = ""; }; - 9B2489BB27C4C056006CFB85 /* XPMineVisitorEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineVisitorEmptyTableViewCell.m; sourceTree = ""; }; 9B2A12DC2783FEDD00CED41B /* UserVipInfoVo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserVipInfoVo.h; sourceTree = ""; }; 9B2A12DD2783FEDD00CED41B /* UserVipInfoVo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserVipInfoVo.m; sourceTree = ""; }; - 9B2EA7BE2804037700ED17BF /* AnchorPKStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorPKStageView.h; sourceTree = ""; }; - 9B2EA7BF2804037700ED17BF /* AnchorPKStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorPKStageView.m; sourceTree = ""; }; - 9B2EA7C12804052E00ED17BF /* AnchorPKMicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorPKMicroView.h; sourceTree = ""; }; - 9B2EA7C22804052E00ED17BF /* AnchorPKMicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorPKMicroView.m; sourceTree = ""; }; - 9B2EA7C428041EFC00ED17BF /* XPAnchorPkPanelView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPkPanelView.h; sourceTree = ""; }; - 9B2EA7C528041EFC00ED17BF /* XPAnchorPkPanelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPkPanelView.m; sourceTree = ""; }; - 9B2EA7CA2804245500ED17BF /* XPAnchorPKPanelUserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPKPanelUserView.h; sourceTree = ""; }; - 9B2EA7CB2804245500ED17BF /* XPAnchorPKPanelUserView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKPanelUserView.m; sourceTree = ""; }; - 9B2F72CE28E45A480000E4FA /* XPRoomQuickMessageContainView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomQuickMessageContainView.h; sourceTree = ""; }; - 9B2F72CF28E45A480000E4FA /* XPRoomQuickMessageContainView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomQuickMessageContainView.m; sourceTree = ""; }; - 9B2F72D128E45C5A0000E4FA /* XPRoomQuidkMessageCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomQuidkMessageCell.h; sourceTree = ""; }; - 9B2F72D228E45C5A0000E4FA /* XPRoomQuidkMessageCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomQuidkMessageCell.m; sourceTree = ""; }; - 9B32A04528881845002009D2 /* XPRoomTagListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTagListView.h; sourceTree = ""; }; - 9B32A04628881845002009D2 /* XPRoomTagListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTagListView.m; sourceTree = ""; }; - 9B335B472925D8A00048A116 /* XPAnchorPKSelectTypeController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPKSelectTypeController.h; sourceTree = ""; }; - 9B335B482925D8A00048A116 /* XPAnchorPKSelectTypeController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKSelectTypeController.m; sourceTree = ""; }; 9B33E3C927D85379003B0E62 /* UploadFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UploadFile.m; sourceTree = ""; }; 9B33E3CA27D85379003B0E62 /* UploadFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UploadFile.h; sourceTree = ""; }; - 9B3A1DF2280571000058E2DD /* XPAnchorPKInviteView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPKInviteView.h; sourceTree = ""; }; - 9B3A1DF3280571000058E2DD /* XPAnchorPKInviteView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKInviteView.m; sourceTree = ""; }; - 9B3C1818292CE4FA003AF543 /* XPAnchorPKMatchView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPKMatchView.h; sourceTree = ""; }; - 9B3C1819292CE4FA003AF543 /* XPAnchorPKMatchView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKMatchView.m; sourceTree = ""; }; - 9B41D36C282649230048C588 /* XPWeekStarRankUserModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPWeekStarRankUserModel.h; sourceTree = ""; }; - 9B41D36D282649230048C588 /* XPWeekStarRankUserModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPWeekStarRankUserModel.m; sourceTree = ""; }; - 9B42868C28C1AE2D009034D2 /* XPReceiveRedPacketView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPReceiveRedPacketView.h; sourceTree = ""; }; - 9B42868D28C1AE2D009034D2 /* XPReceiveRedPacketView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPReceiveRedPacketView.m; sourceTree = ""; }; - 9B42869028C1AED4009034D2 /* XPReceiveRedPacketModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPReceiveRedPacketModel.h; sourceTree = ""; }; - 9B42869128C1AED4009034D2 /* XPReceiveRedPacketModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPReceiveRedPacketModel.m; sourceTree = ""; }; - 9B42869328C1E00A009034D2 /* XPRedPacketResultModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRedPacketResultModel.h; sourceTree = ""; }; - 9B42869428C1E00A009034D2 /* XPRedPacketResultModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRedPacketResultModel.m; sourceTree = ""; }; - 9B42869628C1E06B009034D2 /* XPRedPacketModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRedPacketModel.h; sourceTree = ""; }; - 9B42869728C1E06B009034D2 /* XPRedPacketModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRedPacketModel.m; sourceTree = ""; }; - 9B42869A28C1FD3D009034D2 /* XPOpenRedPacketCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPOpenRedPacketCell.h; sourceTree = ""; }; - 9B42869B28C1FD3D009034D2 /* XPOpenRedPacketCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPOpenRedPacketCell.m; sourceTree = ""; }; - 9B4C5B84292F81FA00CEA41B /* XPSessionListFansPartyModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionListFansPartyModel.h; sourceTree = ""; }; - 9B4C5B85292F81FA00CEA41B /* XPSessionListFansPartyModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionListFansPartyModel.m; sourceTree = ""; }; - 9B4D449128F15765002572D5 /* XPGiftLuckyGiftBroadcastView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftLuckyGiftBroadcastView.h; sourceTree = ""; }; - 9B4D449228F15765002572D5 /* XPGiftLuckyGiftBroadcastView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftLuckyGiftBroadcastView.m; sourceTree = ""; }; - 9B4E91FE28E57A620033419E /* XPGiftHeadTypeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftHeadTypeView.h; sourceTree = ""; }; - 9B4E91FF28E57A620033419E /* XPGiftHeadTypeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftHeadTypeView.m; sourceTree = ""; }; - 9B6B3AA9278C2EA7005551EC /* XPRoomNobleLevelUpView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomNobleLevelUpView.h; sourceTree = ""; }; - 9B6B3AAA278C2EA7005551EC /* XPRoomNobleLevelUpView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomNobleLevelUpView.m; sourceTree = ""; }; - 9B6E8568281A982A0041A321 /* XPRoomRecommendView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRecommendView.h; sourceTree = ""; }; - 9B6E8569281A982A0041A321 /* XPRoomRecommendView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomRecommendView.m; sourceTree = ""; }; - 9B6E856C281AABAB0041A321 /* XPRoomRecommendModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRecommendModel.h; sourceTree = ""; }; - 9B6E856D281AABAB0041A321 /* XPRoomRecommendModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomRecommendModel.m; sourceTree = ""; }; - 9B6E8571281AB9B20041A321 /* XPRoomInsideRecommendCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomInsideRecommendCell.h; sourceTree = ""; }; - 9B6E8572281AB9B20041A321 /* XPRoomInsideRecommendCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomInsideRecommendCell.m; sourceTree = ""; }; - 9B6E8575281ABECC0041A321 /* XPRoomInsideRecommendEmptyCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomInsideRecommendEmptyCell.h; sourceTree = ""; }; - 9B6E8576281ABECC0041A321 /* XPRoomInsideRecommendEmptyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomInsideRecommendEmptyCell.m; sourceTree = ""; }; - 9B734F71288A787000CBDAA9 /* XPMineAccountView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAccountView.h; sourceTree = ""; }; - 9B734F72288A787000CBDAA9 /* XPMineAccountView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineAccountView.m; sourceTree = ""; }; 9B734F74288A92FB00CBDAA9 /* XPMineFunctionItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFunctionItemModel.h; sourceTree = ""; }; 9B734F75288A92FB00CBDAA9 /* XPMineFunctionItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFunctionItemModel.m; sourceTree = ""; }; - 9B7B605927BB53060070BB72 /* XPAnchorAudienceUpMicView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPAnchorAudienceUpMicView.h; sourceTree = ""; }; - 9B7B605A27BB53060070BB72 /* XPAnchorAudienceUpMicView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPAnchorAudienceUpMicView.m; sourceTree = ""; }; - 9B7B606027BB96E40070BB72 /* XPRoomAnchorInfoCardView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomAnchorInfoCardView.h; sourceTree = ""; }; - 9B7B606127BB96E40070BB72 /* XPRoomAnchorInfoCardView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnchorInfoCardView.m; sourceTree = ""; }; - 9B7B606427BBA0EE0070BB72 /* XPAnchorAttentSendInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorAttentSendInfo.h; sourceTree = ""; }; - 9B7B606527BBA0EE0070BB72 /* XPAnchorAttentSendInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorAttentSendInfo.m; sourceTree = ""; }; - 9B7D80482753783D003DAC0C /* SessionViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionViewController.h; sourceTree = ""; }; - 9B7D80492753783D003DAC0C /* SessionViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionViewController.m; sourceTree = ""; }; - 9B7D804B27537950003DAC0C /* MessageCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageCell.h; sourceTree = ""; }; - 9B7D804C27537950003DAC0C /* MessageCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageCell.m; sourceTree = ""; }; - 9B7D804E2753AA9D003DAC0C /* UITableView+NIMScrollToBottom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITableView+NIMScrollToBottom.m"; sourceTree = ""; }; - 9B7D804F2753AA9D003DAC0C /* UITableView+NIMScrollToBottom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITableView+NIMScrollToBottom.h"; sourceTree = ""; }; - 9B7D904B287BC5E20033A45E /* AnchorRoomScrollView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorRoomScrollView.h; sourceTree = ""; }; - 9B7D904C287BC5E20033A45E /* AnchorRoomScrollView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorRoomScrollView.m; sourceTree = ""; }; - 9B85B6D5279FDABA00A0A1AC /* XPUserCardSkillCardView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPUserCardSkillCardView.h; sourceTree = ""; }; - 9B85B6D6279FDABA00A0A1AC /* XPUserCardSkillCardView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPUserCardSkillCardView.m; sourceTree = ""; }; - 9B85B6D8279FDC5200A0A1AC /* XPUserCardSkillCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPUserCardSkillCollectionViewCell.h; sourceTree = ""; }; - 9B85B6D9279FDC5200A0A1AC /* XPUserCardSkillCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPUserCardSkillCollectionViewCell.m; sourceTree = ""; }; - 9B85F3512806AB9A006EDF51 /* XPAnchorPKResultView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPKResultView.h; sourceTree = ""; }; - 9B85F3522806AB9A006EDF51 /* XPAnchorPKResultView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKResultView.m; sourceTree = ""; }; - 9B85F3542806DD8A006EDF51 /* XPAnchorPKFinishView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorPKFinishView.h; sourceTree = ""; }; - 9B85F3552806DD8A006EDF51 /* XPAnchorPKFinishView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKFinishView.m; sourceTree = ""; }; - 9B86D8782817DD8400494FCD /* XPRoomEnterHideTipView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomEnterHideTipView.h; sourceTree = ""; }; - 9B86D8792817DD8400494FCD /* XPRoomEnterHideTipView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomEnterHideTipView.m; sourceTree = ""; }; - 9B86D884281942D200494FCD /* SocialMicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SocialMicroView.h; sourceTree = ""; }; - 9B86D885281942D200494FCD /* SocialMicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SocialMicroView.m; sourceTree = ""; }; - 9B87B3CB2926473D00085110 /* XPSessionListHeadFriendCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionListHeadFriendCell.h; sourceTree = ""; }; - 9B87B3CC2926473D00085110 /* XPSessionListHeadFriendCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionListHeadFriendCell.m; sourceTree = ""; }; - 9B88E20A28C5EB8300D26FBA /* MessageContentRedPacketView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentRedPacketView.h; sourceTree = ""; }; - 9B88E20B28C5EB8300D26FBA /* MessageContentRedPacketView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentRedPacketView.m; sourceTree = ""; }; - 9B88E20D28C6305400D26FBA /* XPRoomSearchRecordViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSearchRecordViewController.h; sourceTree = ""; }; - 9B88E20E28C6305400D26FBA /* XPRoomSearchRecordViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSearchRecordViewController.m; sourceTree = ""; }; - 9B8DE0DF289CF02900FB6EC2 /* XPGiftCompoundModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftCompoundModel.h; sourceTree = ""; }; - 9B8DE0E0289CF02900FB6EC2 /* XPGiftCompoundModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftCompoundModel.m; sourceTree = ""; }; - 9B8DE0E2289CF7AA00FB6EC2 /* XPRoomGiftCompoundView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomGiftCompoundView.h; sourceTree = ""; }; - 9B8DE0E3289CF7AA00FB6EC2 /* XPRoomGiftCompoundView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomGiftCompoundView.m; sourceTree = ""; }; - 9B92A33A2797E38100AD168F /* XPMineHeadItemTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineHeadItemTableViewCell.h; sourceTree = ""; }; - 9B92A33B2797E38100AD168F /* XPMineHeadItemTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineHeadItemTableViewCell.m; sourceTree = ""; }; - 9B9BBF81288FBFB3004E2E74 /* XPNewUserRoomGiftView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewUserRoomGiftView.h; sourceTree = ""; }; - 9B9BBF82288FBFB3004E2E74 /* XPNewUserRoomGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewUserRoomGiftView.m; sourceTree = ""; }; - 9BA3B409293DCDFD0071DF1C /* XPVersionUpdateModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPVersionUpdateModel.h; sourceTree = ""; }; - 9BA3B40A293DCDFD0071DF1C /* XPVersionUpdateModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPVersionUpdateModel.m; sourceTree = ""; }; - 9BA3B40D293DD2F90071DF1C /* XPUpgradeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPUpgradeView.h; sourceTree = ""; }; - 9BA3B40E293DD2F90071DF1C /* XPUpgradeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPUpgradeView.m; sourceTree = ""; }; 9BA812D028BF145700783EA7 /* ClientRedPacketModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ClientRedPacketModel.h; sourceTree = ""; }; 9BA812D128BF145700783EA7 /* ClientRedPacketModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ClientRedPacketModel.m; sourceTree = ""; }; - 9BA812D428BF52E100783EA7 /* XPRoomSendRedPacketViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSendRedPacketViewController.h; sourceTree = ""; }; - 9BA812D528BF52E100783EA7 /* XPRoomSendRedPacketViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSendRedPacketViewController.m; sourceTree = ""; }; - 9BA812DB28BF6A7300783EA7 /* XPRoomRedPacketPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRedPacketPresenter.h; sourceTree = ""; }; - 9BA812DC28BF6A7300783EA7 /* XPRoomRedPacketPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomRedPacketPresenter.m; sourceTree = ""; }; - 9BA812DE28BF6ABB00783EA7 /* Api+RedPacket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+RedPacket.h"; sourceTree = ""; }; - 9BA812DF28BF6ABB00783EA7 /* Api+RedPacket.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+RedPacket.m"; sourceTree = ""; }; - 9BA812E128BF6AFB00783EA7 /* XPRoomRedPacketProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRedPacketProtocol.h; sourceTree = ""; }; - 9BA812E228BF70A600783EA7 /* XPRoomRedPacketPwdView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRedPacketPwdView.h; sourceTree = ""; }; - 9BA812E328BF70A600783EA7 /* XPRoomRedPacketPwdView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomRedPacketPwdView.m; sourceTree = ""; }; 9BA8A47427C60D9F000365A3 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 9BA8A47627C60DF7000365A3 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; - 9BAA5FEB277A1BBE007453F3 /* XPPrivacyViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPrivacyViewController.h; sourceTree = ""; }; - 9BAA5FEC277A1BBE007453F3 /* XPPrivacyViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPrivacyViewController.m; sourceTree = ""; }; - 9BAA5FEE277A23F4007453F3 /* XPPermissionsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPermissionsViewController.h; sourceTree = ""; }; - 9BAA5FEF277A23F4007453F3 /* XPPermissionsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPermissionsViewController.m; sourceTree = ""; }; - 9BAC92F328E6E63000147DD8 /* XPRoomInsideOperationCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomInsideOperationCell.h; sourceTree = ""; }; - 9BAC92F428E6E63000147DD8 /* XPRoomInsideOperationCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomInsideOperationCell.m; sourceTree = ""; }; - 9BAD41AD28C6ECBA005E47B3 /* XPInRoomRecordProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPInRoomRecordProtocol.h; sourceTree = ""; }; - 9BB865B4272076140029CDE0 /* RtcImplDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RtcImplDelegate.h; sourceTree = ""; }; - 9BB89DC127FE7F3A00586A83 /* XPAnchorFansRelationModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorFansRelationModel.h; sourceTree = ""; }; - 9BB89DC227FE7F3A00586A83 /* XPAnchorFansRelationModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorFansRelationModel.m; sourceTree = ""; }; - 9BB89DC427FEB9E100586A83 /* XPAnchorFansTaskViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorFansTaskViewController.h; sourceTree = ""; }; - 9BB89DC527FEB9E100586A83 /* XPAnchorFansTaskViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorFansTaskViewController.m; sourceTree = ""; }; - 9BBC028C2786FA060007C24B /* NobleCardModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NobleCardModel.h; sourceTree = ""; }; - 9BBC028D2786FA060007C24B /* NobleCardModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NobleCardModel.m; sourceTree = ""; }; - 9BBC028F2786FC570007C24B /* XPMineNobleCardTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineNobleCardTableViewCell.h; sourceTree = ""; }; - 9BBC02902786FC570007C24B /* XPMineNobleCardTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineNobleCardTableViewCell.m; sourceTree = ""; }; - 9BC5C91A277C8A7B007C8719 /* XPReleaseRadioViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPReleaseRadioViewController.h; sourceTree = ""; }; - 9BC5C91B277C8A7B007C8719 /* XPReleaseRadioViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPReleaseRadioViewController.m; sourceTree = ""; }; - 9BC5C91D277C902B007C8719 /* XPReleaseRadioView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPReleaseRadioView.h; sourceTree = ""; }; - 9BC5C91E277C902B007C8719 /* XPReleaseRadioView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPReleaseRadioView.m; sourceTree = ""; }; - 9BC8C82E28090C9200C24F85 /* XPRoomAnchorRankBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomAnchorRankBannerView.h; sourceTree = ""; }; - 9BC8C82F28090C9200C24F85 /* XPRoomAnchorRankBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnchorRankBannerView.m; sourceTree = ""; }; - 9BC9DAED27E33B3F009EE409 /* XPRoomGiftAnimationParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomGiftAnimationParser.h; sourceTree = ""; }; - 9BC9DAEE27E33B3F009EE409 /* XPRoomGiftAnimationParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomGiftAnimationParser.m; sourceTree = ""; }; - 9BCB999E28F571B500466D64 /* XPMineCollectPartyRoomViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineCollectPartyRoomViewController.h; sourceTree = ""; }; - 9BCB999F28F571B500466D64 /* XPMineCollectPartyRoomViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineCollectPartyRoomViewController.m; sourceTree = ""; }; - 9BCB99A428F582EC00466D64 /* XPMineCollectRoomEditCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineCollectRoomEditCell.h; sourceTree = ""; }; - 9BCB99A528F582EC00466D64 /* XPMineCollectRoomEditCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineCollectRoomEditCell.m; sourceTree = ""; }; - 9BCD02C52796C02800F396AA /* MicroNobleWaveView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroNobleWaveView.h; sourceTree = ""; }; - 9BCD02C62796C02800F396AA /* MicroNobleWaveView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroNobleWaveView.m; sourceTree = ""; }; - 9BCE6142277D657600CC0358 /* XPReleaseRadioTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPReleaseRadioTableViewCell.h; sourceTree = ""; }; - 9BCE6143277D657600CC0358 /* XPReleaseRadioTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPReleaseRadioTableViewCell.m; sourceTree = ""; }; - 9BCFB826289BAC7D0093D863 /* XPMineHeadFunctionItemLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineHeadFunctionItemLayout.h; sourceTree = ""; }; - 9BCFB827289BAC7D0093D863 /* XPMineHeadFunctionItemLayout.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineHeadFunctionItemLayout.m; sourceTree = ""; }; - 9BD2ECCC288F829600F5CD9A /* XPMineFootPrintViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFootPrintViewController.h; sourceTree = ""; }; - 9BD2ECCD288F829600F5CD9A /* XPMineFootPrintViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFootPrintViewController.m; sourceTree = ""; }; 9BD2ECD0288F833B00F5CD9A /* XPMineFootPrintModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFootPrintModel.h; sourceTree = ""; }; 9BD2ECD1288F833B00F5CD9A /* XPMineFootPrintModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFootPrintModel.m; sourceTree = ""; }; - 9BD2ECD3288F838200F5CD9A /* XPMineFootPrintPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFootPrintPresenter.h; sourceTree = ""; }; - 9BD2ECD4288F838200F5CD9A /* XPMineFootPrintPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFootPrintPresenter.m; sourceTree = ""; }; 9BD2ECD6288F849300F5CD9A /* XPMineFootPrintProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFootPrintProtocol.h; sourceTree = ""; }; - 9BD2ECD8288F867000F5CD9A /* XPMineFootPrintTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFootPrintTableViewCell.h; sourceTree = ""; }; - 9BD2ECD9288F867000F5CD9A /* XPMineFootPrintTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFootPrintTableViewCell.m; sourceTree = ""; }; - 9BD63FA9277EE885006EB744 /* Api+RoomRadio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+RoomRadio.h"; sourceTree = ""; }; - 9BD63FAA277EE885006EB744 /* Api+RoomRadio.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+RoomRadio.m"; sourceTree = ""; }; - 9BD63FAC277EE97A006EB744 /* XPReleaseRadioPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPReleaseRadioPresenter.h; sourceTree = ""; }; - 9BD63FAD277EE97A006EB744 /* XPReleaseRadioPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPReleaseRadioPresenter.m; sourceTree = ""; }; - 9BD63FB1277EF14A006EB744 /* XPReleaseRadioProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPReleaseRadioProtocol.h; sourceTree = ""; }; - 9BD63FB2277EF1B3006EB744 /* XPReleaseRadioModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPReleaseRadioModel.h; sourceTree = ""; }; - 9BD63FB3277EF1B3006EB744 /* XPReleaseRadioModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPReleaseRadioModel.m; sourceTree = ""; }; - 9BD798B52926362F003E03E6 /* XPSessionListHeadItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionListHeadItem.h; sourceTree = ""; }; - 9BD798B62926362F003E03E6 /* XPSessionListHeadItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionListHeadItem.m; sourceTree = ""; }; - 9BD8D4E128911E9900AE03FF /* XPMineCollectRoomListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineCollectRoomListViewController.h; sourceTree = ""; }; - 9BD8D4E228911E9900AE03FF /* XPMineCollectRoomListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineCollectRoomListViewController.m; sourceTree = ""; }; - 9BD8D4E428911F7700AE03FF /* XPMineCollectRoomListPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineCollectRoomListPresenter.h; sourceTree = ""; }; - 9BD8D4E528911F7700AE03FF /* XPMineCollectRoomListPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineCollectRoomListPresenter.m; sourceTree = ""; }; 9BD8D4E728911FBD00AE03FF /* XPMineCollectRoomListProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineCollectRoomListProtocol.h; sourceTree = ""; }; 9BD9A17627A0E953004186FE /* XPMineVisitorProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineVisitorProtocol.h; sourceTree = ""; }; - 9BD9A17727A0EC57004186FE /* XPMineVisitorPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineVisitorPresenter.h; sourceTree = ""; }; - 9BD9A17827A0EC57004186FE /* XPMineVisitorPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineVisitorPresenter.m; sourceTree = ""; }; - 9BD9A17A27A0EE24004186FE /* XPMineVisitorViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineVisitorViewController.h; sourceTree = ""; }; - 9BD9A17B27A0EE24004186FE /* XPMineVisitorViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineVisitorViewController.m; sourceTree = ""; }; - 9BD9A17E27A0EFC7004186FE /* XPMineVisitorTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineVisitorTableViewCell.h; sourceTree = ""; }; - 9BD9A17F27A0EFC7004186FE /* XPMineVisitorTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineVisitorTableViewCell.m; sourceTree = ""; }; 9BD9A18227A0F128004186FE /* XPMineVisitorItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineVisitorItemModel.h; sourceTree = ""; }; 9BD9A18327A0F128004186FE /* XPMineVisitorItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineVisitorItemModel.m; sourceTree = ""; }; 9BD9A18527A120FD004186FE /* XPMineVisitorUnReadModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineVisitorUnReadModel.h; sourceTree = ""; }; 9BD9A18627A120FD004186FE /* XPMineVisitorUnReadModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineVisitorUnReadModel.m; sourceTree = ""; }; - 9BDA3E7527FD41C200517FE6 /* XPAnchorFansTeamViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorFansTeamViewController.h; sourceTree = ""; }; - 9BDA3E7627FD41C200517FE6 /* XPAnchorFansTeamViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorFansTeamViewController.m; sourceTree = ""; }; - 9BDA3E7827FD43EF00517FE6 /* XPAnchorFansTeamEntranceView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorFansTeamEntranceView.h; sourceTree = ""; }; - 9BDA3E7927FD43EF00517FE6 /* XPAnchorFansTeamEntranceView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorFansTeamEntranceView.m; sourceTree = ""; }; - 9BDA3E7B27FD47AB00517FE6 /* XPAnchorFansTeamPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorFansTeamPresenter.h; sourceTree = ""; }; - 9BDA3E7C27FD47AB00517FE6 /* XPAnchorFansTeamPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorFansTeamPresenter.m; sourceTree = ""; }; - 9BDA3E7F27FD480D00517FE6 /* XPAnchorFansTeamProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorFansTeamProtocol.h; sourceTree = ""; }; - 9BE01ACC28925F7D00B50299 /* XPMineNewUserRechargeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineNewUserRechargeView.h; sourceTree = ""; }; - 9BE01ACD28925F7D00B50299 /* XPMineNewUserRechargeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineNewUserRechargeView.m; sourceTree = ""; }; - 9BE01AD228927E9C00B50299 /* XPDressUpShopListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPDressUpShopListViewController.h; sourceTree = ""; }; - 9BE01AD328927E9C00B50299 /* XPDressUpShopListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPDressUpShopListViewController.m; sourceTree = ""; }; - 9BE01AD8289296B500B50299 /* XPDressUpShopPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPDressUpShopPresenter.h; sourceTree = ""; }; - 9BE01AD9289296B500B50299 /* XPDressUpShopPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPDressUpShopPresenter.m; sourceTree = ""; }; - 9BE01ADB2892975000B50299 /* XPDressUpShopProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPDressUpShopProtocol.h; sourceTree = ""; }; - 9BE01ADC2892A66D00B50299 /* DressUpShopModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DressUpShopModel.h; sourceTree = ""; }; - 9BE01ADD2892A66D00B50299 /* DressUpShopModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DressUpShopModel.m; sourceTree = ""; }; - 9BE01ADF28937DBC00B50299 /* XPDressUpShopCardViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPDressUpShopCardViewController.h; sourceTree = ""; }; - 9BE01AE028937DBC00B50299 /* XPDressUpShopCardViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPDressUpShopCardViewController.m; sourceTree = ""; }; - 9BE01AE228937EDE00B50299 /* XPDressUpShopCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPDressUpShopCollectionViewCell.h; sourceTree = ""; }; - 9BE01AE328937EDE00B50299 /* XPDressUpShopCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPDressUpShopCollectionViewCell.m; sourceTree = ""; }; - 9BE01AE528938AB600B50299 /* XPDressUpShopCardTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPDressUpShopCardTableViewCell.h; sourceTree = ""; }; - 9BE01AE628938AB600B50299 /* XPDressUpShopCardTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPDressUpShopCardTableViewCell.m; sourceTree = ""; }; - 9BE01AE82893CB4400B50299 /* XPDressSearchViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPDressSearchViewController.h; sourceTree = ""; }; - 9BE01AE92893CB4400B50299 /* XPDressSearchViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPDressSearchViewController.m; sourceTree = ""; }; - 9BE01AEB2893D0DF00B50299 /* XPDressShopSearchTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPDressShopSearchTableViewCell.h; sourceTree = ""; }; - 9BE01AEC2893D0DF00B50299 /* XPDressShopSearchTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPDressShopSearchTableViewCell.m; sourceTree = ""; }; - 9BE01AEE2893E31700B50299 /* NewUserRechargeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewUserRechargeModel.h; sourceTree = ""; }; - 9BE01AEF2893E31700B50299 /* NewUserRechargeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewUserRechargeModel.m; sourceTree = ""; }; - 9BE2FA8E288010D300EF3D83 /* AnchorRoomSrollTipView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorRoomSrollTipView.h; sourceTree = ""; }; - 9BE2FA8F288010D300EF3D83 /* AnchorRoomSrollTipView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorRoomSrollTipView.m; sourceTree = ""; }; - 9BE570BA28F65B7200D491A5 /* XPMineCollectRoomCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineCollectRoomCell.h; sourceTree = ""; }; - 9BE570BB28F65B7200D491A5 /* XPMineCollectRoomCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineCollectRoomCell.m; sourceTree = ""; }; - 9BE9F0F727FED12D00667200 /* XPAnchorFansPrivilegeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorFansPrivilegeModel.h; sourceTree = ""; }; - 9BE9F0F827FED12D00667200 /* XPAnchorFansPrivilegeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorFansPrivilegeModel.m; sourceTree = ""; }; - 9BE9F0FA27FED2E100667200 /* XPAnchorFansJoinModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorFansJoinModel.h; sourceTree = ""; }; - 9BE9F0FB27FED2E100667200 /* XPAnchorFansJoinModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorFansJoinModel.m; sourceTree = ""; }; - 9BE9F0FD27FED76500667200 /* XPAnchorFansTaskModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorFansTaskModel.h; sourceTree = ""; }; - 9BE9F0FE27FED76500667200 /* XPAnchorFansTaskModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorFansTaskModel.m; sourceTree = ""; }; - 9BE9F10027FEE5C200667200 /* XPAnchorFansTaskDetailModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorFansTaskDetailModel.h; sourceTree = ""; }; - 9BE9F10127FEE5C200667200 /* XPAnchorFansTaskDetailModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorFansTaskDetailModel.m; sourceTree = ""; }; - 9BE9F10327FF04CF00667200 /* XPAnchorFansTaskTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorFansTaskTableViewCell.h; sourceTree = ""; }; - 9BE9F10427FF04CF00667200 /* XPAnchorFansTaskTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorFansTaskTableViewCell.m; sourceTree = ""; }; - 9BF4BEBA28D4182E009CF6C2 /* XPOpenRedPacketModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPOpenRedPacketModel.h; sourceTree = ""; }; - 9BF4BEBB28D4182E009CF6C2 /* XPOpenRedPacketModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPOpenRedPacketModel.m; sourceTree = ""; }; - 9BF5192428801D4700B6BE92 /* XPAcrossRoomPKCountDownView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKCountDownView.h; sourceTree = ""; }; - 9BF5192528801D4700B6BE92 /* XPAcrossRoomPKCountDownView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKCountDownView.m; sourceTree = ""; }; - 9BFB101D2897CC4300B3985E /* XPAnchorCardView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorCardView.h; sourceTree = ""; }; - 9BFB101E2897CC4300B3985E /* XPAnchorCardView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorCardView.m; sourceTree = ""; }; - 9BFB10202897D68400B3985E /* XPTabAnchorCardModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPTabAnchorCardModel.h; sourceTree = ""; }; - 9BFB10212897D68400B3985E /* XPTabAnchorCardModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPTabAnchorCardModel.m; sourceTree = ""; }; 9BFE0D8C2898C8C300F53C24 /* XPAnchorCardSkillCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorCardSkillCollectionViewCell.h; sourceTree = ""; }; 9BFE0D8D2898C8C300F53C24 /* XPAnchorCardSkillCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorCardSkillCollectionViewCell.m; sourceTree = ""; }; - 9BFE0D902899042600F53C24 /* XPTaskCompleteTipView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPTaskCompleteTipView.h; sourceTree = ""; }; - 9BFE0D912899042600F53C24 /* XPTaskCompleteTipView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPTaskCompleteTipView.m; sourceTree = ""; }; - 9BFE992C288142FD009DA429 /* RoomClassifyModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomClassifyModel.h; sourceTree = ""; }; - 9BFE992D288142FD009DA429 /* RoomClassifyModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomClassifyModel.m; sourceTree = ""; }; B66633E061B1B34177CD011C /* Pods-YuMi.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YuMi.release.xcconfig"; path = "Target Support Files/Pods-YuMi/Pods-YuMi.release.xcconfig"; sourceTree = ""; }; CACF623970097D653132D69A /* Pods_YuMi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YuMi.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - E801273E27E323C800BAC3F2 /* XPRoomPKViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKViewController.h; sourceTree = ""; }; - E801273F27E323C800BAC3F2 /* XPRoomPKViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKViewController.m; sourceTree = ""; }; - E801274127E323E500BAC3F2 /* XPRoomPKPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPresenter.h; sourceTree = ""; }; - E801274227E323E500BAC3F2 /* XPRoomPKPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPresenter.m; sourceTree = ""; }; - E801274427E3240000BAC3F2 /* XPRoomPKProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKProtocol.h; sourceTree = ""; }; - E801274527E3241700BAC3F2 /* Api+RoomPK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+RoomPK.h"; sourceTree = ""; }; - E801274627E3241700BAC3F2 /* Api+RoomPK.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+RoomPK.m"; sourceTree = ""; }; - E801274927E327DA00BAC3F2 /* XPRoomPKTypeTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKTypeTableViewCell.h; sourceTree = ""; }; - E801274A27E327DA00BAC3F2 /* XPRoomPKTypeTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKTypeTableViewCell.m; sourceTree = ""; }; - E801274C27E3280000BAC3F2 /* XPRoomPKVoteTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKVoteTableViewCell.h; sourceTree = ""; }; - E801274D27E3280000BAC3F2 /* XPRoomPKVoteTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKVoteTableViewCell.m; sourceTree = ""; }; - E801274F27E3281100BAC3F2 /* XPRoomPKTimeTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKTimeTableViewCell.h; sourceTree = ""; }; - E801275027E3281100BAC3F2 /* XPRoomPKTimeTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKTimeTableViewCell.m; sourceTree = ""; }; - E801275327E3326000BAC3F2 /* XPRoomPKUserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKUserView.h; sourceTree = ""; }; - E801275427E3326000BAC3F2 /* XPRoomPKUserView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKUserView.m; sourceTree = ""; }; - E801275627E347FD00BAC3F2 /* RoomPKRecordModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomPKRecordModel.h; sourceTree = ""; }; - E801275727E347FD00BAC3F2 /* RoomPKRecordModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomPKRecordModel.m; sourceTree = ""; }; - E80487632717DDD9008595F2 /* XPRoomMenuItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMenuItem.h; sourceTree = ""; }; - E80487642717DDD9008595F2 /* XPRoomMenuItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMenuItem.m; sourceTree = ""; }; E8098CA5282E00920090B9F0 /* Api+Moments.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Moments.h"; sourceTree = ""; }; E8098CA6282E00920090B9F0 /* Api+Moments.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Moments.m"; sourceTree = ""; }; - E8098CA8282E03B40090B9F0 /* XPMomentsRecommendPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsRecommendPresenter.h; sourceTree = ""; }; - E8098CA9282E03B40090B9F0 /* XPMomentsRecommendPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsRecommendPresenter.m; sourceTree = ""; }; E8098CAB282E04870090B9F0 /* XPMomentsRecommendProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsRecommendProtocol.h; sourceTree = ""; }; - E8098CAC282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsEmptyTableViewCell.h; sourceTree = ""; }; - E8098CAD282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsEmptyTableViewCell.m; sourceTree = ""; }; - E8098CAF282E86EF0090B9F0 /* XPMomentsContentView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsContentView.h; sourceTree = ""; }; - E8098CB0282E86EF0090B9F0 /* XPMomentsContentView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsContentView.m; sourceTree = ""; }; - E8098CB2282E97550090B9F0 /* XPMineBlackListPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineBlackListPresenter.h; sourceTree = ""; }; - E8098CB3282E97550090B9F0 /* XPMineBlackListPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineBlackListPresenter.m; sourceTree = ""; }; E8098CB6282E97AC0090B9F0 /* XPMineBlackListProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineBlackListProtocol.h; sourceTree = ""; }; - E80A086027F2AC190027B30C /* RoomPKDetailInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomPKDetailInfoModel.h; sourceTree = ""; }; - E80A086127F2AC190027B30C /* RoomPKDetailInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomPKDetailInfoModel.m; sourceTree = ""; }; - E80A63DA28B86B9700690914 /* MessageContentMonentsAutoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentMonentsAutoView.h; sourceTree = ""; }; - E80A63DB28B86B9700690914 /* MessageContentMonentsAutoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentMonentsAutoView.m; sourceTree = ""; }; E80B0710280D0A6700A79F63 /* FansInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FansInfoModel.h; sourceTree = ""; }; E80B0711280D0A6700A79F63 /* FansInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FansInfoModel.m; sourceTree = ""; }; - E80B0732280D740600A79F63 /* MessageContentGuildView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentGuildView.h; sourceTree = ""; }; - E80B0733280D740600A79F63 /* MessageContentGuildView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentGuildView.m; sourceTree = ""; }; E80CBDE827D0C53F001E1EC2 /* XPWeakTimer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPWeakTimer.h; sourceTree = ""; }; E80CBDE927D0C53F001E1EC2 /* XPWeakTimer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPWeakTimer.m; sourceTree = ""; }; - E80E09AA2A40B70100CD2BE7 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = ""; }; - E80E09AC2A41336500CD2BE7 /* XPWebViewNavView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPWebViewNavView.m; sourceTree = ""; }; - E80E09AD2A41336500CD2BE7 /* XPWebViewNavView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPWebViewNavView.h; sourceTree = ""; }; E80E2375299A47F60013FD40 /* AESUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AESUtils.h; sourceTree = ""; }; E80E2376299A47F60013FD40 /* AESUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AESUtils.m; sourceTree = ""; }; - E80E900A27E0358900434B90 /* XPRoomTopicAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTopicAlertView.h; sourceTree = ""; }; - E80E900B27E0358900434B90 /* XPRoomTopicAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTopicAlertView.m; sourceTree = ""; }; - E81060D7298761A300B772F0 /* MessageBaseModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageBaseModel.h; sourceTree = ""; }; - E81060D8298761A300B772F0 /* MessageBaseModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageBaseModel.m; sourceTree = ""; }; - E81060DA298761F100B772F0 /* MessageTextModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageTextModel.h; sourceTree = ""; }; - E81060DB298761F100B772F0 /* MessageTextModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageTextModel.m; sourceTree = ""; }; - E81060DD29876D3A00B772F0 /* MessageTimeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageTimeModel.h; sourceTree = ""; }; - E81060DE29876D3A00B772F0 /* MessageTimeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageTimeModel.m; sourceTree = ""; }; - E81060E029876E9100B772F0 /* MessageImageModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageImageModel.h; sourceTree = ""; }; - E81060E129876E9100B772F0 /* MessageImageModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageImageModel.m; sourceTree = ""; }; - E81060E329876FF300B772F0 /* MessageAudioModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageAudioModel.h; sourceTree = ""; }; - E81060E429876FF300B772F0 /* MessageAudioModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageAudioModel.m; sourceTree = ""; }; - E81060E62987720F00B772F0 /* MessageUnSupportModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageUnSupportModel.h; sourceTree = ""; }; - E81060E72987720F00B772F0 /* MessageUnSupportModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageUnSupportModel.m; sourceTree = ""; }; - E81060E92987BE8300B772F0 /* MessageGiftModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageGiftModel.h; sourceTree = ""; }; - E81060EA2987BE8300B772F0 /* MessageGiftModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageGiftModel.m; sourceTree = ""; }; - E81060EC2987C35700B772F0 /* MessageTextClickModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageTextClickModel.h; sourceTree = ""; }; - E81060ED2987C35700B772F0 /* MessageTextClickModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageTextClickModel.m; sourceTree = ""; }; - E81060EF2987C52B00B772F0 /* MessageGuildModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageGuildModel.h; sourceTree = ""; }; - E81060F02987C52B00B772F0 /* MessageGuildModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageGuildModel.m; sourceTree = ""; }; - E81060F22987C6B200B772F0 /* MessageOpenLiveModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageOpenLiveModel.h; sourceTree = ""; }; - E81060F32987C6B200B772F0 /* MessageOpenLiveModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageOpenLiveModel.m; sourceTree = ""; }; - E81060F52987C8A700B772F0 /* MessageApplicationShareModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageApplicationShareModel.h; sourceTree = ""; }; - E81060F62987C8A700B772F0 /* MessageApplicationShareModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageApplicationShareModel.m; sourceTree = ""; }; - E81060FB2987CC9100B772F0 /* MessageLevelUpgradeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageLevelUpgradeModel.h; sourceTree = ""; }; - E81060FC2987CC9100B772F0 /* MessageLevelUpgradeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageLevelUpgradeModel.m; sourceTree = ""; }; - E81060FE2987CDCC00B772F0 /* MessageTweetModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageTweetModel.h; sourceTree = ""; }; - E81060FF2987CDCC00B772F0 /* MessageTweetModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageTweetModel.m; sourceTree = ""; }; - E81061012987CFCE00B772F0 /* MessageSkillCardModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageSkillCardModel.h; sourceTree = ""; }; - E81061022987CFCE00B772F0 /* MessageSkillCardModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageSkillCardModel.m; sourceTree = ""; }; - E811FFF52742367B00918544 /* XPGiftEmptyCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftEmptyCollectionViewCell.h; sourceTree = ""; }; - E811FFF62742367B00918544 /* XPGiftEmptyCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftEmptyCollectionViewCell.m; sourceTree = ""; }; - E8133914273E532D00708B66 /* XPGiftItemCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftItemCollectionViewCell.h; sourceTree = ""; }; - E8133915273E532D00708B66 /* XPGiftItemCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftItemCollectionViewCell.m; sourceTree = ""; }; - E81366E126F0A1FC0076364C /* LoginBindPhoneViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginBindPhoneViewController.h; sourceTree = ""; }; - E81366E226F0A1FC0076364C /* LoginBindPhoneViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginBindPhoneViewController.m; sourceTree = ""; }; E81366E526F0A49E0076364C /* NSString+Utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+Utils.h"; sourceTree = ""; }; E81366E626F0A49E0076364C /* NSString+Utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+Utils.m"; sourceTree = ""; }; - E81366F126F0B7C80076364C /* LoginFullInfoViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginFullInfoViewController.h; sourceTree = ""; }; - E81366F226F0B7C80076364C /* LoginFullInfoViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginFullInfoViewController.m; sourceTree = ""; }; E81366F426F0C0DF0076364C /* LoginFullInfoPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginFullInfoPresenter.h; sourceTree = ""; }; E81366F526F0C0DF0076364C /* LoginFullInfoPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginFullInfoPresenter.m; sourceTree = ""; }; E81366F726F0C0F60076364C /* LoginFullInfoProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginFullInfoProtocol.h; sourceTree = ""; }; - E816C11327608A7500C84014 /* XPRoomMiniManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMiniManager.h; sourceTree = ""; }; - E816C11427608A7500C84014 /* XPRoomMiniManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMiniManager.m; sourceTree = ""; }; - E818DD1A2A4896EE00F163F7 /* XPLoginAraeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginAraeViewController.h; sourceTree = ""; }; - E818DD1B2A4896EE00F163F7 /* XPLoginAraeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginAraeViewController.m; sourceTree = ""; }; E818DD1D2A48974300F163F7 /* LoginAreaModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginAreaModel.h; sourceTree = ""; }; E818DD1E2A48974300F163F7 /* LoginAreaModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginAreaModel.m; sourceTree = ""; }; - E818DD202A48977F00F163F7 /* XPLoginAreaTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginAreaTableViewCell.h; sourceTree = ""; }; - E818DD212A48977F00F163F7 /* XPLoginAreaTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginAreaTableViewCell.m; sourceTree = ""; }; - E818E346286ECA4B005EDF68 /* XPMonentsPublishViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsPublishViewController.h; sourceTree = ""; }; - E818E347286ECA4B005EDF68 /* XPMonentsPublishViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsPublishViewController.m; sourceTree = ""; }; E818E349286ECABF005EDF68 /* XPMonentsPublishPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsPublishPresenter.h; sourceTree = ""; }; E818E34A286ECABF005EDF68 /* XPMonentsPublishPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsPublishPresenter.m; sourceTree = ""; }; E818E34C286ECAD8005EDF68 /* XPMonentsPublishProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsPublishProtocol.h; sourceTree = ""; }; - E818E34D286EDF72005EDF68 /* XPMonentsPublishCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsPublishCollectionViewCell.h; sourceTree = ""; }; - E818E34E286EDF72005EDF68 /* XPMonentsPublishCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsPublishCollectionViewCell.m; sourceTree = ""; }; - E81A65292834E4F600F55894 /* XPMomentsAttentionViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsAttentionViewController.h; sourceTree = ""; }; - E81A652A2834E4F600F55894 /* XPMomentsAttentionViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsAttentionViewController.m; sourceTree = ""; }; - E81A652F2834E53600F55894 /* XPMomentsLatestViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsLatestViewController.h; sourceTree = ""; }; - E81A65302834E53600F55894 /* XPMomentsLatestViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsLatestViewController.m; sourceTree = ""; }; - E81A653D283511BE00F55894 /* XPMonentsInteractiveViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsInteractiveViewController.h; sourceTree = ""; }; - E81A653E283511BE00F55894 /* XPMonentsInteractiveViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsInteractiveViewController.m; sourceTree = ""; }; - E81A65402835120200F55894 /* XPMonentsInteractivePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsInteractivePresenter.h; sourceTree = ""; }; - E81A65412835120200F55894 /* XPMonentsInteractivePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsInteractivePresenter.m; sourceTree = ""; }; E81A65432835121000F55894 /* XPMonentsInteractiveProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsInteractiveProtocol.h; sourceTree = ""; }; - E81A6544283519CA00F55894 /* MomentsTopicModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MomentsTopicModel.h; sourceTree = ""; }; - E81A6545283519CA00F55894 /* MomentsTopicModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MomentsTopicModel.m; sourceTree = ""; }; - E81A654728351B9500F55894 /* XPMomentsRecommendHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsRecommendHeaderView.h; sourceTree = ""; }; - E81A654828351B9500F55894 /* XPMomentsRecommendHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsRecommendHeaderView.m; sourceTree = ""; }; - E81A654A28351D9900F55894 /* XPMonentsTopicCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicCollectionViewCell.h; sourceTree = ""; }; - E81A654B28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicCollectionViewCell.m; sourceTree = ""; }; - E81AF32627F1EE69003B9E43 /* XPRoomPKPanelUserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPanelUserView.h; sourceTree = ""; }; - E81AF32727F1EE69003B9E43 /* XPRoomPKPanelUserView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPanelUserView.m; sourceTree = ""; }; - E81C1B1927705F4B0020D1E4 /* XPArrangeMicProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPArrangeMicProtocol.h; sourceTree = ""; }; - E81C1B1A27705F6B0020D1E4 /* XPArrangeMicPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPArrangeMicPresenter.h; sourceTree = ""; }; - E81C1B1B27705F6B0020D1E4 /* XPArrangeMicPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPArrangeMicPresenter.m; sourceTree = ""; }; - E81C1B1D27705F7A0020D1E4 /* XPArrangeMicViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPArrangeMicViewController.h; sourceTree = ""; }; - E81C1B1E27705F7A0020D1E4 /* XPArrangeMicViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPArrangeMicViewController.m; sourceTree = ""; }; - E81C1B2027705F950020D1E4 /* Api+ArrangeMic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+ArrangeMic.h"; sourceTree = ""; }; - E81C1B2127705F950020D1E4 /* Api+ArrangeMic.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+ArrangeMic.m"; sourceTree = ""; }; - E81C1B242770663B0020D1E4 /* XPArrangeMicTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPArrangeMicTableViewCell.h; sourceTree = ""; }; - E81C1B252770663B0020D1E4 /* XPArrangeMicTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPArrangeMicTableViewCell.m; sourceTree = ""; }; - E81C1B27277069DD0020D1E4 /* XPArrangeMicEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPArrangeMicEmptyTableViewCell.h; sourceTree = ""; }; - E81C1B28277069DD0020D1E4 /* XPArrangeMicEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPArrangeMicEmptyTableViewCell.m; sourceTree = ""; }; - E81C1B2A27706E5C0020D1E4 /* ArrangeMicModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ArrangeMicModel.h; sourceTree = ""; }; - E81C1B2B27706E5C0020D1E4 /* ArrangeMicModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ArrangeMicModel.m; sourceTree = ""; }; - E81C1B2D277071670020D1E4 /* XPArrangeMicInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPArrangeMicInfoModel.h; sourceTree = ""; }; - E81C1B2E277071670020D1E4 /* XPArrangeMicInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPArrangeMicInfoModel.m; sourceTree = ""; }; E81C278826EAFAF60031E639 /* DESEncrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DESEncrypt.h; sourceTree = ""; }; E81C278926EAFAF60031E639 /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base64.m; sourceTree = ""; }; E81C278A26EAFAF60031E639 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = ""; }; @@ -3648,403 +656,21 @@ E81C27A126EF23370031E639 /* YUMINNNN.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YUMINNNN.h; sourceTree = ""; }; E81C27A926EF2D920031E639 /* ThirdUserInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ThirdUserInfo.h; sourceTree = ""; }; E81C27AA26EF2D920031E639 /* ThirdUserInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ThirdUserInfo.m; sourceTree = ""; }; - E81C27AC26EF39AB0031E639 /* AppDelegate+ThirdConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+ThirdConfig.h"; sourceTree = ""; }; - E81C27AD26EF39AB0031E639 /* AppDelegate+ThirdConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+ThirdConfig.m"; sourceTree = ""; }; - E81D587B271FBC3B003063FE /* RtcInterface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RtcInterface.h; sourceTree = ""; }; - E81D58802720082A003063FE /* MicroWaveView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroWaveView.h; sourceTree = ""; }; - E81D58812720082A003063FE /* MicroWaveView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroWaveView.m; sourceTree = ""; }; - E81DCCCB282B63B40039E5C5 /* XPMomentsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsViewController.h; sourceTree = ""; }; - E81DCCCC282B63B40039E5C5 /* XPMomentsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsViewController.m; sourceTree = ""; }; - E81DCCCE282B63FD0039E5C5 /* XPMomentsRecommendViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsRecommendViewController.h; sourceTree = ""; }; - E81DCCCF282B63FD0039E5C5 /* XPMomentsRecommendViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsRecommendViewController.m; sourceTree = ""; }; - E82107792987D4AB00DE7040 /* MessageFindNewGreetModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageFindNewGreetModel.h; sourceTree = ""; }; - E821077A2987D4AB00DE7040 /* MessageFindNewGreetModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageFindNewGreetModel.m; sourceTree = ""; }; - E821077C2987D67100DE7040 /* MessageRiskAlertModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageRiskAlertModel.h; sourceTree = ""; }; - E821077D2987D67100DE7040 /* MessageRiskAlertModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageRiskAlertModel.m; sourceTree = ""; }; - E821077F2987D7F300DE7040 /* MessageMonentsModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageMonentsModel.h; sourceTree = ""; }; - E82107802987D7F300DE7040 /* MessageMonentsModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageMonentsModel.m; sourceTree = ""; }; - E82107822987E35300DE7040 /* MessageMonentsAutoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageMonentsAutoModel.h; sourceTree = ""; }; - E82107832987E35300DE7040 /* MessageMonentsAutoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageMonentsAutoModel.m; sourceTree = ""; }; - E82107852987E49100DE7040 /* MessageRedPacketModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageRedPacketModel.h; sourceTree = ""; }; - E82107862987E49100DE7040 /* MessageRedPacketModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageRedPacketModel.m; sourceTree = ""; }; E82109AB26F1C8A000FC3319 /* CountDownHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CountDownHelper.h; sourceTree = ""; }; E82109AC26F1C8A000FC3319 /* CountDownHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CountDownHelper.m; sourceTree = ""; }; E82109AE26F1D83500FC3319 /* LoginBindPhonePresent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginBindPhonePresent.h; sourceTree = ""; }; E82109AF26F1D83500FC3319 /* LoginBindPhonePresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginBindPhonePresent.m; sourceTree = ""; }; - E82325F0274E2DE6003A3332 /* XPUserCardViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPUserCardViewController.h; sourceTree = ""; }; - E82325F1274E2DE6003A3332 /* XPUserCardViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPUserCardViewController.m; sourceTree = ""; }; - E82325F3274E2E09003A3332 /* XPUserCardPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPUserCardPresenter.h; sourceTree = ""; }; - E82325F4274E2E09003A3332 /* XPUserCardPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPUserCardPresenter.m; sourceTree = ""; }; - E82325F6274E2E27003A3332 /* XPUserCardProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPUserCardProtocol.h; sourceTree = ""; }; - E82325F7274E2E42003A3332 /* Api+UserCard.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+UserCard.h"; sourceTree = ""; }; - E82325F8274E2E42003A3332 /* Api+UserCard.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+UserCard.m"; sourceTree = ""; }; - E82325FA274E4735003A3332 /* XPUserCardItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPUserCardItemModel.h; sourceTree = ""; }; - E82325FB274E4735003A3332 /* XPUserCardItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPUserCardItemModel.m; sourceTree = ""; }; - E82325FE274E48EA003A3332 /* XPUserCardItemCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPUserCardItemCollectionViewCell.h; sourceTree = ""; }; - E82325FF274E48EA003A3332 /* XPUserCardItemCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPUserCardItemCollectionViewCell.m; sourceTree = ""; }; - E8232601274E4AA0003A3332 /* ThemeColor+UserCard.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ThemeColor+UserCard.h"; sourceTree = ""; }; - E8232602274E4AA0003A3332 /* ThemeColor+UserCard.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "ThemeColor+UserCard.m"; sourceTree = ""; }; - E824543326F57D6E00BE8163 /* XPLoginVerifBindPhoneViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginVerifBindPhoneViewController.h; sourceTree = ""; }; - E824543426F57D6E00BE8163 /* XPLoginVerifBindPhoneViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginVerifBindPhoneViewController.m; sourceTree = ""; }; - E824543626F5820A00BE8163 /* XPLoginVerifBindPhonePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginVerifBindPhonePresenter.h; sourceTree = ""; }; - E824543726F5820A00BE8163 /* XPLoginVerifBindPhonePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginVerifBindPhonePresenter.m; sourceTree = ""; }; E824543926F5822800BE8163 /* XPLoginVerifBindPhoneProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginVerifBindPhoneProtocol.h; sourceTree = ""; }; - E824543B26F58C3A00BE8163 /* XPLoginBindSuccessView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginBindSuccessView.h; sourceTree = ""; }; - E824543C26F58C3A00BE8163 /* XPLoginBindSuccessView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginBindSuccessView.m; sourceTree = ""; }; - E824543E26F58F9400BE8163 /* XPMinePayPwdViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMinePayPwdViewController.h; sourceTree = ""; }; - E824543F26F58F9400BE8163 /* XPMinePayPwdViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMinePayPwdViewController.m; sourceTree = ""; }; - E824544126F58FCE00BE8163 /* XPMinePayPwdInputView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMinePayPwdInputView.h; sourceTree = ""; }; - E824544226F58FCE00BE8163 /* XPMinePayPwdInputView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMinePayPwdInputView.m; sourceTree = ""; }; - E824544426F5934600BE8163 /* XPMinePayPwdPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMinePayPwdPresenter.h; sourceTree = ""; }; - E824544526F5934600BE8163 /* XPMinePayPwdPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMinePayPwdPresenter.m; sourceTree = ""; }; E824544726F5940600BE8163 /* XPMinePayPwdProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMinePayPwdProtocol.h; sourceTree = ""; }; - E824544926F5BBB800BE8163 /* XPMineModifPayPwdViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineModifPayPwdViewController.h; sourceTree = ""; }; - E824544A26F5BBB800BE8163 /* XPMineModifPayPwdViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineModifPayPwdViewController.m; sourceTree = ""; }; - E824544C26F5BC1A00BE8163 /* XPMineModifPayPwdView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineModifPayPwdView.h; sourceTree = ""; }; - E824544D26F5BC1A00BE8163 /* XPMineModifPayPwdView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineModifPayPwdView.m; sourceTree = ""; }; - E824544F26F5CE6E00BE8163 /* XPMineModifPayPwdPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineModifPayPwdPresenter.h; sourceTree = ""; }; - E824545026F5CE6E00BE8163 /* XPMineModifPayPwdPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineModifPayPwdPresenter.m; sourceTree = ""; }; E824545226F5CE9C00BE8163 /* XPMineModifPayProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineModifPayProtocol.h; sourceTree = ""; }; - E824545726F5E65900BE8163 /* XPMineVerifIdentityView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineVerifIdentityView.h; sourceTree = ""; }; - E824545826F5E65900BE8163 /* XPMineVerifIdentityView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineVerifIdentityView.m; sourceTree = ""; }; - E824545A26F5EEBA00BE8163 /* XPMineVerifIdentityPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineVerifIdentityPresenter.h; sourceTree = ""; }; - E824545B26F5EEBA00BE8163 /* XPMineVerifIdentityPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineVerifIdentityPresenter.m; sourceTree = ""; }; E824545D26F5EEFD00BE8163 /* XPMineVerifIdentityProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineVerifIdentityProtocol.h; sourceTree = ""; }; - E824545F26F5F4E400BE8163 /* XPMineResetPayPwdViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineResetPayPwdViewController.h; sourceTree = ""; }; - E824546026F5F4E400BE8163 /* XPMineResetPayPwdViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineResetPayPwdViewController.m; sourceTree = ""; }; - E824546226F5FF1C00BE8163 /* XPMineResetPayPasswordPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineResetPayPasswordPresenter.h; sourceTree = ""; }; - E824546326F5FF1C00BE8163 /* XPMineResetPayPasswordPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineResetPayPasswordPresenter.m; sourceTree = ""; }; E824546526F5FF5100BE8163 /* XPMineResetPayPasswordProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineResetPayPasswordProtocol.h; sourceTree = ""; }; - E8252FEC27687DF1002B3164 /* ActivityInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ActivityInfoModel.h; sourceTree = ""; }; - E8252FED27687DF1002B3164 /* ActivityInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ActivityInfoModel.m; sourceTree = ""; }; - E82D5C6B276ADCE700858D6D /* XPMineDressEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDressEmptyTableViewCell.h; sourceTree = ""; }; - E82D5C6C276ADCE700858D6D /* XPMineDressEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDressEmptyTableViewCell.m; sourceTree = ""; }; - E82D5C6E276AE60000858D6D /* HeadwearModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HeadwearModel.h; sourceTree = ""; }; - E82D5C6F276AE60000858D6D /* HeadwearModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HeadwearModel.m; sourceTree = ""; }; - E82D5C71276AE94800858D6D /* CarModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CarModel.h; sourceTree = ""; }; - E82D5C72276AE94800858D6D /* CarModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CarModel.m; sourceTree = ""; }; - E82D5C74276AEB5100858D6D /* NameplateModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NameplateModel.h; sourceTree = ""; }; - E82D5C75276AEB5100858D6D /* NameplateModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NameplateModel.m; sourceTree = ""; }; - E82D5C78276B25D100858D6D /* SpriteSheetImageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpriteSheetImageManager.h; sourceTree = ""; }; - E82D5C79276B25D100858D6D /* SpriteSheetImageManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpriteSheetImageManager.m; sourceTree = ""; }; - E82D5C7B276B343300858D6D /* YYAnimatedImageView+ImageShow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YYAnimatedImageView+ImageShow.h"; sourceTree = ""; }; - E82D5C7C276B343300858D6D /* YYAnimatedImageView+ImageShow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "YYAnimatedImageView+ImageShow.m"; sourceTree = ""; }; - E82E75042828E76400C25EF7 /* XPCoreDataManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPCoreDataManager.h; sourceTree = ""; }; - E82E75052828E76400C25EF7 /* XPCoreDataManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPCoreDataManager.m; sourceTree = ""; }; - E82EE0F6272FDDFA00D15DC1 /* UserPrivacyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserPrivacyView.h; sourceTree = ""; }; - E82EE0F7272FDDFA00D15DC1 /* UserPrivacyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserPrivacyView.m; sourceTree = ""; }; - E833ED0B274FAD1C00A2463B /* XPKickUserModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPKickUserModel.h; sourceTree = ""; }; - E833ED0C274FAD1C00A2463B /* XPKickUserModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPKickUserModel.m; sourceTree = ""; }; - E83645662A40A2DC00E0DBE4 /* XPSkillCardPlayerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPSkillCardPlayerManager.h; sourceTree = ""; }; - E83645672A40A2DC00E0DBE4 /* XPSkillCardPlayerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPSkillCardPlayerManager.m; sourceTree = ""; }; - E83645692A40A33300E0DBE4 /* MineSkillCardListInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MineSkillCardListInfoModel.m; sourceTree = ""; }; - E836456A2A40A33300E0DBE4 /* MineSkillCardListInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MineSkillCardListInfoModel.h; sourceTree = ""; }; E83645A62A40AF5400E0DBE4 /* NSBundle+Localizable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSBundle+Localizable.h"; sourceTree = ""; }; E83645A72A40AF5400E0DBE4 /* NSBundle+Localizable.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSBundle+Localizable.m"; sourceTree = ""; }; - E8383695298A598D00112E1C /* MessageTipsModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageTipsModel.h; sourceTree = ""; }; - E8383696298A598D00112E1C /* MessageTipsModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageTipsModel.m; sourceTree = ""; }; - E8383698298A59C100112E1C /* MessageTipsView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageTipsView.h; sourceTree = ""; }; - E8383699298A59C100112E1C /* MessageTipsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageTipsView.m; sourceTree = ""; }; - E839532B276A030F00CF2F24 /* XPMineDressUpListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDressUpListViewController.h; sourceTree = ""; }; - E839532C276A030F00CF2F24 /* XPMineDressUpListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDressUpListViewController.m; sourceTree = ""; }; - E839532F276A03AE00CF2F24 /* Api+DressUp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+DressUp.h"; sourceTree = ""; }; - E8395330276A03AE00CF2F24 /* Api+DressUp.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+DressUp.m"; sourceTree = ""; }; - E8395332276A03C300CF2F24 /* XPMineDressUpPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDressUpPresenter.h; sourceTree = ""; }; - E8395333276A03C300CF2F24 /* XPMineDressUpPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDressUpPresenter.m; sourceTree = ""; }; - E8395335276A03E200CF2F24 /* XPMineDressUpProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDressUpProtocol.h; sourceTree = ""; }; - E8395337276A0CC100CF2F24 /* XPMineHeadwearTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineHeadwearTableViewCell.h; sourceTree = ""; }; - E8395338276A0CC100CF2F24 /* XPMineHeadwearTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineHeadwearTableViewCell.m; sourceTree = ""; }; - E839533A276A0CCD00CF2F24 /* XPMineCarTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineCarTableViewCell.h; sourceTree = ""; }; - E839533B276A0CCD00CF2F24 /* XPMineCarTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineCarTableViewCell.m; sourceTree = ""; }; - E839533D276A0CDB00CF2F24 /* XPMineNameplateTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineNameplateTableViewCell.h; sourceTree = ""; }; - E839533E276A0CDB00CF2F24 /* XPMineNameplateTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineNameplateTableViewCell.m; sourceTree = ""; }; - E8398069290288660084BFC8 /* XPMessageInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMessageInfoModel.h; sourceTree = ""; }; - E839806A290288660084BFC8 /* XPMessageInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMessageInfoModel.m; sourceTree = ""; }; - E83ABEF4280E9AD800322EE4 /* MessageContentUnSupportView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentUnSupportView.h; sourceTree = ""; }; - E83ABEF5280E9AD800322EE4 /* MessageContentUnSupportView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentUnSupportView.m; sourceTree = ""; }; - E83ABEF7280EAF3F00322EE4 /* MessageContentOpenLiveView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentOpenLiveView.h; sourceTree = ""; }; - E83ABEF8280EAF3F00322EE4 /* MessageContentOpenLiveView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentOpenLiveView.m; sourceTree = ""; }; - E83ABEFB280EB5E200322EE4 /* ContentOpenLiveInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContentOpenLiveInfoModel.h; sourceTree = ""; }; - E83ABEFC280EB5E200322EE4 /* ContentOpenLiveInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ContentOpenLiveInfoModel.m; sourceTree = ""; }; - E83ABEFE280EC45700322EE4 /* MessageContentApplicationShareView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentApplicationShareView.h; sourceTree = ""; }; - E83ABEFF280EC45700322EE4 /* MessageContentApplicationShareView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentApplicationShareView.m; sourceTree = ""; }; - E83ABF01280EC90C00322EE4 /* ContentApplicationShareModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContentApplicationShareModel.h; sourceTree = ""; }; - E83ABF02280EC90C00322EE4 /* ContentApplicationShareModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ContentApplicationShareModel.m; sourceTree = ""; }; - E83ABF04280EDE2B00322EE4 /* MessageContentLevelUpgradeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentLevelUpgradeView.h; sourceTree = ""; }; - E83ABF05280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentLevelUpgradeView.m; sourceTree = ""; }; - E83DB47827462C4500D8CBD1 /* XPGiftBigPrizeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftBigPrizeModel.h; sourceTree = ""; }; - E83DB47927462C4500D8CBD1 /* XPGiftBigPrizeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftBigPrizeModel.m; sourceTree = ""; }; - E83DB47F274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftBannerUserInfoModel.h; sourceTree = ""; }; - E83DB480274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftBannerUserInfoModel.m; sourceTree = ""; }; - E83DB4822746661800D8CBD1 /* XPRoomGiftBroadcastView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomGiftBroadcastView.h; sourceTree = ""; }; - E83DB4832746661800D8CBD1 /* XPRoomGiftBroadcastView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomGiftBroadcastView.m; sourceTree = ""; }; - E8412F9427795E34006E1101 /* XPRoomInviteFansView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomInviteFansView.h; sourceTree = ""; }; - E8412F9527795E34006E1101 /* XPRoomInviteFansView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomInviteFansView.m; sourceTree = ""; }; - E8412F9727799249006E1101 /* InviteFansModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InviteFansModel.h; sourceTree = ""; }; - E8412F9827799249006E1101 /* InviteFansModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InviteFansModel.m; sourceTree = ""; }; - E8412FA02779BE8F006E1101 /* XPRoomSettingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSettingViewController.h; sourceTree = ""; }; - E8412FA12779BE8F006E1101 /* XPRoomSettingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSettingViewController.m; sourceTree = ""; }; - E8412FA42779BED1006E1101 /* XPRoomSettingTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSettingTableViewCell.h; sourceTree = ""; }; - E8412FA52779BED1006E1101 /* XPRoomSettingTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSettingTableViewCell.m; sourceTree = ""; }; - E8412FA72779C2ED006E1101 /* XPRoomSettingItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSettingItemModel.h; sourceTree = ""; }; - E8412FA82779C2ED006E1101 /* XPRoomSettingItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSettingItemModel.m; sourceTree = ""; }; - E8412FAD2779CB2D006E1101 /* XPRoomSettingProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSettingProtocol.h; sourceTree = ""; }; - E8412FAE2779CB4D006E1101 /* XPRoomSettingPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSettingPresenter.h; sourceTree = ""; }; - E8412FAF2779CB4D006E1101 /* XPRoomSettingPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSettingPresenter.m; sourceTree = ""; }; - E8412FB12779E285006E1101 /* Api+RoomSetting.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+RoomSetting.h"; sourceTree = ""; }; - E8412FB22779E285006E1101 /* Api+RoomSetting.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+RoomSetting.m"; sourceTree = ""; }; - E84150BD27747BD300A7F548 /* Api+FirstRecharge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+FirstRecharge.h"; sourceTree = ""; }; - E84150BE27747BD300A7F548 /* Api+FirstRecharge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+FirstRecharge.m"; sourceTree = ""; }; - E841ED5F280FB0BD00904808 /* ContentLevelUpgradeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContentLevelUpgradeModel.h; sourceTree = ""; }; - E841ED60280FB0BD00904808 /* ContentLevelUpgradeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ContentLevelUpgradeModel.m; sourceTree = ""; }; - E84843AD27F59E7E0050D365 /* XPRoomPKResultView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKResultView.h; sourceTree = ""; }; - E84843AE27F59E7E0050D365 /* XPRoomPKResultView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKResultView.m; sourceTree = ""; }; - E84843B027F5A0740050D365 /* XPRomPKResultTitleLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRomPKResultTitleLabel.h; sourceTree = ""; }; - E84843B127F5A0740050D365 /* XPRomPKResultTitleLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRomPKResultTitleLabel.m; sourceTree = ""; }; - E84A2E802A527DF800D6AF8A /* XPIncomeRecordGoldDetailsVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPIncomeRecordGoldDetailsVC.h; sourceTree = ""; }; - E84A2E812A527DF800D6AF8A /* XPIncomeRecordVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPIncomeRecordVC.m; sourceTree = ""; }; - E84A2E822A527DF800D6AF8A /* XPExchangeDiamondsVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPExchangeDiamondsVC.m; sourceTree = ""; }; - E84A2E842A527DF800D6AF8A /* XPIncomeRecordGoldDetailsVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPIncomeRecordGoldDetailsVC.m; sourceTree = ""; }; - E84A2E862A527DF800D6AF8A /* XPIncomeRecordVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPIncomeRecordVC.h; sourceTree = ""; }; - E84A2E882A527DF800D6AF8A /* XPExchangeDiamondsVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPExchangeDiamondsVC.h; sourceTree = ""; }; - E84A2E902A527EBF00D6AF8A /* XPIncomeRecordProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPIncomeRecordProtocol.h; sourceTree = ""; }; - E84A2E912A527EC700D6AF8A /* XPIncomeRecordPresent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPIncomeRecordPresent.m; sourceTree = ""; }; - E84A2E922A527EC700D6AF8A /* XPIncomeRecordPresent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPIncomeRecordPresent.h; sourceTree = ""; }; - E84A2E942A5280F900D6AF8A /* XPExchangeDiamondsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPExchangeDiamondsView.m; sourceTree = ""; }; - E84A2E952A5280F900D6AF8A /* XPExchangeDiamondsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPExchangeDiamondsView.h; sourceTree = ""; }; - E84A2E972A52817E00D6AF8A /* XPIncomeRecordView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPIncomeRecordView.h; sourceTree = ""; }; - E84A2E982A52817E00D6AF8A /* XPIncomeRecordView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPIncomeRecordView.m; sourceTree = ""; }; - E84A2E9A2A52823900D6AF8A /* XPTextField.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPTextField.h; sourceTree = ""; }; - E84A2E9B2A52823900D6AF8A /* XPTextField.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPTextField.m; sourceTree = ""; }; - E84A2E9D2A5287D200D6AF8A /* XPIncomeRecordGoldDetailsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPIncomeRecordGoldDetailsView.m; sourceTree = ""; }; - E84A2E9E2A5287D200D6AF8A /* XPIncomeRecordGoldDetailsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPIncomeRecordGoldDetailsView.h; sourceTree = ""; }; - E84A2EA02A52883000D6AF8A /* XPIncomeRecordGoldDetailsTimeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPIncomeRecordGoldDetailsTimeView.m; sourceTree = ""; }; - E84A2EA12A52883000D6AF8A /* XPIncomeRecordGoldDetailsTimeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPIncomeRecordGoldDetailsTimeView.h; sourceTree = ""; }; - E84A2EA32A5288CB00D6AF8A /* XPGoldDetailsChooseRoomView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGoldDetailsChooseRoomView.h; sourceTree = ""; }; - E84A2EA42A5288CB00D6AF8A /* XPGoldDetailsChooseRoomView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGoldDetailsChooseRoomView.m; sourceTree = ""; }; - E84A2EA62A5288FD00D6AF8A /* XPGoldDetailsChooseRoomCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGoldDetailsChooseRoomCell.h; sourceTree = ""; }; - E84A2EA72A5288FD00D6AF8A /* XPGoldDetailsChooseRoomCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGoldDetailsChooseRoomCell.m; sourceTree = ""; }; - E84A2EA92A528A4100D6AF8A /* XPIncomeRecordGoldDetailsPickViewView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPIncomeRecordGoldDetailsPickViewView.m; sourceTree = ""; }; - E84A2EAA2A528A4100D6AF8A /* XPIncomeRecordGoldDetailsPickViewView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPIncomeRecordGoldDetailsPickViewView.h; sourceTree = ""; }; - E84B0E3D2727EDF6008818C6 /* XPRoomMessageTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessageTableViewCell.h; sourceTree = ""; }; - E84B0E3E2727EDF6008818C6 /* XPRoomMessageTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMessageTableViewCell.m; sourceTree = ""; }; - E84B0E402727EE0A008818C6 /* XPRoomMessageHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessageHeaderView.h; sourceTree = ""; }; - E84B0E412727EE0A008818C6 /* XPRoomMessageHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMessageHeaderView.m; sourceTree = ""; }; - E84B0E442727EF9D008818C6 /* XPRoomMessageParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessageParser.h; sourceTree = ""; }; - E84B0E452727EF9D008818C6 /* XPRoomMessageParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMessageParser.m; sourceTree = ""; }; - E84B0E4927280289008818C6 /* XPRoomMessageConstant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessageConstant.h; sourceTree = ""; }; - E84BF7C8277AF79D00EF8877 /* XPRoomSettingTagCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSettingTagCell.h; sourceTree = ""; }; - E84BF7C9277AF79D00EF8877 /* XPRoomSettingTagCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSettingTagCell.m; sourceTree = ""; }; - E84BF7CF277BFCDD00EF8877 /* RoomTagModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomTagModel.h; sourceTree = ""; }; - E84BF7D0277BFCDD00EF8877 /* RoomTagModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomTagModel.m; sourceTree = ""; }; - E84BF7D2277C383700EF8877 /* XPRoomSettingInputView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSettingInputView.h; sourceTree = ""; }; - E84BF7D3277C383700EF8877 /* XPRoomSettingInputView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSettingInputView.m; sourceTree = ""; }; - E84BF7D5277C6E2100EF8877 /* XPRoomRoleViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRoleViewController.h; sourceTree = ""; }; - E84BF7D6277C6E2100EF8877 /* XPRoomRoleViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomRoleViewController.m; sourceTree = ""; }; - E84BF7D8277C72AC00EF8877 /* XPRoomRoleTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRoleTableViewCell.h; sourceTree = ""; }; - E84BF7D9277C72AC00EF8877 /* XPRoomRoleTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomRoleTableViewCell.m; sourceTree = ""; }; - E84BF7DB277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRoleEmptyTableViewCell.h; sourceTree = ""; }; - E84BF7DC277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomRoleEmptyTableViewCell.m; sourceTree = ""; }; - E84BF7DE277C869A00EF8877 /* XPRoomOnLineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomOnLineViewController.h; sourceTree = ""; }; - E84BF7DF277C869A00EF8877 /* XPRoomOnLineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomOnLineViewController.m; sourceTree = ""; }; - E84CBCDF28436D3C00D43221 /* XPMineContactViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineContactViewController.h; sourceTree = ""; }; - E84CBCE028436D3C00D43221 /* XPMineContactViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineContactViewController.m; sourceTree = ""; }; - E84CBCE2284372D800D43221 /* XPRoomHalfMessageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomHalfMessageView.h; sourceTree = ""; }; - E84CBCE3284372D800D43221 /* XPRoomHalfMessageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomHalfMessageView.m; sourceTree = ""; }; - E84CBCE52843807400D43221 /* XPMineFriendPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFriendPresenter.h; sourceTree = ""; }; - E84CBCE62843807400D43221 /* XPMineFriendPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFriendPresenter.m; sourceTree = ""; }; E84CBCE8284380B300D43221 /* XPMineFriendProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFriendProtocol.h; sourceTree = ""; }; - E852D739286317F0001465ED /* XPMomentsDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsDetailViewController.h; sourceTree = ""; }; - E852D73A286317F0001465ED /* XPMomentsDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsDetailViewController.m; sourceTree = ""; }; - E852D73C28631C18001465ED /* XPMonentsCommentTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsCommentTableViewCell.h; sourceTree = ""; }; - E852D73D28631C18001465ED /* XPMonentsCommentTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsCommentTableViewCell.m; sourceTree = ""; }; - E852D73F2863249F001465ED /* XPMonentsReplyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsReplyTableViewCell.h; sourceTree = ""; }; - E852D7402863249F001465ED /* XPMonentsReplyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsReplyTableViewCell.m; sourceTree = ""; }; - E852D74228633A08001465ED /* MonentsCommentModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MonentsCommentModel.h; sourceTree = ""; }; - E852D74328633A08001465ED /* MonentsCommentModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MonentsCommentModel.m; sourceTree = ""; }; - E852D74528633E92001465ED /* MonentsCommentReplyModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MonentsCommentReplyModel.h; sourceTree = ""; }; - E852D74628633E92001465ED /* MonentsCommentReplyModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MonentsCommentReplyModel.m; sourceTree = ""; }; - E85410332864155A005CFD9F /* XPMonentDetailPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentDetailPresenter.h; sourceTree = ""; }; - E85410342864155A005CFD9F /* XPMonentDetailPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentDetailPresenter.m; sourceTree = ""; }; E8541036286443D8005CFD9F /* XPMonentsDetailProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsDetailProtocol.h; sourceTree = ""; }; - E854103728646A00005CFD9F /* XPMonentsReplyMoreTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsReplyMoreTableViewCell.h; sourceTree = ""; }; - E854103828646A00005CFD9F /* XPMonentsReplyMoreTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsReplyMoreTableViewCell.m; sourceTree = ""; }; E8555159280559FE005F293F /* NSDate+DateUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSDate+DateUtils.h"; sourceTree = ""; }; E855515A280559FE005F293F /* NSDate+DateUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDate+DateUtils.m"; sourceTree = ""; }; - E85E3FA528B7A6F000268DC8 /* MessageContentMonentsView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentMonentsView.h; sourceTree = ""; }; - E85E3FA628B7A6F000268DC8 /* MessageContentMonentsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentMonentsView.m; sourceTree = ""; }; - E85E7A3D2A4EB0D200B6D00A /* XPGuildSearchPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildSearchPresenter.h; sourceTree = ""; }; - E85E7A3E2A4EB0D200B6D00A /* XPGuildPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildPresenter.h; sourceTree = ""; }; - E85E7A402A4EB0D200B6D00A /* XPSuperAdminSetPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPSuperAdminSetPresenter.m; sourceTree = ""; }; - E85E7A412A4EB0D200B6D00A /* XPSuperAdminManagerRoomPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPSuperAdminManagerRoomPresenter.m; sourceTree = ""; }; - E85E7A422A4EB0D200B6D00A /* XPSuperAdminSetPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPSuperAdminSetPresenter.h; sourceTree = ""; }; - E85E7A432A4EB0D200B6D00A /* XPSuperAdminManagerRoomPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPSuperAdminManagerRoomPresenter.h; sourceTree = ""; }; - E85E7A452A4EB0D200B6D00A /* XPGuildIncomePresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildIncomePresenter.m; sourceTree = ""; }; - E85E7A462A4EB0D200B6D00A /* XPGuildIncomeDetailPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildIncomeDetailPresenter.m; sourceTree = ""; }; - E85E7A472A4EB0D200B6D00A /* XPGuildIncomePresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildIncomePresenter.h; sourceTree = ""; }; - E85E7A482A4EB0D200B6D00A /* XPGuildIncomeDetailPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildIncomeDetailPresenter.h; sourceTree = ""; }; - E85E7A492A4EB0D200B6D00A /* XPClanPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPClanPresenter.m; sourceTree = ""; }; - E85E7A4A2A4EB0D200B6D00A /* XPGuildSearchPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildSearchPresenter.m; sourceTree = ""; }; - E85E7A4B2A4EB0D200B6D00A /* XPGuildPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildPresenter.m; sourceTree = ""; }; - E85E7A4D2A4EB0D200B6D00A /* XPMineManagerSetPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineManagerSetPresenter.m; sourceTree = ""; }; - E85E7A4E2A4EB0D200B6D00A /* XPGuildRemoveMemberPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildRemoveMemberPresenter.m; sourceTree = ""; }; - E85E7A4F2A4EB0D200B6D00A /* XPGuildMangerListPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildMangerListPresenter.h; sourceTree = ""; }; - E85E7A502A4EB0D200B6D00A /* XPGuildManagerPerPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildManagerPerPresenter.m; sourceTree = ""; }; - E85E7A512A4EB0D200B6D00A /* XPGuildSetNamePresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildSetNamePresenter.m; sourceTree = ""; }; - E85E7A522A4EB0D200B6D00A /* XPMineManagerSetPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineManagerSetPresenter.h; sourceTree = ""; }; - E85E7A532A4EB0D200B6D00A /* XPGuildMangerListPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildMangerListPresenter.m; sourceTree = ""; }; - E85E7A542A4EB0D200B6D00A /* XPGuildRemoveMemberPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildRemoveMemberPresenter.h; sourceTree = ""; }; - E85E7A552A4EB0D200B6D00A /* XPGuildSetNamePresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildSetNamePresenter.h; sourceTree = ""; }; - E85E7A562A4EB0D200B6D00A /* XPGuildManagerPerPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildManagerPerPresenter.h; sourceTree = ""; }; - E85E7A572A4EB0D200B6D00A /* XPClanPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPClanPresenter.h; sourceTree = ""; }; - E85E7A592A4EB0D200B6D00A /* XPClanProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPClanProtocol.h; sourceTree = ""; }; - E85E7A5B2A4EB0D200B6D00A /* XPSuperAdminSetProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPSuperAdminSetProtocol.h; sourceTree = ""; }; - E85E7A5C2A4EB0D200B6D00A /* XPSuperAdminManagerRoomProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPSuperAdminManagerRoomProtocol.h; sourceTree = ""; }; - E85E7A5E2A4EB0D200B6D00A /* XPGuildIncomeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildIncomeProtocol.h; sourceTree = ""; }; - E85E7A5F2A4EB0D200B6D00A /* XPGuildIncomeDetailProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildIncomeDetailProtocol.h; sourceTree = ""; }; - E85E7A602A4EB0D200B6D00A /* XPGuildSearchProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildSearchProtocol.h; sourceTree = ""; }; - E85E7A612A4EB0D200B6D00A /* XPGuildProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildProtocol.h; sourceTree = ""; }; - E85E7A632A4EB0D200B6D00A /* XPGuildSetManagerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildSetManagerProtocol.h; sourceTree = ""; }; - E85E7A642A4EB0D200B6D00A /* XPGuildManagerPerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildManagerPerProtocol.h; sourceTree = ""; }; - E85E7A652A4EB0D200B6D00A /* XPGuildRemoveMemberProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildRemoveMemberProtocol.h; sourceTree = ""; }; - E85E7A662A4EB0D200B6D00A /* XPGuildSetNameProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildSetNameProtocol.h; sourceTree = ""; }; - E85E7A672A4EB0D200B6D00A /* XPGuildManagerListProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildManagerListProtocol.h; sourceTree = ""; }; - E85E7A692A4EB0D200B6D00A /* GuildAuthModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuildAuthModel.h; sourceTree = ""; }; - E85E7A6A2A4EB0D200B6D00A /* ClanInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClanInfoModel.h; sourceTree = ""; }; - E85E7A6B2A4EB0D200B6D00A /* ClanDetailInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClanDetailInfoModel.h; sourceTree = ""; }; - E85E7A6C2A4EB0D200B6D00A /* ClanMemberDetailInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClanMemberDetailInfoModel.h; sourceTree = ""; }; - E85E7A6D2A4EB0D200B6D00A /* GuildInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuildInfoModel.h; sourceTree = ""; }; - E85E7A6F2A4EB0D200B6D00A /* GuildRoomInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuildRoomInfoModel.h; sourceTree = ""; }; - E85E7A702A4EB0D200B6D00A /* GuildSuperAdminInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuildSuperAdminInfoModel.m; sourceTree = ""; }; - E85E7A712A4EB0D200B6D00A /* GuildSearchSuperAdminModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuildSearchSuperAdminModel.m; sourceTree = ""; }; - E85E7A722A4EB0D200B6D00A /* GuildRoomInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuildRoomInfoModel.m; sourceTree = ""; }; - E85E7A732A4EB0D200B6D00A /* GuildSuperAdminInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuildSuperAdminInfoModel.h; sourceTree = ""; }; - E85E7A742A4EB0D200B6D00A /* GuildSearchSuperAdminModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuildSearchSuperAdminModel.h; sourceTree = ""; }; - E85E7A762A4EB0D200B6D00A /* GuildIncomeRecordModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuildIncomeRecordModel.h; sourceTree = ""; }; - E85E7A772A4EB0D200B6D00A /* GuildIncomeDetailModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuildIncomeDetailModel.m; sourceTree = ""; }; - E85E7A782A4EB0D200B6D00A /* GuildPersonIncomeRecordModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuildPersonIncomeRecordModel.m; sourceTree = ""; }; - E85E7A792A4EB0D200B6D00A /* GuildIncomeRecordModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuildIncomeRecordModel.m; sourceTree = ""; }; - E85E7A7A2A4EB0D200B6D00A /* GuildIncomeDetailModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuildIncomeDetailModel.h; sourceTree = ""; }; - E85E7A7B2A4EB0D200B6D00A /* GuildPersonIncomeRecordModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuildPersonIncomeRecordModel.h; sourceTree = ""; }; - E85E7A7C2A4EB0D200B6D00A /* GuildSearchUserInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuildSearchUserInfoModel.m; sourceTree = ""; }; - E85E7A7D2A4EB0D200B6D00A /* GuildMessageModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuildMessageModel.h; sourceTree = ""; }; - E85E7A7E2A4EB0D200B6D00A /* GuildAuthModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuildAuthModel.m; sourceTree = ""; }; - E85E7A7F2A4EB0D200B6D00A /* ClanInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClanInfoModel.m; sourceTree = ""; }; - E85E7A802A4EB0D200B6D00A /* GuildInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuildInfoModel.m; sourceTree = ""; }; - E85E7A812A4EB0D200B6D00A /* ClanMemberDetailInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClanMemberDetailInfoModel.m; sourceTree = ""; }; - E85E7A822A4EB0D200B6D00A /* ClanDetailInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClanDetailInfoModel.m; sourceTree = ""; }; - E85E7A832A4EB0D200B6D00A /* GuildMessageModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuildMessageModel.m; sourceTree = ""; }; - E85E7A842A4EB0D200B6D00A /* GuildSearchUserInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuildSearchUserInfoModel.h; sourceTree = ""; }; - E85E7A872A4EB0D200B6D00A /* XPMineGuildIncomeStatisViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildIncomeStatisViewController.h; sourceTree = ""; }; - E85E7A882A4EB0D200B6D00A /* XPMineGoldIncomeRecordVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGoldIncomeRecordVC.m; sourceTree = ""; }; - E85E7A8A2A4EB0D200B6D00A /* XPMineMainIncomeStatisViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineMainIncomeStatisViewController.m; sourceTree = ""; }; - E85E7A8B2A4EB0D200B6D00A /* XPMineHallAnchorIncomeStatisViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineHallAnchorIncomeStatisViewController.m; sourceTree = ""; }; - E85E7A8C2A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineClanIncomeStatisViewController.m; sourceTree = ""; }; - E85E7A8D2A4EB0D200B6D00A /* XPNewMineGuildIncomeRecordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNewMineGuildIncomeRecordViewController.h; sourceTree = ""; }; - E85E7A8E2A4EB0D200B6D00A /* XPMineGuildIncomeDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildIncomeDetailViewController.h; sourceTree = ""; }; - E85E7A8F2A4EB0D200B6D00A /* XPMineGuildIncomeRecordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildIncomeRecordViewController.h; sourceTree = ""; }; - E85E7A902A4EB0D200B6D00A /* XPMineMainIncomeStatisViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineMainIncomeStatisViewController.h; sourceTree = ""; }; - E85E7A922A4EB0D200B6D00A /* XPMineGoldIncomeRecordVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGoldIncomeRecordVC.h; sourceTree = ""; }; - E85E7A932A4EB0D200B6D00A /* XPMineGuildIncomeStatisViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildIncomeStatisViewController.m; sourceTree = ""; }; - E85E7A942A4EB0D200B6D00A /* XPMineGuildIncomeDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildIncomeDetailViewController.m; sourceTree = ""; }; - E85E7A952A4EB0D200B6D00A /* XPNewMineGuildIncomeRecordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNewMineGuildIncomeRecordViewController.m; sourceTree = ""; }; - E85E7A962A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineClanIncomeStatisViewController.h; sourceTree = ""; }; - E85E7A972A4EB0D200B6D00A /* XPMineHallAnchorIncomeStatisViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineHallAnchorIncomeStatisViewController.h; sourceTree = ""; }; - E85E7A982A4EB0D200B6D00A /* XPMineGuildIncomeRecordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildIncomeRecordViewController.m; sourceTree = ""; }; - E85E7A992A4EB0D200B6D00A /* XPMineGuildSearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildSearchViewController.h; sourceTree = ""; }; - E85E7A9A2A4EB0D200B6D00A /* XPMineClanViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineClanViewController.m; sourceTree = ""; }; - E85E7A9C2A4EB0D200B6D00A /* XPMineGuildSuperAdminSetViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildSuperAdminSetViewController.h; sourceTree = ""; }; - E85E7A9D2A4EB0D200B6D00A /* XPMineGuildChooseManagerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildChooseManagerViewController.h; sourceTree = ""; }; - E85E7A9E2A4EB0D200B6D00A /* XPMineGuildSuperAdminSetViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildSuperAdminSetViewController.m; sourceTree = ""; }; - E85E7A9F2A4EB0D200B6D00A /* XPMineGuildChooseManagerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildChooseManagerViewController.m; sourceTree = ""; }; - E85E7AA02A4EB0D200B6D00A /* XPMineGuildViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildViewController.m; sourceTree = ""; }; - E85E7AA12A4EB0D200B6D00A /* XPMineGuildListVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildListVC.h; sourceTree = ""; }; - E85E7AA22A4EB0D200B6D00A /* XPMineExchangeAuthorityVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineExchangeAuthorityVC.h; sourceTree = ""; }; - E85E7AA42A4EB0D200B6D00A /* XPGuildSuperAdminMenuView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildSuperAdminMenuView.m; sourceTree = ""; }; - E85E7AA52A4EB0D200B6D00A /* XPGuildHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildHeaderView.h; sourceTree = ""; }; - E85E7AA62A4EB0D200B6D00A /* XPClanMenuView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPClanMenuView.m; sourceTree = ""; }; - E85E7AA72A4EB0D200B6D00A /* XPGuildTimePickView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildTimePickView.m; sourceTree = ""; }; - E85E7AA82A4EB0D200B6D00A /* XPClanSectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPClanSectionView.h; sourceTree = ""; }; - E85E7AA92A4EB0D200B6D00A /* XPGuildIncomeHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildIncomeHeaderView.h; sourceTree = ""; }; - E85E7AAA2A4EB0D200B6D00A /* XPGoldIncomeSectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGoldIncomeSectionView.h; sourceTree = ""; }; - E85E7AAB2A4EB0D200B6D00A /* XPGuildSearchNavView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildSearchNavView.h; sourceTree = ""; }; - E85E7AAC2A4EB0D200B6D00A /* XPGuildTimeMonthPickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildTimeMonthPickerView.m; sourceTree = ""; }; - E85E7AAD2A4EB0D200B6D00A /* XPNewGuildIncomeHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNewGuildIncomeHeaderView.h; sourceTree = ""; }; - E85E7AAE2A4EB0D200B6D00A /* XPNewGuildTimePickView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNewGuildTimePickView.m; sourceTree = ""; }; - E85E7AAF2A4EB0D200B6D00A /* XPGuildIncomeSectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildIncomeSectionView.h; sourceTree = ""; }; - E85E7AB02A4EB0D200B6D00A /* XPGuildAnchorIncomeSectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildAnchorIncomeSectionView.h; sourceTree = ""; }; - E85E7AB12A4EB0D200B6D00A /* XPClanSectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPClanSectionView.m; sourceTree = ""; }; - E85E7AB22A4EB0D200B6D00A /* XPGuildHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildHeaderView.m; sourceTree = ""; }; - E85E7AB32A4EB0D200B6D00A /* XPClanMenuView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPClanMenuView.h; sourceTree = ""; }; - E85E7AB42A4EB0D200B6D00A /* XPGuildTimePickView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildTimePickView.h; sourceTree = ""; }; - E85E7AB52A4EB0D200B6D00A /* XPGuildSuperAdminMenuView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildSuperAdminMenuView.h; sourceTree = ""; }; - E85E7AB62A4EB0D200B6D00A /* XPGuildTimeMonthPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildTimeMonthPickerView.h; sourceTree = ""; }; - E85E7AB72A4EB0D200B6D00A /* XPGuildSearchNavView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildSearchNavView.m; sourceTree = ""; }; - E85E7AB82A4EB0D200B6D00A /* XPGoldIncomeSectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGoldIncomeSectionView.m; sourceTree = ""; }; - E85E7AB92A4EB0D200B6D00A /* XPGuildIncomeHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildIncomeHeaderView.m; sourceTree = ""; }; - E85E7ABA2A4EB0D200B6D00A /* XPNewGuildTimePickView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNewGuildTimePickView.h; sourceTree = ""; }; - E85E7ABB2A4EB0D200B6D00A /* XPNewGuildIncomeHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNewGuildIncomeHeaderView.m; sourceTree = ""; }; - E85E7ABC2A4EB0D200B6D00A /* XPGuildAnchorIncomeSectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildAnchorIncomeSectionView.m; sourceTree = ""; }; - E85E7ABD2A4EB0D200B6D00A /* XPGuildIncomeSectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildIncomeSectionView.m; sourceTree = ""; }; - E85E7ABE2A4EB0D200B6D00A /* XPMineMainGuildListVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineMainGuildListVC.m; sourceTree = ""; }; - E85E7AC02A4EB0D200B6D00A /* XPClanMemberTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPClanMemberTableViewCell.m; sourceTree = ""; }; - E85E7AC12A4EB0D200B6D00A /* XPClanRoomCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPClanRoomCollectionViewCell.m; sourceTree = ""; }; - E85E7AC32A4EB0D200B6D00A /* XPMineGuildListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildListCell.m; sourceTree = ""; }; - E85E7AC42A4EB0D200B6D00A /* XPMineGuildListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildListCell.h; sourceTree = ""; }; - E85E7AC52A4EB0D200B6D00A /* XPMineGuildSearchMemberTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildSearchMemberTableViewCell.m; sourceTree = ""; }; - E85E7AC62A4EB0D200B6D00A /* XPMineGuildEmptyTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildEmptyTableViewCell.h; sourceTree = ""; }; - E85E7AC72A4EB0D200B6D00A /* XPGuildEmptyCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildEmptyCollectionViewCell.h; sourceTree = ""; }; - E85E7AC92A4EB0D200B6D00A /* XPGuildSuperAdminRoomCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildSuperAdminRoomCollectionViewCell.h; sourceTree = ""; }; - E85E7ACA2A4EB0D200B6D00A /* XPGuildChooseManagerRoomTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildChooseManagerRoomTableViewCell.m; sourceTree = ""; }; - E85E7ACB2A4EB0D200B6D00A /* XPGuildSuperAdminSetTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildSuperAdminSetTableViewCell.m; sourceTree = ""; }; - E85E7ACC2A4EB0D200B6D00A /* XPGuildSearchSuperAdminTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildSearchSuperAdminTableViewCell.m; sourceTree = ""; }; - E85E7ACD2A4EB0D200B6D00A /* XPGuildSuperAdminRoomCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildSuperAdminRoomCollectionViewCell.m; sourceTree = ""; }; - E85E7ACE2A4EB0D200B6D00A /* XPGuildChooseManagerRoomTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildChooseManagerRoomTableViewCell.h; sourceTree = ""; }; - E85E7ACF2A4EB0D200B6D00A /* XPGuildSearchSuperAdminTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildSearchSuperAdminTableViewCell.h; sourceTree = ""; }; - E85E7AD02A4EB0D200B6D00A /* XPGuildSuperAdminSetTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildSuperAdminSetTableViewCell.h; sourceTree = ""; }; - E85E7AD22A4EB0D200B6D00A /* XPGuildIncomeDetailCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildIncomeDetailCollectionViewCell.m; sourceTree = ""; }; - E85E7AD32A4EB0D200B6D00A /* XPGuildIncomeRecordTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildIncomeRecordTableViewCell.m; sourceTree = ""; }; - E85E7AD42A4EB0D200B6D00A /* XPGuildPersonIncomeTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildPersonIncomeTableViewCell.h; sourceTree = ""; }; - E85E7AD52A4EB0D200B6D00A /* XPGuildSingleRoomIncomeTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildSingleRoomIncomeTableViewCell.m; sourceTree = ""; }; - E85E7AD62A4EB0D200B6D00A /* XPGuildIncomeDetailCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildIncomeDetailCollectionViewCell.h; sourceTree = ""; }; - E85E7AD72A4EB0D200B6D00A /* XPGuildPersonIncomeTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildPersonIncomeTableViewCell.m; sourceTree = ""; }; - E85E7AD82A4EB0D200B6D00A /* XPGuildIncomeRecordTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildIncomeRecordTableViewCell.h; sourceTree = ""; }; - E85E7AD92A4EB0D200B6D00A /* XPGuildSingleRoomIncomeTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPGuildSingleRoomIncomeTableViewCell.h; sourceTree = ""; }; - E85E7ADA2A4EB0D200B6D00A /* XPClanRoomCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPClanRoomCollectionViewCell.h; sourceTree = ""; }; - E85E7ADB2A4EB0D200B6D00A /* XPClanMemberTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPClanMemberTableViewCell.h; sourceTree = ""; }; - E85E7ADC2A4EB0D200B6D00A /* XPMineGuildEmptyTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildEmptyTableViewCell.m; sourceTree = ""; }; - E85E7ADD2A4EB0D200B6D00A /* XPMineGuildSearchMemberTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildSearchMemberTableViewCell.h; sourceTree = ""; }; - E85E7ADF2A4EB0D200B6D00A /* XPMineExchangeAuthorityCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineExchangeAuthorityCell.h; sourceTree = ""; }; - E85E7AE02A4EB0D200B6D00A /* XPMinePromptWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMinePromptWindow.m; sourceTree = ""; }; - E85E7AE12A4EB0D200B6D00A /* XPMineExchangeAuthorityFooderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineExchangeAuthorityFooderView.h; sourceTree = ""; }; - E85E7AE22A4EB0D200B6D00A /* XPMineExchangeAuthorityHeadView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineExchangeAuthorityHeadView.m; sourceTree = ""; }; - E85E7AE32A4EB0D200B6D00A /* XPMineExchangeAuthorityCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineExchangeAuthorityCell.m; sourceTree = ""; }; - E85E7AE42A4EB0D200B6D00A /* XPMinePromptWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMinePromptWindow.h; sourceTree = ""; }; - E85E7AE52A4EB0D200B6D00A /* XPMineExchangeAuthorityHeadView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineExchangeAuthorityHeadView.h; sourceTree = ""; }; - E85E7AE62A4EB0D200B6D00A /* XPMineExchangeAuthorityFooderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineExchangeAuthorityFooderView.m; sourceTree = ""; }; - E85E7AE72A4EB0D200B6D00A /* XPGuildEmptyCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGuildEmptyCollectionViewCell.m; sourceTree = ""; }; - E85E7AE92A4EB0D200B6D00A /* XPMineGuildManagerPerTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildManagerPerTableViewCell.m; sourceTree = ""; }; - E85E7AEB2A4EB0D200B6D00A /* XPMineGuildManagerPerTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildManagerPerTableViewCell.h; sourceTree = ""; }; - E85E7AED2A4EB0D200B6D00A /* XPMineGuildSearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildSearchViewController.m; sourceTree = ""; }; - E85E7AEE2A4EB0D200B6D00A /* XPMineClanViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineClanViewController.h; sourceTree = ""; }; - E85E7AF02A4EB0D200B6D00A /* XPMineGuildSetNameViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildSetNameViewController.h; sourceTree = ""; }; - E85E7AF12A4EB0D200B6D00A /* XPMineMangerListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineMangerListViewController.m; sourceTree = ""; }; - E85E7AF22A4EB0D200B6D00A /* XPMineGuildRemoveMemberViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildRemoveMemberViewController.h; sourceTree = ""; }; - E85E7AF32A4EB0D200B6D00A /* XPMineGuildManagerSetViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildManagerSetViewController.m; sourceTree = ""; }; - E85E7AF42A4EB0D200B6D00A /* XPMineGuildManagerPerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildManagerPerViewController.m; sourceTree = ""; }; - E85E7AF52A4EB0D200B6D00A /* XPMineGuildManagerSetViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildManagerSetViewController.h; sourceTree = ""; }; - E85E7AF62A4EB0D200B6D00A /* XPMineGuildRemoveMemberViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildRemoveMemberViewController.m; sourceTree = ""; }; - E85E7AF72A4EB0D200B6D00A /* XPMineMangerListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineMangerListViewController.h; sourceTree = ""; }; - E85E7AF82A4EB0D200B6D00A /* XPMineGuildSetNameViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildSetNameViewController.m; sourceTree = ""; }; - E85E7AF92A4EB0D200B6D00A /* XPMineGuildManagerPerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildManagerPerViewController.h; sourceTree = ""; }; - E85E7AFA2A4EB0D200B6D00A /* XPMineExchangeAuthorityVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineExchangeAuthorityVC.m; sourceTree = ""; }; - E85E7AFB2A4EB0D200B6D00A /* XPMineMainGuildListVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineMainGuildListVC.h; sourceTree = ""; }; - E85E7AFC2A4EB0D200B6D00A /* XPMineGuildViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildViewController.h; sourceTree = ""; }; - E85E7AFD2A4EB0D200B6D00A /* XPMineGuildListVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildListVC.m; sourceTree = ""; }; - E85E7AFF2A4EB0D200B6D00A /* Api+Guild.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+Guild.m"; sourceTree = ""; }; - E85E7B002A4EB0D200B6D00A /* Api+Guild.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+Guild.h"; sourceTree = ""; }; - E85E7B522A4EB4AD00B6D00A /* XPMineGuildListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGuildListModel.h; sourceTree = ""; }; - E85E7B532A4EB4AD00B6D00A /* XPMineGuildListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildListModel.m; sourceTree = ""; }; E85E7B592A4EC35A00B6D00A /* XPIncomeRecordGoldDetailsModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPIncomeRecordGoldDetailsModel.h; sourceTree = ""; }; E85E7B5A2A4EC35A00B6D00A /* XPExchangeDiamondsModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPExchangeDiamondsModel.h; sourceTree = ""; }; E85E7B5B2A4EC35A00B6D00A /* XPIncomeRecordModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPIncomeRecordModel.h; sourceTree = ""; }; @@ -4053,704 +679,61 @@ E85E7B602A4EC35A00B6D00A /* XPIncomeRecordGoldDetailsModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPIncomeRecordGoldDetailsModel.m; sourceTree = ""; }; E85E7B692A4EC39400B6D00A /* XPMineExchangeAuthorityModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineExchangeAuthorityModel.m; sourceTree = ""; }; E85E7B6A2A4EC39400B6D00A /* XPMineExchangeAuthorityModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineExchangeAuthorityModel.h; sourceTree = ""; }; - E85E7B6C2A4EC4AE00B6D00A /* XPMineGuildPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildPresenter.m; sourceTree = ""; }; - E85E7B6D2A4EC4AE00B6D00A /* XPMineGuildPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildPresenter.h; sourceTree = ""; }; - E85E7B6F2A4EC4B700B6D00A /* XPMineGuildProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildProtocol.h; sourceTree = ""; }; - E85E7B702A4EC93C00B6D00A /* XPMineGiveDiamondSearchView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondSearchView.h; sourceTree = ""; }; - E85E7B712A4EC93C00B6D00A /* XPMineGiveDiamondSearchView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondSearchView.m; sourceTree = ""; }; - E85E7B752A4EC99200B6D00A /* XPMineGiveDiamondPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondPresenter.m; sourceTree = ""; }; - E85E7B762A4EC99200B6D00A /* XPMineGiveDiamondPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondPresenter.h; sourceTree = ""; }; - E85E7B782A4EC99200B6D00A /* XPMineGiveDiamondProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondProtocol.h; sourceTree = ""; }; - E85E7B7A2A4EC99200B6D00A /* XPMineGiveDiamondDetailsModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondDetailsModel.m; sourceTree = ""; }; - E85E7B7B2A4EC99200B6D00A /* XPMineGiveDiamondModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondModel.m; sourceTree = ""; }; - E85E7B7C2A4EC99200B6D00A /* XPMineGiveDiamondSearchModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondSearchModel.h; sourceTree = ""; }; - E85E7B7D2A4EC99200B6D00A /* XPMineGiveDiamondDetailsModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondDetailsModel.h; sourceTree = ""; }; - E85E7B7E2A4EC99200B6D00A /* XPMineGiveDiamondModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondModel.h; sourceTree = ""; }; - E85E7B7F2A4EC99200B6D00A /* XPMineGiveDiamondSearchModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondSearchModel.m; sourceTree = ""; }; - E85E7B812A4EC99200B6D00A /* XPMineGiveDiamondVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondVC.h; sourceTree = ""; }; - E85E7B822A4EC99200B6D00A /* XPMineChooseGiveDiamondVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineChooseGiveDiamondVC.h; sourceTree = ""; }; - E85E7B832A4EC99200B6D00A /* XPMineGiveDiamondDetailsVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondDetailsVC.m; sourceTree = ""; }; - E85E7B842A4EC99200B6D00A /* XPMineGiveDiamondDetailsVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondDetailsVC.h; sourceTree = ""; }; - E85E7B862A4EC99200B6D00A /* XPMineGiveDiamondCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondCell.m; sourceTree = ""; }; - E85E7B872A4EC99200B6D00A /* XPMineChooseGiveDiamondView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineChooseGiveDiamondView.m; sourceTree = ""; }; - E85E7B882A4EC99200B6D00A /* XPMineConfirmGiveDiamondView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineConfirmGiveDiamondView.h; sourceTree = ""; }; - E85E7B892A4EC99200B6D00A /* XPMineGiveDiamondSearchView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondSearchView.m; sourceTree = ""; }; - E85E7B8A2A4EC99200B6D00A /* XPMineGiveDiamondPasswordView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondPasswordView.m; sourceTree = ""; }; - E85E7B8B2A4EC99200B6D00A /* XPMineChooseGiveGiftViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineChooseGiveGiftViewCell.h; sourceTree = ""; }; - E85E7B8C2A4EC99200B6D00A /* XPMineGiveDiamondDetailsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondDetailsView.h; sourceTree = ""; }; - E85E7B8D2A4EC99200B6D00A /* XPMineChooseGiveGiftView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineChooseGiveGiftView.h; sourceTree = ""; }; - E85E7B8E2A4EC99200B6D00A /* XPMineGiveDiamondPwdView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondPwdView.h; sourceTree = ""; }; - E85E7B8F2A4EC99200B6D00A /* XPMineGiveDiamondDetailsCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondDetailsCell.h; sourceTree = ""; }; - E85E7B902A4EC99200B6D00A /* XPMineChooseGiveDiamondView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineChooseGiveDiamondView.h; sourceTree = ""; }; - E85E7B912A4EC99200B6D00A /* XPMineGiveDiamondCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondCell.h; sourceTree = ""; }; - E85E7B922A4EC99200B6D00A /* XPMineChooseGiveGiftViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineChooseGiveGiftViewCell.m; sourceTree = ""; }; - E85E7B932A4EC99200B6D00A /* XPMineGiveDiamondPasswordView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondPasswordView.h; sourceTree = ""; }; - E85E7B942A4EC99200B6D00A /* XPMineGiveDiamondSearchView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGiveDiamondSearchView.h; sourceTree = ""; }; - E85E7B952A4EC99200B6D00A /* XPMineConfirmGiveDiamondView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineConfirmGiveDiamondView.m; sourceTree = ""; }; - E85E7B962A4EC99200B6D00A /* XPMineGiveDiamondPwdView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondPwdView.m; sourceTree = ""; }; - E85E7B972A4EC99200B6D00A /* XPMineChooseGiveGiftView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineChooseGiveGiftView.m; sourceTree = ""; }; - E85E7B982A4EC99200B6D00A /* XPMineGiveDiamondDetailsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondDetailsView.m; sourceTree = ""; }; - E85E7B992A4EC99200B6D00A /* XPMineGiveDiamondDetailsCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondDetailsCell.m; sourceTree = ""; }; - E85E7B9A2A4EC99200B6D00A /* XPMineGiveDiamondVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGiveDiamondVC.m; sourceTree = ""; }; - E85E7B9B2A4EC99200B6D00A /* XPMineChooseGiveDiamondVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineChooseGiveDiamondVC.m; sourceTree = ""; }; - E85E7B9D2A4EC99200B6D00A /* Api+GiveDiamond.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+GiveDiamond.h"; sourceTree = ""; }; - E85E7B9E2A4EC99200B6D00A /* Api+GiveDiamond.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+GiveDiamond.m"; sourceTree = ""; }; - E85E7BB12A4ED45300B6D00A /* XPPageControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPPageControl.h; sourceTree = ""; }; - E85E7BB22A4ED45300B6D00A /* XPPageControl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPPageControl.m; sourceTree = ""; }; - E85E7BB42A4ED59900B6D00A /* XPIncomeRecordGoldDetailsCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPIncomeRecordGoldDetailsCell.h; sourceTree = ""; }; - E85E7BB52A4ED59900B6D00A /* XPIncomeRecordGoldDetailsCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPIncomeRecordGoldDetailsCell.m; sourceTree = ""; }; - E85E7BB72A4ED89E00B6D00A /* XPIncomeRecordGoldDetailsHeadView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPIncomeRecordGoldDetailsHeadView.h; sourceTree = ""; }; - E85E7BB82A4ED89F00B6D00A /* XPIncomeRecordGoldDetailsHeadView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPIncomeRecordGoldDetailsHeadView.m; sourceTree = ""; }; - E85E7BBA2A4EE70B00B6D00A /* XPMineTheGuildCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineTheGuildCell.h; sourceTree = ""; }; - E85E7BBB2A4EE70B00B6D00A /* XPMineTheGuildCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineTheGuildCell.m; sourceTree = ""; }; - E85E7BBD2A4EE7AC00B6D00A /* XPMinePersonalCenterCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMinePersonalCenterCell.h; sourceTree = ""; }; - E85E7BBE2A4EE7AC00B6D00A /* XPMinePersonalCenterCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMinePersonalCenterCell.m; sourceTree = ""; }; - E85E7BC02A4EE82300B6D00A /* XPMineListCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineListCell.h; sourceTree = ""; }; - E85E7BC12A4EE82300B6D00A /* XPMineListCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineListCell.m; sourceTree = ""; }; - E86507E3281A7D4D006951B0 /* MessageContentTweetView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentTweetView.h; sourceTree = ""; }; - E86507E4281A7D4D006951B0 /* MessageContentTweetView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentTweetView.m; sourceTree = ""; }; - E86507E6281A8212006951B0 /* ContentTweetModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContentTweetModel.h; sourceTree = ""; }; - E86507E7281A8212006951B0 /* ContentTweetModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ContentTweetModel.m; sourceTree = ""; }; - E86507E9281A88A9006951B0 /* MessageContentSkillCardView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentSkillCardView.h; sourceTree = ""; }; - E86507EA281A88A9006951B0 /* MessageContentSkillCardView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentSkillCardView.m; sourceTree = ""; }; - E865964F2701A1C000846EBD /* StatisticsService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StatisticsService.h; sourceTree = ""; }; - E86596502701A1C000846EBD /* StatisticsService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatisticsService.m; sourceTree = ""; }; - E86596522701A55500846EBD /* StatisticsServiceHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StatisticsServiceHelper.h; sourceTree = ""; }; - E86596532701A55500846EBD /* StatisticsServiceHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatisticsServiceHelper.m; sourceTree = ""; }; - E8659907273E800D00EE349D /* XPGiftCollectionViewFlowLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftCollectionViewFlowLayout.h; sourceTree = ""; }; - E8659908273E800D00EE349D /* XPGiftCollectionViewFlowLayout.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftCollectionViewFlowLayout.m; sourceTree = ""; }; - E8664ECE27E42238000171BA /* XPRoomPKTimePickerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKTimePickerView.h; sourceTree = ""; }; - E8664ECF27E42238000171BA /* XPRoomPKTimePickerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKTimePickerView.m; sourceTree = ""; }; - E8664ED127E4258A000171BA /* RoomPKTimeItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomPKTimeItemModel.h; sourceTree = ""; }; - E8664ED227E4258A000171BA /* RoomPKTimeItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomPKTimeItemModel.m; sourceTree = ""; }; - E8664ED427E434D5000171BA /* XPRoomPKRecordViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKRecordViewController.h; sourceTree = ""; }; - E8664ED527E434D5000171BA /* XPRoomPKRecordViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKRecordViewController.m; sourceTree = ""; }; - E8664ED727E4355C000171BA /* XPRoomPKRecordTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKRecordTableViewCell.h; sourceTree = ""; }; - E8664ED827E4355C000171BA /* XPRoomPKRecordTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKRecordTableViewCell.m; sourceTree = ""; }; - E8664EDA27E43632000171BA /* XPRoomPKEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKEmptyTableViewCell.h; sourceTree = ""; }; - E8664EDB27E43632000171BA /* XPRoomPKEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKEmptyTableViewCell.m; sourceTree = ""; }; - E8664EDD27E45EC7000171BA /* XPRoomPKRecordPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKRecordPresenter.h; sourceTree = ""; }; - E8664EDE27E45EC7000171BA /* XPRoomPKRecordPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKRecordPresenter.m; sourceTree = ""; }; - E8664EE027E45EE6000171BA /* XPRoomPKRecordProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKRecordProtocol.h; sourceTree = ""; }; - E8664EE127E47711000171BA /* XPRoomPKRecordNickView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKRecordNickView.h; sourceTree = ""; }; - E8664EE227E47711000171BA /* XPRoomPKRecordNickView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKRecordNickView.m; sourceTree = ""; }; - E8664EE427E482EF000171BA /* RoomPKTeamModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomPKTeamModel.h; sourceTree = ""; }; - E8664EE527E482EF000171BA /* RoomPKTeamModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomPKTeamModel.m; sourceTree = ""; }; - E866B6E32759F96F009B002A /* XPMiniRoomView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMiniRoomView.h; sourceTree = ""; }; - E866B6E42759F96F009B002A /* XPMiniRoomView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMiniRoomView.m; sourceTree = ""; }; - E8680716271967B00024F48F /* MicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroView.h; sourceTree = ""; }; - E8680717271967B00024F48F /* MicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroView.m; sourceTree = ""; }; - E86A16BD2856D4D5004228B8 /* XPSessionFindNewGreetListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionFindNewGreetListView.h; sourceTree = ""; }; - E86A16BE2856D4D5004228B8 /* XPSessionFindNewGreetListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionFindNewGreetListView.m; sourceTree = ""; }; - E86A16C02856D635004228B8 /* XPSessionFindNewGreetTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionFindNewGreetTableViewCell.h; sourceTree = ""; }; - E86A16C12856D635004228B8 /* XPSessionFindNewGreetTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionFindNewGreetTableViewCell.m; sourceTree = ""; }; - E86A16C32856DBEC004228B8 /* FindNewGreetListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FindNewGreetListModel.h; sourceTree = ""; }; - E86A16C42856DBEC004228B8 /* FindNewGreetListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FindNewGreetListModel.m; sourceTree = ""; }; - E86E79CB28A4E045006DAF48 /* MessageContentRiskAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentRiskAlertView.h; sourceTree = ""; }; - E86E79CC28A4E045006DAF48 /* MessageContentRiskAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentRiskAlertView.m; sourceTree = ""; }; - E86E79CE28A4E0B2006DAF48 /* ContentRistAlertModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContentRistAlertModel.h; sourceTree = ""; }; - E86E79CF28A4E0B2006DAF48 /* ContentRistAlertModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ContentRistAlertModel.m; sourceTree = ""; }; - E86E79D128A4E94E006DAF48 /* SessionRiskView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionRiskView.h; sourceTree = ""; }; - E86E79D228A4E94E006DAF48 /* SessionRiskView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionRiskView.m; sourceTree = ""; }; - E86E79D428A4EA0C006DAF48 /* SessionRiskCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionRiskCache.h; sourceTree = ""; }; - E86E79D528A4EA0C006DAF48 /* SessionRiskCache.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionRiskCache.m; sourceTree = ""; }; - E86F6183284F4E4800E8EC9A /* RoomHalfHourRankModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomHalfHourRankModel.h; sourceTree = ""; }; - E86F6184284F4E4800E8EC9A /* RoomHalfHourRankModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomHalfHourRankModel.m; sourceTree = ""; }; - E872309126E8D31500B90D4F /* LoginVerifCodeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginVerifCodeView.h; sourceTree = ""; }; - 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 = ""; }; - 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 = ""; }; - E873EB04280943ED0071030D /* XPMineUserInfoGiftWallPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoGiftWallPresenter.m; sourceTree = ""; }; E873EB06280944020071030D /* XPMineUserInfoGiftWallProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoGiftWallProtocol.h; sourceTree = ""; }; - E873EB07280960990071030D /* XPMineUserInfoVoiceCardView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoVoiceCardView.h; sourceTree = ""; }; - E873EB08280960990071030D /* XPMineUserInfoVoiceCardView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoVoiceCardView.m; sourceTree = ""; }; - E873EB0A2809850D0071030D /* MessageContentCustomView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentCustomView.h; sourceTree = ""; }; - E873EB0B2809850D0071030D /* MessageContentCustomView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentCustomView.m; sourceTree = ""; }; - E873EB0D28098D500071030D /* MessageContentGiftView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentGiftView.h; sourceTree = ""; }; - E873EB0E28098D500071030D /* MessageContentGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentGiftView.m; sourceTree = ""; }; - E874B88627215D39003954B9 /* MicroStateModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroStateModel.h; sourceTree = ""; }; - E874B88727215D39003954B9 /* MicroStateModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroStateModel.m; sourceTree = ""; }; - E874B88927215EAF003954B9 /* MicroQueueModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroQueueModel.h; sourceTree = ""; }; - E874B88A27215EAF003954B9 /* MicroQueueModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroQueueModel.m; sourceTree = ""; }; - E8751E5728A62A390056EF44 /* Api+Sailing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Sailing.h"; sourceTree = ""; }; - E8751E5828A62A390056EF44 /* Api+Sailing.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Sailing.m"; sourceTree = ""; }; - E8751E5A28A62A530056EF44 /* XPSailingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingViewController.h; sourceTree = ""; }; - E8751E5B28A62A530056EF44 /* XPSailingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingViewController.m; sourceTree = ""; }; - E8751E5D28A62A970056EF44 /* XPSailingPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingPresenter.h; sourceTree = ""; }; - E8751E5E28A62A970056EF44 /* XPSailingPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingPresenter.m; sourceTree = ""; }; - E8751E6028A62AA60056EF44 /* XPSailingProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingProtocol.h; sourceTree = ""; }; - E8751E6128A646400056EF44 /* XPSailingRankView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingRankView.h; sourceTree = ""; }; - E8751E6228A646400056EF44 /* XPSailingRankView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingRankView.m; sourceTree = ""; }; - E8751E6428A6465A0056EF44 /* XPSailingRankSubView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingRankSubView.h; sourceTree = ""; }; - E8751E6528A6465A0056EF44 /* XPSailingRankSubView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingRankSubView.m; sourceTree = ""; }; - E8751E6928A64C6E0056EF44 /* XPSailingRankTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingRankTableViewCell.h; sourceTree = ""; }; - E8751E6A28A64C6E0056EF44 /* XPSailingRankTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingRankTableViewCell.m; sourceTree = ""; }; - E8751E6C28A64F990056EF44 /* XPSailingEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingEmptyTableViewCell.h; sourceTree = ""; }; - E8751E6D28A64F990056EF44 /* XPSailingEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingEmptyTableViewCell.m; sourceTree = ""; }; - E8751E6F28A6541B0056EF44 /* RoomSailingRankModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomSailingRankModel.h; sourceTree = ""; }; - E8751E7028A6541B0056EF44 /* RoomSailingRankModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomSailingRankModel.m; sourceTree = ""; }; - E8751E7228A665BC0056EF44 /* RoomSailingInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomSailingInfoModel.h; sourceTree = ""; }; - E8751E7328A665BC0056EF44 /* RoomSailingInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomSailingInfoModel.m; sourceTree = ""; }; - E875A1B629755EE200AB1BBD /* SessionUserInfoTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionUserInfoTableViewCell.h; sourceTree = ""; }; - E875A1B729755EE200AB1BBD /* SessionUserInfoTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionUserInfoTableViewCell.m; sourceTree = ""; }; E875FA8527D619820086ED04 /* ClientDataModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ClientDataModel.h; sourceTree = ""; }; E875FA8627D619820086ED04 /* ClientDataModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ClientDataModel.m; sourceTree = ""; }; - E8778ADF2988B4C300CF139B /* MessageRevokeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageRevokeModel.h; sourceTree = ""; }; - E8778AE02988B4C300CF139B /* MessageRevokeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageRevokeModel.m; sourceTree = ""; }; - E8778AE22988B57B00CF139B /* MessageContentRevokeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentRevokeView.h; sourceTree = ""; }; - E8778AE32988B57B00CF139B /* MessageContentRevokeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentRevokeView.m; sourceTree = ""; }; - E8778AE52988C1E000CF139B /* XPSessionHelloEnterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionHelloEnterView.h; sourceTree = ""; }; - E8778AE62988C1E000CF139B /* XPSessionHelloEnterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionHelloEnterView.m; sourceTree = ""; }; - E8778AEE2988EF0600CF139B /* XPSessionSayHelloViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionSayHelloViewController.h; sourceTree = ""; }; - E8778AEF2988EF0600CF139B /* XPSessionSayHelloViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionSayHelloViewController.m; sourceTree = ""; }; - E8778AF32988EF2B00CF139B /* XPSessionSayHelloTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionSayHelloTableViewCell.h; sourceTree = ""; }; - E8778AF42988EF2B00CF139B /* XPSessionSayHelloTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionSayHelloTableViewCell.m; sourceTree = ""; }; - E8778AF62988F4E200CF139B /* XPSessionSayHelloHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionSayHelloHeaderView.h; sourceTree = ""; }; - E8778AF72988F4E200CF139B /* XPSessionSayHelloHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionSayHelloHeaderView.m; sourceTree = ""; }; - E8778AF92989034200CF139B /* XPSessionSayHelloEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionSayHelloEmptyTableViewCell.h; sourceTree = ""; }; - E8778AFA2989034200CF139B /* XPSessionSayHelloEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionSayHelloEmptyTableViewCell.m; sourceTree = ""; }; - E877A7E92783E24700EFACED /* DatingStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DatingStageView.h; sourceTree = ""; }; - E877A7EA2783E24700EFACED /* DatingStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DatingStageView.m; sourceTree = ""; }; - E877A7EC278428FB00EFACED /* MicroDatingProgressView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroDatingProgressView.h; sourceTree = ""; }; - E877A7ED278428FB00EFACED /* MicroDatingProgressView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroDatingProgressView.m; sourceTree = ""; }; - E87888F32738C30E00BF1D57 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; - E8788932273A53D700BF1D57 /* XPSendGiftView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSendGiftView.h; sourceTree = ""; }; - E8788933273A53D700BF1D57 /* XPSendGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSendGiftView.m; sourceTree = ""; }; - E878893A273A54C300BF1D57 /* Api+Gift.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Gift.h"; sourceTree = ""; }; - E878893B273A54C300BF1D57 /* Api+Gift.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Gift.m"; sourceTree = ""; }; - E878893D273A54F500BF1D57 /* XPGiftPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftPresenter.h; sourceTree = ""; }; - E878893E273A54F500BF1D57 /* XPGiftPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftPresenter.m; sourceTree = ""; }; - E8788940273A55AD00BF1D57 /* XPGiftUsersView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftUsersView.h; sourceTree = ""; }; - E8788941273A55AD00BF1D57 /* XPGiftUsersView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftUsersView.m; sourceTree = ""; }; - E8788943273A55C200BF1D57 /* XPGiftInfoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftInfoView.h; sourceTree = ""; }; - E8788944273A55C200BF1D57 /* XPGiftInfoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftInfoView.m; sourceTree = ""; }; - E8788946273A55D000BF1D57 /* XPGiftBarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftBarView.h; sourceTree = ""; }; - E8788947273A55D000BF1D57 /* XPGiftBarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftBarView.m; sourceTree = ""; }; - E878894A273A607C00BF1D57 /* XPGiftUserCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftUserCollectionViewCell.h; sourceTree = ""; }; - E878894B273A607C00BF1D57 /* XPGiftUserCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftUserCollectionViewCell.m; sourceTree = ""; }; - E878894D273A672200BF1D57 /* XPGiftProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftProtocol.h; sourceTree = ""; }; - E878894E273A699900BF1D57 /* ThemeColor+SendGift.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ThemeColor+SendGift.h"; sourceTree = ""; }; - E878894F273A699900BF1D57 /* ThemeColor+SendGift.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "ThemeColor+SendGift.m"; sourceTree = ""; }; - E878B8562835F0D300E22DCF /* MonentsInteractiveModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MonentsInteractiveModel.h; sourceTree = ""; }; - E878B8572835F0D300E22DCF /* MonentsInteractiveModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MonentsInteractiveModel.m; sourceTree = ""; }; - E878B8592835F3BF00E22DCF /* XPMonentsInteractiveTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsInteractiveTableViewCell.h; sourceTree = ""; }; - E878B85A2835F3BF00E22DCF /* XPMonentsInteractiveTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsInteractiveTableViewCell.m; sourceTree = ""; }; - E878B85C283640A500E22DCF /* MonentsUnReadModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MonentsUnReadModel.h; sourceTree = ""; }; - E878B85D283640A500E22DCF /* MonentsUnReadModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MonentsUnReadModel.m; sourceTree = ""; }; - E87A24EF272935920086A794 /* XPMessageRemoteExtModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMessageRemoteExtModel.h; sourceTree = ""; }; - E87A24F0272935920086A794 /* XPMessageRemoteExtModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMessageRemoteExtModel.m; sourceTree = ""; }; - E87A27012758BC81002DDC7A /* XPRoomSearchContainerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSearchContainerViewController.h; sourceTree = ""; }; - E87A27022758BC81002DDC7A /* XPRoomSearchContainerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSearchContainerViewController.m; sourceTree = ""; }; - E87AE7F7277AABE50037823A /* XPRoomTagListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTagListViewController.h; sourceTree = ""; }; - E87AE7F8277AABE50037823A /* XPRoomTagListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTagListViewController.m; sourceTree = ""; }; - E87AE7FA277AAC450037823A /* XPRoomTagPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTagPresenter.h; sourceTree = ""; }; - E87AE7FB277AAC450037823A /* XPRoomTagPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTagPresenter.m; sourceTree = ""; }; - E87AE7FD277AAC5A0037823A /* XPRoomTagProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTagProtocol.h; sourceTree = ""; }; - E87AE8BF284E184300CAFBB3 /* RoomNewUserGreetModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomNewUserGreetModel.h; sourceTree = ""; }; - E87AE8C0284E184300CAFBB3 /* RoomNewUserGreetModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomNewUserGreetModel.m; sourceTree = ""; }; - E87AE8C3284E1A8400CAFBB3 /* XPRoomNewUserGreetView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomNewUserGreetView.h; sourceTree = ""; }; - E87AE8C4284E1A8400CAFBB3 /* XPRoomNewUserGreetView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomNewUserGreetView.m; sourceTree = ""; }; - E87C0A9B27D9986700CB2241 /* XPRoomFaceCollectionFlowLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomFaceCollectionFlowLayout.h; sourceTree = ""; }; - E87C0A9C27D9986700CB2241 /* XPRoomFaceCollectionFlowLayout.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomFaceCollectionFlowLayout.m; sourceTree = ""; }; - E87C0A9E27D9DE6400CB2241 /* RoomFaceSendInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomFaceSendInfoModel.h; sourceTree = ""; }; - E87C0A9F27D9DE6400CB2241 /* RoomFaceSendInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomFaceSendInfoModel.m; sourceTree = ""; }; - E87C54BC2823CC5B0051AA11 /* XPMineResetLoginPwdPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineResetLoginPwdPresenter.h; sourceTree = ""; }; - E87C54BD2823CC5B0051AA11 /* XPMineResetLoginPwdPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineResetLoginPwdPresenter.m; sourceTree = ""; }; E87C54BF2823CC940051AA11 /* XPMineResetLoginPwdProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineResetLoginPwdProtocol.h; sourceTree = ""; }; - E87DF4BD2A42C8C1009C1185 /* HomeTagModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeTagModel.h; sourceTree = ""; }; - E87DF4BE2A42C8C1009C1185 /* HomeTagModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeTagModel.m; sourceTree = ""; }; - E87DF4C02A42C900009C1185 /* XPNoteView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNoteView.h; sourceTree = ""; }; - E87DF4C12A42C900009C1185 /* XPNoteView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNoteView.m; sourceTree = ""; }; - E87DF4CA2A42C960009C1185 /* HomeBannerInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeBannerInfoModel.h; sourceTree = ""; }; - E87DF4CB2A42C960009C1185 /* HomeBannerInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeBannerInfoModel.m; sourceTree = ""; }; - E87DF4D22A42C9B1009C1185 /* HomeRecommendRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeRecommendRoomModel.h; sourceTree = ""; }; - E87DF4D32A42C9B1009C1185 /* HomeRecommendRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeRecommendRoomModel.m; sourceTree = ""; }; - E87DF4D52A42C9C3009C1185 /* HomePlayRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomePlayRoomModel.m; sourceTree = ""; }; - E87DF4D62A42C9C3009C1185 /* HomePlayRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomePlayRoomModel.h; sourceTree = ""; }; - E87DF4D82A42C9D8009C1185 /* HomeCollectRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeCollectRoomModel.m; sourceTree = ""; }; - E87DF4D92A42C9D9009C1185 /* HomeCollectRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeCollectRoomModel.h; sourceTree = ""; }; - E87DF4DB2A42CA12009C1185 /* HomeSearchResultModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeSearchResultModel.m; sourceTree = ""; }; - E87DF4DC2A42CA12009C1185 /* HomeSearchResultModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeSearchResultModel.h; sourceTree = ""; }; - E87DF4E22A42CAD2009C1185 /* XPHomeSearchNavView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeSearchNavView.m; sourceTree = ""; }; - E87DF4E32A42CAD2009C1185 /* XPHomeSearchNavView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeSearchNavView.h; sourceTree = ""; }; - E87DF4E52A42CAFF009C1185 /* XPHomePresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomePresenter.m; sourceTree = ""; }; - E87DF4E62A42CB00009C1185 /* XPHomePresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomePresenter.h; sourceTree = ""; }; - E87DF4E82A42CB24009C1185 /* XPHomeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeProtocol.h; sourceTree = ""; }; - E87DF4EA2A42CB60009C1185 /* XPSearchListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPSearchListTableViewCell.m; sourceTree = ""; }; - E87DF4EB2A42CB60009C1185 /* XPSearchListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPSearchListTableViewCell.h; sourceTree = ""; }; - E87DF4ED2A42CB90009C1185 /* XPHomeCollectRoomTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeCollectRoomTableViewCell.h; sourceTree = ""; }; - E87DF4EE2A42CB90009C1185 /* XPHomeCollectRoomTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeCollectRoomTableViewCell.m; sourceTree = ""; }; - E87DF4F02A42CBEC009C1185 /* XPHomeUserView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeUserView.m; sourceTree = ""; }; - E87DF4F12A42CBEC009C1185 /* XPHomeUserView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeUserView.h; sourceTree = ""; }; - E87DF4F32A42CC49009C1185 /* HomeMenuInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeMenuInfoModel.h; sourceTree = ""; }; - E87DF4F42A42CC49009C1185 /* HomeMenuInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeMenuInfoModel.m; sourceTree = ""; }; - E87DF4F62A42CCAB009C1185 /* XPHomeSearchRelateView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeSearchRelateView.m; sourceTree = ""; }; - E87DF4F72A42CCAB009C1185 /* XPHomeSearchRelateView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeSearchRelateView.h; sourceTree = ""; }; - E87DF4F92A42CCDD009C1185 /* XPHomeRedommendCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeRedommendCollectionViewCell.h; sourceTree = ""; }; - E87DF4FA2A42CCDE009C1185 /* XPHomeRedommendCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeRedommendCollectionViewCell.m; sourceTree = ""; }; - E87DF4FC2A42CD7D009C1185 /* XPRoomSearchRecommendHeadView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomSearchRecommendHeadView.m; sourceTree = ""; }; - E87DF4FD2A42CD7E009C1185 /* XPRoomSearchRecommendHeadView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomSearchRecommendHeadView.h; sourceTree = ""; }; - E87DF4FF2A42CDB4009C1185 /* XPHomeRecommendProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeRecommendProtocol.h; sourceTree = ""; }; - E87DF5002A42CDF1009C1185 /* XPHomeAttentionCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeAttentionCollectionViewCell.h; sourceTree = ""; }; - E87DF5012A42CDF1009C1185 /* XPHomeAttentionCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeAttentionCollectionViewCell.m; sourceTree = ""; }; - E87DF5032A42CE21009C1185 /* XPHomeSearchRecordCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeSearchRecordCell.h; sourceTree = ""; }; - E87DF5042A42CE21009C1185 /* XPHomeSearchRecordCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeSearchRecordCell.m; sourceTree = ""; }; - E87DF5062A42CE79009C1185 /* XPInRoomRecordPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPInRoomRecordPresenter.h; sourceTree = ""; }; - E87DF5072A42CE79009C1185 /* XPInRoomRecordPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPInRoomRecordPresenter.m; sourceTree = ""; }; - E87DF5092A42CEC9009C1185 /* HomeEveryOneSearchModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeEveryOneSearchModel.h; sourceTree = ""; }; - E87DF50A2A42CEC9009C1185 /* HomeEveryOneSearchModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeEveryOneSearchModel.m; sourceTree = ""; }; - E87DF50C2A42CF15009C1185 /* HomeLiveRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeLiveRoomModel.h; sourceTree = ""; }; - E87DF50D2A42CF15009C1185 /* HomeLiveRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeLiveRoomModel.m; sourceTree = ""; }; - E87E545229AA05EA00EBE52B /* XPFootPrintNavView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPFootPrintNavView.h; sourceTree = ""; }; - E87E545329AA05EA00EBE52B /* XPFootPrintNavView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPFootPrintNavView.m; sourceTree = ""; }; - E87E62552A3F560A002F68C9 /* XPHomePartyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomePartyViewController.h; sourceTree = ""; }; - E87E62562A3F560A002F68C9 /* XPHomePartyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomePartyViewController.m; sourceTree = ""; }; - E87E625B2A3F5622002F68C9 /* XPNewHomeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeViewController.h; sourceTree = ""; }; - E87E625C2A3F5622002F68C9 /* XPNewHomeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeViewController.m; sourceTree = ""; }; - E87E62602A3F5689002F68C9 /* XPNewHomeNavView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeNavView.m; sourceTree = ""; }; - E87E62612A3F5689002F68C9 /* XPNewHomeNavView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNewHomeNavView.h; sourceTree = ""; }; - E87E62662A3F571C002F68C9 /* XPHomeContainerPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeContainerPresenter.m; sourceTree = ""; }; - E87E62672A3F571D002F68C9 /* XPHomeContainerPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeContainerPresenter.h; sourceTree = ""; }; - E87E62692A3F5756002F68C9 /* XPHomeContainerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeContainerProtocol.h; sourceTree = ""; }; - E87E626A2A3F5906002F68C9 /* XPHomeBannerTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeBannerTableViewCell.m; sourceTree = ""; }; - E87E626B2A3F5906002F68C9 /* XPNewHomePlayEmptyTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNewHomePlayEmptyTableViewCell.h; sourceTree = ""; }; - E87E626C2A3F5906002F68C9 /* XPNewHomePlayTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNewHomePlayTableViewCell.h; sourceTree = ""; }; - E87E626D2A3F5906002F68C9 /* XPNewHomePlayEmptyTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNewHomePlayEmptyTableViewCell.m; sourceTree = ""; }; - E87E626E2A3F5906002F68C9 /* XPNewHomePartyTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNewHomePartyTableViewCell.h; sourceTree = ""; }; - E87E626F2A3F5906002F68C9 /* XPNewHomePlayTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNewHomePlayTableViewCell.m; sourceTree = ""; }; - E87E62702A3F5907002F68C9 /* XPNewHomeRecommendTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeRecommendTableViewCell.m; sourceTree = ""; }; - E87E62712A3F5907002F68C9 /* XPNewHomePartyTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNewHomePartyTableViewCell.m; sourceTree = ""; }; - E87E62722A3F5907002F68C9 /* XPHomeBannerTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeBannerTableViewCell.h; sourceTree = ""; }; - E87E62732A3F5907002F68C9 /* XPNewHomeRecommendTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNewHomeRecommendTableViewCell.h; sourceTree = ""; }; - E87E62792A3F5A0D002F68C9 /* XPNewHomeRecommendPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeRecommendPresenter.h; sourceTree = ""; }; - E87E627A2A3F5A0D002F68C9 /* XPNewHomeRecommendPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeRecommendPresenter.m; sourceTree = ""; }; - E87E627C2A3F5A63002F68C9 /* XPNewHomeRecommendProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeRecommendProtocol.h; sourceTree = ""; }; - E87E627D2A3F5D28002F68C9 /* XPNewHomePlayItemCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNewHomePlayItemCollectionViewCell.h; sourceTree = ""; }; - E87E627E2A3F5D28002F68C9 /* XPNewHomePlayItemCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPNewHomePlayItemCollectionViewCell.m; sourceTree = ""; }; - E87E63F629AA1A5600EBE52B /* xplan-ios.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "xplan-ios.xcdatamodel"; sourceTree = ""; }; - E87E914C2796678D00A7B3F2 /* XPMineDressEmptyTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineDressEmptyTableViewCell.h; sourceTree = ""; }; - E87E914D2796678D00A7B3F2 /* XPMineDressEmptyTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineDressEmptyTableViewCell.m; sourceTree = ""; }; - E87E91502796A15500A7B3F2 /* MicroExtModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroExtModel.h; sourceTree = ""; }; - E87E91512796A15500A7B3F2 /* MicroExtModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroExtModel.m; sourceTree = ""; }; - E87E91532796B6DE00A7B3F2 /* XPRoomInviteUserViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomInviteUserViewController.h; sourceTree = ""; }; - E87E91542796B6DE00A7B3F2 /* XPRoomInviteUserViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomInviteUserViewController.m; sourceTree = ""; }; - E880B39C278BD49E00A83B0D /* XPAcrossRoomPKViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKViewController.h; sourceTree = ""; }; - E880B39D278BD49E00A83B0D /* XPAcrossRoomPKViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKViewController.m; sourceTree = ""; }; - E880B39F278BD60C00A83B0D /* XPAcrossRoomPKSelectRoomView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKSelectRoomView.h; sourceTree = ""; }; - E880B3A0278BD60C00A83B0D /* XPAcrossRoomPKSelectRoomView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKSelectRoomView.m; sourceTree = ""; }; - E880B3A4278BD69900A83B0D /* XPAcrossRoomPKTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKTableViewCell.h; sourceTree = ""; }; - E880B3A5278BD69900A83B0D /* XPAcrossRoomPKTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKTableViewCell.m; sourceTree = ""; }; - E880B3A7278BD82300A83B0D /* AcrossRoomPKInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AcrossRoomPKInfoModel.h; sourceTree = ""; }; - E880B3A8278BD82300A83B0D /* AcrossRoomPKInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AcrossRoomPKInfoModel.m; sourceTree = ""; }; - E880B3AA278BD98600A83B0D /* XPAcrossRoomPKEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKEmptyTableViewCell.h; sourceTree = ""; }; - E880B3AB278BD98600A83B0D /* XPAcrossRoomPKEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKEmptyTableViewCell.m; sourceTree = ""; }; - E880B3AD278BE1D800A83B0D /* Api+AcrossRoomPK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+AcrossRoomPK.h"; sourceTree = ""; }; - E880B3AE278BE1D800A83B0D /* Api+AcrossRoomPK.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+AcrossRoomPK.m"; sourceTree = ""; }; - E880B3B0278C1D1800A83B0D /* XPAcrossRoomPKRuleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKRuleView.h; sourceTree = ""; }; - E880B3B1278C1D1800A83B0D /* XPAcrossRoomPKRuleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKRuleView.m; sourceTree = ""; }; - E880B3B3278C1FE400A83B0D /* XPAcrossRoomPKPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKPresenter.h; sourceTree = ""; }; - E880B3B4278C1FE400A83B0D /* XPAcrossRoomPKPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKPresenter.m; sourceTree = ""; }; - E880B3B6278C1FFB00A83B0D /* XPAcrossRoomProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomProtocol.h; sourceTree = ""; }; - E884C36A2743951B00E1EBED /* GiftReceiveInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftReceiveInfoModel.h; sourceTree = ""; }; - E884C36B2743951B00E1EBED /* GiftReceiveInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftReceiveInfoModel.m; sourceTree = ""; }; - E884C36D2743AAC800E1EBED /* AttachmentModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AttachmentModel.h; sourceTree = ""; }; - E884C36E2743AAC800E1EBED /* AttachmentModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AttachmentModel.m; sourceTree = ""; }; - E884C3702743AEDE00E1EBED /* CustomAttachmentDecoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CustomAttachmentDecoder.h; sourceTree = ""; }; - E884C3712743AEDE00E1EBED /* CustomAttachmentDecoder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomAttachmentDecoder.m; sourceTree = ""; }; - E885D531297798E1004DC088 /* SessionSettingTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionSettingTableViewCell.h; sourceTree = ""; }; - E885D532297798E1004DC088 /* SessionSettingTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionSettingTableViewCell.m; sourceTree = ""; }; - E885D5342977CE28004DC088 /* SessionSettingModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionSettingModel.h; sourceTree = ""; }; - E885D5352977CE28004DC088 /* SessionSettingModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionSettingModel.m; sourceTree = ""; }; - E885D5372977D10E004DC088 /* SessionSettingUserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionSettingUserView.h; sourceTree = ""; }; - E885D5382977D10E004DC088 /* SessionSettingUserView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionSettingUserView.m; sourceTree = ""; }; - E885D53A2977FBFD004DC088 /* MessageTimeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageTimeView.h; sourceTree = ""; }; - E885D53B2977FBFD004DC088 /* MessageTimeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageTimeView.m; sourceTree = ""; }; E88749B4282B8FC600C3C7DB /* MomentsInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MomentsInfoModel.h; sourceTree = ""; }; E88749B5282B8FC600C3C7DB /* MomentsInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MomentsInfoModel.m; sourceTree = ""; }; - E88863C4278EAFC3004BCFAB /* XPAcrossRoomPKResultView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKResultView.h; sourceTree = ""; }; - E88863C5278EAFC3004BCFAB /* XPAcrossRoomPKResultView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKResultView.m; sourceTree = ""; }; - E88863C7278EBA43004BCFAB /* XPAcrossRoomPKForceEndResultView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKForceEndResultView.h; sourceTree = ""; }; - E88863C8278EBA43004BCFAB /* XPAcrossRoomPKForceEndResultView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKForceEndResultView.m; sourceTree = ""; }; - E88863CA278EC336004BCFAB /* AcrossRoomPKPrizeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AcrossRoomPKPrizeModel.h; sourceTree = ""; }; - E88863CB278EC336004BCFAB /* AcrossRoomPKPrizeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AcrossRoomPKPrizeModel.m; sourceTree = ""; }; - E88863CD278EC393004BCFAB /* XPAcrossRoomPKPrizeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKPrizeView.h; sourceTree = ""; }; - E88863CE278EC393004BCFAB /* XPAcrossRoomPKPrizeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKPrizeView.m; sourceTree = ""; }; E88863D1278ED4C0004BCFAB /* Timestamp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Timestamp.h; sourceTree = ""; }; E88863D2278ED4C0004BCFAB /* Timestamp.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Timestamp.m; sourceTree = ""; }; - E8899C7D27853B6A007944BE /* DatingMicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DatingMicroView.h; sourceTree = ""; }; - E8899C7E27853B6A007944BE /* DatingMicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DatingMicroView.m; sourceTree = ""; }; - E8899C802785A694007944BE /* DatingInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DatingInfoModel.h; sourceTree = ""; }; - E8899C812785A694007944BE /* DatingInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DatingInfoModel.m; sourceTree = ""; }; - E8899C832785CC69007944BE /* XPRoomDatingAnimationView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomDatingAnimationView.h; sourceTree = ""; }; - E8899C842785CC69007944BE /* XPRoomDatingAnimationView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomDatingAnimationView.m; sourceTree = ""; }; - E88B5CBF26FB407B00DA9178 /* XPMineUserInfoViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoViewController.h; sourceTree = ""; }; - E88B5CC026FB407B00DA9178 /* XPMineUserInfoViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoViewController.m; sourceTree = ""; }; - E88B5CC326FB42B000DA9178 /* XPMineUserInfoHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoHeaderView.h; sourceTree = ""; }; - E88B5CC426FB42B000DA9178 /* XPMineUserInfoHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoHeaderView.m; sourceTree = ""; }; - E88C728D2828EA4E0047FB2B /* Music+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Music+CoreDataProperties.h"; sourceTree = ""; }; - E88C728E2828EA4E0047FB2B /* Music+CoreDataClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Music+CoreDataClass.h"; sourceTree = ""; }; - E88C728F2828EA4E0047FB2B /* Music+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Music+CoreDataProperties.m"; sourceTree = ""; }; - E88C72902828EA4E0047FB2B /* Music+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Music+CoreDataClass.m"; sourceTree = ""; }; - E88C72932828F1AD0047FB2B /* XPRoomMusicLibraryViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMusicLibraryViewController.h; sourceTree = ""; }; - E88C72942828F1AD0047FB2B /* XPRoomMusicLibraryViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMusicLibraryViewController.m; sourceTree = ""; }; - E88C72972828F3620047FB2B /* XPRoomMusicLibraryTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMusicLibraryTableViewCell.h; sourceTree = ""; }; - E88C72982828F3620047FB2B /* XPRoomMusicLibraryTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMusicLibraryTableViewCell.m; sourceTree = ""; }; - E88C729A2828F37D0047FB2B /* XPRoomMusicLibraryEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMusicLibraryEmptyTableViewCell.h; sourceTree = ""; }; - E88C729B2828F37D0047FB2B /* XPRoomMusicLibraryEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMusicLibraryEmptyTableViewCell.m; sourceTree = ""; }; - E88C729E2828FCD40047FB2B /* XPMusicLibraryPlayView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMusicLibraryPlayView.h; sourceTree = ""; }; - E88C729F2828FCD40047FB2B /* XPMusicLibraryPlayView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMusicLibraryPlayView.m; sourceTree = ""; }; - E88C72A1282917590047FB2B /* XPRoomMusicVoiceSettingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMusicVoiceSettingView.h; sourceTree = ""; }; - E88C72A2282917590047FB2B /* XPRoomMusicVoiceSettingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMusicVoiceSettingView.m; sourceTree = ""; }; - E88C72A4282921D60047FB2B /* XPRoomBackMusicPlayerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomBackMusicPlayerView.h; sourceTree = ""; }; - E88C72A5282921D60047FB2B /* XPRoomBackMusicPlayerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomBackMusicPlayerView.m; sourceTree = ""; }; - E88E4A7E297673DC00019A50 /* SessionNavLiveView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionNavLiveView.h; sourceTree = ""; }; - E88E4A7F297673DC00019A50 /* SessionNavLiveView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionNavLiveView.m; sourceTree = ""; }; - E8901CF428B38D89001E9A92 /* XPGraffitiGiftView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGraffitiGiftView.h; sourceTree = ""; }; - E8901CF528B38D89001E9A92 /* XPGraffitiGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGraffitiGiftView.m; sourceTree = ""; }; - E890BC02273CF0500007C46B /* XPGiftCountModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftCountModel.h; sourceTree = ""; }; - E890BC03273CF0500007C46B /* XPGiftCountModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftCountModel.m; sourceTree = ""; }; - E890BC05273CF1800007C46B /* XPGiftCountCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftCountCollectionViewCell.h; sourceTree = ""; }; - E890BC06273CF1800007C46B /* XPGiftCountCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftCountCollectionViewCell.m; sourceTree = ""; }; - E890BC0B273D09A50007C46B /* XPGiftCountView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftCountView.h; sourceTree = ""; }; - E890BC0C273D09A50007C46B /* XPGiftCountView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftCountView.m; sourceTree = ""; }; - E890BC0E273D23F00007C46B /* GiftInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftInfoModel.h; sourceTree = ""; }; - E890BC0F273D23F00007C46B /* GiftInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftInfoModel.m; sourceTree = ""; }; - E895017E282CAC49007E459A /* XPMomentsUserInfoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsUserInfoView.h; sourceTree = ""; }; - E895017F282CAC49007E459A /* XPMomentsUserInfoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsUserInfoView.m; sourceTree = ""; }; - E8950181282CAC6A007E459A /* XPMomentsPhotoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsPhotoView.h; sourceTree = ""; }; - E8950182282CAC6A007E459A /* XPMomentsPhotoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsPhotoView.m; sourceTree = ""; }; - E8950184282CAC80007E459A /* XPMomentsTooBarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsTooBarView.h; sourceTree = ""; }; - E8950185282CAC80007E459A /* XPMomentsTooBarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsTooBarView.m; sourceTree = ""; }; - E8950187282CFFB1007E459A /* XPMomentsLayoutConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsLayoutConfig.h; sourceTree = ""; }; - E8950188282CFFB1007E459A /* XPMomentsLayoutConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsLayoutConfig.m; sourceTree = ""; }; - E895018A282D0701007E459A /* XPMomentsTopicView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsTopicView.h; sourceTree = ""; }; - E895018B282D0701007E459A /* XPMomentsTopicView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsTopicView.m; sourceTree = ""; }; - E896EF922771AAC100AD2CC1 /* XPMineFansPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFansPresenter.h; sourceTree = ""; }; - E896EF932771AAC100AD2CC1 /* XPMineFansPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFansPresenter.m; sourceTree = ""; }; - E896EF952771AAE400AD2CC1 /* XPMineAttentionPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAttentionPresenter.h; sourceTree = ""; }; - E896EF962771AAE400AD2CC1 /* XPMineAttentionPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineAttentionPresenter.m; sourceTree = ""; }; E896EF982771AB0000AD2CC1 /* XPMineFansProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFansProtocol.h; sourceTree = ""; }; E896EF992771AB1800AD2CC1 /* XPMineAttentionProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAttentionProtocol.h; sourceTree = ""; }; - E896EF9A2771AE6B00AD2CC1 /* XPMineFansViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFansViewController.h; sourceTree = ""; }; - E896EF9B2771AE6B00AD2CC1 /* XPMineFansViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFansViewController.m; sourceTree = ""; }; - E896EF9D2771AE7B00AD2CC1 /* XPMineAttentionViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAttentionViewController.h; sourceTree = ""; }; - E896EF9E2771AE7B00AD2CC1 /* XPMineAttentionViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineAttentionViewController.m; sourceTree = ""; }; - E896EFA02771AE9400AD2CC1 /* XPMineFriendViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFriendViewController.h; sourceTree = ""; }; - E896EFA12771AE9400AD2CC1 /* XPMineFriendViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFriendViewController.m; sourceTree = ""; }; - E896EFA42771AEDD00AD2CC1 /* XPMineFansTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFansTableViewCell.h; sourceTree = ""; }; - E896EFA52771AEDD00AD2CC1 /* XPMineFansTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFansTableViewCell.m; sourceTree = ""; }; - E896EFA72771AEEC00AD2CC1 /* XPMineAttentionTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAttentionTableViewCell.h; sourceTree = ""; }; - E896EFA82771AEEC00AD2CC1 /* XPMineAttentionTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineAttentionTableViewCell.m; sourceTree = ""; }; - E896EFAA2771AEFE00AD2CC1 /* XPMineFriendTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFriendTableViewCell.h; sourceTree = ""; }; - E896EFAB2771AEFE00AD2CC1 /* XPMineFriendTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFriendTableViewCell.m; sourceTree = ""; }; - E896EFAD2771AF0F00AD2CC1 /* XPMineFriendEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFriendEmptyTableViewCell.h; sourceTree = ""; }; - E896EFAE2771AF0F00AD2CC1 /* XPMineFriendEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFriendEmptyTableViewCell.m; sourceTree = ""; }; - E896EFB02771C93B00AD2CC1 /* XPMineFriendNumberView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFriendNumberView.h; sourceTree = ""; }; - E896EFB12771C93B00AD2CC1 /* XPMineFriendNumberView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFriendNumberView.m; sourceTree = ""; }; - E897ABFA28AF2E71003B3587 /* XPSailingGiftView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingGiftView.h; sourceTree = ""; }; - E897ABFB28AF2E71003B3587 /* XPSailingGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingGiftView.m; sourceTree = ""; }; - E897ABFD28AF39B4003B3587 /* XPSailingAnimationView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingAnimationView.h; sourceTree = ""; }; - E897ABFE28AF39B4003B3587 /* XPSailingAnimationView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingAnimationView.m; sourceTree = ""; }; - E8998D7E28597B0300C68558 /* XPRoomLuckyBigPrizeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomLuckyBigPrizeView.h; sourceTree = ""; }; - E8998D7F28597B0300C68558 /* XPRoomLuckyBigPrizeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomLuckyBigPrizeView.m; sourceTree = ""; }; - E8998D832859B4FA00C68558 /* XPMineUserInfoGiftView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoGiftView.h; sourceTree = ""; }; - E8998D842859B4FA00C68558 /* XPMineUserInfoGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoGiftView.m; sourceTree = ""; }; - E8998D892859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoGiftWallSubViewController.h; sourceTree = ""; }; - E8998D8A2859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoGiftWallSubViewController.m; sourceTree = ""; }; - E899C68727508F4E00E189E5 /* XPUserCardInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPUserCardInfoModel.h; sourceTree = ""; }; - E899C68827508F4E00E189E5 /* XPUserCardInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPUserCardInfoModel.m; sourceTree = ""; }; - E899C68A275093B700E189E5 /* XPUserCardMicroItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPUserCardMicroItemModel.h; sourceTree = ""; }; - E899C68B275093B800E189E5 /* XPUserCardMicroItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPUserCardMicroItemModel.m; sourceTree = ""; }; - E89BD7D2277D471100E31B19 /* XPRoomOnlineTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomOnlineTableViewCell.h; sourceTree = ""; }; - E89BD7D3277D471100E31B19 /* XPRoomOnlineTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomOnlineTableViewCell.m; sourceTree = ""; }; - E89D60B8271D643A001F8895 /* Api+Room.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Room.h"; sourceTree = ""; }; - E89D60B9271D643A001F8895 /* Api+Room.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Room.m"; sourceTree = ""; }; - E89D60BB271D647A001F8895 /* XPRoomPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPresenter.h; sourceTree = ""; }; - E89D60BC271D647A001F8895 /* XPRoomPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPresenter.m; sourceTree = ""; }; - E89D60BE271D648D001F8895 /* XPRoomProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomProtocol.h; sourceTree = ""; }; - E89D60BF271D64B9001F8895 /* RoomInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomInfoModel.h; sourceTree = ""; }; - E89D60C0271D64B9001F8895 /* RoomInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomInfoModel.m; sourceTree = ""; }; - E89DA66527006443008483C1 /* RechargeStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RechargeStorage.h; sourceTree = ""; }; - E89DA66627006443008483C1 /* RechargeStorage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RechargeStorage.m; sourceTree = ""; }; E89DA67027008D59008483C1 /* WalletInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WalletInfoModel.h; sourceTree = ""; }; E89DA67127008D59008483C1 /* WalletInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WalletInfoModel.m; sourceTree = ""; }; - E89DA67327009ACD008483C1 /* XPMineRechargeNavView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineRechargeNavView.h; sourceTree = ""; }; - E89DA67427009ACD008483C1 /* XPMineRechargeNavView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineRechargeNavView.m; sourceTree = ""; }; - E8A03DFD27635F960098D9EA /* XPRoomCandyGiftView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomCandyGiftView.h; sourceTree = ""; }; - E8A03DFE27635F960098D9EA /* XPRoomCandyGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomCandyGiftView.m; sourceTree = ""; }; - E8A30BE128534A28003B4873 /* XPSessionFindNewViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionFindNewViewController.h; sourceTree = ""; }; - E8A30BE228534A28003B4873 /* XPSessionFindNewViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionFindNewViewController.m; sourceTree = ""; }; - E8A30BE628534A63003B4873 /* XPSessionFindNewTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionFindNewTableViewCell.h; sourceTree = ""; }; - E8A30BE728534A63003B4873 /* XPSessionFindNewTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionFindNewTableViewCell.m; sourceTree = ""; }; - E8A30BE928534A96003B4873 /* XPSessionFindNewFiltrateView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionFindNewFiltrateView.h; sourceTree = ""; }; - E8A30BEA28534A96003B4873 /* XPSessionFindNewFiltrateView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionFindNewFiltrateView.m; sourceTree = ""; }; - E8A30BEC28534AB1003B4873 /* XPSessionFindNewPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionFindNewPresenter.h; sourceTree = ""; }; - E8A30BED28534AB1003B4873 /* XPSessionFindNewPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionFindNewPresenter.m; sourceTree = ""; }; - E8A30BF028534B03003B4873 /* XPSessionFindNewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionFindNewProtocol.h; sourceTree = ""; }; - E8A30BF128534B17003B4873 /* Api+FindNew.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+FindNew.h"; sourceTree = ""; }; - E8A30BF228534B17003B4873 /* Api+FindNew.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+FindNew.m"; sourceTree = ""; }; - E8A30BF428534B35003B4873 /* FindNewUserInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FindNewUserInfoModel.h; sourceTree = ""; }; - E8A30BF528534B35003B4873 /* FindNewUserInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FindNewUserInfoModel.m; sourceTree = ""; }; - E8A30BF728534E48003B4873 /* XPSessionFindNewEmptyTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionFindNewEmptyTableViewCell.h; sourceTree = ""; }; - E8A30BF828534E48003B4873 /* XPSessionFindNewEmptyTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionFindNewEmptyTableViewCell.m; sourceTree = ""; }; - E8A3538328FD67320014A784 /* GiftLuckyBroadcastModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftLuckyBroadcastModel.h; sourceTree = ""; }; - E8A3538428FD67320014A784 /* GiftLuckyBroadcastModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftLuckyBroadcastModel.m; sourceTree = ""; }; E8A72BBA2A3AFB2F00B2EC07 /* PrefixHeader.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = ""; }; - E8A73F8528586A6F00FD9CBC /* XPGiftWeekStarCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftWeekStarCollectionViewCell.h; sourceTree = ""; }; - E8A73F8628586A6F00FD9CBC /* XPGiftWeekStarCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftWeekStarCollectionViewCell.m; sourceTree = ""; }; - E8A88D2527E8193400CA8837 /* XPRoomPKSelectUserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKSelectUserView.h; sourceTree = ""; }; - E8A88D2627E8193400CA8837 /* XPRoomPKSelectUserView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKSelectUserView.m; sourceTree = ""; }; - E8A88D2827E81C8600CA8837 /* XPRoomPKUserCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKUserCollectionViewCell.h; sourceTree = ""; }; - E8A88D2927E81C8600CA8837 /* XPRoomPKUserCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKUserCollectionViewCell.m; sourceTree = ""; }; - E8A88D2B27E81E8700CA8837 /* RoomPKChooseUserModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomPKChooseUserModel.h; sourceTree = ""; }; - E8A88D2C27E81E8700CA8837 /* RoomPKChooseUserModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomPKChooseUserModel.m; sourceTree = ""; }; - E8A88D2E27E85EEA00CA8837 /* RoomPKInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomPKInfoModel.h; sourceTree = ""; }; - E8A88D2F27E85EEA00CA8837 /* RoomPKInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomPKInfoModel.m; sourceTree = ""; }; - E8AA6EED27DF1E6B009B4C2B /* XPRoomTopicViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTopicViewController.h; sourceTree = ""; }; - E8AA6EEE27DF1E6B009B4C2B /* XPRoomTopicViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTopicViewController.m; sourceTree = ""; }; - E8AA6EF027DF1E97009B4C2B /* XPRoomTopicPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTopicPresenter.h; sourceTree = ""; }; - E8AA6EF127DF1E97009B4C2B /* XPRoomTopicPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTopicPresenter.m; sourceTree = ""; }; - E8AA6EF327DF1EB6009B4C2B /* XPRoomTopicProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTopicProtocol.h; sourceTree = ""; }; - E8AB630B28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentTopicContainerViewController.h; sourceTree = ""; }; - E8AB630C28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentTopicContainerViewController.m; sourceTree = ""; }; - E8AB630E28ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicRecommondViewController.h; sourceTree = ""; }; - E8AB630F28ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicRecommondViewController.m; sourceTree = ""; }; - E8AB631128ADDCF20023B0D2 /* XPMonentsTopicHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicHeaderView.h; sourceTree = ""; }; - E8AB631228ADDCF20023B0D2 /* XPMonentsTopicHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicHeaderView.m; sourceTree = ""; }; - E8AB631428ADE2D20023B0D2 /* XPMonentsTopicLatestViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicLatestViewController.h; sourceTree = ""; }; - E8AB631528ADE2D20023B0D2 /* XPMonentsTopicLatestViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicLatestViewController.m; sourceTree = ""; }; E8AB631728ADE2F40023B0D2 /* XPMonentsTopicRecommendPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicRecommendPresenter.h; sourceTree = ""; }; E8AB631828ADE2F40023B0D2 /* XPMonentsTopicRecommendPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicRecommendPresenter.m; sourceTree = ""; }; E8AB631A28ADE30E0023B0D2 /* XPMonentsTopicLatestPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicLatestPresenter.h; sourceTree = ""; }; E8AB631B28ADE30E0023B0D2 /* XPMonentsTopicLatestPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicLatestPresenter.m; sourceTree = ""; }; E8AB632028ADE5720023B0D2 /* XPMonentsTopicRecommendProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicRecommendProtocol.h; sourceTree = ""; }; E8AB632128ADE5880023B0D2 /* XPMonentsTopicLatestProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicLatestProtocol.h; sourceTree = ""; }; - E8AB632228AE10310023B0D2 /* XPMomentsTopicListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsTopicListViewController.h; sourceTree = ""; }; - E8AB632328AE10310023B0D2 /* XPMomentsTopicListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsTopicListViewController.m; sourceTree = ""; }; - E8AB632528AE13210023B0D2 /* XPMomentsTopicListPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsTopicListPresenter.h; sourceTree = ""; }; - E8AB632628AE13210023B0D2 /* XPMomentsTopicListPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsTopicListPresenter.m; sourceTree = ""; }; E8AB632928AE15070023B0D2 /* XPMomentsTopicListProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsTopicListProtocol.h; sourceTree = ""; }; - E8AB632A28AE19600023B0D2 /* XPMomentsMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsMineViewController.h; sourceTree = ""; }; - E8AB632B28AE19600023B0D2 /* XPMomentsMineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsMineViewController.m; sourceTree = ""; }; E8AB632D28AE19DE0023B0D2 /* XPMomentMinePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentMinePresenter.h; sourceTree = ""; }; E8AB632E28AE19DE0023B0D2 /* XPMomentMinePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentMinePresenter.m; sourceTree = ""; }; E8AB633028AE19FA0023B0D2 /* XPMomentsMineProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsMineProtocol.h; sourceTree = ""; }; - E8AB633128AE51470023B0D2 /* XPSailingPrizeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingPrizeView.h; sourceTree = ""; }; - E8AB633228AE51470023B0D2 /* XPSailingPrizeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingPrizeView.m; sourceTree = ""; }; - E8AB633428AE54A40023B0D2 /* XPSailingPrizeCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingPrizeCollectionViewCell.h; sourceTree = ""; }; - E8AB633528AE54A40023B0D2 /* XPSailingPrizeCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingPrizeCollectionViewCell.m; sourceTree = ""; }; - E8AC721126F46ADD007D6E91 /* XPMineSettingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineSettingViewController.h; sourceTree = ""; }; - E8AC721226F46ADD007D6E91 /* XPMineSettingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineSettingViewController.m; sourceTree = ""; }; - E8AC721426F46B06007D6E91 /* XPMineSettingTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineSettingTableViewCell.h; sourceTree = ""; }; - E8AC721526F46B06007D6E91 /* XPMineSettingTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineSettingTableViewCell.m; sourceTree = ""; }; E8AC721726F46E0B007D6E91 /* XPMineSettingItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineSettingItemModel.h; sourceTree = ""; }; E8AC721826F46E0B007D6E91 /* XPMineSettingItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineSettingItemModel.m; sourceTree = ""; }; - E8AC721A26F4720B007D6E91 /* XPMineSettingPresent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineSettingPresent.h; sourceTree = ""; }; - E8AC721B26F4720B007D6E91 /* XPMineSettingPresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineSettingPresent.m; sourceTree = ""; }; E8AC721D26F4723D007D6E91 /* XPMineSettingProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineSettingProtocol.h; sourceTree = ""; }; - E8AC721F26F47E23007D6E91 /* XPMineAboutUsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAboutUsViewController.h; sourceTree = ""; }; - E8AC722026F47E23007D6E91 /* XPMineAboutUsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineAboutUsViewController.m; sourceTree = ""; }; - E8AC722226F47E5E007D6E91 /* XPMineFeedbackViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFeedbackViewController.h; sourceTree = ""; }; - E8AC722326F47E5E007D6E91 /* XPMineFeedbackViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFeedbackViewController.m; sourceTree = ""; }; - E8AC722526F482A4007D6E91 /* XPMineFeedbackPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFeedbackPresenter.h; sourceTree = ""; }; - E8AC722626F482A4007D6E91 /* XPMineFeedbackPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineFeedbackPresenter.m; sourceTree = ""; }; E8AC722826F48889007D6E91 /* XPMineFeedbackProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineFeedbackProtocol.h; sourceTree = ""; }; - E8AC722A26F49580007D6E91 /* XPMineNotificaViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineNotificaViewController.h; sourceTree = ""; }; - E8AC722B26F49580007D6E91 /* XPMineNotificaViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineNotificaViewController.m; sourceTree = ""; }; E8AC722D26F49610007D6E91 /* XPMineNotificationItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineNotificationItemModel.h; sourceTree = ""; }; E8AC722E26F49610007D6E91 /* XPMineNotificationItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineNotificationItemModel.m; sourceTree = ""; }; - E8AC723026F49710007D6E91 /* XPMineNotificationTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineNotificationTableViewCell.h; sourceTree = ""; }; - E8AC723126F49710007D6E91 /* XPMineNotificationTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineNotificationTableViewCell.m; sourceTree = ""; }; - E8AC723326F49939007D6E91 /* XPMineNotificaPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineNotificaPresenter.h; sourceTree = ""; }; - E8AC723426F49939007D6E91 /* XPMineNotificaPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineNotificaPresenter.m; sourceTree = ""; }; E8AC723626F49957007D6E91 /* XPMineNotificaProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineNotificaProtocol.h; sourceTree = ""; }; E8AC723826F49AAE007D6E91 /* XPMineNotifyStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineNotifyStatus.h; sourceTree = ""; }; E8AC723926F49AAE007D6E91 /* XPMineNotifyStatus.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineNotifyStatus.m; sourceTree = ""; }; - E8AC723B26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginBindPhoneResultViewController.h; sourceTree = ""; }; - E8AC723C26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginBindPhoneResultViewController.m; sourceTree = ""; }; - E8AE427127153A3500BEEBB2 /* XPRoomActivityContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomActivityContainerView.h; sourceTree = ""; }; - E8AE427227153A3500BEEBB2 /* XPRoomActivityContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomActivityContainerView.m; sourceTree = ""; }; - E8AEAED4271412EC0017FCE0 /* XPRoomViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomViewController.h; sourceTree = ""; }; - E8AEAED5271412EC0017FCE0 /* XPRoomViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomViewController.m; sourceTree = ""; }; - E8AEAEEE27141C430017FCE0 /* XPRoomMenuContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMenuContainerView.h; sourceTree = ""; }; - E8AEAEEF27141C430017FCE0 /* XPRoomMenuContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMenuContainerView.m; sourceTree = ""; }; - E8AEAEF127141C7C0017FCE0 /* XPRoomMessageContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessageContainerView.h; sourceTree = ""; }; - E8AEAEF227141C7C0017FCE0 /* XPRoomMessageContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMessageContainerView.m; sourceTree = ""; }; - E8AEAEF727141CA30017FCE0 /* RoomHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomHeaderView.h; sourceTree = ""; }; - E8AEAEF827141CA30017FCE0 /* RoomHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomHeaderView.m; sourceTree = ""; }; - E8AFF7E1298CA1E500FBDE32 /* SessionSayHelloCountModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionSayHelloCountModel.h; sourceTree = ""; }; - E8AFF7E2298CA1E500FBDE32 /* SessionSayHelloCountModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionSayHelloCountModel.m; sourceTree = ""; }; - E8B3E8072848B871009746AB /* InviteUserInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InviteUserInfoModel.h; sourceTree = ""; }; - E8B3E8082848B871009746AB /* InviteUserInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InviteUserInfoModel.m; sourceTree = ""; }; - E8B3E80A2848BA40009746AB /* NewUserGreetModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewUserGreetModel.h; sourceTree = ""; }; - E8B3E80B2848BA40009746AB /* NewUserGreetModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewUserGreetModel.m; sourceTree = ""; }; E8B825C026EA00DF009E8E9F /* LoginVerifCodePresent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginVerifCodePresent.h; sourceTree = ""; }; E8B825C126EA00DF009E8E9F /* LoginVerifCodePresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginVerifCodePresent.m; sourceTree = ""; }; E8B825C626EA0995009E8E9F /* LoginVerifCodeProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginVerifCodeProtocol.h; sourceTree = ""; }; - E8B825C826EA1231009E8E9F /* LoginVerifCodeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginVerifCodeViewController.m; sourceTree = ""; }; - E8B825C926EA1231009E8E9F /* LoginVerifCodeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginVerifCodeViewController.h; sourceTree = ""; }; - E8B846BD26FD827900A777FE /* XPMineUserInfoAlbumViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoAlbumViewController.h; sourceTree = ""; }; - E8B846BE26FD827900A777FE /* XPMineUserInfoAlbumViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoAlbumViewController.m; sourceTree = ""; }; - E8B846C026FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoAlbumCollectionViewCell.h; sourceTree = ""; }; - E8B846C126FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoAlbumCollectionViewCell.m; sourceTree = ""; }; - E8B846C326FDB41A00A777FE /* XPMineUserInfolbumPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfolbumPresenter.h; sourceTree = ""; }; - E8B846C426FDB41A00A777FE /* XPMineUserInfolbumPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfolbumPresenter.m; sourceTree = ""; }; E8B846C626FDB44100A777FE /* XPMineUserInfoAlbumProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoAlbumProtocol.h; sourceTree = ""; }; - E8B846CD26FDD96100A777FE /* XPMineRechageHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineRechageHeadView.h; sourceTree = ""; }; - E8B846CE26FDD96100A777FE /* XPMineRechageHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineRechageHeadView.m; sourceTree = ""; }; - E8B846D126FDDBE600A777FE /* XPMineRechargeTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineRechargeTableViewCell.h; sourceTree = ""; }; - E8B846D226FDDBE600A777FE /* XPMineRechargeTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineRechargeTableViewCell.m; sourceTree = ""; }; - E8B846D426FDE01B00A777FE /* XPMineRechargePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineRechargePresenter.h; sourceTree = ""; }; - E8B846D526FDE01B00A777FE /* XPMineRechargePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineRechargePresenter.m; sourceTree = ""; }; E8B846D726FDE16300A777FE /* XPMineRechargeProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineRechargeProtocol.h; sourceTree = ""; }; E8B846DA26FDE24300A777FE /* RechargeListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RechargeListModel.h; sourceTree = ""; }; E8B846DB26FDE24300A777FE /* RechargeListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RechargeListModel.m; sourceTree = ""; }; - E8B9842B28AB77F10022D026 /* XPMonentsPublishTopicView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsPublishTopicView.h; sourceTree = ""; }; - E8B9842C28AB77F10022D026 /* XPMonentsPublishTopicView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsPublishTopicView.m; sourceTree = ""; }; - E8B9842E28AB90200022D026 /* XPMoentsTopicListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMoentsTopicListView.h; sourceTree = ""; }; - E8B9842F28AB90200022D026 /* XPMoentsTopicListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMoentsTopicListView.m; sourceTree = ""; }; - E8B9843128ABA2FF0022D026 /* MonentsPicResInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MonentsPicResInfo.h; sourceTree = ""; }; - E8B9843228ABA2FF0022D026 /* MonentsPicResInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MonentsPicResInfo.m; sourceTree = ""; }; - E8B9843428ABA8B40022D026 /* XPMonentPublishSuccessView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentPublishSuccessView.h; sourceTree = ""; }; - E8B9843528ABA8B40022D026 /* XPMonentPublishSuccessView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentPublishSuccessView.m; sourceTree = ""; }; - E8BD0F8628A9E9E400DE050D /* RoomSailingPrizeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomSailingPrizeModel.h; sourceTree = ""; }; - E8BD0F8728A9E9E400DE050D /* RoomSailingPrizeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomSailingPrizeModel.m; sourceTree = ""; }; - E8BD0F8928A9EB0A00DE050D /* RoomSailingPrizeListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomSailingPrizeListModel.h; sourceTree = ""; }; - E8BD0F8A28A9EB0A00DE050D /* RoomSailingPrizeListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomSailingPrizeListModel.m; sourceTree = ""; }; - E8C1CD6427D88EF800376F83 /* XPRoomFaceViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomFaceViewController.h; sourceTree = ""; }; - E8C1CD6527D88EF800376F83 /* XPRoomFaceViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomFaceViewController.m; sourceTree = ""; }; - E8C1CD6827D8937800376F83 /* XPRoomFaceCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomFaceCollectionViewCell.h; sourceTree = ""; }; - E8C1CD6927D8937800376F83 /* XPRoomFaceCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomFaceCollectionViewCell.m; sourceTree = ""; }; - E8C1CD6B27D8938C00376F83 /* XPRoomFaceTitleCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomFaceTitleCollectionViewCell.h; sourceTree = ""; }; - E8C1CD6C27D8938C00376F83 /* XPRoomFaceTitleCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomFaceTitleCollectionViewCell.m; sourceTree = ""; }; - E8C1CD6E27D894B800376F83 /* RoomFaceTitleItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomFaceTitleItemModel.h; sourceTree = ""; }; - E8C1CD6F27D894B800376F83 /* RoomFaceTitleItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomFaceTitleItemModel.m; sourceTree = ""; }; - E8C1CD7127D8A16500376F83 /* XPRoomFaceTool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomFaceTool.h; sourceTree = ""; }; - E8C1CD7227D8A16500376F83 /* XPRoomFaceTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomFaceTool.m; sourceTree = ""; }; - E8C1CD7427D8AE3D00376F83 /* XPRoomFacePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomFacePresenter.h; sourceTree = ""; }; - E8C1CD7527D8AE3D00376F83 /* XPRoomFacePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomFacePresenter.m; sourceTree = ""; }; - E8C1CD7727D8AE5600376F83 /* XPRoomFaceProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomFaceProtocol.h; sourceTree = ""; }; - E8C1CD7827D8B29E00376F83 /* RoomFaceInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomFaceInfoModel.h; sourceTree = ""; }; - E8C1CD7927D8B29E00376F83 /* RoomFaceInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomFaceInfoModel.m; sourceTree = ""; }; - E8C214FF274B76F60079E6BF /* XPRoomAnimationHitView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomAnimationHitView.h; sourceTree = ""; }; - E8C21500274B76F60079E6BF /* XPRoomAnimationHitView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnimationHitView.m; sourceTree = ""; }; - E8C6FFC827548120004DC9F0 /* Api+Home.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+Home.m"; sourceTree = ""; }; - E8C6FFC927548120004DC9F0 /* Api+Home.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+Home.h"; sourceTree = ""; }; - E8C6FFDE2754EEF9004DC9F0 /* XPHomeSearchViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeSearchViewController.h; sourceTree = ""; }; - E8C6FFDF2754EEF9004DC9F0 /* XPHomeSearchViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeSearchViewController.m; sourceTree = ""; }; - E8C6FFE42754FE53004DC9F0 /* XPHomeSearchPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeSearchPresenter.h; sourceTree = ""; }; - E8C6FFE52754FE53004DC9F0 /* XPHomeSearchPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeSearchPresenter.m; sourceTree = ""; }; - E8C6FFE72754FE66004DC9F0 /* XPHomeSearchProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeSearchProtocol.h; sourceTree = ""; }; E8CEA03B26EA3DE500644B44 /* LoginPasswordPresent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginPasswordPresent.h; sourceTree = ""; }; E8CEA03C26EA3DE500644B44 /* LoginPasswordPresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginPasswordPresent.m; sourceTree = ""; }; E8CEA03E26EA3E0200644B44 /* LoginPasswordProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginPasswordProtocol.h; sourceTree = ""; }; - E8D34D4528080295009C4835 /* XPMineUserDataViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserDataViewController.h; sourceTree = ""; }; - E8D34D4628080295009C4835 /* XPMineUserDataViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserDataViewController.m; sourceTree = ""; }; - E8D34D4B28080351009C4835 /* XPMineDataClanTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDataClanTableViewCell.h; sourceTree = ""; }; - E8D34D4C28080351009C4835 /* XPMineDataClanTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDataClanTableViewCell.m; sourceTree = ""; }; - E8D34D4E28080362009C4835 /* XPMineDataGiftTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDataGiftTableViewCell.h; sourceTree = ""; }; - E8D34D4F28080362009C4835 /* XPMineDataGiftTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDataGiftTableViewCell.m; sourceTree = ""; }; - E8D34D5428080393009C4835 /* XPMineDataGiftCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDataGiftCollectionViewCell.h; sourceTree = ""; }; - E8D34D5528080393009C4835 /* XPMineDataGiftCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDataGiftCollectionViewCell.m; sourceTree = ""; }; E8D34D5828082357009C4835 /* UserGiftWallInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserGiftWallInfoModel.h; sourceTree = ""; }; E8D34D5928082357009C4835 /* UserGiftWallInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserGiftWallInfoModel.m; sourceTree = ""; }; - E8D34D5E28082BA5009C4835 /* XPMineUserDataPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserDataPresenter.h; sourceTree = ""; }; - E8D34D5F28082BA5009C4835 /* XPMineUserDataPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserDataPresenter.m; sourceTree = ""; }; E8D34D6128082BD4009C4835 /* XPMineUserDataProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserDataProtocol.h; sourceTree = ""; }; - E8D34D6228084E40009C4835 /* XPMineUserInfoGiftWallViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoGiftWallViewController.h; sourceTree = ""; }; - E8D34D6328084E40009C4835 /* XPMineUserInfoGiftWallViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoGiftWallViewController.m; sourceTree = ""; }; - E8D34D6528084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoGiftWallCollectionViewCell.h; sourceTree = ""; }; - E8D34D6628084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoGiftWallCollectionViewCell.m; sourceTree = ""; }; - E8D48248278D1F72003C1D08 /* XPAcrossRoomPKInviteView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKInviteView.h; sourceTree = ""; }; - E8D48249278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKInviteView.m; sourceTree = ""; }; - E8D4824B278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKInviteResultView.h; sourceTree = ""; }; - E8D4824C278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKInviteResultView.m; sourceTree = ""; }; - E8D4824E278D68BA003C1D08 /* XPAcrossRoomPKPanelView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKPanelView.h; sourceTree = ""; }; - E8D4824F278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKPanelView.m; sourceTree = ""; }; - E8D48251278D8228003C1D08 /* AcrossRoomPKPanelModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AcrossRoomPKPanelModel.h; sourceTree = ""; }; - E8D48252278D8228003C1D08 /* AcrossRoomPKPanelModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AcrossRoomPKPanelModel.m; sourceTree = ""; }; - E8D48254278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKPanelUserView.h; sourceTree = ""; }; - E8D48255278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKPanelUserView.m; sourceTree = ""; }; - E8D4DE422940462C00EC788D /* XPGiftTwelveStarBroadcastView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftTwelveStarBroadcastView.h; sourceTree = ""; }; - E8D4DE432940462C00EC788D /* XPGiftTwelveStarBroadcastView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftTwelveStarBroadcastView.m; sourceTree = ""; }; - E8D4DE452940473500EC788D /* GiftTwelveStarFirstModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftTwelveStarFirstModel.h; sourceTree = ""; }; - E8D4DE462940473500EC788D /* GiftTwelveStarFirstModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftTwelveStarFirstModel.m; sourceTree = ""; }; - E8D55C9B28113218006935A5 /* MessageMenuModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageMenuModel.h; sourceTree = ""; }; - E8D55C9C28113218006935A5 /* MessageMenuModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageMenuModel.m; sourceTree = ""; }; - E8D55C9E281186D6006935A5 /* SessionAudioRecordView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionAudioRecordView.h; sourceTree = ""; }; - E8D55C9F281186D6006935A5 /* SessionAudioRecordView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionAudioRecordView.m; sourceTree = ""; }; - E8D7D749282BA1EC0007D7BD /* XPMomentsTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentsTableViewCell.h; sourceTree = ""; }; - E8D7D74A282BA1EC0007D7BD /* XPMomentsTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentsTableViewCell.m; sourceTree = ""; }; - E8DAC5AA2858305A00012CFD /* XPRoomMessageBubbleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessageBubbleView.h; sourceTree = ""; }; - E8DAC5AB2858305A00012CFD /* XPRoomMessageBubbleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMessageBubbleView.m; sourceTree = ""; }; - E8DACCF92766EDC60052092C /* MicroGiftValueView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroGiftValueView.h; sourceTree = ""; }; - E8DACCFA2766EDC60052092C /* MicroGiftValueView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroGiftValueView.m; sourceTree = ""; }; - E8DACCFC27673F870052092C /* GiftValueInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiftValueInfoModel.h; sourceTree = ""; }; - E8DACCFD27673F870052092C /* GiftValueInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiftValueInfoModel.m; sourceTree = ""; }; - E8DBB6FB27B63CE000AA285D /* LittleGameMicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LittleGameMicroView.h; sourceTree = ""; }; - E8DBB6FC27B63CE000AA285D /* LittleGameMicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LittleGameMicroView.m; sourceTree = ""; }; - E8DD25D8295583920043C7D5 /* XPAnchorRandomPKRuleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAnchorRandomPKRuleView.h; sourceTree = ""; }; - E8DD25D9295583920043C7D5 /* XPAnchorRandomPKRuleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorRandomPKRuleView.m; sourceTree = ""; }; E8DEC99327648FA50078CB70 /* ClientConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ClientConfig.h; sourceTree = ""; }; E8DEC99427648FA50078CB70 /* ClientConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ClientConfig.m; sourceTree = ""; }; - E8DEC99C2764A5B60078CB70 /* XPRoomMoreMenuViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMoreMenuViewController.h; sourceTree = ""; }; - E8DEC99D2764A5B60078CB70 /* XPRoomMoreMenuViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMoreMenuViewController.m; sourceTree = ""; }; - E8DEC99F2764A5D20078CB70 /* XPRoomMoreItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMoreItemModel.h; sourceTree = ""; }; - E8DEC9A02764A5D20078CB70 /* XPRoomMoreItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMoreItemModel.m; sourceTree = ""; }; - E8DEC9A22764A6600078CB70 /* XPMoreMenuPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMoreMenuPresenter.h; sourceTree = ""; }; - E8DEC9A32764A6600078CB70 /* XPMoreMenuPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMoreMenuPresenter.m; sourceTree = ""; }; - E8DEC9A52764A6760078CB70 /* XPMoreMenuProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMoreMenuProtocol.h; sourceTree = ""; }; - E8DEC9A62764A68B0078CB70 /* Api+MoreMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+MoreMenu.h"; sourceTree = ""; }; - E8DEC9A72764A68B0078CB70 /* Api+MoreMenu.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+MoreMenu.m"; sourceTree = ""; }; - E8DEC9AA2764A6CD0078CB70 /* XPRoomMoreMenuCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMoreMenuCollectionViewCell.h; sourceTree = ""; }; - E8DEC9AB2764A6CD0078CB70 /* XPRoomMoreMenuCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMoreMenuCollectionViewCell.m; sourceTree = ""; }; - E8E0DADE285C20E500566A2F /* MessageContentFindNewGreetView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentFindNewGreetView.h; sourceTree = ""; }; - E8E0DADF285C20E500566A2F /* MessageContentFindNewGreetView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentFindNewGreetView.m; sourceTree = ""; }; - E8E0DAE4285C280E00566A2F /* XPSessionFindNewAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionFindNewAlertView.h; sourceTree = ""; }; - E8E0DAE5285C280E00566A2F /* XPSessionFindNewAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionFindNewAlertView.m; sourceTree = ""; }; - E8E0DAE7285C2E8C00566A2F /* FindNewGreetMessageModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FindNewGreetMessageModel.h; sourceTree = ""; }; - E8E0DAE8285C2E8C00566A2F /* FindNewGreetMessageModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FindNewGreetMessageModel.m; sourceTree = ""; }; - E8E20BD9281645300033B688 /* SessionInfoViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionInfoViewController.h; sourceTree = ""; }; - E8E20BDA281645300033B688 /* SessionInfoViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionInfoViewController.m; sourceTree = ""; }; - E8E20BDC28164D3A0033B688 /* SessionNavView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionNavView.h; sourceTree = ""; }; - E8E20BDD28164D3A0033B688 /* SessionNavView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionNavView.m; sourceTree = ""; }; - E8E20BE0281695800033B688 /* XPMineLoginPasswordViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineLoginPasswordViewController.h; sourceTree = ""; }; - E8E20BE1281695800033B688 /* XPMineLoginPasswordViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineLoginPasswordViewController.m; sourceTree = ""; }; - E8E20BE628169BDC0033B688 /* XPMineLoginPasswordPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineLoginPasswordPresenter.h; sourceTree = ""; }; - E8E20BE728169BDC0033B688 /* XPMineLoginPasswordPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineLoginPasswordPresenter.m; sourceTree = ""; }; E8E20BE928169E410033B688 /* XPMineLoginPasswordProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineLoginPasswordProtocol.h; sourceTree = ""; }; - E8E20BEA2816A5B90033B688 /* XPMineBlackListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineBlackListViewController.h; sourceTree = ""; }; - E8E20BEB2816A5B90033B688 /* XPMineBlackListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineBlackListViewController.m; sourceTree = ""; }; - E8E20BED2816A5FC0033B688 /* XPMineBlackListTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineBlackListTableViewCell.h; sourceTree = ""; }; - E8E20BEE2816A5FC0033B688 /* XPMineBlackListTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineBlackListTableViewCell.m; sourceTree = ""; }; - E8E21A9928B4BD92008F7C9D /* XPRoomGraffitiGiftAnimationView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomGraffitiGiftAnimationView.h; sourceTree = ""; }; - E8E21A9A28B4BD92008F7C9D /* XPRoomGraffitiGiftAnimationView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomGraffitiGiftAnimationView.m; sourceTree = ""; }; - E8E21A9C28B4DFE8008F7C9D /* XPSailingBuyFuelView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSailingBuyFuelView.h; sourceTree = ""; }; - E8E21A9D28B4DFE8008F7C9D /* XPSailingBuyFuelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSailingBuyFuelView.m; sourceTree = ""; }; - E8E70D7526F2F15100F03460 /* XPMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineViewController.h; sourceTree = ""; }; - E8E70D7626F2F15100F03460 /* XPMineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineViewController.m; sourceTree = ""; }; - E8E70D7826F2F16600F03460 /* XPMinePresent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMinePresent.h; sourceTree = ""; }; - E8E70D7926F2F16600F03460 /* XPMinePresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMinePresent.m; sourceTree = ""; }; E8E70D7B26F2F18900F03460 /* XPMineProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineProtocol.h; sourceTree = ""; }; E8E70D7C26F2F19D00F03460 /* Api+Mine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+Mine.h"; sourceTree = ""; }; E8E70D7D26F2F19D00F03460 /* Api+Mine.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+Mine.m"; sourceTree = ""; }; - E8E70D8126F2F51A00F03460 /* XPMineHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineHeadView.h; sourceTree = ""; }; - E8E70D8226F2F51A00F03460 /* XPMineHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineHeadView.m; sourceTree = ""; }; - E8E70D8A26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineHeadItemCollectionViewCell.h; sourceTree = ""; }; - E8E70D8B26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineHeadItemCollectionViewCell.m; sourceTree = ""; }; E8E70D9026F2F60C00F03460 /* XPMineItemModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineItemModel.h; sourceTree = ""; }; E8E70D9126F2F60C00F03460 /* XPMineItemModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineItemModel.m; sourceTree = ""; }; - E8E7DAE62744F5EF00C631CC /* XPGiftStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftStorage.h; sourceTree = ""; }; - E8E7DAE72744F5EF00C631CC /* XPGiftStorage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftStorage.m; sourceTree = ""; }; - E8E7DAE92745158500C631CC /* XPGiftUserInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGiftUserInfoModel.h; sourceTree = ""; }; - E8E7DAEA2745158500C631CC /* XPGiftUserInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGiftUserInfoModel.m; sourceTree = ""; }; - E8E859E728264F4500EE4857 /* XPRoomTransferMusicViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTransferMusicViewController.h; sourceTree = ""; }; - E8E859E828264F4500EE4857 /* XPRoomTransferMusicViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTransferMusicViewController.m; sourceTree = ""; }; - E8EE827B272B9A2300A17217 /* XPRoomSendTextView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomSendTextView.h; sourceTree = ""; }; - E8EE827C272B9A2300A17217 /* XPRoomSendTextView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomSendTextView.m; sourceTree = ""; }; E8EEB8EB26FC2050007C6EBA /* SDPhotoBrowserConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDPhotoBrowserConfig.h; sourceTree = ""; }; E8EEB8EC26FC2050007C6EBA /* SDPhotoBrowser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDPhotoBrowser.m; sourceTree = ""; }; E8EEB8ED26FC2050007C6EBA /* SDWaitingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWaitingView.m; sourceTree = ""; }; @@ -4760,51 +743,14 @@ E8EEB8F126FC2050007C6EBA /* SDBrowserImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDBrowserImageView.h; sourceTree = ""; }; E8EEB8F526FC2673007C6EBA /* UserPhoto.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserPhoto.h; sourceTree = ""; }; E8EEB8F626FC2673007C6EBA /* UserPhoto.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserPhoto.m; sourceTree = ""; }; - E8EEB8FC26FC2DF8007C6EBA /* XPMineUserInfoCustomNavView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoCustomNavView.h; sourceTree = ""; }; - E8EEB8FD26FC2DF8007C6EBA /* XPMineUserInfoCustomNavView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoCustomNavView.m; sourceTree = ""; }; - E8EEB8FF26FC31B6007C6EBA /* XPMineUserInfoPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoPresenter.h; sourceTree = ""; }; - E8EEB90026FC31B6007C6EBA /* XPMineUserInfoPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoPresenter.m; sourceTree = ""; }; E8EEB90226FC31CE007C6EBA /* XPMineUserInfoProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoProtocol.h; sourceTree = ""; }; - E8EEB90426FC5772007C6EBA /* XPMineUserInfoEditViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoEditViewController.h; sourceTree = ""; }; - E8EEB90526FC5772007C6EBA /* XPMineUserInfoEditViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoEditViewController.m; sourceTree = ""; }; - E8EEB90726FC579A007C6EBA /* XPMineUserInfoEditTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoEditTableViewCell.h; sourceTree = ""; }; - E8EEB90826FC579A007C6EBA /* XPMineUserInfoEditTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoEditTableViewCell.m; sourceTree = ""; }; E8EEB90A26FC5EBC007C6EBA /* XPMineUserInfoEditModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoEditModel.h; sourceTree = ""; }; E8EEB90B26FC5EBC007C6EBA /* XPMineUserInfoEditModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoEditModel.m; sourceTree = ""; }; - E8EEB90D26FC6AB8007C6EBA /* XPMineUserInfoEditPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoEditPresenter.h; sourceTree = ""; }; - E8EEB90E26FC6AB8007C6EBA /* XPMineUserInfoEditPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoEditPresenter.m; sourceTree = ""; }; E8EEB91026FC6AD3007C6EBA /* XPMineUserInfoEditProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoEditProtocol.h; sourceTree = ""; }; - E8EEB91226FC7786007C6EBA /* XPMineUserInfoNickViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoNickViewController.h; sourceTree = ""; }; - E8EEB91326FC7786007C6EBA /* XPMineUserInfoNickViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoNickViewController.m; sourceTree = ""; }; - E8EEB91526FC7B35007C6EBA /* XPMineUserInfoDesViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoDesViewController.h; sourceTree = ""; }; - E8EEB91626FC7B35007C6EBA /* XPMineUserInfoDesViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoDesViewController.m; sourceTree = ""; }; - E8EEB91B26FC9D58007C6EBA /* XPMineUserInfoDateView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoDateView.h; sourceTree = ""; }; - E8EEB91C26FC9D58007C6EBA /* XPMineUserInfoDateView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoDateView.m; sourceTree = ""; }; - E8F1558B28124D5200EE8C06 /* MessageConentAudioView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageConentAudioView.h; sourceTree = ""; }; - E8F1558C28124D5200EE8C06 /* MessageConentAudioView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageConentAudioView.m; sourceTree = ""; }; - E8F1558E28125E2D00EE8C06 /* MessageAudioCenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageAudioCenter.h; sourceTree = ""; }; - E8F1558F28125E2D00EE8C06 /* MessageAudioCenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageAudioCenter.m; sourceTree = ""; }; - E8F1559128129EBA00EE8C06 /* ContentSecretaryModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContentSecretaryModel.h; sourceTree = ""; }; - E8F1559228129EBA00EE8C06 /* ContentSecretaryModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ContentSecretaryModel.m; sourceTree = ""; }; E8F6135A291E26BD00E12650 /* NSMutableDictionary+Saft.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+Saft.h"; sourceTree = ""; }; E8F6135B291E26BD00E12650 /* NSMutableDictionary+Saft.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+Saft.m"; sourceTree = ""; }; E8F6135D291E274E00E12650 /* NSArray+Safe.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSArray+Safe.h"; sourceTree = ""; }; E8F6135E291E274E00E12650 /* NSArray+Safe.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Safe.m"; sourceTree = ""; }; - E8F63CAF298B553500B338BA /* SessionSayHelloLevelModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionSayHelloLevelModel.h; sourceTree = ""; }; - E8F63CB0298B553500B338BA /* SessionSayHelloLevelModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionSayHelloLevelModel.m; sourceTree = ""; }; - E8F63CB2298B563D00B338BA /* Api+SayHello.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+SayHello.h"; sourceTree = ""; }; - E8F63CB3298B563D00B338BA /* Api+SayHello.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+SayHello.m"; sourceTree = ""; }; - E8F63CB5298B566D00B338BA /* XPSessionSayHelloPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionSayHelloPresenter.h; sourceTree = ""; }; - E8F63CB6298B566D00B338BA /* XPSessionSayHelloPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionSayHelloPresenter.m; sourceTree = ""; }; - E8F63CB8298B5F3D00B338BA /* XPSessionSayHelloProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionSayHelloProtocol.h; sourceTree = ""; }; - E8F63CB9298B648300B338BA /* SessionSayHelloListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SessionSayHelloListModel.h; sourceTree = ""; }; - E8F63CBA298B648300B338BA /* SessionSayHelloListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SessionSayHelloListModel.m; sourceTree = ""; }; - E8F65C1D286998C9009BB5B9 /* XPMineShareViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineShareViewController.h; sourceTree = ""; }; - E8F65C1E286998C9009BB5B9 /* XPMineShareViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineShareViewController.m; sourceTree = ""; }; - E8F65C202869A36F009BB5B9 /* ContentShareMonentsModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContentShareMonentsModel.h; sourceTree = ""; }; - E8F65C212869A36F009BB5B9 /* ContentShareMonentsModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ContentShareMonentsModel.m; sourceTree = ""; }; - F1D8556D2931FC86008C418F /* XPRoomYearActivityView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomYearActivityView.h; sourceTree = ""; }; - F1D8556E2931FC86008C418F /* XPRoomYearActivityView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomYearActivityView.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -4820,10 +766,8 @@ 2377010A2BCF73DD00D661F1 /* libiconv.tbd in Frameworks */, 237701082BCF73CE00D661F1 /* Security.framework in Frameworks */, 4CD15D922D7EC2AC00D9279F /* CoreTelephony.framework in Frameworks */, - 234489082AC3C5DA0070E5D5 /* SudMGP.framework in Frameworks */, 73FFADDC93E195344047A2EC /* Pods_YuMi.framework in Frameworks */, 186A531926FC592100D67B2C /* libresolv.tbd in Frameworks */, - E87888F42738C30E00BF1D57 /* StoreKit.framework in Frameworks */, 9BA8A47727C60DF7000365A3 /* AVFoundation.framework in Frameworks */, 9BA8A47527C60D9F000365A3 /* AudioToolbox.framework in Frameworks */, ); @@ -4843,123 +787,6 @@ path = Base; sourceTree = ""; }; - 1427213629A75F6F00C7C423 /* CocoaHttpServer */ = { - isa = PBXGroup; - children = ( - 1427213829A75F6F00C7C423 /* Core */, - 1427217429A75F6F00C7C423 /* MyHTTPConnection.h */, - 1427213729A75F6F00C7C423 /* MyHTTPConnection.m */, - 1427217329A75F6F00C7C423 /* SJXCSMIPHelper.h */, - 1427218629A75F6F00C7C423 /* SJXCSMIPHelper.m */, - 1427217529A75F6F00C7C423 /* Vendor */, - 1427216029A75F6F00C7C423 /* Web */, - ); - path = CocoaHttpServer; - sourceTree = ""; - }; - 1427213829A75F6F00C7C423 /* Core */ = { - isa = PBXGroup; - children = ( - 1427213929A75F6F00C7C423 /* HTTPConnection.h */, - 1427213A29A75F6F00C7C423 /* HTTPLogging.h */, - 1427213B29A75F6F00C7C423 /* HTTPMessage.h */, - 1427213C29A75F6F00C7C423 /* WebSocket.h */, - 1427213D29A75F6F00C7C423 /* HTTPAuthenticationRequest.h */, - 1427213E29A75F6F00C7C423 /* Responses */, - 1427214B29A75F6F00C7C423 /* HTTPServer.h */, - 1427214C29A75F6F00C7C423 /* HTTPMessage.m */, - 1427214D29A75F6F00C7C423 /* HTTPConnection.m */, - 1427214E29A75F6F00C7C423 /* WebSocket.m */, - 1427214F29A75F6F00C7C423 /* HTTPResponse.h */, - 1427215029A75F6F00C7C423 /* Mime */, - 1427215729A75F6F00C7C423 /* HTTPAuthenticationRequest.m */, - 1427215829A75F6F00C7C423 /* Categories */, - 1427215F29A75F6F00C7C423 /* HTTPServer.m */, - ); - path = Core; - sourceTree = ""; - }; - 1427213E29A75F6F00C7C423 /* Responses */ = { - isa = PBXGroup; - children = ( - 1427213F29A75F6F00C7C423 /* HTTPAsyncFileResponse.h */, - 1427214029A75F6F00C7C423 /* HTTPErrorResponse.m */, - 1427214129A75F6F00C7C423 /* HTTPDataResponse.m */, - 1427214229A75F6F00C7C423 /* HTTPRedirectResponse.h */, - 1427214329A75F6F00C7C423 /* HTTPDynamicFileResponse.m */, - 1427214429A75F6F00C7C423 /* HTTPFileResponse.m */, - 1427214529A75F6F00C7C423 /* HTTPAsyncFileResponse.m */, - 1427214629A75F6F00C7C423 /* HTTPRedirectResponse.m */, - 1427214729A75F6F00C7C423 /* HTTPDataResponse.h */, - 1427214829A75F6F00C7C423 /* HTTPErrorResponse.h */, - 1427214929A75F6F00C7C423 /* HTTPFileResponse.h */, - 1427214A29A75F6F00C7C423 /* HTTPDynamicFileResponse.h */, - ); - path = Responses; - sourceTree = ""; - }; - 1427215029A75F6F00C7C423 /* Mime */ = { - isa = PBXGroup; - children = ( - 1427215129A75F6F00C7C423 /* MultipartFormDataParser.h */, - 1427215229A75F6F00C7C423 /* MultipartMessageHeader.h */, - 1427215329A75F6F00C7C423 /* MultipartMessageHeaderField.m */, - 1427215429A75F6F00C7C423 /* MultipartFormDataParser.m */, - 1427215529A75F6F00C7C423 /* MultipartMessageHeader.m */, - 1427215629A75F6F00C7C423 /* MultipartMessageHeaderField.h */, - ); - path = Mime; - sourceTree = ""; - }; - 1427215829A75F6F00C7C423 /* Categories */ = { - isa = PBXGroup; - children = ( - 1427215929A75F6F00C7C423 /* DDNumber.m */, - 1427215A29A75F6F00C7C423 /* DDData.m */, - 1427215B29A75F6F00C7C423 /* DDRange.h */, - 1427215C29A75F6F00C7C423 /* DDNumber.h */, - 1427215D29A75F6F00C7C423 /* DDRange.m */, - 1427215E29A75F6F00C7C423 /* DDData.h */, - ); - path = Categories; - sourceTree = ""; - }; - 1427216029A75F6F00C7C423 /* Web */ = { - isa = PBXGroup; - children = ( - 2368ECE12BC5280300EDF4C9 /* css */, - 2368ECE22BC5280300EDF4C9 /* images */, - 2368ECE42BC5280300EDF4C9 /* index.html */, - 2368ECE32BC5280300EDF4C9 /* js */, - 2368ECE62BC5280300EDF4C9 /* local */, - 2368ECE52BC5280300EDF4C9 /* upload.html */, - ); - path = Web; - sourceTree = ""; - }; - 1427217529A75F6F00C7C423 /* Vendor */ = { - isa = PBXGroup; - children = ( - 23194DBC2AD14BF000649F51 /* CocoaLumberjack */, - ); - path = Vendor; - sourceTree = ""; - }; - 14D8767E29A750A300E1DD7F /* YMWeb */ = { - isa = PBXGroup; - children = ( - E80E09AD2A41336500CD2BE7 /* XPWebViewNavView.h */, - E80E09AC2A41336500CD2BE7 /* XPWebViewNavView.m */, - 18E7B33026F317A20064BC9B /* XPWebViewController.h */, - 18E7B33126F317A20064BC9B /* XPWebViewController.m */, - 23A7FB672BDDEDFA00411860 /* MSRoomGameWebVC.h */, - 23A7FB682BDDEDFA00411860 /* MSRoomGameWebVC.m */, - 23EE97082BA2D39C00475D69 /* PIWebViewSavePhotoView.h */, - 23EE97092BA2D39C00475D69 /* PIWebViewSavePhotoView.m */, - ); - path = YMWeb; - sourceTree = ""; - }; 14D8768029A751A100E1DD7F /* Config */ = { isa = PBXGroup; children = ( @@ -4985,29 +812,6 @@ path = Network; sourceTree = ""; }; - 14DCAD12299B9B0B00A7DD31 /* NewLogin */ = { - isa = PBXGroup; - children = ( - 14B880E5299A4B62005FCA1B /* XPLoginPhoneViewController.h */, - 14B880E6299A4B62005FCA1B /* XPLoginPhoneViewController.m */, - 14DCAD06299B36A500A7DD31 /* XPLoginPwdViewController.h */, - 14DCAD07299B36A500A7DD31 /* XPLoginPwdViewController.m */, - 23942E8F2A86424500D0ECC2 /* XPLoginAuthCodeVC.h */, - 23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */, - 14DCAD0C299B6AD900A7DD31 /* XPForgetPwdViewController.h */, - 14DCAD0D299B6AD900A7DD31 /* XPForgetPwdViewController.m */, - 14DCAD09299B5D3A00A7DD31 /* XPLoginInputView.h */, - 14DCAD0A299B5D3A00A7DD31 /* XPLoginInputView.m */, - E818DD1A2A4896EE00F163F7 /* XPLoginAraeViewController.h */, - E818DD1B2A4896EE00F163F7 /* XPLoginAraeViewController.m */, - E818DD202A48977F00F163F7 /* XPLoginAreaTableViewCell.h */, - E818DD212A48977F00F163F7 /* XPLoginAreaTableViewCell.m */, - 2369F98F2A89CE0E00563B48 /* PIUserSexView.h */, - 2369F9902A89CE0E00563B48 /* PIUserSexView.m */, - ); - path = NewLogin; - sourceTree = ""; - }; 180116F6279E8C3100F2CBC0 /* Date */ = { isa = PBXGroup; children = ( @@ -5021,30 +825,6 @@ path = Date; sourceTree = ""; }; - 18486210271EA9A5005FC5DC /* YMRTC */ = { - isa = PBXGroup; - children = ( - 18486211271EA9DA005FC5DC /* RtcManager.h */, - 18486212271EA9DA005FC5DC /* RtcManager.m */, - 18486214271EAA03005FC5DC /* RtcDelegate.h */, - 1848623627200FDE005FC5DC /* RtcImpl */, - ); - path = YMRTC; - sourceTree = ""; - }; - 1848623627200FDE005FC5DC /* RtcImpl */ = { - isa = PBXGroup; - children = ( - 18486215271EAB8C005FC5DC /* BaseRtcImpl.h */, - 18486216271EAB8C005FC5DC /* BaseRtcImpl.m */, - 18F40438275E20D900A6C548 /* TRTCRtcImpl.h */, - 18F40439275E20D900A6C548 /* TRTCRtcImpl.m */, - E81D587B271FBC3B003063FE /* RtcInterface.h */, - 9BB865B4272076140029CDE0 /* RtcImplDelegate.h */, - ); - path = RtcImpl; - sourceTree = ""; - }; 187EEEA926E62679002833B2 /* Api */ = { isa = PBXGroup; children = ( @@ -5076,7 +856,6 @@ 189DD52B26DE255300AB55B1 /* YuMi */ = { isa = PBXGroup; children = ( - 23E9E9B62A82200500B792F2 /* GoogleService-Info.plist */, E8729EBA2A3B10C10076D80A /* YuMi.entitlements */, E8729EB92A3B10C10076D80A /* YuMiRelease.entitlements */, 4CD19DC92E9CDF980069DAA0 /* CustomUI */, @@ -5084,18 +863,15 @@ 236B2E1B2AA0786E003967A8 /* Library */, 189DD5A726DFA09700AB55B1 /* Tools */, 14D8768429A752B500E1DD7F /* Network */, - E8A1E45C276220B100B294CA /* Resources */, E81C279926EB64BA0031E639 /* Global */, 14D8768029A751A100E1DD7F /* Config */, 189DD56B26DF5B0900AB55B1 /* Structure */, 189DD56126DE45F800AB55B1 /* Modules */, + 4CF462D12EA10E1B005E96C0 /* YMWeb */, E81C27AF26EF39B00031E639 /* AppDelegate */, 189DD53826DE255600AB55B1 /* Assets.xcassets */, 2368ECD52BC38FDA00EDF4C9 /* Launch Screen.storyboard */, - 237700CE2BC697D400D661F1 /* pi_login_new_logo.png */, - 237FD35C2C0F187B00B5335C /* pi_app_logo_new_bg.png */, 4C7B90972E9F70FC00A5E236 /* ep_splash.png */, - 2396FCE32B22BE5D0014021D /* pi_area_info.json */, 189DD53D26DE255600AB55B1 /* Info.plist */, 2368ECD72BC38FED00EDF4C9 /* PrivacyInfo.xcprivacy */, 2368ECCD2BC38F9800EDF4C9 /* InfoPlist.strings */, @@ -5182,16 +958,10 @@ 189DD56126DE45F800AB55B1 /* Modules */ = { isa = PBXGroup; children = ( - 54283CE22CE48884009729B5 /* ShoppingMall */, - E87E624F2A3F54B5002F68C9 /* YMNewHome */, 18E7B1B426E8B2960064BC9B /* YMTabbar */, E81DCCC4282B620A0039E5C5 /* YMMonents */, - 18A61BCC274F72ED00A09A54 /* YMMessage */, E8E70D6E26F2EB1200F03460 /* YMMine */, - 18486210271EA9A5005FC5DC /* YMRTC */, - E8AEAED3271412D00017FCE0 /* YMRoom */, 189DD56226DE460400AB55B1 /* YMLogin */, - 14D8767E29A750A300E1DD7F /* YMWeb */, ); path = Modules; sourceTree = ""; @@ -5201,7 +971,6 @@ children = ( E8B825BC26E9E520009E8E9F /* Model */, 189DD75326E2211000AB55B1 /* Api */, - 189DD58A26DF978700AB55B1 /* View */, 189DD58B26DF978F00AB55B1 /* Presenter */, 189DD59126DF97F600AB55B1 /* Protocol */, ); @@ -5218,42 +987,9 @@ path = Structure; sourceTree = ""; }; - 189DD58A26DF978700AB55B1 /* View */ = { - isa = PBXGroup; - children = ( - 548E01C32C3F78360071C83D /* FeedBackViewController.h */, - 548E01C42C3F78360071C83D /* FeedBackViewController.m */, - 14DCAD12299B9B0B00A7DD31 /* NewLogin */, - E872308A26E89D5100B90D4F /* CustomView */, - E8B825C926EA1231009E8E9F /* LoginVerifCodeViewController.h */, - E8B825C826EA1231009E8E9F /* LoginVerifCodeViewController.m */, - E81366E126F0A1FC0076364C /* LoginBindPhoneViewController.h */, - E81366E226F0A1FC0076364C /* LoginBindPhoneViewController.m */, - E8AC723B26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.h */, - E8AC723C26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m */, - E81366F126F0B7C80076364C /* LoginFullInfoViewController.h */, - E81366F226F0B7C80076364C /* LoginFullInfoViewController.m */, - E824543326F57D6E00BE8163 /* XPLoginVerifBindPhoneViewController.h */, - E824543426F57D6E00BE8163 /* XPLoginVerifBindPhoneViewController.m */, - 23B2AEC32A6516C200543D17 /* LoginForgetPasswordViewController.h */, - 23B2AEC22A6516C200543D17 /* LoginForgetPasswordViewController.m */, - 4C5C37212D0C1C7900BA9AB8 /* RegionListViewController.h */, - 4C5C37222D0C1C7900BA9AB8 /* RegionListViewController.m */, - 4CD15D8F2D7E902800D9279F /* LoginViewController.h */, - 4CD15D902D7E902800D9279F /* LoginViewController.m */, - 4CD15D932D7FE9E400D9279F /* LoginTypesViewController.h */, - 4CD15D942D7FE9E400D9279F /* LoginTypesViewController.m */, - 4C38C2AE2D84070600CFA4A8 /* AccountBindingViewController.h */, - 4C38C2AF2D84070600CFA4A8 /* AccountBindingViewController.m */, - ); - path = View; - sourceTree = ""; - }; 189DD58B26DF978F00AB55B1 /* Presenter */ = { isa = PBXGroup; children = ( - 189DD58D26DF97E700AB55B1 /* LoginPresenter.h */, - 189DD58E26DF97E700AB55B1 /* LoginPresenter.m */, E8B825C026EA00DF009E8E9F /* LoginVerifCodePresent.h */, E8B825C126EA00DF009E8E9F /* LoginVerifCodePresent.m */, E8CEA03B26EA3DE500644B44 /* LoginPasswordPresent.h */, @@ -5264,8 +1000,6 @@ E81366F526F0C0DF0076364C /* LoginFullInfoPresenter.m */, E82109AE26F1D83500FC3319 /* LoginBindPhonePresent.h */, E82109AF26F1D83500FC3319 /* LoginBindPhonePresent.m */, - E824543626F5820A00BE8163 /* XPLoginVerifBindPhonePresenter.h */, - E824543726F5820A00BE8163 /* XPLoginVerifBindPhonePresenter.m */, ); path = Presenter; sourceTree = ""; @@ -5286,25 +1020,16 @@ 189DD5A726DFA09700AB55B1 /* Tools */ = { isa = PBXGroup; children = ( - 4C7F2A682E0BE7C8002F5058 /* FirstCharge */, - 4CC312212D79878B00F57A07 /* Share */, 23CEFC082AFB8FC100576D89 /* sdkContent */, 23FF255C2ABA8EEE0064E904 /* PIIAPTool */, 23E9EA9B2A84C42B00B792F2 /* SGYProgressView */, E83645A42A40AEF600E0DBE4 /* Bundle */, - E83645652A40A2CA00E0DBE4 /* CardManager */, 234E50AC2BF734FC005CB6D5 /* NSTextAttachment */, - 1427213629A75F6F00C7C423 /* CocoaHttpServer */, E8F61356291E269700E12650 /* Safe */, - 9B09979F27F19D1C00EB8F14 /* QGVAPlayer */, 9B33E3C827D85379003B0E62 /* File */, E80CBDE727D0C528001E1EC2 /* Timer */, 180116F6279E8C3100F2CBC0 /* Date */, - 9B17F71527BD14FF00440843 /* SVGAParserManager */, E88863D0278ED4A0004BCFAB /* Timestamp */, - E82D5C77276B25B000858D6D /* SpriteSheetManager */, - E865964E2701A1A900846EBD /* StatisticsService */, - E89DA6612700590A008483C1 /* IAPHelper */, E8EEB8EA26FC2050007C6EBA /* SDPhotoBrowser */, 2331C1BA2A60F67F00E1D940 /* UILabel */, E81366E426F0A4820076364C /* NSString */, @@ -5354,25 +1079,10 @@ children = ( 189DD76026E60DDC00AB55B1 /* Api+Login.h */, 189DD76126E60DDC00AB55B1 /* Api+Login.m */, - 23194DB92AD13EAB00649F51 /* PILoginManager.h */, - 23194DBA2AD13EAB00649F51 /* PILoginManager.m */, ); path = Api; sourceTree = ""; }; - 18A61BCC274F72ED00A09A54 /* YMMessage */ = { - isa = PBXGroup; - children = ( - E884C3782743B6AA00E1EBED /* Tool */, - 18F404B8276097F200A6C548 /* Model */, - 18F404BD276098A800A6C548 /* Api */, - 18F404BC2760989300A6C548 /* View */, - 18F404C4276099B300A6C548 /* Presenter */, - 18F404C5276099C800A6C548 /* Protocol */, - ); - path = YMMessage; - sourceTree = ""; - }; 18E7B1B426E8B2960064BC9B /* YMTabbar */ = { isa = PBXGroup; children = ( @@ -5385,493 +1095,6 @@ path = YMTabbar; sourceTree = ""; }; - 18EE3FF52754AFD900A452BF /* SessionList */ = { - isa = PBXGroup; - children = ( - 18A61BE6274F9CF000A09A54 /* SessionListViewController.h */, - 18A61BE7274F9CF000A09A54 /* SessionListViewController.m */, - 18EE3FDD2750C1F700A452BF /* SessionListCell.h */, - 18EE3FDE2750C1F700A452BF /* SessionListCell.m */, - 23E45C032AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.h */, - 23E45C042AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m */, - ); - path = SessionList; - sourceTree = ""; - }; - 18EE3FF72754B01D00A452BF /* NIMViews */ = { - isa = PBXGroup; - children = ( - 18EE3FE02750C29D00A452BF /* NIMBadgeView.h */, - 18EE3FE12750C29D00A452BF /* NIMBadgeView.m */, - 9B7D804F2753AA9D003DAC0C /* UITableView+NIMScrollToBottom.h */, - 9B7D804E2753AA9D003DAC0C /* UITableView+NIMScrollToBottom.m */, - 18EE3FF22750FA3700A452BF /* UIView+NIM.h */, - 18EE3FF32750FA3700A452BF /* UIView+NIM.m */, - ); - path = NIMViews; - sourceTree = ""; - }; - 18F403A72758B67900A6C548 /* Content */ = { - isa = PBXGroup; - children = ( - E81060D62987613E00B772F0 /* SesssionModel */, - 18F403A32758B5F900A6C548 /* MessageContentProtocol.h */, - E885D53A2977FBFD004DC088 /* MessageTimeView.h */, - E885D53B2977FBFD004DC088 /* MessageTimeView.m */, - E8383698298A59C100112E1C /* MessageTipsView.h */, - E8383699298A59C100112E1C /* MessageTipsView.m */, - 18F403C92758C66800A6C548 /* MessageContentText.h */, - 18F403CA2758C66800A6C548 /* MessageContentText.m */, - E8F1558B28124D5200EE8C06 /* MessageConentAudioView.h */, - E8F1558C28124D5200EE8C06 /* MessageConentAudioView.m */, - 18F403EC2758CF2F00A6C548 /* MessageContentImage.h */, - 18F403ED2758CF2F00A6C548 /* MessageContentImage.m */, - E873EB0A2809850D0071030D /* MessageContentCustomView.h */, - E873EB0B2809850D0071030D /* MessageContentCustomView.m */, - E873EB0D28098D500071030D /* MessageContentGiftView.h */, - E873EB0E28098D500071030D /* MessageContentGiftView.m */, - 18AAF3EE279EA59300CD7DAD /* MessageContentTextClickable.h */, - 18AAF3EF279EA59300CD7DAD /* MessageContentTextClickable.m */, - E80B0732280D740600A79F63 /* MessageContentGuildView.h */, - E80B0733280D740600A79F63 /* MessageContentGuildView.m */, - 233423D42AB0397500B1253F /* PIMessageContentServiceReplyView.h */, - 233423D52AB0397500B1253F /* PIMessageContentServiceReplyView.m */, - E83ABEF4280E9AD800322EE4 /* MessageContentUnSupportView.h */, - E83ABEF5280E9AD800322EE4 /* MessageContentUnSupportView.m */, - E83ABEF7280EAF3F00322EE4 /* MessageContentOpenLiveView.h */, - E83ABEF8280EAF3F00322EE4 /* MessageContentOpenLiveView.m */, - E83ABEFE280EC45700322EE4 /* MessageContentApplicationShareView.h */, - E83ABEFF280EC45700322EE4 /* MessageContentApplicationShareView.m */, - E83ABF04280EDE2B00322EE4 /* MessageContentLevelUpgradeView.h */, - E83ABF05280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m */, - E86507E3281A7D4D006951B0 /* MessageContentTweetView.h */, - E86507E4281A7D4D006951B0 /* MessageContentTweetView.m */, - E86507E9281A88A9006951B0 /* MessageContentSkillCardView.h */, - E86507EA281A88A9006951B0 /* MessageContentSkillCardView.m */, - E8E0DADE285C20E500566A2F /* MessageContentFindNewGreetView.h */, - E8E0DADF285C20E500566A2F /* MessageContentFindNewGreetView.m */, - E86E79CB28A4E045006DAF48 /* MessageContentRiskAlertView.h */, - E86E79CC28A4E045006DAF48 /* MessageContentRiskAlertView.m */, - E85E3FA528B7A6F000268DC8 /* MessageContentMonentsView.h */, - E85E3FA628B7A6F000268DC8 /* MessageContentMonentsView.m */, - E80A63DA28B86B9700690914 /* MessageContentMonentsAutoView.h */, - E80A63DB28B86B9700690914 /* MessageContentMonentsAutoView.m */, - 9B88E20A28C5EB8300D26FBA /* MessageContentRedPacketView.h */, - 9B88E20B28C5EB8300D26FBA /* MessageContentRedPacketView.m */, - E8778AE22988B57B00CF139B /* MessageContentRevokeView.h */, - E8778AE32988B57B00CF139B /* MessageContentRevokeView.m */, - 54C9A1232C3E74AE00C6D970 /* MessageGameOrderView.h */, - 54C9A1242C3E74AE00C6D970 /* MessageGameOrderView.m */, - ); - path = Content; - sourceTree = ""; - }; - 18F404B8276097F200A6C548 /* Model */ = { - isa = PBXGroup; - children = ( - E899C68D2750DA3C00E189E5 /* CustomMessage */, - E884C36D2743AAC800E1EBED /* AttachmentModel.h */, - E884C36E2743AAC800E1EBED /* AttachmentModel.m */, - E8D55C9A281131F1006935A5 /* SessionToolBar */, - E83ABEFA280EB5A000322EE4 /* SessionContent */, - 18F404B92760982000A6C548 /* ChatLimitModel.h */, - 18F404BA2760982000A6C548 /* ChatLimitModel.m */, - E885D5342977CE28004DC088 /* SessionSettingModel.h */, - E885D5352977CE28004DC088 /* SessionSettingModel.m */, - ); - path = Model; - sourceTree = ""; - }; - 18F404BC2760989300A6C548 /* View */ = { - isa = PBXGroup; - children = ( - E8778AE82988EE9200CF139B /* SayHello */, - 9BD798AE29262306003E03E6 /* SessionListHeadView */, - E8A30BDB28534667003B4873 /* FindNew */, - 18EE3FF72754B01D00A452BF /* NIMViews */, - 18EE3FF52754AFD900A452BF /* SessionList */, - 9B7D804727537819003DAC0C /* Session */, - 18EE3FEC2750CE6D00A452BF /* NIMMessageUtils.h */, - 18EE3FED2750CE6D00A452BF /* NIMMessageUtils.m */, - 18EE3FEF2750D2AD00A452BF /* NIMTimeUtils.h */, - 18EE3FF02750D2AD00A452BF /* NIMTimeUtils.m */, - 18EE40192754BA9F00A452BF /* NIMMessageMaker.h */, - 18EE40182754BA9F00A452BF /* NIMMessageMaker.m */, - E8F1558E28125E2D00EE8C06 /* MessageAudioCenter.h */, - E8F1558F28125E2D00EE8C06 /* MessageAudioCenter.m */, - ); - path = View; - sourceTree = ""; - }; - 18F404BD276098A800A6C548 /* Api */ = { - isa = PBXGroup; - children = ( - 18F404C1276098F100A6C548 /* Api+Message.h */, - 18F404C2276098F100A6C548 /* Api+Message.m */, - ); - path = Api; - sourceTree = ""; - }; - 18F404C4276099B300A6C548 /* Presenter */ = { - isa = PBXGroup; - children = ( - 18F404C727609A4300A6C548 /* MessagePresenter.h */, - 18F404C827609A4300A6C548 /* MessagePresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - 18F404C5276099C800A6C548 /* Protocol */ = { - isa = PBXGroup; - children = ( - 18F404C6276099DF00A6C548 /* MessageProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - 2305EEE62AD677D300AD403C /* RoomPhotoAlbum */ = { - isa = PBXGroup; - children = ( - 2305EEE72AD677D300AD403C /* Presenter */, - 2305EEE82AD677D300AD403C /* Protocol */, - 2305EEE92AD677D300AD403C /* Model */, - 2305EEEA2AD677D300AD403C /* View */, - 2305EEED2AD677D300AD403C /* Api */, - ); - path = RoomPhotoAlbum; - sourceTree = ""; - }; - 2305EEE72AD677D300AD403C /* Presenter */ = { - isa = PBXGroup; - children = ( - 23D321D02ADD0EBC006B259C /* PIRoomPhotoAlbumItemPresenter.h */, - 23D321D12ADD0EBC006B259C /* PIRoomPhotoAlbumItemPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - 2305EEE82AD677D300AD403C /* Protocol */ = { - isa = PBXGroup; - children = ( - 23D321D62ADD0F2C006B259C /* PIRoomPhotoAlbumItemProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - 2305EEE92AD677D300AD403C /* Model */ = { - isa = PBXGroup; - children = ( - 2305EEFF2AD6A33E00AD403C /* PIRoomPhotoAlbumItemChoosePhotoModel.h */, - 2305EF002AD6A33E00AD403C /* PIRoomPhotoAlbumItemChoosePhotoModel.m */, - 23D321D72ADD1B46006B259C /* PIRoomPhotoAlbumItemModel.h */, - 23D321D82ADD1B46006B259C /* PIRoomPhotoAlbumItemModel.m */, - ); - path = Model; - sourceTree = ""; - }; - 2305EEEA2AD677D300AD403C /* View */ = { - isa = PBXGroup; - children = ( - 2305EEEB2AD677D300AD403C /* SubViews */, - 2305EEEC2AD677D300AD403C /* Cell */, - 2305EEEE2AD677F200AD403C /* PIRoomPhotoAlbumVC.h */, - 2305EEEF2AD677F200AD403C /* PIRoomPhotoAlbumVC.m */, - 2305EEF12AD67A8D00AD403C /* PIRoomPhotoAlbumItemVC.h */, - 2305EEF22AD67A8D00AD403C /* PIRoomPhotoAlbumItemVC.m */, - ); - path = View; - sourceTree = ""; - }; - 2305EEEB2AD677D300AD403C /* SubViews */ = { - isa = PBXGroup; - children = ( - 2305EEF92AD696B400AD403C /* PIRoomPhotoAlbumChoosePhotoView.h */, - 2305EEFA2AD696B400AD403C /* PIRoomPhotoAlbumChoosePhotoView.m */, - 2305EF022AD6B11700AD403C /* PIRoomPhotoAlbumChoosePhotoTypeView.h */, - 2305EF032AD6B11700AD403C /* PIRoomPhotoAlbumChoosePhotoTypeView.m */, - 2305EF052AD6B51200AD403C /* PIRoomPhotoAlbumChoosePhotoGiftView.h */, - 2305EF062AD6B51200AD403C /* PIRoomPhotoAlbumChoosePhotoGiftView.m */, - 2305EF082AD7CC7C00AD403C /* PIRoomPhotoAlbumChooseGiftView.h */, - 2305EF092AD7CC7C00AD403C /* PIRoomPhotoAlbumChooseGiftView.m */, - 2305F3392AD9293D00AD403C /* PIRoomPhotoAlbumOperateView.h */, - 2305F33A2AD9293D00AD403C /* PIRoomPhotoAlbumOperateView.m */, - ); - path = SubViews; - sourceTree = ""; - }; - 2305EEEC2AD677D300AD403C /* Cell */ = { - isa = PBXGroup; - children = ( - 2305EEF42AD67E5500AD403C /* PIRoomPhotoAlbumItemCell.h */, - 2305EEF52AD67E5500AD403C /* PIRoomPhotoAlbumItemCell.m */, - 2305EEFC2AD6978200AD403C /* PIRoomPhotoAlbumChoosePhotoCell.h */, - 2305EEFD2AD6978200AD403C /* PIRoomPhotoAlbumChoosePhotoCell.m */, - 2305EF0B2AD7CC9A00AD403C /* PIRoomPhotoAlbumChooseGiftCell.h */, - 2305EF0C2AD7CC9A00AD403C /* PIRoomPhotoAlbumChooseGiftCell.m */, - 2305F33C2AD9295800AD403C /* PIRoomPhotoAlbumOperateCell.h */, - 2305F33D2AD9295800AD403C /* PIRoomPhotoAlbumOperateCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - 2305EEED2AD677D300AD403C /* Api */ = { - isa = PBXGroup; - children = ( - 23D321D32ADD0F05006B259C /* Api+PhotoAlbum.h */, - 23D321D42ADD0F05006B259C /* Api+PhotoAlbum.m */, - ); - path = Api; - sourceTree = ""; - }; - 23194DBC2AD14BF000649F51 /* CocoaLumberjack */ = { - isa = PBXGroup; - children = ( - 23194DBD2AD14BF000649F51 /* DDTTYLogger.m */, - 23194DBE2AD14BF000649F51 /* DDLog.h */, - 23194DBF2AD14BF000649F51 /* DDAbstractDatabaseLogger.h */, - 23194DC02AD14BF000649F51 /* DDASLLogger.m */, - 23194DC12AD14BF000649F51 /* DDFileLogger.h */, - 23194DC22AD14BF000649F51 /* Extensions */, - 23194DC72AD14BF000649F51 /* DDLog.m */, - 23194DC82AD14BF000649F51 /* DDTTYLogger.h */, - 23194DC92AD14BF000649F51 /* DDAbstractDatabaseLogger.m */, - 23194DCA2AD14BF000649F51 /* DDFileLogger.m */, - 23194DCB2AD14BF000649F51 /* DDASLLogger.h */, - ); - path = CocoaLumberjack; - sourceTree = ""; - }; - 23194DC22AD14BF000649F51 /* Extensions */ = { - isa = PBXGroup; - children = ( - 23194DC32AD14BF000649F51 /* ContextFilterLogFormatter.h */, - 23194DC42AD14BF000649F51 /* DispatchQueueLogFormatter.h */, - 23194DC52AD14BF000649F51 /* ContextFilterLogFormatter.m */, - 23194DC62AD14BF000649F51 /* DispatchQueueLogFormatter.m */, - ); - path = Extensions; - sourceTree = ""; - }; - 2331C12F2A5EB71000E1D940 /* Noble */ = { - isa = PBXGroup; - children = ( - 2331C1302A5EB71000E1D940 /* Presenter */, - 2331C1332A5EB71000E1D940 /* Protocol */, - 2331C1352A5EB71000E1D940 /* Model */, - 2331C1402A5EB71000E1D940 /* View */, - 2331C1602A5EB71000E1D940 /* Api */, - ); - path = Noble; - sourceTree = ""; - }; - 2331C1302A5EB71000E1D940 /* Presenter */ = { - isa = PBXGroup; - children = ( - 2331C1312A5EB71000E1D940 /* XPNobleCenterPresenter.h */, - 2331C1322A5EB71000E1D940 /* XPNobleCenterPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - 2331C1332A5EB71000E1D940 /* Protocol */ = { - isa = PBXGroup; - children = ( - 2331C1342A5EB71000E1D940 /* XPNobleCenterProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - 2331C1352A5EB71000E1D940 /* Model */ = { - isa = PBXGroup; - children = ( - 2331C1382A5EB71000E1D940 /* NobleAuthInfo.h */, - 2331C13D2A5EB71000E1D940 /* NobleAuthInfo.m */, - 23F963682BB6919D00F440A6 /* PINobleRebateModel.h */, - 23F963692BB6919D00F440A6 /* PINobleRebateModel.m */, - 2331C13E2A5EB71000E1D940 /* NobleCenterModel.h */, - 2331C13A2A5EB71000E1D940 /* NobleCenterModel.m */, - 2331C13B2A5EB71000E1D940 /* NobleInfo.h */, - 2331C1362A5EB71000E1D940 /* NobleInfo.m */, - 2331C1372A5EB71000E1D940 /* NobleLevelUpModel.h */, - 2331C13C2A5EB71000E1D940 /* NobleLevelUpModel.m */, - 2331C13F2A5EB71000E1D940 /* NobleRechargeModel.h */, - 2331C1392A5EB71000E1D940 /* NobleRechargeModel.m */, - 23FE47E52BB4378700F09D23 /* PINobleCenterListModel.h */, - 23FE47E62BB4378700F09D23 /* PINobleCenterListModel.m */, - ); - path = Model; - sourceTree = ""; - }; - 2331C1402A5EB71000E1D940 /* View */ = { - isa = PBXGroup; - children = ( - 2331C1452A5EB71000E1D940 /* SubViews */, - 2331C1422A5EB71000E1D940 /* ThemeColor+NobleCenter.h */, - 2331C15D2A5EB71000E1D940 /* ThemeColor+NobleCenter.m */, - 2331C1432A5EB71000E1D940 /* XPNobleCenterListViewController.h */, - 2331C15E2A5EB71000E1D940 /* XPNobleCenterListViewController.m */, - 5456F3C62C6EF962000E1805 /* VIPCenterViewController.h */, - 5456F3C72C6EF962000E1805 /* VIPCenterViewController.m */, - 2331C15C2A5EB71000E1D940 /* XPNobleSettingViewController.h */, - 2331C1412A5EB71000E1D940 /* XPNobleSettingViewController.m */, - ); - path = View; - sourceTree = ""; - }; - 2331C1452A5EB71000E1D940 /* SubViews */ = { - isa = PBXGroup; - children = ( - 2331C17A2A5EB7AB00E1D940 /* XPNobleCenterEntranceView.h */, - 2331C1792A5EB7AB00E1D940 /* XPNobleCenterEntranceView.m */, - 2331C1462A5EB71000E1D940 /* XPNobleAuthorityDescView.h */, - 2331C1532A5EB71000E1D940 /* XPNobleAuthorityDescView.m */, - 2331C1552A5EB71000E1D940 /* XPNobleCenterEmptyView.h */, - 2331C14C2A5EB71000E1D940 /* XPNobleCenterEmptyView.m */, - 2331C14D2A5EB71000E1D940 /* XPNobleCenterNavView.h */, - 2331C1542A5EB71000E1D940 /* XPNobleCenterNavView.m */, - 2331C14F2A5EB71000E1D940 /* XPNobleCenterResidueView.h */, - 2331C15A2A5EB71000E1D940 /* XPNobleCenterResidueView.m */, - 2331C14A2A5EB71000E1D940 /* XPNobleCenterTableHeadView.h */, - 2331C1572A5EB71000E1D940 /* XPNobleCenterTableHeadView.m */, - 2331C1502A5EB71000E1D940 /* XPNoblePrivilegeCell.h */, - 2331C1592A5EB71000E1D940 /* XPNoblePrivilegeCell.m */, - 2331C14B2A5EB71000E1D940 /* XPNoblePrivilegeContentCell.h */, - 2331C1562A5EB71000E1D940 /* XPNoblePrivilegeContentCell.m */, - 236BA4962BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.h */, - 236BA4972BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m */, - 2331C1472A5EB71000E1D940 /* XPNobleSettingNavView.h */, - 2331C1522A5EB71000E1D940 /* XPNobleSettingNavView.m */, - 2331C14E2A5EB71000E1D940 /* XPNobleUpgradeLevelView.h */, - 2331C15B2A5EB71000E1D940 /* XPNobleUpgradeLevelView.m */, - 2331C17C2A5ECCF600E1D940 /* XPNobleCenterPayView.h */, - 2331C17D2A5ECCF600E1D940 /* XPNobleCenterPayView.m */, - 2331C17F2A5ECD3800E1D940 /* XPNobleCenterPayCell.h */, - 2331C1802A5ECD3800E1D940 /* XPNobleCenterPayCell.m */, - 23FE47D32BB3C64600F09D23 /* PINobleCenterTitleCell.h */, - 23FE47D42BB3C64600F09D23 /* PINobleCenterTitleCell.m */, - 23FE47D62BB3CEAF00F09D23 /* PINobleCenterTitleView.h */, - 23FE47D72BB3CEAF00F09D23 /* PINobleCenterTitleView.m */, - 23FE47D92BB4171C00F09D23 /* PINobleCenterListView.h */, - 23FE47DA2BB4171C00F09D23 /* PINobleCenterListView.m */, - 23FE47DF2BB41CF200F09D23 /* PINobleCenterListReusableView.h */, - 23FE47E02BB41CF200F09D23 /* PINobleCenterListReusableView.m */, - 23FE47E22BB41EBF00F09D23 /* PINobleCenterListCell.h */, - 23FE47E32BB41EBF00F09D23 /* PINobleCenterListCell.m */, - 23E7FE9A2BB6CD42008F6800 /* XPNobleCenterWindow.h */, - 23E7FE9B2BB6CD42008F6800 /* XPNobleCenterWindow.m */, - 5412E0F22C4E460300FDD668 /* XPMineCenterAgencyView.h */, - 5412E0F32C4E460300FDD668 /* XPMineCenterAgencyView.m */, - ); - path = SubViews; - sourceTree = ""; - }; - 2331C1602A5EB71000E1D940 /* Api */ = { - isa = PBXGroup; - children = ( - 2331C1612A5EB71000E1D940 /* Api+NobleCenter.h */, - 2331C1622A5EB71000E1D940 /* Api+NobleCenter.m */, - ); - path = Api; - sourceTree = ""; - }; - 2331C1822A60F32D00E1D940 /* CandyTree */ = { - isa = PBXGroup; - children = ( - 2331C1832A60F32D00E1D940 /* Presenter */, - 2331C1862A60F32D00E1D940 /* Protocol */, - 2331C1882A60F32D00E1D940 /* Model */, - 2331C1912A60F32D00E1D940 /* View */, - 2331C1A72A60F32D00E1D940 /* Api */, - ); - path = CandyTree; - sourceTree = ""; - }; - 2331C1832A60F32D00E1D940 /* Presenter */ = { - isa = PBXGroup; - children = ( - 2331C1852A60F32D00E1D940 /* XPCandyTreePresenter.h */, - 2331C1842A60F32D00E1D940 /* XPCandyTreePresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - 2331C1862A60F32D00E1D940 /* Protocol */ = { - isa = PBXGroup; - children = ( - 2331C1872A60F32D00E1D940 /* XPCandyTreeProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - 2331C1882A60F32D00E1D940 /* Model */ = { - isa = PBXGroup; - children = ( - 2331C18C2A60F32D00E1D940 /* CandyTreeInfoModel.h */, - 2331C1902A60F32D00E1D940 /* CandyTreeInfoModel.m */, - 2331C18E2A60F32D00E1D940 /* CandyTreeRecordModel.h */, - 2331C18A2A60F32D00E1D940 /* CandyTreeRecordModel.m */, - 2331C18F2A60F32D00E1D940 /* CandyTreeResultModel.h */, - 2331C1892A60F32D00E1D940 /* CandyTreeResultModel.m */, - 233423CE2AAEFBC300B1253F /* PICandyTreeSetModel.h */, - 233423CF2AAEFBC300B1253F /* PICandyTreeSetModel.m */, - 2331C18B2A60F32D00E1D940 /* XPCandyTreeAnimationModel.h */, - 2331C18D2A60F32D00E1D940 /* XPCandyTreeAnimationModel.m */, - ); - path = Model; - sourceTree = ""; - }; - 2331C1912A60F32D00E1D940 /* View */ = { - isa = PBXGroup; - children = ( - 2331C1992A60F32D00E1D940 /* Cell */, - 2331C1982A60F32D00E1D940 /* XPCandyRankContainerView.h */, - 2331C1A52A60F32D00E1D940 /* XPCandyRankContainerView.m */, - 233423C52AAEE5C600B1253F /* XPCandyTreeBuySuccessView.h */, - 233423C62AAEE5C600B1253F /* XPCandyTreeBuySuccessView.m */, - 23FF428C2AAB2D3A0055733C /* XPCandyTreeBuyView.h */, - 23FF428D2AAB2D3A0055733C /* XPCandyTreeBuyView.m */, - 233423CB2AAEE98200B1253F /* XPCandyTreeConfirmBuyNumView.h */, - 233423CC2AAEE98200B1253F /* XPCandyTreeConfirmBuyNumView.m */, - 233423C82AAEE97500B1253F /* XPCandyTreeConfirmBuyView.h */, - 233423C92AAEE97500B1253F /* XPCandyTreeConfirmBuyView.m */, - 2331C1A32A60F32D00E1D940 /* XPCandyTreeGiftView.h */, - 2331C1962A60F32D00E1D940 /* XPCandyTreeGiftView.m */, - 2331C1952A60F32D00E1D940 /* XPCandyTreeInsufficientBalanceView.h */, - 2331C1A42A60F32D00E1D940 /* XPCandyTreeInsufficientBalanceView.m */, - 2331C1A22A60F32D00E1D940 /* XPCandyTreeMoreView.h */, - 2331C1932A60F32D00E1D940 /* XPCandyTreeMoreView.m */, - 2331C1A02A60F32D00E1D940 /* XPCandyTreeRankView.h */, - 2331C1922A60F32D00E1D940 /* XPCandyTreeRankView.m */, - 2331C1942A60F32D00E1D940 /* XPCandyTreeViewController.h */, - 2331C1A12A60F32D00E1D940 /* XPCandyTreeViewController.m */, - 2331C1972A60F32D00E1D940 /* XPRoomHalfWebView.h */, - 2331C1A62A60F32D00E1D940 /* XPRoomHalfWebView.m */, - ); - path = View; - sourceTree = ""; - }; - 2331C1992A60F32D00E1D940 /* Cell */ = { - isa = PBXGroup; - children = ( - 2331C19E2A60F32D00E1D940 /* XPCandyTreeEmptyableViewCell.h */, - 2331C19A2A60F32D00E1D940 /* XPCandyTreeEmptyableViewCell.m */, - 2331C19D2A60F32D00E1D940 /* XPCandyTreeMoreRuleCell.h */, - 2331C19B2A60F32D00E1D940 /* XPCandyTreeMoreRuleCell.m */, - 2331C19F2A60F32D00E1D940 /* XPCandyTreeRankTableViewCell.h */, - 2331C19C2A60F32D00E1D940 /* XPCandyTreeRankTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - 2331C1A72A60F32D00E1D940 /* Api */ = { - isa = PBXGroup; - children = ( - 2331C1A82A60F32D00E1D940 /* Api+CandyTree.m */, - 2331C1A92A60F32D00E1D940 /* Api+CandyTree.h */, - ); - path = Api; - sourceTree = ""; - }; 2331C1BA2A60F67F00E1D940 /* UILabel */ = { isa = PBXGroup; children = ( @@ -5893,94 +1116,11 @@ 236B2E1B2AA0786E003967A8 /* Library */ = { isa = PBXGroup; children = ( - 234489072AC3C5DA0070E5D5 /* SudMGP.framework */, 4C47079F2D5342C500C8CD24 /* GZIP */, ); path = Library; sourceTree = ""; }; - 236B2E202AA07D06003967A8 /* LittleGame */ = { - isa = PBXGroup; - children = ( - 236B2E3F2AA07D06003967A8 /* Api */, - 236B2E2E2AA07D06003967A8 /* Model */, - 236B2E212AA07D06003967A8 /* Presenter */, - 236B2E312AA07D06003967A8 /* View */, - ); - path = LittleGame; - sourceTree = ""; - }; - 236B2E212AA07D06003967A8 /* Presenter */ = { - isa = PBXGroup; - children = ( - 236B2E242AA07D06003967A8 /* Category */, - 236B2E2D2AA07D06003967A8 /* SudCommon.h */, - 236B2E232AA07D06003967A8 /* SudCommon.m */, - 236B2E222AA07D06003967A8 /* SudGameConfig.h */, - ); - path = Presenter; - sourceTree = ""; - }; - 236B2E242AA07D06003967A8 /* Category */ = { - isa = PBXGroup; - children = ( - 236B2E2C2AA07D06003967A8 /* NSData+RW.h */, - 236B2E282AA07D06003967A8 /* NSData+RW.m */, - 236B2E292AA07D06003967A8 /* NSString+RW.h */, - 236B2E252AA07D06003967A8 /* NSString+RW.m */, - 236B2E2B2AA07D06003967A8 /* UIColor+RW.h */, - 236B2E272AA07D06003967A8 /* UIColor+RW.m */, - 236B2E262AA07D06003967A8 /* UIImage+RW.h */, - 236B2E2A2AA07D06003967A8 /* UIImage+RW.m */, - ); - path = Category; - sourceTree = ""; - }; - 236B2E2E2AA07D06003967A8 /* Model */ = { - isa = PBXGroup; - children = ( - 236B2E2F2AA07D06003967A8 /* LittleGameInfoModel.h */, - 236B2E302AA07D06003967A8 /* LittleGameInfoModel.m */, - ); - path = Model; - sourceTree = ""; - }; - 236B2E312AA07D06003967A8 /* View */ = { - isa = PBXGroup; - children = ( - 236B2E362AA07D06003967A8 /* Cell */, - 236B2E3B2AA07D06003967A8 /* XPLittleGameMiniStageView.h */, - 236B2E332AA07D06003967A8 /* XPLittleGameMiniStageView.m */, - 236B2E322AA07D06003967A8 /* XPLittleGameRoomListView.h */, - 236B2E3C2AA07D06003967A8 /* XPLittleGameRoomListView.m */, - 236B2E352AA07D06003967A8 /* XPLittleGameRoomOpenView.h */, - 236B2E3D2AA07D06003967A8 /* XPLittleGameRoomOpenView.m */, - 236B2E342AA07D06003967A8 /* XPRoomLittleGameContainerView.h */, - 236B2E3E2AA07D06003967A8 /* XPRoomLittleGameContainerView.m */, - ); - path = View; - sourceTree = ""; - }; - 236B2E362AA07D06003967A8 /* Cell */ = { - isa = PBXGroup; - children = ( - 236B2E392AA07D06003967A8 /* XPCreateLittleGameCollectionViewCell.h */, - 236B2E382AA07D06003967A8 /* XPCreateLittleGameCollectionViewCell.m */, - 236B2E372AA07D06003967A8 /* XPLittleGameTableViewCell.h */, - 236B2E3A2AA07D06003967A8 /* XPLittleGameTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - 236B2E3F2AA07D06003967A8 /* Api */ = { - isa = PBXGroup; - children = ( - 236B2E412AA07D06003967A8 /* Api+LittleGame.h */, - 236B2E402AA07D06003967A8 /* Api+LittleGame.m */, - ); - path = Api; - sourceTree = ""; - }; 237700D02BC7CC7C00D661F1 /* MJExtension */ = { isa = PBXGroup; children = ( @@ -5990,181 +1130,6 @@ path = MJExtension; sourceTree = ""; }; - 237B94AB2A984DA7007853E3 /* NobleTrumpet */ = { - isa = PBXGroup; - children = ( - 237B94AC2A984DA7007853E3 /* Presenter */, - 237B94AF2A984DA7007853E3 /* Protocol */, - 237B94B12A984DA7007853E3 /* Model */, - 237B94B42A984DA7007853E3 /* View */, - 237B94B92A984DA7007853E3 /* Api */, - ); - path = NobleTrumpet; - sourceTree = ""; - }; - 237B94AC2A984DA7007853E3 /* Presenter */ = { - isa = PBXGroup; - children = ( - 237B94AD2A984DA7007853E3 /* XPTrumpetPresenter.h */, - 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - 237B94AF2A984DA7007853E3 /* Protocol */ = { - isa = PBXGroup; - children = ( - 237B94B02A984DA7007853E3 /* XPRoomTrumpetProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - 237B94B12A984DA7007853E3 /* Model */ = { - isa = PBXGroup; - children = ( - 237B94B22A984DA7007853E3 /* XPNobleTrumpetModel.h */, - 237B94B32A984DA7007853E3 /* XPNobleTrumpetModel.m */, - ); - path = Model; - sourceTree = ""; - }; - 237B94B42A984DA7007853E3 /* View */ = { - isa = PBXGroup; - children = ( - 237B94B52A984DA7007853E3 /* XPRoomTrumpetViewController.h */, - 237B94B62A984DA7007853E3 /* XPRoomTrumpetView.h */, - 237B94B72A984DA7007853E3 /* XPRoomTrumpetViewController.m */, - 237B94B82A984DA7007853E3 /* XPRoomTrumpetView.m */, - ); - path = View; - sourceTree = ""; - }; - 237B94B92A984DA7007853E3 /* Api */ = { - isa = PBXGroup; - children = ( - 237B94BA2A984DA7007853E3 /* Api+RoomTrumpet.m */, - 237B94BB2A984DA7007853E3 /* Api+RoomTrumpet.h */, - ); - path = Api; - sourceTree = ""; - }; - 239D0F932BFB3284002977CE /* MSRoomOnLineView */ = { - isa = PBXGroup; - children = ( - 239D0F942BFB3296002977CE /* MSRoomOnLineView.h */, - 239D0F952BFB3296002977CE /* MSRoomOnLineView.m */, - 239D0F972BFB43BC002977CE /* MSRoomOnLineAvatarView.h */, - 239D0F982BFB43BC002977CE /* MSRoomOnLineAvatarView.m */, - ); - path = MSRoomOnLineView; - sourceTree = ""; - }; - 239D0FBF2C045F92002977CE /* Api */ = { - isa = PBXGroup; - children = ( - 239D0FEB2C057362002977CE /* Api+MSRoomGameApi.h */, - 239D0FEC2C057362002977CE /* Api+MSRoomGameApi.m */, - ); - path = Api; - sourceTree = ""; - }; - 239D0FC02C045F92002977CE /* Model */ = { - isa = PBXGroup; - children = ( - 239D0FD62C047DD8002977CE /* MSTabbarRoomGameModel.h */, - 239D0FD72C047DD8002977CE /* MSTabbarRoomGameModel.m */, - 2378529F2C072D8D00E360AC /* MSRoomGameModel.h */, - 237852A02C072D8D00E360AC /* MSRoomGameModel.m */, - 237852A52C08764B00E360AC /* MSRoomGameResultsModel.h */, - 237852A62C08764B00E360AC /* MSRoomGameResultsModel.m */, - ); - path = Model; - sourceTree = ""; - }; - 239D0FC12C045F92002977CE /* Presenter */ = { - isa = PBXGroup; - children = ( - 239D0FEE2C057470002977CE /* MSRoomGamePresenter.h */, - 239D0FEF2C057470002977CE /* MSRoomGamePresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - 239D0FC22C045F92002977CE /* Protocol */ = { - isa = PBXGroup; - children = ( - 239D0FF12C057D2E002977CE /* MSRoomGameProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - 239D0FC32C045F92002977CE /* Cell */ = { - isa = PBXGroup; - children = ( - 239D0FD92C047F24002977CE /* MSTabbarRoomGameCell.h */, - 239D0FDA2C047F24002977CE /* MSTabbarRoomGameCell.m */, - 239D0FF82C05BE9B002977CE /* MSRoomGameVictoryCell.h */, - 239D0FF92C05BE9B002977CE /* MSRoomGameVictoryCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - 239D0FC42C045F92002977CE /* SubView */ = { - isa = PBXGroup; - children = ( - 239D0FCD2C046048002977CE /* MSTabbarRoomGameHeadView.h */, - 239D0FCE2C046048002977CE /* MSTabbarRoomGameHeadView.m */, - 239D0FD02C046EAD002977CE /* MSTabbarRoomGameView.h */, - 239D0FD12C046EAD002977CE /* MSTabbarRoomGameView.m */, - 239D0FD32C0475E6002977CE /* MSTabbarBeginGameView.h */, - 239D0FD42C0475E6002977CE /* MSTabbarBeginGameView.m */, - 239D0FDF2C04850A002977CE /* MSRoomGameHeadView.h */, - 239D0FE02C04850A002977CE /* MSRoomGameHeadView.m */, - 239D0FE22C048700002977CE /* MSRoomGameHeadAvatarView.h */, - 239D0FE32C048700002977CE /* MSRoomGameHeadAvatarView.m */, - 239D0FE52C049D61002977CE /* MSRoomGameMsgView.h */, - 239D0FE62C049D61002977CE /* MSRoomGameMsgView.m */, - 239D0FE82C04A9EE002977CE /* MSRoomGameSendMsgView.h */, - 239D0FE92C04A9EE002977CE /* MSRoomGameSendMsgView.m */, - 239D0FF22C05B9D2002977CE /* MSRoomGameView.h */, - 239D0FF32C05B9D2002977CE /* MSRoomGameView.m */, - 239D0FF52C05BD2A002977CE /* MSRoomGameVictoryView.h */, - 239D0FF62C05BD2A002977CE /* MSRoomGameVictoryView.m */, - 239D0FFB2C05D086002977CE /* MSRoomGameQuitGameView.h */, - 239D0FFC2C05D086002977CE /* MSRoomGameQuitGameView.m */, - 237852A22C082A9800E360AC /* MSRoomGameSendTextView.h */, - 237852A32C082A9800E360AC /* MSRoomGameSendTextView.m */, - ); - path = SubView; - sourceTree = ""; - }; - 239D0FC72C045F92002977CE /* View */ = { - isa = PBXGroup; - children = ( - 239D0FC32C045F92002977CE /* Cell */, - 239D0FC42C045F92002977CE /* SubView */, - 239D0FC52C045F92002977CE /* MSRoomGameVC.h */, - 239D0FC62C045F92002977CE /* MSRoomGameVC.m */, - 239D0FCA2C045FC9002977CE /* MSTabbarRoomGameVC.h */, - 239D0FCB2C045FC9002977CE /* MSTabbarRoomGameVC.m */, - 4C51B09A2DA3B4C600D8DFB5 /* LudoGameViewController.h */, - 4C51B09B2DA3B4C600D8DFB5 /* LudoGameViewController.m */, - ); - path = View; - sourceTree = ""; - }; - 239D0FC82C045F92002977CE /* RoomGame */ = { - isa = PBXGroup; - children = ( - 239D0FBF2C045F92002977CE /* Api */, - 239D0FC02C045F92002977CE /* Model */, - 239D0FC12C045F92002977CE /* Presenter */, - 239D0FC22C045F92002977CE /* Protocol */, - 239D0FC72C045F92002977CE /* View */, - ); - path = RoomGame; - sourceTree = ""; - }; 23CEFC082AFB8FC100576D89 /* sdkContent */ = { isa = PBXGroup; children = ( @@ -6342,14 +1307,6 @@ path = K; sourceTree = ""; }; - 23E9EA6C2A83813000B792F2 /* fairy */ = { - isa = PBXGroup; - children = ( - 2369F9922A8B21EA00563B48 /* pi_treasure_fairy_gift_bg.svga */, - ); - path = fairy; - sourceTree = ""; - }; 23E9EA9B2A84C42B00B792F2 /* SGYProgressView */ = { isa = PBXGroup; children = ( @@ -6367,31 +1324,6 @@ path = PIIAPTool; sourceTree = ""; }; - 23FF25712ABD66B90064E904 /* FreeGiftsView */ = { - isa = PBXGroup; - children = ( - 23FF25722ABD66B90064E904 /* View */, - ); - path = FreeGiftsView; - sourceTree = ""; - }; - 23FF25722ABD66B90064E904 /* View */ = { - isa = PBXGroup; - children = ( - 23FF25732ABD66B90064E904 /* SubViews */, - ); - path = View; - sourceTree = ""; - }; - 23FF25732ABD66B90064E904 /* SubViews */ = { - isa = PBXGroup; - children = ( - 23FF25752ABD66B90064E904 /* XPFreeGiftsObtainView.h */, - 23FF25742ABD66B90064E904 /* XPFreeGiftsObtainView.m */, - ); - path = SubViews; - sourceTree = ""; - }; 4C0642712E97BD6D00BAF413 /* Controllers */ = { isa = PBXGroup; children = ( @@ -6512,17 +1444,6 @@ path = Common; sourceTree = ""; }; - 4C45C1A82E6837BF00E73A44 /* Manager */ = { - isa = PBXGroup; - children = ( - 4C45C1AD2E6855F600E73A44 /* XPTurboModeTipsManager.h */, - 4C45C1AE2E6855F600E73A44 /* XPTurboModeTipsManager.m */, - 4C45C1A62E6837BF00E73A44 /* TurboModeStateManager.h */, - 4C45C1A72E6837BF00E73A44 /* TurboModeStateManager.m */, - ); - path = Manager; - sourceTree = ""; - }; 4C47079F2D5342C500C8CD24 /* GZIP */ = { isa = PBXGroup; children = ( @@ -6532,51 +1453,6 @@ path = GZIP; sourceTree = ""; }; - 4C7989F02D195293006AE07B /* RoomMode */ = { - isa = PBXGroup; - children = ( - 4C7989ED2D195277006AE07B /* RoomModeViewController.h */, - 4C7989EE2D195277006AE07B /* RoomModeViewController.m */, - 4C7989F12D1952DA006AE07B /* RoomModePresenter.h */, - 4C7989F22D1952DA006AE07B /* RoomModePresenter.m */, - ); - path = RoomMode; - sourceTree = ""; - }; - 4C7F2A682E0BE7C8002F5058 /* FirstCharge */ = { - isa = PBXGroup; - children = ( - 4C7F2A692E0BE7E7002F5058 /* FirstRechargeManager.h */, - 4C7F2A6A2E0BE7E7002F5058 /* FirstRechargeManager.m */, - ); - path = FirstCharge; - sourceTree = ""; - }; - 4C886BE42E013BF7006F0BA7 /* Medals */ = { - isa = PBXGroup; - children = ( - 4C7153932E0942F700C9F940 /* MedalsCyclePagerCell.h */, - 4C7153942E0942F700C9F940 /* MedalsCyclePagerCell.m */, - 4C886BE62E013C55006F0BA7 /* MedalsViewController.h */, - 4C886BE72E013C55006F0BA7 /* MedalsViewController.m */, - 4C0A5B822E02675300955219 /* MedalsCollectionViewCell.h */, - 4C0A5B832E02675300955219 /* MedalsCollectionViewCell.m */, - 4C0A5B852E02BB1100955219 /* MedalsLevelIndicatorView.h */, - 4C0A5B862E02BB1100955219 /* MedalsLevelIndicatorView.m */, - 4C0A5B882E02BC3900955219 /* MedalsDetailView.h */, - 4C0A5B892E02BC3900955219 /* MedalsDetailView.m */, - 4C0A5B8E2E03EF4B00955219 /* MedalsWearingViewController.h */, - 4C0A5B8F2E03EF4B00955219 /* MedalsWearingViewController.m */, - 4CF3CE292E0403500071101F /* MedalsWearingControlCollectionViewCell.h */, - 4CF3CE2A2E0403500071101F /* MedalsWearingControlCollectionViewCell.m */, - 4CF3CE2C2E040EEC0071101F /* MedalsWearingListCollectionViewCell.h */, - 4CF3CE2D2E040EEC0071101F /* MedalsWearingListCollectionViewCell.m */, - 4CB41CEA2E053D6300528517 /* MedalsRankViewController.h */, - 4CB41CEB2E053D6300528517 /* MedalsRankViewController.m */, - ); - path = Medals; - sourceTree = ""; - }; 4C886BEF2E015D48006F0BA7 /* Medals */ = { isa = PBXGroup; children = ( @@ -6586,49 +1462,6 @@ path = Medals; sourceTree = ""; }; - 4CB753CE2D2FE80100B13DF5 /* RoomSideMenu */ = { - isa = PBXGroup; - children = ( - 4C44BD5B2D151B5C00F321FA /* RoomSideMenu.h */, - 4C44BD5C2D151B5C00F321FA /* RoomSideMenu.m */, - ); - path = RoomSideMenu; - sourceTree = ""; - }; - 4CB753CF2D30F08E00B13DF5 /* LuckyPackage */ = { - isa = PBXGroup; - children = ( - 4C864A002D55F4F600191AE0 /* LuckyPackagePresenter.h */, - 4C864A012D55F4F600191AE0 /* LuckyPackagePresenter.m */, - 4CB753D02D30F10900B13DF5 /* LuckyPackageViewController.h */, - 4CB753D12D30F10900B13DF5 /* LuckyPackageViewController.m */, - 4C864A032D561E1D00191AE0 /* LuckyPackageLogicManager.h */, - 4C864A042D561E1D00191AE0 /* LuckyPackageLogicManager.m */, - 4CA532B82D5C8EBE00B8F59F /* LuckyPackageBannerView.h */, - 4CA532B92D5C8EBE00B8F59F /* LuckyPackageBannerView.m */, - 4CA532BB2D5CA49A00B8F59F /* OpenLuckyPackageEntranceView.h */, - 4CA532BC2D5CA49A00B8F59F /* OpenLuckyPackageEntranceView.m */, - 4CA532BE2D5CA4D300B8F59F /* LuckyPackageStatusView.h */, - 4CA532BF2D5CA4D300B8F59F /* LuckyPackageStatusView.m */, - 4CA532C12D5F37DC00B8F59F /* LuckyPackageMessageTableViewCell.h */, - 4CA532C22D5F37DC00B8F59F /* LuckyPackageMessageTableViewCell.m */, - ); - path = LuckyPackage; - sourceTree = ""; - }; - 4CC312212D79878B00F57A07 /* Share */ = { - isa = PBXGroup; - children = ( - 4CC312222D7987A200F57A07 /* ShareHelder.h */, - 4CC312232D7987A200F57A07 /* ShareHelder.m */, - 4CC312252D79A10100F57A07 /* ShareProvider.h */, - 4CC312262D79A10100F57A07 /* ShareProvider.m */, - 4C520D832D894E8C0051C784 /* SocialShareManager.h */, - 4C520D842D894E8C0051C784 /* SocialShareManager.m */, - ); - path = Share; - sourceTree = ""; - }; 4CD19C7F2E9CB31C0069DAA0 /* Controllers */ = { isa = PBXGroup; children = ( @@ -6691,225 +1524,6 @@ path = Adbvertise; sourceTree = ""; }; - 4CD19D412E9CDF980069DAA0 /* Emoji */ = { - isa = PBXGroup; - children = ( - 4CD19C9B2E9CDF980069DAA0 /* emoj_s_normal@2x.png */, - 4CD19C9C2E9CDF980069DAA0 /* emoj_s_pressed@2x.png */, - 4CD19C9D2E9CDF980069DAA0 /* emoji.xml */, - 4CD19C9E2E9CDF980069DAA0 /* emoji_00@2x.png */, - 4CD19C9F2E9CDF980069DAA0 /* emoji_01@2x.png */, - 4CD19CA02E9CDF980069DAA0 /* emoji_02@2x.png */, - 4CD19CA12E9CDF980069DAA0 /* emoji_03@2x.png */, - 4CD19CA22E9CDF980069DAA0 /* emoji_04@2x.png */, - 4CD19CA32E9CDF980069DAA0 /* emoji_05@2x.png */, - 4CD19CA42E9CDF980069DAA0 /* emoji_06@2x.png */, - 4CD19CA52E9CDF980069DAA0 /* emoji_07@2x.png */, - 4CD19CA62E9CDF980069DAA0 /* emoji_08@2x.png */, - 4CD19CA72E9CDF980069DAA0 /* emoji_09@2x.png */, - 4CD19CA82E9CDF980069DAA0 /* emoji_10@2x.png */, - 4CD19CA92E9CDF980069DAA0 /* emoji_11@2x.png */, - 4CD19CAA2E9CDF980069DAA0 /* emoji_12@2x.png */, - 4CD19CAB2E9CDF980069DAA0 /* emoji_13@2x.png */, - 4CD19CAC2E9CDF980069DAA0 /* emoji_14@2x.png */, - 4CD19CAD2E9CDF980069DAA0 /* emoji_15@2x.png */, - 4CD19CAE2E9CDF980069DAA0 /* emoji_16@2x.png */, - 4CD19CAF2E9CDF980069DAA0 /* emoji_17@2x.png */, - 4CD19CB02E9CDF980069DAA0 /* emoji_18@2x.png */, - 4CD19CB12E9CDF980069DAA0 /* emoji_19@2x.png */, - 4CD19CB22E9CDF980069DAA0 /* emoji_20@2x.png */, - 4CD19CB32E9CDF980069DAA0 /* emoji_21@2x.png */, - 4CD19CB42E9CDF980069DAA0 /* emoji_22@2x.png */, - 4CD19CB52E9CDF980069DAA0 /* emoji_23@2x.png */, - 4CD19CB62E9CDF980069DAA0 /* emoji_24@2x.png */, - 4CD19CB72E9CDF980069DAA0 /* emoji_25@2x.png */, - 4CD19CB82E9CDF980069DAA0 /* emoji_26@2x.png */, - 4CD19CB92E9CDF980069DAA0 /* emoji_27@2x.png */, - 4CD19CBA2E9CDF980069DAA0 /* emoji_28@2x.png */, - 4CD19CBB2E9CDF980069DAA0 /* emoji_29@2x.png */, - 4CD19CBC2E9CDF980069DAA0 /* emoji_30@2x.png */, - 4CD19CBD2E9CDF980069DAA0 /* emoji_31@2x.png */, - 4CD19CBE2E9CDF980069DAA0 /* emoji_32@2x.png */, - 4CD19CBF2E9CDF980069DAA0 /* emoji_33@2x.png */, - 4CD19CC02E9CDF980069DAA0 /* emoji_34@2x.png */, - 4CD19CC12E9CDF980069DAA0 /* emoji_35@2x.png */, - 4CD19CC22E9CDF980069DAA0 /* emoji_36@2x.png */, - 4CD19CC32E9CDF980069DAA0 /* emoji_37@2x.png */, - 4CD19CC42E9CDF980069DAA0 /* emoji_38@2x.png */, - 4CD19CC52E9CDF980069DAA0 /* emoji_39@2x.png */, - 4CD19CC62E9CDF980069DAA0 /* emoji_40@2x.png */, - 4CD19CC72E9CDF980069DAA0 /* emoji_41@2x.png */, - 4CD19CC82E9CDF980069DAA0 /* emoji_42@2x.png */, - 4CD19CC92E9CDF980069DAA0 /* emoji_43@2x.png */, - 4CD19CCA2E9CDF980069DAA0 /* emoji_44@2x.png */, - 4CD19CCB2E9CDF980069DAA0 /* emoji_45@2x.png */, - 4CD19CCC2E9CDF980069DAA0 /* emoji_46@2x.png */, - 4CD19CCD2E9CDF980069DAA0 /* emoji_47@2x.png */, - 4CD19CCE2E9CDF980069DAA0 /* emoji_48@2x.png */, - 4CD19CCF2E9CDF980069DAA0 /* emoji_49@2x.png */, - 4CD19CD02E9CDF980069DAA0 /* emoji_50@2x.png */, - 4CD19CD12E9CDF980069DAA0 /* emoji_51@2x.png */, - 4CD19CD22E9CDF980069DAA0 /* emoji_52@2x.png */, - 4CD19CD32E9CDF980069DAA0 /* emoji_53@2x.png */, - 4CD19CD42E9CDF980069DAA0 /* emoji_54@2x.png */, - 4CD19CD52E9CDF980069DAA0 /* emoji_55@2x.png */, - 4CD19CD62E9CDF980069DAA0 /* emoji_56@2x.png */, - 4CD19CD72E9CDF980069DAA0 /* emoji_57@2x.png */, - 4CD19CD82E9CDF980069DAA0 /* emoji_58@2x.png */, - 4CD19CD92E9CDF980069DAA0 /* emoji_59@2x.png */, - 4CD19CDA2E9CDF980069DAA0 /* emoji_60@2x.png */, - 4CD19CDB2E9CDF980069DAA0 /* emoji_61@2x.png */, - 4CD19CDC2E9CDF980069DAA0 /* emoji_62@2x.png */, - 4CD19CDD2E9CDF980069DAA0 /* emoji_63@2x.png */, - 4CD19CDE2E9CDF980069DAA0 /* emoji_64@2x.png */, - 4CD19CDF2E9CDF980069DAA0 /* emoji_65@2x.png */, - 4CD19CE02E9CDF980069DAA0 /* emoji_66@2x.png */, - 4CD19CE12E9CDF980069DAA0 /* emoji_67@2x.png */, - 4CD19CE22E9CDF980069DAA0 /* emoji_68@2x.png */, - 4CD19CE32E9CDF980069DAA0 /* emoji_69@2x.png */, - 4CD19CE42E9CDF980069DAA0 /* emoji_70@2x.png */, - 4CD19CE52E9CDF980069DAA0 /* emoji_71@2x.png */, - 4CD19CE62E9CDF980069DAA0 /* emoji_72@2x.png */, - 4CD19CE72E9CDF980069DAA0 /* emoji_73@2x.png */, - 4CD19CE82E9CDF980069DAA0 /* emoji_74@2x.png */, - 4CD19CE92E9CDF980069DAA0 /* emoji_75@2x.png */, - 4CD19CEA2E9CDF980069DAA0 /* emoji_76@2x.png */, - 4CD19CEB2E9CDF980069DAA0 /* emoji_77@2x.png */, - 4CD19CEC2E9CDF980069DAA0 /* emoji_78@2x.png */, - 4CD19CED2E9CDF980069DAA0 /* emoji_79@2x.png */, - 4CD19CEE2E9CDF980069DAA0 /* emoji_80@2x.png */, - 4CD19CEF2E9CDF980069DAA0 /* emoji_81@2x.png */, - 4CD19CF02E9CDF980069DAA0 /* emoji_82@2x.png */, - 4CD19CF12E9CDF980069DAA0 /* emoji_83@2x.png */, - 4CD19CF22E9CDF980069DAA0 /* emoji_84@2x.png */, - 4CD19CF32E9CDF980069DAA0 /* emoji_85@2x.png */, - 4CD19CF42E9CDF980069DAA0 /* emoji_86@2x.png */, - 4CD19CF52E9CDF980069DAA0 /* emoji_87@2x.png */, - 4CD19CF62E9CDF980069DAA0 /* emoji_88@2x.png */, - 4CD19CF72E9CDF980069DAA0 /* emoji_89@2x.png */, - 4CD19CF82E9CDF980069DAA0 /* emoji_90@2x.png */, - 4CD19CF92E9CDF980069DAA0 /* emoji_91@2x.png */, - 4CD19CFA2E9CDF980069DAA0 /* emoji_92@2x.png */, - 4CD19CFB2E9CDF980069DAA0 /* emoji_93@2x.png */, - 4CD19CFC2E9CDF980069DAA0 /* emoji_94@2x.png */, - 4CD19CFD2E9CDF980069DAA0 /* emoji_95@2x.png */, - 4CD19CFE2E9CDF980069DAA0 /* emoji_96@2x.png */, - 4CD19CFF2E9CDF980069DAA0 /* emoji_97@2x.png */, - 4CD19D002E9CDF980069DAA0 /* emoji_98@2x.png */, - 4CD19D012E9CDF980069DAA0 /* emoji_99@2x.png */, - 4CD19D022E9CDF980069DAA0 /* emoji_100@2x.png */, - 4CD19D032E9CDF980069DAA0 /* emoji_101@2x.png */, - 4CD19D042E9CDF980069DAA0 /* emoji_102@2x.png */, - 4CD19D052E9CDF980069DAA0 /* emoji_103@2x.png */, - 4CD19D062E9CDF980069DAA0 /* emoji_104@2x.png */, - 4CD19D072E9CDF980069DAA0 /* emoji_105@2x.png */, - 4CD19D082E9CDF980069DAA0 /* emoji_106@2x.png */, - 4CD19D092E9CDF980069DAA0 /* emoji_107@2x.png */, - 4CD19D0A2E9CDF980069DAA0 /* emoji_108@2x.png */, - 4CD19D0B2E9CDF980069DAA0 /* emoji_109@2x.png */, - 4CD19D0C2E9CDF980069DAA0 /* emoji_110@2x.png */, - 4CD19D0D2E9CDF980069DAA0 /* emoji_111@2x.png */, - 4CD19D0E2E9CDF980069DAA0 /* emoji_112@2x.png */, - 4CD19D0F2E9CDF980069DAA0 /* emoji_113@2x.png */, - 4CD19D102E9CDF980069DAA0 /* emoji_114@2x.png */, - 4CD19D112E9CDF980069DAA0 /* emoji_115@2x.png */, - 4CD19D122E9CDF980069DAA0 /* emoji_116@2x.png */, - 4CD19D132E9CDF980069DAA0 /* emoji_117@2x.png */, - 4CD19D142E9CDF980069DAA0 /* emoji_118@2x.png */, - 4CD19D152E9CDF980069DAA0 /* emoji_119@2x.png */, - 4CD19D162E9CDF980069DAA0 /* emoji_120@2x.png */, - 4CD19D172E9CDF980069DAA0 /* emoji_121@2x.png */, - 4CD19D182E9CDF980069DAA0 /* emoji_122@2x.png */, - 4CD19D192E9CDF980069DAA0 /* emoji_123@2x.png */, - 4CD19D1A2E9CDF980069DAA0 /* emoji_124@2x.png */, - 4CD19D1B2E9CDF980069DAA0 /* emoji_125@2x.png */, - 4CD19D1C2E9CDF980069DAA0 /* emoji_126@2x.png */, - 4CD19D1D2E9CDF980069DAA0 /* emoji_127@2x.png */, - 4CD19D1E2E9CDF980069DAA0 /* emoji_128@2x.png */, - 4CD19D1F2E9CDF980069DAA0 /* emoji_129@2x.png */, - 4CD19D202E9CDF980069DAA0 /* emoji_130@2x.png */, - 4CD19D212E9CDF980069DAA0 /* emoji_131@2x.png */, - 4CD19D222E9CDF980069DAA0 /* emoji_132@2x.png */, - 4CD19D232E9CDF980069DAA0 /* emoji_133@2x.png */, - 4CD19D242E9CDF980069DAA0 /* emoji_134@2x.png */, - 4CD19D252E9CDF980069DAA0 /* emoji_135@2x.png */, - 4CD19D262E9CDF980069DAA0 /* emoji_136@2x.png */, - 4CD19D272E9CDF980069DAA0 /* emoji_137@2x.png */, - 4CD19D282E9CDF980069DAA0 /* emoji_138@2x.png */, - 4CD19D292E9CDF980069DAA0 /* emoji_139@2x.png */, - 4CD19D2A2E9CDF980069DAA0 /* emoji_140@2x.png */, - 4CD19D2B2E9CDF980069DAA0 /* emoji_141@2x.png */, - 4CD19D2C2E9CDF980069DAA0 /* emoji_142@2x.png */, - 4CD19D2D2E9CDF980069DAA0 /* emoji_143@2x.png */, - 4CD19D2E2E9CDF980069DAA0 /* emoji_144@2x.png */, - 4CD19D2F2E9CDF980069DAA0 /* emoji_145@2x.png */, - 4CD19D302E9CDF980069DAA0 /* emoji_146@2x.png */, - 4CD19D312E9CDF980069DAA0 /* emoji_147@2x.png */, - 4CD19D322E9CDF980069DAA0 /* emoji_148@2x.png */, - 4CD19D332E9CDF980069DAA0 /* emoji_149@2x.png */, - 4CD19D342E9CDF980069DAA0 /* emoji_150@2x.png */, - 4CD19D352E9CDF980069DAA0 /* emoji_151@2x.png */, - 4CD19D362E9CDF980069DAA0 /* emoji_152@2x.png */, - 4CD19D372E9CDF980069DAA0 /* emoji_160@2x.png */, - 4CD19D382E9CDF980069DAA0 /* emoji_161@2x.png */, - 4CD19D392E9CDF980069DAA0 /* emoji_162@2x.png */, - 4CD19D3A2E9CDF980069DAA0 /* emoji_163@2x.png */, - 4CD19D3B2E9CDF980069DAA0 /* emoji_164@2x.png */, - 4CD19D3C2E9CDF980069DAA0 /* emoji_165@2x.png */, - 4CD19D3D2E9CDF980069DAA0 /* emoji_166@2x.png */, - 4CD19D3E2E9CDF980069DAA0 /* emoji_200@2x.png */, - 4CD19D3F2E9CDF980069DAA0 /* emoji_del_normal@2x.png */, - 4CD19D402E9CDF980069DAA0 /* emoji_del_pressed@2x.png */, - ); - path = Emoji; - sourceTree = ""; - }; - 4CD19D5E2E9CDF980069DAA0 /* InputView */ = { - isa = PBXGroup; - children = ( - 4CD19D422E9CDF980069DAA0 /* QEEmotionImageView.h */, - 4CD19D432E9CDF980069DAA0 /* QEEmotionImageView.m */, - 4CD19D442E9CDF980069DAA0 /* QEmotion.h */, - 4CD19D452E9CDF980069DAA0 /* QEmotion.m */, - 4CD19D462E9CDF980069DAA0 /* QEmotionAttachment.h */, - 4CD19D472E9CDF980069DAA0 /* QEmotionAttachment.m */, - 4CD19D482E9CDF980069DAA0 /* QEmotionBoardView.h */, - 4CD19D492E9CDF980069DAA0 /* QEmotionBoardView.m */, - 4CD19D4A2E9CDF980069DAA0 /* QEmotionHelper.h */, - 4CD19D4B2E9CDF980069DAA0 /* QEmotionHelper.m */, - 4CD19D4C2E9CDF980069DAA0 /* QExtendBoardView.h */, - 4CD19D4D2E9CDF980069DAA0 /* QExtendBoardView.m */, - 4CD19D4E2E9CDF980069DAA0 /* QInputBarView.h */, - 4CD19D4F2E9CDF980069DAA0 /* QInputBarView.m */, - 4CD19D502E9CDF980069DAA0 /* QInputBarViewConfiguration.h */, - 4CD19D512E9CDF980069DAA0 /* QInputBarViewConfiguration.m */, - 4CD19D522E9CDF980069DAA0 /* QInputPhototCell.h */, - 4CD19D532E9CDF980069DAA0 /* QInputPhototCell.m */, - 4CD19D542E9CDF980069DAA0 /* QinputPhotoView.h */, - 4CD19D552E9CDF980069DAA0 /* QinputPhotoView.m */, - 4CD19D562E9CDF980069DAA0 /* QKeyboardBaseManager.h */, - 4CD19D572E9CDF980069DAA0 /* QKeyboardBaseManager.m */, - 4CD19D582E9CDF980069DAA0 /* QKeyboardManager.h */, - 4CD19D592E9CDF980069DAA0 /* QKeyboardManager.m */, - 4CD19D5A2E9CDF980069DAA0 /* QPhotoImageModel.h */, - 4CD19D5B2E9CDF980069DAA0 /* QPhotoImageModel.m */, - 4CD19D5C2E9CDF980069DAA0 /* UITextView+QEmotion.h */, - 4CD19D5D2E9CDF980069DAA0 /* UITextView+QEmotion.m */, - ); - path = InputView; - sourceTree = ""; - }; - 4CD19D612E9CDF980069DAA0 /* InputView */ = { - isa = PBXGroup; - children = ( - 4CD19D412E9CDF980069DAA0 /* Emoji */, - 4CD19D5E2E9CDF980069DAA0 /* InputView */, - 4CD19D5F2E9CDF980069DAA0 /* Assets.xcassets */, - 4CD19D602E9CDF980069DAA0 /* emoji.plist */, - ); - path = InputView; - sourceTree = ""; - }; 4CD19D762E9CDF980069DAA0 /* MSRTL */ = { isa = PBXGroup; children = ( @@ -6937,46 +1551,6 @@ path = MSRTL; sourceTree = ""; }; - 4CD19D7B2E9CDF980069DAA0 /* Model */ = { - isa = PBXGroup; - children = ( - 4CD19D772E9CDF980069DAA0 /* XPShareInfoModel.h */, - 4CD19D782E9CDF980069DAA0 /* XPShareInfoModel.m */, - 4CD19D792E9CDF980069DAA0 /* XPShareItem.h */, - 4CD19D7A2E9CDF980069DAA0 /* XPShareItem.m */, - ); - path = Model; - sourceTree = ""; - }; - 4CD19D7E2E9CDF980069DAA0 /* View */ = { - isa = PBXGroup; - children = ( - 4CD19D7C2E9CDF980069DAA0 /* XPShareItemCell.h */, - 4CD19D7D2E9CDF980069DAA0 /* XPShareItemCell.m */, - ); - path = View; - sourceTree = ""; - }; - 4CD19D812E9CDF980069DAA0 /* ShareView */ = { - isa = PBXGroup; - children = ( - 4CD19D7B2E9CDF980069DAA0 /* Model */, - 4CD19D7E2E9CDF980069DAA0 /* View */, - 4CD19D7F2E9CDF980069DAA0 /* XPShareView.h */, - 4CD19D802E9CDF980069DAA0 /* XPShareView.m */, - ); - path = ShareView; - sourceTree = ""; - }; - 4CD19D842E9CDF980069DAA0 /* SVGA */ = { - isa = PBXGroup; - children = ( - 4CD19D822E9CDF980069DAA0 /* XPSVGAPlayer.h */, - 4CD19D832E9CDF980069DAA0 /* XPSVGAPlayer.m */, - ); - path = SVGA; - sourceTree = ""; - }; 4CD19D872E9CDF980069DAA0 /* SwitchView */ = { isa = PBXGroup; children = ( @@ -7118,10 +1692,7 @@ isa = PBXGroup; children = ( 4CD19C9A2E9CDF980069DAA0 /* Adbvertise */, - 4CD19D612E9CDF980069DAA0 /* InputView */, 4CD19D762E9CDF980069DAA0 /* MSRTL */, - 4CD19D812E9CDF980069DAA0 /* ShareView */, - 4CD19D842E9CDF980069DAA0 /* SVGA */, 4CD19D872E9CDF980069DAA0 /* SwitchView */, 4CD19DA42E9CDF980069DAA0 /* TTPopup */, 4CD19DA72E9CDF980069DAA0 /* UIButton */, @@ -7134,8 +1705,6 @@ 4CD19DBC2E9CDF980069DAA0 /* DJDKMIMOMColor.m */, 4CD19DBD2E9CDF980069DAA0 /* EmptyDataView.h */, 4CD19DBE2E9CDF980069DAA0 /* EmptyDataView.m */, - 4CD19DBF2E9CDF980069DAA0 /* MoliAvatar.h */, - 4CD19DC02E9CDF980069DAA0 /* MoliAvatar.m */, 4CD19DC12E9CDF980069DAA0 /* MoliMoneyLabel.h */, 4CD19DC22E9CDF980069DAA0 /* MoliMoneyLabel.m */, 4CD19DC32E9CDF980069DAA0 /* SexAgeLabel.h */, @@ -7148,217 +1717,15 @@ path = CustomUI; sourceTree = ""; }; - 4CD47BB72E619F0B00BCDA46 /* Action */ = { + 4CF462D12EA10E1B005E96C0 /* YMWeb */ = { isa = PBXGroup; children = ( - 4C0B4A382E6579C700D67F73 /* XPPKAction.h */, - 4C0B4A392E6579C700D67F73 /* XPPKAction.m */, - 4CD47BCA2E61ADE400BCDA46 /* XPSocialAction.h */, - 4CD47BCB2E61ADE400BCDA46 /* XPSocialAction.m */, - 4CD47BB62E619F0B00BCDA46 /* XPTurboModeAction.h */, - 4CD47BC32E61A4E000BCDA46 /* XPTurboModeAction.m */, - 4CD47BC72E61A78D00BCDA46 /* XPRoomSettingAction.h */, - 4CD47BC82E61A78D00BCDA46 /* XPRoomSettingAction.m */, - 4C0B4A3C2E659A2C00D67F73 /* XPRoomTypeSettingAction.h */, - 4C0B4A3D2E659A2C00D67F73 /* XPRoomTypeSettingAction.m */, - 4C0B4A3F2E659DC100D67F73 /* XPRoomBackGroundSettingAction.h */, - 4C0B4A402E659DC100D67F73 /* XPRoomBackGroundSettingAction.m */, - 4C0B4A422E65A0D300D67F73 /* XPRoomCleanMessagesAction.h */, - 4C0B4A432E65A0D300D67F73 /* XPRoomCleanMessagesAction.m */, - 4C0B4A452E65A51600D67F73 /* XPRoomRedPacketAction.h */, - 4C0B4A462E65A51600D67F73 /* XPRoomRedPacketAction.m */, - 4C0B4A482E65A5D500D67F73 /* XPRoomMusicPanelAction.h */, - 4C0B4A492E65A5D500D67F73 /* XPRoomMusicPanelAction.m */, - 4C0B4A4B2E65A63400D67F73 /* XPRoomRoomPhotoAction.h */, - 4C0B4A4C2E65A63400D67F73 /* XPRoomRoomPhotoAction.m */, - 4C0B4A4E2E65A68800D67F73 /* XPRoomAppManagerAction.h */, - 4C0B4A4F2E65A68800D67F73 /* XPRoomAppManagerAction.m */, - 4CC77BBB2E66A33C0067DA96 /* XPRoomEffectAction.h */, - 4CC77BBC2E66A33C0067DA96 /* XPRoomEffectAction.m */, + 4CF462CD2EA10E1B005E96C0 /* XPWebViewController.h */, + 4CF462CE2EA10E1B005E96C0 /* XPWebViewController.m */, + 4CF462CF2EA10E1B005E96C0 /* XPWebViewNavView.h */, + 4CF462D02EA10E1B005E96C0 /* XPWebViewNavView.m */, ); - path = Action; - sourceTree = ""; - }; - 4CD47BB92E619F0B00BCDA46 /* Factory */ = { - isa = PBXGroup; - children = ( - 4CD47BB82E619F0B00BCDA46 /* XPRoomMoreMenuActionFactory.h */, - 4CD47BC52E61A4FA00BCDA46 /* XPRoomMoreMenuActionFactory.m */, - ); - path = Factory; - sourceTree = ""; - }; - 4CE746C92D929D500094E496 /* Common */ = { - isa = PBXGroup; - children = ( - 4CE746D02D92A2660094E496 /* BravoGiftBannerView.h */, - 4CE746D12D92A2660094E496 /* BravoGiftBannerView.m */, - 4CE746C72D929D500094E496 /* BaseRoomBannerView.h */, - 4CE746C82D929D500094E496 /* BaseRoomBannerView.m */, - ); - path = Common; - sourceTree = ""; - }; - 4CE746D62D92C5B60094E496 /* gift */ = { - isa = PBXGroup; - children = ( - 4CA5A3332D93D4AB00CE41D6 /* 大.svga */, - ); - path = gift; - sourceTree = ""; - }; - 4CFE7F412E45ECEC00F77776 /* Manager */ = { - isa = PBXGroup; - children = ( - 4CFE7F3F2E45ECEC00F77776 /* PublicRoomManager.h */, - 4CFE7F402E45ECEC00F77776 /* PublicRoomManager.m */, - 4C84A9C02E5ED593002C10FC /* GameBannerGestureManager.h */, - 4C84A9C12E5ED593002C10FC /* GameBannerGestureManager.m */, - ); - path = Manager; - sourceTree = ""; - }; - 54283CE22CE48884009729B5 /* ShoppingMall */ = { - isa = PBXGroup; - children = ( - 4CC6195B2CEC996E008C1EE8 /* MyDressingDataModel.h */, - 4CC6195C2CEC996E008C1EE8 /* MyDressingDataModel.m */, - 54283CEC2CE48B97009729B5 /* ShoppingMallDataPresent.h */, - 54283CED2CE48B97009729B5 /* ShoppingMallDataPresent.m */, - 4CC619582CEC7770008C1EE8 /* MyDressingDataPresent.h */, - 4CC619592CEC7770008C1EE8 /* MyDressingDataPresent.m */, - 54283CE32CE48A69009729B5 /* ShoppingMallViewController.h */, - 54283CE42CE48A69009729B5 /* ShoppingMallViewController.m */, - 54283CE62CE48ABB009729B5 /* MyDressingViewController.h */, - 54283CE72CE48ABB009729B5 /* MyDressingViewController.m */, - 54283CE92CE48B71009729B5 /* ShoppingMallCategoryListView.h */, - 54283CEA2CE48B71009729B5 /* ShoppingMallCategoryListView.m */, - 4C6E1F732CEAEC3C0073D0A3 /* ShoppingMallTagView.h */, - 4C6E1F742CEAEC3C0073D0A3 /* ShoppingMallTagView.m */, - 4C6E1F7A2CEB25B10073D0A3 /* ShoppingMallItemPreview.h */, - 4C6E1F7B2CEB25B10073D0A3 /* ShoppingMallItemPreview.m */, - ); - path = ShoppingMall; - sourceTree = ""; - }; - 5461040A2CD4B3CB00066B21 /* banner */ = { - isa = PBXGroup; - children = ( - 4CACCCE32D9A695000CCB135 /* brove_gift.svga */, - 5461040B2CD4B46F00066B21 /* gift_normal_1.svga */, - 5461040C2CD4B46F00066B21 /* gift_normal_2.svga */, - 5461040D2CD4B46F00066B21 /* gift_normal_3.svga */, - 5461040E2CD4B46F00066B21 /* gift_VIP_1.svga */, - 5461040F2CD4B46F00066B21 /* gift_VIP_2.svga */, - 546104102CD4B46F00066B21 /* gift_VIP_3.svga */, - ); - path = banner; - sourceTree = ""; - }; - 547080D82CD0EE7A009879E5 /* Custom Background */ = { - isa = PBXGroup; - children = ( - 547080D92CD0EEB4009879E5 /* CustomRoomBGContentViewController.h */, - 547080DA2CD0EEB4009879E5 /* CustomRoomBGContentViewController.m */, - 544879E82CD215F400D58DC1 /* CustomRoomBGCell.h */, - 544879E92CD215F400D58DC1 /* CustomRoomBGCell.m */, - 544879EB2CD22A6B00D58DC1 /* CustomRoomBGPresenter.h */, - 544879EC2CD22A6B00D58DC1 /* CustomRoomBGPresenter.m */, - ); - path = "Custom Background"; - sourceTree = ""; - }; - 54C608512CBE0BEB003DD5D2 /* game */ = { - isa = PBXGroup; - children = ( - 54C608502CBE0BEB003DD5D2 /* game_floating_bg.svga */, - 4C13929B2D70441500A6DFB5 /* giftgift.mp4 */, - 4C1392A02D71675900A6DFB5 /* coincoin.mp4 */, - ); - path = game; - sourceTree = ""; - }; - 54E82E9B2CA684A600C931D9 /* Features */ = { - isa = PBXGroup; - children = ( - 54E82E9C2CA684CB00C931D9 /* Boom */, - ); - path = Features; - sourceTree = ""; - }; - 54E82E9C2CA684CB00C931D9 /* Boom */ = { - isa = PBXGroup; - children = ( - 4CE746C12D9290430094E496 /* RoomBoomManager.h */, - 4CE746C22D9290430094E496 /* RoomBoomManager.m */, - 54E82EA02CA6886700C931D9 /* RoomBoomBannerAnimation.h */, - 54E82EA12CA6886700C931D9 /* RoomBoomBannerAnimation.m */, - 54E82EA32CA693FA00C931D9 /* RoomBoomExplosionView.h */, - 54E82EA42CA693FA00C931D9 /* RoomBoomExplosionView.m */, - 54E82EA62CA6940900C931D9 /* RoomBoomResultView.h */, - 54E82EA72CA6940900C931D9 /* RoomBoomResultView.m */, - 54E82EAF2CA93BE200C931D9 /* BoomInfoViewController.h */, - 54E82EB02CA93BE200C931D9 /* BoomInfoViewController.m */, - 547B30F72CB511700041E962 /* RoomBoomEntryView.h */, - 547B30F82CB511700041E962 /* RoomBoomEntryView.m */, - ); - path = Boom; - sourceTree = ""; - }; - 54FFD3802C9BD12600DE61E5 /* cp */ = { - isa = PBXGroup; - children = ( - 4C75CEFF2D633C27009147A5 /* CP进场.svga */, - 544B19B72CA169BE00885BEB /* level up 1.svga */, - 544B19B82CA169BE00885BEB /* level up 2.svga */, - 544B19B92CA169BE00885BEB /* level up 3.svga */, - 544B19BA2CA169BE00885BEB /* level up 4.svga */, - 544B19BB2CA169BE00885BEB /* level up 5.svga */, - 54B9C6FA2C9DA4C4003F1CC5 /* CP绑定.mp4 */, - 54B9C6F42C9D8D05003F1CC5 /* 3.mp4 */, - 54B9C6F52C9D8D05003F1CC5 /* 4.mp4 */, - 54B9C6F62C9D8D05003F1CC5 /* 5.mp4 */, - 54FFD37B2C9BD12600DE61E5 /* 1.svga */, - 54FFD37C2C9BD12600DE61E5 /* 2.svga */, - 54FFD37D2C9BD12600DE61E5 /* 3.svga */, - 54FFD37E2C9BD12600DE61E5 /* 4.svga */, - 54FFD37F2C9BD12600DE61E5 /* 5.svga */, - 4CAE69C02E69922B00A9FC35 /* mic_cp_lv1.svga */, - 4CAE69C12E69922B00A9FC35 /* mic_cp_lv2.svga */, - 4CAE69C22E69922B00A9FC35 /* mic_cp_lv3.svga */, - 4CAE69C32E69922B00A9FC35 /* mic_cp_lv4.svga */, - 4CAE69C42E69922B00A9FC35 /* mic_cp_lv5.svga */, - ); - path = cp; - sourceTree = ""; - }; - 9B0086C727BA4F4A0032BD2B /* Anchor */ = { - isa = PBXGroup; - children = ( - 9B0086C827BA4F570032BD2B /* AnchorMicroView.h */, - 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */, - 9B2EA7C12804052E00ED17BF /* AnchorPKMicroView.h */, - 9B2EA7C22804052E00ED17BF /* AnchorPKMicroView.m */, - ); - path = Anchor; - sourceTree = ""; - }; - 9B09979F27F19D1C00EB8F14 /* QGVAPlayer */ = { - isa = PBXGroup; - children = ( - 9B0997A227F19DE500EB8F14 /* QGHWDShaders.metal */, - 9B0997A027F19D8900EB8F14 /* README.md */, - ); - path = QGVAPlayer; - sourceTree = ""; - }; - 9B17F71527BD14FF00440843 /* SVGAParserManager */ = { - isa = PBXGroup; - children = ( - 9B17F71627BD150600440843 /* SVGAParserManager.h */, - 9B17F71727BD150600440843 /* SVGAParserManager.m */, - ); - path = SVGAParserManager; + path = YMWeb; sourceTree = ""; }; 9B1B729A28002249003FACE9 /* AnchorFansTeam */ = { @@ -7370,119 +1737,6 @@ path = AnchorFansTeam; sourceTree = ""; }; - 9B1B729E280023D5003FACE9 /* AnchorFansTeam */ = { - isa = PBXGroup; - children = ( - 9B1B729F280023F3003FACE9 /* XPMineAnchorFansTeamTableViewCell.h */, - 9B1B72A0280023F3003FACE9 /* XPMineAnchorFansTeamTableViewCell.m */, - ); - path = AnchorFansTeam; - sourceTree = ""; - }; - 9B1B72A228002F76003FACE9 /* AnchorPK */ = { - isa = PBXGroup; - children = ( - 9B1B72A9280031A2003FACE9 /* Protocol */, - 9B1B72A82800319B003FACE9 /* Presenter */, - 9B1B72A528003185003FACE9 /* View */, - 9B1B72A42800317F003FACE9 /* Api */, - ); - path = AnchorPK; - sourceTree = ""; - }; - 9B1B72A42800317F003FACE9 /* Api */ = { - isa = PBXGroup; - children = ( - 9B1B72B328003664003FACE9 /* Api+AnchorPk.h */, - 9B1B72B428003664003FACE9 /* Api+AnchorPk.m */, - ); - path = Api; - sourceTree = ""; - }; - 9B1B72A528003185003FACE9 /* View */ = { - isa = PBXGroup; - children = ( - 9B1B72A728003196003FACE9 /* Cell */, - 9B1B72A62800318A003FACE9 /* SubViews */, - 9B1B72AA280031DB003FACE9 /* XPAnchorPKViewController.h */, - 9B1B72AB280031DB003FACE9 /* XPAnchorPKViewController.m */, - 9B1B72AD280031F8003FACE9 /* XPAnchorPKSelectRoomView.h */, - 9B1B72AE280031F8003FACE9 /* XPAnchorPKSelectRoomView.m */, - 9B335B472925D8A00048A116 /* XPAnchorPKSelectTypeController.h */, - 9B335B482925D8A00048A116 /* XPAnchorPKSelectTypeController.m */, - ); - path = View; - sourceTree = ""; - }; - 9B1B72A62800318A003FACE9 /* SubViews */ = { - isa = PBXGroup; - children = ( - 9B1B72BD2800422E003FACE9 /* XPAnchorPKRuleView.h */, - 9B1B72BE2800422E003FACE9 /* XPAnchorPKRuleView.m */, - E8DD25D8295583920043C7D5 /* XPAnchorRandomPKRuleView.h */, - E8DD25D9295583920043C7D5 /* XPAnchorRandomPKRuleView.m */, - 9B2EA7C428041EFC00ED17BF /* XPAnchorPkPanelView.h */, - 9B2EA7C528041EFC00ED17BF /* XPAnchorPkPanelView.m */, - 9B2EA7CA2804245500ED17BF /* XPAnchorPKPanelUserView.h */, - 9B2EA7CB2804245500ED17BF /* XPAnchorPKPanelUserView.m */, - 9B3A1DF2280571000058E2DD /* XPAnchorPKInviteView.h */, - 9B3A1DF3280571000058E2DD /* XPAnchorPKInviteView.m */, - 9B85F3512806AB9A006EDF51 /* XPAnchorPKResultView.h */, - 9B85F3522806AB9A006EDF51 /* XPAnchorPKResultView.m */, - 9B85F3542806DD8A006EDF51 /* XPAnchorPKFinishView.h */, - 9B85F3552806DD8A006EDF51 /* XPAnchorPKFinishView.m */, - ); - path = SubViews; - sourceTree = ""; - }; - 9B1B72A728003196003FACE9 /* Cell */ = { - isa = PBXGroup; - children = ( - 9B1B72BA28003E06003FACE9 /* XPAnchorPKTableViewCell.h */, - 9B1B72BB28003E06003FACE9 /* XPAnchorPKTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - 9B1B72A82800319B003FACE9 /* Presenter */ = { - isa = PBXGroup; - children = ( - 9B1B72B628003772003FACE9 /* XPAnchorPKPresenter.h */, - 9B1B72B728003772003FACE9 /* XPAnchorPKPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - 9B1B72A9280031A2003FACE9 /* Protocol */ = { - isa = PBXGroup; - children = ( - 9B1B72B9280037C5003FACE9 /* XPAnchorPKProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - 9B208A372779C1EF00F9E54A /* FaceView */ = { - isa = PBXGroup; - children = ( - E8C1CD5F27D88E4900376F83 /* Model */, - E8C1CD6127D88E6A00376F83 /* View */, - E8C1CD6227D88E7900376F83 /* Presenter */, - E8C1CD6327D88EA300376F83 /* Protocol */, - ); - path = FaceView; - sourceTree = ""; - }; - 9B2F72CD28E45A1C0000E4FA /* QuickMessageView */ = { - isa = PBXGroup; - children = ( - 9B2F72CE28E45A480000E4FA /* XPRoomQuickMessageContainView.h */, - 9B2F72CF28E45A480000E4FA /* XPRoomQuickMessageContainView.m */, - 9B2F72D128E45C5A0000E4FA /* XPRoomQuidkMessageCell.h */, - 9B2F72D228E45C5A0000E4FA /* XPRoomQuidkMessageCell.m */, - ); - path = QuickMessageView; - sourceTree = ""; - }; 9B33E3C827D85379003B0E62 /* File */ = { isa = PBXGroup; children = ( @@ -7496,153 +1750,6 @@ path = File; sourceTree = ""; }; - 9B42868F28C1AEBE009034D2 /* Model */ = { - isa = PBXGroup; - children = ( - 9B42869028C1AED4009034D2 /* XPReceiveRedPacketModel.h */, - 9B42869128C1AED4009034D2 /* XPReceiveRedPacketModel.m */, - 9B42869328C1E00A009034D2 /* XPRedPacketResultModel.h */, - 9B42869428C1E00A009034D2 /* XPRedPacketResultModel.m */, - 9B42869628C1E06B009034D2 /* XPRedPacketModel.h */, - 9B42869728C1E06B009034D2 /* XPRedPacketModel.m */, - 9BF4BEBA28D4182E009CF6C2 /* XPOpenRedPacketModel.h */, - 9BF4BEBB28D4182E009CF6C2 /* XPOpenRedPacketModel.m */, - ); - path = Model; - sourceTree = ""; - }; - 9B42869928C1FD22009034D2 /* Cell */ = { - isa = PBXGroup; - children = ( - 9B42869A28C1FD3D009034D2 /* XPOpenRedPacketCell.h */, - 9B42869B28C1FD3D009034D2 /* XPOpenRedPacketCell.m */, - 23D321DA2ADFBFF6006B259C /* PIInputRedPacketView.h */, - 23D321DB2ADFBFF6006B259C /* PIInputRedPacketView.m */, - 239141C42AE129F700322CA9 /* PIInputScrollingView.h */, - 239141C52AE129F700322CA9 /* PIInputScrollingView.m */, - 239141C72AE1358F00322CA9 /* PIInputEntireServerScrollingView.h */, - 239141C82AE1358F00322CA9 /* PIInputEntireServerScrollingView.m */, - 23D321DD2ADFCEB2006B259C /* PIRedPacketChooseTypeView.h */, - 23D321DE2ADFCEB2006B259C /* PIRedPacketChooseTypeView.m */, - 23D321E02ADFD0FB006B259C /* PIRedPacketChooseTypeCell.h */, - 23D321E12ADFD0FB006B259C /* PIRedPacketChooseTypeCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - 9B4C5B83292F81D000CEA41B /* Model */ = { - isa = PBXGroup; - children = ( - 9B4C5B84292F81FA00CEA41B /* XPSessionListFansPartyModel.h */, - 9B4C5B85292F81FA00CEA41B /* XPSessionListFansPartyModel.m */, - ); - path = Model; - sourceTree = ""; - }; - 9B6E856B281AAB8B0041A321 /* Model */ = { - isa = PBXGroup; - children = ( - 9B6E856C281AABAB0041A321 /* XPRoomRecommendModel.h */, - 9B6E856D281AABAB0041A321 /* XPRoomRecommendModel.m */, - ); - path = Model; - sourceTree = ""; - }; - 9B6E8570281AAD260041A321 /* RoomRecommend */ = { - isa = PBXGroup; - children = ( - 9B6E8574281ABEB20041A321 /* SubViews */, - 9B6E8568281A982A0041A321 /* XPRoomRecommendView.h */, - 9B6E8569281A982A0041A321 /* XPRoomRecommendView.m */, - 9B6E856B281AAB8B0041A321 /* Model */, - ); - path = RoomRecommend; - sourceTree = ""; - }; - 9B6E8574281ABEB20041A321 /* SubViews */ = { - isa = PBXGroup; - children = ( - 9B6E8571281AB9B20041A321 /* XPRoomInsideRecommendCell.h */, - 9B6E8572281AB9B20041A321 /* XPRoomInsideRecommendCell.m */, - 9B6E8575281ABECC0041A321 /* XPRoomInsideRecommendEmptyCell.h */, - 9B6E8576281ABECC0041A321 /* XPRoomInsideRecommendEmptyCell.m */, - 9BAC92F328E6E63000147DD8 /* XPRoomInsideOperationCell.h */, - 9BAC92F428E6E63000147DD8 /* XPRoomInsideOperationCell.m */, - ); - path = SubViews; - sourceTree = ""; - }; - 9B7B605827BB52FD0070BB72 /* AnchorView */ = { - isa = PBXGroup; - children = ( - 9BDA3E7227FD40DC00517FE6 /* FansTeam */, - 9B7B606327BBA0D40070BB72 /* Model */, - 9B7B606027BB96E40070BB72 /* XPRoomAnchorInfoCardView.h */, - 9B7B606127BB96E40070BB72 /* XPRoomAnchorInfoCardView.m */, - 9B7B605927BB53060070BB72 /* XPAnchorAudienceUpMicView.h */, - 9B7B605A27BB53060070BB72 /* XPAnchorAudienceUpMicView.m */, - ); - path = AnchorView; - sourceTree = ""; - }; - 9B7B606327BBA0D40070BB72 /* Model */ = { - isa = PBXGroup; - children = ( - 9B7B606427BBA0EE0070BB72 /* XPAnchorAttentSendInfo.h */, - 9B7B606527BBA0EE0070BB72 /* XPAnchorAttentSendInfo.m */, - ); - path = Model; - sourceTree = ""; - }; - 9B7D804727537819003DAC0C /* Session */ = { - isa = PBXGroup; - children = ( - 23FF256D2ABC48810064E904 /* XPSessionMainViewController.h */, - 23FF256C2ABC48810064E904 /* XPSessionMainViewController.m */, - 9B7D80482753783D003DAC0C /* SessionViewController.h */, - 9B7D80492753783D003DAC0C /* SessionViewController.m */, - E8E20BD9281645300033B688 /* SessionInfoViewController.h */, - E8E20BDA281645300033B688 /* SessionInfoViewController.m */, - E86E79D428A4EA0C006DAF48 /* SessionRiskCache.h */, - E86E79D528A4EA0C006DAF48 /* SessionRiskCache.m */, - E88E4A7D297673C600019A50 /* View */, - 18F403A72758B67900A6C548 /* Content */, - E86B911B281034F10007DEE7 /* Cell */, - ); - path = Session; - sourceTree = ""; - }; - 9B7D904A287BC4FC0033A45E /* AnchorCycleView */ = { - isa = PBXGroup; - children = ( - 9B7D904B287BC5E20033A45E /* AnchorRoomScrollView.h */, - 9B7D904C287BC5E20033A45E /* AnchorRoomScrollView.m */, - 9BE2FA8E288010D300EF3D83 /* AnchorRoomSrollTipView.h */, - 9BE2FA8F288010D300EF3D83 /* AnchorRoomSrollTipView.m */, - ); - path = AnchorCycleView; - sourceTree = ""; - }; - 9B85B6D4279FDAA900A0A1AC /* SubViews */ = { - isa = PBXGroup; - children = ( - 9B85B6D5279FDABA00A0A1AC /* XPUserCardSkillCardView.h */, - 9B85B6D6279FDABA00A0A1AC /* XPUserCardSkillCardView.m */, - 9B85B6D8279FDC5200A0A1AC /* XPUserCardSkillCollectionViewCell.h */, - 9B85B6D9279FDC5200A0A1AC /* XPUserCardSkillCollectionViewCell.m */, - ); - path = SubViews; - sourceTree = ""; - }; - 9B9BBF80288FBF93004E2E74 /* NewUserGift */ = { - isa = PBXGroup; - children = ( - 9B9BBF81288FBFB3004E2E74 /* XPNewUserRoomGiftView.h */, - 9B9BBF82288FBFB3004E2E74 /* XPNewUserRoomGiftView.m */, - ); - path = NewUserGift; - sourceTree = ""; - }; 9B9DFDA227DB4F68000F95B3 /* Recovered References */ = { isa = PBXGroup; children = ( @@ -7652,128 +1759,6 @@ name = "Recovered References"; sourceTree = ""; }; - 9BA3B40C293DD2E00071DF1C /* VersionUpdate */ = { - isa = PBXGroup; - children = ( - 9BA3B40D293DD2F90071DF1C /* XPUpgradeView.h */, - 9BA3B40E293DD2F90071DF1C /* XPUpgradeView.m */, - ); - path = VersionUpdate; - sourceTree = ""; - }; - 9BA812D328BF52A500783EA7 /* SendRedPacket */ = { - isa = PBXGroup; - children = ( - 9B42869928C1FD22009034D2 /* Cell */, - 9B42868F28C1AEBE009034D2 /* Model */, - 9BA812D928BF53DD00783EA7 /* Api */, - 9BA812D828BF539300783EA7 /* Protocol */, - 9BA812D728BF538E00783EA7 /* Presenter */, - 9BA812D428BF52E100783EA7 /* XPRoomSendRedPacketViewController.h */, - 9BA812D528BF52E100783EA7 /* XPRoomSendRedPacketViewController.m */, - 23D321E32ADFE900006B259C /* PIRoomSendRedPacketVC.h */, - 23D321E42ADFE900006B259C /* PIRoomSendRedPacketVC.m */, - 238ED8382AE2891D0014EF9D /* PIRoomEnterRedPacketView.h */, - 238ED8392AE2891D0014EF9D /* PIRoomEnterRedPacketView.m */, - 23D321E62ADFED0F006B259C /* PIRoomSendRedPacketItemVC.h */, - 23D321E72ADFED0F006B259C /* PIRoomSendRedPacketItemVC.m */, - 9BA812E228BF70A600783EA7 /* XPRoomRedPacketPwdView.h */, - 9BA812E328BF70A600783EA7 /* XPRoomRedPacketPwdView.m */, - 9B42868C28C1AE2D009034D2 /* XPReceiveRedPacketView.h */, - 9B42868D28C1AE2D009034D2 /* XPReceiveRedPacketView.m */, - 239141CA2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.h */, - 239141CB2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m */, - ); - path = SendRedPacket; - sourceTree = ""; - }; - 9BA812D728BF538E00783EA7 /* Presenter */ = { - isa = PBXGroup; - children = ( - 9BA812DB28BF6A7300783EA7 /* XPRoomRedPacketPresenter.h */, - 9BA812DC28BF6A7300783EA7 /* XPRoomRedPacketPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - 9BA812D828BF539300783EA7 /* Protocol */ = { - isa = PBXGroup; - children = ( - 9BA812E128BF6AFB00783EA7 /* XPRoomRedPacketProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - 9BA812D928BF53DD00783EA7 /* Api */ = { - isa = PBXGroup; - children = ( - 9BA812DE28BF6ABB00783EA7 /* Api+RedPacket.h */, - 9BA812DF28BF6ABB00783EA7 /* Api+RedPacket.m */, - ); - path = Api; - sourceTree = ""; - }; - 9BC5C915277C809E007C8719 /* ReleaseRadio */ = { - isa = PBXGroup; - children = ( - 9BD63FB0277EF132006EB744 /* Protocol */, - 9BC5C919277C8A4D007C8719 /* Presenter */, - 9BC5C918277C8A22007C8719 /* View */, - 9BC5C917277C8A1D007C8719 /* Api */, - 9BC5C916277C8A17007C8719 /* Model */, - ); - path = ReleaseRadio; - sourceTree = ""; - }; - 9BC5C916277C8A17007C8719 /* Model */ = { - isa = PBXGroup; - children = ( - 9BD63FB2277EF1B3006EB744 /* XPReleaseRadioModel.h */, - 9BD63FB3277EF1B3006EB744 /* XPReleaseRadioModel.m */, - ); - path = Model; - sourceTree = ""; - }; - 9BC5C917277C8A1D007C8719 /* Api */ = { - isa = PBXGroup; - children = ( - 9BD63FA9277EE885006EB744 /* Api+RoomRadio.h */, - 9BD63FAA277EE885006EB744 /* Api+RoomRadio.m */, - ); - path = Api; - sourceTree = ""; - }; - 9BC5C918277C8A22007C8719 /* View */ = { - isa = PBXGroup; - children = ( - 9BD63FAF277EEAC2006EB744 /* Cell */, - 9BC5C91A277C8A7B007C8719 /* XPReleaseRadioViewController.h */, - 9BC5C91B277C8A7B007C8719 /* XPReleaseRadioViewController.m */, - 9BC5C91D277C902B007C8719 /* XPReleaseRadioView.h */, - 9BC5C91E277C902B007C8719 /* XPReleaseRadioView.m */, - ); - path = View; - sourceTree = ""; - }; - 9BC5C919277C8A4D007C8719 /* Presenter */ = { - isa = PBXGroup; - children = ( - 9BD63FAC277EE97A006EB744 /* XPReleaseRadioPresenter.h */, - 9BD63FAD277EE97A006EB744 /* XPReleaseRadioPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - 9BCB999D28F5716E00466D64 /* CollectRoom */ = { - isa = PBXGroup; - children = ( - 9BE570B928F65B6000D491A5 /* Cell */, - 9BCB999E28F571B500466D64 /* XPMineCollectPartyRoomViewController.h */, - 9BCB999F28F571B500466D64 /* XPMineCollectPartyRoomViewController.m */, - ); - path = CollectRoom; - sourceTree = ""; - }; 9BD2ECCF288F832300F5CD9A /* FootPrint */ = { isa = PBXGroup; children = ( @@ -7783,57 +1768,6 @@ path = FootPrint; sourceTree = ""; }; - 9BD2ECD7288F865900F5CD9A /* FootPrint */ = { - isa = PBXGroup; - children = ( - 9BD2ECD8288F867000F5CD9A /* XPMineFootPrintTableViewCell.h */, - 9BD2ECD9288F867000F5CD9A /* XPMineFootPrintTableViewCell.m */, - ); - path = FootPrint; - sourceTree = ""; - }; - 9BD63FAF277EEAC2006EB744 /* Cell */ = { - isa = PBXGroup; - children = ( - 9BCE6142277D657600CC0358 /* XPReleaseRadioTableViewCell.h */, - 9BCE6143277D657600CC0358 /* XPReleaseRadioTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - 9BD63FB0277EF132006EB744 /* Protocol */ = { - isa = PBXGroup; - children = ( - 9BD63FB1277EF14A006EB744 /* XPReleaseRadioProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - 9BD798AE29262306003E03E6 /* SessionListHeadView */ = { - isa = PBXGroup; - children = ( - 9B4C5B83292F81D000CEA41B /* Model */, - 9BD798B52926362F003E03E6 /* XPSessionListHeadItem.h */, - 9BD798B62926362F003E03E6 /* XPSessionListHeadItem.m */, - 9B87B3CB2926473D00085110 /* XPSessionListHeadFriendCell.h */, - 9B87B3CC2926473D00085110 /* XPSessionListHeadFriendCell.m */, - E8778AE52988C1E000CF139B /* XPSessionHelloEnterView.h */, - E8778AE62988C1E000CF139B /* XPSessionHelloEnterView.m */, - ); - path = SessionListHeadView; - sourceTree = ""; - }; - 9BD9A17D27A0EFB1004186FE /* Visitor */ = { - isa = PBXGroup; - children = ( - 9BD9A17E27A0EFC7004186FE /* XPMineVisitorTableViewCell.h */, - 9BD9A17F27A0EFC7004186FE /* XPMineVisitorTableViewCell.m */, - 9B2489BA27C4C056006CFB85 /* XPMineVisitorEmptyTableViewCell.h */, - 9B2489BB27C4C056006CFB85 /* XPMineVisitorEmptyTableViewCell.m */, - ); - path = Visitor; - sourceTree = ""; - }; 9BD9A18127A0F110004186FE /* Visitor */ = { isa = PBXGroup; children = ( @@ -7845,76 +1779,6 @@ path = Visitor; sourceTree = ""; }; - 9BDA3E6F27FD401100517FE6 /* Api */ = { - isa = PBXGroup; - children = ( - 9B1B7290280010E8003FACE9 /* Api+FansTeam.h */, - 9B1B7291280010E8003FACE9 /* Api+FansTeam.m */, - ); - path = Api; - sourceTree = ""; - }; - 9BDA3E7027FD401700517FE6 /* View */ = { - isa = PBXGroup; - children = ( - 9BDA3E7527FD41C200517FE6 /* XPAnchorFansTeamViewController.h */, - 9BDA3E7627FD41C200517FE6 /* XPAnchorFansTeamViewController.m */, - 9BDA3E7827FD43EF00517FE6 /* XPAnchorFansTeamEntranceView.h */, - 9BDA3E7927FD43EF00517FE6 /* XPAnchorFansTeamEntranceView.m */, - 9BB89DC427FEB9E100586A83 /* XPAnchorFansTaskViewController.h */, - 9BB89DC527FEB9E100586A83 /* XPAnchorFansTaskViewController.m */, - 9BE9F10327FF04CF00667200 /* XPAnchorFansTaskTableViewCell.h */, - 9BE9F10427FF04CF00667200 /* XPAnchorFansTaskTableViewCell.m */, - ); - path = View; - sourceTree = ""; - }; - 9BDA3E7127FD401C00517FE6 /* Presenter */ = { - isa = PBXGroup; - children = ( - 9BDA3E7B27FD47AB00517FE6 /* XPAnchorFansTeamPresenter.h */, - 9BDA3E7C27FD47AB00517FE6 /* XPAnchorFansTeamPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - 9BDA3E7227FD40DC00517FE6 /* FansTeam */ = { - isa = PBXGroup; - children = ( - 9BDA3E7E27FD47FB00517FE6 /* Protocol */, - 9BDA3E7327FD417900517FE6 /* Model */, - 9BDA3E7127FD401C00517FE6 /* Presenter */, - 9BDA3E6F27FD401100517FE6 /* Api */, - 9BDA3E7027FD401700517FE6 /* View */, - ); - path = FansTeam; - sourceTree = ""; - }; - 9BDA3E7327FD417900517FE6 /* Model */ = { - isa = PBXGroup; - children = ( - 9BB89DC127FE7F3A00586A83 /* XPAnchorFansRelationModel.h */, - 9BB89DC227FE7F3A00586A83 /* XPAnchorFansRelationModel.m */, - 9BE9F0F727FED12D00667200 /* XPAnchorFansPrivilegeModel.h */, - 9BE9F0F827FED12D00667200 /* XPAnchorFansPrivilegeModel.m */, - 9BE9F0FA27FED2E100667200 /* XPAnchorFansJoinModel.h */, - 9BE9F0FB27FED2E100667200 /* XPAnchorFansJoinModel.m */, - 9BE9F0FD27FED76500667200 /* XPAnchorFansTaskModel.h */, - 9BE9F0FE27FED76500667200 /* XPAnchorFansTaskModel.m */, - 9BE9F10027FEE5C200667200 /* XPAnchorFansTaskDetailModel.h */, - 9BE9F10127FEE5C200667200 /* XPAnchorFansTaskDetailModel.m */, - ); - path = Model; - sourceTree = ""; - }; - 9BDA3E7E27FD47FB00517FE6 /* Protocol */ = { - isa = PBXGroup; - children = ( - 9BDA3E7F27FD480D00517FE6 /* XPAnchorFansTeamProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; 9BE01AF42893E7E000B50299 /* Cell */ = { isa = PBXGroup; children = ( @@ -7924,35 +1788,6 @@ path = Cell; sourceTree = ""; }; - 9BE570B928F65B6000D491A5 /* Cell */ = { - isa = PBXGroup; - children = ( - 9BE570BA28F65B7200D491A5 /* XPMineCollectRoomCell.h */, - 9BE570BB28F65B7200D491A5 /* XPMineCollectRoomCell.m */, - 9BCB99A428F582EC00466D64 /* XPMineCollectRoomEditCell.h */, - 9BCB99A528F582EC00466D64 /* XPMineCollectRoomEditCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - 9BFB101C2897CC3300B3985E /* AnchorCard */ = { - isa = PBXGroup; - children = ( - 9BFB101D2897CC4300B3985E /* XPAnchorCardView.h */, - 9BFB101E2897CC4300B3985E /* XPAnchorCardView.m */, - ); - path = AnchorCard; - sourceTree = ""; - }; - 9BFE0D8F289903F600F53C24 /* TaskTip */ = { - isa = PBXGroup; - children = ( - 9BFE0D902899042600F53C24 /* XPTaskCompleteTipView.h */, - 9BFE0D912899042600F53C24 /* XPTaskCompleteTipView.m */, - ); - path = TaskTip; - sourceTree = ""; - }; BFB922F5D81845AC32D1E1ED /* Frameworks */ = { isa = PBXGroup; children = ( @@ -7963,7 +1798,6 @@ 237701092BCF73DD00D661F1 /* libiconv.tbd */, 237701072BCF73CE00D661F1 /* Security.framework */, 23E56B3B2B03564B00C8DAC9 /* CoreTelephony.framework */, - E87888F32738C30E00BF1D57 /* StoreKit.framework */, 186A531826FC591100D67B2C /* libresolv.tbd */, CACF623970097D653132D69A /* Pods_YuMi.framework */, ); @@ -7979,190 +1813,6 @@ path = Pods; sourceTree = ""; }; - E801273827E322D700BAC3F2 /* RoomPK */ = { - isa = PBXGroup; - children = ( - E801273D27E3230F00BAC3F2 /* Model */, - E801273C27E3230400BAC3F2 /* Api */, - E801273B27E322FE00BAC3F2 /* View */, - E801273A27E322F500BAC3F2 /* Presenter */, - E801273927E322E900BAC3F2 /* Protocol */, - ); - path = RoomPK; - sourceTree = ""; - }; - E801273927E322E900BAC3F2 /* Protocol */ = { - isa = PBXGroup; - children = ( - E801274427E3240000BAC3F2 /* XPRoomPKProtocol.h */, - E8664EE027E45EE6000171BA /* XPRoomPKRecordProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E801273A27E322F500BAC3F2 /* Presenter */ = { - isa = PBXGroup; - children = ( - E801274127E323E500BAC3F2 /* XPRoomPKPresenter.h */, - E801274227E323E500BAC3F2 /* XPRoomPKPresenter.m */, - E8664EDD27E45EC7000171BA /* XPRoomPKRecordPresenter.h */, - E8664EDE27E45EC7000171BA /* XPRoomPKRecordPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E801273B27E322FE00BAC3F2 /* View */ = { - isa = PBXGroup; - children = ( - E801275227E3321C00BAC3F2 /* SubViews */, - E801274827E3278E00BAC3F2 /* Cell */, - E801273E27E323C800BAC3F2 /* XPRoomPKViewController.h */, - E801273F27E323C800BAC3F2 /* XPRoomPKViewController.m */, - E8664ED427E434D5000171BA /* XPRoomPKRecordViewController.h */, - E8664ED527E434D5000171BA /* XPRoomPKRecordViewController.m */, - E84843AD27F59E7E0050D365 /* XPRoomPKResultView.h */, - E84843AE27F59E7E0050D365 /* XPRoomPKResultView.m */, - 545888312C1AFFB500897585 /* XPRoomPKPanelView.h */, - 545888322C1AFFB500897585 /* XPRoomPKPanelView.m */, - ); - path = View; - sourceTree = ""; - }; - E801273C27E3230400BAC3F2 /* Api */ = { - isa = PBXGroup; - children = ( - E801274527E3241700BAC3F2 /* Api+RoomPK.h */, - E801274627E3241700BAC3F2 /* Api+RoomPK.m */, - ); - path = Api; - sourceTree = ""; - }; - E801273D27E3230F00BAC3F2 /* Model */ = { - isa = PBXGroup; - children = ( - E801275627E347FD00BAC3F2 /* RoomPKRecordModel.h */, - E801275727E347FD00BAC3F2 /* RoomPKRecordModel.m */, - E8664EE427E482EF000171BA /* RoomPKTeamModel.h */, - E8664EE527E482EF000171BA /* RoomPKTeamModel.m */, - E8664ED127E4258A000171BA /* RoomPKTimeItemModel.h */, - E8664ED227E4258A000171BA /* RoomPKTimeItemModel.m */, - E8A88D2B27E81E8700CA8837 /* RoomPKChooseUserModel.h */, - E8A88D2C27E81E8700CA8837 /* RoomPKChooseUserModel.m */, - E8A88D2E27E85EEA00CA8837 /* RoomPKInfoModel.h */, - E8A88D2F27E85EEA00CA8837 /* RoomPKInfoModel.m */, - E80A086027F2AC190027B30C /* RoomPKDetailInfoModel.h */, - E80A086127F2AC190027B30C /* RoomPKDetailInfoModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E801274827E3278E00BAC3F2 /* Cell */ = { - isa = PBXGroup; - children = ( - E801274927E327DA00BAC3F2 /* XPRoomPKTypeTableViewCell.h */, - E801274A27E327DA00BAC3F2 /* XPRoomPKTypeTableViewCell.m */, - E801274C27E3280000BAC3F2 /* XPRoomPKVoteTableViewCell.h */, - E801274D27E3280000BAC3F2 /* XPRoomPKVoteTableViewCell.m */, - E801274F27E3281100BAC3F2 /* XPRoomPKTimeTableViewCell.h */, - E801275027E3281100BAC3F2 /* XPRoomPKTimeTableViewCell.m */, - E8664ED727E4355C000171BA /* XPRoomPKRecordTableViewCell.h */, - E8664ED827E4355C000171BA /* XPRoomPKRecordTableViewCell.m */, - E8664EDA27E43632000171BA /* XPRoomPKEmptyTableViewCell.h */, - E8664EDB27E43632000171BA /* XPRoomPKEmptyTableViewCell.m */, - E8A88D2827E81C8600CA8837 /* XPRoomPKUserCollectionViewCell.h */, - E8A88D2927E81C8600CA8837 /* XPRoomPKUserCollectionViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E801275227E3321C00BAC3F2 /* SubViews */ = { - isa = PBXGroup; - children = ( - E801275327E3326000BAC3F2 /* XPRoomPKUserView.h */, - E801275427E3326000BAC3F2 /* XPRoomPKUserView.m */, - E8664ECE27E42238000171BA /* XPRoomPKTimePickerView.h */, - E8664ECF27E42238000171BA /* XPRoomPKTimePickerView.m */, - E8664EE127E47711000171BA /* XPRoomPKRecordNickView.h */, - E8664EE227E47711000171BA /* XPRoomPKRecordNickView.m */, - E8A88D2527E8193400CA8837 /* XPRoomPKSelectUserView.h */, - E8A88D2627E8193400CA8837 /* XPRoomPKSelectUserView.m */, - E81AF32627F1EE69003B9E43 /* XPRoomPKPanelUserView.h */, - E81AF32727F1EE69003B9E43 /* XPRoomPKPanelUserView.m */, - E84843B027F5A0740050D365 /* XPRomPKResultTitleLabel.h */, - E84843B127F5A0740050D365 /* XPRomPKResultTitleLabel.m */, - 545888342C1C306B00897585 /* XPRoomPKPaneAvatarView.h */, - 545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */, - ); - path = SubViews; - sourceTree = ""; - }; - E804875F2717DD70008595F2 /* Model */ = { - isa = PBXGroup; - children = ( - 4CE746C42D9297C30094E496 /* BravoGiftTipModel.h */, - 4CE746C52D9297C30094E496 /* BravoGiftTipModel.m */, - E89D60BF271D64B9001F8895 /* RoomInfoModel.h */, - E89D60C0271D64B9001F8895 /* RoomInfoModel.m */, - E8252FEC27687DF1002B3164 /* ActivityInfoModel.h */, - E8252FED27687DF1002B3164 /* ActivityInfoModel.m */, - E8899C802785A694007944BE /* DatingInfoModel.h */, - E8899C812785A694007944BE /* DatingInfoModel.m */, - E87AE8BF284E184300CAFBB3 /* RoomNewUserGreetModel.h */, - E87AE8C0284E184300CAFBB3 /* RoomNewUserGreetModel.m */, - 5412E0FB2C52512100FDD668 /* RoomBottomEntranceModel.h */, - 5412E0FC2C52512100FDD668 /* RoomBottomEntranceModel.m */, - 54E82EAC2CA9293C00C931D9 /* BoomInfoModel.h */, - 54E82EAD2CA9293C00C931D9 /* BoomInfoModel.m */, - 544879EE2CD22D4B00D58DC1 /* CustomRoomBGItemModel.h */, - 544879EF2CD22D4B00D58DC1 /* CustomRoomBGItemModel.m */, - 4C5527BA2D1BDCDE00833FFD /* RoomLevelInfoModel.h */, - 4C5527BB2D1BDCDE00833FFD /* RoomLevelInfoModel.m */, - 4CA532B52D5B333200B8F59F /* RoomLuckyPackageInfoModel.h */, - 4CA532B62D5B333200B8F59F /* RoomLuckyPackageInfoModel.m */, - 4C75CEF92D6318FF009147A5 /* RoomEnterModel.h */, - 4C75CEFA2D6318FF009147A5 /* RoomEnterModel.m */, - 4CFBE0C82DAD085700A923AF /* BravoGiftTabInfomationModel.h */, - 4CFBE0C92DAD085700A923AF /* BravoGiftTabInfomationModel.m */, - 4C9828112E6EB50000FC6345 /* MicCpInfoModel.h */, - 4C9828122E6EB50000FC6345 /* MicCpInfoModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E80487602717DD89008595F2 /* Api */ = { - isa = PBXGroup; - children = ( - E89D60B8271D643A001F8895 /* Api+Room.h */, - E89D60B9271D643A001F8895 /* Api+Room.m */, - 54E82EA92CA9261000C931D9 /* Api+Boom.h */, - 54E82EAA2CA9261000C931D9 /* Api+Boom.m */, - 546104172CD4C06400066B21 /* Api+CustomBackground.h */, - 546104182CD4C06400066B21 /* Api+CustomBackground.m */, - 4CFFEFCE2D3A5E130035D016 /* Api+SuperAdmin.h */, - 4CFFEFCF2D3A5E130035D016 /* Api+SuperAdmin.m */, - 4CA532B22D5AEE9400B8F59F /* Api+LuckyPackage.h */, - 4CA532B32D5AEE9400B8F59F /* Api+LuckyPackage.m */, - ); - path = Api; - sourceTree = ""; - }; - E80487612717DD92008595F2 /* Presenter */ = { - isa = PBXGroup; - children = ( - E89D60BB271D647A001F8895 /* XPRoomPresenter.h */, - E89D60BC271D647A001F8895 /* XPRoomPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E80487622717DDAE008595F2 /* Protocol */ = { - isa = PBXGroup; - children = ( - E89D60BE271D648D001F8895 /* XPRoomProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; E80B070F280D0A6700A79F63 /* Friend */ = { isa = PBXGroup; children = ( @@ -8181,67 +1831,6 @@ path = Timer; sourceTree = ""; }; - E81060D62987613E00B772F0 /* SesssionModel */ = { - isa = PBXGroup; - children = ( - E81060D7298761A300B772F0 /* MessageBaseModel.h */, - E81060D8298761A300B772F0 /* MessageBaseModel.m */, - E81060DA298761F100B772F0 /* MessageTextModel.h */, - E81060DB298761F100B772F0 /* MessageTextModel.m */, - E81060DD29876D3A00B772F0 /* MessageTimeModel.h */, - E81060DE29876D3A00B772F0 /* MessageTimeModel.m */, - E8383695298A598D00112E1C /* MessageTipsModel.h */, - E8383696298A598D00112E1C /* MessageTipsModel.m */, - E81060E029876E9100B772F0 /* MessageImageModel.h */, - E81060E129876E9100B772F0 /* MessageImageModel.m */, - E81060E329876FF300B772F0 /* MessageAudioModel.h */, - E81060E429876FF300B772F0 /* MessageAudioModel.m */, - E81060E62987720F00B772F0 /* MessageUnSupportModel.h */, - E81060E72987720F00B772F0 /* MessageUnSupportModel.m */, - E81060E92987BE8300B772F0 /* MessageGiftModel.h */, - E81060EA2987BE8300B772F0 /* MessageGiftModel.m */, - 233423D72AB0438400B1253F /* PIMessageContentServiceReplyModel.h */, - 233423D82AB0438400B1253F /* PIMessageContentServiceReplyModel.m */, - E81060EC2987C35700B772F0 /* MessageTextClickModel.h */, - E81060ED2987C35700B772F0 /* MessageTextClickModel.m */, - E81060EF2987C52B00B772F0 /* MessageGuildModel.h */, - E81060F02987C52B00B772F0 /* MessageGuildModel.m */, - E81060F22987C6B200B772F0 /* MessageOpenLiveModel.h */, - E81060F32987C6B200B772F0 /* MessageOpenLiveModel.m */, - E81060F52987C8A700B772F0 /* MessageApplicationShareModel.h */, - E81060F62987C8A700B772F0 /* MessageApplicationShareModel.m */, - E81060FB2987CC9100B772F0 /* MessageLevelUpgradeModel.h */, - E81060FC2987CC9100B772F0 /* MessageLevelUpgradeModel.m */, - E81060FE2987CDCC00B772F0 /* MessageTweetModel.h */, - E81060FF2987CDCC00B772F0 /* MessageTweetModel.m */, - E81061012987CFCE00B772F0 /* MessageSkillCardModel.h */, - E81061022987CFCE00B772F0 /* MessageSkillCardModel.m */, - E82107792987D4AB00DE7040 /* MessageFindNewGreetModel.h */, - E821077A2987D4AB00DE7040 /* MessageFindNewGreetModel.m */, - E821077C2987D67100DE7040 /* MessageRiskAlertModel.h */, - E821077D2987D67100DE7040 /* MessageRiskAlertModel.m */, - E821077F2987D7F300DE7040 /* MessageMonentsModel.h */, - E82107802987D7F300DE7040 /* MessageMonentsModel.m */, - E82107822987E35300DE7040 /* MessageMonentsAutoModel.h */, - E82107832987E35300DE7040 /* MessageMonentsAutoModel.m */, - E82107852987E49100DE7040 /* MessageRedPacketModel.h */, - E82107862987E49100DE7040 /* MessageRedPacketModel.m */, - E8778ADF2988B4C300CF139B /* MessageRevokeModel.h */, - E8778AE02988B4C300CF139B /* MessageRevokeModel.m */, - 235714872BECC38F004C81D6 /* MessageHeadlinesTextModel.h */, - 235714882BECC38F004C81D6 /* MessageHeadlinesTextModel.m */, - 54C9A1202C3E6C3200C6D970 /* MessageGameOrderModel.h */, - 54C9A1212C3E6C3200C6D970 /* MessageGameOrderModel.m */, - 4CD6FF642D673A5C00262AB7 /* AgentMessageModel.h */, - 4CD6FF652D673A5C00262AB7 /* AgentMessageModel.m */, - 4CBBB44A2DA66334001B1C6D /* MessageCPNotifyModel.h */, - 4CBBB44B2DA66334001B1C6D /* MessageCPNotifyModel.m */, - 4CAFF0082DD342A400CD81DF /* MessagePublicEventModel.h */, - 4CAFF0092DD342A400CD81DF /* MessagePublicEventModel.m */, - ); - path = SesssionModel; - sourceTree = ""; - }; E81366E426F0A4820076364C /* NSString */ = { isa = PBXGroup; children = ( @@ -8251,76 +1840,6 @@ path = NSString; sourceTree = ""; }; - E81C1B1327705EF00020D1E4 /* ArrangeMic */ = { - isa = PBXGroup; - children = ( - E81C1B1827705F2B0020D1E4 /* Model */, - E81C1B1727705F1F0020D1E4 /* Api */, - E81C1B1627705F190020D1E4 /* View */, - E81C1B1527705F130020D1E4 /* Presenter */, - E81C1B1427705F0A0020D1E4 /* Protocol */, - ); - path = ArrangeMic; - sourceTree = ""; - }; - E81C1B1427705F0A0020D1E4 /* Protocol */ = { - isa = PBXGroup; - children = ( - E81C1B1927705F4B0020D1E4 /* XPArrangeMicProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E81C1B1527705F130020D1E4 /* Presenter */ = { - isa = PBXGroup; - children = ( - E81C1B1A27705F6B0020D1E4 /* XPArrangeMicPresenter.h */, - E81C1B1B27705F6B0020D1E4 /* XPArrangeMicPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E81C1B1627705F190020D1E4 /* View */ = { - isa = PBXGroup; - children = ( - E81C1B23277065F70020D1E4 /* Cell */, - E81C1B1D27705F7A0020D1E4 /* XPArrangeMicViewController.h */, - E81C1B1E27705F7A0020D1E4 /* XPArrangeMicViewController.m */, - ); - path = View; - sourceTree = ""; - }; - E81C1B1727705F1F0020D1E4 /* Api */ = { - isa = PBXGroup; - children = ( - E81C1B2027705F950020D1E4 /* Api+ArrangeMic.h */, - E81C1B2127705F950020D1E4 /* Api+ArrangeMic.m */, - ); - path = Api; - sourceTree = ""; - }; - E81C1B1827705F2B0020D1E4 /* Model */ = { - isa = PBXGroup; - children = ( - E81C1B2A27706E5C0020D1E4 /* ArrangeMicModel.h */, - E81C1B2B27706E5C0020D1E4 /* ArrangeMicModel.m */, - E81C1B2D277071670020D1E4 /* XPArrangeMicInfoModel.h */, - E81C1B2E277071670020D1E4 /* XPArrangeMicInfoModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E81C1B23277065F70020D1E4 /* Cell */ = { - isa = PBXGroup; - children = ( - E81C1B242770663B0020D1E4 /* XPArrangeMicTableViewCell.h */, - E81C1B252770663B0020D1E4 /* XPArrangeMicTableViewCell.m */, - E81C1B27277069DD0020D1E4 /* XPArrangeMicEmptyTableViewCell.h */, - E81C1B28277069DD0020D1E4 /* XPArrangeMicEmptyTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; E81C278726EAFABF0031E639 /* Security */ = { isa = PBXGroup; children = ( @@ -8337,10 +1856,6 @@ E81C279926EB64BA0031E639 /* Global */ = { isa = PBXGroup; children = ( - 4C0642862E97BDA300BAF413 /* GlobalEventManager.h */, - 4C0642872E97BDA300BAF413 /* GlobalEventManager.m */, - 4C84A9C92E602B1A002C10FC /* BuglyManager.h */, - 4C84A9CA2E602B1A002C10FC /* BuglyManager.m */, E81C279A26EB65560031E639 /* YUMIMacroUitls.h */, E81C279B26EEEC620031E639 /* YUMIConstant.h */, E81C279C26EEEC620031E639 /* YUMIConstant.m */, @@ -8356,8 +1871,6 @@ children = ( 189DD52C26DE255300AB55B1 /* AppDelegate.h */, 189DD52D26DE255300AB55B1 /* AppDelegate.m */, - E81C27AC26EF39AB0031E639 /* AppDelegate+ThirdConfig.h */, - E81C27AD26EF39AB0031E639 /* AppDelegate+ThirdConfig.m */, 234D821C2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.h */, 234D821D2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m */, ); @@ -8369,7 +1882,6 @@ children = ( E81DCCCA282B638B0039E5C5 /* Model */, E81DCCC9282B63840039E5C5 /* Api */, - E81DCCC8282B637C0039E5C5 /* View */, E81DCCC7282B636D0039E5C5 /* Presenter */, E81DCCC6282B63630039E5C5 /* Protocol */, ); @@ -8401,65 +1913,18 @@ 1427213329A75A2600C7C423 /* XPMomentsLatestPresenter.m */, 1427212E29A7599500C7C423 /* XPMonentsAttentionPresenter.h */, 1427212D29A7599500C7C423 /* XPMonentsAttentionPresenter.m */, - E8950187282CFFB1007E459A /* XPMomentsLayoutConfig.h */, - E8950188282CFFB1007E459A /* XPMomentsLayoutConfig.m */, - E8098CA8282E03B40090B9F0 /* XPMomentsRecommendPresenter.h */, - E8098CA9282E03B40090B9F0 /* XPMomentsRecommendPresenter.m */, - E81A65402835120200F55894 /* XPMonentsInteractivePresenter.h */, - E81A65412835120200F55894 /* XPMonentsInteractivePresenter.m */, - E85410332864155A005CFD9F /* XPMonentDetailPresenter.h */, - E85410342864155A005CFD9F /* XPMonentDetailPresenter.m */, E818E349286ECABF005EDF68 /* XPMonentsPublishPresenter.h */, E818E34A286ECABF005EDF68 /* XPMonentsPublishPresenter.m */, E8AB631728ADE2F40023B0D2 /* XPMonentsTopicRecommendPresenter.h */, E8AB631828ADE2F40023B0D2 /* XPMonentsTopicRecommendPresenter.m */, E8AB631A28ADE30E0023B0D2 /* XPMonentsTopicLatestPresenter.h */, E8AB631B28ADE30E0023B0D2 /* XPMonentsTopicLatestPresenter.m */, - E8AB632528AE13210023B0D2 /* XPMomentsTopicListPresenter.h */, - E8AB632628AE13210023B0D2 /* XPMomentsTopicListPresenter.m */, E8AB632D28AE19DE0023B0D2 /* XPMomentMinePresenter.h */, E8AB632E28AE19DE0023B0D2 /* XPMomentMinePresenter.m */, ); path = Presenter; sourceTree = ""; }; - E81DCCC8282B637C0039E5C5 /* View */ = { - isa = PBXGroup; - children = ( - E8D7D748282BA1C90007D7BD /* SubViews */, - E8D7D747282BA1C20007D7BD /* Cell */, - E81DCCCB282B63B40039E5C5 /* XPMomentsViewController.h */, - E81DCCCC282B63B40039E5C5 /* XPMomentsViewController.m */, - E81DCCCE282B63FD0039E5C5 /* XPMomentsRecommendViewController.h */, - E81DCCCF282B63FD0039E5C5 /* XPMomentsRecommendViewController.m */, - E81A65292834E4F600F55894 /* XPMomentsAttentionViewController.h */, - E81A652A2834E4F600F55894 /* XPMomentsAttentionViewController.m */, - E81A652F2834E53600F55894 /* XPMomentsLatestViewController.h */, - E81A65302834E53600F55894 /* XPMomentsLatestViewController.m */, - E81A653D283511BE00F55894 /* XPMonentsInteractiveViewController.h */, - E81A653E283511BE00F55894 /* XPMonentsInteractiveViewController.m */, - E852D739286317F0001465ED /* XPMomentsDetailViewController.h */, - E852D73A286317F0001465ED /* XPMomentsDetailViewController.m */, - E818E346286ECA4B005EDF68 /* XPMonentsPublishViewController.h */, - E818E347286ECA4B005EDF68 /* XPMonentsPublishViewController.m */, - E8AB630B28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.h */, - E8AB630C28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.m */, - E8AB630E28ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.h */, - E8AB630F28ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.m */, - E8AB631428ADE2D20023B0D2 /* XPMonentsTopicLatestViewController.h */, - E8AB631528ADE2D20023B0D2 /* XPMonentsTopicLatestViewController.m */, - E8AB632228AE10310023B0D2 /* XPMomentsTopicListViewController.h */, - E8AB632328AE10310023B0D2 /* XPMomentsTopicListViewController.m */, - E8AB632A28AE19600023B0D2 /* XPMomentsMineViewController.h */, - E8AB632B28AE19600023B0D2 /* XPMomentsMineViewController.m */, - 14EB640729A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.h */, - 14EB640829A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.m */, - 14EB640B29A5C16000A4A00B /* XPMomentsSimpleDetailNav.h */, - 14EB640C29A5C16000A4A00B /* XPMomentsSimpleDetailNav.m */, - ); - path = View; - sourceTree = ""; - }; E81DCCC9282B63840039E5C5 /* Api */ = { isa = PBXGroup; children = ( @@ -8476,18 +1941,6 @@ 1427212A29A757EC00C7C423 /* MomentsListInfoModel.m */, E88749B4282B8FC600C3C7DB /* MomentsInfoModel.h */, E88749B5282B8FC600C3C7DB /* MomentsInfoModel.m */, - E81A6544283519CA00F55894 /* MomentsTopicModel.h */, - E81A6545283519CA00F55894 /* MomentsTopicModel.m */, - E878B8562835F0D300E22DCF /* MonentsInteractiveModel.h */, - E878B8572835F0D300E22DCF /* MonentsInteractiveModel.m */, - E878B85C283640A500E22DCF /* MonentsUnReadModel.h */, - E878B85D283640A500E22DCF /* MonentsUnReadModel.m */, - E852D74228633A08001465ED /* MonentsCommentModel.h */, - E852D74328633A08001465ED /* MonentsCommentModel.m */, - E852D74528633E92001465ED /* MonentsCommentReplyModel.h */, - E852D74628633E92001465ED /* MonentsCommentReplyModel.m */, - E8B9843128ABA2FF0022D026 /* MonentsPicResInfo.h */, - E8B9843228ABA2FF0022D026 /* MonentsPicResInfo.m */, ); path = Model; sourceTree = ""; @@ -8501,130 +1954,6 @@ path = CountDown; sourceTree = ""; }; - E82325EA274E2D52003A3332 /* UserCard */ = { - isa = PBXGroup; - children = ( - E82325EB274E2D6C003A3332 /* Model */, - E82325EC274E2D7A003A3332 /* Api */, - E82325ED274E2D8E003A3332 /* View */, - E82325EE274E2D97003A3332 /* Presenter */, - E82325EF274E2DA0003A3332 /* Protocol */, - E8232601274E4AA0003A3332 /* ThemeColor+UserCard.h */, - E8232602274E4AA0003A3332 /* ThemeColor+UserCard.m */, - ); - path = UserCard; - sourceTree = ""; - }; - E82325EB274E2D6C003A3332 /* Model */ = { - isa = PBXGroup; - children = ( - E82325FA274E4735003A3332 /* XPUserCardItemModel.h */, - E82325FB274E4735003A3332 /* XPUserCardItemModel.m */, - E899C68A275093B700E189E5 /* XPUserCardMicroItemModel.h */, - E899C68B275093B800E189E5 /* XPUserCardMicroItemModel.m */, - E899C68727508F4E00E189E5 /* XPUserCardInfoModel.h */, - E899C68827508F4E00E189E5 /* XPUserCardInfoModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E82325EC274E2D7A003A3332 /* Api */ = { - isa = PBXGroup; - children = ( - E82325F7274E2E42003A3332 /* Api+UserCard.h */, - E82325F8274E2E42003A3332 /* Api+UserCard.m */, - ); - path = Api; - sourceTree = ""; - }; - E82325ED274E2D8E003A3332 /* View */ = { - isa = PBXGroup; - children = ( - 4CCA0C662DDED89F00E30513 /* Custom9MicLayout.h */, - 4CCA0C672DDED89F00E30513 /* Custom9MicLayout.m */, - 4CCA0C682DDED89F00E30513 /* Custom19MicLayout.h */, - 4CCA0C692DDED89F00E30513 /* Custom19MicLayout.m */, - 4CCA0C6A2DDED89F00E30513 /* UserRoomMicPositionCell.h */, - 4CCA0C6B2DDED89F00E30513 /* UserRoomMicPositionCell.m */, - 4CCA0C6C2DDED89F00E30513 /* UserRoomMicPositionView.h */, - 4CCA0C6D2DDED89F00E30513 /* UserRoomMicPositionView.m */, - 9B85B6D4279FDAA900A0A1AC /* SubViews */, - E82325FD274E48D0003A3332 /* Cell */, - E82325F0274E2DE6003A3332 /* XPUserCardViewController.h */, - E82325F1274E2DE6003A3332 /* XPUserCardViewController.m */, - 4CEB9EA52D09643E00443480 /* UserRoomCardViewController.h */, - 4CEB9EA62D09643E00443480 /* UserRoomCardViewController.m */, - ); - path = View; - sourceTree = ""; - }; - E82325EE274E2D97003A3332 /* Presenter */ = { - isa = PBXGroup; - children = ( - E82325F3274E2E09003A3332 /* XPUserCardPresenter.h */, - E82325F4274E2E09003A3332 /* XPUserCardPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E82325EF274E2DA0003A3332 /* Protocol */ = { - isa = PBXGroup; - children = ( - E82325F6274E2E27003A3332 /* XPUserCardProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E82325FD274E48D0003A3332 /* Cell */ = { - isa = PBXGroup; - children = ( - E82325FE274E48EA003A3332 /* XPUserCardItemCollectionViewCell.h */, - E82325FF274E48EA003A3332 /* XPUserCardItemCollectionViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E82D5C77276B25B000858D6D /* SpriteSheetManager */ = { - isa = PBXGroup; - children = ( - E82D5C78276B25D100858D6D /* SpriteSheetImageManager.h */, - E82D5C79276B25D100858D6D /* SpriteSheetImageManager.m */, - E82D5C7B276B343300858D6D /* YYAnimatedImageView+ImageShow.h */, - E82D5C7C276B343300858D6D /* YYAnimatedImageView+ImageShow.m */, - ); - path = SpriteSheetManager; - sourceTree = ""; - }; - E82E74F92828B1FC00C25EF7 /* Model */ = { - isa = PBXGroup; - children = ( - E88C728D2828EA4E0047FB2B /* Music+CoreDataProperties.h */, - E88C728E2828EA4E0047FB2B /* Music+CoreDataClass.h */, - E88C728F2828EA4E0047FB2B /* Music+CoreDataProperties.m */, - E88C72902828EA4E0047FB2B /* Music+CoreDataClass.m */, - ); - path = Model; - sourceTree = ""; - }; - E82E74FA2828B20F00C25EF7 /* Presenter */ = { - isa = PBXGroup; - children = ( - E87E63F529AA1A5600EBE52B /* YuMi.xcdatamodeld */, - E82E75042828E76400C25EF7 /* XPCoreDataManager.h */, - E82E75052828E76400C25EF7 /* XPCoreDataManager.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E83645652A40A2CA00E0DBE4 /* CardManager */ = { - isa = PBXGroup; - children = ( - E83645662A40A2DC00E0DBE4 /* XPSkillCardPlayerManager.h */, - E83645672A40A2DC00E0DBE4 /* XPSkillCardPlayerManager.m */, - ); - path = CardManager; - sourceTree = ""; - }; E83645A42A40AEF600E0DBE4 /* Bundle */ = { isa = PBXGroup; children = ( @@ -8636,821 +1965,6 @@ path = Bundle; sourceTree = ""; }; - E838D99D275E1B6C0079E0B5 /* AnimationView */ = { - isa = PBXGroup; - children = ( - 4C7547322E55AAB100C6E821 /* GestureOptimizer.h */, - 4C7547332E55AAB100C6E821 /* GestureOptimizer.m */, - 4C75472C2E55837200C6E821 /* BannerScheduler.h */, - 4C75472D2E55837200C6E821 /* BannerScheduler.m */, - 4C75472F2E55A7ED00C6E821 /* TouchAreaCacheManager.h */, - 4C7547302E55A7ED00C6E821 /* TouchAreaCacheManager.m */, - 4C6E31EA2D35010F00D8EEDD /* RoomAnimationView.h */, - 4C6E31EB2D35010F00D8EEDD /* RoomAnimationView.m */, - 4C6E31ED2D363CA800D8EEDD /* addMoveAnimationToView.m */, - E83DB47E274649B200D8CBD1 /* Model */, - E8C214FF274B76F60079E6BF /* XPRoomAnimationHitView.h */, - E8C21500274B76F60079E6BF /* XPRoomAnimationHitView.m */, - 9B8DE0E2289CF7AA00FB6EC2 /* XPRoomGiftCompoundView.h */, - 9B8DE0E3289CF7AA00FB6EC2 /* XPRoomGiftCompoundView.m */, - E83DB4822746661800D8CBD1 /* XPRoomGiftBroadcastView.h */, - E83DB4832746661800D8CBD1 /* XPRoomGiftBroadcastView.m */, - 5461041A2CD4D35A00066B21 /* RoomHighValueGiftBannerAnimation.h */, - 5461041B2CD4D35A00066B21 /* RoomHighValueGiftBannerAnimation.m */, - 2368969E2AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.h */, - 2368969F2AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.m */, - E8A03DFD27635F960098D9EA /* XPRoomCandyGiftView.h */, - E8A03DFE27635F960098D9EA /* XPRoomCandyGiftView.m */, - E8899C832785CC69007944BE /* XPRoomDatingAnimationView.h */, - E8899C842785CC69007944BE /* XPRoomDatingAnimationView.m */, - 9B6B3AA9278C2EA7005551EC /* XPRoomNobleLevelUpView.h */, - 9B6B3AAA278C2EA7005551EC /* XPRoomNobleLevelUpView.m */, - 9BC8C82E28090C9200C24F85 /* XPRoomAnchorRankBannerView.h */, - 9BC8C82F28090C9200C24F85 /* XPRoomAnchorRankBannerView.m */, - 9B86D8782817DD8400494FCD /* XPRoomEnterHideTipView.h */, - 9B86D8792817DD8400494FCD /* XPRoomEnterHideTipView.m */, - E8998D7E28597B0300C68558 /* XPRoomLuckyBigPrizeView.h */, - E8998D7F28597B0300C68558 /* XPRoomLuckyBigPrizeView.m */, - 4C71C6A02D06DB3D00ECCA24 /* GiftAnimationManager.h */, - 4C71C6A12D06DB3D00ECCA24 /* GiftAnimationManager.m */, - 4C71C69D2D069D2B00ECCA24 /* GiftAnimationHelper.h */, - 4C71C69E2D069D2B00ECCA24 /* GiftAnimationHelper.m */, - E8E21A9928B4BD92008F7C9D /* XPRoomGraffitiGiftAnimationView.h */, - E8E21A9A28B4BD92008F7C9D /* XPRoomGraffitiGiftAnimationView.m */, - 9BC9DAED27E33B3F009EE409 /* XPRoomGiftAnimationParser.h */, - 9BC9DAEE27E33B3F009EE409 /* XPRoomGiftAnimationParser.m */, - F1D8556D2931FC86008C418F /* XPRoomYearActivityView.h */, - F1D8556E2931FC86008C418F /* XPRoomYearActivityView.m */, - 238A90052BA9729200828123 /* PIUniversalBannerView.h */, - 238A90062BA9729200828123 /* PIUniversalBannerView.m */, - 54C608532CBE1EC7003DD5D2 /* GameUniversalBannerView.h */, - 54C608542CBE1EC7003DD5D2 /* GameUniversalBannerView.m */, - 54E4D52E2C9048E1009E1FEA /* LuckyGiftWinningFlagView.h */, - 54E4D52F2C9048E1009E1FEA /* LuckyGiftWinningFlagView.m */, - 54E4D5312C90658C009E1FEA /* LuckyGiftWinningBannerView.h */, - 54E4D5322C90658C009E1FEA /* LuckyGiftWinningBannerView.m */, - 4CE746D32D92C1080094E496 /* BravoGiftWinningFlagView.h */, - 4CE746D42D92C1080094E496 /* BravoGiftWinningFlagView.m */, - ); - path = AnimationView; - sourceTree = ""; - }; - E83953232769FF2400CF2F24 /* DressUp */ = { - isa = PBXGroup; - children = ( - E83953272769FFF100CF2F24 /* Model */, - E839532E276A038500CF2F24 /* Api */, - E83953242769FFD000CF2F24 /* View */, - E83953262769FFE200CF2F24 /* Presenter */, - E83953252769FFD900CF2F24 /* Protocol */, - ); - path = DressUp; - sourceTree = ""; - }; - E83953242769FFD000CF2F24 /* View */ = { - isa = PBXGroup; - children = ( - E8395336276A0C9400CF2F24 /* Cell */, - E839532B276A030F00CF2F24 /* XPMineDressUpListViewController.h */, - E839532C276A030F00CF2F24 /* XPMineDressUpListViewController.m */, - 9B1EF3D027E81C0600554295 /* XPMineDressUpBubbleViewController.h */, - 9B1EF3D127E81C0600554295 /* XPMineDressUpBubbleViewController.m */, - 9BE01AD228927E9C00B50299 /* XPDressUpShopListViewController.h */, - 9BE01AD328927E9C00B50299 /* XPDressUpShopListViewController.m */, - 9BE01ADF28937DBC00B50299 /* XPDressUpShopCardViewController.h */, - 9BE01AE028937DBC00B50299 /* XPDressUpShopCardViewController.m */, - 9BE01AE82893CB4400B50299 /* XPDressSearchViewController.h */, - 9BE01AE92893CB4400B50299 /* XPDressSearchViewController.m */, - ); - path = View; - sourceTree = ""; - }; - E83953252769FFD900CF2F24 /* Protocol */ = { - isa = PBXGroup; - children = ( - E8395335276A03E200CF2F24 /* XPMineDressUpProtocol.h */, - 9BE01ADB2892975000B50299 /* XPDressUpShopProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E83953262769FFE200CF2F24 /* Presenter */ = { - isa = PBXGroup; - children = ( - E8395332276A03C300CF2F24 /* XPMineDressUpPresenter.h */, - E8395333276A03C300CF2F24 /* XPMineDressUpPresenter.m */, - 9BE01AD8289296B500B50299 /* XPDressUpShopPresenter.h */, - 9BE01AD9289296B500B50299 /* XPDressUpShopPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E83953272769FFF100CF2F24 /* Model */ = { - isa = PBXGroup; - children = ( - E82D5C6E276AE60000858D6D /* HeadwearModel.h */, - E82D5C6F276AE60000858D6D /* HeadwearModel.m */, - E82D5C71276AE94800858D6D /* CarModel.h */, - E82D5C72276AE94800858D6D /* CarModel.m */, - E82D5C74276AEB5100858D6D /* NameplateModel.h */, - E82D5C75276AEB5100858D6D /* NameplateModel.m */, - 9BBC028C2786FA060007C24B /* NobleCardModel.h */, - 9BBC028D2786FA060007C24B /* NobleCardModel.m */, - 9B1FC3D327E49A5D006EFFE0 /* ChatBubbleModel.h */, - 9B1FC3D427E49A5D006EFFE0 /* ChatBubbleModel.m */, - 9BE01ADC2892A66D00B50299 /* DressUpShopModel.h */, - 9BE01ADD2892A66D00B50299 /* DressUpShopModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E839532E276A038500CF2F24 /* Api */ = { - isa = PBXGroup; - children = ( - E839532F276A03AE00CF2F24 /* Api+DressUp.h */, - E8395330276A03AE00CF2F24 /* Api+DressUp.m */, - ); - path = Api; - sourceTree = ""; - }; - E8395336276A0C9400CF2F24 /* Cell */ = { - isa = PBXGroup; - children = ( - E87E914C2796678D00A7B3F2 /* XPMineDressEmptyTableViewCell.h */, - E87E914D2796678D00A7B3F2 /* XPMineDressEmptyTableViewCell.m */, - E8395337276A0CC100CF2F24 /* XPMineHeadwearTableViewCell.h */, - E8395338276A0CC100CF2F24 /* XPMineHeadwearTableViewCell.m */, - E839533A276A0CCD00CF2F24 /* XPMineCarTableViewCell.h */, - E839533B276A0CCD00CF2F24 /* XPMineCarTableViewCell.m */, - E839533D276A0CDB00CF2F24 /* XPMineNameplateTableViewCell.h */, - E839533E276A0CDB00CF2F24 /* XPMineNameplateTableViewCell.m */, - E82D5C6B276ADCE700858D6D /* XPMineDressEmptyTableViewCell.h */, - E82D5C6C276ADCE700858D6D /* XPMineDressEmptyTableViewCell.m */, - 9BBC028F2786FC570007C24B /* XPMineNobleCardTableViewCell.h */, - 9BBC02902786FC570007C24B /* XPMineNobleCardTableViewCell.m */, - 9B1FC3D627E49C36006EFFE0 /* XPMineDressBubbleCollectionViewCell.h */, - 9B1FC3D727E49C36006EFFE0 /* XPMineDressBubbleCollectionViewCell.m */, - 9B1EF3D327E8294B00554295 /* XPMineDressEmptyCollectionViewCell.h */, - 9B1EF3D427E8294B00554295 /* XPMineDressEmptyCollectionViewCell.m */, - 9BE01AE228937EDE00B50299 /* XPDressUpShopCollectionViewCell.h */, - 9BE01AE328937EDE00B50299 /* XPDressUpShopCollectionViewCell.m */, - 9BE01AE528938AB600B50299 /* XPDressUpShopCardTableViewCell.h */, - 9BE01AE628938AB600B50299 /* XPDressUpShopCardTableViewCell.m */, - 9BE01AEB2893D0DF00B50299 /* XPDressShopSearchTableViewCell.h */, - 9BE01AEC2893D0DF00B50299 /* XPDressShopSearchTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E83ABEFA280EB5A000322EE4 /* SessionContent */ = { - isa = PBXGroup; - children = ( - 23E9EA692A83808000B792F2 /* ContentTreasureFairyModel.h */, - 23E9EA6A2A83808000B792F2 /* ContentTreasureFairyModel.m */, - E83ABEFB280EB5E200322EE4 /* ContentOpenLiveInfoModel.h */, - E83ABEFC280EB5E200322EE4 /* ContentOpenLiveInfoModel.m */, - E83ABF01280EC90C00322EE4 /* ContentApplicationShareModel.h */, - E83ABF02280EC90C00322EE4 /* ContentApplicationShareModel.m */, - E841ED5F280FB0BD00904808 /* ContentLevelUpgradeModel.h */, - E841ED60280FB0BD00904808 /* ContentLevelUpgradeModel.m */, - E8F1559128129EBA00EE8C06 /* ContentSecretaryModel.h */, - E8F1559228129EBA00EE8C06 /* ContentSecretaryModel.m */, - E86507E6281A8212006951B0 /* ContentTweetModel.h */, - E86507E7281A8212006951B0 /* ContentTweetModel.m */, - E86E79CE28A4E0B2006DAF48 /* ContentRistAlertModel.h */, - E86E79CF28A4E0B2006DAF48 /* ContentRistAlertModel.m */, - E8F65C202869A36F009BB5B9 /* ContentShareMonentsModel.h */, - E8F65C212869A36F009BB5B9 /* ContentShareMonentsModel.m */, - ); - path = SessionContent; - sourceTree = ""; - }; - E83DB47E274649B200D8CBD1 /* Model */ = { - isa = PBXGroup; - children = ( - E83DB47827462C4500D8CBD1 /* XPGiftBigPrizeModel.h */, - E83DB47927462C4500D8CBD1 /* XPGiftBigPrizeModel.m */, - E83DB47F274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.h */, - E83DB480274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m */, - E86F6183284F4E4800E8EC9A /* RoomHalfHourRankModel.h */, - E86F6184284F4E4800E8EC9A /* RoomHalfHourRankModel.m */, - 9B8DE0DF289CF02900FB6EC2 /* XPGiftCompoundModel.h */, - 9B8DE0E0289CF02900FB6EC2 /* XPGiftCompoundModel.m */, - 23BA16592A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.h */, - 23BA165A2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m */, - 238A90082BA9756600828123 /* PIUniversalBannerModel.h */, - 238A90092BA9756600828123 /* PIUniversalBannerModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E8412F9A2779BAC2006E1101 /* Setting */ = { - isa = PBXGroup; - children = ( - E8412F9F2779BB03006E1101 /* Model */, - E8412F9E2779BAF9006E1101 /* Api */, - E8412F9D2779BAF2006E1101 /* View */, - E8412F9C2779BAE6006E1101 /* Presenter */, - E8412F9B2779BAD5006E1101 /* Protocol */, - ); - path = Setting; - sourceTree = ""; - }; - E8412F9B2779BAD5006E1101 /* Protocol */ = { - isa = PBXGroup; - children = ( - E8412FAD2779CB2D006E1101 /* XPRoomSettingProtocol.h */, - E87AE7FD277AAC5A0037823A /* XPRoomTagProtocol.h */, - E8AA6EF327DF1EB6009B4C2B /* XPRoomTopicProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E8412F9C2779BAE6006E1101 /* Presenter */ = { - isa = PBXGroup; - children = ( - E8412FAE2779CB4D006E1101 /* XPRoomSettingPresenter.h */, - E8412FAF2779CB4D006E1101 /* XPRoomSettingPresenter.m */, - E87AE7FA277AAC450037823A /* XPRoomTagPresenter.h */, - E87AE7FB277AAC450037823A /* XPRoomTagPresenter.m */, - E8AA6EF027DF1E97009B4C2B /* XPRoomTopicPresenter.h */, - E8AA6EF127DF1E97009B4C2B /* XPRoomTopicPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E8412F9D2779BAF2006E1101 /* View */ = { - isa = PBXGroup; - children = ( - E8412FA32779BE9B006E1101 /* Cell */, - E8412FA02779BE8F006E1101 /* XPRoomSettingViewController.h */, - E8412FA12779BE8F006E1101 /* XPRoomSettingViewController.m */, - E87AE7F7277AABE50037823A /* XPRoomTagListViewController.h */, - E87AE7F8277AABE50037823A /* XPRoomTagListViewController.m */, - E84BF7D2277C383700EF8877 /* XPRoomSettingInputView.h */, - E84BF7D3277C383700EF8877 /* XPRoomSettingInputView.m */, - E84BF7D5277C6E2100EF8877 /* XPRoomRoleViewController.h */, - E84BF7D6277C6E2100EF8877 /* XPRoomRoleViewController.m */, - E84BF7DE277C869A00EF8877 /* XPRoomOnLineViewController.h */, - E84BF7DF277C869A00EF8877 /* XPRoomOnLineViewController.m */, - E87E91532796B6DE00A7B3F2 /* XPRoomInviteUserViewController.h */, - E87E91542796B6DE00A7B3F2 /* XPRoomInviteUserViewController.m */, - E8AA6EED27DF1E6B009B4C2B /* XPRoomTopicViewController.h */, - E8AA6EEE27DF1E6B009B4C2B /* XPRoomTopicViewController.m */, - E80E900A27E0358900434B90 /* XPRoomTopicAlertView.h */, - E80E900B27E0358900434B90 /* XPRoomTopicAlertView.m */, - 9B32A04528881845002009D2 /* XPRoomTagListView.h */, - 9B32A04628881845002009D2 /* XPRoomTagListView.m */, - ); - path = View; - sourceTree = ""; - }; - E8412F9E2779BAF9006E1101 /* Api */ = { - isa = PBXGroup; - children = ( - E8412FB12779E285006E1101 /* Api+RoomSetting.h */, - E8412FB22779E285006E1101 /* Api+RoomSetting.m */, - ); - path = Api; - sourceTree = ""; - }; - E8412F9F2779BB03006E1101 /* Model */ = { - isa = PBXGroup; - children = ( - E8412FA72779C2ED006E1101 /* XPRoomSettingItemModel.h */, - E8412FA82779C2ED006E1101 /* XPRoomSettingItemModel.m */, - E84BF7CF277BFCDD00EF8877 /* RoomTagModel.h */, - E84BF7D0277BFCDD00EF8877 /* RoomTagModel.m */, - 9BFE992C288142FD009DA429 /* RoomClassifyModel.h */, - 9BFE992D288142FD009DA429 /* RoomClassifyModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E8412FA32779BE9B006E1101 /* Cell */ = { - isa = PBXGroup; - children = ( - E8412FA42779BED1006E1101 /* XPRoomSettingTableViewCell.h */, - E8412FA52779BED1006E1101 /* XPRoomSettingTableViewCell.m */, - E84BF7C8277AF79D00EF8877 /* XPRoomSettingTagCell.h */, - E84BF7C9277AF79D00EF8877 /* XPRoomSettingTagCell.m */, - E84BF7D8277C72AC00EF8877 /* XPRoomRoleTableViewCell.h */, - E84BF7D9277C72AC00EF8877 /* XPRoomRoleTableViewCell.m */, - E84BF7DB277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.h */, - E84BF7DC277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m */, - E89BD7D2277D471100E31B19 /* XPRoomOnlineTableViewCell.h */, - E89BD7D3277D471100E31B19 /* XPRoomOnlineTableViewCell.m */, - 239D0FB12BFD8C67002977CE /* MSRoomSetingBackdropCell.h */, - 239D0FB22BFD8C67002977CE /* MSRoomSetingBackdropCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E84150B027747A7400A7F548 /* FirstRecharge */ = { - isa = PBXGroup; - children = ( - E84150B427747AA400A7F548 /* Api */, - ); - path = FirstRecharge; - sourceTree = ""; - }; - E84150B427747AA400A7F548 /* Api */ = { - isa = PBXGroup; - children = ( - E84150BD27747BD300A7F548 /* Api+FirstRecharge.h */, - E84150BE27747BD300A7F548 /* Api+FirstRecharge.m */, - ); - path = Api; - sourceTree = ""; - }; - E84A2E7E2A527DF800D6AF8A /* IncomeRecord */ = { - isa = PBXGroup; - children = ( - E84A2EAA2A528A4100D6AF8A /* XPIncomeRecordGoldDetailsPickViewView.h */, - E84A2EA92A528A4100D6AF8A /* XPIncomeRecordGoldDetailsPickViewView.m */, - E84A2EA62A5288FD00D6AF8A /* XPGoldDetailsChooseRoomCell.h */, - E84A2EA72A5288FD00D6AF8A /* XPGoldDetailsChooseRoomCell.m */, - E84A2EA32A5288CB00D6AF8A /* XPGoldDetailsChooseRoomView.h */, - E84A2EA42A5288CB00D6AF8A /* XPGoldDetailsChooseRoomView.m */, - E84A2EA12A52883000D6AF8A /* XPIncomeRecordGoldDetailsTimeView.h */, - E84A2EA02A52883000D6AF8A /* XPIncomeRecordGoldDetailsTimeView.m */, - E84A2E9E2A5287D200D6AF8A /* XPIncomeRecordGoldDetailsView.h */, - E84A2E9D2A5287D200D6AF8A /* XPIncomeRecordGoldDetailsView.m */, - E84A2E972A52817E00D6AF8A /* XPIncomeRecordView.h */, - E84A2E982A52817E00D6AF8A /* XPIncomeRecordView.m */, - E84A2E952A5280F900D6AF8A /* XPExchangeDiamondsView.h */, - E84A2E942A5280F900D6AF8A /* XPExchangeDiamondsView.m */, - E84A2E8F2A527E6B00D6AF8A /* Protocol */, - E84A2E8E2A527E6100D6AF8A /* Presenter */, - E84A2E882A527DF800D6AF8A /* XPExchangeDiamondsVC.h */, - E84A2E822A527DF800D6AF8A /* XPExchangeDiamondsVC.m */, - E84A2E802A527DF800D6AF8A /* XPIncomeRecordGoldDetailsVC.h */, - E84A2E842A527DF800D6AF8A /* XPIncomeRecordGoldDetailsVC.m */, - E84A2E862A527DF800D6AF8A /* XPIncomeRecordVC.h */, - E84A2E812A527DF800D6AF8A /* XPIncomeRecordVC.m */, - E84A2E9A2A52823900D6AF8A /* XPTextField.h */, - E84A2E9B2A52823900D6AF8A /* XPTextField.m */, - ); - path = IncomeRecord; - sourceTree = ""; - }; - E84A2E8E2A527E6100D6AF8A /* Presenter */ = { - isa = PBXGroup; - children = ( - E84A2E922A527EC700D6AF8A /* XPIncomeRecordPresent.h */, - E84A2E912A527EC700D6AF8A /* XPIncomeRecordPresent.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E84A2E8F2A527E6B00D6AF8A /* Protocol */ = { - isa = PBXGroup; - children = ( - E84A2E902A527EBF00D6AF8A /* XPIncomeRecordProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E84B0E3C2727EDD4008818C6 /* View */ = { - isa = PBXGroup; - children = ( - 2305EF0E2AD8006900AD403C /* PIRoomMessagePhotoAlbumCell.h */, - 2305EF0F2AD8006900AD403C /* PIRoomMessagePhotoAlbumCell.m */, - 2305EF112AD8036B00AD403C /* PIRoomMessagePhotoAlbumView.h */, - 2305EF122AD8036B00AD403C /* PIRoomMessagePhotoAlbumView.m */, - 2305F3362AD9194B00AD403C /* PIRoomMessageUnlockPhotoAlbumView.h */, - 2305F3372AD9194B00AD403C /* PIRoomMessageUnlockPhotoAlbumView.m */, - 1808072B2731598F001FD836 /* XPNetImageYYLabel.h */, - 1808072C2731598F001FD836 /* XPNetImageYYLabel.m */, - E84B0E402727EE0A008818C6 /* XPRoomMessageHeaderView.h */, - E84B0E412727EE0A008818C6 /* XPRoomMessageHeaderView.m */, - E84B0E3D2727EDF6008818C6 /* XPRoomMessageTableViewCell.h */, - E84B0E3E2727EDF6008818C6 /* XPRoomMessageTableViewCell.m */, - 4C1892972CF84349004D4426 /* RoomCahtCell.h */, - 4C1892982CF84349004D4426 /* RoomCahtCell.m */, - ); - path = View; - sourceTree = ""; - }; - E84B0E432727EF2C008818C6 /* Model */ = { - isa = PBXGroup; - children = ( - 4C816A7B2E826C7300EA6A45 /* XPMessageDataSourceManager.h */, - 4C816A7C2E826C7300EA6A45 /* XPMessageDataSourceManager.m */, - 4C816A7D2E826C7300EA6A45 /* XPMessageItem.h */, - 4C816A7E2E826C7300EA6A45 /* XPMessageItem.m */, - E87A24EF272935920086A794 /* XPMessageRemoteExtModel.h */, - E87A24F0272935920086A794 /* XPMessageRemoteExtModel.m */, - E8398069290288660084BFC8 /* XPMessageInfoModel.h */, - E839806A290288660084BFC8 /* XPMessageInfoModel.m */, - 23B8D8DF2B87715100CA472F /* PIGeneralPublicScreenModel.h */, - 23B8D8E02B87715100CA472F /* PIGeneralPublicScreenModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E84B0E47272801F6008818C6 /* Tool */ = { - isa = PBXGroup; - children = ( - E84B0E4927280289008818C6 /* XPRoomMessageConstant.h */, - E84B0E442727EF9D008818C6 /* XPRoomMessageParser.h */, - E84B0E452727EF9D008818C6 /* XPRoomMessageParser.m */, - ); - path = Tool; - sourceTree = ""; - }; - E85E7A3B2A4EB0D200B6D00A /* Guild */ = { - isa = PBXGroup; - children = ( - E85E7A3C2A4EB0D200B6D00A /* Presenter */, - E85E7A582A4EB0D200B6D00A /* Protocol */, - E85E7A682A4EB0D200B6D00A /* Model */, - E85E7A852A4EB0D200B6D00A /* View */, - E85E7AFE2A4EB0D200B6D00A /* Api */, - ); - path = Guild; - sourceTree = ""; - }; - E85E7A3C2A4EB0D200B6D00A /* Presenter */ = { - isa = PBXGroup; - children = ( - E85E7B6D2A4EC4AE00B6D00A /* XPMineGuildPresenter.h */, - E85E7B6C2A4EC4AE00B6D00A /* XPMineGuildPresenter.m */, - E85E7A442A4EB0D200B6D00A /* Income */, - E85E7A4C2A4EB0D200B6D00A /* Setting */, - E85E7A3F2A4EB0D200B6D00A /* SuperAdmin */, - E85E7A572A4EB0D200B6D00A /* XPClanPresenter.h */, - E85E7A492A4EB0D200B6D00A /* XPClanPresenter.m */, - E85E7A3E2A4EB0D200B6D00A /* XPGuildPresenter.h */, - E85E7A4B2A4EB0D200B6D00A /* XPGuildPresenter.m */, - E85E7A3D2A4EB0D200B6D00A /* XPGuildSearchPresenter.h */, - E85E7A4A2A4EB0D200B6D00A /* XPGuildSearchPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E85E7A3F2A4EB0D200B6D00A /* SuperAdmin */ = { - isa = PBXGroup; - children = ( - E85E7A402A4EB0D200B6D00A /* XPSuperAdminSetPresenter.m */, - E85E7A412A4EB0D200B6D00A /* XPSuperAdminManagerRoomPresenter.m */, - E85E7A422A4EB0D200B6D00A /* XPSuperAdminSetPresenter.h */, - E85E7A432A4EB0D200B6D00A /* XPSuperAdminManagerRoomPresenter.h */, - ); - path = SuperAdmin; - sourceTree = ""; - }; - E85E7A442A4EB0D200B6D00A /* Income */ = { - isa = PBXGroup; - children = ( - E85E7A482A4EB0D200B6D00A /* XPGuildIncomeDetailPresenter.h */, - E85E7A462A4EB0D200B6D00A /* XPGuildIncomeDetailPresenter.m */, - E85E7A472A4EB0D200B6D00A /* XPGuildIncomePresenter.h */, - E85E7A452A4EB0D200B6D00A /* XPGuildIncomePresenter.m */, - ); - path = Income; - sourceTree = ""; - }; - E85E7A4C2A4EB0D200B6D00A /* Setting */ = { - isa = PBXGroup; - children = ( - E85E7A562A4EB0D200B6D00A /* XPGuildManagerPerPresenter.h */, - E85E7A502A4EB0D200B6D00A /* XPGuildManagerPerPresenter.m */, - E85E7A4F2A4EB0D200B6D00A /* XPGuildMangerListPresenter.h */, - E85E7A532A4EB0D200B6D00A /* XPGuildMangerListPresenter.m */, - E85E7A542A4EB0D200B6D00A /* XPGuildRemoveMemberPresenter.h */, - E85E7A4E2A4EB0D200B6D00A /* XPGuildRemoveMemberPresenter.m */, - E85E7A552A4EB0D200B6D00A /* XPGuildSetNamePresenter.h */, - E85E7A512A4EB0D200B6D00A /* XPGuildSetNamePresenter.m */, - E85E7A522A4EB0D200B6D00A /* XPMineManagerSetPresenter.h */, - E85E7A4D2A4EB0D200B6D00A /* XPMineManagerSetPresenter.m */, - ); - path = Setting; - sourceTree = ""; - }; - E85E7A582A4EB0D200B6D00A /* Protocol */ = { - isa = PBXGroup; - children = ( - E85E7B6F2A4EC4B700B6D00A /* XPMineGuildProtocol.h */, - E85E7A5D2A4EB0D200B6D00A /* Income */, - E85E7A622A4EB0D200B6D00A /* Setting */, - E85E7A5A2A4EB0D200B6D00A /* SuperAdmin */, - E85E7A592A4EB0D200B6D00A /* XPClanProtocol.h */, - E85E7A612A4EB0D200B6D00A /* XPGuildProtocol.h */, - E85E7A602A4EB0D200B6D00A /* XPGuildSearchProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E85E7A5A2A4EB0D200B6D00A /* SuperAdmin */ = { - isa = PBXGroup; - children = ( - E85E7A5B2A4EB0D200B6D00A /* XPSuperAdminSetProtocol.h */, - E85E7A5C2A4EB0D200B6D00A /* XPSuperAdminManagerRoomProtocol.h */, - ); - path = SuperAdmin; - sourceTree = ""; - }; - E85E7A5D2A4EB0D200B6D00A /* Income */ = { - isa = PBXGroup; - children = ( - E85E7A5E2A4EB0D200B6D00A /* XPGuildIncomeProtocol.h */, - E85E7A5F2A4EB0D200B6D00A /* XPGuildIncomeDetailProtocol.h */, - ); - path = Income; - sourceTree = ""; - }; - E85E7A622A4EB0D200B6D00A /* Setting */ = { - isa = PBXGroup; - children = ( - E85E7A632A4EB0D200B6D00A /* XPGuildSetManagerProtocol.h */, - E85E7A642A4EB0D200B6D00A /* XPGuildManagerPerProtocol.h */, - E85E7A652A4EB0D200B6D00A /* XPGuildRemoveMemberProtocol.h */, - E85E7A662A4EB0D200B6D00A /* XPGuildSetNameProtocol.h */, - E85E7A672A4EB0D200B6D00A /* XPGuildManagerListProtocol.h */, - ); - path = Setting; - sourceTree = ""; - }; - E85E7A682A4EB0D200B6D00A /* Model */ = { - isa = PBXGroup; - children = ( - 23E9E99F2A80C7DF00B792F2 /* XPMineGuildPersonalBillRecordModel.h */, - 23E9E9A02A80C7E000B792F2 /* XPMineGuildPersonalBillRecordModel.m */, - E85E7A6B2A4EB0D200B6D00A /* ClanDetailInfoModel.h */, - E85E7A822A4EB0D200B6D00A /* ClanDetailInfoModel.m */, - E85E7A6A2A4EB0D200B6D00A /* ClanInfoModel.h */, - E85E7A7F2A4EB0D200B6D00A /* ClanInfoModel.m */, - E85E7A6C2A4EB0D200B6D00A /* ClanMemberDetailInfoModel.h */, - E85E7A812A4EB0D200B6D00A /* ClanMemberDetailInfoModel.m */, - E85E7A692A4EB0D200B6D00A /* GuildAuthModel.h */, - E85E7A7E2A4EB0D200B6D00A /* GuildAuthModel.m */, - E85E7A6D2A4EB0D200B6D00A /* GuildInfoModel.h */, - E85E7A802A4EB0D200B6D00A /* GuildInfoModel.m */, - E85E7A7D2A4EB0D200B6D00A /* GuildMessageModel.h */, - E85E7A832A4EB0D200B6D00A /* GuildMessageModel.m */, - E85E7A842A4EB0D200B6D00A /* GuildSearchUserInfoModel.h */, - E85E7A7C2A4EB0D200B6D00A /* GuildSearchUserInfoModel.m */, - E85E7A752A4EB0D200B6D00A /* Income */, - E85E7A6E2A4EB0D200B6D00A /* SuperAdmin */, - E85E7B522A4EB4AD00B6D00A /* XPMineGuildListModel.h */, - E85E7B532A4EB4AD00B6D00A /* XPMineGuildListModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E85E7A6E2A4EB0D200B6D00A /* SuperAdmin */ = { - isa = PBXGroup; - children = ( - E85E7A6F2A4EB0D200B6D00A /* GuildRoomInfoModel.h */, - E85E7A722A4EB0D200B6D00A /* GuildRoomInfoModel.m */, - E85E7A742A4EB0D200B6D00A /* GuildSearchSuperAdminModel.h */, - E85E7A712A4EB0D200B6D00A /* GuildSearchSuperAdminModel.m */, - E85E7A732A4EB0D200B6D00A /* GuildSuperAdminInfoModel.h */, - E85E7A702A4EB0D200B6D00A /* GuildSuperAdminInfoModel.m */, - ); - path = SuperAdmin; - sourceTree = ""; - }; - E85E7A752A4EB0D200B6D00A /* Income */ = { - isa = PBXGroup; - children = ( - E85E7A7A2A4EB0D200B6D00A /* GuildIncomeDetailModel.h */, - E85E7A772A4EB0D200B6D00A /* GuildIncomeDetailModel.m */, - E85E7A762A4EB0D200B6D00A /* GuildIncomeRecordModel.h */, - E85E7A792A4EB0D200B6D00A /* GuildIncomeRecordModel.m */, - E85E7A7B2A4EB0D200B6D00A /* GuildPersonIncomeRecordModel.h */, - E85E7A782A4EB0D200B6D00A /* GuildPersonIncomeRecordModel.m */, - ); - path = Income; - sourceTree = ""; - }; - E85E7A852A4EB0D200B6D00A /* View */ = { - isa = PBXGroup; - children = ( - E85E7ABF2A4EB0D200B6D00A /* Cell */, - E85E7A862A4EB0D200B6D00A /* IncomeStatis */, - E85E7AEF2A4EB0D200B6D00A /* Setting */, - E85E7AA32A4EB0D200B6D00A /* SubViews */, - E85E7A9B2A4EB0D200B6D00A /* SuperAdmin */, - E85E7AEE2A4EB0D200B6D00A /* XPMineClanViewController.h */, - E85E7A9A2A4EB0D200B6D00A /* XPMineClanViewController.m */, - E85E7AA22A4EB0D200B6D00A /* XPMineExchangeAuthorityVC.h */, - E85E7AFA2A4EB0D200B6D00A /* XPMineExchangeAuthorityVC.m */, - E85E7AA12A4EB0D200B6D00A /* XPMineGuildListVC.h */, - E85E7AFD2A4EB0D200B6D00A /* XPMineGuildListVC.m */, - E85E7A992A4EB0D200B6D00A /* XPMineGuildSearchViewController.h */, - E85E7AED2A4EB0D200B6D00A /* XPMineGuildSearchViewController.m */, - E85E7AFC2A4EB0D200B6D00A /* XPMineGuildViewController.h */, - E85E7AA02A4EB0D200B6D00A /* XPMineGuildViewController.m */, - E85E7AFB2A4EB0D200B6D00A /* XPMineMainGuildListVC.h */, - E85E7ABE2A4EB0D200B6D00A /* XPMineMainGuildListVC.m */, - ); - path = View; - sourceTree = ""; - }; - E85E7A862A4EB0D200B6D00A /* IncomeStatis */ = { - isa = PBXGroup; - children = ( - E85E7A962A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.h */, - E85E7A8C2A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.m */, - E85E7A922A4EB0D200B6D00A /* XPMineGoldIncomeRecordVC.h */, - E85E7A882A4EB0D200B6D00A /* XPMineGoldIncomeRecordVC.m */, - 23E9E9952A80C3A000B792F2 /* XPMineGuildPersonalBillRecordVC.h */, - 23E9E9942A80C39F00B792F2 /* XPMineGuildPersonalBillRecordVC.m */, - 23E9E9932A80C39E00B792F2 /* XPMineGuildPersonalBillStatisVC.h */, - 23E9E9962A80C3A100B792F2 /* XPMineGuildPersonalBillStatisVC.m */, - E85E7A8E2A4EB0D200B6D00A /* XPMineGuildIncomeDetailViewController.h */, - E85E7A942A4EB0D200B6D00A /* XPMineGuildIncomeDetailViewController.m */, - E85E7A8F2A4EB0D200B6D00A /* XPMineGuildIncomeRecordViewController.h */, - E85E7A982A4EB0D200B6D00A /* XPMineGuildIncomeRecordViewController.m */, - E85E7A872A4EB0D200B6D00A /* XPMineGuildIncomeStatisViewController.h */, - E85E7A932A4EB0D200B6D00A /* XPMineGuildIncomeStatisViewController.m */, - E85E7A972A4EB0D200B6D00A /* XPMineHallAnchorIncomeStatisViewController.h */, - E85E7A8B2A4EB0D200B6D00A /* XPMineHallAnchorIncomeStatisViewController.m */, - E85E7A902A4EB0D200B6D00A /* XPMineMainIncomeStatisViewController.h */, - E85E7A8A2A4EB0D200B6D00A /* XPMineMainIncomeStatisViewController.m */, - E85E7A8D2A4EB0D200B6D00A /* XPNewMineGuildIncomeRecordViewController.h */, - E85E7A952A4EB0D200B6D00A /* XPNewMineGuildIncomeRecordViewController.m */, - 23E9E9A52A80F1C300B792F2 /* XPNewMineHallIncomeVC.h */, - 23E9E9A62A80F1C300B792F2 /* XPNewMineHallIncomeVC.m */, - ); - path = IncomeStatis; - sourceTree = ""; - }; - E85E7A9B2A4EB0D200B6D00A /* SuperAdmin */ = { - isa = PBXGroup; - children = ( - E85E7A9D2A4EB0D200B6D00A /* XPMineGuildChooseManagerViewController.h */, - E85E7A9F2A4EB0D200B6D00A /* XPMineGuildChooseManagerViewController.m */, - E85E7A9C2A4EB0D200B6D00A /* XPMineGuildSuperAdminSetViewController.h */, - E85E7A9E2A4EB0D200B6D00A /* XPMineGuildSuperAdminSetViewController.m */, - ); - path = SuperAdmin; - sourceTree = ""; - }; - E85E7AA32A4EB0D200B6D00A /* SubViews */ = { - isa = PBXGroup; - children = ( - E85E7AB32A4EB0D200B6D00A /* XPClanMenuView.h */, - E85E7AA62A4EB0D200B6D00A /* XPClanMenuView.m */, - E85E7AA82A4EB0D200B6D00A /* XPClanSectionView.h */, - E85E7AB12A4EB0D200B6D00A /* XPClanSectionView.m */, - E85E7AAA2A4EB0D200B6D00A /* XPGoldIncomeSectionView.h */, - E85E7AB82A4EB0D200B6D00A /* XPGoldIncomeSectionView.m */, - E85E7AB02A4EB0D200B6D00A /* XPGuildAnchorIncomeSectionView.h */, - E85E7ABC2A4EB0D200B6D00A /* XPGuildAnchorIncomeSectionView.m */, - 23C9DFCA2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.h */, - 23C9DFCB2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.m */, - E85E7AA52A4EB0D200B6D00A /* XPGuildHeaderView.h */, - E85E7AB22A4EB0D200B6D00A /* XPGuildHeaderView.m */, - E85E7AA92A4EB0D200B6D00A /* XPGuildIncomeHeaderView.h */, - E85E7AB92A4EB0D200B6D00A /* XPGuildIncomeHeaderView.m */, - E85E7AAF2A4EB0D200B6D00A /* XPGuildIncomeSectionView.h */, - E85E7ABD2A4EB0D200B6D00A /* XPGuildIncomeSectionView.m */, - E85E7AAB2A4EB0D200B6D00A /* XPGuildSearchNavView.h */, - E85E7AB72A4EB0D200B6D00A /* XPGuildSearchNavView.m */, - E85E7AB52A4EB0D200B6D00A /* XPGuildSuperAdminMenuView.h */, - E85E7AA42A4EB0D200B6D00A /* XPGuildSuperAdminMenuView.m */, - E85E7AB62A4EB0D200B6D00A /* XPGuildTimeMonthPickerView.h */, - E85E7AAC2A4EB0D200B6D00A /* XPGuildTimeMonthPickerView.m */, - E85E7AB42A4EB0D200B6D00A /* XPGuildTimePickView.h */, - E85E7AA72A4EB0D200B6D00A /* XPGuildTimePickView.m */, - E85E7AAD2A4EB0D200B6D00A /* XPNewGuildIncomeHeaderView.h */, - E85E7ABB2A4EB0D200B6D00A /* XPNewGuildIncomeHeaderView.m */, - E85E7ABA2A4EB0D200B6D00A /* XPNewGuildTimePickView.h */, - E85E7AAE2A4EB0D200B6D00A /* XPNewGuildTimePickView.m */, - E85E7B702A4EC93C00B6D00A /* XPMineGiveDiamondSearchView.h */, - E85E7B712A4EC93C00B6D00A /* XPMineGiveDiamondSearchView.m */, - 23C7C0B52A7CD7B000802205 /* XPNewMineGuildItemView.h */, - 23C7C0B62A7CD7B000802205 /* XPNewMineGuildItemView.m */, - 23E9E99A2A80C40000B792F2 /* XPMineGuildPersonalBillRecordHeadView.h */, - 23E9E9992A80C3FF00B792F2 /* XPMineGuildPersonalBillRecordHeadView.m */, - 23E9E9A22A80DEAF00B792F2 /* XPMineGuildPersonalBillRecordContentView.h */, - 23E9E9A32A80DEAF00B792F2 /* XPMineGuildPersonalBillRecordContentView.m */, - 23E9E99D2A80C7AF00B792F2 /* XPMineGuildPersonalBillRecordItemView.h */, - 23E9E99C2A80C7AE00B792F2 /* XPMineGuildPersonalBillRecordItemView.m */, - ); - path = SubViews; - sourceTree = ""; - }; - E85E7ABF2A4EB0D200B6D00A /* Cell */ = { - isa = PBXGroup; - children = ( - E85E7ADE2A4EB0D200B6D00A /* ExchangeAuthority */, - E85E7AC22A4EB0D200B6D00A /* GuildList */, - E85E7AD12A4EB0D200B6D00A /* Income */, - E85E7AE82A4EB0D200B6D00A /* Setting */, - E85E7AC82A4EB0D200B6D00A /* SuperAdmin */, - E85E7ADB2A4EB0D200B6D00A /* XPClanMemberTableViewCell.h */, - E85E7AC02A4EB0D200B6D00A /* XPClanMemberTableViewCell.m */, - E85E7ADA2A4EB0D200B6D00A /* XPClanRoomCollectionViewCell.h */, - E85E7AC12A4EB0D200B6D00A /* XPClanRoomCollectionViewCell.m */, - E85E7AC72A4EB0D200B6D00A /* XPGuildEmptyCollectionViewCell.h */, - E85E7AE72A4EB0D200B6D00A /* XPGuildEmptyCollectionViewCell.m */, - E85E7AC62A4EB0D200B6D00A /* XPMineGuildEmptyTableViewCell.h */, - E85E7ADC2A4EB0D200B6D00A /* XPMineGuildEmptyTableViewCell.m */, - E85E7ADD2A4EB0D200B6D00A /* XPMineGuildSearchMemberTableViewCell.h */, - E85E7AC52A4EB0D200B6D00A /* XPMineGuildSearchMemberTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E85E7AC22A4EB0D200B6D00A /* GuildList */ = { - isa = PBXGroup; - children = ( - E85E7AC42A4EB0D200B6D00A /* XPMineGuildListCell.h */, - E85E7AC32A4EB0D200B6D00A /* XPMineGuildListCell.m */, - ); - path = GuildList; - sourceTree = ""; - }; - E85E7AC82A4EB0D200B6D00A /* SuperAdmin */ = { - isa = PBXGroup; - children = ( - E85E7AC92A4EB0D200B6D00A /* XPGuildSuperAdminRoomCollectionViewCell.h */, - E85E7ACA2A4EB0D200B6D00A /* XPGuildChooseManagerRoomTableViewCell.m */, - E85E7ACB2A4EB0D200B6D00A /* XPGuildSuperAdminSetTableViewCell.m */, - E85E7ACC2A4EB0D200B6D00A /* XPGuildSearchSuperAdminTableViewCell.m */, - E85E7ACD2A4EB0D200B6D00A /* XPGuildSuperAdminRoomCollectionViewCell.m */, - E85E7ACE2A4EB0D200B6D00A /* XPGuildChooseManagerRoomTableViewCell.h */, - E85E7ACF2A4EB0D200B6D00A /* XPGuildSearchSuperAdminTableViewCell.h */, - E85E7AD02A4EB0D200B6D00A /* XPGuildSuperAdminSetTableViewCell.h */, - ); - path = SuperAdmin; - sourceTree = ""; - }; - E85E7AD12A4EB0D200B6D00A /* Income */ = { - isa = PBXGroup; - children = ( - E85E7AD62A4EB0D200B6D00A /* XPGuildIncomeDetailCollectionViewCell.h */, - E85E7AD22A4EB0D200B6D00A /* XPGuildIncomeDetailCollectionViewCell.m */, - E85E7AD82A4EB0D200B6D00A /* XPGuildIncomeRecordTableViewCell.h */, - E85E7AD32A4EB0D200B6D00A /* XPGuildIncomeRecordTableViewCell.m */, - 23E9E9A82A80FDF100B792F2 /* XPNewMineHallIncomeCell.h */, - 23E9E9A92A80FDF100B792F2 /* XPNewMineHallIncomeCell.m */, - E85E7AD42A4EB0D200B6D00A /* XPGuildPersonIncomeTableViewCell.h */, - E85E7AD72A4EB0D200B6D00A /* XPGuildPersonIncomeTableViewCell.m */, - E85E7AD92A4EB0D200B6D00A /* XPGuildSingleRoomIncomeTableViewCell.h */, - E85E7AD52A4EB0D200B6D00A /* XPGuildSingleRoomIncomeTableViewCell.m */, - 23C9DFCD2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.h */, - 23C9DFCE2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.m */, - ); - path = Income; - sourceTree = ""; - }; - E85E7ADE2A4EB0D200B6D00A /* ExchangeAuthority */ = { - isa = PBXGroup; - children = ( - E85E7ADF2A4EB0D200B6D00A /* XPMineExchangeAuthorityCell.h */, - E85E7AE32A4EB0D200B6D00A /* XPMineExchangeAuthorityCell.m */, - E85E7AE12A4EB0D200B6D00A /* XPMineExchangeAuthorityFooderView.h */, - E85E7AE62A4EB0D200B6D00A /* XPMineExchangeAuthorityFooderView.m */, - E85E7AE52A4EB0D200B6D00A /* XPMineExchangeAuthorityHeadView.h */, - E85E7AE22A4EB0D200B6D00A /* XPMineExchangeAuthorityHeadView.m */, - E85E7AE42A4EB0D200B6D00A /* XPMinePromptWindow.h */, - E85E7AE02A4EB0D200B6D00A /* XPMinePromptWindow.m */, - ); - path = ExchangeAuthority; - sourceTree = ""; - }; - E85E7AE82A4EB0D200B6D00A /* Setting */ = { - isa = PBXGroup; - children = ( - E85E7AEB2A4EB0D200B6D00A /* XPMineGuildManagerPerTableViewCell.h */, - E85E7AE92A4EB0D200B6D00A /* XPMineGuildManagerPerTableViewCell.m */, - 2305F3452AD94E9C00AD403C /* XPMaskManagerCell.h */, - 2305F3462AD94E9C00AD403C /* XPMaskManagerCell.m */, - ); - path = Setting; - sourceTree = ""; - }; - E85E7AEF2A4EB0D200B6D00A /* Setting */ = { - isa = PBXGroup; - children = ( - E85E7AF92A4EB0D200B6D00A /* XPMineGuildManagerPerViewController.h */, - E85E7AF42A4EB0D200B6D00A /* XPMineGuildManagerPerViewController.m */, - E85E7AF52A4EB0D200B6D00A /* XPMineGuildManagerSetViewController.h */, - E85E7AF32A4EB0D200B6D00A /* XPMineGuildManagerSetViewController.m */, - E85E7AF22A4EB0D200B6D00A /* XPMineGuildRemoveMemberViewController.h */, - E85E7AF62A4EB0D200B6D00A /* XPMineGuildRemoveMemberViewController.m */, - E85E7AF02A4EB0D200B6D00A /* XPMineGuildSetNameViewController.h */, - E85E7AF82A4EB0D200B6D00A /* XPMineGuildSetNameViewController.m */, - E85E7AF72A4EB0D200B6D00A /* XPMineMangerListViewController.h */, - E85E7AF12A4EB0D200B6D00A /* XPMineMangerListViewController.m */, - ); - path = Setting; - sourceTree = ""; - }; - E85E7AFE2A4EB0D200B6D00A /* Api */ = { - isa = PBXGroup; - children = ( - E85E7AFF2A4EB0D200B6D00A /* Api+Guild.m */, - E85E7B002A4EB0D200B6D00A /* Api+Guild.h */, - ); - path = Api; - sourceTree = ""; - }; E85E7B582A4EC35A00B6D00A /* RecordIncome */ = { isa = PBXGroup; children = ( @@ -9473,903 +1987,6 @@ path = ExchangeAuthority; sourceTree = ""; }; - E85E7B732A4EC99200B6D00A /* GiveDiamond */ = { - isa = PBXGroup; - children = ( - E85E7B742A4EC99200B6D00A /* Presenter */, - E85E7B772A4EC99200B6D00A /* Protocol */, - E85E7B792A4EC99200B6D00A /* Model */, - E85E7B802A4EC99200B6D00A /* View */, - E85E7B9C2A4EC99200B6D00A /* Api */, - ); - path = GiveDiamond; - sourceTree = ""; - }; - E85E7B742A4EC99200B6D00A /* Presenter */ = { - isa = PBXGroup; - children = ( - E85E7B752A4EC99200B6D00A /* XPMineGiveDiamondPresenter.m */, - E85E7B762A4EC99200B6D00A /* XPMineGiveDiamondPresenter.h */, - ); - path = Presenter; - sourceTree = ""; - }; - E85E7B772A4EC99200B6D00A /* Protocol */ = { - isa = PBXGroup; - children = ( - E85E7B782A4EC99200B6D00A /* XPMineGiveDiamondProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E85E7B792A4EC99200B6D00A /* Model */ = { - isa = PBXGroup; - children = ( - E85E7B7D2A4EC99200B6D00A /* XPMineGiveDiamondDetailsModel.h */, - E85E7B7A2A4EC99200B6D00A /* XPMineGiveDiamondDetailsModel.m */, - E85E7B7E2A4EC99200B6D00A /* XPMineGiveDiamondModel.h */, - E85E7B7B2A4EC99200B6D00A /* XPMineGiveDiamondModel.m */, - E85E7B7C2A4EC99200B6D00A /* XPMineGiveDiamondSearchModel.h */, - E85E7B7F2A4EC99200B6D00A /* XPMineGiveDiamondSearchModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E85E7B802A4EC99200B6D00A /* View */ = { - isa = PBXGroup; - children = ( - E85E7BB72A4ED89E00B6D00A /* XPIncomeRecordGoldDetailsHeadView.h */, - E85E7BB82A4ED89F00B6D00A /* XPIncomeRecordGoldDetailsHeadView.m */, - E85E7B852A4EC99200B6D00A /* Cell */, - E85E7B822A4EC99200B6D00A /* XPMineChooseGiveDiamondVC.h */, - E85E7B9B2A4EC99200B6D00A /* XPMineChooseGiveDiamondVC.m */, - E85E7B842A4EC99200B6D00A /* XPMineGiveDiamondDetailsVC.h */, - E85E7B832A4EC99200B6D00A /* XPMineGiveDiamondDetailsVC.m */, - E85E7B812A4EC99200B6D00A /* XPMineGiveDiamondVC.h */, - E85E7B9A2A4EC99200B6D00A /* XPMineGiveDiamondVC.m */, - 4C1392912D6D963600A6DFB5 /* SubRechargersViewController.h */, - 4C1392922D6D963600A6DFB5 /* SubRechargersViewController.m */, - 4C1392942D6DA22B00A6DFB5 /* RechargerTransferHistoryViewController.h */, - 4C1392952D6DA22B00A6DFB5 /* RechargerTransferHistoryViewController.m */, - ); - path = View; - sourceTree = ""; - }; - E85E7B852A4EC99200B6D00A /* Cell */ = { - isa = PBXGroup; - children = ( - E85E7B902A4EC99200B6D00A /* XPMineChooseGiveDiamondView.h */, - E85E7B872A4EC99200B6D00A /* XPMineChooseGiveDiamondView.m */, - E85E7B8D2A4EC99200B6D00A /* XPMineChooseGiveGiftView.h */, - E85E7B972A4EC99200B6D00A /* XPMineChooseGiveGiftView.m */, - E85E7B8B2A4EC99200B6D00A /* XPMineChooseGiveGiftViewCell.h */, - E85E7B922A4EC99200B6D00A /* XPMineChooseGiveGiftViewCell.m */, - E85E7B882A4EC99200B6D00A /* XPMineConfirmGiveDiamondView.h */, - E85E7B952A4EC99200B6D00A /* XPMineConfirmGiveDiamondView.m */, - E85E7B912A4EC99200B6D00A /* XPMineGiveDiamondCell.h */, - E85E7B862A4EC99200B6D00A /* XPMineGiveDiamondCell.m */, - E85E7B8F2A4EC99200B6D00A /* XPMineGiveDiamondDetailsCell.h */, - E85E7B992A4EC99200B6D00A /* XPMineGiveDiamondDetailsCell.m */, - E85E7B8C2A4EC99200B6D00A /* XPMineGiveDiamondDetailsView.h */, - E85E7B982A4EC99200B6D00A /* XPMineGiveDiamondDetailsView.m */, - E85E7B932A4EC99200B6D00A /* XPMineGiveDiamondPasswordView.h */, - E85E7B8A2A4EC99200B6D00A /* XPMineGiveDiamondPasswordView.m */, - E85E7B8E2A4EC99200B6D00A /* XPMineGiveDiamondPwdView.h */, - E85E7B962A4EC99200B6D00A /* XPMineGiveDiamondPwdView.m */, - E85E7B942A4EC99200B6D00A /* XPMineGiveDiamondSearchView.h */, - E85E7B892A4EC99200B6D00A /* XPMineGiveDiamondSearchView.m */, - E85E7BB12A4ED45300B6D00A /* XPPageControl.h */, - E85E7BB22A4ED45300B6D00A /* XPPageControl.m */, - E85E7BB42A4ED59900B6D00A /* XPIncomeRecordGoldDetailsCell.h */, - E85E7BB52A4ED59900B6D00A /* XPIncomeRecordGoldDetailsCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E85E7B9C2A4EC99200B6D00A /* Api */ = { - isa = PBXGroup; - children = ( - E85E7B9D2A4EC99200B6D00A /* Api+GiveDiamond.h */, - E85E7B9E2A4EC99200B6D00A /* Api+GiveDiamond.m */, - ); - path = Api; - sourceTree = ""; - }; - E865964E2701A1A900846EBD /* StatisticsService */ = { - isa = PBXGroup; - children = ( - E865964F2701A1C000846EBD /* StatisticsService.h */, - E86596502701A1C000846EBD /* StatisticsService.m */, - E86596522701A55500846EBD /* StatisticsServiceHelper.h */, - E86596532701A55500846EBD /* StatisticsServiceHelper.m */, - ); - path = StatisticsService; - sourceTree = ""; - }; - E8680707271959090024F48F /* MicroView */ = { - isa = PBXGroup; - children = ( - 9B0086C727BA4F4A0032BD2B /* Anchor */, - E8DBB6FA27B63CC300AA285D /* LittleGame */, - E8899C7C27853B46007944BE /* Dating */, - 180806DA27297269001FD836 /* MicroViewProtocol.h */, - E8680716271967B00024F48F /* MicroView.h */, - E8680717271967B00024F48F /* MicroView.m */, - 9B86D884281942D200494FCD /* SocialMicroView.h */, - 9B86D885281942D200494FCD /* SocialMicroView.m */, - E81D58802720082A003063FE /* MicroWaveView.h */, - E81D58812720082A003063FE /* MicroWaveView.m */, - 9BCD02C52796C02800F396AA /* MicroNobleWaveView.h */, - 9BCD02C62796C02800F396AA /* MicroNobleWaveView.m */, - E8DACCF92766EDC60052092C /* MicroGiftValueView.h */, - E8DACCFA2766EDC60052092C /* MicroGiftValueView.m */, - 545831A42C2C085C00364026 /* ArabMicroView.h */, - 545831A52C2C085C00364026 /* ArabMicroView.m */, - ); - path = MicroView; - sourceTree = ""; - }; - E86B911B281034F10007DEE7 /* Cell */ = { - isa = PBXGroup; - children = ( - 9B7D804B27537950003DAC0C /* MessageCell.h */, - 9B7D804C27537950003DAC0C /* MessageCell.m */, - E875A1B629755EE200AB1BBD /* SessionUserInfoTableViewCell.h */, - E875A1B729755EE200AB1BBD /* SessionUserInfoTableViewCell.m */, - E885D531297798E1004DC088 /* SessionSettingTableViewCell.h */, - E885D532297798E1004DC088 /* SessionSettingTableViewCell.m */, - 4CD6FF672D673F7F00262AB7 /* AgentMessageTableViewCell.h */, - 4CD6FF682D673F7F00262AB7 /* AgentMessageTableViewCell.m */, - 4CAFF00B2DD343B200CD81DF /* PublicEventTableViewCell.h */, - 4CAFF00C2DD343B200CD81DF /* PublicEventTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E872308A26E89D5100B90D4F /* CustomView */ = { - isa = PBXGroup; - children = ( - 23B2AEBF2A64E9C200543D17 /* LoginForgetEditView.h */, - 23B2AEC02A64E9C200543D17 /* LoginForgetEditView.m */, - E872309126E8D31500B90D4F /* LoginVerifCodeView.h */, - E872309226E8D31500B90D4F /* LoginVerifCodeView.m */, - E824543B26F58C3A00BE8163 /* XPLoginBindSuccessView.h */, - E824543C26F58C3A00BE8163 /* XPLoginBindSuccessView.m */, - E82EE0F6272FDDFA00D15DC1 /* UserPrivacyView.h */, - E82EE0F7272FDDFA00D15DC1 /* UserPrivacyView.m */, - 4C38C2AB2D84064300CFA4A8 /* LoginInputItemView.h */, - 4C38C2AC2D84064300CFA4A8 /* LoginInputItemView.m */, - ); - path = CustomView; - sourceTree = ""; - }; - E874B88527215CFF003954B9 /* Model */ = { - isa = PBXGroup; - children = ( - E874B88627215D39003954B9 /* MicroStateModel.h */, - E874B88727215D39003954B9 /* MicroStateModel.m */, - E874B88927215EAF003954B9 /* MicroQueueModel.h */, - E874B88A27215EAF003954B9 /* MicroQueueModel.m */, - E87E91502796A15500A7B3F2 /* MicroExtModel.h */, - E87E91512796A15500A7B3F2 /* MicroExtModel.m */, - 9B044D9E282D32F700DE4859 /* MicroInviteExtModel.h */, - 9B044D9F282D32F700DE4859 /* MicroInviteExtModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E8751E5128A629EB0056EF44 /* Sailing */ = { - isa = PBXGroup; - children = ( - E8751E5628A62A250056EF44 /* Model */, - E8751E5528A62A1D0056EF44 /* Api */, - E8751E5428A62A150056EF44 /* View */, - E8751E5328A62A0E0056EF44 /* Presenter */, - ); - path = Sailing; - sourceTree = ""; - }; - E8751E5228A62A010056EF44 /* Protocol */ = { - isa = PBXGroup; - children = ( - E8751E6028A62AA60056EF44 /* XPSailingProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E8751E5328A62A0E0056EF44 /* Presenter */ = { - isa = PBXGroup; - children = ( - E8751E5D28A62A970056EF44 /* XPSailingPresenter.h */, - E8751E5E28A62A970056EF44 /* XPSailingPresenter.m */, - E8751E5228A62A010056EF44 /* Protocol */, - ); - path = Presenter; - sourceTree = ""; - }; - E8751E5428A62A150056EF44 /* View */ = { - isa = PBXGroup; - children = ( - E8751E6828A64C550056EF44 /* Cell */, - E8751E6728A64C480056EF44 /* SubViews */, - E8751E5A28A62A530056EF44 /* XPSailingViewController.h */, - E8751E5B28A62A530056EF44 /* XPSailingViewController.m */, - E8751E6128A646400056EF44 /* XPSailingRankView.h */, - E8751E6228A646400056EF44 /* XPSailingRankView.m */, - E8751E6428A6465A0056EF44 /* XPSailingRankSubView.h */, - E8751E6528A6465A0056EF44 /* XPSailingRankSubView.m */, - E8AB633128AE51470023B0D2 /* XPSailingPrizeView.h */, - E8AB633228AE51470023B0D2 /* XPSailingPrizeView.m */, - E897ABFA28AF2E71003B3587 /* XPSailingGiftView.h */, - E897ABFB28AF2E71003B3587 /* XPSailingGiftView.m */, - E8E21A9C28B4DFE8008F7C9D /* XPSailingBuyFuelView.h */, - E8E21A9D28B4DFE8008F7C9D /* XPSailingBuyFuelView.m */, - E897ABFD28AF39B4003B3587 /* XPSailingAnimationView.h */, - E897ABFE28AF39B4003B3587 /* XPSailingAnimationView.m */, - ); - path = View; - sourceTree = ""; - }; - E8751E5528A62A1D0056EF44 /* Api */ = { - isa = PBXGroup; - children = ( - E8751E5728A62A390056EF44 /* Api+Sailing.h */, - E8751E5828A62A390056EF44 /* Api+Sailing.m */, - ); - path = Api; - sourceTree = ""; - }; - E8751E5628A62A250056EF44 /* Model */ = { - isa = PBXGroup; - children = ( - E8751E6F28A6541B0056EF44 /* RoomSailingRankModel.h */, - E8751E7028A6541B0056EF44 /* RoomSailingRankModel.m */, - E8751E7228A665BC0056EF44 /* RoomSailingInfoModel.h */, - E8751E7328A665BC0056EF44 /* RoomSailingInfoModel.m */, - E8BD0F8928A9EB0A00DE050D /* RoomSailingPrizeListModel.h */, - E8BD0F8A28A9EB0A00DE050D /* RoomSailingPrizeListModel.m */, - E8BD0F8628A9E9E400DE050D /* RoomSailingPrizeModel.h */, - E8BD0F8728A9E9E400DE050D /* RoomSailingPrizeModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E8751E6728A64C480056EF44 /* SubViews */ = { - isa = PBXGroup; - children = ( - ); - path = SubViews; - sourceTree = ""; - }; - E8751E6828A64C550056EF44 /* Cell */ = { - isa = PBXGroup; - children = ( - E8751E6928A64C6E0056EF44 /* XPSailingRankTableViewCell.h */, - E8751E6A28A64C6E0056EF44 /* XPSailingRankTableViewCell.m */, - E8751E6C28A64F990056EF44 /* XPSailingEmptyTableViewCell.h */, - E8751E6D28A64F990056EF44 /* XPSailingEmptyTableViewCell.m */, - E8AB633428AE54A40023B0D2 /* XPSailingPrizeCollectionViewCell.h */, - E8AB633528AE54A40023B0D2 /* XPSailingPrizeCollectionViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E8778AE82988EE9200CF139B /* SayHello */ = { - isa = PBXGroup; - children = ( - E8778AED2988EEED00CF139B /* Model */, - E8778AEC2988EEE600CF139B /* Api */, - E8778AEB2988EEDB00CF139B /* View */, - E8778AEA2988EED400CF139B /* Presenter */, - E8778AE92988EEBF00CF139B /* Protocol */, - ); - path = SayHello; - sourceTree = ""; - }; - E8778AE92988EEBF00CF139B /* Protocol */ = { - isa = PBXGroup; - children = ( - E8F63CB8298B5F3D00B338BA /* XPSessionSayHelloProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E8778AEA2988EED400CF139B /* Presenter */ = { - isa = PBXGroup; - children = ( - E8F63CB5298B566D00B338BA /* XPSessionSayHelloPresenter.h */, - E8F63CB6298B566D00B338BA /* XPSessionSayHelloPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E8778AEB2988EEDB00CF139B /* View */ = { - isa = PBXGroup; - children = ( - E8778AF22988EF1300CF139B /* CustomView */, - E8778AF12988EF0A00CF139B /* Cell */, - E8778AEE2988EF0600CF139B /* XPSessionSayHelloViewController.h */, - E8778AEF2988EF0600CF139B /* XPSessionSayHelloViewController.m */, - ); - path = View; - sourceTree = ""; - }; - E8778AEC2988EEE600CF139B /* Api */ = { - isa = PBXGroup; - children = ( - E8F63CB2298B563D00B338BA /* Api+SayHello.h */, - E8F63CB3298B563D00B338BA /* Api+SayHello.m */, - ); - path = Api; - sourceTree = ""; - }; - E8778AED2988EEED00CF139B /* Model */ = { - isa = PBXGroup; - children = ( - E8F63CAF298B553500B338BA /* SessionSayHelloLevelModel.h */, - E8F63CB0298B553500B338BA /* SessionSayHelloLevelModel.m */, - E8F63CB9298B648300B338BA /* SessionSayHelloListModel.h */, - E8F63CBA298B648300B338BA /* SessionSayHelloListModel.m */, - E8AFF7E1298CA1E500FBDE32 /* SessionSayHelloCountModel.h */, - E8AFF7E2298CA1E500FBDE32 /* SessionSayHelloCountModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E8778AF12988EF0A00CF139B /* Cell */ = { - isa = PBXGroup; - children = ( - E8778AF32988EF2B00CF139B /* XPSessionSayHelloTableViewCell.h */, - E8778AF42988EF2B00CF139B /* XPSessionSayHelloTableViewCell.m */, - E8778AF92989034200CF139B /* XPSessionSayHelloEmptyTableViewCell.h */, - E8778AFA2989034200CF139B /* XPSessionSayHelloEmptyTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E8778AF22988EF1300CF139B /* CustomView */ = { - isa = PBXGroup; - children = ( - E8778AF62988F4E200CF139B /* XPSessionSayHelloHeaderView.h */, - E8778AF72988F4E200CF139B /* XPSessionSayHelloHeaderView.m */, - ); - path = CustomView; - sourceTree = ""; - }; - E8788931273A53B000BF1D57 /* SendGiftView */ = { - isa = PBXGroup; - children = ( - 4C729E462E5318AA00E5171E /* GiftComboConfig.h */, - 4C729E472E5318AA00E5171E /* GiftComboConfig.m */, - 4C729E482E5318AA00E5171E /* GiftComboTransport.h */, - 4C729E492E5318AA00E5171E /* GiftComboTransport.m */, - 4C729E4A2E5318AA00E5171E /* GiftComboUIAdapter.h */, - 4C729E4B2E5318AA00E5171E /* GiftComboUIAdapter.m */, - E8788935273A540400BF1D57 /* Model */, - E8788936273A541500BF1D57 /* Api */, - E8788937273A542700BF1D57 /* View */, - E8788938273A542E00BF1D57 /* Presenter */, - E8788939273A544000BF1D57 /* Protocol */, - E878894E273A699900BF1D57 /* ThemeColor+SendGift.h */, - E878894F273A699900BF1D57 /* ThemeColor+SendGift.m */, - 540EC1D12C89998500F3BF0D /* GiftComboManager.h */, - 540EC1D22C89998500F3BF0D /* GiftComboManager.m */, - ); - path = SendGiftView; - sourceTree = ""; - }; - E8788935273A540400BF1D57 /* Model */ = { - isa = PBXGroup; - children = ( - 23FF25782ABD67CD0064E904 /* XPFreeGiftModel.h */, - 23FF25772ABD67CD0064E904 /* XPFreeGiftModel.m */, - E890BC02273CF0500007C46B /* XPGiftCountModel.h */, - E890BC03273CF0500007C46B /* XPGiftCountModel.m */, - E890BC0E273D23F00007C46B /* GiftInfoModel.h */, - E890BC0F273D23F00007C46B /* GiftInfoModel.m */, - E884C36A2743951B00E1EBED /* GiftReceiveInfoModel.h */, - E884C36B2743951B00E1EBED /* GiftReceiveInfoModel.m */, - E8E7DAE92745158500C631CC /* XPGiftUserInfoModel.h */, - E8E7DAEA2745158500C631CC /* XPGiftUserInfoModel.m */, - E8DACCFC27673F870052092C /* GiftValueInfoModel.h */, - E8DACCFD27673F870052092C /* GiftValueInfoModel.m */, - 9B208A342779B50100F9E54A /* GiftNobleInfoModel.h */, - 9B208A352779B50100F9E54A /* GiftNobleInfoModel.m */, - 9B41D36C282649230048C588 /* XPWeekStarRankUserModel.h */, - 9B41D36D282649230048C588 /* XPWeekStarRankUserModel.m */, - E8A3538328FD67320014A784 /* GiftLuckyBroadcastModel.h */, - E8A3538428FD67320014A784 /* GiftLuckyBroadcastModel.m */, - E8D4DE452940473500EC788D /* GiftTwelveStarFirstModel.h */, - E8D4DE462940473500EC788D /* GiftTwelveStarFirstModel.m */, - 548E01CA2C3FB1C70071C83D /* i18nGiftNameMap.h */, - 548E01CB2C3FB1C70071C83D /* i18nGiftNameMap.m */, - ); - path = Model; - sourceTree = ""; - }; - E8788936273A541500BF1D57 /* Api */ = { - isa = PBXGroup; - children = ( - E878893A273A54C300BF1D57 /* Api+Gift.h */, - E878893B273A54C300BF1D57 /* Api+Gift.m */, - ); - path = Api; - sourceTree = ""; - }; - E8788937273A542700BF1D57 /* View */ = { - isa = PBXGroup; - children = ( - E8788949273A594C00BF1D57 /* Cell */, - E8788932273A53D700BF1D57 /* XPSendGiftView.h */, - E8788933273A53D700BF1D57 /* XPSendGiftView.m */, - 9B4E91FE28E57A620033419E /* XPGiftHeadTypeView.h */, - 9B4E91FF28E57A620033419E /* XPGiftHeadTypeView.m */, - E8788940273A55AD00BF1D57 /* XPGiftUsersView.h */, - E8788941273A55AD00BF1D57 /* XPGiftUsersView.m */, - 23CEFC662AFCCE7700576D89 /* PIGiftInfoSegmentedView.h */, - 23CEFC672AFCCE7700576D89 /* PIGiftInfoSegmentedView.m */, - E8788943273A55C200BF1D57 /* XPGiftInfoView.h */, - E8788944273A55C200BF1D57 /* XPGiftInfoView.m */, - E8788946273A55D000BF1D57 /* XPGiftBarView.h */, - E8788947273A55D000BF1D57 /* XPGiftBarView.m */, - E890BC0B273D09A50007C46B /* XPGiftCountView.h */, - E890BC0C273D09A50007C46B /* XPGiftCountView.m */, - E8901CF428B38D89001E9A92 /* XPGraffitiGiftView.h */, - E8901CF528B38D89001E9A92 /* XPGraffitiGiftView.m */, - 9B4D449128F15765002572D5 /* XPGiftLuckyGiftBroadcastView.h */, - 9B4D449228F15765002572D5 /* XPGiftLuckyGiftBroadcastView.m */, - 23630BA42BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.h */, - 23630BA52BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.m */, - E8D4DE422940462C00EC788D /* XPGiftTwelveStarBroadcastView.h */, - E8D4DE432940462C00EC788D /* XPGiftTwelveStarBroadcastView.m */, - 540EC1CE2C89925F00F3BF0D /* GiftComboView.h */, - 540EC1CF2C89925F00F3BF0D /* GiftComboView.m */, - 54F179082C8EDDF400CB5219 /* CountdownRingView.h */, - 54F179092C8EDDF400CB5219 /* CountdownRingView.m */, - 5468995B2C8AFE4C0049136A /* GiftComboFlagView.h */, - 5468995C2C8AFE4C0049136A /* GiftComboFlagView.m */, - 4CFBE0CB2DAD0FC400A923AF /* PIGiftBravoGiftBroadcastView.h */, - 4CFBE0CC2DAD0FC400A923AF /* PIGiftBravoGiftBroadcastView.m */, - ); - path = View; - sourceTree = ""; - }; - E8788938273A542E00BF1D57 /* Presenter */ = { - isa = PBXGroup; - children = ( - E878893D273A54F500BF1D57 /* XPGiftPresenter.h */, - E878893E273A54F500BF1D57 /* XPGiftPresenter.m */, - E8E7DAE62744F5EF00C631CC /* XPGiftStorage.h */, - E8E7DAE72744F5EF00C631CC /* XPGiftStorage.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E8788939273A544000BF1D57 /* Protocol */ = { - isa = PBXGroup; - children = ( - E878894D273A672200BF1D57 /* XPGiftProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E8788949273A594C00BF1D57 /* Cell */ = { - isa = PBXGroup; - children = ( - 23FF257A2ABD68020064E904 /* XPGiftFreeItemCell.h */, - 23FF257B2ABD68020064E904 /* XPGiftFreeItemCell.m */, - E878894A273A607C00BF1D57 /* XPGiftUserCollectionViewCell.h */, - E878894B273A607C00BF1D57 /* XPGiftUserCollectionViewCell.m */, - E890BC05273CF1800007C46B /* XPGiftCountCollectionViewCell.h */, - E890BC06273CF1800007C46B /* XPGiftCountCollectionViewCell.m */, - E8133914273E532D00708B66 /* XPGiftItemCollectionViewCell.h */, - E8133915273E532D00708B66 /* XPGiftItemCollectionViewCell.m */, - E8A73F8528586A6F00FD9CBC /* XPGiftWeekStarCollectionViewCell.h */, - E8A73F8628586A6F00FD9CBC /* XPGiftWeekStarCollectionViewCell.m */, - E811FFF52742367B00918544 /* XPGiftEmptyCollectionViewCell.h */, - E811FFF62742367B00918544 /* XPGiftEmptyCollectionViewCell.m */, - E8659907273E800D00EE349D /* XPGiftCollectionViewFlowLayout.h */, - E8659908273E800D00EE349D /* XPGiftCollectionViewFlowLayout.m */, - ); - path = Cell; - sourceTree = ""; - }; - E87AE8C2284E1A6B00CAFBB3 /* NewUserGreet */ = { - isa = PBXGroup; - children = ( - E87AE8C3284E1A8400CAFBB3 /* XPRoomNewUserGreetView.h */, - E87AE8C4284E1A8400CAFBB3 /* XPRoomNewUserGreetView.m */, - ); - path = NewUserGreet; - sourceTree = ""; - }; - E87DF4B82A42C7BB009C1185 /* Search */ = { - isa = PBXGroup; - children = ( - E87DF4BC2A42C82F009C1185 /* Protocol */, - E87DF4BB2A42C81A009C1185 /* Presenter */, - E87DF4BA2A42C7F9009C1185 /* Model */, - E87DF4B92A42C7E9009C1185 /* View */, - ); - path = Search; - sourceTree = ""; - }; - E87DF4B92A42C7E9009C1185 /* View */ = { - isa = PBXGroup; - children = ( - E87DF4E92A42CB51009C1185 /* Cell */, - E87DF4E12A42CAC1009C1185 /* SubView */, - E8C6FFDE2754EEF9004DC9F0 /* XPHomeSearchViewController.h */, - E8C6FFDF2754EEF9004DC9F0 /* XPHomeSearchViewController.m */, - E87A27012758BC81002DDC7A /* XPRoomSearchContainerViewController.h */, - E87A27022758BC81002DDC7A /* XPRoomSearchContainerViewController.m */, - 9B88E20D28C6305400D26FBA /* XPRoomSearchRecordViewController.h */, - 9B88E20E28C6305400D26FBA /* XPRoomSearchRecordViewController.m */, - ); - path = View; - sourceTree = ""; - }; - E87DF4BA2A42C7F9009C1185 /* Model */ = { - isa = PBXGroup; - children = ( - E87DF50C2A42CF15009C1185 /* HomeLiveRoomModel.h */, - E87DF50D2A42CF15009C1185 /* HomeLiveRoomModel.m */, - E87DF5092A42CEC9009C1185 /* HomeEveryOneSearchModel.h */, - E87DF50A2A42CEC9009C1185 /* HomeEveryOneSearchModel.m */, - E87DF4DC2A42CA12009C1185 /* HomeSearchResultModel.h */, - E87DF4DB2A42CA12009C1185 /* HomeSearchResultModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E87DF4BB2A42C81A009C1185 /* Presenter */ = { - isa = PBXGroup; - children = ( - E87DF5062A42CE79009C1185 /* XPInRoomRecordPresenter.h */, - E87DF5072A42CE79009C1185 /* XPInRoomRecordPresenter.m */, - E8C6FFE42754FE53004DC9F0 /* XPHomeSearchPresenter.h */, - E8C6FFE52754FE53004DC9F0 /* XPHomeSearchPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E87DF4BC2A42C82F009C1185 /* Protocol */ = { - isa = PBXGroup; - children = ( - E8C6FFE72754FE66004DC9F0 /* XPHomeSearchProtocol.h */, - 9BAD41AD28C6ECBA005E47B3 /* XPInRoomRecordProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E87DF4E12A42CAC1009C1185 /* SubView */ = { - isa = PBXGroup; - children = ( - E87DF4FD2A42CD7E009C1185 /* XPRoomSearchRecommendHeadView.h */, - E87DF4FC2A42CD7D009C1185 /* XPRoomSearchRecommendHeadView.m */, - E87DF4F72A42CCAB009C1185 /* XPHomeSearchRelateView.h */, - E87DF4F62A42CCAB009C1185 /* XPHomeSearchRelateView.m */, - E87DF4E32A42CAD2009C1185 /* XPHomeSearchNavView.h */, - E87DF4E22A42CAD2009C1185 /* XPHomeSearchNavView.m */, - ); - path = SubView; - sourceTree = ""; - }; - E87DF4E92A42CB51009C1185 /* Cell */ = { - isa = PBXGroup; - children = ( - E87DF5032A42CE21009C1185 /* XPHomeSearchRecordCell.h */, - E87DF5042A42CE21009C1185 /* XPHomeSearchRecordCell.m */, - E87DF5002A42CDF1009C1185 /* XPHomeAttentionCollectionViewCell.h */, - E87DF5012A42CDF1009C1185 /* XPHomeAttentionCollectionViewCell.m */, - E87DF4F92A42CCDD009C1185 /* XPHomeRedommendCollectionViewCell.h */, - E87DF4FA2A42CCDE009C1185 /* XPHomeRedommendCollectionViewCell.m */, - E87DF4ED2A42CB90009C1185 /* XPHomeCollectRoomTableViewCell.h */, - E87DF4EE2A42CB90009C1185 /* XPHomeCollectRoomTableViewCell.m */, - E87DF4EB2A42CB60009C1185 /* XPSearchListTableViewCell.h */, - E87DF4EA2A42CB60009C1185 /* XPSearchListTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E87E624F2A3F54B5002F68C9 /* YMNewHome */ = { - isa = PBXGroup; - children = ( - E87E62542A3F55BE002F68C9 /* Model */, - E87E62532A3F55B7002F68C9 /* Api */, - E87E62522A3F55B2002F68C9 /* View */, - E87E62512A3F55AB002F68C9 /* Presenter */, - E87E62502A3F559D002F68C9 /* Protocol */, - ); - path = YMNewHome; - sourceTree = ""; - }; - E87E62502A3F559D002F68C9 /* Protocol */ = { - isa = PBXGroup; - children = ( - E87DF4FF2A42CDB4009C1185 /* XPHomeRecommendProtocol.h */, - E87DF4E82A42CB24009C1185 /* XPHomeProtocol.h */, - E87E62692A3F5756002F68C9 /* XPHomeContainerProtocol.h */, - E87E627C2A3F5A63002F68C9 /* XPNewHomeRecommendProtocol.h */, - 54C389642C24448900FD47B1 /* XPHomeMineProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E87E62512A3F55AB002F68C9 /* Presenter */ = { - isa = PBXGroup; - children = ( - 4C85DB7F2DCDD83E00FD9839 /* CreateEventPresenter.h */, - 4C85DB802DCDD83E00FD9839 /* CreateEventPresenter.m */, - E87DF4E62A42CB00009C1185 /* XPHomePresenter.h */, - E87DF4E52A42CAFF009C1185 /* XPHomePresenter.m */, - E87E62672A3F571D002F68C9 /* XPHomeContainerPresenter.h */, - E87E62662A3F571C002F68C9 /* XPHomeContainerPresenter.m */, - E87E62792A3F5A0D002F68C9 /* XPNewHomeRecommendPresenter.h */, - E87E627A2A3F5A0D002F68C9 /* XPNewHomeRecommendPresenter.m */, - 54C3895D2C2189DD00FD47B1 /* XPHomeMinePresenter.h */, - 54C3895E2C2189DD00FD47B1 /* XPHomeMinePresenter.m */, - 4CBDC4252DC0B947005A75B9 /* EventCenterPresenter.h */, - 4CBDC4262DC0B947005A75B9 /* EventCenterPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E87E62522A3F55B2002F68C9 /* View */ = { - isa = PBXGroup; - children = ( - 4CAFEFF42DD2F21B00CD81DF /* CreateEventPickerContainerView.h */, - 4CAFEFF52DD2F21B00CD81DF /* CreateEventPickerContainerView.m */, - E87DF4B82A42C7BB009C1185 /* Search */, - E87E625F2A3F5669002F68C9 /* Cell */, - E87E625E2A3F565D002F68C9 /* CustomView */, - E87E62552A3F560A002F68C9 /* XPHomePartyViewController.h */, - E87E62562A3F560A002F68C9 /* XPHomePartyViewController.m */, - E87E625B2A3F5622002F68C9 /* XPNewHomeViewController.h */, - E87E625C2A3F5622002F68C9 /* XPNewHomeViewController.m */, - 54C3895A2C215F5100FD47B1 /* XPHomeMineViewController.h */, - 54C3895B2C215F5100FD47B1 /* XPHomeMineViewController.m */, - 239BEED92AA1E058005CDA94 /* PIHoemCategoryTitleView.h */, - 239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */, - 23B8D8DC2B860B8800CA472F /* PIHoemCategoryCollectionView.h */, - 23B8D8DD2B860B8800CA472F /* PIHoemCategoryCollectionView.m */, - 23B8D8D62B85F8B900CA472F /* PIHoemCategoryTitleCell.h */, - 23B8D8D72B85F8B900CA472F /* PIHoemCategoryTitleCell.m */, - 541DD9532C1EDEFB00B616C4 /* XPHomePagingViewController.h */, - 541DD9542C1EDEFB00B616C4 /* XPHomePagingViewController.m */, - 4CBDC4222DC0B078005A75B9 /* EventCenterViewController.h */, - 4CBDC4232DC0B078005A75B9 /* EventCenterViewController.m */, - 4C85DB822DCDDD6800FD9839 /* CreateEventViewControllerV2.h */, - 4C85DB832DCDDD6800FD9839 /* CreateEventViewControllerV2.m */, - 4C3475C22DD1FE590099B984 /* CreateEventSelectRoomViewController.h */, - 4C3475C32DD1FE590099B984 /* CreateEventSelectRoomViewController.m */, - 4C1119702DD7218300C18416 /* MyEventsViewController.h */, - 4C1119712DD7218300C18416 /* MyEventsViewController.m */, - ); - path = View; - sourceTree = ""; - }; - E87E62532A3F55B7002F68C9 /* Api */ = { - isa = PBXGroup; - children = ( - E8C6FFC927548120004DC9F0 /* Api+Home.h */, - E8C6FFC827548120004DC9F0 /* Api+Home.m */, - 4CCFDA012DD59211009BD2FD /* Api+EventCenter.h */, - 4CCFDA022DD59211009BD2FD /* Api+EventCenter.m */, - ); - path = Api; - sourceTree = ""; - }; - E87E62542A3F55BE002F68C9 /* Model */ = { - isa = PBXGroup; - children = ( - 4CD401482E718E36003F5009 /* XPBlankRoomModel.h */, - 4CD401492E718E36003F5009 /* XPBlankRoomModel.m */, - 23FF42772AA6E19C0055733C /* HomeMenuSourceModel.h */, - 23FF42782AA6E19C0055733C /* HomeMenuSourceModel.m */, - E87DF4F32A42CC49009C1185 /* HomeMenuInfoModel.h */, - E87DF4F42A42CC49009C1185 /* HomeMenuInfoModel.m */, - E87DF4D92A42C9D9009C1185 /* HomeCollectRoomModel.h */, - E87DF4D82A42C9D8009C1185 /* HomeCollectRoomModel.m */, - 236B2E5B2AA19168003967A8 /* HomeLittleGameRoomModel.h */, - 236B2E5C2AA19169003967A8 /* HomeLittleGameRoomModel.m */, - E87DF4D62A42C9C3009C1185 /* HomePlayRoomModel.h */, - E87DF4D52A42C9C3009C1185 /* HomePlayRoomModel.m */, - E87DF4D22A42C9B1009C1185 /* HomeRecommendRoomModel.h */, - E87DF4D32A42C9B1009C1185 /* HomeRecommendRoomModel.m */, - E87DF4CA2A42C960009C1185 /* HomeBannerInfoModel.h */, - E87DF4CB2A42C960009C1185 /* HomeBannerInfoModel.m */, - E87DF4BD2A42C8C1009C1185 /* HomeTagModel.h */, - E87DF4BE2A42C8C1009C1185 /* HomeTagModel.m */, - 54C389602C23BD1600FD47B1 /* HomeRankAvatarModel.h */, - 54C389612C23BD1600FD47B1 /* HomeRankAvatarModel.m */, - 23FF42712AA6CC480055733C /* PIHomeItemModel.h */, - 23FF42722AA6CC480055733C /* PIHomeItemModel.m */, - 23B8D8D92B85FDDD00CA472F /* PIHomeCategoryTitleModel.h */, - 23B8D8DA2B85FDDD00CA472F /* PIHomeCategoryTitleModel.m */, - 54C389652C24464600FD47B1 /* HomeMineRoomModel.h */, - 54C389662C24464600FD47B1 /* HomeMineRoomModel.m */, - 4CCFDA042DD5C127009BD2FD /* EventItemModel.h */, - 4CCFDA052DD5C127009BD2FD /* EventItemModel.m */, - 4CCB809D2DD5DFDF00C756D3 /* EventRoomModel.h */, - 4CCB809E2DD5DFDF00C756D3 /* EventRoomModel.m */, - 4C3851972DD5F4D50089CFCC /* EventConfigModel.h */, - 4C3851982DD5F4D50089CFCC /* EventConfigModel.m */, - 4C7F2A652E0BE0AB002F5058 /* FirstRechargeModel.h */, - 4C7F2A662E0BE0AB002F5058 /* FirstRechargeModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E87E625E2A3F565D002F68C9 /* CustomView */ = { - isa = PBXGroup; - children = ( - 23FF25632ABC3B3B0064E904 /* XPHomeGameView.h */, - 23FF25642ABC3B3B0064E904 /* XPHomeGameView.m */, - 23FF42742AA6E1480055733C /* XPHomeRecommendOtherRoomView.h */, - 23FF42752AA6E1480055733C /* XPHomeRecommendOtherRoomView.m */, - E87DF4F12A42CBEC009C1185 /* XPHomeUserView.h */, - E87DF4F02A42CBEC009C1185 /* XPHomeUserView.m */, - E87DF4C02A42C900009C1185 /* XPNoteView.h */, - E87DF4C12A42C900009C1185 /* XPNoteView.m */, - E87E62612A3F5689002F68C9 /* XPNewHomeNavView.h */, - E87E62602A3F5689002F68C9 /* XPNewHomeNavView.m */, - 23FF426E2AA6C7CF0055733C /* XPNewHomeItemCell.h */, - 23FF426F2AA6C7CF0055733C /* XPNewHomeItemCell.m */, - 23A439722AA1CF7C002E6039 /* XPNewHomeHeadView.h */, - 23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */, - 23194DD32AD292F200649F51 /* PIPageControl.h */, - 23194DD42AD292F200649F51 /* PIPageControl.m */, - ); - path = CustomView; - sourceTree = ""; - }; - E87E625F2A3F5669002F68C9 /* Cell */ = { - isa = PBXGroup; - children = ( - 4CD401452E7183A8003F5009 /* XPPartyRoomItemCollectionViewCell.h */, - 4CD401462E7183A8003F5009 /* XPPartyRoomItemCollectionViewCell.m */, - 23FF25662ABC3BC00064E904 /* XPHomeGameCell.h */, - 23FF25672ABC3BC00064E904 /* XPHomeGameCell.m */, - E87E627D2A3F5D28002F68C9 /* XPNewHomePlayItemCollectionViewCell.h */, - E87E627E2A3F5D28002F68C9 /* XPNewHomePlayItemCollectionViewCell.m */, - E87E62722A3F5907002F68C9 /* XPHomeBannerTableViewCell.h */, - E87E626A2A3F5906002F68C9 /* XPHomeBannerTableViewCell.m */, - E87E626E2A3F5906002F68C9 /* XPNewHomePartyTableViewCell.h */, - E87E62712A3F5907002F68C9 /* XPNewHomePartyTableViewCell.m */, - 23FF42682AA5DF050055733C /* XPNewHomePartyTagView.h */, - 23FF42692AA5DF050055733C /* XPNewHomePartyTagView.m */, - 23FF426B2AA5E4EE0055733C /* XPNewHomePartyAudioView.h */, - 23FF426C2AA5E4EE0055733C /* XPNewHomePartyAudioView.m */, - E87E626B2A3F5906002F68C9 /* XPNewHomePlayEmptyTableViewCell.h */, - E87E626D2A3F5906002F68C9 /* XPNewHomePlayEmptyTableViewCell.m */, - E87E626C2A3F5906002F68C9 /* XPNewHomePlayTableViewCell.h */, - E87E626F2A3F5906002F68C9 /* XPNewHomePlayTableViewCell.m */, - E87E62732A3F5907002F68C9 /* XPNewHomeRecommendTableViewCell.h */, - E87E62702A3F5907002F68C9 /* XPNewHomeRecommendTableViewCell.m */, - 23FF42612AA5861E0055733C /* XPNewHomePartyCollectionViewCell.h */, - 23FF42622AA5861E0055733C /* XPNewHomePartyCollectionViewCell.m */, - 4CCFD9FE2DD59038009BD2FD /* EventCenterEmptyCell.h */, - 4CCFD9FF2DD59038009BD2FD /* EventCenterEmptyCell.m */, - 4CBDC4282DC0BB95005A75B9 /* EventCenterOfficialCell.h */, - 4CBDC4292DC0BB95005A75B9 /* EventCenterOfficialCell.m */, - 4CBDC42B2DC0BBB7005A75B9 /* EventCenterEventCell.h */, - 4CBDC42C2DC0BBB7005A75B9 /* EventCenterEventCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E880B396278BD3D800A83B0D /* AcrossRoomPK */ = { - isa = PBXGroup; - children = ( - E880B39B278BD45A00A83B0D /* Model */, - E880B39A278BD45200A83B0D /* Api */, - E880B399278BD44500A83B0D /* View */, - E880B398278BD43D00A83B0D /* Presenter */, - E880B397278BD43600A83B0D /* Protocol */, - ); - path = AcrossRoomPK; - sourceTree = ""; - }; - E880B397278BD43600A83B0D /* Protocol */ = { - isa = PBXGroup; - children = ( - E880B3B6278C1FFB00A83B0D /* XPAcrossRoomProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E880B398278BD43D00A83B0D /* Presenter */ = { - isa = PBXGroup; - children = ( - E880B3B3278C1FE400A83B0D /* XPAcrossRoomPKPresenter.h */, - E880B3B4278C1FE400A83B0D /* XPAcrossRoomPKPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E880B399278BD44500A83B0D /* View */ = { - isa = PBXGroup; - children = ( - E880B3A3278BD66400A83B0D /* SubViews */, - E880B3A2278BD65E00A83B0D /* Cell */, - E880B39C278BD49E00A83B0D /* XPAcrossRoomPKViewController.h */, - E880B39D278BD49E00A83B0D /* XPAcrossRoomPKViewController.m */, - E880B39F278BD60C00A83B0D /* XPAcrossRoomPKSelectRoomView.h */, - E880B3A0278BD60C00A83B0D /* XPAcrossRoomPKSelectRoomView.m */, - ); - path = View; - sourceTree = ""; - }; - E880B39A278BD45200A83B0D /* Api */ = { - isa = PBXGroup; - children = ( - E880B3AD278BE1D800A83B0D /* Api+AcrossRoomPK.h */, - E880B3AE278BE1D800A83B0D /* Api+AcrossRoomPK.m */, - ); - path = Api; - sourceTree = ""; - }; - E880B39B278BD45A00A83B0D /* Model */ = { - isa = PBXGroup; - children = ( - E880B3A7278BD82300A83B0D /* AcrossRoomPKInfoModel.h */, - E880B3A8278BD82300A83B0D /* AcrossRoomPKInfoModel.m */, - E8D48251278D8228003C1D08 /* AcrossRoomPKPanelModel.h */, - E8D48252278D8228003C1D08 /* AcrossRoomPKPanelModel.m */, - E88863CA278EC336004BCFAB /* AcrossRoomPKPrizeModel.h */, - E88863CB278EC336004BCFAB /* AcrossRoomPKPrizeModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E880B3A2278BD65E00A83B0D /* Cell */ = { - isa = PBXGroup; - children = ( - E880B3A4278BD69900A83B0D /* XPAcrossRoomPKTableViewCell.h */, - E880B3A5278BD69900A83B0D /* XPAcrossRoomPKTableViewCell.m */, - E880B3AA278BD98600A83B0D /* XPAcrossRoomPKEmptyTableViewCell.h */, - E880B3AB278BD98600A83B0D /* XPAcrossRoomPKEmptyTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E880B3A3278BD66400A83B0D /* SubViews */ = { - isa = PBXGroup; - children = ( - E880B3B0278C1D1800A83B0D /* XPAcrossRoomPKRuleView.h */, - E880B3B1278C1D1800A83B0D /* XPAcrossRoomPKRuleView.m */, - E8D48248278D1F72003C1D08 /* XPAcrossRoomPKInviteView.h */, - E8D48249278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m */, - E8D4824B278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.h */, - E8D4824C278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m */, - E8D4824E278D68BA003C1D08 /* XPAcrossRoomPKPanelView.h */, - E8D4824F278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m */, - E8D48254278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.h */, - E8D48255278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.m */, - E88863C4278EAFC3004BCFAB /* XPAcrossRoomPKResultView.h */, - E88863C5278EAFC3004BCFAB /* XPAcrossRoomPKResultView.m */, - E88863C7278EBA43004BCFAB /* XPAcrossRoomPKForceEndResultView.h */, - E88863C8278EBA43004BCFAB /* XPAcrossRoomPKForceEndResultView.m */, - E88863CD278EC393004BCFAB /* XPAcrossRoomPKPrizeView.h */, - E88863CE278EC393004BCFAB /* XPAcrossRoomPKPrizeView.m */, - 9BF5192428801D4700B6BE92 /* XPAcrossRoomPKCountDownView.h */, - 9BF5192528801D4700B6BE92 /* XPAcrossRoomPKCountDownView.m */, - 9B3C1818292CE4FA003AF543 /* XPAnchorPKMatchView.h */, - 9B3C1819292CE4FA003AF543 /* XPAnchorPKMatchView.m */, - ); - path = SubViews; - sourceTree = ""; - }; - E884C3782743B6AA00E1EBED /* Tool */ = { - isa = PBXGroup; - children = ( - E884C3702743AEDE00E1EBED /* CustomAttachmentDecoder.h */, - E884C3712743AEDE00E1EBED /* CustomAttachmentDecoder.m */, - ); - path = Tool; - sourceTree = ""; - }; E88863D0278ED4A0004BCFAB /* Timestamp */ = { isa = PBXGroup; children = ( @@ -10379,498 +1996,6 @@ path = Timestamp; sourceTree = ""; }; - E8899C7C27853B46007944BE /* Dating */ = { - isa = PBXGroup; - children = ( - E877A7EC278428FB00EFACED /* MicroDatingProgressView.h */, - E877A7ED278428FB00EFACED /* MicroDatingProgressView.m */, - E8899C7D27853B6A007944BE /* DatingMicroView.h */, - E8899C7E27853B6A007944BE /* DatingMicroView.m */, - ); - path = Dating; - sourceTree = ""; - }; - E88B5CBE26FB404800DA9178 /* MineInfo */ = { - isa = PBXGroup; - children = ( - E88B5CBF26FB407B00DA9178 /* XPMineUserInfoViewController.h */, - E88B5CC026FB407B00DA9178 /* XPMineUserInfoViewController.m */, - E8D34D4528080295009C4835 /* XPMineUserDataViewController.h */, - E8D34D4628080295009C4835 /* XPMineUserDataViewController.m */, - E8EEB90426FC5772007C6EBA /* XPMineUserInfoEditViewController.h */, - E8EEB90526FC5772007C6EBA /* XPMineUserInfoEditViewController.m */, - E8EEB91226FC7786007C6EBA /* XPMineUserInfoNickViewController.h */, - E8EEB91326FC7786007C6EBA /* XPMineUserInfoNickViewController.m */, - E8EEB91526FC7B35007C6EBA /* XPMineUserInfoDesViewController.h */, - E8EEB91626FC7B35007C6EBA /* XPMineUserInfoDesViewController.m */, - E8B846BD26FD827900A777FE /* XPMineUserInfoAlbumViewController.h */, - E8B846BE26FD827900A777FE /* XPMineUserInfoAlbumViewController.m */, - E8D34D6228084E40009C4835 /* XPMineUserInfoGiftWallViewController.h */, - E8D34D6328084E40009C4835 /* XPMineUserInfoGiftWallViewController.m */, - E8998D892859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.h */, - E8998D8A2859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.m */, - 1464C5EE29A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.h */, - 1464C5EF29A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.m */, - ); - path = MineInfo; - sourceTree = ""; - }; - E88B5CC226FB429C00DA9178 /* MineInfo */ = { - isa = PBXGroup; - children = ( - 23E9EB132A84D02400B792F2 /* XPMineUserInfoEditPickView.h */, - 23E9EB142A84D02400B792F2 /* XPMineUserInfoEditPickView.m */, - 23E9EA902A84BD5B00B792F2 /* XPMineUserInfoIndividualTagView.h */, - 23E9EA8F2A84BD5B00B792F2 /* XPMineUserInfoIndividualTagView.m */, - 23E9EA8C2A84BC8F00B792F2 /* XPMineUserInfoHeaderTagCell.h */, - 23E9EA8D2A84BC9000B792F2 /* XPMineUserInfoHeaderTagCell.m */, - 23E9EA892A84B9BD00B792F2 /* XPMineUserInfoTagFlowLayout.h */, - 23E9EA8A2A84B9BD00B792F2 /* XPMineUserInfoTagFlowLayout.m */, - 23E9EAAC2A84C9B800B792F2 /* XPMineUserInfoTagHeadView.h */, - 23E9EAAB2A84C9B800B792F2 /* XPMineUserInfoTagHeadView.m */, - 23E9EAA72A84C9B700B792F2 /* XPMineUserInfoTagItemView.h */, - 23E9EAA82A84C9B700B792F2 /* XPMineUserInfoTagItemView.m */, - 23E9EAB42A84CB2600B792F2 /* XPMineUserInfoTagEmptyView.h */, - 23E9EAB32A84CB2600B792F2 /* XPMineUserInfoTagEmptyView.m */, - 23E9EB1D2A84DA5F00B792F2 /* XPMineUserInfoNavView.h */, - 23E9EB1C2A84DA5F00B792F2 /* XPMineUserInfoNavView.m */, - 23E9EAA92A84C9B700B792F2 /* XPMineUserInfoTagView.h */, - 23E9EAAA2A84C9B700B792F2 /* XPMineUserInfoTagView.m */, - 23E9EAB02A84C9DD00B792F2 /* XPMineUserInfoTagViewCell.h */, - 23E9EAB12A84C9DE00B792F2 /* XPMineUserInfoTagViewCell.m */, - 23E9EA872A84B75900B792F2 /* XPMineUserInfoHeaderTagView.h */, - 23E9EA862A84B75900B792F2 /* XPMineUserInfoHeaderTagView.m */, - E8EEB8FC26FC2DF8007C6EBA /* XPMineUserInfoCustomNavView.h */, - E8EEB8FD26FC2DF8007C6EBA /* XPMineUserInfoCustomNavView.m */, - E88B5CC326FB42B000DA9178 /* XPMineUserInfoHeaderView.h */, - E88B5CC426FB42B000DA9178 /* XPMineUserInfoHeaderView.m */, - 5478539F2C258F2A00F45E60 /* XPMineUserViewHeader.h */, - 547853A02C258F2A00F45E60 /* XPMineUserViewHeader.m */, - E8EEB91B26FC9D58007C6EBA /* XPMineUserInfoDateView.h */, - E8EEB91C26FC9D58007C6EBA /* XPMineUserInfoDateView.m */, - E873EB07280960990071030D /* XPMineUserInfoVoiceCardView.h */, - E873EB08280960990071030D /* XPMineUserInfoVoiceCardView.m */, - E8998D832859B4FA00C68558 /* XPMineUserInfoGiftView.h */, - E8998D842859B4FA00C68558 /* XPMineUserInfoGiftView.m */, - 54ACDCC02C5B31BD0099472C /* XPBeautIDView.h */, - 54ACDCC12C5B31BD0099472C /* XPBeautIDView.m */, - ); - path = MineInfo; - sourceTree = ""; - }; - E88C72962828F3410047FB2B /* Cell */ = { - isa = PBXGroup; - children = ( - E88C72972828F3620047FB2B /* XPRoomMusicLibraryTableViewCell.h */, - E88C72982828F3620047FB2B /* XPRoomMusicLibraryTableViewCell.m */, - E88C729A2828F37D0047FB2B /* XPRoomMusicLibraryEmptyTableViewCell.h */, - E88C729B2828F37D0047FB2B /* XPRoomMusicLibraryEmptyTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E88C729D2828FCB10047FB2B /* SubViews */ = { - isa = PBXGroup; - children = ( - E88C729E2828FCD40047FB2B /* XPMusicLibraryPlayView.h */, - E88C729F2828FCD40047FB2B /* XPMusicLibraryPlayView.m */, - E88C72A1282917590047FB2B /* XPRoomMusicVoiceSettingView.h */, - E88C72A2282917590047FB2B /* XPRoomMusicVoiceSettingView.m */, - E88C72A4282921D60047FB2B /* XPRoomBackMusicPlayerView.h */, - E88C72A5282921D60047FB2B /* XPRoomBackMusicPlayerView.m */, - ); - path = SubViews; - sourceTree = ""; - }; - E88E4A7D297673C600019A50 /* View */ = { - isa = PBXGroup; - children = ( - 18F404B5276095D700A6C548 /* SessionChatLimitView.h */, - 18F404B6276095D700A6C548 /* SessionChatLimitView.m */, - E86E79D128A4E94E006DAF48 /* SessionRiskView.h */, - E86E79D228A4E94E006DAF48 /* SessionRiskView.m */, - E8D55C9E281186D6006935A5 /* SessionAudioRecordView.h */, - E8D55C9F281186D6006935A5 /* SessionAudioRecordView.m */, - E8E20BDC28164D3A0033B688 /* SessionNavView.h */, - E8E20BDD28164D3A0033B688 /* SessionNavView.m */, - E88E4A7E297673DC00019A50 /* SessionNavLiveView.h */, - E88E4A7F297673DC00019A50 /* SessionNavLiveView.m */, - E885D5372977D10E004DC088 /* SessionSettingUserView.h */, - E885D5382977D10E004DC088 /* SessionSettingUserView.m */, - ); - path = View; - sourceTree = ""; - }; - E896EF912771AA6C00AD2CC1 /* Friend */ = { - isa = PBXGroup; - children = ( - E896EF9A2771AE6B00AD2CC1 /* XPMineFansViewController.h */, - E896EF9B2771AE6B00AD2CC1 /* XPMineFansViewController.m */, - E896EF9D2771AE7B00AD2CC1 /* XPMineAttentionViewController.h */, - E896EF9E2771AE7B00AD2CC1 /* XPMineAttentionViewController.m */, - E896EFA02771AE9400AD2CC1 /* XPMineFriendViewController.h */, - E896EFA12771AE9400AD2CC1 /* XPMineFriendViewController.m */, - E84CBCDF28436D3C00D43221 /* XPMineContactViewController.h */, - E84CBCE028436D3C00D43221 /* XPMineContactViewController.m */, - E8F65C1D286998C9009BB5B9 /* XPMineShareViewController.h */, - E8F65C1E286998C9009BB5B9 /* XPMineShareViewController.m */, - E84CBCE2284372D800D43221 /* XPRoomHalfMessageView.h */, - E84CBCE3284372D800D43221 /* XPRoomHalfMessageView.m */, - E8DAC5AA2858305A00012CFD /* XPRoomMessageBubbleView.h */, - E8DAC5AB2858305A00012CFD /* XPRoomMessageBubbleView.m */, - ); - path = Friend; - sourceTree = ""; - }; - E896EFA32771AEC500AD2CC1 /* Friend */ = { - isa = PBXGroup; - children = ( - E896EFA42771AEDD00AD2CC1 /* XPMineFansTableViewCell.h */, - E896EFA52771AEDD00AD2CC1 /* XPMineFansTableViewCell.m */, - E896EFA72771AEEC00AD2CC1 /* XPMineAttentionTableViewCell.h */, - E896EFA82771AEEC00AD2CC1 /* XPMineAttentionTableViewCell.m */, - E896EFAA2771AEFE00AD2CC1 /* XPMineFriendTableViewCell.h */, - E896EFAB2771AEFE00AD2CC1 /* XPMineFriendTableViewCell.m */, - E896EFAD2771AF0F00AD2CC1 /* XPMineFriendEmptyTableViewCell.h */, - E896EFAE2771AF0F00AD2CC1 /* XPMineFriendEmptyTableViewCell.m */, - ); - path = Friend; - sourceTree = ""; - }; - E899C68D2750DA3C00E189E5 /* CustomMessage */ = { - isa = PBXGroup; - children = ( - E833ED0B274FAD1C00A2463B /* XPKickUserModel.h */, - E833ED0C274FAD1C00A2463B /* XPKickUserModel.m */, - ); - path = CustomMessage; - sourceTree = ""; - }; - E89D60B7271D6417001F8895 /* Model */ = { - isa = PBXGroup; - children = ( - E80487632717DDD9008595F2 /* XPRoomMenuItem.h */, - E80487642717DDD9008595F2 /* XPRoomMenuItem.m */, - ); - path = Model; - sourceTree = ""; - }; - E89DA6612700590A008483C1 /* IAPHelper */ = { - isa = PBXGroup; - children = ( - E89DA66527006443008483C1 /* RechargeStorage.h */, - E89DA66627006443008483C1 /* RechargeStorage.m */, - ); - path = IAPHelper; - sourceTree = ""; - }; - E8A1E45C276220B100B294CA /* Resources */ = { - isa = PBXGroup; - children = ( - 4CE746D62D92C5B60094E496 /* gift */, - 5461040A2CD4B3CB00066B21 /* banner */, - 54C608512CBE0BEB003DD5D2 /* game */, - 54FFD3802C9BD12600DE61E5 /* cp */, - 54F179062C8EA48C00CB5219 /* Combo_Boom.svga */, - 23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */, - 237701182BD6143700D661F1 /* pi_happy_egg_smash.svga */, - 23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */, - 23FF256F2ABD456C0064E904 /* pi_home_new_play.svga */, - 23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */, - 239D0F9A2BFC9E6C002977CE /* ms_room_gift_svga_icon.svga */, - 23FF42662AA5CFBB0055733C /* home_sound_wave.gif */, - 23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */, - 23FF255A2AB956D50064E904 /* pi_home_new_pk.svga */, - 23E9EB222A84E98300B792F2 /* pi_new_mine_info_sound_play.svga */, - 23E9EAA22A84C80300B792F2 /* pi_new_loading.svga */, - 23E9EA6C2A83813000B792F2 /* fairy */, - ); - path = Resources; - sourceTree = ""; - }; - E8A30BDB28534667003B4873 /* FindNew */ = { - isa = PBXGroup; - children = ( - E8A30BE02853469C003B4873 /* Model */, - E8A30BDF28534693003B4873 /* Api */, - E8A30BDE28534686003B4873 /* View */, - E8A30BDD2853467B003B4873 /* Presenter */, - E8A30BDC28534673003B4873 /* Protocol */, - ); - path = FindNew; - sourceTree = ""; - }; - E8A30BDC28534673003B4873 /* Protocol */ = { - isa = PBXGroup; - children = ( - E8A30BF028534B03003B4873 /* XPSessionFindNewProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E8A30BDD2853467B003B4873 /* Presenter */ = { - isa = PBXGroup; - children = ( - E8A30BEC28534AB1003B4873 /* XPSessionFindNewPresenter.h */, - E8A30BED28534AB1003B4873 /* XPSessionFindNewPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E8A30BDE28534686003B4873 /* View */ = { - isa = PBXGroup; - children = ( - E8A30BE528534A3A003B4873 /* Cell */, - E8A30BE428534A2D003B4873 /* View */, - E8A30BE128534A28003B4873 /* XPSessionFindNewViewController.h */, - E8A30BE228534A28003B4873 /* XPSessionFindNewViewController.m */, - ); - path = View; - sourceTree = ""; - }; - E8A30BDF28534693003B4873 /* Api */ = { - isa = PBXGroup; - children = ( - E8A30BF128534B17003B4873 /* Api+FindNew.h */, - E8A30BF228534B17003B4873 /* Api+FindNew.m */, - ); - path = Api; - sourceTree = ""; - }; - E8A30BE02853469C003B4873 /* Model */ = { - isa = PBXGroup; - children = ( - E8A30BF428534B35003B4873 /* FindNewUserInfoModel.h */, - E8A30BF528534B35003B4873 /* FindNewUserInfoModel.m */, - E86A16C32856DBEC004228B8 /* FindNewGreetListModel.h */, - E86A16C42856DBEC004228B8 /* FindNewGreetListModel.m */, - E8E0DAE7285C2E8C00566A2F /* FindNewGreetMessageModel.h */, - E8E0DAE8285C2E8C00566A2F /* FindNewGreetMessageModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E8A30BE428534A2D003B4873 /* View */ = { - isa = PBXGroup; - children = ( - E8A30BE928534A96003B4873 /* XPSessionFindNewFiltrateView.h */, - E8A30BEA28534A96003B4873 /* XPSessionFindNewFiltrateView.m */, - E86A16BD2856D4D5004228B8 /* XPSessionFindNewGreetListView.h */, - E86A16BE2856D4D5004228B8 /* XPSessionFindNewGreetListView.m */, - E8E0DAE4285C280E00566A2F /* XPSessionFindNewAlertView.h */, - E8E0DAE5285C280E00566A2F /* XPSessionFindNewAlertView.m */, - ); - path = View; - sourceTree = ""; - }; - E8A30BE528534A3A003B4873 /* Cell */ = { - isa = PBXGroup; - children = ( - E8A30BE628534A63003B4873 /* XPSessionFindNewTableViewCell.h */, - E8A30BE728534A63003B4873 /* XPSessionFindNewTableViewCell.m */, - E8A30BF728534E48003B4873 /* XPSessionFindNewEmptyTableViewCell.h */, - E8A30BF828534E48003B4873 /* XPSessionFindNewEmptyTableViewCell.m */, - E86A16C02856D635004228B8 /* XPSessionFindNewGreetTableViewCell.h */, - E86A16C12856D635004228B8 /* XPSessionFindNewGreetTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E8AEAED3271412D00017FCE0 /* YMRoom */ = { - isa = PBXGroup; - children = ( - 4CFE7F412E45ECEC00F77776 /* Manager */, - 54E82E9B2CA684A600C931D9 /* Features */, - E804875F2717DD70008595F2 /* Model */, - E80487602717DD89008595F2 /* Api */, - E8AEAED8271413530017FCE0 /* View */, - E80487612717DD92008595F2 /* Presenter */, - E80487622717DDAE008595F2 /* Protocol */, - 4C5527BD2D1C099500833FFD /* RoomResourceManager.h */, - 4C5527BE2D1C099500833FFD /* RoomResourceManager.m */, - ); - path = YMRoom; - sourceTree = ""; - }; - E8AEAED8271413530017FCE0 /* View */ = { - isa = PBXGroup; - children = ( - 4CD47BB32E61514900BCDA46 /* StageViewManager.h */, - 4CD47BB42E61514900BCDA46 /* StageViewManager.m */, - 4CE746C92D929D500094E496 /* Common */, - 4CB753CF2D30F08E00B13DF5 /* LuckyPackage */, - 4CB753CE2D2FE80100B13DF5 /* RoomSideMenu */, - 547080D82CD0EE7A009879E5 /* Custom Background */, - 239D0F932BFB3284002977CE /* MSRoomOnLineView */, - E880B396278BD3D800A83B0D /* AcrossRoomPK */, - E8AEAEE527141ACC0017FCE0 /* ActivityContainerView */, - 9B7D904A287BC4FC0033A45E /* AnchorCycleView */, - 9B1B72A228002F76003FACE9 /* AnchorPK */, - 9B7B605827BB52FD0070BB72 /* AnchorView */, - E838D99D275E1B6C0079E0B5 /* AnimationView */, - E81C1B1327705EF00020D1E4 /* ArrangeMic */, - E8E859E628264F0000EE4857 /* BackMusic */, - E8AEAEE727141ACC0017FCE0 /* BaseUIContainerView */, - 2331C1822A60F32D00E1D940 /* CandyTree */, - 9B208A372779C1EF00F9E54A /* FaceView */, - E84150B027747A7400A7F548 /* FirstRecharge */, - 23FF25712ABD66B90064E904 /* FreeGiftsView */, - 236B2E202AA07D06003967A8 /* LittleGame */, - E8AEAEE927141ACC0017FCE0 /* MenuContainerView */, - E8AEAEE627141ACC0017FCE0 /* MessageContainerView */, - 186F8B472733F2AE007A17BC /* MicroQueueProtocol.h */, - E8DEC9962764A51F0078CB70 /* MoreView */, - 9B9BBF80288FBF93004E2E74 /* NewUserGift */, - E87AE8C2284E1A6B00CAFBB3 /* NewUserGreet */, - 237B94AB2A984DA7007853E3 /* NobleTrumpet */, - 9B2F72CD28E45A1C0000E4FA /* QuickMessageView */, - 9BC5C915277C809E007C8719 /* ReleaseRadio */, - 1845C6412790320E00016EAC /* RoomAnimationProtocol.h */, - 180806F827298F9B001FD836 /* RoomGuestDelegate.h */, - E8AEAEE827141ACC0017FCE0 /* RoomHeaderView */, - 181D7F222727DB1E00B7C059 /* RoomHostDelegate.h */, - E801273827E322D700BAC3F2 /* RoomPK */, - 9B6E8570281AAD260041A321 /* RoomRecommend */, - E8751E5128A629EB0056EF44 /* Sailing */, - E8788931273A53B000BF1D57 /* SendGiftView */, - 9BA812D328BF52A500783EA7 /* SendRedPacket */, - E8412F9A2779BAC2006E1101 /* Setting */, - 2305EEE62AD677D300AD403C /* RoomPhotoAlbum */, - E8AEAEEA27141ACC0017FCE0 /* StageView */, - 9BFE0D8F289903F600F53C24 /* TaskTip */, - 180806F92729A354001FD836 /* ThemeColor+Room.h */, - 180806FA2729A354001FD836 /* ThemeColor+Room.m */, - E82325EA274E2D52003A3332 /* UserCard */, - 239D0FC82C045F92002977CE /* RoomGame */, - E866B6E32759F96F009B002A /* XPMiniRoomView.h */, - E866B6E42759F96F009B002A /* XPMiniRoomView.m */, - E816C11327608A7500C84014 /* XPRoomMiniManager.h */, - E816C11427608A7500C84014 /* XPRoomMiniManager.m */, - E8AEAED4271412EC0017FCE0 /* XPRoomViewController.h */, - E8AEAED5271412EC0017FCE0 /* XPRoomViewController.m */, - 5458319B2C2AE09300364026 /* XPRoomTypeSelectionViewController.h */, - 5458319C2C2AE09300364026 /* XPRoomTypeSelectionViewController.m */, - 4C7989F02D195293006AE07B /* RoomMode */, - ); - path = View; - sourceTree = ""; - }; - E8AEAEE527141ACC0017FCE0 /* ActivityContainerView */ = { - isa = PBXGroup; - children = ( - E8AE427127153A3500BEEBB2 /* XPRoomActivityContainerView.h */, - E8AE427227153A3500BEEBB2 /* XPRoomActivityContainerView.m */, - 23C9DFC12B84807A00B51558 /* PIRoomActivityClickView.h */, - 23C9DFC22B84807A00B51558 /* PIRoomActivityClickView.m */, - 23C9DFC42B84903500B51558 /* PIRoomActivityChoosePlayView.h */, - 23C9DFC52B84903500B51558 /* PIRoomActivityChoosePlayView.m */, - 23C9DFC72B84917B00B51558 /* PIRoomActivityChoosePlayCell.h */, - 23C9DFC82B84917B00B51558 /* PIRoomActivityChoosePlayCell.m */, - 235A45182B04A352009753F5 /* PIRoomActivityWebView.h */, - 235A45192B04A352009753F5 /* PIRoomActivityWebView.m */, - 235A451B2B04A452009753F5 /* PIRoomActivityWebCell.h */, - 235A451C2B04A452009753F5 /* PIRoomActivityWebCell.m */, - ); - path = ActivityContainerView; - sourceTree = ""; - }; - E8AEAEE627141ACC0017FCE0 /* MessageContainerView */ = { - isa = PBXGroup; - children = ( - E84B0E47272801F6008818C6 /* Tool */, - E84B0E432727EF2C008818C6 /* Model */, - E84B0E3C2727EDD4008818C6 /* View */, - 235714962BEDF54E004C81D6 /* MsRoomMessageMainView.h */, - 235714972BEDF54E004C81D6 /* MsRoomMessageMainView.m */, - E8AEAEF127141C7C0017FCE0 /* XPRoomMessageContainerView.h */, - E8AEAEF227141C7C0017FCE0 /* XPRoomMessageContainerView.m */, - ); - path = MessageContainerView; - sourceTree = ""; - }; - E8AEAEE727141ACC0017FCE0 /* BaseUIContainerView */ = { - isa = PBXGroup; - children = ( - 239D0F9F2BFCB88C002977CE /* XPRoomAnchorRankEnterView.h */, - 239D0FA52BFCB88D002977CE /* XPRoomAnchorRankEnterView.m */, - 239D0FA72BFCB88D002977CE /* XPRoomBackContainerView.h */, - 239D0F9C2BFCB88C002977CE /* XPRoomBackContainerView.m */, - 239D0FA02BFCB88D002977CE /* XPRoomDatingVipUpMicView.h */, - 239D0FA12BFCB88D002977CE /* XPRoomDatingVipUpMicView.m */, - 239D0F9D2BFCB88C002977CE /* XPRoomDatingWebAlertView.h */, - 239D0FA22BFCB88D002977CE /* XPRoomDatingWebAlertView.m */, - 239D0F9E2BFCB88C002977CE /* XPRoomFunctionContainerView.h */, - 239D0FA32BFCB88D002977CE /* XPRoomFunctionContainerView.m */, - 239D0FA62BFCB88D002977CE /* XPRoomRankEntranceView.h */, - 239D0FA42BFCB88D002977CE /* XPRoomRankEntranceView.m */, - ); - path = BaseUIContainerView; - sourceTree = ""; - }; - E8AEAEE827141ACC0017FCE0 /* RoomHeaderView */ = { - isa = PBXGroup; - children = ( - E8AEAEF727141CA30017FCE0 /* RoomHeaderView.h */, - E8AEAEF827141CA30017FCE0 /* RoomHeaderView.m */, - ); - path = RoomHeaderView; - sourceTree = ""; - }; - E8AEAEE927141ACC0017FCE0 /* MenuContainerView */ = { - isa = PBXGroup; - children = ( - E89D60B7271D6417001F8895 /* Model */, - E8EE827B272B9A2300A17217 /* XPRoomSendTextView.h */, - E8EE827C272B9A2300A17217 /* XPRoomSendTextView.m */, - E8AEAEEE27141C430017FCE0 /* XPRoomMenuContainerView.h */, - E8AEAEEF27141C430017FCE0 /* XPRoomMenuContainerView.m */, - 2320F6372BDF732C00227EEB /* MSRoomMenuGameView.h */, - 2320F6382BDF732C00227EEB /* MSRoomMenuGameView.m */, - 2320F63D2BDF8B3000227EEB /* MSRoomMenuGameVC.h */, - 2320F63E2BDF8B3000227EEB /* MSRoomMenuGameVC.m */, - 2320F63A2BDF738E00227EEB /* MSRoomMenuGameCell.h */, - 2320F63B2BDF738E00227EEB /* MSRoomMenuGameCell.m */, - 2320F6402BE0F53F00227EEB /* MSRoomMenuGameEmptyCell.h */, - 2320F6412BE0F53F00227EEB /* MSRoomMenuGameEmptyCell.m */, - 544A36332C94160F00CA7858 /* RoomMenuBar.h */, - 544A36342C94160F00CA7858 /* RoomMenuBar.m */, - ); - path = MenuContainerView; - sourceTree = ""; - }; - E8AEAEEA27141ACC0017FCE0 /* StageView */ = { - isa = PBXGroup; - children = ( - 4CAE69CA2E69A2DB00A9FC35 /* MicMidpointRectManager.h */, - 4CAE69CB2E69A2DB00A9FC35 /* MicMidpointRectManager.m */, - E874B88527215CFF003954B9 /* Model */, - E8680707271959090024F48F /* MicroView */, - 181D7F192726CE2A00B7C059 /* StageView.h */, - 181D7F1A2726CE2A00B7C059 /* StageView.m */, - 181D7F1F2727D9DB00B7C059 /* SocialStageView.h */, - 181D7F202727D9DB00B7C059 /* SocialStageView.m */, - 5458319E2C2AEFAF00364026 /* TenMicStageView.h */, - 5458319F2C2AEFAF00364026 /* TenMicStageView.m */, - 545831A12C2AF01100364026 /* FifteenMicStageView.h */, - 545831A22C2AF01100364026 /* FifteenMicStageView.m */, - E877A7E92783E24700EFACED /* DatingStageView.h */, - E877A7EA2783E24700EFACED /* DatingStageView.m */, - 9B0086C427BA392B0032BD2B /* AnchorStageView.h */, - 9B0086C527BA392B0032BD2B /* AnchorStageView.m */, - 9B2EA7BE2804037700ED17BF /* AnchorPKStageView.h */, - 9B2EA7BF2804037700ED17BF /* AnchorPKStageView.m */, - 236B2E4F2AA08756003967A8 /* LittleGameScrollStageView.h */, - 236B2E512AA08756003967A8 /* LittleGameScrollStageView.m */, - 236B2E522AA08757003967A8 /* LittleGameStageView.h */, - 236B2E502AA08756003967A8 /* LittleGameStageView.m */, - 4CEB9EAE2D0AF4FE00443480 /* TwentyMicStageView.h */, - 4CEB9EAF2D0AF4FE00443480 /* TwentyMicStageView.m */, - 4CEB9EB12D0AFCE200443480 /* NineteenMicStageView.h */, - 4CEB9EB22D0AFCE200443480 /* NineteenMicStageView.m */, - ); - path = StageView; - sourceTree = ""; - }; E8B3E8022848B828009746AB /* Protocol */ = { isa = PBXGroup; children = ( @@ -10882,8 +2007,6 @@ E8B3E8032848B838009746AB /* Presenter */ = { isa = PBXGroup; children = ( - 18E7B1B026E8AF980064BC9B /* MainPresenter.h */, - 18E7B1B126E8AF980064BC9B /* MainPresenter.m */, ); path = Presenter; sourceTree = ""; @@ -10891,11 +2014,7 @@ E8B3E8042848B842009746AB /* View */ = { isa = PBXGroup; children = ( - 9BA3B40C293DD2E00071DF1C /* VersionUpdate */, - 9BFB101C2897CC3300B3985E /* AnchorCard */, 9BE01AF42893E7E000B50299 /* Cell */, - 189DD53226DE255300AB55B1 /* TabbarViewController.h */, - 189DD53326DE255300AB55B1 /* TabbarViewController.m */, 142721B029A7647F00C7C423 /* XPBlankViewController.h */, 142721B129A7647F00C7C423 /* XPBlankViewController.m */, 140A7F50299CC69000841594 /* XPTabBar.h */, @@ -10916,18 +2035,6 @@ E8B3E8062848B84F009746AB /* Model */ = { isa = PBXGroup; children = ( - E836456A2A40A33300E0DBE4 /* MineSkillCardListInfoModel.h */, - E83645692A40A33300E0DBE4 /* MineSkillCardListInfoModel.m */, - E8B3E8072848B871009746AB /* InviteUserInfoModel.h */, - E8B3E8082848B871009746AB /* InviteUserInfoModel.m */, - E8B3E80A2848BA40009746AB /* NewUserGreetModel.h */, - E8B3E80B2848BA40009746AB /* NewUserGreetModel.m */, - 9BE01AEE2893E31700B50299 /* NewUserRechargeModel.h */, - 9BE01AEF2893E31700B50299 /* NewUserRechargeModel.m */, - 9BFB10202897D68400B3985E /* XPTabAnchorCardModel.h */, - 9BFB10212897D68400B3985E /* XPTabAnchorCardModel.m */, - 9BA3B409293DCDFD0071DF1C /* XPVersionUpdateModel.h */, - 9BA3B40A293DCDFD0071DF1C /* XPVersionUpdateModel.m */, ); path = Model; sourceTree = ""; @@ -10947,43 +2054,6 @@ path = Model; sourceTree = ""; }; - E8B846C826FDD79700A777FE /* Recharge */ = { - isa = PBXGroup; - children = ( - 1464C5F129A4C18000AF7C94 /* XPIAPRechargeViewController.h */, - 1464C5F229A4C18000AF7C94 /* XPIAPRechargeViewController.m */, - 1464C5F429A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.h */, - 1464C5F529A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.m */, - 233423D12AAF0F4F00B1253F /* XPIAPRechargeHeadCell.h */, - 233423D22AAF0F4F00B1253F /* XPIAPRechargeHeadCell.m */, - 1464C5F729A4D00000AF7C94 /* XPIAPRechargeHeaderView.h */, - 1464C5F829A4D00000AF7C94 /* XPIAPRechargeHeaderView.m */, - 5484E1FB2CA2897B008E8754 /* IAPManager.h */, - 5484E1FC2CA2897B008E8754 /* IAPManager.m */, - ); - path = Recharge; - sourceTree = ""; - }; - E8B846CC26FDD93D00A777FE /* Recharge */ = { - isa = PBXGroup; - children = ( - E8B846CD26FDD96100A777FE /* XPMineRechageHeadView.h */, - E8B846CE26FDD96100A777FE /* XPMineRechageHeadView.m */, - E89DA67327009ACD008483C1 /* XPMineRechargeNavView.h */, - E89DA67427009ACD008483C1 /* XPMineRechargeNavView.m */, - ); - path = Recharge; - sourceTree = ""; - }; - E8B846D026FDDBCD00A777FE /* Recharge */ = { - isa = PBXGroup; - children = ( - E8B846D126FDDBE600A777FE /* XPMineRechargeTableViewCell.h */, - E8B846D226FDDBE600A777FE /* XPMineRechargeTableViewCell.m */, - ); - path = Recharge; - sourceTree = ""; - }; E8B846D926FDE21900A777FE /* Recharge */ = { isa = PBXGroup; children = ( @@ -10995,63 +2065,6 @@ path = Recharge; sourceTree = ""; }; - E8C1CD5F27D88E4900376F83 /* Model */ = { - isa = PBXGroup; - children = ( - E8C1CD6E27D894B800376F83 /* RoomFaceTitleItemModel.h */, - E8C1CD6F27D894B800376F83 /* RoomFaceTitleItemModel.m */, - E8C1CD7827D8B29E00376F83 /* RoomFaceInfoModel.h */, - E8C1CD7927D8B29E00376F83 /* RoomFaceInfoModel.m */, - E87C0A9E27D9DE6400CB2241 /* RoomFaceSendInfoModel.h */, - E87C0A9F27D9DE6400CB2241 /* RoomFaceSendInfoModel.m */, - 4C1A14192DCB4AB700B6D0CA /* ChatFaceVo.h */, - 4C1A141A2DCB4AB700B6D0CA /* ChatFaceVo.m */, - ); - path = Model; - sourceTree = ""; - }; - E8C1CD6127D88E6A00376F83 /* View */ = { - isa = PBXGroup; - children = ( - E8C1CD6727D8933A00376F83 /* Cell */, - E8C1CD6427D88EF800376F83 /* XPRoomFaceViewController.h */, - E8C1CD6527D88EF800376F83 /* XPRoomFaceViewController.m */, - ); - path = View; - sourceTree = ""; - }; - E8C1CD6227D88E7900376F83 /* Presenter */ = { - isa = PBXGroup; - children = ( - E8C1CD7127D8A16500376F83 /* XPRoomFaceTool.h */, - E8C1CD7227D8A16500376F83 /* XPRoomFaceTool.m */, - E8C1CD7427D8AE3D00376F83 /* XPRoomFacePresenter.h */, - E8C1CD7527D8AE3D00376F83 /* XPRoomFacePresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E8C1CD6327D88EA300376F83 /* Protocol */ = { - isa = PBXGroup; - children = ( - E8C1CD7727D8AE5600376F83 /* XPRoomFaceProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E8C1CD6727D8933A00376F83 /* Cell */ = { - isa = PBXGroup; - children = ( - E8C1CD6827D8937800376F83 /* XPRoomFaceCollectionViewCell.h */, - E8C1CD6927D8937800376F83 /* XPRoomFaceCollectionViewCell.m */, - E8C1CD6B27D8938C00376F83 /* XPRoomFaceTitleCollectionViewCell.h */, - E8C1CD6C27D8938C00376F83 /* XPRoomFaceTitleCollectionViewCell.m */, - E87C0A9B27D9986700CB2241 /* XPRoomFaceCollectionFlowLayout.h */, - E87C0A9C27D9986700CB2241 /* XPRoomFaceCollectionFlowLayout.m */, - ); - path = Cell; - sourceTree = ""; - }; E8D34D57280821F3009C4835 /* UserInfo */ = { isa = PBXGroup; children = ( @@ -11065,196 +2078,11 @@ path = UserInfo; sourceTree = ""; }; - E8D55C9A281131F1006935A5 /* SessionToolBar */ = { - isa = PBXGroup; - children = ( - E8D55C9B28113218006935A5 /* MessageMenuModel.h */, - E8D55C9C28113218006935A5 /* MessageMenuModel.m */, - ); - path = SessionToolBar; - sourceTree = ""; - }; - E8D7D747282BA1C20007D7BD /* Cell */ = { - isa = PBXGroup; - children = ( - E8D7D749282BA1EC0007D7BD /* XPMomentsTableViewCell.h */, - E8D7D74A282BA1EC0007D7BD /* XPMomentsTableViewCell.m */, - E8098CAC282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.h */, - E8098CAD282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.m */, - E81A654A28351D9900F55894 /* XPMonentsTopicCollectionViewCell.h */, - E81A654B28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m */, - E878B8592835F3BF00E22DCF /* XPMonentsInteractiveTableViewCell.h */, - E878B85A2835F3BF00E22DCF /* XPMonentsInteractiveTableViewCell.m */, - E852D73C28631C18001465ED /* XPMonentsCommentTableViewCell.h */, - E852D73D28631C18001465ED /* XPMonentsCommentTableViewCell.m */, - E852D73F2863249F001465ED /* XPMonentsReplyTableViewCell.h */, - E852D7402863249F001465ED /* XPMonentsReplyTableViewCell.m */, - E854103728646A00005CFD9F /* XPMonentsReplyMoreTableViewCell.h */, - E854103828646A00005CFD9F /* XPMonentsReplyMoreTableViewCell.m */, - E818E34D286EDF72005EDF68 /* XPMonentsPublishCollectionViewCell.h */, - E818E34E286EDF72005EDF68 /* XPMonentsPublishCollectionViewCell.m */, - 149839C5299E0B9F00F82CBF /* XPMomentListCollectionViewCell.h */, - 149839C6299E0B9F00F82CBF /* XPMomentListCollectionViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E8D7D748282BA1C90007D7BD /* SubViews */ = { - isa = PBXGroup; - children = ( - E895017E282CAC49007E459A /* XPMomentsUserInfoView.h */, - E895017F282CAC49007E459A /* XPMomentsUserInfoView.m */, - E8950181282CAC6A007E459A /* XPMomentsPhotoView.h */, - E8950182282CAC6A007E459A /* XPMomentsPhotoView.m */, - E8950184282CAC80007E459A /* XPMomentsTooBarView.h */, - E8950185282CAC80007E459A /* XPMomentsTooBarView.m */, - E8098CAF282E86EF0090B9F0 /* XPMomentsContentView.h */, - E8098CB0282E86EF0090B9F0 /* XPMomentsContentView.m */, - E895018A282D0701007E459A /* XPMomentsTopicView.h */, - E895018B282D0701007E459A /* XPMomentsTopicView.m */, - E81A654728351B9500F55894 /* XPMomentsRecommendHeaderView.h */, - E81A654828351B9500F55894 /* XPMomentsRecommendHeaderView.m */, - E8B9842B28AB77F10022D026 /* XPMonentsPublishTopicView.h */, - E8B9842C28AB77F10022D026 /* XPMonentsPublishTopicView.m */, - E8B9842E28AB90200022D026 /* XPMoentsTopicListView.h */, - E8B9842F28AB90200022D026 /* XPMoentsTopicListView.m */, - E8B9843428ABA8B40022D026 /* XPMonentPublishSuccessView.h */, - E8B9843528ABA8B40022D026 /* XPMonentPublishSuccessView.m */, - E8AB631128ADDCF20023B0D2 /* XPMonentsTopicHeaderView.h */, - E8AB631228ADDCF20023B0D2 /* XPMonentsTopicHeaderView.m */, - ); - path = SubViews; - sourceTree = ""; - }; - E8DBB6FA27B63CC300AA285D /* LittleGame */ = { - isa = PBXGroup; - children = ( - E8DBB6FB27B63CE000AA285D /* LittleGameMicroView.h */, - E8DBB6FC27B63CE000AA285D /* LittleGameMicroView.m */, - ); - path = LittleGame; - sourceTree = ""; - }; - E8DEC9962764A51F0078CB70 /* MoreView */ = { - isa = PBXGroup; - children = ( - 4C45C1A82E6837BF00E73A44 /* Manager */, - 4C45C1A32E6825F300E73A44 /* XPTurboModeConstants.h */, - 4C45C1A42E6825F300E73A44 /* XPTurboModeConstants.m */, - 4CD47BB72E619F0B00BCDA46 /* Action */, - 4CD47BB92E619F0B00BCDA46 /* Factory */, - E8DEC99B2764A5620078CB70 /* Model */, - E8DEC99A2764A55C0078CB70 /* Api */, - E8DEC9992764A54C0078CB70 /* View */, - E8DEC9982764A5400078CB70 /* Presenter */, - E8DEC9972764A5340078CB70 /* Protocol */, - ); - path = MoreView; - sourceTree = ""; - }; - E8DEC9972764A5340078CB70 /* Protocol */ = { - isa = PBXGroup; - children = ( - E8DEC9A52764A6760078CB70 /* XPMoreMenuProtocol.h */, - ); - path = Protocol; - sourceTree = ""; - }; - E8DEC9982764A5400078CB70 /* Presenter */ = { - isa = PBXGroup; - children = ( - E8DEC9A22764A6600078CB70 /* XPMoreMenuPresenter.h */, - E8DEC9A32764A6600078CB70 /* XPMoreMenuPresenter.m */, - ); - path = Presenter; - sourceTree = ""; - }; - E8DEC9992764A54C0078CB70 /* View */ = { - isa = PBXGroup; - children = ( - 4C45C1AA2E68545E00E73A44 /* XPTurboModeTipsView.h */, - 4C45C1AB2E68545E00E73A44 /* XPTurboModeTipsView.m */, - 4C4283F42E66C769006779B0 /* XPEffectPanelViewController.h */, - 4C4283F52E66C769006779B0 /* XPEffectPanelViewController.m */, - E8DEC9A92764A6AF0078CB70 /* Cell */, - E8DEC99C2764A5B60078CB70 /* XPRoomMoreMenuViewController.h */, - E8DEC99D2764A5B60078CB70 /* XPRoomMoreMenuViewController.m */, - E8412F9427795E34006E1101 /* XPRoomInviteFansView.h */, - E8412F9527795E34006E1101 /* XPRoomInviteFansView.m */, - 4CFFEFCB2D3A4E410035D016 /* AppOfficalManagerActionsViewController.h */, - 4CFFEFCC2D3A4E410035D016 /* AppOfficalManagerActionsViewController.m */, - ); - path = View; - sourceTree = ""; - }; - E8DEC99A2764A55C0078CB70 /* Api */ = { - isa = PBXGroup; - children = ( - E8DEC9A62764A68B0078CB70 /* Api+MoreMenu.h */, - E8DEC9A72764A68B0078CB70 /* Api+MoreMenu.m */, - ); - path = Api; - sourceTree = ""; - }; - E8DEC99B2764A5620078CB70 /* Model */ = { - isa = PBXGroup; - children = ( - 4CD47BBA2E619F1700BCDA46 /* XPRoomMoreMenuAction.h */, - 4CD47BBB2E619F1700BCDA46 /* XPRoomMoreMenuAction.m */, - 4CD47BBC2E619F1700BCDA46 /* XPRoomMoreMenuActionContext.h */, - 4CD47BBD2E619F1700BCDA46 /* XPRoomMoreMenuActionContext.m */, - E8DEC99F2764A5D20078CB70 /* XPRoomMoreItemModel.h */, - E8DEC9A02764A5D20078CB70 /* XPRoomMoreItemModel.m */, - E8412F9727799249006E1101 /* InviteFansModel.h */, - E8412F9827799249006E1101 /* InviteFansModel.m */, - ); - path = Model; - sourceTree = ""; - }; - E8DEC9A92764A6AF0078CB70 /* Cell */ = { - isa = PBXGroup; - children = ( - E8DEC9AA2764A6CD0078CB70 /* XPRoomMoreMenuCollectionViewCell.h */, - E8DEC9AB2764A6CD0078CB70 /* XPRoomMoreMenuCollectionViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E8E20BDF281695430033B688 /* Setting */ = { - isa = PBXGroup; - children = ( - E8AC721126F46ADD007D6E91 /* XPMineSettingViewController.h */, - E8AC721226F46ADD007D6E91 /* XPMineSettingViewController.m */, - 2368ECD82BC3C02800EDF4C9 /* XPMineSwitchLanguageVC.h */, - 2368ECD92BC3C02800EDF4C9 /* XPMineSwitchLanguageVC.m */, - E8AC721F26F47E23007D6E91 /* XPMineAboutUsViewController.h */, - E8AC722026F47E23007D6E91 /* XPMineAboutUsViewController.m */, - E8AC722226F47E5E007D6E91 /* XPMineFeedbackViewController.h */, - E8AC722326F47E5E007D6E91 /* XPMineFeedbackViewController.m */, - E8AC722A26F49580007D6E91 /* XPMineNotificaViewController.h */, - E8AC722B26F49580007D6E91 /* XPMineNotificaViewController.m */, - E824543E26F58F9400BE8163 /* XPMinePayPwdViewController.h */, - E824543F26F58F9400BE8163 /* XPMinePayPwdViewController.m */, - E824544926F5BBB800BE8163 /* XPMineModifPayPwdViewController.h */, - E824544A26F5BBB800BE8163 /* XPMineModifPayPwdViewController.m */, - E824545F26F5F4E400BE8163 /* XPMineResetPayPwdViewController.h */, - E824546026F5F4E400BE8163 /* XPMineResetPayPwdViewController.m */, - E8E20BE0281695800033B688 /* XPMineLoginPasswordViewController.h */, - E8E20BE1281695800033B688 /* XPMineLoginPasswordViewController.m */, - E8E20BEA2816A5B90033B688 /* XPMineBlackListViewController.h */, - E8E20BEB2816A5B90033B688 /* XPMineBlackListViewController.m */, - 2305F3402AD94D5200AD403C /* XPMaskManagerVC.h */, - 2305F33F2AD94D5200AD403C /* XPMaskManagerVC.m */, - ); - path = Setting; - sourceTree = ""; - }; E8E70D6E26F2EB1200F03460 /* YMMine */ = { isa = PBXGroup; children = ( E8E70D7026F2EB3800F03460 /* Model */, E8E70D6F26F2EB2A00F03460 /* Api */, - E8E70D7126F2EB4900F03460 /* View */, E8E70D7226F2EB5100F03460 /* Presenter */, E8E70D7426F2EB6B00F03460 /* Protocol */, ); @@ -11312,115 +2140,9 @@ path = Model; sourceTree = ""; }; - E8E70D7126F2EB4900F03460 /* View */ = { - isa = PBXGroup; - children = ( - 4C886BE42E013BF7006F0BA7 /* Medals */, - 2331C12F2A5EB71000E1D940 /* Noble */, - E84A2E7E2A527DF800D6AF8A /* IncomeRecord */, - E85E7B732A4EC99200B6D00A /* GiveDiamond */, - E85E7A3B2A4EB0D200B6D00A /* Guild */, - 9BCB999D28F5716E00466D64 /* CollectRoom */, - E8E20BDF281695430033B688 /* Setting */, - E896EF912771AA6C00AD2CC1 /* Friend */, - E83953232769FF2400CF2F24 /* DressUp */, - E8E70D8026F2F3C500F03460 /* Cell */, - E8E70D7F26F2F39000F03460 /* SubViews */, - E8E70D7526F2F15100F03460 /* XPMineViewController.h */, - E8E70D7626F2F15100F03460 /* XPMineViewController.m */, - 54AE7E152C9AE589006D2BE2 /* CPListViewController.h */, - 54AE7E162C9AE589006D2BE2 /* CPListViewController.m */, - 54C9A1112C3D5A2300C6D970 /* XPGameOrdersListViewController.h */, - 54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */, - 23CEFB6A2AFB803B00576D89 /* PISwitchingEnvironmentVC.h */, - 23CEFB6B2AFB803B00576D89 /* PISwitchingEnvironmentVC.m */, - 54E8C4D42CC78DA900646C44 /* VipSettingViewController.h */, - 54E8C4D52CC78DA900646C44 /* VipSettingViewController.m */, - 23E9EA932A84BE4800B792F2 /* XPGiftUserDataViewController.h */, - 23E9EA922A84BE4800B792F2 /* XPGiftUserDataViewController.m */, - 54F469332C29711400A83655 /* XPMomentUserDataViewController.h */, - 54F469342C29711400A83655 /* XPMomentUserDataViewController.m */, - 23E9EAA42A84C97C00B792F2 /* XPMineUserInfoTagVC.h */, - 23E9EAA52A84C97C00B792F2 /* XPMineUserInfoTagVC.m */, - 9BD8D4E128911E9900AE03FF /* XPMineCollectRoomListViewController.h */, - 9BD8D4E228911E9900AE03FF /* XPMineCollectRoomListViewController.m */, - 9BD9A17A27A0EE24004186FE /* XPMineVisitorViewController.h */, - 9BD9A17B27A0EE24004186FE /* XPMineVisitorViewController.m */, - 9BD2ECCC288F829600F5CD9A /* XPMineFootPrintViewController.h */, - 9BD2ECCD288F829600F5CD9A /* XPMineFootPrintViewController.m */, - 9B1B729328002099003FACE9 /* XPMineFansTeamViewController.h */, - 9B1B729428002099003FACE9 /* XPMineFansTeamViewController.m */, - 14A6034A29A35EE600D2A6A5 /* XPMineItemTableViewCell.h */, - 14A6034B29A35EE600D2A6A5 /* XPMineItemTableViewCell.m */, - 14A6034D29A36D8300D2A6A5 /* XPSimpleMineHeaderView.h */, - 14A6034E29A36D8300D2A6A5 /* XPSimpleMineHeaderView.m */, - 1464C5E829A45FC300AF7C94 /* XPButton.h */, - 1464C5E929A45FC300AF7C94 /* XPButton.m */, - E8B846C826FDD79700A777FE /* Recharge */, - E88B5CBE26FB404800DA9178 /* MineInfo */, - 9BAA5FEB277A1BBE007453F3 /* XPPrivacyViewController.h */, - 9BAA5FEC277A1BBE007453F3 /* XPPrivacyViewController.m */, - 9BAA5FEE277A23F4007453F3 /* XPPermissionsViewController.h */, - 9BAA5FEF277A23F4007453F3 /* XPPermissionsViewController.m */, - 4C520D862D89A78C0051C784 /* VisitorListViewController.h */, - 4C520D872D89A78C0051C784 /* VisitorListViewController.m */, - ); - path = View; - sourceTree = ""; - }; E8E70D7226F2EB5100F03460 /* Presenter */ = { isa = PBXGroup; children = ( - E8E70D7826F2F16600F03460 /* XPMinePresent.h */, - E8E70D7926F2F16600F03460 /* XPMinePresent.m */, - E8AC721A26F4720B007D6E91 /* XPMineSettingPresent.h */, - E8AC721B26F4720B007D6E91 /* XPMineSettingPresent.m */, - E8098CB2282E97550090B9F0 /* XPMineBlackListPresenter.h */, - E8098CB3282E97550090B9F0 /* XPMineBlackListPresenter.m */, - E8AC722526F482A4007D6E91 /* XPMineFeedbackPresenter.h */, - E8AC722626F482A4007D6E91 /* XPMineFeedbackPresenter.m */, - E8AC723326F49939007D6E91 /* XPMineNotificaPresenter.h */, - E8AC723426F49939007D6E91 /* XPMineNotificaPresenter.m */, - E824544426F5934600BE8163 /* XPMinePayPwdPresenter.h */, - E824544526F5934600BE8163 /* XPMinePayPwdPresenter.m */, - E824544F26F5CE6E00BE8163 /* XPMineModifPayPwdPresenter.h */, - E824545026F5CE6E00BE8163 /* XPMineModifPayPwdPresenter.m */, - E824545A26F5EEBA00BE8163 /* XPMineVerifIdentityPresenter.h */, - E824545B26F5EEBA00BE8163 /* XPMineVerifIdentityPresenter.m */, - E824546226F5FF1C00BE8163 /* XPMineResetPayPasswordPresenter.h */, - E824546326F5FF1C00BE8163 /* XPMineResetPayPasswordPresenter.m */, - E8E20BE628169BDC0033B688 /* XPMineLoginPasswordPresenter.h */, - E8E20BE728169BDC0033B688 /* XPMineLoginPasswordPresenter.m */, - E87C54BC2823CC5B0051AA11 /* XPMineResetLoginPwdPresenter.h */, - E87C54BD2823CC5B0051AA11 /* XPMineResetLoginPwdPresenter.m */, - E8EEB8FF26FC31B6007C6EBA /* XPMineUserInfoPresenter.h */, - E8EEB90026FC31B6007C6EBA /* XPMineUserInfoPresenter.m */, - E8D34D5E28082BA5009C4835 /* XPMineUserDataPresenter.h */, - E8D34D5F28082BA5009C4835 /* XPMineUserDataPresenter.m */, - E873EB03280943ED0071030D /* XPMineUserInfoGiftWallPresenter.h */, - E873EB04280943ED0071030D /* XPMineUserInfoGiftWallPresenter.m */, - E8EEB90D26FC6AB8007C6EBA /* XPMineUserInfoEditPresenter.h */, - E8EEB90E26FC6AB8007C6EBA /* XPMineUserInfoEditPresenter.m */, - E8B846C326FDB41A00A777FE /* XPMineUserInfolbumPresenter.h */, - E8B846C426FDB41A00A777FE /* XPMineUserInfolbumPresenter.m */, - E8B846D426FDE01B00A777FE /* XPMineRechargePresenter.h */, - E8B846D526FDE01B00A777FE /* XPMineRechargePresenter.m */, - E896EF922771AAC100AD2CC1 /* XPMineFansPresenter.h */, - E896EF932771AAC100AD2CC1 /* XPMineFansPresenter.m */, - E896EF952771AAE400AD2CC1 /* XPMineAttentionPresenter.h */, - E896EF962771AAE400AD2CC1 /* XPMineAttentionPresenter.m */, - E84CBCE52843807400D43221 /* XPMineFriendPresenter.h */, - E84CBCE62843807400D43221 /* XPMineFriendPresenter.m */, - 9BD9A17727A0EC57004186FE /* XPMineVisitorPresenter.h */, - 9BD9A17827A0EC57004186FE /* XPMineVisitorPresenter.m */, - 9B1B729628002147003FACE9 /* XPMineFansTeamPresenter.h */, - 9B1B729728002147003FACE9 /* XPMineFansTeamPresenter.m */, - 9BD2ECD3288F838200F5CD9A /* XPMineFootPrintPresenter.h */, - 9BD2ECD4288F838200F5CD9A /* XPMineFootPrintPresenter.m */, - 9BD8D4E428911F7700AE03FF /* XPMineCollectRoomListPresenter.h */, - 9BD8D4E528911F7700AE03FF /* XPMineCollectRoomListPresenter.m */, - 4C886BE92E014AE5006F0BA7 /* MedalsPresenter.h */, - 4C886BEA2E014AE5006F0BA7 /* MedalsPresenter.m */, ); path = Presenter; sourceTree = ""; @@ -11456,111 +2178,6 @@ path = Protocol; sourceTree = ""; }; - E8E70D7F26F2F39000F03460 /* SubViews */ = { - isa = PBXGroup; - children = ( - 4C51B09D2DA50FDA00D8DFB5 /* CPRelationshipChangeView.h */, - 4C51B09E2DA50FDA00D8DFB5 /* CPRelationshipChangeView.m */, - 54AE7E122C9AD98C006D2BE2 /* CPCard.h */, - 54AE7E132C9AD9A6006D2BE2 /* CPCard.m */, - 544B19B42CA14A7100885BEB /* CPGiftBanner.h */, - 544B19B52CA14A7100885BEB /* CPGiftBanner.m */, - 544B19AE2CA1299500885BEB /* CPBindingAnimation.h */, - 544B19AF2CA1299500885BEB /* CPBindingAnimation.m */, - 544B19B12CA129A800885BEB /* CPLevelUpAnimation.h */, - 544B19B22CA129A800885BEB /* CPLevelUpAnimation.m */, - E87E545229AA05EA00EBE52B /* XPFootPrintNavView.h */, - E87E545329AA05EA00EBE52B /* XPFootPrintNavView.m */, - E8B846CC26FDD93D00A777FE /* Recharge */, - E88B5CC226FB429C00DA9178 /* MineInfo */, - E8E70D8126F2F51A00F03460 /* XPMineHeadView.h */, - E8E70D8226F2F51A00F03460 /* XPMineHeadView.m */, - E896EFB02771C93B00AD2CC1 /* XPMineFriendNumberView.h */, - E896EFB12771C93B00AD2CC1 /* XPMineFriendNumberView.m */, - 9B734F71288A787000CBDAA9 /* XPMineAccountView.h */, - 9B734F72288A787000CBDAA9 /* XPMineAccountView.m */, - 23E9EABA2A84CCBE00B792F2 /* XPMineDataSkillDataCollectionViewCell.h */, - 23E9EAB92A84CCBD00B792F2 /* XPMineDataSkillDataCollectionViewCell.m */, - E824544126F58FCE00BE8163 /* XPMinePayPwdInputView.h */, - E824544226F58FCE00BE8163 /* XPMinePayPwdInputView.m */, - E824544C26F5BC1A00BE8163 /* XPMineModifPayPwdView.h */, - E824544D26F5BC1A00BE8163 /* XPMineModifPayPwdView.m */, - E824545726F5E65900BE8163 /* XPMineVerifIdentityView.h */, - E824545826F5E65900BE8163 /* XPMineVerifIdentityView.m */, - 23E9EA982A84C39600B792F2 /* XPMineUserInfoRecordedSoundView.h */, - 23E9EA992A84C39700B792F2 /* XPMineUserInfoRecordedSoundView.m */, - 9BE01ACC28925F7D00B50299 /* XPMineNewUserRechargeView.h */, - 9BE01ACD28925F7D00B50299 /* XPMineNewUserRechargeView.m */, - 4C815A152CFEB758002A46A6 /* SuperBlockViewController.h */, - 4C815A162CFEB758002A46A6 /* SuperBlockViewController.m */, - 4C75CEFC2D632CD5009147A5 /* CPEnterRoomTableViewCell.h */, - 4C75CEFD2D632CD5009147A5 /* CPEnterRoomTableViewCell.m */, - ); - path = SubViews; - sourceTree = ""; - }; - E8E70D8026F2F3C500F03460 /* Cell */ = { - isa = PBXGroup; - children = ( - 9BD2ECD7288F865900F5CD9A /* FootPrint */, - 9B1B729E280023D5003FACE9 /* AnchorFansTeam */, - E896EFA32771AEC500AD2CC1 /* Friend */, - 9BD9A17D27A0EFB1004186FE /* Visitor */, - E8B846D026FDDBCD00A777FE /* Recharge */, - E8EEB8F826FC285B007C6EBA /* MineInfo */, - E8E70D8A26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.h */, - E8E70D8B26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.m */, - E8AC721426F46B06007D6E91 /* XPMineSettingTableViewCell.h */, - E8AC721526F46B06007D6E91 /* XPMineSettingTableViewCell.m */, - 2368ECDD2BC51B2D00EDF4C9 /* XPMineSwitchLanguageCell.h */, - 2368ECDE2BC51B2D00EDF4C9 /* XPMineSwitchLanguageCell.m */, - E8AC723026F49710007D6E91 /* XPMineNotificationTableViewCell.h */, - E8AC723126F49710007D6E91 /* XPMineNotificationTableViewCell.m */, - 9B92A33A2797E38100AD168F /* XPMineHeadItemTableViewCell.h */, - 9B92A33B2797E38100AD168F /* XPMineHeadItemTableViewCell.m */, - 9BCFB826289BAC7D0093D863 /* XPMineHeadFunctionItemLayout.h */, - 9BCFB827289BAC7D0093D863 /* XPMineHeadFunctionItemLayout.m */, - E8E20BED2816A5FC0033B688 /* XPMineBlackListTableViewCell.h */, - E8E20BEE2816A5FC0033B688 /* XPMineBlackListTableViewCell.m */, - E85E7BBA2A4EE70B00B6D00A /* XPMineTheGuildCell.h */, - E85E7BBB2A4EE70B00B6D00A /* XPMineTheGuildCell.m */, - E85E7BBD2A4EE7AC00B6D00A /* XPMinePersonalCenterCell.h */, - E85E7BBE2A4EE7AC00B6D00A /* XPMinePersonalCenterCell.m */, - E85E7BC02A4EE82300B6D00A /* XPMineListCell.h */, - E85E7BC12A4EE82300B6D00A /* XPMineListCell.m */, - 236B2E582AA18E12003967A8 /* XPMIneGameCollectionViewCell.h */, - 236B2E552AA18E12003967A8 /* XPMIneGameCollectionViewCell.m */, - 236B2E562AA18E12003967A8 /* XPMineGameTableViewCell.h */, - 236B2E572AA18E12003967A8 /* XPMineGameTableViewCell.m */, - 54C9A1142C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.h */, - 54C9A1152C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m */, - ); - path = Cell; - sourceTree = ""; - }; - E8E859E628264F0000EE4857 /* BackMusic */ = { - isa = PBXGroup; - children = ( - E82E74F92828B1FC00C25EF7 /* Model */, - E8E859EA28264F4C00EE4857 /* View */, - E82E74FA2828B20F00C25EF7 /* Presenter */, - ); - path = BackMusic; - sourceTree = ""; - }; - E8E859EA28264F4C00EE4857 /* View */ = { - isa = PBXGroup; - children = ( - E88C729D2828FCB10047FB2B /* SubViews */, - E88C72962828F3410047FB2B /* Cell */, - E8E859E728264F4500EE4857 /* XPRoomTransferMusicViewController.h */, - E8E859E828264F4500EE4857 /* XPRoomTransferMusicViewController.m */, - E88C72932828F1AD0047FB2B /* XPRoomMusicLibraryViewController.h */, - E88C72942828F1AD0047FB2B /* XPRoomMusicLibraryViewController.m */, - ); - path = View; - sourceTree = ""; - }; E8EEB8EA26FC2050007C6EBA /* SDPhotoBrowser */ = { isa = PBXGroup; children = ( @@ -11575,45 +2192,6 @@ path = SDPhotoBrowser; sourceTree = ""; }; - E8EEB8F826FC285B007C6EBA /* MineInfo */ = { - isa = PBXGroup; - children = ( - E8EEB90726FC579A007C6EBA /* XPMineUserInfoEditTableViewCell.h */, - E8EEB90826FC579A007C6EBA /* XPMineUserInfoEditTableViewCell.m */, - 23E9EB172A84D0E700B792F2 /* XPMineUserInfoEditMainTagView.h */, - 23E9EB162A84D0E700B792F2 /* XPMineUserInfoEditMainTagView.m */, - 23E9EB192A84D28900B792F2 /* XPMineUserInfoEditTagView.h */, - 23E9EB1A2A84D28A00B792F2 /* XPMineUserInfoEditTagView.m */, - E8B846C026FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.h */, - E8B846C126FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.m */, - E8D34D4B28080351009C4835 /* XPMineDataClanTableViewCell.h */, - E8D34D4C28080351009C4835 /* XPMineDataClanTableViewCell.m */, - 54F469362C29C3B400A83655 /* XPMineAlbumTableViewCell.h */, - 54F469372C29C3B400A83655 /* XPMineAlbumTableViewCell.m */, - 54B9C6F12C9D27F3003F1CC5 /* XPMineMultipleContentTableViewCell.h */, - 54B9C6F22C9D27F3003F1CC5 /* XPMineMultipleContentTableViewCell.m */, - 54B9C6E52C9C2CA1003F1CC5 /* XPMineGuildTableViewCell.h */, - 54B9C6E62C9C2CA1003F1CC5 /* XPMineGuildTableViewCell.m */, - 54F4693C2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.h */, - 54F4693D2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m */, - 54F4693F2C2AB56900A83655 /* XPMineGiftsTableViewCell.h */, - 54F469402C2AB56900A83655 /* XPMineGiftsTableViewCell.m */, - E8D34D4E28080362009C4835 /* XPMineDataGiftTableViewCell.h */, - E8D34D4F28080362009C4835 /* XPMineDataGiftTableViewCell.m */, - E8D34D5428080393009C4835 /* XPMineDataGiftCollectionViewCell.h */, - E8D34D5528080393009C4835 /* XPMineDataGiftCollectionViewCell.m */, - E8D34D6528084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.h */, - E8D34D6628084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m */, - E873EB00280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.h */, - E873EB01280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.m */, - 54C9A10B2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.h */, - 54C9A10C2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m */, - 54C9A10E2C3D3E1700C6D970 /* XPMineGameMateOrderView.h */, - 54C9A10F2C3D3E1700C6D970 /* XPMineGameMateOrderView.m */, - ); - path = MineInfo; - sourceTree = ""; - }; E8F61356291E269700E12650 /* Safe */ = { isa = PBXGroup; children = ( @@ -11672,13 +2250,6 @@ knownRegions = ( en, Base, - "zh-Hant", - ar, - tr, - "pt-BR", - ru, - "uz-UZ", - es, ); mainGroup = 189DD52026DE255300AB55B1; productRefGroup = 189DD52A26DE255300AB55B1 /* Products */; @@ -11696,241 +2267,18 @@ buildActionMask = 2147483647; files = ( 23116B0B2BDB8FDC00F7F97A /* PrivacyInfo.xcprivacy in Resources */, - 54B9C6FB2C9DA4C4003F1CC5 /* CP绑定.mp4 in Resources */, - 4CAE69C52E69922B00A9FC35 /* mic_cp_lv1.svga in Resources */, - 4CAE69C62E69922B00A9FC35 /* mic_cp_lv2.svga in Resources */, - 4CAE69C72E69922B00A9FC35 /* mic_cp_lv4.svga in Resources */, - 4CAE69C82E69922B00A9FC35 /* mic_cp_lv5.svga in Resources */, - 4CAE69C92E69922B00A9FC35 /* mic_cp_lv3.svga in Resources */, 23CEFC5A2AFB8FC100576D89 /* pay_on.png in Resources */, 2368ECD32BC38FDA00EDF4C9 /* Launch Screen.storyboard in Resources */, - 23EE96F22B9FF6BE00475D69 /* pi_crazy_zoo.svga in Resources */, - 4C13929D2D70441500A6DFB5 /* giftgift.mp4 in Resources */, 23CEFC582AFB8FC100576D89 /* pay_on@3x.png in Resources */, - 23FF25622ABAE6310064E904 /* pi_room_game_fine_love.svga in Resources */, - 23FF42672AA5CFBB0055733C /* home_sound_wave.gif in Resources */, 4C7B90982E9F70FC00A5E236 /* ep_splash.png in Resources */, - 4C1392A12D71675900A6DFB5 /* coincoin.mp4 in Resources */, E80E09A92A40B70100CD2BE7 /* Localizable.strings in Resources */, - 4CACCCE42D9A695000CCB135 /* brove_gift.svga in Resources */, - 237701192BD6143700D661F1 /* pi_happy_egg_smash.svga in Resources */, - 544B19BC2CA169BE00885BEB /* level up 3.svga in Resources */, - 544B19BD2CA169BE00885BEB /* level up 4.svga in Resources */, - 544B19BE2CA169BE00885BEB /* level up 5.svga in Resources */, - 544B19BF2CA169BE00885BEB /* level up 1.svga in Resources */, - 544B19C02CA169BE00885BEB /* level up 2.svga in Resources */, - 54FFD3812C9BD12600DE61E5 /* 4.svga in Resources */, - 54FFD3822C9BD12600DE61E5 /* 1.svga in Resources */, - 54FFD3832C9BD12600DE61E5 /* 5.svga in Resources */, - 54FFD3842C9BD12600DE61E5 /* 3.svga in Resources */, - 54FFD3852C9BD12600DE61E5 /* 2.svga in Resources */, - 54C608522CBE0BEB003DD5D2 /* game_floating_bg.svga in Resources */, 2368ECCF2BC38F9800EDF4C9 /* InfoPlist.strings in Resources */, - 2368ECE72BC5280300EDF4C9 /* css in Resources */, - 2368ECE92BC5280300EDF4C9 /* js in Resources */, 23CEFC532AFB8FC100576D89 /* readMe_FileOption.txt in Resources */, - 23E9EB252A84E98300B792F2 /* pi_new_mine_info_online.svga in Resources */, - 2368ECEB2BC5280300EDF4C9 /* upload.html in Resources */, - 546104112CD4B46F00066B21 /* gift_normal_1.svga in Resources */, - 546104122CD4B46F00066B21 /* gift_normal_3.svga in Resources */, - 546104132CD4B46F00066B21 /* gift_VIP_2.svga in Resources */, - 546104142CD4B46F00066B21 /* gift_normal_2.svga in Resources */, - 546104152CD4B46F00066B21 /* gift_VIP_1.svga in Resources */, - 546104162CD4B46F00066B21 /* gift_VIP_3.svga in Resources */, - 23A03F2D2B4408CD0094227A /* pi_room_lucky_gift.svga in Resources */, - 2368ECEA2BC5280300EDF4C9 /* index.html in Resources */, - 4CD19DCA2E9CDF980069DAA0 /* emoji_124@2x.png in Resources */, - 4CD19DCB2E9CDF980069DAA0 /* emoji_36@2x.png in Resources */, - 4CD19DCC2E9CDF980069DAA0 /* emoji_75@2x.png in Resources */, - 4CD19DCD2E9CDF980069DAA0 /* emoji_57@2x.png in Resources */, - 4CD19DCE2E9CDF980069DAA0 /* emoji_164@2x.png in Resources */, - 4CD19DCF2E9CDF980069DAA0 /* emoji_04@2x.png in Resources */, - 4CD19DD02E9CDF980069DAA0 /* emoji_84@2x.png in Resources */, - 4CD19DD12E9CDF980069DAA0 /* emoji_58@2x.png in Resources */, - 4CD19DD22E9CDF980069DAA0 /* emoji_41@2x.png in Resources */, - 4CD19DD32E9CDF980069DAA0 /* emoj_s_normal@2x.png in Resources */, - 4CD19DD42E9CDF980069DAA0 /* emoji_60@2x.png in Resources */, - 4CD19DD52E9CDF980069DAA0 /* emoji_117@2x.png in Resources */, - 4CD19DD62E9CDF980069DAA0 /* emoji_48@2x.png in Resources */, - 4CD19DD72E9CDF980069DAA0 /* emoji_92@2x.png in Resources */, - 4CD19DD82E9CDF980069DAA0 /* emoji_104@2x.png in Resources */, - 4CD19DD92E9CDF980069DAA0 /* emoji_53@2x.png in Resources */, - 4CD19DDA2E9CDF980069DAA0 /* emoji_26@2x.png in Resources */, - 4CD19DDB2E9CDF980069DAA0 /* emoji_103@2x.png in Resources */, - 4CD19DDC2E9CDF980069DAA0 /* emoji_90@2x.png in Resources */, - 4CD19DDD2E9CDF980069DAA0 /* emoji_37@2x.png in Resources */, - 4CD19DDE2E9CDF980069DAA0 /* emoji_132@2x.png in Resources */, - 4CD19DDF2E9CDF980069DAA0 /* emoji_67@2x.png in Resources */, - 4CD19DE02E9CDF980069DAA0 /* emoji_42@2x.png in Resources */, - 4CD19DE12E9CDF980069DAA0 /* emoji_99@2x.png in Resources */, - 4CD19DE22E9CDF980069DAA0 /* emoji_165@2x.png in Resources */, - 4CD19DE32E9CDF980069DAA0 /* emoji_46@2x.png in Resources */, - 4CD19DE42E9CDF980069DAA0 /* emoji.xml in Resources */, - 4CD19DE52E9CDF980069DAA0 /* emoji_52@2x.png in Resources */, - 4CD19DE62E9CDF980069DAA0 /* emoji_59@2x.png in Resources */, - 4CD19DE72E9CDF980069DAA0 /* emoji_25@2x.png in Resources */, - 4CD19DE82E9CDF980069DAA0 /* emoji_152@2x.png in Resources */, - 4CD19DE92E9CDF980069DAA0 /* emoji_163@2x.png in Resources */, - 4CD19DEA2E9CDF980069DAA0 /* emoji_146@2x.png in Resources */, - 4CD19DEB2E9CDF980069DAA0 /* emoji_134@2x.png in Resources */, - 4CD19DEC2E9CDF980069DAA0 /* emoji_19@2x.png in Resources */, - 4CD19DED2E9CDF980069DAA0 /* emoji_del_pressed@2x.png in Resources */, - 4CD19DEE2E9CDF980069DAA0 /* emoji.plist in Resources */, - 4CD19DEF2E9CDF980069DAA0 /* emoji_109@2x.png in Resources */, - 4CD19DF02E9CDF980069DAA0 /* emoji_44@2x.png in Resources */, - 4CD19DF12E9CDF980069DAA0 /* emoji_123@2x.png in Resources */, - 4CD19DF22E9CDF980069DAA0 /* emoji_122@2x.png in Resources */, - 4CD19DF32E9CDF980069DAA0 /* emoji_64@2x.png in Resources */, - 4CD19DF42E9CDF980069DAA0 /* emoji_01@2x.png in Resources */, - 4CD19DF52E9CDF980069DAA0 /* emoji_94@2x.png in Resources */, - 4CD19DF62E9CDF980069DAA0 /* emoji_135@2x.png in Resources */, - 4CD19DF72E9CDF980069DAA0 /* emoji_23@2x.png in Resources */, - 4CD19DF82E9CDF980069DAA0 /* emoji_66@2x.png in Resources */, - 4CD19DF92E9CDF980069DAA0 /* emoji_55@2x.png in Resources */, - 4CD19DFA2E9CDF980069DAA0 /* emoji_13@2x.png in Resources */, - 4CD19DFB2E9CDF980069DAA0 /* emoji_00@2x.png in Resources */, - 4CD19DFC2E9CDF980069DAA0 /* emoji_12@2x.png in Resources */, - 4CD19DFD2E9CDF980069DAA0 /* emoji_71@2x.png in Resources */, - 4CD19DFE2E9CDF980069DAA0 /* emoji_144@2x.png in Resources */, - 4CD19DFF2E9CDF980069DAA0 /* emoji_72@2x.png in Resources */, - 4CD19E002E9CDF980069DAA0 /* emoji_136@2x.png in Resources */, - 4CD19E012E9CDF980069DAA0 /* emoji_127@2x.png in Resources */, - 4CD19E022E9CDF980069DAA0 /* emoji_33@2x.png in Resources */, - 4CD19E032E9CDF980069DAA0 /* emoji_120@2x.png in Resources */, - 4CD19E042E9CDF980069DAA0 /* emoji_17@2x.png in Resources */, - 4CD19E052E9CDF980069DAA0 /* emoji_07@2x.png in Resources */, - 4CD19E062E9CDF980069DAA0 /* emoji_149@2x.png in Resources */, - 4CD19E072E9CDF980069DAA0 /* emoji_49@2x.png in Resources */, - 4CD19E082E9CDF980069DAA0 /* emoji_133@2x.png in Resources */, - 4CD19E092E9CDF980069DAA0 /* emoji_91@2x.png in Resources */, - 4CD19E0A2E9CDF980069DAA0 /* emoji_148@2x.png in Resources */, - 4CD19E0B2E9CDF980069DAA0 /* emoji_93@2x.png in Resources */, - 4CD19E0C2E9CDF980069DAA0 /* emoji_162@2x.png in Resources */, - 4CD19E0D2E9CDF980069DAA0 /* emoji_100@2x.png in Resources */, - 4CD19E0E2E9CDF980069DAA0 /* emoji_115@2x.png in Resources */, - 4CD19E0F2E9CDF980069DAA0 /* emoji_05@2x.png in Resources */, - 4CD19E102E9CDF980069DAA0 /* emoji_11@2x.png in Resources */, - 4CD19E112E9CDF980069DAA0 /* emoji_81@2x.png in Resources */, - 4CD19E122E9CDF980069DAA0 /* emoji_38@2x.png in Resources */, - 4CD19E132E9CDF980069DAA0 /* emoji_31@2x.png in Resources */, - 4CD19E142E9CDF980069DAA0 /* emoji_35@2x.png in Resources */, - 4CD19E152E9CDF980069DAA0 /* emoji_126@2x.png in Resources */, - 4CD19E162E9CDF980069DAA0 /* emoji_32@2x.png in Resources */, - 4CD19E172E9CDF980069DAA0 /* emoji_40@2x.png in Resources */, - 4CD19E182E9CDF980069DAA0 /* emoji_45@2x.png in Resources */, - 4CD19E192E9CDF980069DAA0 /* emoji_200@2x.png in Resources */, - 4CD19E1A2E9CDF980069DAA0 /* emoji_143@2x.png in Resources */, - 4CD19E1B2E9CDF980069DAA0 /* emoji_39@2x.png in Resources */, - 4CD19E1C2E9CDF980069DAA0 /* emoji_111@2x.png in Resources */, - 4CD19E1D2E9CDF980069DAA0 /* emoji_151@2x.png in Resources */, - 4CD19E1E2E9CDF980069DAA0 /* emoji_119@2x.png in Resources */, - 4CD19E1F2E9CDF980069DAA0 /* emoji_101@2x.png in Resources */, - 4CD19E202E9CDF980069DAA0 /* emoji_83@2x.png in Resources */, - 4CD19E212E9CDF980069DAA0 /* emoji_24@2x.png in Resources */, - 4CD19E222E9CDF980069DAA0 /* emoji_110@2x.png in Resources */, - 4CD19E232E9CDF980069DAA0 /* emoji_02@2x.png in Resources */, - 4CD19E242E9CDF980069DAA0 /* emoji_61@2x.png in Resources */, - 4CD19E252E9CDF980069DAA0 /* emoji_06@2x.png in Resources */, - 4CD19E262E9CDF980069DAA0 /* emoji_97@2x.png in Resources */, - 4CD19E272E9CDF980069DAA0 /* emoji_88@2x.png in Resources */, - 4CD19E282E9CDF980069DAA0 /* emoji_128@2x.png in Resources */, - 4CD19E292E9CDF980069DAA0 /* emoji_166@2x.png in Resources */, - 4CD19E2A2E9CDF980069DAA0 /* emoji_50@2x.png in Resources */, - 4CD19E2B2E9CDF980069DAA0 /* emoji_20@2x.png in Resources */, - 4CD19E2C2E9CDF980069DAA0 /* emoji_96@2x.png in Resources */, - 4CD19E2D2E9CDF980069DAA0 /* emoji_54@2x.png in Resources */, - 4CD19E2E2E9CDF980069DAA0 /* emoji_140@2x.png in Resources */, - 4CD19E2F2E9CDF980069DAA0 /* emoji_62@2x.png in Resources */, - 4CD19E302E9CDF980069DAA0 /* emoji_86@2x.png in Resources */, - 4CD19E312E9CDF980069DAA0 /* emoj_s_pressed@2x.png in Resources */, - 4CD19E322E9CDF980069DAA0 /* emoji_130@2x.png in Resources */, - 4CD19E332E9CDF980069DAA0 /* emoji_141@2x.png in Resources */, - 4CD19E342E9CDF980069DAA0 /* emoji_106@2x.png in Resources */, - 4CD19E352E9CDF980069DAA0 /* emoji_85@2x.png in Resources */, - 4CD19E362E9CDF980069DAA0 /* emoji_98@2x.png in Resources */, - 4CD19E372E9CDF980069DAA0 /* emoji_69@2x.png in Resources */, - 4CD19E382E9CDF980069DAA0 /* emoji_107@2x.png in Resources */, - 4CD19E392E9CDF980069DAA0 /* emoji_95@2x.png in Resources */, - 4CD19E3A2E9CDF980069DAA0 /* emoji_del_normal@2x.png in Resources */, - 4CD19E3B2E9CDF980069DAA0 /* emoji_09@2x.png in Resources */, - 4CD19E3C2E9CDF980069DAA0 /* emoji_08@2x.png in Resources */, - 4CD19E3D2E9CDF980069DAA0 /* emoji_121@2x.png in Resources */, - 4CD19E3E2E9CDF980069DAA0 /* emoji_113@2x.png in Resources */, - 4CD19E3F2E9CDF980069DAA0 /* emoji_15@2x.png in Resources */, - 4CD19E402E9CDF980069DAA0 /* emoji_29@2x.png in Resources */, - 4CD19E412E9CDF980069DAA0 /* emoji_73@2x.png in Resources */, - 4CD19E422E9CDF980069DAA0 /* Assets.xcassets in Resources */, - 4CD19E432E9CDF980069DAA0 /* emoji_51@2x.png in Resources */, - 4CD19E442E9CDF980069DAA0 /* emoji_137@2x.png in Resources */, - 4CD19E452E9CDF980069DAA0 /* emoji_78@2x.png in Resources */, - 4CD19E462E9CDF980069DAA0 /* emoji_74@2x.png in Resources */, - 4CD19E472E9CDF980069DAA0 /* emoji_68@2x.png in Resources */, - 4CD19E482E9CDF980069DAA0 /* emoji_112@2x.png in Resources */, - 4CD19E492E9CDF980069DAA0 /* emoji_129@2x.png in Resources */, - 4CD19E4A2E9CDF980069DAA0 /* emoji_18@2x.png in Resources */, - 4CD19E4B2E9CDF980069DAA0 /* emoji_150@2x.png in Resources */, - 4CD19E4C2E9CDF980069DAA0 /* emoji_125@2x.png in Resources */, - 4CD19E4D2E9CDF980069DAA0 /* emoji_160@2x.png in Resources */, - 4CD19E4E2E9CDF980069DAA0 /* emoji_105@2x.png in Resources */, - 4CD19E4F2E9CDF980069DAA0 /* emoji_131@2x.png in Resources */, - 4CD19E502E9CDF980069DAA0 /* emoji_76@2x.png in Resources */, - 4CD19E512E9CDF980069DAA0 /* emoji_79@2x.png in Resources */, - 4CD19E522E9CDF980069DAA0 /* emoji_16@2x.png in Resources */, - 4CD19E532E9CDF980069DAA0 /* emoji_22@2x.png in Resources */, - 4CD19E542E9CDF980069DAA0 /* emoji_30@2x.png in Resources */, - 4CD19E552E9CDF980069DAA0 /* emoji_142@2x.png in Resources */, - 4CD19E562E9CDF980069DAA0 /* emoji_27@2x.png in Resources */, - 4CD19E572E9CDF980069DAA0 /* emoji_145@2x.png in Resources */, - 4CD19E582E9CDF980069DAA0 /* emoji_70@2x.png in Resources */, - 4CD19E592E9CDF980069DAA0 /* emoji_139@2x.png in Resources */, - 4CD19E5A2E9CDF980069DAA0 /* emoji_63@2x.png in Resources */, - 4CD19E5B2E9CDF980069DAA0 /* emoji_80@2x.png in Resources */, - 4CD19E5C2E9CDF980069DAA0 /* emoji_65@2x.png in Resources */, - 4CD19E5D2E9CDF980069DAA0 /* emoji_87@2x.png in Resources */, - 4CD19E5E2E9CDF980069DAA0 /* emoji_108@2x.png in Resources */, - 4CD19E5F2E9CDF980069DAA0 /* emoji_03@2x.png in Resources */, - 4CD19E602E9CDF980069DAA0 /* emoji_102@2x.png in Resources */, - 4CD19E612E9CDF980069DAA0 /* emoji_28@2x.png in Resources */, - 4CD19E622E9CDF980069DAA0 /* emoji_56@2x.png in Resources */, - 4CD19E632E9CDF980069DAA0 /* emoji_89@2x.png in Resources */, - 4CD19E642E9CDF980069DAA0 /* emoji_14@2x.png in Resources */, - 4CD19E652E9CDF980069DAA0 /* emoji_82@2x.png in Resources */, - 4CD19E662E9CDF980069DAA0 /* emoji_47@2x.png in Resources */, - 4CD19E672E9CDF980069DAA0 /* emoji_138@2x.png in Resources */, - 4CD19E682E9CDF980069DAA0 /* emoji_34@2x.png in Resources */, - 4CD19E692E9CDF980069DAA0 /* emoji_116@2x.png in Resources */, - 4CD19E6A2E9CDF980069DAA0 /* emoji_43@2x.png in Resources */, - 4CD19E6B2E9CDF980069DAA0 /* emoji_147@2x.png in Resources */, - 4CD19E6C2E9CDF980069DAA0 /* emoji_10@2x.png in Resources */, - 4CD19E6D2E9CDF980069DAA0 /* emoji_77@2x.png in Resources */, - 4CD19E6E2E9CDF980069DAA0 /* emoji_114@2x.png in Resources */, - 4CD19E6F2E9CDF980069DAA0 /* emoji_161@2x.png in Resources */, - 4CD19E702E9CDF980069DAA0 /* emoji_118@2x.png in Resources */, - 4CD19E712E9CDF980069DAA0 /* emoji_21@2x.png in Resources */, - 23FF255B2AB956D50064E904 /* pi_home_new_pk.svga in Resources */, 23CEFC592AFB8FC100576D89 /* pay_on@2x.png in Resources */, - 23FF25702ABD456C0064E904 /* pi_home_new_play.svga in Resources */, - 2368ECE82BC5280300EDF4C9 /* images in Resources */, - 2369F9932A8B21EB00563B48 /* pi_treasure_fairy_gift_bg.svga in Resources */, - 9B0997A127F19D8A00EB8F14 /* README.md in Resources */, - 54B9C6F72C9D8D05003F1CC5 /* 4.mp4 in Resources */, - 54B9C6F82C9D8D05003F1CC5 /* 5.mp4 in Resources */, - 54B9C6F92C9D8D05003F1CC5 /* 3.mp4 in Resources */, - 54F179072C8EA48C00CB5219 /* Combo_Boom.svga in Resources */, - 23E9E9B72A82200500B792F2 /* GoogleService-Info.plist in Resources */, 189DD53926DE255600AB55B1 /* Assets.xcassets in Resources */, - 237700CF2BC697D500D661F1 /* pi_login_new_logo.png in Resources */, 23CEFC562AFB8FC100576D89 /* pay_off.png in Resources */, - 237FD35D2C0F187B00B5335C /* pi_app_logo_new_bg.png in Resources */, - 23E9EAA32A84C80300B792F2 /* pi_new_loading.svga in Resources */, - 239D0F9B2BFC9E6C002977CE /* ms_room_gift_svga_icon.svga in Resources */, - 2368ECEC2BC5280300EDF4C9 /* local in Resources */, - 23E9EB242A84E98300B792F2 /* pi_new_mine_info_sound_play.svga in Resources */, - 4CA5A3342D93D4AB00CE41D6 /* 大.svga in Resources */, 23CEFC552AFB8FC100576D89 /* pay_off@3x.png in Resources */, 23CEFC572AFB8FC100576D89 /* pay_off@2x.png in Resources */, - 2396FCE42B22BE5D0014021D /* pi_area_info.json in Resources */, - 4C75CF002D633C27009147A5 /* CP进场.svga in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -12008,140 +2356,41 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9BE01ADA289296B500B50299 /* XPDressUpShopPresenter.m in Sources */, - E8751E6628A6465A0056EF44 /* XPSailingRankSubView.m in Sources */, - 9B2EA7C32804052E00ED17BF /* AnchorPKMicroView.m in Sources */, - E8F65C1F286998C9009BB5B9 /* XPMineShareViewController.m in Sources */, - E85E7BAB2A4EC99300B6D00A /* XPMineChooseGiveGiftView.m in Sources */, - E85E7B3D2A4EB0D300B6D00A /* XPGuildIncomeDetailCollectionViewCell.m in Sources */, - 181D7F1B2726CE2A00B7C059 /* StageView.m in Sources */, - 18EE3FF12750D2AD00A452BF /* NIMTimeUtils.m in Sources */, - E84BF7DA277C72AC00EF8877 /* XPRoomRoleTableViewCell.m in Sources */, - E839532D276A030F00CF2F24 /* XPMineDressUpListViewController.m in Sources */, - E821077B2987D4AB00DE7040 /* MessageFindNewGreetModel.m in Sources */, 4C886BF22E015D61006F0BA7 /* MedalsModel.m in Sources */, - E85E7BA32A4EC99300B6D00A /* XPMineGiveDiamondDetailsVC.m in Sources */, - 4CD47BB52E61514900BCDA46 /* StageViewManager.m in Sources */, - 238A90072BA9729200828123 /* PIUniversalBannerView.m in Sources */, E8B846D826FDE17300A777FE /* XPMineRechargeProtocol.h in Sources */, - E88C72A6282921D60047FB2B /* XPRoomBackMusicPlayerView.m in Sources */, - E84CBCE72843807500D43221 /* XPMineFriendPresenter.m in Sources */, - E82D5C7D276B343300858D6D /* YYAnimatedImageView+ImageShow.m in Sources */, - 4CF3CE2B2E0403500071101F /* MedalsWearingControlCollectionViewCell.m in Sources */, E8B846C726FDB45000A777FE /* XPMineUserInfoAlbumProtocol.h in Sources */, - 9B1EF3D527E8294B00554295 /* XPMineDressEmptyCollectionViewCell.m in Sources */, - 4CFBE0CD2DAD0FC400A923AF /* PIGiftBravoGiftBroadcastView.m in Sources */, - E890BC07273CF1800007C46B /* XPGiftCountCollectionViewCell.m in Sources */, - E88C72A02828FCD40047FB2B /* XPMusicLibraryPlayView.m in Sources */, - 235A451A2B04A352009753F5 /* PIRoomActivityWebView.m in Sources */, - 4CBDC4242DC0B078005A75B9 /* EventCenterViewController.m in Sources */, E8EEB91126FC6AE2007C6EBA /* XPMineUserInfoEditProtocol.h in Sources */, - E87E625D2A3F5622002F68C9 /* XPNewHomeViewController.m in Sources */, - E85E7B202A4EB0D300B6D00A /* XPMineGuildIncomeDetailViewController.m in Sources */, - E84A2EA82A5288FD00D6AF8A /* XPGoldDetailsChooseRoomCell.m in Sources */, - 2331C1AF2A60F32D00E1D940 /* XPCandyTreeRankView.m in Sources */, 180116FC279E8CCE00F2CBC0 /* NVDate.m in Sources */, - E801275827E347FD00BAC3F2 /* RoomPKRecordModel.m in Sources */, - E8E0DAE0285C20E500566A2F /* MessageContentFindNewGreetView.m in Sources */, 54B9C6EA2C9C2DDC003F1CC5 /* GuildInfo.m in Sources */, 234D821E2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m in Sources */, - 23B2AEC12A64E9C200543D17 /* LoginForgetEditView.m in Sources */, E8EEB90326FC31DC007C6EBA /* XPMineUserInfoProtocol.h in Sources */, - E8232603274E4AA0003A3332 /* ThemeColor+UserCard.m in Sources */, - E87A24F1272935920086A794 /* XPMessageRemoteExtModel.m in Sources */, - 4C5527BC2D1BDCDE00833FFD /* RoomLevelInfoModel.m in Sources */, - E8D34D5028080362009C4835 /* XPMineDataGiftTableViewCell.m in Sources */, - E87C54BE2823CC5B0051AA11 /* XPMineResetLoginPwdPresenter.m in Sources */, - 237852A42C082A9800E360AC /* MSRoomGameSendTextView.m in Sources */, - E85E7B322A4EB0D300B6D00A /* XPGuildAnchorIncomeSectionView.m in Sources */, - 4C84A9CB2E602B1A002C10FC /* BuglyManager.m in Sources */, - E87C0AA027D9DE6400CB2241 /* RoomFaceSendInfoModel.m in Sources */, - 1464C5F629A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.m in Sources */, - E8751E6328A646400056EF44 /* XPSailingRankView.m in Sources */, - 23C9DFCC2B85DD8B00B51558 /* PIGuildAnchorIncomeSectionView.m in Sources */, 4C4707A52D53430300C8CD24 /* NSData+GZIP.m in Sources */, - 9BD9A18027A0EFC7004186FE /* XPMineVisitorTableViewCell.m in Sources */, 4C6C92C02D1172D9000A4693 /* RegionListInfo.m in Sources */, - 233423D02AAEFBC300B1253F /* PICandyTreeSetModel.m in Sources */, - E85E7B112A4EB0D200B6D00A /* GuildPersonIncomeRecordModel.m in Sources */, - 54283CEB2CE48B71009729B5 /* ShoppingMallCategoryListView.m in Sources */, - 548E01CC2C3FB1C70071C83D /* i18nGiftNameMap.m in Sources */, - 4CA532B42D5AEE9400B8F59F /* Api+LuckyPackage.m in Sources */, 9BD2ECD2288F833B00F5CD9A /* XPMineFootPrintModel.m in Sources */, E824546626F5FF6000BE8163 /* XPMineResetPayPasswordProtocol.h in Sources */, - 23D321E22ADFD0FB006B259C /* PIRedPacketChooseTypeCell.m in Sources */, E824545E26F5EF2200BE8163 /* XPMineVerifIdentityProtocol.h in Sources */, E824545326F5CEAD00BE8163 /* XPMineModifPayProtocol.h in Sources */, - E84BF7D7277C6E2100EF8877 /* XPRoomRoleViewController.m in Sources */, - E85E7B242A4EB0D300B6D00A /* XPMineGuildSuperAdminSetViewController.m in Sources */, - E87DF4C22A42C900009C1185 /* XPNoteView.m in Sources */, - E8AB631328ADDCF20023B0D2 /* XPMonentsTopicHeaderView.m in Sources */, - 4C84A9C22E5ED593002C10FC /* GameBannerGestureManager.m in Sources */, - 23E9E9982A80C3A100B792F2 /* XPMineGuildPersonalBillStatisVC.m in Sources */, - 9B86D886281942D200494FCD /* SocialMicroView.m in Sources */, - 54E8C4D62CC78DA900646C44 /* VipSettingViewController.m in Sources */, - E8664ED027E42238000171BA /* XPRoomPKTimePickerView.m in Sources */, - E85E7B2B2A4EB0D300B6D00A /* XPNewGuildTimePickView.m in Sources */, E824544826F5945300BE8163 /* XPMinePayPwdProtocol.h in Sources */, - E8AB633628AE54A40023B0D2 /* XPSailingPrizeCollectionViewCell.m in Sources */, - 2305EF0A2AD7CC7C00AD403C /* PIRoomPhotoAlbumChooseGiftView.m in Sources */, - 23D321D92ADD1B46006B259C /* PIRoomPhotoAlbumItemModel.m in Sources */, - 23FF42792AA6E19C0055733C /* HomeMenuSourceModel.m in Sources */, - E85E7B4E2A4EB0D300B6D00A /* XPMineGuildSetNameViewController.m in Sources */, - 2331C1642A5EB71000E1D940 /* NobleInfo.m in Sources */, - 23E9EB182A84D0E700B792F2 /* XPMineUserInfoEditMainTagView.m in Sources */, E824543A26F5880E00BE8163 /* XPLoginVerifBindPhoneProtocol.h in Sources */, - E821077E2987D67100DE7040 /* MessageRiskAlertModel.m in Sources */, - E818DD222A48977F00F163F7 /* XPLoginAreaTableViewCell.m in Sources */, - E81060F72987C8A700B772F0 /* MessageApplicationShareModel.m in Sources */, - E8E20BE2281695800033B688 /* XPMineLoginPasswordViewController.m in Sources */, - E84A2EA22A52883000D6AF8A /* XPIncomeRecordGoldDetailsTimeView.m in Sources */, - E86E79D628A4EA0C006DAF48 /* SessionRiskCache.m in Sources */, 23CEFC542AFB8FC100576D89 /* BSNotification.m in Sources */, - E824543826F5820A00BE8163 /* XPLoginVerifBindPhonePresenter.m in Sources */, - E8B846BF26FD827900A777FE /* XPMineUserInfoAlbumViewController.m in Sources */, - E84CBCE128436D3C00D43221 /* XPMineContactViewController.m in Sources */, - E8D48253278D8228003C1D08 /* AcrossRoomPKPanelModel.m in Sources */, - 23D321E52ADFE900006B259C /* PIRoomSendRedPacketVC.m in Sources */, - E824545C26F5EEBA00BE8163 /* XPMineVerifIdentityPresenter.m in Sources */, - 9B9BBF83288FBFB3004E2E74 /* XPNewUserRoomGiftView.m in Sources */, - E838369A298A59C100112E1C /* MessageTipsView.m in Sources */, - E8899C852785CC69007944BE /* XPRoomDatingAnimationView.m in Sources */, - 2331C16F2A5EB71000E1D940 /* XPNobleCenterNavView.m in Sources */, - E85E7B1B2A4EB0D200B6D00A /* XPMineMainIncomeStatisViewController.m in Sources */, - E84BF7D4277C383700EF8877 /* XPRoomSettingInputView.m in Sources */, E8AC723726F49982007D6E91 /* XPMineNotificaProtocol.h in Sources */, - E896EFAC2771AEFE00AD2CC1 /* XPMineFriendTableViewCell.m in Sources */, - E8664ED327E4258A000171BA /* RoomPKTimeItemModel.m in Sources */, - E8412FA22779BE8F006E1101 /* XPRoomSettingViewController.m in Sources */, - E89D60BD271D647A001F8895 /* XPRoomPresenter.m in Sources */, 4CD19E722E9CDF980069DAA0 /* UIButton+MSRTL.m in Sources */, - 4CD19E732E9CDF980069DAA0 /* XPShareItem.m in Sources */, 4CD19E742E9CDF980069DAA0 /* TTNewAlertView.m in Sources */, - 4CD19E752E9CDF980069DAA0 /* QPhotoImageModel.m in Sources */, - 4CD19E762E9CDF980069DAA0 /* XPShareInfoModel.m in Sources */, 4CD19E772E9CDF980069DAA0 /* UITextView+MSRTL.m in Sources */, 4CD19E782E9CDF980069DAA0 /* NSMutableAttributedString+MSRTL.m in Sources */, - 4CD19E792E9CDF980069DAA0 /* XPShareItemCell.m in Sources */, + 4CF462D42EA10E1B005E96C0 /* XPWebViewNavView.m in Sources */, + 4CF462D52EA10E1B005E96C0 /* XPWebViewController.m in Sources */, 4CD19E7A2E9CDF980069DAA0 /* SexAgeLabel.m in Sources */, - 4CD19E7B2E9CDF980069DAA0 /* QKeyboardManager.m in Sources */, 4CD19E7C2E9CDF980069DAA0 /* TTPopupService.m in Sources */, - 4CD19E7D2E9CDF980069DAA0 /* QInputPhototCell.m in Sources */, 4CD19E7E2E9CDF980069DAA0 /* XNDJTDDLoadingTool.m in Sources */, - 4CD19E7F2E9CDF980069DAA0 /* QEmotionBoardView.m in Sources */, 4CD19E802E9CDF980069DAA0 /* TTPopup.m in Sources */, 4CD19E812E9CDF980069DAA0 /* UIView+GradientLayer.m in Sources */, 4CD19E822E9CDF980069DAA0 /* TTAlertMessageAttributedConfig.m in Sources */, - 4CD19E832E9CDF980069DAA0 /* QKeyboardBaseManager.m in Sources */, 4CD19E842E9CDF980069DAA0 /* XPAdvertiseView.m in Sources */, 4CD19E852E9CDF980069DAA0 /* UISwipeGestureRecognizer+MSRTL.m in Sources */, 4CD19E862E9CDF980069DAA0 /* TTAlertButtonConfig.m in Sources */, - 4CD19E872E9CDF980069DAA0 /* QInputBarView.m in Sources */, 4CD19E882E9CDF980069DAA0 /* UIView+Corner.m in Sources */, - 4CD19E892E9CDF980069DAA0 /* QEEmotionImageView.m in Sources */, 4CD19E8A2E9CDF980069DAA0 /* TTActionSheetConfig.m in Sources */, - 4CD19E8B2E9CDF980069DAA0 /* QExtendBoardView.m in Sources */, - 4CD19E8C2E9CDF980069DAA0 /* QInputBarViewConfiguration.m in Sources */, 4CD19E8D2E9CDF980069DAA0 /* NetImageView.m in Sources */, 4CD19E8E2E9CDF980069DAA0 /* TTActionSheetView.m in Sources */, 4CD19E8F2E9CDF980069DAA0 /* XPSwitch.m in Sources */, @@ -12151,1261 +2400,184 @@ 4CD19E932E9CDF980069DAA0 /* NetImageConfig.m in Sources */, 4CD19E942E9CDF980069DAA0 /* UIButton+EnlargeTouchArea.m in Sources */, 4CD19E952E9CDF980069DAA0 /* MSBaseRTLFlowLayout.m in Sources */, - 4CD19E962E9CDF980069DAA0 /* XPShareView.m in Sources */, - 4CD19E972E9CDF980069DAA0 /* QEmotion.m in Sources */, 4CD19E982E9CDF980069DAA0 /* AdvertiseModel.m in Sources */, - 4CD19E992E9CDF980069DAA0 /* XPSVGAPlayer.m in Sources */, - 4CD19E9A2E9CDF980069DAA0 /* QinputPhotoView.m in Sources */, 4CD19E9B2E9CDF980069DAA0 /* XCCurrentVCStackManager.m in Sources */, 4CD19E9C2E9CDF980069DAA0 /* UIImage+ImageEffects.m in Sources */, 4CD19E9D2E9CDF980069DAA0 /* UIImage+Utils.m in Sources */, 4CD19E9E2E9CDF980069DAA0 /* UIImage+MSRTL.m in Sources */, 4CD19E9F2E9CDF980069DAA0 /* TTAlertConfig.m in Sources */, 4CD19EA02E9CDF980069DAA0 /* UITextField+MSRTL.m in Sources */, - 4CD19EA12E9CDF980069DAA0 /* UITextView+QEmotion.m in Sources */, 4CD19EA22E9CDF980069DAA0 /* DJDKMIMOMColor.m in Sources */, 4CD19EA32E9CDF980069DAA0 /* EmptyDataView.m in Sources */, 4CD19EA42E9CDF980069DAA0 /* TTPopupManagerService.m in Sources */, 4CD19EA52E9CDF980069DAA0 /* MSBaseTextField.m in Sources */, 4CD19EA62E9CDF980069DAA0 /* XPAdImageTool.m in Sources */, - 4CD19EA72E9CDF980069DAA0 /* QEmotionHelper.m in Sources */, 4CD19EA82E9CDF980069DAA0 /* UIImageConstant.m in Sources */, - 4CD19EA92E9CDF980069DAA0 /* QEmotionAttachment.m in Sources */, 4CD19EAA2E9CDF980069DAA0 /* MoliMoneyLabel.m in Sources */, - 4CD19EAB2E9CDF980069DAA0 /* MoliAvatar.m in Sources */, - E8751E5C28A62A530056EF44 /* XPSailingViewController.m in Sources */, - 9B7D904D287BC5E20033A45E /* AnchorRoomScrollView.m in Sources */, - E8899C822785A694007944BE /* DatingInfoModel.m in Sources */, - 9BB89DC327FE7F3A00586A83 /* XPAnchorFansRelationModel.m in Sources */, - E8AC723226F49710007D6E91 /* XPMineNotificationTableViewCell.m in Sources */, - E87E62592A3F560B002F68C9 /* XPHomePartyViewController.m in Sources */, E8AC722926F488DA007D6E91 /* XPMineFeedbackProtocol.h in Sources */, - 2305EEF62AD67E5500AD403C /* PIRoomPhotoAlbumItemCell.m in Sources */, - E85E7B3C2A4EB0D300B6D00A /* XPGuildSuperAdminRoomCollectionViewCell.m in Sources */, - 4C38C2B02D84070600CFA4A8 /* AccountBindingViewController.m in Sources */, - 4C5527BF2D1C099500833FFD /* RoomResourceManager.m in Sources */, - 23D321E82ADFED10006B259C /* PIRoomSendRedPacketItemVC.m in Sources */, - E85E7B2A2A4EB0D300B6D00A /* XPGuildTimeMonthPickerView.m in Sources */, - E87E62782A3F5907002F68C9 /* XPNewHomePartyTableViewCell.m in Sources */, - E8950183282CAC6A007E459A /* XPMomentsPhotoView.m in Sources */, E8AC721E26F472BF007D6E91 /* XPMineSettingProtocol.h in Sources */, - E8F63CB4298B563D00B338BA /* Api+SayHello.m in Sources */, - 4CD15D912D7E902800D9279F /* LoginViewController.m in Sources */, 4C06428B2E98DC5F00BAF413 /* EPTabBarController.swift in Sources */, - 2305F3412AD94D5200AD403C /* XPMaskManagerVC.m in Sources */, - 4CFFEFD02D3A5E130035D016 /* Api+SuperAdmin.m in Sources */, - 9BC5C91F277C902B007C8719 /* XPReleaseRadioView.m in Sources */, - E84843AF27F59E7E0050D365 /* XPRoomPKResultView.m in Sources */, - E83DB47A27462C4500D8CBD1 /* XPGiftBigPrizeModel.m in Sources */, - E86A16C52856DBEC004228B8 /* FindNewGreetListModel.m in Sources */, 4C1E98C32E9A45160031AE79 /* EPImageUploader.swift in Sources */, 4C1E98C42E9A45160031AE79 /* EPProgressHUD.swift in Sources */, - 4CB753D22D30F10900B13DF5 /* LuckyPackageViewController.m in Sources */, - 2331C1632A5EB71000E1D940 /* XPNobleCenterPresenter.m in Sources */, - 54E82EA22CA6886700C931D9 /* RoomBoomBannerAnimation.m in Sources */, E81366F826F0C12A0076364C /* LoginFullInfoProtocol.h in Sources */, - 9BBC028E2786FA060007C24B /* NobleCardModel.m in Sources */, - 9BCB99A628F582EC00466D64 /* XPMineCollectRoomEditCell.m in Sources */, E8E70D7E26F2F19D00F03460 /* Api+Mine.m in Sources */, - E85E7B3B2A4EB0D300B6D00A /* XPGuildSearchSuperAdminTableViewCell.m in Sources */, - 4C0B4A4D2E65A63400D67F73 /* XPRoomRoomPhotoAction.m in Sources */, - 54C3895F2C2189DD00FD47B1 /* XPHomeMinePresenter.m in Sources */, - E8751E6E28A64F990056EF44 /* XPSailingEmptyTableViewCell.m in Sources */, - E8950189282CFFB1007E459A /* XPMomentsLayoutConfig.m in Sources */, - E81061032987CFCE00B772F0 /* MessageSkillCardModel.m in Sources */, 9BD9A18727A120FD004186FE /* XPMineVisitorUnReadModel.m in Sources */, - E85E7BAD2A4EC99300B6D00A /* XPMineGiveDiamondDetailsCell.m in Sources */, - 2320F63C2BDF738E00227EEB /* MSRoomMenuGameCell.m in Sources */, - E824543D26F58C3A00BE8163 /* XPLoginBindSuccessView.m in Sources */, - E85E7B282A4EB0D300B6D00A /* XPClanMenuView.m in Sources */, - 545831A62C2C085C00364026 /* ArabMicroView.m in Sources */, E8EEB8F726FC2673007C6EBA /* UserPhoto.m in Sources */, - E81061002987CDCC00B772F0 /* MessageTweetModel.m in Sources */, - E87DF4CC2A42C960009C1185 /* HomeBannerInfoModel.m in Sources */, - 235714892BECC38F004C81D6 /* MessageHeadlinesTextModel.m in Sources */, - E8664EDF27E45EC7000171BA /* XPRoomPKRecordPresenter.m in Sources */, - 23FF25762ABD66B90064E904 /* XPFreeGiftsObtainView.m in Sources */, E81C27A226EF23490031E639 /* YUMINNNN.h in Sources */, - E80E900C27E0358900434B90 /* XPRoomTopicAlertView.m in Sources */, - 54E82EA52CA693FA00C931D9 /* RoomBoomExplosionView.m in Sources */, 4CA7410E2E72B8FC00DB6853 /* YMLanguageConfig.m in Sources */, - 9BDA3E7A27FD43EF00517FE6 /* XPAnchorFansTeamEntranceView.m in Sources */, E81C279826EB3AC40031E639 /* LoginForgetPasswordProtocol.h in Sources */, - 9BD8D4E328911E9900AE03FF /* XPMineCollectRoomListViewController.m in Sources */, - 2331C1732A5EB71000E1D940 /* XPNoblePrivilegeCell.m in Sources */, - 9B2EA7C628041EFC00ED17BF /* XPAnchorPkPanelView.m in Sources */, - 4C6E1F752CEAEC3C0073D0A3 /* ShoppingMallTagView.m in Sources */, - E8A88D2D27E81E8700CA8837 /* RoomPKChooseUserModel.m in Sources */, - E82325F9274E2E42003A3332 /* Api+UserCard.m in Sources */, E8AB632F28AE19DE0023B0D2 /* XPMomentMinePresenter.m in Sources */, - E85E7B042A4EB0D200B6D00A /* XPGuildIncomeDetailPresenter.m in Sources */, - 54B9C6F32C9D27F3003F1CC5 /* XPMineMultipleContentTableViewCell.m in Sources */, - 54F4693E2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m in Sources */, - 4C886BEB2E014AE5006F0BA7 /* MedalsPresenter.m in Sources */, - 9BD9A17C27A0EE24004186FE /* XPMineVisitorViewController.m in Sources */, - 2369F9912A89CE0E00563B48 /* PIUserSexView.m in Sources */, - 239D0FAB2BFCB88D002977CE /* XPRoomFunctionContainerView.m in Sources */, E82109B026F1D83500FC3319 /* LoginBindPhonePresent.m in Sources */, - E81C1B1F27705F7A0020D1E4 /* XPArrangeMicViewController.m in Sources */, - 4C7989F32D1952DA006AE07B /* RoomModePresenter.m in Sources */, E8B825C726EA0D9A009E8E9F /* LoginVerifCodeProtocol.h in Sources */, - 23E9EAAE2A84C9B800B792F2 /* XPMineUserInfoTagView.m in Sources */, - 236B2E4E2AA07D06003967A8 /* Api+LittleGame.m in Sources */, - 4C0B4A412E659DC100D67F73 /* XPRoomBackGroundSettingAction.m in Sources */, - 4CEB9EB32D0AFCE200443480 /* NineteenMicStageView.m in Sources */, - 4C0B4A3E2E659A2C00D67F73 /* XPRoomTypeSettingAction.m in Sources */, - 2331C1B32A60F32D00E1D940 /* XPCandyTreeMoreRuleCell.m in Sources */, - 4C0B4A3A2E6579C700D67F73 /* XPPKAction.m in Sources */, - 14A6034C29A35EE600D2A6A5 /* XPMineItemTableViewCell.m in Sources */, - 9BAC92F528E6E63000147DD8 /* XPRoomInsideOperationCell.m in Sources */, - 9BE570BC28F65B7200D491A5 /* XPMineCollectRoomCell.m in Sources */, - E86A16C22856D635004228B8 /* XPSessionFindNewGreetTableViewCell.m in Sources */, - E824544E26F5BC1A00BE8163 /* XPMineModifPayPwdView.m in Sources */, - E86E79CD28A4E045006DAF48 /* MessageContentRiskAlertView.m in Sources */, E855515B280559FE005F293F /* NSDate+DateUtils.m in Sources */, - 4C3851992DD5F4D50089CFCC /* EventConfigModel.m in Sources */, - 544879F02CD22D4B00D58DC1 /* CustomRoomBGItemModel.m in Sources */, - E8664EE327E47711000171BA /* XPRoomPKRecordNickView.m in Sources */, - E8C1CD7327D8A16500376F83 /* XPRoomFaceTool.m in Sources */, - 236B2E462AA07D06003967A8 /* UIImage+RW.m in Sources */, - E81DCCCD282B63B40039E5C5 /* XPMomentsViewController.m in Sources */, - E86507EB281A88A9006951B0 /* MessageContentSkillCardView.m in Sources */, - E8B825CA26EA1231009E8E9F /* LoginVerifCodeViewController.m in Sources */, 189DD76226E60DDC00AB55B1 /* Api+Login.m in Sources */, - E8412FA62779BED1006E1101 /* XPRoomSettingTableViewCell.m in Sources */, - 9B7D80502753AA9D003DAC0C /* UITableView+NIMScrollToBottom.m in Sources */, - E8AFF7E3298CA1E500FBDE32 /* SessionSayHelloCountModel.m in Sources */, - 23FE47D82BB3CEAF00F09D23 /* PINobleCenterTitleView.m in Sources */, - 54C9A1252C3E74AE00C6D970 /* MessageGameOrderView.m in Sources */, 9BD9A18427A0F128004186FE /* XPMineVisitorItemModel.m in Sources */, - 4CAFF00D2DD343B200CD81DF /* PublicEventTableViewCell.m in Sources */, - E852D73E28631C18001465ED /* XPMonentsCommentTableViewCell.m in Sources */, 54F4693B2C2A984D00A83655 /* MedalModel.m in Sources */, 23CEFC4E2AFB8FC100576D89 /* BSNSDictionary.m in Sources */, - 23FF426A2AA5DF050055733C /* XPNewHomePartyTagView.m in Sources */, - E85E7BA22A4EC99300B6D00A /* XPMineGiveDiamondSearchModel.m in Sources */, - 1427219829A75F6F00C7C423 /* HTTPServer.m in Sources */, E80B0712280D0A6700A79F63 /* FansInfoModel.m in Sources */, - 2305EEFB2AD696B400AD403C /* PIRoomPhotoAlbumChoosePhotoView.m in Sources */, - 4CCFDA062DD5C127009BD2FD /* EventItemModel.m in Sources */, - E87E62682A3F571D002F68C9 /* XPHomeContainerPresenter.m in Sources */, E8EEB8F326FC2050007C6EBA /* SDWaitingView.m in Sources */, - E85E7B2F2A4EB0D300B6D00A /* XPGoldIncomeSectionView.m in Sources */, - 4C7F2A672E0BE0AB002F5058 /* FirstRechargeModel.m in Sources */, - 54F469382C29C3B400A83655 /* XPMineAlbumTableViewCell.m in Sources */, - 544B19B02CA1299500885BEB /* CPBindingAnimation.m in Sources */, - E8DEC9A12764A5D20078CB70 /* XPRoomMoreItemModel.m in Sources */, - 9B87B3CD2926473D00085110 /* XPSessionListHeadFriendCell.m in Sources */, - 23194DCD2AD14BF000649F51 /* DDASLLogger.m in Sources */, - E85E7B492A4EB0D300B6D00A /* XPMineGuildSearchViewController.m in Sources */, - 238A900A2BA9756600828123 /* PIUniversalBannerModel.m in Sources */, - 4C1892992CF84349004D4426 /* RoomCahtCell.m in Sources */, - E85E7B012A4EB0D200B6D00A /* XPSuperAdminSetPresenter.m in Sources */, - 18F404B7276095D700A6C548 /* SessionChatLimitView.m in Sources */, - E8788942273A55AD00BF1D57 /* XPGiftUsersView.m in Sources */, - 9BD9A17927A0EC57004186FE /* XPMineVisitorPresenter.m in Sources */, - E8BD0F8828A9E9E400DE050D /* RoomSailingPrizeModel.m in Sources */, - 4CFFEFCD2D3A4E410035D016 /* AppOfficalManagerActionsViewController.m in Sources */, 23CEFC512AFB8FC100576D89 /* SystemUtil.m in Sources */, - E8659909273E800D00EE349D /* XPGiftCollectionViewFlowLayout.m in Sources */, - E85E7B262A4EB0D300B6D00A /* XPMineGuildViewController.m in Sources */, - E86596512701A1C000846EBD /* StatisticsService.m in Sources */, - 54E82EAB2CA9261000C931D9 /* Api+Boom.m in Sources */, - 5412E0F42C4E460300FDD668 /* XPMineCenterAgencyView.m in Sources */, 23CEFC5E2AFB8FC100576D89 /* BSRealTimeView.m in Sources */, - E824544026F58F9400BE8163 /* XPMinePayPwdViewController.m in Sources */, - 9BE01AED2893D0DF00B50299 /* XPDressShopSearchTableViewCell.m in Sources */, - 23FF42732AA6CC480055733C /* PIHomeItemModel.m in Sources */, - E81060F12987C52B00B772F0 /* MessageGuildModel.m in Sources */, - 54ACDCC22C5B31BD0099472C /* XPBeautIDView.m in Sources */, - E87E62772A3F5907002F68C9 /* XPNewHomeRecommendTableViewCell.m in Sources */, 9BA812D228BF145700783EA7 /* ClientRedPacketModel.m in Sources */, - 1427219229A75F6F00C7C423 /* MultipartFormDataParser.m in Sources */, - 4C520D852D894E8C0051C784 /* SocialShareManager.m in Sources */, - 23E9EAAF2A84C9B800B792F2 /* XPMineUserInfoTagHeadView.m in Sources */, - E890BC04273CF0500007C46B /* XPGiftCountModel.m in Sources */, - E899C68C275093B800E189E5 /* XPUserCardMicroItemModel.m in Sources */, - 2331C1B52A60F32D00E1D940 /* XPCandyTreeViewController.m in Sources */, - 9B6E8573281AB9B20041A321 /* XPRoomInsideRecommendCell.m in Sources */, 4C7B91D82EA096DE00A5E236 /* EPEmotionInfoView.m in Sources */, - 2305F33E2AD9295800AD403C /* PIRoomPhotoAlbumOperateCell.m in Sources */, - E8A3538528FD67320014A784 /* GiftLuckyBroadcastModel.m in Sources */, - 9B4C5B86292F81FA00CEA41B /* XPSessionListFansPartyModel.m in Sources */, - 547080DB2CD0EEB4009879E5 /* CustomRoomBGContentViewController.m in Sources */, - 4CD47BC42E61A4E000BCDA46 /* XPTurboModeAction.m in Sources */, - 237B94BD2A984DA7007853E3 /* XPNobleTrumpetModel.m in Sources */, - E82325F5274E2E09003A3332 /* XPUserCardPresenter.m in Sources */, - 236B2E4C2AA07D06003967A8 /* XPLittleGameRoomOpenView.m in Sources */, - 2331C1772A5EB71000E1D940 /* XPNobleCenterListViewController.m in Sources */, - E880B39E278BD49E00A83B0D /* XPAcrossRoomPKViewController.m in Sources */, - 239D0FE12C04850A002977CE /* MSRoomGameHeadView.m in Sources */, - 2331C1AA2A60F32D00E1D940 /* XPCandyTreePresenter.m in Sources */, - E8AC723D26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m in Sources */, - E8AB632728AE13210023B0D2 /* XPMomentsTopicListPresenter.m in Sources */, - 239D0FB32BFD8C67002977CE /* MSRoomSetingBackdropCell.m in Sources */, - 1427218729A75F6F00C7C423 /* MyHTTPConnection.m in Sources */, - 23CEFB6C2AFB803B00576D89 /* PISwitchingEnvironmentVC.m in Sources */, - E8D55C9D28113218006935A5 /* MessageMenuModel.m in Sources */, - 4C45C1A92E6837BF00E73A44 /* TurboModeStateManager.m in Sources */, - E87DF4EF2A42CB90009C1185 /* XPHomeCollectRoomTableViewCell.m in Sources */, - 2368ECDF2BC51B2D00EDF4C9 /* XPMineSwitchLanguageCell.m in Sources */, - 236B2E442AA07D06003967A8 /* UIColor+RW.m in Sources */, 189DD73E26E21C3F00AB55B1 /* YYUtility.m in Sources */, - 14A6034F29A36D8300D2A6A5 /* XPSimpleMineHeaderView.m in Sources */, 23CEFC652AFB8FC100576D89 /* BSDrawLine.m in Sources */, - E81C1B2F277071670020D1E4 /* XPArrangeMicInfoModel.m in Sources */, - 9B0086CA27BA4F570032BD2B /* AnchorMicroView.m in Sources */, - E83ABF00280EC45700322EE4 /* MessageContentApplicationShareView.m in Sources */, - F1D8556F2931FC86008C418F /* XPRoomYearActivityView.m in Sources */, - E8B9843628ABA8B40022D026 /* XPMonentPublishSuccessView.m in Sources */, - 238ED83A2AE2891D0014EF9D /* PIRoomEnterRedPacketView.m in Sources */, - 23E9E9972A80C3A100B792F2 /* XPMineGuildPersonalBillRecordVC.m in Sources */, E81C279626EB39CC0031E639 /* LoginForgetPasswordPresent.m in Sources */, - 546104192CD4C06400066B21 /* Api+CustomBackground.m in Sources */, - 18EE3FF42750FA3700A452BF /* UIView+NIM.m in Sources */, - 9BD63FB4277EF1B3006EB744 /* XPReleaseRadioModel.m in Sources */, - E8A03DFF27635F960098D9EA /* XPRoomCandyGiftView.m in Sources */, - 4C45C1AC2E68545E00E73A44 /* XPTurboModeTipsView.m in Sources */, 180116F9279E8C4C00F2CBC0 /* PLTimeUtil.m in Sources */, 23CEFC502AFB8FC100576D89 /* UILabel+YBAttributeTextTapAction.m in Sources */, - E87E545429AA05EA00EBE52B /* XPFootPrintNavView.m in Sources */, - E8252FEE27687DF1002B3164 /* ActivityInfoModel.m in Sources */, - 54C9A1222C3E6C3200C6D970 /* MessageGameOrderModel.m in Sources */, - E84BF7D1277BFCDD00EF8877 /* RoomTagModel.m in Sources */, - E8AC723526F49939007D6E91 /* XPMineNotificaPresenter.m in Sources */, - 1427218E29A75F6F00C7C423 /* HTTPMessage.m in Sources */, - 4C45C1A52E6825F300E73A44 /* XPTurboModeConstants.m in Sources */, - 239D0FE72C049D61002977CE /* MSRoomGameMsgView.m in Sources */, - 9B42869828C1E06B009034D2 /* XPRedPacketModel.m in Sources */, - 233423D62AB0397500B1253F /* PIMessageContentServiceReplyView.m in Sources */, - 18EE3FE22750C29D00A452BF /* NIMBadgeView.m in Sources */, - E82EE0F8272FDDFA00D15DC1 /* UserPrivacyView.m in Sources */, - 2331C1672A5EB71000E1D940 /* NobleLevelUpModel.m in Sources */, - 9BA812E428BF70A600783EA7 /* XPRoomRedPacketPwdView.m in Sources */, - 23E9EB1B2A84D28A00B792F2 /* XPMineUserInfoEditTagView.m in Sources */, - 237B94BE2A984DA7007853E3 /* XPRoomTrumpetViewController.m in Sources */, 23CEFC5C2AFB8FC100576D89 /* BSNetListenModel.m in Sources */, - 2331C1662A5EB71000E1D940 /* NobleCenterModel.m in Sources */, - E8998D8B2859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.m in Sources */, - E8DEC9A42764A6600078CB70 /* XPMoreMenuPresenter.m in Sources */, - 189DD53426DE255300AB55B1 /* TabbarViewController.m in Sources */, - 23C9DFC92B84917B00B51558 /* PIRoomActivityChoosePlayCell.m in Sources */, - 9BA3B40B293DCDFD0071DF1C /* XPVersionUpdateModel.m in Sources */, - 4CD4014A2E718E36003F5009 /* XPBlankRoomModel.m in Sources */, - 23C9DFCF2B85E21E00B51558 /* PIGuildSingleRoomIncomeCell.m in Sources */, - 18EE401A2754BA9F00A452BF /* NIMMessageMaker.m in Sources */, - E8EEB91D26FC9D58007C6EBA /* XPMineUserInfoDateView.m in Sources */, - 236B2E5D2AA19169003967A8 /* HomeLittleGameRoomModel.m in Sources */, - E85E7B192A4EB0D200B6D00A /* GuildMessageModel.m in Sources */, - 1427219429A75F6F00C7C423 /* HTTPAuthenticationRequest.m in Sources */, - E890BC0D273D09A50007C46B /* XPGiftCountView.m in Sources */, - E880B3B2278C1D1800A83B0D /* XPAcrossRoomPKRuleView.m in Sources */, - 23E9E9A42A80DEAF00B792F2 /* XPMineGuildPersonalBillRecordContentView.m in Sources */, - E81C1B262770663B0020D1E4 /* XPArrangeMicTableViewCell.m in Sources */, - 4CD47BCC2E61ADE400BCDA46 /* XPSocialAction.m in Sources */, - E81A652B2834E4F600F55894 /* XPMomentsAttentionViewController.m in Sources */, - E8E20BEC2816A5B90033B688 /* XPMineBlackListViewController.m in Sources */, E8AC722F26F49610007D6E91 /* XPMineNotificationItemModel.m in Sources */, - E85410352864155A005CFD9F /* XPMonentDetailPresenter.m in Sources */, - 4C45C1AF2E6855F600E73A44 /* XPTurboModeTipsManager.m in Sources */, 54C9A11F2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m in Sources */, - 2331C1B12A60F32D00E1D940 /* XPCandyTreeGiftView.m in Sources */, - 9B1B72BC28003E06003FACE9 /* XPAnchorPKTableViewCell.m in Sources */, - E8E70D7A26F2F16600F03460 /* XPMinePresent.m in Sources */, - E87DF4D42A42C9B1009C1185 /* HomeRecommendRoomModel.m in Sources */, - 23E9EAB22A84C9DE00B792F2 /* XPMineUserInfoTagViewCell.m in Sources */, - 9B42869C28C1FD3D009034D2 /* XPOpenRedPacketCell.m in Sources */, - 23D321D22ADD0EBC006B259C /* PIRoomPhotoAlbumItemPresenter.m in Sources */, - 4CFBE0CA2DAD085700A923AF /* BravoGiftTabInfomationModel.m in Sources */, - 239D0FD22C046EAD002977CE /* MSTabbarRoomGameView.m in Sources */, - 4CD47BC62E61A4FA00BCDA46 /* XPRoomMoreMenuActionFactory.m in Sources */, - 4C864A052D561E1D00191AE0 /* LuckyPackageLogicManager.m in Sources */, - 9BFE992E288142FD009DA429 /* RoomClassifyModel.m in Sources */, - 2331C1B72A60F32D00E1D940 /* XPCandyRankContainerView.m in Sources */, - 239D0FF72C05BD2A002977CE /* MSRoomGameVictoryView.m in Sources */, - 23194DCE2AD14BF000649F51 /* ContextFilterLogFormatter.m in Sources */, - E8A88D3027E85EEA00CA8837 /* RoomPKInfoModel.m in Sources */, - E85E7B022A4EB0D200B6D00A /* XPSuperAdminManagerRoomPresenter.m in Sources */, - E8AB633328AE51470023B0D2 /* XPSailingPrizeView.m in Sources */, 548D54202CC208FD0084A2FF /* AlbumResourcePickerViewController.m in Sources */, - 9B2F72D328E45C5A0000E4FA /* XPRoomQuidkMessageCell.m in Sources */, - E85E7B402A4EB0D300B6D00A /* XPGuildPersonIncomeTableViewCell.m in Sources */, - E87E63F729AA1A5600EBE52B /* YuMi.xcdatamodeld in Sources */, - 9BE01ACE28925F7D00B50299 /* XPMineNewUserRechargeView.m in Sources */, - E83ABF03280EC90C00322EE4 /* ContentApplicationShareModel.m in Sources */, - 4C7153952E0942F700C9F940 /* MedalsCyclePagerCell.m in Sources */, - 9BA812E028BF6ABB00783EA7 /* Api+RedPacket.m in Sources */, - 9BA3B40F293DD2F90071DF1C /* XPUpgradeView.m in Sources */, - E81A654928351B9500F55894 /* XPMomentsRecommendHeaderView.m in Sources */, - E84B0E3F2727EDF6008818C6 /* XPRoomMessageTableViewCell.m in Sources */, - E82325FC274E4735003A3332 /* XPUserCardItemModel.m in Sources */, - E8C1CD6627D88EF800376F83 /* XPRoomFaceViewController.m in Sources */, - E8412FB32779E285006E1101 /* Api+RoomSetting.m in Sources */, 23CEFC4A2AFB8FC100576D89 /* BSNSStringUtil.m in Sources */, - 9B2F72D028E45A480000E4FA /* XPRoomQuickMessageContainView.m in Sources */, - 23FF426D2AA5E4EE0055733C /* XPNewHomePartyAudioView.m in Sources */, - E81060E82987720F00B772F0 /* MessageUnSupportModel.m in Sources */, - E8D34D6028082BA5009C4835 /* XPMineUserDataPresenter.m in Sources */, - E84CBCE4284372D800D43221 /* XPRoomHalfMessageView.m in Sources */, E8EEB8F226FC2050007C6EBA /* SDPhotoBrowser.m in Sources */, 23CEFC4F2AFB8FC100576D89 /* BSSDLayoutUtil.m in Sources */, E81C27AB26EF2D920031E639 /* ThirdUserInfo.m in Sources */, - 23FF25682ABC3BC00064E904 /* XPHomeGameCell.m in Sources */, - 4CCFDA002DD59038009BD2FD /* EventCenterEmptyCell.m in Sources */, - E8788950273A699900BF1D57 /* ThemeColor+SendGift.m in Sources */, - 23B8D8D82B85F8B900CA472F /* PIHoemCategoryTitleCell.m in Sources */, E81C279D26EEEC620031E639 /* YUMIConstant.m in Sources */, - 9B734F73288A787000CBDAA9 /* XPMineAccountView.m in Sources */, - 239141C92AE1358F00322CA9 /* PIInputEntireServerScrollingView.m in Sources */, - E8AA6EF227DF1E97009B4C2B /* XPRoomTopicPresenter.m in Sources */, - 9BF4BEBC28D4182E009CF6C2 /* XPOpenRedPacketModel.m in Sources */, - E873EB0C2809850D0071030D /* MessageContentCustomView.m in Sources */, - E884C36F2743AAC800E1EBED /* AttachmentModel.m in Sources */, E8AC721926F46E0B007D6E91 /* XPMineSettingItemModel.m in Sources */, - 9BE01AF02893E31700B50299 /* NewUserRechargeModel.m in Sources */, - 2320F6392BDF732C00227EEB /* MSRoomMenuGameView.m in Sources */, - 9B32A04728881845002009D2 /* XPRoomTagListView.m in Sources */, - E85E7B1D2A4EB0D200B6D00A /* XPMineClanIncomeStatisViewController.m in Sources */, 189DD55A26DE39D200AB55B1 /* BaseMvpPresenter.m in Sources */, - 5458319D2C2AE09300364026 /* XPRoomTypeSelectionViewController.m in Sources */, - 1427219029A75F6F00C7C423 /* WebSocket.m in Sources */, - E83ABEF9280EAF3F00322EE4 /* MessageContentOpenLiveView.m in Sources */, - E83ABF06280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m in Sources */, - E85E7B0E2A4EB0D200B6D00A /* GuildSearchSuperAdminModel.m in Sources */, - E85E7B4C2A4EB0D300B6D00A /* XPMineGuildManagerPerViewController.m in Sources */, - E87DF4BF2A42C8C1009C1185 /* HomeTagModel.m in Sources */, - 23FF25652ABC3B3C0064E904 /* XPHomeGameView.m in Sources */, - 4CC312242D7987A200F57A07 /* ShareHelder.m in Sources */, E88863D3278ED4C0004BCFAB /* Timestamp.m in Sources */, - 23E7FE9C2BB6CD42008F6800 /* XPNobleCenterWindow.m in Sources */, - E88863CF278EC393004BCFAB /* XPAcrossRoomPKPrizeView.m in Sources */, 4CE3A9462D22754C003F0796 /* RechargeUserModel.m in Sources */, - 239D0FFD2C05D086002977CE /* MSRoomGameQuitGameView.m in Sources */, - 23E9EA8E2A84BC9000B792F2 /* XPMineUserInfoHeaderTagCell.m in Sources */, - E87DF5082A42CE79009C1185 /* XPInRoomRecordPresenter.m in Sources */, - 239D0FD82C047DD8002977CE /* MSTabbarRoomGameModel.m in Sources */, 189DD6FF26E20E5900AB55B1 /* HttpRequestHelper.m in Sources */, - E85E7B062A4EB0D200B6D00A /* XPGuildSearchPresenter.m in Sources */, - E8788945273A55C200BF1D57 /* XPGiftInfoView.m in Sources */, - 9BF5192628801D4700B6BE92 /* XPAcrossRoomPKCountDownView.m in Sources */, - 239141CC2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m in Sources */, - 4C729E4C2E5318AA00E5171E /* GiftComboUIAdapter.m in Sources */, - 4C729E4D2E5318AA00E5171E /* GiftComboConfig.m in Sources */, - 4C729E4E2E5318AA00E5171E /* GiftComboTransport.m in Sources */, - 23D321DC2ADFBFF6006B259C /* PIInputRedPacketView.m in Sources */, - 23E9E99E2A80C7AF00B792F2 /* XPMineGuildPersonalBillRecordItemView.m in Sources */, - E87DF4F52A42CC49009C1185 /* HomeMenuInfoModel.m in Sources */, - 9BD63FAB277EE885006EB744 /* Api+RoomRadio.m in Sources */, - 4C0A5B8A2E02BC3900955219 /* MedalsDetailView.m in Sources */, - E8A30BF328534B17003B4873 /* Api+FindNew.m in Sources */, - E852D7412863249F001465ED /* XPMonentsReplyTableViewCell.m in Sources */, - 237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */, - 239D0FFA2C05BE9B002977CE /* MSRoomGameVictoryCell.m in Sources */, - 54C9A1162C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m in Sources */, - 23E9EA942A84BE4800B792F2 /* XPGiftUserDataViewController.m in Sources */, - 2331C16D2A5EB71000E1D940 /* XPNobleSettingNavView.m in Sources */, - E8AEAED6271412EC0017FCE0 /* XPRoomViewController.m in Sources */, - 2305F33B2AD9293D00AD403C /* PIRoomPhotoAlbumOperateView.m in Sources */, E8E70D9226F2F60C00F03460 /* XPMineItemModel.m in Sources */, E818DD1F2A48974300F163F7 /* LoginAreaModel.m in Sources */, - 1427218A29A75F6F00C7C423 /* HTTPDynamicFileResponse.m in Sources */, - E8DACCFE27673F870052092C /* GiftValueInfoModel.m in Sources */, - E8412F9927799249006E1101 /* InviteFansModel.m in Sources */, - E88C72912828EA4E0047FB2B /* Music+CoreDataProperties.m in Sources */, - E84BF7CA277AF79D00EF8877 /* XPRoomSettingTagCell.m in Sources */, 54FFD37A2C9BCB1900DE61E5 /* RelationUserVO.m in Sources */, - 9BE9F0F927FED12D00667200 /* XPAnchorFansPrivilegeModel.m in Sources */, - E87DF5022A42CDF1009C1185 /* XPHomeAttentionCollectionViewCell.m in Sources */, - E8AB631628ADE2D20023B0D2 /* XPMonentsTopicLatestViewController.m in Sources */, - E8B846CF26FDD96100A777FE /* XPMineRechageHeadView.m in Sources */, - E852D74728633E92001465ED /* MonentsCommentReplyModel.m in Sources */, - 4CEB9EB02D0AF4FE00443480 /* TwentyMicStageView.m in Sources */, - E8B3E80C2848BA40009746AB /* NewUserGreetModel.m in Sources */, - E85E7B4D2A4EB0D300B6D00A /* XPMineGuildRemoveMemberViewController.m in Sources */, - 9BCB99A028F571B500466D64 /* XPMineCollectPartyRoomViewController.m in Sources */, - E81C27AE26EF39AB0031E639 /* AppDelegate+ThirdConfig.m in Sources */, - E8AB631028ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.m in Sources */, - E8E70D8326F2F51A00F03460 /* XPMineHeadView.m in Sources */, 54CE5EF92CCA4A2600A67898 /* LocationModel.m in Sources */, E8EEB90C26FC5EBC007C6EBA /* XPMineUserInfoEditModel.m in Sources */, - 23630BA62BAC3888003AD25D /* PIGiftSuperGiftBroadcastView.m in Sources */, 18E7B31826F097E00064BC9B /* UserInfoModel.m in Sources */, - E87DF4F22A42CBEC009C1185 /* XPHomeUserView.m in Sources */, - 4CC312272D79A10100F57A07 /* ShareProvider.m in Sources */, - E83ABEF6280E9AD800322EE4 /* MessageContentUnSupportView.m in Sources */, - E8AC721326F46ADD007D6E91 /* XPMineSettingViewController.m in Sources */, 18E7B32126F098650064BC9B /* UserInfoSkillVo.m in Sources */, - E8AC722726F482A4007D6E91 /* XPMineFeedbackPresenter.m in Sources */, - 23FF42632AA5861E0055733C /* XPNewHomePartyCollectionViewCell.m in Sources */, - E85E7B422A4EB0D300B6D00A /* XPMinePromptWindow.m in Sources */, - 14EB640929A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.m in Sources */, - 4CBDC42A2DC0BB95005A75B9 /* EventCenterOfficialCell.m in Sources */, - 18AAF3F0279EA59300CD7DAD /* MessageContentTextClickable.m in Sources */, - E8C6FFCC27548120004DC9F0 /* Api+Home.m in Sources */, - E8778AF52988EF2B00CF139B /* XPSessionSayHelloTableViewCell.m in Sources */, - 4C7989EF2D195277006AE07B /* RoomModeViewController.m in Sources */, - 23FF257C2ABD68020064E904 /* XPGiftFreeItemCell.m in Sources */, - 236B2E532AA08757003967A8 /* LittleGameStageView.m in Sources */, - E85E7B3A2A4EB0D300B6D00A /* XPGuildSuperAdminSetTableViewCell.m in Sources */, - E8778AE72988C1E000CF139B /* XPSessionHelloEnterView.m in Sources */, - E8C21501274B76F60079E6BF /* XPRoomAnimationHitView.m in Sources */, - 54283CE82CE48ABB009729B5 /* MyDressingViewController.m in Sources */, - E84A2E9F2A5287D200D6AF8A /* XPIncomeRecordGoldDetailsView.m in Sources */, - 233423C72AAEE5C600B1253F /* XPCandyTreeBuySuccessView.m in Sources */, - E873EB0F28098D500071030D /* MessageContentGiftView.m in Sources */, - 2331C1702A5EB71000E1D940 /* XPNoblePrivilegeContentCell.m in Sources */, 4C0642912E98DC8700BAF413 /* EPMomentViewController.m in Sources */, - E8D34D4D28080351009C4835 /* XPMineDataClanTableViewCell.m in Sources */, - E85E7B292A4EB0D300B6D00A /* XPGuildTimePickView.m in Sources */, - E85E7BBF2A4EE7AC00B6D00A /* XPMinePersonalCenterCell.m in Sources */, - E8AC722426F47E5E007D6E91 /* XPMineFeedbackViewController.m in Sources */, - 4C1A141B2DCB4AB700B6D0CA /* ChatFaceVo.m in Sources */, - E8664ED627E434D5000171BA /* XPRoomPKRecordViewController.m in Sources */, - E87E914E2796678D00A7B3F2 /* XPMineDressEmptyTableViewCell.m in Sources */, 232EBBFF2BD7A25500E8CEAD /* MSParamsDecode.m in Sources */, - 9B7D804D27537950003DAC0C /* MessageCell.m in Sources */, - 23E9EAA62A84C97C00B792F2 /* XPMineUserInfoTagVC.m in Sources */, - E8950180282CAC49007E459A /* XPMomentsUserInfoView.m in Sources */, - 18F404C927609A4300A6C548 /* MessagePresenter.m in Sources */, - 9BC9DAEF27E33B3F009EE409 /* XPRoomGiftAnimationParser.m in Sources */, - E81366E326F0A1FC0076364C /* LoginBindPhoneViewController.m in Sources */, - 1464C5F329A4C18000AF7C94 /* XPIAPRechargeViewController.m in Sources */, E85E7B662A4EC35A00B6D00A /* XPIncomeRecordGoldDetailsModel.m in Sources */, - 9B2EA7CC2804245500ED17BF /* XPAnchorPKPanelUserView.m in Sources */, - 23EE970A2BA2D39C00475D69 /* PIWebViewSavePhotoView.m in Sources */, - 2331C1B42A60F32D00E1D940 /* XPCandyTreeRankTableViewCell.m in Sources */, - 4CA532BD2D5CA49A00B8F59F /* OpenLuckyPackageEntranceView.m in Sources */, - 9B85B6DA279FDC5200A0A1AC /* XPUserCardSkillCollectionViewCell.m in Sources */, - E85E7B0D2A4EB0D200B6D00A /* GuildSuperAdminInfoModel.m in Sources */, - 54F1790A2C8EDDF400CB5219 /* CountdownRingView.m in Sources */, - 9B1B72AF280031F8003FACE9 /* XPAnchorPKSelectRoomView.m in Sources */, - 5412E0FD2C52512100FDD668 /* RoomBottomEntranceModel.m in Sources */, - E818DD1C2A4896EE00F163F7 /* XPLoginAraeViewController.m in Sources */, - 4C6E31EE2D363CA800D8EEDD /* addMoveAnimationToView.m in Sources */, 23959FE72BB15C930085A282 /* UploadFileModel.m in Sources */, - 54AE7E142C9AD9AB006D2BE2 /* CPCard.m in Sources */, - E8D4824A278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m in Sources */, - E85E7B432A4EB0D300B6D00A /* XPMineExchangeAuthorityHeadView.m in Sources */, - 23194DD02AD14BF000649F51 /* DDLog.m in Sources */, 189DD73F26E21C3F00AB55B1 /* YYUtility+Carrier.m in Sources */, - E87AE7F9277AABE50037823A /* XPRoomTagListViewController.m in Sources */, - E85E7B472A4EB0D300B6D00A /* XPMineGuildManagerPerTableViewCell.m in Sources */, - E824544326F58FCE00BE8163 /* XPMinePayPwdInputView.m in Sources */, - 23C7C0B72A7CD7B000802205 /* XPNewMineGuildItemView.m in Sources */, - 23A7FB692BDDEDFA00411860 /* MSRoomGameWebVC.m in Sources */, 23CEFC5D2AFB8FC100576D89 /* BSRecordModel.m in Sources */, - 9B1B72A1280023F3003FACE9 /* XPMineAnchorFansTeamTableViewCell.m in Sources */, - E880B3AC278BD98600A83B0D /* XPAcrossRoomPKEmptyTableViewCell.m in Sources */, - E8C1CD7A27D8B29E00376F83 /* RoomFaceInfoModel.m in Sources */, - E81C1B1C27705F6B0020D1E4 /* XPArrangeMicPresenter.m in Sources */, - E85E7BB32A4ED45300B6D00A /* XPPageControl.m in Sources */, - 23E9EA6B2A83808000B792F2 /* ContentTreasureFairyModel.m in Sources */, - E85E7B3E2A4EB0D300B6D00A /* XPGuildIncomeRecordTableViewCell.m in Sources */, - E8A88D2727E8193400CA8837 /* XPRoomPKSelectUserView.m in Sources */, 9B0E1C5926E77022005D4442 /* BaseNavigationController.m in Sources */, - E8664ED927E4355C000171BA /* XPRoomPKRecordTableViewCell.m in Sources */, - 23FF42762AA6E1480055733C /* XPHomeRecommendOtherRoomView.m in Sources */, 142721B229A7647F00C7C423 /* XPBlankViewController.m in Sources */, - 4C0B4A442E65A0D300D67F73 /* XPRoomCleanMessagesAction.m in Sources */, E85E7B6B2A4EC39400B6D00A /* XPMineExchangeAuthorityModel.m in Sources */, - E836456B2A40A33300E0DBE4 /* MineSkillCardListInfoModel.m in Sources */, - 236B2E482AA07D06003967A8 /* XPLittleGameMiniStageView.m in Sources */, - E85E7B1C2A4EB0D200B6D00A /* XPMineHallAnchorIncomeStatisViewController.m in Sources */, - 4CD15D952D7FE9E400D9279F /* LoginTypesViewController.m in Sources */, - 239BEEDB2AA1E058005CDA94 /* PIHoemCategoryTitleView.m in Sources */, - E81060FD2987CC9100B772F0 /* MessageLevelUpgradeModel.m in Sources */, - 2305EF0D2AD7CC9A00AD403C /* PIRoomPhotoAlbumChooseGiftCell.m in Sources */, - E84BF7DD277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m in Sources */, E8F6135C291E26BD00E12650 /* NSMutableDictionary+Saft.m in Sources */, - 239D0F992BFB43BC002977CE /* MSRoomOnLineAvatarView.m in Sources */, 1427213429A75A2600C7C423 /* XPMomentsLatestPresenter.m in Sources */, - E83ABEFD280EB5E200322EE4 /* ContentOpenLiveInfoModel.m in Sources */, - E85E7BAF2A4EC99300B6D00A /* XPMineChooseGiveDiamondVC.m in Sources */, E8EEB8F426FC2050007C6EBA /* SDBrowserImageView.m in Sources */, - E88863CC278EC336004BCFAB /* AcrossRoomPKPrizeModel.m in Sources */, - 236B2E492AA07D06003967A8 /* XPCreateLittleGameCollectionViewCell.m in Sources */, - 2305EF042AD6B11700AD403C /* PIRoomPhotoAlbumChoosePhotoTypeView.m in Sources */, - 2305EEF02AD677F200AD403C /* PIRoomPhotoAlbumVC.m in Sources */, - 54C9A1132C3D5A2300C6D970 /* XPGameOrdersListViewController.m in Sources */, - 14B880E7299A4B62005FCA1B /* XPLoginPhoneViewController.m in Sources */, - E824544626F5934700BE8163 /* XPMinePayPwdPresenter.m in Sources */, - 4C51B09C2DA3B4C600D8DFB5 /* LudoGameViewController.m in Sources */, 189DD54B26DE338800AB55B1 /* BaseViewController.m in Sources */, - E8B846C226FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.m in Sources */, - 233423CD2AAEE98200B1253F /* XPCandyTreeConfirmBuyNumView.m in Sources */, - 2331C1AD2A60F32D00E1D940 /* XPCandyTreeAnimationModel.m in Sources */, - E816C11527608A7500C84014 /* XPRoomMiniManager.m in Sources */, - E81060EB2987BE8300B772F0 /* MessageGiftModel.m in Sources */, - 4C0B4A472E65A51600D67F73 /* XPRoomRedPacketAction.m in Sources */, - E8EEB91726FC7B35007C6EBA /* XPMineUserInfoDesViewController.m in Sources */, - 544A36352C94160F00CA7858 /* RoomMenuBar.m in Sources */, - 9B1B72AC280031DB003FACE9 /* XPAnchorPKViewController.m in Sources */, - 4CEB9EA72D09643E00443480 /* UserRoomCardViewController.m in Sources */, - 237852A12C072D8D00E360AC /* MSRoomGameModel.m in Sources */, - 180806FB2729A354001FD836 /* ThemeColor+Room.m in Sources */, - 9BC8C83028090C9200C24F85 /* XPRoomAnchorRankBannerView.m in Sources */, - E81A653F283511BE00F55894 /* XPMonentsInteractiveViewController.m in Sources */, - 1464C5EA29A45FC300AF7C94 /* XPButton.m in Sources */, - 54E82EB12CA93BE200C931D9 /* BoomInfoViewController.m in Sources */, - 2331C17E2A5ECCF600E1D940 /* XPNobleCenterPayView.m in Sources */, - E8395331276A03AE00CF2F24 /* Api+DressUp.m in Sources */, - E8B3E8092848B871009746AB /* InviteUserInfoModel.m in Sources */, - E85E7B352A4EB0D300B6D00A /* XPClanMemberTableViewCell.m in Sources */, - 54E82EA82CA6940900C931D9 /* RoomBoomResultView.m in Sources */, - 23194DBB2AD13EAB00649F51 /* PILoginManager.m in Sources */, - E8DEC99E2764A5B60078CB70 /* XPRoomMoreMenuViewController.m in Sources */, - 4C6E1F7C2CEB25B10073D0A3 /* ShoppingMallItemPreview.m in Sources */, - 4CA532C02D5CA4D300B8F59F /* LuckyPackageStatusView.m in Sources */, - E82325F2274E2DE6003A3332 /* XPUserCardViewController.m in Sources */, - 4CA532B72D5B333200B8F59F /* RoomLuckyPackageInfoModel.m in Sources */, - E85E7B512A4EB0D300B6D00A /* Api+Guild.m in Sources */, - 4C9828132E6EB50000FC6345 /* MicCpInfoModel.m in Sources */, - E83645682A40A2DC00E0DBE4 /* XPSkillCardPlayerManager.m in Sources */, - E8F65C222869A36F009BB5B9 /* ContentShareMonentsModel.m in Sources */, - 9B6E856E281AABAB0041A321 /* XPRoomRecommendModel.m in Sources */, - E84A2E992A52817E00D6AF8A /* XPIncomeRecordView.m in Sources */, - E801274B27E327DA00BAC3F2 /* XPRoomPKTypeTableViewCell.m in Sources */, - 2331C1B02A60F32D00E1D940 /* XPCandyTreeMoreView.m in Sources */, - 4CC6195D2CEC996E008C1EE8 /* MyDressingDataModel.m in Sources */, - E8412FB02779CB4D006E1101 /* XPRoomSettingPresenter.m in Sources */, - E878893C273A54C300BF1D57 /* Api+Gift.m in Sources */, - E897ABFC28AF2E71003B3587 /* XPSailingGiftView.m in Sources */, 4CD19EB42E9D141A0069DAA0 /* EPMineViewController.m in Sources */, - E8998D8028597B0300C68558 /* XPRoomLuckyBigPrizeView.m in Sources */, - E88E4A80297673DC00019A50 /* SessionNavLiveView.m in Sources */, - 544879EA2CD215F400D58DC1 /* CustomRoomBGCell.m in Sources */, - E81060DC298761F100B772F0 /* MessageTextModel.m in Sources */, - 23C9DFC62B84903500B51558 /* PIRoomActivityChoosePlayView.m in Sources */, 235A45232B04BEB6009753F5 /* PIBaseModel.m in Sources */, - E8DEC9A82764A68B0078CB70 /* Api+MoreMenu.m in Sources */, - 9B86D87A2817DD8400494FCD /* XPRoomEnterHideTipView.m in Sources */, - 4CCB809F2DD5DFDF00C756D3 /* EventRoomModel.m in Sources */, - 23FE47E12BB41CF200F09D23 /* PINobleCenterListReusableView.m in Sources */, - 4CE746D52D92C1080094E496 /* BravoGiftWinningFlagView.m in Sources */, - E85E7B122A4EB0D200B6D00A /* GuildIncomeRecordModel.m in Sources */, E81C27A026EEF83D0031E639 /* YUMIHtmlUrl.m in Sources */, - E8F1558D28124D5200EE8C06 /* MessageConentAudioView.m in Sources */, - 4C520D882D89A78C0051C784 /* VisitorListViewController.m in Sources */, - E8E20BDB281645300033B688 /* SessionInfoViewController.m in Sources */, - 2331C1B92A60F32D00E1D940 /* Api+CandyTree.m in Sources */, E8AB631C28ADE30E0023B0D2 /* XPMonentsTopicLatestPresenter.m in Sources */, - E80A63DC28B86B9700690914 /* MessageContentMonentsAutoView.m in Sources */, - E8098CB4282E97550090B9F0 /* XPMineBlackListPresenter.m in Sources */, - E87DF4DD2A42CA12009C1185 /* HomeSearchResultModel.m in Sources */, - 1464C5F029A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.m in Sources */, - E85E7B2C2A4EB0D300B6D00A /* XPClanSectionView.m in Sources */, - E801274E27E3280000BAC3F2 /* XPRoomPKVoteTableViewCell.m in Sources */, 18E7B1B726E8B2D10064BC9B /* Api+Main.m in Sources */, - E87DF4D72A42C9C3009C1185 /* HomePlayRoomModel.m in Sources */, - E8B846D326FDDBE600A777FE /* XPMineRechargeTableViewCell.m in Sources */, - E8D48256278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.m in Sources */, - E85E7B372A4EB0D300B6D00A /* XPMineGuildListCell.m in Sources */, - E85E7B502A4EB0D300B6D00A /* XPMineGuildListVC.m in Sources */, - E824546126F5F4E400BE8163 /* XPMineResetPayPwdViewController.m in Sources */, - 239D0FCF2C046048002977CE /* MSTabbarRoomGameHeadView.m in Sources */, - E81D58822720082A003063FE /* MicroWaveView.m in Sources */, - E8A73F8728586A6F00FD9CBC /* XPGiftWeekStarCollectionViewCell.m in Sources */, E8B825C226EA00DF009E8E9F /* LoginVerifCodePresent.m in Sources */, - E878B85B2835F3BF00E22DCF /* XPMonentsInteractiveTableViewCell.m in Sources */, - 9BCFB828289BAC7D0093D863 /* XPMineHeadFunctionItemLayout.m in Sources */, - E8D34D6428084E40009C4835 /* XPMineUserInfoGiftWallViewController.m in Sources */, - E899C68927508F4E00E189E5 /* XPUserCardInfoModel.m in Sources */, - 9B6B3AAB278C2EA7005551EC /* XPRoomNobleLevelUpView.m in Sources */, - E85E7B302A4EB0D300B6D00A /* XPGuildIncomeHeaderView.m in Sources */, - E85E7B222A4EB0D300B6D00A /* XPMineGuildIncomeRecordViewController.m in Sources */, - 544B19B32CA129A800885BEB /* CPLevelUpAnimation.m in Sources */, - 9BD2ECD5288F838200F5CD9A /* XPMineFootPrintPresenter.m in Sources */, - 9B1B72BF2800422E003FACE9 /* XPAnchorPKRuleView.m in Sources */, - 54F469352C29711400A83655 /* XPMomentUserDataViewController.m in Sources */, - 1427219729A75F6F00C7C423 /* DDRange.m in Sources */, - 4CD6FF662D673A5C00262AB7 /* AgentMessageModel.m in Sources */, - E85E7B6E2A4EC4AE00B6D00A /* XPMineGuildPresenter.m in Sources */, 23CEFC5B2AFB8FC100576D89 /* BSSelectView.m in Sources */, - 239D0FAA2BFCB88D002977CE /* XPRoomDatingWebAlertView.m in Sources */, - 9B42869528C1E00A009034D2 /* XPRedPacketResultModel.m in Sources */, - 2331C16E2A5EB71000E1D940 /* XPNobleAuthorityDescView.m in Sources */, - 9BE01AE428937EDE00B50299 /* XPDressUpShopCollectionViewCell.m in Sources */, - 1427219129A75F6F00C7C423 /* MultipartMessageHeaderField.m in Sources */, - 54E82EAE2CA9293C00C931D9 /* BoomInfoModel.m in Sources */, - E8BD0F8B28A9EB0A00DE050D /* RoomSailingPrizeListModel.m in Sources */, - 9BA812DD28BF6A7300783EA7 /* XPRoomRedPacketPresenter.m in Sources */, E85E7B642A4EC35A00B6D00A /* XPIncomeRecordModel.m in Sources */, - 544879ED2CD22A6B00D58DC1 /* CustomRoomBGPresenter.m in Sources */, - 4C886BE82E013C55006F0BA7 /* MedalsViewController.m in Sources */, - E85E7B082A4EB0D200B6D00A /* XPMineManagerSetPresenter.m in Sources */, - 18E7B1B226E8AF980064BC9B /* MainPresenter.m in Sources */, E81366F626F0C0DF0076364C /* LoginFullInfoPresenter.m in Sources */, - 4C7547312E55A7ED00C6E821 /* TouchAreaCacheManager.m in Sources */, - E8A30BEE28534AB1003B4873 /* XPSessionFindNewPresenter.m in Sources */, - 9BDA3E7727FD41C200517FE6 /* XPAnchorFansTeamViewController.m in Sources */, - 4C0A5B902E03EF4B00955219 /* MedalsWearingViewController.m in Sources */, - 23E9EAAD2A84C9B800B792F2 /* XPMineUserInfoTagItemView.m in Sources */, - 18A61BE8274F9CF000A09A54 /* SessionListViewController.m in Sources */, - E8C1CD6A27D8937800376F83 /* XPRoomFaceCollectionViewCell.m in Sources */, - 4CC77BBD2E66A33C0067DA96 /* XPRoomEffectAction.m in Sources */, - 9B2EA7C02804037700ED17BF /* AnchorPKStageView.m in Sources */, 23CEFC622AFB8FC100576D89 /* BSLogNetDetailViewController.m in Sources */, - E811FFF72742367B00918544 /* XPGiftEmptyCollectionViewCell.m in Sources */, - 4C71C6A22D06DB3D00ECCA24 /* GiftAnimationManager.m in Sources */, - E82D5C73276AE94800858D6D /* CarModel.m in Sources */, - E85E7B0B2A4EB0D200B6D00A /* XPGuildSetNamePresenter.m in Sources */, - E87E62762A3F5907002F68C9 /* XPNewHomePlayTableViewCell.m in Sources */, - 18F403EE2758CF2F00A6C548 /* MessageContentImage.m in Sources */, 18E7B31E26F0984C0064BC9B /* UserLevelVo.m in Sources */, - 23B8D8DB2B85FDDD00CA472F /* PIHomeCategoryTitleModel.m in Sources */, - 2331C1762A5EB71000E1D940 /* ThemeColor+NobleCenter.m in Sources */, - 1427218C29A75F6F00C7C423 /* HTTPAsyncFileResponse.m in Sources */, - E8DD25DA295583920043C7D5 /* XPAnchorRandomPKRuleView.m in Sources */, - E8664EDC27E43632000171BA /* XPRoomPKEmptyTableViewCell.m in Sources */, - E8778AE42988B57B00CF139B /* MessageContentRevokeView.m in Sources */, - E880B3A9278BD82300A83B0D /* AcrossRoomPKInfoModel.m in Sources */, - 9B88E20F28C6305400D26FBA /* XPRoomSearchRecordViewController.m in Sources */, - E84A2E892A527DF800D6AF8A /* XPIncomeRecordVC.m in Sources */, - 4CD47BC92E61A78D00BCDA46 /* XPRoomSettingAction.m in Sources */, - E82D5C7A276B25D100858D6D /* SpriteSheetImageManager.m in Sources */, - E85E7BB02A4EC99300B6D00A /* Api+GiveDiamond.m in Sources */, 4C7B909B2E9F822900A5E236 /* EPEmotionColorWheelView.m in Sources */, - E874B88B27215EAF003954B9 /* MicroQueueModel.m in Sources */, - 9B1B72B828003772003FACE9 /* XPAnchorPKPresenter.m in Sources */, - E8EE827D272B9A2300A17217 /* XPRoomSendTextView.m in Sources */, E8AB631928ADE2F40023B0D2 /* XPMonentsTopicRecommendPresenter.m in Sources */, - 9BD63FAE277EE97A006EB744 /* XPReleaseRadioPresenter.m in Sources */, - 9B1FC3D827E49C36006EFFE0 /* XPMineDressBubbleCollectionViewCell.m in Sources */, - 9BE01AEA2893CB4400B50299 /* XPDressSearchViewController.m in Sources */, - E8751E6B28A64C6E0056EF44 /* XPSailingRankTableViewCell.m in Sources */, - 9B1B72B528003664003FACE9 /* Api+AnchorPk.m in Sources */, - 23194DCC2AD14BF000649F51 /* DDTTYLogger.m in Sources */, - E8EEB90626FC5772007C6EBA /* XPMineUserInfoEditViewController.m in Sources */, - 23E9EA912A84BD5B00B792F2 /* XPMineUserInfoIndividualTagView.m in Sources */, - E8B846D626FDE01B00A777FE /* XPMineRechargePresenter.m in Sources */, - E8A30BF628534B35003B4873 /* FindNewUserInfoModel.m in Sources */, 23D8DEF22AC5633300644637 /* PIIAPRegulate.swift in Sources */, - E801274027E323C800BAC3F2 /* XPRoomPKViewController.m in Sources */, - E8EEB91426FC7786007C6EBA /* XPMineUserInfoNickViewController.m in Sources */, 18E7B31B26F0982E0064BC9B /* UserExpand.m in Sources */, - 236B2E592AA18E13003967A8 /* XPMIneGameCollectionViewCell.m in Sources */, - 9BDA3E7D27FD47AB00517FE6 /* XPAnchorFansTeamPresenter.m in Sources */, - E8C6FFE62754FE53004DC9F0 /* XPHomeSearchPresenter.m in Sources */, - 2320F6422BE0F53F00227EEB /* MSRoomMenuGameEmptyCell.m in Sources */, 9B2A12DE2783FEDD00CED41B /* UserVipInfoVo.m in Sources */, - 233423CA2AAEE97500B1253F /* XPCandyTreeConfirmBuyView.m in Sources */, - E824543526F57D6E00BE8163 /* XPLoginVerifBindPhoneViewController.m in Sources */, - E8680718271967B00024F48F /* MicroView.m in Sources */, - E896EF942771AAC100AD2CC1 /* XPMineFansPresenter.m in Sources */, - E8751E5F28A62A970056EF44 /* XPSailingPresenter.m in Sources */, - E84A2E962A5280F900D6AF8A /* XPExchangeDiamondsView.m in Sources */, - 23F9636A2BB6919D00F440A6 /* PINobleRebateModel.m in Sources */, - E8DAC5AC2858305A00012CFD /* XPRoomMessageBubbleView.m in Sources */, - 1427218929A75F6F00C7C423 /* HTTPDataResponse.m in Sources */, - E8B9843028AB90200022D026 /* XPMoentsTopicListView.m in Sources */, - 4CBDC42D2DC0BBB7005A75B9 /* EventCenterEventCell.m in Sources */, - 23E9EA9A2A84C39700B792F2 /* XPMineUserInfoRecordedSoundView.m in Sources */, - E8E20BDE28164D3A0033B688 /* SessionNavView.m in Sources */, 9B734F76288A92FB00CBDAA9 /* XPMineFunctionItemModel.m in Sources */, - 541DD9552C1EDEFB00B616C4 /* XPHomePagingViewController.m in Sources */, - E82D5C70276AE60000858D6D /* HeadwearModel.m in Sources */, - 4C5C37232D0C1C7900BA9AB8 /* RegionListViewController.m in Sources */, - 4CE746C62D9297C30094E496 /* BravoGiftTipModel.m in Sources */, - 4CCFDA032DD59211009BD2FD /* Api+EventCenter.m in Sources */, - E880B3A1278BD60C00A83B0D /* XPAcrossRoomPKSelectRoomView.m in Sources */, - 9B3C181A292CE4FA003AF543 /* XPAnchorPKMatchView.m in Sources */, 23E9EA852A84B6FD00B792F2 /* XPSoundCardModel.m in Sources */, - E8D48250278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m in Sources */, - 18F404C3276098F100A6C548 /* Api+Message.m in Sources */, - 9B85B6D7279FDABA00A0A1AC /* XPUserCardSkillCardView.m in Sources */, 4C7B8F632E9F6E1300A5E236 /* EPSignatureColorGuideView.m in Sources */, 9B33E3CB27D85379003B0E62 /* UploadFile.m in Sources */, - E8AEAEF327141C7C0017FCE0 /* XPRoomMessageContainerView.m in Sources */, 9B1B729D28002264003FACE9 /* XPMineAnchorFansTeamModel.m in Sources */, - E8C6FFE02754EEF9004DC9F0 /* XPHomeSearchViewController.m in Sources */, - E87E627F2A3F5D28002F68C9 /* XPNewHomePlayItemCollectionViewCell.m in Sources */, - E8AE427327153A3500BEEBB2 /* XPRoomActivityContainerView.m in Sources */, - 23E9E99B2A80C40000B792F2 /* XPMineGuildPersonalBillRecordHeadView.m in Sources */, - 2305EEF32AD67A8D00AD403C /* PIRoomPhotoAlbumItemVC.m in Sources */, - 2331C1B22A60F32D00E1D940 /* XPCandyTreeEmptyableViewCell.m in Sources */, - E85E7B072A4EB0D200B6D00A /* XPGuildPresenter.m in Sources */, - 2331C17B2A5EB7AB00E1D940 /* XPNobleCenterEntranceView.m in Sources */, - 9BB89DC627FEB9E100586A83 /* XPAnchorFansTaskViewController.m in Sources */, - E8E20BEF2816A5FC0033B688 /* XPMineBlackListTableViewCell.m in Sources */, - 4C38C2AD2D84064400CFA4A8 /* LoginInputItemView.m in Sources */, - 23BA165B2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m in Sources */, - 18486217271EAB8C005FC5DC /* BaseRtcImpl.m in Sources */, - E8DACCFB2766EDC60052092C /* MicroGiftValueView.m in Sources */, - E85E7BAE2A4EC99300B6D00A /* XPMineGiveDiamondVC.m in Sources */, - 23942E912A86424500D0ECC2 /* XPLoginAuthCodeVC.m in Sources */, E8CEA03D26EA3DE500644B44 /* LoginPasswordPresent.m in Sources */, - 2331C1752A5EB71000E1D940 /* XPNobleUpgradeLevelView.m in Sources */, - E885D533297798E1004DC088 /* SessionSettingTableViewCell.m in Sources */, - E85E7BA82A4EC99300B6D00A /* XPMineChooseGiveGiftViewCell.m in Sources */, - E8E70D7726F2F15100F03460 /* XPMineViewController.m in Sources */, - 9B1FC3D527E49A5D006EFFE0 /* ChatBubbleModel.m in Sources */, - E896EFA62771AEDD00AD2CC1 /* XPMineFansTableViewCell.m in Sources */, - E8E7DAEB2745158500C631CC /* XPGiftUserInfoModel.m in Sources */, - E88863C6278EAFC3004BCFAB /* XPAcrossRoomPKResultView.m in Sources */, - E8AC722C26F49580007D6E91 /* XPMineNotificaViewController.m in Sources */, - 237B94BF2A984DA7007853E3 /* XPRoomTrumpetView.m in Sources */, 4CD19EAE2E9CDFC30069DAA0 /* EPLoginButton.swift in Sources */, 4CD19EAF2E9CDFC30069DAA0 /* EPLoginInputView.swift in Sources */, - 9B335B492925D8A00048A116 /* XPAnchorPKSelectTypeController.m in Sources */, - E8098CAE282E07C00090B9F0 /* XPMomentsEmptyTableViewCell.m in Sources */, - E85E7B4F2A4EB0D300B6D00A /* XPMineExchangeAuthorityVC.m in Sources */, - 23FE47DB2BB4171C00F09D23 /* PINobleCenterListView.m in Sources */, - 4C75CEFB2D6318FF009147A5 /* RoomEnterModel.m in Sources */, - E84A2E932A527EC800D6AF8A /* XPIncomeRecordPresent.m in Sources */, - 236B2E432AA07D06003967A8 /* NSString+RW.m in Sources */, - 239D0FC92C045F92002977CE /* MSRoomGameVC.m in Sources */, 4C0642852E97BD9500BAF413 /* APIConfig.swift in Sources */, - E85E7B172A4EB0D200B6D00A /* ClanMemberDetailInfoModel.m in Sources */, - 54C3895C2C215F5100FD47B1 /* XPHomeMineViewController.m in Sources */, - 9B044DA0282D32F700DE4859 /* MicroInviteExtModel.m in Sources */, - E8D7D74B282BA1EC0007D7BD /* XPMomentsTableViewCell.m in Sources */, E8D34D5A28082357009C4835 /* UserGiftWallInfoModel.m in Sources */, - 5461041C2CD4D35A00066B21 /* RoomHighValueGiftBannerAnimation.m in Sources */, - E82107842987E35300DE7040 /* MessageMonentsAutoModel.m in Sources */, 189DD52E26DE255300AB55B1 /* AppDelegate.m in Sources */, - 23FE47E42BB41EBF00F09D23 /* PINobleCenterListCell.m in Sources */, - E83DB4842746661800D8CBD1 /* XPRoomGiftBroadcastView.m in Sources */, - E8778AF82988F4E200CF139B /* XPSessionSayHelloHeaderView.m in Sources */, - 4C3475C42DD1FE590099B984 /* CreateEventSelectRoomViewController.m in Sources */, - E8B9843328ABA2FF0022D026 /* MonentsPicResInfo.m in Sources */, - 239D0FDB2C047F24002977CE /* MSTabbarRoomGameCell.m in Sources */, - 54F469412C2AB56900A83655 /* XPMineGiftsTableViewCell.m in Sources */, - 235714982BEDF54E004C81D6 /* MsRoomMessageMainView.m in Sources */, - 237852A72C08764B00E360AC /* MSRoomGameResultsModel.m in Sources */, - 9BE9F10227FEE5C200667200 /* XPAnchorFansTaskDetailModel.m in Sources */, - E8E0DAE6285C280E00566A2F /* XPSessionFindNewAlertView.m in Sources */, - E85E7B1A2A4EB0D200B6D00A /* XPMineGoldIncomeRecordVC.m in Sources */, - E86596542701A55500846EBD /* StatisticsServiceHelper.m in Sources */, - E8E21A9B28B4BD92008F7C9D /* XPRoomGraffitiGiftAnimationView.m in Sources */, - E85E7B102A4EB0D200B6D00A /* GuildIncomeDetailModel.m in Sources */, - E85E7B132A4EB0D200B6D00A /* GuildSearchUserInfoModel.m in Sources */, - E8E70D8C26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.m in Sources */, - 9B17F71827BD150600440843 /* SVGAParserManager.m in Sources */, - E87DF5052A42CE21009C1185 /* XPHomeSearchRecordCell.m in Sources */, - E8751E5928A62A390056EF44 /* Api+Sailing.m in Sources */, - E897ABFF28AF39B4003B3587 /* XPSailingAnimationView.m in Sources */, - E885D5362977CE28004DC088 /* SessionSettingModel.m in Sources */, - 9BE01AE128937DBC00B50299 /* XPDressUpShopCardViewController.m in Sources */, - E896EFA22771AE9400AD2CC1 /* XPMineFriendViewController.m in Sources */, - 1427218D29A75F6F00C7C423 /* HTTPRedirectResponse.m in Sources */, - E875A1B829755EE200AB1BBD /* SessionUserInfoTableViewCell.m in Sources */, - E8E70D8C26F2F5A500F03460 /* XPMineHeadItemCollectionViewCell.m in Sources */, - 9BE9F0FC27FED2E100667200 /* XPAnchorFansJoinModel.m in Sources */, - E87DF50B2A42CEC9009C1185 /* HomeEveryOneSearchModel.m in Sources */, - 23E9EA8B2A84B9BD00B792F2 /* XPMineUserInfoTagFlowLayout.m in Sources */, - 9B6E856A281A982A0041A321 /* XPRoomRecommendView.m in Sources */, - E8DBB6FD27B63CE000AA285D /* LittleGameMicroView.m in Sources */, - E85E7B4A2A4EB0D300B6D00A /* XPMineMangerListViewController.m in Sources */, E81C278D26EAFAF60031E639 /* DESEncrypt.m in Sources */, - E85E7BB92A4ED89F00B6D00A /* XPIncomeRecordGoldDetailsHeadView.m in Sources */, - E84A2EAB2A528A4100D6AF8A /* XPIncomeRecordGoldDetailsPickViewView.m in Sources */, - E82107812987D7F300DE7040 /* MessageMonentsModel.m in Sources */, E81366E726F0A49E0076364C /* NSString+Utils.m in Sources */, - 23194DD22AD14BF000649F51 /* DDFileLogger.m in Sources */, - E8EEB90126FC31B6007C6EBA /* XPMineUserInfoPresenter.m in Sources */, - 4CCA0C6E2DDED89F00E30513 /* Custom9MicLayout.m in Sources */, - 4CCA0C6F2DDED89F00E30513 /* UserRoomMicPositionView.m in Sources */, - 4CCA0C702DDED89F00E30513 /* UserRoomMicPositionCell.m in Sources */, - 4CCA0C712DDED89F00E30513 /* Custom19MicLayout.m in Sources */, - 4CE746D22D92A2660094E496 /* BravoGiftBannerView.m in Sources */, - 4C864A022D55F4F600191AE0 /* LuckyPackagePresenter.m in Sources */, - E81A65312834E53600F55894 /* XPMomentsLatestViewController.m in Sources */, - 18F404BB2760982000A6C548 /* ChatLimitModel.m in Sources */, - E8A30BE828534A63003B4873 /* XPSessionFindNewTableViewCell.m in Sources */, - 9BE9F10527FF04CF00667200 /* XPAnchorFansTaskTableViewCell.m in Sources */, - 4C6E31EC2D35010F00D8EEDD /* RoomAnimationView.m in Sources */, - 23FF25792ABD67CD0064E904 /* XPFreeGiftModel.m in Sources */, - 9B92A33C2797E38100AD168F /* XPMineHeadItemTableViewCell.m in Sources */, - E854103928646A00005CFD9F /* XPMonentsReplyMoreTableViewCell.m in Sources */, - 9B8DE0E1289CF02900FB6EC2 /* XPGiftCompoundModel.m in Sources */, - 23FF256E2ABC48810064E904 /* XPSessionMainViewController.m in Sources */, - E85E7B092A4EB0D200B6D00A /* XPGuildRemoveMemberPresenter.m in Sources */, - E8950186282CAC80007E459A /* XPMomentsTooBarView.m in Sources */, - E86507E5281A7D4D006951B0 /* MessageContentTweetView.m in Sources */, - 4C7F2A6B2E0BE7E7002F5058 /* FirstRechargeManager.m in Sources */, - E824544B26F5BBB800BE8163 /* XPMineModifPayPwdViewController.m in Sources */, - E81C1B2227705F950020D1E4 /* Api+ArrangeMic.m in Sources */, - E8E20BE828169BDC0033B688 /* XPMineLoginPasswordPresenter.m in Sources */, - E85E7B3F2A4EB0D300B6D00A /* XPGuildSingleRoomIncomeTableViewCell.m in Sources */, - 9B1EF3D227E81C0600554295 /* XPMineDressUpBubbleViewController.m in Sources */, - 2331C1AB2A60F32D00E1D940 /* CandyTreeResultModel.m in Sources */, - 23C9DFC32B84807A00B51558 /* PIRoomActivityClickView.m in Sources */, - 1427218B29A75F6F00C7C423 /* HTTPFileResponse.m in Sources */, - 4C75CEFE2D632CD5009147A5 /* CPEnterRoomTableViewCell.m in Sources */, - E839533C276A0CCD00CF2F24 /* XPMineCarTableViewCell.m in Sources */, - 2331C1B62A60F32D00E1D940 /* XPCandyTreeInsufficientBalanceView.m in Sources */, - E8751E7128A6541B0056EF44 /* RoomSailingRankModel.m in Sources */, - E85E7B452A4EB0D300B6D00A /* XPMineExchangeAuthorityFooderView.m in Sources */, - E8EEB8FE26FC2DF8007C6EBA /* XPMineUserInfoCustomNavView.m in Sources */, - E85E7B2E2A4EB0D300B6D00A /* XPGuildSearchNavView.m in Sources */, - E87E62752A3F5907002F68C9 /* XPNewHomePlayEmptyTableViewCell.m in Sources */, - 2331C1682A5EB71000E1D940 /* NobleAuthInfo.m in Sources */, - E896EF972771AAE400AD2CC1 /* XPMineAttentionPresenter.m in Sources */, - E86F6185284F4E4800E8EC9A /* RoomHalfHourRankModel.m in Sources */, - 9B208A362779B50100F9E54A /* GiftNobleInfoModel.m in Sources */, - E80A086227F2AC190027B30C /* RoomPKDetailInfoModel.m in Sources */, - 4CAFF00A2DD342A400CD81DF /* MessagePublicEventModel.m in Sources */, - 4C816A7F2E826C7300EA6A45 /* XPMessageItem.m in Sources */, - 4C816A802E826C7300EA6A45 /* XPMessageDataSourceManager.m in Sources */, - E824545126F5CE6E00BE8163 /* XPMineModifPayPwdPresenter.m in Sources */, - E8098CB1282E86EF0090B9F0 /* XPMomentsContentView.m in Sources */, - E85E3FA728B7A6F000268DC8 /* MessageContentMonentsView.m in Sources */, - E880B3AF278BE1D800A83B0D /* Api+AcrossRoomPK.m in Sources */, 23CEFC4B2AFB8FC100576D89 /* BSUIDemoUtil.m in Sources */, - E8B9842D28AB77F10022D026 /* XPMonentsPublishTopicView.m in Sources */, - 239141C62AE129F700322CA9 /* PIInputScrollingView.m in Sources */, - E88C72992828F3620047FB2B /* XPRoomMusicLibraryTableViewCell.m in Sources */, - E8D34D4728080295009C4835 /* XPMineUserDataViewController.m in Sources */, - E801275127E3281100BAC3F2 /* XPRoomPKTimeTableViewCell.m in Sources */, - E8EEB90F26FC6AB8007C6EBA /* XPMineUserInfoEditPresenter.m in Sources */, - E873EB09280960990071030D /* XPMineUserInfoVoiceCardView.m in Sources */, - E85E7B162A4EB0D200B6D00A /* GuildInfoModel.m in Sources */, - E885D53C2977FBFD004DC088 /* MessageTimeView.m in Sources */, E8AC723A26F49AAE007D6E91 /* XPMineNotifyStatus.m in Sources */, - 4C0642882E97BDA300BAF413 /* GlobalEventManager.m in Sources */, - E87DF50E2A42CF15009C1185 /* HomeLiveRoomModel.m in Sources */, E8F6135F291E274E00E12650 /* NSArray+Safe.m in Sources */, - 4C44BD5D2D151B5C00F321FA /* RoomSideMenu.m in Sources */, - E87E62622A3F568A002F68C9 /* XPNewHomeNavView.m in Sources */, - 18E7B33226F317A20064BC9B /* XPWebViewController.m in Sources */, - E8AEAEF927141CA30017FCE0 /* RoomHeaderView.m in Sources */, - 545831A32C2AF01100364026 /* FifteenMicStageView.m in Sources */, - E8AB632428AE10310023B0D2 /* XPMomentsTopicListViewController.m in Sources */, - E8098CAA282E03B40090B9F0 /* XPMomentsRecommendPresenter.m in Sources */, - E8F63CBB298B648300B338BA /* SessionSayHelloListModel.m in Sources */, - 9B1B729828002147003FACE9 /* XPMineFansTeamPresenter.m in Sources */, - 23FF42702AA6C7CF0055733C /* XPNewHomeItemCell.m in Sources */, - E87DF4DA2A42C9D9009C1185 /* HomeCollectRoomModel.m in Sources */, - E86507E8281A8212006951B0 /* ContentTweetModel.m in Sources */, - E8D55CA0281186D6006935A5 /* SessionAudioRecordView.m in Sources */, - E8A88D2A27E81C8600CA8837 /* XPRoomPKUserCollectionViewCell.m in Sources */, - 9B7B606627BBA0EE0070BB72 /* XPAnchorAttentSendInfo.m in Sources */, - E81C1B29277069DD0020D1E4 /* XPArrangeMicEmptyTableViewCell.m in Sources */, - E8AC721C26F4720B007D6E91 /* XPMineSettingPresent.m in Sources */, - 2305EF102AD8006900AD403C /* PIRoomMessagePhotoAlbumCell.m in Sources */, - 4C0B4A502E65A68800D67F73 /* XPRoomAppManagerAction.m in Sources */, - E81060EE2987C35700B772F0 /* MessageTextClickModel.m in Sources */, - E87AE8C5284E1A8400CAFBB3 /* XPRoomNewUserGreetView.m in Sources */, - E87E627B2A3F5A0D002F68C9 /* XPNewHomeRecommendPresenter.m in Sources */, - 14DCAD08299B36A500A7DD31 /* XPLoginPwdViewController.m in Sources */, - E81060F42987C6B200B772F0 /* MessageOpenLiveModel.m in Sources */, - E8AEAEF027141C430017FCE0 /* XPRoomMenuContainerView.m in Sources */, - 9B85F3532806AB9A006EDF51 /* XPAnchorPKResultView.m in Sources */, 4C06427F2E97BD6D00BAF413 /* EPMineHeaderView.m in Sources */, 4C0642802E97BD6D00BAF413 /* EPMomentCell.m in Sources */, E8DEC99527648FA50078CB70 /* ClientConfig.m in Sources */, - 9B6E8577281ABECC0041A321 /* XPRoomInsideRecommendEmptyCell.m in Sources */, - 4CFE7F422E45ECEC00F77776 /* PublicRoomManager.m in Sources */, - E85E7BC22A4EE82300B6D00A /* XPMineListCell.m in Sources */, - E880B3A6278BD69900A83B0D /* XPAcrossRoomPKTableViewCell.m in Sources */, - 4C1392932D6D963700A6DFB5 /* SubRechargersViewController.m in Sources */, - 5456F3C82C6EF962000E1805 /* VIPCenterViewController.m in Sources */, - E8EEB90926FC579A007C6EBA /* XPMineUserInfoEditTableViewCell.m in Sources */, - E8F1559028125E2D00EE8C06 /* MessageAudioCenter.m in Sources */, 4CDF7F3F2E9E580E00113F54 /* EPEmotionColorStorage.m in Sources */, - E8901CF628B38D89001E9A92 /* XPGraffitiGiftView.m in Sources */, - E89DA67527009ACD008483C1 /* XPMineRechargeNavView.m in Sources */, - E81A6546283519CA00F55894 /* MomentsTopicModel.m in Sources */, - E86E79D028A4E0B2006DAF48 /* ContentRistAlertModel.m in Sources */, - 9BFE0D922899042600F53C24 /* XPTaskCompleteTipView.m in Sources */, - 54C9A10D2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m in Sources */, - 23B8D8DE2B860B8800CA472F /* PIHoemCategoryCollectionView.m in Sources */, - 9BE01AE728938AB600B50299 /* XPDressUpShopCardTableViewCell.m in Sources */, - E82E75062828E76400C25EF7 /* XPCoreDataManager.m in Sources */, - 9B8DE0E4289CF7AA00FB6EC2 /* XPRoomGiftCompoundView.m in Sources */, - 1808072D2731598F001FD836 /* XPNetImageYYLabel.m in Sources */, - 4CB41CEC2E053D6300528517 /* MedalsRankViewController.m in Sources */, - E818E348286ECA4B005EDF68 /* XPMonentsPublishViewController.m in Sources */, - 9B88E20C28C5EB8300D26FBA /* MessageContentRedPacketView.m in Sources */, - E896EFAF2771AF0F00AD2CC1 /* XPMineFriendEmptyTableViewCell.m in Sources */, - E8E859E928264F4500EE4857 /* XPRoomTransferMusicViewController.m in Sources */, - 18486213271EA9DA005FC5DC /* RtcManager.m in Sources */, - E8D34D5628080393009C4835 /* XPMineDataGiftCollectionViewCell.m in Sources */, - E84A2E9C2A52823900D6AF8A /* XPTextField.m in Sources */, 23CEFC602AFB8FC100576D89 /* RealViewCellModel.m in Sources */, 4CD19C872E9CB31C0069DAA0 /* EPLoginViewController.swift in Sources */, 4CD19C882E9CB31C0069DAA0 /* EPLoginState.swift in Sources */, 4CD19C892E9CB31C0069DAA0 /* EPLoginTypesViewController.swift in Sources */, 4CD19C8A2E9CB31C0069DAA0 /* EPPolicyLabel.swift in Sources */, - E8AB632C28AE19600023B0D2 /* XPMomentsMineViewController.m in Sources */, 23CEFC5F2AFB8FC100576D89 /* BSLogTableViewController.m in Sources */, - 236B2E4D2AA07D06003967A8 /* XPRoomLittleGameContainerView.m in Sources */, - E87AE8C1284E184300CAFBB3 /* RoomNewUserGreetModel.m in Sources */, - 239D0FAC2BFCB88D002977CE /* XPRoomRankEntranceView.m in Sources */, - 9BC5C91C277C8A7B007C8719 /* XPReleaseRadioViewController.m in Sources */, - 23B2AEC42A6516C200543D17 /* LoginForgetPasswordViewController.m in Sources */, - 23E9EB1E2A84DA5F00B792F2 /* XPMineUserInfoNavView.m in Sources */, - E85E7B332A4EB0D300B6D00A /* XPGuildIncomeSectionView.m in Sources */, - E85E7B0F2A4EB0D200B6D00A /* GuildRoomInfoModel.m in Sources */, - E801275527E3326000BAC3F2 /* XPRoomPKUserView.m in Sources */, - 4C75472E2E55837300C6E821 /* BannerScheduler.m in Sources */, - 2305EF132AD8036B00AD403C /* PIRoomMessagePhotoAlbumView.m in Sources */, 4C1064882E0014CF007E1586 /* NSMutableArray+Safe.m in Sources */, - E8D4824D278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m in Sources */, - 9BD8D4E628911F7700AE03FF /* XPMineCollectRoomListPresenter.m in Sources */, - 233423D92AB0438400B1253F /* PIMessageContentServiceReplyModel.m in Sources */, - E866B6E52759F96F009B002A /* XPMiniRoomView.m in Sources */, - 23E9EAB52A84CB2700B792F2 /* XPMineUserInfoTagEmptyView.m in Sources */, - 2331C1AE2A60F32D00E1D940 /* CandyTreeInfoModel.m in Sources */, - 239D0FEA2C04A9EE002977CE /* MSRoomGameSendMsgView.m in Sources */, E818E34B286ECABF005EDF68 /* XPMonentsPublishPresenter.m in Sources */, - E85E7B462A4EB0D300B6D00A /* XPGuildEmptyCollectionViewCell.m in Sources */, - 9B7B605B27BB53060070BB72 /* XPAnchorAudienceUpMicView.m in Sources */, 4CF67BA52DF9568C00EE5A28 /* BaseModelVo.m in Sources */, 23CEFC522AFB8FC100576D89 /* BSFileOptionModel.m in Sources */, - 14DCAD0E299B6AD900A7DD31 /* XPForgetPwdViewController.m in Sources */, - 23194DD12AD14BF000649F51 /* DDAbstractDatabaseLogger.m in Sources */, - 545831A02C2AEFAF00364026 /* TenMicStageView.m in Sources */, - 9BE9F0FF27FED76500667200 /* XPAnchorFansTaskModel.m in Sources */, - E85E7BAA2A4EC99300B6D00A /* XPMineGiveDiamondPwdView.m in Sources */, - 4C0A5B872E02BB1100955219 /* MedalsLevelIndicatorView.m in Sources */, - 23FF428E2AAB2D3A0055733C /* XPCandyTreeBuyView.m in Sources */, - E88C72922828EA4E0047FB2B /* Music+CoreDataClass.m in Sources */, - E84A2EA52A5288CB00D6AF8A /* XPGoldDetailsChooseRoomView.m in Sources */, - E8E7DAE82744F5EF00C631CC /* XPGiftStorage.m in Sources */, - E8AA6EEF27DF1E6B009B4C2B /* XPRoomTopicViewController.m in Sources */, - 1427219629A75F6F00C7C423 /* DDData.m in Sources */, - E87AE7FC277AAC450037823A /* XPRoomTagPresenter.m in Sources */, E85E7B652A4EC35A00B6D00A /* XPExchangeDiamondsModel.m in Sources */, - E878894C273A607C00BF1D57 /* XPGiftUserCollectionViewCell.m in Sources */, - 23E9E9A72A80F1C300B792F2 /* XPNewMineHallIncomeVC.m in Sources */, - 2331C1712A5EB71000E1D940 /* XPNobleCenterTableHeadView.m in Sources */, - 181D7F212727D9DB00B7C059 /* SocialStageView.m in Sources */, - E8AB630D28ADD8C60023B0D2 /* XPMomentTopicContainerViewController.m in Sources */, - 4C85DB812DCDD83E00FD9839 /* CreateEventPresenter.m in Sources */, - E8D4DE472940473500EC788D /* GiftTwelveStarFirstModel.m in Sources */, - 547B30F92CB511700041E962 /* RoomBoomEntryView.m in Sources */, - E87DF4FB2A42CCDE009C1185 /* XPHomeRedommendCollectionViewCell.m in Sources */, - 2368ECDA2BC3C02800EDF4C9 /* XPMineSwitchLanguageVC.m in Sources */, 187EEEF026E89FE8002833B2 /* AccountInfoStorage.m in Sources */, - 2331C1B82A60F32D00E1D940 /* XPRoomHalfWebView.m in Sources */, 9BFE0D8E2898C8C300F53C24 /* XPAnchorCardSkillCollectionViewCell.m in Sources */, - 54AE7E172C9AE589006D2BE2 /* CPListViewController.m in Sources */, - E85E7B382A4EB0D300B6D00A /* XPMineGuildSearchMemberTableViewCell.m in Sources */, - 23D321D52ADD0F05006B259C /* Api+PhotoAlbum.m in Sources */, 23E9EA842A84B6FD00B792F2 /* XPMineUserInfoTagModel.m in Sources */, - E8998D852859B4FA00C68558 /* XPMineUserInfoGiftView.m in Sources */, - 23FE47E72BB4378700F09D23 /* PINobleCenterListModel.m in Sources */, 54C9A11C2C3D9EDD00C6D970 /* Api+GameOrder.m in Sources */, - 237B94C02A984DA7007853E3 /* Api+RoomTrumpet.m in Sources */, - 23E45C052AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m in Sources */, - 9B42869228C1AED4009034D2 /* XPReceiveRedPacketModel.m in Sources */, - E8B846C526FDB41A00A777FE /* XPMineUserInfolbumPresenter.m in Sources */, - 239D0FE42C048700002977CE /* MSRoomGameHeadAvatarView.m in Sources */, - 9BFB101F2897CC4300B3985E /* XPAnchorCardView.m in Sources */, - 1427218F29A75F6F00C7C423 /* HTTPConnection.m in Sources */, - 9BAA5FED277A1BBE007453F3 /* XPPrivacyViewController.m in Sources */, - E873EB02280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.m in Sources */, - E872309326E8D31500B90D4F /* LoginVerifCodeView.m in Sources */, 4CD19EB12E9D12600069DAA0 /* EPEditSettingViewController.swift in Sources */, 4CD19EB52E9D15000069DAA0 /* EPAboutUsViewController.swift in Sources */, - E82107872987E49100DE7040 /* MessageRedPacketModel.m in Sources */, - 23B8D8E12B87715100CA472F /* PIGeneralPublicScreenModel.m in Sources */, - 23194DD52AD292F200649F51 /* PIPageControl.m in Sources */, 23E9EA9E2A84C42B00B792F2 /* SGYProgressView.m in Sources */, - E87E91552796B6DE00A7B3F2 /* XPRoomInviteUserViewController.m in Sources */, - 239D0FCC2C045FC9002977CE /* MSTabbarRoomGameVC.m in Sources */, - E880B3B5278C1FE400A83B0D /* XPAcrossRoomPKPresenter.m in Sources */, 23CEFC612AFB8FC100576D89 /* RealViewNetWorkCell_0.m in Sources */, - 9B4D449328F15765002572D5 /* XPGiftLuckyGiftBroadcastView.m in Sources */, E81C278C26EAFAF60031E639 /* Base64.m in Sources */, - 544B19B62CA14A7100885BEB /* CPGiftBanner.m in Sources */, - E8C1CD7027D894B800376F83 /* RoomFaceTitleItemModel.m in Sources */, - E85E7B4B2A4EB0D300B6D00A /* XPMineGuildManagerSetViewController.m in Sources */, 189DD73D26E21C3F00AB55B1 /* YYUtility+Device.m in Sources */, 187EEEDC26E89B32002833B2 /* BaseModel.m in Sources */, - 54E4D5302C9048E1009E1FEA /* LuckyGiftWinningFlagView.m in Sources */, - 23CEFC682AFCCE7700576D89 /* PIGiftInfoSegmentedView.m in Sources */, - E878B85E283640A500E22DCF /* MonentsUnReadModel.m in Sources */, - E85E7BA42A4EC99300B6D00A /* XPMineGiveDiamondCell.m in Sources */, - E824546426F5FF1C00BE8163 /* XPMineResetPayPasswordPresenter.m in Sources */, - E818E34F286EDF72005EDF68 /* XPMonentsPublishCollectionViewCell.m in Sources */, - E877A7EE278428FB00EFACED /* MicroDatingProgressView.m in Sources */, - E8E0DAE9285C2E8C00566A2F /* FindNewGreetMessageModel.m in Sources */, - E84A2E8A2A527DF800D6AF8A /* XPExchangeDiamondsVC.m in Sources */, - E87A27032758BC81002DDC7A /* XPRoomSearchContainerViewController.m in Sources */, - E84A2E8B2A527DF800D6AF8A /* XPIncomeRecordGoldDetailsVC.m in Sources */, - E884C3722743AEDE00E1EBED /* CustomAttachmentDecoder.m in Sources */, - 18EE3FEE2750CE6D00A452BF /* NIMMessageUtils.m in Sources */, - 1427219529A75F6F00C7C423 /* DDNumber.m in Sources */, - 236B2E5A2AA18E13003967A8 /* XPMineGameTableViewCell.m in Sources */, - E8DEC9AC2764A6CD0078CB70 /* XPRoomMoreMenuCollectionViewCell.m in Sources */, - E81DCCD0282B63FD0039E5C5 /* XPMomentsRecommendViewController.m in Sources */, - 9B7D804A2753783D003DAC0C /* SessionViewController.m in Sources */, - E85E7BA92A4EC99300B6D00A /* XPMineConfirmGiveDiamondView.m in Sources */, - 4C71C69F2D069D2B00ECCA24 /* GiftAnimationHelper.m in Sources */, - 54C9A1102C3D3E1700C6D970 /* XPMineGameMateOrderView.m in Sources */, - E85E7BA72A4EC99300B6D00A /* XPMineGiveDiamondPasswordView.m in Sources */, - 54283CEE2CE48B97009729B5 /* ShoppingMallDataPresent.m in Sources */, - 2331C1742A5EB71000E1D940 /* XPNobleCenterResidueView.m in Sources */, - 4C0A5B842E02675300955219 /* MedalsCollectionViewCell.m in Sources */, E80E2377299A47F60013FD40 /* AESUtils.m in Sources */, - E81060E229876E9100B772F0 /* MessageImageModel.m in Sources */, - E839533F276A0CDB00CF2F24 /* XPMineNameplateTableViewCell.m in Sources */, - E80E09AE2A41336500CD2BE7 /* XPWebViewNavView.m in Sources */, - E85E7B2D2A4EB0D300B6D00A /* XPGuildHeaderView.m in Sources */, - 4CAFEFF62DD2F21B00CD81DF /* CreateEventPickerContainerView.m in Sources */, - E85E7B542A4EB4AD00B6D00A /* XPMineGuildListModel.m in Sources */, - 54283CE52CE48A69009729B5 /* ShoppingMallViewController.m in Sources */, - 9BCE6144277D657600CC0358 /* XPReleaseRadioTableViewCell.m in Sources */, - E81060E529876FF300B772F0 /* MessageAudioModel.m in Sources */, 23CEFC642AFB8FC100576D89 /* BSkObject.m in Sources */, - 239D0FF42C05B9D2002977CE /* MSRoomGameView.m in Sources */, - E83DB481274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m in Sources */, - 9B3A1DF4280571000058E2DD /* XPAnchorPKInviteView.m in Sources */, 2331C1BD2A60F69E00E1D940 /* UILabel+Utils.m in Sources */, - 9B2489BC27C4C056006CFB85 /* XPMineVisitorEmptyTableViewCell.m in Sources */, 1427212F29A7599500C7C423 /* XPMonentsAttentionPresenter.m in Sources */, - E878893F273A54F500BF1D57 /* XPGiftPresenter.m in Sources */, - 1464C5F929A4D00000AF7C94 /* XPIAPRechargeHeaderView.m in Sources */, E83645A82A40AF5400E0DBE4 /* NSBundle+Localizable.m in Sources */, - 4CAE69CC2E69A2DB00A9FC35 /* MicMidpointRectManager.m in Sources */, - E8778AFB2989034200CF139B /* XPSessionSayHelloEmptyTableViewCell.m in Sources */, - E88B5CC126FB407B00DA9178 /* XPMineUserInfoViewController.m in Sources */, - 2331C1AC2A60F32D00E1D940 /* CandyTreeRecordModel.m in Sources */, - 540EC1D32C89998500F3BF0D /* GiftComboManager.m in Sources */, - 5468995D2C8AFE4C0049136A /* GiftComboFlagView.m in Sources */, - 2305F3472AD94E9D00AD403C /* XPMaskManagerCell.m in Sources */, - E852D74428633A08001465ED /* MonentsCommentModel.m in Sources */, - E8C1CD6D27D8938C00376F83 /* XPRoomFaceTitleCollectionViewCell.m in Sources */, 4C06429C2E99120600BAF413 /* EPMomentPublishViewController.m in Sources */, - 548E01C62C3F78360071C83D /* FeedBackViewController.m in Sources */, - E8C1CD7627D8AE3D00376F83 /* XPRoomFacePresenter.m in Sources */, - E85E7B362A4EB0D300B6D00A /* XPClanRoomCollectionViewCell.m in Sources */, - 18F4043A275E20D900A6C548 /* TRTCRtcImpl.m in Sources */, - 2320F63F2BDF8B3000227EEB /* MSRoomMenuGameVC.m in Sources */, - E8899C7F27853B6A007944BE /* DatingMicroView.m in Sources */, - 23E9EA882A84B75900B792F2 /* XPMineUserInfoHeaderTagView.m in Sources */, - E87DF4EC2A42CB60009C1185 /* XPSearchListTableViewCell.m in Sources */, - E85E7B052A4EB0D200B6D00A /* XPClanPresenter.m in Sources */, - E85E7BA52A4EC99300B6D00A /* XPMineChooseGiveDiamondView.m in Sources */, - E8F63CB1298B553500B338BA /* SessionSayHelloLevelModel.m in Sources */, - 236B2E4B2AA07D06003967A8 /* XPLittleGameRoomListView.m in Sources */, - 9BE01AD428927E9C00B50299 /* XPDressUpShopListViewController.m in Sources */, - 4CD47BBE2E619F1700BCDA46 /* XPRoomMoreMenuAction.m in Sources */, - 4CD47BBF2E619F1700BCDA46 /* XPRoomMoreMenuActionContext.m in Sources */, - 239D0FED2C057362002977CE /* Api+MSRoomGameApi.m in Sources */, - 9B41D36E282649230048C588 /* XPWeekStarRankUserModel.m in Sources */, - E824545926F5E65900BE8163 /* XPMineVerifIdentityView.m in Sources */, - E841ED61280FB0BD00904808 /* ContentLevelUpgradeModel.m in Sources */, 23CEFC632AFB8FC100576D89 /* BSRealTextView.m in Sources */, - 236B2E542AA08757003967A8 /* LittleGameScrollStageView.m in Sources */, 189DD74026E21C3F00AB55B1 /* YYUtility+App.m in Sources */, - E85E7B182A4EB0D200B6D00A /* ClanDetailInfoModel.m in Sources */, - 236B2E452AA07D06003967A8 /* NSData+RW.m in Sources */, - E85E7B272A4EB0D300B6D00A /* XPGuildSuperAdminMenuView.m in Sources */, 189DD74526E21CCC00AB55B1 /* YYReachability.m in Sources */, E82109AD26F1C8A000FC3319 /* CountDownHelper.m in Sources */, - E878B8582835F0D300E22DCF /* MonentsInteractiveModel.m in Sources */, - E87DF4E42A42CAD2009C1185 /* XPHomeSearchNavView.m in Sources */, - 9BD2ECCE288F829600F5CD9A /* XPMineFootPrintViewController.m in Sources */, - 9B4E920028E57A620033419E /* XPGiftHeadTypeView.m in Sources */, - 54E4D5332C90658C009E1FEA /* LuckyGiftWinningBannerView.m in Sources */, - E86A16BF2856D4D5004228B8 /* XPSessionFindNewGreetListView.m in Sources */, - E85E7B312A4EB0D300B6D00A /* XPNewGuildIncomeHeaderView.m in Sources */, - 4CA532C32D5F37DC00B8F59F /* LuckyPackageMessageTableViewCell.m in Sources */, - 9B0997A327F19DE500EB8F14 /* QGHWDShaders.metal in Sources */, - E8778AF02988EF0600CF139B /* XPSessionSayHelloViewController.m in Sources */, 187EEEE126E89BFB002833B2 /* AccountModel.m in Sources */, - 235A451D2B04A452009753F5 /* PIRoomActivityWebCell.m in Sources */, E8098CA7282E00920090B9F0 /* Api+Moments.m in Sources */, - E896EFA92771AEEC00AD2CC1 /* XPMineAttentionTableViewCell.m in Sources */, - E8F1559328129EBA00EE8C06 /* ContentSecretaryModel.m in Sources */, - E85E7B342A4EB0D300B6D00A /* XPMineMainGuildListVC.m in Sources */, - 9BBC02912786FC570007C24B /* XPMineNobleCardTableViewCell.m in Sources */, - E8751E7428A665BC0056EF44 /* RoomSailingInfoModel.m in Sources */, - 4CD6FF692D673F7F00262AB7 /* AgentMessageTableViewCell.m in Sources */, - 4C1392962D6DA22B00A6DFB5 /* RechargerTransferHistoryViewController.m in Sources */, - 4CF3CE2E2E040EEC0071101F /* MedalsWearingListCollectionViewCell.m in Sources */, - E8AC722126F47E23007D6E91 /* XPMineAboutUsViewController.m in Sources */, - E8E21A9E28B4DFE8008F7C9D /* XPSailingBuyFuelView.m in Sources */, - 18F403CB2758C66800A6C548 /* MessageContentText.m in Sources */, - 547853A12C258F2A00F45E60 /* XPMineUserViewHeader.m in Sources */, - E87DF4E72A42CB00009C1185 /* XPHomePresenter.m in Sources */, - E8232600274E48EA003A3332 /* XPUserCardItemCollectionViewCell.m in Sources */, - 239D0FA92BFCB88D002977CE /* XPRoomDatingVipUpMicView.m in Sources */, - E88B5CC526FB42B000DA9178 /* XPMineUserInfoHeaderView.m in Sources */, - E8AC721626F46B06007D6E91 /* XPMineSettingTableViewCell.m in Sources */, - 4C85DB842DCDDD6800FD9839 /* CreateEventViewControllerV2.m in Sources */, - 18EE3FDF2750C1F700A452BF /* SessionListCell.m in Sources */, - 9BD798B72926362F003E03E6 /* XPSessionListHeadItem.m in Sources */, - E80487652717DDD9008595F2 /* XPRoomMenuItem.m in Sources */, - E895018C282D0701007E459A /* XPMomentsTopicView.m in Sources */, - E89BD7D4277D471100E31B19 /* XPRoomOnlineTableViewCell.m in Sources */, - 1427219329A75F6F00C7C423 /* MultipartMessageHeader.m in Sources */, - E8412F9627795E34006E1101 /* XPRoomInviteFansView.m in Sources */, - E801274327E323E500BAC3F2 /* XPRoomPKPresenter.m in Sources */, 189DD75026E21D9000AB55B1 /* GCDHelper.m in Sources */, - E82D5C76276AEB5100858D6D /* NameplateModel.m in Sources */, - 142721AF29A75F6F00C7C423 /* SJXCSMIPHelper.m in Sources */, 4CDF7F422E9E581900113F54 /* EPEmotionColorPicker.m in Sources */, - E87E62742A3F5907002F68C9 /* XPHomeBannerTableViewCell.m in Sources */, - E88C72A3282917590047FB2B /* XPRoomMusicVoiceSettingView.m in Sources */, - 239D0FA82BFCB88D002977CE /* XPRoomBackContainerView.m in Sources */, - 23D321DF2ADFCEB2006B259C /* PIRedPacketChooseTypeView.m in Sources */, - E81AF32827F1EE69003B9E43 /* XPRoomPKPanelUserView.m in Sources */, - 4CC6195A2CEC7770008C1EE8 /* MyDressingDataPresent.m in Sources */, - E84150BF27747BD300A7F548 /* Api+FirstRecharge.m in Sources */, - E84B0E422727EE0A008818C6 /* XPRoomMessageHeaderView.m in Sources */, - 2331C1812A5ECD3800E1D940 /* XPNobleCenterPayCell.m in Sources */, - E852D73B286317F0001465ED /* XPMomentsDetailViewController.m in Sources */, 4C1E98C92E9A4DFD0031AE79 /* EPQCloudConfig.swift in Sources */, 4C1E98CA2E9A4DFD0031AE79 /* EPSDKManager.swift in Sources */, - 2331C1692A5EB71000E1D940 /* XPNobleSettingViewController.m in Sources */, - E85E7B392A4EB0D300B6D00A /* XPGuildChooseManagerRoomTableViewCell.m in Sources */, - 239D0FAD2BFCB88D002977CE /* XPRoomAnchorRankEnterView.m in Sources */, - E81060D9298761A300B772F0 /* MessageBaseModel.m in Sources */, - E890BC10273D23F00007C46B /* GiftInfoModel.m in Sources */, - E8A30BEB28534A96003B4873 /* XPSessionFindNewFiltrateView.m in Sources */, - E84BF7E0277C869A00EF8877 /* XPRoomOnLineViewController.m in Sources */, - 236B2E422AA07D06003967A8 /* SudCommon.m in Sources */, E88749B6282B8FC600C3C7DB /* MomentsInfoModel.m in Sources */, - E89D60BA271D643A001F8895 /* Api+Room.m in Sources */, - 4C0B4A4A2E65A5D500D67F73 /* XPRoomMusicPanelAction.m in Sources */, - E84843B227F5A0740050D365 /* XPRomPKResultTitleLabel.m in Sources */, - E877A7EB2783E24700EFACED /* DatingStageView.m in Sources */, - 4CBDC4272DC0B947005A75B9 /* EventCenterPresenter.m in Sources */, - 9BD2ECDA288F867000F5CD9A /* XPMineFootPrintTableViewCell.m in Sources */, - 545888332C1AFFB500897585 /* XPRoomPKPanelView.m in Sources */, - E8395339276A0CC100CF2F24 /* XPMineHeadwearTableViewCell.m in Sources */, E875FA8727D619820086ED04 /* ClientDataModel.m in Sources */, - 9BFB10222897D68400B3985E /* XPTabAnchorCardModel.m in Sources */, E8B846DC26FDE24300A777FE /* RechargeListModel.m in Sources */, - 4C1119722DD7218300C18416 /* MyEventsViewController.m in Sources */, - 9B1B7292280010E8003FACE9 /* Api+FansTeam.m in Sources */, - 4C815A172CFEB758002A46A6 /* SuperBlockViewController.m in Sources */, - E85E7B142A4EB0D200B6D00A /* GuildAuthModel.m in Sources */, - 4CE746CA2D929D500094E496 /* BaseRoomBannerView.m in Sources */, 4C1E98C62E9A45BC0031AE79 /* EPMomentAPISwiftHelper.swift in Sources */, - 9BE01ADE2892A66D00B50299 /* DressUpShopModel.m in Sources */, - 236B2E472AA07D06003967A8 /* LittleGameInfoModel.m in Sources */, - E884C36C2743951B00E1EBED /* GiftReceiveInfoModel.m in Sources */, - E85E7BB62A4ED59900B6D00A /* XPIncomeRecordGoldDetailsCell.m in Sources */, - 9B7B606227BB96E40070BB72 /* XPRoomAnchorInfoCardView.m in Sources */, - E87DF4FE2A42CD7E009C1185 /* XPRoomSearchRecommendHeadView.m in Sources */, 23CEFC4D2AFB8FC100576D89 /* BSXWDateUtil.m in Sources */, - E85E7B442A4EB0D300B6D00A /* XPMineExchangeAuthorityCell.m in Sources */, - E80B0734280D740600A79F63 /* MessageContentGuildView.m in Sources */, - E8395334276A03C300CF2F24 /* XPMineDressUpPresenter.m in Sources */, - E85E7B212A4EB0D300B6D00A /* XPNewMineGuildIncomeRecordViewController.m in Sources */, - 54C389622C23BD1600FD47B1 /* HomeRankAvatarModel.m in Sources */, - 23A439742AA1CF7C002E6039 /* XPNewHomeHeadView.m in Sources */, 189DD75926E6003C00AB55B1 /* Api.m in Sources */, - 2331C1652A5EB71000E1D940 /* NobleRechargeModel.m in Sources */, - E87C0A9D27D9986700CB2241 /* XPRoomFaceCollectionFlowLayout.m in Sources */, 1427212C29A757EC00C7C423 /* MomentsListInfoModel.m in Sources */, - 23E9EB152A84D02400B792F2 /* XPMineUserInfoEditPickView.m in Sources */, - 9BA812D628BF52E100783EA7 /* XPRoomSendRedPacketViewController.m in Sources */, - E86E79D328A4E94E006DAF48 /* SessionRiskView.m in Sources */, 548E01C92C3F78600071C83D /* FeedBackConfigModel.m in Sources */, - E85E7B1F2A4EB0D300B6D00A /* XPMineGuildIncomeStatisViewController.m in Sources */, - E85E7B412A4EB0D300B6D00A /* XPMineGuildEmptyTableViewCell.m in Sources */, - E8133916273E532D00708B66 /* XPGiftItemCollectionViewCell.m in Sources */, - 2331C1782A5EB71000E1D940 /* Api+NobleCenter.m in Sources */, - 236896A02AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.m in Sources */, 4CD19C912E9CBBD30069DAA0 /* EPLoginBridge.swift in Sources */, - 2305EF012AD6A33E00AD403C /* PIRoomPhotoAlbumItemChoosePhotoModel.m in Sources */, - 2305EEFE2AD6978200AD403C /* PIRoomPhotoAlbumChoosePhotoCell.m in Sources */, - E833ED0D274FAD1C00A2463B /* XPKickUserModel.m in Sources */, - 9B42868E28C1AE2D009034D2 /* XPReceiveRedPacketView.m in Sources */, - E8788934273A53D700BF1D57 /* XPSendGiftView.m in Sources */, 234E50AF2BF7352C005CB6D5 /* NSTextAttachment+MSImage.m in Sources */, - E896EF9C2771AE6B00AD2CC1 /* XPMineFansViewController.m in Sources */, - 54B9C6E72C9C2CA1003F1CC5 /* XPMineGuildTableViewCell.m in Sources */, - E84B0E462727EF9D008818C6 /* XPRoomMessageParser.m in Sources */, - 23E9E9A12A80C7E000B792F2 /* XPMineGuildPersonalBillRecordModel.m in Sources */, - 9B0086C627BA392B0032BD2B /* AnchorStageView.m in Sources */, - 9BCD02C72796C02800F396AA /* MicroNobleWaveView.m in Sources */, - 2305F3382AD9194B00AD403C /* PIRoomMessageUnlockPhotoAlbumView.m in Sources */, - 5484E1FD2CA2897B008E8754 /* IAPManager.m in Sources */, - E874B88827215D39003954B9 /* MicroStateModel.m in Sources */, - 23E9EABB2A84CCBE00B792F2 /* XPMineDataSkillDataCollectionViewCell.m in Sources */, - 23FE47D52BB3C64600F09D23 /* PINobleCenterTitleCell.m in Sources */, - E896EF9F2771AE7B00AD2CC1 /* XPMineAttentionViewController.m in Sources */, - E89D60C1271D64B9001F8895 /* RoomInfoModel.m in Sources */, - E89DA66727006443008483C1 /* RechargeStorage.m in Sources */, 189DD53F26DE255600AB55B1 /* main.m in Sources */, - 236B2E4A2AA07D06003967A8 /* XPLittleGameTableViewCell.m in Sources */, - E85E7BBC2A4EE70B00B6D00A /* XPMineTheGuildCell.m in Sources */, - 239D0F962BFB3296002977CE /* MSRoomOnLineView.m in Sources */, - E885D5392977D10E004DC088 /* SessionSettingUserView.m in Sources */, - 2305EF072AD6B51200AD403C /* PIRoomPhotoAlbumChoosePhotoGiftView.m in Sources */, - 2331C16C2A5EB71000E1D940 /* XPNobleCenterEmptyView.m in Sources */, 2305F3442AD94E2700AD403C /* XPMaskManagerModel.m in Sources */, - E8D34D6728084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m in Sources */, - 23E9E9AA2A80FDF100B792F2 /* XPNewMineHallIncomeCell.m in Sources */, - 23194DCF2AD14BF000649F51 /* DispatchQueueLogFormatter.m in Sources */, - E8A30BE328534A28003B4873 /* XPSessionFindNewViewController.m in Sources */, 140A7F52299CC69000841594 /* XPTabBar.m in Sources */, - 4CA532BA2D5C8EBE00B8F59F /* LuckyPackageBannerView.m in Sources */, - E85E7B0C2A4EB0D200B6D00A /* XPGuildMangerListPresenter.m in Sources */, - 14DCAD0B299B5D3A00A7DD31 /* XPLoginInputView.m in Sources */, - E839806B290288660084BFC8 /* XPMessageInfoModel.m in Sources */, - E81C1B2C27706E5C0020D1E4 /* ArrangeMicModel.m in Sources */, - 9B1B729528002099003FACE9 /* XPMineFansTeamViewController.m in Sources */, - 4C7547342E55AAB100C6E821 /* GestureOptimizer.m in Sources */, - 9BE2FA90288010D300EF3D83 /* AnchorRoomSrollTipView.m in Sources */, - E85E7B252A4EB0D300B6D00A /* XPMineGuildChooseManagerViewController.m in Sources */, - E87E91522796A15500A7B3F2 /* MicroExtModel.m in Sources */, - E8788948273A55D000BF1D57 /* XPGiftBarView.m in Sources */, 237700D32BC7CC7C00D661F1 /* NSObject+MJExtension.m in Sources */, - 4CD401472E7183A8003F5009 /* XPPartyRoomItemCollectionViewCell.m in Sources */, 4C886BEE2E014B6C006F0BA7 /* Api+Medals.m in Sources */, - E8D4DE442940462C00EC788D /* XPGiftTwelveStarBroadcastView.m in Sources */, - 540EC1D02C89925F00F3BF0D /* GiftComboView.m in Sources */, - E81060DF29876D3A00B772F0 /* MessageTimeModel.m in Sources */, - E81A65422835120200F55894 /* XPMonentsInteractivePresenter.m in Sources */, - 239D0FD52C0475E6002977CE /* MSTabbarBeginGameView.m in Sources */, - E8664EE627E482EF000171BA /* RoomPKTeamModel.m in Sources */, - 9BAA5FF0277A23F4007453F3 /* XPPermissionsViewController.m in Sources */, - E85E7BA02A4EC99300B6D00A /* XPMineGiveDiamondDetailsModel.m in Sources */, - 4CE746C32D9290430094E496 /* RoomBoomManager.m in Sources */, - 4C4283F62E66C769006779B0 /* XPEffectPanelViewController.m in Sources */, - 4CBBB44C2DA66334001B1C6D /* MessageCPNotifyModel.m in Sources */, - E81A654C28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m in Sources */, - E85E7B9F2A4EC99300B6D00A /* XPMineGiveDiamondPresenter.m in Sources */, 14D8767C29A7445C00E1DD7F /* NSObject+AutoCoding.m in Sources */, 23CEFC4C2AFB8FC100576D89 /* BS_UIColor.m in Sources */, - E8412FA92779C2ED006E1101 /* XPRoomSettingItemModel.m in Sources */, - 189DD58F26DF97E700AB55B1 /* LoginPresenter.m in Sources */, 4CD19C932E9CCF2C0069DAA0 /* EPLoginConfig.swift in Sources */, - E88863C9278EBA43004BCFAB /* XPAcrossRoomPKForceEndResultView.m in Sources */, - E8F63CB7298B566D00B338BA /* XPSessionSayHelloPresenter.m in Sources */, 4C0642992E98F77900BAF413 /* EPMomentListView.m in Sources */, - E88C72952828F1AD0047FB2B /* XPRoomMusicLibraryViewController.m in Sources */, - 233423D32AAF0F4F00B1253F /* XPIAPRechargeHeadCell.m in Sources */, - E85E7BA62A4EC99300B6D00A /* XPMineGiveDiamondSearchView.m in Sources */, - 1427218829A75F6F00C7C423 /* HTTPErrorResponse.m in Sources */, - E85E7B032A4EB0D200B6D00A /* XPGuildIncomePresenter.m in Sources */, - E8A30BF928534E48003B4873 /* XPSessionFindNewEmptyTableViewCell.m in Sources */, - 54C608552CBE1EC7003DD5D2 /* GameUniversalBannerView.m in Sources */, - 545888362C1C306B00897585 /* XPRoomPKPaneAvatarView.m in Sources */, - E896EFB22771C93B00AD2CC1 /* XPMineFriendNumberView.m in Sources */, - 14EB640D29A5C16000A4A00B /* XPMomentsSimpleDetailNav.m in Sources */, - 54C389672C24464600FD47B1 /* HomeMineRoomModel.m in Sources */, - 149839C7299E0B9F00F82CBF /* XPMomentListCollectionViewCell.m in Sources */, - 236BA4982BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m in Sources */, - E88C729C2828F37D0047FB2B /* XPRoomMusicLibraryEmptyTableViewCell.m in Sources */, - E85E7B0A2A4EB0D200B6D00A /* XPGuildManagerPerPresenter.m in Sources */, 4CD19C8E2E9CBBC80069DAA0 /* EPLoginService.swift in Sources */, 4CD19C8F2E9CBBC80069DAA0 /* EPLoginManager.swift in Sources */, - 9B85F3562806DD8A006EDF51 /* XPAnchorPKFinishView.m in Sources */, - E85E7BA12A4EC99300B6D00A /* XPMineGiveDiamondModel.m in Sources */, - E85E7B232A4EB0D300B6D00A /* XPMineClanViewController.m in Sources */, E89DA67227008D59008483C1 /* WalletInfoModel.m in Sources */, - E8778AE12988B4C300CF139B /* MessageRevokeModel.m in Sources */, - E873EB05280943ED0071030D /* XPMineUserInfoGiftWallPresenter.m in Sources */, - E8383697298A598D00112E1C /* MessageTipsModel.m in Sources */, - E801274727E3241700BAC3F2 /* Api+RoomPK.m in Sources */, - E87DF4F82A42CCAB009C1185 /* XPHomeSearchRelateView.m in Sources */, - 239D0FF02C057470002977CE /* MSRoomGamePresenter.m in Sources */, 4C1E98BF2E9A3A540031AE79 /* EPMineAPIHelper.m in Sources */, E80CBDEA27D0C53F001E1EC2 /* XPWeakTimer.m in Sources */, - E85E7BAC2A4EC99300B6D00A /* XPMineGiveDiamondDetailsView.m in Sources */, - 4C51B09F2DA50FDA00D8DFB5 /* CPRelationshipChangeView.m in Sources */, - E85E7B152A4EB0D200B6D00A /* ClanInfoModel.m in Sources */, 189DD55026DE37F900AB55B1 /* MvpViewController.m in Sources */, - E81366F326F0B7C80076364C /* LoginFullInfoViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -13415,14 +2587,7 @@ 2368ECCD2BC38F9800EDF4C9 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( - 2368ECCE2BC38F9800EDF4C9 /* ar */, 2368ECD02BC38FA900EDF4C9 /* en */, - 2368ECD22BC38FC500EDF4C9 /* zh-Hant */, - 54435F2C2CC89D4600F4884B /* tr */, - 4C4DE6442E2513DA00122763 /* pt-BR */, - 4CA7410F2E72B9E600DB6853 /* ru */, - 4CA741112E72BA3700DB6853 /* uz-UZ */, - 4CA741132E72BA5300DB6853 /* es */, ); name = InfoPlist.strings; sourceTree = ""; @@ -13439,14 +2604,7 @@ E80E09AB2A40B70100CD2BE7 /* Localizable.strings */ = { isa = PBXVariantGroup; children = ( - E80E09AA2A40B70100CD2BE7 /* zh-Hant */, - 2368ECC92BC38F6400EDF4C9 /* ar */, 2368ECCA2BC38F6F00EDF4C9 /* en */, - 54435F2D2CC89D4600F4884B /* tr */, - 4C4DE6452E2513DB00122763 /* pt-BR */, - 4CA741102E72B9E600DB6853 /* ru */, - 4CA741122E72BA3800DB6853 /* uz-UZ */, - 4CA741142E72BA5600DB6853 /* es */, ); name = Localizable.strings; sourceTree = ""; @@ -13588,7 +2746,6 @@ "$(PROJECT_DIR)/YuMi/Resources/Client", "$(PROJECT_DIR)/YuMi/Library", "$(PROJECT_DIR)/YuMi/Tools", - "$(PROJECT_DIR)/YuMi/Tools/TencentOpenApiSDK", ); GCC_PREFIX_HEADER = YuMi/Structure/PrefixHeader.pch; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -13628,10 +2785,6 @@ "\"AVKit\"", "-framework", "\"Accelerate\"", - "\"-framework\"", - "\"AppAuth\"", - "-framework", - "\"AppleAccountConnector\"", "-framework", "\"AssetsLibrary\"", "-framework", @@ -13639,14 +2792,10 @@ "-framework", "\"Base64\"", "-framework", - "\"Bugly\"", - "-framework", "\"CFNetwork\"", "-framework", "\"COSBeaconAPI_Base\"", "-framework", - "\"CocoaAsyncSocket\"", - "-framework", "\"CoreFoundation\"", "-framework", "\"CoreGraphics\"", @@ -13661,16 +2810,6 @@ "-framework", "\"CoreText\"", "-framework", - "\"FBAEMKit\"", - "-framework", - "\"FBSDKCoreKit\"", - "-framework", - "\"FBSDKCoreKit_Basics\"", - "-framework", - "\"FBSDKLoginKit\"", - "-framework", - "\"FBSDKShareKit\"", - "-framework", "\"FFPopup\"", "-framework", "\"FLAnimatedImage\"", @@ -13679,12 +2818,6 @@ "-framework", "\"GKCycleScrollView\"", "-framework", - "\"GTMAppAuth\"", - "-framework", - "\"GTMSessionFetcher\"", - "-framework", - "\"GoogleSignIn\"", - "-framework", "\"IQKeyboardManager\"", "-framework", "\"ImageIO\"", @@ -13703,8 +2836,6 @@ "-framework", "\"MJRefresh\"", "-framework", - "\"MOBFoundation\"", - "-framework", "\"MarqueeLabel\"", "-framework", "\"Masonry\"", @@ -13715,30 +2846,18 @@ "-framework", "\"MetalPerformanceShaders\"", "-framework", - "\"MobLinkPro\"", - "-framework", "\"MobileCoreServices\"", "-framework", - "\"NIMNOS\"", - "-framework", - "\"NIMSDK\"", - "-framework", "\"Photos\"", "-framework", "\"PhotosUI\"", "-framework", - "\"Protobuf\"", - "-framework", "\"QCloudCOSXML\"", "-framework", "\"QCloudCore\"", "-framework", "\"QCloudTrack\"", "-framework", - "\"QGVAPlayer\"", - "-framework", - "\"QimeiSDK\"", - "-framework", "\"QuartzCore\"", "-framework", "\"ReactiveObjC\"", @@ -13753,48 +2872,24 @@ "-framework", "\"SSKeychain\"", "-framework", - "\"SSZipArchive\"", - "-framework", - "\"SVGAPlayer\"", - "-framework", "\"SZTextView\"", "-framework", "\"SafariServices\"", "-framework", "\"Security\"", "-framework", - "\"ShareSDK\"", - "-framework", - "\"ShareSDKConnector\"", - "-framework", - "\"ShareSDKExtension\"", - "-framework", - "\"StoreKit\"", - "-framework", "\"SystemConfiguration\"", "-framework", "\"TABAnimated\"", "-framework", - "\"TXFFmpeg\"", - "-framework", - "\"TXLiteAVSDK_TRTC\"", - "-framework", - "\"TXSoundTouch\"", - "-framework", "\"TYCyclePagerView\"", "-framework", "\"TZImagePickerController\"", "-framework", "\"UIKit\"", "-framework", - "\"UMCommon\"", - "-framework", - "\"UMDevice\"", - "-framework", "\"VideoToolbox\"", "-framework", - "\"YXArtemis\"", - "-framework", "\"YYCache\"", "-framework", "\"YYImage\"", @@ -13807,8 +2902,6 @@ "-framework", "\"ZLCollectionViewFlowLayout\"", "-framework", - "\"libpag\"", - "-framework", "\"pop\"", "-weak_framework", "\"AuthenticationServices\"", @@ -13878,10 +2971,6 @@ "\"AVKit\"", "-framework", "\"Accelerate\"", - "\"-framework\"", - "\"AppAuth\"", - "-framework", - "\"AppleAccountConnector\"", "-framework", "\"AssetsLibrary\"", "-framework", @@ -13889,14 +2978,10 @@ "-framework", "\"Base64\"", "-framework", - "\"Bugly\"", - "-framework", "\"CFNetwork\"", "-framework", "\"COSBeaconAPI_Base\"", "-framework", - "\"CocoaAsyncSocket\"", - "-framework", "\"CoreFoundation\"", "-framework", "\"CoreGraphics\"", @@ -13911,16 +2996,6 @@ "-framework", "\"CoreText\"", "-framework", - "\"FBAEMKit\"", - "-framework", - "\"FBSDKCoreKit\"", - "-framework", - "\"FBSDKCoreKit_Basics\"", - "-framework", - "\"FBSDKLoginKit\"", - "-framework", - "\"FBSDKShareKit\"", - "-framework", "\"FFPopup\"", "-framework", "\"FLAnimatedImage\"", @@ -13929,12 +3004,6 @@ "-framework", "\"GKCycleScrollView\"", "-framework", - "\"GTMAppAuth\"", - "-framework", - "\"GTMSessionFetcher\"", - "-framework", - "\"GoogleSignIn\"", - "-framework", "\"IQKeyboardManager\"", "-framework", "\"ImageIO\"", @@ -13953,8 +3022,6 @@ "-framework", "\"MJRefresh\"", "-framework", - "\"MOBFoundation\"", - "-framework", "\"MarqueeLabel\"", "-framework", "\"Masonry\"", @@ -13965,30 +3032,18 @@ "-framework", "\"MetalPerformanceShaders\"", "-framework", - "\"MobLinkPro\"", - "-framework", "\"MobileCoreServices\"", "-framework", - "\"NIMNOS\"", - "-framework", - "\"NIMSDK\"", - "-framework", "\"Photos\"", "-framework", "\"PhotosUI\"", "-framework", - "\"Protobuf\"", - "-framework", "\"QCloudCOSXML\"", "-framework", "\"QCloudCore\"", "-framework", "\"QCloudTrack\"", "-framework", - "\"QGVAPlayer\"", - "-framework", - "\"QimeiSDK\"", - "-framework", "\"QuartzCore\"", "-framework", "\"ReactiveObjC\"", @@ -14003,48 +3058,24 @@ "-framework", "\"SSKeychain\"", "-framework", - "\"SSZipArchive\"", - "-framework", - "\"SVGAPlayer\"", - "-framework", "\"SZTextView\"", "-framework", "\"SafariServices\"", "-framework", "\"Security\"", "-framework", - "\"ShareSDK\"", - "-framework", - "\"ShareSDKConnector\"", - "-framework", - "\"ShareSDKExtension\"", - "-framework", - "\"StoreKit\"", - "-framework", "\"SystemConfiguration\"", "-framework", "\"TABAnimated\"", "-framework", - "\"TXFFmpeg\"", - "-framework", - "\"TXLiteAVSDK_TRTC\"", - "-framework", - "\"TXSoundTouch\"", - "-framework", "\"TYCyclePagerView\"", "-framework", "\"TZImagePickerController\"", "-framework", "\"UIKit\"", "-framework", - "\"UMCommon\"", - "-framework", - "\"UMDevice\"", - "-framework", "\"VideoToolbox\"", "-framework", - "\"YXArtemis\"", - "-framework", "\"YYCache\"", "-framework", "\"YYImage\"", @@ -14057,8 +3088,6 @@ "-framework", "\"ZLCollectionViewFlowLayout\"", "-framework", - "\"libpag\"", - "-framework", "\"pop\"", "-weak_framework", "\"AuthenticationServices\"", @@ -14099,19 +3128,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - -/* Begin XCVersionGroup section */ - E87E63F529AA1A5600EBE52B /* YuMi.xcdatamodeld */ = { - isa = XCVersionGroup; - children = ( - E87E63F629AA1A5600EBE52B /* xplan-ios.xcdatamodel */, - ); - currentVersion = E87E63F629AA1A5600EBE52B /* xplan-ios.xcdatamodel */; - path = YuMi.xcdatamodeld; - sourceTree = ""; - versionGroupType = wrapper.xcdatamodel; - }; -/* End XCVersionGroup section */ }; rootObject = 189DD52126DE255300AB55B1 /* Project object */; } diff --git a/YuMi/Appdelegate/AppDelegate+ThirdConfig.h b/YuMi/Appdelegate/AppDelegate+ThirdConfig.h deleted file mode 100644 index 555fbbd..0000000 --- a/YuMi/Appdelegate/AppDelegate+ThirdConfig.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// AppDelegate+ThirdConfig.h -// YUMI -// -// Created by YUMI on 2021/9/13. -// - -#import "AppDelegate.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface AppDelegate (ThirdConfig) -/// 初始化一些第三方配置 -- (void)initThirdConfig; -/** - 设置广告页 - */ -- (void)setupLaunchADView; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Appdelegate/AppDelegate+ThirdConfig.m b/YuMi/Appdelegate/AppDelegate+ThirdConfig.m deleted file mode 100644 index 9318261..0000000 --- a/YuMi/Appdelegate/AppDelegate+ThirdConfig.m +++ /dev/null @@ -1,245 +0,0 @@ -// -// AppDelegate+ThirdConfig.m -// YUMI -// -// Created by YUMI on 2021/9/13. -// - -#import "AppDelegate+ThirdConfig.h" -///Third -#import -#import -#import -#import -#import -///Tool -#import "YUMIConstant.h" -#import "CustomAttachmentDecoder.h" -#import "QEmotionHelper.h" -#import "XPAdvertiseView.h" -#import "XPAdImageTool.h" -#import "YUMIMacroUitls.h" -#import "AdvertiseModel.h" -#import "XPWebViewController.h" -#import "XPRoomViewController.h" -#import "XCCurrentVCStackManager.h" -#import "ClientConfig.h" -#import - -#import -#import "BuglyManager.h" -#import - -#import "YuMi-swift.h" - -UIKIT_EXTERN NSString * kYouMiNumberCountKey; -UIKIT_EXTERN NSString * adImageName; - -@implementation AppDelegate (ThirdConfig) - -/// 初始化一些第三方配置 -- (void)initThirdConfig{ - [self setLanguage]; - [self configShareSDK]; - [self configNIMSDK]; - [self configBugly]; - [self registerNot]; - [self initEmojiData]; -} - --(void)setLanguage{ - UISemanticContentAttribute attribute = UISemanticContentAttributeForceLeftToRight; - if (isMSRTL()) { - attribute = UISemanticContentAttributeForceRightToLeft; - } - - [UIView appearance].semanticContentAttribute = attribute; - [UISearchBar appearance].semanticContentAttribute = attribute; -} - --(void)registerNot{ - if (@available(iOS 10.0, *)) { - UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter]; - [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error) { - if (granted) { - [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) { - if (settings.authorizationStatus == UNAuthorizationStatusAuthorized){ - dispatch_async(dispatch_get_main_queue(), ^{ - [[UIApplication sharedApplication] registerForRemoteNotifications]; - }); - } - }]; - } - }]; - } -} - -/** - 崩溃收集 Bugly - */ - -- (void) configBugly { - // 使用 BuglyManager 统一管理 Bugly 配置 -#ifdef DEBUG - [[BuglyManager sharedManager] configureWithAppId:@"c937fd00f7" debug:YES]; -#else - [[BuglyManager sharedManager] configureWithAppId:@"8627948559" debug:NO]; -#endif -} -- (void)configNIMSDK { - //推荐在程序启动的时候初始化 NIMSDK - NSString *appKey = [[ClientConfig shareConfig].configInfo nimKey]; - if ([NSString isEmpty:appKey]) { - appKey = KeyWithType(KeyType_NetEase); - } - - NIMSDKOption *option = [NIMSDKOption optionWithAppKey:appKey]; -#ifdef DEBUG - option.apnsCername = @"pikoDevelopPush"; -#else - option.apnsCername = @"newPiko"; -#endif - - [[NIMSDK sharedSDK] registerWithOption:option]; - - // NIM SDK初始化 - [NIMCustomObject registerCustomDecoder:[[CustomAttachmentDecoder alloc] init]]; - [[NIMSDKConfig sharedConfig] setShouldSyncStickTopSessionInfos:YES]; - [NIMSDKConfig sharedConfig].shouldConsiderRevokedMessageUnreadCount = YES; - - // cdn统计回调不触发 - [NIMSDKConfig sharedConfig].cdnTrackInterval = 0; - - // 最小时间间隔设置为最小边界值 - [NIMSDKConfig sharedConfig].chatroomMessageReceiveMinInterval = 50; - -#ifdef DEBUG - [NIMSDKConfig sharedConfig].enabledHttpsForInfo = NO; - [NIMSDKConfig sharedConfig].enabledHttpsForMessage = NO; -#else - // 生产环境启用HTTPS - [NIMSDKConfig sharedConfig].enabledHttpsForInfo = YES; - [NIMSDKConfig sharedConfig].enabledHttpsForMessage = YES; -#endif -} - -- (void)configShareSDK { - -// [PILineLoginManager registerLine]; - - [ShareSDK registPlatforms:^(SSDKRegister *platformsRegister) { - ///faceBook -// [platformsRegister setupFacebookWithAppkey:@"1266232494209868" appSecret:@"c9b170b383f8be9cdf118823b8632821" displayName:YMLocalizedString(@"AppDelegate_ThirdConfig0")]; - [platformsRegister setupLineAuthType:SSDKAuthorizeTypeBoth]; - }]; - - NSString *isUpload = [[NSUserDefaults standardUserDefaults]valueForKey:@"kMobLinkUploadPrivacy"]; - if (isUpload == nil){ - [MobSDK uploadPrivacyPermissionStatus:YES onResult:nil]; - [[NSUserDefaults standardUserDefaults] setValue:@"YES" forKey:@"kMobLinkUploadPrivacy"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - } -} - -#pragma mark - 表情 -- (void)initEmojiData { - dispatch_async(dispatch_get_global_queue(0, 0), ^{ - NSArray * dicArray = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"emoji" ofType:@"plist"]]; - NSDictionary * dic = [dicArray firstObject]; - NSArray * emojiArray = dic[@"data"]; - NSMutableArray * array = [NSMutableArray array]; - for (int i = 0; i < emojiArray.count; i++) { - - NSDictionary * emotionDic = [emojiArray xpSafeObjectAtIndex:i]; - if (!emotionDic) continue; - - UIImage * image = [UIImage imageNamed:emotionDic[@"file"]]; - QEmotion * info = [[QEmotion alloc] init]; - - info.displayName = emotionDic[@"tag"]; - info.identifier = emotionDic[@"id"]; - info.image = image; - - [array addObject:info]; - } - //在这里强烈建议先预加载一下表情 - QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper]; - faceManager.emotionArray = array; - - // 清理 emoji 缓存，确保新的尺寸设置生效 - [QEmotionHelper clearEmojiCache]; - }); -} - -#pragma mark - 广告 - -/** - 设置广告页 - */ -- (void)setupLaunchADView { - return; - - NSUserDefaults * kUserDefaults = NSUserDefaults.standardUserDefaults; - // 判断沙盒中是否存在广告图片，如果存在，直接显示 - NSString *adName = [kUserDefaults stringForKey:adImageName]; - NSString *filePath = [XPAdImageTool.shareImageTool getFilePathWithImageName:adName]; - BOOL isExist = [XPAdImageTool.shareImageTool isFileExistWithFilePath:filePath]; - - if (isExist) {// 图片存在 -// if ([kUserDefaults integerForKey:@"adShow"] > 4) { - @kWeakify(self); - AdvertiseModel *info = [XPAdImageTool.shareImageTool getAdInfoFromCacheInMainWith:adName]; - XPAdvertiseView *advertiseView = [[XPAdvertiseView alloc] initWithFrame:self.window.bounds]; - advertiseView.type = info.type; - advertiseView.fileModel = info.fillVo; - advertiseView.filePath = filePath; - advertiseView.dismissHandler = ^(BOOL shouldJump) { - @kStrongify(self) - if (!shouldJump || info == nil) { - return; - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self advertiseJumpHandleWithInfo:info]; - }); - }; - [advertiseView show]; -// } - } -} - - -/// 闪屏广告跳转处理 -- (void)advertiseJumpHandleWithInfo:(AdvertiseModel *)info { - if (UIApplication.sharedApplication.keyWindow != self.window) { - //当前窗口不是主控制器所在窗口时，拦截跳转（目前可能情况时，闪屏后出现新人引导 - return; - } - - switch (info.type) { - case SplashInfoSkipTypeRoom: { - if (![[XPAdImageTool shareImageTool] isImLogin]) { - return; // 必须登录后才可以跳转 - } - // 跳转房间 - if (info.link.length > 0) { - [XPRoomViewController openRoom:info.link viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - } - } - break; - case SplashInfoSkipTypeWeb: - case SplashInfoSkipTypeWeb_CP: - case SplashInfoSkipTypeWeb_Custom: - case SplashInfoSkipTypeWeb_WeekStar: { - // 跳转 H5 - if (info.link.length > 0) { - XPWebViewController *webView = [[XPWebViewController alloc] initWithRoomUID:nil]; - webView.url = info.link; - [[[XCCurrentVCStackManager shareManager]currentNavigationController] pushViewController:webView animated:YES]; - } - } - break; - default: - break; - } -} -@end diff --git a/YuMi/Appdelegate/AppDelegate.m b/YuMi/Appdelegate/AppDelegate.m index 62c37d0..2c11be2 100644 --- a/YuMi/Appdelegate/AppDelegate.m +++ b/YuMi/Appdelegate/AppDelegate.m @@ -7,55 +7,23 @@ #import "AppDelegate.h" -#import -#import -#import -#import "TabbarViewController.h" + #import "BaseNavigationController.h" -#import "AppDelegate+ThirdConfig.h" -#import #import #import "ClientConfig.h" -#import -#import -#import "LoginViewController.h" #import "AccountModel.h" #import "YuMi-swift.h" -#import "SessionViewController.h" -#import "LoginFullInfoViewController.h" -#import "UIView+VAP.h" -#import "SocialShareManager.h" #import "EPSignatureColorGuideView.h" #import "EPEmotionColorStorage.h" UIKIT_EXTERN NSString * const kOpenRoomNotification; -@interface AppDelegate () +@interface AppDelegate () @end @implementation AppDelegate -//日志接口 -void qg_VAP_Logger_handler(VAPLogLevel level, const char* file, int line, const char* func, NSString *module, NSString *format, ...) { - - // 屏蔽 MP4 播放 log - return; - -// if (format.UTF8String == nil) { -// NSLog(@"log包含非utf-8字符"); -// return; -// } -// if (level > VAPLogLevelDebug) { -// va_list argList; -// va_start(argList, format); -// NSString* message = [[NSString alloc] initWithFormat:format arguments:argList]; -// file = [NSString stringWithUTF8String:file].lastPathComponent.UTF8String; -// NSLog(@"<%@> %s(%@):%s [%@] - %@",@(level), file, @(line), func, module, message); -// va_end(argList); -// } -} - - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; @@ -65,18 +33,11 @@ void qg_VAP_Logger_handler(VAPLogLevel level, const char* file, int line, const self.window.rootViewController = launchScreenVC; [self.window makeKeyAndVisible]; - [VAPView registerHWDLog:qg_VAP_Logger_handler]; - - ///初始化一些 sdk配置 - [self initThirdConfig]; - [self initUM:application launchOptions:launchOptions]; - @kWeakify(self); [[ClientConfig shareConfig] clientConfig:^{ @kStrongify(self); dispatch_async(dispatch_get_main_queue(), ^{ [self loadMainPage]; - [self setupLaunchADView]; }); }]; @@ -113,16 +74,6 @@ void qg_VAP_Logger_handler(VAPLogLevel level, const char* file, int line, const #pragma clang diagnostic pop } -- (void)initUM:(UIApplication *)application - launchOptions:(NSDictionary *)launchOptions { - // 只有同意过了隐私协议 才初始化 - if ([[NSUserDefaults standardUserDefaults] objectForKey:@"kYouMinumbernnagna"]) { - ///初始化友盟 - [UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" - channel:@"appstore"]; - } - [MobLink setDelegate:self]; -} - (void)loadMainPage { AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo]; @@ -191,16 +142,9 @@ void qg_VAP_Logger_handler(VAPLogLevel level, const char* file, int line, const [[BaseNavigationController alloc] initWithRootViewController:lvc]; navigationController.modalPresentationStyle = UIModalPresentationFullScreen; self.window.rootViewController = navigationController; - - // 旧代码保留注释（便于回滚） - // LoginViewController *lvc = [[LoginViewController alloc] init]; - // BaseNavigationController * navigationController = [[BaseNavigationController alloc] initWithRootViewController:lvc]; - // navigationController.modalPresentationStyle = UIModalPresentationFullScreen; - // self.window.rootViewController = navigationController; } - (void)toHomeTabbarPage { - // ========== 白牌版本：使用新的 EPTabBarController ========== EPTabBarController *epTabBar = [EPTabBarController create]; [epTabBar refreshTabBarWithIsLogin:YES]; @@ -209,31 +153,8 @@ void qg_VAP_Logger_handler(VAPLogLevel level, const char* file, int line, const window.rootViewController = epTabBar; [window makeKeyAndVisible]; } - - NSLog(@"[AppDelegate] 自动登录后已切换到白牌 TabBar：EPTabBarController"); - - // ========== 原代码（已注释） ========== - /* - TabbarViewController *vc = [[TabbarViewController alloc] init]; - BaseNavigationController *navigationController = [[BaseNavigationController alloc] initWithRootViewController:vc]; - self.window.rootViewController = navigationController; - */ } -- (void)IMLSDKWillRestoreScene:(MLSDKScene *)scene - Restore:(void (^)(BOOL, RestoreStyle))restoreHandler { - NSString *inviteCode = scene.params[@"inviteCode"]; - if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){ - ClientConfig *config = [ClientConfig shareConfig]; - config.inviteCode = inviteCode; - } - restoreHandler(YES, MLDefault); -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - NSInteger count = [NIMSDK sharedSDK].conversationManager.allUnreadCount; - [[UIApplication sharedApplication] setApplicationIconBadgeNumber:count]; -} - (void)applicationDidBecomeActive:(UIApplication *)application { [self getAdvertisingTrackingAuthority]; @@ -246,10 +167,8 @@ void qg_VAP_Logger_handler(VAPLogLevel level, const char* file, int line, const ATTrackingManagerAuthorizationStatus status = ATTrackingManager.trackingAuthorizationStatus; switch (status) { case ATTrackingManagerAuthorizationStatusDenied: -// NSLog(@"用户拒绝IDFA"); break; case ATTrackingManagerAuthorizationStatusAuthorized: -// NSLog(@"用户允许IDFA"); break; case ATTrackingManagerAuthorizationStatusNotDetermined: { // NSLog(@"用户未做选择或未弹窗IDFA"); @@ -266,81 +185,6 @@ void qg_VAP_Logger_handler(VAPLogLevel level, const char* file, int line, const }); } -- (void)application:(UIApplication *)app didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken { - // 上传devicetoken至云信服务器。 - [[NIMSDK sharedSDK] updateApnsToken:deviceToken ]; -} - -- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{ - - NSString *data = userInfo[@"data"]; - if(data){ - NSDictionary *dataDic = [data mj_JSONObject]; - NSString *userId = dataDic[@"uid"]; - if(userId){ - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}]; - ClientConfig *config = [ClientConfig shareConfig]; - config.pushChatId = userId; - - }); - return; - } - } - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - NSString *userId = userInfo[@"uid"]; - if(userId){ - [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}]; - ClientConfig *config = [ClientConfig shareConfig]; - config.pushChatId = userId; - } - }); -} - -///URL Scheme跳转 --(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options{ - [[SocialShareManager sharedManager] handleURL:url]; - - return [GIDSignIn.sharedInstance handleURL:url]; -} - -//- (void)__oldApplicationOpenURLMethod:(NSURL *)url { -// NSString *text = [url query]; -// if(text.length){ -// NSMutableDictionary *paramsDict = [NSMutableDictionary dictionary]; -// NSArray *paramArray = [text componentsSeparatedByString:@"&"]; -// for (NSString *param in paramArray) { -// if (param && param.length) { -// NSArray *parArr = [param componentsSeparatedByString:@"="]; -// if (parArr.count == 2) { -// [paramsDict setObject:parArr[1] forKey:parArr[0]]; -// } -// } -// } -// if(paramsDict[@"type"] != nil){ -// NSInteger type = [paramsDict[@"type"] integerValue]; -// if (type == 2) { -// NSString *uid = [NSString stringWithFormat:@"%@",paramsDict[@"uid"]]; -// [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"uid":uid}]; -// ClientConfig *config = [ClientConfig shareConfig]; -// config.roomId = uid; -// }else if(type == 7){ -// NSString *uid = [NSString stringWithFormat:@"%@",paramsDict[@"uid"]]; -// [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":uid}]; -// ClientConfig *config = [ClientConfig shareConfig]; -// config.chatId = uid; -// }else if (type == 8){ -// NSString *inviteCode = paramsDict[@"inviteCode"]; -// if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){ -// ClientConfig *config = [ClientConfig shareConfig]; -// config.inviteCode = inviteCode; -// } -// } -//// return YES; -// } -// } -//} #pragma mark - Core Data stack @synthesize managedObjectContext = _managedObjectContext; diff --git a/YuMi/Config/ClientConfig.m b/YuMi/Config/ClientConfig.m index 9ead174..d4fb8b1 100644 --- a/YuMi/Config/ClientConfig.m +++ b/YuMi/Config/ClientConfig.m @@ -11,13 +11,10 @@ #import "DESEncrypt.h" #import "YUMIConstant.h" #import -#import "XPRoomFaceTool.h" #import "NSString+Utils.h" #import "YYUtility.h" #import "XPWeakTimer.h" #import "Api+Main.h" -#import "ChatFaceVo.h" -#import "PublicRoomManager.h" @interface ClientConfig () ///重试的次数 10次 如果你还是失败的话 那就算了 没办法了 @@ -74,16 +71,7 @@ NSString *json = model.faceJson.json; NSString *deJson = [DESEncrypt decryptUseDES:json key:KeyWithType(KeyType_FacePwdEncode)]; NSDictionary *faceInitData = [deJson toJSONObject]; - model.faceInitData = faceInitData; - if (faceInitData) { - [XPRoomFaceTool shareFaceTool].version = [NSString stringWithFormat:@"%@",faceInitData[@"version"]]; - [XPRoomFaceTool shareFaceTool].zipMd5 = [[NSString stringWithFormat:@"%@",faceInitData[@"zipMd5"]] uppercaseString]; - [XPRoomFaceTool shareFaceTool].zipUrl = [NSString stringWithFormat:@"%@",faceInitData[@"zipUrl"]]; - ///表情的数据保存本地 - [[XPRoomFaceTool shareFaceTool] saveFaceInfoList:faceInitData]; - ///开始下载 - [[XPRoomFaceTool shareFaceTool] downFaceData]; - } + NSString *trtcAppId = @(model.trtcAppId).stringValue; NSString *curTtcKey = [[NSUserDefaults standardUserDefaults]valueForKey:@"kTrtcAppId"]; if(curTtcKey == nil){ @@ -99,7 +87,7 @@ } } } - //是否展示公屏 + NSString *serverVer = model.appStoreAuditNoticeVersion; NSString *shortVer = [YYUtility appVersion]; model.hideNoticeVersion = [NSString versionCompareOldStr:serverVer andNewStr:shortVer]; @@ -107,8 +95,6 @@ self.configInfo = model; [[NSNotificationCenter defaultCenter] postNotificationName:@"reloadAfterLoadConfig" object:nil]; - - [self requestFaceTabNewList]; } else { if (self.retryCount < 10) { dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ @@ -120,14 +106,6 @@ }]; } -- (void)requestFaceTabNewList { - [Api faceTabNewList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - [[XPRoomFaceTool shareFaceTool] cacheChatFaces:data.data]; - } - }]; -} - - (void)clientConfig:(void(^)(void))finish { @kWeakify(self); [Api clientConfig:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { @@ -135,140 +113,11 @@ if (code == 200) { self.uiSetting = [AppUISetting modelWithJSON:data.data[@"appUiSetting"]]; } - // 无论如何都开始构建 tab image path 数组并进入首页 - [self prepareCustomUI]; + if (finish) { finish(); } }]; } -- (void)prepareCustomUI { - NSArray *defaultArray = @[@"", @"", @"", @"", @""]; - self.normalTabImageSource = defaultArray.mutableCopy; - self.selectedTabImageSource = defaultArray.mutableCopy; - - if (self.uiSetting) { - NSArray *unselectIcons = @[ - self.uiSetting.homeUnSelectIcon ?: @"", - self.uiSetting.gameUnSelectIcon ?: @"", - self.uiSetting.dynamicUnSelectIcon ?: @"", - self.uiSetting.msgUnSelectIcon ?: @"", - self.uiSetting.mineUnSelectIcon ?: @"" - ]; - - NSArray *selectIcons = @[ - self.uiSetting.homeSelectIcon ?: @"", - self.uiSetting.gameSelectIcon ?: @"", - self.uiSetting.dynamicSelectIcon ?: @"", - self.uiSetting.msgSelectIcon ?: @"", - self.uiSetting.mineSelectIcon ?: @"" - ]; - - self.normalTabImageSource = unselectIcons.mutableCopy; - self.selectedTabImageSource = selectIcons.mutableCopy; - - [self loadNavigationAreaBG]; - [self loadTabbarBG]; - [self loadBGColor]; - } else { - if (self.updateTabbarBG) { - self.updateTabbarBG(kImage(@"tab_bar_bg")); - } - } -} - -- (UIImage *)navigationAreaBG { - if (!_navigationAreaBG) { - return kImage(@"home_top_bg"); - } else { - return _navigationAreaBG; - } -} - -- (void)loadNavigationAreaBG { - if (!_navigationAreaBGImageLoader) { - _navigationAreaBGImageLoader = [[NetImageView alloc] init]; - } - - @kWeakify(self); - [self.navigationAreaBGImageLoader loadImageWithUrl:self.uiSetting.headIcon - completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - self.navigationAreaBG = image; - [[NSNotificationCenter defaultCenter] postNotificationName:self.reloadNavigationAreaImageKey object:[image resizeTo:CGSizeMake(1125, 420)]]; - } fail:^(NSError * _Nonnull error) {}]; -} - -- (void)loadTabbarBG { - - if (!_tabbarBGImageLoader) { - _tabbarBGImageLoader = [[NetImageView alloc] init]; - } - - @kWeakify(self); - [self.tabbarBGImageLoader loadImageWithUrl:self.uiSetting.navbar - completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - self.tabbarBGImage = image; - if (self.updateTabbarBG) { - self.updateTabbarBG(image); - } - } fail:^(NSError * _Nonnull error) { - @kStrongify(self); - if (self.updateTabbarBG) { - self.updateTabbarBG(kImage(@"tab_bar_bg")); - } - }]; -} - -- (void)loadBGColor { - [[NSNotificationCenter defaultCenter] postNotificationName:self.reloadNavigationAreaImageKey - object:nil]; -} - -- (UIColor *)bgColor { - if (self.uiSetting && ![NSString isEmpty:self.uiSetting.backgroundColor]) { - return [DJDKMIMOMColor colorWithHexString:self.uiSetting.backgroundColor]; - } - - return [DJDKMIMOMColor colorWithHexString:@"#FCF4DF"]; -} - -- (NSString *)tabName:(NSInteger)tabIndex { - return @[YMLocalizedString(@"TabbarViewController2"), - YMLocalizedString(@"TabbarViewController6"), - YMLocalizedString(@"TabbarViewController3"), - YMLocalizedString(@"TabbarViewController4"), - YMLocalizedString(@"TabbarViewController5")][tabIndex]; -} - -- (NSString *)loadDefaultNormalTabImageName:(NSInteger)tabIndex { - return @[@"tab_gameHome_normal", - @"tab_gameHome_game_normal", - @"tab_monents_normal", - @"tab_message_normal", - @"tab_mine_normal"][tabIndex]; -} - -- (NSString *)loadDefaultSelectedTabImageName:(NSInteger)tabIndex { - return @[@"tab_gameHome_selected", - @"tab_gameHome_game_selected", - @"tab_monents_select", - @"tab_message_selected", - @"tab_mine_selected"][tabIndex]; -} - -- (NSString *)loadConfigNormalTabImagePath:(NSInteger)tabIndex { - return [self.normalTabImageSource xpSafeObjectAtIndex:tabIndex]; -} - -- (NSString *)loadConfigSelectedTabImagePath:(NSInteger)tabIndex { - return [self.selectedTabImageSource xpSafeObjectAtIndex:tabIndex]; -} - -- (BOOL)shouldDisplayCaptcha { - return [self.configInfo captchaSwitch]; -} - @end diff --git a/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m b/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m index 866bf1e..de332a9 100644 --- a/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m +++ b/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m @@ -8,7 +8,7 @@ #import "XPAdvertiseView.h" #import "AppDelegate.h" //tool -#import + #import #import #import "YUMIMacroUitls.h" @@ -19,9 +19,8 @@ NSString *const adUrl = @"adUrl"; // 广告显示的时间 static int const showtime = 3; -@interface XPAdvertiseView() +@interface XPAdvertiseView() -@property(nonatomic, strong) SVGAImageView *svgaView; @property (nonatomic, strong) UIImageView *adView;//广告图片 @@ -175,78 +174,14 @@ static int const showtime = 3; #pragma mark - Setter - (void)setFilePath:(NSString *)filePath { - _filePath = filePath; - _imageLoaders = @[].mutableCopy; - if (self.type == SplashInfoSkipTypeWeb_CP || self.type == SplashInfoSkipTypeWeb_Custom || self.type == SplashInfoSkipTypeWeb_WeekStar) { - _svgaView = [[SVGAImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - _svgaView.delegate = self; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTapAdViewAction)]; - [_svgaView addGestureRecognizer:tap]; -// [self addSubview:_svgaView]; - [self insertSubview:_svgaView belowSubview:self.countdownButton]; - SVGAParser *p = [[SVGAParser alloc] init]; - @kWeakify(self); - [p parseWithURL:[[NSURL alloc] initFileURLWithPath:filePath] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - if (videoItem) { - self.svgaView.autoPlay = YES; - self.svgaView.clearsAfterStop = YES; - self.svgaView.videoItem = videoItem; - - if (self.fileModel) { - [self updateSvgaImage:self.fileModel.avatar key:@"avatar"]; - [self updateSvgaImage:self.fileModel.picUrl key:@"gift"]; - [self updateSvgaImage:self.fileModel.avatar key:@"avatar_1"]; - [self updateSvgaImage:self.fileModel.loverAvatar key:@"avatar_2"]; - - [self updateSvgaText:[NSString stringWithFormat:@"ID: %@", self.fileModel.erbanNo] key:@"id"]; - [self updateSvgaText:self.fileModel.giftName key:@"name"]; - [self updateSvgaText:[NSString stringWithFormat:@"ID: %@", self.fileModel.erbanNo] key:@"id_1"]; - [self updateSvgaText:[NSString stringWithFormat:@"ID: %@", self.fileModel.loverErbanNo] key:@"id_2"]; - } - [self.svgaView startAnimation]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - UIImage *image = [UIImage imageWithContentsOfFile:filePath]; - self.adView.image = [image cutImage:[UIScreen mainScreen].bounds.size]; - }]; - } else { - UIImage *image = [UIImage imageWithContentsOfFile:filePath]; - self.adView.image = [image cutImage:[UIScreen mainScreen].bounds.size]; - } } - (void)updateSvgaImage:(NSString *)imagePath key:(NSString *)key { - if (self.svgaView && ![NSString isEmpty:imagePath] && ![NSString isEmpty:key]) { - UIImage *image = [UIImage imageWithColor:[UIColor colorWithWhite:0.9 alpha:0.9] size:CGSizeMake(100, 100)]; - [self.svgaView setImage:image - forKey:key]; - __block NetImageView *loader = [[NetImageView alloc] init]; - @kWeakify(self); - @kWeakify(loader); - [loader loadImageWithUrl:imagePath - completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - @kStrongify(loader); - [self.svgaView setImage:image - forKey:key]; - [self.imageLoaders removeObject:loader]; - }]; - [self.imageLoaders addObject:loader]; - } + } - (void)updateSvgaText:(NSString *)content key:(NSString *)key { - if (self.svgaView && ![NSString isEmpty:content] && ![NSString isEmpty:key]) { - NSAttributedString *string = [[NSAttributedString alloc] initWithString:content - attributes:@{ - NSFontAttributeName: kFontMedium(kGetScaleWidth(24)), - NSForegroundColorAttributeName: UIColorFromRGB(0xFDF565) - }]; - [self.svgaView setAttributedText:string - forKey:key]; - } + } - (void)setAdImage:(UIImage *)adImage { diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/Color/Contents.json b/YuMi/CustomUI/InputView/Assets.xcassets/Color/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/YuMi/CustomUI/InputView/Assets.xcassets/Color/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/Contents.json b/YuMi/CustomUI/InputView/Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/YuMi/CustomUI/InputView/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/Contents.json b/YuMi/CustomUI/InputView/Assets.xcassets/input/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/YuMi/CustomUI/InputView/Assets.xcassets/input/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/Contents.json b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/Contents.json deleted file mode 100644 index 2f5f501..0000000 --- a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/Contents.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "chat_icon_emoji_black_l_normal@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "chat_icon_emoji_black_l_normal@2x-1.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "chat_icon_emoji_black_l_normal@3x.png", - "idiom" : "universal", - "scale" : "3x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "chat_icon_emoji_black_l_normal@3x-1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/chat_icon_emoji_black_l_normal@2x-1.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/chat_icon_emoji_black_l_normal@2x-1.png deleted file mode 100644 index 4f9226cc21e956e8aa647dc513f90f43deecba9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1017 zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT3?e@WZ39x11AIbUf%Lt5_by(%c!yy%*vouSB{DK*n{{(XWw0Ntv;q{fx z%Z*RXdLr<(EL=QZc~VDp0`H?_~>K#hTc>5Zq0V@Sl|x8W~~9vSf5 z(zVuSxE=^(D6#kQ&Qh%Oj=Ko_Nv;1$3^~vko zmlst1vFFo|*1eP>!}3@qc8!t0@!dm0d7r%$o(DA+i-hjuo%+a3sNTiGNROrS_~RKI z2PKP)PUR`h5);wfq%e0!-H$IKzuu|vN(6Bp{qlR=6+@;;8DVj!PDi>-u~^ryRwkBy zPBU5gzs02hW>L-LDd(ql&OO>Kb>K+u+9{83_zKKA5u9c=Eu3*jr1YfhMPJz*_uQ&f zV$8WIy-!GAvg3r<)jf>g)-d}J(+&hqE4uPsUvc3P^Y>P{`aSng znY<}1J#BbtTiz`3@V3N>%hzq|oshqK@u#AbXjBs9M@QC+_fD7RnBbhaSOWq%F?tRTHVcZ zyU*9#;k8&#`J&7{JsuAKT}hvg8S(k1E!%wZ-K_-knZCVtJx_1EUc~w2v?agu*JpE1 zi%UjioC}S3-E+h#xoOj3maFzht8Q>E-Qcs)Z-=bf!{*ceimUJPU8!FBDz+}o_{G7# z%VrB^YF|B&W)S_kC&sC})oGbYbM$2quE%^awHldyvk!}KW#0_?q5a^NxWLa{q1)ED zUg?x#$f{wKsn=M#wnMAuNvdZ#*A#{iPq`KiM2UQy4v`Exc4NSN`qr^`9bdUse5oxWe)N!|Z%kz3nrWif%Af>ucI-xO2bn zuKk(2_qYD}*!Jz;w_Eq#H1An_)0{7L+Un!^F)eSdZ@Rxr<<|N&{5BsB|6s4uhz#x8 T^`H!xSr|NB{an^LB{Ts5t1k_& diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/chat_icon_emoji_black_l_normal@2x.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/chat_icon_emoji_black_l_normal@2x.png deleted file mode 100644 index f744bdd92199710643864c95967e0d71f8020d29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 973 zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT3?e@WZ39wu0X`wFK$@4AR|y7WWo02uMMXtr zWn~~6$bd;A*gz=-1qC1pl!Yh&vQ<=6;Cg`!h;}p+;6?!%K=sUZe(y|NCUqul-}#mmswa~YUftVu z|GMdX$vL-$59XO|5m_=h(CVDp!ue6b&h;G+f`=JV-vNae8~^#R|h({ zHssvnlYhi}P+r1p-9-@{@enB=y$3TFU3%c-dTsiOpTQs6SABn{5NGnyFXGcr;ecHZTZ`Fb+5ru5fE$K@Jd7_8*=@=bfW^yEyTaQ};(7E|86e%i?3s(#&6 z@!VdMY_a+4S)|nN7B|gv6F#)MXV!In6Vv)vJ&%;7m*(_%rf8-9kg)C+*;g%I70qpN(DI!5A=RDKfQ-XF1o1W)Zd>T zN4ypV^Ig0!F|V@i8uN3mj~Bmj%e|a1PxNB)iznuux6W9J^~M-He64q=D&|?e-`=Zg z%?GOQw(7@6pYsbXoqIy|>CPJGl?@?F)K)sYKH~B%L&NapJhf8)Tf3G|_^-Th>X%u& zmRz6org(ZveA1IUA75Vlt9a#azopr0PuaRAOHXW diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/chat_icon_emoji_black_l_normal@3x-1.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/chat_icon_emoji_black_l_normal@3x-1.png deleted file mode 100644 index 567a1f4f30048d99fc7ded5ec21f77712d0c6a94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 781 zcmV+o1M>WdP)bYV*4x^=%l*PArC$H}?p+U;HaO}UOg-}8Q`8Z~O19UmTC zd6qt3e6)TF&gWYgBU?(Ul3sQ|c-pN-+Qk&IUKP>~hDaCh{=RvsGVL8S`ae(9+4?p* zmD=PyG%k_}K1KlY64JQ{!0o9g%K)yrS+9sxq@_+nwgJ4EeHg^Rk&E>h$nCn`lSxe@ z3zK^wv;G5btu~4Q(P;tDw};&(urIOR1J{%lVT4q2b%acc@NHm042u=f`yDAjHUQa~ ztH8P-VD6011tBihl#JLOAM-{)LB!1N;yvX+!|v!92hJR_Di8qIl?%(Z@Msv*wr?!a zV>)cuH28!*rL)dmc9=t&aAQo8p#@N6Z4VD7jd~Wb57h{Npz&3)LugYxp7=fj$Xqc1 z`eTh5)_fltlY2u9@nn22cTHd-BQ`H;bP5-*a?>|~WUL?wH4@jT^92L$u9Ol6=u(0h zKhAT9&7n`XA}$gT4(t(uVth}_{aMpz?Eco6eEZ=n5{h{-znYjqswlt2Tn;gVTv0BIbwmG}hQ5L7 z2Cq@3#!Z7H?@9HLE0!fx52f16MO>lU>#XyeD56Vs-q};a2!t1`r%3&)L8P?n?q97! zuiP=LJFHjAeL4IwCS7KI*);=%_d5WxUu*^_nKy#J-~T0S-td@hJmx5mnXP<2^qfWg z=ic%e+kc+--yP&V#d|06-@gdEeAn~aEB$v^|9zS7<~3^6I5Um`lw%?Twq#6u00000 LNkvXXu0mjfANz0L diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/chat_icon_emoji_black_l_normal@3x.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_emoji_black_normal.imageset/chat_icon_emoji_black_l_normal@3x.png deleted file mode 100644 index 06011f8a047d945435f3bc38897cc15e62f8d59a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 781 zcmV+o1M>WdP)bYV*4x^=%l*PArC$H}?p+U;HaO}UOg-}8Q`8Z~O19UmTC zd6qt3e6)TF&gWYgBU?(Ul3sQ|c-pN-+Qk&IUKP>~hDaCh{=RvsGVL8S`ae(9+4?p* zmD=PyG%k_}K1KlY64JQ{!0o9g%K)yrS+9sxq@_+nwgJ4EeHg^Rk&E>h$nCn`lSxe@ z3zK^wv;G5btu~4Q(P;tDw};&(urIOR1J{%lVT4q2b%acc@NHm042u=f`yDAjHUQa~ ztH8P-VD6011tBihl#JLOAM-{)LB!1N;yvX+!|v!92hJR_Di8qIl?%(Z@Msv*wr?!a zV>)cuH28!*rL)dmc9=t&aAQo8p#@N6Z4VD7jd~Wb57h{Npz&3)LugYxp7=fj$Xqc1 z`eTh5)_fltlY2u9@nn22cTHd-BQ`H;bP5-*a?>|~WUL?wH4@jT^92L$u9Ol6=u(0h zKhAT9&7n`XA}$gT4(t(uVth}_{aMpz?Eco6eEZ=n5{h{-znYjqswlt2Tn;gVTv0BIbwmG}hQ5L7 z2Cq@3#!Z7H?@9HLE0!fx52f16MO>lU>#XyeD56Vs-q};a2!t1`r%3&)L8P?n?q97! zuiP=LJFHjAeL4IwCS7KI*);=%_d5WxUu*^_nKy#J-~T0S-td@hJmx5mnXP<2^qfWg z=ic%e+kc+--yP&V#d|06-@gdEeAn~aEB$v^|9zS7<~3^6I5Um`lw%?Twq#6u00000 LNkvXXu0mjfSms#W diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/Contents.json b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/Contents.json deleted file mode 100644 index 640000e..0000000 --- a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/Contents.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "chat_icon_more_black_l_normal@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "chat_icon_more_black_l_normal@2x-1.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "chat_icon_more_black_l_normal@3x.png", - "idiom" : "universal", - "scale" : "3x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "chat_icon_more_black_l_normal@3x-1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/chat_icon_more_black_l_normal@2x-1.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/chat_icon_more_black_l_normal@2x-1.png deleted file mode 100644 index c624a0d29956111ef4d1e176c24fece597b9e821..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3554 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 diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/chat_icon_more_black_l_normal@2x.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/chat_icon_more_black_l_normal@2x.png deleted file mode 100644 index 4c7083ee040bf9cca92f8cf6c882abfec189fb20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 677 zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT3?e@WZ39vX0X`wFKw3~xPzeU)<>eI>6(Kxj zWo0x5kPDZE>44He#Xz8@rUp>}Bq1U{JC|<&+96*O zi#uDm{O77~DL;6WR=bve-J~;JHb3xWzr%6erY&csU-Gl-&%TqzlH32-xlqa>Ew<1; z&SEy}7Uk)NA{&`kPRd;${^BIp64{+R!Cc)u%Q!pKg}+KWyG6UqnNg&6-1nlRQou&V z&y_QTlTN<;pZe&N!1)Vn%AS%#d|ZBu9GNzYpXZ6^poezFFC~u{^^&NGzF?o``7mI>zdFyCcmFsV}DB@ z(+^xF;N^Gy8rWEtBZ?27+3_SAbkk&oQ}>#oKEBL;?f XZdO0Dl4DbVX@SAh)z4*}Q$iB}?EM#; diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/chat_icon_more_black_l_normal@3x-1.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/chat_icon_more_black_l_normal@3x-1.png deleted file mode 100644 index d56981833c4c5da027306ceded389136b9f658e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2795 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 diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/chat_icon_more_black_l_normal@3x.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_extend_black_normal.imageset/chat_icon_more_black_l_normal@3x.png deleted file mode 100644 index 5b7fce22795293d5cabee00f4495aeef0dc495b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 653 zcmeAS@N?(olHy`uVBq!ia0vp^nIO!<3?xsl5#R(;x&b~Ru0UD|2`DQotEi}GYHC8n zfLtU=rBaT{-#`s~B|(0{3D6T^vIq4!@ba+l$#z zqBXqOxU-|Hw^yNKu43zo2%VKKI!+wd6g9RfYBX_m^-eo@=$M<1t_#zwLu##4m-;L0 z=qxOLSk0y=HT~qdGwZHdp8a(G)4@N_=NPg{Wi0rg{k-t$&8o;XPyQc}S^HVJdhrYK zTRsmm^d9r?a-C57n0*)Xfmyq%cFkc~@R<2F+ltVA*KgLp@S8W!g)ywV&rt2cmxe=X z8`S13X;ihH`qoh?Ewi_WG5v4*LZK}sA)>QB#h%X6ShvGl>{iw*xpPb9raDMQab$hE z_4Z(U*R7`1pYuC9mv-Gc5@z~`VbZCnGuoH^S8xR}l+Lg`p{;l0$~WVcFOIHU80LAe zKk&jHSgBzik(npRK7d!=DAJPH>GdYN9IS!N1eZ2b5kceFTyQS zF6dj-x!Zml|GMtJ^lg)2!$-D_y@gW@r9Up*s8P7y(Cp)$oy?V7mJ@%9@06=lwbc1( fw6iiaG=_g-jQGiScmDhXCKCovS3j3^P6C*)T@Wo-u3Ukr1nU41Kr3$FzJ2}r^}BcP z-oJkzsNm_-ryo9i$h7)k1ay;TNswPK0~5!uC;!y>-)>kD^`eAli`ne1%ZsYhEsc~< z_cz5~pBnDxEBxkEqu|){r~pd#%n*5}EtG zez)}Wp42rDc+S~>u9fn$kjc2T_2ZW1wl{2ye*c=Tr2c$zrOeOX4*R&0+j|{WF1Y?q z@0cC;Uk{Zz{@d9E8hieoEwkc}e33UXP)9(ZS1?mx$sq|9jYl82c$r-^*uK z-0G7JqRqE1VmNW`^js?!FA)y`tIjtSQ!*SArwTlk6U}cEGL)0OI9+hTG^M*yf=i>8 zE-g-+HhZ;-%*V7$mvzxDtAi>{nSM>wP2zT~6?itaL@R1Z?*YcxyFPaqS}(fjti7ls z{=-jPbxOI&&mPTp<*FJ92c|?@F$>HP__^#<_oQX#wYHc3a?^TcZ=Pz^aC*fqo{K^Y zi>+%H&pmS1c5YI0P}-Bb<;e{*@~2s*?Fx0;D6ITxIZK7>^SLth=7G+i^k!N%*{!}H zP-Oiq>wu+YdzXEy?A4D~rd#LVb@)^1p18 zS(fik3NpDpcUNw`y)if~G2nA)vHsZ)9~RtE?`3-AZaS+qcp3MylPfz*q_)49n|t-U zH0zO`WsU2MkLQ}aULRB;zxA`tcu(OBDC_ zJh1#FYpCd>_#xJatBG^_o%c($-v>M@af^{QOcrWbHAV8Bs*Kj$({twZYNhN5j45E` zp7pY*P-};Qvs+x`VvD0OAGY;$J}H_v_tB~*^C))zzJ}gaT<7lg3;xY{9vcw({qeyB z_jMXFTCzNkb@_e6K5`#BB5pEQWt5=-X>9}6wx-{nQNL~v`wd% z;U+iV^*>B)<+P@IZYl9fmuO{OJoWg&64l60Opn)1$!=U3_ij)AvzT|U^!L?o5nZw0 zaOHmARr@nn?{8hRf8kugr|-94|7!mGy61^I?)^Q%VZRl=oJfxR>zwpg`Ss;_-y(kV ZUoQ3e@pyHMJ}^Ttc)I$ztaD0e0svw<_cH(h diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_keyboard_black_normal.imageset/chat_icon_keyboard_black_l_normal@2x.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_keyboard_black_normal.imageset/chat_icon_keyboard_black_l_normal@2x.png deleted file mode 100644 index 4629082811620ce95128bb4e3794ee485ba52ba5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1058 zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT3?e@WZ39w^0(?STfwYK-h`hYKii(ON7${)? zpfFHO83urCxQLvb9E1xO0jh#1hLAvGAqr$+C&q84Cyv%PhE($EQukX5U;e6@gp_H-S>R3ur zN!VKlmy#BZJ6HIZY8UkP?Y**TfA;AEj!YL*r(5Zq;@~*&cFqOYq$`DuzWLiLZ#Zra zbk9D1cusLsxtMfr@7=tOdlvIK`%Ze&xkd5CkGk2%)24-ATiRL8+V}k08n-i_6rDA> zUNl#_T@8NaB-0)A_Q*$v?WZ!8Ioh{>Hg^%4%~joza8H4;W^83xIQMul%b%~GF1gu!=$dy}(shlHlCO)M`p$;5 zMu8=d&4kW9wr4Ur%X;zQr(3Ko-A=P46Rdqx?K5_2JwGJo92Th}&$9W@6CQ@}O@8s6 zvoyjr7Dh7iaA~JD>X>V*{!=+DTq+_rYf zk+l;ixoe(1!cy4W#_cCEy`oQitIx!uW;egC*ACS&AN<<=fDkM@e(jx<+o9%LMdwFBv$vx509?6nP)n-(b3V;($dw{)zZ?^)6>(_)6>$@($dn>($dmN@vl1o000bhQchC<$44fS z>Jp=3+kW#x7T>}E00PuWL_t(o!|hi)ixW{8HCgwmMNr&zA;nmT4^r$3g2fgVi-K4v zA}DS#+Ni6=f{hC)f}pTqu|BYxA_hTG3$d|DGf5^UoAaZ*$9cKAuei6JQ-sW&d**(R z^L_W;Lj?*HI5;kRUcNWFyVP3w56+`)Bp5#TCncR}BgZdqGSUwAA!rcDOY#GyLHzfEGBRVO+? z*H}YzKqZVVV-eNSQCeUw^fi?SPY@=iyx{Lys^pSKBVNVhC5(JUFb3(LEz0#La}iR4 zNg>av!f_q_Sg36b_!Mz@G??BS@e7sX0V+vUXn&Pn);O<(G`3ajDgxU~|Lk$C5&cJ# zYyC*uLst=aFMatzlp4)k5S2r5vKH=YQ|@)Z%1?PKEk)O$Z=jmB9=vjA0@mKqH% zG1aVvEX>-qroex7z-N{(vljZ&T9RL7vZyFORaDN3^f3(3q3}bF!K2hGQViu}ta8&| zXfJZ(yd$2!g?={0SsS?yji3&dnm2-)SJsyitS@CPn<3XS^V&C)*f+F2ia2*W!%ccC z^(eU?(#ITZ8hJl7_1^Notgh61HGO_2K#q#O&l4N@XE)a~T=V5U#eM&px9*j0`?C8P zz<%CvI@`FPqwHrkm-C_fS=4^+bvR?YpXcp&hsbldr#Rn<-0xq+j`gl*zgLpvaEEoj iFWc|t1qu{6F#Z6-$NmoJOOzr20000ZVEe{u#*u*sEq83`tR1Rq4on057%f29aJ-}RW zJS;L9nGQa_rc^7_fl$#&?fF0*3(S$BH~8;$--r+NA4kc3le3K}cd^nen3C24JDMfe z1yf1krwk~xE4EWJ;i|Nha`#gzEk5IR(XbjWI64bnWHUpz#9vAL{9iaF79SW=UE!JHcf zE36KVToSk-tnKHH>?zL-ZH!<}MAT)@!#*1s;m-)Zhi5O7feFvf1{N3ykralnt})hL z4;?!>A#hd?w(Z*7rC4Znf7#sqHQ=c4N_U;Tmo4?Zj6dx7h_VJ)MKV^s5x=%+T}Q>P z+2YrS>RL2L-5ayUj$hC7y@Si{TivHTpgtvjPsI0Mo)_)EJj*jPZ8V6r%}B3@Rd+q# tR$u8L3L?eoVdMA9>fXGA4m#L2{sL|g10sA*eRKc-002ovPDHLkV1gRiv{?WE diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_voice_black_normal.imageset/Contents.json b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_voice_black_normal.imageset/Contents.json deleted file mode 100644 index 0611033..0000000 --- a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_voice_black_normal.imageset/Contents.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "chat_icon_voice@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "chat_icon_voice_dark@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "chat_icon_voice@3x.png", - "idiom" : "universal", - "scale" : "3x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "chat_icon_voice_dark@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_voice_black_normal.imageset/chat_icon_voice@2x.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_voice_black_normal.imageset/chat_icon_voice@2x.png deleted file mode 100644 index ef1c8ecf6d9f6c5786de581f15dc11181acd7a90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1583 zcmZ8hdpMMN6dq$RF2f9A+!kZZjLBk*-0!9^VdPRY?zB=wC|kD8D9MmPxmSuOmvYOc z#I(w-k+g}@#bvFXP>c~F*ZtYqXaCsqJm2}=^M3Dpe!p}6_|n|n91#-A5)cRk;p{~5 z0PlS}4_tUB^JO1EAVNv*E?#>S#0?U_oeVY64P#m6Vi#3olLwPU@J9W*wD`vI zNa+aFcmEiWrdPd*v!YN#SFBf9jFQ&(A0oSV%!?ngD#$4iK9t}V~a3=fnRUp*I1 zKkRCOQAbK&XS-E^RdSsvc3wW6bBAUUUfUuS;Uwe}Xr4mizy%Nadp`y>zqwmuH54$m za&CNuL>Axp^77Jey84cT?5Rc1DTfA&tDD@1u+i)dG}{H z?KMShAN;l@XEmA@X*@6*R~mRI#oUN`to0V^o&Dj7SSDh^mbza-bRat(lWlF^73H3{ z0?&84D1}9`!0y>sji-(1Ito{pYA z{DZERPBP(fXI*Hy+1!n1h9XIJVlGjtS4#JsV9r!i3!W$lt z$@g?4Ty5;+h)7o%N(EPvRNYFJ>RbB~#j@UCc7Iw-&ax_cc;SuAL=Ka&TYm#5Kl^8M z{_YSNe^gbEgjL&WXhapX24F4HYofo)V6)&Xglw``{*7kR-0wGwdI+EKP1c- z8T8I)rOqo_j*s!a@?DKP@}YF~S3Xxv_cQn@y(RSYcC{4eRl_t3I>NDV={)lRUps6y zdD%G=ev4Bw+rSp(6Y5wxu1QUVx&;5(`HJ$!cNI9KOP+(j)zWp*%zI*4r|B~1QVSFO tFP2Ze=iAgBnb1$0sH;wFz;F9(L5IYbV3!}6?*e}vi1S`IO09iR^50d4WVQeR diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_voice_black_normal.imageset/chat_icon_voice@3x.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_chat_voice_black_normal.imageset/chat_icon_voice@3x.png deleted file mode 100644 index 3380ec3a733021c295d8a51ab5d83fefa9ea4be8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1684 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 diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_emotion_delete.imageset/Contents.json b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_emotion_delete.imageset/Contents.json deleted file mode 100644 index 260c5ef..0000000 --- a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_emotion_delete.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "compose_emotion_delete_highlighted.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "compose_emotion_delete_highlighted-1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_emotion_delete.imageset/compose_emotion_delete_highlighted-1.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_emotion_delete.imageset/compose_emotion_delete_highlighted-1.png deleted file mode 100644 index 6053549c41a558d1768fdb07720820487cb20c2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1457 zcmeAS@N?(olHy`uVBq!ia0vp^IY6Ai!3-qNSEaWwFfc9*@Ck7RavMg$APxb;oa5Jl zkeE;cw5WU?i!x{0G?ZAw%IeXcQg?#>~{&u>Pd2sUF9n2+{ z`CqC0w7Z*dsAK-d(o5WaFTa^Lf1I}dd*Qw4AImpAJ-lf8f>n&$SF@Czh^ms)nL{d2|Q<1zkfEA{JNEPYoH5MQM!VOW!>U7KPuCGx%V z^ko(d49q5;E{-7?_uk%o9)86^fT3W5X#4K&qFr6{x|$X(NI1&GQMQJ~?<3#FhIZaJ zv2XVNy?V~AR?KMg%$Du)H8cBf?)_e^Z@$^sbJeO#9?HEY|JJXV7rZ#>*qvLI0xqI1 z-Mf0c1hy*a%=S)NIfv!*v&Z^kSDbrJ=*P6|7fq-#d>7ATxY)5x_vqWxB{6Fh4o!Rf z?x(gwna75yy+8QZGpWz;JaX0d0n6uEh3};bnqF?*v6b~s!s~+PzrxHTr1S1<5S)`x zI-}#Q>;o3#&K;S?76eaVh(C9wyqcrV>i;Bsmq>VZAgPscJHE~|f=svt> z^NfzgfA*LJC+o0XeqQi)Pp;MP@XO*E-3Rp^U7EokxaH$D53%0ZLsPw4D!=IWZudB& z@~A~T^W5LHtk)a@tIX2$wXaU^E!*=de%4tfgZEuQy|ID(pXblI%60rp=$<=bdrSXZ zSQBPZ#=Aaly2&bs%~1~}=E-CUJ(+cM(MCef;FVA>Zsqf@G`(kiJuQa#UH71Ui@pF#x*`&to)!!V^EBjO~BkxNZsH7=wKdNgy%yJ6#_%c8yMM+!p^UkY+?Smc3T3d3`EL}p{ZHbD z!kHQk>i*F);#Mx7Z`=QI#_vOW8tYy@GZcR?wd)?EP_m=fvpDN2{z>ay-Y{(bWc9Mw z^W>=w(meNOO_}rUZi2zAiMwzq8xGWTNt`JSf7X3qwr22j L^>bP0l+XkKKN866 diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/input/q_emotion_delete.imageset/compose_emotion_delete_highlighted.png b/YuMi/CustomUI/InputView/Assets.xcassets/input/q_emotion_delete.imageset/compose_emotion_delete_highlighted.png deleted file mode 100644 index 8acf5f15a4051cd5a26605a2e3c17a1c56923eab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1190 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 diff --git a/YuMi/CustomUI/InputView/Assets.xcassets/q_white_input_press_btn.imageset/white_input_press_btn_dark.png b/YuMi/CustomUI/InputView/Assets.xcassets/q_white_input_press_btn.imageset/white_input_press_btn_dark.png deleted file mode 100644 index 07a2dd9812f1dcdae9079d0380ec3c74555298db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3974 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoj_s_normal@2x.png b/YuMi/CustomUI/InputView/Emoji/emoj_s_normal@2x.png deleted file mode 100755 index 122bda2503866276284d330c8df126e273f41dc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3155 zcmV-Z46O5sP)KCH{IB+Ry?I*Irf zjQxy5jE*-=)P=E(@i8M@z8N<5QXLbz=*)bsNuns5FbOSlT&Db zUjV7KOirUS5(GJwg}BFLbsk+5;TufhqZ4RWdkfW7Kc%zh&eN5`>r`6t2rux@jGr>r zOO}2uM12@L8QHjq3?EDxlP6GWS~{s+JV>o^5#%fqGZ+3HY^>6-_iOZ|(YcdWjK4EJV$?d5=y=9K#xM_eJ!MUuMDyR9Pg=dV(RwP4 z?F6k6=a;47m!;O~DI;?>O-@UrL;pHN|2>sYjm?Hdk{)=`Ups^70>%M`+nC57vtN~Hs+7w#Xn5s{6&x?TNUhd6*NRrGi@u@53f9Gh?0zPj+FznU zjL(rP(r^vU~b35+V zh<=9=I65Mfl9DIb6=C!9^J&M99aLLeOKoj!;uF^e1qDuh)-)2wCnQqz$RW5hknz4X zqCdo++&($;-=&>g(&B@~k3P)*T!qNmQDTj>4bd;9$FFC5ef~_GEYK zt~~fUB_+ja&ng>LOCiA_@@1qsQE!Hqt6oR$9$wNSmhCca+O&Rs_o~lY2ubAT;Yr}q zVrcW^faIN%lT)uXSqCC_SG|#>okYXK!~6B!t3GROWddB7sLZWiW+ZAuyZY@&n94a53Q~6Ri@VzUc**UL8iV7F_u0)2E_CQ$cz_q6Y#3 z0=j{Gh?jsgq0{LU+k5fig&=}7Q&(3 z;xe?h`!&?pk)KDP#mMXD=SR)W&6JjwM)&UBqpGSZp$Ks6)-9`+0a@(7ppHcwwu-B( zt9XgG~BpWt00304H9lNe*Ab^ zvu2IB2TMG8@#@6?jAa*7!{k-u?OY-q%Y5u(Ej7cNjzk|?HxBEZOzBduBn zyJvt}t+wud76g6vm3F#1+6Wv>IK4y^Gu@3PWw)uby+urUl*TD$7?9JaPg7A*5yi*H zQ&dzGmt7H3Rb@GH!)*au1n&Ll(IYV&ii?Y>u&}UumLtz@l*T7?2M0+`C=ta5tl@g; zeSOXIDhhBNU|fYa6Iczdg-(G}r%nmTGZ0ujG&EGWm%qQi0NfMfOsm!QvLpggQ&W?` z^XJb65PUE+Zr{EwTwWEOYG!h&!kD2H*0v3m9DRRKo`hJ!p-%gf7!h0(X7*T9+`tpwdAIU)xlbE5KE?!s%= zOK9HwMrqsOW%tEQ zKmtGxX$b`J9YiJxZ!n+b^tgHlb+k4TbT{EbmWUo>+$ybj6p?!}muAeGPa56JTY>0s z@#4j_XU`rnaSjOy5$*}a;I@FH1nwQEwqWY(Z{-V>lDYPa9P$7x|UWv#I2hW zhdvju@g`QIjlA<$=x%v2b+sE5YhWb#&6_uOlRbR+FqM^+y)sF(apcGm(dOX6gGC?c zOR?Nz-Jm0M#T~{fb8A}LdpSeKJyF{8Sq?QfJQWd5i7dkX)~#D<+_-Tf@F2e)J9eyl zEyx~04UK2f22x8xLIQ2svPHS%lcFqigN~ByWRhnTXKqN$7EX>~)FW1pO^P2y>wmnK zG@M&4?TwJN+VetcG%#)*REX?WgNyEihMa>!MZ5mQFNeujE#*Ib6o3nA>7p zZ-{!f0ZYP6GOy3o6&s0)Eg8mPcvx_tFD+R(mlBdDiqj%aJ<}k$YG-RRUAg!b<@|%A z@e^?#vXU{INfz4Dj6EyW7o^(VFDeY%$V*G+TcDY$vK@$^WY0jK)lecexN9L4CNi=3m zoUm~BsWKkNiU%J-3OSy~pV4{-VZoxJt8_m9BAx58Amk`xgH*?M%j-Cpj1K35ALHjB z%!;X?T+qM)G;%~JMUD)oP_AqSab$J(@H7it#sJgY)JTsxB0s3C6cgsM+xMyJSzS*Q zG6un4OF6yY;)sLEP+*?4cY|@WlogGDvS+`(-m^C3%2P2nz4#Qfl9pC#dSMWs7G5Ii zRh&I6b;OW&cu@cV002ovPDHLkV1imu|7QRI diff --git a/YuMi/CustomUI/InputView/Emoji/emoj_s_pressed@2x.png b/YuMi/CustomUI/InputView/Emoji/emoj_s_pressed@2x.png deleted file mode 100755 index c4ce400fbcdc66bf57853a8ae91189409ccca013..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3130 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 UGapx&_W%F@07*qoM6N<$f`XPVd;kCd diff --git a/YuMi/CustomUI/InputView/Emoji/emoji.xml b/YuMi/CustomUI/InputView/Emoji/emoji.xml deleted file mode 100755 index 2bd948c..0000000 --- a/YuMi/CustomUI/InputView/Emoji/emoji.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -˜ diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_00@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_00@2x.png deleted file mode 100755 index 9db8367c739db11edcb928e714c822520937165a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8869 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_01@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_01@2x.png deleted file mode 100755 index ee31fdcd06cc4f93a5c7014d1fb4f0d2105b5554..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8313 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 DWIIRN diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_02@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_02@2x.png deleted file mode 100755 index 13c6f9a6ba571739673ee27e7fffa344520f698b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8899 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 Hu0mjf#fs%B diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_05@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_05@2x.png deleted file mode 100755 index 92e8845a2f4495f4a086fde1b51ef912dad9a0f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9331 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_06@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_06@2x.png deleted file mode 100755 index 07a645d619fda193d65d9f4217735c2effd77a3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9300 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_09@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_09@2x.png deleted file mode 100755 index 56d2378cd03a9184ee0daa1792a9b503ed6d55d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8677 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_103@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_103@2x.png deleted file mode 100755 index 53ac705568d15fe879c2f4b53da30a111ea0a817..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8005 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 Hu0mjf$R~*_ diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_104@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_104@2x.png deleted file mode 100755 index 38fd7d8d76051d2051bae3d52639d68cc62b7de2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7912 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 Ns*>jGY6Z&={{zZRabW-e diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_105@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_105@2x.png deleted file mode 100755 index 25507f6a071588ce94e43a9ef1c3406c1c7ca83e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6975 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 Z0BDUc>pe4`|NkNb40KGiTQr>${sS(5L4g1O diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_106@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_106@2x.png deleted file mode 100755 index 8e9ab3d9ac605f382a7c90a4d6a65e712b654948..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7378 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 VZ!JvtO5y+j002ovPDHLkV1m0MpDO?W diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_108@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_108@2x.png deleted file mode 100755 index 74d26df4de6580e6a0062f9adb5128f45b917007..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9442 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_110@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_110@2x.png deleted file mode 100755 index 0b084991b0b7a851fd7951d965b5bad5b203fab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9022 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 Ze*oJJ09)u-r9%J!002ovPDHLkV1hFA;-&xq diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_112@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_112@2x.png deleted file mode 100755 index c1c85bb32306967c1920e2f6540d4b713d8d57aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7819 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_113@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_113@2x.png deleted file mode 100755 index a197441db20b539ef037e85ed95ccb69b57921e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7663 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_114@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_114@2x.png deleted file mode 100755 index 0f952644ac254dfd61584409eaaa8263034f7d9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7758 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 b|0IAwxTgEpLV{)RFFQa{PF1#2+BEck)^g{D diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_115@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_115@2x.png deleted file mode 100755 index 13bd41115bc5d2f8aea8eab3209c7e381c80a6f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10188 zcmZ8mWl$VVyB*wNad!zJ5Zs+WkQZIt9fG^NySrO}K#%}If-XT8f(7>gK^Auje)s!( zr+TKVdZw!7k#n9iaq6n_IG7Ze007`9D#(K2z1071bX54W*3Rt@yu)x+(DwiU(B%Ja zgfrAS8UVmlvHS2rUHy}br;EoY7gsvP4AWe&F$`c}tV16G>6e4j0rN-@fz(h`ET#?-F@B+f_F(utrb1Ed-%{2NTj}^%g9L3O zp;Owm>ee9tvy+p@#m8<~A?#_=ZwfCIpMWK8uiPFG21kjBEYYT@DGZMGgd!3vY$DTv z_QrnNq6`7RIg+1mu;(|)Cxk{901 z1dNaY-!xmSFo8?}aP$k5VE}4zfa7aL2^3(dCS#2hSSqKgK?jl$fIL=tCPb+&z)U*~ z%#H~836$1JF}z2HG$4fPxADj$hW4NU-pP8Ycv5CSXr2uFI6xD#O^b&cv!KmZ_PSra+`&F~U+Wc{Y_xjf(eOaJ$$W0Q06Ku#tuVaP5~pK0t`uc z5*q+0?x*`-gd|g8dplcuHZaGt>!I=&hjSMO3HpnTm+nMFWB{Z(b+%%z?4KRQE-zWG9JxS3Nm#L44QBz@JVVy8rl=X0JCrG^VZnh}YjCQCn>^_Sovgy(`b`xzs{2M4H&R)eUvp|y@VLV`~b5EF3qX1oEZ;46+q z3am5$WXs3ncLx9&efKF+?+}2AoX^_;(7jJ)^d*y2c^Dl4WJ|-?zDc8D_Y>7Ya0~mX zyCI~A=BTn#*h~;HkPPZhC>3TIS++E}7DQwTx%C?oMJay%7U+9Fw-63&lfWqK$dwe; zjI8)4S$8xBvh)Z#p*g)sEWSnZ62l}qX7$^G*UL&g`i@67%L_k+F`B2B4! zAM037>1pVTnN8l{5}IZxFyW4-@2FzZGpF(>VktT(tSWGP*8D6n1F|brW;sfA8vV0_ z-W*y-my_0>ikGUE{x~|Y(@rEZ6#G{hqnru+Ig>z%-&%4Pxw3>uCa<(sW1^;b4!t&3 zq{KkcsnlDYQ!}Q9kk2chd7^;i!`NqziuvF9cD8nRpEwUZJ2BQHXykH!=gc_lqaDBw zBCdU~aiVb|pb8eOIY9 zm{#hB`aE*$3;x)r&a}Z#71N3pZ#q~`V{Eti zeMu#3>RhNS>iGUxuQ`aBTiEfeejfZhwA1@`BGVz?rgQrHtmpXn2>V*yQr+lrvhaMN zL$P`9a`);}QdFf};gC{-Kms&-B|C5oC0ix?t}a(cLdQ?%MrW~3alz<_{m5xS*HN8P zw*b39q+qP=OMOB8pm%}O2GL)ll(#c)Z#11(xR0NXF^}_)QBQ<#&2O1+oo=V7$EgUY z7eqZp1KmBn#=RX~yN^C^@eR}r)(jlz+EUtVoQ@SE(>g z6K@lJlgAz!wU$Db;sq|Jk<~%N&7QFUGZ6`K>xan$B#B`O#1j9KnBJ;hh7Ivv#^8nE zykNAa;z!YkvFDV3eOrE)Bp0eEW(fTVy9hmD6k#n$4oI}fdB~M${3uB%U8tPc62vmt z7&!X0?inr+(o4#FOWrkG_WWt$U+6`|29yt6<1ETF3;4;=Q|KF@V3(?U<%97y^w>># z$Jh>9JMuiz`yisXY&^B^4>i7Pdb)Yuu`kr^=s()_BwwV|B>oUxwQqCxwym>w1Up(D z7j%Sn)OLjV#{84J$RY3~WWqR!+ZkLM6p!2XK!iEw^A_&pYh`;{HtepI{~+Bvm>eti z5!2__PYo1`$|cBYmfVe?lTqg+Q`@a}R-q=mj4X&!lj|){D%WUg?@$s;-z(C|x)oX% z4f^o#DO&BL*Dx=J8u*=G8hQE;#w!&a*@ZuKQ_F749KxA}nS~W#9J}oA?-se*S=-fY z-o4Af+40+R`bC)$^XqPh@!sQVmDn*#dAi~|xIrD4M49u;J6}UGL*EXC9tDFr-VK|V z!+S=oaFW2D)Nkq?-&&SBeDyCj8T#b9NEj0|NqydP8-qKoeC^I>g2q0LHD^Do|J4I) zU)uYvT_%GgW-2Q`ybIUm%c{v79dmBDHuzylY@TJMeP*9CZ>ST(Mw(?>=UVrr;orB9 z9eaOuRZZsuZ~UBAR{kip|2jERIQo3#Tz9A6*QnHEFFpS|`W&a8@*-)M($q=mk7t>` z{Y~=3_laK6no(hJI;qFY>A#43JqzZ0IZU2RoeT%;-~K9{%V zcc=W6=U}X1+++J;s#ucL^HjOr^ltR(4=ly_yxaAf;m%@}x&6O-@dk1EVAtm@g+@b{ zBkQ}d6J4fy7SDp{i9`FuBzP~hCL!37MnL*5^2K4dHa4}+vUou~3W431G$K~f4KQbnz z6w%UB;!yNlT1{qbRX0}?PW=kjdG$N;_zK&2{`>gfl-|?QIo5r`R9}N%&6WGv*P2EV zC?k}%d(uz*qUx!Bay96zwFN9AM{} z3C+6IJX`7NG<0y-NQ(q@anT{QArL}_DNB5yd3d&tC2`bmycPahr3>YaGLhTn#TAYI zS`u2ty(neRr{xN zs>kcBKEQ==nCzvPGN$j!n>zFeFhbiD0TvNDa3Nkm1Cs0iA9{JA7#$mX98AC-2pzJx zcnIv3#~DC}ZeKJ+)(V_ck%F~}Gr>YsxY#&2^hB6pu=}qIno8y^%Vte_Qg3^nM5nIk zBBd5@#sZXs)QIFh<)f<1(xD^DYDC)Q$9}BH&CUHM3sX~5i(wyACqfCYvMV72X8EMi z-~OH(?8E^sRu83LCKPNO8k zf+mJpK5KjelcEx1YvQaX+ysP zSiFkS3b=mhi zX)vZPG}+V!2DUT>Ghg2h{xpU0T|bH7`pOwToJ8)}a`b`;RQ+uFF&;8Yb#3C#h7X}N zuQhqRVOreLfsepLEDFMW^h+cqi|>*UvE!iu7p|5r=ix6|G#9n^d$M+@obf7cm;CDN zCb<`GuH`sJI{ZRD5@xJsX~CeM0}2h1c}57q-Nf#jd>u_KsG0}D$w;~EMe!HTOp#(- z13YYBr>$lJaIL@w81$u?Klvt9XZdtJs7U+LT>+3BzDXk~yuE$<7QV89fq~y%)KpO8 z1&*Kc_P)jP;qjX)h$UiSfqq0a0@N^l;lEmuS%aKMsO6$&;iy1wZi`}_ln{VjD1r;3iEc-%YR7*1#M|Kuk_Gikm3{~xGW^CZ?DNsxtQ09u zvwu0(+Yn(6P(X6UhpyA*zq?ftAQIPf4N-Y{baC83&N!VfdE4LoH&|?>zc@HJB5GgPwvBA?xq|Uy z9~u{Q(<5hQz*^ec{YN(zzP@DrX6Mbi_c?{!Ta7+}WPiWOFwoD%;t17F%0+h4@uCdQ zdD)DH@lHJ_fLG~Q`OObS$SN{yl8rbp%*?QL$G4g%a;)(`Xke(CVi07rd#23k3$d{X z9im8{sFK0jLWe$pm@)DsXx%+L((>{!G>GuAQOk}*B;wH60(s6-q|J4Fg^&^=HH8`` zr3b%5EWqd8D8$y&%bPIr@OX#f=o~|#PPF@I=?Y7uFtGp zONUn2)NU%Reona!juzs9%;?gY+JBJiB_)YLYtqB+Hv^51j)q+B{VPCnjngLLwvS2# z*?3gDMZOPJ;!sxlXt#cmCPXr|o}Q+k+>^ETV`g%~-f|_&1jm;9E+-TohRnjw zGgaojsH^O3xb3wfy=ovbjJcK$QBqbBpELr`C%e$(qn`qA;)(l+tPcEUH*iem>CPFL zzEY=8;7(gau^P}R@yL!Mjvj=4@(HbA)B8r-41KhBH;BJli}Ufv|FqCkQp-Z(_d+c5OMCf#D7yYC{T}b0rTnqyx zB;Cx7gnx8SxE|F$R&b9r-%NI|twDKsc(UWmKM~5|M}pvfKg$Pq3eks$2NMmVUBPfV z>|h3fwURD!$Cc`i)44sMX!d|A5xRW_wP-RK*24oLz=t=!V#1ZP9=c01r^>QSYXa1L zhx=l!Tl_M zW}3SC5KbqhL4-#CnTMa>>$F@hp%3an)|c%iJ$ToM7F?E^2CY%Iu$Z;Pl)<1vy21?|1rSdsI zU_g%@viP=oaxYPGrZK#P)Nl69Dlm{LzbYt}ijzSO-Fzv4^r^D%BY4$A6pPTX@4Njv zqvZPuHG>}8v#xnVNmhmhKfJ|VqTGGamxacx&Pkljzf!eGn{uuKG?55Z1mT5!9gHpq zE9J%FjXhs)3k?z8QvWDc)ndYnAau;lJ`?w*d-%P!rz*cn@R%TZzO)~-tKXy zNG^s+(e;PXZ@v>5A*$d}i>A4HgVw|8^78UGZ7v(hW?bk>Z=Zr+Jp%3R*@TiK=+HsP z2+`&c*j11?Bcmk@Zoy_O()Ua$Nl9TK#IAMRVi=sj(cu%*N11=WW>#1E&_5#hD>^#n z>W)_E$;#eldOtntDwy`u>P1Gw%2i`+@jWHao^nYBIyMmnG@XxGW<@g3G*V0n;M=;zGi3Y`Qd<;21Ow-N6t#&TiTJB6b^Gi?p# z`<rS^7A7#j zMYAbRGiBWZ&$aIE?te0^?=MzX3<$7MHNfET=4PIqy}h5?7syKg{dZDRV`pGTGMoAR z#;ETfU5>yd0|B+@=EbgB%d%q%t%&dDy952Gu=|$k*WjNa$4#dTO#|Hgchlc11;^)Z zrg7nNxwB(tZeEsGQ1I@DQ9~RY4~50Wsl(|?`}$~swI4rz z+|i2re;=}MJvHfY-I{=3@305Rwq!L1=PVgSMFY?(uWx<+_@TYe!4h2eBm{%OlSxTQ z;)`>0TI2~sHXDIg9N*#(U3_RLC!BHLYwm15=57gvkzc_qt(bt}Tz+x!o-M(?mtBWv zgk3lSd941&yOQ!rWmPw^djl0(j&|CjrE?<1he)D}@czawU>S$JsezXZl`}XjPW7|U z@Mg0i-D;0^IHVpM8FAyXBf~`8y|!h}(GQ{f4S56kl-%*tK3;&xWSx`4S+0(@_KmZj zpRj7NnDEup{Z%`1M86807S(ljQjjE|AR!^KzJLF+XXw(CHM_d{=&zzOF#+c%MnY7> zgM-L3Gc&zdo5=$)c$N!w`g%XynLoYrBArDgYa2Xj zFk)tp|2$cyC1=|bYbDm{HNm4)I-LnU{QR`7KE$^;C&R;b2gAW5@WrRKN}RupkfX|L zp~z=M+aow8ax(+VIj~q?PL@LL38)fdIv~t7WVhTZAJS|7yqBiO?!9EwB5q46J4M|TQADBqdq|<-d z?9$TG2*bm}n^*V6%k3^33SjU|xLg9su3JPzggTM6s=xn3&e7qax|UYt&z~|q@C3xq z&#zt1%0Pr!*4#`$PEM}MFA)AMUyM5WzE9o-%UzssO6+EwG$!Z0etxk6(>Jqz#4oj& zB~v-@6fGI>@-u3YU3KG1`yP7|+u&>au_0MdA3fV%W49@L(0QSjQBj@e+}pX0dmK=> zMG395A(2~FCN>`4Dm%$o;pypVtr=G=Ge4I3f5qAVelbe45AYx2pzXZ~jAL%yRMC+n zp%W4ky27_MKCaAe+Dmn`*mxGQ8HQGv&P312i3c}gBxuR84d;zoF_D~x(ZGG6L}pgj zGie*ntmp2}2|TZs!9BnWro|cuN^V*0=-B_&gGYFPWo8uUyuB?b zWaR*My*m|mDk>@(Be&d&kH>`X^XvS>!DIsIwg|J0+2^S=7OzkrjB0pf?0q?FZBxjb zcV-zZEf#*7N@a8_Cgl<_i0tPU^yCMnyuEN`BFNjAo(>yIa42PA=v%p)Y=|F}?Rves z69$&Aqz2WLP@@S_Wrw+kK`HNy^!3SWzkb!w*Z2E3SEJd!Fh9RejgD->#>oj!zHnG5 zzPPw(Zfk3ME@X|@21s!5@GSSn^Y)LA*Wiw7y7Bw>`NHkVY9BljTAhdDvtFs=lp->I!*inHcU33UDZ&-iK$lutvWgla6)gk>*g_68&*0Nm1&&T&A5bms+Tdw~;%Am8cu_b0_ zXRFCoXfVHdgT~0nD36AQmO;9>_HVh+s=&Xt_3J6*eg`J$yUMa2?DBWwEa>g)J!x;B zu)|n32Qf`bmu@$Ep?jaKi&?SD}kS6p>@+Sy$AGJQD4 ziTuf2*{fZ@?h#LT5#}_@c0vq$xJG$K>Ob4)I~_jz?sMbld%s)qeD&|&KRit^SnBOO z20hroU_~WO0Xa@KJOR4x2G-GOb8&Tbwbs!gX>M-5_4M?tGih@qudS{9Jv$o_^muDI z-93|2HPLl5n#9?5t%rGeImh+Qu|d2|to=XV3rQ1wBW-PsKC4l1qzwJ>dKW24!Y*Z0 zRMdu;#~!x7zyBv28=G}FtX)QQc6L(3CX4<VlPxB+_HRpe7yftaEP;f&-9Yb zgmAyk$3Hyy&n+zIkdl%vdU<-5HZ|eD&pCo6kaGGz953s%e*M~l3ek|LNB6WalVwN= z)=o`uB&sm$M&KeRs&O@(+;I95X5Bm#_4E|3IyCakR(hFf63>a=J(4IiKZWh(T-e&| z_=i(clGg71rbD0ez+TDmbV9;oC8zig)NU)ZN+P)3TzYOuj=cjis_e8?R8-Jo28_dN zYezNXMjy}mUJLH;@2A?^+mQeZZWNDq9-E_m`bt=DcjVP}DmY6^nY0ICi~bjmt50ao z2H8CfX&ss0`LL13ayX&K%PnsEzv=bZNw|jLf)l=+BC#9|po+Ale0=XS!h7oTrHG@C z+Y6C?GK>yG>sy4{ad?twA-T>n&obtk&mt)}hn-`EON=12!8G1Nl$yuWc<5wGDT?we zKe|@t-AaJWze{n|46(_*fhq181t7#WNFatcfY zW{LF7%qZ1rB?5RfV!qn>wI@{SA>(YIVAPKlmdf*T1Tx5JajYOj-GC=1bPaqpBPBlg z!k13GXPw(kCtuvDa>lR3z?!qa|NKcaOBA=j<`@3aO>Bs~F&-?wmg>Z!4~ZcgJjVxB zkPs??qswbXl-Q)@bCNS|IMrb2@+^ccAe8tHrPTd#H+cqpSufGQ{)iV#WQ>?AA3x!W)h(<79uTqDwnC9JRm;i2`08o>DuCzZXL8 z9y1!5Y2guQXj!o0v*wrCZRbLJtSy*i0@Ai^h}+@LGE{t&=F4HFJeZXzd|->!u-QuS zNGmoTc8}4uo(u=g>+5SHcQtGCpXzA3SmXRG2Jci0nnuJJuTeiak`+S2G!Ht=_cw*Y zrRaY9?u?`{!%?cUfsrO<;KZ9wbT)=>b&0d@vFH?MRDjUAJ)ZWZT1JL6n)ttA=|v1Z zz(^^QH6Bq;!*u{hkgCa`{y!FvL`xaCcbJiVJl)@C{q^e?iGR1Lhq@@5ggBqRPvU%O7cfu1`s3Ve6qd?pM=-bMB02L_=UJZ#H_`1MZrpg6+NJtVRh0_r}xG>qvUfNc;W`Ab!>MZZK>=Ei@++P??3ettppG zwTltNl{Plw0jerCZVh(902%@n;`IUo3D^cgRE4A`v}_5q9d#zdC$zG)4KbeOTXGZt zT=m$q7anHcaB%iqD`na24Jo1_?!lwZQX51x>=m8v`VV|_g~i=iX^!B z3_pDsoca$XkXHYtF!W2_jt1&160PA8S7+My^08#Otg^j(XX-6PH57wOo$ntn zfwZ{>{cHrZQnOF*+3tNp=JE&Tkd|c8$$|5{mzUtVxj8Ex9i8H-sVT{VqN3;igV}12 zcBfVEmVvD=T^GZZ=l;B>c*y0}+;aC#>*l%z1qFhm&4I7Y)?>w+e!&4BKYr9!R2P$2B{VbZRz&~2T?=atP2EPoW=aF_hn}JxP^q!Rc33} zonxvF>VDi~YiY}I3H9C$k(wGkU(c$YO-@XRzf%OSG+9Dj_r}SAPetk9`pBFFV-Pmw z7oXOUN+4?4hjm2U44E15}f&KW#1ORYo=Qx zW<(2p%)eIWL!Kv zMv{cG?rx)bKBt7$6B6NMk7IZtd}#23EQJJ|Yu=iGBG)r#m=l}Ax1lKmHZA7sonB)t zEiLsIzTJXUxG~V-;p^S8oRF*WJl<-!LgG_ZSy{<$*mk@Hr3rBS3f-<*YO%%hK3)og zs|P>{$~QbIwooRZVRV{TxbqG4^Siz3PRnLPbb8~+RKU_v#nhBGzo5Wv)v29$3U0QB zhNFJC$WnhKQXuMcDxyJTOC{=k>{mS-cYg)rH0<`hNU@zPyw}pzB@KRD-6)511K%5@+rPSZPPZ1W zgqO?kqxsUFDX{m2#eV1Y9(I>nh?$o}~`S7%q3+v%FHr;r&#eS$ELh=-u+i4+?k_sGJL!`S=%2)iybcco&(}(wuxoO5NfBqHBVVb_) g{oC++3_$`=$KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z6{bl3EM6Fbnw`jZufh^JB_Gw z;8KTjYMs(@jSl(nhD%Flx=^W#0m*@cf+(Pcx1-BhX1m0#cFpL+mn|tGiM4MWNS-I* z0h`L*R_rDhoMa6+(MvMMZQ@YMeWH}leIe}9>w`{>?$k7Lpma=*I=C3oAWB0^;M4R@1u?(W!n8sygjK+S^D&=={I`J%pEI>YmWnIWnZlp99!3e~q7 zHTyhN-&&++ITYqV*a0d8XAc7tQD75DD(Lz_+~_OVp)J@$Phy9*p_E1U^b(D;Bppcp z$&K?L`Xar-NV2_V--hLpd^7F|P`v@7M$w@~Ew~81R*0$--$WF69VAUS%KVpRp&L68&N~)Wf_y*NCidVX*zLDt4?T~uy_lM&qnuLS72kXH{p0`Yp*K=@(gC<^PSE}1 z-|l))&5h0(?+OWXRaBG^toRsm>h(y}i>vQLYz(5ONO+19nZoaM7-UWYry`^<9~Tef zcKieBOLt-8kfd3nvz%ZL#7|%Gz4GNhIhc-}GypE26LfF9rso&T4^~yWbA;g-s?>o# zg_G-|7DDyj6v3D?JfmzClpT zqu1Yv>skS|y`a^b8I_}`_p!#>sq8T6`8;5rvWWd{(0X@YI~SJUt#&4xL_@uvB0 zYY;K1&-zy6F0S|H3G*?kXEt)$Cp`hK4oXhU#@_)90DJ{j0CBjN{~kMfh@=rw7;Z51 zQuC4ZcZ^=Lr{PYl7`o}K!teGi%UwKP49FEU5`xS+7qmcg5YQ)X-|r|8Rmk-tv(80o z_oGEKUJU44#>F?CRruY{K3@AD$87>jODcM9L(i7()AFY^dn0tgpu6Y5g5LmA5c6vg z`_W87dwK5t5oYWlrmo2i$Bez)czONpqic6oZG2oB@VPVd8@d-or_~CIFc+W#1Dy*% zS%?ph^=~O5c^lF_)-|kws0TV1psELPxqw>WfFPMby>L5*IL5_jFgKWI>DPG;Q8)k+6naR=SHau-w zL#~7h94e=&7c_GgM(1C(IK1eX%i$}RMOV|Qkeo&Wjc5x&9-ILi`yyppRTQMCp#-;n z<6-Xj&Q=;Vn9--X=|8=f%YS=`@abOD&#&4c$m&)5IkV~h+L@DLGEq%ojWrUi;55a#s`v0p1q{n~NtX=$g;G`+@Zg=mG1G;}L<;r!sN zw={uuvxD`miPB0n(b`7*24@jrLXhib2kU{`j|f0P!OH&NOmFkz6Qhhr5L{9Pn&4FC2tD)QkPgKg z2Q8H`%eRX_KmujwHLKOY(E?@1p@D?Cy&om1u z?wWpvc8-zktAfhnoET&D(hSX9uw}@(hnVX7z=T zB;Ik7`W(RF>ykj>lz8KI;v)5lahMrgA_ikQIPrV8c?_}vx#dSBYWhjQ>ff(BYuFZd0gyDghp%|{a zc`ZwqDtLG&J@qQTck^oWyb^nM)iBoi_3FmcQ@2oa(9A}|LNlY;TF-;?%te9f5utQM zC#Zx_Y4WtHTkF9kwth6tlrYk3A4I2jZ(-J8x~O-DdV0Q#3As|UREsEoPEt= zDi*r>HN>s%u!T6Kt6x*GaP~EeS+QKhLwj)u?wLVKBW14Gu!u$}WLCF^vBWc3x4u8$ zPE*rBlF^&^$4dr+(&Uv89mc>$vgM+dhDCNN2#Ssz6ssm^nC(YsKr- zA>%2vWu5HSnp1aH&AHFXq0W4S!)hq(9%p4=4m;Y!I_uTlI4>NR3BqKJ62wOY2M#lF zpD`}ZW=!t{t)reKZWQBsFxJOfl=m}n#(X?Q18nAOv_PV;JI0`-pqM33D)Yj5!Brbj zse1`cz4GApm;FNv0w(cZT^t19Y6iEX;e}zX7ebQxz!m_uwc{$2nWnSeSz1Sux>4(> z9}xf}RGJ9~NZb-A1|}TJej8t#FiSh-AMjHEA+O>Y{|11RWr@ zE$4SW!wa*ujmw%dvugo$LH)?`eRNllz*LR$|=U?4R9^K?VC-WyOROKG$9Tbkh9Bn_E)I_rl|&N4cj zog5Q_gslVV3yC8=YAU?xP`a7KWqi5Ag(Yr+7*Wp0SLKP4f}m#VEPnve4g!}s$!ut# z_5E~1x819<`$NAL7F0n{vvl^mr$u!3yEw05I-8qWnQeu^#Ifn%;dQ{Y06cLZ-9*`- zY@0+?Mqo%b#J@&BAgCFNo%>@Rf2xL@5}^9BOtHnVa+3_b)lf`=rZc8+sD+xiNAbv` zRYn^YRcfPQf~FRb86Y?u4rLsa4Nn|QH@zhQn}^JnR|m}YAk(BtNr+!863BU{=HL4q zx-m=fk#7w0U;lUz@*t}tB+Ber%S5(Ho1Z#tsA+(3AYBSMGsp0N;a~p#KE8PG7`;ma z|9eXiIXq2KD+IP_5gwCQ2hH})gJ#QH0x+7o(MNYDk72!;IlPpKfSk%07GF3N1o8^T z4XfW@;>Iua@|7P~_}GR6{Nn#qV19tCjF6IK(c%cqw~tKd(yNg(a@f4$`+qgUZ~p83 zJiIIA>tCG-a{`}@=M?01Mpq_`C<8``_aK=GJi04+Y&3PF$J7zJ@8#x?KKZ`lr&Q!0 z7Lpu`gyK9`AZW`qLA6B{gqn(_8Q69Y_^z&+2=9n;f zyhCT2RS+mDu#U=(gr9uB%>TTn!V6C}sbTr{U(Di?%RAwRRp@M^!^vb$5~zveDrr$xh<}s^MxB`{9@%fCe=Cc@mMVliC2ew^;3s<{=N!9 zm!fPOi&lo5d47R4Ya$N!a{clg+=ZGrZT(6AJaR zCPL(A@K7+KeC8#>KKUaU@^uHUq(8BmJwZ$!r-?_PQ z&&_M{r`w!Ea>{%6plv%!vbZaP1l|$3ft2W=;>+Ke!)-SW^2_g(S+*de(SV=+(>NRN zfkKa_r%%z@sR**wn=y=yTE>SA&9bEsz@m8}v*!xqvE%x0^l|0&-SBiBheJ9QF3Iu} z+m?*A8MHN7^D432xw-MZ7W2ovG13>x(ii^Cj7Mg#%`b?HnxI3FoN5a(Zc_R>b94a^ zJ7it}r$jvQK$RbUYlOV8TVvnMkIL0cDTEk*e|Ew?+N(G^(L!p53fMK+3n0rov zkKQmbD zl{$KIikY1OI`lZEu_H+xl~DslVfFCD^T+{5(L|vKZ4>AIDTg(n*GKROzBz4G~ z0Qy5r!|>YnnAf+*jOX7-T<~#wrV%(VV4${ixW@xJq z(n^C$D92uZp$K}Re6wZ&V_ zWVDdB;zYHaly8|aGnm*-cBvz6IPbg*S*-xR;yje%>RBQsGO6klMGJ@9e~hmVYmT&P z3CB~|m+~8bGxG5V_9S<`t)sFJ>`CtW+CNv``-dOz`mED}2?ZTyL?M&TP|IX2pGcdT zI3ea54t6EknLv;b!XUeOBr9?(xK{C$Z_6E2Tie@B$zEFEBn}fhT+KI0zV<-nThlRr zqUQwrH(uL)-{qH=-rFoHbXS1x%#xueAhZqJncEbDVr^(?Y)~kUWm>5 zlu4%gb&IK3%$Olpw>~LmG4=b2dt1Fwhih6))sl`Ga!t#QXBs=N`@#5Uj>P;i zZH`WN4aD~O58W|(!~QMtp?uR}$_87txVoKeNG7})4A*9}?RI;#;iiDrKCdP9reE7u zEv9VA$BzA5;zJ+0WAuiB*gk*Kj>;}AsSo`4`tIA8pI2Cv|_1Euz zfAK6=R3rtBE-6$os}#d5RJPaV>No)~Q8;zp1t~>@*j*Q z?#W-tS>fzj@~7`9{_%hQNaqIT1f-F|bqK1UkVt$fd^8}Y+hKl_#ItlacDUH#5{Io@ zq+$sY2M1HWdf)i%|K;)8SAf@lWrwBPu8xc5gxCG`zv%eGHRt4)QqrV(!4F$Sj#LwRQV)N$@?nxd3 zUIH3#`%v9U2B39mpeGVeUDFq=K7T>5@~nB`sb|a$mUZW4W-gR29r%4Zlae$OR~~D) zfz1cf*Ph*s@f?Uh`R7WH1i-uTde{GV`2P+7p7@TmI|8M^00000NkvXXu0mjf DWIIRN diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_117@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_117@2x.png deleted file mode 100755 index c37892ecd4f10a6c2557d9ee2b3b6f3beae85479..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8791 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_119@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_119@2x.png deleted file mode 100755 index d169aecaa0c7c5f009a5160e6ef4eca3ab25b63d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8854 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_123@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_123@2x.png deleted file mode 100755 index 911ab18d2fb3b9bacbccd630697685b01ac27271..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9383 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_124@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_124@2x.png deleted file mode 100755 index e7db679c608b143fe9da4b5f259100f96fe1e4b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8838 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 IM6N<$f^9G4*#H0l diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_125@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_125@2x.png deleted file mode 100755 index adcf5b5168bee22a2bde44fd91537f5d97d265c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7760 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%0DBS&@2l?t#?#wN5MBVYK{jUtMkdv4e|5WbTDVG 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_129@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_129@2x.png deleted file mode 100755 index e9967138c788460117995748298e084bed8242f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11561 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_12@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_12@2x.png deleted file mode 100755 index 83b37d74cd2e8fbfe0cf5ad8ded8dee1bd15346d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9893 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 X)_nm0!dtzk00000NkvXXu0mjf2W!Z1 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_130@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_130@2x.png deleted file mode 100755 index 02d4008dacf5e347cfef1aaadd8b744c05542922..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12776 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®>+xbRKnuG@oDlIm*L(#Y1e$;MeF*vC2Rww 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_132@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_132@2x.png deleted file mode 100755 index 5a6555085022fe6e9df46f1724934bf51de19561..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11178 zcmV;bD^=8qP)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C zAlFGmK~#9!HXbjc z7;G_vu?^$#0_VX7vn&I)FbG*93M3&338n5<=kDstIlXw(IcGlHSJl-?h?$SRYu)wU zef8?RyZ8R@aQ6OR;hf_?@*(*Teu$U17nzNdm*s`n)?V-~5{|7(pa85RPI1%5xk;1S z1IF?K*6h`RB(;ih*W@PG!}-hs6Oow0nX1f6u`Kn<$MAGfxj? zx(Uz-ASFRj!;#_;SQ66B3h{u-*fe)2mL*cf5|NFnMV{{InhTVI=7o6`hJ;4G+BYdXMMusBi&v2`@8rIy(0 zLSpV2b>Zi(wdDgBRkvR&@c*TQWZfnP=zGP56wg@)QcxS5rux`^2A6g*L%KLb_1*3G z-{>WO0sU{K;C1 zKNkVZ?@vYmfbQ~Dt=&^4Ed*9V%cRGZpd2``fOU>`D~UW;?oRZ3ec5

`%VQuK)d|{!x}5t>LaQxF@`mLYZ?8=Ul-# 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

Q(YG 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 IM6N<$f{JQ|YXATM diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_133@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_133@2x.png deleted file mode 100755 index def66bf6d712bb9f4bcd3892cbc659e210c786d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9968 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 KMNUMnLSTXhx=OJC diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_136@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_136@2x.png deleted file mode 100755 index 639cb3a998aba0f54a4c495ac1e35fcda747f67d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10299 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_138@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_138@2x.png deleted file mode 100755 index 417f8ab186f9782b49498e78ee4305b5c397f418..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7845 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 DzLi)z diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_139@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_139@2x.png deleted file mode 100755 index 1fd6655c5a01f777c803f07486181f274834b3c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9210 zcmWkzWn2_p7aw}*rCS;S=@RLXl$Mr8K)Sn@R$7s65P0a2ZfRIx1r(&D%cYl;@SXR= z?0neY&b{}{Ise)ZI$A1(c(ix`01&FFzSINna{s>|*x+ZCqvvn%hU=kf;tc@M>HlA7 zC)hPl002+ZQBhGx=bgKcyZ1YH4<-N}!(r>u4yc+;Gf$JVSB{k~~#|p~#9Xi#XdIzGW? zUHE_l)-V8^Vgv?+`83Ghqt&|u=zzyhJ~q(-eEmaQ~s63bZuuxtgMNq|Wl9Z-BiHif~Yfl(wd z+qYh6=@HYeiU#z<)2A|D%?gvZr+=sQKR;dHWZoQbX;iSL;)2@aZnNZN=CYEh?qO(5 z69541?aa4FaoNUQOaQ8dI9amX*_p@i7)5LF z?Q^bt11uQ=@78Y3g_m)QO!2-4-6jNz-^)EIDApO1VxY&v$3J4XDee*2N|5;{yy3o{ z5OxKA`?wr*3V7zoW!LtXMm>01yZP1WCGWv86$IU`_gEiCW5OSjxn?#+8qIhp;?Imf zwCk{Fjs|w6M$FhJcMi;F2g1|hR%mUvHMll+Ti8bXzwjLBlHD)I^Th3Viuxh~7_nAaEdN(HBn z=Bljcyk6ullFa1(rY?^$3B}*XcdH0~j%d=w_<`;#*YO`CZTv`)_l%DSu{kWG#Ce9c z`H3{FwWMO^)xNI}5E`Fs3!4!nvQJ#JHcO0Cvie|5%P~r6yJIYBm?CP+VEo*Vg08>7 z`UJv;o&X~|gjhsF2V5dkQ&o&Lj1~W5KV)qt?SvTNMnww_JY`AyPrI2ti1cQzA0UG*vdD@lV@Yc+BjnLTdPG&Z^6*ykA~_k(q@$=4o&sQ(eb@ zZ$p}3HB6Zw+fs>BwLjgB4{o=SOANo?)W9ua)BEz7R9)0gb_cVpP)H%Ws7iOLvfu}# z>b*pvshVq%pAP@)xJoh+-yHU-TuMdw7v9pJ-*X%t9IxN;ANX|Qu0}mk%KV-=>%5P1 zuy+u3;ZHyqOBgk(YQst6OcP8~LET2fpRG}jHJ6z^rZ2D{M3?Q5MV#esV9b5R9YXPO zf;3$s-7q~YeXmO2z}rCfXJ8e+ezgH{wS{45xw64movljTAC%QUD;W&BD#hxi_5Afx zbP&3hrM;F9k$-Ion_^>>i(*wv^=;cmXp)#IM}+Loj1}g+3^9;A&RLo^Z<=loHTxl9Qxpd;|kuR6elYc4UDsk>Km;O|O5-9ZZhJbJYP;{8<=8%R8olu!3H)8>$DwznGis$z+c}Qo z9JWLQsATMG-05v&G=#R zi=TPU1=hWb-OKk$F=a}5!|DlQ38NWH86j}249$$|nk+*Z!$8AJ!-X2Pc{3yr(ska* zMTgEPmmpUn7vB0`ZEo$5U#{yK`6hV^*DTlNYqurA!}~+L!<<9xqZe1!SL|1=R|tkl zdQygYNgv4&FCX7YKNpW~0a3g^9&o&lByhc^n1v0Mr6%!6Qf~S-0?#SWw6LtuzM<`)^+eD{e8q6aV8qPEEW;7SO2X>G<|mM$ zP$0l1G-32gbML1*r@OTkUUA^bnW30~2u99U$bp;=g^aUmQtD6A-U|->gDH9c^&w-!J^HXc^lM1^!f$TgwH%42jw6 z_^M>6;@@|%+RDBo!noRc&jLTveCl9DX&Szq|6PMv^jze9@j35vUa20TV@C6{1%Wos zHf{T7&(a9D19x2~=+fdQuD4lly-~{)E-@N2rOkSEIz*Hj{Qo@*ctiarpk1{`)%1t( zn*HOSTUPu?%8;Ja2A%eXufN&@OwQI>`jomTSrcAU`SS^y>vg^ja6Fw2g};M0WjyF? z8tWOHI|Z(sC+kJcmX#?!i!>5Rulzg?cdNTF?Xab=PJe4~;*|OGjbS)9Rk~%3N6mkA zHx0_|yPHN@mOn!-16`Mveyg`l93fSaUyyD!*Cu`S>OD^KKflMG64uh4CGF5zx~l*7 zDGqYFOrC05T6j?#uYq%{x=u5F{?7E@{?7W zH7O;Zk&%v&w&(oqblOHmQw14fBFyk#Akw>fZ|!08?iIrL{?{q~Z33dNF0c~iby8hf zFEPqG%Gf;}D1BCbUpu`VdeVN2`W-sLNp8q-;b;mwi zC=9AiCRrVUS5V`%HNxuQz(%H6r}LOo0uTzY-;ET)LCe&D@qE{rwNUol0sNM zgL`G@abv(v?pj@!tL35H>w&*-nIK_oaIgMe*7QM0?}-0r&7chMqK7=*Cesl^3Z7ia=l7A!ol_#fkZ(i z-S#iANG8~p_`Z*X_18r+7qMJz$z)XXUSJ$9bGp37W0S>&(Qp8{QfW^4!-5&#b+KOM zTgn8bta4oQ1!lMqXPGqmX((f>t9PxTvyH3kk>aaYuNb*A;m$vuF2hB0r|wEQJ8%9) z11`(4<&NPZGBS^AZ7z!?+FDvHg@{1`g0Uw0F6>dy##?3GXaRz>447ecj8lu#^wiYD z86x}?E>vxr=?5Y6K?eX zM<#FWXKUyMXOke&IG{w2mdEa~dQlfq~MeGW?wZr`;%sAHua(^p522_u0zq=o)4K0_)h0B zb|+`qJF#4_~MzpWr6BNNd4inAh+By5k3RTfrzi63Pmf9`(eVv=EhyAHiB>C5oMa6LSai9n4Zc2J%>x^)>W^H~(>Zf;B@EUprdRvK_Mh0S zU0rKOS@aFSLJVJAT>n&mOupURh)d)Xfm2vjb@GfHPk;cUgwsvnG7PPo7FCml4!gY#lsX$C6A!xJTsjgP z85!|_^R`+2dwdYkB>U+^5e)?gT$dc|SiBf?eS=U->R7~?6tPK0V?)Dt?+j#TD%(K{ za1Ra{@2KY^2P9GvkQ)@hEW7CYtX_7fqO5ET1R7P$b(HCFu1vho&B+-6Hv}%^vdl3! zIM_DcM4+TAhWTQ*?;+9R!z~VD2=w}QF#pn#A3}QVX5{(lFn<_Hip*cmy3Rk`X59gT zt>{X+OmLy{@^Ux$TcL0sxYrj>JY^LX&*POBPz9@HvDt%*;>yZO5Qn&KdQ-eQ?jK)e z@;$T(5S&z$aQ3nmBG&qx7x)qr6Xl?oKajpU>T8bFBclwXw|H}Z{`}!C;f&l1d|g$g zRWaxIzJwa5UVxyuiknT1_FY)igrNe2h+Z6~9s1`r-3ko%=&9^2uHVV;q_n5nHbFrW z_FCjhAU1Nw3-vTK2<(VYYkXZCIy~eFS;Jw*w6(SEyUu9q-pPOc`t{gbA+W5AE|k3| z;k~A{y)W%d9v^HP--C@uo-lk6cc2DE*4EmcT=AV6V0oG zo=t6Fq4!Gk{xnW@=yLr(tc?#Svc?(27a4PLgjNiN&L?L8TPQtFc z+K*b7zrPdd_XH0YS?*Z$+0AY$xw4WA5()F`(u^P8Z0Rr~Dt8K}-fbw#Pma z>h!#V-~9b60TQ8Z^-mqX%o(>fcLqATx!Ab4Vq{RtuwO!*cb@C=TAM4KHT4Lo<`-%Z zNWu!Bq+~NKu*%0VVnFuh8!-SFnfp@s9WBK??>W!}U=D?$tt!aFmfqfE^)hroha3x} zfNTwHMMXsr)j&Q1XED|qc8SJk(M>IzfVJ$lBR+)+(Rj*?nUb{m7dUth%*zw{A z+RY6N-k1D(%b7&-x_;qoTsw@^Jq(q5Hh|B+{=HaH+-Dyu=Kebo5wa`nnUCO>L7>2C zcWd8>ElBM5G)ufQA&w9gMq58}4-dX4$Pn!8?fFeO-?oRkr2?t7EgW2CY!8)cM^oeE zLyzO^?A*YEWDG3mdpRf&ZD)e`;ncFs1CK8i#iuSUEhWJ2y9MRc8eb-yUq@Z#ZpNn8 zaPY?u^050Y#;yJcjGF`P@OZERSNzvPLEJp@lZ+iE_=p<`3qJ0^S-YL~*QsCls8z95 zv={gUSq6!NF5FSxCCQsh2&R~E~S;enq8 z_MQwj@%(TSZ8oiSDB(ok5hqIC3ULk$ynO^mbitPdQ{HTX<5{C#W%TXst+Qp|PC8+~ zG8B`Cm$z7lbNy@KgA2l8b)Ztknc&Mxz*f@D&{LTR{_tD4v9a;{DArfCQ}$&1Jr|_F z`uevhaNLrVZ55xYEnIF?*Y^em%#~|`JsyuFQ-DYz66S15XZp|2h3H3bGngQmSb$Zl zY3-9YCMF#Pw*=MWX;ZkGbNwhOdwcsJ%+$m~9$EZI7!zcZ*6O=P1lI33#xUymlJy9j zCvrU&DO=ElS6f?K0rzL4js7PV;C3VQX!pGRdO72>3JOL*;(cq9JXJ8$-)vc_-_Y3^ zM9|MO>Y0hf6whK>J3okzkH6r))Qns1sGv*kW9^lAMLnkK^tBIWjmhr)SWO{EKl-iJ z)q_5cKV$>H9W^cKdAcr7FB?V=2#AP8=eqaOFh1<7fRJ7F^H0BUHq+dJ2nab8{hLHc zu>~hlkbp~O-rZ|c4ss^kx4JTR2b^tUq^q+Vagy8U3=zG`D7B_``wwZN%}=v~BeaUlWm2Mr}Oo2;=8zm`olnzTjDJHRaXkrT~el@z34ka}$@MLu)BS z7pP8qv$M1LDe$oNJD;>QEe`&YpIpJYynIzQ8!OR&{Qxg*VUmN!%8{c*n}zjFVuc_S zZCwea%2K;-b9|yWnAx<#6A}`n6|}DCv)CK@Xg=GQ%L)reIkf~8GC}w-JUnG#dU(sN zj5+!F4__M_8$&qKK15)o{l^*a$)}A6Ga)G>2MK|GKwzj`Gna4SsEL3*U4cz4)l!9Q z7H1uRMgsXk3`cMn77B#|g*@1m$6R&Bfs@p`;zTu?yPbSIaD^U=QBdyKJ2+I=A!R^o zz$2IQ`3n}Bf%zY9xW~uIeWw=vukNt*2lIUcu;d(O$QKSGF1|YwCekS5T&^JZM!!U0(W{b^72sOy|j$>D`*kLrd6JoBLRicaN|4 z5QYEZ%=rA{>X3~HVVzm0md$WsVUQd$?7oR;N}Z3fwuAZ`T%fCbxY+NQz7BgGt)c4# z8}@be>oxj2G>H8`J!x!eIn=~o(>l&BY*ur8&^Z9D@ zR|mxAT;Ze0li)+an)>=dCLurfPHgNl0W3lmD!CMKg5n4WySd8&sn-9$xMSP0KYLWrVdt<7 zN$<(1Q5!$C2yN0yN8R0>`99sNU^h3S7E?k{f_O^uyy!4_^F~poaP+8cEm`uo9fRn@ zdItZ-LJ9qOHpyF28ppEeW)UKlGpjMj#PM9FF$v5MietJpZ~9&0*E5KJC)J1VRNsKI zgFqhI(9i(Iv7t1RMksczDtDO0T2q5$1#-F~2&A{Dy|a51!Zs}Iu@>NKOibO*B>FS& zqq)63FfdR{Kg!@`P6g@>NF;C>Bz+8A`@0$YfmKEa4p%zJEW`KV0YNA7^bbQAzq%c% z~l)l!zspM(dFml(&;h3p?$y{(@?ko0Qz+tR3WCv}vuPyTqOBOyQe z&MSUJRt02j5OTe}y|W4nM-gFHUr%StUY(SGeqz7q46VOV$Cz;|y1RD|%ZZu@3p4VYPVJz4-3lo`X}%Qursk+d|GVI^`f~bgTF8blNhC zxk2;g(ze{^_vc4t-%5w~-YA9A#!KCm@7LM`TjJFLBrNEsIhao6-{>R)SYTV2WAXqD zM)rDrBPxh5pcg}n1TEPtS&jK1+u$Ns2##J=HPBRZ`lIr-C3AF$P`Y}HF+6!n3fr_l zfxlN=2bgRl^}frfstWg7^<4>fGM0`cn|eD|;u=H4|5<9|iVOoWI+*?&*-wMMl%-}&1)G+=?E z!`$;JjNwn<6N16^*Sh2r0&-r{2o`Ty3t~k^d2+PRfDkcXSp=RC=cv3#Aao5YodT-5 zZbtR4o*Bx?0u=9kJE1gGD?F*^Av2VVi;Fukv$PCPw5xm6y~jptHm!G`DOq;y5zN=R zp8TCQ*@P!RLyW!_^%M;)$?6U*B$^2w$Ko@Sx`GkF9m(`^y?!8Bq4@=){x(!x2EAYi z`rHv~TyD&dTCbA){PsQxWP--GqCvxpMJ1f|NM!`-eYxYm2tvlRM}!|F?UC{g42f1A z8}zQ!#3CYnT8@?6Motcciiw^jz@wI+F7(@-bHWm}V?_-KGEToCcfuQ-ikDyJjX zx?dnMcd_}8FRm3lgSY<4HzEA?sHc#zly zdnvt3e0nK>1%eVxg>(!qkBf_$=P8b@vlxc593oO5T+fAW4y@_l1YuQ@@w5EurqQay zWIiXs)x0T4`Du!UFDxuRV#KWF8aEC<4Pmrq>1rscSbH$;pZ8?|4Un*~@QHKVvI@=1 z-V(s#mHMjUjRprQ!i*0G^o8%3Iy!U60n{51Y61hupZd3XUZmT(gdP;?kR#*`$(b%@ z9GCx#cFp5DJ8jjn3bq#E^Z4|vlOVWZqS+GC#8WDX^%rJm@{dOD)bvgHMa%A`JQSw) z_i%0*STm)6kxvZMt8O$J#UB* z)K#?R#MdR?2(-|a%y-N&_-|ZV@ydidec<%e!yXiE5Asl{E7JtMdM;qW_akEOgqJeG z3M~!m#V#_@(=d*h+SH0u5;J)(73s5{^7^IwP6QJ=1V~o=b}8@5*i_XoqN$_4A+EIo zQxlW@CcnVx#puK{LbU@S8&fgJ#HZPJ}t$CZ+ysFg2=X z)@DfH=(Rc+?0{BBY7JumUKqs+K%lYje?Zp7A*;VxgF&m_2b(wNz3W|Ljs7ADhAlo4 zNj8n`Euj6Zm^+XPEKBrI!UxkfP~CsitHd-gc>Xfb(4xt}&mL`Dj4oG@Gaj_wMWmuv zTW>kkWEN1}0gE4SSr&tA$5N*FjBBhT_w6x2c_m|9sbA3jiSE168w=3mf{Db&{{BA4 zoXA!&OH|?Hp7{a;Ct&|Lz6dPeS`)Bg_4guLd+0|aw!}Tm+eQgLq3_R9``4K8Yz96l zceL^G@p;{2@lSEo^T{VRM~@d$5JNw@#9N!j8#$T6IL>%M+e7K`?k#aajPW`_GPx$0 z8usK{s4c>Fc~b+j%H?K8%+@G-H-kYJBD9qKa|ac;?bU$;>e${zrxxxgvxqB2Wn~TS z^q^*a?hl7lw4iBu967e8wK?G_5I|##BO5QN%r(KrgB|^4=eIW*r=*6Hx|BwDCpA57%DzHmSk znx-i6LE0$@Q#j9d5zXuoMyd}SZFe_?vuBFhX2q20aU~`v_YSrmrL@=GEj+YWjG}kW zrSpOT5fZe6=DCBRXd#xgWsdRBoegy4(1EendIn4&Q1icKKYCZBpL^6bn#4ZWM+U;ullC~$ln!n zA9!PG8ys^e-Cfvn>x@VN+brp>MHdk72@wv}QZ8*=9jYIr4|wdrh|ILsj}sCZNqpihpnAXMJ;*O7phpH9*TfxpwF z5VFq8ev;Yt5N0sch)#9XC6{GVn|;*a_?kvC!9DQ>$m-9wLSFvm8ucvjFu!&$;mkR3 z_wd1C=0>30wJYXMbPX=04}2s>#pbi2S+j_P{@SW`^S8ncOM`%cERmQpBt(*1qOjfIl#Z+7_k zO;O?0Vr$R$1E1cb&f~S8$V=Aoaec3n!I}(FZ*nCx1Zq)$U~S5CrAu?}KIOCC$NZDd z<8x4j4_Z?{zF20a|3#q%covKbi0LokRB2GCDy4Uyr_IfkMHTL!s_^;fLQ zfQs3I^k(4iHPej$XSH3NWkCy_rUiTX1d;2;X!mPqfMrx)B~2IxCiwRXpr)ktvQEJ& F@_(&2oeBT| diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_13@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_13@2x.png deleted file mode 100755 index 53be82b51c508f443bce963775a6b0b432abe27f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8724 zcmV+vBJ16WP)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z7ePrxK~#9!UXC*u{#NQKS@YpB19Zi9^)Vp26>4(a1ldL zWI5|Pqg*d2%2FP8#Jg}9Sd5GeBcooC3Gd;dLcoNCggiUxyt+I6uCD5OSN$I6+&`+4 zbO47=Oq7}Vt#wwduIl>z&iU?r_V>H@J|(o)yw~;Z@7~49x};%{E9CLq5{79(ph%~a zAT4s)3cKritej86M~wCjckO zPYfwZXEOIXA?Kp$)20!N#ZbOl)v<5yQzP-xo`!}7&ob^sK>MU>g!EavJ;mOE^f&=9k%JG;<`Q)nwp$gZT0g3>MKeGrq-Gu2+&HQwMJ|89wR`ZP-uK4 zz8yt}qLgF^KU9SZRikYa?SN;7@hu0-ISv{udENIcf>(MZIJE2S%;L!%KWX^ruO!(Js&W*AQi416R3p`d^q z?ZVT7x~d4?!R?6BFxt{+{{(e_G>qelbxJ8zMZjpSTSn8V7n&REIb+f3_(8y)&VBUs z^a2WWd4Y%e`$%PT-)xvLZNwKQT30?35}^Y^-Y95w6a*Noq8SW!dG$Co^>K+)QEjhSP@%w9jg#yLk$D8k7Jl0PRRz(}6%E zb*b!GN+1nM$*QJg+9<8@EEi!&5TzrWuiqnpj&BRd@w0#s0)Zr(PLoNeca4TaziF2!Rp;@ctlbJ|($;7W!h_3bmz1N0xN%?!R#B*0*SGnS^0kM8XkF%R(3yTefUw zaO(z^Os->UeJvlHR$nD4zW8Rxp6io|^n;PA==(zoi$ITS;A;rf%>wbuvsNy@_sT0S z|6KEgRuai1J9oTAd}sh6C5CBnsHZ#V>+4xIkn?UW#`Cy|9GyL*2&I6e>Xg7LXo5CmxW(7g5!Fl+j0?AY0Xk0e%8heR1Ur^vu#@kuIn>@!2;5wNs9j7|EaY2p$KTIs;V9y9vUnI4EMZ}F78k5 z8Tk29H!uoCpBe4-ESNs)(^1R$-S)2Tb4*_sOdj;!zuc8b zj(&g18H<@ca|V6={d6DdOS;7pk*e^p5CY%#j!eRb$F~;!WghHXXG)#gZ zI9voJt!xH8@O<_5nh5|QAP={`n9Lt?JNh4xQcx(m%$wfK$`y+reRF5Wl%9d)9a@5qi***pbbRUR&|q(Z9Ff0!gmU|88CeUme+G^<+<5`5I*|8;si*W*!q z7xz@~;BV5!eq&eP+C`-R&sWTu+00o>Pyg=boqLvS+tc&el56HIVV*hw-gy1>w@G8c zX;Y_A7qU=+LK2Vt1=sdka$=xp85Xyss!0T(-t7%%(Ob*Fer}$FMamwHe}~k*-pR zIt#81HgRoJ7i|%rj1Dp2RzX~03b3CS;gkyl=<*5!drh-5#8r%%aG6^P! z!1K3rUL-3Mn-R@D=oD6v=$R+*--A7gq6${UvT% zm#06kP(T%sh4ow9V0pfC;Kh}`n&P%*9`sFtPjG?K}2DB_l-K3^QQFNE_7@l!2!NbImww+LD~xSfD4c$!ZJvE&)pbQb1o` zGn!XiIxEDM%d7e9?6UC59<|o~J&Gm2-apiNuq(lV?j)P{4%0Q5=k&QV=6>?r6`Sj8 zqF>6S6~Q>FiKm1HHG%+vrv(Y+aHwc8>>3C$jtL3y6m%sOAw%<%^Bo?)pqeRFk}(yn z#D2{=8+%3u`}$IJ_oUdmXNWDkhln*aa`mTI{@>+`oBnQeG)tiL`>!)Jt}P}YQPdnv zC_XhS#D-7TaP92S(a)iGx6&&&9!lg6^p4VbC{0&SlI{D35p^-HJoke)pWfEGc4RbX zmRz6TSJL?7^#(PRN($doXj6mGj+R(uL4=2<=zEG%Nge5B9FAq(@qmd{l7~JX!BGJ} z+T#6L0Axo(lxk%NZ7^)%T`kvY?v_{cd+F2uIiKfh)7B_naw6_bBt0JPTV zK%)XxrKLD?T8pzd6g56*IC8cyX_6ABTt=g)eTHL}-7(EDHfW_cD__5+44oB*#*{Fa zS6BqxwlKtmkmSBjkCCDV*wUq0Y!0TLcimuezTlC|dz9ROnbVs%_Y=#{Xr0-#`H_Em zebvyg|H|75;uPfq5O@lSJlnL5tL-}D6K2eq)E+YlLMX0_F={!8`Shky0PXGfCRf3Arcrv`vPX#!Va+VYcjRDLbg;H)(30%RzK zVF!q4BX;#^5NSp@^M$5;L&C8MXvmrVO>^d-=a>uq31n`UC zCL!00N_1chttS}Rgc%*iYN}i5kC-cEKff@O!Cxm_)g7o~`?kT+BI? zUO+1Ek}vou0~Vjr&Q+J6ee18*zS{b)oxQ8e<;!vO;onVJt(k9g)50*h07gC+8V}eTY;Q=1EOh3dBOQ!$a|F@y(k9>@orsg z0dBm~0kROWX&7gG9ocpsdguLkJ-?%Rc3rGtLiJC-l@)U?dNy;bI_k-447K|n{J6tc zojRU*Dkeqj00N~1PN~S+E&G2WAgMu|um`N3Z*#*ehZ;xzXu{0!4Wh+I*agfvS0QIz zgBB7B{RpAoCO0&{H)A;*6Dz&Ha@!0Dx1xgpwfkYbj>qteA!5Z4|Nc_?f%Bfqe6jNF zx}y@|NLgVJnBNAEFKnou{(;6Y+vB6Jts8MaQpvde6ZU|3Heg~@e6MD@bA#WiFv1?@ zyw!-Qm!gXU;AcUY=rM~uvM_OM{Geh4HD=LTYs&3Gjn3~x8Bz4qt57;jX~)AH5`uHj zth)aGRN$_DHUDKGQW(7p=thd_A8TD`JTt#xIQ$C|y|NiQcoR47a(*I|1#R39pE)`Q7;>l49Fpk~ai)fl+l%HKwXG}H;PK)WM&^RuD8&M- z`bNa8{{hm3Ajc8Wtu(@vQ0+jvSf2ctg}s}2;_#^;4TcmLF$a|?;rjvNh?rLh8AWIx zz5BLHBFf^~)Yjtr+r-uQYbt$ofLBk&_zU$Lj*ab%D-cn6nQO`^cJBbfg6eeV~irXAnAv znCw8v<(4&%aP>70;yVVy$b-rwR34$%{+eC;Oc80J(*m(pq~oKbCacek-ZeRVd_}S20^qv2p-XF~*==sfz%YSm3*aN%6hagc6K$Ai zv+2dHtiJ3%{{E4-xc0hLRJBAPnDr;2Te{Z~J3>_>(jF z^FN=>vc;{??39(Xj=@L>5e8xg7tIc>xouPN=fQZT{CI=lS&hcjS8uG}r)GqOt`1?; zgy}C$WLIxM_rYPdZs}*&#zE5kaM~P`OTKmm7k_2}biRqs`e0cV1t{J-l@tOz4^d^p zj5B!r(QW+l&d1ol%O}BsktrcN3wq^!iD~QN!GV+N z0cW>a=hI}0z_PF`39T_6zORovez=wC0$Q74)`BMHT|bwPUc8uTv%|3C6?9R6Wta8; zSl$z3=uimI;+R8V7y_NnBX+#P#aAw1;o>jx(&L-i@#;=G)(`UX+Clbe_{L2O`TC79 zjC={tvXD)lIJ?a{e_cGd|D<}r6Bkwe(?zRlKj+tmF{36#Es}Nf*wzCJ zshZ$Gq8|<(LK`8F8kA4@jGC(Opn4lcR}$L8xdIY|S*BJc5J3s1d;scO$qp7d(3K!Q zl*5Qsv7im=k~<*h;pcqJ(E|VW#OO~}{ag0)C(Q$5CSqxuy%<9xO#zmPF8S2u_Hp*o zso>N?cN%YK2T+2X0^vg`1wxH6`@1#4-X$40@;?H!1j~fcec&A+G!$aNgj!fy3ndr! z9YmLWgk>Vl01U~}HhXbXNQmLmds}y00DP#~Y;UQRv&ss)GBL|W7mBcT7a}a_&S}1R zPZv?;bHg>QELdEFFdZ25(5^my#i2mh0w!4CE4FP;^7lXPCnrsA|Le)LCndTVRK%@a zZZ1dx5+>HkS*KOW_Tf^{by8?>TCFirThi91EGxYuS&RS!bk3)JqRlOLEu>FIS#@P6 zYredP7hXt0)IhX52ungR4wV*Yge4K}4nz%Jcp=G}FYjU1m7Vm-D7W0TkoJi-I`36x zFOI5hDba=mTiU?HlePscLxc@eRAQDmlBynYRm(tk=b722`PJG*{Or*|{_f^2{O;v6 zD=(4$Sg!XmCla4Je2vfkM5aa@$dSZy@UP|)nvq?f#@V$o@aoJ}k zK*tEWy8wT*1D4D_J_V(<``UDCv|6(8n- zZ*;Kv{EM2n z{*Kv9ooK*s4wYl6V}Mde4InCK4b+%cyEutLXlJ5){EN!zY@vfPZ5^gFL^+waD{sBp z%hb6s{`Z5kx&NC6@oj1PM_j&pdl#FxWLR@;GtsC(S1Oyrk>mo8AKl%{(`yq)6rJTf;03Y2DCKRp>&4A7bszCr{Vt$a{kdEl4L zr`?Lm^T6=XG0+_e!np*W`(h*5l4a8!&R<%^!w(I!eti;JG)S*JS~Tm|CwcgxVa{J# z#j@!R*pkn!ZX}#bpgR)iY7K^8eunVM&(t1Td!Rjp^3lq#oL5u?ip)s^pf9Hm4y9Fp zxkM9y3P1#9Zr6UL!0DH%PgFpOl#j9Q-;f|*Dl^&8K9|cr-@wB2qcBn|9|X1nNEBIk zew52T-@wp57t4Tr3HGl~louMIa$g^0<^Cc70<^9S6+jSxRt%+8e{W75IB5X%7WL@X zUT+&hRJNI}9A(#Ko|hUeH5j@gd^BRR!N9&E_dk@v_F&gGml><7x#fpVG=??W3&7G~ zYP1{B=xA=aw}~06s@b*O!}j3*hejFLUqVbV%WiH~?k`k%>q&)>8XDl1Me*Xb7YE)JmW#bDFQdBhkn1Cz=LmR9K)>0b*-`3qDiB#91~E-897ZtseK>o#c-1H6gN<-6qDEu2N#xS|fY} yS;fYF|7YWF?EJBQp!j~hB>&B?|Mmd<{{a9;t_dG-&qWRZ0000KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z9MwrgK~#9!?3;OzWY<;ZfA_vE_ocF`vbOH(uIhbJOSCM>vW+YOlDuJTWWbCa3}zOC z!x+ZlU?LbMJOm5`U>O8N3{PA99 zRkgY$8*7+9JQ;C2yQ=#w=eyte?sv|8PiU?ALHr;(cqK~v=mqp zY#>lz8V~@e@LNWsqG0~}1>oiQXut=8Fu=D+A?{7X?KfLu+|(en#1UXbH!c7r!ecxE zzMtWdT5i({i&d#P6jM zclHTMAA&rP0g?h7z(HUEQbcJJ&1Cluf(Qf`O$%sfr~+kR4b7TX)X-n)pnpv$p635G z01?%bj^GcoLjJo!At@p#2*?Xa0gez@I-GF>vB8*Va1{tT0@Op}18qVktSeXrme4F~ zMMbN>XlZ`MhK2={|1|*^ArvP@A88u)zUUlV{KAY<@b{nGgL?MTK16g6bU3j;UA z22JIrS(n!k&&@+cBZxo=0AFZ23aVPO2$X_}g)5ynP(W zxPU$caYAu3qrlB5aFeY7bn_p*0Y(o1vB82K0NtUxf7f_G6IfT8Xe0& z|C`I80QQ>V3ll=#vlGcUkV9Zcs%|1MdklzvCqlKCqRW6NC9Z+B0+i4%V1N$Hgu z4*(%U2I$Rcz?Kw{SDB$}0ie(X(J@`|le(Ke;qg-I@OaTZhd`srNSIJil}4;>@Ic8| z_qL<^dr1J+ulh$za^I*l?wQcgCq*=yA_{hE@OC%&O{vgZ38KKS$AE6&8y-MJObFfJ z)#51-QMeIsJ^c_Up~(rsq=u>??>VQ`ePzYN-&G2Xm>aj$(J*evXxxag9UXoLXzBr+Me|J&9G~&j zjm~$&fZ=XYqCrXCxn0N`iaM;|1fl4e0xZ2*^*03{fnxTAFk*oKqw594^)*0u?QoR$ zLTt=kZWM6ZzAtYya#qob%DI}qdJ=!pr$&>)PBA#*vb zToyB##F7@aX<(tT&^S_JYJnvMri?^U8b~QHO%ovmz8|2J!dHqwhfAQVbhNf>+(`J` zK;Z=eezT6hULhz~pfrnKSVBxqA*QEcY8pLXBIvYxEV(EJUpB;vuDPwa$|VMJd6Cmtha7}!C8qXKLpu%&@*7+AKAWm%Y}iDg+> zwvB0;yo5dc*U)@Y{9qJP+UZ@jMUDb8&+p99q+nCaxiIm7?8l zp;lL6ZUK4e67u3D%yZ{xlrHmiG^gQ^1<#A?rGTr!f+N|nQR+W-57oVUAfLy!Y+`|r z)9K(W%wyX&mThC$Ho~?MmW8m5s5LCMj_c;47_Ut0iJ%ICRhV)BmI%|~fZPGYs&I7>^| zmWAOs2-^nB3U5TpjW*7;)Ld(nQYfX+TJ=o75CSPBQX0_+mofmQbk7KPkJn0tOWlj@ zVD-Qj2+zf6HnBP#wC~f=n%4e(IJQmx8(+V(EX2nQ)4YxqmNK25*!dfhBqnYwRdDxbP27%55lx?U6)R~ zMXTMSUaQk=G$K$pK)GfkCz>GPdB|1^C+3ixn0S4;RLW@Eu8L~`&_6J6tJHeP6k^Ls zyMGTas4-2GL^4e>l_Zf!;y4cNR)h7mD=aRQSYKPEQLhn?#nC`{eU)0RPT+e4fkFiV zN(Csb(1@^KU>L}*Hdq#!OqOgmhaY%&o=+y5C70_XkxY}#_mR%!aXT)}W|MloMxd(D z>0Fm71`xNb!MNibl~R7S8~VD1H)q^QfZRu45?fn z38iQ^o7AcmT-WQxAfpFV`3O#We@}bt#*e-qeiV>=D8Eku-4wkPrvIwF*~=!-~Zhs{K!3T zWOjCj!oVmW`1QB&7k_#`fAQfDvu#_BLUEKtDn}xdBb^^0TNt2kph&)d0PVXhF0O_? zqvNrB=Ctkk0cNBFTL4gQyHqQeeq;A!?g34mFMs_zOrJT0Ut7jPkxw}c6|(Foo3 z89x5dgZ%wJeT&aL@(_=H?0)hw13!SJ)hW)MeU|ll2Tw?>)F3%`+WMZ|BUzk!rNJypJL|h2@dZb;*n2&l1yKbd*AQ| z?ED00Pdv_WK1Cvt#4^mDkm(@6^*UU*aGF(y_?ch)uUHcP{X2e=oZaSaZ~9SYr_STo z7D$LDpZLTlc;j1sid$d#Dsm$eWa~5B^+N|Zyk{r7wv8~DOW@U4Id$?9-+umi4jr_4 zRy(BLX;>f!Ez}1BdobvTNHg#X^BhGLBm} z>9~1hECs;g>K@9{SL)@-uIGEwh)-geL388<@Xv3+wAs4D^o> z1OY;5KoSHB?R!+3iv72|p11)sGt-zslMlT69sJW1r}(1}e26<=v5((;-@jpX?c;ps zzMXg~$H+jAZN)qa$#7qW@xc^3hB8c!UF6ZPpMXGMS_ux{wvR7=?zw@vT8reh z_9yo2j^AJyS%hJeunlgQ>}PUpkfB1FbTWo*Nu(i&r3>VnmpS#dPXn-T*EkcS{frC^ z^w#B(!2x!T^s{4ISY%f^V4H$`Dvcpz*a?p6Sb@eeO!~8FJU1+Hve_(qc8)SSkRzYT zhJC+Oim|~y4or@*ZTogA8dje99K)G7N*HJXwk1g?9EJ-Sc8?V~GC4rp5_DWmUw?*t zF`I67TWnV|U}#9&N`=NmN`Yfrpfy3DaD5*y2nc+IVHk`J57U|c3g3Qu8wc*VkEcFy zj-hOf#~=J1q!1)bg*I&Ne#_hOfM>t?CXlN1lUhGQo#N9}FR)904hd)GVh0+Yu+`%#7(&$DZ62+NKmghu!JKA{DY z0@AsD_7BBzpZ^Ts{?=F6cH>=G|^XuvkVRI1ZhN| zg4SW+Dp0t7fUCm-O9dY7R){JhET+Dv1NeL8Wm_z z3MD0`Rv1>2@zDg$$|-V%0p`SZR@SOWX)?L*0L4U;_K8oiH)D{=jf1oiXoQ0Bj}0p; z34u#yiyVq4Szi7&ZgZN$d&ZfY2`DX90h8Nq*hN8I#4(%LLpvb|y99yO8|F%DY@vwj z4icZX@1dp7;`B00b8A*SY-qg@fLmXcBaM26s*&KiH3uWxVyLf!Ac<{& zZHdUm1z=hv^Mj@GbP$N!;7Oi%Z z#~*!`2AIyKxVIKVOA5DB`Af%W9aVnyJ#Bl8vNu9$Rzb|=j)^);>x#HzGhWPqA*s3w zLnySc@wE}=loTLrFl+)OM%cGONP%gYblPo11cZ+E#rz<^acuB>v{K<_i5Wvnhak{s z9iWsZY_jbeO8y7@9pb9^uWzWZznf6gcO>7qs`oUleP6SeYVfLZXIFAXn}PP zENP()3(+llq=6PuCr~I1(?AG==g(ar6*m|g8VDH>RdJUWuh3|D9Ne=j6f{4GdW2z@ zRCMVb_~85afk)of%*?Iwk;ms)bxr#6IfnBIR{b~{LA|`jnX^x`_RQC)%(|#>vuCae z2PITqz<^FChKv-m<0k)D%J_Q*ivxQP?B7iyouSeW$Tb_RuC4LZcP?@Nu~mNO9!b70 z6_y)L*q>`Qe6&^wsUiR*wlrB;FZ1B%{)qzG}r2U_}B^+bBI^mG(n-zhaFF`$B{H@Rc00zxP0y` z=V#qs&r%7zK;z46r9i!&+9XWvlwpWeGMS{%KR~fq#54@Nz^74faB%kyo;x?o7v~m; z&DA+Izkuqr`O!l~Za%n;mK)xDpaX<3!Wm226f+4v^`&p})bj%rGD$SBR&6jfx58aF z-9R>BQmU<#LP|+279*8PA%vil>5$1}=i&t>7tCZ#z`0rnuPHy{?L)9BD?HL-1rUwHG6v11_3GiNWcu&@ef z26JhC;qF)SBd>lX2~48Q-SSq6$lwhaz*(JnAr?B~vHgQU|L zQmGV<>Wz+x|_CW)$b}Yex z12?g4Y=Wd2p0nW_q_bIwIXI@m5hm?+htGWVB4?Hwj1+RLcnR*k`!4p450gx%NhZU9 z6NvBVEb)!0CI@y;(CI63c%+}Pp#c)f zRMc&LnOk0lxjDw7eNQJ4G<-EPi0%cx1%OJWvgM?n=Y6_VDxI5}n%Yw= z7JC79Q=tpO=GNKR*chMuhLx&k08YJJ>hn?zUsE{F_%dr@bV_P-|jUY5t z9oM7PY_Psw;ma%Qw5zMEudi`=W|n5N$-|F4!ofp_diSW5+R}XWeVw zFwL-zkHuoW{{Cjr07eFjTv=b|>)-sw%kn($ z1U4pZeC7$b{qPa~@oQfp-`B^|(o$~%x}P8j@O_^~qrvLxD)V!5oG+It|MM~S&6U`0 znT!b-REi34OTI5)Sr)BU>#a{e{q#4EA3x6G;v%(Ljb^ji z+p+16t^zMCEO6Uvf0$Dj&hy5bZ($mb3N9H8`bdx`77ZsF;m-x)BoNHgVU>XQ|J=`W z?D%u!`}!!AO5L=4!8M!BCe><{E2~#HGd0DtpZ+xQCmts+1xaZT2U@O6)vzcWx`Ctn z_AxOz`Qe$F8Cz~`rOPcNVgRvNOjRnCJDz>^*+-|Rrzw}qTL4g-sHwF^E5+>PS&Abg z{KHdE@X9uugz?#xr@jd2(faigw(GeIfVtXFjw{L&d&Ye5o zv85Kc@x~jk{aT5X_`XjN1n;^1_S^sD&O7g9$BrH3^ZA|@Tx)~Eb3Kxo6vcr-%GC;A z`pjqf=085l`Qs;9SzMxBuOWmanawi1eUyW@-ol+f@#DPqo_jEb;Bu)%;QL$BY_rw` zK|rh33WJ}S;n=Zb#4}lTPweFMU;h<6{uEiyB^jyx?%(=dcKwHUVU^1)EG}~T^y!DT z05Cc_dfhE9&-1V>>s3dO9{uOL?z)Tp`}b2Q6iBDjSeA875H{avI-8|9IEd1kmDN?2 z=H{rC%Sb875A;(U9-%Lr#Z`*M`FT36RxjVLcTUgqsMTt$tgLY1!Udju@<|f07<-N! zA=%f5zp#L@yn>@OeMgUyKXeddeVtS?#d>+2^XJch_9aDd^NQd&&auVC#nV$$Q~Ue- z`!Ngyr4+GP49l{5CaHVFU4tTopkA#~jRJOJF^0E|vVCF#&~(}zYLyCW%gZROd&_GO z1Y5Siy6b&+Lb}Sova-VL>@3x46~}Q{n3^KCut;*CpX3dPG1F;kK|tr^Ns`GVzVEZP zwnnSfy1WH|uHC)fr`2jPKR^HHQ&Us-7Yc=*_3YZw&0FAC`-JYdQVPFbr%|t8_c~oI zxq6-ND!%Xgq1A0RSzTRadU~1*7cThaa=B?)Rt6y9d34+kt<_cH@i_5#oJ2B7pcJ0( zv#_wx`QjJ9__yB^00672s~^62@#1~9ZQtH*w;3B7Bb&|kE@Inu&zo;fjjpJ^)D!6& zJH=`X)jiLn)9K*4F0EFJR;xv&QlV5TasK>y&Ye5=aJgLmBiD5w>jD;w#c*90*Yogv zA3p+cX=#ZQCr?oqGSkz`(!kg$aOIEM}+E>Gx+c znSYzjW+xJfgqh3b7#$sDWMqUwp+GX3d_m#TWy96i>QcQs>s@c(Znrl~&ip)cb93Eg z*soM7m#Wq3M{Bj(huZD7+dWqH@4D`1mzS5%?cBMOLZQIo;^O!J-k@O^%5j`hR4HCwSXel)wzl@(si~MbWvo_uXCm)jSQ$H%0Uc`0R9N@)op)KvgT zrIe?Xswkz_Tdh{9TrQu9$Kzk~eg8=zgi0h5JxBQ6JzgZXINNI-C;tE2<3He^|1$t} W!jQ@@{YozY0000P)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z7{EzHK~#9!?3;Oz99Ny^KksE`Rc6-N)!ilarPi&MEp*tHk!;K00~>n`mNzhq2QlEm z3=0Gk%MQaa?8HFC%=;hGC-V5d;#~_wj=Ofj}w}LCCm( z0N?Xbq5)C}R4Iuk6MDmTF1M`O<+g4AJ+AwNV_9Etoccq)q9Vob5dfa+A{F&5(Rlp7 zr;@3@L@G(dFbM*I>v>2uLMD}@wIxF)l_Z@?p+|KzHDo};^|9+Vg<_F>vB>P)9Qk4i zp+QnNNDRbu#?vxD70;PQFlJY;uaBu~Ci`FH!<;^z_Rb**L3L44FDnVTn|MmBwNyVrCT$9+S1xa)HG?h z9?QDBxN7Sb*7vQ(Gz_XWi+r)Tz-|S=Ldpj7Hl)cZ8g2uN`uwM+X>i5nOSov=g&gWX z#_nhKGCVd$OKTg3VG1)AyW2Z;>gu^%?){$YouSqF20%0^-|&69Iy)Zj=v{JCB9%tf zq6jItdh2Gc-m-;EIz_2crd+B1#`+oB2bW5rH{DyU`=;`4n`}Xnl&-bI7aa1jW z7K!}ngsNsMRqJiO?{O}xiiLOLD{VO0*-N&wQ;Wv5-PuJQmuFhr2o!}_%;d&5U&*EG z)>E@=YIg0s9Q8gI^xjk~4s^Xvx% zco@mpuC}(!<(c*@LQzP@O>TYb^(^n{WomX7-}ewg@Op(;0w`8WlxtNs_FX_S7UTXO zK1#V#Bh%gv1eedut!C4xJLKo4Idx+28>7bu-e=F{&y4|^Vf@k;UE3zRZ0U!V ztX%cpWITZpGYMqC)myjHm0iTd%nV}QrTJ|hA0}pI=*lkQ>aAOOmN!9gNRLPexAiHwqOHmS_$Kw|+Ufg-0qi2cMlF8r^uxagDF59?~Vx_|G zI-ekfAQg|Z=iosO965r5U@o6$;?&8;0OFc1f|OBXYJ2*l${#M zc#Ji@ODUAfXsU|iBxuRB-O#;p<2xI^f1j!-uMR*m7CQq#qaotSkw*PgdRJvc)wBS_%C>D$1;a!)Q zVZ1MuO0SD2lIVsGLZLmA0Rk+$9!mfBC7me1X#~U#gZ9=|3Y9Xtp%YIeNu|>33bV8C zE0#)MQ&shq0Z1g12qCa7i&!jnMs4`^GQB@&5pX#akmd*&HV96d^* zP#_+Qv$Agu+pfEgwd>cD8=s)jaEWLUq_EI5ji{lMh?yv{`1U!=+AH+v+5Lb;S6zkI zXwV&tA6&U&#fHq{#Uu<9Ap%nI1dA6fBHq%%eRqA8op;}T)_q^NX%p}H@JCqD*T?wD zlc59`utD%E9LJYsyH3B;xnv0^`uq9TzkHFy2M(Nd&FwpO@Xq(&L1k`^$y|DR7)Rj^j{w9ISdB z%eJws=40Df^*VLO!EqcMr;d<H~MoAO7ZBZsEJ%{Vuz9?c%ea{Vc2d z`T*E@_ubs{r7w|gYa;-pR8SR(rmAR$Njjb0U`$Q*)t-I!>?%;H)i6E(5+j}+ke>=A`$bfkW$dKY&rk>m9Mb#8(#+?5{+{2z4x;H=9>YS zot-6{&C=b|!#{rE3%vN^i|o4ZUi#Lrr?+n{HOoRuNkr3#=uwP#0>|?&snlxyX9b{R z-8$m2_PQF z$n5MaciwqtD4B139W#++>owOfHZ+8ysvyo@knmiW#Y>j))DIt>KRm!)U;QfEZ@!sa zE=RFgB$vxEI5fm`F2|*tH#0Omj8&`g_`?tLzE!KxRE>ZDRZ+sT2tg{FU9ZH^t=ob`6_eV?|D4yI0>@f_}#C2Wrv$GWD=9rqCq*|-d-rmm1kr4)7JWOtEoMa|Ltz1S`RWwaQiD<;)u{Zc` zqZ=6gl>kf}Ki-|(ym_f^ny6Aml?sX?i6;{rJM=u&a(O;AcJkCI(&;o#y^dj;_?}0# zT4j2An#svYQpqH3ZEcjxW$N`h-~aZv`QWEMg{o<14WLv-K{pM)|Lt$%HLuZ*&Q5xl zEaAzgo+1&C6NyG~U6)d+L~eST*?gXSK2PBLD2hV0TxN3g6rH`j)N54&Kvh(9(?lSa zO$;1AI{-q67FE^SR8>P&!^4LvAhByT02EcFTq-dUDxq_AIq}l={Ykq zgRbk?wvFd`9DHUEho9R|--b=hPE8?Rme>#cfYxl5!_V#K;4^zd_DM;5TN|TeW6b9B zB$G)rO~Z9vs?{omLV;W^$Mp0x^?DsG8pW&Cuxr&bdv5}(sw%3cWrUFFS1OH}Qc;Z4 zRU07$LNqHl&HZYcMzL7rv3f`EFx9&W5yBtJ7t!)XwSMiEj{E|u7~ z`=_kG^or46$RV285|rWkw{>eCaR*~`#!d1QL0oZ%*~O{ z=bKKDGSAS{`xZffkP;~s6h$$F5a!td2t5|@5|>kk0k7UnmPjeFY@3PkamwW~rfH%! z0cbQD*p@}LR>N@|gcK-&#B1vOk%I@wjgAseB(SR0mz>{-$H|S3a^zrm-6@KKs%eyp zMI6T=7K;&$Mp2poIF3WDR-;<2(r}#9CAN9+PUCx8kimQoTAbYo`uIi9bLV{Di-nPP z=-1b6o9yBabX^Z!;u2U(M7#SSolFKj0 zuGY@%C4g8w&XMPzr&21R>v{-)q7VpyWmz;D4Wu~ZRrjg#1<&*F{2;6~2!U0t(z&FEj-GB@&qGK_BoYZJ z7X_apHvI!t3w;G;VWoEg7=94oHl^q{=~=5*aebd)VfI)ET;HeG zR0~bh&>|7ENF+3dLcC<&({%TIAGgUk+0_5F8!sZ+lA%-@M#^wq*Y#;MT;?Vxb~~0e z`icz_Gh<_q6mrv^<2LYoAA(SiN~JQJw{0UD(Xc8Ngp{bN8cJN(iAJO7x{hg@n5K!Y z>*&qTBGCwnsx_$_;5Dnn3m?z-=RHM5)rdqRFPUTEywPZssIC)f0wkows#J(ZG&XPB zMyXtCs%0pB$8AuUp7CbJ#vXaq4iU$)ela;T_^9nTIIc@TfFdO2e4Z5-uH%ZgTt}s; z_o||xMIuBa5e&n?Fbqt?nBS~n80gU`(MS|6qBRYaj@AStyk$a(YN{3{UH~nk5sgIA zqtS5A=6q&z4Z|>qo@Pjsjg@MZE8cP)E7q-}oX?{)=XG2c+i{p2KJlnyS-*HqEi$9W zj((*ulc#3aaXlYjgw{VlGs8{q-a#^zA~!h+O$)0mV1mA2le(^>MIvE5(JY8|FI|Sy zXdsYH3m_0koJNE0rOQH=1U`zYqBZq@em=vPm%O5?A$U?UH8Dvlo#Jgfc95T$MUfI; zgr)hKU8gXUXY}aNue|0Sq0;Q^&f&u^?5Wkm=q(5Wq*N%+&C#~FgAe}YC$Mard_Er< z8X*u;zC?GmW+0^~3PK1fr7|sTZLGXtEmpOHkfBWz0)zysT4Ch{YiVg~qf#n|z$!`z z#LMOtQW7*@&gb*kb(=r?_$O#x)Im9)M@oet2(TT8THRsz@C$oNv$H$TsYz@di z+iv3{pZqkF6B8VI{vfrQh24zv>$Z(;*Fy=|HvNYW)77(t?K^gmpPiX!#llBX6!Nn( zY~QhiuAU|IA3jXYwy_-t+pbf$!@PlAuT!g89D4pBlM@qsH>v>D%6ZVAHm3z1etzSj<3GR02OB5U^^^8je4IkpKP9 z|4jd(Ll}lZdp6sQ*gSH%DayqnOO`L^GynBY)Oei9vC+^E2!1)U+h{ac+|`X+sqlB7 z_)AU>4w6Wv$YvLzstQ)E#&j-+Wm)vCU(f9y{V1z9Y~)yfKN5kE0@rh?RBKFEDja z?d9a~5T#NXDJ7YJ-&-g-Aqu)lz~09H&7n5vQl82dh+OdOC;idBhTNTCWZQ5yAnIA;JJ0k&Od zrc!3)39qyqN51WG*4kC2MElV zNhBI22m-3rDz;rmQp%>V#m<;532c=^rSZ|-PqBa=uFiD)SD%+bQR!WbfSPbKNr zcC4C3wOkA%vsVEk2m%5T(2{9|01C5bGDt$4j#nQK(g`3?Cn0@BjTN-~T_~=89{s z;Z4_HPi}nTWf>%a@O|nHhq+pr@!46P`ToN{KDux3cECEPvf??Yz`_wC8ah(Qd4jvXN6(U8p8CNLxbw4rgBFdlxT}j5eSLH5dMH`MEF`aJn8C_|z<$e7VeMF2|mS9{S;l{Xf4I zsJvGD@|ywx5b0Ta!CjYczhy^HcMq+}I0@50Q&d8?KOhi-HLF(gKmP7-+4;bO^e$V< z-1Ib#Q%6%HD4GfZG#U<`=Msx2FyjeMjSTbYzxgb0di%}vzxW~%O$((iq2aldYZkMm z3a3U-@$}9I?>=?p#rFfwxfs~<0YG>~c6I;#wtx4IPp|A-MO!>cB4(l~3Q|a1&n1yg z)79R_=lD_|AXHkB$D-uhVXK-T(lIrPH@>dE3qZ(zj`oo=vA{iO0|* zQKXdAojTdY9du?|_~Ji&o}D{)lFqcy*4`c#NdU*LGd@0!3<5s<=O5*!+up_DqsM8~ z?Pd-zz;^1)RjT9)MfwjMu=hUvy$@Flg|Gd({f6fifM)XXvW?eV`@b%_>Z%Jnvh8Hz z31YgArYKl-n@oE$&CMzl&8HHt@ocBe+f- zO;vF{pQ;_|`^5A#&+XoQ_~4Hp|FgjN_xvUem**XT=4kEiTl-I!-f+Wvmabe$TRcH3 z9z%~rXm~DCRav`w4Kx}IA3w&-R4#0e?(U&y#c~SO8UuraM4G`;-Ek;Zs?1i(3=ItM z>?4nSYqbB!$AH=2wBz*k0wB!##N&T*(RJ7V!@5h~*s-Xsm2@md+%!>Dg}T$g)OE7i zEQYS*`vK)@h3V;Oe9uGER2mJJie*u#Rhi7qa`nAs)2hvve)7VtmtE1_+ehy^WJOp+XUcrRISJ2w=UhV;r%N&Y`n6wcPYt4oTwJw0`-PV zsa#=vWSD{H4?Z#c{PTC&)ynec-|12FGFs*%XGiC5MU}4z5wD|xG10%q1rTg-%0Q@12fBWCzKXd^8-vB=;&BA%3 R8-xG=002ovPDHLkV1itg)B*qi diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_142@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_142@2x.png deleted file mode 100755 index 06e917099ee428b2f77e5eac7b05996f988a5474..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10608 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 Uni`zy3;+NC07*qoM6N<$g5jLqD*ylh diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_145@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_145@2x.png deleted file mode 100755 index 861327640608bd6c7cd36a126025e1a5bba53504..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7031 zcmaJ`Wmr^Q*B(L|>693T?(Q03NC^cLkdR?!fRUI1hL#$dK|o46lnyDSMM1h#kw#EJ zL=cdW`tW(*=Y78)-}9a8oU`{{*Shbu)?W9IeVr3~$5@w=jFk)k08r}dK}@el@Slf- z==xoO^jNwcSTNd_7&DY3#uw^|0BFEb4hW#W8`KG5ih#oXJq8de0003G(%cebX=JDb zL%E4T|M-acxuLJo0Dy|R9~ugCL12Im2q&bwDrmRuEeME&tAZ?KjU4_+=IZXHLm10{-QKaZv^RD=AB( zJ3uXzCjuxdCM^n+kdy?<$%#qI$jZq{iU6e~B&Eb9u5UR}Nf{+sIVCB1;J+`>bu>@7 zqmn5^=ijleSE?Xq3gDf_f%=KMdvX8G z06}=cJdtP&66Fs3!w7Xid1F*T*O~sS1UK}5Xx+X3y-n8}ChiACi%W`0{3+>gMB^_aZ`jB%G(om-8e_?KcUb{TAm0f2IXmvLb?9Ei+7w+ z7?hVY3JugUlLHDEL19SuKL)|S5JpBy`tDvBs5=ay4^ahObBH04a3w8S9XSOFZ3Qg| zL_<1*4W8weBD*hw(j~Lw0*O4IzPoxh5 zuH%Vv1O8RC67rvOk^4u!e`DeQoQwQFV#TkM5&zTL|JCZhP1pMQGyRWnuNVK3KEnN4 z@1EDfMuQV4005>feTas+-`u)2G1_(}^K#U!rcz}<=)MQTOUrahB3FvW&hEkph0Nj< zNz$ZRi>auMEGBQNy3&}>&ymfOABGxdjuzeSy{ zymo^EEXI;WZ{_3~zTDV+Z9RH*v2%9iHLS4F&mJ!se>OgdhcqQDDaYTr7$=SnX|2%c zsu3q$LmOg2(p3RcQMZK*t86(4o6c)RZt_hXEa-X#h{$jG&=RCf`k~Ee#gF>^E-OIH ze7cN8BEL6atO~h?r5edb7);R~&XHY|v9=s_ZgxB<^5k5fb)(>YEpW!R)h^SwPmW%+ z`rYzoVf?w@l!Ex}Fl~O@(%iaz)&WkUUDN|7j;&@Ef#=KTmI_e*LKX0?RtOA0FQ4!} z*tsa>PU+}LoJui8&W{2eU07{-kq$Sf(58`8B7eXPa+jDKQlWEylX!eba6X9%OA_ zKHtlV6@RPM$|Krv%Cmm2KJK2&{Rq|;A$<=`+^KUJXqHQyUYBOEHF^87+?aEvSQZ=M zlxStC+44>HF>9j0Nrw+|FLT@hRmp4lxm-I;42wCrYAtn0ACjv%xV4149dqaL13uX2 zL-vQN^5ef7s@N=<%J)P~aqxZ`7G!?RoYjedPpDHa1u#}!gejfWdTNxgK(8hRYFWak zZIH_6)$b}5wcd7^ahmXSmCA}S7)jt4fGt49Pi=ZIDx&4cU)LQCWeR?2_IA&pr5n#C zQj?Vqjdn7f+s+BR$OB*e8ggQPKD!bw(x=}`I6xmtpQpDngC(x)#HQIB#Dt;&>yGIn ze0X`^iEjIJ#j!^)s8hTw0Y+=y5!M`!8ZSEDemkC+wft)G+!%Mj-ynlW$2qL5gI@se zOUnN)s|XN$@cYy7u%Oqi65YLt2MoKW-#Gg{WsK~bp$XWBa%1ncVsF*8Z)TGWK`0G2 zG%IWf%fB1eCU1cY;y{iW!y4WTf>bpJ6t_#6>7sMK;d9QCZ}%HpE~3V_-9M8st|ylP z9O@@3ud=A1Zkc>Fl9@}%uZ-CNa#)hnN}Z3vjktJN8l$DZiPyLG)~(~mMfkoW$7@eG z+)aXYB;RKT@u?jxOFHl0<(W6-i+GBDzl| zU~RTLw7Dxm)=(c6g6$O-3GY~U3;fFEP&xaRH;vQkLEF{c$HCs4(=pVy#OYGMp|0@X ze#I@<mxG>+8r+!$ z#5PCdTb8DU&HN&(O7H6zYBXz&?=l=D>7(dAa>{>jF+9#Mf5d!FfRCQ3n~UzJ=&86` zYkE~QhRSI5K`Q>p*l>QBk}EyA9&<3rY_}`tu_)cGFW>n2bPV&E+k&3J_MEvx(R7;` zN%8xjLZ%270JZ4z~O6tQ}cy*7K|%Aa1BJB#5wmErdq z-GlL}aRDB$fBZ~|AX{Y}mdE>0sQzx@XOLyA0_F|#Y9|G{f3{(NAnf4M51+c1=$(2Y zaObJq3wcP;v&D%)Cfy+mW3isMA|xw!;z(}pm+LKnv;>9)(`pMval0MbGJb1zt|#4X z%|DblPoPMQuma5*8znQ1NrVH|8?1g~py`TIMQaW`g zE8|j+L!R6!FgLL-9TpU>5jlcsf_p>VKWdmybe2>{DI0!n2x3`fr2Td~c4efzb8##k z^lJ%dnSsrJ>VsYJi{{05e4vnVprleiiVCj=!-dvM<_jaZ$MKQfw+D>Az4pp)7HKcE zRE(7AFA16n;x?--DPuRu7tNnK`ShHOe5xy$*+!F7RT%=|fhm<{wODF@MWAFl;TDWR+UpOn~lDK{2>fNhI|0?Wd_xwBV6yR7Z&Fm?69F)yNi%awCTgUg> zy|__87Ks+WCwe<+8lsz;d+ccN&dX*~<7Dse!-HAxtP8F+(9?`Z^ZAhO=$6DDVM zU>|zC+ccyFco=`su&37KH3#1N@OuJzf5oJ&XW%Ek*(H#Bt({E55I;PIPG~ILT!|$v z3r`rd7aJ7=2nx&c7_w zqirDzDsUmzW|cAZr@NHU6_Y4wMdIHxM@=UQ!wVykns}u0GN*6VczKX(gusx;uiCwh zY0@@Zc@>{X46rn!Ddd2f_W1KY1lnB^!Wh5&Tl*pj1w0jCDLP^AfT(^}q6u^b6LmQ+ zV6)mpBN-s@^5f`<=ZlaLeLRWq_LYv_m$!llh{v@s(lAyZ?kUVvJ}>=X4uw6{kp7sD z*Ay3%gdv?^?l5;6#P&oWH&wMo#;;zGu9X1G7h~ElD2RX9*N6Vawlno*P9K1VRtE%6 zwXZ8SOri>pgUAUoDQHuVrRV|DJkE3Mff=J*%P8C=u&hS-*vGT^g{M z%Viw8{b+gIum&qdXk}F@o%^rIUBMz0i26;Q@v2;{=GJ|qX_Lg*!=GG5oj;58C$V4o z$qNd~2D{z$yJI4TN*-1A-2hV-Kk51PO}lo`W2ej4gXM~Ju5okL$fiv=UGw2!k&Ou? zKBAPBQ0q`FkAan`hVi$V)prw~y&paa&SQKFfdh9sSro>fV;S{!87Y`r&k|VMl9U5 z&vQf^(^v(5o(k*qkp{ z9kj9R`-W{nG+YRMd6;WDKYjIeGjr>qYo}kfRCPJ=L+5KH*Ec zXQEuy-OszN9Zm4mi49Tym{j;Z5>z!Dkz(Y zEl4udY-BPfe0Oe8tiP_r7ePlSXCUGIGRi3~I6?PvGCp4}greH*i8G~z=_R>B3Qve` zJMjdZ+?_-n_xf1}_7jHk(6oL%Lbo|5w68L{Wt&#vgTZ$fTQJ1hXkED^{(Lb;88Ew% z0Vkmq`82TH==u%@!v`bjq=(XUlnconwfRN`cO|*8$*q7Ng3FP&Zpy3`A3bnYet^65 zlN1E&SjJ6x6W6|KBp@$&O2v3@oG@ZJn+^Q}a#&3u;Gp_7e7o{(W)R!>%dgKg%`%~q(e0k1kt zt)8ejM$KHo&3#dYa)^0&%3zFAJ~ZGg&TiKsVNa8fD_fNNOVM3CU}Ut+leAg;uDVba zh3A`0??^oF8oVH^XhL#r7IsCQg$z61CXDER!gd;)_||Kyzp`c8j0CEPt1qZ}KVnlk zasvSgPgAaPRq&hZ((31fv(W*RjM8|&GHH?s4S5NhzGtV$aSTUg1CCJU-WnLrWJakA zr6>o!r(DLX8k$9rF!O4ql1MxRCuFOfbQQfijpX+GvZF9Z zI>VROWnG(<^byP{F>H&J z8qob5^5rHSA3lF$EvdXSH~HY&LSh14O2e4`GJ!N2Udq^6Skfugky9NKMLX6po7h{b z)$FwcnKn8I=j6CS$n`ikiU4zYLB-K~^py~MnDea+D@6N%Yl*8}LOZqnwIc3gV|VT9 zmfeDn?G3Rv^%Palsx-z(GaCTpii#`KB38OVFaUVa7~!o3ywBmvNf)7cl8AT`uOUn@0`cW9fVP{bT=I0D<6OFa*sHaj7ti3stBD41*%GV?H zkv~iBF6D$Gam=`trRK4@k$l1|;Y156X3|PAcjyuG&1A&F#V)a=p3LD~AGM_(8*J@F z-FGc)wj8TLZhbSwl^@?;H^0RT)ifdXMkh0~E<9$PIn60NgF01Mg!2~JM>SrPH=sIL z|ECPY43VL1x9HnpHsAwBY`qsMk03HIZ%01}MCg3zfvTAR!Ih!v_TwuAHLsoI$s6d- z0-JF>V@O&4DhoY&K<8}#uHWizAIs9&;Ei|nk{@Wvck$$G{2oNn0UpjjTNHucve4Z; zuFl*5)7+;8FsszWLZ2`KxB_)nQG1s@Ib2LjeFWIlrlPxH;($&gKw~8d3v~lqX74<0 zV5?S09Rk(($?0pheEh*vzI=i%WoG63BsGlWgyPIw7JP5!ml&T%77q@7_{ChpE-}W=fMrNhxNG?wV)1{b|dsf|lS7Q3Artq$A zd){+JVKWte8D6I*p30|gZaZ@s-CsooG3-)6vz2TWtDZOn zo}mo{dQL)<$$dYV+vBD9XUfo}v6f@Uyx~2bXk*9_ll;VM)gb#(s^8+@Kl-0J53Rw( zKsa)aVAYmj+wdc!39{OATDWZfvhGQdsLELObEZ%>)%?Qexc+gi<;}iZHKjZ4-_3Hr zq^QG_{mx4zZGsUb`EAN%hdaKCBc^JdX^ zX@!sbMvAk)irgF>q28uTW#VdTDOf+x4LqNLwYrl&683D3^OfU6Z;UJ+b^YjS35IaH zHv7?$3+EP{%KN}2D)rwJB;I=-zYwuImAkQrrKDS0DiavHJ{rsv%&zNHNoZ+|nbeF} zCo6BL24HSnOv;Zge(vkWcFaFCT!NF?<2r>^fhwy1xR=lsXpqS~Y1 zV&*p(svginT7V+(631Z{Daq#FW%0t|WQ8s@3E~guwIApAr^L|gE%-tJ@KZm+k3ASC z&ZvjO4c2`-;yfQ1$kczl?p*kJe)fsKI-`K!k>7PLoMB; zxJ7SFrDe=>*lt)~AO;sq_$E#f*OI?(JTZ~jW@i+sO&`QK`s%YY!|$kxy0tGn0s1ld zSC0YYjKB9{=MBPcF1}Vu#F4eSDBZ^DrSLw*8q%D^lwAFsS$CA&NLd!}&*@ks%%5&P zo#Hi-71=k@Hv^jsaOi0#Pi0Lm=%ny(NKfV&KWO>omFt{A_s-21a#yHTRTBXM^Ln1y zw4_*R);Fvh_I22@EcjYbeG_n5IO9yC2M#|zQ{TAKM7OH*uZq$x6gUi;+@EfgUF=xr zC#VdR{%}O){h~;rB%%mWvq&4{;P9eGN(+CGmrzp=6LEv2-`g(No3hQ5cLZ|p0~ zFwQ*M+v!DFmyXgyV~M+wWGOXM-|d1+qzSH)(opERjb^@l??|RP_;_fd9o23>CjZL$ zN_K~IyO=7dw2V07i+FIwN!=C>|5xiQo+g_HNH_@+xe?tErspB5@#=ec@`XCk^-)Fb z#778O*tjil(@y2bK3e+OSCRSkmNy#R^}fz!MW=79&2}H|<2q$`JY1%bpMZyuht_vZ{!e86G*}93H7OYIftJ0MVk9m8705ip_F-3K04D{=`XDDfS<|Kj1NIa zF8(Ixao{hMLlfoZ`ID(e3%^v@eiIY%)vtVY4y$mX8&NuQWYY7jkf~|+oPe+-GBO^y zsH2wXPhSL@C443Or9>uMol6C=-!UxByT@9Iiw921E8aODMkZlws|S_S+rcMwdmlIQ zzT|`OGc{hm)Be4WD@GC%rmv9>3V`Evd?`OpFFKY{FEOg{`Wz}>l{+)tXq(SV2-$dT zeDU_q_{NzFev-0d2(;tsLz_i}ds*HWVS<)OZ7jJ252x29E#lRsh*8x{?rk|fju5zYfNJiWGjqN`B|z;}o4%fd)3VaC?}#W4|Jhj9 zYIa1~dNUrWt0}laW)_UD+viD4Rk!fO1<}wVt$gOcA6;e#lLtPKKI06M{x$sDZHvDj zutcxFXU-qc3g~ACF%3628{5_eq@%X#iQGDe9~IlhB~zVvs&*`NiQlT5gKzi@LA^iR zO=)72TM8)`Jv%ZBl&ZP>8QO98JHlIzDx`J|L$G2yFIFfqF41I|8Dv~7<<$v!4YhkM z^?G)U?+&jekMO8cE|S`5(%)5LB+wVbdbXri)pYTtV4{9IrY?KotJNH6{q0%2LK6^ePRD@{%t&zE@vZ)c!({aL-9{>O&w^Y@1(Uh0tHL|^O)YQUK%FD@A#Y;ie#LL=*2S_R?K+NyK z`xn60)WwL{!`8;mnb+eR>A!G!|MveGW+Em2mxzn?H`4zhr75pOENbs$O3cB?#$dwC z!a~f+$;iUa!O6)&Pt3~9!pg+__vB} z!o|gbmx;;U-JQ{$jnUr8oQZ{phvy#*R#t|;5)96sb}mL940g_B|3(lqbvALbba1h> zw0b;+OG_ZHsF*Ojhy*7avnUTM z3yV0LFc-Io1dFJ+un4C(54RZmzjejzO^I~SJ!iub>|!2iyL^}p&e{UyWn&(i+?mipgAfAi;`?tc>Z@56sm z-_-7JzB~O*Y~a?c9{`|TD=j9h>alj-3)Q2m;mX+eC~zd#?HqlnmTro%-ejZYl-Lb2 z#_fhGDrLcf?D6gZ3WJOaN;2V1GfEQcuTO0WK2GLOh#0vKfWh7a<>c&;YNOXlTBQGJ zrQX>qm+$=OXIZ(+rsHc{*c#TkzHxEb70Cmb-uwgL zcFzXe*|5Fjgc|5v#|IqQIk*33qI(L&;eRGJE=<7+koVMBAOY?Bjfn9Oq|UpOFEHg@ zkSXn`16p;h&8orO*g}sxI^B*fYmT~2+CSmr^1!tBG>(O!)dm`W?WV`<-U$OZhzA52 z#T?Lyx#63<3Q#?~;rNj5!R~jL`NPKu*q;S&;F(EA^)CRwYBpQRcgvP6QZ;K^xdLjbO zZzNt9x66!AKrpQLoM)kV<9ev`JCH;{{E=2*wA<`tuMF=FA9jZ|qn zmDT-g$JyF#3gjBTXR7=7#X4pCQ{sZ#9z-&a0-uYHA2ioc-B}lFP&A$*SeBOs8eu#BE~e;C)_X5}~N;%PXz1ZaVB6pnIY$0L~1Gw#lt8b<-wflEQ$IPr6t z%h)B(n&Z~KGk~8gp#5r1$aFhM>dn-FB1)5rMi0n|Bwn+RTcGuu2VCkq8)HcY2s3zA z+&X^Rl&0}1c6a64+sT7P3NVI3+7^DKGr|UytVmS71pvQiSaPIhi_Hd|iBjsMM(lwR zdCd9@E8gowj}M?iMU2*g3M?lGbqhBUuQlyb>L)Xs z3;U5_dR;*aiak(e3OcP1+E4;z_#JC&Cb)(C117RFJEu?|XFor!2lgf;-So#TQ`ZBnBO9YNhzy;xNN86Hag znT$yRzL)jk49JOHPbz2CyTj_ys%|q_j&l#a7gMGL5?tqmL$%nWkClqJ zf8s{1>kK}uZGvZ^QGbak7f_S?B9XR{sl()s&4Eg2n~}_RIx-A|n!|Nia15-%Q8dc| zI81~hGo)hj!*c#uR`U+U2q+$*vo@N{TqxBC5sd5bAz7|8tw-E;_*IHcRT5}Q0EvsF z5S8$&Ve2Yj*XS_bLx^Ie^?GEZ6Pe;{zS?U6?iDx#aV1XB8zTvrTOqQg+Vk+J-+i;9C%&jC@FjhsH3bz-%jmsTRcX(QqLy5&;X5 z5YQ~0fd?!sZ?ZhHHMw7tP;qn~ubu%6-R$SzLOPVgIEJra=!4O?MTuW2ylgUeC_LppVqZ6syL}oS`W2 zG~2_sHsmfW*31~I1Rq$$0?~CX3~;5Rz(YT*${okv5u;1wJ!@8W#{x+TB3EHs+Co`=7_YLL4|HekPCey?ZH;;U#S# zVxfM6mM|WkG?9tjWYOMwU_S3Ib?REZP6ZX3?c6I=XumsmhwM6Y%e=4k=b1jA>*NGUmL{87pLba*nyX}-NmH>X| z7j#z|j{nO0WzJPV`Ml^TBXYp!g&W{_)~)lwD%fX^F}i0Oeid z*lEb5rgLEk6XVD(9mzXoHF2eWca3#w@>HBO(Z{ggD@0 zj6Y_rCi#XhW@(xw%Ed%@87U1FW2*ua-jEC)e7!uzMla^S_2!cUZqu1``!8rIx&>hL z|Cr;0=gINx>;k-{2Rq%#wKqe6N|_EBB4DCJrPdT1E|Fk#GpO+V+x3wv&p#9)1Grbp zKpQG6;!h8*7jHMRe0dnA;p655$#5?vIeq?kLQsHbBDXeHC6Nquk(|a=z`bG^326>t zRfoQn;C=$H9ucz5@IuT<0b0J<{kxrK1D0R1yJmH+^QgxKIVR~F3~`a0T?!i(N(sWV zKJyra8xEO2i!#NOe2!g)d7>+s7k-+iR747|p$D)Vr1TcYCMT#O8+V4cy--1{SKApSHUA)q>ZcA{HCEg%= zpqt2ZSDe8>rn|5Q$3xDcz@{-c?wZ#-7!C6I; z^*{t7!)*hB<~y3juC| zGM?NkJ~S>FZ`=9YxC+?K1QmkZZu;4#8_BzE9+KWUD!+d!-a8|kxYFt;u-t$hsqfT8 zSrSIaBr_C?mz*&2lnz!L!*yz-oZmy8+g6AirMNnvdCDGnr#a4C*Pj%a^uzHdN%zN2 zC9BQW_b?gaqQ-+`m`Z>0uFq-U&5>oa;J$MXo7|oZJOf4wFkzYPnq};r(-8W0%{=G>_CVUCP;<$8;WAK zihS%cTJcdEWaxv4ZYh$0TIg6?A-BXU+*pbjD~=61&kap2oa?9zO#m&$`&;K5$?@9{ zS;c<4F}a}YLr7v#vzO7UTIIbO!Nkb(?u{0>NY06vBbGZ$6PJX`@bGxqMNt{=DN~w` z&pC9zz&}c=$6wjZ;x8EF_KH!S4?k{s?xB>aldALyx3q(Z1oehkI80={3PeV*>RX47MR>k$YuoIn$>?(zkH7}2}}BA0gAwl`;&HZlcD?PIhtG-=T8aE@?Q1t1kvD$ zHJHuqyEy~{>3slK9?@n%l9urRv=1F){}pAT=B=U~ZzFpqN&@kXEF;!33km1r9Zs$S z@z7G8%+LdtIdLv04)OgHvy`CPLmVk6Is?ir6?gzu@~k;j^h(?hM-+tE@O*}WORS&J z>_%3Hwbbf0NRTxq$=Hk-*AK>r6?OP;i@}N?zrZj+u+@?i~9Nz)$#(wOddUSqY6Ez^~5v)S-X8v;9dgi>K+}bT| zkt>(F5(Ri=#Ud`l$-$AXtAz_X9CFX^}+t|AO$1P_t3KI@Ja+$a%q&#L{bQs@CYx}^!2 z`E-u4F}J}sQwEpx+J?~B^6XT|`OGK`g7T6i7n3T)o*#W!Acso zPIEhOiOJNp;+5&gQ`y?w@8$x8%wOT=T(+T9M4q^hHtW#<{7_WTx+pR{V!UT5&nnc6 zWJA4qld$t2Fx{_VKX;F|Kg`D4+=qn>{DHr7STGql!gZL5B*q|j`P}{B@;r`dum>U3 zgu|*+Zn~7XObon-1|iN1VMUkI4TYx9P6F<@Y69u>-Enk%7E8x-81+pEYuAcsfKeZD z;lYZTY>IY7p&ybm&~ju}-0C)P2Xq!FZxpdb*bjrc0rWa+43pto?bdhQmG^8Jb<_fS zyu@qGb^%^_!|kwkI)A6P)N2mXi)7>Cr8p0+wPFr@pybNOheZXqYY(N>?ha z^qB7#kB^+kx(Q)ePlRD#eP@Iow~{jhO54cj61Pers0dV_6~XzA&qV7EZDn$z7?P9t z0;&ZF6MlyfM+5bK?;3_5hZ;i`U&Iw`ARcaou2WZG7mBuF{;y|WU{G$ofN@2SQJ5au zcqEWE$UyI3)ID_phQskns{!mK#Ph3=cbLC|>GZu}-ZyIPL)5I(hNTQpgmdG8O=iAI zBHIoSgqxf}MJr?WsS+*D(a289#ZqNTdMF5J3lPx|_``GK8gT@DXZvJO{aMZQ71QK^ zu%cxx_s!*Pn&jv&#zYx26$0pimV=1!BdKYtGF*KPTq>FqPOQ9nNNWuH-iE zv<`Detn~$O6`s*CooYCu1q=70Yehj{o^y`~|J}aVx-7Z|8 z8`O6!Zg7(0Zg!Gx2}DueDbWhHUjFbdw*RODMu3W!%UL#wbNm-n+DFdH!UVeGQfDmcniY^1r-UCVyT7N-|Z0< z>I2-|nZ`za<-0XyRP}-;d4&_!EZ37Zco)}_U2k_^yvx@;u7Y;=1S*n1n}m><(4=9> z3r7a55JO307!JyV9@c2Rh8UrCyZ5?i#x-br-?1~JP4T0FopEfshiMvYBCo8Xwp9~t z+`~QW{Q0YGKRloPZNd;N_nZLXf|2hna8wg}D<+SM4PD>yf*oMxJadMX1Gl!rOq2o= zeGm!XFOiJKlGk^Z47};yH+1|F!z8~4(x5x|;e#8&-twd%jk}#o8}2J+769Z`=R)Mi zX(6{)k9Y9*ixov{m%dT}9#y2=;Q8LOt^TfBq|TSi^O^UPE_jHTxF9Db!=vGnFlB{X zk~jMNN8;b4R~pKq{fldh!D{DGo^QXN)ShR3<8PR~xC0OglQh~5S%Chuf8Lbg+xdfQ zBZ#fTInFSLC^YJVoM&_ZShn1743lohCzj!Lm+)I4v!swWw;^$O;>0@Gfq^W?-&i2|+6V%DXPySxvJFCdXC6qo$1-l#u;cPDrgo>= zc^m8(QP_Vwgjl4I3wT}3=)zrnZ9a+cF2Z!qeosSNe}o^t32bsyp|KTpt>`Jx78{j9 ziA|!#6&~?{co^IZlrh@wcH@7HEH5U?1`lbb2_k!xCCBXfb~0hAs(Vq&u3xbC%M1%c zpvi@x#MLsI1Jz=J;eUQy5U&fk)slyqf&EE6a*edo!&{EDf|?? zWP$bAa($OE#``_q(%_U}HzA{DJNkqCgaCU(pXm1M^f(o_a?L>FCkr+%-CCo!Ctt|f z%D3G4SwHZBA-7{80*{+j+Xk0K(7w}b`_2`1*4xBgSy;Dk?&z2O?tDI9-7|y9ihU6d z@Ypdw5+rOyOVY5LV}5wx<{$3#y%7ecBjN|gZ+wEd?V^v4dN4{jn^LR!tb3?P?#f9~ zOObtihiu!ch}4DTUVcumWg84C9||B%iA?W%oUfNIoBnKf@m_y-!ITe)funKiR2mB8 z;3aP?xL})Qn+b-SJ_)gM)}K5GcA33YOP~X<+e!bHuXR416iOX~nbC z1-t6HzrT1swfCZ)9DP#FKiOKeb$if99^DF(Nbv*`*{vA zSPo~`HK{sel3#J;RYng|DuL^oLC&}$HyUh{9U?~yLSrSnm$6DD?)bX>WD{QRf9U9O z4CU<@6C;jq6)S;NcMEOx2#tQT&0M3~2QA?9_U1TS7djY-vhpxQ3=gly)0p&w$#t)a zHhWqz64oOH?%5K3d8EwarlnUeOT~)BHf56s2=RkZUWAAA$7*T56YuVu_y1m2P%%Mdyj3HJ#Wc!5!-vzp9s9{v#)}3c2 zH`y2h!|FIRX!nIBgc6HUa&lyGi3F~HN8BkzQfjC}E@m_89_Ox-yR=a4TwHab+KrgF zlt6#I`V)mSeN4q0uJ@(a^bZ_bE+vwZX%?5UlsA4&DfSUfcRO(0!&4G#P&cz2{|;&e zP@Np=n1pyS(&m_iIwJ@#XJ606kARB3y099K`(3InZ#&Afw%%^DUYvwhwvm^tB@9zf z<=wvH53(4b_Qoxyv(aENYW1VTc7A`(=KI8HaG3YVSPx1Gk&( z|4F&h;0WRG2mXMJsxdrFfsI2WS}0fZ2hTS&D_}h_;d}YfQeV=E>ahIc2&;VZcE{#^b0;S$K`M2Y9IS~yF*gvi1h4Tl7gKZ2@yUAZ?>(>Jxd|Da`4Nn2@HGQs% zyF;M@D;_tz&r|E$P?&O)msOosl>Xh2qU7;O0c4^IdMw~fPEgC2UYT)915x?T2yZu)J7hsScF2V0zN(?`P z=ye@dSFfku1VG0W;0LG#o{1c0+S~TVY4x{8wep7=uXcGlo-Uhr^@yG!QsijRdy8}E zqo}#iVvy~N9ExQJ;e8Bo_?_55D$|nOz-aOL{?iyPOa*wuB?Pl`Q?PP^{ z&u|`{_2PUoK*%UGAu0!j4pwbxf zkvzdyZ?;&D@x}*tG+|`8cT%H_Ma6Ooi|$QXfGxX{bFZitC*^a}$99T?L3#A_62)Z< zhl8@=Z@a_ z^qRlaW=SPTv44IOesK$jDPO;pYZfr(q_rDJ%Bm6YS;)feWsHqEZ6B^icQo8i^la;K9C&f9 z)9*&b|FtI!Nn(}CjWy<>V5ilIe1tqguf0ZIOU-(?UUs4&(u^}aeNqBaYT%TH0(l+& zq%9|x4WWn`FugaD4n)m!mZdFaqfuxrilQGOAvEKgeA&lE8V&-2n)Bf=K!ITs;_uy2 zFj`CY-n1cY!2921K3%8xJ5&&jj6%c5qH8X^(i*n0+2H>ov1^)Wj3AHh7YWk>;jtq} z^8F~Tn0C1Z-ERAuzZMjHM!8;o|%(dU}?#8DczK>+5K3y?3vdcIAmK%-ue?-E)nIyIt>Vd z*Pnle`&bMuB~w;FmKm_T?Lu<^b=Lq{TfhAl+&-jb&J@%)_}$~if#@D7Mi`~GaR77% ztz0-{@L+XXg+pjMgZF@X3+viLT?PW1053SO5Jj`q2ZZSv$^YK$`99wl?D2AA#(6Hz zIa#D=oKKDMZDH;-;DCmTxeEvZl`t1*nUz>sQ2yt2f9J_>Cp^#?!xIrif#fKk$z^AiBp4zA6AW4FZ$qAg`p zQ#H=ZNDlYx#B4OPWDOtmc2jmzC+^2$=K5-a$YEg^c1Tm;1aK(j2k0~fh>~)bKqK*V zWr+gZJ@1R!jeaS$DpX#)Cb682*B?A4c`ja7JxCzHZN|Vwo|Y!!tI8iNO7ZO zru3pg7q*ut420%rwiN|MCjRQ|Y(yBFT`yZTRV5$EOpx$7=cB$9V<_0a=*uquLHX3Y=G<>7z1Hzj;yRbxO1M4Lips1D00Y|`k+^qB?+>|L4^7lRi~uCx${lY zLXC{OhN6Y7G>&8+OW9o&b}m-cu96Vsi8z7FEMLAx5+gWVPL!XKVM3#^02FXS<}n7R zOOFhe6Q#)OL_TIHx+r_&Ht1lc-PFq_r&xsGwPNv(cB)WFcW@Uh$|scc)SL%ARsoeZ zQ?65Nznn1=k_|#0RxEs!%30;t^D`52lt9v*lSq`s=~YqCLSk#Z2?+w3=S?6%u(kT> z(&{@%FHTHT?!uqW-^g+Uu@j7Y$*p4dc{bpGml%Ba<_Mpb1)pz{QXECim5=sl+Ri%X z)7IM;TlV9nztGOA9#(ULi6j<7-TfAyIw1lJ9k3?W+0r5~2n&kbh@5iY)QpS=JwPPX zviWrIy3hiWaoYoj1~V(%l`q+qFDqTHu%I2BjEFy9s-pe6A3`e)e|$%q)tx)xC&pIa zS3ZQVp+YNcg&L*bMfE+$p)&}^M@C5aA2)0x5PX({n_&lRL=4hoBG6minQ@q+6f@ZJ zr0<({3u~?vCDzS4-84ff+PGz7TqTJgO`al@(NO% zr1X-Es-k(^ClD>^q9&9`%GqTG2SoMe&?@1L$>LHoF$XWtICWR|DRSVF<1kZPgeGaj zw<2IX!7PmU2%x+9N@0c*^+_BSrM@3FO#du$kYwVnd4`U1WL^1H7cgmuIIi`h5gzi6 zxgq`m-JeUW35^fRsJnd$|89VE`hd;a5`%F|nSe6n^*kzkO@Le*45ms!l<+0oOmP*r9E)&LAf(KkuXhc zI_@U{m9jC+>*| z<|Oul)jK6=)8haoUj*;mLSw~H31p((XezJMY*YvSQseJH^zUg%AJk{FbLt<`U`oxo z=`G^Y2%q}jwstb>8izu)i-H1F&cjHm)7v8#C2Cpq(Am%K7M4YMfHf9wgD9N;5SA>j zf>OWoXRfFRgX|&@80MO29W{WC&GX!XjYK^r5%!5c^aq!xr0~V1vH{0nNcK}ZG1jNcf18#J5T{7 z*6N4mb^1v?cFJ4Cd2TZlj6$bkklSiDPLA7R%56*7kYROYLDdN}Blv_5kAQG%ck(S7 zbNI!2nH2eF*{kew*)#BcOJ%VtH|%Y~j}0HnJV#h;Rg?g_hx~lC7Y|Ya{|G$5^R8>R z$Mwu3@JM1z?hN6~xwMgU+MkQlri%tU`+Kq(muzS@I?tm#{}Lyza_cOzx`q^aGNM$r znX^z(jgiAYE_ic(bGDHH>985>xl78^%_0BIL-{c2npo!u;n9N{`yjiiu!`NtqPGkF zAQC9&2^40*a4d^Ogo5v=lDAkm_m?cGJ^ce)< z@PNSe_pe?LGPu{5UP2#+OWB|ci!q=!J1zck_F52Rqac?eL)p1JHL~0TS=W2x zg^hQ71g_jH8qXYH;yY(kWMh10JX8|hP|HM38(gsjI>tV&{zc(CgO)Xx0FO2ZZ^~TObNhF-7o*vIO(jKrd+pjB6pZNbiTa{J#WPTp4-y9kkes=tfvB@ zfuLWpkDDv8mT#Euz4E!qU0~sg12IiKP{?i0>4XoA;C%k`^#W_N{YrljHb$J>#AmU` zU;x18-h%2KiyNK|W*WfT`ZU8nJrkt(_y7_N&0E4q&Q$jQbpQIW^EjQQGOX}NR?f3D zAJbEmH5m{4`0d?;6-VR&vUR)VPKx%&Ar=xjeQzT#1hijw16@sNMX%>V6EAdC3JRQM z3Z-AoqPpmm*?25~tWge<>f}C%moi~^?H$}?sN9AB2lQW0Z!O>jUsZ9GfZrPN#jPnV zM{Gru{zT7QVx_Cp1LeT4S?f&O*yCCn>JZk$8U6Bj)l0vpCtQKEbJt zp!^1HilLw&%}DvAH5O8dF|bOD3PBlyjbWPMp@1Zpb%&XJX2-!})as-6qo`*^dr*QG z3xte_xCNLT5mPF^;9rRiN=05`z=`#i1AX6KbP3c#>ZaNA`lS((S-{gAebR3SY|&VUQ6y5r6F*ZU#LGI+a3IZ@{*VFl zyFUm!B!6`m86rgoQ>B^;lMM0^LTnh^-HnpsmcT~~RiVXvNrXdx0g!Ntxc&ZW*}+U3#(VZScgD)=VrWX%%Zf}WSJ>vVKFGPXVw z?k(qNcq{zMI;T3!vv_7cr%U}%=DLS%odpsa?jVe1Wk*F9Jv!nSG#D=p)Sq1}Dk&&K z6Vd0KE>TS82RzD={1kK0#5S3FwDya#q?%evPej$%lR>!d#~}xMK}Dq~%7~^WOQi(2 z&6UtjzZFC=kxp=j^Klk#j~!&zXsA@>)cD>uz|zOq-}$e6Jsi6bc^1*@$Ti2;a~bqn8xxVevsY^@=3nhWWzHEZmypJ{Mk?WM&oe=mgr9l^*7qNEopvrI9;p;;Lapa1e?tSLN z#f7KpqdlF;82xR}-a3?EZ*CX+sq10Q$)l#3qua8fA5a%ZG~bJ>N@+$%Vd%}1c8WuN zjzd2h-n*g=J9POe+<&U-ajJau#koMXed`UMX+)UeFcG&O)lWxTw(T?kJv@MczLtN9 z3iI`T9PB*OkKJq3{OVqsMr-OkPp&oI*uaxmp$3->erb>N85n()e%c2FSc9U1n22_U zq-NfNjn){BlWz(sWhp2>|8gVL>5Gd*;4K6(wsPY^>w-9ptgI+6>P*W!ks6*IhSL0! z@`@|;%_2YjHg#mOrQNEo3p$hhu8y-DI%o{z6^|cgbA*vVM9AG)%b_^yWT%kXk)gEB z7kBiBOwGMS50c=-e`9UB7Q_6dEf*6;GJnX>LRIOhsyG}`h|)W_vrf8({#$FS{&G>^ zlNIIC{x58BU;(#fAnl3R;@H?hj|8$;AT%Me>gKnuHS9 z%{0L8Q?-H{T2KWUN#l<%IiuGb>=;_)Yd6~08y61_@#5W@zyeXPJq9hhp0~t!uYKhB z*b;bimd~yh3tt7}+m)i#%7JSFESkjNgu!u$OOUTvFx0H<>K6Hj+wvTQWEU6Sg|G3w z!dIlp4CVrtnjkvctaD#drEA|-UX(Xx#UHv0{S<@}70!ez~` z!prvJ}t)JivMUz>^ATJ8~55 zW=bi>v*4TuNO3w7^2_s}j5Cr;>S5`k&oR-L9*n0yPoWS#Jrg`1xmXPsp6OEL#C-L+ zCK+*@>bqibyYt`o@hF(ULGtl($z(Ge(#tWIF}mKl4-s7LanW$`jONSBx+i@z3t7y%&hLQwMO{me#@umclT<2UIA%9qf7cCO{5km>fBLxQ7`9|b10 zVwCK^Zli-$?Q<1Nd?Onlj9R2KJom8gfQok1Y>(hzfw`;Og&om_O`{itt6IdTqK}Y% z-f?-Z4pn1#x5}Hb-EQ{2)=eBqnb+26lQ7WK*e@!QG7&M^AI14?d2yYWWl)!rHc5BIOH>HKC+7hl$%H*(^d?EO z-R!H2uF%(3a%ZTTF^nL)Enr3q50NU_isv)iri$oHa6yx5eG$f*u@}&960o`+DQR_Y zLu?HSN6Z*xI&dU*)b@}_RS*;wf~oKFIaMdST0wykt#W7kPuM16e~yIwQYQmp={y9g zQG=#=uC4&IaUWG`!XRqUUhzMNk5V{Th5;o^jGYC_IWX2}vU=aoG-ePY&g%%w4xzJ= zG}k+u5)aCN(9vt;9Sd&WF3@#;QxY9V`EyD*cpN)m&1ebLt_v?I%^&-Q+3qfl6Y zbDBig(HZP%&0@31!KH{!JOCGR#K(dXA|r? z|Cm$_H<^TwNY9n5x*)Bh7-PFyl!(7jAo$@O1RH;>FGc5fHtdj`DB@#X*QJJAhKX`o zZIX~g<}j6Q7XWqjjtKhmXu7a)3+Gg@ zu&U6DkG@~un@W;D=H8m55W!_(Qz^Dt3^_*XDpHl_95hlaiMRCMCkQcRmo47jxFB4(MVzLG~d(OqqCC(pj z@m~bz+qa+7hzcs4S>vM6IxZQPi-%E+3D?R)))+!Q=uPY9>qsVl^uF70gTVAh zf>57Ac(RlP8M&PMfit;b42{~*r}r5H$V@&EFe*ec(KH@+N8O_c97VuyNKT|cYoGK~ADPgQRYl7B4?>Q}!#j$;MiIuWxqohur zA68oWg`&$uam__H8FG3@orTr~BG9YeffqU97wuosBYF$l_XCBh5 z)N2w@17xA%VB`=}h-#~>H{#5cJ!DPzbBbtk$%Dk7_1p}2=vCn^dQhvRRumD-IAfN; zVHO87xAntD<_YH{jCgEB`CBwwhq+SCc+=a1c|3_v?*U3&Pgf}G2aqK0 z1@IFuU>yNzJ2w*VCf$chb60PLKIfJdh&%i$dQ!-m)DX2%h4QSy!>NrD`KnVifeJq@ zbz?Xq*BTE|3`HAtJ;f#}CXXs2fMM`5F{zQFi1S#3CgQGQ?vM~`qCvqkB@#Gf2pfQM z^;b?v`dTMFCTG**jCR+C#MFA#A4ze(CaT)@Wc0IARck0 zU0SCZ@KAnZQ%al!o$IGR)#1zFcKY-2jlP1Vc&A-U;hDer)s7|4z|sL3BATdBoZUH{1s5(V*2lk2FT{~0bYp919gxyy5)zTK zS4RA6!7$qkRY9U4O8l~p=pdd<-7rdrOD+}UV+`>KQMd2c*X2A(?RM8?I((9%jl5f z8q+9uchlQo2Zlk^=+Eb7lNV-hSM6;S(jdDJaObIx68FKM9=BUQkY18 z)WHodULmp{R}?jXl}%K0DR7PcZfBQk{~G)4_8Pj5@3fJS=`B>Kbs_|_c_zhJB9l_s zvS+eU2JK;MJE31cnNK7+bNXr`ugr`tk!xbT(i+y|msV8Sk&^RArKAX?_FfyR3~YE+ z)Aqx(*`0PZPuDm`>}mBW~p1KNzaXq#7$SxG$ni{792-NqeA7BBfDS`f%`8>F?CJ zYTO7Kje5YHyV?%9_jwrY7#hYBN96dv7JejYaTpCaYW}8)(cOWfY|E!BR z^L&UYFTp-aij0vkZ3+_^&JeGgk||0~j}o=7xkUcgF4U}3OX^t+GjTi936nY!xUjJt zxG*0_{huuoAC^G*;U?H%6CXJd_Hz_MjdSB)=mvet>_4c_2IhYxl8o`;hzDa}J&M~^ zJx!%CQkO%^t)ALTXv{M#XLbI$X?-mE?8ftUJzk^5_^wq3tXUSZFDirLJa?t6Ss>+t zr}}v1exml0Mu!T-C5!pN!lnXHO=VRj@+xe2d#Fx=77EWsiyGjjdFkX#-_y*okmZOg zZB!~r5>{G|X)}_J)-0H`RJ|W!sRg0AG_P?sWq;P*C+Qm(Xy3ky&;s2d=U{5m8e`xQ zP{22Ew$d#S$$0hQO+;=;(-tCLnS8$cC$>3_lq^Sf%z_4cm%#3g_pL>Nt-@?kllP6V5Yl;pF0 z@@BvTStNxJT|-DN=83HS-6bHiOq;b}h4%|{Adf?@esL;u1J|x6%&hieA>`TqJb959 z8QN%9nfgKPSa6|DGA51(0;3uV@e0eBFuJPV*|asC8Fb^(=MOe>kHYJmoc;86ThIE- zi5Q0z8Fc4i7R;3N`~Y*4nd!%IXe{lST->t~hjr!>_Lxd5yC_O>d*dDsN^?}G&F|_{ z-U7}O2i{~a!)lv@(O<+`GamaAdZSLDp>b8VBGsy+tBgx&vK*UG>}~Sx$omWV+KpYz z7D%zAZrwCzNsYG3Evw@R%3nEF0E|+Z5QMi-(+uOYmlHrjij1QJx5ww+h%jRzaIKI5 zL)xI=(PDfZAED`J`ZaK&HP77*LLBFplC`h(nnOk)v@vf%jkO1sA6ATFNxbzG=cVe= zZKC{;w{Z{HbIX?4&jOWuRj%PERQa4yb#s;08)#WlRiMjpB)-;zfDHzeS%yhvu|p+` z7-*VT2#8G71D$YOgOT9z3_C!ybnYuY*F?u&`w)NT*$E`uDX`M#54gCKG9Rj#u4+=; zv5fWf@)<$g!ULoGdS9*9b6sb-90#|)tFM*LL0_O3F<0(8PTGhHhe%fBMnVj340K_3 z3yhsnX+#&y5{HQb2UI~!q^tk#q`8$5clk^=rq)BKF}6@erP(iK@X^gzByNR zm^RU=Itpth+7g86ApQ~pGc@XQ-+uyNz86(q^&J~bJY8}=;Ori$M@P^q zGqmIi(GuL55TkbuPPvY#B-B&Bf%s_nA427!cE-J@+QL5ghE1Vz@xdyb$GNs1TX&8g zld$?5x*=5gj6*7lsXNysM6Xa7TpwJnV-o(S8X4 z*4g#ie?z#!9d%hjre(F#;u1`==xHp?Hn#ns)kZFjxEEUzOSyTWIs0P!W$r2r$4`Jw zEJ9JymjcI0LitMn_QD*Er;gT&Nej5>ehsEtdgSikQBy5f*oh<;<%m;QiG&nor;D`4 z4(t-I#DfF6L@S<95-+0B0gZ#Cq{icNpAD7*hqGa?{RLN{;`x<>8go{uxGK~|E7411 zLs>Rl4D_{9OZ z>+Ugl|81Rc>-##{f2zmSc>PyF>muFoI>S24Fwm`Ziw3i?{USp3q%mn#G{k$u?@~5* zkdh3PaXfP`KmujO=)cvnDiQ_|3$!az9;Ufl`pEz=Tzfe@=G}Y9fB2Gx?k{CBVg(x^ zf!*LPkaiylVQPhi=^`ZSDzS8PC$N|RfU>zh7`;!%E!!4s7gxMH9bV0U{_$S;)^~<^ zawrrGG$1FRHQVHK?VO-_B|*fWBlc(``|m@ z&BLGkaSyD%JOz4C8DpiTxQvJHbQ8a|Zr%J-H~Iy`2#2n>a;()RWDJm&*7==*iFgpj z3+wwMoxfaEy@Ub#Wx45!-;)u+;kD3iGmEJ+?ssqP_?=6adGB^R9nVAENoL7nL;#Y1 z(332RN&HH3(>Qh;BH2t#P9S>agiieC&0s}qLxc6Vc@FGHqvC&kasYPiDMEMFgN#Qz zz}s%CQbfRW!|k*rMBNmeCdzT>fuda#cpZ}7NX79ay{MQR=dM_x2IEz5QZ9VtgY)3l zU+LsUz!r6*k)oS>YNEfX7O%JV#*BwZETzsEj=(@;(OZE?-&3@ybuj>yN9H5(I}%j4 zzEr*Q4R?+H?}}l+<6!oO)8p5Ho>2x2#c&RPt>clS!Gjmfci)t)=pMzZ1Sg9#BP5pz zMk_3^t1Dg*;)t4#Bc~8imoOc;j*q$_3knp&0zC4_;0u)i%pNOV0!B+3{^GCu;P4S2KK_Y$ z?CODnn)(dH!|ioO%QT$hq4bDl=CE`Rsod_hr_5^Nd!A!lETys@rMa(|A<9kH`aKl@ zhHH&bU;5OK@=xEe%)R%Ll(-dAXl5jlwkwi-e!LTd-S)jMLp83SNV}I@sKA5++0qDU z!gv!k0*k*+h7hv!eg8fNpZxO^__H1?>ZB&;rp+(0Ucz=Gb)A~d=ZIRKqG%x*v<~%K z5sBc?Z(GGDRn&=DC&U-MfOZxVtYd!lUxpx$R`wtLK{tqu1>s~kbegzxG}K$y@xQ4S zzx3gw z)%(xyc5Z1)>3KSZCrCYwX(N-sTo7AUI$rP`%etu3eMFORU4xhnT7WFx!BI8Iv6BXT zk9<1^pZxR*)FC{W*C`?6($4R~h+h0GS-764b^UT=Ev>y3`$b_asO50#P?|B|1Y5|& zfV6Rx7dTL){q<;{W!HoM_^%Oew*I@n+hv%rs3wma>n3>&jcI7IMYubF`US6>7$8=} zE8mJ_-s}`#EKz3)Jw|hGRk33y%YLTW)n8t}pXePXd0cqy#5lxitcuV(IpH)o^5&}`XguPpe@aLZ!1P_O6VYjg0licW> zdNC(?*Y}w27mJ*P^(104OoU7*j1}x!_XZgx34Bh?l4vt>w?bX~CHGuhzAyn_|Hcq3 zS?a)heznt#Pqo3p+#+&U7h9ev{;ZlR`8E9^?%uJ<1}Zc@Du(@3i3;bHzh^MGhvwV@ zZ|r1@kC_0Vw!<`x$CB^7=zs5=9_Pl+gkGu>W`9{pR8oN`5!DG|Eaorg9~s>3@E1%U@&{^~HSJKuwiuWtiAs%q|*aUxXI zHx8Uk|I?!W?{%QH-(z!FlnwQokee|pi1}2R%3n2%6?HGowNYrGAEsD*G#da6S#T7O zuFr1D@4R8T`=8gQ#QQ}N?O)nS(K8#`sj6gA#&k~Gxr&%^(#&zJCo(QXOh**W^~3m! zo|&cl?k~W@Kgz*5XCe4#0~iz@=>!=bwCj*y{m+P9W9>?)b!QMKxjMr+_O#jZAP76c zIrd(Li4BrLo>E2Vw<@*@-xmj85OY8)8~F%qI8K=;2)SXXJ6BLq%z!kv zckV8J*D6ATr^nI(kAjXTybyOo-`q=s;z4}r^x?>j2Tt=@Oa>^D;Y3@u_>5$$*UsPz2{ zyPYf6CA>EUs0+F-ZFo#hHDwB|9RXoG7-qw2gFj1%@y1AyZIswsa7Y$epbldjT91Az@#etF7}|@;Ih^wZaI?pxXY@bb=h!vkp3?cmWQUyKnB=p( zFA0ffJTE%P7wFMKAkmxzew;?Ds8aUf;1S;{kfNrN#Jf5O(ZK$qAr#qcwypasbhG$Y z6kE$TOm^WeYsh>&cQ}VMmo%qG26>;R0n30hl0xpzAOL-95x0N-sr;^s7s)$sNr;c8 zTxiqWZcXq;hDw_L(aHixhQW2!VDYN3x=F-h#iEvcAX~U?biH0k?QBa$1>N&p-gg&O z1Dtr^#0e)MqJ7lHCFr!$y-vas5l!p|lEA{Z?SzrB(zNRlS}QIBqAiU&&1hh@rFi27|xHmw5;w&qL$c?M6WKZ$l@iZIEvohA>_j(|cg(UHdAc{#qId)P;p2J+IE<6RjQ9P5QpD2O`w* zLaWm=JG@8xZG>cEnM})iC10Q95q?MbeGyYedyvxZLz>Tp&WrZDGaD1y-3i4MW~^1O zn+SMfyuPQbrR!U%R5j^Vx?&<73__YSoI9FBnoIkwVbbZ070}E^M-(zh`u7j{!T-Ob zbk~XDV5c?VS(#=~#%q(%)8ld0HHkfG zck<*c7Y?@xPDiI)MY^Zvjg-I0E$5_Q<~AJ#!lo30T`J=auUY#M14-HI5wU0({T0*uiiMD^kQQU>N@{k%;y*CcYb)WMjz+7 zC>hWZSwKz!%^A%d&7l>$12f@vnQZ`uAS_tAF8tBM`OQDv?|-$JS2+e?&Ri&)_dG+k zqO7W80}~U)Dt0srz&DGBhCu@S?j#x?KXpqRlo3gllICq(Y4S_vr#Z@0v0x+5D#dHj z24FCi!-Mkqlu4(eOlNve_?hVN!^fHv4j7Dq=7yPNyI)B;e6J3HZO(^&&$r>qfq^Pq zcT*cIKFehX@VE{Q)ZrML*e;KG)jFCdME@2k- zvzV>@N|iN8s8ZzYPd%Q$XK8zO>1D3_HVQhB4yJ7*BOUb}Hd!VFN*U$J#|#Ts)Y7)X z0e6~+aZO@_n=m5RbF}TVY#qJYuzpnu-gt)AWdEQK9Sb~o)2$ug zrX=Xm0P3@vCrGV|E4=|USi08LQZ-V>EO=vV5b%PK{R#p2c~#wh!v7Al((|W#%Kbh+@vD_Z=DtHviQV#m|3jJL`P}zN6N^ zdrG2rLX6Ea07E^q(}HmRN3YDB^Xr!+etU6`cM-G;24Ecs)7Cmn3Krlpv?g6s@D%04 z3o&s#v>{=Y(y?HH39i2Id<8*a`W%yQkPMYI7u7jwyQY^^JlGO=7s?Ko|EIK+T&F>U@=2g&TVw zi0ue~#PoR!K3pWn2dX>%@tMkJKexH?g0*;$&Xm>rasx1gLk}LyD0AlHS7q0H;8O2n zi{`oKQvoHk&$Kxy# z%fEef_JR*ylKAMtd5!^Ln+0KpfG1h}(mnZPdGb6HHnSVlHD^PZ0wa0`+~$l#Ei;5O zw_`Q9LBp8`Q;3Y{2|g3Cwe4{4#ZHo)^I*656s<+AYVZI=MMO}m3k_@yN2v4JnqFc; zT^mf z=%P3#2P}gyVZlO-=o!GsuqfBHKy+eEQcSvtc z0E&Z8H9S@^&p@5Xt#|5^3kt&Q78~6lU!TtghvHnrjz0KvLuLJ+op_=?QxU)zv;|MCUSl~k1DkWR>KNFXFb#1v_;UKp|=i)9%Taj`hE z)4+z%Tqm4WPiQlj5KO_3+4#6_vuFUb1yme-u&X@0#G%Lzc*{S5r%I3SOHNGkLMb2vY`=y z&pP+3CXtlIZ^;@QD0=;Z^7r)y5B<&4rLTQ`Tj^L#=Np_2@SUjujEmzX1jd`sO>}+i z%Jf?51{_T8-|SW}>rIk<&~AP&XzE zK=TCAhyi2m*Fpz#n8gyt_$sxSZW!k!V}rq0HV$SgC@<$#aqDsaKR>g%_|5zGRfa9- zj?ISHeI)=e1R*iuVglp2-H!VQuW7sKrq%9k*)}1tGa*5)EwVne3IC__fxu(6x&4xW6z;=ZEG!HUK8BKRHqnW(GzpLnDY;w2ggW;-Xdw6L$_1HMDgq+w37WGU#y` zIJyBgmye7N61ls2{Rh7EZ23RF@m%R>Ibf#ivr&#&i|@V?0T@nkyVVO9Iu3L$ZFBS= zU7x-2rj^dE^V;M}NX6KYK`7W|!#bcfOiV9AyYY$>bKQuT?@-2SP2z2X8^!ZP8ybp9 z*bb)Q$BQzSbu9bGBtC!z8c$Qz`YP={L=o$i8dwjX59QT?2Mz>xed^)d502&o5d<97 z=!IHJ{b}2m;*|oxa9YzbHtaz*RPWx9S@qs^-kaAfbYGuJiL`8Y1dCn-pOdm;Ibp@J zgoqI%_l#o=moOWdm{P_f7eb8hN7KrJo{s2MEesD8H!$MP@7gYxynB3LGgtfu;Q6Z7 zFtTKF`8c<7EYPKrF7EC1AN=Zb)o}e~+O^3IvSy5kunxr59vd*mcXWdKLa52u zuNB)tqdyO7d+r9Bo4SY3O^TLbI|iO@5EK@PtFTFsb-8frJc-|;O(-a->WQ4%jfTd5 z{pn+cM|wv&l_+nc8Uv?G-}^}cU|b}JKqPBf{@j{W_xsi-ZoG22`^L_sSRm4lD=Bi4 zHlmmu*d{tczy#J2m5nEhD1uUBHeqW;qFtEyJ+TJijeCu>+DA4Xp$H%9*z5crlfK1W z!)*Lk2jTu3VPSa9u!z{sCXaHHpt9BbY}&jo2L4D{_iaAx-}BGgD?j+}y`@2@l}?7h z8#~>s_mcp?xYN2b2E-0>8+>46=A5^l@7=h5k@K^uq{vDFV&pFr9L6Kj9EoGr1+AOL zTFVjZSqnP4UMIfCu!uypo^Yc@QP(w?fmEA;XpcV#nNHQLU>%0iY+N@qIwBxeOd^4b z^7u&K3;a@9=eC~+?)}D|>JPrOg|k@5tu-10-pFh@mtRc)3~kSh1tKxwJgX~~f9tCB zg>O7J@wy8ZIyYrJ*^Uh8h5DfklNv%_VZw@9mk7`5i>}$(J+hYLi83O-d0(s+UbGtM z7zswqCu+{*cqAjJS+b@(hBC&6GBwo9er4O8v=Y~;s!&|Wv(=8E^(4FMOip52GHV!+2P7R!Dng~~8s zxu}YTitgKWB6#Gx`zw$A{gcJr;k8@9g}}?bT)N(?0f6BxW%a{QN9?jJQ2wQhQcHjS z9Pg@&7rIx^&&qQXD4yMfaDlC4Fk;!UV%o8c=*09!S##BB+n8K6B)(3#4`IyGl`8B^ zTuTtu@e;hiShp&w*U+|5$binTXupDDwm+x#J=^O)@tqf{oBn-A>1cSZR?LPv-k1gB z8F%|h1Ymee$AH*r^+S5iU((^o4_%(V)7@=u`*H?!hX%SXWCzcF-wT7m z(@&lVw*JFY#b=IT?oA5nLJ59$p8%DL5$dDf!Ja1+w9+}uUnDm{Dt!q z>o+WLE;zeGuFs^z{G=<}6A1*XTTAzsvc`l2FzM6`6e*kZ<7?cIJYGE+D+pI%p^%Mc zga8bC@l`6c+o>8Wlyv{0QMG+rU$E=H_Efe%ayis%SuEN%{W0Cjne~FI(uJ}QxpD=@`itto^Mh*7?t$RNZ||)Tes&S&7cqob4@N)8j5(oQB0q+Qo|Y zr08}Xk?~wW!x~bKBj`vt0(Hr-j@W4cU{JdcwDyBQSMVs&W|CDO3VxsqV`V*fY)l_K zUWDU&2mGTyK2$yY#F2>Q!h+M11z8~mxV+W*s;|V!cr^krE-aJwNXJBV%05pz4jzWp zDB)VKo$qB)WG^{yo?N)7O)Tn3$)1jc=thR@%%BeGhOMO?NC~^qIB%s9AkZ`v{QwFD z)ZvifMn)@oaG<0HPUQ88=Z91;iqvDf`>Qz$c2Ji}wnG92R@t&$DJEKr_Vw~BLCnqp zaB99p&pK;U_DEPDCSt7VL6quR*L^u?(EO?mTA^wV(?;Sm3#r&`M;`&|3Ro&6j z)x*>o03l}KXa*pc1)5p`)BvUyo=)QcAqWU)DjN+QR~N^SC~UUugE7L?ya z$c4ZH{|JBpS5tB@(B8pC04z-TU%UeU>i_9xr6m6^5m!55%Kv4Qj-m>=grhTnoSTJ{ z*_@4?ot%egO%;y&BM&jCBV%iz`;xYzc0#v+MF#c1=J*^{i;_Q!__5S7FM3mi{jnfS~_F>)`Ug!}Kp;tYA|RD?1C@e_Z-+K}E&?e^DUt z|46&IssaA5z5k!YE*hR70IM3n#nH{#{NKP?e*KRskbs0Uz|_^zS;NuM{=cKBV(sYa z=wj^%B9~C-A*WL`HMep2PY3;fArut_WF1^wO&!buvXa7-|2SA|Y%ByMc%>w`IC&-5 zB=|Yl*}rp&@$!jFu}gdx6X*HP&nL=#7O?rBZ4vt)`TjT7;(xY9{C~u<{xgR4KSTTf8tVV<`j<4z&ty2!u8FTt4GoIU_Ub&oY6AL&lIYiAlhuiyMd;I`te;|4|Gk)+kuBsdO%=7t>wyxPdomtFxT#E1VLahBT zfZbWluZHM)b$K{qfT;WMnS2i!rVYW+-Vob@Q~{z$04nrrMoiW42?xj#(>lZ}q?+2- zAR?3@n^{|CFRPYm_naNYsY>bTcMw>*4Iz(#SVN{hJ}OA6lPp0`vbpbba`_|MH83W4 zWVvd3_p_1Sq}!kMS|B3{j^4(FOkucsFI>I%Z+84$Mb8JkL;)U)rVMz$B{9OhZ&Y}Y zF$8bml#431!lYZj2W&-3>kj`EiI(0HW9tg&&2AH}al6%o8DE7@7qGg1cy8Uj&0|AA zlVQG0RNKZx@bsXQgyj{TWuLa*?+xuFw=>}TX>;Z1Eq3!Jwi_Jsq4kWlDZ28VLj0gQpV^02|XxDQ7hh>CebU zt|B*M1KAran$_>&TY)o%_^KfK*3?(*D~~K9UB>>q)6pw$l6boZ1E#MN}7-`NQ>DQA0 z#+*4EIV7gBGzqG(Pfhhbt$C?mJO0m}zsuDn19ec>*|4IX@~AwilP&%RXb17h0x{Q& z5|VO}VrC^Ni9T=?fuUing&}pMhzR0GRFvJ>R7CR1^>58pT0!W4gdmoC!K4Hv2p1kj z@1x`jOrp9Z`VR^_XExAdXgzh=6)xS9pY}hp{BIX=Gdhv_J|iKzy3w*FHQr9-$o+rB zY^#em;OJK3-(I2kC<)8aqhuh3Q^z1!VBi3`KZPy7aWp+J@d2ESS>0~BdQ+171iZIo zO|+(vo`sokWsw^7r0A`w&EWk#%v%-~Upp=Fv+_MjfveRJf60(VosM)K3=R?NsjRzvvUza!19>+|sz|oh`Zg;HNwnUwx2@r60<{0A z9f^cUD?i?CG5&VinrJWws}RocG-JhU{~Qo06~0CO3x2i$ z(brVt%J5RMD#|sPQ_N?%<_2{N%n&#*2ko#$6`f0!_UmN`EhMsNCvn0Fl+Gtj`Kcf& zrDm@{cN$To@iVJ`UJ#))Z1C&7P3mE6 zOzueBV?d0L(@~H^A<{ql>;R_4|GYQuo8;>tbD;=b37^S{j}29{rQ|+i0TO#spl6U2 z0*}^%sU8q4NHJpdw7wv$>RV=xISuA%PLlZ44ksmO-uAvth~JI=Q^X;>*(p_>|08tw zo$AK+;DmB+&~G^mC-ohVtoo>_B=L>1;FI$fL!hPDz}zQcbj@ z2C;3fhXC;y6M>6S<21CY?x0HMG531d#A?_?sBMgZ12)EuZ!F&nHOy|jG3<_f06MTI zp7ME1T{=6y#Q4h~YzLe7BPHj$mof2NAmp}$b zvY2koUx3URa%PvUHIJpjI2BS;_YJ*kIi)=5hHN$DJSTx`XcU+hgp@^vxPOq28S?Gb z8OG$ze`cz!O1>Ji7>VkEjgMUqfi0fzbe~x=5xm6rNBmlosow2povRYMtG~ z)sXk19C+W%#~r;F)0(NE*?}hL(myz+45&97h9JEiJF2rU5#j(R8h{W^KcV<)@W2ye z2l&w!<~Q4O;<~imX@BS+cw>jS@ohb*Egmgj4@EeCm2|2Xn04R8=Dga3%r)FhITST` zi9Z)2V;s0>qTk0YMCo7cg^XVj6Q2^6HHM8e*za10J5;}1@Kfxp`gSDX{$ArJ5l96o zojMt)0NQa5We11+(x?l0+)d%hlC3tVWFs7{sk-xhtP9_fwKYMf7ikW3@Q0(ekgGlj zqC~cdOD8($J|k!;na$WD1olhfI4XzbGf29q6kQs*N2>VIs3Avig309Nji$NeMJz$8 z-X^Y^>@Q{rKwBjtV_h@uwAaWUC*5o{KFmDxesj%U9{#O#AFqa|6%9zty^ugU4i z5T7Hszr({#m@sx7Q-PMjE**0aEcJO|c$Zt_8@#sOE-hDvSmYN+FTy8hl<7&6l}Z%k z+ABwWwB)c(NS1G6aCsP^%bbzOOEkDAZy~}giKO}7Mr)%dA~gqT4*57|DG4kL^o`dE z2`@Wdm+aN{{c%L43@5K?uq&Xnzy6LSEF`||6+6A`5ND0I#i`_NkwL$HI76G}#0G7p zpvCOuz-MlTEYNWAP6YCFf6bxCJh>b2;Bz)fp!r4V6M07O+Si~>6O)qdEe)-NT$sG$>1}Q^P^APJ?)+_&yLcI@vw}Y6dnQ%W_(dVp`-Y#- zsXku7Pn2|rTA1DNubmvauVPv<33%QUAK;uZwb6K8;exSYpUV4@ze1^$;Ei-b(X0hc5Tq`7k^lbNjj z(g7yhC@M*o-0`wFpV4EP2k7l2h>g&!0;&Oj3o7F>FX-}CBzn%LUM4>HoyC)r^V$+D z7T7!&p`5G~%I@}^)hO}jzPmn(H_e*fc3)W?XeSurq_nNH#i;foEmP`Z=ok~kv)b@x zrQ~L;CD{pbVKR_FpUi9@-d@KD4ZA&em4c%e=(DsQ zYT(X;sydbpzWIL@9gu>aG6zx%Z&}@k__O6Qa zchHd@!bm$@(K`OG>yS}xs?Q1RFTr>b;?e+v0Nn_`_@=7{OZ@lJeVKNZ7$tLRyHM3R z^M#I?7TgafoGF;?@f%I>Zo~beo$ZxpZ@-6D;}cS*a9ZV{S#5-d5;su`v9l}@ND=Vm z;Aw+{u=_UDj>+nxMpT%a1 zaGnUO_-0vkkfb1CzWrr}?9+!cDZ)9va#NHjG`uPEka#*YeG@{zhMv~C5UXwGd>W)@ z*bT&JBt^k6qVFQ3Qu@q1+N|Y2XGGejMtYd9M0zw*W-od>w84xQKN^tKWfMN~1e+?V zK6kM?eK+o#U-_+tm4pLh8tr{($J>b0<%38k`x;so(Rc5_2fYffjp?1HD+K5%tC^;EfzYV&hf8;rS?^@_@k0TX2g&Fw4(#-Yi|YM`h@>rxwH;;KHCD9+TKKq_&t)*HHbmI5NmnGw z_N=_=i+hf7dWo85`5RThql3>k1d3EYG>!H>#jB=BbPKs1J3xSCX-Rd13%}l{V5ZXG z;@;{^HI9za_on>yMLTAw&UTkah##T7@k~M`%LpVd(_z;l>sAu-nWN39XDRl(@JM0$ zGV0yu5a2=4dv`AP?SYzPmOrETk&ozp1Zny#w8tjn9a$doP~nqKMe*_T*< z8B*1x(wsus-*fqJFOVQzX;5VsX{2Bol}kI{>93LC4XVo-+P2zp3tdb}K4KU;ZtN<} ze$$e>)LG*PFWCQy5C=2Prino*R7>E%2v(`QpQMvOgr+>Dl%T9$f@o_DMZrL1D_~{C zJkR%0svUc7fOa=lTreyL1a<5AX3@+_AR3#U%va!J`G&U;d6r_sxyzeUj&B7j`HLGs zteRtOP#04*^hEaDS1b95^7@_D2t)xp4uMvOMcB;Aje!(Vdsj(`UC28N$ ziGN{XT{APvD89Wfe&$hteF5H9r6y%}?_Ox3D)AvJ6(8+44|E|X>wM@*O6+ghufQCn zgLwUi$`W?QoUd}DiVaG;6cRrYZGXc$8si2XR$+ABBkRrcm0=li&38gDtfwbGvMe0x z8A{NH-5{Qly=+WE1yuOep{lJbd$S8l$d70b-DXp3(NAjdXDdX&e0^6i(dwkUGbm8> z%Cp*Lk2r?|%}8PmlKdnN0(yJ&JAO=DiA89EG4x(3nQu?{zNI6NRz=T`~yq| zt#^A29v=`8_v~UmzwXb7b{p+Vd3=I(plqkylalcaV8~tda-m@z`j|Ybn=Hboh1NHq zQqnP>H0)B(B`CU*<6$CFRK-e`l}}oN_H^a*WP+Eox^^Sa!m56Xv~Rqwg|$M~)unHJ z72C$-y9V1z9Sx9&A|ITS&Xmb}-V5m~SN;-#mOn3MY2aQb>7nP{@*+9!bYMkMRO;*e z*y=Pni>sM607{f^nj>ajrps-l7Rt&$6>D5_?^{?*M>@%9ID8AUoa&;5yt>-(uyMDZ zn`+X1n;zy@z9ba2+z*;wPpF*6^>kxvWr1nuZUo(FpCaAQtBv=>jz3s*7nkB5GYtxr^ zhSrDvHyOPz4!V<@N9#-q!^sFQ_+0hh9oVqddy8rhQGvV z&i#+z0aOVSvv>t@8?j6TN0%Ao+&t~mF~0EcHL2D&T@F_+9}k*KG~>i}iFnzv*|bvG zZ0fT4Ix4+x)C?;5YdB9JlumW;<&=}Eim1kAabbZe_KF)09S;ay zcW>K>U$OURCDHjr_gw*{h@I$ULHRFZ;k%lSUGNi&NZUJ>*wkiq(FKv}?C7sh@e5mSfdW6A>QrR$cA{ZgRT z@tmsUYar585Vx(J1>&}x3AWxop88sI)!BMy1IVLh^N{%&<=E@xy3zU%=zjHFQ~vF* z`=ABi2i66Oj#7!GR5(CE@-x)>4?Z&J(_g*kuI63(Y&4V&w^aVT#DA~*El?#)I%uF6 za*IT1fMH)pw+w6G3T@1U5wiZ^_YvN_n2m73^@|?)1>EE|k&`SO$~Q(a^r~Znu9KR&z_;G_ zhhq!L3N!sSC=9S^BqWVw0uSN|U4R}C;^3O?c!WXddHWkY`p07WPGp_%!0347&movf zeg~;W;Q|+=ITmh2-OqYD*X=`V@q&z*2UEmQ8uxEwdxx1d$w~3$Yj+;e3BmVLdsw#| z5QJ=u)!8S$L+mmo=|hb33Q0zss$@R)?RQtaR1kF}5q@5537=LZj`o>yeZZG)oX}HL z41T?qm;|{4+fRt49kUzK#Hz(g{F*{F`r;-hf}Z!yr@=I!z6q{o4b6?bpQmVm1cV$6 zSs*(CN<&aW>ovB2aR>@LoM?f?!ZE-9#k_Gq__w$3;LFN#QyX`YDNT7E+>pxiM2=+{ zDkhJ@7Ql*!h&pcWJOGe&YKR-Qvj3gCN>P9mf zryadc>|(x9>zvTtnvVuo^QXU}DEo+0*h z)cVG8z2(bg&kAlXLXS+0jy|_^ zuck6>34KA8b+eG>2I)+4H<}xcPWsL?#Og%SHS57*w>G@)RY7AnoL0xog97K68P=L+ za)#nP)>KRcgsy~FM+vP?a^`2KWq;Fgk&^4O=?spij7z=ZNRKi=3E`#rr(*bSACPyi z=c{Np>dlJ{-^T(w-@`9t(B9e1-IWXNjOfONxTJ8ZsR`8SK#9EEbetme9HlZMR66NX zfxSR*Y5lj;{t=RQHauu0Kuq<0?u1koGf}K|P_ZzUJ9{$)^zTJEFpjbr*Cd(+Z21~l zpXod_TF9EJaX@F(V~5Uw6R=v2E=EjjALw1aGo}b{vixzuM!Y!NfKagLAn|3j^k{W;#ecH}v~!I4 zRTndZu=_Z3zkFv^IkzJPcvt$!EFBCuEp`33%T3x>^akv%b0!n^BXo+)Yrm*2Clo^5p=%A;wBMe zAg}@_o(CRzjS+CiAV21`;xvV~;%hA!QxHW`hbEeU(6htsQzNM_Y7*U+oedO9@*6mS zMr{%^5!{fpeF7xgG`f#!z;vpFo-e1b2?*k-$qF>IP;<(12#COWY<@Ddy(!j>oCVDh z;E#)pbqu zDutvA$&3o}s11I?-^|3qiVCIM-MGS)PGtvazZVJbOP3bHU5v{lMsEpLO6-tiRP`_U z>YKW@p)InB)0+_^*-*UoF z`Q8QP`w6(X4@$DE8*3tIN+#ZHF^r8wpy`yLAW9Zl6b?!ut-e&f<^+JQ*vUAO0n90P>>9%K9`nl0J~AZG;1fK{HqX&qDX1@{ z2x%o5;;x>eG8!>t7AB+#oVdvKu-{kk!@bDDQUOb4k};JXG&C}&Msaes>JL}{z%wAv z&af->LQ%_9VQPYsz7m3xu3d+3YI3=*?0u&6`DlvYqqjDQ!Q{n$87)ZhM@2r=>&Pca zmfz{}3gz-V;$GPSY?0FeR zs-_7CSq0hY=Ms^7a?9+Ate2vb2;MN_gS*V|W+on2DnocBsq40|)`InUl=}p?ZuHvD zE{m^+S%r|$eQwyNCsJ;>;fki?2_^^F{q%#C6tjnt1KvrSZ?DD=;57P;IGT1$5AU+q zyp`@N`G*iCE1c!%hAC5gFl)Wk8X}}MH0KTgH{4Lo5M#9L=d1E=kuExt{acHAK>w*L*O)iksmt&^^M@8@0+?t3?v5M5lkc=anqXx`_ z5C>6Tp!CmM9tuNfPDt#KhtPU|#>6ci{9$jq`q1u6EPhkr_D78q_QT>1`VA$1;GLO5 zi%7zq3vHp5QH4zHEU+D1!ynvn197~Lv*yC&yoPdX;%e~Arc#9cFkN;ksn|5=r^Va% z#+U#}#0Xw0Bw#6mJPRjd@B=9%t5khtLSR+NgM5WrW;ejarIaC4%`2rA@{&<+2bd2?PIpNK@t;Td# z_%YT$?Vv@R0-kTn$wJ#t081EhQ8|Xmw90ck+0u3+crNXKQ0XAwq10QJ_}*G1UfbEA z&C|tMOotef_Iy*!iji;%6-_dm;7U%glBgP5x^bcfpwJ-W#W@8KQQjR)kc8+llInA% zVPRlUV0eP`!x81FWux;RWziJINTkwA)NmG@Absc&a0Q9ktJG>g&mJ(i4FBe_KqvKw zVX3T6tcJ)bkHf`m+Qv+Iy0(xg6zhCPMqbM>%XHNd9#&cydPdlAo_V-lMkfx=L`KeG zp$d{mg)J{ONyq=)8fW!`hZJHNoZ#M%`$99n%o#rownnVl=CB&bu+G+Cg^Zr)fWqF1 zyHI3w5}H|fNQ}ky=rDlXloddUQj>f`e1Y=7oyi^Y)h<*c3GwoUkVB}~anr?8g>{LH zBPUlObc_ha!n~T0mlsv%WBgSC1EUqM!7MAB0v3kJKP{pf3dP!QXwjRTwdS6cKCK@m z3Q3Cof)f;@2W|aFI>OyCbwI&7Xf{Y@OsQml)Na2|DL?__|4@iT+~I~_5ssZ9`12Pz z_2`e|okMM~NK8$4yW5tqI*}IaTi=~NvJ2W*3u1w_v$-N6=0kT08#CY1qysZ3XFi!> z6*}tQVcL4SmW7tZkjT}H^(zwPl!SrfB+ENil;A%L{CxhVc(xL5ZGZYG2uLaihokWe zJpWLlgw3;Y3qX9`&&Jrnl$Y9UTF%*vn&6Yjxu%sR5H)V7*bm<&W-Q{iOwF#ZS*C_4 zx-Z^f4+PrSz*!!pnLx%jaBxAYXM6PB$`R%H?(*y87zZgPo7a0k`Bm&q2)X@%k-YG% zh~|kwT`mlYma4a@=F3S=@D#(!Eiq&a)2l%dtXqxR&g{E&#lDb}Z`GsQ4l*0706DHi zxt~bGdPzX3)ZKZa2XV2r_~aO}4Q|V=9<>EuAhj#%o~SlZ{68~&(^oX#9NWAl!$}z z)2I7hLb2=3=Lw*kpztMNgz43xK(}FhzxMw~Abgw4StUBSpkb=SI>y|=fSg$KlaJ;E z!QqQR!xiwj!#wWad~d;gUMT+%^tnyW4{&cnRi)mejP4JlX#0$H4AAa=^bbU~$_pQM zq1{eE=EJ@kafJa&r$x@Q> z_L|W0jnaH@H6UtK;e|Q)>@BW!QtP0bCnz^Wzekc?NW*5{1(~gm zvI5u%Th?j>t-k&=z`bmQp8tMs+~@fDr*2pAWFUL%6_3yBj&bMtZl<5?^EcVR=*OKS zg{Z)F@B4m!=uJ)M&ce-+$;bKK^}s!ShJ9{euKrI@zj*wdoyLmjT-xPVS>uU9>%=DJ zm{UcCVJEXeCWK3vKxxm-yQArW_EMOjMCf|JI>k!+8+l9&O26a#Yu$k3`6;KJag z6_Q1?=Q5DUSj_tDloNvk72Ptfeu&OBa1nRpkEr8f9Ipp7j~Oi9k2FKF2H(!;wmGA! z%q3HyLSZ_4#U$SrX4hESx2_Ir9-{!m6NP#E;|72BFDy{mXJ!SYmQp_-JNm$st~Xux zJawb{om%;^EPmG%S~Gsu{>1t?-|vO@*l-f`8TIHwwtYZSP<9BNAC2$-8(LoI@rrW3 z-j3bd6gD^M=b?~^lHG_LBqEp|4ol+@ts9FyW-R0lSC$PRSaBk7zZ8c0H*5F*QB1zh zRQ5*_dHnqe;nW0qC1vxsKmRX%Qyp(FF64Z$@q21~pa0)ff9R);H$pz2W5ShY0OzkM zk}&msL6gh&I&r&QoES8%>u&1H)UxlGY!5bLzYq=sImTWY!hulCZ^r^iJ~BH^@ueFP z3CfGcmEW8VX(b^I!Vnbrl~U4$6Bb}3<3tlQv6~zN;>SgFjci0+z`P2izR<+&?=AJ- zqj&_;MDYVW=zcGdeBQUPE4{v)a)ms9)4#p4Ua#yc?_R|ZHqpU4@--7pRP>NN|1!Sz z01^@fU+B~Bu6_O4ckm%-f;h7KtKG%^{%pmSh_kN^c`8gW!5ehB z=b3S~Wa@l%0eTJ-G&yQjWaAf^@VK`#e!*(i#@j7BdmL=Pv)b|SJ1V|DXfVGX_5bUn zla(JP;qB2kaLy%ko$enPr-nNc4sW{t2eIvANxOeqyX#BVKD=o=0H|1v33XB-Dn2-< z&I16*9qJpBI3+!fH7!r-0TpoVhdY&~iI+$W{fvt#43CE0+1YX%GCiMu)9>A%gFa>)mXV0oW*w(_Xs|`-r`$8!-K$ z3MNiYm@Ksj1goB3&jrB*B>9j8L*`VSt*iF^_wAf)p>e}ox!JqP{x90sSN>1?Y$75f zaSL%b0vrCLE%j>-1IzKkBioXmy8%ImjgXxl7gBYvZlGO8vS7K!fzzZ;)JnX$B$ONC z#DHIELtIOBg+asAW=y2(n{ck;U1~mUAs8h`P^0a;U%CdSTMK4G+=KNgZ6YbUDS6t3+H6}BGE{9Y%u1StH@OrYHmeo(zByk1PsnYT|2DcK2@jz*=Rhiig3fllsaphNf^d|K9qM{wjVS(Hb(EHh@ z1W(_Y48$->Mzsg8guvH?t{h>euFY_czEd^zHa;-62orXX_Q4+h>xNw`BN%PGTi|94 zJFdV-DHp`LeyDOfz_{A|DVG;a$v1HuO4!TER63)1~^ z1J$GF^EHQZ9!P`wl^Yc9DZoaABWgepI^P(=q+i^9X*9Wr$AxZzLoy^E-+3vMO zzIrhTS0i!~c@kr|ny%Zn_1yTr3BQD2a*AD?C3?WTTC)m+TG6^FS&WC~VqVsowzRhW zLkqk}v>kV(6L?q(+jg;*dmZSp1s&cRKRCR~Pe4o(zTExLY2ss+6h9RhFYs<8^nr5h zqTIKl0z-ZJid=%KnJLt|&r^bQ-HadxzCiD2tD!*bw>w&`FwK~xFLptTzGo5T;hiQ( znrpf+$OpFQg>RbSDhc1g^2we=+QmDwj&BerZ2px z$4CqDCKENgYBHb)^Fec5>|RNLd)vS4|JS8YzIaIU|2-%xcNMtaFvX7hH_I( z>_^4gPOfw7KgVji{GqNHSlINeY5z^umSmsED~7R!Sc`3-GV^Q$9W^_1xr||q0A+C) z_pFp21({X9v)ByerPl2QXLy__YLc(XOiOS`iI1&tJi8`a_$zqmf^F#A5)@g#8`u&4 z+>{Budx9am*B-g0O>KRMg@*{Lj-4(y{0Yk3NdtzF%L`gM0$R;+!$w;7EF*Rhf53D( z{EX&pM~-1cs*rVZ@jxO-P*o@2I==;uxfBV)_5qcOz-(Sm|J&Pv^k>`yR zmkhJsLo^~C)>e{7Oo~=tJPvxlca|{j5oG%bioQ^{QuEDj~#>U&Z;c7ZGp*G#! zfi4&3>s`<9Kn0CR(1Yd}KRbVoP+#njsb-8F{HdoaeX2~>E7nsSeO^#)NWKE2^ zi*()4p$8JB%`Hw`G?pD}tU-FGe5QmM1q907)J9Ha7xeI%AmJB#G zev+ypw1O^?xr=Cp$fD*vjLPkbyl#SjJP$ZN=jVIa8wA<9k*1ZoJ3-Iw>_9B@C2=u1 zrFy`Yxs&W(Q4;=Sk?YFLWwmULh%$3Rh~U>j?vLylMtsn*nGz~w+ei?u@kTAp(p*!95+(W`ix#H^tTdU!$7rzh-5uoz zMc-MO+F+HgUsJ86xkXH9*50BG&@ICK`nm#?s9p{D!?4!sVvUyL4>z)B)8=r707Exy zJ`z&6fx+cY-ujrA>OEIBw_%Nx?y{UvC)s-t3ki@gAHNN|4~ljwA*GO~=ehV<~RIxFk26?sY9>;Wc+?0Y!}$M#EZkuD>>syRl+@+HhY92mUdCoHr#tvX|tbn9+2rpwDCpE$e*_0%jYrSMzNbA z$JE{HJ3{u*oIEc=NSy0KSf`uLvtiwx{r*ECJtKR)kojlh?gIJ+9gGAeRjJMJK?;ss z+S(4CLcn-ILT%Yl_dAwfFDggl5VX8Go{k>M8g1#Hj^hfZ!YrDo07x1R-c{b*jO4v6 z&A(ePfxoH7*J2BeB-Wd-zL>*^iE?ESM;8wVx0-eviSH~!j?lb-VR^+eZyDw*QdVpf zX?_ylZ@|zlYuR!^tHU-iD9ueR-0DiL4z0OzY`Y#HM6#4-8f;~Znemzln;Zz(_+wnZO5`1bFcVRn;eQ^1!#q_sms!Y zB`K2Om)%Fvc`5gR(T;1>zZU;$p5WvYzkBzQY#tCOD^s<*FVRjnaWEQOVpeD4Q~8-H z%mYrQGD^lQDINkpyPJ)(0xjXs6%qp&U8YkczXmvdv0*viMMGF`pL)xoM{z)1NzE*u{9weh_(>wrm1uv}{GZ_D+sW zP)LfqJ6p2`W|Az(OQkq;UcU%f0Pw{qFFa+}#{suVL2`XL&GJ~2BaWi@D=b|`X4aA8 z7ALFbQReESUy$?!+_IFP9qUA|37uXktdP&rD(z^178IGx9 zaw7AN#B`j|k%SA>TOfuz|BrhcKJr$vkU54p?1~mS`}IUu=G8qYho+&;qz)sXt4Zmq zSYPcxWfQ*1$qv?~U9>Fo$Xc`EPZK3?Jr5~#et^}NH#Y%U z(M(MA4S)NHaWR7|Xv><2?*hrJfy45ff3LcnmIbe!|KixjuaD7OI8EAJe=J{Zy3Ulx z8RvXhLV{qKF8ZQkGgO|kGO;Ck3oi7zCjn9{aQa zEZ>Mwib{9yB-Xh~YCdnUo1RulI;iVrY&YgKO_=^3H^qd_0TfKonC$0ry~Wkt_87ce zFSb4DE+zl#WMg$r7+HNS@KEsk!f+n?VOOwq@Z0mm7i(Wm`#w*uiAaYw1FC2_#AtAH znp`GE#{6*0piQxef)nKL>mZxyR%j!Xmts}kLY`9@hN=P{HOQPM(@OWy?rV#$Uw)-# zB&C;xW$Na1d^<;BThUDCw`TdpBp$BrR;|LAUZ}>%E}xo`IdriTTCOz#7g)a<+8&Dg z=rhj98;6VoXRGUFFzQ!u0f8Zi9O+1_sjIKAl7(m5Lv#Kqf2TxPE$X7Mg4UcuIn*e+ zK-CPUPbz4Mtw+k0kId>JiJRb5@g^}T)9lC;e2f`9I3W1ZEa(a}e#uog|7=~1ekv~M z)S571WuH#VkQFcEa;G}%q;sqEPOL>`NqS-$oMkQI@cAf(xR>8u`yv5tNFr-}a zzUk5O7H(;o{~fM(0j_LVdv|Wa_J1_~cE2Ib%8F5AiivMYr0k^PonjyQthUX71FM&6 zDJZsRIp*B~?iYBrptjt`BP%|TKQD2ixfA2FJCmd`!s5Iy+ogNSv}$=G(cGj4o^zrJ?#>E6FSoAiKC4*qpVVntHmUN)pi- zEV@w`3J%5S=eh0TGaA2u1{({uAq%a)#@k{MnYxf*YH4U2>8yK*MlH9*nylN8x!EZWlPS*8*$H{sM4HflnL{gTrJwX_&Z=&}U6Du1q z8yQiyZdIrV5zX~&tqAd<8iKyc(j#?UOb~muc&Yf`oM{~^J=CNJIqXUnStqnWeAz#i z3qRI)nv)Su*-I-yEz%b7YNKDOGTEeLHTF#Es7_2d@!6>=`!7!;4H&I#FF2!vDhubQ zUEJ*}=2Ey&Q5Sbm>-dlcTR41fR_^Sdz9cDhg;2Y!$+G^ry4rDcmUP(a#W(WYcdPe| zVQ55k!Jm0*E~U1C1qeI}kLP*pBdl()C9&>`wkRn=_k3x7K#^962MW)}O1GM(JK%^c z1J7a-=9=D*7b?g8okfG#dLXF_dAsUN4HWf>*2u+XBZ+L~_v9#=kfPKML4~B|VW}<@ z;TrN+Rsxzaixm{Y7Ia9qE_efJZIVOdqDqme9Ui6UWxkxCk_b`>r70*TxgJ-Bcw*5% zZ%c*OwyXu?HdkhAFi7jwXA6Pb8J?lC%z^1~(5lt}H%KbEUcW-^>qJ9QwucY?N9hHv2d_~XqA#?#3H?y%XNqj3 zI7=xRDOs3cT`%6_#R}X^4j*E<3~o&=Xe<;4|G_;5Wy$o4CdKQ`eX#6C_40*TyHb4p z(Gt`wbYo`cAf9OET*Spy+`W^^@p9#gmzy1Cp@{YfYJoH#D4=TjcW4(rJ{FI4MI+@K zFvYLf2Hs=41KQ~GR3H57dnJ}rHneJBNZ}N5V2wsOdb);IS5y+O3=^4h#fu-PnUa0e zLyXuNiMuQcWkNSuT_(PzLDsw04L7%ohndvYIM#-O-so2|*t&p^pL0q};bwtzO2?OL zX>d9GgL?q7zTw|lP*5@j?5MqdBp$rcSMUKq4qImd9@qnuGS{OyUpG8x7#z3Z0 zsTQc362WUYFSTf;#UQV%p;;1F4Th%g)~ePl)GE|47)~gywzpSEYD<Y}u%U6Fj zt(0HH!U5xgq(y)ajl_!JCAcqhJT(A+C%l7Ze!wSuEv$GAC=%ATY5vw2EORyIfF=RC@wb5RSI{gLaL2d8F5{tFRH6+Pi`3o+o zo+gn_3u6bu2-b=e2@tAxM35aOl?m1GJ541up}4t)3qMNcW6(lyl;XfP`}sU76e$`L>VO{xxA~nFm!r3 zBuL%YiuPhIrK3&@KHSYOu}`F}=;(cEHT(7>2{qE#CFB^Dh#Cro0*a;c;F8>BtS6ly z2G>GC)U2NymOCwk%y%B}`Hqxrvqo1nMf9O2#nzCaKdgi3z1q;-G_L}+SYIgfp7&=1 zUk(A*{h6Gb@xIWT;CH4M_MAYhX8sh2QhVGQ)mvyD((-von;vY6f@rh0-?kFndVi9s zofNAhwG?aYj~9OJSpCW4-Ngs~$y0?8m}7aj)Kz9C2S3MN=U^qGYjx1c(^nKgs|Aq; z#+N88gSzW|setcf4;C1)#A_-;x{6Z@h2zP%S}EvVzrHRB-0;mevU~$rp>y6Owo+K~ zy72L|Vtq%nM&ppBfuiMRa$BQGv$9UOTh8fe3Hs9yk%f9-EVW~ngoTuhjaF~0X4XHu&CiKnNwk+!Lm%@@2Qz54o% zzrSqD??wX?(5Z!miR6Xv?Ba6_Uh{LKii7iZOW?pS+K$%$PXJmrrOBZ`9gAY@4zQ5ptZnoi*pk``Rxl9;Mys%B;$e6Adc zttt*|n8L9?OKaP>Sf=HvaU;8gQ_UjRhbpamndF!_RX)AusavpWlz}JAO?5e3l zmCig)tmoTJjOjtnMu#YVy9mO>EKE{~6apc>oc3z$&4KIB^U`UM4c$ZuC0uqS$H@k3 zww}^ky6CC)P~~>fxo9<(VR>-@<}NJ2^z_oX`Gu9=h+FUp^j=^1rSh<*9$?R+U=qA3uR!baZMjF z0U?a-xYR&%_C(_9r;25VA}Wibk_po^Ml(YM=U{a@x!s+QOeLO&zWxSpSK_1$=$Y#| ztuit3J?NPVaIkr9Wz&f&v4L%6D}U(RN#fvn#$Ck`8*-A_6iH%s%-9YjV;>jg!hDOJ z5qIpms9f!7ueLfUu^Qagz_zBVK}_@0BA=n4GG>(vso` zf}5DBMc+(#)WJ&iWT;9wOxA$nOnF)8M>9N9m_rbU?wf#9MZ*(5N{Lovr)6s1{B;+#BI z8>s&LSDu1D|MD?@{?>y#;odtA!`P-VYr~n`P08m70nf8dgUd4G7ztdeC(hDttinss z!khm2FFpxhdh9u9pjUX$_50wyTlN{cIj4qg*}V%sGs8Z4!d*jn-eWtj!{L^87gZtk zy^!;Pug%Rg(fLR`39Z*;silxhquGNezcvG3omzy610n1_G5}MXabd)G4e?khXs^2V zJOeY;AVQNNqHZfR@K1bc3BLH*8TjX4c;K53zI6eJz&nfgWjWFDsIuknx~~vO^M`Qkv|-KKGCBnNKlVA88Xjao&_$;}@`1gZVb9h{*uG^HHjNEIyj zq8grur_WzGts-knz!*-W_q&J}VOQcwH|+(d#To%>o%W*|sx#q*1$!L@GqWwI4OOAu zEpx>OsX9`{r7o)EGL;CSC)~4i9>OpNfGzvt7D~mDV>oeUCIuh;oL^Yxt@u;_(o--n zRDoI*L0^s-e3bd{O$aVVpjtRC$uf=Z%e_m7wqBfFg2$dcO{C5!Z4hKa*pId?H#U>Ec%V=Z28V(P94vwu}kpRSXes)U0 zLXM>J5)DbII(D%tZ?aD|z&wCCTEcQbX|P4d zp&IAVqF24zgrkRcz}<&-!55!C1vPI$_{XMr9mQ~Q8L#p3iH)s$g@nGfo{O*25~2B1-SKpAXi~GZuO0g+{8*FSKBKW`$>_HBbtM zZOJ84B~%L$RXYn|`+&`dNp0HkysTCfzP8w0g?n#106+Zgcf+uQt))K}|p{pW60hK!N8^<%Sdbp)F#cE%EG?kgp8_kG9YhRmf6cGejnKlTZmh z*`lR{86v*Fg z&(+l!&Yf#O1p!FvBO))D`xIgbJAoZWXt-LKWuMsgEt;u}KEVB4Ku2Kn#4vp5`(6jn zowx{(pTEGJc7ex;y8hylYj@Wbe0g@BaGx!duzQC_;2*s2b+CWm7C3%t+Kk;&%Bo#k za7w_VSYOg(yN?t3Jy$)_WhqDu45!a6!tzSj#4Bx+K0u-N&qXeseXU%CN$~g!!#hn{ z#mvg%f(j}xBeHfE3?$RQPV^?{s7qBp2wt?nAyUD}l>k7wt_qg$0v`7{omCxW^Z3?c zF!GkFUW+}|^X_OBPoosPaA6sm#3a>e;nwE(SgX@wo2kQN40>tUqL-NJ8SbsMhW_mQ z3hdfC20#Cyx52*QQ3Q&aSk88mA^+g5lq}0P#wgimfMZ7C>c;dSq z^fJRdw2!m#tp3=B%!pUH8N;qjfI@l{7d?A!6{6rR}N$z!4;7Mva zv^A+6e3oc$Z@FnF{HuTRZur?>{3AFuH;dLak+YR@D@?qET+{{YknGAPf^Tze2!8VY zZ-8%q>n*S_zrtjg9CRj?YnzJ57~x_I+NfrZ1}^qGM(tANN!zI4`GplYb!v&FCfRV> zPB9UM-kV~_mv1A69Gi^nBC|kbX&5pwd=MBLP*{^9X2K}c8gYp|Vv4(h*{*CSghDan zlo5ff71PiE=D}uK3!V2XAbYf+R%-#t?@C?{AnT) zQX0KxDzQO3hA2P+w4rFK=E{PC+iuDm-qhl9-x1YZMf zzs1!iyl`R>?bn3c9}~|ORry|~zAQ-WY;LNop)@7|h$qemmIySkb47xj3YM01oiax~ z8E`u$Wt|wPS`1#%0JJOebn2Cf!o_j4G17BRbe=QXw+l0paO1krMJI!JX{igR5QOB6 zP*{OWvbeNKdXa7;pQ!kkYWnC=2`?y@#E~@YpahzUVgJra`1ODNJ@AoV|15mwp|7(v zqO5Y+j#CutJ6xvHgnO|BdfpYd<=S2F!5?@n96Goaou+xtmVm8pc1`xNodMjjJrbr& zy$6k6hl@CyM4FCjcV)Q=Cr>QE!cv<@Soj$ve*m>#fZ&cb@xYnb#w)S`&2=}kMIx$e z4DC=znYEp|UK=V0;}!!-cM<^c3P%D4HUa>T`vjEQlVq@lwkWcu_GuIC8IiWynLOYN zvny;+vpN|OOv9mF46sTcDyJ2_0Zm4?Jq}?=xdHr4PjVr^YC$fi-z67vRH95 zk*)5g8a^(qijBQTeH1Njgl}`)t$}KHWpNcwomql&7nX2=m9rXAp)M))iUq)#ik2KV zHKhKMXYzqG+&Da+kEc|LbV@vN;c$K!&z#6Q=`nE_A{@uBcmU!xdJY9r1Hn;G8Sz=Q z#;l^Wb4a9D2&CP>n*I_s?X7qYJ_s|&rX+aiNT6W&^4&dDDG|;dS?33y(Z@3V!o<9)Q{DRamC7^G=*9TslsQqt(k5 z9y;^xciay5zWNZ;h@Zc7$ebzw`ntJU5bno+pme#Zc>2V zLK$575)c*AGi8bgYB-#B!ilUlSQNr)N@i-;wRB2v_4e72w)m9o8CB-+1WB1ayYO9O zBGpZ*R_1h9Re}9Vo16QTJt@qAh?cRw;c}s{JZe;0etBz zPs3k*;c50v3Dgt}zx$4Z@ans-foj!smysi}*l2>b)EGh=5+Qav5?9GglpY;+JYrP2 zMCV3fmKHi3BmtKYfGf)lv~L%2Lu(orm}y^G19;G{ev5!~Wr`-v8L)Tj7_TYCX}Gsd zTLGIfTG%pOZCV{DyClsNfRG<^Pj&5z2jD8e^O1%Z@%#^`W7cfrnyHZr^PXB-lU1k{ zEP$|IKPxlLhCq0s#hqg;cg9SLtEWvtXI#-xi9$;TDVW|vmqUC{z)kLZ z)x;0A(Q6IMAvdqzch9x(=5M=^Q+`}_k7}FBn_Ar#s#CPx5SYsGTT>Ma_sbevk9%m9 zX)32tt`u-4yRgkg20acP8Hb~do_PbFKR%DruYs4tNtyQJYy&n2CO9s zMJ`orq#+&9d9(>T2*QJVHEf<5GI2Ieb@f;cQ}`nyiZ?Xqsn?jo5D^8j(Gc&F9h3xi zJea9sp!bs_MBQJopt*sarL@di4pI_HOFGoE*$qzrk-f*w^(Mt;^1P;?lq4TH9~9?X zMG3fo;CuG@dAK;ejK@uuWAw^w5%@GjWtq z+^TA9M#=VH!1?xo9GRhw06_Zry6b=wUNBjBK~#~uU^<@!)){+38vXYA9{OU3oC+?% z+}tWWiQX**b+>F8X2}Fem8tru^0^kFWU5q{43kT&N>o?qPiO}_uQ*^^!aWxh%z(sJ z;wzo8UNL72RX3~H0zY9Y4U+IgpFs`=HD$Ns4(D~L^_2Q)&&@8Q0YX?dd+tCaTNX{|Ig1Scih}^(HwN6ULzflsU$I?m@o_MB-Hdz<;?;eHjpoSW$ zM6~_lUI|Ln+>I)^j2lTPk_6Of9&j;3z=hBOOA48iXo?{F+mMO7IdE3(CzduuCpOln zIP0O3m@8U(JzG-6!Df^5UBu%&acUk;o?Yg?-Y_cV>^fNMoORLb)oFMO`aI*)1hb!O+2&TWZ4cQ%yK~ zu?hS3jKJhb9XeqTq8@^-6S7Ae(qo>`PK4(nr>$55N^_H#lu`AIUc+f^vpLXX(jaay zq69tx(Xu`$0dHM)Q>%;DiUT_7mzKDtD%kW#3p;s= zL8yf{TUey$CMX*sWAk3hhH&FPkGQC92msoP`tVw1S4FT$d%=WL#RX|89NVZYNW*mu za^cySbc0Dcot_QVZPu5}Y_7UdEBZX3~Mw}5K!=F-JrFMx2PVyx3z)nn(kk-jL zwVSG67JN?ani;>GVvDWX?ew@PYjL@a>UI&2V}?TozZxEbGfU zie-SWq0jy~Jf%HFo*2K1*md=r@dB}}*SNHOm~tpc|Kh(y=>UVN1g&NdmKzFo4v#{E zLL>OiB$XCBZLUzJ1yW{-NTo_fb#dI*dQF_+U}lfRg3d7JlN1cm&MJoy3{`4uU)E8j zKmF_iEH?oLs$p8Zpf3}8T3t#S7M+#2FMXM^VN)8-HsiZVpy_~c7az3F2TcIAMtC|w ziliYIEl9a>0BEnkSMX;2J>miq1-0oKk%||LhO#Ib_AzXU!bKN-H>m%%3a>7N0N&zi z27s+m1)?qji{`V{YEZ9MIY2>$p%fHeZ8lLln)FyVZnN{CRg&tgN~O%wvP|i?p)w3s zYf!6Kp-S{__#JH;INd@AV>N0V2#vUrkV}uuJA;@yhJfW{wGd*Qpg*PZAC0mlwBWfhc~TELcJ;BTvNf+81+Y> z`mK}@R5gey5mcys(IxCda}$izFh`-&X_)QE z`J9S1xng6H2RyS`LRZ*YK@LO*6h<2|e&z-M;1a+iLjnAeNZ>;h{^LQ*g)B$j4lH_s zwy0I~cdkhfaIwz7Mg>sRR5)54f-M6Ru&Fu)W94zELj|@jF2gox!fb>#(Uvw3Gc;j_ zfF%QY!=!p8lT)I^2*R|II5)17z+r(v$S2yGV3G3U*3J%I5~!oD)AKH$Onz;otJz&2oL#+eCi zTNacVZDv=ztEuGgqngP$FqJnHzA4%3U^6JXECx1?3N{zz(|9T$5`~0E&K~qeyA~Y_ zVK2Bp3YGq*X{tmw+W`|D-7>HVHq|CzTWt%BSI3|dR!!p#iWyz1KzV*1Cgx{&=`L0j zN<0J{)j;zMkdUPW*LQ(&KA00(m~yNnO~rsWaL~*sq4z2yuDN(K<}&wy%iSxu&qhVV zJnms^8NKD<3201gfnCjQa0so>p6)T@=|XP-&NeQ&}=xPwBD`D_3|RLUNG_L5I7TUN7rhT1>q1W<&MgS}G{960T#V-?sV)>>l5R&ct?@D38HFsSahdw`#WOni#J*J;oI} z3ZkTepKC%qfOmA8;%+z!zl5QQ2U3*`g>8tYf{GLZ4%`N&;6Y|BpFEdW80t4!5?t}g zeJ8k|gr=_d65DT4LOU~p&SV?nF+BMB7|QKsgw-~P25T^^290Fp(F6*v?X^v%cDDgb z?Ik$VI0GkE&%)W|i!9Yk99GKaFRleVwN99e9SotfGAszw0oZ{Z+UTZ6k<5%4sV?>> zjPw&F-n9DWcgB6gzBnHLZ=)l^03@G4gjwmmUj?mlhO>DR%_;^R$);U{Q?O@X2kaf% z4x?pMt@U9TEDv!>lyV~qgb9rhb33!4kv+G#1QK0Qz9~bfe)cBJei~V_ZYoe9sYR8? zC2rU;lEM8JBImcWl%T*Zv6pfu3VlBhSPXbyP6|e73(9S16Q05M&!dFIlNm%WTx=fY zHUZN_A25|%UDeG+i49lG{`LX5xxENWokcjkdr6-3+H8=iq6sW`nZHu6jat-W3&`s5+V4^YxL$x9H%9!hq)rd)>8IC}m25plNB_P@`a(V{T z{1Qr%5_HP~NQp$+fTa|b%*GRu0&e-F{HUva*>lx-P6$yiHp5#jz;&;e;ILup_SMCd7tP^LYq%<)RKe|XFifjo`~n-~}do$P|W zqx)dKH4k&`c{saz9*)gFi-4Tt8$tGNP+A*^#_2B^mxl&n+mMSpCyoIM1FVv;lZ$Kv zDw8asG1|2~B%x&v3xZ&5!vT=fa|!$(sETjLPv0#Z2*If2R076^M}>ZN)hFP(u>){m zct30(+ybMuQKPZ~Z4%_6G=0HzamYytGjYmg@XD~xcM(W&f>H?gOr0KjluhFlw**PM;3C> zH=^LGvteWwryz>n#CD;P;n;4s_yskID}1Mb8bs#v3_KffCOeS8$nA=zYs__!xuiVU zsvQOi7b;}zkR&;&6strnO(+40NQs6VmeHf^Y?9F1j_^N;=Yd|cL_4ukt8z1yvCm{0 zSSJTJp#eH^#H8%K#MTrBF^`KN=juRp51J!8VBhdwIKA>Byts1V#1pe$e_}C)EqIhi zDS%Y=0$6yw4Xu(owF)XQ72wY1bJEas6PmiYw8M}bvcLwbr72ItKk6G5fHcPwmn(b# z{rEpx0yN>!ynEf$&BxoiGZSif#b{;d@83Cj)A-h*Z6VV|lx#~OIS3pg3B0Jh?FA8@ zjYiT*+99OM41Fd$se#Y8NmfzmRTS`m79LeaKx2A}kmr1)J+fBv1y=fj5Lw}aoyO^p zL@?>OfcHVXDv51_BsSNG+Cs~wF`TK=@VMxE!%~?B5*f+DHouWLI{%9cCUElVh zMz3*eMOTcYmr_pzCQCv-aA>JWdSFv^lI>?UYv{TQQ$2*=JFsB^Xn#6rNdF1_LF)F; zryqu2yygeqP^%35uLJeLyG1#`8>pdNrJGn|(6M*Q6cNCrlWdc?mFp3TgU!uq;t3|{ zL1Vn?Rj3Sa!tZ(xm`3Ag+hF!%GLyYB!0R)f|LmdiD^ zS8A0S6A)2`A}Uu*+hAaFnWjm`#IFKZvjzbalc%N$oYYH9Gt6M*z!B&y%)-ivCm?tX zmD4T-wKr5DTr!?7J01kS|DU^S{nhL$>(5$izk9#eb9?7<=Ek(NnNnM!GPZ?QX(N?T zYy*`sVvW(nPlUffO+`b*7{Uke17D1OLle`W0k8N0B1+RJ2$(qcnNS!C%(R`JIqz-n zwU+C-thM((=d=;DoxaZGopa{A=e_Oy?C1J>em}#;M{q1-q(vdIG0s6nK7j>u=YzjyDkvM z4Msc?L+UWh%}`9w)Pr!|Z7?;aEg?9d4V5BYVM{Des#<^=ufzDQ_d$8}D$KU7!0aD$ zm>%1J)dyBUy%<>ncsne5RU;>cHpW!L$dQeU9EoR{FB#9FA)sD~5f9xvQo!`g3}$~j z1$XUwIB2V|_O|e`40)hNk1I_7gjp;V z?Lm{|De?|t^IZEUuK62BAKkd`k!#ftt{*VB=U(%^3#AotT|zixqG*K@aDtO1e=V>y z0_RFQCp>;-=?xH#@7|;Rrw{fvAKw^^VSO})L9Y*k!GIVBuzI8k1$w?r@;%^j7|Wpo z@40Gdqf&*Xr@|y&#H__4!-+o%)jQq=SHJl8P`-E#Ui$MMj5bza^W-Y^=#1oiI@1Y| zinGtU57_8yk}x78LP?y_Fc&qY2jMZp!#%iqX$!9Y#S5^w`~zgGf%W_EgN+k+f}YKZ zt(1x>az&0vGIhpFFix{HDq{D%&sgn+j z+f(^xgWF<%6J&D1t7ROf3?p(=lawYDP5KV8H6+%_Xu5#M$_nLvNe6%JwiDo| z+wkI7z69>O&%>2J$w<24z}>50U*KJk2vw)oHoTl2E5g`cgg9NWiU^6gPspC6znQ~} z-<`mfKf40+Z+(ww%|>^hg!Q|Aim2eU^c&IpWtxEj5Sd+dEl`c0*Aguls;X<&+@<<~ zj{}Y((Pnchh`RK35Q+?3i0Zpi&_DJULiKWMcs7g26paZVq?4!Tiz)63E0GYjmOry& z-P>Szp}5MpMHBumw*mgf<~x7wKyUovaWK5qm2oJAgYoqSWPqqXNpn=g;fW1GxJ%+m zO6Xm+m%tC;`ZX2@=sBp^!%!LCF@i-AY_NXEPXZtV!Pou;{Kem)5@(_W>c{1QVwkH>NnkT$3_Li62v1lRF-FxW1si}rnwgbr8S9JVL3 zJHtif(C{gu$ktz^<;?_|j~9g};&e@#D_YVVW~mJqwdV^aRQhX6Yk}#ZWx}tABweAF!PeCV)A+!b6Z0Khem)c?`DvBIQ|^iokvf| zs1|OnI|A6(lOyDy$*EB35cO^mLi9ZRR@csPcSYqHmpw+;f;{Z*46#2D>|WJFQJgAa z3&yIt-DM^OO@J%U7tay-HO(^-Qr16e@8vIfUU`(;?4K(L_>= zXoN<<2D~jNmlp{}CYgeo9YHe%XZUV8i;&;ke8-&|ozX|ux@*DsR$!S;<3PJjA5%)f9RLKX&Q z^ET+c>t{ngxIY-*oSM#5bY!LmfNJq!x&c2E<08ME)&lXu!ficXexj zwktUQsf%F$>KqJU0r~jNFnstS=p8x$9h8?1-W{9LnZUj9^&?f95wL@9AuGEQLBWT+01C5#hYr9>S9c{PphWswM0k7G>#t^L(+3q_3!g^gerc$ zj2=)AVes&%7{Q=73YG4FjgHzZ8F>T3;2B*vf|YPJ#jDgccsbM_fOWjzh%6#5p=3Z{ z0c^$CB*Cg#z}oUxT`oWkd!QeEH%$I6JnlP}K|d2b;l~u*@ze?E@5`Z@SPJb;wkZse z*)UY1;l8t5k-aLNFmPP?HvTWYNRaLUfoxsv z^>tciH-rgXIuH2a1Mj}2-|61d&qk2vUFhPBG{arj4y<~;b9oO=Mm^1I|Rj|qR&V3X8L>`xzNJr@ts8c zqomIWVgOo2@1;{~27jkkkdy?;n8vV~;@Z*d{4Vc2d|y51;dA%nFi6U8@*1qixN>qrw2W(c(W`~e`ynQ4B67swZR$LQ2U?X z%nrk>(amfS?3Hl$HyR-l6(O{%H|oRMhkg;vp*K;ck$?RnTzKj%Os`H!B-?k(P{>pv zPrL->Kb#4_ffe;83{E``{acSgx6+~d?6T*>+%|kqLNItC7~m=&Jv>QB>6G~E$iV_K zmeX-#je)SrsAQa;%YDJeN>1n@(QUAwvkb@;AxMUj)mt`N%#OGHOiOo8iNO+JL5$V< z*p6Z&91Xk6Wq^H^<+)~LZYCVhndaO`r$k(*ggAy;llp%@+RY?JPc2Psot_stV6u#7 zzXY4l7&e7k8QpMyzn8=KS5HB9%k8*H0@;6FhD%R<8|K#*P@)pg$G!vVpU&gv1gP;* zSbOpb=pWt>1!DXV0YfMlhICAbwrzj zdVD0er9>(qlR>$(4R$nt|2KaUYR_wthR{(!ji645J4Apefw#Tdj=-1JZi?rN!WbVX7i7oGenA3HVDGMIo^B4<}bpWoaY@0tagp#+~+tN;ph7B z(zE{xxLP#2<85&G)Ca(XLc<5ohoqR4W0Dx4mp$8zX}yTKwJsQ`#VjolE)dvgNWaa+ z!od;}#*kOj)Ry5@A*_Z`=-SH#q+yQZx?mv=7o$A4od`_e8IH!x`qJz+(*6-|R~Iyj z=+}(b=~y`;q-3TZ1vNCk?oDRBL9r$p!Mq6F%pe9* z?4-UQ(PDw0mvH?3?`86G9EVkW;gDC+DxDZ;O*D4!jkrk2Bv2>uY#Jg*j!*d)<#kZ+ z=<0?jtZ$e`Y+hsNpCK3_Zq$KGc_n*z-+D`}npm-18eJ|ZZDyq}=<5puWGFymKJK-y zE|mdNt5|weIAvGqgn{IJ4a%_B%=qFNY@CHS`^1SuB-K+=JZLAoAFl1iXg#lilxY@B zk~=A{+aQVbvbF32L%KNki~kaI!q>}Anu!-0BN#4f5E1Qh#S_spl_yCG>!Z<$G=ygu zKYQL5=^Gnme1ZBTNn~IWcHe5;)O*p2_i=_xW`H^KEy+G_taOvdp!p`$bo8$a51ngx zLRF9W95CB~2sj%jJ|}X)X)SqD&EC+8QK~jpY=;;*al}0+rAPWzpR%r2w2OHcRm4o> zoJic!uo5kubFxDs1&Hj9xb&6puYnY`=nZ{D5^)rxw7&6y#A8NMrsNwUDA%nlR|qyt z1z|jo(TtCjyG=}-@M>uN+Izv~C2ycDu%X&{8-;1I5#7pa^YUg^8%kyL2Npb`bF#1+CBIqHk02nRm0w zrfbU8kK=D}sZS^jwvz!>_j$ zdBD>0I;U?KUz0iC`-W2ZEA&ovvm+xz16p`cX4#4m%Y81PweUh~;iV!ZiVK3b3w6G8 zHyv>yTK8=lRu!emRZZjXU>7N$Yp_Em594i;w{}u2M7amrG4?LCVdBqI4(b@~O?$(R zjg-ld6sfMea05A>*dHt@|EuV@#+fq}Q>pT$A>9tLOHuZdN}RZA8aX*jzCzqYT!TGG zy56t`xB!+e^^(KT)orQPWDXZ>f#8*k`w!Z^P9gZ!jL+ApnfJBl^NkjT_fnnKo+MVN zzD3^09;!*pNf(_I9I;Y`R7BMJBNpk3DYvU+(oyp2WmOS(jJGA_c?;CHtC(xB63>U6 zGSrg6P%LyJAi_G)xINUwo2p5fzbm__GgFxnFIfndgHAr61X=D5|0@wVq^Sdg5hn98 zDg$+s?a#Ml88|mTF=MdR16dFJ~8ZLzuIy@7K5}h(eNaCh~qTt zd8%Ov2n&qNAw80c=sKwQu=gv6c1E64+mu$ z3^1E=LW`Yxn-j^mj$8YCNMqexFX(qD7WpQbTKd`%4RgX^kSrG) zo@)^dQk4W)t#nE2oiyQg8IAck;SBF_!J*#;XJO}#SiMMyr=m1r2=GuiNndtLVSpj; zQ?n`@r1=e4O#6_d8^_!)&k1K|%|g)2JRb(oZvdy~Aju@Pk|NUpIzfxp)kheUe5o3) zF;@JPl{I9HVkj<=-MYBX1TwT=0IAU}UpkT$5@-)V??2szJ9X0y zFwSNpq$Swd}Bv8t6`ZncMTHp4Y#SxOd~T%&J|bKUTljg4m`rJ!1{&9d<9#T*f} z2SW%K?j&5yHh8hEYDzjL*X;zh?KZqrZo_r-gyC3E=Tksb{&u*3YraMO!vZOU@wPC~ z35J&~!tw6%6x8Jz?PPPGoQ;pdeTZ7qS$Li8@S59GqJ~2@nxo@z@~#nk^6UQRzXcco XVp3h7@hTb}00000NkvXXu0mjf?bk>_ diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_148@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_148@2x.png deleted file mode 100755 index ed2edb2026dd8c164a329b1387243f8300f6c628..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31133 zcmaHRWmFx_wk_`N?(XjH5Zr^?#$7iq!JV*icL*f7+r|m*5(pC9-RJ+)k{ zJ$=mG0T7Z_E*1a^MJIC`fF{7)%Gd2DKm-B;n#N9B-&0>jS;*4GiOu{U8#bVm>tAmO z2oZ6htGT5Ez>~rPU}NVjN_ElMOGRO4B}%2otHPn;Dh;r;Q}A;KX!)sXTlzUz3R+Q# zi&2OGh5iCK0X)qqfKHCi9zsA-s(;}M{muVV%uYq|FB4A(QL6tUrLUq+A?@N0px|ZW zX0_ztuE<>TXIq2S`+EbxYavY;x&N-~ z?~^E%t*57}5Ieh%j}MyOXVg|Bt@xf61`_6WaeP)c-E}tDk?e|0CSL z5C0>5fb(CyyZ;q-TwLP?1cW!bqKu?A@YiWKd>cT=m;e2Tv1+H&Se{f~5vs~q2#+Kz z4CWBVEJJZ+ea;G*rQ-Dw{z7Kv{iG2kdIrGmIg2=G}6 zu$#7=Y+KjljbNDzfNaALejja(QtWN@%goX)VLQ@WI&J}g@(E5d%p`?OP9_t)zMZ%$ zBOyzwg&m@Sl0?gz@x$65vE;84CJ^t5Hs*wD7E7>MVsdXyM#9G)U*=I9IZTNkO={dN_EqbTD_#wU6>HgYPIJ$-&ZsvysU|6;hOtuRG zl>Q!9Fd=(*Ae#`P-?RY282r67M=!aEq$eC>e0*WM6N-Tv`oN`E5_q3n9D-O^G#*(v zeCE*H_7n*t+=Mhz$8s@PjyZ8-a*|U7-QL4C;7uW|+AZhk41y){&D0l*CE&L^fyjX^ z0w%Bsf$~-zX%KQ4>2vK@4D^Kl!#oGGaomT#NQd(<(n}Q0A(KjY%COpqoKiGtghBGA z3;e$-5`P71Jw@27FPQ}`AbVhN&>AH|8s$=(z9H#fAL&U>b1D#ExYkEa=e+l$(;=o`H{Ru;YzO1IjNJC0W zTDXtN>ohz2=*H6xzUjSG^`VS^aZMep!w&YT$PBrVomRt$Jz##^A1Bj~Ua;q&V)cQ! zkD}gwEa*bt@A<~?X5-@p}u6jpk!34xbg z>;vVb%vX9Zm?4OcBUh+TUh6auG2IZa-^T;!Yvi{`>nM(;A-;<6!i^^eapt<7j7Z*R z6zUX&K;SPD%k>47{)~#E2$xB=kEuR6A-_&(0E&gFht{M?PD=iCq}0qEx&ceih&*9x zOTO>m#;Ad95(f{Rwv2Bvs|@5oas-hDQM)i}y>8lp75Y6}WC_9Vj9XrUmt5 z{CfBSy~2kk35|IlVHD3LzCu*w!?rUEk(Whp~37K$Wu!%T615;4{lWV;>$G#_kY*SU>&kx$R$lAYB52=$p#5j9cdm_^|I zT`lBP5&|_rqOBeF{g@Jg?-VMSn2CC)@<0v=-!O#zb>Y`O<10C?Rc#Cffo$RV;DwWm z6b~QT&sQ!MzeP6=pAATk+wqsHSAqcaqTSHe3Dd`)@ToS!zjih>gk&*wOrkCNAT;Sp zKi9qblYbf5@WKNRV=4r7<0%>DU^LmX0G*~SMOQ`=Bx>iS4{az;0NB$j5e?K%<;E(u z@=gf&lc7Ty`6#nzYi7Gy^o8LyCRBTlUyS@R^<7^|?8oQ-zAT2o++A|uCX~^Ztb*}3 zg&Z_SQuL7@Z!{8weXVZ7prv@p%N2}AX$4427^1O|Ac^Uoa#khsev*8NOW&@E(RbG( zda74v?1gmB=y9^!0)K%CQhgNRU@vwkeaTD^CPBZjh{@4` zieIY~-01+~<|76P@TzL2$6pl4+#A3RMhdP=XpDuoHNdeyh_dR^i^j`}w&Bx0&)>94MkY-eUhapJ z3g1vPd*FQ}?B-!8(ZZ96N_n6}$v|r1K1YM~wzNf?4&r%Y45J?EmU(gY)PnJ51>``x!*vZ?5;jIqJ{<<>L_zL1TyR zg)9zI#_p_n?y3rHXCf(Snw|q|&3T87*jaMUR^llWni9OZ>AmwC;fzZr`ZPVGi(n{R z?E-eo8TvtRz8a%^0&?jnNDzDvHZ!L%EC7l_@z#xE(cCA~FE^%7$&k~vf~jjzcm z0J3_0KOp zn_4NoX?>5UjjTubqaNn-YC-V+3z{J?ks2A!*6(L%GRteuWZma;*e$Zvw?xB4oPE(7 z9o%QPIdqX7EB(tUEpVq7X}DoFiWt_uXeWoFTak_XC|cZ)H0U|atb=BYkSjjzX+ao2 zIeUuyU-4XegJcG=j)VbMM;sTH6<;WBrl+EtjWoWOM6*G$a(s#7K%yH<8f_adkcBMOxv$ z8&$0BA1M{ed>h(DR^eq!`&g6SqJC{ESL2%?#k^$~hfr#LR_{Yq^q>Rz z@Z~?Jc0;UxiMk!s0Lb=eOSCM*H%sF~i15N#bir1dxD%u*{rr;gWzvcV@i4aGr`}W^ zbEYw{Fmg0-DePJUxzPO<>Wxv8rr8f>GlL=SkD#X4BWkVi7QGV|@1FjtC>?5T(Z((T!x`GMkzj9@;84qv!IIzZQ6T8Mq6xCJ;gs%Gfue>q1w~Z%~(F|jcqZF znRyU=*buS(QuyLS(>VxjUY3PWXF5d?dgi@&ogfv#UPc>%AF2nHY#;;Vp24q+_d?qC zR)w`&jtM&fz5+fQ@BWZ&QRr5jypmjG11NSg`ouJBZR}Th`l^l5^Q@;lHEkzP+0PO+ zNP785ulAA4xyK$l1Ye3?VV-07fOpZ|LMD|60b5#Re7+^;8$%gFoDsXrWr=I*J zQ}Kz(%qXh*MPTnSRs?78f+`kI5#^F4uCc!-Q|dmORW^59Z-~V!pU~7)sNx&RjMh^| z`~m}>M0FlCUr>hwJH$h7d3-W$SW_}ggj38IJZvgcz~qls9IG+N-0VH7xXs_c&(akN zC-#+<1E~8sFq3&Kml70()5W^kz5fxunEKRb=9I}XK1C5u3F z1&)Vu$Ytf-p-tGwg@xeiF1{L;MH@p(DVNeA4;tuLC_RvOhxK0y>llq(eKBeRJ~gPb zOPt9b&l;GD3ZqNe?Da;pDA6)~j+~^#@5UkOlb3<3vco*)TuKFMTog_N!^4!>luL>< zu#I%reSZ}<0MF#((=;X|&zDG*3A9FdPFlyuflBtm@ZMjExIva^z#Qhjlk=VG_n*F# zV|sm8cKs$)w{bf2LH&q>I7n;jL{3p^$)m!hzvY4uWhEsL%pcnX__eYnEtY0-aK zg2n`u>(>O-SWCk>U*-LWEdMopWpf$)4g(S%47GSmS^j3LM45taZcNCoJ81jO0_+Mi z5F+(Ivu4k&>U0!>wJB%O^Wr>M>E%{2CAh3d5vd5@T0_FFOHEy=nv>QV>J1R9IlF-h zaZ>o<=r>Dm7#gNaGBEg^xab2F`cViL3lB&lY^H+0fg-tbmV3}IR$1PL=b3Uv za(ohtzWawerRp_FgaUGGgds8hcTeJ~Gd3>I51*3a>H>6!mo9`6A=UE_&qZ`GWgS@i z2Bflmf!pvmbx|{nLEAV{$b6=n&C*Ny#ck0{Dh}-lu1Z{M9Q|KUqB_9ef80IL0XQGs_wbBGEojQAArz}g?95UU z^nNI^-fU|wnUfGzhVc}=wI7Ukh`D_Iny7f+Ui}A_{45l!Vf!nZFx9HdJVP`pXS9hC zNDzP_S-8x}Rm046l8KY3i1|~CmMi8U`m7^(TqI5fBzQ`YhUm?4P*{$v1M;aB8zuFM zcHTrvuvy~X8osJAXPT8f)l&xRm8?zs_0*i)L_!7OpZ~rN0xF99Fz6G|?1S9p!VKdm zb{FsThFIr~wYigawG{`4k%gF;YPAs*l(fKE*(V$|b5^QwJ= zFTpV8->~2QQ6Z#@sUD$G9F<*9g;0X%)E4c+J3d|9ug&vjpQVb}z<1%Nq zobJyFC8_KfP1ee-u#$wsAygmFhcqdi&H<}5T9V)_CKW*wI`kKQ0)k+A_+lx&UJLdu zL~Q%pD8!=!?r!W<3VfQ)#WckXSv8q62W)_pvsMv)F5b$jv8^Kw=2|s zc5>>8FDjP-G4eO6$oDI%#wsg#1&A(jNnktPP4v|8C;fR$4==!Ofl{#U^ZF4r6UiA$ zB3XEy(liy&^ZnqaL1fJ|3coT?hy0Wn9bz#yYamUXxoubmTH1T^>9zNOr5x5I<&3Ej zeNwPFBqERjQA~z*0mOW_AM+E_^alYVQ)4E@qSjfo^dliqyR4e*OKOKrWv*Vbc$r6H zq_G9K!a;6?;eyu;fwB$O)Coo2tYif?c(Z5Qw>7`-1~bHD*Eo9oc88BWx__@wnkZTk zF8>O*H0^-Cgx1w04g~`yxg&71weJDVH4vUfmUa-T!uH}5Qn3G&wQFdFkV5j9#GLMw z-sw?cNnZ^CWy}J*?)Brrj={UG&&1Eg<9CxqVJQY*1l8Lr1qG9kdC?@My|1^l;Q}m+ z$Yp+-oT-{8X;==l0IRT$FHq~HSj2y3V{$H*17gWP;9MLgzGwo((hl~7QBH=%2|durq~1m2;>iaA zlDm%+oB+LKxpqdn*&aX7kOZkmwe~;6LKnnI2;(Q|ZJp>*nc=DYBHK8R$Was|tVS5i zxuQ^B4+nSo>OzPFI;+XRDu?6whL}8BTx&Cp>Vec1>Pt0Eb(z{XAKug`w%AJdtYnjd zrLDHGeZ43E_Wj+69$&@=+pAdCmM2f{+m#7}A{`HMS=r-~RMC+A+7IMlTRlP`SO||Z zjs`mv6I>t;5{t2gapxgi)kMkjEMC4U1~Ws0!yy&m8I3T>EfK&PB8P<2k865;{2yQU zswf@>!~&rp`D+mxsJ6m0MQ^l}ykJXSh^DDKXH_0wT@XgAD}FWqxqa$BCH+pNsRT^+ z>c>yb)3zd}wxxj!&z8z!2~^6#A#&`2%yD^N`t*GhdX_LmR;jWEI>f1u$wscxF9c)3 zmM#pv<^#h4yl`1Ie2M&sfC}?n=ubs#B(uLSX|7~m<@PyT#Ta8{{0uu6>DduIsU%U5Dy6lRrLVSaXCcX4fCe zg!~-PgI*vO2fCuqw&z}3{4pGRK?#dPw_H5G5SMF|UP9QfE=1Xotez4&ofFeUW0XzF zI~p<21X@IH&WYb@uJ;kG*}TFbiT#Lnn=M969jr1{d^h#F)0>bv$M%QlvB)jT-Y0&( z5zvt=H6Nbi*bi@ATHfXZ(ygHBXzU1Hz;PiDib9(4&)`1>_Ng=X z2AA{>;*sN2SsQ7e@lX#L4FHEIrJ(Dn8tF5-w7U)I1BasT2B1 z${#PEdC?!Ybt);)UwZkUX)0#W&Tob)@M`zPrDiL2^?M?Za?bx*vB`DgOqez)>pk;q z^#tMWjpHOs`Bm}Fv+-_~`-(?ppyp)|af&pqbbPMf^+w*^m{a$_4J&@7?_i*7Q4v^=^dx;{ge-3ekIAhb@M+Oh%iU|K-5~gR*3RM?$n+Oj*cAjT|2_o=9qZ z2g`&6A?z19BF@FQEKK>_13EM4vA_b7HnL|?kZaY2B0gAUC@gpl;`H8!zHrV<0~^k5 zLkyY)`o13JP;v-+c;y5_O#n1=!uIi5QbU=RUbT@<30zuSm`=36D_OOvw?t>Rkwn9m zr@Ymz798fl819IFo1jd<1$(RYGkKWE6T#rnDjjkJUu2OwtN%WOzg=G_g8*#jU%;aj zr7Lo{PDZlx{+8h;Y_RF6n~fI2ts`TN46e$r5H{NTf(B(qQByQX6cgc^`8C6Cz?rxa z>M*>zDLNqgoaXZ!Hh244*W9*mqJye6vE=Flt&Q2-NeBa%=HQ3OmOF4h@*#7tiC6)e zZ5$bs#JO-T85(x}AW~U}S8^&usC;TzTQ>pqEG}XDGcze?PBO#QR_S|hlnD&EMvwE> zjxI)HVWfX?xUxKCC+WGb_XK2VkAccl6Bd=`r7~3RC07VuRVf33==?{Q2qliz3e==a znY+mpTJ)EUeCfN=_MQrEyoiN{6eRO5A*f~6XUyE*JE|5ax^-gGHl3y(=l(11{*c*E z-y__Ks>@)rHzTfN7@N$G7)ZuKrW#D_K#Ad>x$@+3Uc5v%!)7VMzC!mDv;#vqznrf)Knh*8JAxIR@OD?aOxm6kl*K?Rvs2ZO-?6xX-iy`FpJz_ zTmQTNuA6b)NTNg_hwzA(!xbP!S%jvYZs2TQJugmngPc6@K+3iPbn$nzdQ zqIF-bQ%`RJk}&jbQ5Ru^>i4;PTt|~je(YR?$ku^h{dU_B$_O>SLQNHev8Cct{*P959VBM!Nx3PONbsjUL1?(oU%B2xP9bn^$~uVz>{ zvtnshDH${dG^wuQr4vC=t?Q2voZ4neZzgmk|Q;LK-sV= z_HAytxBEn%la3Kis}sqb^vKt>cZJ?>bhsDM5;8w**F6cb)=4;=rqSmtO##5I~KY4emHH5KG zhMMLciyGxt9?usJodVR}%Za2cR~i@Mh8}8;De|AfpERsf+4}Nnz%^-e z48=JRDq22vp#%&oW@vJ!+`Pq31f)WnQYsCniPtPK7M^Uk|B!rlnpTGnBt2d{$WhrL zd`g>|MXhwAsL2>>*@Z0!_PLNg`zF#;J}>i`EUzHGE_{3%SCzrwc+!x)VbfNy^=~tw@LUZ}~`;CcV)PYN%~BWEDpi zbFi*|{tjD!##`vY7HFndPp$qR+uTs(2jbB;fv0V+~G~*3i4x7`6=Gj}IqgDf=J#w4b&*Wer-|%O8 zFo;X$mL+< za6MBGpXtIE-iF~S3;1lChT0VS=;&T!jPuSda)!?ND3ZA$Gk11VRXL>$$*;q6=lEk5 z^_8?Q>({cjZimdzQ_-Wx&u0#wqvMy9B=@V+m~K{?(tO-_ zgGAvr4f`*^qG_nV#wok(BzZ|0tg+pBNuw(o303djwJ9xrpdbvdyL?T&?wfWTcBP}e zz*aBJjYjXhZ4&8G=)5I(npHCMEoo-6W75>iIo$n(J7lJxmQRI)6H;NgioB2*fmWet z93zEm6sctMA&CY4)(2mdt-Vd#X<|JA=ENV2)Uvw0i%)cpORR!u15Er_O zus{EjviF_H_Hf+gt3PXC=?g@@2v;(SNTpZxXj<3oYr%K*OfY{;{pK;cFj*eog->kF zobX<)BD!F9&-I9Cq}83FbrdKM*Rmh8D%O#uW<;UiX?S(>$F~u2{1|SuO2UwYSGl7JD30GZ?$}Tjn5Kgt8svs9xdm(*F?8g?=mJRz66pkEXX15cu=kc)QByh8_?Bz>3%E`h5Y|E?zwmh4h(T&; z>?l_2ej4=bqLlkewhsA$VFFJHi$6hu2f#5u8J9&O+&Uz8;aiMd0b$=wX7E}FPx#BBaCAS zSMQvwVp<@_*x~_l_MzIzB>dJ7Gvv7XD_G!-5~p_E-$Mp3U8WN*eIr7SAlfzQg9` z$eVzRZk!FOh_yeL^A!%{TdTC?x21#!OFuJbq`;Sk2c+@n7l-wqMbT^b-7?YXFhP7W zkCkAdP%>C$$7lGXt{G+FMG>&ok*LGO{f$RV-N5_Ys=;PIUj$ZL6^N5*n>`_R)Yt8C z9x))F7)iFE^*t;F_mh?&Qf8L1Hd{r;^~HIF*QNC%-lw%91P?n%}$$qs+N5TM_5x!_zs6_>46i|3@?ifeOf~*c)d+V>~GY+4MsRczxAe=QKXWqtK_xqjNcKvua0G7EqNXA49UG znSN4dwKwMa4Vl+Nl!+-7Q72TWBg_5A>xebgp1SoXUoG~e*|#*BEN# zWxs=FeVB8Fz00u|zY<8t?Xp;2Qx?E|aFlK9C=bMHWvrq|=-)aj1H@0uf1jg0c0krD z92pIj=u^`zhGpD>*c<5xvhQ@6BjYxJWV!x*Sr|nqmEq2pnm;04&rhbJo(Ba)t}auR zMJqq^5OXNQQz0{%FWBnj7KW`O2!5U^N@S|7s|-V|q|WiGDg$Lr90GmU#W>mS8tsx9 zk<*#dXwz0D`Ih&d^VhZ}Vz>+Y`V5^?e^QPPEdeQC16LBbyh_4k(;es0zv`dsUe72) z@MCkFGoGB?wpPPdK!}7uAQ(hAQtx$M^0I%4+X#Th#+evGAXYFwqNcwqzmv$~9?M|@LR5GgH9nI97@H>9Reis1RS+?7>| zP@+Xjwt2jQ8F-XbZPGtR(wvGL?^Lr_yBv3w!1=TrTQyGraky}Z)&n!(*z*xe=ObWN z`?MaR|EHs#LlR^-pgVvsFC;({#QH&*Yxa4YfsIs45V^rh>B&k?NlQX8tHH5bkwtikA$_ic zE)7wITT)*;E}4k9ilEE;vWP#a>;2PUID5p!Tr%0fPV`ZTq=z<4Dqxy*9X1ZmZ)-Rh zNFUE{34FkRCnodr<6an}WDA}40(KD&Z=5A|tDj1$bZ0%r3TuGD$kGCDO_tl}DSK0S z^Uw+2#A8K}1qU>C$(xDPaT-f~5z#5QFAO|Aw>k&?S@_*V#m@rkZzsar=fvmXi+>jx zV)9D1BE%X~ISNNpLnO0kcAb72lv^*h$&4K{|k>y33#%-9$uU=1-|1w+RZ*ssf%^tU=7zqlgMh z3`jrw?#t?4fArVebDhhd7e??o^20^Ca}rHIfB#VP@=5aCt6gJFt#L~dWk4ZEklNR zz`VEq+a>kouCy9>C#fckp4^wjN*GR@XCVcd<(KjIs+@vyPrr7IAapZyx*@m;rO__e zVY(srqA?uCBcM*HWfTow-eG1Y-@D`+T9wztj0a>*f&MN=UuetNY zhohM0_W0fjMJJkxYN3|i_4kT8m$?ed`c4c*4qBkG+obgM>jcQrJ;~iT7eeQa#ESgT z5hs7FbI+$J6LfZwXNkl^wvu=iU3jEL^l?Z~7#3D21{93NcTMQS+J0$tQN)6ehm)lYxLJA+^^(GpD@;XLpWG5t+i+>CP! zj>zZ5ul1c0FB-Dq5NN`*d2|dPs(9TpDb7{r+oBngu%w6NDA!RumX}VIZ4z=S4afhh zOdp(G#)(n+dU>J7PS*1j3zhO`(49=O?`cfNoC?(*!9pHRu zf*A8Fg~e&lDnd&wcW}8FMK1zbqBve(5ApE|rg5va`+o1TrL`N*U{tWj>+bIILcAR@ zv>}$dqq;eHd3mwWX3WCaLxXsEYpJ?-FnkYrvjeN=A(eP5bfh4XC^2gYVtQI*#F;Z( zHZ}euc0RG&(b*LJ_FlJW=}T#^b{JN@+4QLhb~uHA!7yXV9v&i2%jb}}8bQ4(gj}mD z)os}+nL&X{{rXVhK2rJ=Dw^+jsz8*udt;c9+`nJJW2f3E?kOQuKR`g1GL?(^m|i^bwus&Z z2j_N9%Vs7>aS5y3t#D3_SsK0&50=;7#HRTIpZ%?#p%idEIKQA+c&xlB{z`6>CRpaU$o0q~iL>N%U{F)PBGhzou*Uyn@p2G9zOlkfANDfVXG(V!O4iGKc!o zk{G4&5tw>@*j{ubR;t+jZWU~EAn@{Y@(*w{h8U7rh4w%{>Iz%F;))`zaHk5M{EO-9 zCB5rfg3r}c6GG307Y`m@Nk^JAVj1>En%wmY0x2~%)=Z41tZt<8ZV7)Pk4Xsm8!K6` znAYW4s~JSkZN6Snt{&i6~ubL!e% zc9^u}A)*kEm%`p8P_lda{2?sMz-;1;V;{k0+7n7$hcFwzVVCACPA;RKxR+;+Zm#q-IjqiS@+P zd>M2Anr#Z$=9|dvVTzttdJ!=$>`PXH!_eS>hbPBlq-x$n=Cq<#-EG0z;(bH8h!XAV zqCZg-m?UCZ&C%5ukFV+;#3J%p`vD!`fJ(xzF2`Njk%?gjz?467#Y%+yEbn9uf-6tE z+^%=*>egL1L2cWKxOE;t0aDZG!mGfPRPyg#>yA8I4jF+2@4IRn2#9X^G)n|#ad|E> z5h1eWIWFD!L2f5+u8Zs!VHNz2V?4nPKiW`kKLy`gH+vRD)Y)!}I7J?vL?B%tnKo(- zg#ApeL6&&l-)}^dmWhdGxinjuW4A$-(9^_DywHF7sjNX^*fjSziAATzYJxLmN-fPF zcHKd4jK29Xm6UweM2XT=XQX_nj5?{h8;7h^jrfI`oJq@S6eZ?y&xoC+_l$|5lk372n3imjf?cRdw+Ag5fiuReBMA8khH{#B6FI0n zK)M-5M~(LgMpySid6rbX8gEDvO<6de7ODyl8jEpdbe?!iuXO`@c>~D5en-I+b8U1Yof|v} zh+H0Kqrk#|Xx^I(jJbJo=Df_-&wi>m zHE0chU0t0{AI$pT(V)u=ksvr~GI#%TWArJXC4y_5zsC>u^>u{*Px)Q_?yVaa)a@`@E_L`_ zTm785zD3O%-@=7#)iUO8ZXKyHrRytS%&Z9aaQ}i*Q9u;)6Qr{9`5*0i6^CPBcK=re zEi}SRPY(xjUnu9^1M@a`*<63JAe1GS4K%~nGahZOa3`M+1V4L#QTjw8(48GAK>F) zys{?#`j3H!j9AtBVm$J!5Ly~2!q)kKkFFegGlHIUOw8B-XKurerRmbD9yyFli-&Im z+ckdLI8#vVdld^Y^&0m9!nV!H&QUni@0pQ{x+D517uuLNjof8~+RrZbH^fuFCE?HE z;Yqt-Hr$WM?Qdaz!B(lS0uSpe3L_j_q8dzO%128hl*wKF@uXCmQVX5~H&w$}T)J&TP~_uFY~3G*vr6U4HVIV%-1W`2Wc!yu)L zW61xGX&3xy<$z!&JY++n7RnYxBc}PaCFIGHnHikSR@}lT&0u_HXygPXD{vYdAS?wI6;UeW#O^;;iAqm zuo9$VNX^rT!8IhHG5@$SbC&2pDMFGi%{QOY8lp@B2tXSn(<_7JNM~&> zlx*-R&XgI~*|@$@Bq>NIG*M=W5VhCs5o-1tDGKm!WbHf00%xt+&Eh>g>)q2_O-6wd!xyRX@SzL8Wx1#{^EB$>0cO zGpAL6adMnFKpJvc8cx#rc2)`FbSHn01X<{sK zQdDsgGi0|i>k)iJz9Hxic~|3wU6zpd;^18fBRIJ~X%vR5KyoabKg|qkD`58kjDz^f zImXTbhWrp@O}2$KYx0lElWlDswQ=R2Ua2{ql|HeG=>726Bbq*2t!RMCt?N-HTPieoYxUJGTK%rx$b!C>APlqH&8`Xx51{YRXm5dO#4IeM6Xvqmq zph%7=cR;_Q6 zxv|FVKUM4Nl}1&+7>yjKh<5D{+VU&GcR@aC;YuS^xqiQv=vcU!W9V`TDMaFQ0cCE6 zp*TpT;RvlLxfRtdet-joc+CdM(n-k>!)h_8RA z)PRc&>yprt29kojnPJl0d;U}?A<0`yZHZF@R$87!#Y2^+bbSdGD!U3~Z6CB0VK}&i zkn}czNqnzJS5qGPC2NwNIi5Z8KLv|JU&5R zWh-XZ=Sb)i8OO)G&bMV8TMaOc0)MlfmR*4vY0h!%@cOs?xW)({wT#N{h`J}D*;zt8 z_S)B335vwK^EW96X&R&JJF8ofl0@!!y57GOY|{{vQ^-@&*V}iPPm?TdIHjRItKuB6 zJ{L;_rYZlQ0Nght$gMB|Qk1Z#3{R}x2ygm}FS9`};OG#=CJuY&noDa#Z>!yccfI36 zcC06EG-`*)>dZEn?Plk3S0@1Wm;5=x43GmjL1hI!*#I3la;zy!66l#GpZw+5{0iRu z=U)LN*ASM-hM1&Qn7p+d3UZd2yF_J5iM0>g`BoiRtD$hbZ;|@_%N0L?H+YNsvt86hYPxjPe|+q2f1$bGw_m2{*2%M z`LFK+K`EUgqmU^Wy8+Txo)>PR%gp!7`$XouP|_1+ihY<3WzI zV@azejYU4IhD8()_XrFw=!erzKLOXPtqs${kq3p2PwbQ&ALqrY>pB4tr?3g!$JmHS zLd$^)vUXx=K!nv6TZY3R)w}(n)%-iB|ItUlpW6qez_`C;KJ->N!l^d7xSLjF^V$V) zdA6$C-vV-wTkm<8Pdnq~Zv!#d&nW^zOco=BnrsMHW&(stQqU>W1jx}tI!FSJuuB7S zYfI@`D>A3rhcqeueQ@iIcf&zvy(RtZ`aAB|K?>bty}N@^sm^is%2YK)ibV@X*RNE| z5aQz8eCNY(*dJsu0l&O^B~u-e>x4-$^}MXYx<{HVvZbgk;T11G#h74{O!c+KKUajY zik_IHKaGJcu3w;>p6xA`$qU+Zzy<^5M69T^Z=cfq8XiSz&g2z=c=5Y01ApOssMJav zu5a_1c`gJL3olMKk#qvx6jliu$4V0!bI1Lw;F33e9K`%NS|$Wh5Km-Uks_@-ri!T> zlZ6>C7r!o@0rO!4QAH|d=r}Q5%&1(#=e{!Au-^6lzlJj}{dn#c9$CGv!$rGPd$AT? zJ27@=r%}`>MM+b_!mzP2?$Ah4kk*B|ztNxd36{JR?_8+tMlw_0;`~nbN&LazQT(@=6kGZv4`uYdg z-V8^c@LFc$0nU4g6UQj)P)?p8*Q4QdUOa$~XSGdxz>1yKZN zo^(|1_nug{3A|%o17H2uA47ohc4+|FGJ=sJ!9!msdHI1bjU1g!z$xZ>aw%G)k2GR< z*^8FvK6-rZ2JjAgIeh(FKLml-4hMQ6r1hZ)ZWDV+IVj~&D_OiT3e?$+Bobfx=v&m% zeFtGN1*9Sy>+Pig$qIP*0~3u1-uB6_!22#aAC?`k817&7Gz`ugfbU;>E3DnP6>c%| zL01mD?JkHYd^<^?W7?GH9;`}~uHI3xkPIDi)?dgWS;T3oxamCl?9{h*z0Y^P?mYO+2j9ddoJGqH;M$JRY{2G?+c_L+ zA+qeOM~Ld~11PQl0w$#BX42LVJFn~Y-}Uo>#s@BY-RufOJ}s0EMLIseq%>1j0tm86~zTemuC z$8g;7hrkA$yprclu|u?JM<#J6cf);nywLtJQjdCs@xUl3XJ!jq4OZ!~(EU=hiRX+p z!m-zSLb&Lxli-@0?(H}d%7UYV9tSL5z`%XMvL$fc&G*2jJAa`4##T#Ej&ZvKM=F|} zC}b)esKM*bI~}gR{*I2<|K^oH=R;qAkmbgs4_yL3zx6)Yc*D0%PZcnjauRdW*5cL> zXK&oRq)apl?0n?EzXS*FJG-pIEB@(Yu+P%{AZj+XQ18eVX<((Jc~OM3h)qC&5k~~? zqzG1C|BYE+|GS@lFC4J{Ak--nOy%7d9Cc#6D_$y|2vkI3h;hPSaLiI2Xj06mgM58M za~tgrm;Yz?kL|V1R zzAyiucfr2<4C;UlYu-xS-%ng)wJaEv^+7om^x5j4eihz+(YZ5P{JXyYk8sKBUjb^g z!MPi0?5HvAOsF=DR1^#kcrZNZ^D#uPD^%k`W+oQ=VvGPHtN)X~{0_Y1wKKc^E#LYS zT>9#>pgGoHcN=SFfeBqQ?Z?Q(z!oY}coRL*x>%96mmPfY0i5+UmGVAC*2}-Te{9=T zrwVplRZB;snCkj?O}@4*#N-)MlV=R}6v;z29Grt>cmme{^h+>^BGODAe{%8p@F(xN z8016)=QBxNUo^Kg$28YN&ivC_(3;TN&>D%fV}RK#Lu0Vvwku%4+<_Tg|9x*bAKw3t z*Fc0Kl$0{Bgn;9=(}pM`6w0Kar)#5YquFMc*0(epU+yhbYECJ ze*j+bk`v(@pZx%+9e2VhryK+E$OPw++9+Nh*~7`3JkGG*dqWFkj$T75=Z3fV`$FD_s z^UZkuYS-(3_5*K(ul?0~83R!gyN+cCUP&sJi7!!FCX(vKs8v#0W?z3FR4OJbPGphN zRQ;+#LTRN+Dg2zg(%!ZcO7rJxi#tWh;^M`Wm}01y?en`96@gtPRO#pRawb^7zby+? z#ba5h(TZSrWE84R1&7a_Z+tO|!*)3J54Ccr=uq|g)}2rrM5=(_0c4>~6n;tYO;FL` zF2ITI@uqV{bTuYQ;-;gGpS4lMXd;!T0zo4vFOH%zQm;2)wBCg8T>euCN@32GXp_^a z?^}zgNgO}Bu?_ooScij23^lLYpS|>@rCO~913eWO=k0#b zDZj?`T>{;}ntXDU7fi}Z1!Y3$?}s~Xz7JY>AFJ1Gfh{|C!70ZsgY(ZlO*1fx0#70q zcxd!b4)27Ciop5TmCs0F5u%v<<)Lzg^N({dJTeXgh`EF3&reI*>0)X4U0grWQ-wQk zxRa~tKC$juPD(%d*u&twb53QiOEl47U%Qfy0UCe1i6Yh5=opG6sDz+$`po9-5V*DX z^trln5tr*Q#!zM(xMgW0_)(qry-pcM*=gr+8a}R^XjrR4ZXOzfhc<0Qd0;-Yn&c5p zINwz`0W8u4%_IooCQd*bLGaA>A*diVIB?+tBX6Nd&}@Og&tY7FpGa;a*xa#;Z%*RP z%1GN1g>f#sg~+Y%nS9kPV+`cn5xj66uN(9CV+I$M!|BJ3SSLyh;bi+bq;+F%bmu16cfmYpmT>-68T>E+uQ2~wHjQwN z+9-N8;GxYsp^A&Nc-}m)HGZN5Su}DsZ=w#T9e)&?8_zuB_|(2ACz`mKBi`Vd-OsHD zBlBfWgl+|C!mP5;Z_gx=u=jw!#NoVLlSGOnP4=eh@tr#i8ifPLaqFXxL0lFvJ{mIk zlDGsIK3>{V}*?aGr^UbZ&sCm~}fPx=oBWu+p0? z$M~tw1=Ft8V~?EPl~hhRNhd`z00^>*sy3nAvvB{pu;z)ej@c8b9o2(m3Q_1%JlK!6 ze#fqWs*h2b49cnC@Go;e91u&cI;y^pV=G%X9gUN2GVrosPC+tN8DvZHB2$bZS0^yR z8HzwFz*Mr(ReWxH>`@T45{x6I4Sl?C1W_sMJpV1^A`?ixc>Ws`ymoJR(P@Qjk(EG)|l0EKGyCK%VH^miY@WN11OZ= zU=s%pZ1wtQVLr-fB`&;;)U8!RE?(mA1t!0k*fvwxhPKI#A`2MZH31toZ-eNhmfq2} zg;=gH98C66D3Jj*abnF(Nj0r>;B#cc$9!GOngcl~Ac0s29`gqK;i<=r(_eJxL!yse zQvmQuJjgnJ_QoA!C?O#DkitYIq_IgwYp1@J&uA=uD7kuU6yWSj&jf&K%A$nkLL!aS z$btl=^0E*@qJFxT2yY~+VYq7jM%aJxAW*6A7?q5kMtSP_N9wj~tO>hN@z{y1Jvjwg zxgR*G8JVKWb^a0s9a)59YBBB48CyjU4ObplmQ1oP?x#0N?+ed{`WUtrS9a! zR8cjvK|(i9`gncZL|#NFUsRy4Zvth^vM$@}>(o8XmL$s`;}b0y+tq;KU1QLov_O>6 z`~cZT+2`Ld>1oDSns*&4+af0|NUp0Xa8sGISh-}E9RSD+vZ|79{M+nS&I zW$myx0;qOi7Lv_5#tavZO8L@&q%wJ}nk=_agB?JHW!vyBo{W043ghEtR&pqMg}f~~ z%usUi8xm4U>mEloFgn_RDgv4&fWm?T>7)ngjEWE5D-|QJ z8CI-JwNM&Ui8-&{^h)9eK=4r%HJ2g@v}ZqG>`8!$4~fQ5ZMyoMD|*Z8)*_|llZIO!ZPA~d*cJ#J0OTTB5x zmElcsH_(u7otMD7$D|aajm3c_dQ#MhuW}#vzBow{NPv?hamCN+?gEXa5^gu&A=@7 zIXwOxsY!1+^r5HLg5J2oT51%RkR=nP!-Hz9;Jnd1_)=F;&|{a{flX$u#4}ZDwOq&? z&8KJ^Lj`@|bd!{O}Oaz>lS>xU6r6rRU7n`y!Q%gli?n{3pNn4Uj$QFTqSVvtOT5q$g zyn=O>jI2_pkS$p_2rpfB5d3P@9jKVoBL~I&U z@7OWya-B(q9t@Y?IYZ~nvax1+Q?)`=DCQv8C=Qvr$8o?_uV_q3K=-OE=##P%aL1-Z zGaqJOn*9pnx&tp}_AHf2ZcKCtop9!i=J194?*qSCw+?FMl8zvna{iG6p)7drQAhCF z>5Yq&%BcYZsrcgt2AlZ##0h84g_Rr6hrycVTtSAQ2vVo0k+XDwtDiGabNG-*9KWL9 zA#0fgTokCu!CtDs8AmLG8nTdItb7#exC=?XqUeyoP*GhHLa|&#?x^$d{F9d*0bWTL z;pVz9COuSIuZ_7;9f+CP9_{WYvy4qN_wlo4YyuJ@Z4A~W)(iz?kA&n5IZ{A2ZrIMZ zPk{mX77&nT%o%xbc!mJnTyL~*o2W)Fo7@doe*R^1tjD{ zIg7`!+{<%{Q%cjo-cvyEd|3$XzwiQ7sWz$Uk)8ozP8?{CY0a$|Z zb{l$;rM8n2kD(nR#Y(7zZo&q4lKV)5<;quS6nmnnM`8-ZOCy&{FAa`hR%L=eXwE`a zf?5yWW734>hb)C<`wYU0XEwr`tvg}c_!tb6s}mmsw`m=4#KfZm!P6TmI_@h zH{|^sXQBAYi5ziEcec=HmOYqc>!h++1IC!tnA0_)Q=!l#t<~EN;H4%}T-%B~u6^QjU72!F=8BfwjLDF+{{qk*I* zoh%Dd93f@El?b#|KFZaA*HBnXM`~7)#v4;2(HATCS zU`|~w8I(i`*?kzZ{6p+_^QN7stxxcVQU%3B6+|AK=gl((;O$Rs*?!hB2VPxowlAJ& z#>j>dge|RKHPIR!UFQhJYri|`MAT{!o(6u~_vohA+P0r=@)65GB z-LF-v9NgQimf6(OXg0Ot;mkjU*_T*GEaUk-T&tR7Q*F++pmTCOQ}E>#5t5>r0lSs2wf!ZVAn7JusI?){wy~{rwdqwaVTHBLKhCWeqFCi;Yp%VhjzC4&sIEe3t8jK0cwop&VA{aCkAb8H zqhoa#$BDal#VWY`%3m;LJnE1G;bkv;0i5%qV_DlHHj>1KEhLGl?`NtSn3Ti>l=1H- zEbqlqM?+JT22o(5jO`Yc=uqs0r@xq1v#TRadzDqtQ;jI8kqZZ@k)q zIu$2xL{Rl3q=W&)flgG4IpikNRqkyrvl3hro8)tyUxJj7)}o|S^g^VbROEcij&Zo= zhTp(FkFJ5uJBFZ!l=ZNK_JQR`9s>P6HRz{gCNgS!`SK@ekAh^H8&FovDfZe;(zwqo zuqDwlpA(KnxN@tJ1vbB$BSVCijU?_a&l+=S_pv+3OOuL~nGi^GJxtiO@!9ISZz3)5 z;fcu!Aj;gh%xaE7AIg9)K(L)~_!7AB?uX!~x7^3O_nPbPfUB;*4VLb^2)_8yOX2v# z59FYQxRtO2KP@h4JPCU9CAydpdp`s(Y817h6=`{o4hmSM_sCDXY3m4V+qO%$C4+po zB+ubMNme#x&F%p3j#V44Ja_p)m-RHthfUNQP^*N{AlWOX7O*;@#}gF|GE&s2h^6s1 zk*v$UYnh}GM`c`}5IIDMireK^{tEuz6+dS?<3LXjEL*Y&UU>8}_=B@fhGi6?PN8a? zh$Rgn$=c|4N)(YQE3YA4i-VMt4A7|?G)A}LdwqO@%uh?S(|#M6xf*`$*=p%{X-ZBq8gTS4P^ z>4`_fIj0@RWcoiWO(_a(nLWE-`EtNzSpBsql{9&rB|BJgGhRc6^3#{3& z88vGk-uK$`;gv5v0hS%M6l6_H)~3dx)zt!Us8@ez;{JY*WqX4Y0p z$mdWh$5bSY|2Hy8_KtyCX>2juk0BL}JZUNf5WCV|0WCZ6Yir9<+DWeB76Q7?7f7p0 zJH-ag>Kj*0qHEi6d5G9Nw{@s{)HFH3k*-*fn3^-}DogmQw2SK#bq)|c`KYDvt-pIe z9JJ3M4E9%G#p7$>tUvubczWA*O%XtcH6`Xg_?}3sC1Y=-15{%+xoG!W3pG&6j%%?3 z62a5!w!!u-L)>7|I&@U7bwhT<+1A@#0K%=0JbT@)di|c!MiWL!7DRANpk~@kw4AEP z8u8fa9;6X7?ENLi6-fr=|GM=7_~@6v58Jm7!TjDTy!Pyq;lpoxH7psN2jeJD*D0U_ z=Q6QzhOE3L`MIaHh?;tBaE)?n7R&saI%~~d8Cz9@Ku6dhjL3{y5{3v%ERRd=ed0AT z>*Og@8;^;s(A0ypl}vL?Z1RNJ2%c`Km9#j*LfeB9u+^5+`X+8UjYMVAyUoT=VuwV_ z)Q+d^b`eho<%AHMC29rZZMXnsK&md^PexLF{?A|E!y=F_W}w*iW!r#q?g!{pOj^{o zj5*$oybWY4qgdbh>q$F$8^W(I0Y8Cm-wza-sATX!%@n+wPSGqaU4Gw`vI zQkg+hB2lD+NC^<-vd6i!*WG$A{NVaK*=|NTA~f#9D9V~-IjOxLO|kw*NJbWnqQ$xm+hE7eo$Pg(oc(5tR%ZK0LTsDdJiaFYylvH{8^*_* zKixIaf?)*Vu6h%XI>+S2jfCY=8av-Ztb-@$-kM6wP_&qJlwV(T+`+uKT*{>^;QHGi zg!_?0)KKA|xf3=hBhqsVX0DYBLRDBBXT8!MfM#uJjcKiwb${B57Ai5O2VktkW*rDa z9w%i!T zOy^CiGiHk@25h6_TT)RW6~H)DO#K$BpG;Qy6;G^zzx?_&FtTe5YRGcNaiI=CR{Z`q zoR6~LG6YnE7r<7oVmX$9Cphne?uio9iRzK@mlDwl`m*u(^^d}sp)1-X6XRHkU8 z3J7~XWbXAI0g&Bu_3<}XO2H6PbH5kwtrF;NnSSV*%2}T7U_ha9rs65rkTwZUJ__{T z{Quay5*WL#v;3cX?^|Zx?DlxPjAJ*89ow-J;_P)6%2G<9fmA}!3aJz!RRXFaKmnm5 z(~61+1;Q!>s7*yHC_)J!go;WEO5?;$;;ePzjP03@mw4>)?8{s3z31?6=e}iT9J}!( zDfN}C=ds7*_wM=czkdJsJ@`wU13vb@&%vp&32Iisul@0tvDixCKmO#?u(7|NoBmby zL@J*fIQ8~^)^H&7fr0P&wCCd?aP#35!uDDh63&s2pR``8=dB z6eEmeG-ZW!o7f=GrM6SD8%UB!P;r8c)6JkpCi6LkNd{02KsxpOj}2tXncSn|d?V3{ zOF50{KUWSsm)7Yje7PJs0StTvE8tg#PV>!e$Hbac8T-21;rBjyKMW4^^6YdT^QJhF zcXw+~n<7cc8<*yQZpHmgN5AC}Ve(v7A+}VhYw(f#@`Dh5LZ>!={Jn$fG zU^Wd*gRGftg4WxHnXteIOtu5UyDsYK$Okb8qfvr)D`U~{o;_RlceWLSCa!}&|IJ^7kALv}OghPhg%uR96d)t8o0x zIDGK-U6>Ol3K(q&y=hWs#jy3Ws*lnd0l-#!tu|Yza@u{cS~WZ0W^pnWC6a*(VK51G zjrV>L(+t`?oLMN#Bqa3~sS^R38&-{=RT+Ygk5lLb2uUbiM#m5=%bJEZjO@1>HPS#s zvER9+4{f!S=LgD(_q176C2y86ZP#zz057~g%pHA#Y;9cI4V%&HQD?uJRqDE2lq%9C zrL@6u+lAmvwVFchW0`zZ;uaC>%#Z!}9g>oGe4+aEfWZTL7HZ6aYR9Cy$OT@Wwn^d^n#3HfvU<5x02MyZWiQ6>#po{gFFb2RKQlARfmd$5gBMH|3mC?xYrXZe{w{YN-*`~;^u zo7VNhqx*jawyy7E159mQtsZoGBw1gY6&((2i>kfN7U$~%j}58<+J}{jSF2x6`_pVP z#X{ux|IcHUKaY-pmd~j8LIb>Ne+L>L{c6J;gci^}P|;`tWFna+WOQFN6SkrDf=reY z*d~KCYE(8eF3}wk)=|$AkQrW0{xylm5Kv%!Z#R7S?mh6W7l&X9E5&agJ`TrDjblEu z2frs}gbTsU1!4tUWKe%k3XX*Hqgq+e)fIZJl{o}IdEf|4oSzrcZPVPsTp|spjsIFk zFJt|3`ah#Ve)DpA!PDpGCi{DeFW_DN1>oo-jb;X21rjwR{gMe4I|=nlgfyaw3c0}# zedZB3eRhIdHT!P79v=Sm$2bg?F%7ZGzs)?+0c7Vxh;eJ`D)IGmu}%HZjLfM~_Jh5i z>?>zuP$!{`i$iL^P+pEsqD*Imj$yG<#qe9<%0Iky`{4er_B<5H2&u&ph!J`_sy}Ux zb3&tIGp?A7{#~k1qZ(-df;g@tvTc(fv}XZv*&@8B!EoxLF`U{Od#L;GyO~4Mt4B}5 z=-4Fu#n-+GTQ~N>)f?6@f|=VDG)|*sAM$!+c(GKx)LUDKX&EZ!19%2K-$@L=G+$nh zt*o`b?{)H=_TrS~f-2y@tT;Ffm-#w5J~uSbQyRnn_NScJ|8Sn5Qwulm7&t&0p6iC_ zAinVE*Wq)2_ivm-(+&Qs-~9yqBtERvHK-*uK~`sPm@}taa~h!*${qH*{QbLH%yhLSr)sz zezHa|D*yz)^dI{+AN6U;DPRa*K;xUkU$dAFMU<#lnXEC9!zzaOH7&|m)~JZROe$?( z#mqFMBFAbx8R9AsLK{6k?)GIy7%F(u)KM~lF1RbS->OOwFXW)R4vef}lXs<_*0!q# z;N+X<8LL)pOW@FvQMhyW7W}&kzyGR@d5S<4FL^?OJCOm?iszvhM`7fJ3YDhsR|iL3MgLrxOo; zpQ-F+OV3imF-@cV44%%6Y%kn%?ZEynUeybsEvKT%syoZf8){tEHF7N542Er*4pOC0 z)tOtB)FNbr_m(_Ta<)m6jjC$O6(}^5sTNt#IS-T5^RR#k>tp|O2%dQMH3qiQjjW-2 zf8f3!!o0O0EtU##nh4ntZJklLtx)y5P=jY)#N6@d872a9#w<^<(PDgc2beT@N#!md z!~E}ISmkSUeD=VauHrO?+n;b5BZU_=thdDqVZ_0B1oLAmLg*8YoS6_Eyj0LGYr4A# zwW-^GYIo`YTqejUMV;s2VU&OoW3y2Aa;bH7VIl3Fq&l*-o&>=90w>|(CXMxMXdw&3 zFO49H0%QU`bd*%ZW60q}!pj^49Jh1SQ)9L!%PkS2j$n8YFVI+SCxsbz0H5}G@q0MArEsjDhoDYR9vp%<-<-i5DVODZZV8}rDdyR=?0_`=n-rdgcj!8B z`1GIcyJ7GI9`Iva?bjrk_uG4kF4KQx-){K8&D-E{d{9q}O~J&>B7E`RpN2(@9P9hK zpdBC7oma1iJ9bRYyy<1wV3;*|yM?V2T$Yz*aB&zCk9l7Y?W zP-x=88;6OELaDf z7N#mAKua;!H>*|rMY-=Xc0+B~&<-lyz)+h?X*LeF+)SS5Mf5VfHgXzX8y$n0*$TtK zxAb>Gv6zP~n|fg*-pD(5ZRK#jfKL$3P08z3DbI^#w_`DldEN2s*(rGLomVMvW-d5u%&YA34@y7Thyn`2psZB>6HL-C)hicroTMhK{4HjoT|F zj2NHz>GyLdVCdvH43AB~9046>%KZLMzB$2p@$RcP!PbF3{45>Z)DJ@i9IJ4kjQK79 zxlP=Xv$Tz3J&L5_nR%A`Nt7eVTdI>OE)2OhD+7W>JhR1e%F)XF>|NKo4c#T^?=1Nj#{XS_`ED_xmW!5}1;Ujik!2+1LC4#R4?In|}r?<);oF!+fyJQ;wh^-?J^w zu5Ns8iSapA{Puf3898|ZduIS%fOq)1aZ7hke_zj&-KDnOeVxiRNZW($)Iuv_aTaoc z)|MCcF-oZl1(AZSR1?{)Nk#jO=E((W+tBu-*QhftQ@!<@jZUY)K}PpeZ^L+YFS1Ko zub`X7`_+lyFR8F317~` z=()(R3Nap%cb@{oGw#rsmd{^5w=^Tu)nzYV1L*#Bnn?4RmcZz>LYPL{G-QWCUa!Xa zI8A1z<|{Bcw+PdV;z-O*o4VZ%*RJK6YfpO{^mMc_e@Gh{9WxUIqCvqj0wF(9xj?vG zc$tO9M%*ZkWQ-HYVhm&gIYG8g%ASUlixR1>d|^ZLTTkR(ONCaJ^Fk|dud33f)oQX- zPOTQoD=HPzcT3>ZnMpYK+z1;iF>W<3Q7 z>{`F0Ghg^uJgaTQc135`Su6nea|_axrkOsq*4X%X%Z=779W$|dqO&LpR6$gV8eW5C zawJnfGgp_1N)rh{n#&KzY6jyRYwu;)VdwI|}v;LvVy|CXWUaL<1a#QfROz z#QPeACR^-hb~G(?JeRgdIg5;g<0drSn2Lf!I5({%SwFT+q?e0md{_a`l*^cxQvO~& zQmv%-KR0rI$ZWtgiwPjA09S49fnD4CVf~s8G`0eJI`V{3E{ElQ$XqEz=|?RMDl8}$ zB=5%!QKS0?6#kS?hSiROKqo4;X-O$tmjuc18Ky&?Fwvfu6>k?Sc@QVu47p0ViTTFy zaX375hQ(~8y_H*1&^CwI3mKmnAT&_ow0b|wHynNxL+}&u9=i5!+pxB)5d2YRd*PR< zGf<+57J5NKI8iQ0? zq_;@X<3s5l`&134E) z+YtGX&Yg+2mk~`ZB&TvF^;s~tShWAg<27RWilyM-b{K|TLY&Vp#!Nbo#RodS^tY== z&pmpmMbHsFpcr6eBy>u=!5@eoaS%P?_G{Ka|JqI{6@;pR-ZbSA6kZFFVAg12!b0B! zAqqlW4-T>-An>|n8IIAZEP|jW5*_2X#AbgM`z0xSJv%-N!{42N;Zu_^hY2hhp0O>v ztrsx7<&AEs@nr;G4J1TAPR_8dF9TSD zXbEfSQc^J2GSOK2dp}sREyYRWc+O8hxCN8I?_l_S2)>W5eb=wQH=m1s6?4F!!NM{} zp}3d}IdTzEIe}b>6rI>A80zK8`l#(@ZMK|g72(2oQJMkkhGCTpLRp}qt^^ev_=+ie z{0N@sm!27#cuUl{8Cbyp>$#D5#8fx>N*y`ayr~zq4tB$){%*_5>I#J`@2EJ?J(~F zJy^kL+r?^e80*e8gbxya5KwdKC>< zx=QLN3SHd=SkqfV&zOhqt|HSzbe1IPr5u4mcT~(_=qxh~it;)#G@`|r)K2}xR2iR~ zMXbiX{z%3SEU4ub-p_^2aV5h8;VfCknr(|ACQ9stA9rL{#Ap6rTs!;wJJ$9F{Wc7L z7^BMW$OJcG`qYP&@Mbi*9yG)$jBb5KijebYZzasbXVDHvus}R(6Zf(+?mK0hJay>E z`7>|ly_j`*!W=}L{{_%MwEk8H?LhZUbz=`a_knl~^zgj3PXJL0oy59CB{KMEigtd==6whO%lN zun+BylTY=67ZrYOvN~@jh%U|0Y|`|G%|#epCit{Me#pibtMTF6nNFZroZyvfbvz&_ zvw}$!g8wdFZ(-QxB9p)6Jov?UbsjY(4U()5{`QLTt+EH~jq1GTmoqQZLglFDe%D>L zP;4&p`&tU7=ThjtVj`>T0nzDvvf*%u3GnF#6}DhbMEBmcs}tZl z9m}fT5!~Y`TXdpFXg3aSBR@t)e?ePKmUpI3z0Esym*%-{2 zSy+fUIT=~lIXF34=!sdGSy-8v|DK!-EbP1-oV=`D#Q%Aa{_V}h+=5qCT=GBr`dbnp zwQ_TF;$>p;^z>x(WMg!6v1DT5;o5(l$o$Wc{tZ-6_`gH#?f(ny z>ZS_(-}e5u!mjGxPCzDApsS<1i`n0WvmpDYD<@tt7odroql>zuqusw}QQ6AT&C%7$ z(TP}0jgy#K!Nknk;hzece=!skcx4=1-Ao+JfHL9&q<=LSt*y;@#keHJ*x9()nZ)63_*F^vTx2cS{h`QItxxa5J&{E^*v&VJDf2TuZS>xm9 z<%})#9*Qs?OR(?|H;QIXo3OLRlJlqXKC57Q0yjADgn1C#Tv-w;V!m0wYIw>jvu+F* z62iHtAc`2f4;=NpDy$?Wpro>MyY;gB=*GYC>GRQZrhPe0k;;u%Blj+RkmqUT;*I;r zGvKYewP8iH`R9Wug9b>QE(W0TpJe$bK)V_?X!)lmM4ycYph~lu7NA)PYTW$u-=KfB z{ssN3^&ikbt^a`jA0*DIK+01)hy&kin;*L+=pKr3m*Sq`RPH?uRnpntpOdP@j=R}6Y?_nYAZ*l0B|z3wqXJ4CxV*(0!n zKl8Y8o-~^BKgp!`&;7W2{(j~2^|~ii0q_C=yG|e3uCz6|cyz$-{!vY8Mfyw%TCi|W zc4JO04TB5amo)7(*d28wrSmvCNdGqHyFw%sz?pxiR~_TQ6|#GDCgP=*D;$4iG&l?6 zRO{S0v9KJxr0w^G9zhw}qhP`i*PC8?Gu?`i5KsuZ3jx`ur-$_+$rroLS0QEe+d;fvHosR8su(gW+T`Svv1d7t|mI)n9ima!T{-8Y>Z4hGc%UD3+CZNs>TrZW2NQ%pXG$>D(_fsZrTRsLV}mGOwa54A zjqVFxW-Ox6lNWblzJ27k5ge}40vyx;pWhBYyP+d{bE0r-&q>Y{h<7tTpu;vmC}8oy zP^G&ZEKZ?_LWrlJ!>D=VNbKix`4&#uV_eO-H^|xsh3{DEiC_&s=}~V! zyM89|Ua{>XR$kk>m0qK3n{i{;fC~%B>5yXCW0*1Yho)M#n zT7XT)5y_7tIo^leJ2n&7FZ2*cRGr!wUsFNUq>_vz72zuMAh38;mZ|4Kfn2PGd3wE3 zoX@gM6o%l$8Jw?LW8qh$u`9G|OjyA9HgO`I;ChIVZBDrqahaPPE2p^h4ml@2F|^hq z2t5^bw3_*V+ecKIiN^($WI|vi=q{#F@8%}gYK+YnGaAQ{M;Jq&*>ME4pm{eWXk9#U zh4(%gbY_}zpzChRG%GYg6Sn!YemahYh%H8p65Re#+%WUUsH23h=Sa=022fYxskdQ#}4ln1hMtbivdC?&!QK$}KC)LRx>_v_Ad zL|o|Nlpg}55uAv&)OGXNv9cl;*<5(=;_N;4^ZPbP0(K(6oP+t?g~kRBnige;KH{aM zp>%IsZKifYsS%Kfy@DN(!wg75hysa1NCB_j$JRsxCkb)nA@O$tP%ZZR%gGgU1t90) z>r(^Znb6CQ_!7r>w>AjaMD~e699eBxpLwlrR&<`=*00K(W>;u*O6gfS8qq_QEAgel znO^bCBn~`HYld*Jduf_!U!31vpM&lPr?ipr`F3%kM8oqP6G6zx;AI?>VeqKD@ImyZ ziFcsB_^f;$<2~sIe_fI1zd+P6Vgn4fd!D?-m-@ilpv_cVZBy$C_>Z}nj8vF7~wHE*{jo?8pC2;D~+y@knQL=7p0 zeXzTD&It4Up{qvHt^~pl;#$4l9(=>%$b7%O3Ak&|-O|@VWZ&0e96^f1V7o7$M~;z; zJbcqPG$+Nc5*66;w{K_9UE*|&9U%*solS}&u zZhhX5^4fa^4{XQcmn+1sbzdW19@NSgKlC~?O>iP9`Jb#pdyI!Z33hqR6v3Qms2e|i zud}z;gfDl9J}j#bS^KL4w&}wRPl?aygvB{k>~v)HzI#J-5=_RvyCu%(M_OssmqBYa zp+J)XNO^1JWf11oy?EmbmYRxdQK;Q2;@rl8Kf*90u#MXYzcE+Cj@$}7pN-WRtdA39 zg{^*Po%KK`WMu~$Wvb~tq1T?g4+z%suu-CN+QfZ^aOAVSMBiFdF4c(aJCbUc$ONBME*qGPa2C zID_$`NBVLTmt06u#0I;Ubb}%q6c{;YV-22OZS#n?l1S69&w09$&`0~e>(LeeD;dPm zp5VEeKxBV}kj*e`Bm$7&E(pb|{Cj7S)6=ZY9E=Gy*DTbmciUyFJU_RZv2}fCRu<}> zk$@>G<_h9=>*W&~{p*L%?tmZ1rkZ>Q7ssN=hpW{M zr1{0;-0cPN+dPD|)se%EO1yF>IS5waTzlp4s6B~ixA5LKHJ@0T(bfjM!}~$!tC*oJ zPS6d$!sI1w%2q=C7Ma z(%nS&h7lrSZbnD`B=JL5aPUwg93kKymH&{pS3FY6P2nwe3%ErYsmrVxyfM$rWgR>d zS`xYq;jLhTmb&kCoW9&H)_W?RXWT%7?MnTnRo3JqLys_A2felmnj! zm{hp6ybO|R$bK2U4rpM>FJy4u!XYJ*&|W*_36dSEeRMYGb0{h2mm2|5Wdjq?7mISk^>m88y+$qenuIaZ!Cr_f{6EMD<8^wE60Sp->! z1YU@>zb0OH(;;``4>x@&-7hu>m0>7Y3Bjwp(5`JJjI7MT+UquKS}3;CG|j5mXPlHx z`{eUx^)K^jY21I7fH?rNxB7x?z~C^0@GYeoR(Q&eeG3kRQ&)feu9thi#n~wOg-b^4 zb}sFwcuoY&nnih$@EuAH?)C^fLWY#uHaH2Ib@?#&f6}uU94Yezch8iZ=OZ!UWGqe9 zHH^jv-&l3Ea@LSG_@?hO8>tziVLLgW;8J3iGw)(unR`>@=W)NDlTa_O@f0k()=F<< z5=)V*@>@gEzTm!Nz-xS|?M9R|%UzU_k#TZJ=ct zIZ)%^4K4~47Ib5{V6K1Lt%8sa)$bB zP1878#yqOU0c^po^9R%XD!m(28@;9A=d46l;k4GOyMjnLpkz$cV?1yY2P&Ab_3J+s^gPc(Gp;6!ElVI3xe{_Ge3WkXKZ*?`WLz#lu21W?S1B)kO@thJX z&PF*-98)}m2=VwiDY|(1mM%ylrr~XBah*8NF@42QI^G`o*;`{z*lyh zD6*rXGlrJt4IN9BbCEuhSjc)?CFy5LI+1yw!6Llkr6x9`j@}>iM2I#~0kOE9j#sD0 z#CQa|vXlg8ywSzr@)kdmkH-y~NPXC3IG9&pLqRO_l)F;jK2g||V>vLKXrN^GaS~PY zZr{Q4F-xOoRpJ#~c^PnKe#S~(3{`t}dnMtd>WdZD;jWfq8`oKzNWa3dkk%U*cO_kR z*jRfrK{g$?&ssattLq{JqE+YpD0!~fgkKd{-H6YRujjKfkPp8+ zcWJU)JT538#)y+#Z`p5^I zSa|J;*qJqy+CLmU$cFmq-rys!&}u+fB9gXGwwShD(cA1rMqJ$4dU{2Z# zJ(>q=#titx!afQ>EmYt{Wtb)ri1r=w)HgL#L!~9hc~8UW+Kd{=xYLGj8Wd_eZMg$y zV-SP5`tJ2>Ro+fxYo--dk0W{0Uq?iCRjbs;OHC-~C9x>eg0fc^Sxvg+;o-2bAOmu3 zLm|EKIUbDFM(T|r89|o0oq#ZetLWs_yhDowb@u4`D&Wjp2Lm3NcA*F;q9VKS0CO_i zoEIA@mhyuhxTIWNNCA0~r*FuNwIWTNApw76}nuh5D$)sadmGcY`rFkz`(L4BbVP0>nOUIE_Nfus3@14&q* zK}?Z|UKqlSThKx*g~d9oytoq&r*Qq2?0AQe6z~W71|#m}rph!9))rM}!cfvs1>(F) zKu}Iz#bMSd@`#C1Xm&aOuWJ?lMF=)N1dk_l@XjA3S*Oli;fyQ_)Eq-Or=_yihP+G` zT!MnOVM^f&?PL6tZAk3?J6;hl|5|AyXDsK~ZZw zRG%a}0;dyri1T>XcYLXb`e;E;n)EMv5XZ*!>hu!hB-S(K~Tm`&CG%bWZ-yUeE zZQq$LWB|Mem&aDHuu;dMqMxOe&(2M`fn)_b4{E$55h{Qw( zAqRe0;Mu9IOvw*2{=D*F?-RmE#_ypkz&DeI#SlsDP~1`v6{>LPgro;(?0fxcO|vdS>WM=sDa{kefz8EQPzz2Pf#nm zQ*b@sEyXTMX1~)5r#v>xnNH{cTh}9dHrkHnQB$rkPGE-A0j5s#5V>JubX zm}!QM29QDC;~n9-NNEfw2v7?=tAb}ik+Bhl#1SS)l6~UYyWvx@3^@h?_ zIgSGtf1{n_BM{Ff7Tf6b{UeB=7JcU+9u&HxB(A{cL9XCwBV%x=hsTPn4|mJ~UJ%sq z58$|8QvT>E7?2bs>3bP~8(~I&+c=l@%#1$( z2wo#XFgdtRsk=`=8n~|fMtnXx7OSY>>|@#&AOVVlN47#?5w`0-G9dbRv@E3|f6^5{ z#C(!s62iL&nl~O!-~Q5gG{(BE3h;BaAB|JveH~IqhA?+>>%+ikkJz5^JR}1E0jNkL z$q}hhlVO02YndtTMV{&MBy_{wwFkA}jH&)1TO*Lg+8$7m)i6rXpNcf^;KG}y(88eK zcQ{$MB@fLole?jeaUy}cFCUV~3waW(4up|r#Nx`g5deHdDR^;HDVtH2z#T5*gGrVumgrY6uP|L2=XmG1_^O+#Au^)gkyN$lT<)B2;VCNd>w2WDfpD^GtdRnHH<$ z)-MIW(-bUtz|LG|hlTF4AYW;b1(K55H=l>X05!PO$SwXKhj;$2buSDI0*ca87B2G6 zvml1XOSv|+-Z1jLC&X@LWrbUIqPeP1)=a`=yYq)Sm-6yQ4?S^xcSTR~q?wO+!P2v6 za}&S6b0RG$^k>cqM!1_wqOa0XDfW-get^X$VuU6Im*Y4^aO?Gf043yt(=8>b?FHG# zE^*1~ofgV&eD~V%3-Y=oS6H^kVmNW=*PdT}zr{T9?*RO^;}UI)zK5d82Es}>G*;*I zqeP`FQ@{i@bwO0DV+cs#kCfDsle(yx^r!Mk?cK2$u30Z#)U<}E4Ab(a$S!y^_lKpHkNu54dpIkex-wk&JF3E zs(D@1bW-tn@3b_B7-?k(c+<`0pZu&_9Uzj9Dp_(HRe+;S21H}xBu|r!@;rCZ4RhBD zo_MZr6SCL%aL9Mvt6J?s5Yx4Y7+3Oq)X?D06 z)VuI(S5eTa2JUOr1uWYdzZ6Otf8^DQ`nbV>E}^x{r)^5&(UI z*HURrx%gOnt=n_bGe1H03o=M+`G?Vp^6QtoTU&;h?L<4Qs0KNRa0LuRt`QVBNZxS} zd{=BN9N5h!d-KwZrl%YdiVhN))IRE?mHGt^_-Gb1 zH+#|X0_%pxd|sxt?()xf2E)axH`A``x%4M6!dRc3^_6)eMesfO1lp#yWCgLUrtNyOQDYO6V5W04CH|Wb^ALP)r=Z?Rc3cHlS66sZP{v#`(3_cDzV9MT z-S?_ZvER(_x>v4n#t5gZsuKHI`8kme>Av6}$m9khd7toHlE1l2ylrdj*TRfWqM(wc zIVWsEko1cvL$n<>mn7`2Jt-uOKt~lU@%o5)< zJlHhrGV}1jWazuVgu0rVf<9jSg4%M(aO4Cf14#stow0Y>i@koXNI?!bFtN(lhcd`O z!7!ybTIc#XwmYu2k!td^iu~m7yjb-eeb(bK{cUD}SFjequbtgdSh}2RZ(!SUQ`YQc ztE^f<8*(Na3ztu96ZYWO=m48m?MbTber>mMmS-uJy0WC>!SIAkP1X^pMJkm-4FUCO~%{P6}LfH6gL(V9lIMD6#7O&5JBJPWVXF zmhn4lND=Ck*1ReZceyiJ=1b`YmR}XbQLc6pIkL7!q3&$Th%Yx|oNqa*=~i8w^&}iz zl2cRubzCHQ^PL$!KF9U%1n4lS2UTI+`|-C@z8Wg4n#Zi5%ry2y!=9~5**dj>Znx+{ z{S~Y74BGgOvtulSp%Geu1tqIJ zTdLxmulb6f!Jx__4KAp@?pfV#Jrm2Cs{AL z@O$hPb*N%ICiM86KU~$Aua?&Vi-c}wo?g&=xSkw!Q*t0g%!%|nKYo@AWeP}k`krSvKb2Fx1Hf!Hr z+@8BOb5kBL&!r+xAvx9-Z3Z2{u^*E2Y#$2nmSc);yCwzN`q>33WU#<0t*tA%r{BPQ zx;2;L6daejzUNPrG0hJb{Lwk{1^Mkt&;`O++se&##rNa=89JjhSq6@C;7XS>jLg=y zF8b)48}xC_31cN08}TW_*uCkq%W8QE-c6}{I++shg1 zmwLaxb;nb zDWsgRuh&YcsjT|t%Jlk%CwFz-ox~`~0yO=m zi=jsXSVN>%(=&sQS$e^DUiB*Fyy+75OI2mujnC|=ce|T*R4Uz{IDCcH z=I0Zdi;guocEqJSA(MOJaA(=cBvaFEP?}SfX&uE1{WY6B)^XmsPAL2OUFfV8gVDSt zWsz{mSDg9v%zu_I0&nM&DV2Zl2n_vRywekXwgpUmnW#2ZtoDZjb<%9&@ zUBqHNf8@9$yihX+nNmVOvlxsl^Bx7UJ7_|)AT-~NQPJH9ru51U>rt9{>2vU6&sM^M z0Tn+qr)J}BJI zkFKs>=|P!3GYNAnL1s zG6PP_6Zg`&cZj0bNglFg8s8Kt26w(*Pop}Ou)rVJ+Ch!cJQY-0M}nTCFXKZSRnF2K z(7P*00OVUSlCD+?PUgMEy8LzSynYhJ zAc~HH(y-YjmaMCQKROF-!R*9=W_7T?+9PDGXNq#FPV-U+{I$MA&0q`^_ffYd3sOBa zQ#&=bl z*h*H4`}^bC+EAD3)Evj1!d+D2PS>YL@TBFY^7E$m*L{J^P=0@JB4}w zYsu7|y%froE&H@S6c6%QvWKEYS9)R|QS-qF6Z$B5!?-GfpKiy>g1dSQ@6oz!#}V0X zH?^nmooPDl&_LIXxgb*wxNdbcj!Vy0>IS#Q2TlaWtC{V@tlnz&2BthX#Z&BA)}?qw zQa=a%jD(xzK=ewCi4eq6!i#C{Oq9JED8Z_dZ_>E?=O>ilsn zwsOAN(;P0SQ`(4NiE~40?C0_4=Q~kO?0&!rmRiarhe`KcN^Bhrawln?!BiVh_gD1e zP+&H!t=2rXic2UmSqBdhN{ofWH<3^ApE?Dp{s-{Tpv8Fo%CS4JcPB@@N+o|rL2<7y zW`~YJgwo|O5W3+g|Q}|Yt8SQzkQqRz24pUU5pph3Tk=W;L~#&asrowIxioKEy%C!1=>o~;b3z~ z$uDv>R69RcDnkE9vB1N;SvVn%3jugen}L!1OJtH5_n@y#*5GHGG4;I|4BVlqvUQnO zmOg)Hpqbo=437S0N^~&2;nOYhAS?1Ls$Y**pbQE+gk;}YyztRwz|Ve&YN(kXEmOZNlyQuqS+wk6|)E# zS)9%}W6BjL0R`3X{wx20y>TIYOobR$kZqpvV!jLwXEEnYPjfX-Cc>9}Eq9B{0PD&p zlO+X15dppOmA;*=&m1=JkXTzau+L7)@UBu$@uZ0Fq6AEt-A1Z_Q2rQ^X1 z!Ihb#yOn1CsatUvEeCtz*ZQ)H8an8{nxO+I7l#Aw^k~_hYOAF`$W^Om2?1)c=GSpE zB62#RCPy4xr%eI+;k2+9rD?fBF^VB?kV@x`u9A=qTezUL3BPPuLnN|>2$6{VxeY&0 zYU%S|Elw0k=R0A`TF16g0ry79J;XXfYUFuWMtm=0`{So^j+d7K3DwO3IlbQMuP|<* zmh=)NQ=nL&cYSDOM#NwcWGu|0COva!9;KpZ$mY}tZ&;fclV!CI3p)Cap!xOEQhy(p zI{NqH+QrY(dI~*l4722drAxZr((^SSJFo%Wde2dDM|}%qmIHkTR0hz`kklfUs*J1B zL)i8i(!=-jHWZ=sl9KX_Q?C7wyL6vi;sY!06ECSV+?bE&R-?;(E`>qD?~oW%tDMCL zzo&?k$bd0NCx6FFsl%-5Uq6a0%uuWMqw3-zWkcgqBP2f(H%gQ0Q76>pIW_ga&^%Vb z70F$*VNhnz(ct~Gyt&4hnI0ns#^!pcbubDr0;e(|^z+hR+{pB~a&o2-5*4(a&fD0J ziswES@N+0RSlc?TK`cfhHO}GTJd8tKYwMU2o>Yyd(`!sTW$oHb2u?l6yr7#vrm=tE zkS;~V_{^A#ne&@>n`h$3y zIdPM*!105L(siND&ScQ@s4mDfI3QU?^ou#U9xLp>Rq}TRetstF0aezJTG#*|z;hKt zFoDd9<&D4I@%Hy8oBaqHa04WfwTh%teY4)e>@dT9$YhR-tULC|kG?k~f=LcgD13%_ zq(_tnMQrZgeC{d%;mO5$9TE1wdzoAkq6RKZ<9Jn@W%NiKSUo&H+hGnSk_(8ab%aCs z#XC3vsZafJ$fpL+uHUc9ve7W(_RJKL=;hv&omCZ*P^Z0;1qVlL<>^rB%rnr$`x6UE z4q5>|w$xE;^;fjQgdV7Pz#!g_$DO9u?N@j6!SYGc_I^gZyhQQo2m@sg3ufkfiZn7pRv*Uc#zt6y=EVW^VaXs5y^CtQ55g)CW3iC2piG73D)D`5gMGd_DOQ&Bi7Z5 z`=LIs2KI!gwr%I4PiC$+8!`JmatIVm zaNb~!4^*o7&7n4r8TP-=%|icR_mVM|7GEVhlnc8#ZZ|m;XMB0mRGB5~B?L|@+hF0~ z!i_t9)_Xl13HCa@ZzuZ#_kN+Y|AGk0^QENdfzN39wODIEyWPWP)14&Vun4C@js}-5 z?!rK%dBN)7Fw70TMh|ua5_KEx8LsLhmeo+_?SmnzOox>8&YIUOaoLKYet8wYXPhKtnm zzT6z1FWA(>ZsbzP(7%RX4u=<%tvmi@Ga9V-xbmx)e|SCx_cTHwKCg+4DxRlZL~2G9 zQ6IdNl63uH2#s@zF_?s?vcLdoB?pCoHup@@bTXiAN;2rgC4RSY4&(w7lHCkzB$d_l zkK;%zNCM3`9)1twYIMz!P6De&-@)ZDy$ehb3l&l#qIB#i3Iclfxv2;-AzrorabsDY zSKxSk*Qay9BiE?0boEM@_&wpA=Fy`r7KE~u!Mr^X(Yd7RHV-ppY zIC+1}fuRgJ=Qb7q9Lc~=>k&aLGhn*ElXKRQh=_DZJQqf`6H@z_XqpbFx6sR#CY9~s zkVQH7k=5goO{#2h;NhKHh$Llmb4`jy=<#=b1@|w^^4E1ZwV?|daIcbj@`26O*4PPy zVbtVrznpdARcHSIU4Ww*uI#s4BT1T~FZZ5M4eNvVevU@#XUAbxGEIz(O8*fH8%-Fl zC_acy?T;I<2dNHWoDT+e_`4-F?@HVu9cl1!5JLd315z=0l*$2fHJ@T%8WKp+I7|lv zP8PlQcV{c3cUesaiPk^$5(+^Z?EiYt{=C`IC5-cHnaI-an0?!b2Y{RO(=a{sINDrB z2t2G@T|%E3&?cWqdmzM^nTmmuDqt4*iJ|rqmjZ%47=kJGn(;f}$n(yJYi5GA|Ne8P zlEb#w*d$~}(_vdJV82v#1BOY##*=SpX_qH#LvA35Hh+elP(+x@3B(Rcofm~1{aLro z%1Vrj_dzA~;raQnFyATrG=yrG%&7r#eUI_1%_`8=z~jF=ak=!(ha}ou)&pa!4nz7G zQNo$cjRFK-e1_=WgfAEA9gdtARW?lgrGM_{P}sr`ddmR>$??V;5i#%64x+RJs%+mw zHHi|khie9*_mSD+cwcG^=!N4mMv5ou|`AIpP4-bz?-)rbrpCDmtxis^8`~PF8Ayw%_0l z^mILQ5@eUdwI5x5M*%uNzvh7TT{O=_!=~qJwbXc+D+!Sd)A!STv#cJHl0Qr5d2q0k zX_cbD$R>8>WWZC@cr469*|gW@q`A|5Ne#bpl^6(Vlz5AV5`o;`aOjyZ0k6xc$1r4j z58Yc@M!JsvPONt4W#(E7P<$PSLD)Q83Sx(qD(K;v%&7HvKTS*0YG)P+y>`DzVFACl zA2;tGi3otb9k7Y0n}q#Qv^)vTos~$!uC?SRTdB#%6t2OXP^F~Am(7Kwz(78$2F|Q$ z5A-sX4mt)j_P)Csog|bhF@SVAeOxi31M(=7Y0}?cXKHqG{&_hP9uqF9kXDB;9k;}8 z$WMIS9Hewg^XC7}j@2&_qg#5v_6|=yO{-}J)|hXI{!2lz>xnO0A3b4KtbQS9OS+t) z)vFXUW0QU;=+7dV5D^9>g8YrnlJJ=I7rLCL!_v=6HN-og6lMGsl5#)NP9~^j)I2(TRvSB0Umg~b zU;(k~Vt}y)+@4*3W3IeihDu|N;%Wy;jQ7ysu&dPhzSwTz8pZCze1pM$ED*E%8xcYE z*TfDJ(U<5+sMhd;fB$MYbl)QW>QKba*1G?so%+|fgEm};dK?x{nS08BXO7H1y}8S* zvbB{01kZDuJbKq6Zks-OiH_&40cVSFA*j0~WK(HoEe04F+6vg2WWqY?v3`G|uRKTF zAD^gxosKEL2>5uEs^Vh^20DGqpk<-e*EEAwWgbM5{mhxyDIz{u)SvNTFaAdZ5;8<9S zkMkblcC%V!p@TY1YSwy2#T|#U#uHw;_sn_s#ThbNQiwj)2X@16Tk?lKit6u9WbIWj z3-g7|_NiCH!@gF5Lxw)>;&Du%g76ojkIbAIrEE|UzkROfwvk2u#dqQ&^nnvME{*F?l z55ua$eVxJKXXg|TXN|B`CfA#DIwMwi*$LX+$@SBf4*zTKxBZoK>35$K&0b8}&DB zIx8>w3)H~ISn_dz#JQO*<>&p+@yn0SQnSFu@u$bWUoHC(w1D{9A3^m!>qJbBicKAatiPphjAhwfu0R_ob7y ze~l$)%-bey5sE-R0&jgoI<~~xj0k{_b3fyHU-~BAxgsnPV{qziR`(zf^ECkcUjaiM z*o=GLpXcb&0lZj$nA2c`X7h0HK*z4V0p_&7q=PaHj;WeJcUv80(4fiIZPzOi0-tti zTZN@1syawS0ZbExqet+6KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z7R5kOWwmr$9&oB)|`u1!F?I#-Z#jvkn2T z<8@r?cw@(#wRcmg&F;p@CJuNvwRTai#AI!V%Q!%Q4J;&J7BDhMLI{C)h>=F`ku;C{ z?AzVv{PvITJJWM#MlT@$cyHBDx94{E>GS*kUf=WUBPAmIGJiC`3V7h{=*%T~d-yeQjir&sX;Ua z04yyLIRp)Mj>$#%gsZtH zS8|7s1@fD!8UNkNI2xQesm$Xq9MF%CE-0@!W61kfSdTsv3-@YungEyb3+>mb?cI>GC+i$)QeCH|0 zXYGK){_z;!Juw1r9BR)5K&g|5ZQ~+WJ$Pg9Ps@wFPgY9~ZcmKsj-!`eg1+cB^cf!p zm50_*u+1cP`Ua>UIgBqBztjuXWXzzjQAjfg=owlHjauRz0_Xx17JvlU{XfI*_yP97 z%fxYoxb9MJ8pig8_h0uw_2w;AD<_}FGo3rJRjm{Iw5t`5rb$SRa}aM$FQ&cHTKmXV*-zM zvqWDlg0c9;>mICL`^15G@;w9K+9ht^*uZ+qsK=wX{+4?^)lXcqde##SVIBH(K?*7TEo;Y}7 z5Kb9@4=;B0lQ)&0Rg2sWll?yVVjZvCgSz4yFt{3;`#|h;Y3o*0oocO}2bj(?ip${G zHslxIBC6I2nmzPQgve<8{6`+BUj4H}v3=J7sQ8N4Zt1^g=uGc3)jl7;)W++};jH^Q zQaK+Q`x2{nE2`$R?#ZU;IqvTqTLYzKsPUbc&3{TX*(Pk{C{KnQ-V@z>!95eVjEC~> z0Py!8EB(&L)|LLe+UJm~Xxw}gz50tVv>~y)a+299-l4`PiHM~Ch)F!*@blPh-y;r+ zw8t&wNyDR?8(+QQ(Z(I`7=W*>%3bznA1}X9?{#n&__+Bh&dTfH>|cXmG+R)U38rjG zE$o9*0VZn5SUs8h$yORkDu5d3f&N}-w2&i{Q)4H}XU57eg5kf#?0TFyC=(wI>8Tlh z_o3?L-+rb2;%NhLc1iKlXZoKkukbfE2YvjW2xq}!IRDn9M%!RIo2z8v%5!0`hiy;2 z!b@9s^Wke(an{9W!=Z^8b3Q&f0T%bOXZtWed*T&VuQ`j=8&|=xIugYR2veaTp!3Os zV&~nMqlXFW9>rrJ)sgV2OYfcd$Z$jE1>m^!@9UQqZYwYIH&%<9La&1^M6mcWa2#kK zO;$CMbx;M1^Ze~!KE&_+`$w2;z?t8DgztX$H@NJdt%1E`v&&!i#|kVT;Ke6?&X>M) zH+%LAy(Rc>e|#gq_POg&`x{91p#s=-kc*>#L(v+9^8^3;O;kGY5+x)=^ znP9gEtnAg^=3Dx=m(TRi3m5vhy%t>=f)&347*J+r#uGs;?q~a^*Z7Uk{xvHGHD@jB zVe6|^@&g5a`jaox(_cZV&Es3YT%G|PH5ZoIy|2#5G0WXQyp@aBUw|B% z=n5wRaT0@!{BP{|Vd9#`KN3>i6TZIgo{5Wh)oe7E2k7}S%~vkT-`=;>JFijD=z@dt z1j@@m3&b@r0oc}*C_<1LKfd=FDn6`TS)gpHT)iq!ZM4Nt?t2b;4Jva_woinQ;w^wU0I;w!;kNM2BeleD|@dAk~!&Qj>-dFaA*`XeM`ObzH&+a_W6qO zTmZ@>WEBV}= zkF)X1KVZcL>*@0it$M)Q!v`TZ&lqtH92fi^vxx7Hn#lLPi z%ljlnjVe0moCB@`KcCcH8-Q)k7PrmVu_~q|R4P4`ht5Ls3mAO=RebcbUuFCNjE`5r zjpn}Jw!w`UAFncg06zNJuQK@lE3x@O%0p*Usq|o4!q`|1+(NXKEjcg9>$3#@bU$)5C$O-90z~^oMg_*(>S># z46a=6U$dkzy9CWDgR3g~l4S$VC2d!sJ&p1dxH_SpaT|!{PT#SI=L^0MVH88VMs@px z9Qwt*48Qauy#pFoh0vaau$9#9?r3aBxT;OhfMWQiXW0Dx-=tV5pxTBgit&B$Jb^d_ z8_r)wtpztp+{)9mUB$8i=aN+weaXR=-8P>GD1a-Mcx&m?TJnkY#nB1Rmv)+Q!=#~M z+R3qvl2uv|Q0Z3`dpsKT7Nh%zS==ksC&!qmwdo%$P%ciw#2yF^Kya{24#317%7rTZ zgGDB4ZR(T9SllZd-oKlAy+yIdqf${21j#dPG{<~e$y~LAIEfcX-hn=?uUz7-?al*k zcl=+n&{>1lC|98!h0+-S;%d^M$Xd^&E#C)v>GuB&h6oh zB|g+7T`|tF9&QO|EcID1lw;zJI;IFcIU`7teYq(&cvlwFX!dv3q1cIY&5h%(8rC zfuR+7s0Y)}kJ9JIO$e(HHIlJZI(J7Ux}>`0_3_G}(C28i47YQWP6U-KK13(67YAuy z&m_Mo2SEc4*IYlq(ZEn|2#W^_jEx$k;&R>f3t=oqj`J=`G%yx(-SrERip$ujVevqL zdP6uG7_PZ~0B{hiQyQMhO(sb5f=(AonfW^kT!o|6GK9W)0nmyb&s7zi=`p68w`q?K zosrD)Q~~=#uDYVaC%&+h7hiAk^s`mo9E-T^-<{2}#XcO3j^7wjz|n|hi+yhYy|a01 zJmTqRs=WAmlYjn&rCfDI1@?zsvsQ`gODbgNn)x{3xvHWSJ@Zxp1$jr4N2M#Wj^a}T z+RQRkW=&ocsJ#K7y=fuKmioN*T9XYQtgz-#MS3 z|KBmrzo5uRuIPik0itA{CW*?t;7ApaOxs<7qsc4CAFm8L(-unC_L5P)8{O`9mj($f zYB*ry6@6^{=pc+n@OmRztDI~%Obcpfol95bx%4Z`VIqdz0b(U_XPKjIHUpTnUtncs zgH?5WVIBYkVqDCAvtTT3fp}g3j1abCnM9;tj3Cy4)rlfx5;k3^s!TSKbb@|b zJ#@EqPSF3${-FiD?)%hig=IPnI=y5iDj`JHASUsIFqTOpg!2Lr35{0FA&i_U#!d~8 zbYe+^ywin|ObDbgr{++qQ$|mp!|~3w`0EqpB?$v`3b3H;49I7f^KRuk1!KlZjq;jcClf`rfa*o!-s!xfWQI4- zN_w-Nr!p^j6$(K_5R(YNw!`sG3**OK3v4+Y@4P)ujBc% z%Lv56mc#MR6E21}9g26DNx|(&(X)aQL2E&@%(Sr1e#=aPhnmi}dKwg^+C*VYW9YwA zIp=0_elou!Z*8VA`RkOtBcOU`Cpt;Tmuz@+CqY5E0=AO`1+3s&A)XXA9g26Hs3D?X zIcj$99F5=d1SFOeX*I8TTiQGYO!fDT$ zgLBOwW^@6pGsYm9yTpPk@cNPXtyhkko!vTjdw^2)KWo6_<9U%jR_rKZxN9uwT2@=}m*D0k{BH1M8WTg8X*>mZ62inaB zVKc%;F>yPh-Dn}oPS<WV(U9SS-Yl$Du@ZmP!5l@I1PCgYw;F*H!3sD)CGLmXKeO@r&`>ExE#KsC)V z=3;?rI!7p#T%WqW35A>$whc!+9~+6D269O|=>%P2VDAsN1rO0qw|_-~iqp)jx-8*z zDX+UcV+J4{?@{y?To&|t4EA~~D0@^&9$KdtDm6E-9dSuLCF?C2f)pnJNFWfx4_^)* z0`{IvSD4gIyt}ps_l@id59Evx2NsD*8DZMcP+cH6^CYg08@n@s%Q>22&Y|cliaCe8 zr%_sgBeVHLb}YB+nK}bNO41|(6Ik*_7pp_)XB>Q&URLxFyPG`}Q z-7usO6vhh18jQ86$n@Gqb(Oj-?e2s{cF`0AEg^1Ls2XTl{@}63T~FY!IG_AmRsd(pc5^2k@v z@8Fa)s-z&Vz}HC|Y(C0rL99hD@}S~Quk9NKyFW^3MyKy5U7lnTdP^&{d|jYw@Iqn7 z=3wvjKbril{Vn@)I^toV{cdiQECGuEDZ1+HpWf8_?T>w^xJC+!u&8m%4!TFDAY{wb zbW&3a;>gl&#l-Cx6D1r#DbS9_^Br;p4=<+^FEG>0F5&h9fyLGZQ?+<4gK7$oKGWQK z^Zm82HDei0pEe3JJ3sH%R@qV~9DwqFSYP~||MKzDud~P{@)VRcx};GBjq+9E3EnhG zQjQ`vhWcbkeLSE!*~UZ`$JG>jeR}%yl=^dcu7gC$f4m@0;$4D-;Mj(Rs>O>0Mq~ct z!;Sy-UpF=HNRyqUmT$agdxcXF763&czI@2N{(Cp{er@gA+*y<~aZVv6g(_%tL4&W7 z*LSW;UR3Jj?QzhI2wMhYEUu&R^A5SZhvzxT_MG zi8{SJVBE6pjd0|y&8jOn8UQ(P0qE@d9MNJ@Q6|hL|^)M8(93IrQU{{ z&iAkS$osrC7cKQxcom(LNu{P&bXmq@Gf6M7L=%=B2cnTD-;TCEurqw_=>yU8z@b!e zn<_n-y1YHriN9L_WWAv$BVG!G>%h_r2HlmHFLhR~TjHIwddNMyQeZ*R)4h&^4`2*o zGqSbu7Du-oj)ylNjNW?TfZ6rhv3QqBxO|){9;LLlBjM>z_}vB|%NI&%jwq76h}2B; zL?7taP|7KCS|uGRE5vP~Z4+xwq>6P~A2!42TB*g`?{uQ?6#!X}$fW?}Qt>k{CcD{w z_unQ3p`A*QeuwYY1m9}_vMV4rRo=^p(?ygeLwci(gsJzu>-+EjsQ{QOY0lT}w_Wm{ eemZ*pzX1TWQw7@xUO1`%0000V|J4Qn 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

G?mn*Vrqs&%?wE0g54p^p}8t(>PR)e>_E6l#NWV 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_15@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_15@2x.png deleted file mode 100755 index 46c29485fddc12ba71d1d8825507ec2d42b8d30c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8768 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
n)!jsC_&g*O;Oj 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 LsK2X_GyD17f~g%!gq3MTg^ox!?mJR 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_166@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_166@2x.png deleted file mode 100755 index e87ca8b744945d2626b0be0edcfcdc6290706168..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10664 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_18@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_18@2x.png deleted file mode 100755 index feab8a16b318a08d89b4537afbc743c2bd1340c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9143 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 B!K?rP diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_19@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_19@2x.png deleted file mode 100755 index 6f979eedfcc623b293b4ccd708bbf9251d5da4a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10230 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_200@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_200@2x.png deleted file mode 100755 index 8b9f3bb69691759c1ad2ba4636025e2452988e25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6666 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 Bt|0&b diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_21@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_21@2x.png deleted file mode 100755 index 70324caf7c7500c0ffcf01f56529de4fc32df4cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8775 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_22@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_22@2x.png deleted file mode 100755 index f7d85847de1fdbbd37007e601a3fbea6e9141dcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8986 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 Ae*gdg diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_23@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_23@2x.png deleted file mode 100755 index 48f30fa4fa0be283d8f7421954f5678b7b447c76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8461 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%0Ari-2x4H1eKi%EB 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 Ef)$5Dvj6}9 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_25@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_25@2x.png deleted file mode 100755 index 78886377a77c713b737233703a0a76b303f7831a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8302 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_27@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_27@2x.png deleted file mode 100755 index bee713cefedbb5d8265e8bcb2e7054ed8e9e128c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8313 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 DrrhaG diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_28@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_28@2x.png deleted file mode 100755 index 0226d98eb688b440cd7242047dd759e4f0dd6991..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9563 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

`v#3Ycy&V;wE%>ki;+ybj>Q#(>tGzjn|Re`#-Ub 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 eJ!*RYzX1R diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_32@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_32@2x.png deleted file mode 100755 index c39d85f319cc3951731cbb865177841173f77251..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9050 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 A2mk;8 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_34@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_34@2x.png deleted file mode 100755 index d57edc6548386ffa56811d1ebdefd1ae171477c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8493 zcmV+|A=2K7P)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z7FtO}K~#9!?3-DPW!H6{zrFXF?!7gSJylm%H=FEclTC?|+>~Su76sZCNE(!lNKlXj zaiRpWV@J-21PT0*hZu>Kzz=p1BgjJ#*bodmPzJ}A9Z0byk(NVIoWyzP>Sk4SO}FlN z&e>xg&Z+9b>{(`XIC5GDWakDg_vJ^Z1q{C4Sn82~?i zYWAJI_Ykn2sF98R#vO+bJTkX$b~I@;@IKHT8UGv6!N%9~q5joUna9)g|3L&yHOJo3 z#k}))5x#i(#IY}&y6#WhGn1{)EiNsv@8Ch=Rtpg)2q|e9%f#3it&s+!t@Kx)f8nLD*(?9ey9&UCjm|r_ z``)9ijg}VY?w**MLM167N^s4LAV8%tky6YE!9DlfMXx{n%IWzZ{10!2FRAEV0$^-3b6eo@!<&h5^|CRsw-De&fX{dJx zfZuz1`5g_ng~{f@M|T=oMg zvEKhs7aPgqmQ)HU1wsnE5CqtTf)D~;N+Kyqk{B7qoZLVC!NXJfx6(L%cL6vwmT_io zoZo-#0zLOb10s?_RJR-gA_T-0AW%0eQcC70M_Aq-Ec~Z$zl;xJFIsN(@h@%$0Pj8H z&4iy>nC2O6d2*$Vyp7)30_q0;JOBuR6bdCn!+K8~!>#lMA%G88|J&$V7ttP;i~zs* zlONzKfBX#3oL%R3Dw054aV6p^zgIn7a7Yl%2wD-yn*hK#=$4R3Xe1Q~Hw6HI6oPK9 z$&KTSkDTGx|LYUHxV&-80GKOpQ(Wct1qAO2rX(-48(J9Jn_utb{u!o|0cpswx2guE z6m$nA#yGzG$Qe!^n!X+BS?z-mKp=$6F_1zaeE{pRR+D#olv)=zyUxs5lfU)gJ$&iY z_wb=3Bh0nn$mDIvVJQXOVTm@5FFo{rj_;ee#T*b;N`;W3if3`^U_*dADN3qy08et?vMZeF6D=Zhad!Qy!1rtg1H+HDyp z2%$hosLNrbBuNwzmyR$TQs#Yn8|$>Uw^`ZAU%t`zKYesRKl9O3#F1p9JG>Zdw^9bL z#tFSbGbIJH&6FN6Gn!#ua<- zJ=S{VOVyJC{!Ua?)s`B1s6IFw7AlV4cHTi_;~;?hgI+b^1FU&b9~LjiLGOwXWyj>;(Vl zb3ewR@fJ_Ma*o-F7UCxA~_hEf>+iD-_$N#RiggH1NZQke(Ze&YgyiCBZS~)TZLN&K*bUH z_JDkIKx63udieHaZN0~9KXdf(;a^)ke1K-N0aEUk1B4VPFY!_myu%rT)g|Y*2Ib># zZvWcbuB{|L_t+=-`1_929}d{)^l8XjYte2?X-~CM{@3^4;QLR!igk`F@fSic*@*e2 zM}OouPuz7xO-xK8qqrhJA3#ck6a*=Wf+tEdlu}q@Sm_MjS|6BiU%BS7gR}h2M?b~~ zPb~84`E^QNprqth`{dgKz<7`MaQe^;BKXTpM}fdv%UCP>)E!3`AKQO$KS`qjN>$e? zYmFZ~LJ3ro5@iik6rp_}mWWm?8JLTyb?>o*{PNE}Or#VqEw3RE$lLVIZVLeI1c`Ed z_}+sYpP6D<>YDTdAq0kb!GVMOesghYk>=)cf2*!f75I~4P z2!h}|!5XYKXl*&SGk6l<{U?|B>kt137q&Y%8I#5lA+Yz{Q_!Nip73r00FcF!yrWsp zyL;bT@AUZbkDmJdyH1@<$0o-SafHvZYBe7&)BPbpa2{th&KSHY+2{_<<8SW#Mhg73 zkDbO#$<|IUZHaA0zT#n~}B z{hWL6T>RRJQzuW(&dm}jMTlZh0-V1@>{1243wUR7T2l@Nn0&z6h0UG&=aL5>y!XUd z+{jL(Y3s~g$43rjX*M6ns-dK)biVUgXT34nTV1YxI?FB;!{M?i^KTTT{$m-U7ccV| zZUz8RlbN%Q-~-+VeDHW*vAwn)7fFPu()a$O^L+OHMNBgC+xLFpzDK8K=Si}J5XXcx zuJT;$dIA;u69U0GY+0ZO1BzaUwdG~*JUBD`A0GY8SEJc|coC5$G0l+-r6Po^))WZ5 zbvR?Bw?=Af7chFEyVLpL+S>YO&n=(l+*_Of-Wc;G@40GjTor&^TTG#WAhb32I2-R5 zkU8i2TI*Gue%%z5Wi7MLu5O~EJAeJe>3cuFuyBwpNeFR5Xrw@>>b?+F3TR#JzX#_G zt}M{KE<3AlArXA&GY`wjLx-`}L6#yCiI?!6DD#}ZduZXp=J}QH zeEZ2C{I@JGzV@T{-TCGBKXB&f4jkA=8pn_(ge0wVK2!zA2PjIgmf!{68oV{wvY_nu z*jZa+|A|wK&+W$)1!{5(8%wOQI9qRG?IB13YF9#MX+^9;AXG%0HJF^9;`ovMtgNg* zvb=WTBcqMvJJ$tZaeNNvAW|it`{c22e&XY2KCypcfkvxE8YdtGA$W|nc&+ERx3?cV zb#m#k&v$y8AN<6}XC`K5NTLX`44);{)%u#EorAKhUW3QGfcKW*EUqjm2R*FOL}`LC zB|<7(SviRkfw-dE6JgI+scybDSiJZ60HJo4=f^XicwzYAm9y>Z1Mt)DPZ$mzQ{xN& z^phXH{}YQxml&U%M5Sp}#sFa*nKd|Lh$6+*Sc{R#=^3vg1ObsXs&a?hbvG-jFLkx^ zq9#6XtFo6@yFci5=ym(Jd`Kt@tWd;&C}JWhAQFhWZ3%lt#Dfn6V+g_Ht;aiy*Cl2! zpd1Xzu$k;$V!-zD8?3+a8hO7D zLJ|--?@&?_CrKR*7l$eWfpeCkC@{LDHz-)|m-MY&-4{y=y) z;H<+tOYja6Lgg&?y1ez~G8cA=FAP-p72w%x_W=Tt#POjdP7p#~R2$b3M1Rr!-p&8O zE^F;hf4%nv@2Zh_@JI<`(^FVuQE?2-3@bd&TY_~J`TELgkqCqm2&GVoLJENp5>XoB zq9FKyGgWnQS|hEaH9pG0i6;N?n_Kr?7l4l(og8m9(rIe436~_ZxY`Ww?S8gP)uEQU zzVZhu6db|TZ7>2AMU{i=T?Lf&$V7sug>u+^pG)6f;OkkbK!C9bV`?I-BEgwTTsdPP z1WN1dbyMKp12a=e9JPXwm)(`P<|OZJL<9nC0Phe291ud?0NJWxky4UmDM=JF>~!(o zV#|^UiOLdGTyMe^S0O@`R>9YL*gAqSc<*txN)4wqw#X?5Jq9~%Hai1`*1djR0RGR} zt%(O8NR^V}(sAZB20dKt?=R`l_Bs`R2`Pp^2(FF@kC2kI(PDDnJR8fev-Rfd%pEz3 z)&|?t2q_R!?be>X*APNgm4dGuO^>8Fv}bdI+xiR;?ht^Hm2}`-dWmXiZMh?{xUy*Z+Wh$M0f# z|3Sv4r-_p4B+0JFF9>z&RL_b_eAP-DjnfvV3rv|~@`7Hw%`0bD!=Jvg`scs<^vaj( z3H`MJ$P$_Q5D-D^9ul}J20}_GEDUo1+Sh z=eGX2gU4^w5Q+A9FI+1C>clQef-_K7^@?+C$H8s1-`x^`cs1Z}`-taC^NQUro25w;?`Aa+^5GCxA_ z1nO7sYm>#|jHB1-Fm>P%`|dc76N=HpM^R}?5FTOe#VX(|A~*7_yD#nQOZKvKq3j! z?uAhB0bdhe2-S{i9QQ3^qF ziRD!{f%SV_Y?%C>oD)KT1QkULyM2o84k5|F2b3|0NbL!r$}+Djj`!6D`MOuI)ipa) z;EDp>?Xa`5LVI(I^=`3t!=`8_*PGozQ3mT$Z(Suttsy8?0b)!gZi1_7v~#$!z&ndd zQ-lyG;_3iIsQbTg>CKD1b3#H$R1^`Zh|#f8R#sMd^{J=0>;Csq=mHs~$Ql4CMdgJB z>b5)7UA6~rvASw_OfkgtdkorJY^|;F>dGchuXew7!vJg-ZhfuY+i<2lqoO`0POo_+Frbapx% zT3jG&Hc@ecP?g-iSpFQ|d2p^OtyWh6XpJdyis69Gc890WwYPrf*$e-+Q`qm^j4f_D z{o!&x7##A(R4PkKFnW*tL*3MPXKRljFx=Te#R<*&G-nitx`%fc39OdHVYg3^0;v>H zmXftv%+5?9h2-TIUgr59yu$2wi;1xY)>OpleFdH))ZYsj?j#c>_( zzB&W2s|fvW`2!)Ukd{&*qX-oxBw3Tjh-E5NH`(qN99&#LDOv4q@EBv!+F(kJ7p5A! zBN0(T91BL0YOa{XF|iUH>KBL4_wq9@Z4AB@$(sP+<+aYAt*>wX)$zGDahmN37KEtF zm)o1;dtKtKL7S5PPMau+X&Q|m9V1FIL=;tgUkjk%-ClPnE;%MiUvu6|Xvrx32OPe9Z;U??syT7M~Yvt*!FPi!U>hq<8i8;9EB}8G3cI z|A#N1U1NS`nj}t0_Xtj2oa9)8)f!jk6#X7J&-Qj3Aq7)qf$sN7M@ET~6cI;zbsMTd zi1Qw=OPtZQhTqe5NFmT=N#5-uvnC=*iJ}ClB1DuR(@RxhKsZM*wyFU6kh0M9b~<#r zeYOj2ZhAD9+wj`|erff;pV&X~a0rfx**TKdC^AyD#pm%xV@i!4_Q^Xt*s>tkj#tmF za$uM^fjTfDxRfAf}RgWq^<>mQ$(JO8OOW!W5d zI;5=@QIevR0`G7}V~n93<`lyry+KatJZs&8XI7T6LOgYJcI@QQx$$hgl@TW~ahy~q z!s;9F*45-zD>?5g?M@&`VxE8TRfhSHBMS#;v|4x-5vV|{#&cC=aMq%Wf^s+@@Aui* z?(p2|j{fS?Yrils?z;Z~Auc=BaS2^EBKgoqj!gc-!ery_1LMv4iDuGjCNYr`duq%W z%b>KhhlaIY*?WCEf9BcM-tTm^{c0l;_uVzydgP9okuyuv&6D$^S!;46BZ;c>qH^~@ zlelP}SRc^Fp^c+GDA?%_8EvGDjWmgpn8Jefp-@VsN+3iC80#1oI&=%O^HwKceQh)U z?lWt>-`385{f6ADs{v3y#(+ba5{I)$92!aEiDsfkVkyR?5UC5n<;L%{bF|O6Td9F030L&H-nyCVg)OfNPyB*_~Cnn>kzt zj05|XV16u%=TjwSBPpkZtn?Hh9hBCE&7pPcy~3UY&H?MdZT;iIbpd!UKK}ndPrugz b_`d@HYi)mWgCS=B00000NkvXXu0mjf>n~=6 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_35@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_35@2x.png deleted file mode 100755 index e3a4fb2037a90d44e7ae63975b82baca32f97571..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8065 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 P00000NkvXXu0mjfhaj@V diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_36@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_36@2x.png deleted file mode 100755 index c7b74cc187882670138bc8c7da108b1e9306c142..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7929 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

`%VQuK)d|{!x}5t>LaQxF@`mLYZ?8=Ul-# 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

Q(YG z;N_QW<74l-ncsfrjZ7~rF*-Fz7)8u2R9LE27@C;i`#(O!^lU`2NE;478dKU)Ohi;8bT#BhwEu|GKaXe>}j-?C{I&ugh(ZL z)2lA!+)aHX^@y3NDm53gxv!5m->@?lGhh9!%1q>!hsWn>E95wP+ggN#VrKKa zW~o-E(X4Z1WSsB*_%M^xA*G_XGAmpmRodgb`V>oOm`hUDw&p=AM*`G=Kj%_5AqWY1 zjKlmn(TnzrJs|IO(y&cZ6P{2ot?h!q>i=@>*&Due<&F((+R#HsM;k#9P{`-lx@is8 z2@W2aq|%7kyuOR>Agt=2J~zm^EgLy|OE=9pX77< zh^3mPT=Z7b-SU|4I10>4IczM?SV&Lq0WU|K-7In~>zT(;dI^)`KH#j*%UKExwWP^R zT&GzZAxakzK%Ass-ZL_BY`W6;n=2OUXAi9Jp|h(@u9#3r5Z=} zjiC1B}r2nVMw(e(nw0O@aUEUAuCr;zi->R#=g%UwczAqf=KP1M zvv&>6_q?aScm0O$wjyn%JcS@&WWqyAL7F5?P0S;H?S_F$M_HF$t3|a;DarXh&83jP z|KT1cBUmG#7zmV*NaQLdEcb9twhwF}A+ivqTnaoZ&On2xw_2sDHAwS-+KVV)J+P(w zI^tqLgl0(>34}p;1w?&;xyA%R=O)TahpDCWbnB#e<&O5*-t`?hYg$bkldf=pmMUpg zzxL%9lk4b0v>4J#fUuTYSY`6rQQi?o!ZhA zqt!`{RfajRaG2q!LIQLs$gAVRCk7Juj5{6g;S3KgM5~nXQduM-jZkTYMCQ(_<~O`1 z>DqZs(zfx6wB6rPo9SUqc$94$6TF~I@0xDf+dById8CviQN-N%AX+Fzk|tRIa~9() zp6Ah4DABpLjj8^F^o$JAf6ePC_w{qV@JZr?@x@6F%pT?^qfhhX?DJ;Skob~Z8<094 zNgQ8!X*SFRPksT>{kTqSL_RESetXol{q3yT@(S6zfqZ)x9oj-cF!QxZZtNUn%VrM> z?P%>`oF$4Qgpimt$+!dge4ZeeLn;l&9iRWcv_k=2V}X&r9lu`dJO86< z%Q^jpbsH#^3*_?>tp!fFY)`p3#O5t^)~+wJV2k7ndHh^1V~7fg)e4i(qk|y84?L98 zIBPLRLTYF~tCPj&=TVOd`mVm7&bAJ`)F4}Ii_{nrlallDTwA!pySQh^D<6H~k$s;Y z`sWYVe=$dX$wv%~ZoKB+h0AYwWAEm5bar|Kfsa_l1+>PJ_bh8(yOqED=d1YT=}|7Y z24-qGeBa9`KvH6izytx>_dGnUk;=n4i!hF$zs%g^ETeZl%ewwo(*Mfq$b}Jpp@Cq)c*;97oSh{W3X>}k3x#@-r`PZPqM zj~`@iE2Kh7ah%$3Ek-F^Q}OEmx|Q!P87{x`5HH-ykzAN5zxbx=MZ{M`OMBo?j0xyeOCvh;Hbs0kA z1Sb+gFXnrnJi^8ELp=43D!NlsnF?szQsW=~Dyr%ucmEWX`fT~g1aspUl(F5=zBWg+3yw z&}Tq^aE2sK&(Z7qw|92t@N+r*T!7a46ju9+Rjk5lMUrTWC|+~-4!-k=fQw##lxMy^ zMcc)T{OzaOdGBZY&|7YJ4`ZMHSCXhf^}caDb2j}SyORQrzLZSZ9dy zc{&R1Y%H{I)!N%9&!B*uGgPF{MEBWLq)*PBAs1Ln8mC)&+B?YS0z5y!^MWjBpOI+d zkPf7_B$1{hJZ}5+0Qdbtj#vFg%C-?NArMH6H3Xhd&dU>slF&kPCItjo0^wtHiB$TeXHbB%7K2eL z$l-Y&+VhdVMoG2mp{CQYab4DxQd*P5DFvDEmd~Bb*YEat^lzrQ^3N`2{XiaFtT!oL zcpe>h{V}?n$1@IuM&`2UiV(OL$?2|DS}HA2MxnGuD}@%?YI$Y_Xlu|?p|nCPjXp!_ zbXFq3Dy31{Lu!quB%ZP_snD=aptMJlD0B?BfABo&?>(2^KE>pOLF;@0Vncc3T1Zk{ zoI)<2@tj{Gx!JYmyi#eD(rBsCGJEXij0(VI%yj7?q=$Tw2P~WbsU<>7gp_zv5J-o6 z3B+^f96n%`B(;z$3c5Q5QO!~)WHV}n7LY_)RM*GBE?)YcB)d`9nhY+})15mbJ${A8 zZXHf!kK>)m1#GM9B3wplFb+~DvF_(uX2o?yi*if~sc~8A1a#DBlts=v(aD`SmA3w3 z^0xwDGm2<7n%T_I#GVrNj0g}mC30YsCeB)%P0y$Rml`jLBEn{b))}d#snp8jH$VUW zPQA7k8g*ON)5pdp)M8LN<=KW`WK${x#$@BN+ERu2g(>Q;+Vrf~qR5@jHw_J9(zrn? z3@K+)fWxL~vpGFqog12?-WK8oLCc)~kIxHdyI~p)Q~SRI0B(9>G~#>!WB>pF07*qo IM6N<$f{JQ|YXATM diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_58@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_58@2x.png deleted file mode 100755 index 52dd5b1e68106a6483f98e8f06587c85225fb1f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6387 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 BKH>lX diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_59@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_59@2x.png deleted file mode 100755 index 6102de8ab6759e97a7310bca7db4d338f68b144a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9875 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 M07*qoM6N<$f*`4no&W#< diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_63@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_63@2x.png deleted file mode 100755 index c574c94d63f6b9339eaaabf5354961318bf9a65e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9604 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_65@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_65@2x.png deleted file mode 100755 index 967e0840ad1c38c2e30f605a7e0ea9c715ffce62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9445 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 GkN*K>BM627 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_66@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_66@2x.png deleted file mode 100755 index 69e85b03c90c3b724472e1dd81191720d4e406fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10171 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_67@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_67@2x.png deleted file mode 100755 index f34d67187a3624cf5992f93e78df8c8fc8fbe385..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10819 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 N002ovPDHLkV1kD$_WS?< diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_68@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_68@2x.png deleted file mode 100755 index 164dc56aa06192ac67a7bb3161e9203a9f675e11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8343 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_69@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_69@2x.png deleted file mode 100755 index b1c92bd7370db7ba86ec898f59ca8a3e31135470..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7669 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 Ef+i@Yb^rhX diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_71@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_71@2x.png deleted file mode 100755 index e1d80e11271600ea2d6e6565da66873edd9477f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9331 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_72@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_72@2x.png deleted file mode 100755 index 14986a8e327b44e1a53719c4a76fab5ba0034dea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11049 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_74@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_74@2x.png deleted file mode 100755 index 04d51befa24908d96a406698cb03c12783a99c58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9862 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 ViMvYeowWb}002ovPDHLkV1jU6uHpay diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_76@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_76@2x.png deleted file mode 100755 index 102ffd95aaba60b141cfe86332617de206a464bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9728 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_80@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_80@2x.png deleted file mode 100755 index d1d400141e09054c31d7acc861e9027bf57e8552..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9443 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 UMfMr|$s+(L%BjlMNSlQH2T^RDMgRZ+ diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_85@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_85@2x.png deleted file mode 100755 index faa169456b9251cda94ad18d281a021f5ee6c282..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10691 zcmWkz1yEbv625q#xI=O8k82^gyF+lNxVt;W-Q7xoV#QsHYk>mA-MzTKyv*F3JCn?n zJ-eUmMyV)CqoEL^004j{DT}A$XfDobIKdhbCp$oE;jE*Y+U{3x2fVn`dA_D*v zMQd?!6%{K-H%C`1M<)tdad8SK7e@J(!p114dZ*dl}Bkth&cJgi(9&4G}46q&rp?LvlDOVQ{^-55=M-gENRvL=6@ zi?g%m#plk0+=G`X?`e!6ENr@@{bCz{Pc2*k{FgjIS!Q6gD+m@(W)q$QbAP@YZ{1y9%8aK#>G&Qehu_fJsyXMp!gPaDfp*;HP?n zISP;p0CwJfVpPBnG~o0`RtN$3TamI#0Q@Z`sQ>|SFhCZAG!3js2Vkrjti}Y}+Yc00 ziBPe?_twA!=`?dl!v=LB03Pw$i5McrKv0$#(*!`l3k!&o;Y`9&D8Lo6&Gu|o7&(Qv z%D@1<<7tx_^0S<{t!clBJ^x*9Zc}de+trDg5PZV4K;EUw&B&p~kvV`Vf3 zH(ueygZXm4);&S@Ctr+bfWg&wdB z0jxG24LDbj3w2R``#i>Y^S+3X|Lk159Ro+W~;iLqh%XR04$|5CBLN2LJa{6bZEtx2hLCw~w^5mjKoT zQ9=ZjrdI${3~@Jz1f_^DU6e?p7yK8#=_edrn^TSIT!%hRILDB-! z4t{88x@ro~d;j>LQK^YhX$bNEE~VL^vQvTl2fuQ@f>g7kf~RIm%~LHwWm?s!q}%8< zt9xF1x!q>Iaa<6d>h>D{xq3tn{ClP(>UigF)_llTJ^VT^faDtKG!ziqR5Eu^E`}#&IDI+YZyX_AG5x+O6CwohhTK9Ht7I4SPnb^Z7qskDK5FHl=74j? zo6D^E??aT7kxe!5k6SY|(cIYl|mK1Dp^yED0?y|cfYCY>O`CSBlnZv86Ft~>h@*PWex>C<7s=u=k2pi zbGIcq9XYGjOZI=(CIkolE1wlvaz2h4{1Utny}7*C-gchY$t%k#>%UGsU^VnG)G>VS zB2#Y2rORJnvmaR*(A(@9_caC!34VE+I)W1#5`r!8DTwI)-c7Y3*i9X<5Ress^pgL~ z|1|!Z@X)j6{SW_23Beeq4`vUhE0{RA0nQeV96k%a6p0%l4xs~)6;%jN3>6tohukH_ zv6tZA$44{HRZFJq8N4x29-i*UC$?YF$gKoIvt^9whCKca7g){K@L8 zvXuJ}C$h2{qjwTfavSxvB1B?gy=r>Nd5M`XH8(Z4L=DY4y^(Q|t%adQ*@BTV1#Q=R z-+t_4O2pXxF7>19^$MO{xWY_Hqgss$I=%vHIir^zp`KT(OqY!AAI=Snx8q0Z4ob?~K8m~`(RoT{7)BI=Sz4|X+ zEp)cDRGcwHiz}@nb#&aJ=0>;849_IZT=T*vV_pvu_#Z)hs`ma(%FnUilP4psL$J+*ROHlp*tzh0tMf4qv@`)Fh@x9(QtV{;on**G~i z3CC^1eWo|jT($DAh^OSvCoj-o9P(OS+0wm4x4h7^=IMKl9!iSGzkZQ=+S$bDrDfYC z>3{1mdmgfuKy3Q4y=OmQtyS7nc`!f0x6~KuPV(Z!#?8@gwYI0H9@$=vCyq=8?6j8? zF$>IfD85=GxuTc1g-qSJO;t5$K8;Woig*X{5&OL!9Q86-uDVGS+)kM z23?lo)A_;#Zs!UuM)#xF>jw!2mz_>GRQIMUv@P=0f;EED0Zy-5GPQb+CtvQz&$I+; z+-?+4_-8KW0-tPp=Uo>c7Fi4myt^)jPCvFd(5;cQ(zf3|c-);4c%qyutQz9yZ{Fzz*;{-uL)fsP!J|Cahb7qK-fJs~|$EkzxdkVj7b5skR( zpZQeER#|-+&h%IS7E+ziffmP%8FX>F!eBb=ajeL z)%Ta`sTKc=){FLy;V$wlh8K}HmFt-&v*EJe%J)JCes3?V_hHx1w6g`AP_;>6CZnbZ z06w$;5EKdkkMGd+2msvK0N~gd0Kl05K;W2cG$;iCWS6oMq8eVy6FJ^)B=dO}!kY8X z->dbQZ5wFh)A!cWcM(ju#&7JXZ`BzOhh)%oXElC4MQap!|tVo zG3$jl>$Sc7k2U$r(mw~=jTT6yUYDma$|LN!{R9UF4cV*dT%CNoBerqUhg_~#PA_y_4 zsE87(RFUCfWs(OPt>-Qt)^RqT&5~)Ol!YGQ8vWeH1Ia@w=O|+=Mfoko z|j+OhY3p zhARmh3X~_1u%4C=Q{b;u9(wT5?Lt~EW<^7-S+njMNpUDBl`KEJyqOM$0D&+;F-L*Es1gy0=IvVdg; zv*B*ngW%BG`=i@nWkIq|WAw6JnkRBK33aht)t#rF zwiqN{CGsW6XM|B=k+$`y-=e7)Q4z%mSam*UO#6)0jO@e^tbHXx$3gw-)TXb^lwO&; zc;vR|E>x#iuJIqdDD+Je8Z4*lOnxDDzn)!Kb>DZ`o2u;Q+QlObPZo~g z3gW#8RdK(SGf}`<7x%i9%3z8ouqfha#;XE?9~23m8fPvZ??A0zwXj znhBe+m9@!5bqmUoF0;3*#g2Q2YK6w(?NeoL96$L5`l47QTx87d!`05?4w9btdE3F? z`n@&Dr6nEVE~2c>rs37M>};gZtojeX2@90seL?2Bv;1F2ng@oZ(Fwnvi0Kk@{GsaS5uV8CPBsDOFr4DXCVMJr2F*PH7t( zl+x1Dm|)>o!E0a(@%yjqCtKUkoq~aHi^K4+$EEC`BnCKmcptp1E<^I{qd8TR!YRQ(&z)FLp_u0+l#kD+aCV9@4evInEdAgUe%U23pm2KFyV=u_gnV9p!QjF z3fZV=QxdTjCiSyhc3z%@DxOApU|#!k3m47kNL zHSrmSK2dzG`zmT`^{9WH8(;>gx3-vL@Yl?)z0~lD;=T=0iDHVVz_+I{z*~yKJodbC zXFNTXZ?xf*42H;+62EQ@IQ8I*tRA(7|1v>DLOMD-E3G-Fd2e$zJKz-drXvTvP6C~V z7X(76;bJpXU%l2uiyNPBj>?R3*v?v6~+P$eUu)29t1vyLCF23)qQ4pfWPmzT7Q8YC**==-_7EBLE<1zjVTIfOU zU2Svi0ea6oa8SY-7#Ir6$}-m1$(C1Eq%U+jEGCBtp!c6)o)(hdrGFPw@Uc~oHt+qj^|1pQuLkDs(K zo6Z+x(y8A)`xSw)@%|a6yuADY7RVS6rvTyN1SsJF{GCw0?Mhl>VEmv`-lKtxz9LG@bA8dW(_C{Aqu(v287Px#>d_BnG;R2$&b| zQLjR{C|DqP5Mt=VYk;2+`Ib|r*>L>T7-KD)_dj!siA+_LKd*wvFh&YEl2|<()0aO} zYNpU<=jJ{!=GEH1xoCH*9 zNYHn#ycqJ?oK@TXCuT63yWcH%NqClL=U}{c%BE*&eq`2rbH@MSy7TGeg;9<4h=?ps zj30sRBD3GYQ(E<9<+I?N%V3d24_Cqc^2a1i?l$~}7fb1-8_H(c+1Y zvF-fjfV}G;ial7+lT1*| zX@c<1s|$6ILsBPl0cSg@u-z{!yUBKxi!f7HRg?x|n!r!Snlo67LrodLEQ=i;9^U!# zZ`|C{QXLAPp*_SR0?G+FG*Kf-<%C}>4}_Y|*Po}W4E+}u?RglPnd5-gH3v7apscJc z;MHmP*6K`6Dg|f6@14w&5+yuHB`QLJ9YGPv#CG_bhsWh6pIck=zwZzYiiqN0-ln$0 zl=}QS(QrR?tGT$juV$pluO>LBs~&An5VxDG%NI}JVAkrtFy7n$y}azf#ly?t2ZIR- zNkmeMVK}*Vd#$)kn{;6auVM@5kGx)u-td~%rj~`zN*9fd3l_)OT)41JvyG)qyA2b% z+roG5*X4iEuzO#b_V-cLGbJ?pP(@n(k}0Xx{BPb0W^Z20=*#v%ltO{fYh4eDh?W+C z^U3Myx4Md`s;bknbPXm0LX>c8yG}7%`42(`3A^9S0VtfX6QY`19!S_)pPdoL(Pisq z^R4|BF?nQ4zgVAC(IrL_5X!B45rOGv_!a}(a_pYDvRsS_AN(nXAOU6PHn)ci)Ul>y zU_k2b?*8&HEc`}n{FuWn+@IsvJ=!1sff+w$FTWO5q;@gIN>(;KoMM@uA4~*= zs-3Ii87oZqq|;M<;OXfJO6m$wH=x0$r>8eEF|pel42RmG-^yYrA!v;q&e|!`&?nL~ z{27H(2&^p`_2@(Tln#ln(TgxB`?8!&8)jPJxVm&ADc0GU57l&2dHl{DYXbj9s1y9Y z0QFUgRwC;oksmWw;%MXu(GX9GJSO(d=@c@9Xrg#Y&{>SSC%(z1NR_q6#l?-(hfE*r zTyELe9q|Zg)g(HfRDXNfrRPmf=H0wvm%tT+2aTgZRL%1ZBYxB+{kpHB9XB`Cl|)EV z0rBA@I}am>wjMXp$P%I=LMiuegC)lOn&*bTalaO9BJX{C78tq*Gv%_1^3slYpT1Fs1TAkskpxI^5}uHva)XG7uDBR#9^A5{f*3{^ z!c>3CQhm4qhmB|OwR$i^;fM3T|3Cw?8(t^FG59Gai^D-bRYpAl^IEVJAP(mg z8X_I^rjuJl4vryXPQTGzt(1 zUCzc*tYPi1{3KCp9U{lKQ$Ag8n{z(5#G*eMLf22G-eMX!{c?@`t3MK?`um`$RHvQU z=61vo#vA07O%_-^V|DrHM*?<>++&2K!b*Nd?LC7;=8V&BdPFEih`lAL{8i?~7OT`O znLA<2z5z5K5YswsD;t~Qnsay}A|i7O3rY~I@XMCELJkjU%BY08I_Gf0BJ@8D#KQUY z|6JZ4b2bJ9El_PeF8Zu_8ietY^=V_Nu5ZBuj9R>%4y4|nKBY42ecd>rg>r4Pk7<-5 zCOp&-EcFBm>zHxWE!nkfumu^bP&#a}d36=lK)tnYhAp8Ex*69oJF)wrn`&Ld${CYU zH%Zx?tgkPB4v&3td3hp%kzdl@cm_2HT7e;J4wmETo>HIHnRMOw#g*u5p-|AudAeHX z`&oQ+ltd;nOoj=2RwBt8Olqo*BfU^dFO1%|^Vol$`Y^%5$Ct%vIfWS?rqk(l6$eL1 zbVTDIWJJ(c7@D8IzMO>hxv!917Q07<$md}z0*2TBiA(8#O+JIA^ykmW_;_>$DIENm z@Z43B_V#vOuS?9Mqa*EV>ni=W=)4Y(e{bWgJM}9SPnY5(bU5>MGLg!K{ZUE3|Blol zkrn>7Fk2W)d+0J0tCNw5g{_8+_lgLU=H*S~e0DsKI}gNGS4);{+}))iiSP5TuCC_I zQ>xM8tg5Q|*4UV;UZwyLx1gbIpZwmL32GE)bzY7;1Fb@gIvL?kI!ix-P*9KPS#VyM}*a9Ym)=ZCyT z>3mEU#gHrL`gJsg{s2gE0Eu{dVmO~19~brX6r}I(Lm!8^W_{f-SLr~r2p?TKW-CGH zi2+~O# zP|kMPdv8xn`2EAiay{Mhz+Egli!XJXQ~X!)v6vtz?i{*-p@Q(YRU?#H6<;dVOu7sc zAeE&}O}7|Ogl%kT*>Q=(L>X=UD#%O1!eV42S~mA@H$}Oa0i~&lo{)&B@8ov-`Vko( zE;2c6$*#{~8cN7l3wn+zX=&lQ%bIYR ze{EUSX(um~uAK6uNySK253_T{j&sLO9~8B<#f^>0p_77p>&%9sb!l#Hj)@+jTKOlk zI8wJ%OhlwK*~+dngd#FEJ$-g#LpmS;Mp^I{*TBF)zs)6!Q#zjQI-WoCrwy%Ti~m4x zBvPeZ93)mM1U3^s7&lGgqL;!T0)x~0)#r}~KY>!Nh%Cb{v|K-;53B6Dy&f&js;N=q zH-y`sMO_GEAsE+b*K}C0MpIE!Q?Kvho{+*)A%+G!F-$E@`8xFEf_m}=ec+S7`Qm`*u6tfVRJCaV+| z0&zP3g+X-l__JdE5TIS4MGcX0K^0SW=T5okA$RuyTPBbv?4_eXT~hoUU#j2tqODN3 zoG#W+pO9k)UDEuo^)_N*Bee``o1hkS?ns~%Qc2E}H7OfHWBmK$h0bxds)#=Xw9deM&(=L@@(2XJVyre7evZMngvJOuYWe`ulgO>9lEB+1s1EJedBm zL4!JQ+}Mv1&`f%L@wVf%P}9&Hd`u7?+KQ42VZld0F~)>fqltPGMG}-w;ILi;b9wL| z*w`lGg_owuJ9kKHMEt-w!==3{t{MrW-l}9`*;e!Oe)2)wynggy#vdofWFtfc1uY)X z5`wVN5v&~?_THWsT`xBSj*pd!XKVOAO2puBZ`GFboj-FD*Kq(^95@FQq>kg~efGDsehOvs#Q1G*VX_B8n@U zPVU0Ui~cMgvypTWVgy*H9{OqxuSmu%`C`(IK1WwoO}Bg!UgRM_-^ zAoaLQno`+xIv!EOk^~J2-R3=YG%Pe!k;%~=7u_+;dh1&+k01WpL2i6V$?aE$mKrSi zTy8-89;dzB0tz}hZNFDnt7MXKS)d~mn|N}|+dNOFyHg#d0wF~uCG=tnr?zgglUO2X zF1T0^E9DxpTHD~YYsaY~#)gPQGqAI9NnF(JC}=kzsw=TPdhox(!Q~3*w5XTOFZ|#p zrcoW>dpJ>hn<8CLI5apJxrXj@>0Nr|6`-5fzdxhTns7OS#A4}nyO%azPe<$ z)}Ho(fCXy9`zNwWQPI)k7tmStTSaKFO~z6yOvS~;&Fvg&a#Q#rU>&XD<)(WzEl)8% z&-2{Gw7fW2eXujE9uqc;e|xA&K>}A33UmLV2WconVpZ~?C-0$UjGtU_nZHth2`>3qoEd~f{{S?iy=?0F7mD;I4%s1jh45e%j zBSlH!=Ycx*QwFHruMRPNL5VWEywiLvz#!^4g z(CQ38iKxNjtgAnZ6HQKBJe191f{-c+bYNrib1GAGW>&7|bSZRhhgK6WE=)pEMoku# zH;?z^Qnvv1*mZs2!Oy~)h<5gZ(JBS)M<0Lx;C`! z#B1UzGl*3~I0a5k&CSE0Q-EaJ7S4bdFB==1^6Ki+uCBP;Tzxy9k5H-ct^8*qwRD2h z)wX1x6<74@>+4(ntWGkd63^DwR;TL;9amEI?tG2Ws%eJ#uB@_BHjgK+zf|6OsRg5D zQQk#?aEC8Q6c^f?%zk>}eH_Mk==P(m*r;*!yXe_WG*du*jd^_7{EiEp7zpw3D@GSwtY!zbH=wZRV z^BWuQO3KR9um#fvXSY6yG{|vM@(j2GC)eA=9&>YZ;w~;6v^a902=PA)3jr=rhZz9| zgWrD7&7~C09ie2fRGVIH52j{JV;j^^P9{-H3*gYDf(8e7N`FOE%E~vOKt~)}F9E{z z%K5muP%G#Dz-Fyp28C3~;Ue)8Ot%mbni}L{k*_o^-^&&?o)`3R$bHV+E~^G(d^dbv zZ@X<_K!J!snZ|1UI%qdAK9%!N1=stNzCWv~Vw01jw5ywE6kL9986QlM+HEvf@5}9^ z9R#2G<?jCILS)Q-198Be96eK54jHbBX+~2bY_EpCcrHuB$AzgY&L1SrR zHPUy!){!dcdj~SC&G>=#F*DD>^5L-{1uga1o$yfrTLSm1dAPwF@M&-`p4_nYveF;| zy{pTuFXU_G9nuTJRSbWg)epij%3f+vzqq8NWI~1lLzb$xh6DtHKSfDjaQg7AyZQV6 zVlPtNK|F^U);A!)7yu!|dfPO$v(eLgnp#*`1ds2{(m-brTGhJ#)2n>0Da-sTe40ke zYHA!u&2HwB-%A?AoxvnbzL%nQh6O*}_fWW$=&#*$CqgjwVsS7Lh@>SKGG7`pshtL~ zd(`G8&J4*18}{Nn3k1NsxVY@Exi7B0J3@DuQ(aB1)$0nox_Z*82|QteL&3J~!TES6 zdHC$}c-j~7vsHg$)|MS70-)l6L-E_jV7qQ!Y43SkvV3oc*4pCT#o9@XZP4YHo%am4 za0yJGUi^-Ws*Q_{vnwwTpv>%JE~n`>pRW4WHS@4D;ql*lLbE_KL_3y@%BG?s6KQCP zNT{aDA|O0wUk&20WleZNhXjTgZz6!QBl#E4_0d#3#)<%6&QL>go~AH}iqsl=6zmU` zOdMwBeZ2RFgthOTon|RRajx%tz#?1{L*!z}%n&|Zim9diL|tn`lJ{X+rDay9n2xkrz4HF3a^XJcYe}DhK7_{#kIW5<}{Cnnhb=QT`r5@XWWfJJ#|NXh_K=^+3deGb3v8Ac`YquTlLwyz7 zI>#)xG4_TsypMhBIPw(zv50AyEV8A0$fk|i0R?6<&1i0NvYk3^V=;vnB5AybPI?4j zrs#UTYMtEp?;W3D3O-yvZwjW_(lA}ynVi&?(*FMPb5lUUk#q5dx-VJ zOVnIz1x~IkiQ>SC_BKOFly&H*g(fvKpA;BvGhLHN|9oO!WvCz4AOQ0_YK8O}y?d;+ zUkeuqcGxc}2l}X}rqbg|jtaYN_G%_fI#Z_KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z7gtF{K~#9!?3-)MrB`*|e|xRH_wzjG_MZ1L@4Ry{p0V*APr%q1qY?u}G$Gugw4_0h zd}&pI2>H+ttrUf*iQ2SPswi#J@F5Zsq)kMnB;YiNn&yI%5+EjVY<$7S29G`0_kKB- z=h>Hjc+QMH#$$WNp0*M_(mqGe(RnWWzt{S&|5|GwlXK<=`6c{-zkc8Wu+Kd(#$2%* z8Q?WbjvK|W;`6%}Upsv7((>Sq0IO%V?^}I*^PbbS`5%v@%u}lkSJE+`>-Oe?gDVIC zzyVM9{l|u%d*{1vdH2fEeN1BeeW`Hj$+LX${pKk1+W>!Z|Ji@?okvgI_VJJ1 z#fLw5>#eINzy7NapJ{$}pyvN92l)NPD>p9;rnR%#ai%kg3)kJW^zp6;fAskWx#xkk z-yOq;7P>9q8>9GJ_dKxnUypwN!JqoEAHIs~Zd&^I_nNc6=t^CG)-4VB{QDIGpb7aE zGo7SF$PuHKlno(6GUi=n<#^;foBYW`YbR35AG-5UhmLE5(5Oi~aAx$O|M{)8w_SU% zf1s=!!I*dL1%A&O5HdM6SfeB{yqXx;iymC&OUaM|&MFvTnqVs#9ym4O$*sU>6rR3) zrMSa7xv5E%06j00+xHg_Z;Zp!UwUx;!0seaC&QdG6f-+&QoyMYF;~t4UJYP#8%|nt z&51Ij>hkN;&WLVpc5Sej2>Gw`oH+!1;TD%qGg!Q~0(+&gDzD9E-lF&VCj@N`-JizjyC zPppmOFQu41Yp#$oc+~+&IWrA(=ezoQM+f#j*YqvRrO;=Ot{c-|Szzup$LQ=kj20ze zh|>w9)#Ge^?{Rict+Uru%$HsEcl5PS?1axexgCCTV~>BVF7IAZ0P-vFF9W2MNtxx9 zUiGK9F8Q0U9XJ+s%&5d;^c*9+k`>#WL`=O-(U_#tG!{pRsY(4r_&i?fm zIrTSx%e*aFDk~OC`LPGi^0l=|c)KLdhfpD+mUEb$s%|7T{!h*+|wA7OLJCZd-DPZyY+7WSy(u@+OXa zS{rUtE8y8C1FuDOlscm5UrtKUF}3&h0X zuczhl8k};44V};mkF*$t_9bU_8|LK3g7C#Sv_Ltl^KV)l~?!JGm_-M-cx2%{~ z92YJCKraJ;+!Ej5s;>UpO$&}iJL2FE-OQm6e1cF%^5`kFGdE-W+$P|rb(?d^xJhjy zmIX*)1dL?rjqf4WbMVK1j_JlG;r?%P(?Z4BasIXAqxfIcnC(}!9$-?w~gxus-62TK@Q{`FeVYUPLNY(M?cmidgSC+|%hj9C@Mtng|H96L#P-DcBM44GSm|6CjBg6oy zA;D$ifQTUmZ;%~NG@M@5tTpG3Jl$kH&!-ocz zerYHNU2LbI**=AF8N(DK0YfH>kknv|w5FI67&{XXk(?S*oRY$X-0YF-E%IcQuzQlQ zagt{147RE$hdugxTO1l#zP+g**_iN~s+S)VFD!{&!c}qxL%wQXsc&BCTRN4+bqkDD zj4d!JlIk7O$YYF<4UhuHN3tyu@fdM4w-2OLlfsnT?2+ni@^phVUWe%pCMS&b7_IT$ zl1^ujm40SlrFU*j<5d}sUv4eu0svyZH1k(6?>*4B%vFjn6kAxpAQ;H)YLg+y1`{SE zqbNd7k)#cXYh}>P-w9JvGa@%rQfOwSD}9zEO-8-N7s_0fIMA~^zSX?9j`=@dt{cdO zsjPWf!(uSW&~x(6<(|?l1@#uA+M4va5feFwR`rDdu^}~6Xlin(A+(=4)R=SM#TsG* zF|@>(QyVsoU_>z1qE6|S%5qQXJ9($c?K8dH=fAiPxTIVlyI~=3UhFDmVX;#6N5o=8|(9o1YD3&d8>99yjPz@W4^uc$Sxx>G?6&k7&fFh_1Mslg;mHbROro01{L zK+ZL!FpCDEjSM+qav~dp5ra|1sG!c^oH8gaivQC=h%;IA4hNU@ASt`y7stRgQ6^sf-6eAW9 zotbZ&^^s?jYeh8A>fdv{iPkNQ2#6q}ZTJ*HRfr;}RjkjHg=J~ZQ^nEi&#nb7ClXu$ zK)L_rKq$XmZDJ9DaI-7 z`~*}n+7hCug6R1b#k4?S?D=CuLQ^1#kVP?~w1^A(l+3WU)3 zr3)f;lPN2AY+v8e?Krfsn8IQUi?wZTE6$_VV!XqMn^k)pA~SOqH#6@U3C0N7VI*Qm zWa~(&f!qQp$&x97Eu4ZW98Jn-6X{l#rJlp3cx*CmzTz*@4K4tn>UCeb{1Gz!LT;O{ zl(JOBE7mF2wSG#RAVx91Xh~2VIFFq3Wp$vf3^qnv#bhCyOiF%MB#VgizTsCQr$@eW%S5Jw0R@f}d#n!FaM zE!qS~{IhO=X|+KXWTwqy&g2+D1L8ZRdV?JI(5g!|H7O+|TGU5uX&H7M^Oe2fyX)JB zr;(@SashZLC6yC+mACBgJMDEXu5hS#Z3OTZu?`GqcM0h%&L&=Bv_x$M>dERc#y?Aj zm{u4iX%%0rQIknTQjQpnNM{KScf`~boOJkXeVnuY70=;9&0hH1K1e{%+$Uy zGpUp@CZV}#6RBKdv_QHCpx%X4V|+o1iR>dArhs5eXHUzU85(tSnkM#Je^VbRKbnbQdwc2P%j!xU zdTRGY1<+!p|KR;MFU&6tJg)Mnvu$j5zLl-Miz((Xs)!Vbda^CZa*p|D>@RLcR&u@& zW3;Ub=QvBAB!W8BdQvV(aSGKuGTkA^ZLl7-k?bR`@+{1GZrE4M-}~sskE~DPJ(pzx zKeT-D&d|6?92oe2esJD17yW`1vHIl4!SA*gFtUVJNJ#DThY^4e+wXjLAfw56g5 zsjV>}E!kvkwLun-NPC^64z1=POo=IzgTvT>Egb!xsC5H_sn*EPxUh0-~s^V zN_&y?H{(@qym_U1$I5&`S$fndqS{X0TD0t8TrpeybAo49_A++H{_Z&{&^_BAnB@y( z+A2|QOXEnZ28lC05rynZwCuNOv$N#JqD7$Wcn-`L+`Q8H`@40zv9RWmmy;gLg&dGy zaBNQ^{X&1``jsw=^98PQh*i`&jB~9ESl1>w`mEA3qKIh$F)|~)bKsm0dIDM7wXizN zBA;`f(G~<_5wUHga=r!ITGTnjT3qQ^7#3W&zr&!=U)h^PV$Ot=zHeN-FVN`sjW977 zJd42e2)1Y7~e|V885Ut!Oo1)x1YwH zzm7dJx=Ky2Dda(VO_DsMC@)lBW!ekBV4P?BEj#g>5&w?+&DORBuBiD{< zj;%MhuZ{OUF-_zDSlDOplwVW|%N$Nxv_r_`Y>wW1u>0$`-PmR2`Z)#%m*_4pAw{QM zQBx6`K-k=%*%;G|A7?rq(KL}11)6|~6LOl8nmuxk7z3%ElIl@g^#zPkr0gKBAScsu zfa_qSAZrEAA~xZiQj}d>RpDfeH4#5pg#H9VmsIz$gEdkCw>62=d(&UP{~32ru<1#w zhMY4^k{7W61W~ZgFb&Zj*Ovg3joiX(^Az_3G4Jky3 zH73=l3Dna-yW0z5HpDEXe6A}jqzi7H5n^l3xvi6^NvLGJ$@EH#_l{^R*|d3uI3=qi z*$%!Cs$NCW@pQ_}+{%EPJxm3*BKJPEKEBaA4NXiuU+Z1CMJ6Z22nONEzT!)7y`g{Y zLeKK#Q+rGv-JzL8GzL=6G%+y=k+m_5>csXmvNmei9%m+XVso$I#8$)JG!SE^j;T#z zv~8M%=ha`WZ3R(G88L!aMHRY*<=~uSz8fhDWv;AQ=u8+CO1BUe%5_SsI2FVgqFQXB zRFyE_v;6QagKPit5p(bAZvA#KX4a*?7zt)*LSnA#{_vWm>K!2pPo54~0(*7j>~78J zordEZQ%-D5*_}kzb{lpli8>}?N;Hx0>%bZV-U?0)It%%3Rz5%Hmy^0Bxs(k}jMSky zzgiC*pQX%V&R@f;&?}XNuBBI54h}t6EfnnUJC=K%ju!%k5QQU4)!W8(xMy`Iy!R#Q z0bE^{?sNMV$~RfB1Pl+J+T)?8cX{OGnA2NRw#Tg>mrkj?(l3RB3l3-7bT;J-*|4!! zGp-|*Z&#iRb;ykBK;@N%o+p!Mpc(3z7)=u= zwi?D~r~K99TVSAHT2|&fHyr42^WiQ>7Ave*_RUxC*{$=}r=$8G0pELJ7qI%NL9cj| z7h!X^=8N~A<*QF@F`Z_rLRsv24$PGlzFkdc4c-d={AAjmLCR2vh{>5jWvL3GQ!2f} z()EUpR|+RsX{*ICW$Gp~Y9f1eVsDz*n*=7)gwWo5Y0e>loo%3wsojfMhfEU^O~_1| z#O@?;d~L#`C-(T#gR9(i%^Y`KJBL?c&@JxR9H&nKKl*|IjGBCSw+@7C`O}Bi_~w(l zEcQKzhnC7Kg%?U^D4bF{p|G=KE3Ih*O>C`TG;VYDK}YFVmidljzGGSFDZ`FqP$`vb zv%flIb|;aIabROFu)Y`A*fng~z%(R=UCW`NM~%VCx#ld?F)?lub(0x~#H5MzN@3V> zEf0+w{_NpRwkLtN-@M3f9T#X_HE|!b0ECFO*K9bStIfm5vuG zCv*y-v@H;o7rbjps0kS(hTTbIXB_C3mSLqV_1cv6z+A!7oMpbRbh?U&VKNGA?Pk`t z1E)5pSTlu`Nn|#68din{N0&RKl(Ax35^ge+CNgdk<0dk$6Qf2Mxrnn75eP|1eTQ1% zk&`1%Zq}1&NFRH#iqKzd?ls3YC*hOxUHjpq`#Oy3h_gcJgh6GQE0w|-N@rVO%9)9K z#an5+KvpP9$J1v=kP?-1^eW3j&$Bq^SU%Kc-;t~6FDxM{?5(d-eD^7gjHp9qZyMN{ z2<$@F3vaw`fkTTWIm9-Whj!&h)5z{P;-`_qM#?7P)Q~bvL#8S$i+xYZhKEm%e}|NR zsawipFS0=bteVF{&L26wHT^eU%}-g8_iRtXt<#uo6WiUOi~WK*@0cHW=6a4n>F8FD zqH4?I0mJpTl$_X{^0mKxhO3t<3?K%|xr+H4Z)0%eR;u1o+fUrLPVo1$wfEQPMvWSS zieY_ykK2zO7WefEO+uZqED9-fBu$#IOIj4@u7u(h# zUvOxlV&7ti;e5%yC1u~f9=!uYe)7Y2v9a?N);4w-RF=KT6ncyFuD+98?ITokEun>q z&ea8c`w8~OXW6SGYa3&(y=IA@_~0FM`^q>Ar_b(kc6G|;#*{M~BTjBiSl^zqx!15c z3MVE_{9cIZ?~IYJnH0WktsWOW7dl^f8_kPumKI|$0y&xEz^7BrpN=uHF$w)=*2Xu7 zm<~DR4Ju|?#4HrvUeoW`qk~>ytIAhP%X4;TClYr8gWW(`T27r>b}2(CwhI|O%kcjq9u2G`&cAOyDr*Wm6Jf*gK0|9w^e zR?T$PPSwtK_tWo8b+n3-92N#C1^@t9@?dE-xE23zprOF$N*kATxIuRY>$(8|XyU(t z07a>$1ON<08!0Ij6>BGVCpT*+XKHyVDQag|CrcZ93jpw5&QND&^09v|gv>}jg5hxij2?ybc_eVf5vM2%O?|;r zs@1Zl0AJ|I$-}}!$3f1)W$_YKq>&(`}j-J0+m?6@s+&jD`2rAWt9k6EF!N!1L6>XOlCQHMDcdOSTjV8 z4YB7JP*5#S`wqFM79m*oC$}78aOW$)GhQbVN8A_)Ξ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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_88@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_88@2x.png deleted file mode 100755 index f61d6e77114440344079393ddc6a7444545d678f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8575 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 Ef}OOX@c;k- diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_90@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_90@2x.png deleted file mode 100755 index 5599f6beafa9870ff5f51aeab0bf095881e9222b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6796 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 TAhz%t00000NkvXXu0mjf&OI0F diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_94@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_94@2x.png deleted file mode 100755 index bc30b6208125b25f7fc2eae42840bbdc25f7c4eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6609 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_95@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_95@2x.png deleted file mode 100755 index 69863a0607abea22254ea28f477aeee1a458f443..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8953 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 T7srxE00000NkvXXu0mjfTU#-H diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_96@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_96@2x.png deleted file mode 100755 index 0b6f17510cc5a3141be5a40bcca3c951d15c8152..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7838 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_97@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_97@2x.png deleted file mode 100755 index 01fa593772f9c5daf0a404262e5e1ebcd4c55e24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9292 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_99@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_99@2x.png deleted file mode 100755 index e0092487f1303c40e5b1fc3f042361fa45dee299..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6270 zcmV-^7=h=BP)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z4Xa5+K~#9!?3>$<9LIIWe|71ep6Qvrlia0fQj|nVltjg(EyuAUDWK&bjsyb+1VeCu z2nccmOyngGdeR>dm$d+T9Hf$h+p`69cU4!{`RbhSoI2GjLI`}856Nfz*aBb+fGq&F0N4Ux3xF*E zKD&q5;972CV0=-+S^xx4DoOz2qHLxkD~bSGMG3m7)Ib#&y7!*D4i9hJcAL$zO$C6C z<7{Sndi=!6Gd}@l0SA~i05MSh^FMw1um17H=f49@ux4}3zm9-}zxcE7JpaN!egAKO z24LDIFaSJw{Mh&Z^UII^R{!Mb-yoIVT*mJ#qx<&r+Rxuw_?^d|{s!is#VI_n>2tn|H5F8}QmzyJmNekg zAh?tg=N!fuvMj?|o7=vWNGW@?bV+qRJpMARrT~8J72ZSwI<+k-fzGG zu2-#nm#T-hJ-3Vhe*v`zfNwnURqlIWKaJ(39@cNOZTnt_=|dMwudVZISe#YTY_}nR z4}M)Aq02kup2A~|#aM&)0a0i}Z@XSkvpU9AZ>i&i3-4d#l^^|VV*sA{_G3KywXeYP zbPvJwI`hyKT6K}IDDG(m)~zRJaUK7^)~O3oxYGdMb!kS?zYy2&SllEOOty3Ur^l}k zz|`aK#zwDj@xp~0kf0C*DG5^2S1a?w zAHP9bNx1Lc-5mSnn^e<;u^j_s#v+BF(K0ya862pxveLv_$F-S7Mn?y!lw<1k3?V>D z!Qx_ryZ7y6VWH0SwME9phPZwAcACvr?%RVe00@OPsgE-t?)14h~gpj*8=N(D8 zf|QChP8k>+#(R&Ff=XI&dk72<4by1ZP7H3HCzXN_;K{E)f-#0>v&nt;>|$xTNq>J0 z=NuqNDt#DZSZ)Qp50sPSx&p*n(lib&KAcg6;0eKO7$2_iYZ{yN!nrj`rr{mE><Cc{AHQ~)9m5swzhmI~`F#}^v4dQb3CdWSIl;uamw~}`W*|3!3xY@L5>iE- zGP|UB@jou2qZp|o&QEzVpAg5r?b=1i2&rP~S;Q}Xy+qR{NEP>#%xPwp6<;{82Pxyu zGu;I=lXH?g_iSHR*Ij027dzriT$$$0U%$iE>Di*bM6hm^WUp%i-s8Q+drNRxPs6uP zOi+#-^`@nqXtJzH@GVvvhO`{9R5#QrQO`5Z2hNW#@U6#pasS?wGnbcm{hh0P@&0WL z_LcbMn^(B!b7hh^@QXL67_3DIA&4WzKrJRSj_)2l!;_EfrV?LIy#pssoZz|Vp5w@o zBOE(+jERW}-gx5;jvP6{GtWGO_ofJn{AzHvF#rZ{n>gF*guJUS671Sh1r?{`uvT2%u7qIQ9NKPdvJtfm(?qRv7Df>E%=G-#dtqg8AhZKYw$Ixuq6Mb;FL~ zGN&&r@W{bY{^bX!Sgso~z^@+7am z`YK0{9%b*|y^M^E6nxX0Z@94rbp4#`1)x%iICpuGp}rEY{OS^=Sn=?|F`Aj@dp|tM zV_z7f-gJx(D*%3U{4$G6hW={Ih0BhYk6qxdJp&y6(oX*CwQ(fyy9dX3_v|d^#uxdc zKitQ^zH*jk%aSCT#g&YA&dzc7o&kpXOB)Igpta`NXP@P%r=H@_p+h|V^wUgDO>ybc zB_4nL@pW?DPy^a-FnCAb&>-ihq1o{4-z}M%m6S?@1nD_67IX5#JR>99Iel?~uYTn| zc5X}AHCADK7Jm9a(+u|Y^Vfg8JD(*|UO#n$zx?)IE>9YkvI>X4yod2?@cCqr-#)0Q zrjkE-YJ|QNgoNLmTVc6wxMNozJ4bH3Q#U#~%IIiLum=tt;J|?cy>3*e1n*Wu>>DqK z15sRMe)500I{r5Q{q7=1)lSM{hTs39Vq(T}=#F9b)#}8NWXB%QKsClV&*EjpsWWpd zT$<-=kKfM1gaSNn-tl|)TKcnDe)irn-+Cy4`S;nS1!_p3q$IPBIF&dba5nJpZb78; z>uVRyx|tJ*BJ&iGlAd)-AdfzS4tH?X3Q!6otS7=L1?Rw31ls@>QZJk|k2&tjpcC zb(E3{<;vhK1VY8ndq!iP`Z+R+Zh)X5B%heeIT0<+#!(MAu5lseM5FjIz($xAAyz|s*WsI?u5=9hA zjLUa@WJw~VKx;{}m60SByt4#6K9Hx!Z>9ksWet|wv8PzumkVuFkfNE{vScfPWUaNej zrIdMg*k+v^rB(`4m_^$&Xsz<|;MbYKhKr#OuLt3l>ZB5^tQcnI>OerLJew;5=qPu6 z!RNqKDG{JZUvSggg$3;|N4dDV9{LDaKfw52R_z@=AkR8j+}| zTQ;#4fB-nHwalZcPdXbP5Cr;a$?7I+F{U&X#a=-`M+sGtCp46Fq!on}j)DG4L5vn3 z9BCycMdkepNMcnam<36q5ac8%C1|Z>@qJL}2EYJILLiekq7+A;{EkEjh<1n{x>Dr9 zw={(BnT5s1 z`0V`3Pk?udZ-f@w03^T|a3^pZFjU;zOh=Ra`@nJFEN}&AwmHBSl?qrU|7bF1QyBqS zA=|Y=R@?0kWFdSBC>I|QsZFKOCVltV?Zpq7?W99zeV-B_{xQM$9c-}k-qKF@nSGhanQ ze9Q_vk{tj5E5xyaBzz6SKZ-2@|I^Le_v6cIOen>Y(M&8~u7?4h63u`?u|}Q+C&6-M zL2fS`0RYQ)H_)v`+9gYToh$y2@u291mm;q-YS}rtu?mPq{N-nf9 zL_(M7_^=9z-KK|=x5cL@wy70tB@`72Mi@Cbfd5> zskzYKNl7IMARpDkUP3d3|98ZAFRpPC;;MfF)U2Aj>ca4?yHxJRI&K#R$Zfm(z2B7*=n zDD;R9Lr^VfVU%Z}c^DVMGyS^+jqW9_*6^ZDc*AH$xsJx5(k&$|I!Yw}@2b(f^fq8g z@IU$fC$S-=KnK&3U;~<`SKx!o^tOc3ark;zj-mP#6wO)eVuA|AP=gB9f&63^7$A`= z5Us`V#&d*3!Vzl?m|UxX#R4vbb5IdP$zkzDp}{O6j};OW%3uhC!`PuA0){{+;_>Lh zFj4R#R)8w0H8=ctE}aW| zNh}RdhGrSz7#Hgcqx5Yi|bvF3!CJ7=oA20JBkIo6ywNPjXLiATyl4v zzPXLE|4NsAW`E}DOe(FDe>dp>Oxlytal5kPNTUz2L#gsObnLY6dXe+i@zN{dQ5WaP<1X#X zBLRC`b&ULJG)W4`coe~gc5nL1+LP_;P7QcXgJmtowv=Bz9qh2VNItLXe1*x|NMwaZ zzq4eEjo54P02&Fv^qG<06@qg)MgSAVg5W6>RK z;^))Z@iv>H9Z{{b${*?(UnnFxay-YD7if26vD+P(9qnR|`U&3I66b`qyzzK?nFC-j zdo92IMSqBB|5eXgV5*34Igi=0-V}A@&Q|yE>nDEdx=B#O#2Lb?>K(V#Vk<-5MM^Pr z?m_G51$F8<`xA`teNe*Jx116#%6NF44~9=|6` zJeU^n)klW78*zQ}F=q*%|7bVjGr1?V*alox?lUJ_Lw$<4RQF9v>t!omd*GKA6;P%k zZ<=wH-e2~t&2#2-?l-cwu+(wSU%af|*?G5X*GSm!YySM`DZkjE*X8ojW06j0>~qfK zZl$a}6umE}*yd^-Wd4%nc4ke^AbIcOkB_rIj;k^=ZDfag3YUpBhX*PL)FvuWKKbD2 zF}9ba>h-Uz?Y0w#RO^~`y%YL-KczG`w!3-Gf}cq;UL`?qeIn~_O79FXG__8A`{{`5 zB^iC;___Fp6Ra&aq+0KZxwURvTBL7w5uLY)$n)z<9c$D1wb|7*MSRz4|Kv}ae5w5o zg9{(J9rWM)`J_jAa^POB_J@Je#uIP(Iy4A2VHZJcW6ROZB>*IL&ORkp>(&%2h?n9erEY96eTyO4wj zhI2OLrPUH$evmMe$#a)85AcE?O+9LObJj1r8nF#;HKtvjuM!%bd_QSn7W_Zx**NexoULPa8LWv9*b*v?W9GX<>db~htKsia`D>7?6TVUdT~ zR^|EH^s4>6*v*@}(mE4cY&Ne9s{E}Gn)841O455_F(2F-*12BtP8_PcM)c?{7#_T` zM?F{XH(!x=baQ#L!L7G_8fS8+PLox{#*nkldDT$h@RYI}}5jPu?g#>U~Ys&~& z3W9!rK!T`ra3ZYIWUREo zLIS~wtXC*8r8HikMiIKo?nAdCMjTBb2xnW3Ds?K10m-mVZxE3lojgqf^coRqAy>+j z8l&M9{hUk_EYFlF)S0PjzJ@eA0uWjSH~|7lq3=;6x1xpo? z-icC56M$&c1Or@p7){M&u>cUHvp8H3WKjV&lf`B*@f)PEI07yxVDo_Y7YUDM(r5*V zP|W*S_(?=c!7!tM!LV2?bW0c=HR%{EKA&&rV6$ns2hE&ez*JV6!5lQo0KsOpNpHmT zr~$Aus*=$(Ohm$!zDofyexNm&-is0K zS&?Cc8HunNO*5(S#%Y7>p^SoP6Rg5elLAFoj8-ur1;tQv3TgzR=PKrsk%!+0!~m=n(DaUm8Yj){z9io;_#qgV)4 zry;Nb8^vlqVtJp%+J^x#;*lZPq)&%6F(woN-X<;3e?kis1%~lBFnc+2nr$8dAyIC5lbz3aQ@FrH z@x2qaE)Bc#+QY%&Lp=kU;5f@k-R(BfZJB$z#p3$f?_$cOXOALFoh^j?dR9_E0(Hdk ziuvsPQ(68#PIs3rbz9(6Iwv$h?c_tS&Ez?keYei9-1%?j9~Og8MdC zvaTag>AIxf>gdzb%=KB!oko*uOHs)=w;G{Kc)NXkdIt2cvK6!KQTQiSm{i zTV7qh>(%X5BCB5BbiGIDUob7}LVJ7S!p<3G4U}GjSh#Th(-5Oe2wU|1_5hk+fv@#K zQ2m(RSTlM`5@}p}?;>%wY zRw~NmO~>lzmsM95zv}yoe~A%F5O}q|LUMX{?W{aDd{khQ6Zw+6t`r@!WtF%0&^cp+ zb>}|a-Jk=rZhlKl>Cg`P4|Q&ce*iZgzG0;#=OFP{pX8EH?DFEC*Jfy)kell^pqabxl|n|d4!-vS7M;cn8qoEtSNh2Os zhaW?3&*B$nQ{3tDJ><4St{h+Fl3R{ z=dvHdLf9jL*S8*Q?CRN0a7}UBdHlfPEmiBK!DEF!4<={c=-=x*vg6{NRdu}LeP>Qy zYSPwK)CtQVTg^9t-o_U-;GHSW&ueyHrFv(i{oO*S&0?n>&E5gjZa8NPuW02#ZKTVy n9kU&;3D@L8$%{Q-GwKPa9s2LN)Nh_@|FcQNGH8EP(wct(jF#72 diff --git a/YuMi/CustomUI/InputView/InputView/QEEmotionImageView.h b/YuMi/CustomUI/InputView/InputView/QEEmotionImageView.h deleted file mode 100644 index df7520f..0000000 --- a/YuMi/CustomUI/InputView/InputView/QEEmotionImageView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// QEEmotionImageView.h -// YUMI -// -// Created by YUMI on 2022/8/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface QEEmotionImageView : UIImageView -@property (nonatomic, strong) NSString *displayText; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/InputView/InputView/QEEmotionImageView.m b/YuMi/CustomUI/InputView/InputView/QEEmotionImageView.m deleted file mode 100644 index 05537a3..0000000 --- a/YuMi/CustomUI/InputView/InputView/QEEmotionImageView.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// QEEmotionImageView.m -// YUMI -// -// Created by YUMI on 2022/8/17. -// - -#import "QEEmotionImageView.h" - -@implementation QEEmotionImageView - -/* -// Only override drawRect: if you perform custom drawing. -// An empty implementation adversely affects performance during animation. -- (void)drawRect:(CGRect)rect { - // Drawing code -} -*/ - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QEmotion.h b/YuMi/CustomUI/InputView/InputView/QEmotion.h deleted file mode 100644 index 2aa0a34..0000000 --- a/YuMi/CustomUI/InputView/InputView/QEmotion.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// QEmotion.h -// QKeyboardEmotionView -// -// Created by DongJin on 2022/3/26. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -/** - * 代表一个表情的数据对象 - */ -@interface QEmotion : NSObject - -/// 当前表情的标识符，可用于区分不同表情 -@property(nonatomic, copy) NSString *identifier; - -/// 当前表情展示出来的名字，可用于输入框里的占位文字，请务必使用统一的左右标识符将表情名称包裹起来（例如常见的“[]”），否则在 `QMUIEmotionInputManager` 里会因为找不到标识符而无法准确识别出一串文本里的哪些字符是代表一个表情。合法的 displayName 例子：“[委屈]” -@property(nonatomic, copy) NSString *displayName; - -/// 表情对应的图片。若表情图片存放于项目内，则建议用当前表情的`identifier`作为图片名 -@property(nonatomic, strong) UIImage *image; - -/** - * 快速生成一个`QMUIEmotion`对象，并且以`identifier`为图片名在当前项目里查找，作为表情的图片 - * @param identifier 表情的标识符，也会被当成图片的名字 - * @param displayName 表情展示出来的名字 - */ -+ (instancetype)emotionWithIdentifier:(NSString *)identifier displayName:(NSString *)displayName; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/InputView/InputView/QEmotion.m b/YuMi/CustomUI/InputView/InputView/QEmotion.m deleted file mode 100644 index b409ede..0000000 --- a/YuMi/CustomUI/InputView/InputView/QEmotion.m +++ /dev/null @@ -1,30 +0,0 @@ -// -// QEmotion.m -// QKeyboardEmotionView -// -// Created by DongJin on 2022/3/26. -// - -#import "QEmotion.h" - -@implementation QEmotion - -+ (instancetype)emotionWithIdentifier:(NSString *)identifier displayName:(NSString *)displayName { - QEmotion *emotion = [[self alloc] init]; - emotion.identifier = identifier; - emotion.displayName = displayName; - return emotion; -} - -- (BOOL)isEqual:(id)object { - if (!object) return NO; - if (self == object) return YES; - if (![object isKindOfClass:[self class]]) return NO; - return [self.identifier isEqualToString:((QEmotion *)object).identifier]; -} - -- (NSString *)description { - return [NSString stringWithFormat:@"%@, identifier: %@, displayName: %@", [super description], self.identifier, self.displayName]; -} - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QEmotionAttachment.h b/YuMi/CustomUI/InputView/InputView/QEmotionAttachment.h deleted file mode 100644 index 64ccd42..0000000 --- a/YuMi/CustomUI/InputView/InputView/QEmotionAttachment.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// QEmotionAttachment.h -// QKeyboardEmotionView -// -// Created by DongJin on 2022/3/25. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -//为了获取输入框里的纯文本，只能自己新建一个类 -@interface QEmotionAttachment : NSTextAttachment - -@property (nonatomic, strong) NSString *displayText; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/InputView/InputView/QEmotionAttachment.m b/YuMi/CustomUI/InputView/InputView/QEmotionAttachment.m deleted file mode 100644 index 657cbdd..0000000 --- a/YuMi/CustomUI/InputView/InputView/QEmotionAttachment.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// QEmotionAttachment.m -// QKeyboardEmotionView -// -// Created by DongJin on 2022/3/25. -// - -#import "QEmotionAttachment.h" - -@implementation QEmotionAttachment - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QEmotionBoardView.h b/YuMi/CustomUI/InputView/InputView/QEmotionBoardView.h deleted file mode 100644 index 5017c96..0000000 --- a/YuMi/CustomUI/InputView/InputView/QEmotionBoardView.h +++ /dev/null @@ -1,122 +0,0 @@ -// -// QMUIEmotionView.h -// qmui -// -// Created by QMUI Team on 16/9/6. -// 本库修改了修复QMUI的两个BUG，1：计算半透明表情的计算方式有问题，2：重新优化点击后的灰色背景的大小改为计算，而不是设置死 -// - -#import -#import "QEmotion.h" - -@class QEmotionBoardView; - -@protocol QEmotionBoardViewDelegate - -@optional -/** - * 选中表情时的回调 - * @param index 被选中的表情在`emotions`里的索引 - * @param emotion 被选中的表情对应的`QMUIEmotion`对象 - */ -- (void)emotionView:(QEmotionBoardView *)emotionView didSelectEmotion:(QEmotion *)emotion atIndex:(NSInteger)index; - -// 删除按钮的点击事件回调 -- (void)emotionViewDidSelectDeleteButton:(QEmotionBoardView *)emotionView; - -// 发送按钮的点击事件回调 -- (void)emotionViewDidSelectSendButton:(QEmotionBoardView *)emotionView; - -@end - -/** - * 表情控件，支持任意表情的展示，每个表情以相同的大小显示。 - * - * 使用方式： - * - * - 通过`initWithFrame:`初始化，如果面板高度不变，建议在init时就设置好，若最终布局以父类的`layoutSubviews`为准，则也可通过`init`方法初始化，再在`layoutSubviews`里计算布局 - * - 通过调整`paddingInPage`、`emotionSize`等变量来自定义UI - * - 通过`emotions`设置要展示的表情 - * - 通过`didSelectEmotionBlock`设置选中表情时的回调，通过`didSelectDeleteButtonBlock`来响应面板内的删除按钮 - * - 为`sendButton`添加`addTarget:action:forState:`事件，从而触发发送逻辑 - * - * 本控件支持通过`UIAppearance`设置全局的默认样式。若要修改控件内的`UIPageControl`的样式，可通过`[UIPageControl appearanceWhenContainedInInstancesOfClasses:@[[QMUIEmotionView class]]]`的方式来修改。 - */ -@interface QEmotionBoardView : UIView - -/// 要展示的所有表情 -@property(nonatomic, copy) NSArray *emotions; - -/** - * 选中表情时的回调 - * @argv index 被选中的表情在`emotions`里的索引 - * @argv emotion 被选中的表情对应的`QMUIEmotion`对象 - * @see QMUIEmotion - */ -//@property(nonatomic, copy) void (^didSelectEmotionBlock)(NSInteger index, QMUIEmotion *emotion); -// -///// 删除按钮的点击事件回调 -//@property(nonatomic, copy) void (^didSelectDeleteButtonBlock)(void); - - -@property(nonatomic, weak) id delegate; - -/// 用于展示表情面板的竖向滚动的 scrollView，布局撑满整个控件 -@property(nonatomic, strong, readonly) UIScrollView *scrollView; - -/// 表情与表情之间的垂直间距，默认为10，仅在 verticalAlignment 为 YES 时生效，当 verticalAlignment 为 N0 时，表情的垂直间距由 numberOfRowsPerPage 决定 -@property(nonatomic, assign) CGFloat emotionVerticalSpacing UI_APPEARANCE_SELECTOR; - -/// 控件右下角的发送按钮 -@property(nonatomic, strong, readonly) UIButton *sendButton; - -/// 控件右下角的删除按钮 -@property(nonatomic, strong, readonly) UIButton *deleteButton; - -/// 每一页表情的上下左右padding，默认为{18, 18, 65, 18} -@property(nonatomic, assign) UIEdgeInsets paddingInPage UI_APPEARANCE_SELECTOR; - -/// 每一页表情允许的最大行数，默认为4 -@property(nonatomic, assign) NSInteger numberOfRowsPerPage UI_APPEARANCE_SELECTOR; - -/// 表情的图片大小，不管`QMUIEmotion.image.size`多大，都会被缩放到`emotionSize`里显示，默认为{30, 30} -@property(nonatomic, assign) CGSize emotionSize UI_APPEARANCE_SELECTOR; - -/// 表情点击时的背景遮罩相对于`emotionSize`往外拓展的区域，负值表示遮罩比表情还大，正值表示遮罩比表情还小，默认为{-3, -3, -3, -3} -@property(nonatomic, assign) UIEdgeInsets emotionSelectedBackgroundExtension UI_APPEARANCE_SELECTOR; - -/// 表情与表情之间的最小水平间距，默认为10 -@property(nonatomic, assign) CGFloat minimumEmotionHorizontalSpacing UI_APPEARANCE_SELECTOR; - -/// 表情面板右下角的删除按钮的图片，默认为`[QMUIHelper imageWithName:@"QMUI_emotion_delete"]` -@property(nonatomic, strong) UIImage *deleteButtonImage UI_APPEARANCE_SELECTOR; - -/// 删除按钮的背景色，默认为 nil -@property(nonatomic, strong) UIColor *deleteButtonBackgroundColor UI_APPEARANCE_SELECTOR; - -/// 删除按钮位置的 (x,y) 的偏移，默认为 CGPointZero -@property(nonatomic, assign) CGPoint deleteButtonOffset UI_APPEARANCE_SELECTOR; - -/// 删除按钮的圆角大小，默认为4 -@property(nonatomic, assign) CGFloat deleteButtonCornerRadius UI_APPEARANCE_SELECTOR; - -/// 发送按钮的文字样式，默认为{NSFontAttributeName: UIFontMake(15), NSForegroundColorAttributeName: UIColorWhite} -@property(nonatomic, strong) NSDictionary *sendButtonTitleAttributes UI_APPEARANCE_SELECTOR; - -/// 发送按钮的背景色，默认为`UIColorBlue` -@property(nonatomic, strong) UIColor *sendButtonBackgroundColor UI_APPEARANCE_SELECTOR; - -/// 发送按钮的圆角大小，默认为4 -@property(nonatomic, assign) CGFloat sendButtonCornerRadius UI_APPEARANCE_SELECTOR; - -/// 发送按钮布局时的外边距，相对于控件右下角。仅right/bottom有效，默认为{0, 0, 16, 16} -@property(nonatomic, assign) UIEdgeInsets sendButtonMargins UI_APPEARANCE_SELECTOR; - -/// 分页控件距离底部的间距，默认为22 -@property(nonatomic, assign) CGFloat pageControlMarginBottom UI_APPEARANCE_SELECTOR; - -/// 顶部那条细线 -@property(nonatomic, strong) UIView *topLineView; - - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QEmotionBoardView.m b/YuMi/CustomUI/InputView/InputView/QEmotionBoardView.m deleted file mode 100644 index 3754bef..0000000 --- a/YuMi/CustomUI/InputView/InputView/QEmotionBoardView.m +++ /dev/null @@ -1,575 +0,0 @@ -// -// QEmotionView.m -// qmui -// -// Created by QMUI Team on 16/9/6. -// 作者DQ：这里的代码我是从QMUI里摘抄出来再做了删减。然后我修改了修复QMUI的两个BUG，1：半透明表情的Rect计算方式有问题，2：重新优化点击后的灰色背景的大小改为计算，而不是设置死，3：添加了顶部的一条细线 -// - -#import "QEmotionBoardView.h" - - -@class UIEmotionPageView; - -@protocol UIEmotionPageViewDelegate - -@optional -- (void)emotionPageView:(UIEmotionPageView *)emotionPageView didSelectEmotion:(QEmotion *)emotion atIndex:(NSInteger)index; -- (void)emotionPageViewDidLayoutEmotions:(UIEmotionPageView *)emotionPageView; -@end - -/// 表情面板每一页的cell，在drawRect里将所有表情绘制上去，同时自带一个末尾的删除按钮 -@interface UIEmotionPageView : UIView - -@property(nonatomic, weak) QEmotionBoardView *delegate; - -/// 表情被点击时盖在表情上方用于表示选中的遮罩 -@property(nonatomic, strong) UIView *emotionSelectedBackgroundView; - -/// 表情面板右下角的删除按钮 -@property(nonatomic, weak) UIButton *deleteButton; - -/// 删除按钮位置的 (x,y) 的偏移 -@property(nonatomic, assign) CGPoint deleteButtonOffset; - -/// 所有表情的 Layer -@property(nonatomic, strong) NSMutableArray *emotionLayers; - -/// 分配给当前pageView的所有表情 -@property(nonatomic, copy) NSArray *emotions; - -/// 记录当前pageView里所有表情的可点击区域的rect，在drawRect:里更新，在tap事件里使用 -@property(nonatomic, strong) NSMutableArray *emotionHittingRects; - -/// 负责实现表情的点击 -@property(nonatomic, strong) UITapGestureRecognizer *tapGestureRecognizer; - -/// 整个pageView内部的padding -@property(nonatomic, assign) UIEdgeInsets padding; - -/// 每个pageView能展示表情的行数 -@property(nonatomic, assign) NSInteger numberOfRows; - -/// 每个表情的绘制区域大小，表情图片最终会以UIViewContentModeScaleAspectFit的方式撑满这个大小。表情计算布局时也是基于这个大小来算的。 -@property(nonatomic, assign) CGSize emotionSize; - -/// 点击表情时出现的遮罩要在表情所在的矩形位置拓展多少空间，负值表示遮罩比emotionSize更大，正值表示遮罩比emotionSize更小。最终判断表情点击区域时也是以拓展后的区域来判定的 -@property(nonatomic, assign) UIEdgeInsets emotionSelectedBackgroundExtension; - -/// 表情与表情之间的水平间距的最小值，实际值可能比这个要大一点（pageView会把剩余空间分配到表情的水平间距里） -@property(nonatomic, assign) CGFloat minimumEmotionHorizontalSpacing; - -/// debug模式会把表情的绘制矩形显示出来 -@property(nonatomic, assign) BOOL debug; - -@property(nonatomic, assign, readonly) BOOL needsLayoutEmotions; - -@property(nonatomic, assign) CGRect previousLayoutFrame; - -@end - -@implementation UIEmotionPageView - -//发送按钮，删除按钮的宽高 -const int UISendButtonWidth = 52; -const int UISendButtonHeight = 41; - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - self.emotionSelectedBackgroundView = [[UIView alloc] init]; - self.emotionSelectedBackgroundView.userInteractionEnabled = NO; - self.emotionSelectedBackgroundView.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:.16]; - self.emotionSelectedBackgroundView.layer.cornerRadius = 3; - self.emotionSelectedBackgroundView.alpha = 0; - [self addSubview:self.emotionSelectedBackgroundView]; - - self.emotionHittingRects = [[NSMutableArray alloc] init]; - self.tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGestureRecognizer:)]; - [self addGestureRecognizer:self.tapGestureRecognizer]; - } - return self; -} - -- (CGRect)frameForDeleteButton:(__kindof UIView *)deleteButton { - CGRect rect = deleteButton.frame; - CGFloat x = CGRectGetWidth(self.bounds) - self.padding.right - CGRectGetWidth(deleteButton.frame) - (self.emotionSize.width - CGRectGetWidth(deleteButton.frame)) / 2.0 + self.deleteButtonOffset.x; - CGFloat y = CGRectGetHeight(self.bounds) - self.padding.bottom - CGRectGetHeight(deleteButton.frame) - (self.emotionSize.height - CGRectGetHeight(deleteButton.frame)) / 2.0 + self.deleteButtonOffset.y; - rect.origin.x = x; - rect.origin.y = y; - return rect; -} - -- (void)layoutSubviews { - [super layoutSubviews]; - if (self.deleteButton.superview == self) { - // 删除按钮必定布局到最后一个表情的位置，且与表情上下左右居中 - self.deleteButton.frame = [self frameForDeleteButton:self.deleteButton]; - } - BOOL isSizeChanged = !CGSizeEqualToSize(self.previousLayoutFrame.size, self.frame.size); - self.previousLayoutFrame = self.frame; - if (isSizeChanged) { - [self setNeedsLayoutEmotions]; - } - - // 添加调试日志 - NSLog(@"UIEmotionPageView layoutSubviews: frame=%@, needsLayoutEmotions=%d", NSStringFromCGRect(self.frame), self.needsLayoutEmotions); - - [self layoutEmotionsIfNeeded]; -} - -- (void)setNeedsLayoutEmotions { - _needsLayoutEmotions = YES; -} - -- (void)setEmotions:(NSArray *)emotions { - if ([_emotions isEqualToArray:emotions]) return; - - // 添加调试日志 - NSLog(@"UIEmotionPageView setEmotions: 表情数量=%lu", (unsigned long)emotions.count); - if (emotions.count > 0) { - QEmotion *firstEmotion = emotions[0]; - NSLog(@"UIEmotionPageView 第一个表情: %@, 图片: %@", firstEmotion.displayName, firstEmotion.image ? @"存在" : @"不存在"); - } - - _emotions = emotions; - [self setNeedsLayoutEmotions]; - [self setNeedsLayout]; -} - -- (void)layoutEmotionsIfNeeded { - if (!self.needsLayoutEmotions) return; - _needsLayoutEmotions = NO; - [self.emotionHittingRects removeAllObjects]; - - CGSize contentSize = UIEdgeInsetsInsetRect(self.bounds, self.padding).size; - //根据小表情的自身大小+水平最小间距，算出来一行有多少个表情 - NSInteger emotionCountPerRow = (contentSize.width + self.minimumEmotionHorizontalSpacing) / (self.emotionSize.width + self.minimumEmotionHorizontalSpacing); - //最后算出来的 实际表情之间的水平间距 - CGFloat emotionHorizontalSpacing = (contentSize.width - emotionCountPerRow * self.emotionSize.width) / (emotionCountPerRow - 1); - //最后算出来的 实际表情之间的垂直间距 - CGFloat emotionVerticalSpacing = (contentSize.height - self.numberOfRows * self.emotionSize.height) / (self.numberOfRows - 1); - //最后计算出来，点击表情的扩展点击范围 ；dqdebug - self.emotionSelectedBackgroundExtension = UIEdgeInsetsMake(-emotionVerticalSpacing/2, -emotionHorizontalSpacing/2, -emotionVerticalSpacing/2, -emotionHorizontalSpacing/2); - CGPoint emotionOrigin = CGPointZero; - NSInteger emotionCount = self.emotions.count; - if (!self.emotionLayers) { - self.emotionLayers = [NSMutableArray arrayWithCapacity:emotionCount]; - } - for (NSInteger i = 0; i < emotionCount; i++) { - CALayer *emotionlayer = nil; - if (i < self.emotionLayers.count) { - emotionlayer = self.emotionLayers[i]; - } else { - emotionlayer = [CALayer layer]; - emotionlayer.contentsScale = [[UIScreen mainScreen] scale]; - [self.emotionLayers addObject:emotionlayer]; - [self.layer addSublayer:emotionlayer]; - } - - emotionlayer.contents = (__bridge id)(self.emotions[i].image.CGImage);//使用layer效率更高 - - // 添加调试日志 - if (i < 3) { // 只打印前3个表情的调试信息 - NSLog(@"渲染表情 %ld: %@, 图片: %@, CGImage: %@", (long)i, self.emotions[i].displayName, - self.emotions[i].image ? @"存在" : @"不存在", - self.emotions[i].image.CGImage ? @"存在" : @"不存在"); - } - NSInteger row = i / emotionCountPerRow; - emotionOrigin.x = self.padding.left + (self.emotionSize.width + emotionHorizontalSpacing) * (i % emotionCountPerRow); - emotionOrigin.y = self.padding.top + (self.emotionSize.height + emotionVerticalSpacing) * row; - CGRect emotionRect = CGRectMake(emotionOrigin.x, emotionOrigin.y, self.emotionSize.width, self.emotionSize.height); - CGRect emotionHittingRect = UIEdgeInsetsInsetRect(emotionRect, self.emotionSelectedBackgroundExtension); - [self.emotionHittingRects addObject:[NSValue valueWithCGRect:emotionHittingRect]]; - emotionlayer.frame = emotionRect; - emotionlayer.hidden = NO; - } - - if (self.emotionLayers.count > emotionCount) { - for (NSInteger i = self.emotionLayers.count - emotionCount - 1; i < self.emotionLayers.count; i++) { - self.emotionLayers[i].hidden = YES; - } - } - if ([self.delegate respondsToSelector:@selector(emotionPageViewDidLayoutEmotions:)]) { - [self.delegate emotionPageViewDidLayoutEmotions:self]; - } -} - -//监听整个大面板的点击事件，然后找到具体的某个表情 -- (void)handleTapGestureRecognizer:(UITapGestureRecognizer *)gestureRecognizer { - CGPoint location = [gestureRecognizer locationInView:self]; - for (NSInteger i = 0; i < self.emotionHittingRects.count; i ++) { - CGRect rect = [self.emotionHittingRects[i] CGRectValue]; - if (CGRectContainsPoint(rect, location)) { - CALayer *layer = self.emotionLayers[i]; - if (layer.opacity < 0.2) return; - QEmotion *emotion = self.emotions[i]; - self.emotionSelectedBackgroundView.frame = rect; - [UIView animateWithDuration:.08 animations:^{ - self.emotionSelectedBackgroundView.alpha = 1; - } completion:^(BOOL finished) { - [UIView animateWithDuration:.08 animations:^{ - self.emotionSelectedBackgroundView.alpha = 0; - } completion:nil]; - }]; - if ([self.delegate respondsToSelector:@selector(emotionPageView:didSelectEmotion:atIndex:)]) { - [self.delegate emotionPageView:self didSelectEmotion:emotion atIndex:i]; - } - if (self.debug) { -// QMUILog(NSStringFromClass(self.class), @"点击的是当前页里的第 %@ 个表情，%@", @(i), emotion); - } - return; - } - } -} - -- (CGSize)verticalSizeThatFits:(CGSize)size emotionVerticalSpacing:(CGFloat)emotionVerticalSpacing { - CGSize contentSize = UIEdgeInsetsInsetRect(CGRectMake(0, 0, size.width, size.height), self.padding).size; - NSInteger emotionCountPerRow = (contentSize.width + self.minimumEmotionHorizontalSpacing) / (self.emotionSize.width + self.minimumEmotionHorizontalSpacing); - NSInteger row = ceil(self.emotions.count / (emotionCountPerRow * 1.0)); - CGFloat height = (self.emotionSize.height + emotionVerticalSpacing) * row - emotionVerticalSpacing + ( self.padding.top + self.padding.bottom); - return CGSizeMake(size.width, height); -} - -- (void)updateDeleteButton:(UIButton *)deleteButton { - _deleteButton = deleteButton; - [self addSubview:deleteButton]; -} - -- (void)setDeleteButtonOffset:(CGPoint)deleteButtonOffset { - _deleteButtonOffset = deleteButtonOffset; - [self setNeedsLayout]; -} - - -@end - -@interface UIEmotionVerticalScrollView : UIScrollView -@property(nonatomic, strong) UIEmotionPageView *pageView; -@end - -@implementation UIEmotionVerticalScrollView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - _pageView = [[UIEmotionPageView alloc] init]; - self.pageView.deleteButton.hidden = YES; - [self addSubview:self.pageView]; - } - return self; -} - -- (void)setEmotions:(NSArray *)emotions - emotionSize:(CGSize)emotionSize - minimumEmotionHorizontalSpacing:(CGFloat)minimumEmotionHorizontalSpacing - emotionVerticalSpacing:(CGFloat)emotionVerticalSpacing - emotionSelectedBackgroundExtension:(UIEdgeInsets)emotionSelectedBackgroundExtension - paddingInPage:(UIEdgeInsets)paddingInPage { - - // 添加调试日志 - NSLog(@"UIEmotionVerticalScrollView setEmotions: 表情数量=%lu, emotionSize=%@", (unsigned long)emotions.count, NSStringFromCGSize(emotionSize)); - if (emotions.count > 0) { - QEmotion *firstEmotion = emotions[0]; - NSLog(@"第一个表情: %@, 图片: %@", firstEmotion.displayName, firstEmotion.image ? @"存在" : @"不存在"); - } - - UIEmotionPageView *pageView = self.pageView; - pageView.emotions = emotions; - pageView.padding = paddingInPage; - - // 添加调试日志 - NSLog(@"UIEmotionVerticalScrollView bounds: %@", NSStringFromCGRect(self.bounds)); - NSLog(@"UIEmotionVerticalScrollView paddingInPage: %@", NSStringFromUIEdgeInsets(paddingInPage)); - - CGSize contentSize = CGSizeMake(self.bounds.size.width - [self edgeInsetsGetHorizontalValue:paddingInPage], self.bounds.size.height - [self edgeInsetsGetVerticalValue:paddingInPage]); - NSLog(@"UIEmotionVerticalScrollView contentSize: %@", NSStringFromCGSize(contentSize)); - - NSInteger emotionCountPerRow = (contentSize.width + minimumEmotionHorizontalSpacing) / (emotionSize.width + minimumEmotionHorizontalSpacing); - pageView.numberOfRows = ceil(emotions.count / (CGFloat)emotionCountPerRow); - - NSLog(@"UIEmotionVerticalScrollView emotionCountPerRow: %ld, numberOfRows: %ld", (long)emotionCountPerRow, (long)pageView.numberOfRows); - pageView.emotionSize =emotionSize; - pageView.emotionSelectedBackgroundExtension = emotionSelectedBackgroundExtension; - pageView.minimumEmotionHorizontalSpacing = minimumEmotionHorizontalSpacing; - [pageView setNeedsLayout]; - CGSize size = [pageView verticalSizeThatFits:self.bounds.size emotionVerticalSpacing:emotionVerticalSpacing]; - self.pageView.frame = CGRectMake(0, 0, size.width, size.height); - self.contentSize = size; -} - -- (void)adjustEmotionsAlphaWithFloatingRect:(CGRect)floatingRect { - CGSize contentSize = CGSizeMake(self.contentSize.width - [self edgeInsetsGetHorizontalValue:self.pageView.padding], self.contentSize.height - [self edgeInsetsGetVerticalValue:self.pageView.padding]); - NSInteger emotionCountPerRow = (contentSize.width + self.pageView.minimumEmotionHorizontalSpacing) / (self.pageView.emotionSize.width + self.pageView.minimumEmotionHorizontalSpacing); - CGFloat emotionVerticalSpacing = (contentSize.height - self.pageView.numberOfRows * self.pageView.emotionSize.height) / (self.pageView.numberOfRows - 1); - //最后算出来的 实际表情之间的水平间距 - CGFloat emotionHorizontalSpacing = (contentSize.width - emotionCountPerRow * self.pageView.emotionSize.width) / (emotionCountPerRow - 1); - NSInteger columnIndexLeft = ceil((floatingRect.origin.x - self.pageView.padding.left) / (self.pageView.emotionSize.width + emotionHorizontalSpacing)) - 1; - NSInteger columnIndexRight = emotionCountPerRow - 1; - CGFloat rowIndexTop = ((floatingRect.origin.y - self.pageView.padding.top) / (self.pageView.emotionSize.height + emotionVerticalSpacing)) - 1; - for (NSInteger i = 0; i < self.pageView.emotionLayers.count; i++) { - NSInteger row = (i / emotionCountPerRow); - NSInteger column = (i % emotionCountPerRow); - - [CATransaction begin]; - [CATransaction setDisableActions:YES]; - if (column >= columnIndexLeft && column <= columnIndexRight && row > rowIndexTop) { - if (row == ceil(rowIndexTop)) { - CGFloat intersectAreaHeight = floatingRect.origin.y - self.pageView.emotionLayers[i].frame.origin.y; - CGFloat percent = intersectAreaHeight / self.pageView.emotionSize.height; - self.pageView.emotionLayers[i].opacity = percent * percent; - } else { - self.pageView.emotionLayers[i].opacity = 0; - } - } else { - self.pageView.emotionLayers[i].opacity = 1.0f; - } - [CATransaction commit]; - } -} - - -- (CGFloat)edgeInsetsGetVerticalValue:(UIEdgeInsets )insets { - return insets.top + insets.bottom; -} - -- (CGFloat)edgeInsetsGetHorizontalValue:(UIEdgeInsets )insets { - return insets.left + insets.right; -} - - -@end - -@interface QEmotionBoardView () -/// 用于展示表情面板的竖向滚动 scrollView，布局撑满整个控件 -@property(nonatomic, strong, readonly) UIEmotionVerticalScrollView *verticalScrollView; -@property(nonatomic, strong) NSMutableArray *> *pagedEmotions; -@property(nonatomic, assign) BOOL debug; -@end - -@implementation QEmotionBoardView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self didInitializedWithFrame:frame]; - } - return self; -} - -- (instancetype)initWithCoder:(NSCoder *)aDecoder { - if (self = [super initWithCoder:aDecoder]) { - [self didInitializedWithFrame:CGRectZero]; - } - return self; -} - -- (void)didInitializedWithFrame:(CGRect)frame { - self.debug = NO; - - self.pagedEmotions = [[NSMutableArray alloc] init]; - - _verticalScrollView = [[UIEmotionVerticalScrollView alloc] init]; - if (@available(iOS 11, *)) { - self.verticalScrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - _verticalScrollView.delegate = self; - [self addSubview:self.verticalScrollView]; - - _sendButton = [[UIButton alloc] init]; - [self.sendButton setTitle:YMLocalizedString(@"QEmotionBoardView0") forState:UIControlStateNormal]; - [self.sendButton addTarget:self action:@selector(didSelectSendButton:) forControlEvents:UIControlEventTouchUpInside]; -// self.sendButton.contentEdgeInsets = UIEdgeInsetsMake(5, 17, 5, 17); - [self addSubview:self.sendButton]; - - _deleteButton = [[UIButton alloc] init]; - - NSBundle *bundle = [NSBundle bundleForClass:[self class]]; - [_deleteButton setImage:self.deleteButtonImage forState:UIControlStateNormal]; - [_deleteButton setBackgroundImage:[UIImage imageNamed:@"q_white_btn" inBundle:bundle compatibleWithTraitCollection:nil] forState:UIControlStateNormal]; - [_deleteButton addTarget:self action:@selector(didSelectDeleteButton:) forControlEvents:UIControlEventTouchUpInside]; -// _deleteButton.layer.cornerRadius = 6; -// _deleteButton.layer.masksToBounds = YES; - [self addSubview:_deleteButton]; - - - //输入条的上方添加一行细线 - UIView *lineView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.bounds), 1 / [UIScreen mainScreen].scale)]; - if (@available(iOS 11.0, *)) { - NSBundle *bundle = [NSBundle bundleForClass:[UIEmotionPageView class]]; - lineView.backgroundColor = [UIColor colorNamed:@"q_border223" inBundle:bundle compatibleWithTraitCollection:nil]; - } else { - lineView.backgroundColor = [UIColor colorWithRed:223/255.0f green:223/255.0f blue:223/255.0f alpha:1]; - } - [self addSubview:lineView]; - self.topLineView = lineView; -} - -- (void)setEmotions:(NSArray *)emotions { - _emotions = emotions; - - // 添加调试日志 - NSLog(@"QEmotionBoardView 设置表情数组，数量: %lu", (unsigned long)emotions.count); - for (int i = 0; i < MIN(emotions.count, 5); i++) { - QEmotion *emotion = emotions[i]; - NSLog(@"表情 %d: %@, 图片: %@", i, emotion.displayName, emotion.image ? @"存在" : @"不存在"); - } - - [self setNeedsLayout]; -} - -- (void)layoutSubviews { - [super layoutSubviews]; - self.sendButton.frame = CGRectMake(CGRectGetWidth(self.frame) - self.sendButtonMargins.right - UISendButtonWidth, CGRectGetHeight(self.frame) - self.qmui_safeAreaInsets.bottom - self.sendButtonMargins.bottom - UISendButtonHeight, UISendButtonWidth, UISendButtonHeight); - - UIEdgeInsets paddingInPage = self.paddingInPage; - paddingInPage.bottom = self.paddingInPage.bottom + self.qmui_safeAreaInsets.bottom; - - CGRect verticalScrollViewFrame = UIEdgeInsetsInsetRect(self.bounds, UIEdgeInsetsZero); - self.verticalScrollView.frame = verticalScrollViewFrame; - [self.verticalScrollView setEmotions:self.emotions - emotionSize:self.emotionSize - minimumEmotionHorizontalSpacing:self.minimumEmotionHorizontalSpacing - emotionVerticalSpacing:self.emotionVerticalSpacing - emotionSelectedBackgroundExtension:self.emotionSelectedBackgroundExtension - paddingInPage:paddingInPage]; - self.verticalScrollView.pageView.delegate = self; - - static CGFloat spacingBetweenDeleteButtonAndSendButton = 10.0f; - - self.deleteButton.frame = CGRectMake(CGRectGetMinX(self.sendButton.frame) - spacingBetweenDeleteButtonAndSendButton - self.deleteButtonOffset.x - UISendButtonWidth, self.sendButton.frame.origin.y, UISendButtonWidth, UISendButtonHeight); - - self.topLineView.frame = CGRectMake(0, 0, CGRectGetWidth(self.bounds), 1 / [UIScreen mainScreen].scale); -} - - -- (void)adjustEmotionsAlpha { - CGFloat x = MIN(self.deleteButton.frame.origin.x, self.sendButton.frame.origin.x); - CGFloat y = MIN(self.deleteButton.frame.origin.y, self.sendButton.frame.origin.y); - CGFloat width = CGRectGetMaxX(self.sendButton.frame) - CGRectGetMinX(self.deleteButton.frame); - CGFloat height = MAX(CGRectGetMaxY(self.deleteButton.frame), CGRectGetMaxY(self.sendButton.frame)) - MIN(CGRectGetMinY(self.deleteButton.frame), CGRectGetMinY(self.sendButton.frame)); - CGRect buttonGruopRect = CGRectMake(x, y, width, height); - CGRect floatingRect = [self.verticalScrollView convertRect:buttonGruopRect fromView:self]; - [self.verticalScrollView adjustEmotionsAlphaWithFloatingRect:floatingRect]; -} - -- (UIEdgeInsets)qmui_safeAreaInsets { - if (@available(iOS 11.0, *)) { - return self.safeAreaInsets; - } - return UIEdgeInsetsZero; -} - -- (IBAction)didSelectDeleteButton:(UIButton *)sender -{ - if ([_delegate respondsToSelector:@selector(emotionViewDidSelectDeleteButton:)]){ - [_delegate emotionViewDidSelectDeleteButton:self]; - } -} - -- (IBAction)didSelectSendButton:(UIButton *)sender -{ - if ([_delegate respondsToSelector:@selector(emotionViewDidSelectSendButton:)]){ - [_delegate emotionViewDidSelectSendButton:self]; - } -} - -#pragma mark - UIAppearance Setter - -- (void)setSendButtonTitleAttributes:(NSDictionary *)sendButtonTitleAttributes { - _sendButtonTitleAttributes = sendButtonTitleAttributes; - [self.sendButton setAttributedTitle:[[NSAttributedString alloc] initWithString:[self.sendButton currentTitle] attributes:_sendButtonTitleAttributes] forState:UIControlStateNormal]; -} - -- (void)setSendButtonBackgroundColor:(UIColor *)sendButtonBackgroundColor { - _sendButtonBackgroundColor = sendButtonBackgroundColor; - self.sendButton.backgroundColor = _sendButtonBackgroundColor; -} - -- (void)setSendButtonCornerRadius:(CGFloat)sendButtonCornerRadius { - _sendButtonCornerRadius = sendButtonCornerRadius; - self.sendButton.layer.cornerRadius = _sendButtonCornerRadius; - self.sendButton.layer.masksToBounds = YES; -} - -- (void)setDeleteButtonBackgroundColor:(UIColor *)deleteButtonBackgroundColor { - _deleteButtonBackgroundColor = deleteButtonBackgroundColor; - self.deleteButton.backgroundColor = deleteButtonBackgroundColor; -} - -- (void)setDeleteButtonImage:(UIImage *)deleteButtonImage { - _deleteButtonImage = deleteButtonImage; - [self.deleteButton setImage:self.deleteButtonImage forState:UIControlStateNormal]; -} - -- (void)setDeleteButtonCornerRadius:(CGFloat)deleteButtonCornerRadius { - _deleteButtonCornerRadius = deleteButtonCornerRadius; - self.deleteButton.layer.cornerRadius = deleteButtonCornerRadius; - self.deleteButton.layer.masksToBounds = YES; -} - -#pragma mark - - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - if (scrollView == self.verticalScrollView) { - [self adjustEmotionsAlpha]; - } -} - -#pragma mark - -- (void)emotionPageView:(UIEmotionPageView *)emotionPageView didSelectEmotion:(QEmotion *)emotion atIndex:(NSInteger)index { - //再回调给vc，之前QMUI官方demo里这里是用的block，为了兼容swift和代码清晰，我修改成了delegate - if ([self.delegate respondsToSelector:@selector(emotionView:didSelectEmotion:atIndex:)]){ - NSInteger index = [self.emotions indexOfObject:emotion]; - [self.delegate emotionView:self didSelectEmotion:emotion atIndex:index]; - } -} - -- (void)emotionPageViewDidLayoutEmotions:(UIEmotionPageView *)emotionPageView { - [self adjustEmotionsAlpha]; -} - -#pragma mark - Getter - -- (UIScrollView *)scrollView { - return self.verticalScrollView; -} - -@end - -@interface QEmotionBoardView (UIAppearance) - -@end - -@implementation QEmotionBoardView (UIAppearance) - -+ (void)initialize { - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - [self setDefaultAppearance]; - }); -} - -+ (void)setDefaultAppearance { - - NSBundle *bundle = [NSBundle bundleForClass:[QEmotionBoardView class]]; - - QEmotionBoardView *appearance = [QEmotionBoardView appearance]; - appearance.backgroundColor = nil; - appearance.deleteButtonImage = [UIImage imageNamed:@"q_emotion_delete" inBundle:bundle compatibleWithTraitCollection:nil]; - appearance.paddingInPage = UIEdgeInsetsMake(18, 18, 65, 18); //65是滚到底部时候的一大片空白，微信也有 - appearance.emotionSize = CGSizeMake(34, 34); - appearance.minimumEmotionHorizontalSpacing = 16; - appearance.sendButtonTitleAttributes = @{NSFontAttributeName: [UIFont systemFontOfSize:17], NSForegroundColorAttributeName: [UIColor whiteColor]}; - appearance.sendButtonBackgroundColor = [UIColor colorWithRed:32/255.0 green:191/255.0 blue:100/255.0 alpha:1];; - appearance.sendButtonCornerRadius = 4; - appearance.sendButtonMargins = UIEdgeInsetsMake(0, 0, 18, 18);//要和上面的paddingInPage一致 - appearance.pageControlMarginBottom = 22; - appearance.deleteButtonCornerRadius = 4; - appearance.emotionVerticalSpacing = 16; - - UIPageControl *pageControlAppearance = [UIPageControl appearanceWhenContainedInInstancesOfClasses:@[[QEmotionBoardView class]]]; - pageControlAppearance.pageIndicatorTintColor = [UIColor colorWithRed:210/255.0 green:210/255.0 blue:210/255.0 alpha:1]; - pageControlAppearance.currentPageIndicatorTintColor = [UIColor colorWithRed:162/255.0 green:162/255.0 blue:162/255.0 alpha:1]; -} - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QEmotionHelper.h b/YuMi/CustomUI/InputView/InputView/QEmotionHelper.h deleted file mode 100644 index 4ce4adf..0000000 --- a/YuMi/CustomUI/InputView/InputView/QEmotionHelper.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// FaceManager.h -// pinpin -// -// Created by DongJin on 15-7-15. -// Copyright (c) 2015年 ibluecollar. All rights reserved. -// - -#import -#import "QEmotionBoardView.h" -#import - -//表情转换类 -@interface QEmotionHelper : NSObject -{ - -} - -+ (QEmotionHelper *)sharedEmotionHelper; - -//显示表情键盘面板的时候，用这个。测试结果是占用0.5MB的内存（永驻） -@property (strong, nonatomic) NSArray *emotionArray; - -//imageKey：[微笑] font：label的Font，返回😊 -//把 @"[微笑]" 转为 @"😊" -- (NSAttributedString *)obtainAttributedStringByImageKey:(NSString *)imageKey font:(UIFont *)font useCache:(BOOL)useCache; - -//imageKey：[微笑] font：label的Font，返回😊 (带场景参数) -//把 @"[微笑]" 转为 @"😊" -- (NSAttributedString *)obtainAttributedStringByImageKey:(NSString *)imageKey font:(UIFont *)font useCache:(BOOL)useCache forMessageBubble:(BOOL)isMessageBubble; - -//把 @"害~你好啊[微笑]" 转为 @"害~你好啊😊" -- (NSMutableAttributedString *)attributedStringByText:(NSString *)text font:(UIFont *)font; - -//把 @"害~你好啊[微笑]" 转为 @"害~你好啊😊" (带场景参数) -- (NSMutableAttributedString *)attributedStringByText:(NSString *)text font:(UIFont *)font forMessageBubble:(BOOL)isMessageBubble; - -// 清理 emoji 缓存，用于尺寸变更后刷新 -+ (void)clearEmojiCache; - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QEmotionHelper.m b/YuMi/CustomUI/InputView/InputView/QEmotionHelper.m deleted file mode 100644 index d2bf2b3..0000000 --- a/YuMi/CustomUI/InputView/InputView/QEmotionHelper.m +++ /dev/null @@ -1,469 +0,0 @@ -// -// FaceManager.m -// pinpin -// -// Created by DongJin on 15-7-15. -// Copyright (c) 2015年 ibluecollar. All rights reserved. -// - -#import "QEmotionHelper.h" -#import "QEEmotionImageView.h" - - -@interface QEmotionHelper() - -//key是 图片名：比如：[微笑] ； value是😊(Image) -//把[微笑]转为😊的时候，用这个。//占用内存0.2M -@property (strong, nonatomic) NSDictionary *cacheTotalImageDictionary; - -//key是 图片名+font：比如：[微笑]17 ； value是😊(NSAttributedString) -//Tips：ios15用不到这个 -@property (strong, nonatomic) NSMutableDictionary *cacheAttributedDictionary; - -//把[微笑]转为😊的正则 -@property (strong, nonatomic) NSRegularExpression * regularExpression; -///繁体 -@property(nonatomic,copy) NSArray *emojiHantList; -///简体 -@property(nonatomic,copy) NSArray *emojiHansList; -@end - -@implementation QEmotionHelper - -+ (QEmotionHelper *)sharedEmotionHelper { - static QEmotionHelper *_sharedFaceManager = nil; - static dispatch_once_t predUser; - dispatch_once(&predUser, ^{ - _sharedFaceManager = [[QEmotionHelper alloc] init]; - - _sharedFaceManager.regularExpression = - [NSRegularExpression regularExpressionWithPattern:@"\\[[a-zA-Z0-9\\u4e00-\\u9fa5]+\\]" - options:kNilOptions - error:nil]; - - _sharedFaceManager.cacheAttributedDictionary = [NSMutableDictionary dictionary]; - }); - return _sharedFaceManager; -} - -// 清理 emoji 缓存，用于尺寸变更后刷新 -+ (void)clearEmojiCache { - QEmotionHelper *helper = [QEmotionHelper sharedEmotionHelper]; - [helper.cacheAttributedDictionary removeAllObjects]; -} - -#pragma mark - public -//本方法我这里只是demo演示；实际开发中，可以改为你自己的获取表情列表的写法 -//由于emotionArray包含Image，测试结果是占用0.5MB的内存（永驻） -- (void)setEmotionArray:(NSArray *)emotionArray { - - _emotionArray = emotionArray; - - //重置Image字典 - _cacheTotalImageDictionary = nil; - [self cacheTotalImageDictionary]; -} - -//懒加载；key是 图片名：比如：[微笑] ； value是😊(Image) -- (NSDictionary *)cacheTotalImageDictionary { - if (!_cacheTotalImageDictionary) { - NSMutableDictionary *emotionImageDictionary = [[NSMutableDictionary alloc] init]; - for (QEmotion *e in _emotionArray) { - if (!e.image) { - //建议在外部AppDelegate里就设置好image，不建议走这里 - e.image = [UIImage imageNamed:e.identifier]; - } - if (e.image) { - [emotionImageDictionary setObject:e.image forKey:e.displayName]; - } - } - _cacheTotalImageDictionary = emotionImageDictionary; - } - return _cacheTotalImageDictionary; -} - -//把整段String：@"害~你好[微笑]", 转为 @"害~你好😊" -- (NSMutableAttributedString *)attributedStringByText:(NSString *)text font:(UIFont *)font { - return [self attributedStringByText:text font:font forMessageBubble:NO]; -} - -//把整段String：@"害~你好[微笑]", 转为 @"害~你好😊" (带场景参数) -- (NSMutableAttributedString *)attributedStringByText:(NSString *)text font:(UIFont *)font forMessageBubble:(BOOL)isMessageBubble { - if(text.length == 0){ - return [[NSMutableAttributedString alloc] initWithString:@""];; - } - NSArray *emojis = [self.regularExpression matchesInString:text options:NSMatchingWithTransparentBounds range:NSMakeRange(0, [text length])]; - - NSMutableAttributedString *intactAttributeString = [[NSMutableAttributedString alloc] initWithString:text]; - - // 逆序遍历数组 - [emojis enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - - NSTextCheckingResult *result = (NSTextCheckingResult *)obj; - - NSString *emojiKey = [text substringWithRange:result.range]; - - BOOL useCache = NO; - if (@available(iOS 15.0, *)) { - //在ios15上不可以用缓存的NSAttributedString，会只出现1个表情，在ios14以及之前是可以。 - //ios15他采用了NSTextAttachmentViewProvider，具体我没研究 - useCache = NO; - } - NSAttributedString *imageAttributedString = [self obtainAttributedStringByImageKey:emojiKey font:font useCache:useCache forMessageBubble:isMessageBubble]; - if (imageAttributedString) { - [intactAttributeString replaceCharactersInRange:result.range withAttributedString:imageAttributedString]; - } - }]; - - // 修复由于插入AttributeString而导致font改变的问题；防止插入表情后textView的font变小 - [intactAttributeString addAttributes:@{NSFontAttributeName: font} range:NSMakeRange(0, intactAttributeString.length)]; - - return intactAttributeString; -} - -#pragma mark - public -//把只是单纯的一个表情转为AttributedString -//imageKey：[微笑] ，font：label的Font，返回😊 -//把 @@"[微笑]", 转为 @"😊" -- (NSAttributedString *)obtainAttributedStringByImageKey:(NSString *)imageKey font:(UIFont *)font useCache:(BOOL)useCache { - return [self obtainAttributedStringByImageKey:imageKey font:font useCache:useCache forMessageBubble:NO]; -} - -//把只是单纯的一个表情转为AttributedString (带场景参数) -//imageKey：[微笑] ，font：label的Font，返回😊 -//把 @@"[微笑]", 转为 @"😊" -- (NSAttributedString *)obtainAttributedStringByImageKey:(NSString *)imageKey font:(UIFont *)font useCache:(BOOL)useCache forMessageBubble:(BOOL)isMessageBubble { - if([self.emojiHantList containsObject:imageKey]){ - NSString *getImageKey = [self.emojiHansList xpSafeObjectAtIndex:[self.emojiHantList indexOfObject:imageKey]]; - if(getImageKey != nil){ - imageKey = getImageKey; - } - } - if (!useCache) { - //不从缓存中取AttributedString，（因为输入栏中的AttributedString如果是同一个对象，在ios12上会有长按bug） - UIImage *image = self.cacheTotalImageDictionary[imageKey]; - if (!image){ - //说明压根就没匹配上，比如：[随便打的字] - return nil; - } - QEEmotionImageView *imageView = [[QEEmotionImageView alloc] init]; - imageView.layer.masksToBounds = YES; - imageView.contentMode = UIViewContentModeScaleAspectFit; - imageView.displayText = imageKey; - imageView.image = image; - - // 计算 emoji 尺寸：根据场景决定是否放大 - CGFloat emojiSize = isMessageBubble ? font.lineHeight * 2.0 : font.lineHeight; // 消息气泡放大一倍 - if (image) { - CGFloat scale = image.size.width / image.size.height; - imageView.bounds = CGRectMake(0, 0, emojiSize * scale, emojiSize); - } else { - imageView.bounds = CGRectMake(0, 0, emojiSize, emojiSize); - } - - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageView.bounds.size.width, imageView.bounds.size.height) alignToFont:font alignment:YYTextVerticalAlignmentCenter]; - return attrString; - } - - - - //keyFont 是： [微笑]17 、[旺柴]17 - NSString *keyFont = [NSString stringWithFormat:@"%@%.1f", imageKey, font.pointSize]; - //在ios15上不可以用缓存的NSAttributedString，在ios14以及之前是可以 - NSAttributedString *result = _cacheAttributedDictionary[keyFont]; - if (result){ - //从缓存中取 - return result; - } - - UIImage *image = self.cacheTotalImageDictionary[imageKey]; - if (!image){ - //说明压根就没匹配上，比如：[随便打的字] - return nil; - } - QEEmotionImageView *imageView = [[QEEmotionImageView alloc] init]; - imageView.layer.masksToBounds = YES; - imageView.contentMode = UIViewContentModeScaleAspectFit; - imageView.displayText = imageKey; - imageView.image = image; - - // 计算 emoji 尺寸：根据场景决定是否放大 - CGFloat emojiSize = isMessageBubble ? font.lineHeight * 2.0 : font.lineHeight; // 消息气泡放大一倍 - if (image) { - CGFloat scale = image.size.width / image.size.height; - imageView.bounds = CGRectMake(0, 0, emojiSize * scale, emojiSize); - } else { - imageView.bounds = CGRectMake(0, 0, emojiSize, emojiSize); - } - - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageView.bounds.size.width, imageView.bounds.size.height) alignToFont:font alignment:YYTextVerticalAlignmentCenter]; - //[微笑]17 对应的NSAttributedString 缓存到Dictionary中 - [_cacheAttributedDictionary setObject:attrString forKey:keyFont]; - return result; -} -- (NSArray *)emojiHantList{ - if(!_emojiHantList){ - _emojiHantList = @[ - @"[可愛]", - @"[大笑]", - @"[色]", - @"[噓]", - @"[親]", - @"[呆]", - @"[口水]", - @"[汗]", - @"[呲牙]", - @"[鬼臉]", - @"[害羞]", - @"[偷笑]", - @"[調皮]", - @"[可憐]", - @"[敲]", - @"[驚訝]", - @"[流感]", - @"[委屈]", - @"[流淚]", - @"[嚎哭]", - @"[驚恐]", - @"[怒]", - @"[酷]", - @"[不說]", - @"[鄙視]", - @"[阿彌陀佛]", - @"[奸笑]", - @"[睡著]", - @"[口罩]", - @"[努力]", - @"[摳鼻孔]", - @"[疑問]", - @"[怒罵]", - @"[暈]", - @"[嘔吐]", - @"[拜一拜]", - @"[驚喜]", - @"[流汗]", - @"[賣萌]", - @"[默契眨眼]", - @"[燒香拜佛]", - @"[晚安]", - @"[強]", - @"[弱]", - @"[OK]", - @"[拳頭]", - @"[勝利]", - @"[鼓掌]", - @"[握手]", - @"[發怒]", - @"[骷髏]", - @"[便便]", - @"[火]", - @"[溜]", - @"[愛心]", - @"[心碎]", - @"[鐘情]", - @"[唇]", - @"[戒指]", - @"[鉆石]", - @"[太陽]", - @"[有時晴]", - @"[多雲]", - @"[雷]", - @"[雨]", - @"[雪花]", - @"[愛人]", - @"[帽子]", - @"[皇冠]", - @"[籃球]", - @"[足球]", - @"[壘球]", - @"[網球]", - @"[臺球]", - @"[咖啡]", - @"[啤酒]", - @"[幹杯]", - @"[檸檬汁]", - @"[餐具]", - @"[漢堡]", - @"[雞腿]", - @"[面條]", - @"[冰淇淋]", - @"[沙冰]", - @"[生日蛋糕]", - @"[蛋糕]", - @"[糖果]", - @"[葡萄]", - @"[西瓜]", - @"[光碟]", - @"[手機]", - @"[電話]", - @"[電視]", - @"[聲音開啟]", - @"[聲音關閉]", - @"[鈴鐺]", - @"[鎖頭]", - @"[放大鏡]", - @"[燈泡]", - @"[錘頭]", - @"[煙]", - @"[炸彈]", - @"[槍]", - @"[刀]", - @"[藥]", - @"[打針]", - @"[錢袋]", - @"[鈔票]", - @"[銀行卡]", - @"[手柄]", - @"[麻將]", - @"[調色板]", - @"[電影]", - @"[麥克風]", - @"[耳機]", - @"[音樂]", - @"[吉他]", - @"[火箭]", - @"[飛機]", - @"[火車]", - @"[公交]", - @"[轎車]", - @"[出租車]", - @"[警車]", - @"[自行車]"]; - } - return _emojiHantList; -} - -- (NSArray *)emojiHansList{ - if(!_emojiHansList){ - _emojiHansList = @[ @"[可爱]", - @"[大笑]", - @"[色]", - @"[嘘]", - @"[亲]", - @"[呆]", - @"[口水]", - @"[汗]", - @"[呲牙]", - @"[鬼脸]", - @"[害羞]", - @"[偷笑]", - @"[调皮]", - @"[可怜]", - @"[敲]", - @"[惊讶]", - @"[流感]", - @"[委屈]", - @"[流泪]", - @"[嚎哭]", - @"[惊恐]", - @"[怒]", - @"[酷]", - @"[不说]", - @"[鄙视]", - @"[阿弥陀佛]", - @"[奸笑]", - @"[睡著]", - @"[口罩]", - @"[努力]", - @"[抠鼻孔]", - @"[疑问]", - @"[怒骂]", - @"[晕]", - @"[呕吐]", - @"[拜一拜]", - @"[惊喜]", - @"[流汗]", - @"[卖萌]", - @"[默契眨眼]", - @"[烧香拜佛]", - @"[晚安]", - @"[强]", - @"[弱]", - @"[OK]", - @"[拳头]", - @"[胜利]", - @"[鼓掌]", - @"[握手]", - @"[发怒]", - @"[骷髅]", - @"[便便]", - @"[火]", - @"[溜]", - @"[爱心]", - @"[心碎]", - @"[钟情]", - @"[唇]", - @"[戒指]", - @"[钻石]", - @"[太阳]", - @"[有时晴]", - @"[多云]", - @"[雷]", - @"[雨]", - @"[雪花]", - @"[爱人]", - @"[帽子]", - @"[皇冠]", - @"[篮球]", - @"[足球]", - @"[垒球]", - @"[网球]", - @"[台球]", - @"[咖啡]", - @"[啤酒]", - @"[干杯]", - @"[柠檬汁]", - @"[餐具]", - @"[汉堡]", - @"[鸡腿]", - @"[面条]", - @"[冰淇淋]", - @"[沙冰]", - @"[生日蛋糕]", - @"[蛋糕]", - @"[糖果]", - @"[葡萄]", - @"[西瓜]", - @"[光碟]", - @"[手机]", - @"[电话]", - @"[电视]", - @"[声音开启]", - @"[声音关闭]", - @"[铃铛]", - @"[锁头]", - @"[放大镜]", - @"[灯泡]", - @"[锤头]", - @"[烟]", - @"[炸弹]", - @"[枪]", - @"[刀]", - @"[药]", - @"[打针]", - @"[钱袋]", - @"[钞票]", - @"[银行卡]", - @"[手柄]", - @"[麻将]", - @"[调色板]", - @"[电影]", - @"[麦克风]", - @"[耳机]", - @"[音乐]", - @"[吉他]", - @"[火箭]", - @"[飞机]", - @"[火车]", - @"[公交]", - @"[轿车]", - @"[出租车]", - @"[警车]", - @"[自行车]"]; - } - return _emojiHansList; -} - - - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QExtendBoardView.h b/YuMi/CustomUI/InputView/InputView/QExtendBoardView.h deleted file mode 100755 index 5eb9979..0000000 --- a/YuMi/CustomUI/InputView/InputView/QExtendBoardView.h +++ /dev/null @@ -1,67 +0,0 @@ -// -// QExtendBoardView.h -// QKeyBoardDemo -// -// Created by QDong on 14-5-1. -// Copyright (c) 2021年 QDong QQ:285275534@qq.com. All rights reserved. -// - -#import - - -@interface QExtendBoardItemModel : PIBaseModel - -/** - * Cell图片 - */ -@property (nonatomic, strong) UIImage *normalIconImage; - -/** - * Cell标题 - */ -@property (nonatomic, strong) NSString *title; - -/** - * 根据正常图片和标题初始化一个Model对象 - * - * @param normalIconImage 正常图片 - * @param title 标题 - * - * @return 返回一个Model对象 - */ -- (instancetype)initWithNormalIconImage:(UIImage *)normalIconImage - title:(NSString *)title; - -@end - - -@protocol QExtendBoardViewDelegate - -@optional -/** - * 点击拓展面板的cell - * - * @param shareMenuItem 被点击的第三方Model对象，可以在这里做一些特殊的定制 - * @param index 被点击的位置 - */ -- (void)didSelectExtendBoardItem:(QExtendBoardItemModel *)shareMenuItem atIndex:(NSInteger)index; - -@end - - -@interface QExtendBoardView : UIView - -//第三方功能Models -@property (nonatomic, strong) NSArray *extendBoardItems; - -@property (nonatomic, weak) id delegate; - -/** - * 根据数据源刷新第三方功能按钮的布局 - */ -- (void)reloadData; - - -- (void)reloadItemOfIndex:(int)index withNormalIconImage:(UIImage *)image withTitle:(NSString *)title ; - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QExtendBoardView.m b/YuMi/CustomUI/InputView/InputView/QExtendBoardView.m deleted file mode 100755 index 28b6b71..0000000 --- a/YuMi/CustomUI/InputView/InputView/QExtendBoardView.m +++ /dev/null @@ -1,279 +0,0 @@ -// -// QExtendBoardView.m -// QKeyBoardDemo -// -// Created by QDong on 14-5-1. -// Copyright (c) 2021年 QDong QQ:285275534@qq.com. All rights reserved. -// - -#import "QExtendBoardView.h" - -const int UIPageControlHeight = 56; - -const int UIMenuItemCellWidth = 80; - -const int UIMenuItemCellHeight = 90; - -const int UIPerColumItemCount = 2; - -@implementation QExtendBoardItemModel - -- (instancetype)initWithNormalIconImage:(UIImage *)normalIconImage - title:(NSString *)title { - self = [super init]; - if (self) { - self.normalIconImage = normalIconImage; - self.title = title; - } - return self; -} - -- (void)dealloc { - self.normalIconImage = nil; - self.title = nil; -} - -@end - -@interface QExtendBoardCollectionCell : UIView - -/** - * 第三方按钮 - */ -@property (nonatomic, weak) UIButton *extendItemButton; -/** - * 第三方按钮的标题 - */ -@property (nonatomic, weak) UILabel *extendItemTitleLabel; - -/** - * 配置默认控件的方法 - */ -- (void)setup; -@end - -@implementation QExtendBoardCollectionCell - -- (void)setup { - if (!_extendItemButton) { - UIButton *extendItemButton = [UIButton buttonWithType:UIButtonTypeCustom]; - extendItemButton.frame = CGRectMake(0, 0, UIMenuItemCellWidth, UIMenuItemCellWidth); - extendItemButton.backgroundColor = [UIColor clearColor]; - [self addSubview:extendItemButton]; - - self.extendItemButton = extendItemButton; - } - - if (!_extendItemTitleLabel) { - - UILabel *extendItemTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(self.extendItemButton.frame), UIMenuItemCellWidth, 17)]; - extendItemTitleLabel.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - NSBundle *bundle = [NSBundle bundleForClass:[self class]]; - extendItemTitleLabel.textColor = [UIColor colorNamed:@"q_text_black_gray" inBundle:bundle compatibleWithTraitCollection:nil]; - } else { - extendItemTitleLabel.textColor = [UIColor colorWithRed:91/255.0f green:91/255.0f blue:91/255.0f alpha:1]; - } - extendItemTitleLabel.font = [UIFont systemFontOfSize:15]; - extendItemTitleLabel.textAlignment = NSTextAlignmentCenter; - [self addSubview:extendItemTitleLabel]; - - self.extendItemTitleLabel = extendItemTitleLabel; - } -} - -- (void)awakeFromNib { - [self setup]; - [super awakeFromNib]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self setup]; - } - return self; -} - -@end - -@interface QExtendBoardView () - -/** - * 这是背景滚动视图 - */ -@property (nonatomic, weak) UIScrollView *extendScrollView; - -/** - * 显示页码的视图 - */ -@property (nonatomic, weak) UIPageControl *extendPageControl; - -/** - * 第三方按钮点击的事件 - * - * @param sender 第三方按钮对象 - */ -- (void)extendItemButtonClicked:(UIButton *)sender; - -/** - * 配置默认控件 - */ -- (void)setup; - -@end - -@implementation QExtendBoardView - -- (void)extendItemButtonClicked:(UIButton *)sender { - if ([self.delegate respondsToSelector:@selector(didSelectExtendBoardItem:atIndex:)]) { - NSInteger index = sender.tag; - if (index < self.extendBoardItems.count) { - [self.delegate didSelectExtendBoardItem:[self.extendBoardItems objectAtIndex:index] atIndex:index]; - } - } -} - -- (void)reloadItemOfIndex:(int)index withNormalIconImage:(UIImage *)image withTitle:(NSString *)title { - if ([self.extendScrollView.subviews count] > index) { - QExtendBoardCollectionCell *extendItemView = self.extendScrollView.subviews[index]; - [extendItemView.extendItemButton setImage:image forState:UIControlStateNormal]; - extendItemView.extendItemTitleLabel.text = title; - } -} - -- (void)reloadData { - if (!_extendBoardItems.count) - return; - // 每行有4个 - int perRowItemCount = (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) ? 10 : 4; - - [self.extendScrollView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)]; - - CGFloat paddingX = 10; - CGFloat paddingY = 10; - for (QExtendBoardItemModel *extendItem in self.extendBoardItems) { - NSInteger index = [self.extendBoardItems indexOfObject:extendItem]; - NSInteger page = index / (perRowItemCount * UIPerColumItemCount); - CGRect extendItemViewFrame = [self getFrameWithPerRowItemCount:perRowItemCount - perColumItemCount:UIPerColumItemCount - itemWidth:UIMenuItemCellWidth - itemHeight:UIMenuItemCellHeight - paddingX:paddingX - paddingY:paddingY - atIndex:index - onPage:page]; - QExtendBoardCollectionCell *extendItemView = [[QExtendBoardCollectionCell alloc] initWithFrame:extendItemViewFrame]; - - extendItemView.extendItemButton.tag = index; - [extendItemView.extendItemButton addTarget:self action:@selector(extendItemButtonClicked:) forControlEvents:UIControlEventTouchUpInside]; - [extendItemView.extendItemButton setImage:extendItem.normalIconImage forState:UIControlStateNormal]; - extendItemView.extendItemTitleLabel.text = extendItem.title; - - [self.extendScrollView addSubview:extendItemView]; - } - - self.extendPageControl.numberOfPages = (self.extendBoardItems.count / (perRowItemCount * 2) + (self.extendBoardItems.count % (perRowItemCount * 2) ? 1 : 0)); - [self.extendScrollView setContentSize:CGSizeMake(((self.extendBoardItems.count / (perRowItemCount * 2) + (self.extendBoardItems.count % (perRowItemCount * 2) ? 1 : 0)) * CGRectGetWidth(self.bounds)), CGRectGetHeight(self.extendScrollView.bounds))]; -} - -/** - * 通过目标的参数，获取一个grid布局 - * - * @param perRowItemCount 每行有多少列 - * @param perColumItemCount 每列有多少行 - * @param itemWidth gridItem的宽度 - * @param itemHeight gridItem的高度 - * @param paddingX gridItem之间的X轴间隔 - * @param paddingY gridItem之间的Y轴间隔 - * @param index 某个gridItem所在的index序号 - * @param page 某个gridItem所在的页码 - * - * @return 返回一个已经处理好的gridItem frame - */ -- (CGRect)getFrameWithPerRowItemCount:(NSInteger)perRowItemCount - perColumItemCount:(NSInteger)perColumItemCount - itemWidth:(CGFloat)itemWidth - itemHeight:(NSInteger)itemHeight - paddingX:(CGFloat)paddingX - paddingY:(CGFloat)paddingY - atIndex:(NSInteger)index - onPage:(NSInteger)page { - CGRect itemFrame = CGRectMake((index % perRowItemCount) * (itemWidth + paddingX) + paddingX + (page * CGRectGetWidth(self.bounds)), ((index / perRowItemCount) - perColumItemCount * page) * (itemHeight + paddingY) + paddingY, itemWidth, itemHeight); - return itemFrame; -} - -#pragma mark - Life cycle - -- (void)setup { - - if (!_extendScrollView) { - UIScrollView *extendScrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.bounds), CGRectGetHeight(self.bounds) - UIPageControlHeight)]; - extendScrollView.delegate = self; - extendScrollView.canCancelContentTouches = NO; - extendScrollView.delaysContentTouches = YES; - extendScrollView.backgroundColor = self.backgroundColor; - extendScrollView.showsHorizontalScrollIndicator = NO; - extendScrollView.showsVerticalScrollIndicator = NO; - [extendScrollView setScrollsToTop:NO]; - extendScrollView.pagingEnabled = YES; - [self addSubview:extendScrollView]; - - self.extendScrollView = extendScrollView; - } - - if (!_extendPageControl) { - UIPageControl *extendPageControl = [[UIPageControl alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(self.extendScrollView.frame), CGRectGetWidth(self.bounds), UIPageControlHeight)]; - extendPageControl.backgroundColor = self.backgroundColor; - extendPageControl.hidesForSinglePage = YES; - extendPageControl.defersCurrentPageDisplay = YES; - [self addSubview:extendPageControl]; - - self.extendPageControl = extendPageControl; - } -} - -- (void)layoutSubviews { - [super layoutSubviews]; - self.extendScrollView.frame = CGRectMake(0, 0, CGRectGetWidth(self.bounds), CGRectGetHeight(self.bounds) - UIPageControlHeight); - self.extendPageControl.frame = CGRectMake(0, CGRectGetMaxY(self.extendScrollView.frame), CGRectGetWidth(self.bounds), UIPageControlHeight); -} - -- (void)awakeFromNib { - [self setup]; - [super awakeFromNib]; -} - -- (id)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - // Initialization code - [self setup]; - } - return self; -} - -- (void)dealloc { - self.extendBoardItems = nil; -// self.extendScrollView.delegate = self; - self.extendScrollView = nil; - self.extendPageControl = nil; -} - -- (void)willMoveToSuperview:(UIView *)newSuperview { - if (newSuperview) { - [self reloadData]; - } -} - -#pragma mark - UIScrollView delegate - -- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView { - //每页宽度 - CGFloat pageWidth = scrollView.frame.size.width; - //根据当前的坐标与页宽计算当前页码 - NSInteger currentPage = floor((scrollView.contentOffset.x - pageWidth/2)/pageWidth)+1; - [self.extendPageControl setCurrentPage:currentPage]; -} - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QInputBarView.h b/YuMi/CustomUI/InputView/InputView/QInputBarView.h deleted file mode 100755 index b4da9d1..0000000 --- a/YuMi/CustomUI/InputView/InputView/QInputBarView.h +++ /dev/null @@ -1,122 +0,0 @@ -// -// QInputBarView.h -// QKeyBoardDemo -// -// Created by QDong on 14-4-24. -// Copyright (c) 2021年 QDong QQ:285275534@qq.com. All rights reserved. -// - -#import -#import "SZTextView.h" -#import "QInputBarViewConfiguration.h" - -//整个Bar的最小高度（即文字只有1行时候的高度） -extern const int UIInputBarViewMinHeight; - -@class QInputBarView; - -@protocol QInputBarViewDataSource -@optional - -//@return 输入条上的UITextView，返回你自定义的UITextView；如果不实现这个方法，本类会自己创建一个UITextView -- (UITextView *)textViewForInputBarView:(QInputBarView *)inputBarView; - -@end - -@protocol QInputBarViewDelegate - -@optional - - -// 输入框刚好开始编辑 -- (void)inputBarView:(QInputBarView *)inputBarView inputTextViewDidBeginEditing:(UITextView *)inputTextView; - -// 输入框将要开始编辑 -- (void)inputBarView:(QInputBarView *)inputBarView inputTextViewShouldBeginEditing:(UITextView *)inputTextView; - -// 输入框的高度发生了改变（因为输入了值） -- (void)inputBarView:(QInputBarView *)inputBarView inputTextView:(UITextView *)inputTextView heightDidChange:(CGFloat)changeValue becauseSendText:(BOOL)becauseSendText; - -/** - * 在发送文本和语音之间发送改变时，会触发这个回调函数 - */ -- (void)inputBarView:(QInputBarView *)inputBarView onVoiceSwitchButtonClick:(UIButton *)voiceSwitchButton; - -/** - * 点击了系统键盘的发送按钮 - * @param inputNormalText ："害~你好啊[微笑]" - */ -- (void)inputBarView:(QInputBarView *)inputBarView onKeyboardSendClick:(NSString *)inputNormalText; - -/** - * 点击+号按钮Action - */ -- (void)inputBarView:(QInputBarView *)inputBarView onExtendButtonClick:(UIButton *)extendSwitchButton; - -/** - * 发送第三方表情 - */ -- (void)inputBarView:(QInputBarView *)inputBarView onEmotionButtonClick:(UIButton *)emotionSwitchButton; - -/** - * 吊起相册 - */ -- (void)inputBarView:(QInputBarView *)inputBarView onCameraButtonClick:(UIButton *)emotionSwitchButton; - - -/** - * 发送相机 - */ -- (void)inputBarView:(QInputBarView *)inputBarView onPhototButtonClick:(UIButton *)emotionSwitchButton; - - -/** - * 送礼物 - */ -- (void)inputBarView:(QInputBarView *)inputBarView onGiftButtonClick:(UIButton *)emotionSwitchButton; - - -- (void)audioRecordCompletion:(NSString *)recordPath; - -@end - -//输入条View，不包含表情面板 -@interface QInputBarView : UIView - -@property (nonatomic, strong, readonly) SZTextView *inputTextView; - -@property (nonatomic, strong, readonly) UIButton *recordButton; - -@property (nonatomic, weak) id delegate; - -@property (nonatomic, weak) id dataSource; - -// 根据配置设置UI，本方法只需要调用一次 -- (void)setupWithConfiguration:(QInputBarViewConfiguration *)configuration; - - -// 让textView获取焦点 -- (void)textViewBecomeFirstResponder; - -// 让textView失去焦点 -- (void)textViewResignFirstResponder; - -// 获取textView的内容文本 -- (NSString *)textViewInputNormalText; - -// 给textView插入表情图片，比如😊 -- (void)insertEmotionAttributedString:(NSAttributedString *)emotionAttributedString; - -// 给textView插入表情的文本，比如[微笑] -- (void)insertEmotion:(NSString *)emotionKey; - -// textView删除表情 -// @return YES 表示刚才成功删除了一个表情； -// @return NO 表示刚才没删掉表情（于是本类就什么都不操作，由外部vc实现删除操作。这样做因为vc的自定义tv可能要实现文字块删除，比如 @人名） -- (BOOL)deleteEmotion; - -// 清除输入的文本，不建议你自己用inputTextView.text = nil来情况文本。因为那样的话如果输入栏的文字>1行，你调用tableView.reload再scrollToBottom会出现tableView滚动不流畅 -//之所以不流畅是因为tableView的scrollToBottom动画和onWholeInputViewHeightDidChange里的动画同时被调用 -- (NSTimeInterval)clearInputTextBySend; //@return 0：当前inputText只有一行；非0：动画时长 - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QInputBarView.m b/YuMi/CustomUI/InputView/InputView/QInputBarView.m deleted file mode 100755 index 6615b56..0000000 --- a/YuMi/CustomUI/InputView/InputView/QInputBarView.m +++ /dev/null @@ -1,704 +0,0 @@ -// -// QInputBarView.m -// QKeyBoardDemo -// -// Created by QDong on 2021-8-3. -// Copyright (c) 2021年 QDong QQ:285275534@qq.com. All rights reserved. -// - -//整个Bar的最小高度（即文字只有1行时候的整条Bar的高度） -const int UIInputBarViewMinHeight = 58; - -//Bar里面的UITextView的最小高度（即文字只有1行时候的UITextView高度） -const int UIInputTextViewMinHeight = 42; - -//Bar里面的UITextView的最大高度（即文字有超多行时候的高度） -const int UIInputTextViewMaxHeight = 147; -///Third -#import -#import -#import "QInputBarView.h" -#import "UITextView+QEmotion.h" -#import "SessionAudioRecordView.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "DJDKMIMOMColor.h" -#import "StatisticsServiceHelper.h" - -//默认的输入bar，包含了：左侧的语音切换按钮，中间的textview和按住录音按钮，右侧的表情和拓展按钮，（总之，仿微信的输入条） -//上述按钮都可以设置隐藏，如果还是无法满足你的需求，请自定义UIView，参考TextFieldViewController -@interface QInputBarView () -{ -} -@property (nonatomic, strong) SZTextView *inputTextView; -@property (nonatomic, strong) UIButton *voiceSwitchButton; -@property (nonatomic, strong) UIButton *extendSwitchButton; -@property (nonatomic, strong) UIButton *emotionSwitchButton; -@property (nonatomic, strong) UIButton *recordButton; //按住不松录音的长条按钮 -///底部的容器 -@property (nonatomic,strong) UIStackView *toolStackView; -///显示相册 -@property (nonatomic,strong) UIButton *photoButton; -///照相机 -@property (nonatomic,strong) UIButton *cameraButton; -///选择的礼物 -@property (nonatomic,strong) UIButton *giftButton; - -/// 输入栏TextView的高度发生变化的动画时长（秒） -@property (nonatomic, assign) NSTimeInterval inputBarHeightChangeAnimationDuration; // default is 0.2 - -/// 点击“发送”按钮时候会清空输入栏，进而导致TextView的高度变化的动画时长（秒） -@property (nonatomic, assign) NSTimeInterval inputBarHeightChangeAnimationWhenSendDuration; //0.1 - -// 点击键盘右下角的按钮是否是发送，NO表示普通回车换行，YES表示回调Delegate的Send方法 -@property (nonatomic, assign) BOOL keyboardSendEnabled; // default is YES - -//在切换语音和文本消息的时候，需要保存原本已经输入的文本 -@property (nonatomic, strong) NSString *inputedText; - -//记录旧的textView Heigth -@property (nonatomic, assign) CGFloat previousTextViewContentHeight; - -//刚才清空文本框是因为点击了”发送“按钮。加入这个全局变量是为了Delegate的heightDidChange方法可以回调特殊的返回值 -@property (nonatomic, assign) BOOL clearInputTextBySendSoon; -///录音的view -@property (nonatomic,strong) SessionAudioRecordView *audioRecordView; -///配置 -@property (nonatomic,strong) QInputBarViewConfiguration *config; -///当前 时间 -@property (nonatomic,assign) NSTimeInterval currentTime; -@end - -@implementation QInputBarView - -#pragma mark - Init -- (void)awakeFromNib { - [super awakeFromNib]; -} - -- (void)setupWithConfiguration:(QInputBarViewConfiguration *)configuration -{ - self.config = configuration; - self.keyboardSendEnabled = configuration.keyboardSendEnabled; - - const int UISwitchButtonWidth = 40; // 3个按钮固定宽高 - const int horizontalPadding = 6; // 水平间隔 - const CGFloat verticalPadding = (UIInputBarViewMinHeight - UISwitchButtonWidth )/2;// 垂直间隔 - CGFloat textViewFrameX = 0;// 输入框的frame.x - CGFloat rightViewsMinX = 0;// 输入框右边的按钮的minY，为了计算textView的宽度 - const CGFloat textViewHorizontalMargin = 8; //输入框的左右margin - CGFloat safeAreaInsetsLeft = 0; - CGFloat safeAreaInsetsRight = 0; - if (@available(iOS 11.0, *)) { - safeAreaInsetsLeft = UIApplication.sharedApplication.windows.firstObject.safeAreaInsets.left; - safeAreaInsetsRight = UIApplication.sharedApplication.windows.firstObject.safeAreaInsets.right; - } - - NSBundle *bundle = [NSBundle bundleForClass:[self class]]; - - // 允许发送语音 - if (!configuration.voiceButtonHidden) { - UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, UISwitchButtonWidth, UISwitchButtonWidth)]; - [button setBackgroundImage:[UIImage imageNamed:@"q_chat_keyboard_black_normal" inBundle:bundle compatibleWithTraitCollection:nil] forState:UIControlStateNormal]; - [button setBackgroundImage:[UIImage imageNamed:@"q_chat_voice_black_normal" inBundle:bundle compatibleWithTraitCollection:nil] forState:UIControlStateSelected]; - [button addTarget:self action:@selector(onVoiceSwitchButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - CGRect buttonFrame = button.frame; - buttonFrame.origin = CGPointMake(horizontalPadding + safeAreaInsetsLeft, verticalPadding); - button.frame = buttonFrame; - [self addSubview:button]; - self.voiceSwitchButton = button; - textViewFrameX = CGRectGetMaxX(button.frame); - } else { - //如果没有左边的语音按钮，输入条太贴左边了，+8提高一些marginLeft - textViewFrameX = safeAreaInsetsLeft + 8; - } - - //是否显示最右侧按钮（最右侧按钮可能是+，也可能是“发送”） - BOOL rightButtonShowed = NO; - - //右边是发送按钮 - if (configuration.rightSendButton) { - UIButton *button = configuration.rightSendButton; - button.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin; - - CGRect buttonFrame = button.frame; - buttonFrame.origin = CGPointMake(CGRectGetWidth(self.bounds) - horizontalPadding - CGRectGetWidth(buttonFrame) - safeAreaInsetsRight, verticalPadding); - button.frame = buttonFrame; - [self addSubview:button]; - rightViewsMinX = CGRectGetMinX(buttonFrame); - rightButtonShowed = YES; - - } else if (!configuration.extendButtonHidden) { - // 允许发送多媒体消息。为什么不是先放表情按钮呢？因为布局的需要 - UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, UISwitchButtonWidth, UISwitchButtonWidth)]; - button.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin; - [button setBackgroundImage:[UIImage imageNamed:@"q_chat_extend_black_normal" inBundle:bundle compatibleWithTraitCollection:nil] forState:UIControlStateNormal]; - [button addTarget:self action:@selector(onExtendSwitchButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - - CGRect buttonFrame = button.frame; - buttonFrame.origin = CGPointMake(CGRectGetWidth(self.bounds) - horizontalPadding - CGRectGetWidth(buttonFrame) - safeAreaInsetsRight, verticalPadding); - button.frame = buttonFrame; - [self addSubview:button]; - rightViewsMinX = CGRectGetMinX(buttonFrame); - self.extendSwitchButton = button; - rightButtonShowed = YES; - - } else { - rightViewsMinX = CGRectGetWidth(self.bounds) - safeAreaInsetsRight; - } - - // 允许发送表情 - if (!configuration.emotionButtonHidden) { - UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, UISwitchButtonWidth, UISwitchButtonWidth)]; - button.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin; - [button setBackgroundImage:[UIImage imageNamed:@"q_chat_emoji_black_normal" inBundle:bundle compatibleWithTraitCollection:nil] forState:UIControlStateNormal]; - [button setBackgroundImage:[UIImage imageNamed:@"q_chat_keyboard_black_normal" inBundle:bundle compatibleWithTraitCollection:nil] forState:UIControlStateSelected]; - [button addTarget:self action:@selector(onEmotionSwitchButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - CGRect buttonFrame = button.frame; - if (rightButtonShowed) { - buttonFrame.origin = CGPointMake(rightViewsMinX - CGRectGetWidth(buttonFrame) - horizontalPadding, verticalPadding); - } else { - buttonFrame.origin = CGPointMake(CGRectGetWidth(self.bounds) - horizontalPadding - CGRectGetWidth(buttonFrame) - safeAreaInsetsRight, verticalPadding); - } - button.frame = buttonFrame; - [self addSubview:button]; - self.emotionSwitchButton = button; - - rightViewsMinX = CGRectGetMinX(buttonFrame); - } else { - //不显示表情按钮，rightViewsMinX已经在上面处理好了 - } - - // 输入框的宽度 - CGFloat textViewWidth = rightViewsMinX - textViewHorizontalMargin - textViewFrameX - textViewHorizontalMargin; - - // 初始化输入框 - UITextView *textView = nil; - if ([self.dataSource respondsToSelector:@selector(textViewForInputBarView:)]) { - //textView 是由vc实现的，本类只设置一下frame - textView = [self.dataSource textViewForInputBarView:self]; - } - - if (!textView){ - //vc没有提供UITextView，我们自己来实现 - textView = [[SZTextView alloc] initWithFrame:CGRectZero]; - textView.font = [UIFont systemFontOfSize:17.5]; - textView.returnKeyType = UIReturnKeySend; - textView.scrollsToTop = NO; - textView.textAlignment = NSTextAlignmentLeft; - textView.layer.cornerRadius = UIInputTextViewMinHeight / 2; - //top, left, bottom, right - textView.textContainerInset = UIEdgeInsetsMake(10.0f, 8.0f, 10.0f, 8.0f); - //如果我设置了left边距，换行的时候，xcode会弹出提示：requesting caretRectForPosition: while the NSTextStorage has oustanding changes . 但是实际运行没任何影响 - //如果把left（第2、4个参数）设置为0，就不会有警告。原因不明 - textView.enablesReturnKeyAutomatically = YES; // UITextView内部判断send按钮是否可以用 - } - //本类来控制tv的frame和delegate - textView.autoresizingMask = UIViewAutoresizingFlexibleWidth; - textView.delegate = self; - - //用kvo来监听输入文本的改变，进而改变tv高度和整个bar高度 - [textView addObserver:self forKeyPath:@"contentSize" options:NSKeyValueObservingOptionNew context:nil]; - [self addSubview:textView]; - textView.frame = CGRectMake(textViewFrameX + textViewHorizontalMargin, (UIInputBarViewMinHeight - UIInputTextViewMinHeight)/2, textViewWidth, UIInputTextViewMinHeight); - - if ([textView isKindOfClass:[SZTextView class]]) { - self.inputTextView = (SZTextView *)textView; - } - - for (id view in textView.subviews) { - if ([view isKindOfClass:[UITextView class]]){ - UITextView *textView = view; - textView.textAlignment = NSTextAlignmentLeft; - break; - } - } - //记录初始化时候的textview高度 - self.previousTextViewContentHeight = [self getTextViewContentHeight]; - - // 如果是可以发送语言的，那就需要一个按钮录音的按钮，事件可以在外部添加 - if (!configuration.voiceButtonHidden) { - UIButton *button = [[UIButton alloc] initWithFrame:self.inputTextView.frame]; - button.autoresizingMask = UIViewAutoresizingFlexibleWidth; - - [button setBackgroundImage:[UIImage imageWithColor: UIColorFromRGB(0xF1F1FA)] forState:UIControlStateNormal]; - [button setBackgroundImage:[UIImage imageNamed:@"q_white_input_press_btn" inBundle:bundle compatibleWithTraitCollection:nil] forState:UIControlStateHighlighted]; - [button setTitle:configuration.speakButtonTitle?:YMLocalizedString(@"QInputBarView0") forState:UIControlStateNormal]; - [button setTitle:configuration.speakButtonTitle?:YMLocalizedString(@"QInputBarView1") forState:UIControlStateSelected]; - [button addTarget:self action:@selector(audioTouchDownAction) forControlEvents:UIControlEventTouchDown]; - [button addTarget:self action:@selector(audioTouchUpOutsideAction) forControlEvents:UIControlEventTouchUpOutside]; - [button addTarget:self action:@selector(audioTouchUpInsideAction) forControlEvents:UIControlEventTouchUpInside]; - [button addTarget:self action:@selector(audioTouchDragEnterAction) forControlEvents:UIControlEventTouchDragEnter]; - [button addTarget:self action:@selector(audioTouchDragExitAction) forControlEvents:UIControlEventTouchDragExit]; - button.layer.masksToBounds = YES; - button.layer.cornerRadius = UIInputTextViewMinHeight / 2; - button.alpha = self.voiceSwitchButton.selected; - [self addSubview:button]; - self.recordButton = button; - } - - if (!configuration.toolHidden) { - UIStackView * stackView = [[UIStackView alloc] init]; - stackView.axis = UILayoutConstraintAxisHorizontal; - stackView.distribution = UIStackViewDistributionFillEqually; - stackView.alignment = UIStackViewAlignmentFill; - stackView.spacing = 0; - stackView.backgroundColor = [UIColor clearColor]; - stackView.frame = CGRectMake(0, CGRectGetMaxY(self.inputTextView.frame) + 5, self.frame.size.width, 30); - [self addSubview:stackView]; - self.toolStackView = stackView; - [self.toolStackView addArrangedSubview:self.photoButton]; - [self.toolStackView addArrangedSubview:self.cameraButton]; - [self.toolStackView addArrangedSubview:self.giftButton]; - - self.photoButton.hidden = configuration.photoButtonHidden; - self.giftButton.hidden = configuration.giftButtonHidden; - self.cameraButton.hidden = configuration.cameraButtonHidden; - } - - - //各种颜色 - self.backgroundColor = configuration.inputBarBackgroundColor; - _inputTextView.textColor = configuration.textColor; - _inputTextView.backgroundColor = configuration.textViewBackgroundColor; - [self.recordButton setTitleColor:configuration.recordButtonTitleColor forState:UIControlStateNormal]; - - //两个动画时长 - self.inputBarHeightChangeAnimationDuration = configuration.inputBarHeightChangeAnimationDuration == 0 ? 0.2 : configuration.inputBarHeightChangeAnimationDuration; - self.inputBarHeightChangeAnimationWhenSendDuration = 0.1; - - //输入条的上方添加一行细线 - UIView *topLineView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.bounds), 1 / [UIScreen mainScreen].scale)]; - topLineView.backgroundColor = configuration.inputBarBoardColor; - [self addSubview:topLineView]; - [[NIMSDK sharedSDK].mediaManager addDelegate:self]; -} - -#pragma mark - NIMMediaManagerDelegate -/** - * 开始录制音频的回调 - * - * @param filePath 录制的音频的文件路径 - * @param error 错误信息 - * @discussion 如果录音失败，filePath 有可能为 nil - */ -- (void)recordAudio:(nullable NSString *)filePath didBeganWithError:(nullable NSError *)error { - NSLog(@"开始录制语音"); -} - -/** - * 录制音频完成后的回调 - * - * @param filePath 录制完成的音频文件路径 - * @param error 错误信息 - */ -- (void)recordAudio:(nullable NSString *)filePath didCompletedWithError:(nullable NSError *)error { - if (filePath.length > 0 && error == nil) { - if (self.delegate && [self.delegate respondsToSelector:@selector(audioRecordCompletion:)]) { - [self.delegate audioRecordCompletion:filePath]; - } - } - NSLog(@"录制音频完成后的回调 %@", filePath); -} - -/** - * 录音被取消的回调 - */ -- (void)recordAudioDidCancelled { - NSLog(@"录音被取消的回调"); -} - -/** - * 音频录制进度更新回调 - * - * @param currentTime 当前录制的时间 - */ -- (void)recordAudioProgress:(NSTimeInterval)currentTime { - self.currentTime = currentTime; - [self.audioRecordView updateAudioRecordProgress:currentTime]; -} - -/** - * 录音开始被打断回调 - */ -- (void)recordAudioInterruptionBegin { - [self.audioRecordView cancelAudioRecord]; -} - - -#pragma mark - IBAction -// 左边语音\键盘切换按钮点击 -- (IBAction)onVoiceSwitchButtonClick:(UIButton *)sender -{ - sender.selected = !sender.selected; - self.emotionSwitchButton.selected = NO; - self.extendSwitchButton.selected = NO; - - if (sender.selected) { - self.inputedText = self.inputTextView.text; - self.inputTextView.text = nil; - [self.inputTextView resignFirstResponder]; - } else { - self.inputTextView.text = self.inputedText; - self.inputedText = nil; - [self.inputTextView becomeFirstResponder]; - } - - [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ - self.recordButton.alpha = sender.selected; - self.inputTextView.alpha = !sender.selected; - } completion:^(BOOL finished) { - - }]; - -//// [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEvent_chat_toolbar_voice_click]; - - if ([self.delegate respondsToSelector:@selector(inputBarView:onVoiceSwitchButtonClick:)]) { - [self.delegate inputBarView:self onVoiceSwitchButtonClick:sender]; - } -} - -// 右边表情\键盘切换按钮点击 -- (IBAction)onEmotionSwitchButtonClick:(UIButton *)sender -{ - sender.selected = !sender.selected; - self.voiceSwitchButton.selected = NO; - self.extendSwitchButton.selected = NO; - - if (!sender.selected) { - [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ - self.recordButton.alpha = sender.selected; - self.inputTextView.alpha = !sender.selected; - } completion:^(BOOL finished) { - - }]; - } else { - [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ - self.recordButton.alpha = !sender.selected; - self.inputTextView.alpha = sender.selected; - } completion:^(BOOL finished) { - - }]; - } -//// [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEvent_chat_toolbar_emoticon_click]; - if ([self.delegate respondsToSelector:@selector(inputBarView:onEmotionButtonClick:)]) { - [self.delegate inputBarView:self onEmotionButtonClick:sender]; - } -} - -// 右边表情\键盘切换按钮点击 -- (IBAction)onExtendSwitchButtonClick:(UIButton *)sender -{ - sender.selected = !sender.selected; - self.emotionSwitchButton.selected = NO; - if ([self.delegate respondsToSelector:@selector(inputBarView:onExtendButtonClick:)]) { - [self.delegate inputBarView:self onExtendButtonClick:sender]; - } -} - -- (void)photoButtonAction:(UIButton *)sender { -//// [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEvent_chat_toolbar_photo_click]; - sender.selected = !sender.selected; - if (self.delegate && [self.delegate respondsToSelector:@selector(inputBarView:onPhototButtonClick:)]) { - [self.delegate inputBarView:self onPhototButtonClick:sender]; - } -} - -- (void)giftButtonAction:(UIButton *)sender { -//// [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEvent_chat_toolbar_gift_click]; - if (self.delegate && [self.delegate respondsToSelector:@selector(inputBarView:onGiftButtonClick:)]) { - [self.delegate inputBarView:self onGiftButtonClick:sender]; - } -} - -- (void)camerButtonAction:(UIButton *)sender { -//// [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEvent_chat_toolbar_camera_click]; - if (self.delegate && [self.delegate respondsToSelector:@selector(inputBarView:onCameraButtonClick:)]) { - [self.delegate inputBarView:self onCameraButtonClick:sender]; - } -} - -- (void)audioTouchDownAction { - self.currentTime = 0; - self.recordButton.selected = YES; - ///开始录音 - if (!self.audioRecordView.superview) { - [kWindow addSubview:self.audioRecordView]; - [self.audioRecordView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(kWindow); - }]; - [self.audioRecordView configAudioRecord:@"message_tool_audio_record_first" title:YMLocalizedString(@"QInputBarView2") isAnimation:YES]; - [self.audioRecordView beginAudioRecord]; - } - -} - -- (void)audioTouchUpOutsideAction { - self.recordButton.selected = NO; - ///取消录音 - [self.audioRecordView cancelAudioRecord]; - [self.audioRecordView removeFromSuperview]; -} - -- (void)audioTouchUpInsideAction { - self.recordButton.selected = NO; - if (self.currentTime > 1) { - ///手指抬起 完成录音 - [self.audioRecordView finishAudioRecord]; - } else { - ///取消录音 - [self.audioRecordView cancelAudioRecord]; - } - [self.audioRecordView removeFromSuperview]; -} - -- (void)audioTouchDragEnterAction { - ///手指上滑 取消发送 - [self.audioRecordView configAudioRecord:@"message_tool_audio_record_first" title:YMLocalizedString(@"QInputBarView3") isAnimation:YES]; -} - -- (void)audioTouchDragExitAction { - ///松开手指 取消发送 - [self.audioRecordView configAudioRecord:@"message_tool_audio_record_cancel" title:YMLocalizedString(@"QInputBarView4") isAnimation:NO]; -} - - -#pragma mark - Public -- (void)resetTextViewHeightBy:(CGFloat)textViewHeightShouldChangeValue { - // 动态改变自身的高度和输入框的高度 - CGRect prevFrame = self.inputTextView.frame; - self.inputTextView.frame = CGRectMake(prevFrame.origin.x, - prevFrame.origin.y, - prevFrame.size.width, - prevFrame.size.height + textViewHeightShouldChangeValue); - - if (!self.config.toolHidden) { - self.toolStackView.frame = CGRectMake(0, CGRectGetMaxY(self.inputTextView.frame) + 5, self.frame.size.width, 30); - } -} - -// 让textView获取焦点 -- (void)textViewBecomeFirstResponder { - [self.inputTextView becomeFirstResponder]; -} - -// 让textView失去焦点 -- (void)textViewResignFirstResponder { - [self.inputTextView resignFirstResponder]; -} - -// 获取textView的内容文本 -- (NSString *)textViewInputNormalText { - return [self.inputTextView normalText]; -} - -// 给textView插入表情图片，比如😊 -- (void)insertEmotionAttributedString:(NSAttributedString *)emotionAttributedString { - [self.inputTextView insertEmotionAttributedString: emotionAttributedString]; -} - -// 给textView插入表情的文本，比如[微笑] -- (void)insertEmotion:(NSString *)emotionKey { - [self.inputTextView insertEmotion: emotionKey]; -} - -// textView删除表情 -// @return YES 表示刚才成功删除了一个表情； -// @return NO 表示刚才没删掉表情（于是本类就什么都不操作，由外部vc实现删除操作。这样做因为vc的自定义tv可能要实现文字块删除，比如 @人名） -- (BOOL)deleteEmotion { - //点的是删除按钮，获得光标所在的位置 - return [self.inputTextView deleteEmotion]; -} - -// 清除输入的文本。不建议你自己用inputTextView.text = nil来情况文本。因为那样的话如果输入栏的文字>1行，你调用tableView.reload再scrollToBottom会出现tableView滚动不流畅 -//之所以不流畅是因为tableView的scrollToBottom动画和onWholeInputViewHeightDidChange里的动画同时被调用 -- (NSTimeInterval)clearInputTextBySend { - - //YES:当前inputText只有一行；NO：大于一行 - BOOL currentIsOneLine = self.inputTextView.frame.size.height == UIInputTextViewMinHeight; - - //临时改成yes，等回调了delegate要立刻设NO - self.clearInputTextBySendSoon = YES; - - //清空输入栏，如果当前输入栏里的文字行数>1会立即触发KVO - self.inputTextView.text = nil; - - //等走完KVO和KVO里的的delegate，再关掉 - self.clearInputTextBySendSoon = NO; - - //@return YES：当前inputText只有一行；NO：大于一行 - return currentIsOneLine ? 0 : _inputBarHeightChangeAnimationWhenSendDuration; -} - -#pragma mark - Private -/** - * 获取某个UITextView对象的content高度 - * @return 返回高度 - */ -- (CGFloat)getTextViewContentHeight -{ - return ceilf([_inputTextView sizeThatFits:_inputTextView.frame.size].height); -} - -#pragma mark - UITextViewDelegate -- (BOOL)textViewShouldBeginEditing:(UITextView *)textView { - if ([self.delegate respondsToSelector:@selector(inputBarView:inputTextViewShouldBeginEditing:)]) { - [self.delegate inputBarView:self inputTextViewShouldBeginEditing:self.inputTextView]; - } - self.emotionSwitchButton.selected = NO; - self.voiceSwitchButton.selected = NO; - self.extendSwitchButton.selected = NO; -//// [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEvent_chat_toolbar_input_click]; - return YES; -} - -- (void)textViewDidBeginEditing:(UITextView *)textView { - [textView becomeFirstResponder]; - if (!self.previousTextViewContentHeight) - self.previousTextViewContentHeight = [self getTextViewContentHeight]; - if ([self.delegate respondsToSelector:@selector(inputBarView:inputTextViewDidBeginEditing:)]) { - [self.delegate inputBarView:self inputTextViewDidBeginEditing:self.inputTextView]; - } -} - -- (void)textViewDidEndEditing:(UITextView *)textView { - [textView resignFirstResponder]; -} - -- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text { - if (self.keyboardSendEnabled && [text isEqualToString:@"\n"]) { - if ([self.delegate respondsToSelector:@selector(inputBarView:onKeyboardSendClick:)]) { - [self.delegate inputBarView:self onKeyboardSendClick:[textView normalText]]; - } - return NO; - } - return YES; -} - -//只有在发生换行时候才会触发这里 -#pragma mark - Key-value Observing -- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { - - if (object == _inputTextView && [keyPath isEqualToString:@"contentSize"]) { - //当输入的文本发生<折行>的时候会进入这里，这是ios系统判断的折行，<折行>包括新增文本导致的折行，也包括删除文本 - - UITextView *textView = (UITextView *)object; - CGFloat newContentHeight = [self getTextViewContentHeight]; - - //true表示tv行数减少了 - BOOL heightShouldShrink = newContentHeight < self.previousTextViewContentHeight; - - //由于内容的输入，tv应该发生高度的变化，这个值就是应该tv改变的高度差 - CGFloat textViewHeightShouldChangeValue = newContentHeight - _previousTextViewContentHeight; - - //要根据max和minheight重新计算一下高度变化差 - if (!heightShouldShrink && (self.previousTextViewContentHeight == UIInputTextViewMaxHeight || textView.text.length == 0)) { - textViewHeightShouldChangeValue = 0; - } else { - textViewHeightShouldChangeValue = MIN(textViewHeightShouldChangeValue, UIInputTextViewMaxHeight - self.previousTextViewContentHeight); - } - - if (textViewHeightShouldChangeValue != 0.0f) { - //textView的高度有所改变 - __weak QInputBarView *weakSelf = self; - [UIView animateWithDuration:_clearInputTextBySendSoon ? _inputBarHeightChangeAnimationWhenSendDuration : _inputBarHeightChangeAnimationDuration animations:^{ - - if (heightShouldShrink) { - // 如果需要缩放, 先改变tv的高度，再修改bar的高度 - [weakSelf resetTextViewHeightBy:textViewHeightShouldChangeValue]; - } - - //设置本bar的frame - CGRect inputViewFrame = weakSelf.frame; - weakSelf.frame = CGRectMake(inputViewFrame.origin.x, - inputViewFrame.origin.y - textViewHeightShouldChangeValue, - inputViewFrame.size.width, - inputViewFrame.size.height + textViewHeightShouldChangeValue); - - if (!heightShouldShrink) { - //为了兼容低版本ios系统，所以这句代码，不可以跟上面的合并 - [weakSelf resetTextViewHeightBy:textViewHeightShouldChangeValue]; - } - - //回调给QKeyboardManager - if ([self.delegate respondsToSelector:@selector(inputBarView:inputTextView:heightDidChange:becauseSendText:)]) { - [self.delegate inputBarView:self inputTextView:self.inputView heightDidChange:textViewHeightShouldChangeValue becauseSendText:self.clearInputTextBySendSoon]; - } - - } completion:^(BOOL finished) { - }]; - - self.previousTextViewContentHeight = MIN(newContentHeight, UIInputTextViewMaxHeight); - } - - //这一句可以不写，为了保险还是写了 - self.clearInputTextBySendSoon = NO; - - // 达到最大高度的时候（无论textView的高度是否有所改变），要更新tv的ContentOffset，让他滚起来 - if (self.previousTextViewContentHeight == UIInputTextViewMaxHeight) { - double delayInSeconds = 0.01; - dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC)); - dispatch_after(popTime, dispatch_get_main_queue(), - ^(void) { - CGPoint bottomOffset = CGPointMake(0.0f, newContentHeight - textView.bounds.size.height); - [textView setContentOffset:bottomOffset animated:YES]; - }); - } - } -} - - -- (void)dealloc { - _inputedText = nil; - [_inputTextView removeObserver:self forKeyPath:@"contentSize"]; - _inputTextView.delegate = nil; - _inputTextView = nil; - - _voiceSwitchButton = nil; - _extendSwitchButton = nil; - _emotionSwitchButton = nil; - _recordButton = nil; - - [[NIMSDK sharedSDK].mediaManager removeDelegate:self]; -} - - -- (UIButton *)cameraButton { - if (!_cameraButton) { - _cameraButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_cameraButton setImage:[UIImage imageNamed:@"message_session_menu_camera"] forState:UIControlStateNormal]; - [_cameraButton setImage:[UIImage imageNamed:@"message_session_menu_camera"] forState:UIControlStateSelected]; - [_cameraButton addTarget:self action:@selector(camerButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _cameraButton; -} - -- (UIButton *)photoButton { - if (!_photoButton) { - _photoButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_photoButton setImage:[UIImage imageNamed:@"message_session_menu_photo"] forState:UIControlStateNormal]; - [_photoButton setImage:[UIImage imageNamed:@"message_session_menu_photo"] forState:UIControlStateSelected]; - [_photoButton addTarget:self action:@selector(photoButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _photoButton; -} - -- (UIButton *)giftButton { - if (!_giftButton) { - _giftButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_giftButton setImage:[UIImage imageNamed:@"message_session_menu_gift"] forState:UIControlStateNormal]; - [_giftButton setImage:[UIImage imageNamed:@"message_session_menu_gift"] forState:UIControlStateSelected]; - [_giftButton addTarget:self action:@selector(giftButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _giftButton; -} - -- (SessionAudioRecordView *)audioRecordView { - if (!_audioRecordView) { - _audioRecordView = [[SessionAudioRecordView alloc] init]; - } - return _audioRecordView; -} - - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QInputBarViewConfiguration.h b/YuMi/CustomUI/InputView/InputView/QInputBarViewConfiguration.h deleted file mode 100644 index 1894f57..0000000 --- a/YuMi/CustomUI/InputView/InputView/QInputBarViewConfiguration.h +++ /dev/null @@ -1,61 +0,0 @@ -// -// QInputBarViewConfiguration.h -// QKeyBoardDemo -// -// Created by QDong on 2021-8-3. -// Copyright (c) 2021年 QDong QQ:285275534@qq.com. All rights reserved. -// - -#import - -@interface QInputBarViewConfiguration : NSObject - -- (instancetype)init NS_UNAVAILABLE; - - -/** - 默认相册配置 - */ -+ (instancetype)defaultInputBarViewConfiguration; - - -@property (nonatomic, strong) UIColor *inputBarBackgroundColor;//输入条颜色，默认仿微信的灰色 - -@property (nonatomic, strong) UIColor *inputBarBoardColor;//输入条上方的的那一条细横线的颜色 - -@property (nonatomic, strong) UIColor *textColor;//输入栏textview的颜色 - -@property (nonatomic, strong) UIColor *textViewBackgroundColor;//输入栏textview的背景颜色，默认白色 - -@property (nonatomic, strong) UIColor *recordButtonTitleColor;//按住说话按钮的字体颜色 - -@property (nonatomic, strong) UIButton *rightSendButton;//如果不为nil，那么替换掉右边的"+"按钮 //default is nil - -//语音条上的title，当voiceButtonHidden为No时候才有效 -@property (nonatomic, strong) NSString *speakButtonTitle;//default is nil。nil就显示@"按住说话" - -/// 是否隐藏发送语音 -@property (nonatomic, assign) BOOL voiceButtonHidden; // default is NO - -/// 是否隐藏发送多媒体 -@property (nonatomic, assign) BOOL extendButtonHidden; // default is NO - -/// 是否隐藏发送表情 -@property (nonatomic, assign) BOOL emotionButtonHidden; // default is NO - -/// 点击键盘右下角的按钮是否是发送，NO表示普通回车换行，YES表示回调Delegate的Send方法 -@property (nonatomic, assign) BOOL keyboardSendEnabled; // default is YES - -/// 输入栏TextView的高度发送变化的动画时长（秒） -@property (nonatomic, assign) NSTimeInterval inputBarHeightChangeAnimationDuration; // default is 0.2 -/// 是否隐藏底部的操作栏 -@property (nonatomic, assign) BOOL toolHidden; // default is yes -/// 是否隐藏 相册 -@property (nonatomic, assign) BOOL photoButtonHidden; // default is yes -/// 是否隐藏照相机 -@property (nonatomic, assign) BOOL cameraButtonHidden; // default is yes -/// 是否隐藏送礼物按钮 -@property (nonatomic, assign) BOOL giftButtonHidden; // default is yes -///底部操作的高度 -@property (nonatomic,assign) CGFloat inputViewHeight; -@end diff --git a/YuMi/CustomUI/InputView/InputView/QInputBarViewConfiguration.m b/YuMi/CustomUI/InputView/InputView/QInputBarViewConfiguration.m deleted file mode 100644 index aeb9434..0000000 --- a/YuMi/CustomUI/InputView/InputView/QInputBarViewConfiguration.m +++ /dev/null @@ -1,57 +0,0 @@ -// -// QKeyboardConfiguration.m -// QKeyBoardDemo -// -// Created by QDong on 2021-8-3. -// Copyright (c) 2021年 QDong QQ:285275534@qq.com. All rights reserved. -// - -#import "QInputBarViewConfiguration.h" -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" - -@implementation QInputBarViewConfiguration - -+ (instancetype)defaultInputBarViewConfiguration -{ - QInputBarViewConfiguration *configuration = [QInputBarViewConfiguration new]; - -// if (@available(iOS 11.0, *)) { -// NSBundle *bundle = [NSBundle bundleForClass:[QInputBarViewConfiguration class]]; -//// configuration.inputBarBackgroundColor = [UIColor colorNamed:@"q_input_gray_bg" inBundle:bundle compatibleWithTraitCollection:nil]; -// configuration.inputBarBoardColor = [UIColor colorNamed:@"q_border223" inBundle:bundle compatibleWithTraitCollection:nil]; -//// configuration.textColor = [UIColor colorNamed:@"q_black_gray" inBundle:bundle compatibleWithTraitCollection:nil]; -// configuration.textViewBackgroundColor = [UIColor colorNamed:@"q_input" inBundle:bundle compatibleWithTraitCollection:nil]; -// configuration.recordButtonTitleColor = [UIColor colorNamed:@"q_black_white" inBundle:bundle compatibleWithTraitCollection:nil]; -// } else { -// -// -// } - configuration.inputBarBoardColor = [UIColor clearColor]; - configuration.textColor = [UIColor blackColor]; - configuration.recordButtonTitleColor = [UIColor darkGrayColor]; - configuration.inputBarBackgroundColor = [UIColor whiteColor]; - configuration.textViewBackgroundColor = [DJDKMIMOMColor colorWithHexString:@"#F2F2F7"]; - configuration.inputBarHeightChangeAnimationDuration = 0.2; - configuration.keyboardSendEnabled = YES; - configuration.inputBarHeightChangeAnimationDuration = 0.2; - configuration.keyboardSendEnabled = YES; - - configuration.toolHidden = YES; - configuration.cameraButtonHidden = YES; - configuration.giftButtonHidden = YES; - configuration.photoButtonHidden = YES; - return configuration; -} - - -- (void)setToolHidden:(BOOL)toolHidden { - _toolHidden = toolHidden; - if (_toolHidden) { - self.inputViewHeight = 58; - } else { - self.inputViewHeight = 58 + 30; - } -} - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QInputPhototCell.h b/YuMi/CustomUI/InputView/InputView/QInputPhototCell.h deleted file mode 100644 index 8f99eb5..0000000 --- a/YuMi/CustomUI/InputView/InputView/QInputPhototCell.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// QInputPhototCell.h -// YUMI -// -// Created by YUMI on 2023/1/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class QPhotoImageModel, QInputPhototCell; - -@protocol QInputPhototCellDelegate - -- (void)qInputPhototCell:(QInputPhototCell *)view didClickChoose:(QPhotoImageModel *)model; - -@end - -@interface QInputPhototCell : UICollectionViewCell -///图片信息 -@property (nonatomic,strong) QPhotoImageModel *imageInfo; - -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/InputView/InputView/QInputPhototCell.m b/YuMi/CustomUI/InputView/InputView/QInputPhototCell.m deleted file mode 100644 index d984de6..0000000 --- a/YuMi/CustomUI/InputView/InputView/QInputPhototCell.m +++ /dev/null @@ -1,128 +0,0 @@ -// -// QInputPhototCell.m -// YUMI -// -// Created by YUMI on 2023/1/11. -// - -#import "QInputPhototCell.h" -///Third -#import -#import "QPhotoImageModel.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "DJDKMIMOMColor.h" -#import "UIButton+EnlargeTouchArea.h" - -@interface QInputPhototCell () - -///显示图片 -@property (nonatomic,strong) UIImageView *logoImageView; -///选中 -@property (nonatomic,strong) UIButton *chooseButton; -///选中的个数 -@property (nonatomic,strong) UILabel *numberLabel; - -@end - - -@implementation QInputPhototCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.logoImageView]; - [self.contentView addSubview:self.chooseButton]; - [self.contentView addSubview:self.numberLabel]; -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; - - [self.chooseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20, 20)); - make.trailing.top.mas_equalTo(self.contentView).inset(10); - }]; - - [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.equalTo(self.chooseButton); - make.size.mas_equalTo(CGSizeMake(18, 18)); - }]; -} - -#pragma mark - Event Response -- (void)chooseButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - self.imageInfo.isSelect = sender.selected; - if (self.delegate && [self.delegate respondsToSelector:@selector(qInputPhototCell:didClickChoose:)]) { - [self.delegate qInputPhototCell:self didClickChoose:self.imageInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setImageInfo:(QPhotoImageModel *)imageInfo { - _imageInfo = imageInfo; - if (_imageInfo) { - self.numberLabel.hidden = !imageInfo.isSelect; - self.chooseButton.selected = imageInfo.isSelect; - if (!imageInfo.originImage) { - [[TZImageManager manager] getPhotoWithAsset:imageInfo.assetInfo.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) { - self.logoImageView.image = photo; - self.imageInfo.originImage = photo; - UIImage * image = [photo compressWithMaxLength:1024 * 30]; - self.imageInfo.compressImage = image; - } progressHandler:nil networkAccessAllowed:NO]; - } else { - self.logoImageView.image = imageInfo.originImage; - } - self.numberLabel.text = [NSString stringWithFormat:@"%ld", imageInfo.number]; - } -} - -- (UIImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[UIImageView alloc] init]; - _logoImageView.userInteractionEnabled = YES; - _logoImageView.layer.masksToBounds = YES; - _logoImageView.contentMode = UIViewContentModeScaleAspectFill; - _logoImageView.layer.cornerRadius = 4; - } - return _logoImageView; -} - -- (UIButton *)chooseButton { - if (!_chooseButton) { - _chooseButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_chooseButton setBackgroundImage:[UIImage imageNamed:@"session_input_tool_choose_normal"] forState:UIControlStateNormal]; - [_chooseButton setBackgroundImage:[UIImage imageNamed:@"session_input_tool_choose_normal"] forState:UIControlStateSelected]; - [_chooseButton addTarget:self action:@selector(chooseButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_chooseButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _chooseButton; -} - - -- (UILabel *)numberLabel { - if (!_numberLabel) { - _numberLabel = [[UILabel alloc] init]; - _numberLabel.font = [UIFont systemFontOfSize:10]; - _numberLabel.textColor = [UIColor whiteColor]; - _numberLabel.backgroundColor = [DJDKMIMOMColor colorWithHexString:@"#5FCCE4"]; - _numberLabel.layer.masksToBounds = YES; - _numberLabel.layer.cornerRadius = 9; - _numberLabel.textAlignment = NSTextAlignmentCenter; - } - return _numberLabel; -} - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QKeyboardBaseManager.h b/YuMi/CustomUI/InputView/InputView/QKeyboardBaseManager.h deleted file mode 100755 index a6b3860..0000000 --- a/YuMi/CustomUI/InputView/InputView/QKeyboardBaseManager.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// QKeyboardBaseManager.h -// QKeyBoardDemo -// -// Created by QDong on 2021-8-3. -// Copyright (c) 2021年 QDong QQ:285275534@qq.com. All rights reserved. -// - -#import -#import "QInputBarViewConfiguration.h" - -@interface QKeyboardBaseManager : NSObject - -- (instancetype)initWithViewController:(UIViewController *)viewController; - -@property (nonatomic, weak) UIViewController *viewController;//当前vc - -// 输入栏TextView的高度发送变化的动画时长（秒） -@property (nonatomic, assign) NSTimeInterval inputBarHeightChangeAnimationDuration; // default is 0.2 - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QKeyboardBaseManager.m b/YuMi/CustomUI/InputView/InputView/QKeyboardBaseManager.m deleted file mode 100755 index 04b5100..0000000 --- a/YuMi/CustomUI/InputView/InputView/QKeyboardBaseManager.m +++ /dev/null @@ -1,102 +0,0 @@ -// -// QKeyboardBaseManager.m -// QKeyBoardDemo -// -// Created by QDong on 2021-8-3. -// Copyright (c) 2021年 QDong QQ:285275534@qq.com. All rights reserved. -// - -#import "QKeyboardBaseManager.h" - -@interface QKeyboardBaseManager() - -@end - -@implementation QKeyboardBaseManager - -- (instancetype)initWithViewController:(UIViewController *)viewController { - self = [super init]; - if (self) { - self.viewController = viewController; - - // 键盘通知 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(onKeyboardWillShowNotification:) - name:UIKeyboardWillShowNotification - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(onKeyboardWillHideNotification:) - name:UIKeyboardWillHideNotification - object:nil]; - - //经过DQ测试，ios13死活收不到UIKeyboardDidShowNotification，情况不明 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(onKeyboardDidShowNotification:) - name:UIKeyboardDidShowNotification - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(onKeyboardDidHideNotification:) - name:UIKeyboardDidHideNotification - object:nil]; - - // 输入栏TextView的高度发送变化的动画时长（秒） - self.inputBarHeightChangeAnimationDuration = 0.2; - } - return self; -} - -#pragma mark - Keyboard notifications -- (void)onKeyboardDidShowNotification:(NSNotification *)notification { - -} - -- (void)onKeyboardDidHideNotification:(NSNotification *)notification { - -} - -//在模拟器上测试：如果模拟器的键盘无法弹出，那么点击输入栏不会收到WillShowNotification，而是直接收到WillHideNotification，但是这种情况下依然会走textViewShouldBeginEditing -- (void)onKeyboardWillShowNotification:(NSNotification *)notification { - CGRect keyboardRect = [[notification.userInfo objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]; - UIViewAnimationCurve curve = [[notification.userInfo objectForKey:UIKeyboardAnimationCurveUserInfoKey] integerValue]; - double duration = [[notification.userInfo objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue]; - [self onKeyboardWillShowOrHideByNotifications:keyboardRect animationOptions:[self animationOptionsForCurve:curve] duration:duration showKeyboard:YES]; -} - -- (void)onKeyboardWillHideNotification:(NSNotification *)notification { - CGRect keyboardRect = [[notification.userInfo objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]; - UIViewAnimationCurve curve = [[notification.userInfo objectForKey:UIKeyboardAnimationCurveUserInfoKey] integerValue]; - double duration = [[notification.userInfo objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue]; - [self onKeyboardWillShowOrHideByNotifications:keyboardRect animationOptions:[self animationOptionsForCurve:curve] duration:duration showKeyboard:NO]; -} - -#pragma mark - Need Override -- (void)onKeyboardWillShowOrHideByNotifications:(CGRect)keyboardRect animationOptions:(UIViewAnimationOptions)animationOptions duration:(double)duration showKeyboard:(BOOL)showKeyboard { -} - -- (UIViewAnimationOptions)animationOptionsForCurve:(UIViewAnimationCurve)curve { - switch (curve) { - case UIViewAnimationCurveEaseInOut: - return UIViewAnimationOptionCurveEaseInOut; - - case UIViewAnimationCurveEaseIn: - return UIViewAnimationOptionCurveEaseIn; - - case UIViewAnimationCurveEaseOut: - return UIViewAnimationOptionCurveEaseOut; - - case UIViewAnimationCurveLinear: - return UIViewAnimationOptionCurveLinear; - - default: - return kNilOptions; - } -} - - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QKeyboardManager.h b/YuMi/CustomUI/InputView/InputView/QKeyboardManager.h deleted file mode 100755 index 72eeb96..0000000 --- a/YuMi/CustomUI/InputView/InputView/QKeyboardManager.h +++ /dev/null @@ -1,91 +0,0 @@ -// -// QKeyboardBaseManager.h -// QKeyboardQKeyboard -// -// Created by QDong on 2021-8-3. -// Copyright (c) 2021年 QDong QQ:285275534@qq.com. All rights reserved. -// - -#import "QKeyboardBaseManager.h" - -@class QKeyboardManager; - -@protocol InputBoardDataSource -@optional - -//@return 点加号按钮弹出的拓展面板View，且无需设置frame -- (UIView *)keyboardManagerExtendBoardView:(QKeyboardManager *)keyboardManager; - -//@return 点表情按钮弹出的表情面板View，且无需设置frame -- (UIView *)keyboardManagerEmotionBoardView:(QKeyboardManager *)keyboardManager; - -//@return 点加号按钮弹出的拓展面板View的高度 -- (CGFloat)keyboardManagerExtendBoardHeight:(QKeyboardManager *)keyboardManager; - -//@return 点表情按钮弹出的表情面板View的高度 -- (CGFloat)keyboardManagerEmotionBoardHeight:(QKeyboardManager *)keyboardManager; - -//@return 点表情按钮弹出的选择图片View，且无需设置frame -- (UIView *)keyboardManagerPhotoBoardView:(QKeyboardManager *)keyboardManager; - -//@return 选择图片的高度 -- (CGFloat)keyboardManagerPhotoBoardHeight:(QKeyboardManager *)keyboardManager; - -@end - -//整个”输入View“的高度发生变化的原因（整个输入View包含bar和表情栏或者键盘） -typedef NS_ENUM(NSUInteger, WholeInputViewHeightDidChangeReason) { - WholeInputViewHeightDidChangeReasonWillAddToSuperView = 0, //因为输入条被add到vc中 - WholeInputViewHeightDidChangeReasonTextDidChange,//因为文本框输入的内容高度发生变化 - WholeInputViewHeightDidChangeReasonTextDidSend,//因为点“发送”按钮所以清空了文本框 2022-03-24与上面那条区分开 - WholeInputViewHeightDidChangeReasonBoardDidShow,//显示了 软键盘or面板（表情面板或者拓展面板） - WholeInputViewHeightDidChangeReasonBoardDidHide,//隐藏了 软键盘or面板（表情面板或者拓展面板） -}; - -@protocol InputBoardDelegate - -@optional - -//整个输入View的高度发生变化（整个View包含bar和表情栏或者键盘，但是不包含底部安全区高度） -//会触发这个的原因：1、addBottomInputBarView；2、输入文字换行了；3、切换面板；4、呼出键盘 -//Warning：这个回调方法的触发已经在animate中了，无需再在本方法里写animate -- (void)keyboardManager:(QKeyboardManager *)keyboardManager onWholeInputViewHeightDidChange:(CGFloat)wholeInputViewHeight reason:(WholeInputViewHeightDidChangeReason)reason; - -@end - -@interface QKeyboardManager : QKeyboardBaseManager - -@property (nonatomic, weak) id dataSource; - -@property (nonatomic, weak) id delegate; - -//viewController是否要走viewWillDisappear；为了解决：键盘弹出状态下vc侧滑返回，会触发Notification进而影响inputBarView.frame的bug -@property(nonatomic, assign) BOOL viewControllerWillDisappear; - -/** - * public - 添加底部输入框View - * @param belowViewController ：YES表示输入框平时不显示（比如朋友圈）；NO表示平时也显示（比如聊天） - */ -- (void)addBottomInputBarView:(UIView *)inputBarView belowViewController:(BOOL)belowViewController; - -// public - 为了方便动画切换，本Manager类需要拿到textview或textField的引用，如果有输入条，请传过来；没有输入条可以不调用该方法 -- (void)bindTextView:(UIResponder *)inputTextView; - -// public - 底部的输入框高度发生变化，becauseSendText: 是因为点击了“发送”按钮清空了文本进而导致了输入栏高度变化 -- (void)inputTextViewHeightDidChange:(BOOL)becauseSendText; - -// public - 隐藏所有面板，包括表情面板和拓展面板 -- (void)hideAllBoardView; - -// public - 表情面板和键盘之间的切换 -- (void)switchToEmotionBoardKeyboard; - -// public - 拓展面板和键盘之间的切换 -- (void)switchToExtendBoardKeyboard; - -// public - 切换到选择图片，toExtendBoardView -- (void)switchToPhotoBoardKeyboard; - -// public - 切换到拓展面板，toExtendBoardView -- (void)switchToAudioBoardKeyboard; -@end diff --git a/YuMi/CustomUI/InputView/InputView/QKeyboardManager.m b/YuMi/CustomUI/InputView/InputView/QKeyboardManager.m deleted file mode 100755 index 60d82fd..0000000 --- a/YuMi/CustomUI/InputView/InputView/QKeyboardManager.m +++ /dev/null @@ -1,426 +0,0 @@ -// -// QKeyboardManager.m -// QKeyBoardDemo -// -// Created by QDong on 2021-8-3. -// Copyright (c) 2021年 QDong QQ:285275534@qq.com. All rights reserved. -// - -#import "QKeyboardManager.h" -#import "QinputPhotoView.h" -typedef NS_ENUM(NSUInteger, InputState) { - InputStateNormal = 0, //默认状态，没弹出键盘 也没弹出表情 也没弹出extend面板 - InputStateText,//弹出软键盘状态 - InputStateEmotion,//弹出表情状态 - InputStateExtend,//弹出extend面板状态 - InputStatePhoto,//弹出选择图片 -}; - -@interface QKeyboardManager() - -//true：输入条平时是不显示出来的；false：输入条一直都在vc底部 -@property (nonatomic, assign) BOOL inputBarBelowViewController; - -//当前的输入状态 -@property (nonatomic, assign) InputState currentInputState; - -//输入条，由vc传过来，一般情况下，这个输入框是inputBar的子view，但是也可能不是（比如发微博界面） -@property (nonatomic, weak, nullable) UIResponder *inputTextView; - -//那一条输入框bar，由vc传过来，包含了左右的按钮 -@property (nonatomic, strong, nullable) UIView *inputBarView; - -@property (nonatomic, strong, nullable) UIView *emotionBoardView; - -@property (nonatomic, strong, nullable) UIView *extendBoardView; -@property (nonatomic, strong, nullable) UIView *photoBoardView; - -//iPhoneX底部距离 -@property (nonatomic, assign) float safeAreaInsetsBottom; - -//iPhoneX系列手机上，如果手指快速向上滑动tableView，那么会出现0.1秒的"可以透过inputBar和底部安全区中间看到背景tableView"。为了解决这个细小的问题，我加入了这个 -@property (nonatomic, strong, nullable) UIView *belowInputBarXView; - -@end - -@implementation QKeyboardManager - -#pragma mark - public 添加底部输入框View -- (void)addBottomInputBarView:(UIView *)inputBarView belowViewController:(BOOL)belowViewController { - - if (@available(iOS 11.0, *)) { - //如果是x，给底部的34pt添加上背景颜色，颜色和输入条一致 - _safeAreaInsetsBottom = UIApplication.sharedApplication.windows.firstObject.safeAreaInsets.bottom; - if (_safeAreaInsetsBottom > 0 && !belowViewController) { - //iPhoneX 且 聊天界面VC（即输入条固定在底部）就会进入这里 - //我添加了一个和输入条背景颜色一样的普通View在inputView的底部 - _belowInputBarXView = [[UIView alloc] initWithFrame:CGRectMake(0, self.viewController.view.frame.size.height - _safeAreaInsetsBottom , self.viewController.view.frame.size.width, _safeAreaInsetsBottom)]; - _belowInputBarXView.autoresizingMask = (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin); - _belowInputBarXView.backgroundColor = inputBarView.backgroundColor; - [self.viewController.view addSubview:_belowInputBarXView]; - [self.viewController.view bringSubviewToFront:_belowInputBarXView]; - } - } - - //注意这里，系统会自动调整inputBarView的y和width - inputBarView.autoresizingMask = (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin); - - // 工具条的frame - CGRect inputFrame = CGRectMake(0.0f,self.viewController.view.frame.size.height + (belowViewController ? 0 : (- inputBarView.frame.size.height - self.safeAreaInsetsBottom)), - self.viewController.view.frame.size.width, - inputBarView.frame.size.height); - - // vc创建的工具条，本类负责设置frame和addSubview - inputBarView.frame = inputFrame; - - [self.viewController.view addSubview:inputBarView]; - [self.viewController.view bringSubviewToFront:inputBarView]; - - //因为底部添加了输入条；回调给vc，让vc处理界面的tableview的frame - [self callBackWholeInputViewHeightDidChange:belowViewController ? 0 : inputBarView.frame.size.height reason:WholeInputViewHeightDidChangeReasonWillAddToSuperView]; - - self.inputBarView = inputBarView; - self.inputBarBelowViewController = belowViewController; -} - -//public - 由vc调用该方法，让本manager类拿到textView的引用 -- (void)bindTextView:(UIResponder *)inputTextView { - self.inputTextView = inputTextView; -} - -#pragma mark - DataSource - 由ViewController实现表情面板view和拓展面板view -- (UIView * _Nullable)extendBoardView { - if (!_extendBoardView) { - if ([self.dataSource respondsToSelector:@selector(keyboardManagerExtendBoardView:)]) { - _extendBoardView = [self.dataSource keyboardManagerExtendBoardView:self]; - CGFloat extendBoardHeight = 220;//默认高度 - if ([self.dataSource respondsToSelector:@selector(keyboardManagerExtendBoardHeight:)]) { - extendBoardHeight = [self.dataSource keyboardManagerExtendBoardHeight:self]; - } - _extendBoardView.frame = CGRectMake(0, CGRectGetHeight(self.viewController.view.bounds), CGRectGetWidth(self.viewController.view.bounds), extendBoardHeight); - _extendBoardView.alpha = 0.0; - [self.viewController.view addSubview:_extendBoardView]; - [self.viewController.view bringSubviewToFront:_extendBoardView]; - } - } - return _extendBoardView; -} - -- (UIView * _Nullable)emotionBoardView { - if (!_emotionBoardView) { - if ([self.dataSource respondsToSelector:@selector(keyboardManagerEmotionBoardView:)]) { - _emotionBoardView = [self.dataSource keyboardManagerEmotionBoardView:self]; - CGFloat emotionBoardHeight = 220;//默认高度 - if ([self.dataSource respondsToSelector:@selector(keyboardManagerEmotionBoardHeight:)]) { - emotionBoardHeight = [self.dataSource keyboardManagerEmotionBoardHeight:self]; - } - _emotionBoardView.frame = CGRectMake(0, CGRectGetHeight(self.viewController.view.bounds), CGRectGetWidth(self.viewController.view.bounds), emotionBoardHeight); - _emotionBoardView.alpha = 0.0; - [self.viewController.view addSubview:_emotionBoardView]; - [self.viewController.view bringSubviewToFront:_emotionBoardView]; - } - } - return _emotionBoardView; -} - -- (UIView * _Nullable)photoBoardView { - if (!_photoBoardView) { - if ([self.dataSource respondsToSelector:@selector(keyboardManagerPhotoBoardView:)]) { - _photoBoardView = [self.dataSource keyboardManagerPhotoBoardView:self]; - CGFloat emotionBoardHeight = 220;//默认高度 - if ([self.dataSource respondsToSelector:@selector(keyboardManagerEmotionBoardHeight:)]) { - emotionBoardHeight = [self.dataSource keyboardManagerPhotoBoardHeight:self]; - } - _photoBoardView.frame = CGRectMake(0, CGRectGetHeight(self.viewController.view.bounds), CGRectGetWidth(self.viewController.view.bounds), emotionBoardHeight); - _photoBoardView.alpha = 0.0; - [self.viewController.view addSubview:_photoBoardView]; - [self.viewController.view bringSubviewToFront:_photoBoardView]; - } - } - return _photoBoardView; -} - -#pragma mark - Override Keyboard notifications -//Private 只有通过系统的键盘广播触发到这里 -- (void)onKeyboardWillShowOrHideByNotifications:(CGRect)keyboardRect animationOptions:(UIViewAnimationOptions)animationOptions duration:(double)duration showKeyboard:(BOOL)showKeyboard { - - if (![self.inputTextView isFirstResponder]) { - //本次弹出软键盘并不是因为我们的输入框，而是有别的输入框 - return; - } - - if (self.viewControllerWillDisappear) { - //为了解决：键盘弹出状态下vc侧滑返回，会触发Notification进而影响inputBarView.frame的bug - return; - } - - //马上要弹出键盘了，先看看当前的状态是哪个BoardView，一会要把它隐藏掉 - InputState previousInputState = self.currentInputState; - - if (showKeyboard) { - //马上要显示软键盘了，设置当前state为Text模式。 - self.currentInputState = InputStateText; - } - - //如果不做下面这个 if == InputStateText判断，会导致表情板（或拓展面板）和键盘切换时候inputbar会晃动 - //Q：为什么会抖动？ - //A：软键盘切换到表情面板时：先调用hideKeyboardAndSwitchToCurrentBoardView方法去做动画，这时候State == InputStateEmotion。但是这时候由于软键盘收到了收起通知，也会进入到这里，这里也做了动画。两个动画冲突了 - //所以加上State == InputStateText，来确保弹出表情板时候不走下面的代码，进而让上述两个动画不会同时执行 - - //Q：为了避免上述抖动问题，为什么不换成if (showKeyboard)？ - //A：因为如果是单纯的键盘收起其实还是要走下面的代码的；单纯的收起键盘时候showKeyboard为false，State为InputStateText - - if (self.currentInputState == InputStateText) { - - CGFloat keyboardY = [self.viewController.view convertRect:keyboardRect fromView:nil].origin.y; - - [UIView animateWithDuration:duration - delay:0.0 - options:animationOptions - animations:^{ - - [self layoutInputBarView:keyboardY boardAllHide:!showKeyboard]; - - if (showKeyboard){ - //键盘Notifition要willShow软键盘 - switch (previousInputState) { - case InputStateEmotion: { - [self switchEmotionBoardView:YES]; - break; - } - case InputStateExtend: { - [self switchExtendBoardView:YES]; - break; - } - case InputStatePhoto: { - [self switchPhotoBoardView:YES]; - break; - } - default: - break; - } - } else { - //当前本来就已经是软键盘输入文本 && 是键盘Notifition要willHide软键盘 - //进入这里的可能性：1、软键盘上的“收起键盘”按钮，2、点击左边的语音按钮，3、vc调用了tv.resignFirstResponder。 而vc调用hideAll的时候，会被hideKeyboardAndSwitchToCurrentBoardView吸收掉，并不会进入这里 - self.currentInputState = InputStateNormal; - } - - //回调给ViewController - [self callBackWholeInputViewHeightDidChange:self.viewController.view.frame.size.height - - self.inputBarView.frame.origin.y - self.safeAreaInsetsBottom reason:showKeyboard ? WholeInputViewHeightDidChangeReasonBoardDidShow : WholeInputViewHeightDidChangeReasonBoardDidHide]; - - } completion:nil]; - } -} - - -#pragma mark - private -/** - * private 切换（或者隐藏）当前面板； --------->>>>>> 如果是切换，调用该方法前需要设置好currentInputState <<<<<<<----------- - * @param allBoardHide yes == 隐藏所有面板，no == 显示currentInputState对应的面板（但是前提是设置好state） - */ -- (void)hideKeyboardAndSwitchToCurrentBoardView:(BOOL)allBoardHide { - - if (allBoardHide && self.currentInputState == InputStateText) { - //隐藏所有面板 && 当前是软键盘，由vc调用->hideAllBoardView(YES)->进入这里 - - //Q：为什么要在这里就把state设置为Normal？ - //A：因为下面的resignFirstResponder会触发系统Notifications -> 进入onKeyboardWillShowOrHideByNotifications方法 - // -> if (self.currentInputState == InputStateText) -> self.layoutInputBarView ; self.callBack; - // - // 但是本方法下面已经实现了self.layoutInputBarView ; self.callBack; - // 所以这里把state设置为Normal就是避免再重复走上述方法，上述方法只是处理软键盘上的“收起键盘”按钮 - self.currentInputState = InputStateNormal; - } - - //无论是显示某个面板，还是隐藏所有面板，都要先让输入框失去焦点，然后再进行切换动画 - [self.inputTextView resignFirstResponder]; - //初始化一下面板view。如果在下面的动画代码里才初始化，会导致从左上角飘移进入 - [self extendBoardView]; - [self emotionBoardView]; - - [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ - - CGRect currentBoardViewFrame = CGRectZero; - if (allBoardHide) { - //表示隐藏掉两个面板 - switch (self.currentInputState) { - case InputStateEmotion: { - currentBoardViewFrame = [self switchEmotionBoardView:allBoardHide]; - break; - } - case InputStateExtend: { - currentBoardViewFrame = [self switchExtendBoardView:allBoardHide]; - break; - } - case InputStatePhoto: { - currentBoardViewFrame = [self switchPhotoBoardView:allBoardHide]; - break; - } - default: - break; - } - } else { - //这里需要注意方法的执行顺序 - switch (self.currentInputState) { - case InputStateEmotion: { - // 1、先隐藏和自己无关的View - currentBoardViewFrame = [self switchPhotoBoardView:!allBoardHide]; - // 1、先隐藏和自己无关的View - currentBoardViewFrame = [self switchExtendBoardView:!allBoardHide]; - // 2、再显示和自己相关的View - currentBoardViewFrame = [self switchEmotionBoardView:allBoardHide]; - break; - } - case InputStateExtend: { - // 1、先隐藏和自己无关的View - currentBoardViewFrame = [self switchPhotoBoardView:!allBoardHide]; - // 1、先隐藏和自己无关的View - currentBoardViewFrame = [self switchEmotionBoardView:!allBoardHide]; - // 2、再显示和自己相关的View - currentBoardViewFrame = [self switchExtendBoardView:allBoardHide]; - break; - } - case InputStatePhoto: { - // 1、先隐藏和自己无关的View - currentBoardViewFrame = [self switchEmotionBoardView:!allBoardHide]; - currentBoardViewFrame = [self switchExtendBoardView:!allBoardHide]; - currentBoardViewFrame = [self switchPhotoBoardView:allBoardHide]; - break; - } - default: - break; - } - } - - //重设InputBarView的frame - [self layoutInputBarView:CGRectGetMinY(currentBoardViewFrame) boardAllHide:allBoardHide]; - - //回调给ViewController - [self callBackWholeInputViewHeightDidChange:self.viewController.view.frame.size.height - - self.inputBarView.frame.origin.y - self.safeAreaInsetsBottom reason:allBoardHide ? WholeInputViewHeightDidChangeReasonBoardDidHide : WholeInputViewHeightDidChangeReasonBoardDidShow]; - - } completion:^(BOOL finished) { - if (allBoardHide) { - self.currentInputState = InputStateNormal; - } - }]; -} - -/** - * private 显示（no）或者 隐藏（yes）表情面板 - * @return 表情面板的Frame - **/ -- (CGRect)switchEmotionBoardView:(BOOL)hide { - CGRect prevFrame = self.emotionBoardView.frame; - prevFrame.origin.y = (hide ? CGRectGetHeight(self.viewController.view.frame) : (CGRectGetHeight(self.viewController.view.frame) - CGRectGetHeight(prevFrame))); - self.emotionBoardView.alpha = !hide; - self.emotionBoardView.frame = prevFrame; - return prevFrame; -} - -/** - * private 显示（no）或者 隐藏（yes）拓展面板 - * @return 拓展面板的Frame - **/ -- (CGRect)switchExtendBoardView:(BOOL)hide { - CGRect prevFrame = self.extendBoardView.frame; - prevFrame.origin.y = (hide ? CGRectGetHeight(self.viewController.view.frame) : (CGRectGetHeight(self.viewController.view.frame) - CGRectGetHeight(prevFrame))); - self.extendBoardView.alpha = !hide; - self.extendBoardView.frame = prevFrame; - return prevFrame; -} - -- (CGRect)switchPhotoBoardView:(BOOL)hide { - CGRect prevFrame = self.photoBoardView.frame; - prevFrame.origin.y = (hide ? CGRectGetHeight(self.viewController.view.frame) : (CGRectGetHeight(self.viewController.view.frame) - CGRectGetHeight(prevFrame))); - self.photoBoardView.alpha = !hide; - self.photoBoardView.frame = prevFrame; - return prevFrame; -} - -/** - * private 依据当前面板切换，来决定输入条view的frame - * @param currentBoardViewMinY 当前面板的Frame的minY - * @param boardAllHide yes 表示所有面板都是隐藏的状态，no 但凡有一个面板没隐藏 - **/ -- (void)layoutInputBarView:(CGFloat)currentBoardViewMinY boardAllHide:(BOOL)boardAllHide { - CGRect prevInputViewFrame = self.inputBarView.frame; - if (boardAllHide) { - //隐藏掉两个面板 - CGFloat hidedFrameY = CGRectGetHeight(self.viewController.view.bounds); - if (!self.inputBarBelowViewController){ - hidedFrameY -= CGRectGetHeight(prevInputViewFrame); - hidedFrameY -= self.safeAreaInsetsBottom; - } - prevInputViewFrame.origin.y = hidedFrameY; - } else { - prevInputViewFrame.origin.y = currentBoardViewMinY - CGRectGetHeight(prevInputViewFrame); - } - self.inputBarView.frame = prevInputViewFrame; - - CGRect belowInputBarXViewFrame = self.belowInputBarXView.frame; - self.belowInputBarXView.frame = CGRectMake(belowInputBarXViewFrame.origin.x, CGRectGetMaxY(self.inputBarView.frame), belowInputBarXViewFrame.size.width, belowInputBarXViewFrame.size.height); -} - -//private -- (void)callBackWholeInputViewHeightDidChange:(CGFloat)wholeInputViewHeight reason:(WholeInputViewHeightDidChangeReason)reason { - if ([_delegate respondsToSelector:@selector(keyboardManager:onWholeInputViewHeightDidChange:reason:)]){ - [_delegate keyboardManager:self onWholeInputViewHeightDidChange:wholeInputViewHeight reason:reason]; - } -} - -#pragma mark - public -// public - 底部的输入框高度发生变化，changeValue 高度变化值 -- (void)inputTextViewHeightDidChange:(BOOL)becauseSendText { - //回调给ViewController - [self callBackWholeInputViewHeightDidChange: self.viewController.view.frame.size.height - - self.inputBarView.frame.origin.y - _safeAreaInsetsBottom reason: becauseSendText ? WholeInputViewHeightDidChangeReasonTextDidSend : WholeInputViewHeightDidChangeReasonTextDidChange]; -} - -// public - 隐藏所有面板，包括表情面板和拓展面板 和 软键盘 -- (void)hideAllBoardView { - if (self.currentInputState != InputStateNormal) { - //说明当前要么是键盘，要么是表情面板或者拓展面板 - [self hideKeyboardAndSwitchToCurrentBoardView:YES]; - } -} - -// public - 切换到表情面板，toEmotionBoardView -- (void)switchToEmotionBoardKeyboard { - //先设置全局变量State为表情State - self.currentInputState = InputStateEmotion; - - //NO表示是要显示当前面板（即InputStateEmotion） - [self hideKeyboardAndSwitchToCurrentBoardView:NO]; -} - -// public - 切换到拓展面板，toExtendBoardView -- (void)switchToExtendBoardKeyboard { - //先设置全局变量State为拓展State - self.currentInputState = InputStateExtend; - - //NO表示是要显示当前面板（即InputStateExtend） - [self hideKeyboardAndSwitchToCurrentBoardView: NO]; -} - -// public - 切换到选择图片，toExtendBoardView -- (void)switchToPhotoBoardKeyboard { - //先设置全局变量State为拓展State - self.currentInputState = InputStatePhoto; - //NO表示是要显示当前面板（即InputStatePhoto） - [self hideKeyboardAndSwitchToCurrentBoardView: NO]; -} - -// public - 切换到拓展面板，toExtendBoardView -- (void)switchToAudioBoardKeyboard { - //先设置全局变量State为拓展State - self.currentInputState = InputStateNormal; - //NO表示是要显示当前面板（即InputStateExtend） - [self hideKeyboardAndSwitchToCurrentBoardView: YES]; -} - -//顺便提一句：切换到软键盘是靠系统的[textView becomeFirstResponder]; 然后会触发键盘的Notification，然后就进入我上面封装的onKeyboardWillShowOrHideByNotifications方法 - - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QPhotoImageModel.h b/YuMi/CustomUI/InputView/InputView/QPhotoImageModel.h deleted file mode 100644 index e5e81bc..0000000 --- a/YuMi/CustomUI/InputView/InputView/QPhotoImageModel.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// QPhotoImageModel.h -// YUMI -// -// Created by YUMI on 2023/1/11. -// - -#import -#import -NS_ASSUME_NONNULL_BEGIN - -@interface QPhotoImageModel : PIBaseModel -///是否选中 -@property (nonatomic,assign) BOOL isSelect; -///是否是原图 -@property (nonatomic,assign) BOOL isOrigin; -///图片信息 -@property (nonatomic,strong) TZAssetModel *assetInfo; -///图片 -@property (nonatomic,strong) UIImage *originImage; -///缩略图 -@property (nonatomic,strong) UIImage *compressImage; -///个数 -@property (nonatomic,assign) NSInteger number; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/InputView/InputView/QPhotoImageModel.m b/YuMi/CustomUI/InputView/InputView/QPhotoImageModel.m deleted file mode 100644 index 02d9468..0000000 --- a/YuMi/CustomUI/InputView/InputView/QPhotoImageModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// QPhotoImageModel.m -// YUMI -// -// Created by YUMI on 2023/1/11. -// - -#import "QPhotoImageModel.h" - -@implementation QPhotoImageModel - -@end diff --git a/YuMi/CustomUI/InputView/InputView/QinputPhotoView.h b/YuMi/CustomUI/InputView/InputView/QinputPhotoView.h deleted file mode 100644 index ae4ca2d..0000000 --- a/YuMi/CustomUI/InputView/InputView/QinputPhotoView.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// QinputPhotoView.h -// YUMI -// -// Created by YUMI on 2023/1/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class QinputPhotoView; -@protocol QinputPhotoViewDelegate - -///点击选择相册 -- (void)qinputPhotoView:(QinputPhotoView *)view didClickPhoto:(UIButton *)sender; -///发送图片 -- (void)qinputPhotoView:(QinputPhotoView *)view didClickSend:(NSArray *)photoList; -@end - -@interface QinputPhotoView : UIView - -@property (nonatomic,strong) NSArray *photoList; -///代理 -@property (nonatomic,weak) id delegate; -///是否选择原图 -@property (nonatomic,assign) BOOL isOrigin; - -///重置 -- (void)resetChoosePhotos; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/InputView/InputView/QinputPhotoView.m b/YuMi/CustomUI/InputView/InputView/QinputPhotoView.m deleted file mode 100644 index 3d5a468..0000000 --- a/YuMi/CustomUI/InputView/InputView/QinputPhotoView.m +++ /dev/null @@ -1,237 +0,0 @@ -// -// QinputPhotoView.m -// YUMI -// -// Created by YUMI on 2023/1/11. -// - -#import "QinputPhotoView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "NSArray+Safe.h" -#import "XNDJTDDLoadingTool.h" -///Model -#import "QPhotoImageModel.h" -///View -#import "QInputPhototCell.h" - -@interface QinputPhotoView () - -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///相册 -@property (nonatomic,strong) UIButton *photoButton; -///原图 -@property (nonatomic,strong) UIButton *originButton; -///发送按钮 -@property (nonatomic,strong) UIButton *sendButton; -///选择发送的图片 -@property (nonatomic,strong) NSMutableArray *chooseArray; - -@end - -@implementation QinputPhotoView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Public Method -- (void)resetChoosePhotos { - [self.chooseArray removeAllObjects]; - for (QPhotoImageModel * model in self.photoList) { - model.isSelect = NO; - } - [self.collectionView reloadData]; - if (self.photoList.count > 0) { - [self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0] atScrollPosition:UICollectionViewScrollPositionNone animated:NO]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.collectionView]; - [self addSubview:self.photoButton]; - [self addSubview:self.originButton]; - [self addSubview:self.sendButton]; -} - -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.equalTo(self).offset(0); - make.height.mas_equalTo(138 + 16); - }]; - - [self.photoButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(16); - make.top.mas_equalTo(self.collectionView.mas_bottom).offset(1); - }]; - - [self.originButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(25); - make.width.mas_equalTo(100); - make.leading.mas_equalTo(self.photoButton.mas_trailing).offset(20); - make.centerY.mas_equalTo(self.photoButton); - }]; - - [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(56, 22)); - make.trailing.mas_equalTo(self).offset(-16); - make.centerY.mas_equalTo(self.photoButton); - }]; -} - -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.photoList.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - QInputPhototCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([QInputPhototCell class]) forIndexPath:indexPath]; -QPhotoImageModel * imageInfo = [self.photoList xpSafeObjectAtIndex:indexPath.row]; - cell.imageInfo = imageInfo; - cell.delegate = self; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; -} - -#pragma mark - QInputPhototCell -- (void)qInputPhototCell:(QInputPhototCell *)view didClickChoose:(QPhotoImageModel *)model { - model.isOrigin = self.isOrigin; - if (self.chooseArray.count > 9) { - model.isSelect = NO; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"QinputPhotoView0")]; - [self.collectionView reloadData]; - return; - } - - if (model.isSelect) { - if (![self.chooseArray containsObject:model]) { - [self.chooseArray addObject:model]; - } - if ([self.photoList containsObject:model]) { - NSInteger index = [self.photoList indexOfObject:model]; - if(index + 1 < self.photoList.count){ - [self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:index + 1 inSection:0] atScrollPosition:UICollectionViewScrollPositionRight animated:YES]; - } - - } - model.number = self.chooseArray.count; - } else { - - for (QPhotoImageModel * imageModel in self.chooseArray) { - if (imageModel.number > model.number) { - imageModel.number -=1; - } - } - - if ([self.chooseArray containsObject:model]) { - [self.chooseArray removeObject:model]; - } - } - - [self.collectionView reloadData]; -} - -#pragma mark - Event Response -- (void)photoButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(qinputPhotoView:didClickPhoto:)]) { - [self.delegate qinputPhotoView:self didClickPhoto:sender]; - } -} - -- (void)originButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - self.isOrigin = sender.selected; -} - -- (void)sendButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(qinputPhotoView:didClickSend:)]) { - [self.delegate qinputPhotoView:self didClickSend:self.chooseArray]; - } -} - -#pragma mark - Getters And Setters -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - layout.itemSize = CGSizeMake(95, 138); - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.minimumLineSpacing = 10; - layout.sectionInset = UIEdgeInsetsMake(0, 8, 8, 8); - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.showsHorizontalScrollIndicator = NO; - if (@available(iOS 11.0, *)) { - _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - _collectionView.backgroundColor = [DJDKMIMOMColor colorWithHexString:@"#F4F4FA"]; - [_collectionView registerClass:[QInputPhototCell class] forCellWithReuseIdentifier:NSStringFromClass([QInputPhototCell class])]; - } - return _collectionView; -} - -- (UIButton *)photoButton { - if (!_photoButton) { - _photoButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_photoButton setTitle:YMLocalizedString(@"QinputPhotoView1") forState:UIControlStateNormal]; - [_photoButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _photoButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_photoButton addTarget:self action:@selector(photoButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _photoButton; -} - -- (UIButton *)originButton { - if (!_originButton) { - _originButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_originButton setTitle:YMLocalizedString(@"QinputPhotoView2") forState:UIControlStateNormal]; - [_originButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _originButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_originButton setImage:[UIImage imageNamed:@"session_input_tool_choose_normal"] forState:UIControlStateNormal]; - [_originButton setImage:[UIImage imageNamed:@"session_input_tool_choose_select"] forState:UIControlStateSelected]; - _originButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - [_originButton setImageEdgeInsets:UIEdgeInsetsMake(0, 2, 0, 0)]; - [_originButton setTitleEdgeInsets:UIEdgeInsetsMake(0, 5, 0, 0)]; - _originButton.layer.masksToBounds = YES; - _originButton.layer.cornerRadius = 14; - [_originButton addTarget:self action:@selector(originButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _originButton; -} - -- (UIButton *)sendButton { - if (!_sendButton) { - _sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sendButton setTitle:YMLocalizedString(@"QinputPhotoView3") forState:UIControlStateNormal]; - [_sendButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - _sendButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_sendButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _sendButton.layer.masksToBounds = YES; - _sendButton.layer.cornerRadius = 10; - [_sendButton addTarget:self action:@selector(sendButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _sendButton; -} - -- (NSMutableArray *)chooseArray { - if(!_chooseArray) { - _chooseArray = [NSMutableArray array]; - } - return _chooseArray; -} - - - -@end diff --git a/YuMi/CustomUI/InputView/InputView/UITextView+QEmotion.h b/YuMi/CustomUI/InputView/InputView/UITextView+QEmotion.h deleted file mode 100644 index 4ec558c..0000000 --- a/YuMi/CustomUI/InputView/InputView/UITextView+QEmotion.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// UITextView+QEmotion.h -// QKeyBoardDemo -// -// Created by QDong on 2021-8-3. -// Copyright (c) 2021年 QDong QQ:285275534@qq.com. All rights reserved. -// - - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface UITextView (QEmotion) - -// 给textView插入表情图片，比如😊 -- (void)insertEmotionAttributedString:(NSAttributedString *)emotionAttributedString; - -// 给textView插入表情的文本，比如[微笑] -- (void)insertEmotion:(NSString *)emotionKey; - -// textView删除表情 -// @return YES 表示刚才成功删除了一个表情； -// @return NO 表示刚才没删掉表情（于是本类就什么都不操作，由外部vc实现删除操作。这样做因为vc的自定义tv可能要实现文字块删除，比如 @人名） -- (BOOL)deleteEmotion; - -- (NSString *)normalText; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/InputView/InputView/UITextView+QEmotion.m b/YuMi/CustomUI/InputView/InputView/UITextView+QEmotion.m deleted file mode 100644 index 38f2b5a..0000000 --- a/YuMi/CustomUI/InputView/InputView/UITextView+QEmotion.m +++ /dev/null @@ -1,119 +0,0 @@ -// -// UITextView+QEmotion.h -// QKeyBoardDemo -// -// Created by QDong on 2021-8-3. -// Copyright (c) 2021年 QDong QQ:285275534@qq.com. All rights reserved. -// - -#import "UITextView+QEmotion.h" -#import "QEEmotionImageView.h" -#import "YYText.h" - -@implementation UITextView (QEmotion) - -// 给textView插入表情图片，比如😊 -- (void)insertEmotionAttributedString:(NSAttributedString *)emotionAttributedString { - if (!emotionAttributedString){ - return; - } - NSMutableAttributedString *content = self.attributedText.mutableCopy; - // 获得光标所在的位置 - int location = (int)self.selectedRange.location; - [content insertAttributedString:emotionAttributedString atIndex:location]; - // 修复由于插入AttributeString而导致font改变的问题；防止插入表情后textView的font变小 - [content addAttributes:@{NSFontAttributeName: self.font, NSForegroundColorAttributeName: self.textColor} range:NSMakeRange(location, emotionAttributedString.length)]; - - self.attributedText = content; - //重新设置光标位置 - NSRange range; - range.location = location + emotionAttributedString.length; - range.length = 0; - self.selectedRange = range; -} - -// 给textView插入表情的文本，比如[微笑] -- (void)insertEmotion:(NSString *)emotionKey { - NSMutableAttributedString *content = self.attributedText.mutableCopy; - // 获得光标所在的位置 - int location = (int)self.selectedRange.location; - [content insertAttributedString:[[NSAttributedString alloc] initWithString:emotionKey attributes:@{NSFontAttributeName:self.font,NSForegroundColorAttributeName:self.textColor}] atIndex:location]; - // 将调整后的字符串添加到UITextView上面 - self.attributedText = content; - //重新设置光标位置 - NSRange range; - range.location = location + emotionKey.length; - range.length = 0; - self.selectedRange = range; -} - -// textView删除表情 -// @return YES 表示刚才成功删除了一个表情； -// @return NO 表示刚才没删掉表情（于是本类就什么都不操作，由外部vc实现删除操作。这样做因为vc的自定义tv可能要实现文字块删除，比如 @人名） -- (BOOL)deleteEmotion { - //点的是删除按钮，获得光标所在的位置 - int location = (int)self.selectedRange.location; - if(location == 0){ - return NO; - } - // 先获取前半段 - NSString *headresult = [self.text substringToIndex:location]; - - if ([headresult hasSuffix:@"]"]) { - //最后一位是] - for (int i = (int)[headresult length]; i>=0 ; i--) { - //往前找，找到"[" - char tempString = [headresult characterAtIndex:(i-1)]; - if (tempString == '[') { - NSMutableAttributedString *content = self.attributedText.mutableCopy; - //砍掉[XXX]，重新赋值前半段 - [content deleteCharactersInRange:NSMakeRange(i - 1,location - i + 1)]; - self.attributedText = content; - //重新设置光标位置 - NSRange range; - range.location = [headresult length]; - range.length = 0; - self.selectedRange = range; - return YES; - } - } - } - return NO; -} - -- (NSString *)normalText { - NSMutableString *normalMutableString = [[NSMutableString alloc]initWithString:[self getResutlText]]; - CGSize maxSize = CGSizeMake(50, MAXFLOAT); - YYTextLayout * layout = [YYTextLayout layoutWithContainerSize:maxSize text:self.attributedText]; - for (int i = 0; i< layout.attachments.count; i++) { - YYTextAttachment * attachment = [layout.attachments objectAtIndex:i]; - if (!attachment || ![attachment.content isKindOfClass:[QEEmotionImageView class]]) continue; - QEEmotionImageView* imageView = attachment.content; - NSValue * value = [layout.attachmentRanges objectAtIndex:i]; - NSRange range = value.rangeValue; - if (!imageView.displayText) continue; - [normalMutableString replaceCharactersInRange:range withString:imageView.displayText]; - } - return normalMutableString; -} --(NSString *)getResutlText{ - if (self.attributedText.length <= 0) { - return @""; - } - NSMutableAttributedString *resutlAtt = [[NSMutableAttributedString alloc] initWithAttributedString:self.attributedText ]; - //枚举出所有的附件字符串 - __block NSUInteger base = 0; - [self.attributedText enumerateAttributesInRange:NSMakeRange(0, self.attributedText.length) options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired usingBlock:^(NSDictionary * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) { - NSTextAttachment *textAtt = attrs[@"NSAttachment"]; - //获取当前替换字符串的长度 - NSInteger length = range.location + base + range.length; - if (textAtt && length <= resutlAtt.length) { - [resutlAtt replaceCharactersInRange:NSMakeRange(range.location + base, range.length) - withString:textAtt.imageName]; - base += textAtt.imageName.length - 1; - - } - }]; - return resutlAtt.string; -} -@end diff --git a/YuMi/CustomUI/InputView/emoji.plist b/YuMi/CustomUI/InputView/emoji.plist deleted file mode 100755 index c3b5347..0000000 --- a/YuMi/CustomUI/InputView/emoji.plist +++ /dev/null @@ -1,1022 +0,0 @@ - - - - - - data - - - file - emoji_01.png - id - emoticon_emoji_01 - tag - [可爱] - - - file - emoji_00.png - id - emoticon_emoji_0 - tag - [大笑] - - - file - emoji_02.png - id - emoticon_emoji_02 - tag - [色] - - - file - emoji_03.png - id - emoticon_emoji_03 - tag - [嘘] - - - file - emoji_04.png - id - emoticon_emoji_04 - tag - [亲] - - - file - emoji_05.png - id - emoticon_emoji_05 - tag - [呆] - - - file - emoji_06.png - id - emoticon_emoji_06 - tag - [口水] - - - file - emoji_145.png - id - emoticon_emoji_145 - tag - [汗] - - - file - emoji_07.png - id - emoticon_emoji_07 - tag - [呲牙] - - - file - emoji_08.png - id - emoticon_emoji_08 - tag - [鬼脸] - - - file - emoji_09.png - id - emoticon_emoji_09 - tag - [害羞] - - - file - emoji_10.png - id - emoticon_emoji_10 - tag - [偷笑] - - - file - emoji_11.png - id - emoticon_emoji_11 - tag - [调皮] - - - file - emoji_12.png - id - emoticon_emoji_12 - tag - [可怜] - - - file - emoji_13.png - id - emoticon_emoji_13 - tag - [敲] - - - file - emoji_14.png - id - emoticon_emoji_14 - tag - [惊讶] - - - file - emoji_15.png - id - emoticon_emoji_15 - tag - [流感] - - - file - emoji_16.png - id - emoticon_emoji_16 - tag - [委屈] - - - file - emoji_17.png - id - emoticon_emoji_17 - tag - [流泪] - - - file - emoji_18.png - id - emoticon_emoji_18 - tag - [嚎哭] - - - file - emoji_19.png - id - emoticon_emoji_19 - tag - [惊恐] - - - file - emoji_20.png - id - emoticon_emoji_20 - tag - [怒] - - - file - emoji_21.png - id - emoticon_emoji_21 - tag - [酷] - - - file - emoji_22.png - id - emoticon_emoji_22 - tag - [不说] - - - file - emoji_23.png - id - emoticon_emoji_23 - tag - [鄙视] - - - file - emoji_24.png - id - emoticon_emoji_24 - tag - [阿弥陀佛] - - - file - emoji_25.png - id - emoticon_emoji_25 - tag - [奸笑] - - - file - emoji_26.png - id - emoticon_emoji_26 - tag - [睡着] - - - file - emoji_27.png - id - emoticon_emoji_27 - tag - [口罩] - - - file - emoji_28.png - id - emoticon_emoji_28 - tag - [努力] - - - file - emoji_29.png - id - emoticon_emoji_29 - tag - [抠鼻孔] - - - file - emoji_30.png - id - emoticon_emoji_30 - tag - [疑问] - - - file - emoji_31.png - id - emoticon_emoji_31 - tag - [怒骂] - - - file - emoji_32.png - id - emoticon_emoji_32 - tag - [晕] - - - file - emoji_33.png - id - emoticon_emoji_33 - tag - [呕吐] - - - file - emoji_160.png - id - emoticon_emoji_160 - tag - [拜一拜] - - - file - emoji_161.png - id - emoticon_emoji_161 - tag - [惊喜] - - - file - emoji_162.png - id - emoticon_emoji_162 - tag - [流汗] - - - file - emoji_163.png - id - emoticon_emoji_163 - tag - [卖萌] - - - file - emoji_164.png - id - emoticon_emoji_164 - tag - [默契眨眼] - - - file - emoji_165.png - id - emoticon_emoji_165 - tag - [烧香拜佛] - - - file - emoji_166.png - id - emoticon_emoji_166 - tag - [晚安] - - - file - emoji_34.png - id - emoticon_emoji_34 - tag - [强] - - - file - emoji_35.png - id - emoticon_emoji_35 - tag - [弱] - - - file - emoji_36.png - id - emoticon_emoji_36 - tag - [OK] - - - file - emoji_37.png - id - emoticon_emoji_37 - tag - [拳头] - - - file - emoji_38.png - id - emoticon_emoji_38 - tag - [胜利] - - - file - emoji_39.png - id - emoticon_emoji_39 - tag - [鼓掌] - - - file - emoji_200.png - id - emoticon_emoji_200 - tag - [握手] - - - file - emoji_40.png - id - emoticon_emoji_40 - tag - [发怒] - - - file - emoji_41.png - id - emoticon_emoji_41 - tag - [骷髅] - - - file - emoji_42.png - id - emoticon_emoji_42 - tag - [便便] - - - file - emoji_43.png - id - emoticon_emoji_43 - tag - [火] - - - file - emoji_44.png - id - emoticon_emoji_44 - tag - [溜] - - - file - emoji_45.png - id - emoticon_emoji_45 - tag - [爱心] - - - file - emoji_46.png - id - emoticon_emoji_46 - tag - [心碎] - - - file - emoji_47.png - id - emoticon_emoji_47 - tag - [钟情] - - - file - emoji_48.png - id - emoticon_emoji_48 - tag - [唇] - - - file - emoji_49.png - id - emoticon_emoji_49 - tag - [戒指] - - - file - emoji_50.png - id - emoticon_emoji_50 - tag - [钻石] - - - file - emoji_51.png - id - emoticon_emoji_51 - tag - [太阳] - - - file - emoji_52.png - id - emoticon_emoji_52 - tag - [有时晴] - - - file - emoji_53.png - id - emoticon_emoji_53 - tag - [多云] - - - file - emoji_54.png - id - emoticon_emoji_54 - tag - [雷] - - - file - emoji_55.png - id - emoticon_emoji_55 - tag - [雨] - - - file - emoji_56.png - id - emoticon_emoji_56 - tag - [雪花] - - - file - emoji_57.png - id - emoticon_emoji_57 - tag - [爱人] - - - file - emoji_58.png - id - emoticon_emoji_58 - tag - [帽子] - - - file - emoji_59.png - id - emoticon_emoji_59 - tag - [皇冠] - - - file - emoji_60.png - id - emoticon_emoji_60 - tag - [篮球] - - - file - emoji_61.png - id - emoticon_emoji_61 - tag - [足球] - - - file - emoji_62.png - id - emoticon_emoji_62 - tag - [垒球] - - - file - emoji_63.png - id - emoticon_emoji_63 - tag - [网球] - - - file - emoji_64.png - id - emoticon_emoji_64 - tag - [台球] - - - file - emoji_65.png - id - emoticon_emoji_65 - tag - [咖啡] - - - file - emoji_66.png - id - emoticon_emoji_66 - tag - [啤酒] - - - file - emoji_67.png - id - emoticon_emoji_67 - tag - [干杯] - - - file - emoji_68.png - id - emoticon_emoji_68 - tag - [柠檬汁] - - - file - emoji_69.png - id - emoticon_emoji_69 - tag - [餐具] - - - file - emoji_70.png - id - emoticon_emoji_70 - tag - [汉堡] - - - file - emoji_71.png - id - emoticon_emoji_71 - tag - [鸡腿] - - - file - emoji_72.png - id - emoticon_emoji_72 - tag - [面条] - - - file - emoji_73.png - id - emoticon_emoji_73 - tag - [冰淇淋] - - - file - emoji_74.png - id - emoticon_emoji_74 - tag - [沙冰] - - - file - emoji_75.png - id - emoticon_emoji_75 - tag - [生日蛋糕] - - - file - emoji_76.png - id - emoticon_emoji_76 - tag - [蛋糕] - - - file - emoji_77.png - id - emoticon_emoji_77 - tag - [糖果] - - - file - emoji_78.png - id - emoticon_emoji_78 - tag - [葡萄] - - - file - emoji_79.png - id - emoticon_emoji_79 - tag - [西瓜] - - - file - emoji_80.png - id - emoticon_emoji_80 - tag - [光碟] - - - file - emoji_81.png - id - emoticon_emoji_81 - tag - [手机] - - - file - emoji_82.png - id - emoticon_emoji_82 - tag - [电话] - - - file - emoji_83.png - id - emoticon_emoji_83 - tag - [电视] - - - file - emoji_84.png - id - emoticon_emoji_84 - tag - [声音开启] - - - file - emoji_85.png - id - emoticon_emoji_85 - tag - [声音关闭] - - - file - emoji_86.png - id - emoticon_emoji_86 - tag - [铃铛] - - - file - emoji_87.png - id - emoticon_emoji_87 - tag - [锁头] - - - file - emoji_88.png - id - emoticon_emoji_88 - tag - [放大镜] - - - file - emoji_89.png - id - emoticon_emoji_89 - tag - [灯泡] - - - file - emoji_90.png - id - emoticon_emoji_90 - tag - [锤头] - - - file - emoji_91.png - id - emoticon_emoji_91 - tag - [烟] - - - file - emoji_92.png - id - emoticon_emoji_92 - tag - [炸弹] - - - file - emoji_93.png - id - emoticon_emoji_93 - tag - [枪] - - - file - emoji_94.png - id - emoticon_emoji_94 - tag - [刀] - - - file - emoji_95.png - id - emoticon_emoji_95 - tag - [药] - - - file - emoji_96.png - id - emoticon_emoji_96 - tag - [打针] - - - file - emoji_97.png - id - emoticon_emoji_97 - tag - [钱袋] - - - file - emoji_98.png - id - emoticon_emoji_98 - tag - [钞票] - - - file - emoji_99.png - id - emoticon_emoji_99 - tag - [银行卡] - - - file - emoji_100.png - id - emoticon_emoji_100 - tag - [手柄] - - - file - emoji_101.png - id - emoticon_emoji_101 - tag - [麻将] - - - file - emoji_102.png - id - emoticon_emoji_102 - tag - [调色板] - - - file - emoji_103.png - id - emoticon_emoji_103 - tag - [电影] - - - file - emoji_104.png - id - emoticon_emoji_104 - tag - [麦克风] - - - file - emoji_105.png - id - emoticon_emoji_105 - tag - [耳机] - - - file - emoji_106.png - id - emoticon_emoji_106 - tag - [音乐] - - - file - emoji_107.png - id - emoticon_emoji_107 - tag - [吉他] - - - file - emoji_108.png - id - emoticon_emoji_108 - tag - [火箭] - - - file - emoji_109.png - id - emoticon_emoji_109 - tag - [飞机] - - - file - emoji_110.png - id - emoticon_emoji_110 - tag - [火车] - - - file - emoji_111.png - id - emoticon_emoji_111 - tag - [公交] - - - file - emoji_112.png - id - emoticon_emoji_112 - tag - [轿车] - - - file - emoji_113.png - id - emoticon_emoji_113 - tag - [出租车] - - - file - emoji_114.png - id - emoticon_emoji_114 - tag - [警车] - - - file - emoji_115.png - id - emoticon_emoji_115 - tag - [自行车] - - - info - - id - default - normal - emoj_s_normal.png - pressed - emoj_s_pressed.png - title - emoji - - - - diff --git a/YuMi/CustomUI/MoliAvatar.h b/YuMi/CustomUI/MoliAvatar.h deleted file mode 100644 index 68ace68..0000000 --- a/YuMi/CustomUI/MoliAvatar.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// MoliAvatar.h -// YuMi -// -// Created by P on 2024/12/11. -// - -#import - -@class UserInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface MoliAvatar : UIView - -@property(nonatomic, strong) UserInfoModel *userInfo; - -@property(nonatomic, copy) void(^handleTapAvatar)(void); - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/MoliAvatar.m b/YuMi/CustomUI/MoliAvatar.m deleted file mode 100644 index 33baae8..0000000 --- a/YuMi/CustomUI/MoliAvatar.m +++ /dev/null @@ -1,153 +0,0 @@ -// -// MoliAvatar.m -// YuMi -// -// Created by P on 2024/12/11. -// - -#import "MoliAvatar.h" - -#import "UserInfoModel.h" - -#import -#import - -#import "UIView+VAP.h" -#import "SpriteSheetImageManager.h" - -@interface MoliAvatar () - -@property (nonatomic,strong) NetImageView *avatarView; - -///序列帧 -@property (nonatomic, strong) SpriteSheetImageManager *sequenceFrameManager; -@property (nonatomic,strong) YYAnimatedImageView *sequenceFrameHeadWear; - -///SVGA -@property (nonatomic, strong) SVGAImageView *headWearSvgaImageView; - -@end - -@implementation MoliAvatar - -- (void)dealloc -{ - if (_headWearSvgaImageView) { - [_headWearSvgaImageView stopAnimation]; - } -} - -- (instancetype)init { - if (self = [super init]) { - [self addSubview:self.avatarView]; - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - } - return self; -} - -- (void)layoutSubviews { - [super layoutSubviews]; - - [self.avatarView setCornerRadius:self.frame.size.height / 2]; -} - -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - - self.avatarView.imageUrl = userInfo.avatar; - - NSString *headerUrl = self.userInfo.headwearEffect.length > 0 ? self.userInfo.headwearEffect : self.userInfo.headwearPic; - if ([NSString isEmpty:headerUrl]) { - return; - } - - if ([userInfo isHeadWearSVGA]) { - [self setupAndPlaySVGA: headerUrl]; - } else { - [self setupAndPlayAnimate: headerUrl]; - } -} - -- (void)setupAndPlaySVGA:(NSString *)url { - [self addSubview:self.headWearSvgaImageView]; - [self.headWearSvgaImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarView); - make.size.mas_equalTo(self.avatarView).multipliedBy(1.4); - }]; - - [self.headWearSvgaImageView setImageName:url]; -} - -- (void)setupAndPlayAnimate:(NSString *)url { - [self addSubview:self.sequenceFrameHeadWear]; - [self.sequenceFrameHeadWear mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarView); - make.size.mas_equalTo(self.avatarView).multipliedBy(1.4); - }]; - - @kWeakify(self); - [self.sequenceFrameManager loadSpriteSheetImageWithURL:[NSURL URLWithString:url] - completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { - @kStrongify(self); - self.sequenceFrameHeadWear.image = sprit; - } failureBlock:^(NSError * _Nullable error) {}]; -} - -#pragma mark - -- (void)clickAvatarAction { - if (self.handleTapAvatar) { - self.handleTapAvatar(); - } -} - -#pragma mark - - - -#pragma mark - --(NetImageView *)avatarView{ - if (!_avatarView){ - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - _avatarView = [[NetImageView alloc]initWithConfig:config]; - _avatarView.layer.cornerRadius = kGetScaleWidth(41); - _avatarView.layer.masksToBounds = YES; - _avatarView.layer.borderWidth = 1; - _avatarView.userInteractionEnabled = YES; - _avatarView.layer.borderColor = [UIColor whiteColor].CGColor; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickAvatarAction)]; - [_avatarView addGestureRecognizer:tap]; - } - return _avatarView; -} - -- (SVGAImageView *)headWearSvgaImageView { - if (!_headWearSvgaImageView) { - _headWearSvgaImageView = [[SVGAImageView alloc]init]; - _headWearSvgaImageView.backgroundColor = [UIColor clearColor]; - _headWearSvgaImageView.frame = self.bounds; - _headWearSvgaImageView.userInteractionEnabled = NO; - _headWearSvgaImageView.autoPlay = YES; - } - return _headWearSvgaImageView; -} - -- (YYAnimatedImageView *)sequenceFrameHeadWear { - if (!_sequenceFrameHeadWear) { - _sequenceFrameHeadWear = [[YYAnimatedImageView alloc] init]; - _sequenceFrameHeadWear.backgroundColor = [UIColor clearColor]; - _sequenceFrameHeadWear.contentMode = UIViewContentModeScaleAspectFit; - } - return _sequenceFrameHeadWear; -} - -- (SpriteSheetImageManager *)sequenceFrameManager { - if (!_sequenceFrameManager) { - _sequenceFrameManager = [[SpriteSheetImageManager alloc] init]; - } - return _sequenceFrameManager; -} - -@end diff --git a/YuMi/CustomUI/SVGA/XPSVGAPlayer.h b/YuMi/CustomUI/SVGA/XPSVGAPlayer.h deleted file mode 100644 index 4180291..0000000 --- a/YuMi/CustomUI/SVGA/XPSVGAPlayer.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMSVGAPlayer.h -// YUMI -// -// Created by YUMI on 2022/6/15. -// - -#import "SVGAImageView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSVGAPlayer : SVGAImageView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/SVGA/XPSVGAPlayer.m b/YuMi/CustomUI/SVGA/XPSVGAPlayer.m deleted file mode 100644 index a7ba301..0000000 --- a/YuMi/CustomUI/SVGA/XPSVGAPlayer.m +++ /dev/null @@ -1,530 +0,0 @@ -// -// YMSVGAPlayer.m -// YUMI -// -// Created by YUMI on 2022/6/15. -// - -#import "XPSVGAPlayer.h" -#import "SVGAVideoEntity.h" -#import "SVGAVideoSpriteEntity.h" -#import "SVGAVideoSpriteFrameEntity.h" -#import "SVGAContentLayer.h" -#import "SVGABitmapLayer.h" -#import "SVGAVectorLayer.h" -#import "SVGAAudioLayer.h" -#import "SVGAAudioEntity.h" -#import "YYText.h" - -@interface XPSVGAPlayer () - -@property (nonatomic, strong) CALayer *drawLayer; -@property (nonatomic, strong) NSArray *audioLayers; -@property (nonatomic, strong) CADisplayLink *displayLink; -@property (nonatomic, assign) NSInteger currentFrame; -@property (nonatomic, copy) NSArray *contentLayers; -@property (nonatomic, copy) NSDictionary *dynamicObjects; -@property (nonatomic, copy) NSDictionary *dynamicTexts; -@property (nonatomic, copy) NSDictionary *dynamicDrawings; -@property (nonatomic, copy) NSDictionary *dynamicHiddens; -@property (nonatomic, assign) int loopCount; -@property (nonatomic, assign) NSRange currentRange; -@property (nonatomic, assign) BOOL forwardAnimating; -@property (nonatomic, assign) BOOL reversing; -@property (nonatomic, assign) BOOL audioPlaying; - -@end - - - -@implementation XPSVGAPlayer -@synthesize videoItem = _videoItem; - - -- (instancetype)init { - if (self = [super init]) { - [self initPlayer]; - } - return self; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initPlayer]; - } - return self; -} - -- (instancetype)initWithCoder:(NSCoder *)aDecoder { - if (self = [super initWithCoder:aDecoder]) { - [self initPlayer]; - } - return self; -} - -- (void)initPlayer { - self.contentMode = UIViewContentModeTop; - self.clearsAfterStop = YES; -} - -- (void)willMoveToSuperview:(UIView *)newSuperview { - [super willMoveToSuperview:newSuperview]; - if (newSuperview == nil) { - [self stopAnimation:YES]; - } -} - -- (void)startAnimation { - if (self.videoItem == nil) { -// NSLog(@"videoItem could not be nil！"); - return; - } else if (self.drawLayer == nil) { - self.videoItem = _videoItem; - } - [self stopAnimation:NO]; - self.loopCount = 0; - self.displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(next)]; - - self.displayLink.preferredFramesPerSecond = self.videoItem.FPS; - [self.displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; - self.forwardAnimating = !self.reversing; -} - -- (void)startAnimationWithRange:(NSRange)range reverse:(BOOL)reverse { - self.currentRange = range; - self.reversing = reverse; - if (reverse) { - self.currentFrame = MIN(self.videoItem.frames - 1, range.location + range.length - 1); - } - else { - self.currentFrame = MAX(0, range.location); - } - [self startAnimation]; -} - -- (void)pauseAnimation { - [self stopAnimation:NO]; -} - -- (void)stopAnimation { - [self stopAnimation:self.clearsAfterStop]; -} - -- (void)stopAnimation:(BOOL)clear { - self.forwardAnimating = NO; - if (self.displayLink != nil) { - [self.displayLink invalidate]; - } - if (clear) { - [self clear]; - } - [self clearAudios]; - self.displayLink = nil; -} - -- (void)clear { - self.contentLayers = nil; - [self.drawLayer removeFromSuperlayer]; - self.drawLayer = nil; -} - -- (void)clearAudios { - if (!self.audioPlaying) { - return; - } - for (SVGAAudioLayer *layer in self.audioLayers) { - [layer.audioPlayer stop]; - } - self.audioPlaying = NO; -} - -- (void)stepToFrame:(NSInteger)frame andPlay:(BOOL)andPlay { - if (self.videoItem == nil) { -// NSLog(@"videoItem could not be nil！"); - return; - } else if (self.drawLayer == nil) { - self.videoItem = _videoItem; - } - if (frame >= self.videoItem.frames || frame < 0) { - return; - } - [self pauseAnimation]; - self.currentFrame = frame; - [self update]; - if (andPlay) { - self.forwardAnimating = YES; - self.displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(next)]; - self.displayLink.preferredFramesPerSecond = self.videoItem.FPS; - [self.displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; - } -} - -- (void)stepToPercentage:(CGFloat)percentage andPlay:(BOOL)andPlay { - NSInteger frame = (NSInteger)(self.videoItem.frames * percentage); - if (frame >= self.videoItem.frames && frame > 0) { - frame = self.videoItem.frames - 1; - } - [self stepToFrame:frame andPlay:andPlay]; -} - -- (void)draw { - self.drawLayer = [[CALayer alloc] init]; - self.drawLayer.frame = CGRectMake(0, 0, self.videoItem.videoSize.width, self.videoItem.videoSize.height); - self.drawLayer.masksToBounds = true; - NSMutableDictionary *tempHostLayers = [NSMutableDictionary dictionary]; - NSMutableArray *tempContentLayers = [NSMutableArray array]; - - [self.videoItem.sprites enumerateObjectsUsingBlock:^(SVGAVideoSpriteEntity * _Nonnull sprite, NSUInteger idx, BOOL * _Nonnull stop) { - UIImage *bitmap; - if (sprite.imageKey != nil) { - NSString *bitmapKey = [sprite.imageKey stringByDeletingPathExtension]; - if (self.dynamicObjects[bitmapKey] != nil) { - bitmap = self.dynamicObjects[bitmapKey]; - } - else { - bitmap = self.videoItem.images[bitmapKey]; - } - } - SVGAContentLayer *contentLayer = [sprite requestLayerWithBitmap:bitmap]; - contentLayer.imageKey = sprite.imageKey; - [tempContentLayers addObject:contentLayer]; - if ([sprite.imageKey hasSuffix:@".matte"]) { - CALayer *hostLayer = [[CALayer alloc] init]; - hostLayer.mask = contentLayer; - tempHostLayers[sprite.imageKey] = hostLayer; - } else { - if (sprite.matteKey && sprite.matteKey.length > 0) { - CALayer *hostLayer = tempHostLayers[sprite.matteKey]; - [hostLayer addSublayer:contentLayer]; - if (![sprite.matteKey isEqualToString:self.videoItem.sprites[idx - 1].matteKey]) { - [self.drawLayer addSublayer:hostLayer]; - } - } else { - [self.drawLayer addSublayer:contentLayer]; - } - } - if (sprite.imageKey != nil) { - if (self.dynamicTexts[sprite.imageKey] != nil) { - NSAttributedString *text = self.dynamicTexts[sprite.imageKey]; - CGSize bitmapSize = CGSizeMake(self.videoItem.images[sprite.imageKey].size.width * self.videoItem.images[sprite.imageKey].scale, self.videoItem.images[sprite.imageKey].size.height * self.videoItem.images[sprite.imageKey].scale); - - - CATextLayer *textLayer = [CATextLayer layer]; - textLayer.contentsScale = [[UIScreen mainScreen] scale]; - [textLayer setString:self.dynamicTexts[sprite.imageKey]]; - textLayer.alignmentMode = kCAAlignmentCenter; - CGSize size = [text boundingRectWithSize:CGSizeMake(bitmapSize.width, CGFLOAT_MAX) - options:NSStringDrawingUsesLineFragmentOrigin - context:NULL].size; - textLayer.frame = CGRectMake(0, 0, size.width, size.height); - [contentLayer addSublayer:textLayer]; - contentLayer.textLayer = textLayer; - [contentLayer resetTextLayerProperties:text]; - } - if (self.dynamicHiddens[sprite.imageKey] != nil && - [self.dynamicHiddens[sprite.imageKey] boolValue] == YES) { - contentLayer.dynamicHidden = YES; - } - if (self.dynamicDrawings[sprite.imageKey] != nil) { - contentLayer.dynamicDrawingBlock = self.dynamicDrawings[sprite.imageKey]; - } - } - }]; - self.contentLayers = tempContentLayers; - - [self.layer addSublayer:self.drawLayer]; - NSMutableArray *audioLayers = [NSMutableArray array]; - [self.videoItem.audios enumerateObjectsUsingBlock:^(SVGAAudioEntity * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - SVGAAudioLayer *audioLayer = [[SVGAAudioLayer alloc] initWithAudioItem:obj videoItem:self.videoItem]; - [audioLayers addObject:audioLayer]; - }]; - self.audioLayers = audioLayers; - [self update]; - [self resize]; -} - -- (void)resize { - if (self.contentMode == UIViewContentModeScaleAspectFit) { - CGFloat videoRatio = self.videoItem.videoSize.width / self.videoItem.videoSize.height; - CGFloat layerRatio = self.bounds.size.width / self.bounds.size.height; - if (videoRatio > layerRatio) { - CGFloat ratio = self.bounds.size.width / self.videoItem.videoSize.width; - CGPoint offset = CGPointMake( - (1.0 - ratio) / 2.0 * self.videoItem.videoSize.width, - (1.0 - ratio) / 2.0 * self.videoItem.videoSize.height - - (self.bounds.size.height - self.videoItem.videoSize.height * ratio) / 2.0 - ); - self.drawLayer.transform = CATransform3DMakeAffineTransform(CGAffineTransformMake(ratio, 0, 0, ratio, -offset.x, -offset.y)); - } - else { - CGFloat ratio = self.bounds.size.height / self.videoItem.videoSize.height; - CGPoint offset = CGPointMake( - (1.0 - ratio) / 2.0 * self.videoItem.videoSize.width - (self.bounds.size.width - self.videoItem.videoSize.width * ratio) / 2.0, - (1.0 - ratio) / 2.0 * self.videoItem.videoSize.height); - self.drawLayer.transform = CATransform3DMakeAffineTransform(CGAffineTransformMake(ratio, 0, 0, ratio, -offset.x, -offset.y)); - } - } - else if (self.contentMode == UIViewContentModeScaleAspectFill) { - CGFloat videoRatio = self.videoItem.videoSize.width / self.videoItem.videoSize.height; - CGFloat layerRatio = self.bounds.size.width / self.bounds.size.height; - if (videoRatio < layerRatio) { - CGFloat ratio = self.bounds.size.width / self.videoItem.videoSize.width; - CGPoint offset = CGPointMake( - (1.0 - ratio) / 2.0 * self.videoItem.videoSize.width, - (1.0 - ratio) / 2.0 * self.videoItem.videoSize.height - - (self.bounds.size.height - self.videoItem.videoSize.height * ratio) / 2.0 - ); - self.drawLayer.transform = CATransform3DMakeAffineTransform(CGAffineTransformMake(ratio, 0, 0, ratio, -offset.x, -offset.y)); - } - else { - CGFloat ratio = self.bounds.size.height / self.videoItem.videoSize.height; - CGPoint offset = CGPointMake( - (1.0 - ratio) / 2.0 * self.videoItem.videoSize.width - (self.bounds.size.width - self.videoItem.videoSize.width * ratio) / 2.0, - (1.0 - ratio) / 2.0 * self.videoItem.videoSize.height); - self.drawLayer.transform = CATransform3DMakeAffineTransform(CGAffineTransformMake(ratio, 0, 0, ratio, -offset.x, -offset.y)); - } - } - else if (self.contentMode == UIViewContentModeTop) { - CGFloat scaleX = self.frame.size.width / self.videoItem.videoSize.width; - CGPoint offset = CGPointMake((1.0 - scaleX) / 2.0 * self.videoItem.videoSize.width, (1 - scaleX) / 2.0 * self.videoItem.videoSize.height); - self.drawLayer.transform = CATransform3DMakeAffineTransform(CGAffineTransformMake(scaleX, 0, 0, scaleX, -offset.x, -offset.y)); - } - else if (self.contentMode == UIViewContentModeBottom) { - CGFloat scaleX = self.frame.size.width / self.videoItem.videoSize.width; - CGPoint offset = CGPointMake( - (1.0 - scaleX) / 2.0 * self.videoItem.videoSize.width, - (1.0 - scaleX) / 2.0 * self.videoItem.videoSize.height); - self.drawLayer.transform = CATransform3DMakeAffineTransform(CGAffineTransformMake(scaleX, 0, 0, scaleX, -offset.x, -offset.y + self.frame.size.height - self.videoItem.videoSize.height * scaleX)); - } - else if (self.contentMode == UIViewContentModeLeft) { - CGFloat scaleY = self.frame.size.height / self.videoItem.videoSize.height; - CGPoint offset = CGPointMake((1.0 - scaleY) / 2.0 * self.videoItem.videoSize.width, (1 - scaleY) / 2.0 * self.videoItem.videoSize.height); - self.drawLayer.transform = CATransform3DMakeAffineTransform(CGAffineTransformMake(scaleY, 0, 0, scaleY, -offset.x, -offset.y)); - } - else if (self.contentMode == UIViewContentModeRight) { - CGFloat scaleY = self.frame.size.height / self.videoItem.videoSize.height; - CGPoint offset = CGPointMake( - (1.0 - scaleY) / 2.0 * self.videoItem.videoSize.width, - (1.0 - scaleY) / 2.0 * self.videoItem.videoSize.height); - self.drawLayer.transform = CATransform3DMakeAffineTransform(CGAffineTransformMake(scaleY, 0, 0, scaleY, -offset.x + self.frame.size.width - self.videoItem.videoSize.width * scaleY, -offset.y)); - } - else { - CGFloat scaleX = self.frame.size.width / self.videoItem.videoSize.width; - CGFloat scaleY = self.frame.size.height / self.videoItem.videoSize.height; - CGPoint offset = CGPointMake((1.0 - scaleX) / 2.0 * self.videoItem.videoSize.width, (1 - scaleY) / 2.0 * self.videoItem.videoSize.height); - self.drawLayer.transform = CATransform3DMakeAffineTransform(CGAffineTransformMake(scaleX, 0, 0, scaleY, -offset.x, -offset.y)); - } -} - -- (void)layoutSubviews { - [super layoutSubviews]; - [self resize]; -} - -- (void)update { - [CATransaction setDisableActions:YES]; - for (SVGAContentLayer *layer in self.contentLayers) { - if ([layer isKindOfClass:[SVGAContentLayer class]]) { - [layer stepToFrame:self.currentFrame]; - } - } - [CATransaction setDisableActions:NO]; - if (self.forwardAnimating && self.audioLayers.count > 0) { - for (SVGAAudioLayer *layer in self.audioLayers) { - if (!self.audioPlaying && layer.audioItem.startFrame >= self.currentFrame) { - [layer.audioPlayer setCurrentTime:(NSTimeInterval)(layer.audioItem.startTime / 1000)]; - [layer.audioPlayer play]; - self.audioPlaying = YES; - } - if (self.audioPlaying && layer.audioItem.endFrame <= self.currentFrame) { - [layer.audioPlayer stop]; - self.audioPlaying = NO; - } - } - } -} - -- (void)next { - if (self.reversing) { - self.currentFrame--; - if (self.currentFrame < (NSInteger)MAX(0, self.currentRange.location)) { - self.currentFrame = MIN(self.videoItem.frames - 1, self.currentRange.location + self.currentRange.length - 1); - self.loopCount++; - } - } - else { - self.currentFrame++; - if (self.currentFrame >= MIN(self.videoItem.frames, self.currentRange.location + self.currentRange.length)) { - self.currentFrame = MAX(0, self.currentRange.location); - [self clearAudios]; - self.loopCount++; - } - } - if (self.loops > 0 && self.loopCount >= self.loops) { - [self stopAnimation]; - if (!self.clearsAfterStop && [self.fillMode isEqualToString:@"Backward"]) { - [self stepToFrame:MAX(0, self.currentRange.location) andPlay:NO]; - } - else if (!self.clearsAfterStop && [self.fillMode isEqualToString:@"Forward"]) { - [self stepToFrame:MIN(self.videoItem.frames - 1, self.currentRange.location + self.currentRange.length - 1) andPlay:NO]; - } - id delegate = self.delegate; - if (delegate != nil && [delegate respondsToSelector:@selector(svgaPlayerDidFinishedAnimation:)]) { - [delegate svgaPlayerDidFinishedAnimation:self]; - } - return; - } - [self update]; - id delegate = self.delegate; - if (delegate != nil && [delegate respondsToSelector:@selector(svgaPlayerDidAnimatedToFrame:)]) { - [delegate svgaPlayerDidAnimatedToFrame:self.currentFrame]; - } - if (delegate != nil && [delegate respondsToSelector:@selector(svgaPlayerDidAnimatedToPercentage:)] && self.videoItem.frames > 0) { - [delegate svgaPlayerDidAnimatedToPercentage:(CGFloat)(self.currentFrame + 1) / (CGFloat)self.videoItem.frames]; - } -} - -- (void)setVideoItem:(SVGAVideoEntity *)videoItem { - _videoItem = videoItem; - _currentRange = NSMakeRange(0, videoItem.frames); - _reversing = NO; - _currentFrame = 0; - _loopCount = 0; - [[NSOperationQueue mainQueue] addOperationWithBlock:^{ - [self clear]; - [self draw]; - }]; -} - -#pragma mark - Dynamic Object - -- (void)setImage:(UIImage *)image forKey:(NSString *)aKey { - if (image == nil) { - return; - } - NSMutableDictionary *mutableDynamicObjects = [self.dynamicObjects mutableCopy]; - [mutableDynamicObjects setObject:image forKey:aKey]; - self.dynamicObjects = mutableDynamicObjects; - if (self.contentLayers.count > 0) { - for (SVGAContentLayer *layer in self.contentLayers) { - if ([layer isKindOfClass:[SVGAContentLayer class]] && [layer.imageKey isEqualToString:aKey]) { - layer.bitmapLayer.contents = (__bridge id _Nullable)([image CGImage]); - } - } - } -} - -- (void)setImageWithURL:(NSURL *)URL forKey:(NSString *)aKey { - [[[NSURLSession sharedSession] dataTaskWithURL:URL completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) { - if (error == nil && data != nil) { - UIImage *image = [UIImage imageWithData:data]; - if (image != nil) { - [[NSOperationQueue mainQueue] addOperationWithBlock:^{ - [self setImage:image forKey:aKey]; - }]; - } - } - }] resume]; -} - -- (void)setImage:(UIImage *)image forKey:(NSString *)aKey referenceLayer:(CALayer *)referenceLayer { - [self setImage:image forKey:aKey]; -} - -- (void)setAttributedText:(NSAttributedString *)attributedText forKey:(NSString *)aKey { - if (attributedText == nil) { - return; - } - NSMutableDictionary *mutableDynamicTexts = [self.dynamicTexts mutableCopy]; - [mutableDynamicTexts setObject:attributedText forKey:aKey]; - self.dynamicTexts = mutableDynamicTexts; - if (self.contentLayers.count > 0) { - CGSize bitmapSize = CGSizeMake(self.videoItem.images[aKey].size.width * self.videoItem.images[aKey].scale, self.videoItem.images[aKey].size.height * self.videoItem.images[aKey].scale); - CGSize size = [attributedText boundingRectWithSize:bitmapSize - options:NSStringDrawingUsesLineFragmentOrigin context:NULL].size; - CATextLayer *textLayer; - for (SVGAContentLayer *layer in self.contentLayers) { - if ([layer isKindOfClass:[SVGAContentLayer class]] && [layer.imageKey isEqualToString:aKey]) { - textLayer = layer.textLayer; - if (textLayer == nil) { - textLayer = [CATextLayer layer]; - [layer addSublayer:textLayer]; - layer.textLayer = textLayer; - [layer resetTextLayerProperties:attributedText]; - } - } - } - if (textLayer != nil) { - textLayer.contentsScale = [[UIScreen mainScreen] scale]; - [textLayer setString:attributedText]; - textLayer.alignmentMode = kCAAlignmentCenter; - textLayer.frame = CGRectMake(0, 0, size.width, size.height); - } - } -} - -- (void)setDrawingBlock:(SVGAPlayerDynamicDrawingBlock)drawingBlock forKey:(NSString *)aKey { - NSMutableDictionary *mutableDynamicDrawings = [self.dynamicDrawings mutableCopy]; - [mutableDynamicDrawings setObject:drawingBlock forKey:aKey]; - self.dynamicDrawings = mutableDynamicDrawings; - if (self.contentLayers.count > 0) { - for (SVGAContentLayer *layer in self.contentLayers) { - if ([layer isKindOfClass:[SVGAContentLayer class]] && - [layer.imageKey isEqualToString:aKey]) { - layer.dynamicDrawingBlock = drawingBlock; - } - } - } -} - -- (void)setHidden:(BOOL)hidden forKey:(NSString *)aKey { - NSMutableDictionary *mutableDynamicHiddens = [self.dynamicHiddens mutableCopy]; - [mutableDynamicHiddens setObject:@(hidden) forKey:aKey]; - self.dynamicHiddens = mutableDynamicHiddens; - if (self.contentLayers.count > 0) { - for (SVGAContentLayer *layer in self.contentLayers) { - if ([layer isKindOfClass:[SVGAContentLayer class]] && - [layer.imageKey isEqualToString:aKey]) { - layer.dynamicHidden = hidden; - } - } - } -} - -- (void)clearDynamicObjects { - self.dynamicObjects = nil; - self.dynamicTexts = nil; - self.dynamicHiddens = nil; - self.dynamicDrawings = nil; -} - -- (NSDictionary *)dynamicObjects { - if (_dynamicObjects == nil) { - _dynamicObjects = @{}; - } - return _dynamicObjects; -} - -- (NSDictionary *)dynamicTexts { - if (_dynamicTexts == nil) { - _dynamicTexts = @{}; - } - return _dynamicTexts; -} - -- (NSDictionary *)dynamicHiddens { - if (_dynamicHiddens == nil) { - _dynamicHiddens = @{}; - } - return _dynamicHiddens; -} - -- (NSDictionary *)dynamicDrawings { - if (_dynamicDrawings == nil) { - _dynamicDrawings = @{}; - } - return _dynamicDrawings; -} - -@end - diff --git a/YuMi/CustomUI/ShareView/Model/XPShareInfoModel.h b/YuMi/CustomUI/ShareView/Model/XPShareInfoModel.h deleted file mode 100644 index aa6d5f3..0000000 --- a/YuMi/CustomUI/ShareView/Model/XPShareInfoModel.h +++ /dev/null @@ -1,55 +0,0 @@ -// -// YMShareModel.h -// YUMI -// -// Created by YUMI on 2021/11/23. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSUInteger, ShareType) { - ///分享房间 - ShareType_Room = 1, - ///分享h5 - ShareType_H5 = 2, - ///大转盘 目前没用到 - ShareType_User_Draw = 888, -}; - -@interface XPShareInfoModel : PIBaseModel -///分享的标题 -@property (nonatomic,copy) NSString *shareTitle; -///分享的内容 -@property (nonatomic,copy) NSString *shareContent; -///分享的地址 -@property (nonatomic,copy) NSString *shareUrl; -///分享图片 -@property (nonatomic,copy) NSString *shareImageUrl; -///分享图片 -@property (nonatomic,copy) UIImage *shareImage; -///分享的类型 -@property (nonatomic,assign) ShareType type; -///分享类型，1微信好友，2微信朋友圈，3QQ好友，4QQ空间 -@property (nonatomic,assign) NSInteger shareType; -///分享房间的uid -@property (nonatomic,assign) NSInteger roomUid; -#pragma mark - 动态分享 -///被分享动态的那个人 -@property (nonatomic,copy) NSString *uid; -///动态分享 -@property (nonatomic,copy) NSString *dynamicId; -///话题id -@property (nonatomic,copy) NSString *worldId; -///封面 -@property (nonatomic,copy) NSString *imageUrl; -///名称 -@property (nonatomic,copy) NSString *nick; -///发布者的uid -@property (nonatomic,copy) NSString *publishUid; -///内容 -@property (nonatomic,copy) NSString *content; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/ShareView/Model/XPShareInfoModel.m b/YuMi/CustomUI/ShareView/Model/XPShareInfoModel.m deleted file mode 100644 index 648355c..0000000 --- a/YuMi/CustomUI/ShareView/Model/XPShareInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMShareModel.m -// YUMI -// -// Created by YUMI on 2021/11/23. -// - -#import "XPShareInfoModel.h" - -@implementation XPShareInfoModel - -@end diff --git a/YuMi/CustomUI/ShareView/Model/XPShareItem.h b/YuMi/CustomUI/ShareView/Model/XPShareItem.h deleted file mode 100644 index 211d661..0000000 --- a/YuMi/CustomUI/ShareView/Model/XPShareItem.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// YMShareItem.h -// YUMI -// -// Created by YUMI on 2021/11/23. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef enum : NSUInteger { - ///微信好友 - XPShareItemTagWeChat = 1, - ///微信朋友圈 - XPShareItemTagMoments, - ///QQ好友 - XPShareItemTagQQ, - ///QQ空间 - XPShareItemTagQQZone, - ///LIne - XPShareItemTagLine, - ///FaceBook - XPShareItemTagFaceBook, - ///复制链接 - XPShareItemTagCopyLink, - ///应用好友 - XPShareItemTagAppFriends, - ///保存到相册 - XPShareItemTagAppSaveAlbum, -} XPShareItemTag; - -@interface XPShareItem : NSObject -@property(nonatomic,assign) BOOL isShareInvite; -@property (nonatomic, copy) NSString *inviteTitle; -@property (nonatomic, copy) NSString *title; -@property (nonatomic, copy) NSString *imageName; -@property (nonatomic, copy) NSString *disableImageName; -@property (nonatomic, assign) BOOL disable; -@property (nonatomic, assign) XPShareItemTag type; - -+ (instancetype)itemWitTag:(XPShareItemTag)itemTag title:(NSString *)title imageName:(NSString *)imageName disableImageName:(NSString *)disableImageName; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/ShareView/Model/XPShareItem.m b/YuMi/CustomUI/ShareView/Model/XPShareItem.m deleted file mode 100644 index 4a2f76a..0000000 --- a/YuMi/CustomUI/ShareView/Model/XPShareItem.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// YMShareItem.m -// YUMI -// -// Created by YUMI on 2021/11/23. -// - -#import "XPShareItem.h" - -@implementation XPShareItem - -+ (instancetype)itemWitTag:(XPShareItemTag)itemTag title:(NSString *)title imageName:(NSString *)imageName disableImageName:(NSString *)disableImageName { - XPShareItem *item = [[self alloc] init]; - item.type = itemTag; - item.title = title; - item.imageName = imageName; - item.disableImageName = disableImageName; - item.disable = NO; - return item; -} - - -@end diff --git a/YuMi/CustomUI/ShareView/View/XPShareItemCell.h b/YuMi/CustomUI/ShareView/View/XPShareItemCell.h deleted file mode 100644 index d70aa25..0000000 --- a/YuMi/CustomUI/ShareView/View/XPShareItemCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMShareItemCell.h -// YMRoomMoudle -// -// Created by YUMI on 2022/9/2. -// Copyright © 2023 YUMI. All rights reserved. -// - -#import -#import "XPShareItem.h" - -@interface XPShareItemCell : UICollectionViewCell - -@property (nonatomic, strong) XPShareItem *shareItem; - -@end diff --git a/YuMi/CustomUI/ShareView/View/XPShareItemCell.m b/YuMi/CustomUI/ShareView/View/XPShareItemCell.m deleted file mode 100644 index 6a56068..0000000 --- a/YuMi/CustomUI/ShareView/View/XPShareItemCell.m +++ /dev/null @@ -1,78 +0,0 @@ -// -// YMShareItemCell.m -// YMRoomMoudle -// -// Created by YUMI on 2022/9/2. -// Copyright © 2023 YUMI. All rights reserved. -// - -#import "XPShareItemCell.h" -#import "DJDKMIMOMColor.h" -#import - -@interface XPShareItemCell() - -@property (nonatomic, strong) UIImageView *iconImageView; -@property (nonatomic, strong) UILabel *titleLabel; - -@end - -@implementation XPShareItemCell - -#pragma mark - Life Style -- (instancetype)initWithFrame:(CGRect)frame{ - if (self=[super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews{ - [self.contentView addSubview:self.iconImageView]; - [self.contentView addSubview:self.titleLabel]; - -} -- (void)initSubViewConstraints{ - CGFloat wh = 30; - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.equalTo(@(wh)); - make.top.equalTo(self.contentView); - make.centerX.equalTo(self.contentView); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.equalTo(self.contentView).inset(5); - make.top.equalTo(self.iconImageView.mas_bottom).offset(10); - }]; -} - -#pragma mark - Getters And Setters -- (void)setShareItem:(XPShareItem *)shareItem{ - _shareItem = shareItem; - self.userInteractionEnabled = shareItem.disable; - if (!shareItem.disable) { - self.iconImageView.image = [UIImage imageNamed:shareItem.disableImageName]; - }else{ - self.iconImageView.image = [UIImage imageNamed:shareItem.imageName]; - } - self.titleLabel.text = shareItem.title; -} - - -- (UIImageView *)iconImageView{ - if (!_iconImageView) { - _iconImageView = [[UIImageView alloc] init]; - } - return _iconImageView; -} -- (UILabel *)titleLabel{ - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [DJDKMIMOMColor alertMessageColor]; - _titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:12]; - _titleLabel.numberOfLines = 2; - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} -@end diff --git a/YuMi/CustomUI/ShareView/XPShareView.h b/YuMi/CustomUI/ShareView/XPShareView.h deleted file mode 100644 index 6b92871..0000000 --- a/YuMi/CustomUI/ShareView/XPShareView.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// XCShareView.h -// XCRoomMoudle -// -// Created by KevinWang on 2018/9/2. -// Copyright © 2018年 YiZhuan. All rights reserved. -// - -#import -#import "XPShareItem.h" -#import "XPShareInfoModel.h" - -@class XPShareView; -@protocol XCShareViewDelegate -@optional -///点击保存图片到相册 -- (void)shareView:(XPShareView *)shareView savePhoto:(XPShareInfoModel *)shareInfo; -///点了取消分享 -- (void)shareViewDidClickCancel:(XPShareView *)shareView; -///分享成功 -- (void)shareView:(XPShareView *)shareView didSuccess:(XPShareInfoModel *)shareInfo; -///分享失败 -- (void)shareView:(XPShareView *)shareView shareFail:(NSString *)message; -@end; - -@interface XPShareView : UIView - -@property (nonatomic, weak) id delegate; -@property (nonatomic,assign) BOOL isFromWebVeiw; - - -- (instancetype)initWithItems:(NSArray *)items itemSize:(CGSize)itemSize shareInfo:(XPShareInfoModel *)shareInfo; - -@end diff --git a/YuMi/CustomUI/ShareView/XPShareView.m b/YuMi/CustomUI/ShareView/XPShareView.m deleted file mode 100644 index fa3282e..0000000 --- a/YuMi/CustomUI/ShareView/XPShareView.m +++ /dev/null @@ -1,329 +0,0 @@ -// -// XCShareView.m -// XCRoomMoudle -// -// Created by KevinWang on 2018/9/2. -// Copyright © 2018年 YiZhuan. All rights reserved. -// - -#import "XPShareView.h" -///Third -#import -#import -#import -#import -#import "XCCurrentVCStackManager.h" -///Tool -#import "TTPopup.h" - -///View -#import "XPShareItemCell.h" -#import "XPMineShareViewController.h" -#import "ClientConfig.h" - -@interface XPShareView() -///取消 -@property (nonatomic, strong) UIButton *cancleButton; -///列表 -@property (nonatomic, strong) UICollectionView *collectionView; -///数据源 -@property (nonatomic, strong) NSArray *items; -///item的大小 -@property (nonatomic,assign) CGSize itemSize; -///分享的内容 -@property (nonatomic,strong) XPShareInfoModel *shareInfo; -@end - -@implementation XPShareView - -#pragma mark - Life Style -- (instancetype)initWithItems:(NSArray *)items itemSize:(CGSize)itemSize shareInfo:(XPShareInfoModel *)shareInfo { - if (self = [super init]) { - for (XPShareItem * item in items) { - if (item.type == XPShareItemTagAppFriends || item.type == XPShareItemTagCopyLink) { - item.disable = YES; - } else { - item.disable = [self isInstallClient:[self getSharePlatformType:item.type]]; - } - } - self.items = [NSMutableArray arrayWithArray:items]; - self.itemSize =itemSize; - self.shareInfo = shareInfo; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.collectionView]; - [self addSubview:self.cancleButton]; -} - -- (void)initSubViewConstraints { - - CGFloat collectionWidth = KScreenWidth - 15 * 2; - ///一行有几个 - int numberLine = collectionWidth / self.itemSize.width; - int page = self.items.count % numberLine > 0 ? (int)self.items.count / numberLine + 1 : (int)self.items.count / numberLine; - CGFloat collectionHeight = page * self.itemSize.height + 20 + (page-1) * 10 + 10; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self); - make.height.mas_equalTo(collectionHeight); - make.leading.trailing.mas_equalTo(self).inset(15); - }]; - - [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(45); - make.leading.trailing.mas_equalTo(self.collectionView); - make.top.mas_equalTo(self.collectionView.mas_bottom).offset(15); - }]; - - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.bottom.mas_equalTo(self.cancleButton.mas_bottom).offset(30); - }]; -} - - -- (BOOL)isInstallClient:(SSDKPlatformType)platform { - return [ShareSDK isClientInstalled:platform]; -} - -- (SSDKPlatformType)getSharePlatformType:(XPShareItemTag)itemTag { - SSDKPlatformType type; - switch (itemTag) { - case XPShareItemTagFaceBook: - type = SSDKPlatformTypeFacebook; - break; - case XPShareItemTagLine: - type = SSDKPlatformTypeLine; - break; - default: - type = SSDKPlatformTypeUnknown; - break; - } - return type; -} - -#pragma mark - UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ - return self.items.count; -} -- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - XPShareItemCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPShareItemCell class]) forIndexPath:indexPath]; - XPShareItem * item = [self.items xpSafeObjectAtIndex:indexPath.item]; - item.disable = YES; - cell.shareItem = item; - return cell; -} -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - - NSMutableDictionary *shareParams = [NSMutableDictionary dictionary]; - NSString * title = [self.shareInfo shareTitle].length > 0 ? self.shareInfo.shareTitle : @""; - NSString * content = self.shareInfo.shareContent.length > 0 ? self.shareInfo.shareContent : @""; - NSString * urlString = self.shareInfo.shareUrl.length > 0 ?self.shareInfo.shareUrl : @""; - if ([urlString containsString:@"?"]){ - urlString = [NSString stringWithFormat:@"%@&lang=%@",urlString,[NSBundle uploadLanguageText]]; - }else{ - urlString = [NSString stringWithFormat:@"%@?lang=%@",urlString,[NSBundle uploadLanguageText]]; - } - - NSString *encodedUrl = [urlString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]; - - XPShareItem * item = [self.items xpSafeObjectAtIndex:indexPath.item]; - if (item == nil){ - [TTPopup dismiss]; - return; - }; - if (item.type == XPShareItemTagAppSaveAlbum){ - [TTPopup dismiss]; - if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:savePhoto:)]){ - [self.delegate shareView:self savePhoto:self.shareInfo]; - } - return; - } - if (item.type == XPShareItemTagAppFriends) { - [TTPopup dismiss]; - XPMineShareViewController * shareVC = [[XPMineShareViewController alloc] init]; - shareVC.shareType = MineShareType_Monents; - shareVC.shareInfo = self.shareInfo; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:shareVC animated:YES]; - return; - } else if(item.type == XPShareItemTagCopyLink) { - NSString * urlString = self.shareInfo.shareUrl; - UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; - [pasteboard setString:urlString]; - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPShareView0")]; - - [TTPopup dismiss]; - return; - } - if([self isInstallClient:[self getSharePlatformType:item.type]] == NO){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPShareView9")]; - [TTPopup dismiss]; - return; - } - - // 添加类型安全检查，防止NSTaggedPointerString错误 - if ([self.shareInfo isKindOfClass:[XPShareInfoModel class]] && [item isKindOfClass:[XPShareItem class]]) { - self.shareInfo.shareType = item.type; - } else { - NSLog(@"警告：self.shareInfo不是XPShareInfoModel类型，而是%@类型", NSStringFromClass([self.shareInfo class])); - [TTPopup dismiss]; - return; - } - - SSDKPlatformType platformType = SSDKPlatformTypeCopy; - - if (item.type == XPShareItemTagLine) { - title = YMLocalizedString(@"XPShareView1"); - platformType = SSDKPlatformTypeLine; - if (![ShareSDK isClientInstalled:platformType]) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPShareView2")]; - return; - } - NSString*contentKey= [encodedUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet characterSetWithCharactersInString:@"`#%^{}\"[]|\\<> "].invertedSet]; - NSString*contentType =@"text"; - NSString*urlString = [NSString stringWithFormat:@"line://msg/%@/%@",contentType, contentKey]; - - [[UIApplication sharedApplication]openURL:[NSURL URLWithString:urlString] options:@{} completionHandler:^(BOOL success) { - - }]; - - if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:didSuccess:)]) { - [self.delegate shareView:self didSuccess:self.shareInfo]; - } - return; - - } - if(item.type == XPShareItemTagFaceBook){ - FBSDKShareLinkContent*linkContent = [[FBSDKShareLinkContent alloc]init]; - urlString = [urlString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]; - linkContent.contentURL= [NSURL URLWithString:urlString]; - linkContent.quote = content; - FBSDKShareDialog *shareDialog = [[FBSDKShareDialog alloc]initWithViewController:[XCCurrentVCStackManager shareManager].getCurrentVC content:linkContent delegate:self]; - // 需要指定模式，否则会调起web分享 - shareDialog.mode = FBSDKShareDialogModeNative; - if (![shareDialog canShow]) { - shareDialog.mode = FBSDKShareDialogModeWeb; - } - - - [shareDialog show]; - return; - } - - [ShareSDK share:platformType parameters:shareParams onStateChanged:^(SSDKResponseState state, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error) { - switch (state) { - case SSDKResponseStateSuccess: - { - if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:didSuccess:)]) { - [self.delegate shareView:self didSuccess:self.shareInfo]; - } - } - break; - case SSDKResponseStateFail: - { - if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:shareFail:)]) { - [self.delegate shareView:self shareFail:YMLocalizedString(@"XPShareView5")]; - } - } - break; - case SSDKResponseStateCancel: - { - if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:shareFail:)]) { - [self.delegate shareView:self shareFail:YMLocalizedString(@"XPShareView6")]; - } - } - break; - default: - break; - } - }]; -} -#pragma mark - FBSDKSharingDelegate -/// Sent to the delegate when sharing completes without error or cancellation. -/// @param sharer The sharer that completed. -/// @param results The results from the sharer. This may be nil or empty. -- (void)sharer:(id _Nonnull)sharer didCompleteWithResults:(NSDictionary * _Nonnull)results{ - NSString *postId = results[@"postId"]; - FBSDKShareDialog *dialog = (FBSDKShareDialog *)sharer; - if (dialog.mode == FBSDKShareDialogModeBrowser && (postId == nil || [postId isEqualToString:@""])) { - // 如果使用webview分享的，但postId是空的， - // 这种情况是用户点击了『完成』按钮，并没有真的分享 - if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:shareFail:)]) { - [self.delegate shareView:self shareFail:YMLocalizedString(@"XPShareView6")]; - } - } else { - if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:didSuccess:)]) { - [self.delegate shareView:self didSuccess:self.shareInfo]; - } - } -} -/// Sent to the delegate when the sharer encounters an error. -/// @param sharer The sharer that completed. -/// @param error The error. -- (void)sharer:(id _Nonnull)sharer didFailWithError:(NSError * _Nonnull)error{ - FBSDKShareDialog *dialog = (FBSDKShareDialog *)sharer; - if (error == nil && dialog.mode == FBSDKShareDialogModeNative) { - // 如果使用原生登录失败，但error为空，那是因为用户没有安装Facebook app - // 重设dialog的mode，再次弹出对话框 - dialog.mode = FBSDKShareDialogModeBrowser; - [dialog show]; - } else { - if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:shareFail:)]) { - [self.delegate shareView:self shareFail:YMLocalizedString(@"XPShareView5")]; - } - } -} -/// Sent to the delegate when the sharer is cancelled. -/// @param sharer The sharer that completed. -- (void)sharerDidCancel:(id _Nonnull)sharer{ - if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:shareFail:)]) { - [self.delegate shareView:self shareFail:YMLocalizedString(@"XPShareView6")]; - } -} -#pragma mark - Event Response -- (void)cancleButtonDidClck:(UIButton *)button{ - if (self.delegate && [self.delegate respondsToSelector:@selector(shareViewDidClickCancel:)]) { - [self.delegate shareViewDidClickCancel:self]; - } -} - -#pragma mark - Getters And Setters -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.itemSize = self.itemSize; - layout.minimumInteritemSpacing = 0; - layout.minimumLineSpacing = 10; - layout.sectionInset = UIEdgeInsetsMake(20, 0, 10, 0); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.backgroundColor = [UIColor whiteColor]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.layer.masksToBounds = YES; - _collectionView.layer.cornerRadius = 15; - [_collectionView registerClass:[XPShareItemCell class] forCellWithReuseIdentifier:NSStringFromClass([XPShareItemCell class])]; - } - return _collectionView; -} - -- (UIButton *)cancleButton{ - if (!_cancleButton) { - _cancleButton = [[UIButton alloc] init]; - [_cancleButton setBackgroundColor:[UIColor whiteColor]]; - [_cancleButton setTitle:YMLocalizedString(@"XPShareView7") forState:UIControlStateNormal]; - _cancleButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:15]; - _cancleButton.layer.masksToBounds = YES; - _cancleButton.layer.cornerRadius = 45/2; - [_cancleButton setTitleColor:[DJDKMIMOMColor textThirdColor] forState:UIControlStateNormal]; - [_cancleButton addTarget:self action:@selector(cancleButtonDidClck:) forControlEvents:UIControlEventTouchUpInside]; - } - return _cancleButton; -} - -@end diff --git a/YuMi/CustomUI/XNDJTDDLoadingTool.m b/YuMi/CustomUI/XNDJTDDLoadingTool.m index 0e9c64d..8c361f6 100644 --- a/YuMi/CustomUI/XNDJTDDLoadingTool.m +++ b/YuMi/CustomUI/XNDJTDDLoadingTool.m @@ -10,7 +10,6 @@ #import "GCDHelper.h" #import #import "MvpViewController.h" -#import #define kDelayTime 2.5 @interface XNDJTDDLoadingTool () @@ -330,26 +329,6 @@ static NSArray * _animationImages = nil; UIView *bgView = [UIView new]; bgView.backgroundColor = [UIColor clearColor]; bgView.frame = CGRectMake(0, 0, 100, 150); - SVGAParser *parser = [[SVGAParser alloc]init]; - SVGAImageView* playView = [[SVGAImageView alloc]init]; - playView.contentMode = UIViewContentModeScaleAspectFit; - playView.frame = CGRectMake(0, 0, 100,150); - playView.backgroundColor = [UIColor clearColor]; - playView.userInteractionEnabled = NO; - - [parser parseWithNamed:@"pi_new_loading" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - - playView.layer.masksToBounds = YES; - playView.contentMode = UIViewContentModeScaleAspectFill; - - - playView.videoItem = videoItem; - [playView startAnimation]; - } failureBlock:^(NSError * _Nonnull error) { - - }]; - - [bgView addSubview:playView]; return bgView; } diff --git a/YuMi/E-P/NewMoments/Controllers/EPMomentViewController.m b/YuMi/E-P/NewMoments/Controllers/EPMomentViewController.m index 1ed4d36..de42bf9 100644 --- a/YuMi/E-P/NewMoments/Controllers/EPMomentViewController.m +++ b/YuMi/E-P/NewMoments/Controllers/EPMomentViewController.m @@ -162,9 +162,9 @@ - (EPMomentListView *)listView { if (!_listView) { _listView = [[EPMomentListView alloc] initWithFrame:CGRectZero]; - __weak typeof(self) weakSelf = self; +// __weak typeof(self) weakSelf = self; _listView.onSelectMoment = ^(NSInteger index) { - __strong typeof(weakSelf) self = weakSelf; +// __strong typeof(weakSelf) self = weakSelf; // [self showAlertWithMessage:[NSString stringWithFormat:YMLocalizedString(@"moment.item_clicked"), (long)index]]; }; } diff --git a/YuMi/E-P/NewTabBar/EPTabBarController.swift b/YuMi/E-P/NewTabBar/EPTabBarController.swift index 8dd1278..496c57b 100644 --- a/YuMi/E-P/NewTabBar/EPTabBarController.swift +++ b/YuMi/E-P/NewTabBar/EPTabBarController.swift @@ -15,9 +15,6 @@ import SnapKit // MARK: - Properties - /// 全局事件管理器 - private var globalEventManager: GlobalEventManager? - /// 是否已登录 private var isLoggedIn: Bool = false @@ -50,14 +47,12 @@ import SnapKit performAutoLogin() setupCustomFloatingTabBar() - setupGlobalManagers() setupInitialViewControllers() NSLog("[EPTabBarController] 悬浮 TabBar 初始化完成") } deinit { - globalEventManager?.removeAllDelegates() NSLog("[EPTabBarController] 已释放") } @@ -232,25 +227,6 @@ import SnapKit } } - /// 设置全局管理器 - private func setupGlobalManagers() { - globalEventManager = GlobalEventManager.shared() - globalEventManager?.setupSDKDelegates() - - // TODO: v0.2 版本暂时禁用房间最小化视图（无房间功能） - // 后续版本可通过 Build Configuration 或版本号判断是否启用 - /* - if let containerView = view { - globalEventManager?.setupRoomMiniView(on: containerView) - } - */ - - // 注册社交分享回调 - globalEventManager?.registerSocialShareCallback() - - NSLog("[EPTabBarController] 全局管理器设置完成（v0.2 - 无 MiniRoom）") - } - /// 设置初始 ViewController（未登录状态） private func setupInitialViewControllers() { // TODO: 暂时使用空白页面占位 diff --git a/YuMi/Global/BuglyManager.h b/YuMi/Global/BuglyManager.h deleted file mode 100644 index 78dc5c7..0000000 --- a/YuMi/Global/BuglyManager.h +++ /dev/null @@ -1,121 +0,0 @@ -// -// BuglyManager.h -// YuMi -// -// Created by BuglyManager -// Copyright © 2024 YuMi. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class BuglyManager; - -/** - * BuglyManager 代理协议 - * 用于监听卡顿和性能问题 - */ -@protocol BuglyManagerDelegate - -@optional -/** - * 检测到卡顿时的回调 - * @param manager BuglyManager 实例 - * @param duration 卡顿持续时间（秒） - */ -- (void)buglyManager:(BuglyManager *)manager didDetectLag:(NSTimeInterval)duration; - -/** - * 检测到主线程阻塞时的回调 - * @param manager BuglyManager 实例 - * @param duration 阻塞持续时间（秒） - */ -- (void)buglyManager:(BuglyManager *)manager didDetectBlock:(NSTimeInterval)duration; - -@end - -/** - * Bugly 统一管理类 - * 封装所有 Bugly 相关操作，提供统一的错误上报和性能监控接口 - */ -@interface BuglyManager : NSObject - -/** - * 单例访问方法 - * @return BuglyManager 单例实例 - */ -+ (instancetype)sharedManager; - -/** - * 设置代理对象 - */ -@property (nonatomic, assign) id delegate; - -/** - * 配置并启动 Bugly - * @param appId Bugly 应用 ID - * @param isDebug 是否为调试模式 - */ -- (void)configureWithAppId:(NSString *)appId debug:(BOOL)isDebug; - -/** - * 上报错误信息 - * @param domain 错误域 - * @param code 错误码 - * @param userInfo 错误详细信息 - */ -- (void)reportError:(NSString *)domain - code:(NSInteger)code - userInfo:(NSDictionary *)userInfo; - -/** - * 上报业务错误（简化版） - * @param message 错误消息 - * @param code 错误码 - * @param context 错误上下文信息 - */ -- (void)reportBusinessError:(NSString *)message - code:(NSInteger)code - context:(NSDictionary *)context; - -/** - * 上报网络请求异常 - * @param uid 用户ID - * @param api 接口路径 - * @param code 错误码 - * @param userInfo 额外信息 - */ -- (void)reportNetworkError:(NSString *)uid - api:(NSString *)api - code:(NSInteger)code - userInfo:(NSDictionary *)userInfo; - -/** - * 上报内购相关错误 - * @param uid 用户ID - * @param transactionId 交易ID - * @param orderId 订单ID - * @param status 状态码 - * @param context 上下文信息 - */ -- (void)reportIAPError:(NSString *)uid - transactionId:(NSString *)transactionId - orderId:(NSString *)orderId - status:(NSInteger)status - context:(NSDictionary *)context; - -/** - * 手动触发卡顿检测 - */ -- (void)startLagDetection; - -/** - * 模拟卡顿检测（测试用） - * 用于测试按钮，直接增加计数 - */ -- (void)simulateLagDetection; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Global/BuglyManager.m b/YuMi/Global/BuglyManager.m deleted file mode 100644 index f2fe02c..0000000 --- a/YuMi/Global/BuglyManager.m +++ /dev/null @@ -1,406 +0,0 @@ -// -// BuglyManager.m -// YuMi -// -// Created by BuglyManager -// Copyright © 2024 YuMi. All rights reserved. -// - -#import "BuglyManager.h" -#import -#import "TurboModeStateManager.h" - -@interface BuglyManager () - -@property (nonatomic, strong) NSString *appId; -@property (nonatomic, assign) BOOL isConfigured; - -// 卡顿计数相关 -@property (nonatomic, assign) NSInteger lagCount; -@property (nonatomic, assign) BOOL isInRoom; -@property (nonatomic, assign) BOOL isTurboModeEnabled; - -@end - -@implementation BuglyManager - -#pragma mark - Singleton - -+ (instancetype)sharedManager { - static BuglyManager *instance = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - instance = [[BuglyManager alloc] init]; - }); - return instance; -} - -- (instancetype)init { - self = [super init]; - if (self) { - _isConfigured = NO; - _lagCount = 0; - _isInRoom = NO; - _isTurboModeEnabled = NO; - - // 监听 turbo mode 状态变化 - [self setupTurboModeNotifications]; - - // 🔧 修复：初始化时获取当前 turbo mode 状态 - [self updateTurboModeState]; - } - return self; -} - -#pragma mark - BuglyDelegate -- (NSString * BLY_NULLABLE)attachmentForException:(NSException * BLY_NULLABLE)exception { - NSString *message = [NSString stringWithFormat:@"%@ - %@", exception.name, exception.reason]; - [self handleLagDetection:message]; - return message; -} - -#pragma mark - Public Methods - -- (void)configureWithAppId:(NSString *)appId debug:(BOOL)isDebug { - if (self.isConfigured) { - NSLog(@"[BuglyManager] Bugly 已经配置，跳过重复配置"); - return; - } - - if (!appId || appId.length == 0) { - NSLog(@"[BuglyManager] 错误：appId 不能为空"); - return; - } - - self.appId = appId; - - // 创建 Bugly 配置 - BuglyConfig *config = [[BuglyConfig alloc] init]; - config.delegate = self; - - // 基础配置 - config.blockMonitorTimeout = 3.0; // 卡顿监控超时时间：3秒 - config.blockMonitorEnable = YES; // 启用卡顿监控 - - // 调试模式配置 - if (isDebug) { - config.debugMode = NO; // 生产环境关闭调试模式 - config.channel = [self getAppChannel]; - config.reportLogLevel = BuglyLogLevelWarn; // 设置日志级别 - } else { - config.unexpectedTerminatingDetectionEnable = YES; // 非正常退出事件记录 - config.debugMode = NO; - config.channel = [self getAppChannel]; - config.blockMonitorEnable = YES; - config.reportLogLevel = BuglyLogLevelWarn; - } - // 启动 Bugly - [Bugly startWithAppId:appId config:config]; - - self.isConfigured = YES; - - NSLog(@"[BuglyManager] Bugly 配置完成 - AppID: %@, Debug: %@", appId, isDebug ? @"YES" : @"NO"); -} - -- (void)reportError:(NSString *)domain - code:(NSInteger)code - userInfo:(NSDictionary *)userInfo { - - if (!self.isConfigured) { - NSLog(@"[BuglyManager] 错误：Bugly 未配置，无法上报错误"); - return; - } - - if (!domain || domain.length == 0) { - domain = @"UnknownError"; - } - - // 创建错误对象 - NSError *error = [NSError errorWithDomain:domain - code:code - userInfo:userInfo]; - - // 异步上报错误 - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ - [Bugly reportError:error]; - NSLog(@"[BuglyManager] 错误上报成功 - Domain: %@, Code: %ld", domain, (long)code); - }); -} - -- (void)reportBusinessError:(NSString *)message - code:(NSInteger)code - context:(NSDictionary *)context { - - NSMutableDictionary *userInfo = [NSMutableDictionary dictionary]; - - // 添加基础信息 - if (message && message.length > 0) { - [userInfo setObject:message forKey:@"error_message"]; - } - [userInfo setObject:@(code) forKey:@"error_code"]; - [userInfo setObject:@"BusinessError" forKey:@"error_type"]; - - // 添加上下文信息 - if (context && context.count > 0) { - [userInfo addEntriesFromDictionary:context]; - } - - // 添加时间戳 - [userInfo setObject:@([[NSDate date] timeIntervalSince1970]) forKey:@"timestamp"]; - - [self reportError:@"BusinessError" code:code userInfo:userInfo]; -} - -- (void)reportNetworkError:(NSString *)uid - api:(NSString *)api - code:(NSInteger)code - userInfo:(NSDictionary *)userInfo { - - NSMutableDictionary *errorInfo = [NSMutableDictionary dictionary]; - - // 添加网络错误特有信息 - if (uid && uid.length > 0) { - [errorInfo setObject:uid forKey:@"user_id"]; - } - if (api && api.length > 0) { - [errorInfo setObject:api forKey:@"api_path"]; - } - [errorInfo setObject:@(code) forKey:@"http_code"]; - [errorInfo setObject:@"NetworkError" forKey:@"error_type"]; - - // 添加调用栈信息 - [errorInfo setObject:[NSThread callStackSymbols] forKey:@"call_stack_symbols"]; - - // 合并额外信息 - if (userInfo && userInfo.count > 0) { - [errorInfo addEntriesFromDictionary:userInfo]; - } - - [self reportError:@"NetworkError" code:code userInfo:errorInfo]; -} - -- (void)reportIAPError:(NSString *)uid - transactionId:(NSString *)transactionId - orderId:(NSString *)orderId - status:(NSInteger)status - context:(NSDictionary *)context { - - NSMutableDictionary *errorInfo = [NSMutableDictionary dictionary]; - - // 添加内购错误特有信息 - if (uid && uid.length > 0) { - [errorInfo setObject:uid forKey:@"user_id"]; - } - if (transactionId && transactionId.length > 0) { - [errorInfo setObject:transactionId forKey:@"transaction_id"]; - } - if (orderId && orderId.length > 0) { - [errorInfo setObject:orderId forKey:@"order_id"]; - } - [errorInfo setObject:@(status) forKey:@"status_code"]; - [errorInfo setObject:@"IAPError" forKey:@"error_type"]; - - // 添加状态描述 - NSString *statusMsg = [self getIAPStatusMessage:status]; - if (statusMsg) { - [errorInfo setObject:statusMsg forKey:@"status_message"]; - } - - // 合并上下文信息 - if (context && context.count > 0) { - [errorInfo addEntriesFromDictionary:context]; - } - - // 生成错误码 - NSInteger errorCode = -20000 + status; - - [self reportError:@"IAPError" code:errorCode userInfo:errorInfo]; -} - -- (void)startLagDetection { - if (!self.isConfigured) { - NSLog(@"[BuglyManager] 错误：Bugly 未配置，无法启动卡顿检测"); - return; - } - - NSLog(@"[BuglyManager] 手动启动卡顿检测"); - // Bugly 会自动进行卡顿检测，这里主要是日志记录 -} - -#pragma mark - 测试方法 - -- (void)simulateLagDetection { - NSLog(@"[BuglyManager] 🧪 模拟卡顿检测（测试按钮触发）"); - - // 模拟卡顿检测，触发计数逻辑 - [self handleLagCountWithDuration:3.0 stackTrace:@"模拟卡顿 - 测试按钮触发"]; -} - -#pragma mark - Private Methods - -- (void)handleLagDetection:(NSString *)stackTrace { - NSLog(@"[BuglyManager] 🚨 检测到卡顿 - StackTrace: %@", stackTrace); - - // 计算卡顿持续时间（这里假设为3秒，实际应该从 Bugly 配置中获取） - NSTimeInterval duration = 3.0; - - // 通知代理 - if (self.delegate && [self.delegate respondsToSelector:@selector(buglyManager:didDetectLag:)]) { - dispatch_async(dispatch_get_main_queue(), ^{ - [(id)self.delegate buglyManager:self didDetectLag:duration]; - }); - } - - // 🔧 新增：卡顿计数逻辑 - [self handleLagCountWithDuration:duration stackTrace:stackTrace]; -} - -#pragma mark - 卡顿计数逻辑 - -- (void)handleLagCountWithDuration:(NSTimeInterval)duration stackTrace:(NSString *)stackTrace { - // 规则2：当 turbo mode 开启时，不计数 - if (self.isTurboModeEnabled) { - NSLog(@"[BuglyManager] 🎮 Turbo Mode 已开启，跳过卡顿计数"); - return; - } - - // 规则1：只有在房间内才计数 - if (!self.isInRoom) { - NSLog(@"[BuglyManager] 🏠 不在房间内，跳过卡顿计数"); - return; - } - - // 增加计数 - self.lagCount++; - NSLog(@"[BuglyManager] 📊 卡顿计数: %ld/3", (long)self.lagCount); - - // 检查是否达到3次 - if (self.lagCount >= 3) { - NSLog(@"[BuglyManager] 🚨 累计卡顿3次，触发 Turbo Mode Tips"); - - // 发送通知给 Tips Manager - dispatch_async(dispatch_get_main_queue(), ^{ - [[NSNotificationCenter defaultCenter] postNotificationName:@"BuglyManagerDidDetectLag" - object:nil - userInfo:@{@"duration": @(duration), - @"stackTrace": stackTrace ?: @"", - @"lagCount": @(self.lagCount), - @"shouldShowTips": @YES}]; - }); - - // 重置计数 - self.lagCount = 0; - } else { - // 未达到3次，只发送计数通知 - dispatch_async(dispatch_get_main_queue(), ^{ - [[NSNotificationCenter defaultCenter] postNotificationName:@"BuglyManagerDidDetectLag" - object:nil - userInfo:@{@"duration": @(duration), - @"stackTrace": stackTrace ?: @"", - @"lagCount": @(self.lagCount), - @"shouldShowTips": @NO}]; - }); - } -} - -- (void)setupTurboModeNotifications { - // 监听 turbo mode 状态变化 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(turboModeStateChanged:) - name:@"TurboModeStateChanged" - object:nil]; - - // 监听房间进入/退出 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(roomDidEnter:) - name:@"RoomDidEnter" - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(roomDidExit:) - name:@"RoomDidExit" - object:nil]; -} - -- (void)turboModeStateChanged:(NSNotification *)notification { - NSNumber *enabled = notification.userInfo[@"enabled"]; - if (enabled) { - self.isTurboModeEnabled = [enabled boolValue]; - NSLog(@"[BuglyManager] 🎮 Turbo Mode 状态变化: %@", enabled.boolValue ? @"开启" : @"关闭"); - - // 规则2：当 turbo mode 开启时，计数复位为0 - if (enabled.boolValue) { - self.lagCount = 0; - NSLog(@"[BuglyManager] 🔄 Turbo Mode 开启，卡顿计数复位为0"); - } - } -} - -- (void)roomDidEnter:(NSNotification *)notification { - self.isInRoom = YES; - - // 🔧 修复：进入房间时主动获取当前 turbo mode 状态 - [self updateTurboModeState]; - - NSLog(@"[BuglyManager] 🏠 用户进入房间，开始卡顿监控 - Turbo Mode: %@", - self.isTurboModeEnabled ? @"开启" : @"关闭"); -} - -- (void)roomDidExit:(NSNotification *)notification { - self.isInRoom = NO; - // 规则3：当用户退出房间时，计数复位为0 - self.lagCount = 0; - NSLog(@"[BuglyManager] 🚪 用户退出房间，卡顿计数复位为0"); -} - -#pragma mark - 状态更新方法 - -- (void)updateTurboModeState { - // 从 TurboModeStateManager 获取当前状态 - BOOL currentTurboModeState = [[TurboModeStateManager sharedManager] isTurboModeEnabled]; - - if (self.isTurboModeEnabled != currentTurboModeState) { - self.isTurboModeEnabled = currentTurboModeState; - NSLog(@"[BuglyManager] 🔄 主动更新 Turbo Mode 状态: %@", - currentTurboModeState ? @"开启" : @"关闭"); - - // 如果 turbo mode 开启，计数复位为0 - if (currentTurboModeState) { - self.lagCount = 0; - NSLog(@"[BuglyManager] 🔄 Turbo Mode 开启，卡顿计数复位为0"); - } - } -} - -- (NSString *)getAppChannel { - // 这里应该调用项目中的工具方法获取渠道信息 - // 暂时返回默认值 - return @"AppStore"; -} - -#pragma mark - Dealloc - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (NSString *)getIAPStatusMessage:(NSInteger)status { - switch (status) { - case 0: - return @"尝试验单"; - case 1: - return @"验单-补单成功"; - case 2: - return @"验单-补单失败"; - case 3: - return @"验单-补单 id 异常"; - case 4: - return @"重试次数过多"; - case 5: - return @"过期交易清理"; - default: - return @"未知状态"; - } -} - -@end diff --git a/YuMi/Global/GlobalEventManager.h b/YuMi/Global/GlobalEventManager.h deleted file mode 100644 index d2fcb65..0000000 --- a/YuMi/Global/GlobalEventManager.h +++ /dev/null @@ -1,71 +0,0 @@ -// -// GlobalEventManager.h -// YuMi -// -// Created by AI on 2025-10-09. -// Copyright © 2025 YuMi. All rights reserved. -// - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -/// 全局事件管理器 -/// 负责处理原 TabBar 中的全局逻辑（SDK 代理、房间最小化、通知等） -@interface GlobalEventManager : NSObject - -/// 单例 -+ (instancetype)shared; - -// MARK: - SDK Delegates Setup - -/// 设置所有第三方 SDK 的代理 -- (void)setupSDKDelegates; - -/// 移除所有代理（dealloc 时调用） -- (void)removeAllDelegates; - -// MARK: - Room Mini View - -/// 设置房间最小化视图 -/// @param containerView 父视图（通常是 TabBar 的 view） -- (void)setupRoomMiniViewOn:(UIView *)containerView; - -/// 处理房间最小化通知 -/// @param userInfo 通知携带的数据 -- (void)handleRoomMini:(NSDictionary * _Nullable)userInfo; - -/// 隐藏房间最小化视图 -- (void)hideRoomMiniView; - -// MARK: - Global Notifications - -/// 处理配置重载通知 -- (void)handleConfigReload; - -/// 处理新用户充值通知 -- (void)handleNewUserRecharge; - -/// 处理主播卡片通知 -/// @param notification 通知对象 -- (void)handleAnchorCard:(NSNotification * _Nullable)notification; - -/// 处理语言切换通知 -/// @param notification 通知对象 -- (void)handleLanguageSwitch:(NSNotification * _Nullable)notification; - -// MARK: - User Info - -/// 获取用户信息成功后的处理 -/// @param userInfo 用户信息模型 -- (void)handleUserInfoSuccess:(id)userInfo; - -// MARK: - Social Share - -/// 注册社交分享回调 -- (void)registerSocialShareCallback; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Global/GlobalEventManager.m b/YuMi/Global/GlobalEventManager.m deleted file mode 100644 index d50d83a..0000000 --- a/YuMi/Global/GlobalEventManager.m +++ /dev/null @@ -1,242 +0,0 @@ -// -// GlobalEventManager.m -// YuMi -// -// Created by AI on 2025-10-09. -// Copyright © 2025 YuMi. All rights reserved. -// - -#import "GlobalEventManager.h" -#import "XPMiniRoomView.h" -#import "RoomBoomManager.h" -#import "PublicRoomManager.h" -#import "XPSkillCardPlayerManager.h" -#import "SocialShareManager.h" -#import "YUMIConstant.h" -#import - -@interface GlobalEventManager () - -// MARK: - Private Properties - -/// 房间最小化视图 -@property (nonatomic, strong) XPMiniRoomView *miniRoomView; - -/// 配置重载回调 -@property (nonatomic, copy) void(^configReloadCallback)(void); - -/// 新用户充值回调 -@property (nonatomic, copy) void(^newUserRechargeCallback)(void); - -@end - -@implementation GlobalEventManager - -// MARK: - Lifecycle - -+ (instancetype)shared { - static GlobalEventManager *instance = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - instance = [[GlobalEventManager alloc] init]; - }); - return instance; -} - -- (instancetype)init { - if (self = [super init]) { - [self setupNotificationObservers]; - } - return self; -} - -- (void)dealloc { - [self removeAllDelegates]; - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -// MARK: - SDK Delegates Setup - -- (void)setupSDKDelegates { - // NIMSDK 代理设置 - [[NIMSDK sharedSDK].loginManager addDelegate:self]; - [[NIMSDK sharedSDK].chatManager addDelegate:self]; - [[NIMSDK sharedSDK].systemNotificationManager addDelegate:self]; - [[NIMSDK sharedSDK].broadcastManager addDelegate:self]; - - // RoomBoomManager 回调注册 - __weak typeof(self) weakSelf = self; - [[RoomBoomManager sharedManager] registerBoomBanner:^(id sth) { - __strong typeof(weakSelf) strongSelf = weakSelf; - if (!strongSelf) return; - - dispatch_async(dispatch_get_main_queue(), ^{ - // 检查用户是否在房间中 - if ([XPSkillCardPlayerManager shareInstance].isInRoom) { - NSLog(@"[GlobalEventManager] 收到 RoomBoom 通知"); - // TODO: 显示 Boom Banner - // [RoomBoomBannerAnimation display:window with:sth tapToRoom:YES complete:^{}]; - } - }); - } target:self]; - - NSLog(@"[GlobalEventManager] SDK 代理设置完成"); -} - -- (void)removeAllDelegates { - [[NIMSDK sharedSDK].loginManager removeDelegate:self]; - [[NIMSDK sharedSDK].chatManager removeDelegate:self]; - [[NIMSDK sharedSDK].systemNotificationManager removeDelegate:self]; - [[NIMSDK sharedSDK].broadcastManager removeDelegate:self]; - [[RoomBoomManager sharedManager] removeEventListenerForTarget:self]; - - NSLog(@"[GlobalEventManager] 所有代理已移除"); -} - -// MARK: - Room Mini View - -- (void)setupRoomMiniViewOn:(UIView *)containerView { - if (!self.miniRoomView) { - self.miniRoomView = [[XPMiniRoomView alloc] init]; - } - [containerView addSubview:self.miniRoomView]; - NSLog(@"[GlobalEventManager] 房间最小化视图已添加"); -} - -- (void)handleRoomMini:(NSDictionary *)userInfo { - if (self.miniRoomView) { - // TODO: 处理房间最小化逻辑 - NSLog(@"[GlobalEventManager] 处理房间最小化: %@", userInfo); - } -} - -- (void)hideRoomMiniView { - if (self.miniRoomView) { - [self.miniRoomView hiddenRoomMiniView]; - NSLog(@"[GlobalEventManager] 房间最小化视图已隐藏"); - } -} - -// MARK: - Notification Observers - -- (void)setupNotificationObservers { - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; - - // 房间最小化通知 - [center addObserver:self - selector:@selector(onRoomMiniNotification:) - name:kRoomMiniNotificationKey - object:nil]; - - // 配置重载通知 - [center addObserver:self - selector:@selector(onConfigReloadNotification:) - name:@"reloadAfterLoadConfig" - object:nil]; - - // 语言切换通知 - [center addObserver:self - selector:@selector(onLanguageSwitchNotification:) - name:@"kSwitchLanguage" - object:nil]; - - NSLog(@"[GlobalEventManager] 通知监听已设置"); -} - -- (void)onRoomMiniNotification:(NSNotification *)notification { - [self handleRoomMini:notification.userInfo]; -} - -- (void)onConfigReloadNotification:(NSNotification *)notification { - [self handleConfigReload]; -} - -- (void)onLanguageSwitchNotification:(NSNotification *)notification { - [self handleLanguageSwitch:notification]; -} - -// MARK: - Global Notifications Handler - -- (void)handleConfigReload { - NSLog(@"[GlobalEventManager] 配置重载"); - if (self.configReloadCallback) { - self.configReloadCallback(); - } -} - -- (void)handleNewUserRecharge { - NSLog(@"[GlobalEventManager] 新用户充值"); - if (self.newUserRechargeCallback) { - self.newUserRechargeCallback(); - } -} - -- (void)handleAnchorCard:(NSNotification *)notification { - NSLog(@"[GlobalEventManager] 主播卡片通知: %@", notification.userInfo); - // TODO: 实现主播卡片逻辑 -} - -- (void)handleLanguageSwitch:(NSNotification *)notification { - NSLog(@"[GlobalEventManager] 语言切换: %@", notification.userInfo); - // TODO: 实现语言切换逻辑 -} - -// MARK: - User Info - -- (void)handleUserInfoSuccess:(id)userInfo { - NSLog(@"[GlobalEventManager] 用户信息获取成功"); - - // 更新各个 Manager 的用户信息 - if ([userInfo respondsToSelector:@selector(uid)]) { - [[PublicRoomManager sharedManager] initialize]; - [[PublicRoomManager sharedManager] updateUserInfo:userInfo]; - [[RoomBoomManager sharedManager] saveUserInfo:userInfo]; - [[XPSkillCardPlayerManager shareInstance] setUserInfoModel:userInfo]; - } -} - -// MARK: - Social Share - -- (void)registerSocialShareCallback { - // 延迟 2 秒检查社交分享 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [[SocialShareManager sharedManager] checkSocialShareItem]; - NSLog(@"[GlobalEventManager] 社交分享回调已注册"); - }); -} - -// MARK: - NIMSDK Delegate Methods - -#pragma mark - NIMLoginManagerDelegate - -- (void)onLogin:(NIMLoginStep)step { - NSLog(@"[GlobalEventManager] NIMSDK 登录步骤: %ld", (long)step); -} - -- (void)onKickout:(NIMKickReason)code clientType:(NIMLoginClientType)clientType { - NSLog(@"[GlobalEventManager] NIMSDK 被踢出: reason=%ld, clientType=%ld", (long)code, (long)clientType); -} - -- (void)onAutoLoginFailed:(NSError *)error { - NSLog(@"[GlobalEventManager] NIMSDK 自动登录失败: %@", error); -} - -#pragma mark - NIMChatManagerDelegate - -- (void)onRecvMessages:(NSArray *)messages { - NSLog(@"[GlobalEventManager] 收到 %lu 条消息", (unsigned long)messages.count); -} - -#pragma mark - NIMSystemNotificationManagerDelegate - -- (void)onReceiveSystemNotification:(NIMSystemNotification *)notification { - NSLog(@"[GlobalEventManager] 收到系统通知: %@", notification.notificationId); -} - -#pragma mark - NIMBroadcastManagerDelegate - -- (void)onReceiveBroadcastMessage:(NIMBroadcastMessage *)message { - NSLog(@"[GlobalEventManager] 收到广播消息: %@", message.content); -} - -@end diff --git a/YuMi/GoogleService-Info.plist b/YuMi/GoogleService-Info.plist deleted file mode 100644 index d42c18c..0000000 --- a/YuMi/GoogleService-Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - CLIENT_ID - 656602722869-mviv7k9179auv8qj7t0qfavk2qqkumtv.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.656602722869-mviv7k9179auv8qj7t0qfavk2qqkumtv - API_KEY - AIzaSyBefrmWsUaNHTZ4sySqJ7cvlaHLhfYrLAo - GCM_SENDER_ID - 656602722869 - PLIST_VERSION - 1 - BUNDLE_ID - com.hflighting.yumi - PROJECT_ID - pekolive-30f9e - STORAGE_BUCKET - pekolive-30f9e.appspot.com - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:656602722869:ios:dbd3b206c835c50121f77c - - \ No newline at end of file diff --git a/YuMi/Info.plist b/YuMi/Info.plist index 98d2155..e864069 100644 --- a/YuMi/Info.plist +++ b/YuMi/Info.plist @@ -15,13 +15,6 @@ CFBundleLocalizations en - tr - zh - ar - pt-BR - es - ru - uz CFBundleName $(PRODUCT_NAME) @@ -30,92 +23,30 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleURLTypes - - - CFBundleTypeRole - Editor - CFBundleURLSchemes - - com.googleusercontent.apps.766987211654-f02ueos1jutp7vfn3ntht5pk4oi33jor - - - - CFBundleTypeRole - Editor - CFBundleURLSchemes - - molistar - - - + CFBundleVersion 1 - FacebookAppID - 1266232494209868 - FacebookAutoLogAppEventsEnabled - - FacebookClientToken - 189d1a90712cc61cedded4cf1372cb21 - FacebookDisplayName - E-Party ITSAppUsesNonExemptEncryption - LSApplicationQueriesSchemes - - fb-messenger-api - line3rdp.$(PRODUCT_BUNDLE_IDENTIFIER) - lineauth - line - lineauth2 - fbapi20150629 - fbapi20160328 - fbshareextension - fbapi - fbapi20130214 - fbauth - fbauth2 - fbapi - fb-messenger-share-api - LSRequiresIPhoneOS - LineSDKConfig - - ChannelID - 1657475529 - - MOBAppKey - 36b91eeac7469 - MOBAppSecret - 63ec0702513aca17e20615dd5dfdc03f - MOBNetLater - 2 NSAppTransportSecurity NSAllowsArbitraryLoads NSCameraUsageDescription - "E-Party"需要您的同意,才可以访问进行拍照并上传您的图片，然后展示在您的个人主页上，便于他人查看 + "E-Party"需要您的同意,才可以访问进行拍照并上传您的图片，然后展示在您的个人主页上，便于他人查看 NSLocalNetworkUsageDescription 此App将可发现和连接到您所用网络上的设备。 - NSLocationWhenInUseUsageDescription - "E-Party"需要您的同意,才可以进行定位服务，推荐附近好友 - NSMicrophoneUsageDescription - "E-Party"需要您的同意,才可以进行语音聊天 NSPhotoLibraryAddUsageDescription - "E-Party"需要您的同意,才可以存储相片到相册 + "E-Party"需要您的同意,才可以存储相片到相册 NSPhotoLibraryUsageDescription - "E-Party"需要您的同意,才可以访问相册并选择您需要上传的图片，然后展示在您的个人主页上，便于他人查看 + "E-Party"需要您的同意,才可以访问相册并选择您需要上传的图片，然后展示在您的个人主页上，便于他人查看 NSUserTrackingUsageDescription 請允許我們獲取您的IDFA權限，可以為您提供個性化活動和服務。未經您的允許，您的信息將不作其他用途。 UIApplicationSupportsIndirectInputEvents - UIBackgroundModes - - audio - remote-notification - UILaunchStoryboardName Launch Screen.storyboard UIRequiredDeviceCapabilities @@ -126,11 +57,6 @@ UIInterfaceOrientationPortrait - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIViewControllerBasedStatusBarAppearance diff --git a/YuMi/Modules/ShoppingMall/MyDressingDataModel.h b/YuMi/Modules/ShoppingMall/MyDressingDataModel.h deleted file mode 100644 index f67ac45..0000000 --- a/YuMi/Modules/ShoppingMall/MyDressingDataModel.h +++ /dev/null @@ -1,60 +0,0 @@ -// -// MyDressingDataModel.h -// YuMi -// -// Created by P on 2024/11/19. -// - -#import "PIBaseModel.h" -#import "CarModel.h" -#import "NobleCardModel.h" -#import "NameplateModel.h" -#import "ChatBubbleModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MyDressingDataModel : PIBaseModel - -//dressId = 191; -//dressType = 0; -//effect = "https://image.pekolive.com/Vip1headdress.svga"; -//effectType = 2; -//expireDays = 44; -//expireTime = 1735812327000; -//hasExpired = 0; -//name = "VIP1\U982d\U98fe"; -//obtainWay = 1; -//pic = "https://image.pekolive.com/Vip1headdress.png"; -//used = 0; - -@property(nonatomic, assign) NSInteger id; -@property(nonatomic, copy) NSString *dressId; -@property(nonatomic, assign) NSInteger dressType; -@property(nonatomic, copy) NSString *effect; -@property(nonatomic, assign) NSInteger effectType; -@property(nonatomic, assign) NSInteger expireDays; -@property(nonatomic, assign) NSInteger expireTime; -@property(nonatomic, assign) BOOL hasExpired; -@property(nonatomic, copy) NSString *name; -@property(nonatomic, assign) NSInteger obtainWay; // "获得方式，1-普通，2-活动" -@property(nonatomic, copy) NSString *pic; -@property(nonatomic, assign) NSInteger used; -@property(nonatomic, strong) NSNumber *discount; - -@property(nonatomic, assign) NSInteger dressDay; -@property(nonatomic, assign) CGFloat discountPrice; -@property(nonatomic, assign) NSInteger vipLevel; -@property(nonatomic, assign) NSInteger dressPrice; -@property(nonatomic, copy) NSString *dressShopId; - - -- (NSString *)expiredContent; -- (NSMutableAttributedString *)generateAttributedStringWithIncludeOriginalPrice:(BOOL)includeOriginalPrice; - -+ (MyDressingDataModel *)modelFromVehicle:(CarModel *)model; -+ (MyDressingDataModel *)modelFromNameplate:(NameplateModel *)model; -+ (MyDressingDataModel *)modelFromNobelCard:(NobleCardModel *)model; -+ (MyDressingDataModel *)modelFromChatBubble:(ChatBubbleModel *)model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/ShoppingMall/MyDressingDataModel.m b/YuMi/Modules/ShoppingMall/MyDressingDataModel.m deleted file mode 100644 index 89ff4d1..0000000 --- a/YuMi/Modules/ShoppingMall/MyDressingDataModel.m +++ /dev/null @@ -1,207 +0,0 @@ -// -// MyDressingDataModel.m -// YuMi -// -// Created by P on 2024/11/19. -// - -#import "MyDressingDataModel.h" - -@implementation MyDressingDataModel - -// JSON 字段映射 -+ (NSDictionary *)mj_replacedKeyFromPropertyName { - return @{ - @"dressShopId" : @"id" - }; -} - -//// 自定义转换逻辑 -//- (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property { -// if ([property.name isEqualToString:@"dressShopId"]) { -// if ([oldValue isKindOfClass:[NSNumber class]]) { -// // 将 NSNumber 转换为 NSString -// return [oldValue stringValue]; -// } -// } -// return oldValue; -//} - -- (NSString *)expiredContent { - if (self.hasExpired) { - return YMLocalizedString(@"XPMineCarTableViewCell1"); - } else { - NSString *content = @""; - if (self.expireDays < 1) { - content = YMLocalizedString(@"1.0.30_text_13"); - } else { - content = [NSString stringWithFormat:YMLocalizedString(@"1.0.18_8"), @(self.expireDays)]; - } - return content; - } -} - -- (NSMutableAttributedString *)generateAttributedStringWithIncludeOriginalPrice:(BOOL)includeOriginalPrice { - // 创建一个 NSMutableAttributedString 来存放最终的结果 - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; - - // 1. 添加金币图片 - NSTextAttachment *coinAttachment = [[NSTextAttachment alloc] init]; - coinAttachment.image = kImage(@"moli_money_icon"); // 替换为你的金币图片名称 - coinAttachment.bounds = CGRectMake(0, -2, 18, 18); // 设置图片大小和位置，偏移量适当调整 - NSAttributedString *coinString = [NSAttributedString attributedStringWithAttachment:coinAttachment]; - [attributedString appendAttributedString:coinString]; - - // 2. 添加空格 - NSAttributedString *spaceString = [[NSAttributedString alloc] initWithString:@" "]; - [attributedString appendAttributedString:spaceString]; - - // 3. 添加 price 文本，字体加粗，颜色 #F8CE1F，字体大小 25 - NSDictionary *priceAttributes = @{ - NSFontAttributeName: kFontSemibold(15), - NSForegroundColorAttributeName: UIColorFromRGB(0xF8CE1F) - }; - NSString *formattedPriceString = [self formatPrice: self.vipLevel>0 ? self.discountPrice : self.dressPrice]; - NSAttributedString *priceString = [[NSAttributedString alloc] initWithString:formattedPriceString attributes:priceAttributes]; - [attributedString appendAttributedString:priceString]; - - // 4. 添加 day 文本，字体常规，颜色 #F8CE1F，字体大小 12 - NSDictionary *dayAttributes = @{ - NSFontAttributeName: kFontRegular(12), - NSForegroundColorAttributeName: UIColorFromRGB(0xF8CE1F) - }; - NSString *formattedDayString = [NSString stringWithFormat:@"/%ldD ", (long)self.dressDay]; - NSAttributedString *dayString = [[NSAttributedString alloc] initWithString:formattedDayString attributes:dayAttributes]; - [attributedString appendAttributedString:dayString]; - - // 如果需要添加原始价格 - if (includeOriginalPrice && self.vipLevel > 0) { - NSDictionary *originalPriceAttributes = @{ - NSFontAttributeName: kFontRegular(12), - NSForegroundColorAttributeName: UIColorRGBAlpha(0xD9E7F7, 0.5f), - NSStrikethroughStyleAttributeName: @(NSUnderlineStyleSingle), // 单条删除线 - NSStrikethroughColorAttributeName: UIColorRGBAlpha(0xD9E7F7, 0.5f) // 删除线颜色 - }; - NSString *originalPriceString = [NSString stringWithFormat:@"%@", [self formatPrice:self.dressPrice]]; - NSAttributedString *originalPriceAttributedString = [[NSAttributedString alloc] initWithString:originalPriceString attributes:originalPriceAttributes]; - [attributedString appendAttributedString:originalPriceAttributedString]; - } - - return attributedString; -} - -// 辅助方法：格式化价格，支持 0-2 位小数 -- (NSString *)formatPrice:(CGFloat)price { -// if (fmod(price, 1.0) == 0.0) { -// // 整数，移除小数部分 -// return [NSString stringWithFormat:@"%.0f", price]; -// } else if (fmod(price * 10, 1.0) == 0.0) { -// // 保留 1 位小数 -// return [NSString stringWithFormat:@"%.1f", price]; -// } else { -// // 保留 2 位小数 -// return [NSString stringWithFormat:@"%.2f", price]; -// } - - NSString *priceString = [NSString stringWithFormat:@"%.8f", price]; // 确保保留足够的位数 - NSArray *components = [priceString componentsSeparatedByString:@"."]; // 分割整数和小数部分 - NSString *integerPart = components[0]; - NSString *decimalPart = components.count > 1 ? components[1] : @""; - - if (decimalPart.length > 2) { - // 保留最多两位有效小数，直接截断 - decimalPart = [decimalPart substringToIndex:2]; - } - - if ([decimalPart isEqualToString:@"00"]) { - // 如果小数部分为 00，只返回整数部分 - return integerPart; - } else if ([decimalPart hasSuffix:@"0"]) { - // 如果小数部分以 0 结尾，保留 1 位小数 - decimalPart = [decimalPart substringToIndex:1]; - } - - // 拼接整数和截断后的小数部分 - return [NSString stringWithFormat:@"%@.%@", integerPart, decimalPart]; -} - - -+ (MyDressingDataModel *)modelFromVehicle:(CarModel *)model { - MyDressingDataModel *myDressingVehicle = [[MyDressingDataModel alloc] init]; - myDressingVehicle.dressId = model.dressShopId; - myDressingVehicle.id = model.carID.integerValue; - myDressingVehicle.pic = model.pic; - myDressingVehicle.name = model.name; - myDressingVehicle.used = model.using; - myDressingVehicle.expireDays = model.expireDate; - myDressingVehicle.hasExpired = (model.status != 3 || model.expireDate<0); - myDressingVehicle.dressType = 1; - myDressingVehicle.discount = model.discount; - myDressingVehicle.discountPrice = model.discountPrice; - myDressingVehicle.dressPrice = model.dressPrice; - myDressingVehicle.vipLevel = model.vipLevel; - myDressingVehicle.dressShopId = model.dressShopId; - myDressingVehicle.effect = model.effect; - - return myDressingVehicle; -} - -+ (MyDressingDataModel *)modelFromNameplate:(NameplateModel *)model { - MyDressingDataModel *myDressingNameplate = [[MyDressingDataModel alloc] init]; - myDressingNameplate.pic = model.nameplateImage; - myDressingNameplate.name = model.nameplateName; - myDressingNameplate.used = model.isUsing; - myDressingNameplate.expireDays = model.expireDays; - myDressingNameplate.expireTime = model.expireTime; - myDressingNameplate.hasExpired = model.isExpired; - myDressingNameplate.id = model.nId.integerValue; - myDressingNameplate.dressId = model.dressShopId;// model.nameplateId; - myDressingNameplate.dressType = 2; - myDressingNameplate.discount = model.discount; - myDressingNameplate.dressDay = model.dressDay; - myDressingNameplate.discountPrice = model.discountPrice; - myDressingNameplate.vipLevel = model.vipLevel; - myDressingNameplate.dressPrice = model.dressPrice; - myDressingNameplate.dressShopId = model.dressShopId; - myDressingNameplate.effect = model.effect; - myDressingNameplate.effectType = model.effectType; - return myDressingNameplate; -} - -+ (MyDressingDataModel *)modelFromNobelCard:(NobleCardModel *)model { - MyDressingDataModel *myDressingNobrlCard = [[MyDressingDataModel alloc] init]; - myDressingNobrlCard.pic = model.pic; - myDressingNobrlCard.effect = model.effect; - myDressingNobrlCard.name = model.name; - myDressingNobrlCard.used = model.used; - myDressingNobrlCard.expireDays = model.expireDays; - myDressingNobrlCard.expireTime = model.expireTime.integerValue; - myDressingNobrlCard.hasExpired = model.hasExpired; - myDressingNobrlCard.dressId = model.cardId; - myDressingNobrlCard.dressType = 3; - myDressingNobrlCard.discount = model.discount; - myDressingNobrlCard.dressDay = model.dressDay; - myDressingNobrlCard.discountPrice = model.discountPrice; - myDressingNobrlCard.vipLevel = model.vipLevel; - myDressingNobrlCard.dressPrice = model.dressPrice; - myDressingNobrlCard.dressShopId = model.dressShopId; - myDressingNobrlCard.effectType = model.effectType; - return myDressingNobrlCard; -} - -+ (MyDressingDataModel *)modelFromChatBubble:(ChatBubbleModel *)model { - MyDressingDataModel *myDressingBubble = [[MyDressingDataModel alloc] init]; - myDressingBubble.pic = model.bubbleUrl; - myDressingBubble.dressId = model.bubbleId; - myDressingBubble.expireDays = model.expireDays; - myDressingBubble.name = model.name; - myDressingBubble.used = model.hasUsed; - myDressingBubble.hasExpired = model.hasExpired; - myDressingBubble.dressType = 4; - myDressingBubble.dressShopId = model.bubbleId; - myDressingBubble.effect = model.effect; - myDressingBubble.effectType = model.effectType; - return myDressingBubble; -} - -@end diff --git a/YuMi/Modules/ShoppingMall/MyDressingDataPresent.h b/YuMi/Modules/ShoppingMall/MyDressingDataPresent.h deleted file mode 100644 index b24e957..0000000 --- a/YuMi/Modules/ShoppingMall/MyDressingDataPresent.h +++ /dev/null @@ -1,53 +0,0 @@ -// -// MyDressingDataPresent.h -// YuMi -// -// Created by P on 2024/11/19. -// - -#import "BaseMvpPresenter.h" -#import "CarModel.h" -#import "UserInfoModel.h" -#import "NobleCardModel.h" -#import "HeadwearModel.h" -#import "NameplateModel.h" -#import "ChatBubbleModel.h" -#import "MyDressingDataModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MyDressingDataPresent : BaseMvpPresenter - -- (void)loadVehicles:(void(^)(NSArray *array))success - failure:(void(^)(NSError *error))failure; - -- (void)loadNameplate:(NSInteger)page - success:(void(^)(NSArray *array))success - failure:(void(^)(NSError *error))failure; - -- (void)loadRoomCard:(NSInteger)page - success:(void(^)(NSArray *array))success - failure:(void(^)(NSError *error))failure; - -- (void)loadBubble:(NSInteger)page - success:(void(^)(NSArray *array))success - failure:(void(^)(NSError *error))failure; - -- (void)loadMyDressingItems:(NSInteger)type - page:(NSInteger)page - success:(void(^)(NSArray *array, NSInteger type))success - failure:(void(^)(NSError *error))failure; - -- (void)useDressBy:(NSInteger)type - dressID:(NSInteger)dressID - success:(void(^)(UserInfoModel *userInfo))success - failure:(void(^)(NSError *error))failure; - -- (void)rebuyItem:(NSString *)itemID - success:(void(^)(id obj))success - failure:(void(^)(NSError *error))failure; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/ShoppingMall/MyDressingDataPresent.m b/YuMi/Modules/ShoppingMall/MyDressingDataPresent.m deleted file mode 100644 index 8a1b646..0000000 --- a/YuMi/Modules/ShoppingMall/MyDressingDataPresent.m +++ /dev/null @@ -1,170 +0,0 @@ -// -// MyDressingDataPresent.m -// YuMi -// -// Created by P on 2024/11/19. -// - -#import "MyDressingDataPresent.h" -#import "Api+DressUp.h" - -@implementation MyDressingDataPresent - -- (void)loadHeadWears:(void(^)(NSArray *array))success - failure:(void(^)(NSError *error))failure { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api headwearList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HeadwearModel modelsWithArray:data.data]; - if (success) { - success(array); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:NO errorToast:YES] ticket:ticket uid:uid]; -} - -- (void)loadVehicles:(void(^)(NSArray *array))success - failure:(void(^)(NSError *error))failure { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api carList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [CarModel modelsWithArray:data.data]; - if (success) { - success(array); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:NO errorToast:YES] ticket:ticket uid:uid]; -} - -- (void)loadNameplate:(NSInteger)page - success:(void(^)(NSArray *array))success - failure:(void(^)(NSError *error))failure { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api nameplateList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - NSArray *array = [NameplateModel modelsWithArray:data.data[@"nameplateList"]]; - success(array); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:page != 1 errorToast:YES] - ticket:ticket - uid:uid - page:@(page).stringValue - pageSize:@"20"]; -} - -- (void)loadRoomCard:(NSInteger)page - success:(void(^)(NSArray *array))success - failure:(void(^)(NSError *error))failure { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api nobleCardList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - NSArray * array = [NobleCardModel modelsWithArray:data.data]; - success(array); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:page != 1 errorToast:YES] - ticket:ticket - uid:uid - page:@(page).stringValue - pageSize:@"20"]; -} - -- (void)loadBubble:(NSInteger)page - success:(void(^)(NSArray *array))success - failure:(void(^)(NSError *error))failure { - [Api chatBubbleList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - - if (success) { - NSArray *array = [ChatBubbleModel modelsWithArray:data.data]; - success(array); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:page != 1 errorToast:YES] page:@(page).stringValue pageSize:@"20"]; -} - -- (void)loadMyDressingItems:(NSInteger)type - page:(NSInteger)page - success:(void(^)(NSArray *array, NSInteger type))success - failure:(void(^)(NSError *error))failure { - [Api mineDressItems:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - NSArray *models = [MyDressingDataModel modelsWithArray:data.data]; - success(models, type); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:page != 1 errorToast:YES] - page:@(page).stringValue - pageSize:@"20" - dressType:@(type).stringValue]; -} - -- (void)useDressBy:(NSInteger)type - dressID:(NSInteger)dressID - success:(void(^)(UserInfoModel *userInfo))success - failure:(void(^)(NSError *error))failure { - @kWeakify(self); - [Api optDress:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if (type == 0) { - [self reloadUserInfo:^(UserInfoModel *userInfo) { - if (success) { - success(userInfo); - } - } failure:nil]; - } else { - if (success) { - success(nil); - } - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] - dressType:@(type).stringValue - dressId:@(dressID).stringValue]; -} - -- (void)reloadUserInfo:(void(^)(UserInfoModel *userInfo))success - failure:(void(^)(NSError *error))failure { - NSString * uid = [[AccountInfoStorage instance] getUid]; - if (uid.length == 0) { - return; - } - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - success(infoModel); - } - } fail:nil showLoading:NO errorToast:YES] uid:uid]; -} - -- (void)rebuyItem:(NSString *)itemID - success:(void(^)(id obj))success - failure:(void(^)(NSError *error))failure { - [Api requestDressUpShopBuy:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - success(data.data); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] - id:itemID]; -} - -@end diff --git a/YuMi/Modules/ShoppingMall/MyDressingViewController.h b/YuMi/Modules/ShoppingMall/MyDressingViewController.h deleted file mode 100644 index 6e2a90d..0000000 --- a/YuMi/Modules/ShoppingMall/MyDressingViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MyDressingViewController.h -// YuMi -// -// Created by P on 2024/11/13. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MyDressingViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/ShoppingMall/MyDressingViewController.m b/YuMi/Modules/ShoppingMall/MyDressingViewController.m deleted file mode 100644 index cbb1bd4..0000000 --- a/YuMi/Modules/ShoppingMall/MyDressingViewController.m +++ /dev/null @@ -1,534 +0,0 @@ -// -// MyDressingViewController.m -// YuMi -// -// Created by P on 2024/11/13. -// - -#import "MyDressingViewController.h" -#import -#import -#import "UserInfoModel.h" -#import "MyDressingDataPresent.h" -#import "ShoppingMallItemPreview.h" -#import "XPSkillCardPlayerManager.h" -#import "XPRoomGiftAnimationParser.h" -#import "ShoppingMallCategoryListView.h" - -static NSArray *> *MyDressUpOptions(void) { - return @[ - @{YMLocalizedString(@"XPMineDressUpViewController2") : @1}, // 座驾 - @{YMLocalizedString(@"XPMineDressUpViewController1") : @0}, // 头饰 - @{YMLocalizedString(@"XPMineDressUpViewController3") : @2}, // 铭牌 - @{YMLocalizedString(@"XPMineDressUpViewController4") : @3}, // 资料卡 - @{YMLocalizedString(@"XPMineDressUpViewController5") : @4}, // 聊天气泡 - @{YMLocalizedString(@"1.0.30_text_9") : @5} // 個人頁裝飾 - ]; -} - -@interface MyDressingViewController () - -@property(nonatomic, strong) UserInfoModel *userInfo; - -@property(nonatomic, strong) NetImageView *avatarView; -@property(nonatomic, strong) NetImageView *avatarHeadViewImageView; -@property(nonatomic, strong) SVGAImageView *avatarHeadWearSVGA; - -@property (nonatomic, strong) UIView *playEffectMask; -@property (nonatomic, strong) VAPView *mp4Effect; -@property(nonatomic, strong) XPRoomGiftAnimationParser *mp4Parser; -@property (nonatomic, strong) SVGAImageView *svgaEffect; -@property(nonatomic, strong) UIActivityIndicatorView *loading; - -@property(nonatomic, strong) MyDressingDataModel *selectedModel; - -@property(nonatomic, strong) ShoppingMallCategoryListView *listView; - -@end - -@implementation MyDressingViewController - -- (MyDressingDataPresent *)createPresenter { - return [[MyDressingDataPresent alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.userInfo = [XPSkillCardPlayerManager shareInstance].userInfoModel; - - [self setupUI]; - [self updateAvatar]; -} - -- (void)setupUI { - [self setupBackground]; - [self setupNavigationBar]; - [self setupAvatar]; - [self setupContentList]; -} - -- (void)setupBackground { - self.view.backgroundColor = UIColorFromRGB(0x02061D); - UIImageView *topBG = [[UIImageView alloc] initWithImage:kImage(@"mall_top_bg")]; - [self.view addSubview:topBG]; - [topBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(200)); - }]; -} - -- (void)setupNavigationBar { - UILabel *titleLabel = [self titleLabel]; - UIButton *backButton = [self backButton]; - [self.view addSubview:titleLabel]; - [self.view addSubview:backButton]; - - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.view).offset(44 + 11); - make.height.mas_equalTo(22); - }]; - - [backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).offset(16); - make.centerY.mas_equalTo(titleLabel); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; -} - -- (void)setupAvatar { - [self.view addSubview:self.avatarView]; - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(100); - make.centerX.mas_equalTo(self.view); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(73), kGetScaleWidth(73))); - }]; - - [self.view addSubview:self.avatarHeadViewImageView]; - [self.avatarHeadViewImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarView); - make.size.mas_equalTo(self.avatarView).multipliedBy(1.3); - }]; - - [self.view addSubview:self.avatarHeadWearSVGA]; - [self.avatarHeadWearSVGA mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarView); - make.size.mas_equalTo(self.avatarView).multipliedBy(1.3); - }]; -} - -- (void)setupContentList { - NSInteger bottom = kSafeAreaBottomHeight; - // 内部列表使用 frame 布局，这里要计算 height - ShoppingMallCategoryListView *listView = [[ShoppingMallCategoryListView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight - 100 - 73)]; - listView.isForMyDressingPage = YES; - listView.bottomSpace = bottom; - [self.view addSubview:listView]; - [listView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarView.mas_bottom).offset(16); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; - @kWeakify(self); - listView.fetchDataForMyDressingPage = ^(NSInteger pageIndex, NSInteger pageNum, FetchDataForMyDressingCompletion _Nonnull completion) { - @kStrongify(self); - [self fetchDataForPage:pageIndex - pageNum:pageNum - completion:completion]; - }; - listView.didTapItemPlay = ^(NSString * _Nonnull resourcePath, NSInteger effectType, NSInteger type) { - @kStrongify(self); - CGSize size = CGSizeZero; - switch (type) { - case 0: // 头饰 - size = CGSizeMake(kGetScaleWidth(183), kGetScaleWidth(183)); - break; - case 5: - size = CGSizeMake(KScreenWidth - 20, KScreenWidth - 20); - break; - default: - size = CGSizeMake(KScreenWidth, KScreenHeight); - break; - } - [self playItemEffect:resourcePath effectType:effectType size:size]; - }; - listView.returnMyDressingSelectedModel = ^(MyDressingDataModel * _Nonnull model, NSInteger type, NSIndexPath *indexPath) { - @kStrongify(self); - [self handTapItem:model type:type indexPath:indexPath]; - }; - - listView.items = MyDressUpOptions(); - self.listView = listView; -} - -- (void)updateAvatar { - self.avatarView.imageUrl = self.userInfo.avatar; - if ([NSString isEmpty:self.userInfo.headwearEffect]) { - [self.avatarHeadWearSVGA stopAnimation]; - self.avatarHeadWearSVGA.hidden = YES; - } else { - if ([self.userInfo.headwearEffect.lowercaseString hasSuffix:@"svga"]) { - self.avatarHeadWearSVGA.hidden = NO; - self.avatarHeadViewImageView.hidden = YES; - SVGAParser *p = [[SVGAParser alloc] init]; - [p parseWithURL:[NSURL URLWithString:self.userInfo.headwearEffect] - completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - self.avatarHeadWearSVGA.videoItem = videoItem; - [self.avatarHeadWearSVGA startAnimation]; - self.avatarHeadWearSVGA.hidden = NO; - } failureBlock:^(NSError * _Nullable error) {}]; - } else { - self.avatarHeadWearSVGA.hidden = YES; - self.avatarHeadViewImageView.hidden = NO; - self.avatarHeadViewImageView.imageUrl = self.userInfo.headwearEffect; - } - } -} - -#pragma mark - -- (void)fetchDataForPage:(NSInteger)pageIndex - pageNum:(NSInteger)pageNum - completion:(FetchDataForMyDressingCompletion)completion { - switch (pageIndex) { - case 0: { - [self.presenter loadMyDressingItems:0 - page:pageNum - success:^(NSArray * _Nonnull array, NSInteger type) { - if (completion) { - completion(array); - } - } failure:^(NSError * _Nonnull error) { - - }]; - } - break; - case 1: { - [self.presenter loadVehicles:^(NSArray * _Nonnull array) { - if (completion) { - NSMutableArray *transArray = @[].mutableCopy; - for (CarModel *car in array) { - MyDressingDataModel *model = [MyDressingDataModel modelFromVehicle:car]; - [transArray addObject:model]; - } - completion(transArray); - } - } failure:^(NSError * _Nonnull error) { }]; - } - break; - case 2: { - [self.presenter loadNameplate:pageNum - success:^(NSArray * _Nonnull array) { - if (completion) { - NSMutableArray *transArray = @[].mutableCopy; - for (NameplateModel *nameplate in array) { - MyDressingDataModel *model = [MyDressingDataModel modelFromNameplate:nameplate]; - [transArray addObject:model]; - } - completion(transArray); - } - } failure:^(NSError * _Nonnull error) { - - }]; - } - break; - case 3: { - [self.presenter loadRoomCard:pageNum - success:^(NSArray * _Nonnull array) { - if (completion) { - NSMutableArray *transArray = @[].mutableCopy; - for (NobleCardModel *nobleCard in array) { - MyDressingDataModel *model = [MyDressingDataModel modelFromNobelCard:nobleCard]; - [transArray addObject:model]; - } - completion(transArray); - } - } failure:^(NSError * _Nonnull error) { - - }]; - } - break; - case 4: { - [self.presenter loadBubble:pageNum - success:^(NSArray * _Nonnull array) { - if (completion) { - NSMutableArray *transArray = @[].mutableCopy; - for (ChatBubbleModel *bubble in array) { - MyDressingDataModel *model = [MyDressingDataModel modelFromChatBubble:bubble]; - [transArray addObject:model]; - } - completion(transArray); - } - } failure:^(NSError * _Nonnull error) { - - }]; - } - break; - case 5: { - [self.presenter loadMyDressingItems:5 - page:pageNum - success:^(NSArray * _Nonnull array, NSInteger type) { - if (completion) { - completion(array); - } - } failure:^(NSError * _Nonnull error) { - - }]; - } - break; - default: - break; - } -} - -- (void)handTapItem:(MyDressingDataModel *)model - type:(NSInteger)type - indexPath:(NSIndexPath *)indexPath { - - if (model.hasExpired) { - // 弹窗购买 - BOOL isVaild = model.obtainWay<=1; - if (isVaild) { - isVaild = ![NSString isEmpty:model.dressShopId] && model.dressShopId.integerValue > 0; - } - - ShoppingMallItemPreview *preview = [[ShoppingMallItemPreview alloc] initWithMyDress:model - isVaild:isVaild]; - preview.frame = CGRectMake(0, 0, 284, 353); - [TTPopup popupView:preview style:TTPopupStyleAlert]; - - @kWeakify(self); - [preview setRebuyWith:^(MyDressingDataModel * _Nonnull model) { - @kStrongify(self); - @kWeakify(self) - [self.presenter rebuyItem:model.dressShopId - success:^(id _Nonnull obj) { - @kStrongify(self); - [TTPopup dismiss]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self showSuccessToast:YMLocalizedString(@"XPDressUpShopListViewController0")]; - [self.listView updateSelectedItem:indexPath]; - }); - } failure:^(NSError * _Nonnull error) { - @kStrongify(self); - [self showErrorToast:error.localizedDescription]; - }]; - }]; - } else { - // 直接使用 - NSInteger dressID = 0; - if (model) { - if (type == 1 || type == 2) { - dressID = model.id; - } else { - dressID = model.dressId.integerValue; - } - } - - @kWeakify(self); - [self.presenter useDressBy:type - dressID:dressID - success:^(UserInfoModel *userInfo){ - @kStrongify(self); - if (userInfo) { - self.userInfo = userInfo; - [XPSkillCardPlayerManager shareInstance].userInfoModel = userInfo; - [self updateAvatar]; - } - [self.listView updateSelectedItem:indexPath]; - } failure:^(NSError * _Nonnull error) { -// NSLog(@"%@", error); - }]; - } -} - -#pragma mark - -- (void)didTapBack { - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - -- (void)playItemEffect:(NSString *)path - effectType:(NSInteger)effectType - size:(CGSize)size { - if (!_playEffectMask) { - [self.view addSubview:self.playEffectMask]; - [self.playEffectMask mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - - [self.playEffectMask addSubview:self.svgaEffect]; - [self.playEffectMask addSubview:self.mp4Effect]; - } - - [self.svgaEffect mas_updateConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.playEffectMask); - make.size.mas_equalTo(size); - }]; - - [self.mp4Effect mas_updateConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.playEffectMask); - make.size.mas_equalTo(size); - }]; - - self.playEffectMask.hidden = NO; - [self.loading startAnimating]; - - if ([path.lowercaseString hasSuffix:@"mp4"] || effectType == 1) { - [self playMP4:path]; - } else if ([path.lowercaseString hasSuffix:@"svga"] || effectType == 2) { - [self playSVGA:path]; - } else { - [self playSVGA:path]; - } -} - -- (void)playMP4:(NSString *)path { - @kWeakify(self); - [self.mp4Parser parseWithURL:path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - [self.loading stopAnimating]; - self.mp4Effect.hidden = NO; - [self.mp4Effect playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - [self stopItemEffect]; - }]; -} - -- (void)playSVGA:(NSString *)path { - @kWeakify(self); - SVGAParser *p = [[SVGAParser alloc] init]; - [p parseWithURL:[NSURL URLWithString:path] - completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - [self.loading stopAnimating]; - self.svgaEffect.hidden = NO; - self.svgaEffect.videoItem = videoItem; - [self.svgaEffect startAnimation]; - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - [self stopItemEffect]; - }]; -} - -- (void)stopItemEffect { - [self.loading stopAnimating]; - [self.svgaEffect stopAnimation]; - self.svgaEffect.hidden = YES; - [self.mp4Effect stopHWDMP4]; - self.mp4Effect.hidden = YES; - self.playEffectMask.hidden = YES; -} - -#pragma mark - -- (UIButton *)backButton { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:[kImage(@"common_nav_back_white") ms_SetImageForRTL] - forState:UIControlStateNormal]; - [b addTarget:self - action:@selector(didTapBack) - forControlEvents:UIControlEventTouchUpInside]; - return b; -} - -- (UILabel *)titleLabel { - UILabel *label = [[UILabel alloc] init]; - label.textAlignment = NSTextAlignmentCenter; - label.font = kFontMedium(17); - label.text = YMLocalizedString(@"1.0.30_text_8"); - label.textColor = UIColorFromRGB(0xD9E7F7); - return label; -} - -- (UIView *)playEffectMask { - if (!_playEffectMask) { - _playEffectMask = [[UIView alloc] initWithFrame:self.view.bounds]; - _playEffectMask.backgroundColor = [UIColor colorWithWhite:0 alpha:0.7f]; - [_playEffectMask addSubview:self.loading]; - [self.loading mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(_playEffectMask); - }]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(stopItemEffect)]; - [_playEffectMask addGestureRecognizer:tap]; - } - return _playEffectMask; -} - -- (SVGAImageView *)svgaEffect { - if (!_svgaEffect) { - _svgaEffect = [[SVGAImageView alloc] init]; - _svgaEffect.contentMode = UIViewContentModeScaleAspectFit; - _svgaEffect.autoPlay = YES; - _svgaEffect.loops = 0; - _svgaEffect.clearsAfterStop = YES; - _svgaEffect.hidden = YES; - _svgaEffect.userInteractionEnabled = YES; - } - return _svgaEffect; -} - -- (VAPView *)mp4Effect { - if (!_mp4Effect) { - _mp4Effect = [[VAPView alloc] init]; - _mp4Effect.contentMode = UIViewContentModeScaleAspectFit; - } - return _mp4Effect; -} - -- (XPRoomGiftAnimationParser *)mp4Parser { - if (!_mp4Parser) { - _mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - } - return _mp4Parser; -} - -- (UIActivityIndicatorView *)loading { - if (!_loading) { - UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite]; - indicator.translatesAutoresizingMaskIntoConstraints = NO; - indicator.hidesWhenStopped = YES; - _loading = indicator; - } - return _loading; -} - -- (NetImageView *)avatarHeadViewImageView { - if (!_avatarHeadViewImageView) { - _avatarHeadViewImageView = [[NetImageView alloc] init]; - _avatarHeadViewImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _avatarHeadViewImageView; -} - -- (NetImageView *)avatarView { - if (!_avatarView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarView = [[NetImageView alloc] initWithConfig:config]; - [_avatarView setCornerRadius:kGetScaleWidth(73)/2 - corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner - borderWidth:2 - borderColor:UIColorFromRGB(0xFBD99A)]; - } - return _avatarView; -} - -- (SVGAImageView *)avatarHeadWearSVGA { - if (!_avatarHeadWearSVGA) { - _avatarHeadWearSVGA = [[SVGAImageView alloc] init]; - _avatarHeadWearSVGA.contentMode = UIViewContentModeScaleAspectFit; - _avatarHeadWearSVGA.autoPlay = YES; - _avatarHeadWearSVGA.loops = 0; - _avatarHeadWearSVGA.clearsAfterStop = YES; - } - return _avatarHeadWearSVGA; -} - -@end diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.h b/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.h deleted file mode 100644 index 053626c..0000000 --- a/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// ShoppingMallCategoryListView.h -// YuMi -// -// Created by P on 2024/11/13. -// - -#import - -#import "DressUpShopModel.h" -#import "MyDressingDataModel.h" - -NS_ASSUME_NONNULL_BEGIN - -typedef void (^DidTapPlay)(NSString *resourcePath, NSInteger effectType, NSInteger type); - -typedef void (^FetchDataCompletion)(NSArray * modelList); -typedef void (^FetchDataForPage)(NSInteger pageIndex, FetchDataCompletion completion); -typedef void (^FetchDataForMyDressingCompletion)(NSArray * modelList); -typedef void (^FetchDataForMyDressingPage)(NSInteger pageIndex, NSInteger pageNum, FetchDataForMyDressingCompletion completion); - -@interface ShoppingMallCategoryListView : UIView - -@property(nonatomic, assign) CGFloat bottomSpace; -@property(nonatomic, assign) CGFloat isForMyDressingPage; - -/// 每个 category 的定义，{名称：类型} -@property (nonatomic, copy) NSArray *> *items; -@property (nonatomic, copy) FetchDataForPage fetchDataForPage; -@property(nonatomic, copy) FetchDataForMyDressingPage fetchDataForMyDressingPage; -@property (nonatomic, copy) DidTapPlay didTapItemPlay; -@property(nonatomic, copy) void(^returnSelectedModel)(DressUpShopModel * _Nullable model); -@property(nonatomic, copy) void(^returnMyDressingSelectedModel)(MyDressingDataModel * _Nullable model, NSInteger type, NSIndexPath *indexPath); - -- (void)updateSelectedItem:(NSIndexPath *)indexPath; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.m b/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.m deleted file mode 100644 index 0a3e3c6..0000000 --- a/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.m +++ /dev/null @@ -1,1275 +0,0 @@ -// -// ShoppingMallCategoryListView.m -// YuMi -// -// Created by P on 2024/11/13. -// - -#import "ShoppingMallCategoryListView.h" -#import -#import -#import "MyDressingDataModel.h" -#import "ShoppingMallTagView.h" -#import "XPRoomGiftAnimationParser.h" -#import "XPSkillCardPlayerManager.h" - -@interface ShoppingMallEmptyCard : UICollectionViewCell - -@property(nonatomic, strong) UILabel *defaultLabel; -@property(nonatomic, strong) UIImageView *defaultImageView; - -@end - -@implementation ShoppingMallEmptyCard - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self.contentView addSubview:self.defaultImageView]; - [self.defaultImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(110, 110)); - }]; - - [self.contentView addSubview:self.defaultLabel]; - [self.defaultLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.defaultImageView.mas_bottom).offset(8); - }]; - } - return self; -} - -- (void)prepareForReuse { - [super prepareForReuse]; - self.selected = NO; -} - -- (UILabel *)defaultLabel { - if (!_defaultLabel) { - _defaultLabel = [UILabel labelInitWithText:YMLocalizedString(@"XPMomentsRecommendViewController0") - font:kFontRegular(14) - textColor:[UIColor colorWithWhite:1 alpha:0.4]]; - _defaultLabel.textAlignment = NSTextAlignmentCenter; - } - return _defaultLabel; -} - -- (UIImageView *)defaultImageView { - if (!_defaultImageView) { - _defaultImageView = [[UIImageView alloc] initWithImage:kImage(@"common_empty_UFO")]; - } - return _defaultImageView; -} - -@end - -@interface ShoppingMallRoomCardView : UIView - -@property(nonatomic, copy) NSString *imagePath; -@property(nonatomic, copy) NSString *mp4Path; -@property(nonatomic, copy) NSString *svgaPath; -@property(nonatomic, strong) NetImageView *imageView; -@property(nonatomic, strong) VAPView *mp4View; -@property(nonatomic, strong) XPRoomGiftAnimationParser *mp4Parser; -@property(nonatomic, strong) SVGAImageView *svgaView; -@end - -@implementation ShoppingMallRoomCardView - -- (instancetype)init { - if (self = [super init]) { - self.backgroundColor = [UIColor clearColor]; - - self.imageView = [[NetImageView alloc] init]; - self.imageView.contentMode = UIViewContentModeScaleAspectFill; - [self addSubview:self.imageView]; - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.mp4View]; - [self.mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.svgaView]; - [self.svgaView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self setCornerRadius:8]; - } - return self; -} - -- (void)setImagePath:(NSString *)imagePath { - _imagePath = imagePath; - self.mp4View.hidden = YES; - self.svgaView.hidden = YES; - self.imageView.hidden = NO; - self.imageView.imageUrl = imagePath; -} - -- (void)setMp4Path:(NSString *)mp4Path { - _mp4Path = mp4Path; - self.mp4View.hidden = NO; - self.svgaView.hidden = YES; - self.imageView.hidden = YES; - if (!_mp4Parser) { - self.mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - } - @kWeakify(self); - [self.mp4Parser parseWithURL:mp4Path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl]) { - [self.mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } - } failureBlock:^(NSError * _Nullable error) { - - }]; -} - -- (void)setSvgaPath:(NSString *)svgaPath { - _svgaPath = svgaPath; -} - -- (VAPView *)mp4View { - if (!_mp4View) { - _mp4View = [[VAPView alloc] init]; - _mp4View.contentMode = UIViewContentModeScaleAspectFit; - } - return _mp4View; -} - -- (SVGAImageView *)svgaView { - if (!_svgaView) { - _svgaView = [[SVGAImageView alloc] init]; - _svgaView.contentMode = UIViewContentModeScaleAspectFit; - } - return _svgaView; -} - -@end - -@interface MyDressingItemCard : UICollectionViewCell - -@property(nonatomic, strong) MyDressingDataModel *model; - -@property(nonatomic, strong) VAPView *mp4View; -@property(nonatomic, strong) XPRoomGiftAnimationParser *vapParser; -@property (nonatomic, strong) UIImageView *bgImageView; -@property (nonatomic, strong) UIView *itemBGView; -@property (nonatomic, strong) NetImageView *itemImageView; -@property(nonatomic, strong) ShoppingMallRoomCardView *roomCardView; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UIButton *playButton; -@property (nonatomic, strong) ShoppingMallTagView *statusLabel; -@property (nonatomic, copy) DidTapPlay didTapPlay; -@end - -@implementation MyDressingItemCard - -- (void)dealloc -{ - [self.mp4View stopHWDMP4]; - [self.mp4View removeFromSuperview]; -} - -- (void)prepareForReuse { - [super prepareForReuse]; - self.selected = NO; - [self.mp4View stopHWDMP4]; -} - -- (void)setSelected:(BOOL)selected { - self.bgImageView.image = selected ? kImage(@"mu_dressing_card_selected_bg") : kImage(@"mu_dressing_card_normal_bg") ; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - self.backgroundColor = [UIColor clearColor]; - - [self.contentView addSubview:self.bgImageView]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.contentView addSubview:self.itemBGView]; - [self.itemBGView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.contentView).inset(9); - make.height.mas_equalTo(self.itemBGView.mas_width); - }]; - - [self.contentView addSubview:self.itemImageView]; - [self.itemImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.itemBGView); - make.width.height.mas_equalTo(self.itemBGView.mas_width).multipliedBy(0.8f); - }]; - - [self.contentView addSubview:self.mp4View]; - [self.mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.itemBGView); - make.width.height.mas_equalTo(self.itemBGView.mas_width).multipliedBy(0.8f); - }]; - - [self.contentView addSubview:self.roomCardView]; - [self.roomCardView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.centerX.mas_equalTo(self.itemBGView); - make.width.height.mas_equalTo(self.itemBGView.mas_width);//.multipliedBy(0.8f); - }]; - - [self.contentView addSubview:self.playButton]; - [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.trailing.mas_equalTo(self.itemBGView).offset(-4); - make.size.mas_equalTo(CGSizeMake(26, 22)); - }]; - - [self.contentView addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.itemBGView); - make.top.mas_equalTo(self.itemBGView.mas_bottom).offset(5); - make.height.mas_equalTo(20); - }]; - - [self.contentView addSubview:self.statusLabel]; - [self.statusLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(self.bgImageView).offset(1); - make.width.mas_equalTo(50); - make.height.mas_equalTo(22); - }]; - } - return self; -} - -- (void)setModel:(MyDressingDataModel *)model { - _model = model; - if (model) { - switch (model.dressType) { - case 4:{ - [self.itemImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.itemBGView); - make.width.mas_equalTo(kGetScaleWidth(90)); - make.height.mas_equalTo(kGetScaleWidth(46)); - }]; - [self.contentView layoutIfNeeded]; - } - break; - default: - break; - } - - self.titleLabel.text = model.name; - - if (model.dressType == 3) { - NSString *url = [NSString isEmpty:model.effect] ? model.pic : model.effect; - [self play:url]; - self.playButton.hidden = YES; - self.itemImageView.hidden = YES; - } else { - self.playButton.hidden = [NSString isEmpty:model.effect]; - self.itemImageView.imageUrl = model.pic; - } - - if (model.hasExpired) { - [self.statusLabel updateBackgroundColors:@[UIColorFromRGB(0xC1CDDB)] textColor:UIColorFromRGB(0x2F3450)]; - } else { - [self.statusLabel updateBackgroundColors:@[UIColorFromRGB(0xA1CAFD)] textColor:UIColorFromRGB(0x172055)]; - } - self.statusLabel.text = [model expiredContent]; - [self.statusLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo([self.statusLabel textWidth]); - }]; - [self layoutIfNeeded]; - } else { - self.playButton.hidden = YES; - self.itemImageView.image = kImage(@"mall_item_not_used"); - self.titleLabel.text = YMLocalizedString(@"1.0.30_text_12"); - [self.itemImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.itemBGView); - make.width.height.mas_equalTo(self.itemBGView.mas_width).multipliedBy(0.4f); - }]; - } -} - -- (void)play:(NSString *)effect { - @kWeakify(self); - [self.vapParser parseWithURL:[effect pureURLString] completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [self.mp4View setMute:YES]; - [self.mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:self]; - } - } failureBlock:^(NSError * _Nullable error) { - }]; -} - -- (void)handleTapPlay:(id)sender { - if (_didTapPlay) { - self.didTapPlay(self.model.effect, self.model.effectType, self.model.dressType); - } -} - -#pragma mark - HWDMP4PlayDelegate -- (BOOL)shouldStartPlayMP4:(VAPView *)container config:(QGVAPConfigModel *)config { - return YES; -} - -#pragma mark - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] initWithImage:kImage(@"mu_dressing_card_normal_bg")]; - } - return _bgImageView; -} - -- (UIView *)itemBGView { - if (!_itemBGView) { - _itemBGView = [[UIView alloc] init]; - _itemBGView.backgroundColor = UIColorFromRGB(0x04184A); - [_itemBGView setCornerRadius:6]; - } - - return _itemBGView; -} - -- (NetImageView *)itemImageView { - if (!_itemImageView) { - _itemImageView = [[NetImageView alloc] init]; - _itemImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _itemImageView; -} - -- (ShoppingMallRoomCardView *)roomCardView { - if (!_roomCardView) { - _roomCardView = [[ShoppingMallRoomCardView alloc] init]; - _roomCardView.hidden = YES; - } - return _roomCardView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(14) - textColor:UIColorFromRGB(0xD9E7F7)]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (UIButton *)playButton { - if (!_playButton) { - _playButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_playButton setImage:kImage(@"mall_play_icon") forState:UIControlStateNormal]; - [_playButton addTarget:self - action:@selector(handleTapPlay:) - forControlEvents:UIControlEventTouchUpInside]; - } - return _playButton; -} - -- (ShoppingMallTagView *)statusLabel { - if (!_statusLabel) { - _statusLabel = [[ShoppingMallTagView alloc] init]; - } - return _statusLabel; -} - -- (XPRoomGiftAnimationParser *)vapParser { - if (!_vapParser) { - _vapParser = [[XPRoomGiftAnimationParser alloc] init]; - } - return _vapParser; -} - -- (VAPView *)mp4View { - if (!_mp4View) { - _mp4View = [[VAPView alloc] init]; - _mp4View.contentMode = UIViewContentModeScaleAspectFill; - } - return _mp4View; -} - -@end - -@interface ShoppingMallItemCard : UICollectionViewCell - -@property (nonatomic, strong) DressUpShopModel *cellModel; - -@property (nonatomic, strong) UIImageView *bgImageView; -@property (nonatomic, strong) UIView *itemBGView; -@property (nonatomic, strong) NetImageView *itemImageView; -@property(nonatomic, strong) ShoppingMallRoomCardView *roomCardView; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UIButton *playButton; -@property (nonatomic, strong) UILabel *pricePerDayLabel; -@property (nonatomic, strong) UILabel *description_1_label; -@property (nonatomic, strong) UILabel *description_2_label; -@property (nonatomic, strong) ShoppingMallTagView *statusLabel; - -@property (nonatomic, copy) DidTapPlay didTapPlay; - -@end - -@implementation ShoppingMallItemCard - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - self.backgroundColor = [UIColor clearColor]; - - [self.contentView addSubview:self.bgImageView]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.contentView addSubview:self.itemBGView]; - [self.itemBGView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.contentView).inset(9); - make.height.mas_equalTo(self.itemBGView.mas_width); - }]; - - [self.contentView addSubview:self.itemImageView]; - [self.itemImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.itemBGView); - make.width.height.mas_equalTo(self.itemBGView.mas_width).multipliedBy(0.8f); - }]; - - [self.contentView addSubview:self.roomCardView]; - [self.roomCardView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.centerX.mas_equalTo(self.itemBGView); - make.width.height.mas_equalTo(self.itemBGView.mas_width);//.multipliedBy(0.8f); - }]; - - [self.contentView addSubview:self.playButton]; - [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.trailing.mas_equalTo(self.itemBGView).offset(-4); - make.size.mas_equalTo(CGSizeMake(26, 22)); - }]; - - [self.contentView addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.itemBGView); - make.top.mas_equalTo(self.itemBGView.mas_bottom).offset(5); - make.height.mas_equalTo(20); - }]; - - [self.contentView addSubview:self.pricePerDayLabel]; - [self.pricePerDayLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(6); - make.left.mas_equalTo(self.itemBGView); - make.right.mas_equalTo(self.itemBGView); - }]; - - [self.contentView addSubview:self.description_1_label]; - [self.description_1_label mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.bgImageView).offset(1); - make.bottom.trailing.mas_equalTo(self.bgImageView).offset(-1); - make.height.mas_equalTo(30); - }]; - - [self.contentView addSubview:self.description_2_label]; - [self.description_2_label mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.bgImageView).offset(1); - make.bottom.trailing.mas_equalTo(self.bgImageView).offset(-1); - make.height.mas_equalTo(45); - }]; - - [self.contentView addSubview:self.statusLabel]; - [self.statusLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(self.bgImageView).offset(1); - make.width.mas_equalTo(50); - make.height.mas_equalTo(22); - }]; - } - return self; -} - -- (void)setCellModel:(DressUpShopModel *)cellModel { - _cellModel = cellModel; - - switch (cellModel.dressType) { - case 4:{ - [self.itemImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.itemBGView); - make.width.mas_equalTo(kGetScaleWidth(90)); - make.height.mas_equalTo(kGetScaleWidth(46)); - }]; - [self.contentView layoutIfNeeded]; - } - break; - - default: - break; - } - - if (cellModel.dressType == 3) { - self.itemImageView.hidden = YES; - self.roomCardView.hidden = NO; - switch (cellModel.effectType) { - case 0: - self.roomCardView.imagePath = cellModel.effect; - break; - case 1: - self.roomCardView.mp4Path = cellModel.effect; - break; - case 2: - self.roomCardView.svgaPath = cellModel.effect; - break; - - default: - break; - } - } else { - self.itemImageView.hidden = NO; - self.roomCardView.hidden = YES; - self.itemImageView.imageUrl = cellModel.pic; - } - - self.titleLabel.text = cellModel.name; - self.pricePerDayLabel.attributedText = [cellModel mallItemPricePerDay:YES isFullDisplay:NO]; - - BOOL needUpdateTitleLayout = NO; - if (cellModel.obtainWay > 1) { - // 活动取得类型 - needUpdateTitleLayout = YES; - self.pricePerDayLabel.hidden = YES; - self.description_1_label.hidden = YES; - self.description_2_label.hidden = NO; - self.description_2_label.text = YMLocalizedString(@"1.0.30_text_2"); - } else { - NSInteger myVIPLevel = [[XPSkillCardPlayerManager shareInstance] userInfoModel].userVipInfoVO.vipLevel; - - if (cellModel.vipLimit > myVIPLevel) { - // VIP 等级限定类型 - self.pricePerDayLabel.hidden = NO; - self.description_1_label.hidden = NO; - self.description_2_label.hidden = YES; - self.description_1_label.text = [NSString stringWithFormat:YMLocalizedString(@"1.0.30_text_3"), @(cellModel.vipLimit)]; - } else { - self.pricePerDayLabel.hidden = NO; - self.description_1_label.hidden = NO; - self.description_2_label.hidden = YES; - if (cellModel.vipLevel == 0) { - self.description_1_label.text = YMLocalizedString(@"1.0.30_text_1"); - } else { - NSString *discountPriceString = @"VIP"; - discountPriceString = [discountPriceString stringByAppendingString:@(cellModel.vipLevel).stringValue]; - discountPriceString = [discountPriceString stringByAppendingString:@"-"]; - discountPriceString = [discountPriceString stringByAppendingString:@(cellModel.discount).stringValue]; - discountPriceString = [discountPriceString stringByAppendingString:@"%"]; - self.description_1_label.text = discountPriceString; - } - } - } - - self.playButton.hidden = [NSString isEmpty:cellModel.effect]; - if (cellModel.dressType == 3) { - self.playButton.hidden = YES; - } - - [self.titleLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.itemBGView.mas_bottom).offset(5 + (needUpdateTitleLayout ? 15 : 0)); - }]; - - if (cellModel.dressLimitStatus == 0) { - self.statusLabel.text = YMLocalizedString(@"1.0.30_text_4"); - self.statusLabel.hidden = NO; - [self.statusLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo([self.statusLabel textWidth]); - }]; - } else { - self.statusLabel.hidden = YES; - } - - [self layoutIfNeeded]; -} - -- (void)handleTapPlay:(id)sender { - if (_didTapPlay) { - self.didTapPlay(self.cellModel.effect, self.cellModel.effectType, self.cellModel.dressType); - } -} - -- (void)setSelected:(BOOL)selected { - self.bgImageView.image = selected ? kImage(@"mall_item_card_selected_bg") : kImage(@"mall_item_card_normal_bg") ; -} - -#pragma mark - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] initWithImage:kImage(@"mall_item_card_normal_bg")]; - } - return _bgImageView; -} - -- (UIView *)itemBGView { - if (!_itemBGView) { - _itemBGView = [[UIView alloc] init]; - _itemBGView.backgroundColor = UIColorFromRGB(0x04184A); - [_itemBGView setCornerRadius:6]; - } - - return _itemBGView; -} - -- (NetImageView *)itemImageView { - if (!_itemImageView) { - _itemImageView = [[NetImageView alloc] init]; - _itemImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _itemImageView; -} - -- (ShoppingMallRoomCardView *)roomCardView { - if (!_roomCardView) { - _roomCardView = [[ShoppingMallRoomCardView alloc] init]; - } - return _roomCardView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(14) - textColor:UIColorFromRGB(0xD9E7F7)]; - } - return _titleLabel; -} - -- (UIButton *)playButton { - if (!_playButton) { - _playButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_playButton setImage:kImage(@"mall_play_icon") forState:UIControlStateNormal]; - [_playButton addTarget:self - action:@selector(handleTapPlay:) - forControlEvents:UIControlEventTouchUpInside]; - } - return _playButton; -} - -- (UILabel *)pricePerDayLabel { - if (!_pricePerDayLabel) { - _pricePerDayLabel = [[UILabel alloc] init]; - _pricePerDayLabel.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - return _pricePerDayLabel; -} - -- (UILabel *)description_1_label { - if (!_description_1_label) { - _description_1_label = [UILabel labelInitWithText:@"" - font:kFontRegular(12) - textColor:UIColorRGBAlpha(0xD9E7F7, 0.5)]; - _description_1_label.textAlignment = NSTextAlignmentCenter; - _description_1_label.backgroundColor = UIColorFromRGB(0x002840); - _description_1_label.numberOfLines = 0; - [_description_1_label setCornerRadius:11 - cornerMask:kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner]; - } - return _description_1_label; -} - -- (UILabel *)description_2_label { - if (!_description_2_label) { - _description_2_label = [UILabel labelInitWithText:@"" - font:kFontRegular(12) - textColor:UIColorRGBAlpha(0xD9E7F7, 0.5)]; - _description_2_label.textAlignment = NSTextAlignmentCenter; - _description_2_label.backgroundColor = UIColorFromRGB(0x002840); - _description_2_label.numberOfLines = 0; - [_description_2_label setCornerRadius:11 - cornerMask:kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner]; - } - return _description_2_label; -} - -- (ShoppingMallTagView *)statusLabel { - if (!_statusLabel) { - _statusLabel = [[ShoppingMallTagView alloc] initWithBackgroundColors:@[UIColorFromRGB(0xE29030), UIColorFromRGB(0xFCC074)] - font:kFontMedium(12) - textColor:UIColorFromRGB(0x51281B)]; - } - return _statusLabel; -} - -@end - -@interface ShoppingMallCategoryCard : UIView -@property (nonatomic, strong) UIImageView *selectedStatusView; -@property (nonatomic, strong) UIImageView *icon; -@property (nonatomic, strong) UILabel *title; -@property (nonatomic, assign) BOOL isSelected; - -+ (ShoppingMallCategoryCard *)initCard:(NSDictionary *)dic - frame:(CGRect)frame; -@end - -@implementation ShoppingMallCategoryCard - -+ (ShoppingMallCategoryCard *)initCard:(NSDictionary *)dic - frame:(CGRect)frame { - ShoppingMallCategoryCard *card = [[ShoppingMallCategoryCard alloc] initWithFrame:frame]; - [card update:dic]; - card.isSelected = NO; - return card; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self setCornerRadius:8]; - - self.selectedStatusView = [[UIImageView alloc] initWithFrame:self.bounds]; - self.selectedStatusView.image = kImage(@"mall_category_normal_bg"); - [self addSubview:self.selectedStatusView]; - - self.icon = [[UIImageView alloc] init]; - [self addSubview:self.icon]; - [self.icon mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(8); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(38), kGetScaleWidth(38))); - }]; - - self.title = [UILabel labelInitWithText:@"" - font:kFontRegular(11) - textColor:UIColorFromRGB(0xD9E7F7)]; - self.title.minimumScaleFactor = 0.7; - self.title.adjustsFontSizeToFitWidth = YES; - self.title.textAlignment = NSTextAlignmentCenter; - [self addSubview:self.title]; - [self.title mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(kGetScaleWidth(-11)); - make.leading.trailing.mas_equalTo(self).inset(4); - make.height.mas_equalTo(14); - }]; - } - return self; -} - -- (void)update:(NSDictionary *)dic { - NSNumber *type = [dic.allValues firstObject]; - NSString *key = [dic.allKeys firstObject]; - self.title.text = key; - switch (type.integerValue) { - case 0: - self.icon.image = kImage(@"mall_category_headdress"); - break; - case 1: - self.icon.image = kImage(@"mall_category_vehicle"); - break; - case 2: - self.icon.image = kImage(@"mall_category_nameplate"); - break; - case 3: - self.icon.image = kImage(@"mall_category_room_card"); - break; - case 4: - self.icon.image = kImage(@"mall_category_bubble"); - break; - case 5: - self.icon.image = kImage(@"mall_category_homepage"); - break; - default: - break; - } -} - -- (void)setIsSelected:(BOOL)isSelected { - _isSelected = isSelected; - self.selectedStatusView.image = isSelected ? kImage(@"mall_category_selected_bg") : kImage(@"mall_category_normal_bg"); - self.title.alpha = isSelected ? 1 : 0.5; -} - -@end - -@interface ShoppingMallCategoryListView () -@property (nonatomic, strong) UIScrollView *shoppoingMallCategoryScrollView; -@property (nonatomic, strong) UIScrollView *mallItemsScrollView; -@property (nonatomic, strong) NSMutableArray *categoryCardArray; -@property (nonatomic, strong) NSMutableArray *itemCollectionViewArray; -@property (nonatomic, strong) NSMutableArray *itemCollectionLoadingViewArray; -@property (nonatomic, strong) NSMutableDictionary*> *dataCache; // 缓存每页数据 - 商城页 -@property (nonatomic, strong) NSMutableDictionary*> *myDressingDataCache; // 缓存每页数据 - 我的装扮页 -@property (nonatomic, strong) NSMutableSet *requestedPages; // 记录已经请求的数据页, 通过下标判断 -@property (nonatomic, strong) NSIndexPath *selectedIndexPath; -@property(nonatomic, strong) NSMutableArray *myDressingDataPagesNumbers; //缓存我的装扮页每页的当前 API 分页 -@property(nonatomic, strong) NSMutableArray *myDressingUsingItemPages; //缓存当前分页类目是有使用任何道具 -@property(nonatomic, assign) NSInteger currengCategoryIndex; -@end - -@implementation ShoppingMallCategoryListView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self setupUI]; - } - return self; -} - -- (instancetype)init { - if (self = [super init]) { - [self setupUI]; - } - return self; -} - -- (void)setupUI { - self.backgroundColor = [UIColor clearColor]; - [self setClipsToBounds:YES]; - - self.dataCache = @{}.mutableCopy; - self.myDressingDataCache = @{}.mutableCopy; - self.myDressingDataPagesNumbers = @[].mutableCopy; - self.myDressingUsingItemPages = @[@(NO), @(NO), @(NO), @(NO), @(NO)].mutableCopy; - self.requestedPages = [NSMutableSet set]; // 初始化请求记录 - self.mallItemsScrollView.delegate = self; // 设置代理 - - CGFloat screenWidth = KScreenWidth; - CGFloat screenHeight = self.bounds.size.height; - - // 容器-1 (顶部) - self.shoppoingMallCategoryScrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, screenWidth, kGetScaleWidth(90))]; - self.shoppoingMallCategoryScrollView.contentInset = UIEdgeInsetsMake(0, 15, 0, 15); - self.shoppoingMallCategoryScrollView.showsHorizontalScrollIndicator = NO; - self.shoppoingMallCategoryScrollView.clipsToBounds = NO; - [self addSubview:self.shoppoingMallCategoryScrollView]; - - // 容器-2 (底部) - self.mallItemsScrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 100, screenWidth, screenHeight - 100)]; - self.mallItemsScrollView.pagingEnabled = YES; - self.mallItemsScrollView.delegate = self; - self.mallItemsScrollView.showsHorizontalScrollIndicator = NO; - [self addSubview:self.mallItemsScrollView]; - - self.categoryCardArray = [NSMutableArray array]; - self.itemCollectionViewArray = [NSMutableArray array]; - self.itemCollectionLoadingViewArray = [NSMutableArray array]; -} - -- (void)setItems:(NSArray *)items { - _items = items; - - CGFloat screenWidth = [UIScreen mainScreen].bounds.size.width; - CGFloat container1ItemWidth = kGetScaleWidth(70); - CGFloat container1ItemHeight = kGetScaleWidth(84); - CGFloat container1ItemSpacing = 12; - - // 设置 container1 和 container2 的内容大小 - self.shoppoingMallCategoryScrollView.contentSize = CGSizeMake(items.count * (container1ItemWidth + container1ItemSpacing), 90); - self.mallItemsScrollView.contentSize = CGSizeMake(items.count * screenWidth, self.mallItemsScrollView.frame.size.height); - - // 添加 item view-1 到 container1ScrollView - for (int i = 0; i < items.count; i++) { - ShoppingMallCategoryCard *itemView1 = [ShoppingMallCategoryCard initCard:[items xpSafeObjectAtIndex:i] - frame:CGRectMake(i * (container1ItemWidth + container1ItemSpacing), - 3, - container1ItemWidth, - container1ItemHeight)]; - itemView1.tag = i; - - UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleItemTap:)]; - [itemView1 addGestureRecognizer:tapGesture]; - [self.shoppoingMallCategoryScrollView addSubview:itemView1]; - [self.categoryCardArray addObject:itemView1]; - } - - // 添加 item view-2 到 container2ScrollView - for (int i = 0; i < items.count; i++) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeZero;// CGSizeMake((screenWidth-30) / 2 - 10, kGetScaleWidth(244)); - layout.minimumInteritemSpacing = 0; - layout.minimumLineSpacing = 10; - layout.sectionInset = UIEdgeInsetsMake(0, 15, self.bottomSpace + 10, 15); - - UICollectionView *collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(i * screenWidth, 0, screenWidth, self.mallItemsScrollView.frame.size.height) - collectionViewLayout:layout]; - collectionView.delegate = self; - collectionView.dataSource = self; - collectionView.backgroundColor = [UIColor clearColor]; - collectionView.tag = i; - collectionView.contentInset = UIEdgeInsetsMake(16, 0, 0, 0); - collectionView.allowsMultipleSelection = NO; - [collectionView registerClass:[UICollectionViewCell class] forCellWithReuseIdentifier:@"cell"]; - [collectionView registerClass:[ShoppingMallItemCard class] forCellWithReuseIdentifier:@"ShoppingMallItemCard"]; - [collectionView registerClass:[ShoppingMallEmptyCard class] forCellWithReuseIdentifier:@"ShoppingMallEmptyCard"]; - [collectionView registerClass:[MyDressingItemCard class] forCellWithReuseIdentifier:@"MyDressingItemCard"]; - [collectionView registerClass:[MyDressingItemCard class] forCellWithReuseIdentifier:@"MyDressingItemCard_NotUsed"]; - - UIActivityIndicatorView *loading = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; - loading.frame = CGRectMake(screenWidth/2 - 30, 180, 60, 60); - loading.hidesWhenStopped = YES; - [collectionView addSubview:loading]; - [loading startAnimating]; - - [self.mallItemsScrollView addSubview:collectionView]; - [self.itemCollectionViewArray addObject:collectionView]; - [self.itemCollectionLoadingViewArray addObject:loading]; - - if (self.isForMyDressingPage) { - [self addRefreshControl:collectionView]; - } - } - - [self updateSelectionForItemAtIndex:0]; - [self loadDataForPageAtIndex:0]; -} - -- (void)handleItemTap:(UITapGestureRecognizer *)gesture { - NSInteger index = gesture.view.tag; - CGFloat screenWidth = [UIScreen mainScreen].bounds.size.width; - [self.mallItemsScrollView setContentOffset:CGPointMake(index * screenWidth, 0) animated:YES]; - [self updateSelectionForItemAtIndex:index]; - [self loadDataForPageAtIndex:index]; -} - -// 加载指定页数据的方法 -- (void)loadDataForPageAtIndex:(NSInteger)pageIndex { - self.currengCategoryIndex = pageIndex; - // 检查该页是否已经请求过数据，避免重复请求 - if (![self.requestedPages containsObject:@(pageIndex)]) { - [self.requestedPages addObject:@(pageIndex)]; // 标记该页已请求 - - // 使用外部提供的回调或代理来请求数据, 我的装扮和商城使用不同的数据 - if (self.fetchDataForPage) { - NSDictionary *itemDic = [self.items xpSafeObjectAtIndex:pageIndex]; - NSNumber *type = [itemDic allValues].firstObject; - @kWeakify(self); - self.fetchDataForPage(type.integerValue, ^(NSArray *data) { - @kStrongify(self); - if (self) { - [self updateItemCollectionViewWithShoppingMallData:data atIndex:pageIndex]; - } - }); - } else if (self.fetchDataForMyDressingPage) { - [self.myDressingDataPagesNumbers addObject:@(1)]; - [self loadMyDressingItems:pageIndex pageNum:1]; - } - } -} - -- (void)loadMyDressingItems:(NSInteger)pageIndex - pageNum:(NSInteger)pageNum{ - NSDictionary *itemDic = [self.items xpSafeObjectAtIndex:pageIndex]; - NSNumber *type = [itemDic allValues].firstObject; - @kWeakify(self); - self.fetchDataForMyDressingPage(type.integerValue, pageNum, ^(NSArray * _Nonnull modelList) { - @kStrongify(self); - if (self) { - [self updateItemCollectionViewWithMyDressingData:modelList pageNum:pageNum atIndex:pageIndex]; - } - }); -} - -- (void)updateSelectionForItemAtIndex:(NSInteger)index { - // 更新 类型card 的选中状态 - for (ShoppingMallCategoryCard *view in self.categoryCardArray) { - view.isSelected = (view.tag == index); - } - - // 移除选中的装扮 - self.selectedIndexPath = nil; - if (self.returnSelectedModel) { - self.returnSelectedModel(nil); - } - - // 我的装扮页逻辑，若有使用中的装扮，选中。否则选中“未使用” - for (UICollectionView *itemView in self.itemCollectionViewArray) { - - NSArray *items = [self.myDressingDataCache objectForKey:@(index)]; - if (items.count > 0) { - NSInteger selectedIndex = 0; - for (MyDressingDataModel *model in items) { - if (model.used) { - selectedIndex = [items indexOfObject:model]+1; - break; - } - } - // 确保 selectedIndex 在合法范围内 - selectedIndex = MIN(selectedIndex, MAX(0, items.count - 1)); - dispatch_async(dispatch_get_main_queue(), ^{ - if (selectedIndex < [itemView numberOfItemsInSection:0]) { - [itemView selectItemAtIndexPath:[NSIndexPath indexPathForRow:selectedIndex inSection:0] - animated:NO - scrollPosition:UICollectionViewScrollPositionNone]; - } - }); - } - - if (self.returnSelectedModel) { - NSArray *data = self.dataCache[@(itemView.tag)]; - self.returnSelectedModel(data.firstObject); - } - - [itemView reloadData]; - } -} - -- (void)updateItemCollectionViewWithShoppingMallData:(NSArray *)data - atIndex:(NSInteger)index { - - UIActivityIndicatorView *loading = [self.itemCollectionLoadingViewArray xpSafeObjectAtIndex:index]; - if (loading) { - [loading stopAnimating]; - } - - if (!data) { - return; - } - self.dataCache[@(index)] = data; - if (index < self.itemCollectionViewArray.count) { - UICollectionView *itemView = self.itemCollectionViewArray[index]; - dispatch_async(dispatch_get_main_queue(), ^{ - if ([itemView numberOfItemsInSection:0] > 0) { - [itemView selectItemAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] animated:NO scrollPosition:UICollectionViewScrollPositionNone]; - } - }); - if (self.returnSelectedModel) { - self.returnSelectedModel(data.firstObject); - } - [itemView reloadData]; - } -} - -- (void)updateItemCollectionViewWithMyDressingData:(NSArray *)data - pageNum:(NSInteger)pageNum - atIndex:(NSInteger)index { - UIActivityIndicatorView *loading = [self.itemCollectionLoadingViewArray xpSafeObjectAtIndex:index]; - if (loading) { - [loading stopAnimating]; - } - - NSMutableArray *sortedData = data.mutableCopy; - [sortedData sortUsingComparator:^NSComparisonResult(MyDressingDataModel * _Nonnull obj1, MyDressingDataModel * _Nonnull obj2) { - if (obj1.used) { - return NSOrderedAscending; - } - if (obj2.used) { - return NSOrderedDescending; - } - return NSOrderedSame; - }]; - - if (pageNum == 1) { - self.myDressingDataCache[@(index)] = sortedData.copy; - } else { - NSMutableArray *array = self.myDressingDataCache[@(index)].mutableCopy; - [array addObjectsFromArray:sortedData]; - self.myDressingDataCache[@(index)] = array.copy; - sortedData = array; - } - - NSPredicate *predicate = [NSPredicate predicateWithFormat:@"used == 1"]; - BOOL containsYes = [sortedData filteredArrayUsingPredicate:predicate].count > 0; - if (containsYes) { - self.myDressingUsingItemPages[index] = @(YES); - } else { - self.myDressingUsingItemPages[index] = @(NO); - } - - if (index < self.itemCollectionViewArray.count) { - UICollectionView *itemView = self.itemCollectionViewArray[index]; - if (pageNum == 1 && !itemView.mj_footer) { - [self addLoadMoreForCollectionView:itemView]; - } - [itemView.refreshControl endRefreshing]; - [itemView.mj_header endRefreshing]; - [itemView.mj_footer endRefreshing]; - - if (data.count == 0 || data.count < 20) { - [itemView.mj_footer endRefreshingWithNoMoreData]; - NSNumber *currentPageNum = [self.myDressingDataPagesNumbers xpSafeObjectAtIndex:itemView.tag]; - - if (currentPageNum.integerValue > 1) { - currentPageNum = @(currentPageNum.integerValue - 1); - [self.myDressingDataPagesNumbers replaceObjectAtIndex:itemView.tag - withObject:currentPageNum]; - } - } - - [itemView reloadData]; - } -} - -- (void)updateSelectedItem:(NSIndexPath *)indexPath { - UICollectionView *itemView = [self.itemCollectionViewArray xpSafeObjectAtIndex:self.currengCategoryIndex]; - if (itemView && indexPath) { - if (indexPath.row < [itemView numberOfItemsInSection:indexPath.section]) { - [itemView selectItemAtIndexPath:indexPath animated:NO scrollPosition:UICollectionViewScrollPositionNone]; - } - } - - if (itemView) { - [self handlePullToRefresh:itemView.refreshControl]; - } -} - - -#pragma mark - UIScrollView Delegate -- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView { - if (scrollView == self.mallItemsScrollView) { - NSInteger pageIndex = round(scrollView.contentOffset.x / scrollView.frame.size.width); - [self updateSelectionForItemAtIndex:pageIndex]; - [self loadDataForPageAtIndex:pageIndex]; - } -} - -#pragma mark - UICollectionView Delegate & DataSource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - if (self.isForMyDressingPage) { - NSArray *data = self.myDressingDataCache[@(collectionView.tag)]; - return data.count + 1; - } else { - NSArray *data = self.dataCache[@(collectionView.tag)]; - return data.count == 0 ? 1 : data.count; - } -} - -- (CGSize)collectionView:(UICollectionView *)collectionView - layout:(UICollectionViewLayout *)collectionViewLayout - sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - CGFloat width = (KScreenWidth-30) / 2 - 5; - if (self.isForMyDressingPage) { - return CGSizeMake(width, kGetScaleWidth(190)); - } else { - NSArray *data = self.dataCache[@(collectionView.tag)]; - if (data.count == 0 ) { - return CGSizeMake(KScreenWidth, 200); - } else { - return CGSizeMake(width, kGetScaleWidth(244)); - } - } -} - -- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.isForMyDressingPage) { - MyDressingItemCard *cell = nil; - - if (indexPath.row == 0) { - cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"MyDressingItemCard_NotUsed" - forIndexPath:indexPath]; - cell.model = nil; - NSNumber *isUsed = [self.myDressingUsingItemPages xpSafeObjectAtIndex:collectionView.tag]; - if (isUsed) { - cell.selected = !isUsed.boolValue; - } - } else { - cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"MyDressingItemCard" - forIndexPath:indexPath]; - NSArray *data = self.myDressingDataCache[@(collectionView.tag)]; - cell.model = [data xpSafeObjectAtIndex:indexPath.row-1]; - cell.selected = cell.model.used; - - if (self.didTapItemPlay) { - @kWeakify(self); - cell.didTapPlay = ^(NSString * _Nonnull resourcePath, NSInteger effectType, NSInteger type) { - @kStrongify(self); - self.didTapItemPlay(resourcePath, effectType, type); - }; - } - } - - return cell; - } else { - NSArray *data = self.dataCache[@(collectionView.tag)]; - if (data.count == 0) { - ShoppingMallEmptyCard *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ShoppingMallEmptyCard" forIndexPath:indexPath]; - return cell; - } else { - ShoppingMallItemCard *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ShoppingMallItemCard" - forIndexPath:indexPath]; - cell.cellModel = [data xpSafeObjectAtIndex:indexPath.row]; - if ([indexPath isEqual:self.selectedIndexPath]) { - cell.selected = YES; - } else { - cell.selected = NO; - } - if (self.didTapItemPlay) { - @kWeakify(self); - cell.didTapPlay = ^(NSString * _Nonnull resourcePath, NSInteger effectType, NSInteger type) { - @kStrongify(self); - self.didTapItemPlay(resourcePath, effectType, type); - }; - } - return cell; - } - } -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - NSIndexPath *previousIndexPath = self.selectedIndexPath; - - self.selectedIndexPath = indexPath; - - if (self.isForMyDressingPage) { - NSArray *data = self.myDressingDataCache[@(collectionView.tag)]; - if (self.returnMyDressingSelectedModel) { - NSInteger type = collectionView.tag; - if (type == 0) { - type = 1; - } else if (type == 1) { - type = 0; - } - if (indexPath.row > 0) { - MyDressingDataModel *model = [data xpSafeObjectAtIndex:indexPath.row - 1]; - if (model.used == 0) { - self.returnMyDressingSelectedModel(model, type, indexPath); - } - } else { - self.returnMyDressingSelectedModel(nil, type, indexPath); - } - } - } else { - NSArray *data = self.dataCache[@(collectionView.tag)]; - if (self.returnSelectedModel) { - DressUpShopModel *model = [data xpSafeObjectAtIndex:indexPath.row]; - self.returnSelectedModel(model); - } - } - - NSMutableArray *indexPathsToReload = [NSMutableArray array]; - if (previousIndexPath != nil) { - [indexPathsToReload addObject:previousIndexPath]; - } - [indexPathsToReload addObject:indexPath]; - [collectionView reloadItemsAtIndexPaths:indexPathsToReload]; -} - -#pragma mark - 上下拉刷新 -- (void)addRefreshControl:(UICollectionView *)collectionView { - UIRefreshControl *refreshControl = [[UIRefreshControl alloc] init]; - refreshControl.tintColor = [UIColor lightGrayColor]; - [refreshControl addTarget:self action:@selector(handlePullToRefresh:) forControlEvents:UIControlEventValueChanged]; - collectionView.refreshControl = refreshControl; -} - -- (void)addLoadMoreForCollectionView:(UICollectionView *)collectionView { - if (collectionView.tag == 0 || collectionView.tag == 1) { - return; - } - @kWeakify(self); - collectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ - @kStrongify(self); - NSNumber *currentPageNum = [self.myDressingDataPagesNumbers xpSafeObjectAtIndex:collectionView.tag]; - currentPageNum = @(currentPageNum.integerValue + 1); - [self.myDressingDataPagesNumbers replaceObjectAtIndex:collectionView.tag - withObject:currentPageNum]; - [self loadMyDressingItems:collectionView.tag pageNum:currentPageNum.integerValue]; - }]; -} - -- (void)handlePullToRefresh:(UIRefreshControl *)collectionViewRefreshControl { - UICollectionView *collectionView = (UICollectionView *)collectionViewRefreshControl.superview; - if (collectionView) { - if (collectionView.tag < self.myDressingDataPagesNumbers.count) { - [self.myDressingDataPagesNumbers replaceObjectAtIndex:collectionView.tag - withObject:@(1)]; - } - [self loadMyDressingItems:collectionView.tag pageNum:1]; - [collectionView.mj_footer resetNoMoreData]; - } -} - -@end diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.h b/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.h deleted file mode 100644 index 0f20db1..0000000 --- a/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// ShoppingMallDataPresent.h -// YuMi -// -// Created by P on 2024/11/13. -// - -#import "BaseMvpPresenter.h" - -#import "DressUpShopModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface ShoppingMallDataPresent : BaseMvpPresenter -/// 获取装扮商城列表 -/// @param type 类型 0：铭牌，1：头饰，2：座驾，3：资料卡，4：聊天气泡 -- (void)loadCategoryItems:(NSInteger)type - success:(void(^)(NSArray * array))success - failure:(void(^)(NSError *error))failure; - -- (void)buyItem:(NSString *)itemID - success:(void(^)(id obj))success - failure:(void(^)(NSError *error))failure; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.m b/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.m deleted file mode 100644 index 2da17b5..0000000 --- a/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.m +++ /dev/null @@ -1,45 +0,0 @@ -// -// ShoppingMallDataPresent.m -// YuMi -// -// Created by P on 2024/11/13. -// - -#import "ShoppingMallDataPresent.h" -#import "Api+DressUp.h" - -@implementation ShoppingMallDataPresent - -- (void)loadCategoryItems:(NSInteger)type - success:(nonnull void (^)(NSArray * array))success - failure:(nonnull void (^)(NSError * _Nonnull))failure{ - - [Api requestDressUpShopList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - NSArray *array = [DressUpShopModel modelsWithArray:data.data]; - success(array); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:NO errorToast:YES] - dressType:@(type).stringValue]; -} - -- (void)buyItem:(NSString *)itemID - success:(void(^)(id obj))success - failure:(void(^)(NSError *error))failure { - [Api requestDressUpShopBuy:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - success(data.data); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] - id:itemID]; -} - -@end diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallItemPreview.h b/YuMi/Modules/ShoppingMall/ShoppingMallItemPreview.h deleted file mode 100644 index cbd80bd..0000000 --- a/YuMi/Modules/ShoppingMall/ShoppingMallItemPreview.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// ShoppingMallItemPreview.h -// YuMi -// -// Created by P on 2024/11/18. -// - -#import - -@class DressUpShopModel, MyDressingDataModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface ShoppingMallItemPreview : UIView - -@property(nonatomic, copy) void(^buyWith)(DressUpShopModel *model); -@property(nonatomic, copy) void(^giveWith)(DressUpShopModel *model); - -@property(nonatomic, copy) void(^rebuyWith)(MyDressingDataModel *model); - -- (instancetype)initWith:(DressUpShopModel *)model isForGive:(BOOL)isForGive; -- (instancetype)initWithMyDress:(MyDressingDataModel *)model isVaild:(BOOL)isVaild; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallItemPreview.m b/YuMi/Modules/ShoppingMall/ShoppingMallItemPreview.m deleted file mode 100644 index 78a401a..0000000 --- a/YuMi/Modules/ShoppingMall/ShoppingMallItemPreview.m +++ /dev/null @@ -1,395 +0,0 @@ -// -// ShoppingMallItemPreview.m -// YuMi -// -// Created by P on 2024/11/18. -// - -#import "ShoppingMallItemPreview.h" -#import "DressUpShopModel.h" -#import "MyDressingDataModel.h" -#import "XPSkillCardPlayerManager.h" -#import -#import -#import "XPRoomGiftAnimationParser.h" - -@interface ShoppingMallItemPreview () - -@property(nonatomic, assign) BOOL isForGive; -@property(nonatomic, assign) BOOL isVaild; -@property(nonatomic, strong) DressUpShopModel *model; -@property(nonatomic, strong) MyDressingDataModel *myDressingModel; -@property(nonatomic, strong) NetImageView *itemImageView; -@property(nonatomic, strong) UIView *itemImageBGView; -@property(nonatomic, strong) VAPView *mp4View; -@property(nonatomic, strong) XPRoomGiftAnimationParser *mp4Parser; -@property(nonatomic, strong) SVGAImageView *svgaView; -@property(nonatomic, strong) UILabel *nameLabel; -@property(nonatomic, strong) UILabel *pricePerDayLabel; - -@property(nonatomic, strong) UIButton *cancelButton; -@property(nonatomic, strong) UIButton *buyButton; -@property(nonatomic, strong) UIButton *giveButton; - -@property(nonatomic, strong) UserInfoModel *userModel; - -@end - -@implementation ShoppingMallItemPreview - -- (instancetype)init { - if (self = [super init]) { - - } - return self; -} - -- (instancetype)initWith:(DressUpShopModel *)model isForGive:(BOOL)isForGive { - if (self = [super init]) { - [self setupUI]; - self.isForGive = isForGive; - self.userModel = [[XPSkillCardPlayerManager shareInstance] userInfoModel]; - self.model = model; - } - return self; -} - -- (instancetype)initWithMyDress:(MyDressingDataModel *)model isVaild:(BOOL)isVaild { - if (self = [super init]) { - [self setupUI]; - self.isVaild = isVaild; - self.userModel = [[XPSkillCardPlayerManager shareInstance] userInfoModel]; - self.myDressingModel = model; - } - return self; -} - -- (void)setModel:(DressUpShopModel *)model { - _model = model; - - self.itemImageView.imageUrl = model.pic; - self.nameLabel.text = model.name; - - if (model.dressType == 4) { - [self.itemImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.itemImageBGView); - make.width.mas_equalTo(kGetScaleWidth(90)); - make.height.mas_equalTo(kGetScaleWidth(46)); - }]; - } - - if (model.vipLimit > self.userModel.userVipInfoVO.vipLevel) { - self.buyButton.hidden = YES; - self.giveButton.hidden = YES; - [self.cancelButton setAttributedTitle:[[NSAttributedString alloc] initWithString:YMLocalizedString(@"TTAlertConfig0") - attributes:@{NSFontAttributeName: kFontMedium(14), - NSForegroundColorAttributeName: [UIColor whiteColor]}] - forState:UIControlStateNormal]; - [self.cancelButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(-38); - make.size.mas_equalTo(CGSizeMake(90, 32)); - }]; - self.pricePerDayLabel.text = [NSString stringWithFormat:YMLocalizedString(@"1.0.30_text_3"), @(model.vipLimit)]; - } else { - self.pricePerDayLabel.attributedText = [model mallItemPricePerDay:YES isFullDisplay:YES]; - if (model.dressType == 3) { - switch (model.effectType) { - case 1:{ - [self addSubview:self.mp4View]; - [self.mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.itemImageView); - }]; - self.mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - @kWeakify(self); - [self.mp4Parser parseWithURL:model.effect - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl]) { - [self.mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } - } failureBlock:^(NSError * _Nullable error) { }]; - } - self.itemImageView.hidden = YES; - break; - case 0: - case 2: - default: - break; - } - } - } -} - -- (void)setMyDressingModel:(MyDressingDataModel *)myDressingModel { - _myDressingModel = myDressingModel; - - if (myDressingModel.dressType == 4) { - [self.itemImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.itemImageBGView); - make.width.mas_equalTo(kGetScaleWidth(90)); - make.height.mas_equalTo(kGetScaleWidth(46)); - }]; - } - - self.itemImageView.imageUrl = myDressingModel.pic; - self.nameLabel.text = myDressingModel.name; - - if (myDressingModel.dressType == 3) { - switch (myDressingModel.effectType) { - case 1:{ - [self addSubview:self.mp4View]; - [self.mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.itemImageView); - }]; - self.mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - - NSString *url = [NSString isEmpty:myDressingModel.effect] ? myDressingModel.pic : myDressingModel.effect; - - @kWeakify(self); - [self.mp4Parser parseWithURL:url - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl]) { - [self.mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } - } failureBlock:^(NSError * _Nullable error) { }]; - } - self.itemImageView.hidden = YES; - break; - case 0: - case 2: - default: - break; - } - } - - if (self.isVaild) { - self.buyButton.hidden = NO; - self.pricePerDayLabel.attributedText = [myDressingModel generateAttributedStringWithIncludeOriginalPrice:YES]; - } else { - self.buyButton.hidden = YES; - self.giveButton.hidden = YES; - [self.cancelButton setAttributedTitle:[[NSAttributedString alloc] initWithString:YMLocalizedString(@"TTAlertConfig0") - attributes:@{NSFontAttributeName: kFontMedium(14), - NSForegroundColorAttributeName: [UIColor whiteColor]}] - forState:UIControlStateNormal]; - [self.cancelButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(-38); - make.size.mas_equalTo(CGSizeMake(90, 32)); - }]; - self.pricePerDayLabel.text = YMLocalizedString(@"1.0.30_text_2"); - } -} - -- (void)setupUI { - UIImageView *bg = [self backgroundImageView]; - [self addSubview:bg]; - [bg mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.itemImageBGView]; - [self.itemImageBGView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(32); - make.size.mas_equalTo(CGSizeMake(155, 155)); - }]; - - [self addSubview:self.itemImageView]; - [self.itemImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(32); - make.size.mas_equalTo(CGSizeMake(155, 155)); - }]; - - [self addSubview:self.nameLabel]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(6); - make.top.mas_equalTo(self.itemImageBGView.mas_bottom).offset(4); - make.height.mas_equalTo(22); - }]; - - [self addSubview:self.pricePerDayLabel]; - [self.pricePerDayLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.nameLabel.mas_bottom).offset(10); - make.height.mas_equalTo(22); - }]; - - UIImageView *line = [self line]; - [self addSubview:line]; - [line mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).offset(22); - make.height.mas_equalTo(1.5); - make.top.mas_equalTo(self.pricePerDayLabel.mas_bottom).offset(18); - }]; - - [self addSubview:self.cancelButton]; - [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(line.mas_bottom).offset(20); - make.leading.mas_equalTo(46); - make.size.mas_equalTo(CGSizeMake(90, 32)); - }]; - - [self addSubview:self.buyButton]; - [self.buyButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(line.mas_bottom).offset(20); - make.trailing.mas_equalTo(-46); - make.size.mas_equalTo(CGSizeMake(90, 32)); - }]; - - [self addSubview:self.giveButton]; - [self.giveButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(line.mas_bottom).offset(20); - make.trailing.mas_equalTo(-46); - make.size.mas_equalTo(CGSizeMake(90, 32)); - }]; -} - -#pragma mark - - -- (void)setIsForGive:(BOOL)isForGive { - _isForGive = isForGive; - self.buyButton.hidden = isForGive; - self.giveButton.hidden = !isForGive; -} - -- (void)didTapCancel { - [TTPopup dismiss]; -} - -- (void)didTapBuy { - if (self.buyWith) { - self.buyWith(self.model); - } else if (self.rebuyWith) { - self.rebuyWith(self.myDressingModel); - } -} - -- (void)didTapGive { - if (self.giveWith) { - self.giveWith(self.model); - } -} - -#pragma mark - -- (UIImageView *)backgroundImageView { - UIImageView *bgImageView = [[UIImageView alloc] initWithImage:kImage(@"mall_item_preview_bg")]; - bgImageView.contentMode = UIViewContentModeScaleAspectFill; - return bgImageView; -} - -- (UIView *)itemImageBGView { - if (!_itemImageBGView) { - _itemImageBGView = [[UIView alloc] init]; - } - return _itemImageBGView; -} - -- (NetImageView *)itemImageView { - if (!_itemImageView) { - _itemImageView = [[NetImageView alloc] init]; - _itemImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _itemImageView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:UIColorFromRGB(0xd9e7f7)]; - _nameLabel.textAlignment = NSTextAlignmentCenter; - } - return _nameLabel; -} - -- (UILabel *)pricePerDayLabel { - if (!_pricePerDayLabel) { - _pricePerDayLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(14) - textColor:UIColorRGBAlpha(0xD9E7F7, 0.8)]; - _pricePerDayLabel.textAlignment = NSTextAlignmentCenter; - } - return _pricePerDayLabel; -} - -- (UIImageView *)line { - UIImageView *line = [[UIImageView alloc] initWithImage:kImage(@"mall_item_preview_line")]; - line.contentMode = UIViewContentModeScaleAspectFill; - return line; -} - -- (UIButton *)cancelButton { - if (!_cancelButton) { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setBackgroundColor:[UIColor colorWithWhite:0 alpha:0.3]]; - [b setAttributedTitle:[[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPShareView7") - attributes:@{NSFontAttributeName: kFontMedium(14), - NSForegroundColorAttributeName: [UIColor whiteColor]}] - forState:UIControlStateNormal]; - [b addTarget:self action:@selector(didTapCancel) forControlEvents:UIControlEventTouchUpInside]; - [b setCornerRadius:16]; - _cancelButton = b; - } - - return _cancelButton; -} - -- (UIButton *)buyButton { - if (!_buyButton) { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b addGradientBackgroundWithColors:@[UIColorFromRGB(0xFFE3B2), UIColorFromRGB(0xE9A71D)] - startPoint:CGPointMake(0.0, 0.5) - endPoint:CGPointMake(1.0, 0.5) - cornerRadius:16]; - [b setAttributedTitle:[[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPDressUpShopCardTableViewCell2") - attributes:@{NSFontAttributeName: kFontMedium(14), - NSForegroundColorAttributeName: UIColorFromRGB(0x51281b)}] - forState:UIControlStateNormal]; - [b addTarget:self action:@selector(didTapBuy) forControlEvents:UIControlEventTouchUpInside]; - [b setCornerRadius:16]; - b.hidden = YES; - _buyButton = b; - } - - return _buyButton; -} - -- (UIButton *)giveButton { - if (!_giveButton) { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b addGradientBackgroundWithColors:@[UIColorFromRGB(0xB2FCFF), UIColorFromRGB(0x4DA2EA)] - startPoint:CGPointMake(0.0, 0.5) - endPoint:CGPointMake(1.0, 0.5) - cornerRadius:16]; - [b setAttributedTitle:[[NSAttributedString alloc] initWithString:YMLocalizedString(@"1.0.30_text_6") - attributes:@{NSFontAttributeName: kFontMedium(14), - NSForegroundColorAttributeName: UIColorFromRGB(0x172055)}] - forState:UIControlStateNormal]; - [b addTarget:self action:@selector(didTapGive) forControlEvents:UIControlEventTouchUpInside]; - [b setCornerRadius:16]; - b.hidden = YES; - _giveButton = b; - } - - return _giveButton; -} - -- (VAPView *)mp4View { - if (!_mp4View) { - _mp4View = [[VAPView alloc] init]; - _mp4View.contentMode = UIViewContentModeScaleAspectFit; - } - return _mp4View; -} - -- (SVGAImageView *)svgaView { - if (!_svgaView) { - _svgaView = [[SVGAImageView alloc] init]; - _svgaView.contentMode = UIViewContentModeScaleAspectFit; - } - return _svgaView; -} - -@end diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallTagView.h b/YuMi/Modules/ShoppingMall/ShoppingMallTagView.h deleted file mode 100644 index d22fe54..0000000 --- a/YuMi/Modules/ShoppingMall/ShoppingMallTagView.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// ShoppingMallTagView.h -// YuMi -// -// Created by P on 2024/11/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface ShoppingMallTagView : UIView - -@property(nonatomic, copy) NSString *text; - -- (instancetype)initWithBackgroundColors:(NSArray *)colors - font:(UIFont *)font - textColor:(UIColor *)textColor; - -- (void)updateBackgroundColors:(NSArray *)colors - textColor:(UIColor *)textColor; - -- (CGFloat)textWidth; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallTagView.m b/YuMi/Modules/ShoppingMall/ShoppingMallTagView.m deleted file mode 100644 index 9471952..0000000 --- a/YuMi/Modules/ShoppingMall/ShoppingMallTagView.m +++ /dev/null @@ -1,104 +0,0 @@ -// -// ShoppingMallTagView.m -// YuMi -// -// Created by P on 2024/11/18. -// - -#import "ShoppingMallTagView.h" - -@interface ShoppingMallTagView () - -@property (nonatomic, strong) CAGradientLayer *gradientLayer; -@property(nonatomic, strong) UILabel *label; - -@end - -@implementation ShoppingMallTagView - -- (instancetype)initWithBackgroundColors:(NSArray *)colors - font:(UIFont *)font - textColor:(UIColor *)textColor { - if (self = [super init]) { - if (isMSRTL()) { - [self setCornerRadius:10 - cornerMask:kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner]; - } else { - [self setCornerRadius:10 - cornerMask:kCALayerMinXMinYCorner | kCALayerMaxXMaxYCorner]; - } - - self.clipsToBounds = YES; - if (colors.count>1) { - [self addGradientBackgroundWithColors:colors - startPoint:isMSRTL() ? CGPointMake(0.0, 0.0) : CGPointMake(1.0, 0.0) - endPoint:isMSRTL() ? CGPointMake(1.0, 0.0) : CGPointMake(0.0, 0.0) - cornerRadius:0]; - } else if (colors.count == 1){ - self.backgroundColor = colors.firstObject; - } - - [self addSubview:self.label]; - [self.label mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - self.label.font = font; - self.label.textColor = textColor; - } - return self; -} - -- (void)updateBackgroundColors:(NSArray *)colors - textColor:(UIColor *)textColor { - if (colors.count>1) { - [self addGradientBackgroundWithColors:colors //@[UIColorFromRGB(0xE29030), UIColorFromRGB(0xFCC074)] - startPoint:isMSRTL() ? CGPointMake(0.0, 0.0) : CGPointMake(1.0, 0.0) - endPoint:isMSRTL() ? CGPointMake(1.0, 0.0) : CGPointMake(0.0, 0.0) - cornerRadius:0]; - } else if (colors.count == 1){ - self.backgroundColor = colors.firstObject; - } - self.label.textColor = textColor; -} - -- (instancetype)init { - if (self = [super init]) { - if (isMSRTL()) { - [self setCornerRadius:10 - cornerMask:kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner]; - } else { - [self setCornerRadius:10 - cornerMask:kCALayerMinXMinYCorner | kCALayerMaxXMaxYCorner]; - } - self.clipsToBounds = YES; - - [self addSubview:self.label]; - [self.label mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - } - return self; -} - -- (void)setText:(NSString *)text { - _text = text; - self.label.text = text; -} - -- (CGFloat)textWidth { - return [self.text boundingRectWithSize:CGSizeMake(KScreenWidth/3, self.label.font.lineHeight) - options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading - attributes:@{NSFontAttributeName: kFontMedium(12)} - context:nil].size.width + 20; -} - -- (UILabel *)label { - if (!_label) { - _label = [UILabel labelInitWithText:@"" font:kFontMedium(12) textColor:UIColorFromRGB(0x51281B)]; - _label.textAlignment = NSTextAlignmentCenter; - } - return _label; -} - -@end diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallViewController.h b/YuMi/Modules/ShoppingMall/ShoppingMallViewController.h deleted file mode 100644 index 1e4dc4d..0000000 --- a/YuMi/Modules/ShoppingMall/ShoppingMallViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// ShoppingMallViewController.h -// YuMi -// -// Created by P on 2024/11/13. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface ShoppingMallViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallViewController.m b/YuMi/Modules/ShoppingMall/ShoppingMallViewController.m deleted file mode 100644 index 1f3ba72..0000000 --- a/YuMi/Modules/ShoppingMall/ShoppingMallViewController.m +++ /dev/null @@ -1,506 +0,0 @@ -// -// ShoppingMallViewController.m -// YuMi -// -// Created by P on 2024/11/13. -// - -#import "ShoppingMallViewController.h" - -#import -#import - -#import "XPRoomGiftAnimationParser.h" -#import "MyDressingViewController.h" -#import "XPDressSearchViewController.h" - -#import "ShoppingMallItemPreview.h" -#import "ShoppingMallDataPresent.h" -#import "ShoppingMallCategoryListView.h" - -static NSArray *> *DressUpOptions(void) { - return @[ - @{YMLocalizedString(@"XPMineDressUpViewController2") : @1}, // 座驾 - @{YMLocalizedString(@"XPMineDressUpViewController1") : @0}, // 头饰 - @{YMLocalizedString(@"XPMineDressUpViewController3") : @2}, // 铭牌 - @{YMLocalizedString(@"XPMineDressUpViewController4") : @3}, // 资料卡 - @{YMLocalizedString(@"XPMineDressUpViewController5") : @4}, // 聊天气泡 - @{YMLocalizedString(@"1.0.30_text_9") : @5} // 個人頁裝飾 - ]; -} - -@interface ShoppingMallViewController () - -@property(nonatomic, strong) ShoppingMallCategoryListView *listView; - -@property (nonatomic, strong) UIView *playEffectMask; -@property (nonatomic, strong) VAPView *mp4Effect; -@property(nonatomic, strong) XPRoomGiftAnimationParser *mp4Parser; -@property (nonatomic, strong) SVGAImageView *svgaEffect; -@property(nonatomic, strong) UIView *bottomControlArea; -@property(nonatomic, strong) UILabel *bottomControlPriceLabel; -@property(nonatomic, strong) UIButton *bottomControlBuyButton; -@property(nonatomic, strong) UIButton *bottomControlGiveButton; - -@property(nonatomic, strong) DressUpShopModel *selectedModel; -@property(nonatomic, strong) UIActivityIndicatorView *loading; - -@end - -@implementation ShoppingMallViewController - -- (ShoppingMallDataPresent *)createPresenter { - return [[ShoppingMallDataPresent alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - [self setupUI]; -} - -- (void)setupUI { - [self setupBackground]; - [self setupNavigationBar]; - [self setupBottomControlBar]; - [self setupContentList]; - -// [self hideBottomControlArea]; -} - -- (void)setupBackground { - self.view.backgroundColor = UIColorFromRGB(0x02061D); - UIImageView *topBG = [[UIImageView alloc] initWithImage:kImage(@"mall_top_bg")]; - [self.view addSubview:topBG]; - [topBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(200)); - }]; -} - -- (void)setupNavigationBar { - UILabel *titleLabel = [self titleLabel]; - UIButton *backButton = [self backButton]; - UIButton *myDressButton = [self myDressButton]; - [self.view addSubview:titleLabel]; - [self.view addSubview:backButton]; - [self.view addSubview:myDressButton]; - - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.view).offset(kStatusBarHeight); - make.height.mas_equalTo(22); - }]; - - [backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).offset(16); - make.centerY.mas_equalTo(titleLabel); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - - [myDressButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.view).offset(-16); - make.centerY.mas_equalTo(titleLabel); - make.height.mas_equalTo(22); - make.width.mas_greaterThanOrEqualTo(84); - }]; -} - -- (void)setupBottomControlBar { - [self.view addSubview:self.bottomControlArea]; - [self.bottomControlArea mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-200); - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(80); - }]; -} - -- (void)setupContentList { - NSInteger top = kNavigationHeight; - NSInteger bottom = 80 + kSafeAreaBottomHeight; - ShoppingMallCategoryListView *listView = [[ShoppingMallCategoryListView alloc] initWithFrame:CGRectMake(0, top, KScreenWidth, KScreenHeight - top)]; - listView.bottomSpace = bottom; - [self.view insertSubview:listView belowSubview:self.bottomControlArea]; - self.listView = listView; - @kWeakify(self); - listView.fetchDataForPage = ^(NSInteger pageIndex, FetchDataCompletion completion) { - @kStrongify(self); - [self fetchDataForPage:pageIndex - completion:completion]; - }; - listView.didTapItemPlay = ^(NSString * _Nonnull resourcePath, NSInteger effectType, NSInteger type) { - @kStrongify(self); - CGSize size = CGSizeZero; - switch (type) { - case 0: // 头饰 - size = CGSizeMake(kGetScaleWidth(183), kGetScaleWidth(183)); - break; - case 5: - size = CGSizeMake(KScreenWidth - 20, KScreenWidth - 20); - break; - default: - size = CGSizeMake(KScreenWidth, KScreenHeight); - break; - } - - [self playItemEffect:resourcePath effectType:effectType size:size]; - }; - listView.returnSelectedModel = ^(DressUpShopModel * _Nonnull model) { - @kStrongify(self); - self.selectedModel = model; - [self updateBottomControlArea]; - }; - - listView.items = DressUpOptions(); -} - -#pragma mark - -- (void)fetchDataForPage:(NSInteger)pageIndex - completion:(FetchDataCompletion)completion { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.presenter loadCategoryItems:pageIndex success:^(NSArray * array) { - if (completion) { - completion(array); - } - } failure:^(NSError * _Nonnull error) {}]; - }); -} - -- (void)updateBottomControlArea { - if (self.selectedModel) { - if (self.selectedModel.obtainWay > 1) { - self.bottomControlPriceLabel.text = @""; - } else { - self.bottomControlPriceLabel.attributedText = [self.selectedModel mallItemPricePerDay:NO isFullDisplay:YES]; - } - } else { - self.bottomControlPriceLabel.text = @""; - } - - if ([NSString isEmpty:self.bottomControlPriceLabel.text]) { - [self hideBottomControlArea]; - } else { - [self showBottomControlArea]; - } -} - -- (void)showBottomControlArea { - if (self.bottomControlArea.hidden) { - self.bottomControlArea.hidden = NO; - } - [UIView animateWithDuration:0.25 animations:^{ - [self.bottomControlArea mas_updateConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(0); - }]; - [self.bottomControlArea layoutIfNeeded]; - } completion:^(BOOL finished) { - - }]; -} - -- (void)hideBottomControlArea { - [self.bottomControlArea mas_updateConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(80 + kSafeAreaBottomHeight); - }]; - [self.bottomControlArea layoutIfNeeded]; -} - -- (void)didTapBuy:(id)sender { - if (!self.selectedModel) { - return; - } - ShoppingMallItemPreview *preview = [[ShoppingMallItemPreview alloc] initWith:self.selectedModel isForGive:NO]; - preview.frame = CGRectMake(0, 0, 284, 353); - [TTPopup popupView:preview style:TTPopupStyleAlert]; - @kWeakify(self); - [preview setBuyWith:^(DressUpShopModel * _Nonnull model) { - @kStrongify(self); - @kWeakify(self); - [self.presenter buyItem:model.dressUpId - success:^(id _Nonnull obj) { - @kStrongify(self); - [TTPopup dismiss]; - [self showSuccessToast:YMLocalizedString(@"XPDressUpShopListViewController0")]; - } failure:^(NSError * _Nonnull error) { -// @kStrongify(self); -// [self showErrorToast:error.localizedDescription]; - }]; - }]; -} - -- (void)didTapGive:(id)sender { - if (!self.selectedModel) { - return; - } - XPDressSearchViewController *vc = [[XPDressSearchViewController alloc] init]; - vc.selectedModel = self.selectedModel; - [self.navigationController pushViewController:vc animated:YES]; -} - -- (void)didTapBack { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)didTapMyDress { - MyDressingViewController *myDressVC = [[MyDressingViewController alloc] init]; - [self.navigationController pushViewController:myDressVC animated:YES]; -} - -#pragma mark - -- (void)playItemEffect:(NSString *)path - effectType:(NSInteger)effectType - size:(CGSize)size { - if (!_playEffectMask) { - [self.view addSubview:self.playEffectMask]; - [self.playEffectMask mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - - [self.playEffectMask addSubview:self.svgaEffect]; - [self.playEffectMask addSubview:self.mp4Effect]; - } - - [self.svgaEffect mas_updateConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.playEffectMask); - make.size.mas_equalTo(size); - }]; - - [self.mp4Effect mas_updateConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.playEffectMask); - make.size.mas_equalTo(size); - }]; - - [self.loading startAnimating]; - self.playEffectMask.hidden = NO; - - if ([path.lowercaseString hasSuffix:@"mp4"] || effectType == 1) { - [self playMP4:path]; - } else if ([path.lowercaseString hasSuffix:@"svga"] || effectType == 2) { - [self playSVGA:path]; - } else { - [self playSVGA:path]; - } -} - -- (void)playMP4:(NSString *)path { - @kWeakify(self); - [self.mp4Parser parseWithURL:path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - [self.loading stopAnimating]; - self.mp4Effect.hidden = NO; - [self.mp4Effect playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - [self stopItemEffect]; - }]; -} - -- (void)playSVGA:(NSString *)path { - @kWeakify(self); - SVGAParser *p = [[SVGAParser alloc] init]; - [p parseWithURL:[NSURL URLWithString:path] - completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - [self.loading stopAnimating]; - self.svgaEffect.hidden = NO; - self.svgaEffect.videoItem = videoItem; - [self.svgaEffect startAnimation]; - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - [self stopItemEffect]; - }]; -} - -- (void)stopItemEffect { - [self.loading stopAnimating]; - [self.svgaEffect stopAnimation]; - self.svgaEffect.hidden = YES; - [self.mp4Effect stopHWDMP4]; - self.mp4Effect.hidden = YES; - self.playEffectMask.hidden = YES; -} - -#pragma mark - -- (UIView *)playEffectMask { - if (!_playEffectMask) { - _playEffectMask = [[UIView alloc] initWithFrame:self.view.bounds]; - _playEffectMask.backgroundColor = [UIColor colorWithWhite:0 alpha:0.7f]; - - [_playEffectMask addSubview:self.loading]; - [self.loading mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(_playEffectMask); - }]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(stopItemEffect)]; - [_playEffectMask addGestureRecognizer:tap]; - } - return _playEffectMask; -} - -- (SVGAImageView *)svgaEffect { - if (!_svgaEffect) { - _svgaEffect = [[SVGAImageView alloc] init]; - _svgaEffect.contentMode = UIViewContentModeScaleAspectFit; - _svgaEffect.autoPlay = YES; - _svgaEffect.loops = 0; - _svgaEffect.clearsAfterStop = YES; - _svgaEffect.hidden = YES; - _svgaEffect.userInteractionEnabled = YES; - } - return _svgaEffect; -} - -- (VAPView *)mp4Effect { - if (!_mp4Effect) { - _mp4Effect = [[VAPView alloc] init]; - _mp4Effect.contentMode = UIViewContentModeScaleAspectFit; - } - return _mp4Effect; -} - -- (XPRoomGiftAnimationParser *)mp4Parser { - if (!_mp4Parser) { - _mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - } - return _mp4Parser; -} - -- (UIView *)bottomControlArea { - if (!_bottomControlArea) { - _bottomControlArea = [[UIView alloc] init]; - _bottomControlArea.hidden = YES; - [_bottomControlArea addGradientBackgroundWithColors:@[UIColorFromRGB(0x012E4D), UIColorFromRGB(0x0F1435)] - startPoint:CGPointMake(0.5, 0) - endPoint:CGPointMake(0.5, 1) - cornerRadius:0]; - - [_bottomControlArea addSubview:self.bottomControlGiveButton]; - [self.bottomControlGiveButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(14); - make.trailing.mas_equalTo(-16); - make.size.mas_equalTo(CGSizeMake(74, 32)); - }]; - - [_bottomControlArea addSubview:self.bottomControlBuyButton]; - [self.bottomControlBuyButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(14); - make.trailing.mas_equalTo(self.bottomControlGiveButton.mas_leading).offset(-8); - make.size.mas_equalTo(CGSizeMake(74, 32)); - }]; - - [_bottomControlArea addSubview:self.bottomControlPriceLabel]; - [self.bottomControlPriceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.bottomControlGiveButton); - make.leading.top.mas_equalTo(16); - }]; - } - return _bottomControlArea; -} - -- (UILabel *)bottomControlPriceLabel { - if (!_bottomControlPriceLabel) { - _bottomControlPriceLabel = [[UILabel alloc] init]; - } - return _bottomControlPriceLabel; -} - -- (UIButton *)bottomControlBuyButton { - if (!_bottomControlBuyButton) { - _bottomControlBuyButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _bottomControlBuyButton.titleLabel.font = kFontMedium(14); - [_bottomControlBuyButton setTitle:YMLocalizedString(@"1.0.30_text_5") forState:UIControlStateNormal]; - [_bottomControlBuyButton setTitleColor:UIColorFromRGB(0x51281B) forState:UIControlStateNormal]; - [_bottomControlBuyButton addGradientBackgroundWithColors:@[UIColorFromRGB(0xFFE3B2), UIColorFromRGB(0xE9A71D)] - startPoint:CGPointMake(0.0, 0.5) - endPoint:CGPointMake(1.0, 0.5) - cornerRadius:16]; - [_bottomControlBuyButton addTarget:self - action:@selector(didTapBuy:) - forControlEvents:UIControlEventTouchUpInside]; - } - return _bottomControlBuyButton; -} - -- (UIButton *)bottomControlGiveButton { - if (!_bottomControlGiveButton) { - _bottomControlGiveButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _bottomControlGiveButton.titleLabel.font = kFontMedium(14); - [_bottomControlGiveButton setTitle:YMLocalizedString(@"1.0.30_text_6") forState:UIControlStateNormal]; - [_bottomControlGiveButton setTitleColor:UIColorFromRGB(0x172055) forState:UIControlStateNormal]; - [_bottomControlGiveButton addGradientBackgroundWithColors:@[UIColorFromRGB(0xB2FCFF), UIColorFromRGB(0x4DA2EA)] - startPoint:CGPointMake(0.0, 0.5) - endPoint:CGPointMake(1.0, 0.5) - cornerRadius:16]; - [_bottomControlGiveButton addTarget:self - action:@selector(didTapGive:) - forControlEvents:UIControlEventTouchUpInside]; - } - return _bottomControlGiveButton; -} - -- (UIButton *)backButton { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:[kImage(@"common_nav_back_white") ms_SetImageForRTL] - forState:UIControlStateNormal]; - [b addTarget:self - action:@selector(didTapBack) - forControlEvents:UIControlEventTouchUpInside]; - return b; -} - -- (UILabel *)titleLabel { - UILabel *label = [[UILabel alloc] init]; - label.textAlignment = NSTextAlignmentCenter; - label.font = kFontMedium(17); - label.text = YMLocalizedString(@"XPDressUpShopViewController1"); - label.textColor = UIColorFromRGB(0xD9E7F7); - return label; -} - -- (UIButton *)myDressButton { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b addGradientBackgroundWithColors:@[UIColorFromRGB(0x004A4F), UIColorFromRGB(0x11215B)] - startPoint:CGPointMake(0.5, 0.0) - endPoint:CGPointMake(0.5, 1.0) - cornerRadius:11]; - [b setCornerRadius:11 - corners:kCALayerMaxXMaxYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMinXMinYCorner - borderWidth:1 - borderColor:UIColorFromRGB(0x75B4DF)]; - NSTextAttachment *iconAttachment = [[NSTextAttachment alloc] init]; - iconAttachment.image = kImage(@"mall_my_icon"); - iconAttachment.bounds = CGRectMake(8, -2, 14, 14); - NSAttributedString *iconString = [NSAttributedString attributedStringWithAttachment:iconAttachment]; - NSMutableAttributedString *title = [[NSMutableAttributedString alloc] initWithAttributedString:iconString]; - [title insertAttributedString:[[NSAttributedString alloc] initWithString:YMLocalizedString(@"1.0.30_text_8") - attributes:@{NSFontAttributeName: kFontMedium(12), - NSForegroundColorAttributeName: UIColorFromRGB(0xd9e7f7)}] - atIndex:0]; - [b setAttributedTitle:title - forState:UIControlStateNormal]; - - CGFloat spacing = 8.0; - - b.contentEdgeInsets = UIEdgeInsetsMake(0, spacing, 4, spacing); - - [b addTarget:self action:@selector(didTapMyDress) forControlEvents:UIControlEventTouchUpInside]; - - return b; -} - -- (UIActivityIndicatorView *)loading { - if (!_loading) { - UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite]; - indicator.translatesAutoresizingMaskIntoConstraints = NO; - indicator.hidesWhenStopped = YES; - _loading = indicator; - } - return _loading; -} - -@end diff --git a/YuMi/Modules/YMLogin/Api/PILoginManager.h b/YuMi/Modules/YMLogin/Api/PILoginManager.h deleted file mode 100644 index 1fbf390..0000000 --- a/YuMi/Modules/YMLogin/Api/PILoginManager.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// PILoginManager.h -// YuMi -// -// Created by duoban on 2023/10/7. -// - -#import -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface PILoginManager : NSObject -///登录，是否手机isLoginPhone -+(void)loginWithVC:(MvpViewController *)VC isLoginPhone:(BOOL)isLoginPhone; -///登录成功，回到首页 -+(void)jumpToHomeVCWithInviteCode:(NSString *)inviteCode; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/Api/PILoginManager.m b/YuMi/Modules/YMLogin/Api/PILoginManager.m deleted file mode 100644 index a27f84a..0000000 --- a/YuMi/Modules/YMLogin/Api/PILoginManager.m +++ /dev/null @@ -1,149 +0,0 @@ -// -// PILoginManager.m -// YuMi -// -// Created by duoban on 2023/10/7. -// - -#import "PILoginManager.h" -///api -#import "Api+Main.h" -///vc -#import "LoginFullInfoViewController.h" -#import "TabbarViewController.h" -#import "BaseNavigationController.h" -#import "LoginVerifCodeViewController.h" -///Model -#import "ThirdUserInfo.h" -#import "AccountModel.h" -#import "UserInfoModel.h" -#import "XPLoginAuthCodeVC.h" -///Manager -#import "TurboModeStateManager.h" -#import "FirstRechargeManager.h" -#import "PublicRoomManager.h" -///Swift -#import "YuMi-Swift.h" // 引入 Swift 类（NewTabBarController） -///Tool -#import "XNDJTDDLoadingTool.h" -#import "AccountInfoStorage.h" - -@implementation PILoginManager -+(void)loginWithVC:(MvpViewController *)VC isLoginPhone:(BOOL)isLoginPhone{ - [XNDJTDDLoadingTool showLoading]; - AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo]; - HomeUserModel *homeUserModel = [HomeUserModel new]; - if (accountModel == nil || accountModel.uid == nil || accountModel.access_token == nil) { - [XNDJTDDLoadingTool hideOnlyView:VC.view]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"LoginPresenter1")]; - return; - } - __block UserInfoModel *userInfo; - dispatch_group_t group = dispatch_group_create(); - dispatch_queue_t queue =dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0); - dispatch_group_enter(group); - dispatch_async(queue, ^{ - [Api requestTicket:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if(code == 200){ - NSArray *tickets = [data.data valueForKey:@"tickets"]; - NSString *ticket = [tickets[0] valueForKey:@"ticket"]; - homeUserModel.ticket = ticket; - [[AccountInfoStorage instance] saveTicket:ticket]; - - [Api getUserInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if(code == 200){ - userInfo = [UserInfoModel modelWithDictionary:data.data]; - [AccountInfoStorage instance].name = userInfo.nick; - homeUserModel.nick = userInfo.nick; - homeUserModel.avatar = userInfo.avatar; - homeUserModel.isBindPhone = userInfo.isBindPhone; - } - dispatch_group_leave(group); - } uid:accountModel.uid]; - return; - } - dispatch_group_leave(group); - } access_token:accountModel.access_token issue_type:@"multi"]; - }); - - dispatch_group_notify(group, dispatch_get_main_queue(), ^{ - [XNDJTDDLoadingTool hideOnlyView:VC.view]; - if ([[AccountInfoStorage instance] getTicket].length <= 0 || userInfo == nil) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"LoginPresenter1")]; - return; - } - [[AccountInfoStorage instance]saveHomeUserInfo:homeUserModel]; - if (userInfo.nick == nil || userInfo.avatar == nil) { - LoginFullInfoViewController * FullVC = [[LoginFullInfoViewController alloc] init]; - [VC.navigationController pushViewController:FullVC animated:YES]; - return; - } - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"PKIDLoginViewController0")]; - - [PILoginManager jumpToHomeVCWithInviteCode:@""]; - }); - - -} -+(void)jumpToHomeVCWithInviteCode:(NSString *)inviteCode{ - // ========== 白牌版本：使用新的 NewTabBarController ========== - // 原代码已注释，改用 Swift 实现的 NewTabBarController - - EPTabBarController *newTabBar = [EPTabBarController new]; - [newTabBar refreshTabBarWithIsLogin:YES]; - - // 设置为根控制器（不需要 NavigationController 包装） - - [self getKeyWindow].rootViewController = newTabBar; - - // 登录成功并进入主页后，启动首充监控 - [[FirstRechargeManager sharedManager] startMonitoring]; - - // 初始化公共房间管理器 - [[PublicRoomManager sharedManager] initialize]; - - // 🔧 启动 TurboModeStateManager - NSString *userId = [[AccountInfoStorage instance] getUid]; - if (userId) { - [[TurboModeStateManager sharedManager] startupWithCurrentUser:userId]; - } - - NSLog(@"[PILoginManager] 已切换到白牌 TabBar：EPTabBarController"); - - // ========== 原代码（已注释） ========== - /* - TabbarViewController *vc = [[TabbarViewController alloc] init]; - vc.isFormLogin = YES; - vc.inviteCode = inviteCode; - BaseNavigationController *bnc = [[BaseNavigationController alloc] initWithRootViewController:vc]; - kWindow.rootViewController = bnc; - */ -} - -#pragma mark - Helper Methods - -/// 获取 keyWindow（iOS 13+ 兼容） -+ (UIWindow *)getKeyWindow { - // iOS 13+ 使用 connectedScenes 获取 window - if (@available(iOS 13.0, *)) { - for (UIWindowScene *scene in [UIApplication sharedApplication].connectedScenes) { - if (scene.activationState == UISceneActivationStateForegroundActive) { - for (UIWindow *window in scene.windows) { - if (window.isKeyWindow) { - return window; - } - } - // 如果没有 keyWindow，返回第一个 window - return scene.windows.firstObject; - } - } - } - - // iOS 13 以下，使用旧方法（已废弃但仍然可用） -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - return [UIApplication sharedApplication].keyWindow; -#pragma clang diagnostic pop -} - -@end diff --git a/YuMi/Modules/YMLogin/Presenter/LoginPresenter.h b/YuMi/Modules/YMLogin/Presenter/LoginPresenter.h deleted file mode 100644 index a0b30d3..0000000 --- a/YuMi/Modules/YMLogin/Presenter/LoginPresenter.h +++ /dev/null @@ -1,72 +0,0 @@ -// -// LoginPresenter.h -// YUMI -// -// Created by zu on 2021/9/1. -// - -#import "BaseMvpPresenter.h" -#import "YUMINNNN.h" -#import -#import -#import - -@class FeedBackConfigModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface LoginPresenter : BaseMvpPresenter - -- (void)phoneQuickLogin:(NSString *)accessToken token:(NSString*) token; - - -/// 第三方登录 -/// @param type 登录的类型 -- (void)thirdLoginWithType:(ThirdLoginType)type; - -///第三方登录，谷歌登录 --(void)thirdLoginByGoogleWithPresentingViewController:(UIViewController *)presentingViewController configuration:(GIDConfiguration *)configuration; -///第三方登录，fb登录 --(void)thirdLoginByFBWithPresentingViewController:(UIViewController *)presentingViewController; -///第三方登录，line登录 --(void)thirdLoginByLine:(UIViewController *)presentingViewController; - -/// 获取手机的验证码 -/// @param phone 手机号 -/// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type phoneAreaCode:(NSString *)phoneAreaCode; - -/// 使用手机号和验证码登录 -/// @param phone 手机号 -/// @param code 验证码 -- (void)loginWithPhone:(NSString *)phone code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode; -/// 使用手机号和密码登录 -/// @param phone 手机号 -/// @param password 验证码 -- (void)loginWithPhone:(NSString *)phone password:(NSString *)password; - -///反馈 -- (void)loadFeedbackConfig:(void(^)(FeedBackConfigModel *model))success - failure:(void(^)(NSString *errorMessage))failure; -- (void)submitFeedback:(void(^)(void))success - failure:(void(^)(NSString *errorMessage))failure - type:(NSString *)type - desc:(NSString *)desc - photoURLString:(nullable NSString *)photoURLString - contact:(nullable NSString *)contact; - -- (void)sendMailVerificationCode:(NSString *)emailAddress type:(NSInteger)type; - -- (void)loginWithEmail:(NSString *)email code:(NSString *)code; - -- (void)bindingNewEmail:(NSString *)email code:(NSString *)code; -- (void)bindingNewPhone:(NSString *)phone code:(NSString *)code areaCode:(NSString *)areaCode; -- (void)resetEmailPassword:(NSString *)email code:(NSString *)code newPassword:(NSString *)newPwd; -- (void)resetPhonePassword:(NSString *)phone code:(NSString *)code newPassword:(NSString *)newPwd areaCode:(NSString *)areaCode; - -- (void)checkEmailCode:(NSString *)email code:(NSString *)code; -- (void)checkPhoneCode:(NSString *)phone code:(NSString *)code areaCode:(NSString *)areaCode; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m b/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m deleted file mode 100644 index 197ca4d..0000000 --- a/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m +++ /dev/null @@ -1,439 +0,0 @@ -// -// LoginPresenter.m -// YUMI -// -// Created by zu on 2021/9/1. -// - -#import "LoginPresenter.h" -///Third -#import -#import -///APi -#import "Api+Login.h" -///Tool -#import "AccountInfoStorage.h" -#import "XNDJTDDLoadingTool.h" -#import "YUMIMacroUitls.h" -///P -#import "LoginProtocol.h" -///Model -#import "ThirdUserInfo.h" -#import "AccountModel.h" -#import "DESEncrypt.h" - -#import "YuMi-swift.h" -#import "FeedBackConfigModel.h" - -static NSString *clinet_s = @"uyzjdhds"; - -@implementation LoginPresenter -- (void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} -- (instancetype)init{ - self = [super init]; - if(self){ - - } - return self; -} -- (id)getView { - return ((id) [super getView]); -} - -- (void)phoneQuickLogin:(NSString *)accessToken - token:(NSString *)token { - @kWeakify(self); - [Api phoneQuickLogin:[self createHttpCompletion:^(BaseModel *data) { - @kStrongify(self); - [[AccountInfoStorage instance] saveAccountInfo:[AccountModel modelWithDictionary:data.data]]; - [[self getView] loginSuccess]; - } showLoading:YES] accessToken:accessToken token:token]; -} - - -/// 第三方登录 -/// @param type 登录的类型 -- (void)thirdLoginWithType:(ThirdLoginType)type{ - - SSDKPlatformType platformType; - switch (type) { - case ThirdLoginType_FB: - platformType = SSDKPlatformTypeFacebook; - break; - case ThirdLoginType_Line: - platformType = SSDKPlatformTypeLine; - break; - case ThirdLoginType_Apple: - platformType = SSDKPlatformTypeAppleAccount; - break; - case ThirdLoginType_Gmail: - platformType = SSDKPlatformTypeGooglePlus; - break; - default: - platformType = SSDKPlatformTypeAppleAccount; - break; - } - NSDictionary * settings; - if (type == SSDKPlatformTypeFacebook) { - settings = @{@"isBrowser":@(YES)}; - } - @kWeakify(self); - [ShareSDK cancelAuthorize:platformType result:nil]; - [ShareSDK authorize:platformType - settings:settings - onStateChanged:^(SSDKResponseState state, SSDKUser *user, NSError *error) { - @kStrongify(self); - if (state == SSDKResponseStateSuccess) {///成功 - ThirdUserInfo * userInfo = [[ThirdUserInfo alloc] init]; - NSString * openid = @""; - NSString * access_token = user.credential.token.length > 0 ? user.credential.token : @""; - NSString * unionid = @""; - if (platformType == SSDKPlatformTypeLine) { - openid = user.credential.uid.length > 0 ? user.credential.uid : user.uid; - unionid = user.credential.uid.length > 0 ? user.credential.uid : user.uid; - userInfo.userName = user.nickname; - userInfo.avatarUrl = user.icon; - } else if (platformType == SSDKPlatformTypeFacebook) { //微信登录 - openid = user.credential.uid.length > 0 ? user.credential.uid : user.uid;; - unionid = user.credential.uid.length > 0 ? user.credential.uid : user.uid;; - userInfo.userName = user.nickname; - userInfo.avatarUrl = user.icon; - } else if (platformType == SSDKPlatformTypeAppleAccount) { //苹果登录 - // openid = user.credential.token; - unionid = [user.credential rawData][@"user"]; - NSString * familyName = [user.credential rawData][@"fullName"][@"familyName"]; - NSString * givenName = [user.credential rawData][@"fullName"][@"givenName"]; - if (familyName.length > 0 && givenName.length> 0) { - userInfo.userName = [NSString stringWithFormat:@"%@%@", familyName, givenName]; - } - } - if (unionid == nil) { - unionid = @""; - } - openid = unionid; - userInfo.openid = openid; - userInfo.access_token = access_token; - userInfo.unionid = unionid; - ///保存一下第三方的值 - [AccountInfoStorage instance].thirdUserInfo = userInfo; - [self loginWithThirdPartWithType:type]; - } else if(state == SSDKResponseStateCancel) {///取消 - [[self getView] showErrorToast:YMLocalizedString(@"LoginPresenter0")]; - } else if (state == SSDKResponseStateFail) {///失败 - [[self getView] showErrorToast:YMLocalizedString(@"LoginPresenter1")]; - } - }]; -} --(void)loginWithThirdPartWithType:(ThirdLoginType)type{ - [XNDJTDDLoadingTool showOnlyView:kWindow]; - NSString * openid = [AccountInfoStorage instance].thirdUserInfo.openid; - NSString * access_token = [AccountInfoStorage instance].thirdUserInfo.access_token; - NSString * unionid = [AccountInfoStorage instance].thirdUserInfo.unionid; - @kWeakify(self); - [Api loginWithThirdPart:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - AccountModel * model = [AccountModel modelWithDictionary:data.data]; - if (model != nil) { - [[AccountInfoStorage instance] saveAccountInfo:model]; - [XNDJTDDLoadingTool hideOnlyView:kWindow]; - [[self getView] loginThirdPartSuccess]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [XNDJTDDLoadingTool hideOnlyView:kWindow]; - if (msg.length == 0) { - [[self getView] showErrorToast:YMLocalizedString(@"LoginPresenter1")]; - } - } showLoading:YES errorToast:YES] - openid:openid - unionid:unionid - access_token:access_token - type:[NSString stringWithFormat:@"%lu", (unsigned long)type]]; - - -} --(void)thirdLoginByLine:(UIViewController *)presentingViewController { - -} --(void)thirdLoginByFBWithPresentingViewController:(UIViewController *)presentingViewController { - -} --(void)thirdLoginByGoogleWithPresentingViewController:(UIViewController *)presentingViewController configuration:(GIDConfiguration *)configuration{ - @kWeakify(self); - [GIDSignIn sharedInstance].configuration = configuration; - [GIDSignIn.sharedInstance signInWithPresentingViewController:presentingViewController - completion:^(GIDSignInResult * _Nullable signInResult, NSError * _Nullable error) { - @kStrongify(self); - if (error) { - if (error.code == kGIDSignInErrorCodeCanceled){ - [[self getView] showErrorToast:YMLocalizedString(@"LoginPresenter0")]; - }else{ - [[self getView] showErrorToast:YMLocalizedString(@"LoginPresenter1")]; - } - } else { - ThirdUserInfo * userInfo = [[ThirdUserInfo alloc] init]; - NSString * openid = signInResult.user.userID; - NSString * access_token = signInResult.user.idToken.tokenString.length > 0 ? signInResult.user.idToken.tokenString : @""; - NSString * unionid = signInResult.user.userID; - userInfo.userName = signInResult.user.profile.name; - userInfo.avatarUrl = [[signInResult.user.profile imageURLWithDimension:60] absoluteString]; - userInfo.openid = openid; - userInfo.access_token = access_token; - userInfo.unionid = unionid; - ///保存一下第三方的值 - [AccountInfoStorage instance].thirdUserInfo = userInfo; - [self loginWithThirdGoogle]; - } - }]; -} - --(void)loginWithThirdGoogle{ - [XNDJTDDLoadingTool showOnlyView:kWindow]; - NSString * openid = [AccountInfoStorage instance].thirdUserInfo.openid; - NSString * access_token = [AccountInfoStorage instance].thirdUserInfo.access_token; - NSString * unionid = [AccountInfoStorage instance].thirdUserInfo.unionid; - @kWeakify(self); - [Api loginWithThirdPart:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [XNDJTDDLoadingTool hideOnlyView:kWindow]; - AccountModel * model = [AccountModel modelWithDictionary:data.data]; - if (model != nil) { - [[AccountInfoStorage instance] saveAccountInfo:model]; - [[self getView] loginThirdPartSuccess]; - } - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [XNDJTDDLoadingTool hideOnlyView:kWindow]; - if (msg.length == 0) { - [[self getView] showErrorToast:YMLocalizedString(@"LoginPresenter1")]; - } - } showLoading:YES errorToast:YES] - openid:openid - unionid:unionid - access_token:access_token - type:[NSString stringWithFormat:@"%lu", (unsigned long)ThirdLoginType_Gmail]]; -} - -/// 获取手机的验证码 -/// @param phone 手机号 -/// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type phoneAreaCode:(NSString *)phoneAreaCode { - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - @kWeakify(self); - [Api phoneSmsCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(phoneSmsCodeSuccess:type:)]) { - NSString *message = data.message; - [[self getView] phoneSmsCodeSuccess:message type:type]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(phoneSmsCodeFailure)]) { - [[self getView] phoneSmsCodeFailure]; - } - } showLoading:YES errorToast:YES] mobile:desPhone type:[NSString stringWithFormat:@"%lu", (unsigned long)type] phoneAreaCode:phoneAreaCode]; -} - -/// 使用手机号和验证码登录 -/// @param phone 手机号 -/// @param code 验证码 -- (void)loginWithPhone:(NSString *)phone code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode{ - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - @kWeakify(self); - [Api loginWithCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - AccountModel * accountModel = [AccountModel modelWithDictionary:data.data]; - if (accountModel && accountModel.access_token.length > 0) { - [[AccountInfoStorage instance] saveAccountInfo:accountModel]; - } - [[self getView] loginWithPhoenSuccess]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] loginFailWithMsg:msg]; - } errorToast:NO] phone:desPhone code:code client_secret:clinet_s version:@"1" client_id:@"erban-client" grant_type:@"password" phoneAreaCode:phoneAreaCode]; -} -/// 使用手机号和密码登录 -/// @param phone 手机号 -/// @param password 验证码 -- (void)loginWithPhone:(NSString *)phone password:(NSString *)password { - NSString * desPassword = [DESEncrypt encryptUseDES:password key:KeyWithType(KeyType_PasswordEncode)]; - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - @kWeakify(self); - [Api loginWithPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - AccountModel * accountModel = [AccountModel modelWithDictionary:data.data]; - if (accountModel && accountModel.access_token.length > 0) { - [[AccountInfoStorage instance] saveAccountInfo:accountModel]; - } - [[self getView] loginSuccess]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] loginFailWithMsg:msg]; - } showLoading:YES errorToast:YES] phone:desPhone password:desPassword client_secret:clinet_s version:@"1" client_id:@"erban-client" grant_type:@"password"]; -} - -///反馈 -- (void)loadFeedbackConfig:(void(^)(FeedBackConfigModel *model))success - failure:(void(^)(NSString *errorMessage))failure { - [Api loadFeedbackConfig:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - FeedBackConfigModel *model =[FeedBackConfigModel modelWithDictionary:data.data]; - if (success) { - success(model); - } - } else { - if (failure) { - failure(msg); - } - } - }]; -} - -- (void)submitFeedback:(void(^)(void))success - failure:(void(^)(NSString *errorMessage))failure - type:(NSString *)type - desc:(NSString *)desc - photoURLString:(nullable NSString *)photoURLString - contact:(nullable NSString *)contact { - [Api commitFeedback:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - if (success) { - success(); - } - } else { - if (failure) { - failure(msg); - } - } - } - type:type - desc:desc - screenUrl:photoURLString ? photoURLString : @"" - contact:contact ? contact : @""]; - -} - -- (void)sendMailVerificationCode:(NSString *)emailAddress type:(NSInteger)type { - NSString * desEmail = [DESEncrypt encryptUseDES:emailAddress key:KeyWithType(KeyType_PasswordEncode)]; - @kWeakify(self); - [Api emailGetCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(emailCodeSucess:type:)]) { - [[self getView] emailCodeSucess:@"" type:type]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(emailCodeFailure)]) { - [[self getView] emailCodeFailure]; - } - } showLoading:YES errorToast:YES] - emailAddress:desEmail type:@(type)]; -} - -- (void)loginWithEmail:(NSString *)email code:(NSString *)code { - NSString * desMail = [DESEncrypt encryptUseDES:email key:KeyWithType(KeyType_PasswordEncode)]; - @kWeakify(self); - [Api loginWithCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - AccountModel * accountModel = [AccountModel modelWithDictionary:data.data]; - if (accountModel && accountModel.access_token.length > 0) { - [[AccountInfoStorage instance] saveAccountInfo:accountModel]; - } - if ([[self getView] respondsToSelector:@selector(loginSuccess)]) { - [[self getView] loginSuccess]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] loginFailWithMsg:msg]; - } errorToast:NO] - email:desMail - code:code - client_secret:clinet_s - version:@"1" - client_id:@"erban-client" - grant_type:@"email"]; -} - -- (void)bindingNewEmail:(NSString *)email code:(NSString *)code { - NSString *desMail = [DESEncrypt encryptUseDES:email key:KeyWithType(KeyType_PasswordEncode)]; - @kWeakify(self); - [Api userBoundEmail:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(bindingNewEmailSuccess:)]) { - [[self getView] bindingNewEmailSuccess:@""]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(bindingNewEmailFailure:)]) { - [[self getView] bindingNewEmailFailure:msg]; - } - } showLoading:YES errorToast:NO] email:desMail code:code]; -} - -- (void)bindingNewPhone:(NSString *)phone code:(NSString *)code areaCode:(NSString *)areaCode { - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - @kWeakify(self); - [Api userBoundPhone:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(bindingNewPhoneSuccess:)]) { - [[self getView] bindingNewPhoneSuccess:@""]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(bindingNewPhoneFailure:)]) { - [[self getView] bindingNewPhoneFailure:msg]; - } - } showLoading:YES errorToast:YES] phone:desPhone code:code phoneAreaCode:areaCode]; -} - -- (void)resetEmailPassword:(NSString *)email code:(NSString *)code newPassword:(NSString *)newPwd { - NSString *desMail = [DESEncrypt encryptUseDES:email key:KeyWithType(KeyType_PasswordEncode)]; - NSString *desPassword = [DESEncrypt encryptUseDES:newPwd key:KeyWithType(KeyType_PasswordEncode)]; - @kWeakify(self); - [Api resetPasswordWithEmail:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(resetEmailPasswordSuccess)]) { - [[self getView] resetEmailPasswordSuccess]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES] email:desMail newPwd:desPassword code:code]; -} - -- (void)resetPhonePassword:(NSString *)phone code:(NSString *)code newPassword:(NSString *)newPwd areaCode:(NSString *)areaCode { - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - NSString *desPassword = [DESEncrypt encryptUseDES:newPwd key:KeyWithType(KeyType_PasswordEncode)]; - @kWeakify(self); - [Api resetPasswordWithPhone:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(resetPhonePasswordSuccess)]) { - [[self getView] resetPhonePasswordSuccess]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES] phone:desPhone newPwd:desPassword smsCode:code phoneAreaCode:areaCode]; -} - -- (void)checkEmailCode:(NSString *)email code:(NSString *)code { - NSString *desMail = [DESEncrypt encryptUseDES:email key:KeyWithType(KeyType_PasswordEncode)]; - [Api emailVerify:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] checkEmailSuccess]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES] emailAddress:desMail code:code]; -} - -- (void)checkPhoneCode:(NSString *)phone code:(NSString *)code areaCode:(NSString *)areaCode { - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - [Api checkMoblieCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] checkPhoneSuccess]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES] mobile:desPhone code:desPhone uid:uid ticket:ticket phoneAreaCode:areaCode]; -} - -@end diff --git a/YuMi/Modules/YMLogin/Presenter/XPLoginVerifBindPhonePresenter.h b/YuMi/Modules/YMLogin/Presenter/XPLoginVerifBindPhonePresenter.h deleted file mode 100644 index 92b0e99..0000000 --- a/YuMi/Modules/YMLogin/Presenter/XPLoginVerifBindPhonePresenter.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// YMLoginVerifBindPhonePresenter.h -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "MainPresenter.h" -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPLoginVerifBindPhonePresenter : MainPresenter - -/// 获取手机的验证码 -/// @param phone 手机号 -/// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type phoneAreaCode:(NSString *)phoneAreaCode; - -/// 校验手机验证码接口 -/// @param moblieNum 手机号码 -/// @param code 验证码 -- (void)checkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode; - -/// 绑定手机验证码接口 -/// @param moblieNum 手机号码 -/// @param code 验证码 -- (void)bindkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/Presenter/XPLoginVerifBindPhonePresenter.m b/YuMi/Modules/YMLogin/Presenter/XPLoginVerifBindPhonePresenter.m deleted file mode 100644 index 63d973a..0000000 --- a/YuMi/Modules/YMLogin/Presenter/XPLoginVerifBindPhonePresenter.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// YMLoginVerifBindPhonePresenter.m -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "XPLoginVerifBindPhonePresenter.h" -#import "Api+Login.h" -///Tool -#import "AccountInfoStorage.h" -#import "DESEncrypt.h" -#import "YUMIConstant.h" -///P -#import "XPLoginVerifBindPhoneProtocol.h" - -@implementation XPLoginVerifBindPhonePresenter - -/// 获取手机的验证码 -/// @param phone 手机号 -/// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type phoneAreaCode:(NSString *)phoneAreaCode{ - NSString * typeStr = [NSString stringWithFormat:@"%lu", (unsigned long)type]; - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api phoneSmsCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] phoneSmsCodeSuccess]; - }] mobile:desPhone type:typeStr phoneAreaCode:phoneAreaCode]; -} - - -/// 校验手机验证码接口 -/// @param moblieNum 手机号码 -/// @param code 验证码 -- (void)checkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode{ - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * desPhone = [DESEncrypt encryptUseDES:moblieNum key:KeyWithType(KeyType_PasswordEncode)]; - [Api checkMoblieCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] checkMoblieCodeWithMoblieSuccess]; - }] mobile:desPhone code:code uid:uid ticket:ticket phoneAreaCode:phoneAreaCode]; -} - -/// 绑定手机验证码接口 -/// @param moblieNum 手机号码 -/// @param code 验证码 -- (void)bindkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode{ - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * desPhone = [DESEncrypt encryptUseDES:moblieNum key:KeyWithType(KeyType_PasswordEncode)]; - [Api bindMoblieCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] bindMoblieCodeWithMoblieSuccess]; - }] phone:desPhone code:code ticket:ticket phoneAreaCode:phoneAreaCode]; -} -@end diff --git a/YuMi/Modules/YMLogin/View/AccountBindingViewController.h b/YuMi/Modules/YMLogin/View/AccountBindingViewController.h deleted file mode 100644 index 9205ac7..0000000 --- a/YuMi/Modules/YMLogin/View/AccountBindingViewController.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// AccountBindingViewController.h -// YuMi -// -// Created by P on 2025/3/14. -// - -#import "MvpViewController.h" -@class UserInfoModel; -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, BindingDisplayType) { - BindingDisplayType_email, - BindingDisplayType_phoneNum, -}; - -@interface AccountBindingViewController : MvpViewController - -- (instancetype)initWithType:(BindingDisplayType)type - currentBindingAccount:(NSString *)account - areaCode:(NSString *)areaCode - userInfo:(UserInfoModel *)userInfo; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/AccountBindingViewController.m b/YuMi/Modules/YMLogin/View/AccountBindingViewController.m deleted file mode 100644 index 464240c..0000000 --- a/YuMi/Modules/YMLogin/View/AccountBindingViewController.m +++ /dev/null @@ -1,444 +0,0 @@ -// -// AccountBindingViewController.m -// YuMi -// -// Created by P on 2025/3/14. -// - -#import "AccountBindingViewController.h" -#import "LoginProtocol.h" -#import "LoginPresenter.h" -#import "LoginInputItemView.h" -#import "XPLoginAraeViewController.h" -#import "XPLoginVerifBindPhonePresenter.h" -#import "UserInfoModel.h" -#import "XPMineSettingViewController.h" -#import "XPWebViewController.h" - -@interface AccountBindingViewController () -@property(nonatomic, assign) BindingDisplayType type; -@property(nonatomic, copy) NSString *currentAccount; -@property(nonatomic, copy) NSString *currentAreaCode; -@property(nonatomic, strong) UILabel *currentAccountLabel; -@property(nonatomic, strong) UIStackView *stackView; -@property(nonatomic, strong) LoginInputItemView *firstLineInputView; -@property(nonatomic, strong) LoginInputItemView *secondLineInputView; -@property(nonatomic, strong) UIButton *bottomActionButton; -@property(nonatomic, strong) UserInfoModel *userInfo; -@property(nonatomic, strong) XPWebViewController *webVC; - -@end - -@implementation AccountBindingViewController - -- (LoginPresenter *)createPresenter { - return [[LoginPresenter alloc] init]; -} - -- (instancetype)initWithType:(BindingDisplayType)type - currentBindingAccount:(NSString *)account - areaCode:(NSString *)areaCode - userInfo:(UserInfoModel *)userInfo { - if (self = [super init]) { - self.type = type; - self.currentAccount = account; - self.currentAreaCode = areaCode; - self.userInfo = userInfo; - } - return self; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - [self setupUI]; -} - -- (void)setupUI { - - [self setupDefaultUI]; - - if ([NSString isEmpty:self.currentAccount]) { - [self setupNewBindingUI]; - } else { - [self setupUpdateBindingUI]; - } -} - -- (void)setupDefaultUI { - self.view.backgroundColor = [UIColor whiteColor]; - self.title = [self displayTitle]; -} - -- (void)setupNewBindingUI { - [self displayInputArea:25 - topView:self.view - isBottom:NO]; -} - -- (void)setupUpdateBindingUI { - UIImageView *topImageView = [self topImageView]; - [self.view addSubview:topImageView]; - [topImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.view).offset(16); - make.centerX.mas_equalTo(self.view); - make.size.mas_equalTo(CGSizeMake(170, 170)); - }]; - - UILabel *descLabel = [self descriptionLabel]; - [self.view addSubview:descLabel]; - [descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(topImageView.mas_bottom).offset(14); - make.leading.trailing.mas_equalTo(self.view).inset(40); - }]; - - [self.view addSubview:self.currentAccountLabel]; - [self.currentAccountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(descLabel.mas_bottom).offset(9); - make.centerX.mas_equalTo(self.view); - }]; - self.currentAccountLabel.text = self.currentAccount; - - [self displayInputArea:25 - topView:self.currentAccountLabel - isBottom:YES]; -} - -#pragma mark - -- (NSString *)displayTitle { - if ([NSString isEmpty:self.currentAccount]) { - if (self.type == BindingDisplayType_email) { - return YMLocalizedString(@"20.20.51_text_13"); - } else { - return YMLocalizedString(@"20.20.51_text_14"); - } - } else { - return YMLocalizedString(@"20.20.51_text_15"); - } -} - -- (void)displayInputArea:(NSInteger)topSpace - topView:(UIView *)topView - isBottom:(BOOL)isBottom { - [self.view addSubview:self.stackView]; - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - if (isBottom) { - make.top.mas_equalTo(topView.mas_bottom).offset(topSpace); - } else { - make.top.mas_equalTo(topView).offset(topSpace); - } - make.leading.trailing.mas_equalTo(self.view).inset(40); - }]; - - @kWeakify(self); - if ([NSString isEmpty:self.currentAccount]) { - if (self.type == BindingDisplayType_email) { - self.firstLineInputView = [[LoginInputItemView alloc] initWithType:LoginInputType_email]; - } else { - self.firstLineInputView = [[LoginInputItemView alloc] initWithType:LoginInputType_phoneNum]; - } - [self.firstLineInputView updateBGColor:UIColorFromRGB(0xf2f3f7)]; - [self.firstLineInputView setHandleItemAction:^(LoginInputType inputType) { - @kStrongify(self); - if (inputType == LoginInputType_phoneNum) { - [self handleTapAreaCode]; - } - }]; - [self.firstLineInputView setHandleFirstInputContentUpdate:^(NSString *inputContent) { - @kStrongify(self); - [self checkActionButtonStatus]; - }]; - - [self.stackView addArrangedSubview:self.firstLineInputView]; - } - - self.secondLineInputView = [[LoginInputItemView alloc] initWithType:LoginInputType_verificationCode]; - [self.secondLineInputView updateBGColor:UIColorFromRGB(0xf2f3f7)]; - [self.secondLineInputView setHandleItemAction:^(LoginInputType inputType) { - @kStrongify(self); - if (inputType == LoginInputType_verificationCode) { - if (self.type == BindingDisplayType_phoneNum) { - [self handleTapGetPhoneVerificationCode]; - } else if (self.type == BindingDisplayType_email) { - [self handleTapGetMailVerificationCode]; - } - } - }]; - [self.secondLineInputView setHandleSecondInputContentUpdate:^(NSString *inputContent) { - @kStrongify(self); - [self checkActionButtonStatus]; - }]; - [self.stackView addArrangedSubview:self.secondLineInputView]; - - [self.stackView addArrangedSubview:self.bottomActionButton]; - [self.firstLineInputView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(46); - }]; - [self.secondLineInputView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(46); - }]; - [self.bottomActionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(46); - }]; -} - -#pragma mark - -- (void)handleTapGetPhoneVerificationCode { - NSString *phone = @""; - NSString *areaCode = @""; - if ([NSString isEmpty:self.currentAccount]) { - phone = [self.firstLineInputView inputContent]; - areaCode = [self.firstLineInputView loadAreaCode]; - } else { - phone = self.currentAccount; - areaCode = self.currentAreaCode; - } - - if (phone.length == 0 ) { - [self showErrorToast:YMLocalizedString(@"XPLoginPhoneViewController0")]; - [self.secondLineInputView endVerificationCountDown]; - return; - } - - @kWeakify(self); - [self loadCaptchaWebView:^{ - @kStrongify(self); - [self.presenter phoneSmsCode:[NSString stringWithFormat:@"%@%@", areaCode,phone] - type:[NSString isEmpty:self.currentAccount] ? GetSmsType_Regist : GetSmsType_Unbind_Phone - phoneAreaCode:areaCode]; - }]; -} - -- (void)handleTapGetMailVerificationCode { - NSString *email = @""; - if (![NSString isEmpty:self.currentAccount]) { - email = self.currentAccount; - } else { - email = [self.firstLineInputView inputContent]; - } - - if (email.length == 0 ) { -// [self showErrorToast:YMLocalizedString(@"20.20.51_text_12")]; - [self.secondLineInputView endVerificationCountDown]; - return; - } - [self.presenter sendMailVerificationCode:email - type:[NSString isEmpty:self.currentAccount] ? GetSmsType_Regist : GetSmsType_Unbind_Phone]; -} - -#pragma mark - -- (void)didTapActionButton { - [self.view endEditing:true]; - if (self.type == BindingDisplayType_email) { - if ([NSString isEmpty:self.currentAccount]) { - [self.presenter bindingNewEmail:[self.firstLineInputView inputContent] - code:[self.secondLineInputView inputContent]]; - } else { - [self.presenter checkEmailCode:self.currentAccount - code:[self.secondLineInputView inputContent]]; - } - } else { - if ([NSString isEmpty:self.currentAccount]) { - [self.presenter bindingNewPhone:[self.firstLineInputView inputContent] - code:[self.secondLineInputView inputContent] - areaCode:[self.firstLineInputView loadAreaCode]]; - } else { - [self.presenter checkPhoneCode:self.currentAccount - code:[self.secondLineInputView inputContent] - areaCode:self.userInfo.phoneAreaCode]; - } - } -} - -- (void)handleTapAreaCode { - XPLoginAraeViewController *codeVC = [XPLoginAraeViewController new]; - codeVC.delegate = self; - [self.navigationController pushViewController:codeVC animated:YES]; -} - -- (void)checkActionButtonStatus { - NSString *accountString = [self.firstLineInputView inputContent]; - NSString *codeString = [self.secondLineInputView inputContent]; - - if ([NSString isEmpty:self.currentAccount]) { - if (![NSString isEmpty:accountString] && ![NSString isEmpty:codeString]) { - self.bottomActionButton.enabled = YES; - } else { - self.bottomActionButton.enabled = NO; - } - } else { - if (![NSString isEmpty:codeString]) { - self.bottomActionButton.enabled = YES; - } else { - self.bottomActionButton.enabled = NO; - } - } -} - -- (void)loadCaptchaWebView:(void(^)(void))finishBlock { - if ([ClientConfig.shareConfig shouldDisplayCaptcha]) { - [self.view endEditing:YES]; - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.view.frame = CGRectMake(0, 0, KScreenWidth*0.8, KScreenWidth*1.2); - webVC.view.backgroundColor = [UIColor clearColor]; - [webVC.view setCornerRadius:12]; - webVC.isLoginStatus = NO; - webVC.isPush = NO; - [webVC hideNavigationBar]; - webVC.url = URLWithType(kCaptchaSwitchPath); - [webVC setVerifyCaptcha:^(BOOL result) { - if (result == NO) { - return; - } - if (result && finishBlock) { - [TTPopup dismiss]; - finishBlock(); - } - }]; - [TTPopup popupView:webVC.view style:TTPopupStyleAlert]; - self.webVC = webVC; - } -} - -#pragma mark - API presenter Delegate -- (void)phoneSmsCodeSuccess:(NSString *)message type:(GetSmsType)type{ - if (type == GetSmsType_Unbind_Phone) { - XPLoginVerifBindPhonePresenter *presenter = [[XPLoginVerifBindPhonePresenter alloc] init]; - [presenter checkMoblieCodeWithMoblie:self.currentAccount - code:[self.secondLineInputView inputContent] - phoneAreaCode:self.userInfo.phoneAreaCode]; - } else { - [self showSuccessToast:YMLocalizedString(@"XPLoginPhoneViewController2")]; - [self.secondLineInputView startVerificationCountDown]; - [self.secondLineInputView displayKeyboard]; - } -} - -- (void)phoneSmsCodeFailure { - [self.secondLineInputView endVerificationCountDown]; -} - -- (void)emailCodeSucess:(NSString *)message type:(GetSmsType)type{ - [self showSuccessToast:YMLocalizedString(@"XPLoginPhoneViewController2")]; - [self.secondLineInputView startVerificationCountDown]; - [self.secondLineInputView displayKeyboard]; -} - -- (void)emailCodeFailure { - [self.secondLineInputView endVerificationCountDown]; - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)bindingNewEmailSuccess:(NSString *)message { - [self showSuccessToast:YMLocalizedString(@"XPLoginBindSuccessView0")]; - for (UIViewController *VC in self.navigationController.viewControllers) { - if ([VC isKindOfClass:[XPMineSettingViewController class]]) { - [self.navigationController popToViewController:VC animated:YES]; - return; - } - } -} - -- (void)bindingNewEmailFailure:(NSString *)message { - [self showSuccessToast:message]; -} - -- (void)chooseAreaCodeSuccess:(NSString *)code { - [self.firstLineInputView updateAreaCode:code]; -} - -- (void)checkEmailSuccess { - AccountBindingViewController *vc = [[AccountBindingViewController alloc] initWithType:self.type - currentBindingAccount:@"" - areaCode:@"" - userInfo:self.userInfo]; - [self.navigationController pushViewController:vc animated:YES]; -} - -- (void)checkPhoneSuccess { - AccountBindingViewController *vc = [[AccountBindingViewController alloc] initWithType:self.type - currentBindingAccount:@"" - areaCode:@"" - userInfo:self.userInfo]; - [self.navigationController pushViewController:vc animated:YES]; -} - -- (void)bindingNewPhoneSuccess:(NSString *)message { - [self showSuccessToast:YMLocalizedString(@"XPLoginBindSuccessView0")]; - for (UIViewController *VC in self.navigationController.viewControllers) { - if ([VC isKindOfClass:[XPMineSettingViewController class]]) { - [self.navigationController popToViewController:VC animated:YES]; - return; - } - } -} - -- (void)bindingNewPhoneFailure:(NSString *)message { - [self showSuccessToast:message]; -} - -#pragma mark - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.spacing = 24; - _stackView.distribution = UIStackViewDistributionFillEqually; - } - return _stackView; -} - -- (UIButton *)bottomActionButton { - if (!_bottomActionButton) { - _bottomActionButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_bottomActionButton setCornerRadius:23]; - [_bottomActionButton setTitle:YMLocalizedString(@"XPAnchorAudienceUpMicView2") forState:UIControlStateNormal]; - [_bottomActionButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - UIImage *normalBG = [UIImage gradientColorImageFromColors:@[ - UIColorFromRGB(0xe29030), - UIColorFromRGB(0xfcc074) - ] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(KScreenWidth-84, 46)] ; - UIImage *disableBG = [UIImage gradientColorImageFromColors:@[ - [UIColor colorWithRed:245/255.0 green:199/255.0 blue:129/255.0 alpha:1], - [UIColor colorWithRed:253/255.0 green:217/255.0 blue:154/255.0 alpha:1], - ] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(KScreenWidth-84, 46)] ; - [_bottomActionButton setBackgroundImage:normalBG forState:UIControlStateNormal]; - [_bottomActionButton setBackgroundImage:disableBG forState:UIControlStateDisabled]; - [_bottomActionButton addTarget:self - action:@selector(didTapActionButton) - forControlEvents:UIControlEventTouchUpInside]; - _bottomActionButton.enabled = NO; - } - return _bottomActionButton; -} - -- (UIImageView *)topImageView { - UIImageView *imageView = [[UIImageView alloc] initWithImage:kImage(@"binding_page_top")]; - imageView.contentMode = UIViewContentModeScaleAspectFit; - return imageView; -} - -- (UILabel *)descriptionLabel { - UILabel *label = [UILabel labelInitWithText:YMLocalizedString(@"20.20.51_text_16") - font:kFontRegular(14) - textColor:UIColorFromRGB(0xafb1b3)]; - label.textAlignment = NSTextAlignmentCenter; - label.numberOfLines = 0; - return label; -} - -- (UILabel *)currentAccountLabel { - if (!_currentAccountLabel) { - _currentAccountLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(16) - textColor:UIColorFromRGB(0x313131)]; - _currentAccountLabel.textAlignment = NSTextAlignmentCenter; - } - return _currentAccountLabel; -} - -@end diff --git a/YuMi/Modules/YMLogin/View/CustomView/LoginForgetEditView.h b/YuMi/Modules/YMLogin/View/CustomView/LoginForgetEditView.h deleted file mode 100644 index 304d302..0000000 --- a/YuMi/Modules/YMLogin/View/CustomView/LoginForgetEditView.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// LoginForgetEditView.h -// xplan-ios -// -// Created by 冯硕 on 2021/9/10. -// - -#import -#import "XPTextField.h" -NS_ASSUME_NONNULL_BEGIN - -typedef enum : NSUInteger { - LoginForgetEditViewTypeNormal, // 普通类型 - LoginForgetEditViewTypeSms, // 短信验证码类型 - LoginForgetEditViewTypePassword, ///密码 -} LoginForgetEditViewType; - -@interface LoginForgetEditView : UIView -/** textField */ -@property (nonatomic, strong, readonly) XPTextField *textField; -/** rightButton */ -@property (nonatomic, strong, readonly) UIButton *rightButton; -/** 验证码 */ -@property (nonatomic, strong, readonly) UIButton *authCodeButton; -///选择区号 -@property (nonatomic,strong,readonly) UILabel *codeView; -///倒计时 -@property (nonatomic, strong, readonly) UILabel *cutdownLabel; -///类型 -@property (nonatomic, assign) LoginForgetEditViewType type; -///展位图 -@property (nonatomic,copy) NSString *placeholder; -@property (nonatomic,copy) NSString *areaCode; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/CustomView/LoginForgetEditView.m b/YuMi/Modules/YMLogin/View/CustomView/LoginForgetEditView.m deleted file mode 100644 index b8bf996..0000000 --- a/YuMi/Modules/YMLogin/View/CustomView/LoginForgetEditView.m +++ /dev/null @@ -1,207 +0,0 @@ -// -// LoginForgetEditView.m -// xplan-ios -// -// Created by 冯硕 on 2021/9/10. -// - -#import "LoginForgetEditView.h" - -///第三方 -#import -///Tool - - -@interface LoginForgetEditView() - - -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///倒计时 -@property (nonatomic, strong) UILabel *cutdownLabel; -///选择区号 -@property (nonatomic,strong) UILabel *codeView; -/** textField */ -@property (nonatomic, strong) XPTextField *textField; -/** rightButton */ -@property (nonatomic, strong) UIButton *rightButton; -/** 验证码 */ -@property (nonatomic, strong) UIButton *authCodeButton; - -@end - -@implementation LoginForgetEditView - -#pragma mark - life cycle -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initView]; - [self initConstrations]; - - } - return self; -} - -#pragma mark - private method -- (void)initView { - self.backgroundColor = UIColorFromRGB(0xF0F5F6); - self.layer.masksToBounds = YES; - self.layer.cornerRadius = kGetScaleWidth(24); - - [self addSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.codeView]; - [self.stackView addArrangedSubview:self.textField]; - [self.stackView addArrangedSubview:self.rightButton]; - [self.stackView addArrangedSubview:self.cutdownLabel]; - [self.stackView addArrangedSubview:self.authCodeButton]; -} - -- (void)initConstrations { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(20)); - make.trailing.mas_equalTo(-kGetScaleWidth(20)); - make.top.bottom.equalTo(self); - }]; - - [self.codeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_lessThanOrEqualTo(kGetScaleWidth(70)); - }]; - [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.codeView.mas_trailing).mas_offset(10); - }]; - [self.authCodeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_lessThanOrEqualTo(kGetScaleWidth(120)); - }]; - [self.rightButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(24)); - }]; - [self.cutdownLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_lessThanOrEqualTo(kGetScaleWidth(120)); - }]; -} - -#pragma mark - getters and setters -- (void)setType:(LoginForgetEditViewType)type { - switch (type) { - case LoginForgetEditViewTypeNormal: - self.codeView.hidden = NO; - self.rightButton.hidden = YES; - self.authCodeButton.hidden = YES; - self.cutdownLabel.hidden = YES; - self.textField.isValidation = YES; - break; - case LoginForgetEditViewTypeSms: - self.authCodeButton.hidden = NO; - self.rightButton.hidden = YES; - self.cutdownLabel.hidden = YES; - self.codeView.hidden = YES; - self.textField.isValidation = YES; - break; - case LoginForgetEditViewTypePassword: - self.authCodeButton.hidden = YES; - self.cutdownLabel.hidden = YES; - self.codeView.hidden = YES; - self.rightButton.hidden = NO; - self.textField.isValidation = NO; - break; - default: - break; - } -} --(NSMutableAttributedString *)getChooseCodeText:(NSString *)code{ - NSMutableAttributedString *codeAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@ ",code] attributes:@{NSFontAttributeName:kFontSemibold(15),NSForegroundColorAttributeName:[DJDKMIMOMColor inputTextColor]}]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"login_arrow"];; - attachment.bounds = CGRectMake(0, roundf(self.codeView.font.capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height); - attachment.image = iconImage; - [codeAtt appendAttributedString:[NSMutableAttributedString attributedStringWithAttachment:attachment]]; - return codeAtt; - -} --(void)setAreaCode:(NSString *)areaCode{ - _areaCode = areaCode; - _codeView.attributedText = [self getChooseCodeText:_areaCode]; -} -- (void)setPlaceholder:(NSString *)placeholder { - _placeholder = placeholder; - if (_placeholder) { - NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init]; - NSDictionary *dic = @{ - NSParagraphStyleAttributeName:style, - NSFontAttributeName:kFontRegular(15), - NSForegroundColorAttributeName:[DJDKMIMOMColor disableButtonTextColor]}; - if (placeholder == nil || placeholder.length == 0) { - placeholder = @""; - } - self.textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:dic]; - } -} - -#pragma mark -懒加载 - -- (UILabel *)codeView{ - if (!_codeView){ - _codeView = [UILabel new]; - _codeView.userInteractionEnabled = YES; - NSString *code = [NSString getCountryCode]; - _codeView.attributedText = [self getChooseCodeText: code]; - - } - return _codeView; -} - -- (XPTextField *)textField { - if (!_textField) { - _textField = [[XPTextField alloc]initWithFrame:CGRectZero]; - _textField.font = kFontRegular(15); - _textField.textColor = [DJDKMIMOMColor inputTextColor]; - _textField.adjustsFontSizeToFitWidth = YES; - - } - return _textField; -} - -- (UIButton *)rightButton { - if (!_rightButton) { - _rightButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_rightButton setImage:[UIImage imageNamed:@"login_forget_password_hidden"] forState:UIControlStateNormal]; - [_rightButton setImage:[UIImage imageNamed:@"login_forget_password_show"] forState:UIControlStateSelected]; - } - return _rightButton; -} -- (UILabel *)cutdownLabel { - if (!_cutdownLabel) { - _cutdownLabel = [[UILabel alloc] init]; - _cutdownLabel.textAlignment = NSTextAlignmentRight; - _cutdownLabel.font = kFontRegular(15); - _cutdownLabel.textColor = UIColorFromRGB(0x9168FA); - _cutdownLabel.hidden = NO; - } - return _cutdownLabel; -} - -- (UIButton *)authCodeButton { - if (!_authCodeButton) { - _authCodeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _authCodeButton.titleLabel.font = kFontRegular(15); - [_authCodeButton setTitle:YMLocalizedString(@"LoginForgetEditView0") forState:UIControlStateNormal]; - _authCodeButton.titleLabel.numberOfLines = 0; - _authCodeButton.titleLabel.adjustsFontSizeToFitWidth = YES; - [_authCodeButton setTitleColor:[DJDKMIMOMColor inputTextColor] forState:UIControlStateNormal]; - } - return _authCodeButton; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 10; - } - return _stackView; -} - -@end diff --git a/YuMi/Modules/YMLogin/View/CustomView/LoginInputItemView.h b/YuMi/Modules/YMLogin/View/CustomView/LoginInputItemView.h deleted file mode 100644 index 3991c97..0000000 --- a/YuMi/Modules/YMLogin/View/CustomView/LoginInputItemView.h +++ /dev/null @@ -1,48 +0,0 @@ -// -// LoginInputItemView.h -// YuMi -// -// Created by P on 2025/3/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, LoginInputType) { - LoginInputType_id, - LoginInputType_email, - LoginInputType_phoneNum, - LoginInputType_password, - LoginInputType_createPassword, - LoginInputType_verificationCode, - LoginInputType_confirmPassword, - LoginInputType_forgetPassword, - LoginInputType_login, - LoginInputType_confirm, - LoginInputType_none -}; - - - -@interface LoginInputItemView : UIView - - -@property(nonatomic, copy) void(^handleItemAction)(LoginInputType inputType); -@property(nonatomic, copy) void(^handleFirstInputContentUpdate)(NSString *inputContent); -@property(nonatomic, copy) void(^handleSecondInputContentUpdate)(NSString *inputContent); -@property(nonatomic, copy) void(^handleThirdInputContentUpdate)(NSString *inputContent); - -- (instancetype)initWithType:(LoginInputType)type; -- (NSString *)inputContent; -- (void)updateAreaCode:(NSString *)code; -- (NSString *)loadAreaCode; -- (void)startVerificationCountDown; -- (void)endVerificationCountDown; -- (void)updateBGColor:(UIColor *)color; - -- (void)displayKeyboard; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/CustomView/LoginInputItemView.m b/YuMi/Modules/YMLogin/View/CustomView/LoginInputItemView.m deleted file mode 100644 index 3718225..0000000 --- a/YuMi/Modules/YMLogin/View/CustomView/LoginInputItemView.m +++ /dev/null @@ -1,386 +0,0 @@ -// -// LoginInputItemView.m -// YuMi -// -// Created by P on 2025/3/14. -// - -#import "LoginInputItemView.h" - -static NSString *const kAreaCodePrefix = @"+"; - -@interface LoginInputItemView() - -@property(nonatomic, copy) NSString *placeholderText; -@property(nonatomic, assign) LoginInputType inputType; -@property(nonatomic, strong) UITextField *inputTextField; -@property(nonatomic, strong) UIButton *rightActionButton; -@property(nonatomic, strong) UIButton *areaCodeButton; -@property(nonatomic, strong) UILabel *areaLabel; -@property(nonatomic, strong) UIButton *verificationCodeButton; -@property(nonatomic, assign) NSInteger verificationCountDown; -@property(nonatomic, strong) NSTimer *verificationTimer; - -@end - -@implementation LoginInputItemView - -- (void)deallo { - _verificationTimer = nil; -} - -- (instancetype)initWithType:(LoginInputType)type { - if (self = [super init]) { - self.backgroundColor = [UIColor whiteColor]; - [self setCornerRadius:23]; - [self addSubview:self.inputTextField]; - - self.inputType = type; - } - return self; -} - -- (void)setInputType:(LoginInputType)inputType { - _inputType = inputType; - switch (inputType) { - case LoginInputType_id: { - [self updatePlaceholder:YMLocalizedString(@"20.20.51_text_3")]; - self.inputTextField.keyboardType = UIKeyboardTypeNumberPad; - } - break; - case LoginInputType_email: { - [self updatePlaceholder:YMLocalizedString(@"20.20.51_text_4")]; - self.inputTextField.keyboardType = UIKeyboardTypeEmailAddress; - } - break; - case LoginInputType_phoneNum: { - [self updatePlaceholder:YMLocalizedString(@"XPMineResetLoginPwdViewController1")]; - self.inputTextField.keyboardType = UIKeyboardTypePhonePad; - } - break; - case LoginInputType_password: { - [self updatePlaceholder:YMLocalizedString(@"XPLoginPwdViewController3")]; - self.inputTextField.keyboardType = UIKeyboardTypeDefault; - self.inputTextField.secureTextEntry = YES; - } - break; - case LoginInputType_createPassword: - [self updatePlaceholder:YMLocalizedString(@"20.20.51_text_11")]; - self.inputTextField.keyboardType = UIKeyboardTypeDefault; - self.inputTextField.secureTextEntry = YES; - break; - case LoginInputType_verificationCode: { - [self updatePlaceholder:YMLocalizedString(@"20.20.51_text_7")]; - self.inputTextField.keyboardType = UIKeyboardTypeDefault; - } - break; - case LoginInputType_confirmPassword: { - [self updatePlaceholder:YMLocalizedString(@"20.20.51_text_11")]; - self.inputTextField.keyboardType = UIKeyboardTypeDefault; - } - break; - default: - break; - } - - [self updateInputLayout]; -} - -- (void)updatePlaceholder:(NSString *)placeholder { - self.inputTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{ - NSFontAttributeName: kFontRegular(14), - NSForegroundColorAttributeName: UIColorFromRGB(0xafb1b3) - }]; -} - -- (void)updateInputLayout { - switch (self.inputType) { - case LoginInputType_id: - case LoginInputType_email: - case LoginInputType_createPassword: - case LoginInputType_confirmPassword: - { - [self.inputTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self).insets(UIEdgeInsetsMake(12, 20, 12, 20)); - }]; - } - break; - case LoginInputType_password: { - [self insertRightActionButton]; - [self.inputTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(20); - make.bottom.top.mas_equalTo(self).inset(12); - make.trailing - .mas_equalTo(self.rightActionButton.mas_leading) - .offset(-20); - }]; - } - break; - case LoginInputType_phoneNum: { - [self insertAreaCodeButton]; - [self.inputTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.areaCodeButton.mas_trailing).offset(8); - make.bottom.top.mas_equalTo(self).inset(12); - make.trailing.mas_equalTo(self).offset(-12); - }]; - } - break; - case LoginInputType_verificationCode: { - [self insertVerificationCodeButton]; - [self.inputTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(20); - make.bottom.top.mas_equalTo(self).inset(12); - make.trailing - .mas_equalTo(self.verificationCodeButton.mas_leading) - .offset(-20); - }]; - } - break; - default: - break; - } -} - -- (void)insertAreaCodeButton { - [self addSubview:self.areaCodeButton]; - [self.areaCodeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(13); - make.height.mas_equalTo(20); - make.width.mas_equalTo(60); - }]; - - UIImageView *image = [[UIImageView alloc] initWithImage:kImage(@"login_page_area_arrow")]; - image.contentMode = UIViewContentModeScaleAspectFit; - [self.areaCodeButton addSubview:image]; - [self.areaCodeButton addSubview:self.areaLabel]; - [self.areaLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.areaCodeButton); - make.leading.mas_equalTo(self.areaCodeButton); - make.height.mas_equalTo(20); - }]; - [image mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.areaCodeButton); - make.leading.mas_equalTo(self.areaLabel.mas_trailing).offset(4); - make.size.mas_equalTo(CGSizeMake(10, 5)); - }]; - -} - -- (void)insertVerificationCodeButton { - [self addSubview:self.verificationCodeButton]; - [self.verificationCodeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.trailing.mas_equalTo(-23); - make.height.mas_equalTo(20); - if (isMSRTL()) { - make.width.mas_equalTo(80); - } else { - make.width.mas_equalTo(60); - } - }]; -} - -- (void)insertRightActionButton { - [self addSubview:self.rightActionButton]; - [self.rightActionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.trailing.mas_equalTo(-20); - make.height.mas_equalTo(24); - make.width.mas_equalTo(24); - }]; -} - -- (NSString *)inputContent { - return self.inputTextField.text; -} - -- (void)updateAreaCode:(NSString *)code { - self.areaLabel.text = [NSString stringWithFormat:@"%@%@", kAreaCodePrefix, code]; -// if (_areaCodeButton) { -// [self.areaCodeButton setTitle:[NSString stringWithFormat:@"%@%@", kAreaCodePrefix, code] -// forState:UIControlStateNormal]; -// } -} - -- (NSString *)loadAreaCode { - NSString *code = [self.areaLabel text]; - if ([code hasPrefix:kAreaCodePrefix]) { - [code stringByReplacingOccurrencesOfString:kAreaCodePrefix - withString:@""]; - } - return code; -} - -- (void)startVerificationCountDown { - self.verificationCountDown = 60; - @kWeakify(self); - self.verificationTimer = [NSTimer scheduledTimerWithTimeInterval:1 - repeats:YES - block:^(NSTimer * _Nonnull timer) { - @kStrongify(self); - [self updateVerificationCountDown]; - }]; -} - -- (void)endVerificationCountDown { - if (_verificationTimer) { - [self.verificationTimer invalidate]; - } - self.verificationCodeButton.enabled = YES; -} - -- (void)updateBGColor:(UIColor *)color { - self.backgroundColor = color; -} - -- (void)displayKeyboard { - [self.inputTextField becomeFirstResponder]; -} - -#pragma mark - -- (void)handleVerificationCountDown { - if (_handleItemAction) { - self.handleItemAction(self.inputType); - } -} - -- (void)updateVerificationCountDown { - [self.verificationCodeButton setTitle:[NSString stringWithFormat:YMLocalizedString(@"20.20.51_text_9"), @(self.verificationCountDown)] - forState:UIControlStateDisabled]; - self.verificationCodeButton.enabled = NO; - self.verificationCountDown -= 1; - if (self.verificationCountDown < 0) { - [self endVerificationCountDown]; - } -} - -#pragma mark - -- (void)didTapAreaButton { - if (_handleItemAction) { - self.handleItemAction(self.inputType); - } -} - -- (void)didTapVerificationButton { - if (_handleItemAction) { - self.handleItemAction(self.inputType); - } -} - -- (void)didTapRightActionButton { - self.rightActionButton.selected = !self.rightActionButton.isSelected; - self.inputTextField.secureTextEntry = !self.rightActionButton.selected; -} - -#pragma mark - UITextFieldDelegate -- (void)textFieldDidChange:(UITextField *)textField { -// NSLog(@"%@", textField.text); - switch (self.inputType) { - case LoginInputType_id: - case LoginInputType_email: - case LoginInputType_phoneNum: - if (self.handleFirstInputContentUpdate) { - self.handleFirstInputContentUpdate(textField.text); - } - break; - case LoginInputType_password: - case LoginInputType_verificationCode: - if (self.handleSecondInputContentUpdate) { - self.handleSecondInputContentUpdate(textField.text); - } - break; - case LoginInputType_confirmPassword: - if (self.handleThirdInputContentUpdate) { - self.handleThirdInputContentUpdate(textField.text); - } - break; - default: - break; - } -} -//- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { -// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ -// NSString *updatedText = [textField.text stringByReplacingCharactersInRange:range withString:string]; -// switch (self.inputType) { -// case LoginInputType_id: -// case LoginInputType_email: -// case LoginInputType_phoneNum: -// if (self.handleFirstInputContentUpdate) { -// self.handleFirstInputContentUpdate(updatedText); -// } -// break; -// case LoginInputType_password: -// case LoginInputType_verificationCode: -// if (self.handleSecondInputContentUpdate) { -// self.handleSecondInputContentUpdate(updatedText); -// } -// break; -// case LoginInputType_confirmPassword: -// if (self.handleThirdInputContentUpdate) { -// self.handleThirdInputContentUpdate(updatedText); -// } -// break; -// default: -// break; -// } -// }); -// return YES; -//} - -#pragma mark - -- (UITextField *)inputTextField { - if (!_inputTextField) { - _inputTextField = [[UITextField alloc] init]; - _inputTextField.font = kFontMedium(14); - _inputTextField.textColor = UIColorFromRGB(0x313131); -// _inputTextField.delegate = self; - [_inputTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; - } - return _inputTextField; -} - -- (UILabel *)areaLabel { - if (!_areaLabel) { - _areaLabel = [UILabel labelInitWithText:[NSString getCountryCode] font:kFontMedium(14) textColor:UIColorFromRGB(0x313131)]; - } - return _areaLabel; -} - -- (UIButton *)areaCodeButton { - if (!_areaCodeButton) { - _areaCodeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_areaCodeButton addTarget:self - action:@selector(didTapAreaButton) - forControlEvents:UIControlEventTouchUpInside]; - } - return _areaCodeButton; -} - -- (UIButton *)verificationCodeButton { - if (!_verificationCodeButton) { - _verificationCodeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_verificationCodeButton.titleLabel setFont:kFontMedium(14)]; - [_verificationCodeButton setTitle:YMLocalizedString(@"20.20.51_text_8") forState:UIControlStateNormal]; - [_verificationCodeButton setTitleColor:UIColorFromRGB(0xff8c03) forState:UIControlStateNormal]; - [_verificationCodeButton setTitleColor:UIColorFromRGB(0xafb1b3) forState:UIControlStateDisabled]; - [_verificationCodeButton addTarget:self - action:@selector(didTapVerificationButton) - forControlEvents:UIControlEventTouchUpInside]; - } - return _verificationCodeButton; -} - -- (UIButton *)rightActionButton { - if (!_rightActionButton) { - _rightActionButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_rightActionButton setBackgroundImage:kImage(@"login_page_kaigan") forState:UIControlStateNormal]; - [_rightActionButton setBackgroundImage:kImage(@"login_page_eye_close") forState:UIControlStateSelected]; - [_rightActionButton addTarget:self - action:@selector(didTapRightActionButton) - forControlEvents:UIControlEventTouchUpInside]; - } - return _rightActionButton; -} - -@end diff --git a/YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.h b/YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.h deleted file mode 100644 index ce9588a..0000000 --- a/YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// LoginVerifCodeView.h -// YUMI -// -// Created by YUMI on 2021/9/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface LoginVerifCodeView : UIView - -///输入的验证码 有几位 -@property (nonatomic,assign) int number; -///输入的字符串的 -@property (nonatomic,copy) void(^textFieldChangeBlock)(NSString *); -///是否密文输入 -@property (nonatomic, assign) BOOL shouldBeSecurity; -///类型 -@property (nonatomic,assign) int type;//1.转赠钻石 -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.m b/YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.m deleted file mode 100644 index 8d509ea..0000000 --- a/YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.m +++ /dev/null @@ -1,195 +0,0 @@ -// -// LoginVerifCodeView.m -// YUMI -// -// Created by YUMI on 2021/9/8. -// - -#import "LoginVerifCodeView.h" -///第三方 -#import -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface LoginVerifCodeView () -///输入框的占位符 -@property (nonatomic,strong) MSBaseTextField *textField; -///显示label的数组 -@property (nonatomic,strong) NSMutableArray *labelArray; -@end - -@implementation LoginVerifCodeView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - [self initEvents]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.textField]; -} - -- (void)initSubViewConstraints { - [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; -} - -- (void)initEvents { - @weakify(self); - [[self.textField rac_signalForControlEvents:UIControlEventEditingChanged] subscribeNext:^(__kindof UITextField *textField) { - @strongify(self); - [self updateLablesWithText:textField]; - }]; -} - -- (void)updateLablesWithText:(UITextField *)textField { - if (textField.text.length > self.labelArray.count) { - textField.text = [textField.text substringToIndex:self.labelArray.count]; - } - if (textField.text.length >= self.number) { - [textField resignFirstResponder]; - if (_textFieldChangeBlock) { - _textFieldChangeBlock(textField.text); - } - } - - if (self.type == 1) { - @kWeakify(self); - [self.labelArray enumerateObjectsUsingBlock:^(UILabel *obj, NSUInteger idx, BOOL *stop) { - @kStrongify(self); - [self normalStyle:obj]; - }]; - } - NSInteger index = -1; - for (UILabel *pwLab in self.labelArray) { - if (pwLab.tag < (100 + textField.text.length)) { - if (self.shouldBeSecurity) { - pwLab.text = @"●"; - index += 1; - } else { - NSRange range = NSMakeRange(pwLab.tag-100, 1); - pwLab.text = [textField.text substringWithRange:range]; - } - }else{ - pwLab.text = @""; - } - } - - if (self.type == 1) { - UILabel *label = [self.labelArray xpSafeObjectAtIndex:index]; - if (label) { - [self lastInputStyle:label]; - } - } -} - -- (void)configLabelArray { - CGFloat itemWidth = 45; - CGFloat itemHeight = 45; - CGFloat itemSpace = 11; - for (int i = 0; i < _number; i++) { - UILabel * label = [[UILabel alloc] init]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - label.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; - label.textAlignment = NSTextAlignmentCenter; - label.backgroundColor = UIColorFromRGB(0xf4f4f4); - [label setCornerRadius:10]; - label.tag = 100 + i; - [self addSubview:label]; - [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(itemWidth, itemHeight)); - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self).offset((itemWidth + itemSpace)* i); - }]; - [self.labelArray addObject:label]; - } - - UILabel * label = [self.labelArray lastObject]; - if (label) { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(label.mas_trailing); - make.height.mas_equalTo(itemHeight); - }]; - } -} - -- (void)configLabelArrayOfGiveDiamond { - CGFloat itemWidth = kGetScaleWidth(50); - CGFloat itemHeight = kGetScaleWidth(50); - CGFloat itemSpace = kGetScaleWidth(9); - for (int i = 0; i < _number; i++) { - UILabel * label = [[UILabel alloc] init]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - label.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; - label.textAlignment = NSTextAlignmentCenter; - label.backgroundColor = UIColorFromRGB(0xF0F5F6); - label.layer.masksToBounds = YES; - label.layer.cornerRadius = kGetScaleWidth(4); - label.tag = 100 + i; - [self addSubview:label]; - [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(itemWidth, itemHeight)); - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self).offset((itemWidth + itemSpace)* i); - }]; - [self.labelArray addObject:label]; - } -} - -- (void)normalStyle:(UILabel *)label { - label.backgroundColor = UIColorFromRGB(0xF0F5F6); - [label setCornerRadius:10 - corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner - borderWidth:1 - borderColor:UIColorFromRGB(0xF0F5F6)]; -} - -- (void)lastInputStyle:(UILabel *)label { - label.backgroundColor = UIColorFromRGB(0xFFF6EB); - [label setCornerRadius:10 - corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner - borderWidth:1 - borderColor:UIColorFromRGB(0xFF8C03)]; -} - -#pragma mark - Getters And Setters -- (void)setNumber:(int)number { - _number = number; - if(self.type == 1 && _number > 0){ - [self configLabelArrayOfGiveDiamond]; - return; - } - - if (_number > 0) { - [self configLabelArray]; - } -} - -- (MSBaseTextField *)textField { - if (!_textField) { - _textField = [[MSBaseTextField alloc] init]; - _textField.tintColor = [UIColor clearColor]; - _textField.textColor = [UIColor clearColor]; - _textField.keyboardType = UIKeyboardTypeNumberPad; - [_textField becomeFirstResponder]; - } - return _textField; -} - -- (NSMutableArray *)labelArray { - if (!_labelArray) { - _labelArray = [NSMutableArray array]; - } - return _labelArray; -} - -@end diff --git a/YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.h b/YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.h deleted file mode 100644 index 7005cd2..0000000 --- a/YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// UserPrivacyView.h -// YUMI -// -// Created by YUMI on 2021/11/1. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface UserPrivacyView : UIView -/// -@property (nonatomic,strong) UIViewController * controller; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.m b/YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.m deleted file mode 100644 index dc3b626..0000000 --- a/YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.m +++ /dev/null @@ -1,210 +0,0 @@ -// -// UserPrivacyView.m -// YUMI -// -// Created by YUMI on 2021/11/1. -// - -#import "UserPrivacyView.h" -///Third -#import - -///Tool -#import "YUMIConstant.h" -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "YUMIHtmlUrl.h" -#import "TTPopup.h" -#import "UIImage+Utils.h" -///VC -#import "XPWebViewController.h" - -NSString * const kYouMiNumberCountKey = @"kYouMinumbernnagna"; -@interface UserPrivacyView () -///title -@property (nonatomic, strong) UILabel *titleLabel; -///内容 -@property (nonatomic, strong) YYTextView *contentLabel; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///确认 -@property (nonatomic, strong) UIButton *confirmButton; -///退出 -@property (nonatomic, strong) UIButton *exitButton; -@end - -@implementation UserPrivacyView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Response -- (void)onAgreementButtonClick:(UIButton *)sender { - if (sender == self.confirmButton) { - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - [defaults setObject:@"isShow" forKey:kYouMiNumberCountKey]; - [defaults synchronize]; - [TTPopup dismiss]; - } -} - -- (void)exitButtonClick:(UIButton *)sender { - [self exitApplication]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - self.layer.masksToBounds = YES; - self.layer.cornerRadius = 10; - [self addSubview:self.titleLabel]; - [self addSubview:self.contentLabel]; - [self addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.exitButton]; - [self.stackView addArrangedSubview:self.confirmButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth - 38 * 2); - make.height.mas_equalTo(424); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(18); - make.centerX.mas_equalTo(self); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(55); - make.leading.mas_equalTo(28); - make.trailing.mas_equalTo(-28); - make.bottom.mas_equalTo(-68); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-20); - make.leading.trailing.mas_equalTo(self).inset(15); - make.height.mas_equalTo(36); - }]; -} - - -///退出app -- (void)exitApplication { - [TTPopup dismiss]; - [UIView beginAnimations:@"exitApplication" context:nil]; - [UIView setAnimationDuration:0.5]; - [UIView setAnimationDelegate:self]; - [UIView setAnimationTransition:UIViewAnimationTransitionCurlUp forView:self cache:NO]; - [UIView setAnimationDidStopSelector:@selector(animationFinished:finished:context:)]; - [UIView commitAnimations]; -} -- (void)animationFinished:(NSString *)animationID finished:(NSNumber *)finished context:(void *)context { - if ([animationID compare:@"exitApplication"] == 0) { - exit(0); - } -} - -#pragma mark - getters and setters - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:16.f weight:UIFontWeightMedium]; - _titleLabel.textColor = [DJDKMIMOMColor alertTitleColor]; - _titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"UserPrivacyView0"), AppName]; - } - return _titleLabel; -} - -- (YYTextView *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[YYTextView alloc]init]; - _contentLabel.editable = NO; - _contentLabel.showsVerticalScrollIndicator = NO; - _contentLabel.showsHorizontalScrollIndicator = NO; - - NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new]; - paragraphStyle.lineSpacing = 4; - NSString * agreement = [NSString stringWithFormat:YMLocalizedString(@"UserPrivacyView1"), AppName]; - NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc] init]; - NSAttributedString *att1 = [[NSAttributedString alloc] initWithString:agreement attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14], NSForegroundColorAttributeName : [DJDKMIMOMColor textThirdColor], NSParagraphStyleAttributeName : paragraphStyle, NSKernAttributeName : @(1.0)}]; - - NSMutableAttributedString *att2 = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"UserPrivacyView2") attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14 weight:UIFontWeightMedium], NSForegroundColorAttributeName : [DJDKMIMOMColor textThirdColor], NSParagraphStyleAttributeName : paragraphStyle, NSKernAttributeName : @(1.0)}]; - @kWeakify(self); - [att2 yy_setTextHighlightRange:NSMakeRange(8, 6) color:[DJDKMIMOMColor appMainColor] backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - @kStrongify(self); - [TTPopup dismiss]; - XPWebViewController *web = [[XPWebViewController alloc] initWithRoomUID:nil]; - web.url = URLWithType(kPrivacyURL); - [self.controller.navigationController pushViewController:web animated:YES]; - }]; - - [att2 yy_setTextHighlightRange:NSMakeRange(15, 6) color:[DJDKMIMOMColor appMainColor] backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - @kStrongify(self); - [TTPopup dismiss]; - XPWebViewController *web = [[XPWebViewController alloc] initWithRoomUID:nil]; - web.url = URLWithType(kUserProtocalURL); - [self.controller.navigationController pushViewController:web animated:YES]; - }]; - - [attStr appendAttributedString:att1]; - [attStr appendAttributedString:att2]; - - _contentLabel.attributedText = attStr; - } - return _contentLabel; -} - -- (UIButton *)confirmButton { - if (!_confirmButton) { - _confirmButton = [[UIButton alloc]init]; - [_confirmButton setTitle:YMLocalizedString(@"UserPrivacyView3") forState:UIControlStateNormal]; - _confirmButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_confirmButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; - [_confirmButton setBackgroundImage:image forState:UIControlStateNormal]; - _confirmButton.layer.cornerRadius = 18; - _confirmButton.layer.masksToBounds = YES; - [_confirmButton addTarget:self action:@selector(onAgreementButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _confirmButton; -} - -- (UIButton *)exitButton { - if (!_exitButton) { - _exitButton = [[UIButton alloc]init]; - [_exitButton setTitle:YMLocalizedString(@"UserPrivacyView4") forState:UIControlStateNormal]; - _exitButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_exitButton setTitleColor:[DJDKMIMOMColor cancelButtonTextColor] forState:UIControlStateNormal]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor],[DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; - [_exitButton setBackgroundImage:image forState:UIControlStateNormal]; - _exitButton.layer.cornerRadius = 18; - _exitButton.layer.masksToBounds = YES; - [_exitButton addTarget:self action:@selector(exitButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _exitButton; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFillEqually; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 20; - } - return _stackView; -} - - - -@end diff --git a/YuMi/Modules/YMLogin/View/CustomView/XPLoginBindSuccessView.h b/YuMi/Modules/YMLogin/View/CustomView/XPLoginBindSuccessView.h deleted file mode 100644 index 3f84cf1..0000000 --- a/YuMi/Modules/YMLogin/View/CustomView/XPLoginBindSuccessView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMLoginBindSuccessView.h -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -typedef void(^XPBindViewDismissHandler)(void); -@interface XPLoginBindSuccessView : UIView -@property (nonatomic, copy) XPBindViewDismissHandler dismissHandler; -+ (void)showBindSuccessViewWithHandler:(XPBindViewDismissHandler)handler; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/CustomView/XPLoginBindSuccessView.m b/YuMi/Modules/YMLogin/View/CustomView/XPLoginBindSuccessView.m deleted file mode 100644 index c3807f0..0000000 --- a/YuMi/Modules/YMLogin/View/CustomView/XPLoginBindSuccessView.m +++ /dev/null @@ -1,126 +0,0 @@ -// -// YMLoginBindSuccessView.m -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "XPLoginBindSuccessView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "TTPopup.h" - -@interface XPLoginBindSuccessView () - -@property (nonatomic, strong) UIImageView *successImageView; -@property (nonatomic, strong) UILabel *textLabel; -@property (nonatomic, strong) UIButton *closeBtn; - -@end - -@implementation XPLoginBindSuccessView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self baseUI]; - [self initViews]; - [self initConstraints]; - } - return self; -} - -- (void)layoutSubviews { - [super layoutSubviews]; - -} - -#pragma mark - -#pragma mark lifeCycle -- (void)baseUI { - self.layer.cornerRadius = 8.f; - self.layer.masksToBounds = YES; - self.backgroundColor = [UIColor whiteColor]; -} -- (void)initViews { - [self addSubview:self.successImageView]; - [self addSubview:self.textLabel]; - [self addSubview:self.closeBtn]; -} - -- (void)initConstraints { - [self.successImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(18); - make.centerX.mas_equalTo(0); - make.size.mas_equalTo(CGSizeMake(76, 76)); - }]; - - [self.textLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(0); - make.top.mas_equalTo(self.successImageView.mas_bottom).offset(7); - }]; - - [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(0); - make.top.mas_equalTo(self.textLabel.mas_bottom).offset(22); - make.height.mas_equalTo(38); - make.width.mas_equalTo(124); - }]; -} - -#pragma mark private methods -+ (void)showBindSuccessViewWithHandler:(XPBindViewDismissHandler)handler { - XPLoginBindSuccessView *bindSuccessView = [[XPLoginBindSuccessView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth - 64, 195)]; - bindSuccessView.dismissHandler = handler; - [TTPopup popupView:bindSuccessView style:TTPopupStyleAlert]; -} - -#pragma mark - -#pragma mark button click events -- (void)closeBtnClickAction:(UIButton *)btn { - [TTPopup dismiss]; - !_dismissHandler ? : _dismissHandler(); -} - -#pragma mark - -#pragma mark getter & setter -- (UIImageView *)successImageView -{ - if (!_successImageView) { - _successImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"login_bind_phone_success"]]; - } - return _successImageView; -} - -- (UILabel *)textLabel -{ - if (!_textLabel) { - _textLabel = [[UILabel alloc] init]; - _textLabel.text = YMLocalizedString(@"XPLoginBindSuccessView0"); - _textLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _textLabel.font = [UIFont fontWithName:@"PingFangSC-Regular" size:17]; - _textLabel.adjustsFontSizeToFitWidth = YES; - _textLabel.textAlignment = NSTextAlignmentCenter; - } - return _textLabel; -} - -- (UIButton *)closeBtn { - if (!_closeBtn) { - _closeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeBtn setTitle:YMLocalizedString(@"XPLoginBindSuccessView1") forState:UIControlStateNormal]; - [_closeBtn setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - [_closeBtn setBackgroundColor:[DJDKMIMOMColor appBackgroundColor]]; - [_closeBtn.titleLabel setFont:[UIFont systemFontOfSize:15.f]]; - _closeBtn.layer.masksToBounds = YES; - _closeBtn.layer.cornerRadius = 19; - [_closeBtn addTarget:self action:@selector(closeBtnClickAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeBtn; -} - -@end diff --git a/YuMi/Modules/YMLogin/View/FeedBackViewController.h b/YuMi/Modules/YMLogin/View/FeedBackViewController.h deleted file mode 100644 index f97c2b3..0000000 --- a/YuMi/Modules/YMLogin/View/FeedBackViewController.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// FeedBackViewController.h -// YuMi -// -// Created by P on 2024/7/2. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface FeedBackViewController : MvpViewController - -@property (nonatomic, strong) UIScrollView *scrollView; -@property (nonatomic, strong) UIView *scrollContentView; - -@property (nonatomic, strong) UIButton *closeKeyboardButton; - -@property (nonatomic, strong) UILabel *title_1; -@property (nonatomic, strong) UILabel *title_2; -@property (nonatomic, strong) UILabel *title_3; -@property (nonatomic, strong) UILabel *title_4; - -@property (nonatomic, strong) UICollectionViewFlowLayout *typeCollectionLayout; -@property (nonatomic, strong) UICollectionView *typeCollectionView; - -@property (nonatomic, strong) UITextView *feedbackTextView; -@property (nonatomic, strong) UILabel *feedbackPlaceholderLabel; -@property (nonatomic, strong) UILabel *feedbackCharCountLabel; -@property (nonatomic, strong) UILabel *feedbackCharLimitLabel; - -@property (nonatomic, strong) UIButton *uploadImageButton; -@property (nonatomic, strong) UIImageView *uploadImageView; - -@property (nonatomic, strong) UITextField *contactTextField; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/FeedBackViewController.m b/YuMi/Modules/YMLogin/View/FeedBackViewController.m deleted file mode 100644 index 8f46946..0000000 --- a/YuMi/Modules/YMLogin/View/FeedBackViewController.m +++ /dev/null @@ -1,939 +0,0 @@ -// -// FeedBackViewController.m -// YuMi -// -// Created by P on 2024/7/2. -// - -#import "FeedBackViewController.h" -#import "LoginPresenter.h" -#import "UploadFile.h" - -#import "FeedBackConfigModel.h" - -@interface FeedBackContactPopUpCell : UICollectionViewCell -@property (nonatomic, strong) UILabel *content; -@property (nonatomic, strong) UIImageView *icon; -//@ -@end - -@implementation FeedBackContactPopUpCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - _content = [UILabel labelInitWithText:@"" - font:[UIFont systemFontOfSize:16 weight:UIFontWeightBold] - textColor:UIColorFromRGB(0x333333)]; - - _icon = [[UIImageView alloc] initWithImage:kImage(@"user_card_copy_id1")]; - [self.contentView addSubview:_content]; - [self.contentView addSubview:_icon]; - [_content mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(0); - }]; - [_icon mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(12); - make.centerY.mas_equalTo(self.content); - make.leading.mas_equalTo(self.content.mas_trailing).offset(2); - }]; - } - return self; -} - -@end - -@interface FeedBackContactPopUp : UIView - -@property (nonatomic, copy) NSArray *contactArray; - -@property (nonatomic, strong) UICollectionView *collectionView; - -@end - -@implementation FeedBackContactPopUp - -+ (CGFloat)popUpHeight:(NSDictionary *)dataSource { - return 32 + 75 + 14 * dataSource.count + 18 * dataSource.count; -} - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self setup]; - } - return self; -} - -- (void)setup { - self.backgroundColor = [UIColor whiteColor]; - self.layer.cornerRadius = 15.5; - self.clipsToBounds = YES; - self.layer.masksToBounds = YES; - - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - b.layer.cornerRadius = 19; - b.layer.masksToBounds = YES; - [b setTitle:YMLocalizedString(@"XPRoomViewController16") forState:UIControlStateNormal]; - [b setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x57e193),UIColorFromRGB(0x14d2a6)] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(120, 38)] - forState:UIControlStateNormal]; - [b addTarget:self action:@selector(didTapButton) forControlEvents:UIControlEventTouchUpInside]; - [self addSubview:b]; - [b mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self).offset(-16); - make.height.mas_equalTo(38); - }]; - - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionVertical; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.scrollEnabled = NO; - _collectionView.delegate = self; - _collectionView.dataSource = self; - [_collectionView registerClass:[FeedBackContactPopUpCell class] forCellWithReuseIdentifier:@"cell"]; - [self addSubview:_collectionView]; - [_collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self).insets(UIEdgeInsetsMake(32, 0, 75, 0)); - }]; -} - -- (void)setContactDic:(NSDictionary *)contactDic { - NSMutableArray *tempArr = @[].mutableCopy; - [contactDic enumerateKeysAndObjectsUsingBlock:^(id _Nonnull key, id _Nonnull obj, BOOL * _Nonnull stop) { - [tempArr addObject:@[key, obj]]; - }]; - _contactArray = tempArr; - - [self.collectionView reloadData]; -} - -- (void)didTapButton { - [TTPopup dismiss]; -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.contactArray.count; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView - layout:(UICollectionViewLayout *)collectionViewLayout - sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - CGFloat padding = 24.0; - CGFloat totalPadding = padding * 2; // 左右两边的间距 + 中间两个间距 - CGFloat availableWidth = collectionView.frame.size.width - totalPadding; - NSArray *subArray = [self.contactArray xpSafeObjectAtIndex:indexPath.row]; - return CGSizeMake(availableWidth, subArray.count > 1 ? 14 : 0); -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { - return 18.0; -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { - return 18.0; -} - -// 返回 cell -- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - FeedBackContactPopUpCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cell" forIndexPath:indexPath]; - - NSArray *subArray = [self.contactArray xpSafeObjectAtIndex:indexPath.row]; - if (subArray.count > 1) { - cell.content.text = [NSString stringWithFormat:@"%@: %@", [subArray firstObject], [subArray lastObject]]; - } - - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - NSArray *subArray = [self.contactArray xpSafeObjectAtIndex:indexPath.row]; - if (subArray.count > 1) { - UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; - [pasteboard setString:[subArray lastObject]]; - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPShareView0")]; - } -} - -@end - -@interface TypeCollectionCell : UICollectionViewCell - -@property (nonatomic, strong) UILabel *titleLabel; - -@end - -@implementation TypeCollectionCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - self.contentView.userInteractionEnabled = YES; - self.contentView.layer.cornerRadius = 15.5; - self.contentView.layer.masksToBounds = YES; - self.contentView.backgroundColor = UIColorFromRGB(0xf3f5fa); - - _titleLabel = [UILabel labelInitWithText:@"" - font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x22252c)]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.userInteractionEnabled = NO; - _titleLabel.numberOfLines = 1; - [self.contentView addSubview:_titleLabel]; - [_titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - } - return self; -} - -- (void)setSelected:(BOOL)selected { - if (selected) { - self.contentView.backgroundColor = UIColorFromRGB(0x85f6d3); - } else { - self.contentView.backgroundColor = UIColorFromRGB(0xf3f5fa); - } -} - -@end - -@interface FeedBackViewController () - -@property (nonatomic, strong) UIButton *submitButton; -@property (nonatomic, strong) UIView *fakeTopBar; -@property (nonatomic, copy) NSString *uploadPhotoURLString; -@property (nonatomic, strong) UIImage *selectedImage; -@property (nonatomic, strong) FeedBackConfigModel *configModel; -@property (nonatomic, strong) FeedBackTypeModel *selectTypeModel; - -@end - -@implementation FeedBackViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - [self setup]; - [self customLayout]; - [self loadFeedbackConfig]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - - [self addNavigationItemWithImageNames:@[@"login_custom_servise"] - isLeft:NO - target:self - action:@selector(rightButtonTapped) tags:nil]; -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; -} - -- (LoginPresenter *)createPresenter { - return [[LoginPresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)setup { - self.title = YMLocalizedString(@"XPMineFeedbackViewController0"); - self.view.backgroundColor = [UIColor whiteColor]; - - [self setupFakeTopBar]; - [self setupSubviews]; - - [self.closeKeyboardButton setTitle:@"" forState:UIControlStateNormal]; - - self.title_1.textColor = [UIColor blackColor]; - self.title_2.textColor = [UIColor blackColor]; - self.title_3.textColor = [UIColor blackColor]; - self.title_4.textColor = [UIColor blackColor]; - - self.title_3.text = YMLocalizedString(@"FeedBackViewController2"); - - NSAttributedString *redMark = [[NSAttributedString alloc] initWithString:@"* " - attributes:@{NSForegroundColorAttributeName: UIColorFromRGB(0xeb5c2c), - NSFontAttributeName: [UIFont systemFontOfSize:16 weight:UIFontWeightBold]}]; - NSDictionary *defaultAttributes = @{NSForegroundColorAttributeName: UIColorFromRGB(0x000000), - NSFontAttributeName: [UIFont systemFontOfSize:16 weight:UIFontWeightBold]}; - NSMutableAttributedString *attributedTitle_1 = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"FeedBackViewController0") attributes:defaultAttributes]; - [attributedTitle_1 insertAttributedString:redMark atIndex:0]; - NSMutableAttributedString *attributedTitle_2 = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"FeedBackViewController1") attributes:defaultAttributes]; - [attributedTitle_2 insertAttributedString:redMark atIndex:0]; - NSMutableAttributedString *attributedTitle_4 = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"FeedBackViewController3") attributes:defaultAttributes]; - [attributedTitle_4 insertAttributedString:redMark atIndex:0]; - - self.title_1.attributedText = attributedTitle_1; - self.title_2.attributedText = attributedTitle_2; - self.title_4.attributedText = attributedTitle_4; - - self.feedbackPlaceholderLabel.text = YMLocalizedString(@"FeedBackViewController4"); - self.feedbackCharCountLabel.text = @"0"; - if (isMSRTL()) { - self.feedbackCharCountLabel.textAlignment = NSTextAlignmentRight; - self.feedbackCharLimitLabel.textAlignment = NSTextAlignmentRight; - self.feedbackCharLimitLabel.text = @"300/"; - self.typeCollectionView.semanticContentAttribute = UISemanticContentAttributeForceRightToLeft; - } else { - self.feedbackCharCountLabel.textAlignment = NSTextAlignmentLeft; - self.feedbackCharLimitLabel.textAlignment = NSTextAlignmentLeft; - self.feedbackCharLimitLabel.text = @"/300"; - } - - - - UIColor *placeholderColor = UIColorFromRGB(0xacb0b7); - self.contactTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"FeedBackViewController5") - attributes:@{NSForegroundColorAttributeName: placeholderColor}]; - - self.submitButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [self.submitButton addTarget:self action:@selector(didTapSubmitButton:) forControlEvents:UIControlEventTouchUpInside]; - [self.view addSubview:self.submitButton]; - [self.submitButton setTitle:YMLocalizedString(@"LoginForgetPasswordViewController6") forState:UIControlStateNormal]; - [self.submitButton setTitle:YMLocalizedString(@"LoginForgetPasswordViewController6") forState:UIControlStateDisabled]; - [self.submitButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - - UIImage *nextImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x57e193), UIColorFromRGB(0x14D2a6)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth-36*2, 48)]; - UIImage *disableImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xa5eec8), UIColorFromRGB(0xabf5e3)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth-36*2, 48)]; - - [self.submitButton setBackgroundImage:nextImage forState:UIControlStateNormal]; - [self.submitButton setBackgroundImage:disableImage forState:UIControlStateDisabled]; - self.submitButton.layer.cornerRadius = 48/2; - self.submitButton.layer.masksToBounds = YES; - self.submitButton.enabled = NO; -} - -- (void)setupSubviews { - // 添加主要的视图层次结构 - [self.view addSubview:self.scrollView]; - [self.scrollView addSubview:self.scrollContentView]; - [self.scrollContentView addSubview:self.closeKeyboardButton]; - - // 添加标题标签 - [self.scrollContentView addSubview:self.title_1]; - [self.scrollContentView addSubview:self.title_2]; - [self.scrollContentView addSubview:self.title_3]; - [self.scrollContentView addSubview:self.title_4]; - - // 添加类型选择集合视图 - [self.scrollContentView addSubview:self.typeCollectionView]; - - // 添加反馈文本视图和相关标签 - [self.scrollContentView addSubview:self.feedbackTextView]; - [self.scrollContentView addSubview:self.feedbackPlaceholderLabel]; - [self.scrollContentView addSubview:self.feedbackCharCountLabel]; - [self.scrollContentView addSubview:self.feedbackCharLimitLabel]; - - // 添加上传图片相关视图 - [self.scrollContentView addSubview:self.uploadImageButton]; - [self.scrollContentView addSubview:self.uploadImageView]; - - // 添加联系方式输入框 - [self.scrollContentView addSubview:self.contactTextField]; -} - -- (void)setupFakeTopBar { - UIView *fakeTopBar = [[UIView alloc] init]; - fakeTopBar.backgroundColor = UIColorFromRGB(0xebecf3); - [self.view addSubview:fakeTopBar]; - _fakeTopBar = fakeTopBar; - CGFloat navigationBarHeight = self.navigationController.navigationBar.frame.size.height + [UIApplication sharedApplication].keyWindow.safeAreaInsets.top; - [fakeTopBar mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.view.mas_top); - make.leading.trailing.equalTo(self.view); - make.height.mas_equalTo(navigationBarHeight); - }]; - - UILabel *title = [UILabel labelInitWithText:YMLocalizedString(@"XPMineFeedbackViewController0") - font:[UIFont systemFontOfSize:17 weight:UIFontWeightMedium] - textColor:UIColorFromRGB(0x010101)]; - [fakeTopBar addSubview:title]; - [title mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-16); - make.centerX.mas_equalTo(0); - }]; - - UIButton *back = [UIButton buttonWithType:UIButtonTypeCustom]; - [back enlargeTouchArea:UIEdgeInsetsMake(10, 10, 10, 10)]; - [back.imageView setContentMode:UIViewContentModeScaleAspectFill]; - [back setImage:kImage(@"room_info_back") forState:UIControlStateNormal]; - [back addTarget:self - action:@selector(didTapBackButton) - forControlEvents:UIControlEventTouchUpInside]; - if (isMSRTL()) { - back.imageView.transform = CGAffineTransformMakeScale(-1.0, 1.0); - } - [fakeTopBar addSubview:back]; - [back mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(title); - make.width.height.mas_equalTo(15); - make.leading.mas_equalTo(16); - }]; - - UIButton *cs = [UIButton buttonWithType:UIButtonTypeCustom]; - [cs enlargeTouchArea:UIEdgeInsetsMake(10, 10, 10, 10)]; - [cs setImage:kImage(@"login_custom_servise") forState:UIControlStateNormal]; - [cs addTarget:self - action:@selector(rightButtonTapped) - forControlEvents:UIControlEventTouchUpInside]; - - [fakeTopBar addSubview:cs]; - [cs mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(title); - make.width.height.mas_equalTo(18); - make.trailing.mas_equalTo(fakeTopBar).offset(-16); - }]; -} - -- (void)customLayout { - [self.submitButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.view).offset(-40); - make.leading.mas_equalTo(36); - make.trailing.mas_equalTo(-36); - make.height.mas_equalTo(48); - }]; - - [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.fakeTopBar.mas_bottom).offset(0); - make.leading.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.submitButton.mas_top).offset(-8); - }]; - - [self.scrollContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.scrollView); - }]; - - [self.title_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.scrollContentView).offset(30); - make.leading.mas_equalTo(self.scrollContentView).offset(16); - }]; - - [self.typeCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.title_1.mas_bottom).offset(18); - make.leading.mas_equalTo(self.scrollContentView).offset(16); - make.trailing.mas_equalTo(self.scrollContentView).offset(-16); - make.height.mas_greaterThanOrEqualTo(31); - make.width.mas_equalTo(KScreenWidth - 32); - }]; - - [self.closeKeyboardButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.typeCollectionView.mas_bottom); - make.bottom.leading.trailing.mas_equalTo(self.scrollContentView); - }]; - - [self.title_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.typeCollectionView.mas_bottom).offset(31); - make.leading.mas_equalTo(self.scrollContentView).offset(16); - }]; - - [self.feedbackTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.title_2.mas_bottom).offset(18); - make.leading.mas_equalTo(self.scrollContentView).offset(16); - make.trailing.mas_equalTo(self.scrollContentView).offset(-16); - make.height.mas_equalTo(150); - }]; - - [self.feedbackPlaceholderLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.feedbackTextView).offset(8); - make.leading.mas_equalTo(self.feedbackTextView).offset(12); - }]; - - [self.feedbackCharLimitLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.feedbackTextView).offset(-8); - make.width.mas_equalTo(40); - make.trailing.mas_equalTo(self.feedbackTextView).offset(-4); - }]; - - [self.feedbackCharCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.feedbackTextView).offset(-8); - make.trailing.mas_equalTo(self.feedbackCharLimitLabel.mas_leading).offset(0); - }]; - - [self.title_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.feedbackTextView.mas_bottom).offset(31); - make.leading.mas_equalTo(self.scrollContentView).offset(16); - }]; - - [self.uploadImageButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.title_3.mas_bottom).offset(18); - make.width.height.mas_equalTo(76); - make.leading.mas_equalTo(self.scrollContentView).offset(16); - }]; - - [self.uploadImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.uploadImageButton); - }]; - - [self.title_4 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.uploadImageButton.mas_bottom).offset(31); - make.leading.mas_equalTo(self.scrollContentView).offset(16); - }]; - - [self.contactTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.scrollContentView).offset(16); - make.trailing.mas_equalTo(self.scrollContentView).offset(-16); - make.top.mas_equalTo(self.title_4.mas_bottom).offset(17.5); - make.bottom.mas_equalTo(self.scrollContentView).offset (-30); - make.height.mas_equalTo(43.5); - }]; -} - -- (void)updateSubmitButtonStatus { - if (self.selectTypeModel == nil) { - self.submitButton.enabled = NO; - } else if(self.feedbackTextView.text.length == 0) { - self.submitButton.enabled = NO; - } else if(self.contactTextField.text.length == 0) { - self.submitButton.enabled = NO; - } else { - self.submitButton.enabled = YES; - } -} - -- (void)showPhotoSelectionSheet { - @kWeakify(self); - TTActionSheetConfig *cameraConfig = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineUserInfoEditViewController1") clickAction:^{ - [YYUtility checkCameraAvailable:^{ - @kStrongify(self); - UIImagePickerController *imagePicker = [[UIImagePickerController alloc] init]; - imagePicker.delegate = self; - imagePicker.sourceType = UIImagePickerControllerSourceTypeCamera; - imagePicker.allowsEditing = NO; - [self presentViewController:imagePicker animated:YES completion:NULL]; - } denied:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"XPMineUserInfoEditViewController2") content:YMLocalizedString(@"XPMineUserInfoEditViewController3")]; - } restriction:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"XPMineUserInfoEditViewController4") content:YMLocalizedString(@"XPMineUserInfoEditViewController5")]; - }]; - }]; - - TTActionSheetConfig *photoLibrayConfig = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineUserInfoEditViewController6") clickAction:^{ - [YYUtility checkAssetsLibrayAvailable:^{ - @kStrongify(self); - UIImagePickerController *imagePicker = [[UIImagePickerController alloc] init]; - imagePicker.modalPresentationCapturesStatusBarAppearance = YES; - imagePicker.delegate = self; - imagePicker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; - imagePicker.allowsEditing = NO; - [self presentViewController:imagePicker animated:YES completion:NULL]; - } denied:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"XPMineUserInfoEditViewController7") content:YMLocalizedString(@"XPMineUserInfoEditViewController8")]; - } restriction:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"XPMineUserInfoEditViewController9") content:YMLocalizedString(@"XPMineUserInfoEditViewController10")]; - }]; - }]; - - [TTPopup actionSheetWithItems:@[cameraConfig, photoLibrayConfig]]; -} - -- (void)showNotPhoto:(NSString *)title content:(NSString *)content { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = title; - config.message = content; - - [TTPopup alertWithConfig:config confirmHandler:^{ - NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - if ([[UIApplication sharedApplication] canOpenURL:url]) { - [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) { - - }]; - } - } cancelHandler:^{ - }]; -} - -#pragma mark - UX Actions -- (void)didTapBackButton { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)didTapUploadImageButton:(id)sender { - [self showPhotoSelectionSheet]; -} - -- (void)didTapSubmitButton:(id)sender { - [self uploadAvatar]; -} - -- (void)didTapCloseKeyboardButton:(id)sender { - [self.view endEditing:YES]; -} - -- (void)rightButtonTapped { - FeedBackContactPopUp *popUp = [[FeedBackContactPopUp alloc] initWithFrame:CGRectMake(0, - 0, - 290, - [FeedBackContactPopUp popUpHeight:self.configModel.customContactMap])]; - [popUp setContactDic:self.configModel.customContactMap]; - [TTPopup popupView:popUp style:TTPopupStyleAlert]; -} - -#pragma mark - API -- (void)loadFeedbackConfig { - [self showLoading]; - @kWeakify(self); - [self.presenter loadFeedbackConfig:^(FeedBackConfigModel * _Nonnull model) { - @kStrongify(self); - [self hideHUD]; - self.configModel = model; - [self.typeCollectionView reloadData]; - [self updateCollectionViewHeight]; - } failure:^(NSString * _Nonnull errorMessage) { - @kStrongify(self); - [self hideHUD]; - if (errorMessage.length > 0) { - [TTPopup alertWithMessage:errorMessage confirmHandler:^{ - } cancelHandler:^{ - }]; - } - }]; -} - -- (void)uploadAvatar { - [self showLoading]; - if (self.selectedImage) { - @kWeakify(self); - NSData *data = UIImageJPEGRepresentation(self.selectedImage, 0.5); - NSString *format = [UIImage getImageTypeWithImageData:data]; - NSString *name = [NSString stringWithFormat:@"image/%@.%@",[NSString createUUID],format]; - [[UploadFile share]QCloudUploadImage:data named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) { - @kStrongify(self); - self.uploadPhotoURLString = key; - [self submitFeedBack]; - } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) { - @kStrongify(self); - [self showErrorToast:message]; - }]; - } else { - [self submitFeedBack]; - } -} - -- (void)submitFeedBack { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - @kWeakify(self); - [self.presenter submitFeedback:^{ - @kStrongify(self); - [self showSuccessToast:YMLocalizedString(@"FeedBackViewController6")]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.navigationController popViewControllerAnimated:YES]; - }); - } failure:^(NSString * _Nonnull errorMessage) { - @kStrongify(self); - [self showErrorToast:errorMessage]; - } - type:self.selectTypeModel.type - desc:self.feedbackTextView.text - photoURLString:self.uploadPhotoURLString - contact:self.contactTextField.text]; - }); -} - -- (void)contactDidChange:(UITextField *)sender { - [self updateSubmitButtonStatus]; -} - -#pragma mark - UICollectionView Delegate & DataSource -- (void)updateCollectionViewHeight { - [self.typeCollectionView layoutIfNeeded]; - CGSize contentSize = self.typeCollectionView.collectionViewLayout.collectionViewContentSize; - [self.typeCollectionView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_greaterThanOrEqualTo(contentSize.height); - }]; -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.configModel.typeEnumList.count; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView - layout:(UICollectionViewLayout*)collectionViewLayout - sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - - FeedBackTypeModel *model = [self.configModel.typeEnumList xpSafeObjectAtIndex:indexPath.row]; - UILabel *label = [UILabel labelInitWithText:model.desc - font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x22252c)];; - CGSize maxSize = CGSizeMake(CGFLOAT_MAX, 31); - CGSize requiredSize = [label sizeThatFits:maxSize]; - - return CGSizeMake(MAX(90, requiredSize.width + 20), 31); -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { - return 14.0; -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { - return 14.0; -} - -// 返回 cell -- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - TypeCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cell" forIndexPath:indexPath]; - cell.contentView.layer.cornerRadius = 15.5; - cell.contentView.layer.masksToBounds = YES; - - FeedBackTypeModel *model = [self.configModel.typeEnumList xpSafeObjectAtIndex:indexPath.row]; - if (model) { - cell.titleLabel.text = model.desc; - } - return cell; -} - -// 处理 cell 的选中状态 -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - TypeCollectionCell *cell = (TypeCollectionCell *)[collectionView cellForItemAtIndexPath:indexPath]; - [cell setSelected:YES]; - - // 取消其他 cell 的选中状态 - for (NSIndexPath *visibleIndexPath in [collectionView indexPathsForVisibleItems]) { - if (![visibleIndexPath isEqual:indexPath]) { - [collectionView deselectItemAtIndexPath:visibleIndexPath animated:NO]; - TypeCollectionCell *otherCell = (TypeCollectionCell *)[collectionView cellForItemAtIndexPath:visibleIndexPath]; - [otherCell setSelected:NO]; - } - } - - FeedBackTypeModel *model = [self.configModel.typeEnumList xpSafeObjectAtIndex:indexPath.row]; - if (model) { - self.selectTypeModel = model; - [self updateSubmitButtonStatus]; - } -} - -// 处理 cell 的取消选中状态 -- (void)collectionView:(UICollectionView *)collectionView didDeselectItemAtIndexPath:(NSIndexPath *)indexPath { - TypeCollectionCell *cell = (TypeCollectionCell *)[collectionView cellForItemAtIndexPath:indexPath]; - [cell setSelected:NO]; -} - -#pragma mark - UIImagePickerControllerDelegate -- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info -{ - UIImage *selectedPhoto = [info objectForKey:UIImagePickerControllerOriginalImage]; - if (selectedPhoto) { - if (picker.sourceType == UIImagePickerControllerSourceTypeCamera) { - UIImageWriteToSavedPhotosAlbum(selectedPhoto, nil, nil, nil); - } - self.selectedImage = selectedPhoto; - self.uploadImageView.hidden = NO; - self.uploadImageView.image = selectedPhoto; -// [self.uploadImageButton setBackgroundImage:selectedPhoto forState:UIControlStateNormal]; -// [self.uploadImageButton setImage:selectedPhoto forState:UIControlStateNormal]; - } - [picker dismissViewControllerAnimated:YES - completion:^{}]; -} - -- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker{ - [picker dismissViewControllerAnimated:YES - completion:^{}]; -} - -#pragma mark - UITextViewDelegate -- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text { - - NSString *newText = [textView.text stringByReplacingCharactersInRange:range withString:text]; - - self.feedbackCharCountLabel.text = [NSString stringWithFormat:@"%ld", (unsigned long)newText.length]; - - self.feedbackPlaceholderLabel.hidden = newText.length > 0; - self.feedbackCharCountLabel.textColor = newText.length > 0 ? - UIColorFromRGB(0x3fddac) : UIColorFromRGB(0xa7acb3); - - [self updateSubmitButtonStatus]; - - if (newText.length >= 300) { - NSString *truncatedText = [newText substringToIndex:300]; - self.feedbackCharCountLabel.text = [NSString stringWithFormat:@"%ld", (unsigned long)truncatedText.length]; - self.feedbackPlaceholderLabel.hidden = truncatedText.length > 0; - self.feedbackCharCountLabel.textColor = truncatedText.length > 0 ? UIColorFromRGB(0x3fddac) : UIColorFromRGB(0xa7acb3); - textView.text = truncatedText; - return NO; - } - - return YES; -} - -#pragma mark - Lazy Loading - -- (UIScrollView *)scrollView { - if (!_scrollView) { - _scrollView = [[UIScrollView alloc] init]; - _scrollView.backgroundColor = [UIColor clearColor]; - _scrollView.showsVerticalScrollIndicator = NO; - _scrollView.showsHorizontalScrollIndicator = NO; - } - return _scrollView; -} - -- (UIView *)scrollContentView { - if (!_scrollContentView) { - _scrollContentView = [[UIView alloc] init]; - _scrollContentView.backgroundColor = [UIColor clearColor]; - } - return _scrollContentView; -} - -- (UIButton *)closeKeyboardButton { - if (!_closeKeyboardButton) { - _closeKeyboardButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _closeKeyboardButton.backgroundColor = [UIColor clearColor]; - [_closeKeyboardButton addTarget:self action:@selector(didTapCloseKeyboardButton:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeKeyboardButton; -} - -- (UILabel *)title_1 { - if (!_title_1) { - _title_1 = [UILabel labelInitWithText:@"" - font:[UIFont systemFontOfSize:16 weight:UIFontWeightBold] - textColor:[UIColor blackColor]]; - } - return _title_1; -} - -- (UILabel *)title_2 { - if (!_title_2) { - _title_2 = [UILabel labelInitWithText:@"" - font:[UIFont systemFontOfSize:16 weight:UIFontWeightBold] - textColor:[UIColor blackColor]]; - } - return _title_2; -} - -- (UILabel *)title_3 { - if (!_title_3) { - _title_3 = [UILabel labelInitWithText:@"" - font:[UIFont systemFontOfSize:16 weight:UIFontWeightBold] - textColor:[UIColor blackColor]]; - } - return _title_3; -} - -- (UILabel *)title_4 { - if (!_title_4) { - _title_4 = [UILabel labelInitWithText:@"" - font:[UIFont systemFontOfSize:16 weight:UIFontWeightBold] - textColor:[UIColor blackColor]]; - } - return _title_4; -} - -- (UICollectionViewFlowLayout *)typeCollectionLayout { - if (!_typeCollectionLayout) { - _typeCollectionLayout = [[UICollectionViewFlowLayout alloc] init]; - _typeCollectionLayout.scrollDirection = UICollectionViewScrollDirectionVertical; - } - return _typeCollectionLayout; -} - -- (UICollectionView *)typeCollectionView { - if (!_typeCollectionView) { - _typeCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:self.typeCollectionLayout]; - _typeCollectionView.backgroundColor = [UIColor clearColor]; - _typeCollectionView.delegate = self; - _typeCollectionView.dataSource = self; - _typeCollectionView.allowsSelection = YES; - [_typeCollectionView registerClass:[TypeCollectionCell class] forCellWithReuseIdentifier:@"cell"]; - } - return _typeCollectionView; -} - -- (UITextView *)feedbackTextView { - if (!_feedbackTextView) { - _feedbackTextView = [[UITextView alloc] init]; - _feedbackTextView.backgroundColor = UIColorFromRGB(0xf3f5fa); - _feedbackTextView.layer.cornerRadius = 8; - _feedbackTextView.layer.masksToBounds = YES; - _feedbackTextView.font = [UIFont systemFontOfSize:14]; - _feedbackTextView.textColor = UIColorFromRGB(0x333333); - _feedbackTextView.delegate = self; - _feedbackTextView.textContainerInset = UIEdgeInsetsMake(8, 8, 20, 8); - } - return _feedbackTextView; -} - -- (UILabel *)feedbackPlaceholderLabel { - if (!_feedbackPlaceholderLabel) { - _feedbackPlaceholderLabel = [UILabel labelInitWithText:@"" - font:[UIFont systemFontOfSize:14] - textColor:UIColorFromRGB(0xacb0b7)]; - _feedbackPlaceholderLabel.numberOfLines = 0; - } - return _feedbackPlaceholderLabel; -} - -- (UILabel *)feedbackCharCountLabel { - if (!_feedbackCharCountLabel) { - _feedbackCharCountLabel = [UILabel labelInitWithText:@"0" - font:[UIFont systemFontOfSize:12] - textColor:UIColorFromRGB(0xa7acb3)]; - } - return _feedbackCharCountLabel; -} - -- (UILabel *)feedbackCharLimitLabel { - if (!_feedbackCharLimitLabel) { - _feedbackCharLimitLabel = [UILabel labelInitWithText:@"/300" - font:[UIFont systemFontOfSize:12] - textColor:UIColorFromRGB(0xa7acb3)]; - } - return _feedbackCharLimitLabel; -} - -- (UIButton *)uploadImageButton { - if (!_uploadImageButton) { - _uploadImageButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _uploadImageButton.backgroundColor = UIColorFromRGB(0xf3f5fa); - _uploadImageButton.layer.cornerRadius = 8; - _uploadImageButton.layer.masksToBounds = YES; - [_uploadImageButton setImage:kImage(@"feedback_upload_image") forState:UIControlStateNormal]; - [_uploadImageButton addTarget:self action:@selector(didTapUploadImageButton:) forControlEvents:UIControlEventTouchUpInside]; - } - return _uploadImageButton; -} - -- (UIImageView *)uploadImageView { - if (!_uploadImageView) { - _uploadImageView = [[UIImageView alloc] init]; - _uploadImageView.contentMode = UIViewContentModeScaleAspectFill; - _uploadImageView.layer.cornerRadius = 8; - _uploadImageView.layer.masksToBounds = YES; - _uploadImageView.hidden = YES; - } - return _uploadImageView; -} - -- (UITextField *)contactTextField { - if (!_contactTextField) { - _contactTextField = [[UITextField alloc] init]; - _contactTextField.backgroundColor = UIColorFromRGB(0xf3f5fa); - _contactTextField.layer.cornerRadius = 8; - _contactTextField.layer.masksToBounds = YES; - _contactTextField.font = [UIFont systemFontOfSize:14]; - _contactTextField.textColor = UIColorFromRGB(0x333333); - _contactTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 16, 0)]; - _contactTextField.leftViewMode = UITextFieldViewModeAlways; - _contactTextField.rightView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 16, 0)]; - _contactTextField.rightViewMode = UITextFieldViewModeAlways; - [_contactTextField addTarget:self action:@selector(contactDidChange:) forControlEvents:UIControlEventEditingChanged]; - } - return _contactTextField; -} -@end diff --git a/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.h b/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.h deleted file mode 100644 index 63f9cfd..0000000 --- a/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// LoginBindPhoneViewController.h -// YUMI -// -// Created by YUMI on 2021/9/14. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface LoginBindPhoneViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m b/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m deleted file mode 100644 index 193c32e..0000000 --- a/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m +++ /dev/null @@ -1,223 +0,0 @@ -// -// LoginBindPhoneViewController.m -// YUMI -// -// Created by YUMI on 2021/9/14. -// - -#import "LoginBindPhoneViewController.h" -///Third -#import -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "NSString+Utils.h" -#import "UIButton+EnlargeTouchArea.h" -///Tool -#import "LoginBindPhonePresent.h" -///VC -#import "LoginVerifCodeViewController.h" - -@interface LoginBindPhoneViewController () -///提示Label -@property (nonatomic, strong) UILabel *titleLabel; -/// 手机号输入框背景 -@property (nonatomic, strong) UIView *bgView; -///86 Label -@property (nonatomic, strong) UILabel *countryLabel; -///手机号输入框 -@property (nonatomic, strong) MSBaseTextField *phoneTextField; -///登录按钮 -@property (nonatomic, strong) UIButton *loginBtn; -///返回按钮 如果点击了返回按钮的话 那就退出登录 -@property (nonatomic,strong) UIButton *backButton; -@end - -@implementation LoginBindPhoneViewController -- (BOOL)isHiddenNavBar { - return YES; -} -#pragma mark - life cycle -- (LoginBindPhonePresent *)createPresenter { - return [[LoginBindPhonePresent alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self setUpUI]; - [self setEvents]; -} - -- (void)viewDidAppear:(BOOL)animated { - [self showErrorToast:YMLocalizedString(@"LoginBindPhoneViewController0")]; -} - -- (void)setUpUI { - [self.view addSubview:self.titleLabel]; - [self.view addSubview:self.bgView];//输入框 - [self.bgView addSubview:self.countryLabel]; - [self.bgView addSubview:self.phoneTextField]; - [self.view addSubview:self.loginBtn]; //登录按钮 - [self.view addSubview:self.backButton]; -} - -- (void)viewDidLayoutSubviews { - [super viewDidLayoutSubviews]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.view).offset(150); - }]; - //输入框 - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(50); - make.width.mas_equalTo(280); - make.height.mas_equalTo(45); - }]; - [self.countryLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(10); - make.top.mas_equalTo(self.bgView).offset(5); - make.width.mas_equalTo(60); - make.height.mas_equalTo(35); - }]; - [self.phoneTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(70); - make.top.mas_equalTo(self.bgView).offset(5); - make.width.mas_equalTo(200); - make.height.mas_equalTo(35); - }]; - //登录按钮 - [self.loginBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.bgView.mas_bottom).offset(50); - make.width.mas_equalTo(60); - make.height.mas_equalTo(60); - }]; - - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - make.leading.mas_equalTo(self.view).offset(14); - make.top.mas_equalTo(self.view).offset(36 + kSafeAreaTopHeight); - }]; -} - -- (void)setEvents { - @weakify(self) - // 登录 - [[RACSignal combineLatest:@[self.phoneTextField.rac_textSignal] - reduce:^id(NSString *phone){ - BOOL enable = phone.length > 0; - return @(enable); - }] subscribeNext:^(NSNumber *enable) { - @strongify(self) - self.loginBtn.enabled = [enable boolValue]; - }]; - - - [[[[self.loginBtn rac_signalForControlEvents:UIControlEventTouchUpInside] doNext:^(id x) { - @strongify(self) - self.loginBtn.enabled = NO; - }] flattenMap:^id (id value) { - return [RACSignal createSignal:^RACDisposable *(id subscriber) { - if (!self.phoneTextField.text.isPhoneNumber) { - [self showErrorToast:YMLocalizedString(@"LoginBindPhoneViewController1")]; - [subscriber sendNext:@(NO)]; - }else { - [subscriber sendNext:@(YES)]; - } - [subscriber sendCompleted]; - return nil; - }]; - }] subscribeNext:^(NSNumber *signedIn) { - @strongify(self) - self.loginBtn.enabled = YES; - BOOL success = [signedIn boolValue]; - if (success) { - //跳转去验证码页面 - LoginVerifCodeViewController *codeVC = [[LoginVerifCodeViewController alloc] init]; - codeVC.phone = self.phoneTextField.text; - codeVC.type = VerifCodeType_BindPhone; - [self.navigationController pushViewController:codeVC animated:YES]; - } - }]; -} - -#pragma mark - Event Response -- (void)backButtonAction:(UIButton *)sender { - ///退出登录状态 - [self dismissViewControllerAnimated:NO completion:^{ - [self.presenter logout]; - }]; -} - -#pragma mark - Getters And Setters -- (UILabel *)titleLabel{ - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; - _titleLabel.text = YMLocalizedString(@"LoginBindPhoneViewController2"); - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UIView *)bgView { - if (!_bgView) { - _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _bgView.layer.cornerRadius = 45/2; - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} - -- (UILabel *)countryLabel{ - if (!_countryLabel) { - _countryLabel = [[UILabel alloc] init]; - _countryLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:15]; - NSString *code = [NSString getCountryCode]; - _countryLabel.text = code; - _countryLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _countryLabel.backgroundColor = [UIColor clearColor]; - _countryLabel.textAlignment = NSTextAlignmentCenter; - } - return _countryLabel; -} - -- (MSBaseTextField *)phoneTextField { - if (!_phoneTextField) { - _phoneTextField = [[MSBaseTextField alloc] init]; - _phoneTextField.keyboardType = UIKeyboardTypeNumberPad; - _phoneTextField.backgroundColor = [UIColor clearColor]; - _phoneTextField.textColor = [DJDKMIMOMColor mainTextColor]; - _phoneTextField.tintColor = [DJDKMIMOMColor appMainColor]; - _phoneTextField.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:15]; - _phoneTextField.textAlignment = NSTextAlignmentLeft; - } - return _phoneTextField; -} - -- (UIButton *)loginBtn { - if (!_loginBtn) { - _loginBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - _loginBtn.enabled = NO; - [_loginBtn setImage:[UIImage imageNamed:@"login_button"] forState:UIControlStateDisabled]; - [_loginBtn setImage:[UIImage imageNamed:@"login_button_sel"] forState:UIControlStateNormal]; - } - return _loginBtn; -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateSelected]; - [_backButton setEnlargeEdgeWithTop:15 right:15 bottom:15 left:15]; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -@end diff --git a/YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.h b/YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.h deleted file mode 100644 index 54819b7..0000000 --- a/YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// LoginForgetPasswordViewController.h -// xplan-ios -// -// Created by 冯硕 on 2021/9/10. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface LoginForgetPasswordViewController : MvpViewController -@property (nonatomic,copy) NSString *pi_phoneAreaCode; -@property (nonatomic,assign) BOOL isLogout; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.m b/YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.m deleted file mode 100644 index a664468..0000000 --- a/YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.m +++ /dev/null @@ -1,238 +0,0 @@ -// -// LoginForgetPasswordViewController.m -// xplan-ios -// -// Created by 冯硕 on 2021/9/10. -// - -#import "LoginForgetPasswordViewController.h" -///第三方 -#import -#import -///Tool -#import "CountDownHelper.h" - -#import "UIImage+Utils.h" -///Presenter -#import "LoginForgetPasswordPresent.h" -#import "LoginForgetPasswordProtocol.h" -///View -#import "LoginForgetEditView.h" -#import "XPLoginAraeViewController.h" - - -@interface LoginForgetPasswordViewController () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///手机号 -@property (nonatomic,strong) LoginForgetEditView *phoneView; -///验证码 -@property (nonatomic,strong) LoginForgetEditView *codeView; -///密码 -@property (nonatomic,strong) LoginForgetEditView *passwordView; -///完成 -@property (nonatomic,strong) UIButton *finishButton; - -@end - -@implementation LoginForgetPasswordViewController - -- (void)dealloc { - [[CountDownHelper shareHelper] stopCountDown]; -} - -- (LoginForgetPasswordPresent *)createPresenter { - return [[LoginForgetPasswordPresent alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - NSString *code = [NSString getCountryCode]; - self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initEvents]; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:NO]; -} - -- (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; - [[CountDownHelper shareHelper] stopCountDown]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"LoginForgetPasswordViewController0"); - self.view.backgroundColor = [UIColor whiteColor]; - [CountDownHelper shareHelper].delegate = self; - [self.view addSubview:self.stackView]; - [self.view addSubview:self.finishButton]; - - [self.stackView addArrangedSubview:self.phoneView]; - [self.stackView addArrangedSubview:self.codeView]; - [self.stackView addArrangedSubview:self.passwordView]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.view).mas_offset(kGetScaleWidth(30)); - make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(15)); - }]; - - [self.finishButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(kGetScaleWidth(15)); - make.height.mas_equalTo(45); - make.top.mas_equalTo(self.stackView.mas_bottom).offset(kGetScaleWidth(51)); - }]; - - [self.phoneView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(48)); - }]; - - [self.codeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(self.phoneView); - }]; - - [self.passwordView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(self.phoneView); - }]; -} - -- (void)initEvents { - @weakify(self); - RAC(self.finishButton, enabled) = [RACSignal combineLatest:@[self.phoneView.textField.rac_textSignal, self.codeView.textField.rac_textSignal, self.passwordView.textField.rac_textSignal] reduce:^id _Nonnull(NSString *phone, NSString *code, NSString *password){ - return @(phone.length > 0 && code.length > 0 && password.length >= 6 && password.length <= 16); - }]; -} -#pragma mark - XPChooseAreaCodeVCDelegate --(void)chooseAreaCodeSuccess:(NSString *)code{ - self.pi_phoneAreaCode = code; - self.phoneView.areaCode = [NSString stringWithFormat:@"+%@",code]; -} -#pragma mark - LoginForgetPasswordProtocol -///请求手机号的验证码成功 -- (void)phoneSmsCodeSuccess { - [self hideHUD]; - self.codeView.authCodeButton.enabled= NO; - [self showSuccessToast:YMLocalizedString(@"LoginForgetPasswordViewController1")]; - [[CountDownHelper shareHelper] openCountdownWithTime:60]; -} -///重置密码成功 -- (void)resetPasswrodSuccess { - [[CountDownHelper shareHelper] stopCountDown]; - [self showSuccessToast:YMLocalizedString(@"LoginForgetPasswordViewController2")]; - if(self.isLogout == YES){ - dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)); - dispatch_after(popTime, dispatch_get_main_queue(), ^(void){ - [self.presenter logout]; - }); - - }else{ - [self.navigationController popViewControllerAnimated:YES]; - } - -} - #pragma mark - CountDownHelperDelegate -///倒计时进行中 -- (void)onCountdownOpen:(int)time { - [self.codeView.authCodeButton setTitle:[NSString stringWithFormat:YMLocalizedString(@"LoginForgetPasswordViewController3"), time] forState:UIControlStateDisabled]; -} -///倒计时结束 -- (void)onCountdownFinish { - self.codeView.authCodeButton.enabled= YES; - [self.codeView.authCodeButton setTitle:YMLocalizedString(@"LoginForgetPasswordViewController4") forState:UIControlStateNormal]; -} -#pragma mark - Event Response -- (void)finishButtonAction:(UIButton *)sender { - [self.view endEditing:YES]; - [self.presenter resetPassword:[NSString stringWithFormat:@"%@%@",self.pi_phoneAreaCode,self.phoneView.textField.text] newPwd:self.passwordView.textField.text smsCode:self.codeView.textField.text phoneAreaCode:self.pi_phoneAreaCode]; -} - -- (void)authCodeButtonAction:(UIButton *)sender { - if(self.phoneView.textField.text.length == 0){ - [self showErrorToast:YMLocalizedString(@"LoginForgetPasswordViewController7")]; - return; - } - [self.view endEditing:YES]; - [self showLoading]; - [self.presenter phoneSmsCode:[NSString stringWithFormat:@"%@%@",self.pi_phoneAreaCode,self.phoneView.textField.text] type:GetSmsType_Reset_Password phoneAreaCode:self.pi_phoneAreaCode]; - -} --(void)chooseAreaCodeAction{ - XPLoginAraeViewController *codeVC = [XPLoginAraeViewController new]; - codeVC.delegate = self; - [self.navigationController pushViewController:codeVC animated:YES]; -} --(void)hidePasswordAction{ - self.passwordView.rightButton.selected = !self.passwordView.rightButton.selected; - self.passwordView.textField.secureTextEntry = !self.passwordView.rightButton.selected; -} -#pragma mark - Getters And Setters -- (UIButton *)finishButton{ - if (!_finishButton) { - _finishButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _finishButton.layer.masksToBounds = YES; - _finishButton.layer.cornerRadius = kGetScaleWidth(24); - [_finishButton setTitle:YMLocalizedString(@"LoginForgetPasswordViewController6") forState:UIControlStateNormal]; - _finishButton.titleLabel.font = kFontRegular(16); - [_finishButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - _finishButton.enabled = NO; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(345), kGetScaleWidth(46))]; - [_finishButton setBackgroundImage:image forState:UIControlStateNormal]; - [_finishButton addTarget:self action:@selector(finishButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _finishButton; -} - - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = kGetScaleWidth(25); - } - return _stackView; -} - -- (LoginForgetEditView *)phoneView { - if (!_phoneView) { - _phoneView = [[LoginForgetEditView alloc] init]; -// _phoneView.placeholder = YMLocalizedString(@"LoginForgetPasswordViewController7"); - _phoneView.textField.keyboardType = UIKeyboardTypeNumberPad; - _phoneView.type = LoginForgetEditViewTypeNormal; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(chooseAreaCodeAction)]; - [_phoneView.codeView addGestureRecognizer:tap]; - } - return _phoneView; -} - -- (LoginForgetEditView *)codeView { - if (!_codeView) { - _codeView = [[LoginForgetEditView alloc] init]; - _codeView.placeholder = YMLocalizedString(@"LoginForgetPasswordViewController8"); - _codeView.type = LoginForgetEditViewTypeSms; - _codeView.textField.keyboardType = UIKeyboardTypeNumberPad; - [_codeView.authCodeButton addTarget:self action:@selector(authCodeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _codeView; -} - -- (LoginForgetEditView *)passwordView { - if (!_passwordView) { - _passwordView = [[LoginForgetEditView alloc] init]; - _passwordView.textField.secureTextEntry = YES; - _passwordView.placeholder = YMLocalizedString(@"LoginForgetPasswordViewController9"); - _passwordView.type = LoginForgetEditViewTypePassword; - _passwordView.textField.keyboardType = UIKeyboardTypeASCIICapable; - _passwordView.textField.clearButtonMode = UITextFieldViewModeAlways; - [_passwordView.rightButton addTarget:self action:@selector(hidePasswordAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _passwordView; -} - -@end diff --git a/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.h b/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.h deleted file mode 100644 index e5c0d05..0000000 --- a/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// LoginFullInfoViewController.h -// YUMI -// -// Created by YUMI on 2021/9/14. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface LoginFullInfoViewController : MvpViewController -@property(nonatomic,copy) NSString *inviteCode; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m b/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m deleted file mode 100644 index 28a4a25..0000000 --- a/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m +++ /dev/null @@ -1,650 +0,0 @@ -// -// LoginFullInfoViewController.m -// YUMI -// -// Created by YUMI on 2021/9/14. -// - -#import "LoginFullInfoViewController.h" -///Third -#import -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "UIButton+EnlargeTouchArea.h" -#import "AccountInfoStorage.h" -#import "TTPopup.h" -#import "PIUserSexView.h" -///Model -#import "ThirdUserInfo.h" -///P -#import "LoginFullInfoPresenter.h" -#import "LoginFullInfoProtocol.h" -#import "PILoginManager.h" -#import "ClientConfig.h" -#import "PublicRoomManager.h" - -#import "RegionListViewController.h" - -#import "RegionListInfo.h" - -@interface LoginFullInfoViewController () - -///背景 -@property(nonatomic,strong) UIImageView *bgImageView; -///背景 -@property(nonatomic,strong) UIView *bgView; -///完善资料 -@property (nonatomic,strong) UILabel *titleLabel; -///性别后期无法修改 -@property (nonatomic,strong) UILabel *remindLabel; -///昵称的背景 -@property (nonatomic,strong) UIView * backView; - -///显示昵称 -@property (nonatomic,strong) UILabel *nameLabel; -///输入框 -@property (nonatomic,strong) MSBaseTextField *textField; -///更新 -@property (nonatomic,strong) UIButton *refreshButton; -///x性别的容器 -@property (nonatomic,strong) UIStackView *sexStackView; -///男用户 -@property (nonatomic,strong) PIUserSexView *maleView; -///女用户 -@property (nonatomic,strong) PIUserSexView*femaleView; -///下一步 -@property (nonatomic,strong) UIButton *nextButton; - -@property(nonatomic, strong) UILabel *block18Tips; - -///邀请码的容器 -@property (nonatomic,strong) UIView *codeContainView; -///邀请码输入框 -@property (nonatomic,strong) MSBaseTextField *codeTextField; - -@property (nonatomic,strong) UIView *regionContainView; -@property(nonatomic, strong) UILabel *regionLabel; -@property(nonatomic, strong) NetImageView *regionFlagImageView; - - -///第三方的用户信息 -@property (nonatomic,strong) ThirdUserInfo *thirdInfo; -///目前选择的性别 -@property (nonatomic,copy) NSString *sexString; - -@property(nonatomic, copy) NSArray *regionInfoList; -@property(nonatomic, strong) RegionListInfo *selectedRegion; - -@end - -@implementation LoginFullInfoViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (LoginFullInfoPresenter *)createPresenter { - return [[LoginFullInfoPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initEvents]; - [self loadAllRegions]; - ClientConfig *config = [ClientConfig shareConfig]; - if (config.inviteCode.length > 0){ - self.inviteCode = config.inviteCode; - config.inviteCode = @""; - } - - // 防止進入後還有 loading - [XNDJTDDLoadingTool hideHUD]; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -- (void)loadAllRegions { - @kWeakify(self); - [self.presenter loadAllRegionInfo:^(NSArray * _Nonnull array) { - @kStrongify(self); - self.regionInfoList = array; - for (RegionListInfo *info in array) { - if (info.checked) { - [self updateRegion:info]; - break; - } - } - } failure:^(NSError * _Nonnull error) { - - }]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - [self.view addSubview:self.bgImageView]; - [self.view addSubview:self.titleLabel]; - [self.view addSubview:self.bgView]; - - [self.bgView addSubview:self.remindLabel]; - [self.bgView addSubview:self.sexStackView]; - - [self.bgView addSubview:self.backView]; - - [self.view addSubview:self.codeContainView]; - [self.view addSubview:self.regionContainView]; - [self.view addSubview:self.nextButton]; - [self.view addSubview:self.block18Tips]; - - [self.backView addSubview:self.textField]; - [self.backView addSubview:self.refreshButton]; - [self.backView addSubview:self.nameLabel]; - - [self.sexStackView addArrangedSubview:self.maleView]; - [self.sexStackView addArrangedSubview:self.femaleView]; - - [self.codeContainView addSubview:self.codeTextField]; - - UIStackView *regionStack = [[UIStackView alloc] initWithArrangedSubviews:@[ - self.regionFlagImageView, - self.regionLabel - ]]; - regionStack.spacing = 4; - [self.regionContainView addSubview:regionStack]; - [regionStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(24)); - make.centerY.mas_equalTo(self.regionContainView); - }]; - - [self.regionFlagImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(0, 18)); - }]; - - if ([self.presenter getThirdUserInfo] && [self.presenter getThirdUserInfo].userName.length > 0) { - self.textField.text = [self.presenter getThirdUserInfo].userName; - } else { - [self.presenter randomRequestNick]; - } -} - -- (void)initSubViewConstraints { - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(140)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - if (iPhoneXSeries) { - make.top.mas_equalTo(kGetScaleWidth(128)); - } else { - make.top.mas_equalTo(kGetScaleWidth(68)); - } - make.leading.mas_equalTo(kGetScaleWidth(24)); - make.height.mas_equalTo(kGetScaleWidth(40)); - }]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.view); - if (iPhoneXSeries) { - make.top.mas_equalTo(kGetScaleWidth(192)); - } else { - make.top.mas_equalTo(kGetScaleWidth(132)); - } - }]; - [self.remindLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(10)); - make.top.mas_equalTo(kGetScaleWidth(48)); - }]; - - [self.sexStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(38)); - make.trailing.mas_equalTo(-kGetScaleWidth(38)); - make.top.mas_equalTo(kGetScaleWidth(86)); - }]; - - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(303)); - make.height.mas_equalTo(kGetScaleWidth(52)); - make.centerX.equalTo(self.bgView); - make.top.mas_equalTo(self.sexStackView.mas_bottom).offset(kGetScaleWidth(28)); - }]; - - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(18)); - make.centerY.equalTo(self.backView); - }]; - - [self.refreshButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(18)); - make.centerY.equalTo(self.backView); - make.trailing.equalTo(self.nameLabel.mas_leading).mas_offset(-kGetScaleWidth(4)); - }]; - [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(24)); - make.top.bottom.equalTo(self.backView); - make.trailing.equalTo(self.refreshButton.mas_leading).mas_offset(-kGetScaleWidth(4)); - }]; - [self.maleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(132)); - make.height.mas_equalTo(kGetScaleWidth(108)); - }]; - [self.femaleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(132)); - make.height.mas_equalTo(kGetScaleWidth(108)); - }]; - - [self.codeContainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.height.mas_equalTo(self.backView); - make.top.mas_equalTo(self.backView.mas_bottom).offset(kGetScaleWidth(20)); - }]; - - [self.codeTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.codeContainView).offset(kGetScaleWidth(24)); - make.top.bottom.mas_equalTo(self.codeContainView); - make.trailing.mas_equalTo(self.codeContainView).offset(-kGetScaleWidth(18)); - }]; - - [self.regionContainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.height.mas_equalTo(self.backView); - make.top.mas_equalTo(self.codeContainView.mas_bottom).offset(kGetScaleWidth(20)); - }]; - - [self.nextButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(303)); - make.centerX.equalTo(self.bgView); - make.height.mas_equalTo(kGetScaleWidth(48)); - make.top.mas_equalTo(self.regionContainView.mas_bottom).offset(kGetScaleWidth(38)); - }]; - - [self.block18Tips mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.nextButton); - make.top.mas_equalTo(self.nextButton.mas_bottom).offset(8); - }]; -} - -- (void)initEvents { - @weakify(self); - [[self.textField.rac_textSignal map:^id _Nullable(NSString * _Nullable value) { - if (value.length > 15) { - value = [value substringToIndex:15]; - } - return value; - }] subscribeNext:^(id _Nullable x) { - @strongify(self); - self.textField.text = x; - [self updateNextButton]; - }]; - -} -- (void)setInviteCode:(NSString *)inviteCode{ - _inviteCode = inviteCode; - self.codeTextField.text = _inviteCode; -} - -- (void)didTapRegionButton { - __block RegionListViewController *vc; - if (self.regionInfoList.count == 0) { - @kWeakify(self); - [self.presenter loadAllRegionInfo:^(NSArray * _Nonnull array) { - @kStrongify(self); - self.regionInfoList = array; - vc = [[RegionListViewController alloc] initForRegionList:array]; - [self presentViewController:vc animated:YES completion:nil]; - @kWeakify(self); - [vc setHandleTapRegionComfirm:^(RegionListInfo * _Nonnull regionInfo) { - @kStrongify(self); - [self updateRegion:regionInfo]; - }]; - } failure:^(NSError * _Nonnull error) { - - }]; - } else { - vc = [[RegionListViewController alloc] initForRegionList:self.regionInfoList]; - [self presentViewController:vc animated:YES completion:nil]; - @kWeakify(self); - [vc setHandleTapRegionComfirm:^(RegionListInfo * _Nonnull regionInfo) { - @kStrongify(self); - [self updateRegion:regionInfo]; - }]; - } -} - -- (void)updateRegion:(RegionListInfo *)model { - self.selectedRegion = model; - self.regionLabel.text = model.name; - self.regionFlagImageView.imageUrl = model.icon; - self.regionLabel.textColor = UIColorFromRGB(0x313131); - - [self.regionFlagImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(24, 18)); - }]; - [self.regionContainView layoutIfNeeded]; - - [self updateNextButton]; -} - -///更新用户信息 -- (void)updateUserInfo { - [XNDJTDDLoadingTool showOnlyView:self.view]; - [self.presenter complectionInfoWithAvatar:[self getAvatarUrl] - gender:self.maleView.selected ? @"1":@"2" nick:self.textField.text - inviteCode:self.codeTextField.text - roomUid:nil - shareUid:nil - shareChannel:nil - regionId:self.selectedRegion.id]; -} - -///获取头像 可能是从第三方获取的头像 -- (NSString *)getAvatarUrl { - NSString * avatar; - if ([self.presenter getThirdUserInfo] && [self.presenter getThirdUserInfo].avatarUrl.length > 0) { - avatar = [self.presenter getThirdUserInfo].avatarUrl; - } else { - avatar = @"https://image.hfighting.com/morentouxiang.png"; - } - return avatar; -} - -- (void)updateNextButton { - if (self.textField.text.length > 0 && self.sexString.length > 0 && self.selectedRegion) { - self.nextButton.enabled = YES; - } else { - self.nextButton.enabled = NO; - } -} - -#pragma mark - LoginFullInfoProtocol -- (void)requestRandomNickSuccess:(NSString *)nick { - self.textField.text = nick; -} - -- (void)complementInfoSuccess { - ///需要重新加载一次 ticket 刷新tabbar的item - [[AccountInfoStorage instance] saveTicket:nil]; - - // 初始化公共房间管理器 - [[PublicRoomManager sharedManager] initialize]; - - NSString * inviteCode = self.codeTextField.text.length > 0 ? self.codeTextField.text : @""; - [PILoginManager jumpToHomeVCWithInviteCode:inviteCode]; -} --(void)complementInfoFail{ - [XNDJTDDLoadingTool hideOnlyView:self.view]; -}; -#pragma mark - Event Response -- (void)nextButtonAction:(UIButton *)sender { - if (self.codeTextField.text.length <= 0) { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"LoginFullInfoViewController10"); - config.message = YMLocalizedString(@"LoginFullInfoViewController0"); - [TTPopup alertWithConfig:config confirmHandler:^{ - [self updateUserInfo]; - } cancelHandler:^{ - - }]; - } else { - [self updateUserInfo]; - } -} - -- (void)refreshButtonAction { - CAKeyframeAnimation *lAni = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"]; - lAni.duration = 1; - lAni.values=@[@0,@(M_PI*2)]; - //使得动画结束后，保持动画效果 - lAni.removedOnCompletion = NO; - lAni.fillMode = kCAFillModeForwards; - [self.refreshButton.layer addAnimation:lAni forKey:nil]; - [self.presenter randomRequestNick]; -} - -- (void)maleButtonAction:(UITapGestureRecognizer *)tap { - PIUserSexView * view = (PIUserSexView *)tap.view; - self.femaleView.selected = NO; - view.selected = YES; - self.sexString = @"1"; -} - -- (void)femaleButtonAction:(UITapGestureRecognizer *)tap { - PIUserSexView * view = (PIUserSexView *)tap.view; - view.selected = YES; - self.maleView.selected = NO; - self.sexString = @"2"; -} - -#pragma mark - Getters And Setters -- (void)setSexString:(NSString *)sexString { - _sexString = sexString; - [self updateNextButton]; -} -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [[UIImageView alloc]init]; - _bgImageView.image = kImage(@"home_top_bg"); - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _bgImageView; -} -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"LoginFullInfoViewController1"); - _titleLabel.font = kFontBold(28); - _titleLabel.textColor = UIColorFromRGB(0x1F1B4F); - } - return _titleLabel; -} - -- (UILabel *)remindLabel { - if (!_remindLabel) { - _remindLabel = [[UILabel alloc] init]; - 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; -} - - - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = UIColorFromRGB(0xF5F6FA); - _backView.layer.masksToBounds = YES; - _backView.layer.cornerRadius = kGetScaleWidth(52)/2; - } - return _backView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [[UILabel alloc] init]; - _nameLabel.text = YMLocalizedString(@"LoginFullInfoViewController9"); - _nameLabel.font = kFontRegular(14); - _nameLabel.textColor = UIColorFromRGB(0x1F1B4F); - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(refreshButtonAction)]; - - _nameLabel.userInteractionEnabled = YES; - [_nameLabel addGestureRecognizer:tap]; - [_nameLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_nameLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - - } - return _nameLabel; -} - -- (MSBaseTextField *)textField { - if (!_textField) { - _textField = [[MSBaseTextField alloc] init]; - _textField.textColor = UIColorFromRGB(0x1F1B4F); - _textField.font = kFontMedium(16); - _textField.placeholder = YMLocalizedString(@"LoginFullInfoViewController3"); - _textField.borderStyle = UITextBorderStyleNone; - _textField.tintColor = [DJDKMIMOMColor appMainColor]; - _textField.backgroundColor = [UIColor clearColor]; - } - return _textField; -} - -- (UIButton *)refreshButton { - if (!_refreshButton) { - _refreshButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_refreshButton setImage:[UIImage imageNamed:@"login_full_info_refresh"] forState:UIControlStateNormal]; - [_refreshButton setImage:[UIImage imageNamed:@"login_full_info_refresh"] forState:UIControlStateSelected]; - [_refreshButton setEnlargeEdgeWithTop:0 right:0 bottom:0 left:10]; - [_refreshButton setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_refreshButton setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_refreshButton addTarget:self action:@selector(refreshButtonAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _refreshButton; -} - -- (UIStackView *)sexStackView { - if (!_sexStackView) { - _sexStackView = [[UIStackView alloc] init]; - _sexStackView.axis = UILayoutConstraintAxisHorizontal; - _sexStackView.distribution = UIStackViewDistributionFill; - _sexStackView.alignment = UIStackViewAlignmentCenter; - _sexStackView.spacing = kGetScaleWidth(35); - } - return _sexStackView; -} - -- (PIUserSexView *)maleView { - if (!_maleView) { - _maleView = [[PIUserSexView alloc] init]; - _maleView.gender = GenderType_Male; - _maleView.selected = NO; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(maleButtonAction:)]; - [_maleView addGestureRecognizer:tap]; - } - return _maleView; -} - -- (PIUserSexView *)femaleView { - if (!_femaleView) { - _femaleView = [[PIUserSexView alloc] init]; - _femaleView.gender = GenderType_Female; - _femaleView.selected = NO; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(femaleButtonAction:)]; - [_femaleView addGestureRecognizer:tap]; - } - return _femaleView; -} - -- (UIView *)codeContainView { - if (!_codeContainView) { - _codeContainView = [[UIView alloc] init]; - _codeContainView.backgroundColor = UIColorFromRGB(0xF5F6FA); - _codeContainView.layer.masksToBounds= YES; - _codeContainView.layer.cornerRadius = kGetScaleWidth(52)/2; - } - return _codeContainView; -} - -- (MSBaseTextField *)codeTextField { - if (!_codeTextField) { - _codeTextField = [[MSBaseTextField alloc] init]; - _codeTextField.textColor = UIColorFromRGB(0x1F1B4F); - _codeTextField.font = kFontMedium(14); - _codeTextField.borderStyle = UITextBorderStyleNone; - NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"LoginFullInfoViewController5") attributes:@{NSFontAttributeName:kFontRegular(14),NSForegroundColorAttributeName:UIColorFromRGB(0xB3B3C3)}]; - _codeTextField.attributedPlaceholder = placeholder; - _codeTextField.textAlignment = NSTextAlignmentLeft; - _codeTextField.backgroundColor = [UIColor clearColor]; - } - return _codeTextField; -} - - - -- (UIButton *)nextButton{ - if (!_nextButton) { - _nextButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _nextButton.layer.masksToBounds = YES; - _nextButton.layer.cornerRadius = kGetScaleWidth(48)/2.f; - [_nextButton setTitle:YMLocalizedString(@"LoginFullInfoViewController6") forState:UIControlStateNormal]; - _nextButton.titleLabel.font = kFontMedium(16); - [_nextButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _nextButton.enabled = NO; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; - [_nextButton setBackgroundImage:image forState:UIControlStateNormal]; - [_nextButton addTarget:self action:@selector(nextButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _nextButton; -} - -- (UILabel *)block18Tips { - if (!_block18Tips) { - _block18Tips = [UILabel labelInitWithText:YMLocalizedString(@"1.0.30_text_25") - font:kFontRegular(11) - textColor:UIColorFromRGB(0xAFB1B3)]; - } - return _block18Tips; -} - -- (UIView *)bgView{ - if(!_bgView){ - UIView *bgView = [UIView new]; - bgView.backgroundColor = [UIColor whiteColor]; - bgView.layer.cornerRadius = kGetScaleWidth(20); - bgView.layer.masksToBounds = YES; - _bgView = bgView; - } - return _bgView; -} - -- (UIView *)regionContainView { - if (!_regionContainView) { - _regionContainView = [[UIView alloc] init]; - _regionContainView.backgroundColor = UIColorFromRGB(0xF5F6FA); - [_regionContainView setCornerRadius:kGetScaleWidth(52)/2]; - - UIImageView *arrow = [[UIImageView alloc] initWithImage:[kImage(@"grey_arrow") ms_SetImageForRTL]]; -// arrow.layer.contentsRect = CGRectMake(0.1, 0.1, 0.8, 0.8); - arrow.contentMode = UIViewContentModeScaleAspectFit; - [_regionContainView addSubview:arrow]; - [arrow mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(_regionContainView); - make.trailing.mas_equalTo(-20); - make.width.height.mas_equalTo(20); - }]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapRegionButton)]; - [_regionContainView addGestureRecognizer:tap]; - } - return _regionContainView; -} - -- (UILabel *)regionLabel { - if (!_regionLabel) { - _regionLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.31_text_0") - font:kFontMedium(12) - textColor:UIColorFromRGB(0xb3b3c1)]; - _regionLabel.userInteractionEnabled = YES; - } - return _regionLabel; -} - -- (NetImageView *)regionFlagImageView { - if (!_regionFlagImageView) { - _regionFlagImageView = [[NetImageView alloc] init]; - _regionFlagImageView.contentMode = UIViewContentModeScaleAspectFit; - _regionFlagImageView.userInteractionEnabled = YES; - } - return _regionFlagImageView; -} - -@end diff --git a/YuMi/Modules/YMLogin/View/LoginTypesViewController.h b/YuMi/Modules/YMLogin/View/LoginTypesViewController.h deleted file mode 100644 index 72af9c6..0000000 --- a/YuMi/Modules/YMLogin/View/LoginTypesViewController.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// LoginTypesViewController.h -// YuMi -// -// Created by P on 2025/3/11. -// - -#import "MvpViewController.h" -#import "LoginInputItemView.h" -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, LoginDisplayType) { - LoginDisplayType_id, - LoginDisplayType_email, - LoginDisplayType_phoneNum, - LoginDisplayType_email_forgetPassword, - LoginDisplayType_phoneNum_forgetPassword, -}; - -@interface LoginTypesViewController : MvpViewController - -@property(nonatomic, assign) BOOL isLogoutAfterRestPassword; - -- (void)updateLoginType:(LoginDisplayType)type; - - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/LoginTypesViewController.m b/YuMi/Modules/YMLogin/View/LoginTypesViewController.m deleted file mode 100644 index a1eb9b0..0000000 --- a/YuMi/Modules/YMLogin/View/LoginTypesViewController.m +++ /dev/null @@ -1,542 +0,0 @@ -// -// LoginTypesViewController.m -// YuMi -// -// Created by P on 2025/3/11. -// - -#import "LoginTypesViewController.h" -#import "LoginPresenter.h" -#import "XPLoginAraeViewController.h" -#import "LoginProtocol.h" -#import "PILoginManager.h" -#import "XPWebViewController.h" - -@interface LoginTypesViewController () - -@property(nonatomic, assign) LoginDisplayType type; -@property(nonatomic, strong) UILabel *titleLabel; -@property(nonatomic, strong) LoginInputItemView *firstLineInputView; -@property(nonatomic, strong) LoginInputItemView *secondLineInputView; -@property(nonatomic, strong) LoginInputItemView *thirdLineInputView; -@property(nonatomic, strong) UIButton *bottomActionButton; -@property(nonatomic, strong) UIButton *forgotPasswordButton; -@property(nonatomic, strong) UIStackView *stackView; -@property(nonatomic, strong) XPWebViewController *webVC; -@property(nonatomic, strong) UIButton *switchForgotType; - -@end - -@implementation LoginTypesViewController - -- (void)dealloc { - [self.secondLineInputView endVerificationCountDown]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (LoginPresenter *)createPresenter { - return [[LoginPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - [self setupUI]; -} - -- (void)updateLoginType:(LoginDisplayType)type { - self.type = type; - [self setupInputArea]; -} - -- (void)setupUI { - [self setupDefaultUI]; - [self setupNavigationBar]; -} - -- (void)handleTap { - [self.view endEditing:YES]; -} - -- (void)setupDefaultUI { - UIImageView *backagroundImageView = [[UIImageView alloc] initWithFrame:self.view.bounds]; - backagroundImageView.userInteractionEnabled = YES; - if (isMSRTL()) { - backagroundImageView.image = kImage(@"login_page_backage_ar"); - } else { - backagroundImageView.image = kImage(@"login_page_backage"); - } - [self.view addSubview:backagroundImageView]; - - UIImageView *hiImageView = [[UIImageView alloc] initWithImage:kImage(@"login_page_mail_HI")]; - [self.view addSubview:hiImageView]; - [hiImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(45); - make.top.mas_equalTo(111); - make.size.mas_equalTo(CGSizeMake(88, 45)); - }]; - - [self.view addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(45); - make.top.mas_equalTo(190); - }]; - - [self.view addSubview:self.stackView]; - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(22); - make.leading.trailing.mas_equalTo(self.view).inset(40); - }]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] init]; - [tap addTarget:self action:@selector(handleTap)]; - [backagroundImageView addGestureRecognizer:tap]; -} - -- (void)setupNavigationBar { - UIButton *backButton = [self backButton]; - [self.view addSubview:backButton]; - [backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).offset(16); - make.top.mas_equalTo(self.view).offset(kStatusBarHeight); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; -} - -- (void)setupInputArea { - switch (self.type) { - case LoginDisplayType_id: - [self setupIDInputArea]; - break; - case LoginDisplayType_email: - [self setupEmailInputArea]; - break; - case LoginDisplayType_phoneNum: - [self setupPhoneInputArea]; - break; - case LoginDisplayType_email_forgetPassword: - case LoginDisplayType_phoneNum_forgetPassword: - [self.firstLineInputView removeFromSuperview]; - [self.secondLineInputView removeFromSuperview]; - [self.thirdLineInputView removeFromSuperview]; - [self.bottomActionButton removeFromSuperview]; - [self.switchForgotType removeFromSuperview]; - [self setupForgotPasswordArea]; - break; - default: - break; - } -} - -- (void)setupIDInputArea { - [self setupInpuArea:LoginInputType_id - second:LoginInputType_password - third:LoginInputType_none - action:LoginInputType_login - showForgetPassword:YES]; -} - -- (void)setupEmailInputArea { - [self setupInpuArea:LoginInputType_email - second:LoginInputType_verificationCode - third:LoginInputType_none - action:LoginInputType_login - showForgetPassword:NO]; -} - -- (void)setupPhoneInputArea { - [self setupInpuArea:LoginInputType_phoneNum - second:LoginInputType_verificationCode - third:LoginInputType_none - action:LoginInputType_login - showForgetPassword:NO]; -} - -- (void)setupForgotPasswordArea { - [self setupInpuArea:self.type==LoginDisplayType_email_forgetPassword ? LoginInputType_email : LoginInputType_phoneNum - second:LoginInputType_verificationCode - third:LoginInputType_confirmPassword - action:LoginInputType_confirm - showForgetPassword:NO]; -} - -- (void)setupInpuArea:(LoginInputType)first - second:(LoginInputType)second - third:(LoginInputType)third - action:(LoginInputType)action - showForgetPassword:(BOOL)showForgetPassword { - - @kWeakify(self); - _firstLineInputView = [[LoginInputItemView alloc] initWithType:first]; - [self.firstLineInputView setHandleItemAction:^(LoginInputType inputType) { - @kStrongify(self); - if (inputType == LoginInputType_phoneNum) { - [self handleTapAreaCode]; - } - }]; - [self.firstLineInputView setHandleFirstInputContentUpdate:^(NSString *inputContent) { - @kStrongify(self); - [self checkActionButtonStatus]; - }]; - [self.stackView addArrangedSubview:self.firstLineInputView]; - [self.firstLineInputView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(46); - }]; - - _secondLineInputView = [[LoginInputItemView alloc] initWithType:second]; - [self.secondLineInputView setHandleItemAction:^(LoginInputType inputType) { - @kStrongify(self); - if (inputType == LoginInputType_verificationCode) { - if (self.type == LoginDisplayType_phoneNum || self.type == LoginDisplayType_phoneNum_forgetPassword) { - [self handleTapGetPhoneVerificationCode]; - } else if (self.type == LoginDisplayType_email || self.type == LoginDisplayType_email_forgetPassword) { - [self handleTapGetMailVerificationCode]; - } - } - }]; - [self.secondLineInputView setHandleSecondInputContentUpdate:^(NSString *inputContent) { - @kStrongify(self); - [self checkActionButtonStatus]; - }]; - [self.stackView addArrangedSubview:self.secondLineInputView]; - [self.secondLineInputView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(46); - }]; - - if (third != LoginInputType_none) { - _thirdLineInputView = [[LoginInputItemView alloc] initWithType:third]; - [self.thirdLineInputView setHandleThirdInputContentUpdate:^(NSString *inputContent) { - @kStrongify(self); - [self checkActionButtonStatus]; - }]; - [self.stackView addArrangedSubview:self.thirdLineInputView]; - [self.thirdLineInputView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(46); - }]; - - [self.view addSubview:self.switchForgotType]; - [self.switchForgotType mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 43); - }]; - - [self.switchForgotType setTitle: self.type == LoginDisplayType_email_forgetPassword ? YMLocalizedString(@"20.20.51_text_19") : YMLocalizedString(@"20.20.51_text_18") - forState:UIControlStateNormal]; - self.titleLabel.text = YMLocalizedString(@"20.20.51_text_20"); - } - - if (showForgetPassword) { - [self.stackView setCustomSpacing:8 afterView:self.secondLineInputView]; - [self.stackView addArrangedSubview:self.forgotPasswordButton]; - [self.forgotPasswordButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - }]; - [self.stackView setCustomSpacing:8 afterView:self.forgotPasswordButton]; - } - - if (action != LoginInputType_none) { - if (action == LoginInputType_login) { - [self.bottomActionButton setTitle:YMLocalizedString(@"XPLoginPhoneViewController8") forState:UIControlStateNormal]; - [self.bottomActionButton setTitle:YMLocalizedString(@"XPLoginPhoneViewController8") forState:UIControlStateDisabled]; - } else if (action == LoginInputType_confirm) { - [self.bottomActionButton setTitle:YMLocalizedString(@"XPAnchorAudienceUpMicView2") forState:UIControlStateNormal]; - [self.bottomActionButton setTitle:YMLocalizedString(@"XPAnchorAudienceUpMicView2") forState:UIControlStateDisabled]; - } - [self.stackView addArrangedSubview:self.bottomActionButton]; - [self.bottomActionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(46); - }]; - } -} - -#pragma mark - -- (void)didTapBack { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)didTapActionButton { - [self.view endEditing:true]; - - switch (self.type) { - case LoginDisplayType_id: { - [self.presenter loginWithPhone:[self.firstLineInputView inputContent] - password:[self.secondLineInputView inputContent]]; - } - break; - case LoginDisplayType_phoneNum: { - [self.presenter loginWithPhone:[self.firstLineInputView inputContent] - code:[self.secondLineInputView inputContent] - phoneAreaCode:[self.firstLineInputView loadAreaCode]]; - } - break; - case LoginDisplayType_email: { - [self.presenter loginWithEmail:[self.firstLineInputView inputContent] - code:[self.secondLineInputView inputContent]]; - } - break; - case LoginDisplayType_email_forgetPassword: { - [self.presenter resetEmailPassword:[self.firstLineInputView inputContent] - code:[self.secondLineInputView inputContent] - newPassword:[self.thirdLineInputView inputContent]]; - } - break; - case LoginDisplayType_phoneNum_forgetPassword: { - [self.presenter resetPhonePassword:[self.firstLineInputView inputContent] - code:[self.secondLineInputView inputContent] - newPassword:[self.thirdLineInputView inputContent] - areaCode:[self.firstLineInputView loadAreaCode]]; - } - break; - default: - break; - } -} - -- (void)didTapForgotPasswordButton { - LoginTypesViewController *vc = [[LoginTypesViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; - [vc updateLoginType:LoginDisplayType_email_forgetPassword]; -} - -- (void)didTapSwitchForgotType { - if (self.type == LoginDisplayType_email_forgetPassword) { - [self updateLoginType:LoginDisplayType_phoneNum_forgetPassword]; - } else { - [self updateLoginType:LoginDisplayType_email_forgetPassword]; - } -} - -- (void)handleTapAreaCode { - XPLoginAraeViewController *codeVC = [XPLoginAraeViewController new]; - codeVC.delegate = self; - [self.navigationController pushViewController:codeVC animated:YES]; -} - -- (void)handleTapGetPhoneVerificationCode { - NSString *phone = [self.firstLineInputView inputContent]; - if (phone.length == 0 ) { - [self showErrorToast:YMLocalizedString(@"XPLoginPhoneViewController0")]; - [self.secondLineInputView endVerificationCountDown]; - return; - } - @kWeakify(self); - [self loadCaptchaWebView:^{ - @kStrongify(self); - NSString *areaCode = [self.firstLineInputView loadAreaCode]; - [self.presenter phoneSmsCode:[NSString stringWithFormat:@"%@%@", areaCode,phone] - type:GetSmsType_Regist - phoneAreaCode:areaCode]; - }]; -} - -- (void)handleTapGetMailVerificationCode { - NSString *email = [self.firstLineInputView inputContent]; - if (email.length == 0 ) { -// [self showErrorToast:YMLocalizedString(@"20.20.51_text_12")]; - [self.secondLineInputView endVerificationCountDown]; - return; - } - [self.presenter sendMailVerificationCode:email type:GetSmsType_Regist]; -} - -- (void)checkActionButtonStatus { - switch (self.type) { - case LoginDisplayType_id: - case LoginDisplayType_email: - case LoginDisplayType_phoneNum:{ - NSString *accountString = [self.firstLineInputView inputContent]; - NSString *codeString = [self.secondLineInputView inputContent]; - if (![NSString isEmpty:accountString] && ![NSString isEmpty:codeString]) { - self.bottomActionButton.enabled = YES; - } else { - self.bottomActionButton.enabled = NO; - } - } - break; - case LoginDisplayType_email_forgetPassword: - case LoginDisplayType_phoneNum_forgetPassword: { - NSString *accountString = [self.firstLineInputView inputContent]; - NSString *codeString = [self.secondLineInputView inputContent]; - NSString *passwordString = [self.thirdLineInputView inputContent]; - if (![NSString isEmpty:accountString] && ![NSString isEmpty:codeString] && ![NSString isEmpty:passwordString]) { - self.bottomActionButton.enabled = YES; - } else { - self.bottomActionButton.enabled = NO; - } - } - - default: - break; - } -} - -- (void)loadCaptchaWebView:(void(^)(void))finishBlock { - if ([ClientConfig.shareConfig shouldDisplayCaptcha]) { - [self.view endEditing:YES]; - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.view.frame = CGRectMake(0, 0, KScreenWidth*0.8, KScreenWidth*1.2); - webVC.view.backgroundColor = [UIColor clearColor]; - [webVC.view setCornerRadius:12]; - webVC.isLoginStatus = NO; - webVC.isPush = NO; - [webVC hideNavigationBar]; - webVC.url = URLWithType(kCaptchaSwitchPath); - [webVC setVerifyCaptcha:^(BOOL result) { - if (result == NO) { - return; - } - if (result && finishBlock) { - [TTPopup dismiss]; - finishBlock(); - } - }]; - [TTPopup popupView:webVC.view style:TTPopupStyleAlert]; - self.webVC = webVC; - } -} - -#pragma mark - XPLoginAraeViewControllerDelegate -- (void)chooseAreaCodeSuccess:(NSString *)code { - [self.firstLineInputView updateAreaCode:code]; -} - -- (void)loginSuccess { - [self showSuccessToast:YMLocalizedString(@"XPLoginPhoneViewController1")]; - [PILoginManager loginWithVC:self isLoginPhone:NO]; -} - -- (void)loginFailWithMsg:(NSString *)msg { - [self showSuccessToast:msg]; -} - -#pragma mark - API presenter Delegate -- (void)phoneSmsCodeSuccess:(NSString *)message type:(GetSmsType)type { - [self showSuccessToast:YMLocalizedString(@"XPLoginPhoneViewController2")]; - [self.secondLineInputView startVerificationCountDown]; - [self.secondLineInputView displayKeyboard]; -} - -- (void)phoneSmsCodeFailure { - [self.secondLineInputView endVerificationCountDown]; -} - -- (void)emailCodeSucess:(NSString *)message type:(GetSmsType)type{ - [self showSuccessToast:YMLocalizedString(@"XPLoginPhoneViewController2")]; - [self.secondLineInputView startVerificationCountDown]; - [self.secondLineInputView displayKeyboard]; -} - -- (void)emailCodeFailure { - [self.secondLineInputView endVerificationCountDown]; -} - -- (void)resetEmailPasswordSuccess { - if (self.isLogoutAfterRestPassword) { - dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)); - dispatch_after(popTime, dispatch_get_main_queue(), ^(void){ - [self.presenter logout]; - }); - } else { - [self.navigationController popViewControllerAnimated:YES]; - } -} - -- (void)resetPhonePasswordSuccess { - if (self.isLogoutAfterRestPassword) { - dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)); - dispatch_after(popTime, dispatch_get_main_queue(), ^(void){ - [self.presenter logout]; - }); - } else { - [self.navigationController popViewControllerAnimated:YES]; - } -} - -#pragma mark - -- (UIButton *)backButton { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:[kImage(@"common_nav_back") ms_SetImageForRTL] - forState:UIControlStateNormal]; - [b addTarget:self - action:@selector(didTapBack) - forControlEvents:UIControlEventTouchUpInside]; - return b; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"20.20.51_text_2") - font:kFontSemibold(20) - textColor:UIColorFromRGB(0x663c22)]; - } - return _titleLabel; -} - -- (UIButton *)bottomActionButton { - if (!_bottomActionButton) { - _bottomActionButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_bottomActionButton setCornerRadius:23]; - [_bottomActionButton setTitle:YMLocalizedString(@"XPLoginPhoneViewController8") forState:UIControlStateNormal]; - [_bottomActionButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - UIImage *normalBG = [UIImage gradientColorImageFromColors:@[ - UIColorFromRGB(0xe29030), - UIColorFromRGB(0xfcc074) - ] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(KScreenWidth-84, 46)] ; - UIImage *disableBG = [UIImage gradientColorImageFromColors:@[ - [UIColor colorWithRed:245/255.0 green:199/255.0 blue:129/255.0 alpha:1], - [UIColor colorWithRed:253/255.0 green:217/255.0 blue:154/255.0 alpha:1], - ] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(KScreenWidth-84, 46)] ; - [_bottomActionButton setBackgroundImage:normalBG forState:UIControlStateNormal]; - [_bottomActionButton setBackgroundImage:disableBG forState:UIControlStateDisabled]; - [_bottomActionButton addTarget:self - action:@selector(didTapActionButton) - forControlEvents:UIControlEventTouchUpInside]; - _bottomActionButton.enabled = NO; - } - return _bottomActionButton; -} - -- (UIButton *)forgotPasswordButton { - if (!_forgotPasswordButton) { - _forgotPasswordButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_forgotPasswordButton.titleLabel setFont:kFontRegular(12)]; - [_forgotPasswordButton setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateNormal]; - [_forgotPasswordButton setTitle:YMLocalizedString(@"XPForgetPwdViewController3") forState:UIControlStateNormal]; - [_forgotPasswordButton setBackgroundColor:[UIColor clearColor]]; - _forgotPasswordButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight; - [_forgotPasswordButton addTarget:self - action:@selector(didTapForgotPasswordButton) - forControlEvents:UIControlEventTouchUpInside]; - } - return _forgotPasswordButton; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.spacing = 24; - _stackView.distribution = UIStackViewDistributionFill; - } - return _stackView; -} - -- (UIButton *)switchForgotType { - if (!_switchForgotType) { - _switchForgotType = [UIButton buttonWithType:UIButtonTypeCustom]; - [_switchForgotType.titleLabel setFont:kFontRegular(12)]; - [_switchForgotType setTitle:YMLocalizedString(@"20.20.51_text_19") forState:UIControlStateNormal]; - [_switchForgotType setTitleColor:UIColorFromRGB(0x7b7b7d) forState:UIControlStateNormal]; - [_switchForgotType addTarget:self action:@selector(didTapSwitchForgotType) forControlEvents:UIControlEventTouchUpInside]; - } - return _switchForgotType; -} -@end - diff --git a/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.h b/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.h deleted file mode 100644 index df7d989..0000000 --- a/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// LoginVerifCodeViewController.h -// YUMI -// -// Created by YUMI on 2021/9/8. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSUInteger, VerifCodeType){ - VerifCodeType_Regist, ///注册的时候 - VerifCodeType_BindPhone,///绑定手机 - VerifCodeType_Login,///手机登录 - VerifCodeType_AreaCode,///区号 -} ; - - -@interface LoginVerifCodeViewController : MvpViewController - -///输入的手机号 -@property (nonatomic,copy) NSString *phone; -@property (nonatomic,copy) NSString *pi_phoneAreaCode; -///类型 -@property (nonatomic,assign) VerifCodeType type; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m b/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m deleted file mode 100644 index 9b257a6..0000000 --- a/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m +++ /dev/null @@ -1,362 +0,0 @@ -// -// LoginVerifCodeViewController.m -// YuMi -// -// Created by YuMi on 2021/9/8. -// - -#import "LoginVerifCodeViewController.h" -///第三方 -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "CountDownHelper.h" -#import "YUMIMacroUitls.h" -#import "YUMIConstant.h" -#import "XNDJTDDLoadingTool.h" -#import "UIView+Corner.h" -#import "UIButton+EnlargeTouchArea.h" -///Presenter -#import "LoginVerifCodePresent.h" -///Protocole -#import "LoginVerifCodeProtocol.h" -///View -#import "LoginVerifCodeView.h" -#import "LoginFullInfoViewController.h" -#import "XPLoginPwdViewController.h" - -@interface LoginVerifCodeViewController () -///顶部背景 -@property (nonatomic,strong) UIImageView *topBackImgView; -///内容 -@property (nonatomic,strong) UIView *contentView; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -//背景 -@property (nonatomic,strong) UIView *bgCodeView; -///容器 -@property (nonatomic,strong) UIStackView *codeStackView; -///显示倒计时 -@property (nonatomic,strong) UILabel *cutdownLabel; -///重新获得验证码 -@property (nonatomic,strong) UIButton *retryCodeButton; -///输入密码 -@property (nonatomic,strong) MSBaseTextField *textField; -///登录 -@property (nonatomic,strong) UIButton *loginButton; -///返回按钮 -@property (nonatomic,strong) UIButton *backBtn; -///是否验证码登录成功，登录成功后，不能再用验证码登录了，直接走下面的登录流程就可 -@property (nonatomic,assign) BOOL isLoginSuccess; -///成功后登录验证码 -@property (nonatomic,copy) NSString *code; -@end - -@implementation LoginVerifCodeViewController - -- (void)dealloc { - [[CountDownHelper shareHelper] stopCountDown]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (LoginVerifCodePresent *)createPresenter { - return [[LoginVerifCodePresent alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - - [self initSubViews]; - [self initSubViewConstraints]; - if(self.type != VerifCodeType_AreaCode){ - self.retryCodeButton.hidden = YES; - self.cutdownLabel.hidden = NO; - [[CountDownHelper shareHelper] openCountdownWithTime:60]; - }else{ - self.textField.keyboardType = UIKeyboardTypeDefault; - } - -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:NO]; -} - -- (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; - [[CountDownHelper shareHelper] stopCountDown]; -} - -#pragma mark - Private Method -- (void)initSubViews { - - [self.view addSubview:self.topBackImgView]; - [self.view addSubview:self.contentView]; - - - if(self.type == VerifCodeType_AreaCode){ - self.titleLabel.text = YMLocalizedString(@"LoginVerifCodeViewController5"); - - }else{ - [self.topBackImgView addSubview:self.backBtn]; - [CountDownHelper shareHelper].delegate = self; - } - - [self.topBackImgView addSubview:self.titleLabel]; - - [self.contentView addSubview:self.bgCodeView]; - [self.bgCodeView addSubview:self.codeStackView]; - [self.codeStackView addArrangedSubview:self.textField]; - [self.codeStackView addArrangedSubview:self.cutdownLabel]; - [self.codeStackView addArrangedSubview:self.retryCodeButton]; - [self.contentView addSubview:self.loginButton]; - - -} - -- (void)initSubViewConstraints { - [self.topBackImgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(333)); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.equalTo(self.topBackImgView.mas_bottom).mas_offset(-kGetScaleWidth(30)); - }]; - if(self.type != VerifCodeType_AreaCode){ - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.topBackImgView.mas_top).offset(kSafeAreaTopHeight + kGetScaleWidth(52)); - make.width.height.mas_equalTo(kGetScaleWidth(20)); - make.leading.mas_equalTo(kGetScaleWidth(15)); - }]; - } - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.topBackImgView).offset(kGetScaleWidth(30)); - make.top.mas_equalTo(self.topBackImgView.mas_top).offset(kSafeAreaTopHeight + kGetScaleWidth(96)); - }]; - - - [self.bgCodeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(30)); - make.trailing.mas_equalTo(-kGetScaleWidth(33)); - make.leading.mas_equalTo(kGetScaleWidth(33)); - make.height.mas_equalTo(kGetScaleWidth(63)); - }]; - - [self.codeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(20)); - make.trailing.mas_equalTo(-kGetScaleWidth(20)); - make.top.bottom.equalTo(self.bgCodeView); - }]; - [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(190)); - }]; - [self.loginButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(63)); - make.width.mas_equalTo(kGetScaleWidth(165)); - make.top.equalTo(self.bgCodeView.mas_bottom).mas_offset(kGetScaleWidth(50)); - }]; - -} - - -- (void)httpRequestPhoneSmsCode { - [self.presenter phoneSmsCode:[NSString stringWithFormat:@"%@%@",self.pi_phoneAreaCode,self.phone] type:GetSmsType_Regist phoneAreaCode:self.pi_phoneAreaCode]; -} - - - --(void)loginButtonAction{ - - [self.view endEditing:YES]; - self.loginButton.enabled = NO; -// if(self.type == VerifCodeType_AreaCode){ -// [self showLoading]; -// -// return; -// } - - if(self.isLoginSuccess == YES && [self.code isEqualToString:self.textField.text]){ - [XNDJTDDLoadingTool showLoadingInView:self.view]; - [self loginSuccess]; - return; - } - self.isLoginSuccess = NO; - [XNDJTDDLoadingTool showLoadingInView:self.view]; - self.code = self.textField.text; - [self.presenter loginWithPhone:[NSString stringWithFormat:@"%@%@",self.pi_phoneAreaCode,self.phone] code:self.textField.text phoneAreaCode:self.pi_phoneAreaCode]; -} - -- (void)disMissVC { - [[CountDownHelper shareHelper] stopCountDown]; - NSMutableArray *vcList = [NSMutableArray array]; - for (id vc in self.navigationController.viewControllers) { - if(![vc isKindOfClass:[XPLoginPwdViewController class]]){ - [vcList addObject:vc]; - } - } - self.navigationController.viewControllers = vcList; - UIViewController *vc = self.presentingViewController; - while (vc.presentingViewController) { - vc = vc.presentingViewController; - } - [vc dismissViewControllerAnimated:YES completion:nil]; - [self.navigationController popToRootViewControllerAnimated:NO]; -} - - -#pragma mark - LoginVerifCodeProtocol -- (void)loginFail:(NSString *)reason{ - self.loginButton.enabled = YES; - [XNDJTDDLoadingTool showLoadingInView:self.view]; -} -- (void)loginSuccess { - self.isLoginSuccess = YES; - [[CountDownHelper shareHelper] stopCountDown]; - [self disMissVC]; - self.loginButton.enabled = YES; -} - -///绑定手机号成功 -- (void)bindPhoneSuccess { - [self disMissVC]; -} -#pragma mark - LoginProtocol -- (void)phoneSmsCodeSuccess { - [self showSuccessToast:YMLocalizedString(@"PKIDLoginViewController11")]; - self.retryCodeButton.hidden = YES; - self.cutdownLabel.hidden = NO; - [[CountDownHelper shareHelper] openCountdownWithTime:60]; -} - -#pragma mark - CountDownHelperDelegate -- (void)onCountdownFinish { - self.retryCodeButton.hidden = NO; - self.cutdownLabel.hidden = YES; -} - -- (void)onCountdownOpen:(int)time { - self.cutdownLabel.text = [NSString stringWithFormat:@"%dS",time]; -} --(void)textFieldDidChange:(UITextField *)textField{ - self.loginButton.enabled = textField.text > 0; -} -#pragma mark 重新获取验证吗 --(void)retryCodeAction{ - [self httpRequestPhoneSmsCode]; -} --(void)backAction{ - [self.navigationController popViewControllerAnimated:YES]; -} -#pragma mark - Getters And Setters - - -- (UILabel *)titleLabel{ - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:40]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.text = YMLocalizedString(@"LoginVerifCodeViewController3"); - } - return _titleLabel; -} - - - - -- (UILabel *)cutdownLabel { - if (!_cutdownLabel) { - _cutdownLabel = [[UILabel alloc] init]; - _cutdownLabel.textAlignment = NSTextAlignmentRight; - _cutdownLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightSemibold]; - _cutdownLabel.textColor = UIColorFromRGB(0x9168FA); - _cutdownLabel.hidden = NO; - } - return _cutdownLabel; -} --(UIView *)bgCodeView{ - if (!_bgCodeView){ - _bgCodeView = [UIView new]; - _bgCodeView.backgroundColor = UIColorFromRGB(0xF0F5F6); - [_bgCodeView setCornerWithLeftTopCorner:kGetScaleWidth(10) rightTopCorner:kGetScaleWidth(10) bottomLeftCorner:kGetScaleWidth(10) bottomRightCorner:kGetScaleWidth(10) size:CGSizeMake(kGetScaleWidth(308), kGetScaleWidth(63))]; - } - return _bgCodeView; -} -- (UIButton *)retryCodeButton { - if (!_retryCodeButton) { - _retryCodeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_retryCodeButton setTitle:YMLocalizedString(@"LoginVerifCodeViewController4") forState:UIControlStateNormal]; - [_retryCodeButton setTitleColor:[DJDKMIMOMColor colorWithHexString:@"#1F1A4E"] forState:UIControlStateNormal]; - _retryCodeButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightSemibold]; - _retryCodeButton.hidden = YES; - [_retryCodeButton addTarget:self action:@selector(retryCodeAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _retryCodeButton; -} -- (UIImageView *)topBackImgView { - if (!_topBackImgView) { - _topBackImgView = [[UIImageView alloc] init]; - _topBackImgView.userInteractionEnabled = YES; - _topBackImgView.image = [UIImage imageNamed:@"login_top_bg"]; - _topBackImgView.layer.masksToBounds = YES; - _topBackImgView.contentMode = UIViewContentModeScaleAspectFill; - } - return _topBackImgView; -} --(MSBaseTextField *)textField{ - if (!_textField){ - _textField = [[MSBaseTextField alloc]init]; - _textField.keyboardType = UIKeyboardTypeNumberPad; - _textField.textColor = [DJDKMIMOMColor colorWithHexString:@"#1F1A4E"]; - _textField.font = [UIFont systemFontOfSize:16 weight:UIFontWeightSemibold]; - [_textField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; - - } - return _textField; -} -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = [UIColor whiteColor]; - [_contentView setCornerWithLeftTopCorner:kGetScaleWidth(25) rightTopCorner:kGetScaleWidth(25) bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth, KScreenHeight - kGetScaleWidth(303))]; - } - return _contentView; -} -- (UIButton *)loginButton { - if (!_loginButton) { - _loginButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_loginButton setImage:[UIImage imageNamed:@"login_finish"] forState:UIControlStateNormal]; - [_loginButton addTarget:self action:@selector(loginButtonAction) forControlEvents:UIControlEventTouchUpInside]; - _loginButton.enabled = NO; - } - return _loginButton; -} - -- (UIStackView *)codeStackView{ - if (!_codeStackView) { - _codeStackView = [[UIStackView alloc] init]; - _codeStackView.axis = UILayoutConstraintAxisHorizontal; - _codeStackView.distribution = UIStackViewDistributionFillProportionally; - _codeStackView.alignment = UIStackViewAlignmentFill; - _codeStackView.spacing = 10; - } - return _codeStackView; -} -- (UIButton *)backBtn{ - if (!_backBtn){ - _backBtn = [UIButton new]; - [_backBtn setBackgroundImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_backBtn addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} -@end diff --git a/YuMi/Modules/YMLogin/View/LoginViewController.h b/YuMi/Modules/YMLogin/View/LoginViewController.h deleted file mode 100644 index 24fb40a..0000000 --- a/YuMi/Modules/YMLogin/View/LoginViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// LoginViewController.h -// YuMi -// -// Created by P on 2025/3/10. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface LoginViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/LoginViewController.m b/YuMi/Modules/YMLogin/View/LoginViewController.m deleted file mode 100644 index 31b4be0..0000000 --- a/YuMi/Modules/YMLogin/View/LoginViewController.m +++ /dev/null @@ -1,509 +0,0 @@ -// -// LoginViewController.m -// YuMi -// -// Created by P on 2025/3/10. -// - -#import "LoginViewController.h" -#import "XPWebViewController.h" -#import "LoginPresenter.h" -#import "AESUtils.h" -#import "LoginTypesViewController.h" -#import "LoginProtocol.h" -#import "PILoginManager.h" -#import "PISwitchingEnvironmentVC.h" -#import "FeedBackViewController.h" -#import "FirstRechargeManager.h" - -NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; - -typedef NS_ENUM(NSUInteger, LoginType) { - LoginType_ID = 101, - LoginType_Email = 102, - LoginType_Google = 103, - LoginType_Apple = 104 -}; - -@interface LoginViewController () - -@property(nonatomic, strong) UIImageView *logoImageView; -@property(nonatomic, assign) BOOL lastPolicySelectedStatus; -@property(nonatomic, strong) UIButton *agreeButton; -@property(nonatomic, strong) YYLabel *policyLabel; -@property(nonatomic, strong) UIView *policyTips; - -///谷歌登录配置 -@property (nonatomic,strong) GIDConfiguration *configuration; - -@end - -@implementation LoginViewController - -- (LoginPresenter *)createPresenter { - return [[LoginPresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self loadPolicySelectedStatus]; - [self setupUI]; - - // 进入登录页面时停止首充监控 - [[FirstRechargeManager sharedManager] stopMonitoring]; -} - -- (void)setupUI { - [self setupBackground]; - [self setupNavigationBar]; - [self setupBottomPolicy]; - [self setupSMSLoginEntrcy]; - [self setupEntrcyButtons]; -} - -- (void)setupBackground { - [self.view addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xfcf4df), - UIColorFromRGB(0xffd374) - ] - startPoint:CGPointMake(0.5, 0) - endPoint:CGPointMake(0.5, 1) - cornerRadius:0]; - - UIImageView *topImageView = [[UIImageView alloc] initWithImage:kImage(@"login_page_top")]; - topImageView.contentMode = UIViewContentModeScaleAspectFit; - [self.view addSubview:topImageView]; - [topImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(326)); - }]; - - [self.view addSubview:self.logoImageView]; - if (iPhoneXSeries) { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.centerY.mas_equalTo(topImageView.mas_bottom); - make.size.mas_equalTo(CGSizeMake(124, 48)); - }]; - } else { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(160); - make.size.mas_equalTo(CGSizeMake(124, 48)); - }]; - } -} - -- (void)setupNavigationBar { -#if DEBUG - UIButton *debugButton = [self debugButton]; - [self.view addSubview:debugButton]; - [debugButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).offset(16); - make.top.mas_equalTo(self.view).offset(kStatusBarHeight); - make.height.mas_equalTo(22); - make.width.mas_greaterThanOrEqualTo(84); - }]; -#endif - - UIButton *feedBackButton = [self feedBackButton]; - [self.view addSubview:feedBackButton]; - [feedBackButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.view).offset(-16); - make.top.mas_equalTo(self.view).offset(kStatusBarHeight); - make.height.mas_equalTo(22); -// make.width.mas_lessThanOrEqualTo(200); // 设置最大宽度防止过长 - }]; - [self.view setNeedsLayout]; -} - -- (void)setupBottomPolicy { - UIView *view_1 = [[UIView alloc] init]; - UIView *view_2 = [[UIView alloc] init]; - UIStackView *stackView = [[UIStackView alloc] initWithArrangedSubviews:@[ - view_1, - self.agreeButton, - self.policyLabel, - view_2 - ]]; - stackView.spacing = 8; - stackView.alignment = UIStackViewAlignmentCenter; - stackView.distribution = UIStackViewDistributionFill; - [self.view addSubview:stackView]; - [stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.view).offset(-44); - make.width.mas_lessThanOrEqualTo(self.view).offset(-32); -// make.height.mas_equalTo(60); - }]; - - [self.agreeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(18,18)); - }]; -} - -- (void)setupSMSLoginEntrcy { - UIButton *smsLogin = [UIButton buttonWithType:UIButtonTypeCustom]; - [smsLogin setBackgroundImage:kImage(@"login_page_phone") forState:UIControlStateNormal]; - [smsLogin addTarget:self action:@selector(didTapSMS) forControlEvents:UIControlEventTouchUpInside]; - [self.view addSubview:smsLogin]; - [smsLogin mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.view).offset(-124); - make.size.mas_equalTo(CGSizeMake(48, 48)); - }]; -} - -- (void)setupEntrcyButtons { - UIButton *idBUtton = [self entrcyButton:LoginType_ID tapSelector:@selector(didTapEntrcyButton:)]; - UIStackView *stackView = [[UIStackView alloc] initWithArrangedSubviews:@[ - idBUtton, - [self entrcyButton:LoginType_Email tapSelector:@selector(didTapEntrcyButton:)], - [self entrcyButton:LoginType_Google tapSelector:@selector(didTapEntrcyButton:)], - [self entrcyButton:LoginType_Apple tapSelector:@selector(didTapEntrcyButton:)], - ]]; - stackView.axis = UILayoutConstraintAxisVertical; - stackView.distribution = UIStackViewDistributionFillEqually; - stackView.spacing = 14; - [self.view addSubview:stackView]; - [stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(34); - }]; - - [idBUtton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(294, 46)); - }]; -} - -- (UIButton *)entrcyButton:(LoginType)type tapSelector:(SEL)selector { - UIImageView *icon = [[UIImageView alloc] init]; - icon.contentMode = UIViewContentModeScaleAspectFill; - - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - button.frame = CGRectMake(0, 0, 294, 46); - button.tag = type; - [button addTarget:self action:selector forControlEvents:UIControlEventTouchUpInside]; - [button setCornerRadius:23]; - [button setBackgroundColor:[UIColor whiteColor]]; - [button.titleLabel setFont:kFontSemibold(14)]; - [button.titleLabel setAdjustsFontSizeToFitWidth:YES]; - [button setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateNormal]; - switch (type) { - case LoginType_ID:{ - [button setTitle:YMLocalizedString(@"1.0.37_text_26") forState:UIControlStateNormal]; - [icon setImage:kImage(@"login_page_id")]; - } - break; - case LoginType_Email:{ - [button setTitle:YMLocalizedString(@"20.20.51_text_1") forState:UIControlStateNormal]; - [icon setImage:kImage(@"login_page_mail")]; - } - break; - case LoginType_Google:{ - [button setTitle:YMLocalizedString(@"XPLoginViewController13") forState:UIControlStateNormal]; - [icon setImage:kImage(@"login_gmail")]; - } - break; - case LoginType_Apple:{ - [button setTitle:YMLocalizedString(@"XPLoginViewController12") forState:UIControlStateNormal]; - [icon setImage:kImage(@"mine_noble_center_apple")]; - } - break; - default: - break; - } - - [button addSubview:icon]; - [icon mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(button); - make.leading.mas_equalTo(15); - make.size.mas_equalTo(CGSizeMake(24, 24)); - }]; - - return button; -} - -#pragma mark - -- (void)didTapPolice:(NSString *)url { - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = url; - [self.navigationController pushViewController:webVC animated:YES]; -} - -- (void)didTapAgreeButton { - self.agreeButton.selected = !self.agreeButton.isSelected; - [self updatePolicySelectedStatus:self.agreeButton.isSelected]; - [self hidePolicyTips]; -} - -- (void)didTapSMS { - if (self.lastPolicySelectedStatus == NO) { - [self displayPolicyTips]; - return; - } - - LoginTypesViewController *vc = [[LoginTypesViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; - [vc updateLoginType:LoginDisplayType_phoneNum]; -} - -- (void)didTapEntrcyButton:(UIButton *)sender { - if (self.lastPolicySelectedStatus == NO) { - [self displayPolicyTips]; - return; - } - - switch (sender.tag) { - case LoginType_ID:{ - LoginTypesViewController *vc = [[LoginTypesViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; - [vc updateLoginType:LoginDisplayType_id]; - } - break; - case LoginType_Email: { - LoginTypesViewController *vc = [[LoginTypesViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; - [vc updateLoginType:LoginDisplayType_email]; - } - break; - case LoginType_Google: - [self.presenter thirdLoginByGoogleWithPresentingViewController:self - configuration:self.configuration]; - break; - case LoginType_Apple: - [self.presenter thirdLoginWithType:ThirdLoginType_Apple]; - break; - default: - break; - } -} - -- (void)didTapFeedback { - FeedBackViewController *vc = [[FeedBackViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; -} -#ifdef DEBUG -- (void)switchEnvironments { - PISwitchingEnvironmentVC *vc = [PISwitchingEnvironmentVC new]; - [self.navigationController pushViewController:vc animated:YES]; -} -#endif - -#pragma mark - LoginProtocol -- (void)loginThirdPartSuccess { - [self showSuccessToast:YMLocalizedString(@"XPLoginViewController4")]; - [PILoginManager loginWithVC:self isLoginPhone:NO]; - - // 登录成功后重新启动首充监控 - [[FirstRechargeManager sharedManager] startMonitoring]; -} - -- (void)loginSuccess { - // 登录成功后重新启动首充监控 - [[FirstRechargeManager sharedManager] startMonitoring]; -} - -#pragma mark - Polisy Status -- (void)loadPolicySelectedStatus { - // 默认 YES - [self updatePolicySelectedStatus:YES]; - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - self.lastPolicySelectedStatus = [defaults boolForKey:HadAgreePrivacy]; - self.agreeButton.selected = self.lastPolicySelectedStatus; -} - -- (void)updatePolicySelectedStatus:(BOOL)isSelected { - self.lastPolicySelectedStatus = isSelected; - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - [defaults setBool:isSelected forKey:HadAgreePrivacy]; -} - -- (void)displayPolicyTips { - [self.view addSubview:self.policyTips]; - [self.policyTips mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.view).offset(-82); - make.leading.trailing.mas_equalTo(self.view).inset(22); - make.height.mas_equalTo(64); - }]; -} - -- (void)hidePolicyTips { - [self.policyTips removeFromSuperview]; -} - -#pragma mark - Lazy init -- (UIButton *)agreeButton { - if(!_agreeButton) { - _agreeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_agreeButton setImage:[UIImage imageNamed:@"login_page_privacy_selected"] forState:UIControlStateSelected]; - [_agreeButton setImage:[UIImage imageNamed:@"login_page_privacy_unselected"] forState:UIControlStateNormal]; - [_agreeButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_agreeButton addTarget:self action:@selector(didTapAgreeButton) forControlEvents:UIControlEventTouchUpInside]; -// NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; -// NSString *hadAgree = [defaults objectForKey:HadAgreePrivacy]; -// if (hadAgree.length > 0) { -// _agreeBtn.selected = YES; -// } - _agreeButton.selected = YES; - } - return _agreeButton; -} - -- (YYLabel *)policyLabel { - if (!_policyLabel) { - _policyLabel = [[YYLabel alloc] init]; - _policyLabel.font = kFontRegular(12); - _policyLabel.numberOfLines = 0; - _policyLabel.preferredMaxLayoutWidth = KScreenWidth-40; - - NSMutableAttributedString *attString = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPLoginViewController6")]; - if ([[UIScreen mainScreen] bounds].size.width < 450 && (isMSPT() || isMSTR())) { - attString = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPLoginViewController6.1")]; - } - attString.yy_color = UIColorFromRGB(0x7B7B7D); - NSRange userRange = [attString.string rangeOfString:YMLocalizedString(@"XPLoginViewController7")]; - [attString addAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x313131)} range:userRange]; - @kWeakify(self); - [attString yy_setTextHighlightRange:userRange color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - @kStrongify(self); - // 跳转用户协议 - [self didTapPolice:URLWithType(kUserProtocalURL)]; - } longPressAction:nil]; - - NSRange andRange = [attString.string rangeOfString:YMLocalizedString(@"XPLoginViewController8")]; - [attString addAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x7B7B7D)} range:andRange]; - NSRange protocolRange = [attString.string rangeOfString:YMLocalizedString(@"XPLoginViewController9")]; - [attString addAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x313131)} range:protocolRange]; - - [attString yy_setTextHighlightRange:protocolRange color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - @kStrongify(self); - // 跳转隐私政策 - [self didTapPolice:URLWithType(kPrivacyURL)]; - } longPressAction:nil]; - - _policyLabel.attributedText = attString; - } - return _policyLabel; -} - -- (UIView *)policyTips { - if (!_policyTips) { - _policyTips = [[UIView alloc] init]; - [_policyTips setCornerRadius:8]; - [_policyTips setBackgroundColor:[UIColor colorWithWhite:0 alpha:0.5]]; - - UILabel *_policyTipsLabel = [[UILabel alloc] init]; - _policyTipsLabel.text = YMLocalizedString(@"XPLoginViewController11"); - _policyTipsLabel.font = kFontRegular(12); - _policyTipsLabel.textColor = UIColor.whiteColor; - _policyTipsLabel.numberOfLines = 0; - _policyTipsLabel.textAlignment = NSTextAlignmentCenter; - - [_policyTips addSubview:_policyTipsLabel]; - [_policyTipsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(_policyTips).insets(UIEdgeInsetsMake(8, 12, 8, 12)); - }]; - } - return _policyTips; -} - -- (GIDConfiguration *)configuration{ - if (!_configuration){ - static dispatch_once_t onceToken; - static NSString *decryptedNumber; - dispatch_once(&onceToken, ^{ - decryptedNumber = [AESUtils aesDecrypt:@"ScLBu7ctIiyGCKPro3Jj6XMdsdCCpNT9L4wyjHEF+bguqubkXNSayFBGMKmoDwe1hjfAc958XSaBdMyEaFXLO38Bwq3xURYVNpgEM4b14zg="]; - }); - _configuration = [[GIDConfiguration alloc] initWithClientID:decryptedNumber]; - } - return _configuration; -} - -- (UIImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[UIImageView alloc] initWithImage:kImage(@"login_page_logo")]; - } - return _logoImageView; -} - -- (UIButton *)feedBackButton { - UIButton *feedBackButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [feedBackButton setTitle:YMLocalizedString(@"XPMineFeedbackViewController0") forState:UIControlStateNormal]; - [feedBackButton setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateNormal]; - [feedBackButton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, 10)]; - feedBackButton.titleLabel.font = kFontRegular(12); - // 设置文本自适应，防止截断 -// feedBackButton.titleLabel.adjustsFontSizeToFitWidth = YES; -// feedBackButton.titleLabel.minimumScaleFactor = 0.8; -// feedBackButton.titleLabel.numberOfLines = 1; - [feedBackButton setBackgroundImage:[[UIImage imageWithColor:[UIColor whiteColor]] imageByApplyingAlpha:0.5] - forState:UIControlStateNormal]; - [feedBackButton setCornerRadius:10.5]; - [feedBackButton addTarget:self - action:@selector(didTapFeedback) - forControlEvents:UIControlEventTouchUpInside]; - [feedBackButton sizeToFit]; -// [feedBackButton enlargeTouchArea:UIEdgeInsetsMake(10, 10, 10, 10)]; - return feedBackButton; -} - -#if DEBUG -- (UIButton *)debugButton { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - b.frame = CGRectMake(0, 0, 84, 22); - [b setTitle:@"切换环境" forState:UIControlStateNormal]; - [b setTitleColor:[UIColor blueColor] forState:UIControlStateNormal]; - [self.view addSubview:b]; - [b addTarget:self action:@selector(switchEnvironments) forControlEvents:UIControlEventTouchUpInside]; - - - CAGradientLayer *gradientLayer = [CAGradientLayer layer]; - gradientLayer.frame = b.bounds; - gradientLayer.colors = @[ - (id)[UIColor redColor].CGColor, - (id)[UIColor blueColor].CGColor, - (id)[UIColor greenColor].CGColor - ]; - gradientLayer.startPoint = CGPointMake(0, 0.5); - gradientLayer.endPoint = CGPointMake(1, 0.5); - [b.layer addSublayer:gradientLayer]; - @kWeakify(self); - [NSTimer scheduledTimerWithTimeInterval:0.1 - repeats:YES - block:^(NSTimer * _Nonnull timer) { - @kStrongify(self); - if (!self) { - return; - } - NSArray *fromColors = gradientLayer.colors; - NSArray *toColors = [self shiftedColorsFromColors:fromColors]; - CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"colors"]; - animation.fromValue = fromColors; - animation.toValue = toColors; - animation.duration = 0.1; - animation.fillMode = kCAFillModeForwards; - animation.removedOnCompletion = NO; - [gradientLayer addAnimation:animation forKey:@"colorChange"]; - gradientLayer.colors = toColors; - }]; - - return b; -} - -- (NSArray *)shiftedColorsFromColors:(NSArray *)colors { - NSMutableArray *mutableColors = [colors mutableCopy]; - id firstColor = [mutableColors firstObject]; - [mutableColors xpSafeRemoveObjectAtIndex:0]; - [mutableColors addObject:firstColor]; - return [mutableColors copy]; -} -#endif - - - -@end diff --git a/YuMi/Modules/YMLogin/View/RegionListViewController.h b/YuMi/Modules/YMLogin/View/RegionListViewController.h deleted file mode 100644 index 4ec9a35..0000000 --- a/YuMi/Modules/YMLogin/View/RegionListViewController.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// RegionListViewController.h -// YuMi -// -// Created by P on 2024/12/13. -// - -#import "MvpViewController.h" -@class PIHomeCategoryTitleModel, RegionListInfo; -NS_ASSUME_NONNULL_BEGIN - -@interface RegionListViewController : MvpViewController - -@property(nonatomic, copy) void(^handleDismiss)(void); -@property(nonatomic, copy) void(^handleTapCategiryComfirm)(PIHomeCategoryTitleModel *tagModel); -@property(nonatomic, copy) void(^handleTapRegionComfirm)(RegionListInfo *regionInfo); - -- (instancetype)initForRegionList:(NSArray *)regionInfoList; -- (instancetype)initForHomeTags:(NSArray *)tags currentItem:(PIHomeCategoryTitleModel *)itemModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/RegionListViewController.m b/YuMi/Modules/YMLogin/View/RegionListViewController.m deleted file mode 100644 index 4174928..0000000 --- a/YuMi/Modules/YMLogin/View/RegionListViewController.m +++ /dev/null @@ -1,521 +0,0 @@ -// -// RegionListViewController.m -// YuMi -// -// Created by P on 2024/12/13. -// - -#import "RegionListViewController.h" - -#import "PIHomeCategoryTitleModel.h" -#import "LoginFullInfoPresenter.h" -#import "RegionListInfo.h" - -@interface RegionListCell : UICollectionViewCell - -@property(nonatomic, strong) RegionListInfo *regionModel; -@property(nonatomic, strong) PIHomeCategoryTitleModel *tagModel; - -@property(nonatomic, strong) UIView *selectedBG; -@property(nonatomic, strong) UIImageView *selectedMark; -@property(nonatomic, strong) NetImageView *flagImageView; -@property(nonatomic, strong) UILabel *titleLabel; - -+ (void)registerTo:(UICollectionView *)collectionView; -+ (RegionListCell *)cellFor:(UICollectionView *)collectionView indexPath:(NSIndexPath *)indexPath; - -@end - -@implementation RegionListCell -+ (void)registerTo:(UICollectionView *)collectionView { - [collectionView registerClass:[self class] forCellWithReuseIdentifier:NSStringFromClass([self class])]; -} - -+ (RegionListCell *)cellFor:(UICollectionView *)collectionView - indexPath:(NSIndexPath *)indexPath { - RegionListCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([self class]) - forIndexPath:indexPath]; -// [cell.contentView setBackgroundColor:UIColorFromRGB(0xF7F7F7)]; -// [cell setCornerRadius:19]; - return cell; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - - [self.contentView addSubview:self.flagImageView]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.selectedMark]; - - [self.flagImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(14); - make.centerY.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(30, 22)); - }]; - - [self.selectedMark mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-14); - make.centerY.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(20, 20)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.flagImageView.mas_trailing).offset(6); - make.trailing.mas_equalTo(self.selectedMark.mas_leading).offset(-6); - make.centerY.mas_equalTo(self.contentView); - make.height.mas_equalTo(20); - }]; - - UIView *line = [[UIView alloc] init]; - line.backgroundColor = UIColorFromRGB(0xe4e4e4); - [self.contentView addSubview:line]; - [line mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.contentView); - make.trailing.mas_equalTo(self.selectedMark); - make.leading.mas_equalTo(self.flagImageView); - make.height.mas_equalTo(1); - }]; - -// [self.contentView addSubview:self.selectedBG]; -// [self.selectedBG mas_makeConstraints:^(MASConstraintMaker *make) { -// make.edges.mas_equalTo(self.contentView); -// }]; - } - return self; -} - -- (void)setSelected:(BOOL)selected { - [super setSelected:selected]; - -// self.selectedBG.hidden = !selected; - self.selectedMark.hidden = !selected; - -// if (selected) { -// [self.contentView setBackgroundColor:UIColorFromRGB(0xFFFAF5)]; -// } else { -// [self.contentView setBackgroundColor:UIColorFromRGB(0xF7F7F7)]; -// } -} - -- (void)prepareForReuse { - [super prepareForReuse]; - self.flagImageView.image = nil; -} - -- (void)setTagModel:(PIHomeCategoryTitleModel *)tagModel { - _tagModel = tagModel; - self.flagImageView.imageUrl = tagModel.icon; - self.titleLabel.text = tagModel.name; - - [self.flagImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(14); - make.centerY.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(40, 30)); - }]; -} - -- (void)setRegionModel:(RegionListInfo *)regionModel { - _regionModel = regionModel; - self.flagImageView.imageUrl = regionModel.icon; - self.titleLabel.text = regionModel.name; -} - -#pragma mark - -- (UIView *)selectedBG { - if (!_selectedBG) { - _selectedBG = [[UIView alloc] init]; - [_selectedBG setCornerRadius:19 - corners:kCALayerMaxXMaxYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMinXMinYCorner - borderWidth:1 - borderColor:UIColorFromRGB(0xFF8C03)]; - _selectedBG.hidden = YES; - } - return _selectedBG; -} - -- (NetImageView *)flagImageView { - if (!_flagImageView) { - _flagImageView = [[NetImageView alloc] init]; - _flagImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _flagImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:UIColorFromRGB(0x313131)]; - } - return _titleLabel; -} - -- (UIImageView *)selectedMark { - if (!_selectedMark) { - _selectedMark = [[UIImageView alloc] initWithImage:kImage(@"region_list_selected")]; - _selectedMark.hidden = YES; - } - return _selectedMark; -} - -@end - -@interface RegionListViewController () - -@property(nonatomic, assign) NSInteger type; -@property(nonatomic, assign) CGFloat displayHeight; -@property(nonatomic, strong) UILabel *titleLabel; -@property(nonatomic, strong) UISearchBar *searchBar; -@property(nonatomic, strong) UICollectionView *collectionView; -@property(nonatomic, strong) UIButton *comfirmButton; -@property(nonatomic, strong) UIView *bgView; -@property(nonatomic, strong) UIView *emptyView; - -@property(nonatomic, copy) NSArray *tagDataSource; -@property(nonatomic, strong) PIHomeCategoryTitleModel *selectedTag; - -@property(nonatomic, copy) NSArray *regionList; -@property(nonatomic, strong) NSMutableArray *filteredRegionList; -@property(nonatomic, strong) RegionListInfo *selectedRegion; - -@property(nonatomic, assign) NSInteger defaultIndex; - -@end - -@implementation RegionListViewController - -- (LoginFullInfoPresenter *)createPresenter { - return [[LoginFullInfoPresenter alloc] init]; -} - -- (instancetype)initForRegionList:(NSArray *)regionInfoList { - if (self = [super init]) { - self.type = 1; - self.displayHeight = KScreenHeight/2; - self.regionList = regionInfoList; - self.filteredRegionList = [regionInfoList mutableCopy]; - - [self.collectionView reloadData]; - } - return self; -} -- (instancetype)initForHomeTags:(NSArray *)tags - currentItem:(nonnull PIHomeCategoryTitleModel *)itemModel { - if (self = [super init]) { - self.type = 2; - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - self.displayHeight = KScreenHeight*2/3; - - NSMutableArray *temp = @[].mutableCopy; - for (PIHomeCategoryTitleModel *model in tags) { - if (![NSString isEmpty:model.regionId]) { - [temp addObject:model]; - } - } - - self.defaultIndex = [temp indexOfObject:itemModel]; - self.selectedTag = itemModel; - self.tagDataSource = temp; - - [self.collectionView reloadData]; - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self.collectionView selectItemAtIndexPath:[NSIndexPath indexPathForRow:self.defaultIndex inSection:0] - animated:NO - scrollPosition:UICollectionViewScrollPositionNone]; - }); - - } - return self; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = YMLocalizedString(@"1.0.31_text_1"); - switch (self.type) { - case 1: - [self setupUIForFullDisplay]; - break; - case 2: - [self setupUIForHalfScreen]; - break; - - default: - break; - } -} - -- (void)setupUIForFullDisplay { - self.view.backgroundColor = [UIColor whiteColor]; - -// self.comfirmButton.frame = CGRectMake(0, 0, 48, 44); -// UIBarButtonItem *rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:self.comfirmButton]; -// self.navigationItem.rightBarButtonItem = rightBarButtonItem; - - [self.view addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(10); - make.centerX.mas_equalTo(self.view); - make.height.mas_equalTo(34); - }]; - - [self.view addSubview:self.comfirmButton]; - [self.comfirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.titleLabel); - make.trailing.mas_equalTo(-15); - }]; - - [self.view addSubview:self.searchBar]; - [self.searchBar mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(10); - make.leading.trailing.mas_equalTo(self.view).inset(16); - make.height.mas_equalTo(34); - }]; - - [self.view addSubview:self.collectionView]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.searchBar.mas_bottom).offset(8); - make.bottom.leading.trailing.mas_equalTo(0); - }]; - - [self.view addSubview:self.emptyView]; - [self.emptyView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.collectionView).offset(8); - make.centerX.mas_equalTo(self.collectionView); - make.size.mas_equalTo(CGSizeMake(120, 120)); - }]; -} - -- (void)setupUIForHalfScreen { - self.view.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - - [self.view addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(KScreenHeight - self.displayHeight); - make.centerX.mas_equalTo(self.view); - make.height.mas_equalTo(34); - }]; - - [self.view addSubview:self.comfirmButton]; - [self.comfirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.titleLabel); - make.trailing.mas_equalTo(-15); - }]; - - [self.view addSubview:self.collectionView]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(8); - make.bottom.leading.trailing.mas_equalTo(0); - }]; - - [self.view insertSubview:self.bgView belowSubview:self.titleLabel]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel).offset(-10); - make.leading.bottom.trailing.mas_equalTo(self.view); - }]; - - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b addTarget:self action:@selector(didTapSpace) forControlEvents:UIControlEventTouchUpInside]; - [self.view insertSubview:b atIndex:0]; - [b mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(KScreenHeight/2); - }]; -} - -- (void)didTapComfirm { - if (self.type == 1) { - if (self.handleTapRegionComfirm) { - self.handleTapRegionComfirm(self.selectedRegion); - } - - } else if (self.type == 2) { - if (self.handleTapCategiryComfirm) { - self.handleTapCategiryComfirm(self.selectedTag); - } - } - [self dismissViewControllerAnimated:YES completion:^{}]; -} - -- (void)didTapSpace { - @kWeakify(self); - [self dismissViewControllerAnimated:YES completion:^{ - @kStrongify(self); - if (self.handleDismiss) { - self.handleDismiss(); - } - }]; -} - -#pragma mark - UISearchBarDelegate -// 当点击 "Search" 按钮时触发 -- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar { - [searchBar resignFirstResponder]; // 收起键盘 -} - -- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText { - if (searchText.length == 0) { - // 输入为空时，显示原始数据 - self.filteredRegionList = [self.regionList copy]; - } else { - // 过滤数据 - NSPredicate *predicate = [NSPredicate predicateWithFormat:@"name CONTAINS[cd] %@", searchText]; - self.filteredRegionList = [[self.regionList filteredArrayUsingPredicate:predicate] mutableCopy]; - } - [self.collectionView reloadData]; - - self.emptyView.hidden = self.filteredRegionList.count > 0; -} - -// 点击取消按钮时重置数据 -- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar { - [searchBar resignFirstResponder]; - searchBar.text = @""; - self.filteredRegionList = [self.regionList mutableCopy]; - [self.collectionView reloadData]; -} - -#pragma mark - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - if (self.type == 1) { - return self.filteredRegionList.count; - } else if (self.type == 2) { - return self.tagDataSource.count; - } - return 0; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - RegionListCell *cell = [RegionListCell cellFor:collectionView indexPath:indexPath]; - if (self.type == 1) { - cell.regionModel = [self.filteredRegionList xpSafeObjectAtIndex:indexPath.row]; - } else if (self.type == 2) { - cell.tagModel = [self.tagDataSource xpSafeObjectAtIndex:indexPath.row]; - } - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.type == 1) { - self.selectedRegion = [self.filteredRegionList xpSafeObjectAtIndex:indexPath.row]; - } else if (self.type == 2) { - self.selectedTag = [self.tagDataSource xpSafeObjectAtIndex:indexPath.row]; - if (self.handleTapCategiryComfirm) { - self.handleTapCategiryComfirm(self.selectedTag); - } - } -} - -#pragma mark - -- (UISearchBar *)searchBar { - if (!_searchBar) { - UIColor *bgColor = UIColorFromRGB(0xf4f4f4); - _searchBar = [[UISearchBar alloc] init]; - _searchBar.delegate = self; - _searchBar.placeholder = YMLocalizedString(@"XPHomeSearchNavView1"); - _searchBar.barTintColor = bgColor; - [_searchBar setCornerRadius:34/2]; - if (@available(iOS 13.0, *)) { - _searchBar.searchTextField.backgroundColor = bgColor; - _searchBar.searchTextField.textColor = UIColorFromRGB(0x313131); - } else { - UITextField *searchField = [self findTextFieldInSearchBar:_searchBar]; - if (searchField) { - searchField.backgroundColor = bgColor; - searchField.textColor = UIColorFromRGB(0x313131); - } - } - } - return _searchBar; -} - -- (UICollectionView *)collectionView { - if (!_collectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; -// if (self.type == 1) { - layout.itemSize = CGSizeMake(KScreenWidth - 30, 48); -// } else if (self.type == 2) { -// layout.itemSize = CGSizeMake(kGetScaleWidth(166), 38); -// } - - layout.sectionInset = UIEdgeInsetsMake(0, 16, kSafeAreaBottomHeight, 16); - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 10; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 44, KScreenWidth, KScreenHeight-44) - collectionViewLayout:layout]; - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.backgroundColor = [UIColor whiteColor]; - [RegionListCell registerTo:_collectionView]; - } - return _collectionView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.31_text_2") - font:kFontSemibold(16) - textColor:UIColorFromRGB(0x313131)]; - } - return _titleLabel; -} - -- (UIButton *)comfirmButton { - if (!_comfirmButton) { - _comfirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_comfirmButton setTitleColor:UIColorFromRGB(0xFF8C03) forState:UIControlStateNormal]; - [_comfirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - [_comfirmButton addTarget:self - action:@selector(didTapComfirm) - forControlEvents:UIControlEventTouchUpInside]; - } - return _comfirmButton; -} - -- (UITextField *)findTextFieldInSearchBar:(UISearchBar *)searchBar { - for (UIView *subview in searchBar.subviews) { - for (UIView *nestedSubview in subview.subviews) { - if ([nestedSubview isKindOfClass:[UITextField class]]) { - return (UITextField *)nestedSubview; - } - } - } - return nil; -} - -- (UIView *)bgView { - if (!_bgView) { - UIView *bg = [[UIView alloc] init]; - bg.backgroundColor = [UIColor whiteColor]; - [bg setCornerRadius:16 cornerMask:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner]; - bg.userInteractionEnabled = NO; - _bgView = bg; - } - return _bgView; -} - -- (UIView *)emptyView { - if (!_emptyView) { - _emptyView = [[UIView alloc] init]; - UIImageView *icon = [[UIImageView alloc] initWithImage:[UIImageConstant defaultEmptyPlaceholder_UFO]]; - [_emptyView addSubview:icon]; - [icon mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerX.mas_equalTo(_emptyView); - make.size.mas_equalTo(CGSizeMake(80, 80)); - }]; - - UILabel *emptyTitle = [UILabel labelInitWithText:YMLocalizedString(@"XPMomentsRecommendViewController0") - font:kFontRegular(14) - textColor:[UIColor colorWithWhite:0 alpha:0.4]]; - emptyTitle.textAlignment = NSTextAlignmentCenter; - [_emptyView addSubview:emptyTitle]; - [emptyTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(_emptyView); - make.top.mas_equalTo(icon.mas_bottom).offset(6); - make.height.mas_equalTo(22); - }]; - - _emptyView.hidden = YES; - } - return _emptyView; -} -@end diff --git a/YuMi/Modules/YMLogin/View/XPLoginBindPhoneResultViewController.h b/YuMi/Modules/YMLogin/View/XPLoginBindPhoneResultViewController.h deleted file mode 100644 index 72cdc31..0000000 --- a/YuMi/Modules/YMLogin/View/XPLoginBindPhoneResultViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMLoginBindPhoneResultViewController.h -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel; -@interface XPLoginBindPhoneResultViewController : BaseViewController -@property (nonatomic, strong) UserInfoModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/XPLoginBindPhoneResultViewController.m b/YuMi/Modules/YMLogin/View/XPLoginBindPhoneResultViewController.m deleted file mode 100644 index 8750e8b..0000000 --- a/YuMi/Modules/YMLogin/View/XPLoginBindPhoneResultViewController.m +++ /dev/null @@ -1,128 +0,0 @@ -// -// XPLoginBindPhoneResultViewController.m -// xplan-ios -// -// Created by 冯硕 on 2021/9/17. -// - -#import "XPLoginBindPhoneResultViewController.h" -///Third -#import -#import -///Tool -#import "UIImage+Utils.h" -///Model -#import "UserInfoModel.h" -///VC -#import "XPLoginVerifBindPhoneViewController.h" -@interface XPLoginBindPhoneResultViewController () - -@property (nonatomic, strong) UIView *containerView; -@property (nonatomic, strong) UIImageView *iconImageView; -@property (nonatomic, strong) UILabel *phoneLabel; -@property (nonatomic, strong) UIButton *changePhoneBtn; - -@end - -@implementation XPLoginBindPhoneResultViewController - - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initViews]; - [self setUpConstraints]; - [self setConfigs]; -} - -#pragma mark - Private Method -- (void)initViews { - [self.view addSubview:self.containerView]; - [self.containerView addSubview:self.iconImageView]; - [self.containerView addSubview:self.phoneLabel]; - [self.containerView addSubview:self.changePhoneBtn]; -} - -- (void)setConfigs { - self.title = YMLocalizedString(@"XPLoginBindPhoneResultViewController0"); - NSMutableAttributedString *titleAtt = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPLoginBindPhoneResultViewController1") attributes:@{NSFontAttributeName:kFontSemibold(16),NSForegroundColorAttributeName:[DJDKMIMOMColor inputTextColor]}]; - NSString *phone = self.userInfo.phone.length > 0 ? self.userInfo.phone : @""; - NSAttributedString *phoneAtt = [[NSAttributedString alloc]initWithString:[NSString stringWithFormat:@"\n%@ %@",self.userInfo.phoneAreaCode, phone] attributes:@{NSFontAttributeName:kFontSemibold(16),NSForegroundColorAttributeName:UIColorFromRGB(0x9168FA)}]; - [titleAtt appendAttributedString:phoneAtt]; - self.phoneLabel.attributedText = titleAtt; -} - -- (void)setUpConstraints { - [self.containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); - }]; - - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(30)); - make.centerX.mas_equalTo(0); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(164), kGetScaleWidth(112))); - }]; - - - - [self.phoneLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(184)); - make.centerX.equalTo(self.containerView); - }]; - [self.changePhoneBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.phoneLabel.mas_bottom).offset(kGetScaleWidth(47)); - make.leading.trailing.mas_equalTo(0).inset(15); - make.centerX.mas_equalTo(0); - make.height.mas_equalTo(kGetScaleWidth(46)); - }]; -} -#pragma mark - Event Response -- (void)changePhoneBtnAction:(UIButton *)sender { - XPLoginVerifBindPhoneViewController *vc = [[XPLoginVerifBindPhoneViewController alloc] init]; - vc.userInfo = self.userInfo; - vc.bindingPhoneNumType = XPBindingPhoneNumTypeConfirm; - [self.navigationController pushViewController:vc animated:YES]; -} - -#pragma mark - Getters And Setters -- (UIView *)containerView{ - if (!_containerView) { - _containerView = [[UIView alloc] init]; - _containerView.backgroundColor = [UIColor whiteColor]; - } - return _containerView; -} - -- (UIImageView *)iconImageView{ - if (!_iconImageView) { - _iconImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"login_bind_phone_bg"]]; - } - return _iconImageView; -} - - - -- (UILabel *)phoneLabel{ - if (!_phoneLabel) { - _phoneLabel = [[UILabel alloc] init]; - _phoneLabel.textAlignment = NSTextAlignmentCenter; - _phoneLabel.numberOfLines = 0; - } - return _phoneLabel; -} - -- (UIButton *)changePhoneBtn { - if (!_changePhoneBtn) { - _changePhoneBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_changePhoneBtn setTitle:YMLocalizedString(@"XPLoginBindPhoneResultViewController2") forState:UIControlStateNormal]; - [_changePhoneBtn setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_changePhoneBtn.titleLabel setFont:kFontRegular(16)]; - [_changePhoneBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _changePhoneBtn.layer.masksToBounds = YES; - _changePhoneBtn.layer.cornerRadius = kGetScaleWidth(23); - [_changePhoneBtn addTarget:self action:@selector(changePhoneBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _changePhoneBtn; -} - - -@end diff --git a/YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.h b/YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.h deleted file mode 100644 index 46b6d59..0000000 --- a/YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// XPLoginVerifBindPhoneViewController.h -// xplan-ios -// -// Created by 冯硕 on 2021/9/18. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -/** - 手机号绑定的类型 - - TTBindingPhoneNumTypeNormal: 普通状态，首次绑定 - - TTBindingPhoneNumTypeConfirm : 验证状态：验证已绑定的手机 - */ -typedef NS_ENUM(NSUInteger, TTBindingPhoneNumType) { - XPBindingPhoneNumTypeNormal = 0, - XPBindingPhoneNumTypeEdit = 1, - XPBindingPhoneNumTypeConfirm = 2, -}; -@class UserInfoModel; -@interface XPLoginVerifBindPhoneViewController : MvpViewController -@property (nonatomic, assign) TTBindingPhoneNumType bindingPhoneNumType; -@property(nonatomic,assign) BOOL isLogout; -///用户信息 -@property (nonatomic, strong) UserInfoModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.m b/YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.m deleted file mode 100644 index 24ccef0..0000000 --- a/YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.m +++ /dev/null @@ -1,289 +0,0 @@ -// -// XPLoginVerifBindPhoneViewController.m -// xplan-ios -// -// Created by 冯硕 on 2021/9/18. -// - -#import "XPLoginVerifBindPhoneViewController.h" -///Third -#import -#import -///Tool - - -#import "UIImage+Utils.h" -#import "CountDownHelper.h" -///Model -#import "UserInfoModel.h" -///P -#import "XPLoginVerifBindPhoneProtocol.h" -#import "XPLoginVerifBindPhonePresenter.h" -///VC -#import "LoginBindPhoneViewController.h" -#import "XPMineSettingViewController.h" -///View -#import "XPLoginBindSuccessView.h" -#import "LoginForgetEditView.h" -#import "XPLoginAraeViewController.h" -#import "XPMineLoginPasswordViewController.h" - -@interface XPLoginVerifBindPhoneViewController () - -///手机号 -@property (nonatomic,strong) LoginForgetEditView *phoneView; -///验证码 -@property (nonatomic,strong) LoginForgetEditView *codeView; -///手机区号 -@property (nonatomic,copy)NSString *pi_phoneAreaCode; -// 确认按钮 -@property (nonatomic, strong) UIButton *confirmBtn; -// 重新绑定手机 -@property (nonatomic, assign) BOOL isResetPhone; -@end - -@implementation XPLoginVerifBindPhoneViewController - -- (void)dealloc { - [[CountDownHelper shareHelper] stopCountDown]; -} - -- (XPLoginVerifBindPhonePresenter *)createPresenter { - return [[XPLoginVerifBindPhonePresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - NSString *code = [NSString getCountryCode]; - self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""]; - [self initSubViews]; - [self initSubViewConstraints]; - [self setConfigs]; - [self setEvents]; -} - -- (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; - [[CountDownHelper shareHelper] stopCountDown]; - self.codeView.authCodeButton.enabled= YES; - [self.codeView.authCodeButton setTitle:YMLocalizedString(@"XPLoginVerifBindPhoneViewController11") forState:UIControlStateNormal]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [CountDownHelper shareHelper].delegate = self; - self.view.backgroundColor = [UIColor whiteColor]; - [self.view addSubview:self.codeView]; - [self.view addSubview:self.phoneView]; - [self.view addSubview:self.confirmBtn]; - -} - -- (void)initSubViewConstraints { - [self.phoneView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(30)); - make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(48)); - }]; - [self.codeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.height.equalTo(self.phoneView); - make.top.equalTo(self.phoneView.mas_bottom).mas_offset(kGetScaleWidth(25)); - }]; - [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(46)); - make.top.mas_equalTo(kGetScaleWidth(275)); - }]; -} -#pragma mark -配置 -- (void)setConfigs { - switch (self.bindingPhoneNumType) { - case XPBindingPhoneNumTypeEdit:{ - self.navigationItem.title = YMLocalizedString(@"XPLoginVerifBindPhoneViewController0"); - } - break; - case XPBindingPhoneNumTypeNormal:{ - self.navigationItem.title = YMLocalizedString(@"XPLoginVerifBindPhoneViewController1"); - } - break; - case XPBindingPhoneNumTypeConfirm:{ - - self.navigationItem.title = YMLocalizedString(@"XPLoginVerifBindPhoneViewController2"); - [self.confirmBtn setTitle:YMLocalizedString(@"XPLoginVerifBindPhoneViewController3") forState:UIControlStateNormal]; - if (self.userInfo.isBindPhone) { -// self.phoneNumTextField.enabled = NO; -// self.phoneNumTextField.text = self.userInfo.phone; - } - } - break; - default: - break; - } - - RAC(self.confirmBtn,enabled) = [RACSignal combineLatest:@[self.phoneView.textField.rac_textSignal,self.codeView.textField.rac_textSignal] reduce:^(NSString *phone,NSString *code){ - return @(phone.length > 0 && code.length == 5); - }]; - -} - -#pragma mark - XPChooseAreaCodeVCDelegate --(void)chooseAreaCodeSuccess:(NSString *)code{ - self.pi_phoneAreaCode = code; - self.phoneView.areaCode = [NSString stringWithFormat:@"+%@",code]; -} --(void)chooseAreaCodeAction{ - XPLoginAraeViewController *codeVC = [XPLoginAraeViewController new]; - codeVC.delegate = self; - [self.navigationController pushViewController:codeVC animated:YES]; -} -#pragma mark 交互事件 -- (void)setEvents { - @weakify(self) - // 获取验证码点击事件 - [[[self.codeView.authCodeButton rac_signalForControlEvents:UIControlEventTouchUpInside] filter:^BOOL(__kindof UIControl * _Nullable value) { - // 获取验证码 - if (self.phoneView.textField.text.length == 0) { - [self showErrorToast:YMLocalizedString(@"XPLoginVerifBindPhoneViewController4")]; - return NO; - } - return YES; - }] subscribeNext:^(id _Nullable x) { - @strongify(self); - [self.presenter phoneSmsCode:[NSString stringWithFormat:@"%@%@",self.pi_phoneAreaCode,self.phoneView.textField.text] type:self.bindingPhoneNumType == XPBindingPhoneNumTypeConfirm ? GetSmsType_Unbind_Phone : GetSmsType_Bind_Phone phoneAreaCode:self.pi_phoneAreaCode]; - }]; - -// // 绑定和验证 - [[[self.confirmBtn rac_signalForControlEvents:UIControlEventTouchUpInside] filter:^BOOL(__kindof UIControl * _Nullable value) { - @strongify(self) - // 确认绑定手机号 - if (self.phoneView.textField.text.length == 0) { - [self showErrorToast:YMLocalizedString(@"XPLoginVerifBindPhoneViewController6")]; - return NO; - }else if (self.codeView.textField.text.length == 0) { - [self showErrorToast:YMLocalizedString(@"XPLoginVerifBindPhoneViewController7")]; - return NO; - }else { - return YES; - } - }] subscribeNext:^(id _Nullable x) { - @strongify(self) - [self.view endEditing:YES]; - if (self.bindingPhoneNumType == XPBindingPhoneNumTypeConfirm) { - [self.presenter checkMoblieCodeWithMoblie:[NSString stringWithFormat:@"%@%@",self.pi_phoneAreaCode,self.phoneView.textField.text] code:self.codeView.textField.text phoneAreaCode:self.pi_phoneAreaCode]; - } else { - [self.presenter bindkMoblieCodeWithMoblie:[NSString stringWithFormat:@"%@%@",self.pi_phoneAreaCode,self.phoneView.textField.text] code:self.codeView.textField.text phoneAreaCode:self.pi_phoneAreaCode]; - } - } error:^(NSError * _Nullable error) { - - }]; -} - -#pragma mark - XPLoginVerifBindPhoneProtocol -- (void)phoneSmsCodeSuccess { - self.codeView.authCodeButton.enabled = NO; - [self showSuccessToast:YMLocalizedString(@"XPLoginVerifBindPhoneViewController8")]; - [[CountDownHelper shareHelper] openCountdownWithTime:60]; -} - -- (void)checkMoblieCodeWithMoblieSuccess { - [self showSuccessToast:YMLocalizedString(@"XPLoginVerifBindPhoneViewController9")]; - [[CountDownHelper shareHelper] stopCountDown]; - XPLoginVerifBindPhoneViewController *vc = [[XPLoginVerifBindPhoneViewController alloc] init]; - vc.bindingPhoneNumType = XPBindingPhoneNumTypeEdit; - vc.userInfo = self.userInfo; - [self.navigationController pushViewController:vc animated:YES]; -} - -- (void)bindMoblieCodeWithMoblieSuccess { - - [[CountDownHelper shareHelper] stopCountDown]; - // 修改绑定信息 - if (self.bindingPhoneNumType == XPBindingPhoneNumTypeEdit) { - @weakify(self); - [XPLoginBindSuccessView showBindSuccessViewWithHandler:^{ - @strongify(self); - // 返回设置页面 - __block __kindof UIViewController *vc; - [self.navigationController.childViewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPMineSettingViewController class]]) { - vc = obj; // 导航控制器中有设置VC - } - }]; - - if ([self.navigationController.childViewControllers containsObject:vc]) { - [self.navigationController popToViewController:vc animated:YES]; - } else { - [self.navigationController popViewControllerAnimated:YES]; - } - }]; - } else if (self.bindingPhoneNumType == XPBindingPhoneNumTypeNormal) { - @weakify(self); - if(self.isLogout == YES){ - XPMineLoginPasswordViewController *vc = [[XPMineLoginPasswordViewController alloc] init]; - vc.userInfo = self.userInfo; - vc.isModifiPwd = NO; - vc.isLogout = YES; - [self.navigationController pushViewController:vc animated:YES]; - return; - } - - - [XPLoginBindSuccessView showBindSuccessViewWithHandler:^{ - @strongify(self); - [self.navigationController popViewControllerAnimated:YES]; - }]; - } - self.confirmBtn.enabled = YES; // 打开交互 -} - - -#pragma mark - CountDownHelperDelegate -///倒计时进行中 -- (void)onCountdownOpen:(int)time { - [self.codeView.authCodeButton setTitle:[NSString stringWithFormat:YMLocalizedString(@"XPLoginVerifBindPhoneViewController10"), time] forState:UIControlStateDisabled]; -} -///倒计时结束 -- (void)onCountdownFinish { - self.codeView.authCodeButton.enabled= YES; - [self.codeView.authCodeButton setTitle:YMLocalizedString(@"XPLoginVerifBindPhoneViewController11") forState:UIControlStateNormal]; -} - -#pragma mark - Getters And Setters - -- (UIButton *)confirmBtn { - if (!_confirmBtn) { - _confirmBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_confirmBtn setTitle:YMLocalizedString(@"XPLoginVerifBindPhoneViewController14") forState:UIControlStateNormal]; - [_confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateDisabled]; - [_confirmBtn.titleLabel setFont:kFontRegular(16)]; - _confirmBtn.layer.cornerRadius = kGetScaleWidth(23); - _confirmBtn.layer.masksToBounds = YES; - _confirmBtn.enabled = NO; - [_confirmBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - - } - return _confirmBtn; -} - -- (LoginForgetEditView *)phoneView { - if (!_phoneView) { - _phoneView = [[LoginForgetEditView alloc] init]; -// _phoneView.placeholder = YMLocalizedString(@"LoginForgetPasswordViewController7"); - _phoneView.type = LoginForgetEditViewTypeNormal; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(chooseAreaCodeAction)]; - [_phoneView.codeView addGestureRecognizer:tap]; - } - return _phoneView; -} - -- (LoginForgetEditView *)codeView { - if (!_codeView) { - _codeView = [[LoginForgetEditView alloc] init]; - _codeView.placeholder = YMLocalizedString(@"XPLoginVerifBindPhoneViewController17"); - _codeView.type = LoginForgetEditViewTypeSms; - } - return _codeView; -} - -@end diff --git a/YuMi/Modules/YMMessage/Api/Api+Message.h b/YuMi/Modules/YMMessage/Api/Api+Message.h deleted file mode 100644 index 81a3c06..0000000 --- a/YuMi/Modules/YMMessage/Api/Api+Message.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// Api+Message.h -// YUMI -// -// Created by zu on 2021/12/8. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (Message) - -+ (void)getChatLimit:(HttpRequestHelperCompletion)completion receiverUid:(NSString *)receiverUid; - -+ (void)checkLimit:(HttpRequestHelperCompletion)completion receiverUid:(NSString *)receiverUid; - -+ (void)sendRoomImageMessage:(HttpRequestHelperCompletion)completion picUrl:(NSString *)picUrl roomUid:(NSInteger)roomUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Api/Api+Message.m b/YuMi/Modules/YMMessage/Api/Api+Message.m deleted file mode 100644 index eebb6e9..0000000 --- a/YuMi/Modules/YMMessage/Api/Api+Message.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// Api+Message.m -// YUMI -// -// Created by zu on 2021/12/8. -// - -#import "Api+Message.h" -#import -@implementation Api (Message) - -+ (void)getChatLimit:(HttpRequestHelperCompletion)completion receiverUid:(NSString *)receiverUid { - NSString * fang = [NSString stringFromBase64String:@"cHJpdmF0ZUNoYXQvbGltaXQ="];///privateChat/limit - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, receiverUid,nil]; -} - -+ (void)checkLimit:(HttpRequestHelperCompletion)completion receiverUid:(NSString *)receiverUid { - [self makeRequest:@"privateChat/limitV2" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, receiverUid,nil]; -} - -+ (void)sendRoomImageMessage:(HttpRequestHelperCompletion)completion picUrl:(NSString *)picUrl roomUid:(NSInteger)roomUid { - [self makeRequest:@"roomScreen/sendPic" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, picUrl, @(roomUid), nil]; -} - - -@end diff --git a/YuMi/Modules/YMMessage/Model/AttachmentModel.h b/YuMi/Modules/YMMessage/Model/AttachmentModel.h deleted file mode 100644 index 0cac04d..0000000 --- a/YuMi/Modules/YMMessage/Model/AttachmentModel.h +++ /dev/null @@ -1,821 +0,0 @@ -// -// AttachmentModel.h -// YUMI -// -// Created by YUMI on 2021/11/16. -// - -#import -#import -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, CustomMessageType) { - ///房间提示 - CustomMessageType_Room_Tip = 2, - ///送礼物的接口 - CustomMessageType_Gift = 3, - ///账户更新 - CustomMessageType_Account = 5, - ///关注的主播上线 - CustomMessageType_Member_Online = 6, - ///队列操作 - CustomMessageType_Queue = 8, - ///表情 - CustomMessageType_Face = 9, - ///推文 - CustomMessageType_Tweet = 10, - ///全麦送 - CustomMessageType_AllMicroSend = 12, - ///座驾相關通知 - CustomMessageType_Car_Notify = 15, - ///踢出房间 - CustomMessageType_Kick_User = 18, - ///小秘书消息 - CustomMessageType_Secretary = 19, - ///房间信息更新 - CustomMessageType_Update_RoomInfo = 20, - ///应用内分享 - CustomMessageType_Application_Share = 22, - ///系统通知，自定义布局消息（带确认、取消） - CustomMessageType_Message_Handle = 23, - ///用户升级 - CustomMessageType_User_UpGrade = 24, - ///糖果树 - CustomMessageType_Candy_Tree = 26, - ///排麦 - CustomMessageType_Arrange_Mic = 30, - ///房间内PK - CustomMessageType_Room_PK = 31, - ///家族 - CustomMessageType_Hall = 32, - ///房间礼物值 - CustomMessageType_Room_GiftValue = 42, - ///版本升级 - CustomMessageType_Version_Update = 49, - ///公会超管 - CustomMessageType_Hall_Super_Admin = 50, - ///动态 - CustomMessageType_Monents = 52, - ///收藏 - CustomMessageType_Collection_Room = 59, - ///房间红包 - CustomMessageType_RedPacket = 60, - ///福袋消息 - CustomMessageType_LuckyBag = 61, - ///发现萌新 - CustomMessageType_FindNew = 62, - ///房间火箭 - CustomMessageType_RoomBoom = 63, - /// CP 礼物 - CustomMessageType_CP = 64, - /// 房间活动 - CustomMessageType_Public_Event = 68, - ///塔罗 - CustomMessageType_Tarot = 71, - ///相亲 - CustomMessageType_RoomPlay_Dating = 72, - ///私聊风险提醒 - CustomMessageType_Chat_Risk_Alert = 75, - ///首充奖励 - CustomMessageType_First_Recharge_Reward = 76, - ///访客记录 - CustomMessageType_First_VisitorRecord = 78, - ///航海 - CustomMessageType_Room_Sailing = 81, - ///跨房PK - CustomMessageType_Across_Room_PK = 83, - ///VIPVIP - CustomMessageType_Noble_VIP = 85, - ///个播房观众点击空坑位，房主收到请求上麦提示 - CustomMessageType_AnchorRoom_AudienceUpMic = 86, - ///技能卡 - CustomMessageType_Skill_Card = 87, - ///个播小时榜 - CustomMessageType_Anchor_Hour_Rank = 89, - ///个播粉丝团 - CustomMessageType_Anchor_FansTeam = 90, - ///牌照房小时榜 - CustomMessageType_License_Hour_Rank = 91, - ///任务完成通知 - CustomMessageType_Task_Complete = 92, - ///礼物合成 - CustomMessageType_Gift_Compound = 93, - ///涂鸦礼物 - CustomMessageType_Graffiti_Gift = 94, - - ///免费礼物倒计时重置时间 - CustomMessageType_Free_Gift_Star_Reset_Time = 96, - ///精灵密藏 -// CustomMessageType_Treasure_Fairy = 97, - ///寻爱之旅 - CustomMessageType_Look_Love = 98, - ///联系客服 - CustomMessageType_Service_Reply = 99, - ///通用h5 - CustomMessageType_Common_H5 = 100, - ///房间相册 - CustomMessageType_Room_Album = 101, - ///守护星球 - CustomMessageType_Guardian_Planet = 102, - ///通用公屏信息 - CustomMessageType_General_Public_Screen = 103, - ///疯狂动物园飘屏 - CustomMessageType_Graffiti_Star_Kitchen = 104, - - ///超级礼物 - CustomMessageType_Super_Gift = 106, - ///通用飘屏 - CustomMessageType_General_Floating_Screen = 107, - ///聊天大厅上头条 - CustomMessageType_Chat_Hall_Headlines = 108, - ///游戏 - CustomMessageType_Chat_Room_Game = 109, - ///家族新协议 - CustomMessageType_New_Hall = 110, - - ///房间流水 - CustomMessageType_MoneyFlow = 111, - - ///游戏陪玩开黑 - CustomMessageType_Game_Order = 112, - - ///房間背景更新 - CustomMessageType_Custom_Room_Background = 113, - - ///房间等级更新 - CustomMessageType_RoomLevel_Update = 114, - - /// 进房类型 - CustomMessageType_User_Enter_Room = 115, - - /// 新系統消息 - CustomMessageType_System_message = 116, - - /// 关系更新消息 - CustomMessageType_CP_message = 117, - - /// 客户端独立收发的消息, 从 1000 开始 - ClientMessage_Type = 1000, - - MicRelationship_Type = 1001, -}; - - -typedef NS_ENUM(NSUInteger, ClientMessageType) { - ClientMessage_UpMic_Ask = 10001, - ClientMessage_UpMic_Agree = 10002, - ClientMessage_UpMic_Reject = 10003, -}; - -typedef NS_ENUM(NSUInteger, MicRelationshipType) { - MicRelationship_CP = 10011, -}; - - -typedef NS_ENUM(NSUInteger, CustomMessageTypePublicEvent) { - Custom_Message_Sub_Public_Event_message = 681, -}; - -/// first = CustomMessageType_CP_message -typedef NS_ENUM(NSUInteger, CustomMessageTypeCPmessage) { - Custom_Message_Sub_CP_message_request = 1170, - Custom_Message_Sub_CP_message_result = 1171, -}; - -/// first = CustomMessageType_System_message -typedef NS_ENUM(NSUInteger, CustomMessageTypeSystemmessage) { - Custom_Message_Sub_System_message = 1160, -}; - -///first = CustomMessageType_User_Enter_Room -typedef NS_ENUM(NSUInteger, CustomMessageTypeUserEnterRoom) { - /// 图片消息 - Custom_Message_Sub_Pic_Message = 1151, - /// 用户进房 - Custom_Message_Sub_User_Enter_Room = 1152, -}; - -///first = CustomMessageType_Room_Tip -typedef NS_ENUM(NSUInteger, CustomMessageSubRoomTip) { - ///分享房间 - Custom_Message_Sub_Room_Tip_ShareRoom = 21, - ///关注房主 - Custom_Message_Sub_Room_Tip_Attention_Owner = 22, -}; - -///first = CustomMessageType_Gift -typedef NS_ENUM(NSUInteger, CustomMessageSubGift) { - ///发送礼物 - Custom_Message_Sub_Gift_Send = 31, - ///全服发送礼物 - Custom_Message_Sub_Gift_ChannelNotify = 32, - ///发送 福袋 礼物 - Custom_Message_Sub_Gift_LuckySend = 34, - ///发送 嵌入式礼物 - Custom_Message_Sub_Gift_EmbeddedStyle = 35, -}; - -///first = CustomMessageType_Account -typedef NS_ENUM(NSUInteger, CustomMessageSubAccount) { - //账户余额钻石变更 - Custom_Message_Sub_Account_Changed = 51, -}; - -///first = CustomMessageType_Member_Online -typedef NS_ENUM(NSInteger, CustomMessageSubOnLine) { - ///房主的主播上线了 - Custom_Message_Type_Attention_Member_Online = 61 -}; - -///first = CustomMessageType_Queue -typedef NS_ENUM(NSInteger, CustomMessageSubQueue) { - ///邀请上麦 - Custom_Message_Sub_Queue_Invite = 81, - ///踢下麦 - Custom_Message_Sub_Queue_Kick = 82, -}; - -//first = CustomMessageType_Face -typedef NS_ENUM(NSUInteger, CustomMessageSubFace) { - ///发送 - Custom_Message_Sub_Face_Send = 91, -}; - -///first == CustomMessageType_Tweet -typedef NS_ENUM(NSInteger, CustomMessageSubTweet) { - ///推文的内容 - Custom_Message_Sub_Tweet_News = 101, -}; - -///first = CustomMessageType_ALLMicroSend -typedef NS_ENUM(NSUInteger, CustomMessageSubAllMicroSend) { - ///全麦送礼物 - Custom_Message_Sub_AllMicroSend = 121, - ///非全麦 多人送礼 - Custom_Message_Sub_AllBatchSend = 123, - ///非全麦 多人送福袋礼物 - Custom_Message_Sub_AllBatchMicroLuckySend = 124, - ///全麦送 福袋 礼物 122老版本占用了 - Custom_Message_Sub_AllMicroLuckySend = 125, -}; - -///first == CustomMessageType_Car_Notify -typedef NS_ENUM(NSUInteger, CustomMessageSubCar) { - Custom_Message_Sub_Car_OutDate = 151, - Custom_Message_Sub_Car_EnterRoom = 159, //进房动画 -}; - -///first = CustomMessageType_Kick_User -typedef NS_ENUM(NSUInteger, CustomNotificationSubKick) { - ///拉黑 - Custom_Message_Sub_Kick_BlackList = 182, - ///踢出房间 - Custom_Message_Sub_Kick_BeKicked = 181, -}; - - -///first = CustomMessageType_Secretary -typedef NS_ENUM(NSUInteger, CustomNotificationSecretary) { - ///跳转页面 - Custom_Message_Sub_Secretary_Router = 191, -}; - -///first = CustomMessageType_Update_RoomInfo -typedef NS_ENUM(NSUInteger, CustomMessageSubUpdateRoomInfo) { - ///动画开关状态更新 - Custom_Message_Sub_Update_RoomInfo_AnimateEffect = 201, - ///公屏开关更新 - Custom_Message_Sub_Update_RoomInfo_MessageState = 203, - ///通用公屏提示文案, 公屏纯文本展示消息 data[@"tip"] - Custom_Message_Sub_Update_RoomInfo_Notice = 204, - ///红包开关通知 - Custom_Message_Sub_Update_RoomInfo_RedPacket = 205, - ///清空公屏 - Custom_Message_Sub_Update_RoomInfo_CleanScreen = 206, -}; - -///first = CustomMessageType_Application_Share -typedef NS_ENUM(NSInteger, CustomMessageSubApplicationShare) { - ///分享房间 - Custom_Message_Sub_Application_Share_Room = 221, -}; - - -///first = CustomMessageType_Applica -typedef NS_ENUM(NSInteger, CustomMessageSubMessageHandle) { - Custom_Message_Sub_Message_Handle_Content = 231, //文本 - Custom_Message_Sub_Message_Handle_Bussiness = 232, //业务 -}; - -///first = CustomMessageType_User_UpGrade -typedef NS_ENUM(NSInteger, CustomMessageSubUserUpgrade) { - ///用户等级 - Custom_Message_Sub_User_UpGrade_Exper = 241, - ///魅力等级 - Custom_Message_Sub_User_UpGrade_Charm = 242 -}; - -///first = CustomMessageType_Candy_Tree -typedef NS_ENUM(NSUInteger, CustomMessageSubCandyTree) { - //.自己可见 一级礼物(最小) - Custom_Message_Sub_Candy_Tree_Me = 261, - ///当前房间可见 二级礼物 - Custom_Message_Sub_Candy_Tree_InRoom = 262, - ///所有房间可见 三级礼物 - Custom_Message_Sub_Candy_Tree_AllRoom = 263, - ///所有房间可见+小秘书 四级礼物 - Custom_Message_Sub_Candy_Tree_AllRoom_Notify = 264, - ///五级礼物 - Custom_Message_Sub_Candy_Tree_InRoom_NeedAllMicSend = 265, - //暴击的没用 不写了 -}; - -///first = CustomMessageType_Arrange_Mic -typedef NS_ENUM(NSUInteger, CustomNotiHeaderArrangeMic) { - ///队列从无人排麦到有人排麦 - Custom_Message_Sub_Arrange_Mic_Non_Empty= 301, - ///队列从有人排麦到无人排麦 - Custom_Message_Sub_Arrange_Mic_Empty= 302, - ///开启排麦 - Custom_Message_Sub_Arrange_Mic_Mode_Open= 303, - ///关闭排麦 - Custom_Message_Sub_Arrange_Mic_Mode_Close= 304, - ///将坑位设置成自由麦 - Custom_Message_Sub_Arrange_Mic_Free_Mic_Open= 305, - ///将坑位设置为排麦 - Custom_Message_Sub_Arrange_Mic_Free_Mic_Close= 306, -}; - -///first =CustomMessageType_Room_PK -typedef NS_ENUM(NSUInteger, CustomMessageSubRoomPK){ - ///从无人报名pk排麦到有人报名pk排麦 - Custom_Message_Sub_Room_PK_Non_Empty = 311, - ///从有人报名pk排麦到无人报名pk排麦 - Custom_Message_Sub_Room_PK_Empty = 312, - ///创建了pk模式 - Custom_Message_Sub_Room_PK_Mode_Open = 313, - ///关闭pk模式 - Custom_Message_Sub_Room_PK_Mode_Close = 314, - ///pk开始 - Custom_Message_Sub_Room_PK_Start = 315, - ///pk结果 - Custom_Message_Sub_Room_PK_Result = 316, - ///重新开始 - Custom_Message_Sub_Room_PK_Re_Start= 317, - ///管理员邀请上麦(只用在客户端) - Custom_Message_Sub_Room_PK_Manager_Up_Mic = 318, -}; - -///first=CustomMessageType_Hall -typedef NS_ENUM(NSUInteger, Custom_Noti_Sub_HALL) { - ///申请加入厅 - Custom_Message_Sub_Hall_Apply_Join = 321, - ///管理邀请入厅 - Custom_Message_Sub_Hall_Manager_Invite = 322, - ///申请退出厅 - Custom_Message_Sub_Hall_Apply_Exit = 323, - ///模厅普通通知 - Custom_Message_Sub_Hall_Notice = 324, - ///设置为模厅 - Custom_Message_Sub_Hall_Become_Hall = 325, -}; - -///first = CustomMessageType_Room_GiftValue -typedef NS_ENUM(NSUInteger, CustomMessageSubRoomGiftValue) { - ///礼物值同步 - Custom_Message_Sub_Room_GiftValue_Sync = 421 -}; - -///first = CustomMessageType_Version_Update) -typedef NS_ENUM(NSUInteger, CustomMessageVersionUpdateValue) { - ///版本升级 - Custom_Message_Version_Update_Value = 491 -}; - -///first = CustomMessageType_Hall_Super_Admin -typedef NS_ENUM(NSInteger, CustomMessageSubHallSuperAdmin) { - ///超管解除陪伴房的进房限制 - Custom_Message_Sub_Hall_Super_Admin_Remove_CP_Room_Limit = 501, - ///超管解除多人房的房间密码 - Custom_Message_Sub_Hall_Super_Admin_Remove_Room_Pwd = 502, - ///锁麦 - Custom_Message_Sub_Hall_Super_Admin_Lock_Mic = 503, - ///闭麦 - Custom_Message_Sub_Hall_Super_Admin_Mute_Mic = 504, - ///踢人下麦 - Custom_Message_Sub_Hall_Super_Admin_Kick_Down_Mic = 505, - ///拉黑 - Custom_Message_Sub_Hall_Super_Admin_Mark_Black = 506, - ///踢出房间 - Custom_Message_Sub_Hall_Super_Admin_Kick_Out_Room = 507, - ///踢管理员出房间 - Custom_Message_Sub_Hall_Super_Admin_Kick_Manager_Out_Room = 508, -}; - -/// first == CustomMessageType_Monents -typedef NS_ENUM(NSUInteger, Custom_Noti_Sub_Dynamic) { - ///未读更新 - Custom_Message_Sub_Monents_Unread_Update = 521, - /// 违禁删除 - Custom_Message_Sub_Monents_Ban_Delete = 522, - /// 动态审核通过 - Custom_Message_Sub_Monents_Approved = 523, - /// app内分享动态 - Custom_Message_Sub_Monents_Share = 524, -}; - -///first = CustomMessageType_RedPacket -typedef NS_ENUM(NSUInteger, CustomMessageSubRedPacket) { - Custom_Message_Sub_RoomGiftRedPacket = 601, //房间礼物红包 - Custom_Message_Sub_RoomDiamandRedPacket = 602, //房间钻石红包 - Custom_Message_Sub_AllGiftRedPacket = 603, //全服礼物红包 - Custom_Message_Sub_AllDiamandRedPacket = 604, //全服钻石红包 - Custom_Message_Sub_OpenRedPacketSuccess = 605,//抢红包成功 - Custom_Message_Sub_NewRoomDiamandRedPacket = 606, //新版本房间钻石红包 - - Custom_Message_Sub_LuckyPackage = 607, // 最新版本房间红包推送 -}; - -///first = CustomMessageType_Collection_Room -typedef NS_ENUM(NSUInteger, CustomMessageSubCollectRoom) { - /// 福袋礼物房间飘屏通知 - Custom_Message_Sub_Room_Gift_LuckBag= 610, - /// 福袋礼物全服飘屏通知 - Custom_Message_Sub_Room_Gift_LuckBag_Server = 611, - /// 福袋礼物全服飘屏通知 - Custom_Message_Sub_Room_Gift_LuckBag_FullScree = 612, -}; - -///first == CustomMessageType_FindNew 发现萌新 -typedef NS_ENUM(NSUInteger, CustomMessageFindNewUserGreet) { - /// 打招呼 - Custom_Message_Find_New_Greet_New_User = 621, -}; -///first == CustomMessageType_RoomBoom 房间火箭 -typedef NS_ENUM(NSUInteger, CustomMessageRoomBoom) { - /// 经验值更新 - Custom_Message_Room_Boom_EXP = 631, - /// 升级 - Custom_Message_Room_Boom_LevelUp = 632, - /// 奖励 - Custom_Message_Room_Boom_Award = 633, -}; -///跳转类型 -typedef NS_ENUM(NSUInteger, CustomMessageRouter) { - /// 跳转H5 - Custom_Message_Router_H5 = 2, -}; - -///first = CustomMessageType_LuckyBag -typedef NS_ENUM(NSUInteger, CustomMessageSubLuckyBag) { - ///收藏房间公屏提示消息 - Custom_Message_Sub_Collect_Room_Tips = 591, - /// 提醒用户收藏房间 - Custom_Message_Sub_Collect_Room_Remind_User = 592, -}; -//first = CustomMessageType_Free_Gift_Star_Reset_Time -typedef NS_ENUM(NSUInteger, CustomMessageFreeGiftStarResetTime) { - ///免费礼物倒计时重置时间 - Custom_Message_Sub_Free_Gift_Star_Reset_Time = 960, - ///更新礼物信息 - Custom_Message_Sub_Update_Gift_Information = 961, - -}; -///CustomMessageType_Tarot -typedef NS_ENUM(NSUInteger, CustomMessageSubTarot) { - /// 塔罗中奖消息 - ///初级 - Custom_Message_Sub_Tarot_Novice = 712, - ///中初 - Custom_Message_Sub_Tarot_Intermediate = 713, - ///高级 - Custom_Message_Sub_Tarot_Advanced = 714, -}; - -///CustomMessageType_RoomPlay_Dating -typedef NS_ENUM(NSUInteger, CustomMessageSubRoomPlayDating){ - ///选择心动用户 - Custom_Message_Sub_Room_Play_Dating_Pick_Heart= 721, - ///公布结果 - Custom_Message_Sub_Room_Play_Dating_Public_Result = 722, - ///选择了对象 但不是互选 客户端收到结果之后自动加到 公屏上 - Custom_Message_Sub_Room_Play_Dating_Result_Not_Mutual = 723, - ///互选的 客户端收到结果之后自动加到 公屏上 - Custom_Message_Sub_Room_Play_Dating_Result_Mutual = 724, -}; - -///first = CustomMessageType_Chat_Risk_Alert -/// 访客记录 -typedef NS_ENUM(NSUInteger, CustomMessageSubChatRiskAlert) { - /// 私聊风险提醒 - Custom_Message_Sub_Chat_Risk_Alert= 751, -}; - -///first = CustomMessageType_First_Recharge_Reward -typedef NS_ENUM(NSUInteger, CustomMessageSubFirstRecharge) { - /// 首充完成 - Custom_Message_Sub_Room_First_Recharge_Reward= 761, - /// 新用户专享优惠充值完成 - Custom_Message_Sub_New_User_Recharge_Reward = 762, -}; - -/// 访客记录 -typedef NS_ENUM(NSUInteger, CustomMessageSubVisitorRecord) { - /// 访客记录 - Custom_Message_Sub_Visitor_Record = 781, -}; - -///first == CustomMessageType_Room_Sailing -typedef NS_ENUM(NSInteger, CustomMessageSubSailing) { - //自己可见 一级礼物(最小) - Custom_Message_Sub_Sailing_Me = 811, - //当前房间可见 二级礼物 - Custom_Message_Sub_Sailing_InRoom = 812, - //所有房间可见 三级礼物 - Custom_Message_Sub_Sailing_AllRoom = 813, - //所有房间可见+小秘书 四级礼物(最大) - Custom_Message_Sub_Sailing_AllRoom_Notify = 814, - //开箱子开到全麦送 （服务端发） - Custom_Message_Sub_Sailing_InRoom_NeedAllMicSend = 815, -}; - -///first = CustomMessageType_Across_Room_PK -typedef NS_ENUM(NSUInteger, CustomMessageSubAcrossRoomPK) { - /// 收到跨房PK邀请 - Custom_Message_Sub_AcrossRoomPK_Invite = 831, - /// 拒绝跨房PK - Custom_Message_Sub_AcrossRoomPK_Reject = 832, - /// 接受跨房PK - Custom_Message_Sub_AcrossRoomPK_Accept = 833, - /// 面板消息 - Custom_Message_Sub_AcrossRoomPK_Panel = 834, - /// 跨房PK结束通知 - Custom_Message_Sub_AcrossRoomPK_End = 835, - /// 跨房PK结束飘屏 - Custom_Message_Sub_AcrossRoomPK_Result = 836, - - ///收到个播PK邀请 - Custom_Message_Sub_AnchorPK_Invite = 837, - ///拒绝个播pk - Custom_Message_Sub_AnchorPK_Reject = 838, - ///接收个播PK - Custom_Message_Sub_AnchorPK_Accept = 839, - ///个播PK面板消息 - Custom_Message_Sub_AnchorPK_Panel = 8310, - ///个播PK结束通知（收到后进入惩罚阶段) - Custom_Message_Sub_AnchorPK_End = 8311, - ///个播PK结束飘屏 - Custom_Message_Sub_AnchorPK_Result = 8312, - ///个播PK完成 - Custom_Message_Sub_AnchorPK_Finish = 8313, - ///收到预约PK倒计时 - Custom_Message_Sub_PK_BeginTime = 8314, - ///匹配个播随机PK等待超时 - Custom_Message_Sub_AnchorPK_Match_TimeOut = 8315, - ///个播pk禁用对方麦克风 - Custom_Message_Sub_AnchorPK_MuteOtherMic = 8316, -}; - -///first = CustomMessageType_Noble_VIP -typedef NS_ENUM(NSUInteger, CustomMessageSubNobleVIP) { - /// 开通VIP房内消息（公屏显示） - Custom_Message_Sub_Room_Open_Noble_VIP = 851, - /// 开通VIP成功通知消息 - Custom_Message_Sub_Open_Noble_Success = 852, - /// VIP升级房内消息（公屏显示） - Custom_Message_Sub_Room_Noble_LevelUp = 853, - /// VIP升级用户通知消息（弹窗） - Custom_Message_Sub_Noble_LevelUp_User = 854, - /// VIP升级全服飘屏通知消息 - Custom_Message_Sub_Room_Noble_LevelUp_Suspend = 855, - /// VIP升级全服房间公屏通知消息 - Custom_Message_Sub_AllRoom_Noble_LevelUp_Suspend = 856, - /// VIP小喇叭房间消息 - Custom_Message_Sub_Room_Trumpet = 857, - -}; - -///first = CustomMessageType_Anchor_Hour_Rank -typedef NS_ENUM(NSUInteger, CustomMessageAnchorHourRank) { - ///个播小时榜 - Custom_Message_Sub_Anchor_Hour_Rank = 891, -}; - -///first = CustomMessageType_Anchor_FansTeam -typedef NS_ENUM(NSUInteger, CustomMessageAnchorFansTeam) { - ///开通粉丝团成功 - Custom_Message_Sub_FansTeam_Open_Success = 901, - ///开通粉丝团失败 - Custom_Message_Sub_FansTeam_Open_Fail = 902, - ///用户加入粉丝团成功 - Custom_Message_Sub_FansTeam_Join_Success = 903, - ///用户退出粉丝团成功 - Custom_Message_Sub_FansTeam_Out_Success = 904, -}; - -///first = CustomMessageType_Licnese_Hour_Rank -typedef NS_ENUM(NSUInteger, CustomMessageLicneseHourRank) { - ///牌照房小时榜 - Custom_Message_Sub_License_Hour_Rank = 911, -}; - -///first = CustomMessageType_Task_Complete -typedef NS_ENUM(NSUInteger, CustomMessageTaskComplete) { - ///任务完成通知 - Custom_Message_Sub_TaskComplete = 921, -}; - -///first = CustomMessageType_Gift_Compound -typedef NS_ENUM(NSUInteger, CustomMessageGiftCompound) { - ///礼物合成通知 - Custom_Message_Sub_Gift_Compound = 931, -}; - -///first = CustomMessageType_Graffiti_Gift -typedef NS_ENUM(NSUInteger, CustomMessageGraffitiGift) { - ///涂鸦礼物 - Custom_Message_Sub_Graffiti_Gift = 941, -}; - -//first = CustomMessageType_Graffiti_Star_Kitchen -typedef NS_ENUM(NSUInteger, CustomMessageGraffitiStarKitchen) { - /// 已删除相关代码 - // 星级厨房礼物全服飘屏通知 - Custom_Message_Sub_Star_Kitchen_Server = 1041, - // 星级厨房礼物全服飘屏通知 - Custom_Message_Sub_Star_Kitchen_FullScreen = 1042, -}; -///夺宝精灵 CustomMessageType_Treasure_Fairy = 97, -//typedef NS_ENUM(NSInteger, CustomMessageTreasureFairy) { -// ///精灵赠送 -// Custom_Message_Sub_Treasure_Fairy_Send_Fairy = 9701, -// ///索要精灵 -// Custom_Message_Sub_Treasure_Fairy_Ask_Fairy = 9702, -// -// -// ///抽奖礼物 -// ///抽奖L1礼物 -// Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L1 = 9711, -// ///抽奖L2礼物 -// Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L2 = 9712, -// ///抽奖L3礼物 -// Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L3 = 9713, -// ///抽奖L4礼物 -// Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4 = 9714, -// ///抽奖L5礼物 -// Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5 = 9715, -// -// ///抽奖获得的精灵球的 -// /// 抽奖L1精灵球 -// Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L1 = 9721, -// /// 抽奖L2精灵球 -// Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L2 = 9722, -// /// 抽奖L3精灵球 -// Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L3 = 9723, -// ///精灵球召唤礼物 -// ///召唤L1 -// Custom_Message_Sub_Treasure_Fairy_Convert_L1 = 9731, -// ///召唤L2 -// Custom_Message_Sub_Treasure_Fairy_Convert_L2 = 9732, -// ///召唤L3 -// Custom_Message_Sub_Treasure_Fairy_Convert_L3 = 9733, -//}; - -///first = CustomMessageType_Candy_Tree -typedef NS_ENUM(NSUInteger, CustomMessageSubLookLove) { - //.自己可见 一级礼物(最小) - Custom_Message_Sub_Look_Love_Me = 981, - ///当前房间可见 二级礼物 - Custom_Message_Sub_Look_Love_InRoom = 982, - ///所有房间可见 三级礼物 - Custom_Message_Sub_Look_Love_AllRoom = 983, - ///所有房间可见+小秘书 四级礼物 - Custom_Message_Sub_Look_Love_AllRoom_Notify = 984, - ///五级礼物 - Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend = 985, - //暴击的没用 不写了 -}; -///通用h5 -//CustomMessageType_Common_H5 = 100 -typedef NS_ENUM(NSUInteger, CustomMessageTypeCommonH5) { - ///所有房间 - Custom_Message_Sub_Common_H5_Novice = 1101, - ///全服 - Custom_Message_Sub_Common_H5_Advanced = 1102, - - -}; -///房间相册 -//CustomMessageType_Room_Album = 101, -typedef NS_ENUM(NSUInteger, CustomMessageTypeRoomAlbum) { - ///所有房间 - Custom_Message_Sub_Room_Album = 1011, -}; -//CustomMessageType_Guardian_Planet = 102, -typedef NS_ENUM(NSUInteger, CustomMessageTypeGuardianPlanet) { - ///所有房间 - Custom_Message_Sub_Guardian_Planet_One_Room = 1021,//单房间 - Custom_Message_Sub_Guardian_Planet_All_Room = 1022,///全部房间 -}; -///通用公屏信息 -//CustomMessageType_General_Public_Screen = 10000, -typedef NS_ENUM(NSUInteger, CustomMessageTypeGeneralPublicScreen) { - ///所有房间 - Custom_Message_Sub_General_Public_Screen_One_Room = 1031,//单房间 - Custom_Message_Sub_General_Public_Screen_All_Room = 1032,///全部房间 -}; - -///超级礼物 -//CustomMessageType_Super_Gift = 106, -typedef NS_ENUM(NSUInteger, CustomMessageTypeSuperGift) { - ///所有房间 - Custom_Message_Sub_Super_Gift = 1061, - // 送礼者显示中奖内容 - Custom_Message_Sub_Super_Gift_Winning_Coins = 1062, - // 全服显示中奖内容 - Custom_Message_Sub_Super_Gift_Winning_Coins_ALL_Room = 1063, - - Custom_Message_Sub_Super_Gift_Room_Message = 1064, // 公屏消息 - Custom_Message_Sub_Super_Gift_UI_Rffect = 1065, // 金币动效 & 大奖提示 - Custom_Message_Sub_Super_Gift_Banner = 1066, // 飘屏 -}; -///通用飘屏 -//CustomMessageType_General_Floating_Screen = 107, -typedef NS_ENUM(NSUInteger, CustomMessageTypeGeneralFloatingScreen) { - ///所有房间 - Custom_Message_Sub_General_Floating_Screen_One_Room = 1071,//单房间 - Custom_Message_Sub_General_Floating_Screen_All_Room = 1072,//全部房间 -}; -///聊天大厅上头条 -//CustomMessageType_Chat_Hall_Headlines = 108, -typedef NS_ENUM(NSUInteger, CustomMessageTypeChatHallHeadlines) { - ///所有房间 - Custom_Message_Sub_Chat_Hall_Headlines = 1081,//单房间 - -}; -//CustomMessageType_Chat_Room_Game = 109, -typedef NS_ENUM(NSUInteger, CustomMessageTypeRoomGame) { - - Custom_Message_Sub_Room_Game_Match_Success = 1091,//匹配成功 - Custom_Message_Sub_Room_Game_Match_Fail = 1092,//匹配失败 - Custom_Message_Sub_Room_Game_Early_Exit = 1093,//提前退出游戏 - -}; -///家族新协议 -//CustomMessageType_New_Hall = 110, -typedef NS_ENUM(NSUInteger, CustomMessageTypeNewHall) { - ///所有房间 - Custom_Message_Sub_New_Hall_Invite = 1101,//邀请加入 - Custom_Message_Sub_New_Hall_Deal_Invite = 1102,//邀请加入 - Custom_Message_Sub_New_Hall_Apply = 1103,//申请加入 - Custom_Message_Sub_New_Hall_Deal_Apply = 1104,//申请加入 - Custom_Message_Sub_New_Hall_Set_Manager = 1105,//设置管理员 - Custom_Message_Sub_New_Hall_Remove_Manager = 1106,//移除管理员 - Custom_Message_Sub_New_Hall_Create = 1107,//加入成员 - Custom_Message_Sub_New_Hall_Dismiss = 1108,//移除成员 -}; - -///开黑邀请 -typedef NS_ENUM(NSUInteger, CustomMessageTypeGameOrder) { - ///所有房间 - Custom_Message_Sub_Game_order = 1121, -}; - -/// 房间流水 -typedef NS_ENUM(NSUInteger, CustomMessageTypeMoneyFlow) { - ///所有房间 - Custom_Message_Sub_Money_Flow = 1110, -}; - -typedef NS_ENUM(NSUInteger, CustomMessageTypeCPGift) { - Custom_Message_Sub_CP_Gift = 641, // 礼物聊屏 - Custom_Message_Sub_CP_Upgrade = 642, // 升级 - Custom_Message_Sub_CP_Binding = 643, // 绑定 -}; - -///开黑邀请 -typedef NS_ENUM(NSUInteger, CustomMessageTypeCustomRoomBackground) { - ///所有房间 - Custom_Message_Sub_Custom_Room_Background = 1131 -}; - -///房间等级更新 -typedef NS_ENUM(NSUInteger, CustomMessageTypeRoomLevelUpdate) { - ///所有房间 - Custom_Message_Sub_RoomLevel_Update = 1141 -}; - -@interface AttachmentModel : PIBaseModel - -@property (nonatomic, strong) id data; // Must be NSMutable Type -@property (nonatomic,assign) int first; -@property (nonatomic,assign) int second; -@property(nonatomic,assign) BOOL isBroadcast; - -@property(nonatomic, assign) NSInteger seq; // 本地序号，用于将一条消息分解为多条有次序的消息 - -@property (nonatomic, assign) BOOL isFromPublic; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/AttachmentModel.m b/YuMi/Modules/YMMessage/Model/AttachmentModel.m deleted file mode 100644 index 558517c..0000000 --- a/YuMi/Modules/YMMessage/Model/AttachmentModel.m +++ /dev/null @@ -1,81 +0,0 @@ -// -// AttachmentModel.m -// YUMI -// -// Created by YUMI on 2021/11/16. -// - -#import "AttachmentModel.h" -#import "NSObject+MJExtension.h" -@implementation AttachmentModel - -- (NSString *)encodeAttachment { -//#if DEBUG -// NSString *s = [self toJSONString]; -// NSString *ss = [self compressJSONString:s]; -// NSString *sss = [self convertModelToJSONString:self]; -//#endif - return [self toJSONString]; -} - -//- (NSDictionary *)toDictionary { -// NSMutableDictionary *dict = [NSMutableDictionary dictionary]; -// -// if (self.data) { -// dict[@"data"] = self.data; -// } -// dict[@"first"] = @(self.first); -// dict[@"second"] = @(self.second); -// dict[@"isBroadcast"] = @(self.isBroadcast); -// -// return [dict copy]; -//} -// -//- (NSString *)convertModelToJSONString:(AttachmentModel *)model { -// if (!model) { -// return nil; -// } -// -// // 获取模型的字典表示 -// NSDictionary *modelDict = [model toDictionary]; -// -// // 将字典序列化为 JSON 数据 -// NSError *error; -// NSData *jsonData = [NSJSONSerialization dataWithJSONObject:modelDict options:0 error:&error]; -// -// if (error) { -// NSLog(@"JSON 序列化失败: %@", error.localizedDescription); -// return nil; -// } -// -// // 转换为字符串 -// return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; -//} -// -//- (NSString *)compressJSONString:(NSString *)jsonString { -// if (!jsonString) return nil; -// -// // 将 JSON 字符串转为对象（字典或数组） -// NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding]; -// NSError *error; -// id jsonObject = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error]; -// -// if (error) { -// NSLog(@"JSON 解析错误: %@", error.localizedDescription); -// return nil; -// } -// -// // 将对象重新序列化为紧凑格式的 JSON 数据 -// NSData *compressedData = [NSJSONSerialization dataWithJSONObject:jsonObject options:0 error:&error]; -// -// if (error) { -// NSLog(@"JSON 序列化错误: %@", error.localizedDescription); -// return nil; -// } -// -// // 转换为字符串 -// NSString *compressedString = [[NSString alloc] initWithData:compressedData encoding:NSUTF8StringEncoding]; -// return compressedString; -//} - -@end diff --git a/YuMi/Modules/YMMessage/Model/ChatLimitModel.h b/YuMi/Modules/YMMessage/Model/ChatLimitModel.h deleted file mode 100644 index e91ae8a..0000000 --- a/YuMi/Modules/YMMessage/Model/ChatLimitModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// ChatLimitModel.h -// YUMI -// -// Created by zu on 2021/12/8. -// - -#import "NSObject+MJExtension.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface ChatLimitModel : PIBaseModel - -@property (nonatomic, assign) BOOL chat; -@property (nonatomic, copy) NSString * message; -@property (nonatomic, copy) NSString * wealthLevel; -@property (nonatomic, copy) NSString * charmLevel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/ChatLimitModel.m b/YuMi/Modules/YMMessage/Model/ChatLimitModel.m deleted file mode 100644 index b17309e..0000000 --- a/YuMi/Modules/YMMessage/Model/ChatLimitModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// ChatLimitModel.m -// YUMI -// -// Created by zu on 2021/12/8. -// - -#import "ChatLimitModel.h" - -@implementation ChatLimitModel - -@end diff --git a/YuMi/Modules/YMMessage/Model/CustomMessage/XPKickUserModel.h b/YuMi/Modules/YMMessage/Model/CustomMessage/XPKickUserModel.h deleted file mode 100644 index c4283a9..0000000 --- a/YuMi/Modules/YMMessage/Model/CustomMessage/XPKickUserModel.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMKickUserModel.h -// YUMI -// -// Created by YUMI on 2021/11/25. -// -///用户被踢出房间的模型 -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPKickUserModel : PIBaseModel -///安卓使用的是Uid 所以加了一个这样的属性 -@property (nonatomic, assign) NSInteger uid; -///处理de uid -@property (nonatomic, assign) NSInteger handleUid; -///处理人的昵称 -@property (nonatomic, copy) NSString *handleNick; -///目标用户的uid -@property (nonatomic, assign) NSInteger targetUid; -///目标用户的昵称 -@property (nonatomic, copy) NSString *targetNick; -///目标坑位 -@property (nonatomic, copy) NSString *micPosition; -///超管踢人的时候目标坑位 -@property (nonatomic, copy) NSString *micNumber; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/CustomMessage/XPKickUserModel.m b/YuMi/Modules/YMMessage/Model/CustomMessage/XPKickUserModel.m deleted file mode 100644 index 13a9d56..0000000 --- a/YuMi/Modules/YMMessage/Model/CustomMessage/XPKickUserModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMKickUserModel.m -// YUMI -// -// Created by YUMI on 2021/11/25. -// - -#import "XPKickUserModel.h" - -@implementation XPKickUserModel - -@end diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentApplicationShareModel.h b/YuMi/Modules/YMMessage/Model/SessionContent/ContentApplicationShareModel.h deleted file mode 100644 index ea97c44..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentApplicationShareModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// ContentApplicationShareModel.h -// YUMI -// -// Created by YUMI on 2022/4/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@interface ContentApplicationShareModel : PIBaseModel -///显示标题 -@property (nonatomic,copy) NSString *title; -///立即进入 -@property (nonatomic,copy) NSString *actionName; -///房主的uid -@property (nonatomic,copy) NSString *routerValue; -///房主头像 -@property (nonatomic,copy) NSString *avatar; -@end -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentApplicationShareModel.m b/YuMi/Modules/YMMessage/Model/SessionContent/ContentApplicationShareModel.m deleted file mode 100644 index b782eac..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentApplicationShareModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// ContentApplicationShareModel.m -// YUMI -// -// Created by YUMI on 2022/4/19. -// - -#import "ContentApplicationShareModel.h" - -@implementation ContentApplicationShareModel - -@end diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentLevelUpgradeModel.h b/YuMi/Modules/YMMessage/Model/SessionContent/ContentLevelUpgradeModel.h deleted file mode 100644 index 4f26246..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentLevelUpgradeModel.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// ContentLevelUpgradeModel.h -// YUMI -// -// Created by YUMI on 2022/4/20. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface ContentLevelUpgradeModel : PIBaseModel -@property (nonatomic, copy) NSString *levelName; -///升到的等级 -@property (nonatomic,assign) NSInteger levelSeq; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentLevelUpgradeModel.m b/YuMi/Modules/YMMessage/Model/SessionContent/ContentLevelUpgradeModel.m deleted file mode 100644 index e37b739..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentLevelUpgradeModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// ContentLevelUpgradeModel.m -// YUMI -// -// Created by YUMI on 2022/4/20. -// - -#import "ContentLevelUpgradeModel.h" - -@implementation ContentLevelUpgradeModel - -@end diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentOpenLiveInfoModel.h b/YuMi/Modules/YMMessage/Model/SessionContent/ContentOpenLiveInfoModel.h deleted file mode 100644 index 8431f2c..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentOpenLiveInfoModel.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// ContentOpenLiveInfoModel.h -// YUMI -// -// Created by YUMI on 2022/4/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class ContentOpenLiveUserInfoModel; -@interface ContentOpenLiveInfoModel : PIBaseModel - -///用户的uid -@property (nonatomic,copy) NSString *uid; -///用户信息 -@property (nonatomic,strong) ContentOpenLiveUserInfoModel *userVo; - -@end - -@interface ContentOpenLiveUserInfoModel : PIBaseModel -///显示名字 -@property (nonatomic,copy) NSString *avatar; -///显示昵称 -@property (nonatomic,copy) NSString *nick; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentOpenLiveInfoModel.m b/YuMi/Modules/YMMessage/Model/SessionContent/ContentOpenLiveInfoModel.m deleted file mode 100644 index 62f05ca..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentOpenLiveInfoModel.m +++ /dev/null @@ -1,18 +0,0 @@ -// -// ContentOpenLiveInfoModel.m -// YUMI -// -// Created by YUMI on 2022/4/19. -// 开启直播 - -#import "ContentOpenLiveInfoModel.h" - -@implementation ContentOpenLiveInfoModel - -@end - -@implementation ContentOpenLiveUserInfoModel - - - -@end diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentRistAlertModel.h b/YuMi/Modules/YMMessage/Model/SessionContent/ContentRistAlertModel.h deleted file mode 100644 index 4b2e89f..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentRistAlertModel.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// ContentRistAlertModel.h -// YUMI -// -// Created by YUMI on 2022/8/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface ContentRistAlertModel : PIBaseModel -@property (nonatomic,strong) NSString *content; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentRistAlertModel.m b/YuMi/Modules/YMMessage/Model/SessionContent/ContentRistAlertModel.m deleted file mode 100644 index 795320d..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentRistAlertModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// ContentRistAlertModel.m -// YUMI -// -// Created by YUMI on 2022/8/11. -// - -#import "ContentRistAlertModel.h" - -@implementation ContentRistAlertModel - -@end diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.h b/YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.h deleted file mode 100644 index ce892b3..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.h +++ /dev/null @@ -1,56 +0,0 @@ -// -// ContentSecretaryModel.h -// YUMI -// -// Created by YUMI on 2022/4/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, SecretaryRouterType) { - ///房间 - SecretaryRouterType_Room = 1, - ///跳转网页 - SecretaryRouterType_H5 = 2, - ///钱包页 - SecretaryRouterType_Purse = 3, - ///充值页 - SecretaryRouterType_Recharge = 5, - ///用户信息 - SecretaryRouterType_UserInfo = 6, - ///座驾 - SecretaryRouterType_Car = 7, - ///头饰 - SecretaryRouterType_Headwear = 8, - ///铭牌 - SecretaryRouterType_Nameplate = 9, - ///设置密码 - SecretaryRouterType_Set_Password = 53, - ///VIP中心 - SecretaryRouterType_Nobel_Center = 54, - ///资料卡装扮 - SecretaryRouterType_User_Card = 55, - ///VIP气泡 - SecretaryRouterType_Nobel_Bubble = 56, - ///装扮商城 - SecretaryRouterType_Dressup_Shop = 73, - ///我的装扮 - SecretaryRouterType_My_Dressup = 74, - ///广场话题 - SecretaryRouterType_Square_Topic = 75, -}; - -@interface ContentSecretaryModel : PIBaseModel -///最近回话列表需要显示的内容 推送的内容 -@property (nonatomic,copy) NSString *msg; -///私聊消息需要显示的内容 -@property (nonatomic,copy) NSString *title; -///跳转的类型 -@property (nonatomic,assign) SecretaryRouterType routerType; -///(转跳当前界面需要传的参) -@property (nonatomic,strong) NSString *routerValue; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.m b/YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.m deleted file mode 100644 index 3cb7846..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// ContentSecretaryModel.m -// YUMI -// -// Created by YUMI on 2022/4/22. -// - -#import "ContentSecretaryModel.h" - -@implementation ContentSecretaryModel - -@end diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentShareMonentsModel.h b/YuMi/Modules/YMMessage/Model/SessionContent/ContentShareMonentsModel.h deleted file mode 100644 index 7685eac..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentShareMonentsModel.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// ContentShareMonentsModel.h -// YUMI -// -// Created by YUMI on 2022/6/27. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface ContentShareMonentsModel : PIBaseModel -///动态分享 -@property (nonatomic,copy) NSString *dynamicId; -///话题id -@property (nonatomic,copy) NSString *worldId; -///封面 -@property (nonatomic,copy) NSString *imageUrl; -///名称 -@property (nonatomic,copy) NSString *nick; -///发布者的uid -@property (nonatomic,copy) NSString *publishUid; -///内容 -@property (nonatomic,copy) NSString *content; -///头像 -@property (nonatomic,copy) NSString *avatar; -///标题 -@property (nonatomic,copy) NSString *title; -///跳转类型 -@property (nonatomic,assign) NSInteger routerType; -///跳转的id -@property (nonatomic,copy) NSString *routerValue; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentShareMonentsModel.m b/YuMi/Modules/YMMessage/Model/SessionContent/ContentShareMonentsModel.m deleted file mode 100644 index 6656ea8..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentShareMonentsModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// ContentShareMonentsModel.m -// YUMI -// -// Created by YUMI on 2022/6/27. -// - -#import "ContentShareMonentsModel.h" - -@implementation ContentShareMonentsModel - -@end diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentTreasureFairyModel.h b/YuMi/Modules/YMMessage/Model/SessionContent/ContentTreasureFairyModel.h deleted file mode 100644 index 4cef9a4..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentTreasureFairyModel.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// ContentTreasureFairyModel.h -// xplan-ios -// -// Created by 冯硕 on 2023/2/23. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface ContentTreasureFairyModel : PIBaseModel -///用户uid -@property (nonatomic,copy) NSString *uid; -///目标用户的uid -@property (nonatomic,copy) NSString *targetUid; -///精灵的id -@property (nonatomic,copy) NSString *elfId; -///精灵的图片 -@property (nonatomic,copy) NSString *elfPicUrl; -///显示的内容 -@property (nonatomic,copy) NSString *msgContent; -///精灵的名称 -@property (nonatomic,copy) NSString *elfName; -///目标用户的昵称 -@property (nonatomic,copy) NSString *targetNick; -///用户的昵称 -@property (nonatomic,copy) NSString *nick; -///是否已经赠送过了 -@property (nonatomic,assign) BOOL isSended; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentTreasureFairyModel.m b/YuMi/Modules/YMMessage/Model/SessionContent/ContentTreasureFairyModel.m deleted file mode 100644 index a030e53..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentTreasureFairyModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// ContentTreasureFairyModel.m -// xplan-ios -// -// Created by 冯硕 on 2023/2/23. -// - -#import "ContentTreasureFairyModel.h" - -@implementation ContentTreasureFairyModel - -@end diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentTweetModel.h b/YuMi/Modules/YMMessage/Model/SessionContent/ContentTweetModel.h deleted file mode 100644 index a61c13d..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentTweetModel.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// ContentTweetModel.h -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface ContentTweetModel : PIBaseModel -///跳转的地址 -@property (nonatomic,copy) NSString *webUrl; -///标题 -@property (nonatomic,copy) NSString *title; -///描述 -@property (nonatomic,copy) NSString *desc; -///显示的照片 -@property (nonatomic,copy) NSString *picUrl; -///跳转类型 1：房间， 2：h5 -@property (nonatomic, assign) NSInteger routerType; -///跳转内容--H5链接或者房主uid -@property (nonatomic, copy) NSString *routerValue; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentTweetModel.m b/YuMi/Modules/YMMessage/Model/SessionContent/ContentTweetModel.m deleted file mode 100644 index c1a761a..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentTweetModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// ContentTweetModel.m -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import "ContentTweetModel.h" - -@implementation ContentTweetModel - -@end diff --git a/YuMi/Modules/YMMessage/Model/SessionSettingModel.h b/YuMi/Modules/YMMessage/Model/SessionSettingModel.h deleted file mode 100644 index 32619ad..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionSettingModel.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// SessionSettingModel.h -// YUMI -// -// Created by YUMI on 2023/1/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, SessionSettingType) { - ///置顶 - SessionSettingType_Top, -///加入黑名单 - SessionSettingType_black, - ///举报 - SessionSettingType_report -}; - -@interface SessionSettingModel : PIBaseModel -///显示标题 -@property (nonatomic,copy) NSString *title; -///类型 -@property (nonatomic,assign) SessionSettingType settingType; -///状态 -@property (nonatomic,assign) BOOL state; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/SessionSettingModel.m b/YuMi/Modules/YMMessage/Model/SessionSettingModel.m deleted file mode 100644 index a57aa8b..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionSettingModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// SessionSettingModel.m -// YUMI -// -// Created by YUMI on 2023/1/18. -// - -#import "SessionSettingModel.h" - -@implementation SessionSettingModel - -@end diff --git a/YuMi/Modules/YMMessage/Model/SessionToolBar/MessageMenuModel.h b/YuMi/Modules/YMMessage/Model/SessionToolBar/MessageMenuModel.h deleted file mode 100644 index bcb6117..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionToolBar/MessageMenuModel.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// MessageMenuModel.h -// YUMI -// -// Created by YUMI on 2022/4/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, MessageMenuType) { - ///发送图片 - MessageMenuType_Photo = 1, - ///送礼物 - MessageMenuType_Gift -}; - -@interface MessageMenuModel : PIBaseModel -///图片 -@property (nonatomic,strong) NSString *imageName; -///类型 -@property (nonatomic,assign) MessageMenuType type; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Model/SessionToolBar/MessageMenuModel.m b/YuMi/Modules/YMMessage/Model/SessionToolBar/MessageMenuModel.m deleted file mode 100644 index dc1a749..0000000 --- a/YuMi/Modules/YMMessage/Model/SessionToolBar/MessageMenuModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MessageMenuModel.m -// YUMI -// -// Created by YUMI on 2022/4/21. -// - -#import "MessageMenuModel.h" - -@implementation MessageMenuModel - -@end diff --git a/YuMi/Modules/YMMessage/Presenter/MessagePresenter.h b/YuMi/Modules/YMMessage/Presenter/MessagePresenter.h deleted file mode 100644 index eee94c4..0000000 --- a/YuMi/Modules/YMMessage/Presenter/MessagePresenter.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// MessagePresenter.h -// YUMI -// -// Created by zu on 2021/12/8. -// - -#import "BaseMvpPresenter.h" -#import "UserInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MessagePresenter : BaseMvpPresenter - -- (void)getChatLimitReceiverUid:(NSString *)receiverUid; - -/// 获取用户信息 -/// @param uid 用户uid -- (void)getUserInfo:(NSString *)uid; -///是否关注当前用户 -- (void)getFansLike:(NSString *)likeUid; -/// 关注用户 -/// @param targetUid 目标用户的uid -- (void)attentionUser:(NSString *)targetUid; - -// 获取用户信息 -- (void)getUserInfoWithUid:(NSString *)uid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Presenter/MessagePresenter.m b/YuMi/Modules/YMMessage/Presenter/MessagePresenter.m deleted file mode 100644 index 6ca75ad..0000000 --- a/YuMi/Modules/YMMessage/Presenter/MessagePresenter.m +++ /dev/null @@ -1,79 +0,0 @@ -// -// MessagePresenter.m -// YUMI -// -// Created by zu on 2021/12/8. -// - -#import "MessagePresenter.h" -#import "Api+Message.h" -#import "ChatLimitModel.h" -#import "MessageProtocol.h" -#import "Api+Mine.h" -#import "UserInfoModel.h" -#import "AccountInfoStorage.h" -#import "NIMMessageUtils.h" -#import "XPMessageRemoteExtModel.h" - -@implementation MessagePresenter - -// 获取用户信息 -- (void)getUserInfoWithUid:(NSString *)uid { - @kWeakify(self); - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetUserInfoSuccess:infoModel]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - if ([self.getView respondsToSelector:@selector(onGetUserFailure:)]) { - [self.getView onGetUserFailure:code]; - } - }] uid:uid]; -} - -- (void)getChatLimitReceiverUid:(NSString *)receiverUid { - @kWeakify(self); - [Api getChatLimit:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - ChatLimitModel *chatLimit = [ChatLimitModel modelWithJSON:data.data]; - [[self getView] onGetLimitChat:chatLimit]; - } showLoading:NO errorToast:NO] receiverUid:receiverUid]; -} - -/// 获取用户信息 -/// @param uid 用户uid -- (void)getUserInfo:(NSString *)uid { - @kWeakify(self); - [Api userDetailInfoCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetSessionUserInfoSuccess:infoModel]; - }] uid:uid page:@"1" pageSize:@"20"]; -} - -///是否关注当前用户 -- (void)getFansLike:(NSString *)likeUid { - @kWeakify(self); - NSString * uid = [AccountInfoStorage instance].getUid; - [Api attentionStatusCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - BOOL isLike = [data.data boolValue] || [NIMMessageUtils isOfficalAccount:likeUid]; - [[self getView] getFansLikeSuccess:isLike]; - }] uid:uid isLikeUid:likeUid]; -} - -/// 关注用户 -/// @param targetUid 目标用户的uid -- (void)attentionUser:(NSString *)targetUid { - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * type = @"1"; - @kWeakify(self); - [Api attentionCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] attentionUserSuccess:targetUid]; - } showLoading:YES] uid:uid likedUid:targetUid ticket:ticket type:type]; -} - - -@end diff --git a/YuMi/Modules/YMMessage/Protocol/MessageProtocol.h b/YuMi/Modules/YMMessage/Protocol/MessageProtocol.h deleted file mode 100644 index 7219543..0000000 --- a/YuMi/Modules/YMMessage/Protocol/MessageProtocol.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// MessageProtocol.h -// YUMI -// -// Created by zu on 2021/12/8. -// - -#import - -@class ChatLimitModel, UserInfoModel, NIMChatroom; - -NS_ASSUME_NONNULL_BEGIN - -@protocol MessageProtocol -@optional -- (void)onGetLimitChat:(ChatLimitModel *)chatLimit; - -///获取用户信息成功 -- (void)onGetSessionUserInfoSuccess:(UserInfoModel *)userInfo; - -- (void)onGetUserFailure:(NSInteger)code; - -///获取粉丝喜欢成功 -- (void)getFansLikeSuccess:(BOOL)isLike; -///关注成功 -- (void)attentionUserSuccess:(NSString *)uid; - -///获取用户信息 -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Tool/CustomAttachmentDecoder.h b/YuMi/Modules/YMMessage/Tool/CustomAttachmentDecoder.h deleted file mode 100644 index 1f9645e..0000000 --- a/YuMi/Modules/YMMessage/Tool/CustomAttachmentDecoder.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// CustomAttachmentDecoder.h -// YUMI -// -// Created by YUMI on 2021/11/16. -// - -#import -#import -NS_ASSUME_NONNULL_BEGIN - -@interface CustomAttachmentDecoder : NSObject - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/Tool/CustomAttachmentDecoder.m b/YuMi/Modules/YMMessage/Tool/CustomAttachmentDecoder.m deleted file mode 100644 index 72ffd93..0000000 --- a/YuMi/Modules/YMMessage/Tool/CustomAttachmentDecoder.m +++ /dev/null @@ -1,62 +0,0 @@ -// -// CustomAttachmentDecoder.m -// YUMI -// -// Created by YUMI on 2021/11/16. -// - -#import "CustomAttachmentDecoder.h" -#import "NSObject+MJExtension.h" -#import "AttachmentModel.h" - -@implementation CustomAttachmentDecoder - -- (id)decodeAttachment:(NSString *)content{ - id attachment; - NSData *data = [content dataUsingEncoding:NSUTF8StringEncoding]; - if (data) { - NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data - options:0 - error:nil]; - if ([dict isKindOfClass:[NSDictionary class]]) { - int first = [dict[@"first"] intValue]; - int second = [dict[@"second"] intValue]; - id originalData = dict[@"data"]; - - AttachmentModel *model = [[AttachmentModel alloc]init]; - model.first = (short)first; - model.second = (short)second; - - if ([originalData isKindOfClass:[NSArray class]]) { - model.data = originalData; - } else if ([originalData isKindOfClass:[NSDictionary class]]) { - model.data = originalData; - } else if ([originalData isKindOfClass:[NSString class]]) { - NSDictionary *jsonDict = [self dictionaryWithJsonString:(NSString *)originalData]; - if ([jsonDict isKindOfClass:[NSDictionary class]]) { - model.data = jsonDict; - } - } - attachment = model; - } - } - return attachment; -} -//json格式字符串转字典： -- (NSDictionary *)dictionaryWithJsonString:(NSString *)jsonString { - if (jsonString == nil || jsonString.length == 0) { - return nil; - } - NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding]; - NSError *err; - NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData - options:NSJSONReadingMutableContainers - error:&err]; - if(err) { -// NSLog(@"json解析失败：%@",err); - return nil; - } - return dic; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/FindNew/Api/Api+FindNew.h b/YuMi/Modules/YMMessage/View/FindNew/Api/Api+FindNew.h deleted file mode 100644 index ef30d5a..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/Api/Api+FindNew.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// Api+FindNew.h -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (FindNew) -///发现萌新 -+ (void)findNewUser:(HttpRequestHelperCompletion)completion; - -/// 打招呼用语列表 -/// @param completion 完成 -/// @param start 开始 -/// @param pageSize 一页多少个 -+ (void)findNewGreetMessageList:(HttpRequestHelperCompletion)completion start:(NSString *)start pageSize:(NSString *)pageSize; - -/// 打招呼 -/// @param completion 完成 -/// @param helloUid 打招呼的uid -/// @param message 打招呼的消息 -+ (void)findNewUserGreet:(HttpRequestHelperCompletion)completion helloUid:(NSString *)helloUid message:(NSString *)message; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/Api/Api+FindNew.m b/YuMi/Modules/YMMessage/View/FindNew/Api/Api+FindNew.m deleted file mode 100644 index 30040f3..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/Api/Api+FindNew.m +++ /dev/null @@ -1,41 +0,0 @@ -// -// Api+FindNew.m -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import "Api+FindNew.h" -#import "NSMutableDictionary+Saft.h" -#import -@implementation Api (FindNew) - -///发现萌新 -+ (void)findNewUser:(HttpRequestHelperCompletion)completion { - NSMutableDictionary * pararms = [NSMutableDictionary dictionary]; - [pararms safeSetObject:@"1" forKey:@"page"]; - [pararms safeSetObject:@"20" forKey:@"pageSize"]; - NSString * fang = [NSString stringFromBase64String:@"bmV3YmllL3Bvb2xMaXN0"];//newbie/poolList - [HttpRequestHelper request:fang method:HttpRequestHelperMethodGET params:pararms completion:completion]; -} - - -/// 打招呼用语列表 -/// @param completion 完成 -/// @param start 开始 -/// @param pageSize 一页多少个 -+ (void)findNewGreetMessageList:(HttpRequestHelperCompletion)completion start:(NSString *)start pageSize:(NSString *)pageSize { - NSString * fang = [NSString stringFromBase64String:@"bmV3YmllL21lc3NhZ2VMaXN0"];//newbie/messageList - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, start, pageSize, nil]; -} - -/// 打招呼 -/// @param completion 完成 -/// @param helloUid 打招呼的uid -/// @param message 打招呼的消息 -+ (void)findNewUserGreet:(HttpRequestHelperCompletion)completion helloUid:(NSString *)helloUid message:(NSString *)message { - NSString * fang = [NSString stringFromBase64String:@"bmV3YmllL2hlbGxv"];//newbie/hello - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion,__FUNCTION__, helloUid, message, nil]; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetListModel.h b/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetListModel.h deleted file mode 100644 index 3dc1a9a..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetListModel.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// FindNewGreetListModel.h -// YUMI -// -// Created by YUMI on 2022/6/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class FindNewGreetModel; -@interface FindNewGreetListModel : PIBaseModel - -///开始的 -@property (nonatomic,copy) NSString * start; -///列表 -@property (nonatomic,strong) NSArray *list; - -@end - - -@interface FindNewGreetModel : PIBaseModel -///id -@property (nonatomic,assign) NSInteger fId; -///消息 -@property (nonatomic,copy) NSString *message; -///是否选中 -@property (nonatomic,assign) BOOL isSelect; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetListModel.m b/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetListModel.m deleted file mode 100644 index 21e4bdc..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetListModel.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// FindNewGreetListModel.m -// YUMI -// -// Created by YUMI on 2022/6/13. -// - -#import "FindNewGreetListModel.h" - -@implementation FindNewGreetListModel -///扩展方法 按需索取 重写即可 -///如果一个模型中 包含一个数组 数组中是另一个模型 -+ (NSDictionary *)objectClassInArray { - return @{@"list": FindNewGreetModel.class}; -} -@end - - -@implementation FindNewGreetModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"fId": @"id"}; -} -@end diff --git a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetMessageModel.h b/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetMessageModel.h deleted file mode 100644 index 7d235bd..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetMessageModel.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// FindNewGreetMessageModel.h -// YUMI -// -// Created by YUMI on 2022/6/17. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface FindNewGreetMessageModel : PIBaseModel -///头像 -@property (nonatomic,copy) NSString *avatar; -///用户uid -@property (nonatomic,copy)NSString *uid; -///用户所在房间inRoomUid -@property (nonatomic,copy)NSString *inRoomUid; -///萌新昵称 -@property (nonatomic,copy) NSString *nick; -///打招呼内容 -@property (nonatomic,copy) NSString *message; -///性别 -@property(nonatomic,assign) GenderType gender; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetMessageModel.m b/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetMessageModel.m deleted file mode 100644 index 69988fb..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetMessageModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// FindNewGreetMessageModel.m -// YUMI -// -// Created by YUMI on 2022/6/17. -// - -#import "FindNewGreetMessageModel.h" - -@implementation FindNewGreetMessageModel - -@end diff --git a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewUserInfoModel.h b/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewUserInfoModel.h deleted file mode 100644 index e715fd1..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewUserInfoModel.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// FindNewUserInfoModel.h -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface FindNewUserInfoModel : PIBaseModel -///生日 -@property(nonatomic,assign) long birth; -///头像 -@property (nonatomic,copy) NSString *avatar; -///魅力等级 -@property (nonatomic,copy) NSString *charmUrl; -///平台id -@property (nonatomic,copy) NSString *erbanNo; -///等级 -@property (nonatomic,copy) NSString *experUrl; -///性别 -@property (nonatomic,assign) GenderType gender; -///uid -@property (nonatomic,copy) NSString *uid; -///昵称 -@property (nonatomic,copy) NSString *nick; -///是否打招呼 -@property (nonatomic,assign) BOOL hello; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewUserInfoModel.m b/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewUserInfoModel.m deleted file mode 100644 index f2d598d..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewUserInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// FindNewUserInfoModel.m -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import "FindNewUserInfoModel.h" - -@implementation FindNewUserInfoModel - -@end diff --git a/YuMi/Modules/YMMessage/View/FindNew/Presenter/XPSessionFindNewPresenter.h b/YuMi/Modules/YMMessage/View/FindNew/Presenter/XPSessionFindNewPresenter.h deleted file mode 100644 index aaedfba..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/Presenter/XPSessionFindNewPresenter.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMSessionFindNewPresenter.h -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSessionFindNewPresenter : BaseMvpPresenter - -- (void)getFindNewUser; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/Presenter/XPSessionFindNewPresenter.m b/YuMi/Modules/YMMessage/View/FindNew/Presenter/XPSessionFindNewPresenter.m deleted file mode 100644 index 6d066c3..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/Presenter/XPSessionFindNewPresenter.m +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMSessionFindNewPresenter.m -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import "XPSessionFindNewPresenter.h" -#import "XPSessionFindNewProtocol.h" -#import "FindNewUserInfoModel.h" -#import "Api+FindNew.h" -@implementation XPSessionFindNewPresenter - -- (void)getFindNewUser { - [Api findNewUser:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [FindNewUserInfoModel modelsWithArray:data.data]; - [[self getView] getFindNewUserSuccess:array]; - }]]; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/FindNew/Protocol/XPSessionFindNewProtocol.h b/YuMi/Modules/YMMessage/View/FindNew/Protocol/XPSessionFindNewProtocol.h deleted file mode 100644 index 4537ca4..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/Protocol/XPSessionFindNewProtocol.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMSessionFindNewProtocol.h -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPSessionFindNewProtocol - -- (void)getFindNewUserSuccess:(NSArray *)list; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.h b/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.h deleted file mode 100644 index 963b955..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMSessionFindNewEmptyTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSessionFindNewEmptyTableViewCell : UITableViewCell - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.m b/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.m deleted file mode 100644 index d1aa4e2..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.m +++ /dev/null @@ -1,72 +0,0 @@ -// -// YMSessionFindNewEmptyTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import "XPSessionFindNewEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPSessionFindNewEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPSessionFindNewEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(250); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPSessionFindNewEmptyTableViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} -@end diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.h b/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.h deleted file mode 100644 index addf3ec..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMSessionFindNewGreetTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/6/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class FindNewGreetModel, XPSessionFindNewGreetTableViewCell; -@protocol XPSessionFindNewGreetTableViewCellDelegate - -///选择了某个item -- (void)xPSessionFindNewGreetTableViewCell:(XPSessionFindNewGreetTableViewCell *)view didSelectItem:(FindNewGreetModel *)model; - -@end - -@interface XPSessionFindNewGreetTableViewCell : UITableViewCell -@property (nonatomic,strong) FindNewGreetModel *greetModel; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.m b/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.m deleted file mode 100644 index f895a62..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// YMSessionFindNewGreetTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/6/13. -// - -#import "XPSessionFindNewGreetTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "FindNewGreetListModel.h" - -@interface XPSessionFindNewGreetTableViewCell () -///选择 -@property (nonatomic,strong) UIButton *chooseButton; -///选择标题 -@property (nonatomic,strong) UILabel *titleLabel; -@end - - -@implementation XPSessionFindNewGreetTableViewCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.chooseButton]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.chooseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.titleLabel.mas_centerY); - make.leading.mas_equalTo(15); - make.height.width.mas_equalTo(18); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(10); - make.leading.mas_equalTo(self.chooseButton.mas_trailing).offset(15); - make.trailing.mas_lessThanOrEqualTo(-15); - }]; -} - -#pragma mark - Event Response -- (void)chooseButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPSessionFindNewGreetTableViewCell:didSelectItem:)]) { - [self.delegate xPSessionFindNewGreetTableViewCell:self didSelectItem:self.greetModel]; - } -} -#pragma mark - Getters And Setters -- (void)setGreetModel:(FindNewGreetModel *)greetModel { - _greetModel = greetModel; - if (_greetModel) { - self.titleLabel.text = _greetModel.message; - self.chooseButton.selected = _greetModel.isSelect; - } -} - -- (UIButton *)chooseButton { - if (!_chooseButton) { - _chooseButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_chooseButton setImage:[UIImage imageNamed:@"mine_guild_guild_manager_normal"] forState:UIControlStateNormal]; - [_chooseButton setImage:[UIImage imageNamed:@"mine_guild_guild_manager_select"] forState:UIControlStateSelected]; - [_chooseButton addTarget:self action:@selector(chooseButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _chooseButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.numberOfLines = 2; - } - return _titleLabel; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.h b/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.h deleted file mode 100644 index 4433dc7..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMSessionFindNewTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class FindNewUserInfoModel, XPSessionFindNewTableViewCell; -@protocol XPSessionFindNewTableViewCellDelegate -///点击打招呼 -- (void)xPSessionFindNewTableViewCell:(XPSessionFindNewTableViewCell *)cell didSelectItem:(FindNewUserInfoModel *)userInfo; -///点击头像 -- (void)xPSessionFindNewTableViewCell:(XPSessionFindNewTableViewCell *)cell didClickAvatar:(FindNewUserInfoModel *)userInfo; -@end - -@interface XPSessionFindNewTableViewCell : UITableViewCell -///用户信息 -@property (nonatomic,strong) FindNewUserInfoModel *userInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.m b/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.m deleted file mode 100644 index 4231b5a..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.m +++ /dev/null @@ -1,252 +0,0 @@ -// -// YMSessionFindNewTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import "XPSessionFindNewTableViewCell.h" -///Third -#import -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -///Model -#import "FindNewUserInfoModel.h" - -@interface XPSessionFindNewTableViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///性别 -@property (nonatomic,strong) UIButton *sexImageView; -///等级 -@property (nonatomic,strong) NetImageView *experImageView; -///魅力等级 -@property (nonatomic,strong) NetImageView *charmImageView; -///签名 -@property (nonatomic,strong) UILabel * idLabel; -///关注 -@property (nonatomic,strong) UIButton * greetButton; -@end - - -@implementation XPSessionFindNewTableViewCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.stackView]; - [self.contentView addSubview:self.idLabel]; - [self.contentView addSubview:self.greetButton]; - - [self.stackView addArrangedSubview:self.nickLabel]; - [self.stackView addArrangedSubview:self.sexImageView]; - [self.stackView addArrangedSubview:self.experImageView]; - [self.stackView addArrangedSubview:self.charmImageView]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(45, 45)); - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(15); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); - make.trailing.mas_lessThanOrEqualTo(self.greetButton.mas_leading).mas_offset(-4); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.stackView); - make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - make.trailing.mas_equalTo(self.greetButton.mas_leading).mas_offset(-4); - }]; - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(28); - make.height.mas_equalTo(14); - }]; - - [self.greetButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(64); - make.height.mas_equalTo(25); - make.centerY.mas_equalTo(self.contentView); - make.trailing.mas_equalTo(self.contentView).offset(-15); - }]; -} - -#pragma mark - Event Response -- (void)attentionButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPSessionFindNewTableViewCell:didSelectItem:)]) { - [self.delegate xPSessionFindNewTableViewCell:self didSelectItem:self.userInfo]; - } -} - -- (void)avatarTapRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPSessionFindNewTableViewCell:didClickAvatar:)]) { - [self.delegate xPSessionFindNewTableViewCell:self didClickAvatar:self.userInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(FindNewUserInfoModel *)userInfo{ - _userInfo = userInfo; - if (_userInfo) { - self.avatarImageView.imageUrl = _userInfo.avatar; - self.experImageView.imageUrl = _userInfo.experUrl; - self.charmImageView.imageUrl = _userInfo.charmUrl; - self.nickLabel.text = _userInfo.nick; - - [_sexImageView setTitle:[NSString getAgeWithBirth:_userInfo.birth] forState:UIControlStateNormal]; - _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.idLabel.text = [NSString stringWithFormat:@"ID:%@", _userInfo.erbanNo]; - self.greetButton.selected = !_userInfo.hello; - UIImage* image = self.experImageView.image; - if (image) { - CGFloat scale = image.size.width / image.size.height; - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20* scale, 20)); - }]; - } else { - NSURL *imgUrl = [NSURL URLWithString:_userInfo.experUrl]; - UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]]; - if (myImage) { - CGFloat scale = myImage.size.width / myImage.size.height; - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20* scale, 20)); - }]; - } - } - - UIImage* charmImage = self.charmImageView.image; - if (charmImage) { - CGFloat scale = charmImage.size.width / charmImage.size.height; - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20* scale, 20)); - }]; - } else { - NSURL *imgUrl = [NSURL URLWithString:_userInfo.charmUrl]; - UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]]; - if (myImage) { - CGFloat scale = myImage.size.width / myImage.size.height; - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20* scale, 20)); - }]; - } - } - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 45/2; - _avatarImageView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(avatarTapRecognizer)]; - [_avatarImageView addGestureRecognizer:tap]; - } - return _avatarImageView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 2; - } - return _stackView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:15]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UIButton *)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; - } - return _sexImageView; -} - -- (NetImageView *)experImageView { - if (!_experImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _experImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _experImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _charmImageView; -} - - -- (UILabel *)idLabel{ - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _idLabel.font = [UIFont systemFontOfSize:14]; - } - return _idLabel; -} - -- (UIButton *)greetButton { - if (!_greetButton) { - _greetButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_greetButton setTitle:YMLocalizedString(@"XPSessionFindNewTableViewCell0") forState:UIControlStateNormal]; - [_greetButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - _greetButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_greetButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_greetButton setTitle:YMLocalizedString(@"XPSessionFindNewTableViewCell1") forState:UIControlStateDisabled]; - [_greetButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateSelected]; - [_greetButton setBackgroundImage:[UIImage imageWithColor:[DJDKMIMOMColor disableButtonColor]] forState:UIControlStateSelected]; - _greetButton.layer.masksToBounds = YES; - _greetButton.layer.cornerRadius = 25 /2; - [_greetButton addTarget:self action:@selector(attentionButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _greetButton; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.h b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.h deleted file mode 100644 index 12828af..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMSessionFindNewAlertView.h -// YUMI -// -// Created by YUMI on 2022/6/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class FindNewGreetMessageModel; -@interface XPSessionFindNewAlertView : UIView -@property (nonatomic,strong) FindNewGreetMessageModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.m b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.m deleted file mode 100644 index 1f3d8b7..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.m +++ /dev/null @@ -1,207 +0,0 @@ -// -// YMSessionFindNewAlertView.m -// YUMI -// -// Created by YUMI on 2022/6/17. -// - -#import "XPSessionFindNewAlertView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "TTPopup.h" -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "Api+Room.h" -#import "XNDJTDDLoadingTool.h" -#import "XCCurrentVCStackManager.h" -///Model -#import "FindNewGreetMessageModel.h" -#import "RoomInfoModel.h" -///View -#import "XPRoomViewController.h" -#import "SessionViewController.h" -///P -#import "RoomHostDelegate.h" - -@interface XPSessionFindNewAlertView () - -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///内容 -@property (nonatomic,strong) UILabel *messageLabel; -///忽略 -@property (nonatomic,strong) UIButton *cancelButton; -///找他 -@property (nonatomic,strong) UIButton *findButton; -@end - - -@implementation XPSessionFindNewAlertView -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.layer.masksToBounds = YES; - self.layer.cornerRadius = 10; - [self addSubview:self.avatarImageView]; - [self addSubview:self.nickLabel]; - [self addSubview:self.messageLabel]; - [self addSubview:self.cancelButton]; - [self addSubview:self.findButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth - 40 * 2); - make.bottom.mas_equalTo(self.cancelButton.mas_bottom).offset(15); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(75, 75)); - make.top.mas_equalTo(self).offset(20); - make.centerX.mas_equalTo(self); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(10); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(15); - }]; - - [self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(40); - make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(10); - }]; - - [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(120, 40)); - make.trailing.mas_equalTo(self.mas_centerX).offset(-10); - make.top.mas_equalTo(self.messageLabel.mas_bottom).offset(30); - }]; - - [self.findButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.cancelButton); - make.leading.mas_equalTo(self.mas_centerX).offset(10); - }]; -} - -#pragma mark - Event Response -- (void)cancelButtonAction:(UIButton *)sender { - [TTPopup dismiss]; -} - -- (void)findButtonAction:(UIButton *)sender { - if (self.userInfo.uid.integerValue > 0) { - [Api requestUserInRoom:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:data.data]; - if (roomInfo.uid && self.userInfo.uid && self.userInfo.nick.length > 0) { - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController popToRootViewControllerAnimated:NO]; - XPRoomViewController * rooomVC = obj; - [rooomVC exitRoom]; - *stop = YES; - } - }]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:[NSString stringWithFormat:@"%ld", roomInfo.uid] fromNick:self.userInfo.nick fromType:UserEnterRoomFromType_Follow_User fromUid:self.userInfo.uid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } else { - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:[NIMSession session:self.userInfo.uid type:NIMSessionTypeP2P]]; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:sessionVC animated:YES]; - } - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } uid:self.userInfo.uid]; - } - [TTPopup dismiss]; -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(FindNewGreetMessageModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.avatarImageView.imageUrl = _userInfo.avatar; - self.nickLabel.text = _userInfo.nick; - self.messageLabel.text = _userInfo.message; - } -} - - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 75 /2; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _nickLabel.textAlignment = NSTextAlignmentCenter; - } - return _nickLabel; -} - -- (UILabel *)messageLabel { - if (!_messageLabel) { - _messageLabel = [[UILabel alloc] init]; - _messageLabel.font = [UIFont systemFontOfSize:15]; - _messageLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _messageLabel.textAlignment = NSTextAlignmentCenter; - _messageLabel.numberOfLines = 0; - } - return _messageLabel; -} - -- (UIButton *)cancelButton { - if (!_cancelButton) { - _cancelButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_cancelButton setTitle:YMLocalizedString(@"XPSessionFindNewAlertView0") forState:UIControlStateNormal]; - [_cancelButton setTitleColor:[DJDKMIMOMColor cancelButtonTextColor] forState:UIControlStateNormal]; - _cancelButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_cancelButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _cancelButton.layer.masksToBounds = YES; - _cancelButton.layer.cornerRadius = 10; - [_cancelButton addTarget:self action:@selector(cancelButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _cancelButton; -} - -- (UIButton *)findButton { - if (!_findButton) { - _findButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_findButton setTitle:YMLocalizedString(@"XPSessionFindNewAlertView2") forState:UIControlStateNormal]; - [_findButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - _findButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_findButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _findButton.layer.masksToBounds = YES; - _findButton.layer.cornerRadius = 10; - [_findButton addTarget:self action:@selector(findButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _findButton; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.h b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.h deleted file mode 100644 index 84cb696..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// YMSessionFindNewFiltrateView.h -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPSessionFindNewFiltrateView; -@protocol XPSessionFindNewFiltrateViewDelegate - -- (void)xPSessionFindNewFiltrateView:(NSString *)chooseHello chooseSex:(NSString *)sex; - -@end - -@interface XPSessionFindNewFiltrateView : UIView -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.m b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.m deleted file mode 100644 index 2ae2bf5..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.m +++ /dev/null @@ -1,349 +0,0 @@ -// -// YMSessionFindNewFiltrateView.m -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import "XPSessionFindNewFiltrateView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "YUMIMacroUitls.h" - -@interface XPSessionFindNewFiltrateView () - -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///性别 -@property (nonatomic,strong) UILabel *sexLabel; -///容器 -@property (nonatomic,strong) UIStackView *sexStackView; -///全部 -@property (nonatomic,strong) UIButton *allButton; -///男性 -@property (nonatomic,strong) UIButton *maleButton; -///女性 -@property (nonatomic,strong) UIButton *femaleButton; -///确认 -@property (nonatomic,strong) UIButton *sureButton; -///打招呼 -@property (nonatomic,strong) UILabel *helloLabel; -///招呼容器 -@property (nonatomic,strong) UIStackView *helloStackView; -///全部 -@property (nonatomic,strong) UIButton *allHelloButton; -///未达招呼 -@property (nonatomic,strong) UIButton *notHellowButton; -///一打招呼 -@property (nonatomic,strong) UIButton *helloButton; -///选择的性别 -@property (nonatomic,copy) NSString *sexChoose; -///打招呼 -@property (nonatomic,copy) NSString *helloChoose; -@end - - -@implementation XPSessionFindNewFiltrateView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.sexChoose = @"0"; - [self addSubview:self.titleLabel]; - [self addSubview:self.sexLabel]; - [self addSubview:self.sexStackView]; - [self addSubview:self.helloLabel]; - [self addSubview:self.helloStackView]; - [self addSubview:self.sureButton]; - - [self.sexStackView addArrangedSubview:self.allButton]; - [self.sexStackView addArrangedSubview:self.femaleButton]; - [self.sexStackView addArrangedSubview:self.maleButton]; - - [self.helloStackView addArrangedSubview:self.allHelloButton]; - [self.helloStackView addArrangedSubview:self.helloButton]; - [self.helloStackView addArrangedSubview:self.notHellowButton]; - - self.backgroundColor = [UIColor whiteColor]; - CAShapeLayer * layer = [CAShapeLayer layer]; - layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, 315) byRoundingCorners:UIRectCornerTopLeft| UIRectCornerTopRight cornerRadii:CGSizeMake(10, 10)].CGPath; - self.layer.masksToBounds = YES; - self.layer.mask = layer; - [self sexButtonAction:self.allButton]; - [self helloButtonAction:self.allHelloButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(315); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self).offset(15); - }]; - - [self.sexLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(15); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(12); - }]; - - [self.sexStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.sexLabel); - make.top.mas_equalTo(self.sexLabel.mas_bottom).offset(12); - make.height.mas_equalTo(26); - make.width.mas_equalTo(72 * 3 + 20 * 2); - }]; - - [self.helloLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(15); - make.top.mas_equalTo(self.sexStackView.mas_bottom).offset(24); - }]; - - [self.helloStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.sexLabel); - make.top.mas_equalTo(self.helloLabel.mas_bottom).offset(12); - make.height.mas_equalTo(26); - make.width.mas_equalTo(72 * 3 + 20 * 2); - }]; - - [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(57); - make.height.mas_equalTo(38); - make.bottom.mas_equalTo(self).offset(-45); - }]; -} -#pragma mark - Event Response -- (void)sexButtonAction:(UIButton *)sender { - self.allButton.selected = NO; - self.femaleButton.selected = NO; - self.maleButton.selected = NO; - self.allButton.layer.borderWidth = 0; - self.femaleButton.layer.borderWidth = 0; - self.maleButton.layer.borderWidth = 0; - sender.layer.borderWidth = 0.5; - sender.selected = YES; - self.sexChoose = [NSString stringWithFormat:@"%ld", sender.tag - 1000]; -} - -- (void)helloButtonAction:(UIButton *)sender { - self.helloButton.selected = NO; - self.notHellowButton.selected = NO; - self.allHelloButton.selected = NO; - sender.selected = YES; - self.allHelloButton.layer.borderWidth = 0; - self.helloButton.layer.borderWidth = 0; - self.notHellowButton.layer.borderWidth = 0; - sender.layer.borderWidth = 0.5; - self.helloChoose = [NSString stringWithFormat:@"%ld", sender.tag - 1000]; -} - -- (void)sureButtonAction:(UIButton *)sener { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPSessionFindNewFiltrateView:chooseSex:)]) { - [self.delegate xPSessionFindNewFiltrateView:self.helloChoose chooseSex:self.sexChoose]; - } -} - -#pragma mark - Getters And Setters -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightSemibold]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.text = YMLocalizedString(@"XPSessionFindNewFiltrateView0"); - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (UILabel *)sexLabel { - if (!_sexLabel) { - _sexLabel = [[UILabel alloc] init]; - _sexLabel.font = [UIFont systemFontOfSize:15]; - _sexLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _sexLabel.text = YMLocalizedString(@"XPSessionFindNewFiltrateView1"); - } - return _sexLabel; -} - -- (UIStackView *)sexStackView { - if (!_sexStackView) { - _sexStackView = [[UIStackView alloc] init]; - _sexStackView.axis = UILayoutConstraintAxisHorizontal; - _sexStackView.distribution = UIStackViewDistributionFillEqually; - _sexStackView.alignment = UIStackViewAlignmentFill; - _sexStackView.spacing = 20; - } - return _sexStackView; -} - - -- (UIButton *)maleButton { - if (!_maleButton) { - _maleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_maleButton setTitle:YMLocalizedString(@"XPSessionFindNewFiltrateView2") forState:UIControlStateNormal]; - [_maleButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _maleButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_maleButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - [_maleButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateSelected]; - [_maleButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xF1F1FA)] forState:UIControlStateNormal]; - [_maleButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xFFF0C9)] forState:UIControlStateSelected]; - _maleButton.layer.borderWidth = 0; - _maleButton.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - _maleButton.layer.masksToBounds = YES; - _maleButton.layer.cornerRadius = 13; - _maleButton.tag = 1001; - [_maleButton addTarget:self action:@selector(sexButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _maleButton; -} - -- (UIButton *)femaleButton { - if (!_femaleButton) { - _femaleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_femaleButton setTitle:YMLocalizedString(@"XPSessionFindNewFiltrateView3") forState:UIControlStateNormal]; - [_femaleButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _femaleButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_femaleButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - [_femaleButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateSelected]; - [_femaleButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xF1F1FA)] forState:UIControlStateNormal]; - [_femaleButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xFFF0C9)] forState:UIControlStateSelected]; - _femaleButton.layer.borderWidth = 0; - _femaleButton.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - _femaleButton.layer.masksToBounds = YES; - _femaleButton.layer.cornerRadius = 13; - _femaleButton.tag = 1002; - [_femaleButton addTarget:self action:@selector(sexButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _femaleButton; -} - -- (UIButton *)allButton { - if (!_allButton) { - _allButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_allButton setTitle:YMLocalizedString(@"XPSessionFindNewFiltrateView4") forState:UIControlStateNormal]; - [_allButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _allButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_allButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - [_allButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateSelected]; - [_allButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xF1F1FA)] forState:UIControlStateNormal]; - [_allButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xFFF0C9)] forState:UIControlStateSelected]; - _allButton.layer.borderWidth = 0.5; - _allButton.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - _allButton.layer.masksToBounds = YES; - _allButton.layer.cornerRadius = 13; - _allButton.tag = 1000; - _allButton.selected = YES; - [_allButton addTarget:self action:@selector(sexButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _allButton; -} - -- (UILabel *)helloLabel { - if (!_helloLabel) { - _helloLabel = [[UILabel alloc] init]; - _helloLabel.font = [UIFont systemFontOfSize:15]; - _helloLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _helloLabel.text = YMLocalizedString(@"XPSessionFindNewFiltrateView5"); - } - return _helloLabel; -} - -- (UIStackView *)helloStackView { - if (!_helloStackView) { - _helloStackView = [[UIStackView alloc] init]; - _helloStackView.axis = UILayoutConstraintAxisHorizontal; - _helloStackView.distribution = UIStackViewDistributionFillEqually; - _helloStackView.alignment = UIStackViewAlignmentFill; - _helloStackView.spacing = 20; - } - return _helloStackView; -} - -- (UIButton *)helloButton { - if (!_helloButton) { - _helloButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_helloButton setTitle:YMLocalizedString(@"XPSessionFindNewFiltrateView6") forState:UIControlStateNormal]; - [_helloButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _helloButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_helloButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - [_helloButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateSelected]; - [_helloButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xF1F1FA)] forState:UIControlStateNormal]; - [_helloButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xFFF0C9)] forState:UIControlStateSelected]; - _helloButton.layer.borderWidth = 0.5; - _helloButton.layer.masksToBounds = YES; - _helloButton.layer.cornerRadius = 13; - _helloButton.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - _helloButton.tag = 1001; - [_helloButton addTarget:self action:@selector(helloButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _helloButton; -} - -- (UIButton *)notHellowButton { - if (!_notHellowButton) { - _notHellowButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_notHellowButton setTitle:YMLocalizedString(@"XPSessionFindNewFiltrateView7") forState:UIControlStateNormal]; - [_notHellowButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _notHellowButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_notHellowButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - [_notHellowButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateSelected]; - [_notHellowButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xF1F1FA)] forState:UIControlStateNormal]; - [_notHellowButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xFFF0C9)] forState:UIControlStateSelected]; - _notHellowButton.layer.borderWidth = 0.5; - _notHellowButton.layer.masksToBounds = YES; - _notHellowButton.layer.cornerRadius = 13; - _notHellowButton.tag = 1002; - _notHellowButton.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - [_notHellowButton addTarget:self action:@selector(helloButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _notHellowButton; -} - -- (UIButton *)allHelloButton { - if (!_allHelloButton) { - _allHelloButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_allHelloButton setTitle:YMLocalizedString(@"XPSessionFindNewFiltrateView8") forState:UIControlStateNormal]; - [_allHelloButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _allHelloButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_allHelloButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - [_allHelloButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateSelected]; - [_allHelloButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xF1F1FA)] forState:UIControlStateNormal]; - [_allHelloButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xFFF0C9)] forState:UIControlStateSelected]; - _allHelloButton.layer.borderWidth = 0.5; - _allHelloButton.layer.masksToBounds = YES; - _allHelloButton.layer.cornerRadius = 13; - _allHelloButton.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - _allHelloButton.tag = 1000; - [_allHelloButton addTarget:self action:@selector(helloButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _allHelloButton; -} - -- (UIButton *)sureButton { - if (!_sureButton) { - _sureButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sureButton setTitle:YMLocalizedString(@"XPSessionFindNewFiltrateView9") forState:UIControlStateNormal]; - [_sureButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _sureButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_sureButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _sureButton.layer.masksToBounds = YES; - _sureButton.layer.cornerRadius = 38/2; - [_sureButton addTarget:self action:@selector(sureButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _sureButton; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.h b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.h deleted file mode 100644 index 6572c28..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMSessionFindNewGreetListView.h -// YUMI -// -// Created by YUMI on 2022/6/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPSessionFindNewGreetListView; -@protocol XPSessionFindNewGreetListViewDelegate - -///打招呼成功 -- (void)xPSessionFindNewGreetListView:(XPSessionFindNewGreetListView *)view greetUserId:(NSString *)userId; - -@end - -@interface XPSessionFindNewGreetListView : UIView -///用户的uid -@property (nonatomic,copy) NSString *userId; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.m b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.m deleted file mode 100644 index 9a8b1b7..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.m +++ /dev/null @@ -1,246 +0,0 @@ -// -// YMSessionFindNewGreetListView.m -// YUMI -// -// Created by YUMI on 2022/6/13. -// - -#import "XPSessionFindNewGreetListView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "YUMIMacroUitls.h" -#import "XNDJTDDLoadingTool.h" -#import "Api+FindNew.h" -#import "TTPopup.h" -#import "NSArray+Safe.h" -///Model -#import "FindNewGreetListModel.h" -///View -#import "XPSessionFindNewGreetTableViewCell.h" - -@interface XPSessionFindNewGreetListView () -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///容器 -@property (nonatomic,strong) UIStackView *refreshStackView; -///刷新 -@property (nonatomic,strong) UIButton *refreshButton; -///换一批 -@property (nonatomic,strong) UILabel *refreshLabel; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///发送 -@property (nonatomic,strong) UIButton *sendButton; -///数据源 -@property (nonatomic,strong) NSArray *datasource; -///显示的内容 -@property (nonatomic,strong) FindNewGreetListModel *listModel; -///选中的消息 -@property (nonatomic,strong) FindNewGreetModel *selectModel; -@end - -@implementation XPSessionFindNewGreetListView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initHttpRequest]; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initHttpRequest { - NSString * start = self.listModel ? self.listModel.start : @"0"; - [XNDJTDDLoadingTool showLoading]; - [Api findNewGreetMessageList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [XNDJTDDLoadingTool hideHUD]; - if (code == 200) { - FindNewGreetListModel * model = [FindNewGreetListModel modelWithDictionary:data.data]; - self.listModel = model; - self.datasource = model.list; - if (model.list.count > 0) { - self.selectModel = model.list.firstObject; - } - [self.tableView reloadData]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } start:start pageSize:@"5"]; -} - -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - [self addSubview:self.titleLabel]; - [self addSubview:self.refreshStackView]; - [self addSubview:self.tableView]; - [self addSubview:self.sendButton]; - - [self.refreshStackView addArrangedSubview:self.refreshButton]; - [self.refreshStackView addArrangedSubview:self.refreshLabel]; - - CAShapeLayer * layer = [CAShapeLayer layer]; - UIBezierPath * path= [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, kHalfScreenHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(10, 10)]; - layer.path = path.CGPath; - self.layer.mask = layer; -} - -- (void)initSubViewConstraints { - self.frame = CGRectMake(0, 0, KScreenWidth, kHalfScreenHeight); - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(17); - make.leading.mas_equalTo(15); - }]; - - [self.refreshStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self).offset(-15); - make.centerY.mas_equalTo(self.titleLabel); - make.height.mas_equalTo(30); - }]; - - [self.refreshButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(30); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self); - make.bottom.mas_equalTo(self.sendButton.mas_top); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(10); - }]; - - [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.mas_bottom).offset(-20); - make.leading.trailing.mas_equalTo(self).inset(57); - make.height.mas_equalTo(44); - }]; -} - - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 65; -} - - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPSessionFindNewGreetTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPSessionFindNewGreetTableViewCell class])]; - FindNewGreetModel * model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (model.fId == self.selectModel.fId) { - model.isSelect = YES; - } else { - model.isSelect = NO; - } - cell.greetModel = model; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - FindNewGreetModel * model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - self.selectModel = model; - [self.tableView reloadData]; - } -} -#pragma mark - Event Response -- (void)sendButtonAction:(UIButton *)sender { - [Api findNewUserGreet:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPSessionFindNewGreetListView0")]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPSessionFindNewGreetListView:greetUserId:)]) { - [self.delegate xPSessionFindNewGreetListView:self greetUserId:self.userId]; - } - [TTPopup dismiss]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } helloUid:self.userId message:self.selectModel.message]; -} - -- (void)tapRefreshRecognizer { - [self initHttpRequest]; -} - -#pragma mark - Getters And Setters -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightBold]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.text = YMLocalizedString(@"XPSessionFindNewGreetListView1"); - } - return _titleLabel; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPSessionFindNewGreetTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPSessionFindNewGreetTableViewCell class])]; - } - return _tableView; -} - -- (UIStackView *)refreshStackView { - if (!_refreshStackView) { - _refreshStackView = [[UIStackView alloc] init]; - _refreshStackView.axis = UILayoutConstraintAxisHorizontal; - _refreshStackView.distribution = UIStackViewDistributionFill; - _refreshStackView.alignment = UIStackViewAlignmentFill; - _refreshStackView.spacing = 2; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapRefreshRecognizer)]; - [_refreshStackView addGestureRecognizer:tap]; - } - return _refreshStackView; -} - -- (UIButton *)refreshButton { - if (!_refreshButton) { - _refreshButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_refreshButton setImage:[UIImage imageNamed:@"session_find_new_refresh"] forState:UIControlStateNormal]; - [_refreshButton setImage:[UIImage imageNamed:@"session_find_new_refresh"] forState:UIControlStateSelected]; - } - return _refreshButton; -} - -- (UILabel *)refreshLabel { - if (!_refreshLabel) { - _refreshLabel = [[UILabel alloc] init]; - _refreshLabel.font = [UIFont systemFontOfSize:13]; - _refreshLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _refreshLabel.text = YMLocalizedString(@"XPSessionFindNewGreetListView2"); - } - return _refreshLabel; -} - -- (UIButton *)sendButton { - if (!_sendButton) { - _sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sendButton setTitle:YMLocalizedString(@"XPSessionFindNewGreetListView3") forState:UIControlStateNormal]; - [_sendButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - _sendButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_sendButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _sendButton.layer.cornerRadius = 22; - _sendButton.layer.masksToBounds = YES; - [_sendButton addTarget:self action:@selector(sendButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _sendButton; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.h b/YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.h deleted file mode 100644 index ac0dd44..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMSessionFindNewViewController.h -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSessionFindNewViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.m b/YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.m deleted file mode 100644 index f936750..0000000 --- a/YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.m +++ /dev/null @@ -1,268 +0,0 @@ -// -// YMSessionFindNewViewController.m -// YUMI -// -// Created by YUMI on 2022/6/10. -// - -#import "XPSessionFindNewViewController.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" -#import "XCCurrentVCStackManager.h" -#import "NSArray+Safe.h" -#import "ClientConfig.h" -///Model -#import "FindNewUserInfoModel.h" -///View -#import "XPSessionFindNewTableViewCell.h" -#import "XPSessionFindNewEmptyTableViewCell.h" -#import "XPSessionFindNewFiltrateView.h" -#import "XPSessionFindNewGreetListView.h" -#import "XPMineUserInfoViewController.h" - -///P -#import "XPSessionFindNewProtocol.h" -#import "XPSessionFindNewPresenter.h" - - -@interface XPSessionFindNewViewController () -///导航栏 -@property (nonatomic,strong) UIView * navView; -///发现萌新 -@property (nonatomic,strong) UILabel *titleLabel; -///没日更新 -@property (nonatomic,strong) UILabel *subTitleLabel; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSArray *datasource; -@property (nonatomic,strong) NSArray *originArray; -@end - -@implementation XPSessionFindNewViewController - -- (__kindof id)createPresenter { - return [[XPSessionFindNewPresenter alloc] init];; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self.presenter getFindNewUser]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; - self.navigationItem.titleView = self.navView; - - [self.navView addSubview:self.titleLabel]; - [self.navView addSubview:self.subTitleLabel]; - - [self addNavigationItemWithImageNames:@[@"message_session_find_new_filtrate"] isLeft:NO target:self action:@selector(rightButtonAction:) tags:nil]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.navView); - make.bottom.mas_equalTo(self.navView.mas_centerY).offset(-1); - }]; - - [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.navView); - make.top.mas_equalTo(self.navView.mas_centerY).offset(1); - }]; -} -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 65; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPSessionFindNewTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPSessionFindNewTableViewCell class])]; - if (cell == nil) { - cell = [[XPSessionFindNewTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPSessionFindNewTableViewCell class])]; - } - cell.userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; - } - - XPSessionFindNewEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPSessionFindNewEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPSessionFindNewEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPSessionFindNewEmptyTableViewCell class])]; - } - return cell; -} - -#pragma mark - XPSessionFindNewFiltrateViewDelegate -- (void)xPSessionFindNewFiltrateView:(NSString *)chooseHello chooseSex:(NSString *)sex { - [TTPopup dismiss]; - NSMutableArray * array = [NSMutableArray array]; - [self.originArray enumerateObjectsUsingBlock:^(FindNewUserInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([sex isEqualToString:@"1"]) { - if (obj.gender == GenderType_Male) { - [array addObject: obj]; - } - } else if([sex isEqualToString:@"2"]) { - if (obj.gender == GenderType_Female) { - [array addObject: obj]; - } - } else { - [array addObject:obj]; - } - }]; - - NSMutableArray * newArray = [NSMutableArray array]; - [array enumerateObjectsUsingBlock:^(FindNewUserInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([chooseHello isEqualToString:@"0"]) { - [newArray addObject:obj]; - } else if([chooseHello isEqualToString:@"2"]) { - if (obj.hello == YES) { - [newArray addObject:obj]; - } - } else if([chooseHello isEqualToString:@"1"]) { - if (obj.hello == NO) { - [newArray addObject:obj]; - } - } - }]; - self.datasource = newArray; - [self.tableView reloadData]; -} - -#pragma mark - XPSessionFindNewTableViewCellDelegate -- (void)xPSessionFindNewTableViewCell:(XPSessionFindNewTableViewCell *)cell didSelectItem:(FindNewUserInfoModel *)userInfo { - if (userInfo.hello) { - ///兼容房间内私聊的 - UIWindow * currentWindow; - for (int i = 0; i < [UIApplication sharedApplication].windows.count; i++) { - UIWindow * window = [[UIApplication sharedApplication].windows xpSafeObjectAtIndex:i]; - if(window.tag == 1000) { - currentWindow = window; - break; - } - } - if (currentWindow) { - currentWindow.windowLevel = -1; - } - XPSessionFindNewGreetListView * listView = [[XPSessionFindNewGreetListView alloc] init]; - listView.userId = userInfo.uid; - listView.delegate = self; - [TTPopup popupView:listView style:TTPopupStyleActionSheet]; - } else { - [self showErrorToast:YMLocalizedString(@"XPSessionFindNewViewController0")]; - } -} - -- (void)xPSessionFindNewTableViewCell:(XPSessionFindNewTableViewCell *)cell didClickAvatar:(FindNewUserInfoModel *)userInfo { - if (userInfo.uid > 0) { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = userInfo.uid.integerValue; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:userInfoVC animated:YES]; - } -} - -#pragma mark - XPSessionFindNewGreetListViewDelegate -- (void)xPSessionFindNewGreetListView:(XPSessionFindNewGreetListView *)view greetUserId:(NSString *)userId { - __block FindNewUserInfoModel * userInfo; - [self.datasource enumerateObjectsUsingBlock:^(FindNewUserInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid.integerValue == userId.integerValue) { - userInfo = obj; - *stop = YES; - } - }]; - if (userInfo) { - userInfo.hello = NO; - } - [self.tableView reloadData]; -} - -#pragma mark - XPSessionFindNewProtocol -- (void)getFindNewUserSuccess:(NSArray *)list { - self.datasource = list; - self.originArray = list; - [self.tableView reloadData]; -} - -#pragma mark - Event Response -- (void)rightButtonAction:(UIButton *)sender { - ///兼容房间内私聊的 - UIWindow * currentWindow; - for (int i = 0; i < [UIApplication sharedApplication].windows.count; i++) { - UIWindow * window = [[UIApplication sharedApplication].windows xpSafeObjectAtIndex:i]; - if(window.tag == 1000) { - currentWindow = window; - break; - } - } - if (currentWindow) { - currentWindow.windowLevel = -1; - } - - XPSessionFindNewFiltrateView * flitrView = [[XPSessionFindNewFiltrateView alloc] init]; - flitrView.delegate = self; - [TTPopup popupView:flitrView style:TTPopupStyleActionSheet]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - } - return _tableView; -} - -- (UIView *)navView { - if (!_navView) { - _navView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 250, 44)]; - _navView.backgroundColor = [UIColor clearColor]; - } - return _navView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightSemibold]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.text = YMLocalizedString(@"XPSessionFindNewViewController1"); - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (UILabel *)subTitleLabel { - if (!_subTitleLabel) { - _subTitleLabel = [[UILabel alloc] init]; - _subTitleLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightSemibold]; - _subTitleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _subTitleLabel.text = YMLocalizedString(@"XPSessionFindNewViewController2"); - _subTitleLabel.textAlignment = NSTextAlignmentCenter; - } - return _subTitleLabel; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/MessageAudioCenter.h b/YuMi/Modules/YMMessage/View/MessageAudioCenter.h deleted file mode 100644 index f02604e..0000000 --- a/YuMi/Modules/YMMessage/View/MessageAudioCenter.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// MessageAudioCenter.h -// YUMI -// -// Created by YUMI on 2022/4/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class NIMMessage; -@interface MessageAudioCenter : NSObject -+ (instancetype)shareInstance; -@property (nonatomic,strong, readonly) NIMMessage *currentPlayingMessage; -- (void)play:(NIMMessage *)message; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/MessageAudioCenter.m b/YuMi/Modules/YMMessage/View/MessageAudioCenter.m deleted file mode 100644 index be55098..0000000 --- a/YuMi/Modules/YMMessage/View/MessageAudioCenter.m +++ /dev/null @@ -1,74 +0,0 @@ -// -// MessageAudioCenter.m -// YUMI -// -// Created by YUMI on 2022/4/22. -// - -#import "MessageAudioCenter.h" -#import - -@interface MessageAudioCenter () -@property (nonatomic,assign) NSInteger retryCount; -@property (nonatomic,strong,nullable) NIMMessage *currentPlayingMessage; -@end - -@implementation MessageAudioCenter - -+ (instancetype)shareInstance { - static MessageAudioCenter *instance; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - instance = [[MessageAudioCenter alloc] init]; - }); - return instance; -} - -- (instancetype)init { - self = [super init]; - if (self) { - [[NIMSDK sharedSDK].mediaManager addDelegate:self]; - [self resetRetryCount]; - } - return self; -} - -- (void)resetRetryCount { - _retryCount = 3; -} - -- (void)play:(NIMMessage *)message { - NIMAudioObject *audioObject = (NIMAudioObject *)message.messageObject; - if ([audioObject isKindOfClass:[NIMAudioObject class]]) { - self.currentPlayingMessage = message; - message.isPlayed = YES; - [[NIMSDK sharedSDK].mediaManager play:audioObject.path]; - } -} - - -#pragma mark - NIMMediaManagerDelegate - -- (void)playAudio:(NSString *)filePath didBeganWithError:(NSError *)error -{ - if (error) { - if (_retryCount > 0){ - // iPhone4 和 iPhone 4S 上连播会由于设备释放过慢导致 AudioQueue 启动不了的问题，这里做个延迟重试，最多重试 3 次 ( code -66681 ) - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [[NIMSDK sharedSDK].mediaManager play:filePath]; - }); - }else{ - self.currentPlayingMessage = nil; - [self resetRetryCount]; - } - } else { - [self resetRetryCount]; - } -} - -- (void)playAudio:(NSString *)filePath didCompletedWithError:(nullable NSError *)error { - self.currentPlayingMessage = nil; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/NIMMessageMaker.h b/YuMi/Modules/YMMessage/View/NIMMessageMaker.h deleted file mode 100644 index 189c89a..0000000 --- a/YuMi/Modules/YMMessage/View/NIMMessageMaker.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// NIMMessageMaker.h -// YUMI -// -// Created by zu on 2021/11/28. -// - -#import -#import - -@interface NIMMessageMaker : NSObject - -+ (NIMMessage*)msgWithText:(NSString *)text; - -+ (NIMMessage *)msgWithAudio:(NSString *)filePath; - -+ (NIMMessage *)msgWithImage:(UIImage *)image; - -+ (NIMMessage *)msgWithImagePath:(NSString *)path; - -+ (NIMMessage *)msgWithImageData:(NSData *)data extension:(NSString *)extension; - -+ (NIMMessage *)msgWithVideo:(NSString *)filePath; - -@end - - -@interface NIMCommentMaker : NSObject - -+ (NIMQuickComment *)commentWithType:(int64_t)type - content:(NSString *)content - ext:(NSString *)ext; - -@end diff --git a/YuMi/Modules/YMMessage/View/NIMMessageMaker.m b/YuMi/Modules/YMMessage/View/NIMMessageMaker.m deleted file mode 100644 index 524aec3..0000000 --- a/YuMi/Modules/YMMessage/View/NIMMessageMaker.m +++ /dev/null @@ -1,129 +0,0 @@ -// -// NIMMessageMaker.m -// YUMI -// -// Created by zu on 2021/11/28. -// - -#import "NIMMessageMaker.h" -#import "YUMIConstant.h" - -@implementation NIMMessageMaker - -+ (NIMMessage*)msgWithText:(NSString*)text -{ - NIMMessage *textMessage = [[NIMMessage alloc] init]; - textMessage.text = text; - [self setupMessage:textMessage]; - return textMessage; -} - -+ (NIMMessage*)msgWithAudio:(NSString*)filePath -{ - NIMAudioObject *audioObject = [[NIMAudioObject alloc] initWithSourcePath:filePath scene:NIMNOSSceneTypeMessage]; - NIMMessage *message = [[NIMMessage alloc] init]; - message.messageObject = audioObject; - message.text = YMLocalizedString(@"NIMMessageMaker0"); - [self setupMessage:message]; - return message; -} - -+ (NIMMessage*)msgWithVideo:(NSString*)filePath -{ - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"]; - NSString *dateString = [dateFormatter stringFromDate:[NSDate date]]; - NIMVideoObject *videoObject = [[NIMVideoObject alloc] initWithSourcePath:filePath scene:NIMNOSSceneTypeMessage]; - videoObject.displayName = [NSString stringWithFormat:@"%@%@", YMLocalizedString(@"NIMMessageMaker1"),dateString]; - NIMMessage *message = [[NIMMessage alloc] init]; - message.messageObject = videoObject; - message.apnsContent = YMLocalizedString(@"NIMMessageMaker2"); - [self setupMessage:message]; - return message; -} - -+ (NIMMessage*)msgWithImage:(UIImage*)image -{ - NIMImageObject *imageObject = [[NIMImageObject alloc] initWithImage:image scene:NIMNOSSceneTypeMessage]; - NIMImageOption *option = [[NIMImageOption alloc] init]; - option.compressQuality = 0.7; - imageObject.option = option; - - return [NIMMessageMaker generateImageMessage:imageObject]; -} - -+ (NIMMessage *)msgWithImagePath:(NSString*)path -{ - NIMImageObject * imageObject = [[NIMImageObject alloc] initWithFilepath:path scene:NIMNOSSceneTypeMessage]; - return [NIMMessageMaker generateImageMessage:imageObject]; -} - -+ (NIMMessage *)msgWithImageData:(NSData *)data extension:(NSString *)extension -{ - NIMImageObject *imageObject = [[NIMImageObject alloc] initWithData:data extension:extension]; - return [NIMMessageMaker generateImageMessage:imageObject]; -} - -+ (NIMMessage *)generateImageMessage:(NIMImageObject *)imageObject -{ - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"]; - NSString *dateString = [dateFormatter stringFromDate:[NSDate date]]; - imageObject.displayName = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"NIMMessageMaker3"), dateString]; - - NIMMessage *message = [[NIMMessage alloc] init]; - message.messageObject = imageObject; - message.apnsContent = YMLocalizedString(@"NIMMessageMaker4"); - -// NIMAntiSpamOption *spamOption = [[NIMAntiSpamOption alloc] init]; -// spamOption.yidunEnabled = YES; -// spamOption.businessId = KeyWithType(keyType_YiDunBussinessId); -// message.antiSpamOption = spamOption; - - [self setupMessage:message]; - return message; -} - -+ (void)setupMessage:(NIMMessage *)message -{ - message.apnsPayload = @{ - @"apns-collapse-id": message.messageId, - }; - - NIMMessageSetting *setting = [[NIMMessageSetting alloc] init]; - setting.scene = NIMNOSSceneTypeMessage; - setting.apnsEnabled = YES; - message.setting = setting; - -// NIMAntiSpamOption *option = [NIMAntiSpamOption new]; -// option.yidunEnabled = YES; -// option.businessId = KeyWithType(keyType_YiDunBussinessId); -// message.antiSpamOption = option; -} - - -@end - - -@implementation NIMCommentMaker - -+ (NIMQuickComment *)commentWithType:(int64_t)type - content:(NSString *)content - ext:(NSString *)ext -{ - NIMQuickComment *comment = [[NIMQuickComment alloc] init]; - comment.ext = ext; - NIMQuickCommentSetting *setting = [[NIMQuickCommentSetting alloc] init]; - setting.needPush = YES; - setting.needBadge = YES; - setting.pushTitle = YMLocalizedString(@"NIMMessageMaker5"); - setting.pushContent = content; - setting.pushPayload = @{ - @"key" : @"value" - }; - comment.setting = setting; - comment.replyType = type; - return comment; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/NIMMessageUtils.h b/YuMi/Modules/YMMessage/View/NIMMessageUtils.h deleted file mode 100644 index 9ef0c8e..0000000 --- a/YuMi/Modules/YMMessage/View/NIMMessageUtils.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// NIMMessageUtils.h -// YUMI -// -// Created by zu on 2021/11/26. -// - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface NIMMessageUtils : NSObject - -+ (NSString *)messageContent:(NIMMessage*)message; - -///是否是官方账号 -+ (BOOL)isOfficalAccount:(NSString *)uid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/NIMMessageUtils.m b/YuMi/Modules/YMMessage/View/NIMMessageUtils.m deleted file mode 100644 index adc570c..0000000 --- a/YuMi/Modules/YMMessage/View/NIMMessageUtils.m +++ /dev/null @@ -1,96 +0,0 @@ -// -// NIMMessageUtils.m -// YUMI -// -// Created by zu on 2021/11/26. -// - -#import "NIMMessageUtils.h" -#import "AttachmentModel.h" -#import "ClientConfig.h" -#import "YUMIConstant.h" - -@implementation NIMMessageUtils - -+ (NSString *)messageContent:(NIMMessage*)message { - NSString *text = @""; - switch (message.messageType) { - case NIMMessageTypeTip: - case NIMMessageTypeText: - text = message.text; - break; - case NIMMessageTypeAudio: - text = YMLocalizedString(@"NIMMessageUtils0"); - break; - case NIMMessageTypeImage: - text = YMLocalizedString(@"NIMMessageUtils1"); - break; - case NIMMessageTypeVideo: - text = YMLocalizedString(@"NIMMessageUtils2"); - break; - case NIMMessageTypeLocation: - text = YMLocalizedString(@"NIMMessageUtils3"); - break; - case NIMMessageTypeFile: - text = YMLocalizedString(@"NIMMessageUtils4"); - break; - case NIMMessageTypeCustom: { - NIMCustomObject *obj = (NIMCustomObject *) message.messageObject; - AttachmentModel *attachment = (AttachmentModel *) obj.attachment; - if (attachment.first == CustomMessageType_Secretary) { - if (attachment.second == Custom_Message_Sub_Secretary_Router) { - text = attachment.data[@"title"]; - } - } else if(attachment.first == CustomMessageType_Gift) { - if (attachment.second == Custom_Message_Sub_Gift_Send) { - text = YMLocalizedString(@"NIMMessageUtils5"); - } - } else if(attachment.first == CustomMessageType_Hall || attachment.first == CustomMessageType_New_Hall) { - text = YMLocalizedString(@"NIMMessageUtils6"); - } else if(attachment.first == CustomMessageType_Member_Online && attachment.second == Custom_Message_Type_Attention_Member_Online) { - return YMLocalizedString(@"NIMMessageUtils7"); - } else if(attachment.first == CustomMessageType_Application_Share && attachment.second == Custom_Message_Sub_Application_Share_Room) { - return YMLocalizedString(@"NIMMessageUtils8"); - }else if(attachment.first == CustomMessageType_User_UpGrade && (attachment.second == Custom_Message_Sub_User_UpGrade_Charm || attachment.second == Custom_Message_Sub_User_UpGrade_Exper)) { - return YMLocalizedString(@"NIMMessageUtils9"); - } else if(attachment.first == CustomMessageType_Tweet && attachment.second == Custom_Message_Sub_Tweet_News) { - return YMLocalizedString(@"NIMMessageUtils10"); - } else if(attachment.first == CustomMessageType_FindNew && attachment.second == Custom_Message_Find_New_Greet_New_User) { - NSString * text = attachment.data[@"message"]; - return text.length > 0 ? text : YMLocalizedString(@"NIMMessageUtils11"); - } else if(attachment.first == CustomMessageType_Monents && attachment.second == Custom_Message_Sub_Monents_Share) { - return YMLocalizedString(@"NIMMessageUtils12");; - } else if(attachment.first == CustomMessageType_RedPacket && attachment.second == Custom_Message_Sub_AllDiamandRedPacket) { - return YMLocalizedString(@"NIMMessageUtils13");; - } else { - text = YMLocalizedString(@"NIMMessageUtils14");; - } - if (!text) { - text = message.text; - } - } - break; - default: - text = YMLocalizedString(@"NIMMessageUtils15");; - break; - } - return text; -} - -+ (BOOL)isOfficalAccount:(NSString *)uid { - if (uid.integerValue <= 0) { - return NO; - } - if ([[ClientConfig shareConfig].configInfo.officialMsgUids containsObject:uid]) { - return YES; - } - - if ([[ClientConfig shareConfig].configInfo.officialAccountUids containsObject:uid]) { - return YES; - } - - return ([KeyWithType(KeyType_SecretaryUidKey) isEqualToString:uid] || [KeyWithType(KeyType_SystemNotifiUidKey) isEqualToString:uid] || [KeyWithType(KeyType_GuildUidKey) isEqualToString:uid]); - return NO; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/NIMTimeUtils.h b/YuMi/Modules/YMMessage/View/NIMTimeUtils.h deleted file mode 100644 index 7dcaf8e..0000000 --- a/YuMi/Modules/YMMessage/View/NIMTimeUtils.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// NIMTimeUtils.h -// YUMI -// -// Created by zu on 2021/11/26. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface NIMTimeUtils : NSObject - -+ (NSString *)formattedTimeFromInterval:(NSTimeInterval)timeInterval; - -//+ (NSString *)showTime:(NSTimeInterval)msglastTime showDetail:(BOOL)showDetail; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/NIMTimeUtils.m b/YuMi/Modules/YMMessage/View/NIMTimeUtils.m deleted file mode 100644 index 99dbf3a..0000000 --- a/YuMi/Modules/YMMessage/View/NIMTimeUtils.m +++ /dev/null @@ -1,118 +0,0 @@ -// -// NIMTimeUtils.m -// YUMI -// -// Created by zu on 2021/11/26. -// - -#import "NIMTimeUtils.h" - -@implementation NIMTimeUtils - -+ (NSString *)formattedTimeFromInterval:(NSTimeInterval)timeInterval { - // 获取当前日历 - NSCalendar *calendar = [NSCalendar currentCalendar]; - - // 获取当前日期 - NSDate *currentDate = [NSDate date]; - NSDate *inputDate = [NSDate dateWithTimeIntervalSince1970:timeInterval]; - - // 检查输入日期是否是今天 - if ([calendar isDate:inputDate inSameDayAsDate:currentDate]) { - // 如果是今天，返回 hour:min 格式 - NSDateFormatter *timeFormatter = [[NSDateFormatter alloc] init]; - timeFormatter.dateFormat = @"HH:mm"; // 小时和分钟格式 - return [timeFormatter stringFromDate:inputDate]; - } else { - // 如果不是今天，返回 year/month/day 格式 - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - dateFormatter.dateFormat = @"yyyy/MM/dd"; // 年/月/日格式 - return [dateFormatter stringFromDate:inputDate]; - } -} - -+ (NSString*)showTime:(NSTimeInterval)msglastTime showDetail:(BOOL)showDetail -{ - //今天的时间 - NSDate * nowDate = [NSDate date]; - NSDate * msgDate = [NSDate dateWithTimeIntervalSince1970:msglastTime]; - NSString *result = nil; - NSCalendarUnit components = (NSCalendarUnit)(NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay|NSCalendarUnitWeekday|NSCalendarUnitHour | NSCalendarUnitMinute); - NSDateComponents *nowDateComponents = [[NSCalendar currentCalendar] components:components fromDate:nowDate]; - NSDateComponents *msgDateComponents = [[NSCalendar currentCalendar] components:components fromDate:msgDate]; - - NSInteger hour = msgDateComponents.hour; - double OnedayTimeIntervalValue = 24*60*60; //一天的秒数 - - result = [self getPeriodOfTime:hour withMinute:msgDateComponents.minute]; - if (hour > 12) - { - hour = hour - 12; - } - - BOOL isSameMonth = (nowDateComponents.year == msgDateComponents.year) && (nowDateComponents.month == msgDateComponents.month); - - if(isSameMonth && (nowDateComponents.day == msgDateComponents.day)) //同一天,显示时间 - { - result = [[NSString alloc] initWithFormat:@"%@ %zd:%02d",result,hour,(int)msgDateComponents.minute]; - } - else if(isSameMonth && (nowDateComponents.day == (msgDateComponents.day+1)))//昨天 - { - result = showDetail? [[NSString alloc] initWithFormat:@"%@%@ %zd:%02d",YMLocalizedString(@"NIMTimeUtils1"),result,hour,(int)msgDateComponents.minute] : YMLocalizedString(@"NIMTimeUtils1"); - } - else if(isSameMonth && (nowDateComponents.day == (msgDateComponents.day+2))) //前天 - { - result = showDetail? [[NSString alloc] initWithFormat:@"%@%@ %zd:%02d",YMLocalizedString(@"NIMTimeUtils3"),result,hour,(int)msgDateComponents.minute] : YMLocalizedString(@"NIMTimeUtils3"); - } - else if([nowDate timeIntervalSinceDate:msgDate] < 7 * OnedayTimeIntervalValue)//一周内 - { - NSString *weekDay = [self weekdayStr:msgDateComponents.weekday]; - result = showDetail? [weekDay stringByAppendingFormat:@"%@ %zd:%02d",result,hour,(int)msgDateComponents.minute] : weekDay; - } - else//显示日期 - { - NSString *day = [NSString stringWithFormat:@"%zd-%zd-%zd", msgDateComponents.year, msgDateComponents.month, msgDateComponents.day]; - result = showDetail? [day stringByAppendingFormat:@"%@ %zd:%02d",result,hour,(int)msgDateComponents.minute]:day; - } - return result; -} - -#pragma mark - Private - -+ (NSString *)getPeriodOfTime:(NSInteger)time withMinute:(NSInteger)minute -{ - NSInteger totalMin = time *60 + minute; - NSString *showPeriodOfTime = @""; - if (totalMin > 0 && totalMin <= 5 * 60) - { - showPeriodOfTime = YMLocalizedString(@"NIMTimeUtils4"); - } - else if (totalMin > 5 * 60 && totalMin < 12 * 60) - { - showPeriodOfTime = YMLocalizedString(@"NIMTimeUtils5"); - } - else if (totalMin >= 12 * 60 && totalMin <= 18 * 60) - { - showPeriodOfTime = YMLocalizedString(@"NIMTimeUtils6"); - } - else if ((totalMin > 18 * 60 && totalMin <= (23 * 60 + 59)) || totalMin == 0) - { - showPeriodOfTime = YMLocalizedString(@"NIMTimeUtils7"); - } - return showPeriodOfTime; -} - -+(NSString*)weekdayStr:(NSInteger)dayOfWeek -{ - static NSDictionary *daysOfWeekDict = nil; - daysOfWeekDict = @{@(1):YMLocalizedString(@"NIMTimeUtils8"), - @(2):YMLocalizedString(@"NIMTimeUtils9"), - @(3):YMLocalizedString(@"NIMTimeUtils10"), - @(4):YMLocalizedString(@"NIMTimeUtils11"), - @(5):YMLocalizedString(@"NIMTimeUtils12"), - @(6):YMLocalizedString(@"NIMTimeUtils13"), - @(7):YMLocalizedString(@"NIMTimeUtils14"),}; - return [daysOfWeekDict objectForKey:@(dayOfWeek)]; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/NIMViews/NIMBadgeView.h b/YuMi/Modules/YMMessage/View/NIMViews/NIMBadgeView.h deleted file mode 100644 index c603232..0000000 --- a/YuMi/Modules/YMMessage/View/NIMViews/NIMBadgeView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// NIMBadgeView.h -// NIMKit -// -// Created by chris on 15/2/12. -// Copyright (c) 2015年 Netease. All rights reserved. -// - -#import - -@interface NIMBadgeView : UIView - -@property (nonatomic, copy) NSString *badgeValue; - -+ (instancetype)viewWithBadgeTip:(NSString *)badgeValue; - - -@end diff --git a/YuMi/Modules/YMMessage/View/NIMViews/NIMBadgeView.m b/YuMi/Modules/YMMessage/View/NIMViews/NIMBadgeView.m deleted file mode 100644 index c6ebd85..0000000 --- a/YuMi/Modules/YMMessage/View/NIMViews/NIMBadgeView.m +++ /dev/null @@ -1,167 +0,0 @@ -// -// NIMBadgeView.m -// NIMKit -// -// Created by chris on 15/2/12. -// Copyright (c) 2015年 Netease. All rights reserved. -// - - -#import "NIMBadgeView.h" - -@interface NIMBadgeView () - -@property (strong) UIColor *badgeBackgroundColor; - -@property (strong) UIColor *borderColor; - -@property (strong) UIColor *badgeTextColor; - -@property (nonatomic) UIFont *badgeTextFont; - -@property (nonatomic) CGFloat badgeTopPadding; //数字顶部到红圈的距离 - -@property (nonatomic) CGFloat badgeLeftPadding; //数字左部到红圈的距离 - -@property (nonatomic) CGFloat whiteCircleWidth; //最外层白圈的宽度 - -@end - -@implementation NIMBadgeView - -+ (instancetype)viewWithBadgeTip:(NSString *)badgeValue{ - if (!badgeValue) { - badgeValue = @""; - } - NIMBadgeView *instance = [[NIMBadgeView alloc] init]; - instance.frame = [instance frameWithStr:badgeValue]; - instance.badgeValue = badgeValue; - - return instance; -} - -- (id)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - self.backgroundColor = [UIColor clearColor]; - // 0xFF5B55 - _badgeBackgroundColor = [UIColor colorWithRed:((float)((0xFF5B55 & 0xFF0000) >> 16))/255.0 green:((float)((0xFF5B55 & 0xFF00) >> 8))/255.0 blue:((float)(0xFF5B55 & 0xFF))/255.0 alpha:1.0]; - _borderColor = [UIColor colorWithRed:((float)((0xFF5B55 & 0xFF0000) >> 16))/255.0 green:((float)((0xFF5B55 & 0xFF00) >> 8))/255.0 blue:((float)(0xFF5B55 & 0xFF))/255.0 alpha:1.0]; - _badgeTextColor = [UIColor whiteColor]; - _badgeTextFont = [UIFont boldSystemFontOfSize:11]; - _whiteCircleWidth = 0.f; - } - return self; -} - - -- (void)drawRect:(CGRect)rect -{ - CGContextRef context = UIGraphicsGetCurrentContext(); - CGContextSaveGState(context); - if ([[self badgeValue] length]) { - [self drawWithContent:rect context:context]; - }else{ - [self drawWithOutContent:rect context:context]; - } - CGContextRestoreGState(context); -} - -- (void)setBadgeValue:(NSString *)badgeValue { - _badgeValue = badgeValue; - if (_badgeValue.integerValue > 9) { - _badgeLeftPadding = 6.f; - }else{ - _badgeLeftPadding = 2.f; - } - _badgeTopPadding = 2.f; - - self.frame = [self frameWithStr:badgeValue]; - - [self setNeedsDisplay]; -} - -- (CGSize)badgeSizeWithStr:(NSString *)badgeValue{ - if (!badgeValue || badgeValue.length == 0) { - return CGSizeZero; - } - CGSize size = [badgeValue sizeWithAttributes:@{NSFontAttributeName:self.badgeTextFont}]; - if (size.width < size.height) { - size = CGSizeMake(size.height, size.height); - } - return size; -} - -- (CGRect)frameWithStr:(NSString *)badgeValue{ - CGSize badgeSize = [self badgeSizeWithStr:badgeValue]; - CGRect badgeFrame = CGRectMake(self.frame.origin.x, self.frame.origin.y, badgeSize.width + self.badgeLeftPadding * 2 + self.whiteCircleWidth * 2, badgeSize.height + self.badgeTopPadding * 2 + self.whiteCircleWidth * 2);//8=2*2（红圈-文字）+2*2（白圈-红圈） - return badgeFrame; -} - - - -#pragma mark - Private -- (void)drawWithContent:(CGRect)rect context:(CGContextRef)context{ - CGRect bodyFrame = self.bounds; - CGRect bkgFrame = CGRectInset(self.bounds, self.whiteCircleWidth, self.whiteCircleWidth); - CGRect badgeSize = CGRectInset(self.bounds, self.whiteCircleWidth + self.badgeLeftPadding, self.whiteCircleWidth + self.badgeTopPadding); - if ([self badgeBackgroundColor]) {//外白色描边 - CGContextSetFillColorWithColor(context, [self.borderColor CGColor]); - if ([self badgeValue].integerValue > 9) { - CGFloat circleWith = bodyFrame.size.height; - CGFloat totalWidth = bodyFrame.size.width; - CGFloat diffWidth = totalWidth - circleWith; - CGPoint originPoint = bodyFrame.origin; - CGRect leftCicleFrame = CGRectMake(originPoint.x, originPoint.y, circleWith, circleWith); - CGRect centerFrame = CGRectMake(originPoint.x +circleWith/2, originPoint.y, diffWidth, circleWith); - CGRect rightCicleFrame = CGRectMake(originPoint.x +(totalWidth - circleWith), originPoint.y, circleWith, circleWith); - CGContextFillEllipseInRect(context, leftCicleFrame); - CGContextFillRect(context, centerFrame); - CGContextFillEllipseInRect(context, rightCicleFrame); - - }else{ - CGContextFillEllipseInRect(context, bodyFrame); - } - // badge背景色 - CGContextSetFillColorWithColor(context, [[self badgeBackgroundColor] CGColor]); - if ([self badgeValue].integerValue > 9) { - CGFloat circleWith = bkgFrame.size.height; - CGFloat totalWidth = bkgFrame.size.width; - CGFloat diffWidth = totalWidth - circleWith; - CGPoint originPoint = bkgFrame.origin; - CGRect leftCicleFrame = CGRectMake(originPoint.x, originPoint.y, circleWith, circleWith); - CGRect centerFrame = CGRectMake(originPoint.x +circleWith/2, originPoint.y, diffWidth, circleWith); - CGRect rightCicleFrame = CGRectMake(originPoint.x +(totalWidth - circleWith), originPoint.y, circleWith, circleWith); - CGContextFillEllipseInRect(context, leftCicleFrame); - CGContextFillRect(context, centerFrame); - CGContextFillEllipseInRect(context, rightCicleFrame); - }else{ - CGContextFillEllipseInRect(context, bkgFrame); - } - } - - CGContextSetFillColorWithColor(context, [[self badgeTextColor] CGColor]); - NSMutableParagraphStyle *badgeTextStyle = [[NSMutableParagraphStyle defaultParagraphStyle] mutableCopy]; - [badgeTextStyle setLineBreakMode:NSLineBreakByWordWrapping]; - [badgeTextStyle setAlignment:NSTextAlignmentCenter]; - - - NSDictionary *badgeTextAttributes = @{ - NSFontAttributeName: [self badgeTextFont], - NSForegroundColorAttributeName: [self badgeTextColor], - NSParagraphStyleAttributeName: badgeTextStyle, - }; - [[self badgeValue] drawInRect:CGRectMake(self.whiteCircleWidth + self.badgeLeftPadding, - self.whiteCircleWidth + self.badgeTopPadding, - badgeSize.size.width, badgeSize.size.height) - withAttributes:badgeTextAttributes]; -} - - -- (void)drawWithOutContent:(CGRect)rect context:(CGContextRef)context{ - CGRect bodyFrame = self.bounds; - CGContextSetFillColorWithColor(context, [[UIColor redColor] CGColor]); - CGContextFillEllipseInRect(context, bodyFrame); -} - -@end diff --git a/YuMi/Modules/YMMessage/View/NIMViews/UITableView+NIMScrollToBottom.h b/YuMi/Modules/YMMessage/View/NIMViews/UITableView+NIMScrollToBottom.h deleted file mode 100644 index 8d69ec5..0000000 --- a/YuMi/Modules/YMMessage/View/NIMViews/UITableView+NIMScrollToBottom.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// UITableView+NTESScrollToBottom.h -// NIMDemo -// -// Created by chris. -// Copyright (c) 2015年 Netease. All rights reserved. -// - -#import - -@interface UITableView (NIMKit) - -- (void)nim_scrollToBottom:(BOOL)animation; -@end diff --git a/YuMi/Modules/YMMessage/View/NIMViews/UITableView+NIMScrollToBottom.m b/YuMi/Modules/YMMessage/View/NIMViews/UITableView+NIMScrollToBottom.m deleted file mode 100644 index e52e680..0000000 --- a/YuMi/Modules/YMMessage/View/NIMViews/UITableView+NIMScrollToBottom.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// UITableView+NTESScrollToBottom.m -// NIMDemo -// -// Created by chris. -// Copyright (c) 2015年 Netease. All rights reserved. -// - -#import "UITableView+NIMScrollToBottom.h" - -@implementation UITableView (NIMKit) - -- (void)nim_scrollToBottom:(BOOL)animation -{ - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - NSInteger row = [self numberOfRowsInSection:1] - 1; - if (row > 0) - { - NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row inSection:1]; - [self scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:animation]; - } - }); -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/NIMViews/UIView+NIM.h b/YuMi/Modules/YMMessage/View/NIMViews/UIView+NIM.h deleted file mode 100644 index 1fee6ca..0000000 --- a/YuMi/Modules/YMMessage/View/NIMViews/UIView+NIM.h +++ /dev/null @@ -1,78 +0,0 @@ -// -// UIView+NIM.h -// NIMKit -// -// Created by chris. -// Copyright (c) 2015年 NetEase. All rights reserved. -// - -#import - -@interface UIView (NIMKit) - -@property (nonatomic) CGFloat nim_left; - -/** - * Shortcut for frame.origin.y - * - * Sets frame.origin.y = top - */ -@property (nonatomic) CGFloat nim_top; - -/** - * Shortcut for frame.origin.x + frame.size.width - * - * Sets frame.origin.x = right - frame.size.width - */ -@property (nonatomic) CGFloat nim_right; - -/** - * Shortcut for frame.origin.y + frame.size.height - * - * Sets frame.origin.y = bottom - frame.size.height - */ -@property (nonatomic) CGFloat nim_bottom; - -/** - * Shortcut for frame.size.width - * - * Sets frame.size.width = width - */ -@property (nonatomic) CGFloat nim_width; - -/** - * Shortcut for frame.size.height - * - * Sets frame.size.height = height - */ -@property (nonatomic) CGFloat nim_height; - -/** - * Shortcut for center.x - * - * Sets center.x = centerX - */ -@property (nonatomic) CGFloat nim_centerX; - -/** - * Shortcut for center.y - * - * Sets center.y = centerY - */ -@property (nonatomic) CGFloat nim_centerY; -/** - * Shortcut for frame.origin - */ -@property (nonatomic) CGPoint nim_origin; - -/** - * Shortcut for frame.size - */ -@property (nonatomic) CGSize nim_size; - -//找到自己的vc -- (UIViewController *)nim_viewController; - - - -@end diff --git a/YuMi/Modules/YMMessage/View/NIMViews/UIView+NIM.m b/YuMi/Modules/YMMessage/View/NIMViews/UIView+NIM.m deleted file mode 100644 index 1b9c409..0000000 --- a/YuMi/Modules/YMMessage/View/NIMViews/UIView+NIM.m +++ /dev/null @@ -1,156 +0,0 @@ -// -// UIView+NIM.m -// NIMKit -// -// Created by chris. -// Copyright (c) 2015年 NetEase. All rights reserved. -// - -#import "UIView+NIM.h" - -@implementation UIView (NIMKit) - -- (CGFloat)nim_left { - return self.frame.origin.x; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (void)setNim_left:(CGFloat)x { - CGRect frame = self.frame; - frame.origin.x = x; - self.frame = frame; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (CGFloat)nim_top { - return self.frame.origin.y; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (void)setNim_top:(CGFloat)y { - CGRect frame = self.frame; - frame.origin.y = y; - self.frame = frame; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (CGFloat)nim_right { - return self.frame.origin.x + self.frame.size.width; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (void)setNim_right:(CGFloat)right { - CGRect frame = self.frame; - frame.origin.x = right - frame.size.width; - self.frame = frame; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (CGFloat)nim_bottom { - return self.frame.origin.y + self.frame.size.height; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (void)setNim_bottom:(CGFloat)bottom { - CGRect frame = self.frame; - frame.origin.y = bottom - frame.size.height; - self.frame = frame; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (CGFloat)nim_centerX { - return self.center.x; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (void)setNim_centerX:(CGFloat)centerX { - self.center = CGPointMake(centerX, self.center.y); -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (CGFloat)nim_centerY { - return self.center.y; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (void)setNim_centerY:(CGFloat)centerY { - self.center = CGPointMake(self.center.x, centerY); -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (CGFloat)nim_width { - return self.frame.size.width; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (void)setNim_width:(CGFloat)width { - CGRect frame = self.frame; - frame.size.width = width; - self.frame = frame; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (CGFloat)nim_height { - return self.frame.size.height; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (void)setNim_height:(CGFloat)height { - CGRect frame = self.frame; - frame.size.height = height; - self.frame = frame; -} -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (CGPoint)nim_origin { - return self.frame.origin; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (void)setNim_origin:(CGPoint)origin { - CGRect frame = self.frame; - frame.origin = origin; - self.frame = frame; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (CGSize)nim_size { - return self.frame.size; -} - - -/////////////////////////////////////////////////////////////////////////////////////////////////// -- (void)setNim_size:(CGSize)size { - CGRect frame = self.frame; - frame.size = size; - self.frame = frame; -} - - -- (UIViewController *)nim_viewController{ - for (UIView* next = self; next; next = next.superview) { - UIResponder* nextResponder = [next nextResponder]; - if ([nextResponder isKindOfClass:[UIViewController class]]) { - return (UIViewController*)nextResponder; - } - } - return nil; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/SayHello/Api/Api+SayHello.h b/YuMi/Modules/YMMessage/View/SayHello/Api/Api+SayHello.h deleted file mode 100644 index 21362bb..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/Api/Api+SayHello.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// Api+SayHello.h -// YUMI -// -// Created by YUMI on 2023/2/2. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (SayHello) - -/// 打招呼主播评级信息 -/// @param complection 完成 -+ (void)shuntLevleInfoComplection:(HttpRequestHelperCompletion)complection; - -/// 开启关注自动打招呼 -/// @param complection 完成 -/// @param enable 1 开启 0 关闭 -+ (void)shuntEnableComplection:(HttpRequestHelperCompletion)complection enable:(NSString *)enable; - -/// 打招呼列表 -/// @param complection 完成 -/// @param page 当前页数 -/// @param size 当前页数 -+ (void)shuntListComplection:(HttpRequestHelperCompletion)complection page:(NSString *)page size:(NSString *)size; - -/// 点击私聊按钮 -/// @param complection 完成 -/// @param toUserId 对方的uid -+ (void)shuntClickChatComplection:(HttpRequestHelperCompletion)complection toUserId:(NSString *)toUserId; - - -/// 打招呼的人数 -/// @param complection 完成 -+ (void)shuntHelloCountComplection:(HttpRequestHelperCompletion)complection; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SayHello/Api/Api+SayHello.m b/YuMi/Modules/YMMessage/View/SayHello/Api/Api+SayHello.m deleted file mode 100644 index 4334f69..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/Api/Api+SayHello.m +++ /dev/null @@ -1,51 +0,0 @@ -// -// Api+SayHello.m -// YUMI -// -// Created by YUMI on 2023/2/2. -// - -#import "Api+SayHello.h" -#import -@implementation Api (SayHello) - -/// 打招呼主播评级信息 -/// @param complection 完成 -+ (void)shuntLevleInfoComplection:(HttpRequestHelperCompletion)complection { - NSString * fang = [NSString stringFromBase64String:@"c2h1bnQvbGV2ZWxfaW5mbw=="];///c2h1bnQvbGV2ZWxfaW5mbw== - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, nil]; -} - -/// 开启关注自动打招呼 -/// @param complection 完成 -/// @param enable 1 开启 0 关闭 -+ (void)shuntEnableComplection:(HttpRequestHelperCompletion)complection enable:(NSString *)enable { - NSString * fang = [NSString stringFromBase64String:@"c2h1bnQvZW5hYmxl"];//shunt/enable - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__,enable, nil]; -} - -/// 打招呼列表 -/// @param complection 完成 -/// @param page 当前页数 -/// @param size 当前页数 -+ (void)shuntListComplection:(HttpRequestHelperCompletion)complection page:(NSString *)page size:(NSString *)size { - NSString * fang = [NSString stringFromBase64String:@"c2h1bnQvbGlzdA=="]; - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__,page, size, nil]; -} - -/// 点击私聊按钮 -/// @param complection 完成 -/// @param toUserId 对方的uid -+ (void)shuntClickChatComplection:(HttpRequestHelperCompletion)complection toUserId:(NSString *)toUserId { - NSString * fang = [NSString stringFromBase64String:@"c2h1bnQvY2xpY2tfY2hhdA=="]; - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__,toUserId, nil]; -} - -/// 打招呼的人数 -/// @param complection 完成 -+ (void)shuntHelloCountComplection:(HttpRequestHelperCompletion)complection { - NSString * fang = [NSString stringFromBase64String:@"c2h1bnQvaGVsbG9fY291bnQ="];///shunt/hello_count - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, nil]; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloCountModel.h b/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloCountModel.h deleted file mode 100644 index cfa0fe4..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloCountModel.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// SessionSayHelloCountModel.h -// YUMI -// -// Created by YUMI on 2023/2/3. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface SessionSayHelloCountModel : PIBaseModel -///有多少人想和你打招呼 -@property (nonatomic,assign) NSInteger helloCount; -///是否可见 -@property (nonatomic,assign) BOOL visible; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloCountModel.m b/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloCountModel.m deleted file mode 100644 index b77e4c7..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloCountModel.m +++ /dev/null @@ -1,14 +0,0 @@ -// -// SessionSayHelloCountModel.m -// YUMI -// -// Created by YUMI on 2023/2/3. -// - -#import "SessionSayHelloCountModel.h" - -@implementation SessionSayHelloCountModel - - - -@end diff --git a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloLevelModel.h b/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloLevelModel.h deleted file mode 100644 index e469315..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloLevelModel.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// SessionSayHelloLevelModel.h -// YUMI -// -// Created by YUMI on 2023/2/2. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface SessionSayHelloLevelModel : PIBaseModel -///当前主播评级 -@property (nonatomic,copy) NSString *currentLevel; -///当前倍数 -@property (nonatomic,copy) NSString * currentMultiple; -///开启状态 -@property (nonatomic,assign) BOOL enable; -///文案描述：提升下一级.... -@property (nonatomic,copy) NSString *desc; -///打招呼的数量 -@property (nonatomic,assign) NSInteger helloCount; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloLevelModel.m b/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloLevelModel.m deleted file mode 100644 index f301830..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloLevelModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// SessionSayHelloLevelModel.m -// YUMI -// -// Created by YUMI on 2023/2/2. -// - -#import "SessionSayHelloLevelModel.h" - -@implementation SessionSayHelloLevelModel - -@end diff --git a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloListModel.h b/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloListModel.h deleted file mode 100644 index a765279..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloListModel.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// SessionSayHelloListModel.h -// YUMI -// -// Created by YUMI on 2023/2/2. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface SessionSayHelloListModel : PIBaseModel -///生日 -@property(nonatomic,assign) long birth; -///uid -@property (nonatomic,assign) NSInteger uid; -///性别 -@property (nonatomic,copy) NSString *name; -///头像 -@property (nonatomic,copy) NSString *avatar; -///打招呼文案 -@property (nonatomic,copy) NSString *content; -///性别 -@property (nonatomic,assign) GenderType gender; -///财富等级 -@property (nonatomic,copy) NSString *experUrl; -///魅力等级 -@property (nonatomic,copy) NSString *charmUrl; -///在线文案描述 -@property (nonatomic,copy) NSString *onlineDesc; -///是否在线 -@property (nonatomic,assign) BOOL online; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloListModel.m b/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloListModel.m deleted file mode 100644 index d1f5816..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloListModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// SessionSayHelloListModel.m -// YUMI -// -// Created by YUMI on 2023/2/2. -// - -#import "SessionSayHelloListModel.h" - -@implementation SessionSayHelloListModel -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"experUrl":@"userLevelVo.experUrl", - @"charmUrl":@"userLevelVo.charmUrl" - }; -} -@end diff --git a/YuMi/Modules/YMMessage/View/SayHello/Presenter/XPSessionSayHelloPresenter.h b/YuMi/Modules/YMMessage/View/SayHello/Presenter/XPSessionSayHelloPresenter.h deleted file mode 100644 index 8a96d33..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/Presenter/XPSessionSayHelloPresenter.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMSessionSayHelloPresenter.h -// YUMI -// -// Created by YUMI on 2023/2/2. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSessionSayHelloPresenter : BaseMvpPresenter - -///获取主播评级信息 -- (void)shuntLevleInfo; - -///开启关闭自动打招呼 -- (void)shuntEnable:(BOOL)enable; - -///打招呼列表 -- (void)shuntList:(NSInteger)page size:(NSInteger)size state:(NSInteger)state; - -///点击去私聊调用的接口 后台统计使用 -- (void)shuntClickChat:(NSString *)userId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SayHello/Presenter/XPSessionSayHelloPresenter.m b/YuMi/Modules/YMMessage/View/SayHello/Presenter/XPSessionSayHelloPresenter.m deleted file mode 100644 index 94fd1c0..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/Presenter/XPSessionSayHelloPresenter.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// YMSessionSayHelloPresenter.m -// YUMI -// -// Created by YUMI on 2023/2/2. -// - -#import "XPSessionSayHelloPresenter.h" -#import "Api+SayHello.h" -#import "SessionSayHelloLevelModel.h" -#import "SessionSayHelloListModel.h" -#import "XPSessionSayHelloProtocol.h" -@implementation XPSessionSayHelloPresenter - -///获取主播评级信息 -- (void)shuntLevleInfo { - [Api shuntLevleInfoComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - SessionSayHelloLevelModel * levelInfo = [SessionSayHelloLevelModel modelWithDictionary:data.data]; - [[self getView] shuntLevleInfoSuccess:levelInfo]; - }]]; -} - -///开启关闭自动打招呼 -- (void)shuntEnable:(BOOL)enable { - NSString * str = enable ? @"1" : @"0"; - [Api shuntEnableComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] shuntEnableScucess:enable]; - }] enable:str]; -} - -///打招呼列表 -- (void)shuntList:(NSInteger)page size:(NSInteger)size state:(NSInteger)state { - NSString * pageStr = [NSString stringWithFormat:@"%ld", page]; - NSString * sizeStr = [NSString stringWithFormat:@"%ld", size]; - [Api shuntListComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [SessionSayHelloListModel modelsWithArray:data.data]; - [[self getView] shuntListScuccess:array state:state]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] shuntListFailState:state]; - }] page:pageStr size:sizeStr]; -} - - -///点击去私聊调用的接口 后台统计使用 -- (void)shuntClickChat:(NSString *)userId { - [Api shuntClickChatComplection:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - } toUserId:userId]; -} - - - -@end diff --git a/YuMi/Modules/YMMessage/View/SayHello/Protocol/XPSessionSayHelloProtocol.h b/YuMi/Modules/YMMessage/View/SayHello/Protocol/XPSessionSayHelloProtocol.h deleted file mode 100644 index ed3c8e8..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/Protocol/XPSessionSayHelloProtocol.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// YMSessionSayHelloProtocol.h -// YUMI -// -// Created by YUMI on 2023/2/2. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class SessionSayHelloLevelModel; -@protocol XPSessionSayHelloProtocol -///获取主播评级信息 -- (void)shuntLevleInfoSuccess:(SessionSayHelloLevelModel *)levelInfo; -///开启关闭自动打招呼 -- (void)shuntEnableScucess:(BOOL)enable; - -///打招呼列表 -- (void)shuntListScuccess:(NSArray *)list state:(NSInteger)state; -- (void)shuntListFailState:(NSInteger)state; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.h b/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.h deleted file mode 100644 index e5c830d..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMSessionSayHelloEmptyTableViewCell.h -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSessionSayHelloEmptyTableViewCell : UITableViewCell - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.m b/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.m deleted file mode 100644 index e393023..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.m +++ /dev/null @@ -1,73 +0,0 @@ -// -// YMSessionSayHelloEmptyTableViewCell.m -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import "XPSessionSayHelloEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPSessionSayHelloEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPSessionSayHelloEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(250); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPSessionSayHelloEmptyTableViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.h b/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.h deleted file mode 100644 index c2983a4..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMSessionSayHelloTableViewCell.h -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class SessionSayHelloListModel, XPSessionSayHelloTableViewCell; -@protocol XPSessionSayHelloTableViewCellDelegate - -///去私聊 -- (void)xPSessionSayHelloTableViewCell:(XPSessionSayHelloTableViewCell *)view didClickChat:(SessionSayHelloListModel *)info; - -@end -@interface XPSessionSayHelloTableViewCell : UITableViewCell -///打招呼信息 -@property (nonatomic,strong) SessionSayHelloListModel *shuntInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.m b/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.m deleted file mode 100644 index add9ac0..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.m +++ /dev/null @@ -1,266 +0,0 @@ -// -// YMSessionSayHelloTableViewCell.m -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import "XPSessionSayHelloTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "SessionSayHelloListModel.h" - -@interface XPSessionSayHelloTableViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///显示性别 -@property (nonatomic,strong) UIButton *sexImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///财富等级 -@property (nonatomic,strong) NetImageView *levelImageView; -///魅力等级 -@property (nonatomic,strong) NetImageView *charmImageView; -///背景 -@property (nonatomic,strong) UIImageView *backView; -///显示内容 -@property (nonatomic,strong) UILabel *titleLabel; -///打招呼 -@property (nonatomic,strong) UIButton *helloButton; -///显示时间 -@property (nonatomic,strong) UILabel *timeLabel; -///在线 -@property (nonatomic,strong) UIView *onLineView; -@end - -@implementation XPSessionSayHelloTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.sexImageView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.levelImageView]; - [self.contentView addSubview:self.charmImageView]; - [self.contentView addSubview:self.timeLabel]; - [self.contentView addSubview:self.onLineView]; - [self.contentView addSubview:self.backView]; - - [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.helloButton]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(54, 54)); - make.leading.mas_equalTo(self.contentView).offset(15); - make.top.mas_equalTo(self.contentView); - }]; - - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(28, 14)); - make.bottom.mas_equalTo(self.avatarImageView); - make.trailing.mas_equalTo(self.avatarImageView); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); - make.trailing.mas_lessThanOrEqualTo(self.contentView).offset(-20); - }]; - - [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(20); - make.height.mas_equalTo(20); - make.leading.mas_equalTo(self.nickLabel); - make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - }]; - - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(20); - make.leading.mas_equalTo(self.levelImageView.mas_trailing).offset(2); - make.centerY.mas_equalTo(self.levelImageView); - }]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avatarImageView); - make.trailing.mas_equalTo(self.contentView).offset(-15); - }]; - - [self.onLineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(8, 8)); - make.centerY.mas_equalTo(self.timeLabel); - make.trailing.mas_equalTo(self.timeLabel.mas_leading).offset(-2); - }]; - - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(56); - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(3); - - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).offset(16); - make.top.mas_equalTo(self.backView).offset(23); - make.trailing.mas_lessThanOrEqualTo(self.backView).offset(-25); - }]; - - [self.helloButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(56,24)); - make.centerY.mas_equalTo(self.titleLabel); - make.trailing.mas_equalTo(self.backView).offset(-16); - }]; -} - -#pragma mark - Event Response -- (void)helloButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPSessionSayHelloTableViewCell:didClickChat:)]) { - [self.delegate xPSessionSayHelloTableViewCell:self didClickChat:self.shuntInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setShuntInfo:(SessionSayHelloListModel *)shuntInfo { - _shuntInfo = shuntInfo; - if (_shuntInfo) { - self.avatarImageView.imageUrl = _shuntInfo.avatar; - - [self.sexImageView setTitle:[NSString getAgeWithBirth:_shuntInfo.birth] forState:UIControlStateNormal]; - self.sexImageView.backgroundColor = _shuntInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.titleEdgeInsets = _shuntInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.sexImageView.selected = _shuntInfo.gender != GenderType_Male; - self.nickLabel.text = _shuntInfo.name; - self.levelImageView.imageUrl = _shuntInfo.experUrl; - self.charmImageView.imageUrl = _shuntInfo.charmUrl; - self.timeLabel.text = _shuntInfo.onlineDesc; - self.titleLabel.text = _shuntInfo.content; - self.onLineView.hidden = !_shuntInfo.online; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 54/2; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UIButton *)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; - } - return _sexImageView; -} - -- (NetImageView *)levelImageView { - if (!_levelImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _levelImageView = [[NetImageView alloc] initWithConfig:config]; - _levelImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _levelImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - _charmImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _charmImageView; -} - -- (UIView *)onLineView { - if (!_onLineView) { - _onLineView = [[UIView alloc] init]; - _onLineView.backgroundColor = [DJDKMIMOMColor colorWithHexString:@"#97EF30"]; - _onLineView.layer.masksToBounds = YES; - _onLineView.layer.cornerRadius = 4; - } - return _onLineView; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:10]; - _timeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _timeLabel; -} - -- (UIImageView *)backView { - if (!_backView) { - _backView = [[UIImageView alloc] init]; - _backView.userInteractionEnabled = YES; - _backView.layer.masksToBounds = YES; - _backView.contentMode = UIViewContentModeScaleAspectFill; - _backView.image = [[UIImage imageNamed:@"session_say_hello_content_bg"] resizableImageWithCapInsets:UIEdgeInsetsMake(20, 300, 10, 250) resizingMode:UIImageResizingModeStretch]; - } - return _backView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:12]; - _titleLabel.textColor = [DJDKMIMOMColor colorWithHexString:@"#8A8CAB"]; - } - return _titleLabel; -} - -- (UIButton *)helloButton { - if (!_helloButton) { - _helloButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_helloButton setTitle:YMLocalizedString(@"XPSessionSayHelloTableViewCell0") forState:UIControlStateNormal]; - [_helloButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - _helloButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_helloButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _helloButton.layer.masksToBounds = YES; - _helloButton.layer.cornerRadius = 12; - [_helloButton addTarget:self action:@selector(helloButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _helloButton; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.h b/YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.h deleted file mode 100644 index cf90f8f..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMSessionSayHelloHeaderView.h -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPSessionSayHelloHeaderView, SessionSayHelloLevelModel; -@protocol XPSessionSayHelloHeaderViewDelegate - -- (void)xPSessionSayHelloHeaderView:(XPSessionSayHelloHeaderView *)view didClickBack:(UIButton *)sender; - -- (void)XPSessionSayHelloHeaderView:(XPSessionSayHelloHeaderView *)view didChangeValue:(UISwitch *)switchView; -@end - -@interface XPSessionSayHelloHeaderView : UIView -///代理 -@property (nonatomic,weak) id delegate; - -///等级信息 -@property (nonatomic,strong) SessionSayHelloLevelModel *levelInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.m b/YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.m deleted file mode 100644 index a522967..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.m +++ /dev/null @@ -1,226 +0,0 @@ -// -// YMSessionSayHelloHeaderView.m -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import "XPSessionSayHelloHeaderView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "XPSwitch.h" -///Model -#import "SessionSayHelloLevelModel.h" - -@interface XPSessionSayHelloHeaderView () -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///开关 -@property (nonatomic,strong) XPSwitch *switchView; -///当前评级 -@property (nonatomic,strong) UILabel *currentRateLabel; -///打招呼流量 -@property (nonatomic,strong) UILabel *helloLabel; -///下一个等级流量 -@property (nonatomic,strong) UILabel *nextLabel; -///当前的等级 -@property (nonatomic,strong) NetImageView *levelImageView; -@end - -@implementation XPSessionSayHelloHeaderView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.backButton]; - [self addSubview:self.titleLabel]; - [self addSubview:self.switchView]; - [self addSubview:self.currentRateLabel]; - [self addSubview:self.helloLabel]; - [self addSubview:self.nextLabel]; - [self addSubview:self.levelImageView]; -} - -- (void)initSubViewConstraints { - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).mas_offset(10); - make.top.mas_equalTo(statusbarHeight); - make.height.width.mas_equalTo(44); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.centerY.mas_equalTo(self.backButton); - }]; - - [self.switchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self).offset(-15); - make.centerY.mas_equalTo(self.titleLabel); - make.size.mas_equalTo(CGSizeMake(42, 23)); - }]; - - [self.currentRateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(15); - make.top.mas_equalTo(self.backButton.mas_bottom).offset(40); - }]; - - [self.helloLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.currentRateLabel); - make.top.mas_equalTo(self.currentRateLabel.mas_bottom).offset(10); - }]; - - [self.nextLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.helloLabel.mas_bottom); - make.leading.mas_equalTo(self.helloLabel); - }]; - - [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(130, 115)); - make.trailing.mas_equalTo(self).offset(-15); - make.top.mas_equalTo(self).offset(kNavigationHeight + 8); - }]; -} - -- (void)createCurrentRateAttribute:(NSString *)level { - if (level.length < 0) { - return; - } - NSString * title = [NSString stringWithFormat:@"%@：%@",YMLocalizedString(@"XPSessionSayHelloHeaderView0"), level]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:@"#1A1A1A"]}]; - [attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:@"#FF8400"] range:[title rangeOfString:level]]; - [attribute addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:16 weight:UIFontWeightSemibold] range:[title rangeOfString:level]]; - self.currentRateLabel.attributedText = attribute; -} - -- (void)createHelloAttribute:(NSString *)level { - if (level.length < 0) { - return; - } - NSString * levelStr = [NSString stringWithFormat:YMLocalizedString(@"XPSessionSayHelloHeaderView1"), level]; - NSString * title = [NSString stringWithFormat:@"%@：%@", YMLocalizedString(@"XPSessionSayHelloHeaderView2"),levelStr]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}]; - [attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:@"#171A58"] range:[title rangeOfString:levelStr]]; - [attribute addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:24 weight:UIFontWeightMedium] range:[title rangeOfString:levelStr]]; - self.helloLabel.attributedText = attribute; -} - - -#pragma mark - Event Response -- (void)backButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPSessionSayHelloHeaderView:didClickBack:)]) { - [self.delegate xPSessionSayHelloHeaderView:self didClickBack:sender]; - } -} - -- (void)switchDidChange:(UISwitch *)switchOn { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPSessionSayHelloHeaderView:didChangeValue:)]) { - [self.delegate XPSessionSayHelloHeaderView:self didChangeValue:switchOn]; - } -} - -#pragma mark - Getters And Setters -- (void)setLevelInfo:(SessionSayHelloLevelModel *)levelInfo { - _levelInfo = levelInfo; - if (_levelInfo) { - self.switchView.on = _levelInfo.enable; - [self createHelloAttribute:_levelInfo.currentMultiple]; - [self createCurrentRateAttribute:_levelInfo.currentLevel]; - self.nextLabel.text = _levelInfo.desc; - if ([_levelInfo.currentLevel isEqualToString:@"S"]) { - self.levelImageView.image = [UIImage imageNamed:@"mine_anchor_level_s"]; - } else if([_levelInfo.currentLevel isEqualToString:@"B"]) { - self.levelImageView.image = [UIImage imageNamed:@"mine_anchor_level_b"]; - } else if([_levelInfo.currentLevel isEqualToString:@"C"]) { - self.levelImageView.image = [UIImage imageNamed:@"mine_anchor_level_c"]; - }else if([_levelInfo.currentLevel isEqualToString:@"D"]) { - self.levelImageView.image = [UIImage imageNamed:@"mine_anchor_level_d"]; - } else { - self.levelImageView.image = [UIImage imageNamed:@"mine_anchor_level_a"]; - } - } -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateSelected]; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.text = YMLocalizedString(@"XPSessionSayHelloHeaderView3"); - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (XPSwitch *)switchView { - if (!_switchView) { - _switchView = [[XPSwitch alloc] initWithFrame:CGRectMake(0, 0, 42, 23)]; - _switchView.backgroundColor = [UIColor clearColor]; - _switchView.onTintColor = [DJDKMIMOMColor colorWithHexString:@"##5FCCE4"]; - _switchView.tintColor = [DJDKMIMOMColor colorWithHexString:@"#C7DAEA"]; - _switchView.thumbTintColor = [UIColor whiteColor]; - _switchView.shadow = NO; - [_switchView addTarget:self action:@selector(switchDidChange:) forControlEvents:UIControlEventValueChanged]; - - } - return _switchView; -} - -- (UILabel *)currentRateLabel { - if (!_currentRateLabel) { - _currentRateLabel = [[UILabel alloc] init]; - } - return _currentRateLabel; -} - -- (UILabel *)helloLabel { - if (!_helloLabel) { - _helloLabel = [[UILabel alloc] init]; - } - return _helloLabel; -} - -- (UILabel *)nextLabel { - if (!_nextLabel) { - _nextLabel = [[UILabel alloc] init]; - _nextLabel.textColor = [DJDKMIMOMColor colorWithHexString:@"#BABBCD"]; - _nextLabel.font = [UIFont systemFontOfSize:10]; - } - return _nextLabel; -} - -- (NetImageView *)levelImageView { - if (!_levelImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _levelImageView = [[NetImageView alloc] initWithConfig:config]; - _levelImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _levelImageView; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.h b/YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.h deleted file mode 100644 index 2eb6ffa..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMSessionSayHelloViewController.h -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSessionSayHelloViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.m b/YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.m deleted file mode 100644 index 23161a4..0000000 --- a/YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.m +++ /dev/null @@ -1,266 +0,0 @@ -// -// YMSessionSayHelloViewController.m -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import "XPSessionSayHelloViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -#import "NIMMessageMaker.h" -///Model -#import "SessionSayHelloLevelModel.h" -#import "SessionSayHelloListModel.h" -///View -#import "XPSessionSayHelloHeaderView.h" -#import "XPSessionSayHelloTableViewCell.h" -#import "XPSessionSayHelloEmptyTableViewCell.h" -#import "SessionViewController.h" -///P -#import "XPSessionSayHelloProtocol.h" -#import "XPSessionSayHelloPresenter.h" -@interface XPSessionSayHelloViewController () -///背景图片 -@property (nonatomic,strong) UIImageView *backImageView; -///顶部的View -@property (nonatomic,strong) XPSessionSayHelloHeaderView *headerView; -///背景 -@property (nonatomic,strong) UIView *backView; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前页数 -@property (nonatomic,assign) NSInteger page; -///等级信息 -@property (nonatomic,strong) SessionSayHelloLevelModel *levelInfo; -@end - -@implementation XPSessionSayHelloViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (__kindof id)createPresenter { - return [[XPSessionSayHelloPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [self headerRefresh]; -} - -#pragma mark - Refresh -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - ///加载用户等级信息 - [self.presenter shuntLevleInfo]; -} - -- (void)headerRefresh { - self.page = 1; - [self.presenter shuntList:self.page size:20 state:0]; -} - -- (void)footerRefresh { - self.page ++; - [self.presenter shuntList:self.page size:20 state:1]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.backImageView]; - [self.view addSubview:self.backView]; - [self.view addSubview:self.tableView]; - [self.view addSubview:self.headerView]; -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KScreenWidth, KScreenWidth)); - make.top.centerX.mas_equalTo(self.view); - }]; - - [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(220 + kSafeAreaTopHeight); - }]; - - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.headerView.mas_bottom); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.backView); - make.top.mas_equalTo(self.backView.mas_top).offset(15); - }]; -} - -#pragma mark - XPSessionSayHelloHeaderViewDelegate -- (void)xPSessionSayHelloHeaderView:(XPSessionSayHelloHeaderView *)view didClickBack:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)XPSessionSayHelloHeaderView:(XPSessionSayHelloHeaderView *)view didChangeValue:(UISwitch *)switchView { - [self.presenter shuntEnable:switchView.on]; -} - -#pragma mark - XPSessionSayHelloProtocol -- (void)shuntEnableScucess:(BOOL)enable { - self.levelInfo.enable = enable; - self.headerView.levelInfo = self.levelInfo; -} - -- (void)shuntListFailState:(NSInteger)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -- (void)shuntListScuccess:(NSArray *)list state:(NSInteger)state { - if (state == 0) { - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - - if (list.count > 0) { - [self.datasource addObjectsFromArray:list]; - } - [self.tableView reloadData]; -} - -- (void)shuntLevleInfoSuccess:(SessionSayHelloLevelModel *)levelInfo { - self.levelInfo = levelInfo; - self.headerView.levelInfo = self.levelInfo; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? 130 : KScreenHeight - kSafeAreaTopHeight -230; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPSessionSayHelloTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPSessionSayHelloTableViewCell class])]; - if (cell == nil) { - cell = [[XPSessionSayHelloTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPSessionSayHelloTableViewCell class])]; - } - SessionSayHelloListModel * model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.shuntInfo = model; - cell.delegate = self; - return cell; - } else { - XPSessionSayHelloEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPSessionSayHelloEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPSessionSayHelloEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPSessionSayHelloEmptyTableViewCell class])]; - } - return cell; - } -} - -#pragma mark - XPSessionSayHelloTableViewCellDelegate -- (void)xPSessionSayHelloTableViewCell:(XPSessionSayHelloTableViewCell *)view didClickChat:(SessionSayHelloListModel *)info { - if (info.uid > 0) { - NSString * toUid = [NSString stringWithFormat:@"%ld", info.uid]; - [self.presenter shuntClickChat:toUid]; - NIMSession * session = [NIMSession session:toUid type:NIMSessionTypeP2P]; - if (info.content.length > 0) { - NIMMessage * message = [NIMMessageMaker msgWithText:info.content]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - } - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:session]; - [self.navigationController pushViewController:sessionVC animated:YES]; - }); - } -} - -#pragma mark - Getters And Setters -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"session_say_hello_list_bg"]; - } - return _backImageView; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView setContentInset:UIEdgeInsetsMake(0, 0, 0, 0)]; - [_tableView registerClass:[XPSessionSayHelloTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPSessionSayHelloTableViewCell class])]; - [_tableView registerClass:[XPSessionSayHelloEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPSessionSayHelloEmptyTableViewCell class])]; - } - return _tableView; -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [UIColor whiteColor]; - CAShapeLayer * layer = [CAShapeLayer layer]; - layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, KScreenHeight - 230 - kSafeAreaTopHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(16, 16)].CGPath; - _backView.layer.mask = layer; - } - return _backView; -} - -- (XPSessionSayHelloHeaderView *)headerView { - if (!_headerView) { - _headerView = [[XPSessionSayHelloHeaderView alloc] init]; - _headerView.delegate = self; - } - return _headerView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/AgentMessageTableViewCell.h b/YuMi/Modules/YMMessage/View/Session/Cell/AgentMessageTableViewCell.h deleted file mode 100644 index b84b36d..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Cell/AgentMessageTableViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// AgentMessageTableViewCell.h -// YuMi -// -// Created by P on 2025/2/20. -// - -#import "MessageContentCustomView.h" -#import "UIView+NIM.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface AgentMessageTableViewCell : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/AgentMessageTableViewCell.m b/YuMi/Modules/YMMessage/View/Session/Cell/AgentMessageTableViewCell.m deleted file mode 100644 index 3e6ca09..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Cell/AgentMessageTableViewCell.m +++ /dev/null @@ -1,379 +0,0 @@ -// -// AgentMessageTableViewCell.m -// YuMi -// -// Created by P on 2025/2/20. -// - -#import "AgentMessageTableViewCell.h" - -#import "MoliAvatar.h" -#import "AgentMessageModel.h" -#import "MessageCPNotifyModel.h" - -@interface AgentMessageTableViewCell () - -@property (nonatomic, strong) MessageCPNotifyModel *model; - -@property(nonatomic, strong) UILabel *titleLabel; -@property(nonatomic, strong) UILabel *messageLabel; -@property(nonatomic, strong) UIButton *agreeButton; -@property(nonatomic, strong) UIButton *rejectButton; -@property(nonatomic, strong) UIStackView *stackView; -@property(nonatomic, strong) UIStackView *avatarStackView; -@property (nonatomic, strong) UIImageView *iconImageView; -@property (nonatomic, strong) NetImageView *avatarMe; -@property (nonatomic, strong) NetImageView *avatarOther; - -@end - -@implementation AgentMessageTableViewCell - -- (void)initSubViews { - [super initSubViews]; - - [self.backView addSubview:self.iconImageView]; - [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.messageLabel]; - [self.backView addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.rejectButton]; - [self.stackView addArrangedSubview:self.agreeButton]; - [self.backView addSubview:self.avatarStackView]; - [self.avatarStackView addArrangedSubview:self.avatarMe]; - [self.avatarStackView addArrangedSubview:self.avatarOther]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(72, 82)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.backView).mas_equalTo(10); - make.height.mas_equalTo(22); - }]; - [self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_equalTo(10); - make.bottom.mas_equalTo(self.backView).offset(-40); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backView); - make.height.mas_equalTo(30); - make.bottom.mas_equalTo(-0); - }]; - - [self.rejectButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - make.width.mas_equalTo(94); - }]; - - [self.agreeButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - make.width.mas_equalTo(94); - }]; - - [self.avatarStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backView); - make.top.mas_equalTo(10); - make.size.mas_equalTo(CGSizeMake(102, 55)); - }]; - - [self.avatarMe mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(55, 55)); - }]; - - [self.avatarOther mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(55, 55)); - }]; -} - -- (void)render:(MessageBaseModel *)message { - if ([message isKindOfClass:[AgentMessageModel class]]) { - AgentMessageModel *model = (AgentMessageModel *)message; - [self renderAgentModel:model]; - } else if ([message isKindOfClass:[MessageCPNotifyModel class]]){ - MessageCPNotifyModel *model = (MessageCPNotifyModel *)message; - [self renderCPNotifyMode:model]; - } -} - -- (void)renderCPNotifyMode:(MessageCPNotifyModel *)model { - self.model = model; - self.iconImageView.hidden = NO; - self.backView.backgroundColor = [UIColor clearColor]; - [self addGradientBackgroundWithColors:@[UIColorFromRGB(0xfff5d9), - UIColorFromRGB(0xffffff)] - startPoint:CGPointMake(0.5, 0) - endPoint:CGPointMake(0.5, 1) - cornerRadius:8]; - self.avatarStackView.hidden = YES; - self.agreeButton.enabled = YES; - self.rejectButton.enabled = YES; - - // 请求方不显示操作按钮 - if (model.isSender) { - self.agreeButton.hidden = YES; - self.rejectButton.hidden = YES; - } else { - self.agreeButton.hidden = NO; - self.rejectButton.hidden = NO; - } - - if (model.isUserTaped > 0) { - // 用户操作过 - self.titleLabel.text = YMLocalizedString(@"20.20.56_text_10"); - self.agreeButton.enabled = NO; - self.rejectButton.enabled = NO; - self.stackView.hidden = NO; - [self.agreeButton addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xEBEBEB), - UIColorFromRGB(0xEBEBEB), - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 0.5) cornerRadius:15]; - if (model.isUserTaped == 1) { - self.agreeButton.hidden = model.status!=1; - self.rejectButton.hidden = model.status==1; - } else if (model.isUserTaped == 2) { - self.agreeButton.hidden = model.status==2; - self.rejectButton.hidden = model.status!=2; - } - [self.messageLabel mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_equalTo(10); - make.bottom.mas_equalTo(self.backView).offset(-40); - }]; - } else { - self.agreeButton.enabled = YES; - self.rejectButton.enabled = YES; - switch (model.status) { - case 0: - case 2: - self.stackView.hidden = NO; - self.titleLabel.text = YMLocalizedString(@"20.20.56_text_10"); - if (model.isSender) { - [self.messageLabel mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(10); - make.bottom.mas_equalTo(self.backView).offset(-10); - }]; - } else { - [self.messageLabel mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_equalTo(10); - make.bottom.mas_equalTo(self.backView).offset(-40); - }]; - } - break; - case 1: { - if (![NSString isEmpty:model.avatar]) { - self.avatarMe.imageUrl = model.avatar; - } - if (![NSString isEmpty:model.loverAvatar]) { - self.avatarOther.imageUrl = model.loverAvatar; - } - self.avatarStackView.hidden = NO; - self.stackView.hidden = YES; - self.titleLabel.text = YMLocalizedString(@"20.20.56_text_10"); - [self.messageLabel mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.avatarStackView.mas_bottom).offset(10); - make.bottom.mas_equalTo(self.backView).offset(-10); - }]; - } - default: - self.titleLabel.text = @""; - break; - } - } - - [self updateMessageContent:model]; -} - -- (void)updateMessageContent:(MessageCPNotifyModel *)model { - if (model.status == 2) { - self.messageLabel.text = YMLocalizedString(@"20.20.56_text_20"); - return; - } - - NSString *part_1 = model.status == 0 ? YMLocalizedString(@"20.20.56_text_13") : YMLocalizedString(@"20.20.56_text_14"); - if (model.isUserTaped > 0) { - part_1 = YMLocalizedString(@"20.20.56_text_13") ; - } - NSString *part_2 = @""; - - if (model.relationNameType > 0) { - switch (model.relationNameType) { - case 1: - part_2 = YMLocalizedString(@"20.20.56_text_6"); - break; - case 2: - part_2 = YMLocalizedString(@"20.20.56_text_7"); - break; - case 3: - part_2 = YMLocalizedString(@"20.20.56_text_8"); - break; - case 4: - part_2 = YMLocalizedString(@"20.20.56_text_9"); - break; - - default: - break; - } - } - - NSString *formattedString = [NSString stringWithFormat:part_1, part_2]; - NSMutableAttributedString *final = [[NSMutableAttributedString alloc] initWithString:formattedString - attributes:@{ - NSFontAttributeName: kFontRegular(15), - NSForegroundColorAttributeName: UIColorFromRGB(0x313131) - }]; - NSRange part2Range = [formattedString rangeOfString:part_2]; - if (part2Range.location != NSNotFound) { - [final setAttributes:@{ - NSForegroundColorAttributeName: UIColorFromRGB(0xff8c03) - } range:part2Range]; - } - - self.messageLabel.attributedText = final; -} - -- (void)renderAgentModel:(AgentMessageModel *)model { - switch (model.layoutType) { - case 1: { - self.agreeButton.hidden = NO; - self.rejectButton.hidden = NO; - } - break; - case 2: { - self.agreeButton.hidden = NO; - self.rejectButton.hidden = YES; - } - break; - case 3: { - self.agreeButton.hidden = YES; - self.rejectButton.hidden = NO; - } - break; - default: - break; - } - - self.titleLabel.text = model.title; - self.messageLabel.text = model.content; -} - - -#pragma mark - -- (void)didTapAgree { - if (self.customMessageDelegate && [self.customMessageDelegate respondsToSelector:@selector(didTapAccept:)]) { - [self.customMessageDelegate didTapAccept:self.model.message]; - } -} - -- (void)didTapReject { - if (self.customMessageDelegate && [self.customMessageDelegate respondsToSelector:@selector(didTapReject:)]) { - [self.customMessageDelegate didTapReject:self.model.message]; - } -} - -#pragma mark - - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc]initWithFrame:CGRectZero]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.preferredMaxLayoutWidth = CONTENT_WIDTH_MAX - MESSAGE_PADDING * 2; - _titleLabel.textColor = UIColorFromRGB(0x313131); - _titleLabel.font = kFontSemibold(15); - } - return _titleLabel; -} - -- (UILabel *)messageLabel { - if (!_messageLabel) { - _messageLabel = [[UILabel alloc]initWithFrame:CGRectZero]; - _messageLabel.textAlignment = NSTextAlignmentCenter; - _messageLabel.preferredMaxLayoutWidth = CONTENT_WIDTH_MAX - MESSAGE_PADDING * 2; - _messageLabel.textColor = UIColorFromRGB(0x313131); - _messageLabel.font = kFontRegular(14); - _messageLabel.numberOfLines = 0; - } - return _messageLabel; -} - -- (UIButton *)agreeButton { - if (!_agreeButton) { - _agreeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_agreeButton addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xE29030), - UIColorFromRGB(0xFCC074), - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 0.5) cornerRadius:15]; - [_agreeButton setTitle:YMLocalizedString(@"XPAnchorPKInviteView7") forState:UIControlStateNormal]; - [_agreeButton setTitle:YMLocalizedString(@"20.20.56_text_18") forState:UIControlStateDisabled]; - [_agreeButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_agreeButton setTitleColor:UIColorFromRGB(0x7b7b7d) forState:UIControlStateDisabled]; - _agreeButton.titleLabel.font = kFontMedium(14); - [_agreeButton addTarget:self action:@selector(didTapAgree) forControlEvents:UIControlEventTouchUpInside]; - } - return _agreeButton; -} - -- (UIButton *)rejectButton { - if (!_rejectButton) { - _rejectButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _rejectButton.backgroundColor = UIColorFromRGB(0xEBEBEB); - [_rejectButton setCornerRadius:15]; - [_rejectButton setTitle:YMLocalizedString(@"XPAnchorPKInviteView6") forState:UIControlStateNormal]; - [_rejectButton setTitle:YMLocalizedString(@"20.20.56_text_19") forState:UIControlStateDisabled]; - [_rejectButton setTitleColor:UIColorFromRGB(0x7b7b7d) forState:UIControlStateNormal]; - _rejectButton.titleLabel.font = kFontMedium(14); - [_rejectButton addTarget:self action:@selector(didTapReject) forControlEvents:UIControlEventTouchUpInside]; - } - return _rejectButton; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.spacing = 12; - } - return _stackView; -} - -- (UIStackView *)avatarStackView { - if (!_avatarStackView) { - _avatarStackView = [[UIStackView alloc] init]; - _avatarStackView.spacing = -8; - } - return _avatarStackView; -} - -- (UIImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[UIImageView alloc] initWithImage:[UIImage getLanguageImage:@"cp_message_icon"]]; - _iconImageView.hidden = YES; - } - return _iconImageView; -} - -- (NetImageView *)avatarMe { - if (!_avatarMe) { - _avatarMe = [[NetImageView alloc] init]; - [_avatarMe setAllCornerRadius:55/2 borderWidth:1 borderColor:UIColorFromRGB(0xffe046)]; - } - return _avatarMe; -} - -- (NetImageView *)avatarOther { - if (!_avatarOther) { - _avatarOther = [[NetImageView alloc] init]; - [_avatarOther setAllCornerRadius:55/2 borderWidth:1 borderColor:UIColorFromRGB(0xffe046)]; - } - return _avatarOther; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.h b/YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.h deleted file mode 100644 index 3df34fe..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.h +++ /dev/null @@ -1,43 +0,0 @@ -// -// MessageCell.h -// YUMI -// -// Created by zu on 2021/11/28. -// - -#import -#import -#import "MessageBaseModel.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol MessageCellDelegate - -///更新消息成功 -- (void)updateMessageSuccess:(NIMMessage *)message; - -- (void)didTapAvatar:(NSString *)uid; -///发送失败点击了重试 -- (void)didFailRetry:(NIMMessage *)message; -///撤回消息消息成功 -- (void)revokeMessageSuccess:(NIMMessage *)message; -///删除消息成功 -- (void)deleteMessageSuccess:(NIMMessage *)message; - -@optional -- (void)didTapAccept:(NIMMessage *)message; -- (void)didTapReject:(NIMMessage *)message; - -@end - -@interface MessageCell : UITableViewCell - -//+ (CGFloat)measureHeight:(NIMMessage *)message; -- (void)renderWithMessage:(MessageBaseModel *)message; -///代理 -@property (nonatomic,weak) id delegate; - -///是否在房间中 -@property (nonatomic,assign) BOOL isInRoom; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.m b/YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.m deleted file mode 100644 index a760b61..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.m +++ /dev/null @@ -1,423 +0,0 @@ -// -// MessageCell.m -// YUMI -// -// Created by zu on 2021/11/28. -// - -#import "MessageCell.h" -#import "MessageContentProtocol.h" -#import "MessageContentText.h" -#import "MessageContentImage.h" -#import "MessageContentTextClickable.h" -#import "MessageContentCustomView.h" -#import "MessageContentGiftView.h" -#import "MessageContentGuildView.h" -#import "MessageContentUnSupportView.h" -#import "MessageContentOpenLiveView.h" -#import "MessageContentApplicationShareView.h" -#import "MessageContentLevelUpgradeView.h" -#import "MessageConentAudioView.h" -#import "MessageContentTweetView.h" -#import "MessageContentSkillCardView.h" -#import "MessageContentFindNewGreetView.h" -#import "MessageContentRiskAlertView.h" -#import "MessageContentMonentsView.h" -#import "MessageContentMonentsAutoView.h" -#import "MessageContentRedPacketView.h" -#import "MessageTimeView.h" -#import "AttachmentModel.h" -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "PLTimeUtil.h" -#import "XPSkillCardPlayerManager.h" -#import "YUMIMacroUitls.h" -#import - -@interface MessageCell() - -@property (nonatomic, assign) NIMMessageType messageType; - -/** - 左侧头像（私聊对象） - */ -@property (nonatomic, strong) NetImageView * leftAvatar; - -/** - 右侧头像（自己） - */ -@property (nonatomic, strong) NetImageView * rightAvatar; -///处理失败的 -@property (nonatomic,strong) UIButton *failButton; - -/** - 消息背景 - */ -@property (nonatomic, strong) UIView * messageBackground; -@property (nonatomic, strong) MASConstraint * bgLeadingToOtherAvatarTrailing; -@property (nonatomic, strong) MASConstraint * bgTrailingToMeAvatarLeading; -@property (nonatomic, strong) MASConstraint * bgLeadingToOtherAvatarLeading; -@property (nonatomic, strong) MASConstraint * bgTrailingToMeAvatarTrailing; -/** - 消息内容实体 - */ -@property (nonatomic, strong) UIView * messageContent; -///当前的消息 -@property (nonatomic,strong) NIMMessage *currentMessage; -///当前的实体 -@property (nonatomic,strong) MessageBaseModel *currentModel; -@end - -@implementation MessageCell - - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if (self) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self initViews]; - [self initLayout]; - } - return self; -} - -- (void)initViews { - self.backgroundColor = UIColor.clearColor; - [self.contentView addSubview:self.leftAvatar]; - [self.contentView addSubview:self.rightAvatar]; - [self.contentView addSubview:self.messageBackground]; - [self.contentView addSubview:self.failButton]; - - - //在自定义cell中的init方法加入 - UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPressCellHandle:)]; - longPressGesture.minimumPressDuration = 0.5; - [self.messageBackground addGestureRecognizer:longPressGesture]; -} - -- (void)initLayout { - [self.leftAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.mas_equalTo(self).offset(15); - make.width.height.mas_equalTo(45).priorityHigh(); - }]; - - [self.rightAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(15); - make.trailing.mas_equalTo(self).offset(-15); - make.width.height.mas_equalTo(45).priorityHigh(); - }]; - - [self.messageBackground mas_makeConstraints:^(MASConstraintMaker *make) { - self.bgLeadingToOtherAvatarTrailing = make.leading.mas_equalTo(self.contentView).offset(75).priorityHigh(); - self.bgTrailingToMeAvatarLeading = make.trailing.mas_equalTo(self.contentView).offset(-75).priorityHigh(); - self.bgLeadingToOtherAvatarLeading = make.leading.mas_equalTo(self.contentView).offset(15).priorityHigh(); - self.bgTrailingToMeAvatarTrailing = make.trailing.mas_equalTo(self.contentView).offset(-15).priorityHigh(); - make.top.mas_equalTo(self).offset(20); - // 添加最大宽度约束，确保消息背景不会超出右侧边缘 - make.width.lessThanOrEqualTo(self.contentView.mas_width).multipliedBy(0.75); - }]; - - [self.failButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20, 20)); - make.centerY.mas_equalTo(self.messageBackground); - make.leading.mas_equalTo(self.messageBackground.mas_trailing).offset(10); - }]; -} - -//并加上几个方法 - --(void)longPressCellHandle:(UILongPressGestureRecognizer *)gesture { - if (!self.currentMessage) { - return; - } - if(gesture.state==UIGestureRecognizerStateBegan) { - [self becomeFirstResponder]; - - UIMenuController *menuController = [UIMenuController sharedMenuController]; - - UIMenuItem *copyItem = [[UIMenuItem alloc] initWithTitle:YMLocalizedString(@"MessageCell0") action:@selector(menuCopyBtnPressed:)]; - UIMenuItem *deleteItem = [[UIMenuItem alloc] initWithTitle:YMLocalizedString(@"MessageCell1") action:@selector(menuDeleteCopyBtnPressed:)]; - UIMenuItem *revokeItem = [[UIMenuItem alloc] initWithTitle:YMLocalizedString(@"MessageCell2") action:@selector(menuRevokeBtnPressed:)]; - NSMutableArray * array = [NSMutableArray array]; - if ((self.currentMessage.messageType == NIMMessageTypeText) && !self.currentModel.isHiddenAvatar) { - [array addObject:copyItem]; - } - - if (!self.currentModel.isHiddenAvatar) { - [array addObject:deleteItem]; - } - - if (self.currentMessage.isOutgoingMsg && [self checkDataWith:self.currentMessage.timestamp] && (self.currentMessage.messageType == NIMMessageTypeText || self.currentMessage.messageType == NIMMessageTypeImage || self.currentMessage.messageType == NIMMessageTypeAudio)){ - [array addObject:revokeItem]; - } - menuController.menuItems = array; - - [menuController setTargetRect:gesture.view.frame inView:gesture.view.superview]; - - [menuController setMenuVisible:YES animated:YES]; - - [UIMenuController sharedMenuController].menuItems=nil; - } -} - -- (BOOL)checkDataWith:(long)currentStr { - NSDate* date = [NSDate dateWithTimeIntervalSince1970:currentStr]; - NSCalendar * calendar = [NSCalendar currentCalendar]; - NSCalendarUnit unit = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond; - NSDateComponents * cmps = [calendar components:unit fromDate:date toDate:[NSDate date] options:0]; - if (cmps.minute <= 2) { - return YES; - } - return NO; -} - --(void)menuCopyBtnPressed:(UIMenuItem *)menuItem { - [UIPasteboard generalPasteboard].string = self.currentMessage.text; -} - -- (void)menuDeleteCopyBtnPressed:(UIMenuItem *)menuItem { - NIMDeleteMessageOption * opt = [[NIMDeleteMessageOption alloc] init]; - opt.removeFromDB = YES; - [[NIMSDK sharedSDK].conversationManager deleteMessage:self.currentMessage option:opt]; - if (self.delegate && [self.delegate respondsToSelector:@selector(deleteMessageSuccess:)]) { - [self.delegate deleteMessageSuccess:self.currentMessage]; - } -} - -- (void)menuRevokeBtnPressed:(UIMenuItem *)menuItem { - if (self.currentMessage) { - NIMRevokeMessageOption * option = [[NIMRevokeMessageOption alloc] init]; - option.shouldBeCounted = NO; - [[NIMSDK sharedSDK].chatManager revokeMessage:self.currentMessage option:option completion:^(NSError * _Nullable error) { - if (error == nil) { - if (self.delegate && [self.delegate respondsToSelector:@selector(revokeMessageSuccess:)]) { - [self.delegate revokeMessageSuccess:self.currentMessage]; - } - } - }]; - } -} - --(BOOL)canBecomeFirstResponder { - return YES; -} - --(BOOL)canPerformAction:(SEL)action withSender:(id)sender { - if (action == @selector(menuCopyBtnPressed:) || action == @selector(menuDeleteCopyBtnPressed:) || action == @selector(menuRevokeBtnPressed:)) { - return YES; - } - return NO; -} - -- (void)renderWithMessage:(MessageBaseModel *)model { - NIMMessage * message = model.message; - NSString * classStr = [model cellContent:model]; - - self.currentModel = model; - self.currentMessage = message; - NSString * avatarUrl = [[NIMSDK sharedSDK].userManager userInfo:message.from].userInfo.avatarUrl; - BOOL isSelf = [[NIMSDK sharedSDK].loginManager.currentAccount isEqualToString:message.from]; - if (isSelf) { - avatarUrl = [[[XPSkillCardPlayerManager shareInstance] userInfoModel] avatar]; - self.leftAvatar.hidden = YES; - self.rightAvatar.hidden = NO; - - [self.bgLeadingToOtherAvatarTrailing uninstall]; - [self.bgLeadingToOtherAvatarLeading uninstall]; - [self.bgTrailingToMeAvatarLeading install]; - [self.bgTrailingToMeAvatarTrailing uninstall]; - - self.rightAvatar.imageUrl = avatarUrl; - } else { - self.leftAvatar.hidden = NO; - self.rightAvatar.hidden = YES; - - [self.bgLeadingToOtherAvatarTrailing install]; - [self.bgTrailingToMeAvatarLeading uninstall]; - [self.bgLeadingToOtherAvatarLeading uninstall]; - [self.bgTrailingToMeAvatarTrailing uninstall]; - - self.leftAvatar.imageUrl = avatarUrl; - } - - [self handleMessageFail:model]; - if (self.messageContent) { - [self.messageContent removeFromSuperview]; - } - - if (classStr) { - if (![self.messageContent isKindOfClass:NSClassFromString(classStr)]) { - self.messageContent = [[NSClassFromString(classStr) alloc] init]; - if([self.messageContent isKindOfClass:[MessageContentCustomView class]]){ - MessageContentCustomView *messageContent = (MessageContentCustomView *)self.messageContent; - messageContent.customMessageDelegate = self; - } - } - } else { -#if DEBUG - NSAssert(classStr != nil, @"message should not be nil"); -#else - return; -#endif - } - [self.messageBackground addSubview:self.messageContent]; - //MARK: 不太理解原来的 layout 关系，对开黑卡特殊处理 - if ([classStr isEqualToString:@"MessageGameOrderView"]) { - [self.messageBackground mas_remakeConstraints:^(MASConstraintMaker *make) { - self.bgLeadingToOtherAvatarTrailing = make.leading.mas_equalTo(self.contentView).offset(75); - self.bgTrailingToMeAvatarLeading = make.trailing.mas_equalTo(self.contentView).offset(-75); - make.top.mas_equalTo(self).offset(20); - make.height.mas_equalTo(98 + MESSAGE_PADDING); - }]; - [self.messageContent mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.trailing.mas_equalTo(self.messageBackground); - make.height.mas_equalTo(98 + MESSAGE_PADDING); - }]; - } else { - [self.messageContent mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.messageBackground); -// make.top.bottom.mas_equalTo(self.messageBackground); -// make.size.mas_equalTo(self.messageBackground); - }]; - } - - if (model.isHiddenAvatar) { - self.leftAvatar.hidden= YES; - self.rightAvatar.hidden = YES; - [self.messageBackground mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(0); - make.height.mas_equalTo(model.height); - }]; - } - [self.messageContent render:model]; - [self.messageContent.superview layoutIfNeeded]; -} - -- (void)handleMessageFail:(MessageBaseModel *)model { - NIMMessage * message = model.message; - BOOL isHiddenFail = YES; - if (!message.isReceivedMsg) { - isHiddenFail = message.deliveryState != NIMMessageDeliveryStateFailed; - if (message.localExt) { - NSDictionary * dic = message.localExt; - if (((NSString *)dic[@"suggestion"]).integerValue == 2) { - isHiddenFail = NO; - } - } - } else { - isHiddenFail = message.attachmentDownloadState != NIMMessageAttachmentDownloadStateFailed; - } - self.failButton.hidden = isHiddenFail || model.isHiddenAvatar; - if (!isHiddenFail) { - if (message.isReceivedMsg) { - [self.failButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20, 20)); - make.centerY.mas_equalTo(self.messageBackground); - make.leading.mas_equalTo(self.messageBackground.mas_trailing).offset(10); - }]; - } else { - [self.failButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20, 20)); - make.centerY.mas_equalTo(self.messageBackground); - make.trailing.mas_equalTo(self.messageBackground.mas_leading).offset(-10); - }]; - } - } -} -#pragma mark - MessageContentCustomViewDelegate -- (void)updateMessageSuccess:(NIMMessage *)message { - if (self.delegate && [self.delegate respondsToSelector:@selector(updateMessageSuccess:)]) { - [self.delegate updateMessageSuccess:message]; - } -} - -- (void)didTapAccept:(NIMMessage *)message { - if (self.delegate && [self.delegate respondsToSelector:@selector(didTapAccept:)]) { - [self.delegate didTapAccept:message]; - } -} - -- (void)didTapReject:(NIMMessage *)message { - if (self.delegate && [self.delegate respondsToSelector:@selector(didTapReject:)]) { - [self.delegate didTapReject:message]; - } -} - -#pragma mark - Event Response -- (void)rightAvatarTapRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(didTapAvatar:)]) { - [self.delegate didTapAvatar:self.currentMessage.from]; - } -} - -- (void)leftAvatarTapRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(didTapAvatar:)]) { - [self.delegate didTapAvatar:self.currentMessage.from]; - } -} - -- (void)failButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(didFailRetry:)]) { - [self.delegate didFailRetry:self.currentMessage]; - } -} - -#pragma mark - Getters And Setters -- (NetImageView *)leftAvatar { - if (!_leftAvatar) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.radius = MAXFLOAT; - config.imageType = ImageTypeUserIcon; - _leftAvatar = [[NetImageView alloc] initWithConfig:config]; - _leftAvatar.layer.masksToBounds = YES; - _leftAvatar.layer.cornerRadius = 45.f / 2; - _leftAvatar.hidden = YES; - _leftAvatar.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(leftAvatarTapRecognizer)]; - [_leftAvatar addGestureRecognizer:tap]; - } - return _leftAvatar; -} - -- (NetImageView *)rightAvatar { - if (!_rightAvatar) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.radius = MAXFLOAT; - config.imageType = ImageTypeUserIcon; - _rightAvatar = [[NetImageView alloc] initWithConfig:config]; - _rightAvatar.layer.masksToBounds = YES; - _rightAvatar.layer.cornerRadius = 45.f / 2; - _rightAvatar.hidden = YES; - _rightAvatar.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(rightAvatarTapRecognizer)]; - [_rightAvatar addGestureRecognizer:tap]; - } - return _rightAvatar; -} - -- (UIView *)messageBackground { - if (!_messageBackground) { - _messageBackground = [[UIView alloc]init]; - _messageBackground.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _messageBackground.layer.masksToBounds = YES; - _messageBackground.layer.cornerRadius = 8.f; - } - return _messageBackground; -} - -- (UIButton *)failButton { - if (!_failButton) { - _failButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_failButton setImage:[UIImage imageNamed:@"message_session_download_fail"] forState:UIControlStateNormal]; - [_failButton setImage:[UIImage imageNamed:@"message_session_download_fail"] forState:UIControlStateSelected]; - [_failButton addTarget:self action:@selector(failButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _failButton.hidden = YES; - } - return _failButton; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/PublicEventTableViewCell.h b/YuMi/Modules/YMMessage/View/Session/Cell/PublicEventTableViewCell.h deleted file mode 100644 index d768fbd..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Cell/PublicEventTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PublicEventTableViewCell.h -// YuMi -// -// Created by P on 2025/5/13. -// - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface PublicEventTableViewCell : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/PublicEventTableViewCell.m b/YuMi/Modules/YMMessage/View/Session/Cell/PublicEventTableViewCell.m deleted file mode 100644 index 974b28d..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Cell/PublicEventTableViewCell.m +++ /dev/null @@ -1,146 +0,0 @@ -// -// PublicEventTableViewCell.m -// YuMi -// -// Created by P on 2025/5/13. -// - -#import "PublicEventTableViewCell.h" -#import "MessagePublicEventModel.h" -#import "XPRoomViewController.h" -#import "XCCurrentVCStackManager.h" - -@interface PublicEventTableViewCell () - -@property (nonatomic, strong) MessagePublicEventModel *model; -@property (nonatomic, strong) NetImageView *topImageView; -@property (nonatomic, strong) UIImageView *roomIcon; -@property (nonatomic, strong) UILabel *roomIDLabel; -@property (nonatomic, strong) UILabel *eventDescLabel; -@property (nonatomic, strong) UIButton *joinButton; - -@end - -@implementation PublicEventTableViewCell - -- (void)initSubViews { - [super initSubViews]; -// return; - [self.backView addSubview:self.topImageView]; - [self.backView addSubview:self.roomIcon]; - [self.backView addSubview:self.roomIDLabel]; - [self.backView addSubview:self.eventDescLabel]; - [self.backView addSubview:self.joinButton]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; -// return; - [self.topImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.edges.mas_equalTo(self); - make.top.leading.mas_equalTo(self); - make.width.mas_equalTo(self); - make.height.mas_equalTo(86); - }]; - - [self.roomIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.topImageView.mas_bottom).offset(8); - make.leading.mas_equalTo(8); - make.size.mas_equalTo(CGSizeMake(16, 16)); - }]; - - - [self.roomIDLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.roomIcon); - make.leading.mas_equalTo(self.roomIcon.mas_trailing).offset(8); - }]; - - [self.joinButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.trailing.mas_equalTo(-8); - make.size.mas_equalTo(CGSizeMake(96, 30)); - }]; - - [self.eventDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.roomIcon.mas_bottom).offset(8); - make.leading.trailing.mas_equalTo(self.backView).inset(8); - make.bottom.mas_equalTo(self.joinButton.mas_top).offset(-8); - }]; -} - -- (void)didTapJoinButton { - [XPRoomViewController openRoom:@(self.model.roomUid).stringValue - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; -} - -- (void)render:(MessageBaseModel *)message { - if ([message isKindOfClass:[MessagePublicEventModel class]]) { - MessagePublicEventModel *model = (MessagePublicEventModel *)message; - self.model = model; -// NSLog(@"%@", model); - self.topImageView.imageUrl = model.eventBanner; - self.roomIDLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildViewController6"), - @(model.roomErbanNO)]; - if ([AccountInfoStorage instance].getUid.integerValue == model.roomUid) { - self.eventDescLabel.text = YMLocalizedString(@"20.20.59_text_26"); - } else { - self.eventDescLabel.text = YMLocalizedString(@"20.20.59_text_27"); - } - } -} - - -#pragma mark - -- (NetImageView *)topImageView { - if (!_topImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultBannerPlaceholder]; - _topImageView = [[NetImageView alloc] initWithConfig:config]; - [_topImageView setCornerRadius:8]; - } - return _topImageView; -} - -- (UIImageView *)roomIcon { - if (!_roomIcon) { - _roomIcon = [[UIImageView alloc] initWithImage:kImage(@"room_icon")]; - } - return _roomIcon; -} - -- (UILabel *)roomIDLabel { - if (!_roomIDLabel) { - _roomIDLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(13) - textColor:UIColorFromRGB(0x313131)]; - } - return _roomIDLabel; -} - -- (UILabel *)eventDescLabel { - if (!_eventDescLabel) { - _eventDescLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(14) - textColor:UIColorFromRGB(0x313131)]; - _eventDescLabel.numberOfLines = 0; - } - return _eventDescLabel; -} - -- (UIButton *)joinButton { - if (!_joinButton) { - _joinButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_joinButton setTitle:YMLocalizedString(@"XPCandyTreeViewController4") forState:UIControlStateNormal]; - [_joinButton.titleLabel setFont:kFontMedium(14)]; - [_joinButton addTarget:self - action:@selector(didTapJoinButton) - forControlEvents:UIControlEventTouchUpInside]; - [_joinButton setCornerRadius:15]; - [_joinButton addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xe29030), - UIColorFromRGB(0xfcc074) - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 0.5) cornerRadius:15]; - } - return _joinButton; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.h b/YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.h deleted file mode 100644 index b28771d..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// SessionSettingTableViewCell.h -// YUMI -// -// Created by YUMI on 2023/1/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class SessionSettingModel, SessionSettingTableViewCell; -@protocol SessionSettingTableViewCellDelegate - -- (void)sessionSettingTableViewCell:(SessionSettingModel *)item switchState:(UISwitch *)switchOn; - -@end -@interface SessionSettingTableViewCell : UITableViewCell -@property (nonatomic,strong) SessionSettingModel *chatItem; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.m b/YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.m deleted file mode 100644 index 475d24e..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.m +++ /dev/null @@ -1,166 +0,0 @@ -// -// SessionSettingTableViewCell.m -// YUMI -// -// Created by YUMI on 2023/1/18. -// - -#import "SessionSettingTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "SessionSettingModel.h" -@interface SessionSettingTableViewCell () - -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///开关盒箭头的容器 -@property (nonatomic,strong) UIStackView *stackView; -///开关 -@property (nonatomic,strong) UISwitch *switchView; -///箭头 -@property (nonatomic,strong) UIImageView *arrowImageView; -///分割线 -@property (nonatomic,strong) UIView *lineView; -@end - - -@implementation SessionSettingTableViewCell - - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.stackView]; - [self.contentView addSubview:self.lineView]; - - [self.stackView addArrangedSubview:self.switchView]; - [self.stackView addArrangedSubview:self.arrowImageView]; -} - -- (void)initSubViewConstraints { - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(15); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.contentView); - make.height.mas_equalTo(0.5); - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(5.5, 10)); - }]; - -} - -#pragma mark - Event Response -- (void)switchDidChange:(UISwitch *)switchOn { - if (self.delegate && [self.delegate respondsToSelector:@selector(sessionSettingTableViewCell:switchState:)]) { - [self.delegate sessionSettingTableViewCell:self.chatItem switchState:switchOn]; - } -} - -#pragma mark - Getters And Setters -- (void)setChatItem:(SessionSettingModel *)chatItem{ - _chatItem = chatItem; - if ( _chatItem) { - self.titleLabel.text = _chatItem.title; - switch (_chatItem.settingType) { - case SessionSettingType_Top: - { - self.arrowImageView.hidden = YES; - self.switchView.hidden = NO; - self.switchView.on = _chatItem.state; - } - break; - case SessionSettingType_black: - { - self.arrowImageView.hidden = YES; - self.switchView.hidden = NO; - self.switchView.on = _chatItem.state; - } - break; - case SessionSettingType_report: - { - self.arrowImageView.hidden = NO; - self.switchView.hidden = YES; - } - break; - default: - break; - } - } -} - - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:14]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 10; - } - return _stackView; -} - -- (UISwitch *)switchView { - if (!_switchView) { - _switchView = [[UISwitch alloc] init]; - _switchView.onTintColor = [DJDKMIMOMColor appEmphasizeColor]; - _switchView.tintColor = [DJDKMIMOMColor appMainColor]; - _switchView.backgroundColor = [UIColor clearColor]; - [_switchView addTarget:self action:@selector(switchDidChange:) forControlEvents:UIControlEventValueChanged]; - } - return _switchView; -} - -- (UIImageView *)arrowImageView { - if (!_arrowImageView) { - _arrowImageView = [[UIImageView alloc] init]; - _arrowImageView.userInteractionEnabled = YES; - _arrowImageView.image = [[UIImage imageNamed:@"room_setting_arrow"]ms_SetImageForRTL]; - } - return _arrowImageView; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor actionSeparatorColor]; - } - return _lineView; -} - - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.h b/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.h deleted file mode 100644 index abf0ff4..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// SessionUserInfoTableViewCell.h -// YUMI -// -// Created by YUMI on 2023/1/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel, SessionUserInfoTableViewCell; -@protocol SessionUserInfoTableViewCellDelegate - -- (void)sessionUserInfoTableViewCell:(SessionUserInfoTableViewCell *)view showUserInfoVC:(UserInfoModel *)userInfo; - -@end - -@interface SessionUserInfoTableViewCell : UITableViewCell -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m b/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m deleted file mode 100644 index 7f954f7..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m +++ /dev/null @@ -1,458 +0,0 @@ -// -// SessionUserInfoTableViewCell.m -// YUMI -// -// Created by YUMI on 2023/1/16. -// - -#import "SessionUserInfoTableViewCell.h" -///Third -#import -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "SpriteSheetImageManager.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -#import "UIImage+Utils.h" -#import "PLTimeUtil.h" -#import "SDPhotoBrowser.h" -#import "XCCurrentVCStackManager.h" -///Model -#import "UserInfoModel.h" -#import "UserPhoto.h" -@interface SessionUserInfoCell : UICollectionViewCell -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; - -@end - -@implementation SessionUserInfoCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.avatarImageView]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; -} - -#pragma mark - Getters And Setters -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 8; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _avatarImageView; -} - -@end - -@interface SessionUserInfoTableViewCell () -///背景 -@property (nonatomic,strong) UIView *backView; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///用户信息 -@property (nonatomic,strong) UIView *userView; -///头像 -@property (nonatomic,strong) NetImageView * avatarImageView; -///VIP等级icon -@property (nonatomic,strong) NetImageView *nobleImageView; -///普通的 -@property (nonatomic,strong) YYAnimatedImageView *headWearImageView; -@property (nonatomic,strong) SVGAImageView *headWearSVGAImageView; -///头饰播放 -@property (nonatomic, strong) SpriteSheetImageManager *manager; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -/// -@property (nonatomic,strong) UIStackView *tagStackView; -///性别 -@property (nonatomic,strong) UIButton *sexButton; - -///签名 -@property (nonatomic,strong) UILabel *signLabel; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -@end - - -@implementation SessionUserInfoTableViewCell - - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.backView]; - [self.contentView addSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.userView]; -// [self.stackView addArrangedSubview:self.collectionView]; - - [self.userView addSubview:self.avatarImageView]; - [self.userView addSubview:self.headWearImageView]; - [self.userView addSubview:self.headWearSVGAImageView]; - - [self.userView addSubview:self.tagStackView]; - [self.userView addSubview:self.signLabel]; - - [self.tagStackView addArrangedSubview:self.nickLabel]; - [self.tagStackView addArrangedSubview:self.sexButton]; - [self.tagStackView addArrangedSubview:self.nobleImageView]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.contentView).offset(10); - }]; - - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.bottom.mas_equalTo(self.stackView.mas_bottom).offset(16); - make.top.mas_equalTo(self.contentView).offset(10); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(56, 56)); - make.leading.mas_equalTo(self.userView).offset(22); - make.top.mas_equalTo(self.backView).offset(22); - }]; - - [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(self.avatarImageView.mas_width).multipliedBy(1.31); - make.height.mas_equalTo(self.headWearImageView.mas_width); - }]; - - [self.headWearSVGAImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(self.avatarImageView.mas_width).multipliedBy(1.31); - make.height.mas_equalTo(self.headWearImageView.mas_width); - }]; - - [self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.headWearImageView.mas_trailing).offset(0); - make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(100)); - make.bottom.mas_equalTo(self.headWearImageView.mas_centerY).offset(-3); - }]; - - [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(20); - }]; - - [self.sexButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(32, 14)); - }]; - [self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.tagStackView); - make.trailing.mas_lessThanOrEqualTo(self.userView).offset(-5); - make.top.mas_equalTo(self.headWearImageView.mas_centerY).offset(3); - }]; - - [self.userView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(76); - }]; - -// [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.height.mas_equalTo(72); -// }]; -} - --(NSInteger) getMonth:(long )time -{ - NSDate *date = [NSDate dateWithTimeIntervalSince1970:time/1000]; - NSCalendar* calendar = [NSCalendar currentCalendar]; - NSDateComponents* components = [calendar components:NSCalendarUnitMonth fromDate:date]; - NSInteger month = components.month; - return month; -} - -- (NSInteger) getDay:(long) time -{ - NSDate *date = [NSDate dateWithTimeIntervalSince1970:time/1000]; - NSCalendar* calendar = [NSCalendar currentCalendar]; - NSDateComponents* components = [calendar components:NSCalendarUnitDay fromDate:date]; - NSInteger day = components.day; - return day; -} - - - -#pragma mark - UICollectionViewDelegate And UICollectionViewDataSource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.userInfo.privatePhoto.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - SessionUserInfoCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([SessionUserInfoCell class]) forIndexPath:indexPath]; - UserPhoto * photo = [self.userInfo.privatePhoto xpSafeObjectAtIndex:indexPath.row]; - cell.avatarImageView.imageUrl = photo.photoUrl; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (self.userInfo.privatePhoto.count > 0) { - SessionUserInfoCell * cell = (SessionUserInfoCell *)[collectionView cellForItemAtIndexPath:indexPath]; - SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init]; - browser.sourceImagesContainerView = cell; - browser.delegate = self; - browser.imageCount = self.userInfo.privatePhoto.count; - browser.currentImageIndex = indexPath.row; - browser.isMe = NO; - [browser show]; - } -} - -#pragma mark - SDPhotoBrowserDelegate -- (NSURL *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageURLForIndex:(NSInteger)index { - UserPhoto * photo = [self.userInfo.privatePhoto xpSafeObjectAtIndex:index]; - return [NSURL URLWithString:photo.photoUrl]; -} - -- (UIImage *)photoBrowser:(SDPhotoBrowser *)browser placeholderImageForIndex:(NSInteger)index { - return [UIImageConstant defaultBannerPlaceholder]; -} - -#pragma mark - Event Response -- (void)avatarImageViewRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(sessionUserInfoTableViewCell:showUserInfoVC:)]) { - [self.delegate sessionUserInfoTableViewCell:self showUserInfoVC:self.userInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.avatarImageView.imageUrl = _userInfo.avatar; - NSString * nick = _userInfo.nick; - if (nick.length > 8) { - nick = [nick substringToIndex:8]; - nick = [NSString stringWithFormat:@"%@...", nick]; - } - self.nickLabel.text = nick; - self.signLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : YMLocalizedString(@"XPTreasureFairyFriendCell0"); - - self.nobleImageView.hidden = _userInfo.userVipInfoVO.nameplateUrl.length > 0 ? NO : YES; - @kWeakify(self); - [self.nobleImageView loadImageWithUrl:_userInfo.userVipInfoVO.nameplateUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - if (image) { - self.nobleImageView.image = image; - CGFloat scale = image.size.width / image.size.height; - [self.nobleImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20* scale, 20)); - }]; - } else { - [self.nobleImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(0, 20)); - }]; - } - }]; - - NSString * headurl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - if (headurl.length == 0) { - self.headWearImageView.hidden = YES; - self.headWearSVGAImageView.hidden = YES; - } else { - if ([userInfo isHeadWearSVGA]) { - self.headWearSVGAImageView.hidden = NO; - [self.headWearSVGAImageView setImageName:headurl]; - } else { - self.headWearImageView.hidden = NO; - NSURL *url = [NSURL URLWithString:headurl]; - @kWeakify(self); - [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { - @kStrongify(self); - self.headWearImageView.image = sprit; - } failureBlock:^(NSError * _Nullable error) { - }]; - } - } - self.collectionView.hidden = _userInfo.privatePhoto.count <= 0; - if (_userInfo.gender == GenderType_Male) { - [self.sexButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor colorWithHexString:@"#45BBFF"], [DJDKMIMOMColor colorWithHexString:@"#8AD4FF"]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [self.sexButton setImage:[UIImage imageNamed:@"session_user_sex_male"] forState:UIControlStateNormal]; - } else { - [self.sexButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor colorWithHexString:@"#FF497D"], [DJDKMIMOMColor colorWithHexString:@"#FF90AE"]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [self.sexButton setImage:[UIImage imageNamed:@"session_user_sex_female"] forState:UIControlStateNormal]; - } - [self.sexButton setTitle:[NSString stringWithFormat:@"%ld", [PLTimeUtil ageWithDateFromBirth:_userInfo.birth]] forState:UIControlStateNormal]; -// NSString *image = [NSString getCalculateConstellationImageWithMonth:_userInfo.birth]; -// if(image.length > 0){ -// self.constellationButton.image = kImage(image); -// } - [self.collectionView reloadData]; - } -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [UIColor whiteColor]; - _backView.layer.masksToBounds = YES; - _backView.layer.cornerRadius = 8; - } - return _backView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 12; - } - return _stackView; -} - -- (UIView *)userView { - if (!_userView) { - _userView = [[UIView alloc] init]; - _userView.backgroundColor = [UIColor clearColor]; - } - return _userView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.userInteractionEnabled = YES; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 56 / 2; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(avatarImageViewRecognizer)]; - [_avatarImageView addGestureRecognizer:tap]; - } - return _avatarImageView; -} - - -- (UIStackView *)tagStackView { - if (!_tagStackView) { - _tagStackView = [[UIStackView alloc] init]; - _tagStackView.axis = UILayoutConstraintAxisHorizontal; - _tagStackView.distribution = UIStackViewDistributionFill; - _tagStackView.alignment = UIStackViewAlignmentCenter; - _tagStackView.spacing = 3; - } - return _tagStackView; -} - -- (YYAnimatedImageView *)headWearImageView { - if (!_headWearImageView) { - _headWearImageView = [[YYAnimatedImageView alloc] init]; - _headWearImageView.backgroundColor = [UIColor clearColor]; - _headWearImageView.contentMode = UIViewContentModeScaleAspectFit; - _headWearImageView.userInteractionEnabled = NO; - } - return _headWearImageView; -} - -- (SVGAImageView *)headWearSVGAImageView { - if (!_headWearSVGAImageView) { - _headWearSVGAImageView = [[SVGAImageView alloc]init]; - _headWearSVGAImageView.backgroundColor = [UIColor clearColor]; - _headWearSVGAImageView.frame = CGRectZero; - _headWearSVGAImageView.userInteractionEnabled = NO; - _headWearSVGAImageView.autoPlay = YES; - } - return _headWearSVGAImageView; -} - -- (SpriteSheetImageManager *)manager { - if (!_manager) { - _manager = [[SpriteSheetImageManager alloc] init]; - } - return _manager; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightBold]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (NetImageView *)nobleImageView { - if (!_nobleImageView) { - _nobleImageView = [[NetImageView alloc] init]; - } - return _nobleImageView; -} - -- (UILabel *)signLabel { - if (!_signLabel) { - _signLabel = [[UILabel alloc] init]; - _signLabel.font = [UIFont systemFontOfSize:12]; - _signLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _signLabel; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.sectionInset = UIEdgeInsetsMake(00, 15, 0, 0); - layout.itemSize = CGSizeMake(72, 72); - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.minimumLineSpacing = 8; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[SessionUserInfoCell class] forCellWithReuseIdentifier:NSStringFromClass([SessionUserInfoCell class])]; - } - return _collectionView; -} - -- (UIButton *)sexButton { - if (!_sexButton) { - _sexButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sexButton setTitle:@"0" forState:UIControlStateNormal]; - [_sexButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _sexButton.titleLabel.font = [UIFont systemFontOfSize:10]; - [_sexButton setTitleEdgeInsets:UIEdgeInsetsMake(0, 3, 0, 0)]; - _sexButton.layer.masksToBounds = YES; - _sexButton.layer.cornerRadius = 7; - } - return _sexButton; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.h deleted file mode 100644 index 9f8bf8e..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageConentAudioView.h -// YUMI -// -// Created by YUMI on 2022/4/22. -// - -#import -#import "MessageContentProtocol.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MessageConentAudioView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.m deleted file mode 100644 index f6f1853..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.m +++ /dev/null @@ -1,151 +0,0 @@ -// -// MessageConentAudioView.m -// YUMI -// -// Created by YUMI on 2022/4/22. -// - -#import "MessageConentAudioView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "MessageAudioCenter.h" -#import "MessageAudioModel.h" -@interface MessageConentAudioView () -///背景 -@property (nonatomic,strong) UIView * backView; -///显示语音的时长 -@property (nonatomic,strong) UILabel *timeLabel; -///显示语音的动画 -@property (nonatomic,strong) UIImageView *audioImageView; -///当前的消息 -@property (nonatomic,strong) NIMMessage *message; -///是否正在播放 -@property (nonatomic,assign) BOOL isPlaying; -@end - -@implementation MessageConentAudioView - -- (void)dealloc { - [[NIMSDK sharedSDK].mediaManager removeDelegate:self]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [[NIMSDK sharedSDK].mediaManager setNeedProximityMonitor:NO]; - [[NIMSDK sharedSDK].mediaManager addDelegate:self]; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backView]; - [self.backView addSubview:self.timeLabel]; - [self.backView addSubview:self.audioImageView]; -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self).insets(UIEdgeInsetsMake(MESSAGE_PADDING, MESSAGE_PADDING, MESSAGE_PADDING, MESSAGE_PADDING)); - make.height.mas_equalTo(30); - make.width.mas_equalTo(50); - }]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).offset(10); - make.centerY.mas_equalTo(self.backView); - }]; - - [self.audioImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20, 20)); - make.trailing.mas_equalTo(self.backView).offset(-10); - make.centerY.mas_equalTo(self.backView); - }]; -} - -#pragma mark - NIMMediaManagerDelegate -- (void)playAudio:(NSString *)filePath didBeganWithError:(NSError *)error { - if(filePath && !error) { - if ([MessageAudioCenter shareInstance].currentPlayingMessage == self.message) { - [self.audioImageView startAnimating]; - } - } -} - -- (void)playAudio:(NSString *)filePath didCompletedWithError:(NSError *)error { - [self.audioImageView stopAnimating]; - UIImage * thirdImage = [UIImage imageNamed:@"message_content_audio_playing_third"]; - self.audioImageView.image = thirdImage; -} -#pragma mark - Event Response -- (void)didTapBackRecognizer { - if ([self.message attachmentDownloadState] == NIMMessageAttachmentDownloadStateDownloaded) { - if ([[NIMSDK sharedSDK].mediaManager isPlaying]) { - [[NIMSDK sharedSDK].mediaManager stopPlay]; - } - - if (self.isPlaying) { - [[NIMSDK sharedSDK].mediaManager stopPlay]; - self.isPlaying = NO; - } else { - self.isPlaying = YES; - [[NIMSDK sharedSDK].mediaManager switchAudioOutputDevice:NIMAudioOutputDeviceSpeaker]; - [[MessageAudioCenter shareInstance] play:self.message]; - } - } -} - -#pragma mark - Getters And Setters -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapBackRecognizer)]; - [_backView addGestureRecognizer:tap]; - } - return _backView; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _timeLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _timeLabel; -} - -- (UIImageView *)audioImageView { - if (!_audioImageView) { - _audioImageView = [[UIImageView alloc] init]; - _audioImageView.userInteractionEnabled = YES; - UIImage * firstImage = [UIImage imageNamed:@"message_content_audio_playing_first"]; - UIImage * secondImage = [UIImage imageNamed:@"message_content_audio_playing_second"]; - UIImage * thirdImage = [UIImage imageNamed:@"message_content_audio_playing_third"]; - _audioImageView.animationImages = @[firstImage, secondImage, thirdImage]; - _audioImageView.animationDuration = 1; - _audioImageView.animationRepeatCount = HUGE; - _audioImageView.image = thirdImage; - } - return _audioImageView; -} - - -- (void)render:(MessageBaseModel *)model { - self.message = model.message; - NIMAudioObject *audioContent = (NIMAudioObject*)[model.message messageObject]; - NSAssert([audioContent isKindOfClass:[NIMAudioObject class]], @"message should be audio"); - [self.backView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(model.contentSize.width);; - }]; - self.timeLabel.text = [NSString stringWithFormat:@"%zd\"",(audioContent.duration+500)/1000];//四舍五入 -} - - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.h deleted file mode 100644 index a8f9800..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentApplicationShareView.h -// YUMI -// -// Created by YUMI on 2022/4/19. -// - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentApplicationShareView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.m deleted file mode 100644 index 169fa00..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.m +++ /dev/null @@ -1,142 +0,0 @@ -// -// MessageContentApplicationShareView.m -// YUMI -// -// Created by YUMI on 2022/4/19. -// - -#import "MessageContentApplicationShareView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "RoomHostDelegate.h" -#import "XCCurrentVCStackManager.h" -///Model -#import "ContentApplicationShareModel.h" -#import "MessageApplicationShareModel.h" -///View -#import "XPRoomViewController.h" - -@interface MessageContentApplicationShareView () -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///分割线 -@property (nonatomic,strong) UIView * lineView; -///进入房间 -@property (nonatomic,strong) UIButton *enterButton; -///分享信息 -@property (nonatomic,strong) ContentApplicationShareModel *shareInfo; -@end - -@implementation MessageContentApplicationShareView - - -- (void)render:(MessageBaseModel *)message { - MessageApplicationShareModel * model = (MessageApplicationShareModel *)message; - ContentApplicationShareModel *info = model.shareInfo; - if (info) { - self.shareInfo = info; - self.titleLabel.text = info.title; - self.avatarImageView.imageUrl = info.avatar; - if (self.shareInfo.actionName.length > 0) { - [self.enterButton setTitle:self.shareInfo.actionName forState:UIControlStateNormal]; - } - } -} - - -- (void)initSubViews { - [super initSubViews]; - [self addSubview:self.backView]; - [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.avatarImageView]; - [self.backView addSubview:self.lineView]; - [self.backView addSubview:self.enterButton]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KScreenWidth - AVATAR_MARGIN_H * 2 * 2 - AVATAR_SIZE - AVATAR_MARGIN_H, 90)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).offset(10); - make.trailing.mas_equalTo(self.avatarImageView.mas_leading).offset(-10); - make.top.mas_equalTo(self.backView); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(50, 50)); - make.top.mas_equalTo(self.backView); - make.trailing.mas_equalTo(self.backView); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView).inset(12); - make.height.mas_equalTo(1); - make.bottom.mas_equalTo(self.enterButton.mas_top); - }]; - - [self.enterButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.backView); - make.height.mas_equalTo(40); - }]; -} -#pragma mark - Event Response -- (void)enterButtonAction:(UIButton *)sender { - if (self.shareInfo.routerValue.length > 0) { - UIViewController * controllerView = [XCCurrentVCStackManager shareManager].getCurrentVC; - [controllerView.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - [controllerView.navigationController popToRootViewControllerAnimated:NO]; - XPRoomViewController * rooomVC = obj; - [rooomVC exitRoom]; - *stop = YES; - } - }]; - [XPRoomViewController openRoom:self.shareInfo.routerValue viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - } -} - -#pragma mark - Getters And Setters -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _avatarImageView; -} - - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:14]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.numberOfLines = 2; - } - return _titleLabel; -} - -- (UIButton *)enterButton { - if (!_enterButton) { - _enterButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_enterButton setTitle:YMLocalizedString(@"MessageContentApplicationShareView0") forState:UIControlStateNormal]; - [_enterButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _enterButton.titleLabel.font = [UIFont systemFontOfSize:16]; - [_enterButton addTarget:self action:@selector(enterButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _enterButton; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentCustomView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentCustomView.h deleted file mode 100644 index 988c519..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentCustomView.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// MessageContentCustomView.h -// YUMI -// -// Created by YUMI on 2022/4/15. -// - -#import -#import -#import "AttachmentModel.h" -#import "MessageContentProtocol.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol MessageContentCustomViewDelegate - -- (void)updateMessageSuccess:(NIMMessage *)message; - -@optional -- (void)didTapAccept:(NIMMessage *)message; -- (void)didTapReject:(NIMMessage *)message; -@end - -@interface MessageContentCustomView : UIView -- (void)initSubViews; - -- (void)initSubViewConstraints; -@property (nonatomic,strong, readonly) UIView * backView; -///代理 -@property (nonatomic,weak) id customMessageDelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentCustomView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentCustomView.m deleted file mode 100644 index c8f3fb5..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentCustomView.m +++ /dev/null @@ -1,56 +0,0 @@ -// -// MessageContentCustomView.m -// YUMI -// -// Created by YUMI on 2022/4/15. -// - -#import "MessageContentCustomView.h" -///Third -#import - -@interface MessageContentCustomView () -///背景 -@property (nonatomic,strong) UIView * backView; -@end - -@implementation MessageContentCustomView - -- (instancetype)init { - if (self = [super init]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Public Method -- (void)initSubViews { - [self addSubview:self.backView]; -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self).insets(UIEdgeInsetsMake(MESSAGE_PADDING, MESSAGE_PADDING, MESSAGE_PADDING, MESSAGE_PADDING)); - }]; -} - - -#pragma mark - MessageContentProtocol -- (void)render:(MessageBaseModel *)model { - -} - -+ (CGFloat)measureHeight:(NIMMessage *)message { - return 0; -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [UIColor clearColor]; - } - return _backView; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentFindNewGreetView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentFindNewGreetView.h deleted file mode 100644 index 2f76394..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentFindNewGreetView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentFindNewGreetView.h -// YUMI -// -// Created by YUMI on 2022/6/17. -// - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentFindNewGreetView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentFindNewGreetView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentFindNewGreetView.m deleted file mode 100644 index b4850e6..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentFindNewGreetView.m +++ /dev/null @@ -1,60 +0,0 @@ -// -// MessageContentFindNewGreetView.m -// YUMI -// -// Created by YUMI on 2022/6/17. -// - -#import "MessageContentFindNewGreetView.h" -///Third -#import -///Tool -#import "NSObject+MJExtension.h" -#import "DJDKMIMOMColor.h" -///Model -#import "FindNewGreetMessageModel.h" -#import "MessageFindNewGreetModel.h" - -@interface MessageContentFindNewGreetView () - -///显示内容 -@property (nonatomic,strong) UILabel *titleLabel; - -@end - -@implementation MessageContentFindNewGreetView - - -- (void)initSubViews { - [super initSubViews]; - [self.backView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.backView); - }]; -} - - -- (void)render:(nonnull MessageBaseModel *)model { - MessageFindNewGreetModel *obj = (MessageFindNewGreetModel *)model; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(obj.contentSize); - }]; - self.titleLabel.attributedText = obj.attributedText; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc]initWithFrame:CGRectZero]; - _titleLabel.preferredMaxLayoutWidth = CONTENT_WIDTH_MAX - MESSAGE_PADDING * 2; - _titleLabel.textColor = DJDKMIMOMColor.mainTextColor; - _titleLabel.font = [UIFont systemFontOfSize:13]; - _titleLabel.numberOfLines = 0; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.h deleted file mode 100644 index 6603d5e..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentGiftView.h -// YUMI -// -// Created by YUMI on 2022/4/15. -// - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentGiftView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.m deleted file mode 100644 index edbb60d..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.m +++ /dev/null @@ -1,98 +0,0 @@ -// -// MessageContentGiftView.m -// YUMI -// -// Created by YUMI on 2022/4/15. -// - -#import "MessageContentGiftView.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -///Model -#import "GiftReceiveInfoModel.h" -#import "MessageGiftModel.h" -@interface MessageContentGiftView () -///礼物的 -@property (nonatomic,strong) NetImageView *giftImageView; -///显示名字 -@property (nonatomic,strong) UILabel *giftNameLabel; -///描述 -@property (nonatomic,strong) UILabel *giftNumLabel; -@end - -@implementation MessageContentGiftView - -- (void)initSubViews { - [super initSubViews]; - [self addSubview:self.backView]; - - [self.backView addSubview:self.giftImageView]; - [self.backView addSubview:self.giftNameLabel]; - [self.backView addSubview:self.giftNumLabel]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(80); - make.width.mas_equalTo(185); - }]; - - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(60, 60)); - make.leading.mas_equalTo(self.backView); - make.centerY.mas_equalTo(self.backView); - }]; - - [self.giftNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.giftImageView.mas_trailing).offset(10); - make.bottom.mas_equalTo(self.giftImageView.mas_centerY).offset(-3); - }]; - - [self.giftNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.giftNameLabel); - make.top.mas_equalTo(self.giftImageView.mas_centerY).offset(3); - }]; -} - -- (void)render:(MessageBaseModel *)model { - MessageGiftModel *obj = (MessageGiftModel *)model; - self.giftImageView.imageUrl = obj.giftInfo.giftUrl; - self.giftNameLabel.text = obj.giftInfo.giftName; - self.giftNumLabel.text = [NSString stringWithFormat:@"X%ld", obj.giftNum]; -} - -- (NetImageView *)giftImageView { - if (!_giftImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _giftImageView = [[NetImageView alloc] initWithConfig:config]; - _giftImageView.contentMode = UIViewContentModeScaleAspectFill; - _giftImageView.layer.masksToBounds = YES; - } - return _giftImageView; -} - -- (UILabel *)giftNameLabel { - if (!_giftNameLabel) { - _giftNameLabel = [[UILabel alloc] init]; - _giftNameLabel.font = [UIFont systemFontOfSize:15]; - _giftNameLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _giftNameLabel; -} - -- (UILabel *)giftNumLabel { - if (!_giftNumLabel) { - _giftNumLabel = [[UILabel alloc] init]; - _giftNumLabel.font = [UIFont systemFontOfSize:12]; - _giftNumLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _giftNumLabel; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.h deleted file mode 100644 index 5b3e5c5..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// MessageContentGuildView.h -// YUMI -// -// Created by YUMI on 2022/4/18. -// - -#import "MessageContentCustomView.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentGuildView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m deleted file mode 100644 index 2054900..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m +++ /dev/null @@ -1,381 +0,0 @@ -// -// MessageContentGuildView.m -// YUMI -// -// Created by YUMI on 2022/4/18. -// - -#import "MessageContentGuildView.h" -///Third -#import - -#import "HttpRequestHelper.h" -#import "AttachMentModel.h" -#import "GuildMessageModel.h" -#import "NSObject+MJExtension.h" -#import "DJDKMIMOMColor.h" -#import "XNDJTDDLoadingTool.h" -#import "AccountInfoStorage.h" -#import "XPMineGuildViewController.h" -#import "XCCurrentVCStackManager.h" -#import "NSMutableDictionary+Saft.h" -#import "MessageGuildModel.h" -#define MESSAGE_MAX_WIDTH 230 -#define MESSAGE_TEXT_PADDING 10 -@interface MessageContentGuildView () -///总的stackView -@property (nonatomic,strong) UIStackView *stackView; -///内容的view -@property (nonatomic,strong) UIView * contentView; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///显示内容 -@property (nonatomic,strong) YYLabel *contentLabel; -///显示操作按钮 -@property (nonatomic,strong) UIStackView *controlStackView; -///拒绝 -@property (nonatomic,strong) UIButton *rejectButton; -///状态 -@property (nonatomic,strong) UIButton *resultButton; -///同意 -@property (nonatomic,strong) UIButton *agreeButton; -///消息的信息 -@property (nonatomic,strong) GuildMessageModel *messageInfo; -@property (nonatomic,strong) AttachmentModel *attachment; -@property (nonatomic,strong) NIMMessage *message; -@end - -@implementation MessageContentGuildView - -- (void)initSubViews { - [super initSubViews]; - [self addSubview:self.backView]; - - [self.backView addSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.contentView]; - [self.stackView addArrangedSubview:self.controlStackView]; - - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.contentLabel]; - ///操作按钮 - [self.controlStackView addArrangedSubview:self.rejectButton]; - [self.controlStackView addArrangedSubview:self.resultButton]; - [self.controlStackView addArrangedSubview:self.agreeButton]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(MESSAGE_MAX_WIDTH); - make.bottom.mas_equalTo(self.stackView).offset(MESSAGE_TEXT_PADDING); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.backView); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(MESSAGE_MAX_WIDTH); - make.height.mas_equalTo(100); - }]; - - [self.controlStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(44); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(20); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.mas_equalTo(self.contentView).inset(MESSAGE_TEXT_PADDING); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(MESSAGE_TEXT_PADDING); - make.bottom.mas_equalTo(self.contentView); - }]; - - CGFloat itemWidth = (MESSAGE_MAX_WIDTH - 15 * 2 - 10) / 2.0; - [self.agreeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(itemWidth); - make.height.mas_equalTo(30); - }]; - - [self.rejectButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(self.agreeButton); - }]; - - [self.resultButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - }]; -} - -- (void)render:(MessageGuildModel *)model { - self.message = model.message; - NIMCustomObject *obj = (NIMCustomObject *)model.message.messageObject; - AttachmentModel * attach = (AttachmentModel *)obj.attachment; - self.attachment = attach; - GuildMessageModel * info; - if (model.message.localExt) { - info = [GuildMessageModel modelWithDictionary:model.message.localExt]; - } else { - info = [GuildMessageModel modelWithDictionary:attach.data]; - } - self.messageInfo = info; - self.titleLabel.text = info.layout.title.content; - self.titleLabel.font = [UIFont systemFontOfSize:info.layout.title.fontSize weight:info.layout.title.fontBold?UIFontWeightBold:UIFontWeightRegular]; - NSMutableAttributedString *attr = [[NSMutableAttributedString alloc]init]; - GuildMessageLayoutModel *layout = info.layout; - for (GuildMessageLayoutInfoModel *params in layout.contents) { - if (params.content.length > 0) { - if ([params.content containsString:@"/r/n"]) { - params.content = @"\r\n"; - } - NSMutableAttributedString *subAttr = [[NSMutableAttributedString alloc]initWithString:params.content]; - if (params.fontSize > 0) { - [subAttr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:params.fontSize weight:params.fontBold?UIFontWeightBold:UIFontWeightRegular] range:NSMakeRange(0, subAttr.length)]; - } - - if (params.fontColor.length > 0) { - [subAttr addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:params.fontColor] range:NSMakeRange(0, subAttr.length)]; - } - [attr appendAttributedString:subAttr]; - } - } - attr.yy_lineSpacing = 5; - self.contentLabel.attributedText = attr; - self.contentLabel.textAlignment = NSTextAlignmentCenter; - CGSize maxSize = CGSizeMake(MESSAGE_MAX_WIDTH - MESSAGE_TEXT_PADDING * 2, CGFLOAT_MAX); - YYTextLayout * contentLayout = [YYTextLayout layoutWithContainerSize:maxSize text:attr]; - CGFloat contentHeight = contentLayout.textBoundingSize.height + 5; - ///顶部的距离 20 title的高度15 title到content的高度15 - [self.contentView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(contentHeight + 20+ 15 + 15); - }]; - BOOL isCommonNotice ; - if(attach.first == CustomMessageType_Hall){ - isCommonNotice = (attach.second == Custom_Message_Sub_Hall_Notice || attach.second == Custom_Message_Sub_Hall_Become_Hall); - }else{ - isCommonNotice = !(attach.second == Custom_Message_Sub_New_Hall_Invite || attach.second == Custom_Message_Sub_New_Hall_Apply); - } - if (!isCommonNotice) { - self.controlStackView.hidden = NO; - if (info.msgStatus == 0) { - info.msgStatus = MessageGuildState_Untreated; - } - [self handletResultControll:info second:attach.second]; - } else { - self.controlStackView.hidden = YES; - [self.rejectButton setAttributedTitle:nil forState:UIControlStateNormal]; - } -} - -- (void)handletResultControll:(GuildMessageModel *)info second:(Custom_Noti_Sub_HALL)second { - self.rejectButton.hidden = YES; - self.agreeButton.hidden = YES; - self.resultButton.hidden= YES; - MessageGuildState state = info.msgStatus; - NSMutableAttributedString *attr = [[NSMutableAttributedString alloc]init]; - switch (state) { - case MessageGuildState_Agree: - { - self.resultButton.hidden = NO; - [attr appendAttributedString:[self creatResultAttribute:YMLocalizedString(@"MessageContentGuildView0") textColor:UIColorRGBAlpha(0x09BB07, 0.6)]]; - } - break; - case MessageGuildState_Reject: - { - self.resultButton.hidden= NO; - [attr appendAttributedString:[self creatResultAttribute:YMLocalizedString(@"MessageContentGuildView1") textColor:UIColorRGBAlpha(0xFF3852, 0.6)]]; - } - break; - case MessageGuildState_OutData: - { - self.resultButton.hidden= NO; - [attr appendAttributedString:[self creatResultAttribute:YMLocalizedString(@"MessageContentGuildView2") textColor:UIColorRGBAlpha(0x333333, 0.6)]]; - } - break; - case MessageGuildState_Processed: - { - self.resultButton.hidden= NO; - [attr appendAttributedString:[self creatResultAttribute:YMLocalizedString(@"MessageContentGuildView3") textColor:UIColorFromRGB(0xC6C6E9)]]; - } - break; - case MessageGuildState_Untreated: - { - self.agreeButton.hidden = NO; - self.rejectButton.hidden = second == Custom_Message_Sub_Hall_Apply_Exit; - } - break; - default: - break; - } - if (attr.length > 0) { - [self.resultButton setAttributedTitle:attr forState:UIControlStateNormal]; - } -} - -- (NSAttributedString *)creatResultAttribute:(NSString *)message textColor:(UIColor *)textColor { - if (message.length <=0) { - message = @""; - } - NSMutableAttributedString *attr = [[NSMutableAttributedString alloc]initWithString:message]; - [attr addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14],NSForegroundColorAttributeName:textColor} range:NSMakeRange(0, attr.length)]; - return attr; -} - - -#pragma mark - Event Response -- (void)controllButtonAction:(UIButton *)sender { - NSRange recordRange = [self.messageInfo.url rangeOfString:@"recordId="]; - NSString *recordId; - if (!NSEqualRanges(recordRange, NSMakeRange(NSNotFound, 0))) { - if (self.messageInfo.url.length > recordRange.location+recordRange.length) { - recordId = [self.messageInfo.url substringFromIndex:recordRange.location+recordRange.length]; - } - } - if (recordId.length > 0) { - NSMutableDictionary * params = [NSMutableDictionary dictionary]; - [params safeSetObject:recordId forKey:@"recordId"]; - [params safeSetObject:[AccountInfoStorage instance].getUid forKey:@"uid"]; - ///0拒绝 1同意 - NSString * type = sender.tag == 1000? @"0" : @"1"; - if (self.attachment.second == Custom_Message_Sub_Hall_Apply_Join || self.attachment.second == Custom_Message_Sub_Hall_Manager_Invite || self.attachment.second == Custom_Message_Sub_Hall_Apply_Exit || self.attachment.second == Custom_Message_Sub_New_Hall_Invite || self.attachment.second == Custom_Message_Sub_New_Hall_Apply) { - if (self.attachment.second != Custom_Message_Sub_Hall_Apply_Exit) { - [params setObject:type forKey:@"type"]; - } - [XNDJTDDLoadingTool showLoading]; - [HttpRequestHelper POST:self.messageInfo.url params:params success:^(BaseModel * _Nonnull data) { - [XNDJTDDLoadingTool hideHUD]; - if(data.code == 200){ - NSString *code = [NSString stringWithFormat:@"%@", data.data[@"code"]]; - BOOL isExpired = [code isEqualToString:@"90121"]; - BOOL isHandled = [code isEqualToString:@"90122"]; - MessageGuildState state = MessageGuildState_Untreated; - if (isExpired) { - state = MessageGuildState_OutData; - } else if(isHandled) { - state = MessageGuildState_Processed; - } else { - state = sender.tag == 1000 ? MessageGuildState_Reject : MessageGuildState_Agree; - } - self.messageInfo.msgStatus = state; - self.message.localExt = [self.messageInfo model2dictionary]; - [[NIMSDK sharedSDK].conversationManager updateMessage:self.message forSession:self.message.session completion:^(NSError * _Nullable error) { - if (self.customMessageDelegate && [self.customMessageDelegate respondsToSelector:@selector(updateMessageSuccess:)]) { - [self.customMessageDelegate updateMessageSuccess:self.message]; - } - }]; - return; - } - - [XNDJTDDLoadingTool showErrorWithMessage:data.message]; - } failure:^(NSInteger resCode, NSString * _Nonnull message) { - [XNDJTDDLoadingTool hideHUD]; - [XNDJTDDLoadingTool showErrorWithMessage:message]; - }]; - } - } -} - -- (void)contentLableTapRecognizer { - if (self.messageInfo.routerType == 22 && self.messageInfo.routerValue > 0) { - XPMineGuildViewController * guildVC= [[XPMineGuildViewController alloc] init]; - guildVC.ownerUid = [AccountInfoStorage instance].getUid; - guildVC.guildId = [NSString stringWithFormat:@"%ld", self.messageInfo.routerValue]; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:guildVC animated:YES]; - } -} -#pragma mark - Getters And Setters -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 10; - } - return _stackView; -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = [UIColor clearColor]; - } - return _contentView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment= NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:14]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - [_titleLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; - } - return _titleLabel; -} - -- (YYLabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[YYLabel alloc] init]; - _contentLabel.numberOfLines = 0; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(contentLableTapRecognizer)]; - [_contentLabel addGestureRecognizer:tap]; - } - return _contentLabel; -} - -- (UIStackView *)controlStackView { - if (!_controlStackView) { - _controlStackView = [[UIStackView alloc] init]; - _controlStackView.axis = UILayoutConstraintAxisHorizontal; - _controlStackView.distribution = UIStackViewDistributionFill; - _controlStackView.alignment = UIStackViewAlignmentCenter; - _controlStackView.spacing = 10; - } - return _controlStackView; -} - -- (UIButton *)rejectButton { - if (!_rejectButton) { - _rejectButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_rejectButton setTitle:YMLocalizedString(@"MessageContentGuildView4") forState:UIControlStateNormal]; - _rejectButton.titleLabel.font = [UIFont systemFontOfSize:13]; - [_rejectButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - _rejectButton.layer.masksToBounds = YES; - _rejectButton.layer.cornerRadius = 15; - _rejectButton.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - _rejectButton.layer.borderWidth = 1; - [_rejectButton setBackgroundColor:[DJDKMIMOMColor appCellBackgroundColor]]; - _rejectButton.tag = 1000; - [_rejectButton addTarget:self action:@selector(controllButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _rejectButton; -} - -- (UIButton *)resultButton { - if (!_resultButton) { - _resultButton = [UIButton buttonWithType:UIButtonTypeCustom]; - } - return _resultButton; -} - -- (UIButton *)agreeButton { - if (!_agreeButton) { - _agreeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_agreeButton setTitle:YMLocalizedString(@"MessageContentGuildView5") forState:UIControlStateNormal]; - _agreeButton.titleLabel.font = [UIFont systemFontOfSize:13]; - [_agreeButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _agreeButton.layer.masksToBounds = YES; - _agreeButton.layer.cornerRadius = 15; - [_agreeButton setBackgroundColor:[DJDKMIMOMColor appMainColor]]; - _agreeButton.tag = 1001; - [_agreeButton addTarget:self action:@selector(controllButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _agreeButton; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentImage.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentImage.h deleted file mode 100644 index d9d848a..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentImage.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MessageContentImage.h -// YUMI -// -// Created by zu on 2021/12/2. -// - -#import -#import "MessageContentProtocol.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentImage : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentImage.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentImage.m deleted file mode 100644 index a2a8bc1..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentImage.m +++ /dev/null @@ -1,90 +0,0 @@ -// -// MessageContentImage.m -// YUMI -// -// Created by zu on 2021/12/2. -// - -#import "MessageContentImage.h" -#import "NetImageView.h" -#import "SDPhotoBrowser.h" -#import -#import -#import "UIImage+Utils.h" -#import "MessageBaseModel.h" -#import "MessageImageModel.h" -#define MESSAGE_IMAGE_MAX_SIZE (CONTENT_WIDTH_MAX) -#define MESSAGE_IMAGE_Min_SIZE (CONTENT_WIDTH_MAX -100) -@interface MessageContentImage() - -@property (nonatomic, strong) NetImageView * messageImage; -@property (nonatomic,strong) MessageImageModel *imageObject; - -@end - -@implementation MessageContentImage - -- (instancetype)init { - self = [super init]; - if (self) { - [self addSubview:self.messageImage]; - [self.messageImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self).with.insets(UIEdgeInsetsMake(MESSAGE_PADDING, MESSAGE_PADDING, MESSAGE_PADDING, MESSAGE_PADDING)); - make.width.height.mas_equalTo(MESSAGE_IMAGE_MAX_SIZE); - }]; - } - return self; -} - -- (void)render:(MessageBaseModel *)model { - MessageImageModel * imageModel = (MessageImageModel *)model; - self.imageObject = imageModel; - [self.messageImage mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(model.contentSize.height); - make.width.mas_equalTo(model.contentSize.width); - }]; - if (imageModel.image) { - self.messageImage.image = imageModel.image; - }else { - self.messageImage.imageUrl = imageModel.imageUrl; - } -} - -#pragma mark - SDPhotoBrowserDelegate -- (NSURL *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageURLForIndex:(NSInteger)index { - return [NSURL URLWithString:self.imageObject.url]; -} - -- (UIImage *)photoBrowser:(SDPhotoBrowser *)browser placeholderImageForIndex:(NSInteger)index { - return [UIImageConstant defaultBannerPlaceholder]; -} -- (UIImage *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageForIndex:(NSInteger)index{ - if(self.imageObject.url == nil && self.imageObject.image != nil){ - return self.imageObject.image; - } - return nil; -} -- (void)didTapImage { - SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init]; - browser.sourceImagesContainerView = self; - browser.delegate = self; - browser.imageCount = 1; - browser.currentImageIndex = 0; - browser.isMe = NO; - [browser show]; -} - - -- (NetImageView *)messageImage { - if (!_messageImage) { - _messageImage = [[NetImageView alloc] init]; - _messageImage.userInteractionEnabled = YES; - _messageImage.layer.masksToBounds = YES; - _messageImage.contentMode = UIViewContentModeScaleAspectFill; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapImage)]; - [_messageImage addGestureRecognizer:tap]; - } - return _messageImage; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.h deleted file mode 100644 index 4254b60..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentLevelUpgradeView.h -// YUMI -// -// Created by YUMI on 2022/4/19. -// - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentLevelUpgradeView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.m deleted file mode 100644 index 0e004d4..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.m +++ /dev/null @@ -1,145 +0,0 @@ -// -// MessageContentLevelUpgradeView.m -// YUMI -// -// Created by YUMI on 2022/4/19. -// - -#import "MessageContentLevelUpgradeView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NSObject+MJExtension.h" -#import "YUMIHtmlUrl.h" -#import "XCCurrentVCStackManager.h" -///Model -#import "MessageLevelUpgradeModel.h" -///View -#import "XPWebViewController.h" - -@interface MessageContentLevelUpgradeView () - -///logo -@property (nonatomic,strong) UIImageView *logoImageView; -///等级升级 -@property (nonatomic,strong) UILabel *levelLabel; -///分割线 -@property (nonatomic,strong) UIView * lineView; -///查看 -@property (nonatomic,strong) UIButton *checkButton; -///箭头 -@property (nonatomic,strong) UIImageView *arrowImageView; - -@end - -@implementation MessageContentLevelUpgradeView - - -- (void)render:(MessageBaseModel *)model { - MessageLevelUpgradeModel *obj = (MessageLevelUpgradeModel *)model; - self.logoImageView.image = [UIImage imageNamed:obj.imageName]; - self.levelLabel.text = obj.level; -} - -- (void)initSubViews { - [super initSubViews]; - [self.backView addSubview:self.logoImageView]; - [self.backView addSubview:self.levelLabel]; - [self.backView addSubview:self.lineView]; - [self.backView addSubview:self.checkButton]; - [self.backView addSubview:self.arrowImageView]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.backView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self).insets(UIEdgeInsetsMake(MESSAGE_PADDING, MESSAGE_PADDING, 0, MESSAGE_PADDING)); - make.size.mas_equalTo(CGSizeMake(220, 116)); - }]; - - - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(64,64)); - make.leading.mas_equalTo(self.backView); - make.top.mas_equalTo(self.backView); - }]; - - [self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.logoImageView.mas_trailing).offset(10); - make.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.logoImageView).offset(10); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.height.mas_equalTo(0.5); - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(10); - }]; - - [self.checkButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.height.mas_equalTo(40); - make.top.mas_equalTo(self.lineView.mas_bottom); - }]; - - [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(6.5, 11)); - make.trailing.mas_equalTo(self.backView); - make.centerY.mas_equalTo(self.checkButton); - }]; -} -#pragma mark - Event Response -- (void)checkButtonAction:(UIButton *)sender { - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kUserLevelURL); - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; -} -#pragma mark - Getters And Setters -- (UIImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[UIImageView alloc] init]; - } - return _logoImageView; -} - -- (UILabel *)levelLabel { - if (!_levelLabel) { - _levelLabel = [[UILabel alloc] init]; - _levelLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _levelLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _levelLabel.numberOfLines = 2; - } - return _levelLabel; -} - -- (UIButton *)checkButton { - if (!_checkButton) { - _checkButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_checkButton setTitle:YMLocalizedString(@"MessageContentLevelUpgradeView0") forState:UIControlStateNormal]; - [_checkButton setTitleColor:UIColorFromRGB(0x4C5AF1) forState:UIControlStateNormal]; - _checkButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_checkButton addTarget:self action:@selector(checkButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _checkButton; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (UIImageView *)arrowImageView { - if (!_arrowImageView) { - _arrowImageView = [[UIImageView alloc] init]; - _arrowImageView.userInteractionEnabled = YES; - _arrowImageView.image = [[UIImage imageNamed:@"common_right_arrow"]ms_SetImageForRTL]; - } - return _arrowImageView; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.h deleted file mode 100644 index 414c8d9..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentMonentsAutoView.h -// YUMI -// -// Created by YUMI on 2022/8/26. -// - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentMonentsAutoView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.m deleted file mode 100644 index 3aa8f96..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// MessageContentMonentsAutoView.m -// YUMI -// -// Created by YUMI on 2022/8/26. -// - -#import "MessageContentMonentsAutoView.h" -///Third -#import -///Tool -#import "NSObject+MJExtension.h" -#import "DJDKMIMOMColor.h" -///Model -#import "MessageMonentsAutoModel.h" -@interface MessageContentMonentsAutoView () - -@property (nonatomic, strong) UILabel *titleLabel; // 标题 -@property (nonatomic, strong) UILabel *timeLabel; // 时间 -@property (nonatomic, strong) UILabel *messageLabel; // 内容 -@end - -@implementation MessageContentMonentsAutoView - -- (void)initSubViews { - [super initSubViews]; - [self addSubview:self.backView]; - - [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.timeLabel]; - [self.backView addSubview:self.messageLabel]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(250, 120)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(14.5); - make.top.mas_equalTo(10); - }]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-14.5); - make.centerY.mas_equalTo(self.titleLabel); - }]; - - [self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(14.5); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(12.5); - }]; -} - -- (void)render:(MessageBaseModel *)message { - MessageMonentsAutoModel *obj = (MessageMonentsAutoModel *)message; - self.titleLabel.text = obj.title; - self.timeLabel.text = obj.time; - self.messageLabel.attributedText = obj.attributedText; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = UIColorFromRGB(0x333333); - _titleLabel.font = [UIFont boldSystemFontOfSize:15]; - } - return _titleLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.textColor = UIColorFromRGB(0x999999); - _timeLabel.font = [UIFont systemFontOfSize:12]; - _timeLabel.textAlignment = NSTextAlignmentRight; - } - return _timeLabel; -} - -- (UILabel *)messageLabel { - if (!_messageLabel) { - _messageLabel = [[UILabel alloc] init]; - _messageLabel.textColor = UIColorFromRGB(0x333333); - _messageLabel.font = [UIFont systemFontOfSize:14]; - _messageLabel.numberOfLines = 0; - } - return _messageLabel; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.h deleted file mode 100644 index 4bce697..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentMonentsView.h -// YUMI -// -// Created by YUMI on 2022/8/25. -// - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentMonentsView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m deleted file mode 100644 index b18339d..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m +++ /dev/null @@ -1,118 +0,0 @@ -// -// MessageContentMonentsView.m -// YUMI -// -// Created by YUMI on 2022/8/25. -// - -#import "MessageContentMonentsView.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "XPGiftStorage.h" -#import "NSObject+MJExtension.h" -#import "XCCurrentVCStackManager.h" -#import "ClientConfig.h" -///Model -#import "GiftReceiveInfoModel.h" -#import "MessageMonentsModel.h" -///View -#import "XPMomentsDetailViewController.h" -#import "XPMomentsSimpleDetailViewController.h" -#import "MomentsInfoModel.h" -@interface MessageContentMonentsView () -///礼物的 -@property (nonatomic,strong) NetImageView *monentsView; -///显示名字 -@property (nonatomic,strong) UILabel *titleLabel; -///描述 -@property (nonatomic,strong) UILabel *contentLabel; -///动态 -@property (nonatomic,strong) MomentsInfoModel *monents; -@end - -@implementation MessageContentMonentsView - - -- (void)initSubViews { - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapBackView)]; - [self.backView addGestureRecognizer:tap]; - [super initSubViews]; - [self addSubview:self.backView]; - - [self.backView addSubview:self.monentsView]; - [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.contentLabel]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(250, 60)); - }]; - - [self.monentsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(50, 50)); - make.leading.mas_equalTo(self.backView); - make.centerY.mas_equalTo(self.backView); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.monentsView.mas_trailing).offset(10); - make.bottom.mas_equalTo(self.monentsView.mas_centerY).offset(-3); - make.trailing.mas_lessThanOrEqualTo(self.backView).offset(-10); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel); - make.top.mas_equalTo(self.monentsView.mas_centerY).offset(3); - make.trailing.mas_lessThanOrEqualTo(self.backView).offset(-10); - }]; -} - -- (void)tapBackView { - XPMomentsDetailViewController * detailView = [[XPMomentsDetailViewController alloc] init]; - detailView.momentsInfo = self.monents; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:detailView animated:YES]; -} - -- (void)render:(MessageBaseModel *)message { - MessageMonentsModel *obj = (MessageMonentsModel *)message; - self.monents = obj.monentsInfo; - self.monentsView.imageUrl = obj.imageUrl; - self.titleLabel.text = obj.title; - self.contentLabel.text = self.monents.content; -} - -- (NetImageView *)monentsView { - if (!_monentsView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _monentsView = [[NetImageView alloc] initWithConfig:config]; - _monentsView.contentMode = UIViewContentModeScaleAspectFill; - _monentsView.layer.masksToBounds = YES; - _monentsView.layer.cornerRadius = 10; - } - return _monentsView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[UILabel alloc] init]; - _contentLabel.font = [UIFont systemFontOfSize:12]; - _contentLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _contentLabel; -}@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.h deleted file mode 100644 index 796426b..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentOnlineView.h -// YUMI -// -// Created by YUMI on 2022/4/19. -// 关注的人 开启直播 - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentOpenLiveView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.m deleted file mode 100644 index 793d1b0..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.m +++ /dev/null @@ -1,152 +0,0 @@ -// -// MessageContentOnlineView.m -// YUMI -// -// Created by YUMI on 2022/4/19. -// - -#import "MessageContentOpenLiveView.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "XCCurrentVCStackManager.h" -#import "RoomHostDelegate.h" -///Model -#import "ContentOpenLiveInfoModel.h" -#import "MessageOpenLiveModel.h" -///View -#import "XPRoomViewController.h" - - -@interface MessageContentOpenLiveView () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///显示id -//@property (nonatomic,strong) UILabel *idLabel; -@property (nonatomic,strong) ContentOpenLiveInfoModel *userInfo; -@end - -@implementation MessageContentOpenLiveView - - -- (void)render:(MessageBaseModel *)model { - MessageOpenLiveModel *obj = (MessageOpenLiveModel *)model; - self.userInfo = obj.userInfo; - if (obj.avatar.length > 0 && obj.nick.length > 0) { - self.avatarImageView.imageUrl = obj.avatar; - self.titleLabel.text = obj.nick; - } else { - if (obj.uid.integerValue > 0) { - NSArray *uids = @[obj.uid]; - [[NIMSDK sharedSDK].userManager fetchUserInfos:uids completion:^(NSArray * _Nullable users, NSError * _Nullable error) { - if (error == nil) { - NIMUser *user = users[0]; - self.avatarImageView.imageUrl = user.userInfo.avatarUrl; - self.titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"MessageContentOpenLiveView0"), - user.userInfo.nickName]; - } - }]; - } - - } -} - -- (void)initSubViews { - [super initSubViews]; - [self addSubview:self.backView]; - - [self.backView addSubview:self.avatarImageView]; - [self.backView addSubview:self.titleLabel]; -// [self.backView addSubview:self.idLabel]; - UITapGestureRecognizer * tap= [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(backViewTapRecognozer)]; - [self.backView addGestureRecognizer:tap]; -} - - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self).insets(UIEdgeInsetsMake(MESSAGE_PADDING, MESSAGE_PADDING, MESSAGE_PADDING, MESSAGE_PADDING)); - make.size.mas_equalTo(CGSizeMake(200, 50)); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(47, 47)); - make.centerY.mas_equalTo(self.backView); - make.leading.mas_equalTo(self.backView).offset(10); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - make.top.mas_equalTo(self.avatarImageView).offset(-2); - make.trailing.mas_lessThanOrEqualTo(self.backView); - }]; - -// [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.leading.trailing.mas_equalTo(self.titleLabel); -// make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); -// }]; -} - -#pragma mark - Event Response -- (void)backViewTapRecognozer { - if (self.userInfo.uid.length > 0) { - UIViewController * controllerView = [XCCurrentVCStackManager shareManager].getCurrentVC; - [controllerView.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - [controllerView.navigationController popToRootViewControllerAnimated:NO]; - XPRoomViewController * rooomVC = obj; - [rooomVC exitRoom]; - *stop = YES; - } - }]; - if ([[XCCurrentVCStackManager shareManager].getCurrentVC isKindOfClass:[XPRoomViewController class]]) { - UIViewController * controller = [XCCurrentVCStackManager shareManager].getCurrentVC.navigationController.presentingViewController; - if (controller) { - [XPRoomViewController openRoom:self.userInfo.uid viewController:controller]; - } - } else { - [XPRoomViewController openRoom:self.userInfo.uid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - } - - } -} - -#pragma mark - Getters And Setters -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _avatarImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.numberOfLines = 0; - _titleLabel.font = [UIFont systemFontOfSize:17]; -// _titleLabel.text = YMLocalizedString(@"MessageContentOpenLiveView1"); - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -//- (UILabel *)idLabel { -// if (!_idLabel) { -// _idLabel = [[UILabel alloc] init]; -// _idLabel.font = [UIFont systemFontOfSize:13]; -// _idLabel.textColor = [DJDKMIMOMColor secondTextColor]; -// } -// return _idLabel; -//} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentProtocol.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentProtocol.h deleted file mode 100644 index e4a0087..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentProtocol.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// MessageContentProtocol.h -// YUMI -// -// Created by zu on 2021/12/2. -// - -#import -#import "YUMIMacroUitls.h" -@class NIMMessage, MessageBaseModel; - -NS_ASSUME_NONNULL_BEGIN - -#define AVATAR_SIZE 45 -#define AVATAR_MARGIN_H 15 -#define CONTENT_WIDTH_MAX (KScreenWidth - AVATAR_MARGIN_H * 2 * 2 - AVATAR_SIZE * 2) -#define CONTENT_PADDING_V_TOTAL (5 + 15 * 2) -#define MESSAGE_PADDING (10) - -@protocol MessageContentProtocol - -- (void)render:(MessageBaseModel *)message; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.h deleted file mode 100644 index a638d0b..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentRedPacketView.h -// YUMI -// -// Created by YUMI on 2022/9/5. -// - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentRedPacketView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.m deleted file mode 100644 index d84fc0d..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.m +++ /dev/null @@ -1,215 +0,0 @@ -// -// MessageContentRedPacketView.m -// YUMI -// -// Created by YUMI on 2022/9/5. -// - -#import "MessageContentRedPacketView.h" -///Third -#import -#import "DJDKMIMOMColor.h" -#import "XPReceiveRedPacketModel.h" -#import "MessageRedPacketModel.h" -#import "YUMIConstant.h" -#import "XCCurrentVCStackManager.h" -#import "XPRoomViewController.h" -#import "RoomHostDelegate.h" - -#define MESSAGE_MAX_WIDTH 260 - -@interface MessageContentRedPacketView () - -@property (nonatomic, strong) UIImageView *bgImageView; -///红包icon -@property (nonatomic, strong) UIImageView *redPacketImageView; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///发出一个全服红包 -@property (nonatomic,strong) UILabel *subLabel; -///分割线 -@property (nonatomic, strong) UIView *devideView; -///领取说明 -@property (nonatomic, strong) UILabel *descLabel; -///消息的信息 -@property (nonatomic,strong) XPReceiveRedPacketModel *messageInfo; -@property (nonatomic,strong) AttachmentModel *attachment; -@property (nonatomic,strong) NIMMessage *message; - -@end - -@implementation MessageContentRedPacketView - -- (void)initSubViews { - [super initSubViews]; - [self.backView addSubview:self.bgImageView]; - [self.backView addSubview:self.redPacketImageView]; - [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.subLabel]; - [self.backView addSubview:self.devideView]; - [self.backView addSubview:self.descLabel]; - - UITapGestureRecognizer * tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(event:)]; - [self.bgImageView addGestureRecognizer:tapGesture]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - self.backView.superview.backgroundColor = [UIColor clearColor]; - self.backView.backgroundColor = [UIColor clearColor]; - [self.backView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self).inset(0); - make.width.mas_equalTo(MESSAGE_MAX_WIDTH); - make.height.mas_equalTo(95); - }]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(MESSAGE_MAX_WIDTH); - make.top.mas_equalTo(self.backView); - make.height.mas_equalTo(95); - make.leading.mas_equalTo(self.backView); - }]; - [self.redPacketImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).mas_offset(16); - make.width.mas_equalTo(31); - make.height.mas_equalTo(40); - make.top.mas_equalTo(self.backView).mas_offset(13); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.redPacketImageView.mas_trailing).mas_offset(6); - make.height.mas_equalTo(16); - make.top.mas_equalTo(self.redPacketImageView).mas_offset(12); - }]; - - [self.subLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(8); - make.height.mas_equalTo(13); - }]; - [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-8); - make.top.mas_equalTo(self.redPacketImageView.mas_bottom).offset(11); - make.height.mas_equalTo(0.5); - }]; - [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.top.mas_equalTo(self.devideView.mas_bottom).offset(9); - make.height.mas_equalTo(13); - }]; -} - -- (void)render:(MessageBaseModel *)model { - self.message = model.message; - MessageRedPacketModel *obj = (MessageRedPacketModel *)model; - XPReceiveRedPacketModel * info = obj.redInfo; - self.messageInfo = info; - //超过半小时就是失效 - NSTimeInterval now = [[NSDate date] timeIntervalSince1970]; - NSInteger time = [self getTimeDifferenceWithTimestamp:now beginTime:info.endTime / 1000]; - if (time <= 0) { - self.titleLabel.text = YMLocalizedString(@"MessageContentRedPacketView0"); - self.descLabel.text = YMLocalizedString(@"MessageContentRedPacketView1"); - self.subLabel.hidden = YES; - self.bgImageView.image = [UIImage imageNamed:@"pi_red_packet_msg_inValid_bg"]; - self.bgImageView.userInteractionEnabled = NO; - } else { - NSArray *redPacketHistory = [[NSUserDefaults standardUserDefaults] objectForKey:kRedPacketHistory]; - if (info) { - if ([redPacketHistory containsObject:info.redEnvelopeId]) { - self.subLabel.hidden = YES; - self.titleLabel.text = YMLocalizedString(@"MessageContentRedPacketView2"); - self.bgImageView.image = [UIImage imageNamed:@"pi_red_packet_msg_inValid_bg"]; - self.descLabel.text = YMLocalizedString(@"MessageContentRedPacketView3"); - self.bgImageView.userInteractionEnabled = NO; - } else { - self.titleLabel.text = info.sendUserNick; - self.descLabel.text = YMLocalizedString(@"MessageContentRedPacketView4"); - self.subLabel.hidden = NO; - self.bgImageView.image = [UIImage imageNamed:@"pi_red_packet_msg_valid_bg"]; - self.bgImageView.userInteractionEnabled = YES; - [self.titleLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.redPacketImageView).mas_offset(5); - }]; - } - } - } -} --(NSInteger)getTimeDifferenceWithTimestamp:(long)timestamp beginTime:(long)beginTime { - NSString *time1 = [NSDate timestampSwitchTime:(NSInteger)timestamp formatter:@"YYYY-MM-dd hh:mm:ss"]; - NSString *time2 = [NSDate timestampSwitchTime:(NSInteger)beginTime formatter:@"YYYY-MM-dd hh:mm:ss"]; - NSInteger second = [NSDate pleaseInsertStarTimeo:time1 andInsertEndTime:time2]; - return second; -} -- (void)event:(UITapGestureRecognizer *)gesture { - UIViewController * controllerView = [XCCurrentVCStackManager shareManager].getCurrentVC; - [controllerView.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - [controllerView.navigationController popToRootViewControllerAnimated:NO]; - XPRoomViewController * rooomVC = obj; - [rooomVC exitRoom]; - *stop = YES; - } - }]; - dispatch_after(1.0, dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:self.messageInfo.roomUid viewController:kWindow.rootViewController redEnvelopeId:self.messageInfo.redEnvelopeId]; - }); -} - -#pragma mark - Getters And Setters -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage imageNamed:@"redPacket_msg_valid_bg"]; - self.bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} - -- (UIImageView *)redPacketImageView { - if (!_redPacketImageView) { - _redPacketImageView = [[UIImageView alloc] init]; - _redPacketImageView.contentMode = UIViewContentModeScaleAspectFit; - _redPacketImageView.image = [UIImage imageNamed:@"redPacket_msg_icon"]; - } - return _redPacketImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment= NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} - -- (UILabel *)subLabel { - if (!_subLabel) { - _subLabel = [[UILabel alloc] init]; - _subLabel.text = YMLocalizedString(@"MessageContentRedPacketView5"); - _subLabel.font = [UIFont systemFontOfSize:13]; - _subLabel.textColor = [UIColor whiteColor]; - } - return _subLabel; -} - -- (UILabel *)descLabel { - if (!_descLabel) { - _descLabel = [[UILabel alloc] init]; - _descLabel.font = [UIFont systemFontOfSize:13]; - _descLabel.textColor = [UIColor whiteColor]; - } - return _descLabel; -} - -- (UIView *)devideView { - if (!_devideView) { - _devideView = [[UIView alloc] init]; - _devideView.backgroundColor = [UIColor whiteColor]; - } - return _devideView; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRevokeView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRevokeView.h deleted file mode 100644 index e772373..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRevokeView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentRevokeView.h -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import -#import "MessageContentProtocol.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentRevokeView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRevokeView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRevokeView.m deleted file mode 100644 index e981141..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRevokeView.m +++ /dev/null @@ -1,52 +0,0 @@ -// -// MessageContentRevokeView.m -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import "MessageContentRevokeView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "MessageRevokeModel.h" - -@interface MessageContentRevokeView() - -///显示时间 -@property (nonatomic, strong) UILabel * timeLabel; - -@end - -@implementation MessageContentRevokeView - -- (instancetype)init { - self = [super init]; - if (self) { - [self addSubview:self.timeLabel]; - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self).with.insets(UIEdgeInsetsMake(MESSAGE_PADDING, MESSAGE_PADDING, MESSAGE_PADDING, MESSAGE_PADDING)); - }]; - } - return self; -} - -- (void)render:(nonnull MessageBaseModel *)model { - self.superview.backgroundColor = [UIColor clearColor]; - MessageRevokeModel * timeModel= (MessageRevokeModel *)model; - NSString * messageText = timeModel.title; - self.timeLabel.text = messageText; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:10]; - _timeLabel.textAlignment = NSTextAlignmentCenter; - _timeLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _timeLabel; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRiskAlertView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRiskAlertView.h deleted file mode 100644 index 3a919a0..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRiskAlertView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentRiskAlertView.h -// YUMI -// -// Created by YUMI on 2022/8/11. -// - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentRiskAlertView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRiskAlertView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRiskAlertView.m deleted file mode 100644 index 242312d..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRiskAlertView.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// MessageContentRiskAlertView.m -// YUMI -// -// Created by YUMI on 2022/8/11. -// - -#import "MessageContentRiskAlertView.h" -///Third -#import - -#import "MessageRiskAlertModel.h" - -@interface MessageContentRiskAlertView () -///显示内容 -@property (nonatomic,strong) YYLabel *contentLabel; -@end - -@implementation MessageContentRiskAlertView - - - -- (void)initSubViews { - [super initSubViews]; - [self.backView addSubview:self.contentLabel]; -} - - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.backView); - }]; -} - - -- (void)render:(nonnull MessageBaseModel *)message { - MessageRiskAlertModel *obj = (MessageRiskAlertModel *)message; - self.contentLabel.attributedText = obj.attributedText; - -} - -- (YYLabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[YYLabel alloc]initWithFrame:CGRectZero]; - _contentLabel.preferredMaxLayoutWidth = CONTENT_WIDTH_MAX - MESSAGE_PADDING * 2; - _contentLabel.numberOfLines = 0; - } - return _contentLabel; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.h deleted file mode 100644 index 20ec08a..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentSkillCardView.h -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentSkillCardView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.m deleted file mode 100644 index 50b0988..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.m +++ /dev/null @@ -1,92 +0,0 @@ -// -// MessageContentSkillCardView.m -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import "MessageContentSkillCardView.h" -///Third -#import - -#import "HttpRequestHelper.h" -#import "AttachMentModel.h" -#import "GuildMessageModel.h" -#import "MessageSkillCardModel.h" -#import "DJDKMIMOMColor.h" -#import "XNDJTDDLoadingTool.h" -#import "AccountInfoStorage.h" -#import "XPMineGuildViewController.h" -#import "XCCurrentVCStackManager.h" -#define MESSAGE_MAX_WIDTH 180 -@interface MessageContentSkillCardView () -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///显示内容 -@property (nonatomic,strong) YYLabel *contentLabel; -///消息的信息 -@property (nonatomic,strong) GuildMessageModel *messageInfo; -@property (nonatomic,strong) NIMMessage *message; -@end - -@implementation MessageContentSkillCardView - -- (void)initSubViews { - [super initSubViews]; - [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.contentLabel]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(MESSAGE_MAX_WIDTH); - make.bottom.mas_equalTo(self.contentLabel.mas_bottom); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.backView).offset(MESSAGE_PADDING); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.mas_equalTo(self.backView); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(MESSAGE_PADDING); - make.height.mas_equalTo(15); - }]; -} - -- (void)render:(MessageBaseModel *)model { - self.message = model.message; - MessageSkillCardModel *obj = (MessageSkillCardModel *)model; - GuildMessageModel * info= obj.guildInfo; - self.messageInfo = info; - self.titleLabel.text = info.layout.title.content; - self.titleLabel.font = [UIFont systemFontOfSize:info.layout.title.fontSize weight:info.layout.title.fontBold?UIFontWeightBold:UIFontWeightRegular]; - self.contentLabel.attributedText = obj.attribute; - self.contentLabel.textAlignment = NSTextAlignmentCenter; - [self.contentLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(obj.textHeight); - }]; -} - -#pragma mark - Getters And Setters - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment= NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:14]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (YYLabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[YYLabel alloc] init]; - _contentLabel.numberOfLines = 0; - } - return _contentLabel; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentText.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentText.h deleted file mode 100644 index fbf798c..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentText.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MessageContentText.h -// YUMI -// -// Created by zu on 2021/12/2. -// - -#import -#import "MessageContentProtocol.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentText : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentText.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentText.m deleted file mode 100644 index b654c4c..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentText.m +++ /dev/null @@ -1,89 +0,0 @@ -// -// MessageContentText.m -// YUMI -// -// Created by zu on 2021/12/2. -// - -#import "MessageContentText.h" -#import "DJDKMIMOMColor.h" -#import "NSObject+MJExtension.h" -#import "QEmotionHelper.h" -#import -#import - -#import "MessageTextModel.h" -#define MESSAGE_TEXT_PADDING 10 - -@interface MessageContentText() - -/** - 消息文本 - */ -@property (nonatomic, strong) YYLabel * messageText; - -///当前的消息 -@property (nonatomic,strong) NIMMessage *message; - -@end - -@implementation MessageContentText - -+ (NSDictionary *)messageTextAttibutes { - UIFont *font = [UIFont systemFontOfSize:13.f]; - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - [paragraphStyle setLineSpacing:2.5]; - return @{ - NSFontAttributeName:font, - NSParagraphStyleAttributeName: paragraphStyle - }; -} - -- (instancetype)init { - self = [super init]; - if (self) { - [self addSubview:self.messageText]; - [self.messageText mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self).with.insets(UIEdgeInsetsMake(MESSAGE_TEXT_PADDING, MESSAGE_TEXT_PADDING, MESSAGE_TEXT_PADDING, MESSAGE_TEXT_PADDING)); - }]; - } - return self; -} - -- (void)render:(nonnull MessageBaseModel *)model { - self.message = model.message; - if (model.messageType == SessionMessageType_Text) { - MessageTextModel * textModel = (MessageTextModel *)model; - _messageText.attributedText = textModel.textAttribute; - } else { - NSString * messageText = model.message.text; - if (!messageText || (model.message.messageType != NIMMessageTypeTip && model.message.messageType != NIMMessageTypeText)) { -// messageText = YMLocalizedString(@"MessageContentText0"); - messageText = [NSString stringWithFormat:@"%@\n%@", - YMLocalizedString(@"MessageContentText0"), - model.message.rawAttachContent]; - } - QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper]; - NSMutableAttributedString * attribute = [faceManager attributedStringByText:messageText font:[UIFont systemFontOfSize:13] forMessageBubble:YES]; - _messageText.attributedText = attribute; - } - [_messageText.superview layoutIfNeeded]; - if(_messageText.frame.size.width > _messageText.preferredMaxLayoutWidth){ - [_messageText mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(_messageText.preferredMaxLayoutWidth); - }]; - } -} - -- (YYLabel *)messageText { - if (!_messageText) { - _messageText = [[YYLabel alloc]initWithFrame:CGRectZero]; - _messageText.preferredMaxLayoutWidth = CONTENT_WIDTH_MAX - MESSAGE_TEXT_PADDING * 2; - _messageText.textColor = DJDKMIMOMColor.mainTextColor; - _messageText.numberOfLines = 0; - _messageText.userInteractionEnabled = YES; - } - return _messageText; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.h deleted file mode 100644 index 3587acc..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MessageContentTextClickable.h -// YUMI -// -// Created by zu on 2022/1/24. -// - -#import "MessageContentCustomView.h" -#import "UIView+NIM.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentTextClickable : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m deleted file mode 100644 index ae821ec..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m +++ /dev/null @@ -1,266 +0,0 @@ -// -// MessageContentTextClickable.m -// YUMI -// -// Created by zu on 2022/1/24. -// - -#import "MessageContentTextClickable.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NSObject+MJExtension.h" -#import "XCCurrentVCStackManager.h" -#import "Api.h" -#import "AccountInfoStorage.h" -#import "XNDJTDDLoadingTool.h" -#import "NSObject+MJExtension.h" -#import "ClientConfig.h" -///Model -#import "UserInfoModel.h" -#import "ContentSecretaryModel.h" -#import "MessageTextClickModel.h" -///View -#import "XPRoomViewController.h" -#import "XPWebViewController.h" - -#import "XPIAPRechargeViewController.h" -#import "XPMineUserInfoViewController.h" - -#import "MyDressingViewController.h" -#import "ShoppingMallViewController.h" -#import "XPMineLoginPasswordViewController.h" -#import "XPMomentTopicContainerViewController.h" -#import "VIPCenterViewController.h" -///P -#import "RoomHostDelegate.h" -@interface MessageContentTextClickable() - -/** - 消息文本 - */ -@property (nonatomic, strong) UILabel * messageText; -///获取的模型 -@property (nonatomic,strong) ContentSecretaryModel *contentInfo; -///分割线 -@property (nonatomic,strong) UIView * lineView; - -///查看详情 -@property (nonatomic,strong) UIButton *checkButton; -@end - -@implementation MessageContentTextClickable - -- (void)initSubViews { - [super initSubViews]; - [self.backView addSubview:self.messageText]; - [self.backView addSubview:self.lineView]; - [self.backView addSubview:self.checkButton]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(280); - make.bottom.mas_equalTo(self.checkButton); - }]; - [self.messageText mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.equalTo(self.backView); - - }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.height.mas_equalTo(0.5); - make.top.mas_equalTo(self.messageText.mas_bottom).offset(5); - }]; - - [self.checkButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.lineView.mas_bottom).offset(10); - make.height.mas_equalTo(20); - }]; -} - -- (void)render:(nonnull MessageBaseModel *)message { - MessageTextClickModel * textModel = (MessageTextClickModel *)message; - _messageText.attributedText = textModel.attributedText; - _contentInfo = textModel.contentInfo; -} -- (NSDictionary *)messageTextAttibutes:(UIFont *)font color:(UIColor *)color { - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - [paragraphStyle setLineSpacing:2.5]; - return @{ - NSFontAttributeName:font, - NSParagraphStyleAttributeName: paragraphStyle, - NSForegroundColorAttributeName:color - }; -} -- (void)checkButtonAction:(UIButton *)gesture { - SecretaryRouterType type = self.contentInfo.routerType; - NSString * value = self.contentInfo.routerValue; - switch (type) { - case SecretaryRouterType_H5: { - if (value.length) { - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = value; - [self.nim_viewController.navigationController pushViewController:webVC animated:YES]; - } - } - break; - case SecretaryRouterType_Room: - { - if (value.length > 0) { - UIViewController * controllerView = [XCCurrentVCStackManager shareManager].getCurrentVC; - [controllerView.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - [controllerView.navigationController popToRootViewControllerAnimated:NO]; - XPRoomViewController * rooomVC = obj; - [rooomVC exitRoom]; - *stop = YES; - } - }]; - [XPRoomViewController openRoom:value viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - } - } - break; - case SecretaryRouterType_Purse: - case SecretaryRouterType_Recharge: - { - XPIAPRechargeViewController * rechargeVC = [[XPIAPRechargeViewController alloc] init]; - rechargeVC.type = @"4"; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:rechargeVC animated:YES]; - } - break; - case SecretaryRouterType_UserInfo: - { - if (value.length > 0) { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = value.integerValue; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:userInfoVC animated:YES]; - } - } - break; - case SecretaryRouterType_Car: - { - MyDressingViewController * dressUpVC = [[MyDressingViewController alloc] init]; -// dressUpVC.currentIndex = 1; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:dressUpVC animated:YES]; - } - break; - case SecretaryRouterType_Headwear: - { - MyDressingViewController * dressUpVC = [[MyDressingViewController alloc] init]; -// dressUpVC.currentIndex = 0; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:dressUpVC animated:YES]; - } - break; - case SecretaryRouterType_Nameplate: - { - MyDressingViewController * dressUpVC = [[MyDressingViewController alloc] init]; -// dressUpVC.currentIndex = 2; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:dressUpVC animated:YES]; - } - break; - case SecretaryRouterType_Nobel_Bubble: - { - MyDressingViewController * dressUpVC = [[MyDressingViewController alloc] init]; -// dressUpVC.currentIndex = 4; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:dressUpVC animated:YES]; - } - break; - case SecretaryRouterType_User_Card: - { - MyDressingViewController * dressUpVC = [[MyDressingViewController alloc] init]; -// dressUpVC.currentIndex = 3; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:dressUpVC animated:YES]; - } - break; - case SecretaryRouterType_Set_Password: - { - [Api getUserInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - UserInfoModel * userInfo = [UserInfoModel modelWithDictionary:data.data]; - if (!userInfo.isBindPhone) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"MessageContentTextClickable0")]; - return; - } - //登录密码 - if (userInfo.isBindPasswd) { - XPMineLoginPasswordViewController *vc = [[XPMineLoginPasswordViewController alloc] init]; - vc.userInfo = userInfo; - vc.isModifiPwd = YES; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:vc animated:YES]; - } else { - XPMineLoginPasswordViewController *vc = [[XPMineLoginPasswordViewController alloc] init]; - vc.userInfo = userInfo; - vc.isModifiPwd = NO; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:vc animated:YES]; - } - } - } uid:[AccountInfoStorage instance].getUid]; - } - break; - case SecretaryRouterType_Dressup_Shop: - { - ShoppingMallViewController *vc = [[ShoppingMallViewController alloc] init]; -// vc.currentIndex = [value integerValue]; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:vc animated:YES]; - } - break; - case SecretaryRouterType_My_Dressup: - { - MyDressingViewController * dressUpVC = [[MyDressingViewController alloc] init]; -// dressUpVC.currentIndex = [value integerValue]; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:dressUpVC animated:YES]; - } - break; - case SecretaryRouterType_Square_Topic: - { - XPMomentTopicContainerViewController *topicVC = [[XPMomentTopicContainerViewController alloc] init]; - topicVC.worldId = value; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:topicVC animated:YES]; - } - break; - case SecretaryRouterType_Nobel_Center: - { -// VIPCenterViewController *nobleCenter = [[VIPCenterViewController alloc] initWithRoomUid:-1]; -// [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:nobleCenter animated:YES]; - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kVIP); - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; - break; - } - default: - break; - } -} - -- (UILabel *)messageText { - if (!_messageText) { - _messageText = [[UILabel alloc]initWithFrame:CGRectZero]; - _messageText.preferredMaxLayoutWidth = CONTENT_WIDTH_MAX - MESSAGE_PADDING * 2; - _messageText.textColor = DJDKMIMOMColor.mainTextColor; - _messageText.numberOfLines = 0; - } - return _messageText; -} -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} -- (UIButton *)checkButton { - if (!_checkButton) { - _checkButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_checkButton setTitle:YMLocalizedString(@"MessageContentTweetView1") forState:UIControlStateNormal]; - [_checkButton setTitleColor:UIColorFromRGB(0x4C5AF1) forState:UIControlStateNormal]; - _checkButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_checkButton addTarget:self action:@selector(checkButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _checkButton; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.h deleted file mode 100644 index 6207667..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentTweetView.h -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentTweetView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.m deleted file mode 100644 index 789ee50..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.m +++ /dev/null @@ -1,236 +0,0 @@ -// -// MessageContentTweetView.m -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import "MessageContentTweetView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "NSObject+MJExtension.h" -#import "XCCurrentVCStackManager.h" -#import "YUMIConstant.h" -///Model -#import "MessageTweetModel.h" -#import "ContentTweetModel.h" -///View -#import "XPWebViewController.h" -#import "XPRoomViewController.h" - -@interface MessageContentTweetView () -///显示图片 -@property (nonatomic,strong) NetImageView *logoImageView; -///显示名字 -@property (nonatomic,strong) UILabel *titleLabel; -///分割线 -@property (nonatomic,strong) UIView * lineView; -///显示副标题 -@property (nonatomic,strong) UILabel *subTitleLabel; -///查看详情 -@property (nonatomic,strong) UIButton *checkButton; -///是否为新消息 -@property (nonatomic, strong) UIImageView *isNewImageView; -///新闻的模型 -@property (nonatomic,strong) ContentTweetModel *tweetModel; -///消息ID，用于记录是否已读 -@property (nonatomic, copy) NSString *messageId; - -@end - - -@implementation MessageContentTweetView - -- (void)render:(MessageBaseModel *)model1 { - MessageTweetModel *obj = (MessageTweetModel *)model1; - ContentTweetModel * model = obj.tweetInfo; - self.tweetModel = model; - self.messageId = model1.message.messageId; - self.logoImageView.imageUrl = model.picUrl; - self.titleLabel.attributedText = [[NSMutableAttributedString alloc] initWithString:model.title attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:16] color:[DJDKMIMOMColor mainTextColor]]]; - self.subTitleLabel.attributedText = [[NSMutableAttributedString alloc] initWithString:model.desc attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:13] color:[DJDKMIMOMColor secondTextColor]]]; - - CGFloat oneHeight = [YMLocalizedString(@"MessageContentTweetView0") boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin - attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:16] color:[DJDKMIMOMColor mainTextColor]] context:nil].size.height + 2.5; - - CGFloat titleHeight = [model.title boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin - attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:16] color:[DJDKMIMOMColor mainTextColor]] context:nil].size.height; - if (titleHeight <= oneHeight * 2) { - [self.titleLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(titleHeight + 5); - }]; - } else{ - [self.titleLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(oneHeight * 2); - }]; - } - - - - CGFloat desHeight = [model.desc boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin - attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:13] color:[DJDKMIMOMColor mainTextColor]] context:nil].size.height + 10; - [self.subTitleLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(desHeight); - }]; - - NSArray *redPacketHistory = [[NSUserDefaults standardUserDefaults] objectForKey:kTuWenMessageHistory]; - if ( [redPacketHistory containsObject: model1.message.messageId]) { - self.isNewImageView.hidden = YES; - } else { - self.isNewImageView.hidden = NO; - } -} - -- (NSDictionary *)messageTextAttibutes:(UIFont *)font color:(UIColor *)color { - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - [paragraphStyle setLineSpacing:2.5]; - return @{ - NSFontAttributeName:font, - NSParagraphStyleAttributeName: paragraphStyle, - NSForegroundColorAttributeName:color - }; -} - -- (void)initSubViews { - [super initSubViews]; - [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.logoImageView]; - [self.backView addSubview:self.lineView]; - [self.backView addSubview:self.subTitleLabel]; - [self.backView addSubview:self.checkButton]; - [self.backView addSubview:self.isNewImageView]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(280); - make.bottom.mas_equalTo(self.checkButton); - }]; - [self.isNewImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.backView); - make.centerY.equalTo(self.titleLabel); - make.size.mas_equalTo(CGSizeMake(24, 10)); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView); - make.trailing.equalTo(self.isNewImageView.mas_leading); - make.top.mas_equalTo(self.backView); - make.height.mas_equalTo(18); - }]; - - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(10); - make.height.mas_equalTo(87); - }]; - - [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(10); - make.height.mas_equalTo(18); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.height.mas_equalTo(0.5); - make.top.mas_equalTo(self.subTitleLabel.mas_bottom).offset(5); - }]; - - [self.checkButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.lineView.mas_bottom).offset(10); - make.height.mas_equalTo(20); - }]; - -} - -#pragma mark - Event Response -- (void)checkButtonAction:(UIButton *)sender { - // 如果打开红包成功 则记录当前红包状态 - NSArray *history = [[NSUserDefaults standardUserDefaults] objectForKey:kTuWenMessageHistory]; - NSMutableArray *tempArray = [NSMutableArray arrayWithArray:history]; - if (![tempArray containsObject:self.messageId]) { - [tempArray addObject:self.messageId]; - [[NSUserDefaults standardUserDefaults] setObject:tempArray forKey:kTuWenMessageHistory]; - [[NSUserDefaults standardUserDefaults] synchronize]; - } - if (self.tweetModel.routerType == 1) { - [XPRoomViewController openRoom:self.tweetModel.routerValue viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - } else if (self.tweetModel.routerType == 2) { - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = self.tweetModel.routerValue; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; - } else { - if ([self.tweetModel.webUrl hasPrefix:@"http"]) { - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = self.tweetModel.webUrl; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; - } - } -} - -#pragma mark - Getters And Setters -- (NetImageView *)logoImageView { - if (!_logoImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _logoImageView = [[NetImageView alloc] initWithConfig:config]; - _logoImageView.layer.masksToBounds = YES; - _logoImageView.layer.cornerRadius = 10; - _logoImageView.contentMode = UIViewContentModeScaleAspectFill; - _logoImageView.layer.masksToBounds = YES; - } - return _logoImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.numberOfLines = 2; - _titleLabel.preferredMaxLayoutWidth = 240; - } - return _titleLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (UILabel *)subTitleLabel { - if (!_subTitleLabel) { - _subTitleLabel = [[UILabel alloc] init]; - _subTitleLabel.numberOfLines = 0; - _subTitleLabel.preferredMaxLayoutWidth = 240; - } - return _subTitleLabel; -} - -- (UIButton *)checkButton { - if (!_checkButton) { - _checkButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_checkButton setTitle:YMLocalizedString(@"MessageContentTweetView1") forState:UIControlStateNormal]; - [_checkButton setTitleColor:UIColorFromRGB(0x4C5AF1) forState:UIControlStateNormal]; - _checkButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_checkButton addTarget:self action:@selector(checkButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _checkButton; -} - -- (UIImageView *)isNewImageView { - if (!_isNewImageView) { - _isNewImageView = [[UIImageView alloc] init]; - _isNewImageView.image = [UIImage imageNamed:@"gift_type_newIcon"]; - _isNewImageView.hidden = YES; - } - return _isNewImageView; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentUnSupportView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentUnSupportView.h deleted file mode 100644 index ab2f87b..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentUnSupportView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageContentUnSupport.h -// YUMI -// -// Created by YUMI on 2022/4/19. -// - -#import -#import "MessageContentProtocol.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MessageContentUnSupportView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentUnSupportView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentUnSupportView.m deleted file mode 100644 index 9d55e5f..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentUnSupportView.m +++ /dev/null @@ -1,64 +0,0 @@ -// -// MessageContentUnSupport.m -// YUMI -// -// Created by YUMI on 2022/4/19. -// - -#import "MessageContentUnSupportView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "MessageUnSupportModel.h" - - -@interface MessageContentUnSupportView () -///不支持的类型 -@property (nonatomic,strong) UILabel *unSupportLabel; -@end - -@implementation MessageContentUnSupportView - -- (void)render:(MessageBaseModel *)message { -// NIMCustomObject *obj = (NIMCustomObject *)message.message.messageObject; -// NSLog(@"%@", obj); -} - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.unSupportLabel]; -} - -- (void)initSubViewConstraints { - [self.unSupportLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self).with.insets(UIEdgeInsetsMake(MESSAGE_PADDING, MESSAGE_PADDING, MESSAGE_PADDING, MESSAGE_PADDING)); - }]; -} - -#pragma mark - Getters And Setters -- (UILabel *)unSupportLabel { - if (!_unSupportLabel) { - _unSupportLabel = [[UILabel alloc]initWithFrame:CGRectZero]; - _unSupportLabel.preferredMaxLayoutWidth = CONTENT_WIDTH_MAX - MESSAGE_PADDING * 2; - _unSupportLabel.textColor = DJDKMIMOMColor.mainTextColor; - _unSupportLabel.text = YMLocalizedString(@"MessageContentUnSupportView0"); - _unSupportLabel.textAlignment = NSTextAlignmentCenter; - _unSupportLabel.font = [UIFont systemFontOfSize:13]; - } - return _unSupportLabel; -} - - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageGameOrderView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageGameOrderView.h deleted file mode 100644 index c868d1e..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageGameOrderView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MessageGameOrderView.h -// YuMi -// -// Created by P on 2024/7/10. -// - -#import -#import "MessageContentProtocol.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageGameOrderView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageGameOrderView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageGameOrderView.m deleted file mode 100644 index 637d000..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageGameOrderView.m +++ /dev/null @@ -1,166 +0,0 @@ -// -// MessageGameOrderView.m -// YuMi -// -// Created by P on 2024/7/10. -// - -#import "MessageGameOrderView.h" -#import "MessageGameOrderModel.h" - -@interface MessageGameOrderView() - -///当前的消息 -@property (nonatomic,strong) NIMMessage *message; - -@property (nonatomic, strong) UIView *line; -@property (nonatomic, strong) NetImageView *bgImageView; -@property (nonatomic, strong) NetImageView *avatarImageView; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UILabel *subTitleLabel; -@property (nonatomic, strong) UILabel *gameNameLabel; -@property (nonatomic, strong) UILabel *roundLabel; - -@end - -@implementation MessageGameOrderView - -- (instancetype)init { - self = [super init]; - if (self) { - [self addSubview:self.bgImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.subTitleLabel]; - - _line = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 92, 0.5)]; - _line.backgroundColor = UIColorRGBAlpha(0xc1c4db, 0.2); - [self addSubview:_line]; - - [self addSubview:self.avatarImageView]; - [self addSubview:self.gameNameLabel]; - [self addSubview:self.roundLabel]; - - [self initSubViewConstraints]; - - CAGradientLayer *gradientLayer = [CAGradientLayer layer]; - gradientLayer.frame = CGRectMake(0, 0, 300, 98 + MESSAGE_PADDING); - gradientLayer.colors = @[ - (id)[UIColorRGBAlpha(0x161616, 0.9) CGColor], - (id)[UIColorRGBAlpha(0x1f1f1f, 0.8) CGColor], - (id)[UIColorRGBAlpha(0x1a1a1a, 0.3) CGColor] - ]; - gradientLayer.locations = @[@0.0, @0.3, @1.0]; - gradientLayer.startPoint = CGPointMake(0.0, 0.5); - gradientLayer.endPoint = CGPointMake(1.0, 0.5); - [self.bgImageView.layer addSublayer:gradientLayer]; - } - return self; -} - -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self); - make.height.mas_equalTo(98 + MESSAGE_PADDING); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(8); - make.leading.mas_equalTo(9.5); - }]; - - [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(4); - make.leading.mas_equalTo(9.5); - }]; - - [self.line mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.subTitleLabel.mas_bottom).offset(4); - make.leading.mas_equalTo(9.5); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.line.mas_bottom).offset(4); - make.leading.mas_equalTo(9.5); - make.width.height.mas_equalTo(45); - }]; - [self.gameNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.line.mas_bottom).offset(11.5); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(5); - make.trailing.mas_equalTo(-9.5); - }]; - [self.roundLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.avatarImageView.mas_bottom).offset(-7); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(5); - make.trailing.mas_equalTo(-9.5); - }]; -} - -- (void)render:(nonnull MessageGameOrderModel *)model { - self.message = model.message; - - self.bgImageView.imageUrl = model.bgURLPath; - self.avatarImageView.imageUrl = model.logoURLPath; - self.gameNameLabel.text = model.title; - self.roundLabel.text = [NSString stringWithFormat:YMLocalizedString(@"GameOrderContent_20"), (long)model.round]; -} - -#pragma mark - -- (NetImageView *)bgImageView { - if (!_bgImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - _bgImageView = [[NetImageView alloc] initWithConfig:config]; - _bgImageView.layer.masksToBounds = YES; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _bgImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 8; - } - return _avatarImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"GameOrderContent_5") - font:kFontMedium(12) - textColor:[UIColor whiteColor]]; - } - return _titleLabel; -} - -- (UILabel *)subTitleLabel { - if (!_subTitleLabel) { - _subTitleLabel = [UILabel labelInitWithText:YMLocalizedString(@"GameOrderContent_16") - font:kFontMedium(11) - textColor:[UIColor colorWithWhite:1 alpha:0.6]];; - } - return _subTitleLabel; -} - -- (UILabel *)gameNameLabel { - if (!_gameNameLabel) { - _gameNameLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(13) - textColor:[UIColor whiteColor]]; - } - return _gameNameLabel; -} - -- (UILabel *)roundLabel { - if (!_roundLabel) { - _roundLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(11) - textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - } - return _roundLabel; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageTimeView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageTimeView.h deleted file mode 100644 index 3a551f2..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageTimeView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageTimeView.h -// YUMI -// -// Created by YUMI on 2023/1/18. -// - -#import -#import "MessageContentProtocol.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MessageTimeView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageTimeView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageTimeView.m deleted file mode 100644 index 8b88a0b..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageTimeView.m +++ /dev/null @@ -1,57 +0,0 @@ -// -// MessageTimeView.m -// YUMI -// -// Created by YUMI on 2023/1/18. -// - -#import "MessageTimeView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "MessageTimeModel.h" - -@interface MessageTimeView() - -///显示时间 -@property (nonatomic, strong) UILabel * timeLabel; -///当前的消息 -@property (nonatomic,strong) NIMMessage *message; - -@end - -@implementation MessageTimeView - -- (instancetype)init { - self = [super init]; - if (self) { - [self addSubview:self.timeLabel]; - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self).with.insets(UIEdgeInsetsMake(0, 0, 0, 0)); - }]; - } - return self; -} - -- (void)render:(nonnull MessageBaseModel *)model { - self.superview.backgroundColor = [UIColor clearColor]; - self.message = model.message; - MessageTimeModel * timeModel= (MessageTimeModel *)model; - NSString * messageText = timeModel.time; - self.timeLabel.text = messageText; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:10]; - _timeLabel.textAlignment = NSTextAlignmentCenter; - _timeLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _timeLabel; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageTipsView.h b/YuMi/Modules/YMMessage/View/Session/Content/MessageTipsView.h deleted file mode 100644 index 3ec6332..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageTipsView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageTipsView.h -// YUMI -// -// Created by YUMI on 2023/2/1. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageTipsView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageTipsView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageTipsView.m deleted file mode 100644 index aa64218..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageTipsView.m +++ /dev/null @@ -1,54 +0,0 @@ -// -// MessageTipsView.m -// YUMI -// -// Created by YUMI on 2023/2/1. -// - -#import "MessageTipsView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "MessageTipsModel.h" - -@interface MessageTipsView() - -///显示时间 -@property (nonatomic, strong) UILabel * timeLabel; -///当前的消息 -@property (nonatomic,strong) NIMMessage *message; - -@end - -@implementation MessageTipsView - -- (instancetype)init { - self = [super init]; - if (self) { - [self addSubview:self.timeLabel]; - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self).with.insets(UIEdgeInsetsMake(0, 0, 0, 0)); - }]; - } - return self; -} - -- (void)render:(nonnull MessageBaseModel *)model { - self.superview.backgroundColor = [UIColor clearColor]; - self.message = model.message; - self.timeLabel.text = model.message.text; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:10]; - _timeLabel.textAlignment = NSTextAlignmentCenter; - _timeLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _timeLabel; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.h b/YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.h deleted file mode 100644 index 83d77f7..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PIMessageContentServiceReplyView.h -// YuMi -// -// Created by duoban on 2023/9/12. -// - -#import "MessageContentCustomView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface PIMessageContentServiceReplyView : MessageContentCustomView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.m b/YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.m deleted file mode 100644 index b7bfdf2..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.m +++ /dev/null @@ -1,179 +0,0 @@ -// -// PIMessageContentServiceReplyView.m -// YuMi -// -// Created by duoban on 2023/9/12. -// - -#import "PIMessageContentServiceReplyView.h" - -#import "PIMessageContentServiceReplyModel.h" -@interface PIMessageContentServiceReplyView() -@property(nonatomic,strong) UIImageView *bgImageView; -@property(nonatomic,strong) UILabel *titleView; - - - -@property(nonatomic,strong) UILabel *contentView; -@property(nonatomic,strong) UILabel *contentView1; -@property(nonatomic,strong) YYLabel *contentView2; -@property(nonatomic,strong) YYLabel *contentView3; -@property(nonatomic,strong) UILabel *contentView4; -@end -@implementation PIMessageContentServiceReplyView - -- (void)initSubViews { - [super initSubViews]; - [self addSubview:self.backView]; - - [self.backView addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.titleView]; - [self.bgImageView addSubview:self.contentView]; - [self.bgImageView addSubview:self.contentView1]; - [self.bgImageView addSubview:self.contentView2]; - [self.bgImageView addSubview:self.contentView3]; - [self.bgImageView addSubview:self.contentView4]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(278); - make.height.mas_equalTo(236); - }]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.backView); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.top.mas_equalTo(58); - make.height.mas_equalTo(20); - }]; - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-14); - make.top.equalTo(self.titleView.mas_bottom).mas_offset(6); - }]; - [self.contentView1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-14); - make.top.equalTo(self.contentView.mas_bottom).mas_offset(6); - }]; - [self.contentView2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-14); - make.top.equalTo(self.contentView1.mas_bottom).mas_offset(4); - }]; - [self.contentView3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-14); - make.top.equalTo(self.contentView2.mas_bottom).mas_offset(4); - }]; - - [self.contentView4 mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-14); - make.top.equalTo(self.contentView3.mas_bottom).mas_offset(6); - }]; -} -- (void)render:(MessageBaseModel *)model { - NIMMessage *message = model.message; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel * attach = (AttachmentModel *)obj.attachment; - - NSString *official0 = attach.data[@"official0"]; - NSString *official1 = attach.data[@"official1"]; - NSString *chatText = [NSString stringWithFormat:YMLocalizedString(@"PIMessageContentServiceReplyView4"),official0]; - NSString *lineText = [NSString stringWithFormat:YMLocalizedString(@"PIMessageContentServiceReplyView5"),official1]; - NSMutableAttributedString *chatAtt = [[NSMutableAttributedString alloc] initWithString:chatText]; - chatAtt.yy_color = UIColorFromRGB(0x767585); - NSMutableAttributedString *lineAtt = [[NSMutableAttributedString alloc] initWithString:lineText]; - lineAtt.yy_color = UIColorFromRGB(0x767585); - _contentView.numberOfLines = 0; - - NSString *userString = YMLocalizedString(@"PIMessageContentServiceReplyView1"); - NSMutableAttributedString *userAttString = [[NSMutableAttributedString alloc] initWithString:userString attributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x9168FA)}]; - - [userAttString yy_setTextHighlightRange:NSMakeRange(0, userAttString.length) color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPMineHeadView8")]; - UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; - pasteboard.string = official0; - } longPressAction:nil]; - [chatAtt insertAttributedString:userAttString atIndex:chatText.length]; - _contentView2.attributedText = chatAtt; - - NSString *protocolString = YMLocalizedString(@"PIMessageContentServiceReplyView1"); - NSMutableAttributedString *privateString = [[NSMutableAttributedString alloc] initWithString:protocolString attributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x9168FA)}]; - [privateString yy_setTextHighlightRange:NSMakeRange(0, privateString.length) color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPMineHeadView8")]; - UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; - pasteboard.string = official1; - } longPressAction:nil]; - - [lineAtt insertAttributedString:privateString atIndex:lineText.length]; - _contentView3.attributedText = lineAtt; - - self.superview.backgroundColor = [UIColor clearColor]; - -} -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = kImage(@"message_content_service_reply"); - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"PIMessageContentServiceReplyView0") font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _titleView; -} -- (UILabel *)contentView{ - if(!_contentView){ - _contentView = [[UILabel alloc] init]; - _contentView.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular]; - _contentView.textColor = UIColorFromRGB(0x767585); - _contentView.text = YMLocalizedString(@"PIMessageContentServiceReplyView2"); - _contentView.numberOfLines = 2; - } - return _contentView; -} -- (UILabel *)contentView1{ - if(!_contentView1){ - _contentView1 = [[UILabel alloc] init]; - _contentView1.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular]; - _contentView1.textColor = UIColorFromRGB(0x767585); - _contentView1.text = YMLocalizedString(@"PIMessageContentServiceReplyView3"); - _contentView1.numberOfLines = 2; - } - return _contentView1; -} -- (YYLabel *)contentView2{ - if(!_contentView2){ - _contentView2 = [[YYLabel alloc] init]; - _contentView2.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular]; - _contentView2.textColor = UIColorFromRGB(0x767585); - } - return _contentView2; -} -- (YYLabel *)contentView3{ - if(!_contentView3){ - _contentView3 = [[YYLabel alloc] init]; - _contentView3.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular]; - _contentView3.textColor = UIColorFromRGB(0x767585); - } - return _contentView3; -} -- (UILabel *)contentView4{ - if(!_contentView4){ - _contentView4 = [[UILabel alloc] init]; - _contentView4.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular]; - _contentView4.textColor = UIColorFromRGB(0x767585); - _contentView4.text = YMLocalizedString(@"PIMessageContentServiceReplyView6"); - _contentView4.numberOfLines = 3; - } - return _contentView4; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/AgentMessageModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/AgentMessageModel.h deleted file mode 100644 index 321912d..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/AgentMessageModel.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// AgentMessageModel.h -// YuMi -// -// Created by P on 2025/2/20. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface AgentTextStyleMessageModel: PIBaseModel - -@property(nonatomic, copy) NSString *content; -@property(nonatomic, assign) NSInteger fontSize; -@property(nonatomic, copy) NSString *fontColor; -@property(nonatomic, assign) bool fontBold; - -@end - -@interface AgentMessageModel : MessageBaseModel - -@property(nonatomic, copy) NSString *url; -@property(nonatomic, copy) NSString *title; -@property(nonatomic, copy) NSString *content; -@property(nonatomic, assign) NSInteger titleFontSize; -@property(nonatomic, assign) NSInteger contentFontSize; -@property(nonatomic, assign) NSInteger layoutType; // (0没有确定取消按钮,1,确定取消按钮,2,只有确定 3,只有取消) -@property(nonatomic, copy) NSArray *titleStyles; -@property(nonatomic, copy) NSArray *contentStyles; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/AgentMessageModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/AgentMessageModel.m deleted file mode 100644 index ad1a1ba..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/AgentMessageModel.m +++ /dev/null @@ -1,60 +0,0 @@ -// -// AgentMessageModel.m -// YuMi -// -// Created by P on 2025/2/20. -// - -#import "AgentMessageModel.h" -#import "AttachmentModel.h" - -@implementation AgentTextStyleMessageModel - -@end - - -@implementation AgentMessageModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super init]) { - self.message = message; - self.isHiddenAvatar = NO; - self.messageType = SessionMessageType_Custom; - - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - NSDictionary *data = attachment.data; - if (data) { - AgentMessageModel *model = [AgentMessageModel modelWithJSON:data]; - self.url = model.url; - self.title = model.title; - self.content = model.content; - self.titleFontSize = model.titleFontSize; - self.contentSize = model.contentSize; - self.layoutType = model.layoutType; - self.titleStyles = model.titleStyles; - self.contentStyles = model.contentStyles; - } - - - CGSize maxSize = CGSizeMake(260, CGFLOAT_MAX); - - // 使用 NSString 的 boundingRectWithSize 方法来计算高度 - CGRect textRect = [self.content boundingRectWithSize:maxSize - options:NSStringDrawingUsesLineFragmentOrigin - attributes:@{NSFontAttributeName: kFontRegular(14)} - context:nil]; - - CGFloat titleHeight = 30; - CGFloat contentHeight = textRect.size.height; - CGFloat buttonHeight = self.layoutType == 0 ? 0 : 40; - self.height = titleHeight + contentHeight + buttonHeight + 20; - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"AgentMessageTableViewCell"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageApplicationShareModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageApplicationShareModel.h deleted file mode 100644 index 5ee22c3..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageApplicationShareModel.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MessageApplicationShareModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN -@class ContentApplicationShareModel; -@interface MessageApplicationShareModel : MessageBaseModel -///分享的信息 -@property (nonatomic,strong) ContentApplicationShareModel *shareInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageApplicationShareModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageApplicationShareModel.m deleted file mode 100644 index 3eb1a52..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageApplicationShareModel.m +++ /dev/null @@ -1,31 +0,0 @@ -// -// MessageApplicationShareModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageApplicationShareModel.h" -#import "AttachmentModel.h" -#import "ContentApplicationShareModel.h" -#import "NSObject+MJExtension.h" -@implementation MessageApplicationShareModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - self.contentSize = CGSizeMake(200, 50); - self.height = 90 + CONTENT_PADDING_V_TOTAL; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel * attach = obj.attachment; - ContentApplicationShareModel *info = [ContentApplicationShareModel modelWithDictionary:attach.data]; - self.shareInfo = info; - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentApplicationShareView"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageAudioModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageAudioModel.h deleted file mode 100644 index 887fa16..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageAudioModel.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageAudioModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageAudioModel : MessageBaseModel - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageAudioModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageAudioModel.m deleted file mode 100644 index 3627bcc..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageAudioModel.m +++ /dev/null @@ -1,29 +0,0 @@ -// -// MessageAudioModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageAudioModel.h" - -@implementation MessageAudioModel -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Audio; - NSInteger audioContentHeight = 30; - NIMAudioObject *audioContent = (NIMAudioObject*)[message messageObject]; - CGFloat value = 2*atan((audioContent.duration/1000.0-1)/10.0)/M_PI; - NSInteger audioContentMinWidth = (CONTENT_WIDTH_MAX - 180); - NSInteger audioContentMaxWidth = (CONTENT_WIDTH_MAX - 100); - CGFloat audioWidth = (audioContentMaxWidth - audioContentMinWidth)* value + audioContentMinWidth; - self.contentSize = CGSizeMake(audioWidth, audioContentHeight); - self.height = (audioContentHeight + CONTENT_PADDING_V_TOTAL+ MESSAGE_PADDING * 2); - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageConentAudioView"; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageBaseModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageBaseModel.h deleted file mode 100644 index d93048b..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageBaseModel.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// MessageBaseModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import -#import -#import "MessageContentProtocol.h" -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, SessionMessageType) { - ///文字 - SessionMessageType_Text = 1, - ///图片 - SessionMessageType_Image, - ///语音 - SessionMessageType_Audio, - ///tips - SessionMessageType_Tips, - ///自定义 - SessionMessageType_Custom, - ///时间戳 - SessionMessageType_Time, - ///撤回消息 - SessionMessageType_Revoke, - ///不支持的消息 - SessionMessageType_UnSupport -}; - -@interface MessageBaseModel : PIBaseModel -///当前的消息类型 -@property (nonatomic,strong) NIMMessage *message; -///大小 -@property (nonatomic,assign) CGSize contentSize; -///高度 -@property (nonatomic,assign) CGFloat height; -///昵称 -@property (nonatomic,strong) NSString *nick; -///头像 -@property (nonatomic,strong) NSString *avatar; -///是否是发出的 -@property (nonatomic,assign) BOOL isOutgoingMsg; -/// -@property (nonatomic,assign) BOOL isHiddenAvatar; -///消息的类型 -@property (nonatomic,assign) SessionMessageType messageType; - -@property (nonatomic, assign) NSInteger uid; -///初始化一个message -- (instancetype)initWithMessage:(NIMMessage *)message; - -- (NSString *)cellContent:(MessageBaseModel *)model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageBaseModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageBaseModel.m deleted file mode 100644 index 39e69d5..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageBaseModel.m +++ /dev/null @@ -1,25 +0,0 @@ -// -// MessageBaseModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -@implementation MessageBaseModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super init]) { - self.message = message; - self.isHiddenAvatar = NO; - self.messageType = SessionMessageType_Text; - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentText"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageCPNotifyModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageCPNotifyModel.h deleted file mode 100644 index b271d74..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageCPNotifyModel.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// MessageCPNotifyModel.h -// YuMi -// -// Created by P on 2025/4/9. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageCPNotifyModel : MessageBaseModel - -@property (nonatomic, copy) NSString *loverAvatar; -@property (nonatomic, assign) NSInteger relationNameType; -@property (nonatomic, assign) NSInteger status; //0-默认，1-同意，2-拒绝 -@property (nonatomic, assign) NSInteger recordId; // 推送的recordId -@property (nonatomic, assign) NSInteger first; -@property (nonatomic, assign) NSInteger second; -@property (nonatomic, assign) BOOL isSender; -@property (nonatomic, assign) NSInteger isUserTaped; // 用户是否已经操作过，0 或 nil：没有操作，1: 点击了接受，2: 点击了拒绝 -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageCPNotifyModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageCPNotifyModel.m deleted file mode 100644 index ac3fe2f..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageCPNotifyModel.m +++ /dev/null @@ -1,69 +0,0 @@ -// -// MessageCPNotifyModel.m -// YuMi -// -// Created by P on 2025/4/9. -// - -#import "MessageCPNotifyModel.h" -#import "AttachmentModel.h" - -@implementation MessageCPNotifyModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { -// self.messageType = SessionMessageType_Custom; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel *attach = (AttachmentModel *)obj.attachment; - NSDictionary * dic = attach.data; - self.avatar = [dic objectForKey:@"avatar"]; - self.loverAvatar = [dic objectForKey:@"loverAvatar"]; - self.relationNameType = [[dic objectForKey:@"relationNameType"] integerValue]; - self.status = [[dic objectForKey:@"status"] integerValue]; - self.recordId = [[dic objectForKey:@"recordId"] integerValue]; - self.uid = [[dic objectForKey:@"uid"] integerValue]; - self.first = attach.first; - self.second = attach.second; - self.isSender = [[[AccountInfoStorage instance] getUid] integerValue] == self.uid || self.uid == 0; - self.isUserTaped = [[dic objectForKey:@"user_action"] integerValue]; - - if (self.isSender) { - switch (self.status) { - case 0: - self.height = 150; - break; - case 1: - self.height = 150; - break; - case 2: - self.height = 150; - break; - - default: - break; - } - } else { - switch (self.status) { - case 0: - self.height = 180; - break; - case 1: - self.height = 180; - break; - case 2: - self.height = 180; - break; - - default: - break; - } - } - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"AgentMessageTableViewCell"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageFindNewGreetModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageFindNewGreetModel.h deleted file mode 100644 index db0ab08..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageFindNewGreetModel.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MessageFindNewGreetModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageFindNewGreetModel : MessageBaseModel - -@property (nonatomic,strong) NSAttributedString *attributedText; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageFindNewGreetModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageFindNewGreetModel.m deleted file mode 100644 index 387bd1e..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageFindNewGreetModel.m +++ /dev/null @@ -1,48 +0,0 @@ -// -// MessageFindNewGreetModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageFindNewGreetModel.h" -#import "AttachmentModel.h" -#import "FindNewGreetMessageModel.h" -#import "NSObject+MJExtension.h" -@implementation MessageFindNewGreetModel -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel * attach = obj.attachment; - FindNewGreetMessageModel * model = [FindNewGreetMessageModel modelWithDictionary:attach.data]; - NSString * text = model.message; - if (text.length <= 0) { - text = @""; - } - CGSize dstRect = CGSizeMake(CONTENT_WIDTH_MAX - MESSAGE_PADDING * 2, MAXFLOAT); - - CGSize msgSize = [text boundingRectWithSize:dstRect options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine attributes:[self messageTextAttibutes] context:nil].size; - self.attributedText = [[NSMutableAttributedString alloc] initWithString:text attributes:[self messageTextAttibutes]]; - self.contentSize = CGSizeMake(msgSize.width + MESSAGE_PADDING * 2, msgSize.height + MESSAGE_PADDING * 2); - self.height = msgSize.height + MESSAGE_PADDING * 2 + CONTENT_PADDING_V_TOTAL; - } - return self; -} - -- (NSDictionary *)messageTextAttibutes { - UIFont *font = [UIFont systemFontOfSize:13.f]; - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - [paragraphStyle setLineSpacing:2.5]; - return @{ - NSFontAttributeName:font, - NSParagraphStyleAttributeName: paragraphStyle - }; -} - - - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentFindNewGreetView"; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGameOrderModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGameOrderModel.h deleted file mode 100644 index e0c89cf..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGameOrderModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// MessageGameOrderModel.h -// YuMi -// -// Created by P on 2024/7/10. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageGameOrderModel : MessageBaseModel - -@property (nonatomic, copy) NSString *title; -@property (nonatomic, copy) NSString *bgURLPath; -@property (nonatomic, copy) NSString *logoURLPath; -@property (nonatomic, assign) NSInteger round; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGameOrderModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGameOrderModel.m deleted file mode 100644 index 5045ca0..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGameOrderModel.m +++ /dev/null @@ -1,38 +0,0 @@ -// -// MessageGameOrderModel.m -// YuMi -// -// Created by P on 2024/7/10. -// - -#import "MessageGameOrderModel.h" -#import "AttachmentModel.h" - -@implementation MessageGameOrderModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super init]) { - self.message = message; - self.isHiddenAvatar = NO; - self.messageType = SessionMessageType_Custom; - - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - NSDictionary *gameInfos = (NSDictionary *)attachment.data; - - self.title = [gameInfos objectForKey:@"gameName"]; - self.round = [[gameInfos objectForKey:@"inning"] integerValue]; - self.bgURLPath = [gameInfos objectForKey:@"gamePic"]; - self.logoURLPath = [gameInfos objectForKey:@"gameLogo"]; - - self.contentSize = CGSizeMake(234 + MESSAGE_PADDING* 2, 98 + MESSAGE_PADDING * 2); - self.height = 98 + MESSAGE_PADDING * 2 + CONTENT_PADDING_V_TOTAL; - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageGameOrderView"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGiftModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGiftModel.h deleted file mode 100644 index 96772bd..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGiftModel.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MessageGiftModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" -@class GiftInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface MessageGiftModel : MessageBaseModel -///礼物信息 -@property (nonatomic,strong) GiftInfoModel *giftInfo; -///礼物个数 -@property (nonatomic,assign) NSInteger giftNum; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGiftModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGiftModel.m deleted file mode 100644 index 84ea6d9..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGiftModel.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// MessageGiftModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageGiftModel.h" -#import "GiftReceiveInfoModel.h" -#import "NSObject+MJExtension.h" -#import "XPGiftStorage.h" -#import "AttachmentModel.h" -@implementation MessageGiftModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - self.contentSize = CGSizeMake(185 + MESSAGE_PADDING * 2, 80); - self.height = (CONTENT_PADDING_V_TOTAL + 80 + MESSAGE_PADDING * 2); - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel * attach = (AttachmentModel *)obj.attachment; - GiftReceiveInfoModel *info = [GiftReceiveInfoModel modelWithDictionary:attach.data]; - GiftInfoModel *giftInfo1 = info.gift == nil ? info.giftInfo : info.gift; - if (giftInfo1 == nil) { - giftInfo1 = [[XPGiftStorage shareStorage] findGiftInfo:info.giftId inRoom:@""]; - } - self.giftNum = info.giftNum; - self.giftInfo = giftInfo1; - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentGiftView"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGuildModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGuildModel.h deleted file mode 100644 index 540e076..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGuildModel.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageGuildModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageGuildModel : MessageBaseModel - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGuildModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGuildModel.m deleted file mode 100644 index 81b8afe..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGuildModel.m +++ /dev/null @@ -1,72 +0,0 @@ -// -// MessageGuildModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageGuildModel.h" - -#import "AttachmentModel.h" -#import "GuildMessageModel.h" -#import "DJDKMIMOMColor.h" -#import "NSObject+MJExtension.h" -@implementation MessageGuildModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel * attach = (AttachmentModel *)obj.attachment; - GuildMessageModel * info = [GuildMessageModel modelWithDictionary:attach.data]; - NSMutableAttributedString *attr = [[NSMutableAttributedString alloc]init]; - GuildMessageLayoutModel *layout = info.layout; - for (GuildMessageLayoutInfoModel *params in layout.contents) { - if (params.content.length > 0) { - if ([params.content containsString:@"/r/n"]) { - params.content = @"\r\n"; - } - NSMutableAttributedString *subAttr = [[NSMutableAttributedString alloc]initWithString:params.content]; - if (params.fontSize > 0) { - [subAttr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:params.fontSize weight:params.fontBold?UIFontWeightBold:UIFontWeightRegular] range:NSMakeRange(0, subAttr.length)]; - } - - if (params.fontColor.length > 0) { - [subAttr addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:params.fontColor] range:NSMakeRange(0, subAttr.length)]; - } - [attr appendAttributedString:subAttr]; - } - } - attr.yy_lineSpacing = 5; - CGSize maxSize = CGSizeMake(230 - MESSAGE_PADDING * 2, CGFLOAT_MAX); - YYTextLayout * contentLayout = [YYTextLayout layoutWithContainerSize:maxSize text:attr]; - ///顶部的距离 20 title的高度15 title到content的高度 - CGFloat contentHeight = contentLayout.textBoundingSize.height + 5 + 20 + 15 + 15 + MESSAGE_PADDING; - ///44 底部操作栏的高度 - BOOL isCommonNotice = (attach.second == Custom_Message_Sub_Hall_Notice || attach.second == Custom_Message_Sub_Hall_Become_Hall); - if (!isCommonNotice) { - contentHeight += (10+44); - } - self.height = contentHeight + CONTENT_PADDING_V_TOTAL; - self.contentSize = CGSizeMake(CONTENT_WIDTH_MAX, contentHeight + 20 + 15 + 15); - - } - return self; -} - -- (NSDictionary *)messageTextAttibutes { - UIFont *font = [UIFont systemFontOfSize:13.f]; - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - [paragraphStyle setLineSpacing:2.5]; - return @{ - NSFontAttributeName:font, - NSParagraphStyleAttributeName: paragraphStyle - }; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentGuildView"; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageHeadlinesTextModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageHeadlinesTextModel.h deleted file mode 100644 index 4887336..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageHeadlinesTextModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// MessageHeadlinesTextModel.h -// YuMi -// -// Created by duoban on 2024/5/9. -// - -#import "MessageBaseModel.h" -#import "XPMessageRemoteExtModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MessageHeadlinesTextModel : MessageBaseModel -///富文本 -@property (nonatomic,strong) NSAttributedString *textAttribute; -@property(nonatomic,assign) BOOL isSelf ; -@property(nonatomic,strong) XPMessageRemoteExtModel *extModel; -@property(nonatomic,assign) CGFloat width; -@property(nonatomic,assign) CGFloat imageHeight; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageHeadlinesTextModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageHeadlinesTextModel.m deleted file mode 100644 index 4353004..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageHeadlinesTextModel.m +++ /dev/null @@ -1,119 +0,0 @@ -// -// MessageHeadlinesTextModel.m -// YuMi -// -// Created by duoban on 2024/5/9. -// - -#import "MessageHeadlinesTextModel.h" -#import "QEmotionHelper.h" - -@implementation MessageHeadlinesTextModel -- (instancetype)initWithMessage:(NIMMessage *)message { - if (![message isKindOfClass:[NIMMessage class]] || ![message respondsToSelector:@selector(remoteExt)]) { - return nil; - } - - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Text; - NSDictionary *dic = message.remoteExt[message.from]; - XPMessageRemoteExtModel *extModel = [XPMessageRemoteExtModel modelWithJSON:dic]; - if ([[dic allKeys] containsObject:@"headwearType"]) { - extModel.headWearType = [dic[@"headwearType"] integerValue]; - } else if ([[dic allKeys] containsObject:@"headWearType"]) { - extModel.headWearType = [dic[@"headWearType"] integerValue]; - } - if (extModel.headWearUrl.length == 0) { - if ([[dic allKeys] containsObject:@"headwearUrl"]) { - extModel.headWearUrl = dic[@"headwearUrl"]; - } else if ([[dic allKeys] containsObject:@"headWearUrl"]) { - extModel.headWearUrl = dic[@"headWearUrl"]; - } - } - - self.extModel = extModel; - self.isSelf = [[NIMSDK sharedSDK].loginManager.currentAccount isEqualToString:message.from]; - NSString * messageText = message.text; - if (!messageText) { -// messageText = YMLocalizedString(@"MessageContentText0"); - messageText = [NSString stringWithFormat:@"%@\n%@", - YMLocalizedString(@"MessageContentText0"), - message.rawAttachContent]; - } - - CGFloat width = [UILabel getWidthWithText:messageText height:kGetScaleWidth(36) font:kFontMedium(14)]; - - width = width > kGetScaleWidth(200) ? kGetScaleWidth(200) : width; - self.width = width >= kGetScaleWidth(220) ? kGetScaleWidth(220) : (width + kGetScaleWidth(25)); - - CGSize dstRect = CGSizeMake(width, MAXFLOAT); - QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper]; - NSMutableAttributedString * attribute = [faceManager attributedStringByText:messageText font:kFontMedium(14) forMessageBubble:YES]; - if(extModel.iosBubbleUrl.length > 0){ - [attribute addAttributes:@{NSForegroundColorAttributeName: UIColorFromRGB(0x333333)} range:[attribute.string rangeOfString:attribute.string]]; - }else{ - [attribute addAttributes:@{NSForegroundColorAttributeName:self.isSelf ? UIColorFromRGB(0x333333) : [UIColor whiteColor]} range:[attribute.string rangeOfString:attribute.string]]; - } - - self.textAttribute = attribute; - YYTextContainer *container = [YYTextContainer containerWithSize:dstRect]; - container.maximumNumberOfRows = 0; - YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:attribute]; - CGFloat rowHeight = layout.textBoundingSize.height + kGetScaleWidth(25); - self.imageHeight = rowHeight; - self.height = (self.isSelf ? kGetScaleWidth(35) : kGetScaleWidth(65)) + rowHeight; - - self.isHiddenAvatar = YES; - } - return self; -} -- (NSMutableAttributedString *)createUrlImageAttribute:(NSString *)imageUrl size:(CGSize)size { - NetImageConfig *config = [[NetImageConfig alloc]init]; - ///先这样吧 - config.autoLoad = YES; - NetImageView *imageView = [[NetImageView alloc]initWithUrl:imageUrl config:config]; - - imageView.bounds = CGRectMake(0, 0, size.width, size.height); - imageView.layer.masksToBounds = YES; - imageView.contentMode = UIViewContentModeScaleAspectFit; - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageView.bounds.size.width, imageView.bounds.size.height) alignToFont:[UIFont systemFontOfSize:15.0] alignment:YYTextVerticalAlignmentCenter]; - return attrString; -} -/// 占位的富文本 -/// @param width 需要的间隙 -- (NSMutableAttributedString *)createSapceAttribute:(CGFloat)width { - UIView *spaceView = [[UIView alloc]init]; - spaceView.backgroundColor = [UIColor clearColor]; - spaceView.bounds = CGRectMake(0, 0, width, 10); - NSMutableAttributedString * attribute = [NSMutableAttributedString yy_attachmentStringWithContent:spaceView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(spaceView.frame.size.width, spaceView.frame.size.height) alignToFont:[UIFont systemFontOfSize:15.0] alignment:YYTextVerticalAlignmentCenter]; - return attribute; -} -/// 生成一个富文本 -/// @param text 富文本的文字 -/// @param color 文字的颜色 -/// @param font 文字的大小 -- (NSMutableAttributedString *)createTextAttribute:(NSString *)text color:(UIColor *)color font:(UIFont *)font { - if (text == nil || text.length <= 0) { - text = @""; - } - NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithString:text attributes:nil]; - attribute.yy_font = font; - attribute.yy_color = color; - attribute.yy_paragraphStyle = [self paragraphStyle]; - return attribute; -} -/// 设置文本的样式 间隙 缩进 ... -- (NSMutableParagraphStyle *)paragraphStyle { - NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init]; - paraStyle.lineSpacing = 4.0f;//行间距 - // 强制排版(从左到右) - paraStyle.alignment = NSTextAlignmentLeft; - paraStyle.baseWritingDirection = NSWritingDirectionLeftToRight; - return paraStyle; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentHeadLinesText"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageImageModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageImageModel.h deleted file mode 100644 index 6cabe47..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageImageModel.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// MessageImageModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageImageModel : MessageBaseModel -@property (nonatomic,strong) UIImage *image; -@property (nonatomic,copy) NSString *imageUrl; -@property(nonatomic,strong) NSString *url; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageImageModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageImageModel.m deleted file mode 100644 index caf35b3..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageImageModel.m +++ /dev/null @@ -1,48 +0,0 @@ -// -// MessageImageModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageImageModel.h" -#import "UIImage+Utils.h" -#define MESSAGE_IMAGE_MAX_SIZE (CONTENT_WIDTH_MAX) -#define MESSAGE_IMAGE_Min_SIZE (CONTENT_WIDTH_MAX -100) - -@implementation MessageImageModel -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Image; - NIMImageObject * imageObject = (NIMImageObject*)message.messageObject; - CGFloat attachmentImageMinWidth = (MESSAGE_IMAGE_Min_SIZE); - CGFloat attachmentImageMinHeight = (MESSAGE_IMAGE_Min_SIZE); - CGFloat attachmemtImageMaxWidth = (MESSAGE_IMAGE_MAX_SIZE); - CGFloat attachmentImageMaxHeight = (MESSAGE_IMAGE_MAX_SIZE); - CGSize imageSize; - if (!CGSizeEqualToSize(imageObject.size, CGSizeZero)) { - imageSize = imageObject.size; - }else { - UIImage *image = [UIImage imageWithContentsOfFile:imageObject.thumbPath]; - imageSize = image ? image.size : CGSizeZero; - } - CGSize contentSize = [UIImage sizeWithImageOriginSize:imageSize - minSize:CGSizeMake(attachmentImageMinWidth, attachmentImageMinHeight) - maxSize:CGSizeMake(attachmemtImageMaxWidth, attachmentImageMaxHeight)]; - self.contentSize = contentSize; - self.height = contentSize.height + MESSAGE_PADDING * 2 + CONTENT_PADDING_V_TOTAL; - UIImage *image = [UIImage imageWithContentsOfFile:imageObject.thumbPath]; - if (image) { - self.image = image; - }else { - self.imageUrl = imageObject.url; - } - self.url = imageObject.url; - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentImage"; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageLevelUpgradeModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageLevelUpgradeModel.h deleted file mode 100644 index 2fc34cc..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageLevelUpgradeModel.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MessageLevelUpgradeModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageLevelUpgradeModel : MessageBaseModel -///等级的图片 -@property (nonatomic,strong) NSString *imageName; -///等级 -@property (nonatomic,strong) NSString *level; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageLevelUpgradeModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageLevelUpgradeModel.m deleted file mode 100644 index 9232f5c..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageLevelUpgradeModel.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// MessageLevelUpgradeModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageLevelUpgradeModel.h" -#import "AttachmentModel.h" -#import "ContentLevelUpgradeModel.h" -#import "NSObject+MJExtension.h" -@implementation MessageLevelUpgradeModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - self.contentSize = CGSizeMake(220, 116); - self.height = 116 + CONTENT_PADDING_V_TOTAL; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel * attach = obj.attachment; - ContentLevelUpgradeModel * model = [ContentLevelUpgradeModel modelWithJSON:attach.data]; - if (attach.second == Custom_Message_Sub_User_UpGrade_Charm) { - self.imageName = @"message_content_upgrade_charm"; - self.level = [NSString stringWithFormat:YMLocalizedString(@"MessageLevelUpgradeModel0"), model.levelName]; - } else { - self.imageName = @"message_content_upgrade_expre"; - self.level = [NSString stringWithFormat:YMLocalizedString(@"MessageLevelUpgradeModel1"), model.levelName]; - } - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentLevelUpgradeView"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsAutoModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsAutoModel.h deleted file mode 100644 index 656cdc2..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsAutoModel.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// MessageMonentsAutoModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageMonentsAutoModel : MessageBaseModel -@property (nonatomic,strong) NSString *title; -@property (nonatomic,strong) NSString *time; -@property (nonatomic,strong) NSAttributedString *attributedText; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsAutoModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsAutoModel.m deleted file mode 100644 index 2eb885c..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsAutoModel.m +++ /dev/null @@ -1,46 +0,0 @@ -// -// MessageMonentsAutoModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageMonentsAutoModel.h" -#import "AttachmentModel.h" -#import "DJDKMIMOMColor.h" -#import "GuildMessageModel.h" -#import "NSObject+MJExtension.h" -@implementation MessageMonentsAutoModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel * attach = (AttachmentModel *)obj.attachment; - NSDictionary * dic = attach.data; - GuildMessageModel *model = [GuildMessageModel modelWithDictionary:dic]; - GuildMessageLayoutModel * layout = model.layout; - if (layout) { - self.title = layout.title.content; - self.time = layout.time.content; - NSMutableAttributedString *msgString = [[NSMutableAttributedString alloc] init]; - - [layout.contents enumerateObjectsUsingBlock:^(GuildMessageLayoutInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:obj.content]; - [string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:obj.fontSize] range:NSMakeRange(0, string.length)]; - [string addAttribute:NSForegroundColorAttributeName value:UIColorFromRGB(0x333333) range:NSMakeRange(0, string.length)]; - [msgString appendAttributedString:string]; - }]; - self.attributedText = msgString; - } - self.contentSize = CGSizeMake(250, 120); - self.height = (CONTENT_PADDING_V_TOTAL + 120);; - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentMonentsAutoView"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.h deleted file mode 100644 index 8caa91f..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// MessageMonentsModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN -@class MomentsInfoModel; -@interface MessageMonentsModel : MessageBaseModel -@property (nonatomic,strong) MomentsInfoModel *monentsInfo; -///图片的链接 -@property (nonatomic,strong) NSString *imageUrl; -///标题 -@property (nonatomic,strong) NSString *title; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.m deleted file mode 100644 index 4ac0279..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageMonentsModel.m +++ /dev/null @@ -1,49 +0,0 @@ -// -// MessageMonentsModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageMonentsModel.h" -#import "AttachmentModel.h" -#import "MomentsInfoModel.h" -#import "NSObject+MJExtension.h" -@implementation MessageMonentsModel -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel * attach = obj.attachment; - NSDictionary * dic = attach.data; - self.monentsInfo = [MomentsInfoModel modelWithDictionary:dic]; - self.imageUrl = dic[@"imageUrl"]; - NSString * nick = self.monentsInfo.nick; - if (nick.length > 6) { - nick = [nick substringToIndex:6]; - } - NSString * title = [NSString stringWithFormat:@"%@%@",nick, YMLocalizedString(@"MessageMonentsModel0")]; - self.title = dic[@"title"] ? dic[@"title"] : title; - self.contentSize = CGSizeMake(250, 60); - self.height = (CONTENT_PADDING_V_TOTAL + 60);; - } - return self; -} - - -- (NSDictionary *)messageTextAttibutes { - UIFont *font = [UIFont systemFontOfSize:13.f]; - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - [paragraphStyle setLineSpacing:2.5]; - return @{ - NSFontAttributeName:font, - NSParagraphStyleAttributeName: paragraphStyle - }; -} - - - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"AgentMessageTableViewCell"; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageOpenLiveModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageOpenLiveModel.h deleted file mode 100644 index e8f9063..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageOpenLiveModel.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// MessageOpenLiveModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN -@class ContentOpenLiveInfoModel; -@interface MessageOpenLiveModel : MessageBaseModel -///用户信息 -@property (nonatomic,strong) ContentOpenLiveInfoModel *userInfo; -///头像 -@property (nonatomic,strong) NSString *avatar; -///昵称 -@property (nonatomic,strong) NSString *nick; -///用户信息 -@property (nonatomic,strong) NSString *uid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageOpenLiveModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageOpenLiveModel.m deleted file mode 100644 index b4f2c64..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageOpenLiveModel.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// MessageOpenLiveModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageOpenLiveModel.h" -#import "AttachmentModel.h" -#import "ContentOpenLiveInfoModel.h" -#import "NSObject+MJExtension.h" -@implementation MessageOpenLiveModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - self.contentSize = CGSizeMake(200, 50); - self.height = (50 + CONTENT_PADDING_V_TOTAL + MESSAGE_PADDING * 2); - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel *attach = obj.attachment; - ContentOpenLiveInfoModel *info = [ContentOpenLiveInfoModel modelWithDictionary:attach.data]; - self.userInfo = info; - self.uid = info.uid; - if (info.userVo.avatar.length > 0 && info.userVo.nick.length > 0) { - self.avatar = info.userVo.avatar; - self.nick = [NSString stringWithFormat:YMLocalizedString(@"MessageOpenLiveModel0"), info.userVo.nick]; - } - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentOpenLiveView"; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessagePublicEventModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessagePublicEventModel.h deleted file mode 100644 index 448c0e7..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessagePublicEventModel.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// MessagePublicEventModel.h -// YuMi -// -// Created by P on 2025/5/13. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessagePublicEventModel : MessageBaseModel - -@property (nonatomic, copy) NSString *eventBanner; -@property (nonatomic, assign) NSInteger roomUid; -@property (nonatomic, copy) NSString *id; -@property (nonatomic, copy) NSString *eventTopic; -@property (nonatomic, copy) NSString *eventDetail; -@property (nonatomic, assign) NSInteger type; -@property (nonatomic, assign) NSInteger roomErbanNO; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessagePublicEventModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessagePublicEventModel.m deleted file mode 100644 index 2b50775..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessagePublicEventModel.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// MessagePublicEventModel.m -// YuMi -// -// Created by P on 2025/5/13. -// - -#import "MessagePublicEventModel.h" -#import "AttachmentModel.h" -@implementation MessagePublicEventModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.message = message; - self.isHiddenAvatar = NO; - self.messageType = SessionMessageType_Custom; - - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - NSDictionary *data = attachment.data; - if (data) { - MessagePublicEventModel *model = [MessagePublicEventModel modelWithJSON:data]; - self.eventBanner = model.eventBanner; - self.roomUid = model.roomUid; - self.id = model.id; - self.eventTopic = model.eventTopic; - self.eventDetail = model.eventDetail; - self.type = model.type; - self.roomErbanNO = model.roomErbanNO; - } -// CGSize maxSize = CGSizeMake(260, CGFLOAT_MAX); -// -// // 使用 NSString 的 boundingRectWithSize 方法来计算高度 -// CGRect textRect = [self.eventTopic boundingRectWithSize:maxSize -// options:NSStringDrawingUsesLineFragmentOrigin -// attributes:@{NSFontAttributeName: kFontMedium(14)} -// context:nil]; -// CGFloat bannerHeight = 86; -// CGFloat contentHeight = textRect.size.height; -// CGFloat buttonHeight = 43; -// -// self.height = bannerHeight + contentHeight + buttonHeight + 28 + 28; - - self.height = 240; - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"PublicEventTableViewCell"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRedPacketModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRedPacketModel.h deleted file mode 100644 index 5f8ab7c..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRedPacketModel.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageRedPacketModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN -@class XPReceiveRedPacketModel; -@interface MessageRedPacketModel : MessageBaseModel -@property (nonatomic,strong) XPReceiveRedPacketModel *redInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRedPacketModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRedPacketModel.m deleted file mode 100644 index d399506..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRedPacketModel.m +++ /dev/null @@ -1,32 +0,0 @@ -// -// MessageRedPacketModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageRedPacketModel.h" -#import "AttachmentModel.h" -#import "XPReceiveRedPacketModel.h" -#import "NSObject+MJExtension.h" -@implementation MessageRedPacketModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel * attach = (AttachmentModel *)obj.attachment; - XPReceiveRedPacketModel * info = [XPReceiveRedPacketModel modelWithJSON:attach.data]; - info.redEnvelopeId = attach.data[@"redEnvelopeId"]; - self.redInfo = info; - self.contentSize = CGSizeMake(260, 95); - self.height = (95 + CONTENT_PADDING_V_TOTAL); - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentRedPacketView"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRevokeModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRevokeModel.h deleted file mode 100644 index bcb06d8..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRevokeModel.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// MessageRevokeModel.h -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageRevokeModel : MessageBaseModel - -///显示的内容 -@property (nonatomic,strong) NSString *title; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRevokeModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRevokeModel.m deleted file mode 100644 index eff9cfc..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRevokeModel.m +++ /dev/null @@ -1,31 +0,0 @@ -// -// MessageRevokeModel.m -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import "MessageRevokeModel.h" - -@implementation MessageRevokeModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Revoke; - NSString * messageText = YMLocalizedString(@"MessageRevokeModel0"); - self.title = messageText; - if (messageText.length > 0) { - CGSize size = [messageText boundingRectWithSize:CGSizeMake(150, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:10]} context:nil].size; - self.contentSize = CGSizeMake(size.width + 10, 15); - self.height = 15 + CONTENT_PADDING_V_TOTAL; - self.isHiddenAvatar = YES; - } - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentRevokeView"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.h deleted file mode 100644 index 8061d03..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MessageRiskAlertModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageRiskAlertModel : MessageBaseModel - -@property (nonatomic,strong) NSAttributedString *attributedText; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.m deleted file mode 100644 index 1639597..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.m +++ /dev/null @@ -1,56 +0,0 @@ -// -// MessageRiskAlertModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageRiskAlertModel.h" - -#import "AttachmentModel.h" -#import "ContentRistAlertModel.h" -#import "NSObject+MJExtension.h" -#import "DJDKMIMOMColor.h" -#import "XPWebViewController.h" -#import "XCCurrentVCStackManager.h" -#import "YUMIHtmlUrl.h" -@implementation MessageRiskAlertModel -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel * attach = obj.attachment; - ContentRistAlertModel * model = [ContentRistAlertModel modelWithDictionary:attach.data]; - NSString * text = model.content; - if (text.length <= 0) { - text = @""; - } - - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:text attributes:[self messageTextAttibutes]]; - self.isHiddenAvatar = YES; - self.attributedText = attribute; - CGSize dstRect = CGSizeMake(CONTENT_WIDTH_MAX - MESSAGE_PADDING * 2, MAXFLOAT); - CGSize msgSize = [text boundingRectWithSize:dstRect options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine attributes:[self messageTextAttibutes] context:nil].size; - self.contentSize = CGSizeMake(msgSize.width + MESSAGE_PADDING * 2, msgSize.height + MESSAGE_PADDING * 2); - self.height = msgSize.height + MESSAGE_PADDING * 2 + CONTENT_PADDING_V_TOTAL; - } - return self; -} - - -- (NSDictionary *)messageTextAttibutes { - UIFont *font = [UIFont systemFontOfSize:13.f]; - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - [paragraphStyle setLineSpacing:2.5]; - return @{ - NSFontAttributeName:font, - NSParagraphStyleAttributeName: paragraphStyle - }; -} - - - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentRiskAlertView"; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageSkillCardModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageSkillCardModel.h deleted file mode 100644 index 37607c5..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageSkillCardModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// MessageSkillCardModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN -@class GuildMessageModel; -@interface MessageSkillCardModel : MessageBaseModel -///技能卡信息 -@property (nonatomic,strong) GuildMessageModel *guildInfo; -///文本消息 -@property (nonatomic,strong) NSAttributedString *attribute; -///文本的高度 -@property (nonatomic,assign) CGFloat textHeight; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageSkillCardModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageSkillCardModel.m deleted file mode 100644 index dbdcfc5..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageSkillCardModel.m +++ /dev/null @@ -1,68 +0,0 @@ -// -// MessageSkillCardModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageSkillCardModel.h" - -#import "AttachmentModel.h" -#import "GuildMessageModel.h" -#import "NSObject+MJExtension.h" -#import "DJDKMIMOMColor.h" -@implementation MessageSkillCardModel -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel * attach = obj.attachment; - GuildMessageModel * info = [GuildMessageModel modelWithDictionary:attach.data]; - self.guildInfo = info; - NSMutableAttributedString *attr = [[NSMutableAttributedString alloc]init]; - GuildMessageLayoutModel *layout = info.layout; - for (GuildMessageLayoutInfoModel *params in layout.contents) { - if (params.content.length > 0) { - if ([params.content containsString:@"/r/n"]) { - params.content = @"\r\n"; - } - NSMutableAttributedString *subAttr = [[NSMutableAttributedString alloc]initWithString:params.content]; - if (params.fontSize > 0) { - [subAttr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:params.fontSize weight:params.fontBold?UIFontWeightBold:UIFontWeightRegular] range:NSMakeRange(0, subAttr.length)]; - } - - if (params.fontColor.length > 0) { - [subAttr addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:params.fontColor] range:NSMakeRange(0, subAttr.length)]; - } - [attr appendAttributedString:subAttr]; - } - } - - attr.yy_lineSpacing = 5; - CGSize maxSize = CGSizeMake(CONTENT_WIDTH_MAX - MESSAGE_PADDING * 2, CGFLOAT_MAX); - YYTextLayout * contentLayout = [YYTextLayout layoutWithContainerSize:maxSize text:attr]; - self.attribute = attr; - ///顶部的距离 20 title的高度15 title到content的高度 - CGFloat contentHeight = contentLayout.textBoundingSize.height+ 20 + 15 + MESSAGE_PADDING * 4; - self.textHeight = contentLayout.textBoundingSize.height + 5; - self.height = contentHeight + CONTENT_PADDING_V_TOTAL; - } - return self; -} - -- (NSDictionary *)messageTextAttibutes:(UIFont *)font { - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - [paragraphStyle setLineSpacing:2.5]; - return @{ - NSFontAttributeName:font, - NSParagraphStyleAttributeName: paragraphStyle - }; -} - - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentSkillCardView"; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextClickModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextClickModel.h deleted file mode 100644 index 466a5da..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextClickModel.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MessageTextClickModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" -#import "ContentSecretaryModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageTextClickModel : MessageBaseModel -@property (nonatomic,strong) NSAttributedString *attributedText; -///获取的模型 -@property (nonatomic,strong) ContentSecretaryModel *contentInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextClickModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextClickModel.m deleted file mode 100644 index d26b8b0..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextClickModel.m +++ /dev/null @@ -1,67 +0,0 @@ -// -// MessageTextClickModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageTextClickModel.h" -#import "AttachmentModel.h" -@implementation MessageTextClickModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - - NSString * messageText = message.text; - if (message.messageType == NIMMessageTypeCustom) { - NIMCustomObject *obj = (NIMCustomObject *) message.messageObject; - AttachmentModel *attachment = (AttachmentModel *) obj.attachment; - if (attachment.first == CustomMessageType_Secretary) { - if (attachment.second == Custom_Message_Sub_Secretary_Router) { - messageText = attachment.data[@"msg"]; - self.contentInfo = [ContentSecretaryModel modelWithJSON:attachment.data]; - } - } else if (attachment.first == CustomMessageType_Car_Notify) { - if (attachment.second == Custom_Message_Sub_Car_OutDate) { - messageText = attachment.data[@"msg"]; - self.contentInfo = [ContentSecretaryModel modelWithJSON:attachment.data]; - self.contentInfo.routerType = SecretaryRouterType_Car; - } - } - } - if (!messageText) { -// messageText = YMLocalizedString(@"MessageContentText0"); - messageText = [NSString stringWithFormat:@"%@\n%@", - YMLocalizedString(@"MessageContentText0"), - message.rawAttachContent]; - } - CGSize dstRect = CGSizeMake(CONTENT_WIDTH_MAX - MESSAGE_PADDING * 2, MAXFLOAT); - - CGSize msgSize = [messageText boundingRectWithSize:dstRect options:NSStringDrawingUsesLineFragmentOrigin attributes:[self messageTextAttibutes] context:nil].size; - if(self.contentInfo.routerType > 0){ - msgSize = CGSizeMake(msgSize.width, msgSize.height+35); - } - self.attributedText = [[NSAttributedString alloc] initWithString:messageText attributes:[self messageTextAttibutes]]; - self.height = msgSize.height + MESSAGE_PADDING * 2 + CONTENT_PADDING_V_TOTAL; - self.contentSize = CGSizeMake(msgSize.width + MESSAGE_PADDING * 2, msgSize.height + MESSAGE_PADDING * 2); - - } - return self; -} - -- (NSDictionary *)messageTextAttibutes { - UIFont *font = [UIFont systemFontOfSize:13.f]; - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - [paragraphStyle setLineSpacing:2.5]; - return @{ - NSFontAttributeName:font, - NSParagraphStyleAttributeName: paragraphStyle - }; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentTextClickable"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextModel.h deleted file mode 100644 index 82b6410..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextModel.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MessageTextModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageTextModel : MessageBaseModel - -///富文本 -@property (nonatomic,strong) NSAttributedString *textAttribute; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextModel.m deleted file mode 100644 index 0dcd37e..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTextModel.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// MessageTextModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageTextModel.h" -#import "QEmotionHelper.h" -#import "AttachmentModel.h" - -@implementation MessageTextModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Text; - NSString * messageText = message.text; - if (!messageText) { - if (message.messageType == NIMMessageTypeCustom) { - NIMCustomObject *obj = (NIMCustomObject *) message.messageObject; - AttachmentModel *attachment = (AttachmentModel *) obj.attachment; - if (attachment.first == CustomMessageType_Car_Notify) { - if (attachment.second == Custom_Message_Sub_Car_OutDate) { - messageText = attachment.data[@"msg"]; - } - } - } - } - if (!messageText) { -// messageText = YMLocalizedString(@"MessageContentText0"); - messageText = [NSString stringWithFormat:@"%@\n%@", - YMLocalizedString(@"MessageContentText0"), - message.rawAttachContent]; - } - CGSize dstRect = CGSizeMake(CONTENT_WIDTH_MAX - MESSAGE_PADDING * 2, MAXFLOAT); - QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper]; - NSMutableAttributedString * attribute = [faceManager attributedStringByText:messageText font:[UIFont systemFontOfSize:13] forMessageBubble:YES]; - self.textAttribute = attribute; - YYTextContainer *container = [YYTextContainer containerWithSize:dstRect]; - container.maximumNumberOfRows = 0; - YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:attribute]; - CGFloat rowHeight = layout.textBoundingSize.height; - self.contentSize = CGSizeMake(layout.textBoundingSize.width + MESSAGE_PADDING* 2, layout.textBoundingSize.height + MESSAGE_PADDING * 2); - self.height = rowHeight + MESSAGE_PADDING * 2 + CONTENT_PADDING_V_TOTAL; - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentText"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTimeModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTimeModel.h deleted file mode 100644 index cf0981a..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTimeModel.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MessageTimeModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageTimeModel : MessageBaseModel -///时间 -@property (nonatomic,strong) NSString *time; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTimeModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTimeModel.m deleted file mode 100644 index 40914d2..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTimeModel.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// MessageTimeModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageTimeModel.h" - -@implementation MessageTimeModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Time; - self.contentSize = CGSizeMake(200, 20); - self.height = 20 + CONTENT_PADDING_V_TOTAL; - self.isHiddenAvatar = YES; - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageTimeView"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTipsModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTipsModel.h deleted file mode 100644 index 7905df8..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTipsModel.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MessageTipsModel.h -// YUMI -// -// Created by YUMI on 2023/2/1. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageTipsModel : MessageBaseModel - -@end - -NS_ASSUME_NONNULL_END - diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTipsModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTipsModel.m deleted file mode 100644 index 0b1a5bf..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTipsModel.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// MessageTipsModel.m -// YUMI -// -// Created by YUMI on 2023/2/1. -// - -#import "MessageTipsModel.h" - -@implementation MessageTipsModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Tips; - self.contentSize = CGSizeMake(200, 20); - self.height = 20 + CONTENT_PADDING_V_TOTAL; - self.isHiddenAvatar = YES; - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageTipsView"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTweetModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTweetModel.h deleted file mode 100644 index 0e68259..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTweetModel.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageTweetModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN -@class ContentTweetModel; -@interface MessageTweetModel : MessageBaseModel -@property (nonatomic,strong) ContentTweetModel *tweetInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTweetModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTweetModel.m deleted file mode 100644 index 2604085..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageTweetModel.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// MessageTweetModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageTweetModel.h" -#import "AttachmentModel.h" -#import "ContentTweetModel.h" -#import "NSObject+MJExtension.h" -@implementation MessageTweetModel - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel * attach = (AttachmentModel *)obj.attachment; - ContentTweetModel * model = [ContentTweetModel modelWithJSON:attach.data]; - self.tweetInfo = model; - - CGFloat oneHeight = [YMLocalizedString(@"MessageTweetModel0") boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin - attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:16]] context:nil].size.height + 2.5; - - CGFloat titleHeight = [model.title boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin - attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:16]] context:nil].size.height; - if (titleHeight <= oneHeight * 2) { - titleHeight = titleHeight + 5; - } else { - titleHeight = oneHeight * 2; - } - CGFloat desHeight = [model.desc boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin - attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:13]] context:nil].size.height; - self.height = titleHeight + desHeight + 85 + 20 + 1 + 35 + MESSAGE_PADDING * 2 + CONTENT_PADDING_V_TOTAL; - } - return self; -} - -- (NSDictionary *)messageTextAttibutes:(UIFont *)font { - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - [paragraphStyle setLineSpacing:2.5]; - return @{ - NSFontAttributeName:font, - NSParagraphStyleAttributeName: paragraphStyle - }; -} - - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentTweetView"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageUnSupportModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageUnSupportModel.h deleted file mode 100644 index ca95a7a..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageUnSupportModel.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MessageUnSupportModel.h -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MessageUnSupportModel : MessageBaseModel - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageUnSupportModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageUnSupportModel.m deleted file mode 100644 index b748c37..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageUnSupportModel.m +++ /dev/null @@ -1,30 +0,0 @@ -// -// MessageUnSupportModel.m -// YUMI -// -// Created by YUMI on 2023/1/30. -// - -#import "MessageUnSupportModel.h" - -@implementation MessageUnSupportModel - - -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Time; - NSString * messageText = YMLocalizedString(@"MessageUnSupportModel0"); - if (messageText.length > 0) { - CGSize size = [messageText boundingRectWithSize:CGSizeMake(150, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13]} context:nil].size; - self.contentSize = CGSizeMake(size.width + MESSAGE_PADDING* 2, size.height + MESSAGE_PADDING * 2); - self.height = size.height + MESSAGE_PADDING * 2 + CONTENT_PADDING_V_TOTAL; - } - } - return self; -} - -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"MessageContentUnSupportView"; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/PIMessageContentServiceReplyModel.h b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/PIMessageContentServiceReplyModel.h deleted file mode 100644 index 88addc4..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/PIMessageContentServiceReplyModel.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PIMessageContentServiceReplyModel.h -// YuMi -// -// Created by duoban on 2023/9/12. -// -#import "MessageBaseModel.h" -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIMessageContentServiceReplyModel : MessageBaseModel - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/PIMessageContentServiceReplyModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/PIMessageContentServiceReplyModel.m deleted file mode 100644 index 992ed9e..0000000 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/PIMessageContentServiceReplyModel.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// PIMessageContentServiceReplyModel.m -// YuMi -// -// Created by duoban on 2023/9/12. -// - -#import "PIMessageContentServiceReplyModel.h" - -@implementation PIMessageContentServiceReplyModel -- (instancetype)initWithMessage:(NIMMessage *)message { - if (self = [super initWithMessage:message]) { - self.messageType = SessionMessageType_Custom; - self.contentSize = CGSizeMake(278, 276); - self.height = 276; - - - } - return self; -} -- (NSString *)cellContent:(MessageBaseModel *)model { - return @"PIMessageContentServiceReplyView"; -} -@end diff --git a/YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.h b/YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.h deleted file mode 100644 index e5780ca..0000000 --- a/YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// SessionInfoViewController.h -// YUMI -// -// Created by YUMI on 2022/4/25. -// - -#import "BaseViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel; -@interface SessionInfoViewController : BaseViewController -///回话 -@property (nonatomic,strong) NIMSession *session; -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -///置顶回话 -@property (nonatomic,strong) NSMutableDictionary *stickTopMessages; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.m b/YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.m deleted file mode 100644 index bced132..0000000 --- a/YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.m +++ /dev/null @@ -1,246 +0,0 @@ -// -// SessionInfoViewController.m -// YUMI -// -// Created by YUMI on 2022/4/25. -// - -#import "SessionInfoViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "TTPopup.h" -#import "YUMIHtmlUrl.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -#import "NSMutableDictionary+Saft.h" -#import "ClientConfig.h" -#import "XNDJTDDLoadingTool.h" -///Model -#import "SessionSettingModel.h" -#import "UserInfoModel.h" -///View -#import "SessionSettingTableViewCell.h" -#import "SessionSettingUserView.h" -#import "XPWebViewController.h" -#import "XPMineUserInfoViewController.h" - - -@interface SessionInfoViewController () -///头部试图 -@property (nonatomic,strong) SessionSettingUserView *headerView; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据 -@property (nonatomic,strong) NSArray *datasource; -@end - -@implementation SessionInfoViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"SessionInfoViewController0"); - [self.view addSubview:self.tableView]; - self.tableView.tableHeaderView = self.headerView; - self.headerView.userInfo = self.userInfo; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(15); - make.top.mas_equalTo(self.view).offset(12); - make.height.mas_equalTo(50 * 3 + 70); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 50; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - SessionSettingTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([SessionSettingTableViewCell class])]; - if (cell == nil) { - cell = [[SessionSettingTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([SessionSettingTableViewCell class])]; - } - SessionSettingModel * model= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.chatItem = model; - cell.delegate = self; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - SessionSettingModel * model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (model.settingType == SessionSettingType_report) { - XPWebViewController *webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = [NSString stringWithFormat:@"%@?reportUid=%ld&source=CHAT", - URLWithType(kReportRoomURL), - self.userInfo.uid]; - [self.navigationController pushViewController:webVC animated:YES]; - } - } -} - -#pragma mark - SessionSettingTableViewCellDelegate -- (void)sessionSettingTableViewCell:(SessionSettingModel *)item switchState:(UISwitch *)switchOn { - NSString * userId = [NSString stringWithFormat:@"%ld",self.userInfo.uid]; - if (item.settingType == SessionSettingType_Top) { - if (switchOn.on) { - NIMAddStickTopSessionParams * params = [[NIMAddStickTopSessionParams alloc] initWithSession:self.session]; - [[NIMSDK sharedSDK].chatExtendManager addStickTopSession:params completion:^(NSError * _Nullable error, NIMStickTopSessionInfo * _Nullable newInfo) { - if (error == nil) { - [self.stickTopMessages safeSetObject:newInfo forKey:self.session]; - } - }]; - } else { - NIMStickTopSessionInfo * topInfo; - NIMSession * topSession; - for (int i = 0; i < self.stickTopMessages.allKeys.count; i++) { - NIMSession * session = [self.stickTopMessages.allKeys xpSafeObjectAtIndex:i]; - if (session.sessionId == self.session.sessionId) { - topSession = session; - break; - } - } - if (topSession) { - topInfo = [self.stickTopMessages objectForKey:topSession]; - } - if (topInfo) { - [[NIMSDK sharedSDK].chatExtendManager removeStickTopSession:topInfo completion:^(NSError * _Nullable error, NIMStickTopSessionInfo * _Nullable removedInfo) { - if (error == nil) { - [self.stickTopMessages removeObjectForKey:topSession]; - } - }]; - } - } - } else if (item.settingType == SessionSettingType_black) { - NSString *title = nil; - NSString *message = nil; - if (switchOn.on) { - title = YMLocalizedString(@"SessionInfoViewController2"); - message = YMLocalizedString(@"SessionInfoViewController3"); - } else { - title = YMLocalizedString(@"SessionInfoViewController4"); - message = YMLocalizedString(@"SessionInfoViewController5"); - } - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = title; - config.message = message; - [TTPopup alertWithConfig:config confirmHandler:^{ - if (!switchOn.on) { - [[NIMSDK sharedSDK].userManager removeFromBlackBlackList:userId completion:^(NSError * _Nullable error) { - if (error == nil) { - [self showErrorToast:YMLocalizedString(@"SessionInfoViewController6")]; - item.state = NO; - [self.tableView reloadData]; - } else { - [self showErrorToast:error.description]; - } - - }]; - } else { - [[NIMSDK sharedSDK].userManager addToBlackList:userId completion:^(NSError * _Nullable error) { - if (error == nil) { - [self showErrorToast:YMLocalizedString(@"SessionInfoViewController7")]; - item.state = YES; - [self.tableView reloadData]; - } else { - [self showErrorToast:error.description]; - } - }]; - } - } cancelHandler:^{ - - }]; - } -} - - -#pragma mark - Event Response -- (void)didTapUserRecognizer { - XPMineUserInfoViewController * mineVC = [[XPMineUserInfoViewController alloc] init]; - mineVC.uid = self.userInfo.uid; - [self.navigationController pushViewController:mineVC animated:YES]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor whiteColor]; - _tableView.layer.masksToBounds = YES; - _tableView.layer.cornerRadius = 8; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[SessionSettingTableViewCell class] forCellReuseIdentifier:NSStringFromClass([SessionSettingTableViewCell class])]; - } - return _tableView; -} - -- (SessionSettingUserView *)headerView { - if (!_headerView) { - _headerView = [[SessionSettingUserView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 70)]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapUserRecognizer)]; - [_headerView addGestureRecognizer:tap]; - } - return _headerView; -} - -- (NSArray *)datasource { - if (!_datasource) { - SessionSettingModel * topModel = [[SessionSettingModel alloc] init]; - topModel.title = YMLocalizedString(@"SessionInfoViewController8"); - topModel.settingType = SessionSettingType_Top; - NIMSession * topSession; - for (int i = 0; i < self.stickTopMessages.allKeys.count; i++) { - NIMSession * session = [self.stickTopMessages.allKeys xpSafeObjectAtIndex:i]; - if (session.sessionId == self.session.sessionId) { - topSession = session; - break; - } - } - if (topSession && topSession.sessionId.length > 0) { - topModel.state = YES; - } else { - topModel.state = NO; - } - - - NSString * uid = [NSString stringWithFormat:@"%ld", self.userInfo.uid]; - BOOL isBlack = [[NIMSDK sharedSDK].userManager isUserInBlackList:uid]; - - SessionSettingModel * blackModel = [[SessionSettingModel alloc] init]; - blackModel.title = YMLocalizedString(@"SessionInfoViewController9"); - blackModel.state = isBlack; - blackModel.settingType = SessionSettingType_black; - - SessionSettingModel * reportModel = [[SessionSettingModel alloc] init]; - reportModel.title = YMLocalizedString(@"SessionInfoViewController10"); - reportModel.settingType = SessionSettingType_report; - - _datasource = @[topModel, blackModel, reportModel]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/SessionRiskCache.h b/YuMi/Modules/YMMessage/View/Session/SessionRiskCache.h deleted file mode 100644 index 0c6325e..0000000 --- a/YuMi/Modules/YMMessage/View/Session/SessionRiskCache.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// SessionRiskCache.h -// YUMI -// -// Created by YUMI on 2022/8/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface SessionRiskCache : NSObject - -+ (instancetype)shareCache; - -- (void)saveCloseRisk:(NSString *)userId; - -- (NSString *)getCloseChatRiskAlert:(NSString *)userid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/SessionRiskCache.m b/YuMi/Modules/YMMessage/View/Session/SessionRiskCache.m deleted file mode 100644 index 56f1927..0000000 --- a/YuMi/Modules/YMMessage/View/Session/SessionRiskCache.m +++ /dev/null @@ -1,50 +0,0 @@ -// -// SessionRiskCache.m -// YUMI -// -// Created by YUMI on 2022/8/11. -// - -#import "SessionRiskCache.h" -#import "AccountInfoStorage.h" -static SessionRiskCache * cache = nil; - - -@interface SessionRiskCache () -/// -@property (nonatomic,strong) NSCache *cache; -@end - -@implementation SessionRiskCache - -+ (instancetype)shareCache { - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - cache = [[SessionRiskCache alloc] init]; - }); - return cache; -} - -- (void)saveCloseRisk:(NSString *)userId { - if (userId.length > 0) { - [self.cache setObject:userId forKey:userId]; - } -} - -- (NSString *)getCloseChatRiskAlert:(NSString *)userid { - if (userid) { - return [self.cache objectForKey:userid]; - } - return nil; -} - - -- (NSCache *)cache { - if (!_cache) { - _cache = [[NSCache alloc]init]; - _cache.countLimit = 500; - } - return _cache; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/SessionViewController.h b/YuMi/Modules/YMMessage/View/Session/SessionViewController.h deleted file mode 100644 index 3d44e1c..0000000 --- a/YuMi/Modules/YMMessage/View/Session/SessionViewController.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// SessionViewController.h -// YUMI -// -// Created by zu on 2021/11/28. -// - -#import "MvpViewController.h" -#import "SessionListViewController.h" -#import -@class UserInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface SessionViewController : MvpViewController -/// integer($int64)当 hallBtnStatus=6 时，对应的申请记录Id -@property (nonatomic,assign) NSInteger recordId; -///integer($int64)当 hallBtnStatus=6 时，对应的申请记录Id,用户申请 -@property (nonatomic,assign) BOOL isUser; -///是否需要关注用户 -@property(nonatomic,assign) BOOL isAttention; -- (instancetype)initWithSession:(NIMSession *)session; -@property (nonatomic, assign) SessionListOpenType openType; -///置顶回话 -@property (nonatomic,strong) NSMutableDictionary *stickTopMessages; - -@property (nonatomic, strong) UserInfoModel *userInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/SessionViewController.m b/YuMi/Modules/YMMessage/View/Session/SessionViewController.m deleted file mode 100644 index 736ed1f..0000000 --- a/YuMi/Modules/YMMessage/View/Session/SessionViewController.m +++ /dev/null @@ -1,1466 +0,0 @@ -// -// SessionViewController.m -// YUMI -// -// Created by zu on 2021/11/28. -// - -#import "SessionViewController.h" -#import -#import -#import -#import -#import -///Tool -#import "XCCurrentVCStackManager.h" -#import "NIMMessageMaker.h" -#import "YUMIMacroUitls.h" -#import "UITableView+NIMScrollToBottom.h" -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -#import "QEmotionHelper.h" -#import "QKeyboardManager.h" -#import "YYUtility.h" -#import "TTPopup.h" -#import "AccountInfoStorage.h" -#import "NSDate+DateUtils.h" -#import "PLTimeUtil.h" -#import "NIMMessageUtils.h" -#import "ClientConfig.h" -///Model -#import "RoomInfoModel.h" -#import "UserInfoModel.h" -#import "MessageMenuModel.h" -#import "SessionRiskCache.h" -#import "QPhotoImageModel.h" -#import "AttachmentModel.h" -#import "MessageBaseModel.h" -#import "MessageTextModel.h" -#import "MessageAudioModel.h" -#import "MessageTimeModel.h" -#import "MessageImageModel.h" -#import "MessageUnSupportModel.h" -#import "MessageGiftModel.h" -#import "PIMessageContentServiceReplyModel.h" -#import "MessageTextClickModel.h" -#import "MessageGuildModel.h" -#import "MessageOpenLiveModel.h" -#import "MessageRedPacketModel.h" -#import "MessageMonentsAutoModel.h" -#import "MessageMonentsModel.h" -#import "MessageRiskAlertModel.h" -#import "MessageFindNewGreetModel.h" -#import "MessageSkillCardModel.h" -#import "MessageTweetModel.h" -#import "MessageLevelUpgradeModel.h" -#import "MessageRevokeModel.h" -#import "MessageTipsModel.h" -#import "MessageCPNotifyModel.h" -#import "MessagePublicEventModel.h" -///View -#import "XPMineUserInfoViewController.h" -#import "XPWebViewController.h" -#import "XPRoomViewController.h" -#import "RoomHostDelegate.h" -#import "MessageCell.h" -#import "SessionChatLimitView.h" -#import "XPSendGiftView.h" -#import "SessionNavView.h" -#import "SessionInfoViewController.h" -#import "SessionRiskView.h" -#import "QInputBarView.h" -#import "QKeyboardManager.h" -#import "QEmotionBoardView.h" -#import "QinputPhotoView.h" -#import "SessionUserInfoTableViewCell.h" -///P -#import "MessagePresenter.h" -#import "MessageProtocol.h" -#import "Api+Message.h" -#import "MessageGameOrderModel.h" -#import "VIPCenterViewController.h" -#import "XPSkillCardPlayerManager.h" -#import "AgentMessageModel.h" -#import "XPMineUserInfoPresenter.h" - -@interface CheckLimitModel :PIBaseModel -@property (nonatomic, assign) BOOL chat; -@property (nonatomic, copy) NSString *message; -@property (nonatomic, assign) NSInteger wealthLevel; -@property (nonatomic, assign) NSInteger charmLevel; -@property (nonatomic, strong) NSNumber *nextVipLevel; -@property (nonatomic, strong) NSNumber *nextUserCountLimit; -@end - -@implementation CheckLimitModel - -@end - -@interface SessionViewController () - -@property (nonatomic, strong) NIMSession * session; -@property (nonatomic, strong) NSMutableArray * messages; -///导航栏 -@property (nonatomic,strong) SessionNavView *sessionNavView; -@property (nonatomic, strong) UITableView * sessionTableView; - -@property (nonatomic, strong) UserInfoModel *detailUserInfo; -///最后的一条消息 -@property (nonatomic,strong) NIMMessage *lastMessage; -///私聊风险提示 -@property (nonatomic,strong) SessionRiskView *riskAlertView; -@property(nonatomic,strong)QInputBarView *inputBarView; -@property(nonatomic,strong)QKeyboardManager *keyboardManager; -///相册 -@property (nonatomic,strong) QinputPhotoView *photoView; -/// -@property (nonatomic,strong) NSArray *phototArray; -@end - -@implementation SessionViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)dealloc { - [[NIMSDK sharedSDK].chatManager removeDelegate:self]; - [[NIMSDK sharedSDK].conversationManager removeDelegate:self]; - [[NIMSDK sharedSDK].mediaManager removeDelegate:self]; - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (MessagePresenter *)createPresenter { - return [[MessagePresenter alloc] init]; -} - -- (instancetype)initWithSession:(NIMSession *)session { - self = [super init]; - if (self) { - _session = session; - } - return self; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initViews]; - [self initLayout]; - [IQKeyboardManager sharedManager].enable = NO; - [IQKeyboardManager sharedManager].enableAutoToolbar = NO; - [self initHeaderAndFooterRrfresh]; - [[NIMSDK sharedSDK].chatManager addDelegate:self]; - [[NIMSDK sharedSDK].conversationManager addDelegate:self]; - [self.presenter getUserInfoWithUid:[AccountInfoStorage instance].getUid]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - if (![NIMMessageUtils isOfficalAccount:self.session.sessionId]) { - [self.presenter getFansLike:self.session.sessionId]; - if (!self.userInfo) { - [self.presenter getUserInfoWithUid:self.session.sessionId]; - } - } -} - -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.sessionTableView.mj_header = header; - [self headerRefresh]; - [self initData]; -} - -- (void)headerRefresh { - @kWeakify(self); - if (self.messages.count > 0) { - MessageBaseModel * model = self.messages.firstObject; - [[[NIMSDK sharedSDK] conversationManager] messagesInSession:self.session message:model.message limit:20 completion:^(NSError * _Nullable error, NSArray * _Nullable messages) { - @kStrongify(self); - [self.sessionTableView.mj_header endRefreshing]; - if (error == nil && messages.count > 0) { - for (int i = ((int)messages.count -1); i >= 0; i--) { - NIMMessage * message = [messages xpSafeObjectAtIndex:i]; - MessageBaseModel * model = [self modeTransformMessage:message]; - [self.messages insertObject:model atIndex:0]; - if ((i -1) > 0) { - NIMMessage * message1 = [messages xpSafeObjectAtIndex:i -1]; - CGFloat dur = message.timestamp - message1.timestamp; - if (dur / 60 > 5) { - MessageBaseModel * timeModel = [self createTimeMessage:message]; - [self.messages insertObject:timeModel atIndex:0]; - } - } - } - } - [self.sessionTableView reloadData]; - }]; - } else { - [[[NIMSDK sharedSDK] conversationManager] messagesInSession:self.session message:nil limit:20 completion:^(NSError * _Nullable error, NSArray * _Nullable messages) { - @kStrongify(self); - NIMMessage * firstmessage = nil; - [self.sessionTableView.mj_header endRefreshing]; - if (error == nil) { - for (int i = 0; i < messages.count; i++) { - NIMMessage * message = [messages xpSafeObjectAtIndex:i]; - if (!firstmessage) { - firstmessage = message; - } - MessageBaseModel * model = [self modeTransformMessage:message]; - if ((i + 1) < messages.count) { - NIMMessage * message1 = [messages xpSafeObjectAtIndex:i + 1]; - CGFloat dur = message1.timestamp - message.timestamp; - if (dur / 60 > 5) { - MessageBaseModel * timeModel = [self createTimeMessage:message]; - [self.messages addObject:timeModel]; - } - } - [self.messages addObject:model]; - } - } - [self.sessionTableView reloadData]; - [self.sessionTableView nim_scrollToBottom:YES]; - }]; - } -} - -#pragma mark - 提前加载相册中的图片 -- (void)loadAlbumPhotos { - [YYUtility checkAssetsLibrayAvailable:^{ } denied:^{ } restriction:^{ }]; -} - -#pragma mark - cell的样式 -- (MessageBaseModel *)modeTransformMessage:(NIMMessage *)message { - MessageBaseModel * model; -//#if DEBUG -// model = [[MessagePublicEventModel alloc] initWithMessage:message]; -// return model; -//#endif - switch (message.messageType) { - case NIMMessageTypeText: - model = [[MessageTextModel alloc] initWithMessage:message]; - break; - case NIMMessageTypeAudio: - model = [[MessageAudioModel alloc] initWithMessage:message]; - break; - case NIMMessageTypeImage: - model = [[MessageImageModel alloc] initWithMessage:message]; - break; - case NIMMessageTypeTip: - model = [[MessageTipsModel alloc] initWithMessage:message]; - break; - case NIMMessageTypeCustom: - model = [self modelTransformCustomMessage:message]; - break; - default: - model = [[MessageUnSupportModel alloc] initWithMessage:message]; - break; - } - return model; -} - -- (MessageBaseModel *)modelTransformCustomMessage:(NIMMessage *)message { - MessageBaseModel * model; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - - NSInteger first = attachment.first; - NSInteger second = attachment.second; - - switch (first) { - case CustomMessageType_Public_Event: - if (second == Custom_Message_Sub_Public_Event_message) { - model = [[MessagePublicEventModel alloc] initWithMessage:message]; - } - break; - case CustomMessageType_CP_message: - if (second == Custom_Message_Sub_CP_message_request || second == Custom_Message_Sub_CP_message_result) { - model = [[MessageCPNotifyModel alloc] initWithMessage:message]; - } - break; - case CustomMessageType_Gift: - if (second == Custom_Message_Sub_Gift_Send) { - model = [[MessageGiftModel alloc] initWithMessage:message]; - } - break; - case CustomMessageType_Secretary: - model = [[MessageTextClickModel alloc] initWithMessage:message]; - break; - case CustomMessageType_Hall: - case CustomMessageType_New_Hall: - model = [[MessageGuildModel alloc] initWithMessage:message]; - break; - case CustomMessageType_Member_Online: - if (second == Custom_Message_Type_Attention_Member_Online) { - model = [[MessageOpenLiveModel alloc] initWithMessage:message]; - } - break; - case CustomMessageType_Application_Share: - if (second == Custom_Message_Sub_Application_Share_Room) { - model = [[MessageOpenLiveModel alloc] initWithMessage:message]; - } - break; - case CustomMessageType_User_UpGrade: - if (second == Custom_Message_Sub_User_UpGrade_Charm || - second == Custom_Message_Sub_User_UpGrade_Exper) { - model = [[MessageLevelUpgradeModel alloc] initWithMessage:message]; - } - break; - case CustomMessageType_Tweet: - if (second == Custom_Message_Sub_Tweet_News) { - model = [[MessageTweetModel alloc] initWithMessage:message]; - } - break; - case CustomMessageType_Skill_Card: - model = [[MessageSkillCardModel alloc] initWithMessage:message]; - break; - case CustomMessageType_FindNew: - model = [[MessageFindNewGreetModel alloc] initWithMessage:message]; - break; - case CustomMessageType_Chat_Risk_Alert: - model = [[MessageRiskAlertModel alloc] initWithMessage:message]; - break; - case CustomMessageType_Monents: - if (second == Custom_Message_Sub_Monents_Share) { - model = [[MessageMonentsModel alloc] initWithMessage:message]; - } else if (second == Custom_Message_Sub_Monents_Approved || - second == Custom_Message_Sub_Monents_Ban_Delete) { - model = [[MessageMonentsAutoModel alloc] initWithMessage:message]; - } - break; - case CustomMessageType_Message_Handle: - if (second == Custom_Message_Sub_Message_Handle_Content) { - model = [[MessageMonentsAutoModel alloc] initWithMessage:message]; - } - break; - case CustomMessageType_RedPacket: - if (second == Custom_Message_Sub_AllDiamandRedPacket) { - model = [[MessageRedPacketModel alloc] initWithMessage:message]; - } - break; - case CustomMessageType_Service_Reply: - model = [[PIMessageContentServiceReplyModel alloc] initWithMessage:message]; - break; - case CustomMessageType_Game_Order: - if (second == Custom_Message_Sub_Game_order) { - model = [[MessageGameOrderModel alloc] initWithMessage:message]; - } - break; - case CustomMessageType_Car_Notify: - if (second == Custom_Message_Sub_Car_OutDate) { - model = [[MessageTextClickModel alloc] initWithMessage:message]; - } - break; - default: - model = [[MessageUnSupportModel alloc] initWithMessage:message]; - break; - } - - if (model == nil) { - model = [[MessageUnSupportModel alloc] initWithMessage:message]; - } - - return model; -} - -- (UINavigationController *)getKeyWindowNav { - if ([XCCurrentVCStackManager shareManager].getCurrentVC) { - return [XCCurrentVCStackManager shareManager].getCurrentVC.navigationController; - } - return self.navigationController; -} - -- (MessageBaseModel *)createTimeMessage:(NIMMessage *)message { - MessageTimeModel * timeModel = [[MessageTimeModel alloc] initWithMessage:message]; - timeModel.time = [self timestrToTimeSecond:[NSString stringWithFormat:@"%f", message.timestamp]]; - return timeModel; -} - -- (NSString *)timestrToTimeSecond:(NSString *)timeStr {//timestr 豪秒 - NSTimeInterval interval = [timeStr doubleValue]; - NSDate *date = [NSDate dateWithTimeIntervalSince1970:interval]; - return [NSDate stringFromDate:date]; -} - -- (void)addTimeMessage:(NIMMessage *)message { - if (self.messages.count > 0) { - NIMMessage * lastMessage = self.messages.lastObject.message; - CGFloat dur = message.timestamp - lastMessage.timestamp; - if (dur / 60 > 5) { - NIMMessage * newMessage = [[NIMMessage alloc] init]; - newMessage.timestamp = message.timestamp; - [newMessage setValue:self.session forKey:@"session"]; - MessageBaseModel * timeModel = [self createTimeMessage:newMessage]; - [self.messages addObject:timeModel]; - } - } -} - -- (void)addRevokeMessage:(NIMMessage *)message title:(NSString *)title { - NIMMessage * revokeMessage = [[NIMMessage alloc] init]; - [revokeMessage setValue:self.session forKey:@"session"]; - [revokeMessage setValue:@(NIMMessageTypeTip) forKey:@"messageType"]; - revokeMessage.timestamp = [PLTimeUtil getNowTimeTimestampMillisecond].longLongValue; - revokeMessage.text = title; - [[NIMSDK sharedSDK].conversationManager saveMessage:revokeMessage forSession:self.session completion:nil]; -} - -#pragma mark - Private Method - -- (void)initInputView { - // 初始化输入工具条，frame可以先这样临时设置，下面的addBottomInputBarView方法会重置输入条frame - // 如果你想要自定义输入条View，请参考TextFieldViewController代码 - QInputBarViewConfiguration *inputBarViewConfiguration = [QInputBarViewConfiguration defaultInputBarViewConfiguration]; - inputBarViewConfiguration.voiceButtonHidden = NO;//隐藏语音按钮 - inputBarViewConfiguration.extendButtonHidden = YES;//隐藏拓展按钮 - inputBarViewConfiguration.toolHidden = NO; - inputBarViewConfiguration.giftButtonHidden = NO; - inputBarViewConfiguration.cameraButtonHidden = NO; - inputBarViewConfiguration.photoButtonHidden = NO; - - _inputBarView = [[QInputBarView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,inputBarViewConfiguration.inputViewHeight)]; - - [_inputBarView setupWithConfiguration:inputBarViewConfiguration]; - _inputBarView.delegate = self; - - //keyboard管理类，用来管理键盘，各大面板的切换 - _keyboardManager = [[QKeyboardManager alloc] initWithViewController:self]; - _keyboardManager.dataSource = self; - //因为addBottomInputBarView方法会立刻触发delegate，所以这里需要先设置delegate - _keyboardManager.delegate = self; - [_keyboardManager addBottomInputBarView:_inputBarView belowViewController:NO]; - - //把输入框（如果有的话）绑定给管理类 - [_keyboardManager bindTextView:_inputBarView.inputTextView]; -} - - -- (void)initViews { - self.sessionNavView.isInRoom = self.openType == SessionListOpenTypeRoom; - [self.view addSubview:self.sessionNavView]; - [self.view addSubview:self.sessionTableView]; - [self initInputView]; -} - -- (void)initLayout { - [self.sessionNavView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(self.openType == SessionListOpenTypeRoom ? 44 : kNavigationHeight); - make.leading.top.trailing.mas_equalTo(self.view); - }]; -} - -- (void)viewDidLayoutSubviews{ - if (self.openType == SessionListOpenTypeRoom) { - self.view.frame = CGRectMake(0, 0, KScreenWidth, kHalfScreenHeight); - } -} - -- (void)initData { - NIMUser * user = [[NIMSDK sharedSDK].userManager userInfo:self.session.sessionId]; - if (user) { - self.sessionNavView.title = user.userInfo.nickName; - } else { - self.sessionNavView.title = YMLocalizedString(@"XNDJTDDLoadingTool0"); - } - [[NIMSDK sharedSDK].conversationManager markAllMessagesReadInSession:self.session]; - [self.presenter getChatLimitReceiverUid:self.session.sessionId]; - if (![[[ClientConfig shareConfig].configInfo officialAccountUids] containsObject:user.userId]) { - [self.presenter getUserInfo:self.session.sessionId]; - } -} - -- (BOOL)isExistMessages:(NIMMessage *)message{ - BOOL isExist = NO; - NIMMessage * model; - for (NIMMessage *item in self.messages.reverseObjectEnumerator.allObjects) { - if ([item isKindOfClass:[NIMMessage class]] && [item.messageId isEqualToString:message.messageId]) { - model = item; - isExist = YES; - break; - } - } - if (model) { - model = message; - } - return isExist; -} - -- (BOOL)showChatRiskView:(UserInfoModel *)userInfo { - if (userInfo.banAccount) { - return YES; - } - - NSString * cacheUid = [[SessionRiskCache shareCache] getCloseChatRiskAlert:self.session.sessionId]; - - if (cacheUid && [cacheUid isEqualToString:self.session.sessionId]) { - return NO; - } - - if ([[NIMSDK sharedSDK].userManager isMyFriend:self.session.sessionId]) { - return NO; - } - - return YES; -} - -#pragma mark - MessageProtocol -- (void)onGetLimitChat:(ChatLimitModel *)chatLimit { - BOOL chatDisabled = !chatLimit.chat && self.messages.count <= 0; - if (chatDisabled) { - SessionChatLimitView *chatLimitView = [[SessionChatLimitView alloc] initWithChatLimit:chatLimit]; - self.sessionTableView.tableHeaderView = chatLimitView; - } else { - self.sessionTableView.tableHeaderView = nil; - } - self.inputBarView.userInteractionEnabled = !chatDisabled; - if (chatDisabled) { - self.inputBarView.inputTextView.placeholder = YMLocalizedString(@"SessionViewController1"); - } else { - self.inputBarView.inputTextView.placeholder = YMLocalizedString(@"SessionViewController2"); - } -} - -///获取用户信息成功 -- (void)onGetSessionUserInfoSuccess:(UserInfoModel *)userInfo { -// _userInfo = userInfo; - self.sessionNavView.userInfo = userInfo; - if (userInfo.roomUid && self.openType == SessionListOpenTypeDefault) { - if ([self showChatRiskView:userInfo]) { - self.riskAlertView.warning = userInfo.banAccount ? YMLocalizedString(@"SessionViewController17") : YMLocalizedString(@"SessionViewController18"); - if (!self.riskAlertView.superview) { - [self.view addSubview:self.riskAlertView]; - [self.riskAlertView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.sessionNavView.mas_bottom); - make.height.mas_equalTo(30); - }]; - } - [self.sessionTableView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.sessionNavView.mas_bottom).mas_offset(30); - }]; - } else { - [self.sessionTableView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.sessionNavView.mas_bottom).mas_offset(0); - }]; - } - } else { - if ([self showChatRiskView:userInfo]) { - self.riskAlertView.warning = userInfo.banAccount ? YMLocalizedString(@"SessionViewController17") : YMLocalizedString(@"SessionViewController18"); - if (!self.riskAlertView.superview) { - [self.view addSubview:self.riskAlertView]; - [self.riskAlertView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.sessionNavView.mas_bottom); - make.height.mas_equalTo(30); - }]; - } - [self.sessionTableView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.sessionNavView.mas_bottom).mas_offset(30); - }]; - } else { - [self.sessionTableView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.sessionNavView.mas_bottom).mas_offset(0); - }]; - } - } -} - -- (void)onGetUserFailure:(NSInteger)code { - if (code == 3009) { - if (self.openType == SessionListOpenTypeRoom) { - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromLeft; - [self.view.superview.layer addAnimation:transition forKey:nil]; - [self willMoveToParentViewController:nil]; //1 - [self.view removeFromSuperview]; //2 - [self removeFromParentViewController]; //3 - return; - } - [self.navigationController popViewControllerAnimated:YES]; - } -} - -- (void)getFansLikeSuccess:(BOOL)isLike { - self.sessionNavView.isLike = isLike; - if(self.isAttention == YES && isLike == NO){ - [self startAttention]; - } -} - -- (void)attentionUserSuccess:(NSString *)uid { - if ([uid isEqualToString:self.session.sessionId]) { - [self showSuccessToast:YMLocalizedString(@"SessionViewController7")]; - self.sessionNavView.isLike = YES; - } -} - -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { - if (userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - [XPSkillCardPlayerManager shareInstance].userInfoModel = userInfo; - } else { - self.userInfo = userInfo; - } - [self.sessionTableView reloadData]; -} - -#pragma mark - MessageCellDelegate -- (void)updateMessageSuccess:(NIMMessage *)message { - if ([message.session.sessionId isEqualToString:self.session.sessionId]) { - [self.sessionTableView reloadData]; - } -} - -- (void)didTapAvatar:(NSString *)uid { - if (uid.length > 0 && ![NIMMessageUtils isOfficalAccount:uid]) { - XPMineUserInfoViewController * infoVC = [[XPMineUserInfoViewController alloc] init]; - infoVC.uid = uid.integerValue; - [[self getKeyWindowNav] pushViewController:infoVC animated:YES]; - } -} - -- (void)deleteMessageSuccess:(NIMMessage *)message { - MessageBaseModel * revokeMessage; - for (int i = 0; i < self.messages.count; i++) { - MessageBaseModel * message1 = [self.messages xpSafeObjectAtIndex:i]; - if ([message.messageId isEqualToString: message1.message.messageId]) { - revokeMessage = message1; - break; - } - } - if (revokeMessage) { - [self.messages removeObject:revokeMessage]; - [self.sessionTableView reloadData]; - } -} - -- (void)revokeMessageSuccess:(NIMMessage *)message { - MessageBaseModel * revokeMessage; - for (int i = 0; i < self.messages.count; i++) { - MessageBaseModel * message1 = [self.messages xpSafeObjectAtIndex:i]; - if ([message.messageId isEqualToString:message1.message.messageId]) { - revokeMessage = message1; - break; - } - } - if (revokeMessage) { - [self.messages removeObject:revokeMessage]; - // 插入一条撤回消息 - [self addRevokeMessage:message title:YMLocalizedString(@"SessionViewController8")]; - } -} --(void)startAttention{ - [self.presenter attentionUser:self.session.sessionId]; -} - -// -- (void)didTapAccept:(NIMMessage *)message { - XPMineUserInfoPresenter *presenter = [[XPMineUserInfoPresenter alloc] init]; - MessageCPNotifyModel *model = [[MessageCPNotifyModel alloc] initWithMessage:message]; - @kWeakify(self); - [presenter updateRelationship:model.recordId - status:1 - success:^{ - @kStrongify(self); - [self updateCPMessageAccept:message]; - } - failure:^(NSError * _Nonnull error) { - - }]; -} - -- (void)didTapReject:(NIMMessage *)message { - XPMineUserInfoPresenter *presenter = [[XPMineUserInfoPresenter alloc] init]; - MessageCPNotifyModel *model = [[MessageCPNotifyModel alloc] initWithMessage:message]; - @kWeakify(self); - [presenter updateRelationship:model.recordId - status:2 - success:^{ - @kStrongify(self); - [self updateCPMessageReject:message]; - } - failure:^(NSError * _Nonnull error) { - - }]; -} - -- (void)updateCPMessageAccept:(NIMMessage *)message { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel *attach = (AttachmentModel *)obj.attachment; - NSMutableDictionary * dic = [attach.data mutableCopy]; - [dic setObject:@(1) forKey:@"user_action"]; - [dic setObject:@(1) forKey:@"status"]; - attach.data = dic.copy; - obj.attachment = attach; - message.messageObject = obj; - MessageCPNotifyModel *model = [[MessageCPNotifyModel alloc] initWithMessage:message]; - @kWeakify(self); - [[[NIMSDK sharedSDK] conversationManager] updateMessage:message forSession:self.session completion:^(NSError * _Nullable error) { - @kStrongify(self); - [self.messages enumerateObjectsUsingBlock:^(MessageBaseModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.message.messageId == message.messageId) { - [self.messages replaceObjectAtIndex:idx withObject:model]; - [self.sessionTableView reloadData]; - *stop = YES; - } - }]; - }]; -} - -- (void)updateCPMessageReject:(NIMMessage *)message { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel *attach = (AttachmentModel *)obj.attachment; - NSMutableDictionary * dic = [attach.data mutableCopy]; - [dic setObject:@(2) forKey:@"user_action"]; - [dic setObject:@(2) forKey:@"status"]; - attach.data = dic.copy; - obj.attachment = attach; - message.messageObject = obj; - MessageCPNotifyModel *model = [[MessageCPNotifyModel alloc] initWithMessage:message]; - @kWeakify(self); - [[[NIMSDK sharedSDK] conversationManager] updateMessage:message forSession:self.session completion:^(NSError * _Nullable error) { - @kStrongify(self); - [self.messages enumerateObjectsUsingBlock:^(MessageBaseModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.message.messageId == message.messageId) { - [self.messages replaceObjectAtIndex:idx withObject:model]; - [self.sessionTableView reloadData]; - *stop = YES; - } - }]; - }]; -} - -#pragma mark - SessionNavViewDelegate -- (void)sessionNavView:(SessionNavView *)view didClickLike:(UIButton *)sender { - [self.presenter attentionUser:self.session.sessionId]; -} - -- (void)sessionNavView:(SessionNavView *)view didClickBack:(UIButton *)sender { - if (self.openType == SessionListOpenTypeRoom) { - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromLeft; - [self.view.superview.layer addAnimation:transition forKey:nil]; - [self willMoveToParentViewController:nil]; //1 - [self.view removeFromSuperview]; //2 - [self removeFromParentViewController]; //3 - return; - } - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)sessionNavView:(SessionNavView *)view didClickReport:(UIButton *)sender { - SessionInfoViewController * reportVC = [[SessionInfoViewController alloc] init]; - reportVC.session = self.session; - reportVC.stickTopMessages = self.stickTopMessages; - reportVC.userInfo = self.userInfo; - [self.getKeyWindowNav pushViewController:reportVC animated:YES]; -} - -- (void)sessionNavView:(SessionNavView *)view didRoomLive:(NSString *)roomUid { - if (self.openType == SessionListOpenTypeDefault) { - __block BOOL isSameRoom = NO; - __block RoomInfoModel *roomModel; - [self.getKeyWindowNav.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - XPRoomViewController * rooomVC = obj; - [[self getKeyWindowNav] popToRootViewControllerAnimated:NO]; - roomModel = rooomVC.getRoomInfo; - if(rooomVC.getRoomInfo.uid == [roomUid integerValue]) { - isSameRoom = YES; - } else { - [rooomVC exitRoom]; - } - *stop = YES; - } - }]; - if (!isSameRoom) { - if (roomModel.type == RoomType_MiniGame) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:roomUid fromNick:self.userInfo.nick fromType:UserEnterRoomFromType_Follow_User fromUid:[NSString stringWithFormat:@"%ld", self.userInfo.uid] viewController:[[XCCurrentVCStackManager shareManager] getCurrentVC]]; - }); - } else { - [XPRoomViewController openRoom:roomUid fromNick:self.userInfo.nick fromType:UserEnterRoomFromType_Follow_User fromUid:[NSString stringWithFormat:@"%ld", self.userInfo.uid] viewController:self]; - } - } - } -} - -#pragma mark - UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 2; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - if (section == 0) { - if ([NIMMessageUtils isOfficalAccount:self.session.sessionId]) { - return 0; - } - return self.userInfo ? 1 : 0; - } else { - return self.messages.count; - } -} - -- (nonnull UITableViewCell *)tableView:(nonnull UITableView *)tableView cellForRowAtIndexPath:(nonnull NSIndexPath *)indexPath { - if (indexPath.section == 0) { - SessionUserInfoTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([SessionUserInfoTableViewCell class])]; - if (cell == nil) { - ///如果没有的话 根据identifier 注册一下 重新获取一下即可 - [tableView registerClass:[SessionUserInfoTableViewCell class] forCellReuseIdentifier:NSStringFromClass([SessionUserInfoTableViewCell class])]; - cell = [[SessionUserInfoTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([SessionUserInfoTableViewCell class])]; - } - cell.userInfo = self.userInfo; - cell.delegate = self; - return cell; - } else { - MessageBaseModel * message = [self.messages xpSafeObjectAtIndex:indexPath.row]; - NSString * identifier = [message cellContent:message]; - ///从复用池中获取所需要的cell - MessageCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier]; - if (!cell) { - ///如果没有的话 根据identifier 注册一下 重新获取一下即可 - [tableView registerClass:[MessageCell class] forCellReuseIdentifier:identifier]; - ///如果注册过了 就不需要判断cell是否为空 - cell = [tableView dequeueReusableCellWithIdentifier:identifier]; - } - cell.delegate = self; - [cell renderWithMessage:message]; - return cell; - } -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 0) { - return 100;//self.userInfo.privatePhoto.count > 0 ? 182 : 100; - } - MessageBaseModel *msg = [self.messages xpSafeObjectAtIndex:indexPath.row]; - return msg.height; -} - -- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView { - [self.keyboardManager hideAllBoardView]; -} - -#pragma mark - NIMChatManagerDelegate -- (void)onRecvMessages:(NSArray *)messages { - if(!messages.count){ - return; - } - NIMMessage *message = messages.firstObject; - NIMSession *session = message.session; - if (![session isEqual:self.session] ) { - return; - } - - // 不处理点击拒绝的显示 -// NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; -// AttachmentModel *attachment = (AttachmentModel *)obj.attachment; -// if (attachment.second == Custom_Message_Sub_CP_message_result) { -// NSDictionary *data = attachment.data; -// NSNumber *status = [data objectForKey:@"status"]; -// if (status && status.integerValue == 2) { -// [[NIMSDK sharedSDK].conversationManager deleteMessage:message]; -// return; -// } -// } - - for (NIMMessage *message in messages) { - [self addTimeMessage:message]; - if (message.isDeleted) { - continue; - } - MessageBaseModel * model = [self modeTransformMessage:message]; - [self.messages addObject:model]; - } - [self.sessionTableView reloadData]; - [self.sessionTableView nim_scrollToBottom:YES]; - - [[NIMSDK sharedSDK].conversationManager markAllMessagesReadInSession:self.session]; -} - -- (void)sendMessage:(NIMMessage *)message didCompleteWithError:(NSError *)error { - if (message.session.sessionType != NIMSessionTypeP2P) { - return; - } - - [self addTimeMessage:message]; - - if (![self isExistMessages:message]) { - MessageBaseModel * model = [self modeTransformMessage:message]; - [self.messages addObject:model]; - } - -// if (message.yidunAntiSpamRes) { -// NSDictionary * spamRes = message.yidunAntiSpamRes.toJSONObject; -// NSDictionary * spamResExt = ((NSString *)spamRes[@"ext"]).toJSONObject; -// if ([spamResExt[@"antispam"][@"suggestion"] intValue] == 2) { -// NSDictionary * dic = @{@"suggestion": @"2"}; -// message.localExt = dic; -// [[NIMSDK sharedSDK].conversationManager updateMessage:message forSession:self.session completion:nil]; -// } -// } - - if (message.yidunAntiSpamRes) { - NSDictionary * spamRes = message.yidunAntiSpamRes.toJSONObject; - id spamResExt = ((NSString *)spamRes[@"ext"]).toJSONObject; - NSDictionary *antispamDic = nil; - if ([spamResExt isKindOfClass:[NSArray class]]) { - antispamDic = [spamResExt xpSafeObjectAtIndex:0]; - } else if ([spamResExt isKindOfClass:[NSDictionary class]]) { - antispamDic = spamResExt[@"antispam"]; - } - NSDictionary *realAntiDic = nil; - if ([[antispamDic allKeys] containsObject:@"antispam"]) { - realAntiDic = antispamDic[@"antispam"];; - } else { - realAntiDic = antispamDic; - } - if (realAntiDic) { - NSInteger suggestion = [realAntiDic[@"suggestion"] integerValue]; - if (suggestion == 2) { - NSDictionary * dic = @{@"suggestion": @"2"}; - message.localExt = dic; - [[NIMSDK sharedSDK].conversationManager updateMessage:message forSession:self.session completion:nil]; - - [self showErrorToast:YMLocalizedString(@"XPRoomViewController10")]; - } - } - } - - [self.sessionTableView reloadData]; - [self.sessionTableView nim_scrollToBottom:YES]; -} - -/** - * 收到消息被撤回的通知 - * - * @param notification 被撤回的消息信息 - * @discusssion 云信在收到消息撤回后，会先从本地数据库中找到对应消息并进行删除，之后通知上层消息已删除 - */ -- (void)onRecvRevokeMessageNotification:(NIMRevokeMessageNotification *)notification { - MessageBaseModel * revokeMessage; - for (int i = 0; i < self.messages.count; i++) { - MessageBaseModel * message1 = [self.messages xpSafeObjectAtIndex:i]; - if ([notification.message.messageId isEqualToString:message1.message.messageId]) { - revokeMessage = message1; - break; - } - } - if (revokeMessage) { - [self.messages removeObject:revokeMessage]; - [self.sessionTableView reloadData]; - } -} - -- (void)displayLimitMessage:(CheckLimitModel *)model { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"1.0.18_26"); - BOOL confirmToBuyVIP = NO; - if (!model.nextVipLevel && !model.nextUserCountLimit) { - // 提示达到聊天上限 - config.message = YMLocalizedString(@"1.0.18_29"); - } else if (model.nextVipLevel && !model.nextUserCountLimit) { - // 提示未达到对应 VIP，去买 VIP - confirmToBuyVIP = YES; - config.message = [NSString stringWithFormat:YMLocalizedString(@"1.0.18_27"), model.nextVipLevel]; - config.confirmButtonConfig.title = [NSString stringWithFormat:YMLocalizedString(@"1.0.18_30"), model.nextVipLevel]; - } else { - //提示未达到对应 VIP，去买 VIP, 可以每天聊多少个 - confirmToBuyVIP = YES; - config.message = [NSString stringWithFormat:YMLocalizedString(@"1.0.18_28"), model.nextVipLevel, model.nextUserCountLimit]; - config.confirmButtonConfig.title = [NSString stringWithFormat:YMLocalizedString(@"1.0.18_30"), model.nextVipLevel]; - } - - [TTPopup alertWithConfig:config confirmHandler:^{ - if (confirmToBuyVIP) { -// VIPCenterViewController *nobleCenter = [[VIPCenterViewController alloc] initWithRoomUid:-1]; -// [nobleCenter jumpToTargetVIP:model.nextVipLevel.integerValue]; -// [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:nobleCenter animated:YES]; - - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kVIP); - [self.navigationController pushViewController:webVC animated:YES]; - } - } cancelHandler:^{ - }]; -} - -#pragma mark - NIMConversationManagerDelegate -- (void)messagesDeletedInSession:(NIMSession *)session { - [self.messages removeAllObjects]; - [self initData]; -} - -- (void)didFailRetry:(NIMMessage *)message { - @kWeakify(self); - [Api checkLimit:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if(code == 200){ - CheckLimitModel *model = [CheckLimitModel modelWithJSON:data.data]; - if (model.chat) { - if (message.isReceivedMsg) { - [[NIMSDK sharedSDK].chatManager fetchMessageAttachment:message error:nil]; - } else { - [[NIMSDK sharedSDK].chatManager resendMessage:message error:nil]; - } - } else { - [self displayLimitMessage:model]; - } - } else { - [self showErrorToast:msg]; - } - } receiverUid:self.session.sessionId]; -} - -- (void)sendTextMessage:(NSString *)text { - @kWeakify(self); - [Api checkLimit:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if(code == 200){ - CheckLimitModel *model = [CheckLimitModel modelWithJSON:data.data]; - if (model.chat) { - NIMMessage *message = [NIMMessageMaker msgWithText:text]; - message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid}; //表明该条消息的发送者的账号或者消息所属的群组 ID - [[[NIMSDK sharedSDK] chatManager] sendMessage:message toSession:self.session error:nil]; - } else { - [self displayLimitMessage:model]; - } - } else { - [self showErrorToast:msg]; - } - } receiverUid:self.session.sessionId]; - -} - -- (void)audioRecordCompletion:(NSString *)recordPath { - @kWeakify(self); - [Api checkLimit:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if(code == 200){ - CheckLimitModel *model = [CheckLimitModel modelWithJSON:data.data]; - if (model.chat) { - NIMMessage *message = [NIMMessageMaker msgWithAudio:recordPath]; - message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid}; //表明该条消息的发送者的账号或者消息所属的群组 ID - [[[NIMSDK sharedSDK] chatManager] sendMessage:message toSession:self.session error:nil]; - } else { - [self displayLimitMessage:model]; - } - } else { - [self showErrorToast:msg]; - } - } receiverUid:self.session.sessionId]; -} - -#pragma mark - TZImagePickerControllerDelegate -- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray *)infos { - [photos enumerateObjectsUsingBlock:^(UIImage * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj) { - @kWeakify(self); - [Api checkLimit:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if(code == 200){ - CheckLimitModel *model = [CheckLimitModel modelWithJSON:data.data]; - if (model.chat) { - // 构造出具体会话 - NIMMessage * message = [NIMMessageMaker msgWithImage:obj]; - message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid}; //表明该条消息的发送者的账号或者消息所属的群组 ID - - // 发送消息 - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil]; - } else { - [self displayLimitMessage:model]; - } - } else { - [self showErrorToast:msg]; - } - } receiverUid:self.session.sessionId]; - } - }]; -} - -#pragma mark - SessionRiskViewDelegate -- (void)sessionRiskViewCloseButtonClick:(SessionRiskView *)view { - [[SessionRiskCache shareCache] saveCloseRisk:self.session.sessionId]; - [self.riskAlertView removeFromSuperview]; - [self.sessionTableView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.sessionNavView.mas_bottom).mas_offset(0); - }]; -} - -#pragma mark - SessionUserInfoTableViewCellDelegate -- (void)sessionUserInfoTableViewCell:(SessionUserInfoTableViewCell *)view showUserInfoVC:(UserInfoModel *)userInfo { - [self didTapAvatar:[NSString stringWithFormat:@"%ld", userInfo.uid]]; -} - -#pragma mark - InputBoardDataSource -//@return 点加号按钮弹出的拓展面板View，且无需设置frame -- (UIView *)keyboardManagerExtendBoardView:(QKeyboardManager *)keyboardManager { - UIView *boardView = [UIView new]; - boardView.backgroundColor = UIColor.clearColor; - return boardView; -} - -//@return 点表情按钮弹出的表情面板View，且无需设置frame -- (UIView *)keyboardManagerEmotionBoardView:(QKeyboardManager *)keyboardManager { - QEmotionBoardView *emotionView = [[QEmotionBoardView alloc] init]; - QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper]; - emotionView.emotions = faceManager.emotionArray; - emotionView.delegate = self; - if (@available(iOS 11.0, *)) { - NSBundle *bundle = [NSBundle bundleForClass:[self class]]; - emotionView.backgroundColor = [UIColor colorNamed:@"q_input_extend_bg" inBundle:bundle compatibleWithTraitCollection:nil]; - } else { - emotionView.backgroundColor = [UIColor colorWithRed:(246)/255.0f green:(246)/255.0f blue:(246)/255.0f alpha:1]; - } - return emotionView; -} - -//@return 点表情按钮弹出的表情面板View，且无需设置frame -- (UIView *)keyboardManagerPhotoBoardView:(QKeyboardManager *)keyboardManager{ - QinputPhotoView *emotionView = [[QinputPhotoView alloc] init]; - self.photoView = emotionView; - emotionView.photoList = self.phototArray; - emotionView.delegate = self; - emotionView.backgroundColor = [UIColor colorWithRed:(246)/255.0f green:(246)/255.0f blue:(246)/255.0f alpha:1]; - return emotionView; -} - -//@return 点表情按钮弹出的表情面板View的高度 -- (CGFloat)keyboardManagerEmotionBoardHeight:(QKeyboardManager *)keyboardManager { - return 294; -} - -//@return 点加号按钮弹出的拓展面板View的高度 -- (CGFloat)keyboardManagerExtendBoardHeight:(QKeyboardManager *)keyboardManager { - return 174; -} - -- (CGFloat)keyboardManagerPhotoBoardHeight:(QKeyboardManager *)keyboardManager { - return 184 + kSafeAreaBottomHeight; -} - -//点击表情按钮，切换到表情面板 -- (void)inputBarView:(QInputBarView *)inputBarView onEmotionButtonClick:(UIButton *)emotionSwitchButton { - if (emotionSwitchButton.isSelected) { - [_keyboardManager switchToEmotionBoardKeyboard]; - } else { - _inputBarView.inputTextView.text = @""; - [_inputBarView textViewBecomeFirstResponder]; - } -} - -- (void)inputBarView:(QInputBarView *)inputBarView onVoiceSwitchButtonClick:(UIButton *)voiceSwitchButton { - if (!voiceSwitchButton.isSelected) { - _inputBarView.inputTextView.text = @""; - [_inputBarView textViewBecomeFirstResponder]; - } else { - [_keyboardManager hideAllBoardView]; - } -} - -- (void)inputBarView:(QInputBarView *)inputBarView onGiftButtonClick:(UIButton *)emotionSwitchButton { - [_keyboardManager hideAllBoardView]; - XPSendGiftView * giftView = [[XPSendGiftView alloc] initWithType:SendGiftType_User uid:nil]; - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = self.userInfo.avatar; - userModel.nick = self.userInfo.nick; - userModel.uid = self.session.sessionId.integerValue; - userModel.isSelect = YES; - [giftView configGiftUsers:@[userModel]]; - [self presentViewController:giftView animated:YES completion:nil]; -} - -- (void)inputBarView:(QInputBarView *)inputBarView onCameraButtonClick:(UIButton *)emotionSwitchButton { - [_keyboardManager hideAllBoardView]; - @kWeakify(self); - [YYUtility checkCameraAvailable:^{ - @kStrongify(self); - UIImagePickerController *imagePicker = [[UIImagePickerController alloc] init]; - imagePicker.delegate = self; - imagePicker.sourceType = UIImagePickerControllerSourceTypeCamera; - imagePicker.allowsEditing = YES; - [self presentViewController:imagePicker animated:YES completion:NULL]; - } denied:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"SessionViewController10")]; - } restriction:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"SessionViewController12")]; - }]; - -} - -- (void)inputBarView:(QInputBarView *)inputBarView onPhototButtonClick:(UIButton *)emotionSwitchButton { - if (emotionSwitchButton.isSelected) { - @kWeakify(self); - [YYUtility checkAssetsLibrayAvailable:^{ - @kStrongify(self); - [TZImagePickerConfig sharedInstance].allowPickingImage = YES; - dispatch_async(dispatch_get_global_queue(0, 0), - ^{ - [[TZImageManager manager] getCameraRollAlbumWithFetchAssets:NO completion:^(TZAlbumModel *model) { - [[TZImageManager manager] getAssetsFromFetchResult:model.result completion:^(NSArray *models) { - dispatch_async(dispatch_get_main_queue(), - ^{ - NSMutableArray * array = [NSMutableArray array]; - if (models.count > 40) { - for (int i = 0; i < 40; i++) { - TZAssetModel * assets = [models xpSafeObjectAtIndex:i]; - QPhotoImageModel * infor = [[QPhotoImageModel alloc] init]; - infor.isOrigin = NO; - infor.assetInfo = assets; - [array addObject:infor]; - } - } else { - for (int i = 0; i < models.count; i++) { - TZAssetModel * assets = [models xpSafeObjectAtIndex:i]; - QPhotoImageModel * infor = [[QPhotoImageModel alloc] init]; - infor.isOrigin = NO; - infor.assetInfo = assets; - [array addObject:infor]; - } - } - self.phototArray = array; - if (self.phototArray.count > 0) { - self.photoView.photoList = self.phototArray; - [self.keyboardManager switchToPhotoBoardKeyboard]; - } else { - TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self]; - imagePickerVc.modalPresentationStyle = UIModalPresentationOverFullScreen; - imagePickerVc.allowPickingVideo = NO; - imagePickerVc.allowTakeVideo = NO; - imagePickerVc.naviBgColor = [DJDKMIMOMColor appCellBackgroundColor]; - imagePickerVc.naviTitleColor = [DJDKMIMOMColor mainTextColor]; - imagePickerVc.barItemTextColor = [DJDKMIMOMColor mainTextColor]; - [self presentViewController:imagePickerVc animated:YES completion:nil]; - } - }); - }]; - }]; - }); - } denied:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"SessionViewController20") content:YMLocalizedString(@"SessionViewController14")]; - } restriction:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"SessionViewController20") content:YMLocalizedString(@"SessionViewController16")]; - }]; - } else { - [_keyboardManager hideAllBoardView]; - _inputBarView.inputTextView.text = @""; - [_inputBarView textViewResignFirstResponder]; - } - -} - -- (void)showNotPhoto:(NSString *)title content:(NSString *)content { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = title; - config.message = content; - - [TTPopup alertWithConfig:config confirmHandler:^{ - NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - if ([[UIApplication sharedApplication] canOpenURL:url]) { - [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) { - - }]; - } - } cancelHandler:^{ - }]; -} - -#pragma mark - InputBoardDelegate -- (void)keyboardManager:(QKeyboardManager *)keyboardManager onWholeInputViewHeightDidChange:(CGFloat)wholeInputViewHeight reason:(WholeInputViewHeightDidChangeReason)reason { - [UIView animateWithDuration:0.2 animations:^{ - [self.sessionTableView nim_scrollToBottom:NO]; - [self.sessionTableView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.sessionNavView.mas_bottom); - make.bottom.mas_equalTo(self.view).offset(-wholeInputViewHeight - kSafeAreaBottomHeight); - }]; - }]; -} - -#pragma mark - QEmotionBoardViewDelegate -/** - * 选中表情时的回调 - * @param index 被选中的表情在`emotions`里的索引 - * @param emotion 被选中的表情对应的`QMUIEmotion`对象 - */ -- (void)emotionView:(QEmotionBoardView *)emotionView didSelectEmotion:(QEmotion *)emotion atIndex:(NSInteger)index { - //把😊插入到输入栏 - UIFont *font = [UIFont systemFontOfSize:17.5]; - NSTextAttachment * emotionAtt = [[NSTextAttachment alloc] init]; - UIImage *iconImage = emotion.image; - emotionAtt.bounds = CGRectMake(0, roundf(font.capHeight - emotion.image.size.width)/2.f, emotion.image.size.width, emotion.image.size.height); - emotionAtt.image = iconImage; - emotionAtt.imageName = emotion.displayName; - NSAttributedString *emotionAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)emotionAtt]; - - [_inputBarView insertEmotionAttributedString:emotionAttribute]; -} - -// 删除按钮的点击事件回调 -- (void)emotionViewDidSelectDeleteButton:(QEmotionBoardView *)emotionView { - if (![_inputBarView deleteEmotion]){ - //根据当前的光标，这次点击删除按钮并没有删除表情，那么就删除文字 - [_inputBarView.inputTextView deleteBackward]; - } -} - -// 发送按钮的点击事件回调 -- (void)emotionViewDidSelectSendButton:(QEmotionBoardView *)emotionView { - [self sendTextMessage:[_inputBarView textViewInputNormalText]]; - _inputBarView.inputTextView.text = @""; - [_keyboardManager hideAllBoardView]; - -} - -/** - * 点击了系统键盘的发送按钮 - * @param inputNormalText ："害~你好啊[微笑]" - */ -- (void)inputBarView:(QInputBarView *)inputBarView onKeyboardSendClick:(NSString *)inputNormalText { - [self sendTextMessage:inputNormalText]; - _inputBarView.inputTextView.text = @""; - [_keyboardManager hideAllBoardView]; -} - -#pragma mark - QinputPhotoViewDelegate -- (void)qinputPhotoView:(QinputPhotoView *)view didClickSend:(NSArray *)photoList { - for (int i = 0; i < photoList.count; i++) { - QPhotoImageModel * imageInfo = [photoList xpSafeObjectAtIndex:i]; - UIImage * image; - if (view.isOrigin) { - image = imageInfo.originImage; - } else { - image = imageInfo.compressImage; - } - if (image == nil){ - continue; - } - // 发送消息 - NIMMessage * message = [NIMMessageMaker msgWithImage:image]; - @kWeakify(self); - [Api checkLimit:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if(code == 200){ - CheckLimitModel *model = [CheckLimitModel modelWithJSON:data.data]; - if (model.chat) { - message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid}; //表明该条消息的发送者的账号或者消息所属的群组 ID - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil]; - [view resetChoosePhotos]; - } else { - [self displayLimitMessage:model]; - } - } else { - [self showErrorToast:msg]; - } - } receiverUid:self.session.sessionId]; - } -} - -- (void)qinputPhotoView:(QinputPhotoView *)view didClickPhoto:(UIButton *)sender { - TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self]; - imagePickerVc.modalPresentationStyle = UIModalPresentationOverFullScreen; - imagePickerVc.allowPickingVideo = NO; - imagePickerVc.allowTakeVideo = NO; - imagePickerVc.naviBgColor = [DJDKMIMOMColor appCellBackgroundColor]; - imagePickerVc.naviTitleColor = [DJDKMIMOMColor mainTextColor]; - imagePickerVc.barItemTextColor = [DJDKMIMOMColor mainTextColor]; - [self presentViewController:imagePickerVc animated:YES completion:nil]; -} - -#pragma mark - UIImagePickerControllerDelegate -- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info -{ - UIImage *selectedPhoto = [info objectForKey:UIImagePickerControllerEditedImage]; - if (selectedPhoto) { - if (picker.sourceType == UIImagePickerControllerSourceTypeCamera) { - UIImageWriteToSavedPhotosAlbum(selectedPhoto, nil, nil, nil); - } - @kWeakify(self); - [Api checkLimit:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if(code == 200){ - CheckLimitModel *model = [CheckLimitModel modelWithJSON:data.data]; - if (model.chat) { - // 构造出具体会话 - NIMMessage * message = [NIMMessageMaker msgWithImage:selectedPhoto]; - message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid}; //表明该条消息的发送者的账号或者消息所属的群组 ID - // 发送消息 - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil]; - } else { - [self displayLimitMessage:model]; - } - } else { - [self showErrorToast:msg]; - } - } receiverUid:self.session.sessionId]; - } - [picker dismissViewControllerAnimated:YES completion:^{}]; -} - -- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker{ - [picker dismissViewControllerAnimated:YES - completion:^{}]; -} - - -#pragma mark - Getters And Setters -- (NSArray *)messages { - if (!_messages) { - _messages = [[NSMutableArray alloc] init]; - } - return _messages; -} - -#pragma mark - Event Response -- (void)closeKeyBoard { - [self.view endEditing:YES]; - [self.inputBarView textViewResignFirstResponder]; -} - -- (UITableView *)sessionTableView { - if (!_sessionTableView) { - _sessionTableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _sessionTableView.delegate = self; - _sessionTableView.dataSource = self; - _sessionTableView.backgroundColor = UIColor.clearColor; - _sessionTableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _sessionTableView.showsVerticalScrollIndicator = NO; - if (@available(iOS 11.0, *)) { - _sessionTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } -// UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(closeKeyBoard)]; -// [_sessionTableView addGestureRecognizer:tap]; - } - return _sessionTableView; -} - -- (SessionNavView *)sessionNavView { - if (!_sessionNavView) { - _sessionNavView = [[SessionNavView alloc] init]; - _sessionNavView.delegate = self; - } - return _sessionNavView; -} - -- (SessionRiskView *)riskAlertView { - if (!_riskAlertView) { - _riskAlertView = [[SessionRiskView alloc] init]; - _riskAlertView.delegate = self; - } - return _riskAlertView; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionAudioRecordView.h b/YuMi/Modules/YMMessage/View/Session/View/SessionAudioRecordView.h deleted file mode 100644 index 862ced3..0000000 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionAudioRecordView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// SessionAudioRecordView.h -// YUMI -// -// Created by YUMI on 2022/4/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface SessionAudioRecordView : UIView - -- (void)configAudioRecord:(NSString *)imageName title:(NSString *)title isAnimation:(BOOL)isAnimation; -///开始录音 -- (void)beginAudioRecord; -///取消录音 -- (void)cancelAudioRecord; -///完成录音 -- (void)finishAudioRecord; -///更新进度 -- (void)updateAudioRecordProgress:(NSTimeInterval)recordTime; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionAudioRecordView.m b/YuMi/Modules/YMMessage/View/Session/View/SessionAudioRecordView.m deleted file mode 100644 index 8b7ec8e..0000000 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionAudioRecordView.m +++ /dev/null @@ -1,148 +0,0 @@ -// -// SessionAudioRecordView.m -// YUMI -// -// Created by YUMI on 2022/4/21. -// - -#import "SessionAudioRecordView.h" -///Third -#import -#import - -@interface SessionAudioRecordView () -///背景 -@property (nonatomic,strong) UIView * backView; -///显示图片 -@property (nonatomic,strong) UIImageView *logoImageView; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///当前时间 -@property (nonatomic,strong) UILabel *timeLabel; -@end - -@implementation SessionAudioRecordView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Public Method -- (void)configAudioRecord:(NSString *)imageName title:(NSString *)title isAnimation:(BOOL)isAnimation { - self.logoImageView.image = [UIImage imageNamed:imageName]; - if (isAnimation) { - [self.logoImageView startAnimating]; - } else { - [self.logoImageView stopAnimating]; - } - self.titleLabel.text = title; -} - -///开始录音 -- (void)beginAudioRecord { - self.timeLabel.text = @"00:00"; - [[NIMSDK sharedSDK].mediaManager recordForDuration:60]; -} -///取消录音 -- (void)cancelAudioRecord { - self.timeLabel.text = @"00:00"; - [[NIMSDK sharedSDK].mediaManager cancelRecord]; -} -///完成录音 -- (void)finishAudioRecord { - self.timeLabel.text = @"00:00"; - [[NIMSDK sharedSDK].mediaManager stopRecord]; -} - -- (void)updateAudioRecordProgress:(NSTimeInterval)recordTime { - NSInteger minutes = (NSInteger)recordTime / 60; - NSInteger seconds = (NSInteger)recordTime % 60; - self.timeLabel.text = [NSString stringWithFormat:@"%02zd:%02zd", minutes, seconds]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backView]; - [self.backView addSubview:self.logoImageView]; - [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.timeLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(250, 200)); - }]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.backView).offset(15); - }]; - - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backView); - make.top.mas_equalTo(self.backView).offset(50); - make.size.mas_equalTo(CGSizeMake(90, 72)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(25); - }]; -} - -#pragma mark - Getters And Setters -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [UIColor blackColor]; - _backView.layer.masksToBounds = YES; - _backView.layer.cornerRadius = 10; - } - return _backView; -} - - -- (UIImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[UIImageView alloc] init]; - _logoImageView.userInteractionEnabled = YES; - UIImage *firstImage = [UIImage imageNamed:@"message_tool_audio_record_first"]; - UIImage *secondImage = [UIImage imageNamed:@"message_tool_audio_record_second"]; - UIImage *thirdImage = [UIImage imageNamed:@"message_tool_audio_record_third"]; - _logoImageView.animationImages = @[firstImage, secondImage, thirdImage]; - _logoImageView.animationDuration = 1; - _logoImageView.animationRepeatCount = HUGE; - } - return _logoImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:17 weight:UIFontWeightMedium]; - _timeLabel.textColor = [UIColor whiteColor]; - _timeLabel.textAlignment = NSTextAlignmentCenter; - } - return _timeLabel; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.h b/YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.h deleted file mode 100644 index 550b049..0000000 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// SessionLimitChatView.h -// YUMI -// -// Created by zu on 2021/12/8. -// - -#import -#import "ChatLimitModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface SessionChatLimitView : UIView - -- (instancetype)initWithChatLimit:(ChatLimitModel *)chatLimit; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.m b/YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.m deleted file mode 100644 index 21f0c2c..0000000 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.m +++ /dev/null @@ -1,75 +0,0 @@ -// -// SessionLimitChatView.m -// YUMI -// -// Created by zu on 2021/12/8. -// - -#import "SessionChatLimitView.h" -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "UIView+NIM.h" -#import "XPWebViewController.h" - -#import -#import - -@interface SessionChatLimitView() - -@property (nonatomic, strong) UIView *bgView; -@property (nonatomic, strong) YYLabel *textLabel; - -@end - -@implementation SessionChatLimitView - -- (instancetype)initWithChatLimit:(ChatLimitModel *)chatLimit { - if (self = [super initWithFrame:CGRectMake(0, 0, KScreenWidth, 50)]) { - [self addSubview:self.bgView]; - [self.bgView addSubview:self.textLabel]; - - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - }]; - - [self.textLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.bottom.mas_equalTo(self.bgView).insets(UIEdgeInsetsMake(10, 10, 10, 10)); - }]; - - [self initLabel:chatLimit.charmLevel.integerValue wealthLevel:chatLimit.wealthLevel.integerValue]; - } - return self; -} - -- (void)initLabel:(NSInteger)charmLevel wealthLevel:(NSInteger)wealthLevel { - NSInteger charm = charmLevel > 0 ? charmLevel : 3; - NSInteger wealth = wealthLevel > 0 ? wealthLevel : 3; - UIColor *highlightColor = DJDKMIMOMColor.appMainColor; - NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:YMLocalizedString(@"SessionChatLimitView0"), wealth, charm] attributes:@{NSFontAttributeName: [UIFont systemFontOfSize: 12],NSForegroundColorAttributeName: DJDKMIMOMColor.mainTextColor}];; - NSRange wealthLevelRange = [attStr.mutableString rangeOfString:[NSString stringWithFormat:@"%@≥%zd",YMLocalizedString(@"SessionChatLimitView1"), wealth]]; - NSRange charmLevelRange = [attStr.mutableString rangeOfString:[NSString stringWithFormat:@"%@≥%zd",YMLocalizedString(@"SessionChatLimitView2"), charm]]; - [attStr yy_setColor:highlightColor range:wealthLevelRange]; - [attStr yy_setColor:highlightColor range:charmLevelRange]; - self.textLabel.attributedText = attStr; -} - -- (UIView *)bgView { - if (!_bgView) { - _bgView = [UIView new]; - _bgView.backgroundColor = DJDKMIMOMColor.appCellBackgroundColor; - _bgView.layer.masksToBounds = YES; - _bgView.layer.cornerRadius = 8.0; - } - return _bgView; -} - -- (YYLabel *)textLabel { - if (!_textLabel) { - _textLabel = [[YYLabel alloc] init]; - _textLabel.textAlignment = NSTextAlignmentCenter; - _textLabel.numberOfLines = 0; - } - return _textLabel; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.h b/YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.h deleted file mode 100644 index c5e5cf4..0000000 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// SessionNavLiveView.h -// YUMI -// -// Created by YUMI on 2023/1/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface SessionNavLiveView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.m b/YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.m deleted file mode 100644 index b46bb87..0000000 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.m +++ /dev/null @@ -1,79 +0,0 @@ -// -// SessionNavLiveView.m -// YUMI -// -// Created by YUMI on 2023/1/17. -// - -#import "SessionNavLiveView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface SessionNavLiveView () - -///音符 -@property (nonatomic,strong) UIImageView *liveView; -///直播中 -@property (nonatomic,strong) UILabel *liveLabel; - -@end - -@implementation SessionNavLiveView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.liveView]; - [self addSubview:self.liveLabel]; -} - -- (void)initSubViewConstraints { - - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(15); - make.trailing.mas_equalTo(self.liveLabel.mas_trailing); - }]; - - [self.liveView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(6, 6)); - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self); - }]; - - [self.liveLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.liveView.mas_trailing).offset(4); - make.centerY.mas_equalTo(self.liveView); - }]; -} -#pragma mark - Getters And Setters -- (UIImageView *)liveView { - if (!_liveView) { - _liveView = [[UIImageView alloc] init]; - _liveView.userInteractionEnabled = YES; - _liveView.image = [UIImage imageNamed:@"session_nav_live"]; - } - return _liveView; -} - -- (UILabel *)liveLabel { - if (!_liveLabel) { - _liveLabel = [[UILabel alloc] init]; - _liveLabel.font = [UIFont systemFontOfSize:10]; - _liveLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _liveLabel.text = [NSString stringWithFormat:@"%@ >",YMLocalizedString(@"SessionNavLiveView0")]; - } - return _liveLabel; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionNavView.h b/YuMi/Modules/YMMessage/View/Session/View/SessionNavView.h deleted file mode 100644 index 7f2cac2..0000000 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionNavView.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// SessionNavView.h -// YUMI -// -// Created by YUMI on 2022/4/25. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class SessionNavView, UserInfoModel; -@protocol SessionNavViewDelegate - -@optional -///点击了举报 -- (void)sessionNavView:(SessionNavView *)view didClickReport:(UIButton *)sender; -///点击了关注 -- (void)sessionNavView:(SessionNavView *)view didClickLike:(UIButton *)sender; -///点击了返回 -- (void)sessionNavView:(SessionNavView *)view didClickBack:(UIButton *)sender; -///点击开房中 -- (void)sessionNavView:(SessionNavView *)view didRoomLive:(NSString *)roomUid; -@end - -@interface SessionNavView : UIView - -///标题 -@property (nonatomic,copy) NSString *title; -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -///是否已经喜欢了 -@property (nonatomic,assign) BOOL isLike; - -//@property(nonatomic,assign) BOOL isPublicChatHall; -///代理 -@property (nonatomic,weak) id delegate; -///是否在房间中 -@property (nonatomic,assign) BOOL isInRoom; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionNavView.m b/YuMi/Modules/YMMessage/View/Session/View/SessionNavView.m deleted file mode 100644 index f80b471..0000000 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionNavView.m +++ /dev/null @@ -1,258 +0,0 @@ -// -// SessionNavView.m -// YUMI -// -// Created by YUMI on 2022/4/25. -// - -#import "SessionNavView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "YUMIConstant.h" -#import "UIImage+Utils.h" -#import "SessionNavLiveView.h" -#import "NIMMessageUtils.h" -///Model -#import "UserInfoModel.h" - -@interface SessionNavView () - -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///用户信息的容器 -@property (nonatomic,strong) UIStackView *infoStackView; -///标题 -@property (nonatomic,strong) UILabel *nickLabel; -///拉黑 和 直播中的 -@property (nonatomic,strong) UIStackView *stackView; -///加入黑名单 -@property (nonatomic,strong) UILabel *subTitleLabel; -///直播中 -@property (nonatomic,strong) SessionNavLiveView *liveView; -///是否关注 -@property (nonatomic,strong) UIButton *likeButton; -///举报 -@property (nonatomic,strong) UIButton *reportButton; - -@property (nonatomic,copy) NSString *userId; - -@end - -@implementation SessionNavView -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - [self addSubview:self.backButton]; - [self addSubview:self.infoStackView]; - [self addSubview:self.reportButton]; - [self addSubview:self.likeButton]; - [self.infoStackView addArrangedSubview:self.nickLabel]; - [self.infoStackView addArrangedSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.subTitleLabel]; - [self.stackView addArrangedSubview:self.liveView]; -} - -- (void)initSubViewConstraints { - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(22, 22)); - make.leading.mas_equalTo(self).offset(8); - make.top.mas_equalTo(statusbarHeight + 14); - }]; - - [self.infoStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.centerY.mas_equalTo(self.backButton); - }]; - - [self.likeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.reportButton); - make.trailing.mas_equalTo(self.reportButton.mas_leading).offset(-12); - make.size.mas_equalTo(CGSizeMake(48, 20)); - }]; - - [self.reportButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(30, 30)); - make.trailing.mas_equalTo(self).offset(-15); - make.centerY.mas_equalTo(self.backButton); - }]; -} - -#pragma mark - Event Response -- (void)reportButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(sessionNavView:didClickReport:)]) { - [self.delegate sessionNavView:self didClickReport:sender]; - } -} - -- (void)backButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(sessionNavView:didClickBack:)]) { - [self.delegate sessionNavView:self didClickBack:sender]; - } -} - -- (void)likeButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(sessionNavView:didClickLike:)]) { - [self.delegate sessionNavView:self didClickLike:sender]; - } -} - -- (void)liveViewRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(sessionNavView:didRoomLive:)]) { - [self.delegate sessionNavView:self didRoomLive:self.userInfo.roomUid]; - } -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - - if (_userInfo) { - NSString * userId = [NSString stringWithFormat:@"%ld", userInfo.uid]; - self.userId = userId; - if (userInfo.nick.length > 0) { - self.title = userInfo.nick; - } else { - [[NIMSDK sharedSDK].userManager fetchUserInfos:@[userId] completion:^(NSArray * _Nullable users, NSError * _Nullable error) { - if (!error) { - self.title = users[0].userInfo.nickName; - } - }]; - } - - self.subTitleLabel.hidden = ![[NIMSDK sharedSDK].userManager isUserInBlackList:userId]; - self.liveView.hidden = ([[NIMSDK sharedSDK].userManager isUserInBlackList:userId] || _userInfo.roomUid.length <= 0); - self.reportButton.hidden = [NIMMessageUtils isOfficalAccount:self.userId] || self.isInRoom; - } -} - -- (void)setTitle:(NSString *)title { - _title = title; - if (_title) { - NSString * nick = title; - if (nick.length > 10 ) { - nick = [nick substringToIndex:10]; - } - self.nickLabel.text = nick; - } -} - -- (void)setIsLike:(BOOL)isLike { - _isLike = isLike; - self.likeButton.hidden = _isLike; -} - -- (void)setIsInRoom:(BOOL)isInRoom { - _isInRoom = isInRoom; - self.reportButton.hidden = _isInRoom; - self.liveView.hidden = YES; - if (_isInRoom) { - [self.backButton mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(11); - }]; - } -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateSelected]; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -- (UIStackView *)infoStackView { - if (!_infoStackView) { - _infoStackView = [[UIStackView alloc] init]; - _infoStackView.axis = UILayoutConstraintAxisVertical; - _infoStackView.distribution = UIStackViewDistributionFill; - _infoStackView.alignment = UIStackViewAlignmentCenter; - _infoStackView.spacing = 1; - } - return _infoStackView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 0; - } - return _stackView; -} - -- (SessionNavLiveView *)liveView { - if (!_liveView) { - _liveView = [[SessionNavLiveView alloc] init]; - _liveView.hidden = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(liveViewRecognizer)]; - [_liveView addGestureRecognizer:tap]; - } - return _liveView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _nickLabel.textAlignment = NSTextAlignmentCenter; - } - return _nickLabel; -} - -- (UIButton *)likeButton { - if (!_likeButton) { - _likeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_likeButton setTitle:YMLocalizedString(@"SessionNavView0") forState:UIControlStateNormal]; - [_likeButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - _likeButton.titleLabel.font = [UIFont systemFontOfSize:10]; - [_likeButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _likeButton.layer.masksToBounds = YES; - _likeButton.layer.cornerRadius = 10; - [_likeButton addTarget:self action:@selector(likeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _likeButton; -} - -- (UILabel *)subTitleLabel { - if (!_subTitleLabel) { - _subTitleLabel = [[UILabel alloc] init]; - _subTitleLabel.font = [UIFont systemFontOfSize:11]; - _subTitleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _subTitleLabel.text = YMLocalizedString(@"SessionNavView1"); - _subTitleLabel.hidden = YES; - _subTitleLabel.textAlignment = NSTextAlignmentCenter; - } - return _subTitleLabel; -} - -- (UIButton *)reportButton { - if (!_reportButton) { - _reportButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_reportButton setImage:[UIImage imageNamed:@"message_session_nav_report"] forState:UIControlStateNormal]; - [_reportButton setImage:[UIImage imageNamed:@"message_session_nav_report"] forState:UIControlStateSelected]; - [_reportButton addTarget:self action:@selector(reportButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _reportButton; -} - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.h b/YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.h deleted file mode 100644 index b022339..0000000 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// SessionRiskView.h -// YUMI -// -// Created by YUMI on 2022/8/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class SessionRiskView; -@protocol SessionRiskViewDelegate - -- (void)sessionRiskViewCloseButtonClick:(SessionRiskView *)view; - -@end - -@interface SessionRiskView : UIView -@property (nonatomic,copy) NSString *userId; -///代理 -@property (nonatomic,weak) id delegate; -@property (nonatomic,copy) NSString *warning; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.m b/YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.m deleted file mode 100644 index 74b88fc..0000000 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// SessionRiskView.m -// YUMI -// -// Created by YUMI on 2022/8/11. -// - -#import "SessionRiskView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "SessionRiskCache.h" -#import "UIButton+EnlargeTouchArea.h" - -@interface SessionRiskView () -@property (strong, nonatomic) UILabel *warnTextLabel; - -@property (strong, nonatomic) UIButton *closeButton; -@end - -@implementation SessionRiskView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColorRGBAlpha(0xfee4e4, 1); - - [self addSubview:self.warnTextLabel]; - [self addSubview:self.closeButton]; -} - -- (void)initSubViewConstraints { - [self.warnTextLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self).inset(kGetScaleWidth(5)); - make.trailing.mas_equalTo(-kGetScaleWidth(20)); - make.centerY.mas_equalTo(self.mas_centerY); - }]; - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(8); - make.trailing.mas_equalTo(self.mas_trailing).offset(-15); - make.centerY.mas_equalTo(self.mas_centerY); - }]; -} - -#pragma mark - Event Response -- (void)closeButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(sessionRiskViewCloseButtonClick:)]) { - [self.delegate sessionRiskViewCloseButtonClick:self]; - } -} - -#pragma mark - Getters And Setters -- (void)setWarning:(NSString *)warning { - _warning = warning; - if (_warning) { - self.warnTextLabel.text = _warning; - } -} - -- (UILabel *)warnTextLabel { - if (!_warnTextLabel) { - _warnTextLabel = [[UILabel alloc]init]; - _warnTextLabel.text = YMLocalizedString(@"SessionRiskView0"); - _warnTextLabel.textColor = UIColorFromRGB(0xFF5858); - _warnTextLabel.font = [UIFont systemFontOfSize:12.f]; - _warnTextLabel.numberOfLines = 2; - _warnTextLabel.textAlignment = NSTextAlignmentCenter; - } - return _warnTextLabel; -} - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [[UIButton alloc]init]; - [_closeButton setImage:[UIImage imageNamed:@"session_warn_close"] forState:UIControlStateNormal]; - [_closeButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_closeButton addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.h b/YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.h deleted file mode 100644 index a1e9b48..0000000 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// SessionSettingUserView.h -// YUMI -// -// Created by YUMI on 2023/1/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel; -@interface SessionSettingUserView : UIView -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.m b/YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.m deleted file mode 100644 index 150929e..0000000 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.m +++ /dev/null @@ -1,167 +0,0 @@ -// -// SessionSettingUserView.m -// YUMI -// -// Created by YUMI on 2023/1/18. -// - -#import "SessionSettingUserView.h" -///Third -#import -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "SpriteSheetImageManager.h" -///Model -#import "UserInfoModel.h" - -@interface SessionSettingUserView () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///个人主页 -@property (nonatomic,strong) UILabel *idLabel; -///箭头 -@property (nonatomic,strong) UIImageView *arrowImageView; -///普通的 -@property (nonatomic,strong) YYAnimatedImageView *headWearImageView; -///头饰播放 -@property (nonatomic, strong) SpriteSheetImageManager *manager; - -@end - -@implementation SessionSettingUserView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.avatarImageView]; - [self addSubview:self.headWearImageView]; - [self addSubview:self.nickLabel]; - [self addSubview:self.idLabel]; - [self addSubview:self.arrowImageView]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(43, 43)); - make.leading.mas_equalTo(self).offset(22); - make.top.mas_equalTo(self).offset(22); - }]; - - [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(self.avatarImageView.mas_width).multipliedBy(1.31); - make.height.mas_equalTo(self.headWearImageView.mas_width); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - }]; - - [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(6.5, 11)); - make.centerY.mas_equalTo(self.avatarImageView); - make.trailing.mas_equalTo(self).offset(-15); - }]; -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.avatarImageView.imageUrl = _userInfo.avatar; - NSString * nick = _userInfo.nick; - self.nickLabel.text = nick; - self.idLabel.text = [NSString stringWithFormat:@"ID:%ld", _userInfo.erbanNo]; - NSString * headurl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - if (headurl.length >0) { - self.headWearImageView.hidden = NO; - NSURL *url = [NSURL URLWithString:headurl]; - @kWeakify(self); - [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { - @kStrongify(self); - self.headWearImageView.image = sprit; - } failureBlock:^(NSError * _Nullable error) { - }]; - } else { - self.headWearImageView.hidden = YES; - } - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 20; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:15]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:12]; - _idLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _idLabel; -} - -- (UIImageView *)arrowImageView { - if (!_arrowImageView) { - _arrowImageView = [[UIImageView alloc] init]; - _arrowImageView.userInteractionEnabled = YES; - _arrowImageView.image = [[UIImage imageNamed:@"room_setting_arrow"]ms_SetImageForRTL]; - } - return _arrowImageView; -} - -- (YYAnimatedImageView *)headWearImageView { - if (!_headWearImageView) { - _headWearImageView = [[YYAnimatedImageView alloc] init]; - _headWearImageView.backgroundColor = [UIColor clearColor]; - _headWearImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _headWearImageView; -} - -- (SpriteSheetImageManager *)manager { - if (!_manager) { - _manager = [[SpriteSheetImageManager alloc] init]; - } - return _manager; -} - - - -@end diff --git a/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.h b/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.h deleted file mode 100644 index 91eb785..0000000 --- a/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPSessionMainViewController.h -// xplan-ios -// -// Created by duoban on 2022/10/12. -// - -#import -#import "MvpViewController.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPSessionMainViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m b/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m deleted file mode 100644 index 0af9441..0000000 --- a/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m +++ /dev/null @@ -1,336 +0,0 @@ -// -// XPSessionMainViewController.m -// xplan-ios -// -// Created by duoban on 2022/10/12. -// - -#import "XPSessionMainViewController.h" -///Tool -#import -#import -#import -#import "QEmotionHelper.h" -///vc -#import "XPMineAttentionViewController.h" -#import "SessionListViewController.h" -#import "XPMineFriendViewController.h" -#import "XPMineFansViewController.h" -#import "MessagePresenter.h" -#import "MessageProtocol.h" - -@interface XPSessionMainViewController () - -@property (nonatomic, strong) NSArray *titles; -@property (nonatomic, strong) UIPageViewController *pageViewController; -@property (nonatomic, strong) NSArray *viewControllers; -@property (nonatomic, assign) NSInteger currentIndex; -@property (nonatomic, strong) UIStackView *buttonStackView; -@property (nonatomic, strong) NSMutableArray *segmentButtons; -@property (nonatomic, strong) UIScrollView *scrollView; // 添加 scrollView 属性 - -@property (nonatomic,strong) SessionListViewController *sessionListVC; -///好友 -@property (nonatomic,strong) XPMineFriendViewController *friendVC; -///关注 -@property (nonatomic,strong) XPMineAttentionViewController *attentionVC; -///粉丝 -@property (nonatomic,strong) XPMineFansViewController *fansVC; -///清除已读 -@property (nonatomic,strong) UIButton * allCleanBtn; - -@end - -@implementation XPSessionMainViewController -- (MessagePresenter *)createPresenter { - return [[MessagePresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self setupTopTheme]; - [self initSubViews]; - [self initSubViewConstraints]; -} -- (BOOL)isHiddenNavBar { - return YES; -} --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(getTabBarItemBadge:) - name:@"kGetTabBarItemBadge" - object:nil]; - - self.view.backgroundColor = [[ClientConfig shareConfig] bgColor]; - - // 初始化分页控制器 - self.pageViewController = [[UIPageViewController alloc] initWithTransitionStyle:UIPageViewControllerTransitionStyleScroll - navigationOrientation:UIPageViewControllerNavigationOrientationHorizontal - options:nil]; - self.pageViewController.dataSource = self; - self.pageViewController.delegate = self; - [self addChildViewController:self.pageViewController]; - [self.view addSubview:self.pageViewController.view]; - [self.pageViewController didMoveToParentViewController:self]; - - // 初始化顶部按钮 - [self setupTopButtons]; - - // 设置初始页面 - self.viewControllers = @[self.sessionListVC, self.friendVC, self.attentionVC, self.fansVC]; - [self.pageViewController setViewControllers:@[self.viewControllers[0]] - direction:UIPageViewControllerNavigationDirectionForward - animated:NO - completion:nil]; -} -- (void)initSubViewConstraints { - UIView *lineView = [UIView new]; - lineView.backgroundColor = UIColorFromRGB(0xF5F6FA); - [self.view addSubview:lineView]; - [lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.equalTo(self.view); - make.height.mas_equalTo(1); - }]; - - // 设置页面控制器约束 - [self.pageViewController.view mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.buttonStackView.mas_bottom).offset(10); - make.left.right.bottom.equalTo(self.view); - }]; -} - -- (void)setupTopButtons { - self.segmentButtons = [NSMutableArray array]; - self.buttonStackView = [[UIStackView alloc] init]; - self.buttonStackView.axis = UILayoutConstraintAxisHorizontal; - self.buttonStackView.spacing = (isMSZH() || isMSZH()) ? 16 : 4; - self.buttonStackView.distribution = UIStackViewDistributionFill;//UIStackViewDistributionFillEqually; - self.buttonStackView.semanticContentAttribute = isMSRTL() ? UISemanticContentAttributeForceRightToLeft : UISemanticContentAttributeForceLeftToRight; - - - if (isMSZH() || isMSRTL()) { - [self.view addSubview:self.buttonStackView]; - // 设置stackView约束 - [self.buttonStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo([UIApplication sharedApplication].keyWindow.safeAreaInsets.top); - make.leading.mas_equalTo(12); - }]; - } else { - // 创建滚动视图 - self.scrollView = [[UIScrollView alloc] init]; - self.scrollView.showsHorizontalScrollIndicator = NO; - self.scrollView.showsVerticalScrollIndicator = NO; - self.scrollView.bounces = NO; - [self.view addSubview:self.scrollView]; - // 设置scrollView约束 - [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo([UIApplication sharedApplication].keyWindow.safeAreaInsets.top); - make.height.mas_equalTo(44); // 设置一个固定高度 - make.leading.mas_equalTo(12); - make.trailing.mas_equalTo(-40); - }]; - [self.scrollView addSubview:self.buttonStackView]; - // 设置stackView约束 - [self.buttonStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.scrollView); - make.height.equalTo(self.scrollView); - }]; - } - - for (NSInteger i = 0; i < self.titles.count; i++) { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - [button setTitle:self.titles[i] forState:UIControlStateNormal]; - [button setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateNormal]; - [button setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateSelected]; - button.titleLabel.font = kFontRegular(16); - button.tag = i; - [button addTarget:self action:@selector(segmentButtonTapped:) forControlEvents:UIControlEventTouchUpInside]; - [self.segmentButtons addObject:button]; - [self.buttonStackView addArrangedSubview:button]; - } - - // 设置初始选中状态 - [self updateSegmentButtonSelection:0]; - - // 设置清除按钮 - [self.view addSubview:self.allCleanBtn]; - [self.allCleanBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(30); - make.centerY.mas_equalTo(self.buttonStackView); - make.trailing.mas_equalTo(-8); - }]; -} - -- (void)segmentButtonTapped:(UIButton *)sender { - NSInteger index = sender.tag; - if (index == self.currentIndex) return; - - UIViewController *targetVC = self.viewControllers[index]; - UIPageViewControllerNavigationDirection direction = index > self.currentIndex ? UIPageViewControllerNavigationDirectionForward : UIPageViewControllerNavigationDirectionReverse; - - [self.pageViewController setViewControllers:@[targetVC] - direction:direction - animated:YES - completion:nil]; - - [self updateSegmentButtonSelection:index]; -} - -- (void)updateSegmentButtonSelection:(NSInteger)index { - self.currentIndex = index; - [self.segmentButtons enumerateObjectsUsingBlock:^(UIButton *button, NSUInteger idx, BOOL *stop) { - button.selected = (idx == index); - button.titleLabel.font = button.selected ? kFontSemibold(20) : kFontRegular(16); - }]; - // 获取选中按钮 - UIButton *selectedButton = self.segmentButtons[index]; - CGRect buttonFrame = selectedButton.frame; - CGFloat scrollViewWidth = self.scrollView.bounds.size.width; - CGFloat currentOffset = self.scrollView.contentOffset.x; - - // 计算按钮的可见区域 - CGFloat buttonLeftEdge = buttonFrame.origin.x; - CGFloat buttonRightEdge = buttonFrame.origin.x + buttonFrame.size.width; - CGFloat visibleLeftEdge = currentOffset; - CGFloat visibleRightEdge = currentOffset + scrollViewWidth; - - // 只有当按钮不完全可见时才滚动 -// if (buttonLeftEdge < visibleLeftEdge) { -// // 如果按钮被左边遮挡，滚动到让按钮左对齐 -// [self.scrollView setContentOffset:CGPointMake(buttonLeftEdge, 0) animated:YES]; -// } else if (buttonRightEdge > visibleRightEdge) { -// // 如果按钮被右边遮挡，滚动最小距离使按钮完全可见 -// CGFloat newOffset = buttonRightEdge - scrollViewWidth; -// [self.scrollView setContentOffset:CGPointMake(newOffset, 0) animated:YES]; -// } - - - if (isMSRTL()) { - // RTL 布局时的滚动逻辑 - if (buttonRightEdge > visibleRightEdge) { - // 如果按钮被右边遮挡，滚动到让按钮右对齐 - [self.scrollView setContentOffset:CGPointMake(buttonRightEdge - scrollViewWidth, 0) animated:YES]; - } else if (buttonLeftEdge < visibleLeftEdge) { - // 如果按钮被左边遮挡，滚动最小距离使按钮完全可见 - [self.scrollView setContentOffset:CGPointMake(buttonLeftEdge, 0) animated:YES]; - } - } else { - // LTR 布局时的滚动逻辑（保持原来的逻辑） - if (buttonLeftEdge < visibleLeftEdge) { - [self.scrollView setContentOffset:CGPointMake(buttonLeftEdge, 0) animated:YES]; - } else if (buttonRightEdge > visibleRightEdge) { - CGFloat newOffset = buttonRightEdge - scrollViewWidth; - [self.scrollView setContentOffset:CGPointMake(newOffset, 0) animated:YES]; - } - } -} - -#pragma mark - SessionListViewController通知 --(void)getTabBarItemBadge:(NSNotification *)not{ - NSInteger badgeValue = [not.userInfo[@"BadgeValue"] integerValue]; - if (badgeValue > 0) { - [self.tabBarItem setBadgeValue:[NSString stringWithFormat:@"%ld", badgeValue]]; - } else { - [self.tabBarItem setBadgeValue:nil]; - } -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPSessionMainViewController0"), - YMLocalizedString(@"XPSessionMainViewController1"), - YMLocalizedString(@"XPSessionMainViewController2"), - YMLocalizedString(@"XPSessionMainViewController3")]; - } - return _titles; -} -#pragma mark- 清除消息 -- (void)allReadButtonClick:(UIButton *)sender { - [[NSNotificationCenter defaultCenter]postNotificationName:@"kAllReadAction" object:nil]; -} - --(NSTimeInterval)curTime { - static double time = 0; - time += 0.1 ; - return time; -} - -#pragma mark - UIPageViewControllerDataSource - -- (UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerBeforeViewController:(UIViewController *)viewController { - NSInteger index = [self.viewControllers indexOfObject:viewController]; - if (index == 0 || index == NSNotFound) { - return nil; - } - return self.viewControllers[index - 1]; -} - -- (UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerAfterViewController:(UIViewController *)viewController { - NSInteger index = [self.viewControllers indexOfObject:viewController]; - if (index == self.viewControllers.count - 1 || index == NSNotFound) { - return nil; - } - return self.viewControllers[index + 1]; -} - -#pragma mark - UIPageViewControllerDelegate - -- (void)pageViewController:(UIPageViewController *)pageViewController didFinishAnimating:(BOOL)finished previousViewControllers:(NSArray *)previousViewControllers transitionCompleted:(BOOL)completed { - if (completed) { - UIViewController *currentVC = pageViewController.viewControllers.firstObject; - NSInteger index = [self.viewControllers indexOfObject:currentVC]; - [self updateSegmentButtonSelection:index]; - } -} - -#pragma mark -懒加载 -- (XPMineAttentionViewController *)attentionVC { - if (!_attentionVC) { - _attentionVC = [[XPMineAttentionViewController alloc] init]; - _attentionVC.type = ContactUseingType_In_Session; - _attentionVC.isClearColor = YES; - } - return _attentionVC; -} - -- (XPMineFriendViewController *)friendVC { - if (!_friendVC) { - _friendVC = [[XPMineFriendViewController alloc] init]; - _friendVC.isClearColor = YES; - _friendVC.type = ContactUseingType_In_Session; - - } - return _friendVC; -} - -- (XPMineFansViewController *)fansVC { - if (!_fansVC) { - _fansVC = [[XPMineFansViewController alloc] init]; - _fansVC.type = ContactUseingType_In_Session; - _fansVC.isClearColor = YES; - - } - return _fansVC; -} -- (SessionListViewController *)sessionListVC{ - if (!_sessionListVC){ - _sessionListVC = [[SessionListViewController alloc]init]; - } - return _sessionListVC; -} -- (UIButton *)allCleanBtn{ - if (!_allCleanBtn){ - _allCleanBtn = [UIButton new]; - [_allCleanBtn setCornerWithLeftTopCorner:10 rightTopCorner:10 bottomLeftCorner:10 bottomRightCorner:10 size:CGSizeMake(30, 30)]; - [_allCleanBtn setImage:[UIImage imageNamed:@"sessionList_clear"] forState:UIControlStateNormal]; - [_allCleanBtn addTarget:self action:@selector(allReadButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _allCleanBtn; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.h b/YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.h deleted file mode 100644 index 66a739f..0000000 --- a/YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// SessionDiscoverNewTableViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2022/6/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface SessionDiscoverNewTableViewCell : UITableViewCell -///是否隐藏小红点 -@property (nonatomic,assign) BOOL hiddenDotView; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.m b/YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.m deleted file mode 100644 index 05a9359..0000000 --- a/YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.m +++ /dev/null @@ -1,126 +0,0 @@ -// -// SessionDiscoverNewTableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2022/6/10. -// - -#import "SessionDiscoverNewTableViewCell.h" -///Third -#import -///Tool - -#import "NetImageView.h" - -@interface SessionDiscoverNewTableViewCell () -///显示logo -@property (nonatomic,strong) NetImageView *logoImageView; -///标题内容 -@property (nonatomic,strong) UILabel *titleLabel; -///箭头 -@property (nonatomic,strong) UIImageView *arrowImageView; - -///红点 -@property (nonatomic,strong) UIView * dotView; -@end - -@implementation SessionDiscoverNewTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.logoImageView]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.arrowImageView]; - [self.contentView addSubview:self.dotView]; - -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.height.width.mas_equalTo(45); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.logoImageView.mas_centerY); - make.leading.mas_equalTo(self.logoImageView.mas_trailing).offset(15); - }]; - - [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(6.5, 11)); - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.centerY.mas_equalTo(self.contentView); - }]; - - - - [self.dotView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(8, 8)); - make.centerY.mas_equalTo(self.contentView); - make.trailing.mas_equalTo(self.arrowImageView.mas_leading).offset(-3); - }]; -} -#pragma mark - Getters And Setters -- (void)setHiddenDotView:(BOOL)hiddenDotView { - _hiddenDotView = hiddenDotView; - self.dotView.hidden = _hiddenDotView; -} - -- (NetImageView *)logoImageView { - if (!_logoImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _logoImageView = [[NetImageView alloc] initWithConfig:config]; - _logoImageView.layer.masksToBounds = YES; - _logoImageView.layer.cornerRadius = 45 / 2; - _logoImageView.imageUrl = @"https://image.lecheng163.com/fxmx.png"; - } - return _logoImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] initWithFrame:CGRectZero]; - _titleLabel.backgroundColor = [UIColor clearColor]; - _titleLabel.font = [UIFont systemFontOfSize:15.f weight:UIFontWeightMedium]; - _titleLabel.textColor = DJDKMIMOMColor.mainTextColor; - _titleLabel.text = YMLocalizedString(@"SessionDiscoverNewTableViewCell0"); - } - return _titleLabel; -} - -- (UIImageView *)arrowImageView { - if (!_arrowImageView) { - _arrowImageView = [[UIImageView alloc] init]; - _arrowImageView.userInteractionEnabled = YES; - _arrowImageView.image = [[UIImage imageNamed:@"common_right_arrow"]ms_SetImageForRTL]; - } - return _arrowImageView; -} - - -- (UIView *)dotView { - if (!_dotView) { - _dotView = [[UIView alloc] init]; - _dotView.backgroundColor = [UIColor redColor]; - _dotView.layer.cornerRadius = 4; - _dotView.layer.masksToBounds = YES; - } - return _dotView; -} - - - -@end diff --git a/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.h b/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.h deleted file mode 100644 index 372602f..0000000 --- a/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// SessionListCell.h -// YUMI -// -// Created by zu on 2021/11/26. -// - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface SessionListCell : UITableViewCell - -- (void)renderWithSession:(NIMRecentSession*)recent; -///置顶回话 -@property (nonatomic,strong) NSMutableDictionary *stickTopMessages; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m b/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m deleted file mode 100644 index aeb6399..0000000 --- a/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m +++ /dev/null @@ -1,245 +0,0 @@ -// -// SessionListCell.m -// YUMI -// -// Created by zu on 2021/11/26. -// - -#import "SessionListCell.h" -#import "NetImageView.h" -#import "NIMMessageUtils.h" -#import "NIMTimeUtils.h" -#import "UIView+NIM.h" -#import "QEmotionHelper.h" -#import "DJDKMIMOMColor.h" - -#import - -@interface SessionListCell() - -@property (nonatomic,strong) NetImageView *avatarImageView; - -@property (nonatomic,strong) UILabel *nameLabel; - -@property (nonatomic,strong) YYLabel*messageLabel; - -@property (nonatomic,strong) UILabel *timeLabel; - -@property(nonatomic, strong) UILabel *badgeView; - -@property (nonatomic,strong) UIView *divider; - -@property (nonatomic, strong) UIView *container; - -@end - -@implementation SessionListCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(nullable NSString *)reuseIdentifier { - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if (self) { - self.backgroundColor = UIColor.clearColor; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self initView]; - [self initLayout]; - } - return self; -} - -- (void)renderWithSession:(NIMRecentSession *)recent { - NIMUser *user = [[NIMSDK sharedSDK].userManager userInfo:recent.session.sessionId]; - self.avatarImageView.image = nil; - self.nameLabel.text = @""; - if (user.userInfo == nil){//} || [user.userInfo.nickName.lowercaseString isEqualToString:@"Platform New User".lowercaseString]) { - NSString * uid = recent.session.sessionId; - if (uid > 0) { - NSArray * uids = @[uid]; - @kWeakify(self); - [[NIMSDK sharedSDK].userManager fetchUserInfos:uids completion:^(NSArray * _Nullable users, NSError * _Nullable error) { - if (error == nil) { - @kStrongify(self); - NIMUser * userInfo = users.firstObject; - self.nameLabel.text = userInfo.userInfo.nickName; - NSString *avatarUrl = userInfo.userInfo.avatarUrl; - [self.avatarImageView loadImageWithUrl:avatarUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - self.avatarImageView.image = image; - }]; - [self.nameLabel sizeToFit]; - } - }]; - } - } else { - NSString *avatarUrl = user.userInfo.avatarUrl; - self.nameLabel.text = user.userInfo.nickName; - [self.avatarImageView loadImageWithUrl:avatarUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - self.avatarImageView.image = image; - }]; - [self.nameLabel sizeToFit]; - } - NSString *messageTitle = [NIMMessageUtils messageContent:recent.lastMessage]; - NSMutableAttributedString *messageAtt = [[QEmotionHelper sharedEmotionHelper]attributedStringByText:messageTitle font:self.messageLabel.font]; - [messageAtt addAttributes:@{NSForegroundColorAttributeName: UIColorFromRGB(0x7b7b7d)} range:NSMakeRange(0, messageAtt.length)]; - self.messageLabel.attributedText = messageAtt; - - if (recent.lastMessage) { - self.timeLabel.text = [NIMTimeUtils formattedTimeFromInterval:recent.lastMessage.timestamp]; - } else { - NSTimeInterval timeSecond = recent.updateTime / 1000.0; - self.timeLabel.text = [NIMTimeUtils formattedTimeFromInterval:timeSecond]; - } - [self.timeLabel sizeToFit]; - - if (recent.unreadCount) { - self.badgeView.hidden = NO; - if (recent.unreadCount > 100) { - self.badgeView.text = @"99+"; - } else { - self.badgeView.text = [NSString stringWithFormat:@"%@", @(recent.unreadCount)]; - } - } else { - self.badgeView.hidden = YES; - } - - NIMStickTopSessionInfo * topInfo = [self.stickTopMessages objectForKey:recent.session]; - if (topInfo && topInfo.session.sessionId.integerValue == recent.session.sessionId.integerValue) { - self.backgroundColor = [DJDKMIMOMColor colorWithHexString:@"#E5EFFC"]; - } else { - self.backgroundColor = [UIColor clearColor]; - } -} - -- (void)initView { - UIView *bottomSpace = [[UIView alloc] init]; - [self.contentView addSubview:bottomSpace]; - [bottomSpace mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.contentView); - make.height.mas_equalTo(12); - }]; - - UIView *container = [[UIView alloc] init]; - container.backgroundColor = [UIColor whiteColor]; - container.layer.cornerRadius = 10; - [self.contentView addSubview:container]; - [container mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(bottomSpace.mas_top); - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-16); - }]; - - [container addSubview:self.avatarImageView]; - [container addSubview:self.nameLabel]; - [container addSubview:self.messageLabel]; - [container addSubview:self.timeLabel]; - [container addSubview:self.badgeView]; - [container addSubview:self.divider]; - - _container = container; -} - -- (void)initLayout { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.container); - make.leading.mas_equalTo(15); - make.height.width.mas_equalTo(47); - }]; - - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(15); - }]; - - [self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameLabel); - make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - make.trailing.mas_equalTo(self.badgeView.mas_leading).offset(-15); - }]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.container).offset(21); - make.trailing.mas_equalTo(self.container).offset(-15); - }]; - - [self.divider mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo (-15); - make.leading.mas_equalTo(self.nameLabel); - make.bottom.mas_equalTo(self.container); - make.height.mas_equalTo(0.5f); - }]; - - [self.badgeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.messageLabel); - make.trailing.mas_equalTo(self.timeLabel); - make.height.mas_equalTo(16); - make.width.mas_equalTo(16); - }]; -} - -- (void)layoutSubviews { - [super layoutSubviews]; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.radius = CGFLOAT_MAX; - config.imageType = ImageTypeUserIcon; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 47.f / 2; - } - return _avatarImageView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [[UILabel alloc] initWithFrame:CGRectZero]; - _nameLabel.font = kFontSemibold(14); - _nameLabel.textColor = UIColorFromRGB(0x333333); - } - return _nameLabel; -} - -- (YYLabel *)messageLabel { - if (!_messageLabel) { - _messageLabel = [[YYLabel alloc] initWithFrame:CGRectZero]; - _messageLabel.font = kFontRegular(13); - _messageLabel.textColor = UIColorFromRGB(0x7b7b7d); - } - return _messageLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] initWithFrame:CGRectZero]; - _timeLabel.backgroundColor = [UIColor clearColor]; - _timeLabel.font = kFontRegular(12); - _timeLabel.textColor = UIColorFromRGB(0x999999); - [_timeLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_timeLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _timeLabel; -} - -- (UILabel *)badgeView { - if (!_badgeView) { - _badgeView = [UILabel labelInitWithText:@"" font:kFontMedium(10) textColor:[UIColor whiteColor]]; - _badgeView.backgroundColor = UIColorFromRGB(0xFF4E5C) ; - _badgeView.textAlignment = NSTextAlignmentCenter; - [_badgeView setCornerRadius:8]; - _badgeView.hidden = YES; - } - return _badgeView; -} - -- (UIView *)divider { - if (!_divider) { - _divider = [[UIView alloc]init]; - _divider.backgroundColor = [DJDKMIMOMColor dividerColor]; - _divider.hidden = YES; - } - return _divider; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.h b/YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.h deleted file mode 100644 index cc42725..0000000 --- a/YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// SessionListViewController.h -// YUMI -// -// Created by zu on 2021/11/25. -// -// 请注意，这是一次冒险。😱 -// - -#import "MvpViewController.h" -#import -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, SessionListOpenType) { - SessionListOpenTypeDefault = 1, - SessionListOpenTypeRoom = 2, -}; - -@interface SessionListViewController : MvpViewController - -- (instancetype)initWithType:(SessionListOpenType)type; -/** 控制器 因为房间内聊天没有控制器去push 或者做其他的操作*/ -@property (nonatomic, weak) UIViewController * mainController; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.m b/YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.m deleted file mode 100644 index fa27a05..0000000 --- a/YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.m +++ /dev/null @@ -1,403 +0,0 @@ -// -// SessionListViewController.m -// xplan-ios -// -// Created by zu on 2021/11/25. -// - -#import "SessionListViewController.h" -#import "SessionListCell.h" -#import "SessionDiscoverNewTableViewCell.h" -#import "SessionViewController.h" -#import "XPMineFriendEmptyTableViewCell.h" - -#import "ClientConfig.h" -#import "Api+Mine.h" -#import "AccountInfoStorage.h" -///Model -#import "UserInfoModel.h" -///View -#import "XPSessionFindNewViewController.h" -#import "TTPopUp.h" -#import "XPSkillCardPlayerManager.h" -#import "MessagePresenter.h" -#import "MessageProtocol.h" -#import "NIMMessageUtils.h" - -NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey"; - -#import - -@interface SessionListViewController () - -/** - * 会话列表 - */ -@property (nonatomic, strong) UITableView *sessionListView; - -/** - * 最近会话集合 - */ -@property (nonatomic, strong) NSMutableArray *recentSessions; - -@property (nonatomic, assign) SessionListOpenType openType; -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); - -@property (nonatomic, strong) NIMRecentSession *recentSession; - -@end - -@implementation SessionListViewController - -- (void)dealloc { - [[NIMSDK sharedSDK].conversationManager removeDelegate:self]; - [[NIMSDK sharedSDK].loginManager removeDelegate:self]; - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (MessagePresenter *)createPresenter { - return [[MessagePresenter alloc] init]; -} - -- (instancetype)initWithType:(SessionListOpenType)type { - self = [self init]; - if (self) { - _openType = type; - } - return self; -} - -- (instancetype)init { - self = [super init]; - if (self) { - _openType = SessionListOpenTypeDefault; - [self initDatas]; - [[NIMSDK sharedSDK].conversationManager addDelegate:self]; - [[NIMSDK sharedSDK].loginManager addDelegate:self]; - ///置顶会话同步 - [[NIMSDKConfig sharedConfig] setShouldSyncStickTopSessionInfos:YES]; - } - return self; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self getUserInfo]; - [self initViews]; - [self initLayout]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(allReadButtonClick) name:@"kAllReadAction" object:nil]; -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; -} - -- (void)getUserInfo { - NSString * uid = [AccountInfoStorage instance].getUid; - @kWeakify(self); - [Api getUserInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - UserInfoModel * userInfo = [UserInfoModel modelWithDictionary:data.data]; - self.userInfo = userInfo; - [[XPSkillCardPlayerManager shareInstance] setUserInfoModel:userInfo]; - [self.sessionListView reloadData]; - } - } uid:uid]; -} -- (void)initViews { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.sessionListView]; -} - -- (void)initLayout { - [self.sessionListView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - if (self.openType == SessionListOpenTypeDefault) { - make.top.mas_equalTo(self.view); - } else { - make.top.mas_equalTo(self.view); - } - }]; -} - -- (void)initDatas { - [self.recentSessions removeAllObjects]; - _recentSessions = [[NIMSDK sharedSDK].conversationManager.allRecentSessions mutableCopy]; - __block int unreadCount = 0; - NSMutableArray * uids = [[NSMutableArray alloc] init]; - [self.recentSessions enumerateObjectsUsingBlock:^(NIMRecentSession * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - [uids addObject:obj.session.sessionId]; - unreadCount += obj.unreadCount; - }]; - [self setTabBarItemBadge:unreadCount]; - [[NIMSDK sharedSDK].userManager fetchUserInfos:uids completion:nil]; - - NIMLoadRecentSessionsOptions *options = [[NIMLoadRecentSessionsOptions alloc] init]; - options.sortByStickTopInfos = YES; - [NIMSDK.sharedSDK.chatExtendManager loadRecentSessionsWithOptions:options completion:^(NSError * _Nullable error, NSArray * _Nullable recentSessions) { - NSLog(@"%@", recentSessions); - }]; -} - -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { - if (userInfo) { - - if (self.openType == SessionListOpenTypeRoom) { - SessionViewController * sessionVC =[[SessionViewController alloc] initWithSession:self.recentSession.session]; - sessionVC.userInfo = userInfo; - sessionVC.openType = self.openType; - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromRight; - [self.mainController.view.layer addAnimation:transition forKey:nil]; - [self.mainController.view addSubview:sessionVC.view]; - [self.mainController addChildViewController:sessionVC]; - } else { - SessionViewController *vc = [[SessionViewController alloc] initWithSession:self.recentSession.session]; - vc.openType = self.openType; - vc.userInfo = userInfo; - [self.navigationController pushViewController:vc animated:YES]; - } - } -} - -#pragma mark - UITableViewDelegate -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ - if (self.recentSessions.count == 0) { - return; - } - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - NIMRecentSession *recentSession = self.recentSessions[indexPath.row]; - self.recentSession = recentSession; - - if ([NIMMessageUtils isOfficalAccount:self.recentSession.session.sessionId]) { - if (self.openType == SessionListOpenTypeRoom) { - SessionViewController * sessionVC =[[SessionViewController alloc] initWithSession:self.recentSession.session]; - sessionVC.openType = self.openType; - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromRight; - [self.mainController.view.layer addAnimation:transition forKey:nil]; - [self.mainController.view addSubview:sessionVC.view]; - [self.mainController addChildViewController:sessionVC]; - } else { - SessionViewController *vc = [[SessionViewController alloc] initWithSession:self.recentSession.session]; - vc.openType = self.openType; - [self.navigationController pushViewController:vc animated:YES]; - } - } else { - [self.presenter getUserInfoWithUid:recentSession.session.sessionId]; - } -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{ - return self.recentSessions.count == 0 ? (KScreenHeight - 200 - kNavigationHeight) : 92.f; -} - -- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { - return self.recentSessions.count == 0 ? NO : YES; -} - -- (NSArray *)tableView:(UITableView *)tableView editActionsForRowAtIndexPath:(NSIndexPath *)indexPath { - UITableViewRowAction * deleteAction = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDefault title:YMLocalizedString(@"SessionListViewController0") handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) { - NIMRecentSession * session = [self.recentSessions xpSafeObjectAtIndex:indexPath.row]; - [[NIMSDK sharedSDK].conversationManager deleteRecentSession:session]; - }]; - deleteAction.title = YMLocalizedString(@"SessionListViewController1"); - deleteAction.backgroundColor = [UIColor redColor]; - return @[deleteAction]; -} - -#pragma mark - UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ - return self.recentSessions.count == 0 ? 1 : self.recentSessions.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - if (self.recentSessions.count == 0) { - XPMineFriendEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineFriendEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - } - cell.emptyTitle = YMLocalizedString(@"XPMineAttentionViewController0"); - return cell; - } else { - static NSString * cellId = @"cellId"; - SessionListCell * cell = [tableView dequeueReusableCellWithIdentifier:cellId]; - if (!cell) { - cell = [[SessionListCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellId]; - } - NIMRecentSession *recent = [self.recentSessions xpSafeObjectAtIndex:indexPath.row]; - [cell renderWithSession:recent]; - return cell; - } -} -#pragma mark - NIMConversationManagerDelegate -- (void)didLoadAllRecentSessionCompletion { - [self initDatas]; - [self.sessionListView reloadData]; -} - -- (void)didAddRecentSession:(NIMRecentSession *)recentSession - totalUnreadCount:(NSInteger)totalUnreadCount { - [self.recentSessions addObject:recentSession]; - [self.recentSessions sortUsingComparator:^NSComparisonResult(id obj1, id obj2) { - NIMRecentSession *item1 = obj1; - NIMRecentSession *item2 = obj2; - if (item1.lastMessage.timestamp < item2.lastMessage.timestamp) { - return NSOrderedDescending; - } - if (item1.lastMessage.timestamp > item2.lastMessage.timestamp) { - return NSOrderedAscending; - } - return NSOrderedSame; - }]; - [self.sessionListView reloadData]; - [self setTabBarItemBadge:totalUnreadCount]; -} - -- (void)didUpdateRecentSession:(NIMRecentSession *)recentSession - totalUnreadCount:(NSInteger)totalUnreadCount { - for (NIMRecentSession *recent in self.recentSessions) { - if ([recentSession.session.sessionId isEqualToString:recent.session.sessionId]) { - [self.recentSessions removeObject:recent]; - break; - } - } - NSInteger insert = [self findInsertPlace:recentSession]; - [self.recentSessions insertObject:recentSession atIndex:insert]; - [self.sessionListView reloadData]; - [self setTabBarItemBadge:totalUnreadCount]; -} - -- (void)didRemoveRecentSession:(NIMRecentSession *)recentSession - totalUnreadCount:(NSInteger)totalUnreadCount { - // 清理本地数据 - NSUInteger index = [self.recentSessions indexOfObject:recentSession]; - [self.recentSessions xpSafeRemoveObjectAtIndex:index]; - - // 如果删除本地会话后就不允许漫游当前会话，则需要进行一次删除服务器会话的操作 - BOOL deleteRemote = NO; - if (deleteRemote) { - [[NIMSDK sharedSDK].conversationManager deleteRemoteSessions:@[recentSession.session] - completion:nil]; - } - [self.sessionListView reloadData]; - [self setTabBarItemBadge:totalUnreadCount]; -} - -#pragma mark - NIMLoginManagerDelegate -- (void)onLogin:(NIMLoginStep)step { - if (step == NIMLoginStepSyncOK) { - [self initDatas]; - } -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} -- (UIScrollView *)listScrollView { - return self.sessionListView; -} -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - self.scrollCallback = callback; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - if (self.scrollCallback){ - self.scrollCallback(scrollView); - } -} - -#pragma mark - Private -- (NSInteger)findInsertPlace:(NIMRecentSession *)recentSession{ - __block NSUInteger matchIdx = 0; - __block BOOL find = NO; - [self.recentSessions enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { - NIMRecentSession *item = obj; - if (item.lastMessage.timestamp <= recentSession.lastMessage.timestamp) { - *stop = YES; - find = YES; - matchIdx = idx; - } - }]; - if (find) { - return matchIdx; - } else { - return self.recentSessions.count; - } -} - -- (void)sort{ - [self.recentSessions sortUsingComparator:^NSComparisonResult(id obj1, id obj2) { - NIMRecentSession *item1 = obj1; - NIMRecentSession *item2 = obj2; - if (item1.lastMessage.timestamp < item2.lastMessage.timestamp) { - return NSOrderedDescending; - } - if (item1.lastMessage.timestamp > item2.lastMessage.timestamp) { - return NSOrderedAscending; - } - return NSOrderedSame; - }]; -} - -- (void)setTabBarItemBadge:(NSInteger)value { - [[NSNotificationCenter defaultCenter]postNotificationName:@"kGetTabBarItemBadge" object:nil userInfo:@{@"BadgeValue":@(value)}]; -} - -#pragma mark - action -- (void)allReadButtonClick { - NSInteger count = [NIMSDK sharedSDK].conversationManager.allUnreadCount; - if (count<1) { - [self showErrorToast:YMLocalizedString(@"SessionListViewController2")]; - return; - } - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.confirmButtonConfig.title = YMLocalizedString(@"SessionListViewController3"); - config.message =YMLocalizedString(@"SessionListViewController4"); - [TTPopup alertWithConfig:config confirmHandler:^{ - [[NIMSDK sharedSDK].conversationManager markAllMessagesRead]; - [self setTabBarItemBadge:0]; - [self.sessionListView reloadData]; - } cancelHandler:^{ - - }]; -} - -- (UITableView *)sessionListView { - if (!_sessionListView) { - _sessionListView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _sessionListView.separatorStyle = UITableViewCellSeparatorStyleNone; - _sessionListView.backgroundColor = UIColor.clearColor; - _sessionListView.delegate = self; - _sessionListView.dataSource = self; - _sessionListView.showsVerticalScrollIndicator = NO; - } - return _sessionListView; -} - -- (NSMutableArray *)recentSessions { - if (!_recentSessions) { - _recentSessions = [NSMutableArray array]; - } - return _recentSessions; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/Model/XPSessionListFansPartyModel.h b/YuMi/Modules/YMMessage/View/SessionListHeadView/Model/XPSessionListFansPartyModel.h deleted file mode 100644 index 21309ad..0000000 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/Model/XPSessionListFansPartyModel.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// YMSessionListFansPartyModel.h -// YUMI -// -// Created by YUMI on 2022/11/24. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSessionListFansPartyModel : PIBaseModel - -@property (nonatomic, copy) NSString *avatar; -@property (nonatomic, copy) NSString *uid; -@property (nonatomic, copy) NSString *erbanNo; -@property (nonatomic, copy) NSString *nick; -@property (nonatomic, copy) NSString *roomUid; -@property (nonatomic, assign) NSInteger gender; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/Model/XPSessionListFansPartyModel.m b/YuMi/Modules/YMMessage/View/SessionListHeadView/Model/XPSessionListFansPartyModel.m deleted file mode 100644 index 01031a4..0000000 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/Model/XPSessionListFansPartyModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMSessionListFansPartyModel.m -// YUMI -// -// Created by YUMI on 2022/11/24. -// - -#import "XPSessionListFansPartyModel.h" - -@implementation XPSessionListFansPartyModel - -@end diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.h b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.h deleted file mode 100644 index b7c175b..0000000 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMSessionHelloEnterView.h -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSessionHelloEnterView : UIView -///有多少人喜欢 -@property (nonatomic,assign) NSInteger number; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.m b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.m deleted file mode 100644 index a7d024d..0000000 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.m +++ /dev/null @@ -1,118 +0,0 @@ -// -// YMSessionHelloEnterView.m -// YUMI -// -// Created by YUMI on 2023/1/31. -// - -#import "XPSessionHelloEnterView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPSessionHelloEnterView () -///图标 -@property (nonatomic,strong) UIImageView *logoImageView; -///打招呼 -@property (nonatomic,strong) UILabel *titleLabel; -///副标题 -@property (nonatomic,strong) UILabel *subTitleLabel; -///分割线 -@property (nonatomic,strong) UIView *lineView; -@end - -@implementation XPSessionHelloEnterView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.logoImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.subTitleLabel]; - [self addSubview:self.lineView]; -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(35, 30)); - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.logoImageView); - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(2); - }]; - - [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(0); - make.leading.trailing.mas_equalTo(self); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(1); - make.height.mas_equalTo(28); - make.top.mas_equalTo(self.logoImageView).offset(20); - make.trailing.mas_equalTo(self); - }]; -} - -- (void)createPersonNumberAttribute:(NSInteger)number { - NSString * numbnerStr = [NSString stringWithFormat:@"%ld", number]; - NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPSessionHelloEnterView0"), numbnerStr]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:8], NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:@"#8A8CAB"]}]; - [attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:@"#FFA027"] range:[title rangeOfString:numbnerStr]]; - self.subTitleLabel.attributedText = attribute; - self.subTitleLabel.textAlignment = NSTextAlignmentCenter; -} -#pragma mark - Getters And Setters -- (void)setNumber:(NSInteger)number { - _number = number; - [self createPersonNumberAttribute:number]; -} - -- (UIImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[UIImageView alloc] init]; - _logoImageView.userInteractionEnabled = YES; - _logoImageView.image = [UIImage imageNamed:@"session_list_hello_enter"]; - } - return _logoImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _titleLabel.textColor = [DJDKMIMOMColor colorWithHexString:@"#171A58"]; - _titleLabel.text = YMLocalizedString(@"XPSessionHelloEnterView1"); - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (UILabel *)subTitleLabel { - if (!_subTitleLabel) { - _subTitleLabel = [[UILabel alloc] init]; - } - return _subTitleLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor colorWithHexString:@"#D8D8D8"]; - } - return _lineView; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.h b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.h deleted file mode 100644 index ac318b4..0000000 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMSessionListHeadFriendCell.h -// YUMI -// -// Created by YUMI on 2022/11/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class XPSessionListFansPartyModel; -@interface XPSessionListHeadFriendCell : UICollectionViewCell - -- (void)configData:(XPSessionListFansPartyModel *)data; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.m b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.m deleted file mode 100644 index d52305f..0000000 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.m +++ /dev/null @@ -1,155 +0,0 @@ -// -// YMSessionListHeadFriendCell.m -// YUMI -// -// Created by YUMI on 2022/11/17. -// - -#import "XPSessionListHeadFriendCell.h" -#import -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -#import "XPSessionListFansPartyModel.h" -#import "XPNoteView.h" - -@interface XPSessionListHeadFriendCell() - -@property (nonatomic, strong) UILabel *nameLabel; -@property (nonatomic, strong) NetImageView *imageView; -@property (nonatomic, strong) UIImageView *dotView; -///音符背景 -@property (nonatomic, strong) UIImageView *noteBgImageView; -///直播中 -@property (nonatomic, strong) UILabel *liveLabel; -///音符动效 -@property (nonatomic,strong) XPNoteView *noteImageView; -///动画的数组 -@property (nonatomic,strong) NSArray *animationArray; -@end - -@implementation XPSessionListHeadFriendCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initView]; - [self initContraints]; - } - return self; -} - -- (void)initView { - [self.contentView addSubview:self.dotView]; - [self.contentView addSubview:self.imageView]; - [self.contentView addSubview:self.nameLabel]; - - - [self.imageView addSubview:self.noteBgImageView]; - [self.imageView addSubview:self.noteImageView]; - [self.imageView addSubview:self.liveLabel]; -} - -- (void)initContraints { - [self.dotView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(0); - make.centerX.mas_equalTo(self); - make.width.height.mas_equalTo(60); - }]; - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self.dotView); - make.width.height.mas_equalTo(56); - }]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.dotView.mas_bottom).mas_offset(2); - make.height.mas_equalTo(17); - make.leading.mas_equalTo(0); - }]; - - [self.noteBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.imageView); - make.height.mas_equalTo(14); - }]; - - [self.noteImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.noteBgImageView).mas_offset(15); - make.centerY.mas_equalTo(self.noteBgImageView).mas_offset(-1); - make.height.mas_equalTo(10); - make.width.mas_equalTo(10); - }]; - [self.liveLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.noteImageView.mas_trailing).mas_offset(2); - make.centerY.mas_equalTo(self.noteImageView); - }]; -} - -- (void)configData:(XPSessionListFansPartyModel *)data { - self.imageView.imageUrl = data.avatar; - NSString *name = data.nick.length > 4 ? [data.nick substringToIndex:4] : data.nick; - self.nameLabel.text = name; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [[UILabel alloc] initWithFrame:CGRectZero]; - _nameLabel.backgroundColor = [UIColor clearColor]; - _nameLabel.font = [UIFont systemFontOfSize:12]; - _nameLabel.textColor = DJDKMIMOMColor.secondTextColor; - _nameLabel.textAlignment = NSTextAlignmentCenter; - } - return _nameLabel; -} - -- (NetImageView *)imageView { - if (!_imageView) { - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _imageView = [[NetImageView alloc] initWithConfig:config]; - _imageView.contentMode = UIViewContentModeScaleAspectFill; - _imageView.layer.cornerRadius = 54/2; - _imageView.layer.masksToBounds = YES; - _imageView.layer.borderWidth = 1; - _imageView.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _imageView; -} - -- (UIImageView *)dotView { - if (!_dotView) { - _dotView = [[UIImageView alloc] init]; - _dotView.layer.cornerRadius = 60 / 2; - _dotView.layer.masksToBounds = YES; - _dotView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x5BC8F8), UIColorFromRGB(0x66D9D9)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(60, 60)]; - } - return _dotView; -} - -- (UIImageView *)noteBgImageView { - if (!_noteBgImageView) { - _noteBgImageView = [[UIImageView alloc] init]; - _noteBgImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFA936), UIColorFromRGB(0xFFCB47)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(52, 14)]; - } - return _noteBgImageView; -} - -- (UILabel *)liveLabel { - if (!_liveLabel) { - _liveLabel = [[UILabel alloc] init]; - _liveLabel.font = [UIFont systemFontOfSize:8]; - _liveLabel.textColor = [UIColor whiteColor]; - _liveLabel.text = YMLocalizedString(@"XPSessionListHeadFriendCell0"); - } - return _liveLabel; -} - -- (XPNoteView *)noteImageView { - if (!_noteImageView) { - _noteImageView = [[XPNoteView alloc] init]; - _noteImageView.pillarColor = [UIColor whiteColor]; - _noteImageView.pillarWidth = 1.5; - [_noteImageView startAnimation]; - } - return _noteImageView; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItem.h b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItem.h deleted file mode 100644 index 0e19f59..0000000 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItem.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMSessionListHeadItem.h -// YUMI -// -// Created by YUMI on 2022/11/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, XPSessionListHeadItemType) { - XPSessionListHeadItemType_Office,//官方公告 - XPSessionListHeadItemType_Activity,//活动通知 - XPSessionListHeadItemType_Subscribe,//订阅提醒 - XPSessionListHeadItemType_MemgXin,//发现萌新 -}; - -@interface XPSessionListHeadItem : PIBaseModel - -@property (nonatomic, copy) NSString *title; -@property (nonatomic, copy) NSString *imageName; -@property (nonatomic, assign) BOOL showRedDot; -@property (nonatomic, assign) XPSessionListHeadItemType type; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItem.m b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItem.m deleted file mode 100644 index 24b2576..0000000 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItem.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMSessionListHeadItem.m -// YUMI -// -// Created by YUMI on 2022/11/17. -// - -#import "XPSessionListHeadItem.h" - -@implementation XPSessionListHeadItem - -@end diff --git a/YuMi/Modules/YMMine/Presenter/MedalsPresenter.h b/YuMi/Modules/YMMine/Presenter/MedalsPresenter.h deleted file mode 100644 index 3c64e3b..0000000 --- a/YuMi/Modules/YMMine/Presenter/MedalsPresenter.h +++ /dev/null @@ -1,62 +0,0 @@ -// -// MedalsPresenter.h -// YuMi -// -// Created by P on 2025/6/17. -// - -#import "BaseMvpPresenter.h" -#import "MedalsModel.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol MedalsPresenterProtocol - -@optional - -- (void)userMedalsSuccess:(UserMedalsModel *)userMedalsModel; -- (void)userMedalsFailure; - -- (void)squareMedalsSuccess:(NSArray *)squareMedalsModel; -- (void)squareMedalsFailure; - -- (void)mineAllMedalsSuccess:(MineAllMedalModel *)model; -- (void)mineAllMedalsFailure; - -- (void)rankListSuccess:(MedalsRankModel *)model; -- (void)rankListFailure; - -- (void)useMedalSuccess; -- (void)useMedalFailure; - -@end - -@interface MedalsPresenter : BaseMvpPresenter - -- (NSInteger)pageSize; -- (NSInteger)rankListSize; - -/// 我的勋章页面（主/客态通用） -/// - Parameters: -/// - uid: 用户uid -/// - page: 页码 -/// - type: 1任务勋章 活动勋章,3荣耀勋章 -- (void)userMedals:(NSInteger)uid - page:(NSInteger)page - type:(NSInteger)type; - -/// 勋章廣場 -/// - Parameters: -/// - page: 页码 -/// - type: 1任务勋章 活动勋章,3荣耀勋章 -- (void)squareMedals:(NSInteger)page - type:(NSInteger)type; - -- (void)mineAllMedals:(NSInteger)page; - -- (void)updateMedalUseStatus:(NSString *)medalId isUse:(BOOL)isUse; - -- (void)rankList:(NSInteger)page; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/MedalsPresenter.m b/YuMi/Modules/YMMine/Presenter/MedalsPresenter.m deleted file mode 100644 index 00c791f..0000000 --- a/YuMi/Modules/YMMine/Presenter/MedalsPresenter.m +++ /dev/null @@ -1,101 +0,0 @@ -// -// MedalsPresenter.m -// YuMi -// -// Created by P on 2025/6/17. -// - -#import "MedalsPresenter.h" -#import "Api+Medals.h" - -@implementation MedalsPresenter - -- (NSInteger)pageSize { - return 8; -} - -- (NSInteger)rankListSize { - return 10; -} - -- (void)userMedals:(NSInteger)uid page:(NSInteger)page type:(NSInteger)type { - @kWeakify(self); - [Api medalMine:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(userMedalsSuccess:)]) { - UserMedalsModel *m = [UserMedalsModel modelWithJSON:data.data]; - [[self getView] userMedalsSuccess:m]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(userMedalsFailure)]) { - [[self getView] userMedalsFailure]; - } - } showLoading:YES errorToast:YES] - pageNo:@(page) pageSize:@([self pageSize]) uid:@(uid) type:@(type)]; -} - -- (void)squareMedals:(NSInteger)page type:(NSInteger)type { - @kWeakify(self); - [Api medalSquare:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(squareMedalsSuccess:)]) { - NSArray *m = [MedalSeriesVo modelsWithArray:data.data]; - [[self getView] squareMedalsSuccess:m]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(squareMedalsFailure)]) { - [[self getView] squareMedalsFailure]; - } - } showLoading:YES errorToast:YES] - pageNo:@(page) pageSize:@([self pageSize]) type:@(type)]; -} - -- (void)mineAllMedals:(NSInteger)page { - @kWeakify(self); - [Api medalMineAll:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(mineAllMedalsSuccess:)]) { - MineAllMedalModel *m = [MineAllMedalModel modelWithJSON:data.data]; - [[self getView] mineAllMedalsSuccess:m]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(mineAllMedalsFailure)]) { - [[self getView] mineAllMedalsFailure]; - } - } showLoading:YES errorToast:YES] pageNo:@(page) pageSize:@([self pageSize])]; -} - -- (void)updateMedalUseStatus:(NSString *)medalId - isUse:(BOOL)isUse { - @kWeakify(self); - [Api medalUseMedal:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(useMedalSuccess)]) { - [[self getView] useMedalSuccess]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(userMedalsFailure)]) { - [[self getView] userMedalsFailure]; - } - } showLoading:YES errorToast:YES] id:medalId useStatus:@(isUse == YES ? 1 : 0)]; -} - -- (void)rankList:(NSInteger)page { - @kWeakify(self); - [Api medalRank:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(rankListSuccess:)]) { - [[self getView] rankListSuccess:[MedalsRankModel modelWithJSON:data.data]]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if ([[self getView] respondsToSelector:@selector(rankListFailure)]) { - [[self getView] rankListFailure]; - } - } showLoading:YES errorToast:YES] pageNo:@(page) pageSize:@([self rankListSize])]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineAttentionPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineAttentionPresenter.h deleted file mode 100644 index fa23736..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineAttentionPresenter.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMMineAttentionPresenter.h -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineAttentionPresenter : BaseMvpPresenter -/// 用户关注列表 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -- (void)getUserAttentionList:(int)page pageSize:(int)pageSize state:(int)state;; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineAttentionPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineAttentionPresenter.m deleted file mode 100644 index 957e81f..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineAttentionPresenter.m +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMMineAttentionPresenter.m -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import "XPMineAttentionPresenter.h" -#import "Api+Mine.h" -#import "AccountInfoStorage.h" -#import "XPMineAttentionProtocol.h" -#import "FansInfoModel.h" - -@implementation XPMineAttentionPresenter - -/// 用户关注列表 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -- (void)getUserAttentionList:(int)page pageSize:(int)pageSize state:(int)state;{ - NSString * uid= [AccountInfoStorage instance].getUid; - NSString * pageStr = [NSString stringWithFormat:@"%d", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize]; - [Api getattentionListCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [FansInfoModel modelsWithArray:data.data]; - [[self getView] getUserAttentionListSuccess:array state:state]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getUserAttentionListFail:state]; - }] uid:uid pageNo:pageStr pageSize:pageSizeStr]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineBlackListPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineBlackListPresenter.h deleted file mode 100644 index 649eb75..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineBlackListPresenter.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineBlackListPresenter.h -// YUMI -// -// Created by YUMI on 2022/5/13. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineBlackListPresenter : BaseMvpPresenter -- (void)getUserListInfo:(NSArray *)array; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineBlackListPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineBlackListPresenter.m deleted file mode 100644 index 39e0c82..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineBlackListPresenter.m +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMMineBlackListPresenter.m -// YUMI -// -// Created by YUMI on 2022/5/13. -// - -#import "XPMineBlackListPresenter.h" -#import "Api+Mine.h" -#import "UserInfoModel.h" -#import "XPMineBlackListProtocol.h" -@implementation XPMineBlackListPresenter - -- (void)getUserListInfo:(NSArray *)array { - NSString * uids = @""; - if (array.count > 0) { - uids = [array componentsJoinedByString:@","]; - } - [Api getUsersListInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *users= [UserInfoModel modelsWithArray:data.data]; - [[self getView] getUserListInfoSuccess:users]; - }] uids:uids]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineCollectRoomListPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineCollectRoomListPresenter.h deleted file mode 100644 index 7faefac..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineCollectRoomListPresenter.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMMineCollectRoomListPresenter.h -// YUMI -// -// Created by YUMI on 2022/7/27. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineCollectRoomListPresenter : BaseMvpPresenter - -/// 获取收藏房间列表 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param type 类型：4：个播房；其他：派对房；不传：所有房间 -- (void)getCollectRoomList:(int)page pageSize:(int)pageSize state:(int)state type:(NSString *)type; - -///批量删除收藏的房间 -- (void)deletecollectRoomWithRoomUids:(NSString *)roomUids; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineCollectRoomListPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineCollectRoomListPresenter.m deleted file mode 100644 index 02b3aa0..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineCollectRoomListPresenter.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// YMMineCollectRoomListPresenter.m -// YUMI -// -// Created by YUMI on 2022/7/27. -// - -#import "XPMineCollectRoomListPresenter.h" -#import "Api+Mine.h" -#import "Api+Room.h" -#import "XPMineCollectRoomListProtocol.h" -#import "AccountInfoStorage.h" -#import "HomeCollectRoomModel.h" - -@implementation XPMineCollectRoomListPresenter - -/// 获取收藏房间列表 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param type 类型：4：个播房；其他：派对房；不传：所有房间 -- (void)getCollectRoomList:(int)page pageSize:(int)pageSize state:(int)state type:(NSString *)type { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api requestMineCollectRoomList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomeCollectRoomModel modelsWithArray:data.data[@"fansRoomList"]]; - [[self getView] onGetCollectRoomListSuccess:array state:state]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getCollectRoomListFail:state]; - }] uid:uid page:[NSString stringWithFormat:@"%d", page] pageSize:[NSString stringWithFormat:@"%d", pageSize] roomType:type.length ? type : NULL]; -} - -///批量删除收藏的房间 -- (void)deletecollectRoomWithRoomUids:(NSString *)roomUids { - NSString * type = @"3"; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api collectRoom:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] deleteCollectRoomSuccess]; - }] roomUid:@"" uid:uid type:type roomUids:roomUids]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineFansPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineFansPresenter.h deleted file mode 100644 index 14c1a29..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineFansPresenter.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// YMMineFansPresenter.h -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineFansPresenter : BaseMvpPresenter -/// 用户粉丝列表 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -- (void)getUserFansList:(int)page pageSize:(int)pageSize state:(int)state; - -/// 关注粉丝 -/// @param targetUid 目标用户的uid -- (void)attentionFans:(NSString *)targetUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineFansPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineFansPresenter.m deleted file mode 100644 index 8642275..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineFansPresenter.m +++ /dev/null @@ -1,43 +0,0 @@ -// -// YMMineFansPresenter.m -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import "XPMineFansPresenter.h" -#import "Api+Mine.h" -#import "XPMineFansProtocol.h" -#import "AccountInfoStorage.h" -#import "FansInfoModel.h" - -@implementation XPMineFansPresenter - - -/// 用户粉丝列表 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -- (void)getUserFansList:(int)page pageSize:(int)pageSize state:(int)state { - NSString * uid= [AccountInfoStorage instance].getUid; - NSString * pageStr = [NSString stringWithFormat:@"%d", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize]; - [Api getFansListCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [FansInfoModel modelsWithArray:data.data[@"fansList"]]; - [[self getView] getUserFansListSuccess:array state:state]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getUserFansListFail:state]; - }] uid:uid pageNo:pageStr pageSize:pageSizeStr]; -} - -/// 关注粉丝 -/// @param targetUid 目标用户的uid -- (void)attentionFans:(NSString *)targetUid { - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * type = @"1"; - [Api attentionCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] attentionFansSuccess]; - }] uid:uid likedUid:targetUid ticket:ticket type:type]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineFansTeamPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineFansTeamPresenter.h deleted file mode 100644 index 383287a..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineFansTeamPresenter.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMMineFansTeamPresenter.h -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineFansTeamPresenter : BaseMvpPresenter - -/// 获取粉丝团列表 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -- (void)getAnchorFansTeamList:(int)page pageSize:(int)pageSize state:(int)state; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineFansTeamPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineFansTeamPresenter.m deleted file mode 100644 index 87c720d..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineFansTeamPresenter.m +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMMineFansTeamPresenter.m -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "XPMineFansTeamPresenter.h" -#import "Api+Mine.h" -#import "XPMineAnchorFansTeamProtocol.h" -#import "XPMineAnchorFansTeamModel.h" - -@implementation XPMineFansTeamPresenter - -/// 获取粉丝团列表 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -- (void)getAnchorFansTeamList:(int)page pageSize:(int)pageSize state:(int)state { - [Api getAnchorFansTeamListCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *array = [XPMineAnchorFansTeamModel modelsWithArray:data.data]; - [[self getView] getAnchorFansTeamListSuccess:array state:state]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getAnchorFansTeamListFail:state]; - }] pageNum:[NSString stringWithFormat:@"%d", page] pageSize:[NSString stringWithFormat:@"%d", pageSize]]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineFeedbackPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineFeedbackPresenter.h deleted file mode 100644 index 477ba2e..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineFeedbackPresenter.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMFeedbackPresenter.h -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineFeedbackPresenter : BaseMvpPresenter - -/// 保存反馈 -/// @param feedback 反馈的内容 -/// @param contact 反馈的联系方式 -- (void)saveFeedBackWith:(NSString *)feedback contact:(NSString *)contact; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineFeedbackPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineFeedbackPresenter.m deleted file mode 100644 index 0006c53..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineFeedbackPresenter.m +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMFeedbackPresenter.m -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "XPMineFeedbackPresenter.h" -///Tool -#import "AccountInfoStorage.h" -///Api -#import "Api+Mine.h" -///P -#import "XPMineFeedbackProtocol.h" - -@implementation XPMineFeedbackPresenter - -/// 保存反馈 -/// @param feedback 反馈的内容 -/// @param contact 反馈的联系方式 -- (void)saveFeedBackWith:(NSString *)feedback contact:(NSString *)contact { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api saveFeedBackWith:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] saveFeedbackSuccess]; - } showLoading:YES] feedbackDesc:feedback contact:contact uid:uid ticket:ticket]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineFootPrintPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineFootPrintPresenter.h deleted file mode 100644 index ceb4a2c..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineFootPrintPresenter.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// YMMineFootPrintPresenter.h -// YUMI -// -// Created by YUMI on 2022/7/26. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineFootPrintPresenter : BaseMvpPresenter - -///获取进房记录 -/// @param page 当前页码 -/// @param pageSize 每页数量 -/// @param state 0：刷新， 1：加载更多 -- (void)getFootPrintListWithPage:(int)page pageSize:(int)pageSize state:(int)state; - -/// 清除进房记录 -/// @param roomUid 不传则清空所有 -- (void)cleanFootPrint:(NSString *)roomUid; - -/// 收藏房间 -/// @param roomUid 房间uid -- (void)collectRoomWithRoomUid:(NSString *)roomUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineFootPrintPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineFootPrintPresenter.m deleted file mode 100644 index daae806..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineFootPrintPresenter.m +++ /dev/null @@ -1,49 +0,0 @@ -// -// YMMineFootPrintPresenter.m -// YUMI -// -// Created by YUMI on 2022/7/26. -// - -#import "XPMineFootPrintPresenter.h" -#import "Api+Mine.h" -#import "Api+Room.h" -#import "XPMineFootPrintProtocol.h" -#import "AccountInfoStorage.h" -#import "XPMineFootPrintModel.h" - -@implementation XPMineFootPrintPresenter - -///获取进房记录 -/// @param page 当前页码 -/// @param pageSize 每页数量 -/// @param state 0：刷新， 1：加载更多 -- (void)getFootPrintListWithPage:(int)page pageSize:(int)pageSize state:(int)state { - NSString *uid = [AccountInfoStorage instance].getUid; - [Api requestFootPrint:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *array = [XPMineFootPrintModel modelsWithArray:data.data]; - [[self getView] getFootPrintListSuccess:array state:state]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getFootPrintListFail:state]; - }] uid:uid page:[NSString stringWithFormat:@"%d", page] pageSize:[NSString stringWithFormat:@"%d", pageSize]]; -} - -/// 清除进房记录 -/// @param roomUid 不传则清空所有 -- (void)cleanFootPrint:(NSString *)roomUid { - NSString *uid = [AccountInfoStorage instance].getUid; - [Api requestCleanFootPrint:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] cleanFootPrintSuccess]; - }] uid:uid roomUid:roomUid.length ? roomUid : NULL]; -} - -///收藏房间 -- (void)collectRoomWithRoomUid:(NSString *)roomUid { - NSString * type = @"1"; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api collectRoom:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] collectRoomSuccess]; - }] roomUid:roomUid uid:uid type:type roomUids:@""]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineFriendPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineFriendPresenter.h deleted file mode 100644 index 3417d54..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineFriendPresenter.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMineFriendPresenter.h -// YUMI -// -// Created by YUMI on 2022/5/29. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineFriendPresenter : BaseMvpPresenter -- (void)getUserListInfo:(NSArray *)array; -- (void)getFriends:(NSInteger)page; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineFriendPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineFriendPresenter.m deleted file mode 100644 index 9c10a96..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineFriendPresenter.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// YMMineFriendPresenter.m -// YUMI -// -// Created by YUMI on 2022/5/29. -// - -#import "XPMineFriendPresenter.h" -#import "Api+Mine.h" -#import "XPMineFriendProtocol.h" -#import "UserInfoModel.h" - -@implementation XPMineFriendPresenter - -- (void)getUserListInfo:(NSArray *)array { - NSString * uids = @""; - if (array.count > 0) { - uids = [array componentsJoinedByString:@","]; - } - [Api getUsersListInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *users= [UserInfoModel modelsWithArray:data.data]; - [[self getView] getUserListInfoSuccess:users]; - }] uids:uids]; -} - -- (void)getFriends:(NSInteger)page { - @kWeakify(self); - [Api fansFriendList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] getFriendsList:[UserInfoModel modelsWithArray:data.data]]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] getFriendsFailure]; - } showLoading:NO errorToast:YES] pageNo:@(page) pageSize:@(20)]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineLoginPasswordPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineLoginPasswordPresenter.h deleted file mode 100644 index 60e5d0d..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineLoginPasswordPresenter.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMMineLoginPasswordPresenter.h -// YUMI -// -// Created by YUMI on 2022/4/25. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineLoginPasswordPresenter : BaseMvpPresenter -/// 设置登录密码 -/// @param phone 手机号 -/// @param newPwd 密码 -- (void)setLoginPassword:(NSString *)phone newPwd:(NSString *)newPwd; - -/// 修改登录密码 -/// @param phone 手机号 -/// @param newPwd 新密码 -/// @param pwd 旧密码 -- (void)modifyLoginPassword:(NSString *)phone newPwd:(NSString *)newPwd pwd:(NSString *)pwd; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineLoginPasswordPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineLoginPasswordPresenter.m deleted file mode 100644 index 8c380a7..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineLoginPasswordPresenter.m +++ /dev/null @@ -1,43 +0,0 @@ -// -// YMMineLoginPasswordPresenter.m -// YUMI -// -// Created by YUMI on 2022/4/25. -// - -#import "XPMineLoginPasswordPresenter.h" -#import "Api+Mine.h" -#import "DESEncrypt.h" -#import "YUMIConstant.h" -#import "XPMineLoginPasswordProtocol.h" - -@implementation XPMineLoginPasswordPresenter - - -/// 设置登录密码 -/// @param phone 手机号 -/// @param newPwd 密码 -- (void)setLoginPassword:(NSString *)phone newPwd:(NSString *)newPwd { - NSString * desNewPwd = [DESEncrypt encryptUseDES:newPwd key:KeyWithType(KeyType_PasswordEncode)]; - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api setLoingPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] setLoginPasswordSuccess]; - } showLoading:YES] phone:desPhone newPwd:desNewPwd]; -} - - -/// 修改登录密码 -/// @param phone 手机号 -/// @param newPwd 新密码 -/// @param pwd 旧密码 -- (void)modifyLoginPassword:(NSString *)phone newPwd:(NSString *)newPwd pwd:(NSString *)pwd{ - NSString * desNewPwd = [DESEncrypt encryptUseDES:newPwd key:KeyWithType(KeyType_PasswordEncode)]; - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - NSString * desPwd = [DESEncrypt encryptUseDES:pwd key:KeyWithType(KeyType_PasswordEncode)]; - [Api modifyLoingPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] modifyLoginPasswordSuccess]; - }] phone:desPhone newPwd:desNewPwd pwd:desPwd]; -} - - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineModifPayPwdPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineModifPayPwdPresenter.h deleted file mode 100644 index 6611978..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineModifPayPwdPresenter.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMMineModifPayPwdPresenter.h -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "MainPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineModifPayPwdPresenter : MainPresenter - -/// 修改支付密码 -/// @param oldPasswd 旧的密码 -/// @param newPasswd 新的密码 -- (void)modifyPaymentPasswordWitholdPassword:(NSString *)oldPasswd - newPassword:(NSString *)newPasswd; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineModifPayPwdPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineModifPayPwdPresenter.m deleted file mode 100644 index 84e57e3..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineModifPayPwdPresenter.m +++ /dev/null @@ -1,34 +0,0 @@ -// -// YMMineModifPayPwdPresenter.m -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "XPMineModifPayPwdPresenter.h" -#import "Api+Mine.h" -///Tool -#import "DESEncrypt.h" -#import "AccountInfoStorage.h" -#import "YUMIConstant.h" -///P -#import "XPMineModifPayProtocol.h" - -@implementation XPMineModifPayPwdPresenter - - -/// 修改支付密码 -/// @param oldPasswd 旧的密码 -/// @param newPasswd 新的密码 -- (void)modifyPaymentPasswordWitholdPassword:(NSString *)oldPasswd - newPassword:(NSString *)newPasswd { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - NSString * newpasswordDes = [DESEncrypt encryptUseDES:newPasswd key:KeyWithType(KeyType_PasswordEncode)]; - NSString * oldpasswordDes = [DESEncrypt encryptUseDES:oldPasswd key:KeyWithType(KeyType_PasswordEncode)]; - [Api modifPayPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] modifPayPasswordSuccess]; - }] newPasswd:newpasswordDes oldPasswd:oldpasswordDes uid:uid ticket:ticket]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineNotificaPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineNotificaPresenter.h deleted file mode 100644 index 7c4ca54..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineNotificaPresenter.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMMineNotificaPresenter.h -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN -@class XPMineNotificationItemModel; -@interface XPMineNotificaPresenter : BaseMvpPresenter -/// 请求当前开关的状态 -- (void)requestUserInfoNotifyStatus; - -/// 更新系统消息状态 -- (void)updateUserInfoSystemNotify:(BOOL)notify; -/// 更新开播消息状态 -- (void)updateBroadCastNotify:(BOOL)notify; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineNotificaPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineNotificaPresenter.m deleted file mode 100644 index f08cdfe..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineNotificaPresenter.m +++ /dev/null @@ -1,69 +0,0 @@ -// -// YMMineNotificaPresenter.m -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "XPMineNotificaPresenter.h" -///Api -#import "Api+Mine.h" -///P -#import "XPMineNotificaProtocol.h" -///Tool -#import "AccountInfoStorage.h" -///Model -#import "XPMineNotifyStatus.h" -#import "XPMineNotificationItemModel.h" - -@interface XPMineNotificaPresenter () -///系统消息 -@property (nonatomic,strong) XPMineNotificationItemModel *systemModel; -@end - -@implementation XPMineNotificaPresenter - -- (id)getView { - return (id)[super getView]; -} - - -/// 请求当前开关的状态 -- (void)requestUserInfoNotifyStatus { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api requestUserInfoNotifyStatus:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - XPMineNotifyStatus * model = [XPMineNotifyStatus modelWithDictionary:data.data]; - if (self.systemModel == nil) { - XPMineNotificationItemModel * systemItem = [[XPMineNotificationItemModel alloc] init]; - systemItem.title = YMLocalizedString(@"XPMineNotificaPresenter0"); - systemItem.desc = YMLocalizedString(@"XPMineNotificaPresenter1"); - self.systemModel = systemItem; - } - self.systemModel.notification = model.sysMsgNotify; - XPMineNotificationItemModel * broadcastItem = [[XPMineNotificationItemModel alloc] init]; - broadcastItem.title = YMLocalizedString(@"XPMineNotificaPresenter2"); - broadcastItem.desc = YMLocalizedString(@"XPMineNotificaPresenter3"); - broadcastItem.notification = model.singleBroadcastMsgNotify; - NSArray * array = @[self.systemModel, broadcastItem]; - [[self getView] requestUserInfoNotifyStatusSuccess:array]; - }] uid:uid]; -} - -/// 更新系统消息状态 -- (void)updateUserInfoSystemNotify:(BOOL)notify { - NSString * notifyStr = [NSString stringWithFormat:@"%d", notify]; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api updateUserInfoSystemNotifyWith:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - - }] sysMsgNotify:notifyStr uid:uid]; -} - -/// 更新开播消息状态 -- (void)updateBroadCastNotify:(BOOL)notify { - NSString * notifyStr = [NSString stringWithFormat:@"%d", notify]; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api updateAnchorBroadCastNotifyWith:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - - }] msgNotify:notifyStr uid:uid]; -} -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.h deleted file mode 100644 index b697ad6..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// YMMinePayPwdPresenter.h -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "MainPresenter.h" -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMinePayPwdPresenter : MainPresenter -/// 获取手机的验证码 -/// @param phone 手机号 -/// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type phoneAreaCode:(NSString *)phoneAreaCode; - -/// 设置支付密码 -/// @param password 支付密码 -/// @param phone 手机号 -/// @param veriftCode 验证码 -//- (void)setPayPassword:(NSString *)password phone:(NSString *)phone veriftCode:(NSString *)veriftCode; - -/// 设置支付密码 -/// @param password 支付密码 - -- (void)setPayPassword:(NSString *)password; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.m deleted file mode 100644 index 80e51b1..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMinePayPwdPresenter.m +++ /dev/null @@ -1,42 +0,0 @@ -// -// YMMinePayPwdPresenter.m -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "XPMinePayPwdPresenter.h" -///Api -#import "Api+Mine.h" -///P -#import "XPMinePayPwdProtocol.h" -///Tool -#import "DESEncrypt.h" -#import "YUMIConstant.h" -#import "AccountInfoStorage.h" - -@implementation XPMinePayPwdPresenter - -/// 获取手机的验证码 -/// @param phone 手机号 -/// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type phoneAreaCode:(NSString *)phoneAreaCode{ - NSString * typeStr = [NSString stringWithFormat:@"%lu", (unsigned long)type]; - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api phoneSmsCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] phoneSmsCodeSuccess]; - } showLoading:YES errorToast:YES] mobile:desPhone type:typeStr phoneAreaCode:phoneAreaCode]; -} - -/// 设置支付密码 -/// @param password 支付密码 - -- (void)setPayPassword:(NSString *)password { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - NSString * newpasswordDes = [DESEncrypt encryptUseDES:password key:KeyWithType(KeyType_PasswordEncode)]; - [Api setPayPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] setPayPasswordSuccess]; - }] newPasswd:newpasswordDes uid:uid ticket:ticket]; -} -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMinePresent.h b/YuMi/Modules/YMMine/Presenter/XPMinePresent.h deleted file mode 100644 index 74bcc2b..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMinePresent.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// YMMinePresent.h -// YUMI -// -// Created by YUMI on 2021/9/16. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN -@interface XPMinePresent : BaseMvpPresenter - -/// 获取用户信息 -- (void)getUserInfo; - -/// 获取钱包信息 -- (void)getUserWalletInfo; - -/// 获取家族详细的信息 -- (void)getClanDetailInfo; - -///获取VIP信息 -- (void)getNobleInfo; - -///获取个人功能列表 -- (void)getPersonItemList; - -///获取个人中心banner -- (void)getMineBannerList; - -- (void)visitUserPageSuccess:(void(^)(NSNumber *browseNum, NSNumber *friendCount, NSNumber *browseNumTip, NSNumber *visitListVipLimit))success failure:(void(^)(NSError *error))failure; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMinePresent.m b/YuMi/Modules/YMMine/Presenter/XPMinePresent.m deleted file mode 100644 index a97f82c..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMinePresent.m +++ /dev/null @@ -1,149 +0,0 @@ -// -// YMMinePresent.m -// YUMI -// -// Created by YUMI on 2021/9/16. -// - -#import "XPMinePresent.h" -///Tool -#import "AccountInfoStorage.h" -///Api -#import "Api+Mine.h" -#import "Api+Guild.h" -#import "Api+Home.h" -#import "Api+LittleGame.h" -///Model -#import "XPMineItemModel.h" -#import "UserInfoModel.h" -#import "ClanDetailInfoModel.h" -#import "XPMineFunctionItemModel.h" -#import "HomeBannerInfoModel.h" -#import "WalletInfoModel.h" -#import "ClanDetailInfoModel.h" -#import "LittleGameInfoModel.h" -#import "HomeLittleGameRoomModel.h" -///Protocol -#import "XPMineProtocol.h" -#import "Api+NobleCenter.h" -#import "NobleCenterModel.h" -@implementation XPMinePresent - -/// 获取用户信息 -- (void)getUserInfo { - NSString * uid = [[AccountInfoStorage instance] getUid]; - if (uid.length == 0) { - return; - } - @kWeakify(self); - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetUserInfoSuccess:infoModel]; - } errorToast:NO] uid:uid]; -} - -/// 获取钱包信息 -- (void)getUserWalletInfo { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - if (!uid.length) { - [[self getView] getUserWalletInfoFail]; - return; - } - @kWeakify(self); - [Api getUserWalletInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data]; - [[self getView] getUserWalletInfo:model]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] getUserWalletInfoFail]; - }] uid:uid ticket:ticket]; -} - - -/// 获取家族详细的信息 -- (void)getClanDetailInfo { - NSString * uid = [[AccountInfoStorage instance] getUid]; - if (!uid.length) { -// [[self getView]onGetClanDetailInfoFail]; - return; - } - @kWeakify(self); - [Api getNewClanDetailInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - ClanDetailMainInfoModel * clanDetailInfo = [ ClanDetailMainInfoModel modelWithDictionary:data.data]; - [[self getView] onGetClanDetailInfoSuccess:clanDetailInfo]; - }fail:^(NSInteger code, NSString * _Nullable msg) { -// @kStrongify(self); -// [[self getView]onGetClanDetailInfoFail]; -// NSLog(@"%@", msg); - }] uid:uid]; -} - -///获取个人功能列表 -- (void)getPersonItemList { - NSString * uid = [[AccountInfoStorage instance] getUid]; - if (!uid.length){ - [[self getView] onGetMineFunctionsItemFail]; - return; - } - @kWeakify(self); - [Api requestPersonalFunctionItem:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray *array = [XPMineFunctionItemModel modelsWithArray:data.data]; - [[self getView] onGetMineFuntionItemSuccess:array]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] onGetMineFunctionsItemFail]; - }] uid:uid]; -} -///获取VIP信息 -- (void)getNobleInfo { - @kWeakify(self); - [Api vipCenterLevelList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NobleCenterModel *model = [NobleCenterModel modelWithDictionary:data.data]; - [[self getView] getNobleCenterInfoSuccess:model ]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] getNobleCenterInfoFail]; - }]]; -} -///获取个人中心banner -- (void)getMineBannerList { - NSString * uid = [[AccountInfoStorage instance] getUid]; - if (!uid.length) { - [[self getView] onGetPersonalBannerListFail]; - return; - } - @kWeakify(self); - [Api requestMineBannerList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray * array = [HomeBannerInfoModel modelsWithArray:data.data]; - [[self getView] onGetPersonalBannerListSuccess:array]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] onGetPersonalBannerListFail]; - } errorToast:NO] uid:uid type:@"10"]; -} - -- (void)visitUserPageSuccess:(void(^)(NSNumber *browseNum, NSNumber *friendCount, NSNumber *browseNumTip, NSNumber *visitListVipLimit))success - failure:(void(^)(NSError *error))failure { - [Api userDetailMine:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - NSNumber *browseNum = [data.data objectForKey:@"browseNum"]; - NSNumber *friendCount = [data.data objectForKey:@"friendCount"]; - NSNumber *browseNumTip = [data.data objectForKey:@"browseNumTip"]; - NSNumber *vipLimit = [data.data objectForKey:@"visitListVipLimit"]; - success(browseNum, friendCount, browseNumTip, vipLimit); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:NO errorToast:NO]]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineRechargePresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineRechargePresenter.h deleted file mode 100644 index f1983af..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineRechargePresenter.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// YMMineRechargePresenter.h -// YUMI -// -// Created by YUMI on 2021/9/24. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineRechargePresenter : BaseMvpPresenter - -/// 获取钱包信息 -- (void)getUserWalletInfo; -/// 请求内购列表 -/// @param channel 目前是8 -- (void)requestRechargeListWithChannel:(NSString *)channel; - -/// 获取充值的订单编号 -/// @param chargeProdId 苹果服务器的充值 的id -- (void)requestIAPRechargeOrderWithChargeProdId:(NSString *)chargeProdId; - -/// 充值成功二次验证 -/// @param orderId 订单编号 -/// @param transcationId 商品id -- (void)checkReceiptWithOrderId:(NSString *)orderId transcationId:(NSString *)transcationId errorToast:(BOOL)errorToast; - -/// 批量验证内购掉单 -/// @param transcations 凭据的数组 -- (void)checkTranscationIds:(NSArray *)transcations; -//充值banner位 --(void)getBannerList; -//联系客服 --(void)getContactCustomerService; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineRechargePresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineRechargePresenter.m deleted file mode 100644 index a9282fe..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineRechargePresenter.m +++ /dev/null @@ -1,110 +0,0 @@ -// -// YMMineRechargePresenter.m -// YUMI -// -// Created by YUMI on 2021/9/24. -// - -#import "XPMineRechargePresenter.h" -///Api -#import "Api+Mine.h" -///Tool -#import "AccountInfoStorage.h" -#import "YYUtility.h" -#import "NSObject+MJExtension.h" -///P -#import "XPMineRechargeProtocol.h" -///Model -#import "RechargeListModel.h" -#import "WalletInfoModel.h" -@implementation XPMineRechargePresenter - - -/// 获取钱包信息 -- (void)getUserWalletInfo { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api getUserWalletInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data]; - [[self getView] getUserWalletInfo:model]; - }] uid:uid ticket:ticket]; -} - - -/// 请求内购列表 -/// @param channel 目前是8 -- (void)requestRechargeListWithChannel:(NSString *)channel { - [Api getRechargeList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [RechargeListModel modelsWithArray:data.data]; - [[self getView] requestRechargeListSucccess:array]; - }] channelType:channel]; -} - -/// 获取充值的订单编号 -/// @param chargeProdId 苹果服务器的充值 的id -- (void)requestIAPRechargeOrderWithChargeProdId:(NSString *)chargeProdId { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - NSString * deviceInfo = [YYUtility deviceID]; - NSString * clientIp= [YYUtility ipAddress]; - @kWeakify(self); - [Api requestIAPRecharge:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSString *orderId = (NSString *)data.data[@"recordId"]; - NSString *uuid = (NSString *)data.data[@"appAccountToken"]; - [[self getView] requestIAPRechargeOrderSuccess:orderId chargeProdId:chargeProdId uuid:uuid]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if(code != 50000){ - [[self getView]showErrorToast:msg]; - } - [[self getView] requestIAPRechargeOrderFailWithCode:code]; - } errorToast:NO] chargeProdId:chargeProdId uid:uid ticket:ticket deviceInfo:deviceInfo clientIp:clientIp]; -} - - -/// 充值成功二次验证 -/// @param orderId 订单编号 -/// @param transcationId 商品id -- (void)checkReceiptWithOrderId:(NSString *)orderId transcationId:(NSString *)transcationId errorToast:(BOOL)errorToast{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - @kWeakify(self); - [Api checkReceipt:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] checkReceiptSuccess:transcationId]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView]checkReceiptFailWithCode:code transcationId:transcationId]; - } showLoading:NO errorToast:errorToast] chooseEnv:@"true" chargeRecordId:orderId transcationId:transcationId uid:uid ticket:ticket]; -} - - -/// 批量验证内购掉单 -/// @param transcations 凭据的数组 -- (void)checkTranscationIds:(NSArray *)transcations { - NSString * transcationIdStr = [transcations toJSONString]; - [Api requestCheckTranscationIds:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] checkTranscationIdsSuccess]; - }] transcationIdStr:transcationIdStr]; -} -//充值banner位 --(void)getBannerList{ - [Api requestBannerListCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - - NSArray * array = [RechargeListModel modelsWithArray:data.data[@"banners"]]; - [[self getView]getBannerListSuccessWithList:array]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:NO errorToast:NO]]; -} -//联系客服 --(void)getContactCustomerService{ - [Api requestContactCustomerServiceCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSString *uid = [NSString stringWithFormat:@"%@",data.data]; - [[self getView]getContactCustomerServiceSuccessWithUid:uid]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:NO]]; -} -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineResetLoginPwdPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineResetLoginPwdPresenter.h deleted file mode 100644 index 9323125..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineResetLoginPwdPresenter.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMMineResetLoginPwdPresenter.h -// YUMI -// -// Created by YUMI on 2022/5/5. -// - -#import "BaseMvpPresenter.h" -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineResetLoginPwdPresenter : BaseMvpPresenter - -/// 获取手机的验证码 -/// @param phone 手机号 -/// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type phoneAreaCode:(NSString *)phoneAreaCode; - -/// 重新设置登录密码 -/// @param phone 手机号 -/// @param smsCode 验证码 -/// @param newPwd 密码 -- (void)resetLoginPassword:(NSString *)phone smsCode:(NSString *)smsCode newPwd:(NSString *)newPwd; - -/// 退出当前账号 -- (void)logoutCurrentAccount; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineResetLoginPwdPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineResetLoginPwdPresenter.m deleted file mode 100644 index 468aa19..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineResetLoginPwdPresenter.m +++ /dev/null @@ -1,70 +0,0 @@ -// -// YMMineResetLoginPwdPresenter.m -// YUMI -// -// Created by YUMI on 2022/5/5. -// - -#import "XPMineResetLoginPwdPresenter.h" -#import -#import "Api+Mine.h" -#import "Api+Room.h" -#import "DESEncrypt.h" -#import "YUMIConstant.h" -#import "XPMineResetLoginPwdProtocol.h" -#import "XPRoomMiniManager.h" -#import "AccountInfoStorage.h" -#import "RtcManager.h" -#import "RoomInfoModel.h" -#import "AccountModel.h" -@implementation XPMineResetLoginPwdPresenter - -/// 获取手机的验证码 -/// @param phone 手机号 -/// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type phoneAreaCode:(NSString *)phoneAreaCode{ - NSString * typeStr = [NSString stringWithFormat:@"%lu", (unsigned long)type]; - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api phoneSmsCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] phoneSmsCodeSuccess]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - }] mobile:desPhone type:typeStr phoneAreaCode:phoneAreaCode]; -} - -/// 重新设置登录密码 -/// @param phone 手机号 -/// @param smsCode 验证码 -/// @param newPwd 密码 -- (void)resetLoginPassword:(NSString *)phone smsCode:(NSString *)smsCode newPwd:(NSString *)newPwd { - NSString * desNewPwd = [DESEncrypt encryptUseDES:newPwd key:KeyWithType(KeyType_PasswordEncode)]; - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api resetLoingPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] resetLoginPasswordSuccess]; - }] phone:desPhone newPwd:desNewPwd smsCode:smsCode]; -} - -/// 退出当前账号 -- (void)logoutCurrentAccount { - if([XPRoomMiniManager shareManager].getRoomInfo) { - NSString *roomUid = [NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.uid]; - ///上报退房 - [Api requestReportUserOutRoom:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - } uid:[[AccountInfoStorage instance] getUid] roomUid:roomUid ticket:[[AccountInfoStorage instance] getTicket]]; - ///退出房间 - NSString * roomId = [NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.roomId]; - [[NIMSDK sharedSDK].chatroomManager exitChatroom:roomId completion:nil]; - [[RtcManager instance] exitRoom]; - [[XPRoomMiniManager shareManager] configRoomInfo:nil]; - [[XPRoomMiniManager shareManager] configUserInfo:nil]; - [[XPRoomMiniManager shareManager] configCurrentMusic:nil isPlaying:NO]; - [[XPRoomMiniManager shareManager] resetLocalMessage]; - } - AccountModel * account = [[AccountInfoStorage instance] accountModel]; - [Api logoutCurrentAccount:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] logoutCurrentAccountSuccess]; - }] access_token:account.access_token]; - [self logout]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineResetPayPasswordPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineResetPayPasswordPresenter.h deleted file mode 100644 index 5610104..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineResetPayPasswordPresenter.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMMineResetPayPasswordPresenter.h -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "MainPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineResetPayPasswordPresenter : MainPresenter -/// 重置支付密码 -/// @param password 支付密码 -/// @param phone 手机号 -/// @param veriftCode 验证码 -- (void)resetPayPassword:(NSString *)password phone:(NSString *)phone veriftCode:(NSString *)veriftCode; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineResetPayPasswordPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineResetPayPasswordPresenter.m deleted file mode 100644 index d2e9bfd..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineResetPayPasswordPresenter.m +++ /dev/null @@ -1,33 +0,0 @@ -// -// YMMineResetPayPasswordPresenter.m -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "XPMineResetPayPasswordPresenter.h" -///Api -#import "Api+Mine.h" -///Tool -#import "AccountInfoStorage.h" -#import "DESEncrypt.h" -#import "YUMIConstant.h" -///P -#import "XPMineResetPayPasswordProtocol.h" - -@implementation XPMineResetPayPasswordPresenter - -/// 重置支付密码 -/// @param password 支付密码 -/// @param phone 手机号 -/// @param veriftCode 验证码 -- (void)resetPayPassword:(NSString *)password phone:(NSString *)phone veriftCode:(NSString *)veriftCode { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - NSString * newpasswordDes = [DESEncrypt encryptUseDES:password key:KeyWithType(KeyType_PasswordEncode)]; - [Api setPayPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] resetPayPasswordSuccess]; - }] newPasswd:newpasswordDes phone:phone code:veriftCode uid:uid ticket:ticket]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.h b/YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.h deleted file mode 100644 index ef17530..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// YMMineSettingPresent.h -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel; -@interface XPMineSettingPresent : BaseMvpPresenter --(void)clearList; -/// 获取用户信息 -- (void)getUserInfo; - -/// 获取数据源 -/// @param userinfo 当前的用户信息 -- (void)getMineSettingDataSourceWith:(UserInfoModel *)userinfo; - -/// 退出当前账号 -- (void)logoutCurrentAccount; - -///获取版本更新 -- (void)getVersionUpdate; -///得到屏蔽房间列表 --(void)getBlackRoomListWithPageNum:(NSString *)pageNum pageSize:(NSString *)pageSize; -///解除屏蔽 --(void)requestUnmaskingFromBlackRoomListWithRoomUid:(NSString *)roomUid type:(NSString *)type; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.m b/YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.m deleted file mode 100644 index adc88e5..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.m +++ /dev/null @@ -1,210 +0,0 @@ -// -// YMMineSettingPresent.m -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "XPMineSettingPresent.h" -#import "Api+Mine.h" -#import "Api+Room.h" -///P -#import "XPMineSettingProtocol.h" -///Model -#import "UserInfoModel.h" -#import "AccountModel.h" -#import "XPMineSettingItemModel.h" -#import "YYUtility.h" -#import "XPVersionUpdateModel.h" -#import "Api+Main.h" -#import "XPMaskManagerModel.h" -///Tool -#import "AccountInfoStorage.h" -#import "XPRoomMiniManager.h" -#import "RtcManager.h" -#import "ClientConfig.h" -///Third -#import - -@interface XPMineSettingPresent () -///手机号 -@property (nonatomic,strong) XPMineSettingItemModel *phoneItem; -@property (nonatomic,strong) XPMineSettingItemModel *emailItem; -///支付密码 -@property (nonatomic,strong) XPMineSettingItemModel *payItem; -///登录密码 -@property (nonatomic,strong) XPMineSettingItemModel *loginItem; -///数据源 -@property (nonatomic,strong) NSArray *datasouce; -@end - -@implementation XPMineSettingPresent -- (id)getView { - return (id) [super getView]; -} - --(void)clearList{ - self.datasouce = nil; -} -/// 获取数据源 -/// @param userinfo 当前的用户信息 -- (void)getMineSettingDataSourceWith:(UserInfoModel *)userinfo { - if (self.datasouce.count > 0) { - self.phoneItem.subTitle = userinfo.isBindPhone ? userinfo.phone : YMLocalizedString(@"XPMineSettingPresent0"); - self.payItem.subTitle = userinfo.isBindPaymentPwd ? YMLocalizedString(@"XPMineSettingPresent26") : YMLocalizedString(@"XPMineSettingPresent2"); - } else { - XPMineSettingItemModel *emailItem = [[XPMineSettingItemModel alloc] init]; - emailItem.title = YMLocalizedString(@"20.20.51_text_13"); - emailItem.subTitle = ![NSString isEmpty:userinfo.email] ? userinfo.email : YMLocalizedString(@"XPMineSettingPresent4"); - emailItem.type = XPMineSettingItemType_Email; - self.emailItem = emailItem; - - XPMineSettingItemModel * phoneItem = [[XPMineSettingItemModel alloc] init]; - phoneItem.title = YMLocalizedString(@"20.20.51_text_14"); - phoneItem.subTitle = userinfo.isBindPhone ? userinfo.phone : YMLocalizedString(@"XPMineSettingPresent4"); - phoneItem.type = XPMineSettingItemType_Phone; - self.phoneItem = phoneItem; - - XPMineSettingItemModel * loginItem = [[XPMineSettingItemModel alloc] init]; - loginItem.title = userinfo.isBindPasswd ? YMLocalizedString(@"XPMineLoginPasswordViewController6") : YMLocalizedString(@"XPMineSettingPresent6"); - loginItem.subTitle = YMLocalizedString(@"XPMineSettingPresent7"); - loginItem.type = XPMineSettingItemType_Login_Password; - self.loginItem = loginItem; - - XPMineSettingItemModel * shieldItem = [[XPMineSettingItemModel alloc] init]; - shieldItem.title = YMLocalizedString(@"XPMineSettingPresent27"); - - shieldItem.type = XPMineSettingItemType_Shield_management; - - XPMineSettingItemModel * blackListItem = [[XPMineSettingItemModel alloc] init]; - blackListItem.title = YMLocalizedString(@"XPMineSettingPresent8"); - blackListItem.subTitle = @""; - blackListItem.type = XPMineSettingItemType_Black_Manager; - - XPMineSettingItemModel * languageItem = [[XPMineSettingItemModel alloc] init]; - languageItem.title = YMLocalizedString(@"XPMineSettingPresent28"); - languageItem.subTitle = @""; - languageItem.type = XPMineSettingItemType_Language; - - XPMineSettingItemModel * payItem = [[XPMineSettingItemModel alloc] init]; - payItem.title = YMLocalizedString(@"XPMineSettingPresent9"); - payItem.subTitle = userinfo.isBindPaymentPwd ? YMLocalizedString(@"XPMineSettingPresent26") : YMLocalizedString(@"XPMineSettingPresent11"); - payItem.type = XPMineSettingItemType_Pay_Password; - self.payItem = payItem; - - XPMineSettingItemModel * notificaItem = [[XPMineSettingItemModel alloc] init]; - notificaItem.title = YMLocalizedString(@"XPMineSettingPresent12"); - notificaItem.subTitle = YMLocalizedString(@"XPMineSettingPresent13"); - notificaItem.type = XPMineSettingItemType_Notification_Remind; - - XPMineSettingItemModel * privacyItem = [[XPMineSettingItemModel alloc] init]; - privacyItem.title = YMLocalizedString(@"XPMineSettingPresent14"); - privacyItem.subTitle = @""; - privacyItem.type = XPMineSettingItemType_Permission; - - XPMineSettingItemModel * helperItem = [[XPMineSettingItemModel alloc] init]; - helperItem.title = YMLocalizedString(@"XPMineSettingPresent15"); - helperItem.subTitle = @""; - helperItem.type = XPMineSettingItemType_Helper; - - XPMineSettingItemModel * feedbackItem = [[XPMineSettingItemModel alloc] init]; - feedbackItem.title = YMLocalizedString(@"XPMineSettingPresent16"); - feedbackItem.subTitle = @""; - feedbackItem.type = XPMineSettingItemType_Feedback; - - XPMineSettingItemModel * clearMemoryItem = [[XPMineSettingItemModel alloc] init]; - clearMemoryItem.title = YMLocalizedString(@"XPMineSettingPresent17"); - clearMemoryItem.subTitle = @""; - clearMemoryItem.type = XPMineSettingItemType_Clear_Memory; - - XPMineSettingItemModel *updateItem = [[XPMineSettingItemModel alloc] init]; - updateItem.title = YMLocalizedString(@"XPMineSettingPresent18"); - updateItem.subTitle = @""; - updateItem.type = XPMineSettingItemType_CheckUpdate; - - XPMineSettingItemModel * aboutusItem = [[XPMineSettingItemModel alloc] init]; - aboutusItem.title = [NSString stringWithFormat:YMLocalizedString(@"XPMineAboutUsViewController0"), AppName]; - aboutusItem.subTitle = @""; - aboutusItem.type = XPMineSettingItemType_About_Us; - - XPMineSettingItemModel * vipItem = [[XPMineSettingItemModel alloc] init]; - vipItem.title = YMLocalizedString(@"VipSettin_1.0.17_0"); - vipItem.subTitle = @""; - vipItem.type = XPMineSettingItemType_VIP; - - XPMineSettingItemModel * deleteItem = [[XPMineSettingItemModel alloc] init]; - deleteItem.title = YMLocalizedString(@"XPMineSettingPresent25"); - deleteItem.subTitle = @""; - deleteItem.type = XPMineSettingItemType_Delete_Account; - - NSArray * oneSection = @[emailItem, phoneItem, loginItem, payItem]; - NSArray * twoSection = @[vipItem, notificaItem, languageItem]; - NSArray * threeSection = @[shieldItem, blackListItem]; - NSArray * fourthSection = @[privacyItem, helperItem, clearMemoryItem, updateItem, deleteItem, aboutusItem]; - - self.datasouce = @[oneSection, twoSection, threeSection, fourthSection]; - } - - [[self getView] getMineSettingDatasourceSuccess:self.datasouce]; -} - -// 获取用户信息 -- (void)getUserInfo { - NSString * uid = [[AccountInfoStorage instance] getUid]; - @kWeakify(self); - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetUserInfoSuccess:infoModel]; - } showLoading:YES] uid:uid]; -} - - -/// 退出当前账号 -- (void)logoutCurrentAccount { - if([XPRoomMiniManager shareManager].getRoomInfo) { - NSString *roomUid = [NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.uid]; - ///上报退房 - [Api requestReportUserOutRoom:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - } uid:[[AccountInfoStorage instance] getUid] roomUid:roomUid ticket:[[AccountInfoStorage instance] getTicket]]; - ///退出房间 - NSString * roomId = [NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.roomId]; - [[NIMSDK sharedSDK].chatroomManager exitChatroom:roomId completion:nil]; - [[RtcManager instance] exitRoom]; - [[XPRoomMiniManager shareManager] configRoomInfo:nil]; - [[XPRoomMiniManager shareManager] configUserInfo:nil]; - [[XPRoomMiniManager shareManager] configCurrentMusic:nil isPlaying:NO]; - [[XPRoomMiniManager shareManager] resetLocalMessage]; - } - AccountModel * account = [[AccountInfoStorage instance] accountModel]; - [Api logoutCurrentAccount:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] logoutCurrentAccountSuccess]; - }] access_token:account.access_token]; - [self logout]; -} - -#pragma mark - 版本更新 --(void)getVersionUpdate{ - NSString *appVersion = [YYUtility appVersion]; - NSString *os = @"ios"; - NSString *channel = [YYUtility getAppSource]; - [Api requestVersionUpdate:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - XPVersionUpdateModel *model = [XPVersionUpdateModel modelWithDictionary:data.data]; - [[self getView] getVersionUpdate:model]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getVersionUpdateFail]; - } errorToast:NO] appVersion:appVersion os:os channel:channel]; -} --(void)getBlackRoomListWithPageNum:(NSString *)pageNum pageSize:(NSString *)pageSize{ - [Api getBlackRoomList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *list = [XPMaskManagerModel modelsWithArray:data.data]; - [[self getView]getBlackRoomList:list]; - }showLoading:NO] pageNum:pageNum pageSize:pageSize]; -} -///解除屏蔽 --(void)requestUnmaskingFromBlackRoomListWithRoomUid:(NSString *)roomUid type:(NSString *)type{ - [Api requestUnmaskingFromBlackRoomList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView]requestUnmaskingFromBlackRoomListSuccess]; - }showLoading:YES] objId:roomUid type:type ]; -} -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineUserDataPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineUserDataPresenter.h deleted file mode 100644 index d1c38f3..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineUserDataPresenter.h +++ /dev/null @@ -1,53 +0,0 @@ -// -// YMMineUserDataPresenter.h -// YUMI -// -// Created by YUMI on 2022/4/14. -// - -#import "BaseMvpPresenter.h" - -@class UserInfoModel, XPMineGamePartnerInfoModel, XPMineGameOrderRecoredModel; -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserDataPresenter : BaseMvpPresenter - -/// 获取会长和当前用户家族详细的信息 -/// @param uid 用户的uid -- (void)getClanDetailInfo:(NSString *)uid currentUserUid:(NSString *)currentUserUid; - -/// 用户申请加入公会 -/// @param hallId 公会的id -- (void)memberApplyHall:(NSString *)hallId; - -- (void)getUserInfo:(NSString *)uid success:(void(^)(UserInfoModel * info))success; -/// 动态点赞 -/// @param dynamicId 动态id -/// @param status yes 点赞 NO 取消 -/// @param likedUid 点赞人的uid -/// @param worldId 话题的id -- (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId; - -/// 删除动态 -/// @param dynamicId 动态id -/// @param worldId 话题id -- (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId; -///屏蔽 -- (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId; - -- (void)loadGamePartnerInfoList:(void(^)(NSArray *infos))success uid:(NSInteger)uid; - -- (void)loadGameOrderRecord:(void(^)(NSArray * orderRecords))success - failure:(void(^)(NSString *msg))failure - page:(NSInteger)currentPage - type:(NSInteger)searchType; - -- (void)submitOrder:(void(^)(void))success - failure:(void(^)(NSString *msg))failure - gameId:(NSInteger)gameId - gameUid:(NSInteger)gameUid - inning:(NSInteger)inning; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineUserDataPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineUserDataPresenter.m deleted file mode 100644 index 13b2ab1..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineUserDataPresenter.m +++ /dev/null @@ -1,160 +0,0 @@ -// -// YMMineUserDataPresenter.m -// YUMI -// -// Created by YUMI on 2022/4/14. -// - -#import "XPMineUserDataPresenter.h" -#import -#import "Api+Guild.h" -#import "ClanDetailInfoModel.h" -#import "AccountInfoStorage.h" -#import "MineSkillCardListInfoModel.h" -#import "XPMineUserDataProtocol.h" -#import "UserInfoModel.h" -#import "Api+Moments.h" -#import "Api+Room.h" -#import "XPMomentsMineProtocol.h" -#import "Api+GameOrder.h" -#import "XPMineGamePartnerInfoModel.h" - -@implementation XPMineUserDataPresenter - -/// 获取会长和当前用户家族详细的信息 -/// @param uid 用户的uid -- (void)getClanDetailInfo:(NSString *)uid currentUserUid:(NSString *)currentUserUid { - RACSubject* owner = [RACSubject subject]; - RACSubject* currentUser = [RACSubject subject]; - -// @kWeakify(self); - [[RACSignal combineLatest:@[owner, currentUser] reduce:^id(ClanDetailInfoModel* ownerClanInfo, ClanDetailInfoModel* currentUserClanInfo){ -// @kStrongify(self); -// [[self getView] getClanDetailInfoSuccess:ownerClanInfo currentUserClanInfo:currentUserClanInfo]; - return nil; - }] subscribeError:^(NSError * _Nullable error) { - - }]; - - [Api getClanDetailInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ClanDetailInfoModel * clanDetailInfo = [ClanDetailInfoModel modelWithDictionary:data.data]; - [currentUser sendNext:clanDetailInfo]; - [currentUser sendCompleted]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [currentUser sendNext:nil]; - [currentUser sendCompleted]; - }] uid:currentUserUid]; - - [Api getClanDetailInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ClanDetailInfoModel * clanDetailInfo = [ClanDetailInfoModel modelWithDictionary:data.data]; - [owner sendNext:clanDetailInfo]; - [owner sendCompleted]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [owner sendNext:nil]; - [owner sendCompleted]; - }] uid:uid]; -} - - -///// 用户申请加入公会 -///// @param hallId 公会的id -//- (void)memberApplyHall:(NSString *)hallId { -// @kWeakify(self); -// NSString *uid = [AccountInfoStorage instance].getUid; -// [Api memberApplyHall:[self createHttpCompletion:^(BaseModel * _Nonnull data) { -// @kStrongify(self); -// [[self getView] memberApplyHallSuccess]; -// } showLoading:YES] hallId:hallId uid:uid]; -//} - -- (void)getUserInfo:(NSString *)uid success:(void(^)(UserInfoModel * info))success { - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - UserInfoModel * info = [UserInfoModel modelWithDictionary:data.data]; - if (success) { - success(info); - } - }] uid:uid]; -} -/// 动态点赞 -/// @param dynamicId 动态id -/// @param status yes 点赞 NO 取消 -/// @param likedUid 点赞人的uid -/// @param worldId 话题的id -- (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { - @kWeakify(self); - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * statusStr = status ? @"1" : @"0"; - [Api momentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] likeMomentsSuccess:dynamicId status:status]; - } showLoading:YES] dynamicId:dynamicId uid:uid status:statusStr likedUid:likedUid worldId:worldId]; -} - -/// 删除动态 -/// @param dynamicId 动态id -/// @param worldId 话题id -- (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId { - @kWeakify(self); - NSString * uid = [AccountInfoStorage instance].getUid; - [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] deleteMomentsSuccess:dynamicId]; - } uid:uid dynamicId:dynamicId worldId:worldId]; -} -- (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId{ - @kWeakify(self); - [Api requestShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] requesstShieldingSuccess:objId]; - }] type:type objId:objId]; -} - -- (void)loadGamePartnerInfoList:(void(^)(NSArray *infos))success uid:(NSInteger)uid{ - [Api requestGamePartnerInfoList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray *models = [XPMineGamePartnerInfoModel modelsWithArray:data.data]; - if (success) { - success(models); - } - } - } uid:@(uid).stringValue]; -} - -- (void)loadGameOrderRecord:(void(^)(NSArray * orderRecords))success - failure:(void(^)(NSString *msg))failure - page:(NSInteger)currentPage - type:(NSInteger)searchType { - [Api requestGameOrderRecord:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - if (success) { - NSArray *records = [XPMineGameOrderRecoredModel modelsWithArray:data.data]; - success(records); - } - } else { - if (failure) { - failure(msg); - } - } - } currSize:currentPage pageSize:20 searchType:searchType uid:[AccountInfoStorage instance].getUid]; -} - - -- (void)submitOrder:(void(^)(void))success - failure:(void(^)(NSString *msg))failure - gameId:(NSInteger)gameId - gameUid:(NSInteger)gameUid - inning:(NSInteger)inning { - [Api requestGameOrder:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - if (success) { - success(); - } - } else { - if (failure) { - failure(msg); - } - } - } gameId:gameId gameUid:gameUid inning:inning uid:[AccountInfoStorage instance].getUid]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.h deleted file mode 100644 index 8be39a9..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// XPMineUserInfoEditPresenter.h -// xplan-ios -// -// Created by 冯硕 on 2021/9/23. -// - -#import "BaseMvpPresenter.h" -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel, LocationModel; -@interface XPMineUserInfoEditPresenter : BaseMvpPresenter - -// 获取用户信息 -- (void)getUserInfo; - -///获取个人资料页编辑的数据源 -- (void)getUserInfoEditDataSourceWithUserInfo:(UserInfoModel *)userInfo ; - -/// 补全资料 -/// @param avatar 头像 -/// @param nick 昵称 -/// @param birth 生日 -/// @param userDesc 用户的签名 -- (void)complectionInfoWithAvatar:(NSString * _Nullable)avatar - nick:(NSString * _Nullable)nick - birth:(NSString * _Nullable)birth - userDesc:(NSString * _Nullable)userDesc; - -/// 上传头像 -/// @param avatar 头像 -- (void)uploadAvatar:(UIImage *)avatar; -- (void)uploadGifAvatar:(NSData *)data; -///获取地区列表 --(void)getAreaList; -///保存地区列表 --(void)saveAreaConfigWithArea:(LocationModel *)area; - -- (void)uploadAvatarV2:(NSString *)avatarPath needPay:(BOOL)needPay; - -- (void)checkMoney:(void(^)(NSString *currentMoney))success failure:(void(^)(NSString *message))failure; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.m deleted file mode 100644 index b747c57..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.m +++ /dev/null @@ -1,320 +0,0 @@ -// -// XPMineUserInfoEditPresenter.m -// xplan-ios -// -// Created by 冯硕 on 2021/9/23. -// - -#import "XPMineUserInfoEditPresenter.h" -///Api -#import "Api+Mine.h" -///Tool -#import "AccountInfoStorage.h" -#import "UploadFile.h" -///Model -#import "XPMineUserInfoEditModel.h" -#import "UserInfoModel.h" -#import "LocationModel.h" -#import "WalletInfoModel.h" -///P -#import "XPMineUserInfoEditProtocol.h" -@interface XPMineUserInfoEditPresenter () -///昵称 -@property (nonatomic,strong) XPMineUserInfoEditModel *nickItem; -///头像 -@property (nonatomic,strong) XPMineUserInfoEditModel *avatarItem; -///生日 -@property (nonatomic,strong) XPMineUserInfoEditModel *birthItem; -///相册 -@property (nonatomic,strong) XPMineUserInfoEditModel *photoItem; -///介绍 -@property (nonatomic,strong) XPMineUserInfoEditModel *desItem; -///标签 -@property (nonatomic,strong) XPMineUserInfoEditModel *tagItem; -///地区 -@property (nonatomic,strong) XPMineUserInfoEditModel *areaItem; -///声音 -@property (nonatomic,strong) XPMineUserInfoEditModel *soundItem;; - -/// -@property (nonatomic,strong) NSMutableArray *editArray; -///日期的格式 -@property (nonatomic,strong) NSDateFormatter *dateFormatter; -@end - -@implementation XPMineUserInfoEditPresenter - -///获取用户信息 -- (void)getUserInfo { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetUserInfoSuccess:infoModel]; - }] uid:uid]; -} - -- (void)checkMoney:(void(^)(NSString *currentMoney))success failure:(void(^)(NSString *message))failure { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - [Api getUserWalletInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data]; - success(model.diamonds); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure(msg); - } - } showLoading:YES errorToast:YES] uid:uid ticket:ticket]; -} - -///获取个人资料页编辑的数据源 -- (void)getUserInfoEditDataSourceWithUserInfo:(UserInfoModel *)userInfo { - ///数据组装 - if (self.editArray.count <= 0) { - [self.editArray addObject:self.avatarItem]; - [self.editArray addObject:self.nickItem]; - [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.desItem]; - - } - - - self.avatarItem.isReview = userInfo.isReview; - self.avatarItem.avatarUrl = userInfo.isReview ? userInfo.reviewingAvatar : userInfo.avatar; - - self.nickItem.subTitle = userInfo.nick; - NSDate *date = [NSDate dateWithTimeIntervalSince1970:userInfo.birth/1000]; - NSString *dateStr = [self.dateFormatter stringFromDate:date]; - self.birthItem.subTitle = dateStr; - - self.photoItem.photoArray = userInfo.privatePhoto; - - self.desItem.subTitle = userInfo.userDesc.length > 0 ? userInfo.userDesc : @""; - ///数据回传 - [[self getView] getUserInfoEditDataSourceSuccess:self.editArray]; -} - -/// 补全资料 -/// @param avatar 头像 -/// @param nick 昵称 -/// @param birth 生日 -/// @param userDesc 用户的签名 -- (void)complectionInfoWithAvatar:(NSString * _Nullable)avatar - nick:(NSString * _Nullable)nick - birth:(NSString * _Nullable)birth - userDesc:(NSString * _Nullable)userDesc { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - if (avatar.length > 0) { - [dic setValue:avatar forKey:@"avatar"]; - } - - if (nick.length > 0) { - [dic setValue:nick forKey:@"nick"]; - } - - if (birth.length > 0) { - [dic setValue:birth forKey:@"birth"]; - } - - if (userDesc.length > 0) { - [dic setValue:userDesc forKey:@"userDesc"]; - } - - [dic setObject:uid forKey:@"uid"]; - [dic setObject:ticket forKey:@"ticket"]; - [Api completeUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] completeUserInfoSuccess:infoModel]; - }showLoading:YES] userInfo:dic]; -} - - -/// 上传头像 -/// @param avatar 头像 -- (void)uploadAvatar:(UIImage *)avatar { - NSData *data = UIImageJPEGRepresentation(avatar, 0.5); - NSString *format = [UIImage getImageTypeWithImageData:data]; - NSString *name = [NSString stringWithFormat:@"image/%@.%@",[NSString createUUID],format]; - @kWeakify(self); - [[UploadFile share]QCloudUploadImage:data named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) { - @kStrongify(self); - [[self getView] uploadImageSuccess:key]; - } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) { - - }]; -} - -- (void)uploadGifAvatar:(NSData *)data { - // 兼容视频与图片数据：自动识别数据类型并给出正确的文件后缀 - NSString *format = [self.class detectMediaExtensionForData:data]; - // 维持原有目录结构，避免服务器侧路径依赖被破坏 - NSString *name = [NSString stringWithFormat:@"image/%@.%@", [NSString createUUID], format]; - @kWeakify(self); - [[UploadFile share]QCloudUploadImage:data named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) { - @kStrongify(self); - [[self getView] uploadImageSuccess:key]; - } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) { - - }]; -} - -/// 根据二进制数据自动识别媒体类型，返回合适的文件后缀 -/// 支持：gif、png、jpg、mp4（通过 ftyp box 识别） -/// 回退策略：无法识别时使用 jpg -+ (NSString *)detectMediaExtensionForData:(NSData *)data { - if (data.length < 12) { - return @"jpg"; - } - - const unsigned char *bytes = (const unsigned char *)data.bytes; - - // GIF: 47 49 46 38 39|37 61 -> "GIF89a" / "GIF87a" - if (bytes[0] == 'G' && bytes[1] == 'I' && bytes[2] == 'F') { - return @"gif"; - } - - // PNG: 89 50 4E 47 0D 0A 1A 0A - const unsigned char pngSig[8] = {0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A}; - if (memcmp(bytes, pngSig, 8) == 0) { - return @"png"; - } - - // JPEG: FF D8 FF - if (bytes[0] == 0xFF && bytes[1] == 0xD8 && bytes[2] == 0xFF) { - return @"jpg"; - } - - // MP4: offset 4..7 == 'f' 't' 'y' 'p' - if (data.length >= 12) { - if (bytes[4] == 'f' && bytes[5] == 't' && bytes[6] == 'y' && bytes[7] == 'p') { - return @"mp4"; - } - } - - // 兜底 - return @"jpg"; -} - -///获取地区列表 --(void)getAreaList{ - @kWeakify(self); - [Api getAreaList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] getAreaListSuccess:[LocationModel modelsWithArray:data.data]]; - }showLoading:NO]]; -} -///保存地区列表 --(void)saveAreaConfigWithArea:(LocationModel *)area{ - @kWeakify(self); - [Api saveAreaConfigWithArea:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] saveAreaSuccess]; - }showLoading:YES errorToast:YES] id:@(area.id).stringValue]; -} - -- (void)uploadAvatarV2:(NSString *)avatarPath needPay:(BOOL)needPay { - @kWeakify(self); - [Api userV2UploadAvatar:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] uploadGifAvatarSuccess:avatarPath]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES] avatarUrl:avatarPath needPay:@(needPay)]; -} - -#pragma mark - Getters And Setters -- (XPMineUserInfoEditModel *)nickItem { - if (!_nickItem) { - _nickItem = [[XPMineUserInfoEditModel alloc] init]; - _nickItem.type = XPMineUserInfoEditType_Nick; - _nickItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter1"); - } - return _nickItem; -} - -- (XPMineUserInfoEditModel *)avatarItem { - if (!_avatarItem) { - _avatarItem = [[XPMineUserInfoEditModel alloc] init]; - _avatarItem.type = XPMineUserInfoEditType_Avatar; - _avatarItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter2"); - } - return _avatarItem; -} - - -- (XPMineUserInfoEditModel *)birthItem { - if (!_birthItem) { - _birthItem = [[XPMineUserInfoEditModel alloc] init]; - _birthItem.type = XPMineUserInfoEditType_Birth; - _birthItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter3"); - } - return _birthItem; -} --(XPMineUserInfoEditModel *)areaItem{ - if (!_areaItem){ - _areaItem = [XPMineUserInfoEditModel new]; - _areaItem.type = XPMineUserInfoEditType_Area; - _areaItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter10"); - } - return _areaItem; -} -- (XPMineUserInfoEditModel *)tagItem{ - if (!_tagItem){ - _tagItem = [XPMineUserInfoEditModel new]; - _tagItem.type = XPMineUserInfoEditType_Tag; - _tagItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter8"); - _tagItem.subTitle = YMLocalizedString(@"XPMineUserInfoEditPresenter9"); - } - return _tagItem; -} -- (XPMineUserInfoEditModel *)photoItem { - if (!_photoItem) { - _photoItem = [[XPMineUserInfoEditModel alloc] init]; - _photoItem.type = XPMineUserInfoEditType_Photo; - _photoItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter4"); - } - return _photoItem; -} - -- (XPMineUserInfoEditModel *)desItem { - if (!_desItem) { - _desItem = [[XPMineUserInfoEditModel alloc] init]; - _desItem.type = XPMineUserInfoEditType_UseDes; - _desItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter5"); - } - return _desItem; -} -- (XPMineUserInfoEditModel *)soundItem{ - if (!_soundItem){ - _soundItem = [[XPMineUserInfoEditModel alloc]init]; - _soundItem.type = XPMineUserInfoEditType_Sound; - _soundItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter6"); - _soundItem.subTitle = YMLocalizedString(@"XPMineUserInfoEditPresenter7"); - } - return _soundItem; -} -- (NSMutableArray *)editArray { - if (!_editArray) { - _editArray = [NSMutableArray array]; - } - return _editArray; -} - -- (NSDateFormatter *)dateFormatter { - if (!_dateFormatter) { - _dateFormatter = [[NSDateFormatter alloc] init]; - _dateFormatter.dateFormat = @"yyyy-MM-dd"; - [_dateFormatter setTimeZone:[NSTimeZone timeZoneWithName:@"Asia/Shanghai"]]; - } - return _dateFormatter; -} - - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoGiftWallPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineUserInfoGiftWallPresenter.h deleted file mode 100644 index 30e8421..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoGiftWallPresenter.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineUserInfoGiftWallPresenter.h -// YUMI -// -// Created by YUMI on 2022/4/15. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserInfoGiftWallPresenter : BaseMvpPresenter -- (void)getUserGiftWall:(NSString *)uid giftType:(NSInteger)giftType; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoGiftWallPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineUserInfoGiftWallPresenter.m deleted file mode 100644 index d9f5a80..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoGiftWallPresenter.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// YMMineUserInfoGiftWallPresenter.m -// YUMI -// -// Created by YUMI on 2022/4/15. -// - -#import "XPMineUserInfoGiftWallPresenter.h" -#import "Api+Mine.h" -#import "XPMineUserInfoGiftWallProtocol.h" -#import "UserGiftWallInfoModel.h" - -@implementation XPMineUserInfoGiftWallPresenter - -- (void)getUserGiftWall:(NSString *)uid giftType:(NSInteger)giftType { - NSString * giftTypeStr = [NSString stringWithFormat:@"%ld", giftType]; - [Api getUserGiftWall:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array= [UserGiftWallInfoModel modelsWithArray:data.data]; - [[self getView] getUserGiftWallSuccess:array]; - }] uid:uid giftType:giftTypeStr]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineUserInfoPresenter.h deleted file mode 100644 index 8e0a61d..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoPresenter.h +++ /dev/null @@ -1,56 +0,0 @@ -// -// YMMineUserInfoPresenter.h -// YUMI -// -// Created by YUMI on 2021/9/23. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserInfoPresenter : BaseMvpPresenter -// 获取用户信息 -- (void)getUserInfoWithUid:(NSString *)uid; -// 获取用户详细信息 -- (void)getUserDetailInfoWithUid:(NSString *)uid; -/// 两个人的关注状态 -/// @param targetUid 对方的uid -- (void)getUserAttentionState:(NSString *)targetUid; - -/// 关注用户 /取消该关注 -/// @param targetUid 目标用户的uid -/// @param state 是否关注 yes 关注 NO 取消关注 -- (void)attentionUser:(NSString *)targetUid state:(BOOL)state; - -///上传访问用户主页记录 -///@param targetUid 被访问用户的uid -- (void)visitUser:(NSString *)targetUid; - - -///得到个人简介标签 --(void)getTagList; -////保存个人简介标签 --(void)saveTagListWithLabels:(NSString *)labels; - -- (void)requestBlockTimesSuccess:(void(^)(NSArray *array))finishHim - failure:(void(^)(NSError *error))failure; -- (void)superBlock:(NSInteger)uid - hours:(NSInteger)hours - resaon:(NSString *)reason - success:(void(^)(void))finishHim - failure:(void(^)(NSError *error))failure; - -- (void)cpTypeList:(NSInteger)uid; -- (void)requestRelationship:(NSInteger)uid - otherUid:(NSInteger)otherUid - type:(NSInteger)type - success:(void(^)(void))finishHim - failure:(void(^)(NSError *error))failure; -- (void)updateRelationship:(NSInteger)recordId - status:(NSInteger)status - success:(void(^)(void))finishHim - failure:(void(^)(NSError *error))failure; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineUserInfoPresenter.m deleted file mode 100644 index 6a768eb..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoPresenter.m +++ /dev/null @@ -1,174 +0,0 @@ -// -// YMMineUserInfoPresenter.m -// YUMI -// -// Created by YUMI on 2021/9/23. -// - -#import "XPMineUserInfoPresenter.h" -///Tool -#import "Api+Mine.h" -#import "AccountInfoStorage.h" -#import "UploadFile.h" -///Model -#import "UserInfoModel.h" -#import "XPSoundCardModel.h" -#import "XPMineUserInfoTagModel.h" -///P -#import "XPMineUserInfoProtocol.h" - -@implementation XPMineUserInfoPresenter - -// 获取用户信息 -- (void)getUserInfoWithUid:(NSString *)uid { - @kWeakify(self); - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetUserInfoSuccess:infoModel]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] onGetUserInfoFailure]; - } showLoading:YES errorToast:YES] uid:uid]; -} - -// 获取用户详细信息 -- (void)getUserDetailInfoWithUid:(NSString *)uid { - @kWeakify(self); - [Api userDetailInfoCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetDetailInfoSuccess:infoModel]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] onGetUserInfoFailure]; - } showLoading:YES errorToast:YES] uid:uid page:@"1" pageSize:@"20"]; -} - -/// 两个人的关注状态 -/// @param targetUid 对方的uid -- (void)getUserAttentionState:(NSString *)targetUid; { - @kWeakify(self); - NSString * uid = [[AccountInfoStorage instance] getUid]; - [Api attentionStatusCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - BOOL isLike = ((NSNumber *)data.data).boolValue; - [[self getView] getAttentionStateSuccess:isLike]; - }] uid:uid isLikeUid:targetUid]; -} - - -/// 关注用户 /取消该关注 -/// @param targetUid 目标用户的uid -/// @param state 是否关注 yes 关注 NO 取消关注 -- (void)attentionUser:(NSString *)targetUid state:(BOOL)state { - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * type = state ? @"1" : @"2"; - @kWeakify(self); - [Api attentionCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] attentionUserSuccess:state]; - }] uid:uid likedUid:targetUid ticket:ticket type:type]; -} - -///上传访问用户主页记录 -///@param targetUid 被访问用户的uid -- (void)visitUser:(NSString *)targetUid { - [Api uploadVisitUserCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - }] uid:targetUid]; -} - - - -///得到个人简介标签 --(void)getTagList{ - @kWeakify(self); - [Api getTagList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - XPMineUserInfoTagModel *model = [XPMineUserInfoTagModel modelWithDictionary:data.data]; - [[self getView]getTagListSuccess:model]; - }showLoading:YES]]; -} --(void)saveTagListWithLabels:(NSString *)labels{ - @kWeakify(self); - [Api saveTagList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView]saveTagListSuccess]; - }showLoading:YES errorToast:YES] labels:labels]; -} - -- (void)requestBlockTimesSuccess:(void(^)(NSArray *array))finishHim - failure:(void(^)(NSError *error))failure { - [Api requestBlockTime:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (finishHim) { - finishHim(data.data); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES]]; -} - -- (void)superBlock:(NSInteger)uid - hours:(NSInteger)hours - resaon:(NSString *)reason - success:(void(^)(void))finishHim - failure:(void(^)(NSError *error))failure { - [Api blockUser:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (finishHim) { - finishHim(); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] uid:@(uid) hours:@(hours) blockReason:reason]; -} - -- (void)cpTypeList:(NSInteger)uid { - [Api userCpNameTypeTopList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if ([[self getView] respondsToSelector:@selector(getCPListSuccess:)]) { - [[self getView] getCPListSuccess:[RelationUserVO modelsWithArray:data.data]]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:NO errorToast:NO] uid:uid]; -} - -- (void)requestRelationship:(NSInteger)uid - otherUid:(NSInteger)otherUid - type:(NSInteger)type - success:(void(^)(void))finishHim - failure:(void(^)(NSError *error))failure { - [Api userCpNameChange:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (finishHim) { - finishHim(); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] - uid:uid - loverUid:otherUid - relationNameType:type]; -} - -- (void)updateRelationship:(NSInteger)recordId - status:(NSInteger)status - success:(void(^)(void))finishHim - failure:(void(^)(NSError *error))failure { - [Api userCpNameChangeAudit:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (finishHim) { - finishHim(); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] recordId:recordId status:status]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineUserInfolbumPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineUserInfolbumPresenter.h deleted file mode 100644 index ed96021..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineUserInfolbumPresenter.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMMineUserInfolbumPresenter.h -// YUMI -// -// Created by YUMI on 2021/9/24. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserInfolbumPresenter : BaseMvpPresenter -///获取用户信息 -- (void)getUserInfo; -/// 将图片的地址上传到自己的服务器 -/// @param url 图片的地址 - -- (void)uploadUserAlbumWithUrlStr:(NSString *)url; - -/// 相册 -/// @param albumImage 相册的image -- (void)uploadAlbumImage:(UIImage *)albumImage; - -/// 删除用户图片 -/// @param pid 相册的id -- (void)deleteImageUrlFromServerWithPid:(NSString *)pid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineUserInfolbumPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineUserInfolbumPresenter.m deleted file mode 100644 index 1445c17..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineUserInfolbumPresenter.m +++ /dev/null @@ -1,65 +0,0 @@ -// -// YMMineUserInfolbumPresenter.m -// YUMI -// -// Created by YUMI on 2021/9/24. -// - -#import "XPMineUserInfolbumPresenter.h" -///Api -#import "Api+Mine.h" -///Model -#import "UserInfoModel.h" -///Tool -#import "AccountInfoStorage.h" -#import "UploadFile.h" -///P -#import "XPMineUserInfoAlbumProtocol.h" - -@implementation XPMineUserInfolbumPresenter - -///获取用户信息 -- (void)getUserInfo { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetUserInfoSuccess:infoModel]; - }] uid:uid]; -} - -/// 将图片的地址上传到自己的服务器 -/// @param url 图片的地址 -- (void)uploadUserAlbumWithUrlStr:(NSString *)url { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api uploadUserAlbum:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] uploadUserAlbumSuccess]; - } showLoading:YES] photoStr:url uid:uid ticket:ticket]; -} - -/// 相册 -/// @param albumImage 相册的image -- (void)uploadAlbumImage:(UIImage *)albumImage { - - NSData *data = UIImageJPEGRepresentation(albumImage, 0.5); - NSString *format = [UIImage getImageTypeWithImageData:data]; - NSString *name = [NSString stringWithFormat:@"image/%@.%@",[NSString createUUID],format]; - [[UploadFile share]QCloudUploadImage:data named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) { - [[self getView] uploadAlbumImageToThirdSuccess:key]; - } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) { - - }]; -} - - -/// 删除用户图片 -/// @param pid 相册的id -- (void)deleteImageUrlFromServerWithPid:(NSString *)pid { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api deleteImageFromServer:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] deleteUserAlbumSuccess]; - } showLoading:YES] pid:pid uid:uid ticket:ticket]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineVerifIdentityPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineVerifIdentityPresenter.h deleted file mode 100644 index bafa349..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineVerifIdentityPresenter.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMMineVerifIdentityPresenter.h -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "MainPresenter.h" -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineVerifIdentityPresenter : MainPresenter - -/// 获取手机的验证码 -/// @param phone 手机号 -/// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type phoneAreaCode:(NSString *)phoneAreaCode; - - -/// 校验手机验证码接口 -/// @param moblieNum 手机号码 -/// @param code 验证码 -- (void)checkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineVerifIdentityPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineVerifIdentityPresenter.m deleted file mode 100644 index 17b16c5..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineVerifIdentityPresenter.m +++ /dev/null @@ -1,47 +0,0 @@ -// -// YMMineVerifIdentityPresenter.m -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "XPMineVerifIdentityPresenter.h" -///Api -#import "Api.h" -///P -#import "XPMineVerifIdentityProtocol.h" -///Tool -#import "AccountInfoStorage.h" -#import "DESEncrypt.h" -#import "YUMIConstant.h" - - -@implementation XPMineVerifIdentityPresenter - -/// 获取手机的验证码 -/// @param phone 手机号 -/// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type phoneAreaCode:(NSString *)phoneAreaCode{ - NSString * typeStr = [NSString stringWithFormat:@"%lu", (unsigned long)type]; - NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api phoneSmsCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] phoneSmsCodeSuccess]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - }] mobile:desPhone type:typeStr phoneAreaCode:phoneAreaCode]; -} - - -/// 校验手机验证码接口 -/// @param moblieNum 手机号码 -/// @param code 验证码 -- (void)checkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode{ - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * desPhone = [DESEncrypt encryptUseDES:moblieNum key:KeyWithType(KeyType_PasswordEncode)]; - [Api checkMoblieCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] checkMoblieCodeWithMoblieSuccess]; - }] mobile:desPhone code:code uid:uid ticket:ticket phoneAreaCode:phoneAreaCode]; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineVisitorPresenter.h b/YuMi/Modules/YMMine/Presenter/XPMineVisitorPresenter.h deleted file mode 100644 index 181d24a..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineVisitorPresenter.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMMineVisitorPresenter.h -// YUMI -// -// Created by YUMI on 2022/1/26. -// - -#import "BaseMvpPresenter.h" -#import "UserInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineVisitorPresenter : BaseMvpPresenter - -/// 获取访客列表 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -- (void)getVisitorList:(int)page pageSize:(int)pageSize state:(int)state; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/Presenter/XPMineVisitorPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineVisitorPresenter.m deleted file mode 100644 index d563ad7..0000000 --- a/YuMi/Modules/YMMine/Presenter/XPMineVisitorPresenter.m +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMMineVisitorPresenter.m -// YUMI -// -// Created by YUMI on 2022/1/26. -// - -#import "XPMineVisitorPresenter.h" -#import "Api+Mine.h" -#import "XPMineVisitorProtocol.h" -#import "AccountInfoStorage.h" -#import "XPMineVisitorItemModel.h" - -@implementation XPMineVisitorPresenter - -/// 访客列表 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -- (void)getVisitorList:(int)page pageSize:(int)pageSize state:(int)state { - [Api getVisitorListCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *array = [UserInfoModel modelsWithArray:data.data]; - [[self getView] onGetVisitorListSuccess:array state:state]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getVisitorListFail:state]; - }] pageNum:[NSString stringWithFormat:@"%d", page] pageSize:[NSString stringWithFormat:@"%d", pageSize]]; - -} - -@end diff --git a/YuMi/Modules/YMMine/View/CPListViewController.h b/YuMi/Modules/YMMine/View/CPListViewController.h deleted file mode 100644 index 2795a28..0000000 --- a/YuMi/Modules/YMMine/View/CPListViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// CPListViewController.h -// YuMi -// -// Created by P on 2024/9/18. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface CPListViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/CPListViewController.m b/YuMi/Modules/YMMine/View/CPListViewController.m deleted file mode 100644 index 2dd7712..0000000 --- a/YuMi/Modules/YMMine/View/CPListViewController.m +++ /dev/null @@ -1,314 +0,0 @@ -// -// CPListViewController.m -// YuMi -// -// Created by P on 2024/9/18. -// - -#import "CPListViewController.h" - -#import "CPCard.h" -#import "Api+Mine.h" -#import "RelationUserVO.h" -#import "XPWebViewController.h" -#import "XPMineUserInfoCustomNavView.h" -#import "CPRelationshipChangeView.h" -#import "XPMineUserInfoPresenter.h" - -@interface CPListCardCell : UITableViewCell - -@property (nonatomic, strong) RelationUserVO *model; -@property (nonatomic, strong) CPCard *cpCard; - -@end - -@implementation CPListCardCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.backgroundColor = [UIColor clearColor]; - self.contentView.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self setupUI]; - } - return self; -} - -- (void)setupUI { - [self.contentView addSubview:self.cpCard]; - [self.cpCard mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; -} - -- (void)setModel:(RelationUserVO *)model { - _model = model; - [self.cpCard updateForCPList:model showBreakHeart:([AccountInfoStorage instance].getUid.integerValue == model.uid)]; -} - -- (CPCard *)cpCard { - if (!_cpCard) { - _cpCard = [[CPCard alloc] init]; - _cpCard.userInteractionEnabled = YES; - _cpCard.isListItem = YES; - } - return _cpCard; -} - -@end - -@interface CPListViewController () - -@property (nonatomic, strong) UIView *emptyView; - -@property (nonatomic, strong) XPMineUserInfoCustomNavView *navView; -@property (nonatomic, strong) UITableView *cpCardTableView; -@property (nonatomic, assign) NSInteger page; -@property (nonatomic, strong) NSMutableArray *dataSource; - -@end - -@implementation CPListViewController - -- (XPMineUserInfoPresenter *)createPresenter { - return [[XPMineUserInfoPresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.page = 1; - [self setupUI]; -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - [self.cpCardTableView.mj_header beginRefreshing]; -} - -- (void)setupUI { - self.view.backgroundColor = UIColorFromRGB(0x08151A); - - [self setupNavigationBar]; - [self setupEmptyView]; - [self setupTableView]; -} - -- (void)setupNavigationBar { - [self.view addSubview:self.navView]; - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; -} - -- (void)setupEmptyView { - [self.view addSubview:self.emptyView]; - [self.emptyView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.navView.mas_bottom); - }]; -} - -- (void)setupTableView { - [self.view addSubview:self.cpCardTableView]; - [self.cpCardTableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.navView.mas_bottom).offset(10); - }]; - - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _cpCardTableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - _cpCardTableView.mj_footer = footer; -} - -- (void)headerRefresh { - self.page = 1; - [self loadData]; -} - -- (void)footerRefresh { - self.page += 1; - [self loadData]; -} - -- (void)loadData { - if (self.page == 1) { - self.dataSource = [NSMutableArray array]; - } - @kWeakify(self); - [Api requestCPList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [self.cpCardTableView.mj_header endRefreshing]; - [self.cpCardTableView.mj_footer endRefreshing]; - - if (code == 200) { - NSArray *array = [RelationUserVO modelsWithArray:data.data]; - [self.dataSource addObjectsFromArray:array]; - [self.cpCardTableView reloadData]; - - self.emptyView.hidden = self.dataSource.count != 0; - } else { - self.emptyView.hidden = NO; - [self showErrorToast:msg]; - } - } page:@(self.page) pageSize:@(10)]; -} - -- (void)cancelRelation:(RelationUserVO *)model { - NSString *message = [NSString stringWithFormat:YMLocalizedString(@"UserDetail_CP_Toast_1"), @(model.cancelGoldNum), model.cpNick]; -// NSString *successMessage = [NSString stringWithFormat:YMLocalizedString(@"UserDetail_CP_Toast_2"), model.cpNick]; - @kWeakify(self); - [TTPopup alertWithMessage:message confirmHandler:^{ - @kStrongify(self); - [self showLoading]; - [Api cancelCPList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - [self showSuccessToast:msg]; - [self.cpCardTableView.mj_header beginRefreshing]; - } else { - [self hideHUD]; - [self showErrorToast:msg]; - } - } - uid:@(model.uid) - loverUid:@(model.cpUid) - goldNum:@(model.cancelGoldNum)]; - } cancelHandler:^{ }]; -} - -- (void)presentSwitchRelationshipPanel:(RelationUserVO *)model { - __block CPRelationshipChangeView *changeView = [[CPRelationshipChangeView alloc] initWithRelationUser:model]; - @kWeakify(self); - @kWeakify(changeView); - [changeView setOnConfirm:^(NSInteger relationshipType, RelationUserVO *vo) { - @kStrongify(self); - @kStrongify(changeView); - [self.presenter requestRelationship:vo.uid - otherUid:vo.cpUid - type:relationshipType - success:^{ - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"20.20.56_text_11")]; - } failure:^(NSError * _Nonnull error) { - - }]; - dispatch_async(dispatch_get_main_queue(), ^{ - [changeView removeFromSuperview]; - }); - }]; - [self.view addSubview:changeView]; -} - -#pragma mark - UITableViewDelegate & DataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.dataSource.count; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return kGetScaleWidth(175); -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - CPListCardCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([CPListCardCell class])]; - RelationUserVO *model = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; - cell.model = model; - - @kWeakify(self); - [cell.cpCard setBreakTheHeart:^(RelationUserVO *model) { - @kStrongify(self); - [self cancelRelation:model]; - }]; - [cell.cpCard setSwitchRelationship:^(RelationUserVO *model) { - @kStrongify(self); - switch (model.clickFlag) { - case CP_CLICK_TYPE_DEFAULT: - [self presentSwitchRelationshipPanel:model]; - break; - case CP_CLICK_TYPE_SENDING: - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"20.20.56_text_11")]; - break; - case CP_CLICK_TYPE_PASSED: - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"20.20.56_text_12")]; - break; - default: - break; - } - - }]; - return cell; -} - -#pragma mark - XPMineCustomNavViewDelegate -- (void)xPMineCustomNavView:(XPMineUserInfoCustomNavView *)view didClickEditButton:(UIButton *)sender { - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kCPRule); - [self.navigationController pushViewController:webVC animated:YES]; -} - -- (void)xPMineCustomNavView:(XPMineUserInfoCustomNavView *)view didClickBackButton:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - -- (XPMineUserInfoCustomNavView *)navView { - if (!_navView) { - _navView = [[XPMineUserInfoCustomNavView alloc] init]; - _navView.delegate = self; - _navView.titleLabel.text = @"My CP"; - _navView.titleLabel.textColor = [UIColor whiteColor]; - [_navView.editButton setImage:[UIImage imageNamed:@"cp_help"] forState:UIControlStateNormal]; - [_navView updateBackButtonImage:[UIImage imageNamed:@"home_search_white_back"]]; - } - return _navView; -} - -- (UITableView *)cpCardTableView { - if (!_cpCardTableView) { - _cpCardTableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _cpCardTableView.delegate = self; - _cpCardTableView.dataSource = self; - _cpCardTableView.backgroundColor = [UIColor clearColor]; - _cpCardTableView.estimatedRowHeight = kGetScaleWidth(175); - _cpCardTableView.separatorStyle = UITableViewCellSeparatorStyleNone; - [_cpCardTableView registerClass:[CPListCardCell class] - forCellReuseIdentifier:NSStringFromClass([CPListCardCell class])]; - } - return _cpCardTableView; -} - - -- (UIView *)emptyView { - if (!_emptyView) { - _emptyView = [[UIView alloc] init]; - _emptyView.hidden = YES; - - UIImageView *icon = [[UIImageView alloc] initWithImage:kImage(@"cp_list_placeholder")]; - [_emptyView addSubview:icon]; - [icon mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(_emptyView); - make.top.mas_equalTo(70); - make.size.mas_equalTo(CGSizeMake(110, 110)); - }]; - - UILabel *title = [UILabel labelInitWithText:YMLocalizedString(@"XPMomentsRecommendViewController0") font:kFontRegular(14) textColor:[UIColor colorWithWhite:1 alpha:0.4]]; - [_emptyView addSubview:title]; - [title mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(_emptyView); - make.top.mas_equalTo(186); - }]; - } - return _emptyView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.h deleted file mode 100644 index d5296e3..0000000 --- a/YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMMineAnchorFansTeamTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import -#import "XPMineAnchorFansTeamModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineAnchorFansTeamTableViewCell : UITableViewCell - -@property (nonatomic, strong) XPMineAnchorFansTeamModel *item; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.m deleted file mode 100644 index 7c164a9..0000000 --- a/YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.m +++ /dev/null @@ -1,103 +0,0 @@ -// -// YMMineAnchorFansTeamTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "XPMineAnchorFansTeamTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" - -@interface XPMineAnchorFansTeamTableViewCell() - -///头像 -@property (nonatomic ,strong) NetImageView *avaterImgView; -///昵称 -@property (nonatomic, strong) UILabel *nickLabel; -///铭牌 -@property (nonatomic ,strong) NetImageView *iconImageView; - -@end - -@implementation XPMineAnchorFansTeamTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self setUpUI]; - [self setUpConstraints]; - } - return self; -} - -#pragma mark - lifeCycle -- (void)setUpUI { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avaterImgView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.iconImageView]; -} - -#pragma mark - Constraints -- (void)setUpConstraints { - [self.avaterImgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.width.height.mas_equalTo(40); - make.centerY.mas_equalTo(self.contentView.mas_centerY); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avaterImgView.mas_trailing).mas_offset(10); - make.centerY.mas_equalTo(self.contentView.mas_centerY); - make.trailing.mas_equalTo(self.iconImageView.mas_leading); - }]; - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.nickLabel.mas_centerY); - make.width.mas_equalTo(95); - make.height.mas_equalTo(27); - make.trailing.mas_equalTo(-15); - }]; -} - -- (void)setItem:(XPMineAnchorFansTeamModel *)item { - _item = item; - self.nickLabel.text = item.anchorNick; - self.avaterImgView.imageUrl = item.anchorAvatar; - self.iconImageView.imageUrl = item.icon; -} - -- (NetImageView *)avaterImgView { - if (!_avaterImgView) { - _avaterImgView = [[NetImageView alloc] init]; - _avaterImgView.contentMode = UIViewContentModeScaleAspectFit; - _avaterImgView.layer.cornerRadius = 20; - _avaterImgView.layer.masksToBounds = YES; - } - return _avaterImgView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.textColor = UIColorFromRGB(0x333333); - _nickLabel.font = [UIFont systemFontOfSize:13]; - _nickLabel.text = YMLocalizedString(@"XPMineAnchorFansTeamTableViewCell0"); - } - return _nickLabel; -} - -- (NetImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[NetImageView alloc] init]; - _iconImageView.contentMode = UIViewContentModeScaleAspectFit; - _iconImageView.layer.cornerRadius = 20; - _iconImageView.layer.masksToBounds = YES; - } - return _iconImageView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.h deleted file mode 100644 index e5db34a..0000000 --- a/YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMMineFootPrintTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/7/26. -// - -#import -#import "XPMineFootPrintModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineFootPrintTableViewCell : UITableViewCell - -@property (nonatomic, strong) XPMineFootPrintModel *item; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.m deleted file mode 100644 index 90cec7b..0000000 --- a/YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.m +++ /dev/null @@ -1,136 +0,0 @@ -// -// YMMineFootPrintTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/7/26. -// - -#import "XPMineFootPrintTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" - -@interface XPMineFootPrintTableViewCell() - -@property (nonatomic ,strong) NetImageView *avaterImgView; -@property (nonatomic, strong) UILabel *nickLabel; -@property (nonatomic ,strong) UILabel *memberIdLabel; -@property (nonatomic ,strong) UILabel *timeLabel; -@property (nonatomic, strong) UIView *lineView; - -@end - - -@implementation XPMineFootPrintTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self setUpUI]; - [self setUpConstraints]; - } - return self; -} - -#pragma mark - lifeCycle -- (void)setUpUI { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avaterImgView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.memberIdLabel]; - [self.contentView addSubview:self.timeLabel]; - [self.contentView addSubview:self.lineView]; -} - -#pragma mark - Constraints -- (void)setUpConstraints { - [self.avaterImgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.width.height.mas_equalTo(40); - make.centerY.mas_equalTo(self.contentView.mas_centerY); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avaterImgView.mas_trailing).mas_offset(8); - make.bottom.mas_equalTo(self.avaterImgView.mas_centerY).mas_offset(-4); - make.height.mas_equalTo(14); - }]; - - [self.memberIdLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avaterImgView.mas_centerY).mas_offset(4); - make.leading.mas_equalTo(self.nickLabel); - make.height.mas_equalTo(14); - }]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-15); - make.centerY.mas_equalTo(self.nickLabel.mas_centerY); - make.height.mas_equalTo(14); - }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(0); - make.leading.mas_equalTo(self.avaterImgView); - make.trailing.mas_equalTo(-15); - make.height.mas_equalTo(0.5); - }]; -} - -- (void)setItem:(XPMineFootPrintModel *)item { - _item = item; - self.nickLabel.text = item.title; - self.avaterImgView.imageUrl = item.avatar; - self.memberIdLabel.text = [NSString stringWithFormat:@"ID：%lld", item.erbanNo]; - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - [dateFormatter setDateFormat:@"yyyy-MM-dd"]; - NSDate *date = [NSDate dateWithTimeIntervalSince1970:item.updateTime/ 1000]; - self.timeLabel.text = [dateFormatter stringFromDate:date]; -} - -- (NetImageView *)avaterImgView { - if (!_avaterImgView) { - _avaterImgView = [[NetImageView alloc] init]; - _avaterImgView.contentMode = UIViewContentModeScaleAspectFit; - _avaterImgView.layer.cornerRadius = 4; - _avaterImgView.layer.masksToBounds = YES; - } - return _avaterImgView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _nickLabel.font = [UIFont systemFontOfSize:14]; - } - return _nickLabel; -} - -- (UILabel *)memberIdLabel { - if (!_memberIdLabel) { - _memberIdLabel = [[UILabel alloc] init]; - _memberIdLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _memberIdLabel.font = [UIFont systemFontOfSize:12]; - } - return _memberIdLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _timeLabel.font = [UIFont boldSystemFontOfSize:10]; - } - return _timeLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = UIColorFromRGB(0xEAEAF1); - } - return _lineView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.h deleted file mode 100644 index a50bb62..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMMineAttentionTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class FansInfoModel, XPMineAttentionTableViewCell; -@protocol XPMineAttentionTableViewCellDelegate - -///跟随进房 -- (void)xPMineAttentionTableViewCell:(XPMineAttentionTableViewCell *)view findUser:(NSString *)uid; - -@end - -@interface XPMineAttentionTableViewCell : UITableViewCell - -///粉丝信息 -@property (nonatomic,strong) FansInfoModel *fansInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m deleted file mode 100644 index 98a8630..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m +++ /dev/null @@ -1,317 +0,0 @@ -// -// XPMineAttentionTableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/21. -// - -#import "XPMineAttentionTableViewCell.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "FansInfoModel.h" - -@interface XPMineAttentionTableViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///性别 -@property (nonatomic,strong) UIButton *sexImageView; -///等级 -@property (nonatomic,strong) NetImageView *experImageView; -///魅力等级 -@property (nonatomic,strong) NetImageView *charmImageView; -///VIP -@property (nonatomic,strong) NetImageView *nobleImageView; -///签名 -@property (nonatomic,strong) UILabel *signLabel; -///找到他 -@property (nonatomic,strong) UIButton *findButton; - -@property (nonatomic, strong) UIView *container; - -@end - - -@implementation XPMineAttentionTableViewCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - - UIView *bottomSpace = [[UIView alloc] init]; - [self.contentView addSubview:bottomSpace]; - [bottomSpace mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.contentView); - make.height.mas_equalTo(12); - }]; - - UIView *container = [[UIView alloc] init]; - container.backgroundColor = [UIColor whiteColor]; - container.layer.cornerRadius = 10; - [self.contentView addSubview:container]; - [container mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(bottomSpace.mas_top); - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-16); - }]; - - [container addSubview:self.avatarImageView]; - [container addSubview:self.stackView]; - [container addSubview:self.signLabel]; - [container addSubview:self.findButton]; - - [self.stackView addArrangedSubview:self.nickLabel]; - [self.stackView addArrangedSubview:self.sexImageView]; - [self.stackView addArrangedSubview:self.experImageView]; - [self.stackView addArrangedSubview:self.charmImageView]; - [self.stackView addArrangedSubview:self.nobleImageView]; - - _container = container; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake((50), (50))); - make.centerY.mas_equalTo(self.container); - make.leading.mas_equalTo(self.container).offset((15)); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset((10)); - make.trailing.mas_lessThanOrEqualTo(self.findButton.mas_leading).mas_offset(-0); - make.height.mas_equalTo(((20))); - make.top.equalTo(self.avatarImageView.mas_top).mas_offset((3)); - }]; - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(28); - make.height.mas_equalTo(14); - }]; - - [self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.stackView); - make.top.equalTo(self.stackView.mas_bottom).mas_offset((7)); - make.trailing.mas_equalTo(self.findButton.mas_leading).mas_offset(-(10)); - }]; - - [self.findButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo((68)); - make.height.mas_equalTo((30)); - make.centerY.mas_equalTo(self.container); - make.trailing.mas_equalTo(self.container).offset(-(15)); - }]; - - CGFloat width = 28 * 20 / 14; - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; -} - -#pragma mark - Event Response -- (void)findButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineAttentionTableViewCell:findUser:)]) { - [self.delegate xPMineAttentionTableViewCell:self findUser:self.fansInfo.userInRoomUid]; - } -} - -#pragma mark - Getters And Setters -- (void)setFansInfo:(FansInfoModel *)fansInfo { - _fansInfo = fansInfo; - if (_fansInfo) { - self.avatarImageView.imageUrl = _fansInfo.avatar; -// if(_fansInfo.nick.length > 5){ -// _fansInfo.nick = [NSString stringWithFormat:@"%@...",[_fansInfo.nick substringToIndex:5]]; -// } - self.nickLabel.text = _fansInfo.nick; - self.signLabel.text = _fansInfo.userDesc && _fansInfo.userDesc.length > 0? _fansInfo.userDesc : YMLocalizedString(@"XPMineAttentionTableViewCell0"); - if (_fansInfo.useingType != ContactUseingType_In_Room && _fansInfo.useingType != ContactUseingType_Share) { - self.experImageView.hidden = NO; - self.charmImageView.hidden = NO; - if (_fansInfo.userVipInfoVO.nameplateUrl != nil) { - self.nobleImageView.hidden = NO; - }else{ - self.nobleImageView.hidden = YES; - } - self.sexImageView.hidden = NO; - self.experImageView.imageUrl = _fansInfo.experUrl; - self.charmImageView.imageUrl = _fansInfo.charmUrl; - self.nobleImageView.imageUrl = _fansInfo.userVipInfoVO.nameplateUrl; - [self.sexImageView setTitle:[NSString getAgeWithBirth:_fansInfo.birth] forState:UIControlStateNormal]; - self.sexImageView.backgroundColor = _fansInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.titleEdgeInsets = _fansInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.sexImageView.selected = _fansInfo.gender != GenderType_Male; - - self.findButton.hidden = _fansInfo.userInRoomUid.length <= 0; - if (self.fansInfo.userVipInfoVO.preventTrace) { - self.findButton.hidden = YES; - } - - UIImage *nobleImage = self.nobleImageView.image; - if (nobleImage) { - CGFloat scale = nobleImage.size.width / nobleImage.size.height; - [self.nobleImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20* scale, 20)); - }]; - } else { - [self.nobleImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(0, 20)); - }]; - } - - if (fansInfo.userVipInfoVO && fansInfo.userVipInfoVO.friendNickColour) { - self.nickLabel.textColor = [self colorWithHexString:fansInfo.userVipInfoVO.friendNickColour]; - } else { - self.nickLabel.textColor = UIColorFromRGB(0x333333); - } - } else { - self.experImageView.hidden = YES; - self.charmImageView.hidden = YES; - self.nobleImageView.hidden = YES; - self.sexImageView.hidden = YES; - self.findButton.hidden = YES; - self.nickLabel.textColor = UIColorFromRGB(0x333333); - } - } -} - -- (UIColor *)colorWithHexString: (NSString *) hexString { - NSString *colorString = [[hexString stringByReplacingOccurrencesOfString: @"#" withString: @""] uppercaseString]; - CGFloat alpha, red, blue, green; - alpha = 1.0f; - red = [self colorComponentFrom: colorString start: 0 length: 2]; - green = [self colorComponentFrom: colorString start: 2 length: 2]; - blue = [self colorComponentFrom: colorString start: 4 length: 2]; - return [UIColor colorWithRed: red green: green blue: blue alpha: alpha]; -} - -- (CGFloat) colorComponentFrom: (NSString *) string start: (NSUInteger) start length: (NSUInteger) length { - NSString *substring = [string substringWithRange: NSMakeRange(start, length)]; - NSString *fullHex = length == 2 ? substring : [NSString stringWithFormat: @"%@%@", substring, substring]; - unsigned hexComponent; - [[NSScanner scannerWithString: fullHex] scanHexInt: &hexComponent]; - return hexComponent / 255.0; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = (50.0/2); - } - return _avatarImageView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = (4); - } - return _stackView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = kFontMedium(14); - _nickLabel.textColor = UIColorFromRGB(0x333333); - } - return _nickLabel; -} - -- (UIButton *)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; - } - return _sexImageView; -} - -- (NetImageView *)experImageView { - if (!_experImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - - _experImageView = [[NetImageView alloc] initWithConfig:config]; - _experImageView.layer.maskedCorners = YES; - _experImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _experImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - _charmImageView.layer.maskedCorners = YES; - _charmImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _charmImageView; -} - -- (NetImageView *)nobleImageView { - if (!_nobleImageView) { - _nobleImageView = [[NetImageView alloc] init]; - } - return _nobleImageView; -} - -- (UILabel *)signLabel{ - if (!_signLabel) { - _signLabel = [[UILabel alloc] init]; - _signLabel.textColor = UIColorFromRGB(0x7b7b7d); - _signLabel.font = kFontRegular(13); - } - return _signLabel; -} - -- (UIButton *)findButton { - if (!_findButton) { - _findButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_findButton setTitle:YMLocalizedString(@"XPMineAttentionTableViewCell1") forState:UIControlStateNormal]; - [_findButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake((68), (30))]; - [_findButton setBackgroundImage:image forState:UIControlStateNormal]; - _findButton.titleLabel.font = kFontMedium(14); - _findButton.layer.masksToBounds = YES; - _findButton.layer.cornerRadius = (15); - _findButton.hidden = YES; - [_findButton addTarget:self action:@selector(findButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _findButton; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.h deleted file mode 100644 index 7b45aac..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMMineFansTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class FansInfoModel, XPMineFansTableViewCell; -@protocol XPMineFansTableViewCellDelegate -///关注 -- (void)xPMineFansTableViewCell:(XPMineFansTableViewCell *)view didClickAttention:(NSString *)uid; - -@end -@interface XPMineFansTableViewCell : UITableViewCell -///粉丝信息 -@property (nonatomic,strong) FansInfoModel *fansInfo; -///代理 -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m deleted file mode 100644 index e987b73..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m +++ /dev/null @@ -1,301 +0,0 @@ -// -// XPMineFansTableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/21. -// - -#import "XPMineFansTableViewCell.h" -///Third -#import -#import -///Tool -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "FansInfoModel.h" - -@interface XPMineFansTableViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///性别 -//@property (nonatomic,strong) UIButton *sexImageView; -///等级 -@property (nonatomic,strong) NetImageView *experImageView; -///魅力等级 -@property (nonatomic,strong) NetImageView *charmImageView; -///VIP -@property (nonatomic,strong) NetImageView *nobleImageView; -///签名 -@property (nonatomic,strong) UILabel *signLabel; -///关注 -@property (nonatomic,strong) UIButton *attentionButton; - -@property (nonatomic, strong) UIView *container; - -@end - - -@implementation XPMineFansTableViewCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - - UIView *bottomSpace = [[UIView alloc] init]; - [self.contentView addSubview:bottomSpace]; - [bottomSpace mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.contentView); - make.height.mas_equalTo(12); - }]; - - UIView *container = [[UIView alloc] init]; - container.backgroundColor = [UIColor whiteColor]; - container.layer.cornerRadius = 10; - [self.contentView addSubview:container]; - [container mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(bottomSpace.mas_top); - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-16); - }]; - - [container addSubview:self.avatarImageView]; - [container addSubview:self.stackView]; - [container addSubview:self.signLabel]; - [container addSubview:self.attentionButton]; - - - [self.stackView addArrangedSubview:self.nickLabel]; - [self.stackView addArrangedSubview:self.experImageView]; - [self.stackView addArrangedSubview:self.charmImageView]; - [self.stackView addArrangedSubview:self.nobleImageView]; - _container = container; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake((50), (50))); - make.centerY.mas_equalTo(self.container); - make.leading.mas_equalTo(self.container).offset((15)); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset((10)); - make.trailing.mas_lessThanOrEqualTo(self.attentionButton.mas_leading).mas_offset(-0); - make.height.mas_equalTo(20); - make.top.equalTo(self.avatarImageView.mas_top).mas_offset((3)); - }]; - - [self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.stackView); - make.top.equalTo(self.stackView.mas_bottom).mas_offset((7)); - make.trailing.mas_equalTo(self.attentionButton.mas_leading).mas_offset(-(10)); - }]; - - [self.attentionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo((68)); - make.height.mas_equalTo((30)); - make.centerY.mas_equalTo(self.container); - make.trailing.mas_equalTo(self.container).offset(-(15)); - }]; - - CGFloat width = 28 * 20 / 14; - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; -} - -#pragma mark - Event Response -- (void)attentionButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineFansTableViewCell:didClickAttention:)]) { - [self.delegate xPMineFansTableViewCell:self didClickAttention:self.fansInfo.uid]; - } -} - -#pragma mark - Getters And Setters -- (void)setFansInfo:(FansInfoModel *)fansInfo { - _fansInfo = fansInfo; - if (_fansInfo) { - self.avatarImageView.imageUrl = _fansInfo.avatar; - - self.nickLabel.text = _fansInfo.nick; - self.signLabel.text = _fansInfo.userDesc && _fansInfo.userDesc.length > 0? _fansInfo.userDesc : YMLocalizedString(@"XPMineFansTableViewCell0"); - if (_fansInfo.useingType != ContactUseingType_In_Room && _fansInfo.useingType != ContactUseingType_Share) { - self.experImageView.hidden = NO; - self.charmImageView.hidden = NO; - if (_fansInfo.userVipInfoVO.nameplateUrl != nil) { - self.nobleImageView.hidden = NO; - }else{ - self.nobleImageView.hidden = YES; - } - - self.experImageView.imageUrl = _fansInfo.experUrl; - self.charmImageView.imageUrl = _fansInfo.charmUrl; - self.nobleImageView.imageUrl = _fansInfo.userVipInfoVO.nameplateUrl; - - BOOL isMyFriend = [[NIMSDK sharedSDK].userManager isMyFriend:_fansInfo.uid]; - self.attentionButton.enabled = !isMyFriend; - self.attentionButton.hidden = NO; - - UIImage *nobleImage = self.nobleImageView.image; - if (nobleImage) { - CGFloat scale = nobleImage.size.width / nobleImage.size.height; - [self.nobleImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20* scale, 20)); - }]; - } else { - [self.nobleImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(0, 20)); - }]; - } - - if (fansInfo.userVipInfoVO && fansInfo.userVipInfoVO.friendNickColour) { - self.nickLabel.textColor = [self colorWithHexString:fansInfo.userVipInfoVO.friendNickColour]; - } else { - self.nickLabel.textColor = UIColorFromRGB(0x333333); - } - } else { - self.experImageView.hidden = YES; - self.charmImageView.hidden = YES; - self.nobleImageView.hidden = YES; - self.attentionButton.hidden = YES; - self.nickLabel.textColor = UIColorFromRGB(0x333333); - } - } -} - -- (UIColor *)colorWithHexString: (NSString *) hexString { - NSString *colorString = [[hexString stringByReplacingOccurrencesOfString: @"#" withString: @""] uppercaseString]; - CGFloat alpha, red, blue, green; - alpha = 1.0f; - red = [self colorComponentFrom: colorString start: 0 length: 2]; - green = [self colorComponentFrom: colorString start: 2 length: 2]; - blue = [self colorComponentFrom: colorString start: 4 length: 2]; - return [UIColor colorWithRed: red green: green blue: blue alpha: alpha]; -} - -- (CGFloat) colorComponentFrom: (NSString *) string start: (NSUInteger) start length: (NSUInteger) length { - NSString *substring = [string substringWithRange: NSMakeRange(start, length)]; - NSString *fullHex = length == 2 ? substring : [NSString stringWithFormat: @"%@%@", substring, substring]; - unsigned hexComponent; - [[NSScanner scannerWithString: fullHex] scanHexInt: &hexComponent]; - return hexComponent / 255.0; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = (50.0/2); - } - return _avatarImageView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = (4); - } - return _stackView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = kFontSemibold(14); - _nickLabel.textColor = UIColorFromRGB(0x333333); - } - return _nickLabel; -} - -- (NetImageView *)experImageView { - if (!_experImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - - _experImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _experImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _charmImageView; -} - -- (NetImageView *)nobleImageView { - if (!_nobleImageView) { - _nobleImageView = [[NetImageView alloc] init]; - } - return _nobleImageView; -} - -- (UILabel *)signLabel{ - if (!_signLabel) { - _signLabel = [[UILabel alloc] init]; - _signLabel.textColor = UIColorFromRGB(0x7b7b7d); - _signLabel.font = kFontRegular(13); - } - return _signLabel; -} - -- (UIButton *)attentionButton { - if (!_attentionButton) { - _attentionButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _attentionButton.titleLabel.font = kFontMedium(14); - _attentionButton.titleLabel.numberOfLines = 2; // 允许多行 - _attentionButton.titleLabel.lineBreakMode = NSLineBreakByWordWrapping; - _attentionButton.titleLabel.adjustsFontSizeToFitWidth = YES; // 关键 - _attentionButton.titleLabel.minimumScaleFactor = 0.1; // 最小允许缩到 50% - _attentionButton.titleLabel.lineBreakMode = NSLineBreakByClipping; - _attentionButton.titleLabel.textAlignment = NSTextAlignmentCenter; - _attentionButton.contentEdgeInsets = UIEdgeInsetsMake(0, 8, 0, 8); - - [_attentionButton setTitle:YMLocalizedString(@"XPMineFansTableViewCell1") forState:UIControlStateNormal]; - [_attentionButton setTitleColor:UIColorFromRGB(0xFF8C03) forState:UIControlStateNormal]; - [_attentionButton setBackgroundImage:[UIImage imageWithColor:[UIColor whiteColor]] forState:UIControlStateNormal]; - - [_attentionButton setTitle:YMLocalizedString(@"XPMineFansTableViewCell2") forState:UIControlStateDisabled]; - - [_attentionButton addTarget:self action:@selector(attentionButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_attentionButton setCornerRadius:15 - corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner - borderWidth:1 - borderColor:UIColorFromRGB(0xFF8C03)]; - [_attentionButton setCornerRadius:15]; - - - } - return _attentionButton; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.h deleted file mode 100644 index 9229f0c..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMineFriendEmptyTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineFriendEmptyTableViewCell : UITableViewCell -///空白的文字 -@property (nonatomic,copy) NSString *emptyTitle; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.m deleted file mode 100644 index 3fdc8b1..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.m +++ /dev/null @@ -1,83 +0,0 @@ -// -// YMMineFriendEmptyTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import "XPMineFriendEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPMineFriendEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPMineFriendEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView.mas_centerY).offset(-15); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters - -- (void)setEmptyTitle:(NSString *)emptyTitle { - _emptyTitle = emptyTitle; - if (_emptyTitle.length > 0) { - self.titleLabel.text = _emptyTitle; - } -} - -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPMineFriendEmptyTableViewCell0"); - _titleLabel.numberOfLines = 2; - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.h deleted file mode 100644 index 6217cef..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMMineFriendTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel; -@interface XPMineFriendTableViewCell : UITableViewCell -@property (nonatomic,strong) UserInfoModel *userInfo; -///是否在房内聊天 -@property (nonatomic,assign) BOOL isInRoom; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.m deleted file mode 100644 index dd6568b..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.m +++ /dev/null @@ -1,247 +0,0 @@ -// -// XPMineFriendTableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/21. -// - -#import "XPMineFriendTableViewCell.h" -///Third -#import -///Tool -#import "NetImageConfig.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "UserInfoModel.h" - -@interface XPMineFriendTableViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///性别 -//@property (nonatomic,strong) UIButton *sexImageView; -///等级 -@property (nonatomic,strong) NetImageView *experImageView; -///魅力等级 -@property (nonatomic,strong) NetImageView *charmImageView; -@property(nonatomic, strong) NetImageView *VIPImageView; - -///签名 -@property (nonatomic,strong) UILabel *signLabel; - -@property (nonatomic, strong) UIView *container; - -@end - - -@implementation XPMineFriendTableViewCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - - UIView *bottomSpace = [[UIView alloc] init]; - [self.contentView addSubview:bottomSpace]; - [bottomSpace mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.contentView); - make.height.mas_equalTo(12); - }]; - - UIView *container = [[UIView alloc] init]; - container.backgroundColor = [UIColor whiteColor]; - container.layer.cornerRadius = 10; - [self.contentView addSubview:container]; - [container mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(bottomSpace.mas_top); - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-16); - }]; - - [container addSubview:self.avatarImageView]; - [container addSubview:self.stackView]; - [container addSubview:self.signLabel]; - - [self.stackView addArrangedSubview:self.nickLabel]; -// [self.stackView addArrangedSubview:self.sexImageView]; - [self.stackView addArrangedSubview:self.experImageView]; - [self.stackView addArrangedSubview:self.charmImageView]; - [self.stackView addArrangedSubview:self.VIPImageView]; - - _container = container; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(50, 50)); - make.centerY.mas_equalTo(self.container); - make.leading.mas_equalTo(self.container).offset(15); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - make.trailing.mas_lessThanOrEqualTo(self.container).offset(-10); - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); - - -// make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset((10)); -// make.trailing.mas_lessThanOrEqualTo(self.container).mas_offset(-0); -// make.height.mas_equalTo(((20))); -// make.top.equalTo(self.avatarImageView.mas_top).mas_offset((3)); - }]; -// [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.width.mas_equalTo(28); -// make.height.mas_equalTo(14); -// }]; - [self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.stackView); - make.top.mas_equalTo(self.stackView.mas_bottom).offset(7); - }]; - CGFloat width = 28 * 20 / 14; - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; - - [self.VIPImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.avatarImageView.imageUrl = _userInfo.avatar; - self.nickLabel.text = _userInfo.nick; - self.signLabel.text = _userInfo.userDesc && _userInfo.userDesc.length > 0? _userInfo.userDesc : YMLocalizedString(@"XPMineFriendTableViewCell0"); - - self.experImageView.hidden = NO; - self.charmImageView.hidden = NO; - self.experImageView.imageUrl = _userInfo.userLevelVo.experUrl; - self.charmImageView.imageUrl = _userInfo.userLevelVo.charmUrl; -// [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; - - if (userInfo.userVipInfoVO) { - self.VIPImageView.hidden = userInfo.userVipInfoVO.vipLevel == 0; - self.VIPImageView.imageUrl = userInfo.userVipInfoVO.nameplateUrl; - @kWeakify(self); - [self.VIPImageView loadImageWithUrl:userInfo.userVipInfoVO.nameplateUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - if (image) { - @kStrongify(self); - CGFloat scale = image.size.width / image.size.height; - [self.VIPImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20* scale, 20)); - }]; - [self.stackView layoutIfNeeded]; - } - }]; - } else { - self.VIPImageView.hidden = YES; - } - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 50.0/2; - } - return _avatarImageView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 4; - } - return _stackView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = kFontSemibold(14); - _nickLabel.textColor = [DJDKMIMOMColor inputTextColor]; - } - return _nickLabel; -} - -//- (UIButton *)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; -// } -// return _sexImageView; -//} - -- (NetImageView *)experImageView { - if (!_experImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - - _experImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _experImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _charmImageView; -} - -- (NetImageView *)VIPImageView { - if (!_VIPImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - - _VIPImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _VIPImageView; -} - -- (UILabel *)signLabel{ - if (!_signLabel) { - _signLabel = [[UILabel alloc] init]; - _signLabel.textColor = UIColorFromRGB(0x7b7b7d); - _signLabel.font = kFontRegular(13); - } - return _signLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineAlbumTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineAlbumTableViewCell.h deleted file mode 100644 index 0e416c2..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineAlbumTableViewCell.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPMineAlbumTableViewCell.h -// YuMi -// -// Created by P on 2024/6/24. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineAlbumTableViewCell : UITableViewCell - -@property (nonatomic, copy) NSArray *albumDataSource; - -+ (CGFloat)cellHeight:(NSInteger)numOfPhotos; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineAlbumTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineAlbumTableViewCell.m deleted file mode 100644 index fefae37..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineAlbumTableViewCell.m +++ /dev/null @@ -1,160 +0,0 @@ -// -// XPMineAlbumTableViewCell.m -// YuMi -// -// Created by P on 2024/6/24. -// - -#import "XPMineAlbumTableViewCell.h" -#import "UserPhoto.h" -#import "SDPhotoBrowser.h" - -@interface XPMineAlbumCell : UICollectionViewCell - -@property (nonatomic, strong) NetImageView *imageView; - -@end - -@implementation XPMineAlbumCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserLibaryDetail; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _imageView = [[NetImageView alloc] initWithConfig:config]; - _imageView.layer.masksToBounds = YES; - _imageView.layer.cornerRadius = 8; - _imageView.contentMode = UIViewContentModeScaleAspectFill; - - [self.contentView addSubview:_imageView]; - [_imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - } - return self; -} - -@end - - -@interface XPMineAlbumTableViewCell() - -@property (nonatomic, strong) UICollectionView *albumCollectionView; -@property (nonatomic, strong) UILabel *noDataLabel; - -@end - -@implementation XPMineAlbumTableViewCell - -+ (CGFloat)cellHeight:(NSInteger)numOfPhotos { - NSInteger lines = MIN(3, ceil(numOfPhotos / 3.0)); - return lines * (kGetScaleWidth(110) + 7); -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.backgroundColor = [UIColor clearColor]; - self.contentView.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.albumCollectionView]; - [self.albumCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.contentView addSubview:self.noDataLabel]; - [self.noDataLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.contentView); - }]; - } - return self; -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; -} - -- (void)setAlbumDataSource:(NSArray *)albumDataSource { - _albumDataSource = albumDataSource; - self.noDataLabel.hidden = albumDataSource.count > 0; - [self.albumCollectionView reloadData]; -} - -#pragma mark - UICollectionViewDataSource - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.albumDataSource.count; -} - -- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPMineAlbumCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"Album Cell" - forIndexPath:indexPath]; - UserPhoto *photo = [self.albumDataSource xpSafeObjectAtIndex:indexPath.row]; - if (photo) { - cell.imageView.imageUrl = photo.photoUrl; - } - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView -didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init]; - browser.sourceImagesContainerView = self.albumCollectionView; - browser.delegate = self; - browser.imageCount = self.albumDataSource.count; - browser.currentImageIndex = indexPath.item - 1; - browser.isHaveUserAdd = YES; - [browser show]; -} - -#pragma mark - UICollectionViewDelegateFlowLayout -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - return CGSizeMake(kGetScaleWidth(110), kGetScaleWidth(110)); -} - -#pragma mark - SDPhotoBrowserDelegate -- (UIImage *)photoBrowser:(SDPhotoBrowser *)browser placeholderImageForIndex:(NSInteger)index { - return [UIImageConstant defaultAvatarPlaceholder]; -} - -- (NSURL *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageURLForIndex:(NSInteger)index { - UserPhoto *photo = [self.albumDataSource xpSafeObjectAtIndex:index]; - if (photo) { - return [NSURL URLWithString:photo.photoUrl]; - } - return nil; -} - -#pragma mark - -- (UICollectionView *)albumCollectionView { - if (!_albumCollectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionVertical; - layout.minimumInteritemSpacing = 8; - layout.minimumLineSpacing = 8; - _albumCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero - collectionViewLayout:layout]; - _albumCollectionView.backgroundColor = [UIColor clearColor]; - _albumCollectionView.delegate = self; - _albumCollectionView.dataSource = self; - _albumCollectionView.scrollEnabled = NO; - [_albumCollectionView registerClass:[XPMineAlbumCell class] - forCellWithReuseIdentifier:@"Album Cell"]; - } - return _albumCollectionView; -} - -- (UILabel *)noDataLabel { - if (!_noDataLabel) { - _noDataLabel = [UILabel labelInitWithText:YMLocalizedString(@"XPMineUserInfoGiftWallViewController3") - font:kFontRegular(14) - textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - _noDataLabel.backgroundColor = [UIColor clearColor]; - _noDataLabel.textAlignment = NSTextAlignmentCenter; - _noDataLabel.alpha = 0.5; - _noDataLabel.hidden = YES; - } - return _noDataLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.h deleted file mode 100644 index 9ca5831..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// XPMineDataClanTableViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import -#import "UserInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN -@class ClanDetailInfoModel, XPMineDataClanTableViewCell; -@protocol XPMineDataClanTableViewCellDelegate -///点击了收起 -- (void)xPMineDataClanTableViewCell:(XPMineDataClanTableViewCell *)view didClickFold:(UIButton *)sender; -///点击了加入公会 -- (void)xPMineDataClanTableViewCell:(XPMineDataClanTableViewCell *)view didClickEnter:(ClanDetailInfoModel *)clanInfo; -///点击了公会 -- (void)xPMineDataClanTableViewCell:(XPMineDataClanTableViewCell *)view didClickClanView:(ClanDetailInfoModel *)clanInfo; -///点击了公会房间 -- (void)xPMineDataClanTableViewCell:(XPMineDataClanTableViewCell *)view didClickHallView:(ClanDetailInfoModel *)clanInfo; -///点击了展开 -- (void)xPMineDataClanTableViewCell:(XPMineDataClanTableViewCell *)view didClickOpen:(ClanDetailInfoModel *)clanInfo; -@end -@interface XPMineDataClanTableViewCell : UITableViewCell -///是否展示加入公会 -@property (nonatomic,assign) BOOL isShowEnterHall; - -@property (nonatomic,strong) ClanDetailInfoModel *clanInfo; -@property (nonatomic,strong) UserInfoModel *userInfo; -@property (nonatomic,assign) BOOL isOpne; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m deleted file mode 100644 index 3017608..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m +++ /dev/null @@ -1,445 +0,0 @@ -// -// XPMineDataClanTableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import "XPMineDataClanTableViewCell.h" -///Third -#import - -///Tool -#import "NetImageView.h" -#import "UIButton+EnlargeTouchArea.h" -///Model -#import "ClanDetailInfoModel.h" - -@interface XPMineDataClanTableViewCell () -/////背景 -@property (nonatomic,strong) UIView *backView; -/////显示标题 -@property (nonatomic,strong) UILabel *titleLabel; - -///星座 -//@property (nonatomic,strong) UILabel *starView; -/////星座背景图片 -//@property (nonatomic,strong) UIImageView *starIconView; -///生日 -@property (nonatomic,strong) UILabel *birthdayHeadView; -@property (nonatomic,strong) UILabel *birthdayView; -///地区 -@property (nonatomic,strong) UILabel *areaHeadView; -@property (nonatomic,strong) UILabel *areaView; -@property (nonatomic,strong) UIButton *areaMornBnt; -@property (nonatomic,strong) UIButton *areaIconView; -///房间 -@property (nonatomic,strong) UILabel *roomHeadView; -@property (nonatomic,strong) UILabel *roomView; -@property (nonatomic,strong) UIButton *roomIconView; - -///公会 -@property (nonatomic,strong) UILabel *clanHeadView; -@property (nonatomic,strong) UILabel *clanView; -@property (nonatomic,strong) UIButton *clanIconView; - - - -@end - -@implementation XPMineDataClanTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - 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.birthdayHeadView]; - [self.backView addSubview:self.birthdayView]; - [self.backView addSubview:self.areaHeadView]; - [self.backView addSubview:self.areaView]; - [self.backView addSubview:self.areaMornBnt]; - [self.backView addSubview:self.areaIconView]; - - [self.backView addSubview:self.roomHeadView]; - [self.backView addSubview:self.roomView]; - [self.backView addSubview:self.roomIconView]; - [self.backView addSubview:self.clanHeadView]; - [self.backView addSubview:self.clanView]; - [self.backView addSubview:self.clanIconView]; - -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(kGetScaleWidth(15)); - make.top.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView).mas_offset(-kGetScaleWidth(12)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).offset(kGetScaleWidth(12)); - make.top.mas_equalTo(self.backView).offset(kGetScaleWidth(10)); - make.height.mas_equalTo(kGetScaleWidth(17)); - }]; - -// [self.starView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.leading.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.leading.equalTo(self.starView.mas_trailing).mas_offset(kGetScaleWidth(10)); -// }]; - - [self.birthdayHeadView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.height.equalTo(self.titleLabel); - make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(12)); - }]; - [self.birthdayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.birthdayHeadView); - make.leading.equalTo(self.birthdayHeadView.mas_trailing).mas_offset(kGetScaleWidth(10)); - }]; - - - [self.areaHeadView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.height.equalTo(self.titleLabel); - make.top.mas_equalTo(kGetScaleWidth(62)); - }]; - [self.areaView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.centerY.equalTo(self.areaHeadView); - make.leading.equalTo(self.birthdayView); - }]; - [self.areaMornBnt mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(25)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.leading.equalTo(self.areaView.mas_trailing).mas_offset(kGetScaleWidth(8)); - make.centerY.equalTo(self.areaView); - }]; - - - [self.areaIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(20)); - make.centerY.equalTo(self.areaView); - make.leading.equalTo(self.areaMornBnt.mas_trailing); - }]; - - - [self.roomHeadView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.height.equalTo(self.titleLabel); - make.top.mas_equalTo(kGetScaleWidth(84)); - }]; - [self.roomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.centerY.equalTo(self.roomHeadView); - make.leading.equalTo(self.birthdayView); - }]; - [self.roomIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(20)); - make.centerY.equalTo(self.roomHeadView); - make.leading.equalTo(self.roomView.mas_trailing); - }]; - [self.clanHeadView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.height.equalTo(self.titleLabel); - make.top.mas_equalTo(kGetScaleWidth(108)); - }]; - [self.clanView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.clanHeadView); - make.leading.equalTo(self.birthdayView); - }]; - [self.clanIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(20)); - make.centerY.equalTo(self.clanHeadView); - make.leading.equalTo(self.clanView.mas_trailing); - }]; -} - -#pragma mark - Event Response -- (void)enterButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineDataClanTableViewCell:didClickEnter:)]) { - [self.delegate xPMineDataClanTableViewCell:self didClickEnter:self.clanInfo]; - } -} - -- (void)foldButtonAction:(UIButton *)sender{ - sender.selected = !sender.selected; - - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineDataClanTableViewCell:didClickFold:)]) { - [self.delegate xPMineDataClanTableViewCell:self didClickFold:sender]; - } -} - -- (void)didTapClanView { - if (_clanInfo.clan.elderUid.length <= 0) return; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineDataClanTableViewCell:didClickClanView:)]) { - [self.delegate xPMineDataClanTableViewCell:self didClickClanView:self.clanInfo]; - } -} - -- (void)didTapHallView { - if(_clanInfo.hall.hallName.length <= 0)return; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineDataClanTableViewCell:didClickHallView:)]) { - [self.delegate xPMineDataClanTableViewCell:self didClickHallView:self.clanInfo]; - } -} -- (void)didTapAreaView { - if(self.delegate && [self.delegate respondsToSelector:@selector(xPMineDataClanTableViewCell:didClickOpen:)]){ - [self.delegate xPMineDataClanTableViewCell:self didClickOpen:self.clanInfo]; - } -} -#pragma mark - Getters And Setters -- (void)setClanInfo:(ClanDetailInfoModel *)clanInfo { - _clanInfo = clanInfo; - if (_clanInfo) { - _clanView.text = _clanInfo.clan.name; - _roomView.text = _clanInfo.hall.hallName.length > 0 ? _clanInfo.hall.hallName :([[AccountInfoStorage instance] getUid].integerValue == self.userInfo.uid ? YMLocalizedString(@"XPMineDataClanTableViewCell12") : YMLocalizedString(@"XPMineDataClanTableViewCell11")) ; - _roomIconView.hidden = !(_clanInfo.hall.hallName.length > 0); - _roomView.textColor = _clanInfo.hall.hallName.length > 0 ? UIColorFromRGB(0xFFBC51):[DJDKMIMOMColor inputTextColor]; - if(self.isOpne == YES){ - self.areaMornBnt.hidden = YES; - self.areaIconView.hidden = YES; - self.roomHeadView.hidden = NO; - self.roomView.hidden = NO; - self.clanView.hidden = YES; - self.clanHeadView.hidden = YES; - self.clanIconView.hidden = YES; - if (self.clanInfo.clan.elderUid.length > 0) { - self.clanView.hidden = NO; - self.clanHeadView.hidden = NO; - self.clanIconView.hidden = NO; - } - }else{ - self.roomHeadView.hidden = YES; - self.roomView.hidden = YES; - self.roomIconView.hidden = YES; - self.clanView.hidden = YES; - self.clanHeadView.hidden = YES; - self.clanIconView.hidden = YES; - self.areaMornBnt.hidden = NO; - self.areaIconView.hidden = NO; - } - - } - -} --(void)setUserInfo:(UserInfoModel *)userInfo{ - _userInfo = userInfo; -// _starIconView.hidden = NO; -// NSString *dateStr = [NSString stringWithFormat:@"%@",[NSString getCalculateConstellationImageWithMonth:_userInfo.birth]]; -// if(dateStr.length > 0){ -// _starIconView.image = kImage(dateStr); -// } - _birthdayView.text = [self timestampSwitchTime:_userInfo.birth / 1000 andFormatter:@"yyyy-MM-dd"]; - _areaView.text = _userInfo.region; -} --(NSString *)timestampSwitchTime:(NSInteger)timestamp andFormatter:(NSString *)format{ - - - - NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; - [formatter setDateStyle:NSDateFormatterMediumStyle]; - [formatter setTimeZone:[NSTimeZone timeZoneWithName:@"Asia/Shanghai"]]; - [formatter setTimeStyle:NSDateFormatterShortStyle]; - - [formatter setDateFormat:format]; // （@"YYYY-MM-dd hh:mm:ss"）----------设置你想要的格式,hh与HH的区别:分别表示12小时制,24小时制 - NSDate *confromTimesp = [NSDate dateWithTimeIntervalSince1970:timestamp]; - NSString *confromTimespStr = [formatter stringFromDate:confromTimesp]; - return confromTimespStr; -} -- (NSString *)calculateConstellationWithMonth:(long)time -{ - NSString *astroString = YMLocalizedString(@"XPMineHeadView0"); - NSString *astroFormat = @"102123444543"; - NSString *result; - - NSInteger month = [self getMonth:time]; - NSInteger day = [self getDay:time]; - - if (month<1 || month>12 || day<1 || day>31){ - return YMLocalizedString(@"XPMineHeadView1"); - } - - if(month==2 && day>29) - { - return YMLocalizedString(@"XPMineHeadView2"); - }else if(month==4 || month==6 || month==9 || month==11) { - if (day>30) { - return YMLocalizedString(@"XPMineHeadView3"); - } - } - - result=[NSString stringWithFormat:@"%@",[astroString substringWithRange:NSMakeRange(month*2-(day < [[astroFormat substringWithRange:NSMakeRange((month-1), 1)] intValue] - (-19))*2,2)]]; - - return [NSString stringWithFormat:YMLocalizedString(@"XPMineHeadView6"),result]; -} - --(NSInteger) getMonth:(long )time -{ - NSDate *date = [NSDate dateWithTimeIntervalSince1970:time/1000]; - NSCalendar* calendar = [NSCalendar currentCalendar]; - NSDateComponents* components = [calendar components:NSCalendarUnitMonth fromDate:date]; - NSInteger month = components.month; - return month; -} - -- (NSInteger) getDay:(long) time -{ - NSDate *date = [NSDate dateWithTimeIntervalSince1970:time/1000]; - NSCalendar* calendar = [NSCalendar currentCalendar]; - NSDateComponents* components = [calendar components:NSCalendarUnitDay fromDate:date]; - NSInteger day = components.day; - return day; -} -- (void)setIsShowEnterHall:(BOOL)isShowEnterHall { - _isShowEnterHall = isShowEnterHall; - -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.userInteractionEnabled = YES; - _backView.layer.cornerRadius = kGetScaleWidth(8); - _backView.backgroundColor =[UIColor whiteColor]; - - } - return _backView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPMineDataClanTableViewCell6"); - _titleLabel.font = kFontMedium(15); - _titleLabel.textColor = UIColorFromRGB(0x1F1A4E); - } - 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 *)birthdayHeadView{ - if (!_birthdayHeadView){ - _birthdayHeadView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineDataClanTableViewCell8") font:kFontRegular(12) textColor:[DJDKMIMOMColor inputTextColor]]; - } - return _birthdayHeadView; -} -- (UILabel *)birthdayView{ - if (!_birthdayView){ - _birthdayView = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:[DJDKMIMOMColor inputTextColor]]; - } - return _birthdayView; -} --(UILabel *)areaHeadView{ - if (!_areaHeadView){ - _areaHeadView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineDataClanTableViewCell13") font:kFontRegular(12) textColor:[DJDKMIMOMColor inputTextColor]]; - } - return _areaHeadView; -} --(UILabel *)areaView{ - if (!_areaView){ - _areaView = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:[DJDKMIMOMColor inputTextColor]]; - } - return _areaView; -} --(UIButton *)areaMornBnt{ - if (!_areaMornBnt){ - _areaMornBnt = [UIButton new]; - [_areaMornBnt setTitle:YMLocalizedString(@"XPMineDataClanTableViewCell14") forState:UIControlStateNormal]; - [_areaMornBnt setTitleColor:UIColorFromRGB(0xFFBC51) forState:UIControlStateNormal]; - _areaMornBnt.titleLabel.font = kFontRegular(11); - [_areaMornBnt addTarget:self action:@selector(didTapAreaView) forControlEvents:UIControlEventTouchUpInside]; - } - return _areaMornBnt; -} --(UIButton *)areaIconView{ - if (!_areaIconView){ - _areaIconView = [UIButton new]; - [_areaIconView setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_areaIconView addTarget:self action:@selector(didTapAreaView) forControlEvents:UIControlEventTouchUpInside]; - [_areaIconView setBackgroundImage:[kImage(@"mine_clan_arrow")ms_SetImageForRTL] forState:UIControlStateNormal]; - } - return _areaIconView; -} --(UILabel *)roomHeadView{ - if (!_roomHeadView){ - _roomHeadView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineDataClanTableViewCell9") font:kFontRegular(12) textColor:[DJDKMIMOMColor inputTextColor]]; - _roomHeadView.hidden = YES; - - } - return _roomHeadView; -} -- (UILabel *)roomView{ - if (!_roomView){ - _roomView = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:UIColorFromRGB(0xFFBC51)]; - _roomView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(didTapHallView)]; - [_roomView addGestureRecognizer:tap]; - _roomView.hidden = YES; - } - return _roomView; -} --(UIButton *)roomIconView{ - if (!_roomIconView){ - _roomIconView = [UIButton new]; - [_roomIconView setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_roomIconView addTarget:self action:@selector(didTapHallView) forControlEvents:UIControlEventTouchUpInside]; - [_roomIconView setBackgroundImage:[kImage(@"mine_clan_arrow")ms_SetImageForRTL] forState:UIControlStateNormal]; - _roomIconView.hidden = YES; - } - return _roomIconView; -} -- (UILabel *)clanHeadView{ - if (!_clanHeadView){ - _clanHeadView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineDataClanTableViewCell10") font:kFontRegular(12) textColor:[DJDKMIMOMColor inputTextColor]]; - _clanHeadView.hidden = YES; - } - return _clanHeadView; -} --(UILabel *)clanView{ - if (!_clanView){ - - _clanView = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:UIColorFromRGB(0xFFBC51)]; - _clanView.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(didTapClanView)]; - [_clanView addGestureRecognizer:tap]; - _clanView.hidden = YES; - } - return _clanView; -} --(UIButton *)clanIconView{ - if (!_clanIconView){ - _clanIconView = [UIButton new]; - [_clanIconView setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_clanIconView addTarget:self action:@selector(didTapClanView) forControlEvents:UIControlEventTouchUpInside]; - [_clanIconView setBackgroundImage:[kImage(@"mine_clan_arrow")ms_SetImageForRTL] forState:UIControlStateNormal]; - _clanIconView.hidden = YES; - } - return _clanIconView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGameMateTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGameMateTableViewCell.h deleted file mode 100644 index 1cc7609..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGameMateTableViewCell.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPMineDataGameMateTableViewCell.h -// YuMi -// -// Created by P on 2024/7/9. -// - -#import -@class XPMineGamePartnerInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineDataGameMateTableViewCell : UITableViewCell - -@property (nonatomic, strong) XPMineGamePartnerInfoModel *cellModel; - -@property (nonatomic, copy) void(^didTapOrder)(XPMineGamePartnerInfoModel *model); - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGameMateTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGameMateTableViewCell.m deleted file mode 100644 index 3e577e2..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGameMateTableViewCell.m +++ /dev/null @@ -1,235 +0,0 @@ -// -// XPMineDataGameMateTableViewCell.m -// YuMi -// -// Created by P on 2024/7/9. -// - -#import "XPMineDataGameMateTableViewCell.h" -#import "XPMineGamePartnerInfoModel.h" - -@interface XPMineDataGameMateTableViewCell() - -@property (nonatomic, strong) NetImageView *bgImageView; -@property (nonatomic, strong) NetImageView *logoImageView; -@property (nonatomic, strong) UILabel *nameLabel; -@property (nonatomic, strong) UILabel *levelLabel; -@property (nonatomic, strong) UILabel *priceLabel; -@property (nonatomic, strong) UIButton *orderButton; - -@end - -@implementation XPMineDataGameMateTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.contentView.backgroundColor = [UIColor whiteColor]; - [self setup]; - } - return self; -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; -} - -- (void)setCellModel:(XPMineGamePartnerInfoModel *)cellModel { - _cellModel = cellModel; - self.bgImageView.imageUrl = cellModel.background; - self.logoImageView.imageUrl = cellModel.logo; - self.nameLabel.text = cellModel.gameName; - self.levelLabel.text = cellModel.proficiency; - - self.orderButton.hidden = cellModel.uid == [AccountInfoStorage instance].getUid.integerValue; - self.priceLabel.text = @(self.cellModel.price).stringValue; -} - -- (void)updatePriceContent { - NSTextAttachment *coinAttachment = [[NSTextAttachment alloc] init]; - coinAttachment.image = kImage(@"moli_money_icon"); - coinAttachment.bounds = CGRectMake(0, -0.5, 9, 9); - NSAttributedString *coin = [NSAttributedString attributedStringWithAttachment:coinAttachment]; - NSAttributedString *price = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@ ", @(self.cellModel.price)] - attributes:@{ - NSFontAttributeName: self.priceLabel.font, - NSForegroundColorAttributeName: self.priceLabel.textColor - }]; - NSMutableAttributedString *mutableAttributedString = [[NSMutableAttributedString alloc] initWithAttributedString:coin]; - [mutableAttributedString insertAttributedString:price atIndex:0]; - self.priceLabel.attributedText = mutableAttributedString.copy; -} - -- (void)setup { - self.backgroundColor = [UIColor clearColor]; - self.contentView.backgroundColor = [UIColor clearColor]; - - [self.contentView addSubview:self.bgImageView]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView).insets(UIEdgeInsetsMake(0, 0, 10, 0)); - }]; - - CAGradientLayer *gradientLayer = [CAGradientLayer layer]; - gradientLayer.frame = CGRectMake(0, 0, KScreenWidth - 28, 68); - gradientLayer.colors = @[ - (id)[UIColorRGBAlpha(0x161616, 0.9) CGColor], - (id)[UIColorRGBAlpha(0x1f1f1f, 0.8) CGColor], - (id)[UIColorRGBAlpha(0x1a1a1a, 0.3) CGColor] - ]; - gradientLayer.locations = @[@0.0, @0.3, @1.0]; - gradientLayer.startPoint = CGPointMake(0.0, 0.5); - gradientLayer.endPoint = CGPointMake(1.0, 0.5); - [self.bgImageView.layer addSublayer:gradientLayer]; - - [self.contentView addSubview:self.logoImageView]; - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(50, 50)); - make.centerY.mas_equalTo(self.bgImageView); - make.leading.mas_equalTo(self.bgImageView).offset(14); - }]; - - UIStackView *mainStack = [[UIStackView alloc] init]; - mainStack.axis = UILayoutConstraintAxisHorizontal; - mainStack.spacing = 12.5; - mainStack.alignment = UIStackViewAlignmentCenter; - mainStack.distribution = UIStackViewDistributionFill; - [self.contentView addSubview:mainStack]; - [mainStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(self.bgImageView); - make.leading.mas_equalTo(self.logoImageView.mas_trailing).offset(12.5); - }]; - - - UIStackView *priceStack = [[UIStackView alloc] init]; - priceStack.spacing = 1; - priceStack.distribution = UIStackViewDistributionFill; - priceStack.alignment = UIStackViewAlignmentCenter; - - UIImageView *coinIcon = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - coinIcon.frame = CGRectMake(0, 0, 12, 12); - [priceStack addArrangedSubview:self.priceLabel]; - [priceStack addArrangedSubview:coinIcon]; - - UIStackView *titleStack = [[UIStackView alloc] init]; - titleStack.axis = UILayoutConstraintAxisVertical; - titleStack.alignment = UIStackViewAlignmentLeading; - titleStack.distribution = UIStackViewDistributionEqualSpacing; - titleStack.spacing = 4; - [titleStack addArrangedSubview:[self titleLabel:YMLocalizedString(@"GameOrderContent_1")]]; - [titleStack addArrangedSubview:[self titleLabel:YMLocalizedString(@"GameOrderContent_2")]]; - [titleStack addArrangedSubview:[self titleLabel:YMLocalizedString(@"GameOrderContent_3")]]; - [mainStack addArrangedSubview:titleStack]; - - UIStackView *informationStack = [[UIStackView alloc] init]; - informationStack.axis = UILayoutConstraintAxisVertical; - informationStack.alignment = UIStackViewAlignmentLeading; - informationStack.distribution = UIStackViewDistributionEqualSpacing; - informationStack.spacing = 4; - [informationStack addArrangedSubview:self.nameLabel]; - [informationStack addArrangedSubview:self.levelLabel]; - [informationStack addArrangedSubview:priceStack]; - [mainStack addArrangedSubview:informationStack]; - - [self.contentView addSubview:self.orderButton]; - [self.orderButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.bgImageView); - make.trailing.mas_equalTo(-12); - make.width.mas_greaterThanOrEqualTo(72.5); - make.height.mas_equalTo(27); - }]; -} - -- (IBAction)didTapOrderButton:(id)sender { - if (self.didTapOrder) { - self.didTapOrder(self.cellModel); - } -} - -#pragma mark - -- (NetImageView *)bgImageView { - if (!_bgImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - _bgImageView = [[NetImageView alloc] initWithConfig:config]; - _bgImageView.layer.masksToBounds = YES; - _bgImageView.layer.cornerRadius = 8; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _bgImageView; -} - -- (NetImageView *)logoImageView { - if (!_logoImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _logoImageView = [[NetImageView alloc] initWithConfig:config]; - _logoImageView.layer.masksToBounds = YES; - _logoImageView.layer.cornerRadius = 8; - _logoImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _logoImageView; -} - -- (UILabel *)titleLabel:(NSString *)content { - return [UILabel labelInitWithText:content - font:kFontMedium(13) - textColor:[UIColor colorWithWhite:1 alpha:0.6]]; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(13) - textColor:[UIColor whiteColor]]; - _nameLabel.numberOfLines = 1; - } - return _nameLabel; -} - -- (UILabel *)levelLabel { - if (!_levelLabel) { - _levelLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(13) - textColor:[UIColor whiteColor]]; - } - return _levelLabel; -} - -- (UILabel *)priceLabel { - if (!_priceLabel) { - _priceLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(13) - textColor:[UIColor whiteColor]]; - [_priceLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_priceLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _priceLabel; -} - -- (UIButton *)orderButton { - if (!_orderButton) { - _orderButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_orderButton setTitle:YMLocalizedString(@"GameOrderContent_4") forState:UIControlStateNormal]; - [_orderButton addTarget:self - action:@selector(didTapOrderButton:) - forControlEvents:UIControlEventTouchUpInside]; - [_orderButton setBackgroundColor:[UIColor colorWithWhite:1 alpha:0.4]]; - [_orderButton setImage:kImage(@"mine_game_order_icon") forState:UIControlStateNormal]; - _orderButton.layer.cornerRadius = 13.5; - [_orderButton.titleLabel setFont:kFontBold(13)]; - - _orderButton.titleEdgeInsets = UIEdgeInsetsMake(0, 2, 0, 0); - - [_orderButton setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_orderButton setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - - _orderButton.contentEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 10); - _orderButton.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 5); - _orderButton.titleEdgeInsets = UIEdgeInsetsMake(0, 5, 0, 0); - - _orderButton.titleLabel.adjustsFontSizeToFitWidth = YES; - _orderButton.titleLabel.minimumScaleFactor = 0.5; - } - return _orderButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.h deleted file mode 100644 index 9cd4794..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// XPMineDataGiftCollectionViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class UserGiftWallInfoModel; -@interface XPMineDataGiftCollectionViewCell : UICollectionViewCell -@property (nonatomic,strong) UserGiftWallInfoModel *giftInfo; --(void)setLevel:(int)level; -@end - - - - - - - - - - - - - - - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.m deleted file mode 100644 index ff0449e..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.m +++ /dev/null @@ -1,142 +0,0 @@ -// -// XPMineDataGiftCollectionViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import "XPMineDataGiftCollectionViewCell.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "UIView+Corner.h" -///Model -#import "UserGiftWallInfoModel.h" - -@interface XPMineDataGiftCollectionViewCell () -///背景 -@property (nonatomic,strong) UIView *bgView; -///排名 -@property (nonatomic,strong) UIImageView *levelImageView; - -///礼物头像 -@property (nonatomic,strong) NetImageView *giftImageView; -///礼物个数 -@property (nonatomic,strong) UILabel *giftNumberLabel; -@end - -@implementation XPMineDataGiftCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method - -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.bgView]; - [self.bgView addSubview:self.giftImageView]; - [self.bgView addSubview:self.giftNumberLabel]; - [self.bgView addSubview:self.levelImageView]; -} - -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; - - - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(59), kGetScaleWidth(63))); - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(kGetScaleWidth(5)); - }]; - - [self.giftNumberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.bgView).offset(-kGetScaleWidth(6)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.mas_equalTo(kGetScaleWidth(3)); - make.width.height.mas_equalTo(kGetScaleWidth(19)); - }]; -} - -#pragma mark - Getters And Setters - --(void)setLevel:(int)level{ - [self.giftImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(59.72), kGetScaleWidth(63.03))); - }]; - if(level == 1){ - self.levelImageView.hidden = NO; - _levelImageView.image = [UIImage imageNamed:@"gift_list_one"]; - }else if(level == 2){ - self.levelImageView.hidden = NO; - _levelImageView.image = [UIImage imageNamed:@"gift_list_two"]; - }else if(level == 3){ - self.levelImageView.hidden = NO; - _levelImageView.image = [UIImage imageNamed:@"gift_list_three"]; - }else{ - [self.giftImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(60.16), kGetScaleWidth(55.58))); - }]; - self.levelImageView.hidden = YES; - } -} - -- (void)setGiftInfo:(UserGiftWallInfoModel *)giftInfo { - _giftInfo = giftInfo; - if (_giftInfo) { - self.giftImageView.imageUrl = _giftInfo.picUrl; - self.giftNumberLabel.text = [NSString stringWithFormat:@"X%ld", _giftInfo.reciveCount]; - } -} - -- (NetImageView *)giftImageView { - if (!_giftImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _giftImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _giftImageView; -} - - -- (UILabel *)giftNumberLabel { - if (!_giftNumberLabel) { - _giftNumberLabel = [[UILabel alloc] init]; - _giftNumberLabel.font = [UIFont systemFontOfSize:kGetScaleWidth(10) weight:UIFontWeightRegular]; - _giftNumberLabel.textColor = UIColorFromRGB(0x6D6B89); - _giftNumberLabel.textAlignment = NSTextAlignmentCenter; - - } - return _giftNumberLabel; -} - -- (UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = UIColorFromRGB(0xF3F5FA); - _bgView.layer.cornerRadius = kGetScaleWidth(8); - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} -- (UIImageView *)levelImageView{ - if (!_levelImageView){ - _levelImageView = [UIImageView new]; - _levelImageView.hidden = NO; - } - return _levelImageView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.h deleted file mode 100644 index c11491f..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// XPMineDataGiftTableViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMineDataGiftTableViewCell, UserGiftWallInfoModel; -@protocol XPMineDataGiftTableViewCellDelegate - -- (void)xPMineDataGiftTableViewCell:(XPMineDataGiftTableViewCell *)view didClickMore:(UIButton *)sender; - -@end -@interface XPMineDataGiftTableViewCell : UITableViewCell -///礼物墙中的礼物 -@property (nonatomic,strong) NSArray *userGiftWall; -///礼物墙中的幸运礼物礼物 -@property (nonatomic,strong) NSArray *userLuckyBagGiftWall; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.m deleted file mode 100644 index 9bedf54..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.m +++ /dev/null @@ -1,231 +0,0 @@ -// -// XPMineDataGiftTableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import "XPMineDataGiftTableViewCell.h" -///Third -#import -#import -#import -#import -///Tool -#import "UIImageConstant.h" -#import "UIButton+EnlargeTouchArea.h" -#import "UIImage+Utils.h" -///View -#import "XPMineUserInfoGiftView.h" - -@interface XPMineDataGiftTableViewCell () -///背景 -@property (nonatomic,strong) UIImageView * backImageView; -/////显示更多 -@property (nonatomic,strong) UIButton *arrowButton; -/////标题 -//@property (nonatomic,strong) UILabel *titleLabel; -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *pi_containerView; -///普通礼物 -@property (nonatomic,strong) XPMineUserInfoGiftView *normalGiftView; -///幸运礼物 -@property (nonatomic,strong) XPMineUserInfoGiftView *luckyGiftView; -@end - -@implementation XPMineDataGiftTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.backImageView]; - -// [self.backImageView addSubview:self.titleLabel]; - [self.backImageView addSubview:self.arrowButton]; - [self.backImageView addSubview:self.titleView]; - [self.backImageView addSubview:self.pi_containerView]; -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView).offset(-15); - }]; - -// [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.leading.mas_equalTo(self.backImageView).offset(12); -// make.top.mas_equalTo(self.backImageView).offset(12); -// }]; -// - [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(13, 22)); - make.centerY.equalTo(self.titleView); - make.trailing.mas_equalTo(self.backImageView).offset(-15); - }]; - - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backImageView); - make.width.mas_equalTo(kGetScaleWidth(200)); - make.height.mas_equalTo(kGetScaleWidth(30)); - make.top.mas_equalTo(kGetScaleWidth(14)); - }]; - - [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.backImageView); - make.top.mas_equalTo(self.titleView.mas_bottom).offset(kGetScaleWidth(20)); - }]; - -} - -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.normalGiftView; - } else { - return self.luckyGiftView; - } -} -#pragma mark - Event Response -- (void)arrowButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineDataGiftTableViewCell:didClickMore:)]) { - [self.delegate xPMineDataGiftTableViewCell:self didClickMore:sender]; - } -} - -#pragma mark - Getters And Setters -- (void)setUserGiftWall:(NSArray *)userGiftWall { - _userGiftWall = userGiftWall; - if (_userGiftWall.count > 11) { - NSMutableArray * array = [_userGiftWall mutableCopy]; - _userGiftWall = [array subarrayWithRange:NSMakeRange(0, 11)]; - } - - self.normalGiftView.datasource = _userGiftWall; - [self.titleView reloadData]; - [self.pi_containerView reloadData]; -} - -- (void)setUserLuckyBagGiftWall:(NSArray *)userLuckyBagGiftWall { - _userLuckyBagGiftWall = userLuckyBagGiftWall; - if (_userLuckyBagGiftWall.count > 11) { - NSMutableArray * array = [_userLuckyBagGiftWall mutableCopy]; - _userLuckyBagGiftWall = [array subarrayWithRange:NSMakeRange(0, 11)]; - } - self.luckyGiftView.datasource = _userLuckyBagGiftWall; - [self.titleView reloadData]; - [self.pi_containerView reloadData]; -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.layer.cornerRadius = 10; - _backImageView.backgroundColor =[DJDKMIMOMColor appCellBackgroundColor]; - _backImageView.layer.shadowColor = UIColorFromRGB(0xE4E4E4).CGColor; - _backImageView.layer.shadowOpacity = 1; - _backImageView.layer.shadowOffset = CGSizeMake(0, 2); - _backImageView.layer.shadowRadius = 8; - } - return _backImageView; -} - -//- (UILabel *)titleLabel { -// if (!_titleLabel) { -// _titleLabel = [[UILabel alloc] init]; -// _titleLabel.text = @"礼物墙"; -// _titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; -// _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; -// } -// return _titleLabel; -//} -// -- (UIButton *)arrowButton { - if (!_arrowButton) { - _arrowButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_arrowButton setImage:[[UIImage imageNamed:@"room_setting_arrow"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_arrowButton setImage:[[UIImage imageNamed:@"room_setting_arrow"]ms_SetImageForRTL] forState:UIControlStateSelected]; - [_arrowButton addTarget:self action:@selector(arrowButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_arrowButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _arrowButton; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = UIColorFromRGB(0xB3B3C3); - _titleView.titleSelectedColor = UIColorFromRGB(0x1F1A4E); - _titleView.titleFont = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _titleView.titleSelectedFont = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.cellSpacing = 20; - _titleView.cellWidthIncrement = 5; - _titleView.cellWidth = 60; - _titleView.listContainer = self.pi_containerView; - - JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.indicatorImageViewSize = CGSizeMake(15, 3); - lineView.verticalMargin = 0; - lineView.indicatorImageView.image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(15, 3)]; - lineView.indicatorImageView.layer.masksToBounds = YES; - lineView.indicatorImageView.layer.cornerRadius = 1.5; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (JXCategoryListContainerView *)pi_containerView { - if (!_pi_containerView) { - _pi_containerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _pi_containerView.defaultSelectedIndex = 0; - _pi_containerView.scrollView.tag = 1009; - } - return _pi_containerView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMineDataGiftTableViewCell0"), YMLocalizedString(@"XPMineDataGiftTableViewCell1")]; - } - return _titles; -} - -- (XPMineUserInfoGiftView *)normalGiftView { - if (!_normalGiftView) { - _normalGiftView = [[XPMineUserInfoGiftView alloc] init]; - } - return _normalGiftView; -} - -- (XPMineUserInfoGiftView *)luckyGiftView { - if (!_luckyGiftView) { - _luckyGiftView = [[XPMineUserInfoGiftView alloc] init]; - } - return _luckyGiftView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGameMateOrderView.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGameMateOrderView.h deleted file mode 100644 index de09cf5..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGameMateOrderView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPMineGameMateOrderView.h -// YuMi -// -// Created by P on 2024/7/9. -// - -#import -@class XPMineGamePartnerInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGameMateOrderView : UIView - -@property (nonatomic, strong) XPMineGamePartnerInfoModel *infoModel; -@property (nonatomic, copy) void(^payForGame)(NSInteger round); - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGameMateOrderView.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGameMateOrderView.m deleted file mode 100644 index 624210b..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGameMateOrderView.m +++ /dev/null @@ -1,350 +0,0 @@ -// -// XPMineGameMateOrderView.m -// YuMi -// -// Created by P on 2024/7/9. -// - -#import "XPMineGameMateOrderView.h" - -#import "XPIAPRechargeViewController.h" -#import "XCCurrentVCStackManager.h" - -#import "XPMineGamePartnerInfoModel.h" -#import "Api.h" -#import "WalletInfoModel.h" - -@interface XPMineGameMateOrderView () - -@property (nonatomic, assign) NSInteger round; -@property (nonatomic, assign) NSInteger currentCoin; - -@property (nonatomic, strong) UIImageView *bgImageView; -@property (nonatomic, strong) NetImageView *logoImageView; -@property (nonatomic, strong) UIButton *reduceButton; -@property (nonatomic, strong) UILabel *numberLabel; -@property (nonatomic, strong) UIButton *increaseButton; -@property (nonatomic, strong) UILabel *priceLabel; -@property (nonatomic, strong) UILabel *balanceLabel; -@property (nonatomic, strong) UIButton *payButton; -@property (nonatomic, strong) UIButton *rechargeButton; - -@end - -@implementation XPMineGameMateOrderView - -- (instancetype)initWithFrame:(CGRect)frame -{ - if (self = [super initWithFrame:frame]) { - self.round = 1; - [self setup]; - [self getCoin]; - } - return self; -} - -- (void)getCoin { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - @kWeakify(self); - [Api getUserWalletInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - @kStrongify(self); - WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data]; - self.currentCoin = model.diamonds.integerValue; - self.balanceLabel.text = @(self.currentCoin).stringValue; - [self updateBalanceContent]; - } - } uid:uid ticket:ticket]; -} - -- (void)setInfoModel:(XPMineGamePartnerInfoModel *)infoModel { - _infoModel = infoModel; - self.round = MAX(1, _infoModel.inning); - - self.logoImageView.imageUrl = infoModel.pic; - self.numberLabel.text = @(self.round).stringValue; - [self updatePriceContent]; -} - -- (void)updatePriceContent { - self.priceLabel.text = @(self.infoModel.price * self.round).stringValue; -} - -- (void)updateBalanceContent { - NSTextAttachment *coinAttachment = [[NSTextAttachment alloc] init]; - coinAttachment.image = kImage(@"moli_money_icon"); - coinAttachment.bounds = CGRectMake(2, -0.5, 10, 10); - NSAttributedString *coin = [NSAttributedString attributedStringWithAttachment:coinAttachment]; - NSAttributedString *price = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@：%ld ", YMLocalizedString(@"GameOrderContent_21"),(long)self.currentCoin] - attributes:@{ - NSFontAttributeName: self.balanceLabel.font, - NSForegroundColorAttributeName: self.balanceLabel.textColor - }]; - NSMutableAttributedString *mutableAttributedString = [[NSMutableAttributedString alloc] initWithAttributedString:coin]; - [mutableAttributedString insertAttributedString:price atIndex:0]; - self.balanceLabel.attributedText = mutableAttributedString.copy; -} - -- (void)setup { - UIView *maskBG = [[UIView alloc] initWithFrame:self.bounds]; - maskBG.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6]; - [self addSubview:maskBG]; - - [self addSubview:self.bgImageView]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KScreenWidth - 38*2, 280)); - make.center.mas_equalTo(self); - }]; - - UIImageView *closeImage = [[UIImageView alloc] initWithImage:kImage(@"noble_time_close")]; - closeImage.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapCloseButton:)]; - [closeImage addGestureRecognizer:tap]; - [self addSubview:closeImage]; - [closeImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(26, 26)); - make.bottom.mas_equalTo(self.bgImageView.mas_top); - make.leading.mas_equalTo(self.bgImageView.mas_trailing); - }]; - - UILabel *titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"GameOrderContent_5") - font:kFontBold(20) - textColor:UIColorFromRGB(0x563c1f)]; - titleLabel.clipsToBounds = NO; - [self addSubview:titleLabel]; - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bgImageView).offset(24); - make.centerX.mas_equalTo(self.bgImageView); - make.height.mas_equalTo(20); - }]; - - [self addSubview:self.logoImageView]; - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(titleLabel.mas_bottom).offset(17.5); - make.centerX.mas_equalTo(self.bgImageView); - make.size.mas_equalTo(CGSizeMake(KScreenWidth - 38*4, 95)); - }]; - - UILabel *subTitleLabel_1 = [UILabel labelInitWithText:YMLocalizedString(@"GameOrderContent_19") font:kFontMedium(14) textColor:UIColorFromRGB(0x3f3c33)]; - UILabel *subTitleLabel_2 = [UILabel labelInitWithText:YMLocalizedString(@"GameOrderContent_7") font:kFontMedium(14) textColor:UIColorFromRGB(0x3f3c33)]; - UIStackView *subTitleStack = [[UIStackView alloc] init]; - subTitleStack.axis = UILayoutConstraintAxisVertical; - subTitleStack.alignment = UIStackViewAlignmentTop; - subTitleStack.distribution = UIStackViewDistributionEqualSpacing; - subTitleStack.spacing = 10; - [subTitleStack addArrangedSubview:subTitleLabel_1]; - [subTitleStack addArrangedSubview:subTitleLabel_2]; - [self addSubview:subTitleStack]; - [subTitleStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(19); - make.leading.mas_equalTo(self.logoImageView); - }]; - - [self addSubview:self.increaseButton]; - [self.increaseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(15); - make.size.mas_equalTo(CGSizeMake(23, 23)); - make.trailing.mas_equalTo(self.logoImageView); - }]; - - [self addSubview:self.numberLabel]; - [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.increaseButton); - make.trailing.mas_equalTo(self.increaseButton.mas_leading).offset(-12.5); - }]; - - [self addSubview:self.reduceButton]; - [self.reduceButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(15); - make.size.mas_equalTo(CGSizeMake(23, 23)); - make.trailing.mas_equalTo(self.numberLabel.mas_leading).offset(-12.5); - }]; - - UIStackView *priceStack = [[UIStackView alloc] init]; - priceStack.spacing = 1; - priceStack.distribution = UIStackViewDistributionFill; - priceStack.alignment = UIStackViewAlignmentCenter; - - UIImageView *coinIcon = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - coinIcon.frame = CGRectMake(0, 0, 12, 12); - [priceStack addArrangedSubview:self.priceLabel]; - [priceStack addArrangedSubview:coinIcon]; - [self addSubview:priceStack]; - [priceStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.numberLabel); - make.top.mas_equalTo(self.increaseButton.mas_bottom).offset(12); - }]; - - UIImageView *line = [[UIImageView alloc] initWithImage:kImage(@"mine_game_order_line")]; - [self addSubview:line]; - [line mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.logoImageView); - make.height.mas_equalTo(0.5); - make.bottom.mas_equalTo(self.bgImageView).offset(-46); - make.top.mas_equalTo(self.priceLabel.mas_bottom).offset(15); - }]; - - [self addSubview:self.balanceLabel]; - [self.balanceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(line.mas_bottom).offset(15); - make.leading.mas_equalTo(self.logoImageView); - }]; - - [self addSubview:self.rechargeButton]; - [self addSubview:self.payButton]; - - [self.rechargeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.balanceLabel); - make.leading.mas_equalTo(self.balanceLabel.mas_trailing).offset(8.5); - }]; - - [self.payButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.balanceLabel); - make.size.mas_equalTo(CGSizeMake(65, 26)); - make.trailing.mas_equalTo(self.logoImageView); - }]; -} - -- (IBAction)didTapReduceButton:(id)sender { - self.round--; - if (self.round<1) { - self.round = 1; - } - self.reduceButton.enabled = self.round >= 1; - self.numberLabel.text = @(self.round).stringValue; - [self updatePriceContent]; -} - -- (IBAction)didTapIncreaseButton:(id)sender { - self.round ++; - self.numberLabel.text = @(self.round).stringValue; - self.reduceButton.enabled = self.round >= 1; - [self updatePriceContent]; -} - -- (IBAction)didTapRechargeButton:(id)sender { - XPIAPRechargeViewController *vc = [[XPIAPRechargeViewController alloc] init]; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:vc animated:YES]; -} - -- (IBAction)didTapPayButton:(id)sender { - if (self.payForGame) { - self.payForGame(self.round); - } -} - -- (IBAction)didTapCloseButton:(id)sender { - [self removeFromSuperview]; -} - -#pragma mark - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] initWithImage:[kImage(@"mine_game_order_bg") ms_SetImageForRTL]]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _bgImageView; -} - -- (NetImageView *)logoImageView { - if (!_logoImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultBannerPlaceholder]; - _logoImageView = [[NetImageView alloc] initWithConfig:config]; - _logoImageView.contentMode = UIViewContentModeScaleAspectFill; - _logoImageView.layer.masksToBounds = YES; - _logoImageView.layer.cornerRadius = 8; - _logoImageView.layer.borderWidth = 2; - _logoImageView.layer.borderColor = UIColorFromRGB(0xf09540).CGColor; - - _logoImageView.backgroundColor = [UIColor systemTealColor]; - } - return _logoImageView; -} - -- (UIButton *)reduceButton { - if (!_reduceButton) { - _reduceButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _reduceButton.enabled = NO; - [_reduceButton addTarget:self action:@selector(didTapReduceButton:) forControlEvents:UIControlEventTouchUpInside]; - [_reduceButton setImage:kImage(@"mine_game_order_reduce_icon") forState:UIControlStateNormal]; - [_reduceButton setImage:kImage(@"mine_game_order_reduce_icon_disable") forState:UIControlStateDisabled]; - [_reduceButton enlargeTouchArea:UIEdgeInsetsMake(10, 10, 10, 10)]; - } - return _reduceButton; -} - -- (UIButton *)increaseButton { - if (!_increaseButton) { - _increaseButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_increaseButton addTarget:self action:@selector(didTapIncreaseButton:) forControlEvents:UIControlEventTouchUpInside]; - [_increaseButton setImage:kImage(@"mine_game_order_increase_icon") forState:UIControlStateNormal]; - [_reduceButton enlargeTouchArea:UIEdgeInsetsMake(10, 10, 10, 10)]; - } - return _increaseButton; -} - -- (UILabel *)numberLabel { - if (!_numberLabel) { - _numberLabel = [UILabel labelInitWithText:@"1" - font:kFontMedium(13) - textColor:UIColorFromRGB(0x471606)]; - } - return _numberLabel; -} - -- (UILabel *)priceLabel { - if (!_priceLabel) { - _priceLabel = [UILabel labelInitWithText:@"0" - font:kFontMedium(13) - textColor:UIColorFromRGB(0x471606)]; - [_priceLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_priceLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _priceLabel; -} - -- (UILabel *)balanceLabel { - if (!_balanceLabel) { - _balanceLabel = [UILabel labelInitWithText:YMLocalizedString(@"GameOrderContent_21") - font:kFontMedium(12) - textColor:UIColorFromRGB(0x471606)]; - } - return _balanceLabel; -} - -- (UIButton *)rechargeButton { - if (!_rechargeButton) { - _rechargeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_rechargeButton setTitle:[NSString stringWithFormat:@"%@ >", YMLocalizedString(@"XPGiftBarView1")] forState:UIControlStateNormal]; - [_rechargeButton.titleLabel setFont:kFontMedium(12)]; - [_rechargeButton setTitleColor:UIColorFromRGB(0xff433a) forState:UIControlStateNormal]; - [_rechargeButton addTarget:self - action:@selector(didTapRechargeButton:) - forControlEvents:UIControlEventTouchUpInside]; - _rechargeButton.titleLabel.adjustsFontSizeToFitWidth = YES; - _rechargeButton.titleLabel.minimumScaleFactor = 0.5; // 最小缩放比例 - } - return _rechargeButton; -} - -- (UIButton *)payButton { - if (!_payButton) { - _payButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_payButton setTitle:YMLocalizedString(@"GameOrderContent_22") forState:UIControlStateNormal]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x57e193),UIColorFromRGB(0x14d2a6)] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(65, 26)]; - [_payButton setBackgroundImage:image forState:UIControlStateNormal]; - [_payButton.titleLabel setFont:kFontMedium(13)]; - [_payButton addTarget:self - action:@selector(didTapPayButton:) - forControlEvents:UIControlEventTouchUpInside]; - _payButton.layer.cornerRadius = 13; - _payButton.layer.masksToBounds = YES; - } - return _payButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGiftsTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGiftsTableViewCell.h deleted file mode 100644 index 3589167..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGiftsTableViewCell.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPMineGiftsTableViewCell.h -// YuMi -// -// Created by P on 2024/6/25. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGiftsTableViewCell : UITableViewCell - -@property (nonatomic, copy) NSArray *giftsDataSource; -@property (nonatomic, assign) BOOL isLucky; - -+ (CGFloat)cellHeight:(BOOL)isExpand source:(NSArray *)dataSource; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGiftsTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGiftsTableViewCell.m deleted file mode 100644 index 2afe002..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGiftsTableViewCell.m +++ /dev/null @@ -1,245 +0,0 @@ -// -// XPMineGiftsTableViewCell.m -// YuMi -// -// Created by P on 2024/6/25. -// - -#import "XPMineGiftsTableViewCell.h" -#import "UserGiftWallInfoModel.h" - -@interface XPMineGiftCell : UICollectionViewCell - -@property (nonatomic, strong) UIImageView *backgroundImageView; -@property (nonatomic, strong) NetImageView *imageView; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UILabel *countLabel; -@property (nonatomic, strong) UIImageView *numberImageView; -@property (nonatomic, assign) NSInteger index; -@property (nonatomic, assign) BOOL isLuckyGift; - -@end - -@implementation XPMineGiftCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self.contentView addSubview:self.backgroundImageView]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.contentView addSubview:self.imageView]; - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(12); - make.size.mas_equalTo(CGSizeMake(60, 60)); - }]; - - [self.contentView addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.imageView.mas_bottom).offset(10); - }]; - - [self.contentView addSubview:self.countLabel]; - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(6); - }]; - - [self.contentView addSubview:self.numberImageView]; - [self.numberImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.mas_equalTo(4); - make.width.mas_equalTo(20); - }]; - } - return self; -} - -- (void)setIsLuckyGift:(BOOL)isLuckyGift { - _isLuckyGift = isLuckyGift; - self.backgroundImageView.image = isLuckyGift ? [UIImage imageNamed:@"mine_lucky_gift_bg"] : [UIImage imageNamed:@"mine_gift_bg"]; -} - -- (void)setIndex:(NSInteger)index { - _index = index; - self.numberImageView.hidden = index >= 3; - if (index >= 3) { - return; - } - switch (index) { - case 0: - self.numberImageView.image = [UIImage imageNamed:@"gift_list_one"]; - break; - case 1: - self.numberImageView.image = [UIImage imageNamed:@"gift_list_two"]; - break; - case 2: - self.numberImageView.image = [UIImage imageNamed:@"gift_list_three"]; - break; - default: - break; - } - -} - -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] init]; - _backgroundImageView.image = [UIImage imageNamed:@"mine_gift_bg"]; - } - return _backgroundImageView; -} - -- (NetImageView *)imageView { - if (!_imageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _imageView = [[NetImageView alloc] initWithConfig:config]; - _imageView.layer.masksToBounds = YES; - } - return _imageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" - font:[UIFont systemFontOfSize:11 weight:UIFontWeightMedium] - textColor:UIColorFromRGB(0x515860)]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (UILabel *)countLabel { - if (!_countLabel) { - _countLabel = [UILabel labelInitWithText:@"" - font:[UIFont systemFontOfSize:11 weight:UIFontWeightRegular] - textColor:UIColorFromRGB(0x515860)]; - _countLabel.alpha = 0.6f; - } - return _countLabel; -} - -- (UIImageView *)numberImageView { - if (!_numberImageView) { - _numberImageView = [[UIImageView alloc] init]; - } - return _numberImageView; -} - -@end - - -@interface XPMineGiftsTableViewCell() - -@property (nonatomic, strong) UICollectionView *giftsCollectionView; -@property (nonatomic, strong) UILabel *noDataLabel; - -@end - -@implementation XPMineGiftsTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.contentView.backgroundColor = [UIColor whiteColor]; - [self.contentView addSubview:self.giftsCollectionView]; - [self.giftsCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(0); - make.leading.trailing.bottom.mas_equalTo(self.contentView); - }]; - - [self.contentView addSubview:self.noDataLabel]; - [self.noDataLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.contentView); - }]; - } - return self; -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; -} - -- (void)setGiftsDataSource:(NSArray *)giftsDataSource { - _giftsDataSource = giftsDataSource; - self.noDataLabel.hidden = giftsDataSource.count > 0; - [self.giftsCollectionView reloadData]; -} - -+ (CGFloat)cellHeight:(BOOL)isExpand - source:(NSArray *)dataSource { - - NSInteger width = (KScreenWidth - 28 - 2.5*3)/4; - NSInteger height = width * 120 / 86; - - if (isExpand) { - NSInteger line = (dataSource.count / 4) + (dataSource.count % 4 > 0 ? 1 : 0); - return MAX(line * height + line * 10, height); - } else { - return height; - } -} - -#pragma mark - UICollectionViewDataSource - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.giftsDataSource.count; -} - -- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPMineGiftCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"Gift Cell" - forIndexPath:indexPath]; - UserGiftWallInfoModel *giftModel = [self.giftsDataSource xpSafeObjectAtIndex:indexPath.row]; - if (giftModel) { - cell.imageView.imageUrl = giftModel.picUrl; - cell.titleLabel.text = giftModel.giftName; - cell.countLabel.text = [NSString stringWithFormat:@"x%ld", (long)giftModel.reciveCount]; - cell.index = indexPath.row; - cell.isLuckyGift = self.isLucky; - } - return cell; -} - -#pragma mark - UICollectionViewDelegateFlowLayout - -- (CGSize)collectionView:(UICollectionView *)collectionView - layout:(UICollectionViewLayout *)collectionViewLayout - sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - NSInteger width = (KScreenWidth - 28 - 2.5*3)/4; - NSInteger height = width * 120 / 86; - return CGSizeMake(width, height); -} - -#pragma mark - -- (UICollectionView *)giftsCollectionView { - if (!_giftsCollectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionVertical; - layout.minimumInteritemSpacing = 2.5; - layout.minimumLineSpacing = 10; - _giftsCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero - collectionViewLayout:layout]; - _giftsCollectionView.backgroundColor = [UIColor clearColor]; - _giftsCollectionView.delegate = self; - _giftsCollectionView.dataSource = self; - _giftsCollectionView.scrollEnabled = NO; - [_giftsCollectionView registerClass:[XPMineGiftCell class] - forCellWithReuseIdentifier:@"Gift Cell"]; - } - return _giftsCollectionView; -} - -- (UILabel *)noDataLabel { - if (!_noDataLabel) { - _noDataLabel = [UILabel labelInitWithText:YMLocalizedString(@"XPMineUserInfoGiftWallViewController4") font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x191919)]; - _noDataLabel.textAlignment = NSTextAlignmentCenter; - _noDataLabel.alpha = 0.5; - _noDataLabel.hidden = YES; - } - return _noDataLabel; -} -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGuildTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGuildTableViewCell.h deleted file mode 100644 index 38ee17f..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGuildTableViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPMineGuildTableViewCell.h -// YuMi -// -// Created by P on 2024/9/19. -// - -#import -@class GuildInfo; -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildTableViewCell : UITableViewCell - -@property (nonatomic, strong) GuildInfo *info; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGuildTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGuildTableViewCell.m deleted file mode 100644 index 31a8279..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineGuildTableViewCell.m +++ /dev/null @@ -1,121 +0,0 @@ -// -// XPMineGuildTableViewCell.m -// YuMi -// -// Created by P on 2024/9/19. -// - -#import "XPMineGuildTableViewCell.h" - -#import "GuildInfo.h" - -@interface XPMineGuildTableViewCell () - -@property (nonatomic, strong) NetImageView *avatarImageView; -@property (nonatomic, strong) UILabel *nameLabel; -@property (nonatomic, strong) UILabel *guildIDLabel; -@property (nonatomic, strong) UILabel *agentIDLabel; - -@end - -@implementation XPMineGuildTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - self.contentView.backgroundColor = [UIColor clearColor]; - [self setupUI]; - } - return self; -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; -} - -- (void)setupUI { - UIImageView *backgroundImageView = [[UIImageView alloc] initWithImage:kImage(@"user_guild_bg")]; - [self.contentView addSubview:backgroundImageView]; - [backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(85)); - }]; - - [self.contentView addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(backgroundImageView); - make.leading.mas_equalTo(self.contentView).offset(12); - make.width.height.mas_equalTo(kGetScaleWidth(62)); - }]; - - UIStackView *stack = [[UIStackView alloc] init]; - stack.axis = UILayoutConstraintAxisVertical; - stack.spacing = 3; - stack.alignment = UIStackViewAlignmentLeading; - [self.contentView addSubview:stack]; - [stack mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); - make.top.bottom.mas_equalTo(self.avatarImageView); - make.trailing.mas_equalTo(self.contentView).offset(-12); - }]; - - [stack addArrangedSubview:self.nameLabel]; - [stack addArrangedSubview:self.guildIDLabel]; - [stack addArrangedSubview:self.agentIDLabel]; - - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - }]; - - [self.guildIDLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(18); - }]; - - [self.agentIDLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(18); - }]; -} - -- (void)setInfo:(GuildInfo *)info { - _info = info; - self.avatarImageView.imageUrl = info.avatar; - self.nameLabel.text = [NSString stringWithFormat:@"%@%@", YMLocalizedString(@"UserDetail_1"), info.guildName]; - self.guildIDLabel.text = [NSString stringWithFormat:@"%@%ld", YMLocalizedString(@"UserDetail_2"), (long)info.guildId]; - self.agentIDLabel.text = [NSString stringWithFormat:@"%@%ld", YMLocalizedString(@"UserDetail_3"), (long)info.erbanNo]; -} - -#pragma mark - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - _avatarImageView = [[NetImageView alloc] init]; - _avatarImageView.layer.cornerRadius = 8; - _avatarImageView.layer.borderColor = UIColorFromRGB(0xFFEEAC).CGColor; - _avatarImageView.layer.borderWidth = 1; - _avatarImageView.layer.masksToBounds = YES; - } - return _avatarImageView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:[UIColor whiteColor]]; - } - return _nameLabel; -} - -- (UILabel *)guildIDLabel { - if (!_guildIDLabel) { - _guildIDLabel = [UILabel labelInitWithText:@"" font:kFontMedium(13) textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - } - return _guildIDLabel; -} - -- (UILabel *)agentIDLabel { - if (!_agentIDLabel) { - _agentIDLabel = [UILabel labelInitWithText:@"" font:kFontMedium(13) textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - } - return _agentIDLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMedalsTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMedalsTableViewCell.h deleted file mode 100644 index c03edd5..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMedalsTableViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPMineMedalsTableViewCell.h -// YuMi -// -// Created by P on 2024/6/25. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineMedalsTableViewCell : UITableViewCell - -@property (nonatomic, copy) NSArray *medalsDataSource; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMedalsTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMedalsTableViewCell.m deleted file mode 100644 index 4156ebf..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMedalsTableViewCell.m +++ /dev/null @@ -1,164 +0,0 @@ -// -// XPMineMedalsTableViewCell.m -// YuMi -// -// Created by P on 2024/6/25. -// - -#import "XPMineMedalsTableViewCell.h" -#import "MedalModel.h" -#import -#import "XPRoomGiftAnimationParser.h" - -@interface XPMineMedalCell : UICollectionViewCell - -@property (nonatomic, strong) NetImageView *imageView; -@property (nonatomic, strong) VAPView *vapView; -@property (nonatomic, strong) XPRoomGiftAnimationParser *vapParser; - -@end - -@implementation XPMineMedalCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _imageView = [[NetImageView alloc] initWithConfig:config]; - _imageView.layer.masksToBounds = YES; - _imageView.layer.cornerRadius = 12; - - [self.contentView addSubview:_imageView]; - [_imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.contentView addSubview:self.vapView]; - [self.vapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - } - return self; -} - -- (VAPView *)vapView { - if (!_vapView) { - _vapView = [[VAPView alloc] init]; - _vapView.contentMode = UIViewContentModeScaleAspectFill; - } - return _vapView; -} - -- (XPRoomGiftAnimationParser *)vapParser { - if (!_vapParser) { - _vapParser = [[XPRoomGiftAnimationParser alloc] init]; - } - return _vapParser; -} - -@end - -@interface XPMineMedalsTableViewCell() - -@property (nonatomic, strong) UICollectionView *medalsCollectionView; -@property (nonatomic, strong) UILabel *noDataLabel; - -@end - -@implementation XPMineMedalsTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.contentView.backgroundColor = [UIColor whiteColor]; - [self.contentView addSubview:self.medalsCollectionView]; - [self.medalsCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(8); - make.edges.mas_equalTo(self.contentView); - }]; - - [self.contentView addSubview:self.noDataLabel]; - [self.noDataLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.contentView); - }]; - } - return self; -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; -} - -- (void)setMedalsDataSource:(NSArray *)medalsDataSource { - _medalsDataSource = medalsDataSource; - self.noDataLabel.hidden = medalsDataSource.count > 0; - [self.medalsCollectionView reloadData]; -} - -#pragma mark - UICollectionViewDataSource - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.medalsDataSource.count; -} - -- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPMineMedalCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"Medal Cell" - forIndexPath:indexPath]; - UserMedalModel *userMedal = [self.medalsDataSource xpSafeObjectAtIndex:indexPath.row]; - if (userMedal) { - cell.imageView.imageUrl = userMedal.picUrl; - - NSString *resourcePath = [userMedal.picUrl pureURLString]; - if (resourcePath.length > 0) { - @kWeakify(cell); - [cell.vapParser parseWithURL:resourcePath - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(cell); - if (videoUrl.length) { - [cell.vapView setMute:YES]; - [cell.vapView playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } - } failureBlock:^(NSError * _Nullable error) { - }]; - } - } - return cell; -} - -#pragma mark - UICollectionViewDelegateFlowLayout - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - return CGSizeMake(140, 140); -} - -#pragma mark - -- (UICollectionView *)medalsCollectionView { - if (!_medalsCollectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.minimumInteritemSpacing = 10; - layout.minimumLineSpacing = 10; - _medalsCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero - collectionViewLayout:layout]; - _medalsCollectionView.backgroundColor = [UIColor clearColor]; - _medalsCollectionView.delegate = self; - _medalsCollectionView.dataSource = self; - [_medalsCollectionView registerClass:[XPMineMedalCell class] - forCellWithReuseIdentifier:@"Medal Cell"]; - } - return _medalsCollectionView; -} - -- (UILabel *)noDataLabel { - if (!_noDataLabel) { - _noDataLabel = [UILabel labelInitWithText:YMLocalizedString(@"XPMineDataGiftTableViewCell2") font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x191919)]; - _noDataLabel.textAlignment = NSTextAlignmentCenter; - _noDataLabel.alpha = 0.5; - _noDataLabel.hidden = YES; - } - return _noDataLabel; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMultipleContentTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMultipleContentTableViewCell.h deleted file mode 100644 index 2bdd658..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMultipleContentTableViewCell.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// XPMineMultipleContentTableViewCell.h -// YuMi -// -// Created by P on 2024/9/20. -// - -#import - -@class MedalModel, UserGiftWallInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineMultipleContentTableViewCell : UITableViewCell - -@property (nonatomic, strong) MedalModel *medalModel; -@property (nonatomic, strong) NSArray *giftWall; -@property (nonatomic, strong) NSArray *luckyGiftWall; - -@property (nonatomic, copy) void(^didChangeCatalog)(BOOL isMedal); - -+ (CGFloat)cellHeightFro:(MedalModel *)medalModel; -+ (CGFloat)cellHeightFro:(NSArray *)giftWall with:(NSArray *)luckyGiftWall; - -- (void)updateCell; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMultipleContentTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMultipleContentTableViewCell.m deleted file mode 100644 index 3255798..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineMultipleContentTableViewCell.m +++ /dev/null @@ -1,553 +0,0 @@ -// -// XPMineMultipleContentTableViewCell.m -// YuMi -// -// Created by P on 2024/9/20. -// - -#import "XPMineMultipleContentTableViewCell.h" - -#import - -#import "MedalModel.h" -#import "UserGiftWallInfoModel.h" -#import "XPRoomGiftAnimationParser.h" - - -@interface RoundCornerBorderBackground : UIView -@property (nonatomic, strong) CAGradientLayer *gradientLayer; - -- (void)setupBGColor; -- (void)setupCellBGColor; -@end - -@implementation RoundCornerBorderBackground - -- (instancetype)init { - if (self = [super init]) { - self.layer.borderWidth = 1; - self.layer.cornerRadius = 10; - self.layer.masksToBounds = YES; - } - return self; -} - -- (void)layoutSubviews { - [super layoutSubviews]; - - // 在 layoutSubviews 中设置渐变图层的 frame - self.gradientLayer.frame = self.bounds; -} - -- (void)setupBGColor { -// UIView *bg = [[UIView alloc] init]; - self.layer.borderColor = UIColorFromRGB(0x1C4B5D).CGColor; - // 创建 CAGradientLayer - CAGradientLayer *gradientLayer = [CAGradientLayer layer]; - - // 设置渐变颜色数组（从上到下） - gradientLayer.colors = @[ - (id)UIColorFromRGB(0x071A21).CGColor, - (id)UIColorFromRGB(0x0B222B).CGColor - ]; - - // 设置渐变的起止位置（0.0 是顶部，1.0 是底部） - gradientLayer.startPoint = CGPointMake(0.5, 0.0); // 顶部中央 - gradientLayer.endPoint = CGPointMake(0.5, 1.0); // 底部中央 - - // 将渐变图层添加到 view 的图层中 - [self.layer insertSublayer:gradientLayer atIndex:0]; - - self.gradientLayer = gradientLayer; -} - -- (void)setupCellBGColor { - self.layer.borderColor = UIColorFromRGB(0x1A4655).CGColor; - // 创建 CAGradientLayer - CAGradientLayer *gradientLayer = [CAGradientLayer layer]; - - // 设置渐变颜色数组（从上到下） - gradientLayer.colors = @[ - (id)UIColorFromRGB(0x041921).CGColor, - (id)UIColorFromRGB(0x072834).CGColor - ]; - - // 设置渐变的起止位置（0.0 是顶部，1.0 是底部） - gradientLayer.startPoint = CGPointMake(0.5, 0.0); // 顶部中央 - gradientLayer.endPoint = CGPointMake(0.5, 1.0); // 底部中央 - - // 将渐变图层添加到 view 的图层中 - [self.layer insertSublayer:gradientLayer atIndex:0]; - - self.gradientLayer = gradientLayer; -} - -@end - -@interface XPMultipleContentCollectionCell : UICollectionViewCell - -@property (nonatomic, copy) NSString *videoUrl; -@property (nonatomic, strong) VAPView *vapView; -@property (nonatomic, strong) XPRoomGiftAnimationParser *vapParser; -@property (nonatomic, strong) NetImageView *icon; -@property (nonatomic, strong) UILabel *nameLabel; -@property (nonatomic, strong) UILabel *countLabel; - -@property (nonatomic, strong) UserMedalModel *userMedalModel; -@property (nonatomic, strong) UserGiftWallInfoModel *giftModel; - -@end - -@implementation XPMultipleContentCollectionCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - RoundCornerBorderBackground *view = [[RoundCornerBorderBackground alloc] init]; - [view setupCellBGColor]; - [self.contentView addSubview:view]; - [view mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.contentView addSubview:self.icon]; - [self.icon mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView); - make.width.height.mas_equalTo(kGetScaleWidth(63)); - }]; - - [self.contentView addSubview:self.nameLabel]; - - [self.contentView addSubview:self.countLabel]; - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(-2); - make.height.mas_equalTo(20); - }]; - - [self.contentView addSubview:self.vapView]; - [self.vapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(7); - make.width.height.mas_equalTo(kGetScaleWidth(63)); - }]; - } - return self; -} - -- (void)setGiftModel:(UserGiftWallInfoModel *)giftModel { - _giftModel = giftModel; - - self.vapView.hidden = YES; - [self.vapView stopHWDMP4]; - - self.icon.hidden = NO; - self.countLabel.hidden = NO; - - self.icon.imageUrl = giftModel.picUrl; - self.nameLabel.text = giftModel.giftName; - self.countLabel.text = [NSString stringWithFormat:@"x%ld", (long)giftModel.reciveCount]; - - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(2); - make.bottom.mas_equalTo(-24); - make.height.mas_equalTo(18); - }]; -} - -- (void)setUserMedalModel:(UserMedalModel *)userMedalModel { - _userMedalModel = userMedalModel; - - self.icon.hidden = YES; - self.vapView.hidden = NO; - self.countLabel.hidden = YES; - - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(2); - make.bottom.mas_equalTo(-8); - make.height.mas_equalTo(18); - }]; - - self.nameLabel.text = userMedalModel.medalName; - - // 停止之前的播放 - [self.vapView stopHWDMP4]; - - // 按照新的优先级逻辑处理显示 - NSString *mp4Url = userMedalModel.mp4Url; - NSString *picUrl = userMedalModel.picUrl; - - // 1. 优先使用 mp4Url 展示 vapView 内容（判断是否有效 mp4） - if (![NSString isEmpty:mp4Url] && [self isValidMP4URL:mp4Url]) { - [self playMP4WithUrl:mp4Url]; - return; - } - - // 2. mp4Url 无效，检查 picUrl 是否为有效图片 - if (![NSString isEmpty:picUrl] && [NSString isValidImageURL:picUrl]) { - // 显示图片内容 - [self showImageWithUrl:picUrl]; - return; - } - - // 3. picUrl 不是有效图片，尝试使用 picUrl 展示 vapView 内容 - if (![NSString isEmpty:picUrl]) { - [self playMP4WithUrl:picUrl]; - return; - } - - // 所有条件都不满足，显示默认状态 - [self showDefaultState]; -} - -#pragma mark - 私有方法 - -/// 验证是否为有效的 MP4 URL -- (BOOL)isValidMP4URL:(NSString *)url { - if ([NSString isEmpty:url]) { - return NO; - } - - NSString *lowercaseUrl = [url lowercaseString]; - return [lowercaseUrl hasSuffix:@".mp4"] || - [lowercaseUrl containsString:@"mp4"] || - [lowercaseUrl containsString:@"video"]; -} - -/// 验证是否为有效的图片 URL -- (BOOL)isValidImageURL:(NSString *)url { - if ([NSString isEmpty:url]) { - return NO; - } - - NSString *lowercaseUrl = [url lowercaseString]; - return [lowercaseUrl hasSuffix:@".jpg"] || - [lowercaseUrl hasSuffix:@".jpeg"] || - [lowercaseUrl hasSuffix:@".png"] || - [lowercaseUrl hasSuffix:@".gif"] || - [lowercaseUrl hasSuffix:@".webp"] || - [lowercaseUrl containsString:@"image"]; -} - -/// 播放 MP4 内容 -- (void)playMP4WithUrl:(NSString *)url { - self.vapView.hidden = NO; - self.icon.hidden = YES; - - NSString *resourcePath = [url pureURLString]; - if (resourcePath.length > 0) { - @kWeakify(self); - [self.vapParser parseWithURL:resourcePath completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [self.vapView playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - // MP4 播放失败，显示默认状态 - [self showDefaultState]; - }]; - } -} - -/// 显示图片内容 -- (void)showImageWithUrl:(NSString *)url { - self.vapView.hidden = YES; - self.icon.hidden = NO; - self.icon.imageUrl = url; -} - -/// 显示默认状态 -- (void)showDefaultState { - self.vapView.hidden = YES; - self.icon.hidden = NO; - self.icon.imageUrl = @""; // 显示默认占位图 -} - -- (NetImageView *)icon { - if (!_icon) { - _icon = [[NetImageView alloc] init]; - } - return _icon; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [UILabel labelInitWithText:@"" font:kFontMedium(12) textColor:[UIColor whiteColor]]; - _nameLabel.textAlignment = NSTextAlignmentCenter; - _nameLabel.numberOfLines = 2; - _nameLabel.minimumScaleFactor = 0.7f; - _nameLabel.adjustsFontSizeToFitWidth = YES; - } - return _nameLabel; -} - -- (UILabel *)countLabel { - if (!_countLabel) { - _countLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:[UIColor whiteColor]]; - } - return _countLabel; -} - -- (VAPView *)vapView { - if (!_vapView) { - _vapView = [[VAPView alloc] init]; - [_vapView setMute:YES]; - _vapView.contentMode = UIViewContentModeScaleAspectFit; - } - return _vapView; -} - -- (XPRoomGiftAnimationParser *)vapParser { - if (!_vapParser) { - _vapParser = [[XPRoomGiftAnimationParser alloc] init]; - } - return _vapParser; -} - -@end - -@interface XPMineMultipleContentTableViewCell () - -@property (nonatomic, assign) BOOL isMedal; - -@property (nonatomic, strong) UIButton *giftButton; -@property (nonatomic, strong) UIButton *medalButton; -@property (nonatomic, strong) UIImageView *indicatorImageView; -@property (nonatomic, strong) UICollectionView *contentCollectionView; -@property (nonatomic, strong) UICollectionViewFlowLayout *contentLayout; - -@property (nonatomic, strong) NSMutableArray *allGifts; - -@property (nonatomic, strong) UILabel *emptyLabel; - -@end - -@implementation XPMineMultipleContentTableViewCell - -+ (CGFloat)cellHeightFro:(MedalModel *)medalModel -{ - if (!medalModel || medalModel.userMedals.count == 0) { - return kGetScaleWidth(116); - } - NSInteger lines = ceil(medalModel.userMedals.count/4.0); - return 50 + lines * (kGetScaleWidth(94) + 8); -} - - -+ (CGFloat)cellHeightFro:(NSArray *)giftWall with:(NSArray *)luckyGiftWall -{ - if (giftWall.count == 0 && luckyGiftWall.count == 0) { - return kGetScaleWidth(116); - } - NSInteger lines = ceil((giftWall.count + luckyGiftWall.count)/4.0); - return 58 + lines * (kGetScaleWidth(107) + 7); -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - self.contentView.backgroundColor = [UIColor clearColor]; - self.isMedal = YES; - [self setupUI]; - } - return self; -} - -- (void)setupUI { - RoundCornerBorderBackground *view = [[RoundCornerBorderBackground alloc] init]; - [self.contentView addSubview:view]; - [view mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - [view setupBGColor]; - - [self.contentView addSubview:self.medalButton]; - [self.medalButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(8); - make.leading.mas_equalTo(8); - make.height.mas_equalTo(30); - make.width.mas_greaterThanOrEqualTo(60); - }]; - - [self.contentView addSubview:self.giftButton]; - [self.giftButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(8); -// make.leading.mas_equalTo(8 + 60 + 8); - make.leading.mas_equalTo(self.medalButton.mas_trailing).offset(8); - make.height.mas_equalTo(30); - make.width.mas_greaterThanOrEqualTo(50); - }]; - - [self.contentView addSubview:self.indicatorImageView]; - [self.indicatorImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(8 + 30 - 11); - make.top.mas_equalTo(self.contentView).offset(34); - make.size.mas_equalTo(CGSizeMake(21, 6)); - }]; - - [self.contentView addSubview:self.contentCollectionView]; - [self.contentCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(50); - make.bottom.mas_equalTo(self.contentView).offset(-8); - make.leading.mas_equalTo(self.contentView).offset(8); - make.trailing.mas_equalTo(self.contentView).offset(-8); - }]; - - [self.contentView addSubview:self.emptyLabel]; - [self.emptyLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.indicatorImageView.mas_bottom).offset(8); - make.bottom.mas_equalTo(view).offset(-8); - make.leading.mas_equalTo(view).offset(8); - make.trailing.mas_equalTo(view).offset(-8); - }]; -} - -- (void)didTapButton:(UIButton *)sender { - - self.isMedal = sender.tag == 1; - - self.medalButton.selected = self.isMedal ? YES : NO; - self.giftButton.selected = self.isMedal ? NO : YES; - self.medalButton.titleLabel.font = self.isMedal ? kFontSemibold(16) : kFontRegular(14); - self.giftButton.titleLabel.font = self.isMedal ? kFontRegular(14) : kFontSemibold(16); - - [self.indicatorImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.isMedal ? (8 + 30 - 11) : (8+90-11)); - make.top.mas_equalTo(self.contentView).offset(34); - make.size.mas_equalTo(CGSizeMake(21, 6)); - }]; - - if (self.didChangeCatalog) { - self.didChangeCatalog(self.isMedal); - } -} - -- (void)setGiftWall:(NSArray *)giftWall { - self.allGifts = @[].mutableCopy; - [self.allGifts addObjectsFromArray:giftWall]; -} - -- (void)setLuckyGiftWall:(NSArray *)luckyGiftWall { - [self.allGifts addObjectsFromArray:luckyGiftWall]; -} - -- (void)setMedalModel:(MedalModel *)medalModel { - _medalModel = medalModel; -} - -- (void)updateCell { - [self.contentCollectionView reloadData]; - - if (self.isMedal) { - self.emptyLabel.hidden = self.medalModel.medalCount != 0; - } else { - self.emptyLabel.hidden = self.allGifts.count != 0; - } -} - -#pragma mark - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - if (self.isMedal) { - return self.medalModel.userMedals.count; - } else { - return self.allGifts.count; - } -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.isMedal) { - XPMultipleContentCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"Medal Cell" forIndexPath:indexPath]; - cell.userMedalModel = [self.medalModel.userMedals xpSafeObjectAtIndex:indexPath.row]; - return cell; - } else { - XPMultipleContentCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"Gift Cell" forIndexPath:indexPath]; - cell.giftModel = [self.allGifts xpSafeObjectAtIndex:indexPath.row]; - return cell; - } -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - CGFloat width = (KScreenWidth - 14*2 - 16 - 7 * 3)/4.0; - return self.isMedal ? CGSizeMake(width, kGetScaleWidth(94)) : CGSizeMake(width, kGetScaleWidth(107)); -} - - -#pragma mark - -- (UIButton *)medalButton { - if (!_medalButton) { - _medalButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _medalButton.tag = 1; - _medalButton.selected = YES; - [_medalButton setTitle:YMLocalizedString(@"XPMineDataGiftTableViewCell2") forState:UIControlStateNormal]; - [_medalButton.titleLabel setFont:kFontSemibold(16)]; - [_medalButton setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - [_medalButton setTitleColor:[UIColor colorWithWhite:1 alpha:0.6] forState:UIControlStateNormal]; - - [_medalButton addTarget:self - action:@selector(didTapButton:) - forControlEvents:UIControlEventTouchUpInside]; - } - return _medalButton; -} - -- (UIButton *)giftButton { - if (!_giftButton) { - _giftButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _giftButton.tag = 2; - [_giftButton setTitle:YMLocalizedString(@"XPMineUserInfoGiftWallViewController0") forState:UIControlStateNormal]; - [_giftButton.titleLabel setFont:kFontRegular(14)]; - [_giftButton setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - [_giftButton setTitleColor:[UIColor colorWithWhite:1 alpha:0.6] forState:UIControlStateNormal]; - - [_giftButton addTarget:self - action:@selector(didTapButton:) - forControlEvents:UIControlEventTouchUpInside]; - } - return _giftButton; -} - -- (UIImageView *)indicatorImageView { - if (!_indicatorImageView) { - _indicatorImageView = [[UIImageView alloc] initWithImage:kImage(@"user_page_Indicator")]; - } - return _indicatorImageView; -} - -- (UICollectionViewFlowLayout *)contentLayout { - if (!_contentLayout) { - _contentLayout = [[UICollectionViewFlowLayout alloc] init]; - _contentLayout.scrollDirection = UICollectionViewScrollDirectionVertical; - _contentLayout.minimumInteritemSpacing = 7; - _contentLayout.minimumLineSpacing = 7; - } - return _contentLayout; -} - -- (UICollectionView *)contentCollectionView { - if (!_contentCollectionView) { - _contentCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero - collectionViewLayout:self.contentLayout]; - _contentCollectionView.delegate = self; - _contentCollectionView.dataSource = self; - _contentCollectionView.backgroundColor = [UIColor clearColor]; - _contentCollectionView.scrollEnabled = NO; - [_contentCollectionView registerClass:[XPMultipleContentCollectionCell class] - forCellWithReuseIdentifier:@"Medal Cell"]; - [_contentCollectionView registerClass:[XPMultipleContentCollectionCell class] - forCellWithReuseIdentifier:@"Gift Cell"]; - } - return _contentCollectionView; -} - -- (UILabel *)emptyLabel { - if (!_emptyLabel) { - _emptyLabel = [UILabel labelInitWithText:@"No data" font:kFontRegular(14) textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - _emptyLabel.textAlignment = NSTextAlignmentCenter; - _emptyLabel.hidden = YES; - } - return _emptyLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.h deleted file mode 100644 index 47f83ab..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMMineUserInfoAlbumCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2021/9/24. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class UserPhoto, XPMineUserInfoAlbumCollectionViewCell; - -@protocol XPMineUserInfoAlbumCollectionViewCellDelegate -///点击了删除某个 -- (void)xPMineUserInfoAlbumCollectionViewCell:(XPMineUserInfoAlbumCollectionViewCell * )cell didDeleteItem:(UserPhoto *)photo; -@end - -@interface XPMineUserInfoAlbumCollectionViewCell : UICollectionViewCell -///代理 -@property (nonatomic,weak) id delegate; -///相册 -@property (nonatomic,strong) UserPhoto *photo; -///添加 -@property (nonatomic,copy) NSString *addImageName; -///是否编辑 -@property (nonatomic,assign) BOOL isEdit; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.m deleted file mode 100644 index 6f84306..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.m +++ /dev/null @@ -1,101 +0,0 @@ -// -// YMMineUserInfoAlbumCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2021/9/24. -// - -#import "XPMineUserInfoAlbumCollectionViewCell.h" -///Third -#import -///Tool -#import "UIButton+EnlargeTouchArea.h" -///Model -#import "UserPhoto.h" - -#import "NetImageView.h" - -@interface XPMineUserInfoAlbumCollectionViewCell () -/// -@property (nonatomic,strong) NetImageView *logoImageView; -/// -@property (nonatomic,strong) UIButton *deleteButton; -@end - -@implementation XPMineUserInfoAlbumCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Response -- (void)deleteButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineUserInfoAlbumCollectionViewCell:didDeleteItem:)]) { - [self.delegate xPMineUserInfoAlbumCollectionViewCell:self didDeleteItem:self.photo]; - } -} -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.logoImageView]; - [self.contentView addSubview:self.deleteButton]; -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.deleteButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(25, 25)); - make.top.trailing.mas_equalTo(self.contentView).inset(0); - }]; -} - -#pragma mark - Getters And Setters -- (void)setPhoto:(UserPhoto *)photo { - _photo = photo; - if (_photo) { - self.logoImageView.imageUrl = photo.photoUrl; - } -} - -- (void)setIsEdit:(BOOL)isEdit { - _isEdit = isEdit; - self.deleteButton.hidden = !_isEdit; -} - -- (void)setAddImageName:(NSString *)addImageName { - _addImageName = addImageName; - if (_addImageName.length > 0) { - self.logoImageView.image = [UIImage imageNamed:_addImageName]; - } -} - -- (NetImageView *)logoImageView { - if (!_logoImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - _logoImageView = [[NetImageView alloc] initWithConfig:config]; - _logoImageView.userInteractionEnabled = YES; - _logoImageView.layer.cornerRadius = 5; - _logoImageView.layer.masksToBounds = YES; - _logoImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _logoImageView; -} - -- (UIButton *)deleteButton { - if (!_deleteButton) { - _deleteButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_deleteButton setImage:[UIImage imageNamed:@"mine_user_info_edit_photo_delete"] forState:UIControlStateNormal]; - [_deleteButton setImage:[UIImage imageNamed:@"mine_user_info_edit_photo_delete"] forState:UIControlStateSelected]; - [_deleteButton addTarget:self action:@selector(deleteButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _deleteButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.h deleted file mode 100644 index 0a8f606..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPMineUserInfoEditMainTagView.h -// xplan-ios -// -// Created by duoban on 2023/2/23. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserInfoEditMainTagView : UIView -@property (nonatomic,strong) NSMutableArray *itemList; -@property (nonatomic,assign) CGFloat maxWidth; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.m deleted file mode 100644 index c732943..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.m +++ /dev/null @@ -1,47 +0,0 @@ -// -// XPMineUserInfoEditMainTagView.m -// xplan-ios -// -// Created by duoban on 2023/2/23. -// - -#import "XPMineUserInfoEditMainTagView.h" -#import "XPMineUserInfoTagModel.h" -#import "XPMineUserInfoEditTagView.h" -@interface XPMineUserInfoEditMainTagView() - -@end -@implementation XPMineUserInfoEditMainTagView - - --(void)setItemList:(NSMutableArray *)itemList{ - _itemList = itemList; - CGFloat x = 0; - if(self.subviews.count > 0){ - for (UIView *view in self.subviews) { - [view removeFromSuperview]; - } - } - for (int i = 0; i < _itemList.count; i++) { - XPMineUserInfoTagItemModel *model = _itemList[i]; - if(i > 0){ - XPMineUserInfoTagItemModel *getModel = _itemList[i-1]; - x = x + getModel.width + kGetScaleWidth(5); - } - XPMineUserInfoEditTagView *tagView = [[XPMineUserInfoEditTagView alloc]initWithFrame:CGRectZero]; - [self addSubview:tagView]; - [tagView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(x); - make.centerY.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(18)); - make.width.mas_equalTo(model.width); - }]; - tagView.isTag = i < 3; - tagView.title = model.label; - - } - -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.h deleted file mode 100644 index 4eeaca4..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// XPMineUserInfoEditTableViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2021/9/23. -// - -#import -#import "XPSoundCardModel.h" - -NS_ASSUME_NONNULL_BEGIN -@class XPMineUserInfoEditModel; -@interface XPMineUserInfoEditTableViewCell : UITableViewCell -///数据 -@property (nonatomic,strong) XPMineUserInfoEditModel *itemModel; -@property (nonatomic,strong) XPSoundCardModel *soundModel; -@property (nonatomic,strong) NSMutableArray *itemList; -@property (nonatomic,assign) CGFloat maxWidth; - -@property (nonatomic, assign) BOOL isCPAvatarDisplay; -@property (nonatomic, assign) BOOL isCPAnimationDisplay; - -@property (nonatomic, copy) void(^changeCPSwitch)(BOOL isOn, NSInteger type); - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m deleted file mode 100644 index de9356a..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m +++ /dev/null @@ -1,517 +0,0 @@ -// -// XPMineUserInfoEditTableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2021/9/23. -// - -#import "XPMineUserInfoEditTableViewCell.h" -///Third -#import -///Tool - -///Model -#import "XPMineUserInfoTagModel.h" -#import "XPMineUserInfoEditModel.h" -#import "UserPhoto.h" -#import "XPMineUserInfoTagFlowLayout.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -#import "XPMineUserInfoHeaderTagCell.h" -#import "XPMineUserInfoEditMainTagView.h" -@interface XPMineUserInfoEditTableViewCell () - -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -@property (nonatomic,strong) UILabel *titleLabelLong; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///副标题 -@property (nonatomic,strong) UILabel *subTitleLabel; -///箭头 -@property (nonatomic,strong) UIImageView *arrowImageView; -///相册的 -@property (nonatomic,strong) UIStackView *phototStackView; -///第一个 -@property (nonatomic,strong) NetImageView *firstPhotoImageView; -///第二个 -@property (nonatomic,strong) NetImageView *secondPhotoImageView; -///第三个 -@property (nonatomic,strong) NetImageView *thirdPhotoImageView; -///分割线 -@property (nonatomic,strong) UIView * partLineView; -///声音 -@property (nonatomic,strong) UIImageView *soundView; -///声音时间 -@property (nonatomic,strong) UILabel *soundTimeView; -/// -@property (nonatomic,strong) NSMutableArray *photoViewArray; -//审核View -@property (nonatomic,strong) UIImageView *reviewView; - -@property (nonatomic, strong) UISwitch *switchButton; - -/// -@property (nonatomic,strong) XPMineUserInfoEditMainTagView *editTagView; - - -@end - -@implementation XPMineUserInfoEditTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.stackView]; - [self.contentView addSubview:self.partLineView]; - [self.soundView addSubview:self.soundTimeView]; - - [self.stackView addArrangedSubview:self.titleLabel]; - UIView *emptyVeiw1 = [UIView new]; - [self.stackView addArrangedSubview:emptyVeiw1]; - [emptyVeiw1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_greaterThanOrEqualTo(5); - }]; - [self.stackView addArrangedSubview:self.avatarImageView]; - [self.stackView addArrangedSubview:self.subTitleLabel]; - - [self.stackView addSubview:self.titleLabelLong]; - - UIView *emptyVeiw = [UIView new]; - [self.stackView addArrangedSubview:emptyVeiw]; - [emptyVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_greaterThanOrEqualTo(5); - }]; - [self.stackView addArrangedSubview:self.phototStackView]; - [self.stackView addArrangedSubview:self.soundView]; - [self.stackView addArrangedSubview:self.arrowImageView]; - [self.stackView addArrangedSubview:self.switchButton]; - - [self.phototStackView addArrangedSubview:self.thirdPhotoImageView]; - [self.phototStackView addArrangedSubview:self.secondPhotoImageView]; - [self.phototStackView addArrangedSubview:self.firstPhotoImageView]; - - [self.photoViewArray addObject:self.firstPhotoImageView]; - [self.photoViewArray addObject:self.secondPhotoImageView]; - [self.photoViewArray addObject:self.thirdPhotoImageView]; - - [self.avatarImageView addSubview:self.reviewView]; - [self.contentView addSubview:self.editTagView]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.partLineView.mas_top); - make.leading.trailing.mas_equalTo(self.contentView).inset(kGetScaleWidth(16)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(100)); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.titleLabelLong mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.centerY.mas_equalTo(self.stackView); - make.width.mas_equalTo(kGetScaleWidth(300)); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.arrowImageView.mas_leading).mas_offset(-kGetScaleWidth(2)); - }]; - [self.partLineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(kGetScaleWidth(16)); - make.bottom.mas_equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(0.5)); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(50), kGetScaleWidth(50))); - make.trailing.equalTo(self.arrowImageView.mas_leading).mas_offset(-kGetScaleWidth(2)); - }]; - - [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(20), kGetScaleWidth(20))); - }]; - [self.switchButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(34), kGetScaleWidth(20))); - }]; - - [self.soundView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(85)); - make.height.mas_equalTo(kGetScaleWidth(28)); - make.trailing.equalTo(self.arrowImageView.mas_leading).mas_offset(-kGetScaleWidth(2)); - }]; - [self.soundTimeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.soundView); - make.leading.mas_equalTo(kGetScaleWidth(44)); - }]; - [self.firstPhotoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(40)); - }]; - - [self.secondPhotoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(self.firstPhotoImageView); - }]; - - [self.thirdPhotoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(self.firstPhotoImageView); - }]; - [self.reviewView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.avatarImageView); - make.height.mas_equalTo(kGetScaleWidth(15)); - }]; - - [self.editTagView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(220)); - make.trailing.equalTo(self.arrowImageView.mas_leading).mas_offset(kGetScaleWidth(3)); - make.centerY.equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(18)); - }]; -} - -- (void)loadPhotoViewWithPhotoArray:(NSArray *)array { - if (array.count > 3) { - array = [array subarrayWithRange:NSMakeRange(0, 3)]; - } - self.firstPhotoImageView.hidden = YES; - self.secondPhotoImageView.hidden = YES; - self.thirdPhotoImageView.hidden = YES; - for (int i = 0; i < array.count; i++) { - NetImageView * imageView = [self.photoViewArray xpSafeObjectAtIndex:i]; - UserPhoto *photo = [array xpSafeObjectAtIndex:i]; - if (photo) { - NSString *imageUrl = photo.photoUrl; - if (imageUrl.length > 0) { - imageView.imageUrl = imageUrl; - imageView.hidden = NO; - } - } - } -} - -- (void)configCellWithModel:(XPMineUserInfoEditModel *)model{ - self.soundView.hidden = YES; - self.editTagView.hidden = YES; - self.switchButton.hidden = YES; - self.phototStackView.hidden = YES; - self.avatarImageView.hidden = YES; - self.titleLabelLong.hidden = YES; - self.titleLabel.hidden = NO; - - switch (model.type) { - case XPMineUserInfoEditType_Avatar: - { - self.subTitleLabel.hidden = YES; - self.avatarImageView.hidden = NO; - if (model.isReview) { - self.reviewView.hidden = NO; - } else { - self.reviewView.hidden = YES; - self.avatarImageView.imageUrl = model.avatarUrl; - } - } - break; - case XPMineUserInfoEditType_Birth: - { - self.subTitleLabel.hidden = NO; - } - break; - case XPMineUserInfoEditType_Nick: - { - self.subTitleLabel.hidden = NO; - } - break; - case XPMineUserInfoEditType_UseDes: - { - self.subTitleLabel.hidden = NO; - } - break; - case XPMineUserInfoEditType_Photo: - { - self.subTitleLabel.hidden = YES; - self.phototStackView.hidden = NO; - [self loadPhotoViewWithPhotoArray:model.photoArray]; - } - break; - case XPMineUserInfoEditType_Sound: - { - self.subTitleLabel.hidden = NO; - break; - } - case XPMineUserInfoEditType_Tag: - { - self.subTitleLabel.hidden = self.itemList.count > 0; - self.editTagView.hidden = !self.subTitleLabel.hidden; - break; - } - case XPMineUserInfoEditType_Area: - { - self.subTitleLabel.hidden = NO; - break; - } - case XPMineUserInfoEditType_CP_Avatar: - { - self.arrowImageView.hidden = YES; - self.switchButton.hidden = NO; - [self.switchButton setOn:self.isCPAvatarDisplay]; - self.titleLabelLong.hidden = NO; - self.titleLabel.hidden = YES; - break; - } - case XPMineUserInfoEditType_CP_Animation: - { - self.arrowImageView.hidden = YES; - self.switchButton.hidden = NO; - [self.switchButton setOn:self.isCPAnimationDisplay]; - self.titleLabelLong.hidden = NO; - self.titleLabel.hidden = YES; - break; - } - default: - break; - } -} - -- (void)switchValueChanged:(UISwitch *)sender { - if (_changeCPSwitch) { - self.changeCPSwitch(sender.isOn, self.itemModel.type == XPMineUserInfoEditType_CP_Animation ? 2 : 1); - } -} - -#pragma mark - Getters And Setters --(void)setMaxWidth:(CGFloat)maxWidth{ - _maxWidth = maxWidth; - [_editTagView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(_maxWidth); - }]; - -} --(void)setItemList:(NSMutableArray *)itemList{ - _itemList = itemList; - _editTagView.itemList = _itemList; -} - --(void)setSoundModel:(XPSoundCardModel *)soundModel{ - _soundModel = soundModel; - if(_itemModel.type == XPMineUserInfoEditType_Sound){ - _soundView.hidden = !(_soundModel.status == 1 || _soundModel.status == 2); - _subTitleLabel.hidden = _soundModel.status == 1 || _soundModel.status == 2; - _soundTimeView.text = [NSString stringWithFormat:@"%ld\"",_soundModel.second]; - } - -} -- (void)setItemModel:(XPMineUserInfoEditModel *)itmeModel { - _itemModel = itmeModel; - if (_itemModel) { - self.titleLabel.text = _itemModel.title; - self.titleLabelLong.text = _itemModel.title; - self.subTitleLabel.text = _itemModel.subTitle; - self.isCPAvatarDisplay = itmeModel.isCPAvatar; - self.isCPAnimationDisplay = itmeModel.isCPAnimation; - [self configCellWithModel:itmeModel]; - } -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = kGetScaleWidth(10); - } - return _stackView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = kFontMedium(14); - _titleLabel.textColor = [DJDKMIMOMColor inputTextColor]; - [_titleLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _titleLabel; -} - -- (UILabel *)titleLabelLong { - if (!_titleLabelLong) { - _titleLabelLong = [[UILabel alloc] init]; - _titleLabelLong.font = kFontMedium(14); - _titleLabelLong.textColor = [DJDKMIMOMColor inputTextColor]; - [_titleLabelLong setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _titleLabelLong; -} - -- (UILabel *)subTitleLabel { - if (!_subTitleLabel) { - _subTitleLabel = [[UILabel alloc] init]; - _subTitleLabel.textColor = UIColorFromRGB(0x6D6B89); - _subTitleLabel.font = kFontMedium(14); - _subTitleLabel.textAlignment = NSTextAlignmentRight; - - } - return _subTitleLabel; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.userInteractionEnabled = YES; - _avatarImageView.layer.cornerRadius = kGetScaleWidth(25); - _avatarImageView.layer.masksToBounds = YES; - } - return _avatarImageView; -} - -- (UIImageView *)arrowImageView { - if (!_arrowImageView) { - _arrowImageView = [[UIImageView alloc] init]; - _arrowImageView.userInteractionEnabled = YES; - _arrowImageView.image = [[UIImage imageNamed:@"mine_item_arrow"]ms_SetImageForRTL]; - [_arrowImageView setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; - } - return _arrowImageView; -} - -- (UIStackView *)phototStackView { - if (!_phototStackView) { - _phototStackView = [[UIStackView alloc] init]; - _phototStackView.axis = UILayoutConstraintAxisHorizontal; - _phototStackView.distribution = UIStackViewDistributionFill; - _phototStackView.alignment = UIStackViewAlignmentFill; - _phototStackView.spacing = kGetScaleWidth(8); - } - return _phototStackView; -} - -- (NetImageView *)firstPhotoImageView { - if (!_firstPhotoImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _firstPhotoImageView = [[NetImageView alloc] initWithConfig:config]; - _firstPhotoImageView.userInteractionEnabled = YES; - _firstPhotoImageView.layer.masksToBounds = YES; - _firstPhotoImageView.contentMode = UIViewContentModeScaleAspectFill; - _firstPhotoImageView.clipsToBounds = YES; - _firstPhotoImageView.layer.cornerRadius = kGetScaleWidth(6); - _firstPhotoImageView.hidden = YES; - } - return _firstPhotoImageView; -} - -- (NetImageView *)secondPhotoImageView { - if (!_secondPhotoImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _secondPhotoImageView = [[NetImageView alloc] initWithConfig:config]; - _secondPhotoImageView.userInteractionEnabled = YES; - _secondPhotoImageView.layer.masksToBounds = YES; - _secondPhotoImageView.contentMode = UIViewContentModeScaleAspectFill; - _secondPhotoImageView.clipsToBounds = YES; - _secondPhotoImageView.layer.cornerRadius = kGetScaleWidth(6); - _secondPhotoImageView.hidden = YES; - } - return _secondPhotoImageView; -} - -- (NetImageView *)thirdPhotoImageView { - if (!_thirdPhotoImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _thirdPhotoImageView = [[NetImageView alloc] initWithConfig:config]; - _thirdPhotoImageView.userInteractionEnabled = YES; - _thirdPhotoImageView.layer.masksToBounds = YES; - _thirdPhotoImageView.contentMode = UIViewContentModeScaleAspectFill; - _thirdPhotoImageView.clipsToBounds = YES; - _thirdPhotoImageView.layer.cornerRadius = kGetScaleWidth(6); - _thirdPhotoImageView.hidden = YES; - } - return _thirdPhotoImageView; -} - -- (UIView *)partLineView { - if (!_partLineView) { - _partLineView = [[UIView alloc] init]; - _partLineView.backgroundColor = UIColorFromRGB(0xF1F1F1); - } - return _partLineView; -} --(UIImageView *)soundView{ - if (!_soundView){ - _soundView = [UIImageView new]; - _soundView.image = kImage(@"mine_item_sound"); - } - return _soundView; -} -- (UILabel *)soundTimeView{ - if (!_soundTimeView){ - _soundTimeView = [UILabel labelInitWithText:@"0\"" font:kFontMedium(14) textColor:[UIColor whiteColor]]; - } - return _soundTimeView; -} -- (NSMutableArray *)photoViewArray { - if (!_photoViewArray) { - _photoViewArray = [NSMutableArray array]; - } - return _photoViewArray; -} -- (UIImageView *)reviewView{ - if (!_reviewView){ - _reviewView = [UIImageView new]; - _reviewView.hidden = YES; - _reviewView.image = kImage(@"mine_avatar_reviewing"); - UILabel *titleView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineHeadView7") font:[UIFont systemFontOfSize:9 weight:UIFontWeightRegular] textColor:[UIColor whiteColor]]; - titleView.textAlignment = NSTextAlignmentCenter; - [_reviewView addSubview:titleView]; - [titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(_reviewView); - }]; - } - return _reviewView; -} - -- (XPMineUserInfoEditMainTagView *)editTagView{ - if (!_editTagView){ - _editTagView = [[XPMineUserInfoEditMainTagView alloc]initWithFrame:CGRectZero]; - } - return _editTagView; -} - -- (UISwitch *)switchButton { - if (!_switchButton) { - _switchButton = [[UISwitch alloc] init]; - // 设置开关为打开状态时的背景颜色 - _switchButton.onTintColor = UIColorFromRGB(0x04D5C6); // 蓝色 - - // 设置滑块的颜色 - _switchButton.thumbTintColor = [UIColor whiteColor]; // 白色 - - // 设置开关为关闭状态时的背景颜色 - _switchButton.tintColor = UIColorFromRGB(0xDCDCDC); // 灰色 - - [_switchButton addTarget:self action:@selector(switchValueChanged:) forControlEvents:UIControlEventValueChanged]; - _switchButton.transform = CGAffineTransformMakeScale(0.8, 0.8); - } - return _switchButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTagView.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTagView.h deleted file mode 100644 index 2c067e9..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTagView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPMineUserInfoEditTagView.h -// xplan-ios -// -// Created by duoban on 2023/2/23. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserInfoEditTagView : UIView -/// -@property (nonatomic,assign) BOOL isTag; -/// -@property (nonatomic,copy) NSString *title; -/// -@property (nonatomic,strong,readonly) UILabel *titleView; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTagView.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTagView.m deleted file mode 100644 index 6f06c6b..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTagView.m +++ /dev/null @@ -1,52 +0,0 @@ -// -// XPMineUserInfoEditTagView.m -// xplan-ios -// -// Created by duoban on 2023/2/23. -// - -#import "XPMineUserInfoEditTagView.h" -@interface XPMineUserInfoEditTagView() -@property (nonatomic,strong) UILabel *titleView; -@end -@implementation XPMineUserInfoEditTagView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.titleView]; - self.layer.cornerRadius = kGetScaleWidth(9); - self.layer.masksToBounds = YES; -} -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; -} --(void)setIsTag:(BOOL)isTag{ - _isTag = isTag; - self.backgroundColor = _isTag ? [UIColor colorWithRed:58/255.0 green:213/255.0 blue:248/255.0 alpha:0.12]: UIColorFromRGB(0xF3F5F9); - _titleView.textColor = _isTag ? UIColorFromRGB(0x00C4EA):UIColorFromRGB(0x6D6B89); -} -- (void)setTitle:(NSString *)title{ - _title = title; - _titleView.text = _title; -} -#pragma mark -懒加载 -- (UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel labelInitWithText:@"" font:kFontRegular(10) textColor:UIColorFromRGB(0x00C4EA)]; - _titleView.textAlignment = NSTextAlignmentCenter; - } - return _titleView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.h deleted file mode 100644 index b620c83..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMMineUserInfoEmptyCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2022/4/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserInfoEmptyCollectionViewCell : UICollectionViewCell -///是否是礼物墙 -@property (nonatomic,assign) BOOL isGiftWall; -@end - -NS_ASSUME_NONNULL_END - diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.m deleted file mode 100644 index 383359e..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.m +++ /dev/null @@ -1,82 +0,0 @@ -// -// YMMineUserInfoEmptyCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2022/4/15. -// - -#import "XPMineUserInfoEmptyCollectionViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPMineUserInfoEmptyCollectionViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPMineUserInfoEmptyCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(150); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (void)setIsGiftWall:(BOOL)isGiftWall { - _isGiftWall = isGiftWall; - if (_isGiftWall) { - [self.emptyImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(10); - }]; - self.titleLabel.font = [UIFont systemFontOfSize:13]; - } -} - -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPMineUserInfoEmptyCollectionViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} -@end diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.h b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.h deleted file mode 100644 index 52a937a..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPMineUserInfoGiftWallCollectionViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class UserGiftWallInfoModel; -@interface XPMineUserInfoGiftWallCollectionViewCell : UICollectionViewCell -@property (nonatomic,strong) UserGiftWallInfoModel *giftInfo; --(void)setLevel:(int)level; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.m deleted file mode 100644 index bac2544..0000000 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.m +++ /dev/null @@ -1,160 +0,0 @@ -// -// XPMineUserInfoGiftWallCollectionViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import "XPMineUserInfoGiftWallCollectionViewCell.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "UIView+Corner.h" -///Model -#import "UserGiftWallInfoModel.h" - -@interface XPMineUserInfoGiftWallCollectionViewCell () -///背景 -@property (nonatomic,strong) UIView *bgView; -///排名 -@property (nonatomic,strong) UIImageView *levelImageView; - -///礼物头像 -@property (nonatomic,strong) NetImageView *giftImageView; -///礼物个数 -@property (nonatomic,strong) UILabel *giftNumberLabel; - -@property (nonatomic,strong) UILabel *priceView; -@end - -@implementation XPMineUserInfoGiftWallCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method - -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.bgView]; - [self.bgView addSubview:self.giftImageView]; - [self.bgView addSubview:self.priceView]; - [self.bgView addSubview:self.giftNumberLabel]; - [self.bgView addSubview:self.levelImageView]; -} - -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; - - - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(60.16), kGetScaleWidth(55.58))); - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(kGetScaleWidth(5)); - }]; - - [self.giftNumberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.giftImageView.mas_bottom).offset(kGetScaleWidth(5)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - [self.priceView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.bgView); - make.top.equalTo(self.giftNumberLabel.mas_bottom).mas_offset(kGetScaleWidth(5)); - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(0)); - }]; - [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.mas_equalTo(kGetScaleWidth(3)); - make.width.height.mas_equalTo(kGetScaleWidth(19)); - }]; -} - -#pragma mark - Getters And Setters - --(void)setLevel:(int)level{ - self.levelImageView.hidden = YES; - if(level == 1){ - self.levelImageView.hidden = NO; - _levelImageView.image = [UIImage imageNamed:@"gift_list_one"]; - }else if(level == 2){ - self.levelImageView.hidden = NO; - _levelImageView.image = [UIImage imageNamed:@"gift_list_two"]; - }else if(level == 3){ - self.levelImageView.hidden = NO; - _levelImageView.image = [UIImage imageNamed:@"gift_list_three"]; - }else{ - self.levelImageView.hidden = YES; - } -} - -- (void)setGiftInfo:(UserGiftWallInfoModel *)giftInfo { - _giftInfo = giftInfo; - if (_giftInfo) { - _giftImageView.imageUrl = _giftInfo.picUrl; - _giftNumberLabel.text = [NSString stringWithFormat:@"X%ld", _giftInfo.reciveCount]; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@" %ld",_giftInfo.giftPrice] attributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x6D6B89)}]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"moli_money_icon"];; - attachment.bounds = CGRectMake(0, roundf(_priceView.font.capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height); - attachment.image = iconImage; - [textAtt insertAttributedString:[NSMutableAttributedString attributedStringWithAttachment:attachment] atIndex:0]; - _priceView.attributedText = textAtt; - } -} - -- (NetImageView *)giftImageView { - if (!_giftImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _giftImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _giftImageView; -} - - -- (UILabel *)giftNumberLabel { - if (!_giftNumberLabel) { - _giftNumberLabel = [[UILabel alloc] init]; - _giftNumberLabel.font = [UIFont systemFontOfSize:kGetScaleWidth(10) weight:UIFontWeightRegular]; - _giftNumberLabel.textColor = UIColorFromRGB(0x6D6B89); - _giftNumberLabel.textAlignment = NSTextAlignmentCenter; - - } - return _giftNumberLabel; -} - -- (UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = UIColorFromRGB(0xF3F5FA); - _bgView.layer.cornerRadius = kGetScaleWidth(8); - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} -- (UIImageView *)levelImageView{ - if (!_levelImageView){ - _levelImageView = [UIImageView new]; - _levelImageView.hidden = NO; - } - return _levelImageView; -} -- (UILabel *)priceView{ - if (!_priceView){ - _priceView = [UILabel new]; - _priceView.textAlignment = NSTextAlignmentCenter; - _priceView.font = [UIFont systemFontOfSize:kGetScaleWidth(10) weight:UIFontWeightRegular]; - } - return _priceView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.h deleted file mode 100644 index 170ee5b..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMMineRechargeTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/9/24. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RechargeListModel,XPMineRechargeTableViewCell; - -@protocol XPMineRechargeTableViewCellDelegate - -///点击了某个item -- (void)xPMineRechargeTableViewCell:(XPMineRechargeTableViewCell *)cell didSelectItem:(RechargeListModel *)listModel; - -@end - -@interface XPMineRechargeTableViewCell : UITableViewCell -///数据源 -@property (nonatomic,strong) RechargeListModel *listModel; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.m deleted file mode 100644 index 33744a2..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.m +++ /dev/null @@ -1,146 +0,0 @@ -// -// YMMineRechargeTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/9/24. -// - -#import "XPMineRechargeTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "RechargeListModel.h" -@interface XPMineRechargeTableViewCell () -///背景 -@property (nonatomic,strong) UIView * backView; -///💎的标志 -@property (nonatomic,strong) UIImageView *coinImageView; -///数量 -@property (nonatomic,strong) UILabel *numberLabel; -///单位 -@property (nonatomic,strong) UILabel *unitLabel; -///充值 -@property (nonatomic,strong) UIButton *rechargeButton; -@end - -@implementation XPMineRechargeTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Response -- (void)rechargeButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineRechargeTableViewCell:didSelectItem:)]) { - [self.delegate xPMineRechargeTableViewCell:self didSelectItem:self.listModel]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.backView]; - [self.backView addSubview:self.coinImageView]; - [self.backView addSubview:self.numberLabel]; - [self.backView addSubview:self.unitLabel]; - [self.backView addSubview:self.rechargeButton]; -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.contentView).offset(15); - make.bottom.mas_equalTo(self.contentView); - }]; - - [self.coinImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(21, 21)); - make.centerY.mas_equalTo(self.backView); - make.leading.mas_equalTo(self.backView).offset(19); - }]; - - [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.coinImageView); - make.leading.mas_equalTo(self.coinImageView.mas_trailing).offset(6); - }]; - - [self.unitLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.numberLabel); - make.leading.mas_equalTo(self.numberLabel.mas_trailing).offset(6); - }]; - - [self.rechargeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(54, 24)); - make.centerY.mas_equalTo(self.backView); - make.trailing.mas_equalTo(self.backView).offset(-15); - }]; -} -#pragma mark - Getters And Setters -- (void)setListModel:(RechargeListModel *)listModel { - _listModel = listModel; - if (_listModel) { - NSCharacterSet* nonDigits =[[NSCharacterSet decimalDigitCharacterSet] invertedSet]; - int remainSecond = [[_listModel.prodName stringByTrimmingCharactersInSet:nonDigits] intValue]; - self.numberLabel.text = [NSString stringWithFormat:@"%d",remainSecond]; - [self.rechargeButton setTitle:[NSString stringWithFormat:@"￥%@",[_listModel.money stringValue]] forState:UIControlStateNormal]; - } -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _backView.layer.masksToBounds = YES; - _backView.layer.cornerRadius = 8; - } - return _backView; -} -- (UIImageView *)coinImageView { - if (!_coinImageView) { - _coinImageView = [[UIImageView alloc] init]; - _coinImageView.userInteractionEnabled = YES; - _coinImageView.image = [UIImage imageNamed:@"moli_money_icon"]; - } - return _coinImageView; -} - -- (UILabel *)numberLabel { - if (!_numberLabel) { - _numberLabel = [[UILabel alloc] init]; - _numberLabel.font = [UIFont fontWithName:@"PingFang-SC-Bold" size:18]; - _numberLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _numberLabel; -} - -- (UILabel *)unitLabel { - if (!_unitLabel) { - _unitLabel = [[UILabel alloc] init]; - _unitLabel.text = YMLocalizedString(@"XPMineRechargeTableViewCell0"); - _unitLabel.font = [UIFont systemFontOfSize:11]; - _unitLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _unitLabel; -} - -- (UIButton *)rechargeButton { - if (!_rechargeButton) { - _rechargeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_rechargeButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _rechargeButton.titleLabel.font = [UIFont systemFontOfSize:15]; - _rechargeButton.layer.masksToBounds = YES; - _rechargeButton.layer.cornerRadius = 12; - _rechargeButton.layer.borderWidth = 1; - _rechargeButton.layer.borderColor = [DJDKMIMOMColor mainTextColor].CGColor; - [_rechargeButton addTarget:self action:@selector(rechargeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _rechargeButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.h deleted file mode 100644 index 9af5191..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMMineVisitorEmptyTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/2/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineVisitorEmptyTableViewCell : UITableViewCell - -///空白的文字 -@property (nonatomic,copy) NSString *emptyTitle; -@property (nonatomic,strong, readonly) UIImageView *emptyImageView; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.m deleted file mode 100644 index 73bc0b8..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.m +++ /dev/null @@ -1,82 +0,0 @@ -// -// YMMineVisitorEmptyTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/2/22. -// - -#import "XPMineVisitorEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPMineVisitorEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - - -@implementation XPMineVisitorEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(250); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (void)setEmptyTitle:(NSString *)emptyTitle { - _emptyTitle = emptyTitle; - if (_emptyTitle.length > 0) { - self.titleLabel.text = _emptyTitle; - } -} - -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPMineVisitorEmptyTableViewCell0"); - _titleLabel.numberOfLines = 2; - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.h deleted file mode 100644 index 44773b6..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// YMMineVisitorTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/1/26. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMineVisitorTableViewCell, XPMineVisitorItemModel, UserInfoModel; - -@protocol XPMineVisitorTableViewCellDelegate - -///点击了私聊 -- (void)onChatClick:(XPMineVisitorTableViewCell *)cell; - -///点击了头像 -- (void)onAvatarClick:(XPMineVisitorTableViewCell *)cell; - -@end - - -@interface XPMineVisitorTableViewCell : UITableViewCell - -@property (nonatomic, assign) BOOL isFirstItem; -@property (nonatomic, assign) BOOL isLastItem; -@property (nonatomic, strong) UserInfoModel *item; - -@property (nonatomic, weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.m deleted file mode 100644 index 5e32096..0000000 --- a/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.m +++ /dev/null @@ -1,254 +0,0 @@ -// -// YMMineVisitorTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/1/26. -// - -#import "XPMineVisitorTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "XPMineVisitorItemModel.h" -#import "UserInfoModel.h" - -@interface XPMineVisitorTableViewCell() - -@property (nonatomic ,strong) NetImageView *avaterImgView; -@property(nonatomic, strong) UIStackView *nameStackView; -@property (nonatomic, strong) UIImageView *genderImageView; -@property (nonatomic, strong) UILabel *nickLabel; -@property(nonatomic, strong) NetImageView *regionImageView; -@property(nonatomic, strong) NetImageView *charmImageView; -@property(nonatomic, strong) NetImageView *experImageView; -@property(nonatomic, strong) NetImageView *nameplateImageView; - -@property (nonatomic ,strong) UILabel *memberIdLabel; -@property (nonatomic ,strong) UILabel *timeLabel; - -@end - -@implementation XPMineVisitorTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self setUpUI]; - [self setUpConstraints]; - } - return self; -} - -#pragma mark - lifeCycle -- (void)setUpUI { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - - [self.contentView addSubview:self.avaterImgView]; - - UIView *spaceView = [[UIView alloc] init]; - _nameStackView = [[UIStackView alloc] initWithArrangedSubviews:@[ - self.nickLabel, - self.genderImageView, - self.regionImageView, - self.charmImageView, - self.experImageView, - self.nameplateImageView, - spaceView - ]]; - _nameStackView.spacing = 4; - _nameStackView.alignment = UIStackViewAlignmentCenter; - _nameStackView.distribution = UIStackViewDistributionFill; - [self.contentView addSubview:self.nameStackView]; - - - [self.contentView addSubview:self.memberIdLabel]; - [self.contentView addSubview:self.timeLabel]; -} - -#pragma mark - Constraints -- (void)setUpConstraints { - [self.avaterImgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(25); - make.leading.mas_equalTo(15); - make.width.height.mas_equalTo(56); - }]; - - [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avaterImgView).offset(-4); - make.leading.mas_equalTo(self.avaterImgView.mas_trailing).offset(6); - make.trailing.mas_equalTo(-8); - make.height.mas_equalTo(22); - }]; - - [self.genderImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(14); - make.width.mas_equalTo(14); - }]; - [self.regionImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(14); - make.width.mas_equalTo(18); - }]; - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(18); - make.width.mas_equalTo(40); - }]; - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(18); - make.width.mas_equalTo(40); - }]; - [self.nameplateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(18); - make.width.mas_equalTo(40); - }]; - - [self.memberIdLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avaterImgView); - make.leading.mas_equalTo(self.nameStackView); - }]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameStackView); - make.bottom.mas_equalTo(self.avaterImgView); - }]; -} - -#pragma mark - event -- (void)onChatButtonClick:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(onChatClick:)]) { - [self.delegate onChatClick:self]; - } -} - -- (void)onCliekAvatar:(UITapGestureRecognizer *)ges { - if (self.delegate && [self.delegate respondsToSelector:@selector(onAvatarClick:)]) { - [self.delegate onAvatarClick:self]; - } -} - -/** 最后一个数据 配置圆角 */ -- (void)setIsFirstItem:(BOOL)isFirstItem{ - _isFirstItem = isFirstItem; -} - -- (void)setIsLastItem:(BOOL)isLastItem { - _isLastItem = isLastItem; -} - -- (void)setItem:(UserInfoModel *)item { - _item = item; - self.nickLabel.text = item.nick; - self.avaterImgView.imageUrl = item.avatar; - self.memberIdLabel.text = [NSString stringWithFormat:@"ID：%zd", item.erbanNo]; - self.timeLabel.text = [NSString stringWithFormat:YMLocalizedString(@"20.20.51_text_28"), item.visitTimeDesc]; - [self.genderImageView setImage:item.gender == GenderType_Male ? kImage(@"common_male") : kImage(@"common_female")]; - - self.regionImageView.imageUrl = item.regionIcon; - self.regionImageView.hidden = [NSString isEmpty:item.regionIcon]; - - if (item.userLevelVo) { - self.experImageView.hidden = NO; - self.charmImageView.hidden = NO; - self.experImageView.imageUrl = item.userLevelVo.experUrl; - self.charmImageView.imageUrl = item.userLevelVo.charmUrl; - }else { - self.experImageView.hidden = YES; - self.charmImageView.hidden = YES; - } - - if (item.userVipInfoVO) { - self.nameplateImageView.hidden = NO; - self.nameplateImageView.imageUrl = item.userVipInfoVO.nameplateUrl; - }else { - self.nameplateImageView.hidden = YES; - } -} - -- (NetImageView *)avaterImgView { - if (!_avaterImgView) { - _avaterImgView = [[NetImageView alloc] init]; - _avaterImgView.contentMode = UIViewContentModeScaleAspectFill; - [_avaterImgView setCornerRadius:56/2]; - } - return _avaterImgView; -} -- (NetImageView *)regionImageView { - if (!_regionImageView) { - _regionImageView = [[NetImageView alloc] init]; - _regionImageView.contentMode = UIViewContentModeScaleAspectFit; - [_regionImageView setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_regionImageView setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _regionImageView; -} -- (NetImageView *)charmImageView { - if (!_charmImageView) { - _charmImageView = [[NetImageView alloc] init]; - _charmImageView.contentMode = UIViewContentModeScaleAspectFit; - [_charmImageView setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_charmImageView setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _charmImageView; -} -- (NetImageView *)experImageView { - if (!_experImageView) { - _experImageView = [[NetImageView alloc] init]; - _experImageView.contentMode = UIViewContentModeScaleAspectFit; - [_experImageView setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_experImageView setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _experImageView; -} -- (NetImageView *)nameplateImageView { - if (!_nameplateImageView) { - _nameplateImageView = [[NetImageView alloc] init]; - _nameplateImageView.contentMode = UIViewContentModeScaleAspectFit; - [_nameplateImageView setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_nameplateImageView setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _nameplateImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.textColor = UIColorFromRGB(0x333333); - _nickLabel.font = [UIFont systemFontOfSize:13]; - _nickLabel.text = YMLocalizedString(@"XPMineVisitorTableViewCell0"); - _nickLabel.translatesAutoresizingMaskIntoConstraints = NO; - [_nickLabel setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; - [_nickLabel setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; - } - return _nickLabel; -} - -- (UIImageView *)genderImageView { - if (!_genderImageView) { - _genderImageView = [[UIImageView alloc] init]; - _genderImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _genderImageView; -} - -- (UILabel *)memberIdLabel { - if (!_memberIdLabel) { - _memberIdLabel = [[UILabel alloc] init]; - _memberIdLabel.textColor = UIColorFromRGB(0x7b7b7d); - _memberIdLabel.font = kFontRegular(13); - _memberIdLabel.text = @""; - } - return _memberIdLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.text = @""; - _timeLabel.textColor = UIColorFromRGB(0x7b7b7d); - _timeLabel.font = kFontRegular(13); - } - return _timeLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPGameOrdersListTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/XPGameOrdersListTableViewCell.h deleted file mode 100644 index 1726f66..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPGameOrdersListTableViewCell.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// XPGameOrdersListTableViewCell.h -// YuMi -// -// Created by P on 2024/7/9. -// - -#import - -@class XPMineGameOrderRecoredModel; -NS_ASSUME_NONNULL_BEGIN - -@interface XPGameOrdersListTableViewCell : UITableViewCell - -@property (nonatomic, strong) XPMineGameOrderRecoredModel *model; -@property (nonatomic, assign) NSInteger type; // 0 = 我發起的 - -@property (nonatomic, copy) void(^didTapChat)(XPMineGameOrderRecoredModel *model, NSInteger type); -@property (nonatomic, copy) void(^didTapPlayAgain)(XPMineGameOrderRecoredModel *model); - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPGameOrdersListTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPGameOrdersListTableViewCell.m deleted file mode 100644 index f54135f..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPGameOrdersListTableViewCell.m +++ /dev/null @@ -1,407 +0,0 @@ -// -// XPGameOrdersListTableViewCell.m -// YuMi -// -// Created by P on 2024/7/9. -// - -#import "XPGameOrdersListTableViewCell.h" -#import "XPMineGamePartnerInfoModel.h" - -@interface XPGameOrdersListTableViewCell () - -@property (nonatomic, strong) NetImageView *avatarImageView; -@property (nonatomic, strong) UILabel *nameLabel; -@property (nonatomic, strong) UILabel *userIDLabel; -@property (nonatomic, strong) UILabel *gameNameLabel; -@property (nonatomic, strong) UILabel *gamePriceLabel; -@property (nonatomic, strong) UILabel *timeLabel; -@property (nonatomic, strong) UILabel *orderIDLabel; -@property (nonatomic, strong) UIButton *againButton; -@property (nonatomic, strong) UIButton *messageButton; - -@end - -@implementation XPGameOrdersListTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self setup]; - } - return self; -} - -- (void)setModel:(XPMineGameOrderRecoredModel *)model { - _model = model; - - self.gameNameLabel.text = model.gameName.length > 0 ? model.gameName : @" "; - self.timeLabel.text = model.orderTime; - self.orderIDLabel.text = model.orderNo; - self.gamePriceLabel.text = @(self.model.amount).stringValue; -} - -- (void)setType:(NSInteger)type { - _type = type; - if (type == 0) { - self.avatarImageView.imageUrl = self.model.toAvatar; - self.nameLabel.text = self.model.toNick; - self.userIDLabel.text = @(self.model.toErBanNo).stringValue; - self.againButton.hidden = NO; - } else { - self.avatarImageView.imageUrl = self.model.fromAvatar; - self.nameLabel.text = self.model.fromNick; - self.userIDLabel.text = @(self.model.fromErBanNo).stringValue; - self.againButton.hidden = YES; - } -} - -- (void)updatePriceContent { - NSTextAttachment *coinAttachment = [[NSTextAttachment alloc] init]; - coinAttachment.image = kImage(@"moli_money_icon"); - coinAttachment.bounds = CGRectMake(4, 0.5, 9, 9); - NSAttributedString *coin = [NSAttributedString attributedStringWithAttachment:coinAttachment]; - NSAttributedString *price = [[NSAttributedString alloc] initWithString:@(self.model.amount).stringValue - attributes:@{ - NSFontAttributeName: self.gamePriceLabel.font, - NSForegroundColorAttributeName: self.gamePriceLabel.textColor - }]; - if (isMSRTL()) { - NSMutableAttributedString *mutableAttributedString = [[NSMutableAttributedString alloc] initWithAttributedString:price]; - [mutableAttributedString insertAttributedString:coin atIndex:0]; - self.gamePriceLabel.attributedText = mutableAttributedString.copy; - } else { - NSMutableAttributedString *mutableAttributedString = [[NSMutableAttributedString alloc] initWithAttributedString:coin]; - [mutableAttributedString insertAttributedString:price atIndex:0]; - self.gamePriceLabel.attributedText = mutableAttributedString.copy; - } - - [self.contentView layoutIfNeeded]; -} - -- (void)updateOrderContent { - NSTextAttachment *coinAttachment = [[NSTextAttachment alloc] init]; - coinAttachment.image = kImage(@"user_card_copy_id1"); - coinAttachment.bounds = CGRectMake(2, -0.5, 9, 9); - NSAttributedString *coin = [NSAttributedString attributedStringWithAttachment:coinAttachment]; - NSAttributedString *price = [[NSAttributedString alloc] initWithString:self.model.orderNo - attributes:@{ - NSFontAttributeName: self.orderIDLabel.font, - NSForegroundColorAttributeName: self.orderIDLabel.textColor - }]; - NSMutableAttributedString *mutableAttributedString = [[NSMutableAttributedString alloc] initWithAttributedString:coin]; - [mutableAttributedString insertAttributedString:price atIndex:0]; - self.orderIDLabel.attributedText = mutableAttributedString.copy; - [self.contentView layoutIfNeeded]; -} - -- (void)setup { - self.backgroundColor = [UIColor clearColor]; - - UIView *container = [[UIView alloc] init]; - container.backgroundColor = [UIColor whiteColor]; - container.layer.cornerRadius = 10; - container.layer.masksToBounds = YES; - container.layer.shadowColor = UIColorFromRGB(0x272727).CGColor; - [self.contentView addSubview:container]; - [container mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(0); - make.leading.mas_equalTo(14); - make.trailing.mas_equalTo(-14); - make.bottom.mas_equalTo(-16); - }]; - - [container addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(12.5); - make.leading.mas_equalTo(9); - make.width.height.mas_equalTo(60); - }]; - - UIStackView *userInfoStack = [[UIStackView alloc] init]; - userInfoStack.axis = UILayoutConstraintAxisVertical; - userInfoStack.distribution = UIStackViewDistributionFill; - userInfoStack.alignment = UIStackViewAlignmentTop; - userInfoStack.spacing = 15.5; - [userInfoStack addArrangedSubview:self.nameLabel]; - [userInfoStack addArrangedSubview:self.userIDLabel]; - [container addSubview:userInfoStack]; - [userInfoStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView).offset(13.5); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); - }]; - - UIView *line = [[UIView alloc] init]; - line.backgroundColor = UIColorFromRGB(0xf4f4f4); - [container addSubview:line]; - [line mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(0.5); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(14); - }]; - - -// UIStackView *nameStack = [self horizontalStack]; -// [nameStack addArrangedSubview:[self titleLabel:YMLocalizedString(@"GameOrderContent_11")]]; -// [nameStack addArrangedSubview:self.gameNameLabel]; -// - UIStackView *priceStack = [self horizontalStack]; -// [priceStack addArrangedSubview:[self titleLabel:YMLocalizedString(@"GameOrderContent_12")]]; -// [priceStack addArrangedSubview:self.gamePriceLabel]; - - UIImageView *coinIcon = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - coinIcon.contentMode = UIViewContentModeScaleAspectFit; - [coinIcon setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [coinIcon setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - coinIcon.frame = CGRectMake(0, 0, 10, 10); - [priceStack addArrangedSubview:self.gamePriceLabel]; - [priceStack addArrangedSubview:coinIcon]; - -// UIStackView *orderTimeStack = [self horizontalStack]; -// [orderTimeStack addArrangedSubview:[self titleLabel:YMLocalizedString(@"GameOrderContent_13")]]; -// [orderTimeStack addArrangedSubview:self.timeLabel]; -// - UIStackView *orderIdStack = [self horizontalStack]; - orderIdStack.spacing = 0; -// [orderIdStack addArrangedSubview:[self titleLabel:YMLocalizedString(@"GameOrderContent_14")]]; - - - UIImageView *copyIcon = [[UIImageView alloc] initWithImage:kImage(@"user_card_copy_id1")]; - copyIcon.contentMode = UIViewContentModeScaleAspectFit; - [copyIcon setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [copyIcon setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - copyIcon.frame = CGRectMake(0, 0, 14, 14); - copyIcon.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self - action:@selector(didTapOrderLabel)]; - [copyIcon addGestureRecognizer:tap]; - - [orderIdStack addArrangedSubview:self.orderIDLabel]; - [orderIdStack addArrangedSubview:copyIcon]; - - UIStackView *titleStack = [[UIStackView alloc] init]; - titleStack.axis = UILayoutConstraintAxisVertical; - titleStack.distribution = UIStackViewDistributionFillEqually; - titleStack.alignment = UIStackViewAlignmentLeading; - titleStack.spacing = 15.5; - [titleStack addArrangedSubview:[self titleLabel:YMLocalizedString(@"GameOrderContent_11")]]; - [titleStack addArrangedSubview:[self titleLabel:YMLocalizedString(@"GameOrderContent_12")]]; - [titleStack addArrangedSubview:[self titleLabel:YMLocalizedString(@"GameOrderContent_13")]]; - [titleStack addArrangedSubview:[self titleLabel:YMLocalizedString(@"GameOrderContent_14")]]; - [container addSubview:titleStack]; - [titleStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(line).offset(11.5); - make.leading.mas_equalTo(self.avatarImageView).offset(11.5); - }]; - - UIStackView *informationStack = [[UIStackView alloc] init]; - informationStack.axis = UILayoutConstraintAxisVertical; - informationStack.distribution = UIStackViewDistributionFill; - informationStack.alignment = UIStackViewAlignmentLeading; - informationStack.spacing = 15.5; - [informationStack addArrangedSubview:self.gameNameLabel]; - [informationStack addArrangedSubview:priceStack]; - [informationStack addArrangedSubview:self.timeLabel]; - [informationStack addArrangedSubview:orderIdStack]; - [container addSubview:informationStack]; - [informationStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(titleStack); - make.leading.mas_equalTo(titleStack.mas_trailing).offset(8); - make.trailing.mas_equalTo(container).offset(-8); - }]; - - UIView *line_2 = [[UIView alloc] init]; - line_2.backgroundColor = UIColorFromRGB(0xF4F4F4); - [container addSubview:line_2]; - [line_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(0.5); - make.top.mas_equalTo(informationStack.mas_bottom).offset(12.5); - }]; - - UIStackView *buttonsStack = [[UIStackView alloc] init]; - buttonsStack.axis = UILayoutConstraintAxisHorizontal; - buttonsStack.distribution = UIStackViewDistributionFill; - buttonsStack.alignment = UIStackViewAlignmentCenter; - buttonsStack.spacing = 26; - [buttonsStack addArrangedSubview:self.againButton]; - [buttonsStack addArrangedSubview:self.messageButton]; - [container addSubview:buttonsStack]; - [buttonsStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-13); - make.top.mas_equalTo(line_2.mas_bottom).offset(10); - }]; -} - -- (UIStackView *)horizontalStack { - UIStackView *stack = [[UIStackView alloc] initWithFrame:CGRectMake(0, 0, 300, 18)]; - stack.axis = UILayoutConstraintAxisHorizontal; - stack.distribution = UIStackViewDistributionFill; - stack.alignment = UIStackViewAlignmentCenter; - stack.spacing = 2; - return stack; -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; -} - -- (void)setIsMyOrder:(BOOL)isMyOrder { - self.againButton.hidden = !isMyOrder; -} - -- (UILabel *)titleLabel:(NSString *)content { - UILabel *label = [UILabel labelInitWithText:[NSString stringWithFormat:@"%@", content] - font:kFontMedium(13) - textColor:UIColorFromRGB(0x242335)]; - [label setContentHuggingPriority:UILayoutPriorityDefaultHigh - forAxis:UILayoutConstraintAxisHorizontal]; - [label setContentCompressionResistancePriority:UILayoutPriorityDefaultHigh - forAxis:UILayoutConstraintAxisHorizontal]; - return label; -} - --(IBAction)didTapAgainButton:(id)sender { - if (self.didTapPlayAgain) { - self.didTapPlayAgain(self.model); - } -} - --(IBAction)didTapMessageButton:(id)sender { - if (self.didTapChat) { - self.didTapChat(self.model, self.type); - } -} - -- (void)didTapOrderLabel { - UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; - [pasteboard setString:self.model.orderNo]; - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPShareView0")]; -} - -#pragma mark - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 10; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _avatarImageView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(14) - textColor:UIColorFromRGB(0x242335)]; - } - return _nameLabel; -} - -- (UILabel *)userIDLabel { - if (!_userIDLabel) { - _userIDLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(12) - textColor:UIColorFromRGB(0x666666)]; - } - return _userIDLabel; -} - -- (UILabel *)gameNameLabel { - if (!_gameNameLabel) { - _gameNameLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(14) - textColor:UIColorFromRGB(0x242335)]; - } - return _gameNameLabel; -} - -- (UILabel *)gamePriceLabel { - if (!_gamePriceLabel) { - _gamePriceLabel = [UILabel labelInitWithText:@"0" - font:kFontMedium(14) - textColor:UIColorFromRGB(0x242335)]; - [_gamePriceLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_gamePriceLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _gamePriceLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(14) - textColor:UIColorFromRGB(0x242335)]; - } - return _timeLabel; -} - -- (UILabel *)orderIDLabel { - if (!_orderIDLabel) { - _orderIDLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(14) - textColor:UIColorFromRGB(0x242335)]; - _orderIDLabel.userInteractionEnabled = YES; - _orderIDLabel.adjustsFontSizeToFitWidth = YES; - _orderIDLabel.minimumScaleFactor = 0.5; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self - action:@selector(didTapOrderLabel)]; - [_orderIDLabel addGestureRecognizer:tap]; - } - return _orderIDLabel; -} - -- (UIButton *)againButton { - if (!_againButton) { - _againButton = [UIButton buttonWithType:UIButtonTypeCustom]; -// _againButton.frame = CGRectMake(0, 0, 65, 26); - [_againButton setTitle:YMLocalizedString(@"GameOrderContent_15") forState:UIControlStateNormal]; - [_againButton addTarget:self - action:@selector(didTapAgainButton:) - forControlEvents:UIControlEventTouchUpInside]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFED118),UIColorFromRGB(0xFDB719)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(65, 26)]; - [_againButton setBackgroundImage:image forState:UIControlStateNormal]; - _againButton.layer.cornerRadius = 13; - _againButton.layer.masksToBounds = YES; - [_againButton.titleLabel setFont:kFontBold(13)]; - - [_againButton setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_againButton setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - - _againButton.contentEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 10); - - _againButton.titleLabel.adjustsFontSizeToFitWidth = YES; - _againButton.titleLabel.minimumScaleFactor = 0.5; // 最小缩放比例 - } - return _againButton; -} - -- (UIButton *)messageButton { - if (!_messageButton) { - _messageButton = [UIButton buttonWithType:UIButtonTypeCustom]; -// _messageButton.frame = CGRectMake(0, 0, 65, 26); - [_messageButton setTitle:YMLocalizedString(@"XPMineUserInfoViewController8") forState:UIControlStateNormal]; - [_messageButton addTarget:self - action:@selector(didTapMessageButton:) - forControlEvents:UIControlEventTouchUpInside]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x70e9e7),UIColorFromRGB(0x41d4f6)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(65, 26)]; - [_messageButton setBackgroundImage:image forState:UIControlStateNormal]; - _messageButton.layer.cornerRadius = 13; - _messageButton.layer.masksToBounds = YES; - [_messageButton.titleLabel setFont:kFontBold(13)]; - - [_messageButton setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_messageButton setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - - _messageButton.contentEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 10); - - _messageButton.titleLabel.adjustsFontSizeToFitWidth = YES; - _messageButton.titleLabel.minimumScaleFactor = 0.5; // 最小缩放比例 - } - return _messageButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPMIneGameCollectionViewCell.h b/YuMi/Modules/YMMine/View/Cell/XPMIneGameCollectionViewCell.h deleted file mode 100644 index 2cc75cc..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMIneGameCollectionViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPMIneGameCollectionViewCell.h -// xplan-ios -// -// Created by GreenLand on 2022/7/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class LittleGameInfoModel; -@interface XPMIneGameCollectionViewCell : UICollectionViewCell - -///游戏 -@property (nonatomic, strong) LittleGameInfoModel *gameModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPMIneGameCollectionViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMIneGameCollectionViewCell.m deleted file mode 100644 index ea0213c..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMIneGameCollectionViewCell.m +++ /dev/null @@ -1,79 +0,0 @@ -// -// XPMIneGameCollectionViewCell.m -// xplan-ios -// -// Created by GreenLand on 2022/7/22. -// - -#import "XPMIneGameCollectionViewCell.h" -///Third -#import -#import "NetImageView.h" - -///Model -#import "LittleGameInfoModel.h" - -@interface XPMIneGameCollectionViewCell () -///显示图片 -@property (nonatomic,strong) NetImageView *logoImageView; -///显示名字 -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPMIneGameCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.logoImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(40, 40)); - make.centerX.top.mas_equalTo(self.contentView); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(6); - make.centerX.mas_equalTo(self.contentView); - }]; -} - -#pragma mark - Getters And Setters -- (void)setGameModel:(LittleGameInfoModel *)gameModel { - _gameModel = gameModel; - if (gameModel) { - self.titleLabel.text = gameModel.name; - self.logoImageView.imageUrl = gameModel.pic; - } -} - -- (NetImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[NetImageView alloc] init]; - } - return _logoImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:13]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.h deleted file mode 100644 index 0dd8db2..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMineBlackListTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/4/25. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel; -@interface XPMineBlackListTableViewCell : UITableViewCell -@property (nonatomic,strong) UserInfoModel *userInfo; -@property (nonatomic, copy)void(^handleTapRemove)(UserInfoModel *userInfo); -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.m deleted file mode 100644 index f34be36..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.m +++ /dev/null @@ -1,119 +0,0 @@ -// -// YMMineBlackListTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/4/25. -// - -#import "XPMineBlackListTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -///Model -#import "UserInfoModel.h" - -@interface XPMineBlackListTableViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -@property (nonatomic, strong) UIButton *removeButton; - -@end - -@implementation XPMineBlackListTableViewCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.removeButton]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(40, 40)); - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(15); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - make.trailing.mas_lessThanOrEqualTo(self.contentView).offset(-5); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.removeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView).offset(-8); - make.centerY.mas_equalTo(self.contentView); - make.height.mas_equalTo(25); - make.width.mas_greaterThanOrEqualTo(60); - }]; -} - -- (void)didTapRemove { - if (_handleTapRemove) { - self.handleTapRemove(self.userInfo); - } -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.avatarImageView.imageUrl = _userInfo.avatar; - self.nickLabel.text = _userInfo.nick; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 20; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UIButton *)removeButton { - if (!_removeButton) { - _removeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_removeButton.titleLabel setFont:kFontRegular(13)]; - [_removeButton setTitle:YMLocalizedString(@"XPMineBlackListViewController1") forState:UIControlStateNormal]; - [_removeButton setTitleColor:UIColorFromRGB(0xff8c03) forState:UIControlStateNormal]; - [_removeButton setCornerRadius:25/2 - corners:kCALayerMaxXMaxYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMinXMinYCorner - borderWidth:1 - borderColor:UIColorFromRGB(0xff8c03)]; - _removeButton.contentEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 10); - _removeButton.titleLabel.lineBreakMode = NSLineBreakByClipping; - _removeButton.clipsToBounds = NO; - [_removeButton addTarget:self action:@selector(didTapRemove) forControlEvents:UIControlEventTouchUpInside]; - } - return _removeButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.h deleted file mode 100644 index 37a42e9..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPMineGameTableViewCell.h -// xplan-ios -// -// Created by GreenLand on 2022/7/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class LittleGameInfoModel, XPMineGameTableViewCell; -@protocol XPMineGameTableViewCellDelegate - -///选择了某个item -- (void)xPMineGameTableViewCell:(XPMineGameTableViewCell *)cell didSelectItem:(LittleGameInfoModel *)item; - -@end - -@interface XPMineGameTableViewCell : UITableViewCell - -///数据 -@property (nonatomic,strong) NSArray *datasource; -///代理 -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.m deleted file mode 100644 index 887a112..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.m +++ /dev/null @@ -1,197 +0,0 @@ -// -// XPMineGameTableViewCell.m -// xplan-ios -// -// Created by GreenLand on 2022/7/22. -// - -#import "XPMineGameTableViewCell.h" -///Third -#import -///Tool -#import "UIImage+Utils.h" -///View -#import "XPMIneGameCollectionViewCell.h" - -@interface XPMineGameTableViewCell () - -@property (nonatomic, strong) UIView *mainView; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UIImageView *titleBgView; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; - -@property (nonatomic, strong) UIView *slideBackView; -@property (nonatomic, strong) UIView *sliderView; - -@end - -@implementation XPMineGameTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.mainView]; - [self.mainView addSubview:self.titleBgView]; - [self.mainView addSubview:self.titleLabel]; - [self.mainView addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(0); - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(12); - make.height.mas_equalTo(18); - }]; - [self.titleBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.titleLabel); - make.bottom.mas_equalTo(self.titleLabel).mas_offset(1); - make.size.mas_equalTo(CGSizeMake(41, 10)); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(14); - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(63); - }]; -} - -#pragma mark - UICollectionViewDatasource And UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPMIneGameCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMIneGameCollectionViewCell class]) forIndexPath:indexPath]; - LittleGameInfoModel * item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.gameModel = item; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineGameTableViewCell:didSelectItem:)]) { - LittleGameInfoModel * model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [self.delegate xPMineGameTableViewCell:self didSelectItem:model]; - } -} - -#pragma mark - MSBaseRTLFlowLayout -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { - return 0; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - CGFloat width = (KScreenWidth - 30) / 4; - return CGSizeMake(width, 63); -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { - return 0; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - CGPoint offset = scrollView.contentOffset; - CGRect frame = self.sliderView.frame; - frame.origin.x = offset.x*12/(scrollView.contentSize.width-scrollView.frame.size.width); - self.sliderView.frame = frame; -} - -#pragma mark - Getters And Setters -- (void)setDatasource:(NSArray *)datasource { - _datasource = datasource; - if(datasource.count > 4) { - [self.mainView addSubview:self.slideBackView]; - [self.slideBackView addSubview:self.sliderView]; - [self.slideBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.mainView); - make.size.mas_equalTo(CGSizeMake(24, 4)); - make.top.mas_equalTo(self.collectionView.mas_bottom).mas_offset(10); - }]; - [self.sliderView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(12, 4)); - make.top.leading.bottom.mas_equalTo(self.slideBackView); - }]; - } else { - [self.sliderView removeFromSuperview]; - [self.slideBackView removeFromSuperview]; - } - [self.collectionView reloadData]; -} - -- (UIView *)mainView { - if (!_mainView) { - _mainView = [[UIView alloc] init]; - _mainView.backgroundColor = [UIColor whiteColor]; - _mainView.layer.cornerRadius = 8; - _mainView.layer.masksToBounds = YES; - } - return _mainView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPMineGameTableViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UIImageView *)titleBgView { - if (!_titleBgView) { - _titleBgView = [[UIImageView alloc] init]; - _titleBgView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFD15A), UIColorFromRGB(0xFFC000)] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(41, 10)]; - _titleBgView.layer.cornerRadius = 5; - _titleBgView.layer.masksToBounds = YES; - } - return _titleBgView; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - [_collectionView registerClass:[XPMIneGameCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMIneGameCollectionViewCell class])]; - } - return _collectionView; -} - -- (UIView *)sliderView { - if (!_sliderView) { - _sliderView = [[UIView alloc] init]; - _sliderView.backgroundColor = UIColorFromRGB(0xFFBC51); - _sliderView.layer.cornerRadius = 2; - _sliderView.layer.masksToBounds = YES; - } - return _sliderView; -} - -- (UIView *)slideBackView { - if (!_slideBackView) { - _slideBackView = [[UIView alloc] init]; - _slideBackView.backgroundColor = UIColorRGBAlpha(0x000000, 0.1); - _slideBackView.layer.cornerRadius = 2; - _slideBackView.layer.masksToBounds = YES; - _sliderView.clipsToBounds = YES; - } - return _slideBackView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineHeadFunctionItemLayout.h b/YuMi/Modules/YMMine/View/Cell/XPMineHeadFunctionItemLayout.h deleted file mode 100644 index 6ca64f6..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineHeadFunctionItemLayout.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineHeadFunctionItemLayout.h -// YUMI -// -// Created by YUMI on 2022/8/4. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineHeadFunctionItemLayout : MSBaseRTLFlowLayout - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineHeadFunctionItemLayout.m b/YuMi/Modules/YMMine/View/Cell/XPMineHeadFunctionItemLayout.m deleted file mode 100644 index dd66c23..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineHeadFunctionItemLayout.m +++ /dev/null @@ -1,218 +0,0 @@ -// -// YMMineHeadFunctionItemLayout.m -// YUMI -// -// Created by YUMI on 2022/8/4. -// - -#import "XPMineHeadFunctionItemLayout.h" - -@interface XPMineHeadFunctionItemLayout () -@property (nonatomic, copy) NSMutableDictionary *sectionDic; -@property (nonatomic, strong) NSMutableArray *allAttributes; -@end - -@implementation XPMineHeadFunctionItemLayout - -#pragma mark - life cycle -- (instancetype)init { - self = [super init]; - if (self) { - self.scrollDirection = UICollectionViewScrollDirectionHorizontal; - } - return self; -} - -#pragma mark - overload - -- (void)prepareLayout { - - [super prepareLayout]; - - _sectionDic = [NSMutableDictionary dictionary]; - self.allAttributes = [NSMutableArray array]; - //获取section的数量 - NSUInteger section = [self.collectionView numberOfSections]; - - for (int sec = 0; sec < section; sec++) { - //获取每个section的cell个数 - NSUInteger count = [self.collectionView numberOfItemsInSection:sec]; - - for (NSUInteger item = 0; item *)layoutAttributesForElementsInRect:(CGRect)rect { - - return self.allAttributes; -} - -#pragma mark - private method - -- (void)applyLayoutAttributes:(UICollectionViewLayoutAttributes *)attributes { - - - if(attributes.representedElementKind != nil){ - return; - } - CGFloat minLine = self.minimumLineSpacing; - CGFloat minSpacing = self.minimumInteritemSpacing; - - //attributes 的宽度 - CGFloat itemW = attributes.frame.size.width; - //attributes 的高度 - CGFloat itemH = attributes.frame.size.height; - UIEdgeInsets sectionInsets = self.sectionInset; - //collectionView 的宽度 - CGFloat width = self.collectionView.frame.size.width; - //collectionView 的高度 - CGFloat height = self.collectionView.frame.size.height; - //每个attributes的下标值 从0开始 - NSInteger itemIndex = attributes.indexPath.item; - - CGFloat stride = (self.scrollDirection == UICollectionViewScrollDirectionHorizontal) ? width : height; - - - //获取现在的attributes是第几组 - NSInteger section = attributes.indexPath.section; - //获取每个section的item的个数 - NSInteger itemCount = [self.collectionView numberOfItemsInSection:section]; - - - CGFloat offset = section * stride; - - //计算x方向item个数 - NSInteger xCount = (width / itemW); - //计算y方向item个数 - NSInteger yCount = (height / itemH); - //计算一页总个数 - NSInteger allCount = (xCount * yCount); - //获取每个section的页数，从0开始 - NSInteger page = itemIndex / allCount; - - //余数，用来计算item的x的偏移量 - NSInteger remain = (itemIndex % xCount); - //取商，用来计算item的y的偏移量 - NSInteger merchant = (itemIndex-page*allCount)/xCount; - - - //x方向每个item的偏移量 - CGFloat xCellOffset = remain * (itemW + minLine)+ sectionInsets.left; - //y方向每个item的偏移量 - CGFloat yCellOffset = merchant * (itemH + minSpacing); - - //获取每个section中item占了几页 - NSInteger pageRe = (itemCount % allCount == 0)? (itemCount / allCount) : (itemCount / allCount) + 1; - //将每个section与pageRe对应，计算下面的位置 - [_sectionDic setValue:@(pageRe) forKey:[NSString stringWithFormat:@"%ld", section]]; - - if(self.scrollDirection == UICollectionViewScrollDirectionHorizontal) { - - NSInteger actualLo = 0; - //将每个section中的页数相加 - for (NSString *key in [_sectionDic allKeys]) { - actualLo += [_sectionDic[key] integerValue]; - } - //获取到的最后的数减去最后一组的页码数 - actualLo -= [_sectionDic[[NSString stringWithFormat:@"%ld", [_sectionDic allKeys].count-1]] integerValue]; - xCellOffset += page*width + actualLo*width; - - } else { - - yCellOffset += offset; - } - - attributes.frame = CGRectMake(xCellOffset, yCellOffset, itemW, itemH); -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.h b/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.h deleted file mode 100644 index dda28fe..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMMineMatchCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2021/9/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMineFunctionItemModel, LittleGameInfoModel; -@interface XPMineHeadItemCollectionViewCell : UICollectionViewCell - -///功能 -@property (nonatomic,strong) XPMineFunctionItemModel *itemModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.m deleted file mode 100644 index ed9103b..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.m +++ /dev/null @@ -1,100 +0,0 @@ -// -// YMMineMatchCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2021/9/16. -// - -#import "XPMineHeadItemCollectionViewCell.h" -///Third -#import -#import "NetImageView.h" -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "XPMineFunctionItemModel.h" - -@interface XPMineHeadItemCollectionViewCell () -///显示图片 -@property (nonatomic,strong) NetImageView *logoImageView; -///角标 -@property (nonatomic,strong) NetImageView *badgeImageView; -///显示名字 -@property (nonatomic,strong) UILabel *titleLabel; -@end - - -@implementation XPMineHeadItemCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.logoImageView]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.badgeImageView]; -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(32, 32)); - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(6); - }]; - [self.badgeImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(24, 10)); - make.centerX.mas_equalTo(self.logoImageView.mas_trailing); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(4); - make.centerX.mas_equalTo(self.contentView); - make.height.mas_equalTo(17); - }]; -} - -#pragma mark - Getters And Setters -- (void)setItemModel:(XPMineFunctionItemModel *)itemModel { - _itemModel = itemModel; - if (_itemModel) { - self.logoImageView.imageUrl = itemModel.centerPic; - self.titleLabel.text = _itemModel.centerName; - self.badgeImageView.imageUrl = itemModel.centerBadge ? itemModel.centerBadge : nil; - } -} - -- (NetImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[NetImageView alloc] init]; - } - return _logoImageView; -} - -- (NetImageView *)badgeImageView { - if (!_badgeImageView) { - _badgeImageView = [[NetImageView alloc] init]; - _badgeImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _badgeImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:13]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.h deleted file mode 100644 index 1396d4b..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMMineHeadItemTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/1/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMineFunctionItemModel, XPMineHeadItemTableViewCell; -@protocol XPMineHeadItemTableViewCellDelegate - -///选择了某个item -- (void)xPMineHeadItemTableViewCell:(XPMineHeadItemTableViewCell *)cell didSelectItem:(XPMineFunctionItemModel *)item; - -@end - -@interface XPMineHeadItemTableViewCell : UITableViewCell - -///数据 -@property (nonatomic,strong) NSArray *datasource; -///代理 -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.m deleted file mode 100644 index 658e28f..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.m +++ /dev/null @@ -1,170 +0,0 @@ -// -// YMMineHeadItemTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/1/19. -// - -#import "XPMineHeadItemTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///View -#import "XPMineHeadItemCollectionViewCell.h" -#import "XPMineHeadFunctionItemLayout.h" - -@interface XPMineHeadItemTableViewCell () -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; - -@property (nonatomic, strong) UIView *mainView; -@property (nonatomic, strong) UIView *slideBackView; -@property (nonatomic, strong) UIView *sliderView; - -@end - - -@implementation XPMineHeadItemTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.mainView]; - [self.mainView addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.bottom.mas_equalTo(self.contentView); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(14); - make.leading.trailing.mas_equalTo(self.mainView); - make.height.mas_equalTo(77+32+17+6); - }]; -} - -#pragma mark - UICollectionViewDatasource And UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPMineHeadItemCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineHeadItemCollectionViewCell class]) forIndexPath:indexPath]; - XPMineFunctionItemModel * item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.itemModel = item; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadItemTableViewCell:didSelectItem:)]) { - XPMineFunctionItemModel * model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [self.delegate xPMineHeadItemTableViewCell:self didSelectItem:model]; - } -} - -#pragma mark - MSBaseRTLFlowLayout -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { - return 0; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - CGFloat width = (KScreenWidth - 30) / 4; - return CGSizeMake(width, 32+4+17+6); -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { - return 0; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - CGPoint offset = scrollView.contentOffset; - CGRect frame = self.sliderView.frame; - frame.origin.x = offset.x*12/(scrollView.contentSize.width-scrollView.frame.size.width); - self.sliderView.frame = frame; -} - -#pragma mark - Getters And Setters -- (void)setDatasource:(NSArray *)datasource { - _datasource = datasource; - if(datasource.count > 8) { - [self.mainView addSubview:self.slideBackView]; - [self.slideBackView addSubview:self.sliderView]; - [self.slideBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.mainView); - make.size.mas_equalTo(CGSizeMake(24, 4)); - make.top.mas_equalTo(self.collectionView.mas_bottom).mas_offset(10); - }]; - [self.sliderView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(12, 4)); - make.top.leading.bottom.mas_equalTo(self.slideBackView); - }]; - } else { - [self.sliderView removeFromSuperview]; - [self.slideBackView removeFromSuperview]; - } - [self.collectionView reloadData]; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - XPMineHeadFunctionItemLayout *layout = [[XPMineHeadFunctionItemLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 10; - layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0); - _collectionView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - [_collectionView registerClass:[XPMineHeadItemCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineHeadItemCollectionViewCell class])]; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.pagingEnabled = YES; - } - return _collectionView; -} - -- (UIView *)sliderView { - if (!_sliderView) { - _sliderView = [[UIView alloc] init]; - _sliderView.backgroundColor = [DJDKMIMOMColor appMainColor]; - _sliderView.layer.cornerRadius = 2; - _sliderView.layer.masksToBounds = YES; - } - return _sliderView; -} - -- (UIView *)slideBackView { - if (!_slideBackView) { - _slideBackView = [[UIView alloc] init]; - _slideBackView.backgroundColor = UIColorRGBAlpha(0x000000, 0.1); - _slideBackView.layer.cornerRadius = 2; - _slideBackView.layer.masksToBounds = YES; - _slideBackView.clipsToBounds = YES; - } - return _slideBackView; -} - -- (UIView *)mainView { - if (!_mainView) { - _mainView = [[UIView alloc] init]; - _mainView.backgroundColor = [UIColor whiteColor]; - _mainView.layer.cornerRadius = 8; - _mainView.layer.masksToBounds = YES; - } - return _mainView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineListCell.h b/YuMi/Modules/YMMine/View/Cell/XPMineListCell.h deleted file mode 100644 index a07b675..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineListCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPMineListCell.h -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMineFunctionItemModel, LittleGameInfoModel; -@interface XPMineListCell : UITableViewCell -///功能 -@property (nonatomic,strong) XPMineFunctionItemModel *itemModel; --(void)setCornerWithIsTop:(BOOL)isTop isBottom:(BOOL)isBottom; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineListCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineListCell.m deleted file mode 100644 index b34f2e9..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineListCell.m +++ /dev/null @@ -1,165 +0,0 @@ -// -// XPMineListCell.m -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import "XPMineListCell.h" -#import "NetImageView.h" -#import "UIView+Corner.h" -///Model -#import "XPMineFunctionItemModel.h" -@interface XPMineListCell() - -@property (nonatomic,strong) UIView * bgView; -@property (nonatomic,strong) NetImageView *iconView; -@property (nonatomic,strong) UILabel * titleView; -@property (nonatomic,strong) UIImageView * arrowView; -@property (nonatomic,strong) UIView *lineView; -///角标 -@property (nonatomic,strong) NetImageView *badgeImageView; -@end -@implementation XPMineListCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.bgView]; - - [self.bgView addSubview:self.iconView]; - [self.bgView addSubview:self.badgeImageView]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.arrowView]; - [self.bgView addSubview:self.lineView]; - -} -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.trailing.mas_equalTo(-15); - make.top.bottom.equalTo(self.contentView); - }]; - - [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(11); - make.width.height.mas_equalTo(25); - make.centerY.equalTo(self.bgView); - }]; - [self.badgeImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.iconView.mas_top); - make.size.mas_equalTo(CGSizeMake(24, 10)); - make.leading.mas_equalTo(self.iconView.mas_centerX); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(42); - make.centerY.equalTo(self.bgView); - }]; - [self.arrowView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_offset(22); - make.height.mas_offset(22); - make.centerY.equalTo(self.bgView); - make.trailing.mas_equalTo(-10); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(0.5); - make.bottom.equalTo(self.bgView); - make.leading.mas_equalTo(15); - make.trailing.mas_equalTo(-15); - }]; -} -#pragma mark - Getters And Setters - -- (void)setItemModel:(XPMineFunctionItemModel *)itemModel { - _itemModel = itemModel; - if (_itemModel) { - self.titleView.text = _itemModel.centerName; - if([_itemModel.centerPic isEqualToString:@"mineview_set"]){ - self.iconView.image = [UIImage imageNamed:@"mineview_set"]; - }else{ - self.iconView.imageUrl = [_itemModel.centerPic stringByReplacingOccurrencesOfString:@"\n" withString:@""]; - } - self.badgeImageView.imageUrl = itemModel.centerBadge ? itemModel.centerBadge : nil; - - [self.iconView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(9); - make.width.mas_equalTo(28); - make.height.mas_equalTo(28); - make.centerY.equalTo(self.bgView); - }]; - } -} --(void)setCornerWithIsTop:(BOOL)isTop isBottom:(BOOL)isBottom{ - _bgView.layer.mask = nil; - if(isTop == YES && isBottom == YES){ - [_bgView setCornerWithLeftTopCorner:10 rightTopCorner:10 bottomLeftCorner:10 bottomRightCorner:10 size:CGSizeMake(KScreenWidth - 30, 60)]; - return; - } - if (isTop){ - [_bgView setCornerWithLeftTopCorner:10 rightTopCorner:10 bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth - 30, 60)]; - } - if(isBottom){ - [_bgView setCornerWithLeftTopCorner:0 rightTopCorner:0 bottomLeftCorner:10 bottomRightCorner:10 size:CGSizeMake(KScreenWidth - 30, 60)]; - } -} -- (UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - } - return _bgView; -} -- (NetImageView *)iconView{ - if (!_iconView){ - _iconView = [NetImageView new]; - _iconView.contentMode = UIViewContentModeScaleAspectFill; - } - return _iconView; -} - -- (UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel new]; - _titleView.font = kFontMedium(15); - _titleView.textColor = UIColorFromRGB(0x1E2531); - } - return _titleView; -} - -- (UIImageView *)arrowView{ - if (!_arrowView){ - _arrowView = [UIImageView new]; - _arrowView.image = [UIImage imageNamed:@"common_right_arrow"]; - _arrowView.contentMode = UIViewContentModeScaleAspectFit; - if (isMSRTL()) { - _arrowView.transform = CGAffineTransformMakeScale(-1.0, 1.0); - } - } - return _arrowView; -} - --(UIView *)lineView{ - if (!_lineView){ - _lineView = [UIView new]; - _lineView.backgroundColor = UIColorFromRGB(0xF7F7F7); - } - return _lineView; -} -- (NetImageView *)badgeImageView { - if (!_badgeImageView) { - _badgeImageView = [[NetImageView alloc] init]; - _badgeImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _badgeImageView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.h deleted file mode 100644 index 5119e66..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMMineNotificationTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class XPMineNotificationTableViewCell, XPMineNotificationItemModel; -@protocol XPMineNotificationTableViewCellDelegate -///开关 -- (void)xPMineNotificationTableViewCell:(XPMineNotificationTableViewCell *)cell switchStatus:(BOOL)status; - -@end -@interface XPMineNotificationTableViewCell : UITableViewCell -/** */ -@property (nonatomic,weak) id delegate; -/// -@property (nonatomic,strong) XPMineNotificationItemModel *itemModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.m deleted file mode 100644 index e7c4ca4..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.m +++ /dev/null @@ -1,106 +0,0 @@ -// -// YMMineNotificationTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "XPMineNotificationTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "XPMineNotificationItemModel.h" - -@interface XPMineNotificationTableViewCell () -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UILabel *subtitleLabel; -@property (nonatomic, strong) UISwitch *selectSwitch; -@end - -@implementation XPMineNotificationTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if (self) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self initSubviews]; - [self makeConstriants]; - } - return self; -} - -#pragma mark - event -- (void)switchDidTapped:(UISwitch *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineNotificationTableViewCell:switchStatus:)]) { - [self.delegate xPMineNotificationTableViewCell:self switchStatus:sender.on]; - } -} - -#pragma mark - private -- (void)initSubviews { - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.subtitleLabel]; - [self.contentView addSubview:self.selectSwitch]; - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; -} - -- (void)makeConstriants { - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(15); - make.top.mas_equalTo(14); - }]; - [self.subtitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - 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) { - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.centerY.mas_equalTo(self.contentView); - }]; -} - -#pragma mark - Getter && Setter - -- (void)setItemModel:(XPMineNotificationItemModel *)itemModel { - _itemModel = itemModel; - self.titleLabel.text = _itemModel.title; - self.subtitleLabel.text = _itemModel.desc; - self.selectSwitch.on = _itemModel.notification; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UILabel *)subtitleLabel { - if (!_subtitleLabel) { - _subtitleLabel = [[UILabel alloc] init]; - _subtitleLabel.font = [UIFont systemFontOfSize:12]; - _subtitleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _subtitleLabel.numberOfLines = 2; - } - return _subtitleLabel; -} - -- (UISwitch *)selectSwitch { - if (_selectSwitch == nil) { - _selectSwitch = [[UISwitch alloc] init]; - _selectSwitch.onTintColor = [DJDKMIMOMColor appMainColor]; - _selectSwitch.tintColor = [DJDKMIMOMColor disableButtonColor]; - _selectSwitch.backgroundColor = [UIColor clearColor]; - _selectSwitch.layer.cornerRadius = CGRectGetHeight(_selectSwitch.frame)/2.0; - _selectSwitch.layer.masksToBounds = YES; - [_selectSwitch addTarget:self action:@selector(switchDidTapped:) forControlEvents:UIControlEventValueChanged]; - } - return _selectSwitch; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.h b/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.h deleted file mode 100644 index 3c858f6..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPMinePersonalCenterCell.h -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -typedef void (^XPMinePersonalCenterCellAction)(int type);//type,0,我的房间，1，收益记录,2，转赠钻石 - -@interface XPMinePersonalCenterCell : UITableViewCell -@property(nonatomic,copy)XPMinePersonalCenterCellAction clickAction; -///是否有转赠钻石 -@property (nonatomic,assign) BOOL isHaveGiveDiamond; -@end - - - -@interface XPMinePersonalCenterItemView : UIView -///是否有转赠钻石 -@property (nonatomic,assign) BOOL isHaveGiveDiamond; --(void)setTitle:(NSString *)title; --(void)setImage:(NSString *)imageName; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.m b/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.m deleted file mode 100644 index 0303b80..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.m +++ /dev/null @@ -1,237 +0,0 @@ -// -// XPMinePersonalCenterCell.m -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import "XPMinePersonalCenterCell.h" -@interface XPMinePersonalCenterCell() - -///背景 -@property (nonatomic,strong) UIView *bgView; -/// 标题 -@property (nonatomic,strong) UILabel *titleView; -///我的房间 -@property (nonatomic,strong) XPMinePersonalCenterItemView *myRoomView; - -///赠送钻石 -@property (nonatomic,strong) XPMinePersonalCenterItemView *giveDiamondView; - - - -@end - -@implementation XPMinePersonalCenterCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.bgView]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.myRoomView]; - - [self.bgView addSubview:self.giveDiamondView]; - self.giveDiamondView.hidden = YES; -} -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.trailing.mas_offset(-15); - make.top.bottom.equalTo(self.contentView); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(12); - make.top.mas_equalTo(14); - }]; - - [self.myRoomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(35); - make.width.mas_greaterThanOrEqualTo(104); - make.height.equalTo(@38); - make.top.mas_equalTo(44); - }]; - - [self.giveDiamondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.height.width.equalTo(self.myRoomView); - make.trailing.mas_equalTo(-kGetScaleWidth(35)); - }]; -} --(void)setIsHaveGiveDiamond:(BOOL)isHaveGiveDiamond{ - _isHaveGiveDiamond = isHaveGiveDiamond; - self.myRoomView.isHaveGiveDiamond = _isHaveGiveDiamond; - self.giveDiamondView.isHaveGiveDiamond = _isHaveGiveDiamond; - self.giveDiamondView.hidden = !_isHaveGiveDiamond; - - - - -} --(void)clickMyRoomAction{ - if (self.clickAction){ - self.clickAction(0); - } -} --(void)clickEarningsRecordAction{ - if (self.clickAction){ - self.clickAction(1); - } -} --(void)clickGiveDiamondAction{ - if (self.clickAction){ - self.clickAction(2); - } -} -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - _bgView.layer.cornerRadius = 10; - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} --(UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel new]; - _titleView.textColor = UIColorFromRGB(0x1F1A4E); - _titleView.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _titleView.text = YMLocalizedString(@"XPMinePersonalCenterCell0"); - } - - return _titleView; -} -- (XPMinePersonalCenterItemView *)myRoomView{ - if(!_myRoomView){ - _myRoomView = [[XPMinePersonalCenterItemView alloc]initWithFrame:CGRectZero]; - [_myRoomView setTitle:YMLocalizedString(@"XPMinePersonalCenterCell1")]; - [_myRoomView setImage:@"mine_personal_centermy_room"]; - UITapGestureRecognizer *myRoomViewTap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickMyRoomAction)]; - [_myRoomView addGestureRecognizer:myRoomViewTap]; - return _myRoomView; - } - return _myRoomView; -} - -- (XPMinePersonalCenterItemView *)giveDiamondView{ - if (!_giveDiamondView){ - _giveDiamondView = [[XPMinePersonalCenterItemView alloc]initWithFrame:CGRectZero]; - [_giveDiamondView setTitle:YMLocalizedString(@"XPMinePersonalCenterCell3")]; - [_giveDiamondView setImage:@"mine_me_give"]; - UITapGestureRecognizer *earningsRecordTap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickGiveDiamondAction)]; - [_giveDiamondView addGestureRecognizer:earningsRecordTap]; - } - return _giveDiamondView; -} - -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -@end - - - -/***************************************************************华丽分割线****************************************************************************/ - -@interface XPMinePersonalCenterItemView() -@property (nonatomic,strong) UIImageView *iconView; -@property (nonatomic,strong) UILabel* titleVeiw; - -@end - - -@implementation XPMinePersonalCenterItemView - - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.iconView]; - [self addSubview:self.titleVeiw]; -} -- (void)initSubViewConstraints { - [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(38); - make.leading.mas_equalTo(0); - make.top.equalTo(self); - }]; - [self.titleVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(48); - make.top.equalTo(self.iconView.mas_top).mas_offset(9); - make.trailing.equalTo(self); - }]; -} --(void)setTitle:(NSString *)title{ - self.titleVeiw.text = title; - -} --(void)setIsHaveGiveDiamond:(BOOL)isHaveGiveDiamond{ - _isHaveGiveDiamond = isHaveGiveDiamond; - - if(_isHaveGiveDiamond){ - [self.titleVeiw mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.top.equalTo(self.iconView.mas_top).mas_offset(48); - }]; - CGFloat left = (((KScreenWidth - 30) / 3) - 38) / 2; - [self.iconView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(left); - }]; - _titleVeiw.textAlignment = NSTextAlignmentCenter; - return; - } - [self.titleVeiw mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(48); - make.top.equalTo(self.iconView.mas_top).mas_offset(9); - }]; - [self.iconView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - }]; - _titleVeiw.textAlignment = NSTextAlignmentLeft; - -} --(void)setImage:(NSString *)imageName{ - self.iconView.image = [UIImage imageNamed:imageName]; -} --(UIImageView *)iconView{ - if(!_iconView){ - _iconView = [UIImageView new]; - _iconView.userInteractionEnabled = YES; - } - return _iconView; -} --(UILabel *)titleVeiw{ - if(!_titleVeiw){ - _titleVeiw = [UILabel new]; - _titleVeiw.font = [UIFont systemFontOfSize:15 weight:UIFontWeightRegular]; - _titleVeiw.textColor = UIColorFromRGB(0x1F1A4E); - - } - return _titleVeiw; -} -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.h b/YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.h deleted file mode 100644 index 0cae7ff..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMMineSettingTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMineSettingItemModel; -@interface XPMineSettingTableViewCell : UITableViewCell -///数据源 -@property (nonatomic,strong) XPMineSettingItemModel *itemModel; - -- (void)setTopCorner:(BOOL)setTop bottomCorner:(BOOL)setBottom; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.m deleted file mode 100644 index fb062c1..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.m +++ /dev/null @@ -1,138 +0,0 @@ -// -// YMMineSettingTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "XPMineSettingTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "XPMineSettingItemModel.h" - -@interface XPMineSettingTableViewCell () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///副标题 -@property (nonatomic,strong) UILabel *subTitleLabel; -///箭头 -@property (nonatomic,strong) UIImageView *arrowImageView; - -@property(nonatomic, strong) UIView *line; - -@end - -@implementation XPMineSettingTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.contentView.backgroundColor = UIColorFromRGB(0xf2f3f7); - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.titleLabel]; - [self.stackView addArrangedSubview:self.subTitleLabel]; - [self.stackView addArrangedSubview:self.arrowImageView]; - - [self.contentView addSubview:self.line]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.bottom.mas_equalTo(self.contentView); - }]; - - [self.line mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.height.mas_equalTo(0.5); - make.bottom.mas_equalTo(self.contentView); - }]; -} - -- (void)setTopCorner:(BOOL)setTop bottomCorner:(BOOL)setBottom { - self.line.hidden = NO; - if (setTop) { - [self setCornerRadius:8 corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner]; - } else if (setBottom) { - self.line.hidden = YES; - [self setCornerRadius:8 corners:kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner]; - } else { - [self setCornerRadius:0 corners:kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner | kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner]; - } -} - -#pragma mark - Getters And Setters -- (void)setItemModel:(XPMineSettingItemModel *)itemModel { - _itemModel = itemModel; - self.titleLabel.text = _itemModel.title; - self.subTitleLabel.text = _itemModel.subTitle; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 10; - } - return _stackView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = kFontRegular(14); - _titleLabel.textColor = UIColorFromRGB(0x313131); - [_titleLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - _titleLabel.adjustsFontSizeToFitWidth = YES; - _titleLabel.numberOfLines = 0; - } - return _titleLabel; -} -- (UILabel *)subTitleLabel { - if (!_subTitleLabel) { - _subTitleLabel = [[UILabel alloc] init]; - _subTitleLabel.font = kFontRegular(14); - _subTitleLabel.textColor = UIColorFromRGB(0x7b7b7d); - _subTitleLabel.textAlignment = NSTextAlignmentRight; - } - return _subTitleLabel; -} - -- (UIImageView *)arrowImageView { - if (!_arrowImageView) { - _arrowImageView = [[UIImageView alloc] init]; - _arrowImageView.userInteractionEnabled = YES; - _arrowImageView.image = [[UIImage imageNamed:@"mine_item_arrow"]ms_SetImageForRTL]; - [_arrowImageView setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; - [_arrowImageView setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _arrowImageView; -} - - -- (UIView *)line { - if (!_line) { - _line = [[UIView alloc] init]; - _line.backgroundColor = UIColorFromRGB(0xe4e4e4); - } - return _line; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineSwitchLanguageCell.h b/YuMi/Modules/YMMine/View/Cell/XPMineSwitchLanguageCell.h deleted file mode 100644 index 6b66e17..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineSwitchLanguageCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineSwitchLanguageCell.h -// YuMi -// -// Created by duoban on 2024/4/9. -// - -#import -#import "XPMineSettingItemModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineSwitchLanguageCell : UITableViewCell -@property(nonatomic,strong) XPMineSettingItemModel * model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineSwitchLanguageCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineSwitchLanguageCell.m deleted file mode 100644 index 842c1cb..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineSwitchLanguageCell.m +++ /dev/null @@ -1,84 +0,0 @@ -// -// XPMineSwitchLanguageCell.m -// YuMi -// -// Created by duoban on 2024/4/9. -// - -#import "XPMineSwitchLanguageCell.h" -@interface XPMineSwitchLanguageCell() -@property(nonatomic,strong) UILabel *textView; -@property(nonatomic,strong) UIView *lineView; -@property(nonatomic,strong) UIImageView *chooseView; -@end -@implementation XPMineSwitchLanguageCell --(instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{ - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} - --(void)installUI{ - self.contentView.backgroundColor = [UIColor whiteColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.textView]; - [self.contentView addSubview:self.lineView]; - [self.contentView addSubview:self.chooseView]; -} --(void)installConstraints{ - [self.textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(16)); - make.centerY.equalTo(self.contentView); - }]; - [self.chooseView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(16)); - make.trailing.mas_equalTo(-kGetScaleWidth(16)); - make.centerY.equalTo(self.contentView); - }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(0.5); - make.bottom.mas_equalTo(-kGetScaleWidth(0)); - make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(20)); - }]; -} -- (void)setModel:(XPMineSettingItemModel *)model{ - _model = model; - _chooseView.hidden = !_model.isChoose; - _textView.text = _model.title; -} -#pragma mark - 懒加载 -- (UILabel *)textView{ - if(!_textView){ - _textView = [UILabel labelInitWithText:@"" font:kFontRegular(16) textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _textView; -} -- (UIView *)lineView{ - if(!_lineView){ - _lineView = [UIView new]; - _lineView.backgroundColor = UIColorFromRGB(0xEBEEF5); - } - return _lineView; -} -- (UIImageView *)chooseView{ - if(!_chooseView){ - _chooseView = [UIImageView new]; - _chooseView.image = kImage(@"pi_mine_set_language_choose") ; - } - return _chooseView; -} -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -@end diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineTheGuildCell.h b/YuMi/Modules/YMMine/View/Cell/XPMineTheGuildCell.h deleted file mode 100644 index b40f255..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineTheGuildCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPMineTheGuildCell.h -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import -#import "ClanDetailInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineTheGuildCell : UITableViewCell -@property (nonatomic,strong) ClanDetailMainInfoModel *clanInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineTheGuildCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineTheGuildCell.m deleted file mode 100644 index d819bc2..0000000 --- a/YuMi/Modules/YMMine/View/Cell/XPMineTheGuildCell.m +++ /dev/null @@ -1,160 +0,0 @@ -// -// XPMineTheGuildCell.m -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import "XPMineTheGuildCell.h" -#import "NetImageView.h" -#import "UIView+Corner.h" -@interface XPMineTheGuildCell() -/// 渐变色背景 -@property (nonatomic,strong) UIImageView *bgImageView; - -/// 左边logo图 -@property (nonatomic,strong) UIImageView *leftIconView; -/// 左边头像 -@property (nonatomic,strong) NetImageView *headIconView; -/// 显示标题 -@property (nonatomic,strong) UILabel *titleView; - -/// 右边点击buttom -@property (nonatomic,strong) UIButton *rightIconBtn; - -@end - - -@implementation XPMineTheGuildCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.headIconView]; - [self.bgImageView addSubview:self.leftIconView]; - [self.bgImageView addSubview:self.titleView]; - [self.bgImageView addSubview:self.rightIconBtn]; -} -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-15); - make.leading.mas_equalTo(15); - make.top.height.equalTo(self.contentView); - }]; - [self.headIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(18); - make.width.height.mas_equalTo(29); - make.centerY.equalTo(self.bgImageView); - }]; - [self.leftIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(17); - make.width.mas_equalTo(30.76); - make.height.mas_equalTo(30); - make.centerY.equalTo(self.bgImageView); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(60); - make.centerY.equalTo(self.bgImageView); - }]; - [self.rightIconBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-18); - make.width.height.mas_equalTo(28); - make.centerY.equalTo(self.bgImageView); - }]; -} - --(void)setClanInfo:(ClanDetailMainInfoModel *)clanInfo{ - _clanInfo = clanInfo; - if([_clanInfo.clanMode isEqualToString: @"clan_hall"]){ - if(_clanInfo.clan.hall.ownerUid > 0 || _clanInfo.clan.clan.elderUid > 0){ - _titleView.text = YMLocalizedString(@"XPMineTheGuildCell0"); - _leftIconView.hidden = YES; - _rightIconBtn.selected = YES; - _headIconView.hidden = NO; - NSString *imageUrl = @""; - if (_clanInfo.clan.clan.elderUid > 0){ - imageUrl = _clanInfo.clan.clan.avatar; - }else{ - if(_clanInfo.clan.hall.ownerUid > 0){ - imageUrl = _clanInfo.clan.hall.ownerAvatar; - } - } - _headIconView.imageUrl = imageUrl; - } - return; - } - - if(_clanInfo.family.familyId){ - _titleView.text = YMLocalizedString(@"XPMineTheGuildCell0"); - _leftIconView.hidden = YES; - _rightIconBtn.selected = YES; - _headIconView.hidden = NO; - _headIconView.imageUrl = _clanInfo.family.ownerAvatar; - } - -} - -#pragma mark -懒加载 - -- (UIImageView *)bgImageView{ - if (!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.userInteractionEnabled = YES; - _bgImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x2C2825),UIColorFromRGB(0x4E433D)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 30, 44)]; - [_bgImageView setCornerWithLeftTopCorner:8 rightTopCorner:8 bottomLeftCorner:8 bottomRightCorner:8 size:CGSizeMake(KScreenWidth - 30, 44)]; - } - return _bgImageView; -} --(NetImageView *)headIconView{ - if(!_headIconView){ - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _headIconView = [[NetImageView alloc] initWithConfig:config]; - _headIconView.layer.cornerRadius = 14.5; - _headIconView.layer.masksToBounds = YES; - _headIconView.hidden = YES; - _headIconView.layer.borderWidth = 1; - _headIconView.layer.borderColor = UIColorFromRGB(0xF7C8A9).CGColor; - } - return _headIconView; -} --(UIImageView *)leftIconView{ - if (!_leftIconView){ - _leftIconView = [UIImageView new]; - _leftIconView.image = [UIImage imageNamed:@"mine_guild_my_icon"]; - } - return _leftIconView; -} -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel new]; - _titleView.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:15]; - _titleView.text = YMLocalizedString(@"XPMineTheGuildCell1"); - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xF9CFB3),(id)UIColorFromRGB(0xEEA473)] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(100, 30)]; - _titleView.textColor = [UIColor colorWithPatternImage:image]; - } - return _titleView; -} --(UIButton *)rightIconBtn{ - if(!_rightIconBtn){ - _rightIconBtn = [UIButton new]; - [_rightIconBtn setBackgroundImage:[UIImage imageNamed:@"mine_guild_add"] forState:UIControlStateNormal]; - [_rightIconBtn setBackgroundImage:[[UIImage imageNamed:@"mine_guild_right_arrow"]ms_SetImageForRTL] forState:UIControlStateSelected]; - _rightIconBtn.selected = NO; - _rightIconBtn.userInteractionEnabled = NO; - } - return _rightIconBtn; -} -@end diff --git a/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomCell.h b/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomCell.h deleted file mode 100644 index 8bf9a40..0000000 --- a/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMMineCollectRoomCell.h -// YUMI -// -// Created by YUMI on 2022/10/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class HomeCollectRoomModel; -@interface XPMineCollectRoomCell : UITableViewCell - -@property (nonatomic,strong) HomeCollectRoomModel *roomInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomCell.m b/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomCell.m deleted file mode 100644 index 4f08849..0000000 --- a/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomCell.m +++ /dev/null @@ -1,126 +0,0 @@ -// -// YMMineCollectRoomCell.m -// YUMI -// -// Created by YUMI on 2022/10/12. -// - -#import "XPMineCollectRoomCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "HomeCollectRoomModel.h" - -@interface XPMineCollectRoomCell () - -///显示头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///显示名字 -@property (nonatomic,strong) UILabel *nickLabel; -///显示id -@property (nonatomic,strong) UILabel *idLabel; -///分割线 -@property (nonatomic, strong) UIView *devideView; - -@end - -@implementation XPMineCollectRoomCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.idLabel]; - [self.contentView addSubview:self.devideView]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(44, 44)); - make.leading.mas_equalTo(self.contentView).offset(15); - make.centerY.mas_equalTo(self.contentView); - }]; - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(7); - make.top.mas_equalTo(self.avatarImageView).offset(2); - make.trailing.mas_equalTo(-15); - make.height.mas_equalTo(14); - }]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nickLabel.mas_bottom).mas_offset(8); - make.leading.mas_equalTo(self.nickLabel); - make.height.mas_equalTo(14); - }]; - - [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.height.mas_equalTo(0.5); - make.trailing.bottom.mas_equalTo(0); - }]; - -} - -#pragma mark - Getters And Setters -- (void)setRoomInfo:(HomeCollectRoomModel *)roomInfo { - _roomInfo = roomInfo; - if (_roomInfo) { - self.avatarImageView.imageUrl = _roomInfo.roomAvatar; - self.nickLabel.text = _roomInfo.roomName; - self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _roomInfo.erbanNo]; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 22; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:14]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:12]; - _idLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _idLabel; -} - -- (UIView *)devideView { - if (!_devideView) { - _devideView = [[UIView alloc] init]; - _devideView.backgroundColor = UIColorFromRGB(0xEAEAF1); - } - return _devideView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomEditCell.h b/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomEditCell.h deleted file mode 100644 index 37b7c84..0000000 --- a/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomEditCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMMineCollectRoomEditCell.h -// YUMI -// -// Created by YUMI on 2022/10/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class HomeCollectRoomModel; -@interface XPMineCollectRoomEditCell : UITableViewCell -@property (nonatomic,strong) HomeCollectRoomModel *roomInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomEditCell.m b/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomEditCell.m deleted file mode 100644 index 6061deb..0000000 --- a/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomEditCell.m +++ /dev/null @@ -1,145 +0,0 @@ -// -// YMMineCollectRoomEditCell.m -// YUMI -// -// Created by YUMI on 2022/10/11. -// - -#import "XPMineCollectRoomEditCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "HomeCollectRoomModel.h" - -@interface XPMineCollectRoomEditCell () - -///显示头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///显示名字 -@property (nonatomic,strong) UILabel *nickLabel; -///显示id -@property (nonatomic,strong) UILabel *idLabel; -///选中按钮 -@property (nonatomic, strong) UIButton *selectBtn; -///分割线 -@property (nonatomic, strong) UIView *devideView; - -@end - -@implementation XPMineCollectRoomEditCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.idLabel]; - [self.contentView addSubview:self.devideView]; - [self.contentView addSubview:self.selectBtn]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(44, 44)); - make.leading.mas_equalTo(self.selectBtn.mas_trailing).offset(15); - make.centerY.mas_equalTo(self.contentView); - }]; - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(7); - make.top.mas_equalTo(self.avatarImageView).offset(2); - make.trailing.mas_equalTo(-15); - make.height.mas_equalTo(14); - }]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nickLabel.mas_bottom).mas_offset(8); - make.leading.mas_equalTo(self.nickLabel); - make.height.mas_equalTo(14); - }]; - - [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.height.mas_equalTo(0.5); - make.trailing.bottom.mas_equalTo(0); - }]; - - [self.selectBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20, 20)); - make.leading.mas_equalTo(15); - make.centerY.mas_equalTo(self.contentView); - }]; -} - -#pragma mark - Getters And Setters -- (void)setRoomInfo:(HomeCollectRoomModel *)roomInfo { - _roomInfo = roomInfo; - if (_roomInfo) { - self.avatarImageView.imageUrl = _roomInfo.roomAvatar; - self.nickLabel.text = _roomInfo.roomName; - self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _roomInfo.erbanNo]; - self.selectBtn.selected = roomInfo.isSelected; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 22; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:14]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:12]; - _idLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _idLabel; -} - -- (UIButton *)selectBtn { - if (!_selectBtn) { - _selectBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_selectBtn setImage:[UIImage imageNamed:@"collect_room_edit_normal"] forState:UIControlStateNormal]; - [_selectBtn setImage:[UIImage imageNamed:@"collect_room_edit_selected"] forState:UIControlStateSelected]; - _selectBtn.userInteractionEnabled = NO; - } - return _selectBtn; -} - -- (UIView *)devideView { - if (!_devideView) { - _devideView = [[UIView alloc] init]; - _devideView.backgroundColor = UIColorFromRGB(0xEAEAF1); - } - return _devideView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/CollectRoom/XPMineCollectPartyRoomViewController.h b/YuMi/Modules/YMMine/View/CollectRoom/XPMineCollectPartyRoomViewController.h deleted file mode 100644 index cc040d5..0000000 --- a/YuMi/Modules/YMMine/View/CollectRoom/XPMineCollectPartyRoomViewController.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// YMMineCollectPartyRoomViewController.h -// YUMI -// -// Created by YUMI on 2022/10/11. -// - -#import "MvpViewController.h" -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, MineCollectRoomType) { - MineCollectRoomTypeParty, - MineCollectRoomTypeAnchor -}; - -@protocol XPMineCollectPartyRoomViewControllerDelegate - -///是否全选 -- (void)xPMineCollectPartyRoomViewControllerSelectAll:(BOOL)selectAll; - -@end - -@interface XPMineCollectPartyRoomViewController : MvpViewController - -@property (nonatomic, weak) id delegate; - -@property (nonatomic, assign) MineCollectRoomType type; -///数据源 -@property (nonatomic,strong, readonly) NSMutableArray *datasource; -///是否为编辑模式 -@property (nonatomic, assign) BOOL isEdit; -///是否选中所有 -@property (nonatomic, assign) BOOL isSelectAll; -///刷新数据 -- (void)headerRefresh; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/CollectRoom/XPMineCollectPartyRoomViewController.m b/YuMi/Modules/YMMine/View/CollectRoom/XPMineCollectPartyRoomViewController.m deleted file mode 100644 index 7149f85..0000000 --- a/YuMi/Modules/YMMine/View/CollectRoom/XPMineCollectPartyRoomViewController.m +++ /dev/null @@ -1,237 +0,0 @@ -// -// YMMineCollectPartyRoomViewController.m -// YUMI -// -// Created by YUMI on 2022/10/11. -// - -#import "XPMineCollectPartyRoomViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///Model -#import "HomeCollectRoomModel.h" -///P -#import "XPMineCollectRoomListPresenter.h" -#import "XPMineCollectRoomListProtocol.h" -///View -#import "XPMineCollectRoomCell.h" -#import "XPMineVisitorEmptyTableViewCell.h" -#import "XPMineCollectRoomEditCell.h" -///VC -#import "XPRoomViewController.h" - -@interface XPMineCollectPartyRoomViewController () - -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前页数 -@property (nonatomic,assign) int page; -///更多数据 -@property (nonatomic,assign) BOOL hasNoMoreData; - -@end - -@implementation XPMineCollectPartyRoomViewController - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} - -- (XPMineCollectRoomListPresenter *)createPresenter { - return [[XPMineCollectRoomListPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - self.page = 1; - [self.presenter getCollectRoomList:self.page pageSize:20 state:0 type:self.type == MineCollectRoomTypeParty ? @"1" : @"4"]; -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMineCollectPartyRoomViewController0")]; - return; - } - self.page++; - [self.presenter getCollectRoomList:self.page pageSize:20 state:1 type:self.type == MineCollectRoomTypeParty ? @"1" : @"4"]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineCollectPartyRoomViewController1"); - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - XPMineCollectRoomListProtocol -///获取访客列表成功 -- (void)onGetCollectRoomListSuccess:(NSArray *)array state:(int)state { - if (state == 0) { - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } - [self.tableView.mj_footer endRefreshing]; - if (array.count > 0) { - self.hasNoMoreData = NO; - [self.datasource addObjectsFromArray:array]; - } else { - self.hasNoMoreData = YES; - [self.tableView.mj_footer endRefreshingWithNoMoreData]; - } - [self.tableView reloadData]; -} - -///获取访客列表失败 -- (void)getCollectRoomListFail:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - if (self.isEdit) { - XPMineCollectRoomEditCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineCollectRoomEditCell class])]; - if (cell == nil) { - cell = [[XPMineCollectRoomEditCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineCollectRoomEditCell class])]; - } - cell.roomInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } else { - XPMineCollectRoomCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineCollectRoomCell class])]; - if (cell == nil) { - cell = [[XPMineCollectRoomCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineCollectRoomCell class])]; - } - cell.roomInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } - } - - XPMineVisitorEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineVisitorEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - } - cell.emptyTitle = YMLocalizedString(@"XPMineCollectPartyRoomViewController2"); - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 68; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - HomeCollectRoomModel * roomInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (self.isEdit) { - roomInfo.isSelected = !roomInfo.isSelected; - [tableView reloadData]; - BOOL selectAll = YES; - for (HomeCollectRoomModel *item in self.datasource) { - if (!item.isSelected) { - selectAll = NO; - break; - } - } - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineCollectPartyRoomViewControllerSelectAll:)]) { - [self.delegate xPMineCollectPartyRoomViewControllerSelectAll:selectAll]; - } - } else { - if (roomInfo.roomUid.integerValue > 0) { - [XPRoomViewController openRoom:roomInfo.roomUid viewController:self]; - } - } -} - -- (void)setIsEdit:(BOOL)isEdit { - _isEdit = isEdit; - for (HomeCollectRoomModel *model in self.datasource) { - model.isSelected = NO; - } - [self.tableView reloadData]; -} - -- (void)setIsSelectAll:(BOOL)isSelectAll { - _isSelectAll = isSelectAll; - if (isSelectAll) { - for (HomeCollectRoomModel *model in self.datasource) { - model.isSelected = YES; - } - } else { - for (HomeCollectRoomModel *model in self.datasource) { - model.isSelected = NO; - } - } - [self.tableView reloadData]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - _tableView.contentInset = UIEdgeInsetsMake(8, 0, 0, 0); - [_tableView registerClass:[XPMineVisitorEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - [_tableView registerClass:[XPMineCollectRoomCell class] forCellReuseIdentifier:NSStringFromClass([XPMineCollectRoomCell class])]; - [_tableView registerClass:[XPMineCollectRoomEditCell class] forCellReuseIdentifier:NSStringFromClass([XPMineCollectRoomEditCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.h b/YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.h deleted file mode 100644 index bd62652..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.h +++ /dev/null @@ -1,110 +0,0 @@ -// -// Api+DressUp.h -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (DressUp) -/// 获取头饰列表 -/// @param completion 完成 -/// @param ticket ticket -/// @param uid uid -+ (void)headwearList:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid; - -/// 获取座驾列表 -/// @param completion 完成 -/// @param ticket ticket -/// @param uid uid -+ (void)carList:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid; - -/// 获取铭牌列表 -/// @param completion 完成 -/// @param ticket ticket -/// @param uid uid -+ (void)nameplateList:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize; - -/// 获取用户VIP资料卡 -/// @param completion 完成 -/// @param ticket ticket -/// @param uid uid -+ (void)nobleCardList:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize; - -/// 获取用户公屏气泡 -/// @param completion 完成 -/// @param page 分页 -/// @param pageSize 页数 -+ (void)chatBubbleList:(HttpRequestHelperCompletion)completion page:(NSString *)page pageSize:(NSString *)pageSize; - -/// 使用头饰 -/// @param completion 完成 -/// @param headwearId 头饰id 0 取消使用头饰 -/// @param ticket ticket -/// @param uid uid -+ (void)useHeadWear:(HttpRequestHelperCompletion)completion headwearId:(NSString *)headwearId ticket:(NSString *)ticket uid:(NSString *)uid; - -/// 使用座驾 -/// @param completion 完成 -/// @param carId 座驾id 0 取消使用座驾 -/// @param ticket ticket -/// @param uid uid -+ (void)useCar:(HttpRequestHelperCompletion)completion carId:(NSString *)carId ticket:(NSString *)ticket uid:(NSString *)uid; - -/// 使用铭牌 -/// @param completion 完成 -/// @param userNameplateId 座驾id 0 取消使用座驾 -/// @param ticket ticket -/// @param uid uid -+ (void)useNameplate:(HttpRequestHelperCompletion)completion userNameplateId:(NSString *)userNameplateId ticket:(NSString *)ticket uid:(NSString *)uid; - -/// 使用VIP资料卡 -/// @param completion 完成 -/// @param cardId 资料卡idd 0 取消使用 -/// @param ticket ticket -/// @param uid uid -+ (void)useNobleCard:(HttpRequestHelperCompletion)completion cardId:(NSString *)cardId ticket:(NSString *)ticket uid:(NSString *)uid; - -/// 使用气泡 -/// @param completion 完成 -/// @param bubbleId 气泡id -+ (void)useBubble:(HttpRequestHelperCompletion)completion bubbleId:(NSString *)bubbleId; - -/// 活动 -/// @param completion 完成 -/// @param type 类型 2 房间的 1 首页的 3 我的装扮 -+ (void)dressUpBannerList:(HttpRequestHelperCompletion)completion type:(NSString *)type; - - -#pragma mark - 装扮商城 -/// 获取装扮商城列表 -/// @param completion 完成 -/// @param dressType 装扮类型 -+ (void)requestDressUpShopList:(HttpRequestHelperCompletion)completion dressType:(NSString *)dressType; - -/// 购买装扮 -/// @param completion 完成 -/// @param dressId 装扮id -+ (void)requestDressUpShopBuy:(HttpRequestHelperCompletion)completion id:(NSString *)dressId; - -/// 赠送装扮 -/// @param completion 完成 -/// @param dressId 装扮ID -/// @param targetUid 目标用户UID -+ (void)requestSendDress:(HttpRequestHelperCompletion)completion id:(NSString *)dressId targetUid:(NSString *)targetUid; - -/// 获取我的装扮内容 -/// @param completion 完成回掉 -/// @param page 分页 -/// @param pageSize 分页大小 -/// @param dressType 装扮类型，目前只支持 0 & 5 -+ (void)mineDressItems:(HttpRequestHelperCompletion)completion page:(NSString *)page pageSize:(NSString *)pageSize dressType:(NSString *)dressType; - -+ (void)optDress:(HttpRequestHelperCompletion)completion dressType:(NSString *)dressType dressId:(NSString *)dressId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.m b/YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.m deleted file mode 100644 index e8ad53c..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.m +++ /dev/null @@ -1,156 +0,0 @@ -// -// Api+DressUp.m -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import "Api+DressUp.h" -#import -@implementation Api (DressUp) - -/// 获取头饰列表 -/// @param completion 完成 -/// @param ticket ticket -/// @param uid uid -+ (void)headwearList:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"aGVhZHdlYXIvdjIvdXNlci9saXN0"];///headwear/v2/user/list - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, ticket, uid, nil]; -} - -/// 获取座驾列表 -/// @param completion 完成 -/// @param ticket ticket -/// @param uid uid -+ (void)carList:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"Y2FyL2NhcnBvcnQvdjIvbGlzdA=="];///car/carport/v2/list - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, ticket, uid, nil]; -} - -/// 获取铭牌列表 -/// @param completion 完成 -/// @param ticket ticket -/// @param uid uid -+ (void)nameplateList:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize { - NSString * fang = [NSString stringFromBase64String:@"bmFtZXBsYXRlL3VzZXJOYW1lcGxhdGVMaXN0"];///nameplate/userNameplateList - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, ticket, uid, page, pageSize, nil]; -} - - -/// 获取用户VIP资料卡 -/// @param completion 完成 -/// @param ticket ticket -/// @param uid uid -+ (void)nobleCardList:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize { - NSString * fang = [NSString stringFromBase64String:@"dXNlckluZm9DYXJkL2xpc3RCeVBhZ2U="];///userInfoCard/listByPage - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, ticket, uid, page, pageSize, nil]; -} - -/// 获取用户公屏气泡 -/// @param completion 完成 -/// @param page 分页 -/// @param pageSize 页数 -+ (void)chatBubbleList:(HttpRequestHelperCompletion)completion page:(NSString *)page pageSize:(NSString *)pageSize { - NSString * fang = [NSString stringFromBase64String:@"dXNlckNoYXRCdWJibGUvbGlzdEJ5UGFnZQ=="];///userChatBubble/listByPage - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, page, pageSize, nil]; -} - -/// 使用头饰 -/// @param completion 完成 -/// @param headwearId 头饰id 0 取消使用头饰 -/// @param ticket ticket -/// @param uid uid -+ (void)useHeadWear:(HttpRequestHelperCompletion)completion headwearId:(NSString *)headwearId ticket:(NSString *)ticket uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"djEvdXNlci9oZWFkd2Vhci91c2U="];///v1/user/headwear/use - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, headwearId, ticket, uid, nil]; -} - -/// 使用座驾 -/// @param completion 完成 -/// @param carId 座驾id 0 取消使用座驾 -/// @param ticket ticket -/// @param uid uid -+ (void)useCar:(HttpRequestHelperCompletion)completion carId:(NSString *)carId ticket:(NSString *)ticket uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"Y2FyL2NhcnBvcnQvdXNl"];///car/carport/use - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, carId, ticket, uid, nil]; -} - -/// 使用铭牌 -/// @param completion 完成 -/// @param userNameplateId 座驾id 0 取消使用座驾 -/// @param ticket ticket -/// @param uid uid -+ (void)useNameplate:(HttpRequestHelperCompletion)completion userNameplateId:(NSString *)userNameplateId ticket:(NSString *)ticket uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"bmFtZXBsYXRlL3VzZU5hbWVwbGF0ZQ=="];///nameplate/useNameplate - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, userNameplateId, ticket, uid, nil]; -} - -/// 使用VIP资料卡 -/// @param completion 完成 -/// @param cardId 资料卡id 0 取消使用VIP资料卡 -/// @param ticket ticket -/// @param uid uid -+ (void)useNobleCard:(HttpRequestHelperCompletion)completion cardId:(NSString *)cardId ticket:(NSString *)ticket uid:(NSString *)uid { - if ([cardId isEqualToString:@"0"]) { - cardId = NULL; - } - NSString * fang = [NSString stringFromBase64String:@"dXNlckluZm9DYXJkL29wdFVzZXJJbmZvQ2FyZA=="];///userInfoCard/optUserInfoCard - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, cardId, ticket, uid, nil]; -} - -/// 使用气泡 -/// @param completion 完成 -/// @param bubbleId 气泡id -+ (void)useBubble:(HttpRequestHelperCompletion)completion bubbleId:(NSString *)bubbleId { - if ([bubbleId isEqualToString:@"0"]) { - bubbleId = NULL; - } - NSString * fang = [NSString stringFromBase64String:@"dXNlckNoYXRCdWJibGUvb3B0VXNlckNoYXRCdWJibGU="];///userChatBubble/optUserChatBubble - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, bubbleId, nil]; -} - -/// 活动 -/// @param completion 完成 -/// @param type 类型 2 房间的 1 首页的 3 我的装扮 -+ (void)dressUpBannerList:(HttpRequestHelperCompletion)completion type:(NSString *)type { - NSString * fang = [NSString stringFromBase64String:@"aG9tZS9iYW5uZXI="];/// home/banner - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, type, nil]; -} - -#pragma mark - 装扮商城 -/// 获取装扮商城列表 -/// @param completion 完成 -/// @param dressType 装扮类型 -+ (void)requestDressUpShopList:(HttpRequestHelperCompletion)completion dressType:(NSString *)dressType { - NSString * fang = [NSString stringFromBase64String:@"ZHJlc3Mvc2hvcC9saXN0"];///dress/shop/list - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, dressType, nil]; -} - -/// 购买装扮 -/// @param completion 完成 -/// @param dressId 装扮id -+ (void)requestDressUpShopBuy:(HttpRequestHelperCompletion)completion id:(NSString *)dressId { - NSString * fang = [NSString stringFromBase64String:@"ZHJlc3Mvc2hvcC9idXk="];///dress/shop/buy - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, dressId, nil]; -} - -/// 赠送装扮 -/// @param completion 完成 -/// @param dressId 装扮ID -/// @param targetUid 目标用户UID -+ (void)requestSendDress:(HttpRequestHelperCompletion)completion id:(NSString *)dressId targetUid:(NSString *)targetUid { - NSString * fang = [NSString stringFromBase64String:@"ZHJlc3Mvc2hvcC9naXZl"];///dress/shop/give - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, dressId, targetUid, nil]; -} - -+ (void)mineDressItems:(HttpRequestHelperCompletion)completion page:(NSString *)page pageSize:(NSString *)pageSize dressType:(NSString *)dressType { - [self makeRequest:@"dress/shop/mine" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, page, pageSize, dressType, nil]; -} - -+ (void)optDress:(HttpRequestHelperCompletion)completion - dressType:(NSString *)dressType - dressId:(NSString *)dressId { - [self makeRequest:@"dress/shop/optDress" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, dressType, dressId, nil]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/CarModel.h b/YuMi/Modules/YMMine/View/DressUp/Model/CarModel.h deleted file mode 100644 index a3ac897..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Model/CarModel.h +++ /dev/null @@ -1,52 +0,0 @@ -// -// CarModel.h -// YUMI -// -// Created by YUMI on 2021/12/16. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -typedef enum { - Dressup_Car_Status_Down = 1, //已下架 - Dressup_Car_Status_Expire = 2, //已过期 - Dressup_Car_Status_Ok = 3 //正常 -}DressupCarStatus; - -@interface CarModel : PIBaseModel -@property (nonatomic, assign) DressupCarStatus status; //状态 -///座驾图片 -@property (nonatomic, strong) NSString *pic; -///id -@property (nonatomic, strong) NSString *carID; -///座驾名称 -@property (nonatomic, strong) NSString *name; -///失效时间 -@property (nonatomic, assign) NSInteger expireDate; -///是否是赠送的 -@property (nonatomic, assign) BOOL isGive; -///是否正在使用 -@property (nonatomic, assign) BOOL isUsed; -///标签类型 -@property (nonatomic, assign) DressUpLabelType labelType; - -@property(nonatomic, assign) NSInteger originalPrice; - -@property(nonatomic, assign) NSInteger days; - -@property(nonatomic, copy) NSString *effect; - -@property(nonatomic, copy) NSNumber *discount; -@property(nonatomic, assign) NSInteger dressPrice; -@property(nonatomic, assign) CGFloat discountPrice; -@property(nonatomic, assign) NSInteger vipLevel; -@property(nonatomic, copy) NSString *dressShopId; -@property(nonatomic, assign) NSInteger dressDay; -@property(nonatomic, assign) NSInteger using; -@property(nonatomic, assign) NSInteger id; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/CarModel.m b/YuMi/Modules/YMMine/View/DressUp/Model/CarModel.m deleted file mode 100644 index 39aae77..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Model/CarModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// CarModel.m -// YUMI -// -// Created by YUMI on 2021/12/16. -// - -#import "CarModel.h" - -@implementation CarModel -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"isUsed" : @"using", - @"carID" : @"id" - }; -} -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/ChatBubbleModel.h b/YuMi/Modules/YMMine/View/DressUp/Model/ChatBubbleModel.h deleted file mode 100644 index dd8816b..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Model/ChatBubbleModel.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// ChatBubbleModel.h -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface ChatBubbleModel : PIBaseModel - -///气泡id -@property (nonatomic, copy) NSString *bubbleId; -///气泡url -@property (nonatomic, strong) NSString *bubbleUrl; -///来源 -@property (nonatomic, assign) NSInteger comeFrom; -///过期天数 -@property (nonatomic, assign) NSInteger expireDays; -///气泡名称 -@property (nonatomic, copy) NSString *name; -///是否使用 -@property (nonatomic, assign) BOOL hasUsed; -///是否过期 -@property (nonatomic, assign) BOOL hasExpired; -@property(nonatomic, copy) NSString *effect; -@property(nonatomic, assign) NSInteger effectType; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/ChatBubbleModel.m b/YuMi/Modules/YMMine/View/DressUp/Model/ChatBubbleModel.m deleted file mode 100644 index 66d5eed..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Model/ChatBubbleModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// ChatBubbleModel.m -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import "ChatBubbleModel.h" - -@implementation ChatBubbleModel - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.h b/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.h deleted file mode 100644 index be3eb29..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.h +++ /dev/null @@ -1,60 +0,0 @@ -// -// DressUpShopModel.h -// YUMI -// -// Created by YUMI on 2022/7/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface DressUpShopModel : PIBaseModel - -///座驾图片 -@property (nonatomic, strong) NSString *pic; -///id -@property (nonatomic, strong) NSString *dressUpId; -/// -@property (nonatomic, copy) NSString *dressId; -///座驾名称 -@property (nonatomic, strong) NSString *name; -///天数 -@property (nonatomic, assign) NSInteger dressDay; -///价格 -@property (nonatomic, assign) NSInteger dressPrice; -///装扮类型 -@property (nonatomic, assign) NSInteger dressType; -///是否限时 0：限时，1：不限时 -@property (nonatomic, assign) NSInteger dressLimitStatus; - -//"装扮动效图片" -@property (nonatomic, copy) NSString *effect;//动图&图片链接 -@property(nonatomic, assign) NSInteger effectType; //0-图片,1-mp4,2svga - -// "折扣价格" -@property (nonatomic, assign) CGFloat discountPrice; - -// "vip等级", 0 表示当前用户不是 VIP -@property (nonatomic, assign) NSInteger vipLevel; - -// "vip等级对应的折扣百分比 * 100" -@property (nonatomic, assign) CGFloat discount; - -// "贵族限定，0-无限制,1,2,3,4..." -@property (nonatomic, assign) NSInteger vipLimit; - -// "获得方式，1-普通，2-活动" -@property (nonatomic, assign) NSInteger obtainWay; - -// 个人页背景 -@property(nonatomic, copy) NSString *usingPersonalBackground; - -- (NSMutableAttributedString *)pricePerDay; -- (NSMutableAttributedString *)pricePerDayForVIP; - -- (NSMutableAttributedString *)mallItemPricePerDay:(BOOL)includeOriginalPrice isFullDisplay:(BOOL)isFull; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.m b/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.m deleted file mode 100644 index 262fd31..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.m +++ /dev/null @@ -1,251 +0,0 @@ -// -// DressUpShopModel.m -// YUMI -// -// Created by YUMI on 2022/7/28. -// - -#import "DressUpShopModel.h" - -@implementation DressUpShopModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"dressUpId": @"id"}; -} - -- (NSMutableAttributedString *)pricePerDay { - // 创建一个 NSMutableAttributedString 来存放最终的结果 - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; - - // 1. 添加金币图片 - NSTextAttachment *coinAttachment = [[NSTextAttachment alloc] init]; - coinAttachment.image = kImage(@"moli_money_icon"); // 替换为你的金币图片名称 - coinAttachment.bounds = CGRectMake(0, -2, 18, 18); // 设置图片大小和位置，偏移量适当调整 - NSAttributedString *coinString = [NSAttributedString attributedStringWithAttachment:coinAttachment]; - [attributedString appendAttributedString:coinString]; - - // 2. 添加空格 - NSAttributedString *spaceString = [[NSAttributedString alloc] initWithString:@" "]; - [attributedString appendAttributedString:spaceString]; - - // 3. 添加 price 文本，字体加粗，颜色 #F8CE1F，字体大小 25 - NSDictionary *priceAttributes = @{ - NSFontAttributeName: kFontSemibold(15), - NSForegroundColorAttributeName: UIColorFromRGB(0xF8CE1F) - }; - NSString *formattedPriceString; - - if (fmod(self.dressPrice, 1.0) == 0.0) { - formattedPriceString = [NSString stringWithFormat:@"%ld", (long)self.dressPrice]; - } else { - formattedPriceString = [NSString stringWithFormat:@"%.2ld", (long)self.dressPrice]; - } - NSAttributedString *priceString = [[NSAttributedString alloc] initWithString:formattedPriceString attributes:priceAttributes]; - [attributedString appendAttributedString:priceString]; - - // 4. 添加 day 文本，字体常规，颜色 #F8CE1F，字体大小 12 - NSDictionary *dayAttributes = @{ - NSFontAttributeName: kFontRegular(12), - NSForegroundColorAttributeName: UIColorFromRGB(0xF8CE1F) - }; - NSString *formattedString; - if (fmod(self.dressDay, 1.0) == 0.0) { - formattedString = [NSString stringWithFormat:@"/%.0ldD ", (long)self.dressDay]; - } else { - formattedString = [NSString stringWithFormat:@"/%.2ldD ", (long)self.dressDay]; - } - NSAttributedString *dayString = [[NSAttributedString alloc] initWithString:formattedString - attributes:dayAttributes]; - [attributedString appendAttributedString:dayString]; - - return attributedString; -} - -- (NSMutableAttributedString *)pricePerDayForVIP { - // 创建一个 NSMutableAttributedString 来存放最终的结果 - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; - - // 1. 添加金币图片 - NSTextAttachment *coinAttachment = [[NSTextAttachment alloc] init]; - coinAttachment.image = kImage(@"moli_money_icon"); // 替换为你的金币图片名称 - coinAttachment.bounds = CGRectMake(0, -2, 18, 18); // 设置图片大小和位置，偏移量适当调整 - NSAttributedString *coinString = [NSAttributedString attributedStringWithAttachment:coinAttachment]; - [attributedString appendAttributedString:coinString]; - - // 2. 添加空格 - NSAttributedString *spaceString = [[NSAttributedString alloc] initWithString:@" "]; - [attributedString appendAttributedString:spaceString]; - - // 3. 添加 price 文本，字体加粗，颜色 #F8CE1F，字体大小 25 - NSDictionary *priceAttributes = @{ - NSFontAttributeName: kFontSemibold(15), - NSForegroundColorAttributeName: UIColorFromRGB(0xF8CE1F) - }; - NSString *formattedPriceString; - if (fmod(self.discountPrice, 1.0) == 0.0) { - formattedPriceString = [NSString stringWithFormat:@"%.f", self.discountPrice]; - } else { - formattedPriceString = [NSString stringWithFormat:@"%.2f", self.discountPrice]; - } - NSAttributedString *priceString = [[NSAttributedString alloc] initWithString:formattedPriceString attributes:priceAttributes]; - [attributedString appendAttributedString:priceString]; - - // 4. 添加 day 文本，字体常规，颜色 #F8CE1F，字体大小 12 - NSDictionary *dayAttributes = @{ - NSFontAttributeName: kFontRegular(12), - NSForegroundColorAttributeName: UIColorFromRGB(0xF8CE1F) - }; - NSString *formattedString; - if (fmod(self.dressDay, 1.0) == 0.0) { - formattedString = [NSString stringWithFormat:@"/%.0ldD ", (long)self.dressDay]; - } else { - formattedString = [NSString stringWithFormat:@"/%.2ldD ", (long)self.dressDay]; - } - NSAttributedString *dayString = [[NSAttributedString alloc] initWithString:formattedString attributes:dayAttributes]; - [attributedString appendAttributedString:dayString]; - - NSDictionary *originalPriceAttributes = @{ - NSFontAttributeName: kFontRegular(12), - NSForegroundColorAttributeName: UIColorRGBAlpha(0xD9E7F7, 0.5f), - NSStrikethroughStyleAttributeName: @(NSUnderlineStyleSingle), // 单条删除线 - NSStrikethroughColorAttributeName: UIColorRGBAlpha(0xD9E7F7, 0.5f) // 删除线颜色 - }; - NSAttributedString *originalPriceString = [[NSAttributedString alloc] initWithString:@(self.dressPrice).stringValue attributes:originalPriceAttributes]; - [attributedString appendAttributedString:originalPriceString]; - - return attributedString; -} - -- (NSMutableAttributedString *)mallItemPricePerDay:(BOOL)includeOriginalPrice - isFullDisplay:(BOOL)isFull { - - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; - - NSDictionary *priceAttributes = @{ - NSFontAttributeName: kFontSemibold(15), - NSForegroundColorAttributeName: UIColorFromRGB(0xF8CE1F) - }; - - NSDictionary *dayAttributes = @{ - NSFontAttributeName: kFontRegular(12), - NSForegroundColorAttributeName: UIColorFromRGB(0xF8CE1F) - }; - - NSDictionary *originalPriceAttributes = @{ - NSFontAttributeName: kFontRegular(12), - NSForegroundColorAttributeName: UIColorRGBAlpha(0xD9E7F7, 0.5f), - NSStrikethroughStyleAttributeName: @(NSUnderlineStyleSingle), // 单条删除线 - NSStrikethroughColorAttributeName: UIColorRGBAlpha(0xD9E7F7, 0.5f) // 删除线颜色 - }; - - NSString *formattedPriceString = [self formatPrice: self.vipLevel>0 ? self.discountPrice : self.dressPrice]; - if (isFull == NO) { - formattedPriceString = [NSString formatNumberToKOrM_NoRounding:formattedPriceString]; - } - - if (isMSRTL()) { -// MARK：DO NOT CHANGE ANYTHING!!!!!! - // 添加空格 - NSAttributedString *spaceString = [[NSAttributedString alloc] initWithString:@" "]; - [attributedString appendAttributedString:spaceString]; - - // 添加金币图片 - [attributedString appendAttributedString:[self iconAttributedString]]; - - // 添加空格 - NSAttributedString *spaceString_1 = [[NSAttributedString alloc] initWithString:@" "]; - [attributedString appendAttributedString:spaceString_1]; - - // 添加原始价格 - if (includeOriginalPrice && self.vipLevel > 0) { - NSString *originalPriceString = [NSString stringWithFormat:@"%@", [self formatPrice:self.dressPrice]]; - originalPriceString = [NSString formatNumberToKOrM_NoRounding:originalPriceString]; - NSAttributedString *originalPriceAttributedString = [[NSAttributedString alloc] initWithString:originalPriceString attributes:originalPriceAttributes]; - [attributedString appendAttributedString:originalPriceAttributedString]; - } - - // 添加 day 文本 - NSString *formattedDayNumString_0 = @"D";//[NSString stringWithFormat:@"%@", YMLocalizedString(@"1.0.30_text_24")]; - NSAttributedString *dayNumString_0 = [[NSAttributedString alloc] initWithString:formattedDayNumString_0 attributes:dayAttributes]; - [attributedString appendAttributedString:dayNumString_0]; - NSString *formattedDayNumString = [NSString stringWithFormat:@"%ld", (long)self.dressDay]; - NSAttributedString *dayNumString = [[NSAttributedString alloc] initWithString:formattedDayNumString attributes:dayAttributes]; - [attributedString appendAttributedString:dayNumString]; - NSString *formattedDayNumString_1 = @"/"; - NSAttributedString *dayNumString_1 = [[NSAttributedString alloc] initWithString:formattedDayNumString_1 attributes:dayAttributes]; - [attributedString appendAttributedString:dayNumString_1]; - - // 添加 price 文本 - NSAttributedString *priceString = [[NSAttributedString alloc] initWithString:formattedPriceString attributes:priceAttributes]; - [attributedString appendAttributedString:priceString]; - } else { - // 1. 添加金币图片 - [attributedString appendAttributedString:[self iconAttributedString]]; - // 2. 添加空格 - NSAttributedString *spaceString = [[NSAttributedString alloc] initWithString:@" "]; - [attributedString appendAttributedString:spaceString]; - - // 添加 price 文本 - NSAttributedString *priceString = [[NSAttributedString alloc] initWithString:formattedPriceString attributes:priceAttributes]; - [attributedString appendAttributedString:priceString]; - - // 添加 day 文本，字体常规，颜色 #F8CE1F，字体大小 12 - NSString *formattedDayString = [NSString stringWithFormat:@"/%ldD ", (long)self.dressDay]; - NSAttributedString *dayString = [[NSAttributedString alloc] initWithString:formattedDayString attributes:dayAttributes]; - [attributedString appendAttributedString:dayString]; - // 添加原始价格 - if (includeOriginalPrice && self.vipLevel > 0) { - NSString *originalPriceString = [NSString stringWithFormat:@"%@", [self formatPrice:self.dressPrice]]; - originalPriceString = [NSString formatNumberToKOrM_NoRounding:originalPriceString]; - NSAttributedString *originalPriceAttributedString = [[NSAttributedString alloc] initWithString:originalPriceString attributes:originalPriceAttributes]; - [attributedString appendAttributedString:originalPriceAttributedString]; - } - } - - return attributedString; -} - -- (NSAttributedString *)iconAttributedString { - NSTextAttachment *coinAttachment = [[NSTextAttachment alloc] init]; - coinAttachment.image = kImage(@"moli_money_icon"); // 替换为你的金币图片名称 - coinAttachment.bounds = CGRectMake(0, -2, 18, 18); // 设置图片大小和位置，偏移量适当调整 - NSAttributedString *coinString = [NSAttributedString attributedStringWithAttachment:coinAttachment]; - return coinString; -} - -// 辅助方法：格式化价格，支持 0-2 位小数 -- (NSString *)formatPrice:(CGFloat)price { - if (fmod(price, 1.0) == 0.0) { - // 整数，移除小数部分 - return [NSString stringWithFormat:@"%.0f", price]; - } else if (fmod(price * 10, 1.0) == 0.0) { - // 保留 1 位小数 - return [NSString stringWithFormat:@"%.1f", price]; - } else { - // 保留 2 位小数 - return [NSString stringWithFormat:@"%.2f", price]; - } - -// NSString *priceString = [NSString stringWithFormat:@"%.8f", price]; // 确保保留足够的位数 -// NSArray *components = [priceString componentsSeparatedByString:@"."]; // 分割整数和小数部分 -// NSString *integerPart = components[0]; -// NSString *decimalPart = components.count > 1 ? components[1] : @""; -// -// if (decimalPart.length > 2) { -// // 保留最多两位有效小数，直接截断 -// decimalPart = [decimalPart substringToIndex:2]; -// } -// -// if ([decimalPart isEqualToString:@"00"]) { -// // 如果小数部分为 00，只返回整数部分 -// return integerPart; -// } else if ([decimalPart hasSuffix:@"0"]) { -// // 如果小数部分以 0 结尾，保留 1 位小数 -// decimalPart = [decimalPart substringToIndex:1]; -// } -// -// // 拼接整数和截断后的小数部分 -// return [NSString stringWithFormat:@"%@.%@", integerPart, decimalPart]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/HeadwearModel.h b/YuMi/Modules/YMMine/View/DressUp/Model/HeadwearModel.h deleted file mode 100644 index 32f3660..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Model/HeadwearModel.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// HeadwearModel.h -// YUMI -// -// Created by YUMI on 2021/12/16. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, DressupHeadWearStatus) { - Dressup_Headwear_Status_Ok = 1, //有效 - Dressup_Headwear_Status_Expire = 2,//已过期 - Dressup_Headwear_Status_Down = 3//已下架 -}; - - -@interface HeadwearModel : PIBaseModel -///头饰id -@property (nonatomic, strong) NSString *headwearId; -///是否是赠送 -@property (nonatomic, assign) BOOL isGive; -///是否正在使用 -@property (nonatomic, assign) BOOL isUsed; -///标签类型 -@property (nonatomic, assign) DressUpLabelType labelType; -///头饰的名字 -@property (nonatomic, strong) NSString *headwearName; -///预览图链接 -@property (nonatomic, strong) NSString *pic; -///效果 -@property (nonatomic, strong) NSString *effect; -///还有过期 -@property (nonatomic, strong) NSString *expireDays; -///状态 -@property (nonatomic, assign) DressupHeadWearStatus status; - -///类型，1 = svga -@property (nonatomic, assign) NSInteger type; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/HeadwearModel.m b/YuMi/Modules/YMMine/View/DressUp/Model/HeadwearModel.m deleted file mode 100644 index 9af57df..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Model/HeadwearModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// HeadwearModel.m -// YUMI -// -// Created by YUMI on 2021/12/16. -// - -#import "HeadwearModel.h" - -@implementation HeadwearModel -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"isUsed" : @"used", - @"isGive" : @"give" - }; -} -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/NameplateModel.h b/YuMi/Modules/YMMine/View/DressUp/Model/NameplateModel.h deleted file mode 100644 index e2c23e6..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Model/NameplateModel.h +++ /dev/null @@ -1,53 +0,0 @@ -// -// NameplateModel.h -// YUMI -// -// Created by YUMI on 2021/12/16. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface NameplateModel : PIBaseModel -/////是否正在使用 -@property (nonatomic, assign) BOOL isUsing; -/////id -@property (nonatomic, copy) NSString * nId; -/////名字 -//@property (nonatomic, strong) NSString *nameplateName; -/////铭牌的图片 -//@property (nonatomic, strong) NSString *nameplateImage; -/////是否过期 -@property (nonatomic, assign) BOOL isExpired; -/////过期的天数 -//@property (nonatomic,copy) NSString *expireDays; - -@property (nonatomic, assign) NSTimeInterval expireTime; -@property (nonatomic, assign) NSInteger uid; -@property (nonatomic, assign) NSInteger nameplateId; -@property (nonatomic, copy) NSString *nameplateImage; -@property (nonatomic, assign) NSInteger nameplateType; -@property (nonatomic, assign) NSTimeInterval createTime; -@property (nonatomic, assign) BOOL isCustomWord; -@property (nonatomic, copy) NSString *remark; -//@property (nonatomic, copy) NSString *iconPic; -@property (nonatomic, assign) NSInteger expireDays; -@property (nonatomic, assign) NSTimeInterval updateTime; -@property (nonatomic, copy) NSString *nameplateName; -@property (nonatomic, copy) NSString *fixedWord; -@property (nonatomic, copy) NSString *word; - -@property(nonatomic, strong) NSNumber *discount; -@property(nonatomic, assign) NSInteger dressDay; -@property(nonatomic, assign) NSInteger discountPrice; -@property(nonatomic, assign) NSInteger vipLevel; -@property(nonatomic, assign) NSInteger dressPrice; -@property(nonatomic, copy) NSString *dressShopId; - -@property(nonatomic, copy) NSString *effect; -@property(nonatomic, assign) NSInteger effectType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/NameplateModel.m b/YuMi/Modules/YMMine/View/DressUp/Model/NameplateModel.m deleted file mode 100644 index 11271ee..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Model/NameplateModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// NameplateModel.m -// YUMI -// -// Created by YUMI on 2021/12/16. -// - -#import "NameplateModel.h" - -@implementation NameplateModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"nId": @"id"}; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/NobleCardModel.h b/YuMi/Modules/YMMine/View/DressUp/Model/NobleCardModel.h deleted file mode 100644 index 0d08644..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Model/NobleCardModel.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// NobleCardModel.h -// YUMI -// -// Created by YUMI on 2022/1/6. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface NobleCardModel : PIBaseModel - -///资料卡id -@property (nonatomic, copy) NSString *cardId; -///来源：1：购买 2：官方赠送 -@property (nonatomic, assign) NSInteger comeFrom; -///过期时间（天） -@property (nonatomic, assign) NSInteger expireDays; -///过期时间 -@property (nonatomic, strong) NSString *expireTime; -///是否过期 -@property (nonatomic, assign) BOOL hasExpired; -///资料卡名字 -@property (nonatomic, strong) NSString *name; -///资料卡图片 -@property (nonatomic, strong) NSString *pic; -///是否使用中 -@property (nonatomic, assign) BOOL used; - -@property(nonatomic, strong) NSNumber *discount; -@property(nonatomic, assign) NSInteger dressDay; -@property(nonatomic, assign) NSInteger discountPrice; -@property(nonatomic, assign) NSInteger vipLevel; -@property(nonatomic, assign) NSInteger dressPrice; -@property(nonatomic, copy) NSString *dressShopId; -@property(nonatomic, assign) NSInteger effectType; -@property(nonatomic, copy) NSString *effect; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/NobleCardModel.m b/YuMi/Modules/YMMine/View/DressUp/Model/NobleCardModel.m deleted file mode 100644 index 60352d6..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Model/NobleCardModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// NobleCardModel.m -// YUMI -// -// Created by YUMI on 2022/1/6. -// - -#import "NobleCardModel.h" - -@implementation NobleCardModel - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/Presenter/XPDressUpShopPresenter.h b/YuMi/Modules/YMMine/View/DressUp/Presenter/XPDressUpShopPresenter.h deleted file mode 100644 index 7f6f3ef..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Presenter/XPDressUpShopPresenter.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMDressUpShopPresenter.h -// YUMI -// -// Created by YUMI on 2022/7/28. -// - -#import "BaseMvpPresenter.h" -#import "XPDressUpShopProtocol.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPDressUpShopPresenter : BaseMvpPresenter - -/// 获取装扮商城列表 -/// @param type 类型 2：铭牌，0：头饰，1：座驾，3：资料卡，4：聊天气泡 -- (void)getDressUpShopList:(DressUpShopListType)type; - -/// 购买装扮 -/// @param dressType 装扮类型 -/// @param dressId 装扮id -- (void)buyDressUp:(DressUpShopListType)dressType dressId:(NSString *)dressId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/Presenter/XPDressUpShopPresenter.m b/YuMi/Modules/YMMine/View/DressUp/Presenter/XPDressUpShopPresenter.m deleted file mode 100644 index 9824eac..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Presenter/XPDressUpShopPresenter.m +++ /dev/null @@ -1,33 +0,0 @@ -// -// YMDressUpShopPresenter.m -// YUMI -// -// Created by YUMI on 2022/7/28. -// - -#import "XPDressUpShopPresenter.h" -#import "Api+DressUp.h" -#import "DressUpShopModel.h" -#import "WalletInfoModel.h" - -@implementation XPDressUpShopPresenter - -/// 获取装扮商城列表 -/// @param type 类型 0：铭牌，1：头饰，2：座驾，3：资料卡，4：聊天气泡 -- (void)getDressUpShopList:(DressUpShopListType)type { - [Api requestDressUpShopList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *array = [DressUpShopModel modelsWithArray:data.data]; - [[self getView] getShopListSuccess:array type:type]; - }] dressType:[NSString stringWithFormat:@"%ld", type]]; -} - -/// 购买装扮 -/// @param dressType 装扮类型 -/// @param dressId 装扮id -- (void)buyDressUp:(DressUpShopListType)dressType dressId:(NSString *)dressId { - [Api requestDressUpShopBuy:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] buyShopDressSuccessWithType:dressType]; - } showLoading:YES] id:dressId]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.h b/YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.h deleted file mode 100644 index 882b4b8..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// DressUpPresenter.h -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineDressUpPresenter : BaseMvpPresenter -/// 获取用户头饰列表 -- (void)getUserHeadwearList; -/// 获取用户座驾列表 -- (void)getUserCarList; -/// 获取用户铭牌列表 -- (void)getUserNameplateList; -/// 获取用户VIP资料卡列表 -- (void)getUserNobleCardList; -/// 获取用户公屏聊天气泡列表 -- (void)getUserChatBubbleList; -/// 使用头饰 -/// @param headwearId 头饰的id 不使用的时候传0 -- (void)useHeader:(NSString *)headwearId; -/// 使用座驾 -/// @param carId 座驾的id 不使用的时候传0 -- (void)useCar:(NSString *)carId; -/// 使用铭牌 -/// @param userNameplateId 铭牌的id 不使用的时候传0 -- (void)useNameplate:(NSString *)userNameplateId; -/// 使用VIP资料卡 -/// @param nobleCardId VIP资料卡的id 不使用的时候传0 -- (void)userNobleCard:(NSString *)nobleCardId; -/// 使用气泡 -/// @param bubbleId 气泡id -- (void)useBubble:(NSString *)bubbleId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.m b/YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.m deleted file mode 100644 index f065c42..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.m +++ /dev/null @@ -1,118 +0,0 @@ -// -// DressUpPresenter.m -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import "XPMineDressUpPresenter.h" -#import "Api+DressUp.h" -#import "XPMineDressUpProtocol.h" -#import "AccountInfoStorage.h" -///Model -#import "HeadwearModel.h" -#import "CarModel.h" -#import "NameplateModel.h" -#import "NobleCardModel.h" -#import "ChatBubbleModel.h" - -@implementation XPMineDressUpPresenter - - -/// 获取用户头饰列表 -- (void)getUserHeadwearList { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api headwearList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HeadwearModel modelsWithArray:data.data]; - [[self getView] getUserHeadwearListSuccess:array]; - }] ticket:ticket uid:uid]; -} - -/// 获取用户座驾列表 -- (void)getUserCarList { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api carList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [CarModel modelsWithArray:data.data]; - [[self getView] getUserCarListSuccess:array]; - }] ticket:ticket uid:uid]; -} - -/// 获取用户铭牌列表 -- (void)getUserNameplateList { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api nameplateList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [NameplateModel modelsWithArray:data.data[@"nameplateList"]]; - [[self getView] getUserNameplateListSuccess:array]; - }] ticket:ticket uid:uid page:@"1" pageSize:@"500"]; -} - -/// 获取用户VIP资料卡列表 -- (void)getUserNobleCardList { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api nobleCardList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [NobleCardModel modelsWithArray:data.data]; - [[self getView] getUserNobleCardListSuccess:array]; - }] ticket:ticket uid:uid page:@"1" pageSize:@"500"]; -} - -/// 获取用户公屏聊天气泡列表 -- (void)getUserChatBubbleList { - [Api chatBubbleList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [ChatBubbleModel modelsWithArray:data.data]; - [[self getView] getUserChatBubbleListSuccess:array]; - }] page:@"1" pageSize:@"500"]; -} - -/// 使用头饰 -/// @param headwearId 头饰的id 不使用的时候传0 -- (void)useHeader:(NSString *)headwearId { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api useHeadWear:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] useHeadwearSuccess:headwearId]; - } showLoading:YES] headwearId:headwearId ticket:ticket uid:uid]; -} - -/// 使用座驾 -/// @param carId 座驾的id 不使用的时候传0 -- (void)useCar:(NSString *)carId { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api useCar:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] useCarSuccess:carId]; - } showLoading:YES] carId:carId ticket:ticket uid:uid]; -} - -/// 使用铭牌 -/// @param userNameplateId 铭牌的id 不使用的时候传0 -- (void)useNameplate:(NSString *)userNameplateId { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api useNameplate:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] useNameplateSuccess:userNameplateId]; - } showLoading:YES] userNameplateId:userNameplateId ticket:ticket uid:uid]; -} - -/// 使用VIP资料卡 -/// @param nobleCardId VIP资料卡的id 不使用的时候传0 -- (void)userNobleCard:(NSString *)nobleCardId { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api useNobleCard:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] userNobleCardSuccess:nobleCardId]; - } showLoading:YES] cardId:nobleCardId ticket:ticket uid:uid]; -} - -/// 使用气泡 -/// @param bubbleId 气泡id -- (void)useBubble:(NSString *)bubbleId { - [Api useBubble:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] useBubbleSuccess:bubbleId]; - }] bubbleId:bubbleId]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/Protocol/XPDressUpShopProtocol.h b/YuMi/Modules/YMMine/View/DressUp/Protocol/XPDressUpShopProtocol.h deleted file mode 100644 index 4ded6c9..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Protocol/XPDressUpShopProtocol.h +++ /dev/null @@ -1,55 +0,0 @@ -// -// YMDressUpShopProtocol.h -// YUMI -// -// Created by YUMI on 2022/7/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, DressUpShopListType) { - DressUpShopListType_HeadWear = 0, - DressUpShopListType_Car, - DressUpShopListType_Nameplate, - DressUpShopListType_Noble, - DressUpShopListType_Bubble, -}; - -@class WalletInfoModel; -@protocol XPDressUpShopProtocol - -///获取账户余额 -- (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo; - -///获取商城装扮列表成功 -- (void)getShopListSuccess:(NSArray *)array type:(DressUpShopListType)type; - -///购买装扮成功 -- (void)buyShopDressSuccessWithType:(DressUpShopListType)type; - -///获取用户头饰列表成功 -- (void)getUserHeadwearListSuccess:(NSArray *)array; -///获取用户头饰列表成功 -- (void)getUserCarListSuccess:(NSArray *)array; -///获取用户头饰列表成功 -- (void)getUserNameplateListSuccess:(NSArray *)array; -///获取用户VIP资料卡成功 -- (void)getUserNobleCardListSuccess:(NSArray *)array; -///获取用户公屏气泡成功 -- (void)getUserChatBubbleListSuccess:(NSArray *)array; -///使用头饰成功 -- (void)useHeadwearSuccess:(NSString *)headWearId; -///使用座驾成功 -- (void)useCarSuccess:(NSString *)carId; -///使用铭牌成功 -- (void)useNameplateSuccess:(NSString *)nameplateId; -///使用VIP资料卡成功 -- (void)userNobleCardSuccess:(NSString *)nobleCardId; -///使用气泡成功 -- (void)useBubbleSuccess:(NSString *)bubbleId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/Protocol/XPMineDressUpProtocol.h b/YuMi/Modules/YMMine/View/DressUp/Protocol/XPMineDressUpProtocol.h deleted file mode 100644 index 16436b4..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/Protocol/XPMineDressUpProtocol.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// YMMineDressUpProtocol.h -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPMineDressUpProtocol -///获取用户头饰列表成功 -- (void)getUserHeadwearListSuccess:(NSArray *)array; -///获取用户头饰列表成功 -- (void)getUserCarListSuccess:(NSArray *)array; -///获取用户头饰列表成功 -- (void)getUserNameplateListSuccess:(NSArray *)array; -///获取用户VIP资料卡成功 -- (void)getUserNobleCardListSuccess:(NSArray *)array; -///获取用户公屏气泡成功 -- (void)getUserChatBubbleListSuccess:(NSArray *)array; -///使用头饰成功 -- (void)useHeadwearSuccess:(NSString *)headWearId; -///使用座驾成功 -- (void)useCarSuccess:(NSString *)carId; -///使用铭牌成功 -- (void)useNameplateSuccess:(NSString *)nameplateId; -///使用VIP资料卡成功 -- (void)userNobleCardSuccess:(NSString *)nobleCardId; -///使用气泡成功 -- (void)useBubbleSuccess:(NSString *)bubbleId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.h b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.h deleted file mode 100644 index 36586bc..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMDressShopSearchTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/7/29. -// - -#import -#import "HomeSearchResultModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@class XPDressShopSearchTableViewCell; -@protocol XPDressShopSearchTableViewCellDelegate - -- (void)xPDressShopSearchTableViewCellSendButtonClick:(XPDressShopSearchTableViewCell *)cell; - -@end -@interface XPDressShopSearchTableViewCell : UITableViewCell - -@property (nonatomic, strong) HomeSearchResultModel *data; -@property (nonatomic, weak) id delegate; - -- (void)shoppingMallStyle; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.m deleted file mode 100644 index ae0ad04..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.m +++ /dev/null @@ -1,232 +0,0 @@ -// -// YMDressShopSearchTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/7/29. -// - -#import "XPDressShopSearchTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -///Model -#import "HomeSearchResultModel.h" -///View -#import "NetImageView.h" - -@interface XPDressShopSearchTableViewCell () - -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///名字的容器 -@property (nonatomic,strong) UIStackView *nameStackView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///性别 -@property (nonatomic,strong) UIButton *sexImageView; -///显示id -@property (nonatomic,strong) UILabel *idLabel; -///分割线 -@property (nonatomic,strong) UIView * lineView; -///赠送 -@property (nonatomic, strong) UIButton *sendButton; - -@property(nonatomic, assign) BOOL isShoppingMallStyle; - -@end - -@implementation XPDressShopSearchTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Public Method -- (void)setData:(HomeSearchResultModel *)data { - if (data) { - self.avatarImageView.imageUrl = data.avatar; - self.nickLabel.text = data.nick; - if (self.isShoppingMallStyle) { - self.idLabel.text = [NSString stringWithFormat:@"ID: %@", data.erbanNo]; - [self.sendButton setTitleColor:UIColorFromRGB(0x172055) forState:UIControlStateNormal]; - [self.sendButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xB2FCFF), UIColorFromRGB(0x4DA2EA)] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(10, 10)] - forState:UIControlStateNormal]; - } else { - self.idLabel.text = [NSString stringWithFormat:@"%@%@:%@",AppName, YMLocalizedString(@"App_Common_hao"),data.erbanNo]; - } - - [self.sexImageView setTitle:[NSString getAgeWithBirth:_data.birth] forState:UIControlStateNormal]; - self.sexImageView.backgroundColor = data.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.titleEdgeInsets = data.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.sexImageView.selected = data.gender != GenderType_Male; - } -} - -- (void)shoppingMallStyle { - - self.isShoppingMallStyle = YES; - - self.lineView.hidden = YES; - - [self.avatarImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(50, 50)); - make.leading.mas_equalTo(self.contentView).offset(15); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.sendButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.centerY.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(60, 26)); - }]; - - self.nickLabel.textColor = [UIColor whiteColor]; - self.sexImageView.hidden = YES; - [self.avatarImageView setCornerRadius:25]; - self.idLabel.textColor = UIColorFromRGB(0xd9e7f7); -} - -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nameStackView]; - [self.contentView addSubview:self.idLabel]; - [self.contentView addSubview:self.sendButton]; - [self.contentView addSubview:self.lineView]; - [self.nameStackView addArrangedSubview:self.nickLabel]; - [self.nameStackView addArrangedSubview:self.sexImageView]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(45, 45)); - make.leading.mas_equalTo(self.contentView).offset(15); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(13); - make.height.mas_equalTo(20); - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-1.5); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameStackView); - make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(1.5); - }]; - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(28); - make.height.mas_equalTo(14); - }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameStackView); - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.bottom.mas_equalTo(self.contentView); - make.height.mas_equalTo(1); - }]; - - [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.centerY.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(72, 24)); - }]; -} - -#pragma mark - Event Response -- (void)sendButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPDressShopSearchTableViewCellSendButtonClick:)]) { - [self.delegate xPDressShopSearchTableViewCellSendButtonClick:self]; - } -} - -#pragma mark - Getters And Setters -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 45/2; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _avatarImageView; -} - -- (UIStackView *)nameStackView { - if (!_nameStackView) { - _nameStackView = [[UIStackView alloc] init]; - _nameStackView.axis = UILayoutConstraintAxisHorizontal; - _nameStackView.distribution = UIStackViewDistributionFill; - _nameStackView.alignment = UIStackViewAlignmentCenter; - _nameStackView.spacing = 2; - } - return _nameStackView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.text = @""; - _nickLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:15]; - _nickLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _nickLabel; -} - -- (UIButton *)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; - } - return _sexImageView; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:13]; - _idLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _idLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (UIButton *)sendButton { - if (!_sendButton) { - _sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sendButton setTitle:YMLocalizedString(@"XPDressShopSearchTableViewCell1") forState:UIControlStateNormal]; - [_sendButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_sendButton addTarget:self action:@selector(sendButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _sendButton.layer.masksToBounds = YES; - _sendButton.layer.cornerRadius = 24/2; - _sendButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_sendButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _sendButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.h b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.h deleted file mode 100644 index e740536..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// YMDressUpShopCardTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/7/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class DressUpShopModel, XPDressUpShopCardTableViewCell; -@protocol XPDressUpShopCardTableViewCellDelegate - -///赠送装扮 -- (void)xPDressUpShopCardTableViewCellSendDress:(XPDressUpShopCardTableViewCell *)view dressId:(NSString *)dressId; -///购买装扮 -- (void)xPDressUpShopCardTableViewCellBuyDress:(XPDressUpShopCardTableViewCell *)view dressId:(NSString *)dressId; - -@end - -@interface XPDressUpShopCardTableViewCell : UITableViewCell - -@property (nonatomic,strong) DressUpShopModel *nobleCardModel; -///代理 -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m deleted file mode 100644 index 4fea7ab..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m +++ /dev/null @@ -1,272 +0,0 @@ -// -// YMDressUpShopCardTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/7/29. -// - -#import "XPDressUpShopCardTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -#import "YUMIMacroUitls.h" -///Model -#import "DressUpShopModel.h" - -@interface XPDressUpShopCardTableViewCell() - -///容器view -@property (nonatomic, strong) UIView *mainView; -///卡片背景 -@property (nonatomic, strong) UIView *userCardBackView; -///卡片底图 -@property (nonatomic, strong) UIImageView *userCardBackImageView; -///卡片外边框 -@property (nonatomic, strong) NetImageView *nobleImageView; -///名字 -@property (nonatomic, strong) UILabel *titleLabel; -///钻石图标 -@property (nonatomic, strong) UIImageView *diamondImageView; -///钻石金额 -@property (nonatomic, strong) UILabel *diamondLabel; -///赠送 -@property (nonatomic, strong) UIButton *sendButton; -///使用 -@property (nonatomic,strong) UIButton *useButton; -///限时背景 -@property (nonatomic, strong) UIView *limitTimeBgView; -///限时 -@property (nonatomic, strong) UILabel *limitLabel; - -@end - -@implementation XPDressUpShopCardTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor];; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.mainView]; - [self.mainView addSubview:self.userCardBackView]; - [self.mainView addSubview:self.userCardBackImageView]; - [self.mainView addSubview:self.nobleImageView]; - [self.mainView addSubview:self.titleLabel]; - [self.mainView addSubview:self.diamondImageView]; - [self.mainView addSubview:self.diamondLabel]; - [self.mainView addSubview:self.sendButton]; - [self.mainView addSubview:self.useButton]; - [self.mainView addSubview:self.limitTimeBgView]; - [self.limitTimeBgView addSubview:self.limitLabel]; -} - -- (void)initSubViewConstraints { - [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(268); - make.leading.trailing.mas_equalTo(self).inset(15); - make.top.mas_equalTo(12); - }]; - [self.userCardBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(0); - make.height.mas_equalTo(180); - }]; - [self.userCardBackImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(110); - make.width.mas_equalTo(285); - make.bottom.mas_equalTo(self.userCardBackView).mas_offset(-4); - make.centerX.mas_equalTo(self.mainView); - }]; - [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(180); - make.width.mas_equalTo(330); - make.bottom.mas_equalTo(self.userCardBackImageView); - make.centerX.mas_equalTo(self.mainView); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(12); - make.top.mas_equalTo(self.userCardBackView.mas_bottom).mas_offset(14); - make.height.mas_equalTo(14); - }]; - [self.diamondImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.diamondLabel.mas_leading).mas_offset(-4); - make.size.mas_equalTo(CGSizeMake(11, 11)); - make.centerY.mas_equalTo(self.titleLabel); - }]; - [self.diamondLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.titleLabel); - make.trailing.mas_equalTo(-12); - make.height.mas_equalTo(20); - }]; - CGFloat width = (KScreenWidth - 30-20-12) *0.5; - [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(width, 32)); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(16); - make.trailing.mas_equalTo(self.mas_centerX).mas_offset(-6); - }]; - [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.mas_centerX).mas_offset(6); - make.size.mas_equalTo(self.sendButton); - make.centerY.mas_equalTo(self.sendButton); - }]; - [self.limitTimeBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.mas_equalTo(self.userCardBackView); - make.height.mas_equalTo(20); - make.width.mas_greaterThanOrEqualTo(36); - }]; - [self.limitLabel mas_makeConstraints:^(MASConstraintMaker *make) { - 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 - -- (void)setNobleCardModel:(DressUpShopModel *)nobleCardModel { - _nobleCardModel = nobleCardModel; - if (_nobleCardModel) { - self.titleLabel.text = [NSString stringWithFormat:@"%@(%zd%@)", nobleCardModel.name, nobleCardModel.dressDay,YMLocalizedString(@"App_Commont_Day")]; - self.nobleImageView.imageUrl = nobleCardModel.pic; - self.diamondLabel.text = [NSString stringWithFormat:@"%zd", nobleCardModel.dressPrice]; - self.limitTimeBgView.hidden = (nobleCardModel.dressLimitStatus != 0); - } -} - -#pragma mark - Event Response -- (void)sendButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPDressUpShopCardTableViewCellSendDress:dressId:)]) { - [self.delegate xPDressUpShopCardTableViewCellSendDress:self dressId:self.nobleCardModel.dressUpId]; - } -} - -- (void)useButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPDressUpShopCardTableViewCellBuyDress:dressId:)]) { - [self.delegate xPDressUpShopCardTableViewCellBuyDress:self dressId:self.nobleCardModel.dressUpId]; - } -} - -#pragma mark - Getter && Setter -- (UIView *)mainView { - if (!_mainView) { - _mainView = [[UIView alloc] init]; - _mainView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _mainView.layer.cornerRadius = 10; - _mainView.layer.masksToBounds = YES; - } - return _mainView; -} - -- (UIView *)userCardBackView { - if (!_userCardBackView) { - _userCardBackView = [[UIView alloc] init]; - _userCardBackView.backgroundColor = UIColorFromRGB(0xEAE5FC); - } - return _userCardBackView;; -} - -- (NetImageView *)nobleImageView { - if (!_nobleImageView) { - _nobleImageView = [[NetImageView alloc] init]; - _nobleImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _nobleImageView;; -} - -- (UIImageView *)userCardBackImageView { - if (!_userCardBackImageView) { - _userCardBackImageView = [[UIImageView alloc] initWithImage:[UIImage getLanguageImage:@"mine_dressup_noble_bg"]]; - _userCardBackImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _userCardBackImageView;; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UIImageView *)diamondImageView { - if (!_diamondImageView) { - _diamondImageView = [[UIImageView alloc] init]; - _diamondImageView.image = [UIImage imageNamed:@"moli_money_icon"]; - } - return _diamondImageView; -} - -- (UILabel *)diamondLabel { - if (!_diamondLabel) { - _diamondLabel = [[UILabel alloc] init]; - _diamondLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - _diamondLabel.textColor = UIColorFromRGB(0xFFBC51); - } - return _diamondLabel; -} - -- (UIButton *)sendButton { - if (!_sendButton) { - _sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sendButton setTitle:YMLocalizedString(@"XPDressUpShopCardTableViewCell1") forState:UIControlStateNormal]; - [_sendButton setTitleColor:UIColorFromRGB(0xFFA936) forState:UIControlStateNormal]; - [_sendButton addTarget:self action:@selector(sendButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _sendButton.layer.masksToBounds = YES; - _sendButton.layer.cornerRadius = 32/2; - _sendButton.titleLabel.font = [UIFont systemFontOfSize:12]; - _sendButton.backgroundColor = UIColorFromRGB(0xFFF0C9); - } - return _sendButton; -} - -- (UIButton *)useButton { - if (!_useButton) { - _useButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_useButton setTitle:YMLocalizedString(@"XPDressUpShopCardTableViewCell2") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_useButton addTarget:self action:@selector(useButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _useButton.layer.masksToBounds = YES; - _useButton.layer.cornerRadius = 32/2; - _useButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _useButton; -} - -- (UIView *)limitTimeBgView { - if (!_limitTimeBgView) { - _limitTimeBgView = [[UIView alloc] init]; - _limitTimeBgView.backgroundColor = UIColorFromRGB(0xFB486A); - - - } - return _limitTimeBgView; -} - -- (UILabel *)limitLabel { - if (!_limitLabel) { - _limitLabel = [[UILabel alloc] init]; - _limitLabel.text = YMLocalizedString(@"XPDressUpShopCardTableViewCell3"); - _limitLabel.textColor = [UIColor whiteColor]; - _limitLabel.font = [UIFont systemFontOfSize:10]; - _limitLabel.textAlignment = NSTextAlignmentCenter; - } - return _limitLabel; -} -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.h b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.h deleted file mode 100644 index 5bb184c..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMDressUpShopCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2022/7/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class DressUpShopModel, XPDressUpShopCollectionViewCell; - -@protocol XPDressUpShopCollectionViewCellDelegate - -///赠送装扮 -- (void)xPDressUpShopCollectionViewCellSendDress:(XPDressUpShopCollectionViewCell *)view dressId:(NSString *)dressId; -///购买装扮 -- (void)xPDressUpShopCollectionViewCellBuyDress:(XPDressUpShopCollectionViewCell *)view dressId:(NSString *)dressId; - -@end - -@interface XPDressUpShopCollectionViewCell : UICollectionViewCell - -@property (nonatomic, strong) DressUpShopModel *dressUpModel; - -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m deleted file mode 100644 index 9000783..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m +++ /dev/null @@ -1,252 +0,0 @@ -// -// YMDressUpShopCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2022/7/29. -// - -#import "XPDressUpShopCollectionViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -#import "YUMIMacroUitls.h" -///Model -#import "DressUpShopModel.h" - -@interface XPDressUpShopCollectionViewCell() - -///容器view -@property (nonatomic, strong) UIView *mainView; -///卡片底图 -@property (nonatomic, strong) UIView *userCardBackView; -///装扮图 -@property (nonatomic, strong) NetImageView *dressUpImageView; -///名字 -@property (nonatomic, strong) UILabel *titleLabel; -///钻石图标 -@property (nonatomic, strong) UIImageView *diamondImageView; -///钻石金额 -@property (nonatomic, strong) UILabel *diamondLabel; -///赠送 -@property (nonatomic, strong) UIButton *sendButton; -///使用 -@property (nonatomic,strong) UIButton *useButton; -///限时背景 -@property (nonatomic, strong) UIView *limitTimeBgView; -///限时 -@property (nonatomic, strong) UILabel *limitLabel; - -@end - - -@implementation XPDressUpShopCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.mainView]; - [self.mainView addSubview:self.userCardBackView]; - [self.mainView addSubview:self.dressUpImageView]; - [self.mainView addSubview:self.titleLabel]; - [self.mainView addSubview:self.diamondImageView]; - [self.mainView addSubview:self.diamondLabel]; - [self.mainView addSubview:self.sendButton]; - [self.mainView addSubview:self.useButton]; - [self.mainView addSubview:self.limitTimeBgView]; - [self.limitTimeBgView addSubview:self.limitLabel]; -} - -- (void)initSubViewConstraints { - [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.userCardBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(92); - make.leading.top.trailing.mas_equalTo(0); - }]; - CGFloat dressImageW = (KScreenWidth - 42) *0.5; - [self.dressUpImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(dressImageW * 0.7, 70)); - make.top.mas_equalTo(11); - make.centerX.mas_equalTo(self.userCardBackView); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(8); - make.top.mas_equalTo(self.userCardBackView.mas_bottom).mas_offset(8); - make.height.mas_equalTo(14); - }]; - - [self.diamondImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel); - make.size.mas_equalTo(CGSizeMake(11, 11)); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(12); - }]; - [self.diamondLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.diamondImageView); - make.leading.mas_equalTo(self.diamondImageView.mas_trailing).mas_offset(4); - make.height.mas_equalTo(17); - }]; - CGFloat width = ((KScreenWidth - 42) *0.5 - 16-6) *0.5; - [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(width, 24)); - make.top.mas_equalTo(self.diamondImageView.mas_bottom).mas_offset(17); - make.trailing.mas_equalTo(self.mas_centerX).mas_offset(-3); - }]; - [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.mas_centerX).mas_offset(3); - make.size.mas_equalTo(self.sendButton); - make.centerY.mas_equalTo(self.sendButton); - }]; - [self.limitTimeBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.mas_equalTo(self.userCardBackView); - make.height.mas_equalTo(20); - make.width.mas_greaterThanOrEqualTo(36); - }]; - [self.limitLabel mas_makeConstraints:^(MASConstraintMaker *make) { - 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 -- (void)setDressUpModel:(DressUpShopModel *)dressUpModel { - _dressUpModel = dressUpModel; - if (dressUpModel) { - self.titleLabel.text = [NSString stringWithFormat:@"%@(%zd%@)", dressUpModel.name, dressUpModel.dressDay,YMLocalizedString(@"App_Commont_Day")]; - self.dressUpImageView.imageUrl = dressUpModel.pic; - self.diamondLabel.text = [NSString stringWithFormat:@"%zd", dressUpModel.dressPrice]; - self.limitTimeBgView.hidden = (dressUpModel.dressLimitStatus != 0); - } -} - -#pragma mark - Event Response -- (void)sendButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPDressUpShopCollectionViewCellSendDress:dressId:)]) { - [self.delegate xPDressUpShopCollectionViewCellSendDress:self dressId:self.dressUpModel.dressUpId]; - } -} - -- (void)useButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPDressUpShopCollectionViewCellBuyDress:dressId:)]) { - [self.delegate xPDressUpShopCollectionViewCellBuyDress:self dressId:self.dressUpModel.dressUpId]; - } -} - -#pragma mark - Getter && Setter -- (UIView *)mainView { - if (!_mainView) { - _mainView = [[UIView alloc] init]; - _mainView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _mainView.layer.cornerRadius = 10; - _mainView.layer.masksToBounds = YES; - } - return _mainView; -} - -- (UIView *)userCardBackView { - if (!_userCardBackView) { - _userCardBackView = [[UIView alloc] init]; - _userCardBackView.backgroundColor = UIColorFromRGB(0xEAE5FC); - } - return _userCardBackView;; -} - -- (NetImageView *)dressUpImageView { - if (!_dressUpImageView) { - _dressUpImageView = [[NetImageView alloc] init]; - _dressUpImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _dressUpImageView;; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UIImageView *)diamondImageView { - if (!_diamondImageView) { - _diamondImageView = [[UIImageView alloc] init]; - _diamondImageView.image = [UIImage imageNamed:@"moli_money_icon"]; - } - return _diamondImageView; -} - -- (UILabel *)diamondLabel { - if (!_diamondLabel) { - _diamondLabel = [[UILabel alloc] init]; - _diamondLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightBold]; - _diamondLabel.textColor = UIColorFromRGB(0xFFBC51); - } - return _diamondLabel; -} - -- (UIButton *)sendButton { - if (!_sendButton) { - _sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sendButton setTitle:YMLocalizedString(@"XPDressUpShopCollectionViewCell1") forState:UIControlStateNormal]; - [_sendButton setTitleColor:UIColorFromRGB(0xFFA936) forState:UIControlStateNormal]; - [_sendButton addTarget:self action:@selector(sendButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _sendButton.layer.masksToBounds = YES; - _sendButton.layer.cornerRadius = 24/2; - _sendButton.titleLabel.font = [UIFont systemFontOfSize:12]; - _sendButton.backgroundColor = UIColorFromRGB(0xFFF0C9); - } - return _sendButton; -} - -- (UIButton *)useButton { - if (!_useButton) { - _useButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_useButton setTitle:YMLocalizedString(@"XPDressUpShopCollectionViewCell2") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_useButton addTarget:self action:@selector(useButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _useButton.layer.masksToBounds = YES; - _useButton.layer.cornerRadius = 24/2; - _useButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _useButton; -} - -- (UIView *)limitTimeBgView { - if (!_limitTimeBgView) { - _limitTimeBgView = [[UIView alloc] init]; - _limitTimeBgView.backgroundColor = UIColorFromRGB(0xFB486A); - } - return _limitTimeBgView; -} - -- (UILabel *)limitLabel { - if (!_limitLabel) { - _limitLabel = [[UILabel alloc] init]; - _limitLabel.text = YMLocalizedString(@"XPDressUpShopCollectionViewCell3"); - _limitLabel.textColor = [UIColor whiteColor]; - _limitLabel.font = [UIFont systemFontOfSize:10]; - _limitLabel.textAlignment = NSTextAlignmentCenter; - } - return _limitLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.h b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.h deleted file mode 100644 index fa5c5d6..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// YMMineCarTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class CarModel,XPMineCarTableViewCell; -@protocol XPMineCarTableViewCellDelegate -///使用座驾 -- (void)xPMineCarTableViewCell:(XPMineCarTableViewCell *)cell carId:(NSString *)carId; - -@end -@interface XPMineCarTableViewCell : UITableViewCell -@property (nonatomic,strong) CarModel *carInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.m deleted file mode 100644 index 635707a..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.m +++ /dev/null @@ -1,249 +0,0 @@ -// -// YMMineCarTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import "XPMineCarTableViewCell.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "CarModel.h" - -@interface XPMineCarTableViewCell () -///座驾 -@property (nonatomic,strong) NetImageView *carImageView; -///名字 -@property (nonatomic,strong) UIStackView *nameStackView; -///头饰名字 -@property (nonatomic, strong) UIImageView *giveImageView; -///名字 -@property (nonatomic, strong) UILabel *titleLabel; -///还有多少时间 -@property (nonatomic,strong) UIStackView *timeStackView; -///剩余天数 -@property (nonatomic, strong) UILabel *timeLabel; -///使用 -@property (nonatomic,strong) UIButton *useButton; -///显示分割线 -@property (nonatomic,strong) UIView * lineView; -/// 限定 新 -@property (nonatomic,strong) UIImageView *limitImageView; -@end - -@implementation XPMineCarTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor];; - [self.contentView addSubview:self.carImageView]; - [self.contentView addSubview:self.nameStackView]; - [self.contentView addSubview:self.timeStackView]; - [self.contentView addSubview:self.useButton]; - [self.contentView addSubview:self.lineView]; - [self.contentView addSubview:self.limitImageView]; - - [self.nameStackView addArrangedSubview:self.giveImageView]; - [self.nameStackView addArrangedSubview:self.titleLabel]; - - [self.timeStackView addArrangedSubview:self.timeLabel]; - -} - -- (void)initSubViewConstraints { - [self.carImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(68); - make.width.mas_equalTo(102); - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(20); - }]; - - - [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.carImageView.mas_trailing).offset(10); - make.trailing.equalTo(self.useButton.mas_leading).mas_offset(-kGetScaleWidth(5)); - make.bottom.mas_equalTo(self.carImageView.mas_centerY).offset(-3); - }]; - - [self.giveImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(11, 11)); - }]; - - [self.timeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameStackView); - make.top.mas_equalTo(self.carImageView.mas_centerY).offset(3); - make.height.mas_equalTo(13); - }]; - - [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.height.mas_equalTo(33); - make.width.mas_equalTo(85); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(105); - make.height.mas_equalTo(0.5); - make.bottom.mas_equalTo(self.contentView); - make.trailing.mas_equalTo(self.contentView).offset(-15); - }]; - - [self.limitImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(self.contentView).offset(20); - make.width.height.mas_equalTo(20); - }]; -} - -#pragma mark - private -- (void)setCarInfo:(CarModel *)carInfo { - _carInfo = carInfo; - if (_carInfo) { - self.titleLabel.text = _carInfo.name; - self.useButton.hidden = _carInfo.status != Dressup_Car_Status_Ok; - if (_carInfo.status == Dressup_Car_Status_Ok) { - self.timeLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineCarTableViewCell0"), _carInfo.expireDate]; - } else { - self.timeLabel.text = YMLocalizedString(@"XPMineCarTableViewCell1"); - } - self.giveImageView.hidden =!_carInfo.isGive; - self.carImageView.imageUrl = _carInfo.pic; - if (_carInfo.isUsed) { - [_useButton setTitle:YMLocalizedString(@"XPMineCarTableViewCell2") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor cancelButtonTextColor] forState:UIControlStateNormal]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } else { - [_useButton setTitle:YMLocalizedString(@"XPMineCarTableViewCell3") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - - NSString * typeStr; - if (_carInfo.labelType == DressUpLabelType_New) { - typeStr = @"mine_dressUp_new"; - } else if(_carInfo.labelType == DressUpLabelType_Limit) { - typeStr = @"mine_dressUp_limit"; - } else if(_carInfo.labelType == DressUpLabelType_Exclusive) { - typeStr = @"mine_dressUp_exclusive"; - } - if (typeStr.length > 0) { - self.limitImageView.image = [UIImage getLanguageImage:typeStr]; - } - } -} -#pragma mark - Event Response -- (void)useButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineCarTableViewCell:carId:)]) { - NSString * carId = self.carInfo.carID;; - if (self.carInfo.isUsed) { - carId = @"0"; - } - [self.delegate xPMineCarTableViewCell:self carId:carId]; - } -} - -#pragma mark - Getter && Setter -- (UIStackView *)nameStackView { - if (!_nameStackView) { - _nameStackView = [[UIStackView alloc] init]; - _nameStackView.axis = UILayoutConstraintAxisHorizontal; - _nameStackView.distribution = UIStackViewDistributionFill; - _nameStackView.alignment = UIStackViewAlignmentCenter; - _nameStackView.spacing = 2; - } - return _nameStackView; -} - -- (UIImageView *)giveImageView { - if (!_giveImageView) { - _giveImageView = [[UIImageView alloc] init]; - _giveImageView.userInteractionEnabled = YES; - _giveImageView.image = [UIImage getLanguageImage:@"mine_dressup_give"]; - } - return _giveImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _timeLabel.numberOfLines = 2; - } - return _titleLabel; -} - -- (UIButton *)useButton { - if (!_useButton) { - _useButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_useButton setTitle:YMLocalizedString(@"XPMineCarTableViewCell4") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_useButton addTarget:self action:@selector(useButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _useButton.layer.masksToBounds = YES; - _useButton.layer.cornerRadius = 33/2; - _useButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _useButton; -} - -- (UIStackView *)timeStackView { - if (!_timeStackView) { - _timeStackView = [[UIStackView alloc] init]; - _timeStackView.axis = UILayoutConstraintAxisHorizontal; - _timeStackView.distribution = UIStackViewDistributionFill; - _timeStackView.alignment = UIStackViewAlignmentCenter; - _timeStackView.spacing = 2; - } - return _timeStackView; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:12]; - _timeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _timeLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (NetImageView *)carImageView { - if (!_carImageView) { - _carImageView = [[NetImageView alloc] init]; - _carImageView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _carImageView.layer.masksToBounds = YES; - _carImageView.layer.cornerRadius = 12; - } - return _carImageView; -} - -- (UIImageView *)limitImageView { - if (!_limitImageView) { - _limitImageView = [[UIImageView alloc] init]; - } - return _limitImageView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.h b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.h deleted file mode 100644 index 99918be..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMMineDressBubbleTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class ChatBubbleModel, XPMineDressBubbleCollectionViewCell; - -@protocol XPMineDressBubbleTableViewCellDelegate -///使用气泡 -- (void)xPMineDressBubbleCollectionViewCell:(XPMineDressBubbleCollectionViewCell *)view bubbleId:(NSString *)bubbleId; - -@end - -@interface XPMineDressBubbleCollectionViewCell : UICollectionViewCell - -@property (nonatomic, strong) ChatBubbleModel *bubbleModel; - -@property (nonatomic,weak) id delegate; - -@end - - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.m deleted file mode 100644 index 1eb602a..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.m +++ /dev/null @@ -1,219 +0,0 @@ -// -// YMMineDressBubbleTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import "XPMineDressBubbleCollectionViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "ChatBubbleModel.h" - -@interface XPMineDressBubbleCollectionViewCell() - -///容器view -@property (nonatomic, strong) UIView *mainView; -///显示分割线 -@property (nonatomic,strong) UIImageView *lineView; -///卡片底图 -@property (nonatomic, strong) UIView *userCardBackView; -///卡片外边框 -@property (nonatomic, strong) NetImageView *nobleImageView; -///名字 -@property (nonatomic, strong) UILabel *titleLabel; -///剩余天数 -@property (nonatomic, strong) UILabel *timeLabel; -///使用 -@property (nonatomic,strong) UIButton *useButton; -@end - - -@implementation XPMineDressBubbleCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.mainView]; - [self.mainView addSubview:self.lineView]; - [self.mainView addSubview:self.titleLabel]; - [self.mainView addSubview:self.timeLabel]; - [self.mainView addSubview:self.useButton]; - [self.mainView addSubview:self.userCardBackView]; - [self.userCardBackView addSubview:self.nobleImageView]; -} - -- (void)initSubViewConstraints { - [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.mainView).mas_offset(8); - make.top.mas_equalTo(self.mainView).mas_offset(12); - make.width.mas_equalTo(3); - make.height.mas_equalTo(16); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.lineView.mas_trailing).mas_offset(4); - make.centerY.mas_equalTo(self.lineView); - make.height.mas_equalTo(14); - }]; - -// [self.userCardBackView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.height.mas_equalTo(44); -// make.width.mas_equalTo(84); -// make.centerX.mas_equalTo(self.mainView); -// make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(16); -// }]; -// -// [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.height.mas_equalTo(30); -// make.width.mas_equalTo(60); -// make.bottom.mas_equalTo(self.userCardBackView).mas_offset(-5); -// make.centerX.mas_equalTo(self.userCardBackView); -// }]; - - [self.userCardBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(92); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(0); - make.leading.trailing.mas_equalTo(0); - }]; - CGFloat dressImageW = (KScreenWidth - 42) *0.5; - [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(dressImageW * 0.7, 70)); - make.top.mas_equalTo(11); - make.centerX.mas_equalTo(self.userCardBackView); - }]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.mainView); - make.top.mas_equalTo(self.useButton.mas_bottom).mas_offset(4); - make.height.mas_equalTo(14); - }]; - - [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.mainView); - make.height.mas_equalTo(24); - make.width.mas_equalTo(89); - make.top.mas_equalTo(self.userCardBackView.mas_bottom).mas_offset(10); - }]; - -} - -#pragma mark - private -- (void)setBubbleModel:(ChatBubbleModel *)bubbleModel { - _bubbleModel = bubbleModel; - if (bubbleModel) { - self.titleLabel.text = bubbleModel.name; - self.useButton.hidden = bubbleModel.hasExpired; - if (!bubbleModel.hasExpired) { - self.timeLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineDressBubbleCollectionViewCell0"), bubbleModel.expireDays]; - } else { - self.timeLabel.text = YMLocalizedString(@"XPMineDressBubbleCollectionViewCell1"); - } - self.nobleImageView.imageUrl = bubbleModel.bubbleUrl; - if (bubbleModel.hasUsed) { - [_useButton setTitle:YMLocalizedString(@"XPMineDressBubbleCollectionViewCell2") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor cancelButtonTextColor] forState:UIControlStateNormal]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } else { - [_useButton setTitle:YMLocalizedString(@"XPMineDressBubbleCollectionViewCell3") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - } -} - -#pragma mark - Event Response -- (void)useButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineDressBubbleCollectionViewCell:bubbleId:)]) { - NSString * bubbleId = self.bubbleModel.bubbleId;; - if (self.bubbleModel.hasUsed) { - bubbleId = @"0"; - } - [self.delegate xPMineDressBubbleCollectionViewCell:self bubbleId:bubbleId]; - } -} - -#pragma mark - Getter && Setter -- (UIView *)mainView { - if (!_mainView) { - _mainView = [[UIView alloc] init]; - _mainView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _mainView.layer.cornerRadius = 10; - _mainView.layer.masksToBounds = YES; - } - return _mainView; -} -- (UIImageView *)lineView { - if (!_lineView) { - _lineView = [[UIImageView alloc] init]; - [_lineView setImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFCB47), UIColorFromRGB(0xFFA936)] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(3, 16)]]; - _lineView.layer.cornerRadius = 1.5; - _lineView.layer.masksToBounds = YES; - } - return _lineView; -} -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:10]; - _timeLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _timeLabel; -} - -- (UIButton *)useButton { - if (!_useButton) { - _useButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_useButton setTitle:YMLocalizedString(@"XPMineDressBubbleCollectionViewCell4") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_useButton addTarget:self action:@selector(useButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _useButton.layer.masksToBounds = YES; - _useButton.layer.cornerRadius = 24/2; - _useButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _useButton; -} - -- (NetImageView *)nobleImageView { - if (!_nobleImageView) { - _nobleImageView = [[NetImageView alloc] init]; - _nobleImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _nobleImageView;; -} - -- (UIView *)userCardBackView { - if (!_userCardBackView) { - _userCardBackView = [[UIView alloc] init]; - _userCardBackView.layer.cornerRadius = 12; - _userCardBackView.layer.masksToBounds = YES; - - } - return _userCardBackView;; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyCollectionViewCell.h b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyCollectionViewCell.h deleted file mode 100644 index 2dc0347..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyCollectionViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMMineDressEmptyCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2022/3/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineDressEmptyCollectionViewCell : UICollectionViewCell - -///标题 -@property (nonatomic,copy) NSString *emptyTitle; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyCollectionViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyCollectionViewCell.m deleted file mode 100644 index 8878c8e..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyCollectionViewCell.m +++ /dev/null @@ -1,77 +0,0 @@ -// -// YMMineDressEmptyCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2022/3/21. -// - -#import "XPMineDressEmptyCollectionViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPMineDressEmptyCollectionViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPMineDressEmptyCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(150); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} - -#pragma mark - Getters And Setters -- (void)setEmptyTitle:(NSString *)emptyTitle { - _emptyTitle = emptyTitle; - self.titleLabel.text = _emptyTitle; -} - -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPMineDressEmptyCollectionViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyTableViewCell.h b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyTableViewCell.h deleted file mode 100644 index ea6882a..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyTableViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMineDressEmptyTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineDressEmptyTableViewCell : UITableViewCell -///标题 -@property (nonatomic,copy) NSString *emptyTitle; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyTableViewCell.m deleted file mode 100644 index 782265b..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyTableViewCell.m +++ /dev/null @@ -1,78 +0,0 @@ -// -// YMMineDressEmptyTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/16. -// - -#import "XPMineDressEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPMineDressEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPMineDressEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(150); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} - -#pragma mark - Getters And Setters -- (void)setEmptyTitle:(NSString *)emptyTitle { - _emptyTitle = emptyTitle; - self.titleLabel.text = _emptyTitle; -} - -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPMineDressEmptyTableViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineHeadwearTableViewCell.h b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineHeadwearTableViewCell.h deleted file mode 100644 index 69fba95..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineHeadwearTableViewCell.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// YMMineHeadwearTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class HeadwearModel, XPMineHeadwearTableViewCell; -@protocol XPMineHeadwearTableViewCellDelegate - -///使用头饰 -- (void)xPMineHeadwearTableViewCell:(XPMineHeadwearTableViewCell *)view headwearId:(NSString *)headwearId; - -@end -@interface XPMineHeadwearTableViewCell : UITableViewCell -@property (nonatomic,strong) HeadwearModel *headwearModel; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineHeadwearTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineHeadwearTableViewCell.m deleted file mode 100644 index f9dc58f..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineHeadwearTableViewCell.m +++ /dev/null @@ -1,304 +0,0 @@ -// -// YMMineHeadwearTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import "XPMineHeadwearTableViewCell.h" -///Third -#import -#import -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -#import "SpriteSheetImageManager.h" -///Model -#import "HeadwearModel.h" - -@interface XPMineHeadwearTableViewCell () -///名字 -@property (nonatomic,strong) UIStackView *nameStackView; -///头饰名字 -@property (nonatomic, strong) UIImageView *giveImageView; -///名字 -@property (nonatomic, strong) UILabel *titleLabel; -///还有多少时间 -@property (nonatomic,strong) UIStackView *timeStackView; -///剩余天数 -@property (nonatomic, strong) UILabel *timeLabel; -///使用 -@property (nonatomic,strong) UIButton *useButton; -///显示分割线 -@property (nonatomic,strong) UIView * lineView; -///普通的 -@property (nonatomic,strong) YYAnimatedImageView *headWearImageView; -///头饰播放 -@property (nonatomic, strong) SpriteSheetImageManager *manager; -@property (nonatomic, strong) SVGAImageView *headWearSVGAImageView; -/// 限定 新 -@property (nonatomic,strong) UIImageView *limitImageView; - -@end - -@implementation XPMineHeadwearTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor];; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.headWearImageView]; - [self.contentView addSubview:self.headWearSVGAImageView]; - [self.contentView addSubview:self.nameStackView]; - [self.contentView addSubview:self.timeStackView]; - [self.contentView addSubview:self.useButton]; - [self.contentView addSubview:self.lineView]; - [self.contentView addSubview:self.limitImageView]; - - [self.nameStackView addArrangedSubview:self.giveImageView]; - [self.nameStackView addArrangedSubview:self.titleLabel]; - - [self.timeStackView addArrangedSubview:self.timeLabel]; - -} - -- (void)initSubViewConstraints { - [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.width.mas_equalTo(80); - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(20); - }]; - - [self.headWearSVGAImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.width.mas_equalTo(80); - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(20); - }]; - - [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.headWearImageView.mas_trailing).offset(10); - make.bottom.mas_equalTo(self.headWearImageView.mas_centerY).offset(-3); - }]; - - [self.giveImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(11, 11)); - }]; - - [self.timeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameStackView); - make.top.mas_equalTo(self.headWearImageView.mas_centerY).offset(3); - make.height.mas_equalTo(13); - }]; - - [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.height.mas_equalTo(33); - make.width.mas_equalTo(85); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(105); - make.height.mas_equalTo(0.5); - make.bottom.mas_equalTo(self.contentView); - make.trailing.mas_equalTo(self.contentView).offset(-15); - }]; - - [self.limitImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(self.contentView).offset(20); - make.width.height.mas_equalTo(20); - }]; -} - -#pragma mark - private -- (void)setHeadwearModel:(HeadwearModel *)headwearModel { - _headwearModel = headwearModel; - if (_headwearModel) { - self.titleLabel.text = _headwearModel.headwearName; - self.useButton.hidden = _headwearModel.status != Dressup_Headwear_Status_Ok; - if (_headwearModel.status == Dressup_Headwear_Status_Ok) { - self.timeLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineHeadwearTableViewCell0"), _headwearModel.expireDays]; - } else { - self.timeLabel.text = YMLocalizedString(@"XPMineHeadwearTableViewCell1"); - } - - self.headWearImageView.hidden = YES; - self.headWearSVGAImageView.hidden = YES; - [self.headWearSVGAImageView clear]; - self.giveImageView.hidden =!_headwearModel.isGive; - NSString * headurl = _headwearModel.effect.length > 0 ? _headwearModel.effect : _headwearModel.pic; - if (headurl.length > 0) { - if (_headwearModel.type == 1) { - self.headWearSVGAImageView.hidden = NO; - [self.headWearSVGAImageView setImageName:headurl]; - } else { - self.headWearImageView.hidden = NO; - NSURL *url = [NSURL URLWithString:headurl]; - @kWeakify(self); - [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { - @kStrongify(self); - self.headWearImageView.image = sprit; - } failureBlock:^(NSError * _Nullable error) { - }]; - } - } - - if (_headwearModel.isUsed) { - [_useButton setTitle:YMLocalizedString(@"XPMineHeadwearTableViewCell2") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor cancelButtonTextColor] forState:UIControlStateNormal]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } else { - [_useButton setTitle:YMLocalizedString(@"XPMineHeadwearTableViewCell3") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - - NSString * typeStr; - if (_headwearModel.labelType == DressUpLabelType_New) { - typeStr = @"mine_dressUp_new"; - } else if(_headwearModel.labelType == DressUpLabelType_Limit) { - typeStr = @"mine_dressUp_limit"; - } else if(_headwearModel.labelType == DressUpLabelType_Exclusive) { - typeStr = @"mine_dressUp_exclusive"; - } - if (typeStr.length > 0) { - self.limitImageView.image = [UIImage getLanguageImage:typeStr]; - } - } -} - - - - -#pragma mark - Event Response -- (void)useButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadwearTableViewCell:headwearId:)]) { - NSString * headwearId = self.headwearModel.headwearId; - if (self.headwearModel.isUsed) { - headwearId = @"0"; - } - [self.delegate xPMineHeadwearTableViewCell:self headwearId:headwearId]; - } -} - -#pragma mark - Getter && Setter -- (UIStackView *)nameStackView { - if (!_nameStackView) { - _nameStackView = [[UIStackView alloc] init]; - _nameStackView.axis = UILayoutConstraintAxisHorizontal; - _nameStackView.distribution = UIStackViewDistributionFill; - _nameStackView.alignment = UIStackViewAlignmentCenter; - _nameStackView.spacing = 2; - } - return _nameStackView; -} - -- (UIImageView *)giveImageView { - if (!_giveImageView) { - _giveImageView = [[UIImageView alloc] init]; - _giveImageView.userInteractionEnabled = YES; - _giveImageView.image = [UIImage getLanguageImage:@"mine_dressup_give"]; - } - return _giveImageView; -} - -- (YYAnimatedImageView *)headWearImageView { - if (!_headWearImageView) { - _headWearImageView = [[YYAnimatedImageView alloc] init]; - _headWearImageView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _headWearImageView.contentMode = UIViewContentModeScaleAspectFit; - _headWearImageView.layer.masksToBounds = YES; - _headWearImageView.layer.cornerRadius = 10; - } - return _headWearImageView; -} - - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UIButton *)useButton { - if (!_useButton) { - _useButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_useButton setTitle:YMLocalizedString(@"XPMineHeadwearTableViewCell4") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_useButton addTarget:self action:@selector(useButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _useButton.layer.masksToBounds = YES; - _useButton.layer.cornerRadius = 33/2; - _useButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _useButton; -} - -- (UIStackView *)timeStackView { - if (!_timeStackView) { - _timeStackView = [[UIStackView alloc] init]; - _timeStackView.axis = UILayoutConstraintAxisHorizontal; - _timeStackView.distribution = UIStackViewDistributionFill; - _timeStackView.alignment = UIStackViewAlignmentCenter; - _timeStackView.spacing = 2; - } - return _timeStackView; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:12]; - _timeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _timeLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (SpriteSheetImageManager *)manager { - if (!_manager) { - _manager = [[SpriteSheetImageManager alloc] init]; - } - return _manager; -} - -- (UIImageView *)limitImageView { - if (!_limitImageView) { - _limitImageView = [[UIImageView alloc] init]; - } - return _limitImageView; -} - -- (SVGAImageView *)headWearSVGAImageView { - if (!_headWearSVGAImageView) { - _headWearSVGAImageView = [[SVGAImageView alloc]init]; - _headWearSVGAImageView.backgroundColor = [UIColor clearColor]; - _headWearSVGAImageView.frame = self.bounds; - _headWearSVGAImageView.userInteractionEnabled = YES; - _headWearSVGAImageView.autoPlay = YES; - } - return _headWearSVGAImageView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNameplateTableViewCell.h b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNameplateTableViewCell.h deleted file mode 100644 index a8356b5..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNameplateTableViewCell.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// YMMineNameplateTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class NameplateModel, XPMineNameplateTableViewCell; -@protocol XPMineNameplateTableViewCellDelegate -///使用铭牌 -- (void)xPMineNameplateTableViewCell:(XPMineNameplateTableViewCell *)view nameplateId:(NSString *)nameplateId; - -@end -@interface XPMineNameplateTableViewCell : UITableViewCell -@property (nonatomic,strong) NameplateModel *nameplateModel; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNameplateTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNameplateTableViewCell.m deleted file mode 100644 index e562e21..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNameplateTableViewCell.m +++ /dev/null @@ -1,183 +0,0 @@ -// -// YMMineNameplateTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import "XPMineNameplateTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "NameplateModel.h" - -@interface XPMineNameplateTableViewCell () -///铭牌背景 -@property (nonatomic, strong) UIView *namePlateBgView; -///铭牌 -@property (nonatomic, strong) NetImageView *namePlateImageView; -///名字 -@property (nonatomic, strong) UILabel *titleLabel; -///还有多少时间 -@property (nonatomic,strong) UIStackView *timeStackView; -///剩余天数 -@property (nonatomic, strong) UILabel *timeLabel; -///使用 -@property (nonatomic,strong) UIButton *useButton; - -@end - -@implementation XPMineNameplateTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor];; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.namePlateBgView]; - [self.namePlateBgView addSubview:self.namePlateImageView]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.timeStackView]; - [self.contentView addSubview:self.useButton]; - [self.timeStackView addArrangedSubview:self.timeLabel]; -} - -- (void)initSubViewConstraints { - [self.namePlateBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(64); - make.width.mas_equalTo(136); - make.bottom.mas_equalTo(self); - make.leading.mas_equalTo(self.contentView).offset(15); - }]; - [self.namePlateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - make.width.mas_equalTo(90); - make.centerX.centerY.mas_equalTo(self.namePlateBgView); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.namePlateBgView.mas_trailing).offset(10); - make.bottom.mas_equalTo(self.namePlateBgView.mas_centerY).offset(-3); - }]; - [self.timeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel); - make.top.mas_equalTo(self.namePlateBgView.mas_centerY).offset(3); - }]; - - [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.namePlateBgView); - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.height.mas_equalTo(33); - make.width.mas_equalTo(85); - }]; -} - -#pragma mark - private -- (void)setNameplateModel:(NameplateModel *)nameplateModel { - _nameplateModel = nameplateModel; - if (_nameplateModel) { - self.titleLabel.text = _nameplateModel.nameplateName; - self.useButton.hidden = _nameplateModel.isExpired; - if (!_nameplateModel.isExpired) { - self.timeLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineNameplateTableViewCell0"), @(_nameplateModel.expireDays)]; - } else { - self.timeLabel.text = YMLocalizedString(@"XPMineNameplateTableViewCell1"); - } - self.namePlateImageView.imageUrl = _nameplateModel.nameplateImage; - if (_nameplateModel.isUsing) { - [_useButton setTitle:YMLocalizedString(@"XPMineNameplateTableViewCell2") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor cancelButtonTextColor] forState:UIControlStateNormal]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } else { - [_useButton setTitle:YMLocalizedString(@"XPMineNameplateTableViewCell3") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - } -} -#pragma mark - Event Response -- (void)useButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineNameplateTableViewCell:nameplateId:)]) { - NSString * nameplateId = self.nameplateModel.nId;; - if (self.nameplateModel.isUsing) { - nameplateId = @"0"; - } - [self.delegate xPMineNameplateTableViewCell:self nameplateId:nameplateId]; - } -} - -#pragma mark - Getter && Setter -- (UIView *)namePlateBgView { - if (!_namePlateBgView) { - _namePlateBgView = [[UIView alloc] init]; - _namePlateBgView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _namePlateBgView.layer.masksToBounds = YES; - _namePlateBgView.layer.cornerRadius = 12; - } - return _namePlateBgView; -} - -- (NetImageView *)namePlateImageView { - if (!_namePlateImageView) { - _namePlateImageView = [[NetImageView alloc] init]; - _namePlateImageView.image = [UIImageConstant defaultAvatarPlaceholder]; - _namePlateImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _namePlateImageView;; -} - -- (UIStackView *)timeStackView { - if (!_timeStackView) { - _timeStackView = [[UIStackView alloc] init]; - _timeStackView.axis = UILayoutConstraintAxisHorizontal; - _timeStackView.distribution = UIStackViewDistributionFill; - _timeStackView.alignment = UIStackViewAlignmentCenter; - _timeStackView.spacing = 2; - } - return _timeStackView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UIButton *)useButton { - if (!_useButton) { - _useButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_useButton setTitle:YMLocalizedString(@"XPMineNameplateTableViewCell4") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_useButton addTarget:self action:@selector(useButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _useButton.layer.masksToBounds = YES; - _useButton.layer.cornerRadius = 33/2; - _useButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _useButton; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:12]; - _timeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _timeLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.h b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.h deleted file mode 100644 index 35f8a77..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMMineNobleCardTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/1/6. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class NobleCardModel, XPMineNobleCardTableViewCell; -@protocol XPMineNobleCardTableViewCellDelegate - -///使用VIP资料卡 -- (void)xPMineNobleCardTableViewCell:(XPMineNobleCardTableViewCell *)view nobleCardId:(NSString *)nobleCardId; - -@end - -@interface XPMineNobleCardTableViewCell : UITableViewCell - -@property (nonatomic,strong) NobleCardModel *nobleCardModel; -///代理 -@property (nonatomic,weak) id delegate; - -@end - - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.m deleted file mode 100644 index 087032b..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.m +++ /dev/null @@ -1,247 +0,0 @@ -// -// YMMineNobleCardTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/1/6. -// - -#import "XPMineNobleCardTableViewCell.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -#import "XPRoomGiftAnimationParser.h" -///Model -#import "NobleCardModel.h" - -@interface XPMineNobleCardTableViewCell() - -///容器view -@property (nonatomic, strong) UIView *mainView; -///显示分割线 -@property (nonatomic,strong) UIImageView *lineView; -///卡片底图 -@property (nonatomic, strong) UIImageView *userCardBackImageView; -///卡片外边框 -@property (nonatomic, strong) NetImageView *nobleImageView; -@property (nonatomic, strong) VAPView *vapView; -@property (nonatomic, strong) XPRoomGiftAnimationParser *vapParser; -///名字 -@property (nonatomic, strong) UILabel *titleLabel; -///剩余天数 -@property (nonatomic, strong) UILabel *timeLabel; -///使用 -@property (nonatomic,strong) UIButton *useButton; - -@end - -@implementation XPMineNobleCardTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor];; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.mainView]; - [self.mainView addSubview:self.lineView]; - [self.mainView addSubview:self.titleLabel]; - [self.mainView addSubview:self.timeLabel]; - [self.mainView addSubview:self.useButton]; - [self.mainView addSubview:self.userCardBackImageView]; - [self.mainView addSubview:self.nobleImageView]; - [self.contentView addSubview:self.vapView]; - -} - -- (void)initSubViewConstraints { - [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(224); - make.leading.trailing.mas_equalTo(self).inset(15); - make.top.mas_equalTo(0); - }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.mainView).mas_offset(8); - make.top.mas_equalTo(self.mainView).mas_offset(16); - make.width.mas_equalTo(3); - make.height.mas_equalTo(16); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.lineView.mas_trailing).mas_offset(4); - make.centerY.mas_equalTo(self.lineView); - }]; - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel.mas_trailing).mas_offset(4); - make.centerY.mas_equalTo(self.lineView); - }]; - - [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.lineView); - make.trailing.mas_equalTo(self.mainView).offset(-9); - make.height.mas_equalTo(24); - make.width.mas_equalTo(89); - }]; - - [self.userCardBackImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(110); - make.width.mas_equalTo(285); - make.bottom.mas_equalTo(self.mainView).mas_offset(-4); - make.centerX.mas_equalTo(self.mainView); - }]; - - [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(180); - make.width.mas_equalTo(330); - make.bottom.mas_equalTo(self.userCardBackImageView); - make.centerX.mas_equalTo(self.mainView); - }]; - - [self.vapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.nobleImageView); - }]; -} - -#pragma mark - private - -- (void)setNobleCardModel:(NobleCardModel *)nobleCardModel { - _nobleCardModel = nobleCardModel; - if (_nobleCardModel) { - self.titleLabel.text = nobleCardModel.name; - self.useButton.hidden = nobleCardModel.hasExpired; - if (!nobleCardModel.hasExpired) { - self.timeLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineNobleCardTableViewCell0"), nobleCardModel.expireDays]; - } else { - self.timeLabel.text = YMLocalizedString(@"XPMineNobleCardTableViewCell1"); - } - self.nobleImageView.imageUrl = nobleCardModel.pic; - if (nobleCardModel.used) { - [_useButton setTitle:YMLocalizedString(@"XPMineNobleCardTableViewCell2") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor cancelButtonTextColor] forState:UIControlStateNormal]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } else { - [_useButton setTitle:YMLocalizedString(@"XPMineNobleCardTableViewCell3") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - - NSString *resourcePath = [nobleCardModel.pic pureURLString]; - if (resourcePath.length == 0) { - return; - } - - @kWeakify(self); - [self.vapParser parseWithURL:resourcePath - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [self.vapView setMute:YES]; - [self.vapView playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } - } failureBlock:^(NSError * _Nullable error) { - }]; - } -} - -#pragma mark - Event Response -- (void)useButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineNobleCardTableViewCell:nobleCardId:)]) { - NSString * nobleCardId = self.nobleCardModel.cardId;; - if (self.nobleCardModel.used) { - nobleCardId = @"0"; - } - [self.delegate xPMineNobleCardTableViewCell:self nobleCardId:nobleCardId]; - } -} - -#pragma mark - Getter && Setter -- (UIView *)mainView { - if (!_mainView) { - _mainView = [[UIView alloc] init]; - _mainView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _mainView.layer.cornerRadius = 10; - _mainView.layer.masksToBounds = YES; - } - return _mainView; -} -- (UIImageView *)lineView { - if (!_lineView) { - _lineView = [[UIImageView alloc] init]; - [_lineView setImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFCB47), UIColorFromRGB(0xFFA936)] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(3, 16)]]; - _lineView.layer.cornerRadius = 1.5; - _lineView.layer.masksToBounds = YES; - } - return _lineView; -} -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:10]; - _timeLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _timeLabel; -} - -- (UIButton *)useButton { - if (!_useButton) { - _useButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_useButton setTitle:YMLocalizedString(@"XPMineNobleCardTableViewCell4") forState:UIControlStateNormal]; - [_useButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_useButton addTarget:self action:@selector(useButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _useButton.layer.masksToBounds = YES; - _useButton.layer.cornerRadius = 24/2; - _useButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_useButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _useButton; -} - -- (NetImageView *)nobleImageView { - if (!_nobleImageView) { - _nobleImageView = [[NetImageView alloc] init]; - _nobleImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _nobleImageView;; -} - -- (UIImageView *)userCardBackImageView { - if (!_userCardBackImageView) { - _userCardBackImageView = [[UIImageView alloc] initWithImage:[UIImage getLanguageImage:@"mine_dressup_noble_bg"]]; - _userCardBackImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _userCardBackImageView;; -} - -- (VAPView *)vapView { - if (!_vapView) { - _vapView = [[VAPView alloc] init]; - _vapView.contentMode = UIViewContentModeScaleAspectFill; - } - return _vapView; -} - -- (XPRoomGiftAnimationParser *)vapParser { - if (!_vapParser) { - _vapParser = [[XPRoomGiftAnimationParser alloc] init]; - } - return _vapParser; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPDressSearchViewController.h b/YuMi/Modules/YMMine/View/DressUp/View/XPDressSearchViewController.h deleted file mode 100644 index b3607a0..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressSearchViewController.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMDressSearchViewController.h -// YUMI -// -// Created by YUMI on 2022/7/29. -// - -#import "MvpViewController.h" - -@class DressUpShopModel; -NS_ASSUME_NONNULL_BEGIN - -@interface XPDressSearchViewController : MvpViewController - -@property(nonatomic, strong) DressUpShopModel *selectedModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPDressSearchViewController.m b/YuMi/Modules/YMMine/View/DressUp/View/XPDressSearchViewController.m deleted file mode 100644 index ee5226f..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressSearchViewController.m +++ /dev/null @@ -1,420 +0,0 @@ -// -// YMDressSearchViewController.m -// YUMI -// -// Created by YUMI on 2022/7/29. -// - -#import "XPDressSearchViewController.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "Api+DressUp.h" -#import "NSArray+Safe.h" -///Model -#import "DressUpShopModel.h" -#import "HomeSearchResultModel.h" -///View -#import "XPDressShopSearchTableViewCell.h" -#import "XPHomeSearchNavView.h" -///P -#import "XPHomeSearchPresenter.h" -#import "XPHomeSearchProtocol.h" -///VC -#import "XPRoomViewController.h" -#import "XPMineUserInfoViewController.h" - -#import "ShoppingMallItemPreview.h" - -@interface XPDressSearchViewController ()< -UITableViewDelegate, -UITableViewDataSource, -XPHomeSearchProtocol, -XPHomeSearchNavViewDelegate, -UITextFieldDelegate, -XPDressShopSearchTableViewCellDelegate, -UISearchBarDelegate> -///搜索 -@property (nonatomic,strong) XPHomeSearchNavView *searchView; -@property(nonatomic, strong) UISearchBar *searchBar; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSArray *datasource; - -@property(nonatomic, strong) NSArray *defaultFriendsList; -@property(nonatomic, strong) UIImageView *emptyImageView; -@property(nonatomic, strong) UILabel *emptyTitle; - -@end - -@implementation XPDressSearchViewController - -- (XPHomeSearchPresenter *)createPresenter { - return [[XPHomeSearchPresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.view.backgroundColor = UIColorFromRGB(0x02061D); - - [self setupNavigationBar]; - [self initSubViews]; - [self initSubViewConstraints]; - - @kWeakify(self); - [self.presenter getFriends:^(NSArray * _Nonnull users) { - @kStrongify(self); - NSMutableArray *tempArray = @[].mutableCopy; - for (UserInfoModel *model in users) { - HomeSearchResultModel *resultModel = [[HomeSearchResultModel alloc] initFromUserInfo:model]; - [tempArray addObject:resultModel]; - } - self.defaultFriendsList = tempArray.copy; - self.datasource = tempArray.copy; - [self.tableView reloadData]; - if (users.count == 0) { - [self showEmptyView]; - } - } failure:^(NSError * _Nonnull error) { - - }]; -} - -- (void)setupNavigationBar { - UILabel *titleLabel = [self titleLabel]; - UIButton *backButton = [self backButton]; - [self.view addSubview:titleLabel]; - [self.view addSubview:backButton]; - - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.view).offset(kStatusBarHeight + kSafeAreaTopHeight); - make.height.mas_equalTo(22); - }]; - - [backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).offset(16); - make.centerY.mas_equalTo(titleLabel); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -- (void)didTapBack { - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - Public Method -- (void)searchText:(NSString *)text { - NSString * type = @"2"; - [self.presenter searchRoomList:text type:type]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.searchBar]; - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.searchBar mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.view).offset(kNavigationHeight + 8); - make.leading.trailing.mas_equalTo(self.view).inset(15); - make.height.mas_equalTo(34); - }]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.bottom.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.searchBar.mas_bottom).offset(16); - }]; -} - -- (void)showEmptyView { - if (!_emptyTitle) { - [self.view addSubview:self.emptyTitle]; - [self.view addSubview:self.emptyImageView]; - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.searchBar.mas_bottom).offset(28); - make.size.mas_equalTo(CGSizeMake(110, 110)); - }]; - - [self.view addSubview:self.emptyTitle]; - [self.emptyTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(6); - make.height.mas_equalTo(22); - }]; - } - - self.emptyTitle.hidden = NO; - self.emptyImageView.hidden = NO; -} - -- (void)hideEmptyView { - if (_emptyTitle) { - self.emptyTitle.hidden = YES; - self.emptyImageView.hidden = YES; - } -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 74; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPDressShopSearchTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPDressShopSearchTableViewCell class])]; - if (cell == nil) { - cell = [[XPDressShopSearchTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPDressShopSearchTableViewCell class])]; - } - HomeSearchResultModel * resultModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - - [cell shoppingMallStyle]; - cell.data = resultModel; - cell.delegate = self; - cell.selectionStyle = UITableViewCellSelectionStyleNone; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; -} - -#pragma mark - XPDressShopSearchTableViewCellDelegate -- (void)xPDressShopSearchTableViewCellSendButtonClick:(XPDressShopSearchTableViewCell *)cell { - - ShoppingMallItemPreview *preview = [[ShoppingMallItemPreview alloc] initWith:self.selectedModel - isForGive:YES]; - preview.frame = CGRectMake(0, 0, 284, 353); - [TTPopup popupView:preview style:TTPopupStyleAlert]; - @kWeakify(self); - [preview setGiveWith:^(DressUpShopModel * _Nonnull model) { - @kStrongify(self); - @kWeakify(self); - NSIndexPath *indexPath = [self.tableView indexPathForCell:cell]; - HomeSearchResultModel * resultModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [self showLoading]; - [Api requestSendDress:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [self hideHUD]; - if (code == 200) { - [TTPopup dismiss]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self showSuccessToast:YMLocalizedString(@"XPDressSearchViewController0")]; - }); - } else { - [self showErrorToast:msg]; - } - } id:self.selectedModel.dressUpId targetUid:resultModel.uid]; - }]; -} - -#pragma mark - XPHomeSearchProtocol -- (void)searchRoomSuccess:(NSArray *)data type:(nonnull NSString *)type { - self.datasource = data; - [self.tableView reloadData]; - - if (data.count == 0) { - [self showEmptyView]; - } else { - [self hideEmptyView]; - } -} - -#pragma mark - -- (UIView *)listView { - return self.view; -} - -#pragma mark - UISearchBarDelegate -- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText { - -} - -- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar { - if ([NSString isEmpty:searchBar.text]) { - [self showErrorToast:YMLocalizedString(@"XPDressSearchViewController2")]; - } else { - [searchBar resignFirstResponder]; - [self searchText:searchBar.text]; - } -} - -#pragma mark - UITextFieldDelegate -- (BOOL)textFieldShouldReturn:(UITextField *)textField { - if (textField.text.length > 0) { - [textField resignFirstResponder]; - [self searchText:textField.text]; - } else { - [self showErrorToast:YMLocalizedString(@"XPDressSearchViewController1")]; - } - return YES; -} - -#pragma mark -XPHomeSearchNavViewDelegate -- (void)xPHomeSearchNavView:(XPHomeSearchNavView *)view didClickSearch:(UIButton *)sender { - if (view.searchTextField.text.length > 0) { - [view.searchTextField resignFirstResponder]; - [self searchText:view.searchTextField.text]; - } else { - [self showErrorToast:YMLocalizedString(@"XPDressSearchViewController2")]; - } -} - -- (void)xPHomeSearchNavView:(XPHomeSearchNavView *)view didClickBack:(UIButton *)sender { - [view.searchTextField resignFirstResponder]; - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableHeaderView = [UIView new]; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPDressShopSearchTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPDressShopSearchTableViewCell class])]; - } - return _tableView; -} - -- (XPHomeSearchNavView *)searchView { - if (!_searchView) { - _searchView = [[XPHomeSearchNavView alloc] init]; - _searchView.delegate = self; - _searchView.searchTextField.delegate = self; - } - return _searchView; -} - -- (UIButton *)backButton { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:[kImage(@"vip_center_back_button") ms_SetImageForRTL] - forState:UIControlStateNormal]; - [b addTarget:self - action:@selector(didTapBack) - forControlEvents:UIControlEventTouchUpInside]; - return b; -} - -- (UILabel *)titleLabel { - UILabel *label = [[UILabel alloc] init]; - label.textAlignment = NSTextAlignmentCenter; - label.font = kFontMedium(17); - label.text = YMLocalizedString(@"1.0.30_text_11"); - label.textColor = UIColorFromRGB(0xD9E7F7); - return label; -} - -- (UILabel *)emptyTitle { - if (!_emptyTitle) { - _emptyTitle = [UILabel labelInitWithText:YMLocalizedString(@"XPMomentsRecommendViewController0") - font:kFontRegular(14) - textColor:[UIColor colorWithWhite:1 alpha:0.4]]; - _emptyTitle.textAlignment = NSTextAlignmentCenter; - } - - return _emptyTitle; -} - -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder_UFO]; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UISearchBar *)searchBar { - if (!_searchBar) { - _searchBar = [[UISearchBar alloc] init]; - _searchBar.delegate = self; - [self customizeSearchBar:_searchBar]; - } - return _searchBar; -} - -- (void)customizeSearchBar:(UISearchBar *)searchBar { - // 设置背景颜色和圆角 - searchBar.backgroundImage = [UIImage new]; // 移除默认背景 - searchBar.backgroundColor = UIColorFromRGB(0x061337); - [searchBar setCornerRadius:17]; - - // 设置高度为 34 - CGRect frame = searchBar.frame; - frame.size.height = 34; - searchBar.frame = frame; - - if (@available(iOS 13.0, *)) { - UITextField *searchField = searchBar.searchTextField; - searchField.backgroundColor = [UIColor clearColor]; - searchField.textColor = [UIColor whiteColor]; - searchField.layer.cornerRadius = 17; - searchField.leftView = [[UIImageView alloc] initWithImage:kImage(@"home_search_input_search")]; - searchField.leftViewMode = UITextFieldViewModeAlways; - searchField.attributedPlaceholder = [self searchPlaceHolder]; - } else { - UITextField *searchField = [self findTextFieldInSearchBar:searchBar]; - searchField.textColor = [UIColor whiteColor]; - searchField.backgroundColor = [UIColor clearColor]; - // 设置圆角和背景色 - searchField.backgroundColor = UIColorFromRGB(0x061337); - searchField.layer.cornerRadius = 17; - searchField.layer.masksToBounds = YES; - - // 自定义搜索图标 - UIImageView *iconView = [[UIImageView alloc] initWithImage:kImage(@"home_search_input_search")]; - iconView.contentMode = UIViewContentModeCenter; - iconView.frame = CGRectMake(0, 0, 20, 20); // 调整大小 - - // 设置左视图 - searchField.leftView = iconView; - searchField.leftViewMode = UITextFieldViewModeAlways; - - // 设置占位符样式 - searchField.attributedPlaceholder = [self searchPlaceHolder]; - } -} - -- (NSAttributedString *)searchPlaceHolder { - return [[NSAttributedString alloc] initWithString:YMLocalizedString(@"1.0.30_text_20") - attributes:@{ - NSForegroundColorAttributeName: UIColorRGBAlpha(0xD9E7F7, 0.5), - NSFontAttributeName: kFontRegular(14) - }]; -} - -- (UITextField *)findTextFieldInSearchBar:(UISearchBar *)searchBar { - for (UIView *subview in searchBar.subviews) { - for (UIView *nestedSubview in subview.subviews) { - if ([nestedSubview isKindOfClass:[UITextField class]]) { - return (UITextField *)nestedSubview; - } - } - } - return nil; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopCardViewController.h b/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopCardViewController.h deleted file mode 100644 index a039bd0..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopCardViewController.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMDressUpShopCardViewController.h -// YUMI -// -// Created by YUMI on 2022/7/29. -// - -#import "MvpViewController.h" -#import -#import "XPDressUpShopProtocol.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPDressUpShopCardViewController : MvpViewController - -///类型 -@property (nonatomic,assign) DressUpShopListType type; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopCardViewController.m b/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopCardViewController.m deleted file mode 100644 index 82fc57c..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopCardViewController.m +++ /dev/null @@ -1,194 +0,0 @@ -// -// YMDressUpShopCardViewController.m -// YUMI -// -// Created by YUMI on 2022/7/29. -// - -#import "XPDressUpShopCardViewController.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///View -#import "XPMineDressEmptyTableViewCell.h" -#import "XPDressUpShopCardTableViewCell.h" -#import "XPDressSearchViewController.h" -///P -#import "XPDressUpShopPresenter.h" -///Model -#import "NobleCardModel.h" - -@interface XPDressUpShopCardViewController () - -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSArray *datasource; - -@end - -@implementation XPDressUpShopCardViewController - -- (XPDressUpShopPresenter *)createPresenter { - return [[XPDressUpShopPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} -#pragma mark - XPDressUpShopCardTableViewCellDelegate -///赠送装扮 -- (void)xPDressUpShopCardTableViewCellSendDress:(XPDressUpShopCardTableViewCell *)view dressId:(NSString *)dressId { - XPDressSearchViewController *vc = [[XPDressSearchViewController alloc] init]; -// vc.dressType = self.type; -// vc.dressId = dressId; - [self.navigationController pushViewController:vc animated:YES]; -} - -///购买装扮 -- (void)xPDressUpShopCardTableViewCellBuyDress:(XPDressUpShopCardTableViewCell *)view dressId:(NSString *)dressId { - [self.presenter buyDressUp:self.type dressId:dressId]; -} - -#pragma mark - XPMineDressUpProtocol -- (void)getShopListSuccess:(NSArray *)array type:(DressUpShopListType)type { - if (type == self.type) { - self.datasource = array; - [self.tableView reloadData]; - } -} - -///购买装扮成功 -- (void)buyShopDressSuccessWithType:(DressUpShopListType)type { - if (type == self.type) { - [self showSuccessToast:YMLocalizedString(@"XPDressUpShopCardViewController0")]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"buyDressSuccessNoti" object:nil]; - } -} - -- (void)getUserHeadwearListSuccess:(NSArray *)array { - self.datasource = array; - [self.tableView reloadData]; -} - -- (void)getUserCarListSuccess:(NSArray *)array { - self.datasource = array; - [self.tableView reloadData]; -} - -- (void)getUserNameplateListSuccess:(NSArray *)array { - self.datasource = array; - [self.tableView reloadData]; -} - -- (void)getUserNobleCardListSuccess:(NSArray *)array { - self.datasource = array; - [self.tableView reloadData]; -} - -- (void)useHeadwearSuccess:(NSString *)headWearId { -// [self.presenter getUserHeadwearList]; - [self showSuccessToast:headWearId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController6") : YMLocalizedString(@"XPDressUpShopCardViewController2")]; - -} - -- (void)useCarSuccess:(NSString *)carId { -// [self.presenter getUserCarList]; - [self showSuccessToast:carId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController7") : YMLocalizedString(@"XPDressUpShopCardViewController4")]; -} - -- (void)useNameplateSuccess:(NSString *)nameplateId { -// [self.presenter getUserNameplateList]; - [self showSuccessToast:nameplateId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController8") : YMLocalizedString(@"XPDressUpShopCardViewController6")]; -} - -- (void)userNobleCardSuccess:(NSString *)nobleCardId { - [self showSuccessToast:nobleCardId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController9") : YMLocalizedString(@"XPDressUpShopCardViewController8")]; - if (nobleCardId.integerValue == 0) { - for (NobleCardModel *model in self.datasource) { - model.used = NO; - } - } else { - for (NobleCardModel *model in self.datasource) { - if ([model.cardId isEqualToString:nobleCardId]) { - model.used = YES; - } else { - model.used = NO; - } - } - } - [self.tableView reloadData]; -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? 280 : (KScreenHeight - kNavigationHeight - 100 -50); -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPDressUpShopCardTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPDressUpShopCardTableViewCell class])]; - if (cell == nil) { - cell = [[XPDressUpShopCardTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPDressUpShopCardTableViewCell class])]; - } - cell.nobleCardModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; - } - XPMineDressEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineDressEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineDressEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineDressEmptyTableViewCell class])]; - } - cell.emptyTitle = YMLocalizedString(@"XPDressUpShopCardViewController9"); - return cell; -} - -#pragma mark - Getters And Setters -- (void)setType:(DressUpShopListType)type { - _type = type; - [self.presenter getDressUpShopList:type]; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - _tableView.contentInset = UIEdgeInsetsMake(0, 0, kSafeAreaBottomHeight, 0); - [_tableView registerClass:[XPDressUpShopCardTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPDressUpShopCardTableViewCell class])]; - [_tableView registerClass:[XPMineDressEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineDressEmptyTableViewCell class])]; - } - return _tableView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopListViewController.h b/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopListViewController.h deleted file mode 100644 index 84ed99b..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopListViewController.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMDressUpShopListViewController.h -// YUMI -// -// Created by YUMI on 2022/7/28. -// - -#import "MvpViewController.h" -#import -#import "XPDressUpShopProtocol.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPDressUpShopListViewController : MvpViewController - -///类型 -@property (nonatomic,assign) DressUpShopListType type; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopListViewController.m b/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopListViewController.m deleted file mode 100644 index 0fa6f1b..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopListViewController.m +++ /dev/null @@ -1,221 +0,0 @@ -// -// YMDressUpShopListViewController.m -// YUMI -// -// Created by YUMI on 2022/7/28. -// - -#import "XPDressUpShopListViewController.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///View -#import "XPMineDressEmptyCollectionViewCell.h" -#import "XPDressUpShopCollectionViewCell.h" -#import "XPDressSearchViewController.h" -///P -#import "XPDressUpShopPresenter.h" -///Model -#import "NobleCardModel.h" - -@interface XPDressUpShopListViewController () - -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///数据源 -@property (nonatomic,strong) NSArray *datasource; - -@end - -@implementation XPDressUpShopListViewController - -- (XPDressUpShopPresenter *)createPresenter { - return [[XPDressUpShopPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - XPDressUpShopCollectionViewCellDelegate -- (void)xPDressUpShopCollectionViewCellSendDress:(XPDressUpShopCollectionViewCell *)view - dressId:(NSString *)dressId { - XPDressSearchViewController *vc = [[XPDressSearchViewController alloc] init]; -// vc.dressType = self.type; -// vc.dressId = dressId; - [self.navigationController pushViewController:vc animated:YES]; -} - -- (void)xPDressUpShopCollectionViewCellBuyDress:(XPDressUpShopCollectionViewCell *)view dressId:(NSString *)dressId { - [self.presenter buyDressUp:self.type dressId:dressId]; -} - -#pragma mark - XPMineDressUpProtocol -- (void)getShopListSuccess:(NSArray *)array type:(DressUpShopListType)type { - if (type == self.type) { - self.datasource = array; - [self.collectionView reloadData]; - } -} - -///购买装扮成功 -- (void)buyShopDressSuccessWithType:(DressUpShopListType)type { - if (type == self.type) { - [self showSuccessToast:YMLocalizedString(@"XPDressUpShopListViewController0")]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"buyDressSuccessNoti" object:nil]; - } -} - -- (void)getUserHeadwearListSuccess:(NSArray *)array { - self.datasource = array; - [self.collectionView reloadData]; -} - -- (void)getUserCarListSuccess:(NSArray *)array { - self.datasource = array; - [self.collectionView reloadData]; -} - -- (void)getUserNameplateListSuccess:(NSArray *)array { - self.datasource = array; - [self.collectionView reloadData]; -} - -- (void)getUserNobleCardListSuccess:(NSArray *)array { - self.datasource = array; - [self.collectionView reloadData]; -} - -- (void)useHeadwearSuccess:(NSString *)headWearId { -// [self.presenter getUserHeadwearList]; - [self showSuccessToast:headWearId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController6") : YMLocalizedString(@"XPDressUpShopListViewController2")]; -} - -- (void)useCarSuccess:(NSString *)carId { -// [self.presenter getUserCarList]; - [self showSuccessToast:carId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController7") : YMLocalizedString(@"XPDressUpShopListViewController4")]; -} - -- (void)useNameplateSuccess:(NSString *)nameplateId { -// [self.presenter getUserNameplateList]; - [self showSuccessToast:nameplateId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController8") : YMLocalizedString(@"XPDressUpShopListViewController6")]; -} - -- (void)userNobleCardSuccess:(NSString *)nobleCardId { - [self showSuccessToast:nobleCardId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController9") : YMLocalizedString(@"XPDressUpShopListViewController8")]; - if (nobleCardId.integerValue == 0) { - for (NobleCardModel *model in self.datasource) { - model.used = NO; - } - } else { - for (NobleCardModel *model in self.datasource) { - if ([model.cardId isEqualToString:nobleCardId]) { - model.used = YES; - } else { - model.used = NO; - } - } - } - [self.collectionView reloadData]; -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPDressUpShopCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPDressUpShopCollectionViewCell class]) forIndexPath:indexPath]; - cell.dressUpModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; - } - XPMineDressEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineDressEmptyCollectionViewCell class]) forIndexPath:indexPath]; - cell.emptyTitle = self.type == DressUpShopListType_HeadWear ? YMLocalizedString(@"XPDressUpShopCardViewController10") : self.type == DressUpShopListType_Car ? YMLocalizedString(@"XPDressUpShopCardViewController12") : self.type == DressUpShopListType_Nameplate ? YMLocalizedString(@"XPDressUpShopCardViewController11") : YMLocalizedString(@"XPDressUpShopListViewController12"); - return cell; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - CGFloat width = (KScreenWidth - 42) *0.5; - return CGSizeMake(width, 188); - } else { - return CGSizeMake(KScreenWidth - 32, KScreenHeight - kNavigationHeight - 100 -50); - } -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { - if (self.datasource.count > 0) { - return 12; - } else { - return 0; - } -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { - if (self.datasource.count > 0) { - return 12; - } else { - return 0; - } -} - -#pragma mark - Getters And Setters -- (void)setType:(DressUpShopListType)type { - _type = type; - switch (type) { - case DressUpShopListType_HeadWear: - [self.presenter getDressUpShopList:DressUpShopListType_HeadWear]; - break; - case DressUpShopListType_Car: - [self.presenter getDressUpShopList:DressUpShopListType_Car]; - break; - case DressUpShopListType_Nameplate: - [self.presenter getDressUpShopList:DressUpShopListType_Nameplate]; - break; - case DressUpShopListType_Bubble: - [self.presenter getDressUpShopList:DressUpShopListType_Bubble]; - break; - default: - break; - } -} - - -- (UICollectionView *)collectionView { - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionVertical; - layout.sectionInset = UIEdgeInsetsMake(15, 15, 15, 15); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPDressUpShopCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPDressUpShopCollectionViewCell class])]; - [_collectionView registerClass:[XPMineDressEmptyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineDressEmptyCollectionViewCell class])]; - } - return _collectionView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpBubbleViewController.h b/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpBubbleViewController.h deleted file mode 100644 index 41ccd7f..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpBubbleViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMineDressUpBubbleViewController.h -// YUMI -// -// Created by YUMI on 2022/3/21. -// - -#import "MvpViewController.h" -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineDressUpBubbleViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpBubbleViewController.m b/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpBubbleViewController.m deleted file mode 100644 index a9bc99b..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpBubbleViewController.m +++ /dev/null @@ -1,147 +0,0 @@ -// -// YMMineDressUpBubbleViewController.m -// YUMI -// -// Created by YUMI on 2022/3/21. -// - -#import "XPMineDressUpBubbleViewController.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///View -#import "XPMineDressBubbleCollectionViewCell.h" -#import "XPMineDressEmptyCollectionViewCell.h" -///P -#import "XPMineDressUpPresenter.h" -#import "XPMineDressUpProtocol.h" -///Model -#import "ChatBubbleModel.h" - -@interface XPMineDressUpBubbleViewController () -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///数据源 -@property (nonatomic,strong) NSArray *datasource; - -@end - -@implementation XPMineDressUpBubbleViewController - -- (XPMineDressUpPresenter *)createPresenter { - return [[XPMineDressUpPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self.presenter getUserChatBubbleList]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - XPMineDressBubbleTableViewCellDelegate -- (void)xPMineDressBubbleCollectionViewCell:(XPMineDressBubbleCollectionViewCell *)view bubbleId:(NSString *)bubbleId { - [self.presenter useBubble:bubbleId]; -} - -#pragma mark - XPMineDressUpProtocol -- (void)getUserChatBubbleListSuccess:(NSArray *)array { - self.datasource = array; - [self.collectionView reloadData]; -} - -- (void)useBubbleSuccess:(NSString *)bubbleId { - [self showSuccessToast:bubbleId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpBubbleViewController3") : YMLocalizedString(@"XPMineDressUpBubbleViewController1")]; - if (bubbleId.integerValue == 0) { - for (ChatBubbleModel *model in self.datasource) { - model.hasUsed = NO; - } - } else { - for (ChatBubbleModel *model in self.datasource) { - if ([model.bubbleId isEqualToString:bubbleId]) { - model.hasUsed = YES; - } else { - model.hasUsed = NO; - } - } - } - [self.collectionView reloadData]; -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMineDressBubbleCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineDressBubbleCollectionViewCell class]) forIndexPath:indexPath]; - cell.bubbleModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; - } - XPMineDressEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineDressEmptyCollectionViewCell class]) forIndexPath:indexPath]; - cell.emptyTitle = YMLocalizedString(@"XPMineDressUpBubbleViewController2"); - return cell; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - CGFloat width = (KScreenWidth - 42) *0.5; - CGFloat height = width * 158 / 166.0; - return CGSizeMake(width, height); - } else { - return CGSizeMake(KScreenWidth - 32, KScreenHeight - kNavigationHeight - 100 -50); - } -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { - if (self.datasource.count > 0) { - return 12; - } else { - return 0; - } -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { - if (self.datasource.count > 0) { - return 12; - } else { - return 0; - } -} - -- (UICollectionView *)collectionView { - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionVertical; - layout.sectionInset = UIEdgeInsetsMake(15, 15, 15, 15); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPMineDressBubbleCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineDressBubbleCollectionViewCell class])]; - [_collectionView registerClass:[XPMineDressEmptyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineDressEmptyCollectionViewCell class])]; - } - return _collectionView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpListViewController.h b/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpListViewController.h deleted file mode 100644 index 6904ce7..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpListViewController.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMMineDressUpListViewController.h -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import "MvpViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, DressUpListType) { - DressUpListType_HeadWear = 1, - DressUpListType_Car, - DressUpListType_Nameplate, - DressUpListType_Noble, - DressUpListType_Bubble, -}; - -@interface XPMineDressUpListViewController : MvpViewController -///类型 -@property (nonatomic,assign) DressUpListType type; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpListViewController.m b/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpListViewController.m deleted file mode 100644 index 9a89c57..0000000 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpListViewController.m +++ /dev/null @@ -1,234 +0,0 @@ -// -// YMMineDressUpListViewController.m -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import "XPMineDressUpListViewController.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///View -#import "XPMineHeadwearTableViewCell.h" -#import "XPMineCarTableViewCell.h" -#import "XPMineNameplateTableViewCell.h" -#import "XPMineDressEmptyTableViewCell.h" -#import "XPMineNobleCardTableViewCell.h" -///P -#import "XPMineDressUpPresenter.h" -#import "XPMineDressUpProtocol.h" -///Model -#import "NobleCardModel.h" - -@interface XPMineDressUpListViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSArray *datasource; -@end - -@implementation XPMineDressUpListViewController - -- (XPMineDressUpPresenter *)createPresenter { - return [[XPMineDressUpPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} -#pragma mark - XPMineNameplateTableViewCellDelegate -- (void)xPMineNameplateTableViewCell:(XPMineNameplateTableViewCell *)view nameplateId:(NSString *)nameplateId { - [self.presenter useNameplate:nameplateId]; -} - -#pragma mark - XPMineHeadwearTableViewCellDelegate -- (void)xPMineHeadwearTableViewCell:(XPMineHeadwearTableViewCell *)view headwearId:(NSString *)headwearId { - [self.presenter useHeader:headwearId]; -} -#pragma mark - XPMineCarTableViewCellDelegate -- (void)xPMineCarTableViewCell:(XPMineCarTableViewCell *)cell carId:(NSString *)carId { - [self.presenter useCar:carId]; -} -#pragma mark - XPMineNobleCardTableViewCellDelegate -- (void)xPMineNobleCardTableViewCell:(XPMineNobleCardTableViewCell *)view nobleCardId:(NSString *)nobleCardId { - [self.presenter userNobleCard:nobleCardId]; -} - -#pragma mark - XPMineDressUpProtocol -- (void)getUserHeadwearListSuccess:(NSArray *)array { - self.datasource = array; - [self.tableView reloadData]; -} - -- (void)getUserCarListSuccess:(NSArray *)array { - self.datasource = array; - [self.tableView reloadData]; -} - -- (void)getUserNameplateListSuccess:(NSArray *)array { - self.datasource = array; - [self.tableView reloadData]; -} - -- (void)getUserNobleCardListSuccess:(NSArray *)array { - self.datasource = array; - [self.tableView reloadData]; -} - -- (void)useHeadwearSuccess:(NSString *)headWearId { - [self.presenter getUserHeadwearList]; - [self showSuccessToast:headWearId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController6") : YMLocalizedString(@"XPMineDressUpListViewController1")]; -} - -- (void)useCarSuccess:(NSString *)carId { - [self.presenter getUserCarList]; - [self showSuccessToast:carId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController7") : YMLocalizedString(@"XPMineDressUpListViewController3")]; -} - -- (void)useNameplateSuccess:(NSString *)nameplateId { - [self.presenter getUserNameplateList]; - [self showSuccessToast:nameplateId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController8") : YMLocalizedString(@"XPMineDressUpListViewController5")]; -} - -- (void)userNobleCardSuccess:(NSString *)nobleCardId { - [self showSuccessToast:nobleCardId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController9") : YMLocalizedString(@"XPMineDressUpListViewController7")]; - if (nobleCardId.integerValue == 0) { - for (NobleCardModel *model in self.datasource) { - model.used = NO; - } - } else { - for (NobleCardModel *model in self.datasource) { - if ([model.cardId isEqualToString:nobleCardId]) { - model.used = YES; - } else { - model.used = NO; - } - } - } - [self.tableView reloadData]; -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.type == DressUpListType_Noble) { - return self.datasource.count > 0 ? 236 : (KScreenHeight - kNavigationHeight - 100 -50); - } else if (self.type == DressUpListType_Nameplate) { - return self.datasource.count > 0 ? 76 : (KScreenHeight - kNavigationHeight - 100 -50); - } else { - return self.datasource.count > 0 ? 120 : (KScreenHeight - kNavigationHeight - 100 -50); - } -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - if (self.type == DressUpListType_HeadWear) { - XPMineHeadwearTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineHeadwearTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineHeadwearTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineHeadwearTableViewCell class])]; - } - cell.headwearModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; - } else if(self.type == DressUpListType_Car) { - XPMineCarTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineCarTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineCarTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineCarTableViewCell class])]; - } - cell.carInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; - } else if (self.type == DressUpListType_Noble) { - XPMineNobleCardTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineNobleCardTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineNobleCardTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineNobleCardTableViewCell class])]; - } - cell.nobleCardModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; - } else { - XPMineNameplateTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineNameplateTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineNameplateTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineNameplateTableViewCell class])]; - } - cell.nameplateModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; - } - } - - XPMineDressEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineDressEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineDressEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineDressEmptyTableViewCell class])]; - } - cell.emptyTitle = self.type == DressUpListType_HeadWear ? YMLocalizedString(@"XPMineDressUpListViewController11") : self.type == DressUpListType_Car ? YMLocalizedString(@"XPMineDressUpListViewController12") : YMLocalizedString(@"XPMineDressUpListViewController10" ); - return cell; -} - -#pragma mark - Getters And Setters -- (void)setType:(DressUpListType)type { - _type = type; - switch (type) { - case DressUpListType_HeadWear: - [self.presenter getUserHeadwearList]; - break; - case DressUpListType_Car: - [self.presenter getUserCarList]; - break; - case DressUpListType_Nameplate: - [self.presenter getUserNameplateList]; - break; - case DressUpListType_Noble: - [self.presenter getUserNobleCardList]; - break; - default: - break; - } -} -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - _tableView.contentInset = UIEdgeInsetsMake(0, 0, kSafeAreaBottomHeight, 0); - [_tableView registerClass:[XPMineNameplateTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineNameplateTableViewCell class])]; - [_tableView registerClass:[XPMineCarTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineCarTableViewCell class])]; - [_tableView registerClass:[XPMineHeadwearTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineHeadwearTableViewCell class])]; - [_tableView registerClass:[XPMineNobleCardTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineNobleCardTableViewCell class])]; - [_tableView registerClass:[XPMineDressEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineDressEmptyTableViewCell class])]; - } - return _tableView; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Friend/XPMineAttentionViewController.h b/YuMi/Modules/YMMine/View/Friend/XPMineAttentionViewController.h deleted file mode 100644 index 11726b8..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPMineAttentionViewController.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMMineAttentionViewController.h -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import "MvpViewController.h" -#import -#import "YUMINNNN.h" -#import -NS_ASSUME_NONNULL_BEGIN - -@class XPMineAttentionViewController, FansInfoModel; -@protocol XPMineAttentionViewControllerDelegate - -- (void)xPMineAttentionViewController:(XPMineAttentionViewController *)viewController didSelectItem:(FansInfoModel *)userInfo; - -@end -@interface XPMineAttentionViewController : MvpViewController -///类型 -@property (nonatomic,assign) ContactUseingType type; -///背景色是否为透明 -@property (nonatomic,assign) BOOL isClearColor; -///代理 -@property (nonatomic,weak) id delegate; -/** 控制器 因为房间内聊天没有控制器去push 或者做其他的操作*/ -@property (nonatomic, weak) UIViewController * mainController; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Friend/XPMineAttentionViewController.m b/YuMi/Modules/YMMine/View/Friend/XPMineAttentionViewController.m deleted file mode 100644 index 15212a7..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPMineAttentionViewController.m +++ /dev/null @@ -1,249 +0,0 @@ -// -// XPMineAttentionViewController.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/21. -// - -#import "XPMineAttentionViewController.h" -///Third -#import -#import -///Tool - -///Model -#import "FansInfoModel.h" -///View -#import "XPMineAttentionTableViewCell.h" -#import "XPMineFriendEmptyTableViewCell.h" -///View -#import "XPMineFriendEmptyTableViewCell.h" -#import "XPMineAttentionTableViewCell.h" -///P -#import "XPMineAttentionPresenter.h" -#import "XPMineAttentionProtocol.h" -#import "RoomHostDelegate.h" -///VC -#import "XPMineUserInfoViewController.h" -#import "XPRoomViewController.h" -#import "SessionViewController.h" - -@interface XPMineAttentionViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前页数 -@property (nonatomic,assign) int page; -///更多数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); -@end - -@implementation XPMineAttentionViewController - -- (BOOL)isHiddenNavBar { - return self.type == ContactUseingType_In_Room || self.type == ContactUseingType_In_Session ? YES : NO; -} - -- (XPMineAttentionPresenter *)createPresenter { - return [[XPMineAttentionPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - self.page = 1; - [self.presenter getUserAttentionList:self.page pageSize:20 state:0]; -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMineAttentionViewController0")]; - return; - } - self.page++; - [self.presenter getUserAttentionList:self.page pageSize:20 state:1]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPMineAttentionViewController1"); - if (self.isClearColor) { - self.view.backgroundColor = [UIColor clearColor]; - } - - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - XPMineAttentionProtocol -- (void)getUserAttentionListSuccess:(NSArray *)array state:(int)state { - if (state == 0) { - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - if (array.count > 0) { - self.hasNoMoreData = NO; - [self.datasource addObjectsFromArray:array]; - } else { - self.hasNoMoreData = YES; - [self.tableView.mj_footer endRefreshingWithNoMoreData]; - } - [self.tableView reloadData]; -} - -- (void)getUserAttentionListFail:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? 92 : self.type == ContactUseingType_In_Room ? (KScreenHeight - kNavigationHeight) : (KScreenHeight - 200 - kNavigationHeight); -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMineAttentionTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineAttentionTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineAttentionTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineAttentionTableViewCell class])]; - } - cell.delegate = self; - FansInfoModel * fansInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - fansInfo.useingType = self.type; - cell.fansInfo = fansInfo; - return cell; - } - - XPMineFriendEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineFriendEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - } - cell.emptyTitle = YMLocalizedString(@"XPMineAttentionViewController2"); - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - FansInfoModel * fansInfoModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (self.type == ContactUseingType_In_Room) { - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:[NIMSession session:fansInfoModel.uid type:NIMSessionTypeP2P]]; - sessionVC.openType = SessionListOpenTypeRoom; - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromRight; - [self.mainController.view.layer addAnimation:transition forKey:nil]; - [self.mainController addChildViewController:sessionVC]; - [self.mainController.view addSubview:sessionVC.view]; - } else if(self.type == ContactUseingType_Share){ - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineAttentionViewController:didSelectItem:)]) { - [self.delegate xPMineAttentionViewController:self didSelectItem:fansInfoModel]; - } - } else { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = fansInfoModel.uid.integerValue; - [self.navigationController pushViewController:userInfoVC animated:YES]; - } - } -} - -#pragma mark - XPMineAttentionTableViewCellDelegate -- (void)xPMineAttentionTableViewCell:(XPMineAttentionTableViewCell *)view findUser:(NSString *)uid { - [self.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - [self.navigationController popToRootViewControllerAnimated:NO]; - XPRoomViewController * rooomVC = obj; - [rooomVC exitRoom]; - *stop = YES; - } - }]; - [XPRoomViewController openRoom:uid viewController:self]; -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} -- (UIScrollView *)listScrollView { - return self.tableView; -} -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - if(self.scrollCallback){ - self.scrollCallback = callback; - } - -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - if(self.scrollCallback){ - self.scrollCallback(scrollView); - } -} -#pragma mark - Getters And Setters - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineFriendEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - [_tableView registerClass:[XPMineAttentionTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineAttentionTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.h b/YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.h deleted file mode 100644 index 98d74e6..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMineContactViewController.h -// YUMI -// -// Created by YUMI on 2022/5/29. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineContactViewController : BaseViewController -///私聊的用户 -@property (nonatomic,copy) NSString *chatUserId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.m b/YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.m deleted file mode 100644 index 2b96ad1..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.m +++ /dev/null @@ -1,192 +0,0 @@ -// -// YMMineContactViewController.m -// YUMI -// -// Created by YUMI on 2022/5/29. -// - -#import "XPMineContactViewController.h" -///Third -#import -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -///View -#import "SessionViewController.h" -#import "SessionListViewController.h" -#import "XPMineFriendViewController.h" -#import "XPMineAttentionViewController.h" -#import "XPMineFansViewController.h" -@interface XPMineContactViewController () -///标题 -@property (nonatomic,strong) NSArray *titles; -///滑块 -@property (nonatomic,strong) JXCategoryTitleView *titleView; -@property (nonatomic, strong) JXCategoryListContainerView *listContainerView; -///回话 -@property (nonatomic,strong) SessionListViewController *sessionListVC; -///好友 -@property (nonatomic,strong) XPMineFriendViewController *friendVC; -///关注 -@property (nonatomic,strong) XPMineAttentionViewController *attentionVC; -///粉丝 -@property (nonatomic,strong) XPMineFansViewController *fansVC; -@end - -@implementation XPMineContactViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - [self.view addSubview:self.titleView]; - [self.view addSubview:self.listContainerView]; - -} - -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(50); - }]; - - [self.listContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.titleView.mas_bottom); - }]; -} - - -#pragma mark - JXCategoryListContainerViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -// 根据下标 index 返回对应遵守并实现 `JXCategoryListContentViewDelegate` 协议的列表实例 -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { -// [self addChildViewController:self.sessionListVC]; - return self.sessionListVC; - }else if (index == 1) { -// [self addChildViewController:self.friendVC]; - return self.friendVC; - } else if(index == 2) { -// [self addChildViewController:self.fansVC]; - return self.fansVC; - } else { -// [self addChildViewController:self.attentionVC]; - return self.attentionVC; - } -} - -#pragma mark - Getters And Setters -- (void)setChatUserId:(NSString *)chatUserId { - _chatUserId = chatUserId; - if (_chatUserId) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - NIMSession *recentSession = [NIMSession session:self.chatUserId type:NIMSessionTypeP2P]; - SessionViewController * sessionVC =[[SessionViewController alloc] initWithSession:recentSession]; - sessionVC.openType = SessionListOpenTypeRoom; - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromRight; - [self.view.layer addAnimation:transition forKey:nil]; - [self.view addSubview:sessionVC.view]; - [self addChildViewController:sessionVC]; - }); - } -} - - -- (JXCategoryListContainerView *)listContainerView { - if (!_listContainerView) { - _listContainerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _listContainerView.listCellBackgroundColor = [UIColor clearColor]; - } - return _listContainerView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"TabbarViewController4"), YMLocalizedString(@"XPMonentsTooBarView2"),YMLocalizedString(@"XPMineHeadView5"), YMLocalizedString(@"XPMineContactViewController3")]; - } - return _titles; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] initWithFrame:CGRectZero]; - _titleView.backgroundColor =[UIColor clearColor]; - _titleView.titleColor = UIColorFromRGB(0x444444); - _titleView.titleSelectedColor = [DJDKMIMOMColor mainTextColor]; - _titleView.titleFont = [UIFont systemFontOfSize:16 weight:UIFontWeightSemibold]; - _titleView.titleSelectedFont = [UIFont systemFontOfSize:18 weight:UIFontWeightHeavy]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.averageCellSpacingEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.titles = self.titles; - _titleView.delegate = self; - _titleView.cellSpacing = 0; - _titleView.cellWidth = (CGFloat)KScreenWidth/ 4.0; - _titleView.listContainer = self.listContainerView; - - JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init]; - lineView.indicatorColor = [DJDKMIMOMColor appMainColor]; - lineView.indicatorWidth = 8.f; - lineView.indicatorHeight = 4.f; - lineView.indicatorCornerRadius = 2.f; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (SessionListViewController *)sessionListVC { - if (!_sessionListVC) { - _sessionListVC = [[SessionListViewController alloc] initWithType:SessionListOpenTypeRoom]; - _sessionListVC.mainController = self; - } - return _sessionListVC; -} - -- (XPMineAttentionViewController *)attentionVC { - if (!_attentionVC) { - _attentionVC = [[XPMineAttentionViewController alloc] init]; - _attentionVC.type = ContactUseingType_In_Room; - _attentionVC.mainController = self; - } - return _attentionVC; -} - -- (XPMineFriendViewController *)friendVC { - if (!_friendVC) { - _friendVC = [[XPMineFriendViewController alloc] init]; - _friendVC.type = ContactUseingType_In_Room; - _friendVC.mainController = self; - } - return _friendVC; -} - -- (XPMineFansViewController *)fansVC { - if (!_fansVC) { - _fansVC = [[XPMineFansViewController alloc] init]; - _fansVC.type = ContactUseingType_In_Room; - _fansVC.mainController = self; - } - return _fansVC; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Friend/XPMineFansViewController.h b/YuMi/Modules/YMMine/View/Friend/XPMineFansViewController.h deleted file mode 100644 index 8c61797..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPMineFansViewController.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// YMMineFansViewController.h -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import "MvpViewController.h" -#import -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN -@class XPMineFansViewController, FansInfoModel; -@protocol XPMineFansViewControllerDelegate - -- (void)xPMineFansViewController:(XPMineFansViewController *)view didSelectItem:(FansInfoModel *)userInfo; - -@end - -@interface XPMineFansViewController : MvpViewController -///类型 -@property (nonatomic,assign) ContactUseingType type; -///背景色是否为透明 -@property (nonatomic,assign) BOOL isClearColor; -///代理 -@property (nonatomic,weak) id delegate; -/** 控制器 因为房间内聊天没有控制器去push 或者做其他的操作*/ -@property (nonatomic, weak) UIViewController * mainController; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Friend/XPMineFansViewController.m b/YuMi/Modules/YMMine/View/Friend/XPMineFansViewController.m deleted file mode 100644 index ff977c6..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPMineFansViewController.m +++ /dev/null @@ -1,251 +0,0 @@ -// -// XPMineFansViewController.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/21. -// - -#import "XPMineFansViewController.h" -///Third -#import -#import -///Tool" -///Model -#import "FansInfoModel.h" -///View -#import "XPMineFriendEmptyTableViewCell.h" -#import "XPMineFansTableViewCell.h" -///P -#import "XPMineFansPresenter.h" -#import "XPMineFansProtocol.h" -///VC -#import "XPMineUserInfoViewController.h" -#import "SessionViewController.h" -#import -@interface XPMineFansViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前页数 -@property (nonatomic,assign) int page; -///更多数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); -@end - -@implementation XPMineFansViewController - -- (BOOL)isHiddenNavBar { - return self.type == ContactUseingType_In_Room || self.type == ContactUseingType_In_Session ? YES : NO; - -} - -- (XPMineFansPresenter *)createPresenter { - return [[XPMineFansPresenter alloc] init]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [self.tableView reloadData]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - self.page = 1; - [self.presenter getUserFansList:self.page pageSize:20 state:0]; -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMineFansViewController0")]; - return; - } - self.page++; - [self.presenter getUserFansList:self.page pageSize:20 state:1]; -} - -#pragma mark - Private Method -- (void)initSubViews { -// self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPMineFansViewController1"); - if(self.isClearColor){ - self.view.backgroundColor = [UIColor clearColor]; - }else{ - self.view.backgroundColor = [UIColor whiteColor]; - } - - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - XPMineFansProtocol -- (void)getUserFansListSuccess:(NSArray *)array state:(int)state { - if (state == 0) { - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - if (array.count > 0) { - self.hasNoMoreData = NO; - [self.datasource addObjectsFromArray:array]; - } else { - self.hasNoMoreData = YES; - [self.tableView.mj_footer endRefreshingWithNoMoreData]; - } - [self.tableView reloadData]; -} - -- (void)getUserFansListFail:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -- (void)attentionFansSuccess { - /// 因为不知道是不是接口请求的问题 需要等一会才能 和云信的好友关系同步 所以加个延迟吧 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self showSuccessToast:YMLocalizedString(@"XPMineFansViewController2")]; - [self.tableView reloadData]; - }); -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? 92 : self.type == ContactUseingType_In_Room ? (KScreenHeight - kNavigationHeight) : (KScreenHeight - 200 - kNavigationHeight); -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMineFansTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineFansTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineFansTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineFansTableViewCell class])]; - } - cell.delegate = self; - FansInfoModel * fansInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - fansInfo.useingType = self.type; - cell.fansInfo = fansInfo; - return cell; - } - - XPMineFriendEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineFriendEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - } - cell.emptyTitle = YMLocalizedString(@"XPMineFansViewController3"); - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - FansInfoModel * fansInfoModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (self.type == ContactUseingType_In_Room) { - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:[NIMSession session:fansInfoModel.uid type:NIMSessionTypeP2P]]; - sessionVC.openType = SessionListOpenTypeRoom; - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromRight; - [self.mainController.view.layer addAnimation:transition forKey:nil]; - [self.mainController addChildViewController:sessionVC]; - [self.mainController.view addSubview:sessionVC.view]; - } else if(self.type == ContactUseingType_Share) { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineFansViewController:didSelectItem:)]) { - [self.delegate xPMineFansViewController:self didSelectItem:fansInfoModel]; - } - } else { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = fansInfoModel.uid.integerValue; - [self.navigationController pushViewController:userInfoVC animated:YES]; - } - } -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} -- (UIScrollView *)listScrollView { - return self.tableView; -} -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - self.scrollCallback = callback; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - if(self.scrollCallback){ - self.scrollCallback(scrollView); - } -} -#pragma mark - mark -- (void)xPMineFansTableViewCell:(XPMineFansTableViewCell *)view didClickAttention:(NSString *)uid { - if (uid.length > 0) { - [self.presenter attentionFans:uid]; - } -} - -#pragma mark - Getters And Setters - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineFriendEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - [_tableView registerClass:[XPMineFansTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineFansTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Friend/XPMineFriendViewController.h b/YuMi/Modules/YMMine/View/Friend/XPMineFriendViewController.h deleted file mode 100644 index d04fcc7..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPMineFriendViewController.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMMineFriendViewController.h -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import "MvpViewController.h" -#import -#import "YUMINNNN.h" -#import -NS_ASSUME_NONNULL_BEGIN -@class XPMineFriendViewController, UserInfoModel; -@protocol XPMineFriendViewControllerDelegate - -- (void)xPMineFriendViewController:(XPMineFriendViewController *)viewController didSelectItem:(UserInfoModel *)userInfo; - -@end -@interface XPMineFriendViewController : MvpViewController -@property(nonatomic, assign) BOOL isFromMineTab; -///类型 -@property (nonatomic,assign) ContactUseingType type; -///背景色是否为透明 -@property (nonatomic,assign) BOOL isClearColor; -///代理 -@property (nonatomic,weak) id delegate; -/** 控制器 因为房间内聊天没有控制器去push 或者做其他的操作*/ -@property (nonatomic, weak) UIViewController * mainController; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Friend/XPMineFriendViewController.m b/YuMi/Modules/YMMine/View/Friend/XPMineFriendViewController.m deleted file mode 100644 index 0286f4f..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPMineFriendViewController.m +++ /dev/null @@ -1,230 +0,0 @@ -// -// XPMineFriendViewController.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/21. -// - -#import "XPMineFriendViewController.h" -///Third -#import -#import -#import -///Tool - -///Model -#import "UserInfoModel.h" -///View -#import "XPMineFriendEmptyTableViewCell.h" -#import "XPMineFriendTableViewCell.h" -#import "SessionViewController.h" -#import "XPMineUserInfoViewController.h" -///P -#import "XPMineFriendPresenter.h" -#import "XPMineFriendProtocol.h" - -@interface XPMineFriendViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前页数 -@property (nonatomic,assign) int page; -///更多数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); -@end - -@implementation XPMineFriendViewController - -- (__kindof id)createPresenter { - return [[XPMineFriendPresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return self.type == ContactUseingType_In_Room || self.type == ContactUseingType_In_Session ? YES : NO; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = YMLocalizedString(@"XPTreasureFairyFriendView0"); - self.datasource = @[].mutableCopy; - - [self initSubViews]; - [self initSubViewConstraints]; - - [self addRefreshControl]; - [self addLoadControl]; - - self.page = 1; - if (self.isHiddenNavBar) { - [self loadData]; - }else { - [self.tableView.mj_header beginRefreshing]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - if (self.isClearColor){ - self.view.backgroundColor = [UIColor clearColor]; - }else{ - self.view.backgroundColor = [UIColor whiteColor]; - } - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -- (void)addRefreshControl { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(handlePullToRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; -} - -- (void)addLoadControl { - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; -} - -- (void)handlePullToRefresh { - self.page = 1; - [self loadData]; - [self.tableView.mj_footer resetNoMoreData]; -} - -- (void)footerRefresh { - self.page += 1; - [self loadData]; -} - -- (void)loadData { - [self.presenter getFriends:self.page]; -} - -- (void)getFriendsList:(NSArray *)list { - if (self.page == 1) { - self.datasource = list.mutableCopy; - } else { - [self.datasource addObjectsFromArray:list]; - } - - [self.tableView reloadData]; - [self.tableView.mj_header endRefreshing]; - [self.tableView.mj_footer endRefreshing]; -} - -- (void)getFriendsFailure { - [self.tableView.mj_header endRefreshing]; - [self.tableView.mj_footer endRefreshing]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? 92 : self.type == ContactUseingType_In_Room ? (KScreenHeight - kNavigationHeight) : (KScreenHeight - 200 - kNavigationHeight); -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMineFriendTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineFriendTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineFriendTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineFriendTableViewCell class])]; - } - cell.userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } - - XPMineFriendEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineFriendEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - } - cell.emptyTitle = YMLocalizedString(@"XPMineFriendViewController0"); - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - UserInfoModel * userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (self.isFromMineTab) { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = userInfo.uid; - [self.navigationController pushViewController:userInfoVC animated:YES]; - }else { - if (self.type == ContactUseingType_Share) { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineFriendViewController:didSelectItem:)]) { - [self.delegate xPMineFriendViewController:self didSelectItem:userInfo]; - } - } else if(self.type == ContactUseingType_In_Room) { - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:[NIMSession session:[NSString stringWithFormat:@"%ld", userInfo.uid] type:NIMSessionTypeP2P]]; - sessionVC.openType = SessionListOpenTypeRoom; - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromRight; - [self.mainController.view.layer addAnimation:transition forKey:nil]; - [self.mainController addChildViewController:sessionVC]; - [self.mainController.view addSubview:sessionVC.view]; - } else { - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:[NIMSession session:[NSString stringWithFormat:@"%ld", userInfo.uid] type:NIMSessionTypeP2P]]; - if (self.type == ContactUseingType_Normal) { - sessionVC.openType = SessionListOpenTypeRoom; - } else { - sessionVC.openType = self.type == ContactUseingType_In_Session ? SessionListOpenTypeDefault : SessionListOpenTypeRoom; - } - [self.navigationController pushViewController:sessionVC animated:YES]; - } - } - } -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} -- (UIScrollView *)listScrollView { - return self.tableView; -} -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - self.scrollCallback = callback; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - if(self.scrollCallback){ - self.scrollCallback(scrollView); - } -} -#pragma mark - Getters And Setters - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.rowHeight = 65; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineFriendEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - [_tableView registerClass:[XPMineFriendTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineFriendTableViewCell class])]; - } - return _tableView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.h b/YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.h deleted file mode 100644 index 81db222..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// YMMineShareViewController.h -// YUMI -// -// Created by YUMI on 2022/6/27. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@class XPShareInfoModel; - -typedef NS_ENUM(NSInteger, MineShareType) { - ///分享动态 - MineShareType_Monents = 1, -}; - -@interface XPMineShareViewController : BaseViewController -@property (nonatomic,strong) XPShareInfoModel *shareInfo; -///分享的类型 -@property (nonatomic,assign) MineShareType shareType; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.m b/YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.m deleted file mode 100644 index 7239033..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.m +++ /dev/null @@ -1,232 +0,0 @@ -// -// YMMineShareViewController.m -// YUMI -// -// Created by YUMI on 2022/6/27. -// - -#import "XPMineShareViewController.h" -///Third -#import -#import -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "TTPopup.h" -///Model -#import "XPShareInfoModel.h" -#import "FansInfoModel.h" -#import "UserInfoModel.h" -#import "AttachMentModel.h" -#import "ContentShareMonentsModel.h" -///View -#import "SessionViewController.h" -#import "SessionListViewController.h" -#import "XPMineFriendViewController.h" -#import "XPMineAttentionViewController.h" -#import "XPMineFansViewController.h" -@interface XPMineShareViewController () -///标题 -@property (nonatomic,strong) NSArray *titles; -///滑块 -@property (nonatomic,strong) JXCategoryTitleView *titleView; -@property (nonatomic, strong) JXCategoryListContainerView *listContainerView; -///好友 -@property (nonatomic,strong) XPMineFriendViewController *friendVC; -///关注 -@property (nonatomic,strong) XPMineAttentionViewController *attentionVC; -///粉丝 -@property (nonatomic,strong) XPMineFansViewController *fansVC; -///回话的id -@property (nonatomic,copy) NSString *sessionId; -@end - -@implementation XPMineShareViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineShareViewController0"); - [self.view addSubview:self.titleView]; - [self.view addSubview:self.listContainerView]; -} - -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(50); - }]; - - [self.listContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.titleView.mas_bottom); - }]; -} - -- (void)sendCustomMessage:(AttachmentModel *)attachment { - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - NIMSessionType sessionType = NIMSessionTypeP2P; - //构造会话 - NIMSession *session = [NIMSession session:self.sessionId type:sessionType]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; -} - -- (void)shareToUser:(NSString *)nick { - NSString * title; - AttachmentModel * attachment = [[AttachmentModel alloc] init]; - - // 添加类型安全检查 - if (![self.shareInfo isKindOfClass:[XPShareInfoModel class]]) { - NSLog(@"警告：self.shareInfo不是XPShareInfoModel类型，而是%@类型", NSStringFromClass([self.shareInfo class])); - return; - } - - switch (self.shareType) { - case MineShareType_Monents: - { - title = [NSString stringWithFormat:YMLocalizedString(@"XPMineShareViewController1"), nick]; - attachment.first = CustomMessageType_Monents; - attachment.second = Custom_Message_Sub_Monents_Share; - ContentShareMonentsModel * shareInfo = [[ContentShareMonentsModel alloc] init]; - shareInfo.imageUrl = self.shareInfo.imageUrl; - shareInfo.nick = self.shareInfo.nick; - shareInfo.content = self.shareInfo.content; - shareInfo.dynamicId= self.shareInfo.dynamicId; - shareInfo.routerValue = self.shareInfo.dynamicId; - shareInfo.routerType = 50; - attachment.data = shareInfo.model2dictionary; - } - - break; - - default: - break; - } - if (title.length > 0) { - [TTPopup alertWithMessage:title confirmHandler:^{ - [self sendCustomMessage:attachment]; - } cancelHandler:^{ - - }]; - } -} - -#pragma mark - JXCategoryListContainerViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -// 根据下标 index 返回对应遵守并实现 `JXCategoryListContentViewDelegate` 协议的列表实例 -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.friendVC; - } else if(index == 1) { - return self.fansVC; - } else { - return self.attentionVC; - } -} - -#pragma mark - XPMineAttentionViewControllerDelegate -///点击了关注的某个人 -- (void)xPMineAttentionViewController:(XPMineAttentionViewController *)viewController didSelectItem:(FansInfoModel *)userInfo { - self.sessionId = userInfo.uid; - [self shareToUser:userInfo.nick]; -} - -#pragma mark - XPMineFansViewControllerDelegate -///点击了粉丝 -- (void)xPMineFansViewController:(XPMineFansViewController *)view didSelectItem:(FansInfoModel *)userInfo { - self.sessionId = userInfo.uid; - [self shareToUser:userInfo.nick]; -} - -#pragma mark - XPMineFriendViewControllerDelegate -///点击了好友 -- (void)xPMineFriendViewController:(XPMineFriendViewController *)viewController didSelectItem:(UserInfoModel *)userInfo { - self.sessionId = [NSString stringWithFormat:@"%ld", userInfo.uid]; - [self shareToUser:userInfo.nick]; -} - -#pragma mark - Getters And Setters - -- (JXCategoryListContainerView *)listContainerView { - if (!_listContainerView) { - _listContainerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _listContainerView.listCellBackgroundColor = [UIColor clearColor]; - } - return _listContainerView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMonentsTooBarView3"),YMLocalizedString(@"XPMineContactViewController3"), YMLocalizedString(@"XPMineShareViewController4")]; - } - return _titles; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] initWithFrame:CGRectZero]; - _titleView.backgroundColor =[UIColor clearColor]; - _titleView.titleColor = UIColorFromRGB(0x444444); - _titleView.titleSelectedColor = [DJDKMIMOMColor mainTextColor]; - _titleView.titleFont = [UIFont systemFontOfSize:16 weight:UIFontWeightSemibold]; - _titleView.titleSelectedFont = [UIFont systemFontOfSize:18 weight:UIFontWeightHeavy]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.averageCellSpacingEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.titles = self.titles; - _titleView.delegate = self; - _titleView.cellSpacing = 0; - _titleView.cellWidth = (CGFloat)KScreenWidth/ 3.0; - _titleView.listContainer = self.listContainerView; - - JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init]; - lineView.indicatorColor = [DJDKMIMOMColor appMainColor]; - lineView.indicatorWidth = 8.f; - lineView.indicatorHeight = 4.f; - lineView.indicatorCornerRadius = 2.f; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (XPMineAttentionViewController *)attentionVC { - if (!_attentionVC) { - _attentionVC = [[XPMineAttentionViewController alloc] init]; - _attentionVC.type = ContactUseingType_Share; - _attentionVC.delegate = self; - } - return _attentionVC; -} - -- (XPMineFriendViewController *)friendVC { - if (!_friendVC) { - _friendVC = [[XPMineFriendViewController alloc] init]; - _friendVC.type = ContactUseingType_Share; - _friendVC.delegate = self; - } - return _friendVC; -} - -- (XPMineFansViewController *)fansVC { - if (!_fansVC) { - _fansVC = [[XPMineFansViewController alloc] init]; - _fansVC.type = ContactUseingType_Share; - _fansVC.delegate = self; - } - return _fansVC; -} -@end diff --git a/YuMi/Modules/YMMine/View/Friend/XPRoomHalfMessageView.h b/YuMi/Modules/YMMine/View/Friend/XPRoomHalfMessageView.h deleted file mode 100644 index 0faa394..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPRoomHalfMessageView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMRoomHalfMessageView.h -// YUMI -// -// Created by YUMI on 2022/5/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomHalfMessageView : UIView -///私聊的用户ID -@property (nonatomic,copy) NSString *chatUserId; - - -- (instancetype)initWithFrame:(CGRect)frame controller:(UIViewController *)controller; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Friend/XPRoomHalfMessageView.m b/YuMi/Modules/YMMine/View/Friend/XPRoomHalfMessageView.m deleted file mode 100644 index c9d12dd..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPRoomHalfMessageView.m +++ /dev/null @@ -1,95 +0,0 @@ -// -// YMRoomHalfMessageView.m -// YUMI -// -// Created by YUMI on 2022/5/29. -// - -#import "XPRoomHalfMessageView.h" -///Third -#import -#import "YUMIMacroUitls.h" -#import "BaseNavigationController.h" -#import "XCCurrentVCStackManager.h" -///View -#import "XPMineContactViewController.h" - -UIKIT_EXTERN NSString * kRoomChatPushViewKey; - -@interface XPRoomHalfMessageView () -///点击消失的View -@property (nonatomic,strong) UIView *dismissView; -///联系人的VC -@property (nonatomic,strong) XPMineContactViewController *contactVC; -@property (nonatomic,weak) UIViewController *roomVC; -@end - -@implementation XPRoomHalfMessageView - - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - self.tag = 888; - [self initSubViews]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(dismissViewTap) name:kRoomChatPushViewKey object:nil]; - } - return self; -} - -- (instancetype)initWithFrame:(CGRect)frame controller:(UIViewController *)controller { - self = [super initWithFrame:frame]; - if (self) { - self.tag = 888; - self.roomVC = controller; - [self initSubViews]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(dismissViewTap) name:kRoomChatPushViewKey object:nil]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - XPMineContactViewController * vc=[XPMineContactViewController new]; - CAShapeLayer * layer = [CAShapeLayer layer]; - UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, kHalfScreenHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)]; - layer.path = path.CGPath; - vc.view.layer.masksToBounds = YES; - vc.view.layer.mask = layer;; - vc.view.frame = CGRectMake(0, KScreenHeight - kHalfScreenHeight, KScreenWidth, kHalfScreenHeight); - self.contactVC = vc; - - - [self addSubview:self.dismissView]; - [self addSubview:self.contactVC.view]; - [self.roomVC addChildViewController:vc]; -} - -#pragma mark - Event Response -- (void)dismissViewTap { - [self removeFromSuperview]; - [self.contactVC removeFromParentViewController]; - [self.contactVC.view removeFromSuperview]; - self.contactVC = nil; - [[NSNotificationCenter defaultCenter] postNotificationName:@"roomMessageTabelViewStopScroll" object:nil]; -} - -#pragma mark - Getters And Setters -- (void)setChatUserId:(NSString *)chatUserId { - _chatUserId = chatUserId; - self.contactVC.chatUserId = chatUserId; -} - - - -- (UIView *)dismissView { - if (!_dismissView) { - _dismissView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight - kHalfScreenHeight)]; - _dismissView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissViewTap)]; - [_dismissView addGestureRecognizer:tap]; - _dismissView.tag = 8888; - } - return _dismissView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Friend/XPRoomMessageBubbleView.h b/YuMi/Modules/YMMine/View/Friend/XPRoomMessageBubbleView.h deleted file mode 100644 index d49bf4a..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPRoomMessageBubbleView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMRoomMessageBubbleView.h -// YUMI -// -// Created by YUMI on 2022/6/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class NIMRecentSession, XPRoomMessageBubbleView; -@protocol XPRoomMessageBubbleViewDelegate - -- (void)xPRoomMessageBubbleView:(XPRoomMessageBubbleView *)view didSelectSession:(NIMRecentSession *)session; - -@end - -@interface XPRoomMessageBubbleView : UIView - -- (void)addRecentSession:(NIMRecentSession *)session; -///代理 -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Friend/XPRoomMessageBubbleView.m b/YuMi/Modules/YMMine/View/Friend/XPRoomMessageBubbleView.m deleted file mode 100644 index 3c65b86..0000000 --- a/YuMi/Modules/YMMine/View/Friend/XPRoomMessageBubbleView.m +++ /dev/null @@ -1,219 +0,0 @@ -// -// YMRoomMessageBubbleView.m -// YUMI -// -// Created by YUMI on 2022/6/14. -// - -#import "XPRoomMessageBubbleView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "NIMMessageUtils.h" -#import "NSArray+Safe.h" - - -@interface XPRoomMessageBubbleCollectionViewCell : UICollectionViewCell -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///内容 -@property (nonatomic,strong) UILabel *contentLabel; -///回话 -@property (nonatomic,strong) NIMRecentSession *session; -@end - -@implementation XPRoomMessageBubbleCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.contentLabel]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(4); - make.leading.mas_equalTo(4); - make.width.height.mas_equalTo(25); - }]; - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(4); - make.trailing.mas_equalTo(-4); - make.centerY.mas_equalTo(self.avatarImageView.mas_centerY); - }]; - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-4); - make.leading.mas_equalTo(4); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).mas_offset(4); - }]; -} -#pragma mark - Getters And Setters -- (void)setSession:(NIMRecentSession *)session { - _session = session; - if (_session) { - NIMUser *user = [[NIMSDK sharedSDK].userManager userInfo:session.session.sessionId]; - NSString *avatarUrl = user.userInfo.avatarUrl; - self.avatarImageView.imageUrl = avatarUrl; - self.nickLabel.text = user.userInfo.nickName; - [self.nickLabel sizeToFit]; - self.contentLabel.text = [NIMMessageUtils messageContent:session.lastMessage]; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 25/2; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightBold]; - _nickLabel.textColor = [DJDKMIMOMColor appMainColor]; - } - return _nickLabel; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[UILabel alloc] init]; - _contentLabel.font = [UIFont systemFontOfSize:10]; - _contentLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _contentLabel; -} - -@end - -@interface XPRoomMessageBubbleView () -///背景图 -@property (nonatomic,strong) UIImageView *backImageView; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -@end - - -@implementation XPRoomMessageBubbleView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Public Method -- (void)addRecentSession:(NIMRecentSession *)session { - [NSObject cancelPreviousPerformRequestsWithTarget:self]; - [self.datasource addObject:session]; - [self.collectionView reloadData]; - if (self.datasource.count > 0) { - [self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:self.datasource.count - 1 inSection:0] atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES]; - } - [self performSelector:@selector(animationFinish) withObject:nil afterDelay:3]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.backImageView]; - [self addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - make.bottom.mas_equalTo(self).offset(-5); - }]; -} - -- (void)animationFinish { - [self.datasource removeAllObjects]; - [self removeFromSuperview]; -} - -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPRoomMessageBubbleCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPRoomMessageBubbleCollectionViewCell class]) forIndexPath:indexPath]; - cell.session = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomMessageBubbleView:didSelectSession:)]) { - NIMRecentSession * session = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [self.delegate xPRoomMessageBubbleView:self didSelectSession:session]; - [self animationFinish]; - } -} - -#pragma mark - Getters And Setters -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"room_message_tips_bg"]; - } - return _backImageView; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(87, 48); - layout.minimumLineSpacing = 0.1; - layout.minimumInteritemSpacing = 0.1; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPRoomMessageBubbleCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPRoomMessageBubbleCollectionViewCell class])]; - } - return _collectionView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/Api/Api+GiveDiamond.h b/YuMi/Modules/YMMine/View/GiveDiamond/Api/Api+GiveDiamond.h deleted file mode 100644 index c0ad7fa..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/Api/Api+GiveDiamond.h +++ /dev/null @@ -1,68 +0,0 @@ -// -// Api+GiveDiamond.h -// YuMi -// -// Created by YuMi on 2022/10/19. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (GiveDiamond) -/// @param completion 完成 -/// @param ticket ticket -/// @param uid uid -+ (void)getGiveDiamondList:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid pageNum:pageStr pageSize:pageSizeStr; - -/// 确认转赠 -/// @param uid 用户id -/// @param touid 转赠用户id -/// @param diamondNum 转赠数量 -/// @param payPwd 支付密码 -+(void)confirmActionWithPay:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid toUid:(NSString *)touid diamondNum:(NSString *) diamondNum payPwd:(NSString *)payPwd; - - - - -/// 搜索转赠人 -/// @param completion 完成 -/// @param erbanNo 平台号 -+(void)searchGivePeople:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid erbanNo:(NSString *)erbanNo; - -/// 转赠记录 -/// @param completion 完成 -/// @param toUid 用户id -/// @param type 0，钻石，1礼物 -/// @param pageNum 页数 -+(void)getexamplesOfRecord:(HttpRequestHelperCompletion)completion toUid:(NSString *)toUid type:(NSString *)type pageNum:(NSString *)pageNum; - -/// 转赠礼物 -/// @param completion 完成 -/// @param toUid 对方id -/// @param giftId 礼物id -/// @param giftNum 礼物数量 -+(void)giveGift:(HttpRequestHelperCompletion)completion toUid:(NSString *)toUid giftId:(NSString *)giftId giftNum:(NSString *)giftNum; - -+(void)rechargeUserInfo:(HttpRequestHelperCompletion)completion; - -/// 子代理接口 -+(void)subrechargeListInfo:(HttpRequestHelperCompletion)completion; - - -/// 用户转增历史 -/// - Parameters: -/// - completion: completion description -/// - periodType: 1-当前周期；2-上个周期 -/// - pageSize: 页内容数量 -/// - pageNo: 页数 -/// - type: 1-金币转赠历史，2-代发薪资历史 -+(void)transferDiamondHistory:(HttpRequestHelperCompletion)completion - periodType:(NSInteger)periodType - pageSize:(NSInteger)pageSize - pageNo:(NSInteger)pageNo - type:(NSInteger)type; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/Api/Api+GiveDiamond.m b/YuMi/Modules/YMMine/View/GiveDiamond/Api/Api+GiveDiamond.m deleted file mode 100644 index d4afc62..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/Api/Api+GiveDiamond.m +++ /dev/null @@ -1,45 +0,0 @@ -// -// Api+GiveDiamond.m -// YuMi -// -// Created by YuMi on 2022/10/19. -// - -#import "Api+GiveDiamond.h" - -@implementation Api (GiveDiamond) -+ (void)getGiveDiamondList:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid pageNum:pageStr pageSize:pageSizeStr{ - - [self makeRequest:@"user/diamond/giveRecord" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, ticket, uid,pageStr,pageSizeStr, nil]; -} -+(void)confirmActionWithPay:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid toUid:(NSString *)touid diamondNum:(NSString *) diamondNum payPwd:(NSString *)payPwd{ - [self makeRequest:@"user/diamond/give" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, ticket, uid,touid,diamondNum,payPwd, nil]; -} - -+(void)searchGivePeople:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid erbanNo:(NSString *)erbanNo{ - [self makeRequest:@"user/diamond/searchUser" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, ticket, uid,erbanNo, nil]; -} -+(void)getexamplesOfRecord:(HttpRequestHelperCompletion)completion toUid:(NSString *)toUid type:(NSString *)type pageNum:(NSString *)pageNum{ - [self makeRequest:@"user/diamond/giveRecordVoByType" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, toUid,type,pageNum, nil]; -} -+(void)giveGift:(HttpRequestHelperCompletion)completion toUid:(NSString *)toUid giftId:(NSString *)giftId giftNum:(NSString *)giftNum{ - [self makeRequest:@"user/diamond/giveGift" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, toUid,giftId,giftNum, nil]; -} -+(void)rechargeUserInfo:(HttpRequestHelperCompletion)completion { - [self makeRequest:@"recharge/user/info" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} - -+(void)subrechargeListInfo:(HttpRequestHelperCompletion)completion { - [self makeRequest:@"recharge/user/subList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} - -+(void)transferDiamondHistory:(HttpRequestHelperCompletion)completion - periodType:(NSInteger)periodType - pageSize:(NSInteger)pageSize - pageNo:(NSInteger)pageNo - type:(NSInteger)type { - [self makeRequest:@"user/diamond/history" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, @(periodType), @(pageSize), @(pageNo), @(type), nil]; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondDetailsModel.h b/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondDetailsModel.h deleted file mode 100644 index 750ff71..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondDetailsModel.h +++ /dev/null @@ -1,66 +0,0 @@ -// -// XPMineGiveDiamondDetailsModel.h -// YuMi -// -// Created by YuMi on 2022/11/1. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGiveDiamondDetailsModel : PIBaseModel - -///记录 id -@property (nonatomic, copy) NSString *recordId; - -///用户uid -@property (nonatomic, copy) NSString *fromUid; - -///对方用户uid -@property (nonatomic, copy) NSString *targetUid; - - -///对方平台id -@property (nonatomic, copy) NSString *targetErbanNo; - - -///对方用户信息 -@property (nonatomic, copy) NSString *targetNick; - -///对方用户信息 -@property (nonatomic, copy) NSString *targetAvatar; - -///转赠给对方的数量 -@property (nonatomic, copy) NSString *diamondNum; - -///转赠实际支出的数量，包含手续费 -@property (nonatomic, assign) double realDiamondNum; - -///创建时间 -@property (nonatomic, assign) NSInteger createTime; - -///更新时间 -@property (nonatomic, assign) NSInteger updateTime; -///转赠类型: 0转赠钻石 1转赠礼物 -@property (nonatomic, copy) NSString *type; - -///转赠礼物id -@property (nonatomic, copy) NSString *giftId; - -///转赠礼物数 -@property (nonatomic, copy) NSString *giftNum; - -///转赠礼物单价 -@property (nonatomic, copy) NSString *giftGoldNum; -///转赠礼物总价值 -@property (nonatomic, copy) NSString *totalGiftGoldNum; -///礼物图片 -@property (nonatomic, copy) NSString *giftUrl; -///礼物名字 -@property (nonatomic,copy) NSString * giftName; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondDetailsModel.m b/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondDetailsModel.m deleted file mode 100644 index d1f1ead..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondDetailsModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineGiveDiamondDetailsModel.m -// YuMi -// -// Created by YuMi on 2022/11/1. -// - -#import "XPMineGiveDiamondDetailsModel.h" - -@implementation XPMineGiveDiamondDetailsModel -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{ - @"recordId" : @"id" - }; -} -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondModel.h b/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondModel.h deleted file mode 100644 index 8ba0480..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondModel.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// XPMineGiveDiamondModel.h -// YuMi -// -// Created by YuMi on 2022/10/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGiveDiamondModel : PIBaseModel -///记录 id -@property (nonatomic, copy) NSString *recordId; -///用户uid -@property (nonatomic, copy) NSString *fromUid; -///对方用户uid -@property (nonatomic, copy) NSString *targetUid; -///对方平台id -@property (nonatomic, copy) NSString *targetErbanNo; -///对方用户名 -@property (nonatomic, copy) NSString *targetNick; -///头像 -@property (nonatomic, copy) NSString *targetAvatar; -///转赠给对方的数量 -@property (nonatomic, assign) NSInteger diamondNum; -///转赠实际支出的数量，包含手续费 -@property (nonatomic, assign) double realDiamondNum; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondModel.m b/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondModel.m deleted file mode 100644 index bca5db4..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineGiveDiamondModel.m -// YuMi -// -// Created by YuMi on 2022/10/19. -// - -#import "XPMineGiveDiamondModel.h" - -@implementation XPMineGiveDiamondModel -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{ - @"recordId" : @"id" - }; -} -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondSearchModel.h b/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondSearchModel.h deleted file mode 100644 index d006fc7..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondSearchModel.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// XPMineGiveDiamondSearchModel.h -// YuMi -// -// Created by YuMi on 2022/10/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGiveDiamondSearchModel : PIBaseModel -/** - * 用户uid - */ -@property (nonatomic,copy) NSString *uid; -/** - * 平台号 - */ -@property (nonatomic,copy) NSString *erbanNo; -/** - * 头像 - */ -@property (nonatomic,copy) NSString *avatar; -/** - * 昵称 - */ -@property (nonatomic,copy) NSString *nick; -/** - * 性别 1.男 2.女 - */ - -@property (nonatomic,copy) NSString *gender; -/** - * 生日 - */ -@property (nonatomic,copy) NSString *birth; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondSearchModel.m b/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondSearchModel.m deleted file mode 100644 index 7cc842e..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondSearchModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// XPMineGiveDiamondSearchModel.m -// YuMi -// -// Created by YuMi on 2022/10/21. -// - -#import "XPMineGiveDiamondSearchModel.h" - -@implementation XPMineGiveDiamondSearchModel - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/Presenter/XPMineGiveDiamondPresenter.h b/YuMi/Modules/YMMine/View/GiveDiamond/Presenter/XPMineGiveDiamondPresenter.h deleted file mode 100644 index 3f97427..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/Presenter/XPMineGiveDiamondPresenter.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// XPMineGiveDiamondPresenter.h -// YuMi -// -// Created by YuMi on 2022/10/19. -// -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGiveDiamondPresenter : BaseMvpPresenter -///得到转赠记录 --(void)getGiveDiamondRecord; - -/// 获取用户钱包余额信息 -- (void)getUserWalletInfo; - -///确认支付 --(void)confirmActionWithPayWithToUid:(NSString *)touid diamondNum:(NSString *) diamondNum payPwd:(NSString *)payPwd; -///搜索转赠人 --(void)searchGivePeopleWith:(NSString *)erbanNo; -///获取转赠记录 --(void)getExamplesOfRecordWithUid:(NSString *)toUid type:(int)type page:(int)page; -///获取礼物 --(void)getPackGiftList; -///转赠礼物 --(void)giveGiftWithToUid:(NSString *)toUid giftId:(NSString *)giftId giftNum:(NSString *)giftNum; - -///充值代理信息 -- (void)rechargeUserInfo; - -- (void)subrechargeInfoList; - - -/// yonghu1 -/// - Parameters: -/// - periodType: 1: 当前周期，2: 上个周期 -/// - page: 页数 -/// - type: 1-金币转赠历史，2-代发薪资历史 -- (void)userTransferHistory:(NSInteger)periodType - page:(NSInteger)page - type:(NSInteger)type; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/Presenter/XPMineGiveDiamondPresenter.m b/YuMi/Modules/YMMine/View/GiveDiamond/Presenter/XPMineGiveDiamondPresenter.m deleted file mode 100644 index 28e283e..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/Presenter/XPMineGiveDiamondPresenter.m +++ /dev/null @@ -1,134 +0,0 @@ -// -// XPMineGiveDiamondPresenter.m -// YuMi -// -// Created by YuMi on 2022/10/19. -// - -#import "XPMineGiveDiamondPresenter.h" -#import "AccountInfoStorage.h" - -#import "XPMineGiveDiamondModel.h" -#import "HomeSearchResultModel.h" -#import "WalletInfoModel.h" -#import "XPMineGiveDiamondSearchModel.h" -#import "XPMineGiveDiamondDetailsModel.h" -#import "UserGiftWallInfoModel.h" -#import "GiftInfoModel.h" -#import "RechargeUserModel.h" -#import "XPMineGiveDiamondProtocol.h" -#import "XPHomeSearchProtocol.h" - -#import "Api+GiveDiamond.h" -#import "Api+Home.h" -#import "Api+Gift.h" -#import "YUMIConstant.h" -#import "DESEncrypt.h" - - -@implementation XPMineGiveDiamondPresenter --(void)getGiveDiamondRecord{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - @kWeakify(self); - [Api getGiveDiamondList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray * array = [XPMineGiveDiamondModel modelsWithArray:data.data]; - [[self getView] getGiveDiamondListSuccess:array]; - }] ticket:ticket uid:uid pageNum:@"1" pageSize:@"100"]; -} - - --(void)getUserWalletInfo{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api getUserWalletInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data]; - [[self getView] getUserWalletInfo:model]; - }] uid:uid ticket:ticket]; -} --(void)confirmActionWithPayWithToUid:(NSString *)touid diamondNum:(NSString *) diamondNum payPwd:(NSString *)payPwd{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - NSString *payPwds = [DESEncrypt encryptUseDES:payPwd key:KeyWithType(KeyType_PasswordEncode)]; - [Api confirmActionWithPay:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] confirmActionWithPay]; - }] ticket:ticket uid:uid toUid:touid diamondNum:diamondNum payPwd:payPwds]; -} --(void)searchGivePeopleWith:(NSString *)erbanNo{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - @kWeakify(self); - [Api searchGivePeople:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - XPMineGiveDiamondSearchModel *model = [XPMineGiveDiamondSearchModel modelWithDictionary:data.data]; - [[self getView] searchGivePeopleWihtModel:model]; - }] ticket:ticket uid:uid erbanNo:erbanNo]; -} --(void)getExamplesOfRecordWithUid:(NSString *)toUid type:(int)type page:(int)page { - [Api getexamplesOfRecord:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *listModel = [XPMineGiveDiamondDetailsModel modelsWithArray:data.data]; - [[self getView]getexamplesOfRecordWithList:listModel state:type]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView]getexamplesOfRecordWithListWithFailState:type]; - } showLoading:YES] toUid:toUid type:@(type).stringValue pageNum:@(page).stringValue]; -} --(void)getPackGiftList{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - @kWeakify(self); - [Api requestPackGiftList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray * info = [GiftInfoModel modelsWithArray:data.data]; - [[self getView] getPacketGiftListSuccess:info]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] getPacketGiftListFail:msg]; - }] uid:uid ticket:ticket]; -} --(void)giveGiftWithToUid:(NSString *)toUid giftId:(NSString *)giftId giftNum:(NSString *)giftNum{ - @kWeakify(self); - [Api giveGift:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] giveGiftSuccess]; - }] toUid:toUid giftId:giftId giftNum:giftNum]; -} - -- (void)rechargeUserInfo { - @kWeakify(self); - [Api rechargeUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] loadRechargeUserSuccess:[RechargeUserModel modelWithJSON:data.data]]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES]]; -} - -- (void)subrechargeInfoList { - @kWeakify(self); - [Api subrechargeListInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(loadSubRechargerInfoSuccess:)]) { - [[self getView] loadSubRechargerInfoSuccess:[SubRechargeUserModel modelsWithArray:data.data]]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES]]; -} - -- (void)userTransferHistory:(NSInteger)periodType page:(NSInteger)page type:(NSInteger)type{ - @kWeakify(self); - [Api transferDiamondHistory:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(loadTransferHistorySuccess:)]) { - [[self getView] loadTransferHistorySuccess:[DiamondHistoryModel modelWithJSON:data.data]]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES] periodType:periodType pageSize:20 pageNo:page type:type]; -} - -@end - - - diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/Protocol/XPMineGiveDiamondProtocol.h b/YuMi/Modules/YMMine/View/GiveDiamond/Protocol/XPMineGiveDiamondProtocol.h deleted file mode 100644 index 4859e3e..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/Protocol/XPMineGiveDiamondProtocol.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// XPMineGiveDiamondProtocol.h -// YuMi -// -// Created by YuMi on 2022/10/19. -// - -#import -@class WalletInfoModel,XPMineGiveDiamondSearchModel,XPMineGiveDiamondDetailsModel,GiftInfoModel, RechargeUserModel, SubRechargeUserModel, DiamondHistoryModel; -NS_ASSUME_NONNULL_BEGIN - -@protocol XPMineGiveDiamondProtocol -@optional - -///请求转赠记录 -- (void)getGiveDiamondListSuccess:(NSArray *)array; -///搜索转赠人 -- (void)searchEndWithText:(NSString *)text; -///请求钱包余额信息 -- (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo; -///点击确认钻石事件 --(void)confirmActionWithText:(NSString *)text; -///转赠礼物点击确认事件 --(void)confirmActionWithText:(NSString *)text chooseGiftModel:(GiftInfoModel *)chooseGiftModel; -///点击确认支付 --(void)confirmActionWithPay; -///搜索转赠人 --(void)searchGivePeopleWihtModel:(XPMineGiveDiamondSearchModel *)model; -///转赠记录 --(void)getexamplesOfRecordWithList:(NSArray *)list state:(int)state; -///转赠记录失败 --(void)getexamplesOfRecordWithListWithFailState:(int)state; - -///获取背包礼物列表 -- (void)getPacketGiftListSuccess:(NSArray *)giftList; -///获取背包礼物列表失败 -- (void)getPacketGiftListFail:(NSString *)message; -///转赠礼物 --(void)giveGiftSuccess; - -- (void)loadRechargeUserSuccess:(RechargeUserModel *)userModel; - -- (void)loadSubRechargerInfoSuccess:(NSArray *)infos; - -- (void)loadTransferHistorySuccess:(DiamondHistoryModel *)infos; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPIncomeRecordGoldDetailsCell.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPIncomeRecordGoldDetailsCell.h deleted file mode 100644 index ff05b68..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPIncomeRecordGoldDetailsCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPIncomeRecordGoldDetailsCell.h -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import -#import "XPIncomeRecordGoldDetailsModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPIncomeRecordGoldDetailsCell : UITableViewCell -@property (nonatomic,strong) XPIncomeRecordGoldDetailItemModel *detailModel; -@property (nonatomic,assign) NSInteger path; -///所属房间 -@property (nonatomic,strong,readonly) UILabel *roomView; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPIncomeRecordGoldDetailsCell.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPIncomeRecordGoldDetailsCell.m deleted file mode 100644 index 1352b8c..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPIncomeRecordGoldDetailsCell.m +++ /dev/null @@ -1,241 +0,0 @@ -// -// XPIncomeRecordGoldDetailsCell.m -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import "XPIncomeRecordGoldDetailsCell.h" -#import "NetImageView.h" -#import "NSString+Utils.h" -@interface XPIncomeRecordGoldDetailsCell() -@property (nonatomic,strong) UILabel *rankView; -///用户头像 -@property (nonatomic,strong) NetImageView *userImageView; -///用户昵称 -@property (nonatomic,strong) UILabel *userNameView; -///钻石流水 -@property (nonatomic,strong) UILabel *diamondsNumView; -///兑换金币 -@property (nonatomic,strong) UILabel *exchangeNumView; -///已兑 -@property (nonatomic,strong) UILabel *convertedView; -///结算金币 -@property (nonatomic,strong) UILabel *settlementNumView; - -@end -@implementation XPIncomeRecordGoldDetailsCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - if([reuseIdentifier isEqualToString:NSStringFromClass([XPIncomeRecordGoldDetailsCell class])]){ - [self initSubViews]; - [self initSubViewConstraints]; - }else{ - [self initSubViewsWithClan]; - [self initSubViewConstraintsWithClan]; - } - - } - return self; -} - -#pragma mark - Private Method - -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.userImageView]; - [self.contentView addSubview:self.userNameView]; - [self.contentView addSubview:self.diamondsNumView]; - [self.contentView addSubview:self.exchangeNumView]; - [self.contentView addSubview:self.convertedView]; - [self.contentView addSubview:self.settlementNumView]; - self.userImageView.layer.cornerRadius = kGetScaleWidth(34)/2; - - -} -- (void)initSubViewConstraints { - [self.userImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(12)); - make.width.height.mas_equalTo(kGetScaleWidth(34)); - make.leading.mas_equalTo(kGetScaleWidth(15)); - }]; - [self.userNameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.userImageView.mas_bottom).mas_offset(kGetScaleWidth(6)); - make.trailing.equalTo(self.diamondsNumView.mas_leading).mas_offset(-kGetScaleWidth(4)); - make.leading.mas_equalTo(kGetScaleWidth(3)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - CGFloat width = kGetScaleWidth(247/3); - [self.settlementNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(width); - make.centerY.equalTo(self.userImageView); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.trailing.mas_equalTo(0); - - }]; - - [self.exchangeNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.width.centerY.equalTo(self.settlementNumView); - make.trailing.equalTo(self.settlementNumView.mas_leading); - }]; - [self.convertedView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(14)); - make.width.leading.equalTo(self.exchangeNumView); - make.top.equalTo(self.exchangeNumView.mas_bottom).mas_offset(3); - }]; - [self.diamondsNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.width.centerY.equalTo(self.exchangeNumView); - make.trailing.equalTo(self.exchangeNumView.mas_leading); - - - }]; -} -- (void)initSubViewsWithClan{ - self.backgroundColor = [UIColor whiteColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.rankView]; - [self.contentView addSubview:self.userImageView]; - [self.contentView addSubview:self.userNameView]; - [self.contentView addSubview:self.diamondsNumView]; - [self.contentView addSubview:self.exchangeNumView]; - [self.contentView addSubview:self.convertedView]; - [self.contentView addSubview:self.settlementNumView]; - self.userImageView.layer.cornerRadius = kGetScaleWidth(35)/2; -} -- (void)initSubViewConstraintsWithClan{ - [self.rankView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.bottom.equalTo(self.contentView); - make.width.mas_equalTo(kGetScaleWidth(50)); - }]; - [self.userImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(12)); - make.width.height.mas_equalTo(kGetScaleWidth(35)); - make.leading.mas_equalTo(kGetScaleWidth(57)); - }]; - [self.userNameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.userImageView.mas_bottom).mas_offset(kGetScaleWidth(6)); - make.centerX.equalTo(self.userImageView); - make.width.mas_equalTo(kGetScaleWidth(48)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - CGFloat width = kGetScaleWidth(277/3); - [self.diamondsNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.userNameView.mas_trailing).mas_offset(1); - make.width.mas_equalTo(width); - make.centerY.equalTo(self.userImageView); - make.height.mas_equalTo(kGetScaleWidth(17)); - }]; - [self.exchangeNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.width.centerY.equalTo(self.diamondsNumView); - make.leading.equalTo(self.diamondsNumView.mas_trailing); - }]; - [self.convertedView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(14)); - make.width.leading.equalTo(self.exchangeNumView); - make.top.equalTo(self.exchangeNumView.mas_bottom).mas_offset(3); - }]; - [self.settlementNumView mas_makeConstraints:^(MASConstraintMaker *make) { - - make.height.width.centerY.equalTo(self.exchangeNumView); - make.leading.equalTo(self.exchangeNumView.mas_trailing); - - }]; - -} --(void)setPath:(NSInteger)path{ - _path = path; - _rankView.text = [NSString stringWithFormat:@"%ld",_path + 1]; -} - --(void)setDetailModel:(XPIncomeRecordGoldDetailItemModel *)detailModel{ - _detailModel = detailModel; - _userNameView.text = _detailModel.nick; - _userImageView.imageUrl = _detailModel.avatar; - _exchangeNumView.text = [NSString getDealNumWithString:_detailModel.giftGolds]; - _diamondsNumView.text = [NSString getDealNumWithString:_detailModel.giftDiamonds]; - _convertedView.text = [NSString stringWithFormat:YMLocalizedString(@"XPIncomeRecordGoldDetailsCell0"),[NSString getDealNumWithString:_detailModel.exchangeGolds]]; - _settlementNumView.text = [NSString getDealNumWithString:_detailModel.remainGolds]; -} -#pragma mark -懒加载 -- (NetImageView *)userImageView{ - if (!_userImageView){ - NetImageConfig *config = [[ NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _userImageView = [[NetImageView alloc]initWithConfig:config]; - - _userImageView.layer.masksToBounds = YES; - } - return _userImageView; -} - -- (UILabel *)userNameView { - if (!_userNameView) { - _userNameView = [[UILabel alloc] init]; - _userNameView.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _userNameView.textColor = [DJDKMIMOMColor inputTextColor]; - _userNameView.textAlignment = NSTextAlignmentCenter; - _userNameView.text = @"0"; - } - return _userNameView; -} - - -- (UILabel *)diamondsNumView { - if (!_exchangeNumView) { - _diamondsNumView = [[UILabel alloc] init]; - _diamondsNumView.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _diamondsNumView.textColor = [DJDKMIMOMColor inputTextColor]; - _diamondsNumView.textAlignment = NSTextAlignmentCenter; - _diamondsNumView.text = @"0"; - } - return _diamondsNumView; -} - - -- (UILabel *)exchangeNumView { - if (!_exchangeNumView) { - _exchangeNumView = [[UILabel alloc] init]; - _exchangeNumView.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _exchangeNumView.textColor = [DJDKMIMOMColor inputTextColor]; - _exchangeNumView.textAlignment = NSTextAlignmentCenter; - _exchangeNumView.text = @"0"; - } - return _exchangeNumView; -} - -- (UILabel *)settlementNumView { - if (!_settlementNumView) { - _settlementNumView = [[UILabel alloc] init]; - _settlementNumView.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _settlementNumView.textColor = UIColorFromRGB(0xDD9E0B); - _settlementNumView.textAlignment = NSTextAlignmentCenter; - _settlementNumView.text = @"0"; - } - return _settlementNumView; -} - -- (UILabel *)convertedView { - if (!_convertedView) { - _convertedView = [[UILabel alloc] init]; - _convertedView.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _convertedView.textColor = [DJDKMIMOMColor disableButtonTextColor]; - _convertedView.text = [NSString stringWithFormat:YMLocalizedString(@"XPIncomeRecordGoldDetailsCell0"),@"0"]; - _convertedView.textAlignment = NSTextAlignmentCenter; - } - return _convertedView; -} - -- (UILabel *)rankView { - if (!_convertedView) { - _rankView = [[UILabel alloc] init]; - _rankView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; - _rankView.textColor = [DJDKMIMOMColor inputTextColor]; - _rankView.textAlignment = NSTextAlignmentCenter; - } - return _rankView; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.h deleted file mode 100644 index c9c1659..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// XPMineChooseGiveDiamondView.h -// YuMi -// -// Created by YuMi on 2022/10/19. -// - -#import -#import "XPMineGiveDiamondModel.h" -#import "XPMineGiveDiamondProtocol.h" -#import "UserInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - - - -@interface XPMineChooseGiveDiamondView : UIView -@property (nonatomic,strong) XPMineGiveDiamondModel *giveDiamondModel;//被转赠人的个人信息 -@property (nonatomic,copy) NSString *diamond;//转赠的钻石 -@property (nonatomic,weak) id delegate;//代理 -@property (nonatomic,strong) UserInfoModel *userInfo;//我的个人信息 -@property (nonatomic,assign) int type;//0，钻石，1，礼物 --(instancetype)initWithFrame:(CGRect)frame isHaveGiveDiamond:(BOOL)isHaveGiveDiamond isHaveGiveGift:(BOOL)isHaveGiveGift; --(void)setListData:(NSMutableArray *)listData count:(NSInteger)count; -@end - - - - - - - - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m deleted file mode 100644 index eebf369..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m +++ /dev/null @@ -1,517 +0,0 @@ -// -// XPMineChooseGiveDiamondView.m -// YuMi -// -// Created by YuMi on 2022/10/19. -// - -#import "XPMineChooseGiveDiamondView.h" -#import "XPMineChooseGiveGiftViewCell.h" - -#import "XPGuildEmptyCollectionViewCell.h" -#import "GiftInfoModel.h" -#import "XPMineChooseGiveGiftView.h" -#import "NetImageView.h" -#import "ClientConfig.h" - -@interface XPMineChooseGiveDiamondView() -///头像 -@property (nonatomic,strong) NetImageView *headView; -///昵称 -@property (nonatomic,strong) UILabel *titleView; -///id -@property (nonatomic,strong) UILabel *idTitleView; -///选择类型 -@property (nonatomic,strong) UIStackView *typeStackView; -///选择钻石 -@property (nonatomic,strong) UIButton *diamondBtn; -///选择礼物 -@property (nonatomic,strong) UIButton *giftBtn; - -@property(nonatomic, strong) UIView *indexImageView; - -///数量钻石图标 -@property (nonatomic,strong) UIImageView *numIcon; -/// 钻石数量 -@property (nonatomic,strong) MSBaseTextField *diamondNumView; -///我的钻石数量 -@property (nonatomic,strong) UILabel * myDiamondNumView; -///我的钻石数量钻石图标 -@property (nonatomic,strong) UIImageView *myDiamondIcon; -///确认 -@property (nonatomic,strong) UIButton *confirmBtn; -///转赠礼物view -@property (nonatomic,strong) XPMineChooseGiveGiftView *giveGiftView; - -///是否有转赠钻石权限 -@property (nonatomic,assign) BOOL isHaveGiveDiamond; -///是否有转赠礼物权限 -@property (nonatomic,assign) BOOL isHaveGiveGift; -@end -@implementation XPMineChooseGiveDiamondView - --(instancetype)initWithFrame:(CGRect)frame isHaveGiveDiamond:(BOOL)isHaveGiveDiamond isHaveGiveGift:(BOOL)isHaveGiveGift{ - self = [super initWithFrame:frame]; - if(self){ - self.isHaveGiveDiamond = isHaveGiveDiamond; - self.isHaveGiveGift = isHaveGiveGift; - [self initSubViews]; - [self initSubViewConstraints]; - if (self.isHaveGiveDiamond == NO && self.isHaveGiveGift == YES){ - [self chooseGiftAction]; - } - - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(keyboardWillShow:)name:UIKeyboardWillShowNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil]; - [self addSubview:self.headView]; - [self addSubview:self.titleView]; - [self addSubview:self.idTitleView]; - [self addSubview:self.typeStackView]; - [self.typeStackView addArrangedSubview:self.diamondBtn]; - [self.typeStackView addArrangedSubview:self.giftBtn]; - - [self addSubview:self.numIcon]; - [self addSubview:self.diamondNumView]; - [self addSubview:self.indexImageView]; - [self addSubview:self.myDiamondIcon]; - [self addSubview:self.myDiamondNumView]; - [self addSubview:self.confirmBtn]; - [self addSubview:self.giveGiftView]; - -} -- (void)initSubViewConstraints { - UIView *bgView = [[UIView alloc] init]; - [bgView setCornerRadius:10]; - bgView.backgroundColor = UIColorFromRGB(0xf7f7f7); - [self insertSubview:bgView belowSubview:self.headView]; - [bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(6); - make.leading.trailing.mas_equalTo(self).inset(15); - make.height.mas_equalTo(82); - }]; - - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(59)); - make.centerY.mas_equalTo(bgView); - make.leading.mas_equalTo(27); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.headView.mas_trailing).mas_offset(kGetScaleWidth(10)); - make.top.equalTo(self.headView.mas_top).mas_offset(kGetScaleWidth(8)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(17)); - }]; - [self.idTitleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.titleView); - make.height.mas_equalTo(kGetScaleWidth(14)); - make.top.equalTo(self.titleView.mas_bottom).mas_offset(kGetScaleWidth(4)); - }]; - - if(self.isHaveGiveGift == YES && self.isHaveGiveDiamond == YES){ - [self.typeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.width.mas_equalTo(kGetScaleWidth(178)); - make.height.mas_equalTo(kGetScaleWidth(31)); - make.top.equalTo(self.headView.mas_bottom).mas_offset(kGetScaleWidth(25)); - }]; - self.type = 0; - self.giftBtn.hidden = NO; - self.diamondBtn.hidden = NO; - self.typeStackView.spacing = kGetScaleWidth(18); - }else if (self.isHaveGiveDiamond == YES && self.isHaveGiveGift == NO){ - [self.typeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.width.mas_equalTo(kGetScaleWidth(80)); - make.height.mas_equalTo(kGetScaleWidth(31)); - make.top.equalTo(self.headView.mas_bottom).mas_offset(kGetScaleWidth(25)); - }]; - self.type = 0; - self.giftBtn.hidden = YES; - self.diamondBtn.hidden = NO; - self.typeStackView.spacing = kGetScaleWidth(0); - }else if (self.isHaveGiveDiamond == NO && self.isHaveGiveGift == YES){ - [self.typeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.width.mas_equalTo(kGetScaleWidth(80)); - make.height.mas_equalTo(kGetScaleWidth(31)); - make.top.equalTo(self.headView.mas_bottom).mas_offset(kGetScaleWidth(25)); - }]; - self.type = 1; - self.giftBtn.hidden = NO; - self.diamondBtn.hidden = YES; - self.typeStackView.spacing = kGetScaleWidth(0); - } - - UIView *bgView_2 = [[UIView alloc] init]; - [bgView_2 setCornerRadius:10]; - bgView_2.backgroundColor = UIColorFromRGB(0xFFF7D6); - [self insertSubview:bgView_2 belowSubview:self.numIcon]; - [bgView_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.indexImageView.mas_bottom).offset(10); - make.leading.trailing.mas_equalTo(self).inset(16); - make.height.mas_equalTo(kGetScaleWidth(52)); - }]; - - [self.numIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.headView).offset(2); - make.width.height.mas_equalTo(kGetScaleWidth(32)); - make.centerY.mas_equalTo(bgView_2); -// make.top.equalTo(self.typeStackView.mas_bottom).mas_offset(kGetScaleWidth(35)); - - }]; - [self.diamondNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.titleView); - make.height.mas_equalTo(28); - make.leading.equalTo(self.numIcon.mas_trailing).mas_offset(12); - make.centerY.equalTo(self.numIcon); - }]; - - [self.diamondBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(80)); - make.height.mas_equalTo(kGetScaleWidth(31)); - }]; - [self.giftBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.equalTo(self.diamondBtn); - }]; - [self.indexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(4); - make.centerX.mas_equalTo(self.diamondBtn); - make.width.mas_equalTo(14); - make.top.mas_equalTo(self.diamondBtn.mas_bottom).mas_offset(2); - }]; - - [self.myDiamondNumView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.trailing.equalTo(self.myDiamondIcon.mas_leading).mas_offset(-kGetScaleWidth(8)); - make.height.mas_equalTo(20); - make.leading.mas_equalTo(bgView_2); - make.top.mas_equalTo(bgView_2.mas_bottom).offset(12); - }]; - [self.myDiamondIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.myDiamondNumView.mas_trailing); - make.width.height.mas_equalTo(20); - make.centerY.mas_equalTo(self.myDiamondNumView); - }]; - - [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(15); - make.top.equalTo(self.indexImageView.mas_bottom).mas_offset(kGetScaleWidth(110)); - make.height.mas_equalTo(kGetScaleWidth(40)); - }]; - - [self.giveGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.trailing.mas_equalTo(0); - make.top.equalTo(self.indexImageView.mas_bottom).mas_offset(9); - make.height.mas_equalTo(kGetScaleWidth(370)); - }]; -} -- (void)keyboardWillShow:(NSNotification *)notification { - if(!self.giveGiftView.textField.isFirstResponder){return;} - - NSDictionary *userInfo = [notification userInfo]; - CGFloat curkeyBoardHeight = [[[notification userInfo]objectForKey:@"UIKeyboardBoundsUserInfoKey"]CGRectValue].size.height; - CGRect begin = [[[notification userInfo]objectForKey:@"UIKeyboardFrameBeginUserInfoKey"]CGRectValue]; - CGRect end = [[[notification userInfo]objectForKey:@"UIKeyboardFrameEndUserInfoKey"]CGRectValue]; - // 第三方键盘回调三次问题，监听仅执行最后一次 - - if( begin.size.height > 0 && (begin.origin.y - end.origin.y > 0)){ - CGFloat keyBoardHeight = curkeyBoardHeight; - CGFloat animationDuration = [userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue]; - [self.superview layoutIfNeeded]; - [UIView animateWithDuration:animationDuration animations:^{ - [self mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(-keyBoardHeight); - }]; - [self.superview layoutIfNeeded]; - }]; - } -} -- (void)keyboardWillHide:(NSNotification *)notification{ - if(!self.giveGiftView.textField.isFirstResponder){return;} - //获取键盘的高度 - NSDictionary *userInfo = [notification userInfo]; -// NSValue *keyboardValue = [userInfo objectForKey:UIKeyboardFrameEndUserInfoKey]; - CGFloat animationDuration = [userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue]; - //做自定义事件 - [self.superview layoutIfNeeded]; - [UIView animateWithDuration:animationDuration animations:^{ - [self mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(0); - }]; - - [self.superview layoutIfNeeded]; - }completion:^(BOOL finished) { - - }]; - -} --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} - --(void)setListData:(NSMutableArray *)listData count:(NSInteger)count{ - [self.giveGiftView setListData:listData count:count]; -} -#pragma mark- UITextFieldDelegate --(void)textFieldDidChange:(UITextField *)textField{ - self.confirmBtn.selected = textField.text.length > 0; - self.confirmBtn.alpha = self.confirmBtn.isSelected ? 1: 0.3; -} --(void)textFieldDidChangeWithText:(NSString *)text{ - if(self.giveGiftView.chooseGiftModel != nil){ - self.confirmBtn.selected = text.length > 0; - } - self.confirmBtn.alpha = self.confirmBtn.isSelected ? 1: 0.3; -} -- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string{ - ClientConfig *config = [ClientConfig shareConfig]; - NSString *diamond = [NSString stringWithFormat:@"%ld",config.configInfo.giveDiamondOnceLimitNum]; - if((textField.text.length + string.length) > diamond.length){ - return NO; - } - return YES; -} -#pragma mark -btn方法 -///确认 --(void)confirmAction{ - if(self.confirmBtn.selected == NO){ - return; - } - if(self.type == 0){ - [self.diamondNumView resignFirstResponder]; - if(self.delegate && [self.delegate respondsToSelector:@selector(confirmActionWithText:)]){ - [self.delegate confirmActionWithText:self.diamondNumView.text]; - } - return; - } - - if(self.giveGiftView.chooseGiftModel == nil){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMineChooseGiveGiftView2")]; - return; - } - NSInteger count = [self.giveGiftView.giftCount integerValue]; - if(count == 0){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMineChooseGiveGiftView4")]; - return; - } - if(count > self.giveGiftView.chooseGiftModel.count){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMineChooseGiveGiftView3")]; - return; - } - - - [self.giveGiftView resignFirstResponder]; - if(self.delegate && [self.delegate respondsToSelector:@selector(confirmActionWithText: chooseGiftModel:)]){ - [self.delegate confirmActionWithText:self.giveGiftView.giftCount chooseGiftModel:self.giveGiftView.chooseGiftModel]; - } -} - -///选择钻石 --(void)chooseDiamondAction{ - self.diamondBtn.selected = YES; - self.giftBtn.selected = NO; - self.giveGiftView.hidden = YES; - self.type = 0; - self.confirmBtn.selected = self.diamondNumView.text.length > 0; - self.confirmBtn.alpha = self.confirmBtn.isSelected ? 1: 0.3; - - [self.giveGiftView resignFirstResponder]; - - [self.confirmBtn mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.indexImageView.mas_bottom).mas_offset(kGetScaleWidth(110)); - }]; - - [self.indexImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(4); - make.centerX.mas_equalTo(self.diamondBtn); - make.width.mas_equalTo(14); - make.top.mas_equalTo(self.diamondBtn.mas_bottom).mas_offset(2); - }]; -} -///选择礼物 --(void)chooseGiftAction{ - self.type = 1; - self.diamondBtn.selected = NO; - self.giftBtn.selected = YES; - self.giveGiftView.hidden = NO; - if(self.giveGiftView.chooseGiftModel != nil){ - self.confirmBtn.selected = self.giveGiftView.giftCount.length > 0; - }else{ - self.confirmBtn.selected = NO; - } - - [self.diamondNumView resignFirstResponder]; - - self.confirmBtn.alpha = self.confirmBtn.isSelected ? 1: 0.3; - [self.confirmBtn mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.indexImageView.mas_bottom).mas_offset(kGetScaleWidth(354)); - }]; - - [self.indexImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(4); - make.centerX.mas_equalTo(self.giftBtn); - make.width.mas_equalTo(14); - make.top.mas_equalTo(self.giftBtn.mas_bottom).mas_offset(2); - }]; -} --(void)setGiveDiamondModel:(XPMineGiveDiamondModel *)giveDiamondModel{ - _giveDiamondModel = giveDiamondModel; - _headView.imageUrl = _giveDiamondModel.targetAvatar; - _titleView.text = _giveDiamondModel.targetNick; - _idTitleView.text = [NSString stringWithFormat:@"ID:%@",_giveDiamondModel.targetErbanNo]; -} --(void)setDiamond:(NSString *)diamond{ - _diamond = diamond; - _myDiamondNumView.text = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPMineChooseGiveDiamondView0"),diamond]; -} - -#pragma mark - 懒加载 -- (NetImageView *)headView{ - if (!_headView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _headView = [[NetImageView alloc]initWithConfig:config]; - _headView.layer.cornerRadius = kGetScaleWidth(59/2); - _headView.layer.masksToBounds = YES; - } - return _headView; -} - --(UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel new]; - _titleView.textColor = [DJDKMIMOMColor inputTextColor]; - _titleView.font = [UIFont systemFontOfSize:kGetScaleWidth(14) weight:UIFontWeightMedium]; - } - return _titleView; -} --(UILabel *)idTitleView{ - if (!_idTitleView){ - _idTitleView = [UILabel new]; - _idTitleView.font = [UIFont systemFontOfSize:kGetScaleWidth(12) weight:UIFontWeightMedium]; - _idTitleView.textColor = [DJDKMIMOMColor disableButtonTextColor]; - } - return _idTitleView; -} - --(UIImageView *)numIcon{ - if (!_numIcon){ - _numIcon = [UIImageView new]; - _numIcon.image = [UIImage imageNamed:@"moli_money_icon"]; - } - return _numIcon; -} - -- (MSBaseTextField *)diamondNumView{ - if (!_diamondNumView){ - _diamondNumView = [MSBaseTextField new]; - _diamondNumView.keyboardType = UIKeyboardTypeNumberPad; - _diamondNumView.font = kFontSemibold(20); - _diamondNumView.textColor = UIColorFromRGB(0x313131); - _diamondNumView.attributedPlaceholder = [[NSMutableAttributedString alloc] initWithString:@"0" attributes:@{NSFontAttributeName:kFontSemibold(20),NSForegroundColorAttributeName:UIColorFromRGB(0x313131)}]; -// _diamondNumView.textAlignment = NSTextAlignmentRight; - [_diamondNumView addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; - _diamondNumView.delegate = self; - } - return _diamondNumView; -} --(UIView *)indexImageView{ - if (!_indexImageView){ - _indexImageView = [UIImageView new]; - [_indexImageView setCornerRadius:2]; - [_indexImageView addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xE29030), - UIColorFromRGB(0xfcc074), - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1.0, 0.5) cornerRadius:2]; - } - return _indexImageView; -} --(UILabel *)myDiamondNumView{ - if (!_myDiamondNumView){ - _myDiamondNumView = [UILabel new]; - _myDiamondNumView.textAlignment = NSTextAlignmentRight; - _myDiamondNumView.text = [NSString stringWithFormat:@"%@0",YMLocalizedString(@"XPMineChooseGiveDiamondView0")]; - _myDiamondNumView.font = [UIFont systemFontOfSize:kGetScaleWidth(14) weight:UIFontWeightMedium]; - _myDiamondNumView.textColor = [DJDKMIMOMColor disableButtonTextColor]; - } - return _myDiamondNumView; -} --(UIImageView *)myDiamondIcon{ - if (!_myDiamondIcon){ - _myDiamondIcon = [UIImageView new]; - _myDiamondIcon.image = [UIImage imageNamed:@"moli_money_icon"]; - } - return _myDiamondIcon; -} --(UIButton *)confirmBtn{ - if (!_confirmBtn){ - _confirmBtn = [UIButton new]; - [_confirmBtn setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - [_confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - [_confirmBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorRGBAlpha(0xE29030, 1.0), UIColorRGBAlpha(0xFCC074, 1.0)] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(KScreenWidth - kGetScaleWidth(30), kGetScaleWidth(40))] - forState:UIControlStateNormal]; - _confirmBtn.layer.cornerRadius = kGetScaleWidth(20); - _confirmBtn.layer.masksToBounds = YES; - _confirmBtn.alpha = 0.3; - [_confirmBtn addTarget:self action:@selector(confirmAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _confirmBtn; -} -- (XPMineChooseGiveGiftView *)giveGiftView{ - if (!_giveGiftView){ - _giveGiftView = [[XPMineChooseGiveGiftView alloc]initWithFrame:CGRectZero]; - _giveGiftView.hidden = YES; - _giveGiftView.delegate = self; - } - return _giveGiftView; -} - -- (UIStackView *)typeStackView{ - if (!_typeStackView) { - _typeStackView = [[UIStackView alloc] init]; - _typeStackView.axis = UILayoutConstraintAxisHorizontal; - _typeStackView.distribution = UIStackViewDistributionFill; - _typeStackView.alignment = UIStackViewAlignmentFill; - - } - return _typeStackView; -} - -- (UIButton *)diamondBtn{ - if (!_diamondBtn){ - _diamondBtn = [UIButton new]; - _diamondBtn.titleLabel.font = kFontMedium(15); - [_diamondBtn setTitle:YMLocalizedString(@"XPMineChooseGiveDiamondView2") forState:UIControlStateNormal]; - [_diamondBtn setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateSelected]; - [_diamondBtn setTitleColor:UIColorFromRGB(0x7b7b7d) forState:UIControlStateNormal]; - _diamondBtn.selected = YES; - [_diamondBtn addTarget:self action:@selector(chooseDiamondAction) forControlEvents:UIControlEventTouchUpInside]; - - } - return _diamondBtn; -} --(UIButton *)giftBtn{ - if (!_giftBtn){ - _giftBtn = [UIButton new]; - _giftBtn.titleLabel.font = kFontMedium(15); - [_giftBtn setTitle:YMLocalizedString(@"XPMineChooseGiveDiamondView3") forState:UIControlStateNormal]; - [_giftBtn setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateSelected]; - [_giftBtn setTitleColor:UIColorFromRGB(0x7b7b7d) forState:UIControlStateNormal]; - _giftBtn.selected = NO; - [_giftBtn addTarget:self action:@selector(chooseGiftAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _giftBtn; -} -@end - - diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.h deleted file mode 100644 index a885b97..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPMineChooseGiveGiftView.h -// YuMi -// -// Created by YuMi on 2022/11/2. -// - -#import -#import "GiftInfoModel.h" -NS_ASSUME_NONNULL_BEGIN -@protocol XPMineChooseGiveGiftViewDelegate - --(void)textFieldDidChangeWithText:(NSString *)text; - -@end - -@interface XPMineChooseGiveGiftView : UIView -@property (nonatomic,strong) MSBaseTextField *textField; -@property (nonatomic,copy) NSString *giftCount; -@property (nonatomic,assign) NSInteger curPage; -@property (nonatomic,assign) NSInteger count; -@property (nonatomic,weak) id delegate; -@property (nonatomic,strong) GiftInfoModel *chooseGiftModel; --(void)setListData:(NSMutableArray *)listData count:(NSInteger)count; --(void)resignFirstResponder; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m deleted file mode 100644 index dbaec5e..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m +++ /dev/null @@ -1,274 +0,0 @@ -// -// XPMineChooseGiveGiftView.m -// YuMi -// -// Created by YuMi on 2022/11/2. -// -//#import "XPPageControl.h" -#import "XPMineChooseGiveGiftView.h" -#import "XPMineChooseGiveGiftViewCell.h" -#import "XPGuildEmptyCollectionViewCell.h" -#import "UIView+Corner.h" -@interface XPMineChooseGiveGiftView() -@property (nonatomic,strong) UICollectionView *collectionView; -@property (nonatomic,strong) UIView *bgView; -//@property (nonatomic,strong) XPPageControl *pageControl; -@property(nonatomic, strong) UIPageControl *pageControl; -@property (nonatomic,strong) NSMutableArray *listData; -@property (nonatomic,strong) NSIndexPath *indexPath; - -@property (nonatomic,strong) UILabel *numTitleLabel; - -@property (nonatomic,strong) UIButton *allBtn; -@end -@implementation XPMineChooseGiveGiftView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgView]; - [self addSubview:self.collectionView]; - [self addSubview:self.pageControl]; - [self addSubview:self.numTitleLabel]; - [self addSubview:self.textField]; - [self addSubview:self.allBtn]; -} - -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.trailing.mas_equalTo(-15); - make.top.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(268)); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.trailing.mas_equalTo(-15); - make.top.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(248)); - }]; - [self.pageControl mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self); - make.bottom.mas_equalTo(self.bgView).offset(-4); - make.height.mas_equalTo(8); - make.width.mas_equalTo(KScreenWidth); - }]; - - UIView *bgView = [[UIView alloc] init]; - [bgView setCornerRadius:12]; - bgView.backgroundColor = UIColorFromRGB(0xf7f7f7); - [self insertSubview:bgView belowSubview:self.numTitleLabel]; - [bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bgView.mas_bottom).offset(14); - make.leading.trailing.mas_equalTo(self).inset(15); - make.height.mas_equalTo(52); - }]; - - [self.numTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(bgView); - make.leading.mas_equalTo(bgView).offset(10); - }]; - - [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.numTitleLabel.mas_trailing).offset(8); - make.height.mas_equalTo(28); - make.width.mas_equalTo(kGetScaleWidth(156)); - make.centerY.mas_equalTo(bgView); - }]; - - [self.allBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_greaterThanOrEqualTo(38); - make.height.mas_equalTo(24); - make.centerY.mas_equalTo(bgView); - make.trailing.mas_equalTo(bgView).offset(-10); - }]; -} --(void)setListData:(NSMutableArray *)listData count:(NSInteger)count{ - self.listData = listData; - if(listData.count == 0)return; - [self.collectionView reloadData]; - - self.pageControl.numberOfPages = count; - self.pageControl.currentPage = 0; - self.pageControl.hidden = count == 1; - self.pageControl.currentPageIndicatorTintColor = [UIColor colorWithRed:1.0 green:0.55 blue:0.01 alpha:1.0]; // 当前点颜色 #FF8C03 - self.pageControl.pageIndicatorTintColor = [UIColor colorWithRed:0.81 green:0.81 blue:0.81 alpha:1.0]; // 其他点颜色 #CECECE - -} --(void)resignFirstResponder{ - [self.textField resignFirstResponder]; -} -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - if(self.listData.count == 0){ - XPGuildEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class]) forIndexPath:indexPath]; - [cell setConstraints]; - [cell setTitle:YMLocalizedString(@"XPMineChooseGiveGiftView5")]; - return cell; - } - NSInteger count = indexPath.section / 4; - NSInteger index = indexPath.row == 0 ? indexPath.section + count * 4 : indexPath.section + count * 4 + 4; - GiftInfoModel *giftModel = self.listData[index]; - if(giftModel.isEmpty == YES){ - UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([UICollectionViewCell class]) forIndexPath:indexPath]; - cell.backgroundColor = [UIColor clearColor]; - return cell; - } - XPMineChooseGiveGiftViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineChooseGiveGiftViewCell class]) forIndexPath:indexPath]; - cell.giftModel = giftModel; - cell.isChoose = NO; - if(self.indexPath != nil){ - if(self.indexPath.section == indexPath.section){ - cell.isChoose = self.indexPath.row == indexPath.row; - } - } - - return cell; -} - -- (NSInteger)collectionView:(nonnull UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - if(self.listData.count == 0)return 1; - return 2; - - -} --(void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView{ -// NSInteger page = scrollView.contentOffset.x / (KScreenWidth - 30); - NSInteger currentPage = round(scrollView.contentOffset.x / scrollView.frame.size.width); - self.pageControl.currentPage = currentPage; -} --(NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView{ - - return self.listData.count > 0 ? self.listData.count / 2 : 1; -} -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{ - if(self.listData.count == 0)return self.collectionView.frame.size; - return CGSizeMake(kGetScaleWidth(72), kGetScaleWidth(107)); -} -- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ - if(self.listData.count == 0)return UIEdgeInsetsMake(0,0, 0, 0); - if(section == 0){ - return UIEdgeInsetsMake(kGetScaleWidth(17), kGetScaleWidth(14), 0, 0); - }else if (section == self.listData.count / 2 - 1){ - return UIEdgeInsetsMake(kGetScaleWidth(17), kGetScaleWidth(10), 0, kGetScaleWidth(14)); - }else if (section % 4 == 0){ - return UIEdgeInsetsMake(kGetScaleWidth(17), kGetScaleWidth(28), 0, 0); - } - return UIEdgeInsetsMake(kGetScaleWidth(17), kGetScaleWidth(10), 0, 0); -} --(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - - id cell = [collectionView cellForItemAtIndexPath:indexPath]; - if([cell isKindOfClass:[XPMineChooseGiveGiftViewCell class]]){ - XPMineChooseGiveGiftViewCell *getCell = (XPMineChooseGiveGiftViewCell *)cell; - self.indexPath = indexPath; - self.chooseGiftModel = getCell.giftModel; - [self.collectionView reloadData]; - if(self.delegate && [self.delegate respondsToSelector:@selector(textFieldDidChangeWithText:)]){ - [self.delegate textFieldDidChangeWithText:self.textField.text]; - } - - self.textField.text = @"1"; - } -} -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section{ - return kGetScaleWidth(10); -} -#pragma mark- UITextFieldDelegate --(void)textFieldDidChange:(UITextField *)textField{ - if(self.delegate && [self.delegate respondsToSelector:@selector(textFieldDidChangeWithText:)]){ - [self.delegate textFieldDidChangeWithText:textField.text]; - } -} --(void)allChooseAction{ - if(self.chooseGiftModel == nil){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMineChooseGiveGiftView2")]; - return; - } - self.textField.text = @(self.chooseGiftModel.count).stringValue; -} -#pragma mark -懒加载 - - -- (UICollectionView *)collectionView{ - if (!_collectionView){ - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc]init]; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _collectionView = [[UICollectionView alloc]initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.pagingEnabled = YES; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPMineChooseGiveGiftViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineChooseGiveGiftViewCell class])]; - [_collectionView registerClass:[UICollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([UICollectionViewCell class])]; - [_collectionView registerClass:[XPGuildEmptyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class])]; - } - return _collectionView; -} - --(UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = UIColorFromRGB(0xF7F7F7); - [_bgView setCornerRadius:12]; - } - return _bgView; -} -- (UIPageControl *)pageControl{ - if (!_pageControl){ - _pageControl = [[UIPageControl alloc]init]; - } - return _pageControl; -} - -- (UILabel *)numTitleLabel { - if (!_numTitleLabel) { - _numTitleLabel = [[UILabel alloc] init]; - _numTitleLabel.font = [UIFont systemFontOfSize:11]; - _numTitleLabel.textColor = UIColorFromRGB(0x7b7b7d); - _numTitleLabel.text = YMLocalizedString(@"XPMineChooseGiveGiftView0"); - } - return _numTitleLabel; -} - --(MSBaseTextField *)textField{ - if (!_textField){ - _textField = [MSBaseTextField new]; - _textField.keyboardType = UIKeyboardTypeNumberPad; - _textField.font = [UIFont systemFontOfSize:kGetScaleWidth(20) weight:UIFontWeightMedium]; - _textField.textColor = [DJDKMIMOMColor inputTextColor]; - _textField.attributedPlaceholder = [[NSMutableAttributedString alloc]initWithString:@"0" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:kGetScaleWidth(20) weight:UIFontWeightRegular],NSForegroundColorAttributeName:[DJDKMIMOMColor disableButtonTextColor]}]; - _textField.text = @"1"; - [_textField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; - } - return _textField; -} - --(UIButton *)allBtn{ - if (!_allBtn){ - _allBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_allBtn setTitle:YMLocalizedString(@"XPMineChooseGiveGiftView1") forState:UIControlStateNormal]; - _allBtn.titleLabel.font = kFontMedium(12); - [_allBtn setTitleColor:UIColorFromRGB(0xFF8C03) forState:UIControlStateNormal]; - _allBtn.backgroundColor = [UIColor whiteColor]; - [_allBtn setCornerRadius:12 - corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner - borderWidth:1 - borderColor:UIColorFromRGB(0xFF8C03)]; - [_allBtn addTarget:self action:@selector(allChooseAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _allBtn; -} --(NSString *)giftCount{ - return self.textField.text; -} - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftViewCell.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftViewCell.h deleted file mode 100644 index cce76ce..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPMineChooseGiveGiftViewCell.h -// YuMi -// -// Created by YuMi on 2022/11/1. -// - -#import -#import "GiftInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineChooseGiveGiftViewCell : UICollectionViewCell -@property (nonatomic,strong) GiftInfoModel * giftModel; -@property (nonatomic,assign) BOOL isChoose; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftViewCell.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftViewCell.m deleted file mode 100644 index 2e0ec98..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftViewCell.m +++ /dev/null @@ -1,105 +0,0 @@ -// -// XPMineChooseGiveGiftViewCell.m -// YuMi -// -// Created by YuMi on 2022/11/1. -// - -#import "XPMineChooseGiveGiftViewCell.h" -#import "NetImageView.h" -#import "UIView+Corner.h" -@interface XPMineChooseGiveGiftViewCell() -///礼物图片 -@property (nonatomic,strong) NetImageView *giftImageView; -///礼物名称 -@property (nonatomic,strong) UILabel *giftNameView; -///礼物数量 -@property (nonatomic,strong) UILabel *giftNumView; -@end -@implementation XPMineChooseGiveGiftViewCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - - [self.contentView addSubview:self.giftImageView]; - [self.contentView addSubview:self.giftNameView]; - [self.contentView addSubview:self.giftNumView]; -} -- (void)initSubViewConstraints { - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(72)); - make.top.centerX.equalTo(self.contentView); - - }]; - [self.giftNameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(12)); - make.top.equalTo(self.giftImageView.mas_bottom).mas_offset(kGetScaleWidth(6)); - }]; - [self.giftNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.equalTo(self.contentView); - make.height.equalTo(self.giftNameView); - make.top.equalTo(self.giftNameView.mas_bottom).mas_offset(kGetScaleWidth(5)); - }]; -} --(void)setIsChoose:(BOOL)isChoose{ - _isChoose = isChoose; - UIColor *lineColor = UIColorFromRGB(0xFF8C03); - _giftImageView.layer.borderColor = _isChoose ? lineColor.CGColor : [UIColor clearColor].CGColor; -} --(void)setGiftModel:(GiftInfoModel *)giftModel{ - _giftModel = giftModel; - _giftImageView.imageUrl = _giftModel.giftUrl; - _giftNameView.text = _giftModel.giftName; - _giftNumView.text = [NSString stringWithFormat:@"x%@",@(_giftModel.count)]; -} -#pragma mark -懒加载 - - -- (NetImageView *)giftImageView{ - if (!_giftImageView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _giftImageView = [[NetImageView alloc]initWithConfig:config]; - [_giftImageView setCornerWithLeftTopCorner:8 rightTopCorner:8 bottomLeftCorner:8 bottomRightCorner:8 size:CGSizeMake(kGetScaleWidth(72), kGetScaleWidth(72))]; - _giftImageView.backgroundColor = [UIColor whiteColor]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(72), kGetScaleWidth(72))]; - UIColor *lineColor = [UIColor colorWithPatternImage:image]; - _giftImageView.layer.cornerRadius = kGetScaleWidth(8); - _giftImageView.layer.masksToBounds = YES; - _giftImageView.layer.borderWidth = 1; - _giftImageView.layer.borderColor = lineColor.CGColor; - } - return _giftImageView; -} - -- (UILabel *)giftNameView { - if (!_giftNameView) { - _giftNameView = [[UILabel alloc] init]; - _giftNameView.font = [UIFont systemFontOfSize:13]; - _giftNameView.textColor = UIColorFromRGB(0x313131); - _giftNameView.textAlignment = NSTextAlignmentCenter; - } - return _giftNameView; -} - -- (UILabel *)giftNumView { - if (!_giftNumView) { - _giftNumView = [[UILabel alloc] init]; - _giftNumView.font = [UIFont systemFontOfSize:12]; - _giftNumView.textColor = UIColorFromRGB(0x7b7b7d); - _giftNumView.textAlignment = NSTextAlignmentCenter; - } - return _giftNumView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.h deleted file mode 100644 index 5d57598..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// XPMineConfirmGiveDiamondView.h -// YuMi -// -// Created by YuMi on 2022/10/20. -// - -#import -#import "UserInfoModel.h" -#import "XPMineGiveDiamondModel.h" -NS_ASSUME_NONNULL_BEGIN - - - - - - -@protocol XPMineConfirmGiveDiamondViewDelegate - -///确认支付 -- (void)xpMineConfirmGiveDiamondViewComplete; - - - -@end - -@interface XPMineConfirmGiveDiamondView : UIView -@property (nonatomic,strong) XPMineGiveDiamondModel *giveDiamondModel; -@property (nonatomic,assign) int type;//1，钻石，2，金币兑换钻石 -@property (nonatomic,assign) NSInteger inputDiamonds;//转赠数量 -@property (nonatomic,assign) NSInteger goldNum;//消耗钻石数 -@property (nonatomic,assign) double poundage;//手续费 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END - -/*************************************华丽分割线********************************************************/ - - -@interface XPMineConfirmGiveDiamondItemView : UIView - -@property(nonatomic,copy)NSString *title; - -@property(nonatomic,copy)NSString *num; -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.m deleted file mode 100644 index d03f93c..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.m +++ /dev/null @@ -1,349 +0,0 @@ -// -// XPMineConfirmGiveDiamondView.m -// YuMi -// -// Created by YuMi on 2022/10/20. -// - -#import "XPMineConfirmGiveDiamondView.h" -#import "ClientConfig.h" -#import "TTPopup.h" -#import "UIButton+EnlargeTouchArea.h" -@interface XPMineConfirmGiveDiamondView() -///转赠人 -@property (nonatomic,strong) UILabel *titleView; -///数量 -@property (nonatomic,strong) UILabel *numView; -///返回 -@property (nonatomic,strong) UIButton *backVeiw; -/// 手续费 -@property (nonatomic,strong) XPMineConfirmGiveDiamondItemView *poundageView; -/// 总钻石 -@property (nonatomic,strong) XPMineConfirmGiveDiamondItemView *totalNumView; -///确认 -@property (nonatomic,strong) UIButton *confirmBtn; -///分割线 -@property (nonatomic,strong) UIView *lineView; - -@end -@implementation XPMineConfirmGiveDiamondView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - self.layer.cornerRadius = 12; - self.layer.masksToBounds = YES; - [self addSubview:self.backVeiw]; - [self addSubview:self.titleView]; - [self addSubview:self.numView]; - [self addSubview:self.lineView]; - [self addSubview:self.poundageView]; - [self addSubview:self.totalNumView]; - [self addSubview:self.confirmBtn]; -} -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(310)); - make.height.mas_equalTo(kGetScaleWidth(250)); - }]; - [self.backVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(22)); - make.top.mas_equalTo(kGetScaleWidth(10)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - }]; - - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(20)); - make.trailing.mas_equalTo(-kGetScaleWidth(20)); - make.top.mas_equalTo(kGetScaleWidth(36)); - make.height.mas_equalTo(kGetScaleWidth(21)); - }]; - - [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.titleView); - make.height.mas_equalTo(42); - make.top.mas_equalTo(kGetScaleWidth(78)); - }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.titleView); - make.height.mas_equalTo(1); - make.top.mas_equalTo(kGetScaleWidth(113)); - }]; - - [self.poundageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.top.mas_equalTo(kGetScaleWidth(125)); - }]; - - [self.totalNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.top.mas_equalTo(kGetScaleWidth(150)); - }]; - [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(36)); - make.width.mas_equalTo(kGetScaleWidth(244)); - make.top.mas_equalTo(kGetScaleWidth(189)); - make.centerX.equalTo(self); - }]; - -} - -#pragma mark -set get 方法 --(void)setType:(int)type{ - _type = type; - if(_type == 2){ - _totalNumView.hidden = YES; - _poundageView.title = YMLocalizedString(@"XPMineConfirmGiveDiamondView7"); - _titleView.text = YMLocalizedString(@"XPMineConfirmGiveDiamondView5"); - [_confirmBtn setTitle:YMLocalizedString(@"XPMineConfirmGiveDiamondView8") forState:UIControlStateNormal]; - } -} -- (void)setGoldNum:(NSInteger)goldNum{ - _goldNum = goldNum; - if(_type == 2){ - [_poundageView setNum:[NSString stringWithFormat:YMLocalizedString(@"XPMineConfirmGiveDiamondView6"),_goldNum]]; - } -} -- (void)setInputDiamonds:(NSInteger)inputDiamonds{ - _inputDiamonds = inputDiamonds; - if(_type == 2){ - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc]initWithString:@(_inputDiamonds).stringValue attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:kGetScaleWidth(30) weight:UIFontWeightMedium],NSForegroundColorAttributeName:[DJDKMIMOMColor inputTextColor]}]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"moli_money_icon"];; - attachment.bounds = CGRectMake(0, roundf(self.numView.font.capHeight - 24)/2.f, 24, 24); - attachment.image =iconImage; - NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; - [attributedString insertAttributedString:starAttribute atIndex:attributedString.length]; - self.numView.attributedText = attributedString; - } -} --(void)setGiveDiamondModel:(XPMineGiveDiamondModel *)giveDiamondModel{ - _giveDiamondModel = giveDiamondModel; - _titleView.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineConfirmGiveDiamondView1"),_giveDiamondModel.targetNick]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@" %@ ", @(self.inputDiamonds)] - attributes:@{NSFontAttributeName:kFontSemibold(30), - NSForegroundColorAttributeName:UIColorFromRGB(0x313131)}]; - UIImage *iconImage = [UIImage imageNamed:@"moli_money_icon"];; - attachment.bounds = CGRectMake(0, roundf(self.numView.font.capHeight - 36)/2.f, 36, 36); - attachment.image =iconImage; - NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; - [attributedString insertAttributedString:starAttribute atIndex:0]; - self.numView.attributedText = attributedString; - self.poundageView.hidden = NO; - self.totalNumView.hidden = NO; - self.lineView.hidden = NO; - if(self.poundage > 0){ - ClientConfig *config = [ClientConfig shareConfig]; - [_poundageView setNum:[NSString stringWithFormat:@"%@%%",@(config.configInfo.giveDiamondRate * 100)]]; - double totalNum = self.inputDiamonds + self.poundage; - - NSString *num = [NSString stringWithFormat:@"%.2f",totalNum]; - [_totalNumView setNum:[NSString stringWithFormat:@"%@%@",[self removeSuffix:num],YMLocalizedString(@"XPMineConfirmGiveDiamondView4")] ]; - return; - } - [self changeConstraintsAction]; - self.poundageView.hidden = YES; - self.totalNumView.hidden = YES; - self.lineView.hidden = YES; - -} -/** - 过滤器/ 将.2f格式化的字符串，去除末尾0 - - @param numberStr .2f格式化后的字符串 - @return 去除末尾0之后的 - */ -- (NSString *)removeSuffix:(NSString *)numberStr{ - if (numberStr.length > 1) { - - if ([numberStr componentsSeparatedByString:@"."].count == 2) { - NSString *last = [numberStr componentsSeparatedByString:@"."].lastObject; - if ([last isEqualToString:@"00"]) { - numberStr = [numberStr substringToIndex:numberStr.length - (last.length + 1)]; - return numberStr; - }else{ - if ([[last substringFromIndex:last.length -1] isEqualToString:@"0"]) { - numberStr = [numberStr substringToIndex:numberStr.length - 1]; - return numberStr; - } - } - } - return numberStr; - }else{ - return nil; - } -} - -///更改约束 --(void)changeConstraintsAction{ - [self mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(196)); - }]; - [self.confirmBtn mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(136)); - }]; - -} - -#pragma mark- btn action --(void)backAction{ - [TTPopup dismiss]; -} --(void)confirmAction{ - [TTPopup dismiss]; - if(self.delegate && [self.delegate respondsToSelector:@selector(xpMineConfirmGiveDiamondViewComplete)]){ - [self.delegate xpMineConfirmGiveDiamondViewComplete]; - } -} -#pragma mark - 懒加载 -- (UIButton *)backVeiw{ - if (!_backVeiw){ - _backVeiw = [UIButton new]; - [_backVeiw setBackgroundImage:[UIImage imageNamed:@"mine_give_diamond_back"] forState:UIControlStateNormal]; - [_backVeiw setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_backVeiw addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backVeiw; -} -- (UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel new]; - _titleView.font = [UIFont systemFontOfSize:kGetScaleWidth(15) weight:UIFontWeightRegular]; - _titleView.textColor = [DJDKMIMOMColor inputTextColor]; - _titleView.textAlignment = NSTextAlignmentCenter; - } - return _titleView; -} --(UILabel *)numView{ - if (!_numView){ - _numView = [UILabel new]; - _numView.font = kFontSemibold(30); - _numView.textColor = [DJDKMIMOMColor inputTextColor]; - _numView.textAlignment = NSTextAlignmentCenter; - } - return _numView; -} -- (UIView *)lineView{ - - if (!_lineView){ - _lineView = [UIView new]; - _lineView.backgroundColor = UIColorFromRGB(0xF7F7F7); - } - return _lineView; - -} -- (XPMineConfirmGiveDiamondItemView *)poundageView{ - if (!_poundageView){ - _poundageView = [[XPMineConfirmGiveDiamondItemView alloc]initWithFrame:CGRectZero]; - [_poundageView setTitle:YMLocalizedString(@"XPMineConfirmGiveDiamondView2")]; - - } - return _poundageView; -} --(XPMineConfirmGiveDiamondItemView *)totalNumView{ - if (!_totalNumView){ - _totalNumView = [[XPMineConfirmGiveDiamondItemView alloc]initWithFrame:CGRectZero]; - [_totalNumView setTitle:YMLocalizedString(@"XPMineConfirmGiveDiamondView3")]; - } - return _totalNumView; -} -- (UIButton *)confirmBtn{ - if (!_confirmBtn){ - _confirmBtn = [UIButton new]; - UIImage *image = [UIImage gradientColorImageFromColors:@[ UIColorFromRGB(0xE29030), - UIColorFromRGB(0xfcc074)] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(kGetScaleWidth(244), kGetScaleWidth(36))]; - [_confirmBtn setBackgroundImage:image forState:UIControlStateNormal]; - [_confirmBtn setTitle:YMLocalizedString(@"XPMineConfirmGiveDiamondView0") forState:UIControlStateNormal]; - _confirmBtn.titleLabel.font = kFontMedium(14); - [_confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_confirmBtn addTarget:self action:@selector(confirmAction) forControlEvents:UIControlEventTouchUpInside]; - _confirmBtn.layer.cornerRadius = kGetScaleWidth(36)/2; - _confirmBtn.layer.masksToBounds = YES; - } - return _confirmBtn; -} -@end - - -/*************************************华丽分割线********************************************************/ - -@interface XPMineConfirmGiveDiamondItemView() - -@property (nonatomic,strong) UILabel *titleView; -@property (nonatomic,strong) UILabel *numView; - - - - -@end - -@implementation XPMineConfirmGiveDiamondItemView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} --(void)setTitle:(NSString *)title{ - _title = title; - _titleView.text = _title; - -} --(void)setNum:(NSString *)num{ - _num = num; - _numView.text = _num; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.titleView]; - [self addSubview:self.numView]; -} -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(20)); - make.top.bottom.equalTo(self); - }]; - [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(20)); - make.top.bottom.equalTo(self); - }]; - -} - -#pragma mark - 懒加载 - -- (UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel new]; - _titleView.font = [UIFont systemFontOfSize:kGetScaleWidth(12) weight:UIFontWeightRegular]; - _titleView.textColor = UIColorFromRGB(0x6D6B89); - } - return _titleView; -} --(UILabel *)numView{ - if (!_numView){ - _numView = [UILabel new]; - _numView.font = [UIFont systemFontOfSize:kGetScaleWidth(12) weight:UIFontWeightRegular]; - _numView.textColor = UIColorFromRGB(0x6D6B89); - _numView.textAlignment = NSTextAlignmentRight; - - } - return _numView; -} -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondCell.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondCell.h deleted file mode 100644 index f3cc5f5..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondCell.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPMineGiveDiamondCell.h -// YuMi -// -// Created by YuMi on 2022/10/17. -// - -#import -#import "XPMineGiveDiamondModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGiveDiamondCell : UITableViewCell -@property (nonatomic,strong) XPMineGiveDiamondModel *giveDiamondModel; - -@property(nonatomic, copy) void(^handleTapTransfer)(XPMineGiveDiamondModel *giveDiamondModel); -@property(nonatomic, copy) void(^handleTapHistory)(XPMineGiveDiamondModel *giveDiamondModel); - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondCell.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondCell.m deleted file mode 100644 index 12da92b..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondCell.m +++ /dev/null @@ -1,152 +0,0 @@ -// -// XPMineGiveDiamondCell.m -// YuMi -// -// Created by YuMi on 2022/10/17. -// - -#import "XPMineGiveDiamondCell.h" -#import "NetImageView.h" -@interface XPMineGiveDiamondCell() - -///头像 -@property (nonatomic,strong) NetImageView *headView; - -/// 名字 -@property (nonatomic,strong) UILabel *titleView; - -/// id -@property (nonatomic,strong) UILabel * IdTitleView; - -@property(nonatomic, strong) UIButton *transferButton; -@property(nonatomic, strong) UIButton *historyButton; - -@end - -@implementation XPMineGiveDiamondCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} --(void)setGiveDiamondModel:(XPMineGiveDiamondModel *)giveDiamondModel{ - _giveDiamondModel = giveDiamondModel; - _headView.imageUrl = _giveDiamondModel.targetAvatar; - _titleView.text = _giveDiamondModel.targetNick; - _IdTitleView.text = [NSString stringWithFormat:@"ID:%@",_giveDiamondModel.targetErbanNo]; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = 0; - [self.contentView addSubview:self.headView]; - [self.contentView addSubview:self.titleView]; - [self.contentView addSubview:self.IdTitleView]; - [self.contentView addSubview:self.transferButton]; - [self.contentView addSubview:self.historyButton]; - -} -- (void)initSubViewConstraints { - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(50)); - make.centerY.equalTo(self); - make.leading.mas_equalTo(kGetScaleWidth(15)); - }]; - - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.headView.mas_trailing).mas_offset( kGetScaleWidth(10)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.top.equalTo(self.headView.mas_top).mas_offset(kGetScaleWidth(8)); - make.trailing.mas_equalTo(self.transferButton.mas_leading).offset(-4); - }]; - - [self.IdTitleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.titleView); - make.height.mas_equalTo(kGetScaleWidth(14)); - make.top.equalTo(self.titleView.mas_bottom).mas_offset(kGetScaleWidth(4)); - }]; - - [self.historyButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self).offset(-15); - make.height.mas_equalTo(30); - make.width.mas_equalTo(68); - make.centerY.equalTo(self.headView); - }]; - - [self.transferButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.historyButton.mas_leading).offset(-10); - make.height.mas_equalTo(30); - make.width.mas_equalTo(68); - make.centerY.equalTo(self.headView); - }]; -} - -- (void)didTapTransfer { - if (_handleTapTransfer) { - self.handleTapTransfer(self.giveDiamondModel); - } -} - -- (void)didTapHistory { - if (_handleTapHistory) { - self.handleTapHistory(self.giveDiamondModel); - } -} - -#pragma mark - 懒加载 -- (NetImageView *)headView{ - if (!_headView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _headView = [[NetImageView alloc]initWithConfig:config]; - _headView.layer.cornerRadius = kGetScaleWidth(50) / 2; - _headView.layer.masksToBounds = YES; - } - return _headView; -} --(UILabel *)titleView{ - if (!_titleView){ - _titleView = [[UILabel alloc]init]; - _titleView.font = [UIFont systemFontOfSize:kGetScaleWidth(14) weight:UIFontWeightMedium]; - _titleView.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleView; -} --(UILabel *)IdTitleView{ - if (!_IdTitleView){ - _IdTitleView = [UILabel new]; - _IdTitleView.font = [UIFont systemFontOfSize:kGetScaleWidth(12) weight:UIFontWeightMedium]; - _IdTitleView.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _IdTitleView; -} - -- (UIButton *)transferButton { - if (!_transferButton) { - _transferButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_transferButton.titleLabel setFont:kFontMedium(13)]; - [_transferButton setTitle:YMLocalizedString(@"1.0.37_text_46") forState:UIControlStateNormal]; - [_transferButton setTitleColor:UIColorFromRGB(0xCD6300) forState:UIControlStateNormal]; - [_transferButton setBackgroundColor:UIColorFromRGB(0xFFEFDC)]; - [_transferButton addTarget:self action:@selector(didTapTransfer) forControlEvents:UIControlEventTouchUpInside]; - [_transferButton setCornerRadius:15]; - } - return _transferButton; -} - -- (UIButton *)historyButton { - if (!_historyButton) { - _historyButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_historyButton.titleLabel setFont:kFontMedium(13)]; - [_historyButton setTitle:YMLocalizedString(@"1.0.37_text_47") forState:UIControlStateNormal]; - [_historyButton setTitleColor:UIColorFromRGB(0x3b70c8) forState:UIControlStateNormal]; - [_historyButton setBackgroundColor:UIColorFromRGB(0xe4eeff)]; - [_historyButton addTarget:self action:@selector(didTapHistory) forControlEvents:UIControlEventTouchUpInside]; - [_historyButton setCornerRadius:15]; - } - return _historyButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsCell.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsCell.h deleted file mode 100644 index 44edad7..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPMineGiveDiamondDetailsCell.h -// YuMi -// -// Created by YuMi on 2022/11/1. -// - -#import -#import "XPMineGiveDiamondDetailsModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGiveDiamondDetailsCell : UITableViewCell -@property (nonatomic,strong) XPMineGiveDiamondDetailsModel *model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsCell.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsCell.m deleted file mode 100644 index 862e5cf..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsCell.m +++ /dev/null @@ -1,209 +0,0 @@ -// -// XPMineGiveDiamondDetailsCell.m -// YuMi -// -// Created by YuMi on 2022/11/1. -// - -#import "XPMineGiveDiamondDetailsCell.h" -#import "NetImageView.h" -#import "NSDate+DateUtils.h" -#import "MoliMoneyLabel.h" -@interface XPMineGiveDiamondDetailsCell() -///礼物/钻石图标 -@property (nonatomic,strong) NetImageView * avatarImageView; -///礼物标题 -@property (nonatomic,strong) UILabel *titleLabel; -///时间 -@property (nonatomic,strong) UILabel *timeLabel; -///转赠钻石数量 -@property (nonatomic,strong) UILabel *contentLabel; -///转赠钻石支出 -@property (nonatomic,strong) UILabel *spendingView; - -@property (nonatomic,strong) UILabel *idLabel; - -@property(nonatomic, strong) MoliMoneyLabel *moneyLabel; - -@end -@implementation XPMineGiveDiamondDetailsCell - - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - self.selectionStyle = 0; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.timeLabel]; - [self.contentView addSubview:self.contentLabel]; - [self.contentView addSubview:self.spendingView]; - [self.contentView addSubview:self.moneyLabel]; - [self.contentView addSubview:self.idLabel]; -} -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(49)); - make.centerY.equalTo(self.contentView); - make.leading.mas_equalTo(kGetScaleWidth(15)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(65)); - make.top.mas_equalTo(self.avatarImageView).offset(3); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.avatarImageView.mas_top).mas_offset(3); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - make.height.mas_equalTo(kGetScaleWidth(21)); - make.trailing.equalTo(self.moneyLabel.mas_leading).mas_offset(-10); - }]; - [self.spendingView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.contentLabel); - make.trailing.equalTo(self.timeLabel); - make.top.equalTo(self.contentLabel.mas_bottom).mas_offset(kGetScaleWidth(4)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentLabel); - make.top.mas_equalTo(self.contentLabel.mas_bottom).offset(3); - make.height.mas_equalTo(20); - }]; - - [self.moneyLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-15); - make.top.mas_equalTo(self.titleLabel); - make.height.mas_equalTo(22); - make.width.mas_greaterThanOrEqualTo(30); - }]; - - // 设置 label 优先级，确保右边的 label 能够完整显示 - [self.moneyLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [self.titleLabel setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; - -} -#pragma mark - 赋值 -- (void)setModel:(XPMineGiveDiamondDetailsModel *)model{ - _model = model; - [self setValue]; -} - --(void)setValue{ - self.titleLabel.hidden = YES; - self.contentLabel.hidden = YES; - self.spendingView.hidden = YES; - self.avatarImageView.image = nil; - - if(self.model.type.intValue == 0){ - // 转赠钻石 - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.bottom.equalTo(self.contentView).offset(-15); - }]; - self.moneyLabel.hidden = NO; - self.titleLabel.hidden = YES; - self.contentLabel.hidden = NO; - self.idLabel.hidden = NO; - self.idLabel.text = [NSString stringWithFormat:@"ID:%@", self.model.targetErbanNo]; - self.avatarImageView.image = [UIImage imageNamed:@"moli_money_icon"]; - self.avatarImageView.imageUrl = self.model.targetAvatar; - self.contentLabel.text = self.model.targetNick; - self.timeLabel.text = [NSDate timestampSwitchTime:self.model.createTime/1000 andFormatter:@"yyyy-MM-dd HH:mm:ss"]; - [self.moneyLabel updateContent:[NSString stringWithFormat:@"-%@", self.model.diamondNum]]; - } else { - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.centerY.equalTo(self.contentLabel); - }]; - self.avatarImageView.image = [UIImageConstant defaultAvatarPlaceholder]; - self.avatarImageView.imageUrl = self.model.giftUrl; - self.titleLabel.text = [NSString stringWithFormat:@"%@ x%@",self.model.giftName,self.model.giftNum]; - self.timeLabel.text = [NSDate timestampSwitchTime:self.model.createTime/1000 andFormatter:@"yyyy-MM-dd HH:mm:ss"]; - self.titleLabel.hidden = NO; - self.contentLabel.hidden = YES; - self.spendingView.hidden = YES; - } -} - -#pragma mark - 懒加载 -- (NetImageView *)avatarImageView{ - if (!_avatarImageView){ - _avatarImageView = [[NetImageView alloc]init]; - _avatarImageView.backgroundColor = UIColorFromRGB(0xF3F5FA); - _avatarImageView.layer.cornerRadius = kGetScaleWidth(49)/2; - _avatarImageView.clipsToBounds = YES; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _avatarImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = kFontSemibold(15); - _titleLabel.textColor = [DJDKMIMOMColor inputTextColor]; - _titleLabel.hidden = YES; - } - return _titleLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = kFontRegular(13); - _timeLabel.textColor = [DJDKMIMOMColor disableButtonTextColor]; - _timeLabel.textAlignment = NSTextAlignmentRight; - } - return _timeLabel; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[UILabel alloc] init]; - _contentLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _contentLabel.textColor = [DJDKMIMOMColor inputTextColor]; - _contentLabel.text = @"0"; - } - return _contentLabel; -} - -- (UILabel *)spendingView { - if (!_spendingView) { - _spendingView = [[UILabel alloc] init]; - _spendingView.font = kFontRegular(13); - _spendingView.textColor = [DJDKMIMOMColor disableButtonTextColor]; - _spendingView.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineGiveDiamondDetailsCell0"),@"0"]; - } - return _spendingView; -} - -- (MoliMoneyLabel *)moneyLabel { - if (!_moneyLabel) { - _moneyLabel = [MoliMoneyLabel moneyLabelWithTextColot:UIColorFromRGB(0xFF8C03) - font:kFontSemibold(16) - moneyPostion:2 - moneySize:CGSizeMake(22, 22)]; - _moneyLabel.hidden = YES; - } - return _moneyLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [UILabel labelInitWithText:@"" font:kFontRegular(13) textColor:UIColorFromRGB(0x7b7b7d)]; - _idLabel.hidden = YES; - } - return _idLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsView.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsView.h deleted file mode 100644 index 9184657..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsView.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// XPMineGiveDiamondDetailsView.h -// YuMi -// -// Created by YuMi on 2022/10/31. -// - -#import -#import -#import "XPMineGiveDiamondDetailsModel.h" -NS_ASSUME_NONNULL_BEGIN - - - - -@interface XPMineGiveDiamondDetailsView : UIView -@property (nonatomic,strong) UITableView *tableView; -@property(nonatomic,strong)NSMutableArray *listData; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsView.m deleted file mode 100644 index e4b5028..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsView.m +++ /dev/null @@ -1,88 +0,0 @@ -// -// XPMineGiveDiamondDetailsView.m -// YuMi -// -// Created by YuMi on 2022/10/31. -// - -#import "XPMineGiveDiamondDetailsView.h" - -///view -#import "XPMineGiveDiamondDetailsCell.h" -#import "XPMineFriendEmptyTableViewCell.h" - - -@interface XPMineGiveDiamondDetailsView() - -@end - - -@implementation XPMineGiveDiamondDetailsView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - self.backgroundColor = [UIColor whiteColor]; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.tableView]; - -} -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; -} -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self; -} --(void)setListData:(NSMutableArray *)listData{ - _listData = listData; -} -#pragma mark - UITableViewDelegate - --(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ - return self.listData.count > 0 ? self.listData.count : 1; -} - --(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{ - return self.listData.count > 0 ? kGetScaleWidth(72) : self.tableView.frame.size.height; -} --(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - if(self.listData.count > 0){ - XPMineGiveDiamondDetailsCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGiveDiamondDetailsCell class]) forIndexPath:indexPath]; - cell.model = self.listData[indexPath.row]; - return cell; - } - XPMineFriendEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])forIndexPath:indexPath] ; - - cell.emptyTitle = YMLocalizedString(@"XPMineGiveDiamondVC3"); - return cell; -} -#pragma mark - 懒加载 -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.showsVerticalScrollIndicator = NO; - _tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine; - _tableView.separatorInset = UIEdgeInsetsMake(0, 15, 0, 15); - _tableView.separatorColor = UIColorFromRGB(0xe4e4e4); - _tableView.backgroundColor = [UIColor clearColor]; - [_tableView registerClass:[XPMineGiveDiamondDetailsCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGiveDiamondDetailsCell class])]; - [_tableView registerClass:[XPMineFriendEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - } - return _tableView; -} -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPasswordView.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPasswordView.h deleted file mode 100644 index 4be8272..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPasswordView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPMineGiveDiamondPasswordView.h -// YuMi -// -// Created by YuMi on 2022/10/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef void(^MineGiveDiamondPasswordViewBlock)(void); - - -@interface XPMineGiveDiamondPasswordView : UIView -@property (nonatomic,copy) MineGiveDiamondPasswordViewBlock completeBlock; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPasswordView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPasswordView.m deleted file mode 100644 index d7121fd..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPasswordView.m +++ /dev/null @@ -1,115 +0,0 @@ -// -// XPMineGiveDiamondPasswordView.m -// YuMi -// -// Created by YuMi on 2022/10/21. -// - -#import "XPMineGiveDiamondPasswordView.h" -#import "UIView+Corner.h" -#import "TTPopup.h" -@interface XPMineGiveDiamondPasswordView() -///标题 -@property (nonatomic,strong) UILabel *titleView; -///取消 -@property (nonatomic,strong) UIButton *cancelBtn; -///确认 -@property (nonatomic,strong) UIButton *confirmBtn; - -@end - -@implementation XPMineGiveDiamondPasswordView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - [self setCornerWithLeftTopCorner:kGetScaleWidth(12) rightTopCorner:kGetScaleWidth(12) bottomLeftCorner:kGetScaleWidth(12) bottomRightCorner:kGetScaleWidth(12) size:CGSizeMake(kGetScaleWidth(310), kGetScaleWidth(149))]; - [self addSubview:self.titleView]; - [self addSubview:self.cancelBtn]; - [self addSubview:self.confirmBtn]; - -} -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(310)); - make.height.mas_equalTo(kGetScaleWidth(149)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(25)); - make.trailing.leading.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(21)); - }]; - [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(31)); - make.width.mas_equalTo(kGetScaleWidth(110)); - make.height.mas_equalTo(kGetScaleWidth(37)); - make.top.mas_equalTo(kGetScaleWidth(81)); - }]; - [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(self.cancelBtn); - make.trailing.mas_equalTo(-kGetScaleWidth(31)); - }]; -} - - --(void)cancelAction{ - [TTPopup dismiss]; -} --(void)confirmAction{ - [TTPopup dismiss]; - if(self.completeBlock){ - self.completeBlock(); - } -} -#pragma mark - 懒加载 -- (UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel new]; - _titleView.font = [UIFont systemFontOfSize:kGetScaleWidth(15) weight:UIFontWeightRegular]; - _titleView.textColor = [DJDKMIMOMColor inputTextColor]; - _titleView.text = YMLocalizedString(@"XPMineChooseGiveDiamondVC1"); - _titleView.textAlignment = NSTextAlignmentCenter; - } - return _titleView; -} - --(UIButton *)cancelBtn{ - if (!_cancelBtn){ - _cancelBtn = [UIButton new]; - [_cancelBtn setTitle:YMLocalizedString(@"XPShareView7") forState:UIControlStateNormal]; - _cancelBtn.layer.cornerRadius = kGetScaleWidth(37) / 2; - _cancelBtn.layer.masksToBounds = YES; - [_cancelBtn setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateNormal]; - [_cancelBtn addTarget:self action:@selector(cancelAction) forControlEvents:UIControlEventTouchUpInside]; - _cancelBtn.titleLabel.font = [UIFont systemFontOfSize:kGetScaleWidth(14) weight:UIFontWeightRegular]; - _cancelBtn.backgroundColor = [DJDKMIMOMColor disableButtonColor]; - } - return _cancelBtn; -} - -- (UIButton *)confirmBtn{ - if (!_confirmBtn){ - _confirmBtn = [UIButton new]; - [_confirmBtn setTitle:YMLocalizedString(@"XPMineChooseGiveDiamondVC2") forState:UIControlStateNormal]; - [_confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _confirmBtn.titleLabel.font = [UIFont systemFontOfSize:kGetScaleWidth(14) weight:UIFontWeightRegular]; - [_confirmBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _confirmBtn.layer.cornerRadius = kGetScaleWidth(37) / 2; - _confirmBtn.layer.masksToBounds = YES; - [_confirmBtn addTarget:self action:@selector(confirmAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _confirmBtn; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPwdView.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPwdView.h deleted file mode 100644 index e445c97..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPwdView.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// XPMineGiveDiamondPwdView.h -// YuMi -// -// Created by YuMi on 2022/10/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@protocol XPMineGiveDiamondPwdViewDelegate - -///完成输入密码 -- (void)xpMineGiveDiamondPwdViewPwdComplete:(NSString *)pwd; - - - -@end -@interface XPMineGiveDiamondPwdView : UIView -@property (nonatomic, weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPwdView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPwdView.m deleted file mode 100644 index f2b7c05..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPwdView.m +++ /dev/null @@ -1,168 +0,0 @@ -// -// XPMineGiveDiamondPwdView.m -// YuMi -// -// Created by YuMi on 2022/10/19. -// - -#import "XPMineGiveDiamondPwdView.h" -#import "LoginVerifCodeView.h" -#import -#import - -@interface XPMineGiveDiamondPwdView() - -@property (nonatomic, strong) UIButton *closeBtn; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) LoginVerifCodeView *codeView; -@property (nonatomic, strong) UIView *bgView; - -@end -@implementation XPMineGiveDiamondPwdView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - [self initEvents]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(keyboardWillShow:)name:UIKeyboardWillShowNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil]; - - - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.35]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.closeBtn]; - [self.bgView addSubview:self.titleLabel]; - [self.bgView addSubview:self.codeView]; - -} -- (void)keyboardWillShow:(NSNotification *)notification { - NSDictionary *userInfo = [notification userInfo]; - CGFloat curkeyBoardHeight = [[[notification userInfo]objectForKey:@"UIKeyboardBoundsUserInfoKey"]CGRectValue].size.height; - CGRect begin = [[[notification userInfo]objectForKey:@"UIKeyboardFrameBeginUserInfoKey"]CGRectValue]; - CGRect end = [[[notification userInfo]objectForKey:@"UIKeyboardFrameEndUserInfoKey"]CGRectValue]; - // 第三方键盘回调三次问题，监听仅执行最后一次 - - if( begin.size.height > 0 && (begin.origin.y - end.origin.y > 0)){ - CGFloat keyBoardHeight = curkeyBoardHeight; - CGFloat animationDuration = [userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue]; - [UIView animateWithDuration:animationDuration animations:^{ - self.bgView.frame = CGRectMake(0, KScreenHeight - keyBoardHeight - kGetScaleWidth(162), KScreenWidth, kGetScaleWidth(162)); - }]; - } -} -- (void)keyboardWillHide:(NSNotification *)notification{ - - //获取键盘的高度 - NSDictionary *userInfo = [notification userInfo]; - NSValue *keyboardValue = [userInfo objectForKey:UIKeyboardFrameEndUserInfoKey]; - CGRect keyboardRect = [keyboardValue CGRectValue]; - CGFloat height = CGRectGetHeight(keyboardRect); - CGFloat animationDuration = [userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue]; - //做自定义事件 - self.backgroundColor = [UIColor clearColor]; - [UIView animateWithDuration:animationDuration animations:^{ - self.bgView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, kGetScaleWidth(162)); - }completion:^(BOOL finished) { - [self removeFromSuperview]; - }]; - -} --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} - -- (void)initSubViewConstraints { - - self.bgView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, kGetScaleWidth(162)); - [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.top.mas_equalTo(kGetScaleWidth(15)); - make.height.width.mas_equalTo(kGetScaleWidth(22)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(kGetScaleWidth(30)); - make.height.mas_equalTo(kGetScaleWidth(22)); - }]; - - - - [self.codeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(50)); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(40)); - }]; - - -} - -- (void)initEvents { - @weakify(self); - self.codeView.textFieldChangeBlock = ^(NSString * _Nonnull code) { - @strongify(self); - if (code.length == 6) { - [self removeFromSuperview]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xpMineGiveDiamondPwdViewPwdComplete:)]) { - [self.delegate xpMineGiveDiamondPwdViewPwdComplete:code]; - } - } - }; -} - -- (void)onCloseButtonClick:(UIButton *)sender { - [self removeFromSuperview]; -} - - -- (UILabel *)titleLabel { - if (!_titleLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomRedPacketPwdView0"); - label.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - label.textColor = [DJDKMIMOMColor inputTextColor]; - _titleLabel = label; - } - return _titleLabel; -} - --(UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - [_bgView setCornerRadius:16 cornerMask:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner]; - } - return _bgView; -} - - -- (UIButton *)closeBtn { - if (!_closeBtn) { - _closeBtn = [[UIButton alloc] init]; - [_closeBtn setImage:[UIImage imageNamed:@"send_redPacket_cancel"] forState:UIControlStateNormal]; - [_closeBtn addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeBtn; -} - -- (LoginVerifCodeView *)codeView { - if (!_codeView) { - _codeView= [[LoginVerifCodeView alloc] init]; - _codeView.type = 1; - _codeView.number = 6; - _codeView.shouldBeSecurity = YES; - } - return _codeView; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.h deleted file mode 100644 index 6e174ca..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPMineGiveDiamondSearchView.h -// YuMi -// -// Created by YuMi on 2022/10/17. -// - -#import -#import "XPMineGiveDiamondProtocol.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGiveDiamondSearchView : UIView -@property (nonatomic,assign) BOOL isSearchHall; -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.m deleted file mode 100644 index 56384e0..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.m +++ /dev/null @@ -1,133 +0,0 @@ -// -// XPMineGiveDiamondSearchView.m -// YuMi -// -// Created by YuMi on 2022/10/17. -// - -#import "XPMineGiveDiamondSearchView.h" - -@interface XPMineGiveDiamondSearchView() - -///背景 -@property (nonatomic,strong)UIImageView *bgView; -///搜索输入 -@property (nonatomic,strong) MSBaseTextField *textField; -///搜索btn -@property (nonatomic,strong) UIButton *searchBtn; - -@property (nonatomic, assign) BOOL isReturnKey; - -@end -@implementation XPMineGiveDiamondSearchView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.textField]; -// [self.bgView addSubview:self.searchBtn]; -} -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.top.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(32)); - }]; - - UIImageView *searchImageView = [[UIImageView alloc] initWithImage:kImage(@"home_nav_search")]; - [self.bgView addSubview:searchImageView]; - [searchImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.bgView); - make.leading.mas_equalTo(15); - make.size.mas_equalTo(CGSizeMake(20, 20)); - }]; - - [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(self.bgView); - make.leading.mas_equalTo(searchImageView.mas_trailing).offset(5); - make.trailing.mas_equalTo(-kGetScaleWidth(76)); - }]; -} - --(void)searchAction{ - [self.textField resignFirstResponder]; - if(self.delegate && [self.delegate respondsToSelector:@selector(searchEndWithText:)]){ - [self.delegate searchEndWithText:self.textField.text]; - } -} --(void)setIsSearchHall:(BOOL)isSearchHall{ - _isSearchHall = isSearchHall; - if(_isSearchHall == YES){ - _textField.keyboardType = UIKeyboardTypeDefault; - _textField.attributedPlaceholder = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPMineGiveDiamondSearchView3") attributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor secondTextColor],NSFontAttributeName:[UIFont systemFontOfSize:14 weight:UIFontWeightRegular]}]; - } -} - -#pragma mark - -#pragma mark - UITextFieldDelegate -- (BOOL)textFieldShouldReturn:(UITextField *)textField { - self.isReturnKey = YES; // 新增属性，标记 return 触发 - [self searchAction]; - return YES; -} - -- (void)textFieldDidEndEditing:(UITextField *)textField { - if (!self.isReturnKey) { - [self searchAction]; - } - self.isReturnKey = NO; // 重置 -} - -#pragma mark - 懒加载 -- (UIImageView *)bgView{ - if (!_bgView){ - _bgView = [UIImageView new]; - _bgView.userInteractionEnabled = YES; -// _bgView.image = [UIImage imageNamed:@"mine_give_diamond_search"]; - _bgView.backgroundColor = UIColorFromRGB(0xf7f7f7); - [_bgView setCornerRadius:kGetScaleWidth(32/2)]; - } - return _bgView; -} --(MSBaseTextField *)textField{ - if (!_textField){ - _textField = [[MSBaseTextField alloc]initWithFrame:CGRectZero]; - _textField.delegate = self; - _textField.keyboardType = UIKeyboardTypeNumbersAndPunctuation; - _textField.returnKeyType = UIReturnKeySearch; - _textField.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _textField.textColor = [DJDKMIMOMColor mainTextColor]; - _textField.attributedPlaceholder = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPMineGiveDiamondSearchView1") attributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor secondTextColor],NSFontAttributeName:[UIFont systemFontOfSize:14 weight:UIFontWeightRegular]}]; -// UIToolbar *bar = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 0, 100, 0)]; -// _textField.inputAccessoryView = bar; -// bar.hidden = YES; - } - return _textField; -} --(UIButton *)searchBtn{ - if (!_searchBtn){ - _searchBtn = [UIButton new]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(66), kGetScaleWidth(26))]; - [_searchBtn setBackgroundImage:image forState:UIControlStateNormal]; - [_searchBtn setTitle:YMLocalizedString(@"XPMineGiveDiamondSearchView0") forState:UIControlStateNormal]; - [_searchBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _searchBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - _searchBtn.layer.cornerRadius = kGetScaleWidth(26) / 2; - _searchBtn.layer.masksToBounds = YES; - - [_searchBtn addTarget:self action:@selector(searchAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _searchBtn; -} -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPPageControl.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPPageControl.h deleted file mode 100644 index 0c19c09..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPPageControl.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPPageControl.h -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPPageControl : UIView - -@property (nonatomic,assign) NSInteger curPage; -@property (nonatomic,assign) NSInteger count; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPPageControl.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPPageControl.m deleted file mode 100644 index 940c155..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPPageControl.m +++ /dev/null @@ -1,47 +0,0 @@ -// -// XPPageControl.m -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import "XPPageControl.h" -#import "UIImage+Utils.h" - -@implementation XPPageControl - -#pragma mark - Private Method -- (void)initSubViews { - for (int i = 0; i < self.count; i++) { - UIButton *sender = [[UIButton alloc]initWithFrame:CGRectMake(i * kGetScaleWidth(22), 0, kGetScaleWidth(16), kGetScaleWidth(3))]; - UIImage *chooseImage = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(16), kGetScaleWidth(3))]; - UIImage *noChooseImage = [UIImage gradientColorImageFromColors:@[[UIColor whiteColor],[UIColor whiteColor],[UIColor whiteColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(16), kGetScaleWidth(3))]; - [sender setBackgroundImage:chooseImage forState:UIControlStateSelected]; - [sender setBackgroundImage:noChooseImage forState:UIControlStateNormal]; - sender.layer.cornerRadius = kGetScaleWidth(3)/2; - sender.layer.masksToBounds = YES; - sender.tag = i + 1; - [self addSubview:sender]; - } - -} -- (void)initSubViewConstraints { - CGFloat width = self.count * kGetScaleWidth(16) + (self.count - 1) * kGetScaleWidth(6); - [self mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(width); - }]; -} --(void)setCurPage:(NSInteger)curPage{ - _curPage = curPage; - for (UIButton *button in self.subviews) { - button.selected = _curPage == button.tag; - } -} --(void)setCount:(NSInteger)count{ - _count = count; - [self initSubViewConstraints]; - [self initSubViews]; - -} - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/RechargerTransferHistoryViewController.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/RechargerTransferHistoryViewController.h deleted file mode 100644 index 357b053..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/RechargerTransferHistoryViewController.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// RechargerTransferHistoryViewController.h -// YuMi -// -// Created by P on 2025/2/25. -// - -#import "MvpViewController.h" -@class UserInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface RechargerTransferHistoryViewController : MvpViewController - -- (instancetype)initWithUserInfo:(UserInfoModel *)userInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/RechargerTransferHistoryViewController.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/RechargerTransferHistoryViewController.m deleted file mode 100644 index 8989656..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/RechargerTransferHistoryViewController.m +++ /dev/null @@ -1,544 +0,0 @@ -// -// RechargerTransferHistoryViewController.m -// YuMi -// -// Created by P on 2025/2/25. -// - -#import "RechargerTransferHistoryViewController.h" -#import "MoliMoneyLabel.h" -#import "UserInfoModel.h" -#import "RechargeUserModel.h" -#import "XPMineGiveDiamondPresenter.h" -#import "XPMineGiveDiamondProtocol.h" - -@interface RechargerTransferHistoryCell : UITableViewCell -@property(nonatomic, strong) NetImageView *avatarImageView; -@property(nonatomic, strong) UILabel *nameLabel; -@property(nonatomic, strong) UILabel *idLabel; -@property(nonatomic, strong) MoliMoneyLabel *moneyLabel; -@property(nonatomic, strong) UILabel *timeLabel; -@property(nonatomic, strong) DiamondGiveHistoryVo *cellModel; -@property(nonatomic, strong) UILabel *settlementLabel; -@property(nonatomic, assign) BOOL isArabia; - -@end - -@implementation RechargerTransferHistoryCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.backgroundColor = [UIColor whiteColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(16); - make.size.mas_equalTo(49); - }]; - - [self.contentView addSubview:self.nameLabel]; - - - [self.contentView addSubview:self.idLabel]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.contentView).offset(-12); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(11); - make.height.mas_equalTo(18); - }]; - - [self.contentView addSubview:self.moneyLabel]; - [self.moneyLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.nameLabel); - make.trailing.mas_equalTo(self.contentView).offset(-16); - make.height.mas_lessThanOrEqualTo(22); - make.width.mas_greaterThanOrEqualTo(30); - }]; - - [self.contentView addSubview:self.settlementLabel]; - [self.settlementLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.moneyLabel); - make.trailing.mas_equalTo(self.moneyLabel.mas_leading).offset(-4); - make.height.mas_equalTo(18); - }]; - - [self.contentView addSubview:self.timeLabel]; - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.moneyLabel.mas_bottom).offset(8); - make.trailing.mas_equalTo(self.moneyLabel); - make.height.mas_equalTo(18); - }]; - - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_top).offset(3); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(11); - make.trailing.mas_equalTo(self.settlementLabel.mas_leading); - make.height.mas_equalTo(18); - }]; - - // 设置 label 优先级，确保右边的 label 能够完整显示 -// [self.nameLabel setContentCompressionResistancePriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; -// [self.moneyLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; -// [self.settlementLabel setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; - } - return self; -} - -- (void)setIsArabia:(BOOL)isArabia { - _isArabia = isArabia; -} - -- (void)updateCellModel:(DiamondGiveHistoryVo *)cellModel isDisplayÜS:(BOOL)isDisplayÜS { - _cellModel = cellModel; - - self.avatarImageView.imageUrl = cellModel.targetAvatar; - self.nameLabel.text = cellModel.targetNick; - self.idLabel.text = [NSString stringWithFormat:@"ID: %@", @(cellModel.targetErbanNo)]; - [self.moneyLabel updateContent: [NSString stringWithFormat:@"%@", @(cellModel.diamondNum)]]; - self.timeLabel.text = cellModel.createTimeStr; - if (self.isArabia) { - if (isDisplayÜS) { -// [self.moneyLabel removeSpace]; - self.settlementLabel.text = [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_48"), @(cellModel.guildUsdNum)]; - [self.moneyLabel updateFont:kFontRegular(12) size:CGSizeMake(14, 14)]; - } else { - self.settlementLabel.text = @""; - [self.moneyLabel updateFont:kFontSemibold(16) size:CGSizeMake(22, 22)]; - } - } -} - -#pragma mark - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - _avatarImageView = [[NetImageView alloc] init]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - [_avatarImageView setCornerRadius:kGetScaleWidth(49/2)]; - } - return _avatarImageView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(15) textColor:UIColorFromRGB(0x313131)]; - } - return _nameLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [UILabel labelInitWithText:@"" font:kFontRegular(13) textColor:UIColorFromRGB(0x7b7b7d)]; - } - return _idLabel; -} - -- (MoliMoneyLabel *)moneyLabel { - if (!_moneyLabel) { - _moneyLabel = [MoliMoneyLabel moneyLabelWithTextColot:UIColorFromRGB(0xFF8C03) font:kFontSemibold(16) moneyPostion:2 moneySize:CGSizeMake(22, 22)]; - } - return _moneyLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [UILabel labelInitWithText:@"" font:kFontRegular(13) textColor:UIColorFromRGB(0x7b7b7d)]; - } - return _timeLabel; -} - -- (UILabel *)settlementLabel { - if (!_settlementLabel) { - _settlementLabel = [UILabel labelInitWithText:@"" font:kFontMedium(13) textColor:UIColorFromRGB(0x313131)]; - } - return _settlementLabel; -} - -@end - -@interface RechargerTransferHistoryViewController () - -@property(nonatomic, strong) UserInfoModel *userInfo; - -@property(nonatomic, strong) UIButton *thisCycleButton; -@property(nonatomic, strong) UIButton *lastCycleButton; -@property(nonatomic, strong) UIView *topSelectedTab; -@property(nonatomic, strong) UILabel *durationsLabel; -@property(nonatomic, strong) UIButton *ÜSSettlementButton; -@property(nonatomic, strong) UIButton *transferCoinsButton; -@property(nonatomic, strong) UILabel *totalAmountTitleLabel; -@property(nonatomic, strong) UILabel *amountLabel; -@property(nonatomic, strong) MoliMoneyLabel *moliAmountLabel; -@property(nonatomic, strong) UITableView *historyTableView; - -@property(nonatomic, assign) NSInteger periodType; // 1: this, 2: last -@property(nonatomic, assign) NSInteger transferType; // 1-金币转赠历史，2-代发薪资历史 - -//@property(nonatomic, strong) NSMutableArray */*dataSource*/; -@property(nonatomic, strong) DiamondHistoryModel *dataSourceModel; -@property(nonatomic, copy) NSArray *sectionTitles; -@property(nonatomic, copy) NSArray *sectionData; -@property(nonatomic, strong) NSMutableArray *originalDiamondGiveHistoryVoList; - -@property(nonatomic, assign) NSInteger page; - -@end - -@implementation RechargerTransferHistoryViewController - -- (XPMineGiveDiamondPresenter *)createPresenter { - return [[XPMineGiveDiamondPresenter alloc] init]; -} - -- (instancetype)initWithUserInfo:(UserInfoModel *)userInfo { - if (self = [super init]) { - self.userInfo = userInfo; - } - return self; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.page = 1; - self.periodType = 1; - self.transferType = 1; - - self.title = YMLocalizedString(@"1.0.37_text_41"); - self.view.backgroundColor = [UIColor whiteColor]; - - [self.view addSubview:self.thisCycleButton]; - [self.view addSubview:self.lastCycleButton]; - [self.thisCycleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(8); - make.leading.mas_equalTo(16); - make.height.mas_equalTo(24); - }]; - [self.lastCycleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(8); - make.leading.mas_equalTo(self.thisCycleButton.mas_trailing).offset(30); - make.height.mas_equalTo(24); - }]; - - [self.view addSubview:self.durationsLabel]; - [self.durationsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.thisCycleButton.mas_bottom).offset(21); - make.leading.mas_equalTo(self.thisCycleButton); - make.height.mas_equalTo(18); - }]; - - if ([self.userInfo isArabia]) { - self.transferType = 2; - [self.moliAmountLabel displayIcon:NO]; - self.ÜSSettlementButton.selected = YES; - self.transferCoinsButton.selected = NO; - UIStackView *stack = [[UIStackView alloc] initWithArrangedSubviews:@[ - self.ÜSSettlementButton, - self.transferCoinsButton - ]]; - stack.backgroundColor = UIColorFromRGB(0xf7f7f7); - [stack setCornerRadius:16]; - [self.view addSubview:stack]; - [stack mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.durationsLabel.mas_bottom).offset(13); - make.leading.trailing.mas_equalTo(self.view).inset(16); - make.height.mas_equalTo(32); - }]; - [self.ÜSSettlementButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(stack.mas_width).multipliedBy(0.5); - make.height.mas_equalTo(stack.mas_height); - }]; - [self.transferCoinsButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(stack.mas_width).multipliedBy(0.5); - make.height.mas_equalTo(stack.mas_height); - }]; - } - - [self.view addSubview:self.totalAmountTitleLabel]; - [self.totalAmountTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.durationsLabel.mas_bottom).offset([self.userInfo isArabia] ? 56 : 12); - make.leading.mas_equalTo(self.durationsLabel); - make.height.mas_equalTo(22); - }]; - - [self.view addSubview:self.moliAmountLabel]; - [self.moliAmountLabel updateContent:@""]; - [self.moliAmountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.totalAmountTitleLabel.mas_bottom).offset(9); - make.leading.mas_equalTo(self.totalAmountTitleLabel); - }]; - - [self.view addSubview:self.historyTableView]; - [self.historyTableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.moliAmountLabel.mas_bottom).offset(16); - make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight); - make.leading.trailing.mas_equalTo(self.view); - }]; - - [self reloadAPI]; -} - -- (void)reloadAPI { - [self.presenter userTransferHistory:self.periodType page:self.page type:self.transferType]; -} - -#pragma mark - -- (void)didTapThisCycle { - if (self.thisCycleButton.isSelected) { - return; - } - self.thisCycleButton.selected = YES; - self.lastCycleButton.selected = NO; - - self.page = 1; - self.periodType = 1; - [self reloadAPI]; -} - -- (void)didTapLastCycle { - if (self.lastCycleButton.isSelected) { - return; - } - self.thisCycleButton.selected = NO; - self.lastCycleButton.selected = YES; - - self.page = 1; - self.periodType = 2; - [self reloadAPI]; -} - -- (void)didTapÜSSettlement { - if (self.ÜSSettlementButton.isSelected) { - return; - } - self.ÜSSettlementButton.selected = YES; - self.transferCoinsButton.selected = NO; - [self.moliAmountLabel displayIcon:NO]; - self.page = 1; - self.transferType = 2; - [self reloadAPI]; -} - -- (void)didTapTransferCoins { - if (self.transferCoinsButton.isSelected) { - return; - } - self.ÜSSettlementButton.selected = NO; - self.transferCoinsButton.selected = YES; - [self.moliAmountLabel displayIcon:YES]; - self.page = 1; - self.transferType = 1; - [self reloadAPI]; -} - -- (void)footerRefresh { - self.page++; - [self reloadAPI]; -} - -#pragma mark - -- (void)loadTransferHistorySuccess:(DiamondHistoryModel *)infos { - self.dataSourceModel = infos; - self.durationsLabel.text = infos.cycleDateStr; - if ([self.userInfo isArabia] && self.transferType == 2) { - [self.moliAmountLabel updateContent:[NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_49"), @(infos.totalGiveGoldUsd)]]; - } else { - [self.moliAmountLabel updateContent:@(infos.totalGiveGold).stringValue]; - } - - if (self.page == 1) { - self.originalDiamondGiveHistoryVoList = @[].mutableCopy; - } else { - [self.historyTableView.mj_footer endRefreshing]; - } - - if (infos.diamondGiveHistoryVoList.count == 0) { - [self.historyTableView.mj_footer endRefreshingWithNoMoreData]; - if (self.page > 1) { - return; - } - } - - [self.originalDiamondGiveHistoryVoList addObjectsFromArray:infos.diamondGiveHistoryVoList]; - - // Step 1: 按日期进行分组 - NSMutableDictionary *groupedData = [NSMutableDictionary dictionary]; - - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - dateFormatter.dateFormat = @"yyyy-MM-dd"; - - for (DiamondGiveHistoryVo *history in self.originalDiamondGiveHistoryVoList) { - // 将 createTime 转换为 NSDate - NSDate *date = [NSDate dateWithTimeIntervalSince1970:history.createTime/1000]; - NSString *dateString = [dateFormatter stringFromDate:date]; - - // 根据日期字符串分组 - if (!groupedData[dateString]) { - groupedData[dateString] = [NSMutableArray array]; - } - [groupedData[dateString] addObject:history]; - } - - // Step 2: 将分组后的数据转换为一个数组，供 tableView 使用 - self.sectionTitles = [groupedData allKeys]; - self.sectionData = [groupedData allValues]; - - // 刷新 tableView 数据 - [self.historyTableView reloadData]; -} - -#pragma mark - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return self.sectionTitles.count; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return [self.sectionData[section] count]; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - return 38; -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 38)]; - container.backgroundColor = UIColorFromRGB(0xf4f4f4); - UILabel *label = [UILabel labelInitWithText:self.sectionTitles[section] - font:kFontMedium(14) - textColor:UIColorFromRGB(0x313131)]; - [container addSubview:label]; - [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(container); - make.leading.mas_equalTo(15); - make.height.mas_equalTo(20); - }]; - return container; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 72; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - RechargerTransferHistoryCell *cell = [tableView dequeueReusableCellWithIdentifier:@"RechargerTransferHistoryCell" forIndexPath:indexPath]; - cell.isArabia = [self.userInfo isArabia]; - DiamondGiveHistoryVo *history = self.sectionData[indexPath.section][indexPath.row]; - - [cell updateCellModel:history isDisplayÜS:self.transferType == 2]; - return cell; -} - -#pragma mark - -- (UIButton *)thisCycleButton { - if (!_thisCycleButton) { - _thisCycleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_thisCycleButton.titleLabel setFont:kFontMedium(16)]; - [_thisCycleButton setTitle:YMLocalizedString(@"1.0.37_text_42") forState:UIControlStateNormal]; - [_thisCycleButton setTitle:YMLocalizedString(@"1.0.37_text_42") forState:UIControlStateSelected]; - [_thisCycleButton setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateSelected]; - [_thisCycleButton setTitleColor:UIColorFromRGB(0xafb1b3) forState:UIControlStateNormal]; - [_thisCycleButton addTarget:self action:@selector(didTapThisCycle) forControlEvents:UIControlEventTouchUpInside]; - [_thisCycleButton setSelected:YES]; - } - return _thisCycleButton; -} - -- (UIButton *)lastCycleButton { - if (!_lastCycleButton) { - _lastCycleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_lastCycleButton.titleLabel setFont:kFontMedium(16)]; - [_lastCycleButton setTitle:YMLocalizedString(@"1.0.37_text_43") forState:UIControlStateNormal]; - [_lastCycleButton setTitle:YMLocalizedString(@"1.0.37_text_43") forState:UIControlStateSelected]; - [_lastCycleButton setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateSelected]; - [_lastCycleButton setTitleColor:UIColorFromRGB(0xafb1b3) forState:UIControlStateNormal]; - [_lastCycleButton addTarget:self action:@selector(didTapLastCycle) forControlEvents:UIControlEventTouchUpInside]; - } - return _lastCycleButton; -} - -- (UILabel *)durationsLabel { - if (!_durationsLabel) { - _durationsLabel = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:UIColorFromRGB(0x7b7b7d)]; - } - return _durationsLabel; -} - -- (UIButton *)ÜSSettlementButton { - if (!_ÜSSettlementButton) { - _ÜSSettlementButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_ÜSSettlementButton.titleLabel setFont:kFontMedium(13)]; - [_ÜSSettlementButton setTitle:YMLocalizedString(@"1.0.37_text_38") forState:UIControlStateNormal]; - [_ÜSSettlementButton setTitleColor:UIColorFromRGB(0xafb1b3) forState:UIControlStateNormal]; - [_ÜSSettlementButton setTitleColor:UIColorFromRGB(0xffffff) forState:UIControlStateSelected]; - [_ÜSSettlementButton setBackgroundImage:[UIImage imageWithColor:[UIColor clearColor]] forState:UIControlStateNormal]; - [_ÜSSettlementButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xff8c03)] forState:UIControlStateSelected]; - [_ÜSSettlementButton setCornerRadius:16]; - [_ÜSSettlementButton addTarget:self action:@selector(didTapÜSSettlement) forControlEvents:UIControlEventTouchUpInside]; - [_ÜSSettlementButton setSelected:YES]; - } - return _ÜSSettlementButton; -} - -- (UIButton *)transferCoinsButton { - if (!_transferCoinsButton) { - _transferCoinsButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_transferCoinsButton.titleLabel setFont:kFontMedium(13)]; - [_transferCoinsButton setTitle:YMLocalizedString(@"1.0.37_text_34") forState:UIControlStateNormal]; - [_transferCoinsButton setTitleColor:UIColorFromRGB(0xafb1b3) forState:UIControlStateNormal]; - [_transferCoinsButton setTitleColor:UIColorFromRGB(0xffffff) forState:UIControlStateSelected]; - [_transferCoinsButton setBackgroundImage:[UIImage imageWithColor:[UIColor clearColor]] forState:UIControlStateNormal]; - [_transferCoinsButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xff8c03)] forState:UIControlStateSelected]; - [_transferCoinsButton setCornerRadius:16]; - [_transferCoinsButton addTarget:self action:@selector(didTapTransferCoins) forControlEvents:UIControlEventTouchUpInside]; - } - return _transferCoinsButton; -} - -- (UILabel *)totalAmountTitleLabel { - if (!_totalAmountTitleLabel) { - _totalAmountTitleLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.37_text_44") - font:kFontMedium(14) - textColor:UIColorFromRGB(0x313131)]; - } - return _totalAmountTitleLabel; -} - -- (UILabel *)amountLabel { - if (!_amountLabel) { - _amountLabel = [UILabel labelInitWithText:@"" - font:kFontSemibold(26) - textColor:UIColorFromRGB(0xFF8C03)]; - } - return _amountLabel; -} - -- (MoliMoneyLabel *)moliAmountLabel { - if (!_moliAmountLabel) { - _moliAmountLabel = [MoliMoneyLabel moneyLabelWithTextColot:UIColorFromRGB(0xFF8C03) - font:kFontSemibold(26) - moneyPostion:2 - moneySize:CGSizeMake(30, 30)]; - } - return _moliAmountLabel; -} - -- (UITableView *)historyTableView { - if (!_historyTableView) { - _historyTableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _historyTableView.delegate = self; - _historyTableView.dataSource = self; - _historyTableView.separatorColor = UIColorFromRGB(0xe4e4e4); - _historyTableView.separatorInset = UIEdgeInsetsMake(0, 15, 0, 15); - _historyTableView.backgroundColor = [UIColor clearColor]; - _historyTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - _historyTableView.contentInset = UIEdgeInsetsZero; - [_historyTableView registerClass:[RechargerTransferHistoryCell class] forCellReuseIdentifier:@"RechargerTransferHistoryCell"]; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - _historyTableView.mj_footer = footer; - } - return _historyTableView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/SubRechargersViewController.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/SubRechargersViewController.h deleted file mode 100644 index f09f352..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/SubRechargersViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// SubRechargersViewController.h -// YuMi -// -// Created by P on 2025/2/25. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface SubRechargersViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/SubRechargersViewController.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/SubRechargersViewController.m deleted file mode 100644 index e804dfb..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/SubRechargersViewController.m +++ /dev/null @@ -1,323 +0,0 @@ -// -// SubRechargersViewController.m -// YuMi -// -// Created by P on 2025/2/25. -// - -#import "SubRechargersViewController.h" -#import "XPMineGiveDiamondPresenter.h" -#import "RechargeUserModel.h" -#import "MoliMoneyLabel.h" - -@interface SubRechargersCell : UITableViewCell - -@property(nonatomic, strong) SubRechargeUserModel *cellModel; - -@property(nonatomic, strong) NetImageView *avatarImageView; -@property(nonatomic, strong) UILabel *nameLabel; -@property(nonatomic, strong) UILabel *idLabel; -@property(nonatomic, strong) UIStackView *starsStack; -@property(nonatomic, strong) UIButton *star_1; -@property(nonatomic, strong) UIButton *star_2; -@property(nonatomic, strong) UIButton *star_3; -@property(nonatomic, strong) UIButton *star_4; -@property(nonatomic, strong) UIButton *star_5; -@property(nonatomic, strong) UILabel *lastTransferDateLabel; -@property(nonatomic, strong) MoliMoneyLabel *totalCostLabel; - -@end - -@implementation SubRechargersCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - - UIView *container = [[UIView alloc] init]; - container.backgroundColor = UIColorFromRGB(0xf4f4f4); - [container setCornerRadius:8]; - [self.contentView addSubview:container]; - [container mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(80); - }]; - - [container addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(13); - make.leading.mas_equalTo(9); - make.size.mas_equalTo(CGSizeMake(55, 55)); - }]; - - [container addSubview:self.nameLabel]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(11); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); - make.height.mas_equalTo(24); - }]; - - [container addSubview:self.idLabel]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nameLabel.mas_bottom); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); - make.height.mas_equalTo(18); - }]; - - [container addSubview:self.starsStack]; - [self.starsStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); - make.top.mas_equalTo(self.idLabel.mas_bottom).offset(2); - make.height.mas_equalTo(15); - }]; - - [self.star_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - [self.star_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - [self.star_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - [self.star_4 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - [self.star_5 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - - [container addSubview:self.lastTransferDateLabel]; - [self.lastTransferDateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nameLabel); - make.trailing.mas_equalTo(container).offset(-9); - make.height.mas_equalTo(18); - }]; - - [container addSubview:self.totalCostLabel]; - [self.totalCostLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avatarImageView); - make.trailing.mas_equalTo(container).offset(-9); - make.height.mas_equalTo(22); - }]; - } - return self; -} - -- (void)setCellModel:(SubRechargeUserModel *)cellModel { - _cellModel = cellModel; - self.avatarImageView.imageUrl = cellModel.avatar; - self.nameLabel.text = cellModel.nick; - self.idLabel.text = [NSString stringWithFormat:@"ID:%@", cellModel.erbanNo]; - [self.totalCostLabel updateContent:@(cellModel.totalGiveGold).stringValue]; - - [self.star_1 setSelected:NO]; - [self.star_2 setSelected:NO]; - [self.star_3 setSelected:NO]; - [self.star_4 setSelected:NO]; - [self.star_5 setSelected:NO]; - if (cellModel.starLevel > 0) { - [self.star_1 setSelected:YES]; - } - if (cellModel.starLevel > 1) { - [self.star_2 setSelected:YES]; - } - if (cellModel.starLevel > 2) { - [self.star_3 setSelected:YES]; - } - if (cellModel.starLevel > 3) { - [self.star_4 setSelected:YES]; - } - if (cellModel.starLevel > 4) { - [self.star_5 setSelected:YES]; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - _avatarImageView = [[NetImageView alloc] init]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - [_avatarImageView setCornerRadius:55/2]; - } - return _avatarImageView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(15) textColor:UIColorFromRGB(0x313131)]; - } - return _nameLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [UILabel labelInitWithText:@"" font:kFontRegular(13) textColor:UIColorFromRGB(0x7b7b7d)]; - } - return _idLabel; -} - -- (UILabel *)lastTransferDateLabel { - if (!_lastTransferDateLabel) { - _lastTransferDateLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.37_text_40") - font:kFontRegular(12) - textColor:UIColorFromRGB(0x7b7b7d)]; - } - return _lastTransferDateLabel; -} - -- (MoliMoneyLabel *)totalCostLabel { - if (!_totalCostLabel) { - _totalCostLabel = [MoliMoneyLabel moneyLabelWithTextColot:UIColorFromRGB(0xff8c03) - font:kFontSemibold(16) - moneyPostion:2 - moneySize:CGSizeMake(22, 22)]; - } - return _totalCostLabel; -} - -- (UIStackView *)starsStack { - if (!_starsStack) { - _starsStack = [[UIStackView alloc] initWithArrangedSubviews:@[ - self.star_1, - self.star_2, - self.star_3, - self.star_4, - self.star_5, - ]]; - _starsStack.spacing = 4; - } - return _starsStack; -} - -- (UIButton *)star_1 { - if (!_star_1) { - _star_1 = [UIButton buttonWithType:UIButtonTypeCustom]; - [_star_1 setBackgroundImage:kImage(@"star_white") forState:UIControlStateNormal]; - [_star_1 setBackgroundImage:kImage(@"star_yellow") forState:UIControlStateSelected]; - } - return _star_1; -} -- (UIButton *)star_2 { - if (!_star_2) { - _star_2 = [UIButton buttonWithType:UIButtonTypeCustom]; - [_star_2 setBackgroundImage:kImage(@"star_white") forState:UIControlStateNormal]; - [_star_2 setBackgroundImage:kImage(@"star_yellow") forState:UIControlStateSelected]; - } - return _star_2; -} -- (UIButton *)star_3 { - if (!_star_3) { - _star_3 = [UIButton buttonWithType:UIButtonTypeCustom]; - [_star_3 setBackgroundImage:kImage(@"star_white") forState:UIControlStateNormal]; - [_star_3 setBackgroundImage:kImage(@"star_yellow") forState:UIControlStateSelected]; - } - return _star_3; -} -- (UIButton *)star_4 { - if (!_star_4) { - _star_4 = [UIButton buttonWithType:UIButtonTypeCustom]; - [_star_4 setBackgroundImage:kImage(@"star_white") forState:UIControlStateNormal]; - [_star_4 setBackgroundImage:kImage(@"star_yellow") forState:UIControlStateSelected]; - } - return _star_4; -} -- (UIButton *)star_5 { - if (!_star_5) { - _star_5 = [UIButton buttonWithType:UIButtonTypeCustom]; - [_star_5 setBackgroundImage:kImage(@"star_white") forState:UIControlStateNormal]; - [_star_5 setBackgroundImage:kImage(@"star_yellow") forState:UIControlStateSelected]; - } - return _star_5; -} - -@end - -@interface SubRechargersViewController () - -@property(nonatomic, copy) NSArray *dataSource; -@property(nonatomic, strong) UITableView *tableView; -@property(nonatomic, strong) UIImageView *emptyImageView; - -@end - -@implementation SubRechargersViewController - -- (XPMineGiveDiamondPresenter *)createPresenter { - return [[XPMineGiveDiamondPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.title = YMLocalizedString(@"1.0.37_text_39"); - self.view.backgroundColor = [UIColor whiteColor]; - - [self setupUI]; - [self.presenter subrechargeInfoList]; -} - -- (void)setupUI { - [self.view addSubview:self.tableView]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view).insets(UIEdgeInsetsMake(18, 15, 18, 15)); - }]; - - [self.view addSubview:self.emptyImageView]; - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.view).offset(150); - make.centerX.mas_equalTo(self.view); - make.size.mas_equalTo(CGSizeMake(200, 200)); - }]; -} - -#pragma mark - XPMineGiveDiamondProtocol -- (void)loadSubRechargerInfoSuccess:(NSArray *)infos { - self.dataSource = infos; - [self.tableView reloadData]; - if (infos.count == 0) { - self.emptyImageView.hidden = NO; - } -} - -#pragma mark - UITableView DataSource & Delegate -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.dataSource.count; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 94; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - SubRechargersCell *cell = [tableView dequeueReusableCellWithIdentifier:@"SubRechargersCell" forIndexPath:indexPath]; - cell.cellModel = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - -#pragma mark - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - [_tableView registerClass:[SubRechargersCell class] forCellReuseIdentifier:@"SubRechargersCell"]; - } - return _tableView; -} - -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.hidden = YES; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder_UFO]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.h deleted file mode 100644 index a96c531..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.h +++ /dev/null @@ -1,52 +0,0 @@ -// -// XPIncomeRecordGoldDetailsHeadView.h -// YuMi -// -// Created by YuMi on 2022/11/24. -// - -#import -#import "XPIncomeRecordGoldDetailsModel.h" - -typedef enum : NSUInteger { - IncomeRecordGold_Diamond,//钻石 - IncomeRecordGold_Gold,//金币 -} IncomeRecordGoldSortingType; - -@protocol XPIncomeRecordGoldDetailsHeadViewDelegate - --(void)chooseGoldCoinOrder:(IncomeRecordGoldSortingType)type isAscending:(BOOL)isAscending; - -@end -NS_ASSUME_NONNULL_BEGIN - -@interface XPIncomeRecordGoldDetailsHeadView : UIView -@property (nonatomic,strong) XPIncomeRecordGoldDetailsModel *detailModel; -@property (nonatomic,weak) id delegate; - --(void)resetArrow; - - - -@end - - - - -/****************************************************华丽分割线*****************************************************************************************/ -@interface XPIncomeRecordGoldDetailsHeadItemView : UIView -@property (nonatomic,copy) NSString *title; -@property (nonatomic,strong,readonly) UIButton *clickBtn; -@property (nonatomic,strong,readonly) UIButton *upBtn; -@property (nonatomic,strong,readonly) UIButton *downBtn; -@end - - - -/****************************************************华丽分割线*****************************************************************************************/ -@interface XPIncomeRecordGoldDetailsNumView : UIView -@property (nonatomic,copy) NSString *title; -@property (nonatomic,copy) NSString *number; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.m deleted file mode 100644 index 63bf263..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.m +++ /dev/null @@ -1,527 +0,0 @@ -// -// XPIncomeRecordGoldDetailsHeadView.m -// YuMi -// -// Created by YuMi on 2022/11/24. -// - -#import "XPIncomeRecordGoldDetailsHeadView.h" -#import "NSString+Utils.h" -@interface XPIncomeRecordGoldDetailsHeadView() -//背景 -@property (nonatomic,strong) UIImageView *bgImageView; -///总金币标题 -@property (nonatomic,strong) UILabel *titleView; -///基礎總結算金币 -@property (nonatomic,strong) XPIncomeRecordGoldDetailsNumView *baseNumView; -///公會收益 -@property (nonatomic,strong) XPIncomeRecordGoldDetailsNumView *guildNumView; -///成員總金币 -@property (nonatomic,strong) XPIncomeRecordGoldDetailsNumView *numberGoldView; -///成員總兌換 -@property (nonatomic,strong) XPIncomeRecordGoldDetailsNumView * numberExchangeView; -/// =号 -@property (nonatomic,strong) UILabel *equalSignView; -/// +加 -@property (nonatomic,strong) UILabel *addView; -/// -加 -@property (nonatomic,strong) UILabel *minusSignView; -///底部item -@property (nonatomic,strong) UIView *bgItemView; -///房间 -@property (nonatomic,strong) UILabel *roomView; -///成员 -@property (nonatomic,strong) UILabel *memberView; -///钻石流水 -@property (nonatomic,strong) XPIncomeRecordGoldDetailsHeadItemView *diamondView; -///金币收益 -@property (nonatomic,strong) UILabel *exchangeGoldView; -///可结算金币 -@property (nonatomic,strong) XPIncomeRecordGoldDetailsHeadItemView *settlementView; - -@end -@implementation XPIncomeRecordGoldDetailsHeadView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.titleView]; - [self.bgImageView addSubview:self.baseNumView]; - [self.bgImageView addSubview:self.guildNumView]; - [self.bgImageView addSubview:self.numberGoldView]; - [self.bgImageView addSubview:self.numberExchangeView]; - [self.bgImageView addSubview:self.equalSignView]; - [self.bgImageView addSubview:self.addView]; - [self.bgImageView addSubview:self.minusSignView]; - - - [self addSubview:self.bgItemView]; - [self.bgItemView addSubview:self.roomView]; - [self.bgItemView addSubview:self.memberView]; - [self.bgItemView addSubview:self.diamondView]; - [self.bgItemView addSubview:self.exchangeGoldView]; - [self.bgItemView addSubview:self.settlementView]; - -} -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self).inset(kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(90)); - make.top.mas_equalTo(kGetScaleWidth(0)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(14)); - make.top.mas_equalTo(kGetScaleWidth(12)); - make.height.mas_equalTo(kGetScaleWidth(21)); - }]; - - [self.baseNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(14)); - make.height.mas_equalTo(kGetScaleWidth(32)); - make.top.mas_equalTo(kGetScaleWidth(41)); - make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(70)); - }]; - - [self.equalSignView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.baseNumView.mas_trailing).mas_offset(kGetScaleWidth(4)); - make.top.equalTo(self.baseNumView); - make.height.width.mas_equalTo(kGetScaleWidth(14)); - }]; - - [self.guildNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.equalSignView.mas_trailing).mas_offset(kGetScaleWidth(4)); - make.height.top.equalTo(self.baseNumView); - make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(40)); - - }]; - [self.addView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.top.equalTo(self.equalSignView); - make.leading.equalTo(self.guildNumView.mas_trailing).mas_offset(kGetScaleWidth(10)); - }]; - [self.numberGoldView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.top.equalTo(self.baseNumView); - make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(50)); - make.leading.equalTo(self.addView.mas_trailing).mas_offset(kGetScaleWidth(10)); - - }]; - - [self.minusSignView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.top.equalTo(self.equalSignView); - make.leading.equalTo(self.numberGoldView.mas_trailing).mas_offset(kGetScaleWidth(10)); - }]; - - [self.numberExchangeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.top.equalTo(self.baseNumView); - make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(50)); - make.leading.equalTo(self.minusSignView.mas_trailing).mas_offset(kGetScaleWidth(10)); - make.trailing.mas_equalTo(-kGetScaleWidth(14)); - }]; - - - [self.bgItemView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(47)); - make.leading.trailing.equalTo(self).inset(kGetScaleWidth(0)); - }]; - [self.roomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(64)); - make.leading.mas_equalTo(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.centerY.equalTo(self.bgItemView); - }]; - [self.memberView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.roomView.mas_trailing); - make.centerY.width.height.equalTo(self.roomView); - }]; - CGFloat width = kGetScaleWidth(247/3); - [self.settlementView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(width); - make.trailing.equalTo(self.bgItemView); - make.centerY.height.equalTo(self.roomView); - }]; - [self.exchangeGoldView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(self.settlementView); - make.trailing.equalTo(self.settlementView.mas_leading); - }]; - [self.diamondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(self.exchangeGoldView); - make.trailing.equalTo(self.exchangeGoldView.mas_leading); - }]; - - - -} --(void)setDetailModel:(XPIncomeRecordGoldDetailsModel *)detailModel{ - _detailModel = detailModel; - _baseNumView.number = [NSString getDealNumWithString:_detailModel.totalRemainGolds]; - _guildNumView.number = [NSString getDealNumWithString:_detailModel.totalEarnGolds]; - _numberGoldView.number = [NSString getDealNumWithString:_detailModel.totalGiftGolds]; - _numberExchangeView.number = [NSString getDealNumWithString:_detailModel.totalExchangeGolds]; -} --(void)resetArrow{ - self.diamondView.upBtn.selected = YES; - self.diamondView.downBtn.selected = NO; - self.settlementView.upBtn.selected = YES; - self.settlementView.downBtn.selected = NO; -} --(void)clickDiamondAction{ - if(self.diamondView.upBtn.selected == YES){ - self.diamondView.upBtn.selected = NO; - self.diamondView.downBtn.selected = YES; - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseGoldCoinOrder:isAscending:)]){ - [self.delegate chooseGoldCoinOrder:IncomeRecordGold_Diamond isAscending:NO]; - } - return; - } - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseGoldCoinOrder:isAscending:)]){ - [self.delegate chooseGoldCoinOrder:IncomeRecordGold_Diamond isAscending:YES]; - } - - self.diamondView.upBtn.selected = YES; - self.diamondView.downBtn.selected = NO; -} - --(void)clickGoldAction{ - if(self.settlementView.upBtn.selected == YES){ - self.settlementView.upBtn.selected = NO; - self.settlementView.downBtn.selected = YES; - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseGoldCoinOrder:isAscending:)]){ - [self.delegate chooseGoldCoinOrder:IncomeRecordGold_Gold isAscending:NO]; - } - return; - } - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseGoldCoinOrder:isAscending:)]){ - [self.delegate chooseGoldCoinOrder:IncomeRecordGold_Gold isAscending:YES]; - } - - self.settlementView.upBtn.selected = YES; - self.settlementView.downBtn.selected = NO; -} -#pragma mark -懒加载 -- (UIImageView *)bgImageView{ - if (!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = [UIImage imageNamed:@"gold_details_head_bg"]; - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} - -- (UILabel *)titleView { - if (!_titleView) { - _titleView = [[UILabel alloc] init]; - _titleView.font = [UIFont systemFontOfSize:15 weight:UIFontWeightSemibold]; - _titleView.textColor = UIColorFromRGB(0x572714); - _titleView.text = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView0"); - _titleView.textAlignment = NSTextAlignmentCenter; - } - return _titleView; -} - - --(UIView *)bgItemView{ - if (!_bgItemView){ - _bgItemView = [UIView new]; - _bgItemView.backgroundColor = UIColorFromRGB(0xF0F5F6); - } - return _bgItemView; -} - -- (UILabel *)roomView { - if (!_roomView) { - _roomView = [[UILabel alloc] init]; - _roomView.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _roomView.textColor = [DJDKMIMOMColor inputTextColor]; - _roomView.text = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView2"); - _roomView.textAlignment = NSTextAlignmentCenter; - } - return _roomView; -} - -- (UILabel *)memberView { - if (!_memberView) { - _memberView = [[UILabel alloc] init]; - _memberView.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _memberView.textColor = [DJDKMIMOMColor inputTextColor]; - _memberView.textAlignment = NSTextAlignmentCenter; - _memberView.text = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView1"); - } - return _memberView; -} - --(XPIncomeRecordGoldDetailsHeadItemView *)diamondView{ - if (!_diamondView){ - _diamondView = [[XPIncomeRecordGoldDetailsHeadItemView alloc]initWithFrame:CGRectZero]; - _diamondView.title = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView5"); - [_diamondView.clickBtn addTarget:self action:@selector(clickDiamondAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _diamondView; -} - -- (UILabel *)exchangeGoldView { - if (!_exchangeGoldView) { - _exchangeGoldView = [[UILabel alloc] init]; - _exchangeGoldView.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _exchangeGoldView.textColor = [DJDKMIMOMColor inputTextColor]; - _exchangeGoldView.textAlignment = NSTextAlignmentCenter; - _exchangeGoldView.text = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView3"); - } - return _exchangeGoldView; -} - --(XPIncomeRecordGoldDetailsHeadItemView *)settlementView{ - if (!_settlementView){ - _settlementView = [[XPIncomeRecordGoldDetailsHeadItemView alloc]initWithFrame:CGRectZero]; - _settlementView.title = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView4"); - [_settlementView.clickBtn addTarget:self action:@selector(clickGoldAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _settlementView; -} - -- (XPIncomeRecordGoldDetailsNumView *)baseNumView{ - if (!_baseNumView){ - _baseNumView = [[XPIncomeRecordGoldDetailsNumView alloc]initWithFrame:CGRectZero]; - _baseNumView.title = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView6"); - _baseNumView.number = @"0"; - } - return _baseNumView; -} - -- (XPIncomeRecordGoldDetailsNumView *)guildNumView{ - if (!_guildNumView){ - _guildNumView = [[XPIncomeRecordGoldDetailsNumView alloc]initWithFrame:CGRectZero]; - _guildNumView.title = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView7"); - _guildNumView.number = @"0"; - } - return _guildNumView; -} --(XPIncomeRecordGoldDetailsNumView *)numberGoldView{ - if (!_numberGoldView){ - _numberGoldView = [[XPIncomeRecordGoldDetailsNumView alloc]initWithFrame:CGRectZero]; - _numberGoldView.title = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView8"); - _numberGoldView.number = @"0"; - } - return _numberGoldView; -} -- (XPIncomeRecordGoldDetailsNumView *)numberExchangeView{ - if (!_numberExchangeView){ - _numberExchangeView = [[XPIncomeRecordGoldDetailsNumView alloc]initWithFrame:CGRectZero]; - _numberExchangeView.title = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView9"); - _numberExchangeView.number = @"0"; - } - return _numberExchangeView; -} - - -- (UILabel *)equalSignView { - if (!_equalSignView) { - _equalSignView = [[UILabel alloc] init]; - _equalSignView.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _equalSignView.textColor = UIColorFromRGB(0x582815); - _equalSignView.text = @"="; - _equalSignView.textAlignment = NSTextAlignmentCenter; - } - return _equalSignView; -} - - -- (UILabel *)addView { - if (!_addView) { - _addView = [[UILabel alloc] init]; - _addView.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _addView.textColor = UIColorFromRGB(0x582815); - _addView.text = @"+"; - _addView.textAlignment = NSTextAlignmentCenter; - } - return _addView; -} - - -- (UILabel *)minusSignView { - if (!_minusSignView) { - _minusSignView = [[UILabel alloc] init]; - _minusSignView.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _minusSignView.textColor = UIColorFromRGB(0x582815); - _minusSignView.text = @"-"; - _minusSignView.textAlignment = NSTextAlignmentCenter; - } - return _minusSignView; -} - -@end - -/****************************************************华丽分割线*****************************************************************************************/ - - -@interface XPIncomeRecordGoldDetailsHeadItemView() -@property (nonatomic,strong) UILabel *titleView; -@property (nonatomic,strong) UIButton *upBtn; -@property (nonatomic,strong) UIButton *downBtn; -@property (nonatomic,strong) UIButton *clickBtn; -@end - -@implementation XPIncomeRecordGoldDetailsHeadItemView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.titleView]; - [self addSubview:self.upBtn]; - [self addSubview:self.downBtn]; - [self addSubview:self.clickBtn]; -} -- (void)initSubViewConstraints { - - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.centerY.equalTo(self); - - }]; - - [self.downBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.titleView.mas_trailing).mas_offset(kGetScaleWidth(3)); - make.centerY.equalTo(self.mas_centerY).mas_offset(-kGetScaleWidth(4)); - make.width.mas_equalTo(kGetScaleWidth(8)); - make.height.mas_equalTo(kGetScaleWidth(4)); - }]; - [self.upBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.width.height.equalTo(self.downBtn); - make.top.equalTo(self.downBtn.mas_bottom).mas_offset(kGetScaleWidth(2)); - }]; - [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; -} - - --(void)setTitle:(NSString *)title{ - _title = title; - _titleView.text = _title; -} -#pragma mark -懒加载 - -- (UILabel *)titleView { - if (!_titleView) { - _titleView = [[UILabel alloc] init]; - _titleView.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _titleView.textColor = [DJDKMIMOMColor inputTextColor]; - _titleView.text = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView5"); - _titleView.numberOfLines = 2; - _titleView.textAlignment = NSTextAlignmentCenter; - } - return _titleView; -} - -- (UIButton *)upBtn{ - if (!_upBtn){ - _upBtn = [UIButton new]; - [_upBtn setBackgroundImage:[UIImage imageNamed:@"exchange_down_grey"] forState:UIControlStateNormal]; - [_upBtn setBackgroundImage:[UIImage imageNamed:@"exchange_down"] forState:UIControlStateSelected]; - - _upBtn.selected = YES; - } - return _upBtn; -} -- (UIButton *)downBtn{ - if (!_downBtn){ - _downBtn = [UIButton new]; - [_downBtn setBackgroundImage:[UIImage imageNamed:@"exchange_up_grey"] forState:UIControlStateNormal]; - [_downBtn setBackgroundImage:[UIImage imageNamed:@"exchange_up"] forState:UIControlStateSelected]; - - - _downBtn.selected = NO; - } - return _downBtn; -} -- (UIButton *)clickBtn{ - if (!_clickBtn){ - _clickBtn = [UIButton new]; - } - return _clickBtn; -} -@end - - - - -/****************************************************华丽分割线***********************************************************************************************************************************************************************************/ - -@interface XPIncomeRecordGoldDetailsNumView() - -@property (nonatomic,strong) UILabel *titleView; -@property (nonatomic,strong) UILabel *numberView; - -@end - -@implementation XPIncomeRecordGoldDetailsNumView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -- (void)setTitle:(NSString *)title{ - _title = title; - _titleView.text = _title; -} -- (void)setNumber:(NSString *)number{ - _number = number; - _numberView.text = _number; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.titleView]; - [self addSubview:self.numberView]; -} -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(14)); - - }]; - [self.numberView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(14)); - - }]; -} -#pragma mark -懒加载 -- (UILabel *)titleView { - if (!_titleView) { - _titleView = [[UILabel alloc] init]; - _titleView.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _titleView.textColor = UIColorFromRGB(0x572714); - } - return _titleView; -} - -- (UILabel *)numberView { - if (!_numberView) { - _numberView = [[UILabel alloc] init]; - _numberView.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _numberView.textColor =UIColorFromRGB(0x572714); - } - return _numberView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineChooseGiveDiamondVC.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineChooseGiveDiamondVC.h deleted file mode 100644 index cbaf5f7..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineChooseGiveDiamondVC.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// XPMineChooseGiveDiamondVC.h -// YuMi -// -// Created by YuMi on 2022/10/19. -// - -#import -#import "MvpViewController.h" -#import "XPMineGiveDiamondModel.h" -@class UserInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@protocol XPMineChooseGiveDiamondVCDelegate - -///支付成功 -- (void)xpMineChooseGiveDiamondVCCompleteWithModel:(XPMineGiveDiamondModel *)model; - - - -@end - - -@interface XPMineChooseGiveDiamondVC : MvpViewController -@property (nonatomic,strong) XPMineGiveDiamondModel *giveDiamondModel; -@property (nonatomic,strong) UserInfoModel *userInfo; -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineChooseGiveDiamondVC.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineChooseGiveDiamondVC.m deleted file mode 100644 index 264fec2..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineChooseGiveDiamondVC.m +++ /dev/null @@ -1,267 +0,0 @@ -// -// XPMineChooseGiveDiamondVC.m -// YuMi -// -// Created by YuMi on 2022/10/19. -// - -#import "XPMineChooseGiveDiamondVC.h" -#import "XPMineChooseGiveDiamondView.h" -#import "XPMineGiveDiamondProtocol.h" -#import "XPMineGiveDiamondPresenter.h" -#import "WalletInfoModel.h" -#import "UserInfoModel.h" -#import "XPMineGiveDiamondPwdView.h" -#import "XPMinePayPwdViewController.h" -#import "XPMineConfirmGiveDiamondView.h" -#import "NSDate+DateUtils.h" -#import "XPMineGiveDiamondPasswordView.h" -#import "GiftInfoModel.h" -#import "ClientConfig.h" -#import "TTPopup.h" -UIKIT_EXTERN NSString * const kGiveDiamondDailyNum; - -@interface XPMineChooseGiveDiamondVC () -@property (nonatomic,strong) XPMineChooseGiveDiamondView *giveDiamondView; -@property (nonatomic,copy) NSString *diamonds; -@property (nonatomic,assign) NSInteger inputDiamonds; -@property (nonatomic,copy) NSString *password; -@property (nonatomic,strong) NSMutableArray *giftList; -///是否有转赠钻石权限 -@property (nonatomic,assign) BOOL isHaveGiveDiamond; -///是否有转赠礼物权限 -@property (nonatomic,assign) BOOL isHaveGiveGift; -@end - -@implementation XPMineChooseGiveDiamondVC -- (XPMineGiveDiamondPresenter *)createPresenter { - return [[XPMineGiveDiamondPresenter alloc] init]; -} -- (void)viewDidLoad { - [super viewDidLoad]; - [self checkHaveGivePermission]; - [self initSubViews]; - [self initSubViewConstraints]; - self.giveDiamondView.giveDiamondModel = self.giveDiamondModel; - self.giveDiamondView.userInfo = self.userInfo; - [self.presenter getUserWalletInfo]; - [self.presenter getPackGiftList]; - - - -} --(void)dealloc{ -// NSLog(@"内存释放了"); -} -#pragma mark -XPMineConfirmGiveDiamondViewDelegate - -///获取背包礼物列表 -- (void)getPacketGiftListSuccess:(NSArray *)giftList{ - [self.giftList addObjectsFromArray:giftList]; - NSInteger count = self.giftList.count % 8 == 0 ? self.giftList.count / 8 : self.giftList.count / 8 + 1; - NSInteger getCount = count * 8 - self.giftList.count; - if(getCount > 0){ - for (int i = 0; i < getCount; i++) { - GiftInfoModel *model = [GiftInfoModel new]; - model.isEmpty = YES; - [self.giftList addObject:model]; - } - } - - [self.giveDiamondView setListData:self.giftList count:count]; -} -///获取背包礼物列表失败 -- (void)getPacketGiftListFail:(NSString *)message{ - -} - - -- (void)xpMineConfirmGiveDiamondViewComplete{ - - - if (self.userInfo.isBindPaymentPwd) { - XPMineGiveDiamondPwdView*pwdView = [[XPMineGiveDiamondPwdView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - pwdView.delegate = self; - [[UIApplication sharedApplication].keyWindow addSubview:pwdView]; - } else { - - XPMineGiveDiamondPasswordView *passwordView = [[XPMineGiveDiamondPasswordView alloc]initWithFrame:CGRectZero]; - @kWeakify(self); - passwordView.completeBlock = ^(){ - @kStrongify(self); - XPMinePayPwdViewController *vc = [[XPMinePayPwdViewController alloc] init]; - vc.userInfo = self.userInfo; - vc.delegate = self; - [self.navigationController pushViewController:vc animated:YES]; - }; - [TTPopup popupView:passwordView style:TTPopupStyleAlert]; - } - - -} -#pragma mark - XPMineGiveDiamondPwdViewDelegate -- (void)xpMineGiveDiamondPwdViewPwdComplete:(NSString *)pwd{ - self.password = pwd; - [self showLoading]; - [self.presenter confirmActionWithPayWithToUid:self.giveDiamondModel.targetUid diamondNum:@(self.inputDiamonds).stringValue payPwd:self.password]; - -} -#pragma mark - XPMineGiveDiamondProtocol -- (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo{ - [self.giveDiamondView setDiamond:balanceInfo.diamonds]; - self.diamonds = balanceInfo.diamonds; -} - -#pragma mark - XPMinePayPwdViewControllerDelegate - - --(void)giveGiftSuccess{ - [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMineChooseGiveDiamondVC6")]; - if(self.delegate && [self.delegate respondsToSelector:@selector(xpMineChooseGiveDiamondVCCompleteWithModel:)]){ - [self.delegate xpMineChooseGiveDiamondVCCompleteWithModel:self.giveDiamondModel]; - } - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)payPasswordSuccess{ - self.userInfo.isBindPaymentPwd = YES; -} - --(void)confirmActionWithPay{ - [self hideHUD]; - - NSMutableDictionary *dailyNumDic ; - NSDictionary *getDic = [[NSUserDefaults standardUserDefaults]valueForKey:kGiveDiamondDailyNum]; - if(getDic == nil){ - dailyNumDic = [NSMutableDictionary dictionary]; - }else{ - dailyNumDic = [NSMutableDictionary dictionaryWithDictionary:getDic]; - } - NSString *key = [NSString stringWithFormat:@"%ld-%@",self.userInfo.uid,[NSDate getNowTimeTimestamp]]; - NSInteger dailyNum = 0; - if(dailyNumDic[key] != nil){ - NSInteger getNum = [dailyNumDic[key] integerValue]; - dailyNum = getNum; - } - NSInteger totalCost = dailyNum + self.inputDiamonds; - dailyNumDic[key] = @(totalCost); - [[NSUserDefaults standardUserDefaults]setValue:dailyNumDic forKey:kGiveDiamondDailyNum]; - [[NSUserDefaults standardUserDefaults] synchronize]; - [self showSuccessToast:YMLocalizedString(@"XPMineChooseGiveDiamondVC6")]; - if(self.delegate && [self.delegate respondsToSelector:@selector(xpMineChooseGiveDiamondVCCompleteWithModel:)]){ - [self.delegate xpMineChooseGiveDiamondVCCompleteWithModel:self.giveDiamondModel]; - } - [self.navigationController popViewControllerAnimated:YES]; - - -} --(void)confirmActionWithText:(NSString *)text{ - [self chooseDiamondsWithText:text]; -} --(void)confirmActionWithText:(NSString *)text chooseGiftModel:(GiftInfoModel *)chooseGiftModel{ - [self showLoading]; - [self.presenter giveGiftWithToUid:self.giveDiamondModel.targetUid giftId:@(chooseGiftModel.giftId).stringValue giftNum:text]; -} - --(void)chooseDiamondsWithText:(NSString *)text{ - self.inputDiamonds = [text integerValue]; - NSInteger totalNum = self.inputDiamonds; - ClientConfig *config = [ClientConfig shareConfig]; - double poundage = config.configInfo.giveDiamondRate * totalNum; - NSInteger totalCost = totalNum + poundage; - if(totalCost > [self.diamonds integerValue]){ - [self showErrorToast:YMLocalizedString(@"XPMineChooseGiveDiamondVC5")]; - return; - } - if(self.inputDiamonds > config.configInfo.giveDiamondOnceLimitNum){ - [self showErrorToast:[NSString stringWithFormat:YMLocalizedString(@"XPMineChooseGiveDiamondVC4"),@(config.configInfo.giveDiamondOnceLimitNum)]]; - return; - } - NSMutableDictionary *dailyNumDic = [[NSUserDefaults standardUserDefaults]valueForKey:kGiveDiamondDailyNum]; - if(dailyNumDic != nil){ - NSString *key = [NSString stringWithFormat:@"%ld-%@",self.userInfo.uid,[NSDate getNowTimeTimestamp]]; - NSInteger dailyNum = 0; - if(dailyNumDic[key] != nil){ - dailyNum = [dailyNumDic[key] integerValue]; - } - NSInteger getTotalNum = dailyNum + totalNum; - if(getTotalNum > config.configInfo.giveDiamondDailyNum){ - [self showErrorToast:YMLocalizedString(@"XPMineChooseGiveDiamondVC3")]; - return; - } - } - - XPMineConfirmGiveDiamondView *confirmView = [[XPMineConfirmGiveDiamondView alloc] initWithFrame:CGRectZero]; - confirmView.poundage = poundage; - confirmView.inputDiamonds = self.inputDiamonds; - confirmView.delegate = self; - confirmView.giveDiamondModel = self.giveDiamondModel; - [TTPopup popupView:confirmView style:TTPopupStyleAlert]; -} -#pragma mark- 检查是否有转赠权限 --(void)checkHaveGivePermission{ - - ClientConfig *config = [ClientConfig shareConfig]; - NSArray *uidList = config.configInfo.giveDiamondErbanNoList; - for (id uid in uidList) { - NSString *getUid = [uid stringValue]; - if([getUid isEqualToString:@(self.userInfo.erbanNo).stringValue]){ - self.isHaveGiveDiamond = YES; - break; - } - } - for (id uid in config.configInfo.giveGiftErbanNoList) { - NSString *getUid = [uid stringValue]; - if([getUid isEqualToString:@(self.userInfo.erbanNo).stringValue]){ - self.isHaveGiveGift = YES; - break; - } - } - if(self.userInfo.userLevelVo.experLevelSeq >= config.configInfo.giveDiamondExperLevel){ - self.isHaveGiveDiamond = YES; - } - if(self.userInfo.userLevelVo.experLevelSeq >= config.configInfo.giveGiftExperLevel){ - - self.isHaveGiveGift = YES; - } -} -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPMineChooseGiveDiamondVC0"); - [self.view addSubview:self.giveDiamondView]; -} -- (void)initSubViewConstraints { - - [self.giveDiamondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.view); - make.top.mas_equalTo(0); - }]; -} - -#pragma mark -懒加载 -- (XPMineChooseGiveDiamondView *)giveDiamondView{ - if (!_giveDiamondView){ - _giveDiamondView = [[XPMineChooseGiveDiamondView alloc]initWithFrame:CGRectZero isHaveGiveDiamond:self.isHaveGiveDiamond isHaveGiveGift:self.isHaveGiveGift]; - _giveDiamondView.delegate = self; - } - return _giveDiamondView; -} --(NSMutableArray *)giftList{ - if (!_giftList){ - _giftList = [NSMutableArray array]; - } - return _giftList; -} -/* - #pragma mark - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - // Get the new view controller using [segue destinationViewController]. - // Pass the selected object to the new view controller. - } - */ - -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.h deleted file mode 100644 index 263e8a1..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPMineGiveDiamondDetailsVC.h -// YuMi -// -// Created by YuMi on 2022/10/31. -// - -#import "MvpViewController.h" -#import "UserInfoModel.h" - - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGiveDiamondDetailsVC : MvpViewController - -@property (nonatomic,strong) UserInfoModel *userInfo; -@property (nonatomic,copy) NSString *toUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.m deleted file mode 100644 index cd051a6..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.m +++ /dev/null @@ -1,329 +0,0 @@ -// -// XPMineGiveDiamondDetailsVC.m -// YuMi -// -// Created by YuMi on 2022/10/31. -// - -#import "XPMineGiveDiamondDetailsVC.h" -///Third -#import -#import -#import -#import -///view -#import "XPMineGiveDiamondDetailsView.h" - -#import "XPMineGiveDiamondPresenter.h" - -#import "XPMineGiveDiamondProtocol.h" -#import "DJDKMIMOMColor.h" -#import "ClientConfig.h" -#import "UIImage+Utils.h" - -@interface XPMineGiveDiamondDetailsVC () -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *pi_containerView; -///钻石 -@property (nonatomic,strong) XPMineGiveDiamondDetailsView *diamondView; -///礼物 -@property (nonatomic,strong) XPMineGiveDiamondDetailsView *giftView; - -///type,0,钻石，1，礼物 -@property (nonatomic,assign) int type; -///钻石页数 -@property (nonatomic,assign) int diamondPage; -///礼物页数 -@property (nonatomic,assign) int giftPage; -///钻石是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreDiamondData; -///礼物是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreGiftData; - -///是否有转赠钻石权限 -@property (nonatomic,assign) BOOL isHaveGiveDiamond; -///是否有转赠礼物权限 -@property (nonatomic,assign) BOOL isHaveGiveGift; -@end - -@implementation XPMineGiveDiamondDetailsVC -- (XPMineGiveDiamondPresenter *)createPresenter { - return [[XPMineGiveDiamondPresenter alloc] init]; -} -- (void)viewDidLoad { - [super viewDidLoad]; - [self checkHaveGivePermission]; - [self initSubViews]; - [self initHeaderAndFooterRrfresh]; - [self initSubViewConstraints]; - self.diamondPage = 1; - self.giftPage = 1; - - - if(self.isHaveGiveGift == YES && self.isHaveGiveDiamond == NO){ - [self.presenter getExamplesOfRecordWithUid:self.toUid type:1 page:self.giftPage]; - }else{ - [self.presenter getExamplesOfRecordWithUid:self.toUid type:0 page:self.diamondPage]; - } - - -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPMineGiveDiamondDetailsVC0"); - if(self.isHaveGiveDiamond == YES && self.isHaveGiveGift == NO){ - self.type = 0; - [self.view addSubview:self.diamondView]; - }else if (self.isHaveGiveDiamond == NO && self.isHaveGiveGift == YES){ - self.type = 1; - [self.view addSubview:self.giftView]; - }else{ - self.type = 0; - [self.view addSubview:self.titleView]; - [self.view addSubview:self.pi_containerView]; - } - - -} -- (void)initSubViewConstraints { - if(self.isHaveGiveDiamond == YES && self.isHaveGiveGift == NO){ - [self.diamondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); - }]; - }else if (self.isHaveGiveDiamond == NO && self.isHaveGiveGift == YES){ - [self.giftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); - }]; - }else{ - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.top.width.mas_equalTo(self.view); - make.height.mas_equalTo(30); - - }]; - [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.titleView.mas_bottom).offset(10); - }]; - } - -} -#pragma mark -XPMineGiveDiamondProtocol - -- (void)getexamplesOfRecordWithList:(NSArray *)list state:(int)state{ - if (state == 0) { - if(self.diamondPage == 1){ - self.hasNoMoreDiamondData = NO; - [self.diamondView.tableView.mj_header endRefreshing]; - self.diamondView.listData = [NSMutableArray arrayWithArray:list]; - [self.diamondView.tableView reloadData]; - return; - } - if (list.count > 0) { - [self.diamondView.listData addObjectsFromArray:list]; - [self.diamondView.tableView reloadData]; - self.hasNoMoreDiamondData = NO; - }else{ - self.hasNoMoreDiamondData = YES; - - } - [self.diamondView.tableView.mj_footer endRefreshing]; - return; - } - if(self.giftPage == 1){ - self.hasNoMoreGiftData = NO; - [self.giftView.tableView.mj_header endRefreshing]; - self.giftView.listData = [NSMutableArray arrayWithArray:list]; - [self.giftView.tableView reloadData]; - return; - } - if (list.count > 0) { - [self.giftView.listData addObjectsFromArray:list]; - [self.giftView.tableView reloadData]; - self.hasNoMoreGiftData = NO; - }else{ - self.hasNoMoreGiftData = YES; - - } - [self.self.giftView.tableView.mj_footer endRefreshing]; - -} --(void)getexamplesOfRecordWithListWithFailState:(int)state{ - if(state == 0){ - [self.diamondView.tableView.mj_header endRefreshing]; - [self.diamondView.tableView.mj_footer endRefreshing]; - return; - } - [self.giftView.tableView.mj_header endRefreshing]; - [self.giftView.tableView.mj_footer endRefreshing]; -} -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.diamondView.tableView.mj_header = header; - - MJRefreshNormalHeader *giftHeader = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - giftHeader.stateLabel.font = [UIFont systemFontOfSize:10.0]; - giftHeader.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - giftHeader.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - giftHeader.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.giftView.tableView.mj_header = giftHeader; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.diamondView.tableView.mj_footer = footer; - - MJRefreshBackNormalFooter *giftFooter = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - giftFooter.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - giftFooter.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.giftView.tableView.mj_footer = giftFooter; - -} -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - if(self.type == 0){ - self.diamondPage = 1; - [self.presenter getExamplesOfRecordWithUid:self.toUid type:self.type page:self.diamondPage]; - return; - } - - self.giftPage = 1; - [self.presenter getExamplesOfRecordWithUid:self.toUid type:self.type page:self.giftPage]; -} - -- (void)footerRefresh { - if (self.hasNoMoreDiamondData && self.type == 0) { - [self.diamondView.tableView.mj_footer endRefreshing]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMomentsRecommendViewController0")]; - return; - } - if(self.hasNoMoreGiftData && self.type == 1){ - [self.giftView.tableView.mj_footer endRefreshing]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMomentsRecommendViewController0")]; - return; - } - if(self.type == 0){ - self.diamondPage++; - [self.presenter getExamplesOfRecordWithUid:self.toUid type:self.type page:self.diamondPage]; - return; - } - self.giftPage++; - [self.presenter getExamplesOfRecordWithUid:self.toUid type:self.type page:self.giftPage]; -} -#pragma mark- 检查是否有转赠权限 - --(void)checkHaveGivePermission{ - - ClientConfig *config = [ClientConfig shareConfig]; - NSArray *uidList = config.configInfo.giveDiamondErbanNoList; - for (id uid in uidList) { - NSString *getUid = [uid stringValue]; - if([getUid isEqualToString:@(self.userInfo.erbanNo).stringValue]){ - self.isHaveGiveDiamond = YES; - break; - } - } - for (id uid in config.configInfo.giveGiftErbanNoList) { - NSString *getUid = [uid stringValue]; - if([getUid isEqualToString:@(self.userInfo.erbanNo).stringValue]){ - self.isHaveGiveGift = YES; - break; - } - } - if(self.userInfo.userLevelVo.experLevelSeq >= config.configInfo.giveDiamondExperLevel){ - self.isHaveGiveDiamond = YES; - } - if(self.userInfo.userLevelVo.experLevelSeq >= config.configInfo.giveGiftExperLevel){ - - self.isHaveGiveGift = YES; - } - -} -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - self.type = 0; - return self.diamondView; - } else { - self.type = 1; - if(self.giftView.listData.count == 0){ - [self.presenter getExamplesOfRecordWithUid:self.toUid type:1 page:self.giftPage]; - } - return self.giftView; - } -} - -#pragma mark - 懒加载 -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = UIColorFromRGB(0x6D6B89); - _titleView.titleSelectedColor = UIColorFromRGB(0x1F1A4E); - _titleView.titleFont = [UIFont systemFontOfSize:kGetScaleWidth(15) weight:UIFontWeightMedium]; - _titleView.titleSelectedFont = [UIFont systemFontOfSize:kGetScaleWidth(15) weight:UIFontWeightMedium]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.cellSpacing = 20; - _titleView.cellWidthIncrement = 5; - _titleView.cellWidth = 60; - _titleView.listContainer = self.pi_containerView; - - JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.indicatorImageViewSize = CGSizeMake(16, 3); - lineView.verticalMargin = -1; - lineView.indicatorImageView.image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(15, 3)]; - lineView.indicatorImageView.layer.masksToBounds = YES; - lineView.indicatorImageView.layer.cornerRadius = 1.5; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (JXCategoryListContainerView *)pi_containerView { - if (!_pi_containerView) { - _pi_containerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _pi_containerView.defaultSelectedIndex = 0; - [_pi_containerView.scrollView.panGestureRecognizer requireGestureRecognizerToFail:self.navigationController.interactivePopGestureRecognizer]; - - } - return _pi_containerView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMineGiveDiamondDetailsVC1"), YMLocalizedString(@"XPMineGiveDiamondDetailsVC2")]; - } - return _titles; -} --(XPMineGiveDiamondDetailsView *)diamondView{ - if (!_diamondView){ - _diamondView = [[XPMineGiveDiamondDetailsView alloc]initWithFrame:CGRectZero]; - } - return _diamondView; -} --(XPMineGiveDiamondDetailsView *)giftView{ - if (!_giftView){ - _giftView = [[XPMineGiveDiamondDetailsView alloc]initWithFrame:CGRectZero]; - } - return _giftView; -} -@end diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.h b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.h deleted file mode 100644 index 5829ac7..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPMineGiveDiamondVC.h -// YuMi -// -// Created by YuMi on 2022/10/17. -// - -#import -#import "MvpViewController.h" -#import "UserInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGiveDiamondVC : MvpViewController - - -- (instancetype)initWithUserModel:(UserInfoModel *)userInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.m deleted file mode 100644 index c292338..0000000 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.m +++ /dev/null @@ -1,712 +0,0 @@ -// -// XPMineGiveDiamondVC.m -// YuMi -// -// Created by YuMi on 2022/10/17. -// - -#import "XPMineGiveDiamondVC.h" - -///view -#import "XPMineGiveDiamondSearchView.h" -#import "XPMineGiveDiamondCell.h" -#import "XPMineFriendEmptyTableViewCell.h" -///vc -#import "XPMineChooseGiveDiamondVC.h" -#import "HomeSearchResultModel.h" -#import "XPMineGiveDiamondModel.h" -#import "XPMineGiveDiamondSearchModel.h" -#import "XPMineGiveDiamondDetailsVC.h" - -#import "XPMineGiveDiamondPresenter.h" - -#import "XPMineGiveDiamondProtocol.h" -#import "XPHomeSearchProtocol.h" -#import "DJDKMIMOMColor.h" - -#import "RechargeUserModel.h" - -#import "SubRechargersViewController.h" -#import "RechargerTransferHistoryViewController.h" - -@interface XPMineGiveDiamondVC () -@property (nonatomic,strong) UITableView *tableView; -@property(nonatomic, strong) UIView *infoContainer; -@property(nonatomic, strong) NetImageView *avatarImageView; -@property(nonatomic, strong) UILabel *transferCoinsLabel; -@property(nonatomic, strong) UILabel *transferCoinsTitleLabel; -@property(nonatomic, strong) UILabel *ÜSSettlementLabel; -@property(nonatomic, strong) UILabel *ÜSSettlementTitleLabel; -@property(nonatomic, strong) UIImageView *moneyIcon; -@property(nonatomic, strong) UIButton *viewDetailButton; -@property(nonatomic, strong) UIButton *subRechargeButton; -@property(nonatomic, strong) UILabel *subRechargeTitleLabel; -@property(nonatomic, strong) UILabel *subRechargeNumLabel; -@property(nonatomic, strong) UILabel *nameLabel; -@property(nonatomic, strong) UILabel *recentTransfersTitleLabel; -@property(nonatomic, strong) NetImageView *icon1ImageView; -@property(nonatomic, strong) NetImageView *icon2ImageView; -@property(nonatomic, strong) UILabel *idLabel; -@property(nonatomic, strong) UIStackView *starsStack; -@property(nonatomic, strong) UIButton *helpButton; -@property(nonatomic, strong) UIButton *star_1; -@property(nonatomic, strong) UIButton *star_2; -@property(nonatomic, strong) UIButton *star_3; -@property(nonatomic, strong) UIButton *star_4; -@property(nonatomic, strong) UIButton *star_5; - -///搜索 -@property (nonatomic,strong) XPMineGiveDiamondSearchView *searchView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; - -///搜索的id -@property (nonatomic,copy) NSString *text; -///显示tag -@property (nonatomic,strong) UILabel *tagView; - -@property (nonatomic,strong) UserInfoModel *userInfo; - -@end - -@implementation XPMineGiveDiamondVC - -- (instancetype)initWithUserModel:(UserInfoModel *)userInfo { - if (self = [super init]) { - self.userInfo = userInfo; - } - return self; -} - -- (XPMineGiveDiamondPresenter *)createPresenter { - return [[XPMineGiveDiamondPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [self.presenter getGiveDiamondRecord]; - [self.presenter rechargeUserInfo]; -} - -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPMineGiveDiamondVC0"); - - [self.view addSubview:self.searchView]; - [self.view addSubview:self.infoContainer]; - [self.view addSubview:self.recentTransfersTitleLabel]; - [self.view addSubview:self.tableView]; - - [self.infoContainer addSubview:self.avatarImageView]; - [self.infoContainer addSubview:self.nameLabel]; - [self.infoContainer addSubview:self.icon1ImageView]; - [self.infoContainer addSubview:self.icon2ImageView]; - [self.infoContainer addSubview:self.idLabel]; - [self.infoContainer addSubview:self.starsStack]; - [self.infoContainer addSubview:self.helpButton]; - [self.infoContainer addSubview:self.transferCoinsTitleLabel]; - [self.infoContainer addSubview:self.transferCoinsLabel]; - [self.infoContainer addSubview:self.moneyIcon]; - [self.infoContainer addSubview:self.viewDetailButton]; - [self.infoContainer addSubview:self.subRechargeButton]; - [self.infoContainer addSubview:self.subRechargeTitleLabel]; - [self.infoContainer addSubview:self.subRechargeNumLabel]; - - if ([self.userInfo isArabia]) { - [self.infoContainer addSubview:self.ÜSSettlementTitleLabel]; - [self.infoContainer addSubview:self.ÜSSettlementLabel]; - } -} - -- (void)initSubViewConstraints { - - [self.searchView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.view).offset(14); - make.leading.trailing.equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(32)); - }]; - - [self.infoContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.searchView.mas_bottom).offset(14); - make.leading.trailing.equalTo(self.view).inset(15); - if ([self.userInfo isArabia]) { - make.height.mas_equalTo(kGetScaleWidth(214)); - } else { - make.height.mas_equalTo(kGetScaleWidth(190)); - } - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(self.infoContainer).offset(12); - make.width.height.mas_equalTo(kGetScaleWidth(59)); - }]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - make.top.mas_equalTo(self.avatarImageView); - make.height.mas_equalTo(22); - }]; - [self.icon1ImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.nameLabel); - make.leading.mas_equalTo(self.nameLabel.mas_trailing).offset(4); - make.size.mas_equalTo(CGSizeMake(38, 18)); - }]; - [self.icon2ImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.nameLabel); - make.leading.mas_equalTo(self.icon1ImageView.mas_trailing).offset(4); - make.size.mas_equalTo(CGSizeMake(38, 18)); - }]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - make.top.mas_equalTo(self.nameLabel.mas_bottom).offset(4); - make.height.mas_equalTo(18); - }]; - [self.starsStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - make.top.mas_equalTo(self.idLabel.mas_bottom).offset(4); - make.height.mas_equalTo(15); - }]; - - [self.star_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - [self.star_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - [self.star_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - [self.star_4 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - [self.star_5 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - - [self.helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.starsStack); - make.leading.mas_equalTo(self.starsStack.mas_trailing).offset(8); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - - if ([self.userInfo isArabia]) { - [self.ÜSSettlementTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(11); - make.leading.mas_equalTo(self.avatarImageView); - make.height.mas_equalTo(22); - }]; - - [self.ÜSSettlementLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.transferCoinsTitleLabel.mas_bottom).offset(6); - make.leading.mas_equalTo(self.avatarImageView); - make.height.mas_equalTo(38); - }]; - - [self.transferCoinsTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(11); - make.leading.mas_equalTo(self.infoContainer.mas_centerX); - make.height.mas_equalTo(22); - }]; - - [self.transferCoinsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.transferCoinsTitleLabel.mas_bottom).offset(6); - make.leading.mas_equalTo(self.infoContainer.mas_centerX); - make.height.mas_equalTo(38); - }]; - - [self.moneyIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.transferCoinsLabel); - make.leading.mas_equalTo(self.transferCoinsLabel.mas_trailing).offset(4); - make.size.mas_equalTo(CGSizeMake(30, 30)); - }]; - - [self.viewDetailButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.infoContainer).offset(-12); - make.top.mas_equalTo(self.ÜSSettlementLabel.mas_bottom).offset(1); - make.height.mas_equalTo(18); - }]; - } else { - [self.transferCoinsTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(11); - make.leading.mas_equalTo(self.avatarImageView); - make.height.mas_equalTo(22); - }]; - - [self.transferCoinsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.transferCoinsTitleLabel.mas_bottom).offset(6); - make.leading.mas_equalTo(self.avatarImageView); - make.height.mas_equalTo(38); - }]; - - [self.moneyIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.transferCoinsLabel); - make.leading.mas_equalTo(self.transferCoinsLabel.mas_trailing).offset(4); - make.size.mas_equalTo(CGSizeMake(30, 30)); - }]; - - [self.viewDetailButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.infoContainer).offset(-12); - make.centerY.mas_equalTo(self.transferCoinsLabel); - make.height.mas_equalTo(18); - make.width.mas_greaterThanOrEqualTo(90); - }]; - } - - [self.subRechargeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.infoContainer); - make.height.mas_equalTo(44); - }]; - - [self.subRechargeTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView); - make.centerY.mas_equalTo(self.subRechargeButton); - make.height.mas_equalTo(24); - }]; - - [self.subRechargeNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.infoContainer).offset(-12); - make.centerY.mas_equalTo(self.subRechargeButton); - make.height.mas_equalTo(17); - }]; - - [self.recentTransfersTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.infoContainer); - make.height.mas_equalTo(24); - make.top.mas_equalTo(self.infoContainer.mas_bottom).offset(14); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(-kGetScaleWidth(20)); - make.top.mas_equalTo(self.recentTransfersTitleLabel.mas_bottom).offset(24); - }]; -} - -- (void)didTapHelp { - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"1.0.33_text_16"); - config.message = YMLocalizedString(@"1.0.33_text_17"); - config.actionStyle = TTAlertActionConfirmStyle; - [TTPopup alertWithConfig:config showBorder:NO confirmHandler:^{} cancelHandler:^{}]; -} - -- (void)didTapViewDetail { - RechargerTransferHistoryViewController *vc = [[RechargerTransferHistoryViewController alloc] initWithUserInfo:self.userInfo]; - [self.navigationController pushViewController:vc animated:YES]; -} - -- (void)didTapViewSubRecharge { - SubRechargersViewController *vc = [[SubRechargersViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; -} - -#pragma mark -XPMineChooseGiveDiamondVCDelegate -- (void)xpMineChooseGiveDiamondVCCompleteWithModel:(XPMineGiveDiamondModel *)model{ - if(model != nil){ - if(self.datasource.count != 0){ - NSMutableArray *objList = [NSMutableArray array]; - for (XPMineGiveDiamondModel *obj in self.datasource) { - if(![obj.targetErbanNo isEqualToString:model.targetErbanNo]){ - [objList addObject:obj]; - } - } - [self.datasource removeAllObjects]; - [self.datasource addObject:model]; - [self.datasource addObjectsFromArray:objList]; - }else{ - [self.datasource addObject:model]; - } - [self.tableView reloadData]; - } -} - -#pragma mark - UITableViewDelegate - --(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{ - return self.datasource.count > 0 ? kGetScaleWidth(70) : self.tableView.frame.size.height; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ - return self.datasource.count > 0 ? self.datasource.count : 1; -} - --(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - if(self.datasource.count > 0){ - XPMineGiveDiamondCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGiveDiamondCell class]) forIndexPath:indexPath]; - cell.giveDiamondModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - @kWeakify(self); - [cell setHandleTapTransfer:^(XPMineGiveDiamondModel * _Nonnull giveDiamondModel) { - @kStrongify(self); - XPMineChooseGiveDiamondVC *vc = [XPMineChooseGiveDiamondVC new]; - vc.giveDiamondModel = giveDiamondModel; - vc.delegate = self; - vc.userInfo = self.userInfo; - [self.navigationController pushViewController:vc animated:YES]; - }]; - [cell setHandleTapHistory:^(XPMineGiveDiamondModel * _Nonnull giveDiamondModel) { - @kStrongify(self); - XPMineGiveDiamondDetailsVC *vc = [[XPMineGiveDiamondDetailsVC alloc]init]; - vc.userInfo = self.userInfo; - XPMineGiveDiamondModel *model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - vc.toUid = model.targetUid; - [self.navigationController pushViewController:vc animated:YES]; - }]; - return cell; - } else { - XPMineFriendEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])forIndexPath:indexPath] ; - cell.emptyTitle = YMLocalizedString(@"XPMineGiveDiamondVC3"); - return cell; - } -} - - -#pragma mark - XPMineGiveDiamondProtocol --(void)getGiveDiamondListSuccess:(NSArray *)array{ - self.datasource = [NSMutableArray arrayWithArray:array]; - [self.tableView reloadData]; -} - -#pragma mark - XPHomeSearchProtocol --(void)searchGivePeopleWihtModel:(XPMineGiveDiamondSearchModel *)model{ - [self hideHUD]; - if(model != nil){ - XPMineGiveDiamondModel *giveModle = [XPMineGiveDiamondModel new]; - giveModle.targetUid = model.uid; - giveModle.targetErbanNo = model.erbanNo; - giveModle.targetNick = model.nick; - giveModle.targetAvatar = model.avatar; - XPMineChooseGiveDiamondVC *vc = [XPMineChooseGiveDiamondVC new]; - vc.giveDiamondModel = giveModle; - vc.delegate = self; - vc.userInfo = self.userInfo; - [self.navigationController pushViewController:vc animated:YES]; - } -} - --(void)searchEndWithText:(NSString *)text{ - if(text.length == 0){ - [self showErrorToast:YMLocalizedString(@"XPMineGiveDiamondSearchView1")]; - return; - } - self.text = text; - [self showLoading]; - [self.presenter searchGivePeopleWith:text]; -} - -- (void)loadRechargeUserSuccess:(RechargeUserModel *)userModel { - - self.infoContainer.hidden = NO; - - self.avatarImageView.imageUrl = userModel.avatar; - self.nameLabel.text = userModel.nick; - self.icon1ImageView.imageUrl = self.userInfo.userLevelVo.charmUrl; - self.icon2ImageView.imageUrl = self.userInfo.userLevelVo.experUrl; - self.idLabel.text = [NSString stringWithFormat:@"ID: %@", userModel.erbanNo]; - - self.transferCoinsLabel.text = @(userModel.totalGiveGold).stringValue; - - NSTextAttachment *attachMent = [[NSTextAttachment alloc] init]; - attachMent.image = kImage(@"sub_recharger_arrow"); - attachMent.bounds = CGRectMake(0, -4, 17, 17); - NSAttributedString *arrowString = [NSAttributedString attributedStringWithAttachment:attachMent]; - NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:@(userModel.subNum).stringValue - attributes:@{ - NSFontAttributeName: self.subRechargeNumLabel.font, - NSForegroundColorAttributeName: self.subRechargeNumLabel.textColor - }]; - [string appendAttributedString:arrowString]; - - self.subRechargeNumLabel.attributedText = string; - - if ([self.userInfo isArabia]) { - self.ÜSSettlementLabel.text = [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_49"), @(userModel.totalGiveGoldUsd)];; - } - - if (userModel.starLevel > 0) { - [self.star_1 setSelected:YES]; - } - if (userModel.starLevel > 1) { - [self.star_2 setSelected:YES]; - } - if (userModel.starLevel > 2) { - [self.star_3 setSelected:YES]; - } - if (userModel.starLevel > 3) { - [self.star_4 setSelected:YES]; - } - if (userModel.starLevel > 4) { - [self.star_5 setSelected:YES]; - } - if (userModel.manageUid > 0 || userModel.subNum == 0) { - [self.subRechargeButton removeFromSuperview]; - [self.subRechargeNumLabel removeFromSuperview]; - [self.subRechargeTitleLabel removeFromSuperview]; - [self.infoContainer mas_updateConstraints:^(MASConstraintMaker *make) { - if ([self.userInfo isArabia]) { - make.height.mas_equalTo(kGetScaleWidth(214)-44); - } else { - make.height.mas_equalTo(kGetScaleWidth(190)-44); - } - }]; - } - - [self.view layoutIfNeeded]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.showsVerticalScrollIndicator = NO; - _tableView.separatorInset = UIEdgeInsetsMake(0, 15, 0, 15); - _tableView.separatorColor = UIColor.lightGrayColor; - _tableView.backgroundColor = [UIColor clearColor]; - [_tableView registerClass:[XPMineGiveDiamondCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGiveDiamondCell class])]; - [_tableView registerClass:[XPMineFriendEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - } - return _tableView; -} -- (XPMineGiveDiamondSearchView *)searchView{ - if (!_searchView){ - _searchView = [[XPMineGiveDiamondSearchView alloc]initWithFrame:CGRectZero]; - _searchView.delegate = self; - } - return _searchView; -} - --(UILabel *)tagView{ - if (!_tagView){ - _tagView = [UILabel new]; - _tagView.textColor = [DJDKMIMOMColor disableButtonTextColor]; - _tagView.font = [UIFont systemFontOfSize:kGetScaleWidth(12) weight:UIFontWeightRegular]; - _tagView.text = YMLocalizedString(@"XPMineGiveDiamondVC2"); - } - return _tagView; -} - -- (UIView *)infoContainer { - if (!_infoContainer) { - _infoContainer = [[UIView alloc] init]; - _infoContainer.backgroundColor = UIColorFromRGB(0xf7f7f7); - [_infoContainer setCornerRadius:10]; - _infoContainer.hidden = YES; - } - return _infoContainer; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - _avatarImageView = [[NetImageView alloc] init]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - [_avatarImageView setCornerRadius:kGetScaleWidth(59/2)]; - } - return _avatarImageView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(15) textColor:UIColorFromRGB(0x313131)]; - } - return _nameLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [UILabel labelInitWithText:@"" font:kFontRegular(13) textColor:UIColorFromRGB(0x7b7b7d)]; - } - return _idLabel; -} - -- (NetImageView *)icon1ImageView { - if (!_icon1ImageView) { - _icon1ImageView = [[NetImageView alloc] init]; - _icon1ImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _icon1ImageView; -} - -- (NetImageView *)icon2ImageView { - if (!_icon2ImageView) { - _icon2ImageView = [[NetImageView alloc] init]; - _icon2ImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _icon2ImageView; -} - -- (UIStackView *)starsStack { - if (!_starsStack) { - _starsStack = [[UIStackView alloc] initWithArrangedSubviews:@[ - self.star_1, - self.star_2, - self.star_3, - self.star_4, - self.star_5, - ]]; - _starsStack.spacing = 4; - } - return _starsStack; -} - -- (UIButton *)star_1 { - if (!_star_1) { - _star_1 = [UIButton buttonWithType:UIButtonTypeCustom]; - [_star_1 setBackgroundImage:kImage(@"star_white") forState:UIControlStateNormal]; - [_star_1 setBackgroundImage:kImage(@"star_yellow") forState:UIControlStateSelected]; - } - return _star_1; -} -- (UIButton *)star_2 { - if (!_star_2) { - _star_2 = [UIButton buttonWithType:UIButtonTypeCustom]; - [_star_2 setBackgroundImage:kImage(@"star_white") forState:UIControlStateNormal]; - [_star_2 setBackgroundImage:kImage(@"star_yellow") forState:UIControlStateSelected]; - } - return _star_2; -} -- (UIButton *)star_3 { - if (!_star_3) { - _star_3 = [UIButton buttonWithType:UIButtonTypeCustom]; - [_star_3 setBackgroundImage:kImage(@"star_white") forState:UIControlStateNormal]; - [_star_3 setBackgroundImage:kImage(@"star_yellow") forState:UIControlStateSelected]; - } - return _star_3; -} -- (UIButton *)star_4 { - if (!_star_4) { - _star_4 = [UIButton buttonWithType:UIButtonTypeCustom]; - [_star_4 setBackgroundImage:kImage(@"star_white") forState:UIControlStateNormal]; - [_star_4 setBackgroundImage:kImage(@"star_yellow") forState:UIControlStateSelected]; - } - return _star_4; -} -- (UIButton *)star_5 { - if (!_star_5) { - _star_5 = [UIButton buttonWithType:UIButtonTypeCustom]; - [_star_5 setBackgroundImage:kImage(@"star_white") forState:UIControlStateNormal]; - [_star_5 setBackgroundImage:kImage(@"star_yellow") forState:UIControlStateSelected]; - } - return _star_5; -} - -- (UIButton *)helpButton { - if (!_helpButton) { - _helpButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_helpButton setBackgroundImage:kImage(@"diamond_help") forState:UIControlStateNormal]; - [_helpButton addTarget:self action:@selector(didTapHelp) forControlEvents:UIControlEventTouchUpInside]; - } - return _helpButton; -} - -- (UILabel *)transferCoinsTitleLabel { - if (!_transferCoinsTitleLabel) { - _transferCoinsTitleLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.37_text_34") - font:kFontMedium(14) - textColor:UIColorFromRGB(0x313131)]; - } - return _transferCoinsTitleLabel; -} - -- (UILabel *)transferCoinsLabel { - if (!_transferCoinsLabel) { - _transferCoinsLabel = [UILabel labelInitWithText:@"18000" - font:kFontSemibold(26) - textColor:UIColorFromRGB(0xFF8C03)]; - } - return _transferCoinsLabel; -} - -- (UIImageView *)moneyIcon { - if (!_moneyIcon) { - _moneyIcon = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - } - return _moneyIcon; -} - -- (UIButton *)viewDetailButton { - if (!_viewDetailButton) { - _viewDetailButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _viewDetailButton.titleLabel.textAlignment = NSTextAlignmentLeft; - NSTextAttachment *attachMent = [[NSTextAttachment alloc] init]; - attachMent.image = kImage(@"sub_recharger_arrow"); - attachMent.bounds = CGRectMake(0, -4, 17, 17); - NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init]; - style.alignment = NSTextAlignmentLeft; - NSAttributedString *arrowString = [NSAttributedString attributedStringWithAttachment:attachMent]; - NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"1.0.37_text_35") - attributes:@{ - NSFontAttributeName: kFontRegular(12), - NSForegroundColorAttributeName: UIColorFromRGB(0x7b7b7d), - NSParagraphStyleAttributeName: style - }]; - [string appendAttributedString:arrowString]; - [_viewDetailButton setAttributedTitle:string forState:UIControlStateNormal]; - [_viewDetailButton addTarget:self action:@selector(didTapViewDetail) forControlEvents:UIControlEventTouchUpInside]; - [_viewDetailButton.titleLabel sizeToFit]; - } - return _viewDetailButton; -} - -- (UIButton *)subRechargeButton { - if (!_subRechargeButton) { - _subRechargeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_subRechargeButton setBackgroundColor:UIColorFromRGB(0xe7e7e7)]; - [_subRechargeButton addTarget:self action:@selector(didTapViewSubRecharge) forControlEvents:UIControlEventTouchUpInside]; - [_subRechargeButton setCornerRadius:10 - cornerMask:kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner]; - } - return _subRechargeButton; -} - -- (UILabel *)subRechargeTitleLabel { - if (!_subRechargeTitleLabel) { - _subRechargeTitleLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.37_text_36") - font:kFontMedium(14) - textColor:UIColorFromRGB(0x313131)]; - } - return _subRechargeTitleLabel; -} - -- (UILabel *)subRechargeNumLabel { - if (!_subRechargeNumLabel) { - _subRechargeNumLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(12) - textColor:UIColorFromRGB(0x7b7b7d)]; - } - return _subRechargeNumLabel; -} - -- (UILabel *)ÜSSettlementTitleLabel { - if (!_ÜSSettlementTitleLabel) { - _ÜSSettlementTitleLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.37_text_38") - font:kFontMedium(14) - textColor:UIColorFromRGB(0x313131)]; - } - return _ÜSSettlementTitleLabel; -} - -- (UILabel *)ÜSSettlementLabel { - if (!_ÜSSettlementLabel) { - _ÜSSettlementLabel = [UILabel labelInitWithText:@"" - font:kFontSemibold(26) - textColor:UIColorFromRGB(0xFF8C03)]; - } - return _ÜSSettlementLabel; -} - -- (UILabel *)recentTransfersTitleLabel { - if (!_recentTransfersTitleLabel) { - _recentTransfersTitleLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.37_text_37") - font:kFontMedium(16) - textColor:UIColorFromRGB(0x161616)]; - } - return _recentTransfersTitleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Api/Api+Guild.h b/YuMi/Modules/YMMine/View/Guild/Api/Api+Guild.h deleted file mode 100644 index 2eb0e40..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Api/Api+Guild.h +++ /dev/null @@ -1,224 +0,0 @@ -// -// Api+Guild.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - - - - - -@interface Api (Guild) -/// 获取家族详情 -/// @param completion 完成 -/// @param uid 族长的uid -+ (void)getNewClanDetailInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; -/// 获取家族详情 -/// @param completion 完成 -/// @param uid 族长的uid -+ (void)getClanDetailInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; - -/// 获取公会中房间列表 -/// @param completion 完成 -/// @param clanId 公会的id -+ (void)getRoomListInClan:(HttpRequestHelperCompletion)completion clanId:(NSString *)clanId; - -/// 公会成员列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param page 当前的页数 -/// @param pageSize 每页多少个 -+ (void)getClanMemberList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize; - -/// 房间成员列表 -/// @param completion 完成 -/// @param hallId 用户的uid -/// @param page 当前的页数 -/// @param pageSize 每页多少个 -+ (void)getGuildMemberList:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId page:(NSString *)page pageSize:(NSString *)pageSize; - -/// 公会成员列表搜索某人 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param page 当前的页数 -/// @param pageSize 每页多少个 -/// @param queryStr 搜索的关键字 -+ (void)searchClanMemberList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize queryStr:(NSString *)queryStr; - -/// 更新房间的名称 -/// @param completion 完成 -/// @param hallName 公会的名称 -/// @param hallId 公会的id -+ (void)updateGuildRoomName:(HttpRequestHelperCompletion)completion hallName:(NSString *)hallName hallId:(NSString *)hallId uid:(NSString *)uid; - -/// 获取公会房间成员权限 -/// @param completion 完成 -/// @param hallId 公会的id -/// @param uid 用户的uid -+ (void)getGuildRoomAuth:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId uid:(NSString *)uid; - -/// 搜索 -/// @param completion 完成 -/// @param key 关键字 -/// @param type 类型 1 房间 2 用户 -/// @param page 多少页 -/// @param pageSize 每页多少个 -+ (void)guildSearchUserCompletion:(HttpRequestHelperCompletion)completion key:(NSString *)key type:(NSString *)type page:(NSString *)page pageSize:(NSString *)pageSize; - -/// 移除公会成员 -/// @param completion 完成 -/// @param uid uid -/// @param targetUid 移除的人的uid -/// @param hallId 公会的id -+ (void)removeGuildMemberCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid targetUid:(NSString *)targetUid hallId:(NSString *)hallId; - -/// 邀请用户加入公会 -/// @param completion 完成 -/// @param hallId 公会的id -/// @param uid 用户的uid -/// @param targetUid 目标用户的uid -+ (void)inviteMemberCompletion:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId uid:(NSString *)uid targetUid:(NSString *)targetUid; - -/// 获取公会房间管理列表 -/// @param completion 完成 -/// @param hallId 公会的id -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -+ (void)getGuildRoomManagerCompletion:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId page:(NSString *)page pageSize:(NSString *)pageSize; - -/// 设置房间管理 -/// @param completion 完成 -/// @param hallId 公会的id -/// @param uid 用户的uid -/// @param targetUid 目标用户的uid -+ (void)guildRoomSetManagerCompletion:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId uid:(NSString *)uid targetUid:(NSString *)targetUid; - -/// 取消设置房间管理 -/// @param completion 完成 -/// @param hallId 公会的id -/// @param uid 用户的uid -/// @param targetUid 目标用户的uid -+ (void)guildRoomCancelManagerCompletion:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId uid:(NSString *)uid targetUid:(NSString *)targetUid; - -/// 公会管理权限 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param managerUid 管理的uid -+ (void)guildManagerAuthCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid managerUid:(NSString *)managerUid; - -/// 设置公会管理权限 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param managerUid 管理的uid -/// @param authStr 权限的字段 -+ (void)setGuildManagerAuthCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid managerUid:(NSString *)managerUid hallId:(NSString *)hallId authStr:(NSString *)authStr; - -/// 退出房间 -/// @param completion 完成 -/// @param uid 自己的UID -+ (void)quitGuildRoom:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; - -/// 申请加入公会房间 -/// @param completion 完成 -/// @param hallId 公会的id -/// @param uid 要加入用户的uid -+ (void)memberApplyHall:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId uid:(NSString *)uid; - -/// 家族收入列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param clanId 家族的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -+ (void)getClanIncomeRecord:(HttpRequestHelperCompletion)completion uid:(NSString *)uid clanId:(NSString *)clanId startTime:(NSString *)startTime endTime:(NSString *)endTime; - -/// 公会收入列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param hallId 家族的id -/// @param startTimeStr 开始时间 -/// @param endTimeStr 结束时间 -+ (void)getGuildIncomeRecord:(HttpRequestHelperCompletion)completion uid:(NSString *)uid hallId:(NSString *)hallId startTimeStr:(NSString *)startTimeStr endTimeStr:(NSString *)endTimeStr; - -/// 家族个播收入列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param hallId 家族的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -+ (void)getClanSingleRoomIncomeRecord:(HttpRequestHelperCompletion)completion uid:(NSString *)uid hallId:(NSString *)hallId startTime:(NSString *)startTime endTime:(NSString *)endTime; - -/// 公会个播收入列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param hallId 公会的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -+ (void)getHallSingleRoomIncomeRecord:(HttpRequestHelperCompletion)completion uid:(NSString *)uid clanId:(NSString *)hallId startTime:(NSString *)startTime endTime:(NSString *)endTime; - -/// 收入明细 -/// @param completion 完成 -/// @param hallId 公会的ID -/// @param memberId 查询用户的uid -/// @param uid 用户的id -/// @param startTimeStr 开始时间 -/// @param endTimeStr 结束时间 -+ (void)getHallIncomeDetail:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId memberId:(NSString *)memberId uid:(NSString *)uid startTimeStr:(NSString *)startTimeStr endTimeStr:(NSString *)endTimeStr; -#pragma mark - 超管 -/// 获取公会超管管理房间列表 -/// @param completion 完成 -/// @param clanId 公会的id -/// @param uid 用户的uid -+ (void)getHallSuperAdminManagerRoomList:(HttpRequestHelperCompletion)completion clanId:(NSString *)clanId uid:(NSString *)uid; - -/// 超管管理公会房间 -/// @param completion 完成 -/// @param roomUids 管理的房间的uid -/// @param uid 用户的uid -+ (void)setSuperAdminManagerRoom:(HttpRequestHelperCompletion)completion roomUids:(NSString *)roomUids uid:(NSString *)uid; - -/// 获取家族超管列表 -/// @param completion 完成 -/// @param clanId 家族de id -+ (void)getClanSuperAdminList:(HttpRequestHelperCompletion)completion clanId:(NSString *)clanId; - -/// 移除超管 -/// @param completion 完成 -/// @param targetUid 移除的人的uid -+ (void)clanRemoveSuperAdmin:(HttpRequestHelperCompletion)completion targetUid:(NSString *)targetUid; - -/// 添加公会超管 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param erbanNo 搜索的id -+ (void)searchGuildSuperAdmin:(HttpRequestHelperCompletion)completion uid:(NSString *)uid erbanNo:(NSString *)erbanNo; - -/// 房主金币明细 -/// @param completion 完成 -/// @param startTime 开始时间 -/// @param endTime 结束时间 -+(void)getClanRoomGoldsList:(HttpRequestHelperCompletion)completion startTime:(NSString *)startTime endTime:(NSString *)endTime; -///房主获取兑换权限列表 -+(void)getClanRoomMemberAuthorityList:(HttpRequestHelperCompletion)completion; - -/// 开启或关闭兑换会员权限 -/// @param completion 完成 -/// @param status 0=关闭，1=开启 -/// @param targetUid 成员id -+(void)requestMasterDisableRrEnablememberExchangeRights:(HttpRequestHelperCompletion)completion status:(NSString *)status targetUid:(NSString *)targetUid; -///获取加入房间 -+(void)applyHallBtnStateWithHallId:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId; -/// 获取公会收入列表 -/// @param completion 完成 -/// @param hallId 公会id -/// @param startTime 查询开始时间，时间格式为yy-mm-dd -/// @param endTime 查询开始时间, 时间格式为yy-mm-dd -+(void)getGuildIncomeTotalList:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId startTime:(NSString *)startTime endTime:(NSString *)endTime; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Api/Api+Guild.m b/YuMi/Modules/YMMine/View/Guild/Api/Api+Guild.m deleted file mode 100644 index d4a89ea..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Api/Api+Guild.m +++ /dev/null @@ -1,281 +0,0 @@ -// -// Api+Guild.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "Api+Guild.h" - -@implementation Api (Guild) - -/// 获取家族详情 -/// @param completion 完成 -/// @param uid 族长的uid -+ (void)getClanDetailInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - [self makeRequest:@"clan/getUserHallAndClan" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; -} -/// 获取家族详情 -/// @param completion 完成 -/// @param uid 族长的uid -+ (void)getNewClanDetailInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - [self makeRequest:@"user/getUserClanInfo" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; -} -/// 获取公会中房间列表 -/// @param completion 完成 -/// @param clanId 公会的id -+ (void)getRoomListInClan:(HttpRequestHelperCompletion)completion clanId:(NSString *)clanId { - [self makeRequest:@"clan/listHall" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,clanId, nil]; -} - -/// 公会成员列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param page 当前的页数 -/// @param pageSize 每页多少个 -+ (void)getClanMemberList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize { - [self makeRequest:@"clan/listMember" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, page, pageSize,nil]; -} - -/// 房间成员列表 -/// @param completion 完成 -/// @param hallId 用户的uid -/// @param page 当前的页数 -/// @param pageSize 每页多少个 -+ (void)getGuildMemberList:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId page:(NSString *)page pageSize:(NSString *)pageSize { - [self makeRequest:@"hall/getAllMembers" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, hallId, page, pageSize,nil]; -} - -/// 公会成员列表搜索某人 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param page 当前的页数 -/// @param pageSize 每页多少个 -/// @param queryStr 搜索的关键字 -+ (void)searchClanMemberList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize queryStr:(NSString *)queryStr { - [self makeRequest:@"clan/listMember" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, page, pageSize, queryStr,nil]; -} - -/// 更新房间的名称 -/// @param completion 完成 -/// @param hallName 公会的名称 -/// @param hallId 公会的id -+ (void)updateGuildRoomName:(HttpRequestHelperCompletion)completion hallName:(NSString *)hallName hallId:(NSString *)hallId uid:(NSString *)uid { - [self makeRequest:@"hall/updateHallName" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, hallName, hallId, uid, nil]; -} - -/// 获取公会房间成员权限 -/// @param completion 完成 -/// @param hallId 公会的id -/// @param uid 用户的uid -+ (void)getGuildRoomAuth:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId uid:(NSString *)uid { - [self makeRequest:@"hallAuth/getHallAuths" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, hallId, uid, nil]; -} - -/// 搜索 -/// @param completion 完成 -/// @param key 关键字 -/// @param type 类型 1 房间 2 用户 -/// @param page 多少页 -/// @param pageSize 每页多少个 -+ (void)guildSearchUserCompletion:(HttpRequestHelperCompletion)completion key:(NSString *)key type:(NSString *)type page:(NSString *)page pageSize:(NSString *)pageSize { - [self makeRequest:@"search/room" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, key, type, page, pageSize, nil]; -} - -/// 移除公会成员 -/// @param completion 完成 -/// @param uid uid -/// @param targetUid 移除的人的uid -/// @param hallId 公会的id -+ (void)removeGuildMemberCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid targetUid:(NSString *)targetUid hallId:(NSString *)hallId { - [self makeRequest:@"hall/remove" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid,targetUid, hallId, nil]; -} - -/// 邀请用户加入公会 -/// @param completion 完成 -/// @param hallId 公会的id -/// @param uid 用户的uid -/// @param targetUid 目标用户的uid -+ (void)inviteMemberCompletion:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId uid:(NSString *)uid targetUid:(NSString *)targetUid { - [self makeRequest:@"hall/invite" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, hallId, uid, targetUid, nil]; -} - -/// 获取公会房间管理列表 -/// @param completion 完成 -/// @param hallId 公会的id -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -+ (void)getGuildRoomManagerCompletion:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId page:(NSString *)page pageSize:(NSString *)pageSize { - [self makeRequest:@"hall/getHallManager" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, hallId, page, pageSize, nil]; -} - -/// 设置房间管理 -/// @param completion 完成 -/// @param hallId 公会的id -/// @param uid 用户的uid -/// @param targetUid 目标用户的uid -+ (void)guildRoomSetManagerCompletion:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId uid:(NSString *)uid targetUid:(NSString *)targetUid { - [self makeRequest:@"hall/setManager" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, hallId, uid, targetUid, nil]; -} - -/// 取消设置房间管理 -/// @param completion 完成 -/// @param hallId 公会的id -/// @param uid 用户的uid -/// @param targetUid 目标用户的uid -+ (void)guildRoomCancelManagerCompletion:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId uid:(NSString *)uid targetUid:(NSString *)targetUid { - [self makeRequest:@"hall/removeManager" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, hallId, uid, targetUid, nil]; -} - -/// 公会管理权限 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param managerUid 管理的uid -+ (void)guildManagerAuthCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid managerUid:(NSString *)managerUid { - [self makeRequest:@"hallAuth/getHallManagerAuths" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, managerUid, nil]; -} - -/// 设置公会管理权限 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param managerUid 管理的uid -/// @param authStr 权限的字段 -+ (void)setGuildManagerAuthCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid managerUid:(NSString *)managerUid hallId:(NSString *)hallId authStr:(NSString *)authStr { - [self makeRequest:@"hallAuth/setHallManagerAuths" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, managerUid, hallId,authStr, nil]; -} - -/// 退出房间 -/// @param completion 完成 -/// @param uid 自己的UID -+ (void)quitGuildRoom:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - [self makeRequest:@"hall/quit" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, nil]; -} - - -/// 申请加入公会房间 -/// @param completion 完成 -/// @param hallId 公会的id -/// @param uid 要加入用户的uid -+ (void)memberApplyHall:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId uid:(NSString *)uid { - [self makeRequest:@"hall/apply" method:HttpRequestHelperMethodPOST completion:completion,__FUNCTION__, hallId, uid, nil]; -} - -#pragma mark - 收入统计 - -/// 家族收入列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param clanId 家族的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -+ (void)getClanIncomeRecord:(HttpRequestHelperCompletion)completion uid:(NSString *)uid clanId:(NSString *)clanId startTime:(NSString *)startTime endTime:(NSString *)endTime { - [self makeRequest:@"clan/income/totalList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, clanId, startTime, endTime, nil]; -} - -/// 公会收入列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param hallId 家族的id -/// @param startTimeStr 开始时间 -/// @param endTimeStr 结束时间 -+ (void)getGuildIncomeRecord:(HttpRequestHelperCompletion)completion uid:(NSString *)uid hallId:(NSString *)hallId startTimeStr:(NSString *)startTimeStr endTimeStr:(NSString *)endTimeStr { - [self makeRequest:@"income/incomeTotal" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, hallId, startTimeStr, endTimeStr, nil]; -} - -/// 家族个播收入列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param clanId 家族的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -+ (void)getClanSingleRoomIncomeRecord:(HttpRequestHelperCompletion)completion uid:(NSString *)uid hallId:(NSString *)hallId startTime:(NSString *)startTime endTime:(NSString *)endTime { - [self makeRequest:@"income/singleroom/incomeTotalV2" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, hallId, startTime, endTime, nil]; -} - -/// 公会个播收入列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param startTime 开始时间 -/// @param endTime 结束时间 -+ (void)getHallSingleRoomIncomeRecord:(HttpRequestHelperCompletion)completion uid:(NSString *)uid clanId:(NSString *)clanId startTime:(NSString *)startTime endTime:(NSString *)endTime { - [self makeRequest:@"clan/income/hallMemberTotalList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid,clanId, startTime, endTime, nil]; -} - -/// 收入明细 -/// @param completion 完成 -/// @param hallId 公会的ID -/// @param memberId 查询用户的uid -/// @param uid 用户的id -/// @param startTimeStr 开始时间 -/// @param endTimeStr 结束时间 -+ (void)getHallIncomeDetail:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId memberId:(NSString *)memberId uid:(NSString *)uid startTimeStr:(NSString *)startTimeStr endTimeStr:(NSString *)endTimeStr { - [self makeRequest:@"income/incomeDetail" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,hallId,memberId, uid, startTimeStr, endTimeStr, nil]; -} - -#pragma mark - 超管 -/// 获取公会超管管理房间列表 -/// @param completion 完成 -/// @param clanId 公会的id -/// @param uid 用户的uid -+ (void)getHallSuperAdminManagerRoomList:(HttpRequestHelperCompletion)completion clanId:(NSString *)clanId uid:(NSString *)uid { - [self makeRequest:@"hall/superManager/listHallInClan" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, clanId, uid, nil]; -} - -/// 超管管理公会房间 -/// @param completion 完成 -/// @param roomUids 管理的房间的uid -/// @param uid 用户的uid -+ (void)setSuperAdminManagerRoom:(HttpRequestHelperCompletion)completion roomUids:(NSString *)roomUids uid:(NSString *)uid { - [self makeRequest:@"hall/superManager/setSuperManage" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUids, uid, nil]; -} - -/// 获取家族超管列表 -/// @param completion 完成 -/// @param clanId 家族de id -+ (void)getClanSuperAdminList:(HttpRequestHelperCompletion)completion clanId:(NSString *)clanId { - [self makeRequest:@"hall/superManager/listSuperManageInClan" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, clanId, nil]; -} - -/// 移除超管 -/// @param completion 完成 -/// @param targetUid 移除的人的uid -+ (void)clanRemoveSuperAdmin:(HttpRequestHelperCompletion)completion targetUid:(NSString *)targetUid { - [self makeRequest:@"hall/superManager/remove" method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, targetUid,nil]; -} - - -/// 添加公会超管 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param erbanNo 搜索的id -+ (void)searchGuildSuperAdmin:(HttpRequestHelperCompletion)completion uid:(NSString *)uid erbanNo:(NSString *)erbanNo { - [self makeRequest:@"hall/superManager/search" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, erbanNo, nil]; -} -/// 房主金币明细 -/// @param completion 完成 -/// @param startTime 开始时间 -/// @param endTime 结束时间 -+(void)getClanRoomGoldsList:(HttpRequestHelperCompletion)completion startTime:(NSString *)startTime endTime:(NSString *)endTime{ - [self makeRequest:@"clanGoldFlow/hallMemberTotalList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, startTime, endTime, nil]; -} -///房主获取兑换权限列表 -+(void)getClanRoomMemberAuthorityList:(HttpRequestHelperCompletion)completion{ - [self makeRequest:@"clan/memberExchangeAuth/list" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} -///加入房间 -+(void)requestMasterDisableRrEnablememberExchangeRights:(HttpRequestHelperCompletion)completion status:(NSString *)status targetUid:(NSString *)targetUid{ - [self makeRequest:@"clan/memberExchangeAuth/operate" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,status,targetUid,nil]; -} -///获取加入房间 -+(void)applyHallBtnStateWithHallId:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId{ - [self makeRequest:@"hall/getApplyBtnStatus" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,hallId,nil]; -} -/// 获取公会收入列表 -/// @param completion 完成 -/// @param hallId 公会id -/// @param startTime 查询开始时间，时间格式为yy-mm-dd -/// @param endTime 查询开始时间, 时间格式为yy-mm-dd -+(void)getGuildIncomeTotalList:(HttpRequestHelperCompletion)completion hallId:(NSString *)hallId startTime:(NSString *)startTime endTime:(NSString *)endTime{ - [self makeRequest:@"income/totalList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, hallId, startTime,endTime, nil]; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/ClanDetailInfoModel.h b/YuMi/Modules/YMMine/View/Guild/Model/ClanDetailInfoModel.h deleted file mode 100644 index c9ba4a4..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/ClanDetailInfoModel.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// ClanDetailInfoModel.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import -#import "ClanInfoModel.h" -#import "GuildInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface ClanDetailInfoModel : PIBaseModel -///家族信息 -@property (nonatomic,strong) ClanInfoModel *clan; -///公会信息 -@property (nonatomic,strong) GuildInfoModel *hall; -///当前用户是否是公会超管 -@property (nonatomic, assign) BOOL manageHall; -@end -@interface ClanDetailMainInfoModel : PIBaseModel -///家族信息 -@property (nonatomic,strong) ClanDetailInfoModel *clan; -@property(nonatomic,copy) NSString *clanMode; -@property(nonatomic,strong) ClanInfoModel *family; -@end - - - - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/ClanDetailInfoModel.m b/YuMi/Modules/YMMine/View/Guild/Model/ClanDetailInfoModel.m deleted file mode 100644 index 3580b83..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/ClanDetailInfoModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// ClanDetailInfoModel.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "ClanDetailInfoModel.h" - -@implementation ClanDetailInfoModel - -@end - -@implementation ClanDetailMainInfoModel - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/ClanInfoModel.h b/YuMi/Modules/YMMine/View/Guild/Model/ClanInfoModel.h deleted file mode 100644 index 5093b75..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/ClanInfoModel.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// ClanInfoModel.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface ClanInfoModel : PIBaseModel -///家族id -@property (nonatomic, copy) NSString *cid; -/// 族长 uid -@property (nonatomic, copy) NSString *elderUid; -/// 族长音游号 -@property (nonatomic, copy) NSString *elderErbanNo; -/// 族长 名称 -@property (nonatomic, copy) NSString *elderName; -/// 家族 名称 -@property (nonatomic, copy) NSString *name; -///家族头像 -@property (nonatomic, copy) NSString *avatar; -///是否是家族族长 -@property (nonatomic, assign) BOOL userIsElder; -///家族等级图片 -@property (nonatomic, copy) NSString *levelIcon; -///是否有开通会员兑换权限的功能 -@property (nonatomic,assign) BOOL elderHasExchangeManagerAuth; -@property(nonatomic,copy) NSString *myFamilyUrl; -@property(nonatomic,copy) NSString *familyListUrl; -@property(nonatomic,copy) NSString *familyId; -@property(nonatomic,copy) NSString *ownerAvatar; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/ClanInfoModel.m b/YuMi/Modules/YMMine/View/Guild/Model/ClanInfoModel.m deleted file mode 100644 index 4714bd5..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/ClanInfoModel.m +++ /dev/null @@ -1,15 +0,0 @@ -// -// ClanInfoModel.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "ClanInfoModel.h" - -@implementation ClanInfoModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"cid":@"id"}; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/ClanMemberDetailInfoModel.h b/YuMi/Modules/YMMine/View/Guild/Model/ClanMemberDetailInfoModel.h deleted file mode 100644 index 2f0cfd2..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/ClanMemberDetailInfoModel.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// ClanMemberInfoModel.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import -#import "YUMINNNN.h" -#import "GuildInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@class ClanMemberInfoModel; -@interface ClanMemberDetailInfoModel : PIBaseModel -///总的个数 -@property (nonatomic,assign) NSInteger count; -///用户的实体 -@property (nonatomic,strong) NSArray *members; -@end - -@interface ClanMemberInfoModel : PIBaseModel -///头像 -@property (nonatomic,copy) NSString *avatar; -///平台id -@property (nonatomic,copy) NSString *erbanNo; -///性别 -@property (nonatomic,assign) GenderType gender; -///生日 -@property(nonatomic,assign) long birth; -///公会名称 -@property (nonatomic, copy) NSString *hallName; -///昵称 -@property (nonatomic,copy) NSString *nick; -///类型 -@property (nonatomic,assign) GuildRoleType roleType; -///用户的uid -@property (nonatomic,copy) NSString *uid; -//用户等级 -@property (nonatomic, copy) NSString *experUrl; -///魅力等级 -@property (nonatomic, copy) NSString *charmUrl; -@end - - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/ClanMemberDetailInfoModel.m b/YuMi/Modules/YMMine/View/Guild/Model/ClanMemberDetailInfoModel.m deleted file mode 100644 index a712df6..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/ClanMemberDetailInfoModel.m +++ /dev/null @@ -1,25 +0,0 @@ -// -// ClanMemberInfoModel.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "ClanMemberDetailInfoModel.h" - -@implementation ClanMemberDetailInfoModel -+ (NSDictionary *)objectClassInArray { - return @{@"members": ClanMemberInfoModel.class}; -} -@end - - -@implementation ClanMemberInfoModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"experUrl":@"userLevelVo.experUrl", - @"charmUrl":@"userLevelVo.charmUrl" - }; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/GuildAuthModel.h b/YuMi/Modules/YMMine/View/Guild/Model/GuildAuthModel.h deleted file mode 100644 index ec1712c..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/GuildAuthModel.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// GuildAuthModel.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// 公会房间权限 - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface GuildAuthModel : PIBaseModel -///标题 -@property (nonatomic, copy) NSString *name; -///描述 -@property (nonatomic, copy) NSString *des; -///授权码字段 -@property (nonatomic, copy) NSString *code; -///开关状态 staus为0表示未拥有此权限,status为1表示拥有此权限 -@property (nonatomic, assign) NSInteger status; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/GuildAuthModel.m b/YuMi/Modules/YMMine/View/Guild/Model/GuildAuthModel.m deleted file mode 100644 index f21a99e..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/GuildAuthModel.m +++ /dev/null @@ -1,14 +0,0 @@ -// -// GuildAuthModel.m -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "GuildAuthModel.h" - -@implementation GuildAuthModel -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"des":@"description"}; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/GuildInfoModel.h b/YuMi/Modules/YMMine/View/Guild/Model/GuildInfoModel.h deleted file mode 100644 index 1e2a5b2..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/GuildInfoModel.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// GuildInfoModel.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, GuildRoleType) { - ///会长 - GuildRoleType_Owner = 1, - ///管理 - GuildRoleType_Manager, - ///普通成员 - GuildRoleType_Normal, - ///族长 - GuildRoleType_Elder, - ///组长 房主 - GuildRoleType_Elder_Owner, - ///超管 - GuildRoleType_Super_Admin -}; - -@interface GuildInfoModel : PIBaseModel -///模厅id -@property (nonatomic, copy) NSString *hallId; -/// 模厅名称 -@property (nonatomic, copy) NSString *hallName; -///角色类型 -@property (nonatomic, assign) GuildRoleType roleType; -/// 厅主的 uid -@property (nonatomic, copy) NSString *ownerUid; -/// 厅主的 音游号 -@property (nonatomic, copy) NSString *ownerErbanNo; -/// 模厅名称 -@property (nonatomic, copy) NSString *ownerNick; -/// 模厅头像 -@property (nonatomic, copy) NSString *ownerAvatar; -/// 模厅成员数量 -@property (nonatomic, strong) NSNumber *memberCount; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/GuildInfoModel.m b/YuMi/Modules/YMMine/View/Guild/Model/GuildInfoModel.m deleted file mode 100644 index f01b7bc..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/GuildInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// GuildInfoModel.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "GuildInfoModel.h" - -@implementation GuildInfoModel - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/GuildMessageModel.h b/YuMi/Modules/YMMine/View/Guild/Model/GuildMessageModel.h deleted file mode 100644 index 7e79622..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/GuildMessageModel.h +++ /dev/null @@ -1,78 +0,0 @@ -// -// GuildMessageModel.h -// YuMi -// -// Created by YuMi on 2022/4/18. -// 公会消息的模型 - -#import - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, MessageGuildState) { - ///未处理 - MessageGuildState_Untreated = 1, - ///同意 - MessageGuildState_Agree, - ///拒绝 - MessageGuildState_Reject, - ///已过期 - MessageGuildState_OutData, - ///已处理 - MessageGuildState_Processed, -}; - -@class GuildMessageLayoutModel, GuildMessageRequestModel, GuildMessageLayoutInfoModel; -@interface GuildMessageModel : PIBaseModel - -@property (nonatomic,assign) MessageGuildState msgStatus; -///请求的时候需要的参数 -@property (nonatomic,strong) GuildMessageRequestModel *params; -///约束 -@property (nonatomic,strong) GuildMessageLayoutModel *layout; -///请求所需要用到的接口名称 -@property (strong, nonatomic) NSString *url; -///处理人 -@property (nonatomic,copy) NSString *approverNick; -///处理人的uid -@property (nonatomic,copy) NSString *approverUid; -/// 目前就跳转公会房间 类型的话 合并了代码之后在搞 -@property (nonatomic,assign) NSInteger routerType; -///公会的id -@property (nonatomic,assign) NSInteger routerValue; -@end - - -///约束的 -@interface GuildMessageLayoutModel : PIBaseModel -///显示的标题 -@property (nonatomic,strong) GuildMessageLayoutInfoModel *title; -///显示的时间 -@property (nonatomic,strong) GuildMessageLayoutInfoModel *time; -///显示的内容 -@property (nonatomic,strong) NSArray *contents; -@end - - -@interface GuildMessageLayoutInfoModel : PIBaseModel -///显示内容 -@property (strong, nonatomic) NSString *content; -///字体大小 -@property (nonatomic, assign) CGFloat fontSize; -///字体的颜色 -@property (strong, nonatomic) NSString *fontColor; -///是否是粗体 -@property (nonatomic,assign) BOOL fontBold; -///跳转的类型 -@property (assign, nonatomic) NSInteger routertype; -///类型的地址 -@property (strong, nonatomic) NSString *routerValue; -@end - -@interface GuildMessageRequestModel : PIBaseModel -///家族的id -@property (nonatomic,copy) NSString *familyId; -///用户的id -@property (nonatomic,copy) NSString *inviteId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/GuildMessageModel.m b/YuMi/Modules/YMMine/View/Guild/Model/GuildMessageModel.m deleted file mode 100644 index 3d09884..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/GuildMessageModel.m +++ /dev/null @@ -1,32 +0,0 @@ -// -// GuildMessageModel.m -// YuMi -// -// Created by YuMi on 2022/4/18. -// - -#import "GuildMessageModel.h" - -@implementation GuildMessageModel - -@end - - -@implementation GuildMessageLayoutModel - -+ (NSDictionary *)objectClassInArray { - return @{@"contents":GuildMessageLayoutInfoModel.class}; -} - -@end - -@implementation GuildMessageLayoutInfoModel - -@end - - -@implementation GuildMessageRequestModel - - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/GuildSearchUserInfoModel.h b/YuMi/Modules/YMMine/View/Guild/Model/GuildSearchUserInfoModel.h deleted file mode 100644 index 5d11037..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/GuildSearchUserInfoModel.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// GuildSearchUserInfoModel.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// 搜索平台成员 - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface GuildSearchUserInfoModel : PIBaseModel -///用户的uid -@property (nonatomic,copy) NSString *uid; -///生日 -@property(nonatomic,assign) long birth; -///头像 -@property (nonatomic,copy) NSString *avatar; -///昵称 -@property (nonatomic,copy) NSString *nick; -///性别 -@property (nonatomic,assign) GenderType gender; -///平台号 -@property (nonatomic,copy) NSString *erbanNo; -///按钮状态 0=不显示，4=可邀请，5=待通过，6=通过申请 -@property (nonatomic,assign) int hallBtnStatus; -/// integer($int64)当 hallBtnStatus=6 时，对应的申请记录Id -@property (nonatomic,assign) NSInteger hallRecordId; -///公会会话id -@property (nonatomic,copy) NSString *hallMessageUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/GuildSearchUserInfoModel.m b/YuMi/Modules/YMMine/View/Guild/Model/GuildSearchUserInfoModel.m deleted file mode 100644 index 19279be..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/GuildSearchUserInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// GuildSearchUserInfoModel.m -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "GuildSearchUserInfoModel.h" - -@implementation GuildSearchUserInfoModel - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeDetailModel.h b/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeDetailModel.h deleted file mode 100644 index 97b5441..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeDetailModel.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// GuildIncomeDetailModel.h -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface GuildIncomeDetailModel : PIBaseModel -///礼物名称 -@property (nonatomic,copy) NSString *giftName; -///礼物价值 -@property (nonatomic,copy) NSString *goldPrice; -///礼物图片 -@property (nonatomic,copy) NSString *picUrl; -///礼物个数 -@property (nonatomic,copy) NSString *giftNum; -///礼物id -@property (nonatomic,copy) NSString *giftId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeDetailModel.m b/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeDetailModel.m deleted file mode 100644 index e1e55ea..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeDetailModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// GuildIncomeDetailModel.m -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import "GuildIncomeDetailModel.h" - -@implementation GuildIncomeDetailModel - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeRecordModel.h b/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeRecordModel.h deleted file mode 100644 index cb039f4..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeRecordModel.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// GuildIncomeRecordModel.h -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildIncomeRecordUserInfoModel; -@interface GuildIncomeRecordModel : PIBaseModel -///总的价值 -@property (nonatomic,copy) NSString *total; -/// -@property (nonatomic,strong) NSArray *income; - -@end - -@interface GuildIncomeRecordUserInfoModel : PIBaseModel -///公会的头像 -@property (nonatomic,copy) NSString *hallAvatar; -///公会的昵称 -@property (nonatomic,copy) NSString *hallName; -///房间流水 -@property (nonatomic,copy) NSString * roomIncome; -///房间流水 -@property (nonatomic,copy) NSString * normalGiftIncome; -///房间流水 -@property (nonatomic,copy) NSString * bagIncome; -///新用户送礼人数 -@property (nonatomic, copy) NSString *userSendGiftNum; -///送礼人数 -@property (nonatomic, copy) NSString *giftUv; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeRecordModel.m b/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeRecordModel.m deleted file mode 100644 index 5c87dea..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeRecordModel.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// GuildIncomeRecordModel.m -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import "GuildIncomeRecordModel.h" - -@implementation GuildIncomeRecordModel -+ (NSDictionary *)objectClassInArray { - return @{@"income":GuildIncomeRecordUserInfoModel.class}; -} -@end - - -@implementation GuildIncomeRecordUserInfoModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"userSendGiftNum": @"newUserSendGiftNum" - }; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildPersonIncomeRecordModel.h b/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildPersonIncomeRecordModel.h deleted file mode 100644 index 06916f2..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildPersonIncomeRecordModel.h +++ /dev/null @@ -1,58 +0,0 @@ -// -// GuildPersonIncomeRecordModel.h -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildPersonIncomeUserInfoModel; -@interface GuildPersonIncomeRecordModel : PIBaseModel -///总共的价值 -@property (nonatomic,copy) NSString *total; -///数据源 -@property (nonatomic,strong) NSArray *vos; -@property (nonatomic,copy) NSArray *memberIncome; -///个播数据 -@property (nonatomic,strong) NSArray *incomes; -///个播收入查询 -@property (nonatomic,copy) NSString *totalDiamond; -@end - - -@interface GuildPersonIncomeUserInfoModel : PIBaseModel - - -@property (nonatomic,copy) NSString *uid; -@property (nonatomic,copy) NSString *income; -@property (nonatomic,copy) NSString *hallId; -@property (nonatomic,copy) NSString *hallOwnerUid; -@property (nonatomic,copy) NSString *hallAvatar; -@property (nonatomic,copy) NSString *hallName; -@property (nonatomic,copy) NSString *total; - - -///排名 -@property (nonatomic,copy) NSString *rowNum; -///接收者的uid -@property (nonatomic,copy) NSString *reciveUid; -///总的价值 -@property (nonatomic,copy) NSString *totalGoldNum; -///头像 -@property (nonatomic,copy) NSString *avatar; -///昵称 -@property (nonatomic,copy) NSString *nick; -///平台id -@property (nonatomic,copy) NSString *erbanNo; -#pragma mark - 个播收入查询 -///个播收入 -@property (nonatomic,copy) NSString *anchorDiamondNum; -///房间收入 -@property (nonatomic,copy) NSString *roomDiamondNum; - -@property(nonatomic,assign) NSInteger timeDuration; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildPersonIncomeRecordModel.m b/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildPersonIncomeRecordModel.m deleted file mode 100644 index 2e27c9b..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildPersonIncomeRecordModel.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// GuildPersonIncomeRecordModel.m -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import "GuildPersonIncomeRecordModel.h" - -@implementation GuildPersonIncomeRecordModel - -+ (NSDictionary *)objectClassInArray { - return @{@"vos":GuildPersonIncomeUserInfoModel.class, - @"incomes":GuildPersonIncomeUserInfoModel.class, - @"memberIncome":GuildPersonIncomeUserInfoModel.class - }; -} - -@end - - -@implementation GuildPersonIncomeUserInfoModel - - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildRoomInfoModel.h b/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildRoomInfoModel.h deleted file mode 100644 index d52183f..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildRoomInfoModel.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// GuildRoomInfoModel.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface GuildRoomInfoModel : PIBaseModel -@property (nonatomic,copy) NSString *hallRoomId; -///公会房间uid -@property (nonatomic,copy) NSString *hallRoomUid; -///公会房间头像 -@property (nonatomic,copy) NSString *hallAvatar; -///公会房间名字 -@property (nonatomic,copy) NSString *hallName; -///是否已经管理 -@property (nonatomic,assign) BOOL hasManage; -///房间的uid 公会超管设置返回的这个 -@property (nonatomic,copy) NSString *roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildRoomInfoModel.m b/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildRoomInfoModel.m deleted file mode 100644 index f3d2b69..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildRoomInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// GuildRoomInfoModel.m -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "GuildRoomInfoModel.h" - -@implementation GuildRoomInfoModel - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSearchSuperAdminModel.h b/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSearchSuperAdminModel.h deleted file mode 100644 index c424e6c..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSearchSuperAdminModel.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// GuildSearchSuperAdminModel.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface GuildSearchSuperAdminModel : PIBaseModel -///用户的uid -@property (nonatomic,copy) NSString *uid; -///平台id -@property (nonatomic,copy) NSString *erbanNo; -///昵称 -@property (nonatomic,copy) NSString *nick; -///头像 -@property (nonatomic,copy) NSString *avatar; -///性别 -@property (nonatomic,assign) GenderType gender; -///生日 -@property(nonatomic,assign) long birth; -///是否已经是超管 -@property (nonatomic,assign) BOOL hasSet; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSearchSuperAdminModel.m b/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSearchSuperAdminModel.m deleted file mode 100644 index 5dbbda6..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSearchSuperAdminModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// GuildSearchSuperAdminModel.m -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "GuildSearchSuperAdminModel.h" - -@implementation GuildSearchSuperAdminModel - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSuperAdminInfoModel.h b/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSuperAdminInfoModel.h deleted file mode 100644 index c2e4cdc..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSuperAdminInfoModel.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// GuildSuperAdminInfoModel.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import -#import "GuildRoomInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface GuildSuperAdminInfoModel : PIBaseModel -///uid -@property (nonatomic,copy) NSString *uid; -///平台id -@property (nonatomic,copy) NSString *erbanNo; -///头像 -@property (nonatomic,copy) NSString *avatar; -///昵称 -@property (nonatomic,copy) NSString *nick; -///管理的房间列表 -@property (nonatomic,strong) NSArray *roomList; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSuperAdminInfoModel.m b/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSuperAdminInfoModel.m deleted file mode 100644 index 0626d4d..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/SuperAdmin/GuildSuperAdminInfoModel.m +++ /dev/null @@ -1,14 +0,0 @@ -// -// GuildSuperAdminInfoModel.m -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "GuildSuperAdminInfoModel.h" - -@implementation GuildSuperAdminInfoModel -+ (NSDictionary *)objectClassInArray { - return @{@"roomList": GuildRoomInfoModel.class}; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildListModel.h b/YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildListModel.h deleted file mode 100644 index 0c4811b..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildListModel.h +++ /dev/null @@ -1,51 +0,0 @@ -// -// XPMineGuildListModel.h -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildListModel : PIBaseModel -///公会id -@property (nonatomic,assign) NSInteger clanId; -///公会长id -@property (nonatomic,assign) NSInteger clanElderUid; -/// 公会头像 -@property (nonatomic,copy) NSString *avatar; -/// 公会收入 -@property (nonatomic,assign) NSInteger income; -///公会等级 -@property (nonatomic,assign) NSInteger level; -///公会名 -@property (nonatomic,copy) NSString *name; -///公会等级图标 -@property (nonatomic,copy) NSString *levelIcon; -///0=不显示 1=可申请 2=已申请 -@property (nonatomic,assign) int applyBtnStatus; -///按钮状态 0=不显示，4=可邀请，5=待通过，6=通过申请 -@property (nonatomic,assign) int hallBtnStatus; -/// integer($int64)当 hallBtnStatus=6 时，对应的申请记录Id -@property (nonatomic,assign) NSInteger hallRecordId; -///公会会话id -@property (nonatomic,copy) NSString *hallMessageUid; -/// -@property (nonatomic,assign) NSInteger recordId; - -/*房间*/ - -///房间id -@property (nonatomic,assign) NSInteger hallId; - -/// 房间头像 -@property (nonatomic,copy) NSString *ownerAvatar; -@property (nonatomic,assign) NSInteger ownerUid; -@property (nonatomic,assign) NSInteger ownerErbanNo; -///房间名 -@property (nonatomic,copy) NSString *hallName; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildListModel.m b/YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildListModel.m deleted file mode 100644 index 62aa585..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildListModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// XPMineGuildListModel.m -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import "XPMineGuildListModel.h" - -@implementation XPMineGuildListModel - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildPersonalBillRecordModel.h b/YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildPersonalBillRecordModel.h deleted file mode 100644 index 5ce26d6..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildPersonalBillRecordModel.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// XPMineGuildPersonalBillRecordModel.h -// xplan-ios -// -// Created by duoban on 2023/7/28. -// - -#import -@class XPMineGuildPersonalBillRecordItemModel; -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildPersonalBillRecordModel : PIBaseModel -@property(nonatomic,copy) NSArray *income; -@property(nonatomic,copy) NSString *total; -@end -@interface XPMineGuildPersonalBillRecordItemModel : PIBaseModel -@property(nonatomic,copy) NSString *bagIncome; -@property(nonatomic,copy) NSString *giftUv; -@property(nonatomic,copy) NSString *hallAvatar; -@property(nonatomic,copy) NSString *hallName; -@property(nonatomic,copy) NSString *userNewSendGiftNum; -@property(nonatomic,copy) NSString *normalGiftIncome; -@property(nonatomic,copy) NSString *roomIncome; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildPersonalBillRecordModel.m b/YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildPersonalBillRecordModel.m deleted file mode 100644 index e65676c..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Model/XPMineGuildPersonalBillRecordModel.m +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPMineGuildPersonalBillRecordModel.m -// xplan-ios -// -// Created by duoban on 2023/7/28. -// - -#import "XPMineGuildPersonalBillRecordModel.h" - -@implementation XPMineGuildPersonalBillRecordModel -+ (NSDictionary *)objectClassInArray { - return @{@"income": XPMineGuildPersonalBillRecordItemModel.class}; -} -@end -@implementation XPMineGuildPersonalBillRecordItemModel -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"userNewSendGiftNum":@"newUserSendGiftNum"}; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomeDetailPresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomeDetailPresenter.h deleted file mode 100644 index 64e9fa1..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomeDetailPresenter.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPGuildIncomeDetailPresenter.h -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGuildIncomeDetailPresenter : BaseMvpPresenter -- (void)getUserIncomeDetailList:(NSString *)hallId memberId:(NSString *)memberId startTimeStr:(NSString *)startTimeStr endTimeStr:(NSString *)endTimeStr; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomeDetailPresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomeDetailPresenter.m deleted file mode 100644 index fb2528a..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomeDetailPresenter.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// XPGuildIncomeDetailPresenter.m -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import "XPGuildIncomeDetailPresenter.h" -#import "Api+Guild.h" -#import "GuildIncomeDetailModel.h" -#import "XPGuildIncomeDetailProtocol.h" -#import "AccountInfoStorage.h" -@implementation XPGuildIncomeDetailPresenter - - -- (void)getUserIncomeDetailList:(NSString *)hallId memberId:(NSString *)memberId startTimeStr:(NSString *)startTimeStr endTimeStr:(NSString *)endTimeStr { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getHallIncomeDetail:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [GuildIncomeDetailModel modelsWithArray:data.data]; - [[self getView] getUserIncomeDetailListSuccess:array]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getUserIncomeDetailListFail:msg]; - }] hallId:hallId memberId:memberId uid:uid startTimeStr:startTimeStr endTimeStr:endTimeStr]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomePresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomePresenter.h deleted file mode 100644 index 413360c..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomePresenter.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// XPGuildIncomePresenter.h -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGuildIncomePresenter : BaseMvpPresenter -/// 获取家族所有的收入记录 -/// @param clanId 家族的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -- (void)getClanTotalIncome:(NSString *)clanId startTime:(NSString *)startTime endTime:(NSString *)endTime; -/// 获取公会所有的收入记录 -/// @param hallId 公会的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -- (void)getHallTotalIncome:(NSString *)hallId startTime:(NSString *)startTime endTime:(NSString *)endTime; -/// 获取家族所有个播的收入记录 -/// @param clanId 家族的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -- (void)getClanAnchorTotalIncome:(NSString *)clanId startTime:(NSString *)startTime endTime:(NSString *)endTime; -/// 获取公会所有个播的收入记录 -/// @param hallId 家族的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -- (void)getHallAnchorTotalIncome:(NSString *)clanId startTime:(NSString *)startTime endTime:(NSString *)endTime; -/// 获取公会收入列表 -/// @param hallId 公会id -/// @param startTime 查询开始时间，时间格式为yy-mm-dd -/// @param endTime 查询开始时间, 时间格式为yy-mm-dd --(void)getGuildIncomeTotalListWithhallId:(NSString *)hallId startTime:(NSString *)startTime endTime:(NSString *)endTime; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomePresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomePresenter.m deleted file mode 100644 index 25b6d67..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Income/XPGuildIncomePresenter.m +++ /dev/null @@ -1,86 +0,0 @@ -// -// XPGuildIncomePresenter.m -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import "XPGuildIncomePresenter.h" -#import "Api+Guild.h" -#import "AccountInfoStorage.h" -#import "GuildIncomeRecordModel.h" -#import "GuildPersonIncomeRecordModel.h" -#import "XPGuildIncomeProtocol.h" -#import "XPMineGuildPersonalBillRecordModel.h" - -@implementation XPGuildIncomePresenter - - -/// 获取家族所有的收入记录 -/// @param clanId 家族的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -- (void)getClanTotalIncome:(NSString *)clanId startTime:(NSString *)startTime endTime:(NSString *)endTime { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getClanIncomeRecord:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - GuildIncomeRecordModel * incomeModel = [GuildIncomeRecordModel modelWithDictionary:data.data]; - [[self getView] getClanTotalIncomeScuess:incomeModel]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getClanTotalIncomeFail:msg]; - }] uid:uid clanId:clanId startTime:startTime endTime:endTime]; -} - -/// 获取公会所有的收入记录 -/// @param hallId 公会的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -- (void)getHallTotalIncome:(NSString *)hallId startTime:(NSString *)startTime endTime:(NSString *)endTime { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getGuildIncomeRecord:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - GuildPersonIncomeRecordModel * incomeModel = [GuildPersonIncomeRecordModel modelWithDictionary:data.data]; - [[self getView] getHallTotalIncomeScuess:incomeModel]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getHallTotalIncomeFail:msg]; - }] uid:uid hallId:hallId startTimeStr:startTime endTimeStr:endTime]; -} - -/// 获取家族所有个播的收入记录 -/// @param clanId 家族的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -- (void)getClanAnchorTotalIncome:(NSString *)clanId startTime:(NSString *)startTime endTime:(NSString *)endTime { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getClanSingleRoomIncomeRecord:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - GuildPersonIncomeRecordModel * incomeModel = [GuildPersonIncomeRecordModel modelWithDictionary:data.data]; - [[self getView] getClanAnchorTotalIncomeSuccess:incomeModel]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getClanAnchorTotalIncomeFail:msg]; - }] uid:uid hallId:clanId startTime:startTime endTime:endTime]; -} - -/// 获取公会所有个播的收入记录 -/// @param clanId 家族的id -/// @param startTime 开始时间 -/// @param endTime 结束时间 -- (void)getHallAnchorTotalIncome:(NSString *)clanId startTime:(NSString *)startTime endTime:(NSString *)endTime { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getHallSingleRoomIncomeRecord:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - GuildPersonIncomeRecordModel * incomeModel = [GuildPersonIncomeRecordModel modelWithDictionary:data.data]; - [[self getView] getHallAnchorTotalIncomeSuccess:incomeModel]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getHallAnchorTotalIncomeFail:msg]; - }] uid:uid clanId:clanId startTime:startTime endTime:endTime]; -} -/// 获取公会收入列表 -/// @param hallId 公会id -/// @param startTime 查询开始时间，时间格式为yy-mm-dd -/// @param endTime 查询开始时间, 时间格式为yy-mm-dd --(void)getGuildIncomeTotalListWithhallId:(NSString *)hallId startTime:(NSString *)startTime endTime:(NSString *)endTime{ - [Api getGuildIncomeTotalList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - XPMineGuildPersonalBillRecordModel *model = [XPMineGuildPersonalBillRecordModel modelWithDictionary:data.data]; - [[self getView]getGuildIncomeTotalListSuccess:model]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES] hallId:hallId startTime:startTime endTime:endTime]; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildManagerPerPresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildManagerPerPresenter.h deleted file mode 100644 index 6bbef49..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildManagerPerPresenter.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// XPGuildManagerPerPesenter.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGuildManagerPerPresenter : BaseMvpPresenter - -/// 获取房间管理权限 -/// @param managerUid 管理uid -- (void)getGuildRoomManagerPermiss:(NSString *)managerUid; - -/// 更新公会房间管理的权限 -/// @param hallId 公会的id -/// @param managerUid 管理的uid -/// @param authStr 更新的权限 -- (void)updateGuildRoomManagerPermiss:(NSString *)hallId managerUid:(NSString *)managerUid authStr:(NSString *)authStr; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildManagerPerPresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildManagerPerPresenter.m deleted file mode 100644 index 1e06314..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildManagerPerPresenter.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// XPGuildManagerPerPesenter.m -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "XPGuildManagerPerPresenter.h" -#import "Api+Guild.h" -#import "AccountInfoStorage.h" -#import "GuildAuthModel.h" -#import "XPGuildManagerPerProtocol.h" - - -@implementation XPGuildManagerPerPresenter - - -/// 获取房间管理权限 -/// @param managerUid 管理uid -- (void)getGuildRoomManagerPermiss:(NSString *)managerUid { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api guildManagerAuthCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [GuildAuthModel modelsWithArray:data.data]; - [[self getView] getGuildRoomManagerPermissSuccess:array]; - }] uid:uid managerUid:managerUid]; -} - - -/// 更新公会房间管理的权限 -/// @param hallId 公会的id -/// @param managerUid 管理的uid -/// @param authStr 更新的权限 -- (void)updateGuildRoomManagerPermiss:(NSString *)hallId managerUid:(NSString *)managerUid authStr:(NSString *)authStr{ - NSString * uid = [AccountInfoStorage instance].getUid; - [Api setGuildManagerAuthCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] updateGuildRoomManagerPermissSuccess]; - }] uid:uid managerUid:managerUid hallId:hallId authStr:authStr]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildMangerListPresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildMangerListPresenter.h deleted file mode 100644 index 2f3d5de..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildMangerListPresenter.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPGuildMangerListPresenter.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGuildMangerListPresenter : BaseMvpPresenter -/// 获取公会管理列表 -/// @param hallId 公会的id -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param state 0下拉 1 上啦 -- (void)getGuildRoomManagerList:(NSString *)hallId page:(int)page pageSize:(int)pageSize state:(int)state; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildMangerListPresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildMangerListPresenter.m deleted file mode 100644 index b6c5ef6..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildMangerListPresenter.m +++ /dev/null @@ -1,31 +0,0 @@ -// -// XPGuildMangerListPresenter.m -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "XPGuildMangerListPresenter.h" -#import "XPGuildManagerListProtocol.h" -#import "Api+Guild.h" -#import "ClanMemberDetailInfoModel.h" - -@implementation XPGuildMangerListPresenter - -/// 获取公会管理列表 -/// @param hallId 公会的id -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param state 0下拉 1 上啦 -- (void)getGuildRoomManagerList:(NSString *)hallId page:(int)page pageSize:(int)pageSize state:(int)state{ - NSString * pageStr = [NSString stringWithFormat:@"%d", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize]; - [Api getGuildRoomManagerCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ClanMemberDetailInfoModel * info = [ClanMemberDetailInfoModel modelWithDictionary:data.data]; - [[self getView] getGuildRoomManagerListSuccess:info state:state]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getGuildRoomManagerListFail:msg state:state]; - }] hallId:hallId page:pageStr pageSize:pageSizeStr]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildRemoveMemberPresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildRemoveMemberPresenter.h deleted file mode 100644 index 1f7c947..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildRemoveMemberPresenter.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// XPGuildRemoveMemberPresenter.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGuildRemoveMemberPresenter : BaseMvpPresenter -/// 获取公会成员列表 -/// @param hallId 公会id -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param state 状态 -- (void)getGuildMemberList:(NSString *)hallId page:(int)page pageSize:(NSInteger)pageSize state:(int)state; -/// 移除公会成员 -/// @param targetUid 目标用户的uid -/// @param hallId 公会的id -- (void)removeGuildMember:(NSString *)targetUid hallId:(NSString *)hallId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildRemoveMemberPresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildRemoveMemberPresenter.m deleted file mode 100644 index bd6594c..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildRemoveMemberPresenter.m +++ /dev/null @@ -1,42 +0,0 @@ -// -// XPGuildRemoveMemberPresenter.m -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "XPGuildRemoveMemberPresenter.h" -#import "AccountInfoStorage.h" -#import "ClanMemberDetailInfoModel.h" -#import "Api+Guild.h" -#import "XPGuildRemoveMemberProtocol.h" - -@implementation XPGuildRemoveMemberPresenter -/// 获取公会成员列表 -/// @param hallId 公会id -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param state 状态 -- (void)getGuildMemberList:(NSString *)hallId page:(int)page pageSize:(NSInteger)pageSize state:(int)state { - NSString * pageStr = [NSString stringWithFormat:@"%d", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%ld", pageSize]; - [Api getGuildMemberList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ClanMemberDetailInfoModel * memberInfo = [ClanMemberDetailInfoModel modelWithDictionary:data.data]; - [[self getView] getGuildMemberListSuccess:memberInfo state:state]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getGuildMemberListFail:msg state:state]; - }] hallId:hallId page:pageStr pageSize:pageSizeStr]; -} - - -/// 移除公会成员 -/// @param targetUid 目标用户的uid -/// @param hallId 公会的id -- (void)removeGuildMember:(NSString *)targetUid hallId:(NSString *)hallId { - NSString *uid = [AccountInfoStorage instance].getUid; - [Api removeGuildMemberCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] removeGuildMemberSuccess]; - } showLoading:YES] uid:uid targetUid:targetUid hallId:hallId]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildSetNamePresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildSetNamePresenter.h deleted file mode 100644 index 3e5979d..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildSetNamePresenter.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPGuildSetNamePresenter.h -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGuildSetNamePresenter : BaseMvpPresenter - -- (void)updateGuildRoomName:(NSString *)roomName hallId:(NSString *)hallId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildSetNamePresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildSetNamePresenter.m deleted file mode 100644 index 5356d94..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPGuildSetNamePresenter.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// XPGuildSetNamePresenter.m -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import "XPGuildSetNamePresenter.h" -#import "AccountInfoStorage.h" -#import "Api+Guild.h" -#import "XPGuildSetNameProtocol.h" - -@implementation XPGuildSetNamePresenter - -- (void)updateGuildRoomName:(NSString *)roomName hallId:(NSString *)hallId { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api updateGuildRoomName:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] updateGuildRoomNameSuccess]; - } showLoading:YES] hallName:roomName hallId:hallId uid:uid]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPMineManagerSetPresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPMineManagerSetPresenter.h deleted file mode 100644 index d59366b..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPMineManagerSetPresenter.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// XPMineManagerSetPresenter.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineManagerSetPresenter : BaseMvpPresenter -/// 获取公会成员列表 -/// @param hallId 公会id -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param state 状态 -- (void)getGuildMemberList:(NSString *)hallId page:(int)page pageSize:(NSInteger)pageSize state:(int)state; -/// 设置管理员 -/// @param targetUid 目标用户的uid -/// @param hallId 公会的id -- (void)guildRoomAddManager:(NSString *)targetUid hallId:(NSString *)hallId; - -/// 移除管理员 -/// @param targetUid 目标用户的uid -/// @param hallId 公会的id -- (void)guildRoomRemoveManager:(NSString *)targetUid hallId:(NSString *)hallId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPMineManagerSetPresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPMineManagerSetPresenter.m deleted file mode 100644 index 8fcc6a2..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/Setting/XPMineManagerSetPresenter.m +++ /dev/null @@ -1,52 +0,0 @@ -// -// XPMineManagerSetPresenter.m -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "XPMineManagerSetPresenter.h" -#import "Api+Guild.h" -#import "ClanMemberDetailInfoModel.h" -#import "XPGuildSetManagerProtocol.h" -#import "AccountInfoStorage.h" - -@implementation XPMineManagerSetPresenter - -/// 获取公会成员列表 -/// @param hallId 公会id -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param state 状态 -- (void)getGuildMemberList:(NSString *)hallId page:(int)page pageSize:(NSInteger)pageSize state:(int)state { - NSString * pageStr = [NSString stringWithFormat:@"%d", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%ld", pageSize]; - [Api getGuildMemberList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ClanMemberDetailInfoModel * memberInfo = [ClanMemberDetailInfoModel modelWithDictionary:data.data]; - [[self getView] getGuildMemberListSuccess:memberInfo state:state]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getGuildMemberListFail:msg state:state]; - }] hallId:hallId page:pageStr pageSize:pageSizeStr]; -} - -/// 设置管理员 -/// @param targetUid 目标用户的uid -/// @param hallId 公会的id -- (void)guildRoomAddManager:(NSString *)targetUid hallId:(NSString *)hallId { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api guildRoomSetManagerCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] guildRoomAddManagerSuccess:targetUid]; - } showLoading:YES] hallId:hallId uid:uid targetUid:targetUid]; -} - -/// 移除管理员 -/// @param targetUid 目标用户的uid -/// @param hallId 公会的id -- (void)guildRoomRemoveManager:(NSString *)targetUid hallId:(NSString *)hallId { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api guildRoomCancelManagerCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] guildRoomRemoveManagerSuccess:targetUid]; - } showLoading:YES] hallId:hallId uid:uid targetUid:targetUid]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminManagerRoomPresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminManagerRoomPresenter.h deleted file mode 100644 index 0625479..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminManagerRoomPresenter.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// XPSuperAdminManagerRoomPresenter.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSuperAdminManagerRoomPresenter : BaseMvpPresenter - -/// 获取公会所有的房间列表 -/// @param clanId 家族id -/// @param targetUid 目标用户的uid -- (void)getGuildRoomList:(NSString *)clanId targetUid:(NSString *)targetUid; - -/// 公会超管设置管理的房间 -/// @param array 房间的uid -/// @param targetUid 目标用户的uid -- (void)guildSuperAdminManagerRoomList:(NSArray *)array targetUid:(NSString *)targetUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminManagerRoomPresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminManagerRoomPresenter.m deleted file mode 100644 index db62b94..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminManagerRoomPresenter.m +++ /dev/null @@ -1,36 +0,0 @@ -// -// XPSuperAdminManagerRoomPresenter.m -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "XPSuperAdminManagerRoomPresenter.h" -#import "Api+Guild.h" -#import "GuildRoomInfoModel.h" -#import "XPSuperAdminManagerRoomProtocol.h" - -@implementation XPSuperAdminManagerRoomPresenter - -/// 获取公会所有的房间列表 -/// @param clanId 家族id -/// @param targetUid 目标用户的uid -- (void)getGuildRoomList:(NSString *)clanId targetUid:(NSString *)targetUid { - [Api getHallSuperAdminManagerRoomList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [GuildRoomInfoModel modelsWithArray:data.data]; - [[self getView] getGuildRoomListSuccess:array]; - }] clanId:clanId uid:targetUid]; -} - -/// 公会超管设置管理的房间 -/// @param array 房间的uid -/// @param targetUid 目标用户的uid -- (void)guildSuperAdminManagerRoomList:(NSArray *)array targetUid:(NSString *)targetUid { - NSString * roomUids = @""; - roomUids = [array componentsJoinedByString:@","]; - [Api setSuperAdminManagerRoom:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] guildSuperAdminManagerRoomListSuccess]; - } showLoading:YES] roomUids:roomUids uid:targetUid]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminSetPresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminSetPresenter.h deleted file mode 100644 index 99ae6e9..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminSetPresenter.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPSuperAdminSetPresenter.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSuperAdminSetPresenter : BaseMvpPresenter - -/// 获取家族超管 -/// @param clanId 家族id -- (void)getClanSuperAdminList:(NSString *)clanId; - - -/// 移除超管 -/// @param targetUid 目标用户的uid -- (void)removeSuperAdmin:(NSString *)targetUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminSetPresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminSetPresenter.m deleted file mode 100644 index 71b5ef9..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/SuperAdmin/XPSuperAdminSetPresenter.m +++ /dev/null @@ -1,33 +0,0 @@ -// -// XPSuperAdminSetPresenter.m -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "XPSuperAdminSetPresenter.h" -#import "Api+Guild.h" -#import "GuildSuperAdminInfoModel.h" -#import "XPSuperAdminSetProtocol.h" - -@implementation XPSuperAdminSetPresenter - -/// 获取家族超管 -/// @param clanId 家族id -- (void)getClanSuperAdminList:(NSString *)clanId { - [Api getClanSuperAdminList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [GuildSuperAdminInfoModel modelsWithArray:data.data]; - [[self getView] getClanSuperAdminListSuccess:array]; - }] clanId:clanId]; -} - - -/// 移除超管 -/// @param targetUid 目标用户的uid -- (void)removeSuperAdmin:(NSString *)targetUid { - [Api clanRemoveSuperAdmin:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] removeSuperAdminSuccess:targetUid]; - }showLoading:YES] targetUid:targetUid]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/XPClanPresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/XPClanPresenter.h deleted file mode 100644 index 99523df..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/XPClanPresenter.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// XPClanPresenter.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN -@class XPMineExchangeAuthorityModel; - -@interface XPClanPresenter : BaseMvpPresenter -/// 获取会长和当前用户家族详细的信息 -/// @param uid 用户的uid -- (void)getClanDetailInfo:(NSString *)uid currentUserUid:(NSString *)currentUserUid; -/// 获取家族成员的列表 -/// @param uid 族长的uid -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -- (void)getClanMemberList:(NSString *)uid page:(int)page pageSize:(NSInteger)pageSize state:(int)state; - -/// 获取当前家族房间的列表 -/// @param clanId 族长的id -- (void)getClanRoomList:(NSString *)clanId; -///房主金币明细 --(void)getClanRoomGoldList:(NSString *)startTime endTime:(NSString *)endTime; -///房主获取兑换权限列表 --(void)getClanRoomMemberAuthorityList; -///关闭或开启会员兑换权限 --(void)masterDisableRrEnablememberExchangeRights:(NSString *)status targetUid:(NSString *)targetUid model:(XPMineExchangeAuthorityModel *)model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/XPClanPresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/XPClanPresenter.m deleted file mode 100644 index c0202e9..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/XPClanPresenter.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// XPClanPresenter.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "XPClanPresenter.h" -#import -#import "XPClanProtocol.h" -#import "Api+Guild.h" -#import "ClanDetailInfoModel.h" -#import "ClanMemberDetailInfoModel.h" -#import "XPIncomeRecordGoldDetailsModel.h" -#import "XPMineExchangeAuthorityModel.h" - -@implementation XPClanPresenter - -/// 获取会长和当前用户家族详细的信息 -/// @param uid 用户的uid -- (void)getClanDetailInfo:(NSString *)uid currentUserUid:(NSString *)currentUserUid { - RACSubject* owner = [RACSubject subject]; - RACSubject* currentUser = [RACSubject subject]; - - [[RACSignal combineLatest:@[owner, currentUser] reduce:^id(ClanDetailInfoModel* ownerClanInfo, ClanDetailInfoModel* currentUserClanInfo){ - [[self getView] getClanDetailInfoSuccess:ownerClanInfo currentUserClanInfo:currentUserClanInfo]; - return nil; - }] subscribeError:^(NSError * _Nullable error) { - - }]; - - [Api getClanDetailInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ClanDetailInfoModel * clanDetailInfo = [ClanDetailInfoModel modelWithDictionary:data.data]; - [currentUser sendNext:clanDetailInfo]; - [currentUser sendCompleted]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [currentUser sendNext:nil]; - [currentUser sendCompleted]; - }] uid:currentUserUid]; - - [Api getClanDetailInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ClanDetailInfoModel * clanDetailInfo = [ClanDetailInfoModel modelWithDictionary:data.data]; - [owner sendNext:clanDetailInfo]; - [owner sendCompleted]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [owner sendNext:nil]; - [owner sendCompleted]; - }] uid:uid]; -} - -/// 获取家族成员的列表 -/// @param uid 族长的uid -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -- (void)getClanMemberList:(NSString *)uid page:(int)page pageSize:(NSInteger)pageSize state:(int)state { - NSString * pageStr = [NSString stringWithFormat:@"%d", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%ld", pageSize]; - [Api getClanMemberList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ClanMemberDetailInfoModel * model= [ClanMemberDetailInfoModel modelWithDictionary:data.data]; - [[self getView] getClanMemberListSuccess:model state:state]; - }] uid:uid page:pageStr pageSize:pageSizeStr]; -} - -/// 获取当前家族房间的列表 -/// @param clanId 族长的id -- (void)getClanRoomList:(NSString *)clanId { - [Api getRoomListInClan:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [GuildInfoModel modelsWithArray:data.data]; - [[self getView] getClanRoomListSuccess:array]; - }] clanId:clanId]; -} --(void)getClanRoomGoldList:(NSString *)startTime endTime:(NSString *)endTime{ - [Api getClanRoomGoldsList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - XPIncomeRecordGoldDetailsModel *model = [XPIncomeRecordGoldDetailsModel modelWithDictionary:data.data]; - [[self getView]getClanRoomGoldsListSuccess:model]; - }] startTime:startTime endTime:endTime]; -} -///房主获取兑换权限列表 --(void)getClanRoomMemberAuthorityList{ - [Api getClanRoomMemberAuthorityList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *list = [XPMineExchangeAuthorityModel modelsWithArray:data.data]; - [[self getView]getClanRoomMemberAuthorityListSuccess:list]; - }showLoading:YES errorToast:YES]]; -} -///关闭或开启会员兑换权限 --(void)masterDisableRrEnablememberExchangeRights:(NSString *)status targetUid:(NSString *)targetUid model:(XPMineExchangeAuthorityModel *)model{ - [Api requestMasterDisableRrEnablememberExchangeRights:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView]getExchangeAuthorityResultSuccess:model status:status]; - }showLoading:YES errorToast:YES] status:status targetUid:targetUid]; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildPresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildPresenter.h deleted file mode 100644 index 44eb908..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildPresenter.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// XPGuildPresenter.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGuildPresenter : BaseMvpPresenter -/// 获取公会成员列表 -/// @param hallId 公会id -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param state 状态 -- (void)getGuildMemberList:(NSString *)hallId page:(int)page pageSize:(NSInteger)pageSize state:(int)state; - -/// 获取会长和当前用户家族详细的信息 -/// @param uid 用户的uid -- (void)getClanDetailInfo:(NSString *)uid currentUserUid:(NSString *)currentUserUid; - -/// 获取当前房间操作的权限 -/// @param hallId 完成 -- (void)getUserInGuildRoomAuth:(NSString *)hallId; - -/// 邀请用户加入公会 -/// @param targetUid 邀请的用户id -/// @param hallId 公会的id -- (void)inviteMember:(NSString *)targetUid hallId:(NSString *)hallId; - -/// 退出公会房间 -- (void)quitGuildRoom; -///加入房间 --(void)applyHallWithHallId:(NSString *)hallId; -///加入房间按钮状态 --(void)applyHallBtnStateWithHallId:(NSString *)hallId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildPresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildPresenter.m deleted file mode 100644 index 8f86e96..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildPresenter.m +++ /dev/null @@ -1,113 +0,0 @@ -// -// XPGuildPresenter.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "XPGuildPresenter.h" -#import -#import "Api+Guild.h" -#import "AccountInfoStorage.h" -#import "ClanMemberDetailInfoModel.h" -#import "ClanDetailInfoModel.h" -#import "XPGuildProtocol.h" -#import "GuildAuthModel.h" -#import "XPMineGuildListModel.h" - -@implementation XPGuildPresenter - - -/// 获取公会成员列表 -/// @param hallId 公会id -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param state 状态 -- (void)getGuildMemberList:(NSString *)hallId page:(int)page pageSize:(NSInteger)pageSize state:(int)state { - NSString * pageStr = [NSString stringWithFormat:@"%d", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%ld", pageSize]; - [Api getGuildMemberList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ClanMemberDetailInfoModel * memberInfo = [ClanMemberDetailInfoModel modelWithDictionary:data.data]; - [[self getView] getGuildMemberListSuccess:memberInfo state:state]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getGuildMemberListFail:msg state:state]; - }] hallId:hallId page:pageStr pageSize:pageSizeStr]; -} - -/// 获取会长和当前用户家族详细的信息 -/// @param uid 用户的uid -- (void)getClanDetailInfo:(NSString *)uid currentUserUid:(NSString *)currentUserUid { - RACSubject* owner = [RACSubject subject]; - RACSubject* currentUser = [RACSubject subject]; - - [[RACSignal combineLatest:@[owner, currentUser] reduce:^id(ClanDetailInfoModel* ownerClanInfo, ClanDetailInfoModel* currentUserClanInfo){ - [[self getView] getClanDetailInfoSuccess:ownerClanInfo currentUserClanInfo:currentUserClanInfo]; - return nil; - }] subscribeError:^(NSError * _Nullable error) { - - }]; - - [Api getClanDetailInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ClanDetailInfoModel * clanDetailInfo = [ClanDetailInfoModel modelWithDictionary:data.data]; - [currentUser sendNext:clanDetailInfo]; - [currentUser sendCompleted]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [currentUser sendNext:nil]; - [currentUser sendCompleted]; - }] uid:currentUserUid]; - - [Api getClanDetailInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ClanDetailInfoModel * clanDetailInfo = [ClanDetailInfoModel modelWithDictionary:data.data]; - [owner sendNext:clanDetailInfo]; - [owner sendCompleted]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [owner sendNext:nil]; - [owner sendCompleted]; - }] uid:uid]; -} - -/// 获取当前房间操作的权限 -/// @param hallId 完成 -- (void)getUserInGuildRoomAuth:(NSString *)hallId { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getGuildRoomAuth:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [GuildAuthModel modelsWithArray:data.data]; - [[self getView] getUserInGuildRoomAuthSuccess:array]; - }] hallId:hallId uid:uid]; -} - -/// 邀请用户加入公会 -/// @param targetUid 邀请的用户id -/// @param hallId 公会的id -- (void)inviteMember:(NSString *)targetUid hallId:(NSString *)hallId { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api inviteMemberCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] inviteMemeberSuccessWithTargetUid:targetUid]; - } showLoading:YES] hallId:hallId uid:uid targetUid:targetUid]; -} - -/// 退出公会房间 -- (void)quitGuildRoom { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api quitGuildRoom:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] quitGuildRoomSuccess]; - } showLoading:YES] uid:uid]; -} -///加入房间 --(void)applyHallWithHallId:(NSString *)hallId{ - NSString *uid = [AccountInfoStorage instance].getUid; - [Api memberApplyHall:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView]applyHallSuccess]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView]applyHallFail]; - }showLoading:YES] hallId:hallId uid:uid]; -} --(void)applyHallBtnStateWithHallId:(NSString *)hallId{ - [Api applyHallBtnStateWithHallId:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - XPMineGuildListModel *model = [XPMineGuildListModel modelWithDictionary:data.data]; - [[self getView]applyHallBtnStateSuccess:model]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:NO errorToast:NO] hallId:hallId]; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildSearchPresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildSearchPresenter.h deleted file mode 100644 index c189412..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildSearchPresenter.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// XPGuildSearchPresenter.h -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGuildSearchPresenter : BaseMvpPresenter -/// 搜索家族成员 -/// @param uid 族长的uid -/// @param key 搜索的关键词 -- (void)searchClanMemberList:(NSString *)uid key:(NSString *)key; - -/// 公会添加成员 搜索用户 -/// @param key 搜索的关键词 -- (void)guildAddMemberSearch:(NSString *)key; - -/// 添加公会超管 -/// @param key 搜索的id -- (void)searchGuildSuperAdmin:(NSString *)key; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildSearchPresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildSearchPresenter.m deleted file mode 100644 index 4fbd835..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/XPGuildSearchPresenter.m +++ /dev/null @@ -1,54 +0,0 @@ -// -// XPGuildSearchPresenter.m -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import "XPGuildSearchPresenter.h" -#import "Api+Guild.h" -#import "XPGuildSearchProtocol.h" -#import "ClanMemberDetailInfoModel.h" -#import "GuildSearchUserInfoModel.h" -#import "GuildSearchSuperAdminModel.h" -#import "AccountInfoStorage.h" -@implementation XPGuildSearchPresenter - -/// 搜索家族成员 -/// @param uid 族长的uid -/// @param key 搜索的关键词 -- (void)searchClanMemberList:(NSString *)uid key:(NSString *)key { - NSString * pageStr = @"1"; - NSString * pageSizeStr = @"50"; - [Api searchClanMemberList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ClanMemberDetailInfoModel * memberInfo = [ClanMemberDetailInfoModel modelWithDictionary:data.data]; - [[self getView] searchClanMemberListSuccess:memberInfo.members]; - } showLoading:YES] uid:uid page:pageStr pageSize:pageSizeStr queryStr:key]; -} - - -/// 公会添加成员 搜索用户 -/// @param key 搜索的关键词 -- (void)guildAddMemberSearch:(NSString *)key { - [Api guildSearchUserCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [GuildSearchUserInfoModel modelsWithArray:data.data]; - [[self getView] guildAddMemberSearchSuccess:array]; - } showLoading:YES] key:key type:@"2" page:@"1" pageSize:@"50"]; -} - -/// 添加公会超管 -/// @param key 搜索的id -- (void)searchGuildSuperAdmin:(NSString *)key { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api searchGuildSuperAdmin:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - GuildSearchSuperAdminModel * info = [GuildSearchSuperAdminModel modelWithDictionary:data.data]; - if (info) { - [[self getView] searchGuildSuperAdminSuccess:@[info]]; - } else { - [[self getView] searchGuildSuperAdminSuccess:@[]]; - } - } showLoading:YES] uid:uid erbanNo:key]; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/XPMineGuildPresenter.h b/YuMi/Modules/YMMine/View/Guild/Presenter/XPMineGuildPresenter.h deleted file mode 100644 index 5083330..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/XPMineGuildPresenter.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// XPMineGuildPresenter.h -// YuMi -// -// Created by YuMi on 2022/10/12. -// - -#import -#import "BaseMvpPresenter.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildPresenter : BaseMvpPresenter -///請求公會列表 --(void)getGuildListData; -///请示公会房间 --(void)getRoomListData; -///申请公会 --(void)applyClanWithClanId:(NSString *)clanId; -///申请房间 --(void)applyHallWithHallId:(NSString *)hallId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Presenter/XPMineGuildPresenter.m b/YuMi/Modules/YMMine/View/Guild/Presenter/XPMineGuildPresenter.m deleted file mode 100644 index 74748d7..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Presenter/XPMineGuildPresenter.m +++ /dev/null @@ -1,51 +0,0 @@ -// -// XPMineGuildPresenter.m -// YuMi -// -// Created by YuMi on 2022/10/12. -// - -#import "XPMineGuildPresenter.h" -///Api -#import "Api+Mine.h" -#import "Api+Guild.h" -#import "AccountInfoStorage.h" -///Model -#import "XPMineGuildListModel.h" -///Protocol -#import "XPMineGuildProtocol.h" -@implementation XPMineGuildPresenter -- (id)getView { - return ((id) [super getView]); -} -///請求公會列表 --(void)getGuildListData{ - [Api requestMineGuildList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - NSArray *array = [XPMineGuildListModel modelsWithArray:data.data]; - [[self getView]onGetMineGuildListSuccess:array]; - }]; -} --(void)getRoomListData{ - [Api requestMineRoomList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - NSArray *array = [XPMineGuildListModel modelsWithArray:data.data]; - [[self getView]onGetMineRoomListSuccess:array]; - }]; -} --(void)applyClanWithClanId:(NSString *)clanId{ - NSString *uid = [AccountInfoStorage instance].getUid; - - [Api applyClanWith:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView]applyClanSuccess]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView]applyClanFail]; - }] uid:uid clanId:clanId]; -} --(void)applyHallWithHallId:(NSString *)hallId{ - NSString *uid = [AccountInfoStorage instance].getUid; - [Api memberApplyHall:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView]applyHallSuccess]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView]applyHallFail]; - }] hallId:hallId uid:uid]; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/Income/XPGuildIncomeDetailProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/Income/XPGuildIncomeDetailProtocol.h deleted file mode 100644 index 0ded643..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/Income/XPGuildIncomeDetailProtocol.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPGuildIncomeDetailProtocol.h -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPGuildIncomeDetailProtocol - -- (void)getUserIncomeDetailListSuccess:(NSArray *)array; -- (void)getUserIncomeDetailListFail:(NSString *)msg; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/Income/XPGuildIncomeProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/Income/XPGuildIncomeProtocol.h deleted file mode 100644 index e58c671..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/Income/XPGuildIncomeProtocol.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// XPGuildIncomeProtocol.h -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildIncomeRecordModel, GuildPersonIncomeRecordModel,XPMineGuildPersonalBillRecordModel; -@protocol XPGuildIncomeProtocol - -///获取家族所有的收入记录成功 -- (void)getClanTotalIncomeScuess:(GuildIncomeRecordModel *)incomeInfo; -///获取家族所有的收入记录失败 -- (void)getClanTotalIncomeFail:(NSString *)msg; -///获取公会所有成员收入记录 -- (void)getHallTotalIncomeScuess:(GuildPersonIncomeRecordModel *)incomeInfo; -///获取公会所有成员收入失败 -- (void)getHallTotalIncomeFail:(NSString *)msg; -///获取家族所有个播收入成功 -- (void)getClanAnchorTotalIncomeSuccess:(GuildPersonIncomeRecordModel *)incomeInfo; -///获取家族所有个播收入失败 -- (void)getClanAnchorTotalIncomeFail:(NSString *)msg; -///获取公会所有个播收入成功 -- (void)getHallAnchorTotalIncomeSuccess:(GuildPersonIncomeRecordModel *)incomeInfo; -///获取公会所有个播收入失败 -- (void)getHallAnchorTotalIncomeFail:(NSString *)msg; -//获取得公会房间收入成功 --(void)getGuildIncomeTotalListSuccess:(XPMineGuildPersonalBillRecordModel *)model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildManagerListProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildManagerListProtocol.h deleted file mode 100644 index ce6a68b..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildManagerListProtocol.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPGuildManagerListProtocol.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class ClanMemberDetailInfoModel; -@protocol XPGuildManagerListProtocol - -- (void)getGuildRoomManagerListSuccess:(ClanMemberDetailInfoModel *)memberInfo state:(int)state; -- (void)getGuildRoomManagerListFail:(NSString *)msg state:(int)state; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildManagerPerProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildManagerPerProtocol.h deleted file mode 100644 index 3bc991a..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildManagerPerProtocol.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// XPGuildManagerPerProtocol.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPGuildManagerPerProtocol - -///获取房间管理权限列表成功 -- (void)getGuildRoomManagerPermissSuccess:(NSArray *)array; - -///更新权限成功 -- (void)updateGuildRoomManagerPermissSuccess; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildRemoveMemberProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildRemoveMemberProtocol.h deleted file mode 100644 index e592015..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildRemoveMemberProtocol.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPGuildRemoveMemberProtocol.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPGuildRemoveMemberProtocol -- (void)getGuildMemberListSuccess:(ClanMemberDetailInfoModel *)memberInfo state:(int)state; -- (void)getGuildMemberListFail:(NSString *)msg state:(int)state; - -///移除公会成员成功 -- (void)removeGuildMemberSuccess; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildSetManagerProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildSetManagerProtocol.h deleted file mode 100644 index e2c6fc1..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildSetManagerProtocol.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// XPGuildSetManagerProtocol.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPGuildSetManagerProtocol -- (void)getGuildMemberListSuccess:(ClanMemberDetailInfoModel *)memberInfo state:(int)state; -- (void)getGuildMemberListFail:(NSString *)msg state:(int)state; - -/// 添加管理成功 -- (void)guildRoomAddManagerSuccess:(NSString *)targetUid; -/// 移除管理成功 -- (void)guildRoomRemoveManagerSuccess:(NSString *)targetUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildSetNameProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildSetNameProtocol.h deleted file mode 100644 index 7aa2d31..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/Setting/XPGuildSetNameProtocol.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPGuildSetNameProtocol.h -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPGuildSetNameProtocol - -- (void)updateGuildRoomNameSuccess; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/SuperAdmin/XPSuperAdminManagerRoomProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/SuperAdmin/XPSuperAdminManagerRoomProtocol.h deleted file mode 100644 index c6a9cab..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/SuperAdmin/XPSuperAdminManagerRoomProtocol.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPSuperAdminManagerRoomProtocol.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPSuperAdminManagerRoomProtocol - -///获取公会房间列表成功 -- (void)getGuildRoomListSuccess:(NSArray *)array; -///设置房间管理管理的房间成功 -- (void)guildSuperAdminManagerRoomListSuccess; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/SuperAdmin/XPSuperAdminSetProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/SuperAdmin/XPSuperAdminSetProtocol.h deleted file mode 100644 index 62317ec..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/SuperAdmin/XPSuperAdminSetProtocol.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPSuperAdminSetProtocol.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPSuperAdminSetProtocol - -///获取家族超管成功 -- (void)getClanSuperAdminListSuccess:(NSArray *)list; -///移除超管成功 -- (void)removeSuperAdminSuccess:(NSString *)uid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/XPClanProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/XPClanProtocol.h deleted file mode 100644 index 067bd16..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/XPClanProtocol.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPClanProtocol.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import -#import "ClanDetailInfoModel.h" -NS_ASSUME_NONNULL_BEGIN -@class ClanDetailInfoModel, ClanMemberDetailInfoModel,XPIncomeRecordGoldDetailsModel,XPMineExchangeAuthorityModel,XPMineExchangeAuthorityModel; -@protocol XPClanProtocol -@optional -///获取家族详情成功 -- (void)getClanDetailInfoSuccess:(ClanDetailInfoModel *)clanDetailInfo currentUserClanInfo:(ClanDetailInfoModel *)currentUserClanInfo; -///获取公会成员列表成功 -- (void)getClanMemberListSuccess:(ClanMemberDetailInfoModel *)memberInfo state:(int)state; -///获取公会房间的列表 -- (void)getClanRoomListSuccess:(NSArray *)array; -///获取公会房间房主金币明细 --(void)getClanRoomGoldsListSuccess:(XPIncomeRecordGoldDetailsModel *)model; -///获取房主兑换权限列表 --(void)getClanRoomMemberAuthorityListSuccess:(NSArray *)list; -///开启或关闭兑换会员 --(void)getExchangeAuthorityResultSuccess:(XPMineExchangeAuthorityModel *)model status:(NSString *)status; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/XPGuildProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/XPGuildProtocol.h deleted file mode 100644 index 35a75dd..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/XPGuildProtocol.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// XPGuildProtocol.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class ClanMemberDetailInfoModel,ClanDetailInfoModel,XPMineGuildListModel; -@protocol XPGuildProtocol - -- (void)getGuildMemberListSuccess:(ClanMemberDetailInfoModel *)memberInfo state:(int)state; -- (void)getGuildMemberListFail:(NSString *)msg state:(int)state; - -///获取家族详情成功 -- (void)getClanDetailInfoSuccess:(ClanDetailInfoModel *)clanDetailInfo currentUserClanInfo:(ClanDetailInfoModel *)currentUserClanInfo; -///获取用户在公会房间权限成功 -- (void)getUserInGuildRoomAuthSuccess:(NSArray *)authList; -///邀请成功 -- (void)inviteMemeberSuccessWithTargetUid:(NSString *)targetUid; -///退出公会成功 -- (void)quitGuildRoomSuccess; -///加入房间成功 --(void)applyHallSuccess; -///加入房间失败 --(void)applyHallFail; -///获取加入房间成功 --(void)applyHallBtnStateSuccess:(XPMineGuildListModel *)model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/XPGuildSearchProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/XPGuildSearchProtocol.h deleted file mode 100644 index 2eb02e6..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/XPGuildSearchProtocol.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// XPGuildSearchProtocol.h -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPGuildSearchProtocol - -///搜索公会成员成功 -- (void)searchClanMemberListSuccess:(NSArray *)memberList; -///公会添加成员 搜索用户 -- (void)guildAddMemberSearchSuccess:(NSArray *)memberList; -///搜索添加公会超管 -- (void)searchGuildSuperAdminSuccess:(NSArray *)memberList; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/Protocol/XPMineGuildProtocol.h b/YuMi/Modules/YMMine/View/Guild/Protocol/XPMineGuildProtocol.h deleted file mode 100644 index a19870b..0000000 --- a/YuMi/Modules/YMMine/View/Guild/Protocol/XPMineGuildProtocol.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// XPMineGuildProtocol.h -// YuMi -// -// Created by YuMi on 2022/10/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class XPMineGuildListModel; - -@protocol XPMineGuildProtocol -///获取公会列表 --(void)onGetMineGuildListSuccess:(NSArray *)list; -///获取公会房间列表 --(void)onGetMineRoomListSuccess:(NSArray *)list; -///申请加入公会成功 --(void)applyClanSuccess; -///申请加入公会失败 --(void)applyClanFail; - -///申请加入房间成功 --(void)applyHallSuccess; -///申请加入房间失败 --(void)applyHallFail; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.h deleted file mode 100644 index 2fb73dd..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// XPMineExchangeAuthorityCell.h -// YuMi -// -// Created by YuMi on 2023/2/13. -// - -#import -#import "XPMineExchangeAuthorityModel.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol XPMineExchangeAuthorityCellDelegate - --(void)openExchangeAuthoritySwiftStatus:(NSString *)status model:(XPMineExchangeAuthorityModel *)model; - -@end - - - -@interface XPMineExchangeAuthorityCell : UITableViewCell -///数据源 -@property (nonatomic,strong) XPMineExchangeAuthorityModel *authorityModel; -/// -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.m deleted file mode 100644 index 1f48974..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.m +++ /dev/null @@ -1,363 +0,0 @@ -// -// XPMineExchangeAuthorityCell.m -// YuMi -// -// Created by YuMi on 2023/2/13. -// - -#import "XPMineExchangeAuthorityCell.h" -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -@interface XPMineExchangeAuthorityCell() -///头像 -@property (nonatomic,strong) NetImageView *headView; -///昵称 -@property (nonatomic,strong) UILabel *nameView; -///昵称的容器 -@property (nonatomic,strong) UIStackView *nickStackView; -///性别 -@property (nonatomic,strong) UIButton *sexImageView; -///魅力等级 -@property (nonatomic,strong) NetImageView *charmImageView; -///等级 -@property (nonatomic,strong) NetImageView *experImageView; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///id -@property (nonatomic,strong) UILabel *idView; -///第一个分割线 -@property (nonatomic,strong) UIView *firstLineView; -///房间名 -@property (nonatomic,strong) UILabel *roomView; -///第二个分割线 -@property (nonatomic,strong) UIView *secondLineView; -///金币数量 -@property (nonatomic,strong) UILabel *goldView; -///兑换按钮 -@property (nonatomic,strong) UIButton *exchangeBtn; -///分割线 -@property (nonatomic,strong) UIView *lineView; -@end -@implementation XPMineExchangeAuthorityCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.contentView.backgroundColor = [UIColor whiteColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.headView]; - [self.contentView addSubview:self.nickStackView]; - [self.contentView addSubview:self.stackView]; - [self.contentView addSubview:self.exchangeBtn]; - [self.contentView addSubview:self.lineView]; - [self.contentView addSubview:self.firstLineView]; - [self.contentView addSubview:self.secondLineView]; - - [self.nickStackView addArrangedSubview:self.nameView]; - [self.nickStackView addArrangedSubview:self.sexImageView]; - [self.nickStackView addArrangedSubview:self.experImageView]; - [self.nickStackView addArrangedSubview:self.charmImageView]; - - [self.stackView addArrangedSubview:self.idView]; - [self.stackView addArrangedSubview:self.roomView]; - [self.stackView addArrangedSubview:self.goldView]; -} -- (void)initSubViewConstraints { - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(12)); - make.width.height.mas_equalTo(kGetScaleWidth(50)); - make.centerY.equalTo(self.contentView); - }]; - [self.exchangeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.width.mas_equalTo(kGetScaleWidth(68)); - make.height.mas_equalTo(kGetScaleWidth(24)); - make.centerY.equalTo(self.contentView); - }]; - - [self.nickStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(70)); - make.top.mas_equalTo(kGetScaleWidth(21)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.width.mas_lessThanOrEqualTo(kGetScaleWidth(215)); - }]; - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(2)); - make.height.mas_equalTo(14); - make.width.mas_equalTo(28); - make.bottom.mas_equalTo(0); - }]; - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(22)); - }]; - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(22)); - }]; - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.nameView); - make.trailing.mas_equalTo(-kGetScaleWidth(90)); - make.top.mas_equalTo(kGetScaleWidth(45)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - [self.goldView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_greaterThanOrEqualTo(10); - }]; - [self.firstLineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.idView.mas_trailing).mas_offset(kGetScaleWidth(3)); - make.centerY.equalTo(self.idView); - make.width.mas_equalTo(kGetScaleWidth(1)); - make.height.mas_equalTo(kGetScaleWidth(8)); - }]; - - [self.secondLineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.roomView.mas_trailing).mas_offset(kGetScaleWidth(3)); - make.centerY.equalTo(self.roomView); - make.width.mas_equalTo(kGetScaleWidth(1)); - make.height.mas_equalTo(kGetScaleWidth(8)); - }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(1)); - }]; -} --(void)setAuthorityModel:(XPMineExchangeAuthorityModel *)authorityModel{ - _authorityModel = authorityModel; - _headView.imageUrl = _authorityModel.avatar; - _idView.text = [NSString stringWithFormat:@"ID:%ld",_authorityModel.erbanNo]; - NSString * hallName = _authorityModel.hallName; - if (hallName.length > 5) { - hallName = [NSString stringWithFormat:@"%@...", [hallName substringToIndex:5]]; - } - _roomView.text = hallName; - _exchangeBtn.selected = _authorityModel.exchangeAuthStatus == 0; - _goldView.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineExchangeAuthorityCell2"),_authorityModel.golds]; - NSString * nick = _authorityModel.nick; - if (nick.length > 8) { - nick = [NSString stringWithFormat:@"%@...", [nick substringToIndex:8]]; - } - _nameView.text = nick; - - [self.sexImageView setTitle:[NSString getAgeWithBirth:_authorityModel.birth] forState:UIControlStateNormal]; - self.sexImageView.backgroundColor = _authorityModel.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.titleEdgeInsets = _authorityModel.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.sexImageView.selected = _authorityModel.gender != GenderType_Male; - if (_authorityModel.userLevelVo.experUrl) { - if (self.experImageView.state == NetImageStateLoaded) { - self.experImageView.imageUrl = _authorityModel.userLevelVo.experUrl; - CGFloat kImageScale = self.experImageView.image.size.width / self.experImageView.image.size.height; - CGFloat imageWidth = 17 * kImageScale; - [self.experImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(imageWidth); - }]; - } else { - @kWeakify(self); - [self.experImageView loadImageWithUrl:_authorityModel.userLevelVo.experUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - self.experImageView.image = image; - CGFloat kImageScale = image.size.width / image.size.height; - CGFloat imageWidth = 17 * kImageScale; - [self.experImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(imageWidth); - }]; - }]; - } - } - self.experImageView.hidden = _authorityModel.userLevelVo.experUrl.length <= 0; - - if (_authorityModel.userLevelVo.charmUrl) { - if (self.charmImageView.state == NetImageStateLoaded) { - self.charmImageView.imageUrl = _authorityModel.userLevelVo.charmUrl; - CGFloat kImageScale = self.charmImageView.image.size.width / self.charmImageView.image.size.height; - CGFloat imageWidth = 17 * kImageScale; - [self.charmImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(imageWidth); - }]; - } else { - @kWeakify(self); - [self.charmImageView loadImageWithUrl:_authorityModel.userLevelVo.charmUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - self.charmImageView.image = image; - CGFloat kImageScale = image.size.width / image.size.height; - CGFloat imageWidth = 17 * kImageScale; - [self.charmImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(imageWidth); - }]; - }]; - } - } - self.charmImageView.hidden = _authorityModel.userLevelVo.charmUrl.length <= 0; -} --(void)exchangeAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(openExchangeAuthoritySwiftStatus:model:)]){ - [self.delegate openExchangeAuthoritySwiftStatus:self.exchangeBtn.selected ? @"1":@"0" model:self.authorityModel]; - } -} -#pragma mark -懒加载 -- (NetImageView *)headView{ - if (!_headView){ - NetImageConfig *config = [NetImageConfig new]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _headView = [[NetImageView alloc]initWithConfig:config]; - _headView.layer.cornerRadius = kGetScaleWidth(25); - _headView.layer.masksToBounds = YES; - } - return _headView; -} - -- (UILabel *)nameView { - if (!_nameView) { - _nameView = [[UILabel alloc] init]; - _nameView.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _nameView.textColor = UIColorFromRGB(0x1F1B4F); - } - return _nameView; -} - --(UIStackView *)stackView{ - if (!_stackView){ - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = kGetScaleWidth(7); - } - return _stackView; -} - -- (UILabel *)idView { - if (!_idView) { - _idView = [[UILabel alloc] init]; - _idView.font = [UIFont systemFontOfSize:10]; - _idView.textColor = UIColorFromRGB(0x6D6B89); - } - return _idView; -} - --(UIView *)firstLineView{ - if (!_firstLineView){ - _firstLineView = [UIView new]; - _firstLineView.backgroundColor = UIColorFromRGB(0xD8D8D8); - } - return _firstLineView; -} - -- (UILabel *)roomView { - if (!_roomView) { - _roomView = [[UILabel alloc] init]; - _roomView.font = [UIFont systemFontOfSize:10]; - _roomView.textColor = UIColorFromRGB(0x6D6B89); - } - return _roomView; -} - --(UIView *)secondLineView{ - if (!_secondLineView){ - _secondLineView = [UIView new]; - _secondLineView.backgroundColor = UIColorFromRGB(0xD8D8D8); - } - return _secondLineView; -} - -- (UILabel *)goldView { - if (!_goldView) { - _goldView = [[UILabel alloc] init]; - _goldView.font = [UIFont systemFontOfSize:10]; - _goldView.textColor = UIColorFromRGB(0x6D6B89); - } - return _goldView; -} - --(UIButton *)exchangeBtn{ - if (!_exchangeBtn){ - _exchangeBtn = [UIButton new]; - _exchangeBtn.titleLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium]; - UIImage *normalImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xE6E6F0),UIColorFromRGB(0xE6E6F0),UIColorFromRGB(0xE6E6F0)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(68), kGetScaleWidth(24))]; - [_exchangeBtn setBackgroundImage:normalImage forState:UIControlStateNormal]; - [_exchangeBtn setTitle:YMLocalizedString(@"XPMineExchangeAuthorityCell1") forState:UIControlStateNormal]; - [_exchangeBtn setTitleColor:UIColorFromRGB(0xB3B3C3) forState:UIControlStateNormal]; - - UIImage *selectedImage = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(68), kGetScaleWidth(24))]; - [_exchangeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - [_exchangeBtn setBackgroundImage:selectedImage forState:UIControlStateSelected]; - [_exchangeBtn setTitle:YMLocalizedString(@"XPMineExchangeAuthorityCell0") forState:UIControlStateSelected]; - _exchangeBtn.layer.cornerRadius = kGetScaleWidth(12); - _exchangeBtn.layer.masksToBounds = YES; - [_exchangeBtn addTarget:self action:@selector(exchangeAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _exchangeBtn; -} --(UIView *)lineView{ - if (!_lineView){ - _lineView = [UIView new]; - _lineView.backgroundColor = UIColorFromRGB(0xF3F5FA); - } - return _lineView; -} -- (UIButton *)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; - } - return _sexImageView; -} - -- (NetImageView *)experImageView { - if (!_experImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _experImageView = [[NetImageView alloc] initWithConfig:config]; - _experImageView.userInteractionEnabled = YES; - _experImageView.hidden = YES; - _experImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _experImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - _charmImageView.userInteractionEnabled = YES; - _charmImageView.hidden = YES; - _charmImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _charmImageView; -} -- (UIStackView *)nickStackView { - if (!_nickStackView) { - _nickStackView = [[UIStackView alloc] init]; - _nickStackView.axis = UILayoutConstraintAxisHorizontal; - _nickStackView.distribution = UIStackViewDistributionFill; - _nickStackView.alignment = UIStackViewAlignmentFill; - _nickStackView.spacing = kGetScaleWidth(5); - } - return _nickStackView; -} -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityFooderView.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityFooderView.h deleted file mode 100644 index d0cad0d..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityFooderView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPMineExchangeAuthorityFooderView.h -// YuMi -// -// Created by YuMi on 2023/2/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineExchangeAuthorityFooderView : UITableViewHeaderFooterView -/// -@property (nonatomic,copy) NSString *title; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityFooderView.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityFooderView.m deleted file mode 100644 index 81ac98e..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityFooderView.m +++ /dev/null @@ -1,54 +0,0 @@ -// -// XPMineExchangeAuthorityFooderView.m -// YuMi -// -// Created by YuMi on 2023/2/13. -// - -#import "XPMineExchangeAuthorityFooderView.h" -///Third -#import -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -@interface XPMineExchangeAuthorityFooderView() -///标题 -@property (nonatomic,strong) UILabel *titleView; -@end -@implementation XPMineExchangeAuthorityFooderView - --(instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier{ - self = [super initWithReuseIdentifier:reuseIdentifier]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.contentView.backgroundColor = UIColorFromRGB(0xF3F5FA); - [self.contentView addSubview:self.titleView]; -} -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.equalTo(self.contentView); - }]; -} --(void)setTitle:(NSString *)title{ - _title = title; - _titleView.text = _title; - -} -#pragma mark -懒加载 -- (UILabel *)titleView { - if (!_titleView) { - _titleView = [[UILabel alloc] init]; - _titleView.font = [UIFont systemFontOfSize:12]; - _titleView.textColor = [DJDKMIMOMColor disableButtonTextColor]; - _titleView.text = YMLocalizedString(@"XPMineExchangeAuthorityFooderView0"); - } - return _titleView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityHeadView.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityHeadView.h deleted file mode 100644 index cd0cd64..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityHeadView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPMineExchangeAuthorityHeadView.h -// YuMi -// -// Created by YuMi on 2023/2/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineExchangeAuthorityHeadView : UITableViewHeaderFooterView -/// -@property (nonatomic,copy) NSString *title; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityHeadView.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityHeadView.m deleted file mode 100644 index e4db0d6..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityHeadView.m +++ /dev/null @@ -1,51 +0,0 @@ -// -// XPMineExchangeAuthorityHeadView.m -// YuMi -// -// Created by YuMi on 2023/2/13. -// - -#import "XPMineExchangeAuthorityHeadView.h" -///Third -#import -#import "DJDKMIMOMColor.h" -@interface XPMineExchangeAuthorityHeadView() -///标题 -@property (nonatomic,strong) UILabel *titleView; -@end -@implementation XPMineExchangeAuthorityHeadView - --(instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier{ - self = [super initWithReuseIdentifier:reuseIdentifier]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.contentView.backgroundColor = UIColorFromRGB(0xECE4FF); - [self.contentView addSubview:self.titleView]; -} -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.centerY.equalTo(self.contentView); - }]; -} --(void)setTitle:(NSString *)title{ - _title = title; - _titleView.text = _title; -} -#pragma mark -懒加载 -- (UILabel *)titleView { - if (!_titleView) { - _titleView = [[UILabel alloc] init]; - _titleView.font = [UIFont systemFontOfSize:15]; - _titleView.textColor = UIColorFromRGB(0x6D6B89); - } - return _titleView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.h deleted file mode 100644 index 6ceead1..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPMinePromptWindow.h -// YuMi -// -// Created by YuMi on 2023/2/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef void(^ConfirmHandler)(void); - -@interface XPMinePromptWindow : UIView -@property (nonatomic,copy) ConfirmHandler confirmHandler; -/// -@property (nonatomic,copy) NSString * name; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.m deleted file mode 100644 index e432aff..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.m +++ /dev/null @@ -1,169 +0,0 @@ -// -// XPMinePromptWindow.m -// YuMi -// -// Created by YuMi on 2023/2/13. -// - -#import "XPMinePromptWindow.h" -///Third -#import -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" -#import "UIImage+Utils.h" -#import "UIView+Corner.h" -#import "YUMIMacroUitls.h" -@interface XPMinePromptWindow() -///背景 -@property (nonatomic,strong) UIView *bgView; -///标题 -@property (nonatomic,strong) UILabel *titleView; -///内容 -@property (nonatomic,strong) UILabel *messageView; - -///取消 -@property (nonatomic,strong) UIButton *cancelBtn; -///确认 -@property (nonatomic,strong) UIButton *confirmBtn; -///返回 -@property (nonatomic,strong) UIButton *backBtn; -@end -@implementation XPMinePromptWindow - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} --(void)setName:(NSString *)name{ - _name = name; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"mine_guild_warning"]; - attachment.bounds = CGRectMake(0, roundf(_messageView.font.capHeight - kGetScaleWidth(16))/2.f, kGetScaleWidth(16), kGetScaleWidth(16)); - attachment.image = iconImage; - NSString *getName = [NSString stringWithFormat:YMLocalizedString(@"XPMinePromptWindow1"),_name]; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@" %@",getName] attributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F),NSFontAttributeName:[UIFont systemFontOfSize:14]}]; - [textAtt setAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14],NSForegroundColorAttributeName:UIColorFromRGB(0x9168FA)} range:[textAtt.string rangeOfString:_name]]; - [textAtt insertAttributedString:[NSMutableAttributedString attributedStringWithAttachment:attachment] atIndex:0]; - _messageView.attributedText = textAtt; -} --(void)backAction{ - [TTPopup dismiss]; -} --(void)confirmAction{ - if(self.confirmHandler){ - self.confirmHandler(); - } - [self backAction]; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgView]; - [self.bgView addSubview:self.backBtn]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.messageView]; - [self.bgView addSubview:self.cancelBtn]; - [self.bgView addSubview:self.confirmBtn]; -} -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(310)); - make.height.mas_equalTo(kGetScaleWidth(196)); - make.center.equalTo(self); - }]; - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(22)); - make.top.mas_equalTo(kGetScaleWidth(10)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(25)); - make.centerX.equalTo(self.bgView); - }]; - - [self.messageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(67)); - make.trailing.mas_equalTo(-kGetScaleWidth(20)); - make.leading.mas_equalTo(kGetScaleWidth(20)); - }]; - - - [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(110)); - make.height.mas_equalTo(kGetScaleWidth(37)); - make.leading.mas_equalTo(kGetScaleWidth(31)); - make.top.mas_equalTo(kGetScaleWidth(129)); - }]; - [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.top.equalTo(self.cancelBtn); - make.trailing.mas_equalTo(-kGetScaleWidth(31)); - }]; -} -#pragma mark -懒加载 -- (UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(12) rightTopCorner:kGetScaleWidth(12) bottomLeftCorner:kGetScaleWidth(12) bottomRightCorner:kGetScaleWidth(12) size:CGSizeMake(kGetScaleWidth(310), kGetScaleWidth(196))]; - _bgView.backgroundColor = [UIColor whiteColor]; - } - return _bgView; -} --(UIButton *)backBtn{ - if (!_backBtn){ - _backBtn = [UIButton new]; - [_backBtn setBackgroundImage:[UIImage imageNamed:@"mine_guild_close"] forState:UIControlStateNormal]; - [_backBtn addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} - - -- (UILabel *)titleView { - if (!_titleView) { - _titleView = [[UILabel alloc] init]; - _titleView.font = [UIFont systemFontOfSize:17 weight:UIFontWeightMedium]; - _titleView.textColor = UIColorFromRGB(0x1F1B4F); - _titleView.text = YMLocalizedString(@"XPMinePromptWindow0"); - } - return _titleView; -} - --(UILabel *)messageView{ - if (!_messageView){ - _messageView = [UILabel new]; - _messageView.textAlignment = NSTextAlignmentCenter; - _messageView.numberOfLines = 0; - _messageView.font = [UIFont systemFontOfSize:14]; - - } - return _messageView; -} --(UIButton *)cancelBtn{ - if (!_cancelBtn){ - _cancelBtn = [UIButton new]; - [_cancelBtn setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateNormal]; - [_cancelBtn setTitle:YMLocalizedString(@"XPMinePromptWindow2") forState:UIControlStateNormal]; - _cancelBtn.backgroundColor = UIColorFromRGB(0xE6E6F0); - _cancelBtn.layer.cornerRadius = kGetScaleWidth(37)/2; - _cancelBtn.layer.masksToBounds = YES; - [_cancelBtn addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _cancelBtn; -} --(UIButton *)confirmBtn{ - if (!_confirmBtn){ - _confirmBtn = [UIButton new]; - [_confirmBtn setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - _confirmBtn.layer.cornerRadius = kGetScaleWidth(37)/2; - _confirmBtn.layer.masksToBounds = YES; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(110), kGetScaleWidth(37))]; - [_confirmBtn setBackgroundImage:image forState:UIControlStateNormal]; - [_confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_confirmBtn addTarget:self action:@selector(confirmAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _confirmBtn; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/GuildList/XPMineGuildListCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/GuildList/XPMineGuildListCell.h deleted file mode 100644 index 80cd332..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/GuildList/XPMineGuildListCell.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPMineGuildListCell.h -// YuMi -// -// Created by YuMi on 2022/10/11. -// - -#import -#import "XPMineGuildListModel.h" - -NS_ASSUME_NONNULL_BEGIN -@protocol XPMineGuildListCellDelegate - --(void)applyActionWithModel:(id)guildModel; - -@end - -@interface XPMineGuildListCell : UITableViewCell -@property(nonatomic,strong)XPMineGuildListModel *guildModel; -@property(nonatomic,strong)XPMineGuildListModel *hallModel; -@property (nonatomic,assign) NSInteger rankNum; -@property (nonatomic,weak) id delegate; -@property (nonatomic,assign) BOOL isFromHall; --(void)setApplyBtnType:(BOOL)is; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/GuildList/XPMineGuildListCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/GuildList/XPMineGuildListCell.m deleted file mode 100644 index 571eed3..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/GuildList/XPMineGuildListCell.m +++ /dev/null @@ -1,328 +0,0 @@ -// -// XPMineGuildListCell.m -// YuMi -// -// Created by YuMi on 2022/10/11. -// - -#import "XPMineGuildListCell.h" -///Third -#import -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "NetImageView.h" -#import "XNDJTDDLoadingTool.h" -@interface XPMineGuildListCell() -///名次icon -@property (nonatomic,strong) UIImageView *rankingIcon; -///名次title -@property (nonatomic,strong) UILabel *rankingTilte; -///公會 名 -@property (nonatomic,strong) UILabel *nameLabel; -///房间id -@property (nonatomic,strong) UILabel *roomIdLabel; -///公會標識 -@property (nonatomic,strong) NetImageView *guildIcon; -///公會頭像 -@property (nonatomic,strong) NetImageView *headIcon; -///申请按钮 -@property (nonatomic,strong) UIButton *applyBtn; -@end - -@implementation XPMineGuildListCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.rankingIcon]; - [self.contentView addSubview:self.rankingTilte]; - [self.contentView addSubview:self.headIcon]; - [self.contentView addSubview:self.nameLabel]; - [self.contentView addSubview:self.roomIdLabel]; - [self.contentView addSubview:self.guildIcon]; - [self.contentView addSubview:self.applyBtn]; -} -- (void)initSubViewConstraints { - [self.rankingIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(22)); - make.leading.mas_equalTo(kGetScaleWidth(12)); - make.centerY.equalTo(self.contentView); - }]; - [self.headIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(40)); - make.leading.equalTo(self.rankingIcon.mas_trailing).mas_offset(kGetScaleWidth(10)); - make.centerY.equalTo(self.contentView); - }]; - [self.rankingTilte mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.headIcon); - make.centerX.equalTo(self.rankingIcon); - }]; - - [self.guildIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(29)); - make.trailing.mas_equalTo(-kGetScaleWidth(91)); - make.centerY.equalTo(self.contentView); - }]; - [self.applyBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(70)); - make.height.mas_equalTo(kGetScaleWidth(25)); - make.centerY.equalTo(self.contentView); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - }]; -} --(void)setApplyBtnType:(BOOL)is{ - if(self.guildModel == nil){ - switch (_hallModel.hallBtnStatus) { - case 0: - { - _applyBtn.hidden = YES; - break; - } - case 1: - { - [_applyBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _applyBtn.backgroundColor = [UIColor clearColor]; - [_applyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_applyBtn setTitle:YMLocalizedString(@"XPMineGuildListCell0") forState:UIControlStateNormal]; - _applyBtn.hidden = NO; - break; - } - case 2: - { - [_applyBtn setTitle:YMLocalizedString(@"XPMineGuildListCell5") forState:UIControlStateNormal]; - _applyBtn.backgroundColor = UIColorFromRGB(0xE6E6F0); - [_applyBtn setTitleColor:UIColorFromRGB(0xB3B3C3) forState:UIControlStateNormal]; - [_applyBtn setBackgroundImage:nil forState:UIControlStateNormal]; - _applyBtn.hidden = NO; - break; - } - case 3: - { - [_applyBtn setTitle:YMLocalizedString(@"XPMineGuildListCell6") forState:UIControlStateNormal]; - _applyBtn.backgroundColor = UIColorFromRGB(0xFFBC51); - [_applyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_applyBtn setBackgroundImage:nil forState:UIControlStateNormal]; - _applyBtn.hidden = NO; - break; - } - default: - break; - } - - - - return; - } - self.applyBtn.selected = is; -} - --(void)applyAction{ - - if(self.guildModel == nil){ - if(self.delegate && [self.delegate respondsToSelector:@selector(applyActionWithModel:)]){ - [self.delegate applyActionWithModel:self.hallModel]; - } - - return; - - } - if(self.guildModel.applyBtnStatus == 0)return; - if(self.guildModel.applyBtnStatus == 2){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMineGuildListCell2")]; - return; - } - if(self.delegate && [self.delegate respondsToSelector:@selector(applyActionWithModel:)]){ - [self.delegate applyActionWithModel:self.guildModel]; - - } - -} --(void)setHallModel:(XPMineGuildListModel *)hallModel{ - _hallModel = hallModel; - _headIcon.imageUrl = _hallModel.ownerAvatar; - _nameLabel.text = _hallModel.hallName; - _guildIcon.hidden = YES; - _roomIdLabel.hidden = NO; - _roomIdLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildListCell3"),_hallModel.ownerErbanNo]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self.headIcon.mas_centerY).mas_offset(-kGetScaleWidth(3.5)); - make.leading.equalTo(self.headIcon.mas_trailing).mas_offset(kGetScaleWidth(8)); - make.trailing.mas_equalTo(-kGetScaleWidth(130)); - - }]; - [self.roomIdLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.nameLabel); - make.top.equalTo(self.nameLabel.mas_bottom).mas_offset(kGetScaleWidth(7)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - - - switch (_hallModel.hallBtnStatus) { - case 0: - { - _applyBtn.hidden = YES; - break; - } - case 1: - { - [_applyBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _applyBtn.backgroundColor = [UIColor clearColor]; - [_applyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_applyBtn setTitle:YMLocalizedString(@"XPMineGuildListCell0") forState:UIControlStateNormal]; - _applyBtn.hidden = NO; - break; - } - case 2: - { - [_applyBtn setTitle:YMLocalizedString(@"XPMineGuildListCell5") forState:UIControlStateNormal]; - _applyBtn.backgroundColor = UIColorFromRGB(0xE6E6F0); - [_applyBtn setTitleColor:UIColorFromRGB(0xB3B3C3) forState:UIControlStateNormal]; - [_applyBtn setBackgroundImage:nil forState:UIControlStateNormal]; - _applyBtn.hidden = NO; - break; - } - case 3: - { - [_applyBtn setTitle:YMLocalizedString(@"XPMineGuildListCell6") forState:UIControlStateNormal]; - _applyBtn.backgroundColor = UIColorFromRGB(0xFFBC51); - [_applyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_applyBtn setBackgroundImage:nil forState:UIControlStateNormal]; - _applyBtn.hidden = NO; - break; - } - default: - break; - } - - - -} --(void)setGuildModel:(XPMineGuildListModel *)guildModel{ - _guildModel = guildModel; - _headIcon.imageUrl = _guildModel.avatar; - _nameLabel.text = _guildModel.name; - _guildIcon.imageUrl = _guildModel.levelIcon; - self.applyBtn.hidden = NO; - _roomIdLabel.hidden = YES; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.headIcon); - make.leading.equalTo(self.headIcon.mas_trailing).mas_offset(kGetScaleWidth(8)); - make.trailing.mas_equalTo(-kGetScaleWidth(130)); - - }]; - - if(_guildModel.applyBtnStatus == 0){ - self.applyBtn.hidden = YES; - [_guildIcon mas_updateConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - }]; - return; - } - self.applyBtn.selected = _guildModel.applyBtnStatus == 1; -} --(void)setIsFromHall:(BOOL)isFromHall{ - _isFromHall = isFromHall; - if(_isFromHall == YES){ - self.applyBtn.hidden = YES; - [self.guildIcon mas_updateConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - }]; - } - -} --(void)setRankNum:(NSInteger)rankNum{ - _rankNum = rankNum; - if (_rankNum < 3){ - _rankingIcon.hidden = NO; - _rankingTilte.hidden = YES; - _rankingIcon.image = [UIImage imageNamed:@[@"mine_guild_list_one",@"mine_guild_list_two",@"mine_guild_list_three"][_rankNum]]; - }else{ - _rankingIcon.hidden = YES; - _rankingTilte.hidden = NO; - _rankingTilte.text = [NSString stringWithFormat:@"%ld",_rankNum+1]; - } -} --(UIImageView *)rankingIcon{ - if (!_rankingIcon){ - _rankingIcon = [UIImageView new]; - } - return _rankingIcon; -} -- (UILabel *)rankingTilte{ - if (!_rankingTilte){ - _rankingTilte = [UILabel new]; - _rankingTilte.font = [UIFont systemFontOfSize:16 weight:UIFontWeightBold]; - _rankingTilte.textColor = UIColorFromRGB(0x1F1A4E); - } - return _rankingTilte; -} -- (UILabel *)nameLabel{ - if (!_nameLabel){ - _nameLabel = [UILabel new]; - _nameLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _nameLabel.textColor = UIColorFromRGB(0x1F1A4E); - } - return _nameLabel; -} --(NetImageView *)guildIcon{ - if (!_guildIcon){ - _guildIcon = [[NetImageView alloc]init]; - } - return _guildIcon; -} -- (NetImageView *)headIcon{ - if (!_headIcon){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _headIcon = [[NetImageView alloc]initWithConfig:config]; - _headIcon.layer.cornerRadius = kGetScaleWidth(20); - _headIcon.layer.masksToBounds = YES; - } - return _headIcon; -} --(UIButton *)applyBtn{ - if (!_applyBtn){ - - UIImage *chooseImage = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(70), kGetScaleWidth(25))]; - UIImage *noChooseImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xE6E6F0),UIColorFromRGB(0xE6E6F0),UIColorFromRGB(0xE6E6F0)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(70), kGetScaleWidth(25))]; - _applyBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_applyBtn setTitle:YMLocalizedString(@"XPMineGuildListCell1") forState:UIControlStateNormal]; - _applyBtn.titleLabel.font = [UIFont systemFontOfSize:12]; - [_applyBtn setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [_applyBtn setBackgroundImage:chooseImage forState:UIControlStateSelected]; - [_applyBtn setBackgroundImage:noChooseImage forState:UIControlStateNormal]; - [_applyBtn setTitle:YMLocalizedString(@"XPMineGuildListCell0") forState:UIControlStateSelected]; - [_applyBtn setTitle:YMLocalizedString(@"XPMineGuildListCell1") forState:UIControlStateNormal]; - - [_applyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - [_applyBtn setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [_applyBtn addTarget:self action:@selector(applyAction) forControlEvents:UIControlEventTouchUpInside]; - _applyBtn.layer.cornerRadius = kGetScaleWidth(25)/2; - _applyBtn.layer.masksToBounds = YES; - _applyBtn.titleLabel.numberOfLines = 2; - - } - return _applyBtn; -} - - -- (UILabel *)roomIdLabel { - if (!_roomIdLabel) { - _roomIdLabel = [[UILabel alloc] init]; - _roomIdLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _roomIdLabel.textColor = [DJDKMIMOMColor disableButtonTextColor]; - } - return _roomIdLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/PIGuildSingleRoomIncomeCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/PIGuildSingleRoomIncomeCell.h deleted file mode 100644 index 8faf0bd..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/PIGuildSingleRoomIncomeCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PIGuildSingleRoomIncomeCell.h -// YuMi -// -// Created by duoban on 2024/2/21. -// - -#import -#import "GuildPersonIncomeRecordModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface PIGuildSingleRoomIncomeCell : UITableViewCell -@property (nonatomic,strong) GuildPersonIncomeUserInfoModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/PIGuildSingleRoomIncomeCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/PIGuildSingleRoomIncomeCell.m deleted file mode 100644 index 665df3f..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/PIGuildSingleRoomIncomeCell.m +++ /dev/null @@ -1,162 +0,0 @@ -// -// PIGuildSingleRoomIncomeCell.m -// YuMi -// -// Created by duoban on 2024/2/21. -// - -#import "PIGuildSingleRoomIncomeCell.h" -@interface PIGuildSingleRoomIncomeCell() -@property(nonatomic,strong) NetImageView *headView; -@property(nonatomic,strong) UILabel *nameView; -@property(nonatomic,strong) UILabel *numberView; -@property(nonatomic,strong) UILabel *anchorNumView; -@property(nonatomic,strong) UILabel *roomNumView; -@property(nonatomic,strong) UILabel *timeView; -@property(nonatomic,strong) UIView *lineView; -@end -@implementation PIGuildSingleRoomIncomeCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{ - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.headView]; - [self.contentView addSubview:self.nameView]; - [self.contentView addSubview:self.numberView]; - [self.contentView addSubview:self.anchorNumView]; - [self.contentView addSubview:self.roomNumView]; - [self.contentView addSubview:self.timeView]; - [self.contentView addSubview:self.lineView]; -} --(void)installConstraints{ - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(44)); - make.leading.mas_equalTo(kGetScaleWidth(17)); - make.centerY.equalTo(self.contentView); - - }]; - CGFloat width = kGetScaleWidth(242) / 3; - [self.timeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(0); - make.width.mas_equalTo(width); - make.centerY.equalTo(self.contentView); - }]; - [self.roomNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(width); - make.centerY.equalTo(self.contentView); - make.trailing.equalTo(self.timeView.mas_leading).mas_offset(0); - }]; - [self.anchorNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(width); - make.centerY.equalTo(self.contentView); - make.trailing.equalTo(self.roomNumView.mas_leading).mas_offset(0); - }]; - [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.headView.mas_top).mas_offset(kGetScaleWidth(4)); - make.leading.equalTo(self.headView.mas_trailing).mas_offset(kGetScaleWidth(6)); - make.trailing.equalTo(self.anchorNumView.mas_leading).mas_offset((0)); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.numberView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.nameView.mas_bottom).mas_offset(kGetScaleWidth(0)); - make.leading.equalTo(self.nameView); - make.trailing.equalTo(self.nameView); - }]; -} -- (void)setUserInfo:(GuildPersonIncomeUserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.headView.image = nil; - [self.headView loadImageWithUrl:_userInfo.avatar completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - self.headView.image = image; - }]; - - self.nameView.text = _userInfo.nick; - self.numberView.text = [NSString stringWithFormat:@"ID:%@",_userInfo.erbanNo]; - self.anchorNumView.text = _userInfo.anchorDiamondNum; - self.roomNumView.text = _userInfo.roomDiamondNum; - NSInteger h = _userInfo.timeDuration / 60; - NSInteger min = _userInfo.timeDuration % 60; - if(h <= 0){ - self.timeView.text = [NSString stringWithFormat:@"%ldmin",_userInfo.timeDuration]; - }else if(min <= 0 && h > 0){ - self.timeView.text = [NSString stringWithFormat:@"%ldh",h]; - }else{ - self.timeView.text = [NSString stringWithFormat:@"%ldh%ldmin",h,min]; - } - - } -} -#pragma mark - 懒加载 -- (NetImageView *)headView{ - if(!_headView){ - NetImageConfig *config = [NetImageConfig new]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _headView = [[NetImageView alloc]initWithConfig:config]; - _headView.layer.cornerRadius = kGetScaleWidth(44)/2; - _headView.layer.masksToBounds = YES; - } - return _headView; -} -- (UILabel *)nameView{ - if(!_nameView){ - _nameView = [UILabel labelInitWithText:@"" font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _nameView; -} -- (UILabel *)numberView{ - if(!_numberView){ - _numberView = [UILabel labelInitWithText:@"" font:[UIFont systemFontOfSize:11 weight:UIFontWeightRegular] textColor:UIColorFromRGB(0x8A8CAB)]; - } - return _numberView; -} -- (UILabel *)anchorNumView{ - if(!_anchorNumView){ - _anchorNumView = [UILabel labelInitWithText:@"0" font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x1F1B4F)]; - _anchorNumView.textAlignment = NSTextAlignmentCenter; - _anchorNumView.numberOfLines = 2; - } - return _anchorNumView; -} -- (UILabel *)roomNumView{ - if(!_roomNumView){ - _roomNumView = [UILabel labelInitWithText:@"0" font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x1F1B4F)]; - _roomNumView.textAlignment = NSTextAlignmentCenter; - _roomNumView.numberOfLines = 2; - } - return _roomNumView; -} -- (UILabel *)timeView{ - if(!_timeView){ - _timeView = [UILabel labelInitWithText:@"0h0min" font:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x1F1B4F)]; - _timeView.textAlignment = NSTextAlignmentCenter; - _timeView.numberOfLines = 2; - } - return _timeView; -} -- (UIView *)lineView{ - if(!_lineView){ - _lineView = [UIView new]; - _lineView.backgroundColor = UIColorFromRGB(0xF1F2F2); - } - return _lineView; -} -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeDetailCollectionViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeDetailCollectionViewCell.h deleted file mode 100644 index 09e3e33..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeDetailCollectionViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPGuildIncomeDetailCollectionViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildIncomeDetailModel; -@interface XPGuildIncomeDetailCollectionViewCell : UICollectionViewCell - -@property (nonatomic,strong) GuildIncomeDetailModel *incomeDetailInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeDetailCollectionViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeDetailCollectionViewCell.m deleted file mode 100644 index 6882d3e..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeDetailCollectionViewCell.m +++ /dev/null @@ -1,153 +0,0 @@ -// -// XPGuildIncomeDetailCollectionViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import "XPGuildIncomeDetailCollectionViewCell.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -///Model -#import "GuildIncomeDetailModel.h" - -@interface XPGuildIncomeDetailCollectionViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///礼物名称 -@property (nonatomic,strong) UILabel *giftNameLabel; -///礼物个数 -@property (nonatomic,strong) UILabel *numberLabel; -///价值的容器 -@property (nonatomic,strong) UIStackView *priceStackView; -///钻石 -@property (nonatomic,strong) UILabel *diamondLabel; -///礼物价值 -@property (nonatomic,strong) UILabel *giftPriceLabel; - -@end - -@implementation XPGuildIncomeDetailCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method - -- (void)initSubViews { - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.giftNameLabel]; - [self.contentView addSubview:self.priceStackView]; - [self.contentView addSubview:self.numberLabel]; - - [self.priceStackView addArrangedSubview:self.giftPriceLabel]; - [self.priceStackView addArrangedSubview:self.diamondLabel]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(7); - make.leading.trailing.mas_equalTo(self).inset(18); - make.height.mas_equalTo(self.avatarImageView.mas_width); - }]; - - [self.giftNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(5); - make.centerX.mas_equalTo(self.contentView); - }]; - - [self.priceStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.giftNameLabel.mas_bottom).offset(2); - make.centerX.mas_equalTo(self.contentView); - }]; - - [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.giftPriceLabel.mas_bottom).offset(2); - make.centerX.mas_equalTo(self.contentView); - }]; -} - -#pragma mark - Getters And Setters -- (void)setIncomeDetailInfo:(GuildIncomeDetailModel *)incomeDetailInfo { - _incomeDetailInfo = incomeDetailInfo; - if (_incomeDetailInfo) { - self.avatarImageView.imageUrl = _incomeDetailInfo.picUrl; - self.giftNameLabel.text = _incomeDetailInfo.giftName; - self.giftPriceLabel.text = _incomeDetailInfo.goldPrice; - self.numberLabel.text = [NSString stringWithFormat:@"X%@", _incomeDetailInfo.giftNum]; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 38/2; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UILabel *)giftNameLabel { - if (!_giftNameLabel) { - _giftNameLabel = [[UILabel alloc] init]; - _giftNameLabel.font = [UIFont systemFontOfSize:14]; - _giftNameLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _giftNameLabel; -} - -- (UILabel *)giftPriceLabel { - if (!_giftPriceLabel) { - _giftPriceLabel = [[UILabel alloc] init]; - _giftPriceLabel.font = [UIFont systemFontOfSize:13]; - _giftPriceLabel.textColor = [DJDKMIMOMColor appMainColor]; - } - return _giftPriceLabel; -} - -- (UIStackView *)priceStackView { - if (!_priceStackView) { - _priceStackView = [[UIStackView alloc] init]; - _priceStackView.axis = UILayoutConstraintAxisHorizontal; - _priceStackView.distribution = UIStackViewDistributionFill; - _priceStackView.alignment = UIStackViewAlignmentFill; - _priceStackView.spacing = 2; - } - return _priceStackView; -} - - -- (UILabel *)diamondLabel { - if (!_diamondLabel) { - _diamondLabel = [[UILabel alloc] init]; - _diamondLabel.text = YMLocalizedString(@"XPGuildIncomeDetailCollectionViewCell0"); - _diamondLabel.font = [UIFont systemFontOfSize:13]; - _diamondLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _diamondLabel; -} - -- (UILabel *)numberLabel { - if (!_numberLabel) { - _numberLabel = [[UILabel alloc] init]; - _numberLabel.font = [UIFont systemFontOfSize:13]; - _numberLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _numberLabel; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.h deleted file mode 100644 index 34318cc..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPGuildIncomeRecordTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildIncomeRecordUserInfoModel; -@interface XPGuildIncomeRecordTableViewCell : UITableViewCell -///用户信息 -@property (nonatomic,strong) GuildIncomeRecordUserInfoModel *userInfo; -///排名 -@property (nonatomic,assign) NSInteger rankNumber; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.m deleted file mode 100644 index 0ad0364..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.m +++ /dev/null @@ -1,423 +0,0 @@ -// -// XPGuildIncomeRecordTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import "XPGuildIncomeRecordTableViewCell.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" - -#import "NSString+Utils.h" -///Model -#import "GuildIncomeRecordModel.h" - -@interface XPGuildIncomeRecordTableViewCell () -///总的容器 -@property (nonatomic,strong) UIStackView *stackView; -///右边收入容器 -@property (nonatomic, strong) UIStackView *incomeContentStackView; -///收入的容器 -@property (nonatomic,strong) UIStackView *incomStackView; -///收礼容器 -@property (nonatomic, strong) UIStackView *giftStackView; -///排名 -@property (nonatomic,strong) UILabel *rankLabel; -///头像的容器 -@property (nonatomic,strong) UIStackView *avatarView; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///id -@property (nonatomic,strong) UILabel *idLabel; -///房间流水容器 -@property (nonatomic,strong) UIStackView *roomIncomeStackView; -///房间流水 -@property (nonatomic,strong) UILabel *roomIncomeLabel; -///房间流水金币 -@property (nonatomic,strong) UILabel *roomIncomeCoinLabel; -///普通礼物流水容器 -@property (nonatomic,strong) UIStackView *normalGiftStackView; -///普通礼物 -@property (nonatomic,strong) UILabel *normalGiftLabel; -///普通礼物金币 -@property (nonatomic,strong) UILabel *normalGiftcoinLabel; -///背包礼物流水容器 -@property (nonatomic,strong) UIStackView *packGiftStackView; -///背包礼物流水 -@property (nonatomic,strong) UILabel *packGiftLabel; -///背包礼物金币 -@property (nonatomic,strong) UILabel *packGiftCoinLabel; -///送礼人数容器 -@property (nonatomic, strong) UIStackView *sendGiftCountStackView; -///送礼人数金币 -@property (nonatomic, strong) UILabel *sendGiftCountCoinLabel; -///送礼人数 -@property (nonatomic, strong) UILabel *sendGiftCountLabel; -///新用户送礼人数容器 -@property (nonatomic, strong) UIStackView *NewUserGiftCountStackView; -///新送礼人数金币 -@property (nonatomic, strong) UILabel *NewUserGiftCountCoinLabel; -///新送礼人数 -@property (nonatomic, strong) UILabel *NewUserGiftCountLabel; - -@end - -@implementation XPGuildIncomeRecordTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.rankLabel]; - [self.stackView addArrangedSubview:self.avatarView]; - [self.stackView addArrangedSubview:self.incomeContentStackView]; - - [self.avatarView addArrangedSubview:self.avatarImageView]; - [self.avatarView addArrangedSubview:self.idLabel]; - - [self.incomeContentStackView addArrangedSubview:self.incomStackView]; - [self.incomeContentStackView addArrangedSubview:self.giftStackView]; - - [self.incomStackView addArrangedSubview:self.roomIncomeStackView]; - [self.incomStackView addArrangedSubview:self.normalGiftStackView]; - [self.incomStackView addArrangedSubview:self.packGiftStackView]; - - [self.roomIncomeStackView addArrangedSubview:self.roomIncomeCoinLabel]; - [self.roomIncomeStackView addArrangedSubview:self.roomIncomeLabel]; - - [self.normalGiftStackView addArrangedSubview:self.normalGiftcoinLabel]; - [self.normalGiftStackView addArrangedSubview:self.normalGiftLabel]; - - [self.packGiftStackView addArrangedSubview:self.packGiftCoinLabel]; - [self.packGiftStackView addArrangedSubview:self.packGiftLabel]; - - [self.giftStackView addArrangedSubview:self.sendGiftCountStackView]; - [self.giftStackView addArrangedSubview:self.NewUserGiftCountStackView]; - UILabel *emptyView = [UILabel new]; - [self.giftStackView addArrangedSubview:emptyView]; - [emptyView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_greaterThanOrEqualTo(10); - }]; - - [self.sendGiftCountStackView addArrangedSubview:self.sendGiftCountCoinLabel]; - [self.sendGiftCountStackView addArrangedSubview:self.sendGiftCountLabel]; - [self.NewUserGiftCountStackView addArrangedSubview:self.NewUserGiftCountCoinLabel]; - [self.NewUserGiftCountStackView addArrangedSubview:self.NewUserGiftCountLabel]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.bottom.mas_equalTo(self.contentView); - }]; - - [self.rankLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(52); - make.height.mas_equalTo(50); - }]; - - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(50); - make.height.mas_equalTo(65); - }]; - - [self.incomeContentStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(self.stackView); - }]; - - [self.incomStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.incomeContentStackView); - }]; - [self.giftStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.incomeContentStackView); - }]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(50); - }]; -} - -#pragma mark - Getters And Setters -- (void)setRankNumber:(NSInteger)rankNumber { - _rankNumber = rankNumber; - self.rankLabel.text = [NSString stringWithFormat:@"%ld", _rankNumber+1]; -} - -- (void)setUserInfo:(GuildIncomeRecordUserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.avatarImageView.imageUrl = _userInfo.hallAvatar; - self.idLabel.text = _userInfo.hallName; - self.roomIncomeCoinLabel.text = [NSString stringWithFormat:@"+%@", [NSString getDealNumWithString:_userInfo.roomIncome]]; - self.normalGiftcoinLabel.text = [NSString stringWithFormat:@"+%@", [NSString getDealNumWithString:_userInfo.normalGiftIncome]]; - self.packGiftCoinLabel.text = [NSString stringWithFormat:@"+%@", [NSString getDealNumWithString:_userInfo.bagIncome]]; - self.sendGiftCountCoinLabel.text = [NSString stringWithFormat:@"+%@", [NSString getDealNumWithString:_userInfo.giftUv]]; - self.NewUserGiftCountCoinLabel.text = [NSString stringWithFormat:@"+%@", [NSString getDealNumWithString:_userInfo.userSendGiftNum]]; - } -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 10; - } - return _stackView; -} - -- (UILabel *)rankLabel { - if (!_rankLabel) { - _rankLabel = [[UILabel alloc] init]; - _rankLabel.font = [UIFont systemFontOfSize:15]; - _rankLabel.text = @"1"; - _rankLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _rankLabel.textAlignment = NSTextAlignmentCenter; - } - return _rankLabel; -} - -- (UIStackView *)avatarView { - if (!_avatarView) { - _avatarView = [[UIStackView alloc] init]; - _avatarView.axis = UILayoutConstraintAxisVertical; - _avatarView.distribution = UIStackViewDistributionFillProportionally; - _avatarView.alignment = UIStackViewAlignmentFill; - _avatarView.spacing = 3; - } - return _avatarView; -} - - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 8; - } - return _avatarImageView; -} -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:11]; - _idLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _idLabel.textAlignment = NSTextAlignmentCenter; - } - return _idLabel; -} - -- (UIStackView *)incomeContentStackView { - if (!_incomeContentStackView) { - _incomeContentStackView = [[UIStackView alloc] init]; - _incomeContentStackView.axis = UILayoutConstraintAxisVertical; - _incomeContentStackView.distribution = UIStackViewDistributionFillEqually; - _incomeContentStackView.alignment = UIStackViewAlignmentCenter; - _incomeContentStackView.spacing = 0; - } - return _incomeContentStackView; -} - - -- (UIStackView *)giftStackView { - if (!_giftStackView) { - _giftStackView = [[UIStackView alloc] init]; - _giftStackView.axis = UILayoutConstraintAxisHorizontal; - _giftStackView.distribution = UIStackViewDistributionFillEqually; - _giftStackView.alignment = UIStackViewAlignmentCenter; - _giftStackView.spacing = 10; - } - return _giftStackView; -} - - -- (UIStackView *)incomStackView { - if (!_incomStackView) { - _incomStackView = [[UIStackView alloc] init]; - _incomStackView.axis = UILayoutConstraintAxisHorizontal; - _incomStackView.distribution = UIStackViewDistributionFillEqually; - _incomStackView.alignment = UIStackViewAlignmentCenter; - _incomStackView.spacing = 10; - } - return _incomStackView; -} - -- (UIStackView *)roomIncomeStackView { - if (!_roomIncomeStackView) { - _roomIncomeStackView = [[UIStackView alloc] init]; - _roomIncomeStackView.axis = UILayoutConstraintAxisVertical; - _roomIncomeStackView.distribution = UIStackViewDistributionFill; - _roomIncomeStackView.alignment = UIStackViewAlignmentFill; - _roomIncomeStackView.spacing = 3; - } - return _roomIncomeStackView; -} - -- (UILabel *)roomIncomeLabel { - if (!_roomIncomeLabel) { - _roomIncomeLabel = [[UILabel alloc] init]; - _roomIncomeLabel.text = YMLocalizedString(@"XPGuildIncomeRecordTableViewCell0"); - _roomIncomeLabel.font = [UIFont systemFontOfSize:12]; - _roomIncomeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _roomIncomeLabel.textAlignment = NSTextAlignmentCenter; - } - return _roomIncomeLabel; -} - -- (UILabel *)roomIncomeCoinLabel { - if (!_roomIncomeCoinLabel) { - _roomIncomeCoinLabel = [[UILabel alloc] init]; - _roomIncomeCoinLabel.font = [UIFont boldSystemFontOfSize:12]; - _roomIncomeCoinLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _roomIncomeCoinLabel.textAlignment = NSTextAlignmentCenter; - } - return _roomIncomeCoinLabel; -} - - -- (UIStackView *)normalGiftStackView { - if (!_normalGiftStackView) { - _normalGiftStackView = [[UIStackView alloc] init]; - _normalGiftStackView.axis = UILayoutConstraintAxisVertical; - _normalGiftStackView.distribution = UIStackViewDistributionFill; - _normalGiftStackView.alignment = UIStackViewAlignmentFill; - _normalGiftStackView.spacing = 3; - } - return _normalGiftStackView; -} - -- (UILabel *)normalGiftLabel { - if (!_normalGiftLabel) { - _normalGiftLabel = [[UILabel alloc] init]; - _normalGiftLabel.text = YMLocalizedString(@"XPGuildIncomeRecordTableViewCell1"); - _normalGiftLabel.font = [UIFont systemFontOfSize:12]; - _normalGiftLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _normalGiftLabel.textAlignment = NSTextAlignmentCenter; - } - return _normalGiftLabel; -} - -- (UILabel *)normalGiftcoinLabel { - if (!_normalGiftcoinLabel) { - _normalGiftcoinLabel = [[UILabel alloc] init]; - _normalGiftcoinLabel.font = [UIFont boldSystemFontOfSize:12]; - _normalGiftcoinLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _normalGiftcoinLabel.textAlignment = NSTextAlignmentCenter; - } - return _normalGiftcoinLabel; -} - - -- (UIStackView *)packGiftStackView { - if (!_packGiftStackView) { - _packGiftStackView = [[UIStackView alloc] init]; - _packGiftStackView.axis = UILayoutConstraintAxisVertical; - _packGiftStackView.distribution = UIStackViewDistributionFill; - _packGiftStackView.alignment = UIStackViewAlignmentFill; - _packGiftStackView.spacing = 3; - } - return _packGiftStackView; -} - -- (UILabel *)packGiftLabel { - if (!_packGiftLabel) { - _packGiftLabel = [[UILabel alloc] init]; - _packGiftLabel.text = YMLocalizedString(@"XPGuildIncomeRecordTableViewCell2"); - _packGiftLabel.font = [UIFont systemFontOfSize:12]; - _packGiftLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _packGiftLabel.textAlignment = NSTextAlignmentCenter; - } - return _packGiftLabel; -} - -- (UILabel *)packGiftCoinLabel { - if (!_packGiftCoinLabel) { - _packGiftCoinLabel = [[UILabel alloc] init]; - _packGiftCoinLabel.font = [UIFont boldSystemFontOfSize:12]; - _packGiftCoinLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _packGiftCoinLabel.textAlignment = NSTextAlignmentCenter; - } - return _packGiftCoinLabel; -} - -- (UIStackView *)sendGiftCountStackView { - if (!_sendGiftCountStackView) { - _sendGiftCountStackView = [[UIStackView alloc] init]; - _sendGiftCountStackView.axis = UILayoutConstraintAxisVertical; - _sendGiftCountStackView.distribution = UIStackViewDistributionFill; - _sendGiftCountStackView.alignment = UIStackViewAlignmentFill; - _sendGiftCountStackView.spacing = 3; - } - return _sendGiftCountStackView; -} - -- (UILabel *)sendGiftCountLabel { - if (!_sendGiftCountLabel) { - _sendGiftCountLabel = [[UILabel alloc] init]; - _sendGiftCountLabel.text = YMLocalizedString(@"XPGuildIncomeRecordTableViewCell3"); - _sendGiftCountLabel.font = [UIFont systemFontOfSize:12]; - _sendGiftCountLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _sendGiftCountLabel.textAlignment = NSTextAlignmentCenter; - } - return _sendGiftCountLabel; -} - -- (UILabel *)sendGiftCountCoinLabel { - if (!_sendGiftCountCoinLabel) { - _sendGiftCountCoinLabel = [[UILabel alloc] init]; - _sendGiftCountCoinLabel.font = [UIFont boldSystemFontOfSize:12]; - _sendGiftCountCoinLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _sendGiftCountCoinLabel.textAlignment = NSTextAlignmentCenter; - } - return _sendGiftCountCoinLabel; -} - -- (UIStackView *)NewUserGiftCountStackView { - if (!_NewUserGiftCountStackView) { - _NewUserGiftCountStackView = [[UIStackView alloc] init]; - _NewUserGiftCountStackView.axis = UILayoutConstraintAxisVertical; - _NewUserGiftCountStackView.distribution = UIStackViewDistributionFill; - _NewUserGiftCountStackView.alignment = UIStackViewAlignmentFill; - _NewUserGiftCountStackView.spacing = 3; - } - return _NewUserGiftCountStackView; -} - -- (UILabel *)NewUserGiftCountLabel { - if (!_NewUserGiftCountLabel) { - _NewUserGiftCountLabel = [[UILabel alloc] init]; - _NewUserGiftCountLabel.text = YMLocalizedString(@"XPGuildIncomeRecordTableViewCell4"); - _NewUserGiftCountLabel.font = [UIFont systemFontOfSize:12]; - _NewUserGiftCountLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _NewUserGiftCountLabel.textAlignment = NSTextAlignmentCenter; - } - return _NewUserGiftCountLabel; -} - -- (UILabel *)NewUserGiftCountCoinLabel { - if (!_NewUserGiftCountCoinLabel) { - _NewUserGiftCountCoinLabel = [[UILabel alloc] init]; - _NewUserGiftCountCoinLabel.font = [UIFont boldSystemFontOfSize:12]; - _NewUserGiftCountCoinLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _NewUserGiftCountCoinLabel.textAlignment = NSTextAlignmentCenter; - } - return _NewUserGiftCountCoinLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.h deleted file mode 100644 index 7f6f436..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPGuildPersonIncomeTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildPersonIncomeUserInfoModel; -@interface XPGuildPersonIncomeTableViewCell : UITableViewCell -///用户信息 -@property (nonatomic,strong) GuildPersonIncomeUserInfoModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.m deleted file mode 100644 index 8de7883..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.m +++ /dev/null @@ -1,186 +0,0 @@ -// -// XPGuildPersonIncomeTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import "XPGuildPersonIncomeTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" - -#import "NSString+Utils.h" -///Model -#import "GuildPersonIncomeRecordModel.h" - -@interface XPGuildPersonIncomeTableViewCell () - -///排名 -@property (nonatomic,strong) UILabel *rankLabel; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; - - -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///显示id -@property (nonatomic,strong) UILabel *idLabel; - -///显示收入 -@property (nonatomic,strong) UILabel *incomeLabel; -///箭头 -@property (nonatomic,strong) UIButton *arrowImageView; -@end - -@implementation XPGuildPersonIncomeTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.rankLabel]; - [self.contentView addSubview:self.avatarImageView]; - - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.idLabel]; - - [self.contentView addSubview:self.incomeLabel]; - [self.contentView addSubview:self.arrowImageView]; - - -} - -- (void)initSubViewConstraints { - - [self.rankLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(54), kGetScaleWidth(17))); - make.leading.mas_equalTo(kGetScaleWidth(0)); - make.centerY.equalTo(self.contentView); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(35)); - make.centerY.equalTo(self.contentView); - make.leading.equalTo(self.rankLabel.mas_trailing).mas_offset(kGetScaleWidth(6)); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(101)); - make.top.equalTo(self.avatarImageView); - make.width.mas_equalTo(kGetScaleWidth(120)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.equalTo(self.nickLabel); - make.centerX.equalTo(self.nickLabel); - make.height.mas_equalTo(kGetScaleWidth(14)); - make.top.equalTo(self.nickLabel.mas_bottom).mas_offset(kGetScaleWidth(7)); - }]; - [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(20)); - make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.centerY.equalTo(self.contentView); - }]; - [self.incomeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(38)); - make.centerY.equalTo(self.contentView); - make.width.height.mas_equalTo(kGetScaleWidth(116)); - }]; - - -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(GuildPersonIncomeUserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.rankLabel.text = _userInfo.rowNum; - self.avatarImageView.imageUrl = _userInfo.avatar; - self.nickLabel.text = _userInfo.nick; - self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _userInfo.erbanNo]; - self.incomeLabel.text = _userInfo.totalGoldNum; - - } -} - - - -- (UILabel *)rankLabel { - if (!_rankLabel) { - _rankLabel = [[UILabel alloc] init]; - _rankLabel.text = @"1"; - _rankLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightSemibold]; - _rankLabel.textAlignment = NSTextAlignmentCenter; - _rankLabel.textColor = [DJDKMIMOMColor inputTextColor]; - } - return _rankLabel; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = kGetScaleWidth(35)/2; - } - return _avatarImageView; -} - - - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _nickLabel.textColor = [DJDKMIMOMColor inputTextColor]; - _nickLabel.textAlignment = NSTextAlignmentCenter; - } - return _nickLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:12]; - _idLabel.textAlignment = NSTextAlignmentCenter; - _idLabel.textColor = [DJDKMIMOMColor disableButtonTextColor]; - } - return _idLabel; -} - -- (UILabel *)incomeLabel { - if (!_incomeLabel) { - _incomeLabel = [[UILabel alloc] init]; - _incomeLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _incomeLabel.textColor = [DJDKMIMOMColor inputTextColor]; - _incomeLabel.textAlignment = NSTextAlignmentCenter; - _incomeLabel.numberOfLines = 2; - } - return _incomeLabel; -} - -- (UIButton *)arrowImageView { - if (!_arrowImageView) { - _arrowImageView = [[UIButton alloc] init]; - [_arrowImageView setImage:[[UIImage imageNamed:@"room_setting_arrow"]ms_SetImageForRTL] forState:UIControlStateNormal]; - } - return _arrowImageView; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.h deleted file mode 100644 index f13ebb9..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPGuildSingleRoomIncomeTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildPersonIncomeUserInfoModel; -@interface XPGuildSingleRoomIncomeTableViewCell : UITableViewCell -@property (nonatomic,strong) GuildPersonIncomeUserInfoModel *userInfo; -///排名 -@property (nonatomic,assign) NSInteger rankNumber; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.m deleted file mode 100644 index 32837b8..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.m +++ /dev/null @@ -1,199 +0,0 @@ -// -// XPGuildSingleRoomIncomeTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/11. -// 个播收入 - -#import "XPGuildSingleRoomIncomeTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" - -#import "NSString+Utils.h" -///Model -#import "GuildPersonIncomeRecordModel.h" - -@interface XPGuildSingleRoomIncomeTableViewCell () - -///排名 -@property (nonatomic,strong) UILabel *rankLabel; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///厅头像 -@property (nonatomic,strong) NetImageView *hallAvatarImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -@property (nonatomic,strong) UILabel *hallNickView; - -///房间收入 -@property (nonatomic,strong) UILabel *roomIncomeLabel; -///分割线 -@property (nonatomic,strong) UIView *lineView; -@end - -@implementation XPGuildSingleRoomIncomeTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.rankLabel]; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.roomIncomeLabel]; - [self.contentView addSubview:self.hallAvatarImageView]; - [self.contentView addSubview:self.hallNickView]; - [self.contentView addSubview:self.lineView]; -} - -- (void)initSubViewConstraints { - - [self.rankLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(0)); - make.width.mas_equalTo(kGetScaleWidth(48)); - make.centerY.equalTo(self.contentView); - }]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(35)); - make.centerY.equalTo(self.contentView); - make.leading.mas_equalTo(kGetScaleWidth(50)); - }]; - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.avatarImageView); - make.top.equalTo(self.avatarImageView.mas_bottom).mas_offset(kGetScaleWidth(6)); - make.width.mas_equalTo(kGetScaleWidth(56)); - }]; - [self.hallNickView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(5)); - make.centerY.equalTo(self.contentView); - make.leading.equalTo(self.hallAvatarImageView.mas_trailing).mas_offset(kGetScaleWidth(6)); - - }]; - [self.hallAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.width.mas_equalTo(kGetScaleWidth(35)); - make.centerY.equalTo(self.contentView); -// make.trailing.equalTo(self.hallNickView.mas_leading).mas_offset(-kGetScaleWidth(6)); - make.leading.equalTo(self.contentView).mas_offset(kGetScaleWidth(260)); - }]; - [self.roomIncomeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(97)); - make.centerY.equalTo(self.contentView); - make.trailing.equalTo(self.hallAvatarImageView.mas_leading).mas_offset(-kGetScaleWidth(5)); - make.width.mas_greaterThanOrEqualTo(10); - }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self.contentView); - make.leading.equalTo(self.rankLabel); - make.trailing.equalTo(self.hallNickView); - make.height.mas_equalTo(kGetScaleWidth(1)); - }]; - -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(GuildPersonIncomeUserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.avatarImageView.imageUrl = _userInfo.avatar; - self.nickLabel.text = _userInfo.nick; - self.hallAvatarImageView.imageUrl = _userInfo.hallAvatar; - self.hallNickView.text = _userInfo.hallName; - self.roomIncomeLabel.text = _userInfo.income; - } -} - -- (void)setRankNumber:(NSInteger)rankNumber { - _rankNumber = rankNumber; - self.rankLabel.text = [NSString stringWithFormat:@"%ld", _rankNumber+1]; -} - - - -- (UILabel *)rankLabel { - if (!_rankLabel) { - _rankLabel = [[UILabel alloc] init]; - _rankLabel.text = @"1"; - _rankLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; - _rankLabel.textAlignment = NSTextAlignmentCenter; - _rankLabel.textColor = [DJDKMIMOMColor inputTextColor]; - } - return _rankLabel; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = kGetScaleWidth(35)/2; - } - return _avatarImageView; -} - - - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:12]; - _nickLabel.textColor = [DJDKMIMOMColor inputTextColor]; - _nickLabel.textAlignment = NSTextAlignmentCenter; - } - return _nickLabel; -} - - - - -- (UILabel *)roomIncomeLabel { - if (!_roomIncomeLabel) { - _roomIncomeLabel = [[UILabel alloc] init]; - _roomIncomeLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _roomIncomeLabel.textColor = [DJDKMIMOMColor inputTextColor]; - _roomIncomeLabel.textAlignment = NSTextAlignmentLeft; - } - return _roomIncomeLabel; -} - -- (NetImageView *)hallAvatarImageView{ - if (!_hallAvatarImageView){ - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _hallAvatarImageView = [[NetImageView alloc] initWithConfig:config]; - _hallAvatarImageView.layer.masksToBounds = YES; - _hallAvatarImageView.layer.cornerRadius = kGetScaleWidth(5); - } - return _hallAvatarImageView; -} - -- (UILabel *)hallNickView { - if (!_hallNickView) { - _hallNickView = [[UILabel alloc] init]; - _hallNickView.font = [UIFont systemFontOfSize:13]; - _hallNickView.textColor = [DJDKMIMOMColor inputTextColor]; - } - return _hallNickView; -} - -- (UIView *)lineView{ - if (!_lineView){ - _lineView = [UIView new]; - _lineView.backgroundColor = UIColorFromRGB(0xF7F7F7); - } - return _lineView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPNewMineHallIncomeCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPNewMineHallIncomeCell.h deleted file mode 100644 index 3b95105..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPNewMineHallIncomeCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPNewMineHallIncomeCell.h -// YuMi -// -// Created by duoban on 2023/8/7. -// - -#import -#import "GuildIncomeRecordModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPNewMineHallIncomeCell : UITableViewCell -///用户信息 -@property (nonatomic,strong) GuildIncomeRecordUserInfoModel *userInfo; -///排名 -@property (nonatomic,assign) NSInteger rankNumber; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPNewMineHallIncomeCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPNewMineHallIncomeCell.m deleted file mode 100644 index 20021aa..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPNewMineHallIncomeCell.m +++ /dev/null @@ -1,219 +0,0 @@ -// -// XPNewMineHallIncomeCell.m -// YuMi -// -// Created by duoban on 2023/8/7. -// - -#import "XPNewMineHallIncomeCell.h" -#import "XPMineGuildPersonalBillRecordItemView.h" -@interface XPNewMineHallIncomeCell() -///背景 -@property(nonatomic,strong) UIView *bgView; -///排名 -@property(nonatomic,strong) UILabel *rankView; -///头像 -@property(nonatomic,strong) NetImageView *headView; -///房间名 -@property(nonatomic,strong) UILabel *roomNameView; -///流水类型 -@property(nonatomic,strong) UILabel *typeView; -///房间流水 -@property(nonatomic,strong) XPMineGuildPersonalBillRecordItemView *roomBillView; -///普通礼物流水 -@property(nonatomic,strong) XPMineGuildPersonalBillRecordItemView *commonGiftView; -///背包礼物流水 -@property(nonatomic,strong) XPMineGuildPersonalBillRecordItemView *bagGiftView; -///送礼人数 -@property(nonatomic,strong) XPMineGuildPersonalBillRecordItemView *sendGiftView; -///新用户送礼人数 -@property(nonatomic,strong) XPMineGuildPersonalBillRecordItemView *userGiftView; -@end -@implementation XPNewMineHallIncomeCell --(instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{ - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} - --(void)installUI{ - self.contentView.backgroundColor = UIColorFromRGB(0xF5F6FA); - [self.contentView addSubview:self.bgView]; - [self.bgView addSubview:self.rankView]; - [self.bgView addSubview:self.headView]; - [self.bgView addSubview:self.roomNameView]; - [self.bgView addSubview:self.typeView]; - [self.bgView addSubview:self.roomBillView]; - [self.bgView addSubview:self.commonGiftView]; - [self.bgView addSubview:self.bagGiftView]; - [self.bgView addSubview:self.sendGiftView]; - [self.bgView addSubview:self.userGiftView]; -} --(void)installConstraints{ - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(10)); - make.top.equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(222)); - make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(14)); - }]; - [self.rankView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(16)); - make.top.mas_equalTo(kGetScaleWidth(20)); - make.height.mas_equalTo(kGetScaleWidth(28)); - }]; - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.rankView.mas_trailing).mas_offset(kGetScaleWidth(8)); - make.width.height.mas_equalTo(kGetScaleWidth(40)); - make.centerY.equalTo(self.rankView); - }]; - [self.roomNameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.headView.mas_trailing).mas_offset(kGetScaleWidth(8)); - make.centerY.equalTo(self.rankView); - }]; - [self.typeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.headView.mas_bottom).mas_offset(kGetScaleWidth(10)); - make.leading.height.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.roomBillView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.typeView.mas_bottom).mas_offset(kGetScaleWidth(6)); - make.leading.mas_equalTo(kGetScaleWidth(16)); - make.width.mas_equalTo(kGetScaleWidth(98)); - make.height.mas_equalTo(kGetScaleWidth(52)); - }]; - [self.commonGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.typeView.mas_bottom).mas_offset(kGetScaleWidth(6)); - make.centerX.equalTo(self.bgView); - make.width.mas_equalTo(kGetScaleWidth(98)); - make.height.mas_equalTo(kGetScaleWidth(52)); - }]; - [self.bagGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.typeView.mas_bottom).mas_offset(kGetScaleWidth(6)); - make.trailing.mas_equalTo(-kGetScaleWidth(16)); - make.width.mas_equalTo(kGetScaleWidth(98)); - make.height.mas_equalTo(kGetScaleWidth(52)); - }]; - [self.sendGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.roomBillView.mas_bottom).mas_offset(kGetScaleWidth(16)); - make.leading.mas_equalTo(kGetScaleWidth(16)); - make.width.mas_equalTo(kGetScaleWidth(98)); - make.height.mas_equalTo(kGetScaleWidth(52)); - }]; - [self.userGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.roomBillView.mas_bottom).mas_offset(kGetScaleWidth(16)); - make.centerX.equalTo(self.bgView); - make.width.mas_equalTo(kGetScaleWidth(98)); - make.height.mas_equalTo(kGetScaleWidth(52)); - }]; -} -#pragma mark - Getters And Setters -- (void)setRankNumber:(NSInteger)rankNumber { - _rankNumber = rankNumber; - self.rankView.text = [NSString stringWithFormat:@"%ld.", _rankNumber+1]; -} - -- (void)setUserInfo:(GuildIncomeRecordUserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.headView.imageUrl = _userInfo.hallAvatar; - self.roomNameView.text = _userInfo.hallName; - self.roomBillView.num = [NSString stringWithFormat:@"+%@", _userInfo.roomIncome]; - self.commonGiftView.num = [NSString stringWithFormat:@"+%@", _userInfo.normalGiftIncome]; - self.bagGiftView.num = [NSString stringWithFormat:@"+%@",_userInfo.bagIncome]; - self.sendGiftView.num = [NSString stringWithFormat:@"+%@", _userInfo.giftUv]; - self.userGiftView.num = [NSString stringWithFormat:@"+%@", _userInfo.userSendGiftNum]; - } -} -#pragma mark - 懒加载 -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - _bgView.layer.cornerRadius = kGetScaleWidth(10); - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} -- (UILabel *)rankView{ - if(!_rankView){ - _rankView = [UILabel labelInitWithText:@"" font:kFontMedium(20) textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _rankView; -} -- (NetImageView *)headView{ - if(!_headView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _headView = [[NetImageView alloc]initWithConfig:config]; - _headView.layer.cornerRadius = kGetScaleWidth(40)/2; - _headView.layer.masksToBounds = YES; - } - return _headView; -} -- (UILabel *)roomNameView{ - if(!_roomNameView){ - _roomNameView = [UILabel labelInitWithText:@"" font:kFontMedium(16) textColor:UIColorFromRGB(0x2B2D33)]; - } - return _roomNameView; -} --(UILabel *)typeView{ - if(!_typeView){ - _typeView = [UILabel labelInitWithText:YMLocalizedString(@"XPGuildIncomeSectionView5") font:kFontMedium(14) textColor:UIColorFromRGB(0x2B2D33)]; - _typeView.hidden = YES; - } - return _typeView; -} -- (XPMineGuildPersonalBillRecordItemView *)roomBillView{ - if(!_roomBillView){ - _roomBillView = [[XPMineGuildPersonalBillRecordItemView alloc]initWithFrame:CGRectZero]; - _roomBillView.num = @"+0.0"; - _roomBillView.title = YMLocalizedString(@"XPMineGuildPersonalBillRecordContentView0"); - } - return _roomBillView; -} -- (XPMineGuildPersonalBillRecordItemView *)commonGiftView{ - if(!_commonGiftView){ - _commonGiftView = [[XPMineGuildPersonalBillRecordItemView alloc]initWithFrame:CGRectZero]; - _commonGiftView.num = @"+0.0"; - _commonGiftView.title = YMLocalizedString(@"XPMineGuildPersonalBillRecordContentView1"); - } - return _commonGiftView; -} -- (XPMineGuildPersonalBillRecordItemView *)bagGiftView{ - if(!_bagGiftView){ - _bagGiftView = [[XPMineGuildPersonalBillRecordItemView alloc]initWithFrame:CGRectZero]; - _bagGiftView.num = @"+0.0"; - _bagGiftView.title = YMLocalizedString(@"XPMineGuildPersonalBillRecordContentView2"); - } - return _bagGiftView; -} -- (XPMineGuildPersonalBillRecordItemView *)sendGiftView{ - if(!_sendGiftView){ - _sendGiftView = [[XPMineGuildPersonalBillRecordItemView alloc]initWithFrame:CGRectZero]; - _sendGiftView.num = @"+0.0"; - _sendGiftView.title = YMLocalizedString(@"XPMineGuildPersonalBillRecordContentView3"); - } - return _sendGiftView; -} -- (XPMineGuildPersonalBillRecordItemView *)userGiftView{ - if(!_userGiftView){ - _userGiftView = [[XPMineGuildPersonalBillRecordItemView alloc]initWithFrame:CGRectZero]; - _userGiftView.num = @"+0.0"; - _userGiftView.title = YMLocalizedString(@"XPMineGuildPersonalBillRecordContentView4"); - } - return _userGiftView; -} -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMaskManagerCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMaskManagerCell.h deleted file mode 100644 index 462eee6..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMaskManagerCell.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// XPMaskManagerCell.h -// xplan-ios -// -// Created by duoban on 2022/12/26. -// - -#import -#import "XPMaskManagerModel.h" - -NS_ASSUME_NONNULL_BEGIN - - -@protocol XPMaskManagerCellDelegate - --(void)unmaskingHandleWithModel:(XPMaskManagerModel *)model; - -@end - - -@interface XPMaskManagerCell : UITableViewCell -@property (nonatomic,strong) XPMaskManagerModel *model; -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMaskManagerCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMaskManagerCell.m deleted file mode 100644 index eb59988..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMaskManagerCell.m +++ /dev/null @@ -1,175 +0,0 @@ -// -// XPMaskManagerCell.m -// xplan-ios -// -// Created by duoban on 2022/12/26. -// - -#import "XPMaskManagerCell.h" -@interface XPMaskManagerCell() -@property (nonatomic,strong) UIView *bgView; -@property (nonatomic,strong) NetImageView *headView; -@property (nonatomic,strong) UILabel *nameView; -@property (nonatomic,strong) UILabel *idView; -@property (nonatomic,strong) UIButton *unmaskingBtn; -@property (nonatomic,strong) UIStackView *stackView; -@property (nonatomic,strong) NetImageView *iconView; - -@end -@implementation XPMaskManagerCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.bgView]; - [self.contentView addSubview:self.headView]; - [self.bgView addSubview:self.nameView]; - - [self.bgView addSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.iconView]; - [self.stackView addArrangedSubview:self.idView]; - - - [self.bgView addSubview:self.unmaskingBtn]; - -} -- (void)initSubViewConstraints { - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.width.height.mas_equalTo(kGetScaleWidth(74)); - make.top.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(36)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.top.mas_equalTo(kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(84)); - }]; - [self.unmaskingBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.height.mas_equalTo(kGetScaleWidth(30)); - make.width.mas_equalTo(kGetScaleWidth(83)); - make.centerY.equalTo(self.bgView); - }]; - [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(65)); - make.top.mas_equalTo(kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(21)); - make.trailing.equalTo(self.unmaskingBtn.mas_leading).mas_offset(-kGetScaleWidth(10)); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.equalTo(self.nameView); - make.top.equalTo(self.nameView.mas_bottom).mas_offset(kGetScaleWidth(16)); - }]; - - [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(15)); - make.width.height.mas_equalTo(kGetScaleWidth(32)); - }]; - - - [self.idView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.greaterThanOrEqualTo(@10); - - }]; - -} --(void)setModel:(XPMaskManagerModel *)model{ - _model = model; - _headView.imageUrl = _model.avatar; - _nameView.text = _model.title; - _idView.text = [NSString stringWithFormat:@"ID:%@",_model.erbanNo]; - if(_model.tagPict.length > 0){ - self.iconView.hidden = NO; - self.iconView.imageUrl = _model.tagPict; - }else{ - self.iconView.hidden = YES; - - } - -} --(void)unmaskingAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(unmaskingHandleWithModel:)]){ - [self.delegate unmaskingHandleWithModel:self.model]; - } -} -#pragma mark -懒加载 -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = kGetScaleWidth(9); - } - return _stackView; -} --(UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - _bgView.layer.cornerRadius = kGetScaleWidth(14); - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} -- (NetImageView *)headView{ - if (!_headView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _headView = [[NetImageView alloc]initWithConfig:config]; - _headView.layer.cornerRadius = kGetScaleWidth(74)/2; - _headView.layer.masksToBounds = YES; - } - return _headView; -} -- (UILabel *)nameView{ - if (!_nameView){ - _nameView = [UILabel labelInitWithText:@"" font:kFontRegular(15) textColor:[DJDKMIMOMColor inputTextColor]]; - } - return _nameView; -} --(NetImageView *)iconView{ - if (!_iconView){ - _iconView = [[NetImageView alloc]init]; - } - return _iconView; -} -- (UILabel *)idView{ - if (!_idView){ - _idView = [UILabel labelInitWithText:@"" font:kFontRegular(13) textColor:UIColorFromRGB(0x6D6B89)]; - } - return _idView; -} --(UIButton *)unmaskingBtn{ - if (!_unmaskingBtn){ - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(83), kGetScaleWidth(30))]; - _unmaskingBtn = [UIButton buttonInitWithText:YMLocalizedString(@"XPMaskManagerCell0") font:kFontMedium(14) textColor:[UIColor whiteColor] image:nil bgImage:image]; - _unmaskingBtn.layer.cornerRadius = kGetScaleWidth(15); - _unmaskingBtn.layer.masksToBounds = YES; - [_unmaskingBtn addTarget:self action:@selector(unmaskingAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _unmaskingBtn; -} -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMineGuildManagerPerTableViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMineGuildManagerPerTableViewCell.h deleted file mode 100644 index 9e2ca18..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMineGuildManagerPerTableViewCell.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// XPMineGuildManagerPerTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildAuthModel; -@protocol XPMineGuildManagerPerTableViewCellDelegate - -///开关 -- (void)xPMineGuildManagerPerTableViewCell:(UISwitch *)onswitch authInfo:(GuildAuthModel *)authInfo; - -@end - -@interface XPMineGuildManagerPerTableViewCell : UITableViewCell -///代理 -@property (nonatomic,weak) id delegate; -@property (nonatomic,strong) GuildAuthModel * authInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMineGuildManagerPerTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMineGuildManagerPerTableViewCell.m deleted file mode 100644 index b46fcd4..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMineGuildManagerPerTableViewCell.m +++ /dev/null @@ -1,119 +0,0 @@ -// -// XPMineGuildManagerPerTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "XPMineGuildManagerPerTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "GuildAuthModel.h" - -@interface XPMineGuildManagerPerTableViewCell () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///副标题 -@property (nonatomic,strong) UILabel *subTitleLabel; -///开关 -@property (nonatomic,strong) UISwitch *onswitch; -@end - -@implementation XPMineGuildManagerPerTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.stackView]; - [self.contentView addSubview:self.onswitch]; - - [self.stackView addArrangedSubview:self.titleLabel]; - [self.stackView addArrangedSubview:self.subTitleLabel]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(15); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.onswitch mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.centerY.mas_equalTo(self.contentView); - make.width.mas_equalTo(44); - make.height.mas_equalTo(24); - }]; -} - -#pragma mark - Event Response -- (void)onswitchChange:(UISwitch *)on { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineGuildManagerPerTableViewCell:authInfo:)]) { - [self.delegate xPMineGuildManagerPerTableViewCell:on authInfo:self.authInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setAuthInfo:(GuildAuthModel *)authInfo { - _authInfo = authInfo; - if (_authInfo) { - self.titleLabel.text = _authInfo.name; - self.subTitleLabel.text = _authInfo.des; - self.titleLabel.hidden = _authInfo.name.length <= 0; - self.subTitleLabel.hidden = _authInfo.des.length <= 0; - self.onswitch.on = _authInfo.status; - } -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 5; - } - return _stackView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UILabel *)subTitleLabel { - if (!_subTitleLabel) { - _subTitleLabel = [[UILabel alloc] init]; - _subTitleLabel.font = [UIFont systemFontOfSize:13]; - _subTitleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _subTitleLabel; -} - -- (UISwitch *)onswitch { - if (!_onswitch) { - _onswitch = [[UISwitch alloc] init]; - _onswitch.onTintColor = [DJDKMIMOMColor appMainColor]; - [_onswitch addTarget:self action:@selector(onswitchChange:) forControlEvents:UIControlEventValueChanged]; - } - return _onswitch; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildChooseManagerRoomTableViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildChooseManagerRoomTableViewCell.h deleted file mode 100644 index 2daed7f..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildChooseManagerRoomTableViewCell.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// XPGuildChooseManagerRoomTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildRoomInfoModel, XPGuildChooseManagerRoomTableViewCell; - -@protocol XPGuildChooseManagerRoomTableViewCellDelegate - -- (void)xPGuildChooseManagerRoomTableViewCell:(XPGuildChooseManagerRoomTableViewCell *)view - didChooseInfo:(GuildRoomInfoModel *)roomInfo - didChooseIndex:(NSIndexPath *)indexPath; - -@end - -@interface XPGuildChooseManagerRoomTableViewCell : UITableViewCell - -///代理 -@property (nonatomic, weak) id delegate; - -@property (nonatomic, strong) GuildRoomInfoModel *roomInfo; -@property (nonatomic, strong) NSIndexPath *cellIndex; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildChooseManagerRoomTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildChooseManagerRoomTableViewCell.m deleted file mode 100644 index 61569b0..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildChooseManagerRoomTableViewCell.m +++ /dev/null @@ -1,157 +0,0 @@ -// -// XPGuildChooseManagerRoomTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "XPGuildChooseManagerRoomTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -///Model -#import "GuildRoomInfoModel.h" - -@interface XPGuildChooseManagerRoomTableViewCell () -///背景 -@property (nonatomic,strong) UIView * backView; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///id -@property (nonatomic,strong) UILabel *idLabel; -///是否选择 -@property (nonatomic,strong) UIButton *chooseButton; -@end - -@implementation XPGuildChooseManagerRoomTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.backView]; - - [self.backView addSubview:self.avatarImageView]; - [self.backView addSubview:self.nickLabel]; - [self.backView addSubview:self.idLabel]; - [self.backView addSubview:self.chooseButton]; -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView).offset(-15); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).offset(10); - make.centerY.mas_equalTo(self.backView); - make.size.mas_equalTo(CGSizeMake(53, 53)); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.backView.mas_centerY).offset(-2); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(8); - make.trailing.mas_lessThanOrEqualTo(self.chooseButton.mas_leading).offset(-5); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - make.leading.mas_equalTo(self.nickLabel); - }]; - - [self.chooseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(30, 30)); - make.centerY.mas_equalTo(self.backView); - make.trailing.mas_equalTo(self.backView).offset(-10); - }]; -} - -#pragma mark - Event Response -- (void)chooseButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildChooseManagerRoomTableViewCell:didChooseInfo:didChooseIndex:)]) { - [self.delegate xPGuildChooseManagerRoomTableViewCell:self - didChooseInfo:self.roomInfo - didChooseIndex:self.cellIndex]; - } -} - -#pragma mark - Getters And Setters -- (void)setRoomInfo:(GuildRoomInfoModel *)roomInfo { - _roomInfo = roomInfo; - if (_roomInfo) { - self.avatarImageView.imageUrl = _roomInfo.hallAvatar; - self.nickLabel.text = _roomInfo.hallName; - self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _roomInfo.hallRoomId]; - self.chooseButton.selected = _roomInfo.hasManage; - } -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _backView.layer.masksToBounds = YES; - _backView.layer.cornerRadius = 10; - } - return _backView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 53.0/2.0; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:18]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:12]; - _idLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _idLabel; -} - -- (UIButton *)chooseButton { - if (!_chooseButton) { - _chooseButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_chooseButton setImage:[UIImage imageNamed:@"mine_guild_guild_manager_normal"] forState:UIControlStateNormal]; - [_chooseButton setImage:[UIImage imageNamed:@"mine_guild_guild_manager_select"] forState:UIControlStateSelected]; - [_chooseButton addTarget:self action:@selector(chooseButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _chooseButton; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.h deleted file mode 100644 index 5eb16ed..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// XPGuildSearchSuperAdminTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildSearchSuperAdminModel, XPGuildSearchSuperAdminTableViewCell; -@protocol XPGuildSearchSuperAdminTableViewCellDelegate - -- (void)xPGuildSearchSuperAdminTableViewCell:(XPGuildSearchSuperAdminTableViewCell *)cell didSelectInfo:(GuildSearchSuperAdminModel *)userInfo; - -@end -@interface XPGuildSearchSuperAdminTableViewCell : UITableViewCell -///代理 -@property (nonatomic,weak) id delegate; -@property (nonatomic,strong) GuildSearchSuperAdminModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.m deleted file mode 100644 index 8f240c9..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.m +++ /dev/null @@ -1,184 +0,0 @@ -// -// XPGuildSearchSuperAdminTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "XPGuildSearchSuperAdminTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "GuildSearchSuperAdminModel.h" - -@interface XPGuildSearchSuperAdminTableViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///性别 -@property (nonatomic,strong) UIButton *sexImageView; -///id -@property (nonatomic,strong) UILabel *idLabel; -///设置超管 -@property (nonatomic,strong) UIButton *superAdminButton; -@end - -@implementation XPGuildSearchSuperAdminTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.sexImageView]; - [self.contentView addSubview:self.idLabel]; - [self.contentView addSubview:self.superAdminButton]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(15); - make.width.height.mas_equalTo(50); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-3); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); - }]; - - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.nickLabel.mas_centerY); - make.leading.mas_equalTo(self.nickLabel.mas_trailing).mas_offset(3); - make.height.mas_equalTo(14); - make.width.mas_equalTo(28); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - make.leading.mas_equalTo(self.nickLabel.mas_leading); - }]; - - [self.superAdminButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.width.mas_equalTo(90); - make.height.mas_equalTo(30); - make.centerY.mas_equalTo(self.contentView); - }]; -} - -#pragma mark - Event Response -- (void)superAdminButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildSearchSuperAdminTableViewCell:didSelectInfo:)]) { - [self.delegate xPGuildSearchSuperAdminTableViewCell:self didSelectInfo:self.userInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(GuildSearchSuperAdminModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.avatarImageView.imageUrl = _userInfo.avatar; - NSString * nick = _userInfo.nick; - if (nick.length > 8) { - nick = [nick substringToIndex:8]; - } - self.nickLabel.text = 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.idLabel.text = [NSString stringWithFormat:@"%@", _userInfo.erbanNo]; - self.superAdminButton.enabled = !_userInfo.hasSet; - if(self.superAdminButton.enabled == NO){ - [self.superAdminButton mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(110); - }]; - }else{ - [self.superAdminButton mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(90); - }]; - } - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 25; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - _avatarImageView.layer.borderWidth = 1; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:18]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UIButton *)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; - } - return _sexImageView; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:12]; - _idLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _idLabel; -} - -- (UIButton *)superAdminButton { - if (!_superAdminButton) { - _superAdminButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_superAdminButton setTitle:YMLocalizedString(@"XPGuildSearchSuperAdminTableViewCell0") forState:UIControlStateNormal]; - [_superAdminButton setTitle:YMLocalizedString(@"XPGuildSearchSuperAdminTableViewCell1") forState:UIControlStateDisabled]; - [_superAdminButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_superAdminButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateSelected]; - _superAdminButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_superAdminButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _superAdminButton.layer.masksToBounds = YES; - _superAdminButton.layer.cornerRadius = 15; - _superAdminButton.titleLabel.numberOfLines = 2; - _superAdminButton.titleLabel.textAlignment = NSTextAlignmentCenter; - [_superAdminButton addTarget:self action:@selector(superAdminButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _superAdminButton; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminRoomCollectionViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminRoomCollectionViewCell.h deleted file mode 100644 index 23d9902..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminRoomCollectionViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPGuildSuperAdminRoomCollectionViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildRoomInfoModel; -@interface XPGuildSuperAdminRoomCollectionViewCell : UICollectionViewCell -@property (nonatomic,strong) GuildRoomInfoModel *roomInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminRoomCollectionViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminRoomCollectionViewCell.m deleted file mode 100644 index 7e66f02..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminRoomCollectionViewCell.m +++ /dev/null @@ -1,86 +0,0 @@ -// -// XPGuildSuperAdminRoomCollectionViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "XPGuildSuperAdminRoomCollectionViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -///Model -#import "GuildRoomInfoModel.h" - -@interface XPGuildSuperAdminRoomCollectionViewCell () -///显示头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///显示id -@property (nonatomic,strong) UILabel *idLabel; -@end - -@implementation XPGuildSuperAdminRoomCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.idLabel]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView); - make.centerX.mas_equalTo(self.contentView); - make.width.height.mas_equalTo(60); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(6); - make.trailing.leading.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (void)setRoomInfo:(GuildRoomInfoModel *)roomInfo { - _roomInfo = roomInfo; - if (_roomInfo) { - self.avatarImageView.imageUrl = _roomInfo.hallAvatar; - self.idLabel.text = _roomInfo.hallName; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 10; - } - return _avatarImageView; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:13]; - _idLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _idLabel.textAlignment = NSTextAlignmentCenter; - } - return _idLabel; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.h deleted file mode 100644 index fc80f3a..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// XPGuildSuperAdminSetTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import -#import "XPGuildSuperAdminMenuView.h" -NS_ASSUME_NONNULL_BEGIN -@class GuildSuperAdminInfoModel, XPGuildSuperAdminSetTableViewCell; -@protocol XPGuildSuperAdminSetTableViewCellDelegate - -- (void)xPGuildSuperAdminSetTableViewCell:(GuildSuperAdminInfoModel *)managerInfo didChooseType:(GuildSuperAdminMenuType)menuType; - -@end -@interface XPGuildSuperAdminSetTableViewCell : UITableViewCell -@property (nonatomic,strong) GuildSuperAdminInfoModel *managerInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.m deleted file mode 100644 index 68c44f5..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.m +++ /dev/null @@ -1,250 +0,0 @@ -// -// XPGuildSuperAdminSetTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "XPGuildSuperAdminSetTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -///Tool -#import "NetImageView.h" -///Model -#import "GuildSuperAdminInfoModel.h" -///View -#import "XPGuildSuperAdminRoomCollectionViewCell.h" - - -@interface XPGuildSuperAdminSetTableViewCell () -///背景色 -@property (nonatomic,strong) UIView * backView; -///个人信息的容器 -@property (nonatomic,strong) UIView * managerInfoView; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///显示昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///id -@property (nonatomic,strong) UILabel *idLabel; -///更多操作按钮 -@property (nonatomic,strong) UIButton *moreButton; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///菜单 -@property (nonatomic,strong) XPGuildSuperAdminMenuView *menuView; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -@end - -@implementation XPGuildSuperAdminSetTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.backView]; - - [self.backView addSubview:self.managerInfoView]; - [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.collectionView]; - [self.backView addSubview:self.menuView]; - - [self.managerInfoView addSubview:self.avatarImageView]; - [self.managerInfoView addSubview:self.nickLabel]; - [self.managerInfoView addSubview:self.idLabel]; - [self.managerInfoView addSubview:self.moreButton]; -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView).offset(-15); - }]; - - [self.managerInfoView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.backView); - make.height.mas_equalTo(74); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(64, 64)); - make.leading.top.mas_equalTo(self.managerInfoView).offset(10); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); - make.trailing.mas_lessThanOrEqualTo(self.moreButton.mas_leading).offset(-5); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(6); - }]; - - [self.moreButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.backView).offset(-5); - make.top.mas_equalTo(self.backView).offset(10); - make.width.height.mas_equalTo(30); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).offset(10); - make.top.mas_equalTo(self.managerInfoView.mas_bottom).offset(15); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.backView); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(6); - }]; - - [self.menuView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.backView).offset(-5); - make.top.mas_equalTo(self.moreButton.mas_bottom).offset(0); - }]; -} - -#pragma mark - UICollectionViewCellDelegate And UICollectionViewDatasource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.managerInfo.roomList.count; -} - --(__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPGuildSuperAdminRoomCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGuildSuperAdminRoomCollectionViewCell class]) forIndexPath:indexPath]; - GuildRoomInfoModel * roomInfo = [self.managerInfo.roomList xpSafeObjectAtIndex:indexPath.row]; - cell.roomInfo = roomInfo; - return cell; -} - -#pragma mark - XPGuildSuperAdminMenuViewDelegate -- (void)xPGuildSuperAdminMenuView:(XPGuildSuperAdminMenuView *)view didClickType:(GuildSuperAdminMenuType)memuType { - self.menuView.hidden = YES; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildSuperAdminSetTableViewCell:didChooseType:)]) { - [self.delegate xPGuildSuperAdminSetTableViewCell:self.managerInfo didChooseType:memuType]; - } -} - -#pragma mark - Event Response -- (void)moreButtonButtonAction:(UIButton *)sender { - self.menuView.hidden = !self.menuView.hidden; -} - -#pragma mark - Getters And Setters -- (void)setManagerInfo:(GuildSuperAdminInfoModel *)managerInfo { - _managerInfo = managerInfo; - if (_managerInfo) { - self.avatarImageView.imageUrl = _managerInfo.avatar; - self.nickLabel.text= _managerInfo.nick; - self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPGuildSuperAdminSetTableViewCell0"), _managerInfo.erbanNo]; - [self.collectionView reloadData]; - } -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _backView.layer.masksToBounds = YES; - _backView.layer.cornerRadius = 10; - } - return _backView; -} - -- (UIView *)managerInfoView { - if (!_managerInfoView) { - _managerInfoView = [[UIView alloc] init]; - _managerInfoView.backgroundColor = [UIColor clearColor]; - } - return _managerInfoView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 64/2; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - _avatarImageView.layer.borderWidth = 1; - } - return _avatarImageView; -} -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:18]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:12]; - _idLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _idLabel; -} - -- (UIButton *)moreButton { - if (!_moreButton) { - _moreButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_moreButton setImage:[UIImage imageNamed:@"mine_guild_super_admin_more"] forState:UIControlStateNormal]; - [_moreButton setImage:[UIImage imageNamed:@"mine_guild_super_admin_more"] forState:UIControlStateSelected]; - [_moreButton addTarget:self action:@selector(moreButtonButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _moreButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPGuildSuperAdminSetTableViewCell1"); - _titleLabel.font = [UIFont systemFontOfSize:14]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.minimumLineSpacing = 10; - layout.itemSize = CGSizeMake(60, 80); - layout.sectionInset = UIEdgeInsetsMake(0, 10, 0, 10); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor whiteColor]; - [_collectionView registerClass:[XPGuildSuperAdminRoomCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGuildSuperAdminRoomCollectionViewCell class])]; - } - return _collectionView; -} - -- (XPGuildSuperAdminMenuView *)menuView { - if (!_menuView) { - _menuView = [[XPGuildSuperAdminMenuView alloc] init]; - _menuView.delegate = self; - _menuView.hidden = YES; - } - return _menuView; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.h deleted file mode 100644 index 4242648..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// XPClanMemberTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import -#import "ClanMemberDetailInfoModel.h" -NS_ASSUME_NONNULL_BEGIN -@class XPClanMemberTableViewCell; - -typedef NS_ENUM(NSInteger, ClanMemberTableViewCellType) { - ClanMemberTableViewCellType_Normal = 0, - ///移除公会成员 - ClanMemberTableViewCellType_Remove_Member, - ///高管设置 - ClanMemberTableViewCellType_Manager_Set, - ///增减高管 - ClanMemberTableViewCellType_Manager_Add_Remove, -}; - -@protocol XPClanMemberTableViewCellDelegate -///点击了某个人 -- (void)xPClanMemberTableViewCell:(XPClanMemberTableViewCell *)view didClickUser:(ClanMemberInfoModel *)userinfo; - -@end - -@interface XPClanMemberTableViewCell : UITableViewCell -///代理 -@property (nonatomic,weak) id delegate; -@property (nonatomic,assign) ClanMemberTableViewCellType cellType; -///是否是最后的一个 -@property (nonatomic,assign) BOOL isLast; -@property (nonatomic,strong) ClanMemberInfoModel *memberInfo; -@property(nonatomic,assign) BOOL pi_IsClan; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.m deleted file mode 100644 index 27052cf..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.m +++ /dev/null @@ -1,472 +0,0 @@ -// -// XPClanMemberTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "XPClanMemberTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -#import "UIButton+EnlargeTouchArea.h" -///Model -#import "ClanMemberDetailInfoModel.h" - -@interface XPClanMemberTableViewCell () -///背景色 -@property (nonatomic,strong) UIView * backView; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///头像的边框 -@property (nonatomic,strong) UIImageView *avatarBorderView; -///角色 -@property (nonatomic,strong) UIButton *roleButon; -///昵称的容器 -@property (nonatomic,strong) UIStackView *nickStackView; -///x姓名 -@property (nonatomic,strong) UILabel *nickLabel; -///id -@property (nonatomic,strong) UILabel *idLabel; -///性别 -@property (nonatomic,strong) UIButton *sexImageView; -///魅力等级 -@property (nonatomic,strong) NetImageView *charmImageView; -///等级 -@property (nonatomic,strong) NetImageView *experImageView; -///所属公会 -@property (nonatomic,strong) UILabel *guildNickLabel; -@property (nonatomic,strong) CAShapeLayer *shapeLayer; -///右边按钮的 -@property (nonatomic,strong) UIButton *rightButton; - -@end - -@implementation XPClanMemberTableViewCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.backView]; - [self.backView addSubview:self.avatarBorderView]; - [self.backView addSubview:self.avatarImageView]; - [self.backView addSubview:self.roleButon]; - [self.backView addSubview:self.nickStackView]; - [self.backView addSubview:self.idLabel]; - [self.backView addSubview:self.guildNickLabel]; - [self.backView addSubview:self.rightButton]; - - [self.nickStackView addArrangedSubview:self.nickLabel]; - [self.nickStackView addArrangedSubview:self.sexImageView]; - [self.nickStackView addArrangedSubview:self.experImageView]; - [self.nickStackView addArrangedSubview:self.charmImageView]; - -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.bottom.mas_equalTo(self.contentView); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(54, 54)); - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.backView).offset(9); - }]; - - [self.avatarBorderView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(57, 57)); - make.center.mas_equalTo(self.avatarImageView); - }]; - - [self.roleButon mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(17); - make.width.mas_equalTo(28); - make.bottom.mas_equalTo(self.avatarBorderView); - make.centerX.mas_equalTo(self.avatarImageView); - }]; - - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - - make.height.mas_equalTo(14); - make.width.mas_equalTo(28); - - }]; - CGFloat width = 28 * 20 / 14; - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; - - [self.nickStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); - make.height.mas_equalTo(20); - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-3); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(3); - }]; - - [self.guildNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.backView).offset(-15); - make.centerY.mas_equalTo(self.idLabel); - }]; - - [self.rightButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20, 20)); - make.centerY.mas_equalTo(self.backView); - make.trailing.mas_equalTo(self.backView).offset(-15); - }]; -} - -#pragma mark - Event Response -- (void)rightButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPClanMemberTableViewCell:didClickUser:)]) { - [self.delegate xPClanMemberTableViewCell:self didClickUser:self.memberInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setMemberInfo:(ClanMemberInfoModel *)memberInfo { - _memberInfo = memberInfo; - if (_memberInfo) { - self.avatarImageView.imageUrl = _memberInfo.avatar; - NSString * nick = _memberInfo.nick; - if (nick.length > 8) { - nick = [NSString stringWithFormat:@"%@...", [nick substringToIndex:8]]; - } - self.nickLabel.text = nick; - - [self.sexImageView setTitle:[NSString getAgeWithBirth:_memberInfo.birth] forState:UIControlStateNormal]; - self.sexImageView.backgroundColor = _memberInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.titleEdgeInsets = _memberInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.sexImageView.selected = _memberInfo.gender != GenderType_Male; - if (_memberInfo.experUrl) { - if (self.experImageView.state == NetImageStateLoaded) { - self.experImageView.imageUrl = _memberInfo.experUrl; - - } else { - @kWeakify(self); - [self.experImageView loadImageWithUrl:_memberInfo.experUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - self.experImageView.image = image; - - }]; - } - } - self.experImageView.hidden = _memberInfo.experUrl.length <= 0; - - if (_memberInfo.charmUrl) { - if (self.charmImageView.state == NetImageStateLoaded) { - self.charmImageView.imageUrl = _memberInfo.charmUrl; - - } else { - @kWeakify(self); - [self.charmImageView loadImageWithUrl:_memberInfo.charmUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - self.charmImageView.image = image; - - }]; - } - } - self.charmImageView.hidden = _memberInfo.charmUrl.length <= 0; - self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _memberInfo.erbanNo]; - NSString * hallName = _memberInfo.hallName; - if (hallName.length > 5) { - hallName = [NSString stringWithFormat:@"%@...", [hallName substringToIndex:5]]; - } - self.guildNickLabel.text = hallName; - UIColor * avatarBoderColor; - UIColor * roleGradStartColor; - UIColor * roleGradEndColor; - NSString * roleTitle; - CGFloat roleWidth = 45; - switch (_memberInfo.roleType) { - case GuildRoleType_Elder: - roleTitle = YMLocalizedString(@"XPClanMemberTableViewCell0"); - avatarBoderColor = UIColorFromRGB(0xFFD755); - roleGradStartColor = UIColorFromRGB(0xFF5357); - roleGradEndColor = UIColorFromRGB(0xFFC919); - roleWidth= 45; - break; - case GuildRoleType_Elder_Owner: - roleTitle = YMLocalizedString(@"XPClanMemberTableViewCell1"); - avatarBoderColor = UIColorFromRGB(0xFFD755); - roleGradStartColor = UIColorFromRGB(0xFF5357); - roleGradEndColor = UIColorFromRGB(0xFFC919); - roleWidth = 66; - break; - case GuildRoleType_Owner: - roleTitle = YMLocalizedString(@"XPClanMemberTableViewCell2"); - avatarBoderColor = UIColorFromRGB(0xF86868); - roleGradEndColor = UIColorFromRGB(0xF86868); - roleGradStartColor = UIColorFromRGB(0xF6A945); - roleWidth = 45; - break; - case GuildRoleType_Normal: - roleTitle = @""; - break; - case GuildRoleType_Manager: - roleTitle = YMLocalizedString(@"XPClanMemberTableViewCell3"); - avatarBoderColor = UIColorFromRGB(0x248CFE); - roleGradStartColor = UIColorFromRGB(0x5092FE); - roleGradEndColor = UIColorFromRGB(0x6A10B5); - roleWidth = 58; - break; - case GuildRoleType_Super_Admin: - roleTitle = YMLocalizedString(@"XPClanMemberTableViewCell4"); - avatarBoderColor = UIColorFromRGB(0x7727E4); - roleGradStartColor = UIColorFromRGB(0x5092FE); - roleGradEndColor = UIColorFromRGB(0x6A10B5); - roleWidth = 66; - break; - - default: - break; - } - if (roleTitle.length > 0) { - self.roleButon.hidden = NO; - self.avatarBorderView.hidden = NO; - [self.roleButon setTitle:roleTitle forState:UIControlStateNormal]; - self.avatarBorderView.layer.borderColor = avatarBoderColor.CGColor; - [self.roleButon setBackgroundImage:[UIImage gradientColorImageFromColors:@[roleGradStartColor, roleGradEndColor] gradientType:GradientTypeUpleftToLowright imgSize:CGSizeMake(roleWidth, 17)] forState:UIControlStateNormal]; - [self.roleButon mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(roleWidth); - }]; - } else { - self.avatarBorderView.hidden = YES; - self.roleButon.hidden = YES; - } - - if (_memberInfo.roleType == GuildRoleType_Owner || _memberInfo.roleType == GuildRoleType_Elder_Owner || _memberInfo.roleType == GuildRoleType_Super_Admin) { - self.rightButton.hidden = YES; - } - - if (_cellType == ClanMemberTableViewCellType_Manager_Add_Remove) { - self.rightButton.selected = _memberInfo.roleType == GuildRoleType_Manager; - } - } -} -- (void)setPi_IsClan:(BOOL)pi_IsClan{ - _pi_IsClan = pi_IsClan; - [self.backView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(0); - }]; -} -- (void)setCellType:(ClanMemberTableViewCellType)cellType { - _cellType = cellType; - switch (_cellType) { - case ClanMemberTableViewCellType_Normal: - { - [self.backView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - }]; - self.rightButton.hidden = YES; - } - break; - case ClanMemberTableViewCellType_Remove_Member: - { - [self.backView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(0); - }]; - self.rightButton.hidden = NO; - [self.rightButton setImage:[UIImage imageNamed:@"mine_guild_guild_remove_member"] forState:UIControlStateNormal]; - [self.rightButton setImage:[UIImage imageNamed:@"mine_guild_guild_remove_member"] forState:UIControlStateSelected]; - } - break; - case ClanMemberTableViewCellType_Manager_Set: - { - [self.backView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(0); - }]; - self.rightButton.hidden = NO; - [self.rightButton setImage:[[UIImage imageNamed:@"room_setting_arrow"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [self.rightButton setImage:[[UIImage imageNamed:@"room_setting_arrow"]ms_SetImageForRTL] forState:UIControlStateSelected]; - } - break; - case ClanMemberTableViewCellType_Manager_Add_Remove: - { - [self.backView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(0); - }]; - self.rightButton.hidden = NO; - self.backView.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - [self.rightButton setImage:[UIImage imageNamed:@"mine_guild_guild_manager_normal"] forState:UIControlStateNormal]; - [self.rightButton setImage:[UIImage imageNamed:@"mine_guild_guild_manager_select"] forState:UIControlStateSelected]; - } - break; - default: - break; - } -} - -- (void)setIsLast:(BOOL)isLast { - _isLast = isLast; - if (_isLast) { - self.backView.layer.mask = self.shapeLayer; - } else { - self.backView.layer.mask = nil; - } -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _backView.layer.masksToBounds = YES; - } - return _backView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 54/2; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UIButton *)roleButon { - if (!_roleButon) { - _roleButon = [UIButton buttonWithType:UIButtonTypeCustom]; - [_roleButon setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _roleButon.titleLabel.font = [UIFont systemFontOfSize:12]; - _roleButon.layer.masksToBounds = YES; - _roleButon.layer.cornerRadius = 17.0 / 2.0; - } - return _roleButon; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:12]; - _idLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _idLabel; -} - -- (UIStackView *)nickStackView { - if (!_nickStackView) { - _nickStackView = [[UIStackView alloc] init]; - _nickStackView.axis = UILayoutConstraintAxisHorizontal; - _nickStackView.distribution = UIStackViewDistributionFill; - _nickStackView.alignment = UIStackViewAlignmentCenter; - _nickStackView.spacing = 2; - } - return _nickStackView; -} - - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:16]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UIButton *)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; - } - return _sexImageView; -} - -- (NetImageView *)experImageView { - if (!_experImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserCardLevel; - _experImageView = [[NetImageView alloc] initWithConfig:config]; - _experImageView.userInteractionEnabled = YES; - _experImageView.hidden = YES; - - } - return _experImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserCardLevel; - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - _charmImageView.userInteractionEnabled = YES; - _charmImageView.hidden = YES; - - } - return _charmImageView; -} - -- (UILabel *)guildNickLabel { - if (!_guildNickLabel) { - _guildNickLabel = [[UILabel alloc] init]; - _guildNickLabel.font = [UIFont systemFontOfSize:13]; - _guildNickLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _guildNickLabel; -} - -- (UIImageView *)avatarBorderView { - if (!_avatarBorderView) { - _avatarBorderView = [[UIImageView alloc] init]; - _avatarBorderView.userInteractionEnabled = YES; - _avatarBorderView.layer.masksToBounds = YES; - _avatarBorderView.layer.cornerRadius = 57 / 2; - _avatarBorderView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _avatarBorderView.layer.borderWidth = 1; - } - return _avatarBorderView; -} - -- (CAShapeLayer *)shapeLayer { - if (!_shapeLayer) { - _shapeLayer = [CAShapeLayer layer]; - _shapeLayer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth - 15 * 2, 66) byRoundingCorners:UIRectCornerBottomLeft | UIRectCornerBottomRight cornerRadii:CGSizeMake(12, 12)].CGPath; - } - return _shapeLayer; -} - - -- (UIButton *)rightButton { - if (!_rightButton) { - _rightButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_rightButton addTarget:self action:@selector(rightButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_rightButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _rightButton; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanRoomCollectionViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanRoomCollectionViewCell.h deleted file mode 100644 index 497da28..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanRoomCollectionViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPClanRoomCollectionViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildInfoModel; -@interface XPClanRoomCollectionViewCell : UICollectionViewCell -@property (nonatomic,strong) GuildInfoModel *guildInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanRoomCollectionViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanRoomCollectionViewCell.m deleted file mode 100644 index 8658028..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanRoomCollectionViewCell.m +++ /dev/null @@ -1,86 +0,0 @@ -// -// XPClanRoomCollectionViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "XPClanRoomCollectionViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "GuildInfoModel.h" - -@interface XPClanRoomCollectionViewCell () -///房间头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPClanRoomCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.mas_equalTo(self.contentView); - make.height.mas_equalTo(60); - make.width.mas_equalTo(60); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(6); - }]; -} - -#pragma mark - Getters And Setters -- (void)setGuildInfo:(GuildInfoModel *)guildInfo { - _guildInfo = guildInfo; - if (_guildInfo) { - self.avatarImageView.imageUrl = _guildInfo.ownerAvatar; - self.titleLabel.text = _guildInfo.hallName; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 8; - } - return _avatarImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:13]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPGuildEmptyCollectionViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPGuildEmptyCollectionViewCell.h deleted file mode 100644 index 1a5d4d8..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPGuildEmptyCollectionViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPGuildEmptyCollectionViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGuildEmptyCollectionViewCell : UICollectionViewCell --(void)setConstraints; --(void)setTitle:(NSString *)title; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPGuildEmptyCollectionViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPGuildEmptyCollectionViewCell.m deleted file mode 100644 index 98853d8..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPGuildEmptyCollectionViewCell.m +++ /dev/null @@ -1,79 +0,0 @@ -// -// XPGuildEmptyCollectionViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import "XPGuildEmptyCollectionViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPGuildEmptyCollectionViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPGuildEmptyCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} --(void)setTitle:(NSString *)title{ - _titleLabel.text = title; -} -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} --(void)setConstraints{ - [self.emptyImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(kGetScaleWidth(90)); - }]; -} -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(150); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPGuildEmptyCollectionViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildEmptyTableViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildEmptyTableViewCell.h deleted file mode 100644 index 26a5581..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildEmptyTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineGuildEmptyTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildEmptyTableViewCell : UITableViewCell -@property (nonatomic,copy) NSString *emptyTitle; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildEmptyTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildEmptyTableViewCell.m deleted file mode 100644 index b826691..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildEmptyTableViewCell.m +++ /dev/null @@ -1,78 +0,0 @@ -// -// XPMineGuildEmptyTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import "XPMineGuildEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPMineGuildEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPMineGuildEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(150); - make.centerX.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(200, 200)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (void)setEmptyTitle:(NSString *)emptyTitle { - _emptyTitle = emptyTitle; - if (_emptyTitle) { - self.titleLabel.text = _emptyTitle; - } -} - -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPMineGuildEmptyTableViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.h b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.h deleted file mode 100644 index 9150a10..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPMineGuildSearchMemberTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GuildSearchUserInfoModel, XPMineGuildSearchMemberTableViewCell; -@protocol XPMineGuildSearchMemberTableViewCellDelegate - -- (void)xPMineGuildSearchMemberTableViewCell:(XPMineGuildSearchMemberTableViewCell *)view didSelectInfo:(GuildSearchUserInfoModel *)userInfo; - -@end -@interface XPMineGuildSearchMemberTableViewCell : UITableViewCell -///用户信息 -@property (nonatomic,strong) GuildSearchUserInfoModel *userInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.m deleted file mode 100644 index 558c540..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.m +++ /dev/null @@ -1,219 +0,0 @@ -// -// XPMineGuildSearchMemberTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "XPMineGuildSearchMemberTableViewCell.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -///Model -#import "GuildSearchUserInfoModel.h" -UIKIT_EXTERN NSString *kInviteMemeberSuccess; -@interface XPMineGuildSearchMemberTableViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///显示性别 -@property (nonatomic,strong) UIButton *sexImageView; -///显示id -@property (nonatomic,strong) UILabel *idLabel; -///邀请 -@property (nonatomic,strong) UIButton *inviteButton; - -@end - -@implementation XPMineGuildSearchMemberTableViewCell --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.sexImageView]; - [self.contentView addSubview:self.idLabel]; - [self.contentView addSubview:self.inviteButton]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(inviteMemeberSuccess:) name:kInviteMemeberSuccess object:nil]; -} --(void)inviteMemeberSuccess:(NSNotification *)not{ - NSString *targetUid = not.object; - if([targetUid isEqualToString:self.userInfo.uid]){ - self.userInfo.hallBtnStatus = 5; - [self.inviteButton setTitle:YMLocalizedString(@"XPMineGuildSearchMemberTableViewCell2") forState:UIControlStateNormal]; - self.inviteButton.backgroundColor = UIColorFromRGB(0xE6E6F0); - [self.inviteButton setTitleColor:UIColorFromRGB(0xB3B3C3) forState:UIControlStateNormal]; - [self.inviteButton setBackgroundImage:nil forState:UIControlStateNormal]; - self.inviteButton.hidden = NO; - } -} -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(50, 50)); - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(12); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(8); - make.height.mas_equalTo(17); - make.top.mas_equalTo(21); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.top.mas_equalTo(45); - make.height.mas_equalTo(14); - }]; - - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel.mas_trailing).offset(6); - make.centerY.mas_equalTo(self.nickLabel); - make.size.mas_equalTo(CGSizeMake(28, 14)); - }]; - - [self.inviteButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(83, 30)); - make.centerY.mas_equalTo(self.contentView); - make.trailing.mas_equalTo(self.contentView).offset(-15); - }]; - - -} - -#pragma mark - Event Response -- (void)inviteButtonAction:(UIButton *)sender { - if(self.userInfo.hallBtnStatus == 5)return; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineGuildSearchMemberTableViewCell:didSelectInfo:)]) { - [self.delegate xPMineGuildSearchMemberTableViewCell:self didSelectInfo:self.userInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(GuildSearchUserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.avatarImageView.imageUrl = _userInfo.avatar; - - [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.nickLabel.text = _userInfo.nick; - self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildSearchMemberTableViewCell0"), _userInfo.erbanNo]; - switch (_userInfo.hallBtnStatus) { - case 0: - { - _inviteButton.hidden = YES; - break; - } - case 4: - { - [_inviteButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _inviteButton.backgroundColor = [UIColor clearColor]; - [_inviteButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_inviteButton setTitle:YMLocalizedString(@"XPMineGuildSearchMemberTableViewCell1") forState:UIControlStateNormal]; - _inviteButton.hidden = NO; - break; - } - case 5: - { - [_inviteButton setTitle:YMLocalizedString(@"XPMineGuildSearchMemberTableViewCell3") forState:UIControlStateNormal]; - _inviteButton.backgroundColor = UIColorFromRGB(0xE6E6F0); - [_inviteButton setTitleColor:UIColorFromRGB(0xB3B3C3) forState:UIControlStateNormal]; - [_inviteButton setBackgroundImage:nil forState:UIControlStateNormal]; - _inviteButton.hidden = NO; - break; - } - case 6: - { - [_inviteButton setTitle:YMLocalizedString(@"XPMineGuildSearchMemberTableViewCell2") forState:UIControlStateNormal]; - _inviteButton.backgroundColor = UIColorFromRGB(0xFFBC51); - [_inviteButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_inviteButton setBackgroundImage:nil forState:UIControlStateNormal]; - _inviteButton.hidden = NO; - break; - } - default: - break; - } - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 25; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:15]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UIButton *)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; - } - return _sexImageView; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:10]; - _idLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _idLabel; -} - -- (UIButton *)inviteButton { - if (!_inviteButton) { - _inviteButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_inviteButton setTitle:YMLocalizedString(@"XPMineGuildSearchMemberTableViewCell1") forState:UIControlStateNormal]; - [_inviteButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _inviteButton.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - [_inviteButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _inviteButton.layer.masksToBounds = YES; - _inviteButton.layer.cornerRadius = 15; - [_inviteButton addTarget:self action:@selector(inviteButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _inviteButton; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineClanIncomeStatisViewController.h b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineClanIncomeStatisViewController.h deleted file mode 100644 index facfd28..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineClanIncomeStatisViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPMineClanStatisViewController.h -// YuMi -// -// Created by YuMi on 2022/4/11. -// 家族收入统计 - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineClanIncomeStatisViewController : BaseViewController -///家族的id -@property (nonatomic,copy) NSString *clanId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineClanIncomeStatisViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineClanIncomeStatisViewController.m deleted file mode 100644 index 8f039b1..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineClanIncomeStatisViewController.m +++ /dev/null @@ -1,163 +0,0 @@ -// -// XPMineClanStatisViewController.m -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import "XPMineClanIncomeStatisViewController.h" -///Third -#import -#import -#import -#import -///Tool - -#import "DJDKMIMOMColor.h" -///View -#import "XPMineGuildIncomeRecordViewController.h" - -@interface XPMineClanIncomeStatisViewController () -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *contentView; -///日 -@property (nonatomic,strong) XPMineGuildIncomeRecordViewController *dayRecordVC; -///周 -@property (nonatomic,strong) XPMineGuildIncomeRecordViewController *weekRecordVC; -///月 -@property (nonatomic,strong) XPMineGuildIncomeRecordViewController *mouthRecordVC; -@end - -@implementation XPMineClanIncomeStatisViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = YMLocalizedString(@"XPMineClanIncomeStatisViewController0"); - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.titleView]; - [self.view addSubview:self.contentView]; -} - -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.view).offset(10); - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(30); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleView.mas_bottom); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; -} - -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.dayRecordVC; - } else if(index == 1) { - return self.weekRecordVC; - } else { - return self.mouthRecordVC; - } -} - -- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index { - if (index == 0) { - self.dayRecordVC.timeType = GuildIncomeRecrdTimeType_Day; - } else if(index == 1) { - self.weekRecordVC.timeType = GuildIncomeRecrdTimeType_Week; - } else { - self.mouthRecordVC.timeType = GuildIncomeRecrdTimeType_Mouth; - } -} - -#pragma mark - Getters And Setters -- (void)setClanId:(NSString *)clanId { - _clanId = clanId; - self.dayRecordVC.guidId = _clanId; - self.weekRecordVC.guidId = _clanId; - self.mouthRecordVC.guidId = _clanId; - self.dayRecordVC.timeType = GuildIncomeRecrdTimeType_Day; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - _titleView.titleColor = [DJDKMIMOMColor secondTextColor]; - _titleView.titleSelectedColor = [DJDKMIMOMColor mainTextColor]; - _titleView.titleFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:16]; - _titleView.titleSelectedFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:16]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.cellSpacing = 5; - _titleView.cellWidthIncrement = 5; - _titleView.listContainer = self.contentView; - - JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init]; - lineView.indicatorColor = [DJDKMIMOMColor appMainColor]; - lineView.indicatorWidth = 8.f; - lineView.indicatorHeight = 4.f; - lineView.indicatorCornerRadius = 2.f; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (JXCategoryListContainerView *)contentView { - if (!_contentView) { - _contentView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _contentView.defaultSelectedIndex = 0; - } - return _contentView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMineClanIncomeStatisViewController1"), YMLocalizedString(@"XPMineClanIncomeStatisViewController2"), YMLocalizedString(@"XPMineClanIncomeStatisViewController3")]; - } - return _titles; -} - -- (XPMineGuildIncomeRecordViewController *)dayRecordVC { - if (!_dayRecordVC) { - _dayRecordVC = [[XPMineGuildIncomeRecordViewController alloc] init]; - _dayRecordVC.incomeType = GuildIncomeType_Clan; - } - return _dayRecordVC; -} - -- (XPMineGuildIncomeRecordViewController *)weekRecordVC { - if (!_weekRecordVC) { - _weekRecordVC = [[XPMineGuildIncomeRecordViewController alloc] init]; - _weekRecordVC.incomeType = GuildIncomeType_Clan; - } - return _weekRecordVC; -} - -- (XPMineGuildIncomeRecordViewController *)mouthRecordVC { - if (!_mouthRecordVC) { - _mouthRecordVC = [[XPMineGuildIncomeRecordViewController alloc] init]; - _mouthRecordVC.incomeType = GuildIncomeType_Clan; - } - return _mouthRecordVC; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGoldIncomeRecordVC.h b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGoldIncomeRecordVC.h deleted file mode 100644 index e0073d6..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGoldIncomeRecordVC.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineGoldIncomeRecordVC.h -// YuMi -// -// Created by YuMi on 2022/12/16. -// - -#import "MvpViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGoldIncomeRecordVC : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGoldIncomeRecordVC.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGoldIncomeRecordVC.m deleted file mode 100644 index a46ab33..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGoldIncomeRecordVC.m +++ /dev/null @@ -1,288 +0,0 @@ -// -// XPMineGoldIncomeRecordVC.m -// YuMi -// -// Created by YuMi on 2022/12/16. -// - -#import "XPMineGoldIncomeRecordVC.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "PLTimeUtil.h" -#import "TTPopup.h" -#import "NSDate+DateUtils.h" - -///Model -#import "GuildIncomeRecordModel.h" -#import "GuildPersonIncomeRecordModel.h" -///View -#import "XPGuildIncomeRecordTableViewCell.h" -#import "XPGuildPersonIncomeTableViewCell.h" -#import "XPMineGuildEmptyTableViewCell.h" -#import "XPIncomeRecordGoldDetailsCell.h" -#import "XPGuildIncomeSectionView.h" -#import "XPGuildAnchorIncomeSectionView.h" -#import "XPGuildIncomeHeaderView.h" -#import "XPGuildTimePickView.h" -#import "XPGuildTimeMonthPickerView.h" -#import "XPGoldIncomeSectionView.h" -#import "XPMineGuildIncomeDetailViewController.h" -#import "XPIncomeRecordGoldDetailsPickViewView.h" - -///P -#import "XPClanPresenter.h" -#import "XPClanProtocol.h" - -@interface XPMineGoldIncomeRecordVC () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///头部的view -@property (nonatomic,strong) XPGuildIncomeHeaderView *headerView; -///数据 -@property (nonatomic,strong) NSArray *datasource; -///结束的时间 -@property (nonatomic,strong) NSDate *endDate; -///开始的时间 -@property (nonatomic,strong) NSDate *startDate; -///当前选择的时间 -@property (nonatomic,strong) NSDate *currentDate; -///选择年月 -@property (nonatomic,strong) XPGuildTimeMonthPickerView *monthPickerView; -///开始的时间戳 -@property (nonatomic,copy) NSString *pi_startTimeStr; -///结束的时间戳 -@property (nonatomic,copy) NSString *pi_endTimeStr; -///头视图 -@property (nonatomic,strong) XPGoldIncomeSectionView *sectionView; -///排序类型，1，钻石排序，2，可结算金币 -@property (nonatomic,assign) int type; -@property (nonatomic,strong) UIView *foodView; -@end - -@implementation XPMineGoldIncomeRecordVC -- (__kindof id)createPresenter { - return [[XPClanPresenter alloc] init]; -} -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - self.type = 1; - [self weekDayWithCurrentDate:[NSDate date]]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - self.headerView.timeType = GuildIncomeRecrdTimeType_Week; - [self.headerView configHeaderView:self.startDate endTime:self.endDate]; - [self.presenter getClanRoomGoldList:self.pi_startTimeStr endTime:self.pi_endTimeStr]; -} - - - - -#pragma mark- XPClanProtocol -- (void)getClanRoomGoldsListSuccess:(XPIncomeRecordGoldDetailsModel *)model{ - self.headerView.totalIncome = model.total; - if(self.type == 1){ - NSArray *list = [model.hallMember sortedArrayUsingComparator:^NSComparisonResult(XPIncomeRecordGoldDetailItemModel * _Nonnull obj1, XPIncomeRecordGoldDetailItemModel * _Nonnull obj2) { - return obj1.giftDiamonds.integerValue < obj2.giftDiamonds.integerValue; - }]; - self.datasource = list; - }else{ - NSArray *list = [model.hallMember sortedArrayUsingComparator:^NSComparisonResult(XPIncomeRecordGoldDetailItemModel * _Nonnull obj1, XPIncomeRecordGoldDetailItemModel * _Nonnull obj2) { - return obj1.remainGolds.integerValue < obj2.remainGolds.integerValue; - }]; - self.datasource = list; - } - - [self.tableView reloadData]; -} -- (void)weekDayWithCurrentDate:(NSDate *)date { - NSCalendar * calendar = [NSCalendar currentCalendar]; // 指定日历的算法 - NSDateComponents *comps = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitWeekday | NSCalendarUnitDay fromDate:date]; - // 获取今天是周几 - // 1 是周日，2是周一 3.以此类推 - NSInteger weekDay = [comps weekday]; - // 获取几天是几号 - NSInteger day = [comps day]; - long firstDiff,lastDiff; - if (weekDay == 1){ - firstDiff = -6; - lastDiff = 0; - } else { - firstDiff = -(weekDay - 2); - lastDiff = 8 - weekDay; - } - // 在当前日期(去掉时分秒)基础上加上差的天数 - NSDateComponents *baseDayComp = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:date]; - //获取周一日期 - [baseDayComp setDay:day + firstDiff]; - NSDate *firstDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.startDate = firstDayOfWeek; - //获取周末日期 - [baseDayComp setDay:day + lastDiff]; - NSDate *lastDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.endDate = lastDayOfWeek; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - [self.view addSubview:self.headerView]; - [self.view addSubview:self.sectionView]; - [self.view addSubview:self.tableView]; -} -- (void)initSubViewConstraints { - [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view); - make.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(124)); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.sectionView.mas_bottom); - }]; -} -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? kGetScaleWidth(71) : 400; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if(self.datasource.count > 0){ - XPIncomeRecordGoldDetailsCell * cell = [tableView dequeueReusableCellWithIdentifier:@"XPIncomeRecordGoldDetailsCellWithClan" forIndexPath:indexPath]; - cell.detailModel = self.datasource[indexPath.row]; - cell.path = indexPath.row; - return cell; - } - XPMineGuildEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineGuildEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - } - return cell; -} -- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - if(self.datasource.count > 0){ - return kGetScaleWidth(108); - } - return 0; -} --(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{ - if(self.datasource.count > 0){ - return self.foodView; - } - - return nil; - -} -#pragma mark- XPGoldIncomeSectionViewDelegate - -- (void)chooseGoldCoinOrder:(int)type isAscending:(BOOL)isAscending{ - if(type == 1){ - self.type = 1; - NSArray *list = [self.datasource sortedArrayUsingComparator:^NSComparisonResult(XPIncomeRecordGoldDetailItemModel * _Nonnull obj1, XPIncomeRecordGoldDetailItemModel * _Nonnull obj2) { - if(isAscending == YES){ - return obj2.giftDiamonds.integerValue > obj1.giftDiamonds.integerValue; - } - return obj1.giftDiamonds.integerValue > obj2.giftDiamonds.integerValue; - }]; - self.datasource = [NSMutableArray arrayWithArray:list]; - [self.tableView reloadData]; - return; - } - self.type = 2; - NSArray *list = [self.datasource sortedArrayUsingComparator:^NSComparisonResult(XPIncomeRecordGoldDetailItemModel * _Nonnull obj1, XPIncomeRecordGoldDetailItemModel * _Nonnull obj2) { - if(isAscending == YES){ - return obj2.remainGolds.integerValue > obj1.remainGolds.integerValue; - } - return obj1.remainGolds.integerValue > obj2.remainGolds.integerValue; - }]; - self.datasource = [NSMutableArray arrayWithArray:list]; - [self.tableView reloadData]; -} - -#pragma mark - XPGuildIncomeHeaderViewDelegate -- (void)xPGuildIncomeHeaderView:(XPGuildIncomeHeaderView *)view didChooseTime:(UIButton *)sender { - XPIncomeRecordGoldDetailsPickViewView *pickViewView = [[XPIncomeRecordGoldDetailsPickViewView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight) curDate:self.startDate]; - pickViewView.delegate = self; - [kWindow addSubview:pickViewView]; -} -#pragma mark - XPIncomeRecordGoldDetailsPickViewViewDelegat -- (void)didClickSureActionWtihStartDate:(NSDate *)startDate endDate:(NSDate *)endDate{ - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:endDate]; - [self.headerView configHeaderView:startDate endTime:endDate]; - [self.presenter getClanRoomGoldList:self.pi_startTimeStr endTime:self.pi_endTimeStr]; -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - Getters And Setters - -//去掉UItableview headerview黏性 -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - CGFloat sectionHeaderHeight = 37; - if (scrollView.contentOffset.y<=sectionHeaderHeight&&scrollView.contentOffset.y>=0) { - scrollView.contentInset = UIEdgeInsetsMake(-scrollView.contentOffset.y, 0, 0, 0); - } else if (scrollView.contentOffset.y>=sectionHeaderHeight) { - scrollView.contentInset = UIEdgeInsetsMake(-sectionHeaderHeight, 0, 0, 0); - } -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineGuildEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - [_tableView registerClass:[XPIncomeRecordGoldDetailsCell class] forCellReuseIdentifier:@"XPIncomeRecordGoldDetailsCellWithClan"]; - } - return _tableView; -} - -- (XPGuildIncomeHeaderView *)headerView { - if (!_headerView) { - _headerView = [[XPGuildIncomeHeaderView alloc] init]; - _headerView.backgroundColor = [UIColor whiteColor]; - _headerView.delegate = self; - } - return _headerView; -} - -- (XPGoldIncomeSectionView *)sectionView{ - if (!_sectionView){ - _sectionView = [[XPGoldIncomeSectionView alloc]initWithFrame:CGRectMake(0, kGetScaleWidth(124), KScreenWidth, kGetScaleWidth(47))]; - _sectionView.delegate = self; - } - return _sectionView; -} -- (UIView *)foodView{ - if (!_foodView){ - _foodView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(108))]; - UILabel *titleView = [[UILabel alloc] init]; - titleView.text = YMLocalizedString(@"XPMineGoldIncomeRecordVC0"); - titleView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - titleView.textColor = [DJDKMIMOMColor disableButtonTextColor]; - titleView.textAlignment = NSTextAlignmentCenter; - titleView.frame = _foodView.bounds; - [_foodView addSubview:titleView]; - } - return _foodView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeDetailViewController.h b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeDetailViewController.h deleted file mode 100644 index f631558..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeDetailViewController.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPMineGuildIncomeDetailViewController.h -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@class GuildPersonIncomeUserInfoModel; -@interface XPMineGuildIncomeDetailViewController : MvpViewController -@property (nonatomic,copy) NSString *hallId; -@property (nonatomic,copy) NSString *startTime; -@property (nonatomic,copy) NSString *endTime; -///用户的x信息 -@property (nonatomic,strong) GuildPersonIncomeUserInfoModel *memberInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeDetailViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeDetailViewController.m deleted file mode 100644 index 857be4f..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeDetailViewController.m +++ /dev/null @@ -1,174 +0,0 @@ -// -// XPMineGuildIncomeDetailViewController.m -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import "XPMineGuildIncomeDetailViewController.h" -///Third -#import -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" - -///Model -#import "GuildPersonIncomeRecordModel.h" -///View -#import "XPGuildIncomeDetailCollectionViewCell.h" -#import "XPGuildEmptyCollectionViewCell.h" -///P -#import "XPGuildIncomeDetailPresenter.h" -#import "XPGuildIncomeDetailProtocol.h" - -@interface XPMineGuildIncomeDetailViewController () -///显示头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///显示昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///数据 -@property (nonatomic,strong) NSArray *datasouce; -@end - -@implementation XPMineGuildIncomeDetailViewController - -- (__kindof id)createPresenter { - return [[XPGuildIncomeDetailPresenter alloc] init];; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initHeaderAndFooterRrfresh]; -} - -#pragma mark - 刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.collectionView.mj_header = header; - - [self headerRefresh]; -} - -- (void)headerRefresh { - if (self.endTime.length <=0) { - self.endTime = @""; - } - [self.presenter getUserIncomeDetailList:self.hallId memberId:self.memberInfo.reciveUid startTimeStr:self.startTime endTimeStr:self.endTime]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineGuildIncomeDetailViewController0"); - [self.view addSubview:self.avatarImageView]; - [self.view addSubview:self.nickLabel]; - [self.view addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(40, 40)); - make.leading.mas_equalTo(self.view).offset(15); - make.top.mas_equalTo(self.view).offset(18); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avatarImageView); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(2); - }]; -} - -#pragma mark - UICOllectionViewDelegate And UICollectionViewDatasource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasouce.count > 0? self.datasouce.count : 1; -} - --(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - CGFloat itemWidth = (KScreenWidth - 10 * 2) / 3.0; - return self.datasouce.count > 0 ? CGSizeMake(itemWidth, itemWidth + 50) : CGSizeMake(KScreenWidth, 500); -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasouce.count > 0) { - XPGuildIncomeDetailCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGuildIncomeDetailCollectionViewCell class]) forIndexPath:indexPath]; - cell.incomeDetailInfo= [self.datasouce xpSafeObjectAtIndex:indexPath.row]; - return cell; - } - - XPGuildEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class]) forIndexPath:indexPath]; - return cell; -} - -#pragma mark - XPGuildIncomeDetailProtocol -- (void)getUserIncomeDetailListSuccess:(NSArray *)array { - [self.collectionView.mj_header endRefreshing]; - self.datasouce = array; - [self.collectionView reloadData]; -} - -- (void)getUserIncomeDetailListFail:(nonnull NSString *)msg { - [self.collectionView.mj_header endRefreshing]; -} - - -#pragma mark - Getters And Setters -- (void)setMemberInfo:(GuildPersonIncomeUserInfoModel *)memberInfo { - _memberInfo = memberInfo; - if (_memberInfo) { - self.avatarImageView.imageUrl = _memberInfo.avatar; - self.nickLabel.text = _memberInfo.nick; - } -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.minimumLineSpacing = 10; - layout.minimumInteritemSpacing = 10; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPGuildIncomeDetailCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGuildIncomeDetailCollectionViewCell class])]; - [_collectionView registerClass:[XPGuildEmptyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class])]; - } - return _collectionView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 40/2; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.text = YMLocalizedString(@"XPMineGuildIncomeDetailViewController1"); - _nickLabel.font = [UIFont systemFontOfSize:15]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.h b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.h deleted file mode 100644 index 31692fb..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// XPMineGuildIncomeRecordViewController.h -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import "MvpViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, GuildIncomeRecrdTimeType) { - ///每日 - GuildIncomeRecrdTimeType_Day = 1, - ///每周 - GuildIncomeRecrdTimeType_Week, - ///每月 - GuildIncomeRecrdTimeType_Mouth, -}; - -typedef NS_ENUM(NSInteger, GuildIncomeType) { - ///家族收入 - GuildIncomeType_Clan = 1, - ///公会收入 - GuildIncomeType_Hall, - ///个播 - GuildIncomeType_Anchor, -}; - -@interface XPMineGuildIncomeRecordViewController : MvpViewController -///时间的类型 -@property (nonatomic,assign) GuildIncomeRecrdTimeType timeType; -///收入类型 -@property (nonatomic,assign) GuildIncomeType incomeType; -///公会的id 或者是家族的id -@property (nonatomic,copy) NSString *guidId; -///个播的时候 传入一个家族的id -@property (nonatomic,copy) NSString *clanId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.m deleted file mode 100644 index 2947650..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.m +++ /dev/null @@ -1,465 +0,0 @@ -// -// XPMineGuildIncomeRecordViewController.m -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import "XPMineGuildIncomeRecordViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "PLTimeUtil.h" -#import "TTPopup.h" -#import "NSDate+DateUtils.h" - -///Model -#import "GuildIncomeRecordModel.h" -#import "GuildPersonIncomeRecordModel.h" -///View -#import "XPGuildIncomeRecordTableViewCell.h" -#import "XPGuildPersonIncomeTableViewCell.h" -#import "XPMineGuildEmptyTableViewCell.h" -#import "XPGuildSingleRoomIncomeTableViewCell.h" -#import "XPGuildIncomeSectionView.h" -#import "XPGuildAnchorIncomeSectionView.h" -#import "XPGuildIncomeHeaderView.h" -#import "XPGuildTimePickView.h" -#import "XPGuildTimeMonthPickerView.h" -#import "XPMineGuildIncomeDetailViewController.h" -///P -#import "XPGuildIncomePresenter.h" -#import "XPGuildIncomeProtocol.h" -#import "PIGuildAnchorIncomeSectionView.h" -#import "PIGuildSingleRoomIncomeCell.h" -@interface XPMineGuildIncomeRecordViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///头部的view -@property (nonatomic,strong) XPGuildIncomeHeaderView *headerView; -///数据 -@property (nonatomic,strong) NSArray *datasource; -///结束的时间 -@property (nonatomic,strong) NSDate *endDate; -///开始的时间 -@property (nonatomic,strong) NSDate *startDate; -///当前选择的时间 -@property (nonatomic,strong) NSDate *currentDate; -///选择年月 -@property (nonatomic,strong) XPGuildTimeMonthPickerView *monthPickerView; -///开始的时间戳 -@property (nonatomic,copy) NSString *pi_startTimeStr; -///结束的时间戳 -@property (nonatomic,copy) NSString *pi_endTimeStr; -@property (nonatomic,strong) UIView *foodView; -@end - -@implementation XPMineGuildIncomeRecordViewController - -- (__kindof id)createPresenter { - return [[XPGuildIncomePresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initHeaderAndFooterRrfresh]; -} - -- (void)viewDidLayoutSubviews { - [super viewDidLayoutSubviews]; - [self initSubViewConstraints]; -} - -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; -} - -- (void)headerRefresh { - if (self.incomeType == GuildIncomeType_Clan) { - [self.presenter getClanTotalIncome:self.guidId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr]; - } else if(self.incomeType == GuildIncomeType_Hall) { - [self.presenter getHallTotalIncome:self.guidId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr]; - } else { -// if (self.clanId.length > 0) { -// [self.presenter getHallAnchorTotalIncome:self.guidId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr]; -// } else { - [self.presenter getClanAnchorTotalIncome:self.guidId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr]; - -// } - } -} -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - [self.view addSubview:self.headerView]; - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view); - make.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(124)); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.headerView.mas_bottom); - }]; -} - -///获取当前时间 的一个月之后的时间 -- (void)monthWithCurrentDate:(NSDate *)newDate { - if (newDate == nil) { - newDate = [NSDate date]; - } - double interval = 0; - NSDate *beginDate = nil; - NSDate *endDate = nil; - NSCalendar *calendar = [NSCalendar currentCalendar]; - [calendar setFirstWeekday:2];//设定周一为周首日 - BOOL ok = [calendar rangeOfUnit:NSCalendarUnitMonth startDate:&beginDate interval:&interval forDate:newDate]; - if (ok) { - endDate = [beginDate dateByAddingTimeInterval:interval-1]; - } else { - return; - } - self.startDate = beginDate; - self.endDate = endDate; -} - -- (void)weekDayWithCurrentDate:(NSDate *)date { - NSCalendar * calendar = [NSCalendar currentCalendar]; // 指定日历的算法 - NSDateComponents *comps = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitWeekday | NSCalendarUnitDay fromDate:date]; - // 获取今天是周几 - // 1 是周日，2是周一 3.以此类推 - NSInteger weekDay = [comps weekday]; - // 获取几天是几号 - NSInteger day = [comps day]; - long firstDiff,lastDiff; - if (weekDay == 1){ - firstDiff = -6; - lastDiff = 0; - } else { - firstDiff = -(weekDay - 2); - lastDiff = 8 - weekDay; - } - // 在当前日期(去掉时分秒)基础上加上差的天数 - NSDateComponents *baseDayComp = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:date]; - //获取周一日期 - [baseDayComp setDay:day + firstDiff]; - NSDate *firstDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.startDate = firstDayOfWeek; - //获取周末日期 - [baseDayComp setDay:day + lastDiff]; - NSDate *lastDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.endDate = lastDayOfWeek; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if(self.incomeType == GuildIncomeType_Anchor){ - return self.datasource.count > 0 ? kGetScaleWidth(75) : 400; - } - return self.datasource.count > 0 ? kGetScaleWidth(71) : 400; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - if (self.incomeType == GuildIncomeType_Clan) { - XPGuildIncomeRecordTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPGuildIncomeRecordTableViewCell class])]; - if (cell == nil) { - cell = [[XPGuildIncomeRecordTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPGuildIncomeRecordTableViewCell class])]; - } - cell.rankNumber = indexPath.row; - cell.userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } else if(self.incomeType == GuildIncomeType_Hall) { - XPGuildPersonIncomeTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPGuildPersonIncomeTableViewCell class])]; - if (cell == nil) { - cell = [[XPGuildPersonIncomeTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPGuildPersonIncomeTableViewCell class])]; - } - cell.userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } else if(self.incomeType == GuildIncomeType_Anchor) { - PIGuildSingleRoomIncomeCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([PIGuildSingleRoomIncomeCell class])]; - cell.userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } - } - XPMineGuildEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineGuildEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - } - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - return kGetScaleWidth(47); -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - if (section == 0) { - if (self.incomeType == GuildIncomeType_Clan || self.incomeType == GuildIncomeType_Hall) { - XPGuildIncomeSectionView * sectionView = [[XPGuildIncomeSectionView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 37)]; - sectionView.incomeType = self.incomeType; - return sectionView; - } else { - PIGuildAnchorIncomeSectionView * sectionView = [[PIGuildAnchorIncomeSectionView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 37)]; - return sectionView; - } - } - return [UIView new]; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - if(self.datasource.count > 0){ - return kGetScaleWidth(108); - } - return 0.01f; -} --(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{ - if(self.datasource.count > 0){ - return self.foodView; - } - - return nil; - -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.incomeType == GuildIncomeType_Hall) { - if (self.datasource.count > 0) { - GuildPersonIncomeUserInfoModel * memberInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - XPMineGuildIncomeDetailViewController * incomeDetailVC = [[XPMineGuildIncomeDetailViewController alloc] init]; - incomeDetailVC.hallId = self.guidId; - incomeDetailVC.startTime = self.pi_startTimeStr; - incomeDetailVC.endTime = self.pi_endTimeStr; - incomeDetailVC.memberInfo = memberInfo; - [self.navigationController pushViewController:incomeDetailVC animated:YES]; - } - - } -} - -#pragma mark - XPGuildIncomeHeaderViewDelegate -- (void)xPGuildIncomeHeaderView:(XPGuildIncomeHeaderView *)view didChooseTime:(UIButton *)sender { - if (self.timeType == GuildIncomeRecrdTimeType_Mouth) { - [self.monthPickerView setDate:[NSDate date] animated:YES]; - [self.monthPickerView show]; - } else { - XPGuildTimePickView * timeView = [[XPGuildTimePickView alloc] init]; - timeView.currentDate = [NSDate date]; - timeView.pickDateType = self.timeType == GuildIncomeRecrdTimeType_Week ? XPGuildTimePickTypeWeek : XPGuildTimePickTypeDay; - timeView.delegate = self; - [TTPopup popupView:timeView style:TTPopupStyleActionSheet]; - } -} - -#pragma mark - XPGuildTimeMonthPickerViewDelegate -- (void)datePicker:(XPGuildTimeMonthPickerView *)datePicker didCancel:(UIButton *)sender { - [TTPopup dismiss]; -} - -- (void)datePicker:(XPGuildTimeMonthPickerView *)dataPicker didSelectedDate:(NSDate *)date { - [TTPopup dismiss]; - [self monthWithCurrentDate:date]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:date]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - [self.headerView configHeaderView:date endTime:nil]; - [self headerRefresh]; -} - -#pragma mark -XPGuildTimePickViewDelegate -- (void)xPGuildTimePickView:(XPGuildTimePickView *)view didClickCancel:(UIButton *)sender { - [TTPopup dismiss]; -} - -- (void)xPGuildTimePickView:(XPGuildTimePickView *)view didClickSure:(UIButton *)sender { - [TTPopup dismiss]; - if (self.timeType == GuildIncomeRecrdTimeType_Week) { - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:view.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:view.endDate]; - [self.headerView configHeaderView:view.startDate endTime:view.endDate]; - } else { - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:view.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:view.endDate];; - [self.headerView configHeaderView:view.startDate endTime:view.endDate]; - } - [self headerRefresh]; -} - -#pragma mark - XPGuildIncomeProtocol -- (void)getClanTotalIncomeScuess:(GuildIncomeRecordModel *)incomeInfo { - [self.tableView.mj_header endRefreshing]; - self.headerView.totalIncome = incomeInfo.total; - self.datasource = incomeInfo.income; - [self.tableView reloadData]; -} - -- (void)getClanTotalIncomeFail:(NSString *)msg { - [self.tableView.mj_header endRefreshing]; -} - -- (void)getHallTotalIncomeScuess:(GuildPersonIncomeRecordModel *)incomeInfo { - [self.tableView.mj_header endRefreshing]; - self.headerView.totalIncome = incomeInfo.total; - self.datasource = incomeInfo.vos; - [self.tableView reloadData]; -} - -- (void)getHallTotalIncomeFail:(NSString *)msg { - [self.tableView.mj_header endRefreshing]; -} - -- (void)getClanAnchorTotalIncomeSuccess:(GuildPersonIncomeRecordModel *)incomeInfo { - [self.tableView.mj_header endRefreshing]; - self.headerView.totalIncome = incomeInfo.totalDiamond; - - - self.datasource = incomeInfo.incomes; - - [self.tableView reloadData]; -} - -- (void)getClanAnchorTotalIncomeFail:(NSString *)msg { - [self.tableView.mj_header endRefreshing]; -} - -- (void)getHallAnchorTotalIncomeSuccess:(GuildPersonIncomeRecordModel *)incomeInfo { - [self.tableView.mj_header endRefreshing]; - self.headerView.totalIncome = incomeInfo.totalDiamond; - self.datasource = incomeInfo.incomes; - [self.tableView reloadData]; -} - -- (void)getHallAnchorTotalIncomeFail:(NSString *)msg { - [self.tableView.mj_header endRefreshing]; -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - Getters And Setters -- (void)setTimeType:(GuildIncomeRecrdTimeType)timeType { - _timeType = timeType; - switch (_timeType) { - case GuildIncomeRecrdTimeType_Day: - self.startDate = [NSDate date]; - self.endDate = [NSDate date]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - break; - case GuildIncomeRecrdTimeType_Week: - [self weekDayWithCurrentDate:[NSDate date]]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - break; - case GuildIncomeRecrdTimeType_Mouth: - [self monthWithCurrentDate:[NSDate date]]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - break; - default: - break; - } - self.headerView.timeType = timeType; - [self.headerView configHeaderView:self.startDate endTime:self.endDate]; - [self headerRefresh]; -} - -//去掉UItableview headerview黏性 -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - CGFloat sectionHeaderHeight = 37; - if (scrollView.contentOffset.y<=sectionHeaderHeight&&scrollView.contentOffset.y>=0) { - scrollView.contentInset = UIEdgeInsetsMake(-scrollView.contentOffset.y, 0, 0, 0); - } else if (scrollView.contentOffset.y>=sectionHeaderHeight) { - scrollView.contentInset = UIEdgeInsetsMake(-sectionHeaderHeight, 0, 0, 0); - } -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPGuildIncomeRecordTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPGuildIncomeRecordTableViewCell class])]; - [_tableView registerClass:[XPGuildPersonIncomeTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPGuildPersonIncomeTableViewCell class])]; - [_tableView registerClass:[XPMineGuildEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - [_tableView registerClass:[XPGuildSingleRoomIncomeTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPGuildSingleRoomIncomeTableViewCell class])]; - [_tableView registerClass:[PIGuildSingleRoomIncomeCell class] forCellReuseIdentifier:NSStringFromClass([PIGuildSingleRoomIncomeCell class])]; - } - return _tableView; -} - -- (XPGuildIncomeHeaderView *)headerView { - if (!_headerView) { - _headerView = [[XPGuildIncomeHeaderView alloc] init]; - _headerView.backgroundColor = [UIColor whiteColor]; - _headerView.delegate = self; - } - return _headerView; -} - -- (XPGuildTimeMonthPickerView *)monthPickerView { - if (!_monthPickerView) { - _monthPickerView = [[XPGuildTimeMonthPickerView alloc] initWithSuperView:self.view]; - _monthPickerView.delegate = self; - _monthPickerView.datePickerMode = HooDatePickerModeYearAndMonth; - [_monthPickerView setTintColor:UIColorFromRGB(0x999999)];//设置主色 - [_monthPickerView setHighlightColor:UIColorFromRGB(0x333333)]; - NSDate * date = [NSDate date]; - NSDateComponents *comps = nil; comps = [[NSCalendar sharedCalendar] components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitMonth fromDate:date]; - NSDateComponents *adcomps = [[NSDateComponents alloc] init]; - [adcomps setYear:-15]; - [adcomps setMonth:0]; - [adcomps setDay:0]; - NSDate *minDate = [[NSCalendar sharedCalendar] dateByAddingComponents:adcomps toDate:date options:0]; - - NSDateComponents *maxcomps = [[NSDateComponents alloc] init]; - [maxcomps setYear:15]; - [maxcomps setMonth:0]; - [maxcomps setDay:0]; - NSDate *maxDate = [[NSCalendar sharedCalendar] dateByAddingComponents:maxcomps toDate:date options:0]; - _monthPickerView.minimumDate = minDate; - _monthPickerView.maximumDate = maxDate; - - } - return _monthPickerView; -} -- (UIView *)foodView{ - if (!_foodView){ - _foodView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(108))]; - UILabel *titleView = [[UILabel alloc] init]; - titleView.text = YMLocalizedString(@"XPMineGoldIncomeRecordVC0"); - titleView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - titleView.textColor = [DJDKMIMOMColor disableButtonTextColor]; - titleView.textAlignment = NSTextAlignmentCenter; - titleView.frame = _foodView.bounds; - [_foodView addSubview:titleView]; - } - return _foodView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.h b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.h deleted file mode 100644 index 81791bc..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPMineGuildIncomeStatisViewController.h -// YuMi -// -// Created by YuMi on 2022/4/11. -// 家族收入统计 - -#import "BaseViewController.h" -#import -#import -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildIncomeStatisViewController : BaseViewController -///公会的id -@property (nonatomic,copy) NSString *hallId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.m deleted file mode 100644 index 2da748d..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.m +++ /dev/null @@ -1,167 +0,0 @@ -// -// XPMineGuildIncomeStatisViewController.m -// YuMi -// -// Created by YuMi on 2022/4/11. -// 公会收入统计 - -#import "XPMineGuildIncomeStatisViewController.h" -///Third -#import -#import -#import -#import -///Tool -#import "UIImage+Utils.h" -#import "DJDKMIMOMColor.h" -///View -#import "XPMineGuildIncomeRecordViewController.h" -#import "XPMineGoldIncomeRecordVC.h" - -@interface XPMineGuildIncomeStatisViewController () -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *contentView; -///日 -@property (nonatomic,strong) XPMineGuildIncomeRecordViewController *dayRecordVC; -///周 -@property (nonatomic,strong) XPMineGuildIncomeRecordViewController *weekRecordVC; -///金币明细 -@property (nonatomic,strong) XPMineGoldIncomeRecordVC *goldIncomeVC; - -@end - -@implementation XPMineGuildIncomeStatisViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPMineGuildIncomeStatisViewController0"); - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.titleView]; - [self.view addSubview:self.contentView]; -} - -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.view).offset(10); - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(30); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleView.mas_bottom); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; -} - -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.dayRecordVC; - } else if(index == 1){ - return self.weekRecordVC; - }else{ - return self.goldIncomeVC; - } -} - -- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index { - if (index == 0) { - self.dayRecordVC.timeType = GuildIncomeRecrdTimeType_Day; - } else if(index == 1){ - self.weekRecordVC.timeType = GuildIncomeRecrdTimeType_Week; - }else{ - - } -} - -#pragma mark - Getters And Setters -- (void)setHallId:(NSString *)hallId { - _hallId = hallId; - self.dayRecordVC.guidId = _hallId; - self.weekRecordVC.guidId = _hallId; - self.dayRecordVC.timeType = GuildIncomeRecrdTimeType_Day; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = [UIColor whiteColor]; - _titleView.titleColor = [DJDKMIMOMColor secondTextColor]; - _titleView.titleSelectedColor = [DJDKMIMOMColor mainTextColor]; - _titleView.titleFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:16]; - _titleView.titleSelectedFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:16]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.cellSpacing = 5; - _titleView.cellWidthIncrement = 5; - _titleView.listContainer = self.contentView; - - JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(16, 3)]; - lineView.indicatorColor = [UIColor colorWithPatternImage:image]; - lineView.indicatorWidth = 16.f; - lineView.indicatorHeight = 3.f; - lineView.indicatorCornerRadius = 1.5f; - _titleView.indicators = @[lineView]; - - } - return _titleView; -} - -- (JXCategoryListContainerView *)contentView { - if (!_contentView) { - _contentView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _contentView.defaultSelectedIndex = 0; - _contentView.backgroundColor = [UIColor whiteColor]; - } - return _contentView; -} - -- (NSArray *)titles { - if (!_titles) { -// _titles = @[YMLocalizedString(@"XPMineGuildIncomeStatisViewController1"), YMLocalizedString(@"XPMineGuildIncomeStatisViewController2"), YMLocalizedString(@"XPMineGuildIncomeStatisViewController3")]; - _titles = @[YMLocalizedString(@"XPMineGuildIncomeStatisViewController1"), YMLocalizedString(@"XPMineGuildIncomeStatisViewController2")]; - } - return _titles; -} - -- (XPMineGuildIncomeRecordViewController *)dayRecordVC { - if (!_dayRecordVC) { - _dayRecordVC = [[XPMineGuildIncomeRecordViewController alloc] init]; - _dayRecordVC.incomeType = GuildIncomeType_Hall; - } - return _dayRecordVC; -} -- (XPMineGoldIncomeRecordVC *)goldIncomeVC{ - if (!_goldIncomeVC){ - _goldIncomeVC = [XPMineGoldIncomeRecordVC new]; - } - return _goldIncomeVC; -} -- (XPMineGuildIncomeRecordViewController *)weekRecordVC { - if (!_weekRecordVC) { - _weekRecordVC = [[XPMineGuildIncomeRecordViewController alloc] init]; - _weekRecordVC.incomeType = GuildIncomeType_Hall; - } - return _weekRecordVC; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillRecordVC.h b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillRecordVC.h deleted file mode 100644 index 32c37bb..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillRecordVC.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPMineGuildPersonalBillRecordVC.h -// xplan-ios -// -// Created by duoban on 2023/7/27. -// - -#import "BaseViewController.h" -#import "MvpViewController.h" -#import -typedef NS_ENUM(NSInteger, GuildBillRecrdTimeType) { - ///每日 - GuildBillRecrdTimeType_Day = 1, - ///每周 - GuildBillRecrdTimeType_Week, - ///每月 - GuildBillRecrdTimeType_Mouth, -}; - - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildPersonalBillRecordVC : MvpViewController -@property(nonatomic,assign) GuildBillRecrdTimeType billType; -@property(nonatomic,copy) NSString *hallId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillRecordVC.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillRecordVC.m deleted file mode 100644 index f47b01c..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillRecordVC.m +++ /dev/null @@ -1,257 +0,0 @@ -// -// XPMineGuildPersonalBillRecordVC.m -// xplan-ios -// -// Created by duoban on 2023/7/27. -// - -#import "XPMineGuildPersonalBillRecordVC.h" -#import "XPMineGuildPersonalBillRecordHeadView.h" -#import "XPMineGuildPersonalBillRecordItemView.h" -#import "XPGuildTimePickView.h" -#import "XPGuildTimeMonthPickerView.h" -#import "PLTimeUtil.h" -#import "XPGuildIncomePresenter.h" -#import "XPMineGuildPersonalBillRecordModel.h" -#import "XPMineGuildPersonalBillRecordContentView.h" -@interface XPMineGuildPersonalBillRecordVC () -///头部 -@property(nonatomic,strong) XPMineGuildPersonalBillRecordHeadView *headView; -@property(nonatomic,strong) XPMineGuildPersonalBillRecordContentView *contentVeiw; - -///结束的时间 -@property (nonatomic,strong) NSDate *endDate; -///开始的时间 -@property (nonatomic,strong) NSDate *startDate; -///当前选择的时间 -@property (nonatomic,strong) NSDate *currentDate; -///选择年月 -@property (nonatomic,strong) XPGuildTimeMonthPickerView *monthPickerView; -///开始的时间戳 -@property (nonatomic,copy) NSString *pi_startTimeStr; -///结束的时间戳 -@property (nonatomic,copy) NSString *pi_endTimeStr; -@property (nonatomic,strong) NSDateFormatter *formatter; -@end - -@implementation XPMineGuildPersonalBillRecordVC -- (__kindof id)createPresenter { - return [[XPGuildIncomePresenter alloc] init]; -} -- (BOOL)isHiddenNavBar { - return YES; -} -- (void)viewDidLoad { - [super viewDidLoad]; - [self installUI]; - [self installConstraints]; -} --(void)installUI{ - [self.view addSubview:self.headView]; - [self.view addSubview:self.contentVeiw]; - -} --(void)installConstraints{ - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(148)); - make.top.mas_equalTo(kGetScaleWidth(0)); - make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(0)); - }]; - [self.contentVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.view); - make.top.equalTo(self.headView.mas_bottom).mas_offset(kGetScaleWidth(0)); - }]; -} -- (void)headerRefresh { - [self.presenter getGuildIncomeTotalListWithhallId:self.hallId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr]; -} -#pragma mark - Getters And Setters -- (void)setBillType:(GuildBillRecrdTimeType)billType { - _billType = billType; - switch (_billType) { - case GuildBillRecrdTimeType_Day: - { - self.startDate = [NSDate date]; - self.endDate = [NSDate date]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.headView.time = [NSString stringWithFormat:@"%@ %@ %@",self.pi_startTimeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),self.pi_endTimeStr]; - } - break; - case GuildBillRecrdTimeType_Week: - { - [self weekDayWithCurrentDate:[NSDate date]]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - self.headView.time = [NSString stringWithFormat:@"%@ %@ %@",self.pi_startTimeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),self.pi_endTimeStr]; - break; - } - case GuildBillRecrdTimeType_Mouth: - { - [self monthWithCurrentDate:[NSDate date]]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - [self.formatter setDateFormat:YMLocalizedString(@"PLTimeUtil3")]; - NSString * currentDay = [self.formatter stringFromDate:[NSDate date]]; - self.headView.time = currentDay; - } - break; - default: - break; - } - - - [self headerRefresh]; -} --(void)getGuildIncomeTotalListSuccess:(XPMineGuildPersonalBillRecordModel *)model{ - self.headView.diamond = model.total; - self.contentVeiw.model = model; -} -- (void)weekDayWithCurrentDate:(NSDate *)date { - NSCalendar * calendar = [NSCalendar currentCalendar]; // 指定日历的算法 - NSDateComponents *comps = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitWeekday | NSCalendarUnitDay fromDate:date]; - // 获取今天是周几 - // 1 是周日，2是周一 3.以此类推 - NSInteger weekDay = [comps weekday]; - // 获取几天是几号 - NSInteger day = [comps day]; - long firstDiff,lastDiff; - if (weekDay == 1){ - firstDiff = -6; - lastDiff = 0; - } else { - firstDiff = [calendar firstWeekday] - weekDay + 1; - lastDiff = 8 - weekDay; - } - // 在当前日期(去掉时分秒)基础上加上差的天数 - NSDateComponents *baseDayComp = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:date]; - //获取周一日期 - [baseDayComp setDay:day + firstDiff]; - NSDate *firstDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.startDate = firstDayOfWeek; - //获取周末日期 - [baseDayComp setDay:day + lastDiff]; - NSDate *lastDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.endDate = lastDayOfWeek; -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} -#pragma mark - XPMineGuildPersonalBillRecordHeadViewDelegate -- (void)xPMineGuildPersonalBillRecordHeadView:(XPMineGuildPersonalBillRecordHeadView *)view didChooseTime:(UILabel *)sender{ - if (self.billType == GuildBillRecrdTimeType_Mouth) { - [self.monthPickerView setDate:[NSDate date] animated:YES]; - [self.monthPickerView show]; - } else { - XPGuildTimePickView * timeView = [[XPGuildTimePickView alloc] init]; - timeView.currentDate = [NSDate date]; - timeView.pickDateType = self.billType == GuildBillRecrdTimeType_Week ? XPGuildTimePickTypeWeek : XPGuildTimePickTypeDay; - timeView.delegate = self; - [TTPopup popupView:timeView style:TTPopupStyleActionSheet]; - } -} -#pragma mark - XPGuildTimeMonthPickerViewDelegate -- (void)datePicker:(XPGuildTimeMonthPickerView *)datePicker didCancel:(UIButton *)sender { - [TTPopup dismiss]; -} - -- (void)datePicker:(XPGuildTimeMonthPickerView *)dataPicker didSelectedDate:(NSDate *)date { - [TTPopup dismiss]; - [self monthWithCurrentDate:date]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:date]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - [self.formatter setDateFormat:YMLocalizedString(@"PLTimeUtil3")]; - NSString * currentDay = [self.formatter stringFromDate:date]; - self.headView.time = currentDay; - [self headerRefresh]; -} - -#pragma mark -XPGuildTimePickViewDelegate -- (void)xPGuildTimePickView:(XPGuildTimePickView *)view didClickCancel:(UIButton *)sender { - [TTPopup dismiss]; -} - -- (void)xPGuildTimePickView:(XPGuildTimePickView *)view didClickSure:(UIButton *)sender { - [TTPopup dismiss]; - if (self.billType == GuildBillRecrdTimeType_Week) { - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:view.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:view.endDate]; - self.headView.time = [NSString stringWithFormat:@"%@ %@ %@",self.pi_startTimeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),self.pi_endTimeStr]; - } else { - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:view.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:view.startDate];; - self.headView.time = [NSString stringWithFormat:@"%@ %@ %@",self.pi_startTimeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),self.pi_endTimeStr]; - - } - [self headerRefresh]; -} -///获取当前时间 的一个月之后的时间 -- (void)monthWithCurrentDate:(NSDate *)newDate { - if (newDate == nil) { - newDate = [NSDate date]; - } - double interval = 0; - NSDate *beginDate = nil; - NSDate *endDate = nil; - NSCalendar *calendar = [NSCalendar currentCalendar]; - [calendar setFirstWeekday:2];//设定周一为周首日 - BOOL ok = [calendar rangeOfUnit:NSCalendarUnitMonth startDate:&beginDate interval:&interval forDate:newDate]; - if (ok) { - endDate = [beginDate dateByAddingTimeInterval:interval-1]; - } else { - return; - } - self.startDate = beginDate; - self.endDate = endDate; -} -#pragma mark - 懒加载 -- (XPMineGuildPersonalBillRecordHeadView *)headView{ - if(!_headView){ - _headView = [[XPMineGuildPersonalBillRecordHeadView alloc]initWithFrame:CGRectZero]; - _headView.delegate = self; - _headView.diamond = @"0"; - } - return _headView; -} - -- (XPGuildTimeMonthPickerView *)monthPickerView { - if (!_monthPickerView) { - _monthPickerView = [[XPGuildTimeMonthPickerView alloc] initWithSuperView:self.view]; - _monthPickerView.delegate = self; - _monthPickerView.datePickerMode = HooDatePickerModeYearAndMonth; - [_monthPickerView setTintColor:UIColorFromRGB(0x999999)];//设置主色 - [_monthPickerView setHighlightColor:UIColorFromRGB(0x333333)]; - NSDate * date = [NSDate date]; - NSDateComponents *comps = nil; comps = [[NSCalendar sharedCalendar] components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitMonth fromDate:date]; - NSDateComponents *adcomps = [[NSDateComponents alloc] init]; - [adcomps setYear:-15]; - [adcomps setMonth:0]; - [adcomps setDay:0]; - NSDate *minDate = [[NSCalendar sharedCalendar] dateByAddingComponents:adcomps toDate:date options:0]; - - NSDateComponents *maxcomps = [[NSDateComponents alloc] init]; - [maxcomps setYear:15]; - [maxcomps setMonth:0]; - [maxcomps setDay:0]; - NSDate *maxDate = [[NSCalendar sharedCalendar] dateByAddingComponents:maxcomps toDate:date options:0]; - _monthPickerView.minimumDate = minDate; - _monthPickerView.maximumDate = maxDate; - - } - return _monthPickerView; -} -- (NSDateFormatter *)formatter { - if (!_formatter) { - _formatter = [[NSDateFormatter alloc] init]; - } - return _formatter; -} -- (XPMineGuildPersonalBillRecordContentView *)contentVeiw{ - if(!_contentVeiw){ - _contentVeiw = [[XPMineGuildPersonalBillRecordContentView alloc]initWithFrame:CGRectZero]; - } - return _contentVeiw; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillStatisVC.h b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillStatisVC.h deleted file mode 100644 index 92c8cf8..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillStatisVC.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPMineGuildPersonalBillStatisVC.h -// xplan-ios -// -// Created by duoban on 2023/7/27. -// - -#import "BaseViewController.h" -#import "MvpViewController.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildPersonalBillStatisVC : MvpViewController - -@property (nonatomic,strong) NSString *guildId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillStatisVC.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillStatisVC.m deleted file mode 100644 index 8835405..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillStatisVC.m +++ /dev/null @@ -1,184 +0,0 @@ -// -// XPMineGuildPersonalBillStatisVC.m -// xplan-ios -// -// Created by duoban on 2023/7/27. -// - -#import "XPMineGuildPersonalBillStatisVC.h" -#import "XPMineClanIncomeStatisViewController.h" -///Third -#import -#import -#import -#import -#import "XPNobleSettingNavView.h" -///Tool - - -///View -#import "XPMineGuildPersonalBillRecordVC.h" -@interface XPMineGuildPersonalBillStatisVC () -@property (nonatomic, strong) XPNobleSettingNavView *navView; -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *contentView; -///日 -@property (nonatomic,strong) XPMineGuildPersonalBillRecordVC *dayRecordVC; -///周 -@property (nonatomic,strong) XPMineGuildPersonalBillRecordVC *weekRecordVC; -///月 -@property (nonatomic,strong) XPMineGuildPersonalBillRecordVC *mouthRecordVC; -@end - -@implementation XPMineGuildPersonalBillStatisVC - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.navView]; - [self.view addSubview:self.titleView]; - [self.view addSubview:self.contentView]; -} - -- (void)initSubViewConstraints { - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.navView.mas_bottom).mas_equalTo(10); - make.leading.mas_equalTo(self.view); - make.trailing.mas_equalTo(-kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(50)); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleView.mas_bottom); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; -} - -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - self.dayRecordVC.hallId = self.guildId; - self.dayRecordVC.billType = GuildBillRecrdTimeType_Day; - return self.dayRecordVC; - } else if(index == 1) { - self.weekRecordVC.hallId = self.guildId; - self.weekRecordVC.billType = GuildBillRecrdTimeType_Week; - return self.weekRecordVC; - } else { - self.mouthRecordVC.hallId = self.guildId; - self.mouthRecordVC.billType = GuildBillRecrdTimeType_Mouth; - return self.mouthRecordVC; - } -} - -- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index { - -} -#pragma mark - XPNobleSettingNavViewDelegate -///点击了返回按钮 -- (void)xPNobleSettingNavView:(XPNobleSettingNavView *)view didClickBackButton:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} -#pragma mark - Getters And Setters - - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = UIColorFromRGB(0xF5F6FA); - _titleView.titleColor = UIColorFromRGB(0x6D6B89); - _titleView.titleSelectedColor = UIColorFromRGB(0x1F1B4F); - _titleView.titleFont = kFontRegular(14); - _titleView.titleSelectedFont = kFontSemibold(16); - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.cellSpacing = kGetScaleWidth(15); - _titleView.cellWidthIncrement = kGetScaleWidth(4); - _titleView.listContainer = self.contentView; - - JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(12), kGetScaleWidth(4)); - lineView.verticalMargin = kGetScaleWidth(4); - lineView.indicatorImageView.image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(12), kGetScaleWidth(4))]; - lineView.indicatorImageView.layer.masksToBounds = YES; - lineView.indicatorImageView.layer.cornerRadius = kGetScaleWidth(4)/2; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (JXCategoryListContainerView *)contentView { - if (!_contentView) { - _contentView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _contentView.defaultSelectedIndex = 0; - } - return _contentView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMineGuildPersonalBillStatisVC1"), YMLocalizedString(@"XPMineGuildPersonalBillStatisVC2"), YMLocalizedString(@"XPMineGuildPersonalBillStatisVC3")]; - } - return _titles; -} - -- (XPMineGuildPersonalBillRecordVC *)dayRecordVC { - if (!_dayRecordVC) { - _dayRecordVC = [[XPMineGuildPersonalBillRecordVC alloc] init]; - - } - return _dayRecordVC; -} - -- (XPMineGuildPersonalBillRecordVC *)weekRecordVC { - if (!_weekRecordVC) { - _weekRecordVC = [[XPMineGuildPersonalBillRecordVC alloc] init]; - - } - return _weekRecordVC; -} - -- (XPMineGuildPersonalBillRecordVC *)mouthRecordVC { - if (!_mouthRecordVC) { - _mouthRecordVC = [[XPMineGuildPersonalBillRecordVC alloc] init]; - - } - return _mouthRecordVC; -} -- (XPNobleSettingNavView *)navView { - if (!_navView) { - _navView = [[XPNobleSettingNavView alloc] init]; - _navView.titleLabel.text = YMLocalizedString(@"XPMineGuildPersonalBillStatisVC0"); - _navView.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - _navView.titleLabel.textColor = UIColorFromRGB(0x1F1B4F); - [_navView.backButton setImage:[kImage(@"common_nav_back")ms_SetImageForRTL] forState:UIControlStateNormal]; - _navView.delegate = self; - } - return _navView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineHallAnchorIncomeStatisViewController.h b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineHallAnchorIncomeStatisViewController.h deleted file mode 100644 index cd756c0..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineHallAnchorIncomeStatisViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineHallAnchorIncomeStatisViewController.h -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineHallAnchorIncomeStatisViewController : BaseViewController -@property (nonatomic,copy) NSString *hallId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineHallAnchorIncomeStatisViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineHallAnchorIncomeStatisViewController.m deleted file mode 100644 index 8f46154..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineHallAnchorIncomeStatisViewController.m +++ /dev/null @@ -1,148 +0,0 @@ -// -// XPMineHallAnchorIncomeStatisViewController.m -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import "XPMineHallAnchorIncomeStatisViewController.h" -///Third -#import -#import -#import -#import -///Tool - -#import "DJDKMIMOMColor.h" -///View -#import "XPMineGuildIncomeRecordViewController.h" - -@interface XPMineHallAnchorIncomeStatisViewController () -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *contentView; -///日 -@property (nonatomic,strong) XPMineGuildIncomeRecordViewController *dayRecordVC; -///周 -@property (nonatomic,strong) XPMineGuildIncomeRecordViewController *weekRecordVC; -@end - -@implementation XPMineHallAnchorIncomeStatisViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = YMLocalizedString(@"XPMineHallAnchorIncomeStatisViewController0"); - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.titleView]; - [self.view addSubview:self.contentView]; -} - -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.view).offset(10); - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(30); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleView.mas_bottom); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; -} - -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.dayRecordVC; - } else { - return self.weekRecordVC; - } -} - -- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index { - if (index == 0) { - self.dayRecordVC.timeType = GuildIncomeRecrdTimeType_Day; - } else { - self.weekRecordVC.timeType = GuildIncomeRecrdTimeType_Week; - } -} - -#pragma mark - Getters And Setters -- (void)setHallId:(NSString *)hallId { - _hallId = hallId; - self.dayRecordVC.guidId = _hallId; - self.weekRecordVC.guidId = _hallId; - self.dayRecordVC.timeType = GuildIncomeRecrdTimeType_Day; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - _titleView.titleColor = [DJDKMIMOMColor secondTextColor]; - _titleView.titleSelectedColor = [DJDKMIMOMColor mainTextColor]; - _titleView.titleFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:16]; - _titleView.titleSelectedFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:16]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.cellSpacing = 5; - _titleView.cellWidthIncrement = 5; - _titleView.listContainer = self.contentView; - - JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init]; - lineView.indicatorColor = [DJDKMIMOMColor appMainColor]; - lineView.indicatorWidth = 8.f; - lineView.indicatorHeight = 4.f; - lineView.indicatorCornerRadius = 2.f; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (JXCategoryListContainerView *)contentView { - if (!_contentView) { - _contentView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _contentView.defaultSelectedIndex = 0; - } - return _contentView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMineHallAnchorIncomeStatisViewController1"), YMLocalizedString(@"XPMineHallAnchorIncomeStatisViewController2")]; - } - return _titles; -} - -- (XPMineGuildIncomeRecordViewController *)dayRecordVC { - if (!_dayRecordVC) { - _dayRecordVC = [[XPMineGuildIncomeRecordViewController alloc] init]; - _dayRecordVC.incomeType = GuildIncomeType_Anchor; - } - return _dayRecordVC; -} - -- (XPMineGuildIncomeRecordViewController *)weekRecordVC { - if (!_weekRecordVC) { - _weekRecordVC = [[XPMineGuildIncomeRecordViewController alloc] init]; - _weekRecordVC.incomeType = GuildIncomeType_Anchor; - } - return _weekRecordVC; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineMainIncomeStatisViewController.h b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineMainIncomeStatisViewController.h deleted file mode 100644 index a6bba8e..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineMainIncomeStatisViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineMainIncomeStatisViewController.h -// YuMi -// -// Created by YuMi on 2022/11/4. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineMainIncomeStatisViewController : MvpViewController -@property (nonatomic,copy) NSString *clanId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineMainIncomeStatisViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineMainIncomeStatisViewController.m deleted file mode 100644 index e748414..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineMainIncomeStatisViewController.m +++ /dev/null @@ -1,174 +0,0 @@ -// -// XPMineMainIncomeStatisViewController.m -// YuMi -// -// Created by YuMi on 2022/11/4. -// - -#import "XPMineMainIncomeStatisViewController.h" -///Third - -#import -#import -#import -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "XPNewMineHallIncomeVC.h" -#import "XPNewMineGuildIncomeRecordViewController.h" -#import "XPNobleSettingNavView.h" -@interface XPMineMainIncomeStatisViewController () -@property (nonatomic, strong) XPNobleSettingNavView *navView; -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *contentView; -///公会收入 -@property (nonatomic,strong) XPNewMineHallIncomeVC *clanIncomeVC; -///主播收入 -@property (nonatomic,strong) XPNewMineGuildIncomeRecordViewController *anchorncomeVC; - -@end - -@implementation XPMineMainIncomeStatisViewController -- (BOOL)isHiddenNavBar { - return YES; -} -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = YMLocalizedString(@"XPMineClanIncomeStatisViewController0"); - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = UIColorFromRGB(0xF5F6FA); - [self.view addSubview:self.navView]; - [self.view addSubview:self.titleView]; - [self.view addSubview:self.contentView]; -} - -- (void)initSubViewConstraints { - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.navView.mas_bottom).offset(0); - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(30); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleView.mas_bottom); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; -} - -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.clanIncomeVC; - } else { - return self.anchorncomeVC; - } -} - -- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index { - -} -#pragma mark - XPNobleSettingNavViewDelegate -///点击了返回按钮 -- (void)xPNobleSettingNavView:(XPNobleSettingNavView *)view didClickBackButton:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} -#pragma mark - Getters And Setters -- (void)setClanId:(NSString *)clanId { - _clanId = clanId; - self.clanIncomeVC.guidId = _clanId; - self.anchorncomeVC.guidId = _clanId; - - self.clanIncomeVC.timeType = NewGuildIncomeRecrdTimeType_Day; - self.anchorncomeVC.timeType = NewGuildIncomeRecrdTimeType_Day; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = UIColorFromRGB(0xF5F6FA); - _titleView.titleColor = [DJDKMIMOMColor secondTextColor]; - _titleView.titleSelectedColor = [DJDKMIMOMColor mainTextColor]; - _titleView.titleFont = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _titleView.titleSelectedFont = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.cellSpacing = 5; - _titleView.cellWidthIncrement = 5; - _titleView.listContainer = self.contentView; - - JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.indicatorImageViewSize = CGSizeMake(16, 3); - lineView.verticalMargin = 0; - lineView.indicatorImageView.image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(16, 3)]; - lineView.indicatorImageView.layer.masksToBounds = YES; - lineView.indicatorImageView.layer.cornerRadius = 1.5; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (JXCategoryListContainerView *)contentView { - if (!_contentView) { - _contentView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _contentView.defaultSelectedIndex = 0; - - } - return _contentView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMineMainIncomeStatisViewController0"), YMLocalizedString(@"XPMineMainIncomeStatisViewController1")]; - } - return _titles; -} - -- (XPNewMineHallIncomeVC *)clanIncomeVC { - if (!_clanIncomeVC) { - _clanIncomeVC = [[XPNewMineHallIncomeVC alloc] init]; - } - return _clanIncomeVC; -} - -- (XPNewMineGuildIncomeRecordViewController *)anchorncomeVC { - if (!_anchorncomeVC) { - _anchorncomeVC = [[XPNewMineGuildIncomeRecordViewController alloc] init]; - _anchorncomeVC.incomeType = NewGuildIncomeType_Anchor; - } - return _anchorncomeVC; -} - - -- (XPNobleSettingNavView *)navView { - if (!_navView) { - _navView = [[XPNobleSettingNavView alloc] init]; - _navView.titleLabel.text = YMLocalizedString(@"XPMineGuildPersonalBillStatisVC0"); - _navView.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - _navView.titleLabel.textColor = UIColorFromRGB(0x1F1B4F); - [_navView.backButton setImage:[kImage(@"common_nav_back")ms_SetImageForRTL] forState:UIControlStateNormal]; - _navView.delegate = self; - } - return _navView; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineGuildIncomeRecordViewController.h b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineGuildIncomeRecordViewController.h deleted file mode 100644 index e3a7155..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineGuildIncomeRecordViewController.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// XPNewMineGuildIncomeRecordViewController.h -// YuMi -// -// Created by YuMi on 2022/11/9. -// - -#import "MvpViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, NewGuildIncomeRecrdTimeType) { - ///每日 - NewGuildIncomeRecrdTimeType_Day = 1, - ///每周 - NewGuildIncomeRecrdTimeType_Week, - ///每月 - NewGuildIncomeRecrdTimeType_Mouth, -}; - -typedef NS_ENUM(NSInteger, NewGuildIncomeType) { - ///家族收入 - NewGuildIncomeType_Clan = 1, - ///个播 - NewGuildIncomeType_Anchor, -}; -@interface XPNewMineGuildIncomeRecordViewController : MvpViewController -///时间的类型 -@property (nonatomic,assign) NewGuildIncomeRecrdTimeType timeType; -///收入类型 -@property (nonatomic,assign) NewGuildIncomeType incomeType; -///公会的id 或者是家族的id -@property (nonatomic,copy) NSString *guidId; -///个播的时候 传入一个家族的id -@property (nonatomic,copy) NSString *clanId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineGuildIncomeRecordViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineGuildIncomeRecordViewController.m deleted file mode 100644 index 7181726..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineGuildIncomeRecordViewController.m +++ /dev/null @@ -1,446 +0,0 @@ -// -// XPNewMineGuildIncomeRecordViewController.m -// YuMi -// -// Created by YuMi on 2022/11/9. -// -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "PLTimeUtil.h" -#import "TTPopup.h" -#import "NSDate+DateUtils.h" - -///Model -#import "GuildIncomeRecordModel.h" -#import "GuildPersonIncomeRecordModel.h" -///View -#import "XPGuildIncomeRecordTableViewCell.h" -#import "XPGuildPersonIncomeTableViewCell.h" -#import "XPMineGuildEmptyTableViewCell.h" -#import "XPGuildSingleRoomIncomeTableViewCell.h" -#import "XPGuildIncomeSectionView.h" -#import "XPGuildAnchorIncomeSectionView.h" -#import "XPNewGuildIncomeHeaderView.h" -#import "XPNewGuildTimePickView.h" -#import "XPGuildTimeMonthPickerView.h" -#import "XPMineGuildIncomeDetailViewController.h" -///P -#import "XPGuildIncomePresenter.h" -#import "XPGuildIncomeProtocol.h" -#import "XPNewMineGuildIncomeRecordViewController.h" - -@interface XPNewMineGuildIncomeRecordViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///头部的view -@property (nonatomic,strong) XPNewGuildIncomeHeaderView *headerView; -///数据 -@property (nonatomic,strong) NSArray *datasource; -///结束的时间 -@property (nonatomic,strong) NSDate *endDate; -///开始的时间 -@property (nonatomic,strong) NSDate *startDate; -///当前选择的时间 -@property (nonatomic,strong) NSDate *currentDate; -///选择年月 -@property (nonatomic,strong) XPGuildTimeMonthPickerView *monthPickerView; -///开始的时间戳 -@property (nonatomic,copy) NSString *pi_startTimeStr; -///结束的时间戳 -@property (nonatomic,copy) NSString *pi_endTimeStr; -@end - -@implementation XPNewMineGuildIncomeRecordViewController -- (BOOL)isHiddenNavBar { - return YES; -} -- (__kindof id)createPresenter { - return [[XPGuildIncomePresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initHeaderAndFooterRrfresh]; - if(self.incomeType == NewGuildIncomeType_Anchor){ - [self headerRefresh]; - } -} - -- (void)viewDidLayoutSubviews { - [super viewDidLayoutSubviews]; - [self initSubViewConstraints]; -} - -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; -} - -- (void)headerRefresh { - if (self.incomeType == NewGuildIncomeType_Clan) { - [self.presenter getClanTotalIncome:self.guidId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr]; - } else { -// if (self.clanId.length > 0) { -// [self.presenter getClanAnchorTotalIncome:self.clanId startTime:self.startTimeStr endTime:self.endTimeStr]; -// } else { - [self.presenter getHallAnchorTotalIncome:self.guidId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr]; -// } - - - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = UIColorFromRGB(0xF5F6FA); - [self.view addSubview:self.headerView]; - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view); - make.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.view).offset(10); - make.height.mas_equalTo(100); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.headerView.mas_bottom); - }]; -} - -///获取当前时间 的一个月之后的时间 -- (void)monthWithCurrentDate:(NSDate *)newDate { - if (newDate == nil) { - newDate = [NSDate date]; - } - double interval = 0; - NSDate *beginDate = nil; - NSDate *endDate = nil; - NSCalendar *calendar = [NSCalendar currentCalendar]; - [calendar setFirstWeekday:2];//设定周一为周首日 - BOOL ok = [calendar rangeOfUnit:NSCalendarUnitMonth startDate:&beginDate interval:&interval forDate:newDate]; - if (ok) { - endDate = [beginDate dateByAddingTimeInterval:interval-1]; - } else { - return; - } - self.startDate = beginDate; - self.endDate = endDate; -} - -- (void)weekDayWithCurrentDate:(NSDate *)date { - NSCalendar * calendar = [NSCalendar currentCalendar]; // 指定日历的算法 - NSDateComponents *comps = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitWeekday | NSCalendarUnitDay fromDate:date]; - // 获取今天是周几 - // 1 是周日，2是周一 3.以此类推 - NSInteger weekDay = [comps weekday]; - // 获取几天是几号 - NSInteger day = [comps day]; - long firstDiff,lastDiff; - if (weekDay == 1){ - firstDiff = -6; - lastDiff = 0; - } else { - firstDiff = -(weekDay - 2); - lastDiff = 8 - weekDay; - } - // 在当前日期(去掉时分秒)基础上加上差的天数 - NSDateComponents *baseDayComp = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:date]; - //获取周一日期 - [baseDayComp setDay:day + firstDiff]; - NSDate *firstDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.startDate = firstDayOfWeek; - //获取周末日期 - [baseDayComp setDay:day + lastDiff]; - NSDate *lastDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.endDate = lastDayOfWeek; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if(self.incomeType == NewGuildIncomeType_Anchor){ - return self.datasource.count > 0 ? kGetScaleWidth(93) : 400; - } - return self.datasource.count > 0 ? 90 : 400; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - if (self.incomeType == NewGuildIncomeType_Clan) { - XPGuildIncomeRecordTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPGuildIncomeRecordTableViewCell class])]; - if (cell == nil) { - cell = [[XPGuildIncomeRecordTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPGuildIncomeRecordTableViewCell class])]; - } - cell.rankNumber = indexPath.row; - cell.userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } else if(self.incomeType == NewGuildIncomeType_Anchor) { - XPGuildSingleRoomIncomeTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPGuildSingleRoomIncomeTableViewCell class])]; - if (cell == nil) { - cell = [[XPGuildSingleRoomIncomeTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPGuildSingleRoomIncomeTableViewCell class])]; - } - - cell.userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.rankNumber = indexPath.row; - return cell; - } - } - XPMineGuildEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineGuildEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - } - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - - return 47; -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - if (section == 0) { - if (self.incomeType == NewGuildIncomeType_Clan) { - - if(self.incomeType == NewGuildIncomeType_Clan){ - XPGuildIncomeSectionView * newSectionView = [[XPGuildIncomeSectionView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 47) right:124]; - newSectionView.incomeType = GuildIncomeType_Clan; - - return newSectionView; - } - XPGuildIncomeSectionView * sectionView = [[XPGuildIncomeSectionView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 47)]; - - GuildIncomeType type = GuildIncomeType_Anchor;; - sectionView.incomeType = type ; - return sectionView; - } else { - XPGuildAnchorIncomeSectionView * sectionView = [[XPGuildAnchorIncomeSectionView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 47)]; - sectionView.isHost = YES; - - return sectionView; - } - } - return [UIView new]; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - return 0.01f; -} - -- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{ - return [[UIView alloc]init]; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - -} - -#pragma mark - XPGuildIncomeHeaderViewDelegate -- (void)xPNewGuildIncomeHeaderView:(XPNewGuildIncomeHeaderView *)view didChooseTime:(UIButton *)sender { - if (self.timeType == NewGuildIncomeRecrdTimeType_Mouth) { - [self.monthPickerView setDate:[NSDate date] animated:YES]; - [self.monthPickerView show]; - } else { - XPNewGuildTimePickView * timeView = [[XPNewGuildTimePickView alloc] init]; - timeView.currentDate = [NSDate date]; - timeView.pickDateType = self.timeType == NewGuildIncomeRecrdTimeType_Week ? XPNewGuildTimePickTypeWeek : XPNewGuildTimePickTypeDay; - timeView.delegate = self; - [TTPopup popupView:timeView style:TTPopupStyleActionSheet]; - } -} - -#pragma mark - XPGuildTimeMonthPickerViewDelegate -- (void)datePicker:(XPGuildTimeMonthPickerView *)datePicker didCancel:(UIButton *)sender { - [TTPopup dismiss]; -} - -- (void)datePicker:(XPGuildTimeMonthPickerView *)dataPicker didSelectedDate:(NSDate *)date { - [TTPopup dismiss]; - [self monthWithCurrentDate:date]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:date]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - [self.headerView configHeaderView:date endTime:nil]; - [self headerRefresh]; -} - -#pragma mark -XPGuildTimePickViewDelegate -- (void)xPNewGuildTimePickView:(XPNewGuildTimePickView *)view didClickCancel:(UIButton *)sender { - [TTPopup dismiss]; -} - -- (void)xPNewGuildTimePickView:(XPNewGuildTimePickView *)view didClickSure:(UIButton *)sender { - [TTPopup dismiss]; - if (self.timeType == NewGuildIncomeRecrdTimeType_Week) { - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:view.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:view.endDate]; - [self.headerView configHeaderView:view.startDate endTime:view.endDate]; - } else { - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:view.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:view.endDate];; - [self.headerView configHeaderView:view.startDate endTime:view.endDate]; - } - [self headerRefresh]; -} - -#pragma mark - XPGuildIncomeProtocol -- (void)getClanTotalIncomeScuess:(GuildIncomeRecordModel *)incomeInfo { - [self.tableView.mj_header endRefreshing]; - self.headerView.totalIncome = incomeInfo.total; - self.datasource = incomeInfo.income; - [self.tableView reloadData]; -} - -- (void)getClanTotalIncomeFail:(NSString *)msg { - [self.tableView.mj_header endRefreshing]; -} - -- (void)getHallTotalIncomeScuess:(GuildPersonIncomeRecordModel *)incomeInfo { - [self.tableView.mj_header endRefreshing]; - self.headerView.totalIncome = incomeInfo.total; - self.datasource = incomeInfo.vos; - [self.tableView reloadData]; -} - -- (void)getHallTotalIncomeFail:(NSString *)msg { - [self.tableView.mj_header endRefreshing]; -} - -- (void)getClanAnchorTotalIncomeSuccess:(GuildPersonIncomeRecordModel *)incomeInfo { - [self.tableView.mj_header endRefreshing]; - self.headerView.totalIncome = incomeInfo.totalDiamond; - self.datasource = incomeInfo.incomes; - [self.tableView reloadData]; - -} - -- (void)getClanAnchorTotalIncomeFail:(NSString *)msg { - [self.tableView.mj_header endRefreshing]; -} - -- (void)getHallAnchorTotalIncomeSuccess:(GuildPersonIncomeRecordModel *)incomeInfo { - [self.tableView.mj_header endRefreshing]; - self.headerView.totalIncome = incomeInfo.total; - self.datasource = incomeInfo.memberIncome; - [self.tableView reloadData]; -} - -- (void)getHallAnchorTotalIncomeFail:(NSString *)msg { - [self.tableView.mj_header endRefreshing]; -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - Getters And Setters -- (void)setTimeType:(NewGuildIncomeRecrdTimeType)timeType { - _timeType = timeType; - switch (_timeType) { - case NewGuildIncomeRecrdTimeType_Day: - self.startDate = [NSDate date]; - self.endDate = [NSDate date]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - break; - case NewGuildIncomeRecrdTimeType_Week: - [self weekDayWithCurrentDate:[NSDate date]]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - break; - case NewGuildIncomeRecrdTimeType_Mouth: - [self monthWithCurrentDate:[NSDate date]]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - break; - default: - break; - } - self.headerView.timeType = timeType; - [self.headerView configHeaderView:self.startDate endTime:self.endDate]; - if(self.incomeType == NewGuildIncomeType_Anchor){ - return; - } - [self headerRefresh]; -} - -//去掉UItableview headerview黏性 -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - CGFloat sectionHeaderHeight = 37; - if (scrollView.contentOffset.y<=sectionHeaderHeight&&scrollView.contentOffset.y>=0) { - scrollView.contentInset = UIEdgeInsetsMake(-scrollView.contentOffset.y, 0, 0, 0); - } else if (scrollView.contentOffset.y>=sectionHeaderHeight) { - scrollView.contentInset = UIEdgeInsetsMake(-sectionHeaderHeight, 0, 0, 0); - } -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor whiteColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPGuildIncomeRecordTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPGuildIncomeRecordTableViewCell class])]; - [_tableView registerClass:[XPGuildPersonIncomeTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPGuildPersonIncomeTableViewCell class])]; - [_tableView registerClass:[XPMineGuildEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - [_tableView registerClass:[XPGuildSingleRoomIncomeTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPGuildSingleRoomIncomeTableViewCell class])]; - } - return _tableView; -} - -- (XPNewGuildIncomeHeaderView *)headerView { - if (!_headerView) { - _headerView = [[XPNewGuildIncomeHeaderView alloc] init]; - _headerView.delegate = self; - _headerView.backgroundColor = UIColorFromRGB(0xF5F6FA); - } - return _headerView; -} - -- (XPGuildTimeMonthPickerView *)monthPickerView { - if (!_monthPickerView) { - _monthPickerView = [[XPGuildTimeMonthPickerView alloc] initWithSuperView:self.view]; - _monthPickerView.delegate = self; - _monthPickerView.datePickerMode = HooDatePickerModeYearAndMonth; - [_monthPickerView setTintColor:UIColorFromRGB(0x999999)];//设置主色 - [_monthPickerView setHighlightColor:UIColorFromRGB(0x333333)]; - NSDate * date = [NSDate date]; - NSDateComponents *comps = nil; comps = [[NSCalendar sharedCalendar] components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitMonth fromDate:date]; - NSDateComponents *adcomps = [[NSDateComponents alloc] init]; - [adcomps setYear:-15]; - [adcomps setMonth:0]; - [adcomps setDay:0]; - NSDate *minDate = [[NSCalendar sharedCalendar] dateByAddingComponents:adcomps toDate:date options:0]; - - NSDateComponents *maxcomps = [[NSDateComponents alloc] init]; - [maxcomps setYear:15]; - [maxcomps setMonth:0]; - [maxcomps setDay:0]; - NSDate *maxDate = [[NSCalendar sharedCalendar] dateByAddingComponents:maxcomps toDate:date options:0]; - _monthPickerView.minimumDate = minDate; - _monthPickerView.maximumDate = maxDate; - - } - return _monthPickerView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.h b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.h deleted file mode 100644 index dc795fd..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPNewMineHallIncomeVC.h -// YuMi -// -// Created by duoban on 2023/8/7. -// -#import -#import "MvpViewController.h" -#import "XPNewMineGuildIncomeRecordViewController.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPNewMineHallIncomeVC : MvpViewController -///时间的类型 -@property (nonatomic,assign) NewGuildIncomeRecrdTimeType timeType; -//公会的id 或者是家族的id -@property (nonatomic,copy) NSString *guidId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.m deleted file mode 100644 index 0ffa0d3..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.m +++ /dev/null @@ -1,358 +0,0 @@ -// -// XPNewMineHallIncomeVC.m -// YuMi -// -// Created by duoban on 2023/8/7. -// - -#import "XPNewMineHallIncomeVC.h" -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "PLTimeUtil.h" -#import "TTPopup.h" -#import "NSDate+DateUtils.h" - -///Model -#import "GuildIncomeRecordModel.h" -#import "GuildPersonIncomeRecordModel.h" -///View -#import "XPGuildIncomeRecordTableViewCell.h" -#import "XPGuildPersonIncomeTableViewCell.h" -#import "XPMineGuildEmptyTableViewCell.h" -#import "XPGuildSingleRoomIncomeTableViewCell.h" -#import "XPGuildIncomeSectionView.h" -#import "XPGuildAnchorIncomeSectionView.h" -#import "XPMineGuildPersonalBillRecordHeadView.h" -#import "XPNewGuildTimePickView.h" -#import "XPGuildTimeMonthPickerView.h" -#import "XPMineGuildIncomeDetailViewController.h" -#import "XPNewMineHallIncomeCell.h" -///P -#import "XPGuildIncomePresenter.h" -#import "XPGuildIncomeProtocol.h" -#import "XPNewMineGuildIncomeRecordViewController.h" -@interface XPNewMineHallIncomeVC () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///头部的view -@property (nonatomic,strong) XPMineGuildPersonalBillRecordHeadView *headerView; -///数据 -@property (nonatomic,strong) NSArray *datasource; -///结束的时间 -@property (nonatomic,strong) NSDate *endDate; -///开始的时间 -@property (nonatomic,strong) NSDate *startDate; -///当前选择的时间 -@property (nonatomic,strong) NSDate *currentDate; -///选择年月 -@property (nonatomic,strong) XPGuildTimeMonthPickerView *monthPickerView; -///开始的时间戳 -@property (nonatomic,copy) NSString *pi_startTimeStr; -///结束的时间戳 -@property (nonatomic,copy) NSString *pi_endTimeStr; -@property (nonatomic,strong) NSDateFormatter *formatter; -@end - -@implementation XPNewMineHallIncomeVC -- (BOOL)isHiddenNavBar { - return YES; -} -- (__kindof id)createPresenter { - return [[XPGuildIncomePresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initHeaderAndFooterRrfresh]; - [self headerRefresh]; - -} - -- (void)viewDidLayoutSubviews { - [super viewDidLayoutSubviews]; - [self initSubViewConstraints]; -} - -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; -} - -- (void)headerRefresh { - - [self.presenter getClanTotalIncome:self.guidId startTime:self.pi_startTimeStr endTime:self.pi_endTimeStr]; - -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = UIColorFromRGB(0xF5F6FA); - [self.view addSubview:self.headerView]; - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view); - make.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.view).offset(0); - make.height.mas_equalTo(kGetScaleWidth(148)); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.headerView.mas_bottom); - }]; -} - -///获取当前时间 的一个月之后的时间 -- (void)monthWithCurrentDate:(NSDate *)newDate { - if (newDate == nil) { - newDate = [NSDate date]; - } - double interval = 0; - NSDate *beginDate = nil; - NSDate *endDate = nil; - NSCalendar *calendar = [NSCalendar currentCalendar]; - [calendar setFirstWeekday:2];//设定周一为周首日 - BOOL ok = [calendar rangeOfUnit:NSCalendarUnitMonth startDate:&beginDate interval:&interval forDate:newDate]; - if (ok) { - endDate = [beginDate dateByAddingTimeInterval:interval-1]; - } else { - return; - } - self.startDate = beginDate; - self.endDate = endDate; -} - -- (void)weekDayWithCurrentDate:(NSDate *)date { - NSCalendar * calendar = [NSCalendar currentCalendar]; // 指定日历的算法 - NSDateComponents *comps = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitWeekday | NSCalendarUnitDay fromDate:date]; - // 获取今天是周几 - // 1 是周日，2是周一 3.以此类推 - NSInteger weekDay = [comps weekday]; - // 获取几天是几号 - NSInteger day = [comps day]; - long firstDiff,lastDiff; - if (weekDay == 1){ - firstDiff = -6; - lastDiff = 0; - } else { - firstDiff = -(weekDay - 2); - lastDiff = 8 - weekDay; - } - // 在当前日期(去掉时分秒)基础上加上差的天数 - NSDateComponents *baseDayComp = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:date]; - //获取周一日期 - [baseDayComp setDay:day + firstDiff]; - NSDate *firstDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.startDate = firstDayOfWeek; - //获取周末日期 - [baseDayComp setDay:day + lastDiff]; - NSDate *lastDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.endDate = lastDayOfWeek; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - - return self.datasource.count > 0 ? kGetScaleWidth(232) : 400; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPNewMineHallIncomeCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPNewMineHallIncomeCell class]) forIndexPath:indexPath]; - - cell.rankNumber = indexPath.row; - cell.userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } - XPMineGuildEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineGuildEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - } - return cell; -} - -#pragma mark - XPGuildIncomeHeaderViewDelegate - -- (void)xPMineGuildPersonalBillRecordHeadView:(XPMineGuildPersonalBillRecordHeadView *_Nonnull)view didChooseTime:(UILabel *_Nullable)sender{ - - if (self.timeType == NewGuildIncomeRecrdTimeType_Mouth) { - [self.monthPickerView setDate:[NSDate date] animated:YES]; - [self.monthPickerView show]; - } else { - XPNewGuildTimePickView * timeView = [[XPNewGuildTimePickView alloc] init]; - timeView.currentDate = [NSDate date]; - timeView.pickDateType = self.timeType == NewGuildIncomeRecrdTimeType_Week ? XPNewGuildTimePickTypeWeek : XPNewGuildTimePickTypeDay; - timeView.delegate = self; - [TTPopup popupView:timeView style:TTPopupStyleActionSheet]; - } -} - - -#pragma mark - XPGuildTimeMonthPickerViewDelegate -- (void)datePicker:(XPGuildTimeMonthPickerView *)datePicker didCancel:(UIButton *)sender { - [TTPopup dismiss]; -} - -- (void)datePicker:(XPGuildTimeMonthPickerView *)dataPicker didSelectedDate:(NSDate *)date { - [TTPopup dismiss]; - [self monthWithCurrentDate:date]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:date]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - self.headerView.time = [NSString stringWithFormat:@"%@ %@ %@",self.pi_startTimeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),self.pi_endTimeStr]; - [self headerRefresh]; -} - -#pragma mark -XPGuildTimePickViewDelegate -- (void)xPNewGuildTimePickView:(XPNewGuildTimePickView *)view didClickCancel:(UIButton *)sender { - [TTPopup dismiss]; -} - -- (void)xPNewGuildTimePickView:(XPNewGuildTimePickView *)view didClickSure:(UIButton *)sender { - [TTPopup dismiss]; - if (self.timeType == NewGuildIncomeRecrdTimeType_Week) { - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:view.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:view.endDate]; - self.headerView.time = [NSString stringWithFormat:@"%@ %@ %@",self.pi_startTimeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),self.pi_endTimeStr]; - } else { - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:view.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:view.endDate];; - self.headerView.time = [NSString stringWithFormat:@"%@ %@ %@",self.pi_startTimeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),self.pi_endTimeStr]; - } - [self headerRefresh]; -} - -#pragma mark - XPGuildIncomeProtocol -- (void)getClanTotalIncomeScuess:(GuildIncomeRecordModel *)incomeInfo { - [self.tableView.mj_header endRefreshing]; - self.headerView.diamond = incomeInfo.total; - self.datasource = incomeInfo.income; - [self.tableView reloadData]; -} - -- (void)getClanTotalIncomeFail:(NSString *)msg { - [self.tableView.mj_header endRefreshing]; -} - - - - - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - Getters And Setters -- (void)setTimeType:(NewGuildIncomeRecrdTimeType)timeType { - _timeType = timeType; - switch (_timeType) { - case NewGuildIncomeRecrdTimeType_Day: - self.startDate = [NSDate date]; - self.endDate = [NSDate date]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.headerView.time = [NSString stringWithFormat:@"%@ %@ %@",self.pi_startTimeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),self.pi_endTimeStr]; - break; - case NewGuildIncomeRecrdTimeType_Week: - [self weekDayWithCurrentDate:[NSDate date]]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - self.headerView.time = [NSString stringWithFormat:@"%@ %@ %@",self.pi_startTimeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),self.pi_endTimeStr]; - break; - case NewGuildIncomeRecrdTimeType_Mouth: - { - [self monthWithCurrentDate:[NSDate date]]; - self.pi_startTimeStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - self.pi_endTimeStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - [self.formatter setDateFormat:YMLocalizedString(@"PLTimeUtil3")]; - NSString * currentDay = [self.formatter stringFromDate:[NSDate date]]; - self.headerView.time = currentDay; - break; - } - default: - break; - } - - [self headerRefresh]; -} - -//去掉UItableview headerview黏性 -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - CGFloat sectionHeaderHeight = 37; - if (scrollView.contentOffset.y<=sectionHeaderHeight&&scrollView.contentOffset.y>=0) { - scrollView.contentInset = UIEdgeInsetsMake(-scrollView.contentOffset.y, 0, 0, 0); - } else if (scrollView.contentOffset.y>=sectionHeaderHeight) { - scrollView.contentInset = UIEdgeInsetsMake(-sectionHeaderHeight, 0, 0, 0); - } -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPNewMineHallIncomeCell class] forCellReuseIdentifier:NSStringFromClass([XPNewMineHallIncomeCell class])]; - } - return _tableView; -} - -- (XPMineGuildPersonalBillRecordHeadView *)headerView { - if (!_headerView) { - _headerView = [[XPMineGuildPersonalBillRecordHeadView alloc] init]; - _headerView.delegate = self; - } - return _headerView; -} - -- (XPGuildTimeMonthPickerView *)monthPickerView { - if (!_monthPickerView) { - _monthPickerView = [[XPGuildTimeMonthPickerView alloc] initWithSuperView:self.view]; - _monthPickerView.delegate = self; - _monthPickerView.datePickerMode = HooDatePickerModeYearAndMonth; - [_monthPickerView setTintColor:UIColorFromRGB(0x999999)];//设置主色 - [_monthPickerView setHighlightColor:UIColorFromRGB(0x333333)]; - NSDate * date = [NSDate date]; - NSDateComponents *comps = nil; comps = [[NSCalendar sharedCalendar] components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitMonth fromDate:date]; - NSDateComponents *adcomps = [[NSDateComponents alloc] init]; - [adcomps setYear:-15]; - [adcomps setMonth:0]; - [adcomps setDay:0]; - NSDate *minDate = [[NSCalendar sharedCalendar] dateByAddingComponents:adcomps toDate:date options:0]; - - NSDateComponents *maxcomps = [[NSDateComponents alloc] init]; - [maxcomps setYear:15]; - [maxcomps setMonth:0]; - [maxcomps setDay:0]; - NSDate *maxDate = [[NSCalendar sharedCalendar] dateByAddingComponents:maxcomps toDate:date options:0]; - _monthPickerView.minimumDate = minDate; - _monthPickerView.maximumDate = maxDate; - - } - return _monthPickerView; -} -- (NSDateFormatter *)formatter { - if (!_formatter) { - _formatter = [[NSDateFormatter alloc] init]; - } - return _formatter; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerPerViewController.h b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerPerViewController.h deleted file mode 100644 index d8f618f..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerPerViewController.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPMineGuildManagerPerViewController.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@class ClanMemberInfoModel; -@interface XPMineGuildManagerPerViewController : MvpViewController -///公会de ID -@property (nonatomic,copy) NSString *guildId; -///管理员的信息 -@property (nonatomic,strong) ClanMemberInfoModel *managerInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerPerViewController.m b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerPerViewController.m deleted file mode 100644 index 988904b..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerPerViewController.m +++ /dev/null @@ -1,321 +0,0 @@ -// -// XPMineGuildManagerPerViewController.m -// YuMi -// -// Created by YuMi on 2022/4/8. -// 管理权限 - -#import "XPMineGuildManagerPerViewController.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -#import "NetImageView.h" -#import "TTPopup.h" -///Model -#import "ClanMemberDetailInfoModel.h" -#import "GuildAuthModel.h" -///View -#import "XPMineGuildManagerPerTableViewCell.h" -///P -#import "XPGuildManagerPerPresenter.h" -#import "XPGuildManagerPerProtocol.h" -@interface XPMineGuildManagerPerViewController () -///导航啦 -@property (nonatomic,strong) UIView * navView; -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///完成 -@property (nonatomic,strong) UIButton *completionButton; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///用户信息 -@property (nonatomic,strong) UIView * contentView; -///用户头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///用户昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///数据源 -@property (nonatomic,strong) NSArray *datasource; -///权限的数组 -@property (nonatomic,strong) NSMutableArray *authArray; -///改变的数组 -@property (nonatomic,strong) NSMutableArray *changeArray; -@end - -@implementation XPMineGuildManagerPerViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (__kindof id)createPresenter { - return [[XPGuildManagerPerPresenter alloc] init];; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self.presenter getGuildRoomManagerPermiss:self.managerInfo.uid]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.titleLabel.text = YMLocalizedString(@"XPMineGuildManagerPerViewController0"); - [self.view addSubview:self.navView]; - [self.view addSubview:self.contentView]; - [self.view addSubview:self.tableView]; - - [self.navView addSubview:self.backButton]; - [self.navView addSubview:self.titleLabel]; - [self.navView addSubview:self.completionButton]; - - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickLabel]; -} - -- (void)initSubViewConstraints { - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).mas_offset(10); - make.top.mas_equalTo(statusbarHeight); - make.height.width.mas_equalTo(44); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.navView); - make.centerY.mas_equalTo(self.backButton); - }]; - - [self.completionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.navView).offset(-15); - make.centerY.mas_equalTo(self.backButton); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.navView.mas_bottom); - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(50); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(40, 40)); - make.leading.mas_equalTo(self.contentView).offset(15); - make.top.mas_equalTo(self.contentView).offset(10); - }]; - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avatarImageView); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - }]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.contentView.mas_bottom); - }]; - - -} - - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 70; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPMineGuildManagerPerTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGuildManagerPerTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineGuildManagerPerTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineGuildManagerPerTableViewCell class])]; - } - GuildAuthModel * authInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.authInfo = authInfo; - cell.delegate = self; - if (authInfo.status) { - if (![self.authArray containsObject:authInfo.code]) { - [self.authArray addObject:authInfo.code]; - } - } else { - if ([self.authArray containsObject:authInfo.code]) { - [self.authArray removeObject:authInfo.code]; - } - } - return cell; -} - -#pragma mark - XPMineGuildManagerPerTableViewCellDelegate -- (void)xPMineGuildManagerPerTableViewCell:(UISwitch *)onswitch authInfo:(GuildAuthModel *)authInfo { - if (onswitch.on) { - if (![self.authArray containsObject:authInfo.code]) { - [self.authArray addObject:authInfo.code]; - } - - if (![self.changeArray containsObject:authInfo.code]) { - [self.changeArray addObject:authInfo.code]; - } - - } else { - if ([self.authArray containsObject:authInfo.code]) { - [self.authArray removeObject:authInfo.code]; - } - - if ([self.changeArray containsObject:authInfo.code]) { - [self.changeArray removeObject:authInfo.code]; - } - } -} - -#pragma mark - ClanMemberDetailInfoModel -- (void)getGuildRoomManagerPermissSuccess:(NSArray *)array { - self.datasource = array; - [self.tableView reloadData]; -} - -- (void)updateGuildRoomManagerPermissSuccess { - [self showSuccessToast:YMLocalizedString(@"XPMineGuildManagerPerViewController1")]; - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - Event Response -- (void)completionButtonAction:(UIButton *)sender { - if (self.authArray.count > 0) { - NSString *authStr = [[self.authArray componentsJoinedByString:@","] stringByAppendingString:@","]; - [self.presenter updateGuildRoomManagerPermiss:self.guildId managerUid:self.managerInfo.uid authStr:authStr]; - } else { - [self.presenter updateGuildRoomManagerPermiss:self.guildId managerUid:self.managerInfo.uid authStr:@""]; - } -} - -- (void)backButtonAction:(UIButton *)sender { - if (self.changeArray.count == 0) { - [self.navigationController popViewControllerAnimated:YES]; - return; - } - - [TTPopup alertWithMessage:YMLocalizedString(@"XPMineGuildManagerPerViewController2") confirmHandler:^{ - [self.navigationController popViewControllerAnimated:YES]; - } cancelHandler:^{ - }]; -} - -#pragma mark - Getters And Setters -- (void)setManagerInfo:(ClanMemberInfoModel *)managerInfo { - _managerInfo = managerInfo; - if (_managerInfo) { - self.avatarImageView.imageUrl = _managerInfo.avatar; - self.nickLabel.text = _managerInfo.nick; - } -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - } - return _contentView; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.scrollEnabled = NO; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineGuildManagerPerTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGuildManagerPerTableViewCell class])]; - } - return _tableView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 20; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel{ - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _nickLabel.font = [UIFont systemFontOfSize:15.f]; - } - return _nickLabel; -} - -- (UIView *)navView { - if (!_navView) { - _navView = [[UIView alloc] init]; - _navView.backgroundColor = [UIColor whiteColor]; - } - return _navView; -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - _backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - - -- (UIButton *)completionButton { - if (!_completionButton) { - _completionButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_completionButton setTitle:YMLocalizedString(@"XPMineGuildManagerPerViewController3") forState:UIControlStateNormal]; - [_completionButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - _completionButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_completionButton addTarget:self action:@selector(completionButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _completionButton; -} - - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont boldSystemFontOfSize:18]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (NSMutableArray *)authArray { - if (!_authArray) { - _authArray = [NSMutableArray array]; - } - return _authArray; -} - -- (NSMutableArray *)changeArray { - if (!_changeArray) { - _changeArray = [NSMutableArray array]; - } - return _changeArray; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerSetViewController.h b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerSetViewController.h deleted file mode 100644 index fd79209..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerSetViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineGuildManagerSetViewController.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildManagerSetViewController : MvpViewController -@property (nonatomic,copy) NSString *guildId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerSetViewController.m b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerSetViewController.m deleted file mode 100644 index 46d8be9..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerSetViewController.m +++ /dev/null @@ -1,270 +0,0 @@ -// -// XPMineGuildManagerSetViewController.m -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "XPMineGuildManagerSetViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" -///View -#import "XPClanMemberTableViewCell.h" -///P -#import "XPMineManagerSetPresenter.h" -#import "XPGuildSetManagerProtocol.h" - - -@interface XPMineGuildManagerSetViewController () -@property (nonatomic,strong) UIView * topView; -///已选择的人数 -@property (nonatomic,strong) UILabel *chooseLabel; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///当前的页数 -@property (nonatomic,assign) int page; -///是否有更多数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///管理的数量 -@property (nonatomic,assign) int managerNumber; -@end - -@implementation XPMineGuildManagerSetViewController - -- (__kindof id)createPresenter { - return [[XPMineManagerSetPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initHeaderAndFooterRrfresh]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - [self headerRefresh]; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - if (self.guildId.length <= 0) { - [self showErrorToast:YMLocalizedString(@"XPMineGuildManagerSetViewController0")]; - [self.navigationController popViewControllerAnimated:YES]; - return; - } - self.page = 1; - [self.presenter getGuildMemberList:self.guildId page:self.page pageSize:20 state:0]; -} - -- (void)footerRefresh { - if (self.guildId.length <= 0) { - [self showErrorToast:YMLocalizedString(@"XPMineGuildManagerSetViewController1")]; - [self.navigationController popViewControllerAnimated:YES]; - return; - } - - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMineGuildManagerSetViewController2")]; - [self.tableView.mj_footer endRefreshing]; - return; - } - self.page++; - [self.presenter getGuildMemberList:self.guildId page:self.page pageSize:20 state:1]; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineGuildManagerSetViewController3"); - [self.view addSubview:self.topView]; - [self.view addSubview:self.tableView]; - [self.topView addSubview:self.chooseLabel]; -} - -- (void)initSubViewConstraints { - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.leading.trailing.top.mas_equalTo(self.view); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.topView.mas_bottom); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; - - [self.chooseLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.topView).offset(15); - make.centerY.mas_equalTo(self.topView); - }]; -} - -- (void)guildRoomManagerAddOrRemove:(ClanMemberInfoModel *)memberInfo { - if (memberInfo) { - NSMutableArray *array = [NSMutableArray array]; - TTAlertMessageAttributedConfig * alertConfig = [[TTAlertMessageAttributedConfig alloc] init]; - alertConfig.text = memberInfo.nick; - alertConfig.color = [DJDKMIMOMColor appMainColor]; - alertConfig.font = [UIFont systemFontOfSize:15]; - [array addObject:alertConfig]; - NSString * title; - if (memberInfo.roleType == GuildRoleType_Manager) { - title = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildManagerSetViewController4"), memberInfo.nick]; - } else { - title = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildManagerSetViewController5"), memberInfo.nick]; - } - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPMineGuildManagerSetViewController6"); - config.message = title; - config.messageAttributedConfig = array; - [TTPopup alertWithConfig:config confirmHandler:^{ - if (memberInfo.roleType == GuildRoleType_Manager) { - [self.presenter guildRoomRemoveManager:memberInfo.uid hallId:self.guildId]; - } else { - [self.presenter guildRoomAddManager:memberInfo.uid hallId:self.guildId]; - } - } cancelHandler:^{ - - }]; - } -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPClanMemberTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - if (cell == nil) { - cell = [[XPClanMemberTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - } - cell.delegate = self; - cell.cellType = ClanMemberTableViewCellType_Manager_Add_Remove; - ClanMemberInfoModel * memberInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (memberInfo.roleType == GuildRoleType_Manager) { - self.managerNumber += 1; - } - cell.memberInfo = memberInfo; - self.chooseLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildManagerSetViewController7"), self.managerNumber]; - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 66; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; -} - -#pragma mark - XPClanMemberTableViewCellDelegate -- (void)xPClanMemberTableViewCell:(XPClanMemberTableViewCell *)view didClickUser:(ClanMemberInfoModel *)userinfo { - [self guildRoomManagerAddOrRemove:userinfo]; -} - -#pragma mark -XPGuildRemoveMemberProtolcol -- (void)getGuildMemberListSuccess:(ClanMemberDetailInfoModel *)memberInfo state:(int)state { - if (state == 0) { - self.hasNoMoreData = NO; - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - - if (memberInfo.members.count > 0) { - [self.datasource addObjectsFromArray:memberInfo.members]; - } else { - self.hasNoMoreData = YES; - } - [self.tableView reloadData]; -} - -- (void)getGuildMemberListFail:(NSString *)msg state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -- (void)guildRoomAddManagerSuccess:(NSString *)targetUid { - [self.datasource enumerateObjectsUsingBlock:^(ClanMemberInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid == targetUid) { - obj.roleType = GuildRoleType_Manager; - *stop = YES; - } - }]; - [self.tableView reloadData]; -} -- (void)guildRoomRemoveManagerSuccess:(NSString *)targetUid { - self.managerNumber -= 1; - [self.datasource enumerateObjectsUsingBlock:^(ClanMemberInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid == targetUid) { - obj.roleType = GuildRoleType_Normal; - *stop = YES; - } - }]; - [self.tableView reloadData]; -} -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.showsVerticalScrollIndicator = NO; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPClanMemberTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - } - return _tableView; -} - -- (UIView *)topView { - if (!_topView) { - _topView = [[UIView alloc] init]; - _topView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - } - return _topView; -} - -- (UILabel *)chooseLabel { - if (!_chooseLabel) { - _chooseLabel = [[UILabel alloc] init]; - _chooseLabel.font = [UIFont systemFontOfSize:12]; - _chooseLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _chooseLabel; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildRemoveMemberViewController.h b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildRemoveMemberViewController.h deleted file mode 100644 index 1d783e1..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildRemoveMemberViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPMineGuildRemoveMemberViewController.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildRemoveMemberViewController : MvpViewController -///公会id -@property (nonatomic,copy) NSString *guildId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildRemoveMemberViewController.m b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildRemoveMemberViewController.m deleted file mode 100644 index 892f437..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildRemoveMemberViewController.m +++ /dev/null @@ -1,215 +0,0 @@ -// -// XPMineGuildRemoveMemberViewController.m -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "XPMineGuildRemoveMemberViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" -///View -#import "XPClanMemberTableViewCell.h" -#import "XPMineGuildEmptyTableViewCell.h" -#import "XPMineUserInfoViewController.h" -///P -#import "XPGuildRemoveMemberPresenter.h" -#import "XPGuildRemoveMemberProtocol.h" - - -@interface XPMineGuildRemoveMemberViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///当前的页数 -@property (nonatomic,assign) int page; -///是否有更多数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -@end - -@implementation XPMineGuildRemoveMemberViewController - -- (__kindof id)createPresenter { - return [[XPGuildRemoveMemberPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initHeaderAndFooterRrfresh]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - [self headerRefresh]; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - if (self.guildId.length <= 0) { - [self showErrorToast:YMLocalizedString(@"XPMineGuildRemoveMemberViewController0")]; - [self.navigationController popViewControllerAnimated:YES]; - return; - } - self.page = 1; - [self.presenter getGuildMemberList:self.guildId page:self.page pageSize:20 state:0]; -} - -- (void)footerRefresh { - if (self.guildId.length <= 0) { - [self showErrorToast:YMLocalizedString(@"XPMineGuildRemoveMemberViewController1")]; - [self.navigationController popViewControllerAnimated:YES]; - return; - } - - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMineGuildRemoveMemberViewController2")]; - [self.tableView.mj_footer endRefreshing]; - return; - } - self.page++; - [self.presenter getGuildMemberList:self.guildId page:self.page pageSize:20 state:1]; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineGuildRemoveMemberViewController3"); - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -- (void)removeGuildMemberAlert:(ClanMemberInfoModel *)memberInfo { - NSMutableArray *array = [NSMutableArray array]; - TTAlertMessageAttributedConfig * alertConfig = [[TTAlertMessageAttributedConfig alloc] init]; - alertConfig.text = memberInfo.nick; - alertConfig.color = [DJDKMIMOMColor appMainColor]; - alertConfig.font = [UIFont systemFontOfSize:15]; - [array addObject:alertConfig]; - NSString * title; - if (memberInfo.roleType == GuildRoleType_Manager) { - title = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildRemoveMemberViewController4"), memberInfo.nick]; - } else { - title = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildRemoveMemberViewController5"), memberInfo.nick]; - } - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.message = title; - config.messageAttributedConfig = array; - [TTPopup alertWithConfig:config confirmHandler:^{ - [self.presenter removeGuildMember:memberInfo.uid hallId:self.guildId]; - } cancelHandler:^{ - - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPClanMemberTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - if (cell == nil) { - cell = [[XPClanMemberTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - } - cell.delegate = self; - cell.cellType = ClanMemberTableViewCellType_Remove_Member; - ClanMemberInfoModel * memberInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.memberInfo = memberInfo; - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 66; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - ClanMemberInfoModel * memberInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - XPMineUserInfoViewController * mineUserVC = [[XPMineUserInfoViewController alloc] init]; - mineUserVC.uid = memberInfo.uid.integerValue; - [self.navigationController pushViewController:mineUserVC animated:YES]; - } -} -#pragma mark - XPClanMemberTableViewCellDelegate -- (void)xPClanMemberTableViewCell:(XPClanMemberTableViewCell *)view didClickUser:(ClanMemberInfoModel *)userinfo { - [self removeGuildMemberAlert:userinfo]; -} - -#pragma mark -XPGuildRemoveMemberProtolcol -- (void)getGuildMemberListSuccess:(ClanMemberDetailInfoModel *)memberInfo state:(int)state { - if (state == 0) { - self.hasNoMoreData = NO; - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - - if (memberInfo.members.count > 0) { - [self.datasource addObjectsFromArray:memberInfo.members]; - } else { - self.hasNoMoreData = YES; - } - [self.tableView reloadData]; -} - -- (void)getGuildMemberListFail:(NSString *)msg state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -- (void)removeGuildMemberSuccess { - [self headerRefresh]; -} -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.showsVerticalScrollIndicator = NO; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPClanMemberTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.h b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.h deleted file mode 100644 index d20edad..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPMineGuildSetNameViewController.h -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildSetNameViewController : MvpViewController -///公会的id -@property (nonatomic,copy) NSString *hallId; -///房间名 -@property (nonatomic,copy) NSString *roomName; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m deleted file mode 100644 index 7915431..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m +++ /dev/null @@ -1,164 +0,0 @@ -// -// XPMineGuildSetNameViewController.m -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import "XPMineGuildSetNameViewController.h" -///Third -#import - -///Tool -#import "DJDKMIMOMColor.h" -///P -#import "XPGuildSetNamePresenter.h" -#import "XPGuildSetNameProtocol.h" - -@interface XPMineGuildSetNameViewController () -///容器 -@property (nonatomic, strong) UIView *containView; -///房间名 -@property (nonatomic, strong) MSBaseTextField *nameTextField; -///描述的问题 -@property (nonatomic,strong) YYLabel *descriptionLabel; -@end - -@implementation XPMineGuildSetNameViewController - -- (__kindof id)createPresenter { - return [[XPGuildSetNamePresenter alloc] init];; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.nameTextField resignFirstResponder]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineGuildSetNameViewController0"); - [self.view addSubview:self.containView]; - [self.view addSubview:self.descriptionLabel]; - [self.containView addSubview:self.nameTextField]; - [self addNavigationItemWithTitles:@[YMLocalizedString(@"TTAlertConfig0")] titleColor:[DJDKMIMOMColor appMainColor] isLeft:NO target:self action:@selector(completionBtnAction:) tags:nil]; -} - -- (void)initSubViewConstraints { - [self.containView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(20); - make.leading.mas_equalTo(self.view).offset(15); - make.trailing.mas_equalTo(self.view).offset(-15); - make.height.mas_equalTo(40); - }]; - [self.nameTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.containView); - make.leading.mas_equalTo(self.containView).offset(5); - make.trailing.mas_equalTo(self.containView); - make.height.mas_equalTo(40); - }]; - - [self.descriptionLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.containView); - make.top.mas_equalTo(self.containView.mas_bottom).offset(5); - }]; -} - -// 昵称规则过滤 -- (void)nickTextRuleFilter:(UITextField *)textField{ - NSString *toBeString = textField.text; - NSString *lang = [self.nameTextField.textInputMode primaryLanguage]; - if ([lang isEqualToString:@"zh-Hans"]){// 简体中文输入 - //获取高亮部分 - UITextRange *selectedRange = [self.nameTextField markedTextRange]; - UITextPosition *position = [self.nameTextField positionFromPosition:selectedRange.start offset:0]; - // 没有高亮选择的字，则对已输入的文字进行字数统计和限制 - if (!position){ - if (toBeString.length > 15){ - [self showErrorToast:YMLocalizedString(@"XPMineGuildSetNameViewController2")]; - NSRange rangeIndex = [toBeString rangeOfComposedCharacterSequenceAtIndex:15]; - if (rangeIndex.length == 1){ - self.nameTextField.text = [toBeString substringToIndex:15]; - }else{ - NSRange rangeRange = [toBeString rangeOfComposedCharacterSequencesForRange:NSMakeRange(0, 15)]; - self.nameTextField.text = [toBeString substringWithRange:rangeRange]; - } - } - } - }else{ // 中文输入法以外的直接对其统计限制即可，不考虑其他语种情况 - if (toBeString.length > 15){ - [self showErrorToast:YMLocalizedString(@"XPMineGuildSetNameViewController3")]; - NSRange rangeIndex = [toBeString rangeOfComposedCharacterSequenceAtIndex:15]; - if (rangeIndex.length == 1){ - self.nameTextField.text = [toBeString substringToIndex:15]; - }else{ - NSRange rangeRange = [toBeString rangeOfComposedCharacterSequencesForRange:NSMakeRange(0, 15)]; - self.nameTextField.text = [toBeString substringWithRange:rangeRange]; - } - } - } -} - -#pragma mark - XPGuildSetNameProtocol -- (void)updateGuildRoomNameSuccess { - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - Event Response -- (void)completionBtnAction:(UIButton *)sender { - if (self.nameTextField.text.length <= 0) { - [self showErrorToast:YMLocalizedString(@"XPMineGuildSetNameViewController4")]; - return; - } - [self.presenter updateGuildRoomName:self.nameTextField.text hallId:self.hallId]; -} -#pragma mark - getter && setter -- (void)setRoomName:(NSString *)roomName { - _roomName = roomName; - self.nameTextField.text = _roomName; -} - -- (UIView *)containView { - if (!_containView) { - _containView = [[UIView alloc] init]; - _containView.layer.cornerRadius = 5; - _containView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - } - return _containView; -} - -- (MSBaseTextField *)nameTextField { - if (!_nameTextField) { - _nameTextField = [[MSBaseTextField alloc] init]; - _nameTextField.clearButtonMode = UITextFieldViewModeAlways; - _nameTextField.font = [UIFont systemFontOfSize:14]; - _nameTextField.textColor = [DJDKMIMOMColor mainTextColor]; - _nameTextField.tintColor = [DJDKMIMOMColor mainTextColor]; - [_nameTextField addTarget:self action:@selector(nickTextRuleFilter:) forControlEvents:UIControlEventEditingChanged]; - } - return _nameTextField; -} - -- (YYLabel *)descriptionLabel { - if (!_descriptionLabel) { - _descriptionLabel = [[YYLabel alloc] init]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - UIImageView *imaveView = [[UIImageView alloc]init]; - imaveView.image = [UIImage imageNamed:@"mine_guild_manager_edit_name_logo"]; - imaveView.bounds = CGRectMake(0, 0, 16, 16); - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imaveView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imaveView.frame.size.width, imaveView.frame.size.height) alignToFont:[UIFont systemFontOfSize:15.0] alignment:YYTextVerticalAlignmentCenter]; - - NSMutableAttributedString * titleAttribute = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPMineGuildSetNameViewController5") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14],NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}]; - [attribute appendAttributedString:attrString]; - [attribute appendAttributedString:titleAttribute]; - _descriptionLabel.attributedText = attribute; - } - return _descriptionLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineMangerListViewController.h b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineMangerListViewController.h deleted file mode 100644 index 9accf14..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineMangerListViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineMangerListViewController.h -// YuMi -// -// Created by YuMi on 2022/4/8. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineMangerListViewController : MvpViewController -@property (nonatomic,copy) NSString *guildId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineMangerListViewController.m b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineMangerListViewController.m deleted file mode 100644 index a87ae2c..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineMangerListViewController.m +++ /dev/null @@ -1,210 +0,0 @@ -// -// XPMineMangerListViewController.m -// YuMi -// -// Created by YuMi on 2022/4/8. -// 高管列表 - -#import "XPMineMangerListViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" - -///View -#import "XPClanMemberTableViewCell.h" -#import "XPMineGuildEmptyTableViewCell.h" -#import "XPMineGuildManagerSetViewController.h" -#import "XPMineGuildManagerPerViewController.h" -///P -#import "XPGuildMangerListPresenter.h" -#import "XPGuildManagerListProtocol.h" - -@interface XPMineMangerListViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///当前的页数 -@property (nonatomic,assign) int page; -///是否有更多数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -@end - -@implementation XPMineMangerListViewController - -- (__kindof id)createPresenter { - return [[XPGuildMangerListPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initHeaderAndFooterRrfresh]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - if (self.guildId.length > 0) { - [self headerRefresh]; - } -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - if (self.guildId.length <= 0) { - [self showErrorToast:YMLocalizedString(@"XPMineMangerListViewController0")]; - [self.navigationController popViewControllerAnimated:YES]; - return; - } - self.page = 1; - [self.presenter getGuildRoomManagerList:self.guildId page:self.page pageSize:20 state:0]; -} - -- (void)footerRefresh { - if (self.guildId.length <= 0) { - [self showErrorToast:YMLocalizedString(@"XPMineMangerListViewController1")]; - [self.navigationController popViewControllerAnimated:YES]; - return; - } - - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMineMangerListViewController2")]; - [self.tableView.mj_footer endRefreshing]; - return; - } - self.page++; - [self.presenter getGuildRoomManagerList:self.guildId page:self.page pageSize:20 state:1]; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineMangerListViewController3"); - [self.view addSubview:self.tableView]; - [self addNavigationItemWithImageNames:@[@"mine_guild_guild_manager_set"] isLeft:NO target:self action:@selector(rightButtonAction:) tags:nil]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPClanMemberTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - if (cell == nil) { - cell = [[XPClanMemberTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - } - cell.cellType = ClanMemberTableViewCellType_Manager_Set; - ClanMemberInfoModel * memberInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.memberInfo = memberInfo; - return cell; - } - - XPMineGuildEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineGuildEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - } - cell.emptyTitle = YMLocalizedString(@"XPMineMangerListViewController4"); - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? 66 : (KScreenHeight - kNavigationHeight); -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - ClanMemberInfoModel * memberInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - XPMineGuildManagerPerViewController * managerAuthVC = [[XPMineGuildManagerPerViewController alloc] init]; - managerAuthVC.guildId = self.guildId; - managerAuthVC.managerInfo = memberInfo; - [self.navigationController pushViewController:managerAuthVC animated:YES]; - } -} - -#pragma mark -XPGuildRemoveMemberProtolcol -- (void)getGuildRoomManagerListSuccess:(ClanMemberDetailInfoModel *)memberInfo state:(int)state { - if (state == 0) { - self.hasNoMoreData = NO; - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - - if (memberInfo.members.count > 0) { - [self.datasource addObjectsFromArray:memberInfo.members]; - } else { - self.hasNoMoreData = YES; - } - [self.tableView reloadData]; -} - -- (void)getGuildRoomManagerListFail:(NSString *)msg state:(int)state{ - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -#pragma mark - Event Response -- (void)rightButtonAction:(UIButton *)sender { - XPMineGuildManagerSetViewController * managerSetVC = [[XPMineGuildManagerSetViewController alloc] init]; - managerSetVC.guildId = self.guildId; - [self.navigationController pushViewController:managerSetVC animated:YES]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.showsVerticalScrollIndicator = NO; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPClanMemberTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - [_tableView registerClass:[XPMineGuildEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/PIGuildAnchorIncomeSectionView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/PIGuildAnchorIncomeSectionView.h deleted file mode 100644 index 30eb4e2..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/PIGuildAnchorIncomeSectionView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PIGuildAnchorIncomeSectionView.h -// YuMi -// -// Created by duoban on 2024/2/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIGuildAnchorIncomeSectionView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/PIGuildAnchorIncomeSectionView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/PIGuildAnchorIncomeSectionView.m deleted file mode 100644 index ea45d80..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/PIGuildAnchorIncomeSectionView.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// PIGuildAnchorIncomeSectionView.m -// YuMi -// -// Created by duoban on 2024/2/21. -// - -#import "PIGuildAnchorIncomeSectionView.h" -@interface PIGuildAnchorIncomeSectionView() -@property(nonatomic,strong) UILabel *userInfoView; -@property(nonatomic,strong) UILabel *anchorView; -@property(nonatomic,strong) UILabel *roomView; -@property(nonatomic,strong) UILabel *timeView; -@end -@implementation PIGuildAnchorIncomeSectionView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColorFromRGB(0xF1F2F2); - [self addSubview:self.userInfoView]; - [self addSubview:self.anchorView]; - [self addSubview:self.roomView]; - [self addSubview:self.timeView]; - -} - -- (void)initSubViewConstraints { - CGFloat width = kGetScaleWidth(242) / 3; - [self.userInfoView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.centerY.equalTo(self); - }]; - [self.timeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(0); - make.centerY.equalTo(self); - make.width.mas_equalTo(width); - }]; - [self.roomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.timeView.mas_leading).mas_offset(0); - make.centerY.equalTo(self); - make.width.mas_equalTo(width); - }]; - [self.anchorView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self); - make.trailing.equalTo(self.roomView.mas_leading).mas_offset(0); - make.width.mas_equalTo(width); - }]; -} - -#pragma mark - Getters And Setters -- (UILabel *)userInfoView{ - if(!_userInfoView){ - _userInfoView = [UILabel labelInitWithText:YMLocalizedString(@"PIGuildAnchorIncomeSectionView0") font:[UIFont systemFontOfSize:13 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0xA7A7A8)]; - } - return _userInfoView; -} -- (UILabel *)anchorView{ - if(!_anchorView){ - _anchorView = [UILabel labelInitWithText:YMLocalizedString(@"PIGuildAnchorIncomeSectionView1") font:[UIFont systemFontOfSize:13 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0xA7A7A8)]; - _anchorView.textAlignment = NSTextAlignmentCenter; - } - return _anchorView; -} - -- (UILabel *)roomView{ - if(!_roomView){ - _roomView = [UILabel labelInitWithText:YMLocalizedString(@"PIGuildAnchorIncomeSectionView2") font:[UIFont systemFontOfSize:13 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0xA7A7A8)]; - _roomView.textAlignment = NSTextAlignmentCenter; - } - return _roomView; -} - -- (UILabel *)timeView{ - if(!_timeView){ - _timeView = [UILabel labelInitWithText:YMLocalizedString(@"PIGuildAnchorIncomeSectionView3") font:[UIFont systemFontOfSize:13 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0xA7A7A8)]; - _timeView.textAlignment = NSTextAlignmentCenter; - } - return _timeView; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanMenuView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanMenuView.h deleted file mode 100644 index 4bd525e..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanMenuView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPClanMenuView.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPClanMenuView : UIView -///显示图片的名称 -@property (nonatomic,copy) NSString * imageName; -///显示标题 -@property (nonatomic,copy) NSString *title; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanMenuView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanMenuView.m deleted file mode 100644 index fa59a01..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanMenuView.m +++ /dev/null @@ -1,83 +0,0 @@ -// -// XPClanMenuView.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "XPClanMenuView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPClanMenuView () -///显示背景图 -@property (nonatomic,strong) UIImageView *logoImageView; -///显示名字 -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPClanMenuView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.logoImageView]; - [self addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - - }]; -} -#pragma mark - Getters And Setters -- (void)setImageName:(NSString *)imageName { - _imageName = imageName; - if (_imageName) { - self.logoImageView.image = [UIImage imageNamed:_imageName]; - } -} - -- (void)setTitle:(NSString *)title { - _title = title; - if (_title.length > 0) { - self.titleLabel.text = _title; - } -} - -- (UIImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[UIImageView alloc] init]; - _logoImageView.userInteractionEnabled = YES; - } - return _logoImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.numberOfLines = 2; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanSectionView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanSectionView.h deleted file mode 100644 index ce25263..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanSectionView.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// XPClanSectionView.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPClanSectionView; -@protocol XPClanSectionViewDelegate -@optional -///点击了搜索按钮 -- (void)xPClanSectionView:(XPClanSectionView *)view didClickSearch:(UIButton *)sender; -///点击了管理按钮 -- (void)xPClanSectionView:(XPClanSectionView *)view didClickManager:(UIButton *)sender; -@end -@interface XPClanSectionView : UIView -///代理 -@property (nonatomic,weak) id delegate; -///顶部是否切圆角 -@property (nonatomic,assign) BOOL isTopCor; -@property(nonatomic,assign) BOOL pi_IsClan; -///显示标题 -@property (nonatomic,copy) NSString *title; -///隐藏搜索 默认隐藏 -@property (nonatomic,assign) BOOL isHiddenSearch; -///隐藏管理 默认隐藏 -@property (nonatomic,assign) BOOL isHiddenManager; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanSectionView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanSectionView.m deleted file mode 100644 index 431071e..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanSectionView.m +++ /dev/null @@ -1,183 +0,0 @@ -// -// XPClanSectionView.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "XPClanSectionView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - - -@interface XPClanSectionView () -///显示背景色 -@property (nonatomic,strong) UIView * backView; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///更多权限 -@property (nonatomic,strong) UIStackView *moreStackView; -///搜索 -@property (nonatomic,strong) UIButton *searchButton; -///管理 -@property (nonatomic,strong) UIButton *managerButton; -@property(nonatomic,strong) UILabel *managerView; -@end - -@implementation XPClanSectionView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.backView]; - [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.moreStackView]; - - - [self.moreStackView addArrangedSubview:self.searchButton]; - [self.moreStackView addArrangedSubview:self.managerButton]; - [self.moreStackView addArrangedSubview:self.managerView]; - self.managerView.hidden = YES; -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(15); - make.top.bottom.mas_equalTo(self); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).offset(15); - make.top.mas_equalTo(self.backView).offset(10); - }]; - - [self.moreStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.backView).offset(-15); - make.centerY.mas_equalTo(self.titleLabel); - }]; - - [self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(22); - }]; - - [self.managerButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(22); - }]; -} -#pragma mark - Event Response -- (void)searchButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPClanSectionView:didClickSearch:)]) { - [self.delegate xPClanSectionView:self didClickSearch:sender]; - } -} - -- (void)managerButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPClanSectionView:didClickManager:)]) { - [self.delegate xPClanSectionView:self didClickManager:sender]; - } -} -- (void)setPi_IsClan:(BOOL)pi_IsClan{ - _pi_IsClan = pi_IsClan; - [self.backView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(0); - make.top.bottom.mas_equalTo(self); - }]; - self.managerView.hidden = NO; -} -#pragma mark - Getters And Setters -- (void)setTitle:(NSString *)title { - _title = title; - if (_title.length > 0) { - self.titleLabel.text = _title; - } -} - -- (void)setIsTopCor:(BOOL)isTopCor { - _isTopCor = isTopCor; - if (_isTopCor) { - CAShapeLayer * layer = [CAShapeLayer layer]; - CGFloat width = _pi_IsClan ? 0 : 30; - layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth - width, 37) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)].CGPath; - self.backView.layer.mask = layer; - } -} - -- (void)setIsHiddenSearch:(BOOL)isHiddenSearch { - _isHiddenSearch = isHiddenSearch; - self.searchButton.hidden= _isHiddenSearch; -} - -- (void)setIsHiddenManager:(BOOL)isHiddenManager { - _isHiddenManager = isHiddenManager; - self.managerButton.hidden = _isHiddenManager; -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _backView.layer.masksToBounds = YES; - } - return _backView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UIStackView *)moreStackView { - if (!_moreStackView) { - _moreStackView = [[UIStackView alloc] init]; - _moreStackView.axis = UILayoutConstraintAxisHorizontal; - _moreStackView.distribution = UIStackViewDistributionFill; - _moreStackView.alignment = UIStackViewAlignmentFill; - _moreStackView.spacing = 10; - } - return _moreStackView; -} - -- (UIButton *)searchButton { - if (!_searchButton) { - _searchButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_searchButton setImage:[UIImage imageNamed:@"home_search_input_search"] forState:UIControlStateNormal]; - [_searchButton setImage:[UIImage imageNamed:@"home_search_input_search"] forState:UIControlStateSelected]; - [_searchButton addTarget:self action:@selector(searchButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _searchButton.hidden = YES; - } - return _searchButton; -} - -- (UIButton *)managerButton { - if (!_managerButton) { - _managerButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_managerButton setImage:[UIImage imageNamed:@"mine_guild_guild_section_manager"] forState:UIControlStateNormal]; - [_managerButton setImage:[UIImage imageNamed:@"mine_guild_guild_section_manager"] forState:UIControlStateSelected]; - [_managerButton addTarget:self action:@selector(managerButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _managerButton.hidden = YES; - } - return _managerButton; -} - -- (UILabel *)managerView{ - if(!_managerView){ - _managerView = [UILabel labelInitWithText:YMLocalizedString(@"XPClanSectionView0") font:kFontMedium(14) textColor:UIColorFromRGB(0x8A8CAB)]; - } - return _managerView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.h deleted file mode 100644 index 4999b9a..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPGoldIncomeSectionView.h -// YuMi -// -// Created by YuMi on 2022/12/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@protocol XPGoldIncomeSectionViewDelegate - --(void)chooseGoldCoinOrder:(int)type isAscending:(BOOL)isAscending; - -@end -@interface XPGoldIncomeSectionView : UIView -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.m deleted file mode 100644 index 34d1b06..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.m +++ /dev/null @@ -1,170 +0,0 @@ -// -// XPGoldIncomeSectionView.m -// xplan-ios -// -// Created by duoban on 2022/12/16. -// - -#import "XPGoldIncomeSectionView.h" -#import "XPIncomeRecordGoldDetailsHeadView.h" -@interface XPGoldIncomeSectionView() -///底部item -@property (nonatomic,strong) UIView *bgItemView; -///房间 -@property (nonatomic,strong) UILabel *roomView; -///成员 -@property (nonatomic,strong) UILabel *memberView; -///钻石流水 -@property (nonatomic,strong) XPIncomeRecordGoldDetailsHeadItemView *diamondView; -///金币收益 -@property (nonatomic,strong) UILabel *exchangeGoldView; -///可结算金币 -@property (nonatomic,strong) XPIncomeRecordGoldDetailsHeadItemView *settlementView; -@end -@implementation XPGoldIncomeSectionView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - - - [self addSubview:self.bgItemView]; - [self.bgItemView addSubview:self.roomView]; - [self.bgItemView addSubview:self.memberView]; - [self.bgItemView addSubview:self.diamondView]; - [self.bgItemView addSubview:self.exchangeGoldView]; - [self.bgItemView addSubview:self.settlementView]; -} -- (void)initSubViewConstraints { - - - [self.bgItemView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(47)); - make.leading.trailing.equalTo(self).inset(kGetScaleWidth(0)); - }]; - [self.roomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(50)); - make.leading.mas_equalTo(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.centerY.equalTo(self.bgItemView); - }]; - [self.memberView mas_makeConstraints:^(MASConstraintMaker *make) { - - make.leading.mas_equalTo(kGetScaleWidth(50)); - make.width.mas_equalTo(kGetScaleWidth(48)); - make.centerY.height.equalTo(self.roomView); - }]; - CGFloat width = kGetScaleWidth(277/3); - [self.settlementView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(width); - make.trailing.equalTo(self.bgItemView); - make.centerY.height.equalTo(self.roomView); - }]; - [self.exchangeGoldView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.equalTo(self.settlementView); - make.centerY.equalTo(self); - make.trailing.equalTo(self.settlementView.mas_leading); - }]; - [self.diamondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(self.exchangeGoldView); - make.trailing.equalTo(self.exchangeGoldView.mas_leading); - }]; - - -} - - --(void)clickDiamondAction{ - - if(self.diamondView.upBtn.selected == YES){ - self.diamondView.upBtn.selected = NO; - self.diamondView.downBtn.selected = YES; - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseGoldCoinOrder:isAscending:)]){ - [self.delegate chooseGoldCoinOrder:1 isAscending:NO]; - } - return; - } - - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseGoldCoinOrder:isAscending:)]){ - [self.delegate chooseGoldCoinOrder:1 isAscending:YES]; - } - self.diamondView.upBtn.selected = YES; - self.diamondView.downBtn.selected = NO; -} --(void)clickGoldAction{ - - if(self.settlementView.upBtn.selected == YES){ - self.settlementView.upBtn.selected = NO; - self.settlementView.downBtn.selected = YES; - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseGoldCoinOrder:isAscending:)]){ - [self.delegate chooseGoldCoinOrder:1 isAscending:NO]; - } - return; - } - - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseGoldCoinOrder:isAscending:)]){ - [self.delegate chooseGoldCoinOrder:1 isAscending:YES]; - } - self.settlementView.upBtn.selected = YES; - self.settlementView.downBtn.selected = NO; -} -#pragma mark -懒加载 - --(UIView *)bgItemView{ - if (!_bgItemView){ - _bgItemView = [UIView new]; - _bgItemView.backgroundColor = UIColorFromRGB(0xF0F5F6); - } - return _bgItemView; -} -- (UILabel *)roomView{ - if (!_roomView){ - _roomView = [UILabel labelInitWithText:YMLocalizedString(@"XPGoldIncomeSectionView0") font:kFontMedium(12) textColor:[DJDKMIMOMColor inputTextColor]]; - _roomView.textAlignment = NSTextAlignmentCenter; - - } - return _roomView; -} --(UILabel *)memberView{ - if (!_memberView){ - _memberView = [UILabel labelInitWithText:YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView1") font:kFontMedium(12) textColor:[DJDKMIMOMColor inputTextColor]]; - _memberView.textAlignment = NSTextAlignmentCenter; - } - return _memberView; -} --(XPIncomeRecordGoldDetailsHeadItemView *)diamondView{ - if (!_diamondView){ - _diamondView = [[XPIncomeRecordGoldDetailsHeadItemView alloc]initWithFrame:CGRectZero]; - _diamondView.title = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView5"); - [_diamondView.clickBtn addTarget:self action:@selector(clickDiamondAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _diamondView; -} -- (UILabel *)exchangeGoldView{ - if (!_exchangeGoldView){ - _exchangeGoldView = [UILabel labelInitWithText:YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView3") font:kFontMedium(12) textColor:[DJDKMIMOMColor inputTextColor]]; - _exchangeGoldView.textAlignment = NSTextAlignmentCenter; - _exchangeGoldView.numberOfLines = 2; - - } - return _exchangeGoldView; -} --(XPIncomeRecordGoldDetailsHeadItemView *)settlementView{ - if (!_settlementView){ - _settlementView = [[XPIncomeRecordGoldDetailsHeadItemView alloc]initWithFrame:CGRectZero]; - _settlementView.title = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView4"); - [_settlementView.clickBtn addTarget:self action:@selector(clickGoldAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _settlementView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildAnchorIncomeSectionView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildAnchorIncomeSectionView.h deleted file mode 100644 index d478092..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildAnchorIncomeSectionView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPGuildAnchorIncomeSectionView.h -// YuMi -// -// Created by YuMi on 2022/4/24. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGuildAnchorIncomeSectionView : UIView -@property (nonatomic,assign) BOOL isHost; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildAnchorIncomeSectionView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildAnchorIncomeSectionView.m deleted file mode 100644 index 71d4176..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildAnchorIncomeSectionView.m +++ /dev/null @@ -1,193 +0,0 @@ -// -// XPGuildAnchorIncomeSectionView.m -// YuMi -// -// Created by YuMi on 2022/4/24. -// - -#import "XPGuildAnchorIncomeSectionView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - - -@interface XPGuildAnchorIncomeSectionView () -///rongqi -@property (nonatomic,strong) UIStackView *stackView; -///排名 -@property (nonatomic,strong) UILabel *rankLabel; -///昵称 -@property (nonatomic,strong) UILabel *avatarLabel; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///房间/头像 -@property (nonatomic,strong) UILabel *roomLabel; -///收入 -@property (nonatomic,strong) UILabel *incomeLabel; -///主播收入 -@property (nonatomic,strong) UILabel *hostIncomeLabel; -///所属厅 -@property (nonatomic,strong) UILabel *hallLabel; - - - - -@end - -@implementation XPGuildAnchorIncomeSectionView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { -// self.backgroundColor = [UIColor clearColor]; - self.backgroundColor = UIColorFromRGB(0xF0F5F6); - [self addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.rankLabel]; - [self.stackView addArrangedSubview:self.avatarLabel]; - [self.stackView addArrangedSubview:self.nickLabel]; - [self.stackView addArrangedSubview:self.roomLabel]; - [self.stackView addArrangedSubview:self.incomeLabel]; - - [self addSubview:self.hallLabel]; - [self addSubview:self.hostIncomeLabel]; - -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(KScreenWidth, 30)); - }]; - - [self.rankLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(52); - }]; - - [self.avatarLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(45); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(90); - }]; - - [self.roomLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo((KScreenWidth - 52 - 45 - 90 - 10 * 4)/ 2); - }]; - - [self.hostIncomeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - - make.height.mas_equalTo(kGetScaleWidth(14)); - make.centerY.equalTo(self); - make.leading.mas_equalTo(kGetScaleWidth(97)); - }]; - [self.hallLabel mas_makeConstraints:^(MASConstraintMaker *make) { - - make.height.mas_equalTo(kGetScaleWidth(14)); - make.centerY.equalTo(self); - make.leading.mas_equalTo(kGetScaleWidth(260)); - }]; -} --(void)setIsHost:(BOOL)isHost{ - _isHost = isHost; - - self.stackView.hidden = _isHost; - self.hostIncomeLabel.hidden = !isHost; - self.hallLabel.hidden = !isHost; -} -#pragma mark - Getters And Setters -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 10; - } - return _stackView; -} - -- (UILabel *)rankLabel { - if (!_rankLabel) { - _rankLabel = [[UILabel alloc] init]; - _rankLabel.text = YMLocalizedString(@"XPGuildAnchorIncomeSectionView0"); - _rankLabel.font = [UIFont systemFontOfSize:12]; - _rankLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _rankLabel.textAlignment = NSTextAlignmentCenter; - } - return _rankLabel; -} - -- (UILabel *)avatarLabel { - if (!_avatarLabel) { - _avatarLabel = [[UILabel alloc] init]; - _avatarLabel.text = YMLocalizedString(@"XPGuildAnchorIncomeSectionView1"); - _avatarLabel.font = [UIFont systemFontOfSize:12]; - _avatarLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _avatarLabel.textAlignment = NSTextAlignmentCenter; - } - return _avatarLabel; -} - -- (UILabel *)roomLabel { - if (!_roomLabel) { - _roomLabel = [[UILabel alloc] init]; - _roomLabel.text = YMLocalizedString(@"XPGuildAnchorIncomeSectionView2"); - _roomLabel.font = [UIFont systemFontOfSize:12]; - _roomLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _roomLabel.textAlignment = NSTextAlignmentLeft; - } - return _roomLabel; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.text = YMLocalizedString(@"XPGuildAnchorIncomeSectionView3"); - _nickLabel.font = [UIFont systemFontOfSize:12]; - _nickLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _nickLabel.textAlignment = NSTextAlignmentLeft; - } - return _nickLabel; -} - -- (UILabel *)incomeLabel { - if (!_incomeLabel) { - _incomeLabel = [[UILabel alloc] init]; - _incomeLabel.text = YMLocalizedString(@"XPGuildAnchorIncomeSectionView4"); - _incomeLabel.font = [UIFont systemFontOfSize:12]; - _incomeLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _incomeLabel.textAlignment = NSTextAlignmentLeft; - } - return _incomeLabel; -} - -- (UILabel *)hostIncomeLabel { - if (!_hostIncomeLabel) { - _hostIncomeLabel = [[UILabel alloc] init]; - _hostIncomeLabel.font = [UIFont systemFontOfSize:12]; - _hostIncomeLabel.textColor =UIColorFromRGB(0x1F1A4E); - _hostIncomeLabel.text = YMLocalizedString(@"XPGuildAnchorIncomeSectionView2"); - } - return _hostIncomeLabel; -} - -- (UILabel *)hallLabel { - if (!_hallLabel) { - _hallLabel = [[UILabel alloc] init]; - _hallLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _hallLabel.textColor = UIColorFromRGB(0x1F1A4E); - _hallLabel.text = YMLocalizedString(@"XPGuildAnchorIncomeSectionView6"); - } - return _hallLabel; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildHeaderView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildHeaderView.h deleted file mode 100644 index 197f463..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildHeaderView.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// XPGuildHeaderView.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class ClanDetailInfoModel, XPGuildHeaderView, GuildInfoModel; - -typedef NS_ENUM(NSInteger, GuildHeaderMenuType) { - ///公会流水 - GuildHeaderMenuType_Hall_Income = 1, -///兑换权限设置 - GuildHeaderMenuType_Exchange_Authority = 2, - ///超管 - GuildHeaderMenuType_Super_Admin, -}; - -@protocol XPGuildHeaderViewDelegate -///选择了族长 -- (void)xPGuildHeaderView:(XPGuildHeaderView *)view dicSelectOwner:(ClanDetailInfoModel *)guildInfo; -///选择了公会的某个房间 -- (void)xPGuildHeaderView:(XPGuildHeaderView *)view dicSelectGuild:(GuildInfoModel *)guildInfo; -///菜单栏的点击 -- (void)xPGuildHeaderView:(XPGuildHeaderView *)view dicTapMenuItem:(GuildHeaderMenuType)menuType; -@end - -@interface XPGuildHeaderView : UIView -///家族信息 -@property (nonatomic,strong) ClanDetailInfoModel *clanInfo; -///家族房间列表 -@property (nonatomic,strong) NSArray *clanRoomList; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildHeaderView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildHeaderView.m deleted file mode 100644 index af39ff1..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildHeaderView.m +++ /dev/null @@ -1,403 +0,0 @@ -// -// XPGuildHeaderView.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "XPGuildHeaderView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "NSArray+Safe.h" -#import "AccountInfoStorage.h" -///Model -#import "ClanDetailInfoModel.h" -///View -#import "XPClanMenuView.h" -#import "XPClanRoomCollectionViewCell.h" -@interface XPGuildHeaderView () -///背景图 -@property (nonatomic,strong) UIImageView *backImageView; -///最外面的容器 -@property (nonatomic,strong) UIStackView *stackView; -///用户信息 -@property (nonatomic,strong) UIView * userInfoView; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///公会名称 -@property (nonatomic,strong) UILabel *clanNameLabel; -///Pekoid -@property (nonatomic,strong) UILabel *daeIdLabel; -///房间数量 -@property (nonatomic,strong) UILabel *roomNumberLabel; -///家族等级 -@property (nonatomic,strong) NetImageView *clanLevelImageView; -///容器 -@property (nonatomic,strong) UIStackView *menuStackView; -///查看流水 -@property (nonatomic,strong) XPClanMenuView *incomeView; -///超管设置 -@property (nonatomic,strong) XPClanMenuView *superAdminSetView; -///兑换权限设置 -@property (nonatomic,strong) XPClanMenuView *anchorIncomeView; -///公会房间的容器 -@property (nonatomic,strong) UIView * clanRoomView; -///公会房间多少个 -@property (nonatomic,strong) UILabel *numberLabel; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -@end - -@implementation XPGuildHeaderView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.clipsToBounds = YES; - [self addSubview:self.backImageView]; - [self addSubview:self.stackView]; - - [self.userInfoView addSubview:self.avatarImageView]; - [self.userInfoView addSubview:self.clanNameLabel]; - [self.userInfoView addSubview:self.daeIdLabel]; - [self.userInfoView addSubview:self.roomNumberLabel]; - [self.userInfoView addSubview:self.clanLevelImageView]; - - [self.stackView addArrangedSubview:self.userInfoView]; - [self.stackView addArrangedSubview:self.menuStackView]; - [self.stackView addArrangedSubview:self.clanRoomView]; - - [self.menuStackView addArrangedSubview:self.incomeView]; - [self.menuStackView addArrangedSubview:self.superAdminSetView]; - [self.menuStackView addArrangedSubview:self.anchorIncomeView]; - - [self.clanRoomView addSubview:self.numberLabel]; - [self.clanRoomView addSubview:self.collectionView]; - -} - -- (void)initSubViewConstraints { - - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.bottom.mas_equalTo(self.stackView.mas_bottom); - }]; - - CGFloat kBackScale = 274.0 / 375.0; - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - make.height.mas_equalTo(KScreenWidth * kBackScale); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(15); - make.top.mas_equalTo(self); - }]; - - [self.userInfoView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(179 * kScreenScale); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(64), kGetScaleWidth(64))); - make.leading.mas_equalTo(self.userInfoView); - make.top.mas_equalTo(self.userInfoView).offset(108 * kScreenScale); - }]; - - [self.clanNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); - make.top.mas_equalTo(self.avatarImageView); - make.trailing.mas_lessThanOrEqualTo(self.clanLevelImageView); - }]; - - [self.daeIdLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.clanNameLabel); - make.top.mas_equalTo(self.clanNameLabel.mas_bottom).offset(6); - }]; - - [self.roomNumberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.clanNameLabel); - make.top.mas_equalTo(self.daeIdLabel.mas_bottom).offset(6); - }]; - - [self.clanLevelImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(60, 60)); - make.centerY.mas_equalTo(self.avatarImageView); - make.trailing.mas_equalTo(self).offset(-35); - }]; - - CGFloat kMenuScale = 52.0 / 112.0; - CGFloat kMenuItemWidth = (CGFloat)(KScreenWidth - 15 * 2 - 6 * 2) / 3.0; - [self.menuStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kMenuItemWidth * kMenuScale); - }]; - - [self.clanRoomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(130); - }]; - - [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.clanRoomView).offset(9); - make.top.mas_equalTo(self.clanRoomView).offset(10); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.clanRoomView).inset(9); - make.top.mas_equalTo(self.numberLabel.mas_bottom).offset(3); - make.bottom.mas_equalTo(self.clanRoomView); - }]; -} - -#pragma mark - UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.clanRoomList.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPClanRoomCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([ XPClanRoomCollectionViewCell class]) forIndexPath:indexPath]; - cell.guildInfo = [self.clanRoomList xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (self.clanRoomList.count > 0) { - GuildInfoModel * guildInfo = [self.clanRoomList xpSafeObjectAtIndex:indexPath.row]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildHeaderView:dicSelectGuild:)]) { - [self.delegate xPGuildHeaderView:self dicSelectGuild:guildInfo]; - } - } -} - -#pragma mark - Event Response -- (void)menuViewTapRecognizer:(UITapGestureRecognizer *)tap { - UIView * view = tap.view; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildHeaderView:dicTapMenuItem:)]) { - [self.delegate xPGuildHeaderView:self dicTapMenuItem:view.tag]; - } -} - -- (void)tapOwnerUserInfoView:(UITapGestureRecognizer *)tap { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildHeaderView:dicSelectOwner:)]) { - [self.delegate xPGuildHeaderView:self dicSelectOwner:self.clanInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setClanInfo:(ClanDetailInfoModel *)clanInfo { - _clanInfo = clanInfo; - if (_clanInfo) { - self.avatarImageView.imageUrl = _clanInfo.clan.avatar; - NSString * elderName = _clanInfo.clan.elderName; - if (elderName.length > 8) { - elderName = [elderName substringToIndex:8]; - } - _anchorIncomeView.hidden = YES; - if(_anchorIncomeView.hidden == YES){ - _incomeView.imageName = @"mine_guild_clan_header_income_bg_two"; - _superAdminSetView.imageName = @"mine_guild_clan_header_superadmin_set_bg_two"; - } - self.clanNameLabel.text = elderName; - self.daeIdLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPGuildHeaderView0"), _clanInfo.clan.elderErbanNo]; - self.clanLevelImageView.imageUrl = _clanInfo.clan.levelIcon; - if (_clanInfo.clan.elderUid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - self.menuStackView.hidden = NO; - } else { - self.menuStackView.hidden = YES; - } - } -} - -- (void)setClanRoomList:(NSArray *)clanRoomList { - _clanRoomList = clanRoomList; - if (_clanRoomList.count > 0) { - self.roomNumberLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPGuildHeaderView1"), _clanRoomList.count]; - self.clanRoomView.hidden = NO; - } else { - self.clanRoomView.hidden = YES; - self.roomNumberLabel.text = YMLocalizedString(@"XPGuildHeaderView2"); - } - self.numberLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPGuildHeaderView3"), clanRoomList.count]; - [self.collectionView reloadData]; -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"mine_guild_clan_header_bg"]; - } - return _backImageView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 15; - } - return _stackView; -} - -- (UIView *)userInfoView { - if (!_userInfoView) { - _userInfoView = [[UIView alloc] init]; - _userInfoView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap= [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapOwnerUserInfoView:)]; - [_userInfoView addGestureRecognizer:tap]; - } - return _userInfoView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = kGetScaleWidth(32); - _avatarImageView.layer.borderWidth = 2; - _avatarImageView.layer.borderColor = UIColorFromRGB(0xC6C6E9).CGColor; - } - return _avatarImageView; -} - -- (UILabel *)clanNameLabel { - if (!_clanNameLabel) { - _clanNameLabel = [[UILabel alloc] init]; - _clanNameLabel.font = [UIFont systemFontOfSize:18]; - _clanNameLabel.textColor = [UIColor whiteColor]; - } - return _clanNameLabel; -} - -- (UILabel *)daeIdLabel { - if (!_daeIdLabel) { - _daeIdLabel = [[UILabel alloc] init]; - _daeIdLabel.font = [UIFont systemFontOfSize:12]; - _daeIdLabel.textColor = UIColorFromRGB(0xC6C6E9); - } - return _daeIdLabel; -} - -- (UILabel *)roomNumberLabel { - if (!_roomNumberLabel) { - _roomNumberLabel = [[UILabel alloc] init]; - _roomNumberLabel.font = [UIFont systemFontOfSize:12]; - _roomNumberLabel.textColor = UIColorFromRGB(0xC6C6E9); - } - return _roomNumberLabel; -} - -- (NetImageView *)clanLevelImageView { - if (!_clanLevelImageView) { - _clanLevelImageView = [[NetImageView alloc] init]; - } - return _clanLevelImageView; -} - -- (UIStackView *)menuStackView { - if (!_menuStackView) { - _menuStackView = [[UIStackView alloc] init]; - _menuStackView.axis = UILayoutConstraintAxisHorizontal; - _menuStackView.distribution = UIStackViewDistributionFillEqually; - _menuStackView.alignment = UIStackViewAlignmentFill; - _menuStackView.spacing = 6; - _menuStackView.hidden = YES; - } - return _menuStackView; -} - - -- (XPClanMenuView *)incomeView { - if (!_incomeView) { - _incomeView = [[XPClanMenuView alloc] init]; - _incomeView.title = YMLocalizedString(@"XPGuildHeaderView4"); - _incomeView.imageName = @"mine_guild_clan_header_income_bg"; - _incomeView.tag = GuildHeaderMenuType_Hall_Income; - UITapGestureRecognizer * tap= [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(menuViewTapRecognizer:)]; - [_incomeView addGestureRecognizer:tap]; - } - return _incomeView; -} - -- (XPClanMenuView *)anchorIncomeView { - if (!_anchorIncomeView) { - _anchorIncomeView = [[XPClanMenuView alloc] init]; - _anchorIncomeView.title = YMLocalizedString(@"XPGuildHeaderView5"); - _anchorIncomeView.imageName = @"mine_guild_clan_header_anchor_income_bg"; - _anchorIncomeView.tag = GuildHeaderMenuType_Exchange_Authority; - UITapGestureRecognizer * tap= [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(menuViewTapRecognizer:)]; - [_anchorIncomeView addGestureRecognizer:tap]; - _anchorIncomeView.hidden = YES; - - } - return _anchorIncomeView; -} - -- (XPClanMenuView *)superAdminSetView { - if (!_superAdminSetView) { - _superAdminSetView = [[XPClanMenuView alloc] init]; - _superAdminSetView.title = YMLocalizedString(@"XPGuildHeaderView6"); - _superAdminSetView.imageName = @"mine_guild_clan_header_superadmin_set_bg"; - _superAdminSetView.tag = GuildHeaderMenuType_Super_Admin; - UITapGestureRecognizer * tap= [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(menuViewTapRecognizer:)]; - [_superAdminSetView addGestureRecognizer:tap]; - } - return _superAdminSetView; -} - -- (UIView *)clanRoomView { - if (!_clanRoomView) { - _clanRoomView = [[UIView alloc] init]; - _clanRoomView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _clanRoomView.layer.masksToBounds = YES; - _clanRoomView.layer.cornerRadius = 10; - } - return _clanRoomView; -} - -- (UILabel *)numberLabel { - if (!_numberLabel) { - _numberLabel = [[UILabel alloc] init]; - _numberLabel.text = YMLocalizedString(@"XPGuildHeaderView7"); - _numberLabel.font = [UIFont systemFontOfSize:14]; - _numberLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _numberLabel; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.minimumLineSpacing = 10; - layout.itemSize = CGSizeMake(60, 80); - layout.minimumInteritemSpacing = 0; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPClanRoomCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPClanRoomCollectionViewCell class])]; - } - return _collectionView; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeHeaderView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeHeaderView.h deleted file mode 100644 index e16008e..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeHeaderView.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// XPGuildIncomeHeaderView.h -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import -#import "XPMineGuildIncomeRecordViewController.h" -NS_ASSUME_NONNULL_BEGIN -@class XPGuildIncomeHeaderView; -@protocol XPGuildIncomeHeaderViewDelegate - -///选择日期 -- (void)xPGuildIncomeHeaderView:(XPGuildIncomeHeaderView *)view didChooseTime:(UIButton *)sender; - -@end - -@interface XPGuildIncomeHeaderView : UIView -///代理 -@property (nonatomic,weak) id delegate; -///显示 -@property (nonatomic,assign) GuildIncomeRecrdTimeType timeType; - -@property (nonatomic,copy) NSString *totalIncome; - -- (void)configHeaderView:(NSDate *)startDate endTime:(NSDate * _Nullable)endDate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeHeaderView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeHeaderView.m deleted file mode 100644 index 5909552..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeHeaderView.m +++ /dev/null @@ -1,281 +0,0 @@ -// -// XPGuildIncomeHeaderView.m -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import "XPGuildIncomeHeaderView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -#import "NSString+Utils.h" -#import "UIButton+EnlargeTouchArea.h" -@interface XPGuildIncomeHeaderView () -///显示背景 -@property (nonatomic,strong) UIImageView *backImageView; -///显示哪一年 -@property (nonatomic,strong) UILabel *yearLabel; - -///开始时间 -@property (nonatomic,strong) UILabel *startLabel; -///结束时间 -@property (nonatomic,strong) UILabel *endLabel; -///每日 -@property (nonatomic,strong) UILabel *dayLabel; - -///箭头 -@property (nonatomic,strong) UIButton *arrowButton; -///分割线 -@property (nonatomic,strong) UIView * lineView; -///总收入 -@property (nonatomic,strong) UILabel *totalLabel; -///金币 -@property (nonatomic,strong) UILabel *coinLabel; -///时间格式 -@property (nonatomic,strong) NSDateFormatter *formatter; -@end - -@implementation XPGuildIncomeHeaderView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Public Method -- (void)configHeaderView:(NSDate *)startDate endTime:(NSDate * _Nullable)endDate { - [self.formatter setDateFormat:YMLocalizedString(@"App_Common_Year")]; - NSString *currentYear = [self.formatter stringFromDate:startDate]; - self.yearLabel.text = currentYear; - if (self.timeType == GuildIncomeRecrdTimeType_Day) { - [self.formatter setDateFormat:YMLocalizedString(@"XPGuildIncomeHeaderView0")]; - NSString * currentDay = [self.formatter stringFromDate:startDate]; - self.dayLabel.text = currentDay; - } else if(self.timeType == GuildIncomeRecrdTimeType_Week) { - [self.formatter setDateFormat:YMLocalizedString(@"XPGuildIncomeHeaderView1")]; - NSString * currentDay = [self.formatter stringFromDate:startDate]; - self.startLabel.text = currentDay; - - NSString * endDayStr = [self.formatter stringFromDate:endDate]; - self.endLabel.text = endDayStr; - } else { - [self.formatter setDateFormat:YMLocalizedString(@"XPGuildIncomeHeaderView5")]; - NSString * currentDay = [self.formatter stringFromDate:startDate]; - self.startLabel.text = currentDay; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - [self addSubview:self.backImageView]; - - [self.backImageView addSubview:self.yearLabel]; - [self.backImageView addSubview:self.dayLabel]; - [self.backImageView addSubview:self.startLabel]; - [self.backImageView addSubview:self.endLabel]; - [self.backImageView addSubview:self.arrowButton]; - [self.backImageView addSubview:self.lineView]; - [self.backImageView addSubview:self.totalLabel]; - [self.backImageView addSubview:self.coinLabel]; - - -} - -- (void)initSubViewConstraints { - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(15)); - make.leading.trailing.equalTo(self).inset(kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(90)); - }]; - - [self.yearLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(18)); - make.leading.mas_equalTo(kGetScaleWidth(20)); - make.height.mas_equalTo(kGetScaleWidth(12)); - }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(0.5)); - make.height.mas_equalTo(kGetScaleWidth(49)); - make.centerY.equalTo(self.backImageView); - make.leading.mas_equalTo(kGetScaleWidth(119)); - }]; - [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { - - make.top.mas_equalTo(kGetScaleWidth(54)); - make.width.height.mas_equalTo(kGetScaleWidth(20)); - make.trailing.equalTo(self.lineView.mas_leading).mas_offset(-kGetScaleWidth(19)); - }]; - [self.dayLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.arrowButton.mas_leading).mas_offset(-kGetScaleWidth(1)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.top.mas_equalTo(kGetScaleWidth(56)); - }]; - - - [self.startLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.arrowButton.mas_leading).mas_offset(-kGetScaleWidth(1)); - make.top.mas_equalTo(kGetScaleWidth(44)); - make.height.mas_equalTo(kGetScaleWidth(17)); - }]; - [self.endLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.arrowButton.mas_leading).mas_offset(-kGetScaleWidth(1)); - make.top.mas_equalTo(kGetScaleWidth(65)); - make.height.mas_equalTo(kGetScaleWidth(17)); - }]; - - - [self.totalLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(18)); - make.leading.mas_equalTo(kGetScaleWidth(140)); - make.height.mas_equalTo(kGetScaleWidth(12)); - }]; - - [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.totalLabel); - make.trailing.equalTo(self.backImageView.mas_trailing).mas_offset(-kGetScaleWidth(5)); - make.centerY.mas_equalTo(self.arrowButton); - }]; -} - -#pragma mark - Event Response -- (void)arrowButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildIncomeHeaderView:didChooseTime:)]) { - [self.delegate xPGuildIncomeHeaderView:self didChooseTime:sender]; - } -} - -#pragma mark - Getters And Setters -- (void)setTotalIncome:(NSString *)totalIncome { - _totalIncome = totalIncome; - if (_totalIncome == nil) { - _totalIncome = @"0"; - } - NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPGuildIncomeHeaderView2"), _totalIncome]; - - self.coinLabel.text = title; -} - -- (void)setTimeType:(GuildIncomeRecrdTimeType)timeType { - _timeType = timeType; - switch (_timeType) { - case GuildIncomeRecrdTimeType_Day: - self.dayLabel.hidden = NO; - self.endLabel.hidden = YES; - self.startLabel.hidden = YES; - break; - case GuildIncomeRecrdTimeType_Week: - self.dayLabel.hidden = YES; - self.endLabel.hidden = NO; - self.startLabel.hidden = NO; - break; - case GuildIncomeRecrdTimeType_Mouth: - self.dayLabel.hidden = NO; - self.endLabel.hidden = YES; - self.startLabel.hidden = YES; - break; - default: - break; - } -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"mine_guild_income_header_bg"]; - } - return _backImageView; -} - -- (UILabel *)yearLabel { - if (!_yearLabel) { - _yearLabel = [[UILabel alloc] init]; - _yearLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium]; - _yearLabel.textColor = [UIColor colorWithWhite:1 alpha:0.8]; - } - return _yearLabel; -} - -- (UILabel *)dayLabel { - if (!_dayLabel) { - _dayLabel = [[UILabel alloc] init]; - _dayLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _dayLabel.textColor = [UIColor whiteColor]; - } - return _dayLabel; -} - -- (UILabel *)startLabel { - if (!_startLabel) { - _startLabel = [[UILabel alloc] init]; - _startLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _startLabel.textColor = [UIColor whiteColor]; - } - return _startLabel; -} - -- (UILabel *)endLabel { - if (!_endLabel) { - _endLabel = [[UILabel alloc] init]; - _endLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _endLabel.textColor = [UIColor whiteColor]; - } - return _endLabel; -} - -- (UIButton *)arrowButton { - if (!_arrowButton) { - _arrowButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_arrowButton setBackgroundImage:[UIImage imageNamed:@"mine_guild_income_record_arrow"] forState:UIControlStateNormal]; - [_arrowButton setBackgroundImage:[UIImage imageNamed:@"mine_guild_income_record_arrow"] forState:UIControlStateSelected]; - [_arrowButton addTarget:self action:@selector(arrowButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_arrowButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _arrowButton; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [UIColor whiteColor]; - } - return _lineView; -} - -- (UILabel *)totalLabel { - if (!_totalLabel) { - _totalLabel = [[UILabel alloc] init]; - _totalLabel.text = YMLocalizedString(@"XPGuildIncomeHeaderView4"); - _totalLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium]; - _totalLabel.textColor = [UIColor whiteColor]; - } - return _totalLabel; -} - -- (UILabel *)coinLabel { - if (!_coinLabel) { - _coinLabel = [[UILabel alloc] init]; - _coinLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - _coinLabel.textColor = [UIColor whiteColor]; - _coinLabel.numberOfLines = 2; - } - return _coinLabel; -} - -- (NSDateFormatter *)formatter { - if (!_formatter) { - _formatter = [[NSDateFormatter alloc] init]; - } - return _formatter; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeSectionView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeSectionView.h deleted file mode 100644 index 0178ccd..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeSectionView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPGuildIncomeSectionView.h -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import -#import "XPMineGuildIncomeRecordViewController.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPGuildIncomeSectionView : UIView -///收入类型 -@property (nonatomic,assign) GuildIncomeType incomeType; - -- (instancetype)initWithFrame:(CGRect)frame right:(CGFloat)right; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeSectionView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeSectionView.m deleted file mode 100644 index 1a39de4..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeSectionView.m +++ /dev/null @@ -1,160 +0,0 @@ -// -// XPGuildIncomeSectionView.m -// YuMi -// -// Created by YuMi on 2022/4/11. -// - -#import "XPGuildIncomeSectionView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - - -@interface XPGuildIncomeSectionView () - -///排名 -@property (nonatomic,strong) UILabel *rankLabel; -///房间/头像 -@property (nonatomic,strong) UILabel *roomLabel; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///收入 -@property (nonatomic,strong) UILabel *incomeLabel; -@property (nonatomic,assign) CGFloat right; -@end - -@implementation XPGuildIncomeSectionView -- (instancetype)initWithFrame:(CGRect)frame right:(CGFloat)right{ - self = [super initWithFrame:frame]; - if (self) { - self.right = right; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColorFromRGB(0xF0F5F6); - - [self addSubview:self.rankLabel]; - [self addSubview:self.roomLabel]; - [self addSubview:self.nickLabel]; - [self addSubview:self.incomeLabel]; -} - -- (void)initSubViewConstraints { - - - [self.rankLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(54)); - make.leading.mas_equalTo(kGetScaleWidth(0)); - make.top.bottom.equalTo(self); - }]; - - [self.roomLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(47)); - make.leading.mas_equalTo(kGetScaleWidth(54)); - make.top.bottom.equalTo(self); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.roomLabel.mas_trailing); - make.width.mas_equalTo(kGetScaleWidth(120)); - make.top.bottom.equalTo(self); - }]; - CGFloat width = self.right > 0 ? self.right : 38; - [self.incomeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(self); - if(self.right <= 0){ - make.leading.equalTo(self.nickLabel.mas_trailing); - } - make.trailing.mas_equalTo(-kGetScaleWidth(width)); - }]; -} - -#pragma mark - Getters And Setters -- (void)setIncomeType:(GuildIncomeType)incomeType { - _incomeType = incomeType; - switch (_incomeType) { - case GuildIncomeType_Clan: - case GuildIncomeType_Anchor: - { - self.nickLabel.hidden = YES; - self.roomLabel.text = YMLocalizedString(@"XPGuildIncomeSectionView0"); - self.incomeLabel.textAlignment = NSTextAlignmentCenter; - } - break; - case GuildIncomeType_Hall: - { - self.nickLabel.hidden = NO; - self.roomLabel.text = YMLocalizedString(@"XPGuildIncomeSectionView1"); - self.incomeLabel.textAlignment = NSTextAlignmentCenter; - } - break; - default: - break; - } -} - - - -- (UILabel *)rankLabel { - if (!_rankLabel) { - _rankLabel = [[UILabel alloc] init]; - _rankLabel.text = YMLocalizedString(@"XPGuildIncomeSectionView2"); - _rankLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _rankLabel.textColor = [DJDKMIMOMColor inputTextColor]; - _rankLabel.textAlignment = NSTextAlignmentCenter; - } - return _rankLabel; -} - -- (UILabel *)roomLabel { - if (!_roomLabel) { - _roomLabel = [[UILabel alloc] init]; - _roomLabel.text = YMLocalizedString(@"XPGuildIncomeSectionView3"); - _roomLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _roomLabel.textColor = [DJDKMIMOMColor inputTextColor]; - _roomLabel.textAlignment = NSTextAlignmentCenter; - } - return _roomLabel; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.text = YMLocalizedString(@"XPGuildIncomeSectionView4"); - _nickLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _nickLabel.textColor = [DJDKMIMOMColor inputTextColor]; - _nickLabel.textAlignment = NSTextAlignmentCenter; - _nickLabel.hidden = YES; - } - return _nickLabel; -} - -- (UILabel *)incomeLabel { - if (!_incomeLabel) { - _incomeLabel = [[UILabel alloc] init]; - _incomeLabel.text = YMLocalizedString(@"XPGuildIncomeSectionView5"); - _incomeLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _incomeLabel.textColor = [DJDKMIMOMColor inputTextColor]; - _incomeLabel.textAlignment = NSTextAlignmentCenter; - } - return _incomeLabel; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.h deleted file mode 100644 index 843acb6..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// XPGuildSearchNavView.h -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class XPGuildSearchNavView; -@protocol XPGuildSearchNavViewDelegate -//点击了返回 -- (void)xPGuildSearchNavView:(XPGuildSearchNavView *)view didClickBack:(UIButton *)sender; -///点击了搜索 -- (void)xPGuildSearchNavView:(XPGuildSearchNavView *)view didClickSearch:(UIButton *)sender; -@end - -@interface XPGuildSearchNavView : UIView -///输入框 -@property (nonatomic,strong,readonly) UITextField *searchTextField; -///代理 -@property (nonatomic,weak) id delegate; -///占位文字 -@property (nonatomic,copy) NSString *placeHolder; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.m deleted file mode 100644 index 661c1a2..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.m +++ /dev/null @@ -1,178 +0,0 @@ -// -// XPGuildSearchNavView.m -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import "XPGuildSearchNavView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -#import "UIButton+EnlargeTouchArea.h" -@interface XPGuildSearchNavView () -///返回 -@property (nonatomic,strong) UIButton *backButton; -///输入框背景 -@property (nonatomic,strong) UIView * inputBackView; -///搜索logo -@property (nonatomic,strong) UIImageView *searchImageView; -///输入框 -@property (nonatomic,strong) MSBaseTextField *searchTextField; -///取消 -@property (nonatomic,strong) UIButton *cancleButton; - -@end - - -@implementation XPGuildSearchNavView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - - - - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - [self addSubview:self.backButton]; - [self addSubview:self.inputBackView]; - [self addSubview:self.cancleButton]; - - [self.inputBackView addSubview:self.searchImageView]; - [self.inputBackView addSubview:self.searchTextField]; -} - -- (void)initSubViewConstraints { - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(22, 22)); - make.leading.mas_equalTo(self).offset(8); - make.centerY.mas_equalTo(self.inputBackView); - }]; - - [self.inputBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-8); - make.leading.mas_equalTo(self.backButton.mas_trailing).offset(5); - make.trailing.mas_equalTo(self.cancleButton.mas_leading).offset(-13); - make.height.mas_equalTo(30); - }]; - - [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self).offset(-15); - make.centerY.mas_equalTo(self.inputBackView); - make.height.mas_equalTo(30); - }]; - - [self.searchImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(22, 22)); - make.centerY.mas_equalTo(self.inputBackView); - make.leading.mas_equalTo(self.inputBackView).offset(13); - }]; - - [self.searchTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.searchImageView.mas_trailing).mas_offset(4); - make.top.bottom.mas_equalTo(self.inputBackView); - make.trailing.mas_equalTo(-13); - }]; -} - -#pragma mark - UITextFieldDelegate -- (BOOL)textFieldShouldReturn:(UITextField *)textField { - [self cancleButtonAction:self.cancleButton]; - return YES; -} - - -#pragma mark - Event Response -- (void)cancleButtonAction:(UIButton *)sender { - [self.searchTextField resignFirstResponder]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildSearchNavView:didClickSearch:)]) { - [self.delegate xPGuildSearchNavView:self didClickSearch:sender]; - } -} - -- (void)backButtonAction:(UIButton *)sender { - [self.searchTextField resignFirstResponder]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildSearchNavView:didClickBack:)]) { - [self.delegate xPGuildSearchNavView:self didClickBack:sender]; - } -} - -#pragma mark - Getters And Setters -- (void)setPlaceHolder:(NSString *)placeHolder { - _placeHolder= placeHolder; - if (_placeHolder) { - _searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:_placeHolder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}]; - } -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateSelected]; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_backButton setEnlargeEdgeWithTop:10 right:5 bottom:10 left:8]; - } - return _backButton; -} - -- (UIView *)inputBackView { - if (!_inputBackView) { - _inputBackView = [[UIView alloc] init]; - _inputBackView.backgroundColor = UIColorFromRGB(0xF3F5FA); - _inputBackView.layer.masksToBounds = YES; - _inputBackView.layer.cornerRadius = 15; - } - return _inputBackView; -} - -- (UIImageView *)searchImageView { - if (!_searchImageView) { - _searchImageView = [[UIImageView alloc] init]; - _searchImageView.userInteractionEnabled = YES; - _searchImageView.image = [UIImage imageNamed:@"home_search_input_search2"]; - } - return _searchImageView; -} - -- (MSBaseTextField *)searchTextField { - if (!_searchTextField) { - _searchTextField = [[MSBaseTextField alloc] init]; - _searchTextField.tintColor = [DJDKMIMOMColor secondTextColor]; - _searchTextField.textColor = [DJDKMIMOMColor mainTextColor]; - _searchTextField.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - _searchTextField.font = [UIFont systemFontOfSize:13]; - NSString *placeholder = [NSString stringWithFormat:YMLocalizedString(@"XPGuildSearchNavView0"), AppName]; - _searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}]; - _searchTextField.clearButtonMode = UITextFieldViewModeWhileEditing; - _searchTextField.returnKeyType = UIReturnKeySearch; - _searchTextField.delegate = self; - _searchTextField.enablesReturnKeyAutomatically = YES; - } - return _searchTextField; -} - -- (UIButton *)cancleButton { - if (!_cancleButton) { - _cancleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_cancleButton setTitle:YMLocalizedString(@"XPGuildSearchNavView1") forState:UIControlStateNormal]; - [_cancleButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - _cancleButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:16]; - [_cancleButton addTarget:self action:@selector(cancleButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_cancleButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:0]; - } - return _cancleButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSuperAdminMenuView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSuperAdminMenuView.h deleted file mode 100644 index de8be4d..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSuperAdminMenuView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// XPGuildSuperAdminMenuView.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, GuildSuperAdminMenuType) { - ///设置管理的房间 - GuildSuperAdminMenuType_Set_Manager_Room =1, - ///移除管理 - GuildSuperAdminMenuType_Remove_Super_Admnin -}; - -@class XPGuildSuperAdminMenuView; -@protocol XPGuildSuperAdminMenuViewDelegate - -- (void)xPGuildSuperAdminMenuView:(XPGuildSuperAdminMenuView *)view didClickType:(GuildSuperAdminMenuType)memuType; - -@end -@interface XPGuildSuperAdminMenuView : UIView -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSuperAdminMenuView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSuperAdminMenuView.m deleted file mode 100644 index 88d6901..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSuperAdminMenuView.m +++ /dev/null @@ -1,139 +0,0 @@ -// -// XPGuildSuperAdminMenuView.m -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "XPGuildSuperAdminMenuView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPGuildSuperAdminMenuView () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///设置管理的房间 -@property (nonatomic,strong) UIButton *managerRoomButton; -///分割线 -@property (nonatomic,strong) UIView *lineView; -///移除超管身份 -@property (nonatomic,strong) UIButton *removeButton; - -@end - -@implementation XPGuildSuperAdminMenuView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)drawRect:(CGRect)rect { - CGFloat startX = self.frame.size.width - 20; - - CGContextRef context = UIGraphicsGetCurrentContext(); - CGContextBeginPath(context);//标记 - CGContextMoveToPoint(context, startX, 5); - CGContextAddLineToPoint(context, startX + 5, 0); - CGContextAddLineToPoint(context, startX + 10, 5); - CGContextClosePath(context); - [UIColorFromRGB(0x3C3C3C) setFill]; - [UIColorFromRGB(0x3C3C3C) setStroke]; - CGContextDrawPath(context, kCGPathFillStroke); -} - -#pragma mark - Private Method - -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.managerRoomButton]; - [self.stackView addArrangedSubview:self.lineView]; - [self.stackView addArrangedSubview:self.removeButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(110); - make.height.mas_equalTo(66); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self); - make.top.mas_equalTo(self).offset(5); - }]; - - [self.managerRoomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(1); - }]; -} - -#pragma mark - Event Response - -- (void)managerRoomButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildSuperAdminMenuView:didClickType:)]) { - [self.delegate xPGuildSuperAdminMenuView:self didClickType:sender.tag]; - } -} - -#pragma mark - Getters And Setters -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 0; - _stackView.layer.masksToBounds = YES; - _stackView.layer.cornerRadius = 8; - } - return _stackView; -} - -- (UIButton *)managerRoomButton { - if (!_managerRoomButton) { - _managerRoomButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_managerRoomButton setTitle:YMLocalizedString(@"XPGuildSuperAdminMenuView0") forState:UIControlStateNormal]; - [_managerRoomButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _managerRoomButton.titleLabel.font = [UIFont systemFontOfSize:12]; - _managerRoomButton.backgroundColor = UIColorFromRGB(0x3C3C3C); - _managerRoomButton.tag = GuildSuperAdminMenuType_Set_Manager_Room; - [_managerRoomButton addTarget:self action:@selector(managerRoomButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _managerRoomButton; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [UIColor whiteColor]; - } - return _lineView; -} - -- (UIButton *)removeButton { - if (!_removeButton) { - _removeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_removeButton setTitle:YMLocalizedString(@"XPGuildSuperAdminMenuView1") forState:UIControlStateNormal]; - [_removeButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _removeButton.titleLabel.font = [UIFont systemFontOfSize:12]; - _removeButton.backgroundColor = UIColorFromRGB(0x3C3C3C); - _removeButton.tag = GuildSuperAdminMenuType_Remove_Super_Admnin; - [_removeButton addTarget:self action:@selector(managerRoomButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _removeButton; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimeMonthPickerView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimeMonthPickerView.h deleted file mode 100644 index 076ed1e..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimeMonthPickerView.h +++ /dev/null @@ -1,78 +0,0 @@ -// -// XPGuildTimeMouthPickerView.h -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import -#import "NSDate+DateUtils.h" - -typedef NS_ENUM(NSInteger,HooDatePickerMode) { - HooDatePickerModeTime, // Displays hour, minute, and optionally AM/PM designation depending on the locale setting (e.g. 6 | 53 | PM) - HooDatePickerModeDate, // Displays month, day, and year depending on the locale setting (e.g. November | 15 | 2007) - HooDatePickerModeDateAndTime, // Displays date, hour, minute, and optionally AM/PM designation depending on the locale setting (e.g. Wed Nov 15 | 6 | 53 | PM) - HooDatePickerModeYearAndMonth // Displays Year, Month, designation depending on the locale setting (e.g. November | 2007) -}; - -@class XPGuildTimeMonthPickerView; - -@protocol XPGuildTimeMonthPickerViewDelegate -@optional -- (void)datePicker:(XPGuildTimeMonthPickerView *)datePicker dateDidChange:(NSDate *)date; -- (void)datePicker:(XPGuildTimeMonthPickerView *)datePicker didCancel:(UIButton *)sender; -- (void)datePicker:(XPGuildTimeMonthPickerView *)dataPicker didSelectedDate:(NSDate *)date; -@end - -@interface XPGuildTimeMonthPickerView : UIControl -/** - * Title on the top of HooDatePicker - */ -@property (nonatomic, copy) NSString *title; - -@property (nonatomic, strong) NSDate *date; -/** - * specify min/max date range. default is nil. When min > max, the values are ignored. - */ -@property (nonatomic, strong) NSDate *minimumDate; - -@property (nonatomic, strong) NSDate *maximumDate; -/** - * default is HooDatePickerModeDate. setting nil returns to default - */ -@property (nonatomic, assign) HooDatePickerMode datePickerMode; -/** - * default is [NSLocale currentLocale]. setting nil returns to default - */ -@property(nonatomic,strong) NSLocale *locale; -/** - * default is [NSCalendar currentCalendar]. setting nil returns to default - */ -@property(nonatomic,copy) NSCalendar *calendar; -/** - * default is nil. use current time zone or time zone from calendar - */ -@property(nonatomic,strong) NSTimeZone *timeZone; -/** - * read only property, indicate in datepicker is open. - */ -@property(nonatomic,readonly) BOOL isOpen; - -@property (nonatomic, weak) id delegate; - -- (instancetype)initWithSuperView:(UIView*)superView; - -- (instancetype)initDatePickerMode:(HooDatePickerMode)datePickerMode andAddToSuperView:(UIView *)superView; - -- (instancetype)initDatePickerMode:(HooDatePickerMode)datePickerMode minDate:(NSDate *)minimumDate maxMamDate:(NSDate *)maximumDate andAddToSuperView:(UIView *)superView; -- (instancetype)initNoBackBtnWithSuperView:(UIView*)superView; -- (void)setDate:(NSDate *)date animated:(BOOL)animated; - -- (void)setTintColor:(UIColor *)tintColor; - -- (void)setHighlightColor:(UIColor *)highlightColor; - -- (void)show; --(void)showView; -- (void)dismiss; -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimeMonthPickerView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimeMonthPickerView.m deleted file mode 100644 index d0145b7..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimeMonthPickerView.m +++ /dev/null @@ -1,1729 +0,0 @@ -// -// XPGuildTimeMouthPickerView.m -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import "XPGuildTimeMonthPickerView.h" -#import "DJDKMIMOMColor.h" - -extern NSString *const kDateFormatYYYYMMDD; - -// Constants sizes : -static CGFloat const kHooDatePickerHeight = 260.0f; - - - -static CGFloat const kHooDatePickerButtonHeaderWidth = 40.0f; - -static CGFloat const kHooDatePickerHeaderBottomMargin = 1.0f; - -static CGFloat const kHooDatePickerScrollViewDaysWidth = 90.0f; - -static CGFloat const kHooDatePickerScrollViewMonthWidth = 140.0f; - -static CGFloat const kHooDatePickerScrollViewDateWidth = 165.0f; - -static CGFloat const kHooDatePickerScrollViewLeftMargin = 1.0f; - -static CGFloat const kHooDatePickerScrollViewItemHeight = 45.0f; - -static CGFloat const kHooDatePickerLineWidth = 0.5f; - -static CGFloat const kHooDatePickerLineMargin = 15.0f; - -static CGFloat const kHooDatePickerPadding = 15.0f; - -// Constants times : -static CGFloat const kHooDatePickerAnimationDuration = 0.4f; - -// Constants fonts -#define kHooDatePickerTitleFont [UIFont systemFontOfSize:18.0] -#define kHooDatePickerLabelFont [UIFont systemFontOfSize:18.0] -#define kHooDatePickerLabelSelectedFont [UIFont systemFontOfSize:20.0]; - -// Constants colors : -#define kHooDatePickerHighlightColor [UIColor colorWithRed:255.0/255.0 green:180.0/255.0 blue:18.0/255.0 alpha:1.0] - -typedef NS_ENUM(NSInteger,ScrollViewTagValue) { - ScrollViewTagValue_DAYS = 1, - ScrollViewTagValue_MONTHS = 2, - ScrollViewTagValue_YEARS = 3, - ScrollViewTagValue_HOURS = 4, - ScrollViewTagValue_MINUTES = 5, - ScrollViewTagValue_SECONDS = 6, - ScrollViewTagValue_DATES = 7, - -}; - -@interface XPGuildTimeMonthPickerView () { - // Lines : - UIView *_lineDaysTop, *_lineDaysBottom, *_lineMonthsTop, *_lineMonthsBottom, *_lineYearsTop,*_lineYearsBottom, *_lineDatesTop, *_lineDatesBottom, *_lineHoursTop, *_lineHoursBottom, *_lineMinutesTop, *_lineMinutesBottom, *_lineSecondsTop, *_lineSecondsBottom; - - // Labels : - NSMutableArray *_labelsDays, *_labelsMonths, *_labelsYears, *_labelsDates, *_labelsHours, *_labelsMinutes, *_labelsSeconds; - - // Date and time selected : - NSInteger _selectedDay, _selectedMonth, _selectedYear, _selectedDate, _selectedHour, _selectedMinute, _selectedSecond; - - // First init flag : - BOOL _isInitialized; - NSInteger _minYear; - -} - -// Data of years, months, days, dates, hours, minutes, seconds -@property (nonatomic, strong) NSMutableArray *years, *months, *days, *dates, *hours, *minutes, *seconds; - -// ScrollView for Years, Months, days ,Dates ,Hours ,Minute ,Seconds -@property (nonatomic, strong) UIScrollView *scrollViewYears, *scrollViewMonths, *scrollViewDays, *scrollViewDates, *scrollViewHours, *scrollViewMinutes,*scrollViewSeconds; - -@property (nonatomic, weak) UIView *superView; -@property (nonatomic,assign) CGFloat kHooDatePickerHeaderHeight; -@property (nonatomic, copy) UIView *dimBackgroundView; - -@property (nonatomic, strong) UILabel *titleLabel; - -@property (nonatomic, strong) UIView *headerView; - -@property (nonatomic, strong) UIColor *tintColor; - -@property (nonatomic, strong) UIColor *highlightColor; - -@property (nonatomic, strong) NSDateFormatter *dateFormatter; - -@end - -@implementation XPGuildTimeMonthPickerView - - -#pragma mark - Initializers - - - -- (instancetype)initNoBackBtnWithSuperView:(UIView*)superView { - - if (self = [super initWithFrame:CGRectMake(0.0, 139, superView.frame.size.width, 216)]) { - self.kHooDatePickerHeaderHeight = 0; - _datePickerMode = HooDatePickerModeDate; - [superView addSubview:self]; - _superView = superView; - _minYear = 1900; - self.tintColor = [UIColor whiteColor]; - self.highlightColor = kHooDatePickerHighlightColor; - [self setupControl]; - } - return self; -} - - - -- (instancetype)initWithSuperView:(UIView*)superView { - - - if (self = [super initWithFrame:CGRectMake(0.0, superView.frame.size.height, superView.frame.size.width, kHooDatePickerHeight)]) { - self.kHooDatePickerHeaderHeight = 44; - _datePickerMode = HooDatePickerModeDate; - [superView addSubview:self]; - _superView = superView; - _minYear = 1900; - self.tintColor = [UIColor whiteColor]; - self.highlightColor = kHooDatePickerHighlightColor; - [self addSubview:self.headerView]; - [self setupControl]; - } - return self; -} - -- (instancetype)initDatePickerMode:(HooDatePickerMode)datePickerMode andAddToSuperView:(UIView *)superView { - if (self = [super initWithFrame:CGRectMake(0.0, superView.frame.size.height, superView.frame.size.width, kHooDatePickerHeight)]) { - self.kHooDatePickerHeaderHeight = 44; - _datePickerMode = datePickerMode; - [superView addSubview:self]; - _superView = superView; - _minYear = 1900; - self.tintColor = [UIColor whiteColor]; - self.highlightColor = kHooDatePickerHighlightColor; -// [self addSubview:self.headerView]; - [self setupControl]; - } - return self; -} - -- (instancetype)initDatePickerMode:(HooDatePickerMode)datePickerMode minDate:(NSDate *)minimumDate maxMamDate:(NSDate *)maximumDate andAddToSuperView:(UIView *)superView { - if (self = [super initWithFrame:CGRectMake(0.0, superView.frame.size.height, superView.frame.size.width, kHooDatePickerHeight)]) { - self.kHooDatePickerHeaderHeight = 44; - _datePickerMode = datePickerMode; - [superView addSubview:self]; - _superView = superView; - _minYear = 1900; - if (maximumDate) { - _maximumDate = maximumDate; - } - if (minimumDate) { - _minimumDate = minimumDate; - - NSDateComponents* componentsMin = [self.calendar components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay fromDate:_minimumDate]; - NSInteger yearMin = [componentsMin year]; - _minYear = yearMin; - } - self.tintColor = [UIColor whiteColor]; - self.highlightColor = kHooDatePickerHighlightColor; -// [self addSubview:self.headerView]; - [self setupControl]; - } - return self; -} - -- (void)setupControl { - - // Set parent View : - self.hidden = YES; - - // Clear old selectors - [self removeSelectorYears]; - [self removeSelectorMonths]; - [self removeSelectorDays]; - [self removeSelectorHours]; - [self removeSelectorMinutes]; - [self removeSelectorSeconds]; - - // Generate collections days, months, years, hours, minutes and seconds : - _years = [self getYears]; - _days = [self getDaysInMonth:[NSDate date]]; - if (self.datePickerMode == HooDatePickerModeDateAndTime) { - _dates = [self getDates]; - } - - // Background : - self.backgroundColor = [UIColor whiteColor]; - - // Date Selectors : - if (self.datePickerMode == HooDatePickerModeDate) { - [self buildSelectorYearsOffsetX:0.0 andWidth:kHooDatePickerScrollViewMonthWidth]; - [self buildSelectorMonthsOffsetX:(_scrollViewYears.frame.size.width + kHooDatePickerScrollViewLeftMargin) andWidth:kHooDatePickerScrollViewDaysWidth]; - [self buildSelectorDaysOffsetX:(_scrollViewMonths.frame.origin.x + _scrollViewMonths.frame.size.width + kHooDatePickerScrollViewLeftMargin) andWidth:(self.frame.size.width - (_scrollViewMonths.frame.origin.x + _scrollViewMonths.frame.size.width + kHooDatePickerScrollViewLeftMargin))]; - } - - // Time Selectors : - if (self.datePickerMode == HooDatePickerModeTime) { - [self buildSelectorHoursOffsetX:0.0 andWidth:((self.frame.size.width / 3.0) - kHooDatePickerScrollViewLeftMargin)]; - [self buildSelectorMinutesOffsetX:(self.frame.size.width / 3.0) andWidth:((self.frame.size.width / 3.0) - kHooDatePickerScrollViewLeftMargin)]; - [self buildSelectorSecondsOffsetX:((self.frame.size.width / 3.0) * 2.0) andWidth:(self.frame.size.width / 3.0)]; - } - - // Date & Time Selectors : - if (self.datePickerMode == HooDatePickerModeDateAndTime) { - [self buildSelectorDatesOffsetX:0.0 andWidth:kHooDatePickerScrollViewDateWidth]; - [self buildSelectorHoursOffsetX:(kHooDatePickerScrollViewDateWidth + kHooDatePickerScrollViewLeftMargin) andWidth:(((self.frame.size.width - kHooDatePickerScrollViewDateWidth) / 2.0) - kHooDatePickerScrollViewLeftMargin)]; - [self buildSelectorMinutesOffsetX:(kHooDatePickerScrollViewDateWidth + kHooDatePickerScrollViewLeftMargin + ((self.frame.size.width - kHooDatePickerScrollViewDateWidth) / 2.0)) andWidth:(((self.frame.size.width - kHooDatePickerScrollViewDateWidth) / 2.0) - kHooDatePickerScrollViewLeftMargin)]; - } - - if (self.datePickerMode == HooDatePickerModeYearAndMonth) { - [self buildSelectorYearsOffsetX:0.0 andWidth:self.frame.size.width * 0.5]; - [self buildSelectorMonthsOffsetX:(_scrollViewYears.frame.size.width + kHooDatePickerScrollViewLeftMargin) andWidth:self.frame.size.width * 0.5]; - - } - - // Defaut Date selected : - [self setDate:[NSDate date] animated:NO]; -} - - -#pragma mark - Build Selector Days - -- (void)buildSelectorDaysOffsetX:(CGFloat)x andWidth:(CGFloat)width { - - // ScrollView Days : - _scrollViewDays = [[UIScrollView alloc] initWithFrame:CGRectMake(x, self.kHooDatePickerHeaderHeight + kHooDatePickerHeaderBottomMargin, width, self.frame.size.height - self.kHooDatePickerHeaderHeight - kHooDatePickerHeaderBottomMargin)]; - _scrollViewDays.tag = ScrollViewTagValue_DAYS; - _scrollViewDays.delegate = self; - _scrollViewDays.backgroundColor = [UIColor whiteColor]; - _scrollViewDays.showsHorizontalScrollIndicator = NO; - _scrollViewDays.showsVerticalScrollIndicator = NO; - [self addSubview:_scrollViewDays]; - - _lineDaysTop = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewDays.frame.origin.x + kHooDatePickerLineMargin, _scrollViewDays.frame.origin.y + (_scrollViewDays.frame.size.height / 2) - (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineDaysTop.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineDaysTop]; - - _lineDaysBottom = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewDays.frame.origin.x + kHooDatePickerLineMargin, _scrollViewDays.frame.origin.y + (_scrollViewDays.frame.size.height / 2) + (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineDaysBottom.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineDaysBottom]; - - // Update ScrollView Data - [self buildSelectorLabelsDays]; - - UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTapGestureDaysCaptured:)]; - singleTap.numberOfTapsRequired = 1; - singleTap.numberOfTouchesRequired = 1; - [_scrollViewDays addGestureRecognizer:singleTap]; -} - -- (void)buildSelectorLabelsDays { - - CGFloat offsetContentScrollView = (_scrollViewYears.frame.size.height - kHooDatePickerScrollViewItemHeight) / 2.0; - - if (_labelsDays && _labelsDays.count > 0) { - for (UILabel *label in _labelsDays) { - [label removeFromSuperview]; - } - } - - _labelsDays = [[NSMutableArray alloc] init]; - - for (int i = 0; i < _days.count; i++) { - - NSString *day = (NSString*)[_days xpSafeObjectAtIndex:i]; - - UILabel *labelDay = [[UILabel alloc] initWithFrame:CGRectMake(0, (i * kHooDatePickerScrollViewItemHeight) + offsetContentScrollView, _scrollViewDays.frame.size.width, kHooDatePickerScrollViewItemHeight)]; - labelDay.text = day; - labelDay.font = kHooDatePickerLabelFont; - labelDay.textAlignment = NSTextAlignmentCenter; - labelDay.textColor = self.tintColor; - labelDay.backgroundColor = [UIColor redColor]; - - [_labelsDays addObject:labelDay]; - [_scrollViewDays addSubview:labelDay]; - } - - _scrollViewDays.contentSize = CGSizeMake(_scrollViewDays.frame.size.width, (kHooDatePickerScrollViewItemHeight * _days.count) + (offsetContentScrollView * 2)); -} - -- (void)removeSelectorDays { - - if (_scrollViewDays) { - [_scrollViewDays removeFromSuperview]; - _scrollViewDays = nil; - } - if (_lineDaysTop) { - [_lineDaysTop removeFromSuperview]; - _lineDaysTop = nil; - } - if (_lineDaysBottom) { - [_lineDaysBottom removeFromSuperview]; - _lineDaysBottom = nil; - } -} - -#pragma mark - Build Selector Months - -- (void)buildSelectorMonthsOffsetX:(CGFloat)x andWidth:(CGFloat)width { - - // ScrollView Months - - _scrollViewMonths = [[UIScrollView alloc] initWithFrame:CGRectMake(x, self.kHooDatePickerHeaderHeight + kHooDatePickerHeaderBottomMargin, width, self.frame.size.height - self.kHooDatePickerHeaderHeight - kHooDatePickerHeaderBottomMargin)]; - _scrollViewMonths.tag = ScrollViewTagValue_MONTHS; - _scrollViewMonths.delegate = self; - _scrollViewMonths.backgroundColor = [UIColor whiteColor]; - _scrollViewMonths.showsHorizontalScrollIndicator = NO; - _scrollViewMonths.showsVerticalScrollIndicator = NO; - [self addSubview:_scrollViewMonths]; - - _lineMonthsTop = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewMonths.frame.origin.x + kHooDatePickerLineMargin, _scrollViewMonths.frame.origin.y + (_scrollViewMonths.frame.size.height / 2) - (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineMonthsTop.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineMonthsTop]; - - _lineMonthsBottom = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewMonths.frame.origin.x + kHooDatePickerLineMargin, _scrollViewMonths.frame.origin.y + (_scrollViewMonths.frame.size.height / 2) + (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineMonthsBottom.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineMonthsBottom]; - - - // Update ScrollView Data - [self buildSelectorLabelsMonths]; - - UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTapGestureMonthsCaptured:)]; - singleTap.numberOfTapsRequired = 1; - singleTap.numberOfTouchesRequired = 1; - [_scrollViewMonths addGestureRecognizer:singleTap]; -} - -- (void)buildSelectorLabelsMonths { - - CGFloat offsetContentScrollView = (_scrollViewYears.frame.size.height - kHooDatePickerScrollViewItemHeight) / 2.0; - - if (_labelsMonths && _labelsMonths.count > 0) { - for (UILabel *label in _labelsMonths) { - [label removeFromSuperview]; - } - } - - _labelsMonths = [[NSMutableArray alloc] init]; - - for (int i = 0; i < self.months.count; i++) { - - NSString *day = (NSString*)[self.months xpSafeObjectAtIndex:i]; - - UILabel *labelDay = [[UILabel alloc] initWithFrame:CGRectMake(0.0, (i * kHooDatePickerScrollViewItemHeight) + offsetContentScrollView, _scrollViewMonths.frame.size.width, kHooDatePickerScrollViewItemHeight)]; - labelDay.text = day; - labelDay.font = kHooDatePickerLabelFont; - labelDay.textAlignment = NSTextAlignmentCenter; - labelDay.textColor = self.tintColor; - labelDay.backgroundColor = [UIColor clearColor]; - - [_labelsMonths addObject:labelDay]; - [_scrollViewMonths addSubview:labelDay]; - } - - _scrollViewMonths.contentSize = CGSizeMake(_scrollViewMonths.frame.size.width, (kHooDatePickerScrollViewItemHeight * self.months.count) + (offsetContentScrollView * 2)); -} - -- (void)removeSelectorMonths { - - if (_scrollViewMonths) { - [_scrollViewMonths removeFromSuperview]; - _scrollViewMonths = nil; - } - if (_lineMonthsTop) { - [_lineMonthsTop removeFromSuperview]; - _lineMonthsTop = nil; - } - if (_lineMonthsBottom) { - [_lineMonthsBottom removeFromSuperview]; - _lineMonthsBottom = nil; - } -} - -#pragma mark - Build Selector Years - -- (void)buildSelectorYearsOffsetX:(CGFloat)x andWidth:(CGFloat)width { - - // ScrollView Years - - _scrollViewYears = [[UIScrollView alloc] initWithFrame:CGRectMake(x, self.kHooDatePickerHeaderHeight + kHooDatePickerHeaderBottomMargin, width, self.frame.size.height - self.kHooDatePickerHeaderHeight - kHooDatePickerHeaderBottomMargin)]; - _scrollViewYears.tag = ScrollViewTagValue_YEARS; - _scrollViewYears.delegate = self; - _scrollViewYears.backgroundColor = [UIColor whiteColor]; - _scrollViewYears.showsHorizontalScrollIndicator = NO; - _scrollViewYears.showsVerticalScrollIndicator = NO; - [self addSubview:_scrollViewYears]; - - _lineYearsTop = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewYears.frame.origin.x + kHooDatePickerLineMargin, _scrollViewYears.frame.origin.y + (_scrollViewYears.frame.size.height / 2) - (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineYearsTop.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineYearsTop]; - - _lineYearsBottom = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewYears.frame.origin.x + kHooDatePickerLineMargin, _scrollViewYears.frame.origin.y + (_scrollViewYears.frame.size.height / 2) + (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineYearsBottom.backgroundColor = [UIColor clearColor]; -// [self addSubview:_lineYearsBottom]; - - // Update ScrollView Data - [self buildSelectorLabelsYears]; - - UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTapGestureYearsCaptured:)]; - singleTap.numberOfTapsRequired = 1; - singleTap.numberOfTouchesRequired = 1; - [_scrollViewYears addGestureRecognizer:singleTap]; -} - -- (void)buildSelectorLabelsYears { - - CGFloat offsetContentScrollView = (_scrollViewYears.frame.size.height - kHooDatePickerScrollViewItemHeight) / 2.0; - - if (_labelsYears && _labelsYears.count > 0) { - for (UILabel *label in _labelsYears) { - [label removeFromSuperview]; - } - } - - _labelsYears = [[NSMutableArray alloc] init]; - - for (int i = 0; i < _years.count; i++) { - - NSString *day = (NSString*)[_years xpSafeObjectAtIndex:i]; - - UILabel *labelDay = [[UILabel alloc] initWithFrame:CGRectMake(0.0, (i * kHooDatePickerScrollViewItemHeight) + offsetContentScrollView, _scrollViewYears.frame.size.width, kHooDatePickerScrollViewItemHeight)]; - labelDay.text = day; - labelDay.font = kHooDatePickerLabelFont; - labelDay.textAlignment = NSTextAlignmentCenter; - labelDay.textColor = self.tintColor; - labelDay.backgroundColor = [UIColor clearColor]; - - [_labelsYears addObject:labelDay]; - [_scrollViewYears addSubview:labelDay]; - } - - _scrollViewYears.contentSize = CGSizeMake(_scrollViewYears.frame.size.width, (kHooDatePickerScrollViewItemHeight * _years.count) + (offsetContentScrollView * 2)); -} - -- (void)removeSelectorYears { - - if (_scrollViewYears) { - [_scrollViewYears removeFromSuperview]; - _scrollViewYears = nil; - } - if (_lineYearsTop) { - [_lineYearsTop removeFromSuperview]; - _lineYearsTop = nil; - } - if (_lineYearsBottom) { - [_lineYearsBottom removeFromSuperview]; - _lineYearsBottom = nil; - } -} - -#pragma mark - Build Selector Dates - -- (void)buildSelectorDatesOffsetX:(CGFloat)x andWidth:(CGFloat)width { - - // ScrollView Dates - _scrollViewDates = [[UIScrollView alloc] initWithFrame:CGRectMake(x, self.kHooDatePickerHeaderHeight + kHooDatePickerHeaderBottomMargin, width, self.frame.size.height - self.kHooDatePickerHeaderHeight - kHooDatePickerHeaderBottomMargin)]; - _scrollViewDates.tag = ScrollViewTagValue_DATES; - _scrollViewDates.delegate = self; - _scrollViewDates.backgroundColor = [UIColor whiteColor]; - _scrollViewDates.showsHorizontalScrollIndicator = NO; - _scrollViewDates.showsVerticalScrollIndicator = NO; - [self addSubview:_scrollViewDates]; - - _lineDatesTop = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewDates.frame.origin.x + kHooDatePickerLineMargin, _scrollViewDates.frame.origin.y + (_scrollViewDates.frame.size.height / 2) - (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineDatesTop.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineDatesTop]; - - _lineDatesBottom = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewDates.frame.origin.x + kHooDatePickerLineMargin, _scrollViewDates.frame.origin.y + (_scrollViewDates.frame.size.height / 2) + (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineDatesBottom.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineDatesBottom]; - - // Update ScrollView Data - [self buildSelectorLabelsDates]; - - UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTapGestureDatesCaptured:)]; - singleTap.numberOfTapsRequired = 1; - singleTap.numberOfTouchesRequired = 1; - [_scrollViewDates addGestureRecognizer:singleTap]; -} - -- (void)buildSelectorLabelsDates { - - CGFloat offsetContentScrollView = (_scrollViewDates.frame.size.height - kHooDatePickerScrollViewItemHeight) / 2.0; - - if (_labelsDates && _labelsDates.count > 0) { - for (UILabel *label in _labelsDates) { - [label removeFromSuperview]; - } - } - - _labelsDates = [[NSMutableArray alloc] init]; - - NSDateFormatter *dateFormatter = self.dateFormatter; - [dateFormatter setCalendar:self.calendar]; - [dateFormatter setTimeZone:self.timeZone]; - [dateFormatter setDateFormat:[NSString stringWithFormat:@"MMMdd%@ EEE", YMLocalizedString(@"App_Commont_Day")]]; - - for (int i = 0; i < _dates.count; i++) { - - NSDate *date = [_dates xpSafeObjectAtIndex:i]; - - NSString *hour = [dateFormatter stringFromDate:date]; - - UILabel *labelDate = [[UILabel alloc] initWithFrame:CGRectMake(0, (i * kHooDatePickerScrollViewItemHeight) + offsetContentScrollView, _scrollViewDates.frame.size.width, kHooDatePickerScrollViewItemHeight)]; - labelDate.text = hour; - labelDate.font = kHooDatePickerLabelFont; - labelDate.textAlignment = NSTextAlignmentCenter; - labelDate.textColor = self.tintColor; - labelDate.backgroundColor = [UIColor clearColor]; - - [_labelsDates addObject:labelDate]; - [_scrollViewDates addSubview:labelDate]; - } - - _scrollViewDates.contentSize = CGSizeMake(_scrollViewDates.frame.size.width, (kHooDatePickerScrollViewItemHeight * _dates.count) + (offsetContentScrollView * 2)); -} - -- (void)removeSelectorDates { - - if (_scrollViewDates) { - [_scrollViewDates removeFromSuperview]; - _scrollViewDates = nil; - } - if (_lineDatesTop) { - [_lineDatesTop removeFromSuperview]; - _lineDatesTop = nil; - } - if (_lineDatesBottom) { - [_lineDatesBottom removeFromSuperview]; - _lineDatesBottom = nil; - } -} - -#pragma mark - Build Selector Hours - -- (void)buildSelectorHoursOffsetX:(CGFloat)x andWidth:(CGFloat)width { - - // ScrollView Hours : - _scrollViewHours = [[UIScrollView alloc] initWithFrame:CGRectMake(x, self.kHooDatePickerHeaderHeight + kHooDatePickerHeaderBottomMargin, width, self.frame.size.height - self.kHooDatePickerHeaderHeight - kHooDatePickerHeaderBottomMargin)]; - _scrollViewHours.tag = ScrollViewTagValue_HOURS; - _scrollViewHours.delegate = self; - _scrollViewHours.backgroundColor = [UIColor whiteColor]; - _scrollViewHours.showsHorizontalScrollIndicator = NO; - _scrollViewHours.showsVerticalScrollIndicator = NO; - [self addSubview:_scrollViewHours]; - - _lineHoursTop = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewHours.frame.origin.x + kHooDatePickerLineMargin, _scrollViewHours.frame.origin.y + (_scrollViewHours.frame.size.height / 2) - (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineHoursTop.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineHoursTop]; - - _lineHoursBottom = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewHours.frame.origin.x + kHooDatePickerLineMargin, _scrollViewHours.frame.origin.y + (_scrollViewHours.frame.size.height / 2) + (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineHoursBottom.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineHoursBottom]; - - // Update ScrollView Data - [self buildSelectorLabelsHours]; - - UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTapGestureHoursCaptured:)]; - singleTap.numberOfTapsRequired = 1; - singleTap.numberOfTouchesRequired = 1; - [_scrollViewHours addGestureRecognizer:singleTap]; -} - -- (void)buildSelectorLabelsHours { - - CGFloat offsetContentScrollView = (_scrollViewHours.frame.size.height - kHooDatePickerScrollViewItemHeight) / 2.0; - - if (_labelsHours && _labelsHours.count > 0) { - for (UILabel *label in _labelsHours) { - [label removeFromSuperview]; - } - } - - _labelsHours = [[NSMutableArray alloc] init]; - - for (int i = 0; i < self.hours.count; i++) { - - NSString *hour = (NSString*)[self.hours xpSafeObjectAtIndex:i]; - - UILabel *labelHour = [[UILabel alloc] initWithFrame:CGRectMake(0, (i * kHooDatePickerScrollViewItemHeight) + offsetContentScrollView, _scrollViewHours.frame.size.width, kHooDatePickerScrollViewItemHeight)]; - labelHour.text = hour; - labelHour.font = kHooDatePickerLabelFont; - labelHour.textAlignment = NSTextAlignmentCenter; - labelHour.textColor = self.tintColor; - labelHour.backgroundColor = [UIColor clearColor]; - - [_labelsHours addObject:labelHour]; - [_scrollViewHours addSubview:labelHour]; - } - - _scrollViewHours.contentSize = CGSizeMake(_scrollViewHours.frame.size.width, (kHooDatePickerScrollViewItemHeight * self.hours.count) + (offsetContentScrollView * 2)); -} - -- (void)removeSelectorHours { - - if (_scrollViewHours) { - [_scrollViewHours removeFromSuperview]; - _scrollViewHours = nil; - } - if (_lineHoursTop) { - [_lineHoursTop removeFromSuperview]; - _lineHoursTop = nil; - } - if (_lineHoursBottom) { - [_lineHoursBottom removeFromSuperview]; - _lineHoursBottom = nil; - } -} - -#pragma mark - Build Selector Minutes - -- (void)buildSelectorMinutesOffsetX:(CGFloat)x andWidth:(CGFloat)width { - - // ScrollView Minutes : - _scrollViewMinutes = [[UIScrollView alloc] initWithFrame:CGRectMake(x, self.kHooDatePickerHeaderHeight + kHooDatePickerHeaderBottomMargin, width, self.frame.size.height - self.kHooDatePickerHeaderHeight - kHooDatePickerHeaderBottomMargin)]; - _scrollViewMinutes.tag = ScrollViewTagValue_MINUTES; - _scrollViewMinutes.delegate = self; - _scrollViewMinutes.backgroundColor = [UIColor whiteColor]; - _scrollViewMinutes.showsHorizontalScrollIndicator = NO; - _scrollViewMinutes.showsVerticalScrollIndicator = NO; - [self addSubview:_scrollViewMinutes]; - - _lineMinutesTop = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewMinutes.frame.origin.x + kHooDatePickerLineMargin, _scrollViewMinutes.frame.origin.y + (_scrollViewMinutes.frame.size.height / 2) - (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineMinutesTop.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineMinutesTop]; - - _lineMinutesBottom = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewMinutes.frame.origin.x + kHooDatePickerLineMargin, _scrollViewMinutes.frame.origin.y + (_scrollViewMinutes.frame.size.height / 2) + (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineMinutesBottom.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineMinutesBottom]; - - // Update ScrollView Data - [self buildSelectorLabelsMinutes]; - - UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTapGestureMinutesCaptured:)]; - singleTap.numberOfTapsRequired = 1; - singleTap.numberOfTouchesRequired = 1; - [_scrollViewMinutes addGestureRecognizer:singleTap]; -} - -- (void)buildSelectorLabelsMinutes { - - CGFloat offsetContentScrollView = (_scrollViewMinutes.frame.size.height - kHooDatePickerScrollViewItemHeight) / 2.0; - - if (_labelsMinutes && _labelsMinutes.count > 0) { - for (UILabel *label in _labelsMinutes) { - [label removeFromSuperview]; - } - } - - _labelsMinutes = [[NSMutableArray alloc] init]; - - for (int i = 0; i < self.minutes.count; i++) { - - NSString *minute = (NSString*)[self.minutes xpSafeObjectAtIndex:i]; - - UILabel *labelMinute = [[UILabel alloc] initWithFrame:CGRectMake(0, (i * kHooDatePickerScrollViewItemHeight) + offsetContentScrollView, _scrollViewMinutes.frame.size.width, kHooDatePickerScrollViewItemHeight)]; - labelMinute.text = minute; - labelMinute.font = kHooDatePickerLabelFont; - labelMinute.textAlignment = NSTextAlignmentCenter; - labelMinute.textColor = self.tintColor; - labelMinute.backgroundColor = [UIColor clearColor]; - - [_labelsMinutes addObject:labelMinute]; - [_scrollViewMinutes addSubview:labelMinute]; - } - - _scrollViewMinutes.contentSize = CGSizeMake(_scrollViewMinutes.frame.size.width, (kHooDatePickerScrollViewItemHeight * self.minutes.count) + (offsetContentScrollView * 2)); -} - -- (void)removeSelectorMinutes { - - if (_scrollViewMinutes) { - [_scrollViewMinutes removeFromSuperview]; - _scrollViewMinutes = nil; - } - if (_lineMinutesTop) { - [_lineMinutesTop removeFromSuperview]; - _lineMinutesTop = nil; - } - if (_lineMinutesBottom) { - [_lineMinutesBottom removeFromSuperview]; - _lineMinutesBottom = nil; - } -} - -#pragma mark - Build Selector Seconds - -- (void)buildSelectorSecondsOffsetX:(CGFloat)x andWidth:(CGFloat)width { - - // ScrollView Seconds : - _scrollViewSeconds = [[UIScrollView alloc] initWithFrame:CGRectMake(x, self.kHooDatePickerHeaderHeight + kHooDatePickerHeaderBottomMargin, width, self.frame.size.height - self.kHooDatePickerHeaderHeight - kHooDatePickerHeaderBottomMargin)]; - _scrollViewSeconds.tag = ScrollViewTagValue_SECONDS; - _scrollViewSeconds.delegate = self; - _scrollViewSeconds.backgroundColor = [UIColor whiteColor]; - _scrollViewSeconds.showsHorizontalScrollIndicator = NO; - _scrollViewSeconds.showsVerticalScrollIndicator = NO; - [self addSubview:_scrollViewSeconds]; - - _lineSecondsTop = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewSeconds.frame.origin.x + kHooDatePickerLineMargin, _scrollViewSeconds.frame.origin.y + (_scrollViewSeconds.frame.size.height / 2) - (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineSecondsTop.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineSecondsTop]; - - _lineSecondsBottom = [[UIView alloc] initWithFrame:CGRectMake(_scrollViewSeconds.frame.origin.x + kHooDatePickerLineMargin, _scrollViewSeconds.frame.origin.y + (_scrollViewSeconds.frame.size.height / 2) + (kHooDatePickerScrollViewItemHeight / 2), width - (2 * kHooDatePickerLineMargin), kHooDatePickerLineWidth)]; - _lineSecondsBottom.backgroundColor = [UIColor clearColor]; - [self addSubview:_lineSecondsBottom]; - - // Update ScrollView Data - [self buildSelectorLabelsSeconds]; - - UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTapGestureSecondsCaptured:)]; - singleTap.numberOfTapsRequired = 1; - singleTap.numberOfTouchesRequired = 1; - [_scrollViewSeconds addGestureRecognizer:singleTap]; -} - -- (void)buildSelectorLabelsSeconds { - - CGFloat offsetContentScrollView = (_scrollViewSeconds.frame.size.height - kHooDatePickerScrollViewItemHeight) / 2.0; - - if (_labelsSeconds && _labelsSeconds.count > 0) { - for (UILabel *label in _labelsSeconds) { - [label removeFromSuperview]; - } - } - - _labelsSeconds = [[NSMutableArray alloc] init]; - - for (int i = 0; i < self.seconds.count; i++) { - - NSString *second = (NSString*)[self.seconds xpSafeObjectAtIndex:i]; - - UILabel *labelSecond = [[UILabel alloc] initWithFrame:CGRectMake(0, (i * kHooDatePickerScrollViewItemHeight) + offsetContentScrollView, _scrollViewSeconds.frame.size.width, kHooDatePickerScrollViewItemHeight)]; - labelSecond.text = second; - labelSecond.font = kHooDatePickerLabelFont; - labelSecond.textAlignment = NSTextAlignmentCenter; - labelSecond.textColor = self.tintColor; - labelSecond.backgroundColor = [UIColor clearColor]; - - [_labelsSeconds addObject:labelSecond]; - [_scrollViewSeconds addSubview:labelSecond]; - } - - _scrollViewSeconds.contentSize = CGSizeMake(_scrollViewSeconds.frame.size.width, (kHooDatePickerScrollViewItemHeight * self.seconds.count) + (offsetContentScrollView * 2)); -} - -- (void)removeSelectorSeconds { - - if (_scrollViewSeconds) { - [_scrollViewSeconds removeFromSuperview]; - _scrollViewSeconds = nil; - } - if (_lineSecondsTop) { - [_lineSecondsTop removeFromSuperview]; - _lineSecondsTop = nil; - } - if (_lineSecondsBottom) { - [_lineSecondsBottom removeFromSuperview]; - _lineSecondsBottom = nil; - } -} - -#pragma mark - Actions - -- (void)actionButtonCancel:(UIButton *)sender { - - [self dismiss]; - - if ([self.delegate respondsToSelector:@selector(datePicker:didCancel:)]) { - [self.delegate datePicker:self didCancel:sender]; - } -} - -- (void)actionButtonValid:(UIButton *)sender { - - [self dismiss]; - - if ([self.delegate respondsToSelector:@selector(datePicker:didSelectedDate:)]) { - [self.delegate datePicker:self didSelectedDate:[self getDate]]; - } -} - -#pragma mark - Show and Dismiss --(void)showView{ - if (!_superView) return; - - if (self.hidden == YES) { - self.hidden = NO; - } - - if (_isInitialized == NO) { - self.frame = CGRectMake(self.frame.origin.x, _superView.frame.size.height, self.frame.size.width, self.frame.size.height); - _isInitialized = YES; - } - - [self.superView insertSubview:self.dimBackgroundView belowSubview:self]; - - if (self.datePickerMode == HooDatePickerModeDate || self.datePickerMode == HooDatePickerModeDateAndTime) { - - int indexDays = [self getIndexForScrollViewPosition:_scrollViewDays]; - [self highlightLabelInArray:_labelsDays atIndex:indexDays]; - - int indexMonths = [self getIndexForScrollViewPosition:_scrollViewMonths]; - [self highlightLabelInArray:_labelsMonths atIndex:indexMonths]; - - int indexYears = [self getIndexForScrollViewPosition:_scrollViewYears]; - [self highlightLabelInArray:_labelsYears atIndex:indexYears]; - } - - if (self.datePickerMode == HooDatePickerModeTime || self.datePickerMode == HooDatePickerModeDateAndTime) { - - int indexHours = [self getIndexForScrollViewPosition:_scrollViewHours]; - [self highlightLabelInArray:_labelsHours atIndex:indexHours]; - - int indexMinutes = [self getIndexForScrollViewPosition:_scrollViewMinutes]; - [self highlightLabelInArray:_labelsMinutes atIndex:indexMinutes]; - - int indexSeconds = [self getIndexForScrollViewPosition:_scrollViewSeconds]; - [self highlightLabelInArray:_labelsSeconds atIndex:indexSeconds]; - } - - if (self.datePickerMode == HooDatePickerModeYearAndMonth) { - int indexMonths = [self getIndexForScrollViewPosition:_scrollViewMonths]; - [self highlightLabelInArray:_labelsMonths atIndex:indexMonths]; - - int indexYears = [self getIndexForScrollViewPosition:_scrollViewYears]; - [self highlightLabelInArray:_labelsYears atIndex:indexYears]; - } - self.frame = CGRectMake(self.frame.origin.x, 139, self.frame.size.width, 216); - _isOpen = YES; - [self.dimBackgroundView removeFromSuperview]; - self.dimBackgroundView = nil; -} --(void)show { - - if (!_superView) return; - - if (self.hidden == YES) { - self.hidden = NO; - } - - if (_isInitialized == NO) { - self.frame = CGRectMake(self.frame.origin.x, _superView.frame.size.height, self.frame.size.width, self.frame.size.height); - _isInitialized = YES; - } - - [self.superView insertSubview:self.dimBackgroundView belowSubview:self]; - - if (self.datePickerMode == HooDatePickerModeDate || self.datePickerMode == HooDatePickerModeDateAndTime) { - - int indexDays = [self getIndexForScrollViewPosition:_scrollViewDays]; - [self highlightLabelInArray:_labelsDays atIndex:indexDays]; - - int indexMonths = [self getIndexForScrollViewPosition:_scrollViewMonths]; - [self highlightLabelInArray:_labelsMonths atIndex:indexMonths]; - - int indexYears = [self getIndexForScrollViewPosition:_scrollViewYears]; - [self highlightLabelInArray:_labelsYears atIndex:indexYears]; - } - - if (self.datePickerMode == HooDatePickerModeTime || self.datePickerMode == HooDatePickerModeDateAndTime) { - - int indexHours = [self getIndexForScrollViewPosition:_scrollViewHours]; - [self highlightLabelInArray:_labelsHours atIndex:indexHours]; - - int indexMinutes = [self getIndexForScrollViewPosition:_scrollViewMinutes]; - [self highlightLabelInArray:_labelsMinutes atIndex:indexMinutes]; - - int indexSeconds = [self getIndexForScrollViewPosition:_scrollViewSeconds]; - [self highlightLabelInArray:_labelsSeconds atIndex:indexSeconds]; - } - - if (self.datePickerMode == HooDatePickerModeYearAndMonth) { - int indexMonths = [self getIndexForScrollViewPosition:_scrollViewMonths]; - [self highlightLabelInArray:_labelsMonths atIndex:indexMonths]; - - int indexYears = [self getIndexForScrollViewPosition:_scrollViewYears]; - [self highlightLabelInArray:_labelsYears atIndex:indexYears]; - } - - [UIView animateWithDuration:kHooDatePickerAnimationDuration delay:0.0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ - self.frame = CGRectMake(self.frame.origin.x, _superView.frame.size.height - kHooDatePickerHeight, self.frame.size.width, self.frame.size.height); - } completion:^(BOOL finished) { - _isOpen = YES; - - }]; -} - --(void)dismiss { - - if (!_superView) return; - [UIView animateWithDuration:kHooDatePickerAnimationDuration delay:0.0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ - self.frame = CGRectMake(self.frame.origin.x, _superView.frame.size.height, self.frame.size.width, self.frame.size.height); - self.dimBackgroundView.alpha = 0.0; - } completion:^(BOOL finished) { - _isOpen = NO; - [self.dimBackgroundView removeFromSuperview]; - self.dimBackgroundView = nil; - }]; -} - -#pragma mark - DatePicker Mode - -- (void)setDatePickerMode:(HooDatePickerMode)mode { - _datePickerMode = mode; - [self setupControl]; -} - -#pragma mark - Collections - -- (NSMutableArray*)getYears { - - NSMutableArray *years = [[NSMutableArray alloc] init]; - - NSInteger yearMin = 0; - - if (self.minimumDate) { - NSDateComponents* componentsMin = [self.calendar components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay fromDate:self.minimumDate]; - yearMin = [componentsMin year]; - } else { - yearMin = _minYear; - } - - NSInteger yearMax = 0; - NSDateComponents* componentsMax = nil; - - if (self.maximumDate) { - componentsMax = [self.calendar components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay fromDate:self.maximumDate]; - yearMax = [componentsMax year]; - } else { - componentsMax = [self.calendar components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay fromDate:[NSDate date]]; - yearMax = [componentsMax year]; - } - - for (NSInteger i = yearMin; i <= yearMax; i++) { - - [years addObject:[NSString stringWithFormat:@"%ld\u5e74", (long)i]]; - } - - return years; -} - -- (NSMutableArray*)getDates { - NSMutableArray *dates = [[NSMutableArray alloc] init]; - - if (self.minimumDate && self.maximumDate) { - NSInteger days = [self.minimumDate daysBetween:self.maximumDate]; - for (NSInteger i = 0; i < days; i++) { - NSDate *date = [self.minimumDate dateByAddingDays:i]; - if ([date daysBetween: self.maximumDate] >= 0) { - [dates addObject:date]; - } - } - } else { - - NSDateComponents* currentComponents = [self.calendar components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay fromDate:[NSDate date]]; - NSInteger currentYear = [currentComponents year]; - - NSDateComponents *dateComponents = [[NSDateComponents alloc] init]; - [dateComponents setCalendar:self.calendar]; - [dateComponents setTimeZone:self.timeZone]; - [dateComponents setDay:1]; - [dateComponents setMonth:1]; - [dateComponents setHour:0]; - [dateComponents setMinute:0]; - [dateComponents setSecond:0]; - [dateComponents setYear:currentYear]; - - NSDateComponents *maxComponents = [[NSDateComponents alloc] init]; - [maxComponents setCalendar:self.calendar]; - [maxComponents setTimeZone:self.timeZone]; - [maxComponents setDay:1]; - [maxComponents setMonth:1]; - [maxComponents setHour:0]; - [maxComponents setMinute:0]; - [maxComponents setSecond:0]; - [maxComponents setYear:currentYear + 1]; - - NSDate *yearMin = [dateComponents date]; - NSDate *yearMax = [maxComponents date]; - - NSInteger timestampMin = [yearMin timeIntervalSince1970]; - NSInteger timestampMax = [yearMax timeIntervalSince1970]; - - while (timestampMin < timestampMax) { - - NSDate *date = [NSDate dateWithTimeIntervalSince1970:timestampMin]; - - [dates addObject:date]; - - timestampMin += 1 * 24 * 60 * 60; - } - } - - return dates; -} - -- (NSMutableArray*)getDaysInMonth:(NSDate*)date { - - if (date == nil) date = [NSDate date]; - - NSRange daysRange = [self.calendar rangeOfUnit:NSCalendarUnitDay inUnit:NSCalendarUnitMonth forDate:date]; - - NSMutableArray *days = [[NSMutableArray alloc] init]; - - for (int i = 1; i <= daysRange.length; i++) { - - [days addObject:[NSString stringWithFormat:@"%d%@", i, YMLocalizedString(@"App_Commont_Day")]]; - } - - return days; -} - -#pragma mark - UIScrollView Delegate - -- (void)singleTapGestureDaysCaptured:(UITapGestureRecognizer *)gesture { - - CGPoint touchPoint = [gesture locationInView:self]; - CGFloat touchY = touchPoint.y; - - if (touchY < (_lineDaysTop.frame.origin.y)) { - - if (_selectedDay > 1) { - _selectedDay -= 1; - [self setScrollView:_scrollViewDays atIndex:(_selectedDay - 1) animated:YES]; - } - - } else if (touchY > (_lineDaysBottom.frame.origin.y)) { - - if (_selectedDay < _days.count) { - _selectedDay += 1; - [self setScrollView:_scrollViewDays atIndex:(_selectedDay - 1) animated:YES]; - } - } -} - -- (void)singleTapGestureMonthsCaptured:(UITapGestureRecognizer *)gesture { - - CGPoint touchPoint = [gesture locationInView:self]; - CGFloat touchY = touchPoint.y; - - if (touchY < (_lineMonthsTop.frame.origin.y)) { - - if (_selectedMonth > 1) { - _selectedMonth -= 1; - [self setScrollView:_scrollViewMonths atIndex:(_selectedMonth - 1) animated:YES]; - } - - } else if (touchY > (_lineMonthsBottom.frame.origin.y)) { - - if (_selectedMonth < self.months.count) { - _selectedMonth += 1; - [self setScrollView:_scrollViewMonths atIndex:(_selectedMonth - 1) animated:YES]; - } - } -} - -- (void)singleTapGestureYearsCaptured:(UITapGestureRecognizer *)gesture { - - CGPoint touchPoint = [gesture locationInView:self]; - CGFloat touchY = touchPoint.y; - - NSInteger minYear = _minYear; - - if (touchY < (_lineYearsTop.frame.origin.y)) { - - if (_selectedYear > minYear) { - _selectedYear -= 1; - [self setScrollView:_scrollViewYears atIndex:(_selectedYear - minYear) animated:YES]; - } - - } else if (touchY > (_lineYearsBottom.frame.origin.y)) { - - if (_selectedYear < (_years.count + (minYear - 1))) { - _selectedYear += 1; - [self setScrollView:_scrollViewYears atIndex:(_selectedYear - minYear) animated:YES]; - } - } -} - - -- (void)singleTapGestureDatesCaptured:(UITapGestureRecognizer *)gesture { - - CGPoint touchPoint = [gesture locationInView:self]; - CGFloat touchY = touchPoint.y; - - if (touchY < (_lineDatesTop.frame.origin.y)) { - - if (_selectedDate > 0) { - _selectedDate -= 1; - [self setScrollView:_scrollViewDates atIndex:_selectedDate animated:YES]; - } - - } else if (touchY > (_lineDatesBottom.frame.origin.y)) { - - if (_selectedDate < _dates.count - 1) { - _selectedDate += 1; - [self setScrollView:_scrollViewDates atIndex:_selectedDate animated:YES]; - } - } -} - -- (void)singleTapGestureHoursCaptured:(UITapGestureRecognizer *)gesture { - - CGPoint touchPoint = [gesture locationInView:self]; - CGFloat touchY = touchPoint.y; - - if (touchY < (_lineHoursTop.frame.origin.y)) { - - if (_selectedHour > 0) { - _selectedHour -= 1; - [self setScrollView:_scrollViewHours atIndex:_selectedHour animated:YES]; - } - - } else if (touchY > (_lineHoursBottom.frame.origin.y)) { - - if (_selectedHour < self.hours.count - 1) { - _selectedHour += 1; - [self setScrollView:_scrollViewHours atIndex:_selectedHour animated:YES]; - } - } -} - -- (void)singleTapGestureMinutesCaptured:(UITapGestureRecognizer *)gesture { - - CGPoint touchPoint = [gesture locationInView:self]; - CGFloat touchY = touchPoint.y; - - if (touchY < (_lineMinutesTop.frame.origin.y)) { - - if (_selectedMinute > 0) { - _selectedMinute -= 1; - [self setScrollView:_scrollViewMinutes atIndex:_selectedMinute animated:YES]; - } - - } else if (touchY > (_lineMinutesBottom.frame.origin.y)) { - - if (_selectedMinute < self.minutes.count - 1) { - _selectedMinute += 1; - [self setScrollView:_scrollViewMinutes atIndex:_selectedMinute animated:YES]; - } - } -} - -- (void)singleTapGestureSecondsCaptured:(UITapGestureRecognizer *)gesture { - - CGPoint touchPoint = [gesture locationInView:self]; - CGFloat touchY = touchPoint.y; - - if (touchY < (_lineSecondsTop.frame.origin.y)) { - - if (_selectedSecond > 0) { - _selectedSecond -= 1; - [self setScrollView:_scrollViewSeconds atIndex:_selectedSecond animated:YES]; - } - - } else if (touchY > (_lineSecondsBottom.frame.origin.y)) { - - if (_selectedSecond < self.seconds.count - 1) { - _selectedSecond += 1; - [self setScrollView:_scrollViewSeconds atIndex:_selectedSecond animated:YES]; - } - } -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - - int index = [self getIndexForScrollViewPosition:scrollView]; - - [self updateSelectedDateAtIndex:index forScrollView:scrollView]; - - if (scrollView.tag == ScrollViewTagValue_DAYS) { - [self highlightLabelInArray:_labelsDays atIndex:index]; - } else if (scrollView.tag == ScrollViewTagValue_MONTHS) { - [self highlightLabelInArray:_labelsMonths atIndex:index]; - } else if (scrollView.tag == ScrollViewTagValue_YEARS) { - [self highlightLabelInArray:_labelsYears atIndex:index]; - } else if (scrollView.tag == ScrollViewTagValue_HOURS) { - [self highlightLabelInArray:_labelsHours atIndex:index]; - } else if (scrollView.tag == ScrollViewTagValue_MINUTES) { - [self highlightLabelInArray:_labelsMinutes atIndex:index]; - } else if (scrollView.tag == ScrollViewTagValue_SECONDS) { - [self highlightLabelInArray:_labelsSeconds atIndex:index]; - } else if (scrollView.tag == ScrollViewTagValue_DATES) { - [self highlightLabelInArray:_labelsDates atIndex:index]; - } -} - -- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate { - - int index = [self getIndexForScrollViewPosition:scrollView]; - - [self updateSelectedDateAtIndex:index forScrollView:scrollView]; - - [self setScrollView:scrollView atIndex:index animated:YES]; - - NSDate *selectedDate = [self getDate]; - if (self.datePickerMode != HooDatePickerModeDateAndTime && self.datePickerMode != HooDatePickerModeTime) { - if ([selectedDate compare:self.minimumDate] == NSOrderedAscending) { - [self setDate:self.minimumDate animated:YES]; - } - - if ([selectedDate compare:self.maximumDate] == NSOrderedDescending) { - [self setDate:self.maximumDate animated:YES]; - } - } - if ([self.delegate respondsToSelector:@selector(datePicker:dateDidChange:)]) { - [self.delegate datePicker:self dateDidChange:selectedDate]; - } -} - -- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView { - - int index = [self getIndexForScrollViewPosition:scrollView]; - - [self updateSelectedDateAtIndex:index forScrollView:scrollView]; - - [self setScrollView:scrollView atIndex:index animated:YES]; - - NSDate *selectedDate = [self getDate]; - if (self.datePickerMode != HooDatePickerModeDateAndTime && self.datePickerMode != HooDatePickerModeTime) { - if ([selectedDate compare:self.minimumDate] == NSOrderedAscending) { - [self setDate:self.minimumDate animated:YES]; - return; - } - - if ([selectedDate compare:self.maximumDate] == NSOrderedDescending) { - [self setDate:self.maximumDate animated:YES]; - return; - } - } - - if ([self.delegate respondsToSelector:@selector(datePicker:dateDidChange:)]) { - [self.delegate datePicker:self dateDidChange:selectedDate]; - } -} - -- (void)updateSelectedDateAtIndex:(int)index forScrollView:(UIScrollView*)scrollView { - - if (scrollView.tag == ScrollViewTagValue_DAYS) { - _selectedDay = index + 1; // 1 to 31 - } else if (scrollView.tag == ScrollViewTagValue_MONTHS) { - - _selectedMonth = index + 1; // 1 to 12 - - // Updates days : - [self updateNumberOfDays]; - - } else if (scrollView.tag == ScrollViewTagValue_YEARS) { - - _selectedYear = _minYear + index; - - // Updates days : - [self updateNumberOfDays]; - - } else if (scrollView.tag == ScrollViewTagValue_HOURS) { - _selectedHour = index; // 0 to 23 - } else if (scrollView.tag == ScrollViewTagValue_MINUTES) { - _selectedMinute = index; // 0 to 59 - } else if (scrollView.tag == ScrollViewTagValue_SECONDS) { - _selectedSecond = index; // 0 to 59 - } else if (scrollView.tag == ScrollViewTagValue_DATES) { - _selectedDate = index; - } -} - -- (void)updateNumberOfDays { - - // Updates days : - NSDate *date = [self convertToDateDay:1 month:_selectedMonth year:_selectedYear hours:_selectedHour minutes:_selectedMinute seconds:_selectedSecond]; - - if (!date) return; - - NSMutableArray *newDays = [self getDaysInMonth:date]; - - if (newDays.count != _days.count) { - - _days = newDays; - - [self buildSelectorLabelsDays]; - - if (_selectedDay > _days.count) { - _selectedDay = _days.count; - } - - [self highlightLabelInArray:_labelsDays atIndex:_selectedDay - 1]; - } -} - -- (int)getIndexForScrollViewPosition:(UIScrollView *)scrollView { - - CGFloat offsetContentScrollView = (scrollView.frame.size.height - kHooDatePickerScrollViewItemHeight) / 2.0; - CGFloat offetY = scrollView.contentOffset.y; - CGFloat index = floorf((offetY + offsetContentScrollView) / kHooDatePickerScrollViewItemHeight); - index = (index - 1); - return index; -} - -- (void)setScrollView:(UIScrollView*)scrollView atIndex:(NSInteger)index animated:(BOOL)animated { - - if (!scrollView) return; - - if (animated) { - [UIView beginAnimations:@"ScrollViewAnimation" context:nil]; - [UIView setAnimationDelegate:self]; - [UIView setAnimationDuration:kHooDatePickerAnimationDuration]; - [UIView setAnimationCurve:UIViewAnimationCurveEaseInOut]; - } - - scrollView.contentOffset = CGPointMake(0.0, (index * kHooDatePickerScrollViewItemHeight)); - - if (animated) { - [UIView commitAnimations]; - } - - if (self.delegate != nil && [self.delegate respondsToSelector:@selector(datePicker:dateDidChange:)]) { - [self.delegate datePicker:self dateDidChange:[self getDate]]; - } -} - -- (void)highlightLabelInArray:(NSMutableArray*)labels atIndex:(NSInteger)index { - if (!labels) return; - if (index > labels.count) return; - if (index < 0) return; - - for (int i = 0; i < labels.count; i++) { - UILabel *label = (UILabel *)[labels xpSafeObjectAtIndex:i]; - if (i != index) { - label.textColor = self.tintColor; - label.font = kHooDatePickerLabelFont; - } else { - label.textColor = self.highlightColor; - label.font = kHooDatePickerLabelSelectedFont; - } - } -} - -#pragma mark - Date - -- (void) setDate:(NSDate *)date animated:(BOOL)animated { - - if (!date) return; - NSDateComponents* components = [self.calendar components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay|NSCalendarUnitHour|NSCalendarUnitMinute|NSCalendarUnitSecond fromDate:date]; - - _selectedDay = [components day]; - _selectedMonth = [components month]; - _selectedYear = [components year]; - _selectedHour = [components hour]; - /** - * only show mininute 00 10 20 ~ 50 in hotel tour edit order for flight pick up - */ - if (self.datePickerMode != HooDatePickerModeDateAndTime) { - _selectedMinute = [components minute]; - } - _selectedSecond = [components second]; - - if (self.datePickerMode == HooDatePickerModeDateAndTime) { - if (self.minimumDate) { - [self setScrollView:_scrollViewDates atIndex:[date daysBetween:self.minimumDate] - 1 animated:animated]; - } else { - [self setScrollView:_scrollViewDates atIndex:(_selectedDay - 1) animated:animated]; - } - - } - - if (self.datePickerMode == HooDatePickerModeDate) { - [self setScrollView:_scrollViewYears atIndex:(_selectedYear - _minYear) animated:animated]; - [self setScrollView:_scrollViewMonths atIndex:(_selectedMonth - 1) animated:animated]; - [self setScrollView:_scrollViewDays atIndex:(_selectedDay - 1) animated:animated]; - - - } - - if (self.datePickerMode == HooDatePickerModeTime || self.datePickerMode == HooDatePickerModeDateAndTime) { - [self setScrollView:_scrollViewHours atIndex:_selectedHour animated:animated]; - [self setScrollView:_scrollViewMinutes atIndex:_selectedMinute animated:animated]; - [self setScrollView:_scrollViewSeconds atIndex:_selectedSecond animated:animated]; - } - - if (self.datePickerMode == HooDatePickerModeYearAndMonth) { - [self setScrollView:_scrollViewMonths atIndex:(_selectedMonth - 1) animated:animated]; - [self setScrollView:_scrollViewYears atIndex:(_selectedYear - _minYear) animated:animated]; - } - - if (self.delegate != nil && [self.delegate respondsToSelector:@selector(datePicker:dateDidChange:)]) { - [self.delegate datePicker:self dateDidChange:[self getDate]]; - } -} - -- (NSDate*)convertToDateDay:(NSInteger)day month:(NSInteger)month year:(NSInteger)year hours:(NSInteger)hours minutes:(NSInteger)minutes seconds:(NSInteger)seconds { - - NSMutableString *dateString = [[NSMutableString alloc] init]; - - NSDateFormatter *dateFormatter = self.dateFormatter; - if (self.timeZone) [dateFormatter setTimeZone:self.timeZone]; - [dateFormatter setLocale:self.locale]; - - // Date Mode : - if (self.datePickerMode == HooDatePickerModeDate) { - - if (day < 10) { - [dateString appendFormat:@"0%ld-", (long)day]; - } else { - [dateString appendFormat:@"%ld-", (long)day]; - } - - if (month < 10) { - [dateString appendFormat:@"0%ld-", (long)month]; - } else { - [dateString appendFormat:@"%ld-", (long)month]; - } - - [dateString appendFormat:@"%ld", (long)year]; - - [dateFormatter setDateFormat:@"dd-MM-yyyy"]; - } - - // Time Mode : - if (self.datePickerMode == HooDatePickerModeTime) { - - NSDateComponents* components = [self.calendar components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay fromDate:[NSDate date]]; - - NSInteger nowDay = [components day]; - NSInteger nowMonth = [components month]; - NSInteger nowYear = [components year]; - - if (nowDay < 10) { - [dateString appendFormat:@"0%ld-", (long)nowDay]; - } else { - [dateString appendFormat:@"%ld-", (long)nowDay]; - } - - if (nowMonth < 10) { - [dateString appendFormat:@"0%ld-", (long)nowMonth]; - } else { - [dateString appendFormat:@"%ld-", (long)nowMonth]; - } - - [dateString appendFormat:@"%ld", (long)nowYear]; - - if (hours < 10) { - [dateString appendFormat:@" 0%ld:", (long)hours]; - } else { - [dateString appendFormat:@" %ld:", (long)hours]; - } - - if (minutes < 10) { - [dateString appendFormat:@"0%ld:", (long)minutes]; - } else { - [dateString appendFormat:@"%ld:", (long)minutes]; - } - - if (seconds < 10) { - [dateString appendFormat:@"0%ld", (long)seconds]; - } else { - [dateString appendFormat:@"%ld", (long)seconds]; - } - - [dateFormatter setDateFormat:@"dd-MM-yyyy HH:mm:ss"]; - } - - // Date and Time Mode : - if (self.datePickerMode == HooDatePickerModeDateAndTime) { - - if (day < 10) { - [dateString appendFormat:@"0%ld-", (long)day]; - } else { - [dateString appendFormat:@"%ld-", (long)day]; - } - - if (month < 10) { - [dateString appendFormat:@"0%ld-", (long)month]; - } else { - [dateString appendFormat:@"%ld-", (long)month]; - } - - [dateString appendFormat:@"%ld", (long)year]; - - if (hours < 10) { - [dateString appendFormat:@" 0%ld:", (long)hours]; - } else { - [dateString appendFormat:@" %ld:", (long)hours]; - } - - if (minutes < 10) { - [dateString appendFormat:@"0%ld:", (long)minutes]; - } else { - [dateString appendFormat:@"%ld:", (long)minutes]; - } - - [dateString appendString:@"00"]; - - [dateFormatter setDateFormat:@"dd-MM-yyyy HH:mm:ss"]; - } - - if (self.datePickerMode == HooDatePickerModeYearAndMonth) { - - if (month < 10) { - [dateString appendFormat:@"0%ld-", (long)month]; - } else { - [dateString appendFormat:@"%ld-", (long)month]; - } - - [dateString appendFormat:@"%ld", (long)year]; - - [dateFormatter setDateFormat:@"MM-yyyy"]; - } - - return [dateFormatter dateFromString:dateString]; -} - -- (NSDate*)convertToDate:(NSInteger)days hours:(NSInteger)hours minutes:(NSInteger)minutes seconds:(NSInteger)seconds { - - NSDate *date = [self.minimumDate dateByAddingDays:days]; - - NSMutableString *dateString = [[NSMutableString alloc] initWithString:[date stringForFormat:@"dd-MM-yyyy"]]; - - NSDateFormatter *dateFormatter = self.dateFormatter; - if (self.timeZone) [dateFormatter setTimeZone:self.timeZone]; - [dateFormatter setLocale:self.locale]; - - - if (hours < 10) { - [dateString appendFormat:@" 0%ld:", (long)hours]; - } else { - [dateString appendFormat:@" %ld:", (long)hours]; - } - /** - * only show mininute 00 10 20 ~ 50 in hotel tour edit order for flight pick up - */ - - if (!minutes) { - [dateString appendFormat:@"0%ld:", (long)minutes]; - } else { - [dateString appendFormat:@"%ld:", (long)minutes * 10]; - } - - [dateString appendString:@"00"]; - - [dateFormatter setDateFormat:@"dd-MM-yyyy HH:mm:ss"]; - return [dateFormatter dateFromString:dateString]; -} - -- (NSDate*)getDate { - if (self.datePickerMode == HooDatePickerModeDateAndTime) { - return [self convertToDate:_selectedDate hours:_selectedHour minutes:_selectedMinute seconds:_selectedSecond]; - } - return [self convertToDateDay:_selectedDay month:_selectedMonth year:_selectedYear hours:_selectedHour minutes:_selectedMinute seconds:_selectedSecond]; -} - - - -#pragma mark - Getters and Setters - -- (UIView *)dimBackgroundView { - if(!_dimBackgroundView) { - _dimBackgroundView = [[UIView alloc] initWithFrame:self.superView.bounds]; - [_dimBackgroundView setTranslatesAutoresizingMaskIntoConstraints:YES]; - _dimBackgroundView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismiss)]; - [_dimBackgroundView addGestureRecognizer:tap]; - } - return _dimBackgroundView; -} - -- (UIView *)headerView { - if (!_headerView) { - _headerView = [[UIView alloc] initWithFrame:CGRectMake(0.0, 0.0, self.frame.size.width, self.kHooDatePickerHeaderHeight)]; - // Button Cancel - UIButton *cancelButton = [[UIButton alloc] initWithFrame:CGRectMake(kHooDatePickerPadding, 0.0, kHooDatePickerButtonHeaderWidth, self.kHooDatePickerHeaderHeight)]; - [cancelButton setTitle:YMLocalizedString(@"XPGuildTimeMonthPickerView2") forState:UIControlStateNormal]; - [cancelButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - [cancelButton addTarget:self action:@selector(actionButtonCancel:) forControlEvents:UIControlEventTouchUpInside]; - cancelButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_headerView addSubview:cancelButton]; - - // Button confirm - UIButton *sureButton = [[UIButton alloc] initWithFrame:CGRectMake(self.frame.size.width - kHooDatePickerButtonHeaderWidth - kHooDatePickerPadding, 0.0, kHooDatePickerButtonHeaderWidth, self.kHooDatePickerHeaderHeight)]; - [sureButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - [sureButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - [sureButton addTarget:self action:@selector(actionButtonValid:) forControlEvents:UIControlEventTouchUpInside]; - sureButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_headerView addSubview:sureButton]; - } - return _headerView; -} - -- (NSDateFormatter *)dateFormatter { - if (!_dateFormatter) { - NSDateFormatter *dateFormatter = [NSDate shareDateFormatter]; - _dateFormatter = dateFormatter; - } - _dateFormatter.dateFormat = kDateFormatYYYYMMDD; - - return _dateFormatter; -} - -- (NSCalendar *)calendar { - if (!_calendar) { - _calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]; - _calendar.timeZone = self.timeZone; - _calendar.locale = self.locale; - } - return _calendar; -} - -- (NSMutableArray *)months { - NSMutableArray *months = [[NSMutableArray alloc] init]; - for (int monthNumber = 1; monthNumber <= 12; monthNumber++) { - NSString *dateString = [NSString stringWithFormat: @"%d", monthNumber]; - NSDateFormatter* dateFormatter = self.dateFormatter; - if (self.timeZone) [dateFormatter setTimeZone:self.timeZone]; - [dateFormatter setLocale:self.locale]; - [dateFormatter setDateFormat:@"MM"]; - NSDate* myDate = [dateFormatter dateFromString:dateString]; - - NSDateFormatter *formatter = self.dateFormatter; - if (self.timeZone) [dateFormatter setTimeZone:self.timeZone]; - [dateFormatter setLocale:self.locale]; - [formatter setDateFormat:@"MMM"]; - NSString *stringFromDate = [formatter stringFromDate:myDate]; - - [months addObject:stringFromDate]; - } - _months = months; - return _months; -} - -- (NSMutableArray*)hours { - if (!_hours) { - NSMutableArray *hours = [[NSMutableArray alloc] init]; - - for (int i = 0; i < 24; i++) { - if (i < 10) { - [hours addObject:[NSString stringWithFormat:@"0%d%@", i, YMLocalizedString(@"App_Commont_Hour")]]; - } else { - [hours addObject:[NSString stringWithFormat:@"%d%@", i, YMLocalizedString(@"App_Commont_Hour")]]; - } - } - _hours = hours; - } - return _hours; -} - -- (NSMutableArray*)minutes { - if (!_minutes) { - NSMutableArray *minutes = [[NSMutableArray alloc] init]; - /** - * only show mininute 00 10 20 ~ 50 in hotel tour edit order for flight pick up - */ - for (int i = 0; i < 6; i++) { - if (!i) { - [minutes addObject:[NSString stringWithFormat:@"%d0%@", i, YMLocalizedString(@"App_Commont_Minute")]]; - } else { - [minutes addObject:[NSString stringWithFormat:@"%d%@", i * 10, YMLocalizedString(@"App_Commont_Minute")]]; - } - - } - _minutes = minutes; - } - return _minutes; -} - -- (NSMutableArray*)seconds { - if (!_seconds) { - - NSMutableArray *seconds = [[NSMutableArray alloc] init]; - - for (int i = 0; i < 60; i++) { - if (i < 10) { - [seconds addObject:[NSString stringWithFormat:@"0%d", i]]; - } else { - [seconds addObject:[NSString stringWithFormat:@"%d", i]]; - } - } - _seconds = seconds; - } - return _seconds; -} -- (NSTimeZone *)timeZone { - if (!_timeZone) { - _timeZone = [NSTimeZone timeZoneWithAbbreviation:@"UTC"]; - } - return _timeZone; -} - -- (NSLocale *)locale { - if (!_locale) { - _locale = [NSLocale localeWithLocaleIdentifier:@"zh_CN"]; - } - return _locale; -} - -- (void)setTintColor:(UIColor *)tintColor { - _tintColor = tintColor; - [self setupControl]; -} - -- (void)setHighlightColor:(UIColor *)highlightColor { - _highlightColor = highlightColor; - [self setupControl]; -} - -- (void)setMinimumDate:(NSDate*)date { - _minimumDate = date; - NSDateComponents* componentsMin = [self.calendar components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay fromDate:_minimumDate]; - NSInteger yearMin = [componentsMin year]; - _minYear = yearMin; - [self setupControl]; -} - -- (void)setMaximumDate:(NSDate*)date { - _maximumDate = date; - [self setupControl]; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.h deleted file mode 100644 index c2fd2a2..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// XPGuildTimePickView.h -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, XPGuildTimePickType) { - XPGuildTimePickTypeDay,///按日 - XPGuildTimePickTypeWeek,///按周 -}; - -@class XPGuildTimePickView; -@protocol XPGuildTimePickViewDelegate - -///点了确认按钮 -- (void)xPGuildTimePickView:(XPGuildTimePickView *)view didClickSure:(UIButton *)sender; -///点了取消按钮 -- (void)xPGuildTimePickView:(XPGuildTimePickView *)view didClickCancel:(UIButton *)sender; -@end - -@interface XPGuildTimePickView : UIView -///是否是选择两个日期 -@property (nonatomic, assign) XPGuildTimePickType pickDateType; -///代理 -@property (nonatomic,weak) id delegate; -///当前的时间 -@property (nonatomic,strong) NSDate *currentDate; -///开始的时间 -@property (nonatomic,strong, readonly) NSDate *startDate; -///结束的时间 -@property (nonatomic,strong, readonly) NSDate *endDate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m deleted file mode 100644 index 35dce76..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m +++ /dev/null @@ -1,407 +0,0 @@ -// -// XPGuildTimePickView.m -// YuMi -// -// Created by YuMi on 2022/4/12. -// - -#import "XPGuildTimePickView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -#import "XNDJTDDLoadingTool.h" - -@interface XPGuildTimePickView () -///背景 -@property (nonatomic, strong) UIImageView *bgImageView; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///顶部的view -@property (nonatomic,strong) UIView * toolView; -///取消 -@property (nonatomic,strong) UIButton *cancleButton; -///确定 -@property (nonatomic,strong) UIButton *sureButton; -///时间间隔 -@property (nonatomic,strong) UIView * intervalView; -///开始时间 -@property (nonatomic,strong) UIButton *startButton; -///至 -@property (nonatomic,strong) UILabel *titleLabel; -///结束的时间 -@property (nonatomic,strong) UIButton *endButton; -///时间选择器 -@property (nonatomic, strong) UIDatePicker *datePicker; -///样式 -@property (nonatomic, strong) NSDateFormatter *dateFormatter; -/// -@property (nonatomic, strong) NSCalendar *calendar; -///开始的时间 -@property (nonatomic,strong) NSDate *startDate; -///结束的时间 -@property (nonatomic,strong) NSDate *endDate; -@end - -@implementation XPGuildTimePickView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.toolView]; - [self.stackView addArrangedSubview:self.intervalView]; - [self.stackView addArrangedSubview:self.datePicker]; - [self.toolView addSubview:self.cancleButton]; - [self.toolView addSubview:self.sureButton]; - - [self.intervalView addSubview:self.startButton]; - [self.intervalView addSubview:self.titleLabel]; - [self.intervalView addSubview:self.endButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.bottom.mas_equalTo(self.stackView); - }]; - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self); - make.top.mas_equalTo(8); - }]; - - [self.toolView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(44); - }]; - - [self.intervalView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - }]; - - [self.datePicker mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(220); - }]; - [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.toolView); - make.leading.mas_equalTo(self.toolView).mas_offset(8); - make.height.mas_equalTo(30); - - }]; - [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.toolView).mas_offset(-8); - make.width.height.centerY.mas_equalTo(self.cancleButton); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(40); - make.centerX.top.bottom.mas_equalTo(self.intervalView); - }]; - - [self.startButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.intervalView); - make.trailing.mas_equalTo(self.titleLabel.mas_leading); - make.top.bottom.mas_equalTo(self.intervalView); - }]; - - [self.endButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.intervalView); - make.leading.mas_equalTo(self.titleLabel.mas_trailing); - make.top.bottom.mas_equalTo(self.intervalView); - }]; -} - -- (void)weekDayWithCurrentDate:(NSDate *)date { - NSCalendar * calendar = [NSCalendar currentCalendar]; // 指定日历的算法 - NSDateComponents *comps = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitWeekday | NSCalendarUnitDay fromDate:date]; - // 获取今天是周几 - // 1 是周日，2是周一 3.以此类推 - NSInteger weekDay = [comps weekday]; - // 获取几天是几号 - NSInteger day = [comps day]; - long firstDiff,lastDiff; - if (weekDay == 1){ - firstDiff = -6; - lastDiff = 0; - } else { - firstDiff = -(weekDay - 2); - lastDiff = 8 - weekDay; - } - // 在当前日期(去掉时分秒)基础上加上差的天数 - NSDateComponents *baseDayComp = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:date]; - //获取周一日期 - [baseDayComp setDay:day + firstDiff]; - NSDate *firstDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.startDate = firstDayOfWeek; - //获取周末日期 - [baseDayComp setDay:day + lastDiff]; - NSDate *lastDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.endDate = lastDayOfWeek; -} - -#pragma mark - Event -- (void)onClickCancelButton:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildTimePickView:didClickCancel:)]) { - [self.delegate xPGuildTimePickView:self didClickCancel:sender]; - } -} - -- (void)onClickSureButton:(UIButton *)sender { - if (self.pickDateType == XPGuildTimePickTypeWeek) { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildTimePickView:didClickSure:)]) { - [self.delegate xPGuildTimePickView:self didClickSure:sender]; - } - } else { - NSDateComponents *delta = [[NSCalendar currentCalendar] components:NSCalendarUnitDay fromDate:self.startDate toDate:self.endDate options:0]; - if ([self.startDate compare:[NSDate date]] == NSOrderedDescending) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPGuildTimePickView0")]; - return; - } else if ([self.endDate compare:[NSDate date]] == NSOrderedDescending) {//结束日期大于当前日期 - self.endDate = [NSDate date]; - } else if ([self.startDate compare:self.endDate] == NSOrderedDescending) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPGuildTimePickView1")]; - return; - } else if (delta.day > 180) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPGuildTimePickView2")]; - return; - } - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGuildTimePickView:didClickSure:)]) { - [self.delegate xPGuildTimePickView:self didClickSure:sender]; - } - } -} - -- (void)datePickerValueChange:(UIDatePicker *)datepick { - if (self.pickDateType == XPGuildTimePickTypeWeek) { - [self weekDayWithCurrentDate:datepick.date]; - NSString *startDateStr = [self.dateFormatter stringFromDate:self.startDate]; - NSString *endDateStr = [self.dateFormatter stringFromDate:self.endDate]; - [self.startButton setTitle:startDateStr forState:UIControlStateNormal]; - [self.endButton setTitle:endDateStr forState:UIControlStateNormal]; - } else { - NSString *dateStr = [self.dateFormatter stringFromDate:datepick.date]; - if (self.startButton.isSelected) {//修改开始日期 - self.startDate = datepick.date; - [self.startButton setTitle:dateStr forState:UIControlStateNormal]; - if ([self.startDate compare:self.endDate] == NSOrderedDescending) {//开始日期大于结束日期，修改结束日期 - self.endDate = datepick.date; - [self.endButton setTitle:dateStr forState:UIControlStateNormal]; - } - } else {//修改结束日期 - if ([self.startDate compare:datepick.date] == NSOrderedDescending) {//开始日期大于结束日期 - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPGuildTimePickView3")]; - dateStr = [self.dateFormatter stringFromDate:self.startDate]; - self.endDate = self.startDate; - [self.endButton setTitle:dateStr forState:UIControlStateNormal]; - self.datePicker.date = self.startDate; - } else { - self.endDate = datepick.date; - [self.endButton setTitle:dateStr forState:UIControlStateNormal]; - } - } - } -} - -- (void)onClickStartButton:(UIButton *)sender { - self.startButton.selected = YES; - self.endButton.selected = NO; - self.datePicker.date = self.startDate; - self.startButton.titleLabel.font = [UIFont systemFontOfSize:20 weight:UIFontWeightMedium]; - self.endButton.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; -} - -- (void)onClickEndButton:(UIButton *)sender { - self.startButton.selected = NO; - self.endButton.selected = YES; - self.datePicker.date = self.endDate; - self.startButton.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - self.endButton.titleLabel.font = [UIFont systemFontOfSize:20 weight:UIFontWeightMedium]; -} - -#pragma mark - Getters And Setters -- (void)setCurrentDate:(NSDate *)currentDate { - _currentDate = currentDate; - if (_currentDate) { - NSDateComponents *comps = nil; comps = [self.calendar components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitMonth fromDate:_currentDate]; - NSDateComponents *adcomps = [[NSDateComponents alloc] init]; - [adcomps setYear:-25]; - [adcomps setMonth:0]; - [adcomps setDay:0]; - NSDate *minDate = [self.calendar dateByAddingComponents:adcomps toDate:_currentDate options:0]; - - NSDateComponents *maxcomps = [[NSDateComponents alloc] init]; - [maxcomps setYear:25]; - [maxcomps setMonth:0]; - [maxcomps setDay:0]; - NSDate *maxDate = [self.calendar dateByAddingComponents:maxcomps toDate:_currentDate options:0]; - self.datePicker.minimumDate = minDate; - self.datePicker.maximumDate = maxDate; - self.datePicker.date = _currentDate; - } -} - -- (void)setPickDateType:(XPGuildTimePickType)pickDateType { - _pickDateType = pickDateType; - if (pickDateType == XPGuildTimePickTypeWeek) { - [self weekDayWithCurrentDate:_currentDate]; - NSString *startDateStr = [self.dateFormatter stringFromDate:self.startDate]; - NSString *endDateStr = [self.dateFormatter stringFromDate:self.endDate]; - [self.startButton setTitle:startDateStr forState:UIControlStateNormal]; - [self.endButton setTitle:endDateStr forState:UIControlStateNormal]; - self.startButton.userInteractionEnabled = NO; - self.endButton.userInteractionEnabled = NO; - } else{ - self.startButton.selected = YES; - NSString *dateStr = [self.dateFormatter stringFromDate:self.currentDate]; - [self.startButton setTitle:dateStr forState:UIControlStateNormal]; - [self.endButton setTitle:dateStr forState:UIControlStateNormal]; - [self.startButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateSelected]; - [self.startButton setTitleColor:[DJDKMIMOMColor textThirdColor] forState:UIControlStateNormal]; - self.startButton.titleLabel.font = [UIFont systemFontOfSize:20 weight:UIFontWeightMedium]; - [self.endButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateSelected]; - [self.endButton setTitleColor:[DJDKMIMOMColor textThirdColor] forState:UIControlStateNormal]; - self.endButton.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - self.startDate = _currentDate; - self.endDate = _currentDate; - } -} - - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 0; - } - return _stackView; -} - -- (UIView *)toolView { - if (!_toolView) { - _toolView = [[UIView alloc] init]; - _toolView.backgroundColor = [UIColor clearColor]; - } - return _toolView; -} - -- (UIView *)intervalView { - if (!_intervalView) { - _intervalView = [[UIView alloc] init]; - _intervalView.backgroundColor = [UIColor clearColor]; - } - return _intervalView; -} - - -- (UIButton *)cancleButton { - if (!_cancleButton) { - _cancleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_cancleButton setTitle:YMLocalizedString(@"XPGuildTimePickView4") forState:UIControlStateNormal]; - [_cancleButton addTarget:self action:@selector(onClickCancelButton:) forControlEvents:UIControlEventTouchUpInside]; - _cancleButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - [_cancleButton setTitleColor:[DJDKMIMOMColor textThirdColor] forState:UIControlStateNormal]; - } - return _cancleButton; -} - -- (UIButton *)sureButton { - if (!_sureButton) { - _sureButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sureButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - [_sureButton addTarget:self action:@selector(onClickSureButton:) forControlEvents:UIControlEventTouchUpInside]; - _sureButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - [_sureButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - } - return _sureButton; -} - -- (NSDateFormatter *)dateFormatter { - if (!_dateFormatter) { - _dateFormatter = [[NSDateFormatter alloc] init]; - _dateFormatter.dateFormat = @"YYYY-MM-dd"; - } - return _dateFormatter; -} - -- (UIDatePicker *)datePicker { - if (!_datePicker){ - _datePicker = [[UIDatePicker alloc] init]; - _datePicker.datePickerMode = UIDatePickerModeDate; - if (@available(iOS 13.4, *)) { - _datePicker.preferredDatePickerStyle = UIDatePickerStyleWheels; - } - if (@available(iOS 13.0, *)) { - _datePicker.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; - } - [_datePicker addTarget:self action:@selector(datePickerValueChange:) forControlEvents:UIControlEventValueChanged]; - } - return _datePicker; -} - -- (UIButton *)startButton { - if (!_startButton) { - _startButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_startButton addTarget:self action:@selector(onClickStartButton:) forControlEvents:UIControlEventTouchUpInside]; - _startButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_startButton setTitleColor:[DJDKMIMOMColor textThirdColor] forState:UIControlStateNormal]; - [_startButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateSelected]; - [_startButton.titleLabel sizeToFit]; - } - return _startButton; -} - -- (UIButton *)endButton { - if (!_endButton) { - _endButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_endButton addTarget:self action:@selector(onClickEndButton:) forControlEvents:UIControlEventTouchUpInside]; - _endButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_endButton setTitleColor:[DJDKMIMOMColor textThirdColor] forState:UIControlStateNormal]; - [_endButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateSelected]; - _endButton.titleLabel.textAlignment = NSTextAlignmentRight; - } - return _endButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"App_Common_To"); - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} - -- (NSCalendar *)calendar { - if (!_calendar) { - _calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]; - } - return _calendar; -} - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage imageNamed:@"mine_guild_income_datePicker_bg"]; - } - return _bgImageView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.h deleted file mode 100644 index 0ab846a..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPMineGiveDiamondSearchView.h -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import -#import "XPMineGiveDiamondProtocol.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGiveDiamondSearchView : UIView -@property (nonatomic,assign) BOOL isSearchHall; -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.m deleted file mode 100644 index a70dc6d..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.m +++ /dev/null @@ -1,113 +0,0 @@ -// -// XPMineGiveDiamondSearchView.m -// YuMi -// -// Created by YuMi on 2023/6/30. -// - -#import "XPMineGiveDiamondSearchView.h" -#import -@interface XPMineGiveDiamondSearchView() -///背景 -@property (nonatomic,strong)UIImageView *bgView; -///搜索输入 -@property (nonatomic,strong) MSBaseTextField *textField; -///搜索btn -@property (nonatomic,strong) UIButton *searchBtn; - -@end -@implementation XPMineGiveDiamondSearchView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.textField]; - [self.bgView addSubview:self.searchBtn]; - self.textField.delegate = self; -} -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.top.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(32)); - }]; - [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(self.bgView); - make.leading.mas_equalTo(kGetScaleWidth(10)); - make.trailing.mas_equalTo(-kGetScaleWidth(76)); - }]; - [self.searchBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(3)); - make.centerY.equalTo(self.bgView); - make.width.mas_equalTo(kGetScaleWidth(66)); - make.height.mas_equalTo(kGetScaleWidth(26)); - }]; -} - --(void)searchAction{ - [self.textField resignFirstResponder]; - if(self.delegate && [self.delegate respondsToSelector:@selector(searchEndWithText:)]){ - [self.delegate searchEndWithText:self.textField.text]; - } -} --(void)setIsSearchHall:(BOOL)isSearchHall{ - _isSearchHall = isSearchHall; - if(_isSearchHall == YES){ - _textField.keyboardType = UIKeyboardTypeDefault; - _textField.attributedPlaceholder = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPMineGiveDiamondSearchView3") attributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor secondTextColor],NSFontAttributeName:[UIFont systemFontOfSize:14 weight:UIFontWeightRegular]}]; - } -} -#pragma mark -懒加载 -- (UIImageView *)bgView{ - if (!_bgView){ - _bgView = [UIImageView new]; - _bgView.userInteractionEnabled = YES; - _bgView.image = [UIImage imageNamed:@"mine_give_diamond_search"]; - } - return _bgView; -} --(MSBaseTextField *)textField{ - if (!_textField){ - _textField = [[MSBaseTextField alloc]initWithFrame:CGRectZero]; - _textField.keyboardType = UIKeyboardTypeNumberPad; - _textField.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _textField.textColor = [DJDKMIMOMColor mainTextColor]; - _textField.attributedPlaceholder = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPMineGiveDiamondSearchView1") attributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor secondTextColor],NSFontAttributeName:[UIFont systemFontOfSize:14 weight:UIFontWeightRegular]}]; - - } - return _textField; -} --(UIButton *)searchBtn{ - if (!_searchBtn){ - _searchBtn = [UIButton new]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(66), kGetScaleWidth(26))]; - [_searchBtn setBackgroundImage:image forState:UIControlStateNormal]; - [_searchBtn setTitle:YMLocalizedString(@"XPMineGiveDiamondSearchView0") forState:UIControlStateNormal]; - [_searchBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _searchBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - _searchBtn.layer.cornerRadius = kGetScaleWidth(26) / 2; - _searchBtn.layer.masksToBounds = YES; - - [_searchBtn addTarget:self action:@selector(searchAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _searchBtn; -} - -#pragma mark - UITextFieldDelegate -- (BOOL)textFieldShouldReturn:(UITextField *)textField { - [self searchAction]; - return YES; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordContentView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordContentView.h deleted file mode 100644 index ffd3207..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordContentView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineGuildPersonalBillRecordContentView.h -// YuMi -// -// Created by duoban on 2023/8/7. -// - -#import -#import "XPMineGuildPersonalBillRecordModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildPersonalBillRecordContentView : UIView -@property(nonatomic,strong) XPMineGuildPersonalBillRecordModel *model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordContentView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordContentView.m deleted file mode 100644 index 95910cc..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordContentView.m +++ /dev/null @@ -1,191 +0,0 @@ -// -// XPMineGuildPersonalBillRecordContentView.m -// YuMi -// -// Created by duoban on 2023/8/7. -// - -#import "XPMineGuildPersonalBillRecordContentView.h" -#import "XPMineGuildPersonalBillRecordItemView.h" -@interface XPMineGuildPersonalBillRecordContentView() -///房间流水 -@property(nonatomic,strong) XPMineGuildPersonalBillRecordItemView *roomBillView; -///普通礼物流水 -@property(nonatomic,strong) XPMineGuildPersonalBillRecordItemView *commonGiftView; -///背包礼物流水 -@property(nonatomic,strong) XPMineGuildPersonalBillRecordItemView *bagGiftView; -///送礼人数 -@property(nonatomic,strong) XPMineGuildPersonalBillRecordItemView *sendGiftView; -///新用户送礼人数 -@property(nonatomic,strong) XPMineGuildPersonalBillRecordItemView *userGiftView; -///背景 -@property(nonatomic,strong) UIView *bgView; -///头像 -@property(nonatomic,strong) NetImageView *headImageView; -///房间名 -@property(nonatomic,strong) UILabel *roomNameVeiw; -///标题 -@property(nonatomic,strong) UILabel *titleVeiw; -@end -@implementation XPMineGuildPersonalBillRecordContentView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.bgView]; - [self.bgView addSubview:self.headImageView]; - [self.bgView addSubview:self.roomNameVeiw]; - [self.bgView addSubview:self.titleVeiw]; - - [self.bgView addSubview:self.roomBillView]; - [self.bgView addSubview:self.commonGiftView]; - [self.bgView addSubview:self.bagGiftView]; - [self.bgView addSubview:self.sendGiftView]; - [self.bgView addSubview:self.userGiftView]; - - -} --(void)installConstraints{ - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - - }]; - [self.headImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(48)); - make.top.mas_equalTo(kGetScaleWidth(16)); - make.leading.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.roomNameVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.headImageView.mas_trailing).mas_offset(kGetScaleWidth(10)); - make.centerY.equalTo(self.headImageView); - }]; - [self.titleVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.headImageView.mas_bottom).mas_offset(kGetScaleWidth(10)); - make.leading.mas_equalTo(kGetScaleWidth(20)); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.roomBillView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.titleVeiw.mas_bottom).mas_offset(kGetScaleWidth(6)); - make.leading.mas_equalTo(kGetScaleWidth(16)); - make.width.mas_equalTo(kGetScaleWidth(108)); - make.height.mas_equalTo(kGetScaleWidth(58)); - }]; - [self.commonGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.titleVeiw.mas_bottom).mas_offset(kGetScaleWidth(6)); - make.centerX.equalTo(self.bgView); - make.width.mas_equalTo(kGetScaleWidth(108)); - make.height.mas_equalTo(kGetScaleWidth(58)); - }]; - [self.bagGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.titleVeiw.mas_bottom).mas_offset(kGetScaleWidth(6)); - make.trailing.mas_equalTo(-kGetScaleWidth(16)); - make.width.mas_equalTo(kGetScaleWidth(108)); - make.height.mas_equalTo(kGetScaleWidth(58)); - }]; - [self.sendGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.roomBillView.mas_bottom).mas_offset(kGetScaleWidth(16)); - make.leading.mas_equalTo(kGetScaleWidth(16)); - make.width.mas_equalTo(kGetScaleWidth(108)); - make.height.mas_equalTo(kGetScaleWidth(58)); - }]; - [self.userGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.roomBillView.mas_bottom).mas_offset(kGetScaleWidth(16)); - make.centerX.equalTo(self.bgView); - make.width.mas_equalTo(kGetScaleWidth(108)); - make.height.mas_equalTo(kGetScaleWidth(58)); - }]; -} --(void)setModel:(XPMineGuildPersonalBillRecordModel *)model{ - _model = model; - if(model.income.count > 0){ - XPMineGuildPersonalBillRecordItemModel *itemModel = model.income.firstObject; - self.roomBillView.num = [NSString stringWithFormat:@"+%@",itemModel.roomIncome]; - self.bagGiftView.num = [NSString stringWithFormat:@"+%@",itemModel.bagIncome]; - self.headImageView.imageUrl = itemModel.hallAvatar; - self.roomNameVeiw.text = itemModel.hallName; - self.commonGiftView.num = [NSString stringWithFormat:@"+%@",itemModel.normalGiftIncome]; - self.sendGiftView.num = [NSString stringWithFormat:@"+%@",itemModel.giftUv]; - self.userGiftView.num = [NSString stringWithFormat:@"+%@",itemModel.userNewSendGiftNum]; - } - [self.bgView setCornerWithLeftTopCorner:kGetScaleWidth(16) rightTopCorner:kGetScaleWidth(16) bottomLeftCorner:0 bottomRightCorner:0 size:self.bgView.frame.size]; -} -#pragma mark - 懒加载 -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - } - return _bgView; -} -- (NetImageView *)headImageView{ - if(!_headImageView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _headImageView = [[NetImageView alloc]initWithConfig:config]; - _headImageView.layer.cornerRadius = kGetScaleWidth(48)/2; - _headImageView.layer.masksToBounds = YES; - } - return _headImageView; -} --(UILabel *)roomNameVeiw{ - if(!_roomNameVeiw){ - _roomNameVeiw = [UILabel labelInitWithText:@"" font:kFontMedium(16) textColor:UIColorFromRGB(0x2B2D33)]; - } - return _roomNameVeiw; -} -- (UILabel *)titleVeiw{ - if(!_titleVeiw){ - _titleVeiw = [UILabel new]; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPMineGuildPersonalBillRecordContentView5") attributes:@{NSFontAttributeName:kFontMedium(14),NSForegroundColorAttributeName:UIColorFromRGB(0x2B2D33)}]; - [textAtt addAttributes:@{NSFontAttributeName:kFontMedium(14),NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)} range:[textAtt.string rangeOfString:YMLocalizedString(@"XPMineGuildPersonalBillRecordContentView6")]]; - _titleVeiw.attributedText = textAtt; - } - return _titleVeiw; -} -- (XPMineGuildPersonalBillRecordItemView *)roomBillView{ - if(!_roomBillView){ - _roomBillView = [[XPMineGuildPersonalBillRecordItemView alloc]initWithFrame:CGRectZero]; - _roomBillView.num = @"+0.0"; - _roomBillView.title = YMLocalizedString(@"XPMineGuildPersonalBillRecordContentView0"); - } - return _roomBillView; -} -- (XPMineGuildPersonalBillRecordItemView *)commonGiftView{ - if(!_commonGiftView){ - _commonGiftView = [[XPMineGuildPersonalBillRecordItemView alloc]initWithFrame:CGRectZero]; - _commonGiftView.num = @"+0.0"; - _commonGiftView.title = YMLocalizedString(@"XPMineGuildPersonalBillRecordContentView1"); - } - return _commonGiftView; -} -- (XPMineGuildPersonalBillRecordItemView *)bagGiftView{ - if(!_bagGiftView){ - _bagGiftView = [[XPMineGuildPersonalBillRecordItemView alloc]initWithFrame:CGRectZero]; - _bagGiftView.num = @"+0.0"; - _bagGiftView.title = YMLocalizedString(@"XPMineGuildPersonalBillRecordContentView2"); - } - return _bagGiftView; -} -- (XPMineGuildPersonalBillRecordItemView *)sendGiftView{ - if(!_sendGiftView){ - _sendGiftView = [[XPMineGuildPersonalBillRecordItemView alloc]initWithFrame:CGRectZero]; - _sendGiftView.num = @"+0.0"; - _sendGiftView.title = YMLocalizedString(@"XPMineGuildPersonalBillRecordContentView3"); - } - return _sendGiftView; -} -- (XPMineGuildPersonalBillRecordItemView *)userGiftView{ - if(!_userGiftView){ - _userGiftView = [[XPMineGuildPersonalBillRecordItemView alloc]initWithFrame:CGRectZero]; - _userGiftView.num = @"+0.0"; - _userGiftView.title = YMLocalizedString(@"XPMineGuildPersonalBillRecordContentView4"); - } - return _userGiftView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordHeadView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordHeadView.h deleted file mode 100644 index 60db1bf..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordHeadView.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// XPMineGuildPersonalBillRecordHeadView.h -// xplan-ios -// -// Created by duoban on 2023/7/27. -// - -#import -@class XPMineGuildPersonalBillRecordHeadView; -@protocol XPMineGuildPersonalBillRecordHeadViewDelegate - -///选择日期 -- (void)xPMineGuildPersonalBillRecordHeadView:(XPMineGuildPersonalBillRecordHeadView *_Nonnull)view didChooseTime:(UILabel *_Nullable)sender; - -@end - - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildPersonalBillRecordHeadView : UIView -@property(nonatomic,copy) NSString *diamond; -@property(nonatomic,copy) NSString *time; - -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordHeadView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordHeadView.m deleted file mode 100644 index 6bf0b0a..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordHeadView.m +++ /dev/null @@ -1,118 +0,0 @@ -// -// XPMineGuildPersonalBillRecordHeadView.m -// xplan-ios -// -// Created by duoban on 2023/7/27. -// - -#import "XPMineGuildPersonalBillRecordHeadView.h" -@interface XPMineGuildPersonalBillRecordHeadView() -///背景 -@property(nonatomic,strong) UIImageView *bgImageView; -///收入标题 -@property(nonatomic,strong) UILabel *titleView; - -///钻石数量 -@property(nonatomic,strong) UILabel *diamondNumView; -///时间 -@property(nonatomic,strong) UILabel *timeVeiw; - - -@end -@implementation XPMineGuildPersonalBillRecordHeadView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - - [self addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.titleView]; - [self.bgImageView addSubview:self.diamondNumView]; - [self.bgImageView addSubview:self.timeVeiw]; - -} --(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self).inset(0); - make.top.mas_equalTo(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(148)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(31)); - make.leading.mas_equalTo(kGetScaleWidth(35)); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.diamondNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(35)); - make.top.mas_equalTo(kGetScaleWidth(59)); - make.height.mas_equalTo(kGetScaleWidth(32)); - }]; - [self.timeVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(108)); - make.leading.mas_equalTo(kGetScaleWidth(35)); - }]; - -} --(void)setDiamond:(NSString *)diamond{ - _diamond = diamond; - _diamondNumView.text = _diamond; -} - --(void)chooseTime{ - if(self.delegate && [self.delegate respondsToSelector:@selector(xPMineGuildPersonalBillRecordHeadView:didChooseTime:)]){ - [self.delegate xPMineGuildPersonalBillRecordHeadView:self didChooseTime:self.timeVeiw]; - } -} -- (void)setTime:(NSString *)time{ - _time = time; - NSString *getTime = [NSString stringWithFormat:@"%@ ",_time]; - NSMutableAttributedString * starAttribute = [[NSMutableAttributedString alloc]initWithString:getTime attributes:@{NSFontAttributeName:kFontRegular(12),NSForegroundColorAttributeName:UIColorFromRGB(0x6D6B89)}]; - UIImage *iconImage = kImage(@"mine_guild_bill_record_arrow"); - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - attachment.bounds = CGRectMake(0, roundf(self.timeVeiw.font.capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height);; - attachment.image = iconImage; - [starAttribute insertAttributedString:[NSMutableAttributedString attributedStringWithAttachment:attachment] atIndex:getTime.length]; - _timeVeiw.attributedText = starAttribute; -} -#pragma mark - 懒加载 -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = kImage(@"mine_guild_bill_record_bg"); - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineGuildPersonalBillRecordHeadView2") font:kFontMedium(14) textColor:[UIColor whiteColor]]; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPMineGuildPersonalBillRecordHeadView3") attributes:@{NSFontAttributeName:kFontMedium(14),NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)}]; - [textAtt addAttributes:@{NSFontAttributeName:kFontRegular(14),NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)} range:[textAtt.string rangeOfString:YMLocalizedString(@"XPMineGuildPersonalBillRecordHeadView4")]]; - _titleView.attributedText = textAtt; - } - return _titleView; -} -- (UILabel *)diamondNumView{ - if(!_diamondNumView){ - _diamondNumView = [UILabel labelInitWithText:@"" font:kFontMedium(24) textColor:UIColorFromRGB(0x9168FA)]; - } - return _diamondNumView; -} --(UILabel *)timeVeiw{ - if(!_timeVeiw){ - _timeVeiw = [UILabel new]; - _timeVeiw.font = kFontMedium(12); - _timeVeiw.textColor = [UIColor whiteColor]; - _timeVeiw.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(chooseTime)]; - [_timeVeiw addGestureRecognizer:tap]; - } - return _timeVeiw; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.h deleted file mode 100644 index 3160177..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPMineGuildPersonalBillRecordItemView.h -// xplan-ios -// -// Created by duoban on 2023/7/27. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildPersonalBillRecordItemView : UIView -@property(nonatomic,copy) NSString *num; -@property(nonatomic,copy) NSString *title; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.m deleted file mode 100644 index 3620300..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.m +++ /dev/null @@ -1,66 +0,0 @@ -// -// XPMineGuildPersonalBillRecordItemView.m -// xplan-ios -// -// Created by duoban on 2023/7/27. -// - -#import "XPMineGuildPersonalBillRecordItemView.h" -@interface XPMineGuildPersonalBillRecordItemView() -@property(nonatomic,strong) UILabel *numView; -@property(nonatomic,strong) UILabel *titleView; -@end -@implementation XPMineGuildPersonalBillRecordItemView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.backgroundColor = UIColorRGBAlpha(0xBBBCCF, 0.1); - self.layer.cornerRadius = kGetScaleWidth(6); - self.layer.masksToBounds = YES; - [self addSubview:self.numView]; - [self addSubview:self.titleView]; -} --(void)installConstraints{ - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-kGetScaleWidth(8)); - make.leading.trailing.equalTo(self); - }]; - [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self).inset(kGetScaleWidth(5)); - make.bottom.equalTo(self.titleView.mas_top).mas_offset(-kGetScaleWidth(2)); - make.top.mas_lessThanOrEqualTo(kGetScaleWidth(28)); - }]; -} -- (void)setNum:(NSString *)num{ - _num = num; - _numView.text = _num; -} -- (void)setTitle:(NSString *)title{ - _title = title; - _titleView.text = _title; -} -#pragma mark - 懒加载 -- (UILabel *)numView{ - if(!_numView){ - _numView = [UILabel labelInitWithText:@"+0" font:kFontSemibold(12) textColor:UIColorFromRGB(0x2B2D33)]; - _numView.textAlignment = NSTextAlignmentCenter; - _numView.numberOfLines = 2; - } - return _numView; -} --(UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:@"" font:kFontRegular(11) textColor:UIColorFromRGB(0x696D7A)]; - _titleView.textAlignment = NSTextAlignmentCenter; - _titleView.numberOfLines = 2; - } - return _titleView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.h deleted file mode 100644 index c17800d..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// XPNewGuildIncomeHeaderView.h -// YuMi -// -// Created by YuMi on 2022/11/9. -// - -#import -#import "XPNewMineGuildIncomeRecordViewController.h" -NS_ASSUME_NONNULL_BEGIN -@class XPNewGuildIncomeHeaderView; -@protocol XPNewGuildIncomeHeaderViewDelegate - -///选择日期 -- (void)xPNewGuildIncomeHeaderView:(XPNewGuildIncomeHeaderView *)view didChooseTime:(UIButton *)sender; - -@end -@interface XPNewGuildIncomeHeaderView : UIView -///代理 -@property (nonatomic,weak) id delegate; -///显示 -@property (nonatomic,assign) NewGuildIncomeRecrdTimeType timeType; - -@property (nonatomic,copy) NSString *totalIncome; - -- (void)configHeaderView:(NSDate *)startDate endTime:(NSDate * _Nullable)endDate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.m deleted file mode 100644 index ffa7bf4..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.m +++ /dev/null @@ -1,263 +0,0 @@ -// -// XPNewGuildIncomeHeaderView.m -// YuMi -// -// Created by YuMi on 2022/11/9. -// -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -#import "NSString+Utils.h" -#import "UIView+Corner.h" -#import "UIImage+Utils.h" -#import "UIButton+EnlargeTouchArea.h" -#import "XPNewGuildIncomeHeaderView.h" -@interface XPNewGuildIncomeHeaderView() -///显示背景 -@property (nonatomic,strong) UIImageView *backImageView; -///显示哪一年 -@property (nonatomic,strong) UILabel *yearLabel; -///开始时间 -@property (nonatomic,strong) UILabel *startLabel; -///结束时间 -@property (nonatomic,strong) UILabel *endLabel; -///箭头 -@property (nonatomic,strong) UIButton *arrowButton; -///分割线 -@property (nonatomic,strong) UIView * lineView; -///总收入 -@property (nonatomic,strong) UILabel *totalLabel; -///金币 -@property (nonatomic,strong) UILabel *coinLabel; -@property (nonatomic,strong) NSDateFormatter *formatter; -@end -@implementation XPNewGuildIncomeHeaderView -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Public Method -- (void)configHeaderView:(NSDate *)startDate endTime:(NSDate * _Nullable)endDate { - [self.formatter setDateFormat:YMLocalizedString(@"App_Common_Year")]; - NSString *currentYear = [self.formatter stringFromDate:startDate]; - self.yearLabel.text = currentYear; - - if (self.timeType == NewGuildIncomeRecrdTimeType_Day) { - [self.formatter setDateFormat:YMLocalizedString(@"XPGuildIncomeHeaderView0")]; - NSString * currentDay = [self.formatter stringFromDate:startDate]; - self.startLabel.text = currentDay; - NSString * endDayStr = [self.formatter stringFromDate:endDate]; - self.endLabel.text = endDayStr; - } else if(self.timeType == NewGuildIncomeRecrdTimeType_Week) { - [self.formatter setDateFormat:YMLocalizedString(@"XPGuildIncomeHeaderView1")]; - NSString * currentDay = [self.formatter stringFromDate:startDate]; - self.startLabel.text = currentDay; - - NSString * endDayStr = [self.formatter stringFromDate:endDate]; - self.endLabel.text = endDayStr; - } else { - [self.formatter setDateFormat:YMLocalizedString(@"XPGuildIncomeHeaderView5")]; - NSString * currentDay = [self.formatter stringFromDate:startDate]; - self.startLabel.text = currentDay; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - [self.backImageView setCornerWithLeftTopCorner:kGetScaleWidth(10) rightTopCorner:kGetScaleWidth(10) bottomLeftCorner:kGetScaleWidth(10) bottomRightCorner:kGetScaleWidth(10) size:CGSizeMake(kGetScaleWidth(345), kGetScaleWidth(75))]; - [self addSubview:self.backImageView]; - [self.backImageView addSubview:self.yearLabel]; - [self.backImageView addSubview:self.startLabel]; - [self.backImageView addSubview:self.endLabel]; - [self.backImageView addSubview:self.arrowButton]; - [self.backImageView addSubview:self.lineView]; - [self.backImageView addSubview:self.totalLabel]; - [self.backImageView addSubview:self.coinLabel]; - - -} - -- (void)initSubViewConstraints { - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(75)); - make.top.mas_equalTo(self); - }]; - - [self.yearLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(14)); - make.top.mas_equalTo(kGetScaleWidth(10)); - make.height.mas_equalTo(kGetScaleWidth(12)); - }]; - - [self.startLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.yearLabel); - make.top.mas_equalTo(kGetScaleWidth(28)); - make.height.mas_equalTo(kGetScaleWidth(17)); - - - }]; - [self.endLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.width.height.equalTo(self.startLabel); - make.top.equalTo(self.startLabel.mas_bottom).mas_offset(kGetScaleWidth(2)); - }]; - [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.startLabel.mas_trailing).offset(1); - make.centerY.mas_equalTo(self.lineView); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(20), kGetScaleWidth(20))); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(1), kGetScaleWidth(49))); - make.bottom.mas_equalTo(self.backImageView).offset(-kGetScaleWidth(13)); - make.leading.equalTo(self.arrowButton.mas_trailing).mas_offset(kGetScaleWidth(9)); - }]; - - [self.totalLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backImageView.mas_leading).offset(kGetScaleWidth(127)); - make.top.mas_equalTo(kGetScaleWidth(28)); - make.height.mas_equalTo(kGetScaleWidth(12)); - }]; - - [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.totalLabel); - make.top.mas_equalTo(kGetScaleWidth(46)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.trailing.mas_equalTo(-kGetScaleWidth(14)); - }]; -} - -#pragma mark - Event Response -- (void)arrowButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNewGuildIncomeHeaderView:didChooseTime:)]) { - [self.delegate xPNewGuildIncomeHeaderView:self didChooseTime:sender]; - } -} - -#pragma mark - Getters And Setters -- (void)setTotalIncome:(NSString *)totalIncome { - _totalIncome = totalIncome; - if (_totalIncome == nil) { - _totalIncome = @"0"; - } - NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPGuildIncomeHeaderView2"), _totalIncome]; - NSRange range = [title rangeOfString:YMLocalizedString(@"XPGuildIncomeHeaderView3")]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:23],NSForegroundColorAttributeName:[UIColor whiteColor]}]; - [attribute addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:18] range:range]; - self.coinLabel.attributedText = attribute; -} - -- (void)setTimeType:(NewGuildIncomeRecrdTimeType)timeType { - _timeType = timeType; - switch (_timeType) { - case NewGuildIncomeRecrdTimeType_Day: - self.endLabel.hidden = NO; - break; - case NewGuildIncomeRecrdTimeType_Week: - self.endLabel.hidden = NO; - break; - case NewGuildIncomeRecrdTimeType_Mouth: - self.endLabel.hidden = YES; - break; - default: - break; - } -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x2B4658),UIColorFromRGB(0x363E45)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(345), kGetScaleWidth(75))]; - _backImageView.image = image; - } - return _backImageView; -} - -- (UILabel *)yearLabel { - if (!_yearLabel) { - _yearLabel = [[UILabel alloc] init]; - _yearLabel.font = [UIFont systemFontOfSize:10]; - _yearLabel.textColor = [UIColor colorWithWhite:1 alpha:0.8]; - } - return _yearLabel; -} - - - -- (UILabel *)startLabel { - if (!_startLabel) { - _startLabel = [[UILabel alloc] init]; - _startLabel.font = [UIFont systemFontOfSize:14]; - _startLabel.textColor = [UIColor whiteColor]; - } - return _startLabel; -} - -- (UILabel *)endLabel { - if (!_endLabel) { - _endLabel = [[UILabel alloc] init]; - _endLabel.font = [UIFont systemFontOfSize:14]; - _endLabel.textColor = [UIColor whiteColor]; - } - return _endLabel; -} - -- (UIButton *)arrowButton { - if (!_arrowButton) { - _arrowButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_arrowButton setImage:[UIImage imageNamed:@"mine_guild_income_record_arrow"] forState:UIControlStateNormal]; - [_arrowButton setImage:[UIImage imageNamed:@"mine_guild_income_record_arrow"] forState:UIControlStateSelected]; - [_arrowButton addTarget:self action:@selector(arrowButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_arrowButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _arrowButton; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.1]; - } - return _lineView; -} - -- (UILabel *)totalLabel { - if (!_totalLabel) { - _totalLabel = [[UILabel alloc] init]; - _totalLabel.text = YMLocalizedString(@"XPGuildIncomeHeaderView4"); - _totalLabel.font = [UIFont systemFontOfSize:11]; - _totalLabel.textColor = [UIColor whiteColor]; - } - return _totalLabel; -} - -- (UILabel *)coinLabel { - if (!_coinLabel) { - _coinLabel = [[UILabel alloc] init]; - _coinLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _coinLabel.text = @"0"; - _coinLabel.textColor = [UIColor whiteColor]; - } - return _coinLabel; -} - -- (NSDateFormatter *)formatter { - if (!_formatter) { - _formatter = [[NSDateFormatter alloc] init]; - } - return _formatter; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.h deleted file mode 100644 index 6a94f1b..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// XPNewGuildTimePickView.h -// YuMi -// -// Created by YuMi on 2022/11/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSUInteger, XPNewGuildTimePickType) { - XPNewGuildTimePickTypeDay,///按日 - XPNewGuildTimePickTypeWeek,///按周 - XPNewGuildTimePickTypeMonth,///按月 -}; - -@class XPNewGuildTimePickView; -@protocol XPNewGuildTimePickViewDelegate - -///点了确认按钮 -- (void)xPNewGuildTimePickView:(XPNewGuildTimePickView *)view didClickSure:(UIButton *)sender; -///点了取消按钮 -- (void)xPNewGuildTimePickView:(XPNewGuildTimePickView *)view didClickCancel:(UIButton *)sender; -@end -@interface XPNewGuildTimePickView : UIView - -///隐藏日，周，月按钮 -@property (nonatomic,assign) BOOL hiddenBtn; - -///是否是选择两个日期 -@property (nonatomic, assign) XPNewGuildTimePickType pickDateType; -///代理 -@property (nonatomic,weak) id delegate; -///当前的时间 -@property (nonatomic,strong) NSDate *currentDate; -///开始的时间 -@property (nonatomic,strong, readonly) NSDate *startDate; -///结束的时间 -@property (nonatomic,strong, readonly) NSDate *endDate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m deleted file mode 100644 index d769dc7..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m +++ /dev/null @@ -1,692 +0,0 @@ -// -// XPNewGuildTimePickView.m -// YuMi -// -// Created by YuMi on 2022/11/9. -// - -#import "XPNewGuildTimePickView.h" -///Third -#import -#import "PLTimeUtil.h" -///Tool -#import "DJDKMIMOMColor.h" -#import "UIView+Corner.h" -#import "UIImage+Utils.h" - -#import "XNDJTDDLoadingTool.h" -#import "XPGuildTimeMonthPickerView.h" -@interface XPNewGuildTimePickView() -///背景 -@property (nonatomic, strong) UIImageView *bgImageView; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///顶部的view -@property (nonatomic,strong) UIView * toolView; -///取消 -@property (nonatomic,strong) UIButton *cancleButton; -///确定 -@property (nonatomic,strong) UIButton *sureButton; - - -///日 -@property (nonatomic,strong) UIButton *dayBtn; -///周 -@property (nonatomic,strong) UIButton *weekBtn; -///月 -@property (nonatomic,strong) UIButton *monthBtn; - - -///时间间隔 -@property (nonatomic,strong) UIView * intervalView; -///开始时间 -@property (nonatomic,strong) UIButton *startButton; -///至 -@property (nonatomic,strong) UILabel *titleLabel; -///结束的时间 -@property (nonatomic,strong) UIButton *endButton; -///时间选择器 -@property (nonatomic, strong) UIDatePicker *datePicker; -///样式 -@property (nonatomic, strong) NSDateFormatter *dateFormatter; -/// -@property (nonatomic, strong) NSCalendar *calendar; -///开始的时间 -@property (nonatomic,strong) NSDate *startDate; -///结束的时间 -@property (nonatomic,strong) NSDate *endDate; - -///距离当前时间三个月的时间 -@property (nonatomic,strong) NSDate *threeMinStartDate; -@property (nonatomic,strong) NSDate *threeMinEndDate; -@property (nonatomic,strong) NSDate *threeMaxStartDate; -@property (nonatomic,strong) NSDate *threeMaxEndDate; -///选择年月 -@property (nonatomic,strong) XPGuildTimeMonthPickerView *monthPickerView; -@end -@implementation XPNewGuildTimePickView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} --(void)setHiddenBtn:(BOOL)hiddenBtn{ - _hiddenBtn = hiddenBtn; - self.dayBtn.hidden = YES; - self.weekBtn.hidden = YES; - self.monthBtn.hidden = YES; - [self.toolView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(59); - }]; - -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.toolView]; - [self.stackView addArrangedSubview:self.intervalView]; - [self.stackView addArrangedSubview:self.datePicker]; - [self.toolView addSubview:self.cancleButton]; - [self.toolView addSubview:self.sureButton]; - [self.toolView addSubview:self.dayBtn]; - [self.toolView addSubview:self.weekBtn]; - [self.toolView addSubview:self.monthBtn]; - - - - [self.intervalView addSubview:self.startButton]; - [self.intervalView addSubview:self.titleLabel]; - [self.intervalView addSubview:self.endButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.bottom.mas_equalTo(self.stackView); - }]; - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self); - make.top.mas_equalTo(8); - }]; - - [self.toolView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(83); - }]; - - - - [self.intervalView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(56); - }]; - - [self.datePicker mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(220); - }]; - [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(20); - make.leading.mas_equalTo(self.toolView).mas_offset(15); - make.height.mas_equalTo(19); - - }]; - [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.toolView).mas_offset(-15); - make.height.centerY.mas_equalTo(self.cancleButton); - }]; - - [self.dayBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(68); - make.height.mas_equalTo(24); - make.leading.mas_equalTo(32); - make.top.mas_equalTo(59); - }]; - [self.weekBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.toolView); - make.width.height.top.equalTo(self.dayBtn); - }]; - [self.monthBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.top.equalTo(self.dayBtn); - make.trailing.mas_equalTo(-32); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(40); - make.centerX.top.bottom.mas_equalTo(self.intervalView); - }]; - - [self.startButton mas_makeConstraints:^(MASConstraintMaker *make) { - - make.trailing.mas_equalTo(self.titleLabel.mas_leading); - make.top.bottom.mas_equalTo(self.intervalView); - }]; - - [self.endButton mas_makeConstraints:^(MASConstraintMaker *make) { - - make.leading.mas_equalTo(self.titleLabel.mas_trailing); - make.top.bottom.mas_equalTo(self.intervalView); - }]; -} -- (void)layoutSubviews{ - [super layoutSubviews]; - [self.bgImageView setCornerWithLeftTopCorner:18 rightTopCorner:18 bottomLeftCorner:0 bottomRightCorner:0 size:self.bgImageView.frame.size]; - -} -- (void)weekDayWithCurrentDate:(NSDate *)date { - NSCalendar * calendar = [NSCalendar currentCalendar]; // 指定日历的算法 - - NSDateComponents *comps = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitWeekday | NSCalendarUnitDay fromDate:date]; - // 获取今天是周几 - // 1 是周日，2是周一 3.以此类推 - NSInteger weekDay = [comps weekday]; - // 获取几天是几号 - NSInteger day = [comps day]; - long firstDiff,lastDiff; - if (weekDay == 1){ - firstDiff = -6; - lastDiff = 0; - } else { - firstDiff = -(weekDay - 2); - lastDiff = 8 - weekDay; - } - // 在当前日期(去掉时分秒)基础上加上差的天数 - NSDateComponents *baseDayComp = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:date]; - //获取周一日期 - [baseDayComp setDay:day + firstDiff]; - NSDate *firstDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.startDate = firstDayOfWeek; - //获取周末日期 - [baseDayComp setDay:day + lastDiff]; - NSDate *lastDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.endDate = lastDayOfWeek; - - //获取距离当前三个月日期 - if(self.threeMinStartDate == nil){ - [baseDayComp setDay:day + firstDiff - 3 * 4 * 7]; - self.threeMinStartDate = [calendar dateFromComponents:baseDayComp]; - [baseDayComp setDay:day + lastDiff - 3 * 4 * 7]; - self.threeMinEndDate = [calendar dateFromComponents:baseDayComp]; - [baseDayComp setDay:day + firstDiff ]; - self.threeMaxStartDate = [calendar dateFromComponents:baseDayComp]; - [baseDayComp setDay:day + lastDiff ]; - self.threeMaxEndDate = [calendar dateFromComponents:baseDayComp]; - } - - - -} -- (void)datePicker:(XPGuildTimeMonthPickerView *)datePicker dateDidChange:(NSDate *)date{ - if(self.pickDateType != XPNewGuildTimePickTypeMonth)return; - [self.startButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [self.startButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateSelected]; - [self.endButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [self.endButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateSelected]; - [self monthWithCurrentDate:date]; - NSString *startDateStr = [PLTimeUtil getYYMMDDWithDate:date]; - NSString *endDateStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - [self.startButton setTitle:startDateStr forState:UIControlStateSelected]; - [self.endButton setTitle:endDateStr forState:UIControlStateSelected]; -} -///获取当前时间 的一个月之后的时间 -- (void)monthWithCurrentDate:(NSDate *)newDate { - if (newDate == nil) { - newDate = [NSDate date]; - } - double interval = 0; - NSDate *beginDate = nil; - NSDate *endDate = nil; - NSCalendar *calendar = [NSCalendar currentCalendar]; - [calendar setFirstWeekday:2];//设定周一为周首日 - BOOL ok = [calendar rangeOfUnit:NSCalendarUnitMonth startDate:&beginDate interval:&interval forDate:newDate]; - if (ok) { - endDate = [beginDate dateByAddingTimeInterval:interval-1]; - } else { - return; - } - self.startDate = beginDate; - self.endDate = endDate; -} -#pragma mark - Event -- (void)onClickCancelButton:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNewGuildTimePickView:didClickCancel:)]) { - [self.delegate xPNewGuildTimePickView:self didClickCancel:sender]; - } -} - -- (void)onClickSureButton:(UIButton *)sender { - if (self.pickDateType == XPNewGuildTimePickTypeWeek) { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNewGuildTimePickView:didClickSure:)]) { - [self.delegate xPNewGuildTimePickView:self didClickSure:sender]; - } - } else { - NSDateComponents *delta = [[NSCalendar currentCalendar] components:NSCalendarUnitDay fromDate:self.startDate toDate:self.endDate options:0]; - if ([self.startDate compare:[NSDate date]] == NSOrderedDescending) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPGuildTimePickView0")]; - return; - } else if ([self.endDate compare:[NSDate date]] == NSOrderedDescending) {//结束日期大于当前日期 - self.endDate = [NSDate date]; - } else if ([self.startDate compare:self.endDate] == NSOrderedDescending) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPGuildTimePickView1")]; - return; - } else if (delta.day > 180) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPGuildTimePickView2")]; - return; - } - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNewGuildTimePickView:didClickSure:)]) { - [self.delegate xPNewGuildTimePickView:self didClickSure:sender]; - } - } -} - -- (void)datePickerValueChange:(UIDatePicker *)datepick { - [self.startButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [self.startButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateSelected]; - [self.endButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [self.endButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateSelected]; - if(self.pickDateType == XPNewGuildTimePickTypeDay){ - // NSString *dateStr = [self.dateFormatter stringFromDate:datepick.date]; - // self.startDate = datepick.date; - // [self.startButton setTitle:dateStr forState:UIControlStateSelected]; - // self.endDate = datepick.date; - // [self.endButton setTitle:dateStr forState:UIControlStateSelected]; - [self.startButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [self.startButton setTitleColor:[DJDKMIMOMColor inputTextColor] forState:UIControlStateSelected]; - [self.endButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [self.endButton setTitleColor:[DJDKMIMOMColor inputTextColor] forState:UIControlStateSelected]; - NSString *dateStr = [self.dateFormatter stringFromDate:datepick.date]; - - if (self.startButton.isSelected) {//修改开始日期 - self.startDate = datepick.date; - [self.startButton setTitle:dateStr forState:UIControlStateNormal]; - [self.startButton setTitle:dateStr forState:UIControlStateSelected]; - if ([self.startDate compare:self.endDate] == NSOrderedDescending) {//开始日期大于结束日期，修改结束日期 - self.endDate = datepick.date; - [self.endButton setTitle:dateStr forState:UIControlStateNormal]; - [self.endButton setTitle:dateStr forState:UIControlStateSelected]; - } - } else {//修改结束日期 - if ([self.startDate compare:datepick.date] == NSOrderedDescending) {//开始日期大于结束日期 - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPGuildTimePickView3")]; - dateStr = [self.dateFormatter stringFromDate:self.startDate]; - self.endDate = self.startDate; - [self.endButton setTitle:dateStr forState:UIControlStateNormal]; - [self.endButton setTitle:dateStr forState:UIControlStateSelected]; - self.datePicker.date = self.startDate; - } else { - self.endDate = datepick.date; - [self.endButton setTitle:dateStr forState:UIControlStateNormal]; - [self.endButton setTitle:dateStr forState:UIControlStateSelected]; - } - } - - - }else if (self.pickDateType == XPNewGuildTimePickTypeWeek) { - [self weekDayWithCurrentDate:datepick.date]; - if(self.hiddenBtn == YES){ - - NSDateFormatter *formatter = [[NSDateFormatter alloc]init]; - [formatter setDateFormat:@"yyyy-MM-dd"]; - NSDate *resDate; - -#ifdef DEBUG - NSString *isProduction = [[NSUserDefaults standardUserDefaults]valueForKey:@"kIsProductionEnvironment"]; - if([isProduction isEqualToString:@"YES"]){ - resDate = [formatter dateFromString:@"2022-12-05"]; - }else{ - resDate = [formatter dateFromString:@"2022-09-05"]; - } -#else - resDate = [formatter dateFromString:@"2022-12-05"]; -#endif - if([self.startDate compare:resDate] == NSOrderedAscending){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPGuildTimePickView6")]; - NSString *startDateStr = [self.dateFormatter stringFromDate:resDate]; - NSString *endDateStr = [self.dateFormatter stringFromDate:self.threeMinEndDate]; - [self.startButton setTitle:startDateStr forState:UIControlStateSelected]; - [self.endButton setTitle:endDateStr forState:UIControlStateSelected]; - self.datePicker.date = resDate; - return; - }else if([self.startDate compare:self.threeMinStartDate] == NSOrderedAscending){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPGuildTimePickView6")]; - NSString *startDateStr = [self.dateFormatter stringFromDate:self.threeMinStartDate]; - NSString *endDateStr = [self.dateFormatter stringFromDate:self.threeMinEndDate]; - [self.startButton setTitle:startDateStr forState:UIControlStateSelected]; - [self.endButton setTitle:endDateStr forState:UIControlStateSelected]; - self.datePicker.date = self.threeMinStartDate; - return; - }else if ([self.startDate compare:self.threeMaxStartDate] == NSOrderedDescending){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPGuildTimePickView6")]; - NSString *startDateStr = [self.dateFormatter stringFromDate:self.threeMaxStartDate]; - NSString *endDateStr = [self.dateFormatter stringFromDate:self.threeMaxEndDate]; - [self.startButton setTitle:startDateStr forState:UIControlStateSelected]; - [self.endButton setTitle:endDateStr forState:UIControlStateSelected]; - self.datePicker.date = self.threeMaxStartDate; - return; - } - } - NSString *startDateStr = [self.dateFormatter stringFromDate:self.startDate]; - NSString *endDateStr = [self.dateFormatter stringFromDate:self.endDate]; - [self.startButton setTitle:startDateStr forState:UIControlStateSelected]; - [self.endButton setTitle:endDateStr forState:UIControlStateSelected]; - - - } -} - -- (void)onClickStartButton:(UIButton *)sender { - if(self.pickDateType != XPNewGuildTimePickTypeDay)return; - self.startButton.selected = YES; - self.endButton.selected = NO; - self.datePicker.date = self.startDate; -} - -- (void)onClickEndButton:(UIButton *)sender { - if(self.pickDateType != XPNewGuildTimePickTypeDay)return; - self.startButton.selected = NO; - self.endButton.selected = YES; - self.datePicker.date = self.endDate; - -} --(void)clickDayAction{ - self.dayBtn.selected = YES; - self.weekBtn.selected = NO; - self.monthBtn.selected = NO; - - - self.datePicker.date = self.startDate; - self.monthPickerView.hidden = YES; - self.pickDateType = XPNewGuildTimePickTypeDay; -} --(void)clickWeekAction{ - self.dayBtn.selected = NO; - self.weekBtn.selected = YES; - self.monthBtn.selected = NO; - - self.pickDateType = XPNewGuildTimePickTypeWeek; - self.datePicker.date = self.startDate; - self.monthPickerView.hidden = YES; - -} --(void)clickMonthAction{ - self.dayBtn.selected = NO; - self.weekBtn.selected = NO; - self.monthBtn.selected = YES; - self.pickDateType = XPNewGuildTimePickTypeMonth; - - - [self.monthPickerView showView]; - [self.monthPickerView setDate:[NSDate date] animated:YES]; - -} -#pragma mark - Getters And Setters -- (void)setCurrentDate:(NSDate *)currentDate { - _currentDate = currentDate; - if (_currentDate) { - NSDateComponents *comps = nil; comps = [self.calendar components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitMonth fromDate:_currentDate]; - NSDateComponents *adcomps = [[NSDateComponents alloc] init]; - [adcomps setYear:-25]; - [adcomps setMonth:0]; - [adcomps setDay:0]; - NSDate *minDate = [self.calendar dateByAddingComponents:adcomps toDate:_currentDate options:0]; - - NSDateComponents *maxcomps = [[NSDateComponents alloc] init]; - [maxcomps setYear:25]; - [maxcomps setMonth:0]; - [maxcomps setDay:0]; - NSDate *maxDate = [self.calendar dateByAddingComponents:maxcomps toDate:_currentDate options:0]; - self.datePicker.minimumDate = minDate; - self.datePicker.maximumDate = maxDate; - self.datePicker.date = _currentDate; - } -} - -- (void)setPickDateType:(XPNewGuildTimePickType)pickDateType { - _pickDateType = pickDateType; - [self.startButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [self.startButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateSelected]; - [self.endButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [self.endButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateSelected]; - if(pickDateType == XPNewGuildTimePickTypeDay){ - [self.startButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [self.startButton setTitleColor:[DJDKMIMOMColor inputTextColor] forState:UIControlStateSelected]; - [self.endButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [self.endButton setTitleColor:[DJDKMIMOMColor inputTextColor] forState:UIControlStateSelected]; - self.startButton.selected = YES; - self.endButton.selected = NO; - NSString *dateStr = [self.dateFormatter stringFromDate:self.currentDate]; - [self.startButton setTitle:dateStr forState:UIControlStateNormal]; - [self.startButton setTitle:dateStr forState:UIControlStateSelected]; - [self.endButton setTitle:dateStr forState:UIControlStateNormal]; - [self.endButton setTitle:dateStr forState:UIControlStateSelected]; - self.startDate = _currentDate; - self.endDate = _currentDate; - }else if (pickDateType == XPNewGuildTimePickTypeWeek) { - [self weekDayWithCurrentDate:self.currentDate]; - NSString *startDateStr = [self.dateFormatter stringFromDate:self.startDate]; - NSString *endDateStr = [self.dateFormatter stringFromDate:self.endDate]; - [self.startButton setTitle:startDateStr forState:UIControlStateSelected]; - [self.endButton setTitle:endDateStr forState:UIControlStateSelected]; - self.startButton.selected = YES; - self.endButton.selected = YES; - }else{ - [self monthWithCurrentDate:self.startDate]; - NSString *startDateStr = [PLTimeUtil getYYMMDDWithDate:self.startDate]; - NSString *endDateStr = [PLTimeUtil getYYMMDDWithDate:self.endDate]; - [self.startButton setTitle:startDateStr forState:UIControlStateSelected]; - [self.endButton setTitle:endDateStr forState:UIControlStateSelected]; - self.startButton.selected = YES; - self.endButton.selected = YES; - } -} - - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 0; - } - return _stackView; -} - -- (UIView *)toolView { - if (!_toolView) { - _toolView = [[UIView alloc] init]; - _toolView.backgroundColor = [UIColor clearColor]; - } - return _toolView; -} - -- (UIView *)intervalView { - if (!_intervalView) { - _intervalView = [[UIView alloc] init]; - _intervalView.backgroundColor = [UIColor clearColor]; - } - return _intervalView; -} - - -- (UIButton *)cancleButton { - if (!_cancleButton) { - _cancleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_cancleButton setTitle:YMLocalizedString(@"XPGuildTimePickView4") forState:UIControlStateNormal]; - [_cancleButton addTarget:self action:@selector(onClickCancelButton:) forControlEvents:UIControlEventTouchUpInside]; - _cancleButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - [_cancleButton setTitleColor:[DJDKMIMOMColor textThirdColor] forState:UIControlStateNormal]; - } - return _cancleButton; -} - -- (UIButton *)sureButton { - if (!_sureButton) { - _sureButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sureButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - [_sureButton addTarget:self action:@selector(onClickSureButton:) forControlEvents:UIControlEventTouchUpInside]; - _sureButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - [_sureButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - } - return _sureButton; -} - -- (NSDateFormatter *)dateFormatter { - if (!_dateFormatter) { - _dateFormatter = [[NSDateFormatter alloc] init]; - _dateFormatter.dateFormat = @"YYYY-MM-dd"; - } - return _dateFormatter; -} - -- (UIDatePicker *)datePicker { - if (!_datePicker){ - _datePicker = [[UIDatePicker alloc] init]; - _datePicker.datePickerMode = UIDatePickerModeDate; - - if (@available(iOS 13.4, *)) { - _datePicker.preferredDatePickerStyle = UIDatePickerStyleWheels; - } - if (@available(iOS 13.0, *)) { - _datePicker.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; - } - [_datePicker addTarget:self action:@selector(datePickerValueChange:) forControlEvents:UIControlEventValueChanged]; - } - return _datePicker; -} - -- (UIButton *)startButton { - if (!_startButton) { - _startButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_startButton addTarget:self action:@selector(onClickStartButton:) forControlEvents:UIControlEventTouchUpInside]; - _startButton.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - [_startButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [_startButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateSelected]; - [_startButton.titleLabel sizeToFit]; - _startButton.selected = YES; - } - return _startButton; -} - -- (UIButton *)endButton { - if (!_endButton) { - _endButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_endButton addTarget:self action:@selector(onClickEndButton:) forControlEvents:UIControlEventTouchUpInside]; - _endButton.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - [_endButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal]; - [_endButton setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateSelected]; - _endButton.titleLabel.textAlignment = NSTextAlignmentRight; - _endButton.selected = YES; - } - return _endButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"App_Common_To"); - _titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = UIColorFromRGB(0x6D6B89); - } - return _titleLabel; -} - -- (NSCalendar *)calendar { - if (!_calendar) { - _calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]; - } - return _calendar; -} - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.backgroundColor = [UIColor whiteColor]; - - // _bgImageView.image = [UIImage imageNamed:@"mine_guild_income_datePicker_bg"]; - } - return _bgImageView; -} -- (UIButton *)dayBtn{ - if (!_dayBtn){ - _dayBtn = [UIButton new]; - _dayBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - [_dayBtn setTitle:YMLocalizedString(@"App_Commont_Days") forState:UIControlStateNormal]; - [_dayBtn setTitleColor:UIColorFromRGB(0xB3B3C3) forState:UIControlStateNormal]; - [_dayBtn setTitleColor:DJDKMIMOMColor.appMainColor forState:UIControlStateSelected]; - UIImage *chooseImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xCCF8F9),UIColorFromRGB(0xDEE4FF),UIColorFromRGB(0xEEDCFF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(68,24)]; - UIImage *noChooseImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xE6E6F0),UIColorFromRGB(0xE6E6F0),UIColorFromRGB(0xE6E6F0)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(68,24)]; - [_dayBtn setBackgroundImage:chooseImage forState:UIControlStateSelected]; - [_dayBtn setBackgroundImage:noChooseImage forState:UIControlStateNormal]; - _dayBtn.selected = YES; - [_dayBtn setCornerWithLeftTopCorner:3 rightTopCorner:3 bottomLeftCorner:3 bottomRightCorner:3 size:CGSizeMake(68,24)]; - [_dayBtn addTarget:self action:@selector(clickDayAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _dayBtn; -} -- (UIButton *)weekBtn{ - if (!_weekBtn){ - _weekBtn = [UIButton new]; - _weekBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - [_weekBtn setTitle:YMLocalizedString(@"App_Commont_Week") forState:UIControlStateNormal]; - [_weekBtn setTitleColor:UIColorFromRGB(0xB3B3C3) forState:UIControlStateNormal]; - [_weekBtn setTitleColor:DJDKMIMOMColor.appMainColor forState:UIControlStateSelected]; - UIImage *chooseImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xCCF8F9),UIColorFromRGB(0xDEE4FF),UIColorFromRGB(0xEEDCFF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(68,24)]; - UIImage *noChooseImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xE6E6F0),UIColorFromRGB(0xE6E6F0),UIColorFromRGB(0xE6E6F0)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(68,24)]; - [_weekBtn setBackgroundImage:chooseImage forState:UIControlStateSelected]; - [_weekBtn setBackgroundImage:noChooseImage forState:UIControlStateNormal]; - [_weekBtn setCornerWithLeftTopCorner:3 rightTopCorner:3 bottomLeftCorner:3 bottomRightCorner:3 size:CGSizeMake(68,24)]; - [_weekBtn addTarget:self action:@selector(clickWeekAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _weekBtn; -} -- (UIButton *)monthBtn{ - if (!_monthBtn){ - _monthBtn = [UIButton new]; - _monthBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - [_monthBtn setTitle:YMLocalizedString(@"App_Commont_Month") forState:UIControlStateNormal]; - [_monthBtn setTitleColor:UIColorFromRGB(0xB3B3C3) forState:UIControlStateNormal]; - [_monthBtn setTitleColor:DJDKMIMOMColor.appMainColor forState:UIControlStateSelected]; - UIImage *chooseImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xCCF8F9),UIColorFromRGB(0xDEE4FF),UIColorFromRGB(0xEEDCFF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(68,24)]; - UIImage *noChooseImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xE6E6F0),UIColorFromRGB(0xE6E6F0),UIColorFromRGB(0xE6E6F0)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(68,24)]; - [_monthBtn setBackgroundImage:chooseImage forState:UIControlStateSelected]; - [_monthBtn setBackgroundImage:noChooseImage forState:UIControlStateNormal]; - [_monthBtn setCornerWithLeftTopCorner:3 rightTopCorner:3 bottomLeftCorner:3 bottomRightCorner:3 size:CGSizeMake(68,24)]; - [_monthBtn addTarget:self action:@selector(clickMonthAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _monthBtn; -} -- (XPGuildTimeMonthPickerView *)monthPickerView { - if (!_monthPickerView) { - _monthPickerView = [[XPGuildTimeMonthPickerView alloc] initNoBackBtnWithSuperView:self]; - _monthPickerView.delegate = self; - _monthPickerView.datePickerMode = HooDatePickerModeYearAndMonth; - [_monthPickerView setTintColor:UIColorFromRGB(0x999999)];//设置主色 - [_monthPickerView setHighlightColor:UIColorFromRGB(0x333333)]; - NSDate * date = [NSDate date]; - NSDateComponents *comps = nil; comps = [[NSCalendar sharedCalendar] components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitMonth fromDate:date]; - NSDateComponents *adcomps = [[NSDateComponents alloc] init]; - [adcomps setYear:-15]; - [adcomps setMonth:0]; - [adcomps setDay:0]; - NSDate *minDate = [[NSCalendar sharedCalendar] dateByAddingComponents:adcomps toDate:date options:0]; - - NSDateComponents *maxcomps = [[NSDateComponents alloc] init]; - [maxcomps setYear:15]; - [maxcomps setMonth:0]; - [maxcomps setDay:0]; - NSDate *maxDate = [[NSCalendar sharedCalendar] dateByAddingComponents:maxcomps toDate:date options:0]; - _monthPickerView.minimumDate = minDate; - _monthPickerView.maximumDate = maxDate; - - } - return _monthPickerView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewMineGuildItemView.h b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewMineGuildItemView.h deleted file mode 100644 index ea34e45..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewMineGuildItemView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPNewMineGuildItemView.h -// YuMi -// -// Created by duoban on 2023/8/4. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNewMineGuildItemView : UIView -@property(nonatomic,strong) UIImage *bgImage; -@property(nonatomic,copy) NSString *text; -@property(nonatomic,strong) UIColor *textColor; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewMineGuildItemView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewMineGuildItemView.m deleted file mode 100644 index 1b262d0..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewMineGuildItemView.m +++ /dev/null @@ -1,63 +0,0 @@ -// -// XPNewMineGuildItemView.m -// YuMi -// -// Created by duoban on 2023/8/4. -// - -#import "XPNewMineGuildItemView.h" -@interface XPNewMineGuildItemView() -@property(nonatomic,strong) UIImageView *iconView; -@property(nonatomic,strong) UILabel *titleView; -@end -@implementation XPNewMineGuildItemView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.iconView]; - [self addSubview:self.titleView]; -} --(void)installConstraints{ - [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.iconView); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(12); - make.centerY.equalTo(self); - }]; -} -- (void)setBgImage:(UIImage *)bgImage{ - _bgImage = bgImage; - _iconView.image = [_bgImage ms_SetImageForRTL]; -} -- (void)setText:(NSString *)text{ - _text = text; - _titleView.text = _text; -} --(void)setTextColor:(UIColor *)textColor{ - _textColor = textColor; - _titleView.textColor = _textColor; -} -#pragma mark - 懒加载 -- (UIImageView *)iconView{ - if(!_iconView){ - _iconView = [UIImageView new]; - - } - return _iconView; -} --(UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel new]; - _titleView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - } - return _titleView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildChooseManagerViewController.h b/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildChooseManagerViewController.h deleted file mode 100644 index fd7654f..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildChooseManagerViewController.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPMineGuildChooseManagerViewController.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildChooseManagerViewController : MvpViewController -///家族id -@property (nonatomic,copy) NSString *clanId; -///管理员的iuid -@property (nonatomic,copy) NSString *targetUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildChooseManagerViewController.m b/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildChooseManagerViewController.m deleted file mode 100644 index 5c90dc9..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildChooseManagerViewController.m +++ /dev/null @@ -1,262 +0,0 @@ -// -// XPMineGuildChooseManagerViewController.m -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "XPMineGuildChooseManagerViewController.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -#import "TTPopup.h" -#import "UIImage+Utils.h" -///Model -#import "GuildRoomInfoModel.h" -///View -#import "XPGuildChooseManagerRoomTableViewCell.h" -///P -#import "XPSuperAdminManagerRoomPresenter.h" -#import "XPSuperAdminManagerRoomProtocol.h" - -@interface XPMineGuildChooseManagerViewController () -///导航啦 -@property (nonatomic,strong) UIView * navView; -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///确定按钮 -@property (nonatomic,strong) UIButton * sureButton; -///数据源 -@property (nonatomic,copy) NSArray *datasource; -///选中房间 -@property (nonatomic,strong) NSMutableArray *chooseArray; -///发生改变的数据 -@property (nonatomic,strong) NSMutableArray *changeArray; -@end - -@implementation XPMineGuildChooseManagerViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (__kindof id)createPresenter { - return [[XPSuperAdminManagerRoomPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self.presenter getGuildRoomList:self.clanId targetUid:self.targetUid]; - [self initSubViews]; - [self initSubViewConstraints]; -} -#pragma mark - Private Method -- (void)initSubViews { - self.titleLabel.text = YMLocalizedString(@"XPMineGuildChooseManagerViewController0"); - [self.view addSubview:self.navView]; - [self.view addSubview:self.tableView]; - [self.view addSubview:self.sureButton]; - - [self.navView addSubview:self.backButton]; - [self.navView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).mas_offset(10); - make.top.mas_equalTo(statusbarHeight); - make.height.width.mas_equalTo(44); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.navView); - make.centerY.mas_equalTo(self.backButton); - }]; - - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.navView.mas_bottom); - }]; - - [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(47); - make.height.mas_equalTo(44); - make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 20); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPGuildChooseManagerRoomTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPGuildChooseManagerRoomTableViewCell class])]; - if (cell == nil) { - cell = [[XPGuildChooseManagerRoomTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPGuildChooseManagerRoomTableViewCell class])]; - } - cell.delegate = self; - cell.cellIndex = indexPath; - GuildRoomInfoModel* roomInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (roomInfo) { - cell.roomInfo = roomInfo; - if (roomInfo.hasManage) { - if (![self.chooseArray containsObject:roomInfo.hallRoomUid]) { - [self.chooseArray addObject:roomInfo.hallRoomUid]; - } - } else { - if ([self.chooseArray containsObject:roomInfo.hallRoomUid]) { - [self.chooseArray removeObject:roomInfo.hallRoomUid]; - } - } - } - - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 88; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; -} - -#pragma mark - XPGuildChooseManagerRoomTableViewCellDelegate -- (void)xPGuildChooseManagerRoomTableViewCell:(XPGuildChooseManagerRoomTableViewCell *)view - didChooseInfo:(GuildRoomInfoModel *)roomInfo - didChooseIndex:(NSIndexPath *)indexPath { - GuildRoomInfoModel *originalRoomInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - originalRoomInfo.hasManage = !originalRoomInfo.hasManage; - roomInfo.hasManage = originalRoomInfo.hasManage; - - if (roomInfo.hasManage) { - if (![self.changeArray containsObject:roomInfo.hallRoomUid]) { - [self.changeArray addObject:roomInfo.hallRoomUid]; - } - } else { - if ([self.changeArray containsObject:roomInfo.hallRoomUid]) { - [self.changeArray removeObject:roomInfo.hallRoomUid]; - } - } - - [self.tableView reloadData]; -} - -#pragma mark - XPSuperAdminManagerRoomProtocol -- (void)getGuildRoomListSuccess:(NSArray *)array { - self.datasource = array; - [self.tableView reloadData]; -} - -- (void)guildSuperAdminManagerRoomListSuccess { - [self showSuccessToast:YMLocalizedString(@"XPMineGuildChooseManagerViewController1")]; - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - Event Response -- (void)backButtonAction:(UIButton *)sender { - if (self.changeArray.count <=0) { - [self.navigationController popViewControllerAnimated:YES]; - return; - } - [TTPopup alertWithMessage:YMLocalizedString(@"XPMineGuildChooseManagerViewController2") confirmHandler:^{ - [self.navigationController popViewControllerAnimated:YES]; - } cancelHandler:^{ - - }]; -} - -- (void)sureButtonAction:(UIButton *)sender { - [self.presenter guildSuperAdminManagerRoomList:self.chooseArray.copy targetUid:self.targetUid]; -} - -#pragma mark - Getters And Setters -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont boldSystemFontOfSize:18]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UIView *)navView { - if (!_navView) { - _navView = [[UIView alloc] init]; - _navView.backgroundColor = [UIColor whiteColor]; - } - return _navView; -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - _backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - UIView * headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 15)]; - headerView.backgroundColor = [UIColor clearColor]; - _tableView.tableHeaderView = headerView; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPGuildChooseManagerRoomTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPGuildChooseManagerRoomTableViewCell class])]; - } - return _tableView; -} - -- (UIButton *)sureButton { - if (!_sureButton) { - _sureButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sureButton setTitle:YMLocalizedString(@"XPMineGuildChooseManagerViewController3") forState:UIControlStateNormal]; - [_sureButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - _sureButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_sureButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _sureButton.layer.masksToBounds = YES; - _sureButton.layer.cornerRadius = 20; - [_sureButton addTarget:self action:@selector(sureButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _sureButton; -} - -- (NSMutableArray *)chooseArray { - if (!_chooseArray) { - _chooseArray = [NSMutableArray array]; - } - return _chooseArray; -} - -- (NSMutableArray *)changeArray { - if (!_changeArray) { - _changeArray = [NSMutableArray array]; - } - return _changeArray; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildSuperAdminSetViewController.h b/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildSuperAdminSetViewController.h deleted file mode 100644 index 9f83120..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildSuperAdminSetViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPGuildSuperAdminSetViewController.h -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildSuperAdminSetViewController : MvpViewController -///家族的ID -@property (nonatomic,copy) NSString *clanId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildSuperAdminSetViewController.m b/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildSuperAdminSetViewController.m deleted file mode 100644 index 12138a2..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildSuperAdminSetViewController.m +++ /dev/null @@ -1,208 +0,0 @@ -// -// XPGuildSuperAdminSetViewController.m -// YuMi -// -// Created by YuMi on 2022/4/13. -// - -#import "XPMineGuildSuperAdminSetViewController.h" -///Third -#import -///Tool -#import "UIImage+Utils.h" -#import "DJDKMIMOMColor.h" - -#import "TTPopup.h" -///Model -#import "GuildSuperAdminInfoModel.h" -///View -#import "XPGuildSuperAdminSetTableViewCell.h" -#import "XPMineGuildEmptyTableViewCell.h" -#import "XPMineGuildChooseManagerViewController.h" -#import "XPMineGuildSearchViewController.h" -///P -#import "XPSuperAdminSetPresenter.h" -#import "XPSuperAdminSetProtocol.h" - -@interface XPMineGuildSuperAdminSetViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///添加公会超管 -@property (nonatomic,strong) UIButton *addManagerButton; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -@end - -@implementation XPMineGuildSuperAdminSetViewController - -- (__kindof id)createPresenter { - return [[XPSuperAdminSetPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [self.presenter getClanSuperAdminList:self.clanId]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineGuildSuperAdminSetViewController0"); - [self.view addSubview:self.tableView]; - [self.view addSubview:self.addManagerButton]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.addManagerButton.mas_top); - }]; - - [self.addManagerButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(47); - make.height.mas_equalTo(40); - make.bottom.mas_equalTo(self.view.mas_safeAreaLayoutGuideBottom).offset(-20); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPGuildSuperAdminSetTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPGuildSuperAdminSetTableViewCell class])]; - if (cell == nil) { - cell = [[XPGuildSuperAdminSetTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPGuildSuperAdminSetTableViewCell class])]; - } - cell.delegate = self; - GuildSuperAdminInfoModel * info= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.managerInfo = info; - return cell; - } - - XPMineGuildEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineGuildEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - } - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? 220 : 500; -} - -#pragma mark - XPGuildSuperAdminSetTableViewCellDelegate -- (void)xPGuildSuperAdminSetTableViewCell:(GuildSuperAdminInfoModel *)managerInfo didChooseType:(GuildSuperAdminMenuType)menuType { - switch (menuType) { - case GuildSuperAdminMenuType_Set_Manager_Room: - { - XPMineGuildChooseManagerViewController * managerRoomVC = [[XPMineGuildChooseManagerViewController alloc] init]; - managerRoomVC.clanId = self.clanId; - managerRoomVC.targetUid = managerInfo.uid; - [self.navigationController pushViewController:managerRoomVC animated:YES]; - } - break; - case GuildSuperAdminMenuType_Remove_Super_Admnin: - { - NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildSuperAdminSetViewController1"), managerInfo.nick]; - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.message = title; - TTAlertMessageAttributedConfig * attributeConfig = [[TTAlertMessageAttributedConfig alloc] init]; - attributeConfig.text = managerInfo.nick; - attributeConfig.color = [DJDKMIMOMColor appMainColor]; - config.messageAttributedConfig = @[attributeConfig]; - [TTPopup alertWithConfig:config confirmHandler:^{ - [self.presenter removeSuperAdmin:managerInfo.uid]; - } cancelHandler:^{ - - }]; - } - break; - default: - break; - } -} - -#pragma mark - XPSuperAdminSetProtocol -- (void)getClanSuperAdminListSuccess:(NSArray *)list { - [self.datasource removeAllObjects]; - [self.datasource addObjectsFromArray:list]; - [self.tableView reloadData]; -} - -- (void)removeSuperAdminSuccess:(NSString *)uid { - __block GuildSuperAdminInfoModel * removeItem; - [self.datasource enumerateObjectsUsingBlock:^(GuildSuperAdminInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid.integerValue == uid.integerValue) { - removeItem = obj; - *stop = YES; - } - }]; - - if (removeItem) { - [self.datasource removeObject:removeItem]; - [self.tableView reloadData]; - } -} - - -#pragma mark - Event Response -- (void)addManagerButtonAction:(UIButton *)sender { - XPMineGuildSearchViewController * searchVC = [[XPMineGuildSearchViewController alloc] init]; - searchVC.searchType = GuildSearchType_Clan_Add_Super_Admin; - searchVC.modalPresentationStyle = UIModalPresentationOverFullScreen; - searchVC.clanOwnerUid = self.clanId; - [self.navigationController presentViewController:searchVC animated:YES completion:nil]; -} - -#pragma mark - Getters And Setters -- (UIButton *)addManagerButton { - if (!_addManagerButton) { - _addManagerButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_addManagerButton setTitle:YMLocalizedString(@"XPMineGuildSuperAdminSetViewController2") forState:UIControlStateNormal]; - [_addManagerButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - _addManagerButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_addManagerButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _addManagerButton.layer.masksToBounds = YES; - _addManagerButton.layer.cornerRadius = 20; - [_addManagerButton addTarget:self action:@selector(addManagerButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _addManagerButton; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - UIView * headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 15)]; - headerView.backgroundColor = [UIColor clearColor]; - _tableView.tableHeaderView = headerView; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPGuildSuperAdminSetTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPGuildSuperAdminSetTableViewCell class])]; - [_tableView registerClass:[XPMineGuildEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.h b/YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.h deleted file mode 100644 index 2bb6eb4..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPMineClanViewController.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@class ClanDetailInfoModel; -@interface XPMineClanViewController : MvpViewController -///组长的Uid -@property (nonatomic,copy) NSString *uid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.m b/YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.m deleted file mode 100644 index 91ee6de..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.m +++ /dev/null @@ -1,371 +0,0 @@ -// -// XPMineClanViewController.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "XPMineClanViewController.h" -///Third -#import -#import -///Tool - -#import "DJDKMIMOMColor.h" -#import "AccountInfoStorage.h" -///Model -#import "ClanDetailInfoModel.h" -#import "ClanMemberDetailInfoModel.h" -///View -#import "XPClanMemberTableViewCell.h" -#import "XPGuildHeaderView.h" -#import "XPClanSectionView.h" -#import "XPMineGuildViewController.h" -#import "XPMineGuildSearchViewController.h" -#import "XPMineClanIncomeStatisViewController.h" -#import "XPMineGuildSuperAdminSetViewController.h" -#import "XPMineUserInfoViewController.h" -#import "XPMineMainIncomeStatisViewController.h" -#import "XPMineExchangeAuthorityVC.h" -///P -#import "XPClanPresenter.h" -#import "XPClanProtocol.h" - -@interface XPMineClanViewController () -///顶部视图 -@property (nonatomic,strong) XPGuildHeaderView *headerView; -///导航栏 -@property (nonatomic,strong) UIView * navView; -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///当前页数 -@property (nonatomic,assign) int page; -///是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///家族信息详情 -@property (nonatomic,strong) ClanDetailInfoModel *clanDetailInfo; -///成员详情的列表 -@property (nonatomic,strong) ClanMemberDetailInfoModel *memberDetailInfo; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///区头 -@property (nonatomic,strong) XPClanSectionView *sectionView; -///是否请求了数据 -@property (nonatomic,assign) BOOL isRequest; -///公会成员 -@property(nonatomic,assign) NSInteger memberNum; -@end - -@implementation XPMineClanViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (XPClanPresenter *)createPresenter { - return [[XPClanPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initHeaderAndFooterRrfresh]; -} -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - self.page = 1; - [self.presenter getClanDetailInfo:self.uid currentUserUid:[AccountInfoStorage instance].getUid]; - [self.presenter getClanMemberList:self.uid page:self.page pageSize:20 state:0]; -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMineClanViewController0")]; - [self.tableView.mj_footer endRefreshing]; - return; - } - self.page++; - [self.presenter getClanMemberList:self.uid page:self.page pageSize:20 state:1]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.headerView]; - [self.view addSubview:self.tableView]; - [self.view addSubview:self.navView]; - [self.navView addSubview:self.backButton]; - [self.navView addSubview:self.titleLabel]; - -} - -- (void)initSubViewConstraints { - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.view); - }]; - - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).mas_offset(10); - make.top.mas_equalTo(statusbarHeight); - make.height.width.mas_equalTo(44); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.navView); - make.centerY.mas_equalTo(self.backButton); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count + 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if(indexPath.row == 0){ - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([UITableViewCell class]) forIndexPath:indexPath]; - cell.backgroundColor = [UIColor clearColor]; - cell.contentView.backgroundColor = [UIColor clearColor]; - if(!self.sectionView.superview){ - [cell.contentView addSubview:self.sectionView]; - } - return cell; - } - XPClanMemberTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - if (cell == nil) { - cell = [[XPClanMemberTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - } - self.sectionView.title = [NSString stringWithFormat:YMLocalizedString(@"XPMineClanViewController1"), self.memberNum]; - cell.cellType = ClanMemberTableViewCellType_Normal; - ClanMemberInfoModel * memberInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row-1]; - cell.isLast = (self.datasource.count -1) == indexPath.row-1; - - cell.memberInfo = memberInfo; - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if(self.headerView.clanRoomList.count == 0 && indexPath.row == 0){ - self.sectionView.frame = CGRectMake(0, 25, KScreenWidth, 37); - return 62; - } - if(indexPath.row == 0){ - self.sectionView.frame = CGRectMake(0, 10, KScreenWidth, 37); - return 47; - } - return 66; -} - - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{ - return self.headerView; -} - - -- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - return 0.01f; -} - -- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{ - return [[UIView alloc]init]; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - ClanMemberInfoModel * memberInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row-1]; - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = memberInfo.uid.integerValue; - [self.navigationController pushViewController:userInfoVC animated:YES]; - } -} - -#pragma mark - XPClanSectionViewDelegate -- (void)xPClanSectionView:(XPClanSectionView *)view didClickSearch:(UIButton *)sender { - XPMineGuildSearchViewController * searchVC = [[XPMineGuildSearchViewController alloc] init]; - searchVC.modalPresentationStyle = UIModalPresentationOverFullScreen; - searchVC.searchType = GuildSearchType_Clan_All_Member; - searchVC.clanOwnerUid = self.clanDetailInfo.clan.elderUid; - [self.navigationController presentViewController:searchVC animated:YES completion:nil]; -} - -#pragma mark -XPClanProtocol -- (void)getClanDetailInfoSuccess:(ClanDetailInfoModel *)clanDetailInfo currentUserClanInfo:(nonnull ClanDetailInfoModel *)currentUserClanInfo{ - if ([currentUserClanInfo.clan.elderUid isEqualToString:clanDetailInfo.clan.elderUid]) { - self.sectionView.isHiddenSearch = NO; - } - self.clanDetailInfo = clanDetailInfo; - self.headerView.clanInfo = clanDetailInfo; - self.titleLabel.text = clanDetailInfo.clan.name; - [self.presenter getClanRoomList:clanDetailInfo.clan.cid]; -} - -- (void)getClanMemberListSuccess:(ClanMemberDetailInfoModel *)memberInfo state:(int)state { - self.isRequest = YES; - if (state == 0) { - self.hasNoMoreData = NO; - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - - if (memberInfo.members.count > 0) { - [self.datasource addObjectsFromArray:memberInfo.members]; - } else { - self.hasNoMoreData = YES; - } - self.memberNum = memberInfo.count; - [self.tableView reloadData]; -} - -- (void)getClanRoomListSuccess:(NSArray *)array { - self.headerView.clanRoomList = array; - [self.tableView reloadData]; -} - -#pragma mark - XPGuildHeaderViewDelegate -- (void)xPGuildHeaderView:(XPGuildHeaderView *)view dicSelectGuild:(GuildInfoModel *)guildInfo { - XPMineGuildViewController * guildVC = [[XPMineGuildViewController alloc] init]; - guildVC.ownerUid = guildInfo.ownerUid; - guildVC.guildId = guildInfo.hallId; - [self.navigationController pushViewController:guildVC animated:YES]; -} - -- (void)xPGuildHeaderView:(XPGuildHeaderView *)view dicSelectOwner:(ClanDetailInfoModel *)guildInfo { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = guildInfo.clan.elderUid.integerValue; - [self.navigationController pushViewController:userInfoVC animated:YES]; -} - -- (void)xPGuildHeaderView:(XPGuildHeaderView *)view dicTapMenuItem:(GuildHeaderMenuType)menuType { - switch (menuType) { - case GuildHeaderMenuType_Hall_Income: - { - XPMineMainIncomeStatisViewController * clanIncomeVC = [[XPMineMainIncomeStatisViewController alloc] init]; - clanIncomeVC.clanId = self.clanDetailInfo.clan.cid; - [self.navigationController pushViewController:clanIncomeVC animated:YES]; - } - break; - case GuildHeaderMenuType_Exchange_Authority: - { - XPMineExchangeAuthorityVC* clanIncomeVC = [[XPMineExchangeAuthorityVC alloc] init]; - [self.navigationController pushViewController:clanIncomeVC animated:YES]; - } - break; - case GuildHeaderMenuType_Super_Admin: - { - XPMineGuildSuperAdminSetViewController * superAdminVC = [[XPMineGuildSuperAdminSetViewController alloc] init]; - superAdminVC.clanId = self.clanDetailInfo.clan.cid; - [self.navigationController pushViewController:superAdminVC animated:YES]; - } - break; - default: - break; - } -} - -#pragma mark - Event Response -- (void)backButtonAction:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - Getters And Setters -- (UIView *)navView { - if (!_navView) { - _navView = [[UIView alloc] init]; - _navView.backgroundColor = [UIColor clearColor]; - } - return _navView; -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"home_search_white_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backButton setImage:[[UIImage imageNamed:@"home_search_white_back"]ms_SetImageForRTL] forState:UIControlStateSelected]; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:17]; - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} -- (XPClanSectionView *)sectionView{ - if(!_sectionView){ - _sectionView = [[XPClanSectionView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 37)]; - _sectionView.isTopCor = YES; - _sectionView.delegate = self; - } - return _sectionView; -} -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - UIView *footView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 20)]; - footView.backgroundColor = [UIColor clearColor]; - _tableView.tableFooterView = footView; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.showsVerticalScrollIndicator = NO; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPClanMemberTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:NSStringFromClass([UITableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -- (XPGuildHeaderView *)headerView { - if (!_headerView) { - _headerView = [[XPGuildHeaderView alloc] init]; - _headerView.delegate = self; - } - return _headerView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineExchangeAuthorityVC.h b/YuMi/Modules/YMMine/View/Guild/View/XPMineExchangeAuthorityVC.h deleted file mode 100644 index 5472674..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineExchangeAuthorityVC.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineExchangeAuthorityVC.h -// YuMi -// -// Created by YuMi on 2023/2/13. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineExchangeAuthorityVC : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineExchangeAuthorityVC.m b/YuMi/Modules/YMMine/View/Guild/View/XPMineExchangeAuthorityVC.m deleted file mode 100644 index 770e890..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineExchangeAuthorityVC.m +++ /dev/null @@ -1,168 +0,0 @@ -// -// XPMineExchangeAuthorityVC.m -// YuMi -// -// Created by YuMi on 2023/2/13. -// - -#import "XPMineExchangeAuthorityVC.h" -///view -#import "XPMineExchangeAuthorityCell.h" -#import "XPMineExchangeAuthorityFooderView.h" -#import "XPMineExchangeAuthorityHeadView.h" -#import "XPMinePromptWindow.h" -#import "TTPopup.h" -#import "DJDKMIMOMColor.h" -///model -#import "XPMineExchangeAuthorityModel.h" -///Presenter -#import "XPClanPresenter.h" -#import "XPClanProtocol.h" -@interface XPMineExchangeAuthorityVC () -/// -@property (nonatomic,strong) UITableView *tableView; -/// -@property (nonatomic,strong) NSMutableArray *dataList; -@end - -@implementation XPMineExchangeAuthorityVC -- (XPClanPresenter *)createPresenter { - return [[XPClanPresenter alloc] init]; -} -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self.presenter getClanRoomMemberAuthorityList]; - -} -#pragma mark - Private Method -- (void)initSubViews { - self.dataList = [NSMutableArray array]; - self.title = YMLocalizedString(@"XPMineExchangeAuthorityVC0"); - [self.view addSubview:self.tableView]; -} -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); - }]; -} -#pragma mark -获取房主兑换权限列表 --(void)getClanRoomMemberAuthorityListSuccess:(NSArray *)list{ - NSMutableArray *openList = [NSMutableArray array]; - NSMutableArray *closeList = [NSMutableArray array]; - for (XPMineExchangeAuthorityModel *model in list) { - if(model.exchangeAuthStatus == 0){ - [openList addObject:model]; - }else{ - [closeList addObject:model]; - } - } - NSArray * getOpenList = [openList sortedArrayUsingComparator:^NSComparisonResult(XPMineExchangeAuthorityModel * obj1, XPMineExchangeAuthorityModel * obj2) { - NSComparisonResult result = obj1.golds < obj2.golds; - return result; - }]; - NSArray *getcloseList = [closeList sortedArrayUsingComparator:^NSComparisonResult(XPMineExchangeAuthorityModel * obj1, XPMineExchangeAuthorityModel * obj2) { - NSComparisonResult result = obj1.golds < obj2.golds; - return result; - }]; - [self.dataList addObject:[getOpenList mutableCopy]]; - [self.dataList addObject:[getcloseList mutableCopy]]; - [self.tableView reloadData]; -} -- (void)getExchangeAuthorityResultSuccess:(XPMineExchangeAuthorityModel *)model status:(NSString *)status{ - [self showSuccessToast:status.intValue == 0 ? YMLocalizedString(@"XPMineExchangeAuthorityVC3"):YMLocalizedString(@"XPMineExchangeAuthorityVC4") ]; - NSMutableArray *openList = self.dataList.firstObject; - NSMutableArray *closeList = self.dataList.lastObject; - model.exchangeAuthStatus = status.intValue; - if([status isEqualToString:@"1"]){ - [closeList addObject:model]; - [openList removeObject:model]; - }else{ - [closeList removeObject:model]; - [openList addObject:model]; - } - NSArray *getOpenList = [openList sortedArrayUsingComparator:^NSComparisonResult(XPMineExchangeAuthorityModel * obj1, XPMineExchangeAuthorityModel * obj2) { - NSComparisonResult result = obj1.golds < obj2.golds; - return result; - }]; - - NSArray *getcloseList = [closeList sortedArrayUsingComparator:^NSComparisonResult(XPMineExchangeAuthorityModel * obj1, XPMineExchangeAuthorityModel * obj2) { - NSComparisonResult result = obj1.golds < obj2.golds; - return result; - }]; - self.dataList[0] = [getOpenList mutableCopy]; - self.dataList[1] = [getcloseList mutableCopy]; - [self.tableView reloadData]; -} - -#pragma mark -XPMineExchangeAuthorityCellDelegate --(void)openExchangeAuthoritySwiftStatus:(NSString *)status model:(XPMineExchangeAuthorityModel *)model{ - if([status isEqualToString:@"0"]){ - XPMinePromptWindow *window = [[XPMinePromptWindow alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - window.name = model.nick; - @kWeakify(self); - window.confirmHandler = ^(){ - @kStrongify(self); - [self.presenter masterDisableRrEnablememberExchangeRights:status targetUid:model.uid model:model]; - }; - [TTPopup popupView:window style:TTPopupStyleAlert]; - return; - } - [self.presenter masterDisableRrEnablememberExchangeRights:status targetUid:model.uid model:model]; -} -#pragma mark -UITableViewDelegate,UITableViewDataSource --(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{ - return self.dataList.count; -} -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ - return [self.dataList[section]count]; -} --(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - XPMineExchangeAuthorityCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineExchangeAuthorityCell class]) forIndexPath:indexPath]; - if(indexPath.section < self.dataList.count){ - if(indexPath.row < [self.dataList[indexPath.section]count]){ - XPMineExchangeAuthorityModel *model = self.dataList[indexPath.section][indexPath.row]; - cell.authorityModel = model; - } - } - cell.delegate = self; - return cell; -} --(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ - return kGetScaleWidth(32); -} --(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - return kGetScaleWidth(45); -} --(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{ - - XPMineExchangeAuthorityHeadView *headerView = [tableView dequeueReusableHeaderFooterViewWithIdentifier:NSStringFromClass([XPMineExchangeAuthorityHeadView class])]; - headerView.title = section == 0 ? YMLocalizedString(@"XPMineExchangeAuthorityVC1"):YMLocalizedString(@"XPMineExchangeAuthorityVC2"); - return headerView; -} -- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{ - XPMineExchangeAuthorityFooderView *fooderView = [tableView dequeueReusableHeaderFooterViewWithIdentifier:NSStringFromClass([XPMineExchangeAuthorityFooderView class])]; - fooderView.title = section == 0 ? YMLocalizedString(@"XPMineExchangeAuthorityFooderView0"):YMLocalizedString(@"XPMineExchangeAuthorityFooderView1"); - return fooderView; -} -#pragma mark -懒加载 -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = UIColorFromRGB(0xF3F5FA); - _tableView.rowHeight = kGetScaleWidth(80); - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineExchangeAuthorityHeadView class] forHeaderFooterViewReuseIdentifier:NSStringFromClass([XPMineExchangeAuthorityHeadView class])]; - [_tableView registerClass:[XPMineExchangeAuthorityFooderView class] forHeaderFooterViewReuseIdentifier:NSStringFromClass([XPMineExchangeAuthorityFooderView class])]; - [_tableView registerClass:[XPMineExchangeAuthorityCell class] forCellReuseIdentifier:NSStringFromClass([XPMineExchangeAuthorityCell class])]; - } - return _tableView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.h b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.h deleted file mode 100644 index 52d02b9..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPMineGuildListVC.h -// YuMi -// -// Created by YuMi on 2022/10/11. -// - -#import -#import "MvpViewController.h" -#import -#import -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineGuildListVC : MvpViewController -@property (nonatomic,assign) int type;//0，公会，1，房间 -@property (nonatomic,assign) BOOL isFromHall; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.m b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.m deleted file mode 100644 index e99dc83..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.m +++ /dev/null @@ -1,294 +0,0 @@ -// -// XPMineGuildListVC.m -// YuMi -// -// Created by YuMi on 2022/10/11. -// - -#import "XPMineGuildListVC.h" -#import "XPMineGuildPresenter.h" -#import "XPMineGuildProtocol.h" -#import "XPMineGuildListCell.h" -#import "XPMineFriendEmptyTableViewCell.h" -#import "XPMineClanViewController.h" -#import "XPMineGuildViewController.h" -#import "XPMineGiveDiamondSearchView.h" -#import "SessionViewController.h" -@interface XPMineGuildListVC () -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *dataList; -///搜索 -@property (nonatomic,strong) XPMineGiveDiamondSearchView *searchView; -///搜索数据源 -@property (nonatomic,strong) NSMutableArray * searchList; - -///申请model -@property (nonatomic,strong) XPMineGuildListModel *applyModel; -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); -@end - -@implementation XPMineGuildListVC -- (XPMineGuildPresenter *)createPresenter { - return [[XPMineGuildPresenter alloc] init];; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self showLoading]; - if(self.type == 0){ - [self.presenter getGuildListData]; - }else{ - [self.presenter getRoomListData]; - } - - [self initSubViews]; - [self initSubViewConstraints]; - -} -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} -- (UIScrollView *)listScrollView { - return self.tableView; -} -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - self.scrollCallback = callback; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - if (self.scrollCallback){ - self.scrollCallback(scrollView); - } - -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPMineGuildListVC0"); - if(self.type == 1){ - [self.view addSubview:self.searchView]; - - } - [self.view addSubview:self.tableView]; - self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - if (@available(iOS 15.0, *)) {//移除iOS15列表头默认增加的22高度 - self.tableView.sectionHeaderTopPadding = 0; - } - -} -- (void)initSubViewConstraints { - if(self.type == 1){ - - [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.trailing.mas_equalTo(0); - make.height.mas_equalTo(kGetScaleWidth(32)); - make.top.mas_equalTo(kGetScaleWidth(10)); - }]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.view); - make.top.equalTo(self.searchView.mas_bottom).mas_offset(kGetScaleWidth(16)); - }]; - - return; - } - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); - }]; -} - -#pragma mark -XPMineGiveDiamondProtocol -- (void)searchEndWithText:(NSString *)text{ - if(text.length == 0){ - self.dataList = [NSMutableArray arrayWithArray:self.searchList]; - [self.tableView reloadData]; - return; - } - [self.dataList removeAllObjects]; - for (XPMineGuildListModel *model in self.searchList) { - NSString *ownerUid = [NSString stringWithFormat:@"%ld",model.ownerErbanNo]; - if([model.hallName containsString:text] || [ownerUid containsString:text] ){ - [self.dataList addObject:model]; - } - } - if(self.dataList.count == 0){ - [self showErrorToast:YMLocalizedString(@"XPMineGuildListVC3")]; - } - [self.tableView reloadData]; -} -#pragma mark -XPMineGuildProtocol --(void)onGetMineRoomListSuccess:(NSArray *)list{ - self.searchList = [NSMutableArray arrayWithArray:list]; - self.dataList = [NSMutableArray arrayWithArray:list]; - [self.tableView reloadData]; - [self hideHUD]; -} --(void)onGetMineGuildListSuccess:(NSArray *)list{ - self.dataList = [NSMutableArray arrayWithArray:list]; - [self.tableView reloadData]; - [self hideHUD]; -} --(void)applyClanSuccess{ - - [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMineGuildListVC2")]; - if(self.applyModel == nil)return; - NSInteger index = [self.dataList indexOfObject:self.applyModel]; - self.applyModel.applyBtnStatus = 2; - XPMineGuildListCell *cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:index inSection:0]]; - [cell setApplyBtnType:NO]; -} -- (void)applyClanFail{ - [self hideHUD]; -} -///申请加入房间成功 --(void)applyHallSuccess{ - [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMineGuildListVC4")]; - if(self.applyModel == nil)return; - NSInteger index = [self.dataList indexOfObject:self.applyModel]; - self.applyModel.hallBtnStatus = 2; - XPMineGuildListCell *cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:index inSection:0]]; - [cell setApplyBtnType:NO]; -} -///申请加入房间失败 --(void)applyHallFail{ - [self hideHUD]; -} -#pragma mark -XPMineGuildListCellDelegate -- (void)applyActionWithModel:(XPMineGuildListModel *)guildModel{ - if(self.type == 0){ - self.applyModel = guildModel; - [self.presenter applyClanWithClanId:@(guildModel.clanId).stringValue]; - [self showLoading]; - return; - } - - if(guildModel.hallBtnStatus == 3){ - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:[NIMSession session:guildModel.hallMessageUid type:NIMSessionTypeP2P]]; - sessionVC.isUser = YES; - sessionVC.recordId = guildModel.hallRecordId; - [self.navigationController pushViewController:sessionVC animated:YES]; - - return; - } - if(guildModel.hallBtnStatus == 1){ - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"XPMineGuildListVC5"); - config.message = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildListVC6"),guildModel.hallName]; - [TTPopup alertWithConfig:config confirmHandler:^{ - self.applyModel = guildModel; - [self.presenter applyHallWithHallId:@(guildModel.hallId).stringValue]; - [self showLoading]; - } cancelHandler:^{ - - }]; - - } - -} -#pragma mark -UITableViewDelegate - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.dataList.count > 0 ? self.dataList.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.dataList.count > 0 ? kGetScaleWidth(58) : (KScreenHeight - kNavigationHeight) ; -} - --(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - if (self.dataList.count > 0){ - XPMineGuildListCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGuildListCell class]) forIndexPath:indexPath]; - cell.rankNum = indexPath.row; - if(cell.delegate == nil){ - cell.delegate = self; - } - if(self.type == 0){ - cell.guildModel = self.dataList[indexPath.row]; - }else{ - XPMineGuildListModel*hallModel = self.dataList[indexPath.row]; - cell.hallModel = hallModel; - cell.isFromHall = self.isFromHall; - } - return cell; - } - XPMineFriendEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineFriendEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - } - cell.emptyTitle = self.type == 0 ? YMLocalizedString(@"XPMineGuildListVC1") : YMLocalizedString(@"XPMineGuildListVC3"); - return cell; -} -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ - if(self.dataList.count == 0)return; - XPMineGuildListModel *guildModel = self.dataList[indexPath.row]; - - if(self.type == 0){ - XPMineClanViewController * clanVC = [[XPMineClanViewController alloc] init]; - clanVC.uid = @(guildModel.clanElderUid).stringValue; - [self.navigationController pushViewController:clanVC animated:YES]; - return; - } - XPMineGuildViewController * hallVC = [[XPMineGuildViewController alloc] init]; - hallVC.ownerUid = @(guildModel.ownerUid).stringValue; - hallVC.guildId = @(guildModel.hallId).stringValue; - hallVC.delegate = self; - [self.navigationController pushViewController:hallVC animated:YES]; -} -#pragma mark- XPMineGuildViewControllerDelegate -- (void)applyHallSuccessHandleWithHallId:(NSString *)hallId{ - for (XPMineGuildListModel *guildModel in self.dataList) { - if([hallId isEqualToString:@(guildModel.hallId).stringValue]){ - guildModel.hallBtnStatus = 2; - break; - } - } - [self.tableView reloadData]; -} -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.showsVerticalScrollIndicator = NO; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;; - [_tableView registerClass:[XPMineGuildListCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGuildListCell class])]; - [_tableView registerClass:[XPMineFriendEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - - _tableView.backgroundColor = [UIColor whiteColor]; - - } - return _tableView; -} -- (XPMineGiveDiamondSearchView *)searchView{ - if (!_searchView){ - _searchView = [[XPMineGiveDiamondSearchView alloc]initWithFrame:CGRectZero]; - _searchView.delegate = self; - _searchView.isSearchHall = YES; - } - return _searchView; -} -- (NSMutableArray *)dataList{ - if (!_dataList){ - _dataList = [NSMutableArray array]; - } - return _dataList; -} -/* - #pragma mark - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - // Get the new view controller using [segue destinationViewController]. - // Pass the selected object to the new view controller. - } - */ - - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.h b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.h deleted file mode 100644 index a8ba88d..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// XPMineGuildSearchViewController.h -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@class XPMineGuildSearchViewController, ClanMemberInfoModel, GuildSearchUserInfoModel, GuildSearchSuperAdminModel; -typedef NS_ENUM(NSInteger, GuildSearchType) { - GuildSearchType_Clan_All_Member = 1, - ///公会增加新成员 - GuildSearchType_Guild_Add_Member, - ///家族设置超级管理员 - GuildSearchType_Clan_Add_Super_Admin, -}; - -@protocol XPMineGuildSearchViewControllerDelegate -@optional -///选中了某个用户 -- (void)xPMineGuildSearchViewController:(XPMineGuildSearchViewController *)viewController chooseUserInfo:(ClanMemberInfoModel *)memberInfo; -///邀请用户加入公会 -- (void)xPMineGuildSearchViewController:(XPMineGuildSearchViewController *)viewController inviteUserInfo:(GuildSearchUserInfoModel *)userInfo; -///邀请用户成为管理员 -- (void)xPMineGuildSearchViewController:(XPMineGuildSearchViewController *)viewController superAdminInfo:(GuildSearchSuperAdminModel *)superAdminInfo; -@end - -@interface XPMineGuildSearchViewController : MvpViewController -///代理 -@property (nonatomic,weak) id delegate; -///族长的uid -@property (nonatomic,copy) NSString *clanOwnerUid; -///搜索的类型 -@property (nonatomic,assign) GuildSearchType searchType; -@property(nonatomic,assign) BOOL isPush; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.m b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.m deleted file mode 100644 index 70d3e4b..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.m +++ /dev/null @@ -1,305 +0,0 @@ -// -// XPMineGuildSearchViewController.m -// YuMi -// -// Created by YuMi on 2022/4/7. -// - -#import "XPMineGuildSearchViewController.h" -///Third -#import -///Tool - -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" -///Model -#import "ClanMemberDetailInfoModel.h" -#import "GuildSearchUserInfoModel.h" -#import "GuildSearchSuperAdminModel.h" -///View -#import "XPGuildSearchNavView.h" -#import "XPClanMemberTableViewCell.h" -#import "XPMineGuildEmptyTableViewCell.h" -#import "XPMineGuildSearchMemberTableViewCell.h" -#import "XPGuildSearchSuperAdminTableViewCell.h" -#import "XPMineUserInfoViewController.h" -#import "XPMineGuildChooseManagerViewController.h" -#import "SessionViewController.h" -///P -#import "XPGuildSearchPresenter.h" -#import "XPGuildSearchProtocol.h" - - -@interface XPMineGuildSearchViewController () -///导航栏 -@property (nonatomic,strong) XPGuildSearchNavView *navView; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSArray *datasource; -@end - -@implementation XPMineGuildSearchViewController -- (BOOL)isHiddenNavBar { - return YES; -} -- (__kindof id)createPresenter { - return [[XPGuildSearchPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.navView]; - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.navView.mas_bottom); - }]; -} -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - if (self.searchType == GuildSearchType_Clan_All_Member) { - return 66; - } else if(self.searchType == GuildSearchType_Guild_Add_Member) { - return 80; - } else if(self.searchType == GuildSearchType_Clan_Add_Super_Admin) { - return 70; - } - return 0; - } - - return (KScreenHeight - kNavigationHeight); -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0 ) { - if (self.searchType == GuildSearchType_Clan_All_Member) { - XPClanMemberTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - if (cell == nil) { - cell = [[XPClanMemberTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - } - cell.cellType = ClanMemberTableViewCellType_Normal; - ClanMemberInfoModel * memberInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.memberInfo = memberInfo; - return cell; - }else if(self.searchType == GuildSearchType_Guild_Add_Member) { - XPMineGuildSearchMemberTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGuildSearchMemberTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineGuildSearchMemberTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineGuildSearchMemberTableViewCell class])]; - } - cell.delegate = self; - GuildSearchUserInfoModel * userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.userInfo = userInfo; - return cell; - } else if(self.searchType == GuildSearchType_Clan_Add_Super_Admin) { - XPGuildSearchSuperAdminTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPGuildSearchSuperAdminTableViewCell class])]; - if (cell == nil) { - cell = [[XPGuildSearchSuperAdminTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPGuildSearchSuperAdminTableViewCell class])]; - } - cell.delegate = self; - GuildSearchSuperAdminModel * userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.userInfo = userInfo; - return cell; - } - } - XPMineGuildEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineGuildEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineGuildEmptyTableViewCell class])]; - } - switch (self.searchType) { - case GuildSearchType_Clan_All_Member: - cell.emptyTitle = YMLocalizedString(@"XPMineGuildSearchViewController0"); - break; - - default: - break; - } - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - switch (self.searchType) { - case GuildSearchType_Clan_All_Member: - { - ClanMemberInfoModel * memberInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = memberInfo.uid.integerValue; - [((UINavigationController *)self.presentingViewController) pushViewController:userInfoVC animated:YES]; - [self dismissViewControllerAnimated:NO completion:nil]; - } - break; - case GuildSearchType_Guild_Add_Member: - { - GuildSearchUserInfoModel * userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = userInfo.uid.integerValue; - [((UINavigationController *)self.presentingViewController) pushViewController:userInfoVC animated:YES]; - [self dismissViewControllerAnimated:NO completion:nil]; - } - break; - default: - break; - } - } -} - -#pragma mark - XPClanMemberTableViewCellDelegate -- (void)xPClanMemberTableViewCell:(XPClanMemberTableViewCell *)view didClickUser:(ClanMemberInfoModel *)userinfo { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineGuildSearchViewController:chooseUserInfo:)]) { - [self.delegate xPMineGuildSearchViewController:self chooseUserInfo:userinfo]; - } -} - -#pragma mark - XPMineGuildSearchMemberTableViewCellDelegate -- (void)xPMineGuildSearchMemberTableViewCell:(XPMineGuildSearchMemberTableViewCell *)view didSelectInfo:(GuildSearchUserInfoModel *)userInfo { - if(userInfo.hallBtnStatus == 6){ - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:[NIMSession session:userInfo.hallMessageUid type:NIMSessionTypeP2P]]; - sessionVC.recordId = userInfo.hallRecordId; - [self.navigationController pushViewController:sessionVC animated:YES]; - return; - } - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineGuildSearchViewController:inviteUserInfo:)]) { - [self.delegate xPMineGuildSearchViewController:self inviteUserInfo:userInfo]; - } -} - -#pragma mark - XPGuildSearchNavView -- (void)xPGuildSearchNavView:(XPGuildSearchNavView *)view didClickBack:(UIButton *)sender { - if(self.isPush){ - [self.navigationController popViewControllerAnimated:YES]; - return; - } - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)xPGuildSearchNavView:(XPGuildSearchNavView *)view didClickSearch:(UIButton *)sender { - NSString * key = view.searchTextField.text; - if (key.length <= 0) { - [self showErrorToast:YMLocalizedString(@"XPMineGuildSearchViewController1")]; - return; - } - switch (self.searchType) { - case GuildSearchType_Clan_All_Member: - [self.presenter searchClanMemberList:self.clanOwnerUid key:key]; - break; - case GuildSearchType_Guild_Add_Member: - [self.presenter guildAddMemberSearch:key]; - break; - case GuildSearchType_Clan_Add_Super_Admin: - [self.presenter searchGuildSuperAdmin:key]; - break; - default: - break; - } -} - -#pragma mark - XPGuildSearchSuperAdminTableViewCellDelegate -- (void)xPGuildSearchSuperAdminTableViewCell:(XPGuildSearchSuperAdminTableViewCell *)cell didSelectInfo:(GuildSearchSuperAdminModel *)userInfo { - if (userInfo && !userInfo.hasSet) { - - NSString * message = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildSearchViewController2"), userInfo.nick, userInfo.erbanNo]; - TTAlertConfig * config =[[TTAlertConfig alloc] init]; - config.message = message; - - TTAlertMessageAttributedConfig * nickAttribute = [[TTAlertMessageAttributedConfig alloc] init]; - nickAttribute.text = userInfo.nick; - nickAttribute.color = [DJDKMIMOMColor appMainColor]; - - TTAlertMessageAttributedConfig * idAttribute = [[TTAlertMessageAttributedConfig alloc] init]; - idAttribute.text = userInfo.erbanNo; - idAttribute.color = [DJDKMIMOMColor appMainColor]; - config.messageAttributedConfig = @[nickAttribute, idAttribute]; - [TTPopup alertWithConfig:config confirmHandler:^{ - XPMineGuildChooseManagerViewController * managerRoomVC = [[XPMineGuildChooseManagerViewController alloc] init]; - managerRoomVC.clanId = self.clanOwnerUid; - managerRoomVC.targetUid = userInfo.uid; - [(UINavigationController *)self.presentingViewController pushViewController:managerRoomVC animated:YES]; - [self dismissViewControllerAnimated:YES completion:nil]; - } cancelHandler:^{ - - }]; - } -} - -#pragma mark - XPGuildSearchProtocol -- (void)searchClanMemberListSuccess:(NSArray *)memberList { - self.datasource = memberList; - [self.tableView reloadData]; -} - -- (void)guildAddMemberSearchSuccess:(NSArray *)memberList { - self.datasource = memberList; - [self.tableView reloadData]; -} - -- (void)searchGuildSuperAdminSuccess:(NSArray *)memberList { - self.datasource = memberList; - [self.tableView reloadData]; -} - -#pragma mark - Getters And Setters -- (void)setSearchType:(GuildSearchType)searchType { - _searchType = searchType; - switch (_searchType) { - case GuildSearchType_Clan_Add_Super_Admin: - self.navView.searchTextField.keyboardType = UIKeyboardTypeNumberPad; - self.navView.placeHolder = YMLocalizedString(@"XPMineGuildSearchViewController3"); - break; - - default: - break; - } -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPClanMemberTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - [_tableView registerClass:[XPMineGuildSearchMemberTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGuildSearchMemberTableViewCell class])]; - [_tableView registerClass:[XPGuildSearchSuperAdminTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPGuildSearchSuperAdminTableViewCell class])]; - } - return _tableView; -} - -- (XPGuildSearchNavView *)navView { - if (!_navView) { - _navView = [[XPGuildSearchNavView alloc] init]; - _navView.delegate = self; - } - return _navView; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.h b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.h deleted file mode 100644 index 7a2b88a..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPMineGuildViewController.h -// YuMi -// -// Created by YuMi on 2022/4/6. -// - -#import "MvpViewController.h" - -@protocol XPMineGuildViewControllerDelegate - --(void)applyHallSuccessHandleWithHallId:(NSString *_Nullable)hallId; - -@end - -NS_ASSUME_NONNULL_BEGIN -@interface XPMineGuildViewController : MvpViewController -@property (nonatomic,strong) NSString *ownerUid; -@property (nonatomic,strong) NSString *guildId; -@property(nonatomic,weak) iddelegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m deleted file mode 100644 index 0c3112e..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m +++ /dev/null @@ -1,934 +0,0 @@ -// -// XPMineGuildViewController.m -// YuMi -// -// Created by YuMi on 2022/4/6. -// 公会主页 - -#import "XPMineGuildViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "AccountInfoStorage.h" -#import "TTPopup.h" -#import "UIImage+Utils.h" -#import "XNDJTDDLoadingTool.h" -///Model -#import "ClanDetailInfoModel.h" -#import "ClanMemberDetailInfoModel.h" -#import "GuildAuthModel.h" -#import "GuildSearchUserInfoModel.h" -#import "XPMineGuildListModel.h" -///View -#import "XPClanMemberTableViewCell.h" -#import "XPClanSectionView.h" -#import "XPMineGuildSetNameViewController.h" -#import "XPMineGuildSearchViewController.h" -#import "XPMineGuildRemoveMemberViewController.h" -#import "XPMineMangerListViewController.h" -#import "XPMineGuildIncomeStatisViewController.h" -#import "XPMineHallAnchorIncomeStatisViewController.h" -#import "XPMineUserInfoViewController.h" -#import "XPMineMainGuildListVC.h" -#import "SessionViewController.h" -#import "XPNewMineGuildItemView.h" -#import "XPMineGuildPersonalBillStatisVC.h" -///P -#import "XPGuildPresenter.h" -#import "XPGuildProtocol.h" - -UIKIT_EXTERN NSString *kInviteMemeberSuccess; - -@interface XPMineGuildViewController () -///导航栏 -@property (nonatomic,strong) UIView * navView; -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -/// -@property (nonatomic,strong) UIStackView *rightStackView; -///编辑公会名称 -@property (nonatomic,strong) UIButton *editButton; -///退出房间 -@property (nonatomic,strong) UIButton *exitButton; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///顶部视图 -@property (nonatomic,strong) UIView * headerView; -///显示头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///显示id -@property (nonatomic,strong) UILabel *idLabel; -///背景图 -@property (nonatomic,strong) NetImageView *backImageView; - - -///当前页数 -@property (nonatomic,assign) int page; -///是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///区头 -@property (nonatomic,strong) XPClanSectionView *sectionView; -///家族信息 -@property (nonatomic,strong) ClanDetailInfoModel *clanDetailInfo; -///当前用户的家族信息 -@property (nonatomic,strong) ClanDetailInfoModel *currentUserClanInfo; -///权限 -@property (nonatomic,strong) NSArray *authList; -///管理权限的列表 -@property (nonatomic,strong) NSArray *managerAuthList; - -///加入公会 -@property (nonatomic,strong) TTActionSheetConfig *addGuildItem; - -///添加成员 -@property (nonatomic,strong) TTActionSheetConfig *addMemberItem; -///移除成员 -@property (nonatomic,strong) TTActionSheetConfig *removeMemberItem; - -///主播收入 -@property (nonatomic,strong) TTActionSheetConfig *singleIncomeItem; -///查看流水 -@property(nonatomic,strong) XPNewMineGuildItemView *checkView; -///成员收入 -@property(nonatomic,strong) XPNewMineGuildItemView *memberView; -///管理设置 -@property(nonatomic,strong) XPNewMineGuildItemView *managerView; -@property(nonatomic,strong) UIStackView *itemStackView; -///加入房间 -@property (nonatomic,strong) UIView *addRoomView; -/// -@property (nonatomic,strong) XPMineGuildListModel *stateModel; -@end - -@implementation XPMineGuildViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (XPGuildPresenter *)createPresenter { - return [[XPGuildPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initHeaderAndFooterRrfresh]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [self headerRefresh]; -} -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - if (self.guildId.length <= 0 || self.ownerUid.length <= 0) { - [self showErrorToast:YMLocalizedString(@"XPMineGuildViewController0")]; - [self.navigationController popViewControllerAnimated:YES]; - return; - } - self.page = 1; - [self.presenter applyHallBtnStateWithHallId:self.guildId]; - [self.presenter getClanDetailInfo:self.ownerUid currentUserUid:[AccountInfoStorage instance].getUid]; - [self.presenter getGuildMemberList:self.guildId page:self.page pageSize:20 state:0]; -} - -- (void)footerRefresh { - if (self.guildId.length <= 0 || self.ownerUid.length <= 0) { - [self showErrorToast:YMLocalizedString(@"XPMineGuildViewController1")]; - [self.navigationController popViewControllerAnimated:YES]; - return; - } - - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMineGuildViewController2")]; - [self.tableView.mj_footer endRefreshing]; - return; - } - self.page++; - [self.presenter getGuildMemberList:self.guildId page:self.page pageSize:20 state:1]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.backImageView]; - UIView *view = [UIView new]; - view.backgroundColor = [UIColor whiteColor]; - [self.view addSubview:view]; - [view mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.view); - make.height.mas_equalTo(KScreenHeight - 297); - }]; - [self.view addSubview:self.tableView]; - - - - [self.view addSubview:self.navView]; - [self.navView addSubview:self.backButton]; - [self.navView addSubview:self.titleLabel]; - [self.navView addSubview:self.rightStackView]; - - - - - [self.rightStackView addArrangedSubview:self.exitButton]; - [self.rightStackView addArrangedSubview:self.editButton]; - - [self.headerView addSubview:self.avatarImageView]; - [self.headerView addSubview:self.idLabel]; - - [self.headerView addSubview:self.itemStackView]; - [self.itemStackView addArrangedSubview:self.checkView]; - [self.itemStackView addArrangedSubview:self.memberView]; - - [self.itemStackView addArrangedSubview:self.managerView]; - self.headerView.frame = CGRectMake(0, 0, KScreenWidth, 285); - self.tableView.tableHeaderView = self.headerView; - - - [self.view addSubview:self.addRoomView]; - @kWeakify(self); - self.addMemberItem.clickAction = ^{ - @kStrongify(self); - XPMineGuildSearchViewController * searchVC = [[XPMineGuildSearchViewController alloc] init]; - searchVC.modalPresentationStyle = UIModalPresentationOverFullScreen; - searchVC.searchType = GuildSearchType_Guild_Add_Member; - searchVC.delegate = self; - searchVC.isPush = YES; - [self.navigationController pushViewController:searchVC animated:YES]; - }; - - self.removeMemberItem.clickAction = ^{ - @kStrongify(self); - XPMineGuildRemoveMemberViewController * removeVC = [[XPMineGuildRemoveMemberViewController alloc] init]; - removeVC.guildId = self.clanDetailInfo.hall.hallId; - [self.navigationController pushViewController:removeVC animated:YES]; - }; - - - self.singleIncomeItem.clickAction = ^{ - @kStrongify(self); - XPMineHallAnchorIncomeStatisViewController * managerList = [[XPMineHallAnchorIncomeStatisViewController alloc] init]; - managerList.hallId = self.clanDetailInfo.hall.hallId; - [self.navigationController pushViewController:managerList animated:YES]; - }; - self.addGuildItem.clickAction = ^{ - @kStrongify(self); - XPMineMainGuildListVC *vc = [XPMineMainGuildListVC new]; - vc.isFromHall = YES; - [self.navigationController pushViewController:vc animated:YES]; - }; - - -} - -- (void)initSubViewConstraints { - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.view); - }]; - [self.addRoomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(98)); - make.leading.trailing.bottom.equalTo(self.view); - - }]; - - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).mas_offset(10); - make.top.mas_equalTo(statusbarHeight); - make.height.width.mas_equalTo(44); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backButton.mas_trailing); - make.trailing.mas_equalTo(self.rightStackView.mas_leading); - make.centerY.mas_equalTo(self.backButton); - }]; - - [self.rightStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.navView).offset(-15); - make.centerY.mas_equalTo(self.backButton); - }]; - - [self.exitButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(70); - make.height.mas_equalTo(22); - }]; - - [self.editButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(22); - make.height.mas_equalTo(22); - }]; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(390); - }]; - - - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(70, 70)); - make.centerX.mas_equalTo(self.headerView); - make.top.mas_equalTo(self.headerView).offset(66 + kSafeAreaTopHeight); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.headerView); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(10); - }]; - CGFloat spacing = (KScreenWidth - 112*3)/4; - [self.itemStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(spacing); - make.trailing.mas_equalTo(-spacing); - make.top.mas_equalTo(221); - make.height.mas_equalTo(52); - }]; - CGFloat width = 112; - [self.checkView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(52); - make.width.mas_equalTo(width); - - }]; - [self.memberView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(52); - make.width.mas_equalTo(width); - }]; - [self.managerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(52); - make.width.mas_equalTo(width); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPClanMemberTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - if (cell == nil) { - cell = [[XPClanMemberTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - } - cell.pi_IsClan = YES; - cell.cellType = ClanMemberTableViewCellType_Normal; - cell.pi_IsClan = YES; - ClanMemberInfoModel * memberInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.memberInfo = memberInfo; - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 66; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - return self.datasource.count > 0 ? 37 : 0.1; -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - if (section == 0) { - if (self.sectionView == nil) { - XPClanSectionView * sectionView = [[XPClanSectionView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 37)]; - sectionView.delegate = self; - sectionView.pi_IsClan = YES; - sectionView.isTopCor = YES; - self.sectionView = sectionView; - } - return self.sectionView; - } - return [UIView new]; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - return 0.01f; -} - -- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{ - return [[UIView alloc]init]; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - ClanMemberInfoModel * memberInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = memberInfo.uid.integerValue; - [self.navigationController pushViewController:userInfoVC animated:YES]; - } -} - -#pragma mark - XPMineGuildSearchViewControllerDelegate -- (void)xPMineGuildSearchViewController:(XPMineGuildSearchViewController *)viewController inviteUserInfo:(GuildSearchUserInfoModel *)userInfo { - if (userInfo && userInfo.uid.length > 0) { - NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildViewController3"), userInfo.nick,self.clanDetailInfo.hall.hallName]; - TTAlertMessageAttributedConfig * inviteAlertConfig = [[TTAlertMessageAttributedConfig alloc] init]; - inviteAlertConfig.text = userInfo.nick; - inviteAlertConfig.color = [DJDKMIMOMColor appMainColor]; - inviteAlertConfig.font = [UIFont systemFontOfSize:15]; - - TTAlertMessageAttributedConfig * hallNameAlertConfig = [[TTAlertMessageAttributedConfig alloc] init]; - hallNameAlertConfig.text = self.clanDetailInfo.hall.hallName; - hallNameAlertConfig.color = [DJDKMIMOMColor appMainColor]; - hallNameAlertConfig.font = [UIFont systemFontOfSize:15]; - - NSArray * array = @[inviteAlertConfig, hallNameAlertConfig]; - TTAlertConfig * alerconfig= [[TTAlertConfig alloc] init]; - alerconfig.message = title; - alerconfig.messageAttributedConfig = array; - alerconfig.title = YMLocalizedString(@"XPMineGuildViewController4"); - [TTPopup alertWithConfig:alerconfig confirmHandler:^{ - [self.presenter inviteMember:userInfo.uid hallId:self.clanDetailInfo.hall.hallId]; - } cancelHandler:^{ - - }]; - } -} - -#pragma mark - XPClanSectionView -- (void)xPClanSectionView:(XPClanSectionView *)view didClickSearch:(UIButton *)sender { - XPMineGuildSearchViewController * searchVC = [[XPMineGuildSearchViewController alloc] init]; - searchVC.modalPresentationStyle = UIModalPresentationOverFullScreen; - searchVC.searchType = GuildSearchType_Clan_All_Member; - searchVC.clanOwnerUid = self.clanDetailInfo.hall.ownerUid; - [self.navigationController presentViewController:searchVC animated:YES completion:nil]; -} - -- (void)xPClanSectionView:(XPClanSectionView *)view didClickManager:(UIButton *)sender { - if (self.managerAuthList.count > 0) { - [TTPopup actionSheetWithItems:self.managerAuthList]; - } -} - -#pragma mark -XPClanProtocol -- (void)applyHallBtnStateSuccess:(XPMineGuildListModel *)model{ - self.stateModel = model; - [self setApplyBut:self.stateModel.hallBtnStatus]; -} --(void)applyHallSuccess{ - self.stateModel.hallBtnStatus = 2; - [self setApplyBut:self.stateModel.hallBtnStatus]; - [self showSuccessToast:YMLocalizedString(@"XPMineGuildListVC4")]; - if(self.delegate && [self.delegate respondsToSelector:@selector(applyHallSuccessHandleWithHallId:)]){ - [self.delegate applyHallSuccessHandleWithHallId:self.guildId]; - } -} --(void)applyHallFail{ - -} -- (void)getGuildMemberListSuccess:(ClanMemberDetailInfoModel *)memberInfo state:(int)state { - self.sectionView.title = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildViewController5"), memberInfo.count]; - if (state == 0) { - self.hasNoMoreData = NO; - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - - if (memberInfo.members.count > 0) { - [self.datasource addObjectsFromArray:memberInfo.members]; - } else { - self.hasNoMoreData = YES; - } - [self.tableView reloadData]; -} - -- (void)getGuildMemberListFail:(NSString *)msg state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -- (void)getClanDetailInfoSuccess:(ClanDetailInfoModel *)clanDetailInfo currentUserClanInfo:(ClanDetailInfoModel *)currentUserClanInfo { - self.clanDetailInfo = clanDetailInfo; - self.currentUserClanInfo = currentUserClanInfo; - self.avatarImageView.imageUrl = clanDetailInfo.hall.ownerAvatar; - self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildViewController6"),clanDetailInfo.hall.ownerErbanNo]; - [self.backImageView loadImageWithUrl:clanDetailInfo.hall.ownerAvatar completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - self.backImageView.image = [UIImage setBlurImage:image value:1]; - }]; - self.titleLabel.text = clanDetailInfo.hall.hallName; - if (clanDetailInfo.manageHall) { - self.sectionView.isHiddenSearch = NO; - self.editButton.hidden = NO; - self.exitButton.hidden = YES; - self.sectionView.isHiddenManager = NO; - ///请求权限 - [self.presenter getUserInGuildRoomAuth:self.guildId]; - } else { - if ([clanDetailInfo.hall.hallId isEqualToString:currentUserClanInfo.hall.hallId]) { - self.sectionView.isHiddenSearch = NO; - GuildInfoModel * hallInfo = currentUserClanInfo.hall; - if (hallInfo.roleType == GuildRoleType_Super_Admin || hallInfo.roleType == GuildRoleType_Owner) { - self.editButton.hidden = NO; - self.exitButton.hidden = YES; - self.sectionView.isHiddenManager = NO; - ///请求权限 - [self.presenter getUserInGuildRoomAuth:self.guildId]; - } else if(hallInfo.roleType == GuildRoleType_Manager){ - self.editButton.hidden = YES; - self.exitButton.hidden = NO; - [self.presenter getUserInGuildRoomAuth:self.guildId]; - } else { - self.sectionView.isHiddenManager = YES; - self.editButton.hidden = YES; - self.exitButton.hidden = NO; - } - } else { - self.sectionView.isHiddenSearch = YES; - self.editButton.hidden = YES; - self.exitButton.hidden = YES; - } - } -} - -- (void)getUserInGuildRoomAuthSuccess:(NSArray *)authList { - self.authList = authList; - NSMutableArray * array = [NSMutableArray array]; - if ([self.clanDetailInfo.hall.hallId isEqualToString:self.currentUserClanInfo.hall.hallId] ) { - GuildInfoModel * hallInfo = self.currentUserClanInfo.hall; - if(hallInfo.roleType == GuildRoleType_Owner && self.currentUserClanInfo.clan.cid == nil) { - self.addGuildItem.title = YMLocalizedString(@"XPMineGuildViewController12"); - [array addObject:self.addGuildItem]; - } - - } - [self.authList enumerateObjectsUsingBlock:^(GuildAuthModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (![obj.code isEqualToString:@"hall_build"]&& ![obj.code isEqualToString:@"hall_exit"] && ![obj.code isEqualToString:@"guild_income"] && obj.status == 1) { - if ([obj.code isEqualToString:@"member_join_manager"]) { - self.addMemberItem.title = obj.name; - [array addObject:self.addMemberItem]; - } else if ([obj.code isEqualToString:@"member_exit_manager"]) { - self.removeMemberItem.title = obj.name; - [array addObject:self.removeMemberItem]; - }else if ([obj.code isEqualToString:@"look_hall_income"]) { - self.memberView.text = obj.name; - self.memberView.hidden = NO; - }else if ([obj.code isEqualToString:@"single_room_income"]) { - self.singleIncomeItem.title = obj.name; - [array addObject:self.singleIncomeItem]; - }else if ([obj.code isEqualToString:@"hall_manager_set"]) { - self.managerView.text = obj.name; - self.managerView.hidden = NO; - }else if ([obj.code isEqualToString:@"hall_serial"]) { - self.checkView.hidden = NO; - } - } - }]; - self.managerAuthList = array.copy; - self.sectionView.isHiddenManager = self.managerAuthList.count <= 0; -} - -- (void)inviteMemeberSuccessWithTargetUid:(NSString *)targetUid { - [[NSNotificationCenter defaultCenter]postNotificationName:kInviteMemeberSuccess object:targetUid]; - [self showSuccessToast:YMLocalizedString(@"XPMineGuildViewController7")]; -} - -- (void)quitGuildRoomSuccess { - [self showSuccessToast:YMLocalizedString(@"XPMineGuildViewController8")]; -} - -#pragma mark - Event Response -- (void)backButtonAction:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} --(void)addRoomAction{ - if(self.stateModel.hallBtnStatus == 2)return; - if(self.stateModel.hallBtnStatus == 3){ - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:[NIMSession session:self.stateModel.hallMessageUid type:NIMSessionTypeP2P]]; - sessionVC.isUser = YES; - sessionVC.recordId = self.stateModel.recordId; - [self.navigationController pushViewController:sessionVC animated:YES]; - return; - } - [self.presenter applyHallWithHallId:self.guildId]; -} -- (void)exitButtonAction:(UIButton *)sender { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - NSString * highlight = YMLocalizedString(@"XPMineGuildViewController9"); - NSString * message = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildViewController10"), highlight]; - config.message = message; - TTAlertMessageAttributedConfig * attribute = [[TTAlertMessageAttributedConfig alloc] init]; - attribute.text = highlight; - attribute.color = [DJDKMIMOMColor appMainColor]; - config.messageAttributedConfig = @[attribute]; - [TTPopup alertWithConfig:config confirmHandler:^{ - [self.presenter quitGuildRoom]; - } cancelHandler:^{ - - }]; -} - -- (void)editButtonAction:(UIButton *)sender { - if (self.clanDetailInfo.hall && self.clanDetailInfo.hall.hallId.length > 0) { - XPMineGuildSetNameViewController * setNameVC = [[XPMineGuildSetNameViewController alloc] init]; - setNameVC.roomName = self.clanDetailInfo.hall.hallName; - setNameVC.hallId = self.clanDetailInfo.hall.hallId; - [self.navigationController pushViewController:setNameVC animated:YES]; - } -} - -- (void)didTapRecognizer { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = self.clanDetailInfo.hall.ownerUid.integerValue; - [self.navigationController pushViewController:userInfoVC animated:YES]; -} -///复制id --(void)copyNameAction{ - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPMineUserInfoHeaderView0")]; - UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; - pasteboard.string = self.clanDetailInfo.hall.ownerErbanNo; -} - -///设置申请bug --(void)setApplyBut:(int)status{ - UIButton *addRoomBtn = (UIButton *)[self.addRoomView viewWithTag:200001]; - switch (status) { - case 0: - { - self.addRoomView.hidden = YES; - break; - } - case 1: - { - [addRoomBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - addRoomBtn.backgroundColor = [UIColor clearColor]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"mine_guild_add_room"]; - attachment.bounds = CGRectMake(0, roundf(addRoomBtn.titleLabel.font.capHeight - kGetScaleWidth(12))/2.f, kGetScaleWidth(12), kGetScaleWidth(12)); - attachment.image = iconImage; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@" %@",YMLocalizedString(@"XPMineClanViewController2")] attributes:@{NSForegroundColorAttributeName:[UIColor whiteColor],NSFontAttributeName:[UIFont systemFontOfSize:16]}]; - [textAtt insertAttributedString:[NSMutableAttributedString attributedStringWithAttachment:attachment] atIndex:0]; - [addRoomBtn setAttributedTitle:textAtt forState:UIControlStateNormal]; - - - self.addRoomView.hidden = NO; - break; - } - case 2: - { - addRoomBtn.backgroundColor = UIColorFromRGB(0xE6E6F0); - [addRoomBtn setBackgroundImage:nil forState:UIControlStateNormal]; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@" %@",YMLocalizedString(@"XPMineGuildListCell5")] attributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0xB3B3C3),NSFontAttributeName:[UIFont systemFontOfSize:16]}]; - [addRoomBtn setAttributedTitle:textAtt forState:UIControlStateNormal]; - - - self.addRoomView.hidden = NO; - break; - } - case 3: - { - addRoomBtn.backgroundColor = UIColorFromRGB(0xFFBC51); - [addRoomBtn setBackgroundImage:nil forState:UIControlStateNormal]; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@" %@",YMLocalizedString(@"XPMineGuildListCell6")] attributes:@{NSForegroundColorAttributeName:[UIColor whiteColor],NSFontAttributeName:[UIFont systemFontOfSize:16]}]; - [addRoomBtn setAttributedTitle:textAtt forState:UIControlStateNormal]; - self.addRoomView.hidden = NO; - break; - } - default: - break; - } -} --(void)checkBillAction{ - XPMineGuildPersonalBillStatisVC *billVC = [[XPMineGuildPersonalBillStatisVC alloc]init]; - billVC.guildId = self.clanDetailInfo.hall.hallId; - [self.navigationController pushViewController:billVC animated:YES]; -} --(void)checkMemberIncomeAction{ - XPMineGuildIncomeStatisViewController * personIncomeVC = [[XPMineGuildIncomeStatisViewController alloc] init]; - personIncomeVC.hallId = self.clanDetailInfo.hall.hallId; - [self.navigationController pushViewController:personIncomeVC animated:YES]; -} --(void)checkManagerSetAction{ - XPMineMangerListViewController * managerList = [[XPMineMangerListViewController alloc] init]; - managerList.guildId = self.clanDetailInfo.hall.hallId; - [self.navigationController pushViewController:managerList animated:YES]; -} - -#pragma mark - Getters And Setters - -- (UIView *)navView { - if (!_navView) { - _navView = [[UIView alloc] init]; - _navView.backgroundColor = [UIColor clearColor]; - } - return _navView; -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"home_search_white_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backButton setImage:[[UIImage imageNamed:@"home_search_white_back"]ms_SetImageForRTL] forState:UIControlStateSelected]; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:17]; - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} - -- (UIStackView *)rightStackView { - if (!_rightStackView) { - _rightStackView = [[UIStackView alloc] init]; - _rightStackView.axis = UILayoutConstraintAxisHorizontal; - _rightStackView.distribution = UIStackViewDistributionFill; - _rightStackView.alignment = UIStackViewAlignmentCenter; - _rightStackView.spacing = 0; - } - return _rightStackView; -} - -- (UIButton *)exitButton { - if (!_exitButton) { - _exitButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_exitButton setTitle:YMLocalizedString(@"XPMineGuildViewController11") forState:UIControlStateNormal]; - [_exitButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _exitButton.titleLabel.font = [UIFont systemFontOfSize:16]; - _exitButton.hidden = YES; - [_exitButton addTarget:self action:@selector(exitButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_exitButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _exitButton; -} - -- (UIButton *)editButton { - if (!_editButton) { - _editButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_editButton setImage:[UIImage imageNamed:@"mine_guild_guild_edit"] forState:UIControlStateNormal]; - [_editButton setImage:[UIImage imageNamed:@"mine_guild_guild_edit"] forState:UIControlStateSelected]; - [_editButton addTarget:self action:@selector(editButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _editButton.hidden = YES; - [_editButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _editButton; -} - -- (UIView *)headerView { - if (!_headerView) { - _headerView = [[UIView alloc] init]; - _headerView.backgroundColor = [UIColor clearColor]; - } - return _headerView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 70/2; - _avatarImageView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapRecognizer)]; - [_avatarImageView addGestureRecognizer:tap]; - } - return _avatarImageView; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:13]; - _idLabel.textColor = [UIColor whiteColor]; - _idLabel.textAlignment = NSTextAlignmentCenter; - _idLabel.userInteractionEnabled = YES; - UILongPressGestureRecognizer *longPress = [[ UILongPressGestureRecognizer alloc]initWithTarget:self action:@selector(copyNameAction)]; - longPress.minimumPressDuration = 1; - [_idLabel addGestureRecognizer:longPress]; - } - return _idLabel; -} - -- (NetImageView *)backImageView { - if (!_backImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - _backImageView = [[NetImageView alloc] initWithConfig:config]; - _backImageView.contentMode = UIViewContentModeScaleAspectFill; - _backImageView.layer.masksToBounds = YES; - _backImageView.userInteractionEnabled = YES; - } - return _backImageView; -} - - - - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; - _tableView.delegate = self; - _tableView.dataSource = self; - UIView * footView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(98))]; - footView.backgroundColor = [UIColor clearColor]; - _tableView.tableFooterView = footView; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.showsVerticalScrollIndicator = NO; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPClanMemberTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPClanMemberTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -- (TTActionSheetConfig *)addMemberItem { - if (!_addMemberItem) { - _addMemberItem = [[TTActionSheetConfig alloc] init]; - _addMemberItem.titleColor = [DJDKMIMOMColor alertTitleColor]; - } - return _addMemberItem; -} - -- (TTActionSheetConfig *)removeMemberItem { - if (!_removeMemberItem) { - _removeMemberItem = [[TTActionSheetConfig alloc] init]; - _removeMemberItem.titleColor = [DJDKMIMOMColor alertTitleColor]; - } - return _removeMemberItem; -} - - - -- (TTActionSheetConfig *)singleIncomeItem { - if (!_singleIncomeItem) { - _singleIncomeItem = [[TTActionSheetConfig alloc] init]; - _singleIncomeItem.titleColor = [DJDKMIMOMColor alertTitleColor]; - } - return _singleIncomeItem; -} --(TTActionSheetConfig *)addGuildItem{ - if (!_addGuildItem){ - _addGuildItem = [[TTActionSheetConfig alloc] init]; - _addGuildItem.titleColor = [DJDKMIMOMColor alertTitleColor]; - } - return _addGuildItem; -} - -- (XPNewMineGuildItemView *)checkView{ - if(!_checkView){ - _checkView = [[XPNewMineGuildItemView alloc]initWithFrame:CGRectZero]; - _checkView.bgImage = kImage(@"mine_guild_guild_check"); - _checkView.text = YMLocalizedString(@"XPGuildHeaderView4"); - _checkView.hidden = YES; - _checkView.textColor = UIColorFromRGB(0x308BE0); - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(checkBillAction)]; - [_checkView addGestureRecognizer:tap]; - } - return _checkView; -} -- (XPNewMineGuildItemView *)memberView{ - if(!_memberView){ - _memberView = [[XPNewMineGuildItemView alloc]initWithFrame:CGRectZero]; - _memberView.bgImage = kImage(@"mine_guild_guild_meber"); - _memberView.textColor = UIColorFromRGB(0xE1489B); - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(checkMemberIncomeAction)]; - [_memberView addGestureRecognizer:tap]; - _memberView.hidden = YES; - } - return _memberView; -} -- (XPNewMineGuildItemView *)managerView{ - if(!_managerView){ - _managerView = [[XPNewMineGuildItemView alloc]initWithFrame:CGRectZero]; - _managerView.textColor = UIColorFromRGB(0x8843E0); - _managerView.bgImage = kImage(@"mine_guild_guild_manager"); - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(checkManagerSetAction)]; - [_managerView addGestureRecognizer:tap]; - _managerView.hidden = YES; - } - return _managerView; -} -- (UIStackView *)itemStackView { - if (!_itemStackView) { - _itemStackView = [[UIStackView alloc] init]; - _itemStackView.axis = UILayoutConstraintAxisHorizontal; - _itemStackView.distribution = UIStackViewDistributionFill; - _itemStackView.alignment = UIStackViewAlignmentLeading; - CGFloat spacing = (KScreenWidth - 112*3)/4; - _itemStackView.spacing = spacing; - } - return _itemStackView; -} -- (UIView *)addRoomView{ - if (!_addRoomView){ - _addRoomView = [UIView new]; - _addRoomView.backgroundColor = [UIColor clearColor]; - _addRoomView.hidden = YES; - UIButton *addRoomBtn = [UIButton new]; - addRoomBtn.tag = 200001; - addRoomBtn.titleLabel.font = [UIFont systemFontOfSize:16]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(345, 46)]; - [addRoomBtn addTarget:self action:@selector(addRoomAction) forControlEvents:UIControlEventTouchUpInside]; - [addRoomBtn setBackgroundImage:image forState:UIControlStateNormal]; - addRoomBtn.layer.cornerRadius = kGetScaleWidth(23); - addRoomBtn.layer.masksToBounds = YES; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"mine_guild_add_room"]; - attachment.bounds = CGRectMake(0, roundf(addRoomBtn.titleLabel.font.capHeight - kGetScaleWidth(12))/2.f, kGetScaleWidth(12), kGetScaleWidth(12)); - attachment.image = iconImage; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@" %@",YMLocalizedString(@"XPMineClanViewController2")] attributes:@{NSForegroundColorAttributeName:[UIColor whiteColor],NSFontAttributeName:[UIFont systemFontOfSize:16]}]; - [textAtt insertAttributedString:[NSMutableAttributedString attributedStringWithAttachment:attachment] atIndex:0]; - [addRoomBtn setAttributedTitle:textAtt forState:UIControlStateNormal]; - [_addRoomView addSubview:addRoomBtn]; - [addRoomBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(58)); - make.leading.mas_equalTo(kGetScaleWidth(58)); - make.top.mas_equalTo(kGetScaleWidth(9)); - make.height.mas_equalTo(kGetScaleWidth(46)); - }]; - - } - return _addRoomView; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineMainGuildListVC.h b/YuMi/Modules/YMMine/View/Guild/View/XPMineMainGuildListVC.h deleted file mode 100644 index 9ecafe3..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineMainGuildListVC.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPMineMainGuildListVC.h -// YuMi -// -// Created by YuMi on 2022/11/3. -// - -#import -#import -#import -#import "MvpViewController.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineMainGuildListVC : MvpViewController -@property (nonatomic,assign) BOOL isFromHall; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineMainGuildListVC.m b/YuMi/Modules/YMMine/View/Guild/View/XPMineMainGuildListVC.m deleted file mode 100644 index 6b33895..0000000 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineMainGuildListVC.m +++ /dev/null @@ -1,153 +0,0 @@ -// -// XPMineMainGuildListVC.m -// YuMi -// -// Created by YuMi on 2022/11/3. -// -#import -#import -#import -#import "XPMineMainGuildListVC.h" -#import "XPMineGuildListVC.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "YUMIMacroUitls.h" -///Third -#import -@interface XPMineMainGuildListVC() -@property (nonatomic, strong) JXCategoryTitleView *titleView; -@property (nonatomic, strong) JXCategoryIndicatorImageView *lineView; -@property (nonatomic, strong) JXPagerView *pagingView; -@property (nonatomic,strong) UIView *headView; -@property (nonatomic, strong) NSArray *titles; -//公会 -@property (nonatomic,strong) XPMineGuildListVC *gulidVC; -//房间 -@property (nonatomic,strong) XPMineGuildListVC *roomVC; -@end - -@implementation XPMineMainGuildListVC - - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - -} -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPMineGuildListVC0"); - self.headView = [UIView new]; - [self.view addSubview:self.pagingView]; - -} -- (void)initSubViewConstraints { - [self.pagingView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); - }]; -} - -#pragma mark - JXCategoryViewDelegate -- (NSUInteger)tableHeaderViewHeightInPagerView:(JXPagerView *)pagerView { - return 0; -} -- (UIView *)tableHeaderViewInPagerView:(JXPagerView *)pagerView { - return self.headView; -} -- (NSUInteger)heightForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return kGetScaleWidth(44); -} - -- (UIView *)viewForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return self.titleView; -} - -- (NSInteger)numberOfListsInPagerView:(JXPagerView *)pagerView { - return self.titles.count; -} - - -- (id)pagerView:(JXPagerView *)pagerView initListAtIndex:(NSInteger)index { - UIViewController *viewController; - if (index == 0) { - return self.gulidVC; - } else{ - return self.roomVC; - } - - - return (id )viewController; -} -#pragma mark - 懒加载 -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMineMainGuildListVC0"), YMLocalizedString(@"XPMineMainGuildListVC1")]; - } - return _titles; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = UIColorFromRGB(0x6D6B89); - _titleView.titleSelectedColor = UIColorFromRGB(0x1F1A4E); - _titleView.titleFont = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _titleView.titleSelectedFont = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.averageCellSpacingEnabled = NO; - - _titleView.cellWidth = KScreenWidth / 2 - 20 ; - _titleView.contentEdgeInsetLeft = 0; - _titleView.contentEdgeInsetRight = 0; - _titleView.titles = self.titles; - _titleView.listContainer = (id)self.pagingView.listContainerView; - - JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.indicatorImageViewSize = CGSizeMake(16, 3); - lineView.verticalMargin = 10; - lineView.indicatorImageView.image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(16, 3)]; - lineView.indicatorImageView.layer.masksToBounds = YES; - lineView.indicatorImageView.layer.cornerRadius = 1.5; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (JXPagerView *)pagingView { - if (!_pagingView) { - _pagingView = [[JXPagerView alloc] initWithDelegate:self listContainerType:0]; - _pagingView.backgroundColor = [UIColor clearColor]; - _pagingView.listContainerView.backgroundColor = [UIColor clearColor]; - _pagingView.mainTableView.backgroundColor = [UIColor clearColor]; - _pagingView.listContainerView.listCellBackgroundColor = UIColor.clearColor; - _pagingView.mainTableView.gestureDelegate = self; - _pagingView.pinSectionHeaderVerticalOffset = 0; - - [_pagingView.mainTableView.panGestureRecognizer requireGestureRecognizerToFail:self.navigationController.interactivePopGestureRecognizer]; - } - return _pagingView; -} --(XPMineGuildListVC *)gulidVC{ - if (!_gulidVC){ - _gulidVC = [[XPMineGuildListVC alloc]init]; - _gulidVC.type = 0; - _gulidVC.isFromHall = self.isFromHall; - } - return _gulidVC; -} --(XPMineGuildListVC *)roomVC{ - if (!_roomVC){ - _roomVC = [[XPMineGuildListVC alloc]init]; - _roomVC.type = 1; - _roomVC.isFromHall = self.isFromHall; - - } - return _roomVC; -} -@end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.h b/YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.h deleted file mode 100644 index dcb4cd5..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPIncomeRecordPresent.h -// YuMi -// -// Created by YuMi on 2022/11/17. -// - -#import -#import "BaseMvpPresenter.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPIncomeRecordPresent : BaseMvpPresenter -///获取收益记录 --(void)requestRecordIncome; -///获取兑换钻石 --(void)getExchangeDiamondInformation; -///确认兑换钻石 --(void)confirmExchangeDiamondWithGoldNum:(NSString *)goldNum diamondNum:(NSString *)diamondNum currency:(NSString *)currency; -///金币明细 --(void)getGoldDetailsDataWithStartTime:(NSString *)startTime endTime:(NSString *)endTime; --(void)requestQueryWithRoomType; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.m b/YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.m deleted file mode 100644 index 694b480..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/Presenter/XPIncomeRecordPresent.m +++ /dev/null @@ -1,68 +0,0 @@ -// -// XPIncomeRecordPresent.m -// YuMi -// -// Created by YuMi on 2022/11/17. -// - -#import "XPIncomeRecordPresent.h" -///Api -#import "Api+Mine.h" -///tool -#import "DESEncrypt.h" -///Protocol -#import "XPIncomeRecordProtocol.h" -///model -#import "XPIncomeRecordModel.h" -#import "XPExchangeDiamondsModel.h" -#import "XPIncomeRecordGoldDetailsModel.h" -@implementation XPIncomeRecordPresent -- (id)getView { - return ((id) [super getView]); -} --(void)requestQueryWithRoomType{ - @kWeakify(self); - [Api requestQueryWithRoomType:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - XPIncomeRecordModel *model = [XPIncomeRecordModel modelWithDictionary:data.data]; - [[self getView]getRecordIncomeSuccess:model]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView]requestQueryWithRoomTypeFail]; - } showLoading:YES errorToast:NO]]; -} --(void)requestRecordIncome{ - [Api requestRecordIncome:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - XPIncomeRecordModel *model = [XPIncomeRecordModel modelWithDictionary:data.data]; - [[self getView]getRecordIncomeSuccess:model]; - } showLoading:YES]]; -} --(void)getExchangeDiamondInformation{ - @kWeakify(self); - [Api getExchangeDiamondInformation:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - XPExchangeDiamondsModel *model = [XPExchangeDiamondsModel modelWithDictionary:data.data]; - XPExchangeDiamondsModel *tempModel = [XPExchangeDiamondsModel modelWithDictionary:data.data]; - model.golds = tempModel.diamonds; - model.diamonds = tempModel.golds; - [[self getView] getExchangeDiamondInformation:model]; - } showLoading:YES]]; -} --(void)confirmExchangeDiamondWithGoldNum:(NSString *)goldNum diamondNum:(NSString *)diamondNum currency:(NSString *)currency{ - @kWeakify(self); - [Api confirmExchangeDiamond:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView]confirmExchangeDiamondSuccessWithDiamondNum:diamondNum goldNum:goldNum]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] confirmExchangeDiamondFail]; - } showLoading:YES errorToast:YES] goldNum:goldNum diamondNum:diamondNum currency:currency]; -} - --(void)getGoldDetailsDataWithStartTime:(NSString *)startTime endTime:(NSString *)endTime{ - [Api getGoldDetailsData:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - XPIncomeRecordGoldDetailsModel *model = [XPIncomeRecordGoldDetailsModel modelWithDictionary:data.data]; - [[self getView]getGoldDetailsDataSuccess:model]; - } showLoading:YES errorToast:YES] startTime:startTime endTime:endTime]; -} -@end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/Protocol/XPIncomeRecordProtocol.h b/YuMi/Modules/YMMine/View/IncomeRecord/Protocol/XPIncomeRecordProtocol.h deleted file mode 100644 index 3560548..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/Protocol/XPIncomeRecordProtocol.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// XPIncomeRecordProtocol.h -// YuMi -// -// Created by YuMi on 2022/11/17. -// - -#import -@class XPIncomeRecordModel,XPExchangeDiamondsModel,XPBindExtractInfoModel,XPWithdrawAccountModel,XPIncomeRecordGoldDetailsModel; -NS_ASSUME_NONNULL_BEGIN - -@protocol XPIncomeRecordProtocol -@optional -///收益记录成功 --(void)getRecordIncomeSuccess:(XPIncomeRecordModel *)model; -///获取兑换钻石信息成功 --(void)getExchangeDiamondInformation:(XPExchangeDiamondsModel *)model; -///确认兑换成功 --(void)confirmExchangeDiamondSuccessWithDiamondNum:(NSString *)diamondNum goldNum:(NSString *)goldNum ; -///确认兑换失败 --(void)confirmExchangeDiamondFail; -///金币明细 --(void)getGoldDetailsDataSuccess:(XPIncomeRecordGoldDetailsModel *)detailModel; -///请求是否是个播房，type=4为是 --(void)requestQueryWithRoomTypeSuccess:(NSInteger)type; -///请求是否是个播房失败 --(void)requestQueryWithRoomTypeFail; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.h deleted file mode 100644 index 1e86cd1..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPExchangeDiamondsVC.h -// YuMi -// -// Created by YuMi on 2022/11/17. -// - -#import "MvpViewController.h" -#import "XPExchangeDiamondsModel.h" - -@protocol XPExchangeDiamondsVCDelegate - --(void)confirmExchangeDiamondsWithDiamondSuccess:(NSString *_Nullable)diamond gold:(NSString *_Nonnull)gold; - -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface XPExchangeDiamondsVC : MvpViewController -@property (nonatomic,strong) XPExchangeDiamondsModel *model; -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.m deleted file mode 100644 index 3ec5d7c..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsVC.m +++ /dev/null @@ -1,161 +0,0 @@ -// -// XPExchangeDiamondsVC.m -// YuMi -// -// Created by YuMi on 2022/11/17. -// - -#import "XPExchangeDiamondsVC.h" -///Third -#import -///view -#import "XPExchangeDiamondsView.h" -#import "XPMineConfirmGiveDiamondView.h" -#import "TTPopup.h" -///Present -#import "XPIncomeRecordPresent.h" -///Protocol -#import "XPIncomeRecordProtocol.h" -///model -#import "XPExchangeDiamondsModel.h" - -@interface XPExchangeDiamondsVC () -@property (nonatomic,strong) XPExchangeDiamondsView *exchangeView; -@property (nonatomic,copy) NSString *diamond; -@property (nonatomic,copy) NSString *gold; -@property(nonatomic,strong) UIImageView *bgImageView; -/// 返回 -@property (nonatomic,strong) UIButton *backBtn; -/// 标题 -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPExchangeDiamondsVC -- (XPIncomeRecordPresent *)createPresenter { - return [[XPIncomeRecordPresent alloc] init]; -} -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - if(self.model != nil){ - self.exchangeView.model = self.model; - return; - } - [self showLoading]; - [self.presenter getExchangeDiamondInformation]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - - -} - -#pragma mark - XPIncomeRecordProtocol --(void)getExchangeDiamondInformation:(XPExchangeDiamondsModel *)model{ - [self hideHUD]; - self.model = model; - self.exchangeView.model = self.model; - - [self.exchangeView showKeyboard]; -} -- (void)confirmExchangeDiamondSuccessWithDiamondNum:(NSString *)diamondNum goldNum:(NSString *)goldNum{ - [self hideHUD]; - if(self.delegate && [self.delegate respondsToSelector:@selector(confirmExchangeDiamondsWithDiamondSuccess:gold:)]){ - [self.delegate confirmExchangeDiamondsWithDiamondSuccess:diamondNum gold:goldNum]; - } - [self showSuccessToast:YMLocalizedString(@"XPExchangeDiamondsView5")]; - [self.navigationController popViewControllerAnimated:YES]; -} -- (void)confirmExchangeDiamondFail{ - [self.presenter getExchangeDiamondInformation]; -} -#pragma mark - XPMineConfirmGiveDiamondViewDelegate -- (void)xpMineConfirmGiveDiamondViewComplete{ - [self showLoading]; - [self.presenter confirmExchangeDiamondWithGoldNum:self.gold diamondNum:self.diamond currency:@"1"]; -} -#pragma mark - XPExchangeDiamondsViewDelegate --(void)confirmExchangeDiamondsWithDiamond:(NSString *)diamond gold:(NSString *)gold{ - self.diamond = diamond; - self.gold = [NSString stringWithFormat:@"%.0f",ceilf(diamond.doubleValue / self.model.rate)]; - XPMineConfirmGiveDiamondView *confirmView = [[XPMineConfirmGiveDiamondView alloc]initWithFrame:CGRectZero]; - confirmView.type = 2; - confirmView.goldNum = self.gold.integerValue; - confirmView.inputDiamonds = self.diamond.integerValue; - confirmView.delegate = self; - [TTPopup popupView:confirmView style:TTPopupStyleAlert]; -} -- (BOOL)isHiddenNavBar { - return YES; -} -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPExchangeDiamondsView0"); - [self.view addSubview:self.bgImageView]; - [self.view addSubview:self.backBtn]; - [self.view addSubview:self.titleLabel]; - [self.view addSubview:self.exchangeView]; - - -} -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.equalTo(self.view); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kStatusBarHeight); - make.height.mas_equalTo(44); - make.centerX.mas_equalTo(self.view); - }]; - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.top.mas_equalTo(kStatusBarHeight); - make.width.height.mas_equalTo(44); - }]; - [self.exchangeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.view); - make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(48)); - }]; -} -/// 返回 -- (void)backBtnAction { - [self.navigationController popViewControllerAnimated:YES]; -} -#pragma mark -懒加载 -- (XPExchangeDiamondsView *)exchangeView{ - if (!_exchangeView){ - _exchangeView = [[XPExchangeDiamondsView alloc]initWithFrame:CGRectZero]; - _exchangeView.delegate = self; - } - return _exchangeView; -} -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.contentMode = UIViewContentModeScaleToFill; - _bgImageView.image = kImage(@"ms_mine_diamond_bg"); - } - return _bgImageView; -} -- (UIButton *)backBtn { - if (!_backBtn) { - _backBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backBtn setImage:[[UIImage imageNamed:@"room_info_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backBtn addTarget:self action:@selector(backBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPIncomeRecordVC1"); - _titleLabel.textColor = UIColor.blackColor; - _titleLabel.font = kFontBold(16); - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.h deleted file mode 100644 index 4d06688..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// XPExchangeDiamondsView.h -// YuMi -// -// Created by YuMi on 2022/11/17. -// - -#import -#import "XPIncomeRecordView.h" -#import "XPExchangeDiamondsModel.h" -NS_ASSUME_NONNULL_BEGIN - - -@protocol XPExchangeDiamondsViewDelegate - --(void)confirmExchangeDiamondsWithDiamond:(NSString *)diamond gold:(NSString *)gold ; - -@end - - -typedef void(^ExchangeDiamondsItemViewHandle)(NSString *goldNum,NSString *diamondNum); - -@interface XPExchangeDiamondsView : UIView -@property (nonatomic,weak) id delegate; -@property (nonatomic,strong) XPExchangeDiamondsModel *model; -- (void)showKeyboard; -@end - - -/*******************************************************华丽分割线***************************************************************/ - -@interface XPExchangeDiamondsItemView : UIView - -@property (nonatomic,copy) ExchangeDiamondsItemViewHandle inputCounthandle; - -@property (nonatomic,copy) NSString *text; -@property (nonatomic,strong) XPExchangeDiamondsModel *model; -@property (nonatomic,copy) NSString *count; --(instancetype)initWithFrame:(CGRect)frame type:(IncomeRecordViewType)type; --(void)becomeResponder; --(void)resignResponder; -@end - - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m deleted file mode 100644 index e259455..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m +++ /dev/null @@ -1,334 +0,0 @@ -// -// XPExchangeDiamondsView.m -// YuMi -// -// Created by YuMi on 2022/11/17. -// - -#import "XPExchangeDiamondsView.h" -///Third -#import -#import "XPTextField.h" -#import "XNDJTDDLoadingTool.h" -#import "UIView+Corner.h" -@interface XPExchangeDiamondsView() -@property (nonatomic,strong) XPExchangeDiamondsItemView *myGoldView; -@property (nonatomic,strong) XPExchangeDiamondsItemView *myDiamondsView; -@property(nonatomic, strong) UILabel *descLabel; -@property (nonatomic,strong) UIButton *confirmBtn; -///金币数 -@property (nonatomic,copy) NSString *goldNum; -///钻石数 -@property (nonatomic,copy) NSString *diamondNum; -@property (nonatomic,assign) IncomeRecordViewType chooseType; - -@end -@implementation XPExchangeDiamondsView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)showKeyboard { - [self.myDiamondsView becomeResponder]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - - [self addSubview:self.myDiamondsView]; - [self addSubview:self.myGoldView]; - [self addSubview:self.confirmBtn]; - [self addSubview:self.descLabel]; - - @kWeakify(self) - self.myDiamondsView.inputCounthandle = ^(NSString *_Nonnull goldNum,NSString *_Nonnull diamondNum) { - @kStrongify(self) - if(goldNum.integerValue == 0 && diamondNum.integerValue == 0){ - self.confirmBtn.enabled = NO; - self.myGoldView.text = @""; - self.myDiamondsView.text = @""; - - return; - } - - self.confirmBtn.enabled = diamondNum.integerValue > 0; - self.goldNum = goldNum; - self.diamondNum = diamondNum; - self.myGoldView.count = diamondNum; - self.chooseType = IncomeRecord_Diamond; - }; - -} -- (void)initSubViewConstraints { - [self.myDiamondsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(0)); - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(72)); - }]; - [self.myGoldView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.width.height.equalTo(self.myDiamondsView); - make.top.equalTo(self.myDiamondsView.mas_bottom).mas_offset(kGetScaleWidth(28)); - }]; - - [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.myGoldView.mas_bottom).mas_offset(kGetScaleWidth(33)); - make.width.mas_equalTo(kGetScaleWidth(303)); - make.height.mas_equalTo(kGetScaleWidth(48)); - make.centerX.equalTo(self); - }]; - - [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.myGoldView.mas_bottom).offset(4); - make.leading.trailing.mas_equalTo(self.myGoldView).inset(15); - }]; -} -/// 返回 -- (void)backBtnAction { - -} --(void)setModel:(XPExchangeDiamondsModel *)model{ - _model = model; - _myGoldView.model = _model; - _myDiamondsView.model = _model; - self.descLabel.text = [NSString stringWithFormat:YMLocalizedString(@"20.20.51_text_29"), - @(model.minDiamonds)]; -} --(void)confirmAction{ - if( self.model.diamonds < self.diamondNum.doubleValue){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPExchangeDiamondsView2")]; - return; - } - if(self.diamondNum.doubleValue > self.model.maxDiamonds){ - [XNDJTDDLoadingTool showErrorWithMessage:[NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsView4"),self.model.maxDiamonds]]; - return; - } - [self.myGoldView resignResponder]; - [self.myDiamondsView resignResponder]; - if(self.delegate && [self.delegate respondsToSelector:@selector(confirmExchangeDiamondsWithDiamond:gold:)]){ - [self.delegate confirmExchangeDiamondsWithDiamond:self.diamondNum gold:self.goldNum]; - } -} -#pragma mark -懒加载 - -- (XPExchangeDiamondsItemView *)myGoldView{ - if (!_myGoldView){ - _myGoldView = [[XPExchangeDiamondsItemView alloc]initWithFrame:CGRectZero type:IncomeRecord_Gold]; - - } - return _myGoldView; -} - --(XPExchangeDiamondsItemView *)myDiamondsView{ - if (!_myDiamondsView){ - _myDiamondsView = [[XPExchangeDiamondsItemView alloc]initWithFrame:CGRectZero type:IncomeRecord_Diamond]; - - } - return _myDiamondsView; -} --(UIButton *)confirmBtn{ - if (!_confirmBtn){ - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(345), kGetScaleWidth(48))]; - _confirmBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_confirmBtn setTitle:YMLocalizedString(@"XPExchangeDiamondsView1") forState:UIControlStateNormal]; - _confirmBtn.titleLabel.font = kFontHeavy(16); - [_confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _confirmBtn.layer.cornerRadius = kGetScaleWidth(24); - _confirmBtn.layer.masksToBounds = YES; - _confirmBtn.enabled = NO; - [_confirmBtn setBackgroundImage:image forState:UIControlStateNormal]; - [_confirmBtn addTarget:self action:@selector(confirmAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _confirmBtn; -} - -- (UILabel *)descLabel { - if (!_descLabel) { - _descLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(14) textColor:[UIColor lightGrayColor]]; - _descLabel.adjustsFontSizeToFitWidth = YES; - } - return _descLabel; -} - -@end - - - -/*******************************************************华丽分割线***************************************************************/ -@interface XPExchangeDiamondsItemView() -///我的数量 -@property (nonatomic,strong) UILabel *titleNumView; -///背景 -@property (nonatomic,strong) UIImageView *bgImageView; -///图标 -@property (nonatomic,strong) UIButton *iconView; -///兑换数量 -@property (nonatomic,strong) XPTextField *numberView; - -@property (nonatomic,assign) IncomeRecordViewType type; - -@end - -@implementation XPExchangeDiamondsItemView - --(instancetype)initWithFrame:(CGRect)frame type:(IncomeRecordViewType)type{ - self = [super initWithFrame:frame]; - if(self){ - self.type = type; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.titleNumView]; - [self addSubview:self.bgImageView]; - - [self.bgImageView addSubview:self.iconView]; - [self.bgImageView addSubview:self.numberView]; -} -- (void)initSubViewConstraints { - [self.titleNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.top.mas_equalTo(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(14)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - }]; - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.top.equalTo(self.titleNumView.mas_bottom).mas_offset(kGetScaleWidth(10)); - make.height.mas_equalTo(kGetScaleWidth(48)); - }]; - [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(28)); - make.height.mas_equalTo(kGetScaleWidth(28)); - make.leading.mas_equalTo(kGetScaleWidth(9)); - make.centerY.equalTo(self.bgImageView); - }]; - [self.numberView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(self.bgImageView); - make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.leading.equalTo(self.iconView.mas_trailing).mas_offset(8); - }]; -} -#pragma mark - 赋值 --(void)setModel:(XPExchangeDiamondsModel *)model{ - _model = model; - if(self.type == IncomeRecord_Gold){ - _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView0"),@(_model.golds)]; - UIImage *image = [UIImage imageNamed:@"moli_money_icon"]; - [_iconView setImage:image forState:UIControlStateNormal]; - - }else{ - _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView1"),_model.diamonds]; - UIImage *image = [UIImage imageNamed:@"exchange_new_diamonds_icon"]; - [_iconView setImage:image forState:UIControlStateNormal]; - } - -} - --(void)resignResponder{ - [_numberView resignFirstResponder]; -} - --(void)becomeResponder { - [_numberView becomeFirstResponder]; -} - --(void)setText:(NSString *)text{ - _text = text; - _numberView.text = _text; - -} --(void)setCount:(NSString *)count{ - _count = count; - _numberView.text = _count; -} --(void)textFieldDidChange:(UITextField *)textField{ - if (textField.text.length == 0){ - if(self.inputCounthandle){ - self.inputCounthandle(@"0", @"0"); - } - return; - - } - NSInteger count = textField.text.integerValue; - NSString *diamondNum = [NSString stringWithFormat:@"%.0f",floorf(count * _model.rate)]; - if (count < self.model.minDiamonds || count % self.model.minDiamonds != 0) { - diamondNum = @"0"; - } - if(self.inputCounthandle){ - self.inputCounthandle(textField.text,diamondNum); - } - -} -#pragma mark -懒加载 - -- (UILabel *)titleNumView { - if (!_titleNumView) { - _titleNumView = [[UILabel alloc] init]; - _titleNumView.font = kFontBold(15); - _titleNumView.textColor = UIColorFromRGB(0x00223D); - NSString *title = self.type == IncomeRecord_Gold ? YMLocalizedString(@"XPExchangeDiamondsItemView0"): YMLocalizedString(@"XPExchangeDiamondsItemView1"); - _titleNumView.text = [NSString stringWithFormat:title,@"0"]; - } - return _titleNumView; -} - -- (UIImageView *)bgImageView{ - if (!_bgImageView){ - _bgImageView = [UIImageView new]; - if(self.type == IncomeRecord_Gold){ - _bgImageView.image = kImage(@"ms_exchange_diamonds_coin_bg"); - }else{ - _bgImageView.image = kImage(@"ms_exchange_diamonds_diamonds_bg"); - } - _bgImageView.userInteractionEnabled = YES; - - } - return _bgImageView; -} --(UIButton *)iconView{ - if (!_iconView){ - UIImage *image = self.type == IncomeRecord_Gold ? [UIImage imageNamed:@"moli_money_icon"] : [UIImage imageNamed:@"exchange_new_diamonds_icon"]; - _iconView = [UIButton buttonWithType:UIButtonTypeCustom]; - [_iconView setImage:image forState:UIControlStateNormal]; - } - return _iconView; -} - -- (XPTextField *)numberView{ - if (!_numberView){ - _numberView = [[XPTextField alloc]initWithFrame:CGRectZero]; - _numberView.keyboardType = UIKeyboardTypeNumberPad; - _numberView.isValidation = YES; - NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc] initWithString:(self.type == IncomeRecord_Diamond) ? YMLocalizedString(@"XPExchangeDiamondsView6") : YMLocalizedString(@"XPExchangeDiamondsView7") - attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium], - NSForegroundColorAttributeName:[UIColor colorWithWhite:1 alpha:0.6]}]; - _numberView.attributedPlaceholder = attStr; - _numberView.font = kFontMedium(15); - _numberView.textColor = [UIColor whiteColor]; - [_numberView addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; - if (self.type == IncomeRecord_Gold) { - _numberView.userInteractionEnabled = NO; - } - } - return _numberView; -} - - - - -@end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomCell.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomCell.h deleted file mode 100644 index 3748b85..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPGoldDetailsChooseRoomCell.h -// YuMi -// -// Created by YuMi on 2022/12/15. -// - -#import -#import "XPIncomeRecordGoldDetailsModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGoldDetailsChooseRoomCell : UITableViewCell -@property (nonatomic,strong) XPIncomeRecordGoldDetailItemModel *model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomCell.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomCell.m deleted file mode 100644 index ba8e5fb..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomCell.m +++ /dev/null @@ -1,70 +0,0 @@ -// -// XPGoldDetailsChooseRoomCell.m -// YuMi -// -// Created by YuMi on 2022/12/15. -// - -#import "XPGoldDetailsChooseRoomCell.h" -#import "NetImageView.h" -#import "UIView+Corner.h" -@interface XPGoldDetailsChooseRoomCell() -@property (nonatomic,strong) NetImageView *headImage; -@property (nonatomic,strong) UILabel *nameView; -@end -@implementation XPGoldDetailsChooseRoomCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -- (void)setModel:(XPIncomeRecordGoldDetailItemModel *)model{ - _model = model; - _headImage.imageUrl = _model.ownerAvatar; - _nameView.text = _model.hallName; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.headImage]; - [self.contentView addSubview:self.nameView]; - -} -- (void)initSubViewConstraints { - [self.headImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(34)); - make.top.mas_equalTo(kGetScaleWidth(12)); - make.centerX.equalTo(self.contentView); - }]; - [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(14)); - make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(5)); - - make.top.mas_equalTo(kGetScaleWidth(52)); - }]; -} -#pragma mark -懒加载 -- (NetImageView *)headImage{ - if (!_headImage){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _headImage = [[NetImageView alloc]initWithConfig:config]; - [_headImage setCornerWithLeftTopCorner:kGetScaleWidth(6) rightTopCorner:kGetScaleWidth(6) bottomLeftCorner:kGetScaleWidth(6) bottomRightCorner:kGetScaleWidth(6) size:CGSizeMake(kGetScaleWidth(34), kGetScaleWidth(34))]; - } - return _headImage; -} - -- (UILabel *)nameView { - if (!_nameView) { - _nameView = [[UILabel alloc] init]; - _nameView.font = [UIFont systemFontOfSize:10]; - _nameView.textColor = [DJDKMIMOMColor inputTextColor]; - _nameView.textAlignment = NSTextAlignmentCenter; - } - return _nameView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomView.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomView.h deleted file mode 100644 index 7c8f944..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// XPGoldDetailsChooseRoomView.h -// YuMi -// -// Created by YuMi on 2022/11/24. -// - -#import -#import "XPIncomeRecordGoldDetailsModel.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol XPGoldDetailsChooseRoomViewDelegate - --(void)chooseBelongRoomWithModel:(XPIncomeRecordGoldDetailItemModel *)model; - -@end - - -@interface XPGoldDetailsChooseRoomView : UIView -@property (nonatomic,strong) XPIncomeRecordGoldDetailsModel *detailModel; -@property (nonatomic,weak) id delegate; -@property (nonatomic,assign) BOOL isReset; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomView.m deleted file mode 100644 index 4155450..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomView.m +++ /dev/null @@ -1,82 +0,0 @@ -// -// XPGoldDetailsChooseRoomView.m -// YuMi -// -// Created by YuMi on 2022/11/24. -// - -#import "XPGoldDetailsChooseRoomView.h" -#import "XPGoldDetailsChooseRoomCell.h" -@interface XPGoldDetailsChooseRoomView() -@property (nonatomic,strong) UITableView *tableView; -@property (nonatomic,strong) NSMutableArray *modelList; -@property (nonatomic,strong) NSIndexPath *path; -@end -@implementation XPGoldDetailsChooseRoomView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} --(void)setDetailModel:(XPIncomeRecordGoldDetailsModel *)detailModel{ - _detailModel = detailModel; - _modelList = [NSMutableArray arrayWithArray:_detailModel.hallVoList]; - [_tableView reloadData]; -} -#pragma mark - Private Method -- (void)initSubViews { - self.path = [NSIndexPath indexPathForRow:0 inSection:0]; - self.backgroundColor = [UIColor whiteColor]; - [self addSubview:self.tableView]; - - -} -- (void)setIsReset:(BOOL)isReset{ - _isReset = isReset; - self.path = [NSIndexPath indexPathForRow:0 inSection:0]; - [self.tableView reloadData]; -} -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; -} --(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ - return _modelList.count; -} --(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - XPGoldDetailsChooseRoomCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPGoldDetailsChooseRoomCell class]) forIndexPath:indexPath]; - cell.model = self.modelList[indexPath.row]; - cell.contentView.backgroundColor = self.path.row == indexPath.row ? [UIColor whiteColor] :UIColorFromRGB(0xF0F5F6); - return cell; -} -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseBelongRoomWithModel:)]){ - [self.delegate chooseBelongRoomWithModel:self.modelList[indexPath.row]]; - } - self.path = indexPath; - [self.tableView reloadData]; -} -#pragma mark -懒加载 -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.rowHeight = kGetScaleWidth(78); - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPGoldDetailsChooseRoomCell class] forCellReuseIdentifier:NSStringFromClass([XPGoldDetailsChooseRoomCell class])]; - - } - return _tableView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.h deleted file mode 100644 index a478d19..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// XPIncomeRecordGoldDetailsPickViewView.h -// YuMi -// -// Created by YuMi on 2022/11/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPIncomeRecordGoldDetailsPickViewViewDelegate - -///点了确认按钮 -- (void)didClickSureActionWtihStartDate:(NSDate *)startDate endDate:(NSDate *)endDate; - -@end - -@interface XPIncomeRecordGoldDetailsPickViewView : UIView -///当前的时间 -@property (nonatomic,strong) NSDate *currentDate; -@property (nonatomic,weak) id delegate; --(instancetype)initWithFrame:(CGRect)frame curDate:(NSDate *)date; -@end - - - - -@interface DatePickerView : UIView - -@property(nonatomic,assign)CGFloat leftWidth; -@property(nonatomic,strong)UIView *lineView; -@property(nonatomic,strong) UILabel *titleLab; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m deleted file mode 100644 index 28da4c6..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m +++ /dev/null @@ -1,453 +0,0 @@ -// -// XPIncomeRecordGoldDetailsPickViewView.m -// YuMi -// -// Created by YuMi on 2022/11/28. -// - -#import "XPIncomeRecordGoldDetailsPickViewView.h" -#import "NSDate+DateUtils.h" -#import "UIView+Corner.h" -@interface XPIncomeRecordGoldDetailsPickViewView() -@property (nonatomic,strong) UIView *bgView; -@property (nonatomic,strong) UIButton *cancelBtn; -@property (nonatomic,strong) UIButton *confirmBtn; -@property (nonatomic,strong) UILabel *titleView; -@property (strong, nonatomic) UIPickerView *pickerView; -@property (nonatomic,strong)NSMutableArray * selDateArray; -@property (nonatomic,strong)NSMutableArray * dataArray;//数据源 -@property (nonatomic,strong)NSDateComponents * components;//时间结构体、可计算时间间隔、获取年月日时分、 -///开始的时间 -@property (nonatomic,strong) NSDate *startDate; -///结束的时间 -@property (nonatomic,strong) NSDate *endDate; -@property (nonatomic,copy) NSArray *yearArr; - -///距离当前时间三个月的时间 -@property (nonatomic,strong) NSDate *threeMinStartDate; -@property (nonatomic,strong) NSDate *threeMinEndDate; -@property (nonatomic,strong) NSDate *threeMaxStartDate; -@property (nonatomic,strong) NSDate *threeMaxEndDate; -@property (nonatomic,assign) BOOL isHaveEffectiveDate; - - -@end -@implementation XPIncomeRecordGoldDetailsPickViewView - --(instancetype)initWithFrame:(CGRect)frame curDate:(NSDate *)date{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - [self weekDayWithCurrentDate:date]; - [self initDate:date]; - self.currentDate = date; - - } - return self; -} - -#pragma mark - Private Method - -- (void)initSubViews { - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.cancelBtn]; - [self.bgView addSubview:self.confirmBtn]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.pickerView]; -} -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self).inset(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(302)); - }]; - [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.top.mas_equalTo(kGetScaleWidth(20)); - make.width.mas_equalTo(kGetScaleWidth(35)); - make.height.mas_equalTo(kGetScaleWidth(20)); - - }]; - [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(20)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(59)); - make.centerX.equalTo(self.bgView); - - }]; - [self.pickerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(80)); - make.leading.trailing.bottom.equalTo(self.bgView).inset(kGetScaleWidth(0)); - - }]; - -} --(void)initDate:(NSDate *)date{ - - self.yearArr = @[YMLocalizedString(@"XPIncomeRecordGoldDetailsPickViewView3") ,YMLocalizedString(@"XPIncomeRecordGoldDetailsPickViewView4"),YMLocalizedString(@"XPIncomeRecordGoldDetailsPickViewView5")]; - _selDateArray = [[NSMutableArray alloc]init]; - NSCalendar * calender = [NSCalendar currentCalendar]; - _components = [calender components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay|NSCalendarUnitHour|NSCalendarUnitMinute fromDate:[NSDate date]]; - NSArray * timeArr = [[NSArray alloc]init]; - NSTimeInterval startTimeNum = [self.startDate timeIntervalSince1970] ; - NSString *timeStr = [NSDate timestampSwitchTime:startTimeNum andFormatter:@"yyyy-MM-dd"]; - NSTimeInterval endTimeNum = [self.endDate timeIntervalSince1970] ; - NSString *endTime = [NSDate timestampSwitchTime:endTimeNum andFormatter:@"yyyy-MM-dd"]; - self.titleView.text = [NSString stringWithFormat:@"%@ %@ %@",timeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsPickViewView2"),endTime]; - [self judgeDateIsHaveEffective]; - if (timeStr) { - timeArr = [self receiveTime:timeStr]; - } - if (timeArr.count == 3) {//需要显示传入的时间 - - _dataArray = [self dataSourceArrayWithMonth:self.components.month year:self.components.year]; - _selDateArray = [timeArr mutableCopy]; - - for (int i = 0; i < 3; i++) { - - [_pickerView selectRow: [_dataArray[i] xpSafeObjectAtIndex:_selDateArray[i]] inComponent:i animated:YES]; - } - } -} --(void)judgeDateIsHaveEffective{ - NSDateFormatter *formatter = [[NSDateFormatter alloc]init]; - [formatter setDateFormat:@"yyyy-MM-dd"]; - NSDate *resDate; -#ifdef DEBUG - NSString *isProduction = [[NSUserDefaults standardUserDefaults]valueForKey:@"kIsProductionEnvironment"]; - if([isProduction isEqualToString:@"YES"]){ - resDate = [formatter dateFromString:@"2022-12-05"]; - }else{ - resDate = [formatter dateFromString:@"2022-09-05"]; - } -#else - resDate = [formatter dateFromString:@"2022-12-05"]; -#endif - if([self.startDate compare:resDate] == NSOrderedAscending){ - self.isHaveEffectiveDate = NO; - }else if([self.startDate compare:self.threeMinStartDate] == NSOrderedAscending){ - self.isHaveEffectiveDate = NO; - }else if ([self.startDate compare:self.threeMaxStartDate] == NSOrderedDescending){ - self.isHaveEffectiveDate = NO; - }else{ - self.isHaveEffectiveDate = YES; - } - -} -- (void)weekDayWithCurrentDate:(NSDate *)date { - NSCalendar * calendar = [NSCalendar currentCalendar]; // 指定日历的算法 - NSDateComponents *comps = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitWeekday | NSCalendarUnitDay fromDate:date]; - // 获取今天是周几 - // 1 是周日，2是周一 3.以此类推 - NSInteger weekDay = [comps weekday]; - // 获取几天是几号 - NSInteger day = [comps day]; - long firstDiff,lastDiff; - if (weekDay == 1){ - firstDiff = -6; - lastDiff = 0; - } else { - firstDiff = -(weekDay - 2); - lastDiff = 8 - weekDay; - } - // 在当前日期(去掉时分秒)基础上加上差的天数 - NSDateComponents *baseDayComp = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:date]; - //获取周一日期 - [baseDayComp setDay:day + firstDiff]; - NSDate *firstDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.startDate = firstDayOfWeek; - //获取周末日期 - [baseDayComp setDay:day + lastDiff]; - NSDate *lastDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.endDate = lastDayOfWeek; - - //获取距离当前三个月日期 - if(self.threeMinStartDate == nil){ - [baseDayComp setDay:day + firstDiff - 3 * 4 * 7 ]; - self.threeMinStartDate = [calendar dateFromComponents:baseDayComp]; - [baseDayComp setDay:day + lastDiff - 3 * 4 * 7 ]; - self.threeMinEndDate = [calendar dateFromComponents:baseDayComp]; - [baseDayComp setDay:day + firstDiff]; - self.threeMaxStartDate = [calendar dateFromComponents:baseDayComp]; - [baseDayComp setDay:day + lastDiff]; - self.threeMaxEndDate = [calendar dateFromComponents:baseDayComp]; - } - - - -} --(NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView{ - - return 3; -} - --(NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component{ - - return [_dataArray[component] count]; -} - --(CGFloat)pickerView:(UIPickerView *)pickerView widthForComponent:(NSInteger)component{ - - return KScreenWidth / 3; -} --(CGFloat)pickerView:(UIPickerView *)pickerView rowHeightForComponent:(NSInteger)component{ - return 48; -} - --(UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView *)view{ - [self changeSpearatorLineColor]; - DatePickerView *lab = (DatePickerView *)view; - if (!lab) { - lab = [[DatePickerView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth/3, 48)]; - } - - - lab.lineView.hidden = YES; - if ([_selDateArray[component] isEqualToString: self.dataArray[component][row]] ) { - - lab.lineView.hidden = component == 2; - lab.titleLab.font = [UIFont systemFontOfSize:20 weight:UIFontWeightSemibold]; - lab.titleLab.textColor = self.isHaveEffectiveDate ? [DJDKMIMOMColor inputTextColor] : [DJDKMIMOMColor disableButtonTextColor]; - lab.titleLab.text= [NSString stringWithFormat:@"%@%@",self.selDateArray[component],self.yearArr[component]]; - - }else{ - lab.titleLab.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; - lab.titleLab.textColor = [DJDKMIMOMColor disableButtonTextColor]; - lab.titleLab.text = [NSString stringWithFormat:@"%@%@",self.dataArray[component][row],self.yearArr[component]]; - } - - - - return lab; -} - --(void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component{ - ///选择时间后，要重置日期数据源 - if(component == 0){ - self.dataArray = [self dataSourceArrayWithMonth:[_selDateArray[1]integerValue] year:[self.dataArray[component][row]integerValue]]; - - }else if (component == 1){ - self.dataArray = [self dataSourceArrayWithMonth:[self.dataArray[component][row]integerValue] year:[_selDateArray[0]integerValue]]; - } - ///防止选择最大月份时，再选择最小月份日期出错，如，润年选择2月29日，再选择非润年，导致非润年出现2月29日 - if([[self.dataArray[2] lastObject]integerValue] < [_selDateArray[2]integerValue]){ - _selDateArray[2] = [self.dataArray[2] lastObject]; - } - - - [_selDateArray replaceObjectAtIndex:component withObject:self.dataArray[component][row]]; - NSDateFormatter *formatter = [[NSDateFormatter alloc]init]; - [formatter setDateFormat:@"yyyy-MM-dd"]; - NSString *date = [NSString stringWithFormat:@"%@-%@-%@",_selDateArray[0],_selDateArray[1],_selDateArray[2]]; - NSDate *resDate = [formatter dateFromString:date]; - [self weekDayWithCurrentDate:resDate]; - [self judgeDateIsHaveEffective]; - NSTimeInterval startTimeNum = [self.startDate timeIntervalSince1970] ; - NSString *timeStr = [NSDate timestampSwitchTime:startTimeNum andFormatter:@"yyyy-MM-dd"]; - NSTimeInterval endTimeNum = [self.endDate timeIntervalSince1970] ; - NSString *endTime = [NSDate timestampSwitchTime:endTimeNum andFormatter:@"yyyy-MM-dd"]; - self.titleView.text = [NSString stringWithFormat:@"%@ %@ %@",timeStr,YMLocalizedString(@"XPIncomeRecordGoldDetailsPickViewView2"),endTime]; - [pickerView reloadAllComponents]; - -} - -#pragma mark - 改变分割线的颜色 -- (void)changeSpearatorLineColor { - - for(UIView *speartorView in _pickerView.subviews) { - - if (speartorView.frame.size.height < 80) {//找出当前的 View - /// 背景 - speartorView.backgroundColor = [UIColor whiteColor]; - // 添加分割线 (判断只添加一次 滑动不断刷新) - - - speartorView.backgroundColor = [UIColor clearColor]; - }else{ - speartorView.backgroundColor = [UIColor clearColor]; - } - } -} - -//分解传来需要显示的时间 --(NSArray *)receiveTime:(NSString *)timeStr{ - - NSArray * timeArray = [timeStr componentsSeparatedByString:@"-"]; - NSMutableArray * timeArr = [[NSMutableArray alloc]init]; - for (int i = 0; i - -@protocol XPIncomeRecordGoldDetailsTimeViewDelegate - --(void)chooseTime; - -@end - - -NS_ASSUME_NONNULL_BEGIN - -@interface XPIncomeRecordGoldDetailsTimeView : UIView -@property (nonatomic,weak) id delegate; -@property (nonatomic,copy) NSString *time; -@property (nonatomic,strong,readonly) UIButton *minusBtn; -@property (nonatomic,strong,readonly) UIButton *addBtn; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsTimeView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsTimeView.m deleted file mode 100644 index 7c37a01..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsTimeView.m +++ /dev/null @@ -1,85 +0,0 @@ -// -// XPIncomeRecordGoldDetailsTimeView.m -// YuMi -// -// Created by YuMi on 2022/11/24. -// - -#import "XPIncomeRecordGoldDetailsTimeView.h" -@interface XPIncomeRecordGoldDetailsTimeView() -@property (nonatomic,strong) UIButton *minusBtn; -@property (nonatomic,strong) UIButton *addBtn; -@property (nonatomic,strong) UILabel *timeView; - -@end - -@implementation XPIncomeRecordGoldDetailsTimeView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} --(void)setTime:(NSString *)time{ - _time = time; - _timeView.text = _time; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColorFromRGB(0xF4F0FE); - [self addSubview:self.minusBtn]; - [self addSubview:self.timeView]; - [self addSubview:self.addBtn]; -} -- (void)initSubViewConstraints { - - [self.timeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.equalTo(self); - }]; - [self.minusBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(24)); - make.centerY.equalTo(self); - make.trailing.equalTo(self.timeView.mas_leading).mas_offset(-kGetScaleWidth(20)); - }]; - [self.addBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.centerY.equalTo(self.minusBtn); - make.leading.equalTo(self.timeView.mas_trailing).mas_offset(kGetScaleWidth(20)); - }]; -} --(void)chooseTimeAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseTime)]){ - [self.delegate chooseTime]; - } -} -#pragma mark -懒加载 -- (UIButton *)minusBtn{ - if (!_minusBtn){ - _minusBtn = [UIButton new]; - [_minusBtn setImage:[UIImage imageNamed:@"gold_details_minus"] forState:UIControlStateNormal]; - } - return _minusBtn; -} --(UIButton *)addBtn{ - if (!_addBtn){ - _addBtn = [UIButton new]; - [_addBtn setImage:[UIImage imageNamed:@"gold_details_add"] forState:UIControlStateNormal]; - } - return _addBtn; -} - -- (UILabel *)timeView { - if (!_timeView) { - _timeView = [[UILabel alloc] init]; - _timeView.font = [UIFont systemFontOfSize:15]; - _timeView.textColor = UIColorFromRGB(0x6D6B89); - _timeView.textAlignment = NSTextAlignmentCenter; - _timeView.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(chooseTimeAction)]; - [_timeView addGestureRecognizer:tap]; - } - return _timeView; -} -@end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsVC.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsVC.h deleted file mode 100644 index a97c95d..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsVC.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// XPIncomeRecordGoldDetailsVC.h -// YuMi -// -// Created by YuMi on 2022/11/24. -// -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPIncomeRecordGoldDetailsVC : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsVC.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsVC.m deleted file mode 100644 index 1ff2015..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsVC.m +++ /dev/null @@ -1,147 +0,0 @@ -// -// XPIncomeRecordGoldDetailsVC.m -// YuMi -// -// Created by YuMi on 2022/11/24. -// - -#import "XPIncomeRecordGoldDetailsVC.h" -///vc -#import "XPIncomeRecordGoldDetailsView.h" -///Present -#import "XPIncomeRecordPresent.h" -///model -#import "XPIncomeRecordGoldDetailsModel.h" -#import "NSDate+DateUtils.h" -@interface XPIncomeRecordGoldDetailsVC () -@property (nonatomic,strong) XPIncomeRecordGoldDetailsView *goldDetailsView; -@property (nonatomic,strong) XPIncomeRecordGoldDetailsModel *detailModel; -///开始的时间 -@property (nonatomic,strong) NSDate *startDate; -///结束的时间 -@property (nonatomic,strong) NSDate *endDate; -///开始的时间 -@property (nonatomic,copy) NSString *startTime; -///结束的时间 -@property (nonatomic,copy) NSString *endDateTime; -@end - -@implementation XPIncomeRecordGoldDetailsVC -- (XPIncomeRecordPresent *)createPresenter { - return [[XPIncomeRecordPresent alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self weekDayWithCurrentDate:[NSDate date] type:0]; - [self getCurTime]; -} --(void)getGoldDetailsDataSuccess:(XPIncomeRecordGoldDetailsModel *)detailModel{ - [self hideHUD]; - self.detailModel = detailModel; - _goldDetailsView.detailModel = _detailModel; -} --(void)getCurTime{ - NSTimeInterval startTimeNum = [self.startDate timeIntervalSince1970] ; - NSTimeInterval endTimeNum = [self.endDate timeIntervalSince1970] ; - NSString *startTime = [NSDate timestampSwitchTime:startTimeNum andFormatter:@"yyyy-MM-dd"]; - NSString *endTime = [NSDate timestampSwitchTime:endTimeNum andFormatter:@"yyyy-MM-dd"]; - self.startTime = startTime; - self.endDateTime = endTime; - self.goldDetailsView.startDate = self.startDate; - self.goldDetailsView.endDate = self.endDate; - self.goldDetailsView.time = [NSString stringWithFormat:@"%@ %@ %@",startTime,YMLocalizedString(@"XPIncomeRecordGoldDetailsVC1"),endTime]; - [self.presenter getGoldDetailsDataWithStartTime:startTime endTime:endTime]; - -} -- (void)weekDayWithCurrentDate:(NSDate *)date type:(int)type{ - - NSCalendar * calendar = [NSCalendar currentCalendar]; // 指定日历的算法 - NSDateComponents *comps = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitWeekday | NSCalendarUnitDay fromDate:date]; - // 获取今天是周几 - // 1 是周日，2是周一 3.以此类推 - NSInteger weekDay = [comps weekday]; - // 获取几天是几号 - NSInteger day = [comps day]; - ///type,1，当前周期，1，3，下一个周期，0，2，上一个周期 - NSInteger getDay = 0; - if(type == 1){ - getDay = 0; - }else if (type == 3){ - getDay = -7; - }else if (type == 2){ - getDay = 7; - } - long firstDiff,lastDiff; - if (weekDay == 1){ - firstDiff = -6; - lastDiff = 0; - } else { - firstDiff = -(weekDay - 2) ; - lastDiff = 8 - weekDay ; - } - // 在当前日期(去掉时分秒)基础上加上差的天数 - NSDateComponents *baseDayComp = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:date]; - //获取周一日期 - [baseDayComp setDay:day + firstDiff - getDay]; - NSDate *firstDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.startDate = firstDayOfWeek; - //获取周末日期 - [baseDayComp setDay:day + lastDiff - getDay]; - NSDate *lastDayOfWeek = [calendar dateFromComponents:baseDayComp]; - self.endDate = lastDayOfWeek; - if(self.goldDetailsView.curDate == nil){ - [baseDayComp setDay:day + lastDiff]; - self.goldDetailsView.curDate = [calendar dateFromComponents:baseDayComp]; - - } - -} -#pragma mark - XPIncomeRecordGoldDetailsViewDelegate --(void)didClickSureWithStartDate:(NSDate *)startDate endDate:(NSDate *)endDate type:(int)type{ - switch (type) { - case 1: - { - [self weekDayWithCurrentDate:startDate type:1]; - [self getCurTime]; - break; - } - case 2: - { - [self weekDayWithCurrentDate:startDate type:2]; - [self getCurTime]; - break; - } - - default: - { - [self weekDayWithCurrentDate:startDate type:3]; - [self getCurTime]; - break; - } - } -} -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPIncomeRecordGoldDetailsVC0"); - [self.view addSubview:self.goldDetailsView]; -} -- (void)initSubViewConstraints { - [self.goldDetailsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.bottom.equalTo(self.view); - - }]; -} -#pragma mark -懒加载 -- (XPIncomeRecordGoldDetailsView *)goldDetailsView{ - if (!_goldDetailsView){ - _goldDetailsView = [[XPIncomeRecordGoldDetailsView alloc]initWithFrame:CGRectZero]; - _goldDetailsView.delegate = self; - } - return _goldDetailsView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsView.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsView.h deleted file mode 100644 index 43ed07e..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsView.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// XPIncomeRecordGoldDetailsView.h -// YuMi -// -// Created by YuMi on 2022/11/24. -// - -#import -#import "XPIncomeRecordGoldDetailsModel.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol XPIncomeRecordGoldDetailsViewDelegate - -///type,1,选择时间，2，选择上一个周期时间，3,选择下一个周期时间 --(void)didClickSureWithStartDate:(NSDate *)startDate endDate:(NSDate *)endDate type:(int)type; - -@end - - -@interface XPIncomeRecordGoldDetailsView : UIView -@property (nonatomic,strong) XPIncomeRecordGoldDetailsModel *detailModel; - -///最长周期日期 -@property (nonatomic,strong) NSDate *curDate; - -///开始的时间 -@property (nonatomic,copy) NSString *startTime; -///结束的时间 -@property (nonatomic,copy) NSString *endDateTime; -///开始的时间 -@property (nonatomic,strong) NSDate *startDate; -///结束的时间 -@property (nonatomic,strong) NSDate *endDate; -///时间 -@property (nonatomic,copy) NSString *time; -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsView.m deleted file mode 100644 index 0d7c0ac..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsView.m +++ /dev/null @@ -1,318 +0,0 @@ -// -// XPIncomeRecordGoldDetailsView.m -// YuMi -// -// Created by YuMi on 2022/11/24. -// - -#import "XPIncomeRecordGoldDetailsView.h" -///view -#import "XPIncomeRecordGoldDetailsHeadView.h" -#import "XPIncomeRecordGoldDetailsCell.h" -#import "XPIncomeRecordGoldDetailsTimeView.h" -#import "XPGoldDetailsChooseRoomView.h" -#import "XPMineVisitorEmptyTableViewCell.h" -#import "XPNewGuildTimePickView.h" -#import "XPIncomeRecordGoldDetailsPickViewView.h" -#import "NSString+Utils.h" -#import "TTPopup.h" -#import "NSObject+MJExtension.h" -@interface XPIncomeRecordGoldDetailsView() -@property (nonatomic,strong)XPIncomeRecordGoldDetailsTimeView *timeView; -@property (nonatomic,strong) XPIncomeRecordGoldDetailsHeadView *headView; -@property (nonatomic,strong) UITableView *tableView; -@property (nonatomic,strong) UILabel *totalView; -@property (nonatomic,copy) NSArray *modelList; -@property (nonatomic,strong) XPGoldDetailsChooseRoomView *chooseView; -@property (nonatomic,assign) IncomeRecordGoldSortingType sortingType; -@property (nonatomic,strong) NSMutableArray *originalArray; -@end -@implementation XPIncomeRecordGoldDetailsView - - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - - [self initSubViews]; - [self initSubViewConstraints]; - self.sortingType = IncomeRecordGold_Diamond; - - } - return self; -} --(void)setTime:(NSString *)time{ - _time = time; - _timeView.time = time; - NSDateFormatter *formatter = [[NSDateFormatter alloc]init]; - [formatter setDateFormat:@"yyyy-MM-dd"]; - NSDate *resDate; -#ifdef DEBUG - NSString *isProduction = [[NSUserDefaults standardUserDefaults]valueForKey:@"kIsProductionEnvironment"]; - if([isProduction isEqualToString:@"YES"]){ - resDate = [formatter dateFromString:@"2022-12-05"]; - }else{ - resDate = [formatter dateFromString:@"2022-09-05"]; - } -#else - resDate = [formatter dateFromString:@"2022-12-05"]; -#endif - if ([self.startDate compare:resDate] == NSOrderedAscending) { - _timeView.minusBtn.enabled = NO; - }else{ - _timeView.minusBtn.enabled = YES; - } - if ([self.endDate compare:resDate] == NSOrderedAscending) { - _timeView.addBtn.enabled = NO; - }else{ - if ([self.startDate compare:self.curDate] == NSOrderedDescending || [self.endDate compare:self.curDate] == NSOrderedSame) { - _timeView.addBtn.enabled = NO; - }else{ - _timeView.addBtn.enabled = YES; - } - } - -} -#pragma mark - Private Method -- (void)initSubViews { - - [self addSubview:self.timeView]; - [self addSubview:self.headView]; - [self addSubview:self.totalView]; - [self addSubview:self.tableView]; - [self addSubview:self.chooseView]; - -} - -- (void)initSubViewConstraints { - - - [self.timeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(47)); - }]; - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(65)); - make.trailing.leading.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(153)); - - }]; - [self.chooseView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(64)); - make.leading.mas_equalTo(kGetScaleWidth(0)); - make.top.equalTo(self.headView.mas_bottom); - make.bottom.equalTo(self); - }]; - [self.totalView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.chooseView.mas_trailing); - make.trailing.equalTo(self); - make.bottom.equalTo(self).mas_equalTo(- kGetScaleWidth(66)); - }]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self); - make.bottom.equalTo(self.totalView.mas_top).mas_offset(-kGetScaleWidth(10)); - make.top.equalTo(self.headView.mas_bottom); - make.leading.mas_equalTo(kGetScaleWidth(64)); - }]; - - - -} --(void)setDetailModel:(XPIncomeRecordGoldDetailsModel *)detailModel{ - _detailModel = detailModel; - _headView.detailModel = _detailModel; - _chooseView.detailModel = _detailModel; - NSMutableArray *modelList = [NSMutableArray array]; - if(_detailModel.hallVoList.count == 0){ - _modelList = modelList; - [_tableView reloadData]; - return; - } - XPIncomeRecordGoldDetailItemModel *chooseModel = _detailModel.hallVoList.firstObject; - NSDictionary *memberObj = _detailModel.hallMemberMap[chooseModel.hallId]; - _totalView.attributedText = [self getTotalAttWtihNum:[NSString stringWithFormat:@"%@",memberObj[@"total"] ?: @"0"]]; - NSArray *itemList = memberObj[@"hallMember"]; - if(itemList != nil){ - NSArray *itemModelList = [XPIncomeRecordGoldDetailItemModel modelsWithArray:itemList]; - NSArray *list = [itemModelList sortedArrayUsingComparator:^NSComparisonResult(XPIncomeRecordGoldDetailItemModel * _Nonnull obj1, XPIncomeRecordGoldDetailItemModel * _Nonnull obj2) { - return obj1.giftDiamonds.integerValue < obj2.giftDiamonds.integerValue; - }]; - modelList = [NSMutableArray arrayWithArray:list]; - } - _modelList = modelList; - [_tableView reloadData]; -} - -#pragma mark - XPIncomeRecordGoldDetailsTimeViewDelegate --(void)chooseTime{ - XPIncomeRecordGoldDetailsPickViewView *view = [[XPIncomeRecordGoldDetailsPickViewView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight) curDate:self.startDate]; - view.delegate = self; - [[UIApplication sharedApplication].keyWindow addSubview:view]; - -} -#pragma mark - XPNewGuildTimePickViewDelegate -///点了确认按钮 -- (void)xPNewGuildTimePickView:(XPNewGuildTimePickView *)view didClickSure:(UIButton *)sender{ - [TTPopup dismiss]; - self.chooseView.isReset = YES; - if(self.delegate && [self.delegate respondsToSelector:@selector(didClickSureWithStartDate:endDate:type:)]){ - [self.delegate didClickSureWithStartDate:view.startDate endDate:view.endDate type:1]; - } -} -- (void)didClickSureActionWtihStartDate:(NSDate *)startDate endDate:(NSDate *)endDate{ - - self.chooseView.isReset = YES; - if(self.delegate && [self.delegate respondsToSelector:@selector(didClickSureWithStartDate:endDate:type:)]){ - [self.delegate didClickSureWithStartDate:startDate endDate:endDate type:1]; - } -} -///点了取消按钮 -- (void)xPNewGuildTimePickView:(XPNewGuildTimePickView *)view didClickCancel:(UIButton *)sender{ - [TTPopup dismiss]; -} -#pragma mark - XPGoldDetailsChooseRoomViewDelegate --(void)chooseBelongRoomWithModel:(XPIncomeRecordGoldDetailItemModel *)model{ - [self.headView resetArrow]; - NSMutableArray *modelList = [NSMutableArray array]; - NSDictionary *memberObj = self.detailModel.hallMemberMap[model.hallId]; - self.totalView.attributedText = [self getTotalAttWtihNum:[NSString stringWithFormat:@"%@",memberObj[@"total"]?:@"0"]]; - NSArray *itemList = memberObj[@"hallMember"]; - if(itemList != nil){ - NSArray *itemModelList = [XPIncomeRecordGoldDetailItemModel modelsWithArray:itemList]; - NSArray *list = [itemModelList sortedArrayUsingComparator:^NSComparisonResult(XPIncomeRecordGoldDetailItemModel * _Nonnull obj1, XPIncomeRecordGoldDetailItemModel * _Nonnull obj2) { - return obj1.giftDiamonds.integerValue < obj2.giftDiamonds.integerValue; - }]; - modelList = [NSMutableArray arrayWithArray:list]; - - } - - self.modelList = modelList; - [self.tableView reloadData]; - -} --(NSMutableAttributedString *)getTotalAttWtihNum:(NSString *)total{ - NSString *getTotal = [NSString stringWithFormat:YMLocalizedString(@"XPIncomeRecordGoldDetailsView1"),[NSString getDealNumWithString:total]]; - NSMutableAttributedString *totalAtt = [[NSMutableAttributedString alloc]initWithString:getTotal attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14 weight:UIFontWeightMedium],NSForegroundColorAttributeName:[DJDKMIMOMColor inputTextColor]}]; - [totalAtt addAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0xDE9F0C)} range:[getTotal rangeOfString:[NSString getDealNumWithString:total]]]; - return totalAtt; -} -#pragma mark - XPIncomeRecordGoldDetailsCellDelegate - -- (void)chooseGoldCoinOrder:(IncomeRecordGoldSortingType)type isAscending:(BOOL)isAscending{ - self.sortingType = type; - if(type == IncomeRecordGold_Diamond){ - NSArray *list = [self.modelList sortedArrayUsingComparator:^NSComparisonResult(XPIncomeRecordGoldDetailItemModel * _Nonnull obj1, XPIncomeRecordGoldDetailItemModel * _Nonnull obj2) { - if(isAscending == YES){ - return obj2.giftDiamonds.integerValue > obj1.giftDiamonds.integerValue; - } - return obj1.giftDiamonds.integerValue > obj2.giftDiamonds.integerValue; - }]; - self.modelList = [NSMutableArray arrayWithArray:list]; - [self.tableView reloadData]; - return; - } - NSArray *list = [self.modelList sortedArrayUsingComparator:^NSComparisonResult(XPIncomeRecordGoldDetailItemModel * _Nonnull obj1, XPIncomeRecordGoldDetailItemModel * _Nonnull obj2) { - if(isAscending == YES){ - return obj2.remainGolds.integerValue > obj1.remainGolds.integerValue; - } - return obj1.remainGolds.integerValue > obj2.remainGolds.integerValue; - }]; - self.modelList = [NSMutableArray arrayWithArray:list]; - [self.tableView reloadData]; - - -} -#pragma mark - UITableViewDelegate,UITableViewDataSource --(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ - return self.modelList.count > 0 ? self.modelList.count : 1; -} --(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{ - if(self.modelList.count > 0){ - return kGetScaleWidth(78); - } - return kGetScaleWidth(400); -} --(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - if(self.modelList.count > 0){ - XPIncomeRecordGoldDetailsCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPIncomeRecordGoldDetailsCell class]) forIndexPath:indexPath]; - cell.detailModel = self.modelList[indexPath.row]; - - return cell; - } - - XPMineVisitorEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineVisitorEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - } - cell.emptyTitle = YMLocalizedString(@"XPIncomeRecordGoldDetailsView0"); - [cell.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(150)); - }]; - return cell; -} --(void)minusTimeAction{ - self.chooseView.isReset = YES; - if(self.delegate && [self.delegate respondsToSelector:@selector(didClickSureWithStartDate:endDate:type:)]){ - [self.delegate didClickSureWithStartDate:self.startDate endDate:self.endDate type:2]; - } - -} --(void)addTimeAction{ - self.chooseView.isReset = YES; - if(self.delegate && [self.delegate respondsToSelector:@selector(didClickSureWithStartDate:endDate:type:)]){ - [self.delegate didClickSureWithStartDate:self.startDate endDate:self.endDate type:3]; - } -} -#pragma mark -懒加载 -- (XPIncomeRecordGoldDetailsTimeView *)timeView{ - if (!_timeView){ - _timeView = [[XPIncomeRecordGoldDetailsTimeView alloc]initWithFrame:CGRectZero]; - _timeView.delegate = self; - [_timeView.minusBtn addTarget:self action:@selector(minusTimeAction) forControlEvents:UIControlEventTouchUpInside]; - [_timeView.addBtn addTarget:self action:@selector(addTimeAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _timeView; -} -- (XPIncomeRecordGoldDetailsHeadView *)headView{ - if (!_headView){ - _headView = [[XPIncomeRecordGoldDetailsHeadView alloc]initWithFrame:CGRectZero]; - _headView.delegate = self; - } - return _headView; -} -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPIncomeRecordGoldDetailsCell class] forCellReuseIdentifier:NSStringFromClass([XPIncomeRecordGoldDetailsCell class])]; - [_tableView registerClass:[XPMineVisitorEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - - } - return _tableView; -} -- (XPGoldDetailsChooseRoomView *)chooseView{ - if (!_chooseView){ - _chooseView = [[XPGoldDetailsChooseRoomView alloc]initWithFrame:CGRectZero]; - _chooseView.delegate = self; - _chooseView.backgroundColor = UIColorFromRGB(0xF0F5F6); - } - return _chooseView; -} - -- (UILabel *)totalView { - if (!_totalView) { - _totalView = [[UILabel alloc] init]; - _totalView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _totalView.textColor = [DJDKMIMOMColor inputTextColor]; - } - return _totalView; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.h deleted file mode 100644 index e59aeac..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPIncomeRecordVC.h -// YuMi -// -// Created by YuMi on 2022/11/17. -// - -#import "MvpViewController.h" -#import "UserInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPIncomeRecordVC : MvpViewController - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m deleted file mode 100644 index a75ce3d..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m +++ /dev/null @@ -1,319 +0,0 @@ -// -// XPIncomeRecordVC.m -// YuMi -// -// Created by YuMi on 2022/11/17. -// - -#import "XPIncomeRecordVC.h" -///view -#import "XPIncomeRecordView.h" -///vc -#import "XPWebViewController.h" -#import "XPExchangeDiamondsVC.h" -#import "XPIncomeRecordGoldDetailsVC.h" -#import "XPIAPRechargeViewController.h" -///Present -#import "XPIncomeRecordPresent.h" -///Protocol -#import "XPIncomeRecordProtocol.h" -///model -#import "XPIncomeRecordModel.h" -///tool -#import "AccountInfoStorage.h" -#import "YUMIHtmlUrl.h" -#import -#import -#import - -#import "FirstRechargeManager.h" - -@interface XPIncomeRecordVC () -///钻石 -@property (nonatomic,strong) XPIncomeRecordView *diamondView; -///金币 -@property (nonatomic,strong) XPIncomeRecordView *goldView; -///model -@property (nonatomic,strong) XPIncomeRecordModel *recordModel; -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *pi_containerView; -@property(nonatomic,strong) UIImageView *bgImageView; -/// 返回 -@property (nonatomic,strong) UIButton *backBtn; -/// 标题 -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPIncomeRecordVC - -- (XPIncomeRecordPresent *)createPresenter { - return [[XPIncomeRecordPresent alloc] init]; -} -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; - [self hideHUD]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [self.presenter requestQueryWithRoomType]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)handleTapFirstCharge { - XPWebViewController *webVC = [[XPWebViewController alloc] initWithRoomUID:@""]; - webVC.url = URLWithType(kFirstChargeBanner); - webVC.isPush = YES; - [self.navigationController pushViewController:webVC animated:YES]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPIncomeRecordVC0"); - [self.view addSubview:self.bgImageView]; - [self.view addSubview:self.backBtn]; - [self.view addSubview:self.titleLabel]; - - [self.view addSubview:self.titleView]; - [self.view addSubview:self.pi_containerView]; - - FirstRechargeModel *model = [FirstRechargeManager.sharedManager loadCurrentModel]; - if (![NSString isEmpty:model.chargeBanner]) { - NetImageView *imageView = [[NetImageView alloc] init]; - imageView.contentMode = UIViewContentModeScaleAspectFill; - [imageView setCornerRadius:12]; - imageView.imageUrl = model.chargeBanner; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapFirstCharge)]; - imageView.userInteractionEnabled = YES; - [imageView addGestureRecognizer:tap]; - [self.view addSubview:imageView]; - [imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-50); - make.leading.trailing.mas_equalTo(self.view).inset(15); - make.height.mas_equalTo(100); - }]; - } -} -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.equalTo(self.view); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kStatusBarHeight); - make.height.mas_equalTo(44); - make.centerX.mas_equalTo(self.view); - }]; - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.top.mas_equalTo(kStatusBarHeight); - make.width.height.mas_equalTo(44); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(33)); - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(kGetScaleWidth(30)); - - }]; - - [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.titleView.mas_bottom).offset(19); - }]; -} -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.goldView; - } else { - return self.diamondView; - } -} -- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index{ - self.bgImageView.image = index == 0 ? kImage(@"ms_mine_top_bg"):kImage(@"ms_mine_diamond_bg"); - self.titleView.titleColor = index == 0 ? UIColorFromRGB(0xA88238):UIColorFromRGB(0x7E8373); -} -#pragma mark - XPExchangeDiamondsVCDelegate --(void)confirmExchangeDiamondsWithDiamondSuccess:(NSString *)diamond gold:(NSString *)gold{ - self.recordModel.diamonds = self.recordModel.diamonds + diamond.doubleValue; - self.recordModel.golds = self.recordModel.golds - gold.doubleValue; - NSString *diamondNum = [NSString stringWithFormat:@"%.0f",self.recordModel.diamonds]; - NSString *goldNum = [NSString stringWithFormat:@"%.2f",self.recordModel.golds]; - self.diamondView.number = goldNum; - self.goldView.number = diamondNum; -} -#pragma mark - XPIncomeRecordProtocol -- (void)requestQueryWithRoomTypeFail{ - -} --(void)getExchangeDiamondInformation:(XPExchangeDiamondsModel *)model{ - [self hideHUD]; - XPExchangeDiamondsVC *exchangeVC = [XPExchangeDiamondsVC new]; - exchangeVC.model = model; - exchangeVC.delegate = self; - [self.navigationController pushViewController:exchangeVC animated:YES]; -} --(void)getRecordIncomeSuccess:(XPIncomeRecordModel *)model{ - [self hideHUD]; - self.recordModel = model; - self.goldView.number = @(model.diamonds).stringValue; - self.diamondView.number = [NSString stringWithFormat:@"%.2f",model.golds]; -} - -#pragma mark - XPIncomeRecordViewDelegate --(void)clickHandleWithType:(IncomeRecordViewClickType)type{ - switch (type) { - case ClickType_Diamond_Detail: - { - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kMineEarningsRecord); - [self.navigationController pushViewController:webVC animated:YES]; - break; - } - case ClickType_Diamond_Pay: - { - XPIAPRechargeViewController * webVC =[[XPIAPRechargeViewController alloc] init]; - webVC.type = @"4"; - [self.navigationController pushViewController:webVC animated:YES]; - break; - } - case ClickType_Gold_Exchangel: - { - if(self.recordModel.isClan == NO){ - XPExchangeDiamondsVC *exchangeVC = [XPExchangeDiamondsVC new]; - exchangeVC.delegate = self; - [self.navigationController pushViewController:exchangeVC animated:YES]; - return; - } - [self showLoading]; - [self.presenter getExchangeDiamondInformation]; - - - break; - } - default: - { - - - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kGoldEarningsRecord); - [self.navigationController pushViewController:webVC animated:YES]; - - break; - } - } -} -/// 返回 -- (void)backBtnAction { - [self.navigationController popViewControllerAnimated:YES]; -} -#pragma mark -懒加载 -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.contentMode = UIViewContentModeScaleToFill; - _bgImageView.image = kImage(@"ms_mine_top_bg"); - } - return _bgImageView; -} -- (XPIncomeRecordView *)diamondView{ - if (!_diamondView){ - _diamondView = [[XPIncomeRecordView alloc]initWithFrame:CGRectZero type:IncomeRecord_Diamond]; - _diamondView.delegate = self; - } - return _diamondView; -} -- (XPIncomeRecordView *)goldView{ - if (!_goldView){ - _goldView = [[XPIncomeRecordView alloc]initWithFrame:CGRectZero type:IncomeRecord_Gold]; - _goldView.delegate = self; - } - return _goldView; -} -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = UIColorFromRGB(0xA88238); - _titleView.titleSelectedColor = UIColorFromRGB(0x4E390A); - _titleView.titleFont = kFontBold(16); - _titleView.titleSelectedFont = kFontHeavy(16); - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.listContainer = self.pi_containerView; - - JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(11), kGetScaleWidth(3)); - lineView.verticalMargin = 0; - lineView.backgroundColor = UIColorFromRGB(0xAA7400); - lineView.layer.masksToBounds = YES; - lineView.layer.cornerRadius = kGetScaleWidth(3)/2; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (NSArray *)titles{ - if(!_titles){ - _titles = @[YMLocalizedString(@"XPIncomeRecordView4"),YMLocalizedString(@"XPIncomeRecordView5")]; - } - return _titles; -} -- (JXCategoryListContainerView *)pi_containerView { - if (!_pi_containerView) { - _pi_containerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _pi_containerView.defaultSelectedIndex = 0; - _pi_containerView.scrollView.tag = 1009; - } - return _pi_containerView; -} -- (UIButton *)backBtn { - if (!_backBtn) { - _backBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backBtn setImage:[[UIImage imageNamed:@"room_info_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backBtn addTarget:self action:@selector(backBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPIncomeRecordVC1"); - _titleLabel.textColor = UIColor.blackColor; - _titleLabel.font = kFontBold(16); - } - return _titleLabel; -} - -/* - #pragma mark - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - - (void)prexpareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - // Get the new view controller using [segue destinationViewController]. - // Pass the selected object to the new view controller. - } - */ - -@end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.h deleted file mode 100644 index b1572ab..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// XPIncomeRecordView.h -// YuMi -// -// Created by YuMi on 2022/11/17. -// - -#import -#import -NS_ASSUME_NONNULL_BEGIN - -typedef enum : NSUInteger { - IncomeRecord_Gold,///金币 - IncomeRecord_Diamond,///钻石 - -} IncomeRecordViewType; - -typedef enum : NSUInteger { - ClickType_Diamond_Detail,///钻石明细 - ClickType_Diamond_Pay,///钻石充值 - ClickType_Gold_Detail,///金币明细 - ClickType_Gold_Exchangel,///金币兑换 -} IncomeRecordViewClickType; - - -@protocol XPIncomeRecordViewDelegate - --(void)clickHandleWithType:(IncomeRecordViewClickType)type; - -@end - -@interface XPIncomeRecordView : UIView -@property (nonatomic,copy) NSString *number; -@property (nonatomic,assign) BOOL isClanPresident; -@property (nonatomic,weak) id delegate; - --(instancetype)initWithFrame:(CGRect)frame type:(IncomeRecordViewType)type; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m deleted file mode 100644 index 56732bf..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m +++ /dev/null @@ -1,204 +0,0 @@ -// -// XPIncomeRecordView.m -// YuMi -// -// Created by YuMi on 2022/11/17. -// - -#import "XPIncomeRecordView.h" -#import "UIView+Corner.h" -@interface XPIncomeRecordView() - -/// 背景 -@property (nonatomic,strong) UIImageView *bgImageView; -@property(nonatomic,strong) UIImageView *coinView; -///标题 -@property (nonatomic,strong) UILabel *titleView; -///明细 -@property (nonatomic,strong) UIButton *detailView; -@property(nonatomic,strong) UIButton *detailArrowView; - -///数量 -@property (nonatomic,strong) UILabel *numberView; - - -///兑换 -@property (nonatomic,strong) UIButton *clickBtn; - -@property (nonatomic,assign) IncomeRecordViewType type; -@end -@implementation XPIncomeRecordView --(instancetype)initWithFrame:(CGRect)frame type:(IncomeRecordViewType)type{ - self = [super initWithFrame:frame]; - if(self){ - self.type = type; - [self initSubViews]; - [self initSubViewConstraints]; - - } - return self; -} -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self addSubview:self.clickBtn]; - [self.bgImageView addSubview:self.coinView]; - [self.bgImageView addSubview:self.titleView]; - [self.bgImageView addSubview:self.detailArrowView]; - [self.bgImageView addSubview:self.detailView]; - [self.bgImageView addSubview:self.numberView]; - - -} -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(0)); - make.width.mas_equalTo(kGetScaleWidth(339)); - make.height.mas_equalTo(kGetScaleWidth(118)); - make.centerX.equalTo(self); - }]; - [self.coinView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(47)); - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.centerY.equalTo(self.bgImageView); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(36)); - make.leading.mas_equalTo(kGetScaleWidth(68)); - - }]; - [self.detailArrowView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(20)); - make.width.mas_equalTo(kGetScaleWidth(4.5)); - make.height.mas_equalTo(kGetScaleWidth(8)); - make.top.mas_equalTo(kGetScaleWidth(38)); - }]; - [self.detailView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(27)); - make.height.mas_equalTo(kGetScaleWidth(12)); - make.centerY.equalTo(self.detailArrowView); - }]; - - [self.numberView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.titleView); - make.top.mas_equalTo(kGetScaleWidth(61)); - }]; - [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(303)); - make.height.mas_equalTo(kGetScaleWidth(48)); - make.top.equalTo(self.bgImageView.mas_bottom).mas_offset(kGetScaleWidth(46)); - make.centerX.equalTo(self); - }]; -} --(void)setNumber:(NSString *)number{ - _number = number; - _numberView.text = _number; -} - -#pragma mark - btnClick --(void)clickDetailViewAction{ - if(self.type == IncomeRecord_Gold){ - [self clickDiamondDetailAction]; - return; - } - [self clickGoldDetailAction]; -} -///钻石明细 --(void)clickDiamondDetailAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(clickHandleWithType:)]){ - [self.delegate clickHandleWithType:ClickType_Diamond_Detail]; - } -} - --(void)clickBtnAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(clickHandleWithType:)]){ - [self.delegate clickHandleWithType:self.type == IncomeRecord_Gold ? ClickType_Diamond_Pay : ClickType_Gold_Exchangel]; - } -} -///金币明细 --(void)clickGoldDetailAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(clickHandleWithType:)]){ - [self.delegate clickHandleWithType:ClickType_Gold_Detail]; - } -} - - -#pragma mark - 懒加载 -- (UIImageView *)bgImageView{ - if (!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.userInteractionEnabled = YES; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - _bgImageView.image = self.type == IncomeRecord_Gold ? [[UIImage imageNamed:@"income_record_gold_bg"] ms_SetImageForRTL]:[[UIImage imageNamed:@"income_record_diamond_bg"] ms_SetImageForRTL]; - } - return _bgImageView; -} -- (UIImageView *)coinView{ - if(!_coinView){ - _coinView = [UIImageView new]; - _coinView.image = self.type == IncomeRecord_Gold ? [UIImage imageNamed:@"moli_money_icon"]:[UIImage imageNamed:@"ms_income_recorddiamond"]; - } - return _coinView; -} -- (UILabel *)titleView { - if (!_titleView) { - _titleView = [[UILabel alloc] init]; - _titleView.font = kFontBold(15); - _titleView.textColor = self.type == IncomeRecord_Gold ? UIColorFromRGB(0x9F4805) : UIColorFromRGB(0xffffff); - _titleView.text = self.type == IncomeRecord_Gold ? YMLocalizedString(@"XPDressUpShopViewController7"):YMLocalizedString(@"XPExchangeDiamondsItemView2"); - } - return _titleView; -} - --(UIButton *)detailView{ - if (!_detailView){ - _detailView = [UIButton new]; - [_detailView setTitle:YMLocalizedString(@"XPIncomeRecordView0") forState:UIControlStateNormal]; - [_detailView setTitleColor:self.type == IncomeRecord_Gold ? UIColorFromRGB(0xB38C3F):UIColorFromRGB(0x737D83) forState:UIControlStateNormal]; - _detailView.titleLabel.font = [UIFont systemFontOfSize:13]; - - [_detailView addTarget:self action:@selector(clickDetailViewAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _detailView; -} -- (UIButton *)detailArrowView{ - if(!_detailArrowView){ - _detailArrowView = [UIButton new]; - [_detailArrowView setBackgroundImage:self.type == IncomeRecord_Gold ? [[UIImage imageNamed:@"income_record_arrow_1"]ms_SetImageForRTL]: [[UIImage imageNamed:@"income_record_arrow_2"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_detailArrowView setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_detailArrowView addTarget:self action:@selector(clickDetailViewAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _detailArrowView; -} - -- (UILabel *)numberView { - if (!_numberView) { - _numberView = [[UILabel alloc] init]; - _numberView.font = kFontHeavy(24); - _numberView.textColor = self.type == IncomeRecord_Gold ? UIColorFromRGB(0xFFFBD5) : UIColorFromRGB(0xFFFBD5); - _numberView.text = @"0"; - } - return _numberView; -} - -- (UIButton *)clickBtn{ - if(!_clickBtn){ - _clickBtn = [UIButton new]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x70E9FF),UIColorFromRGB(0xAE87FF),UIColorFromRGB(0xFF5CE1)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(303), kGetScaleWidth(48))]; - [_clickBtn setBackgroundImage:image forState:UIControlStateNormal]; - [_clickBtn setTitle:self.type == IncomeRecord_Gold ? YMLocalizedString(@"XPIncomeRecordView1") : YMLocalizedString(@"XPTreasureFairyShopingExchangeCell1") forState:UIControlStateNormal]; - [_clickBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _clickBtn.titleLabel.font = kFontHeavy(16); - [_clickBtn addTarget:self action:@selector(clickBtnAction) forControlEvents:UIControlEventTouchUpInside]; - _clickBtn.layer.cornerRadius = kGetScaleWidth(48)/2; - _clickBtn.layer.masksToBounds = YES; - } - return _clickBtn; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPTextField.h b/YuMi/Modules/YMMine/View/IncomeRecord/XPTextField.h deleted file mode 100644 index 1f403ea..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPTextField.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPTextField.h -// YuMi -// -// Created by YuMi on 2023/7/3. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPTextField : MSBaseTextField -@property (nonatomic,assign) BOOL isValidation; -@property (nonatomic,copy) NSString *regular; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPTextField.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPTextField.m deleted file mode 100644 index 633881b..0000000 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPTextField.m +++ /dev/null @@ -1,60 +0,0 @@ -// -// XPTextField.m -// YuMi -// -// Created by YuMi on 2023/7/3. -// - -#import "XPTextField.h" -@interface XPTextField() - -@end -@implementation XPTextField - - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - self.delegate = self; - } - return self; -} - -- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { - - if(self.isValidation == NO){ - return YES; - } - return [self validateNumber:string]; -} - -- (BOOL)validateNumber:(NSString*)number { - BOOL res = YES; - NSCharacterSet* tmpSet = [NSCharacterSet characterSetWithCharactersInString:self.regular]; - int i = 0; - while (i < number.length) { - NSString * string = [number substringWithRange:NSMakeRange(i, 1)]; - NSRange range = [string rangeOfCharacterFromSet:tmpSet]; - if (range.length == 0) { - res = NO; - break; - } - i++; - } - return res; -} - -- (NSString *)regular{ - if (!_regular){ - _regular = @"0123456789"; - } - return _regular; -} -- (BOOL)isValidation{ - if (!_isValidation){ - _isValidation = NO; - } - return _isValidation; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsCollectionViewCell.h b/YuMi/Modules/YMMine/View/Medals/MedalsCollectionViewCell.h deleted file mode 100644 index f9b8b41..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsCollectionViewCell.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// MedalsCollectionViewCell.h -// YuMi -// -// Created by P on 2025/6/18. -// - -#import -@class MedalSeriesItemVo; -NS_ASSUME_NONNULL_BEGIN - -@interface MedalsCollectionViewCell : UICollectionViewCell - -+ (void)registerTo:(UICollectionView *)collectionView; -+ (instancetype)cellFor:(UICollectionView *)collectionView atIndexPath:(NSIndexPath *)index; - -- (void)updateCell:(MedalSeriesItemVo *)model isForSquare:(BOOL)isSquare isForMine:(BOOL)isMine; - -/** - * 当 cell 将要显示时调用 - * 用于恢复 mp4 播放 - */ -- (void)willDisplay; - -/** - * 当 cell 结束显示时调用 - * 用于暂停 mp4 播放 - */ -- (void)didEndDisplaying; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsCollectionViewCell.m b/YuMi/Modules/YMMine/View/Medals/MedalsCollectionViewCell.m deleted file mode 100644 index 692d588..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsCollectionViewCell.m +++ /dev/null @@ -1,538 +0,0 @@ -// -// MedalsCollectionViewCell.m -// YuMi -// -// Created by P on 2025/6/18. -// - -#import "MedalsCollectionViewCell.h" -#import "MedalsModel.h" -#import -#import "XPRoomGiftAnimationParser.h" -#import "MedalsLevelIndicatorView.h" - - -@interface MedalsCollectionViewCell () - -@property(nonatomic, copy) NSString *imagePath; -@property(nonatomic, copy) NSString *mp4Path; - -@property(nonatomic, strong) NetImageView *imageView; -@property(nonatomic, strong) VAPView *mp4View; -@property(nonatomic, strong) XPRoomGiftAnimationParser *mp4Parser; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UILabel *subLabel; -@property (nonatomic, strong) MedalsLevelIndicatorView *levelIndicatorView; - -@property (nonatomic, strong) MedalVo *displayModel; -@property (nonatomic, strong) MedalSeriesItemVo *currentItemVo; -@property (nonatomic, assign) BOOL isVisible; // 跟踪 cell 是否可见 - -@end - -@implementation MedalsCollectionViewCell - -+ (NSString *)cellID { - return NSStringFromClass([MedalsCollectionViewCell class]); -} - -+ (void)registerTo:(UICollectionView *)collectionView { - [collectionView registerClass:[self class] forCellWithReuseIdentifier:[self cellID]]; -} - -+ (instancetype)cellFor:(UICollectionView *)collectionView atIndexPath:(NSIndexPath *)index { - MedalsCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:[self cellID] - forIndexPath:index]; - return cell; -} - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self.contentView addGradientBackgroundWithColors:@[ - UIColorFromRGB(0x41007b), - UIColorFromRGB(0x290858) - ] startPoint:CGPointMake(0.5, 0) endPoint:CGPointMake(0.5, 1) cornerRadius:8]; - - [self.contentView setAllCornerRadius:8 - borderWidth:1 - borderColor:UIColorFromRGB(0xa166bf)]; - - self.imageView = [[NetImageView alloc] init]; - self.imageView.contentMode = UIViewContentModeScaleAspectFill; - [self.contentView addSubview:self.imageView]; - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(13); - make.leading.trailing.mas_equalTo(self.contentView).inset(13); - make.height.mas_equalTo(self.imageView.mas_width); - }]; - - [self.contentView addSubview:self.mp4View]; - [self.mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.imageView); - }]; - - self.titleLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:[UIColor whiteColor]]; - self.titleLabel.adjustsFontSizeToFitWidth = YES; - self.titleLabel.minimumScaleFactor = 0.5; - self.subLabel = [UILabel labelInitWithText:@"" font:kFontRegular(11) textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - self.titleLabel.textAlignment = NSTextAlignmentCenter; - self.subLabel.textAlignment = NSTextAlignmentCenter; - [self.contentView addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.imageView.mas_bottom).offset(3); - make.leading.trailing.mas_equalTo(self.contentView).inset(10); - }]; - [self.contentView addSubview:self.subLabel]; - [self.subLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(7); - make.leading.trailing.mas_equalTo(self.contentView).inset(3); - }]; - - // 添加等级指示器 - self.levelIndicatorView = [[MedalsLevelIndicatorView alloc] init]; - [self.contentView addSubview:self.levelIndicatorView]; - [self.levelIndicatorView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView).offset(-8); - make.leading.trailing.mas_greaterThanOrEqualTo(self.contentView).inset(8); - make.height.mas_equalTo(26); // 增加高度以适应圆点和文本 - }]; - - // 设置等级选择回调 -// @kWeakify(self); -// self.levelIndicatorView.levelSelectedBlock = ^(NSInteger level) { -// @kStrongify(self); -// // 处理等级选择事件 -// if (self.currentItemVo && level <= self.currentItemVo.medalVos.count) { -// MedalVo *selectedMedalVo = [self.currentItemVo.medalVos xpSafeObjectAtIndex:level - 1]; -// if (selectedMedalVo) { -// self.displayModel = selectedMedalVo; -// [self updateDisplayWithCurrentModel]; -// } -// } -// }; - - // 设置通知监听 - [self setupNotifications]; - } - return self; -} - -- (void)setupNotifications { - // 监听应用进入后台和恢复前台的通知 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(appDidEnterBackground) - name:UIApplicationDidEnterBackgroundNotification - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(appWillEnterForeground) - name:UIApplicationWillEnterForegroundNotification - object:nil]; - - // 监听内存警告通知 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(didReceiveMemoryWarning) - name:UIApplicationDidReceiveMemoryWarningNotification - object:nil]; -} - -- (void)prepareForReuse { - [super prepareForReuse]; - - // 停止播放 - [self stopMP4Playback]; - - // 更彻底地重置 mp4View - [self resetMP4View]; - - // 隐藏视图 - self.mp4View.hidden = YES; - self.imageView.hidden = YES; - - // 重置状态 - self.mp4Path = nil; - self.imagePath = nil; - self.isVisible = NO; - self.displayModel = nil; // 重置数据模型 - self.currentItemVo = nil; // 重置当前项 - - // 清空文本 - self.titleLabel.text = @""; - self.subLabel.text = @""; - - // 重置等级指示器 - [self.levelIndicatorView resetToLevel:0]; - - // 清空图片 - self.imageView.image = nil; - self.imageView.imageUrl = @""; -} - -- (void)updateCell:(MedalSeriesItemVo *)model isForSquare:(BOOL)isSquare isForMine:(BOOL)isMine { - self.currentItemVo = model; - - // 设置指示器类型为不带图片 - self.levelIndicatorView.indicatorType = MedalsLevelIndicatorTypeNormal; - - // 配置等级指示器 - [self.levelIndicatorView setupWithMaxLevel:model.medalLevel]; - - if (isSquare) { - self.subLabel.hidden = YES; - self.displayModel = [model.medalVos xpSafeObjectAtIndex:model.medalVos.count - 1]; - [self.levelIndicatorView setSelectedLevel:model.medalLevel animated:NO]; - } else { - self.subLabel.hidden = !isMine; - self.levelIndicatorView.userInteractionEnabled = YES; - self.displayModel = [model.medalVos xpSafeObjectAtIndex:0]; - NSMutableArray *arr = @[].mutableCopy; - for (MedalVo *vo in model.medalVos) { - if (vo.hasGain) { - [arr addObject:@(vo.level)]; - if (vo.level > self.displayModel.level) { - self.displayModel = vo; - } - } - } - [self.levelIndicatorView setHighlightLevels:arr animated:NO]; - } - - self.levelIndicatorView.userInteractionEnabled = !isSquare; - - [self updateDisplayWithCurrentModel]; -} - -- (void)updateDisplayWithCurrentModel { - if (!self.displayModel || !self.currentItemVo) { - [self showDefaultPlaceholder]; - return; - } - - // 优化后的判断逻辑：更严格的 MP4 URL 验证 - NSString *mp4Url = self.displayModel.mp4Url; - NSString *picUrl = self.displayModel.picUrl; - - // 首先检查是否有明确的 MP4 URL - if (![NSString isEmpty:mp4Url] && [self isValidMP4URL:mp4Url]) { - [self setMp4Path:mp4Url]; - [self updateTextLabels]; - return; - } - - // 检查 picUrl 是否实际上是 MP4（兼容旧逻辑） - if (![NSString isEmpty:picUrl]) { - if ([self isValidMP4URL:picUrl]) { - [self setMp4Path:picUrl]; - [self updateTextLabels]; - return; - } else if ([NSString isValidImageURL:picUrl]) { - [self setImagePath:picUrl]; - [self updateTextLabels]; - return; - } - } - - // 都不满足，显示默认占位图 - [self showDefaultPlaceholder]; - - // 设置文本信息（无论是否有有效的媒体内容都要设置） - [self updateTextLabels]; -} - -#pragma mark - 私有方法 - -/// 验证是否为有效的 MP4 URL -- (BOOL)isValidMP4URL:(NSString *)url { - if ([NSString isEmpty:url]) { - return NO; - } - - // 检查 URL 是否以 mp4 结尾或包含 mp4 标识 - NSString *lowercaseUrl = [url lowercaseString]; - return [lowercaseUrl hasSuffix:@".mp4"] || - [lowercaseUrl containsString:@"mp4"] || - [lowercaseUrl containsString:@"video"]; -} - -/// 更新文本标签 -- (void)updateTextLabels { - self.titleLabel.text = self.currentItemVo.seriesName; - self.subLabel.text = [self.displayModel expireDateString]; -} - -/// 显示默认占位图 -- (void)showDefaultPlaceholder { - [self stopMP4Playback]; - self.mp4View.hidden = YES; - self.imageView.hidden = NO; - - // 设置默认占位图 - self.imageView.imageUrl = @""; - self.imageView.image = [UIImageConstant defaultEmptyPlaceholder]; -} - -/// 根据新的优先级逻辑获取勋章的图片URL -- (NSString *)getImageUrlForMedal:(MedalVo *)medal { - if (!medal) { - return @""; - } - -#if 0 - // Debug 环境：如果数据不满足新条件，使用原有逻辑 - if ([NSString isEmpty:medal.mp4Url] && ![NSString isEmpty:medal.picUrl]) { - return medal.picUrl; - } -#endif - - // 新逻辑：优先使用 mp4URL - if (![NSString isEmpty:medal.mp4Url]) { - return medal.mp4Url; - } else if (![NSString isEmpty:medal.picUrl]) { - // mp4URL 为空，使用 picURL (需要验证是否为有效图片) - if ([NSString isValidImageURL:medal.picUrl]) { - return medal.picUrl; - } else { - // picURL 不是有效图片，返回空字符串 - return @""; - } - } else { - // 都为空，返回空字符串 - return @""; - } -} - -- (void)setImagePath:(NSString *)imagePath { - if ([NSString isEmpty:imagePath]) { - self.imageView.hidden = YES; - return; - } - // 停止之前的 mp4 播放 - [self stopMP4Playback]; - - _imagePath = imagePath; - self.mp4View.hidden = YES; - self.imageView.hidden = NO; - self.imageView.imageUrl = imagePath; -} - -- (void)setMp4Path:(NSString *)mp4Path { - if ([NSString isEmpty:mp4Path]) { - self.mp4View.hidden = YES; - return; - } - - // 停止之前的 mp4 播放 - [self stopMP4Playback]; - - _mp4Path = mp4Path; - self.mp4View.hidden = NO; - self.imageView.hidden = YES; - - if (!_mp4Parser) { - self.mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - } - - @kWeakify(self); - [self.mp4Parser parseWithURL:mp4Path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl]) { - // 延迟播放机制：先标记为准备就绪，等待明确的播放信号 - self.mp4View.tag = 1; // 标记已准备好播放 - - // 如果当前 Cell 可见，立即播放 - if (self.isVisible) { - [self startMP4PlaybackWithURL:videoUrl]; - } - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - NSLog(@"[MedalsCollectionViewCell] Failed to parse mp4: %@, fallback to image", error); - // MP4 解析失败，降级使用 picURL - [self handleMP4FailureWithFallback]; - }]; -} - -/// 开始 MP4 播放 -- (void)startMP4PlaybackWithURL:(NSString *)videoUrl { - if (![NSString isEmpty:videoUrl] && self.mp4View && !self.mp4View.hidden) { - [self.mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:self]; - NSLog(@"[MedalsCollectionViewCell] Started MP4 playback: %@", videoUrl); - } -} - -/// 处理 MP4 播放失败，降级使用 picURL -- (void)handleMP4FailureWithFallback { - if (![NSString isEmpty:self.displayModel.picUrl]) { - if ([NSString isValidImageURL:self.displayModel.picUrl]) { - [self setImagePath:self.displayModel.picUrl]; - } else { - [self showDefaultPlaceholder]; - } - } else { - [self showDefaultPlaceholder]; - } -} - -#pragma mark - MP4 播放控制 - -/// 重置 MP4 视图，清理所有缓存内容 -- (void)resetMP4View { - if (self.mp4View) { - // 方案1: 基础重置（推荐） - [self.mp4View stopHWDMP4]; - self.mp4View.tag = 0; - self.mp4View.hidden = YES; - - // 方案2: 完全重置（如果遇到严重的缓存问题才启用） - if (YES) { // 根据需要设置为 NO 来禁用完全重置 - [self.mp4View removeFromSuperview]; - _mp4View = nil; - // 重新添加 mp4View - [self.contentView addSubview:self.mp4View]; - [self.mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.imageView); - }]; - } - - // 方案3: 强制清理内存（备用方案） - // 通过设置新的frame来触发内部清理 - if (NO) { // 可以启用此方案作为替代 - CGRect currentFrame = self.mp4View.frame; - self.mp4View.frame = CGRectZero; - self.mp4View.frame = currentFrame; - } - } -} - -- (void)stopMP4Playback { - if (self.mp4View) { - [self.mp4View stopHWDMP4]; - self.mp4View.tag = 0; // 重置播放状态标记 - } -} - -- (void)pauseMP4Playback { - if (self.mp4View && !self.mp4View.hidden) { - [self.mp4View stopHWDMP4]; - } -} - -- (void)resumeMP4Playback { - if (self.mp4View && !self.mp4View.hidden && self.mp4Path) { - if (self.mp4View.tag == 1) { // 已准备好但尚未播放 - @kWeakify(self); - [self.mp4Parser parseWithURL:self.mp4Path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl] && self.isVisible) { - [self startMP4PlaybackWithURL:videoUrl]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - // MP4 恢复播放失败，降级使用 picURL - [self handleMP4FailureWithFallback]; - }]; - } else { - [self.mp4View resumeHWDMP4]; - } - } -} - -- (void)vapWrap_viewDidFailPlayMP4:(NSError *)error { - NSLog(@"%@", error); -} - - -#pragma mark - HWDMP4PlayDelegate - -- (BOOL)shouldStartPlayMP4:(VAPView *)container config:(QGVAPConfigModel *)config { - return YES; -} - -- (void)viewDidFinishPlayMP4:(NSInteger)totalFrameCount view:(VAPView *)container { - // MP4 播放完成，循环播放会自动重新开始 -} - -- (void)viewDidStopPlayMP4:(NSInteger)lastFrameIndex view:(VAPView *)container { - // MP4 播放停止 -} - -- (void)viewDidFailPlayMP4:(NSError *)error { - NSLog(@"MP4 播放失败: %@", error); - // MP4 播放失败，降级使用 picURL - [self handleMP4FailureWithFallback]; -} - -#pragma mark - 可见性管理 - -- (void)willDisplay { - self.isVisible = YES; -// return; - - // 如果有准备好的 MP4，立即开始播放 - if (self.mp4View.tag == 1 && !self.mp4View.hidden && self.mp4Path) { - [self resumeMP4Playback]; - } else if (!self.mp4View.hidden) { - // 恢复之前暂停的播放 - [self resumeMP4Playback]; - } - - NSLog(@"[MedalsCollectionViewCell] willDisplay - isVisible: %@, mp4Path: %@", - self.isVisible ? @"YES" : @"NO", self.mp4Path ?: @"nil"); -} - -- (void)didEndDisplaying { - self.isVisible = NO; - [self pauseMP4Playback]; -} - -#pragma mark - 通知处理 - -- (void)appDidEnterBackground { - [self pauseMP4Playback]; -} - -- (void)appWillEnterForeground { - if (self.isVisible) { - [self resumeMP4Playback]; - } -} - -- (void)didReceiveMemoryWarning { - // 内存警告时停止播放 - if (!self.isVisible) { - [self stopMP4Playback]; - } -} - -#pragma mark - 生命周期 - -- (void)dealloc { - // 停止播放 - [self stopMP4Playback]; - - // 移除通知观察者 - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - // 清理资源 - self.mp4Parser = nil; - NSLog(@"MedalsCollectionViewCell dealloc"); -} - -- (VAPView *)mp4View { - if (!_mp4View) { - _mp4View = [[VAPView alloc] init]; - _mp4View.contentMode = UIViewContentModeScaleAspectFit; -// [_mp4View enableOldVersion:YES]; - } - return _mp4View; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsCyclePagerCell.h b/YuMi/Modules/YMMine/View/Medals/MedalsCyclePagerCell.h deleted file mode 100644 index 527eac3..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsCyclePagerCell.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// MedalsCyclePagerCell.h -// YuMi -// -// Created by P on 2025/1/7. -// - -#import -@class MedalVo; -NS_ASSUME_NONNULL_BEGIN - -@interface MedalsCyclePagerCell : UICollectionViewCell - -- (void)updateCell:(MedalVo *)model; - -/** - * 当 cell 将要显示时调用 - * 用于恢复 mp4 播放 - */ -- (void)willDisplay; - -/** - * 当 cell 结束显示时调用 - * 用于暂停 mp4 播放 - */ -- (void)didEndDisplaying; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsCyclePagerCell.m b/YuMi/Modules/YMMine/View/Medals/MedalsCyclePagerCell.m deleted file mode 100644 index 4f20943..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsCyclePagerCell.m +++ /dev/null @@ -1,404 +0,0 @@ -// -// MedalsCyclePagerCell.m -// YuMi -// -// Created by P on 2025/1/7. -// - -#import "MedalsCyclePagerCell.h" -#import "MedalsModel.h" -#import -#import "XPRoomGiftAnimationParser.h" - -@interface MedalsCyclePagerCell () - -@property(nonatomic, copy) NSString *imagePath; -@property(nonatomic, copy) NSString *mp4Path; - -@property(nonatomic, strong) NetImageView *imageView; -@property(nonatomic, strong) VAPView *mp4View; -@property(nonatomic, strong) XPRoomGiftAnimationParser *mp4Parser; - -@property (nonatomic, strong) MedalVo *displayModel; -@property (nonatomic, assign) BOOL isVisible; // 跟踪 cell 是否可见 - -@end - -@implementation MedalsCyclePagerCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self setupUI]; - [self setupNotifications]; - } - return self; -} - -- (instancetype)init { - self = [super init]; - if (self) { - [self setupUI]; - [self setupNotifications]; - } - return self; -} - -- (void)setupUI { - self.isVisible = YES; - - self.backgroundColor = [UIColor clearColor]; - self.contentView.backgroundColor = [UIColor clearColor]; - - // 添加图片视图 - self.imageView = [[NetImageView alloc] init]; - self.imageView.contentMode = UIViewContentModeScaleAspectFit; - [self.contentView addSubview:self.imageView]; - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(184, 184)); - }]; - - // 添加 MP4 视图 - [self.contentView addSubview:self.mp4View]; - [self.mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.imageView); - }]; -} - -- (void)setupNotifications { - // 监听应用进入后台和恢复前台的通知 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(appDidEnterBackground) - name:UIApplicationDidEnterBackgroundNotification - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(appWillEnterForeground) - name:UIApplicationWillEnterForegroundNotification - object:nil]; - - // 监听内存警告通知 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(didReceiveMemoryWarning) - name:UIApplicationDidReceiveMemoryWarningNotification - object:nil]; -} - -- (void)prepareForReuse { - [super prepareForReuse]; - - // 停止播放 - [self stopMP4Playback]; - - // 更彻底地重置 mp4View - [self resetMP4View]; - - // 隐藏视图 - self.mp4View.hidden = YES; - self.imageView.hidden = YES; - - // 重置状态 - self.mp4Path = nil; - self.imagePath = nil; - self.isVisible = YES; - self.displayModel = nil; // 重置数据模型 - - // 清空图片 - self.imageView.image = nil; - self.imageView.imageUrl = @""; -} - -- (void)updateCell:(MedalVo *)model { - self.displayModel = model; - [self updateDisplayWithCurrentModel]; -} - -- (void)updateDisplayWithCurrentModel { - if (!self.displayModel) { - [self showDefaultPlaceholder]; - return; - } - - // 优化后的判断逻辑：更严格的 MP4 URL 验证 - NSString *mp4Url = self.displayModel.mp4Url; - NSString *picUrl = self.displayModel.picUrl; - - // 首先检查是否有明确的 MP4 URL - if (![NSString isEmpty:mp4Url] && [self isValidMP4URL:mp4Url]) { - [self setMp4Path:mp4Url]; - return; - } - - // 检查 picUrl 是否实际上是 MP4（兼容旧逻辑） - if (![NSString isEmpty:picUrl]) { - if ([self isValidMP4URL:picUrl]) { - [self setMp4Path:picUrl]; - return; - } else if ([NSString isValidImageURL:picUrl]) { - [self setImagePath:picUrl]; - return; - } - } - - // 都不满足，显示默认占位图 - [self showDefaultPlaceholder]; -} - -#pragma mark - 私有方法 - -/// 验证是否为有效的 MP4 URL -- (BOOL)isValidMP4URL:(NSString *)url { - if ([NSString isEmpty:url]) { - return NO; - } - - // 检查 URL 是否以 mp4 结尾或包含 mp4 标识 - NSString *lowercaseUrl = [url lowercaseString]; - return [lowercaseUrl hasSuffix:@".mp4"] || - [lowercaseUrl containsString:@"mp4"] || - [lowercaseUrl containsString:@"video"]; -} - -/// 显示默认占位图 -- (void)showDefaultPlaceholder { - [self stopMP4Playback]; - self.mp4View.hidden = YES; - self.imageView.hidden = NO; - - // 设置默认占位图，如果没有可以使用透明图片或者空白 - self.imageView.imageUrl = @""; - self.imageView.image = [UIImageConstant defaultEmptyPlaceholder]; -} - -- (void)setImagePath:(NSString *)imagePath { - // 停止之前的 mp4 播放 - [self stopMP4Playback]; - - _imagePath = imagePath; - self.mp4View.hidden = YES; - self.imageView.hidden = NO; - self.imageView.imageUrl = imagePath; -} - -- (void)setMp4Path:(NSString *)mp4Path { - if ([NSString isEmpty:mp4Path]) { - self.mp4View.hidden = YES; - [self handleMP4FailureWithFallback]; - return; - } - // 如果是相同的 mp4 路径，不需要重新加载 -// if ([_mp4Path isEqualToString:mp4Path]) { -// return; -// } - - // 停止之前的 mp4 播放 - [self stopMP4Playback]; - - _mp4Path = mp4Path; - self.mp4View.hidden = NO; - self.imageView.hidden = YES; - - if (!_mp4Parser) { - self.mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - } - - @kWeakify(self); - [self.mp4Parser parseWithURL:mp4Path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl]) { - // 延迟播放机制：先标记为准备就绪，等待明确的播放信号 - self.mp4View.tag = 1; // 标记已准备好播放 - - // 如果当前 Cell 可见，立即播放 - if (self.isVisible) { - [self startMP4PlaybackWithURL:videoUrl]; - } - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - NSLog(@"[MedalsCyclePagerCell] Failed to parse mp4: %@, fallback to image", error); - // MP4 解析失败，降级使用 picURL - [self handleMP4FailureWithFallback]; - }]; -} - -/// 开始 MP4 播放 -- (void)startMP4PlaybackWithURL:(NSString *)videoUrl { - if (![NSString isEmpty:videoUrl] && self.mp4View && !self.mp4View.hidden) { - [self.mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:self]; - NSLog(@"[MedalsCyclePagerCell] Started MP4 playback: %@", videoUrl); - } -} - -/// 处理 MP4 播放失败，降级使用 picURL -- (void)handleMP4FailureWithFallback { - if (![NSString isEmpty:self.displayModel.picUrl]) { - if ([NSString isValidImageURL:self.displayModel.picUrl]) { - [self setImagePath:self.displayModel.picUrl]; - } else { - [self showDefaultPlaceholder]; - } - } else { - [self showDefaultPlaceholder]; - } -} - -#pragma mark - MP4 播放控制 - -/// 重置 MP4 视图，清理所有缓存内容 -- (void)resetMP4View { - if (self.mp4View) { - // 方案1: 基础重置（推荐） - [self.mp4View stopHWDMP4]; - self.mp4View.tag = 0; - self.mp4View.hidden = YES; - - // 方案2: 完全重置（如果遇到严重的缓存问题才启用） - if (NO) { // 根据需要设置为 NO 来禁用完全重置 - [self.mp4View removeFromSuperview]; - _mp4View = nil; - // 重新添加 mp4View - [self.contentView addSubview:self.mp4View]; - [self.mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.imageView); - }]; - } - - // 方案3: 强制清理内存（备用方案） - // 通过设置新的frame来触发内部清理 - if (NO) { // 可以启用此方案作为替代 - CGRect currentFrame = self.mp4View.frame; - self.mp4View.frame = CGRectZero; - self.mp4View.frame = currentFrame; - } - } -} - -- (void)stopMP4Playback { - if (self.mp4View) { - [self.mp4View stopHWDMP4]; - self.mp4View.tag = 0; // 重置播放状态标记 - } -} - -#pragma mark - 可见性管理 - -- (void)willDisplay { - self.isVisible = YES; - - // 重新开始播放，而不是恢复暂停的播放 - if (!self.mp4View.hidden && self.mp4Path) { - // 彻底停止当前播放 - [self stopMP4Playback]; - - // 重新开始播放 - if (!_mp4Parser) { - self.mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - } - - @kWeakify(self); - [self.mp4Parser parseWithURL:self.mp4Path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl] && self.isVisible) { - [self startMP4PlaybackWithURL:videoUrl]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - NSLog(@"[MedalsCyclePagerCell] Failed to restart mp4 in willDisplay: %@", error); - [self handleMP4FailureWithFallback]; - }]; - } - - NSLog(@"[MedalsCyclePagerCell] willDisplay - isVisible: %@, mp4Path: %@", - self.isVisible ? @"YES" : @"NO", self.mp4Path ?: @"nil"); -} - -- (void)didEndDisplaying { - self.isVisible = NO; - // 彻底停止播放，而不是暂停 - [self stopMP4Playback]; -} - -#pragma mark - 通知处理 - -- (void)appDidEnterBackground { - [self stopMP4Playback]; -} - -- (void)appWillEnterForeground { - if (self.isVisible && !self.mp4View.hidden && self.mp4Path) { - // 重新开始播放 - if (!_mp4Parser) { - self.mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - } - - @kWeakify(self); - [self.mp4Parser parseWithURL:self.mp4Path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl] && self.isVisible) { - [self startMP4PlaybackWithURL:videoUrl]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - [self handleMP4FailureWithFallback]; - }]; - } -} - -- (void)didReceiveMemoryWarning { - // 内存警告时停止播放 - if (!self.isVisible) { - [self stopMP4Playback]; - } -} - -#pragma mark - 生命周期 - -- (void)dealloc { - // 停止播放 - [self stopMP4Playback]; - - // 移除通知观察者 - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - // 清理资源 - self.mp4Parser = nil; - NSLog(@"MedalsCyclePagerCell dealloc"); -} - -#pragma mark - Lazy load - -- (VAPView *)mp4View { - if (!_mp4View) { - _mp4View = [[VAPView alloc] init]; - _mp4View.contentMode = UIViewContentModeScaleAspectFit; -// [_mp4View enableOldVersion:YES]; - } - return _mp4View; -} - -#pragma mark - HWDMP4PlayDelegate - -- (BOOL)shouldStartPlayMP4:(VAPView *)container config:(QGVAPConfigModel *)config { - return YES; -} - -- (void)viewDidFinishPlayMP4:(NSInteger)totalFrameCount view:(VAPView *)container { - // MP4 播放完成，循环播放会自动重新开始 -} - -- (void)viewDidStopPlayMP4:(NSInteger)lastFrameIndex view:(VAPView *)container { - // MP4 播放停止 -} - -- (void)viewDidFailPlayMP4:(NSError *)error { - NSLog(@"MP4 播放失败: %@", error); - // MP4 播放失败，降级使用 picURL - [self handleMP4FailureWithFallback]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsDetailView.h b/YuMi/Modules/YMMine/View/Medals/MedalsDetailView.h deleted file mode 100644 index 22bd85a..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsDetailView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// MedalsDetailView.h -// YuMi -// -// Created by P on 2025/6/18. -// - -#import -@class MedalSeriesItemVo; -NS_ASSUME_NONNULL_BEGIN - -@interface MedalsDetailView : UIView - -- (void)updateSeriesItem:(MedalSeriesItemVo *)detailItem isMine:(BOOL)isMine; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsDetailView.m b/YuMi/Modules/YMMine/View/Medals/MedalsDetailView.m deleted file mode 100644 index 6bc64df..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsDetailView.m +++ /dev/null @@ -1,392 +0,0 @@ -// -// MedalsDetailView.m -// YuMi -// -// Created by P on 2025/6/18. -// - -#import "MedalsDetailView.h" -#import "MedalsModel.h" -#import -#import "XPRoomGiftAnimationParser.h" -#import "MedalsLevelIndicatorView.h" - -@interface MedalsDetailView () - -@property (nonatomic, strong) UIImageView *bgLightImageView; -@property(nonatomic, copy) NSString *imagePath; -@property(nonatomic, copy) NSString *mp4Path; -@property(nonatomic, strong) NetImageView *imageView; -@property(nonatomic, strong) VAPView *mp4View; -@property(nonatomic, strong) XPRoomGiftAnimationParser *mp4Parser; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UILabel *subLabel; -@property (nonatomic, strong) MedalsLevelIndicatorView *levelIndicatorView; - -@property (nonatomic, strong) MedalSeriesItemVo *currentSeriesItemVO; -@property (nonatomic, strong) MedalVo *displayModel; - -@property (nonatomic, strong) MedalSeriesItemVo *detailItemVo; - -@end - -@implementation MedalsDetailView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self setupUI]; - } - return self; -} - -- (void)setupUI { - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.8]; - - [self addSubview:self.bgLightImageView]; - [self.bgLightImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self); - make.height.mas_equalTo(self.bgLightImageView.mas_width); - }]; - - self.imageView = [[NetImageView alloc] init]; - self.imageView.contentMode = UIViewContentModeScaleAspectFill; - [self addSubview:self.imageView]; - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(kGetScaleWidth(135)); - make.size.mas_equalTo(CGSizeMake(228, 228)); - }]; - - [self addSubview:self.mp4View]; - [self.mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.imageView); - }]; - - self.titleLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(20) textColor:[UIColor whiteColor]]; - self.subLabel = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - self.titleLabel.textAlignment = NSTextAlignmentCenter; - self.subLabel.textAlignment = NSTextAlignmentCenter; - self.subLabel.numberOfLines = 2; - [self addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.imageView.mas_bottom).offset(8); - make.leading.trailing.mas_equalTo(self).inset(13); - make.height.mas_equalTo(28); - }]; - [self addSubview:self.subLabel]; - [self.subLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(12); - make.leading.trailing.mas_equalTo(self).inset(3); - }]; - - // 添加等级指示器 - self.levelIndicatorView = [[MedalsLevelIndicatorView alloc] init]; - [self addSubview:self.levelIndicatorView]; - [self.levelIndicatorView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.subLabel.mas_bottom).offset(33); - make.leading.trailing.mas_greaterThanOrEqualTo(self).inset(8); - make.height.mas_equalTo(66); - }]; - - // 设置等级选择回调 - @kWeakify(self); - self.levelIndicatorView.levelSelectedBlock = ^(NSInteger level) { - @kStrongify(self); -// 处理等级选择事件 - if (self.currentSeriesItemVO && level <= self.currentSeriesItemVO.medalVos.count) { - MedalVo *selectedMedalVo = [self.currentSeriesItemVO.medalVos xpSafeObjectAtIndex:level - 1]; - if (selectedMedalVo) { - self.displayModel = selectedMedalVo; - [self updateDisplayWithCurrentModel]; - } - } - }; - - // 在 levelIndicatorView 底部添加一个视图作为关闭按钮区域 - UIView *closeButtonView = [[UIView alloc] init]; - closeButtonView.backgroundColor = [UIColor clearColor]; - [self addSubview:closeButtonView]; - [closeButtonView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.levelIndicatorView.mas_bottom).offset(20); - make.bottom.leading.trailing.mas_equalTo(self); - }]; - - // 添加点击手势到关闭按钮区域 - UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleBackgroundTap:)]; - [closeButtonView addGestureRecognizer:tapGesture]; - - UIButton *back = [UIButton buttonWithType:UIButtonTypeCustom]; - [back setBackgroundImage:kImage(@"common_nav_back_white") forState:UIControlStateNormal]; - [back addTarget:selfWeak action:@selector(handleBackgroundTap:) forControlEvents:UIControlEventTouchUpInside]; - [self addSubview:back]; - [back mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.top.mas_equalTo(kStatusBarHeight); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; -} - -- (void)updateSeriesItem:(MedalSeriesItemVo *)detailItem isMine:(BOOL)isMine { - self.detailItemVo = detailItem; - if (isMine) { - MedalVo *tempVo = [detailItem.medalVos xpSafeObjectAtIndex:0]; - for (MedalVo *vo in detailItem.medalVos) { - if (vo.hasGain) { - if (vo.level > tempVo.level) { - tempVo = vo; - } - } - } - self.displayModel = tempVo; - [self.levelIndicatorView setSelectedLevel:self.displayModel.level animated:NO]; - [self updateDisplayWithCurrentModel]; - } -} - -- (void)setDetailItemVo:(MedalSeriesItemVo *)detailItemVo { -// _detailItemVo = detailItemVo; - self.currentSeriesItemVO = detailItemVo; - self.displayModel = [detailItemVo.medalVos xpSafeObjectAtIndex:0]; - - [self.levelIndicatorView setupWithMaxLevel:self.currentSeriesItemVO.medalLevel]; - for (MedalVo *vo in detailItemVo.medalVos) { - if (vo.level > self.displayModel.level) { - self.displayModel = vo; - } - } - [self.levelIndicatorView setSelectedLevel:self.displayModel.level animated:NO]; - [self.levelIndicatorView setSeriesItems:detailItemVo.medalVos]; - - // 设置指示器类型为带图片 - self.levelIndicatorView.indicatorType = MedalsLevelIndicatorTypeWithImage; - - // 为每个等级设置对应的图片，使用新的 URL 优先级逻辑 - for (MedalVo *medalVo in detailItemVo.medalVos) { - NSString *imageUrl = [self getImageUrlForMedal:medalVo]; - [self.levelIndicatorView setImageUrl:imageUrl forLevel:medalVo.level]; - } - - [self updateDisplayWithCurrentModel]; -} - -- (void)updateDisplayWithCurrentModel { - if (!self.displayModel) { - [self showDefaultPlaceholder]; - return; - } - -#if 0 - // Debug 环境：如果数据不满足新条件，使用原有逻辑 - if ([NSString isEmpty:self.displayModel.mp4Url] && ![NSString isEmpty:self.displayModel.picUrl]) { - // 使用原有逻辑：通过 picUrl 后缀判断 - if ([self.displayModel.picUrl hasSuffix:@"mp4"]) { - [self setMp4Path:self.displayModel.picUrl]; - } else { - [self setImagePath:self.displayModel.picUrl]; - } - self.titleLabel.text = self.displayModel.name; - self.subLabel.text = self.displayModel.medalDesc; - return; - } -#endif - - // 新逻辑：优先使用 mp4URL - if (![NSString isEmpty:self.displayModel.mp4Url]) { - [self setMp4Path:self.displayModel.mp4Url]; - } else if (![NSString isEmpty:self.displayModel.picUrl]) { - // mp4URL 为空，使用 picURL - if ([NSString isValidImageURL:self.displayModel.picUrl]) { - [self setImagePath:self.displayModel.picUrl]; - } else { - // picURL 不是有效图片，显示默认占位图 - [self showDefaultPlaceholder]; - } - } else { - // 都为空，显示默认占位图 - [self showDefaultPlaceholder]; - } - - self.titleLabel.text = self.displayModel.name; - self.subLabel.text = self.displayModel.medalDesc; -} - -#pragma mark - 私有方法 - -/// 显示默认占位图 -- (void)showDefaultPlaceholder { - [self stopMP4Playback]; - self.mp4View.hidden = YES; - self.imageView.hidden = NO; - - // 设置默认占位图 - self.imageView.imageUrl = @""; - self.imageView.image = [UIImageConstant defaultEmptyPlaceholder]; -} - -/// 根据新的优先级逻辑获取勋章的图片URL -- (NSString *)getImageUrlForMedal:(MedalVo *)medal { - if (!medal) { - return @""; - } - -#if 0 - // Debug 环境：如果数据不满足新条件，使用原有逻辑 - if ([NSString isEmpty:medal.mp4Url] && ![NSString isEmpty:medal.picUrl]) { - return medal.picUrl; - } -#endif - - // 新逻辑：优先使用 mp4URL - if (![NSString isEmpty:medal.mp4Url]) { - return medal.mp4Url; - } else if (![NSString isEmpty:medal.picUrl]) { - // mp4URL 为空，使用 picURL (需要验证是否为有效图片) - if ([NSString isValidImageURL:medal.picUrl]) { - return medal.picUrl; - } else { - // picURL 不是有效图片，返回空字符串 - return @""; - } - } else { - // 都为空，返回空字符串 - return @""; - } -} - -- (void)setImagePath:(NSString *)imagePath { - // 停止之前的 mp4 播放 - [self stopMP4Playback]; - - _imagePath = imagePath; - self.mp4View.hidden = YES; - self.imageView.hidden = NO; - self.imageView.imageUrl = imagePath; -} - -- (void)setMp4Path:(NSString *)mp4Path { - // 如果是相同的 mp4 路径，不需要重新加载 -// if ([_mp4Path isEqualToString:mp4Path]) { -// return; -// } - - // 停止之前的 mp4 播放 - [self stopMP4Playback]; - - _mp4Path = mp4Path; - self.mp4View.hidden = NO; - self.imageView.hidden = YES; - - if (!_mp4Parser) { - self.mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - } - - @kWeakify(self); - [self.mp4Parser parseWithURL:mp4Path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl]) { - [self.mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - NSLog(@"Failed to parse mp4: %@", error); - // MP4 解析失败，降级使用 picURL - [self handleMP4FailureWithFallback]; - }]; -} - -/// 处理 MP4 播放失败，降级使用 picURL -- (void)handleMP4FailureWithFallback { - if (![NSString isEmpty:self.displayModel.picUrl]) { - if ([NSString isValidImageURL:self.displayModel.picUrl]) { - [self setImagePath:self.displayModel.picUrl]; - } else { - [self showDefaultPlaceholder]; - } - } else { - [self showDefaultPlaceholder]; - } -} - -#pragma mark - MP4 播放控制 - -- (void)stopMP4Playback { - if (self.mp4View) { - [self.mp4View stopHWDMP4]; - self.mp4View.tag = 0; // 重置播放状态标记 - } -} - -- (void)pauseMP4Playback { - if (self.mp4View && !self.mp4View.hidden) { - [self.mp4View pauseHWDMP4]; - } -} - -- (void)resumeMP4Playback { - if (self.mp4View && !self.mp4View.hidden && self.mp4Path) { - if (self.mp4View.tag == 1) { // 已准备好但尚未播放 - @kWeakify(self); - [self.mp4Parser parseWithURL:self.mp4Path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl]) { - [self.mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - // MP4 恢复播放失败，降级使用 picURL - [self handleMP4FailureWithFallback]; - }]; - } else { - [self.mp4View resumeHWDMP4]; - } - } -} - -#pragma mark - -- (UIImageView *)bgLightImageView { - if (!_bgLightImageView) { - _bgLightImageView = [[UIImageView alloc] initWithImage:kImage(@"medals_lights")]; - } - return _bgLightImageView; -} - -- (VAPView *)mp4View { - if (!_mp4View) { - _mp4View = [[VAPView alloc] init]; - _mp4View.contentMode = UIViewContentModeScaleAspectFit; - } - return _mp4View; -} - -// 修改处理背景点击的方法名称，使其更符合实际功能 -- (void)handleBackgroundTap:(UITapGestureRecognizer *)gesture { - [self removeFromSuperview]; -} - -// 重写 removeFromSuperview 方法，确保在移除前停止 MP4 播放 -- (void)removeFromSuperview { - // 停止 MP4 播放并释放资源 - [self stopMP4Playback]; - self.mp4Parser = nil; - - [super removeFromSuperview]; -} - -// 添加 dealloc 方法确保资源被正确释放 -- (void)dealloc { - // 停止 MP4 播放 - [self stopMP4Playback]; - - // 清理资源 - self.mp4Parser = nil; - NSLog(@"MedalsDetailView dealloc"); -} - -@end diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsLevelIndicatorView.h b/YuMi/Modules/YMMine/View/Medals/MedalsLevelIndicatorView.h deleted file mode 100644 index 15a800d..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsLevelIndicatorView.h +++ /dev/null @@ -1,54 +0,0 @@ -// -// MedalsLevelIndicatorView.h -// YuMi -// -// Created by P on 2025/6/18. -// - -#import -@class MedalSeriesItemVo, MedalVo; -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, MedalsLevelIndicatorType) { - MedalsLevelIndicatorTypeNormal = 0, // 普通类型（只有圆点和文字） - MedalsLevelIndicatorTypeWithImage = 1, // 带图片类型（圆点上方有图片） -}; - -@interface MedalsLevelIndicatorView : UIView - -@property (nonatomic, copy) void (^levelSelectedBlock)(NSInteger level); -@property (nonatomic, assign) MedalsLevelIndicatorType indicatorType; -@property (nonatomic, copy) NSArray *seriesItems; - -- (void)setupWithMaxLevel:(NSInteger)maxLevel; -- (void)setSelectedLevel:(NSInteger)level animated:(BOOL)animated; - -/** - * 设置多个高亮等级 - * @param levels 需要高亮的等级数组 - * @param animated 是否使用动画 - */ -- (void)setHighlightLevels:(NSArray *)levels animated:(BOOL)animated; - -/** - * 重置等级指示器到指定等级 - * @param level 等级（0表示重置到初始状态） - */ -- (void)resetToLevel:(NSInteger)level; - -/** - * 设置指定等级的图片 - * @param imageUrl 图片URL - * @param level 等级 - */ -- (void)setImageUrl:(NSString *)imageUrl forLevel:(NSInteger)level; - -/** - * 设置系列数据，用于处理 MP4 和 PNG 资源 - * @param seriesItems MedalSeriesItemVo 数组 - */ -- (void)setSeriesItems:(NSArray *)seriesItems; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsLevelIndicatorView.m b/YuMi/Modules/YMMine/View/Medals/MedalsLevelIndicatorView.m deleted file mode 100644 index 8bf2dd4..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsLevelIndicatorView.m +++ /dev/null @@ -1,751 +0,0 @@ -// -// MedalsLevelIndicatorView.m -// YuMi -// -// Created by P on 2025/6/18. -// - -#import "MedalsLevelIndicatorView.h" -#import "UIImage+Utils.h" -#import "MedalsModel.h" -#import -#import "XPRoomGiftAnimationParser.h" - -// 等级指示器视图 -@interface LevelItemView : UIView - -@property (nonatomic, strong) UILabel *levelLabel; -@property (nonatomic, strong) UIView *dotView; // 圆点视图 -@property (nonatomic, strong) NetImageView *imageView; // 图片视图 -@property (nonatomic, strong) VAPView *mp4View; // MP4 视图 -@property (nonatomic, strong) XPRoomGiftAnimationParser *mp4Parser; // MP4 解析器 -@property (nonatomic, assign) BOOL isSelected; -@property (nonatomic, assign) NSInteger level; -@property (nonatomic, assign) BOOL hasImage; -@property (nonatomic, assign) BOOL hasMP4; -@property (nonatomic, strong) UIImage *originalImage; // 保存原始彩色图片 -@property (nonatomic, strong) UIImage *grayImage; // 保存灰度图片 -@property (nonatomic, copy) NSString *cachedImageUrl; // 缓存图片URL，用于延迟加载 -@property (nonatomic, copy) NSString *cachedMP4Url; // 缓存MP4 URL，用于延迟加载 - -- (instancetype)initWithLevel:(NSInteger)level; -- (void)setSelected:(BOOL)selected animated:(BOOL)animated; -- (void)setImageUrl:(NSString *)imageUrl; -- (void)setMP4Url:(NSString *)mp4Url; -- (void)createImageViewIfNeeded; -- (void)createMP4ViewIfNeeded; -- (void)stopMP4Playback; - -@end - -@implementation LevelItemView - -- (instancetype)initWithLevel:(NSInteger)level { - self = [super init]; - if (self) { - _level = level; - _isSelected = NO; - _hasImage = NO; - _hasMP4 = NO; - - // 创建圆点视图 - _dotView = [[UIView alloc] init]; - _dotView.backgroundColor = UIColorFromRGB(0x8B54E8); - _dotView.layer.cornerRadius = 3; // 圆点半径 - _dotView.clipsToBounds = YES; - [self addSubview:_dotView]; - - // 创建等级标签 - self.levelLabel = [UILabel labelInitWithText:[NSString stringWithFormat:@"LV%ld", (long)level] - font:kFontMedium(10) - textColor:UIColorFromRGB(0x8B54E8)]; - self.levelLabel.textAlignment = NSTextAlignmentCenter; - [self addSubview:self.levelLabel]; - - // 布局 - [_dotView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self); - make.width.height.mas_equalTo(6); // 圆点大小 - }]; - - [self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(_dotView.mas_bottom).offset(4); // 圆点和文字的间距 - make.leading.trailing.bottom.mas_equalTo(self); - }]; - } - return self; -} - -- (void)createImageViewIfNeeded { - if (_imageView) { - return; - } - - // 创建图片视图 - _imageView = [[NetImageView alloc] init]; - _imageView.contentMode = UIViewContentModeScaleAspectFill; - _imageView.clipsToBounds = YES; - [self addSubview:_imageView]; - - [_imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(_dotView.mas_top).offset(-4); - make.width.height.mas_equalTo(40); - }]; - - // 调整圆点位置 - [_dotView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(_imageView.mas_bottom).offset(4); - make.width.height.mas_equalTo(6); - }]; - - // 如果有缓存的图片URL，加载图片 - if (_cachedImageUrl) { - [self loadImageWithUrl:_cachedImageUrl]; - _cachedImageUrl = nil; - } -} - -- (void)createMP4ViewIfNeeded { - if (_mp4View) { - return; - } - - // 创建 MP4 视图 - _mp4View = [[VAPView alloc] init]; - _mp4View.contentMode = UIViewContentModeScaleAspectFill; - _mp4View.clipsToBounds = YES; - [self addSubview:_mp4View]; - - [_mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(_dotView.mas_top).offset(-4); - make.width.height.mas_equalTo(40); - }]; - - // 调整圆点位置 - [_dotView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(_mp4View.mas_bottom).offset(4); - make.width.height.mas_equalTo(6); - }]; - - // 如果有缓存的 MP4 URL，加载 MP4 - if (_cachedMP4Url) { - [self loadMP4WithUrl:_cachedMP4Url]; - _cachedMP4Url = nil; - } -} - -- (void)setImageUrl:(NSString *)imageUrl { - // 检查URL是否为空 -#if 0 - imageUrl = @"https://img.toto.im/mw600/9f0b0dd5ly1i2u07wq7g2j20n00w343s.jpg.webp"; -#endif - if ([NSString isEmpty:imageUrl]) { - [self showDefaultPlaceholder]; - return; - } - -#if 0 - // Debug 环境：使用原有逻辑 - if ([imageUrl.lowercaseString hasSuffix:@"mp4"]) { - [self setMP4Url:imageUrl]; - } else { - _hasImage = YES; - _hasMP4 = NO; - _cachedImageUrl = imageUrl; - - // 停止 MP4 播放 - [self stopMP4Playback]; - - // 如果已经创建了imageView，直接加载图片 - if (_imageView) { - [self loadImageWithUrl:imageUrl]; - } - } - return; -#endif - - // 新逻辑：只显示图片，MP4 显示占位图 - if ([imageUrl.lowercaseString hasSuffix:@"mp4"]) { - // MP4 URL：显示占位图（保留MP4处理代码备用） - [self showDefaultPlaceholder]; - // [self setMP4Url:imageUrl]; // 保留备用 - } else if ([NSString isValidImageURL:imageUrl]) { - // 验证为有效图片URL - _hasImage = YES; - _hasMP4 = NO; - _cachedImageUrl = imageUrl; - - // 停止 MP4 播放 - [self stopMP4Playback]; - - // 如果已经创建了imageView，直接加载图片 - if (_imageView) { - [self loadImageWithUrl:imageUrl]; - } - } else { - // URL 不是有效的图片，显示默认占位图 - [self showDefaultPlaceholder]; - } -} - -/// 显示默认占位图 -- (void)showDefaultPlaceholder { - // 停止 MP4 播放 - [self stopMP4Playback]; - - _hasImage = NO; - _hasMP4 = NO; - _cachedImageUrl = nil; - _cachedMP4Url = nil; - - if (_imageView) { - _imageView.hidden = NO; - _imageView.image = [UIImageConstant defaultEmptyPlaceholder]; - } - if (_mp4View) { - _mp4View.hidden = YES; - } -} - -- (void)setMP4Url:(NSString *)mp4Url { - _hasMP4 = YES; - _hasImage = NO; - _cachedMP4Url = mp4Url; - - // 隐藏图片视图 - if (_imageView) { - _imageView.hidden = YES; - } - - // 如果已经创建了mp4View，直接加载MP4 - if (_mp4View) { - [self loadMP4WithUrl:mp4Url]; - } -} - -- (void)loadImageWithUrl:(NSString *)imageUrl { - // 加载图片并处理灰度效果 - @kWeakify(self); - [_imageView loadImageWithUrl:imageUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - if (image) { - UIImage *cutImage = [image cutImage:CGSizeMake(40, 40)]; - self.hasImage = YES; - self.originalImage = cutImage; - self.grayImage = [cutImage grayscaleImage]; - [self updateImageEffect]; - } - }]; -} - -- (void)loadMP4WithUrl:(NSString *)mp4Url { - if (!_mp4Parser) { - _mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - } - - @kWeakify(self); - [_mp4Parser parseWithURL:mp4Url - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl]) { - [self.mp4View setMute:YES]; - [self.mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - - // 显示 MP4 视图，隐藏图片视图 - self.mp4View.hidden = NO; - if (self.imageView) { - self.imageView.hidden = YES; - } - - // MP4 加载完成后，应用当前的选中状态效果 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self updateImageEffect]; - }); - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - // MP4 加载失败时的处理 - NSLog(@"MP4 加载失败: %@", error); - [self showDefaultPlaceholder]; - }]; -} - -- (void)stopMP4Playback { - if (_mp4View) { - [_mp4View stopHWDMP4]; - _mp4View.hidden = YES; - } -} - -// 更新图片效果 -- (void)updateImageEffect { - if (_hasImage && _imageView) { - if (_isSelected && _originalImage) { - // 选中状态：显示彩色图片 - self.imageView.image = _originalImage; - } else if (!_isSelected && _grayImage) { - // 非选中状态：显示灰度图片 - self.imageView.image = _grayImage; - } - } - - // MP4 的选中效果处理 - 使用简单的 alpha 透明度 -// if (_hasMP4 && _mp4View) { -// if (_isSelected) { -// _mp4View.alpha = 1.0; // 选中状态：完全不透明 -// } else { -// _mp4View.alpha = 0.3; // 非选中状态：半透明 -// } -// } -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - if (_isSelected == selected) { - return; - } - - _isSelected = selected; - - void (^updateBlock)(void) = ^{ - UIColor *color = selected ? [UIColor whiteColor] : UIColorFromRGB(0x8B54E8); - self.levelLabel.textColor = color; - self.dotView.backgroundColor = color; - - // 如果有图片或MP4，更新效果 - if (self.hasImage || self.hasMP4) { - [self updateImageEffect]; - } - }; - - if (animated) { - [UIView animateWithDuration:0.2 animations:updateBlock]; - } else { - updateBlock(); - } -} - -@end - -// 等级指示器容器视图 -@interface MedalsLevelIndicatorView() - -@property (nonatomic, strong) NSMutableArray *levelItems; -@property (nonatomic, strong) NSMutableArray *connectionLines; // 连接线数组 -@property (nonatomic, assign) NSInteger maxLevel; -@property (nonatomic, assign) NSInteger selectedLevel; - -@end - -@implementation MedalsLevelIndicatorView - -- (instancetype)init { - self = [super init]; - if (self) { - _levelItems = [NSMutableArray array]; - _connectionLines = [NSMutableArray array]; - _selectedLevel = 1; - _indicatorType = MedalsLevelIndicatorTypeNormal; - - UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap:)]; - [self addGestureRecognizer:tapGesture]; - } - return self; -} - -- (void)setupWithMaxLevel:(NSInteger)maxLevel { - if (maxLevel < 0) { - maxLevel = 1; - } - if (_maxLevel == maxLevel && _levelItems.count == maxLevel) { - return; - } - - _maxLevel = maxLevel; - - // 清除现有的等级指示器和连接线 - for (UIView *view in _levelItems) { - [view removeFromSuperview]; - } - [_levelItems removeAllObjects]; - - for (UIView *line in _connectionLines) { - [line removeFromSuperview]; - } - [_connectionLines removeAllObjects]; - - // 创建新的等级指示器 - CGFloat itemWidth = 25.0; // 每个等级指示器的宽度 - CGFloat leftMargin = 20.0; // 左边距 - CGFloat rightMargin = 20.0; // 右边距 - - // 计算可用宽度（考虑左右边距） - CGFloat availableWidth = self.bounds.size.width - leftMargin - rightMargin; - - // 计算间距和起始位置 - CGFloat spacing = 0; - CGFloat startX = leftMargin; - - if (maxLevel == 1) { - // 只有一个元素时，居中显示 - startX = (self.bounds.size.width - itemWidth) / 2.0; - } else if (maxLevel > 1) { - // 多个元素时，计算间距 - // 总的元素宽度 - CGFloat totalItemWidth = itemWidth * maxLevel; - // 可用于间距的宽度 - CGFloat totalSpacingWidth = availableWidth - totalItemWidth; - // 间距数量 = 元素数量 - 1 - spacing = totalSpacingWidth / (maxLevel - 1); - - // 如果间距太小，设置一个最小值，并重新调整布局 - if (spacing < 10.0) { - spacing = 10.0; - // 重新计算总宽度 - CGFloat totalWidth = totalItemWidth + spacing * (maxLevel - 1); - // 重新计算起始位置，使整体居中 - startX = (self.bounds.size.width - totalWidth) / 2.0; - } - } - - for (NSInteger i = 1; i <= maxLevel; i++) { - // 创建等级指示器 - LevelItemView *levelItem = [[LevelItemView alloc] initWithLevel:i]; - [self addSubview:levelItem]; - [_levelItems addObject:levelItem]; - - // 设置位置 - CGFloat x = startX + (i - 1) * (itemWidth + spacing); - [levelItem mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(itemWidth); - make.height.mas_equalTo(self); - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self).offset(x); - }]; - - // 如果不是第一个，添加连接线 - if (i > 1) { - UIView *line = [[UIView alloc] init]; - line.backgroundColor = UIColorFromRGB(0x8B54E8); // 默认非选中颜色 - [self insertSubview:line atIndex:0]; - [_connectionLines addObject:line]; - - // 连接线位置：从上一个圆点到当前圆点 - [line mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(1); // 线的高度 - make.centerY.mas_equalTo(levelItem.dotView); - make.leading.mas_equalTo(_levelItems[i-2].dotView.mas_centerX); - make.trailing.mas_equalTo(levelItem.dotView.mas_centerX); - }]; - } - } - - // 默认选中LV1 - [self setSelectedLevel:1 animated:NO]; - - // 根据类型设置图片可见性 - [self updateImageVisibility]; -} - -- (void)layoutSubviews { - [super layoutSubviews]; - - if (_maxLevel > 0 && _levelItems.count > 0) { - // 创建新的等级指示器 - CGFloat itemWidth = 25.0; // 每个等级指示器的宽度 - CGFloat leftMargin = 20.0; // 左边距 - CGFloat rightMargin = 20.0; // 右边距 - if (_levelItems.count > 4) { - itemWidth = 16; - leftMargin = 0; - rightMargin = 10; - } - - // 计算可用宽度（考虑左右边距） - CGFloat availableWidth = self.bounds.size.width - leftMargin - rightMargin; - - // 计算间距和起始位置 - CGFloat spacing = 0; - CGFloat startX = leftMargin; - - if (_maxLevel == 1) { - // 只有一个元素时，居中显示 - startX = (self.bounds.size.width - itemWidth) / 2.0; - } else if (_maxLevel > 1) { - // 多个元素时，计算间距 - // 总的元素宽度 - CGFloat totalItemWidth = itemWidth * _maxLevel; - // 可用于间距的宽度 - CGFloat totalSpacingWidth = availableWidth - totalItemWidth; - // 间距数量 = 元素数量 - 1 - spacing = totalSpacingWidth / (_maxLevel - 1); - - // 如果间距太小，设置一个最小值，并重新调整布局 - if (spacing < 10.0) { - spacing = 10.0; - // 重新计算总宽度 - CGFloat totalWidth = totalItemWidth + spacing * (_maxLevel - 1); - // 重新计算起始位置，使整体居中 - startX = (self.bounds.size.width - totalWidth) / 2.0; - if (_levelItems.count > 4) { - startX -= spacing/2; - } - } - } - - for (NSInteger i = 0; i < _levelItems.count; i++) { - LevelItemView *item = _levelItems[i]; - CGFloat x = startX + i * (itemWidth + spacing); - [item mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(x); - }]; - } - - // 更新连接线 - for (NSInteger i = 0; i < _connectionLines.count && i + 1 < _levelItems.count; i++) { - UIView *line = _connectionLines[i]; - [line mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(_levelItems[i].dotView.mas_centerX); - make.trailing.mas_equalTo(_levelItems[i+1].dotView.mas_centerX); - }]; - } - } -} - -- (void)setSelectedLevel:(NSInteger)level animated:(BOOL)animated { - if (level < 1 || level > _maxLevel) { - return; - } - - _selectedLevel = level; - - // 更新等级指示器状态 - for (NSInteger i = 0; i < _levelItems.count; i++) { - LevelItemView *item = _levelItems[i]; - [item setSelected:(i + 1) <= level animated:animated]; - } - - // 更新连接线状态 - for (NSInteger i = 0; i < _connectionLines.count; i++) { - UIView *line = _connectionLines[i]; - // 连接线的状态取决于它连接的两个等级指示器是否都被选中 - // 如果连接线两端的等级指示器都被选中，则连接线也被选中 - BOOL isSelected = (i + 2) <= level; - - void (^updateBlock)(void) = ^{ - line.backgroundColor = isSelected ? [UIColor whiteColor] : UIColorFromRGB(0x8B54E8); - }; - - if (animated) { - [UIView animateWithDuration:0.2 animations:updateBlock]; - } else { - updateBlock(); - } - } -} - -- (void)resetToLevel:(NSInteger)level { - // 停止所有MP4播放 - for (LevelItemView *item in _levelItems) { - [item stopMP4Playback]; - } - - // 重置选中状态 - if (level <= 0) { - // 重置到初始状态 - [self setSelectedLevel:1 animated:NO]; - } else { - // 重置到指定等级 - [self setSelectedLevel:level animated:NO]; - } -} - -- (void)setIndicatorType:(MedalsLevelIndicatorType)indicatorType { - _indicatorType = indicatorType; - - // 如果已经创建了视图，需要根据类型进行调整 - if (_levelItems.count > 0) { - // 如果是带图片类型，创建相应的视图 - if (indicatorType == MedalsLevelIndicatorTypeWithImage) { - for (LevelItemView *item in _levelItems) { - if (item.hasMP4) { - [item createMP4ViewIfNeeded]; - } else if (item.hasImage) { - [item createImageViewIfNeeded]; - } - } - } - [self updateImageVisibility]; - } -} - -// 根据指示器类型更新图片可见性 -- (void)updateImageVisibility { - for (LevelItemView *item in _levelItems) { - if (item.imageView) { - item.imageView.hidden = (_indicatorType == MedalsLevelIndicatorTypeNormal); - } - if (item.mp4View) { - item.mp4View.hidden = (_indicatorType == MedalsLevelIndicatorTypeNormal); - } - } -} - -- (void)setImageUrl:(NSString *)imageUrl forLevel:(NSInteger)level { - if (level < 1 || level > _maxLevel || level > _levelItems.count) { - return; - } - - LevelItemView *item = _levelItems[level - 1]; - - // 根据指示器类型决定是否创建和加载图片/MP4 - if (_indicatorType == MedalsLevelIndicatorTypeWithImage) { - // 判断是 MP4 还是图片 - if ([imageUrl.lowercaseString hasSuffix:@"mp4"]) { - [item createMP4ViewIfNeeded]; // 确保创建了 mp4View - } else { - [item createImageViewIfNeeded]; // 确保创建了 imageView - } - [item setImageUrl:imageUrl]; - } else { - // 在普通模式下，只保存URL，不创建视图 - [item setImageUrl:imageUrl]; - } -} - -- (void)setSeriesItems:(NSArray *)seriesItems { - _seriesItems = seriesItems; - - // 如果没有系列数据或者等级指示器还没有创建，直接返回 - if (!seriesItems || seriesItems.count == 0 || _levelItems.count == 0) { - return; - } - - for (MedalVo *medalVo in seriesItems) { - if (medalVo && medalVo.picUrl) { - [self setImageUrl:medalVo.picUrl forLevel:medalVo.level]; - } - } -} - -- (void)handleTap:(UITapGestureRecognizer *)gesture { - CGPoint location = [gesture locationInView:self]; - - for (NSInteger i = 0; i < _levelItems.count; i++) { - LevelItemView *item = _levelItems[i]; - CGPoint itemLocation = [self convertPoint:location toView:item]; - - // 检查点击是否在 item 的边界内 - if (CGRectContainsPoint(item.bounds, itemLocation)) { - NSInteger level = i + 1; - [self setSelectedLevel:level animated:YES]; - - if (_levelSelectedBlock) { - _levelSelectedBlock(level); - } - break; - } - } -} - -- (void)setHighlightLevels:(NSArray *)levels animated:(BOOL)animated { - if (!levels || levels.count == 0 || _levelItems.count == 0) { - return; - } - - // 先将所有 item 重置为非高亮状态 - for (LevelItemView *item in _levelItems) { - [item setSelected:NO animated:animated]; - } - - // 将所有连接线重置为非高亮状态 - for (UIView *line in _connectionLines) { - void (^updateBlock)(void) = ^{ - line.backgroundColor = UIColorFromRGB(0x8B54E8); // 非选中颜色 - }; - - if (animated) { - [UIView animateWithDuration:0.2 animations:updateBlock]; - } else { - updateBlock(); - } - } - - // 高亮指定的等级 - NSMutableSet *highlightedLevels = [NSMutableSet set]; - for (NSNumber *levelNumber in levels) { - NSInteger level = [levelNumber integerValue]; - if (level >= 1 && level <= _maxLevel) { - [highlightedLevels addObject:@(level)]; - - // 设置对应的 item 为高亮状态 - LevelItemView *item = _levelItems[level - 1]; - [item setSelected:YES animated:animated]; - } - } - - // 更新连接线状态 - // 只有当连接线两端的等级都被高亮时，连接线才高亮 - for (NSInteger i = 0; i < _connectionLines.count; i++) { - UIView *line = _connectionLines[i]; - NSInteger startLevel = i + 1; - NSInteger endLevel = i + 2; - - BOOL isSelected = [highlightedLevels containsObject:@(startLevel)] && - [highlightedLevels containsObject:@(endLevel)]; - - void (^updateBlock)(void) = ^{ - line.backgroundColor = isSelected ? [UIColor whiteColor] : UIColorFromRGB(0x8B54E8); - }; - - if (animated) { - [UIView animateWithDuration:0.2 animations:updateBlock]; - } else { - updateBlock(); - } - } -} - -// 计算布局参数 -- (void)calculateLayoutParams:(CGFloat *)itemWidth spacing:(CGFloat *)spacing startX:(CGFloat *)startX forMaxLevel:(NSInteger)maxLevel { - *itemWidth = 25.0; // 每个等级指示器的宽度 - - CGFloat leftMargin = 20.0; // 左边距 - CGFloat rightMargin = 20.0; // 右边距 - - // 计算可用宽度（考虑左右边距） - CGFloat availableWidth = self.bounds.size.width - leftMargin - rightMargin; - - // 计算间距和起始位置 - *spacing = 0; - *startX = leftMargin; - - if (maxLevel == 1) { - // 只有一个元素时，居中显示 - *startX = (self.bounds.size.width - (*itemWidth)) / 2.0; - } else if (maxLevel > 1) { - // 多个元素时，计算间距 - // 总的元素宽度 - CGFloat totalItemWidth = (*itemWidth) * maxLevel; - // 可用于间距的宽度 - CGFloat totalSpacingWidth = availableWidth - totalItemWidth; - // 间距数量 = 元素数量 - 1 - *spacing = totalSpacingWidth / (maxLevel - 1); - - // 如果间距太小，设置一个最小值，并重新调整布局 - if (*spacing < 10.0) { - *spacing = 10.0; - // 重新计算总宽度 - CGFloat totalWidth = totalItemWidth + (*spacing) * (maxLevel - 1); - // 重新计算起始位置，使整体居中 - *startX = (self.bounds.size.width - totalWidth) / 2.0; - } - } -} - -@end diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsRankViewController.h b/YuMi/Modules/YMMine/View/Medals/MedalsRankViewController.h deleted file mode 100644 index 8d6f1a3..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsRankViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MedalsRankViewController.h -// YuMi -// -// Created by P on 2025/6/20. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MedalsRankViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsRankViewController.m b/YuMi/Modules/YMMine/View/Medals/MedalsRankViewController.m deleted file mode 100644 index 23d098c..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsRankViewController.m +++ /dev/null @@ -1,607 +0,0 @@ -// -// MedalsRankViewController.m -// YuMi -// -// Created by P on 2025/6/20. -// - -#import "MedalsRankViewController.h" -#import "MedalsPresenter.h" -#import "MedalsViewController.h" -#import "UserInfoModel.h" -#import -#import "DJDKMIMOMColor.h" - - -@interface MedalsRankListCell : UITableViewCell - -@property (nonatomic, strong) UILabel *indexLabel; -@property (nonatomic, strong) NetImageView *avatarImageView; -@property (nonatomic, strong) UILabel *nameLabel; -@property (nonatomic, strong) UILabel *countLabel; - - -+ (void)registerTo:(UITableView *)tableView; -+ (instancetype)cellFor:(UITableView *)tableView atIndexPath:(NSIndexPath *)index; - -- (void)updateCell:(MedalsRankUserModel *)userModel atIndex:(NSInteger)index; - -@end - -@implementation MedalsRankListCell - -+ (NSString *)cellID { - return NSStringFromClass([MedalsRankListCell class]); -} - -+ (void)registerTo:(UITableView *)tableView { - [tableView registerClass:[self class] forCellReuseIdentifier:[self cellID]]; -} - -+ (instancetype)cellFor:(UITableView *)tableView atIndexPath:(NSIndexPath *)index { - MedalsRankListCell *cell = [tableView dequeueReusableCellWithIdentifier:[self cellID] forIndexPath:index]; - return cell; -} - -- (void)updateCell:(MedalsRankUserModel *)userModel atIndex:(NSInteger)index { - self.avatarImageView.imageUrl = userModel.avatar; - self.nameLabel.text = userModel.nick; - self.indexLabel.text = @(index + 4).stringValue; - self.countLabel.text = @(userModel.medalCount).stringValue; -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.backgroundColor = [UIColor clearColor]; - self.contentView.backgroundColor = [UIColor clearColor]; - - self.selectionStyle = UITableViewCellSelectionStyleNone; - - self.indexLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:[UIColor whiteColor]]; - [self.contentView addSubview:self.indexLabel]; - [self.indexLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(18); - }]; - - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - self.avatarImageView = [[NetImageView alloc] initWithConfig:config]; - [self.avatarImageView setCornerRadius:47/2]; - [self.contentView addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.indexLabel.mas_trailing).offset(16); - make.size.mas_equalTo(CGSizeMake(47, 47)); - }]; - - self.nameLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(15) textColor:[UIColor whiteColor]]; - [self.contentView addSubview:self.nameLabel]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); - make.top.mas_equalTo(self.avatarImageView); - }]; - - UIImageView *rankIcon = [[UIImageView alloc] initWithImage:kImage(@"medals_rank")]; - [self.contentView addSubview:rankIcon]; - [rankIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); - make.bottom.mas_equalTo(self.avatarImageView); - make.size.mas_equalTo(CGSizeMake(10, 14)); - }]; - - self.countLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:[UIColor whiteColor]]; - [self.contentView addSubview:self.countLabel]; - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(rankIcon.mas_trailing).offset(6); - make.centerY.mas_equalTo(rankIcon); - }]; - - UILabel *detailLabel = [UILabel labelInitWithText:YMLocalizedString(@"20.20.61_text_13") - font:kFontRegular(12) - textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - [self.contentView addSubview:detailLabel]; - [detailLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView).offset(-28); - make.centerY.mas_equalTo(self.contentView); - }]; - - UIImageView *arrow = [[UIImageView alloc] initWithImage:kImage(@"grey_right_arrow")]; - [self.contentView addSubview:arrow]; - [arrow mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - } - return self; -} - -@end - -@interface MedalsRankTopView : UIView - -@property (nonatomic, assign) NSInteger topLevel; -@property (nonatomic, strong) MedalsRankUserModel *userModel; -@property (nonatomic, copy) void (^onTapBlock)(MedalsRankUserModel *userModel); - -@end - -@implementation MedalsRankTopView -{ - NetImageView *avatarImageView; - UIImageView *decorationImageView; - UILabel *nameLabel; - UILabel *honorLabel; - UIImageView *honorImageView; - UIImageView *medalIconImageView; - UILabel *medalCountLabel; - UIStackView *medalCountStack; -} - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - avatarImageView = [[NetImageView alloc] initWithConfig:config]; - [avatarImageView setCornerRadius:50]; - [self addSubview:avatarImageView]; - [avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - decorationImageView = [[UIImageView alloc] init]; - [self addSubview:decorationImageView]; - [decorationImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - -// honorImageView = [[UIImageView alloc] initWithImage:kImage(@"medals_rank_namebar")]; -// [self addSubview:honorImageView]; -// [honorImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.centerX.mas_equalTo(self); -// make.bottom.mas_equalTo(self).offset(6); -// }]; -// -// honorLabel = [UILabel labelInitWithText:YMLocalizedString(@"20.20.61_text_12") -// font:kFontSemibold(12) -// textColor:UIColorFromRGB(0xfff27b)]; -// [self addSubview:honorLabel]; -// [honorLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.center.mas_equalTo(honorImageView); -// }]; - - // 1. 先加 label，因為我們要讓 imageView 跟著 label 的大小走 - honorLabel = [UILabel labelInitWithText:YMLocalizedString(@"20.20.61_text_12") - font:kFontSemibold(12) - textColor:UIColorFromRGB(0xfff27b)]; - honorLabel.textAlignment = NSTextAlignmentCenter; - [self addSubview:honorLabel]; - - // 2. 再加 imageView，但先不要給它固定圖片尺寸 - honorImageView = [[UIImageView alloc] initWithImage:kImage(@"medals_rank_namebar")]; - honorImageView.contentMode = UIViewContentModeScaleToFill; // 讓圖片自動拉伸 - [self insertSubview:honorImageView belowSubview:honorLabel]; // 圖片在 label 下面 - - // 3. 讓 imageView 的邊緣跟 label 保持固定間距（例如上下左右各 8pt） - [honorLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self).offset(6); // 與父 view 的相對位置 - }]; - - [honorImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.equalTo(honorLabel); // 中心對齊 label - make.left.equalTo(honorLabel.mas_left).offset(-8); - make.right.equalTo(honorLabel.mas_right).offset(8); - make.top.equalTo(honorLabel.mas_top).offset(-4); - make.bottom.equalTo(honorLabel.mas_bottom).offset(4); - }]; - - - nameLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(15) textColor:UIColorFromRGB(0xffffff)]; - [self addSubview:nameLabel]; - - medalIconImageView = [[UIImageView alloc] initWithImage:kImage(@"medals_rank")]; - medalCountLabel = [UILabel labelInitWithText:@"0" font:kFontMedium(14) textColor:UIColorFromRGB(0xffffff)]; - medalCountStack = [[UIStackView alloc] initWithArrangedSubviews:@[ - medalIconImageView, - medalCountLabel - ]]; - [self addSubview:medalCountStack]; - - honorLabel.hidden = YES; - honorImageView.hidden = YES; - - // 添加点击手势 - UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapTopView)]; - [self addGestureRecognizer:tapGesture]; - self.userInteractionEnabled = YES; - } - return self; -} - -- (void)didTapTopView { - if (self.onTapBlock && self.userModel) { - self.onTapBlock(self.userModel); - } -} - -- (void)setTopLevel:(NSInteger)topLevel { - _topLevel = topLevel; - NSString *imagePath = @""; - NSInteger nameTopOffset = 0; - NSInteger bottomOffset = 0; - switch (topLevel) { - case 1: - imagePath = @"medals_rank_top_1"; - honorLabel.hidden = NO; - honorImageView.hidden = NO; - nameTopOffset = 8; - bottomOffset = 40; - break; - case 2: - imagePath = @"medals_rank_top_2"; - nameTopOffset = -4; - bottomOffset = 20; - break; - case 3: - imagePath = @"medals_rank_top_3"; - nameTopOffset = -4; - bottomOffset = 20; - break; - default: - break; - } - - [nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.mas_bottom).offset(nameTopOffset); - }]; - - [medalCountStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(nameLabel.mas_bottom).offset(4); - }]; - - if (![NSString isEmpty:imagePath]) { - decorationImageView.image = kImage(imagePath); - } -} - -- (void)setUserModel:(MedalsRankUserModel *)userModel { - _userModel = userModel; - if (userModel) { - avatarImageView.imageUrl = userModel.avatar; - nameLabel.text = userModel.nick; - medalCountLabel.text = @(userModel.medalCount).stringValue; - } -} - -@end - -@interface MedalsRankViewController () - -@property (nonatomic, strong) UILabel *indexLabel; -@property (nonatomic, strong) NetImageView *avatarImageView; -@property (nonatomic, strong) UILabel *nameLabel; -@property (nonatomic, strong) UILabel *countLabel; - -@property (nonatomic, strong) MedalsRankTopView *topOne; -@property (nonatomic, strong) MedalsRankTopView *topTwo; -@property (nonatomic, strong) MedalsRankTopView *topThree; - -@property (nonatomic, strong) MedalsRankUserModel *mineRankModel; -@property (nonatomic, strong) NSMutableArray *rankList; - -@property (nonatomic, strong) UITableView *rankTableView; - -// 分页相关属性 -@property (nonatomic, assign) NSInteger currentPage; - -@end - -@implementation MedalsRankViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (MedalsPresenter *)createPresenter { - return [[MedalsPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - // 初始化分页 - self.currentPage = 1; - - [self setupUI]; - [self setupRefresh]; - [self loadData]; -} - -#pragma mark - -- (void)setupUI { - self.view.backgroundColor = UIColorFromRGB(0x1B0043); - [self setupTopArea]; - [self setupRankList]; - [self setupBottomArea]; - [self setupNavigationBar]; -} - -- (void)setupNavigationBar { - [self setupCustomNavigationBar:^{} - title:YMLocalizedString(@"20.20.61_text_11") - titleColor:[UIColor whiteColor]]; -} - -- (void)setupTopArea { - UIImageView *topBG = [[UIImageView alloc] initWithImage:kImage(@"medals_rank_top_bg")]; - topBG.frame = CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(270)); - [self.view addSubview:topBG]; - - self.topOne = [self rankTopView:1]; - self.topTwo = [self rankTopView:2]; - self.topThree = [self rankTopView:3]; - - // 设置点击回调 - __weak typeof(self) weakSelf = self; - self.topOne.onTapBlock = ^(MedalsRankUserModel *userModel) { - [weakSelf handleTopViewTap:userModel]; - }; - self.topTwo.onTapBlock = ^(MedalsRankUserModel *userModel) { - [weakSelf handleTopViewTap:userModel]; - }; - self.topThree.onTapBlock = ^(MedalsRankUserModel *userModel) { - [weakSelf handleTopViewTap:userModel]; - }; - - [self.view addSubview:self.topOne]; - [self.view addSubview:self.topTwo]; - [self.view addSubview:self.topThree]; - - [self.topOne mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.view).offset(95); - make.centerX.mas_equalTo(self.view); - make.size.mas_equalTo(CGSizeMake(209, 145)); - }]; - - [self.topTwo mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(topBG.mas_bottom); - make.leading.mas_equalTo(self.view).offset(25); - make.size.mas_equalTo(CGSizeMake(145, 145)); - }]; - - [self.topThree mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(topBG.mas_bottom); - make.trailing.mas_equalTo(self.view).offset(-25); - make.size.mas_equalTo(CGSizeMake(145, 145)); - }]; -} - -- (void)setupRankList { - [self.view addSubview:self.rankTableView]; - CGFloat height = 84; - [self.rankTableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.topTwo.mas_bottom).offset(40); - make.bottom.mas_equalTo(self.view).offset(-height); - make.leading.trailing.mas_equalTo(self.view); - }]; -} - -- (void)setupBottomArea { - CGFloat height = 84; - UIView *bottomArea = [[UIView alloc] initWithFrame:CGRectMake(0, KScreenHeight - height, KScreenWidth, height)]; - [bottomArea addGradientBackgroundWithColors:@[ - UIColorFromRGB(0x3d1479), - UIColorFromRGB(0x1c0044), - ] startPoint:CGPointMake(0.5, 0) endPoint:CGPointMake(0.5, 1) cornerRadius:0]; - [self.view addSubview:bottomArea]; - - self.indexLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:[UIColor whiteColor]]; - [bottomArea addSubview:self.indexLabel]; - [self.indexLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(bottomArea); - make.leading.mas_equalTo(18); - }]; - - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - self.avatarImageView = [[NetImageView alloc] initWithConfig:config]; - [self.avatarImageView setCornerRadius:47/2]; - [bottomArea addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(bottomArea); - make.leading.mas_equalTo(self.indexLabel.mas_trailing).offset(16); - make.size.mas_equalTo(CGSizeMake(47, 47)); - }]; - - self.nameLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(15) textColor:[UIColor whiteColor]]; - [bottomArea addSubview:self.nameLabel]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); - make.top.mas_equalTo(self.avatarImageView); - }]; - - UIImageView *rankIcon = [[UIImageView alloc] initWithImage:kImage(@"medals_rank")]; - [bottomArea addSubview:rankIcon]; - [rankIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); - make.bottom.mas_equalTo(self.avatarImageView); - make.size.mas_equalTo(CGSizeMake(10, 14)); - }]; - - self.countLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:[UIColor whiteColor]]; - [bottomArea addSubview:self.countLabel]; - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(rankIcon.mas_trailing).offset(6); - make.centerY.mas_equalTo(rankIcon); - }]; -} - -- (void)setupRefresh { - // 设置下拉刷新 - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.rankTableView.mj_header = header; - -// // 设置上拉加载更多 -// MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; -// footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; -// footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; -// self.rankTableView.mj_footer = footer; -} - -#pragma mark - -- (void)loadData { - [self.presenter rankList:self.currentPage]; -} - -- (void)rankListSuccess:(MedalsRankModel *)model { - // 结束刷新状态 - [self.rankTableView.mj_header endRefreshing]; - [self.rankTableView.mj_footer endRefreshing]; - - NSInteger currentRank = 4; // 从第4名开始计算（前三名已经处理） - - if (model) { - // 第一页时更新个人信息和前三名 - if (self.currentPage == 1) { - self.mineRankModel = model.mine; - self.avatarImageView.imageUrl = self.mineRankModel.avatar; - self.nameLabel.text = self.mineRankModel.nick; - self.indexLabel.text = self.mineRankModel.rank == 0 ? @"10+" : @(self.mineRankModel.rank).stringValue; - self.countLabel.text = @(self.mineRankModel.medalCount).stringValue; - - self.rankList = [NSMutableArray array]; - - // 处理前三名显示 - for (MedalsRankUserModel *user in model.rankList) { - if (user.rank == 1) { - self.topOne.userModel = user; - } else if (user.rank == 2) { - self.topTwo.userModel = user; - } else if (user.rank == 3) { - self.topThree.userModel = user; - } else { - [self.rankList addObject:user]; - currentRank = MAX(currentRank, user.rank + 1); - } - } - } else { - // 非第一页，追加数据（排除前三名） - for (MedalsRankUserModel *user in model.rankList) { - if (user.rank > 3) { - [self.rankList addObject:user]; - } - } - } - - // 检查是否还有更多数据 - if (model.rankList.count < [self.presenter rankListSize]) { - if (self.currentPage == 1) { - // 补充数据至 10 个（rankList 中应有 7 个，因为前三名在 top 视图中） - NSInteger targetCount = 7; // 总共10个，减去前3名 - while (self.rankList.count < targetCount) { - MedalsRankUserModel *emptyUser = [[MedalsRankUserModel alloc] init]; - emptyUser.rank = currentRank; - emptyUser.uid = 0; - emptyUser.avatar = @""; - emptyUser.nick = @"--"; - emptyUser.medalCount = 0; - [self.rankList addObject:emptyUser]; - currentRank++; - } - } - [self.rankTableView.mj_footer endRefreshingWithNoMoreData]; - } else { - [self.rankTableView.mj_footer resetNoMoreData]; - } - - [self.rankTableView reloadData]; - } -} - -- (void)rankListFailure { - // 结束刷新状态 - [self.rankTableView.mj_header endRefreshing]; - [self.rankTableView.mj_footer endRefreshing]; - - // 如果是加载更多失败，页码需要回退 - if (self.currentPage > 1) { - self.currentPage--; - } -} - -#pragma mark - UITableView DataSource & Delegate -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.rankList.count; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 70; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - MedalsRankListCell *cell = [MedalsRankListCell cellFor:tableView atIndexPath:indexPath]; - MedalsRankUserModel *model = [self.rankList xpSafeObjectAtIndex:indexPath.row]; - [cell updateCell:model atIndex:indexPath.row]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - // 取消选中高亮效果 - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - - MedalsRankUserModel *model = [self.rankList xpSafeObjectAtIndex:indexPath.row]; - [self handleTopViewTap:model]; -} - -- (void)handleTopViewTap:(MedalsRankUserModel *)model { - if (model) { - UserInfoModel *userInfo = [[UserInfoModel alloc] init]; - userInfo.uid = model.uid; - userInfo.avatar = model.avatar; - userInfo.nick = model.nick; - MedalsViewController *vc = [[MedalsViewController alloc] initForOtherMedals:userInfo]; - [self.navigationController pushViewController:vc animated:YES]; - } -} - -#pragma mark - -- (MedalsRankTopView *)rankTopView:(NSInteger)rank { - MedalsRankTopView *topView = [[MedalsRankTopView alloc] initWithFrame:CGRectMake(0, 0, rank == 1 ? 209 : 145, 145)]; - topView.topLevel = rank; - return topView; -} - -- (UITableView *)rankTableView { - if (!_rankTableView) { - _rankTableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _rankTableView.delegate = self; - _rankTableView.dataSource = self; - _rankTableView.backgroundColor = [UIColor clearColor]; - [MedalsRankListCell registerTo:_rankTableView]; - } - return _rankTableView; -} - -#pragma mark - 刷新方法 -- (void)headerRefresh { - self.currentPage = 1; - [self loadData]; -} - -- (void)footerRefresh { - self.currentPage++; - [self loadData]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsViewController.h b/YuMi/Modules/YMMine/View/Medals/MedalsViewController.h deleted file mode 100644 index 970c186..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsViewController.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// MedalsViewController.h -// YuMi -// -// Created by P on 2025/6/17. -// - -#import "MvpViewController.h" -@class UserInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface MedalsViewController : MvpViewController - -- (instancetype)initForMyMedals:(UserInfoModel *)userInfo; -- (instancetype)initForOtherMedals:(UserInfoModel *)userInfo; -- (instancetype)initForMedalsSquare; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsViewController.m b/YuMi/Modules/YMMine/View/Medals/MedalsViewController.m deleted file mode 100644 index a6bdecd..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsViewController.m +++ /dev/null @@ -1,1255 +0,0 @@ -// -// MedalsViewController.m -// YuMi -// -// Created by P on 2025/6/17. -// - -#import "MedalsViewController.h" -#import "MedalsPresenter.h" -#import "UserInfoModel.h" -#import "TYCyclePagerView.h" -#import "MedalsCollectionViewCell.h" -#import "MedalsCyclePagerCell.h" -#import "MedalsDetailView.h" -#import "MedalsWearingViewController.h" -#import "MedalsRankViewController.h" -#import -#import "XPRoomGiftAnimationParser.h" - -typedef enum : NSInteger { - MedalsCenterTab_TaskMedals = 1, - MedalsCenterTab_ActivityMedals = 2, - MedalsCenterTab_GloryMedals = 3, -} MedalsCenterTabType; - -typedef enum : NSInteger { - MedalsCenterDisplayType_Mine, - MedalsCenterDisplayType_Other, - MedalsCenterDisplayType_Square -} MedalsCenterDisplayType; - -@interface MedalsViewController () - -@property (nonatomic, strong) UserInfoModel *userInfo; -@property (nonatomic, copy) NSArray *centerTabButtons; -@property (nonatomic, strong) UILabel *medalDescLabel; -@property (nonatomic, strong) UIButton *emptyUserMedalButton; -@property (nonatomic, strong) TYCyclePagerView *medalsCyclePagerView; -@property (nonatomic, strong) UIView *emptyView; -@property (nonatomic, strong) UICollectionView *medalsCollectionView; -@property (nonatomic, strong) UIStackView *centerTabsStackView; - -@property (nonatomic, strong) NSMutableArray *datasourceTaskMedals; -@property (nonatomic, strong) NSMutableArray *datasourceActivityMedals; -@property (nonatomic, strong) NSMutableArray *datasourceGloryMedals; -@property (nonatomic, copy) NSArray *useMedals; - -@property (nonatomic, assign) NSInteger currentPageTaskMedals; -@property (nonatomic, assign) NSInteger currentPageActivityMedals; -@property (nonatomic, assign) NSInteger currentPageGloryMedals; - -@property (nonatomic, assign) MedalsCenterTabType currentTabType; -@property (nonatomic, assign) MedalsCenterDisplayType displayType; - -@property (nonatomic, strong) UserMedalsModel *userMedalsModel; -@property (nonatomic, strong) NSMutableArray *taskSquareMedalVo; -@property (nonatomic, strong) NSMutableArray *activitySquareMedalVo; -@property (nonatomic, strong) NSMutableArray *glorySquareMedalVo; - -@property (nonatomic, strong) UIImageView *otherBG; -@property (nonatomic, strong) NetImageView *otherAvatar; -@property (nonatomic, strong) NetImageView *otherMedal; -@property (nonatomic, strong) VAPView *otherMP4View; -@property (nonatomic, strong) XPRoomGiftAnimationParser *mp4Parser; -@property (nonatomic, strong) UILabel *otherNameLabel; -@property (nonatomic, strong) UILabel *otherCountLabel; -@property (nonatomic, strong) UserMedalsModel *otherMedalsModel; - -// 自动轮播相关属性 -@property (nonatomic, strong) NSTimer *autoScrollTimer; -@property (nonatomic, assign) NSInteger currentAutoScrollIndex; - -@end - -@implementation MedalsViewController - -- (instancetype)initForMyMedals:(UserInfoModel *)userInfo { - self = [super init]; - if (self) { - self.displayType = MedalsCenterDisplayType_Mine; - self.userInfo = userInfo; - } - return self; -} - -- (instancetype)initForOtherMedals:(UserInfoModel *)userInfo { - self = [super init]; - if (self) { - self.displayType = MedalsCenterDisplayType_Other; - self.userInfo = userInfo; - } - return self; -} - -- (instancetype)initForMedalsSquare { - self = [super init]; - if (self) { - self.displayType = MedalsCenterDisplayType_Square; - } - return self; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (MedalsPresenter *)createPresenter { - return [[MedalsPresenter alloc] init]; -} - -- (void)dealloc { - [self stopAutoScroll]; - [self stopOtherMedalMP4Playback]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - [self setupUI]; - [self setupData]; -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - - // 确保可见的 cell 开始播放 - [self startVisibleCellsPlayback]; - - // 如果有佩戴的勋章，再次确保居中显示 - if (self.useMedals.count > 0 && !self.medalsCyclePagerView.hidden) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.medalsCyclePagerView scrollToItemAtIndex:0 animate:NO]; - }); - } - - // 重新启动自动轮播（如果有多个勋章且在广场页面） - if (self.useMedals.count > 1 && !self.medalsCyclePagerView.hidden && self.displayType == MedalsCenterDisplayType_Square) { - [self startAutoScroll:self.currentAutoScrollIndex]; - } -} - -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; - - // 停止所有播放 - [self stopAllCellsPlayback]; - - // 停止自动轮播 - [self stopAutoScroll]; - - // 停止其他用户勋章的MP4播放 - [self stopOtherMedalMP4Playback]; -} - -- (void)stopAllCellsPlayback { - // 停止所有 cell 的播放 - NSArray *visibleCells = self.medalsCyclePagerView.collectionView.visibleCells; - for (UICollectionViewCell *cell in visibleCells) { - if ([cell isKindOfClass:[MedalsCyclePagerCell class]]) { - [(MedalsCyclePagerCell *)cell didEndDisplaying]; - } - } -} - -#pragma mark - 自动轮播方法 - -/** - * 启动自动轮播 - * @param userSelectedIndex 用户选择的起始索引，如果无效则默认从0开始 - */ -- (void)startAutoScroll:(NSInteger)userSelectedIndex { - [self stopAutoScroll]; // 先停止之前的定时器 - - // 设置当前索引 - if (userSelectedIndex >= 0 && userSelectedIndex < self.useMedals.count) { - self.currentAutoScrollIndex = userSelectedIndex; - } else { - self.currentAutoScrollIndex = 0; - } - - NSTimeInterval time = 5; - - // 总是创建新的定时器（因为已经在上面停止了旧的） - self.autoScrollTimer = [NSTimer scheduledTimerWithTimeInterval:time - target:self - selector:@selector(autoScrollToNextItem) - userInfo:nil - repeats:YES]; -} - -- (void)stopAutoScroll { - if (self.autoScrollTimer) { - [self.autoScrollTimer invalidate]; - self.autoScrollTimer = nil; - } -} - -- (void)autoScrollToNextItem { - if (self.useMedals.count <= 1) { - [self stopAutoScroll]; - return; - } - - // 计算下一个索引，实现循环滚动 - self.currentAutoScrollIndex = (self.currentAutoScrollIndex + 1) % self.useMedals.count; - - // 滚动到下一个位置 - [self.medalsCyclePagerView scrollToItemAtIndex:self.currentAutoScrollIndex animate:YES]; -} - -/** - * Tab 切换时重置自动滚动状态 - * 停止当前定时器，重置索引为0，准备从第一个元素重新开始轮播 - */ -- (void)resetAutoScrollOnTabChange { - // 停止当前的自动滚动定时器 - [self stopAutoScroll]; - - // 重置滚动索引为 0，确保切换 tab 后从第一个元素开始显示 - self.currentAutoScrollIndex = 0; - - // 注意：新的自动滚动将在数据更新后的 _updateWearingInfo 方法中重新启动 -} - -#pragma mark - UI -- (void)setupUI { - [self setupBackground]; - if (self.displayType != MedalsCenterDisplayType_Other) { - if (self.userInfo.medals.medalCount == 0) { - [self setupEmptyUserMedals]; - } else { - [self setupWearingUserMedals]; - } - } else { - [self setupOthersMedalInfo]; - } - - [self setupCenterTabs]; - [self setupBottomMedalsList]; - [self setupEmptyView]; - - [self setupNavigationBar]; - - if (self.displayType == MedalsCenterDisplayType_Mine) { - [self setupWearingButton]; - } -} - -- (void)setupNavigationBar { - NSString *title = @""; - NSArray *navigationButtons = [NSArray array]; - switch (self.displayType) { - case MedalsCenterDisplayType_Mine: - title = YMLocalizedString(@"20.20.61_text_1"); - navigationButtons = @[[self medalsRankButton], - [self medalsSquareButton]]; - break; - case MedalsCenterDisplayType_Other: - title = [NSString stringWithFormat:YMLocalizedString(@"20.20.61_text_14"), - self.userInfo.nick]; - break; - case MedalsCenterDisplayType_Square: - title = YMLocalizedString(@"20.20.61_text_10"); - break; - default: - break; - } - [self setupCustomNavigationBar:^{} - title:title - titleColor:[UIColor whiteColor]]; - [self setupCustonNavigationRightButtons:navigationButtons - sizes:@[ - [NSValue valueWithCGSize:CGSizeMake(22, 22)], - [NSValue valueWithCGSize:CGSizeMake(22, 22)] - ]]; -} - -- (void)setupBackground { - self.view.backgroundColor = UIColorFromRGB(0x1B0043); - UIImageView *bottomBg = [self bottomBG]; - [self.view addSubview:bottomBg]; - if (self.displayType == MedalsCenterDisplayType_Other) { - [bottomBg mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.view).offset(66 + 98 + 44 + kSafeAreaTopHeight + 20); - }]; - } else { - UIImageView *topBg = [self topBG]; - [self.view addSubview:topBg]; - [topBg mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(314)); - }]; - - [bottomBg mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.view); -// make.height.mas_equalTo(kGetScaleWidth(445)); - make.top.mas_equalTo(topBg.mas_bottom).offset(44); - }]; - } -} - -- (void)setupOthersMedalInfo { - UIImageView *bg = [[UIImageView alloc] initWithImage:kImage(@"medals_other_bg")]; - [self.view addSubview:bg]; - [bg mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(80); - make.leading.trailing.mas_equalTo(self.view).inset(12); - make.height.mas_equalTo(kGetScaleWidth(98)); - }]; - self.otherBG = bg; - - [self.view addSubview:self.otherAvatar]; - [self.otherAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(bg); - make.leading.mas_equalTo(bg).offset(15); - make.size.mas_equalTo(CGSizeMake(53, 53)); - }]; - - self.otherNameLabel = [UILabel labelInitWithText:@"" - font:kFontSemibold(15) - textColor:UIColorFromRGB(0x313131)]; - [self.view addSubview:self.otherNameLabel]; - [self.otherNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.otherAvatar.mas_trailing).offset(10); - make.top.mas_equalTo(self.otherAvatar); - }]; - - UIImageView *rankIcon = [[UIImageView alloc] initWithImage:kImage(@"medals_icon_other")]; - [self.view addSubview:rankIcon]; - [rankIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.otherAvatar.mas_trailing).offset(10); - make.bottom.mas_equalTo(self.otherAvatar); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - - self.otherCountLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(20) - textColor:UIColorFromRGB(0x313131)]; - [self.view addSubview:self.otherCountLabel]; - [self.otherCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(rankIcon.mas_trailing).offset(6); - make.centerY.mas_equalTo(rankIcon); - }]; - - self.otherMedal = [[NetImageView alloc] initWithImage:kImage(@"medals_empty_other")]; - [self.view addSubview:self.otherMedal]; - [self.otherMedal mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(bg); - make.trailing.mas_equalTo(bg).offset(-15); - make.size.mas_equalTo(CGSizeMake(81, 81)); - }]; - - [self.view addSubview:self.otherMP4View]; - [self.otherMP4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(bg); - make.trailing.mas_equalTo(bg).offset(-15); - make.size.mas_equalTo(CGSizeMake(80, 80)); - }]; -} - -- (void)setupCenterTabs { - self.centerTabsStackView = [self centerTabStack]; - [self.view addSubview:self.centerTabsStackView]; - [self.centerTabsStackView mas_makeConstraints:^(MASConstraintMaker *make) { - if (self.displayType == MedalsCenterDisplayType_Other) { - make.top.mas_equalTo(self.otherBG.mas_bottom).offset(18); - } else { - make.top.mas_equalTo(kGetScaleWidth(314)); - } - make.height.mas_equalTo(44); - make.leading.trailing.mas_equalTo(self.view); - }]; -} - -- (void)setupWearingButton { - UIView *wearingBg = [[UIView alloc] init]; - [wearingBg addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xf2e7ff), - UIColorFromRGB(0xb497f6) - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 0.5) cornerRadius:25/2]; - [wearingBg setAllCornerRadius:25/2 borderWidth:1 borderColor:[UIColor whiteColor]]; - [self.view addSubview:wearingBg]; - - - UIButton *wearingButton = [self wearingButton]; - [self.view addSubview:wearingButton]; - [wearingButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(90); - make.trailing.mas_equalTo(-12); - make.height.mas_equalTo(25); - }]; - - [wearingBg mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(wearingButton).insets(UIEdgeInsetsMake(0, -25, 0, -25)); - }]; -} - -- (void)setupEmptyUserMedals { - - [self.view addSubview:self.medalsCyclePagerView]; - [self.view addSubview:self.emptyUserMedalButton]; - [self.emptyUserMedalButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(184); - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(100); - }]; - - [self.medalsCyclePagerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.emptyUserMedalButton); - make.width.mas_equalTo([UIScreen mainScreen].bounds.size.width); -// make.width.mas_equalTo(184*3); - make.height.mas_equalTo(self.emptyUserMedalButton); - }]; - - [self.view addSubview:self.medalDescLabel]; - if (self.displayType != MedalsCenterDisplayType_Square) { - self.medalDescLabel.text = YMLocalizedString(@"20.20.61_text_6"); - } - - [self.medalDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(290)); - make.leading.trailing.mas_equalTo(self.view).inset(20); - make.height.mas_equalTo(20); - }]; -} - -- (void)setupWearingUserMedals { -// // 添加 TYCyclePagerView 用于显示佩戴的勋章 -// [self.view addSubview:self.medalsCyclePagerView]; -// [self.medalsCyclePagerView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.top.mas_equalTo(100); -// make.centerX.mas_equalTo(self.view); -//// make.width.mas_equalTo([UIScreen mainScreen].bounds.size.width); -// make.width.height.mas_equalTo(184); -// }]; - - [self.view addSubview:self.medalDescLabel]; - self.medalDescLabel.text = @"显示过期时间";//YMLocalizedString(@"20.20.61_text_6"); - [self.medalDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(290)); - make.leading.trailing.mas_equalTo(self.view).inset(20); - make.height.mas_equalTo(20); - }]; -} - -- (void)setupScrollMedalsList { - -} - -- (void)setupBottomMedalsList { - [self.view addSubview:self.medalsCollectionView]; - [self.medalsCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.view); - make.trailing.leading.mas_equalTo(self.view).inset(26); - make.top.mas_equalTo(self.centerTabsStackView.mas_bottom).offset(68); - }]; - - // 添加下拉刷新 - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.lastUpdatedTimeLabel.hidden = YES; - self.medalsCollectionView.mj_header = header; - - // 添加上拉加载更多 - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - self.medalsCollectionView.mj_footer = footer; -} - -- (void)setupEmptyView { - self.emptyView.hidden = YES; - [self.view insertSubview:self.emptyView - belowSubview:self.medalsCollectionView]; - [self.emptyView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.medalsCollectionView); - make.height.mas_equalTo(200); - }]; -} - -#pragma mark - Refresh Methods -- (void)headerRefresh { - NSInteger page = 1; - switch (self.currentTabType) { - case MedalsCenterTab_TaskMedals: - self.currentPageTaskMedals = 1; - page = self.currentPageTaskMedals; - break; - case MedalsCenterTab_ActivityMedals: - self.currentPageActivityMedals = 1; - page = self.currentPageActivityMedals; - break; - case MedalsCenterTab_GloryMedals: - self.currentPageGloryMedals = 1; - page = self.currentPageGloryMedals; - break; - default: - break; - } - [self loadMedalsList:self.currentTabType page:page]; -} - -- (void)footerRefresh { - NSInteger page = 1; - switch (self.currentTabType) { - case MedalsCenterTab_TaskMedals: - self.currentPageTaskMedals += 1; - page = self.currentPageTaskMedals; - break; - case MedalsCenterTab_ActivityMedals: - self.currentPageActivityMedals += 1; - page = self.currentPageActivityMedals; - break; - case MedalsCenterTab_GloryMedals: - self.currentPageGloryMedals += 1; - page = self.currentPageGloryMedals; - break; - default: - break; - } - [self loadMedalsList:self.currentTabType page:page]; -} - -- (void)endReresh { - [self.medalsCollectionView.mj_header endRefreshing]; - [self.medalsCollectionView.mj_footer endRefreshing]; -} - -#pragma mark - Load datas -- (void)setupData { - self.datasourceTaskMedals = @[].mutableCopy; - self.datasourceActivityMedals = @[].mutableCopy; - self.datasourceGloryMedals = @[].mutableCopy; - - self.currentPageTaskMedals = 1; - self.currentPageActivityMedals = 1; - self.currentPageGloryMedals = 1; - - self.currentTabType = MedalsCenterTab_TaskMedals; - - [self loadMedalsList:self.currentTabType page:1]; -} - -- (void)loadMedalsList:(MedalsCenterTabType)tabType page:(NSInteger)tabPage { - if (self.displayType == MedalsCenterDisplayType_Square) { - [self.presenter squareMedals:tabPage - type:tabType]; - } else { - [self.presenter userMedals:self.userInfo.uid - page:tabPage - type:tabType]; - } -} - -#pragma mark - MedalsPresenterProtocol -- (void)userMedalsSuccess:(UserMedalsModel *)userMedalsModel { - self.userMedalsModel = userMedalsModel; - [self endReresh]; - [self _updateDataSource:userMedalsModel.medalSeries]; - [self _updateOtherInfo:userMedalsModel]; - [self _updateWearingInfo]; -} - -- (void)userMedalsFailure { - [self endReresh]; - - // 如果是加载更多失败，页码需要回退 - switch (self.currentTabType) { - case MedalsCenterTab_TaskMedals: - if (self.currentPageTaskMedals > 1) { - self.currentPageTaskMedals--; - } - break; - case MedalsCenterTab_ActivityMedals: - if (self.currentPageActivityMedals > 1) { - self.currentPageActivityMedals--; - } - break; - case MedalsCenterTab_GloryMedals: - if (self.currentPageGloryMedals > 1) { - self.currentPageGloryMedals--; - } - break; - default: - break; - } - - [self _updateDataSource:@[]]; -} - -- (void)squareMedalsSuccess:(NSArray *)squareMedalsModel { - switch (self.currentTabType) { - case MedalsCenterTab_TaskMedals: - if (self.currentPageTaskMedals == 1) { - self.taskSquareMedalVo = squareMedalsModel.mutableCopy; - } else { - [self.taskSquareMedalVo addObjectsFromArray:squareMedalsModel]; - } - break; - case MedalsCenterTab_ActivityMedals: - if (self.currentPageActivityMedals == 1) { - self.activitySquareMedalVo = squareMedalsModel.mutableCopy; - } else { - [self.activitySquareMedalVo addObjectsFromArray:squareMedalsModel]; - } - break; - case MedalsCenterTab_GloryMedals: - if (self.currentPageGloryMedals == 1) { - self.glorySquareMedalVo = squareMedalsModel.mutableCopy; - } else { - [self.glorySquareMedalVo addObjectsFromArray:squareMedalsModel]; - } - break; - default: - break; - } - - [self endReresh]; - [self _updateDataSource:squareMedalsModel]; - [self _updateWearingInfo]; -} - -- (void)squareMedalsFailure { - [self endReresh]; - - // 如果是加载更多失败，页码需要回退 - switch (self.currentTabType) { - case MedalsCenterTab_TaskMedals: - if (self.currentPageTaskMedals > 1) { - self.currentPageTaskMedals--; - } - break; - case MedalsCenterTab_ActivityMedals: - if (self.currentPageActivityMedals > 1) { - self.currentPageActivityMedals--; - } - break; - case MedalsCenterTab_GloryMedals: - if (self.currentPageGloryMedals > 1) { - self.currentPageGloryMedals--; - } - break; - default: - break; - } -} - -- (void)_updateWearingInfo { - - if (self.displayType == MedalsCenterDisplayType_Mine) { - self.useMedals = self.userMedalsModel.useMedals; - } else if (self.displayType == MedalsCenterDisplayType_Square) { - NSArray *arr = [NSArray array]; - NSMutableArray *editArr = [NSMutableArray array]; - switch (self.currentTabType) { - case MedalsCenterTab_TaskMedals: - arr = self.taskSquareMedalVo.copy; - break; - case MedalsCenterTab_ActivityMedals: - arr = self.activitySquareMedalVo.copy; - break; - case MedalsCenterTab_GloryMedals: - arr = self.glorySquareMedalVo.copy; - break; - - default: - break; - } - for (MedalSeriesVo *seriesVO in arr) { - for (MedalSeriesItemVo *item in seriesVO.medalSeries) { - // 遍历所有medalSeries，找到最高级别的 - for (MedalVo *medalVo in item.medalVos) { - if (medalVo.level == item.medalLevel) { - [editArr addObject:medalVo]; - } - } - } - } - self.useMedals = editArr.copy; - } - - if (self.displayType != MedalsCenterDisplayType_Other) { - if (self.useMedals.count > 0 ) { - self.emptyUserMedalButton.hidden = YES; - self.medalsCyclePagerView.hidden = NO; - [self.medalsCyclePagerView reloadData]; - if (self.useMedals.count > 1 && self.displayType == MedalsCenterDisplayType_Square) { - // 启动自动轮播，从第一个位置开始 - [self startAutoScroll:0]; - - // 确保滚动到第一个位置 - dispatch_async(dispatch_get_main_queue(), ^{ - [self.medalsCyclePagerView scrollToItemAtIndex:0 animate:NO]; - }); - } else { - // 停止自动轮播 - [self stopAutoScroll]; - } - } else { - self.emptyUserMedalButton.hidden = NO; - self.medalsCyclePagerView.hidden = YES; - } - } -} - - -- (void)startVisibleCellsPlayback { - // 获取所有可见的 cell 并启动播放 - NSArray *visibleCells = self.medalsCyclePagerView.collectionView.visibleCells; - for (UICollectionViewCell *cell in visibleCells) { - if ([cell isKindOfClass:[MedalsCyclePagerCell class]]) { - [(MedalsCyclePagerCell *)cell willDisplay]; - } - } -} - -- (void)_updateOtherInfo:(UserMedalsModel *)userModel { - _otherMedalsModel = userModel; - if (self.displayType == MedalsCenterDisplayType_Other) { - self.otherAvatar.imageUrl = userModel.avatar; - self.otherNameLabel.text = userModel.nick; - self.otherCountLabel.text = @(userModel.medalNum).stringValue; - - MedalVo *useMedal = [[userModel useMedals] xpSafeObjectAtIndex:0]; - if (useMedal) { - if ([useMedal.picUrl hasSuffix:@"mp4"]) { - // 显示客态的 MP4 播放 - [self displayOtherMedalMp4:useMedal.picUrl]; - } else { - // 显示客态的 图片 - [self displayOtherMedalImage:useMedal.picUrl]; - } - } else { - // 没有勋章时显示默认图片 - [self displayOtherMedalImage:nil]; - } - } -} - -#pragma mark - 其他用户勋章显示方法 - -/** - * 显示其他用户的勋章图片 - * @param imageUrl 图片URL，如果为nil则显示默认图片 - */ -- (void)displayOtherMedalImage:(NSString *)imageUrl { - // 停止MP4播放 - [self stopOtherMedalMP4Playback]; - - // 显示图片，隐藏MP4视图 - self.otherMP4View.hidden = YES; - self.otherMedal.hidden = NO; - - if (imageUrl && imageUrl.length > 0) { - self.otherMedal.imageUrl = imageUrl; - } else { - // 显示默认空勋章图片 - self.otherMedal.image = kImage(@"medals_empty_other"); - } -} - -/** - * 显示其他用户的勋章MP4动画 - * @param mp4Url MP4文件URL - */ -- (void)displayOtherMedalMp4:(NSString *)mp4Url { - if (!mp4Url || mp4Url.length == 0) { - [self displayOtherMedalImage:nil]; - return; - } - - // 停止之前的MP4播放 - [self stopOtherMedalMP4Playback]; - - // 显示MP4视图，隐藏图片 - self.otherMP4View.hidden = NO; - self.otherMedal.hidden = YES; - - // 初始化MP4解析器 - if (!self.mp4Parser) { - self.mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - } - - @kWeakify(self); - [self.mp4Parser parseWithURL:mp4Url - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl] && !self.otherMP4View.hidden) { - // 静音播放，因为是展示其他用户的勋章 - [self.otherMP4View setMute:YES]; - [self.otherMP4View playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - NSLog(@"Failed to parse other user medal mp4: %@", error); - // 播放失败时显示图片 - [self displayOtherMedalImage:nil]; - }]; -} - -/** - * 停止其他用户勋章的MP4播放 - */ -- (void)stopOtherMedalMP4Playback { - if (self.otherMP4View) { - [self.otherMP4View stopHWDMP4]; - } -} - -- (void)_updateDataSource:(NSArray *)models { - - NSArray *targetArr = models; - NSMutableArray *itemDataSources = [NSMutableArray array]; - - MedalSeriesVo *series = [models xpSafeObjectAtIndex:0]; - if (series) { - targetArr = series.medalSeries; - } - itemDataSources = targetArr.mutableCopy; - - if (targetArr.count < [self.presenter pageSize]) { - [self.medalsCollectionView.mj_footer endRefreshingWithNoMoreData]; - } else { - [self.medalsCollectionView.mj_footer resetNoMoreData]; - } - - switch (self.currentTabType) { - case MedalsCenterTab_TaskMedals: - if (self.currentPageTaskMedals == 1) { - self.emptyView.hidden = (targetArr.count != 0); - self.datasourceTaskMedals = itemDataSources; - } else { - [self.datasourceTaskMedals addObjectsFromArray:itemDataSources]; - } - break; - case MedalsCenterTab_ActivityMedals: - if (self.currentPageActivityMedals == 1) { - self.emptyView.hidden = (targetArr.count != 0); - self.datasourceActivityMedals = itemDataSources; - } else { - [self.datasourceActivityMedals addObjectsFromArray:itemDataSources]; - } - break; - case MedalsCenterTab_GloryMedals: - if (self.currentPageGloryMedals == 1) { - self.emptyView.hidden = (targetArr.count != 0); - self.datasourceGloryMedals = itemDataSources; - } else { - [self.datasourceGloryMedals addObjectsFromArray:itemDataSources]; - } - break; - - default: - break; - } - - [self.medalsCollectionView reloadData]; -} - -#pragma mark - 数据刷新 -- (void)refreshDataAfterWearingChange { - // 只有在 Mine 模式下才需要刷新（因为只有自己的勋章页面会受到佩戴变化影响） - if (self.displayType == MedalsCenterDisplayType_Mine) { - // 重新加载当前 tab 的数据 - [self loadMedalsList:self.currentTabType page:1]; - } -} - -#pragma mark - Button actions -- (void)didTapSquareButton:(UIButton *)sender { - MedalsViewController *vc = [[MedalsViewController alloc] initForMedalsSquare]; - [self.navigationController pushViewController:vc animated:YES]; -} - -- (void)didTapRankButton:(UIButton *)sender { - MedalsRankViewController *vc = [[MedalsRankViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; -} - -- (void)didTapWearingButton:(UIButton *)sender { - MedalsWearingViewController *vc = [[MedalsWearingViewController alloc] init]; - vc.userInfo = self.userInfo; - - // 设置数据变化回调 - @kWeakify(self); - vc.dataChangedCallback = ^{ - @kStrongify(self); - // 刷新数据 - [self refreshDataAfterWearingChange]; - }; - - [self addChildViewController:vc]; - [self.view addSubview:vc.view]; -} - -- (void)didTapEmptyMedalButton:(UIButton *)sender { - MedalsWearingViewController *vc = [[MedalsWearingViewController alloc] init]; - vc.userInfo = self.userInfo; - - // 设置数据变化回调 - @kWeakify(self); - vc.dataChangedCallback = ^{ - @kStrongify(self); - // 刷新数据 - [self refreshDataAfterWearingChange]; - }; - - [self addChildViewController:vc]; - [self.view addSubview:vc.view]; -} - -- (void)didTapCenterTab:(UIButton *)sender { - if (sender.isSelected == YES) { - return; - } - for (UIButton *b in self.centerTabButtons) { - b.selected = NO; - } - sender.selected = YES; - self.currentTabType = sender.tag; - - // 切换 tab 时重置自动滚动 - [self resetAutoScrollOnTabChange]; - - [self loadMedalsList:self.currentTabType page:1]; -} - -#pragma mark - UICollectionView DataSource & Delegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - switch (self.currentTabType) { - case MedalsCenterTab_TaskMedals: - return self.datasourceTaskMedals.count; - break; - case MedalsCenterTab_ActivityMedals: - return self.datasourceActivityMedals.count; - break; - case MedalsCenterTab_GloryMedals: - return self.datasourceGloryMedals.count; - break; - default: - break; - } -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - MedalsCollectionViewCell *cell = [MedalsCollectionViewCell cellFor:collectionView atIndexPath:indexPath]; - [cell updateCell:[self loadModel:indexPath.item] - isForSquare:self.displayType == MedalsCenterDisplayType_Square - isForMine:self.displayType == MedalsCenterDisplayType_Mine]; - return cell; -} - -// 处理 cell 的可见性 -- (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath { - if (collectionView == self.medalsCollectionView) { - if ([cell isKindOfClass:[MedalsCollectionViewCell class]]) { - [(MedalsCollectionViewCell *)cell willDisplay]; - } - } -} - -- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath { - if (collectionView == self.medalsCollectionView) { - if ([cell isKindOfClass:[MedalsCollectionViewCell class]]) { - [(MedalsCollectionViewCell *)cell didEndDisplaying]; - } - } -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - if (collectionView == self.medalsCyclePagerView.collectionView) { - return; - } - MedalsDetailView *view = [[MedalsDetailView alloc] initWithFrame:self.view.bounds]; - [view updateSeriesItem:[self loadModel:indexPath.item] - isMine:self.displayType == MedalsCenterDisplayType_Mine || self.displayType == MedalsCenterDisplayType_Other]; - [self.view addSubview:view]; -} - -- (MedalSeriesItemVo *)loadModel:(NSInteger)row { - MedalSeriesItemVo *model = nil; - switch (self.currentTabType) { - case MedalsCenterTab_TaskMedals: - model = [self.datasourceTaskMedals xpSafeObjectAtIndex:row]; - break; - case MedalsCenterTab_ActivityMedals: - model = [self.datasourceActivityMedals xpSafeObjectAtIndex:row]; - break; - case MedalsCenterTab_GloryMedals: - model = [self.datasourceGloryMedals xpSafeObjectAtIndex:row]; - break; - default: - break; - } - return model; -} - -- (MedalSeriesVo *)loadDetailModel:(NSInteger)row { - MedalSeriesVo *model = nil; - switch (self.currentTabType) { - case MedalsCenterTab_TaskMedals: - model = [self.taskSquareMedalVo xpSafeObjectAtIndex:row]; - break; - case MedalsCenterTab_ActivityMedals: - model = [self.activitySquareMedalVo xpSafeObjectAtIndex:row]; - break; - case MedalsCenterTab_GloryMedals: - model = [self.glorySquareMedalVo xpSafeObjectAtIndex:row]; - break; - default: - break; - } - return model; -} - - -#pragma mark - TYCyclePagerView DataSource & Delegate - -- (NSInteger)numberOfItemsInPagerView:(TYCyclePagerView *)pageView { - return self.useMedals.count; -} - -- (__kindof UICollectionViewCell *)pagerView:(TYCyclePagerView *)pagerView cellForItemAtIndex:(NSInteger)index { - MedalsCyclePagerCell *cell = [pagerView dequeueReusableCellWithReuseIdentifier:@"MedalsCyclePagerCell" forIndex:index]; - MedalVo *vo = [self.useMedals xpSafeObjectAtIndex:index]; - [cell updateCell:vo]; - - return cell; -} - -- (TYCyclePagerViewLayout *)layoutForPagerView:(TYCyclePagerView *)pageView { - TYCyclePagerViewLayout *layout = [[TYCyclePagerViewLayout alloc] init]; - layout.itemSize = CGSizeMake(184, 184); - layout.itemSpacing = 10; - layout.layoutType = TYCyclePagerTransformLayoutLinear; - layout.itemHorizontalCenter = YES; - return layout; -} - -- (void)pagerView:(TYCyclePagerView *)pageView didScrollFromIndex:(NSInteger)fromIndex toIndex:(NSInteger)toIndex { - // 用户手动滚动时，更新当前索引，重新开始自动轮播计时 - self.currentAutoScrollIndex = toIndex; - - // 如果有多个勋章且在广场页面，重新启动自动轮播定时器 - if (self.useMedals.count > 1 && self.displayType == MedalsCenterDisplayType_Square) { - [self startAutoScroll:toIndex]; - } - - if (self.displayType == MedalsCenterDisplayType_Mine) { - MedalVo *vo = [self.useMedals xpSafeObjectAtIndex:toIndex]; - self.medalDescLabel.text = [vo expireDateString]; - } else { - self.medalDescLabel.text = @""; - } -} - -#pragma mark - Lazy load -- (UIButton *)medalsSquareButton { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - [button addTarget:self action:@selector(didTapSquareButton:) forControlEvents:UIControlEventTouchUpInside]; - [button setBackgroundImage:kImage(@"medals_square") forState:UIControlStateNormal]; - return button; -} - -- (UIButton *)medalsRankButton { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - [button addTarget:self action:@selector(didTapRankButton:) forControlEvents:UIControlEventTouchUpInside]; - [button setBackgroundImage:kImage(@"medals_rank") forState:UIControlStateNormal]; - return button; -} - -- (UIButton *)wearingButton { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - [button addTarget:self action:@selector(didTapWearingButton:) forControlEvents:UIControlEventTouchUpInside]; - [button setTitle:YMLocalizedString(@"20.20.61_text_2") forState:UIControlStateNormal]; - [button setTitleColor:UIColorFromRGB(0x201440) forState:UIControlStateNormal]; - button.titleLabel.font = kFontMedium(12); - return button; -} - -- (UIImageView *)topBG { - UIImageView *iv = [[UIImageView alloc] initWithImage:kImage(@"medals_top_bg")]; - iv.contentMode = UIViewContentModeScaleAspectFit; - return iv; -} - -- (UIImageView *)bottomBG { - UIImage *originalImage = kImage(@"medals_bottom_bg"); - - // 创建可拉伸的图片，让下半部分可以拉伸 - // 假设图片高度的上半部分不拉伸，下半部分可拉伸 - CGFloat imageHeight = originalImage.size.height; - CGFloat stretchableTopInset = imageHeight * 0.5; // 上半部分不拉伸 - CGFloat stretchableBottomInset = 1; // 下半部分保留1像素不拉伸 - - UIImage *stretchableImage = [originalImage resizableImageWithCapInsets:UIEdgeInsetsMake(stretchableTopInset, 0, stretchableBottomInset, 0) - resizingMode:UIImageResizingModeStretch]; - - UIImageView *iv = [[UIImageView alloc] initWithImage:stretchableImage]; - iv.contentMode = UIViewContentModeScaleToFill; // 使用ScaleToFill来应用拉伸效果 - return iv; -} - -- (UIButton *)taskMedalsButton:(MedalsCenterTabType)tabType { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - button.tag = tabType; - switch (tabType) { - case MedalsCenterTab_TaskMedals: - [button setTitle:YMLocalizedString(@"20.20.61_text_3") forState:UIControlStateNormal]; - break; - case MedalsCenterTab_ActivityMedals: - [button setTitle:YMLocalizedString(@"20.20.61_text_4") forState:UIControlStateNormal]; - break; - case MedalsCenterTab_GloryMedals: - [button setTitle:YMLocalizedString(@"20.20.61_text_5") forState:UIControlStateNormal]; - break; - default: - break; - } - [button addTarget:self action:@selector(didTapCenterTab:) forControlEvents:UIControlEventTouchUpInside]; - [button setBackgroundImage:kImage(@"medals_tab_normal") forState:UIControlStateNormal]; - [button setBackgroundImage:kImage(@"medals_tab_selected") forState:UIControlStateSelected]; - [button setTitleColor:UIColorFromRGB(0xd8a2ff) forState:UIControlStateNormal]; - [button setTitleColor:UIColorFromRGB(0xFFFFFF) forState:UIControlStateSelected]; - [button.titleLabel setFont:kFontMedium(13)]; - [button.titleLabel setAdjustsFontSizeToFitWidth:YES]; - button.contentEdgeInsets = UIEdgeInsetsMake(0, 20, 0, 20); - [button setAdjustsImageWhenDisabled:NO]; - return button; -} - -- (UIStackView *)centerTabStack { - UIButton *taskMedalsButton = [self taskMedalsButton:MedalsCenterTab_TaskMedals]; - taskMedalsButton.selected = YES; - UIButton *activityMedalsButton = [self taskMedalsButton:MedalsCenterTab_ActivityMedals]; - UIButton *gloryMedalsButton = [self taskMedalsButton:MedalsCenterTab_GloryMedals]; - self.centerTabButtons = @[ - taskMedalsButton, - activityMedalsButton, - gloryMedalsButton - ]; - - UIStackView *stack = [[UIStackView alloc] initWithArrangedSubviews:self.centerTabButtons]; - stack.distribution = UIStackViewDistributionFillEqually; - - return stack; -} - -- (UILabel *)medalDescLabel { - if (!_medalDescLabel) { - _medalDescLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(12) - textColor:[UIColor whiteColor]]; - _medalDescLabel.textAlignment = NSTextAlignmentCenter; - } - return _medalDescLabel; -} - -- (UIButton *)emptyUserMedalButton { - if (!_emptyUserMedalButton) { - _emptyUserMedalButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_emptyUserMedalButton setImage:kImage(@"medals_empty") - forState:UIControlStateNormal]; - [_emptyUserMedalButton addTarget:self - action:@selector(didTapEmptyMedalButton:) - forControlEvents:UIControlEventTouchUpInside]; - } - return _emptyUserMedalButton; -} - -- (UICollectionView *)medalsCollectionView { - if (!_medalsCollectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(kGetScaleWidth(156), kGetScaleWidth(218)); - layout.minimumInteritemSpacing = 6; - layout.minimumLineSpacing = 6; - _medalsCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _medalsCollectionView.backgroundColor = [UIColor clearColor]; - _medalsCollectionView.delegate = self; - _medalsCollectionView.dataSource = self; - [MedalsCollectionViewCell registerTo:_medalsCollectionView]; - } - return _medalsCollectionView; -} - -- (UIView *)emptyView { - if (!_emptyView) { - _emptyView = [[UIView alloc] init]; - _emptyView.backgroundColor = [UIColor clearColor]; - - NSString *content = YMLocalizedString(@"20.20.61_text_7.1"); - if (self.displayType == MedalsCenterDisplayType_Mine) { - content = YMLocalizedString(@"20.20.61_text_7.2"); - } - - UILabel *titleLabel = [UILabel labelInitWithText:content - font:kFontRegular(14) - textColor:UIColorFromRGB(0xafb1b3)]; - titleLabel.numberOfLines = 2; - titleLabel.textAlignment = NSTextAlignmentCenter; - UIImageView *ufoImageView = [[UIImageView alloc] initWithImage:kImage(@"common_empty_UFO")]; - - [_emptyView addSubview:ufoImageView]; - [_emptyView addSubview:titleLabel]; - - [ufoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(_emptyView); - make.top.mas_equalTo(20); - make.size.mas_equalTo(CGSizeMake(110, 110)); - }]; - - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(_emptyView); - make.top.mas_equalTo(ufoImageView.mas_bottom).offset(10); - make.leading.trailing.mas_equalTo(_emptyView).inset(20); - }]; - } - return _emptyView; -} - -- (NetImageView *)otherAvatar { - if (!_otherAvatar) { - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _otherAvatar = [[NetImageView alloc] initWithConfig:config]; - [_otherAvatar setAllCornerRadius:53/2 borderWidth:1 borderColor:[UIColor whiteColor]]; - } - return _otherAvatar; -} - -- (TYCyclePagerView *)medalsCyclePagerView { - if (!_medalsCyclePagerView) { - _medalsCyclePagerView = [[TYCyclePagerView alloc] init]; - _medalsCyclePagerView.dataSource = self; - _medalsCyclePagerView.delegate = self; - _medalsCyclePagerView.backgroundColor = [UIColor clearColor]; - _medalsCyclePagerView.isInfiniteLoop = NO; - _medalsCyclePagerView.clipsToBounds = NO; -// _medalsCyclePagerView.autoScrollInterval = 0; // 禁用自动滚动 - [_medalsCyclePagerView registerClass:[MedalsCyclePagerCell class] - forCellWithReuseIdentifier:@"MedalsCyclePagerCell"]; - - // 设置内部 collectionView 的代理，用于处理 cell 的显示和隐藏 -// _medalsCyclePagerView.collectionView.delegate = self; - } - return _medalsCyclePagerView; -} - -- (VAPView *)otherMP4View { - if (!_otherMP4View) { - _otherMP4View = [[VAPView alloc] init]; - _otherMP4View.contentMode = UIViewContentModeScaleAspectFit; - } - return _otherMP4View; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsWearingControlCollectionViewCell.h b/YuMi/Modules/YMMine/View/Medals/MedalsWearingControlCollectionViewCell.h deleted file mode 100644 index b7a6777..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsWearingControlCollectionViewCell.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// MedalsWearingControlCollectionViewCell.h -// YuMi -// -// Created by P on 2025/6/19. -// - -#import - -@class MedalVo; - -NS_ASSUME_NONNULL_BEGIN - -@interface MedalsWearingControlCollectionViewCell : UICollectionViewCell - -+ (void)registerTo:(UICollectionView *)collectionView; -+ (instancetype)cellFor:(UICollectionView *)collectionView atIndexPath:(NSIndexPath *)index; - -- (void)updateVIPLevel:(NSInteger)level; -- (void)updateMedal:(MedalVo *)medalVo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsWearingControlCollectionViewCell.m b/YuMi/Modules/YMMine/View/Medals/MedalsWearingControlCollectionViewCell.m deleted file mode 100644 index 723b66c..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsWearingControlCollectionViewCell.m +++ /dev/null @@ -1,187 +0,0 @@ -// -// MedalsWearingControlCollectionViewCell.m -// YuMi -// -// Created by P on 2025/6/19. -// - -#import "MedalsWearingControlCollectionViewCell.h" -#import "MedalsModel.h" - -@interface VipPill : UIView - -- (void)updateLevel:(NSInteger)level; - -@end - -@implementation VipPill { - UILabel *contentLabel; -} - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xf2e7ff), - UIColorFromRGB(0xb497f6) - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 0.5) cornerRadius:6.5]; - [self setAllCornerRadius:6.5 borderWidth:1 borderColor:[UIColor whiteColor]]; - - contentLabel = [UILabel labelInitWithText:@"VIP" font:kFontHeavy(10) textColor:UIColorFromRGB(0x1b0043)]; - [self addSubview:contentLabel]; - [contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - }]; - } - return self; -} - -- (void)updateLevel:(NSInteger)level { - contentLabel.text = [NSString stringWithFormat:@"VIP%@", @(level)]; -} - -@end - -@interface MedalsWearingControlCollectionViewCell () - -@property (nonatomic, strong) NetImageView *medalImageView; -@property (nonatomic, strong) UIImageView *vipImageView; -@property (nonatomic, strong) VipPill *pill; - -@end - -@implementation MedalsWearingControlCollectionViewCell - -+ (NSString *)cellID { - return NSStringFromClass([MedalsWearingControlCollectionViewCell class]); -} - -+ (void)registerTo:(UICollectionView *)collectionView { - [collectionView registerClass:[self class] forCellWithReuseIdentifier:[self cellID]]; -} - -+ (instancetype)cellFor:(UICollectionView *)collectionView atIndexPath:(NSIndexPath *)index { - MedalsWearingControlCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:[self cellID] - forIndexPath:index]; - return cell; -} - -- (void)updateVIPLevel:(NSInteger)level { - if (level <= 0) { - self.pill.hidden = YES; - self.vipImageView.hidden = YES; - return; - } - - self.vipImageView.hidden = NO; - NSString *imagePath = [NSString stringWithFormat:@"medals_control_vip%@", - @(level)]; - self.vipImageView.image = kImage(imagePath); - - self.pill.hidden = self.vipImageView.hidden; - [self.pill updateLevel:level]; -} - -- (void)updateMedal:(MedalVo *)medalVo { - if (!medalVo) { - self.medalImageView.imageUrl = @""; - return; - } - - // 按照新的显示逻辑处理（该 Cell 只支持图片显示） - [self handleMedalDisplay:medalVo]; -} - -#pragma mark - 新的显示逻辑 -- (void)handleMedalDisplay:(MedalVo *)medalVo { - if (!medalVo) { - self.medalImageView.imageUrl = @""; - return; - } - - // 1. 优先判断 mp4Url 是否有内容 - if (![NSString isEmpty:medalVo.mp4Url]) { - // 该 Cell 不支持 mp4，降级使用 picUrl - if (![NSString isEmpty:medalVo.picUrl] && [NSString isImageFormat:medalVo.picUrl]) { - self.medalImageView.imageUrl = medalVo.picUrl; - } else { - // picUrl 不是图片格式或为空，显示默认占位图 - self.medalImageView.imageUrl = @""; - } - return; - } - - // 2. mp4Url 为空，使用 picUrl - if (![NSString isEmpty:medalVo.picUrl]) { - // 3. 使用 picUrl 时，判断内容是否为图片 - if ([NSString isImageFormat:medalVo.picUrl]) { - self.medalImageView.imageUrl = medalVo.picUrl; - } else { - [self handleLegacyDisplay:medalVo]; - } - return; - } - - // 4. 都为空，显示默认占位图 - self.medalImageView.imageUrl = @""; -} - -#pragma mark - 旧版显示逻辑（用于 Debug 环境兼容） -- (void)handleLegacyDisplay:(MedalVo *)medalVo { - if (![medalVo.picUrl hasSuffix:@"mp4"]) { - self.medalImageView.imageUrl = medalVo.picUrl; - } else { - self.medalImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - } -} - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self.contentView addSubview:self.medalImageView]; - [self.contentView addSubview:self.vipImageView]; - [self.contentView addSubview:self.pill]; - - [self.medalImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - [self.vipImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.centerY.mas_equalTo(self.contentView.mas_bottom); - make.size.mas_equalTo(CGSizeMake(32, 13)); - }]; - [self.pill mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.vipImageView); - }]; - } - return self; -} - -#pragma mark - -- (NetImageView *)medalImageView { - if (!_medalImageView) { - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = kImage(@"medals_control_position"); - _medalImageView = [[NetImageView alloc] initWithConfig:config]; - _medalImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _medalImageView; -} - -- (UIImageView *)vipImageView { - if (!_vipImageView) { - _vipImageView = [[UIImageView alloc] init]; - } - return _vipImageView; -} - -- (VipPill *)pill { - if (!_pill) { - _pill = [[VipPill alloc] initWithFrame:CGRectZero]; - } - return _pill; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsWearingListCollectionViewCell.h b/YuMi/Modules/YMMine/View/Medals/MedalsWearingListCollectionViewCell.h deleted file mode 100644 index aaea6ee..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsWearingListCollectionViewCell.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// MedalsWearingListCollectionViewCell.h -// YuMi -// -// Created by P on 2025/6/19. -// - -#import -@class MedalVo; -NS_ASSUME_NONNULL_BEGIN - -@interface MedalsWearingListCollectionViewCell : UICollectionViewCell - -+ (void)registerTo:(UICollectionView *)collectionView; -+ (instancetype)cellFor:(UICollectionView *)collectionView atIndexPath:(NSIndexPath *)index; - -- (void)updateCell:(MedalVo *)medalModel; - -// 可见性管理 -- (void)willDisplay; -- (void)didEndDisplaying; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsWearingListCollectionViewCell.m b/YuMi/Modules/YMMine/View/Medals/MedalsWearingListCollectionViewCell.m deleted file mode 100644 index ff487dd..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsWearingListCollectionViewCell.m +++ /dev/null @@ -1,337 +0,0 @@ -// -// MedalsWearingListCollectionViewCell.m -// YuMi -// -// Created by P on 2025/6/19. -// - -#import "MedalsWearingListCollectionViewCell.h" -#import -#import "XPRoomGiftAnimationParser.h" -#import "MedalsModel.h" - -@interface MedalsWearingListCollectionViewCell () -@property(nonatomic, copy) NSString *imagePath; -@property(nonatomic, copy) NSString *mp4Path; - -@property(nonatomic, strong) NetImageView *imageView; -@property(nonatomic, strong) VAPView *mp4View; -@property(nonatomic, strong) XPRoomGiftAnimationParser *mp4Parser; - -@property (nonatomic, strong) UIImageView *selectedImageView; - -@property (nonatomic, assign) BOOL isVisible; // 跟踪 cell 是否可见 - -// 新增属性：用于降级处理 -@property (nonatomic, strong) MedalVo *currentMedalModel; // 当前显示的 medal 模型 - -@end - -@implementation MedalsWearingListCollectionViewCell - -+ (NSString *)cellID { - return NSStringFromClass([MedalsWearingListCollectionViewCell class]); -} - -+ (void)registerTo:(UICollectionView *)collectionView { - [collectionView registerClass:[self class] forCellWithReuseIdentifier:[self cellID]]; -} - -+ (instancetype)cellFor:(UICollectionView *)collectionView atIndexPath:(NSIndexPath *)index { - MedalsWearingListCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:[self cellID] - forIndexPath:index]; - cell.isVisible = YES; - return cell; -} - -- (void)updateCell:(MedalVo *)medalModel { - self.selectedImageView.hidden = medalModel.useStatus==NO; - - // 保存当前模型，用于降级处理 - self.currentMedalModel = medalModel; - - // 按照新的显示逻辑处理 - [self handleMedalDisplay:medalModel]; -} - -#pragma mark - 新的显示逻辑 -- (void)handleMedalDisplay:(MedalVo *)medalModel { - if (!medalModel) { - [self setImagePath:@""]; - return; - } - - // 使用 picUrl - if (![NSString isEmpty:medalModel.picUrl]) { - // 3. 使用 picUrl 时，判断内容是否为图片 - if ([NSString isImageFormat:medalModel.picUrl]) { - [self setImagePath:medalModel.picUrl]; - } else { - // 降级 - [self handleLegacyDisplay:medalModel]; - } - return; - } else if (![NSString isEmpty:medalModel.mp4Url]) { - // 判断 mp4Url 是否有内容 - [self setMp4Path:medalModel.mp4Url]; - return; - } - - // 4. 都为空，显示默认占位图 - [self setImagePath:@""]; -} - -#pragma mark - mp4 失败降级处理 -- (void)handleMp4FailureFallback { - if (!self.currentMedalModel) { - [self setImagePath:@""]; - return; - } - - // mp4 下载失败，降级使用 picUrl - if (![NSString isEmpty:self.currentMedalModel.picUrl]) { - if ([NSString isImageFormat:self.currentMedalModel.picUrl]) { - [self setImagePath:self.currentMedalModel.picUrl]; - } else { - // picUrl 也不是图片格式，显示默认占位图 - [self setImagePath:@""]; - } - } else { - // picUrl 为空，显示默认占位图 - [self setImagePath:@""]; - } -} - -#pragma mark - 旧版显示逻辑（用于 Debug 环境兼容） -- (void)handleLegacyDisplay:(MedalVo *)medalModel { - if ([medalModel.picUrl hasSuffix:@"mp4"]) { - [self setMp4Path:medalModel.picUrl]; - } else { - [self setImagePath:medalModel.picUrl]; - } -} - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self setupUI]; - [self setupNotifications]; - } - return self; -} - -- (void)setupUI { - [self.contentView addGradientBackgroundWithColors:@[ - UIColorFromRGB(0x41007b), - UIColorFromRGB(0x290858) - ] startPoint:CGPointMake(0.5, 0) endPoint:CGPointMake(0.5, 1) cornerRadius:8]; - - [self.contentView setAllCornerRadius:8 - borderWidth:1 - borderColor:UIColorFromRGB(0xa166bf)]; - - self.imageView = [[NetImageView alloc] init]; - self.imageView.contentMode = UIViewContentModeScaleAspectFill; - [self.contentView addSubview:self.imageView]; - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(13); - make.leading.trailing.mas_equalTo(self.contentView).inset(13); - make.height.mas_equalTo(self.imageView.mas_width); - }]; - - [self.contentView addSubview:self.mp4View]; - [self.mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.imageView); - }]; - - [self.contentView addSubview:self.selectedImageView]; - [self.selectedImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(7); - make.trailing.mas_equalTo(-7); - make.size.mas_equalTo(CGSizeMake(21, 21)); - }]; -} - -- (void)setImagePath:(NSString *)imagePath { - // 停止之前的 mp4 播放 - [self stopMP4Playback]; - - _imagePath = imagePath; - self.mp4View.hidden = YES; - self.imageView.hidden = NO; - self.imageView.imageUrl = imagePath; -} - -- (void)setMp4Path:(NSString *)mp4Path { - if ([NSString isEmpty:mp4Path]) { - return; - } - - // 如果是相同的 mp4 路径，不需要重新加载 -// if ([_mp4Path isEqualToString:mp4Path]) { -// return; -// } - - // 停止之前的 mp4 播放 - [self stopMP4Playback]; - - _mp4Path = mp4Path; - self.mp4View.hidden = NO; - self.imageView.hidden = YES; - - if (!_mp4Parser) { - self.mp4Parser = [[XPRoomGiftAnimationParser alloc] init]; - } - - @kWeakify(self); - [self.mp4Parser parseWithURL:mp4Path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl]) { - // 只有当 cell 可见时才播放 - if (self.isVisible) { - [self.mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } else { - // 存储 URL，但不立即播放 - self.mp4View.tag = 1; // 标记已准备好播放 - } - } - } failureBlock:^(NSError * _Nullable error) { - NSLog(@"Failed to parse mp4: %@", error); - // mp4 下载失败时，降级使用 picUrl - [self handleMp4FailureFallback]; - }]; -} - -#pragma mark - MP4 播放控制 -- (void)stopMP4Playback { - if (self.mp4View) { - [self.mp4View stopHWDMP4]; - self.mp4View.tag = 0; // 重置播放状态标记 - } -} - -- (void)pauseMP4Playback { - if (self.mp4View && !self.mp4View.hidden) { - [self.mp4View pauseHWDMP4]; - } -} - -- (void)resumeMP4Playback { - if (self.mp4View && !self.mp4View.hidden && self.mp4Path) { - if (self.mp4View.tag == 1) { // 已准备好但尚未播放 - @kWeakify(self); - [self.mp4Parser parseWithURL:self.mp4Path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl] && self.isVisible) { - [self.mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } - } failureBlock:nil]; - } else { - [self.mp4View resumeHWDMP4]; - } - } -} - -#pragma mark - 可见性管理 - -- (void)willDisplay { - self.isVisible = YES; - [self resumeMP4Playback]; -} - -- (void)didEndDisplaying { - self.isVisible = NO; - [self pauseMP4Playback]; -} - -#pragma mark - 通知处理 - -- (void)appDidEnterBackground { - [self pauseMP4Playback]; -} - -- (void)appWillEnterForeground { - if (self.isVisible) { - [self resumeMP4Playback]; - } -} - -- (void)didReceiveMemoryWarning { - // 内存警告时停止播放 - if (!self.isVisible) { - [self stopMP4Playback]; - } -} - -#pragma mark - 生命周期 - -- (void)dealloc { - // 停止播放 - [self stopMP4Playback]; - - // 移除通知观察者 - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - // 清理资源 - self.mp4Parser = nil; - NSLog(@"MedalsWearingListCollectionViewCell dealloc"); -} - -#pragma mark - -- (VAPView *)mp4View { - if (!_mp4View) { - _mp4View = [[VAPView alloc] init]; - _mp4View.contentMode = UIViewContentModeScaleAspectFit; - } - return _mp4View; -} - -- (UIImageView *)selectedImageView { - if (!_selectedImageView) { - _selectedImageView = [[UIImageView alloc] initWithImage:kImage(@"medals_selected")]; - _selectedImageView.hidden = YES; - } - return _selectedImageView; -} - -- (void)setupNotifications { - // 监听应用进入后台和恢复前台的通知 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(appDidEnterBackground) - name:UIApplicationDidEnterBackgroundNotification - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(appWillEnterForeground) - name:UIApplicationWillEnterForegroundNotification - object:nil]; - - // 监听内存警告通知 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(didReceiveMemoryWarning) - name:UIApplicationDidReceiveMemoryWarningNotification - object:nil]; -} - -- (void)prepareForReuse { - [super prepareForReuse]; - - // 停止播放 - [self stopMP4Playback]; - - // 隐藏 mp4 视图 - self.mp4View.hidden = YES; - self.imageView.hidden = NO; - - // 重置状态 - self.mp4Path = nil; - self.imagePath = nil; - self.isVisible = NO; - self.currentMedalModel = nil; // 重置当前模型 -} - -@end diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsWearingViewController.h b/YuMi/Modules/YMMine/View/Medals/MedalsWearingViewController.h deleted file mode 100644 index 477cdb8..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsWearingViewController.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// MedalsWearingViewController.h -// YuMi -// -// Created by P on 2025/6/19. -// - -#import "MvpViewController.h" -@class UserInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface MedalsWearingViewController : MvpViewController - -/// 数据变化回调，当佩戴数据发生改变时触发 -@property (nonatomic, copy) void (^dataChangedCallback)(void); -@property (nonatomic, strong) UserInfoModel *userInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Medals/MedalsWearingViewController.m b/YuMi/Modules/YMMine/View/Medals/MedalsWearingViewController.m deleted file mode 100644 index aca0115..0000000 --- a/YuMi/Modules/YMMine/View/Medals/MedalsWearingViewController.m +++ /dev/null @@ -1,401 +0,0 @@ -// -// MedalsWearingViewController.m -// YuMi -// -// Created by P on 2025/6/19. -// - -#import "MedalsWearingViewController.h" -#import "MedalsPresenter.h" -#import "MedalsWearingListCollectionViewCell.h" -#import "MedalsWearingControlCollectionViewCell.h" -#import "MJRefresh.h" -#import "UserInfoModel.h" -#import "XPWebViewController.h" - -@interface MedalsWearingViewController () - -@property (nonatomic, strong) UIView *dismissArea; -@property (nonatomic, strong) UIView *contentArea; -@property (nonatomic, strong) UIImageView *controlAreaBG; -@property (nonatomic, strong) UICollectionView *controlAreaCollectionView; -@property (nonatomic, strong) UICollectionView *medalsAreaCollectionView; - -@property (nonatomic, assign) NSInteger medalsAreaPage; - -@property (nonatomic, copy) NSArray *useMedalsVo; -@property (nonatomic, copy) NSArray *allMedalsVo; -@property (nonatomic, copy) NSDictionary *vipSeatDic; -@property (nonatomic, assign) NSInteger minVipLevelForSeats; - -// 数据变化标记 -@property (nonatomic, assign) BOOL hasDataChanged; - -@end - -@implementation MedalsWearingViewController - -- (MedalsPresenter *)createPresenter { - return [[MedalsPresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.medalsAreaPage = 1; - self.hasDataChanged = NO; // 初始化数据变化标记 - - [self setupUI]; - [self setupRefresh]; - [self loadMedals]; -} - -- (void)setupUI { - self.view.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - [self.view addSubview:self.dismissArea]; - [self.view addSubview:self.contentArea]; - - [self.contentArea addSubview:self.controlAreaBG]; - [self.contentArea addSubview:self.controlAreaCollectionView]; - [self.controlAreaBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(46); - make.leading.trailing.mas_equalTo(self.contentArea).inset(14); - make.height.mas_equalTo(kGetScaleWidth(147)); - }]; - [self.controlAreaCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.controlAreaBG).insets(UIEdgeInsetsMake(15, 15, 0, 15)); - }]; - - [self.contentArea addSubview:self.medalsAreaCollectionView]; - [self.medalsAreaCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.controlAreaBG.mas_bottom).offset(14); - make.leading.trailing.mas_equalTo(self.controlAreaBG); - make.bottom.mas_equalTo(self.contentArea); - }]; -} - -- (void)setupRefresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.lastUpdatedTimeLabel.hidden = YES; - header.stateLabel.hidden = YES; - self.medalsAreaCollectionView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - self.medalsAreaCollectionView.mj_footer = footer; -} - -- (void)loadMedals { - [self.presenter mineAllMedals:self.medalsAreaPage]; -} - -#pragma mark - User Actions -- (void)handleTapGesture:(id)sender { - [self dismissViewController]; -} - -- (void)dismissViewController { - // 如果数据发生了变化，触发回调 - if (self.hasDataChanged && self.dataChangedCallback) { - self.dataChangedCallback(); - } - - [self.view removeFromSuperview]; - [self removeFromParentViewController]; -} - -#pragma mark - -- (void)mineAllMedalsSuccess:(MineAllMedalModel *)model { - [self endRefresh]; - - // 重置最低VIP level - self.minVipLevelForSeats = 0; - - if (model.allMedals.count < [self.presenter pageSize]) { - [self.medalsAreaCollectionView.mj_footer endRefreshingWithNoMoreData]; - } else { - [self.medalsAreaCollectionView.mj_footer resetNoMoreData]; - } - - self.vipSeatDic = model.vipMedalSeatVos; - self.allMedalsVo = model.allMedals; - self.useMedalsVo = model.useMedals; - - [self.controlAreaCollectionView reloadData]; - [self.medalsAreaCollectionView reloadData]; -} - -- (void)mineAllMedalsFailure { - [self endRefresh]; - - // 如果是加载更多失败，页码需要回退 - if (self.medalsAreaPage > 1) { - self.medalsAreaPage--; - } -} - -- (void)useMedalSuccess { - // 标记数据已变化 - self.hasDataChanged = YES; - [self headerRefresh]; -} - -- (void)userMedalsFailure { - -} - -- (void)endRefresh { - [self.medalsAreaCollectionView.mj_header endRefreshing]; - [self.medalsAreaCollectionView.mj_footer endRefreshing]; -} - -#pragma mark - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - if (collectionView == self.controlAreaCollectionView) { - return 10; - } else if (collectionView == self.medalsAreaCollectionView) { - return self.allMedalsVo.count; - } - return 0; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - if (collectionView == self.controlAreaCollectionView) { - MedalsWearingControlCollectionViewCell *cell = [MedalsWearingControlCollectionViewCell cellFor:collectionView atIndexPath:indexPath]; - - // 找到 vipSeatDic 的最小 key，判断当前 index 是否适用显示 VIP level - NSInteger minSeatIndex = NSIntegerMax; - for (NSString *key in self.vipSeatDic.allKeys) { - NSInteger seatIndex = [key integerValue]; - if (seatIndex < minSeatIndex) { - minSeatIndex = seatIndex; - } - } - - // 当前 cell 的座位索引（从1开始） - NSInteger currentSeatIndex = indexPath.row + 1; - - // 只有当前座位索引大于等于最小座位索引时，才处理 VIP level 逻辑 - if (minSeatIndex != NSIntegerMax && currentSeatIndex >= minSeatIndex) { - // 根据 vipSeatDic 数据判断是否调用 updateVIPLevel - NSString *seatKey = [NSString stringWithFormat:@"%ld", (long)currentSeatIndex]; - NSArray *vipLevels = self.vipSeatDic[seatKey]; - - if (vipLevels && vipLevels.count > 0) { - // 找到最低的 VIP level - NSInteger currentMinVipLevel = NSIntegerMax; - for (NSNumber *levelNum in vipLevels) { - NSInteger level = [levelNum integerValue]; - if (level < currentMinVipLevel) { - currentMinVipLevel = level; - } - } - - if (currentMinVipLevel != NSIntegerMax) { - // 更新全局最低VIP level - self.minVipLevelForSeats = currentMinVipLevel; - [cell updateVIPLevel:currentMinVipLevel]; - } - } else if (self.minVipLevelForSeats >= 0) { - // 当前座位没有对应的vip seat vo，但之前已经有最低VIP level，则沿用 - [cell updateVIPLevel:self.minVipLevelForSeats]; - } - } else { - // 如果当前座位索引小于最小座位索引，则不显示 VIP level - [cell updateVIPLevel:-1]; - } - - MedalVo *medalVo = [self.useMedalsVo xpSafeObjectAtIndex:indexPath.row]; - [cell updateMedal:medalVo]; - - return cell; - } else if (collectionView == self.medalsAreaCollectionView) { - MedalsWearingListCollectionViewCell *cell = [MedalsWearingListCollectionViewCell cellFor:collectionView atIndexPath:indexPath]; - [cell updateCell:[self.allMedalsVo xpSafeObjectAtIndex:indexPath.row]]; - return cell; - } - return nil; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - if (collectionView == self.controlAreaCollectionView) { - // 当前 cell 的座位索引（从1开始） - NSInteger currentSeatIndex = indexPath.row + 1; - NSString *seatKey = [NSString stringWithFormat:@"%ld", (long)currentSeatIndex]; - NSArray *vipLevels = self.vipSeatDic[seatKey]; - - // 计算当前位置显示的VIP level - NSInteger displayedVipLevel = -1; - - // 找到 vipSeatDic 的最小 key - NSInteger minSeatIndex = NSIntegerMax; - for (NSString *key in self.vipSeatDic.allKeys) { - NSInteger seatIndex = [key integerValue]; - if (seatIndex < minSeatIndex) { - minSeatIndex = seatIndex; - } - } - - // 判断当前位置的VIP level - if (minSeatIndex != NSIntegerMax && currentSeatIndex >= minSeatIndex) { - if (vipLevels && vipLevels.count > 0) { - // 找到最低的 VIP level - NSInteger currentMinVipLevel = NSIntegerMax; - for (NSNumber *levelNum in vipLevels) { - NSInteger level = [levelNum integerValue]; - if (level < currentMinVipLevel) { - currentMinVipLevel = level; - } - } - if (currentMinVipLevel != NSIntegerMax) { - displayedVipLevel = currentMinVipLevel; - } - } else if (self.minVipLevelForSeats > 0) { - displayedVipLevel = self.minVipLevelForSeats; - } - } - - UserVipInfoVo *vipVo = self.userInfo.userVipInfoVO; - if (vipVo) { - if (vipVo.vipLevel < displayedVipLevel) { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; -// config.actionStyle = 0; - config.title = YMLocalizedString(@"20.20.61_text_17"); - config.message = YMLocalizedString(@"20.20.61_text_15"); - - TTAlertButtonConfig *confirmCongif = config.confirmButtonConfig; - confirmCongif.title = YMLocalizedString(@"20.20.61_text_18"); - config.confirmButtonConfig = confirmCongif; - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ - @kStrongify(self); - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kVIP); - [self.navigationController pushViewController:webVC animated:YES]; - } cancelHandler:^{ - }]; - } - } - - NSLog(@"[MedalsWearing] 点击位置: %ld, 座位索引: %ld, 显示VIP等级: %ld, VIP数据: %@, 最小座位索引: %ld, 全局最低VIP: %ld", - (long)indexPath.row, - (long)currentSeatIndex, - (long)displayedVipLevel, - vipLevels ?: @"无", - (long)minSeatIndex, - (long)self.minVipLevelForSeats); - } else if (collectionView == self.medalsAreaCollectionView) { - if (self.useMedalsVo.count >= 10) { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.actionStyle = 0; - config.title = YMLocalizedString(@"UserDetail_CP_Toast_0"); - config.message = YMLocalizedString(@"20.20.61_text_16"); - [TTPopup alertWithConfig:config confirmHandler:^{ - } cancelHandler:^{ - }]; - } else { - MedalVo *vo = [self.allMedalsVo xpSafeObjectAtIndex:indexPath.row]; - if (vo) { - [self.presenter updateMedalUseStatus:vo.id isUse:!vo.useStatus]; - } - } - } -} - -// 处理 cell 的可见性 -- (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath { - if ([cell isKindOfClass:[MedalsWearingListCollectionViewCell class]]) { - [(MedalsWearingListCollectionViewCell *)cell willDisplay]; - } -} - -- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath { - if ([cell isKindOfClass:[MedalsWearingListCollectionViewCell class]]) { - [(MedalsWearingListCollectionViewCell *)cell didEndDisplaying]; - } -} - -#pragma mark - Refresh Actions -- (void)headerRefresh { - self.medalsAreaPage = 1; - [self loadMedals]; -} - -- (void)footerRefresh { - self.medalsAreaPage++; - [self loadMedals]; -} - -#pragma mark - Lazy Load -- (UIView *)dismissArea { - if (!_dismissArea) { - _dismissArea = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(192))]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)]; - [_dismissArea addGestureRecognizer:tap]; - } - return _dismissArea; -} - -- (UIView *)contentArea { - if (!_contentArea) { - _contentArea = [[UIView alloc] initWithFrame:CGRectMake(0, kGetScaleWidth(192), KScreenWidth, KScreenHeight - kGetScaleWidth(192))]; - [_contentArea setBackgroundColor:UIColorFromRGB(0x1B0043)]; - [_contentArea setCornerRadius:16 corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner borderWidth:0 borderColor:[UIColor clearColor]]; - - UILabel *titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"20.20.61_text_2") font:kFontMedium(16) textColor:[UIColor whiteColor]]; - [_contentArea addSubview:titleLabel]; - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(_contentArea); - make.top.mas_equalTo(12); - make.height.mas_equalTo(22); - }]; - } - return _contentArea; -} - -- (UIImageView *)controlAreaBG { - if (!_controlAreaBG) { - _controlAreaBG = [[UIImageView alloc] initWithImage:kImage(@"medals_control_bg")]; - } - return _controlAreaBG; -} - -- (UICollectionView *)controlAreaCollectionView { - if (!_controlAreaCollectionView) { - CGFloat length = (KScreenWidth - 60 - 21 *4)/5.0; - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(length, length); - layout.minimumInteritemSpacing = 21; - layout.minimumLineSpacing = 19; - - _controlAreaCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _controlAreaCollectionView.backgroundColor = [UIColor clearColor]; - _controlAreaCollectionView.delegate = self; - _controlAreaCollectionView.dataSource = self; - _controlAreaCollectionView.clipsToBounds = NO; - - [MedalsWearingControlCollectionViewCell registerTo:_controlAreaCollectionView]; - } - return _controlAreaCollectionView; -} -- (UICollectionView *)medalsAreaCollectionView { - if (!_medalsAreaCollectionView) { - CGFloat length = kGetScaleWidth(166); - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(length, length); - layout.minimumInteritemSpacing = 12; - layout.minimumLineSpacing = 14; - _medalsAreaCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _medalsAreaCollectionView.backgroundColor = [UIColor clearColor]; - _medalsAreaCollectionView.delegate = self; - _medalsAreaCollectionView.dataSource = self; - - [MedalsWearingListCollectionViewCell registerTo:_medalsAreaCollectionView]; - } - return _medalsAreaCollectionView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.h b/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.h deleted file mode 100644 index d4a32c1..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// YMMineSimpleUserInfoHeaderView.h -// YUMI -// -// Created by XY on 2023/2/21. -// - -#import - -@class UserInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@protocol XPMineSimpleUserInfoHeaderViewDelegate -/// 点击了更多礼物 -- (void)headerViewMoreGiftAction; -/// 点击了直播中 -- (void)headerViewOnlineAction:(NSString *)roomUid; - -@end - -@interface XPMineSimpleUserInfoHeaderView : UIView - -/// 用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; - -///当前查看用户是否在直播 -@property (nonatomic,copy) NSString *roomUid; - -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.m deleted file mode 100644 index fc9f280..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.m +++ /dev/null @@ -1,429 +0,0 @@ -// -// YMMineSimpleUserInfoHeaderView.m -// YUMI -// -// Created by XY on 2023/2/21. -// - -#import "XPMineSimpleUserInfoHeaderView.h" -#import "NetImageView.h" -#import -#import "DJDKMIMOMColor.h" -#import -#import -#import - -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" -#import "UIButton+EnlargeTouchArea.h" -#import "UIImage+Utils.h" - -///View -#import "XPMineUserInfoGiftView.h" - -#import "UserGiftWallInfoModel.h" -#import "UserInfoModel.h" - - -@interface XPMineSimpleUserInfoHeaderView() - -/// 背景图 -@property (nonatomic, strong) NetImageView *bgImageView; -/// 毛玻璃 -@property (nonatomic, strong) UIVisualEffectView *effectView; -/// 昵称 -@property (nonatomic, strong) UILabel *nicknameLabel; -/// ID -@property (nonatomic, strong) UILabel *idLabel; -/// 头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -/// 个人简介 -@property (nonatomic, strong) UILabel *introduceLabel; -/// 粉丝 -@property (nonatomic, strong) UILabel *fansLabel; -/// 直播中 -@property (nonatomic,strong) UIButton *onlineBtn; - -// ---------- 礼物部分 - -///背景 -@property (nonatomic,strong) UIImageView * backImageView; -///灰色背景 -@property (nonatomic,strong) UIView *giftBgView; -///显示更多 -@property (nonatomic,strong) UIButton *arrowButton; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *pi_containerView; -///普通礼物 -@property (nonatomic,strong) XPMineUserInfoGiftView *normalGiftView; -///幸运礼物 -@property (nonatomic,strong) XPMineUserInfoGiftView *luckyGiftView; -///动态 -@property (nonatomic,strong) UILabel *dynamicLabel; - -///礼物墙中的礼物 -@property (nonatomic,strong) NSArray *userGiftWall; -///礼物墙中的幸运礼物礼物 -@property (nonatomic,strong) NSArray *userLuckyBagGiftWall; - -@end - -@implementation XPMineSimpleUserInfoHeaderView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self createUI]; - } - return self; -} - -- (void)createUI { - [self addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.effectView]; - [self addSubview:self.nicknameLabel]; - [self addSubview:self.idLabel]; - [self addSubview:self.avatarImageView]; - [self addSubview:self.introduceLabel]; - [self addSubview:self.fansLabel]; - [self addSubview:self.onlineBtn]; - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(260); - }]; - [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.bgImageView); - }]; - [self.nicknameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avatarImageView).offset(-5); - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(self.avatarImageView.mas_leading).offset(-5); - }]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nicknameLabel.mas_bottom).offset(2); - make.leading.mas_equalTo(self.nicknameLabel); - make.trailing.mas_equalTo(self.nicknameLabel); - }]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.bgImageView); - make.trailing.mas_equalTo(-16); - make.width.height.mas_equalTo(86); - }]; - [self.fansLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(16); - make.centerX.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(self.avatarImageView); - }]; - [self.introduceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nicknameLabel); - make.top.mas_equalTo(self.fansLabel); - make.trailing.mas_equalTo(self.avatarImageView.mas_leading).offset(-10); - }]; - [self.onlineBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.bottom.mas_equalTo(self.nicknameLabel.mas_top).offset(-12); - make.width.mas_equalTo(56); - make.height.mas_equalTo(24); - }]; - - // 礼物部分 - - [self addSubview:self.backImageView]; - [self.backImageView addSubview:self.titleLabel]; - [self.backImageView addSubview:self.giftBgView]; - [self.backImageView addSubview:self.arrowButton]; - [self.giftBgView addSubview:self.titleView]; - [self.giftBgView addSubview:self.pi_containerView]; - [self.backImageView addSubview:self.dynamicLabel]; - - CGFloat itemHeight = 65; - CGFloat topHeight = 100; - CGFloat bottomHeight = 45; - CGFloat giftHeight = itemHeight * 3 + 10 * 3 + topHeight + bottomHeight; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(0); - make.top.mas_equalTo(self.bgImageView.mas_bottom).offset(-20); - make.height.mas_equalTo(giftHeight); - }]; - - [self.giftBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-16); - make.top.mas_equalTo(47); - make.height.mas_equalTo(281); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backImageView).offset(16); - make.top.mas_equalTo(self.backImageView).offset(16); - }]; - - [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(13, 22)); - make.centerY.mas_equalTo(self.titleLabel); - make.trailing.mas_equalTo(self.backImageView).offset(-15); - }]; - - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.giftBgView); - make.width.mas_equalTo(90 * 2 + 20); - make.height.mas_equalTo(50); - make.top.mas_equalTo(0); - }]; - - [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(0); - make.top.mas_equalTo(self.titleView.mas_bottom).offset(8); - make.bottom.mas_equalTo(0); - }]; - - [self.dynamicLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel); - make.top.mas_equalTo(self.giftBgView.mas_bottom).offset(20); - }]; - -} - -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.idLabel.text = [NSString stringWithFormat:@"ID:%ld", (long)_userInfo.erbanNo]; - self.nicknameLabel.text = _userInfo.nick.length > 0 ? _userInfo.nick : @""; - self.avatarImageView.imageUrl = userInfo.avatar; - self.bgImageView.imageUrl = userInfo.avatar; - self.introduceLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : YMLocalizedString(@"XPMineSimpleUserInfoHeaderView0"); - self.fansLabel.text =[NSString stringWithFormat:@"%@：%ld",YMLocalizedString(@"XPMineHeadView5"), _userInfo.fansNum]; - - self.userGiftWall = self.userInfo.userGiftWall; - self.userLuckyBagGiftWall = self.userInfo.userLuckyBagGiftWall; - } -} - -- (void)setRoomUid:(NSString *)roomUid { - _roomUid = roomUid; - self.onlineBtn.hidden = _roomUid.length <= 0; -} - -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.normalGiftView; - } else { - return self.luckyGiftView; - } -} -#pragma mark - Event Response -- (void)arrowButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(headerViewMoreGiftAction)]) { - [self.delegate headerViewMoreGiftAction]; - } -} - -- (void)onlineBtnAction { - if (self.delegate && [self.delegate respondsToSelector:@selector(headerViewOnlineAction:)]) { - [self.delegate headerViewOnlineAction:self.roomUid]; - } -} - -#pragma mark - Getters And Setters -- (void)setUserGiftWall:(NSArray *)userGiftWall { - _userGiftWall = userGiftWall; - if (_userGiftWall.count > 12) { - NSMutableArray * array = [_userGiftWall mutableCopy]; - _userGiftWall = [array subarrayWithRange:NSMakeRange(0, 12)]; - } - self.normalGiftView.datasource = _userGiftWall; -} - -- (void)setUserLuckyBagGiftWall:(NSArray *)userLuckyBagGiftWall { - _userLuckyBagGiftWall = userLuckyBagGiftWall; - if (_userLuckyBagGiftWall.count > 12) { - NSMutableArray * array = [_userLuckyBagGiftWall mutableCopy]; - _userLuckyBagGiftWall = [array subarrayWithRange:NSMakeRange(0, 12)]; - } - self.luckyGiftView.datasource = _userLuckyBagGiftWall; -} - - -#pragma mark - 懒加载 - -- (NetImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[NetImageView alloc] init]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - _bgImageView.clipsToBounds = YES; - } - return _bgImageView; -} - -- (UIVisualEffectView *)effectView { - if (!_effectView) { - UIBlurEffect *blur = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; - _effectView = [[UIVisualEffectView alloc] initWithEffect:blur]; - _effectView.alpha = 0.9; - } - return _effectView; -} - -- (UILabel *)nicknameLabel { - if (!_nicknameLabel) { - _nicknameLabel = [[UILabel alloc] init]; - _nicknameLabel.textColor = UIColor.whiteColor; - _nicknameLabel.font = [UIFont systemFontOfSize:20 weight:UIFontWeightMedium]; - } - return _nicknameLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.textColor = [UIColor.whiteColor colorWithAlphaComponent:0.4]; - _idLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - } - return _idLabel; -} - -- (UILabel *)introduceLabel { - if (!_introduceLabel) { - _introduceLabel = [[UILabel alloc] init]; - _introduceLabel.textColor = UIColor.whiteColor; - _introduceLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular]; - _introduceLabel.numberOfLines = 2; - } - return _introduceLabel; -} - -- (UILabel *)fansLabel { - if (!_fansLabel) { - _fansLabel = [[UILabel alloc] init]; - _fansLabel.textColor = UIColor.whiteColor; - _fansLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular]; - _fansLabel.textAlignment = NSTextAlignmentCenter; - } - return _fansLabel; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.userInteractionEnabled = YES; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - _avatarImageView.layer.borderWidth = 2; - _avatarImageView.layer.borderColor = [UIColor.whiteColor colorWithAlphaComponent:0.4].CGColor; - _avatarImageView.layer.cornerRadius = 86/2; - _avatarImageView.clipsToBounds = YES; - - } - return _avatarImageView; -} - -- (UIButton *)onlineBtn { - if(!_onlineBtn) { - _onlineBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_onlineBtn setTitle:YMLocalizedString(@"XPMineSimpleUserInfoHeaderView2") forState:UIControlStateNormal]; - [_onlineBtn setTitleColor:UIColor.whiteColor forState:UIControlStateNormal]; - _onlineBtn.titleLabel.font = [UIFont systemFontOfSize:12]; - [_onlineBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _onlineBtn.layer.masksToBounds = YES; - _onlineBtn.layer.cornerRadius = 24/2; - _onlineBtn.layer.maskedCorners = kCALayerMaxXMinYCorner | kCALayerMaxXMaxYCorner; - [_onlineBtn addTarget:self action:@selector(onlineBtnAction) forControlEvents:UIControlEventTouchUpInside]; - _onlineBtn.hidden = YES; - } - return _onlineBtn; -} - -#pragma mark - 礼物部分 - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.layer.cornerRadius = 20; - _backImageView.layer.maskedCorners = kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner; - _backImageView.backgroundColor =[DJDKMIMOMColor appCellBackgroundColor]; - } - return _backImageView; -} - -- (UIView *)giftBgView { - if (!_giftBgView) { - _giftBgView = [[UIView alloc] init]; - _giftBgView.backgroundColor = UIColorFromRGB(0xF6F7F9); - _giftBgView.layer.cornerRadius = 12; - } - return _giftBgView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPMineSimpleUserInfoHeaderView3"); - _titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UIButton *)arrowButton { - if (!_arrowButton) { - _arrowButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_arrowButton setImage:[[UIImage imageNamed:@"room_setting_arrow"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_arrowButton setImage:[[UIImage imageNamed:@"room_setting_arrow"]ms_SetImageForRTL] forState:UIControlStateSelected]; - [_arrowButton addTarget:self action:@selector(arrowButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_arrowButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _arrowButton; -} - - - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPWishGiftCreateItemViewController0"), YMLocalizedString(@"XPMineSimpleUserInfoHeaderView5")]; - } - return _titles; -} - -- (XPMineUserInfoGiftView *)normalGiftView { - if (!_normalGiftView) { - _normalGiftView = [[XPMineUserInfoGiftView alloc] init]; - } - return _normalGiftView; -} - -- (XPMineUserInfoGiftView *)luckyGiftView { - if (!_luckyGiftView) { - _luckyGiftView = [[XPMineUserInfoGiftView alloc] init]; - } - return _luckyGiftView; -} - -- (UILabel *)dynamicLabel { - if (!_dynamicLabel) { - _dynamicLabel = [[UILabel alloc] init]; - _dynamicLabel.text = YMLocalizedString(@"XPMineSimpleUserInfoHeaderView6"); - _dynamicLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - _dynamicLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _dynamicLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.h b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.h deleted file mode 100644 index c439183..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// XPMineUserDataViewController.h -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import "MvpViewController.h" -#import -#import "MomentsInfoModel.h" -#import "XPMineGamePartnerInfoModel.h" -@class MedalModel, UserGiftWallInfoModel, GuildInfo; - -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel, MineSkillCardListInfoModel, XPMineUserDataViewController; -@protocol XPMineUserDataViewControllerDelegate - -- (void)showGameOrderView:(XPMineGamePartnerInfoModel *)model; -- (void)dismissGameOrderView; - -@optional -///请求技能卡中有声音的技能 -- (void)xPMineUserDataViewController:(XPMineUserDataViewController *)viewController didGetVoiceSuccess:(MineSkillCardListInfoModel *)voiceCard; - - - -@end -@interface XPMineUserDataViewController : MvpViewController -@property (nonatomic,copy) NSString *userUid; -///用户信息 -@property (nonatomic, strong) UserInfoModel *userInfo; -@property (nonatomic, copy) NSArray*dynamicInfo; -@property (nonatomic, strong) MedalModel *medalInfo; -@property (nonatomic, strong) GuildInfo *guildInfo; -@property (nonatomic, copy) NSArray *giftWall; -@property (nonatomic, copy) NSArray *luckyGiftWall; -///代理 -@property (nonatomic,weak) id delegate; - -- (void)submitGameOrder:(XPMineGamePartnerInfoModel *)model round:(NSInteger)round; -- (void)reloadView; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m deleted file mode 100644 index 96a621b..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m +++ /dev/null @@ -1,800 +0,0 @@ -// -// XPMineUserDataViewController.m -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import "XPMineUserDataViewController.h" -///Third -#import -///Tool -#import "AccountInfoStorage.h" -#import "XPMomentsLayoutConfig.h" -///View -#import "XPMineDataGiftTableViewCell.h" -#import "XPMomentsTableViewCell.h" -#import "XPMomentsEmptyTableViewCell.h" -///Model -#import "UserInfoModel.h" -#import "MineSkillCardListInfoModel.h" -///P -#import "XPMineUserDataPresenter.h" -#import "XPMineUserDataProtocol.h" -#import "XPMomentsMineProtocol.h" -///View - -#import "XPMineUserInfoGiftWallViewController.h" -#import "XPMineGuildViewController.h" -#import "XPMomentsDetailViewController.h" -#import "XPMineUserInfoAlbumViewController.h" - -#import "XPMineDataGiftTableViewCell.h" -#import "XPMineAlbumTableViewCell.h" -#import "XPMineMedalsTableViewCell.h" -#import "XPMineGiftsTableViewCell.h" -#import "XPMineGuildTableViewCell.h" -#import "XPMineDataGameMateTableViewCell.h" -#import "XPMineMultipleContentTableViewCell.h" - -#import "XPMineGameMateOrderView.h" - -#import "MedalModel.h" -#import "XPMineGamePartnerInfoModel.h" - -typedef enum : NSUInteger { - GameMate = 0, - Album = 1, - Guild = 2, - Medal = 3, - Gifts = 4, - LuckyGifts = 5, - MultipleContent = 6, - SectionTypeCount = 7 -} MineUserInfoPageSectionType; - -@interface XPMineUserSectionHeader : UIView - -@property (nonatomic, copy) NSString *title; -@property (nonatomic, copy) NSString *num; -@property (nonatomic, assign) BOOL hasMore; -@property (nonatomic, copy) void(^didTapMore)(void); - -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UILabel *numLabel; -@property (nonatomic, strong) UIButton *arrowButton; - -@end - -@implementation XPMineUserSectionHeader - -- (instancetype)init -{ - if (self = [super init]) { - self.frame = CGRectMake(0, 0, KScreenWidth, 20); - - UIView *greenLine = [[UIView alloc] init]; - greenLine.layer.backgroundColor = UIColorFromRGB(0x04D5C6).CGColor; - greenLine.layer.cornerRadius = 2; - - [self addSubview:greenLine]; - [greenLine mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self); - make.centerY.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(3, 15)); - }]; - - _titleLabel = [UILabel labelInitWithText:@"" - font:kFontSemibold(16) - textColor:[UIColor whiteColor]]; - [self addSubview:_titleLabel]; - [_titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(greenLine.mas_trailing).offset(7); - }]; - - _numLabel = [UILabel labelInitWithText:@"" - font:kFontSemibold(16) - textColor:[UIColor whiteColor]]; - [self addSubview:_numLabel]; - [_numLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self.titleLabel.mas_trailing).offset(4); - }]; - - _arrowButton = [UIButton buttonWithType:UIButtonTypeCustom]; - if (isMSRTL()) { - _arrowButton.semanticContentAttribute = UISemanticContentAttributeForceRightToLeft; - } - if (isMSRTL()) { - [_arrowButton setBackgroundImage:[[UIImage imageNamed:@"skillCard_arrow"] ms_SetImageForRTL] - forState:UIControlStateNormal]; - } else { - [_arrowButton setBackgroundImage:[UIImage imageNamed:@"skillCard_arrow"] - forState:UIControlStateNormal]; - } - [_arrowButton addTarget:self - action:@selector(didTapArrowButton) - forControlEvents:UIControlEventTouchUpInside]; - [_arrowButton setEnlargeEdgeWithTop:5 right:10 bottom:10 left:10]; - [self addSubview:_arrowButton]; - [_arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(20, 20)); - make.trailing.mas_equalTo(self).offset(0); - }]; - } - return self; -} - -- (void)setTitle:(NSString *)title { - _titleLabel.text = title; -} - -- (void)setNum:(NSString *)num { -// _numLabel.text = num; -} - -- (void)setHasMore:(BOOL)hasMore { - _arrowButton.hidden = !hasMore; -} - -- (void)didTapArrowButton { - if (self.didTapMore) { - self.didTapMore(); - } -} - -@end - - -@interface XPMineUserDataViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; - -@property (nonatomic,assign) BOOL isGiftsSectionExpand; -@property (nonatomic,assign) BOOL isLuckyGiftsSectionExpand; -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); - -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -@property (nonatomic, strong) UIButton *giftsExpandButton; -@property (nonatomic, strong) UIButton *luckyGiftsExpandButton; -@property (nonatomic,assign) BOOL isDisplayMedalContent; - -@property (nonatomic, strong) XPMineUserSectionHeader *gameMateHeader; -@property (nonatomic, strong) XPMineUserSectionHeader *albumHeader; -@property (nonatomic, strong) XPMineUserSectionHeader *guildHeader; -@property (nonatomic, strong) XPMineUserSectionHeader *medalHeader; -@property (nonatomic, strong) XPMineUserSectionHeader *giftsHeader; -@property (nonatomic, strong) XPMineUserSectionHeader *luckyGiftsHeader; - -@property (nonatomic, copy) NSArray *gameInfos; - -@end - -@implementation XPMineUserDataViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (__kindof id)createPresenter { - return [[XPMineUserDataPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = UIColorFromRGB(0x08151A); - self.isDisplayMedalContent = YES; - - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.view).offset(14); - make.bottom.mas_equalTo(self.view).offset(-14); - make.leading.mas_equalTo(self.view).offset(14); - make.trailing.mas_equalTo(self.view).offset(-14); - }]; -} - -- (void)didTapGiftsSectionFoldButton { - self.isGiftsSectionExpand = !self.isGiftsSectionExpand; - self.giftsExpandButton.transform = self.isGiftsSectionExpand ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformIdentity; - [self.tableView reloadData]; -} - -- (void)didTapLuckyGiftsSectionFoldButton { - self.isLuckyGiftsSectionExpand = !self.isLuckyGiftsSectionExpand; - self.luckyGiftsExpandButton.transform = self.isLuckyGiftsSectionExpand ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformIdentity; - [self.tableView reloadData]; -} - -- (void)submitGameOrder:(XPMineGamePartnerInfoModel *)model round:(NSInteger)round { - @kWeakify(self); - [self showLoading]; - [self.presenter submitOrder:^{ - @kStrongify(self); - [self showSuccessToast:YMLocalizedString(@"GameOrderContent_18")]; - if (self.delegate) { - [self.delegate dismissGameOrderView]; - } - } failure:^(NSString * _Nonnull msg) { - @kStrongify(self); - [self showErrorToast:msg]; - } - gameId:model.gameId - gameUid:model.uid - inning:round]; -} - -- (void)reloadView { - [self.tableView reloadData]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return SectionTypeCount; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - switch (section) { - case GameMate: - return self.gameInfos.count; - break; - case Album: - return 1; - break; - case Guild: - return self.guildInfo == nil ? 0 : 1; - break; - case Medal: - return 0; //self.medalInfo.medalCount == 0 ? 0 : 1; - break; - case Gifts: - return 0; - break; - case LuckyGifts: - return 0; - break; - case MultipleContent: - return 1; - break; - default: - return 0; - break; - } -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - switch (indexPath.section) { - case GameMate: - return 78.5; - break; - case Album: -// return 90; - return self.userInfo.privatePhoto.count == 0 ? 90 : [XPMineAlbumTableViewCell cellHeight:self.userInfo.privatePhoto.count]; - break; - case Guild: - return self.guildInfo ? kGetScaleWidth(85 + 14) : 0; - break; - case Medal: - return 0;//140; - break; - case Gifts: - return 0;//[XPMineGiftsTableViewCell cellHeight:self.isGiftsSectionExpand - //source:self.giftWall]; - break; - case LuckyGifts: - return 0;//[XPMineGiftsTableViewCell cellHeight:self.isLuckyGiftsSectionExpand - //source:self.luckyGiftWall]; - break; - case MultipleContent: - return self.isDisplayMedalContent ? [XPMineMultipleContentTableViewCell cellHeightFro:self.medalInfo] : [XPMineMultipleContentTableViewCell cellHeightFro:self.giftWall - with:self.luckyGiftWall]; - break; - default: - return 0; - break; - } -} - -- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{ - switch (section) { - case GameMate: - return nil; - break; - case Album: - return nil; - break; - case Guild: - return nil; - break; - case Medal: - return nil; - break; - case Gifts: - return nil;//self.giftWall.count > 4 ? self.giftsExpandButton : nil; - break; - case LuckyGifts: - return nil;//self.luckyGiftWall.count > 4 ? self.luckyGiftsExpandButton : nil; - break; - case MultipleContent: - return nil; - break; - default: - return nil; - break; - } -} -- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - switch (section) { - case GameMate: - return 0; - break; - case Album: - return 0; - break; - case Guild: - return 0; - break; - case Medal: - return 0; - break; - case Gifts: - return 0;//self.giftWall.count > 4 ? 20 : 0; - break; - case LuckyGifts: - return 0;//self.luckyGiftWall.count > 4 ? 20 : 0; - break; - case MultipleContent: - return 0; - break; - default: - return 0; - break; - } -} --(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ - switch (section) { - case GameMate: - return self.gameInfos.count > 0 ? 40 : 0; - break; - case Album: - return 40; - break; - case Guild: - return 40; - break; - case Medal: - return 0;// self.medalInfo.medalCount == 0 ? 0 : 30; - break; - case Gifts: - return 0;//50; - break; - case LuckyGifts: - return 0;//50; - break; - case MultipleContent: - return 0; - break; - default: - return 40; - break; - } -} -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{ - switch (section) { - case GameMate: - return self.gameInfos.count > 0 ? self.gameMateHeader : nil; - case Album: - return self.albumHeader; - break; - case Guild: - return self.guildHeader; - break; - case Medal: - return nil;//self.medalInfo.medalCount == 0 ? [UIView new] : self.medalHeader; - break; - case Gifts: - return nil;//self.giftsHeader; - break; - case LuckyGifts: - return nil;//self.luckyGiftsHeader; - break; - case MultipleContent: - return nil; - break; - default: - return nil; - break; - } -} -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - switch (indexPath.section) { - case GameMate: { - XPMineDataGameMateTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineDataGameMateTableViewCell class]) - forIndexPath:indexPath]; - cell.cellModel = [self.gameInfos xpSafeObjectAtIndex:indexPath.row]; - cell.selectionStyle = UITableViewCellSelectionStyleNone; - @kWeakify(self); - [cell setDidTapOrder:^(XPMineGamePartnerInfoModel *model) { - @kStrongify(self); - if (self.delegate) { - [self.delegate showGameOrderView:model]; - } - }]; - return cell; - } - break; - case Album: { - XPMineAlbumTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineAlbumTableViewCell class]) - forIndexPath:indexPath]; - cell.albumDataSource = self.userInfo.privatePhoto; - return cell; - } - break; - case Guild:{ - XPMineGuildTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGuildTableViewCell class]) - forIndexPath:indexPath]; - cell.info = self.guildInfo; - return cell; - } - break; - case Medal: { - XPMineMedalsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineMedalsTableViewCell class]) - forIndexPath:indexPath]; - cell.medalsDataSource = self.medalInfo.userMedals; - return cell; - } - break; - case Gifts:{ - XPMineGiftsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGiftsTableViewCell class]) forIndexPath:indexPath]; - cell.giftsDataSource = self.giftWall; - cell.isLucky = NO; - return cell; - } - break; - case LuckyGifts:{ - XPMineGiftsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineGiftsTableViewCell class]) forIndexPath:indexPath]; - cell.giftsDataSource = self.luckyGiftWall; - cell.isLucky = YES; - return cell; - } - break; - case MultipleContent: { - XPMineMultipleContentTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineMultipleContentTableViewCell class]) forIndexPath:indexPath];; - cell.medalModel = self.medalInfo; - cell.giftWall = self.giftWall; - cell.luckyGiftWall = self.luckyGiftWall; - [cell updateCell]; - - @kWeakify(self); - [cell setDidChangeCatalog:^(BOOL isMedal) { - @kStrongify(self); - self.isDisplayMedalContent = isMedal; - [self.tableView reloadData]; - }]; - - return cell; - } - break; - default: - return [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - break; - } -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { -// if(indexPath.section == 0)return; - [tableView deselectRowAtIndexPath:indexPath animated:YES]; -// if (self.datasource.count > 0) { -// XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; -// MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; -// if(monentsInfo.dynamicId == nil){ -// return; -// } -// detailVC.momentsInfo = monentsInfo; -// detailVC.delegate = self; -// [self.navigationController pushViewController:detailVC animated:YES]; -// } -} - -#pragma mark - XPMomentsTableViewCellDelegate -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { - if(monentsInfo.dynamicId == nil){ - [self showErrorToast:YMLocalizedString(@"XPMineUserDataViewController2")]; - return; - } - [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicCommon:(MomentsInfoModel *)monentsInfo{ - if(monentsInfo.dynamicId == nil){ - [self showErrorToast:YMLocalizedString(@"XPMineUserDataViewController3")]; - return; - } - XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; - detailVC.momentsInfo = monentsInfo; - detailVC.delegate = self; - [self.navigationController pushViewController:detailVC animated:YES]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsMineViewController0") confirmHandler:^{ - [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; - } cancelHandler:^{ - - }]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(nonnull MomentsInfoModel *)monentsInfo{ - [self showLoading]; - [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { - __block MomentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { - monentsInfos = obj; - *stop = YES; - } - }]; - if (monentsInfos) { - NSInteger section = [self.datasource indexOfObject:monentsInfo]; - [self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:section inSection:1]] withRowAnimation:UITableViewRowAnimationFade]; - } -} - -#pragma mark - XPMomentsDetailViewControllerDelegate -- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == dynamicId.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - XPMomentsMineProtocol -- (void)requesstShieldingSuccess:(NSString *)monentsInfo{ - [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} -- (void)likeMomentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.dynamicId isEqualToString:dynamicId]) { - NSInteger likeCount = obj.likeCount.integerValue; - if (status) { - likeCount += 1; - obj.isLike += 1; - } else { - likeCount -= 1; - obj.isLike -= 1; - } - obj.likeCount = @(likeCount).stringValue; - *stop = YES; - } - }]; - [self.tableView reloadData]; -} - -- (void)deleteMomentsSuccess:(NSString *)monentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController1")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - XPMineDataGiftTableViewCellDelegate -- (void)xPMineDataGiftTableViewCell:(XPMineDataGiftTableViewCell *)view didClickMore:(UIButton *)sender { - XPMineUserInfoGiftWallViewController * giftWallVC = [[XPMineUserInfoGiftWallViewController alloc] init]; - giftWallVC.userUid = self.userUid; - [self.navigationController pushViewController:giftWallVC animated:YES]; -} - -#pragma mark - JXPagingViewListViewDelegate -- (UIView *)listView { - return self.view; -} - -- (UIScrollView *)listScrollView { - return self.tableView; -} - -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - self.scrollCallback = callback; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - self.scrollCallback(scrollView); -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - self.albumHeader.num = [NSString stringWithFormat:@"(%ld)", (long)userInfo.privatePhoto.count]; - [self.tableView reloadData]; - - if (userInfo.uid != [[AccountInfoStorage instance].getUid integerValue]) { - self.albumHeader.hasMore = NO; - } - - @kWeakify(self); - [self.presenter loadGamePartnerInfoList:^(NSArray * _Nonnull infos) { - @kStrongify(self); - self.gameInfos = infos; - [self.tableView reloadData]; - } uid:userInfo.uid]; -} -- (void)setDynamicInfo:(NSArray *)dynamicInfo { - [self.datasource removeAllObjects]; - [self.datasource addObjectsFromArray:dynamicInfo]; - [self.tableView reloadData]; -} - -- (void)setMedalInfo:(MedalModel *)medalInfo { - _medalInfo = medalInfo; - self.medalHeader.num = [NSString stringWithFormat:@"(%ld)", (long)medalInfo.medalCount]; - [self.tableView reloadData]; -} - -- (void)setGuildInfo:(GuildInfo *)guildInfo { - _guildInfo = guildInfo; - [self.tableView reloadData]; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.showsVerticalScrollIndicator = NO; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineDataGameMateTableViewCell class] - forCellReuseIdentifier:NSStringFromClass([XPMineDataGameMateTableViewCell class])]; - [_tableView registerClass:[XPMineAlbumTableViewCell class] - forCellReuseIdentifier:NSStringFromClass([XPMineAlbumTableViewCell class])]; - [_tableView registerClass:[XPMineMedalsTableViewCell class] - forCellReuseIdentifier:NSStringFromClass([XPMineMedalsTableViewCell class])]; - [_tableView registerClass:[XPMineGiftsTableViewCell class] - forCellReuseIdentifier:NSStringFromClass([XPMineGiftsTableViewCell class])]; - [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - [_tableView registerClass:[XPMineDataGiftTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineDataGiftTableViewCell class])]; - [_tableView registerClass:[XPMineGuildTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineGuildTableViewCell class])]; - [_tableView registerClass:[XPMineMultipleContentTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineMultipleContentTableViewCell class])]; - - UIView *footer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, kSafeAreaBottomHeight)]; - footer.backgroundColor = [UIColor clearColor]; - _tableView.tableFooterView = footer; - - if (isMSRTL()) { - _tableView.semanticContentAttribute = UISemanticContentAttributeForceRightToLeft; - } - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -- (XPMineUserSectionHeader *)gameMateHeader { - if (!_gameMateHeader) { - _gameMateHeader = [[XPMineUserSectionHeader alloc] init]; - _gameMateHeader.title = YMLocalizedString(@"GameOrderContent_0"); - _gameMateHeader.hasMore = NO; - } - return _gameMateHeader; -} - -- (XPMineUserSectionHeader *)albumHeader { - if (!_albumHeader) { - _albumHeader = [[XPMineUserSectionHeader alloc] init]; - _albumHeader.title = YMLocalizedString(@"QinputPhotoView1"); - _albumHeader.hasMore = YES; - @kWeakify(self); - _albumHeader.didTapMore = ^{ - @kStrongify(self); - XPMineUserInfoAlbumViewController * albumVC = [[XPMineUserInfoAlbumViewController alloc] init]; - [self.navigationController pushViewController:albumVC animated:YES]; - }; - } - return _albumHeader; -} - -- (XPMineUserSectionHeader *)guildHeader { - if (!_guildHeader) { - _guildHeader = [[XPMineUserSectionHeader alloc] init]; - _guildHeader.title = YMLocalizedString(@"UserDetail_0"); - _guildHeader.hasMore = NO; - } - return _guildHeader; -} - -- (XPMineUserSectionHeader *)medalHeader { - if (!_medalHeader) { - _medalHeader = [[XPMineUserSectionHeader alloc] init]; - _medalHeader.title = YMLocalizedString(@"XPMineDataGiftTableViewCell2"); - _medalHeader.num = @"(0)"; - _medalHeader.hasMore = NO; - } - return _medalHeader; -} - -- (XPMineUserSectionHeader *)giftsHeader { - if (!_giftsHeader) { - _giftsHeader = [[XPMineUserSectionHeader alloc] init]; - _giftsHeader.title = YMLocalizedString(@"XPMineDataGiftTableViewCell0"); - _giftsHeader.hasMore = NO; - } - return _giftsHeader; -} - -- (XPMineUserSectionHeader *)luckyGiftsHeader { - if (!_luckyGiftsHeader) { - _luckyGiftsHeader = [[XPMineUserSectionHeader alloc] init]; - _luckyGiftsHeader.title = YMLocalizedString(@"XPMineDataGiftTableViewCell1"); - _luckyGiftsHeader.hasMore = NO; - } - return _luckyGiftsHeader; -} - -- (UIButton *)giftsExpandButton { - if (!_giftsExpandButton) { - _giftsExpandButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_giftsExpandButton setImage:[UIImage imageNamed:@"common_down_arrow"] forState:UIControlStateNormal]; - [_giftsExpandButton addTarget:self action:@selector(didTapGiftsSectionFoldButton) forControlEvents:UIControlEventTouchUpInside]; - _giftsExpandButton.selected = YES; - [_giftsExpandButton setEnlargeEdgeWithTop:5 right:10 bottom:10 left:10]; - } - return _giftsExpandButton; -} - -- (UIButton *)luckyGiftsExpandButton { - if (!_luckyGiftsExpandButton) { - _luckyGiftsExpandButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_luckyGiftsExpandButton setImage:[UIImage imageNamed:@"common_down_arrow"] forState:UIControlStateNormal]; - [_luckyGiftsExpandButton addTarget:self action:@selector(didTapLuckyGiftsSectionFoldButton) forControlEvents:UIControlEventTouchUpInside]; - _luckyGiftsExpandButton.selected = YES; - [_luckyGiftsExpandButton setEnlargeEdgeWithTop:5 right:10 bottom:10 left:10]; - } - return _luckyGiftsExpandButton; -} -@end diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoAlbumViewController.h b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoAlbumViewController.h deleted file mode 100644 index 5505acc..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoAlbumViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineUserInfoAlbumViewController.h -// YUMI -// -// Created by YUMI on 2021/9/24. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserInfoAlbumViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoAlbumViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoAlbumViewController.m deleted file mode 100644 index 070a376..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoAlbumViewController.m +++ /dev/null @@ -1,272 +0,0 @@ -// -// YMMineUserInfoAlbumViewController.m -// YUMI -// -// Created by YUMI on 2021/9/24. -// - -#import "XPMineUserInfoAlbumViewController.h" -///Third -#import -#import -#import "SDPhotoBrowser.h" -#import "UIImageConstant.h" -#import "TTPopup.h" -#import "YYUtility.h" -///Tool -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -///Model -#import "UserInfoModel.h" -///View -#import "XPMineUserInfoAlbumCollectionViewCell.h" -///P -#import "XPMineUserInfolbumPresenter.h" -#import "XPMineUserInfoAlbumProtocol.h" - -@interface XPMineUserInfoAlbumViewController () -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///数据源 -@property (nonatomic,strong) NSArray *datasource; -///完成 -@property (nonatomic,strong) UIButton *complectButton; -///是否编辑 -@property (nonatomic,assign) BOOL isEdit; -@end - -@implementation XPMineUserInfoAlbumViewController - -- (XPMineUserInfolbumPresenter*)createPresenter { - return [[XPMineUserInfolbumPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self loadUserInfo]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineUserInfoAlbumViewController0"); - ///添加完成按钮 - [self addNavigationItemWithItems:@[self.complectButton] isLeft:NO]; - [self.view addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -- (void)loadUserInfo { - [self.presenter getUserInfo]; -} - -/// 取消编辑 -- (void)cancelEditing { - self.complectButton.selected = NO; - self.isEdit = NO; - [self.collectionView reloadData]; -} - -#pragma mark - 选择图片 -- (void)showPhotoView { - @weakify(self); - TTActionSheetConfig *cameraConfig = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineUserInfoAlbumViewController1") clickAction:^{ - [YYUtility checkCameraAvailable:^{ - @strongify(self); - UIImagePickerController *imagePicker = [[UIImagePickerController alloc] init]; - imagePicker.delegate = self; - imagePicker.sourceType = UIImagePickerControllerSourceTypeCamera; - imagePicker.allowsEditing = YES; - [self presentViewController:imagePicker animated:YES completion:NULL]; - } denied:^{ - @strongify(self); - [self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController3")]; - } restriction:^{ - @strongify(self); - [self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController5")]; - }]; - }]; - - TTActionSheetConfig *photoLibrayConfig = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineUserInfoAlbumViewController6") clickAction:^{ - [YYUtility checkAssetsLibrayAvailable:^{ - @strongify(self); - UIImagePickerController *imagePicker = [[UIImagePickerController alloc] init]; - imagePicker.modalPresentationCapturesStatusBarAppearance = YES; - imagePicker.delegate = self; - imagePicker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; - imagePicker.allowsEditing = YES; - [self presentViewController:imagePicker animated:YES completion:NULL]; - } denied:^{ - @strongify(self); - [self showNotPhoto:YMLocalizedString(@"SessionViewController21") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController8")]; - } restriction:^{ - @strongify(self); - [self showNotPhoto:YMLocalizedString(@"SessionViewController21") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController10")]; - }]; - }]; - - [TTPopup actionSheetWithItems:@[cameraConfig, photoLibrayConfig]]; -} - -- (void)showNotPhoto:(NSString *)title content:(NSString *)content{ - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = title; - config.message = content; - [TTPopup alertWithConfig:config confirmHandler:^{ - NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - if ([[UIApplication sharedApplication] canOpenURL:url]) { - [[UIApplication sharedApplication] openURL:url]; -// [[UIApplication sharedApplication] openURL:url options:nil completionHandler:nil]; - } - } cancelHandler:^{ - }]; -} - -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count + 1; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPMineUserInfoAlbumCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoAlbumCollectionViewCell class]) forIndexPath:indexPath]; - cell.delegate = self; - if (indexPath.row == 0) { - cell.addImageName = @"mine_user_info_album_add"; - cell.isEdit = NO; - } else { - if (self.datasource.count > 0) { - cell.photo = [self.datasource xpSafeObjectAtIndex:indexPath.row - 1]; - cell.isEdit = self.isEdit; - } - } - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (indexPath.row == 0) { - if (self.datasource.count < 8) { - [self showPhotoView]; - [self cancelEditing]; - }else{ - [self showErrorToast:YMLocalizedString(@"XPMineUserInfoAlbumViewController11")]; - } - }else { - if (!self.isEditing) { - SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init]; - browser.sourceImagesContainerView = self.collectionView; - browser.delegate = self; - browser.imageCount = self.datasource.count; - browser.currentImageIndex = indexPath.item - 1; - browser.isHaveUserAdd = YES; - [browser show]; - } - } -} - -#pragma mark - XPMineUserInfoAlbumCollectionViewCellDelegate -- (void)xPMineUserInfoAlbumCollectionViewCell:(XPMineUserInfoAlbumCollectionViewCell *)cell didDeleteItem:(UserPhoto *)photo { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPMineUserInfoAlbumViewController12"); - config.message = YMLocalizedString(@"XPMineUserInfoAlbumViewController13"); - [TTPopup alertWithConfig:config confirmHandler:^{ - [self.presenter deleteImageUrlFromServerWithPid:photo.pid]; - } cancelHandler:^{ - - }]; -} - -#pragma mark - SDPhotoBrowserDelegate -- (UIImage *)photoBrowser:(SDPhotoBrowser *)browser placeholderImageForIndex:(NSInteger)index { - return [UIImageConstant defaultAvatarPlaceholder]; -} - -- (NSURL *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageURLForIndex:(NSInteger)index { - return [NSURL URLWithString:self.datasource[index].photoUrl]; -} -#pragma mark - UIImagePickerControllerDelegate -- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { - - @kWeakify(self); - [picker dismissViewControllerAnimated:YES completion:^{ - @kStrongify(self); - UIImage *selectedPhoto = [info objectForKey:UIImagePickerControllerOriginalImage]; - if (selectedPhoto) { - if (picker.sourceType == UIImagePickerControllerSourceTypeCamera) { - UIImageWriteToSavedPhotosAlbum(selectedPhoto, nil, nil, nil); - } - [self.presenter uploadAlbumImage:selectedPhoto]; - [self showLoading]; - } - }]; -} - -- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker { - [picker dismissViewControllerAnimated:YES completion:^{ - - }]; -} - -#pragma mark - XPMineUserInfoAlbumProtocol -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { - self.datasource = userInfo.privatePhoto; - [self.collectionView reloadData]; -} -///上传第三方服务器 -- (void)uploadAlbumImageToThirdSuccess:(NSString *)url { - [self.presenter uploadUserAlbumWithUrlStr:url]; -} -///上传自己服务器 -- (void)uploadUserAlbumSuccess { - [self.presenter getUserInfo]; - [self showSuccessToast:YMLocalizedString(@"XPMineUserInfoAlbumViewController14")]; -} - -- (void)deleteUserAlbumSuccess { - [self.presenter getUserInfo]; - [self showSuccessToast:YMLocalizedString(@"XPMineUserInfoAlbumViewController15")]; -} -#pragma mark - Event Response -- (void)complectButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - self.isEdit = sender.selected; - [self.collectionView reloadData]; -} - -#pragma mark - Getters And Setters -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.sectionInset = UIEdgeInsetsMake(10, 10, 10, 10); - layout.itemSize = CGSizeMake((self.view.frame.size.width - 50) / 3, (self.view.frame.size.width - 50) / 3); - layout.minimumLineSpacing = 15; - layout.minimumInteritemSpacing = 15; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPMineUserInfoAlbumCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoAlbumCollectionViewCell class])]; - } - return _collectionView; -} - -- (UIButton *)complectButton { - if (!_complectButton) { - _complectButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_complectButton setTitle:YMLocalizedString(@"XPMineUserInfoAlbumViewController16") forState:UIControlStateNormal]; - [_complectButton setTitle:YMLocalizedString(@"XPMineUserInfoAlbumViewController17") forState:UIControlStateSelected]; - [_complectButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - [_complectButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateSelected]; - _complectButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_complectButton addTarget:self action:@selector(complectButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _complectButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.h b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.h deleted file mode 100644 index 6f632f7..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMMineUserInfoDesViewController.h -// YUMI -// -// Created by YUMI on 2021/9/23. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@class XPMineUserInfoDesViewController; -@protocol XPMineUserInfoDesViewControllerDelegate - -////更新用户介绍 -- (void)xPMineUserInfoDesViewController:(XPMineUserInfoDesViewController *)viewController updateUserDes:(NSString *)userDes; - -@end -@interface XPMineUserInfoDesViewController : BaseViewController -///用户签名 -@property (nonatomic,strong) NSString *userDesc; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.m deleted file mode 100644 index 8d8080d..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.m +++ /dev/null @@ -1,177 +0,0 @@ -// -// YMMineUserInfoDesViewController.m -// YUMI -// -// Created by YUMI on 2021/9/23. -// - -#import "XPMineUserInfoDesViewController.h" -///Third -#import -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "UserInfoModel.h" - -static NSInteger maxCount = 60; - -@interface XPMineUserInfoDesViewController () -///容器 -@property (nonatomic, strong) UIView *containView; -///输入框 -@property (nonatomic, strong) SZTextView *useDescTextView; -///清除按钮 -@property (nonatomic, strong) UIButton *clearBtn; -///完成按钮 -@property (nonatomic, strong) UIButton *completionBtn; -///显示输入的个数 -@property (nonatomic, strong) UILabel *limitLabel;// - - -@end - - - -@implementation XPMineUserInfoDesViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = YMLocalizedString(@"XPMineUserInfoDesViewController0"); - [self initSubViews]; - [self initSubViewConstraints]; - [self initEvents]; - for (id view in self.useDescTextView.subviews) { - if ([view isKindOfClass:[UITextView class]]){ - UITextView *textView = view; - textView.textAlignment = NSTextAlignmentLeft; - break; - } - } -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -#pragma mark - Private Method -- (void)initSubViews { - UIBarButtonItem *completeItem = [[UIBarButtonItem alloc] initWithCustomView:self.completionBtn]; - self.navigationItem.rightBarButtonItem = completeItem; - [self.view addSubview:self.containView]; - [self.containView addSubview:self.useDescTextView]; - [self.containView addSubview:self.clearBtn]; - [self.view addSubview:self.limitLabel]; - self.useDescTextView.text = self.userDesc; - self.limitLabel.text = [NSString stringWithFormat:@"%ld",(maxCount - self.userDesc.length)]; - self.limitLabel.textColor = self.userDesc.length > 0 ? [DJDKMIMOMColor mainTextColor] : [DJDKMIMOMColor secondTextColor]; - self.completionBtn.enabled = self.useDescTextView.text.length > 0; -} - -- (void)initSubViewConstraints { - [self.containView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(20); - make.leading.mas_equalTo(self.view).offset(15); - make.trailing.mas_equalTo(self.view).offset(-15); - make.height.mas_equalTo(137); - }]; - [self.useDescTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.mas_equalTo(self.containView).offset(10); - make.bottom.mas_equalTo(self.containView).offset(-10); - make.trailing.mas_equalTo(self.clearBtn.mas_leading).offset(-5); - }]; - [self.clearBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.containView).offset(10); - make.trailing.mas_equalTo(self.containView).offset(-10); - }]; - [self.limitLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.containView.mas_bottom).offset(5); - make.trailing.mas_equalTo(self.containView); - }]; -} - -- (void)initEvents { - @weakify(self); - RAC(self.completionBtn, enabled) = [RACSignal combineLatest:@[self.useDescTextView.rac_textSignal] reduce:^id _Nonnull(NSString *text){ - @strongify(self); - self.limitLabel.text = [NSString stringWithFormat:@"%ld",(maxCount - text.length)]; - if (text.length > maxCount) { - self.useDescTextView.text = [text substringToIndex:maxCount]; - [self showErrorToast:[NSString stringWithFormat:YMLocalizedString(@"XPMineUserInfoDesViewController1"), maxCount]]; - self.limitLabel.text = @"0"; - } - - return @(text.length > 0 && text.length <= maxCount+1); - }]; -} -#pragma mark - Event Response -- (void)completionBtnAction:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineUserInfoDesViewController:updateUserDes:)]) { - [self.delegate xPMineUserInfoDesViewController:self updateUserDes:self.useDescTextView.text]; - } -} - -- (void)clearBtnAction:(UIButton *)sender { - self.useDescTextView.text = @""; - self.completionBtn.enabled = NO; - self.limitLabel.text = [NSString stringWithFormat:@"%ld",(maxCount - self.useDescTextView.text.length)]; -} - -#pragma mark - getter && setter -- (UIView *)containView { - if (!_containView) { - _containView = [[UIView alloc] init]; - _containView.layer.cornerRadius = 5; - _containView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - } - return _containView; -} - -- (SZTextView *)useDescTextView { - if (!_useDescTextView) { - _useDescTextView = [[SZTextView alloc] init]; - _useDescTextView.delegate = self; - _useDescTextView.placeholder = YMLocalizedString(@"XPMineUserInfoDesViewController2"); - _useDescTextView.placeholderTextColor = [DJDKMIMOMColor secondTextColor]; - _useDescTextView.font = [UIFont systemFontOfSize:14]; - _useDescTextView.textColor = [DJDKMIMOMColor mainTextColor]; - _useDescTextView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - } - return _useDescTextView; -} - -- (UIButton *)completionBtn { - if (!_completionBtn) { - _completionBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_completionBtn setTitle:YMLocalizedString(@"XPMineUserInfoDesViewController3") forState:UIControlStateNormal]; - [_completionBtn setFrame:CGRectMake(0, 0, 50, 30)]; - [_completionBtn setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - [_completionBtn setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateDisabled]; - [_completionBtn.titleLabel setFont:[UIFont systemFontOfSize:13]]; - [_completionBtn addTarget:self action:@selector(completionBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _completionBtn; -} - -- (UILabel *)limitLabel { - if (!_limitLabel) { - _limitLabel = [[UILabel alloc] init]; - _limitLabel.font = [UIFont systemFontOfSize:14]; - _limitLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _limitLabel.text = @"60"; - } - return _limitLabel; -} - -- (UIButton *)clearBtn { - if (!_clearBtn) { - _clearBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_clearBtn setImage:[UIImage imageNamed:@"mine_user_info_edit_clear"] forState:UIControlStateNormal]; - [_clearBtn addTarget:self action:@selector(clearBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _clearBtn; -} - -@end diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.h b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.h deleted file mode 100644 index aa9b835..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// XPMineUserInfoEditViewController.h -// xplan-ios -// -// Created by 冯硕 on 2021/9/23. -// - -#import "MvpViewController.h" - -@class RelationUserVO; - -NS_ASSUME_NONNULL_BEGIN -@class XPMineUserInfoEditViewController, LocationModel; -@protocol XPMineUserInfoEditViewControllerDelegate - -- (void)xPMineUserInfoEditViewControllerC:(XPMineUserInfoEditViewController *)vc didClickComplete:(NSString *)meLabels; -- (void)xPMineUserInfoEditViewControllerC:(XPMineUserInfoEditViewController *)vc didClickCompleteArea:(LocationModel *)area; -@end -@interface XPMineUserInfoEditViewController : MvpViewController - -@property (nonatomic,copy) NSString *uid; -@property (nonatomic,copy) NSString *outsideSelectedRegionName; -/// -@property (nonatomic,strong) LocationModel *selectedArea; -/// -@property (nonatomic,weak) id delegate; - -@property (nonatomic, strong) RelationUserVO *relationUser; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.m deleted file mode 100644 index 389e4cc..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.m +++ /dev/null @@ -1,768 +0,0 @@ -// -// XPMineUserInfoEditViewController.m -// xplan-ios -// -// Created by 冯硕 on 2021/9/23. -// - -#import "XPMineUserInfoEditViewController.h" -///Third -#import -#import -#import -#import -///Tool - -#import "TTPopup.h" -#import "YYUtility.h" - -#import "Api+Mine.h" - -///Model -#import "XPMineUserInfoEditModel.h" -#import "UserInfoModel.h" -#import "LocationModel.h" -///View -#import "XPMineUserInfoEditTableViewCell.h" -#import "XPMineUserInfoDateView.h" -#import "XPMineUserInfoEditPickView.h" -///P -#import "XPMineUserInfoEditProtocol.h" -#import "XPMineUserInfoEditPresenter.h" -///VC -#import "XPMineUserInfoNickViewController.h" -#import "XPMineUserInfoDesViewController.h" -#import "XPMineUserInfoAlbumViewController.h" - -#import "AlbumResourcePickerViewController.h" - -UIKIT_EXTERN NSString * kUpdateSoundInfo; - -@interface XPMineUserInfoEditViewController ()< -UITableViewDelegate, -UITableViewDataSource, -XPMineUserInfoEditProtocol, -XPMineUserInfoDesViewControllerDelegate, -XPMineUserInfoNickViewControllerDelegate, -UIImagePickerControllerDelegate, -UINavigationControllerDelegate, -XPMineUserInfoDateViewDelegate, -XPMineUserInfoEditPickViewDelegate, -TZImagePickerControllerDelegate> -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSArray *dataSource; -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -///地区列表 -@property (nonatomic,strong) NSMutableArray *areaList; - -@property (nonatomic,assign) CGFloat maxWidth; - -@property (nonatomic, assign) BOOL isPhotoPickerDisplayGIF; - -@end - -@implementation XPMineUserInfoEditViewController --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} -- (XPMineUserInfoEditPresenter *)createPresenter { - return [[XPMineUserInfoEditPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.areaList = [NSMutableArray array]; - [self initSubViews]; - [self initSubViewConstraints]; - [self getAreaList]; -} --(void)getAreaList { - [self.presenter getAreaList]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [self.presenter getUserInfo]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPMineUserInfoEditViewController0"); - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -- (void)showPhotoView { - @weakify(self); - TTActionSheetConfig *cameraConfig = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineUserInfoEditViewController1") clickAction:^{ - [YYUtility checkCameraAvailable:^{ - @strongify(self); - UIImagePickerController *imagePicker = [[UIImagePickerController alloc] init]; - imagePicker.delegate = self; - imagePicker.sourceType = UIImagePickerControllerSourceTypeCamera; - imagePicker.allowsEditing = YES; - [self presentViewController:imagePicker animated:YES completion:NULL]; - } denied:^{ - @strongify(self); - [self showNotPhoto:YMLocalizedString(@"XPMineUserInfoEditViewController2") content:YMLocalizedString(@"XPMineUserInfoEditViewController3")]; - } restriction:^{ - @strongify(self); - [self showNotPhoto:YMLocalizedString(@"XPMineUserInfoEditViewController4") content:YMLocalizedString(@"XPMineUserInfoEditViewController5")]; - }]; - }]; - - TTActionSheetConfig *photoLibraryConfig = [TTActionSheetConfig normalTitle:YMLocalizedString(@"UserInfoEdit_1.0.17_1") clickAction:^{ - [YYUtility checkAssetsLibrayAvailable:^{ - @strongify(self); - [self presentViewController:[self photoPickerWillDisplayGIF: NO] - animated:YES - completion:nil]; - } denied:^{ - @strongify(self); - [self showNotPhoto:YMLocalizedString(@"XPMineUserInfoEditViewController7") content:YMLocalizedString(@"XPMineUserInfoEditViewController8")]; - } restriction:^{ - @strongify(self); - [self showNotPhoto:YMLocalizedString(@"XPMineUserInfoEditViewController9") content:YMLocalizedString(@"XPMineUserInfoEditViewController10")]; - }]; - }]; - -// if (self.userInfo.userVipInfoVO.uploadGifAvatar) { -// if (![self.userInfo isEnglish]) { - TTActionSheetConfig *gifLibraryConfig = [TTActionSheetConfig normalTitle:YMLocalizedString(@"UserInfoEdit_1.0.17_0") clickAction:^{ - if (self.userInfo.uploadGifAvatarPrice == 0) { - [self displayGifPhotoBroswer]; - } else { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.actionStyle = TTAlertActionBothStyle; - config.title = YMLocalizedString(@"AnchorPKStageView0"); - config.titleFont = kFontMedium(15); - config.titleColor = UIColorFromRGB(0x313131); - config.messageTextAlignment = NSTextAlignmentLeft; - config.message = [NSString stringWithFormat:YMLocalizedString(@"20.20.51_text_27"), @(self.userInfo.uploadGifAvatarPrice), @(self.userInfo.uploadGifAvatarPrice)]; - @kWeakify(self); - [TTPopup alertWithConfig:config - confirmHandler:^{ - @kStrongify(self); - [self.presenter checkMoney:^(NSString *currentMoney){ - if (currentMoney.integerValue < self.userInfo.uploadGifAvatarPrice) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPTreasureFairyViewController5")]; - } else { - [self displayGifPhotoBroswer]; - } - } failure:^(NSString * _Nonnull message) { - - }]; - } cancelHandler:^{ - }]; - } - }]; - gifLibraryConfig.displayMoliCoin = self.userInfo.uploadGifAvatarPrice > 0; - [TTPopup actionSheetWithItems:@[cameraConfig, photoLibraryConfig, gifLibraryConfig]]; -// } else { -// [TTPopup actionSheetWithItems:@[cameraConfig, photoLibraryConfig]]; -// } -} - -- (void)displayGifPhotoBroswer { - @kWeakify(self); - [YYUtility checkAssetsLibrayAvailable:^{ - @kStrongify(self); - [self presentViewController:[self photoPickerWillDisplayGIF: YES] - animated:YES - completion:nil]; - } denied:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"XPMineUserInfoEditViewController7") content:YMLocalizedString(@"XPMineUserInfoEditViewController8")]; - } restriction:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"XPMineUserInfoEditViewController9") content:YMLocalizedString(@"XPMineUserInfoEditViewController10")]; - }]; -} - -- (TZImagePickerController *)photoPickerWillDisplayGIF:(BOOL)displayGIF { - self.isPhotoPickerDisplayGIF = displayGIF; - - TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 - delegate:self]; - imagePickerVc.modalPresentationStyle = UIModalPresentationOverFullScreen; - imagePickerVc.allowPickingVideo = displayGIF; - imagePickerVc.allowTakeVideo = NO; - if (displayGIF) { - imagePickerVc.allowTakePicture = NO; - // 当允许选择视频时，禁用裁剪功能，因为视频不能像图片一样裁剪 - imagePickerVc.allowCrop = NO; - } else { - imagePickerVc.allowCrop = YES; - CGFloat cropWidth = KScreenWidth; - imagePickerVc.cropRect = CGRectMake(0, (self.view.bounds.size.height - cropWidth) / 2, cropWidth, cropWidth); - } - imagePickerVc.allowPickingGif = displayGIF; - imagePickerVc.naviBgColor = [DJDKMIMOMColor appCellBackgroundColor]; - imagePickerVc.naviTitleColor = [DJDKMIMOMColor mainTextColor]; - imagePickerVc.barItemTextColor = [DJDKMIMOMColor mainTextColor]; - return imagePickerVc; -} - -- (void)showNotPhoto:(NSString *)title content:(NSString *)content { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = title; - config.message = content; - - [TTPopup alertWithConfig:config confirmHandler:^{ - NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - if ([[UIApplication sharedApplication] canOpenURL:url]) { - [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) { - - }]; - } - } cancelHandler:^{ - }]; -} - -- (void)showDatePickerView { - XPMineUserInfoDateView *dateView = [[XPMineUserInfoDateView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth,KScreenHeight)]; - dateView.delegate = self; - dateView.time = self.userInfo.birth/1000; - [kWindow addSubview:dateView]; - [UIView animateWithDuration:0.5 animations:^{ - dateView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - }completion:^(BOOL finished) { - dateView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - }]; -} - -- (void)updateCPSetting:(BOOL)isOn type:(NSInteger)type { - [self showLoading]; - @kWeakify(self); - [Api updateCPSetting:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [self hideHUD]; - if (code == 200) { - if (type == 1) { - self.relationUser.showCpAvatar = isOn; - } else { - self.relationUser.showCpAnim = isOn; - } - [self showSuccessToast:msg]; - } else { - [self showErrorToast:msg]; - } - } type:@(type) isShow:@(isOn)]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 2; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - if (section == 1) { - return 2; - } - return self.dataSource.count; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 1) { - return kGetScaleWidth(60); - } - - XPMineUserInfoEditModel * model = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; - if (model.type == XPMineUserInfoEditType_Avatar) { - return kGetScaleWidth(80); - } else { - return kGetScaleWidth(60); - } -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - if (section == 1) { - return 60; - } - return 0; -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - if (section == 1) { - // 创建 header view - UIView *headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, 60)]; - headerView.backgroundColor = [UIColor clearColor]; - - // 创建 label 或者其他子视图 - UILabel *label = [UILabel labelInitWithText:@"CP" font:kFontMedium(15) textColor:UIColorFromRGB(0x313131)]; - - // 添加到 header view - [headerView addSubview:label]; - - // 设置 Auto Layout 约束，给 label 添加左间距 - label.translatesAutoresizingMaskIntoConstraints = NO; - [NSLayoutConstraint activateConstraints:@[ - [label.leadingAnchor constraintEqualToAnchor:headerView.leadingAnchor constant:16], // 左间距为16 - [label.centerYAnchor constraintEqualToAnchor:headerView.centerYAnchor], // 垂直居中 - ]]; - - return headerView; - } - return nil; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - - XPMineUserInfoEditTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineUserInfoEditTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineUserInfoEditTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineUserInfoEditTableViewCell class])]; - } - - if (indexPath.section == 1) { - XPMineUserInfoEditModel *model = [[XPMineUserInfoEditModel alloc] init]; - if (indexPath.row == 0) { - model.isCPAnimation = self.relationUser.showCpAnim; - model.title = YMLocalizedString(@"UserDetail_Setting_0"); - model.type = XPMineUserInfoEditType_CP_Animation; - } else { - model.isCPAvatar = self.relationUser.showCpAvatar; - model.title =YMLocalizedString(@"UserDetail_Setting_1"); - model.type = XPMineUserInfoEditType_CP_Avatar; - } - cell.itemModel = model; - - @kWeakify(self); - [cell setChangeCPSwitch:^(BOOL isOn, NSInteger type) { - @kStrongify(self); - [self updateCPSetting:isOn type:type]; - }]; - - return cell; - } - - XPMineUserInfoEditModel * model = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; - if(model.type == XPMineUserInfoEditType_Tag){ - - }else if(model.type == XPMineUserInfoEditType_Area){ - if (self.selectedArea) { - model.subTitle = self.selectedArea.name; - } else { - model.subTitle = self.outsideSelectedRegionName; - } - } - - cell.itemModel = model; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (indexPath.section == 1) { - return; - } - XPMineUserInfoEditModel * model = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; - switch (model.type) { - case XPMineUserInfoEditType_Nick: - { - XPMineUserInfoNickViewController * nickVC = [[XPMineUserInfoNickViewController alloc] init]; - nickVC.delegate = self; - nickVC.nick = self.userInfo.nick; - [self.navigationController pushViewController:nickVC animated:YES]; - } - break; - case XPMineUserInfoEditType_Avatar: { - if (self.userInfo.isReview) { - [self showErrorToast:YMLocalizedString(@"XPMineUserInfoEditViewController11")]; - } else { - [self showPhotoView]; - } - } - break; - case XPMineUserInfoEditType_Birth: - [self showDatePickerView]; - break; - case XPMineUserInfoEditType_UseDes: - { - XPMineUserInfoDesViewController * desVC = [[XPMineUserInfoDesViewController alloc] init]; - desVC.delegate = self; - desVC.userDesc = self.userInfo.userDesc; - [self.navigationController pushViewController:desVC animated:YES]; - } - break; - case XPMineUserInfoEditType_Photo: - { - XPMineUserInfoAlbumViewController * albumVC = [[XPMineUserInfoAlbumViewController alloc] init]; - [self.navigationController pushViewController:albumVC animated:YES]; - } - break; - case XPMineUserInfoEditType_Sound: - break; - case XPMineUserInfoEditType_Tag: - break; - - case XPMineUserInfoEditType_Area: - { - XPMineUserInfoEditPickView *pickerView = [[XPMineUserInfoEditPickView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - pickerView.outsideSelectedAreaName = self.outsideSelectedRegionName; - pickerView.selectedArea = self.selectedArea; - pickerView.dataArray = self.areaList; - pickerView.delegate = self; - [kWindow addSubview:pickerView]; - break; - } - default: - break; - } -} - -#pragma mark - TZImagePickerControllerDelegate -- (BOOL)isAssetCanBeDisplayed:(PHAsset *)asset { - if (self.isPhotoPickerDisplayGIF) { - // 当 displayGIF 为 YES 时，允许显示 GIF 和视频文件 - NSString *filename = [asset valueForKey:@"filename"]; - BOOL isGIF = [filename containsString:@"GIF"]; - BOOL isVideo = asset.mediaType == PHAssetMediaTypeVideo; - return isGIF || isVideo; - } else { - // 当 displayGIF 为 NO 时，只显示非 GIF 文件 - return ![[asset valueForKey:@"filename"] containsString:@"GIF"]; - } -} - -- (void)imagePickerController:(TZImagePickerController *)picker - didFinishPickingPhotos:(NSArray *)photos - sourceAssets:(NSArray *)assets - isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto - infos:(NSArray *)infos { - PHAsset *sourceAsset = assets.firstObject; - if ([[sourceAsset valueForKey:@"filename"] containsString:@"GIF"]) { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self showLoading]; - [[PHImageManager defaultManager] requestImageDataForAsset:sourceAsset - options:nil - resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, UIImageOrientation orientation, NSDictionary * _Nullable info) { - [self.presenter uploadGifAvatar:imageData]; - }]; - [picker dismissViewControllerAnimated:YES completion:^{}]; - }); - } else { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - UIImage *croppedImage = photos.firstObject; // 选中的裁剪后的图片 - // 在这里处理裁剪后的图片 - if (croppedImage) { - [self showLoading]; - [self.presenter uploadAvatar:croppedImage]; - } - [picker dismissViewControllerAnimated:YES completion:^{}]; - }); - } -} - -- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingGifImage:(UIImage *)animatedImage sourceAssets:(PHAsset *)asset { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self showLoading]; - [[PHImageManager defaultManager] requestImageDataForAsset:asset - options:nil - resultHandler:^(NSData * _Nullable imageData, NSString * _Nullable dataUTI, UIImageOrientation orientation, NSDictionary * _Nullable info) { - [self.presenter uploadGifAvatar:imageData]; - }]; - [picker dismissViewControllerAnimated:YES completion:^{}]; - }); -} - -// 处理视频选择 -- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingVideo:(UIImage *)coverImage sourceAssets:(PHAsset *)asset { - [self showLoading]; - [self processVideoAsset:asset]; - [picker dismissViewControllerAnimated:YES completion:^{}]; -} - -// 处理视频资源 -- (void)processVideoAsset:(PHAsset *)asset { - @kWeakify(self); - - // 检查视频时长（头像视频应该在5秒内） - NSTimeInterval duration = asset.duration; - if (duration > 5.0) { - dispatch_async(dispatch_get_main_queue(), - ^{ - @kStrongify(self); - [self hideHUD]; - [self showErrorToast:[NSString stringWithFormat:YMLocalizedString(@"20.20.51_text_30"), @(5)]]; - }); - return; - } - - // 获取视频的 AVAsset - [[PHImageManager defaultManager] requestAVAssetForVideo:asset - options:nil - resultHandler:^(AVAsset * _Nullable asset, AVAudioMix * _Nullable audioMix, NSDictionary * _Nullable info) { - @kStrongify(self); - if ([asset isKindOfClass:[AVURLAsset class]]) { - AVURLAsset *urlAsset = (AVURLAsset *)asset; - [self compressAndUploadVideo:urlAsset.URL]; - } else { - dispatch_async(dispatch_get_main_queue(), ^{ - [self hideHUD]; - [self showErrorToast:@"视频格式不支持"]; - }); - } - }]; -} - -// 压缩并上传视频 -- (void)compressAndUploadVideo:(NSURL *)videoURL { - @kWeakify(self); - - // 创建输出URL - NSString *outputFileName = [NSString stringWithFormat:@"compressed_video_%ld.mov", (long)[[NSDate date] timeIntervalSince1970]]; - NSString *outputPath = [NSTemporaryDirectory() stringByAppendingPathComponent:outputFileName]; - NSURL *outputURL = [NSURL fileURLWithPath:outputPath]; - - // 删除已存在的文件 - if ([[NSFileManager defaultManager] fileExistsAtPath:outputPath]) { - [[NSFileManager defaultManager] removeItemAtPath:outputPath error:nil]; - } - - // 创建导出会话 - AVAssetExportSession *exportSession = [[AVAssetExportSession alloc] initWithAsset:[AVAsset assetWithURL:videoURL] - presetName:AVAssetExportPresetMediumQuality]; - - if (exportSession) { - exportSession.outputURL = outputURL; - exportSession.outputFileType = AVFileTypeMPEG4; - exportSession.shouldOptimizeForNetworkUse = YES; - - // 设置视频尺寸（头像通常需要正方形） - exportSession.videoComposition = [self createVideoCompositionForAsset:[AVAsset assetWithURL:videoURL]]; - - [exportSession exportAsynchronouslyWithCompletionHandler:^{ - @kStrongify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - if (exportSession.status == AVAssetExportSessionStatusCompleted) { - // 检查文件大小（限制在100MB以内） - NSDictionary *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:outputPath error:nil]; - NSNumber *fileSize = [fileAttributes objectForKey:NSFileSize]; - if (fileSize && fileSize.longLongValue > 100 * 1024 * 1024) { // 10MB - [self hideHUD]; - [self showErrorToast:@"视频文件过大，请选择较短的视频"]; - [[NSFileManager defaultManager] removeItemAtPath:outputPath error:nil]; - return; - } - - // 读取压缩后的视频数据 - NSData *videoData = [NSData dataWithContentsOfURL:outputURL]; - if (videoData) { - // 使用现有的 GIF 上传方法上传视频数据 - [self.presenter uploadGifAvatar:videoData]; - } else { - [self hideHUD]; - [self showErrorToast:@"视频数据读取失败"]; - } - } else if (exportSession.status == AVAssetExportSessionStatusFailed) { - [self hideHUD]; - [self showErrorToast:[NSString stringWithFormat:@"视频压缩失败: %@", exportSession.error.localizedDescription]]; - } else if (exportSession.status == AVAssetExportSessionStatusCancelled) { - [self hideHUD]; - [self showErrorToast:@"视频处理已取消"]; - } else { - [self hideHUD]; - [self showErrorToast:@"视频处理失败"]; - } - - // 清理临时文件 - [[NSFileManager defaultManager] removeItemAtPath:outputPath error:nil]; - }); - }]; - } else { - dispatch_async(dispatch_get_main_queue(), ^{ - [self hideHUD]; - [self showErrorToast:@"视频处理失败"]; - }); - } -} - -// 创建视频合成，确保视频为正方形 -- (AVMutableVideoComposition *)createVideoCompositionForAsset:(AVAsset *)asset { - AVMutableVideoComposition *videoComposition = [AVMutableVideoComposition videoComposition]; - - // 获取视频轨道 - AVAssetTrack *videoTrack = [[asset tracksWithMediaType:AVMediaTypeVideo] firstObject]; - if (!videoTrack) { - return nil; - } - - // 设置视频尺寸为正方形（头像尺寸） - CGSize videoSize = videoTrack.naturalSize; - CGFloat size = MIN(videoSize.width, videoSize.height); - CGSize targetSize = CGSizeMake(size, size); - - videoComposition.renderSize = targetSize; - videoComposition.frameDuration = CMTimeMake(1, 30); // 30fps - - // 创建视频层指令 - AVMutableVideoCompositionInstruction *instruction = [AVMutableVideoCompositionInstruction videoCompositionInstruction]; - instruction.timeRange = CMTimeRangeMake(kCMTimeZero, asset.duration); - - AVMutableVideoCompositionLayerInstruction *layerInstruction = [AVMutableVideoCompositionLayerInstruction videoCompositionLayerInstructionWithAssetTrack:videoTrack]; - - // 计算裁剪区域，使视频居中显示 - CGFloat scaleX = targetSize.width / videoSize.width; - CGFloat scaleY = targetSize.height / videoSize.height; - CGFloat scale = MAX(scaleX, scaleY); - - CGAffineTransform transform = CGAffineTransformMakeScale(scale, scale); - - // 计算偏移量，使视频居中 - CGFloat offsetX = (targetSize.width - videoSize.width * scale) / 2; - CGFloat offsetY = (targetSize.height - videoSize.height * scale) / 2; - transform = CGAffineTransformTranslate(transform, offsetX / scale, offsetY / scale); - - [layerInstruction setTransform:transform atTime:kCMTimeZero]; - instruction.layerInstructions = @[layerInstruction]; - videoComposition.instructions = @[instruction]; - - return videoComposition; -} - -#pragma mark - UIImagePickerControllerDelegate -- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info -{ - UIImage *selectedPhoto = [info objectForKey:UIImagePickerControllerEditedImage]; - if (selectedPhoto) { - if (picker.sourceType == UIImagePickerControllerSourceTypeCamera) { - UIImageWriteToSavedPhotosAlbum(selectedPhoto, nil, nil, nil); - } - [self showLoading]; - [self.presenter uploadAvatar:selectedPhoto]; - } - [picker dismissViewControllerAnimated:YES completion:^{}]; -} - -- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker{ - [picker dismissViewControllerAnimated:YES completion:^{ - }]; -} - -#pragma mark - XPMineUserInfoDateViewDelegate -- (void)xPMineUserInfoDateView:(XPMineUserInfoDateView *)view didClickSureButton:(NSString *)dateStr{ - if (dateStr.length > 0) { - [self.presenter complectionInfoWithAvatar:nil nick:nil birth:dateStr userDesc:nil]; - } -} - -#pragma mark - XPMineUserInfoNickViewControllerDelegate -- (void)xPMineUserInfoNickViewController:(XPMineUserInfoNickViewController *)viewController updateNick:(NSString *)nick { - if (nick.length > 0) { - [self.presenter complectionInfoWithAvatar:nil nick:nick birth:nil userDesc:nil]; - } -} -#pragma mark - XPMineUserInfoDesViewControllerDelegate -- (void)xPMineUserInfoDesViewController:(XPMineUserInfoDesViewController *)viewController updateUserDes:(NSString *)userDes { - if (userDes.length > 0) { - [self.presenter complectionInfoWithAvatar:nil nick:nil birth:nil userDesc:userDes]; - } -} - -#pragma mark - XPMineUserInfoEditProtocol -- (void)getUserInfoEditDataSourceSuccess:(NSArray *)array { - self.dataSource = array; - [self.tableView reloadData]; -} --(void)getAreaListSuccess:(NSArray *)list{ - self.areaList = [list mutableCopy]; -} -- (void)saveAreaSuccess{ - if(self.delegate && [self.delegate respondsToSelector:@selector(xPMineUserInfoEditViewControllerC:didClickCompleteArea:)]){ - [self.delegate xPMineUserInfoEditViewControllerC:self didClickCompleteArea:self.selectedArea]; - } - [self.tableView reloadData]; -} -- (void)completeUserInfoSuccess:(UserInfoModel *)userInfo { - if (userInfo.isReview) { - [self showSuccessToast:YMLocalizedString(@"XPMineUserInfoEditViewController12")]; - dispatch_time_t delayTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)); - dispatch_after(delayTime, dispatch_get_main_queue(), ^{ - [self.presenter getUserInfo]; - }); - } else { - [self showSuccessToast:YMLocalizedString(@"XPMineUserInfoEditViewController13")]; - [self.presenter getUserInfo]; - } -} - -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { - self.userInfo = userInfo; - [self.presenter getUserInfoEditDataSourceWithUserInfo:self.userInfo]; -} - -- (void)uploadImageSuccess:(NSString *)url { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self hideHUD]; - if (self.isPhotoPickerDisplayGIF) { - [self uploadGiftAvatar:url]; - } else { - [self.presenter complectionInfoWithAvatar:url nick:nil birth:nil userDesc:nil]; - } - }); -} - -- (void)uploadGiftAvatar:(NSString *)url { - [self.presenter uploadAvatarV2:url needPay:self.userInfo.uploadGifAvatarPrice > 0]; -} - -- (void)uploadGifAvatarSuccess:(NSString *)url { - self.userInfo.avatar = url; - XPMineUserInfoEditModel *model = [self.dataSource firstObject]; - if (model) { - model.avatarUrl = url; - } - [self.tableView reloadData]; - if ([url hasSuffix:@"mp4"]) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.presenter getUserInfo]; - }); - [self showSuccessToast:YMLocalizedString(@"XPMineUserInfoEditViewController12")]; - }else { - [self.presenter complectionInfoWithAvatar:url nick:nil birth:nil userDesc:nil]; - } -} - -#pragma mark - XPMineUserInfoEditPickView -- (void)didClickSureActionWithArea:(LocationModel *)area{ - self.selectedArea = area; - [self.presenter saveAreaConfigWithArea:self.selectedArea]; -} -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.tableHeaderView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineUserInfoEditTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineUserInfoEditTableViewCell class])]; - } - return _tableView; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallSubViewController.h b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallSubViewController.h deleted file mode 100644 index c5ca65e..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallSubViewController.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPMineUserInfoGiftWalllSubViewController.h -// xplan-ios -// -// Created by 冯硕 on 2022/6/15. -// - -#import "MvpViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, GiftWallViewType) { - ///普通礼物 - GiftWallViewType_Normal = 1, - ///幸运礼物 - GiftWallViewType_Lucky = 2, -}; - -@interface XPMineUserInfoGiftWallSubViewController : MvpViewController -@property (nonatomic,assign) GiftWallViewType type; -@property (nonatomic,copy) NSString *userUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallSubViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallSubViewController.m deleted file mode 100644 index eec6219..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallSubViewController.m +++ /dev/null @@ -1,159 +0,0 @@ -// -// XPMineUserInfoGiftWalllSubViewController.m -// xplan-ios -// -// Created by 冯硕 on 2022/6/15. -// - -#import "XPMineUserInfoGiftWallSubViewController.h" -///Third -#import -///Tool -///View -#import "XPMineUserInfoGiftWallCollectionViewCell.h" -#import "XPGuildEmptyCollectionViewCell.h" -///P -#import "XPMineUserInfoGiftWallPresenter.h" -#import "XPMineUserInfoGiftWallProtocol.h" - -@interface XPMineUserInfoGiftWallSubViewController () -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -@property (nonatomic,strong) NSArray *datasource; -@property (nonatomic,assign) NSInteger giftNum; -@end - -@implementation XPMineUserInfoGiftWallSubViewController - -- (__kindof id)createPresenter { - return [[XPMineUserInfoGiftWallPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self.presenter getUserGiftWall:self.userUid giftType:self.type]; - [self initSubViews]; - [self initSubViewConstraints]; -} -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - [self.view addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource - --(NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView{ - if (self.giftNum == 0)return 1; - return 2; - - -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - if(self.giftNum > 0){ - - CGFloat width = KScreenWidth - kGetScaleWidth(60); - return indexPath.section == 0 ? CGSizeMake(width / 3 , kGetScaleWidth(110)): CGSizeMake((width - kGetScaleWidth(15))/4 , kGetScaleWidth(105)); - } - return CGSizeMake(KScreenWidth - 30, 65 * 3 + 30); -} -- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ - if(self.giftNum > 0){ - return section == 0 ? UIEdgeInsetsMake(0, kGetScaleWidth(15), kGetScaleWidth(15), kGetScaleWidth(15)):UIEdgeInsetsMake(0, kGetScaleWidth(15), 0, kGetScaleWidth(15)); - } - return UIEdgeInsetsMake(0, 0, 0, 0); -} -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - if (self.giftNum == 0)return 1; - return [self.datasource[section] count]; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.giftNum > 0) { - XPMineUserInfoGiftWallCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoGiftWallCollectionViewCell class]) forIndexPath:indexPath]; - if (indexPath.section == 0 && self.datasource.count > 0){ - NSArray *dataList = self.datasource[indexPath.section]; - if(indexPath.row < dataList.count){ - cell.giftInfo = [dataList xpSafeObjectAtIndex:indexPath.row]; - [cell setLevel:((int)indexPath.row + 1)]; - }else{ - UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([UICollectionViewCell class]) forIndexPath:indexPath]; - - return cell; - } - - } - if (indexPath.section == 1 && self.datasource.count > 1){ - NSArray *dataList = self.datasource[indexPath.section]; - if(indexPath.row < dataList.count){ - cell.giftInfo = [dataList xpSafeObjectAtIndex:indexPath.row]; - }else{ - UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([UICollectionViewCell class]) forIndexPath:indexPath]; - - return cell; - } - [cell setLevel:4]; - } - - return cell; - } - - XPGuildEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class]) forIndexPath:indexPath]; - - return cell; -} - - - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - XPMineUserInfoGiftWallProtocol -- (void)getUserGiftWallSuccess:(NSArray *)giftList { - _giftNum = giftList.count ; - NSMutableArray *firstDataSource = [NSMutableArray array]; - NSMutableArray *secondDataSource = [NSMutableArray array]; - for (int i = 0; i < giftList.count; i++) { - UserGiftWallInfoModel *obj = giftList[i]; - if(i < 3){ - [firstDataSource addObject:obj]; - }else{ - [secondDataSource addObject:obj]; - } - } - _datasource = @[firstDataSource,secondDataSource]; - [self.collectionView reloadData]; -} - -#pragma mark - Getters And Setters -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.minimumLineSpacing = kGetScaleWidth(15); - layout.minimumInteritemSpacing = 0; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.pagingEnabled = NO; - - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPMineUserInfoGiftWallCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoGiftWallCollectionViewCell class])]; - [_collectionView registerClass:[XPGuildEmptyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class])]; - [_collectionView registerClass:[UICollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([UICollectionViewCell class])]; - - } - return _collectionView; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.h b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.h deleted file mode 100644 index 698aaf8..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineGiftWallViewController.h -// YUMI -// -// Created by YUMI on 2022/4/14. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserInfoGiftWallViewController : BaseViewController -@property (nonatomic,copy) NSString *userUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.m deleted file mode 100644 index a904f5c..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.m +++ /dev/null @@ -1,147 +0,0 @@ -// -// XPMineGiftWallViewController.m -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import "XPMineUserInfoGiftWallViewController.h" -///Third -#import -#import -#import -#import -///Tool - -#import "UIImage+Utils.h" -///View -#import "XPMineUserInfoGiftWallSubViewController.h" - - -@interface XPMineUserInfoGiftWallViewController () -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *pi_containerView; -///普通礼物 -@property (nonatomic,strong) XPMineUserInfoGiftWallSubViewController *normalGiftVC; -///幸运礼物 -@property (nonatomic,strong) XPMineUserInfoGiftWallSubViewController *luckyGiftVC; -@end - -@implementation XPMineUserInfoGiftWallViewController -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPMineUserInfoGiftWallViewController0"); - [self.view addSubview:self.titleView]; - [self.view addSubview:self.pi_containerView]; -} - -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.width.mas_equalTo(100 * 2 + 20); - make.height.mas_equalTo(30); - make.top.mas_equalTo(self.view).offset(10); - }]; - - [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.titleView.mas_bottom).offset(10); - }]; -} - -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.normalGiftVC; - } else { - return self.luckyGiftVC; - } -} - -- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index { - // 侧滑手势处理 - self.navigationController.interactivePopGestureRecognizer.enabled = (index == 0); -} - -#pragma mark - Getters And Setters -- (void)setUserUid:(NSString *)userUid { - _userUid = userUid; - self.normalGiftVC.userUid = _userUid; - self.luckyGiftVC.userUid = _userUid; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = UIColorFromRGB(0xB3B3C3); - _titleView.titleSelectedColor = UIColorFromRGB(0x1F1A4E); - _titleView.titleFont = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _titleView.titleSelectedFont = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.cellSpacing = 20; - _titleView.cellWidthIncrement = 5; - _titleView.cellWidth = 60; - _titleView.listContainer = self.pi_containerView; - - JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.indicatorImageViewSize = CGSizeMake(15, 3); - lineView.verticalMargin = 0; - lineView.indicatorImageView.image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(15, 3)]; - lineView.indicatorImageView.layer.masksToBounds = YES; - lineView.indicatorImageView.layer.cornerRadius = 1.5; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (JXCategoryListContainerView *)pi_containerView { - if (!_pi_containerView) { - _pi_containerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _pi_containerView.defaultSelectedIndex = 0; - } - return _pi_containerView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMineUserInfoGiftWallViewController1"), YMLocalizedString(@"XPMineUserInfoGiftWallViewController2")]; - } - return _titles; -} - -- (XPMineUserInfoGiftWallSubViewController *)normalGiftVC { - if (!_normalGiftVC) { - _normalGiftVC = [[XPMineUserInfoGiftWallSubViewController alloc] init]; - _normalGiftVC.type = GiftWallViewType_Normal; - } - return _normalGiftVC; -} - -- (XPMineUserInfoGiftWallSubViewController *)luckyGiftVC { - if (!_luckyGiftVC) { - _luckyGiftVC = [[XPMineUserInfoGiftWallSubViewController alloc] init]; - _luckyGiftVC.type = GiftWallViewType_Lucky; - } - return _luckyGiftVC; -} - -@end diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.h b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.h deleted file mode 100644 index c43f2be..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// YMMineUserInfoNickViewController.h -// YUMI -// -// Created by YUMI on 2021/9/23. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@class XPMineUserInfoNickViewController; -@protocol XPMineUserInfoNickViewControllerDelegate -///更新用户名 -- (void)xPMineUserInfoNickViewController:(XPMineUserInfoNickViewController *)viewController updateNick:(NSString *)nick; -@end - -@interface XPMineUserInfoNickViewController : BaseViewController -///用户名字 -@property (nonatomic,strong) NSString *nick; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.m deleted file mode 100644 index 3b2712d..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.m +++ /dev/null @@ -1,164 +0,0 @@ -// -// YMMineUserInfoNickViewController.m -// YUMI -// -// Created by YUMI on 2021/9/23. -// - -#import "XPMineUserInfoNickViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -///Tool -#import "UserInfoModel.h" - -static NSInteger maxCount = 15; - -@interface XPMineUserInfoNickViewController () -@property (nonatomic, strong) UIView *containView;// -@property (nonatomic, strong) MSBaseTextField *nickTextField;// -@property (nonatomic, strong) UIButton *completionBtn;// -@property (nonatomic, strong) UILabel *limitLabel;// -@end - -@implementation XPMineUserInfoNickViewController -- (void)viewDidLoad { - [super viewDidLoad]; - [self setEvents]; - [self setUpUI]; - [self initSubViewConstraints]; - -} - -#pragma mark -UI -- (void)setUpUI { - self.title = YMLocalizedString(@"XPMineUserInfoNickViewController0"); - UIBarButtonItem *completeItem = [[UIBarButtonItem alloc] initWithCustomView:self.completionBtn]; - self.navigationItem.rightBarButtonItem = completeItem; - [self.view addSubview:self.containView]; - [self.containView addSubview:self.nickTextField]; - [self.view addSubview:self.limitLabel]; - self.nickTextField.text = self.nick; - self.limitLabel.text = [NSString stringWithFormat:@"%ld", (long)(maxCount - self.nick.length)]; -} - -- (void)initSubViewConstraints { - [self.containView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(20); - make.leading.mas_equalTo(self.view).offset(15); - make.trailing.mas_equalTo(self.view).offset(-15); - make.height.mas_equalTo(35); - }]; - [self.nickTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.containView); - make.leading.mas_equalTo(self.containView).offset(5); - make.trailing.mas_equalTo(self.containView); - make.height.mas_equalTo(35); - }]; - [self.limitLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nickTextField.mas_bottom).offset(8); - make.trailing.mas_equalTo(self.nickTextField); - }]; -} - -- (void)setEvents { - @weakify(self) - [self.nickTextField.rac_textSignal subscribeNext:^(NSString * _Nullable x) { - @strongify(self); - [self nickTextRuleFilter:x]; - self.limitLabel.text = [NSString stringWithFormat:@"%ld", (long)(maxCount - self.nickTextField.text.length)]; - }]; - RAC(self.completionBtn, enabled) = [RACSignal combineLatest:@[self.nickTextField.rac_textSignal] reduce:^id _Nonnull(NSString *text){ - return @(text.length > 0 && text.length <= maxCount); - }]; -} - -// 昵称规则过滤 -- (void)nickTextRuleFilter:(NSString *)nickTitle{ - NSString *toBeString = nickTitle; - NSString *lang = [self.nickTextField.textInputMode primaryLanguage]; - if ([lang isEqualToString:@"zh-Hans"]){// 简体中文输入 - //获取高亮部分 - UITextRange *selectedRange = [self.nickTextField markedTextRange]; - UITextPosition *position = [self.nickTextField positionFromPosition:selectedRange.start offset:0]; - // 没有高亮选择的字，则对已输入的文字进行字数统计和限制 - if (!position){ - if (toBeString.length > 15){ - [self showErrorToast:YMLocalizedString(@"XPMineUserInfoNickViewController1")]; - NSRange rangeIndex = [toBeString rangeOfComposedCharacterSequenceAtIndex:15]; - if (rangeIndex.length == 1){ - self.nickTextField.text = [toBeString substringToIndex:15]; - }else{ - NSRange rangeRange = [toBeString rangeOfComposedCharacterSequencesForRange:NSMakeRange(0, 15)]; - self.nickTextField.text = [toBeString substringWithRange:rangeRange]; - } - } - } - }else{ // 中文输入法以外的直接对其统计限制即可，不考虑其他语种情况 - if (toBeString.length > 15){ - [self showErrorToast:YMLocalizedString(@"XPMineUserInfoNickViewController2")]; - NSRange rangeIndex = [toBeString rangeOfComposedCharacterSequenceAtIndex:15]; - if (rangeIndex.length == 1){ - self.nickTextField.text = [toBeString substringToIndex:15]; - }else{ - NSRange rangeRange = [toBeString rangeOfComposedCharacterSequencesForRange:NSMakeRange(0, 15)]; - self.nickTextField.text = [toBeString substringWithRange:rangeRange]; - } - } - } -} -#pragma mark - Event Response -- (void)completionBtnAction:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineUserInfoNickViewController:updateNick:)]) { - [self.delegate xPMineUserInfoNickViewController:self updateNick:self.nickTextField.text]; - } -} -#pragma mark - getter && setter -- (UIView *)containView { - if (!_containView) { - _containView = [[UIView alloc] init]; - _containView.layer.cornerRadius = 5; - _containView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - } - return _containView; -} - -- (MSBaseTextField *)nickTextField { - if (!_nickTextField) { - _nickTextField = [[MSBaseTextField alloc] init]; - _nickTextField.clearButtonMode = UITextFieldViewModeAlways; - _nickTextField.font = [UIFont systemFontOfSize:14]; - _nickTextField.textColor = [DJDKMIMOMColor mainTextColor]; - _nickTextField.layer.cornerRadius = 5; - } - return _nickTextField; -} - -- (UIButton *)completionBtn { - if (!_completionBtn) { - _completionBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_completionBtn setFrame:CGRectMake(0, 0, 50, 30)]; - [_completionBtn setTitle:YMLocalizedString(@"XPMineUserInfoNickViewController3") forState:UIControlStateNormal]; - [_completionBtn setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - [_completionBtn setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateDisabled]; - _completionBtn.titleLabel.font = [UIFont systemFontOfSize:13]; - [_completionBtn addTarget:self action:@selector(completionBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _completionBtn; -} - -- (UILabel *)limitLabel { - if (!_limitLabel) { - _limitLabel = [[UILabel alloc] init]; - _limitLabel.font = [UIFont systemFontOfSize:14]; - _limitLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _limitLabel.text = @"0/15"; - } - return _limitLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.h b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.h deleted file mode 100644 index c373131..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// MineInfoViewController.h -// xplan-ios -// -// Created by 冯硕 on 2021/9/22. -// - -#import "MvpViewController.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserInfoViewController : MvpViewController -///用户的id -@property (nonatomic,assign) NSInteger uid; - -@property (nonatomic,assign) BOOL isFormCandyTree; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m deleted file mode 100644 index 16515e6..0000000 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m +++ /dev/null @@ -1,687 +0,0 @@ -// -// MineInfoViewController.m -// xplan-ios -// -// Created by 冯硕 on 2021/9/22. -// - -#import "XPMineUserInfoViewController.h" -///Third -#import -#import -#import -#import -#import "UIView+VAP.h" -#import "QGVAPConfigModel.h" -#import "XPRoomGiftAnimationParser.h" -///Tool -#import "AccountInfoStorage.h" -#import "TTPopup.h" -#import "XPSkillCardPlayerManager.h" -#import "UIImage+Utils.h" - -///Model -#import "MineSkillCardListInfoModel.h" -#import "UserInfoModel.h" -#import "XPSoundCardModel.h" -#import "XPMineUserInfoTagModel.h" -#import "UploadFile.h" -///View -#import "XPMineUserInfoHeaderView.h" -#import "XPMineUserInfoCustomNavView.h" -#import "XPMineUserInfoIndividualTagView.h" -#import "XPMineGameMateOrderView.h" -///P -#import "XPMineUserInfoPresenter.h" -#import "XPMineUserInfoProtocol.h" -#import "RoomHostDelegate.h" -///VC -#import "XPMineUserInfoEditViewController.h" -#import "XPWebViewController.h" -#import "SessionViewController.h" -#import "XPRoomViewController.h" -#import "XPMineUserDataViewController.h" -#import "XPMomentsMineViewController.h" -#import "XPGiftUserDataViewController.h" -#import "SuperBlockViewController.h" - -#import "XPRoomMiniManager.h" - -#import "XPMomentUserDataViewController.h" - -#import "LocationModel.h" - -UIKIT_EXTERN NSString * kUpdateSoundInfo; - -@interface XPMineUserInfoViewController ()< -XPMineCustomNavViewDelegate, -XPMineUserInfoProtocol, -XPMineUserInfoHeaderViewDelegate, -JXCategoryViewDelegate, -JXPagerViewDelegate, -JXPagerMainTableViewGestureDelegate, -XPMineUserInfoEditViewControllerDelegate, -XPMineUserDataViewControllerDelegate, -HWDMP4PlayDelegate> -@property (nonatomic, strong) JXCategoryTitleView *titleView; -@property (nonatomic, strong) JXCategoryIndicatorImageView *lineView; -@property (nonatomic, strong) JXPagerView *pagingView; -@property (nonatomic, strong) NSArray *titles; -///头部视图 -@property (nonatomic,strong) XPMineUserInfoHeaderView *headView; -///自定义的导航栏 -@property (nonatomic,strong) XPMineUserInfoCustomNavView *navView; -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -///底部的容器 -@property (nonatomic,strong) UIStackView *bottomStackView; -///私聊 -@property (nonatomic,strong) UIButton *chatButton; -///关注 -@property (nonatomic,strong) UIButton *attentionButton; -///资料 -@property (nonatomic,strong) XPMineUserDataViewController *userDataVC; -///禮物牆 -@property (nonatomic,strong) XPGiftUserDataViewController *giftVC; -///编辑资料 -@property (nonatomic,strong) XPMineUserInfoEditViewController *editVC; - -@property (nonatomic, strong) XPMomentUserDataViewController *userMomentVC; - -@property (nonatomic, strong) XPMineGameMateOrderView *gameOrderView; - -@property (nonatomic, assign) CGFloat headerHeight; - -@property (nonatomic, strong) VAPView *vapView; -@property (nonatomic, strong) NetImageView *avatarLoader; -@property (nonatomic, strong) NetImageView *cpAvatarLoader; - -@property (nonatomic, assign) NSInteger playVapCount; - -@end - -@implementation XPMineUserInfoViewController -- (void)dealloc { - [self hideHUD]; - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} - -- (XPMineUserInfoPresenter *)createPresenter { - return [[XPMineUserInfoPresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - --(void)viewDidAppear:(BOOL)animated{ - [super viewDidAppear:animated]; -} - --(void)viewDidDisappear:(BOOL)animated{ - [super viewDidAppear:animated]; - [[XPSkillCardPlayerManager shareInstance] stopMusic]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - - if([XPSkillCardPlayerManager shareInstance].isInRoom == YES && [XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge == NO){ - [XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge = YES; - } - - if (!_userInfo) { - [self initHttpRequest]; - } -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = UIColorFromRGB(0x08151A); - self.playVapCount = 0; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)viewDidLayoutSubviews { - [super viewDidLayoutSubviews]; - if (self.uid == [AccountInfoStorage instance].getUid.integerValue) { - self.pagingView.frame = self.view.bounds; - } else { - self.pagingView.frame = CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height - 45 - kSafeAreaBottomHeight - 15); - } -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.pagingView]; - [self.view addSubview:self.navView]; - if (self.uid != [AccountInfoStorage instance].getUid.integerValue) { - [self.view addSubview:self.bottomStackView]; - [self.bottomStackView addArrangedSubview:self.attentionButton]; - [self.bottomStackView addArrangedSubview:self.chatButton]; - [self.bottomStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(15); - make.height.mas_equalTo(45); - make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 15); - }]; - } -} - -- (void)initSubViewConstraints { - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; -} - -- (void)initHttpRequest { - NSString *uid = [NSString stringWithFormat:@"%ld", self.uid]; - [self.presenter getUserInfoWithUid:uid]; - [self.presenter getUserAttentionState:uid]; -} - -#pragma mark - 拉黑 移除黑名单 -- (BOOL)isSystemAccount { - return [KeyWithType(KeyType_SecretaryUidKey) isEqualToString:[NSString stringWithFormat:@"%ld", self.uid]] || [KeyWithType(KeyType_SystemNotifiUidKey) isEqualToString:[NSString stringWithFormat:@"%ld", self.uid]] || [KeyWithType(KeyType_GuildUidKey) isEqualToString:[NSString stringWithFormat:@"%ld", self.uid]]; -} - -- (void)showRightNavHandle { - NSMutableArray *array = [NSMutableArray array]; - NSString *uid = [NSString stringWithFormat:@"%ld",self.uid]; - @kWeakify(self); - TTActionSheetConfig *report = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineUserInfoViewController0") clickAction:^{ - @kStrongify(self); - XPWebViewController *vc = [[XPWebViewController alloc] initWithRoomUID:nil]; - NSString *urlStr = [NSString stringWithFormat:@"%@?reportUid=%@&source=PERSONAL",URLWithType(kReportRoomURL),uid]; - vc.url = urlStr; - [self.navigationController pushViewController:vc animated:YES]; - }]; - [array addObject:report]; - - BOOL isInBlackList = [[NIMSDK sharedSDK].userManager isUserInBlackList:uid] || [self isSystemAccount]; - if (!isInBlackList) { - TTActionSheetConfig *black = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineUserInfoViewController1") clickAction:^{ - @kStrongify(self); - [self addOrRemoveBlack:NO uid:uid]; - }]; - [array addObject:black]; - } - - if ([XPSkillCardPlayerManager shareInstance].userInfoModel.hasSuperRole) { - TTActionSheetConfig *superBlock = [TTActionSheetConfig normalTitle:YMLocalizedString(@"1.0.30_text_26") clickAction:^{ - @kStrongify(self); - SuperBlockViewController *vc = [[SuperBlockViewController alloc] init]; - vc.targetUser = self.userInfo; - [self.navigationController pushViewController:vc animated:YES]; - }]; - [array addObject:superBlock]; - } - - [TTPopup actionSheetWithItems:array]; -} - -//加入黑名单 -- (void)addOrRemoveBlack:(BOOL)isRemove uid:(NSString *)uid { - NSString *title; - NSString *message; - if (isRemove) { - title = YMLocalizedString(@"XPMineUserInfoViewController2"); - message = YMLocalizedString(@"XPMineUserInfoViewController3"); - }else{ - title = YMLocalizedString(@"XPMineUserInfoViewController4"); - message = YMLocalizedString(@"XPMineUserInfoViewController5"); - } - - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = title; - config.message = message; - - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ - @kStrongify(self); - @kWeakify(self); - if (isRemove) { - [[NIMSDK sharedSDK].userManager removeFromBlackBlackList:uid completion:^(NSError * _Nullable error) { - if (error == nil) { - @kStrongify(self); - [self showSuccessToast:YMLocalizedString(@"XPMineUserInfoViewController6")]; - } - }]; - } else { - [[NIMSDK sharedSDK].userManager addToBlackList:uid completion:^(NSError * _Nullable error) { - if (error == nil) { - @kStrongify(self); - [self showSuccessToast:YMLocalizedString(@"XPMineUserInfoViewController7")]; - } - }]; - } - } cancelHandler:^{ - }]; -} - -#pragma mark - XPMineUserDataViewControllerDelegate -- (void)showGameOrderView:(XPMineGamePartnerInfoModel *)model { - XPMineGameMateOrderView *view = [[XPMineGameMateOrderView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - [self.view addSubview:view]; - view.infoModel = model; - @kWeakify(self); - view.payForGame = ^(NSInteger round) { - @kStrongify(self); - [self.userDataVC submitGameOrder:model round:round]; - }; - self.gameOrderView = view; -} - -- (void)dismissGameOrderView { - [self.gameOrderView removeFromSuperview]; -} - -#pragma mark - JXCategoryViewDelegate -- (NSUInteger)tableHeaderViewHeightInPagerView:(JXPagerView *)pagerView { - return self.headerHeight <= 0 ? KScreenHeight : self.headerHeight; -} - -- (UIView *)tableHeaderViewInPagerView:(JXPagerView *)pagerView { - return self.headView; -} - -- (NSUInteger)heightForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return 50; -} - -- (UIView *)viewForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return self.titleView; -} - -- (NSInteger)numberOfListsInPagerView:(JXPagerView *)pagerView { - return self.titles.count; -} - -- (id)pagerView:(JXPagerView *)pagerView initListAtIndex:(NSInteger)index { - if (index == 0) { - return isMSRTL() ? self.userMomentVC : self.userDataVC; - } else { - return isMSRTL() ? self.userDataVC : self.userMomentVC; - } -} - -#pragma mark - JXPagerMainTableViewGestureDelegate -- (BOOL)mainTableViewGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { - ///1000是外部的scrollView 1001是人气主播中的collectionView - if (otherGestureRecognizer.view.tag == 1005 || otherGestureRecognizer.view.tag == 1009) { - return NO; - } - return [gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] && [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]]; -} - -#pragma mark - XPMineCustomNavViewDelegate -- (void)xPMineCustomNavView:(XPMineUserInfoCustomNavView *)view didClickEditButton:(UIButton *)sender { - if (sender.isSelected) {///自己看自己的 去修改资料 - self.editVC.outsideSelectedRegionName = self.userInfo.region; - self.editVC.relationUser = self.userInfo.relationUserVO; - [self.navigationController pushViewController:self.editVC animated:YES]; - } else { - [self showRightNavHandle]; - } -} - -- (void)xPMineCustomNavView:(XPMineUserInfoCustomNavView *)view didClickBackButton:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - XPMineUserInfoHeaderViewDelegate -- (void)xPMineUserInfoHeaderView:(XPMineUserInfoHeaderView *)view didClickGoToRoom:(NSString *)roomUid { - if (roomUid.length > 0 ) { - if(roomUid.integerValue == [XPSkillCardPlayerManager shareInstance].roomUid.integerValue && [XPRoomMiniManager shareManager].getRoomInfo == nil){ - [self.navigationController popViewControllerAnimated:YES]; - return; - } - [self.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - [self.navigationController popToRootViewControllerAnimated:NO]; - XPRoomViewController * rooomVC = obj; - [rooomVC exitRoom]; - *stop = YES; - } - }]; - [XPRoomViewController openRoom:roomUid viewController:self]; - } -} - -#pragma mark - XPMineUserInfoProtocol -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { - self.userInfo = userInfo; - self.headView.userInfo = userInfo; - self.userDataVC.userInfo = userInfo; - - //获取用户详细信息 跟随进房目前使用的这个接口 - [self.presenter getUserDetailInfoWithUid:@(self.uid).stringValue]; -} - -- (void)onGetUserInfoFailure { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)onGetDetailInfoSuccess:(UserInfoModel *)userInfo { - - self.userInfo.uploadGifAvatarPrice = userInfo.uploadGifAvatarPrice; - self.userInfo.usingPersonalBackground = userInfo.usingPersonalBackground; - self.userInfo.infoCardVo = userInfo.infoCardVo; - self.headView.userInfo = self.userInfo; - self.userDataVC.userInfo = self.userInfo; - - self.userDataVC.giftWall = userInfo.userGiftWall; - self.userDataVC.luckyGiftWall = userInfo.userLuckyBagGiftWall; - self.userDataVC.dynamicInfo = userInfo.dynamicInfo; - self.userDataVC.medalInfo = userInfo.medals; - self.userDataVC.guildInfo = userInfo.guildInfo; - - self.userMomentVC.dynamicInfo = userInfo.dynamicInfo; - - self.headView.roomUid = userInfo.roomUid; - - self.headView.nameplateList = userInfo.userNameplateList; - - self.giftVC.userInfo = userInfo; - - self.userInfo.relationUserVO = userInfo.relationUserVO; - self.headView.relationUser = userInfo.relationUserVO; - - userInfo.medalsPic = self.userInfo.medalsPic; - self.headerHeight = [XPMineUserInfoHeaderView headerHeight:userInfo cps:0]; - - [self.pagingView reloadData]; - - ///上传访问记录 - NSString *uid = [NSString stringWithFormat:@"%ld", self.uid]; - if (userInfo.uid != [AccountInfoStorage instance].getUid.integerValue && - [XPSkillCardPlayerManager shareInstance].userInfoModel.userVipInfoVO.visitListView == NO) { - [self.presenter visitUser:uid]; - } - - if(isMSRTL()){ - self.userMomentVC.view.hidden = YES; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.titleView selectItemAtIndex:1]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.titleView selectItemAtIndex:0]; - [self.userDataVC reloadView]; - self.userMomentVC.view.hidden = NO; - }); - }); - } - - [self playCPAnimation]; - [self.presenter cpTypeList:userInfo.uid]; -} - -- (void)getCPListSuccess:(NSArray *)array { - self.headView.cpUsers = array; - self.headerHeight = [XPMineUserInfoHeaderView headerHeight:self.giftVC.userInfo - cps:array.count]; - [self.pagingView reloadData]; -} - -- (void)getAttentionStateSuccess:(BOOL)status { - self.attentionButton.selected = status; -} - -- (void)attentionUserSuccess:(BOOL)status { - self.attentionButton.selected = status; -} - -- (void)playCPAnimation { - if (self.userInfo.relationUserVO.showCpAnim && - self.userInfo.relationUserVO.cpLevel >= 3 && - self.playVapCount == 0) { - - self.playVapCount = 1; - - [self.view addSubview:self.vapView]; - NSString *filePath = [[NSBundle mainBundle] pathForResource:@(self.userInfo.relationUserVO.cpLevel).stringValue ofType:@"mp4"]; - [self.vapView playHWDMP4:filePath delegate:self]; - } -} - -- (void)removeCPAnimation { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [UIView animateWithDuration:0.25 animations:^{ - self.vapView.alpha = 0; - } completion:^(BOOL finished) { - [self.vapView removeFromSuperview]; - }]; - - }); -} - -#pragma mark - MP4 delegate -- (BOOL)shouldStartPlayMP4:(VAPView *)container config:(QGVAPConfigModel *)config { - return YES; -} - -- (void)viewDidFailPlayMP4:(NSError *)error { - [self removeCPAnimation]; -} - -- (void)viewDidFinishPlayMP4:(NSInteger)totalFrameCount view:(VAPView *)container { - [self removeCPAnimation]; -} - -//provide image for url from tag content -- (void)loadVapImageWithURL:(NSString *)urlStr context:(NSDictionary *)context completion:(VAPImageCompletionBlock)completionBlock { - dispatch_async(dispatch_get_main_queue(), ^{ - QGVAPSourceInfo *info = (QGVAPSourceInfo *)context[@"resource"]; - if ([info.contentTag isEqualToString:@"avatar1"] ) { - self.avatarLoader = [[NetImageView alloc] init]; - [self.avatarLoader loadImageWithUrl:self.userInfo.relationUserVO.avatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - completionBlock(image, nil, urlStr); - }]; - } else { - self.cpAvatarLoader = [[NetImageView alloc] init]; - [self.cpAvatarLoader loadImageWithUrl:self.userInfo.relationUserVO.cpAvatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - completionBlock(image, nil, urlStr); - }]; - } - }); -} - -#pragma mark -XPMineUserInfoEditViewController -- (void)xPMineUserInfoEditViewControllerC:(XPMineUserInfoEditViewController *)vc didClickComplete:(NSString *)meLabels{ -// self.headView.tagModel = self.tagModel; -} -- (void)xPMineUserInfoEditViewControllerC:(XPMineUserInfoEditViewController *)vc didClickCompleteArea:(LocationModel *)area{ - self.userInfo.region = area.name; - self.userDataVC.userInfo = self.userInfo; -} -#pragma mark - Event Response -- (void)chatButtonAction:(UIButton *)sender { - NSString * sessionId = [NSString stringWithFormat:@"%ld",self.uid]; - NIMSession * session = [NIMSession session:sessionId type:NIMSessionTypeP2P]; - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:session]; - [self.navigationController pushViewController:sessionVC animated:YES]; -} - -- (void)attentionButtonAction:(UIButton *)sender { - NSString *uid = [NSString stringWithFormat:@"%ld", self.uid]; - [self.presenter attentionUser:uid state:!sender.selected]; -} - -#pragma mark - Getters And Setters -- (void)setUid:(NSInteger)uid { - _uid = uid; - if (_uid > 0) { - if (_uid == [AccountInfoStorage instance].getUid.integerValue) { - [self.navView.editButton setImage:[UIImage imageNamed:@"mine_user_info_edit_self"] forState:UIControlStateNormal]; - } else { - - [self.navView.editButton setImage:[UIImage imageNamed:@"mine_user_info_edit"] forState:UIControlStateNormal]; - } - self.navView.editButton.selected = _uid == [AccountInfoStorage instance].getUid.integerValue; - NSString * uidStr = [NSString stringWithFormat:@"%ld", uid]; - self.userDataVC.userUid = uidStr; - self.giftVC.userUid = uidStr; - self.editVC.uid = uidStr; - } -} - -- (XPMineUserInfoHeaderView *)headView { - if (!_headView) { - _headView = [[XPMineUserInfoHeaderView alloc] init]; - _headView.delegate = self; - } - return _headView; -} - -- (XPMineUserInfoCustomNavView *)navView { - if (!_navView) { - _navView = [[XPMineUserInfoCustomNavView alloc] init]; - _navView.delegate = self; - [_navView updateBackButtonImage:[UIImage imageNamed:@"home_search_white_back"]]; - } - return _navView; -} - -- (UIStackView *)bottomStackView { - if (!_bottomStackView) { - _bottomStackView = [[UIStackView alloc] init]; - _bottomStackView.backgroundColor = [UIColor clearColor]; - _bottomStackView.axis = UILayoutConstraintAxisHorizontal; - _bottomStackView.distribution = UIStackViewDistributionFillEqually; - _bottomStackView.alignment = UIStackViewAlignmentFill; - _bottomStackView.spacing = 25; - } - return _bottomStackView; -} - -- (UIButton *)chatButton { - if (!_chatButton) { - _chatButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_chatButton setTitle:YMLocalizedString(@"XPMineUserInfoViewController8") forState:UIControlStateNormal]; - [_chatButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _chatButton.titleLabel.font = kFontMedium(14); - [_chatButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0x04D5C6)] forState:UIControlStateNormal]; - [_chatButton setImage:kImage(@"user_detail_message") forState:UIControlStateNormal]; - _chatButton.layer.masksToBounds = YES; - _chatButton.layer.cornerRadius = 45/2; - [_chatButton addTarget:self action:@selector(chatButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _chatButton; -} - -- (UIButton *)attentionButton { - if (!_attentionButton) { - _attentionButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_attentionButton setTitle:YMLocalizedString(@"XPMineUserInfoViewController9") forState:UIControlStateNormal]; - [_attentionButton setTitle:YMLocalizedString(@"XPMineUserInfoViewController10") forState:UIControlStateSelected]; - [_attentionButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_attentionButton setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - _attentionButton.titleLabel.font = kFontMedium(14); - [_attentionButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xFFA018)] forState:UIControlStateNormal]; - [_attentionButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0x00444A)] forState:UIControlStateSelected]; - [_attentionButton setImage:kImage(@"user_detail_unfollow") forState:UIControlStateNormal]; - [_attentionButton setImage:kImage(@"user_detail_followed") forState:UIControlStateSelected]; - _attentionButton.layer.masksToBounds = YES; - _attentionButton.layer.cornerRadius = 45/2; - [_attentionButton addTarget:self action:@selector(attentionButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _attentionButton; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.backgroundColor = UIColorFromRGB(0x08151A); - _titleView.titleColor = [UIColor colorWithWhite:1 alpha:0.6]; - _titleView.titleSelectedColor = [UIColor whiteColor]; - _titleView.titleFont = kFontMedium(16); - _titleView.titleSelectedFont = kFontMedium(18); - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0;//isMSRTL() ? 1 : 0; - _titleView.averageCellSpacingEnabled = NO; - _titleView.contentEdgeInsetLeft = 15; - _titleView.titles = self.titles; - _titleView.cellSpacing = 20; - _titleView.listContainer = (id)self.pagingView.listContainerView; - - JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.verticalMargin = 8; - lineView.indicatorImageView.image = kImage(@"user_page_Indicator"); - lineView.indicatorImageView.contentMode = UIViewContentModeScaleAspectFill; - lineView.indicatorImageViewSize = CGSizeMake(21, 6); - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (JXPagerView *)pagingView { - if (!_pagingView) { - _pagingView = [[JXPagerView alloc] initWithDelegate:self]; -// _pagingView.hidden = YES; - _pagingView.backgroundColor = [UIColor clearColor]; - _pagingView.listContainerView.backgroundColor = [UIColor clearColor]; - _pagingView.mainTableView.backgroundColor = [UIColor clearColor]; - _pagingView.listContainerView.listCellBackgroundColor = UIColor.clearColor; - _pagingView.listContainerView.scrollView.bounces = NO; - _pagingView.mainTableView.gestureDelegate = self; - } - return _pagingView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMineUserInfoViewController11"), - YMLocalizedString(@"XPMineUserInfoViewController12") - ]; - } - return _titles; -} - -- (XPMineUserDataViewController *)userDataVC { - if (!_userDataVC) { - _userDataVC = [[XPMineUserDataViewController alloc] init]; - _userDataVC.delegate = self; - } - return _userDataVC; -} - -- (XPMomentUserDataViewController *)userMomentVC { - if (!_userMomentVC) { - _userMomentVC = [[XPMomentUserDataViewController alloc] init]; - } - return _userMomentVC; -} - --(XPGiftUserDataViewController *)giftVC{ - if (!_giftVC){ - _giftVC = [XPGiftUserDataViewController new]; - } - return _giftVC; -} -- (XPMineUserInfoEditViewController *)editVC{ - if (!_editVC){ - _editVC = [XPMineUserInfoEditViewController new]; - _editVC.delegate = self; - } - return _editVC; -} - -- (VAPView *)vapView { - if (!_vapView) { - _vapView = [[VAPView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - _vapView.contentMode = UIViewContentModeScaleAspectFit; - _vapView.hwd_Delegate = self; - @kWeakify(self); - [_vapView addVapTapGesture:^(UIGestureRecognizer *gestureRecognizer, BOOL insideSource, QGVAPSourceDisplayItem *source) { - @kStrongify(self); - [self removeCPAnimation]; - }]; - } - return _vapView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.h b/YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.h deleted file mode 100644 index d114147..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.h +++ /dev/null @@ -1,72 +0,0 @@ -// -// Api+NobleCenter.h -// xplan-ios -// -// Created by GreenLand on 2021/12/28. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (NobleCenter) - -/// VIP中心等级列表 -/// @param completion 完成 -//+ (void)nobleCenterLevelList:(HttpRequestHelperCompletion)completion; -+ (void)vipCenterLevelList:(HttpRequestHelperCompletion)completion; -///领取返利钻石 -+ (void)getNobleCenterDiamond:(HttpRequestHelperCompletion)completion returnProfitRecordId:(NSString *)returnProfitRecordId; -///获取开通VIP产品列表 -+ (void)getChargeList:(HttpRequestHelperCompletion)completion type:(NSString *)type; - -/// 苹果下单 -/// @param completion 完成 -/// @param chargeProdId 充值id -/// @param uid 用户的uid -/// @param roomUid 房间的Uid -/// @param ticket ticket -/// @param deviceInfo uuid -/// @param clientIp ip地址 -+ (void)requestNobleIAPRecharge:(HttpRequestHelperCompletion)completion - chargeProdId:(NSString *)chargeProdId - uid:(NSString *)uid - roomUid:(NSString *)roomUid - ticket:(NSString *)ticket - deviceInfo:(NSString *)deviceInfo - clientIp:(NSString *)clientIp; - -/// 一键还原装扮 -/// @param completion 完成 -+ (void)requestRecoveryDress:(HttpRequestHelperCompletion)completion; -/// 使用钻石开通VIP -/// @param complection 完成回调 -/// @param roomUid 房主的uid -+(void)openWithDiamond:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid vipLevel:(NSString *)vipLevel; - -/// VIP 隐身进房开关 -/// @param complection 完成回调 -/// @param open 是否打开 -+ (void)changeEnterHideCompletion:(HttpRequestHelperCompletion)complection open:(NSString *)open; - -/// VIP 防关注开关 -/// @param completion 完成回调 -/// @param open 是否打开 -+ (void)changePreventFollowCompletion:(HttpRequestHelperCompletion)completion open:(NSString *)open; - -/// VIP 防跟随开关 -/// @param completion 完成回调 -/// @param open 是否打开 -+ (void)changePreventTraceCompletion:(HttpRequestHelperCompletion)completion open:(NSString *)open; - -/// VIP 防被踢开关 -/// @param completion 完成回调 -/// @param open 是否打开 -+ (void)changePreventKickCompletion:(HttpRequestHelperCompletion)completion open:(NSString *)open; - -+ (void)changePrivateChatLimitCompletion:(HttpRequestHelperCompletion)completion open:(NSString *)open; - -+ (void)changeVisitHideCompletion:(HttpRequestHelperCompletion)completion open:(NSString *)open; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.m b/YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.m deleted file mode 100644 index a5d857b..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.m +++ /dev/null @@ -1,102 +0,0 @@ -// -// Api+NobleCenter.m -// xplan-ios -// -// Created by GreenLand on 2021/12/28. -// - -#import "Api+NobleCenter.h" - -@implementation Api (NobleCenter) - -/// VIP中心等级列表 -/// @param completion 完成 -//+ (void)nobleCenterLevelList:(HttpRequestHelperCompletion)completion { -// [self makeRequest:@"vip/getVipPageInfo" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -//} -// vip/v2/getVipPageInfo -+ (void)vipCenterLevelList:(HttpRequestHelperCompletion)completion { - [self makeRequest:@"vip/v2/getVipPageInfo" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} - -//vip/v2/getVipPageInfo - -///领取返利钻石 -+ (void)getNobleCenterDiamond:(HttpRequestHelperCompletion)completion returnProfitRecordId:(NSString *)returnProfitRecordId{ - [self makeRequest:@"vip/returnProfit/receive" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, returnProfitRecordId,nil]; -} -///获取开通VIP产品列表 -+ (void)getChargeList:(HttpRequestHelperCompletion)completion type:(NSString *)type { -// [self makeRequest:@"chargeprod/getVipList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, type, nil]; -} - -/// 苹果下单 -/// @param completion 完成 -/// @param chargeProdId 充值id -/// @param uid 用户的uid -/// @param roomUid 房间的Uid -/// @param ticket ticket -/// @param deviceInfo uuid -/// @param clientIp ip地址 -+ (void)requestNobleIAPRecharge:(HttpRequestHelperCompletion)completion - chargeProdId:(NSString *)chargeProdId - uid:(NSString *)uid - roomUid:(NSString *)roomUid - ticket:(NSString *)ticket - deviceInfo:(NSString *)deviceInfo - clientIp:(NSString *)clientIp { - if (!roomUid) { - roomUid = NULL; - } - [self makeRequest:@"order/placeV2" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,chargeProdId, uid, roomUid, ticket, deviceInfo, clientIp, nil]; -} - -/// 一键还原装扮 -/// @param completion 完成 -+ (void)requestRecoveryDress:(HttpRequestHelperCompletion)completion { - [self makeRequest:@"vip/recoveryDress" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} - -/// 使用钻石开通VIP -/// @param complection 完成回调 -/// @param roomUid 房主的uid -+(void)openWithDiamond:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid vipLevel:(NSString *)vipLevel{ - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - if (roomUid.length > 0) { - [dic setValue:roomUid forKey:@"roomUid"]; - } - if (vipLevel.length > 0){ - [dic setValue:vipLevel forKey:@"vipLevel"]; - } - [HttpRequestHelper request:@"vip/openWithDiamond" method:HttpRequestHelperMethodPOST params:dic completion:complection]; -} - -/// 开关隐身进房 -/// @param complection 完成回调 -/// @param open 是否打开 -+ (void)changeEnterHideCompletion:(HttpRequestHelperCompletion)complection open:(NSString *)open { - [self makeRequest:@"vip/changeInvisibleInRoom" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__,open, nil]; -} - -+ (void)changePreventFollowCompletion:(HttpRequestHelperCompletion)completion open:(NSString *)open { - [self makeRequest:@"vip/changePreventFollow" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,open, nil]; -} - -+ (void)changePreventTraceCompletion:(HttpRequestHelperCompletion)completion open:(NSString *)open { - [self makeRequest:@"vip/changePreventTrace" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,open, nil]; -} - -+ (void)changePreventKickCompletion:(HttpRequestHelperCompletion)completion open:(NSString *)open { - [self makeRequest:@"vip/changePreventKick" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,open, nil]; -} - -+ (void)changePrivateChatLimitCompletion:(HttpRequestHelperCompletion)completion open:(NSString *)open { - [self makeRequest:@"vip/changePrivateChatLimit" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,open, nil]; -} - -+ (void)changeVisitHideCompletion:(HttpRequestHelperCompletion)completion open:(NSString *)open { - [self makeRequest:@"vip/visitHide" method:HttpRequestHelperMethodGET - completion:completion, __FUNCTION__, open, nil]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleAuthInfo.h b/YuMi/Modules/YMMine/View/Noble/Model/NobleAuthInfo.h deleted file mode 100644 index 0fb327f..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleAuthInfo.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// NobleAuthInfo.h -// xplan-ios -// -// Created by GreenLand on 2022/1/3. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface NobleAuthInfo : PIBaseModel - -///特权短描述 -@property (nonatomic, copy) NSString *authDesc; -///特权icon -@property (nonatomic, copy) NSString *authIcon; -///特权长描述 -@property (nonatomic, copy) NSString *authIntro; -///特权名称 -@property (nonatomic, copy) NSString *authName; - -///特权类型：1. 铭牌 2. 头饰 3. 座驾 4. 礼物 5.资料卡 6. 财富值经验加成 7.表情 8.麦序光圈 9.麦位昵称颜色 10. 好友红名 11.聊天气泡 12.进场特效 13 隐身进房 -@property (nonatomic, assign) NSInteger authType; -///描述图片 -@property (nonatomic, copy) NSString *descPic; -///id -@property (nonatomic, assign) NSInteger id; -///seq -@property (nonatomic, assign) NSInteger seq; -///status -@property (nonatomic, assign) NSInteger status; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleAuthInfo.m b/YuMi/Modules/YMMine/View/Noble/Model/NobleAuthInfo.m deleted file mode 100644 index 2f06fae..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleAuthInfo.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// NobleAuthInfo.m -// xplan-ios -// -// Created by GreenLand on 2022/1/3. -// - -#import "NobleAuthInfo.h" - -@implementation NobleAuthInfo - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleCenterModel.h b/YuMi/Modules/YMMine/View/Noble/Model/NobleCenterModel.h deleted file mode 100644 index 7f9cee1..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleCenterModel.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// NobleCenterModel.h -// xplan-ios -// -// Created by GreenLand on 2022/1/3. -// - -#import -#import "NobleAuthInfo.h" -#import "NobleInfo.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface NobleCenterModel : PIBaseModel - -///用户当前VIP等级 -@property (nonatomic, assign) NSInteger currentLevel; -///用户当前权力值 -@property (nonatomic, assign) NSInteger currScore; -///VIP到期剩余秒数 -@property (nonatomic, assign) NSInteger remainSeconds; -///VIP权限信息列表 -@property (nonatomic, strong) NSArray *vipAuthInfos; -///VIP信息列表 -@property (nonatomic, strong) NSArray *vipInfos; -///当前是否为最高等级 -@property (nonatomic, assign) BOOL isMaxLevel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleCenterModel.m b/YuMi/Modules/YMMine/View/Noble/Model/NobleCenterModel.m deleted file mode 100644 index bac20a8..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleCenterModel.m +++ /dev/null @@ -1,18 +0,0 @@ -// -// NobleCenterModel.m -// xplan-ios -// -// Created by GreenLand on 2022/1/3. -// - -#import "NobleCenterModel.h" - -@implementation NobleCenterModel - -+ (NSDictionary *)objectClassInArray { - return @{@"vipAuthInfos": NobleAuthInfo.class, - @"vipInfos": NobleInfo.class - }; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h b/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h deleted file mode 100644 index 2fbf1d6..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// NobleInfo.h -// xplan-ios -// -// Created by GreenLand on 2022/1/3. -// - -#import -#import "PINobleRebateModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface NobleInfo : PIBaseModel - -///是否敬请期待：1. 否 2.是 -@property (nonatomic, assign) NSInteger comingSoon; -///VIP保级值 -@property (nonatomic, assign) NSInteger levelKeepScore; -///VIP升级值 -@property (nonatomic, assign) NSInteger levelUpScore; - -@property (nonatomic, copy) NSString *ownAuthTypeStr; -///有用的权限type列表 -@property (nonatomic, copy) NSArray *ownAuthTypes; -///VIPicon -@property (nonatomic, copy) NSString *vipIcon; -///VIP等级 -@property (nonatomic, assign) NSInteger vipLevel; -///VIPlogo -@property (nonatomic, copy) NSString *vipLogo; -///VIP名称 -@property (nonatomic, copy) NSString *vipName; -///返钻 -@property(nonatomic,copy) NSArray *returnProfits; - -@property(nonatomic,assign) BOOL isReturnProfit; - -@property (nonatomic, assign) NSInteger buyAmount; -@property (nonatomic, assign) NSInteger remainSeconds; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.m b/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.m deleted file mode 100644 index ea0df15..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.m +++ /dev/null @@ -1,18 +0,0 @@ -// -// NobleInfo.m -// xplan-ios -// -// Created by GreenLand on 2022/1/3. -// - -#import "NobleInfo.h" - -@implementation NobleInfo - -+ (NSDictionary *)objectClassInArray { - return @{ - @"returnProfits": [PINobleRebateModel class], - }; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleLevelUpModel.h b/YuMi/Modules/YMMine/View/Noble/Model/NobleLevelUpModel.h deleted file mode 100644 index ee185a5..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleLevelUpModel.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// NobleLevelUpModel.h -// xplan-ios -// -// Created by GreenLand on 2022/1/7. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface NobleLevelUpModel : PIBaseModel - -///用户昵称 -@property (nonatomic, strong) NSString *nick; -///UID -@property (nonatomic, assign) long long uid; -///VIP等级 -@property (nonatomic, assign) NSInteger vipLevel; -///VIP名称 -@property (nonatomic, strong) NSString *vipName; - -@property (nonatomic, copy) NSString *floatPic; -///头像 -@property (nonatomic, copy) NSString *vipIcon; -///VIPlogo动图 -@property (nonatomic, copy) NSString *vipLogo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleLevelUpModel.m b/YuMi/Modules/YMMine/View/Noble/Model/NobleLevelUpModel.m deleted file mode 100644 index b12a155..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleLevelUpModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// NobleLevelUpModel.m -// xplan-ios -// -// Created by GreenLand on 2022/1/7. -// - -#import "NobleLevelUpModel.h" - -@implementation NobleLevelUpModel - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleRechargeModel.h b/YuMi/Modules/YMMine/View/Noble/Model/NobleRechargeModel.h deleted file mode 100644 index 3febf25..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleRechargeModel.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// NobleRechargeModel.h -// xplan-ios -// -// Created by GreenLand on 2022/1/4. -// - -#import -#import "RechargeListModel.h" - -NS_ASSUME_NONNULL_BEGIN - - -@interface NobleRechargeModel : PIBaseModel - -@property (nonatomic, strong) NSArray *list; -@property (nonatomic, assign) NSInteger defaultPayH5; -@property (nonatomic, assign) NSInteger defaultPay; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleRechargeModel.m b/YuMi/Modules/YMMine/View/Noble/Model/NobleRechargeModel.m deleted file mode 100644 index 57aac87..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleRechargeModel.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// NobleRechargeModel.m -// xplan-ios -// -// Created by GreenLand on 2022/1/4. -// - -#import "NobleRechargeModel.h" - -@implementation NobleRechargeModel - -+ (NSDictionary *)objectClassInArray { - return @{@"list": RechargeListModel.class - }; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/Model/PINobleCenterListModel.h b/YuMi/Modules/YMMine/View/Noble/Model/PINobleCenterListModel.h deleted file mode 100644 index c4836f2..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/PINobleCenterListModel.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// PINobleCenterListModel.h -// YuMi -// -// Created by duoban on 2024/3/27. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PINobleCenterListModel : NSObject - - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/Model/PINobleCenterListModel.m b/YuMi/Modules/YMMine/View/Noble/Model/PINobleCenterListModel.m deleted file mode 100644 index 1071d20..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/PINobleCenterListModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// PINobleCenterListModel.m -// YuMi -// -// Created by duoban on 2024/3/27. -// - -#import "PINobleCenterListModel.h" - -@implementation PINobleCenterListModel - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/Model/PINobleRebateModel.h b/YuMi/Modules/YMMine/View/Noble/Model/PINobleRebateModel.h deleted file mode 100644 index 0051146..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/PINobleRebateModel.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// PINobleRebateModel.h -// YuMi -// -// Created by duoban on 2024/3/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PINobleRebateModel : NSObject -@property(nonatomic,copy) NSString *id; -@property(nonatomic,assign) BOOL isReceive; -@property(nonatomic,copy) NSString *profitAmount; -@property(nonatomic,copy) NSString *profitDate; -@property(nonatomic,assign) int seqNo; -@property(nonatomic,assign) int vipLevel; -@property(nonatomic,assign) BOOL isReach; -@property(nonatomic,copy) NSString *returnProfitRecordId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/Model/PINobleRebateModel.m b/YuMi/Modules/YMMine/View/Noble/Model/PINobleRebateModel.m deleted file mode 100644 index 4819e68..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Model/PINobleRebateModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// PINobleRebateModel.m -// YuMi -// -// Created by duoban on 2024/3/29. -// - -#import "PINobleRebateModel.h" - -@implementation PINobleRebateModel - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.h b/YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.h deleted file mode 100644 index 921d117..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// XPNobleCenterPresenter.h -// xplan-ios -// -// Created by GreenLand on 2022/1/3. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNobleCenterPresenter : BaseMvpPresenter - -/// 获取VIP中心数据 -- (void)getNobleCenterInfo; -/// 获取VIP中心数据 -- (void)getNobleCenterReturnDiamond:(NSString *)recordId; -/// 获取用户信息 -- (void)getUserInfo; - -///获取VIP充值产品列表 -- (void)getNobleChargeProductListWithChannelType:(NSString *)type; - -/// 生成VIP充值的订单 -/// @param chargeProdId 苹果服务器的充值 的id -- (void)requestNobleIAPRechargeOrderWithChargeProdId:(NSString *)chargeProdId roomUid:(NSString *)roomUid ; - -/// 充值成功二次验证 -/// @param orderId 订单编号 -/// @param transcationId 商品id -- (void)checkReceiptWithOrderId:(NSString *)orderId transcationId:(NSString *)transcationId errorToast:(BOOL)errorToast; - -/// 批量验证内购掉单 -/// @param transcations 凭据的数组 -- (void)checkTranscationIds:(NSArray *)transcations; - - -/// 使用钻石开通VIP - -/// @param roomUid 房主的uid -- (void)openVipWithDiamondRoomUid:(NSString *)roomUid vipLevel:(NSString *)vipLevel; - -//联系客服 --(void)getContactCustomerService; - - -/// 切换隐身进房 -/// @param enterHide 隐身进房 -- (void)changeEnterHide:(BOOL)enterHide; -- (void)changePreventFollow:(BOOL)preventFollow; // 关注 -- (void)changePreventTrace:(BOOL)preventTrace; // 跟随 -- (void)changePreventKick:(BOOL)preventKick; -- (void)changePrivateChatLimit:(BOOL)chatLimit; -- (void)changeVisitHide:(BOOL)chatLimit; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.m b/YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.m deleted file mode 100644 index 1a740ce..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.m +++ /dev/null @@ -1,206 +0,0 @@ -// -// XPNobleCenterPresenter.m -// xplan-ios -// -// Created by GreenLand on 2022/1/3. -// - -#import "XPNobleCenterPresenter.h" - -///Api -#import "Api+NobleCenter.h" -#import "Api+Mine.h" - -///Tool -#import "AccountInfoStorage.h" -#import "YYUtility.h" -///Model -#import "NobleCenterModel.h" -#import "UserInfoModel.h" -#import "NobleRechargeModel.h" -///P -#import "XPNobleCenterProtocol.h" - -@implementation XPNobleCenterPresenter - -/// 获取VIP中心数据 -- (void)getNobleCenterInfo { - @kWeakify(self); - [Api vipCenterLevelList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NobleCenterModel *model = [NobleCenterModel modelWithDictionary:data.data]; - [[self getView] getNobleCenterInfoSuccess:model]; - }]]; -} -/// 获取VIP中心数据 -- (void)getNobleCenterReturnDiamond:(NSString *)recordId{ - @kWeakify(self); - [Api getNobleCenterDiamond:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] getNobleCenterDiamondSuccess:recordId]; - } showLoading:YES errorToast:YES] returnProfitRecordId:recordId]; -} -// 获取用户信息 -- (void)getUserInfo { - @kWeakify(self); - NSString * uid = [[AccountInfoStorage instance] getUid]; - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetUserInfoSuccess:infoModel]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - }] uid:uid]; -} - -///获取VIP充值产品列表 -- (void)getNobleChargeProductListWithChannelType:(NSString *)type { - @kWeakify(self); - [Api getChargeList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray *list = [RechargeListModel modelsWithArray:data.data]; - [[self getView] onGetNobleRechargeDataSuccess:list]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - - }] type:type]; -} - -/// 生成VIP充值的订单 -/// @param chargeProdId 苹果服务器的充值 的id -- (void)requestNobleIAPRechargeOrderWithChargeProdId:(NSString *)chargeProdId roomUid:(NSString *)roomUid { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - NSString * deviceInfo = [YYUtility deviceID]; - NSString * clientIp= [YYUtility ipAddress]; - @kWeakify(self); - [Api requestNobleIAPRecharge:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSString *orderId = (NSString *)data.data[@"recordId"]; - NSString *uuid = (NSString *)data.data[@"appAccountToken"]; - [[self getView] requestIAPRechargeOrderSuccess:orderId chargeProdId:chargeProdId uuid:uuid]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] requestIAPRechargeOrderFail:msg code:code]; - }showLoading:NO errorToast:NO] chargeProdId:chargeProdId uid:uid roomUid:roomUid ticket:ticket deviceInfo:deviceInfo clientIp:clientIp]; -} - -/// 充值成功二次验证 -/// @param orderId 订单编号 -/// @param transcationId 商品id -- (void)checkReceiptWithOrderId:(NSString *)orderId transcationId:(NSString *)transcationId errorToast:(BOOL)errorToast{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - @kWeakify(self); - [Api checkReceipt:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] checkReceiptSuccess:transcationId]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView]checkReceiptFailWithCode:code transcationId:transcationId]; - } showLoading:YES errorToast:errorToast] chooseEnv:@"true" chargeRecordId:orderId transcationId:transcationId uid:uid ticket:ticket]; -} - -/// 批量验证内购掉单 -/// @param transcations 凭据的数组 -- (void)checkTranscationIds:(NSArray *)transcations { - NSString * transcationIdStr = [transcations toJSONString]; - @kWeakify(self); - [Api requestCheckTranscationIds:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] checkTranscationIdsSuccess]; - }] transcationIdStr:transcationIdStr]; -} - -/// 切换隐身进房 -/// @param enterHide 隐身进房 -- (void)changeEnterHide:(BOOL)enterHide { - @kWeakify(self); - [Api changeEnterHideCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] changeEnterHideSuccess:enterHide]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] changeEnterHideFail]; - } showLoading:YES errorToast:YES] open:[NSString stringWithFormat:@"%d", enterHide]]; -} - -- (void)changePreventFollow:(BOOL)preventFollow { - @kWeakify(self); - [Api changePreventFollowCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] changePreventFollowSuccess:preventFollow]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] changePreventFollowFail]; - } showLoading:YES errorToast:YES] open:[NSString stringWithFormat:@"%d", preventFollow]]; -} - -- (void)changePreventTrace:(BOOL)preventTrace { - @kWeakify(self); - [Api changePreventTraceCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] changePreventTraceSuccess:preventTrace]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] changePreventTraceFail]; - } showLoading:YES errorToast:YES] open:[NSString stringWithFormat:@"%d", preventTrace]]; -} - -- (void)changePreventKick:(BOOL)preventKick { - @kWeakify(self); - [Api changePreventKickCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] changePreventKickSuccess:preventKick]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] changePreventKickFail]; - } showLoading:YES errorToast:YES] open:[NSString stringWithFormat:@"%d", preventKick]]; -} - -/// @param roomUid 房主的uid -- (void)openVipWithDiamondRoomUid:(NSString *)roomUid vipLevel:(NSString *)vipLevel{ - @kWeakify(self); - [Api openWithDiamond:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] openVipWithDiamondSuccess]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] openVipWithDiamondFail:code]; - }showLoading:YES errorToast:YES] roomUid:roomUid vipLevel:vipLevel]; -} -//联系客服 --(void)getContactCustomerService{ - @kWeakify(self); - [Api requestContactCustomerServiceCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSString *uid = [NSString stringWithFormat:@"%@",data.data]; - [[self getView]getContactCustomerServiceSuccessWithUid:uid]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:NO]]; -} - -- (void)changePrivateChatLimit:(BOOL)chatLimit { - @kWeakify(self); - [Api changePrivateChatLimitCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] changePrivateChatLimitSuccess:chatLimit]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] changePrivateChatLimitFail]; - } showLoading:YES errorToast:YES] open:[NSString stringWithFormat:@"%d", chatLimit]]; -} - -- (void)changeVisitHide:(BOOL)chatLimit { - @kWeakify(self); - [Api changeVisitHideCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] changeVisitHideSuccess:chatLimit]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] changeVisitHideLimitFail]; - } showLoading:YES errorToast:YES] open:[NSString stringWithFormat:@"%d", chatLimit]]; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/Protocol/XPNobleCenterProtocol.h b/YuMi/Modules/YMMine/View/Noble/Protocol/XPNobleCenterProtocol.h deleted file mode 100644 index 0e964c2..0000000 --- a/YuMi/Modules/YMMine/View/Noble/Protocol/XPNobleCenterProtocol.h +++ /dev/null @@ -1,65 +0,0 @@ -// -// XPNobleCenterProtocol.h -// xplan-ios -// -// Created by GreenLand on 2021/12/28. -// - -#import - -@class NobleCenterModel, UserInfoModel, NobleRechargeModel; -@protocol XPNobleCenterProtocol -@optional -///获取VIP信息成功 -- (void)getNobleCenterInfoSuccess:(NobleCenterModel *)model; -///获取VIP信息成功 -- (void)getNobleCenterDiamondSuccess:(NSString *)recordId; -///获取用户信息成功 -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo; - -///获取VIP充值信息成功 -- (void)onGetNobleRechargeDataSuccess:(NSArray *)list; - -///请求充值id的状态成功 -- (void)requestIAPRechargeOrderSuccess:(NSString *)orderId chargeProdId:(NSString *)chargeProdId uuid:(NSString *)uuid; -///请求充值账单失败 -- (void)requestIAPRechargeOrderFail:(NSString *)message code:(NSInteger)code; - -///二次校验成功 -- (void)checkReceiptSuccess:(NSString *)transcationId; -///二次校验失败 -- (void)checkReceiptFailWithCode:(NSInteger)code transcationId:(NSString *)transcationId; -///批量验证凭据成功 -- (void)checkTranscationIdsSuccess; - -///VIP 开关隐身进房成功 -- (void)changeEnterHideSuccess:(BOOL)switchStatus; -///VIP 开关隐身进房失败 -- (void)changeEnterHideFail; -///VIP 防关注开关修改成功 -- (void)changePreventFollowSuccess:(BOOL)switchStatus; -///VIP 防关注开关修改失败 -- (void)changePreventFollowFail; -///VIP 防跟随开关修改成功 -- (void)changePreventTraceSuccess:(BOOL)switchStatus; -///VIP 防跟随开关修改失败 -- (void)changePreventTraceFail; -///VIP 防被踢开关修改成功 -- (void)changePreventKickSuccess:(BOOL)switchStatus; -///VIP 防被踢开关修改失败 -- (void)changePreventKickFail; -///VIP 請勿打擾开关修改成功 -- (void)changePrivateChatLimitSuccess:(BOOL)switchStatus; -///VIP 請勿打擾开关修改失败 -- (void)changePrivateChatLimitFail; -///VIP 無痕瀏覽开关修改成功 -- (void)changeVisitHideSuccess:(BOOL)switchStatus; -///VIP 無痕瀏覽开关修改失败 -- (void)changeVisitHideLimitFail; -///钻石开通会员成功 --(void)openVipWithDiamondSuccess; -///钻石开通会员失败 --(void)openVipWithDiamondFail:(NSInteger)code; -//联系客服成功 --(void)getContactCustomerServiceSuccessWithUid:(NSString *)uid; -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.h deleted file mode 100644 index c6614e3..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// PINobleCenterListCell.h -// YuMi -// -// Created by duoban on 2024/3/27. -// - -#import -#import "PINobleRebateModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface PINobleCenterListCell : UICollectionViewCell -@property(nonatomic,copy) NSString *text; -@property(nonatomic,assign) NSInteger count; -@property(nonatomic,strong) NSIndexPath *path; -@property(nonatomic,strong) PINobleRebateModel *model; -@property(nonatomic,copy) NSString *vipName; -@property(nonatomic,assign) NSInteger returnProfitsCount; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.m deleted file mode 100644 index 28dd0c4..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.m +++ /dev/null @@ -1,236 +0,0 @@ -// -// PINobleCenterListCell.m -// YuMi -// -// Created by duoban on 2024/3/27. -// - -#import "PINobleCenterListCell.h" -@interface PINobleCenterListCell() -@property(nonatomic,strong) UIView *topView; -@property(nonatomic,strong) UIView *leftView; -@property(nonatomic,strong) UIView *bottomView; -@property(nonatomic,strong) UIView *rightView; -@property(nonatomic,strong) UILabel *textVeiw; -@property(nonatomic,strong) UIButton *getBtn; -@property(nonatomic,strong) UILabel *tipView; -@property(nonatomic,strong) UILabel *getTipView; -@end -@implementation PINobleCenterListCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)setText:(NSString *)text{ - _text = text; - _textVeiw.text = _text; -} - - --(void)setPath:(NSIndexPath *)path{ - _path = path; - self.topView.hidden = YES; - self.leftView.hidden = YES; - self.bottomView.hidden = YES; - self.rightView.hidden = YES; - self.textVeiw.hidden = NO; - self.getBtn.hidden = YES; - self.tipView.hidden = YES; - self.getTipView.hidden = YES; - if (_path.section == 0){ - _bottomView.hidden = YES; - }else if (_path.section == 1){ - _leftView.hidden = NO; - _bottomView.hidden = _path.row == _count; - }else if (_path.section == 2){ - _leftView.hidden = NO; - _bottomView.hidden = _path.row == _count; - - }else{ - _leftView.hidden = NO; - _bottomView.hidden = _path.row == _count; - - } - self.contentView.backgroundColor = _path.row == 0 ? UIColorRGBAlpha(0xFFAA36, 0.1) : [UIColor clearColor]; - - if (_path.row == 0){ - self.textVeiw.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - self.textVeiw.textColor = [UIColor whiteColor]; - }else{ - self.textVeiw.font = [UIFont systemFontOfSize:10 weight:UIFontWeightRegular]; - self.textVeiw.textColor = UIColorFromRGB(0xBC9E66); - } - - if (_path.section == 3 && _path.row > 0){ - self.textVeiw.hidden = YES; - } - CGFloat top = (_path.section == 0 && _path.row == 1 && _returnProfitsCount >= 3) ? 12 : 0; - [self.textVeiw mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(top); - - }]; - -} --(void)setVipName:(NSString *)vipName{ - _vipName = vipName; - _textVeiw.text = _vipName; -} -- (void)setModel:(PINobleRebateModel *)model{ - _model = model; - if (_path.row == 0)return; - if (_path.section == 1){ - _textVeiw.text = _model.profitDate.integerValue == 0 ? YMLocalizedString(@"PINobleCenterListCell8") : [NSString stringWithFormat:YMLocalizedString(@"PINobleCenterListCell6"),_model.profitDate]; - }else if (_path.section == 2){ - _textVeiw.text = _model.profitAmount; - }else{ - if (_model.isReach == YES){ - _tipView.hidden = YES; - _getTipView.hidden = !_model.isReceive; - _getBtn.hidden = _model.isReceive; - }else{ - _tipView.hidden = NO; - } - } - - -} -- (void)dealloc -{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} --(void)installUI{ - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.topView]; - [self.contentView addSubview:self.leftView]; - [self.contentView addSubview:self.bottomView]; - [self.contentView addSubview:self.rightView]; - [self.contentView addSubview:self.textVeiw]; - [self.contentView addSubview:self.getBtn]; - [self.contentView addSubview:self.tipView]; - [self.contentView addSubview:self.getTipView]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(getNobleCenterGetDiamondSucces:) name:@"kNobleCenterGetDiamondSuccess" object:nil]; -} --(void)getNobleCenterGetDiamondSucces:(NSNotification *)not{ - NSString *returnProfitRecordId = not.object; - if ([self.model.returnProfitRecordId isEqualToString:returnProfitRecordId] && _path.section == 3){ - self.model.isReach = YES; - self.getBtn.hidden = YES; - self.getTipView.hidden = NO; - } - -} --(void)installConstraints{ - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(1); - make.leading.trailing.top.equalTo(self.contentView); - }]; - [self.leftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(1); - make.top.mas_equalTo(0); - make.leading.bottom.equalTo(self.contentView); - }]; - [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(1); - make.leading.trailing.bottom.equalTo(self.contentView); - }]; - [self.rightView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(1); - make.bottom.trailing.top.equalTo(self.contentView); - }]; - [self.textVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(0); - make.leading.trailing.bottom.equalTo(self.contentView); - }]; - [self.getBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(isMSEN() ? 40 : 32); - make.height.mas_equalTo(13); - make.center.equalTo(self); - }]; - [self.tipView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(72)); - make.height.mas_equalTo(13); - make.center.equalTo(self); - }]; - [self.getTipView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(38); - make.height.mas_equalTo(13); - make.center.equalTo(self); - }]; -} --(void)getDiamondAction{ - [[NSNotificationCenter defaultCenter]postNotificationName:@"kNobleCenterGetDiamond" object:self.model]; -} -#pragma mark - 懒加载 -- (UIView *)topView{ - if(!_topView){ - _topView = [UIView new]; - _topView.backgroundColor = UIColorRGBAlpha(0xFFAA36, 0.2); - } - return _topView; -} -- (UIView *)leftView{ - if(!_leftView){ - _leftView = [UIView new]; - _leftView.backgroundColor = UIColorRGBAlpha(0xFFAA36, 0.2); - } - return _leftView; -} -- (UIView *)bottomView{ - if(!_bottomView){ - _bottomView = [UIView new]; - _bottomView.backgroundColor = UIColorRGBAlpha(0xFFAA36, 0.2); - } - return _bottomView; -} -- (UIView *)rightView{ - if(!_rightView){ - _rightView = [UIView new]; - _rightView.backgroundColor = UIColorRGBAlpha(0xFFAA36, 0.2); - } - return _rightView; -} -- (UILabel *)textVeiw{ - if(!_textVeiw){ - _textVeiw = [UILabel new]; - _textVeiw.textAlignment = NSTextAlignmentCenter; - } - return _textVeiw; -} -- (UIButton *)getBtn{ - if(!_getBtn){ - _getBtn = [UIButton new]; - [_getBtn setTitle:YMLocalizedString(@"PINobleCenterListCell0") forState:UIControlStateNormal]; - _getBtn.backgroundColor = UIColorFromRGB(0xF6AD3F); - [_getBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _getBtn.titleLabel.font = [UIFont systemFontOfSize:8 weight:UIFontWeightMedium]; - _getBtn.layer.cornerRadius = 6.5; - _getBtn.layer.masksToBounds = YES; - [_getBtn addTarget:self action:@selector(getDiamondAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _getBtn; -} -- (UILabel *)tipView{ - if(!_tipView){ - _tipView = [UILabel labelInitWithText:YMLocalizedString(@"PINobleCenterListCell1") font:[UIFont systemFontOfSize:8 weight:UIFontWeightRegular] textColor:[UIColor whiteColor]]; - _tipView.backgroundColor = UIColorFromRGB(0x726041); - _tipView.textAlignment = NSTextAlignmentCenter; - _tipView.layer.cornerRadius = 6.5; - _tipView.layer.masksToBounds = YES; - } - return _tipView; -} -- (UILabel *)getTipView{ - if(!_getTipView){ - _getTipView = [UILabel labelInitWithText:YMLocalizedString(@"PINobleCenterListCell7") font:[UIFont systemFontOfSize:8 weight:UIFontWeightRegular] textColor:UIColorFromRGB(0xB3B3C3)]; - _getTipView.textAlignment = NSTextAlignmentCenter; - _getTipView.layer.cornerRadius = 6.5; - _getTipView.layer.masksToBounds = YES; - _getTipView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.28]; - } - return _getTipView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListReusableView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListReusableView.h deleted file mode 100644 index f843fcb..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListReusableView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// PINobleCenterListReusableView.h -// YuMi -// -// Created by duoban on 2024/3/27. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PINobleCenterListReusableView : UIView -@property(nonatomic,copy) NSString *headerText; -@property(nonatomic,copy) NSString *fooderText; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListReusableView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListReusableView.m deleted file mode 100644 index 94ac06e..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListReusableView.m +++ /dev/null @@ -1,52 +0,0 @@ -// -// PINobleCenterListReusableView.m -// YuMi -// -// Created by duoban on 2024/3/27. -// - -#import "PINobleCenterListReusableView.h" -@interface PINobleCenterListReusableView() -@property(nonatomic,strong) UILabel *contentView; -@end -@implementation PINobleCenterListReusableView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.contentView]; -} --(void)installConstraints{ - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(self); - make.leading.trailing.equalTo(self).inset(12); - }]; -} -- (void)setHeaderText:(NSString *)headerText{ - _headerText = headerText; - NSMutableParagraphStyle *style = [NSMutableParagraphStyle new]; - style.lineSpacing = 3; - NSMutableAttributedString *att = [[NSMutableAttributedString alloc]initWithString:_headerText attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12 weight:UIFontWeightRegular],NSParagraphStyleAttributeName:style,NSForegroundColorAttributeName:UIColorFromRGB(0xFFE3AF)}]; - _contentView.attributedText = att; -} --(void)setFooderText:(NSString *)fooderText{ - _fooderText = fooderText; - NSMutableParagraphStyle *style = [NSMutableParagraphStyle new]; - style.lineSpacing = 3; - NSMutableAttributedString *att = [[NSMutableAttributedString alloc]initWithString:_fooderText attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12 weight:UIFontWeightRegular],NSParagraphStyleAttributeName:style,NSForegroundColorAttributeName:UIColorFromRGB(0xFFE3AF)}]; - _contentView.attributedText = att; -} -#pragma mark - 懒加载 -- (UILabel *)contentView{ - if(!_contentView){ - _contentView = [UILabel labelInitWithText:@"" font:[UIFont systemFontOfSize:12 weight:UIFontWeightRegular] textColor:UIColorFromRGB(0xFFE3AF)]; - _contentView.numberOfLines = 0; - } - return _contentView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.h deleted file mode 100644 index 89a23cf..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PINobleCenterListView.h -// YuMi -// -// Created by duoban on 2024/3/27. -// - -#import -#import "NobleInfo.h" -NS_ASSUME_NONNULL_BEGIN - -@interface PINobleCenterListView : UIView -@property (nonatomic, strong) NobleInfo *vipInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.m deleted file mode 100644 index 324fed2..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.m +++ /dev/null @@ -1,182 +0,0 @@ -// -// PINobleCenterListView.m -// YuMi -// -// Created by duoban on 2024/3/27. -// - -#import "PINobleCenterListView.h" -#import "PINobleCenterListReusableView.h" -#import "PINobleCenterListCell.h" -#import "PINoblePrivilegeEmptyCell.h" -@interface PINobleCenterListView() -@property(nonatomic,strong) UICollectionView *pi_collectionView; -@property(nonatomic,strong) PINobleCenterListReusableView *headerView; -@property(nonatomic,strong) PINobleCenterListReusableView *fooderView; -@property(nonatomic,copy) NSArray *returnProfits; -@property(nonatomic,copy) NSArray *titleList; -@end -@implementation PINobleCenterListView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.headerView]; - [self addSubview:self.pi_collectionView]; - [self addSubview:self.fooderView]; -} --(void)installConstraints{ - self.headerView.hidden = YES; - self.fooderView.hidden = YES; - [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self).inset(10); - make.top.equalTo(self); - make.height.mas_equalTo(68); - }]; - [self.pi_collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.headerView.mas_bottom).mas_offset(12); - make.width.mas_equalTo(kGetScaleWidth(347)); - make.centerX.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(300)); - }]; - [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(90); - }]; -} -- (void)setVipInfo:(NobleInfo *)vipInfo{ - _vipInfo = vipInfo; - _returnProfits = _vipInfo.returnProfits; - if (_returnProfits.count > 0){ - CGFloat height = (_returnProfits.count + 1) * 24; - [self.pi_collectionView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(height); - }]; - } - self.headerView.hidden = _returnProfits.count == 0; - self.fooderView.hidden = _returnProfits.count == 0; - _headerView.headerText = [NSString stringWithFormat:YMLocalizedString(@"PINobleCenterListView0"),_vipInfo.vipName]; - self.pi_collectionView.layer.borderWidth = _returnProfits.count == 0 ? 0 : 1; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.pi_collectionView reloadData]; - }); - - -} -#pragma mark - UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout --(NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView{ - if (self.returnProfits.count == 0){ - return 1; - } - return 4; -} -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ - if (self.returnProfits.count == 0){ - return 1; - } - if (section == 0){ - return 2; - } - return self.returnProfits.count + 1; -} --(__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - if (self.returnProfits.count == 0){ - PINoblePrivilegeEmptyCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([PINoblePrivilegeEmptyCell class]) forIndexPath:indexPath]; - return cell; - } - PINobleCenterListCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([PINobleCenterListCell class]) forIndexPath:indexPath]; - if (indexPath.row == 0){ - cell.text = self.titleList[indexPath.section]; - cell.path = indexPath; - }else{ - if (self.returnProfits.count > 0 && indexPath.section > 0){ - cell.returnProfitsCount = self.returnProfits.count; - cell.count = self.returnProfits.count; - cell.path = indexPath; - cell.model = self.returnProfits[indexPath.row - 1]; - }else{ - cell.returnProfitsCount = self.returnProfits.count; - cell.path = indexPath; - - cell.vipName = self.vipInfo.vipName; - } - } - - - - return cell; -} -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{ - if (self.returnProfits.count == 0){ - return CGSizeMake(kGetScaleWidth(347), kGetScaleWidth(300)); - } - if (indexPath.section == 0){ - NSInteger count = self.returnProfits.count > 2 ? 3 : self.returnProfits.count; - return indexPath.row == 0 ? CGSizeMake(kGetScaleWidth(70), 24): CGSizeMake(kGetScaleWidth(70), 24*count); - }else if (indexPath.section == 1){ - return indexPath.row == 0 ? CGSizeMake(kGetScaleWidth(78), 24) : CGSizeMake(kGetScaleWidth(78), 24); - }else if (indexPath.section == 2){ - return indexPath.row == 0 ? CGSizeMake(kGetScaleWidth(97), 24) : CGSizeMake(kGetScaleWidth(97), 24); - }else{ - return indexPath.row == 0 ? CGSizeMake(kGetScaleWidth(102), 24) : CGSizeMake(kGetScaleWidth(102), 24); - - } -} - -//- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ -// PINobleCenterListCell *cell = [collectionView cellForItemAtIndexPath:indexPath]; -// NSLog(@"%@",cell); -//} - -#pragma mark - 懒加载 - - -- (UICollectionView *)pi_collectionView{ - if(!_pi_collectionView){ - MSBaseRTLFlowLayout *layout = [MSBaseRTLFlowLayout new]; - layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0); - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 0; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _pi_collectionView = [[UICollectionView alloc]initWithFrame:CGRectZero collectionViewLayout:layout]; - _pi_collectionView.backgroundColor = [UIColor clearColor]; - _pi_collectionView.layer.cornerRadius = 6; - _pi_collectionView.layer.masksToBounds = YES; - _pi_collectionView.layer.borderWidth = 0; - _pi_collectionView.layer.borderColor = UIColorRGBAlpha(0xFFAA36, 0.2).CGColor; - [_pi_collectionView registerClass:[PINobleCenterListCell class] forCellWithReuseIdentifier:NSStringFromClass([PINobleCenterListCell class])]; - [_pi_collectionView registerClass:[PINoblePrivilegeEmptyCell class] forCellWithReuseIdentifier:NSStringFromClass([PINoblePrivilegeEmptyCell class])]; - - _pi_collectionView.delegate = self; - _pi_collectionView.dataSource = self; - } - return _pi_collectionView; -} -- (PINobleCenterListReusableView *)headerView{ - if(!_headerView){ - _headerView = [[PINobleCenterListReusableView alloc]initWithFrame:CGRectZero]; - _headerView.headerText = [NSString stringWithFormat:YMLocalizedString(@"PINobleCenterListView0"),@""];; - } - return _headerView; -} --(PINobleCenterListReusableView *)fooderView{ - if(!_fooderView){ - _fooderView = [[PINobleCenterListReusableView alloc]initWithFrame:CGRectZero]; - _fooderView.fooderText = YMLocalizedString(@"PINobleCenterListView1"); - } - return _fooderView; -} -- (NSArray *)titleList{ - if(!_titleList){ - _titleList = @[YMLocalizedString(@"PINobleCenterListCell2"),YMLocalizedString(@"PINobleCenterListCell3"),YMLocalizedString(@"PINobleCenterListCell4"),YMLocalizedString(@"PINobleCenterListCell5")]; - } - return _titleList; -} -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.h deleted file mode 100644 index 64f6851..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// PINobleCenterTitleCell.h -// YuMi -// -// Created by duoban on 2024/3/27. -// - -#import -#import -#import "NobleInfo.h" -NS_ASSUME_NONNULL_BEGIN - -@interface PINobleCenterTitleCell : JXCategoryTitleCell -@property(nonatomic,strong) NobleInfo *info; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.m deleted file mode 100644 index ed93023..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.m +++ /dev/null @@ -1,56 +0,0 @@ -// -// PINobleCenterTitleCell.m -// YuMi -// -// Created by duoban on 2024/3/27. -// -#import "ThemeColor+NobleCenter.h" -#import "PINobleCenterTitleCell.h" -@interface PINobleCenterTitleCell() -@property(nonatomic,strong) UIImageView *bgImageView; - -@end -@implementation PINobleCenterTitleCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self.contentView addSubview:self.bgImageView]; - -} -- (void)reloadData:(JXCategoryBaseCellModel *)cellModel { - [super reloadData:cellModel]; - -} -- (void)setInfo:(NobleInfo *)info{ - _info = info; - - _bgImageView.hidden = !self.info.isReturnProfit; -} --(void)installConstraints{ - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(16)); - make.height.mas_equalTo(kGetScaleWidth(16)); - make.top.mas_equalTo(0); - make.trailing.mas_equalTo(0); - }]; - -} - -#pragma mark - 懒加载 -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = kImage(@"mine_noble_center_tag_title_bg_ar"); - _bgImageView.hidden = YES; - } - return _bgImageView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleView.h deleted file mode 100644 index 347caac..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// PINobleCenterTitleView.h -// YuMi -// -// Created by duoban on 2024/3/27. -// - -#import -#import -#import "NobleInfo.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface PINobleCenterTitleView : JXCategoryTitleView -///VIP信息列表 -@property (nonatomic, strong) NSArray *vipInfos; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleView.m deleted file mode 100644 index c0f3a85..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleView.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// PINobleCenterTitleView.m -// YuMi -// -// Created by duoban on 2024/3/27. -// - -#import "PINobleCenterTitleView.h" -#import "PINobleCenterTitleCell.h" -@implementation PINobleCenterTitleView - -- (Class)preferredCellClass{ - return PINobleCenterTitleCell.class; -} -- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - PINobleCenterTitleCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([self preferredCellClass]) forIndexPath:indexPath]; - NobleInfo *info = [self.vipInfos xpSafeObjectAtIndex:indexPath.row]; - cell.info = info; - return cell; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINoblePrivilegeEmptyCell.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINoblePrivilegeEmptyCell.h deleted file mode 100644 index e44adb4..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINoblePrivilegeEmptyCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PINoblePrivilegeEmptyCell.h -// YuMi -// -// Created by duoban on 2024/3/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PINoblePrivilegeEmptyCell : UICollectionViewCell - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINoblePrivilegeEmptyCell.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINoblePrivilegeEmptyCell.m deleted file mode 100644 index 2c09bb6..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINoblePrivilegeEmptyCell.m +++ /dev/null @@ -1,65 +0,0 @@ -// -// PINoblePrivilegeEmptyCell.m -// YuMi -// -// Created by duoban on 2024/3/29. -// - -#import "PINoblePrivilegeEmptyCell.h" -@interface PINoblePrivilegeEmptyCell() -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end -@implementation PINoblePrivilegeEmptyCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} - --(void)installUI{ - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} --(void)installConstraints{ - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(0); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - 懒加载 -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"PINoblePrivilegeEmptyCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPMineCenterAgencyView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPMineCenterAgencyView.h deleted file mode 100644 index f4ff972..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPMineCenterAgencyView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPMineCenterAgencyView.h -// YuMi -// -// Created by P on 2024/7/22. -// - -#import -@class ClanDetailMainInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineCenterAgencyView : UIView - -@property (nonatomic, strong) ClanDetailMainInfoModel *model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPMineCenterAgencyView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPMineCenterAgencyView.m deleted file mode 100644 index 6e696d7..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPMineCenterAgencyView.m +++ /dev/null @@ -1,85 +0,0 @@ -// -// XPMineCenterAgencyView.m -// YuMi -// -// Created by P on 2024/7/22. -// - -#import "XPMineCenterAgencyView.h" -#import "ClanDetailInfoModel.h" - -@interface XPMineCenterAgencyView () - -@property (nonatomic, strong) UIImageView *bgImageView; -@property (nonatomic, strong) UILabel *coinLabel; - -@end - -@implementation XPMineCenterAgencyView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)setModel:(ClanDetailMainInfoModel *)model { - _model = model; - if([model.clanMode isEqualToString: @"clan_hall"]){ - if(model.clan.hall.ownerUid > 0 || model.clan.clan.elderUid > 0){ - self.coinLabel.text = YMLocalizedString(@"XPMineTheGuildCell3"); - } - } else { - // 家族 - if(model.family.familyId){ - self.coinLabel.text = YMLocalizedString(@"XPMineTheGuildCell3"); - } - } -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self addSubview:self.coinLabel]; -} - -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - - [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-11); - make.leading.mas_equalTo(4); - make.trailing.mas_equalTo(-4); - make.height.mas_equalTo(18); - }]; -} - -#pragma mark - Getters And Setters -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"me_bg_guild"]]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _bgImageView; -} - -- (UILabel *)coinLabel { - if (!_coinLabel) { - _coinLabel = [[UILabel alloc] init]; - _coinLabel.text = YMLocalizedString(@"XPMineTheGuildCell1"); - _coinLabel.textAlignment = NSTextAlignmentCenter; - _coinLabel.font = kFontSemibold(14); - _coinLabel.textColor = UIColorFromRGB(0x4F3500); - _coinLabel.adjustsFontSizeToFitWidth = YES; - _coinLabel.numberOfLines = 0; - } - return _coinLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.h deleted file mode 100644 index 0dd05be..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPNobleAuthorityDescView.h -// xplan-ios -// -// Created by GreenLand on 2022/1/5. -// VIP权限说明弹窗 - -#import -#import "NobleAuthInfo.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNobleAuthorityDescView : UIView - -@property (nonatomic, strong) NobleAuthInfo *vipInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.m deleted file mode 100644 index ed66130..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.m +++ /dev/null @@ -1,120 +0,0 @@ -// -// XPNobleAuthorityDescView.m -// xplan-ios -// -// Created by GreenLand on 2022/1/5. -// - -#import "XPNobleAuthorityDescView.h" -///tool -#import "ThemeColor+NobleCenter.h" -///third -#import -#import "TTPopup.h" -#import "NetImageView.h" - -@interface XPNobleAuthorityDescView () - -///背景 -@property (nonatomic, strong) UIImageView *bgImageView; -///icon -@property (nonatomic, strong) NetImageView *iconImageView; -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///描述 -@property (nonatomic, strong) SZTextView *descView; -///关闭按钮 -@property (nonatomic, strong) UIButton *closeButton; - -@end - -@implementation XPNobleAuthorityDescView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initViews]; - [self initConstraints]; - } - return self; -} - -#pragma mark - layout -- (void)initViews { - self.bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"noble_time_popBg"]]; - [self addSubview:self.bgImageView]; - self.iconImageView = [[NetImageView alloc] init]; - self.iconImageView.contentMode = UIViewContentModeScaleAspectFit; - [self addSubview:self.iconImageView]; - - self.titleLabel = [[UILabel alloc] init]; - self.titleLabel.text = @""; - self.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - self.titleLabel.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; - [self addSubview:self.titleLabel]; - - self.descView = [[SZTextView alloc] init]; - self.descView.editable = NO; - self.descView.backgroundColor = [UIColor clearColor]; - self.descView.text = @""; - self.descView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - self.descView.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; - self.descView.textAlignment = NSTextAlignmentCenter; - [self addSubview:self.descView]; - - self.closeButton = [[UIButton alloc] init]; - [self.closeButton setBackgroundImage:[UIImage imageNamed:@"noble_time_close"] forState:UIControlStateNormal]; - [self addSubview:self.closeButton]; - [self.closeButton addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - - for (id view in self.descView.subviews) { - if ([view isKindOfClass:[UITextView class]]){ - UITextView *textView = view; - textView.textAlignment = NSTextAlignmentLeft; - break; - } - } -} - -- (void)initConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(41); - make.leading.trailing.mas_equalTo(self.bgImageView).inset(24); - make.height.mas_equalTo(115); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.iconImageView.mas_bottom).mas_offset(19); - make.centerX.mas_equalTo(0); - make.height.mas_equalTo(18); - }]; - - [self.descView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(8); - make.centerX.mas_equalTo(0); - make.bottom.mas_equalTo(-24); - make.leading.trailing.mas_equalTo(self.bgImageView).inset(12); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(8); - make.trailing.mas_equalTo(-8); - make.width.height.mas_equalTo(22); - }]; -} - -#pragma mark - events -- (void)onCloseButtonClick:(UIButton *)button { - [TTPopup dismiss]; -} - -- (void)setVipInfo:(NobleAuthInfo *)vipInfo { - self.titleLabel.text = vipInfo.authName; - self.descView.text = vipInfo.authIntro; - self.iconImageView.imageUrl = vipInfo.descPic; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEmptyView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEmptyView.h deleted file mode 100644 index 9c15dd1..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEmptyView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPNobleCenterEmptyView.h -// xplan-ios -// -// Created by GreenLand on 2022/1/5. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNobleCenterEmptyView : UIView - -@property (nonatomic, copy) NSString *emptyImageStr; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEmptyView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEmptyView.m deleted file mode 100644 index 7420c38..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEmptyView.m +++ /dev/null @@ -1,82 +0,0 @@ -// -// XPNobleCenterEmptyView.m -// xplan-ios -// -// Created by GreenLand on 2022/1/5. -// - -#import "XPNobleCenterEmptyView.h" -#import "ThemeColor+NobleCenter.h" -///Third -#import -//#import "NetImageView.h" -//SVGA动画播放 -#import "SVGA.h" - - -@interface XPNobleCenterEmptyView() - -@property (nonatomic, strong) SVGAImageView *imageView; -@property (nonatomic, strong) UILabel *descLabel; -@property (strong, nonatomic) SVGAParser *parser; - - -@end - -@implementation XPNobleCenterEmptyView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initViews]; - [self initConstraints]; - } - return self; -} - -- (void)setEmptyImageStr:(NSString *)emptyImageStr { - @kWeakify(self); - [self.parser parseWithURL:[NSURL URLWithString:[emptyImageStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - self.imageView.loops = INT_MAX; - self.imageView.clearsAfterStop = NO; - self.imageView.videoItem = videoItem; - [self.imageView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { - }]; -} - -#pragma mark - layout -- (void)initViews { - self.imageView = [[SVGAImageView alloc] init]; - [self addSubview:self.imageView]; - - self.descLabel = [[UILabel alloc] init]; - self.descLabel.text = YMLocalizedString(@"XPNobleCenterEmptyView0"); - self.descLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - self.descLabel.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; - [self addSubview:self.descLabel]; -} - -- (void)initConstraints { - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(110); - make.centerX.mas_equalTo(0); - make.width.mas_equalTo(260); - make.height.mas_equalTo(180); - }]; - - [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.imageView.mas_bottom).offset(14); - make.centerX.mas_equalTo(0); - }]; -} - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.h deleted file mode 100644 index 71eac32..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPNobleCenterEntranceView.h -// xplan-ios -// -// Created by GreenLand on 2022/1/6. -// - -#import -#import "NobleInfo.h" -#import "NobleCenterModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNobleCenterEntranceView : UIView - -@property (nonatomic, strong) NobleInfo *vipInfo; -@property (nonatomic, strong) NobleCenterModel *nobleInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m deleted file mode 100644 index 9c62c52..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m +++ /dev/null @@ -1,104 +0,0 @@ -// -// XPNobleCenterEntranceView.m -// xplan-ios -// -// Created by GreenLand on 2022/1/6. -// - -#import "XPNobleCenterEntranceView.h" -#import - -#import "NetImageView.h" -#import "UIImage+Utils.h" - - -@interface XPNobleCenterEntranceView () - -@property (nonatomic, strong) UIImageView *bgImageView; -@property (nonatomic, strong) UILabel *titleLabel; - -@end - -@implementation XPNobleCenterEntranceView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-11); - make.leading.mas_equalTo(4); - make.trailing.mas_equalTo(-4); - make.height.mas_equalTo(18); - }]; -} - -- (void)setVipInfo:(NobleInfo *)vipInfo { - _vipInfo = vipInfo; - if (vipInfo) { - self.titleLabel.text = vipInfo.vipName; - } -} --(void)setNobleInfoData:(NobleCenterModel *)nobleInfo{ - if (self.vipInfo) { - NSInteger distanceValue = 0; - NSInteger saveScore = 0; - NSInteger nextScore = 0; - NSString *nextLevelName = @""; - BOOL hadNextLevel = YES;//标记 - for (NobleInfo *info in nobleInfo.vipInfos) { - if (info.vipLevel == nobleInfo.currentLevel) { - saveScore = info.levelKeepScore; - nextScore = info.levelUpScore; - distanceValue = info.levelUpScore - nobleInfo.currScore; - } - if (info.vipLevel > nobleInfo.currentLevel && hadNextLevel) { - hadNextLevel = NO; - nextLevelName = info.vipName; - } - } - } -} - - -#pragma mark - Getters And Setters -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"me_bg_vip"] ]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _bgImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = kFontSemibold(14); - _titleLabel.textColor = UIColorFromRGB(0x4F3500); - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.text = YMLocalizedString(@"XPMineTheGuildCell2"); - _titleLabel.adjustsFontSizeToFitWidth = YES; - _titleLabel.numberOfLines = 0; - } - return _titleLabel; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterNavView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterNavView.h deleted file mode 100644 index 3615f1b..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterNavView.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// XPNobleCenterNavView.h -// xplan-ios -// -// Created by GreenLand on 2022/1/3. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class XPNobleCenterNavView; -@protocol XPNobleCenterNavViewDelegate - -///点击了返回按钮 -- (void)xPNobleCenterNavView:(XPNobleCenterNavView *)view didClickBackButton:(UIButton *)sender; -///点击了帮助按钮 -- (void)xPNobleCenterNavView:(XPNobleCenterNavView *)view didClickHelpButton:(UIButton *)sender; -///点击了设置按钮 -- (void)xPNobleCenterNavView:(XPNobleCenterNavView *)view didClickSettingButton:(UIButton *)sender; - -@end - - -@interface XPNobleCenterNavView : UIView - -///代理 -@property (nonatomic,weak) id delegate; -///是否隐藏设置按钮 -@property (nonatomic, assign) BOOL hideSettingBtn; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterNavView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterNavView.m deleted file mode 100644 index 4ce49b4..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterNavView.m +++ /dev/null @@ -1,133 +0,0 @@ -// -// XPNobleCenterNavView.m -// xplan-ios -// -// Created by GreenLand on 2022/1/3. -// - -#import "XPNobleCenterNavView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIButton+EnlargeTouchArea.h" - - -@interface XPNobleCenterNavView () -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///显示文本 -@property (nonatomic,strong) UILabel *titleLabel; -///帮助按钮 -@property (nonatomic, strong) UIButton *helpButton; -///设置按钮 -@property (nonatomic, strong) UIButton *settingButton; -@end - -@implementation XPNobleCenterNavView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Response -- (void)backButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNobleCenterNavView:didClickBackButton:)]) { - [self.delegate xPNobleCenterNavView:self didClickBackButton:sender]; - } -} -- (void)helpButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNobleCenterNavView:didClickHelpButton:)]) { - [self.delegate xPNobleCenterNavView:self didClickHelpButton:sender]; - } -} - -- (void)settingButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNobleCenterNavView:didClickSettingButton:)]) { - [self.delegate xPNobleCenterNavView:self didClickSettingButton:sender]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.backButton]; - [self addSubview:self.titleLabel]; - [self addSubview:self.helpButton]; - [self addSubview:self.settingButton]; -} - -- (void)initSubViewConstraints { - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; - [self.helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-15); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; - [self.settingButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.helpButton.mas_leading).mas_offset(-8); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; -} - -- (void)setHideSettingBtn:(BOOL)hideSettingBtn { - self.settingButton.hidden = hideSettingBtn; -} - -#pragma mark - Getters And Setters -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"home_search_white_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - _backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_backButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _backButton; -} - -- (UIButton *)helpButton { - if (!_helpButton) { - _helpButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_helpButton setImage:[UIImage imageNamed:@"noble_nav_help"] forState:UIControlStateNormal]; - _helpButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - [_helpButton addTarget:self action:@selector(helpButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_helpButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _helpButton; -} - -- (UIButton *)settingButton { - if (!_settingButton) { - _settingButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_settingButton setImage:[UIImage imageNamed:@"noble_nav_setting"] forState:UIControlStateNormal]; - _settingButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - [_settingButton addTarget:self action:@selector(settingButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_settingButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _settingButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - _titleLabel.text = YMLocalizedString(@"XPNobleCenterNavView0"); - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayCell.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayCell.h deleted file mode 100644 index ddf64cc..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPNobleCenterPayCell.h -// YuMi -// -// Created by duoban on 2023/7/12. -// - -#import - - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNobleCenterPayCell : UITableViewCell -@property(nonatomic,copy) UIImage *iconImage; -@property(nonatomic,copy) NSMutableAttributedString *titleAtt; -@property(nonatomic,assign) BOOL isChoose; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayCell.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayCell.m deleted file mode 100644 index b8af004..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayCell.m +++ /dev/null @@ -1,99 +0,0 @@ -// -// XPNobleCenterPayCell.m -// YuMi -// -// Created by duoban on 2023/7/12. -// - -#import "XPNobleCenterPayCell.h" -@interface XPNobleCenterPayCell() -@property(nonatomic,strong) UIImageView *iconView; -@property(nonatomic,strong) UILabel *titleView; -@property(nonatomic,strong) UIButton *selectBtn; -@end -@implementation XPNobleCenterPayCell --(instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{ - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} - --(void)installUI{ - self.backgroundColor = [UIColor whiteColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.contentView.backgroundColor = [UIColor whiteColor]; - [self.contentView addSubview:self.iconView]; - [self.contentView addSubview:self.titleView]; - [self.contentView addSubview:self.selectBtn]; -} --(void)installConstraints{ - [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(28); - make.leading.mas_equalTo(40); - make.centerY.equalTo(self.contentView); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.contentView); - make.leading.equalTo(self.iconView.mas_trailing).mas_offset(10); - make.trailing.equalTo(self.selectBtn.mas_leading).mas_offset(-kGetScaleWidth(10)); - }]; - [self.selectBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(20); - make.centerY.equalTo(self.contentView); - make.trailing.mas_equalTo(-38); - }]; -} --(void)setIconImage:(UIImage *)iconImage{ - _iconImage = iconImage; - _iconView.image = iconImage; -} --(void)setTitleAtt:(NSMutableAttributedString *)titleAtt{ - _titleAtt = titleAtt; - _titleView.attributedText = _titleAtt; -} --(void)setIsChoose:(BOOL)isChoose{ - _isChoose = isChoose; - self.selectBtn.selected = _isChoose; -} - -#pragma mark - 懒加载 -- (UIImageView *)iconView{ - if(!_iconView){ - _iconView = [UIImageView new]; - } - return _iconView; -} --(UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel new]; - _titleView.font = [UIFont systemFontOfSize:16 weight:UIFontWeightBold]; - _titleView.textColor = UIColorFromRGB(0x1F1B4F); - _titleView.adjustsFontSizeToFitWidth = YES; - } - return _titleView; -} -- (UIButton *)selectBtn{ - if(!_selectBtn){ - _selectBtn = [UIButton new]; - [_selectBtn setImage:kImage(@"mine_noble_center_pay_select") forState:UIControlStateSelected]; - [_selectBtn setImage:kImage(@"mine_noble_center_pay_no_select") forState:UIControlStateNormal]; - [_selectBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - _selectBtn.userInteractionEnabled = NO; - } - return _selectBtn; -} -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.h deleted file mode 100644 index ccdb364..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// XPNobleCenterPayView.h -// YuMi -// -// Created by duoban on 2023/7/12. -// - -#import -typedef enum : NSUInteger { - NobleCenterPayType_diamond, - NobleCenterPayType_Apple, - -} NobleCenterPayType; - -@protocol XPNobleCenterPayViewDelegate - --(void)payWithType:(NobleCenterPayType)type vipLevel:(NSString *_Nullable)vipLevel; - -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNobleCenterPayView : UIView -//钻石数量 -@property(nonatomic, copy)NSString *diamonds; -@property(nonatomic,weak) id delegate; -@property(nonatomic,copy) NSString *vipLevel; -@property(nonatomic, strong) NSNumber *money; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.m deleted file mode 100644 index 50e662a..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.m +++ /dev/null @@ -1,210 +0,0 @@ -// -// XPNobleCenterPayView.m -// YuMi -// -// Created by duoban on 2023/7/12. -// - -#import "XPNobleCenterPayView.h" -#import "XPNobleCenterPayCell.h" - - - - -@interface XPNobleCenterPayView() -@property(nonatomic,strong) UIView *bgView; -@property(nonatomic,strong) UITableView *tableView; -@property(nonatomic,strong) UILabel *titleView; -@property(nonatomic,strong) UILabel *diamondNumView; -@property(nonatomic,strong) UILabel *diamondNumTitle; -@property(nonatomic,strong) UIButton *payBtn; -@property(nonatomic,copy) NSArray *listData; -@property(nonatomic,strong) NSIndexPath *path; -@property(nonatomic,strong) UIButton *backBtn; -@property(nonatomic,assign) NobleCenterPayType type; -@end -@implementation XPNobleCenterPayView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.path = [NSIndexPath indexPathForRow:0 inSection:0]; - self.type = NobleCenterPayType_diamond; - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - [self addSubview:self.backBtn]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.diamondNumView]; - [self.bgView addSubview:self.diamondNumTitle]; - [self.bgView addSubview:self.tableView]; - [self.bgView addSubview:self.payBtn]; -} --(void)installConstraints{ - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - - - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.bottom.equalTo(self); - make.height.mas_equalTo(275); - }]; - - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(24); - make.centerX.equalTo(self.bgView); - }]; - [self.diamondNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(76); - make.centerX.equalTo(self.bgView); - }]; - [self.diamondNumTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(108); - make.centerX.equalTo(self.bgView); - }]; -// [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.top.mas_equalTo(138); -// make.leading.trailing.equalTo(self); -// make.bottom.mas_equalTo(-124); -// }]; - [self.payBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-58); - make.width.mas_equalTo(303); - make.height.mas_equalTo(48); - make.centerX.equalTo(self.bgView); - }]; -} -- (void)setMoney:(NSNumber *)money{ - _money = money; - self.diamondNumView.text = [NSString stringWithFormat:@"%@", _money]; -} --(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ - return self.listData.count; -} --(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - XPNobleCenterPayCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPNobleCenterPayCell class]) forIndexPath:indexPath]; - cell.isChoose = indexPath.row == self.path.row; - cell.iconImage = indexPath.row == 0 ? kImage( @"moli_money_icon") : kImage(@"noble_open_btn"); - NSString *num = [NSString stringWithFormat:@"（%@%@）",self.diamonds,YMLocalizedString(@"XPNobleCenterPayView1")]; - NSString *text = indexPath.row == 0 ? [NSString stringWithFormat:@"%@%@",self.listData[indexPath.row],num] : self.listData[indexPath.row]; - - NSMutableAttributedString *titleAtt = [[NSMutableAttributedString alloc]initWithString:text attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16 weight:UIFontWeightSemibold],NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)}]; - if(indexPath.row == 0){ - [titleAtt addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12 weight:UIFontWeightRegular],NSForegroundColorAttributeName:UIColorFromRGB(0x8A8CAB)} range:[text rangeOfString:num]]; - } - cell.titleAtt = titleAtt; - return cell; -} -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ - self.path = indexPath; - self.type = indexPath.row == 0 ? NobleCenterPayType_diamond : NobleCenterPayType_Apple; - self.diamondNumView.text = [NSString stringWithFormat:@"%@", _money]; //indexPath.row == 0 ? [NSString stringWithFormat:@"%.0f",_money.floatValue * 1000] : [NSString stringWithFormat:@"$%.2f",_money.floatValue]; - self.diamondNumTitle.text = indexPath.row == 0 ? YMLocalizedString(@"XPNobleCenterPayView1"):@""; - [self.tableView reloadData]; -} --(void)backAction{ - [self removeFromSuperview]; -} --(void)setDiamonds:(NSString *)diamonds{ - _diamonds = diamonds; - [self.tableView reloadData]; -} --(void)payBtnAction{ - [self backAction]; - if(self.delegate && [self.delegate respondsToSelector:@selector(payWithType:vipLevel:)]){ - [self.delegate payWithType:self.type vipLevel:self.vipLevel]; - } -} -#pragma mark - 懒加载 -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - [_bgView setCornerWithLeftTopCorner:28 rightTopCorner:28 bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth, 487)]; - } - return _bgView; -} -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel new]; - _titleView.text = YMLocalizedString(@"XPNobleCenterPayView0"); - _titleView.font = [UIFont systemFontOfSize:18 weight:UIFontWeightSemibold]; - _titleView.textColor = UIColorFromRGB(0x1F1B4F); - } - return _titleView; -} -- (UILabel *)diamondNumView{ - if(!_diamondNumView){ - _diamondNumView = [UILabel new]; - _diamondNumView.text = @"2990"; - _diamondNumView.font = [UIFont systemFontOfSize:28 weight:UIFontWeightSemibold]; - _diamondNumView.textColor = UIColorFromRGB(0x9168FA); - } - return _diamondNumView; -} -- (UILabel *)diamondNumTitle{ - if(!_diamondNumTitle){ - _diamondNumTitle = [UILabel new]; - _diamondNumTitle.text = YMLocalizedString(@"XPNobleCenterPayView1");; - _diamondNumTitle.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - _diamondNumTitle.textColor = UIColorFromRGB(0x8A8CAB); - } - return _diamondNumTitle; -} -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.rowHeight = 56; - - _tableView.backgroundColor = [UIColor whiteColor]; - [_tableView registerClass:[XPNobleCenterPayCell class] forCellReuseIdentifier:NSStringFromClass([XPNobleCenterPayCell class])]; - } - return _tableView; -} -- (UIButton *)payBtn{ - if(!_payBtn){ - _payBtn = [UIButton new]; - [_payBtn setTitle:YMLocalizedString(@"XPNobleCenterPayView3") forState:UIControlStateNormal]; - [_payBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _payBtn.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _payBtn.layer.cornerRadius = 24; - _payBtn.layer.masksToBounds = YES; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x5AECFA),UIColorFromRGB(0x9DB4FF),UIColorFromRGB(0xCF70FF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(303, 48)]; - [_payBtn setBackgroundImage:image forState:UIControlStateNormal]; - [_payBtn addTarget:self action:@selector(payBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _payBtn; -} -- (NSArray *)listData{ - if(!_listData){ -//#ifdef DEBUG - _listData = @[YMLocalizedString(@"XPNobleCenterPayView2")]; -//#else -// if(isEnterprise == YES){ -// _listData = @[YMLocalizedString(@"XPNobleCenterPayView2"),YMLocalizedString(@"XPNobleCenterWindow0")]; -// }else{ -// _listData = @[YMLocalizedString(@"XPNobleCenterPayView2")]; -// } -//#endif -// - } - return _listData; -} -- (UIButton *)backBtn{ - if(!_backBtn){ - _backBtn = [UIButton new]; - [_backBtn addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterResidueView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterResidueView.h deleted file mode 100644 index 41c86b3..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterResidueView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPNobleCenterResidueView.h -// xplan-ios -// -// Created by GreenLand on 2022/1/5. -// 剩余时间说明弹窗 - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNobleCenterResidueView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterResidueView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterResidueView.m deleted file mode 100644 index 5c9c107..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterResidueView.m +++ /dev/null @@ -1,102 +0,0 @@ -// -// XPNobleCenterResidueView.m -// xplan-ios -// -// Created by GreenLand on 2022/1/5. -// - -#import "XPNobleCenterResidueView.h" -#import "ThemeColor+NobleCenter.h" -///Third -#import -#import "TTPopup.h" - -@interface XPNobleCenterResidueView() - -@property (nonatomic, strong) UIImageView *bgImageView; - -@property (nonatomic, strong) UILabel *titleLabel; - -@property (nonatomic, strong) SZTextView *descView; - -@property (nonatomic, strong) UIButton *closeButton; - -@end - -@implementation XPNobleCenterResidueView - - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initViews]; - [self initConstraints]; - } - return self; -} - -#pragma mark - layout -- (void)initViews { - self.bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"noble_time_popBg"]]; - [self addSubview:self.bgImageView]; - - self.titleLabel = [[UILabel alloc] init]; - self.titleLabel.text = YMLocalizedString(@"XPNobleCenterResidueView0"); - self.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - self.titleLabel.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; - [self addSubview:self.titleLabel]; - - self.descView = [[SZTextView alloc] init]; - self.descView.userInteractionEnabled = NO; - self.descView.backgroundColor = [UIColor clearColor]; - self.descView.text = YMLocalizedString(@"XPNobleCenterResidueView1"); - self.descView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - self.descView.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; - [self addSubview:self.descView]; - - self.closeButton = [[UIButton alloc] init]; - [self.closeButton setBackgroundImage:[UIImage imageNamed:@"noble_time_close"] forState:UIControlStateNormal]; - [self addSubview:self.closeButton]; - [self.closeButton addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - - - for (id view in self.descView.subviews) { - if ([view isKindOfClass:[UITextView class]]){ - UITextView *textView = view; - textView.textAlignment = NSTextAlignmentLeft; - break; - } - } - -} - -- (void)onCloseButtonClick:(UIButton *)button { - [TTPopup dismiss]; -} - -- (void)initConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(24); - make.centerX.mas_equalTo(0); - make.height.mas_equalTo(18); - }]; - - [self.descView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(16); - make.centerX.mas_equalTo(0); - make.bottom.mas_equalTo(-22); - make.leading.trailing.mas_equalTo(self.bgImageView).inset(13); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(8); - make.trailing.mas_equalTo(-8); - make.width.height.mas_equalTo(22); - }]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.h deleted file mode 100644 index 9ae657b..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPNobleCenterTableHeadView.h -// xplan-ios -// -// Created by GreenLand on 2022/1/4. -// - -#import -#import "NobleCenterModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNobleCenterTableHeadView : UIView - -@property (nonatomic, strong) NobleInfo *vipInfo; - -///用户是否为当前等级 -@property (nonatomic, assign) BOOL isCurrentLevel; - -///当前权力值 -@property (nonatomic, assign) NSInteger currentScore; - -///当前用户是否开通了VIP -@property (nonatomic, assign) BOOL isOpenNoble; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.m deleted file mode 100644 index a28c603..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.m +++ /dev/null @@ -1,177 +0,0 @@ -// -// XPNobleCenterTableHeadView.m -// xplan-ios -// -// Created by GreenLand on 2022/1/4. -// - - -#import "XPNobleCenterTableHeadView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -//SVGA动画播放 -#import "SVGA.h" - -@interface XPNobleCenterTableHeadView () - -///VIP图标 -//@property (nonatomic, strong) NetImageView *iconImageView; -///VIPlogo -@property (nonatomic, strong) SVGAImageView *svgDisplayView; -///我的等级图标 -@property (nonatomic, strong) UIImageView *myLevelImageView; -///当前权力值 -@property (nonatomic, strong) UILabel *currentValueLabel; -///尚未开通VIP -@property (nonatomic, strong) UILabel *noOpenNobleLabel; - -@property (strong, nonatomic) SVGAParser *parser; - -@end - -@implementation XPNobleCenterTableHeadView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.svgDisplayView]; - [self addSubview:self.myLevelImageView]; - [self addSubview:self.currentValueLabel]; - [self addSubview:self.noOpenNobleLabel]; -} - -- (void)initSubViewConstraints { - CGFloat topMargin = 0; - if (kStatusBarHeight > 20) { - topMargin = KScreenWidth > 375 ? 12 : 0; - } else { - topMargin = KScreenWidth > 375 ? 32 : 12; - } - [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(topMargin); - make.centerX.mas_equalTo(self); - make.width.mas_equalTo(260); - make.height.mas_equalTo(155); - }]; - [self.noOpenNobleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.height.mas_equalTo(17); - make.bottom.mas_equalTo(self.currentValueLabel.mas_top).mas_offset(-3); - }]; - [self.myLevelImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self.currentValueLabel.mas_top).mas_offset(-3); - make.width.mas_equalTo(300); - make.height.mas_equalTo(22); - }]; - [self.currentValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.height.mas_equalTo(14); - make.bottom.mas_equalTo(-16); - }]; -} - -#pragma mark - Getters And Setters - -- (void)setVipInfo:(NobleInfo *)vipInfo { - @kWeakify(self); - [self.parser parseWithURL:[NSURL URLWithString:[vipInfo.vipLogo stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - self.svgDisplayView.loops = INT_MAX; - self.svgDisplayView.clearsAfterStop = NO; - self.svgDisplayView.videoItem = videoItem; - [self.svgDisplayView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { - }]; -} - -- (void)setIsOpenNoble:(BOOL)isOpenNoble { - _isOpenNoble = isOpenNoble; -} - -- (void)setIsCurrentLevel:(BOOL)isCurrentLevel { - _isCurrentLevel = isCurrentLevel; - if (isCurrentLevel) { - self.noOpenNobleLabel.hidden = YES; - self.myLevelImageView.hidden = NO; - self.currentValueLabel.hidden = NO; - } else { - if (self.isOpenNoble) { - self.noOpenNobleLabel.hidden = YES; - self.myLevelImageView.hidden = YES; - self.currentValueLabel.hidden = YES; - } else { - self.noOpenNobleLabel.hidden = NO; - self.myLevelImageView.hidden = YES; - self.currentValueLabel.hidden = YES; - } - } -} - -- (void)setCurrentScore:(NSInteger)currentScore { - _currentScore = currentScore; - if (self.isCurrentLevel) { - self.currentValueLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPNobleCenterTableHeadView0"), currentScore]; - } -} - -- (SVGAImageView *)svgDisplayView { - if (!_svgDisplayView) { - _svgDisplayView = [[SVGAImageView alloc] init]; - _svgDisplayView.contentMode = UIViewContentModeScaleAspectFit; - } - return _svgDisplayView; -} - -- (UILabel *)noOpenNobleLabel { - if (!_noOpenNobleLabel) { - _noOpenNobleLabel = [[UILabel alloc] init]; - _noOpenNobleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _noOpenNobleLabel.textAlignment = NSTextAlignmentCenter; - _noOpenNobleLabel.text = YMLocalizedString(@"XPNobleCenterTableHeadView1"); - _noOpenNobleLabel.textColor = UIColorFromRGB(0xB59862); - } - return _noOpenNobleLabel; -} - -- (UIImageView *)myLevelImageView { - if (!_myLevelImageView) { - _myLevelImageView = [[UIImageView alloc] initWithImage:[UIImage getLanguageImage:@"noble_myLevel_head"]]; - _myLevelImageView.contentMode = UIViewContentModeScaleAspectFit; - _myLevelImageView.hidden = YES; - } - return _myLevelImageView; -} - -- (UILabel *)currentValueLabel { - if (!_currentValueLabel) { - _currentValueLabel = [[UILabel alloc] init]; - _currentValueLabel.textAlignment = NSTextAlignmentCenter; - _currentValueLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _currentValueLabel.text = YMLocalizedString(@"XPNobleCenterTableHeadView2"); - _currentValueLabel.textColor = UIColorFromRGB(0xFFE7CF); - _currentValueLabel.hidden = YES; - } - return _currentValueLabel; -} - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterWindow.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterWindow.h deleted file mode 100644 index fc108f4..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterWindow.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPNobleCenterWindow.h -// YuMi -// -// Created by duoban on 2024/3/29. -// - -#import - -typedef void(^ConfirmBlcok)(void); - - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNobleCenterWindow : UIView -@property(nonatomic,copy) ConfirmBlcok confirmBlcok; -@property(nonatomic,copy) NSString *text; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterWindow.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterWindow.m deleted file mode 100644 index d8ebef8..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterWindow.m +++ /dev/null @@ -1,111 +0,0 @@ -// -// XPNobleCenterWindow.m -// YuMi -// -// Created by duoban on 2024/3/29. -// - -#import "XPNobleCenterWindow.h" -@interface XPNobleCenterWindow() -@property(nonatomic,strong) UIView *bgView; -@property(nonatomic,strong) UILabel *pi_textView; -@property(nonatomic,strong) UIButton *cancelBtn; -@property(nonatomic,strong) UIButton *confirmBtn; -@end -@implementation XPNobleCenterWindow - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.pi_textView]; - [self.bgView addSubview:self.cancelBtn]; - [self.bgView addSubview:self.confirmBtn]; -} --(void)installConstraints{ - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.equalTo(self); - make.width.mas_equalTo(kGetScaleWidth(319)); - make.height.mas_equalTo(kGetScaleWidth(176)); - }]; - [self.pi_textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(36)); - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(60)); - - }]; - [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(124)); - make.height.mas_equalTo(kGetScaleWidth(44)); - make.top.mas_equalTo(kGetScaleWidth(108)); - make.leading.mas_equalTo(kGetScaleWidth(28)); - }]; - [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.with.height.equalTo(self.cancelBtn); - make.trailing.mas_equalTo(-kGetScaleWidth(28)); - }]; -} --(void)cancelBtnAction{ - [TTPopup dismiss]; -} --(void)setText:(NSString *)text{ - _text = text; - _pi_textView.text = text; -} --(void)confirmBtnAction{ - [TTPopup dismiss]; - if (self.confirmBlcok){ - self.confirmBlcok(); - } -} -#pragma mark - 懒加载 -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(22) rightTopCorner:kGetScaleWidth(22) bottomLeftCorner:kGetScaleWidth(22) bottomRightCorner:kGetScaleWidth(22) size:CGSizeMake(kGetScaleWidth(319), kGetScaleWidth(176))]; - } - return _bgView; -} -- (UILabel *)pi_textView{ - if(!_pi_textView){ - _pi_textView = [UILabel labelInitWithText:@"" font:kFontRegular(14) textColor:UIColorFromRGB(0x1F1B4F)]; - _pi_textView.textAlignment = NSTextAlignmentCenter; - _pi_textView.numberOfLines = 0; - } - return _pi_textView; -} -- (UIButton *)cancelBtn{ - if(!_cancelBtn){ - _cancelBtn = [UIButton new]; - _cancelBtn.backgroundColor = UIColorFromRGB(0xE6E6F0); - [_cancelBtn setTitle:YMLocalizedString(@"XPMinePromptWindow2") forState:UIControlStateNormal]; - _cancelBtn.titleLabel.font = kFontMedium(16); - [_cancelBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_cancelBtn addTarget:self action:@selector(cancelBtnAction) forControlEvents:UIControlEventTouchUpInside]; - _cancelBtn.layer.cornerRadius = kGetScaleWidth(44)/2; - _cancelBtn.layer.masksToBounds = YES; - } - return _cancelBtn; -} -- (UIButton *)confirmBtn{ - if(!_confirmBtn){ - _confirmBtn = [UIButton new]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(124), kGetScaleWidth(44))]; - [_confirmBtn setBackgroundImage:image forState:UIControlStateNormal]; - [_confirmBtn setTitle:YMLocalizedString(@"XPNobleCenterWindow0") forState:UIControlStateNormal]; - _confirmBtn.titleLabel.font = kFontMedium(16); - [_confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_confirmBtn addTarget:self action:@selector(confirmBtnAction) forControlEvents:UIControlEventTouchUpInside]; - _confirmBtn.layer.cornerRadius = kGetScaleWidth(44)/2; - _confirmBtn.layer.masksToBounds = YES; - } - return _confirmBtn; -} -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeCell.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeCell.h deleted file mode 100644 index 3cc73c5..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeCell.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPNoblePrivilegeCell.h -// xplan-ios -// -// Created by GreenLand on 2022/1/4. -// - -#import -#import "NobleAuthInfo.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNoblePrivilegeCell : UICollectionViewCell - -@property (nonatomic, strong) NobleAuthInfo *vipInfo; -///是否是当前等级能点亮的 -@property (nonatomic, assign) BOOL isOwn; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeCell.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeCell.m deleted file mode 100644 index 874d7ae..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeCell.m +++ /dev/null @@ -1,112 +0,0 @@ -// -// XPNoblePrivilegeCell.m -// xplan-ios -// -// Created by GreenLand on 2022/1/4. -// - -#import "XPNoblePrivilegeCell.h" -///Third -#import -///Tool -#import "ThemeColor+NobleCenter.h" - -#import "NetImageView.h" - -@interface XPNoblePrivilegeCell() - -///特权icon -@property (nonatomic, strong) NetImageView *iconImageView; -///特权名称 -@property (nonatomic, strong) UILabel *privilegeLabel; -///特权描述 -@property (nonatomic, strong) UILabel *descLabel; - -@end - -@implementation XPNoblePrivilegeCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.iconImageView]; - [self.contentView addSubview:self.privilegeLabel]; - [self.contentView addSubview:self.descLabel]; - -} - -- (void)initSubViewConstraints { - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(0); - make.centerX.mas_equalTo(self); - make.width.height.mas_equalTo(46); - }]; - [self.privilegeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(3)); - make.top.mas_equalTo(self.iconImageView.mas_bottom).mas_offset(7); - - }]; - [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(3)); - make.top.mas_equalTo(self.privilegeLabel.mas_bottom).mas_offset(4); - - }]; -} - -#pragma mark - Getters And Setters -- (void)setVipInfo:(NobleAuthInfo *)vipInfo { - _vipInfo = vipInfo; - self.iconImageView.imageUrl = vipInfo.authIcon; - self.privilegeLabel.text = vipInfo.authName; - self.descLabel.text = vipInfo.authDesc; - if (self.isOwn) { - self.iconImageView.alpha = 1; - self.privilegeLabel.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; - self.descLabel.textColor = [DJDKMIMOMColor normalNobleTextColor]; - } else { - self.iconImageView.alpha = 0.5; - self.privilegeLabel.textColor = [DJDKMIMOMColor noContainTitleTextColor]; - self.descLabel.textColor = [DJDKMIMOMColor noContainDescTextColor]; - } -} - -- (NetImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[NetImageView alloc] init]; - _iconImageView.layer.cornerRadius = 23; - _iconImageView.layer.masksToBounds = YES; - } - return _iconImageView; -} - -- (UILabel *)privilegeLabel { - if (!_privilegeLabel) { - _privilegeLabel = [[UILabel alloc] init]; - _privilegeLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; - _privilegeLabel.textAlignment = NSTextAlignmentCenter; - _privilegeLabel.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; - _privilegeLabel.numberOfLines = 2; - } - return _privilegeLabel; -} - -- (UILabel *)descLabel { - if (!_descLabel) { - _descLabel = [[UILabel alloc] init]; - _descLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular]; - _descLabel.textAlignment = NSTextAlignmentCenter; - _descLabel.textColor = [DJDKMIMOMColor normalNobleTextColor]; - _descLabel.numberOfLines = 2; - } - return _descLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeContentCell.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeContentCell.h deleted file mode 100644 index 2cfdeeb..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeContentCell.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPNoblePrivilegeContentCell.h -// xplan-ios -// -// Created by GreenLand on 2022/1/4. -// - -#import -#import "NobleCenterModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNoblePrivilegeContentCell : UITableViewCell - -@property (nonatomic, strong) NobleInfo *vipInfo; - -@property (nonatomic, strong) NSMutableArray *vipAuthInfos; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeContentCell.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeContentCell.m deleted file mode 100644 index 4505871..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeContentCell.m +++ /dev/null @@ -1,248 +0,0 @@ -// -// XPNoblePrivilegeContentCell.m -// xplan-ios -// -// Created by GreenLand on 2022/1/4. -// - -#import "XPNoblePrivilegeContentCell.h" -///Third -#import -#import "TTPopup.h" -///Tool -#import "DJDKMIMOMColor.h" - -///View -#import "XPNoblePrivilegeCell.h" -#import "XPNobleAuthorityDescView.h" -#import "PINobleCenterListView.h" - -@interface XPNoblePrivilegeContentCell() - -@property (nonatomic, strong) UIImageView *bgImageView; -@property(nonatomic,strong) UIImageView *leftImageView; -@property(nonatomic,strong) UIImageView *rigthImageView; -@property(nonatomic,strong) UIButton *nobleBtn; -@property(nonatomic,strong) UIButton *rebateBtn; -///已有特权数量 -@property (nonatomic, strong) UILabel *privilegeLabel; - -@property (nonatomic, strong) UICollectionView *collectionView; -@property(nonatomic,strong) PINobleCenterListView *rebateView; -@property (nonatomic, strong) NSMutableArray *dataArray; - -@end - -@implementation XPNoblePrivilegeContentCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.layer.masksToBounds = YES; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.bgImageView]; - [self.contentView addSubview:self.leftImageView]; - [self.contentView addSubview:self.nobleBtn]; - [self.contentView addSubview:self.rebateBtn]; - [self.contentView addSubview:self.rigthImageView]; - - [self.contentView addSubview:self.privilegeLabel]; - [self.contentView addSubview:self.collectionView]; - [self.contentView addSubview:self.rebateView]; - self.contentView.backgroundColor = [UIColor clearColor]; -} - -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - - [self.nobleBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.contentView.mas_centerX).offset(-4); - make.width.mas_equalTo(76); - make.height.mas_equalTo(26); - make.top.mas_equalTo(25); - }]; - [self.rebateBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.contentView.mas_centerX).offset(4); - make.width.mas_equalTo(76); - make.height.mas_equalTo(26); - make.top.mas_equalTo(25); - }]; - [self.leftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(97); - make.height.mas_equalTo(14); - make.trailing.equalTo(self.nobleBtn.mas_leading).mas_offset(-3); - make.centerY.equalTo(self. nobleBtn); - }]; - [self.rigthImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(97); - make.height.mas_equalTo(14); - make.leading.equalTo(self.rebateBtn.mas_trailing).mas_offset(3); - make.centerY.equalTo(self. nobleBtn); - }]; - [self.privilegeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(60); - make.height.mas_equalTo(16); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(90); - make.leading.trailing.bottom.mas_equalTo(0); - }]; - [self.rebateView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.rebateBtn.mas_bottom).mas_offset(25); - make.leading.trailing.bottom.mas_equalTo(0); - }]; -} - -#pragma mark - UICollectionViewDataSource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.vipAuthInfos.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPNoblePrivilegeCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass(XPNoblePrivilegeCell.class) forIndexPath:indexPath]; - NobleAuthInfo *info = [self.vipAuthInfos xpSafeObjectAtIndex:indexPath.row]; - if ([self.vipInfo.ownAuthTypes containsObject:@(info.authType)]) { - cell.isOwn = YES; - }else{ - cell.isOwn = NO; - } - cell.vipInfo = info; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - NobleAuthInfo *info = [self.vipAuthInfos xpSafeObjectAtIndex:indexPath.row]; - XPNobleAuthorityDescView *alertView = [[XPNobleAuthorityDescView alloc] initWithFrame:CGRectMake(0, 0, 300, 286)]; - alertView.vipInfo = info; - TTPopupService * config = [[TTPopupService alloc] init]; - config.maskBackgroundAlpha = 0.6; - config.contentView = alertView; - [TTPopup popupWithConfig:config]; -} - -#pragma mark - Getters And Setters -- (void)setVipAuthInfos:(NSMutableArray *)vipAuthInfos { - _vipAuthInfos = [NSMutableArray arrayWithArray:vipAuthInfos]; - self.privilegeLabel.text = [NSString stringWithFormat:@"%zd/%zd", self.vipInfo.ownAuthTypes.count, self.vipAuthInfos.count]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.collectionView reloadData]; - }); - -} - -- (void)setVipInfo:(NobleInfo *)vipInfo { - _vipInfo = vipInfo; - self.rebateView.vipInfo = _vipInfo; -} --(void)clickBtnAction:(UIButton *)sender{ - if (sender == self.nobleBtn){ - self.collectionView.hidden = NO; - self.rebateView.hidden = YES; - self.privilegeLabel.hidden = NO; - self.nobleBtn.selected = YES; - self.nobleBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - self.rebateBtn.selected = NO; - self.rebateBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - return; - } - self.privilegeLabel.hidden = YES; - self.collectionView.hidden = YES; - self.rebateView.hidden = NO; - self.nobleBtn.selected = NO; - self.nobleBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - self.rebateBtn.selected = YES; - self.rebateBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; -} - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"noble_privilege_list_bg"]]; - _bgImageView.contentMode = UIViewContentModeScaleToFill; - } - return _bgImageView; -} - -- (UILabel *)privilegeLabel { - if (!_privilegeLabel) { - _privilegeLabel = [[UILabel alloc] init]; - _privilegeLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; - _privilegeLabel.textAlignment = NSTextAlignmentCenter; - _privilegeLabel.textColor = UIColorFromRGB(0xFFE7CF); - _privilegeLabel.text = @"0/12"; - } - return _privilegeLabel; -} - -- (UICollectionView *)collectionView { - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(KScreenWidth / 3, 125); - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 0; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - [_collectionView registerClass:XPNoblePrivilegeCell.class forCellWithReuseIdentifier:NSStringFromClass(XPNoblePrivilegeCell.class)]; - _collectionView.backgroundColor = [UIColor clearColor]; - } - return _collectionView; -} -- (UIImageView *)leftImageView{ - if(!_leftImageView){ - _leftImageView = [UIImageView new]; - _leftImageView.image = kImage(@"noble_privilege_list_left_icon"); - } - return _leftImageView; -} -- (UIImageView *)rigthImageView{ - if(!_rigthImageView){ - _rigthImageView = [UIImageView new]; - _rigthImageView.image = kImage(@"noble_privilege_list_rigth_icon"); - } - return _rigthImageView; -} -- (UIButton *)nobleBtn{ - if(!_nobleBtn){ - _nobleBtn = [UIButton new]; - [_nobleBtn setTitle:YMLocalizedString(@"XPNoblePrivilegeContentCell0") forState:UIControlStateNormal]; - [_nobleBtn setBackgroundImage:kImage(@"noble_privilege_list_noble_icon") forState:UIControlStateSelected]; - [_nobleBtn setBackgroundImage:kImage(@"noble_privilege_list_rebate_icon") forState:UIControlStateNormal]; - [_nobleBtn setTitleColor:UIColorFromRGB(0x333333) forState:UIControlStateSelected]; - [_nobleBtn setTitleColor:UIColorFromRGB(0x3B3224) forState:UIControlStateNormal]; - _nobleBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _nobleBtn.selected = YES; - [_nobleBtn addTarget:self action:@selector(clickBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _nobleBtn; -} -- (UIButton *)rebateBtn{ - if(!_rebateBtn){ - _rebateBtn = [UIButton new]; - [_rebateBtn setTitle:YMLocalizedString(@"XPNoblePrivilegeContentCell1") forState:UIControlStateNormal]; - [_rebateBtn setBackgroundImage:kImage(@"noble_privilege_list_rebate_icon") forState:UIControlStateNormal]; - [_rebateBtn setBackgroundImage:kImage(@"noble_privilege_list_noble_icon") forState:UIControlStateSelected]; - [_rebateBtn setTitleColor:UIColorFromRGB(0x333333) forState:UIControlStateSelected]; - [_rebateBtn setTitleColor:UIColorFromRGB(0x3B3224) forState:UIControlStateNormal]; - _rebateBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - [_rebateBtn addTarget:self action:@selector(clickBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _rebateBtn; -} -- (PINobleCenterListView *)rebateView{ - if(!_rebateView){ - _rebateView = [[PINobleCenterListView alloc]initWithFrame:CGRectZero]; - _rebateView.hidden = YES; - } - return _rebateView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleSettingNavView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleSettingNavView.h deleted file mode 100644 index 39ce985..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleSettingNavView.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// XPNobleSettingNavView.h -// xplan-ios -// -// Created by GreenLand on 2022/4/26. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class XPNobleSettingNavView; -@protocol XPNobleSettingNavViewDelegate - -///点击了返回按钮 -- (void)xPNobleSettingNavView:(XPNobleSettingNavView *)view didClickBackButton:(UIButton *)sender; - -@end - -@interface XPNobleSettingNavView : UIView -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///显示文本 -@property (nonatomic,strong) UILabel *titleLabel; -///代理 -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleSettingNavView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleSettingNavView.m deleted file mode 100644 index 9236e6f..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleSettingNavView.m +++ /dev/null @@ -1,81 +0,0 @@ -// -// XPNobleSettingNavView.m -// xplan-ios -// -// Created by GreenLand on 2022/4/26. -// - -#import "XPNobleSettingNavView.h" -///Third -#import -///Tool - -#import "UIButton+EnlargeTouchArea.h" - - -@interface XPNobleSettingNavView () - - -@end - -@implementation XPNobleSettingNavView - - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Response -- (void)backButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNobleSettingNavView:didClickBackButton:)]) { - [self.delegate xPNobleSettingNavView:self didClickBackButton:sender]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.backButton]; - [self addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; -} - -#pragma mark - Getters And Setters -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"home_search_white_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - _backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_backButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _backButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - _titleLabel.text = YMLocalizedString(@"XPNobleSettingNavView0"); - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.h deleted file mode 100644 index 1fa0f61..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPNobleUpgradeLevelView.h -// xplan-ios -// -// Created by GreenLand on 2022/1/6. -// VIP等级提升view - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class NobleLevelUpModel; -@interface XPNobleUpgradeLevelView : UIView - -@property (nonatomic, strong) NobleLevelUpModel *levelUpInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.m deleted file mode 100644 index 11998f9..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.m +++ /dev/null @@ -1,216 +0,0 @@ -// -// XPNobleUpgradeLevelView.m -// xplan-ios -// -// Created by GreenLand on 2022/1/6. -// - -#import "XPNobleUpgradeLevelView.h" -///tool -#import "ThemeColor+NobleCenter.h" -#import "Api+NobleCenter.h" - -//SVGA动画播放 -#import "SVGA.h" -///third -#import -#import "TTPopup.h" -#import "NetImageView.h" -///model -#import "NobleLevelUpModel.h" -///View -#import "XCCurrentVCStackManager.h" -#import "VIPCenterViewController.h" -#import "XPWebViewController.h" - -@interface XPNobleUpgradeLevelView () - -///背景 -@property (nonatomic, strong) UIImageView *bgImageView; -///VIPlogo -@property (nonatomic, strong) SVGAImageView *svgDisplayView; -///主标题 -@property (nonatomic, strong) UILabel *titleLabel; -///等级提升标题 -@property (nonatomic, strong) UILabel *subTitleLabel; -///关闭按钮 -@property (nonatomic, strong) UIButton *closeButton; -///前往VIP中心 -@property (nonatomic, strong) UIButton *jumpButton; - -@property (strong, nonatomic) SVGAParser *parser; -///保留原有装扮 -@property (nonatomic, strong) UIButton *keepOriginalButton; -///佩戴高等级装扮 -@property (nonatomic, strong) UIButton *dressHighLevelButton; - -@end - -@implementation XPNobleUpgradeLevelView - - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initViews]; - [self initConstraints]; - } - return self; -} - -#pragma mark - layout -- (void)initViews { - self.bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"noble_time_popBg"]]; - [self addSubview:self.bgImageView]; - - self.titleLabel = [[UILabel alloc] init]; - self.titleLabel.text = YMLocalizedString(@"XPNobleUpgradeLevelView0"); - self.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - self.titleLabel.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; - [self addSubview:self.titleLabel]; - - [self addSubview:self.svgDisplayView]; - - self.subTitleLabel = [[UILabel alloc] init]; - self.subTitleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - self.subTitleLabel.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; - self.subTitleLabel.numberOfLines = 0; - self.subTitleLabel.textAlignment = NSTextAlignmentCenter; - [self addSubview:self.subTitleLabel]; - - self.closeButton = [[UIButton alloc] init]; - [self.closeButton setBackgroundImage:[UIImage imageNamed:@"noble_time_close"] forState:UIControlStateNormal]; - [self addSubview:self.closeButton]; - [self.closeButton addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - - self.keepOriginalButton = [[UIButton alloc] init]; - [self.keepOriginalButton setBackgroundImage:[UIImage imageNamed:@"noble_upgrade_keepBtn"] forState:UIControlStateNormal]; - [self.keepOriginalButton setTitle:YMLocalizedString(@"XPNobleUpgradeLevelView1") forState:UIControlStateNormal]; - self.keepOriginalButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - [self.keepOriginalButton setTitleColor:[DJDKMIMOMColor hightNobleLightTextColor] forState:UIControlStateNormal]; - [self.keepOriginalButton addTarget:self action:@selector(onKeepButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - [self addSubview:self.keepOriginalButton]; - - self.dressHighLevelButton = [[UIButton alloc] init]; - [self.dressHighLevelButton setBackgroundImage:[UIImage imageNamed:@"noble_upgrade_dressBtn"] forState:UIControlStateNormal]; - [self.dressHighLevelButton setTitle:YMLocalizedString(@"XPNobleUpgradeLevelView2") forState:UIControlStateNormal]; - self.dressHighLevelButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - [self.dressHighLevelButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - [self.dressHighLevelButton addTarget:self action:@selector(onDressButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - [self addSubview:self.dressHighLevelButton]; - - self.jumpButton = [[UIButton alloc] init]; - [self.jumpButton setBackgroundImage:[UIImage imageNamed:@"noble_upgrade_jumpBtn"] forState:UIControlStateNormal]; - [self.jumpButton setTitle:YMLocalizedString(@"XPNobleUpgradeLevelView3") forState:UIControlStateNormal]; - self.jumpButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - [self.jumpButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - [self.jumpButton addTarget:self action:@selector(onJumpButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - [self addSubview:self.jumpButton]; -} - -- (void)initConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.trailing.mas_equalTo(0); - make.height.mas_equalTo(285); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(23); - make.centerX.mas_equalTo(0); - make.height.mas_equalTo(18); - }]; - [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom); - make.centerX.mas_equalTo(self.bgImageView); - make.width.mas_equalTo(182); - make.height.mas_equalTo(126); - }]; - - [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.svgDisplayView.mas_bottom); - make.centerX.mas_equalTo(self.bgImageView); - make.height.mas_equalTo(44); - make.leading.mas_equalTo(self.bgImageView).mas_offset(15); - }]; - - [self.keepOriginalButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.subTitleLabel.mas_bottom).mas_offset(14); - make.width.mas_equalTo(130); - make.height.mas_equalTo(44); - make.trailing.mas_equalTo(self.mas_centerX).mas_offset(-4); - }]; - - [self.dressHighLevelButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.keepOriginalButton); - make.width.mas_equalTo(130); - make.height.mas_equalTo(44); - make.leading.mas_equalTo(self.mas_centerX).mas_offset(4); - }]; - - [self.jumpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bgImageView.mas_bottom).mas_offset(22); - make.centerX.mas_equalTo(0); - make.width.mas_equalTo(204); - make.height.mas_equalTo(44); - }]; - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(8); - make.trailing.mas_equalTo(-8); - make.width.height.mas_equalTo(22); - }]; -} - -#pragma mark - events -- (void)onCloseButtonClick:(UIButton *)button { - [TTPopup dismiss]; -} - -- (void)onJumpButtonClick:(UIButton *)button { - [TTPopup dismiss]; -// VIPCenterViewController * nobleVC = [[VIPCenterViewController alloc] initWithRoomUid:-1]; -// [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:nobleVC animated:YES]; - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kVIP); - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; -} - -- (void)onKeepButtonClick:(UIButton *)button { - [Api requestRecoveryDress:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - [TTPopup dismiss]; - }]; -} - -- (void)onDressButtonClick:(UIButton *)button { - [TTPopup dismiss]; -} - -- (void)setLevelUpInfo:(NobleLevelUpModel *)levelUpInfo { - self.subTitleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPNobleUpgradeLevelView4"), levelUpInfo.vipName]; - @kWeakify(self); - [self.parser parseWithURL:[NSURL URLWithString:[levelUpInfo.vipLogo stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - self.svgDisplayView.loops = INT_MAX; - self.svgDisplayView.clearsAfterStop = NO; - self.svgDisplayView.videoItem = videoItem; - [self.svgDisplayView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { - }]; -} - -- (SVGAImageView *)svgDisplayView { - if (!_svgDisplayView) { - _svgDisplayView = [[SVGAImageView alloc] init]; - _svgDisplayView.contentMode = UIViewContentModeScaleAspectFit; - } - return _svgDisplayView; -} - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.h b/YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.h deleted file mode 100644 index 89ac7e3..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// ThemeColorNobleCenter.h -// xplan-ios -// -// Created by GreenLand on 2022/1/5. -// - -#import "DJDKMIMOMColor.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface DJDKMIMOMColor (NobleCenter) - -///普通文字颜色（0xBC9E66） -+ (UIColor *)normalNobleTextColor; - -///高亮文字颜色（0xFFE3AF） -+ (UIColor *)hightNobleLightTextColor; - -///VIP特权未点亮标题颜色（0x9F8052） -+ (UIColor *)noContainTitleTextColor; - -///VIP特权未点亮短描述颜色（0x8B7245） -+ (UIColor *)noContainDescTextColor; - -///VIP设置背景颜色（0x232017） -+ (UIColor *)nobleSettingBgColor; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.m b/YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.m deleted file mode 100644 index ca515c6..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// ThemeColorNobleCenter.m -// xplan-ios -// -// Created by GreenLand on 2022/1/5. -// - -#import "ThemeColor+NobleCenter.h" - -@implementation DJDKMIMOMColor (NobleCenter) - -///普通文字颜色（0xBC9E66） -+ (UIColor *)normalNobleTextColor { - return UIColorFromRGB(0xBC9E66); -} - -///高亮文字颜色（0xFFE3AF） -+ (UIColor *)hightNobleLightTextColor { - return UIColorFromRGB(0xFFE3AF); -} - -///VIP特权未点亮标题颜色（0x9F8052） -+ (UIColor *)noContainTitleTextColor { - return UIColorFromRGB(0x9F8052); -} - -///VIP特权未点亮短描述颜色（0x8B7245） -+ (UIColor *)noContainDescTextColor { - return UIColorFromRGB(0x8B7245); -} - -///VIP设置背景颜色（0x232017） -+ (UIColor *)nobleSettingBgColor { - return UIColorFromRGB(0x232017); -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.h b/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.h deleted file mode 100644 index 0ccd8f0..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// VIPCenterViewController.h -// YuMi -// -// Created by P on 2024/8/16. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface VIPCenterViewController : MvpViewController -- (instancetype)initWithRoomUid:(NSInteger)roomUid; -- (void)jumpToTargetVIP:(NSInteger)vipLevel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m b/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m deleted file mode 100644 index c60d62d..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m +++ /dev/null @@ -1,1223 +0,0 @@ -// -// VIPCenterViewController.m -// YuMi -// -// Created by P on 2024/8/16. -// - -#import "VIPCenterViewController.h" - -#import -#import -#import - -#import "YuMi-swift.h" -#import "XPWebViewController.h" -#import "XPIAPRechargeViewController.h" -#import "XPNobleSettingViewController.h" - -#import "Api+Main.h" -#import "Api+NobleCenter.h" -#import "XPNobleCenterPresenter.h" -#import "XPRoomGiftAnimationParser.h" - -#import "RechargeStorage.h" -#import "QGVAPConfigModel.h" -#import "XPNobleCenterProtocol.h" - -#import "SVGAImageView.h" -#import "TYCyclePagerView.h" -#import "XPNobleCenterWindow.h" -#import "XPNobleCenterPayView.h" -#import "XPNobleAuthorityDescView.h" - -#import "NobleInfo.h" -#import "UserInfoModel.h" -#import "AttachmentModel.h" -#import "WalletInfoModel.h" -#import "NobleCenterModel.h" -#import "RechargeListModel.h" - - -@interface VIPExclusivePrivilegesTitleCell: UICollectionViewCell - -@property (nonatomic, strong) UIStackView *titlesStack; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UILabel *exclusivePrivilegesCountLabel; -@property (nonatomic, strong) UIImageView *leftDecorateImageView; -@property (nonatomic, strong) UIImageView *rightDecorateImageView; - -@end - -@implementation VIPExclusivePrivilegesTitleCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - UIStackView *titlesStack = [[UIStackView alloc] init]; - titlesStack.axis = UILayoutConstraintAxisVertical; - UILabel *titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"VipCenter_3") - font:kFontBold(16) - textColor:[DJDKMIMOMColor colorWithHexString:@"#FFE3AF"]]; - [titlesStack addArrangedSubview:titleLabel]; - [titlesStack addArrangedSubview:self.exclusivePrivilegesCountLabel]; - [self.contentView addSubview:titlesStack]; - [titlesStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView); - make.centerX.mas_equalTo(self.contentView); - make.height.mas_equalTo(22 * 2); - }]; - - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(22); - }]; - - [self.exclusivePrivilegesCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(titleLabel); - }]; - - UIImageView *leftDecorateImageView = [[UIImageView alloc] initWithImage:kImage(@"vip_center_label_decorate")]; - [self.contentView addSubview:leftDecorateImageView]; - [leftDecorateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(titlesStack); - make.trailing.mas_equalTo(titlesStack.mas_leading).offset(-12); - make.size.mas_equalTo(CGSizeMake(43, 16)); - }]; - - UIImageView *rightDecorateImageView = [[UIImageView alloc] initWithImage:kImage(@"vip_center_label_decorate")]; - rightDecorateImageView.transform = CGAffineTransformMakeScale(-1.0, 1.0); - [self.contentView addSubview:rightDecorateImageView]; - [rightDecorateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(titlesStack); - make.leading.mas_equalTo(titlesStack.mas_trailing).offset(12); - make.size.mas_equalTo(CGSizeMake(43, 16)); - }]; - } - return self; -} - -- (UILabel *)exclusivePrivilegesCountLabel { - if (!_exclusivePrivilegesCountLabel) { - _exclusivePrivilegesCountLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(13) - textColor:[DJDKMIMOMColor colorWithHexString:@"#FFE3AF"]]; - _exclusivePrivilegesCountLabel.textAlignment = NSTextAlignmentCenter; - } - return _exclusivePrivilegesCountLabel; -} - -@end - - -@interface VIPIdentificationTitleCell: UICollectionViewCell -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UIImageView *leftDecorateImageView; -@property (nonatomic, strong) UIImageView *rightDecorateImageView; -@end - -@implementation VIPIdentificationTitleCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - UILabel *titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"VipCenter_4") - font:kFontBold(16) - textColor:[DJDKMIMOMColor colorWithHexString:@"#FFE3AF"]]; - [self.contentView addSubview:titleLabel]; - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerX.mas_equalTo(self.contentView); - make.height.mas_equalTo(22); - }]; - - UIImageView *leftDecorateImageView = [[UIImageView alloc] initWithImage:kImage(@"vip_center_label_decorate")]; - [self.contentView addSubview:leftDecorateImageView]; - [leftDecorateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(titleLabel); - make.trailing.mas_equalTo(titleLabel.mas_leading).offset(-12); - make.size.mas_equalTo(CGSizeMake(43, 16)); - }]; - - UIImageView *rightDecorateImageView = [[UIImageView alloc] initWithImage:kImage(@"vip_center_label_decorate")]; - rightDecorateImageView.transform = CGAffineTransformMakeScale(-1.0, 1.0); - [self.contentView addSubview:rightDecorateImageView]; - [rightDecorateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(titleLabel); - make.leading.mas_equalTo(titleLabel.mas_trailing).offset(12); - make.size.mas_equalTo(CGSizeMake(43, 16)); - }]; - } - return self; -} - -@end - -@interface VIPExclusivePrivilegesCard: UICollectionViewCell - -@property (nonatomic, assign) bool enable; -@property (nonatomic, assign) NSInteger index; -@property (nonatomic, strong) NobleAuthInfo *info; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) NetImageView *imageView; - -@property (nonatomic, copy) void(^didTapCard)(NSInteger index); - -@end - -@implementation VIPExclusivePrivilegesCard - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self.contentView addSubview:self.imageView]; - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerX.mas_equalTo(self.contentView); - make.width.height.mas_equalTo(kGetScaleWidth(42)); - }]; - - [self.contentView addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.centerX.mas_equalTo(self.contentView); - make.height.mas_equalTo(18); - }]; - - UIGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self - action:@selector(handleTapCardGesture)]; - [self addGestureRecognizer:tap]; - } - return self; -} - -- (void)handleTapCardGesture { - XPNobleAuthorityDescView *alertView = [[XPNobleAuthorityDescView alloc] initWithFrame:CGRectMake(0, 0, 300, 286)]; - alertView.vipInfo = self.info; - TTPopupService * config = [[TTPopupService alloc] init]; - config.maskBackgroundAlpha = 0.6; - config.contentView = alertView; - [TTPopup popupWithConfig:config]; -} - -- (void)setInfo:(NobleAuthInfo *)info { - _info = info; - - self.imageView.imageUrl = info.authIcon; - self.titleLabel.text = info.authName; -} - -- (void)setEnable:(bool)enable { - _enable = enable; - if (enable) { - self.imageView.alpha = 1; - self.titleLabel.alpha = 1; - } else { - self.imageView.alpha = 0.5; - self.titleLabel.alpha = 0.5; - } -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(13) - textColor:[DJDKMIMOMColor colorWithHexString:@"#FFE3AF"]]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (NetImageView *)imageView { - if (!_imageView) { - _imageView = [[NetImageView alloc] init]; - _imageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _imageView; -} - -@end - -@interface VIPIdentificationCard : UICollectionViewCell -@property (nonatomic, strong) UIImageView *bg; -@property (nonatomic, strong) NetImageView *imageView; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, assign) bool isPlaceHolder; - -- (void)updateTitle:(NSString *)title; -- (void)updateImage:(NSString *)imagePath; - -@end - -@implementation VIPIdentificationCard - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - UIImageView *bg = [[UIImageView alloc] initWithImage:kImage(@"vip_center_identification_card")]; - [self addSubview:bg]; - [bg mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - _bg = bg; - - [self.contentView addSubview:self.imageView]; - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(90)); - }]; - - [self.contentView addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(-13); - }]; - } - return self; -} - -- (void)setIsPlaceHolder:(bool)isPlaceHolder { - _isPlaceHolder = isPlaceHolder; - self.bg.hidden = isPlaceHolder; - self.imageView.hidden = isPlaceHolder; - self.titleLabel.hidden = isPlaceHolder; -} - -- (void)updateTitle:(NSString *)title { - self.titleLabel.text = title; -} - -- (void)updateImage:(NSString *)imagePath { - self.imageView.image = kImage(imagePath); -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(13) - textColor:[DJDKMIMOMColor colorWithHexString:@"#FFE3AF"]]; - } - return _titleLabel; -} - -- (NetImageView *)imageView { - if (!_imageView) { - _imageView = [[NetImageView alloc] init]; - _imageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _imageView; -} - -@end - -@interface VIPCardCyclePagerCell : UICollectionViewCell - -@property (nonatomic, assign) NSInteger cellIndex; -@property (nonatomic, copy) NSString *svgaPath; - -@property (nonatomic, strong) UIImageView *levelBgImageView; -@property (nonatomic, strong) UILabel *statusLabel; -@property (nonatomic, strong) NetImageView *placeHolderImageView; -@property (nonatomic, strong) VAPView *vapView; -@property (nonatomic, strong) XPRoomGiftAnimationParser *vapParser; - -@end - -@implementation VIPCardCyclePagerCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self setupCell]; - } - return self; -} - -- (void)dealloc -{ - [self.vapView stopHWDMP4]; - [self.vapView removeFromSuperview]; - self.vapView = nil; -} - -- (void)setupCell { - _levelBgImageView = [[UIImageView alloc] init]; - [self.contentView addSubview:_levelBgImageView]; - [_levelBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - _statusLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(12) - textColor:[DJDKMIMOMColor colorWithHexString:@"#4d1c1c"]]; - [self.contentView addSubview:_statusLabel]; - [_statusLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(18); - make.bottom.mas_equalTo(-26); - make.height.mas_equalTo(18); - }]; - - _placeHolderImageView = [[NetImageView alloc] init]; - _placeHolderImageView.contentMode = UIViewContentModeScaleAspectFill; - [self.contentView addSubview:_placeHolderImageView]; - [_placeHolderImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-13); - make.bottom.mas_equalTo(-25); - make.width.height.mas_equalTo(kGetScaleWidth(130)); - }]; - - _vapView = [[VAPView alloc] init]; - _vapView.contentMode = UIViewContentModeScaleAspectFill; - [self.contentView addSubview:_vapView]; - [_vapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(_placeHolderImageView); - make.bottom.mas_equalTo(_placeHolderImageView).offset(0); - make.width.height.mas_equalTo(kGetScaleWidth(130)); - }]; -} - -- (void)setCellIndex:(NSInteger)cellIndex { - _cellIndex = cellIndex; - NSString *imageName = [NSString stringWithFormat:@"vip_center_level_%ld", (long)(cellIndex+1)]; - UIImage *image = kImage(imageName); - [self.levelBgImageView setImage:image]; -} - -- (void)setPlaceHolderPath:(NSString *)placeHolderPath { - self.placeHolderImageView.imageUrl = [placeHolderPath stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; -} - -- (void)setDueDate:(NSString *)dateStr { - self.statusLabel.text = dateStr; -} - -- (void)setSvgaPath:(NSString *)svgaPath { - _svgaPath = [svgaPath pureURLString]; - if (svgaPath.length == 0) { - return; - } - - @kWeakify(self); - [self.vapParser parseWithURL:_svgaPath - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [self.vapView setMute:YES]; - [self.vapView playHWDMP4:videoUrl repeatCount:-1 delegate:self]; - self.placeHolderImageView.hidden = YES; - } - } failureBlock:^(NSError * _Nullable error) { - }]; - -} - -- (XPRoomGiftAnimationParser *)vapParser { - if (!_vapParser) { - _vapParser = [[XPRoomGiftAnimationParser alloc] init]; - } - return _vapParser; -} - -#pragma mark - HWDMP4PlayDelegate -//即将开始播放时询问，true马上开始播放，false放弃播放 -- (BOOL)shouldStartPlayMP4:(VAPView *)container config:(QGVAPConfigModel *)config { - return YES; -} - -- (void)viewDidFinishPlayMP4:(NSInteger)totalFrameCount view:(VAPView *)container { - -} - -- (void)viewDidStopPlayMP4:(NSInteger)lastFrameIndex view:(VAPView *)container { - -} -- (void)viewDidFailPlayMP4:(NSError *)error{ - self.placeHolderImageView.hidden = NO; -} - - -@end - - -@interface VIPCenterViewController () < -TYCyclePagerViewDataSource, -TYCyclePagerViewDelegate, -XPNobleCenterPayViewDelegate, -XPNobleCenterProtocol, -NIMSystemNotificationManagerDelegate, -UICollectionViewDelegateFlowLayout, -UICollectionViewDataSource> - -@property (nonatomic, strong) UIButton *backButton; -@property (nonatomic, strong) UILabel *titleLabel; - -@property (nonatomic, strong) TYCyclePagerView *vipCardCyclePager; - -@property (nonatomic, strong) UserInfoModel *userInfo; -@property (nonatomic, strong) UserVipInfoVo *userVIPInfo; -@property (nonatomic, strong) NobleInfo *currentVIPInfo; -@property (nonatomic, strong) NobleCenterModel *vipModel; -@property (nonatomic, strong) WalletInfoModel *walletInfo; - -@property (nonatomic, copy) NSArray *exclusivePrivilegesCards; - -@property (nonatomic, strong) UICollectionView *identificationCollectionView; -@property (nonatomic, strong) UICollectionView *exclusivePrivilegesCollectionView; - -@property (nonatomic, strong) UIView *purchaseContainer; -@property (nonatomic, strong) UILabel *purchaseExpiresLabel; -@property (nonatomic, strong) UILabel *purchasePriceLabel; -@property (nonatomic, strong) UILabel *purchaseNoticeLabel; - -@property (nonatomic, copy) NSArray *vipIdentificationInfoArray; -@property (nonatomic, copy) NSArray *displayVipIdentificationInfoArray; -@property (nonatomic, copy) NSArray *vipExclusivePrivilegesInfoArray; - -@property (nonatomic, assign) NSInteger roomUid; - -@property (nonatomic, copy) NSString *exclusivePrivilegesSubTitle; - -@property (nonatomic, assign) NSInteger targetVIPLevel; - -@end - -@implementation VIPCenterViewController - -- (instancetype)initWithRoomUid:(NSInteger)roomUid { - if (self = [super init]) { - self.targetVIPLevel = -1; - self.roomUid = roomUid; - } - return self; -} - -- (void)jumpToTargetVIP:(NSInteger)vipLevel { - self.targetVIPLevel = vipLevel; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - [self setupUI]; - [self setupNIM]; - [self setupData]; -} - -- (XPNobleCenterPresenter *)createPresenter { - return [[XPNobleCenterPresenter alloc] init]; -} - -#pragma mark - Setup -- (void)setupNIM { - [[NIMSDK sharedSDK].systemNotificationManager addDelegate:self]; -} - -- (void)setupUI { - [self setupBG]; - [self setupNavigationBar]; - [self setupVIPCardCyclePager]; - [self setupScrollContent]; - [self setupPurchaseArea]; -} - -- (void)setupBG { - self.view.backgroundColor = [DJDKMIMOMColor colorWithHexString:@"#150c00"]; - - UIImageView *bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"vip_center_background"]]; - [self.view addSubview:bgImageView]; - [bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(350)); - }]; -} - -- (void)setupVIPCardCyclePager { - [self.view addSubview:self.vipCardCyclePager]; - [self.vipCardCyclePager mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(11); - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(136 + 36 + 51)); - }]; -} - -- (void)setupNavigationBar { - [self.view addSubview:self.titleLabel]; - [self.view addSubview:self.backButton]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.view).offset(44 + 11); - make.height.mas_equalTo(22); - }]; - - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).offset(16); - make.centerY.mas_equalTo(self.titleLabel); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; -} - -- (void)setupScrollContent { - [self.view addSubview:self.identificationCollectionView]; - [self.identificationCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.vipCardCyclePager.mas_bottom); - }]; -} - -- (void)setupPurchaseArea { - UIImageView *purchaseArea = [[UIImageView alloc] initWithImage:kImage(@"vip_center_purchase_bg")]; - purchaseArea.userInteractionEnabled = YES; - [self.view addSubview:purchaseArea]; - [purchaseArea mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.view).offset(-26); - make.leading.mas_equalTo(self.view).offset(16); - make.trailing.mas_equalTo(self.view).offset(-16); - make.height.mas_equalTo(kGetScaleWidth(54)); - }]; - - _purchaseContainer = [[UIView alloc] init]; - [purchaseArea addSubview:_purchaseContainer]; - [_purchaseContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(purchaseArea); - }]; - - UIButton *purchaseButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [purchaseButton setTitle:YMLocalizedString(@"VipCenter_2") - forState:UIControlStateNormal]; - [purchaseButton setTitleColor:[DJDKMIMOMColor colorWithHexString:@"#633000"] - forState:UIControlStateNormal]; - [purchaseButton setBackgroundImage:kImage(@"vip_center_purchase_button_bg") - forState:UIControlStateNormal]; - [purchaseButton.titleLabel setFont:kFontSemibold(16)]; - [purchaseButton addTarget:self - action:@selector(didTapPurchaseButton) - forControlEvents:UIControlEventTouchUpInside]; - [_purchaseContainer addSubview:purchaseButton]; - [purchaseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.trailing.mas_equalTo(-3); - make.top.mas_equalTo(3); - make.width.mas_equalTo(kGetScaleWidth(146)); - }]; - - UIImageView *coin = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - [_purchaseContainer addSubview:coin]; - [coin mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.purchaseContainer); - make.leading.mas_equalTo(16); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(20), kGetScaleWidth(20))); - }]; - - [_purchaseContainer addSubview:self.purchasePriceLabel]; - [self.purchasePriceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(coin.mas_trailing).offset(4); - make.centerY.mas_equalTo(coin); - make.trailing.mas_equalTo(purchaseButton.mas_leading); - }]; - - [_purchaseContainer addSubview:self.purchaseExpiresLabel]; - [self.purchaseExpiresLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(coin); - make.top.mas_equalTo(coin.mas_bottom).offset(4); - make.trailing.mas_equalTo(purchaseButton.mas_leading); - }]; - - [purchaseArea addSubview:self.purchaseNoticeLabel]; - [self.purchaseNoticeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(purchaseArea); - }]; -} - -#pragma mark - Config & Update UI -- (void)configVIPCards { - [self.vipCardCyclePager reloadData]; - - if (self.targetVIPLevel >= 0 && self.targetVIPLevel <= 9) { - [self.vipCardCyclePager scrollToItemAtIndex:self.targetVIPLevel-1 animate:NO]; - self.targetVIPLevel = -1; - } else { - if (self.userVIPInfo) { - [self.vipCardCyclePager scrollToItemAtIndex:self.userVIPInfo.vipLevel-1 animate:NO]; - } - } -} - -- (void)configIdentificationCards { - NSInteger currentVIPLevel = self.currentVIPInfo.vipLevel; - __block NSMutableArray *tempArray = @[].mutableCopy; - [self.vipIdentificationInfoArray enumerateObjectsUsingBlock:^(NobleAuthInfo * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - switch (currentVIPLevel) { - case 1: { - if (obj.authType == 1 || obj.authType == 2) { - [tempArray addObject:obj]; - } - } - break; - case 2:{ - if (obj.authType == 1 || obj.authType == 2 || obj.authType == 5) { - [tempArray addObject:obj]; - } - } - break; - case 3:{ - if (obj.authType == 1 || obj.authType == 2 || obj.authType == 5 || obj.authType == 8) { - [tempArray addObject:obj]; - } - } - break; - case 4:{ - if (obj.authType == 1 || - obj.authType == 2 || - obj.authType == 5 || - obj.authType == 8 || - obj.authType == 11) { - [tempArray addObject:obj]; - } - } - break; - case 5: - case 6: - case 7: - case 8: - case 9: - default:{ - if (obj.authType == 1 || - obj.authType == 2 || - obj.authType == 5 || - obj.authType == 8 || - obj.authType == 11 || - obj.authType == 12 ) { - [tempArray addObject:obj]; - } - } - break; - } - }]; - self.displayVipIdentificationInfoArray = tempArray.copy; -} - -- (void)configExclusivePrivilegesArea { - int itemsPerRow = 3; - NSMutableArray *tempArray = @[].mutableCopy; - for (int row = 0; row < (self.vipExclusivePrivilegesInfoArray.count + itemsPerRow - 1)/itemsPerRow; row++) { - for (int col = 0; col < itemsPerRow; col++) { - int index = row * itemsPerRow + col; - if (index < self.vipExclusivePrivilegesInfoArray.count) { - NobleAuthInfo *info = [self.vipExclusivePrivilegesInfoArray xpSafeObjectAtIndex:index]; - [tempArray addObject:info]; - } - } - } - - self.exclusivePrivilegesCards = tempArray.copy; - - [self updateExclusivePrivilegesArea]; -} - -- (void)updateExclusivePrivilegesArea { - NSInteger enableCount = 0; - if (self.currentVIPInfo) { - for (NobleAuthInfo *info in self.exclusivePrivilegesCards) { - if ([self.currentVIPInfo.ownAuthTypes containsObject:@(info.authType)]) { - enableCount++; - } - } - } - self.exclusivePrivilegesSubTitle = [NSString stringWithFormat:@"(%ld/%ld)", enableCount, self.vipExclusivePrivilegesInfoArray.count]; -} - -- (void)updatePurchaseArea { - if (self.userInfo == nil) { - return; - } - - [self.identificationCollectionView reloadData]; - - if (self.currentVIPInfo.buyAmount == 0) { - self.purchaseNoticeLabel.text = [NSString stringWithFormat:YMLocalizedString(@"VipCenter_7"), self.currentVIPInfo.vipLevel]; - self.purchaseNoticeLabel.hidden = NO; - self.purchaseContainer.hidden = YES; - } else { - self.purchaseNoticeLabel.hidden = YES; - self.purchaseContainer.hidden = NO; - self.purchasePriceLabel.text = [NSString stringWithFormat:@"%ld/30 %@", self.currentVIPInfo.buyAmount, YMLocalizedString(@"VipCenter_0")]; - - self.purchaseExpiresLabel.text = [NSString stringWithFormat:@"%@ %@", [self calNext30Day], YMLocalizedString(@"VipCenter_1")]; - } -} - -- (NSString *)calNextVIPExpiredSeconds:(NSInteger)seconds { - NSDate *date = [NSDate date]; - NSDate *nextDate = [date dateByAddingSeconds:seconds]; - return [NSDate timestampSwitchTime:nextDate.timeIntervalSince1970 - formatter:@"yyyy-MM-dd"]; -} - -- (NSString *)calNext30Day { - NSDate *date = [NSDate date]; - NSDate *next30Date = [date dateByAddingDays:30]; - return [NSDate timestampSwitchTime:next30Date.timeIntervalSince1970 - formatter:@"yyyy/MM/dd 00:00"]; -} - -#pragma mark - Load Data from API -- (void)setupData { - [self showLoading]; - [self loadUserInfo]; -// [self loadWalletInfo]; -} - -- (void)loadUserInfo { - NSString * uid = [[AccountInfoStorage instance] getUid]; - @kWeakify(self); - [Api getUserInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - UserInfoModel *infoModel = [UserInfoModel modelWithDictionary:data.data]; - self.userInfo = infoModel; - self.userVIPInfo = infoModel.userVipInfoVO; - - [self loadVIPCenterInfo]; - [self updatePurchaseArea]; - } else { - if (msg.length > 0) { - [self showErrorToast:msg]; - } else { - [self hideHUD]; - } - } - } uid:uid]; -} - -- (void)loadWalletInfo { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - @kWeakify(self); - [Api getUserWalletInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if(code == 200){ - WalletInfoModel *infoModel = [WalletInfoModel modelWithDictionary:data.data]; - self.walletInfo = infoModel; - } - } uid:uid ticket:ticket]; -} - -- (void)loadVIPCenterInfo { - @kWeakify(self); - [Api vipCenterLevelList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - NobleCenterModel *model = [NobleCenterModel modelWithDictionary:data.data]; - self.vipModel = model; - - __block NSMutableArray *tempArray_1 = @[].mutableCopy; - __block NSMutableArray *tempArray_2 = @[].mutableCopy; - [model.vipAuthInfos enumerateObjectsUsingBlock:^(NobleAuthInfo * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.authType == 1 || obj.authType == 2 || obj.authType == 5 || obj.authType == 8 || obj.authType == 11 || obj.authType == 12) { - [tempArray_1 addObject:obj]; - } else { - [tempArray_2 addObject:obj]; - } - }]; - self.vipIdentificationInfoArray = tempArray_1.copy; - self.vipExclusivePrivilegesInfoArray = model.vipAuthInfos.copy; - - if (self.userVIPInfo) { - self.currentVIPInfo = [self.vipModel.vipInfos xpSafeObjectAtIndex:self.userVIPInfo.vipLevel - 1]; - } else { - self.currentVIPInfo = [self.vipModel.vipInfos firstObject]; - } - - [self configVIPCards]; - [self configIdentificationCards]; - [self configExclusivePrivilegesArea]; - [self updatePurchaseArea]; - - [self hideHUD]; - } else { - if (msg.length > 0) { - [self showErrorToast:msg]; - } else { - [self hideHUD]; - } - } - }]; -} - -#pragma mark - Button Actions -- (void)didTapBackButton { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)didTapPurchaseButton { - if (self.userInfo.userVipInfoVO.vipLevel > 0) { - XPNobleCenterWindow *window = [[XPNobleCenterWindow alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - [TTPopup popupView:window style:TTPopupStyleAlert]; - window.text = [NSString stringWithFormat:YMLocalizedString(@"XPNobleCenterWindow1"),self.userInfo.userVipInfoVO.vipName, self.currentVIPInfo.vipName]; - @kWeakify(self); - window.confirmBlcok = ^{ - @kStrongify(self); - XPNobleCenterPayView *payView = [[XPNobleCenterPayView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - payView.money = @(self.currentVIPInfo.buyAmount); -// payView.diamonds = self.walletInfo.diamonds; - payView.vipLevel = @(self.currentVIPInfo.vipLevel).stringValue; - payView.delegate = self; - [self.view addSubview:payView]; - }; - } else { - XPNobleCenterPayView *payView = [[XPNobleCenterPayView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - payView.money = @(self.currentVIPInfo.buyAmount); - payView.diamonds = self.walletInfo.diamonds; - payView.vipLevel = @(self.currentVIPInfo.vipLevel).stringValue; - payView.delegate = self; - [self.view addSubview:payView]; - } -} - -#pragma mark - TYCyclePagerView Delegate & DataSource -- (NSInteger)numberOfItemsInPagerView:(TYCyclePagerView *)pageView { - return self.vipModel.vipInfos.count;//9; -} - -- (TYCyclePagerViewLayout *)layoutForPagerView:(TYCyclePagerView *)pageView { - TYCyclePagerViewLayout *layout = [[TYCyclePagerViewLayout alloc]init]; - layout.layoutType = TYCyclePagerTransformLayoutLinear; - layout.itemSize = CGSizeMake(kGetScaleWidth(320), kGetScaleWidth(136)); - layout.itemSpacing = 15; - layout.sectionInset = UIEdgeInsetsMake(0, 40, 0, 40); - return layout; -} - -- (__kindof UICollectionViewCell *)pagerView:(TYCyclePagerView *)pagerView - cellForItemAtIndex:(NSInteger)index { - VIPCardCyclePagerCell *cell = [pagerView dequeueReusableCellWithReuseIdentifier:@"VIPCardCyclePagerCell" forIndex:index]; - cell.cellIndex = index; - if (self.vipModel) { - NobleInfo *info = [self.vipModel.vipInfos xpSafeObjectAtIndex:index]; - if (info) { - cell.svgaPath = info.vipLogo; - [cell setPlaceHolderPath:info.vipIcon]; - - if (info.remainSeconds > 0) { - [cell setDueDate:[NSString stringWithFormat:YMLocalizedString(@"VipCenter_6"), [self calNextVIPExpiredSeconds:info.remainSeconds]]]; - } else { - [cell setDueDate:[NSString stringWithFormat:YMLocalizedString(@"VipCenter_5"), index + 1]]; - } - } - } - return cell; -} - -- (void)pagerView:(TYCyclePagerView *)pageView didScrollFromIndex:(NSInteger)fromIndex toIndex:(NSInteger)toIndex { - - self.currentVIPInfo = [self.vipModel.vipInfos xpSafeObjectAtIndex:toIndex]; - - [self configIdentificationCards]; - [self configExclusivePrivilegesArea]; - [self updateExclusivePrivilegesArea]; - [self updatePurchaseArea]; -} - -#pragma mark - XPNobleCenterPayViewDelegate -- (void)payWithType:(NobleCenterPayType)type vipLevel:(NSString * _Nullable)vipLevel{ - if(type == NobleCenterPayType_diamond){ - NSString *roomUid = self.roomUid > 0 ? @(self.roomUid).stringValue : @(self.userInfo.uid).stringValue; - [self.presenter openVipWithDiamondRoomUid:roomUid vipLevel:vipLevel]; - } -} - -#pragma mark - UICollectionView Delegate & DataSource -- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView { - return 4; -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { - switch (section) { - case 0: - return 0; - break; - case 1: - return 12; - break; - case 2: - return 0; - break; - case 3: - return 28; - break; - - default: - return 8; - break; - } -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { - switch (section) { - case 0: - return 0; - break; - case 1: - return 12; - break; - case 2: - return 0; - break; - case 3: - return kGetScaleWidth(84); - break; - - default: - return 8; - break; - } -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - switch (section) { - case 0: - return 1; - break; - case 1: - return self.displayVipIdentificationInfoArray.count; - break; - case 2: - return 1; - break; - case 3: - return self.vipExclusivePrivilegesInfoArray.count; - break; - - default: - return 0; - break; - } -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - switch (indexPath.section) { - case 0: - return CGSizeMake(KScreenWidth, 30); - break; - case 1: - return CGSizeMake(kGetScaleWidth(166), kGetScaleWidth(120)); - break; - case 2: - return CGSizeMake(KScreenWidth, 60); - break; - case 3: - return CGSizeMake(42, 42 + 4 + 18); - break; - - default: - return CGSizeZero; - break; - } -} - -- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section { - switch (section) { - case 0: - return UIEdgeInsetsMake(10, 0, 10, 0); - break; - case 1: - if (iPhoneXSeries) { - return UIEdgeInsetsMake(0, 16, 0, 16); - } else { - return UIEdgeInsetsMake(0, 6, 0, 6); - } - break; - case 2: - return UIEdgeInsetsMake(14, 0, 6, 0); - break; - case 3: - return UIEdgeInsetsMake(0, 40, 100, 40); - break; - - default: - return UIEdgeInsetsZero; - break; - } -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView - cellForItemAtIndexPath:(NSIndexPath *)indexPath { - NSInteger currentVIPLevel = self.currentVIPInfo.vipLevel; - - switch (indexPath.section) { - case 0: { - VIPIdentificationTitleCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([VIPIdentificationTitleCell class]) - forIndexPath:indexPath]; - return cell; - } - return [UICollectionViewCell new]; - break; - case 1: { - VIPIdentificationCard *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([VIPIdentificationCard class]) - forIndexPath:indexPath]; - NobleAuthInfo *info = [self.displayVipIdentificationInfoArray xpSafeObjectAtIndex:indexPath.row]; - [cell updateTitle:info.authName]; - switch (info.authType) { - case 1: - [cell updateImage:[NSString stringWithFormat:@"vip_center_id_level_%ld", currentVIPLevel]]; - break; - case 2: - [cell updateImage:[NSString stringWithFormat:@"vip_center_avatar_level_%ld", currentVIPLevel]]; - break; - case 5: - [cell updateImage:[NSString stringWithFormat:@"vip_center_room_card_level_%ld", currentVIPLevel]]; - break; - case 8: - [cell updateImage:[NSString stringWithFormat:@"vip_center_wave_level_%ld", currentVIPLevel]]; - break; - case 11: - [cell updateImage:[NSString stringWithFormat:@"vip_center_bubbles_level_%ld", currentVIPLevel]]; - break; - case 12: - [cell updateImage:[NSString stringWithFormat:@"vip_center_entry_level_%ld", currentVIPLevel]]; - break; - - default: - break; - } - return cell; - } - break; - case 2: { - VIPExclusivePrivilegesTitleCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([VIPExclusivePrivilegesTitleCell class]) - forIndexPath:indexPath]; - cell.exclusivePrivilegesCountLabel.text = self.exclusivePrivilegesSubTitle; - return cell; - } - break; - case 3: { - VIPExclusivePrivilegesCard *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([VIPExclusivePrivilegesCard class]) - forIndexPath:indexPath]; - NobleAuthInfo *info = [self.vipExclusivePrivilegesInfoArray xpSafeObjectAtIndex:indexPath.row]; - cell.info = info; - cell.enable = [self.currentVIPInfo.ownAuthTypes containsObject:@(info.authType)]; - return cell; - } - break; - - default: - return [UICollectionViewCell new]; - break; - } -} - -#pragma mark - Purchase & Recharge -- (void)openVipWithDiamondSuccess { - [self setupData]; -} - -- (void)openVipWithDiamondFail:(NSInteger)code { - if(code == 31005){ - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"UserDetail_CP_Toast_0"); - config.message = YMLocalizedString(@"XPNobleCenterViewController3"); - config.actionStyle = TTAlertActionBothStyle; - [TTPopup alertWithConfig:config showBorder:NO confirmHandler:^{ - XPIAPRechargeViewController * webVC =[[XPIAPRechargeViewController alloc] init]; - webVC.type = @"4"; - [self.navigationController pushViewController:webVC animated:YES]; - } cancelHandler:^{ - - }]; - } -} - -#pragma mark - Properties -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[kImage(@"vip_center_back_button") ms_SetImageForRTL] - forState:UIControlStateNormal]; - [_backButton addTarget:self - action:@selector(didTapBackButton) - forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _titleLabel.text = YMLocalizedString(@"XPNobleCenterNavView0"); - _titleLabel.textColor = [DJDKMIMOMColor colorWithHexString:@"#FFE3AF"]; - } - return _titleLabel; -} - -- (TYCyclePagerView *)vipCardCyclePager { - if (!_vipCardCyclePager) { - _vipCardCyclePager = [[TYCyclePagerView alloc] init]; - _vipCardCyclePager.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - _vipCardCyclePager.collectionView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - _vipCardCyclePager.backgroundColor = [UIColor clearColor]; - _vipCardCyclePager.backgroundView = nil; - _vipCardCyclePager.isInfiniteLoop = NO; - _vipCardCyclePager.autoScrollInterval = -1; - _vipCardCyclePager.dataSource = self; - _vipCardCyclePager.delegate = self; - [_vipCardCyclePager registerClass:[VIPCardCyclePagerCell class] - forCellWithReuseIdentifier:@"VIPCardCyclePagerCell"]; - } - return _vipCardCyclePager; -} - -- (UICollectionView *)identificationCollectionView { - if (!_identificationCollectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(kGetScaleWidth(166), kGetScaleWidth(120)); - layout.minimumInteritemSpacing = 12; - layout.minimumLineSpacing = 12; - _identificationCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero - collectionViewLayout:layout]; - _identificationCollectionView.backgroundColor = [UIColor clearColor]; - _identificationCollectionView.delegate = self; - _identificationCollectionView.dataSource = self; - [_identificationCollectionView registerClass:[VIPIdentificationTitleCell class] - forCellWithReuseIdentifier:NSStringFromClass([VIPIdentificationTitleCell class])]; - [_identificationCollectionView registerClass:[VIPExclusivePrivilegesTitleCell class] - forCellWithReuseIdentifier:NSStringFromClass([VIPExclusivePrivilegesTitleCell class])]; - [_identificationCollectionView registerClass:[VIPIdentificationCard class] - forCellWithReuseIdentifier:NSStringFromClass([VIPIdentificationCard class])]; - [_identificationCollectionView registerClass:[VIPExclusivePrivilegesCard class] - forCellWithReuseIdentifier:NSStringFromClass([VIPExclusivePrivilegesCard class])]; - } - return _identificationCollectionView; -} - -- (UILabel *)purchasePriceLabel { - if (!_purchasePriceLabel) { - _purchasePriceLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(15) - textColor:[DJDKMIMOMColor colorWithHexString:@"#FFE3AF"]]; - } - return _purchasePriceLabel; -} - -- (UILabel *)purchaseExpiresLabel { - if (!_purchaseExpiresLabel) { - _purchaseExpiresLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(12) - textColor:[DJDKMIMOMColor colorWithHexString:@"#FFE3AF"]]; - _purchaseExpiresLabel.alpha = 0.6; - _purchaseExpiresLabel.hidden = YES; - } - return _purchaseExpiresLabel; -} - -- (UILabel *)purchaseNoticeLabel { - if (!_purchaseNoticeLabel) { - _purchaseNoticeLabel = [UILabel labelInitWithText:@"Is only through activity" - font:kFontRegular(15) - textColor:[DJDKMIMOMColor colorWithHexString:@"#FFE3AF"]]; - _purchaseNoticeLabel.hidden = YES; - } - return _purchaseNoticeLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.h b/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.h deleted file mode 100644 index b6dae61..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPNobleCenterListViewController.h -// xplan-ios -// -// Created by GreenLand on 2021/12/28. -// - -#import "MvpViewController.h" -#import -#import "NobleCenterModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNobleCenterListViewController : MvpViewController - -@property (nonatomic, strong) NobleInfo *vipInfo; - -@property (nonatomic, strong) NSMutableArray *vipAuthInfos; -///用户是否为当前等级 -@property (nonatomic, assign) BOOL isCurrentLevel; -///当前权力值 -@property (nonatomic, assign) NSInteger currentScore; -///当前用户是否开通了VIP -@property (nonatomic, assign) BOOL isOpenNoble; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.m b/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.m deleted file mode 100644 index ca61d8b..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.m +++ /dev/null @@ -1,162 +0,0 @@ -// -// XPNobleCenterListViewController.m -// xplan-ios -// -// Created by GreenLand on 2021/12/28. -// - -#import "XPNobleCenterListViewController.h" -///Third -#import -///Tool - -///View -#import "XPNobleCenterTableHeadView.h" -#import "XPNoblePrivilegeContentCell.h" -#import "XPNobleCenterEmptyView.h" -///P -#import "XPNobleCenterProtocol.h" - -@interface XPNobleCenterListViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -//@property (nonatomic,strong) NSArray *datasource; -///列表头view -@property (nonatomic, strong) XPNobleCenterTableHeadView *headView; - -@property (nonatomic, strong) UIImageView *bgImageView; - -@end - -@implementation XPNobleCenterListViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.vipInfo.comingSoon == 2 ? 0 : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - NSInteger itemCount = self.vipAuthInfos.count; - CGFloat lineCount = (itemCount % 3 == 0) ? itemCount / 3 : (itemCount / 3 + 1); - CGFloat itemHeight = 105; - CGFloat bottomHeight = kSafeAreaBottomHeight + 44 + 5; - return 90 + lineCount * itemHeight + bottomHeight + 59 + 40; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPNoblePrivilegeContentCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPNoblePrivilegeContentCell class])]; - cell.selectionStyle = UITableViewCellSelectionStyleNone; - cell.vipInfo = self.vipInfo; - cell.vipAuthInfos = self.vipAuthInfos; - return cell; -} - -#pragma mark - Getters And Setters -- (void)setVipInfo:(NobleInfo *)vipInfo { - _vipInfo = vipInfo; - if (vipInfo.comingSoon == 2) {//敬请期待 - self.tableView.tableHeaderView = [[UIView alloc] initWithFrame:CGRectZero]; - XPNobleCenterEmptyView *emptyView = [[XPNobleCenterEmptyView alloc] initWithFrame:self.tableView.bounds]; - emptyView.emptyImageStr = vipInfo.vipLogo; - self.tableView.backgroundView = emptyView; - } else { - self.headView.vipInfo = vipInfo; - self.tableView.tableHeaderView = self.headView; - } - [self.tableView reloadData]; -} - -- (void)setVipAuthInfos:(NSMutableArray *)vipAuthInfos { - _vipAuthInfos = [NSMutableArray arrayWithArray:vipAuthInfos]; - [self.tableView reloadData]; -} - -- (void)setIsCurrentLevel:(BOOL)isCurrentLevel { - _isCurrentLevel = isCurrentLevel; - self.headView.isCurrentLevel = isCurrentLevel; -} - -- (void)setCurrentScore:(NSInteger)currentScore { - _currentScore = currentScore; - self.headView.currentScore = currentScore; -} - -- (void)setIsOpenNoble:(BOOL)isOpenNoble { - _isOpenNoble = isOpenNoble; - self.headView.isOpenNoble = isOpenNoble; - if (isOpenNoble) { - [self.tableView setContentInset:UIEdgeInsetsMake(0, 0, 36, 0)]; - } -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - _tableView.bounces = NO; - [_tableView registerClass:[XPNoblePrivilegeContentCell class] forCellReuseIdentifier:NSStringFromClass([XPNoblePrivilegeContentCell class])]; - } - return _tableView; -} - -- (XPNobleCenterTableHeadView *)headView { - if (!_headView) { - CGFloat height; - if (kStatusBarHeight > 20) { - height = KScreenWidth > 375 ? 220 : 195; - } else { - height = KScreenWidth > 375 ? 240 : 210; - } - _headView = [[XPNobleCenterTableHeadView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, height)]; - } - return _headView; -} - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"noble_privilege_list_bg"]]; - } - return _bgImageView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Noble/View/XPNobleSettingViewController.h b/YuMi/Modules/YMMine/View/Noble/View/XPNobleSettingViewController.h deleted file mode 100644 index 31c3e6e..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/XPNobleSettingViewController.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPNobleSettingViewController.h -// xplan-ios -// -// Created by GreenLand on 2022/4/26. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNobleSettingViewController : MvpViewController - -@property (nonatomic, assign) BOOL enterHide; - -@property (nonatomic, copy) void(^didUpdateEnterHideBlock)(void); - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/XPNobleSettingViewController.m b/YuMi/Modules/YMMine/View/Noble/View/XPNobleSettingViewController.m deleted file mode 100644 index 20df3f4..0000000 --- a/YuMi/Modules/YMMine/View/Noble/View/XPNobleSettingViewController.m +++ /dev/null @@ -1,130 +0,0 @@ -// -// XPNobleSettingViewController.m -// xplan-ios -// -// Created by GreenLand on 2022/4/26. -// - -#import "XPNobleSettingViewController.h" -#import "XPNobleSettingNavView.h" -///Tool -#import "ThemeColor+NobleCenter.h" - -#import "UIButton+EnlargeTouchArea.h" -///Third -#import -///P -#import "XPNobleCenterPresenter.h" -#import "XPNobleCenterProtocol.h" - -@interface XPNobleSettingViewController () - -@property (nonatomic, strong) XPNobleSettingNavView *navView; -///标题 -@property (nonatomic, strong) UILabel *label; -///开关 -//@property (nonatomic, strong) UIButton *switchButton; -@property (nonatomic, strong) UISwitch *switchButton; - -@end - -@implementation XPNobleSettingViewController - -- (XPNobleCenterPresenter *)createPresenter { - return [[XPNobleCenterPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = YMLocalizedString(@"XPNobleSettingViewController0"); - self.view.backgroundColor = [DJDKMIMOMColor nobleSettingBgColor]; - [self initSubView]; - [self initSubViewConstraints]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent; -} -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)initSubView { - [self.view addSubview:self.navView]; - [self.view addSubview:self.label]; - [self.view addSubview:self.switchButton]; -} - -- (void)initSubViewConstraints { - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - [self.label mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kNavigationHeight+16); - make.leading.mas_equalTo(15); - make.height.mas_equalTo(21); - }]; - [self.switchButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.label); - make.trailing.mas_equalTo(-15); - }]; -} - -#pragma mark - XPNobleCenterProtocol -- (void)changeEnterHideSuccess { - self.enterHide = !self.enterHide; - if (self.didUpdateEnterHideBlock) { - self.didUpdateEnterHideBlock(); - } -} - -- (void)changeEnterHideFail { - self.switchButton.on = self.enterHide; -} - -#pragma mark - XPNobleSettingNavViewDelegate -///点击了返回按钮 -- (void)xPNobleSettingNavView:(XPNobleSettingNavView *)view didClickBackButton:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)switchDidChange:(UISwitch *)switchButton { - [self.presenter changeEnterHide:switchButton.isOn]; -} - -#pragma mark - getter and setter -- (void)setEnterHide:(BOOL)enterHide { - _enterHide = enterHide; - self.switchButton.on = enterHide; -} - -- (XPNobleSettingNavView *)navView { - if (!_navView) { - _navView = [[XPNobleSettingNavView alloc] init]; - _navView.delegate = self; - } - return _navView; -} - -- (UILabel *)label { - if (!_label) { - _label = [[UILabel alloc] init]; - _label.text = YMLocalizedString(@"XPNobleSettingViewController1"); - _label.textColor = [UIColor whiteColor]; - _label.font = [UIFont systemFontOfSize:15]; - } - return _label; -} - -- (UISwitch *)switchButton { - if (!_switchButton) { - _switchButton = [[UISwitch alloc] init]; - _switchButton.tintColor = UIColorRGBAlpha(0xFFE3AF, 0.4); - _switchButton.onTintColor = UIColorFromRGB(0xFFE3AF); - [_switchButton addTarget:self action:@selector(switchDidChange:) forControlEvents:UIControlEventValueChanged]; - } - return _switchButton; -} -@end diff --git a/YuMi/Modules/YMMine/View/PISwitchingEnvironmentVC.h b/YuMi/Modules/YMMine/View/PISwitchingEnvironmentVC.h deleted file mode 100644 index ae5e02f..0000000 --- a/YuMi/Modules/YMMine/View/PISwitchingEnvironmentVC.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PISwitchingEnvironmentVC.h -// YuMi -// -// Created by duoban on 2023/11/8. -// - -#import -#import "MvpViewController.h" -NS_ASSUME_NONNULL_BEGIN - -@interface PISwitchingEnvironmentVC : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/PISwitchingEnvironmentVC.m b/YuMi/Modules/YMMine/View/PISwitchingEnvironmentVC.m deleted file mode 100644 index e7dd7c4..0000000 --- a/YuMi/Modules/YMMine/View/PISwitchingEnvironmentVC.m +++ /dev/null @@ -1,121 +0,0 @@ -// -// PISwitchingEnvironmentVC.m -// YuMi -// -// Created by duoban on 2023/11/8. -// - -#import "PISwitchingEnvironmentVC.h" - -#import "XPAdImageTool.h" -#import "BaseNavigationController.h" -#import "XPMineSwitchLanguageVC.h" - -@interface PISwitchingEnvironmentVC () -@property(nonatomic,strong) UILabel *titleView; -@end - -@implementation PISwitchingEnvironmentVC - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = @"切换"; - NSString *isProduction = [[NSUserDefaults standardUserDefaults]valueForKey:@"kIsProductionEnvironment"]; - NSString *text = @""; - if([isProduction isEqualToString:@"YES"]){ - text = @"当前环境:正式环境"; - }else{ - text = @"当前环境:测试环境"; - } - self.titleView = [UILabel labelInitWithText:text font:kFontMedium(16) textColor:[DJDKMIMOMColor mainTextColor]]; - [self.view addSubview:self.titleView]; - UILabel *switchTitle = [UILabel labelInitWithText:@"切换环境" font:kFontMedium(15) textColor:[DJDKMIMOMColor secondTextColor]]; - [self.view addSubview:switchTitle]; - UISwitch *switchView = [[UISwitch alloc]init]; - [switchView setOn:[isProduction isEqualToString:@"YES"]]; - [self.view addSubview:switchView]; - [switchView addTarget:self action:@selector(switchEnvironmentAction:) forControlEvents:UIControlEventValueChanged]; - - if (@available(iOS 14.0, *)) { - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(switchLanguage:) name:@"kSwitchLanguage" object:nil]; - - UIButton *toSwithLanguage = [UIButton buttonWithType:UIButtonTypeInfoLight - primaryAction:[UIAction actionWithHandler:^(__kindof UIAction * _Nonnull action) { - XPMineSwitchLanguageVC*languageVC = [XPMineSwitchLanguageVC new]; - [self.navigationController pushViewController:languageVC animated:YES]; - }]]; - [self.view addSubview:toSwithLanguage]; - [toSwithLanguage mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.view); - make.size.mas_equalTo(CGSizeMake(60, 60)); - }]; - } - - UIButton *realBtn = [UIButton new]; - [realBtn setTitle:@"调试捉包工具" forState:UIControlStateNormal]; - realBtn.titleLabel.font = kFontMedium(16); - [realBtn setTitleColor:[UIColor blueColor] forState:UIControlStateNormal]; - [realBtn addTarget:self action:@selector(showRealTimeView) forControlEvents:UIControlEventTouchUpInside]; - [self.view addSubview:realBtn]; - - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(30)); - make.top.mas_equalTo(kGetScaleWidth(100)); - }]; - [switchTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.titleView); - make.top.equalTo(self.titleView.mas_bottom).mas_offset(kGetScaleWidth(20)); - }]; - [switchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(switchTitle.mas_trailing).mas_offset(kGetScaleWidth(10)); - make.centerY.equalTo(switchTitle); - }]; - [realBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.titleView); - make.top.equalTo(switchTitle.mas_bottom).mas_offset(kGetScaleWidth(30)); - }]; -} - --(void)switchLanguage:(NSNotification *)not{ -#if DEBUG - exit(0); -#endif -} - --(void)showRealTimeView{ - [BSNetListenModel initRealTimeView]; - UIWindow * window = [UIApplication sharedApplication].keyWindow; - [BSNetListenModel sharedInstance:window]; - -} - --(void)switchEnvironmentAction:(UISwitch *)sender{ - - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = @"提示"; - config.message = @"确认切换网络环境吗？需要重启app"; - [TTPopup alertWithConfig:config confirmHandler:^{ - - if(sender.isOn == YES){ - [[NSUserDefaults standardUserDefaults]setValue:@"YES" forKey:@"kIsProductionEnvironment"]; - [[NSUserDefaults standardUserDefaults]synchronize]; - self.titleView.text = @"当前环境:正式环境"; - [self logoutAction]; - return; - } - [[NSUserDefaults standardUserDefaults]setValue:@"NO" forKey:@"kIsProductionEnvironment"]; - [[NSUserDefaults standardUserDefaults]synchronize]; - self.titleView.text = @"当前环境:测试环境"; - [self logoutAction]; - } cancelHandler:^{ - [sender setOn:!sender.isOn]; - }]; - -} --(void)logoutAction{ -#if DEBUG - exit(0); -#endif -} - -@end diff --git a/YuMi/Modules/YMMine/View/Recharge/IAPManager.h b/YuMi/Modules/YMMine/View/Recharge/IAPManager.h deleted file mode 100644 index 50b4910..0000000 --- a/YuMi/Modules/YMMine/View/Recharge/IAPManager.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// IAPManager.h -// YuMi -// -// Created by P on 2024/9/24. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface IAPManager : NSObject - -+ (instancetype)sharedManager; - -- (void)purchase:(NSString *)productId - success:(void(^)(NSString *transactionID, NSString *orderID))success - failure:(void(^)(NSError *error))failure - contactCS:(void(^)(NSString *uid))contactCS; - -- (void)retryCheckAllReceipt; - -- (void)handleLogin; -- (void)handleLogout; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Recharge/IAPManager.m b/YuMi/Modules/YMMine/View/Recharge/IAPManager.m deleted file mode 100644 index d16073e..0000000 --- a/YuMi/Modules/YMMine/View/Recharge/IAPManager.m +++ /dev/null @@ -1,699 +0,0 @@ -// -// IAPManager.m -// YuMi -// -// Created by P on 2024/9/24. -// - -#import "IAPManager.h" -#import -#import "BuglyManager.h" -#import "Api+Mine.h" -#import "YuMi-swift.h" -#import "RechargeStorage.h" - -#define MAX_RETRY_COUNT 50 - -@interface IAPManager() - -@property (nonatomic, assign) BOOL isLogin; - -@property (nonatomic, assign) NSInteger recheckInterval; -@property (nonatomic, assign) NSInteger recheckIndex; -@property (nonatomic, strong) NSTimer *recheckTimer; -@property (nonatomic, assign) BOOL isProcessing; - -@property (nonatomic, copy) NSString *orderID; -@property (nonatomic, copy) NSString *transactionID; - -@property (nonatomic, copy) void(^successPurchase)(NSString *transactionID, NSString *orderID); -@property (nonatomic, copy) void(^successRecheck)(void); -@property (nonatomic, copy) void(^failurePurchase)(NSError *error); -@property (nonatomic, copy) void(^contactCustomerService)(NSString *uid); - -// 记录交易重试次数 -@property (nonatomic, strong) NSMutableDictionary *retryCountDict; -// 线程安全队列 -@property (nonatomic, strong) dispatch_queue_t retryCountQueue; - -@end - -@implementation IAPManager - -+ (instancetype)sharedManager { - static IAPManager *proxy; - static dispatch_once_t onceToken; - - dispatch_once(&onceToken, ^{ - proxy = [[self alloc] init]; - - proxy.recheckIndex = 0; - proxy.recheckInterval = 1.0; - proxy.retryCountDict = [NSMutableDictionary dictionary]; - proxy.retryCountQueue = dispatch_queue_create("com.iapmanager.retrycount.queue", DISPATCH_QUEUE_CONCURRENT); - proxy.isProcessing = NO; - proxy.isLogin = NO; - }); - - return proxy; -} - -- (void)handleLogin { - self.isLogin = YES; -} - -- (void)handleLogout { - self.isLogin = NO; - if (self.recheckTimer) { - [self.recheckTimer invalidate]; - } -} - -- (NSString *)fetchEncodedReceipt { - NSURL *receiptURL = [[NSBundle mainBundle] appStoreReceiptURL]; - NSData *receiptData = [NSData dataWithContentsOfURL:receiptURL]; - if (!receiptData) return nil; - return [receiptData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithLineFeed]; -} - -- (BOOL)isValidTransactionID:(NSString *)tID orderID:(NSString *)orderID { - return (tID.length > 0 && orderID.length > 0); -} - -// 开始正常内购流程 -- (void)purchase:(NSString *)productId - success:(void(^)(NSString *transactionID, NSString *orderID))success - failure:(void(^)(NSError *error))failure - contactCS:(void(^)(NSString *uid))contactCS { - - self.successPurchase = success; - self.failurePurchase = failure; - self.contactCustomerService = contactCS; - - [self handleIAPState]; - [self requestAPPOrderData:productId isFroRecheck:NO]; -} - -// 定时轮训未完成的订单并进行验单 -- (void)retryCheckAllReceipt { - // 先清理旧定时器 - if (self.recheckTimer) { - [self.recheckTimer invalidate]; - self.recheckTimer = nil; - } - - // 清理过期交易 - [self cleanupStaleTransactions]; - - // 设置最大重试间隔 - NSTimeInterval interval = MIN(self.recheckInterval, 300.0); - - // 使用传统定时器创建方式，避免在旧版iOS上的兼容性问题 - self.recheckTimer = [NSTimer scheduledTimerWithTimeInterval:interval - target:self - selector:@selector(handleRetryCheckReceipt) - userInfo:nil - repeats:NO]; - - // 确保定时器在主运行循环中运行 - [[NSRunLoop mainRunLoop] addTimer:self.recheckTimer forMode:NSRunLoopCommonModes]; -} - -// 验单逻辑 -- (void)handleRetryCheckReceipt { - NSLog(@"[YuMi IAP] 用户触发补单检查 - Retry checking receipts"); - - // 如果已经在处理中或未登录，则不执行，直接等待下次定时器触发 - if (self.isProcessing || !self.isLogin) { - // 只销毁当前定时器，不递归创建新定时器，避免无限循环 - if (self.recheckTimer) { - [self.recheckTimer invalidate]; - self.recheckTimer = nil; - } - // 重新安排下一次检查（延迟更长时间，防止频繁空转） - self.recheckInterval = MIN(self.recheckInterval * 1.5, 300.0); - [self retryCheckAllReceipt]; - return; - } - - NSArray *array = [RechargeStorage getAllReceiptsWithUid:[AccountInfoStorage instance].getUid]; - NSLog(@" ------------.------------ 尝试：%@", array); - - // 如果没有需要处理的收据，定时器继续以较长间隔轮询 - if (array.count == 0) { - NSLog(@" ------------.------------ 没有需要验单的数据"); - if (self.recheckTimer) { - [self.recheckTimer invalidate]; - self.recheckTimer = nil; - } - // 设为较长间隔（如10分钟） - self.recheckInterval = 600.0; - [self retryCheckAllReceipt]; - return; - } - - // 确保索引在有效范围内 - if (self.recheckIndex >= array.count) { - self.recheckIndex = 0; - } - - // 标记为处理中 - self.isProcessing = YES; - - // 安全地获取当前需要处理的收据 - NSDictionary *dic = [array xpSafeObjectAtIndex:self.recheckIndex]; - NSString *transactionId = dic[@"transactionId"]; - NSString *orderId = dic[@"orderId"]; - - // 记录尝试验单 - [self _logToBugly:transactionId oID:orderId status:0]; - - // 检查重试次数 - NSInteger retryCount = [self getRetryCountForTransaction:transactionId]; - - if (retryCount > MAX_RETRY_COUNT) { - // 超过最大重试次数，记录并清理 - [self _logToBugly:transactionId oID:orderId status:4]; // 新状态：重试次数过多 - [RechargeStorage delegateTransactionId:transactionId uid:[AccountInfoStorage instance].getUid]; - [self removeRetryCountForTransaction:transactionId]; - - // 重置处理状态 - self.isProcessing = NO; - - // 增加索引并安排下一次检查 - self.recheckIndex = (self.recheckIndex + 1) % array.count; - if (self.recheckTimer) { - [self.recheckTimer invalidate]; - self.recheckTimer = nil; - } - [self retryCheckAllReceipt]; - return; - } - - // 增加重试计数 - [self incrementRetryCountForTransaction:transactionId]; - - @kWeakify(self); - [self backgroundCheckReceiptWithTransactionID:transactionId - orderID:orderId - next:^(BOOL isSuccess){ - @kStrongify(self); - if (isSuccess) { - // 成功处理 - [RechargeStorage delegateTransactionId:transactionId - uid:[AccountInfoStorage instance].getUid]; - - // 成功后减少重试间隔，加快处理速度 - self.recheckInterval = MAX(self.recheckInterval / 2, 1.0); - - [self _logToBugly:transactionId oID:orderId status:1]; - - // 成功后移除重试记录 - [self removeRetryCountForTransaction:transactionId]; - - } else { - // 失败后增加重试间隔，避免频繁请求 - self.recheckInterval = MIN(self.recheckInterval * 1.5, 300.0); - [self _logToBugly:transactionId oID:orderId status:2]; - } - - // 增加索引，准备处理下一个收据 - self.recheckIndex = (self.recheckIndex + 1) % array.count; - - // 重置处理状态 - self.isProcessing = NO; - - // 安排下一次检查 - if (self.recheckTimer) { - [self.recheckTimer invalidate]; - self.recheckTimer = nil; - } - [self retryCheckAllReceipt]; - }]; -} - -- (void)_logToBugly:(NSString *)tid oID:(NSString *)oid status:(NSInteger)status { - // 使用 BuglyManager 统一上报内购错误 - NSString *uid = [AccountInfoStorage instance].getUid ?: @"未知用户"; - - // 构建上下文信息 - NSMutableDictionary *context = [NSMutableDictionary dictionary]; - [context setObject:@([self getRetryCountForTransaction:tid]) forKey:@"重试次数"]; - [context setObject:@(self.recheckInterval) forKey:@"重试间隔"]; - [context setObject:@(self.recheckIndex) forKey:@"当前索引"]; - [context setObject:@(self.isProcessing) forKey:@"处理中状态"]; - [context setObject:@(self.isLogin) forKey:@"登录状态"]; - - // 使用 BuglyManager 上报 - [[BuglyManager sharedManager] reportIAPError:uid - transactionId:tid - orderId:oid - status:status - context:context]; -} - -// 内购成功并通知外部 -- (void)handleSuccessPurchase:(NSString *)tID order:(NSString *)orderID { - if (self.successPurchase) { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - self.successPurchase(tID, orderID); - }); - } - - if (self.successRecheck) { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - self.successRecheck(); - }); - } -} - -// 内购失败并通知外部 -- (void)handleFailurePurchase:(NSString *)errorMsg { - if (self.failurePurchase) { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - if (errorMsg.length == 0) { - self.failurePurchase(nil); - } else { - self.failurePurchase([NSError errorWithDomain:errorMsg code:-1 userInfo:nil]); - } - }); - } -} - -// 获取客服内容 -- (void)handleContactCS { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"XPIAPRechargeViewController7"); - config.message = YMLocalizedString(@"XPIAPRechargeViewController8"); - TTAlertButtonConfig *confirmButtonConfig = [[TTAlertButtonConfig alloc]init]; - confirmButtonConfig.title = YMLocalizedString(@"XPIAPRechargeViewController9"); - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x13E2F5),UIColorFromRGB(0x9DB4FF),UIColorFromRGB(0xCC67FF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(200, 200)]; - confirmButtonConfig.backgroundColor = [UIColor colorWithPatternImage:image]; - confirmButtonConfig.cornerRadius = 38/2; - config.confirmButtonConfig = confirmButtonConfig; - - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ - @kStrongify(self); - [self loadCSUid]; - } cancelHandler:^{}]; - }); -} - -// 获取客服 UID -- (void)loadCSUid { - if (self.contactCustomerService) { - [Api requestContactCustomerServiceCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSString *uid = [NSString stringWithFormat:@"%@",data.data]; - self.contactCustomerService(uid); - } - }]; - } -} - -// 监听内购流程状态 -- (void)handleIAPState { - if (@available(iOS 15.0, *)) { - @kWeakify(self); - [[PIIAPRegulate shared] setConditionBlock:^(enum StoreConditionResult state, NSDictionary * _Nullable param) { - @kStrongify(self); - switch (state) { - case StoreConditionResultStart: - NSLog(@"~~~```~~~ Purchase started"); - break; - case StoreConditionResultPay: - NSLog(@"~~~```~~~ Processing payment"); - break; - case StoreConditionResultVerifiedServer: - NSLog(@"~~~```~~~ Verified by server"); - [self handleIAPSuccess:param]; - break; - case StoreConditionResultUserCancelled: - NSLog(@"~~~```~~~ User cancelled purchase"); - [self handleFailurePurchase:@""]; - break; - case StoreConditionResultNoProduct: - NSLog(@"~~~```~~~ No product found"); - [self handleFailurePurchase:[NSString stringWithFormat:@"%@ No product found", YMLocalizedString(@"XPIAPRechargeViewController1")]]; - break; - case StoreConditionResultFailedVerification: - NSLog(@"~~~```~~~ Verification failed"); - [self handleFailurePurchase:YMLocalizedString(@"XPIAPRechargeViewController1")]; - break; - case StoreConditionResultUnowned: - NSLog(@"~~~```~~~ Result Unowned"); - [self handleFailurePurchase:YMLocalizedString(@"XPIAPRechargeViewController1")]; - break; - default: - [self handleFailurePurchase:YMLocalizedString(@"XPIAPRechargeViewController0")]; - break; - } - }]; - } -} - -// 生成后端订单 -- (void)requestAPPOrderData:(NSString *)productId isFroRecheck:(BOOL)isFroRecheck { - if (@available(iOS 15.0, *)) { - @kWeakify(self); - [Api requestIAPRecharge:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (isFroRecheck) { - return; - } - @kStrongify(self); - if (code == 200) { - NSString *orderId = (NSString *)data.data[@"recordId"]; - NSString *uuid = (NSString *)data.data[@"appAccountToken"]; - [self requestIAPOrder:orderId - productID:productId - uuid:uuid]; - } else if (code == 50000) { - [self handleContactCS]; - [self handleFailurePurchase:@""]; - } else { - [self handleFailurePurchase:msg]; - } - } - chargeProdId:productId - uid:[AccountInfoStorage instance].getUid - ticket:[AccountInfoStorage instance].getTicket - deviceInfo:[YYUtility deviceID] - clientIp:[YYUtility ipAddress]]; - } else { - [self handleFailurePurchase:YMLocalizedString(@"XPIAPRechargeViewController10")]; - } -} - - -// 获取后端订单后，查询线上是否有对应 productID 的物品，如果有，会自动拉起付费弹窗（PIIAPRegulate - purchase） -- (void)requestIAPOrder:(NSString *)orderID productID:(NSString *)productID uuid:(NSString *)uuid { - self.orderID = orderID; - - if (@available(iOS 15.0, *)) { -// @kWeakify(self); - [[PIIAPRegulate shared] demandCommodityThingWithProductId:productID - uuid:uuid - completionHandler:^(NSError * _Nullable error) { -// @kStrongify(self); - if (error) { - // 已在 ConditionBlock 中回调 - } - }]; - } -} - -// 处理内购付款成功 -- (void)handleIAPSuccess:(NSDictionary *)param { - id tid = param[@"transactionId"]; - self.transactionID = tid; - - if (self.transactionID.length == 0) { - [self handleFailurePurchase:YMLocalizedString(@"XPIAPRechargeViewController1")]; - return; - } - - [self saveTransactionID]; - [self checkReceiptWithTransactionID:self.transactionID - orderID:self.orderID]; -} - -// 内购付款成功后保存收据 id 到钥匙串 -- (void)saveTransactionID { - NSString *encodedReceipt = [self fetchEncodedReceipt]; - NSMutableDictionary *receiptInfo = [NSMutableDictionary dictionary]; - - [self addValueIfNotNil:self.transactionID forKey:@"transactionId" toDictionary:receiptInfo]; - [self addValueIfNotNil:encodedReceipt forKey:@"receipt" toDictionary:receiptInfo]; - [self addValueIfNotNil:self.orderID forKey:@"orderId" toDictionary:receiptInfo]; - - // 添加时间戳便于后续判断过期交易 - [receiptInfo setObject:[[NSDate date] description] forKey:@"timestamp"]; - - @synchronized (self.transactionID) { - [RechargeStorage saveTransactionId:self.transactionID - receipt:[receiptInfo toJSONString] - uid:[AccountInfoStorage instance].getUid]; - } -} - -// 通过苹果收据与后端订单进行验单与发货 -// MARK: 必须等待结果 -- (void)checkReceiptWithTransactionID:(NSString *)tID - orderID:(NSString *)orderID { - - NSLog(@" ------------.------------ 后端验单：%@ | %@", tID, orderID); - - @kWeakify(self); - [Api checkReceipt:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - [self handleSuccessPurchase:tID order:orderID]; - [self handleCheckReceiptSuccess:tID isFromRecheck:NO]; - } else { - [self handleFailurePurchase:msg]; - if (code == 1444) { - // 参数异常，暂不处理 - } - } - NSLog(@" ------------.------------ 后端验单结果：%@ ",msg); - } - chooseEnv:@"true" - chargeRecordId:orderID - transcationId:tID - uid:[AccountInfoStorage instance].getUid - ticket:[AccountInfoStorage instance].getTicket]; -} - -// 通过苹果收据与后端订单进行验单与发货，此方法是对本地未删除的订单进行检测 -- (void)backgroundCheckReceiptWithTransactionID:(NSString *)tID - orderID:(NSString *)orderID - next:(void(^)(BOOL isSuccess))next { - - // 验证参数有效性 - if (![self isValidTransactionID:tID orderID:orderID]) { - if (next) { - next(NO); - } - return; - } - - // 创建后台任务标识 - UIBackgroundTaskIdentifier backgroundTask = [[UIApplication sharedApplication] beginBackgroundTaskWithName:@"VerifyReceipt" - expirationHandler:^{ - // 超时处理 - if (next) { - next(NO); - } - [[UIApplication sharedApplication] endBackgroundTask:backgroundTask]; - }]; - - // 完成后务必结束后台任务 - @kWeakify(self); - [Api checkReceipt:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - - BOOL isSuccess = (code == 200); - - if (isSuccess) { - [self handleCheckReceiptSuccess:tID isFromRecheck:YES]; - NSLog(@" ------------.------------ 后台验单成功：%@ | %@", tID, orderID); - } else { - NSLog(@" ------------.------------ 后台验单失败：%@ | %@ | %@", tID, orderID, msg); - } - - // 确保回调被调用 - if (next) { - next(isSuccess); - } - - // 结束后台任务 - [[UIApplication sharedApplication] endBackgroundTask:backgroundTask]; - } - chooseEnv:@"true" - chargeRecordId:orderID - transcationId:tID - uid:[AccountInfoStorage instance].getUid - ticket:[AccountInfoStorage instance].getTicket]; -} - -// 查找在缓存中的 transactionID 并告知 apple 订单已完成 -- (void)handleCheckReceiptSuccess:(NSString *)tID - isFromRecheck:(BOOL)isFromRecheck { - // 验证参数 - if (tID.length == 0) { - NSLog(@" ------------.------------ apple 验单失败：交易ID为空"); - return; - } - - if (@available(iOS 15.0, *)) { - @kWeakify(self); - [[PIIAPRegulate shared] verifyBusinessAccomplishWithTransactionID:tID - completionHandler:^(BOOL success, NSError * _Nullable error) { - @kStrongify(self); - if (success) { - NSLog(@" ------------.------------ apple 验单成功"); - // 流程完成，移除本地缓存账单 - [RechargeStorage delegateTransactionId:tID - uid:[AccountInfoStorage instance].getUid]; - // 成功后移除重试记录 - [self removeRetryCountForTransaction:tID]; - } else { - // 出现异常 - NSLog(@" ------------.------------ apple 验单失败：%@ ",error); - if (error == nil) { - // 该订单在 appstore 已无法找到，不必再重试 - [RechargeStorage delegateTransactionId:tID - uid:[AccountInfoStorage instance].getUid]; - // 清理不存在的交易记录 - [self removeRetryCountForTransaction:tID]; - } else { - // 只有在重试检查时才安排下一次重试 - if (isFromRecheck) { - // 不立即重试，让定时器自然触发下一次 - } - } - } - - if (!isFromRecheck) { - // 正常购买情况，重置内存订单数据 - self.orderID = @""; - self.transactionID = @""; - } - }]; - } -} - -- (void)addValueIfNotNil:(id)value - forKey:(NSString *)key - toDictionary:(NSMutableDictionary *)dictionary { - if (value != nil && key != nil) { - dictionary[key] = value; - } -} - -// 添加 dealloc 方法确保定时器释放 -- (void)dealloc { - if (self.recheckTimer) { - [self.recheckTimer invalidate]; - self.recheckTimer = nil; - } -} - -// 在应用进入后台时暂停定时器 -- (void)applicationDidEnterBackground { - if (self.recheckTimer) { - [self.recheckTimer invalidate]; - self.recheckTimer = nil; - } -} - -// 在应用恢复活动时重新启动定时器 -- (void)applicationWillEnterForeground { - if (self.isLogin) { - [self retryCheckAllReceipt]; - } -} - -// 清理长时间未处理的交易记录 -- (void)cleanupStaleTransactions { - NSArray *receipts = [RechargeStorage getAllReceiptsWithUid:[AccountInfoStorage instance].getUid]; - if (!receipts || receipts.count == 0) { - return; - } - - NSDate *now = [NSDate date]; - NSInteger cleanupDays = 70; // 70天后清理 - - for (NSDictionary *receipt in receipts) { - // 检查交易时间，如果超过指定天数还未成功，则清理 - NSString *timestamp = receipt[@"timestamp"]; - if (!timestamp || timestamp.length == 0) { - continue; - } - - NSDate *transactionDate = nil; - - // 尝试多种日期格式解析 - NSArray *dateFormats = @[ - @"yyyy-MM-dd HH:mm:ss Z", - @"yyyy-MM-dd'T'HH:mm:ssZ", - @"EEE MMM dd HH:mm:ss Z yyyy" - ]; - - for (NSString *format in dateFormats) { - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - [dateFormatter setDateFormat:format]; - [dateFormatter setLocale:[NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]]; - - transactionDate = [dateFormatter dateFromString:timestamp]; - if (transactionDate) { - break; - } - } - - // 如果无法解析日期，使用当前时间减去60天作为估计值 - if (!transactionDate) { - transactionDate = [now dateByAddingTimeInterval:-60 * 24 * 60 * 60]; - } - - // 检查是否超过清理期限 - if ([now timeIntervalSinceDate:transactionDate] > cleanupDays * 24 * 60 * 60) { - NSString *tID = receipt[@"transactionId"]; - NSString *oID = receipt[@"orderId"]; - - // 记录清理日志 - [self _logToBugly:tID oID:oID status:5]; // 状态5：过期清理 - - // 从存储中删除 - [RechargeStorage delegateTransactionId:tID uid:[AccountInfoStorage instance].getUid]; - - // 清理过期交易的重试记录 - [self removeRetryCountForTransaction:tID]; - } - } -} - -// 获取交易的重试次数 -- (NSInteger)getRetryCountForTransaction:(NSString *)transactionId { - __block NSInteger count = 0; - dispatch_sync(self.retryCountQueue, ^{ - NSNumber *countNumber = self.retryCountDict[transactionId]; - count = countNumber ? [countNumber integerValue] : 0; - }); - return count; -} - -// 增加交易的重试次数 -- (void)incrementRetryCountForTransaction:(NSString *)transactionId { - dispatch_barrier_async(self.retryCountQueue, ^{ - NSInteger currentCount = [self.retryCountDict[transactionId] integerValue]; - self.retryCountDict[transactionId] = @(currentCount + 1); - }); -} - -// 移除交易的重试记录 -- (void)removeRetryCountForTransaction:(NSString *)transactionId { - dispatch_barrier_async(self.retryCountQueue, ^{ - [self.retryCountDict removeObjectForKey:transactionId]; - }); -} - -// 清理所有重试记录 -- (void)cleanAllRetryCount { - dispatch_barrier_async(self.retryCountQueue, ^{ - [self.retryCountDict removeAllObjects]; - }); -} - -@end - diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.h b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.h deleted file mode 100644 index 7349397..0000000 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMIAPRechargeCollectionViewCell.h -// YUMI -// -// Created by XY on 2023/2/21. -// - -#import - -@class RechargeListModel; -NS_ASSUME_NONNULL_BEGIN - -@interface XPIAPRechargeCollectionViewCell : UICollectionViewCell - -@property (nonatomic, strong) RechargeListModel *rechargeModel; - -@property (nonatomic, assign) BOOL selectedStyle; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.m b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.m deleted file mode 100644 index fb9f400..0000000 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.m +++ /dev/null @@ -1,182 +0,0 @@ -// -// YMIAPRechargeCollectionViewCell.m -// YUMI -// -// Created by XY on 2023/2/21. -// - -#import "XPIAPRechargeCollectionViewCell.h" -#import "DJDKMIMOMColor.h" -#import - -#import "RechargeListModel.h" -#import "FirstRechargeManager.h" -#import "MoliMoneyLabel.h" - -@interface XPIAPRechargeCollectionViewCell() - -/// 背景 -@property (nonatomic, strong) UIView *bgView; -@property(nonatomic,strong) UIView *bgPriceView; -/// 价格 -@property (nonatomic, strong) UILabel *priceLabel; -/// 💎 -@property (nonatomic, strong) UIImageView *iconImageView; -/// 数量 -@property (nonatomic, strong) UILabel *numLabel; - -@property (nonatomic, strong) UIView *extBG; -@property (nonatomic, strong) MoliMoneyLabel *moneyLabel; - -@end - -@implementation XPIAPRechargeCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self createUI]; - } - return self; -} - -- (void)createUI { - [self.contentView addSubview:self.bgView]; - [self.bgView addSubview:self.bgPriceView]; - [self.bgPriceView addSubview:self.priceLabel]; - [self.bgView addSubview:self.iconImageView]; - [self.bgView addSubview:self.numLabel]; - - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - - }]; - - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(13)); - make.width.mas_equalTo(kGetScaleWidth(55)); - make.height.mas_equalTo(kGetScaleWidth(48)); - make.centerX.equalTo(self.bgView); - }]; - [self.numLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(0)); - make.top.mas_equalTo(kGetScaleWidth(66)); - }]; - [self.bgPriceView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.bgView); - make.height.mas_equalTo(kGetScaleWidth(26)); - }]; - [self.priceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.bgPriceView); - }]; - - [self.contentView addSubview:self.extBG]; - [self.extBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.mas_equalTo(self.bgView); - make.size.mas_equalTo(CGSizeMake(64, 20)); - }]; - - [self.contentView addSubview:self.moneyLabel]; - [self.moneyLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.extBG); - make.trailing.mas_equalTo(self.extBG).offset(-5); - }]; -} - -- (void)setRechargeModel:(RechargeListModel *)rechargeModel { - _rechargeModel = rechargeModel; - NSMutableAttributedString *priceStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"$%.2f",rechargeModel.money.floatValue]]; - self.priceLabel.attributedText = priceStr; - self.numLabel.text = [NSString stringWithFormat:@"%ld", - (long)rechargeModel.chargeGoldNum]; - self.extBG.hidden = YES; - self.moneyLabel.hidden = YES; - FirstRechargeModel *model = [FirstRechargeManager.sharedManager loadCurrentModel]; - if (model && model.chargeStatus == NO) { - for (FirstRechargeLevelModel *levelModel in model.levelCharge) { - if (levelModel.exp == rechargeModel.chargeGoldNum) { - [self.moneyLabel updateContent: [NSString stringWithFormat:@"+ %@", @(levelModel.awardNum)]]; - self.extBG.hidden = NO; - self.moneyLabel.hidden = NO; - break; - } - } - } -} - -- (void)setSelectedStyle:(BOOL)selectedStyle { - _selectedStyle = selectedStyle; - _bgView.layer.borderWidth = _selectedStyle ? 1 : 0; -} - -#pragma mark - 懒加载 - -- (UIView *)bgView { - if (!_bgView) { - _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = UIColorFromRGB(0xF3F0E6); - _bgView.layer.cornerRadius = kGetScaleWidth(9); - _bgView.layer.masksToBounds = YES; - _bgView.layer.borderColor = UIColorFromRGB(0xFFB05E).CGColor; - - } - return _bgView; -} - -- (UIView *)bgPriceView{ - if(!_bgPriceView){ - _bgPriceView = [UIView new]; - _bgPriceView.backgroundColor = UIColorFromRGB(0xFFF09C); - } - return _bgPriceView; -} - -- (UILabel *)priceLabel { - if (!_priceLabel) { - _priceLabel = [[UILabel alloc] init]; - _priceLabel.textColor = UIColorFromRGB(0x513C0B); - _priceLabel.font = kFontBold(12); - _priceLabel.textAlignment = NSTextAlignmentCenter; - } - return _priceLabel; -} - -- (UIImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[UIImageView alloc] init]; - _iconImageView.contentMode = UIViewContentModeScaleAspectFit; - _iconImageView.image = [UIImage imageNamed:@"ms_mine_recharge_coin"]; - } - return _iconImageView; -} - -- (UILabel *)numLabel { - if (!_numLabel) { - _numLabel = [[UILabel alloc] init]; - _numLabel.textColor = UIColorFromRGB(0x8A4B00); - _numLabel.font = kFontBold(15); - _numLabel.textAlignment = NSTextAlignmentCenter; - } - return _numLabel; -} - -- (UIView *)extBG { - if (!_extBG) { - _extBG = [[UIView alloc] init]; - [_extBG addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xFFE347), - UIColorFromRGB(0xFF9A51), - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 0.5) cornerRadius:4]; - [_extBG setCornerWithLeftTopCorner:4 rightTopCorner:kGetScaleWidth(9) bottomLeftCorner:4 bottomRightCorner:4 size:CGSizeMake(64, 20)]; - } - return _extBG; -} - -- (MoliMoneyLabel *)moneyLabel { - if (!_moneyLabel) { - _moneyLabel = [MoliMoneyLabel moneyLabelWithTextColot:UIColorFromRGB(0x582B00) font:kFontMedium(13) moneyPostion:2 moneySize:CGSizeMake(14, 14)]; - } - return _moneyLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeadCell.h b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeadCell.h deleted file mode 100644 index 5005c12..0000000 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeadCell.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// XPIAPRechargeHeadCell.h -// YuMi -// -// Created by duoban on 2023/9/11. -// - -#import -#import "RechargeListModel.h" -@class XPIAPRechargeHeadCell; -NS_ASSUME_NONNULL_BEGIN -@protocol XPIAPRechargeHeadCellDelegate - -- (void)xpIAPRechargeHeadCell:(XPIAPRechargeHeadCell *)cycleScrollView didSelectItemAtIndex:(NSInteger)index; - -@end -@interface XPIAPRechargeHeadCell : UICollectionViewCell -//////充值banner位 -@property(nonatomic,copy) NSArray *bannerList; -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeadCell.m b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeadCell.m deleted file mode 100644 index 076d0a3..0000000 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeadCell.m +++ /dev/null @@ -1,75 +0,0 @@ -// -// XPIAPRechargeHeadCell.m -// YuMi -// -// Created by duoban on 2023/9/11. -// - -#import "XPIAPRechargeHeadCell.h" -#import - -@interface XPIAPRechargeHeadCell() - -///轮播图 -@property (nonatomic, strong) SDCycleScrollView *pi_BannerView; -@end -@implementation XPIAPRechargeHeadCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self.contentView addSubview:self.pi_BannerView]; -} --(void)installConstraints{ - [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(16)); - make.top.mas_equalTo(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(94)); - }]; -} -- (void)setBannerList:(NSArray *)bannerList{ - _bannerList = bannerList; - NSMutableArray *list = [NSMutableArray array]; - for ( RechargeListModel *rechargeModel in _bannerList) { - [list addObject:rechargeModel.bannerUrl]; - } - self.pi_BannerView.imageURLStringsGroup = list; - [self.pi_BannerView autoScroll]; -} -#pragma mark - SDCycleScrollViewDelegate -- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index { - if(self.delegate && [self.delegate respondsToSelector:@selector(xpIAPRechargeHeadCell:didSelectItemAtIndex:)]){ - [self.delegate xpIAPRechargeHeadCell:self didSelectItemAtIndex:index]; - } - -} -#pragma mark - 懒加载 - -- (SDCycleScrollView *)pi_BannerView { - if (!_pi_BannerView) { - _pi_BannerView = [[SDCycleScrollView alloc] init]; - _pi_BannerView.backgroundColor = [UIColor clearColor]; - _pi_BannerView.layer.cornerRadius = kGetScaleWidth(10); - _pi_BannerView.layer.masksToBounds = YES; - _pi_BannerView.delegate = self; - _pi_BannerView.showPageControl = YES; - _pi_BannerView.autoScrollTimeInterval = 5.0; - _pi_BannerView.currentPageDotColor = UIColorFromRGB(0x9168FA); - _pi_BannerView.pageDotColor = UIColorRGBAlpha(0xB3B3C3, 0.4); - _pi_BannerView.pageControlDotSize = CGSizeMake(kGetScaleWidth(4), kGetScaleWidth(4)); - _pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; - _pi_BannerView.placeholderImage = [UIImageConstant defaultBannerPlaceholder]; - // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 - _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - for (UIView *subView in _pi_BannerView.subviews) { - subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - } - return _pi_BannerView; -} -@end diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeaderView.h b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeaderView.h deleted file mode 100644 index d276da2..0000000 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeaderView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMIAPRechargeHeaderView.h -// YUMI -// -// Created by XY on 2023/2/21. -// - -#import - -@class WalletInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface XPIAPRechargeHeaderView : UIView - -///钱包信息 -@property (nonatomic,strong) WalletInfoModel *walletInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeaderView.m b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeaderView.m deleted file mode 100644 index 143a04d..0000000 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeaderView.m +++ /dev/null @@ -1,114 +0,0 @@ -// -// YMIAPRechargeHeaderView.m -// YUMI -// -// Created by XY on 2023/2/21. -// - -#import "XPIAPRechargeHeaderView.h" -#import -#import "YUMIMacroUitls.h" - -#import "WalletInfoModel.h" - -@interface XPIAPRechargeHeaderView() - -/// 背景图 -@property (nonatomic, strong) UIImageView *bgImageView; -///余额背景 -@property(nonatomic,strong) UIImageView *balanceBgVeiw; -/// 余额文字 -@property (nonatomic, strong) UILabel *balanceTextLabel; -/// 余额 -@property (nonatomic, strong) UILabel *balanceLabel; - - -@end - -@implementation XPIAPRechargeHeaderView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self createUI]; - } - return self; -} - -- (void)createUI { - [self addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.balanceBgVeiw]; - - [self.balanceBgVeiw addSubview:self.balanceTextLabel]; - [self.balanceBgVeiw addSubview:self.balanceLabel]; - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.balanceBgVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(339)); - make.height.mas_equalTo(kGetScaleWidth(118)); - make.centerX.equalTo(self.bgImageView); - make.bottom.mas_equalTo(-kGetScaleWidth(0)); - }]; - - [self.balanceTextLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(33)); - make.top.mas_equalTo(kGetScaleWidth(36)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - - [self.balanceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.balanceTextLabel.mas_bottom).mas_offset(kGetScaleWidth(10)); - make.leading.mas_equalTo(kGetScaleWidth(33)); - }]; -} - -- (void)setWalletInfo:(WalletInfoModel *)walletInfo { - _walletInfo = walletInfo; - if (_walletInfo) { - self.balanceLabel.text = walletInfo.diamonds; - } -} - -#pragma mark - 懒加载 - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - - _bgImageView.image = kImage(@"ms_mine_top_bg"); - } - return _bgImageView; -} -- (UIImageView *)balanceBgVeiw{ - if(!_balanceBgVeiw){ - _balanceBgVeiw = [UIImageView new]; - _balanceBgVeiw.image = [kImage(@"ms_mine_coin_bg") ms_SetImageForRTL]; - } - return _balanceBgVeiw; -} -- (UILabel *)balanceTextLabel { - if (!_balanceTextLabel) { - _balanceTextLabel = [[UILabel alloc] init]; - _balanceTextLabel.textColor = UIColorFromRGB(0x9F4805); - _balanceTextLabel.font = kFontBold(15); - _balanceTextLabel.text = YMLocalizedString(@"XPIAPRechargeHeaderView0"); - } - return _balanceTextLabel; -} - -- (UILabel *)balanceLabel { - if (!_balanceLabel) { - _balanceLabel = [[UILabel alloc] init]; - _balanceLabel.textColor = UIColorFromRGB(0xFFFBD5); - _balanceLabel.font = kFontBold(24); - _balanceLabel.textAlignment = NSTextAlignmentCenter; - _balanceLabel.text = @"0"; - _balanceLabel.adjustsFontSizeToFitWidth = YES; - } - return _balanceLabel; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.h b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.h deleted file mode 100644 index 8dc74c4..0000000 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMIAPRechargeViewController.h -// YUMI -// -// Created by XY on 2023/2/21. -// - -#import "MvpViewController.h" - -@protocol XPIAPRechargeViewControllerDelegate - --(void)paySuccess; - -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface XPIAPRechargeViewController : MvpViewController -@property(nonatomic,weak) iddelegate; -///是否从精灵页面过来 -@property (nonatomic,assign) BOOL isFairyPay; -@property(nonatomic,copy) NSString *type; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m deleted file mode 100644 index 78ae50c..0000000 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m +++ /dev/null @@ -1,409 +0,0 @@ -// -// YMIAPRechargeViewController.m -// YUMI -// -// Created by XY on 2023/2/21. -// - -#import "XPIAPRechargeViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "YUMIHtmlUrl.h" -#import "RechargeStorage.h" -#import "AccountInfoStorage.h" -#import "NSObject+MJExtension.h" -#import "NSArray+Safe.h" -#import "UIImage+Utils.h" -///Model -#import "RechargeListModel.h" -///View -#import "XPIAPRechargeHeaderView.h" -#import "XPIAPRechargeCollectionViewCell.h" -#import "XPMineRechargeNavView.h" -///P -#import "XPMineRechargePresenter.h" -#import "XPMineRechargeProtocol.h" -///VC -#import "XPWebViewController.h" -#import "XPIAPRechargeHeadCell.h" -#import "SessionViewController.h" -#import "ClientConfig.h" -#import "Api+Main.h" -#import "YuMi-swift.h" - -#import "IAPManager.h" -#import "FirstRechargeManager.h" - -#define kHeaderViewHeight 220.0/375.0*KScreenWidth - -@interface XPIAPRechargeViewController ()< -UICollectionViewDelegate, -UICollectionViewDataSource, -UICollectionViewDelegateFlowLayout, -XPMineRechargeProtocol, -XPMineRechargeNavViewDelegate, -XPIAPRechargeHeadCellDelegate> - -@property (nonatomic, strong) UICollectionView *collectionView; -/// 头部 -@property (nonatomic, strong) XPIAPRechargeHeaderView *headerView; -/// 充值按钮 -@property (nonatomic, strong) UIButton *rechargeBtn; -/// -@property (nonatomic,strong) UIStackView *stackView; -///同意 -@property (nonatomic,strong) UILabel *agreeLabel; -///充值协议 -@property (nonatomic,strong) UIButton *protcoloButton; -/// 返回 -@property (nonatomic,strong) UIButton *backBtn; -/// 标题 -@property (nonatomic,strong) UILabel *titleLabel; - -/// 数据源 -@property (nonatomic, strong) NSArray *dataSource; -/// 选中下标 -@property (nonatomic, strong) NSIndexPath *selectedIndex; - -@end - -@implementation XPIAPRechargeViewController - -- (void)dealloc { - -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (UIStatusBarStyle)preferredStatusBarStyle { - return UIStatusBarStyleLightContent; -} - -- (XPMineRechargePresenter *)createPresenter { - return [[XPMineRechargePresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self createUI]; - [self initHttpData]; -} - -- (void)createUI { - self.view.backgroundColor = UIColorFromRGB(0xF4F5FA); - - [self.view addSubview:self.headerView]; - [self.view addSubview:self.collectionView]; - [self.view addSubview:self.rechargeBtn]; - [self.view addSubview:self.stackView]; - [self.view addSubview:self.titleLabel]; - [self.view addSubview:self.backBtn]; - - [self.stackView addArrangedSubview:self.agreeLabel]; - [self.stackView addArrangedSubview:self.protcoloButton]; - CGFloat height = kGetScaleWidth(236); - [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(0); - make.height.mas_equalTo(height); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.bottom.mas_equalTo(-34); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - - [self.rechargeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(343)); - make.height.mas_equalTo(kGetScaleWidth(56)); - make.centerX.equalTo(self.view); - make.bottom.equalTo(self.stackView.mas_top).mas_offset(-kGetScaleWidth(10)); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.headerView.mas_bottom).mas_offset(kGetScaleWidth(21)); - make.leading.trailing.mas_equalTo(0); - make.bottom.equalTo(self.rechargeBtn.mas_top).mas_offset(-kGetScaleWidth(10)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kStatusBarHeight); - make.height.mas_equalTo(44); - make.centerX.mas_equalTo(self.view); - }]; - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.top.mas_equalTo(kStatusBarHeight); - make.width.height.mas_equalTo(44); - }]; -} - -- (void)initHttpData { - [self getRechargeList]; - [self.presenter getBannerList]; - [self getUserWalletBalanceInfo]; - -// @kWeakify(self); -// [[IAPManager sharedManager] retryCheckAllReceipt:^{ -// @kStrongify(self); -// [self getUserWalletBalanceInfo]; -// if(self.delegate && [self.delegate respondsToSelector:@selector(paySuccess)]){ -// [self.delegate paySuccess]; -// } -// }]; -} - -/// 返回 -- (void)backBtnAction { - if(self.isFairyPay){ - [UIView animateWithDuration:0.5 animations:^{ - self.view.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight); - }completion:^(BOOL finished) { - [self willMoveToParentViewController:nil]; //1 - [self.view removeFromSuperview]; //2 - [self removeFromParentViewController]; //3 - }]; - return; - } - [self.navigationController popViewControllerAnimated:YES]; -} - -/// 点击充值按钮 -- (void)rechargeBtnAction { - self.rechargeBtn.userInteractionEnabled = NO; - - if(self.selectedIndex == nil){ - [self showSuccessToast:YMLocalizedString(@"XPIAPRechargeViewController11")]; - return; - } - - NSInteger index = self.selectedIndex.row; - if(index < self.dataSource.count){ - RechargeListModel *model = [self.dataSource xpSafeObjectAtIndex:index]; - if (model.chargeProdId) { - [self showLoading]; - - @kWeakify(self); - [[IAPManager sharedManager] purchase:model.chargeProdId - success:^(NSString *transactionID, NSString *orderID) { - @kStrongify(self); - [self hideHUD]; - [self getUserWalletBalanceInfo]; - - // 更新首充状态 - FirstRechargeManager *manager = [FirstRechargeManager sharedManager]; - // 使用新添加的方法更新首充状态 - [manager updateChargeStatusToCompleted]; - [self.collectionView reloadData]; - - // 由于服务器可能会返回不同的状态，我们在延迟后再次确认状态已更新 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [[FirstRechargeManager sharedManager] updateChargeStatusToCompleted]; - }); - - if(self.delegate && [self.delegate respondsToSelector:@selector(paySuccess)]){ - [self.delegate paySuccess]; - } - self.rechargeBtn.userInteractionEnabled = YES; - - } failure:^(NSError * _Nonnull error) { - @kStrongify(self); - [self hideHUD]; - if (error) { - [self showErrorToast:error.domain]; - } - self.rechargeBtn.userInteractionEnabled = YES; - } contactCS:^(NSString * _Nonnull uid) { - @kStrongify(self); - [self hideHUD]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - NIMSession * session = [NIMSession session:uid type:NIMSessionTypeP2P]; - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:session]; - [self.navigationController pushViewController:sessionVC animated:YES]; - }); - }]; - } - } -} - -- (void)protcoloButtonAction:(UIButton *)sender { - if(self.isFairyPay){ - XPWebViewController * webVC= [[XPWebViewController alloc] initWithCustomizeNav:YES]; - webVC.url = URLWithType(kRechargePrivacyURL); - webVC.is_Pi_FairyPay = YES; - webVC.view.backgroundColor = [UIColor whiteColor]; - [self addChildViewController:webVC]; - [self.view addSubview:webVC.view]; - webVC.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - return; - } - - XPWebViewController * webVC= [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kRechargePrivacyURL); - [self.navigationController pushViewController:webVC animated:YES]; -} - -- (void)getRechargeList { - [self.presenter requestRechargeListWithChannel:@"8"]; -} - -- (void)getUserWalletBalanceInfo { - [self.presenter getUserWalletInfo]; -} -- (void)getBannerListSuccessWithList:(NSArray *)list{ - - self.selectedIndex = [NSIndexPath indexPathForRow:0 inSection:0]; - - [self.collectionView reloadData]; -} - -- (void)requestRechargeListSucccess:(NSArray *)list { - self.dataSource = list; - [self.collectionView reloadData]; -} - -#pragma mark - XPMineRechargeNavViewDelegate -- (void)xPMineRechargeNavView:(XPMineRechargeNavView *)view didClickBackButton:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo { - self.headerView.walletInfo = balanceInfo; -} - -// MARK: 。。。没有用到？ -//- (void)checkTranscationIdsSuccess { -// NSString * uid = [AccountInfoStorage instance].getUid; -// [RechargeStorage delegateAllTranscationIdsWithUid:uid]; -//} - -#pragma mark - UICollectionViewDelegate - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - - return self.dataSource.count; -} -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{ - return CGSizeMake(kGetScaleWidth(108), kGetScaleWidth(121)); -} -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPIAPRechargeCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass(XPIAPRechargeCollectionViewCell.self) forIndexPath:indexPath]; - NSInteger count = indexPath.item; - cell.rechargeModel = [self.dataSource xpSafeObjectAtIndex:count]; - cell.selectedStyle = self.selectedIndex.item == indexPath.item; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - - self.selectedIndex = indexPath; - [collectionView reloadData]; -} -#pragma mark - XPIAPRechargeHeadCellDelegate -- (void)xpIAPRechargeHeadCell:(XPIAPRechargeHeadCell *)cycleScrollView didSelectItemAtIndex:(NSInteger)index{ - -} -#pragma mark - 懒加载 -- (UICollectionView *)collectionView { - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionVertical; - layout.minimumLineSpacing = kGetScaleWidth(8); - layout.minimumInteritemSpacing = kGetScaleWidth(8); - layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(17), 0, kGetScaleWidth(17)); - - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.backgroundColor = UIColor.clearColor; - _collectionView.alwaysBounceVertical = YES; - [_collectionView registerClass:[XPIAPRechargeCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass(XPIAPRechargeCollectionViewCell.self)]; - [_collectionView registerClass:[XPIAPRechargeHeadCell class] forCellWithReuseIdentifier:NSStringFromClass(XPIAPRechargeHeadCell.self)]; - - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - return _collectionView; -} - -- (XPIAPRechargeHeaderView *)headerView { - if (!_headerView) { - _headerView = [[XPIAPRechargeHeaderView alloc] init]; - } - return _headerView; -} - -- (UIButton *)rechargeBtn { - if (!_rechargeBtn) { - _rechargeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_rechargeBtn setTitle:YMLocalizedString(@"XPIAPRechargeViewController2") forState:UIControlStateNormal]; - [_rechargeBtn setTitleColor:UIColor.whiteColor forState:UIControlStateNormal]; - _rechargeBtn.titleLabel.font = kFontMedium(16); - [_rechargeBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _rechargeBtn.layer.cornerRadius = kGetScaleWidth(56)/2; - _rechargeBtn.clipsToBounds = YES; - [_rechargeBtn addTarget:self action:@selector(rechargeBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _rechargeBtn; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 2; - } - return _stackView; -} - -- (UIButton *)protcoloButton { - if (!_protcoloButton) { - _protcoloButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_protcoloButton setTitle:YMLocalizedString(@"XPIAPRechargeViewController3") forState:UIControlStateNormal]; - [_protcoloButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - _protcoloButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_protcoloButton addTarget:self action:@selector(protcoloButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _protcoloButton; -} -- (UILabel *)agreeLabel { - if (!_agreeLabel) { - _agreeLabel = [[UILabel alloc] init]; - _agreeLabel.text = YMLocalizedString(@"XPIAPRechargeViewController4"); - _agreeLabel.font = [UIFont systemFontOfSize:12]; - _agreeLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _agreeLabel; -} - - - - -- (UIButton *)backBtn { - if (!_backBtn) { - _backBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backBtn setImage:[[UIImage imageNamed:@"room_info_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backBtn addTarget:self action:@selector(backBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPIAPRechargeViewController6"); - _titleLabel.textColor = UIColor.blackColor; - _titleLabel.font = kFontBold(16); - } - return _titleLabel; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Setting/XPMaskManagerVC.h b/YuMi/Modules/YMMine/View/Setting/XPMaskManagerVC.h deleted file mode 100644 index e528976..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMaskManagerVC.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMaskManagerVC.h -// xplan-ios -// -// Created by duoban on 2022/12/26. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMaskManagerVC : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Setting/XPMaskManagerVC.m b/YuMi/Modules/YMMine/View/Setting/XPMaskManagerVC.m deleted file mode 100644 index 36ce072..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMaskManagerVC.m +++ /dev/null @@ -1,166 +0,0 @@ -// -// XPMaskManagerVC.m -// xplan-ios -// -// Created by duoban on 2022/12/26. -// - -#import "XPMaskManagerVC.h" -///view -#import "XPMaskManagerCell.h" -#import "XPMineSettingPresent.h" -#import "XPMineSettingProtocol.h" -#import "XPMineFriendEmptyTableViewCell.h" -#import "XPMaskManagerModel.h" -#import - -@interface XPMaskManagerVC () -@property (nonatomic,strong) UITableView *tableView; -@property (nonatomic,strong) NSMutableArray *listData; -@property (nonatomic,strong) UIView *foodView; -@property (nonatomic,strong) XPMaskManagerModel * chooseModel; -@property (nonatomic,assign) NSInteger page; - -@end - -@implementation XPMaskManagerVC - -- (__kindof id)createPresenter{ - return [[XPMineSettingPresent alloc]init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initHeaderAndFooterRrfresh]; - -} -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = kFontRegular(14); - header.lastUpdatedTimeLabel.font = kFontRegular(14); - header.stateLabel.textColor = UIColorFromRGB(0x6D6B89); - header.lastUpdatedTimeLabel.textColor = UIColorFromRGB(0x6D6B89); - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = UIColorFromRGB(0x6D6B89); - footer.stateLabel.font = kFontRegular(14); - [footer setTitle:YMLocalizedString(@"XPMaskManagerVC1") forState:MJRefreshStateNoMoreData]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - self.page = 1; - [self.presenter getBlackRoomListWithPageNum:@(self.page).stringValue pageSize:@"20"]; -} - -- (void)footerRefresh { - - self.page++; - [self.presenter getBlackRoomListWithPageNum:@(self.page).stringValue pageSize:@"20"]; -} - --(void)getBlackRoomList:(NSArray *)list{ - [self.tableView.mj_footer endRefreshing]; - [self.tableView.mj_header endRefreshing]; - if(self.page == 1){ - self.listData = [NSMutableArray arrayWithArray:list]; - }else{ - if(list.count == 0){ - [self.tableView.mj_footer endRefreshingWithNoMoreData]; - }else{ - [self.listData addObjectsFromArray:list]; - } - } - [self.tableView reloadData]; -} --(void)requestUnmaskingFromBlackRoomListSuccess{ - if(self.chooseModel){ - if([self.listData containsObject:self.chooseModel]){ - [self.listData removeObject:self.chooseModel]; - [self.tableView reloadData]; - [self showSuccessToast:YMLocalizedString(@"XPMaskManagerVC3")]; - } - } -} -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMaskManagerVC0"); - self.view.backgroundColor = UIColorFromRGB(0xF3F5FA); - [self.view addSubview:self.tableView]; -} -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); - }]; -} -#pragma mark - XPMaskManagerCellDelegate --(void)unmaskingHandleWithModel:(XPMaskManagerModel *)model{ - self.chooseModel = model; - [self showLoading]; - [self.presenter requestUnmaskingFromBlackRoomListWithRoomUid:model.uid type:@"1"]; -} - -#pragma mark UITableViewDelegate,UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ - return self.listData.count > 0 ? self.listData.count : 1; -} --(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{ - return self.listData.count > 0 ? kGetScaleWidth(99) : self.view.frame.size.height; -} - --(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - if(self.listData.count > 0){ - XPMaskManagerCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMaskManagerCell class]) forIndexPath:indexPath]; - if(indexPath.row < self.listData.count){ - cell.model = self.listData[indexPath.row]; - } - cell.delegate = self; - return cell; - } - - XPMineFriendEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - cell.emptyTitle = YMLocalizedString(@"XPMaskManagerVC2"); - return cell; -} - -#pragma mark -懒加载 -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.showsVerticalScrollIndicator = NO; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMaskManagerCell class] forCellReuseIdentifier:NSStringFromClass([XPMaskManagerCell class])]; - [_tableView registerClass:[XPMineFriendEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - - } - return _tableView; -} -- (UIView *)foodView{ - if (!_foodView){ - _foodView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(117))]; - UILabel *titleView = [UILabel labelInitWithText:YMLocalizedString(@"XPMaskManagerVC1") font:kFontRegular(14) textColor:UIColorFromRGB(0x6D6B89)]; - titleView.frame = _foodView.bounds; - titleView.textAlignment = NSTextAlignmentCenter; - [_foodView addSubview:titleView]; - } - return _foodView; -} -- (NSMutableArray *)listData{ - if (!_listData){ - _listData = [NSMutableArray array]; - } - return _listData; -} -@end diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.h b/YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.h deleted file mode 100644 index 3e94a1f..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineAboutUsViewController.h -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineAboutUsViewController : BaseViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.m deleted file mode 100644 index 668aa62..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.m +++ /dev/null @@ -1,88 +0,0 @@ -// -// YMMineAboutUsViewController.m -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "XPMineAboutUsViewController.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YYUtility.h" -#import "YUMIMacroUitls.h" - -@interface XPMineAboutUsViewController () -@property (nonatomic, strong) UIImageView *iconImageView;//图标 -@property (strong, nonatomic) UILabel *versionLabel;//版本 -@property (strong , nonatomic) UILabel *nameLabel; -@end - -@implementation XPMineAboutUsViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPMineSettingPresent19"),AppName]; - [self initSubViews]; - [self makeConstriants]; -} - -- (void)initSubViews { - [self.view addSubview:self.versionLabel]; - [self.view addSubview:self.iconImageView]; - [self.view addSubview:self.nameLabel]; -} - -- (void)makeConstriants { - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.width.height.mas_equalTo(80); - make.top.mas_equalTo(kNavigationHeight+60); - }]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.iconImageView.mas_bottom).offset(5); - }]; - [self.versionLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nameLabel.mas_bottom).offset(5); - make.centerX.mas_equalTo(self.view); - }]; -} - - -#pragma mark - Getter && Setter - -- (UIImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[UIImageView alloc] init]; - _iconImageView.image = [UIImage imageNamed:@"ming_setting_about_us"]; - _iconImageView.layer.cornerRadius = 12; - _iconImageView.layer.masksToBounds = YES; - } - return _iconImageView; -} - - -- (UILabel *)versionLabel { - if (!_versionLabel) { - _versionLabel = [[UILabel alloc] init]; - _versionLabel.font = [UIFont systemFontOfSize:12]; - _versionLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _versionLabel.text = [NSString stringWithFormat:@"V%@",PI_App_Version]; - } - return _versionLabel; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [[UILabel alloc] init]; - _nameLabel.text = AppName; - _nameLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _nameLabel.font = [UIFont systemFontOfSize:17]; - } - return _nameLabel; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineBlackListViewController.h b/YuMi/Modules/YMMine/View/Setting/XPMineBlackListViewController.h deleted file mode 100644 index 2e45e04..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineBlackListViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineBlackListViewController.h -// YUMI -// -// Created by YUMI on 2022/4/25. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineBlackListViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineBlackListViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineBlackListViewController.m deleted file mode 100644 index bcdf9ec..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineBlackListViewController.m +++ /dev/null @@ -1,148 +0,0 @@ -// -// YMMineBlackListViewController.m -// YUMI -// -// Created by YUMI on 2022/4/25. -// - -#import "XPMineBlackListViewController.h" -///Third -#import -#import -#import "XPMineBlackListTableViewCell.h" -#import "XPMineFriendEmptyTableViewCell.h" -#import "NSArray+Safe.h" -///Model -#import "UserInfoModel.h" -///P -#import "XPMineBlackListPresenter.h" -#import "XPMineBlackListProtocol.h" - -@interface XPMineBlackListViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -/// -@property (nonatomic,strong) NSMutableArray *datasource; -@end - -@implementation XPMineBlackListViewController - -- (__kindof id)createPresenter { - return [[XPMineBlackListPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - NSArray *array = [[NIMSDK sharedSDK].userManager myBlackList]; - if (array.count > 0) { - NSMutableArray * uids = [NSMutableArray array]; - for (int i = 0; i< array.count; i++) { - NIMUser * user = [array xpSafeObjectAtIndex:i]; - [uids addObject:user.userId]; - } - [self.presenter getUserListInfo:uids]; - } - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineBlackListViewController0"); - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? 60 : 500; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMineBlackListTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineBlackListTableViewCell class])]; - cell.userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - @kWeakify(self); - [cell setHandleTapRemove:^(UserInfoModel * _Nonnull userInfo) { - @kStrongify(self); - [[NIMSDK sharedSDK].userManager removeFromBlackBlackList:[NSString stringWithFormat:@"%ld", userInfo.uid] completion:^(NSError * _Nullable error) { - if (error == nil) { - [self.datasource removeObject:userInfo]; - [self.tableView reloadData]; - } - }]; - }]; - return cell; - } - XPMineFriendEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - return cell; -} - -- (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath{ - if (self.datasource.count > 0) { - return UITableViewCellEditingStyleDelete; - } - return UITableViewCellEditingStyleNone; -} - --(NSString *)tableView:(UITableView *)tableView titleForDeleteConfirmationButtonForRowAtIndexPath:(NSIndexPath *)indexPath{ - return YMLocalizedString(@"XPMineBlackListViewController1"); -} - --(void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath{ - if (editingStyle ==UITableViewCellEditingStyleDelete){ - if (self.datasource.count > 0) { - UserInfoModel *userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [[NIMSDK sharedSDK].userManager removeFromBlackBlackList:[NSString stringWithFormat:@"%ld", userInfo.uid] completion:^(NSError * _Nullable error) { - if (error == nil) { - [self.datasource removeObject:userInfo]; - [self.tableView reloadData]; - } - }]; - } - - } -} - -#pragma mark - XPMineBlackListPrototcol -- (void)getUserListInfoSuccess:(NSArray *)array { - [self.datasource addObjectsFromArray:array]; - [self.tableView reloadData]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineBlackListTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineBlackListTableViewCell class])]; - [_tableView registerClass:[XPMineFriendEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineFriendEmptyTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.h b/YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.h deleted file mode 100644 index 66dc322..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineFeedbackViewController.h -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineFeedbackViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.m deleted file mode 100644 index e2ce605..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.m +++ /dev/null @@ -1,172 +0,0 @@ -// -// YMMineFeedbackViewController.m -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "XPMineFeedbackViewController.h" -///Third -#import -#import -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -///P -#import "XPMineFeedbackProtocol.h" -#import "XPMineFeedbackPresenter.h" - -@interface XPMineFeedbackViewController () -///小红点 -@property (nonatomic, strong) UIView *pointView; -///内容 -@property (nonatomic, strong) UILabel *titleLabel; -///输入反馈的内容 -@property (nonatomic, strong) SZTextView *contentTextView; -///微信或者qq -@property (nonatomic, strong) MSBaseTextField *contactField; -///提交 -@property (nonatomic, strong) UIButton *submitBtn; - -@end - -@implementation XPMineFeedbackViewController - -- (XPMineFeedbackPresenter *)createPresenter { - return [[XPMineFeedbackPresenter alloc] init];; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = YMLocalizedString(@"XPMineFeedbackViewController0"); - [self initSubviews]; - [self makeConstriants]; -} - -#pragma mark - Private Method -- (void)initSubviews { - [self.view addSubview:self.pointView]; - [self.view addSubview:self.titleLabel]; - [self.view addSubview:self.contentTextView]; - [self.view addSubview:self.contactField]; - [self.view addSubview:self.submitBtn]; - -} - -- (void)makeConstriants { - [self.pointView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).offset(15); - make.top.mas_equalTo(17); - make.height.width.mas_equalTo(7); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.pointView.mas_trailing).offset(4); - make.centerY.mas_equalTo(self.pointView); - }]; - [self.contentTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.pointView.mas_bottom).offset(20); - make.leading.mas_equalTo(self.view).offset(15); - make.trailing.mas_equalTo(self.view).offset(-15); - make.height.mas_equalTo(154); - }]; - [self.contactField mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentTextView.mas_bottom).offset(10); - make.leading.trailing.mas_equalTo(self.contentTextView); - make.height.mas_equalTo(35); - }]; - [self.submitBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contactField.mas_bottom).offset(45); - make.centerX.mas_equalTo(self.view); - make.height.mas_equalTo(45); - make.width.mas_equalTo(310); - }]; -} - -- (void)initEvents { - RAC(self.submitBtn, enabled) = [RACSignal combineLatest:@[self.contentTextView.rac_textSignal, self.contactField.rac_textSignal] reduce:^id _Nonnull(NSString *content, NSString * contact){ - return @(content.length > 0 && contact.length > 0); - }]; -} - -#pragma mark - FeedbackCoreClient -- (void)saveFeedbackSuccess { - [self showSuccessToast:[NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPMineFeedbackViewController1"), AppName]]; - [self.navigationController popViewControllerAnimated:YES]; -} -#pragma mark - Event Response -- (void)submitBtnAction:(UIButton *)sender { - [self.presenter saveFeedBackWith:self.contentTextView.text contact:self.contactField.text]; -} - -#pragma mark - Getter && Setter - -- (UIView *)pointView { - if (!_pointView) { - _pointView = [[UIView alloc] init]; - _pointView.backgroundColor = UIColorFromRGB(0xF944A1); - _pointView.layer.masksToBounds = YES; - _pointView.layer.cornerRadius = 3.5; - } - return _pointView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPMineFeedbackViewController2"); - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - - -- (SZTextView *)contentTextView { - if (!_contentTextView) { - _contentTextView = [[SZTextView alloc] init]; - NSString * placeholder = YMLocalizedString(@"XPMineFeedbackViewController3"); - _contentTextView.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14], NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}]; - _contentTextView.textColor = [DJDKMIMOMColor mainTextColor]; - _contentTextView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _contentTextView.font = [UIFont systemFontOfSize:14]; - _contentTextView.layer.cornerRadius = 3; - } - return _contentTextView; -} - -- (MSBaseTextField *)contactField { - if (!_contactField) { - _contactField = [[MSBaseTextField alloc] init]; - NSString * placeholder = YMLocalizedString(@"XPMineFeedbackViewController4"); - _contactField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14], NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}]; - _contactField.font = [UIFont systemFontOfSize:14]; - _contactField.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _contactField.textColor = [DJDKMIMOMColor mainTextColor]; - _contactField.layer.cornerRadius = 3; - _contactField.leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 8, 0)]; - _contactField.leftViewMode = UITextFieldViewModeAlways; - } - return _contactField; -} - -- (UIButton *)submitBtn { - if (!_submitBtn) { - _submitBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - _submitBtn.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; - [_submitBtn setTitle:YMLocalizedString(@"XPMineFeedbackViewController5") forState:UIControlStateNormal]; - [_submitBtn setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_submitBtn setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateDisabled]; - _submitBtn.layer.masksToBounds = YES; - _submitBtn.layer.cornerRadius = 45/2; - [_submitBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_submitBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor disableButtonColor], [DJDKMIMOMColor disableButtonColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateDisabled]; - _submitBtn.enabled = NO; - [_submitBtn addTarget:self action:@selector(submitBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - - } - return _submitBtn; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.h b/YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.h deleted file mode 100644 index 3477191..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMMineLoginPasswordViewController.h -// YUMI -// -// Created by YUMI on 2022/4/25. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - - -@class UserInfoModel; -@interface XPMineLoginPasswordViewController : MvpViewController -/// -@property (nonatomic,strong) UserInfoModel *userInfo; -///是否是修改密码 -@property (nonatomic,assign) BOOL isModifiPwd; -@property(nonatomic,assign) BOOL isLogout; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.m deleted file mode 100644 index f2919b7..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineLoginPasswordViewController.m +++ /dev/null @@ -1,266 +0,0 @@ -// -// XPMineLoginPasswordViewController.m -// xplan-ios -// -// Created by 冯硕 on 2022/4/25. -// - -#import "XPMineLoginPasswordViewController.h" -///Third -#import -#import -///Tool - -#import "UIButton+EnlargeTouchArea.h" -#import "UIImage+Utils.h" -///Model -#import "UserInfoModel.h" -///View -#import "XPMineModifPayPwdView.h" -///P -#import "XPMineLoginPasswordPresenter.h" -#import "XPMineLoginPasswordProtocol.h" -///VC -#import "XPMineSettingViewController.h" -#import "LoginTypesViewController.h" - - -@interface XPMineLoginPasswordViewController () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///当前的密码 -@property (nonatomic,strong) XPMineModifPayPwdView *currentPwdView; -///新密码 -@property (nonatomic,strong) XPMineModifPayPwdView *newsPwdView; -///检查密码 -@property (nonatomic,strong) XPMineModifPayPwdView *checkPwdView; -///忘记密码 -@property (nonatomic, strong) UIButton *forgetButton; -///提交 -@property (nonatomic, strong) UIButton *submitButton; -///限制的提示 -@property (nonatomic,strong) UILabel *limitLabel; -///旧密码 -@property (nonatomic,copy) NSString *currentPwd; -///新密码 -@property (nonatomic,copy) NSString *newsPwd; -///检查密码 -@property (nonatomic,copy) NSString *checkPwd; -@end - -@implementation XPMineLoginPasswordViewController - -- (XPMineLoginPasswordPresenter *)createPresenter { - return [[XPMineLoginPasswordPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - [self.view addSubview:self.stackView]; - [self.view addSubview:self.limitLabel]; - [self.view addSubview:self.forgetButton]; - [self.view addSubview:self.submitButton]; - [self.stackView addArrangedSubview:self.currentPwdView]; - [self.stackView addArrangedSubview:self.newsPwdView]; - [self.stackView addArrangedSubview:self.checkPwdView]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(30); - }]; - - [self.limitLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).offset(20); - make.trailing.mas_equalTo(-20); - make.top.mas_equalTo(self.stackView.mas_bottom).offset(10); - }]; - - [self.forgetButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.view).offset(-20); - make.top.mas_equalTo(self.submitButton.mas_bottom).offset(15); - }]; - [self.submitButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.limitLabel.mas_bottom).offset(20); - make.trailing.mas_equalTo(self.view).offset(-32); - make.leading.mas_equalTo(self.view).offset(32); - make.height.mas_equalTo(45); - }]; -} - -#pragma mark - XPMineLoginPasswordProtocol -- (void)setLoginPasswordSuccess { - [self showSuccessToast:YMLocalizedString(@"XPMineLoginPasswordViewController0")]; - self.userInfo.isBindPasswd = YES; - if(self.isLogout == YES){ - // 返回设置页面 - __block __kindof UIViewController *vc; - [self.navigationController.childViewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPMineSettingViewController class]]) { - vc = obj; // 导航控制器中有设置VC - } - }]; - - if ([self.navigationController.childViewControllers containsObject:vc]) { - [self.navigationController popToViewController:vc animated:YES]; - } else { - [self.navigationController popViewControllerAnimated:YES]; - } - return; - } - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)modifyLoginPasswordSuccess { - [self showSuccessToast:YMLocalizedString(@"XPMineLoginPasswordViewController1")]; - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - Event Response -- (void)forgetButtonAction:(UIButton *)sender { - LoginTypesViewController *vc = [[LoginTypesViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; - [vc updateLoginType:LoginDisplayType_email_forgetPassword]; - vc.isLogoutAfterRestPassword = YES; -} - -- (void)submitButtonAction:(UIButton *)sender { - if (![self.newsPwdView.contentTextField.text isEqualToString:self.checkPwdView.contentTextField.text]) { - [self showErrorToast:YMLocalizedString(@"XPMineLoginPasswordViewController2")]; - return; - } - if (self.isModifiPwd) { - [self.presenter modifyLoginPassword:self.userInfo.phone newPwd:self.newsPwd pwd:self.currentPwd]; - } else { - [self.presenter setLoginPassword:self.userInfo.phone newPwd:self.newsPwd]; - } -} - -- (void)textFieldDidChange:(UITextField *)textfield { - if (textfield == self.currentPwdView.contentTextField) { - self.currentPwd = textfield.text; - } else if (textfield == self.newsPwdView.contentTextField) { - self.newsPwd = textfield.text; - } else { - self.checkPwd = textfield.text; - } - - if (self.isModifiPwd) { - if (self.currentPwd.length >= 6 && self.newsPwd.length >= 6 && self.checkPwd.length >= 6) { - self.submitButton.enabled = YES; - } else { - self.submitButton.enabled = NO; - } - } else { - if (self.newsPwd.length >= 6 && self.checkPwd.length >= 6) { - self.submitButton.enabled = YES; - } else { - self.submitButton.enabled = NO; - } - } -} - -#pragma mark - Getters And Setters -- (void)setIsModifiPwd:(BOOL)isModifiPwd { - _isModifiPwd = isModifiPwd; - if (_isModifiPwd) { - self.currentPwdView.hidden = NO; - self.currentPwdView.placeholder = YMLocalizedString(@"XPMineLoginPasswordViewController3"); - self.newsPwdView.placeholder = YMLocalizedString(@"XPMineLoginPasswordViewController4"); - self.checkPwdView.placeholder = YMLocalizedString(@"XPMineLoginPasswordViewController5"); - self.title = YMLocalizedString(@"XPMineLoginPasswordViewController6"); - } else { - self.currentPwdView.hidden = YES; - self.newsPwdView.placeholder = YMLocalizedString(@"XPMineLoginPasswordViewController7"); - self.checkPwdView.placeholder = YMLocalizedString(@"XPMineLoginPasswordViewController8"); - self.forgetButton.hidden = YES; - self.title = YMLocalizedString(@"XPMineLoginPasswordViewController9"); - } - self.currentPwdView.hidden = !_isModifiPwd; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 25; - } - return _stackView; -} - -- (XPMineModifPayPwdView *)currentPwdView { - if (!_currentPwdView) { - _currentPwdView = [[XPMineModifPayPwdView alloc] init]; - [_currentPwdView.contentTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; - _currentPwdView.hidden = YES; - } - return _currentPwdView; -} - -- (XPMineModifPayPwdView *)newsPwdView { - if (!_newsPwdView) { - _newsPwdView = [[XPMineModifPayPwdView alloc] init]; - [_newsPwdView.contentTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; - } - return _newsPwdView; -} - -- (XPMineModifPayPwdView *)checkPwdView { - if (!_checkPwdView) { - _checkPwdView = [[XPMineModifPayPwdView alloc] init]; - [_checkPwdView.contentTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; - } - return _checkPwdView; -} - -- (UIButton *)submitButton { - if (!_submitButton) { - _submitButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_submitButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_submitButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateDisabled]; - [_submitButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - _submitButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; - _submitButton.layer.masksToBounds = YES; - _submitButton.layer.cornerRadius = 45/2; - [_submitButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_submitButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor disableButtonColor], [DJDKMIMOMColor disableButtonColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateDisabled]; - [_submitButton addTarget:self action:@selector(submitButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _submitButton.enabled = NO; - } - return _submitButton; -} - -- (UIButton *)forgetButton { - if (!_forgetButton) { - _forgetButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_forgetButton setEnlargeEdgeWithTop:5 right:5 bottom:5 left:5]; - [_forgetButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - [_forgetButton setTitle:YMLocalizedString(@"XPMineLoginPasswordViewController11") forState:UIControlStateNormal]; - _forgetButton.titleLabel.font = [UIFont systemFontOfSize:13]; - [_forgetButton addTarget:self action:@selector(forgetButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _forgetButton; -} - -- (UILabel *)limitLabel { - if (!_limitLabel) { - _limitLabel = [[UILabel alloc] init]; - _limitLabel.font = [UIFont systemFontOfSize:13]; - _limitLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _limitLabel.text = YMLocalizedString(@"XPMineLoginPasswordViewController12"); - _limitLabel.numberOfLines = 0; - } - return _limitLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineModifPayPwdViewController.h b/YuMi/Modules/YMMine/View/Setting/XPMineModifPayPwdViewController.h deleted file mode 100644 index 07cfc9a..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineModifPayPwdViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMineModifPayPwdViewController.h -// YUMI -// -// Created by YUMI on 2021/9/18. -// 修改支付密码 - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel; -@interface XPMineModifPayPwdViewController : MvpViewController -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineModifPayPwdViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineModifPayPwdViewController.m deleted file mode 100644 index 62866f6..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineModifPayPwdViewController.m +++ /dev/null @@ -1,210 +0,0 @@ -// -// XPMineModifPayPwdViewController.m -// xplan-ios -// -// Created by 冯硕 on 2021/9/18. -// - -#import "XPMineModifPayPwdViewController.h" -///Third -#import -#import -///Tool - -#import "UIButton+EnlargeTouchArea.h" -#import "UIImage+Utils.h" -///View -#import "XPMineModifPayPwdView.h" -///P -#import "XPMineModifPayPwdPresenter.h" -#import "XPMineModifPayProtocol.h" -///VC -#import "XPMineSettingViewController.h" - -@interface XPMineModifPayPwdViewController () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///当前的密码 -@property (nonatomic,strong) XPMineModifPayPwdView *currentPwdView; -///新密码 -@property (nonatomic,strong) XPMineModifPayPwdView *newsPwdView; -///检查密码 -@property (nonatomic,strong) XPMineModifPayPwdView *checkPwdView; -///忘记密码 -@property (nonatomic, strong) UIButton *forgetBtn; -///提交 -@property (nonatomic, strong) UIButton *submitBtn; -@end - -@implementation XPMineModifPayPwdViewController - -- (XPMineModifPayPwdPresenter *)createPresenter { - return [[XPMineModifPayPwdPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initEvents]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"XPMineModifPayPwdViewController0"); - [self.view addSubview:self.stackView]; - [self.view addSubview:self.forgetBtn]; - [self.view addSubview:self.submitBtn]; - [self.stackView addArrangedSubview:self.currentPwdView]; - [self.stackView addArrangedSubview:self.newsPwdView]; - [self.stackView addArrangedSubview:self.checkPwdView]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(30); - make.leading.trailing.mas_equalTo(self.view); - }]; - - [self.forgetBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.view).offset(-32); - make.top.mas_equalTo(self.stackView.mas_bottom).offset(8); - }]; - [self.submitBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(275); - make.trailing.mas_equalTo(self.view).offset(-15); - make.leading.mas_equalTo(self.view).offset(15); - make.height.mas_equalTo(46); - }]; -} - -- (void)initEvents { - RAC(self.submitBtn, enabled) = [RACSignal combineLatest:@[self.currentPwdView.contentTextField.rac_textSignal, self.newsPwdView.contentTextField.rac_textSignal, self.checkPwdView.contentTextField.rac_textSignal] reduce:^id _Nonnull(NSString *currentPassword, NSString *newsPassword, NSString *checkPassword){ - return @(currentPassword.length == 6 && newsPassword.length == 6 && checkPassword.length == 6); - }]; -} -///判断一个字符串是纯数字 -- (BOOL)isPureNum:(NSString *)text { - if (!text) { - return NO; - } - NSScanner *scan = [NSScanner scannerWithString:text]; - int val; - return [scan scanInt:&val] && [scan isAtEnd]; -} - - -#pragma mark - XPMineModifPayProtocol -- (void)modifPayPasswordSuccess { - [self showSuccessToast:YMLocalizedString(@"XPMineModifPayPwdViewController1")]; - for (UIViewController *VC in self.navigationController.viewControllers) { - if ([VC isKindOfClass:[XPMineSettingViewController class]]) { - [self.navigationController popToViewController:VC animated:YES]; - return; - } - } - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - Event Response -- (void)forgetBtnAction:(UIButton *)sender { - - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"PKIDLoginViewController2"); - config.message = YMLocalizedString(@"PKIDLoginViewController3"); - config.actionStyle = TTAlertActionConfirmStyle; - config.confirmButtonConfig.title = YMLocalizedString(@"PKIDLoginViewController4"); - [TTPopup alertWithConfig:config confirmHandler:^{ - - } cancelHandler:^{ - - }]; - - - -} - -- (void)submitBtnAction:(UIButton *)sender { - if (![self.newsPwdView.contentTextField.text isEqual:self.checkPwdView.contentTextField.text]) { - [self showErrorToast:YMLocalizedString(@"XPMineModifPayPwdViewController2")]; - return; - } - - if (![self isPureNum:self.checkPwdView.contentTextField.text] || ![self isPureNum:self.newsPwdView.contentTextField.text]) { - [self showErrorToast:YMLocalizedString(@"XPMineModifPayPwdViewController3")]; - return; - } - - [self.presenter modifyPaymentPasswordWitholdPassword:self.currentPwdView.contentTextField.text newPassword:self.newsPwdView.contentTextField.text]; -} - -#pragma mark - Getters And Setters -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 25; - } - return _stackView; -} - -- (XPMineModifPayPwdView *)currentPwdView { - if (!_currentPwdView) { - _currentPwdView = [[XPMineModifPayPwdView alloc] init]; - _currentPwdView.placeholder = YMLocalizedString(@"XPMineModifPayPwdViewController4"); - _currentPwdView.contentTextField.keyboardType = UIKeyboardTypeNumberPad; - } - return _currentPwdView; -} - -- (XPMineModifPayPwdView *)newsPwdView { - if (!_newsPwdView) { - _newsPwdView = [[XPMineModifPayPwdView alloc] init]; - _newsPwdView.placeholder = YMLocalizedString(@"XPMineModifPayPwdViewController5"); - _newsPwdView.contentTextField.keyboardType = UIKeyboardTypeNumberPad; - } - return _newsPwdView; -} - -- (XPMineModifPayPwdView *)checkPwdView { - if (!_checkPwdView) { - _checkPwdView = [[XPMineModifPayPwdView alloc] init]; - _checkPwdView.placeholder = YMLocalizedString(@"XPMineModifPayPwdViewController6"); - _checkPwdView.contentTextField.keyboardType = UIKeyboardTypeNumberPad; - } - return _checkPwdView; -} - -- (UIButton *)submitBtn { - if (!_submitBtn) { - _submitBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_submitBtn setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateDisabled]; - [_submitBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_submitBtn setTitle:YMLocalizedString(@"XPAnchorAudienceUpMicView2") forState:UIControlStateNormal]; - _submitBtn.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightRegular]; - _submitBtn.layer.masksToBounds = YES; - _submitBtn.layer.cornerRadius = 45/2; - _submitBtn.enabled = YES; - [_submitBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor disableButtonColor], [DJDKMIMOMColor disableButtonColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateDisabled]; - [_submitBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_submitBtn addTarget:self action:@selector(submitBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _submitBtn; -} - -- (UIButton *)forgetBtn { - if (!_forgetBtn) { - _forgetBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_forgetBtn setEnlargeEdgeWithTop:5 right:5 bottom:5 left:5]; - [_forgetBtn setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - [_forgetBtn setTitle:YMLocalizedString(@"XPMineModifPayPwdViewController8") forState:UIControlStateNormal]; - _forgetBtn.titleLabel.font = [UIFont systemFontOfSize:13]; - [_forgetBtn addTarget:self action:@selector(forgetBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _forgetBtn; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.h b/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.h deleted file mode 100644 index a5795cd..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineNotificaViewController.h -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineNotificaViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.m deleted file mode 100644 index b289377..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.m +++ /dev/null @@ -1,164 +0,0 @@ -// -// YMMineNotificaViewController.m -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "XPMineNotificaViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///Model -#import "XPMineNotificationItemModel.h" -///View -#import "XPMineNotificationTableViewCell.h" -///P -#import "XPMineNotificaProtocol.h" -#import "XPMineNotificaPresenter.h" - -@interface XPMineNotificaViewController () - -@property (nonatomic, strong) NSArray *dataModelArray; -/// -@property (nonatomic,strong) UITableView *tableView; -@end - -@implementation XPMineNotificaViewController - -- (XPMineNotificaPresenter *)createPresenter { - return [[XPMineNotificaPresenter alloc] init]; -} - -#pragma mark - Life Cycle -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [self.presenter requestUserInfoNotifyStatus]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineNotificaViewController0"); - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(0); - }]; -} - -/// 获取系统通知权限 -- (BOOL)systemNotify { -#warning to do 需要实现的 - /* - SecretarySystemUIDs *uids = GetCore(ImFriendCore).secretarySystemUIDs; - if (uids == nil) { - //uid为空时，获取、缓存 - [GetCore(ImFriendCore) requestSecretarySystemUIDsWithCompletion:nil]; - return NO; - } - - BOOL secretaryNotify = [GetCore(ImFriendCore) notifyForNewMsg:uids.secretaryUid]; - BOOL systemNotify = [GetCore(ImFriendCore) notifyForNewMsg:uids.systemMessageUid]; - - return secretaryNotify && systemNotify; - */ - return YES; -} - -#pragma mark - UITableViewDelegate -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.dataModelArray.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPMineNotificationItemModel *item = [self.dataModelArray xpSafeObjectAtIndex:indexPath.row]; - XPMineNotificationTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineNotificationTableViewCell class]) forIndexPath:indexPath]; - cell.delegate = self; - cell.itemModel = item; - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 80; -} - - -#pragma mark - Private -/// 获取手机推送权限 -+ (void)mobilePushAuthority:(void(^)(BOOL isAuthority))authority { - - if (@available(iOS 10.0, *)) { - [[UNUserNotificationCenter currentNotificationCenter] getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) { - - BOOL permission = settings.authorizationStatus == UNAuthorizationStatusAuthorized; - dispatch_async(dispatch_get_main_queue(), ^{ - !authority ?: authority(permission); - }); - }]; - } else { - BOOL permission = [[UIApplication sharedApplication] currentUserNotificationSettings].types != UIUserNotificationTypeNone; - !authority ?: authority(permission); - } -} - - - -#pragma mark - XPMineNotificationTableViewCell -- (void)xPMineNotificationTableViewCell:(XPMineNotificationTableViewCell *)cell switchStatus:(BOOL)status { - NSIndexPath *indexPath = [self.tableView indexPathForCell:cell]; - self.dataModelArray[indexPath.row].notification = status; - if (indexPath.row == 0) { - [self.presenter updateUserInfoSystemNotify:status]; - } else { - [self.presenter updateBroadCastNotify:status]; - } - /* - if (!status) { -#warning to do 弹框 -// [TTPopup alertWithMessage:@"您未开启推送通知权限，请前往设置" confirmHandler:^{ -// [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]]; -// } cancelHandler:^{ -// -// }]; - self.dataModelArray[0].notification = NO; - [self.tableView reloadData]; - return; - } - //iOS端只上传给服务器统计，暂无业务操作关系 - [self.presenter updateUserInfoSystemNotify:status]; - */ -} - -#pragma mark - XPMineNotificaProtocol -- (void)requestUserInfoNotifyStatusSuccess:(NSArray *)array { - self.dataModelArray = array; - [self.tableView reloadData]; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.showsVerticalScrollIndicator = NO; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - [_tableView registerClass:[XPMineNotificationTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineNotificationTableViewCell class])]; - _tableView.backgroundColor = [UIColor clearColor]; - } - return _tableView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Setting/XPMinePayPwdViewController.h b/YuMi/Modules/YMMine/View/Setting/XPMinePayPwdViewController.h deleted file mode 100644 index 2bf2214..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMinePayPwdViewController.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMMinePayPwdViewController.h -// YUMI -// -// Created by YUMI on 2021/9/18. -//设置支付密码（初次） 重置支付密码 - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSUInteger, PayPasswordType) { - PayPasswordType_Set,///设置支付密码 - PayPasswordType_Reset,///重置支付密码 -}; - -@protocol XPMinePayPwdViewControllerDelegate - --(void)payPasswordSuccess; - -@end - -@class UserInfoModel; -@interface XPMinePayPwdViewController : MvpViewController -/// -@property (nonatomic,assign) PayPasswordType type; -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Setting/XPMinePayPwdViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMinePayPwdViewController.m deleted file mode 100644 index 3244db3..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMinePayPwdViewController.m +++ /dev/null @@ -1,229 +0,0 @@ -// -// YMMinePayPwdViewController.m -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "XPMinePayPwdViewController.h" -///Third -#import -#import -///Tool -#import "UIImage+Utils.h" -#import "DJDKMIMOMColor.h" -#import "CountDownHelper.h" -///Model -#import "UserInfoModel.h" -///View -#import "XPMineModifPayPwdView.h" -#import "XPMineSettingViewController.h" -///P -#import "XPMinePayPwdPresenter.h" -#import "XPMinePayPwdProtocol.h" - -@interface XPMinePayPwdViewController () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///设置支付密码 -@property (nonatomic, strong) XPMineModifPayPwdView *pwdInputView; -///再次输入支付密码 -@property (nonatomic, strong) XPMineModifPayPwdView *repeatPwdInputView; -/////请输入验证码 -//@property (nonatomic, strong) XPMinePayPwdInputView *verificationCodeInputView; -///提交按钮 -@property (nonatomic, strong) UIButton *submitButton; -@property (nonatomic, strong) UILabel *tipsLabel; -@end - -@implementation XPMinePayPwdViewController - -- (void)dealloc { - -} - -- (XPMinePayPwdPresenter *)createPresenter { - return [[XPMinePayPwdPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubviews]; - - self.title = YMLocalizedString(@"XPMinePayPwdViewController0"); - - -} - -- (void)initSubviews { - self.view.backgroundColor = [UIColor whiteColor]; - [self.view addSubview:self.stackView]; - [self.view addSubview:self.submitButton]; - [self.stackView addArrangedSubview:self.pwdInputView]; - [self.stackView addArrangedSubview:self.repeatPwdInputView]; - - - - [self makeConstriants]; -} - -- (void)makeConstriants { - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(30); - make.leading.trailing.mas_equalTo(self.view); - }]; - - - [self.submitButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(275); - make.trailing.mas_equalTo(self.view).offset(-15); - make.leading.mas_equalTo(self.view).offset(15); - make.height.mas_equalTo(46); - }]; - - -} - - - - -- (void)setPayPasswordSuccess { - NSString *message = YMLocalizedString(@"XPMinePayPwdViewController3"); - [self showSuccessToast:message]; - if(self.delegate && [self.delegate respondsToSelector:@selector(payPasswordSuccess)]){ - [self.delegate payPasswordSuccess]; - } - @weakify(self) - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @strongify(self) - for (UIViewController *VC in self.navigationController.viewControllers) { - if ([VC isKindOfClass:[XPMineSettingViewController class]]) { - [self.navigationController popToViewController:VC animated:YES]; - return; - } - } - [self.navigationController popViewControllerAnimated:YES]; - }); -} - - - -#pragma mark - event -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -- (void)onClickSubmitButton { - [self.view endEditing:YES]; - NSString *pwd = self.pwdInputView.contentTextField.text; - NSString *repeatPwd = self.repeatPwdInputView.contentTextField.text; -// -// -// // 位数校验 - if (pwd.length != 6) { - NSString *msg = YMLocalizedString(@"XPMinePayPwdViewController4"); - [self showErrorToast:msg]; - return; - } -// -// // 纯数字校验 - if (![self isPureNum:pwd]) { - NSString *msg = YMLocalizedString(@"XPMinePayPwdViewController5"); - [self showErrorToast:msg]; - return; - } -// -// // 重复密码校验 - if (![pwd isEqualToString:repeatPwd]) { - [self showErrorToast:YMLocalizedString(@"XPMinePayPwdViewController6")]; - return; - } - - - - //设置密码 - [self.presenter setPayPassword:pwd ]; -} - -#pragma mark - Private -/** 判断一个字符串是纯数字 */ -- (BOOL)isPureNum:(NSString *)text { - if (!text) { - return NO; - } - - NSScanner *scan = [NSScanner scannerWithString:text]; - int val; - return [scan scanInt:&val] && [scan isAtEnd]; -} - -- (NSString *)phoneNumber { - return self.userInfo.phone; -} - -#pragma mark - Getter && Setter -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 25; - } - return _stackView; -} -- (XPMineModifPayPwdView *)pwdInputView { - if (!_pwdInputView) { - _pwdInputView = [[XPMineModifPayPwdView alloc] init]; - _pwdInputView.placeholder = YMLocalizedString(@"XPMinePayPwdViewController10"); - _pwdInputView.contentTextField.keyboardType = UIKeyboardTypeNumberPad; - } - return _pwdInputView; -} - -- (XPMineModifPayPwdView *)repeatPwdInputView { - if (!_repeatPwdInputView) { - _repeatPwdInputView = [[XPMineModifPayPwdView alloc] init]; - _repeatPwdInputView.placeholder = YMLocalizedString(@"XPMinePayPwdViewController11"); - _repeatPwdInputView.contentTextField.keyboardType = UIKeyboardTypeNumberPad; - - } - return _repeatPwdInputView; -} - - - -- (UIButton *)submitButton { - if (!_submitButton) { - _submitButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_submitButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateDisabled]; - [_submitButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_submitButton setTitle:YMLocalizedString(@"XPAnchorAudienceUpMicView2") forState:UIControlStateNormal]; - _submitButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightRegular]; - _submitButton.layer.masksToBounds = YES; - _submitButton.layer.cornerRadius = 45/2; - _submitButton.enabled = YES; - [_submitButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor disableButtonColor], [DJDKMIMOMColor disableButtonColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateDisabled]; - [_submitButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_submitButton addTarget:self action:@selector(onClickSubmitButton) forControlEvents:UIControlEventTouchUpInside]; - } - return _submitButton; -} - -- (UILabel *)tipsLabel { - if (!_tipsLabel) { - _tipsLabel = [[UILabel alloc] init]; - _tipsLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _tipsLabel.font = [UIFont systemFontOfSize:13]; - _tipsLabel.numberOfLines = 0; - _tipsLabel.hidden = YES; - NSString *phonePrefix = [[self phoneNumber] substringToIndex:3]; - NSString *phoneSuffix = [[self phoneNumber] substringFromIndex:7]; - _tipsLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMinePayPwdViewController9"), phonePrefix, phoneSuffix]; - } - return _tipsLabel; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.h b/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.h deleted file mode 100644 index 48ba5a1..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineResetPayPwdViewController.h -// YUMI -// -// Created by YUMI on 2021/9/18. -// 重设支付密码 - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineResetPayPwdViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.m deleted file mode 100644 index 1a8f49c..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.m +++ /dev/null @@ -1,140 +0,0 @@ -// -// YMMineResetPayPwdViewController.m -// YUMI -// -// Created by YUMI on 2021/9/18. -// 重置支付密码 - -#import "XPMineResetPayPwdViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -///View -#import "XPMineModifPayPwdView.h" -///P -#import "XPMineResetPayPasswordPresenter.h" -#import "XPMineResetPayPasswordProtocol.h" -///VC -#import "XPMineSettingViewController.h" - -@interface XPMineResetPayPwdViewController () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///新的密码 -@property (nonatomic,strong) XPMineModifPayPwdView *passwordView; -///校验 -@property (nonatomic,strong) XPMineModifPayPwdView *verificationCodeInputView; -/// -@property (nonatomic,strong) UIButton *submitButton; -@end - -@implementation XPMineResetPayPwdViewController - -- (XPMineResetPayPasswordPresenter *)createPresenter { - return [[XPMineResetPayPasswordPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initEvents]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineResetPayPwdViewController0"); - [self.view addSubview:self.stackView]; - [self.view addSubview:self.submitButton]; - - [self.stackView addArrangedSubview:self.passwordView]; - [self.stackView addArrangedSubview:self.verificationCodeInputView]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - }]; - - [self.submitButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.stackView.mas_bottom).offset(45); - make.trailing.leading.mas_equalTo(self.view).inset(32); - make.height.mas_equalTo(45); - }]; -} - -- (void)initEvents { - @weakify(self); - RAC(self.submitButton, enabled) = [RACSignal combineLatest:@[self.passwordView.contentTextField.rac_textSignal, self.verificationCodeInputView.contentTextField.rac_textSignal] reduce:^id _Nonnull(NSString *password, NSString *checkPassword){ - return @(password.length == 6 && checkPassword.length == 6); - }]; -} - -#pragma mark - XPMineResetPayPasswordProtocol -- (void)resetPayPasswordSuccess { - [self showErrorToast:YMLocalizedString(@"XPMineResetPayPwdViewController1")]; - for (UIViewController *VC in self.navigationController.viewControllers) { - if ([VC isKindOfClass:[XPMineSettingViewController class]]) { - [self.navigationController popToViewController:VC animated:YES]; - return; - } - } - [self.navigationController popViewControllerAnimated:YES]; -} -#pragma mark - Event Response -- (void)submitButtonAction:(UIButton *)sender { - if (![self.passwordView.contentTextField.text isEqual:self.verificationCodeInputView.contentTextField.text]) { - [self showErrorToast:YMLocalizedString(@"XPMineResetPayPwdViewController2")]; - } - [self.presenter resetPayPassword:self.passwordView.contentTextField.text phone:@"" veriftCode:@""]; -} - -#pragma mark - Getters And Setters -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 0; - } - return _stackView; -} - -- (XPMineModifPayPwdView *)passwordView { - if (!_passwordView) { - _passwordView = [[XPMineModifPayPwdView alloc] init]; - _passwordView.placeholder = YMLocalizedString(@"XPMineResetPayPwdViewController3"); - } - return _passwordView; -} - -- (XPMineModifPayPwdView *)verificationCodeInputView { - if (!_verificationCodeInputView) { - _verificationCodeInputView = [[XPMineModifPayPwdView alloc] init]; - _verificationCodeInputView.placeholder = YMLocalizedString(@"XPMineResetPayPwdViewController4"); - } - return _verificationCodeInputView; -} - -- (UIButton *)submitButton { - if (!_submitButton) { - _submitButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_submitButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_submitButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateDisabled]; - [_submitButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - _submitButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; - _submitButton.layer.masksToBounds = YES; - _submitButton.layer.cornerRadius = 45/2; - _submitButton.enabled = NO; - [_submitButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_submitButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor disableButtonColor], [DJDKMIMOMColor disableButtonColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateDisabled]; - [_submitButton addTarget:self action:@selector(submitButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _submitButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.h b/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.h deleted file mode 100644 index 324c9e7..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMineSettingViewController.h -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel; -@interface XPMineSettingViewController : MvpViewController -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m deleted file mode 100644 index c28ee4e..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m +++ /dev/null @@ -1,498 +0,0 @@ -// -// YMMineSettingViewController.m -// YUMI -// -// Created by YUMI on 2021/9/17. -// - -#import "XPMineSettingViewController.h" -///Third -#import -#import -#import "SDWebImageManager.h" -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -#import "YUMIHtmlUrl.h" -#import "YYUtility.h" -#import "ClientConfig.h" -///Model -#import "XPMineSettingItemModel.h" -#import "UserInfoModel.h" -#import "XPVersionUpdateModel.h" -///View -#import "XPMineSettingTableViewCell.h" -#import "TTAlertConfig.h" -#import "TTPopup.h" -#import "XPUpgradeView.h" -///P -#import "XPMineSettingPresent.h" -#import "XPMineSettingProtocol.h" -///VC -#import "XPMineAboutUsViewController.h" -#import "XPMineFeedbackViewController.h" -#import "XPMineNotificaViewController.h" -#import "XPMinePayPwdViewController.h" -#import "XPMineModifPayPwdViewController.h" -#import "XPPrivacyViewController.h" -#import "XPMineLoginPasswordViewController.h" -#import "XPMineBlackListViewController.h" -#import "XPMaskManagerVC.h" -#import "XPMineSwitchLanguageVC.h" -///不同模块的VC -#import "XPWebViewController.h" -#import "XPLoginVerifBindPhoneViewController.h" -#import "AccountBindingViewController.h" -#import "VipSettingViewController.h" -#import "BaseNavigationController.h" -#import "LoginViewController.h" -#import "SocialShareManager.h" -#import "FirstRechargeManager.h" - -@interface XPMineSettingViewController () -/// -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSArray *> *datasource; -///退出登录 -@property (nonatomic,strong) UIButton *logoutButton; -///底部的试图 -@property (strong, nonatomic) UIView *footerView; -@end - -@implementation XPMineSettingViewController -- (void)dealloc -{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} -- (XPMineSettingPresent *)createPresenter { - return [[XPMineSettingPresent alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor whiteColor]; - [self initSubViews]; - [self initSubViewConstraints]; - [self.presenter getMineSettingDataSourceWith:self.userInfo]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(switchLanguage:) name:@"kSwitchLanguage" object:nil]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(setNavView) name:@"kNavViewUpdateWhenLanguageUpdate" object:nil]; -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; -} - --(void)setNavView{ - UIBarButtonItem *leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"common_nav_back"] ms_SetImageForRTL] - style:UIBarButtonItemStyleDone - target:self - action:@selector(backClick)]; - leftBarButtonItem.tintColor = [DJDKMIMOMColor mainTextColor]; - self.navigationItem.leftBarButtonItem = leftBarButtonItem; -} --(void)switchLanguage:(NSNotification *)not{ - for (UIView *obj in self.view.subviews) { - [obj removeFromSuperview]; - } - self.navigationItem.rightBarButtonItem = nil; - self.navigationItem.leftBarButtonItem = nil; - [self.presenter clearList]; - self.tableView = nil; - self.datasource = nil; - self.logoutButton = nil; - self.footerView = nil; - [self initSubViews]; - [self initSubViewConstraints]; - [self.presenter getMineSettingDataSourceWith:self.userInfo]; -} --(void)backClick{ - [self.navigationController popViewControllerAnimated:YES]; -} -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - ///每次都需要刷新一个userinfo - [self.presenter getUserInfo]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineSettingViewController0"); - [self.view addSubview:self.tableView]; - [self.footerView addSubview:self.logoutButton]; - self.tableView.tableFooterView = self.footerView; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view).inset(14); - make.top.mas_equalTo(12); - }]; - [self.logoutButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.footerView); - make.size.mas_equalTo(CGSizeMake(KScreenWidth - 32* 2, 50)); - }]; -} - -- (void)toBindEmail { - AccountBindingViewController *bindingVC = [[AccountBindingViewController alloc] initWithType:BindingDisplayType_email - currentBindingAccount:self.userInfo.email - areaCode:@"" - userInfo:self.userInfo]; - [self.navigationController pushViewController:bindingVC animated:YES]; -} - -- (void)pushViewControllerWithType:(XPMineSettingItemType)type { - switch (type) { - case XPMineSettingItemType_Email: - [self toBindEmail]; - break; - case XPMineSettingItemType_Phone: - { - AccountBindingViewController *bindingVC = [[AccountBindingViewController alloc] initWithType:BindingDisplayType_phoneNum - currentBindingAccount:self.userInfo.phone - areaCode:self.userInfo.phoneAreaCode - userInfo:self.userInfo]; - [self.navigationController pushViewController:bindingVC animated:YES]; - // 绑定手机 -// if (self.userInfo.isBindPhone) { // 如果已经绑定 -// XPLoginBindPhoneResultViewController *vc = [[XPLoginBindPhoneResultViewController alloc] init]; -// vc.userInfo = _userInfo; -// [self.navigationController pushViewController:vc animated:YES]; -// }else { -// XPLoginVerifBindPhoneViewController *vc = [[XPLoginVerifBindPhoneViewController alloc] init]; -// vc.bindingPhoneNumType = XPBindingPhoneNumTypeNormal; -// vc.userInfo = _userInfo; -// [self.navigationController pushViewController:vc animated:YES]; -// } - } - break; - case XPMineSettingItemType_Pay_Password: - { - if (!self.userInfo.isBindPhone) { - [self showErrorToast:YMLocalizedString(@"XPMineSettingViewController1")]; - return; - } - //支付密码 - if (self.userInfo.isBindPaymentPwd) { - XPMineModifPayPwdViewController *vc = [[XPMineModifPayPwdViewController alloc] init]; - vc.userInfo = self.userInfo; - [self.navigationController pushViewController:vc animated:YES]; - } else { - XPMinePayPwdViewController *vc = [[XPMinePayPwdViewController alloc] init]; - vc.userInfo = self.userInfo; - [self.navigationController pushViewController:vc animated:YES]; - } - } - break; - case XPMineSettingItemType_Login_Password: - { - if ([NSString isEmpty:self.userInfo.email] && [NSString isEmpty:self.userInfo.phone]) { - [self toBindEmail]; - return; - } - //支付密码 - if (self.userInfo.isBindPasswd) { - XPMineLoginPasswordViewController *vc = [[XPMineLoginPasswordViewController alloc] init]; - vc.userInfo = self.userInfo; - vc.isModifiPwd = YES; - [self.navigationController pushViewController:vc animated:YES]; - } else { - XPMineLoginPasswordViewController *vc = [[XPMineLoginPasswordViewController alloc] init]; - vc.userInfo = self.userInfo; - vc.isModifiPwd = NO; - [self.navigationController pushViewController:vc animated:YES]; - } - } - break; - case XPMineSettingItemType_Black_Manager: - { - XPMineBlackListViewController * blackMangerVC = [[XPMineBlackListViewController alloc] init]; - [self.navigationController pushViewController:blackMangerVC animated:YES]; - } - break; - case XPMineSettingItemType_Notification_Remind: - { - XPMineNotificaViewController * notiVC = [[XPMineNotificaViewController alloc] init]; - [self.navigationController pushViewController:notiVC animated:YES]; - } - break; - case XPMineSettingItemType_Permission: - { - XPPrivacyViewController * pvc = [[XPPrivacyViewController alloc] init]; - [self.navigationController pushViewController:pvc animated:YES]; - } - break; - case XPMineSettingItemType_Helper: - { - [self pushWebViewWIthUrl:URLWithType(kFAQURL)]; - } - break; - case XPMineSettingItemType_Feedback: - { - XPMineFeedbackViewController * feedbackVC = [[XPMineFeedbackViewController alloc] init]; - [self.navigationController pushViewController:feedbackVC animated:YES]; - } - break; - case XPMineSettingItemType_Clear_Memory: - { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPMineSettingViewController2"); - config.message = YMLocalizedString(@"XPMineSettingViewController3"); - [TTPopup alertWithConfig:config confirmHandler:^{ - NSSet *websiteDataTypes = [WKWebsiteDataStore allWebsiteDataTypes]; - NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0]; - @weakify(self); - [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes modifiedSince:dateFrom completionHandler:^{ - @strongify(self); - [self showSuccessToast:YMLocalizedString(@"XPMineSettingViewController4")]; - }]; - [[SDWebImageManager sharedManager].imageCache clearWithCacheType:SDImageCacheTypeAll completion:nil]; - } cancelHandler:^{ - }]; - } - break; - case XPMineSettingItemType_About_Us: - { - XPMineAboutUsViewController * aboutusVC = [[XPMineAboutUsViewController alloc] init]; - [self.navigationController pushViewController:aboutusVC animated:YES]; - } - break; - case XPMineSettingItemType_CheckUpdate: - { - [self showLoading]; - [self.presenter getVersionUpdate]; - } - break; - case XPMineSettingItemType_Delete_Account: { - [self pushWebViewWIthUrl:URLWithType(kAccountlogoutConfirmURL)]; - } - break; - case XPMineSettingItemType_Shield_management: - { - XPMaskManagerVC *vc = [XPMaskManagerVC new]; - [self.navigationController pushViewController:vc animated:YES]; - break; - } - case XPMineSettingItemType_Language: - { - XPMineSwitchLanguageVC*languageVC = [XPMineSwitchLanguageVC new]; - [self.navigationController pushViewController:languageVC animated:YES]; - } - break; - case XPMineSettingItemType_VIP: { - VipSettingViewController *vc = [[VipSettingViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; - } - default: - break; - } -} - -- (void)pushWebViewWIthUrl:(NSString *)url { - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = url; - [self.navigationController pushViewController:webVC animated:YES]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 45; -} - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return self.datasource.count; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource[section].count; -} - -- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath { - NSArray * array = [self.datasource xpSafeObjectAtIndex:indexPath.section]; - XPMineSettingItemModel *model = [array xpSafeObjectAtIndex:indexPath.row]; - switch (model.type) { - case XPMineSettingItemType_Email: - case XPMineSettingItemType_VIP: - case XPMineSettingItemType_Shield_management: - case XPMineSettingItemType_Permission: - [(XPMineSettingTableViewCell *)cell setTopCorner:YES bottomCorner:NO]; - break; - case XPMineSettingItemType_Pay_Password: - case XPMineSettingItemType_Language: - case XPMineSettingItemType_Black_Manager: - case XPMineSettingItemType_About_Us: - [(XPMineSettingTableViewCell *)cell setTopCorner:NO bottomCorner:YES]; - break; - default: - [(XPMineSettingTableViewCell *)cell setTopCorner:NO bottomCorner:NO]; - break; - } -// if (indexPath.row == 0) { -// [(XPMineSettingTableViewCell *)cell setTopCorner:YES bottomCorner:NO]; -// } else if (indexPath.row == self.datasource[indexPath.section].count-1) { -// [(XPMineSettingTableViewCell *)cell setTopCorner:NO bottomCorner:YES]; -// } else { -// [(XPMineSettingTableViewCell *)cell setTopCorner:NO bottomCorner:NO]; -// } -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPMineSettingTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineSettingTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineSettingTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineSettingTableViewCell class])]; - } - NSArray * array = [self.datasource xpSafeObjectAtIndex:indexPath.section]; - XPMineSettingItemModel * model = [array xpSafeObjectAtIndex:indexPath.row]; - cell.itemModel = model; - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - if (section != 0) { - return 15; - } - return 0.01f; -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - UIView * view = [[UIView alloc] init]; - view.frame = CGRectMake(0, 0, KScreenWidth, 15); - view.backgroundColor = [UIColor clearColor]; - return view; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { - return 0.01f; -} - -- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section { - UIView * view = [[UIView alloc] init]; - view.frame = CGRectMake(0, 0, KScreenWidth, 0.01f); - view.backgroundColor = [UIColor clearColor]; - return view; -} - - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - XPMineSettingItemModel * model = [[self.datasource xpSafeObjectAtIndex:indexPath.section] xpSafeObjectAtIndex:indexPath.row]; - [self pushViewControllerWithType:model.type]; - } -} -#pragma mark - XPMineSettingProtocol -- (void)getMineSettingDatasourceSuccess:(NSArray *)array { - self.datasource = array; - [self.tableView reloadData]; -} - -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { - self.userInfo = userInfo; - [self.presenter getMineSettingDataSourceWith:userInfo]; -} - -- (void)logoutCurrentAccountSuccess { - // 停止首充监控 - [[FirstRechargeManager sharedManager] stopMonitoring]; - - [[SocialShareManager sharedManager] reset]; - - LoginViewController *lvc = [[LoginViewController alloc] init]; - BaseNavigationController * navigationController = [[BaseNavigationController alloc] initWithRootViewController:lvc]; - kWindow.rootViewController = navigationController; -} - -- (void)getVersionUpdateFail{ - [self hideHUD]; -} -///版本更新 --(void)getVersionUpdate:(XPVersionUpdateModel *)model{ - [self hideHUD]; - if(model.updateVersion.length == 0){ - [self showErrorToast:YMLocalizedString(@"XPMineSettingViewController5")]; - return; - } - NSString *appVersion = [YYUtility appVersion]; - NSString *updateVersion = model.updateVersion; - NSComparisonResult result = [appVersion compare:updateVersion options:NSNumericSearch]; - if(result == NSOrderedSame || result == NSOrderedDescending){ - [self showErrorToast:YMLocalizedString(@"XPMineSettingViewController6")]; - return; - } - XPUpgradeView *view = [[XPUpgradeView alloc] init]; - view.versionModel = model; - TTPopupService * service = [[TTPopupService alloc] init]; - service.contentView = view; - service.shouldDismissOnBackgroundTouch = NO; - [TTPopup popupWithConfig:service]; -} - -#pragma mark - Event Response -- (void)logoutButtonAction:(UIButton *)sender { - id isSaveBindPwd = [[NSUserDefaults standardUserDefaults]valueForKey:@"kSaveBindPwd"]; - if(self.userInfo.isBindPasswd == NO && isSaveBindPwd == nil){ - [[NSUserDefaults standardUserDefaults]setValue:@"1" forKey:@"kSaveBindPwd"]; - [[NSUserDefaults standardUserDefaults]synchronize]; - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPMineSettingViewController9"); - config.message = YMLocalizedString(@"XPMineSettingViewController10"); - [TTPopup alertWithConfig:config confirmHandler:^{ -// if (!self.userInfo.isBindPhone) { -// XPLoginVerifBindPhoneViewController *vc = [[XPLoginVerifBindPhoneViewController alloc] init]; -// vc.bindingPhoneNumType = XPBindingPhoneNumTypeNormal; -// vc.userInfo = self.userInfo; -// vc.isLogout = YES; -// [self.navigationController pushViewController:vc animated:YES]; -// return; -// } - - [self logoutCurrentAccountSuccess]; - } cancelHandler:^{ - [self.presenter logoutCurrentAccount]; - }]; - return; - } - - [self.presenter logoutCurrentAccount]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.showsVerticalScrollIndicator = NO; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - [_tableView registerClass:[XPMineSettingTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineSettingTableViewCell class])]; - } - return _tableView; -} - -- (UIView *)footerView { - if (!_footerView) { - _footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 88)]; - } - return _footerView; -} - -- (UIButton *)logoutButton { - if (!_logoutButton) { - _logoutButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _logoutButton.frame = CGRectMake(32, 40, KScreenWidth - 32* 2, 50); - _logoutButton.layer.masksToBounds = YES; - _logoutButton.layer.cornerRadius = 50/2; - _logoutButton.titleLabel.font = [UIFont systemFontOfSize:16]; - [_logoutButton addTarget:self action:@selector(logoutButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_logoutButton setTitle:YMLocalizedString(@"XPMineSettingViewController7") forState:UIControlStateNormal]; - _logoutButton.backgroundColor = UIColorFromRGB(0xF2F3F7); - [_logoutButton setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateNormal]; - } - return _logoutButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.h b/YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.h deleted file mode 100644 index 2a4be70..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineSwitchLanguageVC.h -// YuMi -// -// Created by duoban on 2024/4/8. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineSwitchLanguageVC : BaseViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.m b/YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.m deleted file mode 100644 index 8e008fb..0000000 --- a/YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.m +++ /dev/null @@ -1,150 +0,0 @@ -// -// XPMineSwitchLanguageVC.m -// YuMi -// -// Created by duoban on 2024/4/8. -// - -#import "XPMineSwitchLanguageVC.h" -#import "XPMineSettingItemModel.h" -#import "XPMineSwitchLanguageCell.h" -#import "YMLanguageConfig.h" -@interface XPMineSwitchLanguageVC () -@property(nonatomic,strong) UIButton *saveBtn; -@property (nonatomic,strong) UITableView *tableView; -@property(nonatomic,strong) XPMineSettingItemModel * chooseModel; -///数据源 -@property (nonatomic,strong) NSArray *datasource; -@end - -@implementation XPMineSwitchLanguageVC - -- (void)viewDidLoad { - [super viewDidLoad]; - [self installUI]; - [self installConstraints]; -} --(void)installUI{ - self.title = YMLocalizedString(@"XPMineSwitchLanguageVC0"); - self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:self.saveBtn]; - - [self.view addSubview:self.tableView]; -} --(void)installConstraints{ - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(20)); - make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(16)); - make.height.mas_equalTo(kGetScaleWidth(51 * [YMLanguageConfig supportedLanguages].count)); - }]; -} --(void)saveBtnAction{ - // 根据选择的显示名称找到对应的语言代码 - NSString *language = [self languageCodeForDisplayName:self.chooseModel.title]; - - // 设置RTL属性 - if ([YMLanguageConfig isRTLanguage:language]) { - [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft; - [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft; - } else { - [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - - [NSBundle setLanguageText:language]; - [self.navigationController popToRootViewControllerAnimated:YES]; - - [self showLoading]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self hideHUD]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"kNavViewUpdateWhenLanguageUpdate" object:language]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"kSwitchLanguage" object:language]; - }); -} - -// 根据显示名称获取语言代码 -- (NSString *)languageCodeForDisplayName:(NSString *)displayName { - for (NSDictionary *language in [YMLanguageConfig supportedLanguages]) { - if ([language[@"displayName"] isEqualToString:displayName]) { - return language[@"code"]; - } - } - return [YMLanguageConfig defaultLanguage]; -} -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return kGetScaleWidth(51); -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPMineSwitchLanguageCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineSwitchLanguageCell class])]; - XPMineSettingItemModel * model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.model = model; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - XPMineSettingItemModel * model = [self.datasource xpSafeObjectAtIndex:indexPath.row] ; - for (XPMineSettingItemModel *obj in self.datasource) { - obj.isChoose = NO; - if ([model.title isEqualToString:obj.title]){ - model.isChoose = YES; - } - } - self.chooseModel = model; - [self.tableView reloadData]; -} -#pragma mark - 懒加载 -- (NSArray *)datasource{ - if(!_datasource){ - NSMutableArray *items = [NSMutableArray array]; - NSString *currentLanguage = [NSBundle getLanguageText]; - - // 动态创建语言选项 - for (NSDictionary *languageConfig in [YMLanguageConfig supportedLanguages]) { - XPMineSettingItemModel *item = [XPMineSettingItemModel new]; - item.title = languageConfig[@"displayName"]; - item.isChoose = [languageConfig[@"code"] isEqualToString:currentLanguage]; - - if (item.isChoose) { - self.chooseModel = item; - } - - [items addObject:item]; - } - - _datasource = [items copy]; - } - return _datasource; -} -- (UIButton *)saveBtn { - if (!_saveBtn) { - _saveBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_saveBtn setFrame:CGRectMake(0, 0, 50, 30)]; - [_saveBtn setTitle:YMLocalizedString(@"XPMineSwitchLanguageVC1") forState:UIControlStateNormal]; - [_saveBtn setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _saveBtn.titleLabel.font = [UIFont systemFontOfSize:13]; - [_saveBtn addTarget:self action:@selector(saveBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _saveBtn; -} -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.scrollEnabled = NO; - _tableView.showsVerticalScrollIndicator = NO; - _tableView.backgroundColor = [UIColor whiteColor]; - _tableView.layer.cornerRadius = kGetScaleWidth(8); - _tableView.layer.masksToBounds = YES; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - [_tableView registerClass:[XPMineSwitchLanguageCell class] forCellReuseIdentifier:NSStringFromClass([XPMineSwitchLanguageCell class])]; - } - return _tableView; -} -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/CPBindingAnimation.h b/YuMi/Modules/YMMine/View/SubViews/CPBindingAnimation.h deleted file mode 100644 index e47ab2d..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/CPBindingAnimation.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// CPBindingAnimation.h -// YuMi -// -// Created by P on 2024/9/23. -// - -#import - -@class AttachmentModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface CPBindingAnimation : UIView - -@property (nonatomic, strong) AttachmentModel *cpAttachment; - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/CPBindingAnimation.m b/YuMi/Modules/YMMine/View/SubViews/CPBindingAnimation.m deleted file mode 100644 index 48d1059..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/CPBindingAnimation.m +++ /dev/null @@ -1,136 +0,0 @@ -// -// CPBindingAnimation.m -// YuMi -// -// Created by P on 2024/9/23. -// - -#import "CPBindingAnimation.h" - -#import "UIView+VAP.h" -#import "AttachmentModel.h" -#import "QGVAPConfigModel.h" - - -@interface CPBindingAnimation() - -@property (nonatomic, strong) VAPView *cpVAPView; -@property (nonatomic, strong) NetImageView *avatarLoader; -@property (nonatomic, strong) NetImageView *cpAvatarLoader; - -@property (nonatomic, copy) void(^completeDisplay)(void); - -@end - -@implementation CPBindingAnimation - -- (instancetype)init { - if (self = [super init]) { - [self addSubview:self.cpVAPView]; - [self.cpVAPView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - } - return self; -} - -// {"data":{"giftUrl":"https://image.pekolive.com/I Do.png","partitionId":2,"receiverAvatar":"https://img.molistar.xyz/default_avatar_molistar.png","roomUid":3238,"senderAvatar":"https://img.molistar.xyz/default_avatar_molistar.png"},"first":64,"second":643} -- (void)setCpAttachment:(AttachmentModel *)cpAttachment { - _cpAttachment = cpAttachment; - [self startPlay]; -} - -- (void)startPlay { - NSString *filePath = [[NSBundle mainBundle] pathForResource:@"CP绑定" ofType:@"mp4"]; - [self.cpVAPView playHWDMP4:filePath delegate:self]; -} - -- (void)endPlay { - if (_cpVAPView) { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - self.cpVAPView.hidden = YES; - [self.cpVAPView stopHWDMP4]; - [self.cpVAPView removeFromSuperview]; - self.cpVAPView = nil; - if (self.completeDisplay) { - self.completeDisplay(); - } - - [self removeFromSuperview]; - }); - } -} - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete { - CPBindingAnimation *cpBindingAnimation = [[CPBindingAnimation alloc] init]; - cpBindingAnimation.userInteractionEnabled = YES; - cpBindingAnimation.cpAttachment = attachment; - cpBindingAnimation.completeDisplay = complete; - [superView addSubview:cpBindingAnimation]; - [cpBindingAnimation mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(superView); - make.top.mas_equalTo(146); - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(kGetScaleWidth(272)); - }]; -} - -#pragma mark - HWDMP4PlayDelegate -- (NSString *)contentForVapTag:(NSString *)tag resource:(QGVAPSourceInfo *)info { - NSDictionary *extraInfo = @{@"name1" : self.cpAttachment.data[@"senderNick"], - @"name2" : self.cpAttachment.data[@"receiverNick"]}; - return extraInfo[tag]; -} - -- (void)loadVapImageWithURL:(NSString *)urlStr - context:(NSDictionary *)context - completion:(VAPImageCompletionBlock)completionBlock { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - QGVAPSourceInfo *info = (QGVAPSourceInfo *)context[@"resource"]; - if ([info.contentTag isEqualToString:@"avatar1"] ) { - self.avatarLoader = [[NetImageView alloc] init]; - [self.avatarLoader loadImageWithUrl:self.cpAttachment.data[@"senderAvatar"] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - completionBlock(image, nil, urlStr); - }]; - } else { - self.cpAvatarLoader = [[NetImageView alloc] init]; - [self.cpAvatarLoader loadImageWithUrl:self.cpAttachment.data[@"receiverAvatar"] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - completionBlock(image, nil, urlStr); - }]; - } - }); -} - -- (BOOL)shouldStartPlayMP4:(VAPView *)container config:(QGVAPConfigModel *)config { - return YES; -} - -- (void)viewDidStopPlayMP4:(NSInteger)lastFrameIndex view:(VAPView *)container { -// [self endPlay]; -} - -- (void)viewDidFinishPlayMP4:(NSInteger)totalFrameCount view:(VAPView *)container { - [self endPlay]; -} - -- (void)viewDidFailPlayMP4:(NSError *)error { - [self endPlay]; -} - -#pragma mark - -- (VAPView *)cpVAPView { - if (!_cpVAPView) { - _cpVAPView = [[VAPView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 0)]; - _cpVAPView.contentMode = UIViewContentModeScaleAspectFill; - } - return _cpVAPView; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/CPCard.h b/YuMi/Modules/YMMine/View/SubViews/CPCard.h deleted file mode 100644 index 1b6b4ce..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/CPCard.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// CPCard.h -// YuMi -// -// Created by P on 2024/9/18. -// - - -#import -@class RelationUserVO; - -@interface CPCard : UIView - -@property (nonatomic, assign) BOOL isListItem; -@property (nonatomic, copy) NSString *usersAvatar; -@property (nonatomic, copy) void(^breakTheHeart)(RelationUserVO *model); -@property (nonatomic, copy) void(^switchRelationship)(RelationUserVO *model); - -- (void)updateForUserPage:(RelationUserVO *)model; -- (void)updateForCPList:(RelationUserVO *)model showBreakHeart:(BOOL)showBreakHeart; - - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/CPCard.m b/YuMi/Modules/YMMine/View/SubViews/CPCard.m deleted file mode 100644 index 58356d6..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/CPCard.m +++ /dev/null @@ -1,405 +0,0 @@ -// -// CPCard.m -// YuMi -// -// Created by P on 2024/9/18. -// - -#import "CPCard.h" -//#import -#import "RelationUserVO.h" -#import "XPMineUserInfoViewController.h" -#import "XCCurrentVCStackManager.h" - -@interface CPCard () - -@property (nonatomic, strong) RelationUserVO *relationUser; - -@property (nonatomic, strong) UIImageView *backgroundImage; -@property (nonatomic, strong) UIButton *breakYourHeartButton; -@property (nonatomic, strong) UIButton *isTimeToChageOurRelationshipButton; -@property (nonatomic, strong) NetImageView *avatarView; -@property (nonatomic, strong) NetImageView *headWearImageView; -@property (nonatomic, strong) NetImageView *avatarView_cp; -@property (nonatomic, strong) NetImageView *headWearImageView_cp; -@property (nonatomic, strong) UIButton *cpButton; -@property (nonatomic, strong) UILabel *bottomLabel; -@property (nonatomic, strong) UILabel *topLabel; -@property (nonatomic, strong) NetImageView *bottomImageView; -@property (nonatomic, strong) UILabel *progressUpgradeLabel; -@property (nonatomic, strong) UILabel *progressNumLabel; -@property (nonatomic, strong) UIProgressView *progressView; - -@end - -@implementation CPCard - -- (instancetype)init { - if (self = [super init]) { - [self setupUI]; - } - return self; -} - -- (void)setupUI { - _backgroundImage = [[UIImageView alloc] initWithImage:kImage(@"cp_bg")]; - self.backgroundImage.contentMode = UIViewContentModeScaleAspectFit; - [self addSubview:self.backgroundImage]; - [self.backgroundImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.trailing.mas_equalTo(kGetScaleWidth(-15)); - make.bottom.mas_equalTo(self); - make.top.mas_equalTo(self); - }]; - - UIImageView *heart = [[UIImageView alloc] initWithImage:kImage(@"cp_heart")]; - heart.contentMode = UIViewContentModeScaleAspectFit; - [self addSubview:heart]; - [heart mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(34)); - make.centerX.mas_equalTo(self.backgroundImage); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(125), kGetScaleWidth(60))); - }]; - - UIImageView *avatar_placeholder = [[UIImageView alloc] initWithImage:kImage(@"cp_empty_avatar")]; - avatar_placeholder.contentMode = UIViewContentModeScaleAspectFit; - [self addSubview:avatar_placeholder]; - [avatar_placeholder mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(43)); - make.trailing.mas_equalTo(-56); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(56), kGetScaleWidth(56))); - }]; - - [self addSubview:self.avatarView]; - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(43)); - make.leading.mas_equalTo(56); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(56), kGetScaleWidth(56))); - }]; - [self addSubview:self.headWearImageView]; - [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarView); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(85), kGetScaleWidth(85))); - }]; - - [self addSubview:self.avatarView_cp]; - [self.avatarView_cp mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(avatar_placeholder); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(56), kGetScaleWidth(56))); - }]; - [self addSubview:self.headWearImageView_cp]; - [self.headWearImageView_cp mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarView_cp); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(85), kGetScaleWidth(85))); - }]; - - [self addSubview:self.cpButton]; - [self.cpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.headWearImageView_cp); - }]; - - [self addSubview:self.topLabel]; - [self.topLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.height.mas_equalTo(18); - make.top.mas_equalTo(29); - }]; - - [self addSubview:self.bottomLabel]; - [self.bottomLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.height.mas_equalTo(18); - make.top.mas_equalTo(heart.mas_bottom); - }]; - - [self addSubview:self.bottomImageView]; - [self.bottomImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(100, 19)); - make.top.mas_equalTo(heart).offset(55); - }]; - - [self addSubview:self.progressView]; - [self.progressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.headWearImageView.mas_bottom).offset(4); - make.leading.mas_equalTo(self.backgroundImage).offset(22); - make.trailing.mas_equalTo(self.backgroundImage).offset(-22); - make.height.mas_equalTo(4); - }]; - - [self addSubview:self.breakYourHeartButton]; - [self.breakYourHeartButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(27); - make.trailing.mas_equalTo(-28); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - - [self addSubview:self.isTimeToChageOurRelationshipButton]; - [self.isTimeToChageOurRelationshipButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(27); - make.leading.mas_equalTo(28); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - - [self addSubview:self.progressNumLabel]; - [self.progressNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.progressView.mas_bottom).offset(4); - make.trailing.mas_equalTo(self.progressView); - }]; - - [self addSubview:self.progressUpgradeLabel]; - [self.progressUpgradeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.progressView.mas_bottom).offset(4); - make.leading.mas_equalTo(self.progressView); - }]; -} - -- (void)setIsListItem:(BOOL)isListItem { - _isListItem = isListItem; - self.progressView.hidden = !isListItem; - self.progressNumLabel.hidden = !isListItem; - self.progressUpgradeLabel.hidden = !isListItem; -} - -- (void)setRelationUser:(RelationUserVO *)relationUser { - _relationUser = relationUser; - - self.topLabel.hidden = [relationUser isEmptyRelation]; - self.avatarView_cp.hidden = [relationUser isEmptyRelation]; - self.bottomLabel.hidden = ![relationUser isEmptyRelation]; - self.bottomImageView.hidden = [relationUser isEmptyRelation]; - - self.avatarView.imageUrl = [NSString isEmpty:relationUser.avatar] ? self.usersAvatar : relationUser.avatar; - self.avatarView_cp.imageUrl = relationUser.cpAvatar; - self.avatarView_cp.hidden = [NSString isEmpty:relationUser.cpAvatar]; - self.topLabel.text = [NSString stringWithFormat:@"%ld days", (long)relationUser.cpDay]; - - NSString *imagePath = [NSString stringWithFormat:@"cp_relationship_lv_%ld", self.relationUser.cpLevel]; - self.bottomImageView.image = kImage(imagePath); -} - -- (void)updateForUserPage:(RelationUserVO *)model { - self.relationUser = model; - - self.headWearImageView_cp.hidden = [model isEmptyRelation]; - if ([model isEmptyRelation]) { - self.avatarView.imageUrl = self.usersAvatar; - self.bottomLabel.hidden = NO; - } - self.progressView.hidden = YES; - self.progressNumLabel.hidden = YES; - self.progressUpgradeLabel.hidden = YES; - self.breakYourHeartButton.hidden = YES; - self.isTimeToChageOurRelationshipButton.hidden = YES; - - [self updateCPBG]; -} - -- (void)updateForCPList:(RelationUserVO *)model showBreakHeart:(BOOL)showBreakHeart { - self.relationUser = model; - self.headWearImageView_cp.hidden = NO; - self.breakYourHeartButton.hidden = !showBreakHeart; - self.isTimeToChageOurRelationshipButton.hidden = !showBreakHeart; - - self.isTimeToChageOurRelationshipButton.alpha = (model.clickFlag == CP_CLICK_TYPE_DEFAULT) ? 1 : 0.5; - - [self.backgroundImage mas_updateConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self).offset(-12); - }]; - - self.progressView.progress = (self.relationUser.currentExp * 1.0) / ((self.relationUser.endExp - self.relationUser.startExp) * 1.0); - self.progressUpgradeLabel.text = [NSString stringWithFormat:YMLocalizedString(@"UserDetail_CP_List_0"), [NSString formatNumberToKOrM:@(self.relationUser.endExp - self.relationUser.currentExp).stringValue]]; - self.progressNumLabel.text = [NSString stringWithFormat:@"(%@/%@)", [NSString formatNumberToKOrM:@(self.relationUser.currentExp).stringValue], [NSString formatNumberToKOrM:@(self.relationUser.endExp).stringValue]]; - - [self updateCPBG]; -} - -- (void)updateCPBG { - NSString *baseName = self.isListItem ? @"cp_relationship_bg" : @"cp_bg"; - switch (self.relationUser.relationNameType) { - case CP_TYPE_CP: - self.progressView.progressTintColor = UIColorFromRGB(0xff7330); - break; - case CP_TYPE_BRO: - self.progressView.progressTintColor = UIColorFromRGB(0x2e65ff); - baseName = [baseName stringByAppendingString:@"_bro"]; - break; - case CP_TYPE_SISTER: - self.progressView.progressTintColor = UIColorFromRGB(0xf369b5); - baseName = [baseName stringByAppendingString:@"_sister"]; - break; - case CP_TYPE_FRIEND: - self.progressView.progressTintColor = UIColorFromRGB(0xa353ff); - baseName = [baseName stringByAppendingString:@"_friends"]; - break; - default: - break; - } - - self.backgroundImage.image = kImage(baseName); -} - -- (void)didTapBreakButton { - if (self.breakTheHeart) { - self.breakTheHeart(self.relationUser); - } -} - -- (void)didTapSwitchButton { - if (self.switchRelationship) { - self.switchRelationship(self.relationUser); - } -} - -- (void)didTapCPAvatar { - if (self.relationUser.cpUid > 0) { - XPMineUserInfoViewController * infoVC = [[XPMineUserInfoViewController alloc] init]; - infoVC.uid = self.relationUser.cpUid; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:infoVC animated:YES]; - } -} - -#pragma mark - -- (NetImageView *)avatarView { - if (!_avatarView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - _avatarView = [[NetImageView alloc]initWithConfig:config]; - _avatarView.layer.cornerRadius = kGetScaleWidth(56/2); - _avatarView.layer.masksToBounds = YES; - _avatarView.layer.borderWidth = 1; - _avatarView.userInteractionEnabled = YES; - _avatarView.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _avatarView; -} - -- (NetImageView *)avatarView_cp { - if (!_avatarView_cp) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - _avatarView_cp = [[NetImageView alloc]initWithConfig:config]; - _avatarView_cp.hidden = YES; - _avatarView_cp.layer.cornerRadius = kGetScaleWidth(56/2); - _avatarView_cp.layer.masksToBounds = YES; - _avatarView_cp.layer.borderWidth = 1; - _avatarView_cp.userInteractionEnabled = YES; - _avatarView_cp.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _avatarView_cp; -} - -- (UILabel *)topLabel { - if (!_topLabel) { - _topLabel = [UILabel labelInitWithText:@"" font:kFontMedium(12) textColor:[UIColor whiteColor]]; - } - return _topLabel; -} - -- (UILabel *)bottomLabel { - if (!_bottomLabel) { - _bottomLabel = [UILabel labelInitWithText:YMLocalizedString(@"UserDetail_CP_List_1") font:kFontRegular(12) textColor:[UIColor colorWithWhite:1 alpha:0.8]]; - } - return _bottomLabel; -} - -- (NetImageView *)bottomImageView { - if (!_bottomImageView) { - _bottomImageView = [[NetImageView alloc] init]; - } - return _bottomImageView; -} - -- (UILabel *)progressUpgradeLabel { - if (!_progressUpgradeLabel) { - _progressUpgradeLabel = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:[UIColor whiteColor]]; - _progressUpgradeLabel.alpha = 0.8; - _progressUpgradeLabel.hidden = YES; - } - return _progressUpgradeLabel; -} - -- (UILabel *)progressNumLabel { - if (!_progressNumLabel) { - _progressNumLabel = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:[UIColor whiteColor]]; - _progressNumLabel.alpha = 0.8; - _progressNumLabel.hidden = YES; - } - return _progressNumLabel; -} - -- (UIProgressView *)progressView { - if (!_progressView) { - _progressView = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault]; - _progressView.hidden = YES; - - // 设置背景色和前景色 - _progressView.progressTintColor = UIColorFromRGB(0xF77300); - _progressView.trackTintColor = UIColorFromRGB(0x7E1E00); - - // 设置高度 4 和圆角 1 - _progressView.transform = CGAffineTransformMakeScale(1.0, 4.0 / _progressView.frame.size.height); // 调整高度 - _progressView.layer.cornerRadius = 2.0; // 设置圆角 - _progressView.layer.masksToBounds = YES; // 裁剪超出边界的部分 - } - return _progressView; -} - -- (NetImageView *)headWearImageView { - if (!_headWearImageView) { - _headWearImageView = [[NetImageView alloc]init]; - _headWearImageView.backgroundColor = [UIColor clearColor]; - _headWearImageView.frame = self.bounds; - _headWearImageView.userInteractionEnabled = YES; - _headWearImageView.image = kImage(@"cp_avatar_card_head"); - } - return _headWearImageView; -} - -- (NetImageView *)headWearImageView_cp { - if (!_headWearImageView_cp) { - _headWearImageView_cp = [[NetImageView alloc] init]; - _headWearImageView_cp.backgroundColor = [UIColor clearColor]; - _headWearImageView_cp.frame = self.bounds; - _headWearImageView_cp.userInteractionEnabled = YES; - _headWearImageView_cp.image = kImage(@"cp_avatar_card_head"); - _headWearImageView_cp.hidden = YES; - } - return _headWearImageView_cp; -} - -- (UIButton *)breakYourHeartButton { - if (!_breakYourHeartButton) { - _breakYourHeartButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _breakYourHeartButton.hidden = YES; - [_breakYourHeartButton setImage:kImage(@"cp_break_heart") forState:UIControlStateNormal]; - [_breakYourHeartButton addTarget:self - action:@selector(didTapBreakButton) - forControlEvents:UIControlEventTouchUpInside]; - } - return _breakYourHeartButton; -} - -- (UIButton *)isTimeToChageOurRelationshipButton { - if (!_isTimeToChageOurRelationshipButton) { - _isTimeToChageOurRelationshipButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _isTimeToChageOurRelationshipButton.hidden = YES; - [_isTimeToChageOurRelationshipButton setImage:kImage(@"cp_switch") forState:UIControlStateNormal]; - [_isTimeToChageOurRelationshipButton addTarget:self - action:@selector(didTapSwitchButton) - forControlEvents:UIControlEventTouchUpInside]; - } - return _isTimeToChageOurRelationshipButton; -} - -- (UIButton *)cpButton { - if (!_cpButton) { - _cpButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_cpButton addTarget:self action:@selector(didTapCPAvatar) forControlEvents:UIControlEventTouchUpInside]; - } - return _cpButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/CPEnterRoomTableViewCell.h b/YuMi/Modules/YMMine/View/SubViews/CPEnterRoomTableViewCell.h deleted file mode 100644 index 720e4e6..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/CPEnterRoomTableViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// CPEnterRoomTableViewCell.h -// YuMi -// -// Created by P on 2025/2/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface CPEnterRoomTableViewCell : UITableViewCell - -@property(nonatomic, assign) NSInteger cpIndex; -@property(nonatomic, copy) NSDictionary *dataSource; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/CPEnterRoomTableViewCell.m b/YuMi/Modules/YMMine/View/SubViews/CPEnterRoomTableViewCell.m deleted file mode 100644 index b1a7b56..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/CPEnterRoomTableViewCell.m +++ /dev/null @@ -1,106 +0,0 @@ -// -// CPEnterRoomTableViewCell.m -// YuMi -// -// Created by P on 2025/2/17. -// - -#import "CPEnterRoomTableViewCell.h" - -#import "RoomEnterModel.h" - -@interface CPEnterRoomTableViewCell () - -@property(nonatomic, strong) UIImageView *bgImageView; -@property(nonatomic, strong) UILabel *contentLabel; - -@end - -@implementation CPEnterRoomTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.bgImageView]; - [self.contentView addSubview:self.contentLabel]; - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(70); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.centerY.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.bgImageView).offset(12); - make.leading.mas_equalTo(self.contentView).offset(9); - make.trailing.mas_equalTo(self.contentView).offset(kGetScaleWidth(-66)); - }]; - } - return self; -} - - -- (void)setDataSource:(NSDictionary *)dataSource { - _dataSource = dataSource; - RoomEnterModel *model = [RoomEnterModel modelWithJSON:dataSource]; - - NSString *ar = isMSRTL() ? @"_ar" : @""; - NSString *bgImageKey = [NSString stringWithFormat:@"%@%@",model.screenType == 2 ? @"cp_enter_message" : @"cp_onmic_message", ar]; - self.bgImageView.image = kImage(bgImageKey); - - NSString *name = model.nick; - RoomEnterCPListModel *cpmodel = [model.cpList xpSafeObjectAtIndex:self.cpIndex]; - NSString *cpname = cpmodel.cpNick; - - NSString *cpLevelContentKey = [NSString stringWithFormat:@"RoomEffect_CP_lv_%@", @(cpmodel.cpLevel)]; - NSString *cpLevelContent = YMLocalizedString(cpLevelContentKey); - - NSString *placeHolder = @""; - if (model.screenType == 2) { - if (isMSRTL()) { - placeHolder = [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_31"), name, cpname, cpLevelContent]; - } else { - placeHolder = [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_31"), name, cpLevelContent, cpname]; - } - } else if (model.screenType == 3) { - placeHolder = [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_32"), cpLevelContent, name, cpname]; - } - NSMutableAttributedString *content = [[NSMutableAttributedString alloc] initWithString:placeHolder attributes:@{ - NSFontAttributeName: kFontMedium(13), - NSForegroundColorAttributeName: [UIColor whiteColor] - }]; - NSRange nameRange = [placeHolder rangeOfString:name]; - NSRange cpnameRange = [placeHolder rangeOfString:cpname options:NSBackwardsSearch]; - [content addAttributes:@{ - NSFontAttributeName: kFontMedium(14), - NSForegroundColorAttributeName: UIColorFromRGB(0xffdf66) - } range:nameRange]; - [content addAttributes:@{ - NSFontAttributeName: kFontMedium(14), - NSForegroundColorAttributeName: UIColorFromRGB(0xffdf66) - } range:cpnameRange]; - - self.contentLabel.attributedText = content; -} - - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _bgImageView; -} - - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [UILabel labelInitWithText:@"" font:kFontMedium(13) textColor:[UIColor whiteColor]]; - _contentLabel.numberOfLines = 2; - _contentLabel.adjustsFontSizeToFitWidth = YES; - _contentLabel.minimumScaleFactor = 0.5; - } - return _contentLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.h b/YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.h deleted file mode 100644 index d520e6d..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// CPGiftBanner.h -// YuMi -// -// Created by P on 2024/9/23. -// - -#import - -@class AttachmentModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface CPGiftBanner : UIView - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.m b/YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.m deleted file mode 100644 index d23c3ec..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/CPGiftBanner.m +++ /dev/null @@ -1,243 +0,0 @@ -// -// CPGiftBanner.m -// YuMi -// -// Created by P on 2024/9/23. -// - -#import "CPGiftBanner.h" - -#import -#import "AttachmentModel.h" - -@interface CPGiftBanner() - -@property (nonatomic, strong) NetImageView *avatar_sender; -@property (nonatomic, strong) NetImageView *avatar_receiver; -@property (nonatomic, strong) NetImageView *giftImageView; - -@property (nonatomic, strong) AttachmentModel *bannerAttachment; - -@property (nonatomic, copy) void(^completeDisplay)(void); - -@end - -@implementation CPGiftBanner - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - UIImageView *background = [self backgroundImageView]; - [self addSubview:background]; - [background mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - UIStackView *stack = [[UIStackView alloc] init]; - stack.translatesAutoresizingMaskIntoConstraints = NO; - stack.spacing = 8; - stack.distribution = UIStackViewDistributionEqualSpacing; - stack.alignment = UIStackViewAlignmentCenter; - [self addSubview:stack]; - [stack mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.height.mas_equalTo(50); - make.bottom.mas_equalTo(self).offset(-40); - }]; - - UILabel *label_1 = [self labelWith:YMLocalizedString(@"Combo_0")]; - UILabel *label_2 = [self labelWith:[NSString stringWithFormat:@"CP %@", YMLocalizedString(@"XPWishGiftInfoView1")]]; - [stack addArrangedSubview:self.avatar_sender]; - [stack addArrangedSubview:label_1]; - [stack addArrangedSubview:self.avatar_receiver]; - [stack addArrangedSubview:label_2]; - [stack addArrangedSubview:self.giftImageView]; - - [self.avatar_sender mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(38); - }]; - - [label_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_greaterThanOrEqualTo(32); - make.height.mas_equalTo(20); - }]; - - [self.avatar_receiver mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(38); - }]; - - [label_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_greaterThanOrEqualTo(46); - make.height.mas_equalTo(20); - }]; - - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(50); - }]; - } - return self; -} - -- (void)setBannerAttachment:(AttachmentModel *)bannerAttachment { - _bannerAttachment = bannerAttachment; - self.avatar_sender.imageUrl = bannerAttachment.data[@"senderAvatar"]; - self.avatar_receiver.imageUrl = bannerAttachment.data[@"receiverAvatar"]; - self.giftImageView.imageUrl = bannerAttachment.data[@"giftUrl"]; -} - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete { - - CGFloat width = KScreenWidth; - CGFloat height = kGetScaleWidth(145); -// CGFloat topSpace = kGetScaleWidth(67); - CPGiftBanner *bannerView = [[CPGiftBanner alloc] initWithFrame:CGRectMake(KScreenWidth, 0, width, height)]; - bannerView.bannerAttachment = attachment; - bannerView.completeDisplay = complete; - [superView addSubview:bannerView]; - - @kWeakify(bannerView); - // 使用 POP 动画移动 banner 到目标位置 - [bannerView popEnterAnimation:^(BOOL finished) { - if (finished) { - @kStrongify(bannerView); - [bannerView addNotification]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [bannerView popLeaveAnimation:^(bool finished) { - if (bannerView.completeDisplay) { - bannerView.completeDisplay(); - } - [bannerView removeNotification]; - [bannerView removeFromSuperview]; - }]; - }); - } - }]; -} - -- (void)handleTapNotification:(NSNotification *)note { - NSValue *value = note.userInfo[@"point"]; - CGPoint point = [value CGPointValue]; - - // 将 banner 中的点转换为屏幕坐标系 - CGPoint screenPoint = [self convertPoint:point toView:nil]; - - // 发送通知给 FunctionContainer 处理，传递屏幕坐标 - [[NSNotificationCenter defaultCenter] postNotificationName:@"BannerTapToFunctionContainer" - object:nil - userInfo:@{@"point": [NSValue valueWithCGPoint:screenPoint]}]; -} - -- (void)handleSwipeNotification { - [self dismissBanner]; -} - -- (void)addNotification { - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleSwipeNotification) - name:@"SwipeOutBanner" - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTapNotification:) - name:@"TapBanner" - object:nil]; -} - -- (void)removeNotification { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (void)dismissBanner { - [self pop_removeAllAnimations]; // 停止所有动画 - - [self popLeaveAnimation:^(bool finished) { - if (self.completeDisplay) { - self.completeDisplay(); - } - [self removeFromSuperview]; - }]; -} - -- (void)popEnterAnimation:(void(^)(BOOL finished))finish { - NSInteger height = kGetScaleWidth(145); - POPSpringAnimation *enterAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewFrame]; - enterAnimation.toValue = [NSValue valueWithCGRect:CGRectMake(0, 0, KScreenWidth, height)]; - enterAnimation.springBounciness = 10; // 弹性系数 - enterAnimation.springSpeed = 12; // 动画速度 - enterAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finish) { - finish(finished); - } - }; - [self pop_addAnimation:enterAnimation forKey:@"enterAnimation"]; -} - -- (void)popLeaveAnimation:(void(^)(bool finished))finish { - NSInteger height = kGetScaleWidth(145); - POPBasicAnimation *exitAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewFrame]; - exitAnimation.toValue = [NSValue valueWithCGRect:CGRectMake(-KScreenWidth, 0, KScreenWidth, height)]; - exitAnimation.duration = 0.25; // 动画持续时间 - exitAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - exitAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finish) { - finish(finished); - } - }; - [self pop_addAnimation:exitAnimation forKey:@"exitAnimation"]; -} - -#pragma mark - -- (UIImageView *)backgroundImageView { - UIImageView *iv = [[UIImageView alloc] init]; - iv.contentMode = UIViewContentModeScaleAspectFit; - iv.image = kImage(@"cp_banner"); - return iv; -} - --(UILabel *)labelWith:(NSString *)content { - return [UILabel labelInitWithText:content - font:kFontSemibold(13) - textColor:UIColorFromRGB(0xFFE6A0)]; -} - -- (NetImageConfig *)avatarConfig { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - return config; -} - -- (NetImageView *)avatar_sender { - if (!_avatar_sender) { - _avatar_sender = [[NetImageView alloc] initWithConfig:[self avatarConfig]]; - _avatar_sender.layer.masksToBounds = YES; - _avatar_sender.layer.cornerRadius = 38/2; - _avatar_sender.layer.borderColor = [UIColor whiteColor].CGColor; - _avatar_sender.layer.borderWidth = 1; - } - return _avatar_sender; -} - -- (NetImageView *)avatar_receiver { - if (!_avatar_receiver) { - _avatar_receiver = [[NetImageView alloc] initWithConfig:[self avatarConfig]]; - _avatar_receiver.layer.masksToBounds = YES; - _avatar_receiver.layer.cornerRadius = 38/2; - _avatar_receiver.layer.borderColor = [UIColor whiteColor].CGColor; - _avatar_receiver.layer.borderWidth = 1; - } - return _avatar_receiver; -} - -- (NetImageView *)giftImageView { - if (!_giftImageView) { - _giftImageView = [[NetImageView alloc] initWithConfig:[self avatarConfig]]; - _giftImageView.layer.masksToBounds = YES; - _giftImageView.layer.cornerRadius = 50/2; - } - return _giftImageView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/CPLevelUpAnimation.h b/YuMi/Modules/YMMine/View/SubViews/CPLevelUpAnimation.h deleted file mode 100644 index da8ad1d..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/CPLevelUpAnimation.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// CPLevelUpAnimation.h -// YuMi -// -// Created by P on 2024/9/23. -// - -#import - -@class AttachmentModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface CPLevelUpAnimation : UIView - -@property (nonatomic, strong) AttachmentModel *cpAttachment; - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/CPLevelUpAnimation.m b/YuMi/Modules/YMMine/View/SubViews/CPLevelUpAnimation.m deleted file mode 100644 index fb0cfb8..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/CPLevelUpAnimation.m +++ /dev/null @@ -1,206 +0,0 @@ -// -// CPLevelUpAnimation.m -// YuMi -// -// Created by P on 2024/9/23. -// - -#import "CPLevelUpAnimation.h" - -#import "SVGA.h" -#import "AttachmentModel.h" - -@interface CPLevelUpAnimation() - -@property (nonatomic, strong) SVGAImageView *backgroundSvga; -@property (nonatomic, strong) UIImageView *bottomBannerImageView; -@property (nonatomic, strong) UILabel *bottomContentLabel; - -@property (nonatomic, copy) void(^completeDisplay)(void); - -@property (nonatomic, strong) NSTimer *endPlayTimer; - -@end - -@implementation CPLevelUpAnimation - -- (void)dealloc -{ - if (_endPlayTimer) { - [self.endPlayTimer invalidate]; - self.endPlayTimer = nil; - } -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self addSubview:self.backgroundSvga]; - [self.backgroundSvga mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.bottomBannerImageView]; - [self.bottomBannerImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self).offset(-19); - make.centerX.mas_equalTo(self); - make.height.mas_equalTo(17); - make.width.mas_equalTo(kGetScaleWidth(291)); - }]; - - [self addSubview:self.bottomContentLabel]; - [self.bottomContentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.bottomBannerImageView); - }]; - } - return self; -} - -- (void)setCpAttachment:(AttachmentModel *)cpAttachment { - - -// { -// cpLevel = 1; -// partitionId = 4; -// receiverAvatar = "https://img.molistar.xyz/default_avatar_molistar.png"; -// receiverNick = "\U7231\U5764\Ud83d\Udc14"; -// receiverUid = 3164; -// roomUid = 3133; -// senderAvatar = "https://image.pekolive.com/image/3283950eebfb7a55ab84e5b15cc29421.jpeg"; -// senderNick = "\U5468\U59d0\U4f26"; -// senderUid = 3133; -// } - - _cpAttachment = cpAttachment; - - NSNumber *level = cpAttachment.data[@"cpLevel"]; - NSString *bannerImageName = [NSString stringWithFormat:@"cp_level_banner_lv_%@", level]; - self.bottomBannerImageView.image = kImage(bannerImageName); - - NSString *senderName = cpAttachment.data[@"senderNick"]; - NSString *receiverName = cpAttachment.data[@"receiverNick"]; - [self updateLabelContent:senderName and:receiverName level:level.integerValue]; - - @kWeakify(self); - SVGAParser *parser = [SVGAParser new]; - [parser parseWithNamed:[NSString stringWithFormat:@"level up %@", level] - inBundle:[NSBundle mainBundle] - completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - NSString *senderAvatar = cpAttachment.data[@"senderAvatar"]; - NSString *receiverAvatar = cpAttachment.data[@"receiverAvatar"]; - self.backgroundSvga.videoItem = videoItem; - [self.backgroundSvga setImageWithURL:[NSURL URLWithString:senderAvatar] forKey:@"user_img1"]; - [self.backgroundSvga setImageWithURL:[NSURL URLWithString:receiverAvatar] forKey:@"user_img2"]; - [self.backgroundSvga startAnimation]; - [self startTimer]; - } failureBlock:^(NSError * _Nonnull error) { - @kStrongify(self); - [self removeFromSuperview]; - if (self.completeDisplay) { - self.completeDisplay(); - } - }]; -} - -- (void)updateLabelContent:(NSString *)name_1 and:(NSString *)name_2 level:(NSInteger)level { - // 根据 level 确定 relation ship - NSString *relationship = @""; - switch (level) { - case 1: - relationship = YMLocalizedString(@"RoomEffect_CP_lv_0"); - break; - case 2: - relationship = YMLocalizedString(@"RoomEffect_CP_lv_1"); - break; - case 3: - relationship = YMLocalizedString(@"RoomEffect_CP_lv_2"); - break; - case 4: - relationship = YMLocalizedString(@"RoomEffect_CP_lv_3"); - break; - case 5: - relationship = YMLocalizedString(@"RoomEffect_CP_lv_4"); - break; - case 6: - relationship = YMLocalizedString(@"RoomEffect_CP_lv_5"); - break; - default: - relationship = YMLocalizedString(@"RoomEffect_CP_lv_0"); - break; - } - - // 构造文本内容 - NSString *cuttingName_1 = name_1.length <= 10 ? name_1 : [name_1 substringToIndex:10]; - NSString *cuttingName_2 = name_2.length <= 10 ? name_2 : [name_2 substringToIndex:10]; - NSString *fullText = [NSString stringWithFormat:@"%@ %@ %@ %@ %@", cuttingName_1, YMLocalizedString(@"RoomEffect_CP_0"), cuttingName_2, YMLocalizedString(@"RoomEffect_CP_1"), relationship]; - - // 创建可变的 attributed string - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:fullText]; - - // 设置默认颜色为白色 - [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(0, fullText.length)]; - - // 找到 "and" 的位置，并设置其颜色为黄色 - NSRange andRange = [fullText rangeOfString:@"and"]; - if (andRange.location != NSNotFound) { - [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor yellowColor] range:andRange]; - } - - // 找到 "Become" 的位置，并设置其颜色为黄色 - NSRange becomeRange = [fullText rangeOfString:@"Become"]; - if (becomeRange.location != NSNotFound) { - [attributedString addAttribute:NSForegroundColorAttributeName value:UIColorFromRGB(0xFFF664) range:becomeRange]; - } - - // 将生成的 attributed string 赋值给 UILabel - self.bottomContentLabel.attributedText = attributedString; -} - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - complete:(void (^)(void))complete { - CPLevelUpAnimation *levelUp = [[CPLevelUpAnimation alloc] initWithFrame:CGRectMake(0, kNavigationHeight*2.5, KScreenWidth, kGetScaleWidth(145))]; - levelUp.cpAttachment = attachment; - levelUp.completeDisplay = complete; - [superView addSubview:levelUp]; -} - -- (void)startTimer { - @kWeakify(self); - self.endPlayTimer = [NSTimer scheduledTimerWithTimeInterval:5 repeats:NO block:^(NSTimer * _Nonnull timer) { - @kStrongify(self); - [self removeFromSuperview]; - [self.backgroundSvga stopAnimation]; - if (self.completeDisplay) { - self.completeDisplay(); - } - }]; -} - -#pragma mark - -- (SVGAImageView *)backgroundSvga { - if (!_backgroundSvga) { - _backgroundSvga = [[SVGAImageView alloc]init]; - _backgroundSvga.backgroundColor = [UIColor clearColor]; - _backgroundSvga.autoPlay = YES; - } - return _backgroundSvga; -} - -- (UIImageView *)bottomBannerImageView { - if (!_bottomBannerImageView) { - _bottomBannerImageView = [[UIImageView alloc] initWithImage:kImage(@"cp_level_banner_lv_1")]; - } - return _bottomBannerImageView; -} - -- (UILabel *)bottomContentLabel { - if (!_bottomContentLabel) { - _bottomContentLabel = [UILabel labelInitWithText:@"" font:kFontMedium(12) textColor:[UIColor whiteColor]]; - _bottomContentLabel.textAlignment = NSTextAlignmentCenter; - } - return _bottomContentLabel; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/CPRelationshipChangeView.h b/YuMi/Modules/YMMine/View/SubViews/CPRelationshipChangeView.h deleted file mode 100644 index 4fd1510..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/CPRelationshipChangeView.h +++ /dev/null @@ -1,10 +0,0 @@ -#import -@class RelationUserVO; - -@interface CPRelationshipChangeView : UIView - -@property (nonatomic, copy) void(^onConfirm)(NSInteger relationshipType, RelationUserVO *vo); - -- (instancetype)initWithRelationUser:(RelationUserVO *)relationUser; - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/CPRelationshipChangeView.m b/YuMi/Modules/YMMine/View/SubViews/CPRelationshipChangeView.m deleted file mode 100644 index 7a3e679..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/CPRelationshipChangeView.m +++ /dev/null @@ -1,244 +0,0 @@ -#import "CPRelationshipChangeView.h" -#import "RelationUserVO.h" - -@interface CPRelationshipButton : UIButton - -@property (nonatomic, strong) UIImageView *now; -@property (nonatomic, strong) UIImageView *tick; - -//- (void)updateState:(BOOL)isSelected isCurrent:(BOOL)isCurrent; -- (void)updateIsCurrent:(BOOL)isCurrent; -- (void)updateIsSelected:(BOOL)isSelected; - -@end - -@implementation CPRelationshipButton - -- (instancetype)init { - if (self = [super init]) { - - self.adjustsImageWhenHighlighted = NO; - - [self setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateNormal]; - [self setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateSelected]; - [self setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xf2f3f7)] forState:UIControlStateNormal]; - [self setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xfffaf5)] forState:UIControlStateSelected]; - - self.selected = NO; - - _now = [[UIImageView alloc] initWithImage:kImage(@"cp_now")]; - _tick = [[UIImageView alloc] initWithImage:kImage(@"region_list_selected")]; - _tick.hidden = YES; - - [self addSubview:self.now]; - [self addSubview:self.tick]; - [self.now mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(10); - make.size.mas_equalTo(CGSizeMake(37, 18)); - }]; - [self.tick mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.trailing.mas_equalTo(-10); - make.size.mas_equalTo(CGSizeMake(20, 20)); - }]; - } - return self; -} - -- (void)setSelected:(BOOL)selected { - [super setSelected:selected]; - if (selected) { - [self setAllCornerRadius:19 borderWidth:1 borderColor:UIColorFromRGB(0xff8c03)]; - } else { - [self setAllCornerRadius:19 borderWidth:0 borderColor:UIColorFromRGB(0xff8c03)]; - } -} - -- (void)updateIsCurrent:(BOOL)isCurrent { - self.now.hidden = !isCurrent; -} - -- (void)updateIsSelected:(BOOL)isSelected { - self.tick.hidden = !isSelected; - self.selected = isSelected; -} - -@end - -@interface CPRelationshipChangeView () - -@property (nonatomic, strong) UIView *containerView; // 添加containerView属性 -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UILabel *subtitleLabel; -@property (nonatomic, strong) UIButton *confirmButton; -@property (nonatomic, strong) NSArray *relationButtons; -@property (nonatomic, assign) NSInteger selectedType; -@property (nonatomic, strong) RelationUserVO *relationUser; - -@end - -@implementation CPRelationshipChangeView - -- (instancetype)initWithRelationUser:(RelationUserVO *)relationUser { - // 使用屏幕尺寸初始化 - if (self = [super initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]) { - - self.relationUser = relationUser; - [self setupUI]; - } - return self; -} - -- (void)setRelationUser:(RelationUserVO *)relationUser { - _relationUser = relationUser; -} - -- (void)setupUI { - - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6]; - - // 主容器视图 - self.containerView = [[UIView alloc] init]; - self.containerView.backgroundColor = [UIColor whiteColor]; - [self.containerView setCornerRadius:16]; - [self addSubview:self.containerView]; - [self.containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self); - make.height.mas_equalTo(340); - }]; - - // 标题 - self.titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"20.20.56_text_3") - font:kFontSemibold(16) - textColor:UIColorFromRGB(0x313131)]; - self.titleLabel.textAlignment = NSTextAlignmentCenter; - [self.containerView addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.containerView).offset(20); - make.centerX.equalTo(self.containerView); - }]; - - // 副标题 - self.subtitleLabel = [UILabel labelInitWithText:YMLocalizedString(@"20.20.56_text_4") - font:kFontRegular(14) - textColor:UIColorFromRGB(0x313131)]; - self.subtitleLabel.textAlignment = NSTextAlignmentCenter; - self.subtitleLabel.numberOfLines = 0; - [self.containerView addSubview:self.subtitleLabel]; - [self.subtitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.titleLabel.mas_bottom).offset(10); - make.leading.trailing.equalTo(self.containerView).inset(20); - }]; - - // 提示文本 - UILabel *tipLabel = [UILabel labelInitWithText:YMLocalizedString(@"20.20.56_text_5") - font:kFontRegular(12) - textColor:UIColorFromRGB(0x7b7b7d)]; - tipLabel.numberOfLines = 0; - tipLabel.textAlignment = NSTextAlignmentCenter; - [self.containerView addSubview:tipLabel]; - [tipLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.subtitleLabel.mas_bottom).offset(15); - make.leading.trailing.equalTo(self.containerView).inset(20); - }]; - - // 关系选择按钮 - NSArray *titles = @[YMLocalizedString(@"20.20.56_text_6"), - YMLocalizedString(@"20.20.56_text_7"), - YMLocalizedString(@"20.20.56_text_8"), - YMLocalizedString(@"20.20.56_text_9")]; - NSMutableArray *btns = [NSMutableArray array]; - CGFloat buttonHeight = 38; - CGFloat buttonSpacing = 15; - - for (int i = 0; i < titles.count; i++) { - CPRelationshipButton *btn = [[CPRelationshipButton alloc] init]; - [btn addTarget:self - action:@selector(relationButtonTapped:) - forControlEvents:UIControlEventTouchUpInside]; - [btn setTitle:titles[i] forState:UIControlStateNormal]; - btn.tag = i + 1; - [self.containerView addSubview:btn]; - [btns addObject:btn]; - - [btn mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(buttonHeight); - make.width.equalTo(self.containerView).multipliedBy(0.42); // 稍微调整宽度比例 - - if (i < 2) { - make.top.equalTo(tipLabel.mas_bottom).offset(20); - if (i == 0) { - make.leading.equalTo(self.containerView).offset(20); - } else { - make.trailing.equalTo(self.containerView).offset(-20); - } - } else { - CPRelationshipButton *zeroButton = btns[0]; - make.top.equalTo(zeroButton.mas_bottom).offset(buttonSpacing); - if (i == 2) { - make.leading.equalTo(self.containerView).offset(20); - } else { - make.trailing.equalTo(self.containerView).offset(-20); - } - } - }]; - - [btn updateIsCurrent:btn.tag == self.relationUser.relationNameType]; - } - self.relationButtons = btns; - - // 确认按钮 - self.confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - self.confirmButton.enabled = NO; - self.confirmButton.titleLabel.font = kFontMedium(13); - [self.confirmButton setTitle:YMLocalizedString(@"20.20.56_text_10") - forState:UIControlStateNormal]; - [self.confirmButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [self.confirmButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xE29030), UIColorFromRGB(0xFCC074)] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(KScreenWidth - 40, 38)] - forState:UIControlStateNormal]; - self.confirmButton.layer.cornerRadius = 19; - self.confirmButton.layer.masksToBounds = YES; - [self.confirmButton addTarget:self action:@selector(confirmButtonTapped) forControlEvents:UIControlEventTouchUpInside]; - [self.containerView addSubview:self.confirmButton]; - [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self.containerView).offset(-30); - make.leading.trailing.equalTo(self.containerView).inset(20); - make.height.mas_equalTo(38); - }]; - - UIButton *exitButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [exitButton addTarget:self action:@selector(didTapExitButton) forControlEvents:UIControlEventTouchUpInside]; - [self addSubview:exitButton]; - [exitButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self); - make.bottom.mas_equalTo(self.containerView.mas_top); - }]; -} - -- (void)relationButtonTapped:(UIButton *)sender { - for (CPRelationshipButton *btn in self.relationButtons) { - [btn updateIsSelected:btn == sender]; - } - - self.selectedType = sender.tag; - [self updateConfirmButtonStatus]; -} - -- (void)confirmButtonTapped { - if (self.onConfirm) { - self.onConfirm(self.selectedType, self.relationUser); - } -} - -- (void)updateConfirmButtonStatus { - self.confirmButton.enabled = self.selectedType != self.relationUser.relationNameType; -} - -- (void)didTapExitButton { - [self removeFromSuperview]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPBeautIDView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPBeautIDView.h deleted file mode 100644 index 1c242c3..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPBeautIDView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPBeautIDView.h -// YuMi -// -// Created by P on 2024/8/1. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPBeautIDView : UIView - -@property (nonatomic, copy) NSString *num; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPBeautIDView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPBeautIDView.m deleted file mode 100644 index a2ae6e8..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPBeautIDView.m +++ /dev/null @@ -1,88 +0,0 @@ -// -// XPBeautIDView.m -// YuMi -// -// Created by P on 2024/8/1. -// - -#import "XPBeautIDView.h" - -@interface XPBeautIDView () - -@property (nonatomic, strong) UIImageView *frameImageView; -@property (nonatomic, strong) UILabel *numLabel; -@property (nonatomic, strong) UIImageView *copiedImageView; - -@end - -@implementation XPBeautIDView - -- (instancetype)init -{ - self = [super init]; - if (self) { - [self addSubview:self.frameImageView]; - [self addSubview:self.numLabel]; - - [self.frameImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.bottom.mas_equalTo(self); - make.trailing.mas_equalTo(self); - }]; - - [self.numLabel mas_makeConstraints:^(MASConstraintMaker *make) { - if (isMSRTL()) { - make.leading.mas_equalTo(self).offset(10); - make.trailing.mas_equalTo(self).offset(-46); - } else { - make.leading.mas_equalTo(self.frameImageView).offset(24); - make.trailing.mas_equalTo(self).offset(-8); - } - make.centerY.mas_equalTo(self).offset(0.8); - }]; - } - return self; -} - -- (void)setNum:(NSString *)num { - _num = num; - self.numLabel.text = num; - - UIImage *longBackgroundImage = kImage(@"user_info_id_beatiful_mark_short"); - UIEdgeInsets capInsets = UIEdgeInsetsMake(0, 27, 0, 14); - UIImage *resizableImage = [longBackgroundImage resizableImageWithCapInsets:capInsets resizingMode:UIImageResizingModeStretch]; - self.frameImageView.image = resizableImage; -} - -- (UIImageView *)frameImageView { - if (!_frameImageView) { - _frameImageView = [[UIImageView alloc] init]; - UIImage *longBackgroundImage = kImage(@"user_info_id_beatiful_mark_short"); - UIEdgeInsets capInsets = UIEdgeInsetsMake(0, 27, 0, 14); - UIImage *resizableImage = [longBackgroundImage resizableImageWithCapInsets:capInsets resizingMode:UIImageResizingModeStretch]; - _frameImageView.image = resizableImage;//Image(@"user_info_id_beatiful_mark_short"); - } - return _frameImageView; -} - -- (UIImageView *)copiedImageView { - if (!_copiedImageView) { - _copiedImageView = [[UIImageView alloc] init]; - _copiedImageView.contentMode = UIViewContentModeScaleAspectFit; - _copiedImageView.image = kImage(@"user_card_copy_id1"); - } - return _copiedImageView; -} - -- (UILabel *)numLabel { - if (!_numLabel) { - _numLabel = [[UILabel alloc] init]; - _numLabel.font = kFontMedium(10); - _numLabel.textAlignment = NSTextAlignmentCenter; - _numLabel.textColor = [UIColor whiteColor]; - _numLabel.userInteractionEnabled = YES; - _numLabel.clipsToBounds = NO; - } - return _numLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.h deleted file mode 100644 index 09097f4..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMMineCustomNavView.h -// YUMI -// -// Created by YUMI on 2021/9/23. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMineUserInfoCustomNavView; -@protocol XPMineCustomNavViewDelegate -///点击了编辑的按钮 -- (void)xPMineCustomNavView:(XPMineUserInfoCustomNavView *)view didClickEditButton:(UIButton *)sender; -///点击了返回按钮 -- (void)xPMineCustomNavView:(XPMineUserInfoCustomNavView *)view didClickBackButton:(UIButton *)sender; -@end -@interface XPMineUserInfoCustomNavView : UIView -///代理 -@property (nonatomic,weak) id delegate; -///显示文本 -@property (nonatomic,strong,readonly) UILabel *titleLabel; -///编辑按钮 -@property (nonatomic,strong,readonly) UIButton *editButton; - -- (void)updateBackButtonImage:(UIImage *)image; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.m deleted file mode 100644 index 79a732d..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.m +++ /dev/null @@ -1,114 +0,0 @@ -// -// YMMineCustomNavView.m -// YUMI -// -// Created by YUMI on 2021/9/23. -// - -#import "XPMineUserInfoCustomNavView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIButton+EnlargeTouchArea.h" - -@interface XPMineUserInfoCustomNavView () -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///显示文本 -@property (nonatomic,strong) UILabel *titleLabel; -///编辑按钮 -@property (nonatomic,strong) UIButton *editButton; -@end - -@implementation XPMineUserInfoCustomNavView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)updateBackButtonImage:(UIImage *)image { - if (image) { - [self.backButton setImage:[image ms_SetImageForRTL] - forState:UIControlStateNormal]; - } -} - -#pragma mark - Response -- (void)editButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineCustomNavView:didClickEditButton:)]) { - [self.delegate xPMineCustomNavView:self didClickEditButton:sender]; - } -} - -- (void)backButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineCustomNavView:didClickBackButton:)]) { - [self.delegate xPMineCustomNavView:self didClickBackButton:sender]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.backButton]; - [self addSubview:self.titleLabel]; - [self addSubview:self.editButton]; -} - -- (void)initSubViewConstraints { - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; - - [self.editButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-15); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; -} - -#pragma mark - Getters And Setters -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back_white"]ms_SetImageForRTL] forState:UIControlStateNormal]; - _backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_backButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _backButton; -} - -- (UIButton *)editButton { - if (!_editButton) { - _editButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_editButton setImage:[UIImage imageNamed:@"mine_user_info_edit"] forState:UIControlStateNormal]; - _editButton.titleLabel.font = [UIFont systemFontOfSize:16]; - [_editButton setTitleColor:[DJDKMIMOMColor alertTitleColor] forState:UIControlStateNormal]; - [_editButton addTarget:self action:@selector(editButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_editButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _editButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.h deleted file mode 100644 index 231bec2..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMMineUserInfoDateView.h -// YUMI -// -// Created by YUMI on 2021/9/23. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMineUserInfoDateView; -@protocol XPMineUserInfoDateViewDelegate - -///确定 -- (void)xPMineUserInfoDateView:(XPMineUserInfoDateView *)view didClickSureButton:(NSString *)dateStr; -@end - -@interface XPMineUserInfoDateView : UIView -// 设置当前日期 时间戳 -@property (nonatomic, assign) NSTimeInterval time;// -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m deleted file mode 100644 index ae301da..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m +++ /dev/null @@ -1,382 +0,0 @@ -// -// YMMineUserInfoDateView.m -// YUMI -// -// Created by YUMI on 2021/9/23. -// - -#import "XPMineUserInfoDateView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPMineUserInfoDateView () -@property (nonatomic,strong)NSMutableArray * selDateArray; - -@property (nonatomic,strong)NSDateComponents * components;//时间结构体、可计算时间间隔、获取年月日时分、 -@property(nonatomic,strong) UIView *bgView; -/// -@property (nonatomic,strong) UIButton *cancleButton; -/// -@property (nonatomic,strong) UIButton *sureButton; -/// -@property (nonatomic, strong) UIPickerView *pickerView; -///样式 -@property (nonatomic, strong) NSDateFormatter *dateFormatter; -///年龄 -@property(nonatomic,strong) UILabel *ageView; -///星座 -//@property(nonatomic,strong) UILabel *starView; -@property(nonatomic,strong) NSMutableArray *dataSourceArray; -@end - -@implementation XPMineUserInfoDateView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.cancleButton]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.ageView]; -// [self.bgView addSubview:self.starView]; - [self.bgView addSubview:self.sureButton]; - [self.bgView addSubview:self.pickerView]; -} - -- (void)initSubViewConstraints { - - [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.bottom.trailing.equalTo(self).inset(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(383)); - }]; - [self.ageView mas_makeConstraints:^(MASConstraintMaker *make) { - 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); - make.width.mas_equalTo(kGetScaleWidth(303)); - make.height.mas_equalTo(kGetScaleWidth(48)); - }]; - [self.pickerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self); - make.bottom.equalTo(self.sureButton.mas_top); - make.top.equalTo(self.ageView.mas_bottom).mas_offset(kGetScaleWidth(10)); - - }]; -} -#pragma mark- UIPickerViewDelegate,UIPickerViewDataSource --(NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView{ - return 3; -} - --(NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component{ - - return [_dataSourceArray[component] count]; -} - --(CGFloat)pickerView:(UIPickerView *)pickerView widthForComponent:(NSInteger)component{ - - return KScreenWidth/3; -} --(CGFloat)pickerView:(UIPickerView *)pickerView rowHeightForComponent:(NSInteger)component{ - return kGetScaleWidth(40); -} - --(UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView *)view{ - [self changeSpearatorLineColor]; - UIView *bgView = (UIView *)view; - UILabel *lab = [view viewWithTag:100]; - if (!bgView) { - bgView = [UIView new]; - bgView.backgroundColor = [UIColor clearColor]; - } - if(!lab){ - lab = [UILabel labelInitWithText:@"" font:kFontRegular(20) textColor:UIColorFromRGB(0x1E1E1F)]; - [bgView addSubview:lab]; - CGFloat x ; - if(component == 0){ - x = kGetScaleWidth(20) ; - }else if(component == 1){ - x = kGetScaleWidth(10) ; - }else{ - x = 0 ; - } - [lab mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(bgView); - make.leading.mas_equalTo(kGetScaleWidth(x)); - make.width.mas_equalTo(kGetScaleWidth(98)); - make.height.mas_equalTo(kGetScaleWidth(40)); - }]; - lab.layer.cornerRadius = kGetScaleWidth(8); - lab.layer.masksToBounds = YES; - lab.textAlignment = NSTextAlignmentCenter; - lab.tag = 100; - }else{ - CGFloat x ; - if(component == 0){ - x = kGetScaleWidth(20) ; - }else if(component == 1){ - x = kGetScaleWidth(10) ; - }else{ - x = 0 ; - } - [lab mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(bgView); - make.leading.mas_equalTo(kGetScaleWidth(x)); - make.width.mas_equalTo(kGetScaleWidth(98)); - make.height.mas_equalTo(kGetScaleWidth(40)); - }]; - } - - NSArray *yearArr = @[YMLocalizedString(@"XPIncomeRecordGoldDetailsPickViewView3") ,YMLocalizedString(@"XPIncomeRecordGoldDetailsPickViewView4"),YMLocalizedString(@"XPIncomeRecordGoldDetailsPickViewView5")]; - if ([self.selDateArray[component]isEqualToString:self.dataSourceArray[component][row]] ) { - lab.backgroundColor = UIColorFromRGB(0xF7F7F7); - lab.font = kFontRegular(20); - lab.text = [NSString stringWithFormat:@"%@%@",self.selDateArray[component],yearArr[component]]; - lab.textColor = UIColorFromRGB(0x1E1E1F); - }else{ - lab.backgroundColor = [UIColor clearColor]; - lab.font = kFontRegular(18); - lab.text = [NSString stringWithFormat:@"%@%@",self.dataSourceArray[component][row],yearArr[component]]; - lab.textColor = UIColorRGBAlpha(0x1E1E1F, 0.6); - } - return bgView; -} -#pragma mark - 改变分割线的颜色 -- (void)changeSpearatorLineColor { - for(UIView *speartorView in _pickerView.subviews) { - if (speartorView.frame.size.height < 80) {//找出当前的 View - speartorView.backgroundColor = [UIColor clearColor]; - }else{ - speartorView.backgroundColor = [UIColor clearColor]; - } - } -} --(void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component{ - [self.selDateArray replaceObjectAtIndex:component withObject:self.dataSourceArray[component][row]]; - [pickerView reloadAllComponents]; - NSString *time = [NSString stringWithFormat:@"%@-%@-%@",self.selDateArray[0],self.selDateArray[1],self.selDateArray[2]]; - 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")] ; -} -//数据源 --(NSMutableArray *)dataSourceArray{ - if(!_dataSourceArray){ - // 获取当前日期 - NSDate *currentDate = [NSDate date]; - - // 创建日历对象 - NSCalendar *calendar = [NSCalendar currentCalendar]; - - // 获取年、月、日组件 - NSDateComponents *components = [calendar components:(NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay) fromDate:currentDate]; - - NSInteger year = [components year]; - NSMutableArray * yearArr = [@[]mutableCopy]; - for (int i = 1900; i <= year; i++) { - [yearArr addObject:@(i).stringValue]; - } - NSArray * monthArr = @[@"01",@"02",@"03",@"04",@"05",@"06",@"07",@"08",@"09",@"10",@"11",@"12"]; - NSArray * dayArr = [self dayArrayMonth:self.components.month year:self.components.year]; - - NSArray * array = @[yearArr,monthArr,dayArr]; - _dataSourceArray = [array mutableCopy]; - } - - return _dataSourceArray; -} - -//根据月份返回日期 --(NSArray *)dayArrayMonth:(NSInteger)month year:(NSInteger)year{ - NSArray * dayArr = [[NSArray alloc]init]; - - switch (month) { - case 1: case 3: case 5: case 7: case 8: case 10: case 12: - dayArr = @[@"01",@"02",@"03",@"04",@"05",@"06",@"07",@"08",@"09",@"10",@"11",@"12",@"13",@"14",@"15",@"16",@"17",@"18",@"19",@"20",@"21",@"22",@"23",@"24",@"25",@"26",@"27",@"28",@"29",@"30",@"31"]; - - break; - case 4: case 6: case 9: case 11: - dayArr = @[@"01",@"02",@"03",@"04",@"05",@"06",@"07",@"08",@"09",@"10",@"11",@"12",@"13",@"14",@"15",@"16",@"17",@"18",@"19",@"20",@"21",@"22",@"23",@"24",@"25",@"26",@"27",@"28",@"29",@"30"]; - break; - case 2: - if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) {///是润年 - dayArr = @[@"01",@"02",@"03",@"04",@"05",@"06",@"07",@"08",@"09",@"10",@"11",@"12",@"13",@"14",@"15",@"16",@"17",@"18",@"19",@"20",@"21",@"22",@"23",@"24",@"25",@"26",@"27",@"28",@"29"]; - }else{ - dayArr = @[@"01",@"02",@"03",@"04",@"05",@"06",@"07",@"08",@"09",@"10",@"11",@"12",@"13",@"14",@"15",@"16",@"17",@"18",@"19",@"20",@"21",@"22",@"23",@"24",@"25",@"26",@"27",@"28"]; - - } - break; - - default: - break; - } - return dayArr; - -} -#pragma mark - Event -- (void)onClickCancelButton:(UIButton *)sender { - self.backgroundColor = [UIColor clearColor]; - [UIView animateWithDuration:0.5 animations:^{ - self.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight); - }completion:^(BOOL finished) { - [self removeFromSuperview]; - }]; - -} - -- (void)onClickSureButton:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineUserInfoDateView:didClickSureButton:)]) { - NSString *time = [NSString stringWithFormat:@"%@-%@-%@",self.selDateArray[0],self.selDateArray[1],self.selDateArray[2]]; - [self.delegate xPMineUserInfoDateView:self didClickSureButton:time]; - } - self.backgroundColor = [UIColor clearColor]; - [UIView animateWithDuration:0.5 animations:^{ - self.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight); - }completion:^(BOOL finished) { - [self removeFromSuperview]; - }]; - -} -//分解传来需要显示的时间 --(NSArray *)receiveTime:(NSString *)timeStr{ - - NSArray * timeArray = [timeStr componentsSeparatedByString:@"-"]; - NSMutableArray * timeArr = [[NSMutableArray alloc]init]; - for (int i = 0; i - -NS_ASSUME_NONNULL_BEGIN - -@class LocationModel; - -@protocol XPMineUserInfoEditPickViewDelegate - -///点了确认按钮 -- (void)didClickSureActionWithArea:(LocationModel *)area; - -@end -@interface XPMineUserInfoEditPickView : UIView -@property (nonatomic,strong)NSMutableArray * dataArray;//数据源 -/// -@property (nonatomic,copy) NSString *outsideSelectedAreaName; -@property (nonatomic, strong) LocationModel *selectedArea; -/// -@property (nonatomic,weak) id delegate; -@end - - - -@interface AreaPickerView : UIView - - - -@property(nonatomic,strong) UILabel *titleLab; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m deleted file mode 100644 index 8029e39..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m +++ /dev/null @@ -1,209 +0,0 @@ -// -// XPMineUserInfoEditPickView.m -// xplan-ios -// -// Created by duoban on 2023/2/17. -// - -#import "XPMineUserInfoEditPickView.h" -#import "LocationModel.h" - -@interface XPMineUserInfoEditPickView() -@property (strong, nonatomic) UIPickerView *pickerView; - -@property (nonatomic,strong) UIView *bgView; -@property (nonatomic,strong) UIButton *cancelBtn; -@property (nonatomic,strong) UIButton *confirmBtn; - -@end -@implementation XPMineUserInfoEditPickView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} --(void)setDataArray:(NSMutableArray *)dataArray{ - _dataArray = dataArray; - if(_dataArray.count == 0)return; - - NSInteger index = 0; - for (LocationModel *model in dataArray) { - if ([model.name isEqualToString:self.outsideSelectedAreaName]) { - index = [dataArray indexOfObject:model]; - break; - } - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [_pickerView selectRow:index inComponent:0 animated:YES]; - }); -} --(NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView{ - return 1; -} - --(NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component{ - - return [_dataArray count]; -} - --(CGFloat)pickerView:(UIPickerView *)pickerView widthForComponent:(NSInteger)component{ - - return KScreenWidth; -} --(CGFloat)pickerView:(UIPickerView *)pickerView rowHeightForComponent:(NSInteger)component{ - return kGetScaleWidth(38); -} - --(UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView *)view{ - [self changeSpearatorLineColor]; - AreaPickerView *lab = (AreaPickerView *)view; - if (!lab) { - lab = [[AreaPickerView alloc] initWithFrame:CGRectMake(kGetScaleWidth(15),0, KScreenWidth - kGetScaleWidth(30), kGetScaleWidth(38))]; - } - LocationModel *area = self.dataArray[row]; - lab.titleLab.text = area.name; - if([area isEqual:self.self.selectedArea]){ - lab.backgroundColor = UIColorFromRGB(0xF3F5FA); - lab.titleLab.textColor = [DJDKMIMOMColor inputTextColor]; - }else{ - lab.backgroundColor = [UIColor clearColor]; - lab.titleLab.textColor = [DJDKMIMOMColor disableButtonTextColor]; - } - return lab; -} -#pragma mark - 改变分割线的颜色 -- (void)changeSpearatorLineColor { - - for(UIView *speartorView in _pickerView.subviews) { - - if (speartorView.frame.size.height < 80) {//找出当前的 View - - - speartorView.backgroundColor = [UIColor clearColor]; - }else{ - speartorView.backgroundColor = [UIColor clearColor]; - } - } -} --(void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component{ - if(row < self.dataArray.count){ - self.selectedArea = self.dataArray[row]; - [pickerView reloadAllComponents]; - } - -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.cancelBtn]; - [self.bgView addSubview:self.confirmBtn]; - [self.bgView addSubview:self.pickerView]; -} -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self).inset(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(272)); - }]; - [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.top.mas_equalTo(kGetScaleWidth(20)); - make.height.mas_equalTo(kGetScaleWidth(20)); - - }]; - [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(20)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - }]; - [self.pickerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(74)); - make.leading.trailing.bottom.equalTo(self.bgView).inset(kGetScaleWidth(0)); - - }]; -} --(void)cancelAction{ - [self removeFromSuperview]; -} --(void)confirmAction{ - [self removeFromSuperview]; - if(self.delegate && [self.delegate respondsToSelector:@selector(didClickSureActionWithArea:)]){ - [self.delegate didClickSureActionWithArea:self.selectedArea]; - } -} -#pragma mark -懒加载 -- (UIPickerView *)pickerView{ - if (!_pickerView){ - _pickerView = [[UIPickerView alloc]initWithFrame:CGRectZero]; - if (@available(iOS 13.0, *)) { - _pickerView.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; - } - _pickerView.delegate = self; - _pickerView.dataSource = self; - } - return _pickerView; -} -- (UIButton *)cancelBtn{ - if (!_cancelBtn){ - _cancelBtn = [UIButton buttonInitWithText:YMLocalizedString(@"XPIncomeRecordGoldDetailsPickViewView0") font:kFontMedium(16) textColor:[DJDKMIMOMColor disableButtonTextColor] image:nil bgImage:nil]; - [_cancelBtn addTarget:self action:@selector(cancelAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _cancelBtn; -} --(UIButton *)confirmBtn{ - if (!_confirmBtn){ - _confirmBtn = [UIButton buttonInitWithText:YMLocalizedString(@"TTAlertConfig0") font:kFontMedium(16) textColor:[DJDKMIMOMColor inputTextColor] image:nil bgImage:nil]; - [_confirmBtn addTarget:self action:@selector(confirmAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _confirmBtn; -} - -- (UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(18) rightTopCorner:kGetScaleWidth(18) bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth, kGetScaleWidth(302))]; - } - return _bgView; -} -@end - - - - -@implementation AreaPickerView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColorFromRGB(0xF3F5FA); - [self addSubview:self.titleLab]; - -} -- (void)initSubViewConstraints { - [self.titleLab mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - -} -#pragma mark -懒加载 -- (UILabel *)titleLab{ - if (!_titleLab){ - _titleLab = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:[DJDKMIMOMColor inputTextColor]]; - _titleLab.textAlignment = NSTextAlignmentCenter; - } - return _titleLab; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoGiftView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoGiftView.h deleted file mode 100644 index 386df81..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoGiftView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMineUserInfoGiftView.h -// YUMI -// -// Created by YUMI on 2022/6/15. -// - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserInfoGiftView : UIView -@property (nonatomic,strong) NSArray *datasource; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoGiftView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoGiftView.m deleted file mode 100644 index 22ab298..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoGiftView.m +++ /dev/null @@ -1,148 +0,0 @@ -// -// XPMineUserInfoGiftView.m -// xplan-ios -// -// Created by 冯硕 on 2022/6/15. -// - -#import "XPMineUserInfoGiftView.h" -///Third -#import -///View -#import "XPMineDataGiftCollectionViewCell.h" -#import "XPMineUserInfoEmptyCollectionViewCell.h" -#import "UserGiftWallInfoModel.h" -@interface XPMineUserInfoGiftView () -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -@property (nonatomic,assign) NSInteger giftNum; -@end - -@implementation XPMineUserInfoGiftView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; -} -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource - --(NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView{ - if (self.giftNum == 0)return 1; - return 2; - - -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - if(self.giftNum > 0){ - - CGFloat width = KScreenWidth - 30 - kGetScaleWidth(52); - return indexPath.section == 0 ? CGSizeMake(width / 3 , kGetScaleWidth(93)): CGSizeMake((width - 24)/4 , kGetScaleWidth(82)); - } - return CGSizeMake(KScreenWidth - 30, 65 * 3 + 30); -} -- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ - if(self.giftNum > 0){ - return section == 0 ? UIEdgeInsetsMake(0, kGetScaleWidth(16), kGetScaleWidth(12), kGetScaleWidth(16)):UIEdgeInsetsMake(0, kGetScaleWidth(16), 0, kGetScaleWidth(16)); - } - return UIEdgeInsetsMake(0, 0, 0, 0); -} -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - if (self.giftNum == 0)return 1; - return [self.datasource[section] count]; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.giftNum > 0) { - XPMineDataGiftCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineDataGiftCollectionViewCell class]) forIndexPath:indexPath]; - if (indexPath.section == 0 && self.datasource.count > 0){ - NSArray *dataList = self.datasource[indexPath.section]; - if(indexPath.row < dataList.count){ - cell.giftInfo = [dataList xpSafeObjectAtIndex:indexPath.row]; - [cell setLevel:((int)indexPath.row + 1)]; - }else{ - UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([UICollectionViewCell class]) forIndexPath:indexPath]; - - return cell; - } - - } - if (indexPath.section == 1 && self.datasource.count > 1){ - NSArray *dataList = self.datasource[indexPath.section]; - if(indexPath.row < dataList.count){ - cell.giftInfo = [dataList xpSafeObjectAtIndex:indexPath.row]; - }else{ - UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([UICollectionViewCell class]) forIndexPath:indexPath]; - - return cell; - } - [cell setLevel:4]; - } - - return cell; - } - - XPMineUserInfoEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoEmptyCollectionViewCell class]) forIndexPath:indexPath]; - cell.isGiftWall = YES; - return cell; -} -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self; -} - -#pragma mark - Getters And Setters -- (void)setDatasource:(NSArray *)datasource { - _giftNum = datasource.count ; - NSMutableArray *firstDataSource = [NSMutableArray array]; - NSMutableArray *secondDataSource = [NSMutableArray array]; - for (int i = 0; i < datasource.count; i++) { - UserGiftWallInfoModel *obj = datasource[i]; - if(i < 3){ - [firstDataSource addObject:obj]; - }else{ - [secondDataSource addObject:obj]; - } - } - _datasource = @[firstDataSource,secondDataSource]; - [self.collectionView reloadData]; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.minimumLineSpacing = kGetScaleWidth(12); - layout.minimumInteritemSpacing = 0; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.pagingEnabled = NO; - - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPMineDataGiftCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineDataGiftCollectionViewCell class])]; - [_collectionView registerClass:[XPMineUserInfoEmptyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoEmptyCollectionViewCell class])]; - [_collectionView registerClass:[UICollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([UICollectionViewCell class])]; - - } - return _collectionView; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagCell.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagCell.h deleted file mode 100644 index fd814a3..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagCell.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPMineUserInfoHeaderTagCell.h -// xplan-ios -// -// Created by duoban on 2023/2/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserInfoHeaderTagCell : UICollectionViewCell -/// -@property (nonatomic,assign) BOOL isTag; -/// -@property (nonatomic,copy) NSString *title; -/// -@property (nonatomic,strong,readonly) UILabel *titleView; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagCell.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagCell.m deleted file mode 100644 index d6ef1ec..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagCell.m +++ /dev/null @@ -1,51 +0,0 @@ -// -// XPMineUserInfoHeaderTagCell.m -// xplan-ios -// -// Created by duoban on 2023/2/16. -// - -#import "XPMineUserInfoHeaderTagCell.h" -@interface XPMineUserInfoHeaderTagCell() -/// -@property (nonatomic,strong) UILabel *titleView; -@end -@implementation XPMineUserInfoHeaderTagCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.titleView]; - self.contentView.layer.cornerRadius = 9; - self.contentView.layer.masksToBounds = YES; -} -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; -} --(void)setIsTag:(BOOL)isTag{ - _isTag = isTag; - self.contentView.backgroundColor = _isTag ? [UIColor colorWithRed:58/255.0 green:213/255.0 blue:248/255.0 alpha:0.12]: UIColorFromRGB(0xF3F5F9); - _titleView.textColor = _isTag ? UIColorFromRGB(0x00C4EA):UIColorFromRGB(0x6D6B89); -} -- (void)setTitle:(NSString *)title{ - _title = title; - _titleView.text = _title; -} -#pragma mark -懒加载 -- (UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel labelInitWithText:@"" font:[UIFont systemFontOfSize:10 weight:UIFontWeightRegular] textColor:UIColorFromRGB(0x00C4EA)]; - _titleView.textAlignment = NSTextAlignmentCenter; - } - return _titleView; -} -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagView.h deleted file mode 100644 index 8158c37..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// XPMineUserInfoHeaderTagView.h -// xplan-ios -// -// Created by duoban on 2023/2/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMineUserInfoHeaderTagView; -@protocol XPMineUserInfoHeaderTagViewDelegate - -- (void)didClickGotoEditVC; - -@end -@interface XPMineUserInfoHeaderTagView : UIView -@property (nonatomic,strong) NSMutableArray *itemList; -/// -@property (nonatomic,copy) NSString *uid; -/// -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagView.m deleted file mode 100644 index 9813e94..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagView.m +++ /dev/null @@ -1,161 +0,0 @@ -// -// XPMineUserInfoHeaderTagView.m -// xplan-ios -// -// Created by duoban on 2023/2/16. -// - -#import "XPMineUserInfoHeaderTagView.h" -#import "XPMineUserInfoTagFlowLayout.h" -#import "XPMineUserInfoHeaderTagCell.h" -#import "XPMineUserInfoTagModel.h" -@interface XPMineUserInfoHeaderTagView() -@property (nonatomic,strong) UICollectionView *collectionView; -/// -@property (nonatomic,strong) UIButton *clickBtn; -///设置个人标签 -@property (nonatomic,strong) UIView *editView; -@end -@implementation XPMineUserInfoHeaderTagView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.hidden = YES; - [self addSubview:self.collectionView]; - [self addSubview:self.clickBtn]; - [self addSubview:self.editView]; -} -- (void)initSubViewConstraints { - [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(0); - make.centerY.equalTo(self); - make.width.height.mas_equalTo(20); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.centerY.equalTo(self); - make.height.mas_equalTo(18); - make.trailing.equalTo(self.clickBtn.mas_leading); - }]; - [self.editView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.equalTo(self); - make.height.equalTo(self.clickBtn); - make.width.mas_greaterThanOrEqualTo(128); - }]; - -} -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - XPMineUserInfoTagItemModel *model = self.itemList[indexPath.row]; - return CGSizeMake(model.width, 18); -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - - return self.itemList.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - - XPMineUserInfoHeaderTagCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoHeaderTagCell class]) forIndexPath:indexPath]; - cell.isTag = indexPath.row < 3; - XPMineUserInfoTagItemModel *model = self.itemList[indexPath.row]; - cell.title = model.label; - - return cell; -} --(void)setItemList:(NSMutableArray *)itemList{ - _itemList = itemList; - for (XPMineUserInfoTagItemModel *model in _itemList) { - CGRect stringRect = [model.label boundingRectWithSize:CGSizeMake(MAXFLOAT, kGetScaleWidth(18)) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:kFontRegular(10)} context:nil]; - model.width = stringRect.size.width + kGetScaleWidth(14); - } - [_collectionView reloadData]; - NSString *uid = [[AccountInfoStorage instance]getUid]; - BOOL isMe = [self.uid isEqualToString:uid]; - if(isMe == YES && _itemList.count == 0){ - _collectionView.hidden = YES; - _clickBtn.hidden = YES; - _editView.hidden = NO; - }else{ - _collectionView.hidden = NO; - _clickBtn.hidden = NO; - _editView.hidden = YES; - } -} --(void)clickAction{ -// if(self.delegate && [self.delegate respondsToSelector:@selector(didClickGotoIvidualView)]){ -// [self.delegate didClickGotoIvidualView]; -// } -} --(void)editAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(didClickGotoEditVC)]){ - [self.delegate didClickGotoEditVC]; - } -} -#pragma mark -懒加载 -- (UICollectionView *)collectionView{ - if (!_collectionView) { - XPMineUserInfoTagFlowLayout *layout = [[XPMineUserInfoTagFlowLayout alloc] init]; - layout.delegate = self; - layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0); - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 5; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.pagingEnabled = NO; - _collectionView.scrollEnabled = NO; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPMineUserInfoHeaderTagCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoHeaderTagCell class])]; - _collectionView.showsVerticalScrollIndicator = NO; - } - return _collectionView; -} -- (UIButton *)clickBtn{ - if (!_clickBtn){ - _clickBtn = [UIButton new]; - [_clickBtn setBackgroundImage:[kImage(@"mine_info_tag_arrow")ms_SetImageForRTL] forState:UIControlStateNormal]; - [_clickBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_clickBtn addTarget:self action:@selector(clickAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _clickBtn; -} -- (UIView *)editView{ - if (!_editView){ - _editView = [UIView new]; - _editView.backgroundColor = UIColorFromRGB(0xE1FAFF); - UIImageView *imageView = [UIImageView new]; - imageView.image = kImage(@"mine_user_info_head_edit"); - imageView.userInteractionEnabled = YES; - [_editView addSubview:imageView]; - [imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(14); - make.leading.mas_equalTo(9); - make.top.mas_equalTo(4); - }]; - UILabel *label = [UILabel labelInitWithText:YMLocalizedString(@"XPMineUserInfoHeaderTagView0") font:[UIFont systemFontOfSize:10 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x00C4EA)]; - [_editView addSubview:label]; - label.userInteractionEnabled = YES; - [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(33); - make.trailing.mas_equalTo(-15); - make.top.mas_equalTo(3); - make.bottom.mas_equalTo(-3); - }]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(editAction)]; - [_editView addGestureRecognizer:tap]; - _editView.hidden = YES; - _editView.layer.cornerRadius = 10; - _editView.layer.masksToBounds = YES; - } - return _editView; -} -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.h deleted file mode 100644 index 0ed1fb4..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// XPMineHeaderView.h -// xplan-ios -// -// Created by 冯硕 on 2021/9/22. -// - -#import -#import "XPSoundCardModel.h" -#import "XPMineUserInfoTagModel.h" -@class RelationUserVO, NameplateModel; -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel, SDCycleScrollView,XPMineUserInfoHeaderView; -@protocol XPMineUserInfoHeaderViewDelegate -///去房间 -- (void)xPMineUserInfoHeaderView:(XPMineUserInfoHeaderView *)view didClickGoToRoom:(NSString *)roomUid; - -//@optional -/////播放声音，播放或关闭 -//- (void)xPMineUserInfoHeaderView:(XPMineUserInfoHeaderView *)view didClickPlaySound:(BOOL)isPlay; -/////去录音VC -////- (void)didClickGoToPlaySound; -/////去标签页 -//- (void)xPMineUserInfoHeaderView:(XPMineUserInfoHeaderView *)view didClickGotoEditView:(NSMutableArray *)itemList; -/////去标签vc -//- (void)xPMineUserInfoHeaderView:(XPMineUserInfoHeaderView *)view didClickGotoEditVC:(NSMutableArray *)itemList; -@end - -@interface XPMineUserInfoHeaderView : UIView -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -///代理 -@property (nonatomic,weak) id delegate; -///当前查看用户是否在直播 -@property (nonatomic,copy) NSString *roomUid; - -@property (nonatomic, strong) RelationUserVO *relationUser; -@property (nonatomic, copy) NSArray *cpUsers; - -@property (nonatomic, copy) NSArray *nameplateList; - -+ (CGFloat)headerHeight:(UserInfoModel *)model cps:(NSInteger)cps; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m deleted file mode 100644 index 988c6c8..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m +++ /dev/null @@ -1,1775 +0,0 @@ -// -// XPMineHeaderView.m -// xplan-ios -// -// Created by 冯硕 on 2021/9/22. -// - -#import "XPMineUserInfoHeaderView.h" -///Third -#import -#import -#import "SDPhotoBrowser.h" -#import -#import -#import -#import "UIView+VAP.h" -#import "XPRoomGiftAnimationParser.h" -///Tool -#import "UIImage+ImageEffects.h" -#import "UIImage+Utils.h" -#import "NetImageView.h" -#import "XPSkillCardPlayerManager.h" -#import "XPRoomMiniManager.h" -#import "SpriteSheetImageManager.h" -#import "XCCurrentVCStackManager.h" - -///view -#import "CPCard.h" -#import "XPBeautIDView.h" -#import "CPListViewController.h" - -///Model -#import "UserInfoModel.h" - -@interface NameplateCell : UICollectionViewCell - -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) NetImageView *imageView; - -- (void)updateCell:(NameplateModel *)model; - -@end - -@implementation NameplateCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self.contentView addSubview:self.imageView]; - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - } - return self; -} - -- (void)updateCell:(NameplateModel *)model { - self.imageView.imageUrl = model.nameplateImage; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" font:kFontRegular(10) textColor:[UIColor whiteColor]]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (NetImageView *)imageView { - if (!_imageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _imageView = [[NetImageView alloc] initWithConfig:config]; - _imageView.userInteractionEnabled = YES; - _imageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _imageView; -} - -@end - -@interface XPMineUserInfoHeaderView ()< -SDCycleScrollViewDelegate, -SDPhotoBrowserDelegate, -UICollectionViewDataSource, -UICollectionViewDelegateFlowLayout, -HWDMP4PlayDelegate> - -///轮播图 -@property (nonatomic,strong) SDCycleScrollView *pi_cycleScrollView; -///显示当前的页数 -@property (nonatomic,strong) UIButton *pageButton; -///审核中图标 -@property (nonatomic,strong) UIImageView *reviewIcon; -///图片数组 -@property (nonatomic,strong) NSArray *imageUrls; -///用户的头像和相册 -@property (nonatomic,strong) NSMutableArray *userPhotoArray; -///用户信息 -@property (nonatomic,strong) UIView * userInfoView; -///头像的 -@property (nonatomic,strong) UserPhoto *avatarPhoto; -///头像 -@property (nonatomic,strong) NetImageView * avatarView; -@property (nonatomic,strong) NetImageView * avatarView_cp; -///普通的 -@property (nonatomic,strong) YYAnimatedImageView *headWearImageView; -///头饰播放 -@property (nonatomic, strong) SpriteSheetImageManager *manager; -@property (nonatomic, strong) SVGAImageView *headWearSvgaImageView; -@property (nonatomic, strong) SVGAImageView *headWearSvgaImageView_cp_me; -@property (nonatomic, strong) SVGAImageView *headWearSvgaImageView_cp; - -@property (nonatomic, strong) UIImageView *cpAvatarHeart; -@property (nonatomic, strong) UIImageView *cpAvatarFlag; - -///用户信息的背景 -@property (nonatomic,strong) UIStackView *nickStackView; -///名字 -@property (nonatomic,strong) UILabel *nameLabel; -///sex -@property (nonatomic,strong) UIButton *sexImageView; -///正在直播icon图 -@property (nonatomic,strong) SVGAImageView *onlineIconView; -///正在直播中 -@property (nonatomic,strong) UIButton *onlineButton; -@property(nonatomic, strong) UIStackView *stack; -///id -@property (nonatomic,strong) UILabel *idLabel; -@property (nonatomic, strong) UIImageView *copyIdImageView; -@property (nonatomic, strong) XPBeautIDView *beautIDView; - -@property(nonatomic, strong) UIView *idEmptyView; - -@property (nonatomic, strong) UIButton *copyIdButton; -///魅力等级 等级 铭牌 -@property (nonatomic,strong) UIStackView *tagStackView; -///魅力等级 -@property (nonatomic,strong) NetImageView *charmImageView; -///等级 -@property (nonatomic,strong) NetImageView *experImageView; -///代充 -@property (nonatomic,strong) NetImageView *rechargeImageView; -///铭牌图片 -@property (nonatomic,strong) NetImageView *vipPlateImageView; -@property (nonatomic,strong) NetImageView *agentPlateImageView; -///新用户 -@property (nonatomic,strong) UIImageView *newUserImageView; -///官方的 -@property (nonatomic,strong) UIImageView *officialImageView; -///签名 -@property (nonatomic,strong) UILabel *signatureLabel; -///VIP等级icon -@property (nonatomic,strong) NetImageView *nobleImageView; - -@property (nonatomic, strong) UIStackView *locateDateStackView; -@property (nonatomic, strong) UILabel *locateLabel; - -@property (nonatomic, strong) UILabel *fansNum; -@property (nonatomic, strong) UILabel *followersNum; - -@property (nonatomic, strong) CPCard *cpCard_1; -@property (nonatomic, strong) CPCard *cpCard_2; -@property (nonatomic, strong) CPCard *cpCard_3; -@property (nonatomic, strong) CPCard *cpCard_4; -@property (nonatomic, strong) UIButton *cpListButton; - -@property (nonatomic, strong) UICollectionView *nameplateCollectionView; - -@property(nonatomic, strong) XPRoomGiftAnimationParser *personalBGMP4Parser; -@property(nonatomic, strong) NetImageView *personalBGImageView; -@property (nonatomic, strong) VAPView *personalBGMP4; -@property (nonatomic, strong) SVGAImageView *personalBGSvga; - -@property (nonatomic, strong) UIScrollView *medalsScrollView; -@property (nonatomic, strong) UIStackView *medalsStackView; - -@property (nonatomic, strong) NSArray *medalMP4Views; - -@end - -@implementation XPMineUserInfoHeaderView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self setupUI]; - } - return self; -} - -+ (CGFloat)namePlateHeight:(NSArray *)list { - CGFloat namePlateHeight = 0; - if (list.count > 0) { - // 固定的 cell 宽度和高度 - CGFloat cellWidth = 70; - CGFloat cellHeight = 20; - - // collectionView 左右边距 - CGFloat sidePadding = kGetScaleWidth(15); // 左右各 15 - CGFloat itemSpacing = 4; // cell 间的水平间距 - CGFloat lineSpacing = 2; // 行间距 - - CGFloat collectionViewWidth = KScreenWidth - sidePadding; - - // 可用宽度 = collectionView 的总宽度 - 左右边距 - CGFloat availableWidth = collectionViewWidth - sidePadding; - - // 计算每行能放的 cell 数量 - NSInteger itemsPerRow = floor((availableWidth) / (cellWidth + itemSpacing)); - - // 计算总行数 - NSInteger rows = (list.count + itemsPerRow - 1) / itemsPerRow; - - // 总高度 = 所有 cell 的高度 + 所有行间距 - namePlateHeight = rows * cellHeight + rows * lineSpacing; - } - - return namePlateHeight; -} - -+ (CGFloat)medalsHeight:(NSArray *)medalsList { - if (medalsList.count > 0) { - // 勋章高度 30px + 上下间距 12px (6px * 2) - return 30 + 12; - } - return 0; -} - -+ (CGFloat)headerHeight:(UserInfoModel *)model cps:(NSInteger)cps { - CGFloat height = 0; - NSInteger numberOfLines = 1; - CGFloat lineHeight = 0; - if (model.userDesc.length > 0) { - // 限定宽度 - CGFloat maxWidth = KScreenWidth - 30; - UIFont *font = kFontRegular(13); - // 设置计算属性 - NSDictionary *attributes = @{NSFontAttributeName:font}; - - // 计算文本的矩形区域 - CGRect textRect = [model.userDesc boundingRectWithSize:CGSizeMake(maxWidth, CGFLOAT_MAX) - options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading - attributes:attributes - context:nil]; - - // 计算每行的高度 - lineHeight = font.lineHeight; - - // 计算行数 - numberOfLines = ceil(textRect.size.height / lineHeight); - } - - // topAlbum + cp + name plate area + medals area + line contents + others - height = kGetScaleWidth(195) + 160 + [self namePlateHeight:model.userNameplateList] + [self medalsHeight:model.medalsPic] + (lineHeight * numberOfLines) + kGetScaleWidth(80); - if (cps == 0) { - cps = 1; - } - if (cps > 0) { - height = height + kGetScaleWidth(135) * cps + 10 * cps; - } - - return height; -} - -#pragma mark - Private Method -- (void)setupUI { - self.backgroundColor = [UIColor clearColor]; - - [self setupAlbumScrollView]; - - [self addSubview:self.pageButton]; - [self.pageButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self).offset(kGetScaleWidth(-15)); - make.top.mas_equalTo(self).offset(kNavigationHeight + 80); - make.size.mas_equalTo(CGSizeMake(30, 18)); - }]; - - [self addSubview:self.userInfoView]; - [self.userInfoView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self); - make.top.mas_equalTo(kGetScaleWidth(195)); - make.bottom.mas_equalTo(self); - }]; - - [self.userInfoView addSubview:self.personalBGMP4]; - [self.userInfoView addSubview:self.personalBGSvga]; - [self.userInfoView addSubview:self.personalBGImageView]; - - [self setupAvatars]; - - [self.personalBGImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarView).offset(-15); - make.leading.trailing.mas_equalTo(self.userInfoView); - make.height.mas_equalTo(kGetScaleWidth(370)); - }]; - - [self setupNameArea]; - - [self setupNameplateArea]; - - [self setupMedalsArea]; - - [self setupLocateArea]; - - [self setupCustomDesc]; - - [self setupRelationshipArea]; - - [self setupCPArea]; -} - -- (void)setupAlbumScrollView { - [self addSubview:self.pi_cycleScrollView]; - [self.pi_cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(195)); - }]; - - // 创建一个新的视图作为蒙层 - UIView *overlay = [[UIView alloc] initWithFrame:self.pi_cycleScrollView.bounds]; - overlay.userInteractionEnabled = NO; - // 设置蒙层背景色为黑色，透明度为 0.5 - overlay.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5]; - - // 将蒙层添加到目标视图 - [self.pi_cycleScrollView addSubview:overlay]; - - // 确保蒙层大小适应目标视图的变化 - overlay.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; - [overlay mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.pi_cycleScrollView); - }]; -} - -- (void)setupAvatars { - [self addSubview:self.avatarView]; - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(82)); - make.leading.mas_equalTo(30); - make.centerY.equalTo(self.userInfoView.mas_top); - }]; - - [self addSubview:self.headWearImageView]; - [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarView); - make.width.height.mas_equalTo(kGetScaleWidth(114)); - }]; - - [self addSubview:self.headWearSvgaImageView]; - [self.headWearSvgaImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarView); - make.width.height.mas_equalTo(kGetScaleWidth(114)); - }]; - - [self addSubview:self.reviewIcon]; - [self.reviewIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.avatarView); - }]; - - [self addSubview:self.avatarView_cp]; - [self.avatarView_cp mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(82)); - make.leading.mas_equalTo(self.headWearSvgaImageView.mas_trailing).offset(kGetScaleWidth(16)); - make.centerY.equalTo(self.userInfoView.mas_top); - }]; - - [self addSubview:self.headWearSvgaImageView_cp_me]; - [self.headWearSvgaImageView_cp_me mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarView); - make.width.height.mas_equalTo(kGetScaleWidth(114)); - }]; - - [self addSubview:self.headWearSvgaImageView_cp]; - [self.headWearSvgaImageView_cp mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarView_cp); - make.width.height.mas_equalTo(kGetScaleWidth(114)); - }]; - - [self addSubview:self.cpAvatarHeart]; - [self.cpAvatarHeart mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.userInfoView.mas_top); - make.centerX.equalTo(self.headWearSvgaImageView.mas_trailing); - make.width.height.mas_equalTo(kGetScaleWidth(38)); - }]; - - [self addSubview:self.cpAvatarFlag]; - [self.cpAvatarFlag mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self.headWearSvgaImageView); - make.centerX.equalTo(self.headWearSvgaImageView.mas_trailing); - make.width.mas_equalTo(kGetScaleWidth(122)); - make.height.mas_equalTo(kGetScaleWidth(35)); - }]; -} - -- (void)setupNameArea { - [self addSubview:self.onlineButton]; - [self.onlineButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.userInfoView).offset(-15); - make.top.mas_equalTo(self.userInfoView).offset(kGetScaleWidth(57)); - make.height.mas_equalTo(22); - make.width.mas_greaterThanOrEqualTo(72); - }]; - - [self.onlineButton addSubview:self.onlineIconView]; - [self.onlineIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(8); - make.centerY.mas_equalTo(0); - make.width.height.mas_equalTo(16); - }]; - - @kWeakify(self); - SVGAParser * parser = [[SVGAParser alloc]init]; - [parser parseWithNamed:@"pi_new_mine_info_online" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.onlineIconView.loops = 0; - self.onlineIconView.clearsAfterStop = NO; - self.onlineIconView.videoItem = videoItem; - [self.onlineIconView startAnimation]; - } failureBlock:^(NSError * _Nonnull error) { }]; - - [self.userInfoView addSubview:self.nickStackView]; - [self.nickStackView addArrangedSubview:self.nameLabel]; - [self.nickStackView addArrangedSubview:self.sexImageView]; - - [self.nickStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.userInfoView).offset(kGetScaleWidth(15)); - make.top.mas_equalTo(self.userInfoView).offset(kGetScaleWidth(57)); - make.height.mas_equalTo(22); - }]; - - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(35, 16)); - }]; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { -// NSLog(@"%@", [NSValue valueWithCGPoint:scrollView.contentOffset]); -} - -- (void)setupIDArea { - if (_stack) { - return; - } - UIScrollView *scrollView = [[UIScrollView alloc] init]; - - _stack = [[UIStackView alloc] init]; - self.stack.axis = UILayoutConstraintAxisHorizontal; - self.stack.distribution = UIStackViewDistributionFill; - self.stack.alignment = UIStackViewAlignmentLeading; - self.stack.spacing = 4; - - [self.userInfoView addSubview:self.stack]; - [self.stack mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.top.mas_equalTo(self.nickStackView.mas_bottom).offset(5); - make.height.mas_equalTo(24); - }]; - - [self.stack addArrangedSubview:self.beautIDView]; - [self.stack addArrangedSubview:self.idLabel]; - [self.stack addArrangedSubview:self.copyIdImageView]; - [self.stack addArrangedSubview:self.experImageView]; - [self.stack addArrangedSubview:self.charmImageView]; - [self.stack addArrangedSubview:self.vipPlateImageView]; - [self.stack addArrangedSubview:self.agentPlateImageView]; - if (_idEmptyView) { - [self.stack addArrangedSubview:self.idEmptyView]; - [self.idEmptyView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(24); - make.width.mas_equalTo(30); - }]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [scrollView setContentOffset:CGPointMake(34, 0)]; - }); - } - - [self.beautIDView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(24); - make.width.mas_greaterThanOrEqualTo(10); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(24); - }]; - - [self.copyIdImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20, 20)); - }]; - - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(36, 18)); - }]; - - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(36, 18)); - }]; - - [self.vipPlateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(24); - make.width.mas_equalTo(60); - }]; - [self.agentPlateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(24); - make.width.mas_equalTo(60); - }]; -} - -- (void)setupNameplateArea { - [self.userInfoView addSubview:self.nameplateCollectionView]; - [self.nameplateCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nickStackView.mas_bottom).offset(30); - make.leading.mas_equalTo(self.userInfoView).offset(kGetScaleWidth(15)); - make.trailing.mas_equalTo(self.userInfoView);//.offset(kGetScaleWidth(-15)); - make.height.mas_equalTo(0); - }]; -} - -- (void)setupMedalsArea { - // 添加 ScrollView 作为容器 - [self.userInfoView addSubview:self.medalsScrollView]; - [self.medalsScrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nameplateCollectionView.mas_bottom).offset(6); - make.leading.mas_equalTo(self.userInfoView).offset(kGetScaleWidth(15)); - make.trailing.mas_equalTo(self.userInfoView).offset(kGetScaleWidth(-15)); - make.height.mas_equalTo(0); - }]; - - UIView *container = [[UIView alloc] init]; - container.backgroundColor = [UIColor clearColor]; - [self.medalsScrollView addSubview:container]; - [container mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.medalsScrollView); - }]; - - // 在 ScrollView 中添加 StackView - [container addSubview:self.medalsStackView]; - [self.medalsStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(container); - make.height.mas_equalTo(kGetScaleWidth(30)); - }]; - - // 默认隐藏，有数据时再显示 - self.medalsScrollView.hidden = YES; -} - -- (void)setupLocateArea { - [self.userInfoView addSubview:self.locateLabel]; - [self.locateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.userInfoView).offset(kGetScaleWidth(15)); - make.height.mas_equalTo(18); - make.top.mas_equalTo(self.medalsScrollView.mas_bottom).offset(6); - }]; -} - -- (void)setupCustomDesc { - [self.userInfoView addSubview:self.signatureLabel]; - [self.signatureLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.userInfoView).offset(kGetScaleWidth(15)); - make.trailing.mas_equalTo(self.userInfoView).offset(kGetScaleWidth(-15)); - make.top.mas_equalTo(self.locateLabel.mas_bottom).offset(6); - }]; -} - -- (void)setupRelationshipArea { - UIStackView *stack = [[UIStackView alloc] init]; - stack.axis = UILayoutConstraintAxisHorizontal; - stack.distribution = UIStackViewDistributionFill; - stack.alignment = UIStackViewAlignmentCenter; - stack.spacing = 30; - - UIStackView *stack_follow = [[UIStackView alloc] init]; - stack_follow.axis = UILayoutConstraintAxisHorizontal; - stack_follow.distribution = UIStackViewDistributionFill; - stack_follow.alignment = UIStackViewAlignmentFirstBaseline; - stack_follow.spacing = 6; - - [stack_follow addArrangedSubview:self.followersNum]; - UILabel *followerTitle = [UILabel labelInitWithText:YMLocalizedString(@"XPMineHeadView4") - font:kFontRegular(12) - textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - [stack_follow addArrangedSubview:followerTitle]; - - - UIStackView *stack_fans = [[UIStackView alloc] init]; - stack_fans.axis = UILayoutConstraintAxisHorizontal; - stack_fans.distribution = UIStackViewDistributionFill; - stack_fans.alignment = UIStackViewAlignmentFirstBaseline; - stack_fans.spacing = 6; - - [stack_fans addArrangedSubview:self.fansNum]; - UILabel *fansTitle = [UILabel labelInitWithText:YMLocalizedString(@"XPMineHeadView5") - font:kFontRegular(12) - textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - [stack_fans addArrangedSubview:fansTitle]; - - [stack addArrangedSubview:stack_follow]; - [stack addArrangedSubview:stack_fans]; - - [self.userInfoView addSubview:stack]; - [stack mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.signatureLabel.mas_bottom).offset(6); - make.leading.mas_equalTo(self.userInfoView).offset(kGetScaleWidth(15)); - make.height.mas_equalTo(30); - }]; -} - -- (void)setupCPArea { - UIView *greenLine = [[UIView alloc] init]; - greenLine.layer.backgroundColor = UIColorFromRGB(0x04D5C6).CGColor; - greenLine.layer.cornerRadius = 2; - - [self.userInfoView addSubview:greenLine]; - [greenLine mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.top.mas_equalTo(self.signatureLabel.mas_bottom).offset(57); - make.size.mas_equalTo(CGSizeMake(3, 15)); - }]; - - UILabel *titleLabel = [UILabel labelInitWithText:@"CP" font:kFontSemibold(16) textColor:[UIColor whiteColor]]; - [self.userInfoView addSubview:titleLabel]; - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(greenLine.mas_trailing).offset(7); - make.centerY.mas_equalTo(greenLine); - }]; - - UIButton *cpListButton = [UIButton buttonWithType:UIButtonTypeCustom]; - cpListButton.hidden = YES; - [cpListButton setImage:kImage(@"cp_menu") forState:UIControlStateNormal]; - [cpListButton addTarget:self action:@selector(clickCPListButton) forControlEvents:UIControlEventTouchUpInside]; - [self.userInfoView addSubview:cpListButton]; - [cpListButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(titleLabel); - make.trailing.mas_equalTo(kGetScaleWidth(-15)); - make.width.height.mas_equalTo(22); - }]; - self.cpListButton = cpListButton; - - [self.userInfoView addSubview:self.cpCard_1]; - [self.cpCard_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(titleLabel.mas_bottom).offset(3); - make.width.mas_equalTo(self.userInfoView); - make.height.mas_equalTo(kGetScaleWidth(135)); - }]; - - [self.userInfoView addSubview:self.cpCard_2]; - [self.cpCard_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.cpCard_1.mas_bottom).offset(12); - make.width.mas_equalTo(self.userInfoView); - make.height.mas_equalTo(kGetScaleWidth(135)); - }]; - - [self.userInfoView addSubview:self.cpCard_3]; - [self.cpCard_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.cpCard_2.mas_bottom).offset(12); - make.width.mas_equalTo(self.userInfoView); - make.height.mas_equalTo(kGetScaleWidth(135)); - }]; - - [self.userInfoView addSubview:self.cpCard_4]; - [self.cpCard_4 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.cpCard_3.mas_bottom).offset(12); - make.width.mas_equalTo(self.userInfoView); - make.height.mas_equalTo(kGetScaleWidth(135)); - }]; -} - -#pragma mark - UICollectionView Delegate & DataSource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.nameplateList.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView - cellForItemAtIndexPath:(NSIndexPath *)indexPath { - NameplateCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"NameplateCell" forIndexPath:indexPath]; - [cell updateCell:[self.nameplateList xpSafeObjectAtIndex:indexPath.row]]; - return cell; -} - -#pragma mark - SDPhotoBrowserDelegate -- (NSURL *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageURLForIndex:(NSInteger)index { - if(browser.isAvatar == YES){ - return [NSURL URLWithString:self.avatarView.imageUrl]; - } - NSString *photoUrl = [self.imageUrls xpSafeObjectAtIndex:index]; - return [NSURL URLWithString:photoUrl ? photoUrl : @""]; -} - -- (UIImage *)photoBrowser:(SDPhotoBrowser *)browser placeholderImageForIndex:(NSInteger)index { - return [UIImageConstant defaultBannerPlaceholder]; -} - -#pragma mark - SDCycleScrollViewDelegate --(void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didScrollToIndex:(NSInteger)index { - [self.pageButton setTitle:[NSString stringWithFormat:@"%ld/%lu",(index + 1), (unsigned long)self.imageUrls.count] forState:UIControlStateNormal]; - UserPhoto * photo = [self.userPhotoArray xpSafeObjectAtIndex:index]; - self.reviewIcon.hidden = !photo.isReview; -} - -// 轮播图点击 -- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index { - NSInteger count = self.imageUrls.count; - SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init]; - browser.sourceImagesContainerView = self.pi_cycleScrollView; - browser.delegate = self; - browser.imageCount = count; - browser.currentImageIndex = index; - browser.isMe = NO; - [browser show]; -} -///复制id --(void)copyNameAction{ - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPMineUserInfoHeaderView0")]; - UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; - pasteboard. string = [NSString stringWithFormat:@"%ld", (long)_userInfo.erbanNo]; -} - -#pragma mark - Event Response --(void)clickAvatarAction{ - SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init]; - browser.sourceImagesContainerView = self.avatarView; - browser.delegate = self; - browser.imageCount = 1; - browser.currentImageIndex = 0; - browser.isMe = NO; - browser.isAvatar = YES; - [browser show]; -} - -- (void)clickCPListButton { - CPListViewController *cpListVC = [[CPListViewController alloc] init]; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:cpListVC animated:YES]; -} - -- (void)onlineButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineUserInfoHeaderView:didClickGoToRoom:)]) { - [self.delegate xPMineUserInfoHeaderView:self didClickGoToRoom:self.roomUid]; - } -} - -#pragma mark - Getters And Setters -- (CGFloat)widthOfText:(NSString *)text withFont:(UIFont *)font { - NSDictionary *attributes = @{NSFontAttributeName: font}; - CGSize textSize = [text sizeWithAttributes:attributes]; - return textSize.width; -} - -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - if (!_userInfo) { - return; - } - - if (_personalBGMP4) { - [self.personalBGMP4 stopHWDMP4]; - } - if (_personalBGSvga) { - [self.personalBGSvga stopAnimation]; - } - - if (userInfo.usingPersonalBackground) { - if (![NSString isEmpty:userInfo.usingPersonalBackground.effect]) { - switch (userInfo.usingPersonalBackground.effectType) { - case 0: { - self.personalBGImageView.imageUrl = userInfo.usingPersonalBackground.effect; - } - break; - case 1: { - @kWeakify(self); - [self.personalBGMP4Parser parseWithURL:[userInfo.usingPersonalBackground.effect pureURLString] - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [self.personalBGMP4 setMute:YES]; - [self.personalBGMP4 playHWDMP4:videoUrl repeatCount:-1 delegate:self]; - } - } failureBlock:^(NSError * _Nullable error) { -// NSLog(@"%@", error); - }]; - } - break; - case 2: { - SVGAParser *parser = [[SVGAParser alloc] init]; - @kWeakify(self); - [parser parseWithURL:[NSURL URLWithString:userInfo.usingPersonalBackground.effect] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - self.personalBGSvga.videoItem = videoItem; - self.personalBGSvga.loops = 0; - [self.personalBGSvga startAnimation]; - } failureBlock:nil]; - } - break; - - default: - break; - } - } else if(![NSString isEmpty:userInfo.usingPersonalBackground.pic]) { - self.personalBGImageView.imageUrl = userInfo.usingPersonalBackground.pic; - } - } - - [self updateNameAndGenderInfo]; - [self updateIDInfo]; - [self updateLocateAndRegionInfo]; - [self updateSignatureInfo]; - [self updateRelationShipInfo]; - [self updateHeadwearInfo]; - - self.cpListButton.hidden = (userInfo.uid != [AccountInfoStorage instance].getUid.integerValue); - - self.officialImageView.hidden = userInfo.defUser != UserLevelType_Offical; - self.newUserImageView.hidden = !userInfo.newUser; - - 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_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; - }]; - } - 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_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; - }] ; - } - self.charmImageView.hidden = userInfo.userLevelVo.charmUrl.length <= 0; - if (userInfo.userVipInfoVO.nameplateUrl.length > 0) { - [self loadNamePlate:userInfo.userVipInfoVO.nameplateUrl targetView:self.vipPlateImageView]; - self.vipPlateImageView.hidden = NO; - } else { - self.vipPlateImageView.hidden = YES; - } - - if (userInfo.guildNameplateIcon.length > 0) { - [self loadNamePlate:userInfo.guildNameplateIcon targetView:self.agentPlateImageView]; - self.agentPlateImageView.hidden = NO; - } else { - self.agentPlateImageView.hidden = YES; - } - - self.rechargeImageView.hidden = !_userInfo.isRechargeUser; - [self.userPhotoArray removeAllObjects]; - // 轮播图 - NSMutableArray * imageUrls = [NSMutableArray array]; - if (userInfo.avatar) { - [imageUrls addObject:userInfo.avatar]; - if (![self.userPhotoArray containsObject:self.avatarPhoto]) { - [self.userPhotoArray addObject:self.avatarPhoto]; - } - self.avatarPhoto.isReview = userInfo.isReview; - self.avatarPhoto.photoUrl = userInfo.avatar; - self.avatarView.imageUrl = userInfo.avatar; - } - if (self.userInfo.privatePhoto.count > 0) { - for (int i = 0; i < self.userInfo.privatePhoto.count; i++) { - UserPhoto * photo = [self.userInfo.privatePhoto xpSafeObjectAtIndex:i]; - if (photo.photoUrl.length > 0) { - [self.userPhotoArray addObject:photo]; - [imageUrls addObject:photo.photoUrl]; - } - } - } - - if (imageUrls.count > 0) { - self.imageUrls = imageUrls; - self.pi_cycleScrollView.imageURLStringsGroup = imageUrls; - [self.pageButton setTitle:[NSString stringWithFormat:@"1/%lu",(unsigned long)imageUrls.count] forState:UIControlStateNormal];; - // 要初始化一下当前的审核状态 - if(self.userPhotoArray.count > 0){ - UserPhoto * photo = [self.userPhotoArray xpSafeObjectAtIndex:0]; - if (photo) { - self.reviewIcon.hidden = !photo.isReview; - } - } - } - - if (userInfo.userVipInfoVO.vipIcon.length > 0) { - self.nobleImageView.hidden = NO; - self.nobleImageView.imageUrl = userInfo.userVipInfoVO.vipIcon; - } else { - self.nobleImageView.hidden = YES; - } - - // 更新勋章显示 - [self updateMedalsDisplay:userInfo.medalsPic]; -} - -- (void)loadNamePlate:(NSString *)imagePath targetView:(NetImageView *)targetView { - [targetView loadImageWithUrl:imagePath completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - if (image) { - CGSize size = image.size; - [targetView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(round(size.width * 24/size.height)); - }]; - targetView.image = image; - } - }]; -} - -- (void)setRoomUid:(NSString *)roomUid { - _roomUid = roomUid; - if([XPSkillCardPlayerManager shareInstance].isInRoom == YES || [[XPRoomMiniManager shareManager] getRoomInfo] != nil){ - self.onlineButton.hidden = _roomUid.length <= 0; - }else{ - self.onlineButton.hidden = YES; - } -} - -- (void)setCpUsers:(NSArray *)cpUsers { - _cpUsers = cpUsers; - RelationUserVO *vo_1 = [cpUsers xpSafeObjectAtIndex:0]; - self.cpCard_1.usersAvatar = self.userInfo.avatar; - if (vo_1) { - [self.cpCard_1 updateForUserPage:vo_1]; - } - - RelationUserVO *vo_2 = [cpUsers xpSafeObjectAtIndex:1]; - self.cpCard_2.usersAvatar = self.userInfo.avatar; - [self.cpCard_2 setHidden:!vo_2]; - if (vo_2) { - [self.cpCard_2 updateForUserPage:vo_2]; - } - - RelationUserVO *vo_3 = [cpUsers xpSafeObjectAtIndex:2]; - self.cpCard_3.usersAvatar = self.userInfo.avatar; - [self.cpCard_3 setHidden:!vo_3]; - if (vo_3) { - [self.cpCard_3 updateForUserPage:vo_3]; - } - - RelationUserVO *vo_4 = [cpUsers xpSafeObjectAtIndex:3]; - self.cpCard_4.usersAvatar = self.userInfo.avatar; - [self.cpCard_4 setHidden:!vo_4]; - if (vo_4) { - [self.cpCard_4 updateForUserPage:vo_4]; - } -} - -- (void)setRelationUser:(RelationUserVO *)relationUser { - _relationUser = relationUser; - BOOL hideCPAvatarContent = NO; - if (relationUser.showCpAvatar) { - hideCPAvatarContent = [relationUser isEmptyRelation]; - } else { - hideCPAvatarContent = YES; - } - - if (hideCPAvatarContent) { - [self.headWearSvgaImageView_cp stopAnimation]; - } else { - [self playCPSVGA:relationUser.cpLevel]; - } - - self.avatarView_cp.hidden = hideCPAvatarContent; - self.cpAvatarHeart.hidden = hideCPAvatarContent; - self.cpAvatarFlag.hidden = hideCPAvatarContent; - self.headWearSvgaImageView_cp.hidden = hideCPAvatarContent; - - self.avatarView_cp.imageUrl = relationUser.cpAvatar; - - NSString *imagePath = [NSString stringWithFormat:@"cp_avatar_flag_lv_%ld", relationUser.cpLevel]; - self.cpAvatarFlag.image = kImage(imagePath); -} - -- (void)setNameplateList:(NSArray *)nameplateList { - _nameplateList = nameplateList; - [self.nameplateCollectionView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo([XPMineUserInfoHeaderView namePlateHeight:nameplateList]); - }]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.nameplateCollectionView reloadData]; - }); -} - -- (void)updateNameAndGenderInfo { - self.nameLabel.text = self.userInfo.nick; - UIImage *sexBackgroundImage = nil; - if (self.userInfo.gender == GenderType_Male) { - sexBackgroundImage = [UIImage gradientColorImageFromColors:@[UIColorRGBAlpha(0x6BB3FF, 0.5),UIColorFromRGB(0x6BB3FF)] - gradientType:GradientTypeTopToBottom - imgSize:CGSizeMake(35, 16)]; - } else { - sexBackgroundImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xF2A0C3),UIColorFromRGB(0xEB74A6)] - gradientType:GradientTypeTopToBottom - imgSize:CGSizeMake(35, 16)]; - } - [self.sexImageView setTitle:[NSString getAgeWithBirth:self.userInfo.birth] forState:UIControlStateNormal]; - [self.sexImageView setBackgroundImage:sexBackgroundImage forState:UIControlStateNormal]; -} - -- (void)updateIDInfo { - NSString *text = [NSString stringWithFormat:@"%ld", (long)self.userInfo.erbanNo]; - - [self setupIDArea]; - - if (self.userInfo.hasPrettyErbanNo) { - self.idLabel.hidden = YES; - self.beautIDView.hidden = NO; - self.beautIDView.num = text; - } else { - self.idLabel.hidden = NO; - self.beautIDView.hidden = YES; - self.idLabel.text = [NSString stringWithFormat:@"ID:%@", text]; - } -} - -- (void)updateLocateAndRegionInfo { - NSString *locateString = @""; - if (self.userInfo.region.length > 0) { - locateString = [NSString stringWithFormat:@"%@ | ", self.userInfo.region]; - } - NSDate *date = [NSDate dateWithTimeIntervalSince1970:self.userInfo.birth/1000]; - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - [dateFormatter setDateFormat:@"yyyy-MM-dd"]; - NSString *dateString = [dateFormatter stringFromDate:date]; - - self.locateLabel.text = [NSString stringWithFormat:@"%@%@", locateString, dateString]; -} - -- (void)updateSignatureInfo { - self.signatureLabel.text = _userInfo.userDesc.length > 0 ? self.userInfo.userDesc : YMLocalizedString(@"XPMineUserInfoHeaderView6"); -} - -- (void)updateRelationShipInfo { - self.fansNum.text = [@(self.userInfo.fansNum) stringValue]; - self.followersNum.text = [@(self.userInfo.followNum) stringValue]; -} - -- (void)updateHeadwearInfo { - NSString *headerUrl = self.userInfo.headwearEffect.length > 0 ? self.userInfo.headwearEffect : self.userInfo.headwearPic; - if (headerUrl.length == 0) { - self.headWearImageView.hidden = YES; - self.headWearSvgaImageView.hidden = YES; - } else { - if ([self.userInfo isHeadWearSVGA]) { - [self playSVGA:headerUrl]; - } else { - [self playAnimate:headerUrl]; - } - } -} - -- (void)playSVGA:(NSString *)svgaUrlString { - [self.headWearSvgaImageView setImageName:svgaUrlString]; -} - -- (void)playCPSVGA:(NSInteger)level { - if (level == 0) { - return; - } - self.headWearSvgaImageView.videoItem = nil; - [self.headWearSvgaImageView stopAnimation]; - - @kWeakify(self); - SVGAParser *parser = [SVGAParser new]; - [parser parseWithNamed:@(level).stringValue - inBundle:[NSBundle mainBundle] - completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.headWearSvgaImageView_cp_me.hidden = NO; - self.headWearSvgaImageView_cp.hidden = NO; - self.headWearSvgaImageView_cp_me.videoItem = videoItem; - [self.headWearSvgaImageView_cp_me startAnimation]; - self.headWearSvgaImageView_cp.videoItem = videoItem; - [self.headWearSvgaImageView_cp startAnimation]; - } failureBlock:^(NSError * _Nonnull error) { - - }]; -} - -- (void)playAnimate:(NSString *)headwearUrlString { - self.headWearImageView.hidden = NO; - NSURL *url = [NSURL URLWithString:headwearUrlString]; - @kWeakify(self); - [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { - @kStrongify(self); - self.headWearImageView.image = sprit; - } failureBlock:^(NSError * _Nullable error) {}]; -} - -#pragma mark - MP4 delegate -- (BOOL)shouldStartPlayMP4:(VAPView *)container config:(QGVAPConfigModel *)config { - return YES; -} - -- (void)viewDidFailPlayMP4:(NSError *)error { - [self.personalBGMP4 removeFromSuperview]; -} - -- (void)viewDidFinishPlayMP4:(NSInteger)totalFrameCount view:(VAPView *)container { - -} - -#pragma mark - Getters -- (UIView *)userInfoView { - if (!_userInfoView) { - _userInfoView = [[UIView alloc] init]; - _userInfoView.backgroundColor = UIColorFromRGB(0x08151A); - } - return _userInfoView; -} - -- (UIStackView *)nickStackView { - if (!_nickStackView) { - _nickStackView = [[UIStackView alloc] init]; - _nickStackView.backgroundColor = [UIColor clearColor]; - _nickStackView.axis = UILayoutConstraintAxisHorizontal; - _nickStackView.distribution = UIStackViewDistributionFillProportionally; - _nickStackView.alignment = UIStackViewAlignmentCenter; - _nickStackView.spacing = 4; - if (isMSRTL()) { - _nickStackView.semanticContentAttribute = UISemanticContentAttributeForceRightToLeft; - } - } - return _nickStackView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [[UILabel alloc] init]; - _nameLabel.font = kFontMedium(16); - _nameLabel.textColor = [UIColor whiteColor]; - _nameLabel.numberOfLines = 1; - [_nameLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_nameLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _nameLabel; -} - -- (UIButton *)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, 2, 0, 0); - _sexImageView.layer.cornerRadius = 14/2; - _sexImageView.layer.masksToBounds = YES; - } - return _sexImageView; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = kFontMedium(12); - _idLabel.textColor = [UIColor whiteColor]; - _idLabel.textAlignment = NSTextAlignmentCenter; - _idLabel.userInteractionEnabled = YES; - _idLabel.clipsToBounds = NO; - _idLabel.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(copyNameAction)]; - [_idLabel addGestureRecognizer:tap]; - } - return _idLabel; -} - -- (UIImageView *)copyIdImageView { - if (!_copyIdImageView) { - _copyIdImageView = [[UIImageView alloc] init]; - _copyIdImageView.userInteractionEnabled = YES; - _copyIdImageView.contentMode = UIViewContentModeScaleAspectFit; - _copyIdImageView.image = [UIImage getLanguageImage:@"user_card_copy_id1"]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(copyNameAction)]; - [_copyIdImageView addGestureRecognizer:tap]; - } - return _copyIdImageView; -} - -- (UIButton *)copyIdButton { - if (!_copyIdButton) { - _copyIdButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_copyIdButton addTarget:self action:@selector(copyNameAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _copyIdButton; -} - -- (XPBeautIDView *)beautIDView { - if (!_beautIDView) { - _beautIDView = [[XPBeautIDView alloc] init]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(copyNameAction)]; - [_beautIDView addGestureRecognizer:tap]; - } - return _beautIDView; -} - -- (SVGAImageView *)onlineIconView { - if (_onlineIconView == nil) { - _onlineIconView = [[SVGAImageView alloc]init]; - _onlineIconView.contentMode = UIViewContentModeScaleToFill; - _onlineIconView.userInteractionEnabled = NO; - _onlineIconView.backgroundColor = [UIColor clearColor]; - } - return _onlineIconView; -} - -- (UIButton *)onlineButton { - if (!_onlineButton) { - _onlineButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_onlineButton setBackgroundColor:UIColorFromRGB(0x04D5C6)]; - [_onlineButton addTarget:self - action:@selector(onlineButtonAction:) - forControlEvents:UIControlEventTouchUpInside]; - [_onlineButton setTitle:[NSString stringWithFormat:@"%@ ", YMLocalizedString(@"XPMineSimpleUserInfoHeaderView2")] - forState:UIControlStateNormal]; - [_onlineButton.titleLabel setFont:kFontMedium(12)]; - [_onlineButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - _onlineButton.layer.cornerRadius = 11; - _onlineButton.layer.masksToBounds = YES; - _onlineButton.hidden = YES; - - _onlineButton.imageEdgeInsets = UIEdgeInsetsMake(0, 40, 0, 0); - _onlineButton.titleEdgeInsets = UIEdgeInsetsMake(0, 34, 0, 0); - } - return _onlineButton; -} - -- (SDCycleScrollView *)pi_cycleScrollView { - if (!_pi_cycleScrollView) { - _pi_cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero - delegate:self - placeholderImage:[UIImageConstant defaultBannerPlaceholder]]; - _pi_cycleScrollView.backgroundColor = [UIColor clearColor]; - _pi_cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; - _pi_cycleScrollView.pageControlStyle = SDCycleScrollViewPageContolStyleNone; - _pi_cycleScrollView.autoScroll = NO; - // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 - _pi_cycleScrollView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - for (UIView *subView in _pi_cycleScrollView.subviews) { - subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - } - return _pi_cycleScrollView; -} - -- (UIButton *)pageButton { - if (!_pageButton) { - _pageButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_pageButton setTitleColor:UIColorFromRGB(0xfffcfc) forState:UIControlStateNormal]; - _pageButton.titleLabel.font = kFontMedium(11); - _pageButton.backgroundColor = UIColorRGBAlpha(0x000000, 0.6); - _pageButton.layer.cornerRadius = 9; - _pageButton.layer.masksToBounds = YES; - } - return _pageButton; -} - - -- (UIImageView *)reviewIcon { - if (!_reviewIcon) { - _reviewIcon = [[UIImageView alloc] init]; - _reviewIcon.image = [UIImage getLanguageImage:@"mine_album_reviewing"]; - _reviewIcon.contentMode = UIViewContentModeScaleAspectFit; - _reviewIcon.hidden = YES; - } - return _reviewIcon; -} - -- (UIStackView *)tagStackView { - if (!_tagStackView) { - _tagStackView = [[UIStackView alloc] init]; - _tagStackView.axis = UILayoutConstraintAxisHorizontal; - _tagStackView.distribution = UIStackViewDistributionFill; - _tagStackView.alignment = UIStackViewAlignmentCenter; - _tagStackView.spacing = 6; - } - return _tagStackView; -} -- (NetImageView *)experImageView { - if (!_experImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserCardLevel; - _experImageView = [[NetImageView alloc] initWithConfig:config]; - _experImageView.userInteractionEnabled = YES; - _experImageView.hidden = YES; - _experImageView.contentMode = UIViewContentModeScaleToFill; - } - return _experImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserCardLevel; - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - _charmImageView.userInteractionEnabled = YES; - _charmImageView.hidden = YES; - _charmImageView.contentMode = UIViewContentModeScaleToFill; - } - return _charmImageView; -} - -- (NetImageView *)vipPlateImageView { - if (!_vipPlateImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _vipPlateImageView = [[NetImageView alloc] initWithConfig:config]; - _vipPlateImageView.userInteractionEnabled = YES; - _vipPlateImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _vipPlateImageView; -} - -- (NetImageView *)agentPlateImageView { - if (!_agentPlateImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _agentPlateImageView = [[NetImageView alloc] initWithConfig:config]; - _agentPlateImageView.userInteractionEnabled = YES; - _agentPlateImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _agentPlateImageView; -} - -- (UIImageView *)newUserImageView { - if (!_newUserImageView) { - _newUserImageView = [[UIImageView alloc] init]; - _newUserImageView.userInteractionEnabled = YES; - _newUserImageView.image = [UIImage getLanguageImage:@"common_new_user"]; - _newUserImageView.hidden = YES; - } - return _newUserImageView; -} - -- (UIImageView *)officialImageView { - if (!_officialImageView) { - _officialImageView = [[UIImageView alloc] init]; - _officialImageView.userInteractionEnabled = YES; - _officialImageView.image = [UIImage imageNamed:@"app_admin_icon"]; - _officialImageView.hidden = YES; - } - return _officialImageView; -} - -- (UILabel *)signatureLabel { - if (!_signatureLabel) { - _signatureLabel = [[UILabel alloc] init]; - _signatureLabel.font = kFontRegular(13); - _signatureLabel.textColor = [UIColor colorWithWhite:1 alpha:0.6]; - _signatureLabel.numberOfLines = 0; - _signatureLabel.textAlignment = NSTextAlignmentNatural; - } - return _signatureLabel; -} - -- (NSMutableArray *)userPhotoArray { - if (!_userPhotoArray) { - _userPhotoArray = [NSMutableArray array]; - } - return _userPhotoArray; -} - -- (UserPhoto *)avatarPhoto { - if (!_avatarPhoto) { - _avatarPhoto = [[UserPhoto alloc] init]; - } - return _avatarPhoto; -} - --(NetImageView *)avatarView{ - if (!_avatarView){ - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - _avatarView = [[NetImageView alloc]initWithConfig:config]; - _avatarView.layer.cornerRadius = kGetScaleWidth(41); - _avatarView.layer.masksToBounds = YES; - _avatarView.layer.borderWidth = 1; - _avatarView.userInteractionEnabled = YES; - _avatarView.layer.borderColor = [UIColor whiteColor].CGColor; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickAvatarAction)]; - [_avatarView addGestureRecognizer:tap]; - } - return _avatarView; -} - --(NetImageView *)avatarView_cp{ - if (!_avatarView_cp){ - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - _avatarView_cp = [[NetImageView alloc]initWithConfig:config]; - _avatarView_cp.hidden = YES; - _avatarView_cp.layer.cornerRadius = kGetScaleWidth(41); - _avatarView_cp.layer.masksToBounds = YES; - _avatarView_cp.layer.borderWidth = 1; - _avatarView_cp.userInteractionEnabled = YES; - _avatarView_cp.layer.borderColor = [UIColor whiteColor].CGColor; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickAvatarAction)]; - [_avatarView_cp addGestureRecognizer:tap]; - } - return _avatarView_cp; -} - -- (YYAnimatedImageView *)headWearImageView { - if (!_headWearImageView) { - _headWearImageView = [[YYAnimatedImageView alloc] init]; - _headWearImageView.backgroundColor = [UIColor clearColor]; - _headWearImageView.contentMode = UIViewContentModeScaleAspectFit; - _headWearImageView.layer.masksToBounds = YES; - _headWearImageView.layer.cornerRadius = 10; - } - return _headWearImageView; -} - -- (SpriteSheetImageManager *)manager { - if (!_manager) { - _manager = [[SpriteSheetImageManager alloc] init]; - } - return _manager; -} - -- (NetImageView *)rechargeImageView{ - if(!_rechargeImageView){ - _rechargeImageView = [NetImageView new]; - _rechargeImageView.image = [UIImage getLanguageImage:@"mine_info_recharge"]; - _rechargeImageView.hidden = YES; - } - return _rechargeImageView; -} -- (NetImageView *)nobleImageView { - if (!_nobleImageView) { - _nobleImageView = [[NetImageView alloc] init]; - _nobleImageView.contentMode = UIViewContentModeScaleAspectFit; - _nobleImageView.hidden = YES; - } - return _nobleImageView; -} - -- (UIStackView *)locateDateStackView { - if (!_locateDateStackView) { - _locateDateStackView = [[UIStackView alloc] init]; - _locateDateStackView.backgroundColor = [UIColor clearColor]; - _locateDateStackView.axis = UILayoutConstraintAxisHorizontal; - _locateDateStackView.distribution = UIStackViewDistributionEqualCentering; - _locateDateStackView.alignment = UIStackViewAlignmentCenter; - _locateDateStackView.spacing = 6; - } - return _locateDateStackView; -} - -- (UILabel *)locateLabel { - if (!_locateLabel) { - _locateLabel = [[UILabel alloc] init]; - _locateLabel.font = kFontMedium(12); - _locateLabel.textColor = [UIColor colorWithWhite:1 alpha:0.6]; - } - return _locateLabel; -} - -- (UILabel *)fansNum { - if (!_fansNum) { - _fansNum = [[UILabel alloc] init]; - _fansNum.font = kFontSemibold(20); - _fansNum.textColor = [UIColor whiteColor]; - } - return _fansNum; -} - -- (UILabel *)followersNum { - if (!_followersNum) { - _followersNum = [[UILabel alloc] init]; - _followersNum.font = kFontSemibold(20); - _followersNum.textColor = [UIColor whiteColor]; - } - return _followersNum; -} - -- (SVGAImageView *)headWearSvgaImageView { - if (!_headWearSvgaImageView) { - _headWearSvgaImageView = [[SVGAImageView alloc]init]; - _headWearSvgaImageView.backgroundColor = [UIColor clearColor]; - _headWearSvgaImageView.frame = self.bounds; - _headWearSvgaImageView.userInteractionEnabled = YES; - _headWearSvgaImageView.autoPlay = YES; - } - return _headWearSvgaImageView; -} - -- (SVGAImageView *)headWearSvgaImageView_cp_me { - if (!_headWearSvgaImageView_cp_me) { - _headWearSvgaImageView_cp_me = [[SVGAImageView alloc]init]; - _headWearSvgaImageView_cp_me.hidden = YES; - _headWearSvgaImageView_cp_me.backgroundColor = [UIColor clearColor]; - _headWearSvgaImageView_cp_me.frame = self.bounds; - _headWearSvgaImageView_cp_me.userInteractionEnabled = YES; - _headWearSvgaImageView_cp_me.autoPlay = YES; - } - return _headWearSvgaImageView_cp_me; -} - -- (SVGAImageView *)headWearSvgaImageView_cp { - if (!_headWearSvgaImageView_cp) { - _headWearSvgaImageView_cp = [[SVGAImageView alloc]init]; - _headWearSvgaImageView_cp.hidden = YES; - _headWearSvgaImageView_cp.backgroundColor = [UIColor clearColor]; - _headWearSvgaImageView_cp.frame = self.bounds; - _headWearSvgaImageView_cp.userInteractionEnabled = YES; - _headWearSvgaImageView_cp.autoPlay = YES; - } - return _headWearSvgaImageView_cp; -} - -- (CPCard *)cpCard_1 { - if (!_cpCard_1) { - _cpCard_1 = [[CPCard alloc] init]; - _cpCard_1.isListItem = NO; - } - return _cpCard_1; -} - -- (CPCard *)cpCard_2 { - if (!_cpCard_2) { - _cpCard_2 = [[CPCard alloc] init]; - _cpCard_2.isListItem = NO; - _cpCard_2.hidden = YES; - } - return _cpCard_2; -} - -- (CPCard *)cpCard_3 { - if (!_cpCard_3) { - _cpCard_3 = [[CPCard alloc] init]; - _cpCard_3.isListItem = NO; - _cpCard_3.hidden = YES; - } - return _cpCard_3; -} - -- (CPCard *)cpCard_4 { - if (!_cpCard_4) { - _cpCard_4 = [[CPCard alloc] init]; - _cpCard_4.isListItem = NO; - _cpCard_4.hidden = YES; - } - return _cpCard_4; -} - -- (UIImageView *)cpAvatarHeart { - if (!_cpAvatarHeart) { - _cpAvatarHeart = [[UIImageView alloc] initWithImage:kImage(@"cp_avatar_heart")]; - _cpAvatarHeart.hidden = YES; - } - return _cpAvatarHeart; -} - -- (UIImageView *)cpAvatarFlag { - if (!_cpAvatarFlag) { - _cpAvatarFlag = [[UIImageView alloc] init]; - _cpAvatarFlag.hidden = YES; - } - return _cpAvatarFlag; -} - -- (UICollectionView *)nameplateCollectionView { - if (!_nameplateCollectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(72, 20); - layout.minimumLineSpacing = 2; - layout.minimumInteritemSpacing = 4; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _nameplateCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _nameplateCollectionView.backgroundColor = [UIColor clearColor]; - _nameplateCollectionView.scrollEnabled = NO; - _nameplateCollectionView.delegate = self; - _nameplateCollectionView.dataSource = self; - _nameplateCollectionView.scrollEnabled = YES; - [_nameplateCollectionView registerClass:[NameplateCell class] forCellWithReuseIdentifier:@"NameplateCell"]; - } - return _nameplateCollectionView; -} - -- (VAPView *)personalBGMP4 { - if (!_personalBGMP4) { - _personalBGMP4 = [[VAPView alloc] initWithFrame:CGRectMake(0, kGetScaleWidth(-82/2), KScreenWidth, kGetScaleWidth(370))]; - _personalBGMP4.contentMode = UIViewContentModeScaleAspectFill; - _personalBGMP4.hwd_Delegate = self; - } - return _personalBGMP4; -} - -- (SVGAImageView *)personalBGSvga { - if (_personalBGSvga == nil) { - _personalBGSvga = [[SVGAImageView alloc] initWithFrame:CGRectMake(0, -20, KScreenWidth, kGetScaleWidth(370))]; - _personalBGSvga.contentMode = UIViewContentModeScaleToFill; - _personalBGSvga.userInteractionEnabled = NO; - _personalBGSvga.backgroundColor = [UIColor clearColor]; - } - return _personalBGSvga; -} - -- (XPRoomGiftAnimationParser *)personalBGMP4Parser { - if (!_personalBGMP4Parser) { - _personalBGMP4Parser = [[XPRoomGiftAnimationParser alloc] init]; - } - return _personalBGMP4Parser; -} - -- (NetImageView *)personalBGImageView { - if (!_personalBGImageView) { - _personalBGImageView = [[NetImageView alloc] initWithFrame:CGRectMake(0, kGetScaleWidth(-50), KScreenWidth, kGetScaleWidth(370))]; - _personalBGImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _personalBGImageView; -} - -- (UIScrollView *)medalsScrollView { - if (!_medalsScrollView) { - _medalsScrollView = [[UIScrollView alloc] init]; - _medalsScrollView.backgroundColor = [UIColor clearColor]; - _medalsScrollView.showsHorizontalScrollIndicator = NO; - _medalsScrollView.showsVerticalScrollIndicator = NO; - _medalsScrollView.scrollEnabled = YES; - _medalsScrollView.bounces = YES; - _medalsScrollView.alwaysBounceHorizontal = NO; - } - return _medalsScrollView; -} - -- (UIStackView *)medalsStackView { - if (!_medalsStackView) { - _medalsStackView = [[UIStackView alloc] init]; - _medalsStackView.backgroundColor = [UIColor clearColor]; - _medalsStackView.axis = UILayoutConstraintAxisHorizontal; - _medalsStackView.distribution = UIStackViewDistributionFill;//UIStackViewDistributionEqualSpacing; - _medalsStackView.alignment = UIStackViewAlignmentLeading; - _medalsStackView.spacing = 5; - } - return _medalsStackView; -} - -- (NSArray *)medalMP4Views { - if (!_medalMP4Views) { - _medalMP4Views = [NSArray array]; - } - return _medalMP4Views; -} - -- (void)updateMedalsDisplay:(NSArray *)medals { - // 停止并清除之前的播放器 - for (VAPView *mp4View in self.medalMP4Views) { - [mp4View stopHWDMP4]; - } - - // 清空 StackView 中的所有子视图 - for (UIView *subview in self.medalsStackView.arrangedSubviews) { - [self.medalsStackView removeArrangedSubview:subview]; - [subview removeFromSuperview]; - } - - if (medals.count == 0) { - self.medalsScrollView.hidden = YES; - return; - } - - [self.medalsScrollView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(30)); - }]; - - self.medalsScrollView.hidden = NO; - NSMutableArray *mp4Views = [NSMutableArray array]; - - // 最多显示 10 个勋章 - NSInteger count = MIN(medals.count, 10); - for (NSInteger i = 0; i < count; i++) { - BaseModelVo *medal = medals[i]; - UIView *medalContainer = [[UIView alloc] init]; - medalContainer.backgroundColor = [UIColor clearColor]; - - if ([medal.picUrl.lowercaseString hasSuffix:@".mp4"]) { - // 显示 MP4 - 需要先通过 XPRoomGiftAnimationParser 解析 - VAPView *mp4View = [[VAPView alloc] init]; - mp4View.contentMode = UIViewContentModeScaleAspectFit; - mp4View.hwd_Delegate = self; - - [medalContainer addSubview:mp4View]; - [mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(medalContainer); - }]; - - [mp4Views addObject:mp4View]; - - // 创建 parser 来解析 MP4 URL - XPRoomGiftAnimationParser *parser = [[XPRoomGiftAnimationParser alloc] init]; - @kWeakify(self); - [parser parseWithURL:[medal.picUrl pureURLString] - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [mp4View setMute:YES]; - [mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:self]; - } - } failureBlock:^(NSError * _Nullable error) { - // 解析失败，可以显示默认图片或隐藏 - NSLog(@"Medal MP4 parse failed: %@", error); - }]; - } else { - // 显示图片 - NetImageView *imageView = [[NetImageView alloc] init]; - imageView.imageUrl = medal.picUrl; - imageView.contentMode = UIViewContentModeScaleAspectFit; - - [medalContainer addSubview:imageView]; - [imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(medalContainer); - }]; - } - - [self.medalsStackView addArrangedSubview:medalContainer]; - [medalContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height - .mas_equalTo(kGetScaleWidth(30)); -// .priority(UILayoutPriorityRequired); - }]; - -// // 设置内容压缩阻力优先级，防止被压缩 -// [medalContainer setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; -// [medalContainer setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; -// -// // 设置内容拥抱优先级，防止被拉伸 -// [medalContainer setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; -// [medalContainer setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; - } - - // 更新 ScrollView 的 contentSize - [self.medalsStackView layoutIfNeeded]; - CGFloat stackViewWidth = self.medalsStackView.frame.size.width; - if (stackViewWidth == 0) { - // 如果 StackView 还没有布局，计算预期宽度 - CGFloat expectedWidth = count * kGetScaleWidth(30) + (count - 1) * 5; - stackViewWidth = expectedWidth; - } - - CGFloat targetWidth = KScreenWidth - kGetScaleWidth(40); - if (stackViewWidth < targetWidth) { - UIView *v = [[UIView alloc] initWithFrame:CGRectMake(0, 0, targetWidth, kGetScaleWidth(30))]; - v.backgroundColor = [UIColor clearColor]; - [self.medalsStackView addArrangedSubview:v]; - [v mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size - .mas_equalTo(CGSizeMake(targetWidth-stackViewWidth, kGetScaleWidth(30))); - }]; - stackViewWidth = targetWidth; - } - [self.medalsStackView layoutIfNeeded]; - self.medalsScrollView.contentSize = CGSizeMake(stackViewWidth, kGetScaleWidth(30)); - - self.medalMP4Views = [mp4Views copy]; -} - -- (void)stopAllMedalsMP4 { - for (VAPView *mp4View in self.medalMP4Views) { - [mp4View stopHWDMP4]; - } - self.medalMP4Views = @[]; -} - -- (void)dealloc { - [self stopAllMedalsMP4]; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoIndividualTagView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoIndividualTagView.h deleted file mode 100644 index d8f6b75..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoIndividualTagView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// XPMineUserInfoIndividualTagView.h -// xplan-ios -// -// Created by duoban on 2023/2/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@protocol XPMineUserInfoIndividualTagViewDelegate - -- (void)didClickGotoEditVC; - - -@end - -@interface XPMineUserInfoIndividualTagView : UIView -@property (nonatomic,strong) NSMutableArray *itemList; -/// -@property (nonatomic,copy) NSString *uid; -/// -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoIndividualTagView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoIndividualTagView.m deleted file mode 100644 index 6848c46..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoIndividualTagView.m +++ /dev/null @@ -1,184 +0,0 @@ -// -// XPMineUserInfoIndividualTagView.m -// xplan-ios -// -// Created by duoban on 2023/2/16. -// -#import "XPMineUserInfoTagFlowLayout.h" -#import "XPMineUserInfoHeaderTagCell.h" -#import "XPMineUserInfoTagModel.h" -#import "XPMineUserInfoIndividualTagView.h" -@interface XPMineUserInfoIndividualTagView() - - -@property (nonatomic,strong) UICollectionView *collectionView; -///标题 -@property (nonatomic,strong) UILabel *titleView; -///返回按钮 -@property (nonatomic,strong) UIButton *backBtn; -///编辑按钮 -@property (nonatomic,strong) UIButton *editBtn; -///背景 -@property (nonatomic,strong) UIView *bgView; -///容器 -@property (nonatomic,strong) UIStackView *stackView; - -@end -@implementation XPMineUserInfoIndividualTagView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} --(void)setUid:(NSString *)uid{ - _uid = uid; - BOOL isMe = [[[AccountInfoStorage instance]getUid]isEqualToString:_uid]; - _editBtn.hidden = !isMe; - _titleView.text = isMe ? YMLocalizedString(@"XPMineUserInfoIndividualTagView1"):YMLocalizedString(@"XPMineUserInfoIndividualTagView0"); -} -#pragma mark - Private Method -- (void)initSubViews { - - [self addSubview:self.bgView]; - [self.bgView addSubview:self.backBtn]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.collectionView]; - [self.stackView addArrangedSubview:self.editBtn]; -} -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(310)); - make.height.mas_equalTo(kGetScaleWidth(220)); - make.center.equalTo(self); - }]; - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(22)); - make.top.mas_equalTo(kGetScaleWidth(10)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(18)); - make.centerX.equalTo(self.bgView); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.bgView); - make.bottom.mas_equalTo(-kGetScaleWidth(20)); - make.top.equalTo(self.titleView.mas_bottom); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.equalTo(self.stackView); - }]; - [self.editBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(130)); - make.height.mas_equalTo(kGetScaleWidth(34)); - make.centerX.equalTo(self.stackView); - }]; - -} -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - XPMineUserInfoTagItemModel *model = self.itemList[indexPath.row]; - return CGSizeMake(model.width, kGetScaleWidth(18)); -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - - return self.itemList.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - - XPMineUserInfoHeaderTagCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoHeaderTagCell class]) forIndexPath:indexPath]; - cell.isTag = indexPath.row < 3; - XPMineUserInfoTagItemModel *model = self.itemList[indexPath.row]; - cell.title = model.label; - cell.contentView.layer.cornerRadius = 9; - cell.titleView.font = kFontRegular(10); - return cell; -} --(void)setItemList:(NSMutableArray *)itemList{ - _itemList = itemList; - - [_collectionView reloadData]; -} --(void)backAction{ - [TTPopup dismiss]; -} --(void)editAction{ - - if(self.delegate && [self.delegate respondsToSelector:@selector(didClickGotoEditVC)]){ - [self.delegate didClickGotoEditVC]; - } - [TTPopup dismiss]; -} -#pragma mark -懒加载 -- (UICollectionView *)collectionView{ - if (!_collectionView) { - XPMineUserInfoTagFlowLayout *layout = [[XPMineUserInfoTagFlowLayout alloc] init]; - layout.delegate = self; - layout.sectionInset = UIEdgeInsetsMake(kGetScaleWidth(15), kGetScaleWidth(15), kGetScaleWidth(15), kGetScaleWidth(15)); - layout.minimumLineSpacing = kGetScaleWidth(12); - layout.minimumInteritemSpacing = kGetScaleWidth(5); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPMineUserInfoHeaderTagCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoHeaderTagCell class])]; - _collectionView.showsVerticalScrollIndicator = YES; - _collectionView.showsHorizontalScrollIndicator = YES; - } - return _collectionView; -} -- (UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(12) rightTopCorner:kGetScaleWidth(12) bottomLeftCorner:kGetScaleWidth(12) bottomRightCorner:kGetScaleWidth(12) size:CGSizeMake(kGetScaleWidth(310), kGetScaleWidth(220))]; - } - return _bgView; -} -- (UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel labelInitWithText:@"" font:kFontMedium(17) textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _titleView; -} --(UIButton *)backBtn{ - if (!_backBtn){ - _backBtn = [UIButton new]; - [_backBtn setBackgroundImage:kImage(@"mine_guild_close") forState:UIControlStateNormal]; - [_backBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_backBtn addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = kGetScaleWidth(10); - } - return _stackView; -} --(UIButton *)editBtn{ - if (!_editBtn){ - _editBtn = [UIButton new]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(130), kGetScaleWidth(34))]; - [_editBtn setBackgroundImage:image forState:UIControlStateNormal]; - [_editBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _editBtn.titleLabel.font = kFontMedium(14); - [_editBtn setTitle:YMLocalizedString(@"XPMineUserInfoIndividualTagView2") forState:UIControlStateNormal]; - [_editBtn addTarget:self action:@selector(editAction) forControlEvents:UIControlEventTouchUpInside]; - _editBtn.layer.cornerRadius = kGetScaleWidth(17); - _editBtn.layer.masksToBounds = YES; - } - return _editBtn; -} -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoNavView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoNavView.h deleted file mode 100644 index 01d49dc..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoNavView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// XPMineUserInfoNavView.h -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMineUserInfoNavView; - -@protocol XPMineUserInfoNavViewDelegate -//点击了返回 -- (void)xPMineUserInfoNavView:(XPMineUserInfoNavView *)view didClickBack:(UIButton *)sender; -///点击了搜索 -- (void)xPMineUserInfoNavView:(XPMineUserInfoNavView *)view didClickComplete:(UIButton *)sender; -@end - - -@interface XPMineUserInfoNavView : UIView -/// -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoNavView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoNavView.m deleted file mode 100644 index 7d671b8..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoNavView.m +++ /dev/null @@ -1,88 +0,0 @@ -// -// XPMineUserInfoNavView.m -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import "XPMineUserInfoNavView.h" -@interface XPMineUserInfoNavView() -///返回 -@property (nonatomic,strong) UIButton *backButton; -///标题 -@property (nonatomic,strong) UILabel *titleView; -///完成 -@property (nonatomic,strong) UIButton *completeBtn; -@end -@implementation XPMineUserInfoNavView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backButton]; - [self addSubview:self.titleView]; - [self addSubview:self.completeBtn]; -} -- (void)initSubViewConstraints { - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(28)); - make.leading.mas_equalTo(0); - make.bottom.mas_equalTo(-kGetScaleWidth(8)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.backButton); - make.centerX.equalTo(self); - }]; - [self.completeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.width.mas_equalTo(kGetScaleWidth(40)); - make.height.mas_equalTo(kGetScaleWidth(24)); - make.centerY.equalTo(self.backButton); - }]; -} --(void)backButtonAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(xPMineUserInfoNavView:didClickBack:)]){ - [self.delegate xPMineUserInfoNavView:self didClickBack:self.backButton]; - } -} --(void)completeAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(xPMineUserInfoNavView:didClickComplete:)]){ - [self.delegate xPMineUserInfoNavView:self didClickComplete:self.completeBtn]; - } -} -#pragma mark -懒加载 -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateSelected]; - [_backButton addTarget:self action:@selector(backButtonAction) forControlEvents:UIControlEventTouchUpInside]; - [_backButton setEnlargeEdgeWithTop:10 right:5 bottom:10 left:8]; - } - return _backButton; -} -- (UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineUserInfoTagVC0") font:kFontSemibold(17) textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _titleView; -} -- (UIButton *)completeBtn{ - if (!_completeBtn){ - _completeBtn = [UIButton new]; - [_completeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_completeBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_completeBtn setTitle:YMLocalizedString(@"XPMineUserInfoTagVC1") forState:UIControlStateNormal]; - [_completeBtn addTarget:self action:@selector(completeAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _completeBtn; -} -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagEmptyView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagEmptyView.h deleted file mode 100644 index a056d85..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagEmptyView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineUserInfoTagEmptyView.h -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserInfoTagEmptyView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagEmptyView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagEmptyView.m deleted file mode 100644 index d312c4a..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagEmptyView.m +++ /dev/null @@ -1,58 +0,0 @@ -// -// XPMineUserInfoTagEmptyView.m -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import "XPMineUserInfoTagEmptyView.h" -@interface XPMineUserInfoTagEmptyView () -///图片 -@property (nonatomic,strong) UIImageView *iconView; -///标题 -@property (nonatomic,strong) UILabel *titleView; -@end -@implementation XPMineUserInfoTagEmptyView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.iconView]; - [self addSubview:self.titleView]; -} -- (void)initSubViewConstraints { - [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(55)); - make.height.mas_equalTo(kGetScaleWidth(56)); - make.top.mas_equalTo(kNavigationHeight + kGetScaleWidth(18)); - make.centerX.equalTo(self); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kNavigationHeight + kGetScaleWidth(95)); - make.centerX.equalTo(self); - }]; -} -#pragma mark -懒加载 -- (UIImageView *)iconView{ - if (!_iconView){ - _iconView = [UIImageView new]; - _iconView.image = kImage(@"mine_info_tag_empty"); - } - return _iconView; -} --(UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineUserInfoTagEmptyViewCell0") font:kFontRegular(14) textColor:[UIColor whiteColor]]; - } - return _titleView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagFlowLayout.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagFlowLayout.h deleted file mode 100644 index 3eee22d..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagFlowLayout.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPMineUserInfoTagFlowLayout.h -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol EqualSpaceFlowLayoutDelegate -@end -@interface XPMineUserInfoTagFlowLayout : MSBaseRTLFlowLayout -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagFlowLayout.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagFlowLayout.m deleted file mode 100644 index ccd2a0d..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagFlowLayout.m +++ /dev/null @@ -1,65 +0,0 @@ -// -// XPMineUserInfoTagFlowLayout.m -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import "XPMineUserInfoTagFlowLayout.h" -@interface XPMineUserInfoTagFlowLayout() -@property (nonatomic, strong) NSMutableArray *itemAttributes; -@end -@implementation XPMineUserInfoTagFlowLayout -#pragma mark - Methods to Override -- (void)prepareLayout -{ - [super prepareLayout]; - - NSInteger itemCount = [[self collectionView] numberOfItemsInSection:0]; - self.itemAttributes = [NSMutableArray arrayWithCapacity:itemCount]; - - CGFloat xOffset = self.sectionInset.left; - CGFloat yOffset = self.sectionInset.top; - CGFloat xNextOffset = self.sectionInset.left; - for (NSInteger idx = 0; idx < itemCount; idx++) { - NSIndexPath *indexPath = [NSIndexPath indexPathForItem:idx inSection:0]; - CGSize itemSize = [self.delegate collectionView:self.collectionView layout:self sizeForItemAtIndexPath:indexPath]; - - xNextOffset+=(self.minimumInteritemSpacing + itemSize.width); - if (xNextOffset > [self collectionView].bounds.size.width - self.sectionInset.right) { - xOffset = self.sectionInset.left; - xNextOffset = (self.sectionInset.left + self.minimumInteritemSpacing + itemSize.width); - yOffset += (itemSize.height + self.minimumLineSpacing); - } - else - { - xOffset = xNextOffset - (self.minimumInteritemSpacing + itemSize.width); - } - - UICollectionViewLayoutAttributes *layoutAttributes = - [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath]; - - layoutAttributes.frame = CGRectMake(xOffset, yOffset, itemSize.width, itemSize.height); - [_itemAttributes addObject:layoutAttributes]; - } -} - -- (UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSIndexPath *)indexPath -{ - return (self.itemAttributes)[indexPath.item]; -} - -- (NSArray *)layoutAttributesForElementsInRect:(CGRect)rect -{ - return [self.itemAttributes filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(UICollectionViewLayoutAttributes *evaluatedObject, NSDictionary *bindings) { - return CGRectIntersectsRect(rect, [evaluatedObject frame]); - }]]; -} - -- (BOOL)shouldInvalidateLayoutForBoundsChange:(CGRect)newBounds -{ - return NO; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagHeadView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagHeadView.h deleted file mode 100644 index b2f3ede..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagHeadView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPMineUserInfoTagHeadView.h -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import -#import "XPMineUserInfoTagModel.h" -NS_ASSUME_NONNULL_BEGIN - - - -@interface XPMineUserInfoTagHeadView : UIView -/// -@property (nonatomic,strong) XPMineUserInfoTagModel *tagModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagHeadView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagHeadView.m deleted file mode 100644 index d3f5ade..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagHeadView.m +++ /dev/null @@ -1,146 +0,0 @@ -// -// XPMineUserInfoTagHeadView.m -// xplan-ios -// -// Created by duoban on 2023/2/15. -// -UIKIT_EXTERN NSString * kMineInfoDelTag; -#import "XPMineUserInfoTagHeadView.h" -///cell -#import "XPMineUserInfoTagViewCell.h" -#import "XPMineUserInfoTagEmptyView.h" -#import "XPMineUserInfoTagFlowLayout.h" -@interface XPMineUserInfoTagHeadView() -@property (nonatomic,strong) UICollectionView *collectionView; -/// -@property (nonatomic,strong) NSMutableArray *itemList; -/// -@property (nonatomic,strong) XPMineUserInfoTagEmptyView *emptyView; - -@end -@implementation XPMineUserInfoTagHeadView --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} --(void)setTagModel:(XPMineUserInfoTagModel *)tagModel{ - _tagModel = tagModel; - [_itemList removeAllObjects]; - for (NSString *text in _tagModel.meLabels) { - if(text.length > 0){ - XPMineUserInfoTagItemModel *model = [XPMineUserInfoTagItemModel new]; - model.label = text; - CGRect stringRect = [text boundingRectWithSize:CGSizeMake(MAXFLOAT, kGetScaleWidth(18)) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:kFontRegular(13)} context:nil]; - model.width = stringRect.size.width + kGetScaleWidth(46); - [_itemList addObject:model]; - } - - } - _collectionView.hidden = !(_itemList.count > 0); - _emptyView.hidden = _itemList.count > 0; - [_collectionView reloadData]; - - if(_itemList.count > 0 && [_collectionView visibleCells] > 0){ - [self scrollBottom]; - - } - -} --(void)scrollBottom{ - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:self.itemList.count - 1 inSection:0] atScrollPosition:UICollectionViewScrollPositionTop animated:YES]; - - }); -} - -#pragma mark - Private Method -- (void)initSubViews { - _itemList = [NSMutableArray array]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xB0DAFF),UIColorFromRGB(0xB0DAFF),UIColorFromRGB(0xF4DBFF)] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(KScreenWidth, kGetScaleWidth(304))]; - self.backgroundColor = [UIColor colorWithPatternImage:image]; - [self addSubview:self.emptyView]; - [self addSubview:self.collectionView]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(delTagItem:) name:kMineInfoDelTag object:nil]; -} -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self); - make.top.mas_equalTo(kNavigationHeight); - }]; - [self.emptyView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; -} --(void)delTagItem:(NSNotification *)not{ - XPMineUserInfoTagItemModel *model = not.object; - NSMutableArray *meLabels = [NSMutableArray arrayWithArray:self.tagModel.meLabels]; - if([meLabels containsObject:model.label]){ - [meLabels removeObject:model.label]; - } - self.tagModel.meLabels = meLabels; - [self.itemList removeObject:model]; - _collectionView.hidden = !(_itemList.count > 0); - _emptyView.hidden = _itemList.count > 0; - [_collectionView reloadData]; - if(_itemList.count > 0 && [_collectionView visibleCells] > 0){ - [self scrollBottom]; - } -} -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource - - - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - - XPMineUserInfoTagItemModel *model = self.itemList[indexPath.row]; - return CGSizeMake(model.width, kGetScaleWidth(34)); - -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.itemList.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - - XPMineUserInfoTagViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoTagViewCell class]) forIndexPath:indexPath]; - XPMineUserInfoTagItemModel *model = self.itemList[indexPath.row]; - cell.headModel = model; - return cell; - - -} -#pragma mark -懒加载 -- (UICollectionView *)collectionView{ - if (!_collectionView) { - XPMineUserInfoTagFlowLayout *layout = [[XPMineUserInfoTagFlowLayout alloc] init]; - layout.delegate = self; - layout.minimumLineSpacing = kGetScaleWidth(15); - layout.minimumInteritemSpacing = kGetScaleWidth(15); - layout.sectionInset = UIEdgeInsetsMake(kGetScaleWidth(15), kGetScaleWidth(15), kGetScaleWidth(64), kGetScaleWidth(15)); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.hidden = YES; - _collectionView.pagingEnabled = NO; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPMineUserInfoTagViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoTagViewCell class])]; - _collectionView.showsVerticalScrollIndicator = NO; - } - return _collectionView; -} - -- (XPMineUserInfoTagEmptyView *)emptyView{ - if (!_emptyView){ - _emptyView = [[XPMineUserInfoTagEmptyView alloc]initWithFrame:CGRectZero]; - } - return _emptyView; -} -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagItemView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagItemView.h deleted file mode 100644 index d173770..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagItemView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPMineUserInfoTagItemView.h -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import -#import -#import "XPMineUserInfoTagModel.h" -#import "XPMineUserInfoTagModel.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol XPMineUserInfoTagItemViewDelegate - --(void)didSelectTag; - - -@end - -@interface XPMineUserInfoTagItemView : UIView -@property (nonatomic,strong) XPMineUserInfoTagModel *tagModel; -@property (nonatomic,strong) NSMutableArray *itemList; -/// -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagItemView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagItemView.m deleted file mode 100644 index 27b6bf4..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagItemView.m +++ /dev/null @@ -1,118 +0,0 @@ -// -// XPMineUserInfoTagItemView.m -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import "XPMineUserInfoTagItemView.h" -///view -#import "XPMineUserInfoTagViewCell.h" -#import "XPMineUserInfoTagModel.h" -#import "XPMineUserInfoTagFlowLayout.h" -@interface XPMineUserInfoTagItemView () -@property (nonatomic,strong) UICollectionView *collectionView; - - -@end -@implementation XPMineUserInfoTagItemView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.collectionView]; -} -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.equalTo(self); - make.bottom.mas_equalTo(0); - }]; -} --(void)setItemList:(NSMutableArray *)itemList{ - _itemList = itemList; - for (XPMineUserInfoTagItemModel *model in self.itemList) { - CGRect stringRect = [model.label boundingRectWithSize:CGSizeMake(MAXFLOAT, kGetScaleWidth(18)) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:kFontRegular(13)} context:nil]; - model.width = stringRect.size.width + kGetScaleWidth(32); - model.isNoChooseTag = YES; - } - - [self.collectionView reloadData]; - - - -} -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource - - - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - XPMineUserInfoTagItemModel *model = self.itemList[indexPath.row]; - return CGSizeMake(model.width, kGetScaleWidth(34)); -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - - return self.itemList.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - - XPMineUserInfoTagViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoTagViewCell class]) forIndexPath:indexPath]; - cell.mainTagModel = self.tagModel; - cell.tagModel = self.itemList[indexPath.row]; - - return cell; -} --(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - XPMineUserInfoTagItemModel *model = self.itemList[indexPath.row]; - NSMutableArray *meLabels = [NSMutableArray arrayWithArray:self.tagModel.meLabels]; - [meLabels removeObject:@""]; - if(model.picked == NO && meLabels.count >= 20){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMineUserInfoTagItemView0")]; - return; - } - model.picked = !model.picked; - if(model.picked == NO){ - [meLabels removeObject:model.label]; - }else{ - [meLabels addObject:model.label]; - } - self.tagModel.meLabels = meLabels; - [self.collectionView reloadData]; - if(self.delegate && [self.delegate respondsToSelector:@selector(didSelectTag)]){ - [self.delegate didSelectTag]; - } -} -#pragma mark -懒加载 -- (UICollectionView *)collectionView{ - if (!_collectionView) { - XPMineUserInfoTagFlowLayout *layout = [[XPMineUserInfoTagFlowLayout alloc] init]; - layout.delegate = self; - layout.sectionInset = UIEdgeInsetsMake(kGetScaleWidth(7), kGetScaleWidth(15), kGetScaleWidth(30), kGetScaleWidth(15)); - layout.minimumLineSpacing = kGetScaleWidth(15); - layout.minimumInteritemSpacing = kGetScaleWidth(15); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.pagingEnabled = NO; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPMineUserInfoTagViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMineUserInfoTagViewCell class])]; - - _collectionView.showsVerticalScrollIndicator = NO; - } - return _collectionView; -} -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagView.h deleted file mode 100644 index 76ee4dc..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPMineUserInfoTagView.h -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import -#import "XPMineUserInfoTagModel.h" -NS_ASSUME_NONNULL_BEGIN -@protocol XPMineUserInfoTagViewDelegate - --(void)didingSelectTag; - - -@end -@interface XPMineUserInfoTagView : UIView -/// -@property (nonatomic,strong) XPMineUserInfoTagModel *tagModel; -/// -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagView.m deleted file mode 100644 index 1f31d51..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagView.m +++ /dev/null @@ -1,135 +0,0 @@ -// -// XPMineUserInfoTagView.m -// xplan-ios -// -// Created by duoban on 2023/2/15. -// -///Third -#import -#import -#import -#import -#import "XPMineUserInfoTagView.h" -///view -#import "XPMineUserInfoTagItemView.h" -@interface XPMineUserInfoTagView() -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *pi_containerView; -///数据源 -/// -@property (nonatomic,strong) NSMutableArray *dataList; -@end -@implementation XPMineUserInfoTagView - - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.dataList = [NSMutableArray array]; - self.backgroundColor = [UIColor whiteColor]; - [self addSubview:self.titleView]; - [self addSubview:self.pi_containerView]; -} -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(40)); - }]; - - [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self); - make.top.mas_equalTo(self.titleView.mas_bottom); - }]; -} --(void)setTagModel:(XPMineUserInfoTagModel *)tagModel{ - _tagModel = tagModel; - _titles = _tagModel.groups; - [_dataList removeAllObjects]; - for (NSString *label in _titles) { - NSMutableArray *array = [NSMutableArray array]; - for (XPMineUserInfoTagItemModel *model in _tagModel.labels) { - if([model.group isEqualToString:label]){ - [array addObject:model]; - } - } - [_dataList addObject:array]; - } - _titleView.titles = _titles; - [_titleView reloadData]; -} -#pragma mark -XPMineUserInfoTagItemViewDelegate --(void)didSelectTag{ - if(self.delegate && [self.delegate respondsToSelector:@selector(didingSelectTag)]){ - [self.delegate didingSelectTag]; - } -} -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - XPMineUserInfoTagItemView *tagView = [[XPMineUserInfoTagItemView alloc]init]; - NSMutableArray *modelList = self.dataList[index]; - tagView.itemList = modelList; - tagView.tagModel = self.tagModel; - tagView.delegate = self; - return tagView; -} -#pragma mark -懒加载 -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = UIColorFromRGB(0xB3B3C3); - _titleView.titleSelectedColor = UIColorFromRGB(0x1F1B4F); - _titleView.titleFont = kFontMedium(15); - _titleView.titleSelectedFont = kFontMedium(15); - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.cellWidthIncrement = 5; - _titleView.listContainer = self.pi_containerView; - - JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(12), kGetScaleWidth(3)); - lineView.verticalMargin = kGetScaleWidth(5); - lineView.indicatorImageView.image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(12), kGetScaleWidth(3))]; - lineView.indicatorImageView.layer.masksToBounds = YES; - lineView.indicatorImageView.layer.cornerRadius = kGetScaleWidth(3)/2; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (JXCategoryListContainerView *)pi_containerView { - if (!_pi_containerView) { - _pi_containerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _pi_containerView.defaultSelectedIndex = 0; - _pi_containerView.scrollView.tag = 1009; - } - return _pi_containerView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[]; - } - return _titles; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagViewCell.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagViewCell.h deleted file mode 100644 index b56610a..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagViewCell.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// XPMineUserInfoTagViewCell.h -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import -#import "XPMineUserInfoTagModel.h" -NS_ASSUME_NONNULL_BEGIN - - - -@interface XPMineUserInfoTagViewCell : UICollectionViewCell -@property (nonatomic,strong) XPMineUserInfoTagItemModel *headModel; -/// -@property (nonatomic,strong) XPMineUserInfoTagItemModel *tagModel; - -@property (nonatomic,strong) XPMineUserInfoTagModel *mainTagModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagViewCell.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagViewCell.m deleted file mode 100644 index c8b2022..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagViewCell.m +++ /dev/null @@ -1,118 +0,0 @@ -// -// XPMineUserInfoTagViewCell.m -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import "XPMineUserInfoTagViewCell.h" -UIKIT_EXTERN NSString * kMineInfoDelTag; -@interface XPMineUserInfoTagViewCell() -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///内容 -@property (nonatomic,strong) UILabel *titleView; -///删除 -@property (nonatomic,strong) UIButton *delBtn; - -@end -@implementation XPMineUserInfoTagViewCell --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.contentView.backgroundColor = [UIColor whiteColor]; - self.contentView.layer.cornerRadius = kGetScaleWidth(17); - self.contentView.layer.masksToBounds = YES; - [self.contentView addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.titleView]; - [self.stackView addArrangedSubview:self.delBtn]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(delTagItem:) name:kMineInfoDelTag object:nil]; - -} - --(void)delTagItem:(NSNotification *)not{ - XPMineUserInfoTagItemModel *model = not.object; - NSString *label = model.label; - if(self.tagModel != nil && [self.tagModel.label isEqualToString:label] ){ - self.tagModel.picked = NO; - self.contentView.backgroundColor = UIColorFromRGB(0xF7F7F9); - self.titleView.textColor = [DJDKMIMOMColor inputTextColor]; - } -} -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(8)); - make.leading.mas_equalTo(kGetScaleWidth(16)); - make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.bottom.mas_equalTo(-kGetScaleWidth(8)); - }]; - [self.delBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(15)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - - make.height.mas_equalTo(kGetScaleWidth(18)); - - }]; -} --(void)setHeadModel:(XPMineUserInfoTagItemModel *)headModel{ - _headModel = headModel; - _titleView.text = _headModel.label; -} --(void)setTagModel:(XPMineUserInfoTagItemModel *)tagModel{ - _tagModel = tagModel; - _titleView.text = _tagModel.label; - _delBtn.hidden = _tagModel.isNoChooseTag; - if(_tagModel.picked == YES || [_mainTagModel.meLabels containsObject:_tagModel.label]){ - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xCCF8F9),UIColorFromRGB(0xDEE4FF),UIColorFromRGB(0xEEDCFF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(_tagModel.width, kGetScaleWidth(34))]; - self.contentView.backgroundColor = [UIColor colorWithPatternImage:image]; - _titleView.textColor = UIColorFromRGB(0x9168FA); - }else{ - self.contentView.backgroundColor = UIColorFromRGB(0xF7F7F9); - _titleView.textColor = [DJDKMIMOMColor inputTextColor]; - } -} --(void)delItemAction{ - [[NSNotificationCenter defaultCenter]postNotificationName:kMineInfoDelTag object:self.headModel]; -} -#pragma mark -懒加载 --(UIStackView *)stackView{ - if (!_stackView){ - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = kGetScaleWidth(2); - } - return _stackView; -} -- (UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel labelInitWithText:@"" font:kFontRegular(13) textColor:[DJDKMIMOMColor inputTextColor]]; - _titleView.textAlignment = NSTextAlignmentCenter; - - } - return _titleView; -} --(UIButton *)delBtn{ - if (!_delBtn){ - _delBtn = [UIButton new]; - [_delBtn setBackgroundImage:kImage(@"mine_info_tag_del") forState:UIControlStateNormal]; - [_delBtn setEnlargeEdgeWithTop:20 right:20 bottom:20 left:20]; - [_delBtn addTarget:self action:@selector(delItemAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _delBtn; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoVoiceCardView.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoVoiceCardView.h deleted file mode 100644 index 277245f..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoVoiceCardView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMMineUserInfoVoiceCardView.h -// YUMI -// -// Created by YUMI on 2022/4/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MineSkillCardListInfoModel; -@interface XPMineUserInfoVoiceCardView : UIView -///播放完成 -@property (nonatomic,assign, readonly) BOOL isPlaying; -@property (nonatomic,strong) MineSkillCardListInfoModel *voiceInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoVoiceCardView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoVoiceCardView.m deleted file mode 100644 index 5c7fdaf..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoVoiceCardView.m +++ /dev/null @@ -1,195 +0,0 @@ -// -// YMMineUserInfoVoiceCardView.m -// YUMI -// -// Created by YUMI on 2022/4/15. -// - -#import "XPMineUserInfoVoiceCardView.h" -///Third -#import -#import -///Tool -#import "UIImage+Utils.h" -#import "UIButton+EnlargeTouchArea.h" -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -///Model -#import "MineSkillCardListInfoModel.h" -#import "XPSkillCardPlayerManager.h" - -@interface XPMineUserInfoVoiceCardView () -///背景 -@property (nonatomic,strong) UIImageView *backImaegView; -///播放 -@property (nonatomic,strong) UIButton *playButton; -///音符 -@property (nonatomic,strong) UIImageView *noteImaegView; -///播放完成 -@property (nonatomic,assign) BOOL isPlaying; -@end - -@implementation XPMineUserInfoVoiceCardView - -- (void)dealloc { - self.isPlaying = NO; - [self.noteImaegView stopAnimating]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImaegView]; - [self.backImaegView addSubview:self.playButton]; - [self.backImaegView addSubview:self.noteImaegView]; -} - -- (void)initSubViewConstraints { - [self.backImaegView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.bottom.mas_equalTo(self); - make.trailing.mas_equalTo(self).offset(13); - }]; - - [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - make.leading.mas_equalTo(self.backImaegView).offset(6); - make.centerY.mas_equalTo(self.backImaegView); - }]; - - [self.noteImaegView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(60, 20)); - make.centerY.mas_equalTo(self.backImaegView); - make.leading.mas_equalTo(self.playButton.mas_trailing).offset(7); - }]; -} - -- (void)playButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - if (!self.isPlaying) { - if(self.voiceInfo.propVals.count) { -// NSString *fileName = [[self.voiceInfo.name componentsSeparatedByString:@"/"] lastObject]; - NSString * url = [self.voiceInfo.propVals xpSafeObjectAtIndex:0]; - NSArray * nameArray = [url componentsSeparatedByString:@"/"]; - NSString * fileName = @"daeplay"; - if (nameArray.count > 0) { - fileName = nameArray.lastObject; - } - - NSString *filePath = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"mineSkillCardVoice"]; - NSString *fullPath = [filePath stringByAppendingPathComponent:fileName]; -// NSLog(@"下载的路径：%@", fullPath); - if ([[NSFileManager defaultManager] fileExistsAtPath:fullPath]) { - self.isPlaying = YES; - sender.selected = YES; - [self.noteImaegView startAnimating]; - [[XPSkillCardPlayerManager shareInstance] playerVoiceWithPath:fullPath completionBlock:^{ - self.isPlaying = NO; - [self.noteImaegView stopAnimating]; - sender.selected = NO; - self.noteImaegView.image = [UIImage imageNamed:@"mine_voice_shengyin_32"]; - [[XPSkillCardPlayerManager shareInstance] stopMusic]; - }]; - } else { - if (![[NSFileManager defaultManager] fileExistsAtPath:fullPath]) { - NSFileManager *fileMgr = [[NSFileManager alloc] init]; - NSError * error; - [fileMgr createDirectoryAtPath:filePath withIntermediateDirectories:YES attributes:nil error:&error]; -// NSLog(@"%@", error.description); - } - [self downloadAudioWithFileName:fileName musicUrl:url completion:^(BOOL isSuccess, NSString *editAudioPath) { - self.isPlaying = YES; - sender.selected = YES; - [self.noteImaegView startAnimating]; - [[XPSkillCardPlayerManager shareInstance] playerVoiceWithPath:editAudioPath completionBlock:^{ - self.isPlaying = NO; - sender.selected = NO; - [self.noteImaegView stopAnimating]; - self.noteImaegView.image = [UIImage imageNamed:@"mine_voice_shengyin_32"]; - [[XPSkillCardPlayerManager shareInstance] stopMusic]; - }]; - }]; - } - } - } else { - self.isPlaying = NO; - sender.selected = NO; - [self.noteImaegView stopAnimating]; - self.noteImaegView.image = [UIImage imageNamed:@"mine_voice_shengyin_32"]; - [[XPSkillCardPlayerManager shareInstance] stopMusic]; - } -} - -- (void)downloadAudioWithFileName:(NSString *)fileName musicUrl:(NSString *)musicUrl completion:(void (^) (BOOL isSuccess, NSString *editAudioPath))completion { - AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; - NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:musicUrl]]; - NSURLSessionDownloadTask *download = [manager downloadTaskWithRequest:request progress:^(NSProgress * _Nonnull downloadProgress) { - } destination:^NSURL * _Nonnull(NSURL * _Nonnull targetPath, NSURLResponse * _Nonnull response) { - NSString *filePath = [[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"mineSkillCardVoice"] stringByAppendingPathComponent:fileName]; - return [NSURL fileURLWithPath:filePath]; - } completionHandler:^(NSURLResponse * _Nonnull response, NSURL * _Nullable filePath, NSError * _Nullable error) { - if (!error) { - completion(YES, filePath.path); - } else { - completion(NO, nil); - } - }]; - [download resume]; -} -#pragma mark - Getters And Setters -- (UIImageView *)backImaegView { - if (!_backImaegView) { - _backImaegView = [[UIImageView alloc] init]; - _backImaegView.userInteractionEnabled = YES; - _backImaegView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xF8F8F4), UIColorFromRGB(0xE7FBFD)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(77, 25)]; - _backImaegView.layer.masksToBounds = YES; - _backImaegView.layer.cornerRadius = 25/2; - } - return _backImaegView; -} - -- (UIButton *)playButton { - if (!_playButton) { - _playButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_playButton setImage:[UIImage imageNamed:@"mine_user_info_skill_card_voice_play"] forState:UIControlStateNormal]; - [_playButton setImage:[UIImage imageNamed:@"mine_user_info_skill_card_voice_pause"] forState:UIControlStateSelected]; - [_playButton addTarget:self action:@selector(playButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_playButton setEnlargeEdgeWithTop:8 right:10 bottom:8 left:10]; - } - return _playButton; -} - -- (UIImageView *)noteImaegView { - if (!_noteImaegView) { - _noteImaegView = [[UIImageView alloc] init]; - _noteImaegView.userInteractionEnabled = YES; - _noteImaegView.image = [UIImage imageNamed:@"mine_voice_shengyin_32"]; - NSMutableArray * array = [NSMutableArray array]; - for (int i = 0 ; i< 40; i++) { - UIImage * image; - if ( i < 10) { - image = [UIImage imageNamed:[NSString stringWithFormat:@"mine_voice_shengyin_0%d", i]]; - } else { - image = [UIImage imageNamed:[NSString stringWithFormat:@"mine_voice_shengyin_%d", i]]; - } - if (image) { - [array addObject:image]; - } - - } - _noteImaegView.animationImages = array; - _noteImaegView.animationDuration = 1.2; - _noteImaegView.animationRepeatCount = HUGE; - } - return _noteImaegView; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserViewHeader.h b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserViewHeader.h deleted file mode 100644 index 2770bad..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserViewHeader.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineUserViewHeader.h -// YuMi -// -// Created by P on 2024/6/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineUserViewHeader : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserViewHeader.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserViewHeader.m deleted file mode 100644 index 3d7de89..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserViewHeader.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPMineUserViewHeader.m -// YuMi -// -// Created by P on 2024/6/21. -// - -#import "XPMineUserViewHeader.h" - -@implementation XPMineUserViewHeader - -/* -// Only override drawRect: if you perform custom drawing. -// An empty implementation adversely affects performance during animation. -- (void)drawRect:(CGRect)rect { - // Drawing code -} -*/ - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechageHeadView.h b/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechageHeadView.h deleted file mode 100644 index abd3b7e..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechageHeadView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMineRechageHeadView.h -// YUMI -// -// Created by YUMI on 2021/9/24. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class WalletInfoModel; -@interface XPMineRechageHeadView : UIView -///钱包信息 -@property (nonatomic,strong) WalletInfoModel *walletInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechageHeadView.m b/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechageHeadView.m deleted file mode 100644 index 453db77..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechageHeadView.m +++ /dev/null @@ -1,138 +0,0 @@ -// -// YMMineRechageHeadView.m -// YUMI -// -// Created by YUMI on 2021/9/24. -// - -#import "XPMineRechageHeadView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -///Model -#import "WalletInfoModel.h" - -@interface XPMineRechageHeadView () -///大的背景 -@property (nonatomic,strong) UIImageView *backImageView; -///底部的背景 -@property (nonatomic,strong) UIImageView *bottomBackImg; -///显示钻石图标 -@property (nonatomic,strong) UIImageView *coinImageView; -///显示我的钻石 -@property (nonatomic,strong) UILabel *coinLabel; -///显示钻石数 -@property (nonatomic,strong) UILabel *amountLabel; - -@end - - -@implementation XPMineRechageHeadView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initView]; - [self initContrations]; - } - return self; -} - -#pragma mark - Private Method -- (void)initView { - [self addSubview:self.backImageView]; - [self.backImageView addSubview:self.bottomBackImg]; - [self.bottomBackImg addSubview:self.coinImageView]; - [self.bottomBackImg addSubview:self.coinLabel]; - [self.bottomBackImg addSubview:self.amountLabel]; -} - -- (void)initContrations { - self.frame = CGRectMake(0, 0, KScreenWidth, 190 + kSafeAreaTopHeight); - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.bottomBackImg mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.backImageView); - make.height.mas_equalTo(110); - }]; - - [self.coinImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(21, 21)); - make.top.mas_equalTo(self.bottomBackImg).offset(23); - make.trailing.mas_equalTo(self.coinLabel.mas_leading).offset(-4); - }]; - - [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.coinImageView); - make.centerX.mas_equalTo(self.bottomBackImg.mas_centerX).offset(12); - }]; - - [self.amountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.bottomBackImg); - make.top.mas_equalTo(self.coinImageView.mas_bottom).offset(1); - }]; -} - -#pragma mark - Getters And Setters -- (void)setWalletInfo:(WalletInfoModel *)walletInfo { - _walletInfo = walletInfo; - if (_walletInfo) { - self.amountLabel.text = walletInfo.diamonds; - } -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"mine_recharge_header_bg"]; - _backImageView.layer.masksToBounds = YES; - _backImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _backImageView; -} - -- (UIImageView *)bottomBackImg { - if (!_bottomBackImg) { - _bottomBackImg = [[UIImageView alloc] init]; - _bottomBackImg.userInteractionEnabled = YES; - _bottomBackImg.image = [UIImage imageNamed:@"mine_recharge_coin_bg"]; - _bottomBackImg.layer.masksToBounds = YES; - _bottomBackImg.contentMode = UIViewContentModeScaleAspectFit; - } - return _bottomBackImg; -} - -- (UIImageView *)coinImageView { - if (!_coinImageView) { - _coinImageView = [[UIImageView alloc] init]; - _coinImageView.userInteractionEnabled = YES; - _coinImageView.image = [UIImage imageNamed:@"moli_money_icon"]; - } - return _coinImageView; -} - -- (UILabel *)coinLabel { - if (!_coinLabel) { - _coinLabel = [[UILabel alloc] init]; - _coinLabel.text = YMLocalizedString(@"XPMineRechageHeadView0"); - _coinLabel.font = [UIFont systemFontOfSize:13]; - _coinLabel.textColor = [UIColor whiteColor]; - } - return _coinLabel; -} - -- (UILabel *)amountLabel { - if (!_amountLabel) { - _amountLabel = [[UILabel alloc] init]; - _amountLabel.font = [UIFont boldSystemFontOfSize:36]; - _amountLabel.textColor = [DJDKMIMOMColor appMainColor]; - _amountLabel.textAlignment = NSTextAlignmentCenter; - } - return _amountLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechargeNavView.h b/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechargeNavView.h deleted file mode 100644 index 383c9e7..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechargeNavView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMMineRechargeNavView.h -// YUMI -// -// Created by YUMI on 2021/9/26. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMineRechargeNavView; -@protocol XPMineRechargeNavViewDelegate -///点击了返回按钮 -- (void)xPMineRechargeNavView:(XPMineRechargeNavView *)view didClickBackButton:(UIButton *)sender; -@end -@interface XPMineRechargeNavView : UIView -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechargeNavView.m b/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechargeNavView.m deleted file mode 100644 index 69a95cc..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechargeNavView.m +++ /dev/null @@ -1,82 +0,0 @@ -// -// YMMineRechargeNavView.m -// YUMI -// -// Created by YUMI on 2021/9/26. -// - -#import "XPMineRechargeNavView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIButton+EnlargeTouchArea.h" - -@interface XPMineRechargeNavView () -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///显示文本 -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPMineRechargeNavView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Response -- (void)backButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineRechargeNavView:didClickBackButton:)]) { - [self.delegate xPMineRechargeNavView:self didClickBackButton:sender]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.backButton]; - [self addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; -} - -#pragma mark - Getters And Setters -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"home_search_white_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - _backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_backButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _backButton; -} - - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.text = YMLocalizedString(@"XPMineRechargeNavView0"); - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/SuperBlockViewController.h b/YuMi/Modules/YMMine/View/SubViews/SuperBlockViewController.h deleted file mode 100644 index bd7b941..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/SuperBlockViewController.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// SuperBlockViewController.h -// YuMi -// -// Created by P on 2024/12/3. -// - -#import "MvpViewController.h" -@class UserInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface SuperBlockViewController : MvpViewController - -@property(nonatomic, strong) UserInfoModel *targetUser; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/SuperBlockViewController.m b/YuMi/Modules/YMMine/View/SubViews/SuperBlockViewController.m deleted file mode 100644 index 325a6bd..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/SuperBlockViewController.m +++ /dev/null @@ -1,356 +0,0 @@ -// -// SuperBlockViewController.m -// YuMi -// -// Created by P on 2024/12/3. -// - -#import "SuperBlockViewController.h" -#import "XPMineUserInfoPresenter.h" -#import "UserInfoModel.h" - -@interface BlockHourCell : UICollectionViewCell - -@property(nonatomic, assign) NSInteger hours; -@property(nonatomic, strong) UIImageView *selectedStatusImageView; -@property(nonatomic, strong) UILabel *titleLabel; - -@end - -@implementation BlockHourCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - self.backgroundColor = [UIColor clearColor]; - self.contentView.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.selectedStatusImageView]; - [self.selectedStatusImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(0); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(18), kGetScaleWidth(18))); - }]; - - [self.contentView addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.selectedStatusImageView.mas_trailing).offset(6); - make.trailing.mas_equalTo(self.contentView); - }]; - } - return self; -} - -- (UIImageView *)selectedStatusImageView { - if (!_selectedStatusImageView) { - _selectedStatusImageView = [[UIImageView alloc] initWithImage:kImage(@"block_unselected")]; - } - return _selectedStatusImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" font:kFontRegular(14) textColor:UIColorFromRGB(0x313131)]; - } - return _titleLabel; -} - -- (void)setHours:(NSInteger)hours { - _hours = hours; - self.titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"1.0.30_text_28"), @(hours)]; -} - -- (void)setSelected:(BOOL)selected { - [super setSelected:selected]; - if (selected) { - self.selectedStatusImageView.image = kImage(@"block_selected"); - } else { - self.selectedStatusImageView.image = kImage(@"block_unselected"); - } -} - -@end - -@interface SuperBlockViewController () - -@property(nonatomic, copy) NSArray *blockTimes; -@property(nonatomic, strong) NetImageView *avatarImageView; -@property(nonatomic, strong) UILabel *nameLabel; -@property(nonatomic, strong) UILabel *IDLabel; -@property(nonatomic, strong) UICollectionView *blockedTimeCollectionView; -@property(nonatomic, strong) UITextView *reasonTextView; -@property(nonatomic, strong) UILabel *placeholderLabel; -@property(nonatomic, strong) UIButton *blockButton; -@property(nonatomic, assign) NSInteger selectedHours; -@end - -@implementation SuperBlockViewController - -- (XPMineUserInfoPresenter *)createPresenter { - return [[XPMineUserInfoPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.title = YMLocalizedString(@"1.0.30_text_26"); - self.view.backgroundColor = [UIColor whiteColor]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapSpace:)]; - tap.cancelsTouchesInView = NO; // 允许触摸事件继续传递 - tap.delegate = self; - [self.view addGestureRecognizer:tap]; - - @kWeakify(self); - [self.presenter requestBlockTimesSuccess:^(NSArray * _Nonnull array) { - @kStrongify(self); - self.blockTimes = array; - [self setupUI]; - [self updateUI]; - } failure:^(NSError * _Nonnull error) { - @kStrongify(self); - [self.navigationController popViewControllerAnimated:YES]; - }]; -} - -- (void)setupUI { - [self.view addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.top.mas_equalTo(20); - make.size.mas_equalTo(52); - }]; - - [self.view addSubview:self.nameLabel]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(8); - make.top.mas_equalTo(self.avatarImageView).offset(5); - make.height.mas_equalTo(22); - }]; - - [self.view addSubview:self.IDLabel]; - [self.IDLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(8); - make.top.mas_equalTo(self.nameLabel.mas_bottom).offset(2); - make.height.mas_equalTo(18); - }]; - - [self.view addSubview:[self line]]; - - UILabel *timeTitleLabel = [self titleLabel:YMLocalizedString(@"1.0.30_text_27") withRedStar:NO]; - [self.view addSubview:timeTitleLabel]; - [timeTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(41); - }]; - - [self.view addSubview:self.blockedTimeCollectionView]; - [self.blockedTimeCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(timeTitleLabel.mas_bottom).offset(12); - make.leading.mas_equalTo(self.view).offset(16); - make.trailing.mas_equalTo(self.view).offset(-70); - make.height.mas_equalTo(0); - }]; - - [self.view addSubview:[self line]]; - - UILabel *reasonTitleLabel = [self titleLabel:YMLocalizedString(@"1.0.30_text_29") withRedStar:YES]; - [self.view addSubview:reasonTitleLabel]; - [reasonTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView); - make.top.mas_equalTo(self.blockedTimeCollectionView.mas_bottom).offset(10); - }]; - - [self.view addSubview:self.reasonTextView]; - [self.reasonTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(reasonTitleLabel.mas_bottom).offset(10); - make.leading.trailing.mas_equalTo(self.view).inset(16); - make.height.mas_equalTo(140); - }]; - - [self.view addSubview:self.placeholderLabel]; - [self.placeholderLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.reasonTextView).offset(10); - make.leading.trailing.mas_equalTo(self.reasonTextView).inset(12); - }]; - - [self.view addSubview:self.blockButton]; - [self.blockButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.reasonTextView.mas_bottom).offset(20); - make.size.mas_equalTo(CGSizeMake(234, 44)); - }]; -} - -- (void)updateUI { - self.selectedHours = [[self.blockTimes xpSafeObjectAtIndex:0] integerValue]; - - self.avatarImageView.imageUrl = self.targetUser.avatar; - self.nameLabel.text = self.targetUser.nick; - self.IDLabel.text = [NSString stringWithFormat:@"ID: %@", @(self.targetUser.erbanNo)]; - [self.blockedTimeCollectionView reloadData]; - NSIndexPath *defaultIndexPath = [NSIndexPath indexPathForItem:0 inSection:0]; - [self.blockedTimeCollectionView selectItemAtIndexPath:defaultIndexPath - animated:NO - scrollPosition:UICollectionViewScrollPositionNone]; - - NSInteger lines = ceil(self.blockTimes.count/2.0); - [self.blockedTimeCollectionView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(lines * 40); - }]; - - [self.view layoutIfNeeded]; -} - -- (void)didTapSpace:(UITapGestureRecognizer *)gesture { - [self.view endEditing:YES]; // 收起键盘 -} - -- (void)didTapBlock { - if (self.reasonTextView.text.length == 0) { - - } else { - @kWeakify(self); - [self.presenter superBlock:self.targetUser.uid - hours:self.selectedHours - resaon:self.reasonTextView.text - success:^{ - @kStrongify(self); - [self.navigationController popViewControllerAnimated:YES]; - } failure:^(NSError * _Nonnull error) { - - }]; - } -} - -#pragma mark - -- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch { - // 如果触摸点在 UITextView 或 UICollectionView 内，则不触发手势 - if ([touch.view isKindOfClass:[UICollectionView class]] || [touch.view isKindOfClass:[UITextView class]]) { - return NO; - } - return YES; // 触发手势 -} - -#pragma mark - UITextViewDelegate -- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text { - NSString *newText = [textView.text stringByReplacingCharactersInRange:range withString:text]; - self.placeholderLabel.hidden = newText.length != 0; - self.blockButton.alpha = newText.length == 0 ? 0.5 : 1; - return YES; -} - -#pragma mark - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.blockTimes.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - BlockHourCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"BlockHourCell" forIndexPath:indexPath]; - NSNumber *hour = [self.blockTimes xpSafeObjectAtIndex:indexPath.row]; - cell.hours = hour.integerValue; - return cell; -} - -#pragma mark - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - _avatarImageView = [[NetImageView alloc] init]; - [_avatarImageView setCornerRadius:52/2]; - } - return _avatarImageView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [UILabel labelInitWithText:@"" font:kFontMedium(16) textColor:UIColorFromRGB(0x313131)]; - } - return _nameLabel; -} - -- (UILabel *)IDLabel { - if (!_IDLabel) { - _IDLabel = [UILabel labelInitWithText:@"" font:kFontRegular(13) textColor:UIColorFromRGB(0x7b7b7d)]; - } - return _IDLabel; -} - -- (UIView *)line { - UIView *v = [[UIView alloc] initWithFrame:CGRectMake(16, 102, KScreenWidth-32, 1)]; - v.backgroundColor = UIColorFromRGB(0xe4e4e4); - return v; -} - -- (UILabel *)titleLabel:(NSString *)title withRedStar:(BOOL)isRed { - UILabel *label = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:UIColorFromRGB(0x313131)]; - NSMutableAttributedString *s_title = [[NSMutableAttributedString alloc] initWithString:title - attributes:@{ - NSFontAttributeName: kFontMedium(15), - NSForegroundColorAttributeName: UIColorFromRGB(0x313131) - }]; - - if (isRed) { - NSAttributedString *star = [[NSAttributedString alloc] initWithString:@"*" attributes:@{ - NSFontAttributeName: kFontMedium(15), - NSForegroundColorAttributeName: UIColorFromRGB(0xff3332) - }]; - [s_title insertAttributedString:star atIndex:s_title.length]; - } - - label.attributedText = s_title; - - return label; -} - -- (UICollectionView *)blockedTimeCollectionView { - if (!_blockedTimeCollectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake((KScreenWidth - 32)/3, kGetScaleWidth(20)); - layout.minimumLineSpacing = 14; - layout.minimumInteritemSpacing = 20; - _blockedTimeCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _blockedTimeCollectionView.scrollEnabled = NO; - _blockedTimeCollectionView.allowsMultipleSelection = NO; - _blockedTimeCollectionView.delegate = self; - _blockedTimeCollectionView.dataSource = self; - _blockedTimeCollectionView.backgroundColor = [UIColor whiteColor]; - [_blockedTimeCollectionView registerClass:[BlockHourCell class] forCellWithReuseIdentifier:@"BlockHourCell"]; - } - return _blockedTimeCollectionView; -} - -- (UITextView *)reasonTextView { - if (!_reasonTextView) { - _reasonTextView = [[UITextView alloc] init]; - _reasonTextView.delegate = self; - [_reasonTextView setCornerRadius:10]; - _reasonTextView.backgroundColor = UIColorFromRGB(0xf6f6f6); - _reasonTextView.textColor = [UIColor darkGrayColor]; - } - return _reasonTextView; -} - -- (UIButton *)blockButton { - if (!_blockButton) { - _blockButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_blockButton addGradientBackgroundWithColors:@[UIColorFromRGB(0xE29030), UIColorFromRGB(0xfcc074)] - startPoint:CGPointMake(0, 0.5) - endPoint:CGPointMake(1, 0.5) - cornerRadius:22]; - [_blockButton setTitle:YMLocalizedString(@"1.0.30_text_31") forState:UIControlStateNormal]; - [_blockButton addTarget:self action:@selector(didTapBlock) forControlEvents:UIControlEventTouchUpInside]; - _blockButton.alpha = 0.5; - } - return _blockButton; -} - -- (UILabel *)placeholderLabel { - if (!_placeholderLabel) { - _placeholderLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.30_text_30") - font:kFontRegular(14) - textColor:UIColorFromRGB(0x7b7b7d)]; - _placeholderLabel.numberOfLines = 0; - } - return _placeholderLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/XPFootPrintNavView.h b/YuMi/Modules/YMMine/View/SubViews/XPFootPrintNavView.h deleted file mode 100644 index df87299..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPFootPrintNavView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMFootPrintNavView.h -// YUMI -// -// Created by YUMI on 2022/7/26. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class XPFootPrintNavView; -@protocol XPFootPrintNavViewDelegate - -///点击了返回按钮 -- (void)xPFootPrintNavView:(XPFootPrintNavView *)view didClickBackButton:(UIButton *)sender; -///点击了清除按钮 -- (void)xPFootPrintNavView:(XPFootPrintNavView *)view didClickClearButton:(UIButton *)sender; - -@end - -@interface XPFootPrintNavView : UIView - -///代理 -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/XPFootPrintNavView.m b/YuMi/Modules/YMMine/View/SubViews/XPFootPrintNavView.m deleted file mode 100644 index ceccfd6..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPFootPrintNavView.m +++ /dev/null @@ -1,109 +0,0 @@ -// -// YMFootPrintNavView.m -// YUMI -// -// Created by YUMI on 2022/7/26. -// - -#import "XPFootPrintNavView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIButton+EnlargeTouchArea.h" - -@interface XPFootPrintNavView () - -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///显示文本 -@property (nonatomic,strong) UILabel *titleLabel; -///设置按钮 -@property (nonatomic, strong) UIButton *settingButton; - -@end - - -@implementation XPFootPrintNavView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Response -- (void)backButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPFootPrintNavView:didClickBackButton:)]) { - [self.delegate xPFootPrintNavView:self didClickBackButton:sender]; - } -} - -- (void)clearButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPFootPrintNavView:didClickClearButton:)]) { - [self.delegate xPFootPrintNavView:self didClickClearButton:sender]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.backButton]; - [self addSubview:self.titleLabel]; - [self addSubview:self.settingButton]; -} - -- (void)initSubViewConstraints { - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; - [self.settingButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-15); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.centerY.equalTo(self.mas_bottom).mas_offset(-22); - }]; -} - -#pragma mark - Getters And Setters -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - _backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_backButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _backButton; -} - -- (UIButton *)settingButton { - if (!_settingButton) { - _settingButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_settingButton setTitle:YMLocalizedString(@"XPFootPrintNavView0") forState:UIControlStateNormal]; - _settingButton.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - [_settingButton setTitleColor:[DJDKMIMOMColor textThirdColor] forState:UIControlStateNormal]; - [_settingButton addTarget:self action:@selector(clearButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_settingButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _settingButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - _titleLabel.text = YMLocalizedString(@"XPFootPrintNavView1"); - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.h b/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.h deleted file mode 100644 index 35d2aff..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMMineAccountView.h -// YUMI -// -// Created by YUMI on 2022/7/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineAccountView : UIView - -@property (nonatomic, copy) NSString *diamonds; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m deleted file mode 100644 index 3dcb90c..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m +++ /dev/null @@ -1,76 +0,0 @@ -// -// YMMineAccountView.m -// YUMI -// -// Created by YUMI on 2022/7/22. -// - -#import "XPMineAccountView.h" -#import -#import "DJDKMIMOMColor.h" - -@interface XPMineAccountView () - -@property (nonatomic, strong) UIImageView *bgImageView; -@property (nonatomic, strong) UILabel *coinLabel; - -@end - -@implementation XPMineAccountView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self addSubview:self.coinLabel]; -} - -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - - [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-11); - make.leading.mas_equalTo(4); - make.trailing.mas_equalTo(-4); - make.height.mas_equalTo(18); - }]; -} - -- (void)setDiamonds:(NSString *)diamonds { - -} - -#pragma mark - Getters And Setters -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"me_bg_wallet"]]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _bgImageView; -} - -- (UILabel *)coinLabel { - if (!_coinLabel) { - _coinLabel = [[UILabel alloc] init]; - _coinLabel.text = YMLocalizedString(@"XPIncomeRecordVC1"); - _coinLabel.textAlignment = NSTextAlignmentCenter; - _coinLabel.font = kFontSemibold(14); - _coinLabel.textColor = UIColorFromRGB(0x4f3500); - _coinLabel.numberOfLines = 0; - _coinLabel.adjustsFontSizeToFitWidth = YES; - } - return _coinLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineDataSkillDataCollectionViewCell.h b/YuMi/Modules/YMMine/View/SubViews/XPMineDataSkillDataCollectionViewCell.h deleted file mode 100644 index aef7a67..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineDataSkillDataCollectionViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPMineDataSkillDataCollectionViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MineSkillCardListInfoModel; -@interface XPMineDataSkillDataCollectionViewCell : UICollectionViewCell -@property (nonatomic,strong) MineSkillCardListInfoModel *skillInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineDataSkillDataCollectionViewCell.m b/YuMi/Modules/YMMine/View/SubViews/XPMineDataSkillDataCollectionViewCell.m deleted file mode 100644 index 4b2be3b..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineDataSkillDataCollectionViewCell.m +++ /dev/null @@ -1,145 +0,0 @@ -// -// XPMineDataSkillDataCollectionViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2022/4/14. -// - -#import "XPMineDataSkillDataCollectionViewCell.h" -///Third -#import -///Tool -#import "NetImageView.h" -///Model -#import "MineSkillCardListInfoModel.h" - -@interface XPMineDataSkillDataCollectionViewCell () - -///背景 -@property (nonatomic,strong) UIView * backView; -///显示图片 -@property (nonatomic,strong) NetImageView *logoImageView; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///技能卡 -@property (nonatomic,strong) UILabel *skillLabel; - -@end - -@implementation XPMineDataSkillDataCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.backView]; - [self.backView addSubview:self.logoImageView]; - [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.skillLabel]; -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(self.backView).inset(8); - make.leading.mas_equalTo(self.backView).offset(4); - make.height.mas_equalTo(self.logoImageView.mas_width); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.logoImageView.mas_centerY).offset(-2); - make.leading.mas_equalTo(self.logoImageView.mas_trailing).offset(4); - make.trailing.mas_lessThanOrEqualTo(self.backView); - }]; - - [self.skillLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.titleLabel); - make.top.mas_equalTo(self.logoImageView.mas_centerY).offset(2); - }]; -} -- (UIColor *)getSkillCardBackColor:(NSString *)cardId { - UIColor * color = UIColorFromRGB(0xFEF5E8); - if ([cardId isEqualToString:@"1"]) { - color = UIColorFromRGB(0xEEF2FF); - } else if([cardId isEqualToString:@"2"]) { - color = UIColorFromRGB(0xFEF5E8); - }else if([cardId isEqualToString:@"3"]) { - color = UIColorFromRGB(0xF2FFE0); - }else if([cardId isEqualToString:@"4"]) { - color = UIColorFromRGB(0xE9FFF4); - }else if([cardId isEqualToString:@"5"]) { - color = UIColorFromRGB(0xFFE7EF); - }else if([cardId isEqualToString:@"6"]) { - color = UIColorFromRGB(0xF9ECFF); - }else if([cardId isEqualToString:@"7"]) { - color = UIColorFromRGB(0xFFE4FB); - }else if([cardId isEqualToString:@"9"]) { - color = UIColorFromRGB(0xF7EFDB); - } - return color; -} - -#pragma mark - Getters And Setters -- (void)setSkillInfo:(MineSkillCardListInfoModel *)skillInfo { - _skillInfo = skillInfo; - if (_skillInfo) { - self.logoImageView.imageUrl = _skillInfo.icon; - NSString * title = [_skillInfo.propVals componentsJoinedByString:@"/"]; - self.skillLabel.text = title; - self.titleLabel.text = _skillInfo.name; - self.backView.backgroundColor = [self getSkillCardBackColor:skillInfo.cardId]; - } -} - -- (NetImageView *)logoImageView { - if (!_logoImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _logoImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _logoImageView; -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = UIColorFromRGB(0xFEF5E8); - _backView.layer.masksToBounds = YES; - _backView.layer.cornerRadius = 8; - } - return _backView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UILabel *)skillLabel { - if (!_skillLabel) { - _skillLabel = [[UILabel alloc] init]; - _skillLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _skillLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _skillLabel; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.h b/YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.h deleted file mode 100644 index daabdfb..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMMineFriendNumberView.h -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineFriendNumberView : UIView - -///显示数量 -@property (nonatomic,copy) NSString *number; -///显示标题 -@property (nonatomic,copy) NSString *title; -///是否为访客记录 -@property (nonatomic, assign) BOOL isVisitor; -///访客角标 -@property (nonatomic, assign) NSInteger visitorNum; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.m deleted file mode 100644 index 3206384..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.m +++ /dev/null @@ -1,139 +0,0 @@ -// -// YMMineFriendNumberView.m -// YUMI -// -// Created by YUMI on 2021/12/21. -// - -#import "XPMineFriendNumberView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - - -@interface XPMineFriendNumberView () -///显示个数 -@property (nonatomic,strong) UILabel *numberLabel; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -//访客记录未读数量 -@property (nonatomic, strong) UILabel *unReadLabel; - -@end - -@implementation XPMineFriendNumberView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.numberLabel]; - [self addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.titleLabel.mas_bottom); - }]; - - [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self); - make.centerX.mas_equalTo(self); -// make.height.mas_equalTo(24); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.numberLabel.mas_bottom).offset(4); - make.leading.trailing.mas_equalTo(self); - }]; -} - -- (NSAttributedString *)attributedStringWithLineSpace:(CGFloat)lineSpace str:(NSString *)str{ - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; - NSMutableAttributedString *title = [[NSMutableAttributedString alloc] initWithString:str attributes:@{NSForegroundColorAttributeName : UIColorFromRGB(0xffffff), NSFontAttributeName: kFontMedium(20)}]; - [attributedString appendAttributedString:title]; - attributedString.yy_alignment = NSTextAlignmentCenter; - return attributedString; -} - -- (CGFloat)getWidthWithContent:(NSString *)content height:(CGFloat)height font:(CGFloat)font{ - - CGRect rect = [content boundingRectWithSize:CGSizeMake(999, height) - options:NSStringDrawingUsesLineFragmentOrigin - attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:font]} - context:nil]; - return rect.size.width; -} - -#pragma mark - Getters And Setters -- (void)setTitle:(NSString *)title { - self.titleLabel.text = title; -} - -- (void)setNumber:(NSString *)number { - self.numberLabel.text = number; -} - -- (void)setIsVisitor:(BOOL)isVisitor { - if (isVisitor) { - [self addSubview:self.unReadLabel]; - [self.unReadLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self).mas_offset(-12); - make.height.mas_equalTo(15); - make.top.mas_equalTo(self.numberLabel).offset(-10); - }]; - } -} - -- (void)setVisitorNum:(NSInteger)visitorNum { - if (visitorNum > 0) { - [self setIsVisitor:YES]; - self.unReadLabel.hidden = NO; - self.unReadLabel.text = [NSString stringWithFormat:@"+%@", @(visitorNum)]; - } else { - self.unReadLabel.hidden = YES; - } -} - -- (UILabel *)numberLabel { - if (!_numberLabel) { - _numberLabel = [[UILabel alloc] init]; - _numberLabel.font = kFontMedium(18); - _numberLabel.textAlignment = NSTextAlignmentCenter; - _numberLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _numberLabel; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = kFontMedium(14); - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (UILabel *)unReadLabel { - if (!_unReadLabel) { - _unReadLabel = [[UILabel alloc] init]; - _unReadLabel.font = kFontSemibold(12); - _unReadLabel.textColor = UIColorFromRGB(0xff6868); - _unReadLabel.backgroundColor = [UIColor clearColor]; - _unReadLabel.textAlignment = NSTextAlignmentCenter; - [_unReadLabel sizeToFit]; - _unReadLabel.hidden = YES; - } - return _unReadLabel ; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h deleted file mode 100644 index 04ab30a..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h +++ /dev/null @@ -1,50 +0,0 @@ -// -// YMMineHeadView.h -// YUMI -// -// Created by YUMI on 2021/9/16. -// - -#import -#import "NobleInfo.h" -@class ClanDetailMainInfoModel; -NS_ASSUME_NONNULL_BEGIN -typedef void(^CompletionHandler)(NSMutableAttributedString *); -@class UserInfoModel,XPMineHeadView, WalletInfoModel,NobleCenterModel; -@protocol XPMineHeadViewDelegate -///点击了头像 -- (void)xPMineHeadView:(XPMineHeadView *)view didClickAvatar:(UserInfoModel *)info; -///点击了关注 -- (void)xpMineHeadViewClickAttention; -///点击了粉丝 -- (void)xpMineHeadViewClickFans; -///点击了账户中心 -- (void)xpMineHeadViewClickAccount; -///点击了VIP中心 -- (void)xPMineHeadViewClickNobleCenter; -///点击了工会 -- (void)xPMineHeadViewClickAgency; - -- (void)xPMineHeadViewClickVisitors; -- (void)xPMineHeadViewClickFriends; -@end -@interface XPMineHeadView : UIView -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -@property (nonatomic, strong) WalletInfoModel *walletInfo; -@property (nonatomic, strong) NobleCenterModel *nobleInfo; -@property (nonatomic, strong) ClanDetailMainInfoModel *clanModel; -@property(nonatomic,strong) NobleInfo *vipInfo; -///代理 -@property (nonatomic,assign) id delegate; -///访客未读数量 -@property (nonatomic, assign) NSInteger visitorUnReadCount; - -///当装扮铭牌时，我的页面中不需要显示铭牌标识 -- (void)createNamePlateLevelAttribute:(UserInfoModel *)userInfo;// complete:(CompletionHandler)complete; -///id -- (NSMutableAttributedString *)createNamePlateIdLabelAttribute:(UserInfoModel *)userInfo ; -- (void)updateFriendsCount:(NSNumber *)fCount browseCount:(NSNumber *)bCount browseCountTip:(NSNumber *)tCount; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m deleted file mode 100644 index 7079b35..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m +++ /dev/null @@ -1,722 +0,0 @@ -// -// XPMineHeadView.m -// YuMi -// -// Created by YuMi on 2021/9/16. -// - -#import "XPMineHeadView.h" -///Third -#import - -///Tool -#import "UIImage+Utils.h" -#import "DJDKMIMOMColor.h" -///View -#import "NetImageView.h" -#import "XPNobleCenterEntranceView.h" -#import "UIImage+Utils.h" -#import "XPMineFriendNumberView.h" -#import "XPMineAccountView.h" -#import "XPMineCenterAgencyView.h" -///Model -#import "UserInfoModel.h" -#import "WalletInfoModel.h" -#import "ClanDetailInfoModel.h" - -@interface XPMineHeadView () -///头像 -@property (nonatomic,strong) NetImageView * avatarImageView; -///name的容器 -@property (nonatomic,strong) UIStackView *nameStackView; - -///名字 -@property (nonatomic,strong) UILabel *nameLabel; -///id 的容器 -@property (nonatomic,strong) UIStackView *idStackView; -///id -@property (nonatomic,strong) UILabel *idLabel; -///性别 -@property (nonatomic,strong) UIButton *sexImageView; - -///显示等级 -@property (nonatomic,strong) YYLabel *levelLabel; - -@property (nonatomic,strong) NetImageView *experImageView; -@property (nonatomic,strong) NetImageView *charmImageView; - -///关注、粉丝的容器 -@property (nonatomic,strong) UIStackView *attentionStackView; -///关注 -@property (nonatomic,strong) XPMineFriendNumberView *followingView; -///粉丝 -@property (nonatomic,strong) XPMineFriendNumberView *fansView; - -@property (nonatomic,strong) XPMineFriendNumberView *friendsView; - -@property (nonatomic,strong) XPMineFriendNumberView *visitorView; -///账户中心 -@property (nonatomic, strong) XPMineAccountView *accountView; -///VIP中心 -@property (nonatomic, strong) XPNobleCenterEntranceView *nobleEntranceView; - -@property (nonatomic, strong) XPMineCenterAgencyView *agencyView; - -@property (nonatomic, strong) UIStackView *stackView; - -//审核View -@property (nonatomic,strong) UIImageView *reviewView; -@end - -@implementation XPMineHeadView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.avatarImageView]; - - [self addSubview:self.nameStackView]; - [self addSubview:self.idStackView]; - [self.nameStackView addArrangedSubview:self.nameLabel]; - [self.nameStackView addArrangedSubview:self.sexImageView]; - [self.idStackView addArrangedSubview:self.idLabel]; - [self addSubview:self.levelLabel]; - - [self addSubview:self.attentionStackView]; - [self.attentionStackView addArrangedSubview:self.followingView]; - [self.attentionStackView addArrangedSubview:self.fansView]; - [self.attentionStackView addArrangedSubview:self.friendsView]; - [self.attentionStackView addArrangedSubview:self.visitorView]; - - UIView *line_1 = [self createLine]; - UIView *line_2 = [self createLine]; - UIView *line_3 = [self createLine]; - [self.attentionStackView addSubview:line_1]; - [self.attentionStackView addSubview:line_2]; - [self.attentionStackView addSubview:line_3]; - [line_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.attentionStackView); - make.centerX.mas_equalTo(self.attentionStackView).multipliedBy(0.5); - make.width.mas_equalTo(1); - make.height.mas_equalTo(20); - }]; - [line_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.attentionStackView); - make.width.mas_equalTo(1); - make.height.mas_equalTo(20); - }]; - [line_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.attentionStackView); - make.centerX.mas_equalTo(self.attentionStackView).multipliedBy(1.5); - make.width.mas_equalTo(1); - make.height.mas_equalTo(20); - }]; - - _stackView = [[UIStackView alloc] init]; - _stackView.distribution = UIStackViewDistributionFillEqually; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 8; - [self addSubview:_stackView]; - [_stackView addArrangedSubview:self.accountView]; - [_stackView addArrangedSubview:self.nobleEntranceView]; - [_stackView addArrangedSubview:self.agencyView]; - - [self addSubview:self.experImageView]; - [self addSubview:self.charmImageView]; - - [self.avatarImageView addSubview:self.reviewView]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAvatarImageView)]; - [self.avatarImageView addGestureRecognizer:tap]; -} - -- (UIView *)createLine { - UIView *line = [[UIView alloc] init]; - line.backgroundColor = UIColorFromRGB(0x989898); - line.alpha = 0.3; - return line; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(70, 70)); - make.leading.mas_equalTo(self).offset(15); - make.top.mas_equalTo(self).offset(49 + kStatusBarHeight); - }]; - - [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); - make.top.mas_equalTo(self.avatarImageView);//.mas_offset(4); - make.height.mas_equalTo(20); - }]; - - [self.idStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameStackView); - make.top.mas_equalTo(self.nameStackView.mas_bottom).offset(8); - make.height.mas_equalTo(18); - }]; - - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(28*1.3); - make.height.mas_equalTo(14*1.3); - }]; - [self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameStackView); - make.top.mas_equalTo(self.idStackView.mas_bottom).offset(5); - }]; - - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameStackView); - make.top.mas_equalTo(self.idStackView.mas_bottom).offset(5); - make.width.mas_equalTo(0); - make.height.mas_equalTo(20); - }]; - - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.experImageView.mas_trailing).offset(8); - make.top.mas_equalTo(self.idStackView.mas_bottom).offset(5); - make.width.mas_equalTo(0); - make.height.mas_equalTo(20); - }]; - - [self.attentionStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).mas_offset(16); - make.height.mas_equalTo(60); - make.centerX.mas_equalTo(self); - make.width.mas_equalTo(KScreenWidth); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.attentionStackView.mas_bottom).mas_offset(18); - make.leading.mas_equalTo(14); - make.trailing.mas_equalTo(-14); - make.height.mas_equalTo(80); - }]; - - [self.reviewView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.avatarImageView); - make.height.mas_equalTo(20); - }]; -} - -#pragma mark - Action -- (void)tapAvatarImageView { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadView:didClickAvatar:)]) { - [self.delegate xPMineHeadView:self didClickAvatar:self.userInfo]; - } -} - -///粉丝 -- (void)tapFansRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(xpMineHeadViewClickFans)]) { - [self.delegate xpMineHeadViewClickFans]; - } -} -///关注 -- (void)tapFollowingRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(xpMineHeadViewClickAttention)]) { - [self.delegate xpMineHeadViewClickAttention]; - } -} -///账号中心 -- (void)tapAccountRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(xpMineHeadViewClickAccount)]) { - [self.delegate xpMineHeadViewClickAccount]; - } -} -///VIP中心 -- (void)tapNobleCenterRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadViewClickNobleCenter)]) { - [self.delegate xPMineHeadViewClickNobleCenter]; - } -} - -- (void)didTapAgency { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadViewClickAgency)]) { - [self.delegate xPMineHeadViewClickAgency]; - } -} - -- (void)didTapFriends { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadViewClickFriends)]) { - [self.delegate xPMineHeadViewClickFriends]; - } -} - -- (void)didTapVisitor { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadViewClickVisitors)]) { - [self.delegate xPMineHeadViewClickVisitors]; - } -} - -#pragma mark - NSMutableAttributedString --(NSInteger) getMonth:(long )time -{ - NSDate *date = [NSDate dateWithTimeIntervalSince1970:time/1000]; - NSCalendar* calendar = [NSCalendar currentCalendar]; - NSDateComponents* components = [calendar components:NSCalendarUnitMonth fromDate:date]; - NSInteger month = components.month; - return month; -} - -- (NSInteger) getDay:(long) time -{ - NSDate *date = [NSDate dateWithTimeIntervalSince1970:time/1000]; - NSCalendar* calendar = [NSCalendar currentCalendar]; - NSDateComponents* components = [calendar components:NSCalendarUnitDay fromDate:date]; - NSInteger day = components.day; - return day; -} - -/// 生成一个图片的富文本 -/// @param imageUrl 网络图片的地址 -- (NSMutableAttributedString *)createUrlImageAttribute:(NSString *)imageUrl { - NetImageConfig *config = [[NetImageConfig alloc]init]; - ///先这样吧 - config.autoLoad = YES; - NetImageView *imageView = [[NetImageView alloc] initWithUrl:imageUrl config:config]; - UIImage* image = imageView.image; - if (image) { - CGFloat height = image.size.height > 0 ? image.size.height : 1; - CGFloat scale = image.size.width / height ; - imageView.bounds = CGRectMake(0, 0, 20 * scale, 20); - } else { - NSURL *imgUrl = [NSURL URLWithString:imageUrl]; - UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]]; - CGFloat height = myImage.size.height > 0 ? myImage.size.height : 1; - CGFloat scale = myImage.size.width / height; - imageView.bounds = CGRectMake(0, 0, 20 * scale, 20); - } - imageView.layer.masksToBounds = YES; - imageView.contentMode = UIViewContentModeScaleAspectFit; - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageView.bounds.size.width, imageView.bounds.size.height) alignToFont:[UIFont systemFontOfSize:15.0] alignment:YYTextVerticalAlignmentCenter]; - return attrString; -} - -/// 占位的富文本 -/// @param width 需要的间隙 -- (NSMutableAttributedString *)createSpaceAttribute:(CGFloat)width { - UIView *spaceView = [[UIView alloc]init]; - spaceView.backgroundColor = [UIColor clearColor]; - spaceView.bounds = CGRectMake(0, 0, width, 10); - NSMutableAttributedString * attribute = [NSMutableAttributedString yy_attachmentStringWithContent:spaceView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(spaceView.frame.size.width, spaceView.frame.size.height) alignToFont:[UIFont systemFontOfSize:15.0] alignment:YYTextVerticalAlignmentCenter]; - return attribute; -} - -///铭牌 -- (NSMutableAttributedString *)createNameplateAttibuteWithImage:(NSString *)imageName{ - NetImageConfig *config = [[NetImageConfig alloc]init]; - ///先这样吧 - config.autoLoad = YES; - NetImageView *imageView = [[NetImageView alloc]initWithUrl:imageName config:config]; - UIImage* image = imageView.image; - if (image) { - CGFloat scale = image.size.width / (image.size.height > 0 ? image.size.height : 1); - imageView.bounds = CGRectMake(0, 0, 20 * scale, 20); - } else { - NSURL *imgUrl = [NSURL URLWithString:imageName]; - UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]]; - CGFloat scale = myImage.size.width / (myImage.size.height > 0 ? myImage.size.height : 1); - if (scale == 0) { - imageView.bounds = CGRectMake(0, 0, 60, 20); - }else { - imageView.bounds = CGRectMake(0, 0, 20 * scale, 20); - } - } - imageView.contentMode = UIViewContentModeScaleAspectFit; - NSMutableAttributedString *string = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:imageView.bounds.size alignToFont:[UIFont boldSystemFontOfSize:12] alignment:YYTextVerticalAlignmentCenter]; - return string; -} -- (NSMutableAttributedString *)createNameplateAttibute:(NSString *)tagName image:(NSString *)imageName textFont:(UIFont *)textFont { - NetImageConfig *config = [[NetImageConfig alloc]init]; - ///先这样吧 - config.autoLoad = YES; - NetImageView *imageView = [[NetImageView alloc]initWithUrl:imageName config:config]; - UIImage* image = imageView.image; - if (image) { - CGFloat scale = image.size.width / (image.size.height > 0 ? image.size.height : 1); - imageView.bounds = CGRectMake(0, 0, 20 * scale, 20); - } else { - NSURL *imgUrl = [NSURL URLWithString:imageName]; - UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]]; - CGFloat scale = myImage.size.width / (myImage.size.height > 0 ? myImage.size.height : 1); - if (scale == 0) { - imageView.bounds = CGRectMake(0, 0, 60, 20); - }else { - imageView.bounds = CGRectMake(0, 0, 20 * scale, 20); - } - } - imageView.contentMode = UIViewContentModeScaleAspectFit; - // 铭牌文字 - UILabel *label = [[UILabel alloc] init]; - label.textAlignment = NSTextAlignmentCenter; - label.font = [UIFont boldSystemFontOfSize:12]; - label.adjustsFontSizeToFitWidth = YES; - label.textColor = UIColor.whiteColor; - label.text = tagName; - [imageView addSubview:label]; - [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(27); - make.trailing.mas_equalTo(-8); - make.centerY.mas_equalTo(0); - }]; - NSMutableAttributedString *string = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:imageView.bounds.size alignToFont:[UIFont boldSystemFontOfSize:12] alignment:YYTextVerticalAlignmentCenter]; - return string; -} -//复制id --(void)copyNameAction{ - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPMineHeadView8")]; - UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; - pasteboard. string = [NSString stringWithFormat:@"%ld", (long)_userInfo.erbanNo]; - -} -- (NSMutableAttributedString *)createNamePlateIdLabelAttribute:(UserInfoModel *)userInfo{ - - UIFont *font = [UIFont systemFontOfSize:14]; - NSString *text = [NSString stringWithFormat:@"ID:%ld", (long)userInfo.erbanNo]; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@ ",text] attributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x6D6B89)}]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"user_card_copy_id1"];; - attachment.bounds = CGRectMake(0, roundf(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; - return textAtt; -} - -- (void)updateFriendsCount:(NSNumber *)fCount browseCount:(NSNumber *)bCount browseCountTip:(NSNumber *)tCount { - self.friendsView.number = fCount.stringValue; - self.visitorView.number = bCount.stringValue; - self.visitorView.visitorNum = tCount.integerValue; -} - -///当装扮铭牌时，我的页面中不需要显示铭牌标识 -- (void)createNamePlateLevelAttribute:(UserInfoModel *)userInfo {// complete:(nonnull CompletionHandler)complete{ - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; - if (!userInfo) { -// if(complete){ -// complete(attributedString); -// } - return; - } - - if(userInfo.isCertified == YES){ - //主播认证 - if (userInfo.nameplatePic.length > 0) { - [self createNameplateAttibuteWithImage:userInfo.nameplatePic]; - [attributedString appendAttributedString:[self createSpaceAttribute:2]]; - } - }else{ - //主播认证 - if (userInfo.nameplateWord.length > 0 && userInfo.nameplatePic.length>0) { - [self createNameplateAttibute:userInfo.nameplateWord image:userInfo.nameplatePic textFont:[UIFont systemFontOfSize:9]]; - [attributedString appendAttributedString:[self createSpaceAttribute:2]]; - } - } - - // userRank 用户级别 - if (userInfo.userLevelVo.experUrl) { - [attributedString appendAttributedString:[self createUrlImageAttribute:userInfo.userLevelVo.experUrl]]; - [attributedString appendAttributedString:[self createSpaceAttribute:2]]; - } - - //charmRank 魅力等级 - if (userInfo.userLevelVo.charmUrl) { - [attributedString appendAttributedString:[self createUrlImageAttribute:userInfo.userLevelVo.charmUrl]]; - [attributedString appendAttributedString:[self createSpaceAttribute:4]]; - } - -// if(complete){ -// complete(attributedString); -// } - - self.levelLabel.attributedText = attributedString; -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - - self.nameLabel.text = _userInfo.nick.length > 0 ? _userInfo.nick : @""; - self.avatarImageView.imageUrl = userInfo.avatar; - if (userInfo.isReview) { - self.reviewView.hidden = NO; - } else { - self.reviewView.hidden = YES; - self.avatarImageView.imageUrl = userInfo.avatar; - } - - [self.sexImageView setTitle:[NSString getAgeWithBirth:userInfo.birth] forState:UIControlStateNormal]; - self.sexImageView.hidden = NO; - self.sexImageView.backgroundColor = userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.selected = _userInfo.gender != GenderType_Male; - self.sexImageView.titleEdgeInsets = _userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - - self.fansView.number = [NSString stringWithFormat:@"%ld",_userInfo.fansNum]; - self.followingView.number = [NSString stringWithFormat:@"%ld",_userInfo.followNum]; - - @kWeakify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - @kWeakify(self); - [self.experImageView loadImageWithUrl:self.userInfo.userLevelVo.experUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - self.experImageView.image = image; - CGFloat scale = 0; - if (image) { - CGFloat height = image.size.height > 0 ? image.size.height : 1; - scale = image.size.width / height ; - } - else { - NSURL *imgUrl = [NSURL URLWithString:self.userInfo.userLevelVo.experUrl]; - UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]]; - CGFloat height = myImage.size.height > 0 ? myImage.size.height : 1; - scale = myImage.size.width / height; - } - [self.experImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(20 * scale); - }]; - }]; - - [self.charmImageView loadImageWithUrl:self.userInfo.userLevelVo.charmUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - self.charmImageView.image = image; - CGFloat scale = 0; - if (image) { - CGFloat height = image.size.height > 0 ? image.size.height : 1; - scale = image.size.width / height ; - } - else { - NSURL *imgUrl = [NSURL URLWithString:self.userInfo.userLevelVo.experUrl]; - UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]]; - CGFloat height = myImage.size.height > 0 ? myImage.size.height : 1; - scale = myImage.size.width / height; - } - [self.charmImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(20 * scale); - }]; - }]; - }); - } -} - -- (void)setWalletInfo:(WalletInfoModel *)walletInfo { - self.accountView.diamonds = walletInfo.diamonds; -} -- (void)setNobleInfo:(NobleCenterModel *)nobleInfo { - self.nobleEntranceView.nobleInfo = nobleInfo; -} -- (void)setVipInfo:(NobleInfo *)vipInfo{ - _vipInfo = vipInfo; - self.nobleEntranceView.vipInfo = _vipInfo; -} - -- (void)setClanModel:(ClanDetailMainInfoModel *)clanModel { - self.agencyView.model = clanModel; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.userInteractionEnabled = YES; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 35; - } - return _avatarImageView; -} - -- (UIStackView *)nameStackView { - if (!_nameStackView) { - _nameStackView = [[UIStackView alloc] init]; - _nameStackView.axis = UILayoutConstraintAxisHorizontal; - _nameStackView.distribution = UIStackViewDistributionFill; - _nameStackView.alignment = UIStackViewAlignmentLeading; - _nameStackView.spacing = 5; - } - return _nameStackView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [[UILabel alloc] init]; - _nameLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:20]; - _nameLabel.textColor = [DJDKMIMOMColor colorWithHexString:@"#1F1A4E"]; - } - return _nameLabel; -} - -- (UIStackView *)idStackView { - if (!_idStackView) { - _idStackView = [[UIStackView alloc] init]; - _idStackView.axis = UILayoutConstraintAxisHorizontal; - _idStackView.distribution = UIStackViewDistributionFill; - _idStackView.alignment = UIStackViewAlignmentCenter; - _idStackView.spacing = 5; - } - return _idStackView; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:14]; - _idLabel.textColor = UIColorFromRGB(0x6D6B89); - _idLabel.userInteractionEnabled = YES; - UITapGestureRecognizer *longPress = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(copyNameAction)]; - [_idLabel addGestureRecognizer:longPress]; - } - return _idLabel; -} - -- (UIButton *)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.hidden = YES; - - } - return _sexImageView; -} - -- (YYLabel *)levelLabel { - if (!_levelLabel) { - _levelLabel = [[YYLabel alloc] init]; - _levelLabel.preferredMaxLayoutWidth = KScreenWidth - 88; - } - return _levelLabel; -} - -- (NetImageView *)experImageView { - if (!_experImageView) { - _experImageView = [[NetImageView alloc] init]; - _experImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _experImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - _charmImageView = [[NetImageView alloc] init]; - _charmImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _charmImageView; -} - -- (UIStackView *)attentionStackView { - if (!_attentionStackView) { - _attentionStackView = [[UIStackView alloc] init]; - _attentionStackView.axis = UILayoutConstraintAxisHorizontal; - _attentionStackView.distribution = UIStackViewDistributionFillEqually; - _attentionStackView.alignment = UIStackViewAlignmentCenter; - } - return _attentionStackView; -} - -- (XPMineFriendNumberView *)followingView { - if (!_followingView) { - _followingView = [[XPMineFriendNumberView alloc] init]; - _followingView.title = YMLocalizedString(@"XPMineHeadView4"); - _followingView.number = @"0"; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapFollowingRecognizer)]; - [_followingView addGestureRecognizer:tap]; - } - return _followingView; -} - -- (XPMineFriendNumberView *)fansView { - if (!_fansView) { - _fansView = [[XPMineFriendNumberView alloc] init]; - _fansView.title = YMLocalizedString(@"XPMineHeadView5"); - _fansView.number = @"0"; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapFansRecognizer)]; - [_fansView addGestureRecognizer:tap]; - } - return _fansView; -} - -- (XPMineFriendNumberView *)friendsView { - if (!_friendsView) { - _friendsView = [[XPMineFriendNumberView alloc] init]; - _friendsView.title = YMLocalizedString(@"20.20.51_text_23"); - _friendsView.number = @"0"; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapFriends)]; - [_friendsView addGestureRecognizer:tap]; - } - return _friendsView; -} - -- (XPMineFriendNumberView *)visitorView { - if (!_visitorView) { - _visitorView = [[XPMineFriendNumberView alloc] init]; - _visitorView.title = YMLocalizedString(@"20.20.51_text_24"); - _visitorView.number = @"0"; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapVisitor)]; - [_visitorView addGestureRecognizer:tap]; - } - return _visitorView; -} - -- (XPMineAccountView *)accountView { - if (!_accountView) { - _accountView = [[XPMineAccountView alloc] init]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAccountRecognizer)]; - [_accountView addGestureRecognizer:tap]; - } - return _accountView; -} -- (XPNobleCenterEntranceView *)nobleEntranceView { - if (!_nobleEntranceView) { - _nobleEntranceView = [[XPNobleCenterEntranceView alloc] init]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapNobleCenterRecognizer)]; - [_nobleEntranceView addGestureRecognizer:tap]; - } - return _nobleEntranceView; -} - -- (XPMineCenterAgencyView *)agencyView { - if (!_agencyView) { - _agencyView = [[XPMineCenterAgencyView alloc] init]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapAgency)]; - [_agencyView addGestureRecognizer:tap]; - } - return _agencyView; -} - -- (UIImageView *)reviewView{ - if (!_reviewView){ - _reviewView = [UIImageView new]; - _reviewView.hidden = YES; - _reviewView.image = [UIImage imageNamed:@"mine_avatar_reviewing"]; - UILabel *titleView = [[UILabel alloc] init]; - titleView.text = YMLocalizedString(@"XPMineHeadView7"); - titleView.font = [UIFont systemFontOfSize:11 weight:UIFontWeightRegular]; - titleView.textColor = [UIColor whiteColor]; - titleView.textAlignment = NSTextAlignmentCenter; - [_reviewView addSubview:titleView]; - [titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(_reviewView); - }]; - } - return _reviewView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineModifPayPwdView.h b/YuMi/Modules/YMMine/View/SubViews/XPMineModifPayPwdView.h deleted file mode 100644 index af21e2b..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineModifPayPwdView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMMineModifPayPwdView.h -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineModifPayPwdView : UIView -///输入框 -@property (nonatomic,strong, readonly) UITextField *contentTextField; -///占位 -@property (nonatomic,copy) NSString *placeholder; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineModifPayPwdView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineModifPayPwdView.m deleted file mode 100644 index 0f84369..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineModifPayPwdView.m +++ /dev/null @@ -1,120 +0,0 @@ -// -// XPMineModifPayPwdView.m -// xplan-ios -// -// Created by 冯硕 on 2021/9/18. -// - -#import "XPMineModifPayPwdView.h" -///Third -#import -///Tool - -#import "UIButton+EnlargeTouchArea.h" - -@interface XPMineModifPayPwdView () -///输入框 -@property (nonatomic,strong) MSBaseTextField *contentTextField; -///控制显示或者隐藏 -@property (nonatomic,strong) UIButton *commandButton; -///背景 -@property (nonatomic,strong) UIView * bgView; -@end - -@implementation XPMineModifPayPwdView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Response -- (void)onClickHiddenBtn:(UIButton *)btn { - btn.selected = !btn.selected; - self.contentTextField.secureTextEntry = !self.contentTextField.secureTextEntry; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.contentTextField]; - [self.bgView addSubview:self.commandButton]; - -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(48); - }]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(self); - make.leading.mas_offset(15); - make.trailing.mas_equalTo(-15); - }]; - [self.contentTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(20); - make.trailing.mas_equalTo(-54); - make.top.bottom.mas_equalTo(self.bgView); - }]; - - [self.commandButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-20); - make.width.height.mas_equalTo(24); - make.centerY.mas_equalTo(self.contentTextField); - make.leading.mas_equalTo(self.contentTextField.mas_trailing).offset(10); - }]; - - -} - -#pragma mark - Getters And Setters -- (void)setPlaceholder:(NSString *)placeholder { - _placeholder = placeholder; - NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init]; - self.contentTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : self.contentTextField.font, NSForegroundColorAttributeName : [DJDKMIMOMColor disableButtonTextColor], NSParagraphStyleAttributeName: style}]; -} - - -- (UIView *)bgView { - if (!_bgView) { - _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = UIColorFromRGB(0xF0F5F6); - _bgView.layer.cornerRadius = 24; - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} - -- (MSBaseTextField *)contentTextField { - if (!_contentTextField) { - _contentTextField = [[MSBaseTextField alloc] init]; - _contentTextField.secureTextEntry = YES; - _contentTextField.font = [UIFont systemFontOfSize:15]; - _contentTextField.textColor = [DJDKMIMOMColor inputTextColor]; - _contentTextField.tintColor = [DJDKMIMOMColor appMainColor]; - } - return _contentTextField; -} - -- (UIButton *)commandButton { - if (!_commandButton) { - _commandButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_commandButton setEnlargeEdgeWithTop:20 right:20 bottom:20 left:20]; - [_commandButton addTarget:self action:@selector(onClickHiddenBtn:) forControlEvents:UIControlEventTouchUpInside]; - [_commandButton setImage:[UIImage imageNamed:@"mine_setting_modif_pay_pwd_hidden"] forState:UIControlStateNormal]; - [_commandButton setImage:[UIImage imageNamed:@"mine_setting_modif_pay_pwd_show"] forState:UIControlStateSelected]; - _commandButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_commandButton setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _commandButton; -} - - - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineNewUserRechargeView.h b/YuMi/Modules/YMMine/View/SubViews/XPMineNewUserRechargeView.h deleted file mode 100644 index 4349742..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineNewUserRechargeView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMMineNewUserRechargeView.h -// YUMI -// -// Created by YUMI on 2022/7/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineNewUserRechargeView : UIView - -@property (nonatomic, assign) long endTime; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineNewUserRechargeView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineNewUserRechargeView.m deleted file mode 100644 index 8413bfe..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineNewUserRechargeView.m +++ /dev/null @@ -1,169 +0,0 @@ -// -// YMMineNewUserRechargeView.m -// YUMI -// -// Created by YUMI on 2022/7/28. -// - -#import "XPMineNewUserRechargeView.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "Timestamp.h" -///View - -@interface XPMineNewUserRechargeView () -///底部的底图 -@property (nonatomic,strong) UIImageView *backImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; - -@end - -@implementation XPMineNewUserRechargeView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initEvents]; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self.backImageView addSubview:self.nickLabel]; -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.trailing.mas_equalTo(-6); - make.bottom.mas_equalTo(-2); - make.height.mas_equalTo(14); - }]; -} - -- (void)initEvents { - UIPanGestureRecognizer *pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(roomMiniTag:)]; - pan.delaysTouchesBegan = YES; - [self addGestureRecognizer:pan]; -} - -#pragma mark - events -- (void)roomMiniTag:(UIPanGestureRecognizer*)p { - UIWindow *appWindow = [UIApplication sharedApplication].delegate.window; - CGPoint panPoint = [p locationInView:appWindow]; - if (p.state == UIGestureRecognizerStateBegan) { - self.alpha = 1; - } else if(p.state == UIGestureRecognizerStateChanged) { - self.center = CGPointMake(panPoint.x, panPoint.y); - } else if(p.state == UIGestureRecognizerStateEnded - || p.state == UIGestureRecognizerStateCancelled) { - self.alpha = 1; - CGFloat touchWidth = self.frame.size.width; - CGFloat touchHeight = self.frame.size.height; - CGFloat screenWidth = [[UIScreen mainScreen] bounds].size.width; - CGFloat screenHeight = [[UIScreen mainScreen] bounds].size.height; - // fabs 是取绝对值的意思 - CGFloat left = fabs(panPoint.x); - CGFloat right = fabs(screenWidth - left); - CGFloat top = fabs(panPoint.y); - CGFloat bottom = fabs(screenHeight - top); - CGFloat minSpace = 0; - minSpace = MIN(MIN(MIN(top, left), bottom), right); - CGPoint newCenter; - CGFloat targetY = 0; - //校正Y - if (panPoint.y < 15 + touchHeight / 2.0) { - targetY = 15 + touchHeight / 2.0; - }else if (panPoint.y > (screenHeight - touchHeight / 2.0 - 15)) { - targetY = screenHeight - touchHeight / 2.0 - 15; - }else{ - targetY = panPoint.y; - } - - if (minSpace == left) { - newCenter = CGPointMake(touchWidth/2.0, targetY); - }else if (minSpace == right) { - newCenter = CGPointMake(touchWidth/2.0, targetY); - }else if (minSpace == top) { - newCenter = CGPointMake(touchWidth/2.0, touchWidth / 3); - }else { - newCenter = CGPointMake(touchWidth/2.0, screenHeight - touchWidth / 3); - } - [UIView animateWithDuration:0.25 animations:^{ - if (newCenter.y + self.frame.size.height / 2 > KScreenHeight - kSafeAreaBottomHeight - 44) { - self.center = CGPointMake(newCenter.x, KScreenHeight - self.frame.size.height / 2 - kSafeAreaBottomHeight - 44); - }else { - self.center = newCenter; - } - }]; - } -} - -#pragma mark - Getters And Setters -- (void)setEndTime:(long)endTime { - _endTime = endTime; - [Timestamp getInternetDateWithSuccess:^(NSTimeInterval timeInterval) { - timeInterval = timeInterval * 1000; - long aTime = (endTime - timeInterval) / 1000; - [self countTimeWithTime:aTime]; - } failure:^(NSError * _Nonnull error) { - NSDate *datenow = [NSDate date];//现在时间 - long time2 = (long)([datenow timeIntervalSince1970]*1000); - long aTime = (endTime - time2) / 1000; - [self countTimeWithTime:aTime]; - }]; -} - -- (void)countTimeWithTime:(long)time { - NSInteger minute; - NSInteger hour; - NSInteger day = time / 24 / 3600; - time = time - day * 24 * 3600; - hour = time / 3600; - time = time - hour * 3600; - minute = time / 60; - if (day > 0) { - if (hour > 0) { - self.nickLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineNewUserRechargeView0"), day, hour, minute]; - } else { - self.nickLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineNewUserRechargeView1"), day, minute]; - } - } else { - if (hour > 0) { - self.nickLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineNewUserRechargeView2"), hour, minute]; - } else { - self.nickLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineNewUserRechargeView3"), minute]; - } - } -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.image = [UIImage imageNamed:@"NewUserRecharge_entrance_bg"]; - } - return _backImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:8 weight:UIFontWeightMedium]; - _nickLabel.textColor = [UIColor whiteColor]; - _nickLabel.textAlignment = NSTextAlignmentCenter; - } - return _nickLabel; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.h b/YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.h deleted file mode 100644 index 83bb858..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// YMMinePayPwdInputView.h -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -///输入框类型 -///TTPayPwdInputViewTypePwd-密码 -///TTPayPwdInputViewTypeRepeatPwd-重复密码 -///TTPayPwdInputViewTypeVerification-验证码 -typedef NS_ENUM(NSInteger, XPPayPwdInputViewType) { - XPPayPwdInputViewTypePwd, - XPPayPwdInputViewTypeRepeatPwd, - XPPayPwdInputViewTypeVerification -}; - -@interface XPMinePayPwdInputView : UIView - -@property (nonatomic, assign) XPPayPwdInputViewType type;//输入框类型 - -@property (nonatomic, copy) void (^fetchVerificationHandler)(void);//获取验证码 - -/// 获取当前文本框内容 -- (NSString *)contentText; - -/// 验证码倒计时更新 -/// @param seconds 秒数 -- (void)verificationCountdownUpdate:(NSInteger)seconds; - -/// 验证码倒计时结束 -- (void)verificationCountdownFinish; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.m b/YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.m deleted file mode 100644 index 2f33d36..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.m +++ /dev/null @@ -1,202 +0,0 @@ -// -// YMMinePayPwdInputView.m -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "XPMinePayPwdInputView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIButton+EnlargeTouchArea.h" -@interface XPMinePayPwdInputView() -///分割线 -@property (nonatomic, strong) UIView *lineView; -///输入框 -@property (nonatomic, strong) MSBaseTextField *contentTextField; -///状态按钮（隐藏显示密码、获取验证码、倒计时） -@property (nonatomic, strong) UIButton *statusButton; -///是否密文显示 -@property (nonatomic, assign) BOOL isSecurity; -///内容长度限制 -@property (nonatomic, assign) int contentLimit; -///键盘类型 -@property (nonatomic, assign) UIKeyboardType keyboardType; -///提示文本 -@property (nonatomic, strong) NSString *placeholder; - -@end - - -@implementation XPMinePayPwdInputView - -- (instancetype)init { - if (self = [super init]) { - [self initSubviews]; - } - return self; -} - -- (void)initSubviews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - [self addSubview:self.contentTextField]; - [self addSubview:self.statusButton]; - [self addSubview:self.lineView]; - [self makeConstriants]; -} - -- (void)makeConstriants { - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(25); - make.bottom.mas_equalTo(0); - make.height.mas_equalTo(0.5); - }]; - - [self.statusButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.lineView); - make.bottom.mas_equalTo(-10); - }]; - - [self.contentTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.statusButton); - make.leading.mas_equalTo(self.lineView); - make.trailing.mas_equalTo(self.statusButton.mas_leading).offset(-10); - make.height.mas_equalTo(44); - }]; -} - -#pragma mark - Event - -- (void)edingtingChange { - if (self.contentLimit && self.contentTextField.text.length > self.contentLimit) { - self.contentTextField.text = [self.contentTextField.text substringToIndex:self.contentLimit]; - } -} - -- (void)onClickStatusButton:(UIButton *)sender { - if (self.type == XPPayPwdInputViewTypeVerification) { - !self.fetchVerificationHandler ?: self.fetchVerificationHandler(); - return; - } - - sender.selected = !sender.selected; - self.isSecurity = !sender.selected; -} - -#pragma mark - Public -- (NSString *)contentText { - return self.contentTextField.text; -} - -/// 验证码倒计时更新 -/// @param seconds 秒数 -- (void)verificationCountdownUpdate:(NSInteger)seconds { - if (self.type == XPPayPwdInputViewTypeVerification) { - [self.statusButton setTitle:[NSString stringWithFormat:YMLocalizedString(@"XPMinePayPwdInputView0"), (long)seconds] forState:UIControlStateNormal]; - [self.statusButton setEnabled:NO]; - [self.statusButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - } -} - -/// 验证码倒计时结束 -- (void)verificationCountdownFinish { - if (self.type == XPPayPwdInputViewTypeVerification) { - [self.statusButton setTitle:YMLocalizedString(@"XPMinePayPwdInputView1") forState:UIControlStateNormal]; - [self.statusButton setEnabled:YES]; - [self.statusButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - } -} - -#pragma mark - Getters And Setters -- (void)setType:(XPPayPwdInputViewType)type { - _type = type; - - switch (type) { - case XPPayPwdInputViewTypePwd: - { - self.contentLimit = 6; - self.isSecurity = YES; - self.keyboardType = UIKeyboardTypeNumberPad; - self.placeholder = [NSString stringWithFormat:YMLocalizedString(@"XPMinePayPwdInputView2")]; - } - break; - case XPPayPwdInputViewTypeRepeatPwd: - { - self.contentLimit = 6; - self.isSecurity = YES; - self.keyboardType = UIKeyboardTypeNumberPad; - self.placeholder = [NSString stringWithFormat:YMLocalizedString(@"XPMinePayPwdInputView3")]; - } - break; - case XPPayPwdInputViewTypeVerification: - { - self.contentLimit = 5; - self.isSecurity = NO; - self.keyboardType = UIKeyboardTypeNumberPad; - self.placeholder = YMLocalizedString(@"XPMinePayPwdInputView4"); - - [self.statusButton setTitle:YMLocalizedString(@"XPMinePayPwdInputView5") forState:UIControlStateNormal]; - [self.statusButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - [self.statusButton setImage:nil forState:UIControlStateNormal]; - [self.statusButton setImage:nil forState:UIControlStateSelected]; - } - break; - default: - break; - } -} - -- (void)setIsSecurity:(BOOL)isSecurity { - _isSecurity = isSecurity; - - self.statusButton.selected = !isSecurity; - self.contentTextField.secureTextEntry = isSecurity; -} - -- (void)setPlaceholder:(NSString *)placeholder { - _placeholder = placeholder; - self.contentTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : self.contentTextField.font, NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}]; -} - -- (void)setKeyboardType:(UIKeyboardType)keyboardType { - _keyboardType = keyboardType; - self.contentTextField.keyboardType = keyboardType; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (MSBaseTextField *)contentTextField { - if (!_contentTextField) { - _contentTextField = [[MSBaseTextField alloc] init]; - _contentTextField.secureTextEntry = YES; - _contentTextField.font = [UIFont systemFontOfSize:13]; - _contentTextField.textColor = [DJDKMIMOMColor mainTextColor]; - [_contentTextField addTarget:self action:@selector(edingtingChange) forControlEvents:UIControlEventEditingChanged]; - } - return _contentTextField; -} - -- (UIButton *)statusButton { - if (!_statusButton) { - _statusButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_statusButton addTarget:self action:@selector(onClickStatusButton:) forControlEvents:UIControlEventTouchUpInside]; - [_statusButton setImage:[UIImage imageNamed:@"mine_setting_pay_password_hidden"] forState:UIControlStateNormal]; - [_statusButton setImage:[UIImage imageNamed:@"mine_setting_pay_password_show"] forState:UIControlStateSelected]; - _statusButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_statusButton setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_statusButton setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_statusButton setEnlargeEdgeWithTop:8 right:8 bottom:8 left:8]; - } - return _statusButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineUserInfoRecordedSoundView.h b/YuMi/Modules/YMMine/View/SubViews/XPMineUserInfoRecordedSoundView.h deleted file mode 100644 index 2f51912..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineUserInfoRecordedSoundView.h +++ /dev/null @@ -1,58 +0,0 @@ -// -// XPMineUserInfoRecordedSoundView.h -// xplan-ios -// -// Created by duoban on 2022/12/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - - -@protocol XPMineUserInfoRecordedSoundViewDelegate -///开始录音 -- (void)startRecordAudio; -///停止录音 --(void)stopRecordAudio; -///重新录音 --(void)resetRecordAudio; -///播放录音 --(void)playRecordAudio; -///停止播放录音 --(void)stopPlayRecordAudio; -///删除录音 --(void)deleteRecordingAudio; -///保存录音 --(void)saveRecordAudio; - -@end - - -@interface XPMineUserInfoRecordedSoundView : UIView -@property (nonatomic,weak) id delegate; - -///正在录制 --(void)recordingWithTime:(NSString *)time progress:(CGFloat)progress animated:(BOOL)animated; -///录制完成 --(void)recordCompleted; -///开始录制 --(void)startRecord; -///停止录制 --(void)stopRecord; -///重置录制 --(void)resetRecord; -///播放录音 --(void)playRecord; -///停止播放录音 --(void)stopPlayRecord; -///保存声音 --(void)uploadRecordSuccess:(BOOL)isAudit; -///录制按钮的点击事件 --(void)recordAction; -@end - -NS_ASSUME_NONNULL_END - - - diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineUserInfoRecordedSoundView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineUserInfoRecordedSoundView.m deleted file mode 100644 index 9f23f54..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineUserInfoRecordedSoundView.m +++ /dev/null @@ -1,525 +0,0 @@ -// -// XPMineUserInfoRecordedSoundView.m -// xplan-ios -// -// Created by duoban on 2022/12/29. -// - -#import "XPMineUserInfoRecordedSoundView.h" -#import "SGYProgressView.h" -#import -#import "XPSkillCardPlayerManager.h" - -@interface XPMineUserInfoRecordedSoundView() -@property (nonatomic,strong) UIScrollView *scrollView; -///背景 -@property (nonatomic,strong) UIImageView *bgImageView; -///记录背景 -@property (nonatomic,strong) UIImageView *recordView; -///录制圆环进度条 -@property (nonatomic,strong) SGYProgressView *progressView; -///录制麦图标 -@property (nonatomic,strong) UIImageView *maiView; -///声音动效 -@property (nonatomic,strong) SVGAImageView *soundSVGAView; -///录制时间 -@property (nonatomic,strong) UILabel *timeView; -///提示 -@property (nonatomic,strong) UILabel *promptView; -///录制背景 -@property (nonatomic,strong) UIView *bgRecordView; -///录制 -@property (nonatomic,strong) UIButton *recordBtn; -///完成录制 -@property (nonatomic,strong) UIButton *completedBtn; -///录制下面提示 -@property (nonatomic,strong) UILabel *recordTitleView; - -///重新录制背景 -@property (nonatomic,strong) UIView *bgRerecordView; -///重新录制 -@property (nonatomic,strong) UIButton *rerecordBtn; -///重新录制下面提示 -@property (nonatomic,strong) UILabel *rerecordTitleView; -///保存声音 -@property (nonatomic,strong) UIButton *saveBtn; -///保存声音下面提示 -@property (nonatomic,strong) UILabel *saveTitleView; -///删除背景 -@property (nonatomic,strong) UIView *bgDeleteView; -///删除 -@property (nonatomic,strong) UIButton *deleteBtn; -///结果提示 -@property (nonatomic,strong) UILabel *resultView; -@end -@implementation XPMineUserInfoRecordedSoundView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.scrollView]; - [self.scrollView addSubview:self.bgImageView]; - [self.scrollView addSubview:self.recordView]; - [self.recordView addSubview:self.progressView]; - [self.recordView addSubview:self.maiView]; - [self.recordView addSubview:self.soundSVGAView]; - [self.scrollView addSubview:self.timeView]; - [self.scrollView addSubview:self.promptView]; - [self.scrollView addSubview:self.bgRecordView]; - [self.bgRecordView addSubview:self.recordBtn]; - [self.bgRecordView addSubview:self.completedBtn]; - [self.scrollView addSubview:self.recordTitleView]; - [self.scrollView addSubview:self.bgRerecordView]; - [self.bgRerecordView addSubview:self.rerecordBtn]; - [self.scrollView addSubview:self.rerecordTitleView]; - [self.scrollView addSubview:self.bgDeleteView]; - [self.bgDeleteView addSubview:self.deleteBtn]; - [self.scrollView addSubview:self.saveBtn]; - [self.scrollView addSubview:self.saveTitleView]; - [self.scrollView addSubview:self.resultView]; - - - self.bgRerecordView.hidden = YES; - self.rerecordTitleView.hidden = YES; - self.bgDeleteView.hidden = YES; - self.saveBtn.hidden = YES; - self.saveTitleView.hidden = YES; - self.resultView.hidden = YES; - - SVGAParser *soundParser = [SVGAParser new]; - @kWeakify(self) - [soundParser parseWithNamed:@"mine_info_sound_record" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.soundSVGAView.loops = 0; - self.soundSVGAView.clearsAfterStop = NO; - self.soundSVGAView.videoItem = videoItem; - [self.soundSVGAView startAnimation]; - } failureBlock:^(NSError * _Nonnull error) { - - }]; -} -- (void)initSubViewConstraints { - [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(216)); - }]; - [self.recordView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(168)); - make.width.height.mas_equalTo(kGetScaleWidth(180)); - make.centerX.equalTo(self); - }]; - [self.maiView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(110)); - make.center.equalTo(self.recordView); - }]; - [self.soundSVGAView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(110)); - make.center.equalTo(self.recordView); - }]; - [self.timeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.recordView.mas_bottom).mas_offset(kGetScaleWidth(30)); - make.centerX.equalTo(self); - }]; - [self.promptView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.timeView.mas_bottom).mas_offset(kGetScaleWidth(15)); - make.centerX.equalTo(self); - }]; - [self.bgRecordView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.promptView.mas_bottom).mas_offset(kGetScaleWidth(116)); - make.width.height.mas_equalTo(kGetScaleWidth(64)); - make.centerX.equalTo(self); - }]; - [self.completedBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(28)); - make.center.equalTo(self.bgRecordView); - }]; - [self.recordBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(28)); - make.center.equalTo(self.bgRecordView); - }]; - [self.recordTitleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.bgRecordView.mas_bottom).mas_offset(kGetScaleWidth(15)); - make.centerX.equalTo(self); - }]; - - [self.bgRerecordView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(42)); - make.centerY.equalTo(self.recordBtn); - make.trailing.equalTo(self.recordBtn.mas_leading).mas_offset(-kGetScaleWidth(56)); - }]; - - [self.rerecordBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(18)); - make.center.equalTo(self.bgRerecordView); - }]; - [self.rerecordTitleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.bgRerecordView.mas_bottom).mas_offset(kGetScaleWidth(10)); - make.centerX.equalTo(self.rerecordBtn); - - }]; - - - [self.bgDeleteView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(42)); - make.centerY.equalTo(self.recordBtn); - make.leading.equalTo(self.recordBtn.mas_trailing).mas_offset(kGetScaleWidth(56)); - }]; - - [self.deleteBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(18)); - make.center.equalTo(self.bgDeleteView); - }]; - - [self.saveBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(42)); - make.centerY.equalTo(self.recordBtn); - make.leading.equalTo(self.recordBtn.mas_trailing).mas_offset(kGetScaleWidth(56)); - }]; - [self.saveTitleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.rerecordTitleView); - make.centerX.equalTo(self.saveBtn); - }]; - [self.resultView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.recordTitleView.mas_bottom).mas_offset(kGetScaleWidth(54)); - make.centerX.equalTo(self); - - }]; - [self.resultView.superview layoutIfNeeded]; - self.scrollView.contentSize = CGSizeMake(0, self.resultView.frame.origin.y + self.resultView.frame.size.height ); -} --(void)recordingWithTime:(NSString *)time progress:(CGFloat)progress animated:(BOOL)animated{ - self.timeView.text = time; - [self.progressView setProgress:progress animated:animated startAngle:-M_PI_2 clockwise:YES]; -} --(void)uploadRecordSuccess:(BOOL)isAudit{ - self.bgDeleteView.hidden = NO; - self.resultView.hidden = NO; - self.bgRerecordView.hidden = NO; - self.rerecordTitleView.hidden = NO; - self.saveBtn.hidden = YES; - self.soundSVGAView.hidden = YES; - self.maiView.hidden = NO; - self.recordBtn.hidden = YES; - self.completedBtn.hidden = NO; - self.saveTitleView.hidden = NO; - self.recordTitleView.text = YMLocalizedString(@"XPMineUserInfoRecordedSoundView6"); - self.saveTitleView.text = YMLocalizedString(@"XPMineUserInfoRecordedSoundView8"); - self.resultView.text = isAudit == YES ? YMLocalizedString(@"XPMineUserInfoRecordedSoundView9") : YMLocalizedString(@"XPMineUserInfoRecordedSoundView4"); - -} --(void)recordCompleted{ - self.resultView.hidden = YES; - self.bgDeleteView.hidden = YES; - self.bgRerecordView.hidden = NO; - self.rerecordTitleView.hidden = NO; - self.saveBtn.hidden = NO; - self.soundSVGAView.hidden = YES; - self.maiView.hidden = NO; - self.recordBtn.hidden = YES; - self.completedBtn.hidden = NO; - self.saveTitleView.hidden = NO; - self.recordTitleView.text = YMLocalizedString(@"XPMineUserInfoRecordedSoundView6"); - self.saveTitleView.text = YMLocalizedString(@"XPMineUserInfoRecordedSoundView3"); -} -- (void)startRecord{ - - self.recordBtn.selected = YES; - self.soundSVGAView.hidden = NO; - self.maiView.hidden = YES; - self.recordTitleView.text = YMLocalizedString(@"XPMineUserInfoRecordedSoundView5"); -} --(void)stopRecord{ - self.recordBtn.selected = NO; - self.soundSVGAView.hidden = YES; - self.maiView.hidden = NO; - self.recordTitleView.text = YMLocalizedString(@"XPMineUserInfoRecordedSoundView1"); -} --(void)resetRecord{ - self.recordBtn.selected = NO; - self.soundSVGAView.hidden = YES; - self.maiView.hidden = NO; - self.recordTitleView.text = YMLocalizedString(@"XPMineUserInfoRecordedSoundView1"); - self.bgRerecordView.hidden = YES; - self.rerecordTitleView.hidden = YES; - self.saveBtn.hidden = YES; - self.soundSVGAView.hidden = YES; - self.maiView.hidden = NO; - self.recordBtn.hidden = NO; - self.completedBtn.hidden = YES; - self.saveTitleView.hidden = YES; - self.bgDeleteView.hidden = YES; - self.resultView.hidden = YES; - self.completedBtn.selected = NO; -} --(void)playRecord{ - self.maiView.hidden = YES; - self.soundSVGAView.hidden = NO; - - self.recordTitleView.text = YMLocalizedString(@"XPMineUserInfoRecordedSoundView7"); - -} --(void)stopPlayRecord{ - self.maiView.hidden = NO; - self.soundSVGAView.hidden = YES; - self.completedBtn.selected = NO; - self.recordTitleView.text = YMLocalizedString(@"XPMineUserInfoRecordedSoundView6"); -} --(void)saveRecordAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(saveRecordAudio)]){ - [self.delegate saveRecordAudio]; - } -} -#pragma mark - buttonAction --(void)recordAction{ - if([XPSkillCardPlayerManager shareInstance].isMineInMic == YES){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMineUserInfoRecordedSoundView10")]; - return; - } - - - self.recordBtn.selected = !self.recordBtn.selected; - if(!self.recordBtn.selected){ - self.recordBtn.userInteractionEnabled = NO; - dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)); - dispatch_after(popTime, dispatch_get_main_queue(), ^(void){ - self.recordBtn.userInteractionEnabled = YES; - }); - } - if(self.recordBtn.selected){ - if(self.delegate && [self.delegate respondsToSelector:@selector(startRecordAudio)]){ - [self.delegate startRecordAudio]; - } - return; - } - if(self.delegate && [self.delegate respondsToSelector:@selector(stopRecordAudio)]){ - [self.delegate stopRecordAudio]; - } - -} --(void)playSoundAction{ - self.completedBtn.selected = !self.completedBtn.selected; - if(self.completedBtn.selected){ - if(self.delegate && [self.delegate respondsToSelector:@selector(playRecordAudio)]){ - [self.delegate playRecordAudio]; - } - - return; - } - if(self.delegate && [self.delegate respondsToSelector:@selector(stopPlayRecordAudio)]){ - [self.delegate stopPlayRecordAudio]; - } -} --(void)resetRecordAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(resetRecordAudio)]){ - [self.delegate resetRecordAudio]; - } -} --(void)deleteRecordingAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(deleteRecordingAudio)]){ - [self.delegate deleteRecordingAudio]; - } -} -#pragma mark -懒加载 -- (UIImageView *)bgImageView{ - if (!_bgImageView){ - _bgImageView = [UIImageView new]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xDBE3FC),UIColorFromRGB(0xF2F1FF),[UIColor colorWithRed:255/255.0 green:255/255.0 blue:255/255.0 alpha:1]] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(KScreenWidth, kGetScaleWidth(216))]; - _bgImageView.image = image; - } - return _bgImageView; -} -- (UIImageView *)recordView{ - if (!_recordView){ - _recordView = [UIImageView new]; - _recordView.image = kImage(@"mine_recorded_sound_bg"); - } - return _recordView; -} -- (SGYProgressView *)progressView{ - if (!_progressView){ - _progressView = [[SGYProgressView alloc]initWithFrame:CGRectMake(0, 0, kGetScaleWidth(180), kGetScaleWidth(180)) trackWidth:kGetScaleWidth(8)]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(180), kGetScaleWidth(180))]; - _progressView.progressColor = [UIColor colorWithPatternImage:image]; - _progressView.progressBgColor = [UIColor clearColor]; - } - return _progressView; -} -- (UIImageView *)maiView{ - if (!_maiView){ - _maiView = [UIImageView new]; - _maiView.image = kImage(@"mine_recorded_sound_mic"); - } - return _maiView; -} -- (SVGAImageView *)soundSVGAView { - if (_soundSVGAView == nil) { - _soundSVGAView = [[SVGAImageView alloc]init]; - _soundSVGAView.contentMode = UIViewContentModeScaleToFill; - _soundSVGAView.userInteractionEnabled = NO; - _soundSVGAView.hidden = YES; - _soundSVGAView.backgroundColor = [UIColor clearColor]; - } - return _soundSVGAView; -} -- (UILabel *)timeView{ - if (!_timeView){ - _timeView = [UILabel labelInitWithText:@"0s/60s" font:kFontSemibold(14) textColor:[DJDKMIMOMColor inputTextColor]]; - } - return _timeView; -} -- (UILabel *)promptView{ - if (!_promptView){ - _promptView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineUserInfoRecordedSoundView0") font:kFontRegular(14) textColor:[DJDKMIMOMColor disableButtonTextColor]]; - } - return _promptView; -} - -- (UIView *)bgRecordView{ - if (!_bgRecordView){ - _bgRecordView = [[UIView alloc] init]; - _bgRecordView.frame = CGRectMake(0,0,kGetScaleWidth(64),kGetScaleWidth(64)); - _bgRecordView.layer.backgroundColor = [UIColor clearColor].CGColor; - _bgRecordView.layer.shadowColor = [UIColor colorWithRed:225/255.0 green:232/255.0 blue:246/255.0 alpha:1.0].CGColor; - _bgRecordView.layer.shadowOffset = CGSizeMake(0,kGetScaleWidth(1)); - _bgRecordView.layer.shadowOpacity = kGetScaleWidth(1); - _bgRecordView.layer.shadowRadius = kGetScaleWidth(11); - UIView *bgView = [UIView new]; - bgView.frame = CGRectMake(0,0,kGetScaleWidth(64),kGetScaleWidth(64)); - bgView.backgroundColor = [UIColor whiteColor]; - bgView.layer.cornerRadius = kGetScaleWidth(32); - bgView.layer.masksToBounds = YES; - [_bgRecordView addSubview:bgView]; - } - return _bgRecordView; -} --(UIButton *)completedBtn{ - if (!_completedBtn){ - _completedBtn = [UIButton new]; - _completedBtn.hidden = YES; - [_completedBtn setImage:kImage(@"mine_recorded_sound_completed") forState:UIControlStateNormal]; - [_completedBtn setImage:kImage(@"mine_recorded_sound_completeding") forState:UIControlStateSelected]; - [_completedBtn setEnlargeEdgeWithTop:20 right:20 bottom:20 left:20]; - [_completedBtn addTarget:self action:@selector(playSoundAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _completedBtn; -} --(UIButton *)recordBtn{ - if (!_recordBtn){ - _recordBtn = [UIButton new]; - [_recordBtn setBackgroundImage:kImage(@"mine_recorded_sound_start_record") forState:UIControlStateNormal]; - [_recordBtn setBackgroundImage:kImage(@"mine_recorded_sound_recording") forState:UIControlStateSelected]; - [_recordBtn setEnlargeEdgeWithTop:20 right:20 bottom:20 left:20]; - [_recordBtn addTarget:self action:@selector(recordAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _recordBtn; -} --(UILabel *)recordTitleView{ - if (!_recordTitleView){ - _recordTitleView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineUserInfoRecordedSoundView1") font:kFontRegular(14) textColor:UIColorFromRGB(0x6D6B89)]; - } - return _recordTitleView; -} -- (UIView *)bgRerecordView{ - if (!_bgRerecordView){ - _bgRerecordView = [[UIView alloc] init]; - _bgRerecordView.frame = CGRectMake(0,0,kGetScaleWidth(42),kGetScaleWidth(42)); - _bgRerecordView.layer.backgroundColor = [UIColor clearColor].CGColor; - _bgRerecordView.layer.shadowColor = [UIColor colorWithRed:225/255.0 green:232/255.0 blue:246/255.0 alpha:1.0].CGColor; - _bgRerecordView.layer.shadowOffset = CGSizeMake(0,kGetScaleWidth(1)); - _bgRerecordView.layer.shadowOpacity = kGetScaleWidth(1); - _bgRerecordView.layer.shadowRadius = kGetScaleWidth(11); - UIView *bgView = [UIView new]; - bgView.frame = CGRectMake(0,0,kGetScaleWidth(42),kGetScaleWidth(42)); - bgView.backgroundColor = [UIColor whiteColor]; - bgView.layer.cornerRadius = kGetScaleWidth(21); - bgView.layer.masksToBounds = YES; - [_bgRerecordView addSubview:bgView]; - } - return _bgRerecordView; -} --(UIButton *)rerecordBtn{ - if (!_rerecordBtn){ - _rerecordBtn = [UIButton new]; - [_rerecordBtn setImage:kImage(@"mine_recorded_sound_rerecord") forState:UIControlStateNormal]; - [_rerecordBtn setEnlargeEdgeWithTop:20 right:20 bottom:20 left:20]; - [_rerecordBtn addTarget:self action:@selector(resetRecordAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _rerecordBtn; -} --(UILabel *)rerecordTitleView{ - if (!_rerecordTitleView){ - _rerecordTitleView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineUserInfoRecordedSoundView2") font:kFontRegular(12) textColor:UIColorFromRGB(0x6D6B89)]; - } - return _rerecordTitleView; -} --(UIView *)bgDeleteView{ - if (!_bgDeleteView){ - _bgDeleteView = [[UIView alloc] init]; - _bgDeleteView.frame = CGRectMake(0,0,kGetScaleWidth(42),kGetScaleWidth(42)); - _bgDeleteView.layer.backgroundColor = [UIColor clearColor].CGColor; - _bgDeleteView.layer.shadowColor = [UIColor colorWithRed:225/255.0 green:232/255.0 blue:246/255.0 alpha:1.0].CGColor; - _bgDeleteView.layer.shadowOffset = CGSizeMake(0,kGetScaleWidth(1)); - _bgDeleteView.layer.shadowOpacity = kGetScaleWidth(1); - _bgDeleteView.layer.shadowRadius = kGetScaleWidth(11); - UIView *bgView = [UIView new]; - bgView.frame = CGRectMake(0,0,kGetScaleWidth(42),kGetScaleWidth(42)); - bgView.backgroundColor = [UIColor whiteColor]; - bgView.layer.cornerRadius = kGetScaleWidth(21); - bgView.layer.masksToBounds = YES; - [_bgDeleteView addSubview:bgView]; - } - return _bgDeleteView; -} --(UIButton *)deleteBtn{ - if (!_deleteBtn){ - _deleteBtn = [UIButton new]; - [_deleteBtn setImage:kImage(@"mine_recorded_sound_del") forState:UIControlStateNormal]; - [_deleteBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_deleteBtn addTarget:self action:@selector(deleteRecordingAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _deleteBtn; -} --(UIButton *)saveBtn{ - if (!_saveBtn){ - _saveBtn = [UIButton new]; - [_saveBtn setImage:kImage(@"mine_recorded_sound_save") forState:UIControlStateNormal]; - [_saveBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_saveBtn addTarget:self action:@selector(saveRecordAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _saveBtn; -} --(UILabel *)saveTitleView{ - if (!_saveTitleView){ - _saveTitleView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineUserInfoRecordedSoundView3") font:kFontRegular(12) textColor:UIColorFromRGB(0x6D6B89)]; - } - return _saveTitleView; -} --(UILabel *)resultView{ - if (!_resultView){ - _resultView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineUserInfoRecordedSoundView4") font:kFontRegular(14) textColor:UIColorFromRGB(0x6D6B89)]; - } - return _resultView; -} --(UIScrollView *)scrollView{ - if (!_scrollView){ - _scrollView = [UIScrollView new]; - - } - return _scrollView; -} -@end - - - - diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.h b/YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.h deleted file mode 100644 index 28eab8c..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// YMMineVerifIdentityView.h -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger,XPMineVerifIdentityType ) { - XPMineVerifIdentityType_Phone, ///手机号 - XPMineVerifIdentityType_Sms,///验证码 -}; -typedef void(^VerifIdentitySmsCodeBlock)(UIButton *sender); -@interface XPMineVerifIdentityView : UIView -///输入框 -@property (nonatomic, strong, readonly) UITextField *contentTextField; -///发送验证码 -@property (nonatomic, strong, readonly) UIButton *smsCodeButton; -///点击了smsCode -@property (nonatomic,copy) VerifIdentitySmsCodeBlock smsCodeBlock; -/// -@property (nonatomic,assign) XPMineVerifIdentityType type; -///占位 -@property (nonatomic, strong) NSString *placeholder; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.m deleted file mode 100644 index ba34384..0000000 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.m +++ /dev/null @@ -1,127 +0,0 @@ -// -// YMMineVerifIdentityView.m -// YUMI -// -// Created by YUMI on 2021/9/18. -// - -#import "XPMineVerifIdentityView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPMineVerifIdentityView () -/// -@property (nonatomic,strong) UIStackView *stackView; -///分割线 -@property (nonatomic, strong) UIView *lineView; -///输入框 -@property (nonatomic, strong) MSBaseTextField *contentTextField; -///发送验证码 -@property (nonatomic, strong) UIButton *smsCodeButton; -@end - -@implementation XPMineVerifIdentityView - - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Response -- (void)smsCodeButtonAction:(UIButton *)sender { - if (self.smsCodeBlock) { - self.smsCodeBlock(sender); - } -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.stackView]; - [self addSubview:self.lineView]; - - [self.stackView addArrangedSubview:self.contentTextField]; - [self.stackView addArrangedSubview:self.smsCodeButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(50); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(15); - make.trailing.mas_equalTo(self).offset(-32); - make.top.bottom.mas_equalTo(self); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(5); - make.trailing.mas_equalTo(self).offset(-5); - make.bottom.mas_equalTo(self); - make.height.mas_equalTo(1); - }]; -} - -#pragma mark - Getters And Setters -- (void)setType:(XPMineVerifIdentityType)type { - _type = type; - switch (_type) { - case XPMineVerifIdentityType_Phone: - self.smsCodeButton.hidden = YES; - break; - default: - break; - } -} - -- (void)setPlaceholder:(NSString *)placeholder { - _placeholder = placeholder; - self.contentTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : self.contentTextField.font, NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}]; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 10; - } - return _stackView; -} - -- (MSBaseTextField *)contentTextField { - if (!_contentTextField) { - _contentTextField = [[MSBaseTextField alloc] init]; - _contentTextField.secureTextEntry = YES; - _contentTextField.font = [UIFont systemFontOfSize:13]; - _contentTextField.textColor = [DJDKMIMOMColor mainTextColor]; - _contentTextField.tintColor = [DJDKMIMOMColor appMainColor]; - } - return _contentTextField; -} - -- (UIButton *)smsCodeButton { - if (!_smsCodeButton) { - _smsCodeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_smsCodeButton setTitle:YMLocalizedString(@"XPMineVerifIdentityView0") forState:UIControlStateNormal]; - [_smsCodeButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - [_smsCodeButton setTitleColor:[DJDKMIMOMColor appEmphasizeColor] forState:UIControlStateDisabled]; - _smsCodeButton.titleLabel.font = [UIFont systemFontOfSize:12]; - _smsCodeButton.layer.masksToBounds = YES; - _smsCodeButton.layer.cornerRadius = 10; - [_smsCodeButton addTarget:self action:@selector(smsCodeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_smsCodeButton setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _smsCodeButton; -} - -@end diff --git a/YuMi/Modules/YMMine/View/VipSettingViewController.h b/YuMi/Modules/YMMine/View/VipSettingViewController.h deleted file mode 100644 index c1a8be8..0000000 --- a/YuMi/Modules/YMMine/View/VipSettingViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// VipSettingViewController.h -// YuMi -// -// Created by P on 2024/10/22. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface VipSettingViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/VipSettingViewController.m b/YuMi/Modules/YMMine/View/VipSettingViewController.m deleted file mode 100644 index 19c49f8..0000000 --- a/YuMi/Modules/YMMine/View/VipSettingViewController.m +++ /dev/null @@ -1,426 +0,0 @@ -// -// VipSettingViewController.m -// YuMi -// -// Created by P on 2024/10/22. -// - -#import "VipSettingViewController.h" - -#import "Api.h" -#import "UserInfoModel.h" -#import "XPNobleCenterProtocol.h" -#import "XPNobleCenterPresenter.h" - -typedef NS_ENUM(NSUInteger, VIP_Settings) { - VIP_Settings_PreventFollow = 0, - VIP_Settings_PreventTrace, - VIP_Settings_VisitHide, - VIP_Settings_PrivateChatLimit, - VIP_Settings_EnterHide, - VIP_Settings_PreventKick, - VIP_Settings_Num -}; - -@interface VipSettingCell : UITableViewCell - -@property (nonatomic, copy) NSString *title; -@property (nonatomic, assign) NSInteger minLevel; -@property (nonatomic, assign) NSInteger maxLevel; - -@property (nonatomic, strong) UIStackView *stack; -@property (nonatomic, strong) UIImageView *vip_5; -@property (nonatomic, strong) UIImageView *vip_6; -@property (nonatomic, strong) UIImageView *vip_7; -@property (nonatomic, strong) UIImageView *vip_8; -@property (nonatomic, strong) UIImageView *vip_9; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UISwitch *vipSwitch; -@property (nonatomic, assign) NSInteger index; -@property (nonatomic, assign) BOOL switchStatus; - -@property (nonatomic, copy) void(^switchUpdate)(BOOL switchState, NSInteger index); - -@end - -@implementation VipSettingCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - - UIView *container = [[UIView alloc] init]; - container.backgroundColor = UIColorFromRGB(0xF2F3F7); - container.layer.cornerRadius = 8; - container.layer.masksToBounds = YES; - [self.contentView addSubview:container]; - [container mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.contentView.mas_width).offset(-16); - make.height.mas_equalTo(64); - make.top.mas_equalTo(self.contentView).offset(20); - }]; - - [self.stack addArrangedSubview:self.vip_5]; - [self.stack addArrangedSubview:self.vip_6]; - [self.stack addArrangedSubview:self.vip_7]; - [self.stack addArrangedSubview:self.vip_8]; - [self.stack addArrangedSubview:self.vip_9]; - [container addSubview:self.stack]; - [self.stack mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(10); - make.height.mas_equalTo(20); - }]; - - [self.vip_5 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(42, 20)); - }]; - [self.vip_6 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(42, 20)); - }]; - [self.vip_7 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(42, 20)); - }]; - [self.vip_8 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(42, 20)); - }]; - [self.vip_9 mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(42, 20)); - }]; - - [container addSubview:self.vipSwitch]; - [self.vipSwitch mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(container); - make.trailing.mas_equalTo(container).offset(-20); - make.size.mas_equalTo(CGSizeMake(34, 20)); - }]; - - [container addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(10); - make.top.mas_equalTo(self.stack.mas_bottom).offset(10); - }]; - } - return self; -} - -- (void)setMaxLevel:(NSInteger)maxLevel { - _maxLevel = maxLevel; - self.titleLabel.text = self.title; - self.vip_5.hidden = self.minLevel>5; - self.vip_6.hidden = self.minLevel>6; - self.vip_7.hidden = self.minLevel>7; - self.vip_8.hidden = self.minLevel>8; - self.vipSwitch.on = self.switchStatus; -} - -- (void)onSwitchChange:(UISwitch *)sender { - if (self.switchUpdate) { - self.switchUpdate(sender.isOn, self.index); - } -} - -- (UIStackView *)stack { - if (!_stack) { - _stack = [[UIStackView alloc] init]; - _stack.spacing = 5; - _stack.alignment = UIStackViewAlignmentLeading; - } - return _stack; -} - -- (UIImageView *)vip_5 { - if (!_vip_5) { - _vip_5 = [[UIImageView alloc] initWithImage:kImage(@"vip_setting_level_5")]; - _vip_5.contentMode = UIViewContentModeScaleAspectFill; - } - return _vip_5; -} -- (UIImageView *)vip_6 { - if (!_vip_6) { - _vip_6 = [[UIImageView alloc] initWithImage:kImage(@"vip_setting_level_6")]; - _vip_6.contentMode = UIViewContentModeScaleAspectFill; - } - return _vip_6; -} -- (UIImageView *)vip_7 { - if (!_vip_7) { - _vip_7 = [[UIImageView alloc] initWithImage:kImage(@"vip_setting_level_7")]; - _vip_7.contentMode = UIViewContentModeScaleAspectFill; - } - return _vip_7; -} -- (UIImageView *)vip_8 { - if (!_vip_8) { - _vip_8 = [[UIImageView alloc] initWithImage:kImage(@"vip_setting_level_8")]; - _vip_8.contentMode = UIViewContentModeScaleAspectFill; - } - return _vip_8; -} -- (UIImageView *)vip_9 { - if (!_vip_9) { - _vip_9 = [[UIImageView alloc] initWithImage:kImage(@"vip_setting_level_9")]; - _vip_9.contentMode = UIViewContentModeScaleAspectFill; - } - return _vip_9; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(14) - textColor:UIColorFromRGB(0x313131)]; - } - return _titleLabel; -} - -- (UISwitch *)vipSwitch { - if (!_vipSwitch) { - _vipSwitch = [[UISwitch alloc] init]; - _vipSwitch.onTintColor = UIColorFromRGB(0xff8c03); - [_vipSwitch addTarget:self - action:@selector(onSwitchChange:) - forControlEvents:UIControlEventValueChanged]; - _vipSwitch.transform = CGAffineTransformMakeScale(0.8, 0.8); - } - return _vipSwitch; -} - -@end - - -@interface VipSettingViewController () - -@property (nonatomic, strong) UserInfoModel *userInfo; -@property (nonatomic, strong) UITableView *tableView; - -@end - -@implementation VipSettingViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.title = YMLocalizedString(@"VipSettin_1.0.17_0"); - self.view.backgroundColor = [UIColor whiteColor]; - - [self.view addSubview:self.tableView]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).offset(16); - make.top.trailing.bottom.mas_equalTo(self.view); - }]; - - [self showLoading]; - @kWeakify(self); - [Api getUserInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - [self hideHUD]; - self.userInfo = [UserInfoModel modelWithDictionary:data.data]; - [self.tableView reloadData]; - } else { - [self showErrorToast:msg]; - [self dismissViewControllerAnimated:YES completion:nil]; - } - } uid:[[AccountInfoStorage instance] getUid]]; -} - -- (XPNobleCenterPresenter *)createPresenter { - return [[XPNobleCenterPresenter alloc] init];; -} - -- (void)handleSwitchUpdate:(BOOL)switchStatus atIndex:(NSInteger)index { - self.tableView.userInteractionEnabled = false; - switch (index) { - case VIP_Settings_PreventFollow: - /// 防关注 - [self.presenter changePreventFollow:switchStatus]; - break; - case VIP_Settings_PreventTrace: - /// 防跟随 - [self.presenter changePreventTrace:switchStatus]; - break; - case VIP_Settings_VisitHide: - // 無痕瀏覽 - [self.presenter changeVisitHide:switchStatus]; - break; - case VIP_Settings_PrivateChatLimit: - /// 請勿打擾 - [self.presenter changePrivateChatLimit:switchStatus]; - break; - case VIP_Settings_EnterHide: - /// 隐身 - [self.presenter changeEnterHide:switchStatus]; - break; - case VIP_Settings_PreventKick: - /// 防被踢 - [self.presenter changePreventKick:switchStatus]; - break; - - default: - break; - } -} - -#pragma mark - -///开关隐身进房成功 -- (void)changeEnterHideSuccess:(BOOL)switchStatus { - [self.userInfo.userVipInfoVO setEnterHide:switchStatus]; - [self switchUpdateEnd]; -} - -///开关隐身进房失败 -- (void)changeEnterHideFail { - [self switchUpdateEnd]; -} - -///防关注开关修改成功 -- (void)changePreventFollowSuccess:(BOOL)switchStatus { - [self.userInfo.userVipInfoVO setPreventFollow:switchStatus]; - [self switchUpdateEnd]; -} - -///防关注开关修改失败 -- (void)changePreventFollowFail { - [self switchUpdateEnd]; -} - -///防跟随开关修改成功 -- (void)changePreventTraceSuccess:(BOOL)switchStatus { - [self.userInfo.userVipInfoVO setPreventTrace:switchStatus]; - [self switchUpdateEnd]; -} - -///防跟随开关修改失败 -- (void)changePreventTraceFail { - [self switchUpdateEnd]; -} - -///VIP 防被踢开关修改成功 -- (void)changePreventKickSuccess:(BOOL)switchStatus { - [self.userInfo.userVipInfoVO setPreventKick:switchStatus]; - [self switchUpdateEnd]; -} - -///VIP 防被踢开关修改失败 -- (void)changePreventKickFail { - [self switchUpdateEnd]; -} - -- (void)changePrivateChatLimitSuccess:(BOOL)switchStatus { - [self.userInfo.userVipInfoVO setPrivateChatLimit:switchStatus]; - [self switchUpdateEnd]; -} - -- (void)changePrivateChatLimitFail { - [self switchUpdateEnd]; -} - -- (void)changeVisitHideSuccess:(BOOL)switchStatus { - [self.userInfo.userVipInfoVO setVisitListView:switchStatus]; - [self switchUpdateEnd]; -} - -- (void)changeVisitHideLimitFail { - [self switchUpdateEnd]; -} - -- (void)switchUpdateEnd { - [self.tableView reloadData]; - self.tableView.userInteractionEnabled = YES; -} - - - -#pragma mark - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - return 20; -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - return [UILabel labelInitWithText:YMLocalizedString(@"VipSettin_1.0.17_1") - font:kFontSemibold(16) - textColor:UIColorFromRGB(0x313131)]; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 84; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return VIP_Settings_Num; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - VipSettingCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([VipSettingCell class])]; - switch (indexPath.row) { - case VIP_Settings_PreventFollow: - // 跟随进房 - cell.title = YMLocalizedString(@"VipSettin_1.0.17_2"); - cell.switchStatus = self.userInfo.userVipInfoVO.preventFollow; - cell.minLevel = 5; - break; - case VIP_Settings_PreventTrace: - // 关注 - cell.title = YMLocalizedString(@"VipSettin_1.0.17_3"); - cell.switchStatus = self.userInfo.userVipInfoVO.preventTrace; - cell.minLevel = 6; - break; - case VIP_Settings_VisitHide: - cell.title = YMLocalizedString(@"20.20.51_text_17"); - cell.switchStatus = self.userInfo.userVipInfoVO.visitListView; - cell.minLevel = 6; - break; - case VIP_Settings_PrivateChatLimit: - // 勿打擾 - cell.title = YMLocalizedString(@"1.0.18_25"); - cell.switchStatus = self.userInfo.userVipInfoVO.privateChatLimit; - cell.minLevel = 7; - break; - case VIP_Settings_EnterHide: - // 隐身进房 - cell.title = YMLocalizedString(@"VipSettin_1.0.17_4"); - cell.switchStatus = self.userInfo.userVipInfoVO.enterHide; - cell.minLevel = 7; - break; - case VIP_Settings_PreventKick: - // 防被踢 - cell.title = YMLocalizedString(@"VipSettin_1.0.17_5"); - cell.switchStatus = self.userInfo.userVipInfoVO.preventKick; - cell.minLevel = 8; - break; - default: - break; - } - cell.maxLevel = 9; - cell.index = indexPath.row; - - @kWeakify(self); - [cell setSwitchUpdate:^(BOOL switchState, NSInteger index) { - @kStrongify(self); - [self handleSwitchUpdate:switchState atIndex:index]; - }]; - - return cell; -} - -#pragma mark - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero - style:UITableViewStylePlain]; - _tableView.scrollEnabled = NO; - _tableView.backgroundColor = [UIColor clearColor]; - if (isMSZH()) { - - } - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - [_tableView registerClass:[VipSettingCell class] - forCellReuseIdentifier:NSStringFromClass([VipSettingCell class])]; - } - return _tableView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/VisitorListViewController.h b/YuMi/Modules/YMMine/View/VisitorListViewController.h deleted file mode 100644 index 7120c1e..0000000 --- a/YuMi/Modules/YMMine/View/VisitorListViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// VisitorListViewController.h -// YuMi -// -// Created by P on 2025/3/18. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface VisitorListViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/VisitorListViewController.m b/YuMi/Modules/YMMine/View/VisitorListViewController.m deleted file mode 100644 index 4b263c5..0000000 --- a/YuMi/Modules/YMMine/View/VisitorListViewController.m +++ /dev/null @@ -1,76 +0,0 @@ -// -// VisitorListViewController.m -// YuMi -// -// Created by P on 2025/3/18. -// - -#import "VisitorListViewController.h" -#import "XPMineVisitorPresenter.h" - -@interface VisitorListCell : UITableViewCell - -@property(nonatomic, strong) NetImageView *avatarImageView; -@property(nonatomic, strong) UILabel *nameLabel; -@property(nonatomic, strong) NetImageView *regionImageView; -@property(nonatomic, strong) NetImageView *charmImageView; -@property(nonatomic, strong) NetImageView *experImageView; -@property(nonatomic, strong) NetImageView *nameplateImageView; -@property(nonatomic, strong) UILabel *idLabel; -@property(nonatomic, strong) UILabel *descriptionLabel; - -@end - -@implementation VisitorListCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - - } - return self; -} - -@end - -@interface VisitorListViewController () - -@property(nonatomic, strong) UITableView *listTableView; - -@property(nonatomic, strong) UIVisualEffectView *visualEffectView; - - -@end - -@implementation VisitorListViewController - -- (__kindof id)presenter { - return [[XPMineVisitorPresenter alloc] init]; -} - - -- (void)viewDidLoad { - [super viewDidLoad]; -} - -#pragma mark - -- (UITableView *)listTableView { - if (!_listTableView) { - _listTableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - } - return _listTableView; -} - -- (UIImageView *)lockImageView { - return [[UIImageView alloc] initWithImage:kImage(@"visitor_lock")]; -} - -- (UILabel *)lockTipsLabel { - return [UILabel labelInitWithText:YMLocalizedString(@"20.20.51_text_25") font:kFontMedium(14) textColor:UIColorFromRGB(0x313131)]; -} - -- (UIButton *)lockToVipButton { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - return button; -} - -@end diff --git a/YuMi/Modules/YMMine/View/XPButton.h b/YuMi/Modules/YMMine/View/XPButton.h deleted file mode 100644 index ab0cf30..0000000 --- a/YuMi/Modules/YMMine/View/XPButton.h +++ /dev/null @@ -1,43 +0,0 @@ -// -// YMButton.h -// YUMI -// -// Created by XY on 2023/2/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, XPButtonStyle){ - XPButtonImageLeft = 0, //图片在左 - XPButtonImageRight = 1, //图片在右 - XPButtonImageTop = 2, //图片在上 - XPButtonImageBottom = 3, //图片在下 -}; - -@interface XPButton : UIButton - -/** - 图片的位置，上、下、左、右，默认是图片居左 - */ -@property (nonatomic, assign) XPButtonStyle buttonStyle; - -/** - 文字与图片之间的间距，默认是0 - */ -@property (nonatomic, assign) CGFloat padding; - -/** - 创建button - - @param buttonType button的类型 - @param space 图片距离button的边距，如果图片比较大的，此时有效果； - 如果图片比较小，没有效果，默认居中； - @return button - */ -+ (id)buttonWithType:(UIButtonType)buttonType withSpace:(CGFloat)space; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPButton.m b/YuMi/Modules/YMMine/View/XPButton.m deleted file mode 100644 index ff4ab3b..0000000 --- a/YuMi/Modules/YMMine/View/XPButton.m +++ /dev/null @@ -1,80 +0,0 @@ -// -// YMButton.m -// YUMI -// -// Created by XY on 2023/2/21. -// - -#import "XPButton.h" - -@interface XPButton() - -/** - 图片距离上下的距离 - */ -@property (nonatomic, assign) CGFloat space; - -@end - -@implementation XPButton - -+ (id)buttonWithType:(UIButtonType)buttonType withSpace:(CGFloat)space { - XPButton *button = [super buttonWithType:buttonType]; - button.space = space; - return button; -} - -- (void)layoutSubviews { - [super layoutSubviews]; - //文案的宽度 - CGFloat labelWidth = self.titleLabel.frame.size.width; - //文案的高度 - CGFloat labelHeight = self.titleLabel.frame.size.height; - //button的image - UIImage *image = self.imageView.image; - - switch (self.buttonStyle) { - case XPButtonImageLeft: { - //设置后的image显示的高度 - CGFloat imageHeight = self.frame.size.height - (2 * self.space); - //文案和图片居中显示时距离两边的距离 - CGFloat edgeSpace = (self.frame.size.width - imageHeight - labelWidth - self.padding) / 2; - self.imageEdgeInsets = UIEdgeInsetsMake(self.space, edgeSpace, self.space, edgeSpace + labelWidth + self.padding); - self.titleEdgeInsets = UIEdgeInsetsMake(0, -image.size.width + imageHeight + self.padding, 0, 0); - } - break; - case XPButtonImageRight: { - //设置后的image显示的高度 - CGFloat imageHeight = self.frame.size.height - (2 * self.space); - //文案和图片居中显示时距离两边的距离 - CGFloat edgeSpace = (self.frame.size.width - imageHeight - labelWidth - self.padding) / 2; - self.imageEdgeInsets = UIEdgeInsetsMake(self.space, edgeSpace + labelWidth + self.padding, self.space, edgeSpace); - self.titleEdgeInsets = UIEdgeInsetsMake(0, -image.size.width - self.padding - imageHeight, 0, 0); - } - break; - case XPButtonImageTop: { - //设置后的image显示的高度 - CGFloat imageHeight = self.frame.size.height - (2 * self.space) - labelHeight - self.padding; - if (imageHeight > image.size.height) { - imageHeight = image.size.height; - } - self.imageEdgeInsets = UIEdgeInsetsMake(self.space, (self.frame.size.width - imageHeight) / 2, self.space + labelHeight + self.padding, (self.frame.size.width - imageHeight) / 2); - self.titleEdgeInsets = UIEdgeInsetsMake(self.space + imageHeight + self.padding, -image.size.width, self.space, 0); - } - break; - case XPButtonImageBottom: { - //设置后的image显示的高度 - CGFloat imageHeight = self.frame.size.height - (2 * self.space) - labelHeight - self.padding; - if (imageHeight > image.size.height) { - imageHeight = image.size.height; - } - self.imageEdgeInsets = UIEdgeInsetsMake(self.space + labelHeight + self.padding, (self.frame.size.width - imageHeight) / 2, self.space, (self.frame.size.width - imageHeight) / 2); - self.titleEdgeInsets = UIEdgeInsetsMake(self.space, -image.size.width, self.padding + imageHeight + self.space, 0); - } - break; - default: - break; - } -} - -@end diff --git a/YuMi/Modules/YMMine/View/XPGameOrdersListViewController.h b/YuMi/Modules/YMMine/View/XPGameOrdersListViewController.h deleted file mode 100644 index b9e80bd..0000000 --- a/YuMi/Modules/YMMine/View/XPGameOrdersListViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPGameOrdersListViewController.h -// YuMi -// -// Created by P on 2024/7/9. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGameOrdersListViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPGameOrdersListViewController.m b/YuMi/Modules/YMMine/View/XPGameOrdersListViewController.m deleted file mode 100644 index af87510..0000000 --- a/YuMi/Modules/YMMine/View/XPGameOrdersListViewController.m +++ /dev/null @@ -1,354 +0,0 @@ -// -// XPGameOrdersListViewController.m -// YuMi -// -// Created by P on 2024/7/9. -// - -#import "XPGameOrdersListViewController.h" -#import "XPGameOrdersListTableViewCell.h" -#import "XPMineUserDataPresenter.h" -#import -#import "SessionViewController.h" -#import "XPMineGamePartnerInfoModel.h" -#import "XPMineGameMateOrderView.h" -#import "XPMineUserDataPresenter.h" - -@interface XPGameOrdersListViewController () - -@property (nonatomic, assign) NSInteger page; -@property (nonatomic, assign) NSInteger type; - -@property (nonatomic, strong) UIStackView *topStack; - -@property (nonatomic, strong) UIButton *tab_1_button; -@property (nonatomic, strong) UIButton *tab_2_button; -@property (nonatomic, strong) UIView *underLine; - -@property (nonatomic, strong) UITableView *myOrderTableView; -@property (nonatomic, strong) UITableView *acceptOrderTableView; - -@property (nonatomic, strong) NSMutableArray *myOrders; -@property (nonatomic, strong) NSMutableArray *acceptOrders; - -@end - -@implementation XPGameOrdersListViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.type = 0; - self.title = YMLocalizedString(@"GameOrderContent_8"); - self.myOrders = @[].mutableCopy; - self.acceptOrders = @[].mutableCopy; - self.tab_1_button.selected = YES; - [self setup]; - [self initHeaderAndFooterRefresh:self.myOrderTableView]; - [self headerRefresh]; -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear: animated]; -} - -- (__kindof id)createPresenter { - return [[XPMineUserDataPresenter alloc] init]; -} - -- (void)createHeaderFor:(UITableView *)tableView { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - tableView.mj_header = header; -} - -- (void)createFooterFor:(UITableView *)tableView { - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - tableView.mj_footer = footer; -} - -- (void)initHeaderAndFooterRefresh:(UITableView *)tableView { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - tableView.mj_footer = footer; -} - -- (void)headerRefresh { - self.page = 1; - - if (self.type == 0) { - self.myOrders = @[].mutableCopy; - } else { - self.acceptOrders = @[].mutableCopy; - } - - @kWeakify(self); - [self.presenter loadGameOrderRecord:^(NSArray * _Nonnull orderRecords){ - @kStrongify(self); - if (self.type == 0) { - [self.myOrders addObjectsFromArray:orderRecords]; - [self.myOrderTableView reloadData]; - [self.myOrderTableView.mj_header endRefreshing]; - } else { - [self.acceptOrders addObjectsFromArray:orderRecords]; - [self.acceptOrderTableView reloadData]; - [self.acceptOrderTableView.mj_header endRefreshing]; - } - } failure:^(NSString * _Nonnull msg) { - @kStrongify(self); - if (self.type == 0) { - [self.myOrderTableView.mj_header endRefreshing]; - } else { - [self.acceptOrderTableView.mj_header endRefreshing]; - } - } page:self.page type:self.type]; -} - -- (void)footerRefresh { - self.page++; - @kWeakify(self); - [self.presenter loadGameOrderRecord:^(NSArray * _Nonnull orderRecords){ - @kStrongify(self) - if (self.type == 0) { - [self.myOrders addObjectsFromArray:orderRecords]; - [self.myOrderTableView reloadData]; - [self.myOrderTableView.mj_footer endRefreshing]; - } else { - [self.acceptOrders addObjectsFromArray:orderRecords]; - [self.acceptOrderTableView reloadData]; - [self.acceptOrderTableView.mj_footer endRefreshing]; - } - } failure:^(NSString * _Nonnull msg) { - @kStrongify(self); - if (self.type == 0) { - [self.myOrderTableView.mj_footer endRefreshing]; - } else { - [self.acceptOrderTableView.mj_footer endRefreshing]; - } - } page:self.page type:self.type]; -} - -- (void)setup { - self.view.backgroundColor = UIColorFromRGB(0xf9f9f9); - - UIStackView *topStack = [[UIStackView alloc] init]; - topStack.axis = UILayoutConstraintAxisHorizontal; - topStack.distribution = UIStackViewDistributionFill; - if (isMSRTL()) { - topStack.alignment = UIStackViewAlignmentTrailing; - } else { - topStack.alignment = UIStackViewAlignmentLeading; - } - topStack.spacing = 30; - [topStack addArrangedSubview:self.tab_1_button]; - [topStack addArrangedSubview:self.tab_2_button]; - [self.view addSubview:topStack]; - self.topStack = topStack; - [topStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(36); - make.top.mas_equalTo(13); - make.leading.mas_equalTo(13); - }]; - - [topStack addSubview:self.underLine]; - [self.underLine mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.tab_1_button.mas_bottom).offset(-4); - make.centerX.mas_equalTo(self.tab_1_button); - make.size.mas_equalTo(CGSizeMake(14, 3)); - }]; - - [self.view addSubview:self.myOrderTableView]; - [self.myOrderTableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(topStack.mas_bottom); - }]; - - [self.view addSubview:self.acceptOrderTableView]; - [self.acceptOrderTableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(topStack.mas_bottom); - }]; -} - -- (IBAction)didTapButton1:(id)sender { - self.tab_1_button.selected = YES; - self.tab_2_button.selected = NO; - [self.underLine mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.tab_1_button.mas_bottom).offset(-4); - make.centerX.mas_equalTo(self.tab_1_button); - make.size.mas_equalTo(CGSizeMake(14, 3)); - }]; - - self.myOrderTableView.hidden = NO; - self.acceptOrderTableView.hidden = YES; - self.myOrderTableView.userInteractionEnabled = YES; - self.acceptOrderTableView.userInteractionEnabled = NO; - - self.type = 0; - if (self.myOrders.count == 0) { - [self headerRefresh]; - } -} - -- (IBAction)didTapButton2:(id)sender { - if (self.acceptOrderTableView.mj_header == nil) { - [self initHeaderAndFooterRefresh:self.acceptOrderTableView]; - } - self.tab_1_button.selected = NO; - self.tab_2_button.selected = YES; - [self.underLine mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.tab_2_button.mas_bottom).offset(-4); - make.centerX.mas_equalTo(self.tab_2_button); - make.size.mas_equalTo(CGSizeMake(14, 3)); - }]; - - self.myOrderTableView.hidden = YES; - self.acceptOrderTableView.hidden = NO; - self.myOrderTableView.userInteractionEnabled = NO; - self.acceptOrderTableView.userInteractionEnabled = YES; - - self.type = 1; - if (self.acceptOrders.count == 0) { - [self headerRefresh]; - } -} - -#pragma mark - UITable DataSource & Delegate -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - if (tableView == self.myOrderTableView) { - return self.myOrders.count; - } else { - return self.acceptOrders.count; - } -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 262 + 16 + 16; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPGameOrdersListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPGameOrdersListTableViewCell class]) - forIndexPath:indexPath]; - if (tableView == self.myOrderTableView) { - cell.model = [self.myOrders xpSafeObjectAtIndex:indexPath.row]; - } else { - cell.model = [self.acceptOrders xpSafeObjectAtIndex:indexPath.row]; - } - cell.type = self.type; - - cell.selectionStyle = UITableViewCellSelectionStyleNone; - - @kWeakify(self); - cell.didTapChat = ^(XPMineGameOrderRecoredModel * _Nonnull model, NSInteger type) { - @kStrongify(self); - NSInteger uid = type == 0 ? model.toUid : model.fromUid; - NIMSession * session = [NIMSession session:@(uid).stringValue type:NIMSessionTypeP2P]; - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:session]; - [self.navigationController pushViewController:sessionVC animated:YES]; - }; - - cell.didTapPlayAgain = ^(XPMineGameOrderRecoredModel * _Nonnull record) { - @kStrongify(self); - XPMineGameMateOrderView *view = [[XPMineGameMateOrderView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight - kNavigationHeight)]; - [self.view addSubview:view]; - view.infoModel = [XPMineGamePartnerInfoModel modelFromRecord:record]; - // model 要轉換 - @kWeakify(self); - @kWeakify(view); - view.payForGame = ^(NSInteger round) { - @kStrongify(self); - @kStrongify(view); - XPMineUserDataPresenter *udp = [[XPMineUserDataPresenter alloc] init]; - [udp submitOrder:^{ - [self showSuccessToast:YMLocalizedString(@"GameOrderContent_18")]; - [view removeFromSuperview]; - } failure:^(NSString * _Nonnull msg) { - [self showErrorToast:msg]; - } - gameId:view.infoModel.gameId - gameUid:view.infoModel.uid - inning:round]; - }; - }; - - return cell; -} - -#pragma mark - -- (UITableView *)myOrderTableView { - if (!_myOrderTableView) { - _myOrderTableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _myOrderTableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _myOrderTableView.backgroundColor = [UIColor clearColor]; - _myOrderTableView.dataSource = self; - _myOrderTableView.delegate = self; - _myOrderTableView.separatorStyle = UITableViewCellSeparatorStyleNone; - [_myOrderTableView registerClass:[XPGameOrdersListTableViewCell class] - forCellReuseIdentifier:NSStringFromClass([XPGameOrdersListTableViewCell class])]; - } - return _myOrderTableView; -} - -- (UITableView *)acceptOrderTableView { - if (!_acceptOrderTableView) { - _acceptOrderTableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _acceptOrderTableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _acceptOrderTableView.backgroundColor = [UIColor clearColor]; - _acceptOrderTableView.dataSource = self; - _acceptOrderTableView.delegate = self; - _acceptOrderTableView.userInteractionEnabled = NO; - _acceptOrderTableView.separatorStyle = UITableViewCellSeparatorStyleNone; - [_acceptOrderTableView registerClass:[XPGameOrdersListTableViewCell class] - forCellReuseIdentifier:NSStringFromClass([XPGameOrdersListTableViewCell class])]; - } - return _acceptOrderTableView; -} - -- (UIButton *)tab_1_button { - if (!_tab_1_button) { - _tab_1_button = [UIButton buttonWithType:UIButtonTypeCustom]; - [_tab_1_button setTitle:YMLocalizedString(@"GameOrderContent_9") forState:UIControlStateNormal]; - [_tab_1_button.titleLabel setFont:kFontBold(14)]; - [_tab_1_button setTitleColor:[UIColor blackColor] forState:UIControlStateSelected]; - [_tab_1_button setTitleColor:[UIColor colorWithWhite:0 alpha:0.4] forState:UIControlStateNormal]; - [_tab_1_button addTarget:self action:@selector(didTapButton1:) forControlEvents:UIControlEventTouchUpInside]; - } - return _tab_1_button; -} - -- (UIButton *)tab_2_button { - if (!_tab_2_button) { - _tab_2_button = [UIButton buttonWithType:UIButtonTypeCustom]; - [_tab_2_button setTitle:YMLocalizedString(@"GameOrderContent_10") forState:UIControlStateNormal]; - [_tab_2_button.titleLabel setFont:kFontBold(14)]; - [_tab_2_button setTitleColor:[UIColor blackColor] forState:UIControlStateSelected]; - [_tab_2_button setTitleColor:[UIColor colorWithWhite:0 alpha:0.4] forState:UIControlStateNormal]; - [_tab_2_button addTarget:self action:@selector(didTapButton2:) forControlEvents:UIControlEventTouchUpInside]; - } - return _tab_2_button; -} - -- (UIView *)underLine { - if (!_underLine) { - _underLine = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 14, 3)]; - [_underLine setBackgroundColor:UIColorFromRGB(0x0fca81)]; - _underLine.layer.cornerRadius = 1.5; - _underLine.layer.masksToBounds = YES; - } - return _underLine; -} - -@end diff --git a/YuMi/Modules/YMMine/View/XPGiftUserDataViewController.h b/YuMi/Modules/YMMine/View/XPGiftUserDataViewController.h deleted file mode 100644 index 9c71099..0000000 --- a/YuMi/Modules/YMMine/View/XPGiftUserDataViewController.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPGiftUserDataViewController.h -// xplan-ios -// -// Created by duoban on 2022/10/11. -// - -#import -#import "MvpViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel, MineSkillCardListInfoModel, XPMineUserDataViewController; - - -@interface XPGiftUserDataViewController : MvpViewController -@property (nonatomic,copy) NSString *userUid; -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPGiftUserDataViewController.m b/YuMi/Modules/YMMine/View/XPGiftUserDataViewController.m deleted file mode 100644 index 5bc1f1c..0000000 --- a/YuMi/Modules/YMMine/View/XPGiftUserDataViewController.m +++ /dev/null @@ -1,158 +0,0 @@ -// -// XPGiftUserDataViewController.m -// xplan-ios -// -// Created by duoban on 2022/10/11. -// - -#import "XPGiftUserDataViewController.h" -///Third -#import -///Tool -#import "AccountInfoStorage.h" - -///View - -#import "XPMineDataGiftTableViewCell.h" -///Model - -#import "UserInfoModel.h" - - - -///View - -#import "XPMineUserInfoGiftWallViewController.h" - -@interface XPGiftUserDataViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; - - -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); - -@end - -@implementation XPGiftUserDataViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - - - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHettpRequest]; - [self initSubViews]; - [self initSubViewConstraints]; - -} -#pragma mark - Http -- (void)initHettpRequest { - -} -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; - -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return 1; - -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - - return kGetScaleWidth(385); -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - - XPMineDataGiftTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineDataGiftTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineDataGiftTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineDataGiftTableViewCell class])]; - } - - cell.delegate = self; - cell.userGiftWall = self.userInfo.userGiftWall; - cell.userLuckyBagGiftWall = self.userInfo.userLuckyBagGiftWall; - return cell; - -} - - - - - - - -#pragma mark - XPMineDataGiftTableViewCellDelegate -- (void)xPMineDataGiftTableViewCell:(XPMineDataGiftTableViewCell *)view didClickMore:(UIButton *)sender { - XPMineUserInfoGiftWallViewController * giftWallVC = [[XPMineUserInfoGiftWallViewController alloc] init]; - giftWallVC.userUid = self.userUid; - [self.navigationController pushViewController:giftWallVC animated:YES]; -} - - -#pragma mark - JXPagingViewListViewDelegate -- (UIView *)listView { - return self.view; -} - -- (UIScrollView *)listScrollView { - return self.tableView; -} - -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - self.scrollCallback = callback; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - self.scrollCallback(scrollView); -} - - - - - - - -#pragma mark - Getters And Setters -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - [self.tableView reloadData]; -// [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:2] withRowAnimation:UITableViewRowAnimationNone]; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineDataGiftTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineDataGiftTableViewCell class])]; - - } - return _tableView; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.h b/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.h deleted file mode 100644 index 6fa44ae..0000000 --- a/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineCollectRoomListViewController.h -// YUMI -// -// Created by YUMI on 2022/7/27. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineCollectRoomListViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m b/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m deleted file mode 100644 index 15260af..0000000 --- a/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m +++ /dev/null @@ -1,333 +0,0 @@ -// -// YMMineCollectRoomListViewController.m -// YUMI -// -// Created by YUMI on 2022/7/27. -// - -#import "XPMineCollectRoomListViewController.h" -///Third -#import -#import -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -///Model -#import "HomeCollectRoomModel.h" -///View -#import "XPHomeCollectRoomTableViewCell.h" -#import "XPMineVisitorEmptyTableViewCell.h" -///P -#import "XPMineCollectRoomListPresenter.h" -#import "XPMineCollectRoomListProtocol.h" -///VC -#import "XPRoomViewController.h" -#import "XPMineCollectPartyRoomViewController.h" - -///记录最后选中的tab -static NSString *lastSelectTab = @"lastSelectTab"; - -@interface XPMineCollectRoomListViewController () - -@property (nonatomic, strong) JXCategoryListContainerView *listContainerView; -///标题 -@property (nonatomic,strong) NSArray *titles; -///滑块 -@property (nonatomic,strong) JXCategoryTitleView *titleView; - -@property (nonatomic,strong) XPMineCollectPartyRoomViewController *partyVC; -///个播房的 -@property (nonatomic, strong) XPMineCollectPartyRoomViewController *anchorRoomListVC; - -///更多数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///底部编辑容器 -@property (nonatomic, strong) UIView *bottomView; -///全选按钮 -@property (nonatomic, strong) UIButton *allSelectBtn; -///删除按钮 -@property (nonatomic, strong) UIButton *deleteBtn; -///管理 -@property (nonatomic, strong) UIButton *managerBtn; - -@end - -@implementation XPMineCollectRoomListViewController - -- (XPMineCollectRoomListPresenter *)createPresenter { - return [[XPMineCollectRoomListPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)managerBtnAction:(UIButton *)sender { - sender.selected = !sender.isSelected; - if (sender.isSelected) {//开始编辑 - self.partyVC.isEdit = YES; - self.anchorRoomListVC.isEdit = YES; - self.bottomView.hidden = NO; - } else {//完成编辑 - self.bottomView.hidden = YES; - self.allSelectBtn.selected = NO; - self.partyVC.isEdit = NO; - self.anchorRoomListVC.isEdit = NO; - self.allSelectBtn.selected = NO; - } -} - -#pragma mark - JXCategoryListContainerViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -// 根据下标 index 返回对应遵守并实现 `JXCategoryListContentViewDelegate` 协议的列表实例 -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.partyVC; - }else if (index == 1) { - return self.anchorRoomListVC; - } - return nil; -} - -#pragma mark - JXCategoryViewDelegate -- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index { - //记录最后选中的index - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - [defaults setObject:@(index) forKey:lastSelectTab]; - [defaults synchronize]; - - self.managerBtn.selected = NO; - self.allSelectBtn.selected = NO; - self.bottomView.hidden = YES; - self.partyVC.isEdit = NO; - self.anchorRoomListVC.isEdit = NO; -} - -#pragma mark - XPMineCollectRoomListProtocol -- (void)deleteCollectRoomSuccess { - [self showSuccessToast:YMLocalizedString(@"XPMineCollectRoomListViewController0")]; - if (self.titleView.selectedIndex == 0) { - [self.partyVC headerRefresh]; - } else { - [self.anchorRoomListVC headerRefresh]; - } - self.allSelectBtn.selected = NO; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineCollectRoomListViewController1"); - [self.view addSubview:self.titleView]; - [self.view addSubview:self.listContainerView]; - [self.view addSubview:self.bottomView]; - [self.bottomView addSubview:self.allSelectBtn]; - [self.bottomView addSubview:self.deleteBtn]; -} - -- (void)initSubViewConstraints { - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.width.mas_equalTo(180); - make.top.mas_equalTo(0); - make.height.mas_equalTo(44); - }]; - [self.listContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.titleView.mas_bottom); - }]; - [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(64+kSafeAreaBottomHeight); - make.leading.bottom.trailing.mas_equalTo(0); - }]; - [self.allSelectBtn mas_makeConstraints:^(MASConstraintMaker *make) { - - make.height.mas_equalTo(22); - make.leading.mas_equalTo(15); - make.top.mas_equalTo(18); - }]; - [self.deleteBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-15); - make.centerY.mas_equalTo(self.allSelectBtn); - make.size.mas_equalTo(CGSizeMake(72, 24)); - }]; -} - -#pragma mark - action -- (void)allSelectBtnAction:(UIButton *)sender { - sender.selected = !sender.selected; - if (self.titleView.selectedIndex == 0) { - self.partyVC.isSelectAll = sender.selected; - } else { - self.anchorRoomListVC.isSelectAll = sender.selected; - } -} - -- (void)deleteBtnAction:(UIButton *)sender { - if (self.titleView.selectedIndex == 0) { - NSMutableArray *roomUidsArray = [NSMutableArray array]; - for (HomeCollectRoomModel *model in self.partyVC.datasource) { - if (model.isSelected) { - [roomUidsArray addObject:model.roomUid]; - } - } - if (roomUidsArray.count) { - NSString *roomUids = [roomUidsArray componentsJoinedByString:@","]; - [self.presenter deletecollectRoomWithRoomUids:roomUids]; - } else { - [self showErrorToast:YMLocalizedString(@"XPMineCollectRoomListViewController2")]; - } - } else { - NSMutableArray *roomUidsArray = [NSMutableArray array]; - for (HomeCollectRoomModel *model in self.anchorRoomListVC.datasource) { - if (model.isSelected) { - [roomUidsArray addObject:model.roomUid]; - } - } - if (roomUidsArray.count) { - NSString *roomUids = [roomUidsArray componentsJoinedByString:@","]; - [self.presenter deletecollectRoomWithRoomUids:roomUids]; - } else { - [self showErrorToast:YMLocalizedString(@"XPMineCollectRoomListViewController3")]; - } - } -} - -#pragma mark XPMineCollectPartyRoomViewControllerDelegate -///全选 -- (void)xPMineCollectPartyRoomViewControllerSelectAll:(BOOL)selectAll { - self.allSelectBtn.selected = selectAll; -} - -#pragma mark - Getters And Setters -- (UIView *)bottomView { - if (!_bottomView) { - _bottomView = [[UIView alloc] init]; - _bottomView.backgroundColor = [UIColor whiteColor]; - _bottomView.hidden = YES; - UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, 64+kSafeAreaBottomHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(8, 8)]; - CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init]; - maskLayer.frame = CGRectMake(0, 0, KScreenWidth, 64+kSafeAreaBottomHeight); - maskLayer.path = maskPath.CGPath; - _bottomView.layer.mask = maskLayer; - } - return _bottomView; -} - -- (UIButton *)allSelectBtn { - if (!_allSelectBtn) { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - button.titleLabel.font = [UIFont systemFontOfSize:16]; - [button addTarget:self action:@selector(allSelectBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - [button setTitle:YMLocalizedString(@"XPMineCollectRoomListViewController4") forState:UIControlStateNormal]; - [button setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - [button setImage:[UIImage imageNamed:@"collect_room_edit_normal"] forState:UIControlStateNormal]; - [button setImage:[UIImage imageNamed:@"collect_room_edit_selected"] forState:UIControlStateSelected]; - _allSelectBtn = button; - } - return _allSelectBtn; -} - -- (UIButton *)managerBtn { - if (!_managerBtn) { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - button.titleLabel.font = [UIFont systemFontOfSize:13]; - [button addTarget:self action:@selector(managerBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - [button setTitle:YMLocalizedString(@"XPMineCollectRoomListViewController5") forState:UIControlStateNormal]; - [button setTitle:YMLocalizedString(@"XPMineCollectRoomListViewController6") forState:UIControlStateSelected]; - [button setTitleColor:UIColorFromRGB(0x999999) forState:UIControlStateNormal]; - _managerBtn = button; - } - return _managerBtn; -} - -- (UIButton *)deleteBtn { - if (!_deleteBtn) { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - button.titleLabel.font = [UIFont systemFontOfSize:14]; - [button addTarget:self action:@selector(deleteBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - [button setTitle:YMLocalizedString(@"XPMineCollectRoomListViewController7") forState:UIControlStateNormal]; - [button setTitleColor:UIColorFromRGB(0xFB486A) forState:UIControlStateNormal]; - button.layer.cornerRadius = 12; - button.layer.masksToBounds = YES; - button.layer.borderWidth = 1; - button.layer.borderColor = UIColorFromRGB(0xFB486A).CGColor; - _deleteBtn = button; - } - return _deleteBtn; -} - -#pragma mark - Getters And Setters -- (JXCategoryListContainerView *)listContainerView { - if (!_listContainerView) { - _listContainerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _listContainerView.scrollView.scrollEnabled = YES; - _listContainerView.scrollView.tag = 1000; - _listContainerView.listCellBackgroundColor = [UIColor clearColor]; - } - return _listContainerView; -} - -- (XPMineCollectPartyRoomViewController *)partyVC { - if (!_partyVC) { - _partyVC = [[XPMineCollectPartyRoomViewController alloc] init]; - _partyVC.type = MineCollectRoomTypeParty; - _partyVC.delegate = self; - } - return _partyVC; -} - -- (XPMineCollectPartyRoomViewController *)anchorRoomListVC { - if (!_anchorRoomListVC) { - _anchorRoomListVC = [[XPMineCollectPartyRoomViewController alloc] init]; - _anchorRoomListVC.type = MineCollectRoomTypeAnchor; - _anchorRoomListVC.delegate = self; - } - return _anchorRoomListVC; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMineCollectRoomListViewController8")]; - } - return _titles; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] initWithFrame:CGRectZero]; - _titleView.backgroundColor =[UIColor clearColor]; - _titleView.titleColor = [DJDKMIMOMColor secondTextColor]; - _titleView.titleSelectedColor = [DJDKMIMOMColor mainTextColor]; - _titleView.titleFont = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; - _titleView.titleSelectedFont = [UIFont systemFontOfSize:14 weight:UIFontWeightHeavy]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.averageCellSpacingEnabled = YES; - _titleView.listContainer = self.listContainerView; - _titleView.titles = self.titles; - _titleView.delegate = self; - - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSNumber *index = [defaults objectForKey:lastSelectTab]; - _titleView.defaultSelectedIndex = index.intValue; - - JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.indicatorImageViewSize = CGSizeMake(50, 8); - lineView.verticalMargin = 12; - lineView.indicatorImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x5BC8F8),UIColorFromRGB(0x66D9D9)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(50, 8)]; - lineView.indicatorImageView.layer.masksToBounds = YES; - lineView.indicatorImageView.layer.cornerRadius = 4; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/XPMineFansTeamViewController.h b/YuMi/Modules/YMMine/View/XPMineFansTeamViewController.h deleted file mode 100644 index a127c64..0000000 --- a/YuMi/Modules/YMMine/View/XPMineFansTeamViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineFansTeamViewController.h -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineFansTeamViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPMineFansTeamViewController.m b/YuMi/Modules/YMMine/View/XPMineFansTeamViewController.m deleted file mode 100644 index a2e81ff..0000000 --- a/YuMi/Modules/YMMine/View/XPMineFansTeamViewController.m +++ /dev/null @@ -1,135 +0,0 @@ -// -// YMMineFansTeamViewController.m -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "XPMineFansTeamViewController.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -#import "ClientConfig.h" -///Model -#import "XPMineAnchorFansTeamModel.h" -///View -#import "XPMineAnchorFansTeamTableViewCell.h" -#import "XPMineVisitorEmptyTableViewCell.h" -///P -#import "XPMineFansTeamPresenter.h" -#import "XPMineAnchorFansTeamProtocol.h" -///VC -#import "XPMineUserInfoViewController.h" - -#import "SessionViewController.h" - -@interface XPMineFansTeamViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前页数 -@property (nonatomic,assign) int page; -///更多数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -@end - -@implementation XPMineFansTeamViewController - -- (XPMineFansTeamPresenter *)createPresenter { - return [[XPMineFansTeamPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self.presenter getAnchorFansTeamList:self.page pageSize:100 state:0]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineFansTeamViewController0"); - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - XPMineAnchorFansTeamProtocol -- (void)getAnchorFansTeamListSuccess:(NSArray *)array state:(int)state { - [self.datasource addObjectsFromArray:array]; - [self.tableView reloadData]; -} - -- (void)getAnchorFansTeamListFail:(int)state { - [self.tableView reloadData]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMineAnchorFansTeamTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineAnchorFansTeamTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineAnchorFansTeamTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineAnchorFansTeamTableViewCell class])]; - } - cell.item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } - - XPMineVisitorEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineVisitorEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - } - cell.emptyTitle = YMLocalizedString(@"XPMineFansTeamViewController1"); - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - XPMineAnchorFansTeamModel *item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = item.teamUid; - [self.navigationController pushViewController:userInfoVC animated:YES]; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? 56 : 400; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.rowHeight = 56; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineVisitorEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - [_tableView registerClass:[XPMineAnchorFansTeamTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineAnchorFansTeamTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - - -@end diff --git a/YuMi/Modules/YMMine/View/XPMineFootPrintViewController.h b/YuMi/Modules/YMMine/View/XPMineFootPrintViewController.h deleted file mode 100644 index 69328c8..0000000 --- a/YuMi/Modules/YMMine/View/XPMineFootPrintViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineFootPrintViewController.h -// YUMI -// -// Created by YUMI on 2022/7/26. -// 足迹/进房记录 - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineFootPrintViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPMineFootPrintViewController.m b/YuMi/Modules/YMMine/View/XPMineFootPrintViewController.m deleted file mode 100644 index 6369250..0000000 --- a/YuMi/Modules/YMMine/View/XPMineFootPrintViewController.m +++ /dev/null @@ -1,248 +0,0 @@ -// -// YMMineFootPrintViewController.m -// YUMI -// -// Created by YUMI on 2022/7/26. -// - -#import "XPMineFootPrintViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///Model -#import "XPMineFootPrintModel.h" -///View -#import "XPMineFootPrintTableViewCell.h" -#import "XPMineVisitorEmptyTableViewCell.h" -#import "XPFootPrintNavView.h" -///P -#import "XPMineFootPrintPresenter.h" -#import "XPMineFootPrintProtocol.h" -///VC -#import "XPRoomViewController.h" - -@interface XPMineFootPrintViewController() - -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前页数 -@property (nonatomic,assign) int page; -///更多数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -@property (nonatomic, strong) XPFootPrintNavView *navView; - -@end - -@implementation XPMineFootPrintViewController - -- (XPMineFootPrintPresenter *)createPresenter { - return [[XPMineFootPrintPresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - self.page = 1; - [self.presenter getFootPrintListWithPage:self.page pageSize:20 state:0]; -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMineFootPrintViewController0")]; - return; - } - self.page++; - [self.presenter getFootPrintListWithPage:self.page pageSize:20 state:1]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.navView]; - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.navView.mas_bottom); - }]; -} - -#pragma mark - XPMineFootPrintProtocol -- (void)getFootPrintListSuccess:(NSArray *)array state:(int)state { - if (state == 0) { - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } - [self.tableView.mj_footer endRefreshing]; - if (array.count > 0) { - self.hasNoMoreData = NO; - [self.datasource addObjectsFromArray:array]; - } else { - self.hasNoMoreData = YES; - [self.tableView.mj_footer endRefreshingWithNoMoreData]; - } - [self.tableView reloadData]; -} - -- (void)getFootPrintListFail:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -///清除进房记录成功 -- (void)cleanFootPrintSuccess { - [self showSuccessToast:YMLocalizedString(@"XPMineFootPrintViewController1")]; - [self headerRefresh]; -} - -- (void)collectRoomSuccess { - [self showSuccessToast:YMLocalizedString(@"XPMineFootPrintViewController2")]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMineFootPrintTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineFootPrintTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineFootPrintTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineFootPrintTableViewCell class])]; - } - cell.item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } - - XPMineVisitorEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineVisitorEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - } - cell.emptyTitle = YMLocalizedString(@"XPMineFootPrintViewController3"); - return cell; -} - -- (UISwipeActionsConfiguration *)tableView:(UITableView *)tableView trailingSwipeActionsConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath API_AVAILABLE(ios(11.0)){ - [tableView setEditing:NO animated:YES]; - __weak typeof(self) weakSelf = self; - UIContextualAction *deleteAction = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:YMLocalizedString(@"XPMineFootPrintViewController4") handler:^(UIContextualAction * _Nonnull action, __kindof UIView * _Nonnull sourceView, void (^ _Nonnull completionHandler)(BOOL)) { - XPMineFootPrintModel *item = [weakSelf.datasource xpSafeObjectAtIndex:indexPath.row]; - [weakSelf.presenter cleanFootPrint:item.roomUid]; - completionHandler(true); - }]; - UIContextualAction *collectAction = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleNormal title:YMLocalizedString(@"XPMineFootPrintViewController5") handler:^(UIContextualAction * _Nonnull action, __kindof UIView * _Nonnull sourceView, void (^ _Nonnull completionHandler)(BOOL)) { - XPMineFootPrintModel *item = [weakSelf.datasource xpSafeObjectAtIndex:indexPath.row]; - [weakSelf.presenter collectRoomWithRoomUid:item.roomUid]; - completionHandler(true); - }]; - deleteAction.backgroundColor = [DJDKMIMOMColor textThirdColor]; - collectAction.backgroundColor = UIColorFromRGB(0xFFA027); - UISwipeActionsConfiguration *actions = [UISwipeActionsConfiguration configurationWithActions:@[collectAction, deleteAction]]; - actions.performsFirstActionWithFullSwipe = NO; - return actions; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count == 0) { - return 85; - } else { - return 66; - } -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMineFootPrintModel *model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (model.roomUid.integerValue > 0) { - [XPRoomViewController openRoom:model.roomUid viewController:self]; - } - } -} - -#pragma mark - XPFootPrintNavViewDelegate -///点击了返回按钮 -- (void)xPFootPrintNavView:(XPFootPrintNavView *)view didClickBackButton:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} - -///点击了清除按钮 -- (void)xPFootPrintNavView:(XPFootPrintNavView *)view didClickClearButton:(UIButton *)sender { - [self.presenter cleanFootPrint:nil]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.rowHeight = 65; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineVisitorEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - [_tableView registerClass:[XPMineFootPrintTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineFootPrintTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -- (XPFootPrintNavView *)navView { - if (!_navView) { - _navView = [[XPFootPrintNavView alloc] init]; - _navView.delegate = self; - } - return _navView; -} - -@end diff --git a/YuMi/Modules/YMMine/View/XPMineItemTableViewCell.h b/YuMi/Modules/YMMine/View/XPMineItemTableViewCell.h deleted file mode 100644 index 937db63..0000000 --- a/YuMi/Modules/YMMine/View/XPMineItemTableViewCell.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMMineItemTableViewCell.h -// YUMI -// -// Created by XY on 2023/2/20. -// - -#import - -@class XPMineItemModel; -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineItemTableViewCell : UITableViewCell - -@property (nonatomic, strong) XPMineItemModel *itemModel; - -- (void)setCornerTop:(BOOL)isTop bottom:(BOOL)isBottom; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPMineItemTableViewCell.m b/YuMi/Modules/YMMine/View/XPMineItemTableViewCell.m deleted file mode 100644 index 62c36b0..0000000 --- a/YuMi/Modules/YMMine/View/XPMineItemTableViewCell.m +++ /dev/null @@ -1,195 +0,0 @@ -// -// YMMineItemTableViewCell.m -// YUMI -// -// Created by XY on 2023/2/20. -// - -#import "XPMineItemTableViewCell.h" -#import "NetImageView.h" -#import -#import "DJDKMIMOMColor.h" -#import "UIView+Corner.h" -#import "YUMIMacroUitls.h" - -#import "XPMineItemModel.h" - -@interface XPMineItemTableViewCell() - -/// 容器 -@property (nonatomic, strong) UIView *containerView; -/// 图标 -@property (nonatomic, strong) NetImageView *iconImageView; -/// 标题 -@property (nonatomic, strong) UILabel *titleLabel; -/// 箭头 -@property (nonatomic, strong) UIImageView *arrowImageView; -/// 虚线 -@property (nonatomic, strong) UIView *dashLineView; -@property (nonatomic, strong) CAShapeLayer *shapeLayer; - -@end - -@implementation XPMineItemTableViewCell - -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if (self) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = UIColor.clearColor; - self.contentView.backgroundColor = UIColor.clearColor; - [self createUI]; - } - return self; -} - -- (void)createUI { - [self.contentView addSubview:self.containerView]; - [self.containerView addSubview:self.iconImageView]; - [self.containerView addSubview:self.titleLabel]; - [self.containerView addSubview:self.arrowImageView]; - [self.containerView addSubview:self.dashLineView]; - - [self.containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-16); - make.top.bottom.mas_equalTo(0); - }]; - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(12); - make.centerY.mas_equalTo(self.containerView); - make.width.height.mas_equalTo(40); - }]; - [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(0); - make.width.mas_equalTo(40); - make.height.mas_equalTo(12); - make.centerY.mas_equalTo(self.containerView); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.iconImageView.mas_trailing).offset(2); - make.trailing.mas_equalTo(self.arrowImageView.mas_leading).offset(-2); - make.centerY.mas_equalTo(self.containerView); - }]; - [self.dashLineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(22); - make.trailing.mas_equalTo(-8); - make.height.mas_equalTo(1); - make.bottom.mas_equalTo(0); - }]; - -} - -- (void)layoutSubviews { - [super layoutSubviews]; - if (self.shapeLayer.superlayer == nil && self.dashLineView.frame.size.width > 0) { - [self addDashLineLength:5 lineSpacing:5 lineColor:[UIColorFromRGB(0x939BA3) colorWithAlphaComponent:0.3]]; - } -} - -- (void)addDashLineLength:(int)lineLength lineSpacing:(int)lineSpacing lineColor:(UIColor *)lineColor { - [self.shapeLayer setBounds:self.dashLineView.bounds]; - [self.shapeLayer setPosition:CGPointMake(CGRectGetWidth(self.dashLineView.frame) / 2, CGRectGetHeight(self.dashLineView.frame))]; - [self.shapeLayer setFillColor:[UIColor clearColor].CGColor]; - [self.shapeLayer setStrokeColor:lineColor.CGColor]; - [self.shapeLayer setLineWidth:CGRectGetHeight(self.dashLineView.frame)]; - [self.shapeLayer setLineJoin:kCALineJoinRound]; - [self.shapeLayer setLineDashPattern:[NSArray arrayWithObjects:[NSNumber numberWithInt:lineLength], [NSNumber numberWithInt:lineSpacing], nil]]; - // 设置路径 - CGMutablePathRef path = CGPathCreateMutable(); - CGPathMoveToPoint(path, NULL, 0, 0); - CGPathAddLineToPoint(path, NULL,CGRectGetWidth(self.dashLineView.frame), 0); - [self.shapeLayer setPath:path]; - CGPathRelease(path); - // 把绘制好的虚线添加上来 - [self.dashLineView.layer addSublayer:self.shapeLayer]; -} - -- (void)setCornerTop:(BOOL)isTop bottom:(BOOL)isBottom { - if (isTop == NO && isBottom == NO) { - self.containerView.layer.cornerRadius = 0; - self.dashLineView.hidden = NO; - return; - } - if (isTop) { - self.containerView.layer.cornerRadius = 20.0; - self.containerView.layer.maskedCorners = kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner; - self.dashLineView.hidden = NO; - return; - } - if (isBottom) { - self.containerView.layer.cornerRadius = 20.0; - self.containerView.layer.maskedCorners = kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner; - self.dashLineView.hidden = YES; - return; - } -} - -- (void)setItemModel:(XPMineItemModel *)itemModel { - _itemModel = itemModel; - self.iconImageView.image = [UIImage imageNamed:itemModel.itemImageName]; - self.titleLabel.text = itemModel.itemName; -} - -#pragma mark - 懒加载 - -- (UIView *)containerView { - if (!_containerView) { - _containerView = [[UIView alloc] init]; - _containerView.backgroundColor = UIColor.whiteColor; - } - return _containerView; -} - -- (NetImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[NetImageView alloc] init]; - _iconImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _iconImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _titleLabel.font = [UIFont systemFontOfSize:12]; - } - return _titleLabel; -} - -- (UIImageView *)arrowImageView { - if (!_arrowImageView) { - _arrowImageView = [[UIImageView alloc] init]; - _arrowImageView.image = [[UIImage imageNamed:@"common_right_arrow"]ms_SetImageForRTL]; - _arrowImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _arrowImageView; -} - -- (UIView *)dashLineView { - if (!_dashLineView) { - _dashLineView = [[UIView alloc] init]; - } - return _dashLineView; -} - -- (CAShapeLayer *)shapeLayer { - if (!_shapeLayer) { - _shapeLayer = [CAShapeLayer layer]; - } - return _shapeLayer; -} - -@end diff --git a/YuMi/Modules/YMMine/View/XPMineUserInfoTagVC.h b/YuMi/Modules/YMMine/View/XPMineUserInfoTagVC.h deleted file mode 100644 index 5b2efa2..0000000 --- a/YuMi/Modules/YMMine/View/XPMineUserInfoTagVC.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// XPMineUserInfoTagVC.h -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import "MvpViewController.h" -#import "XPMineUserInfoTagModel.h" -NS_ASSUME_NONNULL_BEGIN -@class XPMineUserInfoTagVC; -@protocol XPMineUserInfoTagVCDelegate - -- (void)xPMineUserInfoTagVC:(XPMineUserInfoTagVC *)vc didClickComplete:(NSArray *)meLabels; - -@end - - -@interface XPMineUserInfoTagVC : MvpViewController -@property (nonatomic,strong) XPMineUserInfoTagModel *tagModel; -/// -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPMineUserInfoTagVC.m b/YuMi/Modules/YMMine/View/XPMineUserInfoTagVC.m deleted file mode 100644 index 4422c2e..0000000 --- a/YuMi/Modules/YMMine/View/XPMineUserInfoTagVC.m +++ /dev/null @@ -1,140 +0,0 @@ -// -// XPMineUserInfoTagVC.m -// xplan-ios -// -// Created by duoban on 2023/2/15. -// - -#import "XPMineUserInfoTagVC.h" -///view -#import "XPMineUserInfoTagHeadView.h" -#import "XPMineUserInfoNavView.h" -#import "XPMineUserInfoTagView.h" -#import "XPMineUserInfoPresenter.h" -#import "XPMineUserInfoProtocol.h" -@interface XPMineUserInfoTagVC () -///头部 -@property (nonatomic,strong) XPMineUserInfoTagHeadView *headView; -///导航栏 -@property (nonatomic,strong) XPMineUserInfoNavView *navView; -/// -@property (nonatomic,strong) XPMineUserInfoTagView *tagVeiw; -/// -@property (nonatomic,copy) NSArray *meLabels; -@end - -@implementation XPMineUserInfoTagVC -- (BOOL)isHiddenNavBar { - return YES; -} -- (XPMineUserInfoPresenter *)createPresenter { - return [[XPMineUserInfoPresenter alloc] init]; -} --(void)viewWillDisappear:(BOOL)animated{ - [super viewWillAppear:animated]; - self.tagModel.meLabels = self.meLabels; -} -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self requestData]; - - - -} --(void)requestData{ - - - [self.presenter getTagList]; -} -#pragma mark - XPMineUserInfoTagView --(void)didingSelectTag{ - self.headView.tagModel = self.self.tagVeiw.tagModel; -} --(void)setTagModel:(XPMineUserInfoTagModel *)tagModel{ - _tagModel = tagModel; - self.meLabels = self.tagModel.meLabels; - self.headView.tagModel = _tagModel; - self.tagVeiw.tagModel = _tagModel; -} -#pragma mark - XPMineUserInfoEditProtocol --(void)saveTagListSuccess{ - self.meLabels = self.tagModel.meLabels; - [self showSuccessToast:YMLocalizedString(@"XPMineUserInfoTagVC2")]; - - if(self.delegate && [self.delegate respondsToSelector:@selector(xPMineUserInfoTagVC:didClickComplete:)]){ - [self.delegate xPMineUserInfoTagVC:self didClickComplete:self.meLabels]; - } - [self.navigationController popViewControllerAnimated:YES]; -} --(void)getTagListSuccess:(XPMineUserInfoTagModel *)model{ - - self.tagModel = model; - - -} -#pragma mark - XPMineUserInfoNavViewDelegate -- (void)xPMineUserInfoNavView:(XPMineUserInfoNavView *)view didClickBack:(UIButton *)sender{ - [self.navigationController popViewControllerAnimated:YES]; -} -- (void)xPMineUserInfoNavView:(XPMineUserInfoNavView *)view didClickComplete:(UIButton *)sender{ - NSArray *meLabels = self.tagVeiw.tagModel.meLabels; - NSString *tagStr = @""; - for (int i = 0; i < meLabels.count; i++) { - NSString *text = meLabels[i]; - if(text.length > 0){ - if(i == 0){ - tagStr = meLabels[i]; - }else{ - tagStr = [NSString stringWithFormat:@"%@,%@",tagStr,meLabels[i]]; - } - } - - } - [self.presenter saveTagListWithLabels:tagStr]; -} -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.headView]; - [self.view addSubview:self.navView]; - [self.view addSubview:self.tagVeiw]; -} -- (void)initSubViewConstraints { - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(304)); - }]; - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - [self.tagVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.bottom.trailing.equalTo(self.view); - make.top.equalTo(self.headView.mas_bottom); - - }]; -} -#pragma mark -懒加载 -- (XPMineUserInfoNavView *)navView{ - if (!_navView){ - _navView = [[XPMineUserInfoNavView alloc]initWithFrame:CGRectZero]; - _navView.delegate = self; - } - return _navView; -} -- (XPMineUserInfoTagHeadView *)headView{ - if (!_headView){ - _headView = [[XPMineUserInfoTagHeadView alloc]initWithFrame:CGRectZero]; - - } - return _headView; -} -- (XPMineUserInfoTagView *)tagVeiw{ - if (!_tagVeiw){ - _tagVeiw = [[XPMineUserInfoTagView alloc]initWithFrame:CGRectZero]; - _tagVeiw.delegate = self; - } - return _tagVeiw; -} -@end diff --git a/YuMi/Modules/YMMine/View/XPMineViewController.h b/YuMi/Modules/YMMine/View/XPMineViewController.h deleted file mode 100644 index b7b196e..0000000 --- a/YuMi/Modules/YMMine/View/XPMineViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMineViewController.h -// YUMI -// -// Created by YUMI on 2021/9/16. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPMineViewController.m b/YuMi/Modules/YMMine/View/XPMineViewController.m deleted file mode 100644 index 5704587..0000000 --- a/YuMi/Modules/YMMine/View/XPMineViewController.m +++ /dev/null @@ -1,826 +0,0 @@ -// -// XPMineViewController.m -// YuMi -// -// Created by YuMi on 2021/9/16. -// - -#import "XPMineViewController.h" -///Third -#import -///Tool -#import "TTPopup.h" -#import "YUMIHtmlUrl.h" -#import "UIButton+EnlargeTouchArea.h" -#import "YUMIConstant.h" -#import "Api+Room.h" -#import "Api+NobleCenter.h" -#import "Api+RoomSetting.h" -#import "AccountInfoStorage.h" -#import "ClientConfig.h" -#import "NobleCenterModel.h" -#import "NobleInfo.h" -///Model -#import "XPMineItemModel.h" -#import "UserInfoModel.h" -#import "XPMineVisitorUnReadModel.h" -#import "ClanDetailInfoModel.h" -#import "HomeBannerInfoModel.h" -#import "XPMineFunctionItemModel.h" -#import "WalletInfoModel.h" - -///P -#import "XPMineProtocol.h" -#import "XPMinePresent.h" -///View -#import "XPMineHeadItemTableViewCell.h" -#import "XPMineHeadView.h" -#import "XPHomeBannerTableViewCell.h" -#import "XPMineNewUserRechargeView.h" -#import "XPMineTheGuildCell.h" -#import "XPMinePersonalCenterCell.h" -#import "XPMineListCell.h" -///VC -#import "XPMineSettingViewController.h" -#import "XPMineUserInfoViewController.h" - -#import "XPWebViewController.h" -#import "XPRoomViewController.h" -#import "MyDressingViewController.h" -#import "ShoppingMallViewController.h" -#import "XPMineFansViewController.h" -#import "XPMineAttentionViewController.h" -#import "XPMineVisitorViewController.h" -#import "XPMineFansTeamViewController.h" -#import "XPMineClanViewController.h" -#import "XPMineGuildViewController.h" -#import "XPMineFootPrintViewController.h" -#import "XPMineCollectRoomListViewController.h" -#import "XPMineMainGuildListVC.h" -#import "XPMineGiveDiamondVC.h" -#import "XPIAPRechargeViewController.h" -#import "XPIncomeRecordVC.h" -#import "VIPCenterViewController.h" -#import "LittleGameInfoModel.h" -#import "HomeLittleGameRoomModel.h" -#import "XPLittleGameRoomOpenView.h" -#import "PISwitchingEnvironmentVC.h" -#import "XPGameOrdersListViewController.h" -#import "VIPCenterViewController.h" -#import "VipSettingViewController.h" - -#import "XPSkillCardPlayerManager.h" -#import "XPMineFriendViewController.h" -#import "MedalsViewController.h" - - -UIKIT_EXTERN NSString *kRequestTicket; - -@interface XPMineViewController () - -@property (nonatomic,strong) UITableView *tableView; -///个人功能 -@property (nonatomic, strong) NSMutableArray *functionArray; -///banner列表 -@property (nonatomic, strong) NSMutableArray *bannerArray; -///头部 -@property (nonatomic,strong) XPMineHeadView *headView; -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -///家族信息 -@property (nonatomic,strong) ClanDetailMainInfoModel *clanInfo; -///我的公会 -@property (nonatomic,strong) XPMineItemModel *guildItemModel; -///转赠钻石权限 -@property(nonatomic,assign)BOOL isHavePermission; -///点击我的房间时，防止出现多次点击 -@property (nonatomic,assign) BOOL isRefreshRoomInfo; - -@property(nonatomic, assign) NSInteger visitorVipLimit; - -@end - -@implementation XPMineViewController - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (XPMinePresent *)createPresenter { - return [[XPMinePresent alloc] init];; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [[ClientConfig shareConfig] bgColor]; - [self setupTopTheme]; - [self initSubViews]; - [self initSubViewConstraints]; - self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; -} - -- (void)setupTopTheme { - __block UIImageView *theme = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(140))]; - theme.image = [[ClientConfig shareConfig] navigationAreaBG]; - theme.contentMode = UIViewContentModeScaleAspectFill; - [self.view addSubview:theme]; - - [[NSNotificationCenter defaultCenter] addObserverForName:[ClientConfig shareConfig].reloadNavigationAreaImageKey - object:nil - queue:[NSOperationQueue mainQueue] - usingBlock:^(NSNotification * _Nonnull notification) { - if ([notification.object isKindOfClass:[UIImage class]]) { - theme.image = (UIImage *)notification.object; - } - }]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - self.isRefreshRoomInfo = NO; - - if([AccountInfoStorage instance].isRequestTicket == NO) { - [self getDataInfo]; - } -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; -} - --(void)getDataInfo{ - [self.presenter getUserInfo]; -} - -#pragma mark- 检查是否有转赠钻石权限 - --(void)checkHaveGiveDiamondsPermission{ -//#if DEBUG -// self.isHavePermission = YES; -// return; -//#endif - - // TODO: 切换账号可能会保持权限状态，需要进一步检查逻辑 - - ClientConfig *config = [ClientConfig shareConfig]; - NSArray *uidList = config.configInfo.giveDiamondErbanNoList; - for (id uid in uidList) { - NSString *getUid = [uid stringValue]; - if([getUid isEqualToString:@(self.userInfo.erbanNo).stringValue]){ - self.isHavePermission = YES; - break; - } - } - if(self.isHavePermission == YES)return; - for (id uid in config.configInfo.giveGiftErbanNoList) { - NSString *getUid = [uid stringValue]; - if([getUid isEqualToString:@(self.userInfo.erbanNo).stringValue]){ - self.isHavePermission = YES; - break; - } - } - if(self.isHavePermission == YES)return; - if(self.userInfo.userLevelVo.experLevelSeq >= config.configInfo.giveDiamondExperLevel){ - self.isHavePermission = YES; - return; - } - if(self.userInfo.userLevelVo.experLevelSeq >= config.configInfo.giveGiftExperLevel){ - self.isHavePermission = YES; - } -} - -#pragma mark - Response -- (void)settingButtonAction { - XPMineSettingViewController * settingVC = [[XPMineSettingViewController alloc] init]; - settingVC.userInfo = self.userInfo; - [self.navigationController pushViewController:settingVC animated:YES]; -} - -#pragma mark - Private Method -- (void)initSubViews { - XPMineFunctionItemModel *setItem = [XPMineFunctionItemModel new]; - setItem.centerName = YMLocalizedString(@"XPMineSettingViewController0"); - setItem.centerPic = @"mineview_set"; - setItem.skipType = XPMineItemType_My_Setting; - [self.functionArray addObject:setItem]; - - [self.view addSubview:self.tableView]; - // [self.view addSubview:self.settingButton]; - self.tableView.tableHeaderView = self.headView; - if (@available(iOS 15.0, *)) {//移除iOS15列表头默认增加的22高度 - self.tableView.sectionHeaderTopPadding = 0; - } -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.view); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; -} - -- (void)pushViewControllerWithType:(NSInteger)type functionItem:(XPMineFunctionItemModel *)item { - - if([item.centerName isEqualToString:@"切换环境"]){ - PISwitchingEnvironmentVC *vc = [PISwitchingEnvironmentVC new]; - [self.navigationController pushViewController:vc animated:YES]; - return; - } - -//#if DEBUG -// [self pushGiveDiamondVC]; -//#endif - - switch (type) { - case XPMineItemType_My_Medal: - [self clickMedalsAction]; - break; - case XPMineItemType_My_Agent: - [self clickHallAction]; - break; - case XPMineItemType_My_Setting:{ - [self settingButtonAction]; - break; - } - case XPMineItemType_Match_Relevance_Account: { - [self pushWebViewWithUrl:item.centerUrl];} - break; - case XPMineItemType_Foot_Print: - { - XPMineFootPrintViewController *vc = [[XPMineFootPrintViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; - } - break; - - case XPMineItemType_Account: - { - [self pushThirdPartyPayVC]; - } - break; - case XPMineItemType_PersonInfo: - { - XPMineUserInfoViewController * infoVC = [[XPMineUserInfoViewController alloc] init]; - infoVC.uid = self.userInfo.uid; - [self.navigationController pushViewController:infoVC animated:YES]; - } - break; - case XPMineItemType_My_Room: - { - NSString* roomUid = [NSString stringWithFormat:@"%ld", (long)self.userInfo.uid]; - [Api getRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - RoomInfoModel * roomInfo = [RoomInfoModel modelWithJSON:data.data]; - if (roomInfo.isReselect) { - XPLittleGameRoomOpenView * roomOpenView = [[XPLittleGameRoomOpenView alloc] init]; - roomOpenView.roomInfo = roomInfo; - roomOpenView.currentVC = self; - [TTPopup popupView:roomOpenView style:TTPopupStyleActionSheet]; - } else { - [XPRoomViewController openRoom:roomUid viewController:self]; - } - } else { - [self showErrorToast:msg]; - } - } uid:roomUid intoUid:roomUid]; - } - break; - case XPMineItemType_Collect_Room://收藏房间 - { - XPMineCollectRoomListViewController *collectVC = [[XPMineCollectRoomListViewController alloc] init]; - [self.navigationController pushViewController:collectVC animated:YES]; - } - break; - case XPMineItemType_My_DressUp: - { - MyDressingViewController * dressUpVC = [[MyDressingViewController alloc] init]; - [self.navigationController pushViewController:dressUpVC animated:YES]; - } - break; - case XPMineItemType_DressUp_Market: - { - ShoppingMallViewController *dressUpShopVc = [[ShoppingMallViewController alloc] init]; - [self.navigationController pushViewController:dressUpShopVc animated:YES]; - } - break; - case XPMineItemType_Fans_List: - { - XPMineFansViewController * fansVC = [[XPMineFansViewController alloc] init]; - fansVC.view.backgroundColor = [UIColor whiteColor]; - [self.navigationController pushViewController:fansVC animated:YES]; - } - break; - case XPMineItemType_Attention_List: - { - XPMineAttentionViewController * attentionVC = [[XPMineAttentionViewController alloc] init]; - [self.navigationController pushViewController:attentionVC animated:YES]; - } - break; - case XPMineItemType_Visitor: - { - self.headView.visitorUnReadCount = 0; - XPMineVisitorViewController *visitorVC = [[XPMineVisitorViewController alloc] init]; - [self.navigationController pushViewController:visitorVC animated:YES]; - } - break; - case XPMineItemType_Noble_Center: - { -// VIPCenterViewController *vc = [[VIPCenterViewController alloc] initWithRoomUid:-1]; -// [self.navigationController pushViewController:vc animated:YES]; - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kVIP); - [self.navigationController pushViewController:webVC animated:YES]; - } - break; - case XPMineItemType_FansTeam: { - XPMineFansTeamViewController *fansTeamVc = [[XPMineFansTeamViewController alloc] init]; - [self.navigationController pushViewController:fansTeamVc animated:YES]; - } - break; - case XPMineItemType_My_Guild: - { - [self clickHallAction]; - } - break; - case XPMineItemType_My_Gift: - { - [self pushGiveDiamondVC]; - } - break; - case XPMineItemType_My_Game_Order: { - [self toGameOrdersList]; - } - break; - case XPMineItemType_My_Item: { - [self toMineItems]; - } - break; - break; - default: - break; - } -} - -- (void)toMineItems { - MyDressingViewController *vc = [[MyDressingViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; -} - -- (void)toGameOrdersList { - XPGameOrdersListViewController *vc = [[XPGameOrdersListViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; -} - -- (void)pushWebViewWithUrl:(NSString *)url { - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = url; - [self.navigationController pushViewController:webVC animated:YES]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 3; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - switch (section) { - case 0: - return 0; - break; - case 1: - return 0; - break; - case 2: - return self.functionArray.count; - break; - default: - return 0; - break; - } -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - switch (indexPath.section) { - case 0: - return 0; // 44 - break; - case 1: - return 0; // self.isHavePermission ? 134 : 99 - break; - case 2: - return 60; - break; - default: - return 0; - break; - } -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 0) { - - XPMineTheGuildCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineTheGuildCell class])]; - cell.clanInfo = self.clanInfo; - - return cell; - }else if (indexPath.section == 1) { - XPMinePersonalCenterCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMinePersonalCenterCell class])]; - cell.isHaveGiveDiamond = NO; - @kWeakify(self) - cell.clickAction = ^(int type){ - @kStrongify(self) - if (type == 0){ - [self pushMyRoomVC]; - } else if (type == 1){ - [self pushEarningsRecordVC]; - }else{ - [self pushGiveDiamondVC]; - } - }; - - cell.selectionStyle = UITableViewCellSelectionStyleNone; - return cell; - } else { - XPMineListCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineListCell class])]; - if (indexPath.row == 0 && self.functionArray.count > 1){ - [cell setCornerWithIsTop:YES isBottom:NO]; - }else if (indexPath.row == self.functionArray.count-1){ - if(self.functionArray.count == 1){ - [cell setCornerWithIsTop:YES isBottom:YES]; - }else{ - [cell setCornerWithIsTop:NO isBottom:YES]; - } - }else{ - [cell setCornerWithIsTop:NO isBottom:NO]; - } - - XPMineFunctionItemModel *model = self.functionArray[indexPath.row]; - cell.itemModel = model; - return cell; - } -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - return 16; -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - UIView * view = [[UIView alloc] init]; - view.backgroundColor = [UIColor clearColor]; - return view; -} --(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ - if (indexPath.section == 0){ - [self clickHallAction]; - return; - } - if (indexPath.section != 2)return; - XPMineFunctionItemModel *item = self.functionArray[indexPath.row]; - [self pushViewControllerWithType:item.skipType functionItem:item]; -} - -- (void)clickMedalsAction { - MedalsViewController *vc = [[MedalsViewController alloc] initForMyMedals:self.userInfo]; - [self.navigationController pushViewController:vc animated:YES]; -} - -///跳转到公会 --(void)clickHallAction{ - if(self.clanInfo == nil)return; - if([self.clanInfo.clanMode isEqualToString:@"clan_hall"]){ - if( self.clanInfo.clan.clan.elderUid > 0){ - XPMineClanViewController * clanVC = [[XPMineClanViewController alloc] init]; - clanVC.uid = self.clanInfo.clan.clan.elderUid; - [self.navigationController pushViewController:clanVC animated:YES]; - return; - }else { - if(self.clanInfo.clan.hall.ownerUid > 0){ - XPMineGuildViewController * hallVC = [[XPMineGuildViewController alloc] init]; - hallVC.ownerUid = self.clanInfo.clan.hall.ownerUid; - hallVC.guildId = self.clanInfo.clan.hall.hallId; - [self.navigationController pushViewController:hallVC animated:YES]; - return; - } - } - XPMineMainGuildListVC *gulidListVC = [XPMineMainGuildListVC new]; - [self.navigationController pushViewController:gulidListVC animated:YES]; - return; - } - if([self.clanInfo.clanMode isEqualToString:@"family"]){ - XPWebViewController *webViewVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - NSString *url = self.clanInfo.family.familyId ? self.clanInfo.family.myFamilyUrl : self.clanInfo.family.familyListUrl; - if([url hasPrefix:@"/"]){ - url = [url substringFromIndex:1]; - } - webViewVC.url = url; - [self.navigationController pushViewController:webViewVC animated:YES]; - } -} -///转赠钻石 --(void)pushGiveDiamondVC{ - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kTransfer); - [self.navigationController pushViewController:webVC animated:YES]; -// XPMineGiveDiamondVC *giveDiamondVC = [[XPMineGiveDiamondVC alloc] initWithUserModel:self.userInfo]; -// [self.navigationController pushViewController:giveDiamondVC animated:YES]; -} -///点击充值 --(void)pushThirdPartyPayVC{ - [self pushEarningsRecordVC]; -} -///点击钱包 --(void)pushEarningsRecordVC{ - - XPIncomeRecordVC *incomeRecordVC = [XPIncomeRecordVC new]; - - [self.navigationController pushViewController:incomeRecordVC animated:YES]; - -} -///点击我的房间 --(void)pushMyRoomVC{ - if(self.isRefreshRoomInfo == YES)return; - self.isRefreshRoomInfo = YES; - NSString* roomUid = [NSString stringWithFormat:@"%ld", (long)self.userInfo.uid]; - @kWeakify(self); - [Api getRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - self.isRefreshRoomInfo = NO; - if (code == 200) { - RoomInfoModel * roomInfo = [RoomInfoModel modelWithJSON:data.data]; - if (roomInfo.isReselect) { - XPLittleGameRoomOpenView * roomOpenView = [[XPLittleGameRoomOpenView alloc] init]; - roomOpenView.roomInfo = roomInfo; - roomOpenView.currentVC = self; - [TTPopup popupView:roomOpenView style:TTPopupStyleActionSheet]; - } else { - [XPRoomViewController openRoom:roomUid viewController:self]; - } - } else { - [self showErrorToast:msg]; - } - } uid:roomUid intoUid:roomUid]; -} -#pragma mark - XPMineHeadViewDelegate -///点击头像 -- (void)xPMineHeadView:(XPMineHeadView *)view didClickAvatar:(UserInfoModel *)info { - [self pushViewControllerWithType:XPMineItemType_PersonInfo functionItem:nil]; -} - -///点击了粉丝 -- (void)xpMineHeadViewClickFans { - [self pushViewControllerWithType:XPMineItemType_Fans_List functionItem:nil]; -} - -///点击了关注 -- (void)xpMineHeadViewClickAttention { - [self pushViewControllerWithType:XPMineItemType_Attention_List functionItem:nil]; -} - -///点击了技能卡 -- (void)xpMineHeadViewClickSkillCard { - [self pushViewControllerWithType:XPMineItemType_Skill_Card functionItem:nil]; -} - -///点击了账户中心 -- (void)xpMineHeadViewClickAccount { - [self pushViewControllerWithType:XPMineItemType_Account functionItem:nil]; -} - -///点击了VIP中心 -- (void)xPMineHeadViewClickNobleCenter { - [self pushViewControllerWithType:XPMineItemType_Noble_Center functionItem:nil]; -} - -- (void)xPMineHeadViewClickAgency { - [self clickHallAction]; -} - -- (void)xPMineHeadViewClickVisitors { - self.headView.visitorUnReadCount = 0; - XPMineVisitorViewController *visitorVC = [[XPMineVisitorViewController alloc] initWithVIPVisible:self.userInfo.userVipInfoVO.visitHide - vipLimit:self.visitorVipLimit]; - [self.navigationController pushViewController:visitorVC animated:YES]; -} - -- (void)xPMineHeadViewClickFriends { - XPMineFriendViewController *vc = [[XPMineFriendViewController alloc] init]; - vc.isFromMineTab = YES; - [self.navigationController pushViewController:vc animated:YES]; -} - -#pragma mark - XPMineProtocol -///获取个人中心功能 -- (void)onGetMineFuntionItemSuccess:(NSArray *)items { - - [self hideHUD]; - - [self.functionArray removeAllObjects]; - [self.functionArray addObjectsFromArray:items]; - - for (XPMineFunctionItemModel * _Nonnull obj in self.functionArray) { - if(obj.skipType == XPMineItemType_My_Gift && self.isHavePermission == NO){ - [self.functionArray removeObject:obj]; - break; - } - } - @kWeakify(self); - [self.functionArray enumerateObjectsUsingBlock:^(XPMineFunctionItemModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - @kStrongify(self); - if (obj.skipType == XPMineItemType_CP) { - [self.functionArray removeObject:obj]; - } - if([obj.centerName isEqualToString:@"切换分区"]){ - [self.functionArray removeObject:obj]; - } - }]; - NSMutableArray *array = [NSMutableArray array]; - for (XPMineFunctionItemModel *item in self.functionArray) { - [array addObject:item.centerName]; - } -#ifdef DEBUG - XPMineFunctionItemModel *item = [XPMineFunctionItemModel new]; - item.centerName = @"切换环境"; - item.centerPic = @"mineview_set"; - [self.functionArray addObject:item]; -#else -#endif - [self.tableView reloadData]; -} - -- (void)onGetMineFunctionsItemFail{ - [self hideHUD]; -} - -- (void)onGetLittleGameListFail{ - -} -///获取个人中心banner -- (void)onGetPersonalBannerListSuccess:(NSArray *)items { - [self.bannerArray removeAllObjects]; - [self.bannerArray addObjectsFromArray:items]; - NSMutableArray *array = [NSMutableArray array]; - for (HomeBannerInfoModel *item in self.bannerArray) { - [array addObject:item.bannerId]; - } - [self.tableView reloadData]; -} - --(void)onGetPersonalBannerListFail{ - -} - -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { - - [XPSkillCardPlayerManager shareInstance].userInfoModel = userInfo; - - ///防止重新注册时，获取到用户信息不全，调用接口时401 - [self hideHUD]; - if (!userInfo.isBindPhone && [ClientConfig shareConfig].iOSPhoneBind) { - return; - } - if (userInfo.nick == nil || userInfo.avatar == nil ) { - return; - } - self.userInfo = userInfo; - - [self checkHaveGiveDiamondsPermission]; - - [self.tableView reloadData]; - [self.headView createNamePlateIdLabelAttribute:userInfo]; - self.headView.userInfo = userInfo; - - // MARK: 获取配置列表前，需要先执行 checkHaveGiveDiamondsPermission 确认权限 - [self.presenter getPersonItemList]; - [self.presenter getClanDetailInfo]; - [self.presenter getUserWalletInfo]; - [self.presenter getNobleInfo]; - @kWeakify(self); - [self.presenter visitUserPageSuccess:^(NSNumber * _Nonnull browseNum, NSNumber * _Nonnull friendCount, NSNumber * _Nonnull browseNumTip, NSNumber * _Nonnull visitListVipLimit) { - @kStrongify(self); - [self.headView updateFriendsCount:friendCount browseCount:browseNum browseCountTip:browseNumTip]; - self.visitorVipLimit = visitListVipLimit.integerValue; - } failure:^(NSError * _Nonnull error) { - - }]; -} - -- (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo{ - self.headView.walletInfo = balanceInfo; - [self.tableView reloadData]; -} - -- (void)getUserWalletInfoFail{ - -} - -///获取VIP信息成功 -- (void)getNobleCenterInfoSuccess:(NobleCenterModel *)model { - NobleInfo *vipInfo ; - for (int index = 0; index < model.vipInfos.count; index++) { - NobleInfo *tagInfo = [model.vipInfos xpSafeObjectAtIndex:index]; - if (model.currentLevel > 0){ - if (tagInfo.vipLevel == model.currentLevel) { - vipInfo = tagInfo; - break; - } - } - } - self.headView.nobleInfo = model; - [self.tableView reloadData]; -} - --(void)getNobleCenterInfoFail{ - -} - -///获取家族信息成功 -- (void)onGetClanDetailInfoSuccess:(ClanDetailMainInfoModel *)clanInfo { - self.clanInfo = clanInfo; - self.headView.clanModel = clanInfo; - [self.tableView reloadData]; -} - -#pragma mark - XPMineHeadItemTableViewCellDelegate -- (void)xPMineHeadItemTableViewCell:(XPMineHeadItemTableViewCell *)cell didSelectItem:(XPMineFunctionItemModel *)item { - [self pushViewControllerWithType:item.skipType functionItem:item]; -} - -#pragma mark - XPHomeBannerTableViewCellDelegate -///点击了某个banner -- (void)xPHomeBannerTableViewCell:(XPHomeBannerTableViewCell *)view didClickBanner:(HomeBannerInfoModel *)info { - switch (info.skipType) { - case HomeBannerInfoSkipType_Room: - { - if (info.skipUri.length > 0) { - [XPRoomViewController openRoom:info.skipUri viewController:self]; - } - } - break; - case HomeBannerInfoSkipType_Web: - { - XPWebViewController *vc = [[XPWebViewController alloc]initWithRoomUID:nil]; - vc.url = info.skipUri; - [self.navigationController pushViewController:vc animated:YES]; - } - break; - default: - break; - } -} - -#pragma mark - NSNotification -- (void)onVisitorUnReadCountUpdate:(NSNotification *)noti { - XPMineVisitorUnReadModel *model = (XPMineVisitorUnReadModel *)noti.object; - self.headView.visitorUnReadCount = model.visitNum; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.showsVerticalScrollIndicator = NO; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;; - [_tableView registerClass:[XPMineTheGuildCell class] forCellReuseIdentifier:NSStringFromClass([XPMineTheGuildCell class])]; - [_tableView registerClass:[XPMinePersonalCenterCell class] forCellReuseIdentifier:NSStringFromClass([XPMinePersonalCenterCell class])]; - [_tableView registerClass:[XPMineListCell class] forCellReuseIdentifier:NSStringFromClass([XPMineListCell class])]; - _tableView.backgroundColor = [UIColor clearColor]; - } - return _tableView; -} - -- (XPMineHeadView *)headView { - if (!_headView) { - CGFloat height = 120; - _headView = [[XPMineHeadView alloc] initWithFrame:CGRectMake(0, 0,KScreenWidth , 146 + height + kStatusBarHeight)]; - _headView.delegate = self; - } - return _headView; -} - -- (NSMutableArray *)functionArray { - if (!_functionArray) { - _functionArray = [NSMutableArray array]; - } - return _functionArray; -} - -- (NSMutableArray *)bannerArray { - if (!_bannerArray) { - _bannerArray = [NSMutableArray array]; - } - return _bannerArray; -} - --(UserInfoModel *)userInfo{ - if(!_userInfo){ - _userInfo = [UserInfoModel new]; - _userInfo.uid = [[AccountInfoStorage instance].getUid integerValue]; - } - return _userInfo; -} -@end diff --git a/YuMi/Modules/YMMine/View/XPMineVisitorViewController.h b/YuMi/Modules/YMMine/View/XPMineVisitorViewController.h deleted file mode 100644 index 876f858..0000000 --- a/YuMi/Modules/YMMine/View/XPMineVisitorViewController.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMMineVisitorViewController.h -// YUMI -// -// Created by YUMI on 2022/1/26. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMineVisitorViewController : MvpViewController - -- (instancetype)initWithVIPVisible:(BOOL)visible vipLimit:(NSInteger)visitListVipLimit; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPMineVisitorViewController.m b/YuMi/Modules/YMMine/View/XPMineVisitorViewController.m deleted file mode 100644 index 32a1532..0000000 --- a/YuMi/Modules/YMMine/View/XPMineVisitorViewController.m +++ /dev/null @@ -1,299 +0,0 @@ -// -// YMMineVisitorViewController.m -// YUMI -// -// Created by YUMI on 2022/1/26. -// - -#import "XPMineVisitorViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -#import "ClientConfig.h" -///Model -#import "XPMineVisitorItemModel.h" -///View -#import "XPMineVisitorTableViewCell.h" -#import "XPMineVisitorEmptyTableViewCell.h" -///P -#import "XPMineVisitorPresenter.h" -#import "XPMineVisitorProtocol.h" -///VC -#import "XPMineUserInfoViewController.h" - -#import "SessionViewController.h" -#import "VIPCenterViewController.h" -#import "XCCurrentVCStackManager.h" -#import "XPWebViewController.h" - - -@interface XPMineVisitorViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前页数 -@property (nonatomic,assign) int page; -///更多数据 -@property (nonatomic,assign) BOOL hasNoMoreData; - -@property(nonatomic, strong) UIVisualEffectView *blurEffectView; - -@property(nonatomic, assign) BOOL vipVisible; -@property(nonatomic, assign) NSInteger vipLimit; - - -@end - -@implementation XPMineVisitorViewController - -- (instancetype)initWithVIPVisible:(BOOL)visit vipLimit:(NSInteger)visitListVipLimit { - if (self = [super init]) { - self.vipVisible = visit; - self.vipLimit = visitListVipLimit; - } - return self; -} - -- (XPMineVisitorPresenter *)createPresenter { - return [[XPMineVisitorPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor whiteColor]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; - [self addBlurEffect]; -} - -- (void)addBlurEffect { - if (self.vipVisible) { - return; - } - - UIVisualEffect *blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]; - self.blurEffectView = [[UIVisualEffectView alloc] initWithEffect:blurEffect]; - self.blurEffectView.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.blurEffectView]; - [self.blurEffectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - - UIView *container = [[UIView alloc] init]; - [self.view addSubview:container]; - [container mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - - UIImageView *lock = [self lockImageView]; - [container addSubview:lock]; - UILabel *tipsLabel = [self lockTipsLabel]; - [container addSubview:tipsLabel]; - UIButton *lockButton = [self lockToVipButton]; - [container addSubview:lockButton]; - [tipsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.view); - }]; - [lock mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(tipsLabel.mas_top).offset(-6); - make.centerX.mas_equalTo(self.view); - make.size.mas_equalTo(CGSizeMake(36, 36)); - }]; - [lockButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(tipsLabel.mas_bottom).offset(16); - make.centerX.mas_equalTo(self.view); - make.size.mas_equalTo(CGSizeMake(150, 38)); - }]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - self.page = 1; - [self.presenter getVisitorList:self.page pageSize:20 state:0]; -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMineVisitorViewController0")]; - return; - } - self.page++; - [self.presenter getVisitorList:self.page pageSize:20 state:1]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMineVisitorViewController1"); - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - XPMineVisitorProtocol -- (void)onGetVisitorListSuccess:(NSArray *)array state:(int)state { - if (state == 0) { - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } - [self.tableView.mj_footer endRefreshing]; - if (array.count > 0) { - self.hasNoMoreData = NO; - [self.datasource addObjectsFromArray:array]; - } else { - self.hasNoMoreData = YES; - [self.tableView.mj_footer endRefreshingWithNoMoreData]; - } - [self.tableView reloadData]; -} - -- (void)getVisitorListFail:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMineVisitorTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineVisitorTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineVisitorTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineVisitorTableViewCell class])]; - } - cell.isFirstItem = indexPath.row == 0; - cell.isLastItem = indexPath.row == self.datasource.count - 1; - cell.delegate = self; - cell.item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } - - XPMineVisitorEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineVisitorEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - } - cell.emptyTitle = YMLocalizedString(@"XPMineVisitorViewController2"); - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 85; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - XPMineVisitorItemModel *item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = item.uid; - [self.navigationController pushViewController:userInfoVC animated:YES]; -} - -#pragma mark - TTVisitorRecordCellDelegate -- (void)onAvatarClick:(XPMineVisitorTableViewCell *)cell { - NSIndexPath *indexPath = [self.tableView indexPathForCell:cell]; - XPMineVisitorItemModel *item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = item.uid; - [self.navigationController pushViewController:userInfoVC animated:YES]; -} - -- (void)onChatClick:(XPMineVisitorTableViewCell *)cell { - NSIndexPath *indexPath = [self.tableView indexPathForCell:cell]; - XPMineVisitorItemModel *item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - NSString * sessionId = [NSString stringWithFormat:@"%lld",item.uid]; - NIMSession * session = [NIMSession session:sessionId type:NIMSessionTypeP2P]; - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:session]; - [self.navigationController pushViewController:sessionVC animated:YES]; -} - -- (void)didTapVIPButton { - [self.navigationController popViewControllerAnimated:NO]; -// VIPCenterViewController *vc = [[VIPCenterViewController alloc] initWithRoomUid:-1]; -// [[XCCurrentVCStackManager shareManager].currentNavigationController pushViewController:vc animated:NO]; -// [vc jumpToTargetVIP:self.vipLimit]; - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kVIP); - [self.navigationController pushViewController:webVC animated:YES]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.rowHeight = 65; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMineVisitorEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineVisitorEmptyTableViewCell class])]; - [_tableView registerClass:[XPMineVisitorTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineVisitorTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -- (UIImageView *)lockImageView { - return [[UIImageView alloc] initWithImage:kImage(@"visitor_lock")]; -} - -- (UILabel *)lockTipsLabel { - return [UILabel labelInitWithText:[NSString stringWithFormat:YMLocalizedString(@"20.20.51_text_25"), - @(self.vipLimit)] - font:kFontMedium(14) - textColor:UIColorFromRGB(0x313131)]; -} - -- (UIButton *)lockToVipButton { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - [button.titleLabel setFont:kFontMedium(16)]; - [button setTitle:[NSString stringWithFormat:YMLocalizedString(@"20.20.51_text_26"), - @(self.vipLimit)] - forState:UIControlStateNormal]; - [button setBackgroundImage:[UIImage gradientColorImageFromColors:@[ - UIColorFromRGB(0xe28939), UIColorFromRGB(0xfcc074) - ] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(150, 40)] forState:UIControlStateNormal]; - [button addTarget:self action:@selector(didTapVIPButton) forControlEvents:UIControlEventTouchUpInside]; - [button setCornerRadius:20]; - return button; -} - -@end diff --git a/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.h b/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.h deleted file mode 100644 index 0256560..0000000 --- a/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPMomentUserDataViewController.h -// YuMi -// -// Created by P on 2024/6/24. -// - -#import "MvpViewController.h" -#import -@class MomentsInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMomentUserDataViewController : MvpViewController - -@property (nonatomic,strong) NSArray*dynamicInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.m b/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.m deleted file mode 100644 index 2f1f9e3..0000000 --- a/YuMi/Modules/YMMine/View/XPMomentUserDataViewController.m +++ /dev/null @@ -1,280 +0,0 @@ -// -// XPMomentUserDataViewController.m -// YuMi -// -// Created by P on 2024/6/24. -// - -#import "XPMomentUserDataViewController.h" - -#import "XPMomentsDetailViewController.h" - -#import "XPMineUserDataPresenter.h" -#import "XPMomentsMineProtocol.h" - -#import "XPMomentsLayoutConfig.h" -#import "XPMomentsEmptyTableViewCell.h" -#import "XPMomentsTableViewCell.h" -#import "MomentsInfoModel.h" - -@interface XPMomentUserDataViewController () - -@property (nonatomic,strong) NSMutableArray *datasource; -@property (nonatomic,strong) UITableView *tableView; -@property (nonatomic,strong) UIView *headView; -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); -@end - -@implementation XPMomentUserDataViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.tableView]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -- (__kindof id)createPresenter { - return [[XPMineUserDataPresenter alloc] init]; -} - -- (void)setDynamicInfo:(NSArray *)dynamicInfo { - [self.datasource removeAllObjects]; - [self.datasource addObjectsFromArray:dynamicInfo]; - [self.tableView reloadData]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -#pragma mark - JXPagingViewListViewDelegate -- (UIView *)listView { - return self.view; -} - -- (UIScrollView *)listScrollView { - return self.tableView; -} - -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - self.scrollCallback = callback; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - self.scrollCallback(scrollView); -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1;; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - MomentsInfoModel * momentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMomentsLayoutConfig getNewLayoutMomentsModelWithDynamic:momentInfo]; - if(momentInfo.content.length == 0){ - return momentInfo.rowHeight + 20; - } - return momentInfo.rowHeight; - } - return KScreenHeight - kNavigationHeight - 49 - kSafeAreaBottomHeight; -} -- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{ - return nil; -} -- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - return 0.01; -} --(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ - return 0.01; -// return self.datasource.count > 0 ? 30 : 0.01; -} -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{ - return nil; //self.datasource.count > 0 ? self.headView : nil; -} -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"XPMomentsDynamicTableViewCell" forIndexPath:indexPath]; - MomentsInfoModel *monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - cell.isInUserDetail = YES; - cell.mineMomentsInfo = monentsInfo; - cell.isFillet = indexPath.row == self.datasource.count - 1; - return cell; - } - XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - if(indexPath.section == 0)return; - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; - MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if(monentsInfo.dynamicId == nil){ - return; - } - detailVC.momentsInfo = monentsInfo; - detailVC.delegate = self; - [self.navigationController pushViewController:detailVC animated:YES]; - } -} - -#pragma mark - XPMomentsTableViewCellDelegate -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { - if(monentsInfo.dynamicId == nil){ - [self showErrorToast:YMLocalizedString(@"XPMineUserDataViewController2")]; - return; - } - [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicCommon:(MomentsInfoModel *)monentsInfo{ - if(monentsInfo.dynamicId == nil){ - [self showErrorToast:YMLocalizedString(@"XPMineUserDataViewController3")]; - return; - } - XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; - detailVC.momentsInfo = monentsInfo; - detailVC.delegate = self; - [self.navigationController pushViewController:detailVC animated:YES]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsMineViewController0") confirmHandler:^{ - [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; - } cancelHandler:^{ - - }]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(nonnull MomentsInfoModel *)monentsInfo{ - [self showLoading]; - [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { - __block MomentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { - monentsInfos = obj; - *stop = YES; - } - }]; - if (monentsInfos) { - NSInteger section = [self.datasource indexOfObject:monentsInfo]; - [self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:section inSection:1]] withRowAnimation:UITableViewRowAnimationFade]; - } -} - -#pragma mark - XPMomentsDetailViewControllerDelegate -- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == dynamicId.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - XPMomentsMineProtocol -- (void)requesstShieldingSuccess:(NSString *)monentsInfo{ - [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} -- (void)likeMomentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.dynamicId isEqualToString:dynamicId]) { - NSInteger likeCount = obj.likeCount.integerValue; - if (status) { - likeCount += 1; - obj.isLike += 1; - } else { - likeCount -= 1; - obj.isLike -= 1; - } - obj.likeCount = @(likeCount).stringValue; - *stop = YES; - } - }]; - [self.tableView reloadData]; -} - -- (void)deleteMomentsSuccess:(NSString *)monentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController1")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:@"XPMomentsDynamicTableViewCell"]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - --(UIView *)headView{ - if (!_headView){ - _headView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, 30)]; - _headView.backgroundColor = [UIColor clearColor]; - UIView *bgView = [[UIView alloc]initWithFrame:CGRectMake(15, 0, KScreenWidth-30, 30)]; - [_headView addSubview:bgView]; - bgView.backgroundColor = [UIColor whiteColor]; - [bgView setCornerWithLeftTopCorner:8 rightTopCorner:8 bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth-30, 30)]; - UILabel *titleView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineUserDataViewController1") font:kFontMedium(15) textColor:[DJDKMIMOMColor inputTextColor]]; - [bgView addSubview:titleView]; - [titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(12); - make.leading.mas_equalTo(12); - }]; - } - return _headView; -} -@end diff --git a/YuMi/Modules/YMMine/View/XPPermissionsViewController.h b/YuMi/Modules/YMMine/View/XPPermissionsViewController.h deleted file mode 100644 index ba63cce..0000000 --- a/YuMi/Modules/YMMine/View/XPPermissionsViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMPermissionsViewController.h -// YUMI -// -// Created by zu on 2021/12/28. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPPermissionsViewController : BaseViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPPermissionsViewController.m b/YuMi/Modules/YMMine/View/XPPermissionsViewController.m deleted file mode 100644 index b639ccc..0000000 --- a/YuMi/Modules/YMMine/View/XPPermissionsViewController.m +++ /dev/null @@ -1,293 +0,0 @@ -// -// YMPermissionsViewController.m -// YUMI -// -// Created by zu on 2021/12/28. -// - -#import "XPPermissionsViewController.h" -#import -#import -#import -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" - -@interface XPPermissionCell : UITableViewCell - -@property (nonatomic, strong) UIImageView * icon; -@property (nonatomic, strong) UILabel * name; -@property (nonatomic, strong) UILabel * tip; - -@end - -@implementation XPPermissionCell - -- (instancetype)init { - if (self == [super init]) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = UIColor.clearColor; - [self.contentView addSubview:self.icon]; - [self.contentView addSubview:self.name]; - [self.contentView addSubview:self.tip]; - self.contentView.backgroundColor = DJDKMIMOMColor.appCellBackgroundColor; - self.contentView.layer.masksToBounds = YES; - self.contentView.layer.cornerRadius = 8; - [self.icon mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(15); - }]; - [self.name mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.icon.mas_trailing).offset(8); - make.top.mas_equalTo(self.contentView).offset(16); - }]; - [self.tip mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.icon.mas_trailing).offset(8); - make.bottom.mas_equalTo(self.contentView).offset(-16); - }]; - } - return self; -} - -- (UIImageView *)icon { - if (!_icon) { - _icon = [[UIImageView alloc] init]; - } - return _icon; -} - -- (UILabel *)name { - if (!_name) { - _name = [[UILabel alloc] init]; - _name.textColor = DJDKMIMOMColor.mainTextColor; - _name.font = [UIFont systemFontOfSize:14]; - } - return _name; -} - -- (UILabel *)tip { - if (!_tip) { - _tip = [[UILabel alloc] init]; - _tip.textColor = DJDKMIMOMColor.secondTextColor; - _tip.font = [UIFont systemFontOfSize:13]; - } - return _tip; -} - -@end - -@interface XPPermissionsViewController () - -@property (nonatomic,strong) UITableView * tableView; - -@property (nonatomic, strong) NSMutableArray * permissionIcons; -@property (nonatomic, strong) NSMutableArray * permissionNames; -@property (nonatomic, strong) NSMutableArray * permissionTips; - -@property (nonatomic, strong) UIView * empty; -@property (nonatomic, strong) UIImageView * emptyImage; -@property (nonatomic, strong) UILabel * emptyTip; - -@property (nonatomic, strong) UIView * footer; -@property (nonatomic, strong) UILabel * footerTip; -@property (nonatomic, strong) UIButton * gotoSetting; - -@end - -@implementation XPPermissionsViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = YMLocalizedString(@"XPPermissionsViewController0"); - [self.empty addSubview:self.emptyImage]; - [self.empty addSubview:self.emptyTip]; - [self.view addSubview:self.tableView]; - [self.footer addSubview:self.footerTip]; - [self.footer addSubview:self.gotoSetting]; - [self.view addSubview:self.footer]; -} - -- (void)viewDidLayoutSubviews { - [super viewDidLayoutSubviews]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.trailing.bottom.mas_equalTo(self.view).insets(UIEdgeInsetsMake(16, 16, 16, 16)); - }]; - [self.emptyImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.empty); - make.top.mas_equalTo(self.empty).offset(200); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - [self.emptyTip mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.empty); - make.top.mas_equalTo(self.emptyImage.mas_bottom).offset(16); - }]; - [self.footer mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight); - make.height.mas_equalTo(100); - }]; - [self.footerTip mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.footer); - make.top.mas_equalTo(self.footer).offset(24); - }]; - [self.gotoSetting mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.footer); - make.top.mas_equalTo(self.footerTip.mas_bottom).offset(40); - }]; -} - -- (void)viewWillAppear:(BOOL)animated { - PHAuthorizationStatus phStatus = [PHPhotoLibrary authorizationStatus]; - if (phStatus == PHAuthorizationStatusAuthorized) { - [self.permissionNames addObject:YMLocalizedString(@"XPPermissionsViewController1")]; - [self.permissionTips addObject:YMLocalizedString(@"XPPermissionsViewController2")]; - [self.permissionIcons addObject:@"mine_setting_permission_album"]; - } - - AVAuthorizationStatus microPhoneStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeAudio]; - if (microPhoneStatus == AVAuthorizationStatusAuthorized) { - [self.permissionNames addObject:YMLocalizedString(@"XPPermissionsViewController3")]; - [self.permissionTips addObject:YMLocalizedString(@"XPPermissionsViewController4")]; - [self.permissionIcons addObject:@"mine_setting_permission_voice"]; - } - - AVAuthorizationStatus cameraStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]; - if (cameraStatus == AVAuthorizationStatusAuthorized) { - [self.permissionNames addObject:YMLocalizedString(@"XPPermissionsViewController5")]; - [self.permissionTips addObject:YMLocalizedString(@"XPPermissionsViewController6")]; - [self.permissionIcons addObject:@"mine_setting_permission_camera"]; - } -} - -- (void)gotoSettingClick:(UIButton *)sender { - NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - if ([[UIApplication sharedApplication] canOpenURL:url]) { - [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil]; - } -} - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - tableView.backgroundView = self.permissionNames.count == 0 ? self.empty : nil; - return self.permissionNames.count; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - if (section == 0) { - return 0.001f; - } - return 16.f; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 70.f; -} - --(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - UIView *view = [[UIView alloc] init]; - view.backgroundColor = [UIColor clearColor]; - return view; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - NSInteger section = indexPath.section; - XPPermissionCell * cell = [[XPPermissionCell alloc] init]; - cell.icon.image = [UIImage imageNamed:[self.permissionIcons xpSafeObjectAtIndex:section]]; - cell.name.text = [self.permissionNames xpSafeObjectAtIndex:section]; - cell.tip.text = [self.permissionTips xpSafeObjectAtIndex:section]; - return cell; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.showsVerticalScrollIndicator = NO; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - [_tableView registerClass:[XPPermissionCell class] forCellReuseIdentifier:NSStringFromClass([XPPermissionCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)permissionIcons { - if (!_permissionIcons) { - _permissionIcons = [[NSMutableArray alloc] init]; - } - return _permissionIcons; -} - -- (NSMutableArray *)permissionNames { - if (!_permissionNames) { - _permissionNames = [[NSMutableArray alloc] init]; - } - return _permissionNames; -} - -- (NSMutableArray *)permissionTips { - if (!_permissionTips) { - _permissionTips = [[NSMutableArray alloc] init]; - } - return _permissionTips; -} - -- (UIView *)empty { - if (!_empty) { - _empty = [[UIView alloc] init]; - } - return _empty; -} - -- (UIImageView *)emptyImage { - if (!_emptyImage) { - _emptyImage = [[UIImageView alloc] init]; - _emptyImage.contentMode = UIViewContentModeScaleAspectFit; - _emptyImage.image = [UIImage imageNamed:@"common_empty"]; - } - return _emptyImage; -} - -- (UILabel *)emptyTip { - if (!_emptyTip) { - _emptyTip = [[UILabel alloc] init]; - _emptyTip.textColor = DJDKMIMOMColor.secondTextColor; - _emptyTip.font = [UIFont systemFontOfSize:12]; - _emptyTip.text = YMLocalizedString(@"XPPermissionsViewController7"); - } - return _emptyTip; -} - -- (UIView *)footer { - if (!_footer) { - _footer = [[UIView alloc] init]; - } - return _footer; -} - -- (UILabel *)footerTip { - if (!_footerTip) { - _footerTip = [[UILabel alloc] init]; - _footerTip.textColor = DJDKMIMOMColor.mainTextColor; - _footerTip.font = [UIFont systemFontOfSize:12]; - _footerTip.text = YMLocalizedString(@"XPPermissionsViewController8"); - } - return _footerTip; -} - -- (UIButton *)gotoSetting { - if (!_gotoSetting) { - _gotoSetting = [UIButton buttonWithType:UIButtonTypeCustom]; - [_gotoSetting setTitle:YMLocalizedString(@"XPPermissionsViewController9") forState:UIControlStateNormal]; - [_gotoSetting setTitleColor:DJDKMIMOMColor.appMainColor forState:UIControlStateNormal]; - _gotoSetting.titleLabel.font = [UIFont systemFontOfSize:14]; - _gotoSetting.titleLabel.adjustsFontSizeToFitWidth = YES; - [_gotoSetting addTarget:self action:@selector(gotoSettingClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _gotoSetting; -} - -@end diff --git a/YuMi/Modules/YMMine/View/XPPrivacyViewController.h b/YuMi/Modules/YMMine/View/XPPrivacyViewController.h deleted file mode 100644 index 9465b62..0000000 --- a/YuMi/Modules/YMMine/View/XPPrivacyViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMPrivacyViewController.h -// YUMI -// -// Created by zu on 2021/12/28. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPPrivacyViewController : BaseViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPPrivacyViewController.m b/YuMi/Modules/YMMine/View/XPPrivacyViewController.m deleted file mode 100644 index c78e93a..0000000 --- a/YuMi/Modules/YMMine/View/XPPrivacyViewController.m +++ /dev/null @@ -1,163 +0,0 @@ -// -// YMPrivacyViewController.m -// YUMI -// -// Created by zu on 2021/12/28. -// - -#import "XPPrivacyViewController.h" -#import -#import "XPMineSettingTableViewCell.h" -#import "XPMineSettingItemModel.h" -#import "XPWebViewController.h" -#import "XPPermissionsViewController.h" -#import "YUMIHtmlUrl.h" -#import "NSArray+Safe.h" - -@interface XPPrivacyViewController () - -@property (nonatomic, strong) UITableView * tableView; - -@property (nonatomic, strong) NSArray * datasource; - -@end - -@implementation XPPrivacyViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = YMLocalizedString(@"XPPrivacyViewController0"); - [self.view addSubview:self.tableView]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(0); - }]; -} - -- (void)pushWebViewWIthUrl:(NSString *)url { - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = url; - [self.navigationController pushViewController:webVC animated:YES]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 45; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPMineSettingTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMineSettingTableViewCell class])]; - if (cell == nil) { - cell = [[XPMineSettingTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineSettingTableViewCell class])]; - } - - cell.itemModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - switch (indexPath.row) { - case 0: - { - XPPermissionsViewController * pvc = [[XPPermissionsViewController alloc] init]; - [self.navigationController pushViewController:pvc animated:YES]; - } - break; - case 1: - [self pushWebViewWIthUrl:URLWithType(kPrivacyURL)]; - break; - case 2: - [self pushWebViewWIthUrl:URLWithType(kPrivacySDKURL)]; - break; - case 3: - [self pushWebViewWIthUrl:URLWithType(kPrivacyPersonalURL)]; - break; - case 4: - [self pushWebViewWIthUrl:URLWithType(kPrivacyDeviceURL)]; - break; - case 5: - [self pushWebViewWIthUrl:URLWithType(kUserRechargeAgrURL)]; - break; - case 6: - [self pushWebViewWIthUrl:URLWithType(kUserRegiServiceAgrURL)]; - break; - case 7: - [self pushWebViewWIthUrl:URLWithType(kLiveServiceAgrURL)]; - break; - case 8: - [self pushWebViewWIthUrl:URLWithType(kCommunitySpecURL)]; - break; - case 9: - [self pushWebViewWIthUrl:URLWithType(kAccountlogoutAgrURL)]; - break; - default: - break; - } -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.showsVerticalScrollIndicator = NO; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - [_tableView registerClass:[XPMineSettingTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMineSettingTableViewCell class])]; - } - return _tableView; -} - -- (NSArray *)datasource { - if (!_datasource) { - XPMineSettingItemModel * sysPermission = [[XPMineSettingItemModel alloc] init]; - sysPermission.title = YMLocalizedString(@"XPPrivacyViewController1"); - sysPermission.subTitle = @""; - - XPMineSettingItemModel * privacy = [[XPMineSettingItemModel alloc] init]; - privacy.title = YMLocalizedString(@"XPPrivacyViewController2"); - privacy.subTitle = @""; - - XPMineSettingItemModel * sdk = [[XPMineSettingItemModel alloc] init]; - sdk.title = YMLocalizedString(@"XPPrivacyViewController3"); - sdk.subTitle = @""; - - XPMineSettingItemModel * personalInfo = [[XPMineSettingItemModel alloc] init]; - personalInfo.title = YMLocalizedString(@"XPPrivacyViewController4"); - personalInfo.subTitle = @""; - - XPMineSettingItemModel * permissionList = [[XPMineSettingItemModel alloc] init]; - permissionList.title = YMLocalizedString(@"XPPrivacyViewController5"); - permissionList.subTitle = @""; - - XPMineSettingItemModel * userChargeProtocol = [[XPMineSettingItemModel alloc] init]; - userChargeProtocol.title = YMLocalizedString(@"XPPrivacyViewController6"); - userChargeProtocol.subTitle = @""; - - XPMineSettingItemModel *userRegistProtocol = [[XPMineSettingItemModel alloc] init]; - userRegistProtocol.title = YMLocalizedString(@"XPPrivacyViewController7"); - userRegistProtocol.subTitle = @""; - - XPMineSettingItemModel * liveServiceProtocol = [[XPMineSettingItemModel alloc] init]; - liveServiceProtocol.title = YMLocalizedString(@"XPPrivacyViewController8"); - liveServiceProtocol.subTitle = @""; - - XPMineSettingItemModel * communitySpec = [[XPMineSettingItemModel alloc] init]; - communitySpec.title = YMLocalizedString(@"XPPrivacyViewController9"); - communitySpec.subTitle = @""; - - XPMineSettingItemModel * accountLogout = [[XPMineSettingItemModel alloc] init]; - accountLogout.title = YMLocalizedString(@"XPPrivacyViewController10"); - accountLogout.subTitle = @""; - - _datasource = @[sysPermission, privacy, sdk, personalInfo, permissionList, userChargeProtocol, userRegistProtocol, liveServiceProtocol, communitySpec,accountLogout]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMMine/View/XPSimpleMineHeaderView.h b/YuMi/Modules/YMMine/View/XPSimpleMineHeaderView.h deleted file mode 100644 index 6694ba4..0000000 --- a/YuMi/Modules/YMMine/View/XPSimpleMineHeaderView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMSimpleMineHeaderView.h -// YUMI -// -// Created by XY on 2023/2/20. -// - -#import -#import "XPMineItemModel.h" - -@class UserInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPSimpleMineHeaderViewDelegate - -- (void)headerViewBtnActionType:(XPMineItemType)itemType; - -@end - -@interface XPSimpleMineHeaderView : UIView -/// 用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; - -@property (nonatomic, weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/XPSimpleMineHeaderView.m b/YuMi/Modules/YMMine/View/XPSimpleMineHeaderView.m deleted file mode 100644 index 9bdb098..0000000 --- a/YuMi/Modules/YMMine/View/XPSimpleMineHeaderView.m +++ /dev/null @@ -1,355 +0,0 @@ -// -// YMSimpleMineHeaderView.m -// YUMI -// -// Created by XY on 2023/2/20. -// - -#import "XPSimpleMineHeaderView.h" -#import "NetImageView.h" -#import -#import "DJDKMIMOMColor.h" -#import "XPButton.h" - -/// M -#import "UserInfoModel.h" - -@interface XPSimpleMineHeaderView() - -/// 背景图 -@property (nonatomic, strong) NetImageView *bgImageView; -/// 毛玻璃 -@property (nonatomic, strong) UIVisualEffectView *effectView; -/// 昵称 -@property (nonatomic, strong) UILabel *nicknameLabel; -/// ID -@property (nonatomic, strong) UILabel *idLabel; -/// 头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -/// 关注、粉丝、访客、浏览 -@property (nonatomic, strong) UIStackView *numStackView; -@property (nonatomic, strong) UIButton *attentionBtn; -@property (nonatomic, strong) UIButton *fansBtn; -@property (nonatomic, strong) UIButton *visitorBtn; -@property (nonatomic, strong) UIButton *browseBtn; -/// 钱包、房间、收藏、等级 -@property (nonatomic, strong) UIStackView *funcStackView; -@property (nonatomic, strong) XPButton *walletBtn; -@property (nonatomic, strong) XPButton *roomBtn; -@property (nonatomic, strong) XPButton *collectionBtn; -@property (nonatomic, strong) XPButton *gradeBtn; - -@end - -@implementation XPSimpleMineHeaderView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self createUI]; - } - return self; -} - -- (void)createUI { - [self addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.effectView]; - [self addSubview:self.nicknameLabel]; - [self addSubview:self.idLabel]; - [self addSubview:self.avatarImageView]; - [self addSubview:self.numStackView]; - [self.numStackView addArrangedSubview:self.attentionBtn]; - [self.numStackView addArrangedSubview:self.fansBtn]; - [self.numStackView addArrangedSubview:self.visitorBtn]; - [self.numStackView addArrangedSubview:self.browseBtn]; - [self addSubview:self.funcStackView]; - [self.funcStackView addArrangedSubview:self.walletBtn]; - [self.funcStackView addArrangedSubview:self.roomBtn]; - [self.funcStackView addArrangedSubview:self.collectionBtn]; - [self.funcStackView addArrangedSubview:self.gradeBtn]; - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(260); - }]; - [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.bgImageView); - }]; - [self.nicknameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avatarImageView).offset(-5); - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(self.avatarImageView.mas_leading).offset(-5); - }]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nicknameLabel.mas_bottom).offset(2); - make.leading.mas_equalTo(self.nicknameLabel); - make.trailing.mas_equalTo(self.nicknameLabel); - }]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.bgImageView); - make.trailing.mas_equalTo(-16); - make.width.height.mas_equalTo(86); - }]; - [self.numStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-16); - make.bottom.mas_equalTo(self.funcStackView.mas_top).offset(-10); - make.height.mas_equalTo(30); - }]; - [self.funcStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-16); - make.centerY.mas_equalTo(self.bgImageView.mas_bottom); - make.height.mas_equalTo(70); - }]; - -} - -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - self.idLabel.text = [NSString stringWithFormat:@"ID:%ld", (long)_userInfo.erbanNo]; - self.nicknameLabel.text = _userInfo.nick.length > 0 ? _userInfo.nick : @""; - self.avatarImageView.imageUrl = userInfo.avatar; - self.bgImageView.imageUrl = userInfo.avatar; - - NSString *attent = YMLocalizedString(@"XPSimpleMineHeaderView0"); - NSString *attentStr = [NSString stringWithFormat:@"%@%ld",attent,_userInfo.followNum]; - NSMutableAttributedString *attentAttrStr = [[NSMutableAttributedString alloc] initWithString:attentStr]; - [attentAttrStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium] range:NSMakeRange(attent.length, attentStr.length-attent.length)]; - [self.attentionBtn setAttributedTitle:attentAttrStr forState:UIControlStateNormal]; - - NSString *fans = YMLocalizedString(@"XPSimpleMineHeaderView1"); - NSString *fansStr = [NSString stringWithFormat:@"%@%ld",fans,_userInfo.fansNum]; - NSMutableAttributedString *fansAttrStr = [[NSMutableAttributedString alloc] initWithString:fansStr]; - [fansAttrStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium] range:NSMakeRange(fans.length, fansStr.length-fans.length)]; - [self.fansBtn setAttributedTitle:fansAttrStr forState:UIControlStateNormal]; - - NSString *visitor = YMLocalizedString(@"XPSimpleMineHeaderView2"); - NSString *visitorStr = [NSString stringWithFormat:@"%@%ld",visitor,_userInfo.visitNum]; - NSMutableAttributedString *visitorAttrStr = [[NSMutableAttributedString alloc] initWithString:visitorStr]; - [visitorAttrStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium] range:NSMakeRange(visitor.length, visitorStr.length-visitor.length)]; - [self.visitorBtn setAttributedTitle:visitorAttrStr forState:UIControlStateNormal]; - - NSString *browse = YMLocalizedString(@"XPSimpleMineHeaderView3"); - NSString *browseStr = [NSString stringWithFormat:@"%@%ld",browse,_userInfo.inRoomNum]; - NSMutableAttributedString *browseAttrStr = [[NSMutableAttributedString alloc] initWithString:browseStr]; - [browseAttrStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium] range:NSMakeRange(browse.length, browseStr.length-browse.length)]; - [self.browseBtn setAttributedTitle:browseAttrStr forState:UIControlStateNormal]; - } -} - -- (void)btnAction:(UIButton *)button { - if (self.delegate && [self.delegate respondsToSelector:@selector(headerViewBtnActionType:)]) { - XPMineItemType itemType = -INT_MAX; - if (button == self.attentionBtn) { - itemType = XPMineItemType_Attention_List; - }else if (button == self.fansBtn) { - itemType = XPMineItemType_Fans_List; - }else if (button == self.visitorBtn) { - itemType = XPMineItemType_Visitor; - }else if (button == self.browseBtn) { - itemType = XPMineItemType_Foot_Print; - }else if (button == self.walletBtn) { - itemType = XPMineItemType_Account; - }else if (button == self.roomBtn) { - itemType = XPMineItemType_My_Room; - }else if (button == self.collectionBtn) { - itemType = XPMineItemType_Collect_Room; - }else if (button == self.gradeBtn) { - itemType = -1; //我的等级 - } - [self.delegate headerViewBtnActionType:itemType]; - } -} - -/// 点击头像 -- (void)tapAvatarImageView { - if (self.delegate && [self.delegate respondsToSelector:@selector(headerViewBtnActionType:)]) { - [self.delegate headerViewBtnActionType:XPMineItemType_PersonInfo]; - } -} - -#pragma mark - 懒加载 - -- (NetImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[NetImageView alloc] init]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - _bgImageView.clipsToBounds = YES; - } - return _bgImageView; -} - -- (UIVisualEffectView *)effectView { - if (!_effectView) { - UIBlurEffect *blur = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; - _effectView = [[UIVisualEffectView alloc] initWithEffect:blur]; - _effectView.alpha = 0.9; - } - return _effectView; -} - -- (UILabel *)nicknameLabel { - if (!_nicknameLabel) { - _nicknameLabel = [[UILabel alloc] init]; - _nicknameLabel.textColor = UIColor.whiteColor; - _nicknameLabel.font = [UIFont systemFontOfSize:20 weight:UIFontWeightMedium]; - } - return _nicknameLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.textColor = [UIColor.whiteColor colorWithAlphaComponent:0.4]; - _idLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - } - return _idLabel; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.userInteractionEnabled = YES; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - _avatarImageView.layer.borderWidth = 2; - _avatarImageView.layer.borderColor = [UIColor.whiteColor colorWithAlphaComponent:0.4].CGColor; - _avatarImageView.layer.cornerRadius = 86/2; - _avatarImageView.clipsToBounds = YES; - - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAvatarImageView)]; - [_avatarImageView addGestureRecognizer:tap]; - } - return _avatarImageView; -} - -- (UIStackView *)numStackView { - if (!_numStackView) { - _numStackView = [[UIStackView alloc] init]; - _numStackView.axis = UILayoutConstraintAxisHorizontal; - _numStackView.distribution = UIStackViewDistributionFillEqually; - _numStackView.alignment = UIStackViewAlignmentFill; - _numStackView.spacing = 2; - } - return _numStackView; -} - -- (UIButton *)attentionBtn { - if (!_attentionBtn) { - _attentionBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_attentionBtn setTitleColor:UIColor.whiteColor forState:UIControlStateNormal]; - _attentionBtn.titleLabel.font = [UIFont systemFontOfSize:10]; - _attentionBtn.hidden = YES; - [_attentionBtn addTarget:self action:@selector(btnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _attentionBtn; -} - -- (UIButton *)fansBtn { - if (!_fansBtn) { - _fansBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_fansBtn setTitleColor:UIColor.whiteColor forState:UIControlStateNormal]; - _fansBtn.titleLabel.font = [UIFont systemFontOfSize:10]; - _fansBtn.hidden = YES; - [_fansBtn addTarget:self action:@selector(btnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _fansBtn; -} - -- (UIButton *)visitorBtn { - if (!_visitorBtn) { - _visitorBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_visitorBtn setTitleColor:UIColor.whiteColor forState:UIControlStateNormal]; - _visitorBtn.titleLabel.font = [UIFont systemFontOfSize:10]; - [_visitorBtn addTarget:self action:@selector(btnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _visitorBtn; -} - -- (UIButton *)browseBtn { - if (!_browseBtn) { - _browseBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_browseBtn setTitleColor:UIColor.whiteColor forState:UIControlStateNormal]; - _browseBtn.titleLabel.font = [UIFont systemFontOfSize:10]; - [_browseBtn addTarget:self action:@selector(btnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _browseBtn; -} - -- (UIStackView *)funcStackView { - if (!_funcStackView) { - _funcStackView = [[UIStackView alloc] init]; - _funcStackView.axis = UILayoutConstraintAxisHorizontal; - _funcStackView.distribution = UIStackViewDistributionFillEqually; - _funcStackView.alignment = UIStackViewAlignmentFill; - _funcStackView.spacing = 2; - _funcStackView.backgroundColor = UIColor.whiteColor; - _funcStackView.layer.cornerRadius = 20; - _funcStackView.clipsToBounds = YES; - } - return _funcStackView; -} - -- (XPButton *)walletBtn { - if (!_walletBtn) { - _walletBtn = [XPButton buttonWithType:UIButtonTypeCustom]; - [_walletBtn setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _walletBtn.titleLabel.font = [UIFont systemFontOfSize:10]; - [_walletBtn setTitle:YMLocalizedString(@"XPSimpleMineHeaderView4") forState:UIControlStateNormal]; - [_walletBtn setImage:[UIImage imageNamed:@"mine_wallet"] forState:UIControlStateNormal]; - [_walletBtn addTarget:self action:@selector(btnAction:) forControlEvents:UIControlEventTouchUpInside]; - _walletBtn.buttonStyle = XPButtonImageTop; - _walletBtn.padding = 4; - - } - return _walletBtn; -} - -- (XPButton *)roomBtn { - if (!_roomBtn) { - _roomBtn = [XPButton buttonWithType:UIButtonTypeCustom]; - [_roomBtn setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _roomBtn.titleLabel.font = [UIFont systemFontOfSize:10]; - [_roomBtn setTitle:YMLocalizedString(@"XPSimpleMineHeaderView5") forState:UIControlStateNormal]; - [_roomBtn setImage:[UIImage imageNamed:@"mine_room"] forState:UIControlStateNormal]; - [_roomBtn addTarget:self action:@selector(btnAction:) forControlEvents:UIControlEventTouchUpInside]; - _roomBtn.buttonStyle = XPButtonImageTop; - _roomBtn.padding = 4; - } - return _roomBtn; -} - -- (XPButton *)collectionBtn { - if (!_collectionBtn) { - _collectionBtn = [XPButton buttonWithType:UIButtonTypeCustom]; - [_collectionBtn setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _collectionBtn.titleLabel.font = [UIFont systemFontOfSize:10]; - [_collectionBtn setTitle:YMLocalizedString(@"XPSimpleMineHeaderView6") forState:UIControlStateNormal]; - [_collectionBtn setImage:[UIImage imageNamed:@"mine_collection"] forState:UIControlStateNormal]; - [_collectionBtn addTarget:self action:@selector(btnAction:) forControlEvents:UIControlEventTouchUpInside]; - _collectionBtn.buttonStyle = XPButtonImageTop; - _collectionBtn.padding = 4; - } - return _collectionBtn; -} - -- (XPButton *)gradeBtn { - if (!_gradeBtn) { - _gradeBtn = [XPButton buttonWithType:UIButtonTypeCustom]; - [_gradeBtn setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _gradeBtn.titleLabel.font = [UIFont systemFontOfSize:10]; - [_gradeBtn setTitle:YMLocalizedString(@"XPSimpleMineHeaderView7") forState:UIControlStateNormal]; - [_gradeBtn setImage:[UIImage imageNamed:@"mine_grade"] forState:UIControlStateNormal]; - [_gradeBtn addTarget:self action:@selector(btnAction:) forControlEvents:UIControlEventTouchUpInside]; - _gradeBtn.buttonStyle = XPButtonImageTop ; - _gradeBtn.hidden = YES; - _gradeBtn.padding = 4; - } - return _gradeBtn; -} - -@end diff --git a/YuMi/Modules/YMMonents/Model/MomentsTopicModel.h b/YuMi/Modules/YMMonents/Model/MomentsTopicModel.h deleted file mode 100644 index fe70ed4..0000000 --- a/YuMi/Modules/YMMonents/Model/MomentsTopicModel.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// MonentsTopicModel.h -// YUMI -// -// Created by YUMI on 2022/5/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface MomentsTopicModel : PIBaseModel -///创建人id -@property (nonatomic, copy) NSString *ownerUid; -///名称 -@property (nonatomic, copy) NSString *name; -//convert from id -@property (nonatomic, copy) NSString *tId; -///封面 -@property (nonatomic, copy) NSString *icon; -///描述 convert from description -@property (nonatomic, copy) NSString *desc; -///id -@property (nonatomic, copy) NSString *worldId; -///名称 -@property (nonatomic, copy) NSString *worldName; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Model/MomentsTopicModel.m b/YuMi/Modules/YMMonents/Model/MomentsTopicModel.m deleted file mode 100644 index 57a947f..0000000 --- a/YuMi/Modules/YMMonents/Model/MomentsTopicModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// MonentsTopicModel.m -// YUMI -// -// Created by YUMI on 2022/5/18. -// - -#import "MomentsTopicModel.h" - -@implementation MomentsTopicModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"tId":@"id", @"desc":@"description"}; -} - -@end diff --git a/YuMi/Modules/YMMonents/Model/MonentsCommentModel.h b/YuMi/Modules/YMMonents/Model/MonentsCommentModel.h deleted file mode 100644 index e78fd8a..0000000 --- a/YuMi/Modules/YMMonents/Model/MonentsCommentModel.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// MonentsCommentModel.h -// YUMI -// -// Created by YUMI on 2022/6/22. -// - -#import -#import "MonentsCommentReplyModel.h" -NS_ASSUME_NONNULL_BEGIN -@interface MonentsCommentModel : PIBaseModel -///是否刷新高度 -@property (nonatomic,assign) BOOL isReloadHeight; -///评论的高度 -@property (nonatomic,assign) CGFloat commentRowHeight; -/// 昵称 -@property (nonatomic,copy) NSString *nick; -/// 头像 -@property (nonatomic,copy) NSString *avatar; -/// 用户 uid -@property (nonatomic,copy) NSString *uid; -///评论内容 -@property (nonatomic,copy) NSString *content; -///时间 -@property (nonatomic, copy) NSString *publishTime; -/// 当前评论id -@property (nonatomic, copy) NSString *commentId; -///回复的内容 -@property (nonatomic,strong) MonentsCommentReplyModel *replyInfo; -/// 是否是楼主 -@property (nonatomic, assign) BOOL landLordFlag; -@end - - -@interface MonentsCommentListModel : PIBaseModel -///评论的列表 -@property (nonatomic,strong) NSArray *commentList; -///下一个评论的时间戳 -@property (nonatomic,copy) NSString *nextTimestamp; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Model/MonentsCommentModel.m b/YuMi/Modules/YMMonents/Model/MonentsCommentModel.m deleted file mode 100644 index dff4f1e..0000000 --- a/YuMi/Modules/YMMonents/Model/MonentsCommentModel.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// MonentsCommentModel.m -// YUMI -// -// Created by YUMI on 2022/6/22. -// - -#import "MonentsCommentModel.h" - -@implementation MonentsCommentModel - - -@end - - -@implementation MonentsCommentListModel - -+ (NSDictionary *)objectClassInArray { - return @{@"commentList": MonentsCommentModel.class}; -} - -@end diff --git a/YuMi/Modules/YMMonents/Model/MonentsCommentReplyModel.h b/YuMi/Modules/YMMonents/Model/MonentsCommentReplyModel.h deleted file mode 100644 index b84cd0f..0000000 --- a/YuMi/Modules/YMMonents/Model/MonentsCommentReplyModel.h +++ /dev/null @@ -1,51 +0,0 @@ -// -// MonentsCommentReplyModel.h -// YUMI -// -// Created by YUMI on 2022/6/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MonentsReplyModel; -@interface MonentsCommentReplyModel : PIBaseModel -@property (nonatomic, strong) NSMutableArray *replyList;// 剩余数量 -///剩余多少可以展开 -@property (nonatomic, assign) NSInteger leftCount; -///下一个时间 -@property (nonatomic, copy) NSString *nextTimestamp; -@end - - -@interface MonentsReplyModel : PIBaseModel -///回复的高度 -@property (nonatomic,assign) CGFloat replyRowHeight; -/// 头像 -@property (nonatomic,copy) NSString *avatar; -/// 用户uid -@property (nonatomic,copy) NSString *uid; -/// 用户昵称 -@property (nonatomic,copy) NSString *nick; -/// 回复评论的评论id -@property (nonatomic,copy) NSString *toCommentId; -/// 回复评论的uid -@property (nonatomic,copy) NSString *toUid; -/// 回复评论的昵称 -@property (nonatomic,copy) NSString *toNick; -/// 评论内容 -@property (nonatomic,copy) NSString *content; -/// 发布时间 -@property (nonatomic,copy) NSString *publishTime; -/// 是否是楼主 -@property (nonatomic,assign) BOOL landLordFlag; -/// 回复评论的评论id -@property (nonatomic,copy) NSString *replyId; -///显示的富文本 -@property (nonatomic,strong) NSAttributedString *contentAttribute; - -- (void)createContentAttribute; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Model/MonentsCommentReplyModel.m b/YuMi/Modules/YMMonents/Model/MonentsCommentReplyModel.m deleted file mode 100644 index 03f35cd..0000000 --- a/YuMi/Modules/YMMonents/Model/MonentsCommentReplyModel.m +++ /dev/null @@ -1,34 +0,0 @@ -// -// MonentsCommentReplyModel.m -// YUMI -// -// Created by YUMI on 2022/6/22. -// - -#import "MonentsCommentReplyModel.h" -#import "DJDKMIMOMColor.h" -#import "QEmotionHelper.h" - -@implementation MonentsCommentReplyModel -+ (NSDictionary *)objectClassInArray { - return @{@"replyList": MonentsReplyModel.class}; -} -@end - - -@implementation MonentsReplyModel -- (void)createContentAttribute { - if (self.contentAttribute == nil) { - QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper]; - NSString * toNick = [NSString stringWithFormat:@"@%@", _toNick]; - NSString *title = [NSString stringWithFormat:@"%@%@",toNick, _content.length > 0 ? _content : @""]; - NSMutableAttributedString * attribute = [faceManager attributedStringByText:title font:[UIFont systemFontOfSize:15]]; - if ([attribute.string containsString:toNick]) { - NSRange range = [attribute.string rangeOfString:toNick]; - [attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor appMainColor] range:range]; - } - self.contentAttribute = attribute; - } -} - -@end diff --git a/YuMi/Modules/YMMonents/Model/MonentsInteractiveModel.h b/YuMi/Modules/YMMonents/Model/MonentsInteractiveModel.h deleted file mode 100644 index 6d7bfd7..0000000 --- a/YuMi/Modules/YMMonents/Model/MonentsInteractiveModel.h +++ /dev/null @@ -1,65 +0,0 @@ -// -// MonentsInteractiveModel.h -// YUMI -// -// Created by YUMI on 2022/5/19. -// - -#import -#import "MomentsInfoModel.h" -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, MonentsInteractiveActionType) { - ///评论 - MonentsInteractiveActionType_Comment = 1, - ///回复 - MonentsInteractiveActionType_Reply, - ///点赞 - MonentsInteractiveActionType_Like, - ///分享 - MonentsInteractiveActionType_Share -}; - -@interface MonentsInteractiveModel : PIBaseModel -///msgType为2时为评论id -@property (nonatomic,assign) NSInteger targetId; -///类型 0：纯文本，2图片， -@property (nonatomic,assign) MonentsContentType type; -///动态内容 -@property (nonatomic,copy) NSString *content; -///性别 -@property (nonatomic,assign) GenderType gender; -///年龄 -@property (nonatomic,assign) NSInteger age; -///动态id -@property (nonatomic,copy) NSString *dynamicId; -///消息id -@property (nonatomic,copy) NSString *msgId; -///用户的uid -@property (nonatomic,assign) NSInteger uid; -///动作类型，1-评论,2-回复,3-点赞,4-分享 -@property (nonatomic,assign) MonentsInteractiveActionType actionType; -///消息，如"赞了你的动态" -@property (nonatomic,copy) NSString *message; -///类型，1-动态，2-评论(回复也算评论) -@property (nonatomic,assign) NSInteger msgType; -///昵称 -@property (nonatomic,copy) NSString *nick; -///头像 -@property (nonatomic,copy) NSString *avatar; -///目标对象uid -@property (nonatomic,copy) NSString *targetUid; -///发布时间 -@property (nonatomic,copy) NSString *publishTime; -///动态发布者uid -@property (nonatomic,copy) NSString *dynamicUid; -///话题id -@property (nonatomic,copy) NSString *worldId; -///话题的名称 -@property (nonatomic,copy) NSString *worldName; -///动态的图片 -@property (nonatomic,strong) MomentsPicInfoModel *dynamicRes; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Model/MonentsInteractiveModel.m b/YuMi/Modules/YMMonents/Model/MonentsInteractiveModel.m deleted file mode 100644 index e7e86ea..0000000 --- a/YuMi/Modules/YMMonents/Model/MonentsInteractiveModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MonentsInteractiveModel.m -// YUMI -// -// Created by YUMI on 2022/5/19. -// - -#import "MonentsInteractiveModel.h" - -@implementation MonentsInteractiveModel - -@end diff --git a/YuMi/Modules/YMMonents/Model/MonentsPicResInfo.h b/YuMi/Modules/YMMonents/Model/MonentsPicResInfo.h deleted file mode 100644 index 3d4559d..0000000 --- a/YuMi/Modules/YMMonents/Model/MonentsPicResInfo.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// MonentsPicResInfo.h -// YUMI -// -// Created by YUMI on 2022/8/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface MonentsPicResInfo : PIBaseModel -// 图片key -@property (nonatomic, copy) NSString *key; -// 图片url -@property (nonatomic, copy) NSString *path; -// 图片类型 gif, png, jpeg -@property (nonatomic, copy) NSString *format; -// 宽 -@property (nonatomic, assign) CGFloat w; -// 高 -@property (nonatomic, assign) CGFloat h; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Model/MonentsPicResInfo.m b/YuMi/Modules/YMMonents/Model/MonentsPicResInfo.m deleted file mode 100644 index 806c4ca..0000000 --- a/YuMi/Modules/YMMonents/Model/MonentsPicResInfo.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MonentsPicResInfo.m -// YUMI -// -// Created by YUMI on 2022/8/16. -// - -#import "MonentsPicResInfo.h" - -@implementation MonentsPicResInfo - -@end diff --git a/YuMi/Modules/YMMonents/Model/MonentsUnReadModel.h b/YuMi/Modules/YMMonents/Model/MonentsUnReadModel.h deleted file mode 100644 index 6a2a7a8..0000000 --- a/YuMi/Modules/YMMonents/Model/MonentsUnReadModel.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// MonentsUnReadModel.h -// YUMI -// -// Created by YUMI on 2022/5/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface MonentsUnReadModel : PIBaseModel -/// 总计未读消息数 -@property (nonatomic, assign) NSInteger total; -/// 评论未读消息数 -@property (nonatomic, assign) NSInteger comment; -/// 分享未读消息数 -@property (nonatomic, assign) NSInteger share; -/// 回复未读消息数 -@property (nonatomic, assign) NSInteger reply; -/// 点赞未读消息数 -@property (nonatomic, assign) NSInteger like; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Model/MonentsUnReadModel.m b/YuMi/Modules/YMMonents/Model/MonentsUnReadModel.m deleted file mode 100644 index f420204..0000000 --- a/YuMi/Modules/YMMonents/Model/MonentsUnReadModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MonentsUnReadModel.m -// YUMI -// -// Created by YUMI on 2022/5/19. -// - -#import "MonentsUnReadModel.h" - -@implementation MonentsUnReadModel - -@end diff --git a/YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.h b/YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.h deleted file mode 100644 index 6e30599..0000000 --- a/YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.h +++ /dev/null @@ -1,51 +0,0 @@ -// -// YMMonentsLayoutConfig.h -// YUMI -// -// Created by YUMI on 2022/5/12. -// - -#import -#import "YUMIMacroUitls.h" -NS_ASSUME_NONNULL_BEGIN -#define kMONENTS_CONTENT_LEFT_PADDING 67 -#define kMONENTS_CONTENT_RIGHT_PADDING 36 -#define kMONENTS_CONTENT_MAX_WIDTH (KScreenWidth - kMONENTS_CONTENT_LEFT_PADDING - kMONENTS_CONTENT_RIGHT_PADDING) -#define kMOMENTS_PIC_ONE_WIDTH 200 ///只有一个动态图片的高度 -#define kMOMENTS_PIC_SPACE 4 ///图片之间的间隙的宽度或者高度 -#define kMOMENTS_USER_INFO_HEIGHT 60 ///用户信息的高度 -#define kMOMENTS_TOOL_BAR_HEIGHT 58 ///底部操作栏的高度 -#define kMOMENTS_CONTENT_SPACAE_HEIGHT 12 /// 每个内容之间下面的间隙的高度 -#define kMOMENTS_TEXT_TOPIC_HEIGHT 20 /// 话题的高度 -#define kMOMENTS_FOLD_HEIGHT 20 /// 展开 关闭的高度 -#pragma mark - 评论的配置 -#define kMONENTS_COMMENT_LEFT_PADDING 15 ///评论左的间隙 -#define kMONENTS_COMMENT_RIGHT_PADDING 25 ///评论右的间隙 -#define kMONENTS_COMMENT_AVATAR_NICK_PADDING 10 ///头像昵称之间的间隙 -#define KMONENTS_COMMENT_AVATAR_WIDTH 45 ///评论的头像大小 -#define KMONENTS_COMMENT_MAX_WIDTH (KScreenWidth - KMONENTS_COMMENT_AVATAR_WIDTH - kMONENTS_COMMENT_LEFT_PADDING - kMONENTS_COMMENT_RIGHT_PADDING - kMONENTS_COMMENT_AVATAR_NICK_PADDING) ///评论内容的最大宽度 -#pragma mark - 评论回复的配置 -#define KMONENTS_COMMENT_REPLY_AVATAR_WIDTH 30 ///评论回复的头像大小 -#define kMONENTS_COMMENT_REPLY_LEFT_PADDING (kMONENTS_COMMENT_LEFT_PADDING + kMONENTS_COMMENT_RIGHT_PADDING + kMONENTS_COMMENT_AVATAR_NICK_PADDING) ///回复这左边的间隙 -#define kMOMENTS_COMMENT_REPLY_MAX_WIDTH (KMONENTS_COMMENT_MAX_WIDTH - KMONENTS_COMMENT_REPLY_AVATAR_WIDTH - kMONENTS_COMMENT_AVATAR_NICK_PADDING) ///评论回复内容的最大宽度 - -#pragma mark - 审核UI配置 -#define kSIMPLE_MONENTS_CONTENT_LEFT_PADDING 16 ///动态内容左边间距 -#define kSIMPLE_MONENTS_CONTENT_RIGHT_PADDING 16 ///动态内容右边间距 -#define kSIMPLE_MOMENTS_CONTENT_MAX_WIDTH (KScreenWidth - kSIMPLE_MONENTS_CONTENT_LEFT_PADDING - kSIMPLE_MONENTS_CONTENT_RIGHT_PADDING) ///动态内容最大宽度 - -#define KSIMPLE_MONENTS_COMMENT_AVATAR_WIDTH 40 ///评论的头像大小 - -@class MomentsInfoModel, MonentsCommentModel; -@interface XPMomentsLayoutConfig : NSObject -+ (void)layoutSimpleMomentsModel:(MomentsInfoModel *)monents; -+ (void)layoutMomentsModel:(MomentsInfoModel *)monents; -+ (CGFloat)momentsPicHeight:(MomentsInfoModel *)monents; -+ (CGFloat)momentsContentHeight:(MomentsInfoModel *)monents; -///计算评论的高度 -+ (CGFloat)commentCommentRowHeight:(MonentsCommentModel * )comment; -+ (void)layoutMonentsModelWithDynamic:(MomentsInfoModel *)monents; -+ (void)getNewLayoutMomentsModelWithDynamic:(MomentsInfoModel *)monents; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.m b/YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.m deleted file mode 100644 index ab463fa..0000000 --- a/YuMi/Modules/YMMonents/Presenter/XPMomentsLayoutConfig.m +++ /dev/null @@ -1,317 +0,0 @@ -// -// YMMonentsLayoutConfig.m -// YUMI -// -// Created by YUMI on 2022/5/12. -// - -#import "XPMomentsLayoutConfig.h" - -#import "DJDKMIMOMColor.h" -///Model -#import "MomentsInfoModel.h" -#import "MonentsCommentModel.h" -#import "QEmotionHelper.h" - -@implementation XPMomentsLayoutConfig - -#pragma mark - 审核的布局 -+ (void)getNewLayoutMomentsModelWithDynamic:(MomentsInfoModel *)moments { - CGFloat rowHeight = 10; - ///用户信息和文字之间的间隙 - rowHeight += kMOMENTS_CONTENT_SPACAE_HEIGHT; - ///文字内容的高度 - rowHeight += [self momentsContentHeight:moments]; - ///图片的高度 - rowHeight += [self getNewMomentsPicHeight:moments]; - ///如果没有图片的话 间隙就只有一个 - if (moments.type == MomentsContentType_Picture && moments.content.length > 0) { - rowHeight += (kMOMENTS_CONTENT_SPACAE_HEIGHT); - } - ///话题的高度 - if (moments.worldId > 0) { - rowHeight += kMOMENTS_TEXT_TOPIC_HEIGHT; - } - ///底部操作栏的高度 - rowHeight += kMOMENTS_TOOL_BAR_HEIGHT; - moments.rowHeight = rowHeight; -} -+ (CGFloat)getNewMomentsPicHeight:(MomentsInfoModel *)moments { - ///计算图片的高度 - NSInteger picCount = moments.dynamicResList.count; - CGFloat picHeight = 0; - CGFloat width = KScreenWidth-27*2; - if (picCount == 0) { - picHeight = 0; - } else if(picCount == 1) { - picHeight = width; - } else if(picCount == 2) { - picHeight = (width - kMOMENTS_PIC_SPACE) / 2; - } else { - if (picCount > 9) { - picCount = 9; - } - CGFloat itemWidth = (width - kMOMENTS_PIC_SPACE * 2) / 3; - NSInteger page = picCount % 3; - NSInteger line = picCount / 3; - if (page == 0) { - picHeight = itemWidth * line + (line -1)* kMOMENTS_PIC_SPACE; - } else { - picHeight = itemWidth * (line +1) + line * kMOMENTS_PIC_SPACE; - } - } - moments.picHeight = picHeight; - return picHeight; -} -+ (void)layoutMonentsModelWithDynamic:(MomentsInfoModel *)moments { - CGFloat rowHeight = 10; - ///用户信息和文字之间的间隙 - rowHeight += kMOMENTS_CONTENT_SPACAE_HEIGHT; - ///文字内容的高度 - rowHeight += [self momentsContentHeight:moments]; - ///图片的高度 - rowHeight += [self momentsPicHeight:moments]; - ///如果没有图片的话 间隙就只有一个 - if (moments.type == MomentsContentType_Picture && moments.content.length > 0) { - rowHeight += (kMOMENTS_CONTENT_SPACAE_HEIGHT); - } - ///话题的高度 - if (moments.worldId > 0) { - rowHeight += kMOMENTS_TEXT_TOPIC_HEIGHT; - } - ///底部操作栏的高度 - rowHeight += kMOMENTS_TOOL_BAR_HEIGHT; - moments.rowHeight = rowHeight; -} -+ (void)layoutSimpleMomentsModel:(MomentsInfoModel *)moments { - CGFloat rowHeight = kMOMENTS_CONTENT_SPACAE_HEIGHT; - ///文字内容的高度 - rowHeight += [self simpleMomentsContentHeight:moments]; - ///图片的高度 - rowHeight += [self momentsPicHeight:moments]; - ///如果没有图片的话 间隙就只有一个 - if (moments.type == MomentsContentType_Picture && moments.content.length > 0) { - rowHeight += (kMOMENTS_CONTENT_SPACAE_HEIGHT * 2); - }else { - rowHeight += kMOMENTS_CONTENT_SPACAE_HEIGHT; - } - ///话题的高度 - rowHeight += kMOMENTS_TEXT_TOPIC_HEIGHT; - moments.rowHeight = rowHeight; -} - -+ (CGFloat)simpleMomentsContentHeight:(MomentsInfoModel *)moments { - if (moments.content.length <= 0) { - moments.contentHeight = 0; - return 0; - } - ///计算文本的高度 - if (!moments.contentAttribute) { - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; - if (moments.squareTop ) {//动态/广场 - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - attachment.bounds = CGRectMake(0, 0, 25 * 1.3 ,10 * 1.3); - attachment.image = [UIImage getLanguageImage:@"monents_info_top"]; - NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; - [attributedString insertAttributedString:starAttribute atIndex:0]; - } - [attributedString appendAttributedString:[self creatStrAttrByStr:moments.content attributed:@{NSFontAttributeName : [UIFont systemFontOfSize:15]}]]; - attributedString.yy_lineSpacing = 5; - attributedString.yy_lineBreakMode = NSLineBreakByWordWrapping; - moments.contentAttribute = attributedString; - } - - YYTextContainer *container = [YYTextContainer new]; - container.size = CGSizeMake(kSIMPLE_MOMENTS_CONTENT_MAX_WIDTH, CGFLOAT_MAX); - container.maximumNumberOfRows = 0; - YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:moments.contentAttribute]; - moments.numberOfText = layout.rowCount; - CGFloat foldHeight = 0; - if (layout.rowCount > 6) { - foldHeight = kMOMENTS_FOLD_HEIGHT; - NSInteger numberOfLines = moments.isFold ? 6 : 0; - container.maximumNumberOfRows = numberOfLines; - } - YYTextLayout *realLayout = [YYTextLayout layoutWithContainer:container text:moments.contentAttribute]; - CGFloat contentHeight = realLayout.textBoundingSize.height; - moments.contentHeight =contentHeight; - return contentHeight + foldHeight; -} - -+ (CGFloat)simpleMonentsPicHeight:(MomentsInfoModel *)moments { - ///计算图片的高度 - NSInteger picCount = moments.dynamicResList.count; - CGFloat picHeight = 0; - if (picCount == 0) { - picHeight = 0; - } else if(picCount == 1) { - picHeight = kMOMENTS_PIC_ONE_WIDTH; - } else if(picCount == 2) { - picHeight = (kSIMPLE_MOMENTS_CONTENT_MAX_WIDTH - kMOMENTS_PIC_SPACE) / 2; - } else { - if (picCount > 9) { - picCount = 9; - } - CGFloat itemWidth = (kSIMPLE_MOMENTS_CONTENT_MAX_WIDTH - kMOMENTS_PIC_SPACE * 2) / 3; - NSInteger page = picCount % 3; - NSInteger line = picCount / 3; - if (page == 0) { - picHeight = itemWidth * line + (line -1)* kMOMENTS_PIC_SPACE; - } else { - picHeight = itemWidth * (line +1) + line * kMOMENTS_PIC_SPACE; - } - } - moments.picHeight = picHeight; - return picHeight; -} - -#pragma mark - 正常的布局 - -+ (void)layoutMomentsModel:(MomentsInfoModel *)moments { - CGFloat rowHeight = kMOMENTS_USER_INFO_HEIGHT; - ///用户信息和文字之间的间隙 - rowHeight += kMOMENTS_CONTENT_SPACAE_HEIGHT; - ///文字内容的高度 - rowHeight += [self momentsContentHeight:moments]; - ///图片的高度 - rowHeight += [self momentsPicHeight:moments]; - ///如果没有图片的话 间隙就只有一个 - if (moments.type == MomentsContentType_Picture && moments.content.length > 0) { - rowHeight += (kMOMENTS_CONTENT_SPACAE_HEIGHT * 2); - }else { - rowHeight += kMOMENTS_CONTENT_SPACAE_HEIGHT; - } - ///话题的高度 - rowHeight += kMOMENTS_TEXT_TOPIC_HEIGHT; - ///底部操作栏的高度 - rowHeight += kMOMENTS_TOOL_BAR_HEIGHT; - moments.rowHeight = rowHeight; -} - -+ (CGFloat)momentsPicHeight:(MomentsInfoModel *)moments { - ///计算图片的高度 - NSInteger picCount = moments.dynamicResList.count; - CGFloat picHeight = 0; - if (picCount == 0) { - picHeight = 0; - } else if(picCount == 1) { - picHeight = kMOMENTS_PIC_ONE_WIDTH; - } else if(picCount == 2) { - picHeight = (kMONENTS_CONTENT_MAX_WIDTH - kMOMENTS_PIC_SPACE) / 2; - } else { - if (picCount > 9) { - picCount = 9; - } - CGFloat itemWidth = (kMONENTS_CONTENT_MAX_WIDTH - kMOMENTS_PIC_SPACE * 2) / 3; - NSInteger page = picCount % 3; - NSInteger line = picCount / 3; - if (page == 0) { - picHeight = itemWidth * line + (line -1)* kMOMENTS_PIC_SPACE; - } else { - picHeight = itemWidth * (line +1) + line * kMOMENTS_PIC_SPACE; - } - } - moments.picHeight = picHeight; - return picHeight; -} - -+ (CGFloat)momentsContentHeight:(MomentsInfoModel *)moments { - if (moments.content.length <= 0) { - moments.contentHeight = 0; - return 0; - } - ///计算文本的高度 - if (!moments.contentAttribute) { - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; - if (moments.squareTop ) {//动态/广场 - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - attachment.bounds = CGRectMake(0, 0, 25 * 1.3 ,10 * 1.3); - attachment.image = [UIImage getLanguageImage:@"monents_info_top"]; - NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; - [attributedString insertAttributedString:starAttribute atIndex:0]; - } - [attributedString appendAttributedString:[self creatStrAttrByStr:moments.content attributed:@{NSFontAttributeName : [UIFont systemFontOfSize:15]}]]; - attributedString.yy_lineSpacing = 5; - attributedString.yy_lineBreakMode = NSLineBreakByWordWrapping; - moments.contentAttribute = attributedString; - } - - YYTextContainer *container = [YYTextContainer new]; - container.size = CGSizeMake(kMONENTS_CONTENT_MAX_WIDTH, CGFLOAT_MAX); - container.maximumNumberOfRows = 0; - YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:moments.contentAttribute]; - moments.numberOfText = layout.rowCount; - CGFloat foldHeight = 0; - if (layout.rowCount > 6) { - foldHeight = kMOMENTS_FOLD_HEIGHT; - NSInteger numberOfLines = moments.isFold ? 6 : 0; - container.maximumNumberOfRows = numberOfLines; - } - YYTextLayout *realLayout = [YYTextLayout layoutWithContainer:container text:moments.contentAttribute]; - CGFloat contentHeight = realLayout.textBoundingSize.height; - moments.contentHeight =contentHeight; - return contentHeight + foldHeight; -} - -+ (NSMutableAttributedString *)creatStrAttrByStr:(NSString *)str attributed:(NSDictionary *)attribute{ - if (str.length == 0 || !str) { - str = @" "; - } - NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:str attributes:attribute]; - return attr; -} - -///计算评论的高度 -+ (CGFloat)commentCommentRowHeight:(MonentsCommentModel * )comment { - if (comment.commentRowHeight > 0 && !comment.isReloadHeight) { - return comment.commentRowHeight; - } - __block CGFloat rowHeight = 0; - CGFloat commentTopHeight = 10 + 15 + 10;///10顶部的间隙 15 昵称的高度 - ///内容 - QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper]; - NSMutableAttributedString * attribute = [faceManager attributedStringByText:comment.content font:[UIFont systemFontOfSize:15]]; - YYTextContainer *container = [YYTextContainer new]; - container.size = CGSizeMake(kMOMENTS_COMMENT_REPLY_MAX_WIDTH, CGFLOAT_MAX); - container.maximumNumberOfRows = 0; - YYTextLayout *realLayout = [YYTextLayout layoutWithContainer:container text:attribute]; - CGFloat commentHeight = realLayout.textBoundingSize.height; - commentHeight = MAX(commentHeight, 15); - rowHeight += commentTopHeight; - rowHeight += commentHeight; - - ///展开剩余的回复 - if (comment.replyInfo.leftCount > 0) { - rowHeight += 44; - } - - if (comment.replyInfo.replyList.count > 0) { - rowHeight += 10 * 2; - } else { - rowHeight += 10; - } - - ///评论的高度 - [comment.replyInfo.replyList enumerateObjectsUsingBlock:^(MonentsReplyModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.content.length > 0) { - [obj createContentAttribute]; - CGFloat replayHeight = 0; - CGFloat commentTopHeight = 10 + 15 + 10;///10顶部的间隙 15 昵称的高度 - CGFloat commentBottomHeight = 10; - YYTextContainer *container = [YYTextContainer new]; - container.size = CGSizeMake(kMOMENTS_COMMENT_REPLY_MAX_WIDTH, CGFLOAT_MAX); - container.maximumNumberOfRows = 0; - YYTextLayout *realLayout = [YYTextLayout layoutWithContainer:container text:obj.contentAttribute]; - CGFloat replyContentHeight = realLayout.textBoundingSize.height; - replayHeight += commentTopHeight; - replayHeight += replyContentHeight; - replayHeight += commentBottomHeight; - obj.replyRowHeight = replayHeight; - rowHeight += replayHeight; - } - }]; - comment.commentRowHeight = rowHeight; - return rowHeight; -} - -@end diff --git a/YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.h b/YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.h deleted file mode 100644 index 3ed5cd4..0000000 --- a/YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// YMMonentsRecommendPresenter.h -// YUMI -// -// Created by YUMI on 2022/5/13. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMomentsRecommendPresenter : BaseMvpPresenter -/// 获取朋友圈动态推荐列表 -/// @param page 当前的页数 -/// @param pageSize 一页的个数 -/// @param state 状态 -- (void)getMomentsRecommendList:(NSInteger)page pageSize:(NSInteger)pageSize state:(int)state; - -/// 获取话题列表 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -- (void)getMomentsTopicList:(NSInteger)page pageSize:(NSInteger)pageSize; - -/// 动态点赞 -/// @param dynamicId 动态id -/// @param status yes 点赞 NO 取消 -/// @param likedUid 点赞人的uid -/// @param worldId 话题的id -- (void)likeMoment:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId; - -/// 删除动态 -/// @param dynamicId 动态id -/// @param worldId 话题id -- (void)deleteMoments:(NSString *)dynamicId worldId:(NSString *)worldId; -///屏蔽 -- (void)requestShieldingWithType:(NSString *)type objId:(NSString *)objId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.m deleted file mode 100644 index 2e83e0b..0000000 --- a/YuMi/Modules/YMMonents/Presenter/XPMomentsRecommendPresenter.m +++ /dev/null @@ -1,84 +0,0 @@ -// -// YMMonentsRecommendPresenter.m -// YUMI -// -// Created by YUMI on 2022/5/13. -// - -#import "XPMomentsRecommendPresenter.h" -#import "AccountInfoStorage.h" -#import "Api+Moments.h" -#import "MomentsTopicModel.h" -#import "MomentsInfoModel.h" -#import "XPMomentsRecommendProtocol.h" -@implementation XPMomentsRecommendPresenter - - -/// 获取朋友圈动态推荐列表 -/// @param page 当前的页数 -/// @param pageSize 一页的个数 -/// @param state 状态 -- (void)getMomentsRecommendList:(NSInteger)page pageSize:(NSInteger)pageSize state:(int)state { - NSString * pageStr = [NSString stringWithFormat:@"%ld", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%ld", pageSize]; - @kWeakify(self); - [Api momentsRecommendList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray *array = [MomentsInfoModel modelsWithArray:data.data]; - [[self getView] getMomentsRecommendListSuccess:array state:state]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] getMomentsRecommendListFail:msg state:state]; - } showLoading:NO] page:pageStr pageSize:pageSizeStr types:@"0,2"]; -} - - -/// 获取话题列表 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -- (void)getMomentsTopicList:(NSInteger)page pageSize:(NSInteger)pageSize { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * pageStr = [NSString stringWithFormat:@"%ld", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%ld", pageSize]; - @kWeakify(self); - [Api momentsTopicList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray * array = [MomentsTopicModel modelsWithArray:data.data[@"records"]]; - [[self getView] momentsTopicListSuccess:array]; - }showLoading:NO] uid:uid page:pageStr pageSize:pageSizeStr worldTypeId:@"1"]; -} - -/// 动态点赞 -/// @param dynamicId 动态id -/// @param status yes 点赞 NO 取消 -/// @param likedUid 点赞人的uid -/// @param worldId 话题的id -- (void)likeMoment:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * statusStr = status ? @"1" : @"0"; - @kWeakify(self); - [Api momentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] likeMomentsSuccess:dynamicId status:status]; - } showLoading:YES] dynamicId:dynamicId uid:uid status:statusStr likedUid:likedUid worldId:worldId]; -} - -/// 删除动态 -/// @param dynamicId 动态id -/// @param worldId 话题id -- (void)deleteMoments:(NSString *)dynamicId worldId:(NSString *)worldId { - NSString * uid = [AccountInfoStorage instance].getUid; - @kWeakify(self); - [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] deleteMomentsSuccess:dynamicId]; - } uid:uid dynamicId:dynamicId worldId:worldId]; -} -- (void)requestShieldingWithType:(NSString *)type objId:(NSString *)objId{ - @kWeakify(self); - [Api requestShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] requestShieldingSuccess:objId]; - }] type:type objId:objId]; -} -@end diff --git a/YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.h b/YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.h deleted file mode 100644 index 78b137d..0000000 --- a/YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMMonentsTopicListPresenter.h -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMomentsTopicListPresenter : BaseMvpPresenter -- (void)getMoentsTopicList:(int)page pageSize:(int)pageSize state:(int)state; - -/// 删除动态 -/// @param dynamicId 动态id -/// @param worldId 话题id -- (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.m deleted file mode 100644 index 5d836df..0000000 --- a/YuMi/Modules/YMMonents/Presenter/XPMomentsTopicListPresenter.m +++ /dev/null @@ -1,39 +0,0 @@ -// -// YMMonentsTopicListPresenter.m -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "XPMomentsTopicListPresenter.h" -#import "Api+Moments.h" -#import "AccountInfoStorage.h" -#import "MomentsTopicModel.h" -#import "XPMomentsTopicListProtocol.h" - -@implementation XPMomentsTopicListPresenter - -- (void)getMoentsTopicList:(int)page pageSize:(int)pageSize state:(int)state { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * pageStr = [NSString stringWithFormat:@"%d", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize]; - [Api momentsTopicList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [MomentsTopicModel modelsWithArray:data.data[@"records"]]; - [[self getView] getMomentsTopicListSuccess:array state:state]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getMomentsTopicFail:msg state:state]; - } showLoading:YES] uid:uid page:pageStr pageSize:pageSizeStr worldTypeId:@"0"]; -} - -/// 删除动态 -/// @param dynamicId 动态id -/// @param worldId 话题id -- (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [[self getView] deleteMomentsSuccess:dynamicId]; - } uid:uid dynamicId:dynamicId worldId:worldId]; -} - - -@end diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentDetailPresenter.h b/YuMi/Modules/YMMonents/Presenter/XPMonentDetailPresenter.h deleted file mode 100644 index f86ebfc..0000000 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentDetailPresenter.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// YMMonentDetailPresenter.h -// YUMI -// -// Created by YUMI on 2022/6/23. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMonentDetailPresenter : BaseMvpPresenter -/// 获取动态相亲 -/// @param dynamicId 动态ID -- (void)getMonentsDetail:(NSString *)dynamicId; - -- (void)getMonentsCommentList:(NSString *)dynamicId timestamp:(NSString *)timestamp status:(int)state; - -/// 获取评论的回复列表 -/// @param dynamicId 动态id -/// @param commentId 评论id -/// @param timestamp 最后一条评论的时间戳 -- (void)getMonentsCommentReplyList:(NSString *)dynamicId commentId:(NSString *)commentId timestamp:(NSString *)timestamp; - -/// 动态点赞 -/// @param dynamicId 动态id -/// @param status yes 点赞 NO 取消 -/// @param likedUid 点赞人的uid -/// @param worldId 话题的id -- (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId; - -/// 删除动态 -/// @param dynamicId 动态id -/// @param worldId 话题id -- (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId; -/// 评论回复 -/// @param commonId 评论的id -/// @param dynamicId 动态的id -/// @param content 评论的内容 -- (void)replayCommon:(NSString *)commonId dynamicId:(NSString *)dynamicId content:(NSString *)content; - -/// 评论动态 -/// @param dynamicId 动态的id -/// @param content 评论的内容 -- (void)commontMonents:(NSString *)dynamicId content:(NSString *)content; -- (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentDetailPresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMonentDetailPresenter.m deleted file mode 100644 index 21aac29..0000000 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentDetailPresenter.m +++ /dev/null @@ -1,105 +0,0 @@ -// -// YMMonentDetailPresenter.m -// YUMI -// -// Created by YUMI on 2022/6/23. -// - -#import "XPMonentDetailPresenter.h" -#import "Api+Moments.h" -#import "AccountInfoStorage.h" -#import "XPMonentsDetailProtocol.h" -#import "MomentsInfoModel.h" -#import "MonentsCommentModel.h" -#import "MonentsCommentReplyModel.h" -@implementation XPMonentDetailPresenter - -/// 获取动态详情 -/// @param dynamicId 动态ID -- (void)getMonentsDetail:(NSString *)dynamicId { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api momentsDetail:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - MomentsInfoModel * monentsInfo = [MomentsInfoModel modelWithDictionary:data.data]; - [[self getView] getMonentsDetailSuccess:monentsInfo]; - } showLoading:YES] dynamicId:dynamicId worldId:@"" uid:uid]; -} - - -/// 获取评论列表 -/// @param dynamicId 动态id -/// @param timestamp 上一条的时间戳 -/// @param state 状态 -- (void)getMonentsCommentList:(NSString *)dynamicId timestamp:(NSString *)timestamp status:(int)state{ - NSString * uid = [AccountInfoStorage instance].getUid; - [Api momentsCommentList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - MonentsCommentListModel * info = [MonentsCommentListModel modelWithDictionary:data.data]; - [[self getView] getMonentsCommentListSuccess:info state:state]; - }] dynamicId:dynamicId uid:uid pageSize:@"10" timestamp:timestamp]; -} - - -/// 获取评论的回复列表 -/// @param dynamicId 动态id -/// @param commentId 评论id -/// @param timestamp 最后一条评论的时间戳 -- (void)getMonentsCommentReplyList:(NSString *)dynamicId commentId:(NSString *)commentId timestamp:(NSString *)timestamp { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api momentsCommentReplyList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - MonentsCommentReplyModel * replyInfo = [MonentsCommentReplyModel modelWithDictionary:data.data]; - [[self getView] getMonentsCommentReplyListSuccess:replyInfo commentId:commentId]; - }] dynamicId:dynamicId uid:uid pageSize:@"5" commentId:commentId timestamp:timestamp]; -} - -/// 动态点赞 -/// @param dynamicId 动态id -/// @param status yes 点赞 NO 取消 -/// @param likedUid 点赞人的uid -/// @param worldId 话题的id -- (void)likeMonent:(NSString *)dynamicId status:(BOOL)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * statusStr = status ? @"1" : @"0"; - [Api momentsLike:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] likeMonentsSuccess:dynamicId status:status]; - } showLoading:YES] dynamicId:dynamicId uid:uid status:statusStr likedUid:likedUid worldId:worldId]; -} - -/// 删除动态 -/// @param dynamicId 动态id -/// @param worldId 话题id -- (void)deleteMonents:(NSString *)dynamicId worldId:(NSString *)worldId { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api momentsDelete:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [[self getView] deleteMonentsSuccess:dynamicId]; - } uid:uid dynamicId:dynamicId worldId:worldId]; -} - - -/// 评论动态 -/// @param dynamicId 动态的id -/// @param content 评论的内容 -- (void)commontMonents:(NSString *)dynamicId content:(NSString *)content { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api momentDetailCommon:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] commonMonentsSuccess]; - } showLoading:YES] uid:uid dynamicId:dynamicId content:content]; -} - -/// 评论回复 -/// @param commonId 评论的id -/// @param dynamicId 动态的id -/// @param content 评论的内容 -- (void)replayCommon:(NSString *)commonId dynamicId:(NSString *)dynamicId content:(NSString *)content { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api replyMomentsDetailCommon:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] replyMonentsSuccess]; - }] uid:uid dynamicId:dynamicId content:content commentId:commonId]; -} -- (void)requesstShieldingWtihType:(NSString *)type objId:(NSString *)objId{ - [Api requestShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] requesstShieldingSuccess:objId]; - }] type:type objId:objId]; -} - - - -@end diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsInteractivePresenter.h b/YuMi/Modules/YMMonents/Presenter/XPMonentsInteractivePresenter.h deleted file mode 100644 index a8fbfc6..0000000 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsInteractivePresenter.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// YMMonentsInteractivePresenter.h -// YUMI -// -// Created by YUMI on 2022/5/18. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMonentsInteractivePresenter : BaseMvpPresenter - -/// 获取互动消息 -/// @param dynamicId 动态的id -/// @param pageSize 一页的个数 -/// @param state 状态 -- (void)getMonentsInteractiveList:(NSString *)dynamicId pageSize:(int)pageSize state:(int)state; - -///清空互动消息 -- (void)clearInteractiveMessage; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/Presenter/XPMonentsInteractivePresenter.m b/YuMi/Modules/YMMonents/Presenter/XPMonentsInteractivePresenter.m deleted file mode 100644 index eba9003..0000000 --- a/YuMi/Modules/YMMonents/Presenter/XPMonentsInteractivePresenter.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// YMMonentsInteractivePresenter.m -// YUMI -// -// Created by YUMI on 2022/5/18. -// - -#import "XPMonentsInteractivePresenter.h" -#import "Api+Moments.h" -#import "XPMonentsInteractiveProtocol.h" -#import "AccountInfoStorage.h" -#import "MonentsInteractiveModel.h" - -@implementation XPMonentsInteractivePresenter - - -/// 获取互动消息 -/// @param dynamicId 动态的id -/// @param pageSize 一页的个数 -/// @param state 状态 -- (void)getMonentsInteractiveList:(NSString *)dynamicId pageSize:(int)pageSize state:(int)state{ - NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize]; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api momentsInteractiveList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [MonentsInteractiveModel modelsWithArray:data.data]; - [[self getView] getMonentsInteractiveListSueccess:array state:state]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getMonentsInteractiveListFail:msg state:state]; - }] dynamicId:dynamicId pageSize:pageSizeStr uid:uid]; -} - -///清空互动消息 -- (void)clearInteractiveMessage { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api momentsInteractiveClear:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] clearInteractiveMessageSuccess]; - } showLoading:YES] uid:uid]; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.h deleted file mode 100644 index 00609e0..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMMomentListCollectionViewCell.h -// YUMI -// -// Created by XY on 2023/2/16. -// - -#import - -@class MomentsInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMomentListCollectionViewCell : UICollectionViewCell - -@property (nonatomic,strong) MomentsInfoModel *monentsInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.m deleted file mode 100644 index 52d9f78..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.m +++ /dev/null @@ -1,161 +0,0 @@ -// -// YMMomentListCollectionViewCell.m -// YUMI -// -// Created by XY on 2023/2/16. -// - -#import "XPMomentListCollectionViewCell.h" -#import "DJDKMIMOMColor.h" -#import -#import "NetImageView.h" -#import "NSArray+Safe.h" - -#import "MomentsInfoModel.h" - -@interface XPMomentListCollectionViewCell() - -/// 文字底部渐变背景 -@property (nonatomic, strong) CAGradientLayer *bgLayer; -/// 封面图 -@property (nonatomic, strong) NetImageView *coverImageView; -/// 点赞图标 -@property (nonatomic, strong) UIButton *likeBtn; -/// 点赞数量 -@property (nonatomic, strong) UILabel *countLabel; -/// 标题 -@property (nonatomic, strong) UILabel *titleLabel; -/// 头像 -@property (nonatomic, strong) NetImageView *avatarImageView; - -@end - -@implementation XPMomentListCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - self.contentView.layer.cornerRadius = 12; - self.contentView.clipsToBounds = YES; - [self createUI]; - - } - return self; -} - -- (void)layoutSubviews { - [super layoutSubviews]; - self.bgLayer.frame = CGRectMake(0, self.contentView.bounds.size.height-78, self.contentView.bounds.size.width, 78); -} - -- (void)createUI { - [self.contentView addSubview:self.coverImageView]; - [self.contentView.layer addSublayer:self.bgLayer]; - [self.contentView addSubview:self.likeBtn]; - [self.contentView addSubview:self.countLabel]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.avatarImageView]; - - [self.coverImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - [self.likeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(8); - make.bottom.mas_equalTo(-12); - make.width.mas_equalTo(14); - make.height.mas_equalTo(14); - }]; - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.likeBtn.mas_trailing).offset(2); - make.centerY.mas_equalTo(self.likeBtn); - make.trailing.mas_lessThanOrEqualTo(-8); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(8); - make.bottom.mas_equalTo(self.likeBtn.mas_top).offset(-2); - make.trailing.mas_equalTo(-8); - }]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-4); - make.bottom.mas_equalTo(-4); - make.width.height.mas_equalTo(24); - }]; -} - -#pragma mark - Getters And Setters -- (void)setMonentsInfo:(MomentsInfoModel *)monentsInfo { - _monentsInfo = monentsInfo; - if (_monentsInfo) { - if (_monentsInfo.dynamicResList.count > 0) { - MomentsPicInfoModel * picInfo = [_monentsInfo.dynamicResList xpSafeObjectAtIndex:0]; - self.coverImageView.imageUrl = picInfo.resUrl; - }else{ - self.coverImageView.imageUrl = _monentsInfo.avatar; - } - self.avatarImageView.imageUrl = _monentsInfo.avatar; - self.titleLabel.text = _monentsInfo.content; - self.likeBtn.selected = _monentsInfo.isLike; - self.countLabel.text = _monentsInfo.likeCount.length > 0 ? _monentsInfo.likeCount : @"0"; - } -} - -#pragma mark - 懒加载 - -- (CAGradientLayer *)bgLayer { - if (!_bgLayer) { - _bgLayer = [[CAGradientLayer alloc] init]; - _bgLayer.colors = @[(__bridge id)[UIColor.blackColor colorWithAlphaComponent:0].CGColor, (__bridge id)[UIColor.blackColor colorWithAlphaComponent:0.4].CGColor]; - _bgLayer.locations = @[@0, @1]; - _bgLayer.startPoint = CGPointMake(0.5, 0); - _bgLayer.endPoint = CGPointMake(0.5, 1); - } - return _bgLayer; -} - -- (NetImageView *)coverImageView { - if (!_coverImageView) { - _coverImageView = [[NetImageView alloc] init]; - _coverImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _coverImageView; -} - -- (UIButton *)likeBtn { - if (!_likeBtn) { - _likeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_likeBtn setImage:[UIImage imageNamed:@"monents_info_like_count_normal"] forState:UIControlStateNormal]; - [_likeBtn setImage:[UIImage imageNamed:@"monents_info_like_count_select"] forState:UIControlStateSelected]; - } - return _likeBtn; -} - -- (UILabel *)countLabel { - if (!_countLabel) { - _countLabel = [[UILabel alloc] init]; - _countLabel.textColor = UIColor.whiteColor; - _countLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - } - return _countLabel; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = UIColor.whiteColor; - _titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _titleLabel.numberOfLines = 5; - } - return _titleLabel; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - _avatarImageView = [[NetImageView alloc] init]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - _avatarImageView.layer.cornerRadius = 24/2; - _avatarImageView.clipsToBounds = YES; - } - return _avatarImageView; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.h deleted file mode 100644 index 6bfb103..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMonentsEmptyTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/5/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMomentsEmptyTableViewCell : UITableViewCell - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.m deleted file mode 100644 index 9b7b153..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMomentsEmptyTableViewCell.m +++ /dev/null @@ -1,72 +0,0 @@ -// -// YMMonentsEmptyTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/5/13. -// - -#import "XPMomentsEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPMomentsEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPMomentsEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(150); - make.centerX.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(200, 200)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder_UFO]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPMonentsEmptyTableViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.h deleted file mode 100644 index dbe4f4c..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// XPMomentsTableViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2022/5/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MomentsInfoModel, XPMomentsTableViewCell; - -@protocol XPMomentsTableViewCellDelegate -///点击了点赞 -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)momentsInfo; -///点击了删除 -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)momentsInfo; -@optional -///点击了评论 -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicCommon:(MomentsInfoModel *)momentsInfo; -///点击了展开 -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)momentsInfo; -///屏蔽 -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)momentsInfo; - - -@end - -@interface XPMomentsTableViewCell : UITableViewCell -@property (nonatomic,strong) MomentsInfoModel *mineMomentsInfo; -@property (nonatomic,strong) MomentsInfoModel *momentsInfo; -@property (nonatomic,assign) BOOL isFillet; -@property (nonatomic,assign) BOOL isTopic;///是否是话题页 -@property (nonatomic, assign) BOOL isInUserDetail; -///代理 -@property (nonatomic,weak) id delegate; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.m deleted file mode 100644 index 6137112..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMomentsTableViewCell.m +++ /dev/null @@ -1,407 +0,0 @@ -// -// XPMomentsTableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2022/5/11. -// - -#import "XPMomentsTableViewCell.h" -///Third -#import - -///Tool -#import "NetImageView.h" -#import "XPMomentsLayoutConfig.h" -#import "SDPhotoBrowser.h" -#import "XCCurrentVCStackManager.h" -///Model -#import "MomentsInfoModel.h" -///View -#import "XPMomentsUserInfoView.h" -#import "XPMomentsPhotoView.h" -#import "XPMomentsTooBarView.h" -#import "XPMomentsTopicView.h" -#import "XPMomentsContentView.h" -#import "XPMomentsLayoutConfig.h" -#import "XPMomentTopicContainerViewController.h" -#import "XPMineUserInfoViewController.h" -#import "XPRoomViewController.h" -@interface XPMomentsTableViewCell () -///显示颜色的 有的时候stackView 不能显示颜色 -@property (nonatomic,strong) UIView * backView; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///用户信息 -@property (nonatomic,strong) XPMomentsUserInfoView * userInfoView; -///显示内容的 -@property (nonatomic,strong) XPMomentsContentView *textView; -///图片 -@property (nonatomic,strong) XPMomentsPhotoView *photoView; -///显示底部的操作栏 -@property (nonatomic,strong) XPMomentsTooBarView *toolBarView; -///话题 -@property (nonatomic,strong) XPMomentsTopicView *topicView; -@property (nonatomic,strong) UIView *lineView; - -@end - -@implementation XPMomentsTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - if ([reuseIdentifier isEqualToString:@"XPMomentsDynamicTableViewCell"]) { - [self initDynamicSubViews]; - [self initDynamicSubViewConstraints]; - }else{ - [self initSubViews]; - [self initSubViewConstraints]; - } - } - return self; -} - -- (void)setIsInUserDetail:(BOOL)isInUserDetail { - _isInUserDetail = isInUserDetail; - self.textView.isInUserDetail = isInUserDetail; - self.toolBarView.isInUserDetail = isInUserDetail; -} - -#pragma mark - Private Method - -- (void)initDynamicSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.backView]; - - [self.backView addSubview:self.stackView]; - [self.backView addSubview:self.toolBarView]; - - [self.stackView addArrangedSubview:self.textView]; - [self.stackView addArrangedSubview:self.photoView]; - [self.stackView addArrangedSubview:self.topicView]; - - [self.contentView addSubview:self.lineView]; -} - -- (void)initDynamicSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.trailing.mas_equalTo(-15); - make.top.bottom.equalTo(self.contentView); - }]; - - [self.textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).offset(12); - make.trailing.mas_equalTo(self.backView).offset(-12); - make.top.mas_equalTo(13); - }]; - - [self.topicView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kMOMENTS_TEXT_TOPIC_HEIGHT); - }]; - - [self.toolBarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.stackView.mas_bottom).mas_offset(10); - make.height.mas_equalTo(18); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(1)); - make.leading.trailing.equalTo(self.toolBarView).inset(12); - make.bottom.equalTo(self.contentView); - }]; -} - -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.backView]; - - [self.backView addSubview:self.userInfoView]; - [self.backView addSubview:self.stackView]; - [self.backView addSubview:self.toolBarView]; - - [self.stackView addArrangedSubview:self.textView]; - [self.stackView addArrangedSubview:self.photoView]; - [self.stackView addArrangedSubview:self.topicView]; -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.userInfoView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.backView).offset(4); - make.leading.trailing.mas_equalTo(self.backView); - make.height.mas_equalTo(kMOMENTS_USER_INFO_HEIGHT); - }]; - - [self.textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).offset(kMONENTS_CONTENT_LEFT_PADDING); - make.trailing.mas_equalTo(self.backView).offset(-kMONENTS_CONTENT_RIGHT_PADDING); - make.top.mas_equalTo(self.userInfoView.mas_bottom).offset(kMOMENTS_CONTENT_SPACAE_HEIGHT); - }]; - - [self.topicView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kMOMENTS_TEXT_TOPIC_HEIGHT); - }]; - - [self.toolBarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.top.mas_equalTo(self.stackView.mas_bottom); - make.height.mas_equalTo(kMOMENTS_TOOL_BAR_HEIGHT); - }]; -} -#pragma mark - XPMomentsUserInfoViewDelegate -- (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickEnterRoom:(MomentsInfoModel *)momentsInfo { - if (momentsInfo.inRoomUid.integerValue > 0) { - [XPRoomViewController openRoom:momentsInfo.inRoomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - } -} - -- (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickAvatar:(MomentsInfoModel *)momentsInfo { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = momentsInfo.uid.integerValue; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:userInfoVC animated:YES]; -} - -- (void)XPMomentsTooBarView:(XPMomentsUserInfoView *)view didClickDelete:(MomentsInfoModel *)momentsInfo { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClicDelete:)]) { - [self.delegate XPMomentsTableViewCell:self didClicDelete:momentsInfo]; - } -} - -#pragma mark - XPMomentsTooBarViewDelegate -- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickLike:(MomentsInfoModel *)momentsInfo { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClickLike:)]) { - [self.delegate XPMomentsTableViewCell:self didClickLike:momentsInfo]; - } -} - -- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickCommon:(MomentsInfoModel *)momentsInfo { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClicCommon:)]) { - [self.delegate XPMomentsTableViewCell:self didClicCommon:momentsInfo]; - } -} -- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickShielding:(MomentsInfoModel *)momentsInfo{ - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClicShielding:)]) { - [self.delegate XPMomentsTableViewCell:self didClicShielding:momentsInfo]; - } -} -#pragma mark - XPMomentsContentViewDelegate -- (void)xPMonentsContentView:(XPMomentsContentView *)view didClickFold:(MomentsInfoModel *)momentsInfo { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTableViewCell:didClicFold:)]) { - [self.delegate XPMomentsTableViewCell:self didClicFold:momentsInfo]; - } -} - -#pragma mark - SDPhotoBrowserDelegate -- (NSURL *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageURLForIndex:(NSInteger)index { - - NSArray *list = self.momentsInfo != nil ? self.momentsInfo.dynamicResList : self.mineMomentsInfo.dynamicResList; - if(index < list.count){ - MomentsPicInfoModel *picInfo = [list xpSafeObjectAtIndex:index]; - return [NSURL URLWithString:picInfo.resUrl]; - } - return [NSURL URLWithString:@""];; -} - -- (UIImage *)photoBrowser:(SDPhotoBrowser *)browser placeholderImageForIndex:(NSInteger)index { - return [UIImageConstant defaultBannerPlaceholder]; -} - -#pragma mark - XPMonentsPhotoViewDelegate -- (void)xPMonentsPhotoView:(XPMomentsPhotoView *)view didClickImage:(NSInteger)index { - NSInteger count = self.momentsInfo != nil ? self.momentsInfo.dynamicResList.count : self.mineMomentsInfo.dynamicResList.count; - SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init]; - browser.sourceImagesContainerView = self; - browser.delegate = self; - browser.imageCount = count; - browser.currentImageIndex = index; - browser.isMe = NO; - [browser show]; -} - -#pragma mark - Event Response -- (void)didTapTopicRecognizer { - long worldId = self.momentsInfo != nil ? self.momentsInfo.worldId : self.mineMomentsInfo.worldId; - if (worldId > 0) { - XPMomentTopicContainerViewController * topicListVC = [[XPMomentTopicContainerViewController alloc] init]; - topicListVC.worldId = [NSString stringWithFormat:@"%ld", worldId]; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:topicListVC animated:YES]; - } -} - -#pragma mark - Getters And Setters -- (void)setIsFillet:(BOOL)isFillet{ - _isFillet = isFillet; - if(_isFillet == YES){ - self.lineView.hidden = YES; - [self.backView setCornerWithLeftTopCorner:0 rightTopCorner:0 bottomLeftCorner:8 bottomRightCorner:8 size:CGSizeMake(KScreenWidth-30, self.frame.size.height)]; - }else{ - self.lineView.hidden = NO; - if(self.backView.layer.mask != nil){ - self.backView.layer.mask = nil; - } - } -} - --(void)setMineMomentsInfo:(MomentsInfoModel *)mineMonentsInfo{ - _mineMomentsInfo = mineMonentsInfo; - if (_mineMomentsInfo) { - self.userInfoView.momentsInfo = _mineMomentsInfo; - self.textView.monentsInfo = _mineMomentsInfo; - self.photoView.mineDynamicResList = _mineMomentsInfo.dynamicResList; - self.topicView.monentsInfo = _mineMomentsInfo; - self.toolBarView.momentsInfo = _mineMomentsInfo; - if (_mineMomentsInfo.type == MomentsContentType_Picture) { - self.photoView.hidden = NO; - CGFloat picHeight = _mineMomentsInfo.picHeight <=0 ? [XPMomentsLayoutConfig momentsPicHeight:_mineMomentsInfo] : _mineMomentsInfo.picHeight; - [self.photoView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(picHeight); - }]; - } else { - self.photoView.hidden = YES; - [self.photoView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(0); - }]; - } - - CGFloat contentHeight = [XPMomentsLayoutConfig momentsContentHeight:_mineMomentsInfo] + 24; - - self.topicView.hidden = _mineMomentsInfo.worldId <= 0; - - if(_mineMomentsInfo.squareTop && _mineMomentsInfo.content.length == 0){ - [self.textView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(contentHeight + 20); - }]; - }else{ - [self.textView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(contentHeight); - }]; - } - } -} - -- (void)setMomentsInfo:(MomentsInfoModel *)monentsInfo { - _momentsInfo = monentsInfo; - if (_momentsInfo) { - self.userInfoView.momentsInfo = _momentsInfo; - self.textView.isTopic = _isTopic; - self.textView.monentsInfo = _momentsInfo; - self.photoView.dynamicResList = _momentsInfo.dynamicResList; - self.topicView.monentsInfo = _momentsInfo; - self.toolBarView.momentsInfo = _momentsInfo; - if (_momentsInfo.type == MomentsContentType_Picture) { - self.photoView.hidden = NO; - CGFloat picHeight = _momentsInfo.picHeight <=0 ? [XPMomentsLayoutConfig momentsPicHeight:_momentsInfo] : _momentsInfo.picHeight; - [self.photoView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(picHeight); - }]; - } else { - self.photoView.hidden = YES; - [self.photoView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(0); - }]; - } - - CGFloat contentHeight = [XPMomentsLayoutConfig momentsContentHeight:_momentsInfo] + 24; - - self.topicView.hidden = monentsInfo.worldId <= 0; - - if(_momentsInfo.topicTop && _momentsInfo.content.length == 0){ - [self.textView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(contentHeight + 20); - }]; - }else{ - [self.textView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(contentHeight); - }]; - } - } -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [UIColor clearColor]; - } - return _backView; -} - -- (XPMomentsUserInfoView *)userInfoView { - if (!_userInfoView) { - _userInfoView = [[XPMomentsUserInfoView alloc] init]; - _userInfoView.delegate = self; - } - return _userInfoView; -} - -- (XPMomentsPhotoView *)photoView { - if (!_photoView) { - _photoView = [[XPMomentsPhotoView alloc] init]; - _photoView.delegate = self; - } - return _photoView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 8; - } - return _stackView; -} - -- (XPMomentsContentView *)textView { - if (!_textView) { - _textView = [[XPMomentsContentView alloc] init]; - _textView.delegate = self; - } - return _textView; -} - -- (XPMomentsTopicView *)topicView { - if (!_topicView) { - _topicView = [[XPMomentsTopicView alloc] initWithFrame:CGRectZero]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapTopicRecognizer)]; - [_topicView addGestureRecognizer:tap]; - } - return _topicView; -} - -- (XPMomentsTooBarView *)toolBarView { - if (!_toolBarView) { - if ([self.reuseIdentifier isEqualToString:@"XPMomentsDynamicTableViewCell"]){ - _toolBarView = [[XPMomentsTooBarView alloc]initDynamicWithFrame:CGRectZero]; - }else{ - _toolBarView = [[XPMomentsTooBarView alloc] init]; - } - - _toolBarView.delegate = self; - } - return _toolBarView; -} -- (UIView *)lineView{ - if (!_lineView){ - _lineView = [UIView new]; - _lineView.backgroundColor = UIColorFromRGB(0xF7F7F7); - } - return _lineView; -} - - -@end diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.h deleted file mode 100644 index fe47715..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMMonentsCommentTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/6/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MonentsCommentModel, XPMonentsCommentTableViewCell, MonentsReplyModel; - -@protocol XPMonentsCommentTableViewCellDelegate -///点击了查看更多 -- (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickMoreReply:(MonentsCommentModel *)commentInfo; -///点击了某个评论 -- (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickCommon:(MonentsReplyModel *)commentInfo; -///点击了头想 -- (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickAvatar:(NSString *)commentInfo; -@end - -@interface XPMonentsCommentTableViewCell : UITableViewCell -@property (nonatomic,strong) MonentsCommentModel *commentInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.m deleted file mode 100644 index d87fa57..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.m +++ /dev/null @@ -1,376 +0,0 @@ -// -// YMMonentsCommentTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/6/22. -// - -#import "XPMonentsCommentTableViewCell.h" -///Third -#import - -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "XPMomentsLayoutConfig.h" -#import "NSString+Utils.h" -#import "QEmotionHelper.h" -#import "AccountInfoStorage.h" -#import "NSArray+Safe.h" -///Model -#import "MonentsCommentModel.h" -///View -#import "XPMonentsReplyTableViewCell.h" -#import "XPMonentsReplyMoreTableViewCell.h" - -@interface XPMonentsCommentTableViewCell () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///评论者 -@property (nonatomic,strong) UIView * commentUserView; -///评论者的头像 -@property (nonatomic,strong) NetImageView *commentAvatarView; -///评论者的昵称 -@property (nonatomic,strong) UILabel *commentNickLabel; -///楼主 -@property (nonatomic,strong) UIImageView *ownerImageView; -///评论的内容 -@property (nonatomic,strong) YYLabel *commentLabel; -///时间 -@property (nonatomic,strong) UILabel *commentDateLabel; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///容器 -@property (nonatomic,strong) UIView * lineContainerView; -///分割线 -@property (nonatomic,strong) UIView * lineView; -///数据源 -@property (nonatomic,strong) NSArray *datasource; -@end - -@implementation XPMonentsCommentTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method - -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.commentUserView]; - [self.stackView addArrangedSubview:self.tableView]; - [self.stackView addArrangedSubview:self.lineContainerView]; - - [self.lineContainerView addSubview:self.lineView]; - - [self.commentUserView addSubview:self.commentAvatarView]; - [self.commentUserView addSubview:self.commentNickLabel]; - [self.commentUserView addSubview:self.ownerImageView]; - [self.commentUserView addSubview:self.commentLabel]; - [self.commentUserView addSubview:self.commentDateLabel]; -} - -- (void)initSubViewConstraints { - if ([self.reuseIdentifier isEqualToString:NSStringFromClass([XPMonentsCommentTableViewCell class])]) { - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.mas_equalTo(self.contentView).inset(15); - make.top.bottom.mas_equalTo(self.contentView); - }]; - - [self.lineContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(1); - }]; - - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.commentNickLabel); - make.top.bottom.trailing.mas_equalTo(self.lineContainerView); - }]; - - [self.commentAvatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KMONENTS_COMMENT_AVATAR_WIDTH, KMONENTS_COMMENT_AVATAR_WIDTH)); - make.leading.mas_equalTo(self.commentUserView); - make.top.mas_equalTo(self.commentUserView).offset(10); - }]; - - [self.commentNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.commentAvatarView.mas_trailing).offset(10); - make.top.mas_equalTo(self.commentUserView).offset(10); - make.height.mas_equalTo(15); - }]; - - [self.ownerImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(32, 15)); - make.centerY.mas_equalTo(self.commentNickLabel); - make.leading.mas_equalTo(self.commentNickLabel.mas_trailing).offset(5); - }]; - - [self.commentDateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.commentUserView); - make.centerY.mas_equalTo(self.commentNickLabel); - }]; - - [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.commentNickLabel); - make.top.mas_equalTo(self.commentNickLabel.mas_bottom).offset(10); - make.trailing.mas_equalTo(self.commentUserView).offset(-kMONENTS_COMMENT_RIGHT_PADDING); - }]; - - }else{ - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.mas_equalTo(self.contentView).inset(15); - make.top.bottom.mas_equalTo(self.contentView); - }]; - - [self.lineContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(1); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.commentNickLabel); - make.top.bottom.trailing.mas_equalTo(self.lineContainerView); - }]; - - [self.commentAvatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KMONENTS_COMMENT_AVATAR_WIDTH, KMONENTS_COMMENT_AVATAR_WIDTH)); - make.leading.mas_equalTo(self.commentUserView); - make.top.mas_equalTo(self.commentUserView).offset(10); - }]; - - [self.commentNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.commentAvatarView.mas_trailing).offset(10); - make.top.mas_equalTo(self.commentUserView).offset(10); - make.height.mas_equalTo(15); - }]; - - [self.ownerImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(32, 15)); - make.centerY.mas_equalTo(self.commentNickLabel); - make.leading.mas_equalTo(self.commentNickLabel.mas_trailing).offset(5); - }]; - - [self.commentDateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.commentUserView); - make.centerY.mas_equalTo(self.commentNickLabel); - }]; - - [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.commentNickLabel); - make.top.mas_equalTo(self.commentNickLabel.mas_bottom).offset(10); - make.trailing.mas_equalTo(self.commentUserView).offset(-kMONENTS_COMMENT_RIGHT_PADDING); - }]; - } -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 2; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - if (section == 0) { - return self.datasource.count; - } - return self.commentInfo.replyInfo.leftCount > 0 ? 1 : 0; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 0) { - MonentsReplyModel * replayinfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return replayinfo.replyRowHeight; - } - return 44; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 0) { - XPMonentsReplyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsReplyTableViewCell class])]; - cell.replyInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; - } - XPMonentsReplyMoreTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsReplyMoreTableViewCell class])]; - cell.leftCount = self.commentInfo.replyInfo.leftCount; - cell.delegate = self; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (indexPath.section == 0 && self.datasource.count > 0) { - MonentsReplyModel * replyInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (replyInfo.uid.integerValue != [AccountInfoStorage instance].getUid.integerValue && self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsCommentTableViewCell:didClickCommon:)]) { - [self.delegate xPMonentsCommentTableViewCell:self didClickCommon:replyInfo]; - } - } -} - -#pragma mark - XPMonentsReplyTableViewCellDelegate -- (void)xPMonentsReplyTableViewCell:(XPMonentsReplyTableViewCell *)view didClickAvatar:(MonentsReplyModel *)replyInfo { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsCommentTableViewCell:didClickAvatar:)]) { - [self.delegate xPMonentsCommentTableViewCell:self didClickAvatar:replyInfo.uid]; - } -} - -#pragma mark - XPMonentsReplyMoreTableViewCellDelegate -- (void)xPMonentsReplyMoreTableViewCellDidClickMoreReply:(XPMonentsReplyMoreTableViewCell *)view { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsCommentTableViewCell:didClickMoreReply:)]) { - [self.delegate xPMonentsCommentTableViewCell:self didClickMoreReply:self.commentInfo]; - } -} - -#pragma mark - Event Response -- (void)tapAvatarRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsCommentTableViewCell:didClickAvatar:)]) { - [self.delegate xPMonentsCommentTableViewCell:self didClickAvatar:self.commentInfo.uid]; - } -} - -#pragma mark - Getters And Setters -- (void)setCommentInfo:(MonentsCommentModel *)commentInfo { - _commentInfo = commentInfo; - if (_commentInfo) { - self.ownerImageView.hidden = !_commentInfo.landLordFlag; - self.commentAvatarView.imageUrl = _commentInfo.avatar; - NSString * nick = _commentInfo.nick; - if (nick.length > 8) { - nick = [nick substringToIndex:8]; - } - QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper]; - ///内容 - NSMutableAttributedString * attribute = [faceManager attributedStringByText:_commentInfo.content font:[UIFont systemFontOfSize:15]]; - self.commentLabel.attributedText = attribute; - self.commentNickLabel.text = nick; - self.commentDateLabel.text = [NSString stringWithTimeStamp:_commentInfo.publishTime]; - self.tableView.hidden = _commentInfo.replyInfo.replyList.count <=0; - self.datasource = _commentInfo.replyInfo.replyList; - [self.tableView reloadData]; - if (_commentInfo.replyInfo.replyList.count > 0) { - NSString * content = _commentInfo.content.length > 0 ? _commentInfo.content : @""; - CGFloat commentHeight = [content boundingRectWithSize:CGSizeMake(KMONENTS_COMMENT_MAX_WIDTH, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:15]} context:nil].size.height + 5; - commentHeight = MAX(commentHeight, 15); - [self.commentUserView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(commentHeight + 10 + 15 + 10); - }]; - } - - } -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 10; - } - return _stackView; -} - -- (UIView *)commentUserView { - if (!_commentUserView) { - _commentUserView = [[UIView alloc] init]; - _commentUserView.backgroundColor = [UIColor clearColor]; - } - return _commentUserView; -} - -- (NetImageView *)commentAvatarView { - if (!_commentAvatarView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _commentAvatarView = [[NetImageView alloc] initWithConfig:config]; - _commentAvatarView.layer.masksToBounds = YES; - _commentAvatarView.layer.cornerRadius = 45/2.0; - _commentAvatarView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap= [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAvatarRecognizer)]; - [_commentAvatarView addGestureRecognizer:tap]; - } - return _commentAvatarView; -} - -- (UILabel *)commentNickLabel { - if (!_commentNickLabel) { - _commentNickLabel = [[UILabel alloc] init]; - _commentNickLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _commentNickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - [_commentNickLabel sizeToFit]; - } - return _commentNickLabel; -} - -- (YYLabel *)commentLabel { - if (!_commentLabel) { - _commentLabel = [[YYLabel alloc] init]; - _commentLabel.font = [UIFont systemFontOfSize:15]; - _commentLabel.numberOfLines = 0; - _commentLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _commentLabel.preferredMaxLayoutWidth = KMONENTS_COMMENT_MAX_WIDTH; - } - return _commentLabel; -} - -- (UILabel *)commentDateLabel { - if (!_commentDateLabel) { - _commentDateLabel = [[UILabel alloc] init]; - _commentDateLabel.font = [UIFont systemFontOfSize:12]; - _commentDateLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _commentDateLabel; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.scrollEnabled = NO; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMonentsReplyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsReplyTableViewCell class])]; - [_tableView registerClass:[XPMonentsReplyMoreTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsReplyMoreTableViewCell class])]; - } - return _tableView; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (UIView *)lineContainerView { - if (!_lineContainerView) { - _lineContainerView = [[UIView alloc] init]; - _lineContainerView.backgroundColor = [UIColor clearColor]; - } - return _lineContainerView; -} - -- (UIImageView *)ownerImageView { - if (!_ownerImageView) { - _ownerImageView = [[UIImageView alloc] init]; - _ownerImageView.userInteractionEnabled = YES; - _ownerImageView.image = [UIImage getLanguageImage:@"monents_common_landLordFlag"]; - _ownerImageView.hidden = YES; - } - return _ownerImageView; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsInteractiveTableViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMonentsInteractiveTableViewCell.h deleted file mode 100644 index 19d475e..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsInteractiveTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMonentsInteractiveTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/5/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MonentsInteractiveModel; -@interface XPMonentsInteractiveTableViewCell : UITableViewCell -@property (nonatomic,strong) MonentsInteractiveModel *interactiveInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsInteractiveTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsInteractiveTableViewCell.m deleted file mode 100644 index 0bd2af6..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsInteractiveTableViewCell.m +++ /dev/null @@ -1,317 +0,0 @@ -// -// YMMonentsInteractiveTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/5/19. -// - -#import "XPMonentsInteractiveTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -///Model -#import "MonentsInteractiveModel.h" - -@interface XPMonentsInteractiveTableViewCell () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///显示话题 -@property (nonatomic,strong) UIButton *topicButton; -///显示内容 -@property (nonatomic,strong) UIView * infoView; -///显示头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///性别 -@property (nonatomic,strong) UIButton *sexImageView; -///评论了你 -@property (nonatomic,strong) UILabel *commentLabel; -///赞了动态或者显示评论的内容 -@property (nonatomic,strong) UILabel *contentLabel; -///时间 -@property (nonatomic,strong) UILabel *timeLabel; -///动态的图片 -@property (nonatomic,strong) NetImageView *dynamicImageView; -///动态的内容 -@property (nonatomic,strong) UILabel *dynamicLabel; -///显示分割线 -@property (nonatomic,strong) UIView * lineView; -///时间格式 -@property (nonatomic,strong) NSDateFormatter *dataFormatter; -@end -@implementation XPMonentsInteractiveTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.topicButton]; - [self.stackView addArrangedSubview:self.infoView]; - - - [self.infoView addSubview:self.avatarImageView]; - [self.infoView addSubview:self.nickLabel]; - [self.infoView addSubview:self.sexImageView]; - [self.infoView addSubview:self.commentLabel]; - [self.infoView addSubview:self.contentLabel]; - [self.infoView addSubview:self.timeLabel]; - [self.infoView addSubview:self.dynamicImageView]; - [self.infoView addSubview:self.dynamicLabel]; - [self.infoView addSubview:self.lineView]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.contentView).offset(10); - make.bottom.mas_equalTo(self.contentView); - }]; - - [self.topicButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - make.width.mas_equalTo(50); - }]; - - [self.infoView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth- 15 * 2); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(44, 44)); - make.leading.top.mas_equalTo(self.infoView); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - make.top.mas_equalTo(self.avatarImageView); - }]; - - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(28, 14)); - make.centerY.mas_equalTo(self.nickLabel); - make.leading.mas_equalTo(self.nickLabel.mas_trailing).offset(2); - }]; - - [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.nickLabel); - make.leading.mas_equalTo(self.sexImageView.mas_trailing).offset(2); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(10); - make.leading.mas_equalTo(self.nickLabel); - make.trailing.mas_lessThanOrEqualTo(self.dynamicImageView.mas_leading).offset(-5); - }]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.top.mas_equalTo(self.contentLabel.mas_bottom).offset(10); - }]; - - - [self.dynamicImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(60, 60)); - make.trailing.mas_equalTo(self.infoView); - make.centerY.mas_equalTo(self.infoView); - }]; - - [self.dynamicLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.trailing.mas_equalTo(self.dynamicImageView); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.trailing.mas_equalTo(self.infoView); - make.height.mas_equalTo(1); - make.bottom.mas_equalTo(self.infoView); - }]; -} -#pragma mark - Getters And Setters -- (void)setInteractiveInfo:(MonentsInteractiveModel *)interactiveInfo { - _interactiveInfo = interactiveInfo; - if (_interactiveInfo) { - self.topicButton.hidden = _interactiveInfo.worldName.length <=0; - [self.topicButton setTitle:_interactiveInfo.worldName forState:UIControlStateNormal]; - self.avatarImageView.imageUrl = _interactiveInfo.avatar; - NSString * nick = interactiveInfo.nick; - if (nick.length > 6) { - nick = [NSString stringWithFormat:@"%@…", [nick substringToIndex:6]]; - } - self.nickLabel.text = nick.length > 0 ? nick : @""; - [self.sexImageView setTitle:[NSString stringWithFormat:@"%ld",_interactiveInfo.age] forState:UIControlStateNormal]; - self.sexImageView.backgroundColor = _interactiveInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.selected = _interactiveInfo.gender != GenderType_Male; - self.sexImageView.titleEdgeInsets = _interactiveInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - BOOL isComment = _interactiveInfo.actionType == MonentsInteractiveActionType_Comment; - self.commentLabel.text = isComment ? YMLocalizedString(@"XPMonentsInteractiveTableViewCell0") : @""; - BOOL isText = _interactiveInfo.type == MonentsContentType_Text; - self.dynamicImageView.hidden = isText; - self.dynamicLabel.hidden = !isText; - if (isText) { - self.dynamicLabel.text = _interactiveInfo.content; - } else { - self.dynamicImageView.imageUrl = _interactiveInfo.dynamicRes.resUrl; - } - self.contentLabel.text = _interactiveInfo.message; - - NSDate *date = [NSDate dateWithTimeIntervalSince1970:_interactiveInfo.publishTime.floatValue/1000]; - NSString *dateString = [self.dataFormatter stringFromDate:date]; - self.timeLabel.text = dateString; - - CGFloat width = [_interactiveInfo.worldName boundingRectWithSize:CGSizeMake(150,CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12]} context:nil].size.width + 10; - [self.topicButton mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(width); - }]; - } -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentLeading; - _stackView.spacing = 10; - } - return _stackView; -} - -- (UIButton *)topicButton { - if (!_topicButton) { - _topicButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_topicButton setTitle:YMLocalizedString(@"XPMonentsInteractiveTableViewCell1") forState:UIControlStateNormal]; - [_topicButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _topicButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_topicButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _topicButton.layer.masksToBounds = YES; - _topicButton.layer.cornerRadius = 15; - } - return _topicButton; -} - -- (UIView *)infoView { - if (!_infoView) { - _infoView = [[UIView alloc] init]; - _infoView.backgroundColor = [UIColor clearColor]; - } - return _infoView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 22; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:15]; - _nickLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _nickLabel; -} - -- (UIButton *)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; - } - return _sexImageView; -} - -- (UILabel *)commentLabel { - if (!_commentLabel) { - _commentLabel = [[UILabel alloc] init]; - _commentLabel.font = [UIFont systemFontOfSize:15]; - _commentLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _commentLabel; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[UILabel alloc] init]; - _contentLabel.font = [UIFont systemFontOfSize:15]; - _contentLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _contentLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:12]; - _timeLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _timeLabel; -} - -- (NetImageView *)dynamicImageView { - if (!_dynamicImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _dynamicImageView = [[NetImageView alloc] initWithConfig:config]; - _dynamicImageView.layer.masksToBounds = YES; - _dynamicImageView.layer.cornerRadius = 8; - _dynamicImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _dynamicImageView; -} - -- (UILabel *)dynamicLabel { - if (!_dynamicLabel) { - _dynamicLabel = [[UILabel alloc] init]; - _dynamicLabel.font = [UIFont systemFontOfSize:12]; - _dynamicLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _dynamicLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (NSDateFormatter *)dataFormatter { - if (!_dataFormatter) { - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"]; - _dataFormatter = dateFormatter; - } - return _dataFormatter; -} - - -@end diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsPublishCollectionViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMonentsPublishCollectionViewCell.h deleted file mode 100644 index 6a085c0..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsPublishCollectionViewCell.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMMonentsPublishCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2022/7/1. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMonentsPublishCollectionViewCell; - -@protocol XPMonentsPublishCollectionViewCellDelegate - -- (void)XPMonentsPublishCollectionViewCell:(XPMonentsPublishCollectionViewCell *)view didDeleteItem:(UIImage *)image; - -@end - -@interface XPMonentsPublishCollectionViewCell : UICollectionViewCell -///设置图片 -@property (nonatomic,strong) UIImage *image; -///是否展示删除 -@property (nonatomic,assign) BOOL isShowDelete; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsPublishCollectionViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsPublishCollectionViewCell.m deleted file mode 100644 index b7dd692..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsPublishCollectionViewCell.m +++ /dev/null @@ -1,92 +0,0 @@ -// -// YMMonentsPublishCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2022/7/1. -// - -#import "XPMonentsPublishCollectionViewCell.h" -///Third -#import - -@interface XPMonentsPublishCollectionViewCell () -///显示图片 -@property (nonatomic,strong) UIImageView *logoImageView; -///删除 -@property (nonatomic,strong) UIButton *deleteButton; -@end - - -@implementation XPMonentsPublishCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.logoImageView]; - [self.contentView addSubview:self.deleteButton]; -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.deleteButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20, 20)); - make.trailing.top.mas_equalTo(self.contentView); - }]; -} - -#pragma mark - Event Response -- (void)deleteButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMonentsPublishCollectionViewCell:didDeleteItem:)]) { - [self.delegate XPMonentsPublishCollectionViewCell:self didDeleteItem:self.image]; - } -} - -#pragma mark - Getters And Setters -- (void)setImage:(UIImage *)image { - _image = image; - if (_image) { - self.logoImageView.image = _image; - } -} - -- (void)setIsShowDelete:(BOOL)isShowDelete { - _isShowDelete = isShowDelete; - self.deleteButton.hidden = !_isShowDelete; -} - -- (UIImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[UIImageView alloc] init]; - _logoImageView.userInteractionEnabled = YES; - _logoImageView.layer.masksToBounds = YES; - _logoImageView.layer.cornerRadius = 10; - _logoImageView.contentMode = UIViewContentModeScaleAspectFill; - _logoImageView.layer.masksToBounds = YES; - } - return _logoImageView; -} - -- (UIButton *)deleteButton { - if (!_deleteButton) { - _deleteButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_deleteButton setImage:[UIImage imageNamed:@"monents_publish_album_delete"] forState:UIControlStateNormal]; - [_deleteButton setImage:[UIImage imageNamed:@"monents_publish_album_delete"] forState:UIControlStateSelected]; - [_deleteButton addTarget:self action:@selector(deleteButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _deleteButton; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.h deleted file mode 100644 index e010542..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMMonentsReplyMoreTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/6/23. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMonentsReplyMoreTableViewCell; -@protocol XPMonentsReplyMoreTableViewCellDelegate - -- (void)xPMonentsReplyMoreTableViewCellDidClickMoreReply:(XPMonentsReplyMoreTableViewCell *)view; - -@end -@interface XPMonentsReplyMoreTableViewCell : UITableViewCell -///代理 -@property (nonatomic,weak) id delegate; - -///剩余的个数 -@property (nonatomic,assign) NSInteger leftCount; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.m deleted file mode 100644 index f2696fb..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.m +++ /dev/null @@ -1,70 +0,0 @@ -// -// YMMonentsReplyMoreTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/6/23. -// - -#import "XPMonentsReplyMoreTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "XPMomentsLayoutConfig.h" - -@interface XPMonentsReplyMoreTableViewCell () -///查看更多 -@property (nonatomic,strong) UILabel *moreLabel; - -@end -@implementation XPMonentsReplyMoreTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.moreLabel]; -} - -- (void)initSubViewConstraints { - [self.moreLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.top.bottom.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(kMONENTS_COMMENT_REPLY_LEFT_PADDING + KMONENTS_COMMENT_REPLY_AVATAR_WIDTH + kMONENTS_COMMENT_AVATAR_NICK_PADDING); - }]; -} -#pragma mark - Event Response -- (void)moreLabelTapRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsReplyMoreTableViewCellDidClickMoreReply:)]) { - [self.delegate xPMonentsReplyMoreTableViewCellDidClickMoreReply:self]; - } -} -#pragma mark - Getters And Setters -- (void)setLeftCount:(NSInteger)leftCount { - _leftCount = leftCount; - if (_leftCount) { - self.moreLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMonentsReplyMoreTableViewCell0"), _leftCount]; - } -} - -- (UILabel *)moreLabel { - if (!_moreLabel) { - _moreLabel = [[UILabel alloc] init]; - _moreLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightBold]; - _moreLabel.textColor = [DJDKMIMOMColor appEmphasizeColor]; - _moreLabel.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(moreLabelTapRecognizer)]; - [_moreLabel addGestureRecognizer:tap]; - } - return _moreLabel; -} - - -@end diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.h deleted file mode 100644 index 639ea5a..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// YMMonentsReplyTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/6/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MonentsReplyModel, XPMonentsReplyTableViewCell; -@protocol XPMonentsReplyTableViewCellDelegate - -///点击了头像 -- (void)xPMonentsReplyTableViewCell:(XPMonentsReplyTableViewCell *)view didClickAvatar:(MonentsReplyModel *)replyInfo; - -@end -@interface XPMonentsReplyTableViewCell : UITableViewCell -@property (nonatomic,strong) MonentsReplyModel *replyInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.m deleted file mode 100644 index 340557c..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.m +++ /dev/null @@ -1,184 +0,0 @@ -// -// YMMonentsReplyTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/6/22. -// - -#import "XPMonentsReplyTableViewCell.h" -///Third -#import - -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "XPMomentsLayoutConfig.h" -#import "NSString+Utils.h" -#import "QEmotionHelper.h" -///Model -#import "MonentsCommentReplyModel.h" - -@interface XPMonentsReplyTableViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///自己的名字 -@property (nonatomic,strong) UILabel *nickLabel; -///房主 -@property (nonatomic,strong) UIImageView *ownerImageView; -///内容 -@property (nonatomic,strong) YYLabel *contentLabel; -///时间 -@property (nonatomic,strong) UILabel *dateLabel; -///分割线 -@property (nonatomic,strong) UIView * lineView; - -@end - -@implementation XPMonentsReplyTableViewCell - - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.ownerImageView]; - [self.contentView addSubview:self.contentLabel]; - [self.contentView addSubview:self.dateLabel]; - [self.contentView addSubview:self.lineView]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KMONENTS_COMMENT_REPLY_AVATAR_WIDTH, KMONENTS_COMMENT_REPLY_AVATAR_WIDTH)); - make.top.mas_equalTo(self.contentView).offset(10); - make.leading.mas_equalTo(self.contentView).offset(kMONENTS_COMMENT_REPLY_LEFT_PADDING); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(kMONENTS_COMMENT_AVATAR_NICK_PADDING); - make.top.mas_equalTo(self.contentView).offset(10); - make.height.mas_equalTo(15); - }]; - - [self.ownerImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(30, 15)); - make.centerY.mas_equalTo(self.nickLabel); - make.leading.mas_equalTo(self.nickLabel.mas_trailing).offset(5); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(10); - make.trailing.mas_equalTo(self.contentView).offset(-15); - }]; - - [self.dateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView).offset(-10); - make.centerY.mas_equalTo(self.nickLabel); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.trailing.mas_equalTo(self.contentView).offset(-10); - make.height.mas_equalTo(0.5); - make.bottom.mas_equalTo(self.contentView); - }]; -} - -#pragma mark - Event Response -- (void)tapAvatarImage { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsReplyTableViewCell:didClickAvatar:)]) { - [self.delegate xPMonentsReplyTableViewCell:self didClickAvatar:self.replyInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setReplyInfo:(MonentsReplyModel *)replyInfo { - _replyInfo = replyInfo; - if (_replyInfo) { - self.avatarImageView.imageUrl = _replyInfo.avatar; - NSString * nick = _replyInfo.nick; - if (nick.length > 8) { - nick = [nick substringToIndex:8]; - } - self.ownerImageView.hidden = !_replyInfo.landLordFlag; - self.nickLabel.text = nick; - self.dateLabel.text = [NSString stringWithTimeStamp:_replyInfo.publishTime]; - self.contentLabel.attributedText = _replyInfo.contentAttribute; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 30/2.0; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - _avatarImageView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAvatarImage)]; - [_avatarImageView addGestureRecognizer:tap]; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (YYLabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[YYLabel alloc] init]; - _contentLabel.preferredMaxLayoutWidth = kMOMENTS_COMMENT_REPLY_MAX_WIDTH; - _contentLabel.numberOfLines = 0; - } - return _contentLabel; -} - -- (UILabel *)dateLabel { - if (!_dateLabel) { - _dateLabel = [[UILabel alloc] init]; - _dateLabel.font = [UIFont systemFontOfSize:12]; - _dateLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _dateLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (UIImageView *)ownerImageView { - if (!_ownerImageView) { - _ownerImageView = [[UIImageView alloc] init]; - _ownerImageView.userInteractionEnabled = YES; - _ownerImageView.image = [UIImage getLanguageImage:@"monents_common_landLordFlag"]; - _ownerImageView.hidden = YES; - } - return _ownerImageView; -} - - -@end diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.h b/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.h deleted file mode 100644 index 63d7d73..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMonentsTopicCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2022/5/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MomentsTopicModel; -@interface XPMonentsTopicCollectionViewCell : UICollectionViewCell -@property (nonatomic,strong) MomentsTopicModel *topicInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.m deleted file mode 100644 index 537d073..0000000 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.m +++ /dev/null @@ -1,114 +0,0 @@ -// -// XPMonentsTopicCollectionViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2022/5/18. -// - -#import "XPMonentsTopicCollectionViewCell.h" -///Third -#import -///Tool - -#import "UIImage+Utils.h" -///Model -#import "MomentsTopicModel.h" - -@interface XPMonentsTopicCollectionViewCell () - -///背景 -//@property (nonatomic,strong) UIImageView *topicImageView; -///显示话题前面的# -@property (nonatomic,strong) UIImageView *iconImageView; -///显示话题 -@property (nonatomic,strong) UILabel *topicLabel; - -@end - -@implementation XPMonentsTopicCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.contentView.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.iconImageView]; - [self.contentView addSubview:self.topicLabel]; -// [self.contentView addSubview:self.topicImageView]; -// [self.topicImageView addSubview:self.iconImageView]; -// [self.topicImageView addSubview:self.topicLabel]; -} - -- (void)initSubViewConstraints { - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.contentView); - make.leading.mas_equalTo(14); - make.width.height.mas_equalTo(10); - }]; - - [self.topicLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.trailing.equalTo(self.contentView); - make.leading.equalTo(self.iconImageView.mas_trailing).mas_offset(5); - make.trailing.mas_equalTo(-5.5); - }]; - -// [self.topicImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.edges.mas_equalTo(self.contentView); -// }]; -// -// [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.leading.mas_equalTo(self.topicImageView).offset(7); -// make.size.mas_equalTo(CGSizeMake(16, 16)); -// make.centerY.mas_equalTo(self.topicImageView); -// }]; -// -// [self.topicLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.leading.mas_equalTo(self.iconImageView.mas_trailing).offset(2); -// make.centerY.mas_equalTo(self.topicImageView); -// }]; -} - -#pragma mark - Getters And Setters -- (void)setTopicInfo:(MomentsTopicModel *)topicInfo { - _topicInfo = topicInfo; - if (_topicInfo) { - self.topicLabel.text = _topicInfo.name; - } -} -// -//- (UIImageView *)topicImageView { -// if (!_topicImageView) { -// _topicImageView = [[UIImageView alloc] init]; -// _topicImageView.userInteractionEnabled = YES; -// _topicImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFFCDD), UIColorFromRGB(0xDFF9FF), UIColorFromRGB(0xF4E5FF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; -// _topicImageView.layer.masksToBounds = YES; -// _topicImageView.layer.cornerRadius = 13; -// } -// return _topicImageView; -//} - -- (UIImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[UIImageView alloc] init]; - _iconImageView.userInteractionEnabled = YES; - _iconImageView.image = [UIImage imageNamed:@"monents_info_topic_icon"]; - } - return _iconImageView; -} - -- (UILabel *)topicLabel { - if (!_topicLabel) { - _topicLabel = [[UILabel alloc] init]; - _topicLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightRegular]; - _topicLabel.textColor = UIColorFromRGB(0x1F1A4E); - } - return _topicLabel; -} -@end diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.h deleted file mode 100644 index d85b309..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMMoentsTopicListView.h -// YUMI -// -// Created by YUMI on 2022/8/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMoentsTopicListView, MomentsTopicModel; -@protocol XPMoentsTopicListViewDelegate - -- (void)xPMoentsTopicListView:(XPMoentsTopicListView *)view didSelectItem:(MomentsTopicModel *)topicInfo; - -@end -@interface XPMoentsTopicListView : UIView -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.m deleted file mode 100644 index 54712dd..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.m +++ /dev/null @@ -1,263 +0,0 @@ -// -// YMMoentsTopicListView.m -// YUMI -// -// Created by YUMI on 2022/8/16. -// - -#import "XPMoentsTopicListView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "Api+Moments.h" -#import "NetImageView.h" -#import "XNDJTDDLoadingTool.h" -#import "AccountInfoStorage.h" -#import "MomentsTopicModel.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" - -@interface XPMoentsTopicListTableViewCell : UITableViewCell -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///标题 -@property (nonatomic,strong) UILabel *nameLabel; -///描述 -@property (nonatomic,strong) UILabel *desLabel; -@property (nonatomic,strong) MomentsTopicModel *topicInfo; -@end - -@implementation XPMoentsTopicListTableViewCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColor.clearColor; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nameLabel]; - [self.contentView addSubview:self.desLabel]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(10); - make.centerY.mas_equalTo(self.contentView); - make.width.mas_equalTo(100); - make.height.mas_equalTo(60); - }]; - - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - make.trailing.mas_equalTo(-20); - }]; - - [self.desLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - make.leading.trailing.mas_equalTo(self.nameLabel); - }]; -} - -#pragma mark - Getters And Setters -- (void)setTopicInfo:(MomentsTopicModel *)topicInfo { - _topicInfo= topicInfo; - if (_topicInfo) { - self.avatarImageView.imageUrl = _topicInfo.icon; - self.nameLabel.text = _topicInfo.worldName; - self.desLabel.text = _topicInfo.desc; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 12; - } - return _avatarImageView; -} - -- (UILabel *)nameLabel { - if (_nameLabel == nil) { - _nameLabel = [[UILabel alloc] init]; - _nameLabel.font = [UIFont systemFontOfSize:15]; - _nameLabel.textColor = DJDKMIMOMColor.mainTextColor; - } - return _nameLabel; -} - -- (UILabel *)desLabel { - if (_desLabel == nil) { - _desLabel = [[UILabel alloc] init]; - _desLabel.font = [UIFont systemFontOfSize:12]; - _desLabel.textColor = DJDKMIMOMColor.secondTextColor; - _desLabel.numberOfLines = 2; - } - return _desLabel; -} - -@end - - -@interface XPMoentsTopicListView () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -@property (nonatomic,assign) int page; -@end - -@implementation XPMoentsTopicListView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -- (void)headerRefresh { - self.page = 1; - NSString * pageStr = [NSString stringWithFormat:@"%d", self.page]; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api momentsTopicList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [self.tableView.mj_header endRefreshing]; - if (code == 200) { - [self.datasource removeAllObjects]; - NSArray * array = [MomentsTopicModel modelsWithArray:data.data]; - [self.datasource addObjectsFromArray:array]; - [self.tableView reloadData]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } uid:uid type:@"0" page:pageStr]; -} - -- (void)footerRefresh { - self.page++; - NSString * pageStr = [NSString stringWithFormat:@"%d", self.page]; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api momentsTopicList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [self.tableView.mj_footer endRefreshing]; - if (code == 200) { - NSArray * array = [MomentsTopicModel modelsWithArray:data.data]; - if (array.count > 0) { - [self.datasource addObjectsFromArray:array]; - [self.tableView reloadData]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMoentsTopicListView0")]; - } - - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } uid:uid type:@"0" page:pageStr]; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - self.layer.masksToBounds = YES; - self.layer.cornerRadius = 10; - [self addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KScreenWidth, 450)); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self); - make.top.mas_equalTo(self).offset(10); - }]; -} - - - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPMoentsTopicListTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMoentsTopicListTableViewCell class])]; - if (cell == nil) { - cell = [[XPMoentsTopicListTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMoentsTopicListTableViewCell class])]; - } - cell.topicInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 80; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - MomentsTopicModel * infor = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMoentsTopicListView:didSelectItem:)]) { - [self.delegate xPMoentsTopicListView:self didSelectItem:infor]; - } - } -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMoentsTopicListTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMoentsTopicListTableViewCell class])]; - } - return _tableView; -} - - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.h deleted file mode 100644 index 8e3985c..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// XPMonentsContentView.h -// xplan-ios -// -// Created by 冯硕 on 2022/5/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MomentsInfoModel, XPMomentsContentView; - -@protocol XPMomentsContentViewDelegate - -///点击这折叠 -- (void)xPMonentsContentView:(XPMomentsContentView *)view didClickFold:(MomentsInfoModel *)monentsInfo; - -@end - -@interface XPMomentsContentView : UIView -/// -@property (nonatomic,assign) BOOL isTopic; -@property (nonatomic,assign) BOOL isInUserDetail; -@property (nonatomic,strong) MomentsInfoModel *monentsInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.m deleted file mode 100644 index 2d171ab..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsContentView.m +++ /dev/null @@ -1,202 +0,0 @@ -// -// XPMonentsContentView.m -// xplan-ios -// -// Created by 冯硕 on 2022/5/13. -// - -#import "XPMomentsContentView.h" -///Third -#import - -///Tool - -#import "XPMomentsLayoutConfig.h" -#import "UIButton+EnlargeTouchArea.h" -///Model -#import "MomentsInfoModel.h" -@interface XPMomentsContentView () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///显示内容 -@property (nonatomic,strong) UILabel *contentLabel; -///折叠的按钮 -@property (nonatomic,strong) UIButton *foldButton; -///显示时间 -@property (nonatomic,strong) UILabel *timeLabel; -@end - - -@implementation XPMomentsContentView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)setIsInUserDetail:(BOOL)isInUserDetail { - _isInUserDetail = isInUserDetail; - if (isInUserDetail) { - self.timeLabel.textColor = [UIColor whiteColor]; - self.contentLabel.textColor = [UIColor whiteColor]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - - [self addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.contentLabel]; - [self.stackView addArrangedSubview:self.foldButton]; - [self.stackView addArrangedSubview:self.timeLabel]; -} - -- (void)initSubViewConstraints { - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(14); - }]; - [self.foldButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kMOMENTS_FOLD_HEIGHT); - }]; -} - -- (NSAttributedString *)createMonentsContentAttribute { - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; - BOOL isTop = NO; - if(self.isTopic && self.monentsInfo.topicTop){ - isTop = YES; - }else{ - if (self.monentsInfo.squareTop ) { - isTop = YES; - } - } - if (isTop) {//动态/广场 - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage getLanguageImage:@"monents_info_top"];; - attachment.bounds = CGRectMake(0, roundf(self.contentLabel.font.capHeight - 14)/2.f, 37, 14); - - attachment.image =iconImage; - NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; - [attributedString insertAttributedString:starAttribute atIndex:0]; - //将图片插入到合适的位置 -// [attributedString appendAttributedString:[self creatStrAttrByStr:YMLocalizedString(@"XPMonentsContentView0") attributed:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName: UIColorFromRGB(0xE84C46)}]]; - } - [attributedString appendAttributedString:[self creatStrAttrByStr:self.monentsInfo.content attributed:@{NSFontAttributeName : [UIFont systemFontOfSize:15]}]]; - attributedString.yy_lineSpacing = 5; - attributedString.yy_lineBreakMode = NSLineBreakByWordWrapping; - return attributedString; -} - -- (NSMutableAttributedString *)creatStrAttrByStr:(NSString *)str attributed:(NSDictionary *)attribute{ - if (str.length == 0 || !str) { - str = @" "; - } - NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:str attributes:attribute]; - return attr; -} - - - -#pragma mark - Event Response -- (void)didClickFoldButton:(UIButton *)sender { - sender.selected = !sender.selected; - self.monentsInfo.isFold = !sender.selected; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsContentView:didClickFold:)]) { - [self.delegate xPMonentsContentView:self didClickFold:self.monentsInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setMonentsInfo:(MomentsInfoModel *)monentsInfo { - _monentsInfo = monentsInfo; - if (_monentsInfo) { - self.timeLabel.text = [NSString stringWithTimeStamp:_monentsInfo.publishTime]; - self.contentLabel.attributedText = [self createMonentsContentAttribute]; - self.foldButton.selected = !_monentsInfo.isFold; - if (monentsInfo.numberOfText <= 0) { - YYTextContainer *container = [YYTextContainer new]; - container.size = CGSizeMake(kMONENTS_CONTENT_MAX_WIDTH, CGFLOAT_MAX); - container.maximumNumberOfRows = 0; - YYTextLayout * layout = [YYTextLayout layoutWithContainer:container text:self.contentLabel.attributedText]; - if (layout.rowCount > 6) { - self.foldButton.hidden = NO; - [self.foldButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kMOMENTS_FOLD_HEIGHT); - }]; - } else { - self.foldButton.hidden = YES; - [self.foldButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(0); - }]; - } - } else { - if (monentsInfo.numberOfText > 6) { - self.foldButton.hidden = NO; - [self.foldButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kMOMENTS_FOLD_HEIGHT); - }]; - } else { - self.foldButton.hidden = YES; - [self.foldButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(0); - }]; - } - } - } -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentLeading; - _stackView.spacing = 5; - } - return _stackView; -} - -- (UIButton *)foldButton { - if (_foldButton == nil) { - _foldButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_foldButton setTitle:YMLocalizedString(@"XPMonentsContentView1") forState:UIControlStateNormal]; - [_foldButton setTitle:YMLocalizedString(@"XPMonentsContentView2") forState:UIControlStateSelected]; - [_foldButton setTitleColor:UIColorFromRGB(0x34A7FF) forState:UIControlStateNormal]; - [_foldButton setTitleColor:UIColorFromRGB(0x34A7FF) forState:UIControlStateSelected]; - _foldButton.titleLabel.font = [UIFont systemFontOfSize:15]; - _foldButton.hidden = YES; - [_foldButton addTarget:self action:@selector(didClickFoldButton:) forControlEvents:UIControlEventTouchUpInside]; - } - return _foldButton; -} - - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[UILabel alloc] init]; - _contentLabel.numberOfLines = 0; - _contentLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular]; - _contentLabel.textColor = UIColorRGBAlpha(0x1F1A4E, 1); - _contentLabel.preferredMaxLayoutWidth = kMONENTS_CONTENT_MAX_WIDTH; - _contentLabel.lineBreakMode = NSLineBreakByWordWrapping; - - } - return _contentLabel; -} -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular]; - _timeLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _timeLabel; -} -@end diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.h deleted file mode 100644 index 9be6bb8..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMMonentsPhotoView.h -// YUMI -// -// Created by YUMI on 2022/5/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MomentsPicInfoModel, XPMomentsPhotoView; -@protocol XPMomentsPhotoViewDelegate - -- (void)xPMonentsPhotoView:(XPMomentsPhotoView *)view didClickImage:(NSInteger)index; - -@end - -@interface XPMomentsPhotoView : UIView -///发布的内容 -@property (nonatomic,copy) NSArray *dynamicResList; -@property (nonatomic,copy) NSArray *mineDynamicResList; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.m deleted file mode 100644 index fa28071..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsPhotoView.m +++ /dev/null @@ -1,364 +0,0 @@ -// -// XPMonentsPhotoView.m -// xplan-ios -// -// Created by 冯硕 on 2022/5/12. -// - -#import "XPMomentsPhotoView.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "XPMomentsLayoutConfig.h" -///Model -#import "MomentsInfoModel.h" - -@interface XPMomentsPhotoView () -///第一个 -@property (nonatomic,strong) NetImageView *firstImageView; -///第二个 -@property (nonatomic,strong) NetImageView *secondImageView; -///第三个 -@property (nonatomic,strong) NetImageView *thirdImageView; -///第四个 -@property (nonatomic,strong) NetImageView *fourthImageView; -///第五个 -@property (nonatomic,strong) NetImageView *fifthImageView; -///第六个 -@property (nonatomic,strong) NetImageView *sixthImageView; -///第七个 -@property (nonatomic,strong) NetImageView *sevenImageView; -///第八个 -@property (nonatomic,strong) NetImageView *eighthImageView; -///第九个 -@property (nonatomic,strong) NetImageView *ninthImageView; -@property (nonatomic,strong) NSArray *subViewArray; -@end - - -@implementation XPMomentsPhotoView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.firstImageView]; - [self addSubview:self.secondImageView]; - [self addSubview:self.thirdImageView]; - [self addSubview:self.fourthImageView]; - [self addSubview:self.fifthImageView]; - [self addSubview:self.sixthImageView]; - [self addSubview:self.sevenImageView]; - [self addSubview:self.eighthImageView]; - [self addSubview:self.ninthImageView]; - self.subViewArray = @[self.firstImageView, self.secondImageView, self.thirdImageView, self.fourthImageView, self.fifthImageView, self.sixthImageView, self.sevenImageView, self.eighthImageView, self.ninthImageView]; -} - -- (void)hiddenAllImageView { - [self.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - obj.hidden = YES; - }]; -} - -#pragma mark - Event Response -- (void)tapImageView:(UITapGestureRecognizer *)tap { - NetImageView * imageView = (NetImageView *)tap.view; - if (imageView.imageUrl.length > 0 && self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsPhotoView:didClickImage:)]) { - [self.delegate xPMonentsPhotoView:self didClickImage:imageView.tag - 1001]; - } -} - - -#pragma mark - Getters And Setters --(void)setMineDynamicResList:(NSArray *)mineDynamicResList{ - _mineDynamicResList = mineDynamicResList; - [self hiddenAllImageView]; - if ( _mineDynamicResList.count == 0) { - - } else if ( _mineDynamicResList.count == 1) { - self.firstImageView.hidden = NO; - [self.firstImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KScreenWidth-27*2, KScreenWidth-27*2)); - make.leading.top.mas_equalTo(self); - }]; - MomentsPicInfoModel * picInfo = [ _mineDynamicResList xpSafeObjectAtIndex:0]; - if(picInfo != nil){ - self.firstImageView.imageUrl = picInfo.resUrl; - } - } else if( _mineDynamicResList.count == 2) { - self.firstImageView.hidden = NO; - CGFloat itemWidth = (KScreenWidth-27*2 - kMOMENTS_PIC_SPACE) / 2; - [self.firstImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); - make.leading.top.mas_equalTo(self); - }]; - - MomentsPicInfoModel * picInfo = [ _mineDynamicResList xpSafeObjectAtIndex:0]; - if(picInfo != nil){ - self.firstImageView.imageUrl = picInfo.resUrl; - - self.secondImageView.hidden = NO; - [self.secondImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); - make.top.mas_equalTo(self); - make.leading.mas_equalTo(self.firstImageView.mas_trailing).offset(kMOMENTS_PIC_SPACE); - }]; - } - MomentsPicInfoModel * secondPicInfo = [ _mineDynamicResList xpSafeObjectAtIndex:1]; - if(secondPicInfo != nil){ - self.secondImageView.imageUrl = secondPicInfo.resUrl; - - } - - } else{ - for (int i = 0; i < _mineDynamicResList.count; i++) { - MomentsPicInfoModel * picInfo = [ _mineDynamicResList xpSafeObjectAtIndex:i]; - if (i < self.subViewArray.count) { - NetImageView * imageView = [self.subViewArray xpSafeObjectAtIndex:i]; - imageView.hidden = NO; - imageView.imageUrl = picInfo.resUrl; - } - } - - CGFloat itemWidth = (KScreenWidth-27*2 - kMOMENTS_PIC_SPACE * 2) / 3; - for (int i = 0; i < self.subViewArray.count; i++) { - NSInteger page = i % 3; - NSInteger line = i / 3; - NetImageView * imageView = [self.subViewArray xpSafeObjectAtIndex:i]; - if(imageView == nil)return; - [imageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); - make.leading.mas_equalTo(page * (itemWidth + kMOMENTS_PIC_SPACE)); - make.top.mas_equalTo(line * (itemWidth + kMOMENTS_PIC_SPACE)); - }]; - } - } -} - -- (void)setDynamicResList:(NSArray *)dynamicResList { - _dynamicResList = dynamicResList; - [self hiddenAllImageView]; - if (_dynamicResList.count == 0) { - return; - } - if (_dynamicResList.count == 1) { - self.firstImageView.hidden = NO; - [self.firstImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kMOMENTS_PIC_ONE_WIDTH, kMOMENTS_PIC_ONE_WIDTH)); - make.leading.top.mas_equalTo(self); - }]; - MomentsPicInfoModel * picInfo = [_dynamicResList xpSafeObjectAtIndex:0]; - self.firstImageView.imageUrl = picInfo.resUrl; - } else if(_dynamicResList.count == 2) { - self.firstImageView.hidden = NO; - CGFloat itemWidth = (kMONENTS_CONTENT_MAX_WIDTH - kMOMENTS_PIC_SPACE) / 2; - [self.firstImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); - make.leading.top.mas_equalTo(self); - }]; - - MomentsPicInfoModel * picInfo = [_dynamicResList xpSafeObjectAtIndex:0]; - self.firstImageView.imageUrl = picInfo.resUrl; - - self.secondImageView.hidden = NO; - [self.secondImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); - make.top.mas_equalTo(self); - make.leading.mas_equalTo(self.firstImageView.mas_trailing).offset(kMOMENTS_PIC_SPACE); - }]; - - MomentsPicInfoModel * secondPicInfo = [_dynamicResList xpSafeObjectAtIndex:1]; - self.secondImageView.imageUrl = secondPicInfo.resUrl; - - } else{ - for (int i = 0; i < _dynamicResList.count; i++) { - MomentsPicInfoModel * picInfo = [_dynamicResList xpSafeObjectAtIndex:i]; - if (i < self.subViewArray.count) { - NetImageView * imageView = [self.subViewArray xpSafeObjectAtIndex:i]; - imageView.hidden = NO; - imageView.imageUrl = picInfo.resUrl; - } - } - - CGFloat itemWidth = (kMONENTS_CONTENT_MAX_WIDTH - kMOMENTS_PIC_SPACE * 2) / 3; - for (int i = 0; i < self.subViewArray.count; i++) { - NSInteger page = i % 3; - NSInteger line = i / 3; - NetImageView * imageView = [self.subViewArray xpSafeObjectAtIndex:i]; - if(imageView == nil)return; - [imageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); - make.leading.mas_equalTo(page * (itemWidth + kMOMENTS_PIC_SPACE)); - make.top.mas_equalTo(line * (itemWidth + kMOMENTS_PIC_SPACE)); - }]; - } - } -} - -- (NetImageView *)firstImageView { - if (!_firstImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeMonentsPhoto; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _firstImageView = [[NetImageView alloc] initWithConfig:config]; - _firstImageView.layer.masksToBounds = YES; - _firstImageView.layer.cornerRadius = 12; - _firstImageView.contentMode = UIViewContentModeScaleAspectFill; - _firstImageView.tag = 1000 + 1; - _firstImageView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapImageView:)]; - [_firstImageView addGestureRecognizer:tap]; - } - return _firstImageView; -} - -- (NetImageView *)secondImageView { - if (!_secondImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeMonentsPhoto; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _secondImageView = [[NetImageView alloc] initWithConfig:config]; - _secondImageView.layer.masksToBounds = YES; - _secondImageView.layer.cornerRadius = 12; - _secondImageView.contentMode = UIViewContentModeScaleAspectFill; - _secondImageView.tag = 1000 + 2; - _secondImageView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapImageView:)]; - [_secondImageView addGestureRecognizer:tap]; - } - return _secondImageView; -} - -- (NetImageView *)thirdImageView { - if (!_thirdImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeMonentsPhoto; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _thirdImageView = [[NetImageView alloc] initWithConfig:config]; - _thirdImageView.layer.masksToBounds = YES; - _thirdImageView.layer.cornerRadius = 12; - _thirdImageView.contentMode = UIViewContentModeScaleAspectFill; - _thirdImageView.tag = 1000 + 3; - _thirdImageView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapImageView:)]; - [_thirdImageView addGestureRecognizer:tap]; - } - return _thirdImageView; -} - - -- (NetImageView *)fourthImageView { - if (!_fourthImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeMonentsPhoto; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _fourthImageView = [[NetImageView alloc] initWithConfig:config]; - _fourthImageView.layer.masksToBounds = YES; - _fourthImageView.layer.cornerRadius = 12; - _fourthImageView.contentMode = UIViewContentModeScaleAspectFill; - _fourthImageView.tag = 1000 + 4; - _fourthImageView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapImageView:)]; - [_fourthImageView addGestureRecognizer:tap]; - - } - return _fourthImageView; -} - -- (NetImageView *)fifthImageView { - if (!_fifthImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeMonentsPhoto; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _fifthImageView = [[NetImageView alloc] initWithConfig:config]; - _fifthImageView.layer.masksToBounds = YES; - _fifthImageView.layer.cornerRadius = 12; - _fifthImageView.contentMode = UIViewContentModeScaleAspectFill; - _fifthImageView.tag = 1000 + 5; - _fifthImageView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapImageView:)]; - [_fifthImageView addGestureRecognizer:tap]; - } - return _fifthImageView; -} - - -- (NetImageView *)sixthImageView { - if (!_sixthImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeMonentsPhoto; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _sixthImageView = [[NetImageView alloc] initWithConfig:config]; - _sixthImageView.layer.masksToBounds = YES; - _sixthImageView.layer.cornerRadius = 12; - _sixthImageView.contentMode = UIViewContentModeScaleAspectFill; - _sixthImageView.tag = 1000 + 6; - _sixthImageView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapImageView:)]; - [_sixthImageView addGestureRecognizer:tap]; - } - return _sixthImageView; -} - - -- (NetImageView *)sevenImageView { - if (!_sevenImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeMonentsPhoto; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _sevenImageView = [[NetImageView alloc] initWithConfig:config]; - _sevenImageView.layer.masksToBounds = YES; - _sevenImageView.layer.cornerRadius = 12; - _sevenImageView.contentMode = UIViewContentModeScaleAspectFill; - _sevenImageView.tag = 1000 + 7; - _sevenImageView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapImageView:)]; - [_sevenImageView addGestureRecognizer:tap]; - } - return _sevenImageView; -} - - -- (NetImageView *)eighthImageView { - if (!_eighthImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeMonentsPhoto; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _eighthImageView = [[NetImageView alloc] initWithConfig:config]; - _eighthImageView.layer.masksToBounds = YES; - _eighthImageView.layer.cornerRadius = 12; - _eighthImageView.contentMode = UIViewContentModeScaleAspectFill; - _eighthImageView.tag = 1000 + 8; - _eighthImageView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapImageView:)]; - [_eighthImageView addGestureRecognizer:tap]; - } - return _eighthImageView; -} - - -- (NetImageView *)ninthImageView { - if (!_ninthImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeMonentsPhoto; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _ninthImageView = [[NetImageView alloc] initWithConfig:config]; - _ninthImageView.layer.masksToBounds = YES; - _ninthImageView.layer.cornerRadius = 12; - _ninthImageView.contentMode = UIViewContentModeScaleAspectFill; - _ninthImageView.tag = 1000 + 9; - _ninthImageView.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapImageView:)]; - [_ninthImageView addGestureRecognizer:tap]; - } - return _ninthImageView; -} - - -@end diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.h deleted file mode 100644 index 1e9b981..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMMonentsRecommendHeaderView.h -// YUMI -// -// Created by YUMI on 2022/5/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MomentsTopicModel,XPMomentsRecommendHeaderView ; -@protocol XPMomentsRecommendHeaderViewDelegate - -///选中了某个item -- (void)XPMomentsRecommendHeaderView:(XPMomentsRecommendHeaderView *)view didSelectItem:(MomentsTopicModel *)info; - -///查看更多 -- (void)XPMomentsRecommendHeaderView:(XPMomentsRecommendHeaderView *)view didClickMoreTopic:(UIButton *)sender; - -@end - -@interface XPMomentsRecommendHeaderView : UIView -@property (nonatomic,strong) NSArray *topicList; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.m deleted file mode 100644 index f12d339..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsRecommendHeaderView.m +++ /dev/null @@ -1,216 +0,0 @@ -// -// XPMonentsRecommendHeaderView.m -// xplan-ios -// -// Created by 冯硕 on 2022/5/18. -// - -#import "XPMomentsRecommendHeaderView.h" -///Third -#import - -///Model -#import "MomentsTopicModel.h" -///View -#import "XPMonentsTopicCollectionViewCell.h" - -@interface XPMomentsRecommendHeaderView () -///背景图 -@property (nonatomic,strong) UIImageView *bgView; - -///titile背景 -@property (nonatomic,strong) UIImageView *titleBgView; - -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///显示箭头 -//@property (nonatomic,strong) UIButton *arrowButton; -///列表背景 -@property (nonatomic,strong) UIView *collectionBgView; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; - -@end - -@implementation XPMomentsRecommendHeaderView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.collectionBgView]; - [self.collectionBgView addSubview:self.collectionView]; - [self.bgView addSubview:self.titleBgView]; - [self.titleBgView addSubview:self.titleLabel]; - -} - -- (void)initSubViewConstraints { - - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(16); - make.trailing.mas_offset(-15); - make.leading.mas_offset(15); - make.bottom.mas_equalTo(-20); - }]; -// [self.collectionBgView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.top.mas_equalTo(10); -// make.leading.mas_equalTo(10); -// make.trailing.mas_equalTo(-10); -// make.bottom.mas_equalTo(-10); -// }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(15); - make.leading.trailing.equalTo(self.collectionBgView); - make.height.mas_equalTo(69); - }]; - [self.titleBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.equalTo(self.bgView); - make.width.mas_equalTo(74); - make.height.mas_equalTo(21); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.equalTo(self.titleBgView); - }]; - -// [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { -// make.size.mas_equalTo(CGSizeMake(11, 20)); -// make.centerY.mas_equalTo(self.titleLabel); -// make.trailing.mas_equalTo(self).offset(-15); -// }]; - - -} - -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.topicList.count; -} - -//- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { -// MonentsTopicModel * topicModel = [self.topicList safeObjectAtIndex1:indexPath.row]; -// CGFloat itemWidth = [topicModel.name boundingRectWithSize:CGSizeMake(100, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:10 weight:UIFontWeightBold]} context:nil].size.width; -// return CGSizeMake(itemWidth +34, 26); -//} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPMonentsTopicCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMonentsTopicCollectionViewCell class]) forIndexPath:indexPath]; - - cell.topicInfo = [self.topicList xpSafeObjectAtIndex:indexPath.row]; - - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (self.topicList.count > 0) { - MomentsTopicModel * topicInfo = [self.topicList xpSafeObjectAtIndex:indexPath.row]; - if(topicInfo == nil)return; - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsRecommendHeaderView:didSelectItem:)]) { - [self.delegate XPMomentsRecommendHeaderView:self didSelectItem:topicInfo]; - } - } -} - -#pragma mark - Event Response -- (void)arrowButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsRecommendHeaderView:didClickMoreTopic:)]) { - [self.delegate XPMomentsRecommendHeaderView:self didClickMoreTopic:sender]; - } -} - -#pragma mark - Getters And Setters -- (void)setTopicList:(NSArray *)topicList { - _topicList = topicList; - [self.collectionView reloadData]; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _titleLabel.textColor = UIColorFromRGB(0x0D344D); - _titleLabel.text = YMLocalizedString(@"XPMonentsRecommendHeaderView0"); - } - return _titleLabel; -} - -//- (UIButton *)arrowButton { -// if (!_arrowButton) { -// _arrowButton = [UIButton buttonWithType:UIButtonTypeCustom]; -// [_arrowButton setImage:[[UIImage imageNamed:@"room_setting_arrow"]ms_SetImageForRTL] forState:UIControlStateNormal]; -// [_arrowButton setImage:[[UIImage imageNamed:@"room_setting_arrow"]ms_SetImageForRTL] forState:UIControlStateSelected]; -// [_arrowButton addTarget:self action:@selector(arrowButtonAction:) forControlEvents:UIControlEventTouchUpInside]; -// } -// return _arrowButton; -//} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.sectionInset = UIEdgeInsetsMake(0,0, 0, 0); - layout.itemSize = CGSizeMake((KScreenWidth - 50)/2, 18); - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 0; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.pagingEnabled = YES; - _collectionView.showsHorizontalScrollIndicator = NO; - [_collectionView registerClass:[XPMonentsTopicCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPMonentsTopicCollectionViewCell class])]; - } - return _collectionView; -} -- (UIView *)collectionBgView{ - if (!_collectionBgView){ - - UIView *view = [[UIView alloc] init]; - view.frame = CGRectMake(10,10,KScreenWidth - 50,89); - view.layer.borderWidth = 0.5; - view.layer.borderColor = [UIColor colorWithRed:255/255.0 green:255/255.0 blue:255/255.0 alpha:1.0].CGColor; - - view.layer.backgroundColor = [UIColor colorWithRed:255/255.0 green:255/255.0 blue:255/255.0 alpha:0.6300].CGColor; - - // blur - UIBlurEffect *blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]; - UIVisualEffectView *visualView = [[UIVisualEffectView alloc]initWithEffect:blurEffect]; - visualView.frame = CGRectMake(10,10,KScreenWidth - 50,89); - view.layer.cornerRadius = 8; - _collectionBgView = view; - _collectionView.userInteractionEnabled = YES; - } - return _collectionBgView; -} -- (UIImageView *)bgView{ - if (!_bgView){ - _bgView = [UIImageView new]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x9FF4F2),UIColorFromRGB(0x96D6FF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 30, 109)]; - _bgView.image = image; - [_bgView setCornerWithLeftTopCorner:10 rightTopCorner:10 bottomLeftCorner:10 bottomRightCorner:10 size:CGSizeMake(KScreenWidth - 30, 109)]; - _bgView.userInteractionEnabled = YES; - } - return _bgView; -} --(UIImageView *)titleBgView{ - if (!_titleBgView){ - _titleBgView = [UIImageView new]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x83E8E7),UIColorFromRGB(0x86D4F6)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(74, 21)]; - _titleBgView.image = image; - [_titleBgView setCornerWithLeftTopCorner:10 rightTopCorner:0 bottomLeftCorner:0 bottomRightCorner:10 size:CGSizeMake(74, 21)]; - _titleBgView.userInteractionEnabled = YES; - } - return _titleBgView; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.h deleted file mode 100644 index bc028ec..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// XPMonentsTooBarView.h -// xplan-ios -// -// Created by 冯硕 on 2022/5/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MomentsInfoModel, XPMomentsTooBarView; -@protocol XPMomentsTooBarViewDelegate -///点赞 -- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickLike:(MomentsInfoModel *)momentsInfo; -///评论 -- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickCommon:(MomentsInfoModel *)momentsInfo; -///删除 -- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickDelete:(MomentsInfoModel *)momentsInfo; -///屏蔽 -- (void)XPMomentsTooBarView:(XPMomentsTooBarView *)view didClickShielding:(MomentsInfoModel *)momentsInfo; - -@end - -@interface XPMomentsTooBarView : UIView -@property (nonatomic,assign) BOOL isInUserDetail; -@property (nonatomic,strong) MomentsInfoModel *momentsInfo; -///代理 -@property (nonatomic,weak) id delegate; -///从进入主态时初始化 -- (instancetype)initDynamicWithFrame:(CGRect)frame; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.m deleted file mode 100644 index b4275fa..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTooBarView.m +++ /dev/null @@ -1,375 +0,0 @@ -// -// XPMonentsTooBarView.m -// xplan-ios -// -// Created by 冯硕 on 2022/5/12. -// - -#import "XPMomentsTooBarView.h" -///Third -#import -#import -///Tool -#import "TTPopup.h" -#import "AccountInfoStorage.h" -#import "Api+Moments.h" -///Model -#import "MomentsInfoModel.h" -///View -#import "XPWebViewController.h" -#import "XCCurrentVCStackManager.h" - -#import "ShareHelder.h" - -@interface XPMomentsTooBarView () -///喜欢的容器 -@property (nonatomic,strong) UIView * likeView; -///喜欢 -@property (nonatomic,strong) UIButton *likeButton; -///喜欢的个数 -@property (nonatomic,strong) UILabel *likeLabel; -///评论的容器 -@property (nonatomic,strong) UIView * commentView; -///评论 -@property (nonatomic,strong) UIButton *commentButton; -///评论数 -@property (nonatomic,strong) UILabel *commentLabel; - -///分割线 -@property (nonatomic,strong) UIView * lineView; -///举报 -@property (nonatomic,strong) UIButton *reportButton; -///是不是我的动态 -@property (nonatomic,assign) BOOL isMyMonents; -@end - -@implementation XPMomentsTooBarView - -- (instancetype)initDynamicWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if (self) { - self.isMyMonents = YES; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - - -- (void)setIsInUserDetail:(BOOL)isInUserDetail { - _isInUserDetail = isInUserDetail; - if (isInUserDetail) { - self.likeLabel.textColor = [UIColor whiteColor]; - self.commentLabel.textColor = [UIColor whiteColor]; - [self.reportButton setImage:[UIImage imageNamed:@"monents_info_like_report_new"] forState:UIControlStateNormal]; - [self.reportButton setImage:[UIImage imageNamed:@"monents_info_like_report_new"] forState:UIControlStateSelected]; - [self.commentButton setImage:[UIImage imageNamed:@"monents_info_comment_count_new"] forState:UIControlStateNormal]; - [self.commentButton setImage:[UIImage imageNamed:@"monents_info_comment_count_new"] forState:UIControlStateSelected]; - [self.likeButton setImage:[UIImage imageNamed:@"monents_info_like_count_normal_new"] forState:UIControlStateNormal]; - [self.likeButton setImage:[UIImage imageNamed:@"monents_info_like_count_select_new"] forState:UIControlStateSelected]; - } -} - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method - -- (void)initSubViews { - [self addSubview:self.likeView]; - [self addSubview:self.commentView]; - [self addSubview:self.lineView]; - [self addSubview:self.reportButton]; - - [self.likeView addSubview:self.likeButton]; - [self.likeView addSubview:self.likeLabel]; - [self.commentView addSubview:self.commentButton]; - [self.commentView addSubview:self.commentLabel]; -} - -- (void)initSubViewConstraints { - if (self.isMyMonents) { - [self.likeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(12); - make.height.mas_equalTo(18); - make.top.mas_equalTo(self).offset(0); - make.width.greaterThanOrEqualTo(@62); - }]; - [self.likeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(18, 18)); - make.centerY.mas_equalTo(self.likeView); - make.leading.mas_equalTo(self.likeView); - }]; - [self.likeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.likeButton.mas_trailing).mas_offset(4); - make.trailing.equalTo(self.likeView); - make.centerY.mas_equalTo(self.likeView); - }]; - - [self.commentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.height.mas_equalTo(self.likeView); - make.width.greaterThanOrEqualTo(@62); - make.leading.mas_equalTo(self.likeView.mas_trailing).offset(5); - }]; - - - [self.commentButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(18, 18)); - make.centerY.mas_equalTo(self.commentView); - make.leading.mas_equalTo(self.commentView); - }]; - - [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.commentButton.mas_trailing).offset(4); - make.centerY.mas_equalTo(self.commentView); - make.trailing.equalTo(self.commentView); - }]; - - [self.reportButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self).offset(-12); - make.centerY.mas_equalTo(self.commentView); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - } else { - self.lineView.hidden = YES; - [self.likeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(18); - make.height.mas_equalTo(18); - make.top.mas_equalTo(self).offset(10); - make.width.greaterThanOrEqualTo(@62); - }]; - [self.likeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(18, 18)); - make.centerY.mas_equalTo(self.likeView); - make.leading.mas_equalTo(self.likeView); - }]; - [self.likeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.likeButton.mas_trailing).mas_offset(4); - make.trailing.equalTo(self.likeView); - make.centerY.mas_equalTo(self.likeView); - }]; - - [self.commentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.height.mas_equalTo(self.likeView); - make.width.greaterThanOrEqualTo(@62); - make.leading.mas_equalTo(self.likeView.mas_trailing).offset(5); - }]; - - - [self.commentButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(18, 18)); - make.centerY.mas_equalTo(self.commentView); - make.leading.mas_equalTo(self.commentView); - }]; - - [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.commentButton.mas_trailing).offset(4); - make.centerY.mas_equalTo(self.commentView); - make.trailing.equalTo(self.commentView); - }]; - - [self.reportButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self).offset(-18); - make.centerY.mas_equalTo(self.commentView); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - } -} -#pragma mark - Event Response -- (void)reportButtonAction:(UIButton *)sender { - - NSMutableArray *array = [NSMutableArray array]; - TTActionSheetConfig *action1; - if (self.momentsInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - action1 = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMonentsTooBarView0") clickAction:^{ - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTooBarView:didClickDelete:)]) { - [self.delegate XPMomentsTooBarView:self didClickDelete:self.momentsInfo]; - } - }]; - [TTPopup actionSheetWithItems:@[action1]]; - } else { - NSString * url= [NSString stringWithFormat:@"%@?reportUid=%@&source=%@", URLWithType(kReportRoomURL),self.momentsInfo.uid, @"WORLDDYNAMIC"]; - [ShareHelder shareImage:kImage(@"luck_package_bag_lv4") - url:url - fromController:[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController]; - - return; - TTActionSheetConfig *action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMonentsTooBarView8") clickAction:^{ - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTooBarView:didClickShielding:)]) { - [self.delegate XPMomentsTooBarView:self didClickShielding:self.momentsInfo]; - } - }]; - - TTActionSheetConfig *black = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineUserInfoViewController1") clickAction:^{ - [self addOrRemoveBlack:NO uid:self.momentsInfo.uid]; - }]; - - [array addObjectsFromArray:@[action, black]]; - - BOOL isInBlackList = [[NIMSDK sharedSDK]. userManager isUserInBlackList:self.momentsInfo.uid] || [self isSystemAccount]; - if (isInBlackList) { - [array removeObject:black]; - } - action1 = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMonentsTooBarView1") clickAction:^{ - NSString * url= [NSString stringWithFormat:@"%@?reportUid=%@&source=%@", URLWithType(kReportRoomURL),self.momentsInfo.uid, @"WORLDDYNAMIC"]; - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = url; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; - }]; - [array addObject:action1]; - [TTPopup actionSheetWithItems:array]; - } - -} -- (BOOL)isSystemAccount { - return [KeyWithType(KeyType_SecretaryUidKey) isEqualToString:[NSString stringWithFormat:@"%@", self.momentsInfo.uid]] || [KeyWithType(KeyType_SystemNotifiUidKey) isEqualToString:[NSString stringWithFormat:@"%@", self.momentsInfo.uid]] || [KeyWithType(KeyType_GuildUidKey) isEqualToString:[NSString stringWithFormat:@"%@", self.momentsInfo.uid]]; -} - -//加入黑名单 -- (void)addOrRemoveBlack:(BOOL)isRemove uid:(NSString *)uid { - NSString *title; - NSString *message; - if (isRemove) { - title = YMLocalizedString(@"XPMineUserInfoViewController2"); - message = YMLocalizedString(@"XPMineUserInfoViewController3"); - }else{ - title = YMLocalizedString(@"XPMineUserInfoViewController4"); - message = YMLocalizedString(@"XPMineUserInfoViewController5"); - } - - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = title; - config.message = message; - - [TTPopup alertWithConfig:config confirmHandler:^{ - if (isRemove) { - [[NIMSDK sharedSDK].userManager removeFromBlackBlackList:uid completion:^(NSError * _Nullable error) { - if (error == nil) { - - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPMineUserInfoViewController6")]; - - - } - }]; - } else { - [[NIMSDK sharedSDK].userManager addToBlackList:uid completion:^(NSError * _Nullable error) { - if (error == nil) { - - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPMineUserInfoViewController7")]; - - } - }]; - } - } cancelHandler:^{ - }]; -} - -- (void)commonButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTooBarView:didClickCommon:)]) { - self.commentButton.userInteractionEnabled = YES; - [self.delegate XPMomentsTooBarView:self didClickCommon:self.momentsInfo]; - } else { - self.commentButton.userInteractionEnabled = NO; - } -} - -- (void)likeButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTooBarView:didClickLike:)]) { - [self.delegate XPMomentsTooBarView:self didClickLike:self.momentsInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setMomentsInfo:(MomentsInfoModel *)monentsInfo { - _momentsInfo = monentsInfo; - if (_momentsInfo) { - self.likeButton.selected = _momentsInfo.isLike; - self.likeLabel.text = _momentsInfo.likeCount.length > 0 ? _momentsInfo.likeCount : @"0"; - self.commentLabel.text = _momentsInfo.commentCount.length > 0 ? _momentsInfo.commentCount : @"0"; - self.reportButton.hidden = _momentsInfo.dynamicId == nil; - } -} - -- (UIView *)likeView { - if (!_likeView) { - _likeView = [[UIView alloc] init]; - _likeView.backgroundColor = [UIColor clearColor]; - } - return _likeView; -} - -- (UIButton *)likeButton { - if (!_likeButton) { - _likeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_likeButton setImage:[UIImage imageNamed:@"monents_info_like_count_normal"] forState:UIControlStateNormal]; - [_likeButton setImage:[UIImage imageNamed:@"monents_info_like_count_select"] forState:UIControlStateSelected]; - [_likeButton addTarget:self action:@selector(likeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_likeButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _likeButton; -} - -- (UILabel *)likeLabel { - if (!_likeLabel) { - _likeLabel = [[UILabel alloc] init]; - _likeLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _likeLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _likeLabel; -} - - -- (UIView *)commentView { - if (!_commentView) { - _commentView = [[UIView alloc] init]; - _commentView.backgroundColor = [UIColor clearColor]; - } - return _commentView; -} - -- (UIButton *)commentButton { - if (!_commentButton) { - _commentButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_commentButton setImage:[UIImage imageNamed:@"monents_info_comment_count"] forState:UIControlStateNormal]; - [_commentButton setImage:[UIImage imageNamed:@"monents_info_comment_count"] forState:UIControlStateSelected]; - [_commentButton addTarget:self action:@selector(commonButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_commentButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _commentButton; -} - -- (UILabel *)commentLabel { - if (!_commentLabel) { - _commentLabel = [[UILabel alloc] init]; - _commentLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _commentLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _commentLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - _lineView.hidden = YES; - } - return _lineView; -} -- (UIButton *)reportButton { - if (!_reportButton) { - _reportButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_reportButton setImage:[UIImage imageNamed:@"monents_info_like_report"] forState:UIControlStateNormal]; - [_reportButton setImage:[UIImage imageNamed:@"monents_info_like_report"] forState:UIControlStateSelected]; - [_reportButton addTarget:self action:@selector(reportButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_reportButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _reportButton; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.h deleted file mode 100644 index 309e980..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMoentsTopicView.h -// YUMI -// -// Created by YUMI on 2022/5/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MomentsInfoModel; -@interface XPMomentsTopicView : UIView -@property (nonatomic,strong) MomentsInfoModel *monentsInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.m deleted file mode 100644 index 7c21fa5..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsTopicView.m +++ /dev/null @@ -1,120 +0,0 @@ -// -// XPMoentsTopicView.m -// xplan-ios -// -// Created by 冯硕 on 2022/5/12. -// - -#import "XPMomentsTopicView.h" -///Third -#import -///Tool - -#import "UIImage+Utils.h" -#import "NSString+Utils.h" -///Model -#import "MomentsInfoModel.h" - -@interface XPMomentsTopicView () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///背景 -@property (nonatomic,strong) UIImageView *topicImageView; -///显示话题前面的# -@property (nonatomic,strong) UIImageView *iconImageView; -///显示话题 -@property (nonatomic,strong) UILabel *topicLabel; - -@end - -@implementation XPMomentsTopicView -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.topicImageView]; - [self.topicImageView addSubview:self.iconImageView]; - [self.topicImageView addSubview:self.topicLabel]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.bottom.mas_equalTo(self); - }]; - - [self.topicImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.topicLabel.mas_trailing).offset(9); - }]; - - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.topicImageView); - make.size.mas_equalTo(CGSizeMake(10, 10)); - make.centerY.mas_equalTo(self.topicImageView); - }]; - - [self.topicLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.iconImageView.mas_trailing).offset(4); - make.centerY.mas_equalTo(self.topicImageView); - }]; -} -#pragma mark - Getters And Setters -- (void)setMonentsInfo:(MomentsInfoModel *)monentsInfo { - _monentsInfo = monentsInfo; - if (_monentsInfo) { - if (_monentsInfo.worldId > 0) { - self.topicLabel.text = _monentsInfo.worldName; - } - } -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 8; - } - return _stackView; -} - -- (UIImageView *)topicImageView { - if (!_topicImageView) { - _topicImageView = [[UIImageView alloc] init]; - _topicImageView.userInteractionEnabled = YES; -// _topicImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFFCDD), UIColorFromRGB(0xDFF9FF), UIColorFromRGB(0xF4E5FF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; - _topicImageView.layer.masksToBounds = YES; - _topicImageView.layer.cornerRadius = 8; - } - return _topicImageView; -} - -- (UIImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[UIImageView alloc] init]; - _iconImageView.userInteractionEnabled = YES; - _iconImageView.image = [UIImage imageNamed:@"monents_info_topic_icon"]; - } - return _iconImageView; -} - -- (UILabel *)topicLabel { - if (!_topicLabel) { - _topicLabel = [[UILabel alloc] init]; - _topicLabel.font = [UIFont systemFontOfSize:11 weight:UIFontWeightRegular]; - _topicLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _topicLabel; -} - - - -@end diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.h deleted file mode 100644 index 97d8b85..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// XPMomentsUserInfoView.h -// xplan-ios -// -// Created by 冯硕 on 2022/5/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MomentsInfoModel, XPMomentsUserInfoView; -@protocol XPMomentsUserInfoViewDelegate - -///点击了头像 -- (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickAvatar:(MomentsInfoModel *)moments; - -///点击了跟随进房 -- (void)XPMomentsUserInfoView:(XPMomentsUserInfoView *)view didClickEnterRoom:(MomentsInfoModel *)moments; - -///删除 -- (void)XPMomentsTooBarView:(XPMomentsUserInfoView *)view didClickDelete:(MomentsInfoModel *)momentsInfo; - -@end -@interface XPMomentsUserInfoView : UIView -///动态信息 -@property (nonatomic,strong) MomentsInfoModel *momentsInfo; - -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.m deleted file mode 100644 index 68de836..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMomentsUserInfoView.m +++ /dev/null @@ -1,532 +0,0 @@ -// -// XPMonentsUserInfoView.m -// xplan-ios -// -// Created by 冯硕 on 2022/5/12. -// - -#import "XPMomentsUserInfoView.h" -///Third -#import -#import -///Tool - -#import "NetImageView.h" -#import "SpriteSheetImageManager.h" -#import "TTPopup.h" -#import "XPWebViewController.h" -#import "XCCurrentVCStackManager.h" -#import "AccountInfoStorage.h" -#import "UIButton+EnlargeTouchArea.h" -///Model -#import "MomentsInfoModel.h" - -@interface XPMomentsUserInfoView () -/// -@property (nonatomic,strong) UIStackView *nickStackView; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///VIP -@property (nonatomic, strong) NetImageView *nobleImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///性别 -@property (nonatomic,strong) UIButton *sexImageView; -///新用户 -@property (nonatomic,strong) UIImageView *newsUserImageView; -///官方的 -@property (nonatomic,strong) UIImageView *officialImageView; -///头饰 -@property (nonatomic,strong) YYAnimatedImageView *headWearImageView; -@property (nonatomic,strong) SVGAImageView *headWearSVGAImageView; -///头饰播放 -@property (nonatomic, strong) SpriteSheetImageManager *manager; -///用户的等级 -@property (nonatomic,strong) UIStackView *levelStackView; -///魅力等级 -@property (nonatomic,strong) NetImageView *charmImageView; -///等级 -@property (nonatomic,strong) NetImageView *levelImageView; -///铭牌的容器 -@property (nonatomic,strong) UIView * namePlateView; -///铭牌图片 -@property (nonatomic,strong) NetImageView *nameplateImageView; -///铭牌文字 -@property (nonatomic,strong) UILabel *nameplateLabel; -///tag的容器 -@property (nonatomic,strong) UIStackView *tagStackView; -///第一个tag -@property (nonatomic,strong) NetImageView *firstTagImageView; -///第二个tag -@property (nonatomic,strong) NetImageView *secondTagImageView; -///第三个tag -@property (nonatomic,strong) NetImageView *thirdTagImageView; -///直播中 -@property (nonatomic,strong) UIButton *onlineButton; - -@end -@implementation XPMomentsUserInfoView -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.avatarImageView]; - [self addSubview:self.headWearImageView]; - [self addSubview:self.headWearSVGAImageView]; - [self addSubview:self.nickLabel]; - [self addSubview:self.sexImageView]; - [self addSubview:self.tagStackView]; - [self addSubview:self.levelStackView]; - [self addSubview:self.onlineButton]; - - [self.tagStackView addArrangedSubview:self.firstTagImageView]; - [self.tagStackView addArrangedSubview:self.secondTagImageView]; - [self.tagStackView addArrangedSubview:self.thirdTagImageView]; - - [self.levelStackView addArrangedSubview:self.nobleImageView]; - [self.levelStackView addArrangedSubview:self.newsUserImageView]; - [self.levelStackView addArrangedSubview:self.officialImageView]; - [self.levelStackView addArrangedSubview:self.levelImageView]; - [self.levelStackView addArrangedSubview:self.charmImageView]; - [self.levelStackView addArrangedSubview:self.namePlateView]; - ///铭牌 - [self.namePlateView addSubview:self.nameplateImageView]; - [self.namePlateView addSubview:self.nameplateLabel]; -} - -- (void)initSubViewConstraints { - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(50, 50)); - make.leading.mas_equalTo(self).offset(15); - make.centerY.mas_equalTo(self); - }]; - - [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(70); - make.height.mas_equalTo(70); - }]; - - [self.headWearSVGAImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(70); - make.height.mas_equalTo(70); - }]; - - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); - }]; - - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(28, 14)); - make.leading.mas_equalTo(self.nickLabel.mas_trailing).offset(4); - make.centerY.mas_equalTo(self.nickLabel); - }]; - - [self.levelStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - make.height.mas_equalTo(20); - }]; - - [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(20); - }]; - - [self.newsUserImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(20); - }]; - - [self.officialImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(20); - }]; - - [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(34); - }]; - - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(34); - }]; - - [self.namePlateView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.nameplateImageView.mas_width); - }]; - - [self.nameplateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(60); - make.leading.top.mas_equalTo(self.namePlateView); - }]; - - [self.nameplateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(self.nameplateImageView); - make.trailing.mas_equalTo(self.namePlateView).offset(-2); - }]; - - [self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self).offset(-15); - make.centerY.mas_equalTo(self.nickLabel); - make.height.mas_equalTo(14); - }]; - - [self.onlineButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(55, 18)); - make.trailing.mas_equalTo(-15); - make.top.equalTo(self.tagStackView.mas_bottom).mas_offset(8); - }]; - - [self.firstTagImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(28); - }]; - - [self.secondTagImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.firstTagImageView); - }]; - - [self.thirdTagImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.firstTagImageView); - }]; -} - -#pragma mark - Event Response -- (void)onlineButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsUserInfoView:didClickEnterRoom:)]) { - [self.delegate XPMomentsUserInfoView:self didClickEnterRoom:self.momentsInfo]; - } -} - -- (void)didTapAvatarGuest { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsUserInfoView:didClickAvatar:)]) { - [self.delegate XPMomentsUserInfoView:self didClickAvatar:self.momentsInfo]; - } -} - -- (void)reportButtonAction:(UIButton *)sender { - TTActionSheetConfig *action; - if (self.momentsInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMonentsUserInfoView0") clickAction:^{ - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsTooBarView:didClickDelete:)]) { - [self.delegate XPMomentsTooBarView:self didClickDelete:self.momentsInfo]; - } - }]; - } else { - action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMonentsUserInfoView1") clickAction:^{ - NSString * url= [NSString stringWithFormat:@"%@?reportUid=%@&source=%@", URLWithType(kReportRoomURL),self.momentsInfo.uid, @"WORLDDYNAMIC"]; - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = url; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; - }]; - } - [TTPopup actionSheetWithItems:@[action]]; -} -#pragma mark - Getters And Setters -- (void)setMomentsInfo:(MomentsInfoModel *)momentsInfo { - _momentsInfo = momentsInfo; - if (_momentsInfo) { - self.avatarImageView.imageUrl = _momentsInfo.avatar; - NSString * nick = _momentsInfo.nick; - self.nickLabel.text = nick.length > 0 ? nick : @""; - - [self.sexImageView setTitle:[NSString stringWithFormat:@"%d",_momentsInfo.age] forState:UIControlStateNormal]; - self.sexImageView.backgroundColor = _momentsInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.titleEdgeInsets = _momentsInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.sexImageView.selected = _momentsInfo.gender != GenderType_Male; - self.officialImageView.hidden = _momentsInfo.defUser != 2; - self.newsUserImageView.hidden = !_momentsInfo.newUser; - self.nobleImageView.hidden = !_momentsInfo.userVipInfoVO; - if (_momentsInfo.expertLevelPic) { - self.levelImageView.imageUrl = _momentsInfo.expertLevelPic; - } - self.levelImageView.hidden = _momentsInfo.expertLevelPic.length <= 0; - - if (_momentsInfo.charmLevelPic) { - self.charmImageView.imageUrl = _momentsInfo.charmLevelPic; - } - - if (_momentsInfo.userVipInfoVO) { - self.nobleImageView.imageUrl = _momentsInfo.userVipInfoVO.vipIcon; - } - - self.charmImageView.hidden = _momentsInfo.charmLevelPic.length <= 0; - if(_momentsInfo.isCustomWord == YES){ - if (_momentsInfo.nameplateWord.length>0) { - self.nameplateImageView.imageUrl = _momentsInfo.nameplatePic; - self.namePlateView.hidden = NO; - } else { - self.namePlateView.hidden = YES; - } - }else{ - if (_momentsInfo.nameplateWord.length>0 && _momentsInfo.nameplatePic.length>0) { - self.nameplateImageView.imageUrl = _momentsInfo.nameplatePic; - self.nameplateLabel.text = _momentsInfo.nameplateWord; - self.namePlateView.hidden = NO; - } else { - self.namePlateView.hidden = YES; - } - } - - NSString * headwearUrl= _momentsInfo.headwearEffect.length > 0 ? _momentsInfo.headwearEffect : _momentsInfo.headwearPic; - self.headWearImageView.hidden = YES; - self.headWearSVGAImageView.hidden = YES; - if (headwearUrl.length > 0) { - if (_momentsInfo.headwearType == 1) { - self.headWearSVGAImageView.hidden = NO; - [self.headWearSVGAImageView setImageName:headwearUrl]; - } else { - @kWeakify(self); - [self.manager loadSpriteSheetImageWithURL:[NSURL URLWithString:headwearUrl] completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { - @kStrongify(self); - self.headWearImageView.hidden = NO; - self.headWearImageView.image = sprit; - } failureBlock:^(NSError * _Nullable error) { -// NSLog(@"%@", error); - }]; - } - } - self.firstTagImageView.hidden = YES; - self.secondTagImageView.hidden = YES; - self.thirdTagImageView.hidden = YES; - for (int i = 0; i< _momentsInfo.labelList.count; i++) { - NSString * imageUrl = [_momentsInfo.labelList xpSafeObjectAtIndex:i]; - if (i < self.tagStackView.subviews.count) { - NetImageView * image = [self.tagStackView.subviews xpSafeObjectAtIndex:i]; - if(image != nil){ - image.hidden = NO; - image.imageUrl = imageUrl; - } - } - } - self.onlineButton.hidden = _momentsInfo.inRoomUid.length <= 0; - } -} - -- (SpriteSheetImageManager *)manager { - if (!_manager) { - _manager = [[SpriteSheetImageManager alloc] init]; - } - return _manager; -} - -- (YYAnimatedImageView *)headWearImageView { - if (!_headWearImageView) { - _headWearImageView = [[YYAnimatedImageView alloc] init]; - _headWearImageView.backgroundColor = [UIColor clearColor]; - _headWearImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _headWearImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.userInteractionEnabled = YES; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 25; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapAvatarGuest)]; - [_avatarImageView addGestureRecognizer:tap]; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UIButton *)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; - } - return _sexImageView; -} - -- (UIStackView *)levelStackView { - if (!_levelStackView) { - _levelStackView = [[UIStackView alloc] init]; - _levelStackView.axis = UILayoutConstraintAxisHorizontal; - _levelStackView.distribution = UIStackViewDistributionFill; - _levelStackView.alignment = UIStackViewAlignmentFill; - _levelStackView.spacing = 2; - } - return _levelStackView; -} -- (NetImageView *)levelImageView { - if (!_levelImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _levelImageView = [[NetImageView alloc] initWithConfig:config]; - _levelImageView.userInteractionEnabled = YES; - _levelImageView.hidden = YES; - _levelImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _levelImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - _charmImageView.userInteractionEnabled = YES; - _charmImageView.hidden = YES; - _charmImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _charmImageView; -} - -- (NetImageView *)nobleImageView { - if (!_nobleImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _nobleImageView = [[NetImageView alloc] initWithConfig:config]; - _nobleImageView.userInteractionEnabled = YES; - _nobleImageView.hidden = YES; - _nobleImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _nobleImageView; -} - -- (UIView *)namePlateView { - if (!_namePlateView) { - _namePlateView = [[UIView alloc] init]; - _namePlateView.backgroundColor = [UIColor clearColor]; - _namePlateView.hidden = YES; - } - return _namePlateView; -} - -- (NetImageView *)nameplateImageView { - if (!_nameplateImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _nameplateImageView = [[NetImageView alloc] initWithConfig:config]; - _nameplateImageView.userInteractionEnabled = YES; - _nameplateImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _nameplateImageView; -} - -- (UILabel *)nameplateLabel { - if (!_nameplateLabel) { - _nameplateLabel = [[UILabel alloc] init]; - _nameplateLabel.font = [UIFont systemFontOfSize:10]; - _nameplateLabel.textAlignment = NSTextAlignmentCenter; - _nameplateLabel.textColor = [UIColor whiteColor]; - } - return _nameplateLabel; -} - -- (UIImageView *)newsUserImageView { - if (!_newsUserImageView) { - _newsUserImageView = [[UIImageView alloc] init]; - _newsUserImageView.userInteractionEnabled = YES; - _newsUserImageView.image = [UIImage getLanguageImage:@"common_new_user"]; - _newsUserImageView.hidden = YES; - } - return _newsUserImageView; -} - -- (UIImageView *)officialImageView { - if (!_officialImageView) { - _officialImageView = [[UIImageView alloc] init]; - _officialImageView.userInteractionEnabled = YES; - _officialImageView.image = [UIImage imageNamed:@"app_admin_icon"]; - _officialImageView.hidden = YES; - } - return _officialImageView; -} - -- (UIStackView *)tagStackView { - if (!_tagStackView) { - _tagStackView = [[UIStackView alloc] init]; - _tagStackView.axis = UILayoutConstraintAxisHorizontal; - _tagStackView.distribution = UIStackViewDistributionFill; - _tagStackView.alignment = UIStackViewAlignmentFill; - _tagStackView.spacing = 2; - } - return _tagStackView; -} - -- (NetImageView *)firstTagImageView { - if (!_firstTagImageView) { - _firstTagImageView = [[NetImageView alloc] init]; - _firstTagImageView.hidden = YES; - } - return _firstTagImageView; -} - -- (NetImageView *)secondTagImageView { - if (!_secondTagImageView) { - _secondTagImageView = [[NetImageView alloc] init]; - _secondTagImageView.hidden = YES; - } - return _secondTagImageView; -} - -- (NetImageView *)thirdTagImageView { - if (!_thirdTagImageView) { - _thirdTagImageView = [[NetImageView alloc] init]; - _thirdTagImageView.hidden = YES; - } - return _thirdTagImageView; -} - -- (UIButton *)onlineButton { - if (!_onlineButton) { - _onlineButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_onlineButton setTitle:YMLocalizedString(@"XPMonentsUserInfoView2") forState:UIControlStateNormal]; - [_onlineButton setImage:[UIImage imageNamed:@"monents_on_line_note"] forState:UIControlStateNormal]; - [_onlineButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - _onlineButton.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 3); - _onlineButton.backgroundColor = [UIColor clearColor]; - _onlineButton.titleLabel.font = [UIFont systemFontOfSize:10]; - _onlineButton.layer.masksToBounds = YES; - _onlineButton.layer.cornerRadius = 18/2; - [_onlineButton setBackgroundImage:[UIImage imageNamed:@"monents_on_line_bg"] forState:UIControlStateNormal]; - [_onlineButton addTarget:self action:@selector(onlineButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _onlineButton; -} - -- (SVGAImageView *)headWearSVGAImageView { - if (!_headWearSVGAImageView) { - _headWearSVGAImageView = [[SVGAImageView alloc]init]; - _headWearSVGAImageView.backgroundColor = [UIColor clearColor]; - _headWearSVGAImageView.frame = CGRectZero; - _headWearSVGAImageView.userInteractionEnabled = NO; - _headWearSVGAImageView.autoPlay = YES; - } - return _headWearSVGAImageView; -} - - -@end diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.h deleted file mode 100644 index f952d0e..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMonentPublishSuccessView.h -// YUMI -// -// Created by YUMI on 2022/8/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMonentPublishSuccessView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.m deleted file mode 100644 index 7c563b3..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.m +++ /dev/null @@ -1,96 +0,0 @@ -// -// YMMonentPublishSuccessView.m -// YUMI -// -// Created by YUMI on 2022/8/16. -// - -#import "XPMonentPublishSuccessView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPMonentPublishSuccessView () -@property (nonatomic, strong) UIImageView *logoImageView; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UILabel *tipsLabel; -@end - -@implementation XPMonentPublishSuccessView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - self.layer.masksToBounds = YES; - self.layer.cornerRadius = 10; - [self addSubview:self.logoImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.tipsLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(280, 200)); - }]; - - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(20); - make.centerX.mas_equalTo(self); - make.height.width.mas_equalTo(56); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(20); - make.centerX.mas_equalTo(self); - }]; - - [self.tipsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(15); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(20); - }]; -} - -#pragma mark - Getters And Setters -- (UIImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[UIImageView alloc] init]; - _logoImageView.userInteractionEnabled = YES; - _logoImageView.image = [UIImage imageNamed:@"monents_publish_success_icon"]; - } - return _logoImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPMonentPublishSuccessView0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (UILabel *)tipsLabel { - if (!_tipsLabel) { - _tipsLabel = [[UILabel alloc] init]; - _tipsLabel.text = YMLocalizedString(@"XPMonentPublishSuccessView1"); - _tipsLabel.font = [UIFont systemFontOfSize:13]; - _tipsLabel.numberOfLines = 0; - _tipsLabel.textColor = UIColorFromRGB(0x999999); - _tipsLabel.textAlignment = NSTextAlignmentCenter; - } - return _tipsLabel; -} - - -@end diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.h deleted file mode 100644 index 8af7ff3..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMMonentsPublishTopicView.h -// YUMI -// -// Created by YUMI on 2022/8/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPMonentsPublishTopicView, MomentsTopicModel; -@protocol XPMonentsPublishTopicViewDelegate - -///选择了关闭按钮 -- (void)xPMonentsPublishTopicView:(XPMonentsPublishTopicView *)view didClickCloseButton:(UIButton *)sender; -///选择话题 -- (void)xPMonentsPublishTopicView:(XPMonentsPublishTopicView *)view didClickChooseTopic:(UIButton *)sender; - -@end - -@interface XPMonentsPublishTopicView : UIView -///代理 -@property (nonatomic,weak) id delegate; -@property (nonatomic,strong) MomentsTopicModel *topicInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.m deleted file mode 100644 index de7eb28..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.m +++ /dev/null @@ -1,196 +0,0 @@ -// -// YMMonentsPublishTopicView.m -// YUMI -// -// Created by YUMI on 2022/8/16. -// - -#import "XPMonentsPublishTopicView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIView+Corner.h" -#import "UIButton+EnlargeTouchArea.h" -///Model -#import "MomentsTopicModel.h" - -@interface XPMonentsPublishTopicView () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///添加话题 -@property (nonatomic,strong) UIButton *addTopicButton; -///重新选择 -@property (nonatomic,strong) UIButton *againButton; -///话题的view -@property (nonatomic,strong) UIView * topicView; -///显示话题内容 -@property (nonatomic,strong) UILabel *titleLabel; -///关闭按钮 -@property (nonatomic,strong) UIButton *closeButton; -///占位 -@property (nonatomic,strong) UIView * placeView; -@end - -@implementation XPMonentsPublishTopicView -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.addTopicButton]; - [self.stackView addArrangedSubview:self.topicView]; - [self.stackView addArrangedSubview:self.placeView]; - [self.stackView addArrangedSubview:self.againButton]; - - [self.topicView addSubview:self.titleLabel]; - [self.topicView addSubview:self.closeButton]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self); - make.height.mas_equalTo(20); - make.centerY.mas_equalTo(self); - }]; - - [self.addTopicButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(60); - }]; - - [self.topicView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(120); - }]; - - [self.againButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(60); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.topicView).offset(5); - make.centerY.mas_equalTo(self.topicView); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.topicView).offset(-7); - make.size.mas_equalTo(CGSizeMake(18, 18)); - make.centerY.mas_equalTo(self.topicView); - }]; -} - -#pragma mark - Event Response -- (void)addTopicButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsPublishTopicView:didClickChooseTopic:)]) { - [self.delegate xPMonentsPublishTopicView:self didClickChooseTopic:sender]; - } -} - -- (void)closeButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMonentsPublishTopicView:didClickCloseButton:)]) { - [self.delegate xPMonentsPublishTopicView:self didClickCloseButton:sender]; - } -} - -#pragma mark - Getters And Setters -- (void)setTopicInfo:(MomentsTopicModel *)topicInfo { - _topicInfo = topicInfo; - if (_topicInfo) { - self.addTopicButton.hidden = YES; - self.topicView.hidden = YES; - self.againButton.hidden = YES; - self.titleLabel.text = _topicInfo.worldName; - } else { - self.addTopicButton.hidden = YES; - self.topicView.hidden = YES; - self.againButton.hidden= YES; - } -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 0; - } - return _stackView; -} - -- (UIButton *)addTopicButton { - if (!_addTopicButton) { - _addTopicButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_addTopicButton setTitle:YMLocalizedString(@"XPMonentsPublishTopicView0") forState:UIControlStateNormal]; - [_addTopicButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _addTopicButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_addTopicButton setBackgroundColor:[UIColor whiteColor]]; - _addTopicButton.layer.masksToBounds = YES; - _addTopicButton.layer.cornerRadius = 10; - _addTopicButton.hidden = YES; - [_addTopicButton addTarget:self action:@selector(addTopicButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _addTopicButton; -} - -- (UIButton *)againButton { - if (!_againButton) { - _againButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_againButton setTitle:YMLocalizedString(@"XPMonentsPublishTopicView1") forState:UIControlStateNormal]; - [_againButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - _againButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_againButton addTarget:self action:@selector(addTopicButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _againButton.hidden = YES; - } - return _againButton; -} - -- (UIView *)topicView { - if (!_topicView) { - _topicView = [[UIView alloc] init]; - _topicView.backgroundColor = [UIColor clearColor]; - _topicView.backgroundColor = [DJDKMIMOMColor appMainColor]; - _topicView.layer.masksToBounds = YES; - _topicView.hidden = YES; - [_topicView setCornerWithLeftTopCorner:10 rightTopCorner:5 bottomLeftCorner:10 bottomRightCorner:10 size:CGSizeMake(120, 20)]; - } - return _topicView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:13]; - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeButton setImage:[UIImage imageNamed:@"monents_publish_delete"] forState:UIControlStateNormal]; - [_closeButton setImage:[UIImage imageNamed:@"monents_publish_delete"] forState:UIControlStateSelected]; - [_closeButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_closeButton addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -- (UIView *)placeView { - if (!_placeView) { - _placeView = [[UIView alloc] init]; - _placeView.backgroundColor = [UIColor clearColor]; - } - return _placeView; -} - - - -@end diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.h b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.h deleted file mode 100644 index 490cc18..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMonentsTopicHeaderView.h -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MomentsTopicModel; -@interface XPMonentsTopicHeaderView : UIView -/// -@property (nonatomic,strong) MomentsTopicModel *topicInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.m deleted file mode 100644 index 56f2916..0000000 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.m +++ /dev/null @@ -1,116 +0,0 @@ -// -// YMMonentsTopicHeaderView.m -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "XPMonentsTopicHeaderView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "NetImageView.h" -///Model -#import "MomentsTopicModel.h" - -@interface XPMonentsTopicHeaderView () - -@property (nonatomic,strong) UILabel *titleLabel; -@property (nonatomic,strong) UILabel *descLabel; -@property (nonatomic,strong) NetImageView *logoImageView; -@property (nonatomic,strong) UIView * alphaView; -@end - -@implementation XPMonentsTopicHeaderView - - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.logoImageView]; - [self addSubview:self.alphaView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.descLabel]; - -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.alphaView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(kNavigationHeight + 10); - make.leading.mas_equalTo(self).offset(30); - }]; - - [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel); - make.trailing.mas_equalTo(self).offset(-10); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(20); - }]; -} - -#pragma mark - Getters And Setters -- (void)setTopicInfo:(MomentsTopicModel *)topicInfo { - _topicInfo = topicInfo; - if (_topicInfo) { - self.logoImageView.imageUrl = _topicInfo.icon; - self.titleLabel.text = _topicInfo.name; - self.descLabel.text = _topicInfo.desc; - } -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:18]; - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} - -- (UILabel *)descLabel { - if (!_descLabel) { - _descLabel = [[UILabel alloc] init]; - _descLabel.font = [UIFont systemFontOfSize:14]; - _descLabel.textColor = [UIColor whiteColor]; - _descLabel.numberOfLines = 2; - } - return _descLabel; -} - -- (NetImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[NetImageView alloc] init]; - _logoImageView.userInteractionEnabled = YES; - _logoImageView.layer.masksToBounds = YES; - _logoImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _logoImageView; -} - -- (UIView *)alphaView { - if (!_alphaView) { - _alphaView = [[UIView alloc] init]; - _alphaView.backgroundColor = [UIColor blackColor]; - _alphaView.alpha = 0.5; - } - return _alphaView; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.h b/YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.h deleted file mode 100644 index 77ea577..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMonentTopicContainerViewController.h -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMomentTopicContainerViewController : BaseViewController -@property (nonatomic,copy) NSString *worldId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.m b/YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.m deleted file mode 100644 index fe0062f..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentTopicContainerViewController.m +++ /dev/null @@ -1,235 +0,0 @@ -// -// YMMonentTopicContainerViewController.m -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "XPMomentTopicContainerViewController.h" -///Third -#import -#import -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "Api+Moments.h" -#import "AccountInfoStorage.h" -///Model -#import "MomentsTopicModel.h" -///View -#import "XPMonentsTopicRecommondViewController.h" -#import "XPMonentsTopicLatestViewController.h" -#import "XPMonentsTopicHeaderView.h" -#import "XPMonentsPublishViewController.h" - -@interface XPMomentTopicContainerViewController () -@property (nonatomic,strong) JXCategoryTitleView *pi_categoryView; -@property (nonatomic,strong) JXCategoryIndicatorLineView *lineView; -@property (nonatomic,strong) JXPagerListRefreshView *pagerContentView; -@property (nonatomic,strong) NSArray *titles; -@property (nonatomic,strong) XPMonentsTopicRecommondViewController *recommendVC; -@property (nonatomic,strong) XPMonentsTopicLatestViewController *latestVC; -@property (nonatomic,strong) XPMonentsTopicHeaderView *headerView; -@property (nonatomic,strong) UIButton *backButton; -@property (nonatomic,strong) UIButton *enterTopicButton; -@property (nonatomic,strong) MomentsTopicModel *topicInfo; -@end - -@implementation XPMomentTopicContainerViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self requestTopicDetail]; - [self initSubViews]; -} - -- (void)viewDidLayoutSubviews { - [super viewDidLayoutSubviews]; - self.pagerContentView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight - 50); -} - -- (void)initSubViews { - [self.view addSubview:self.pagerContentView]; - [self.view addSubview:self.backButton]; - [self.view addSubview:self.enterTopicButton]; - - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view); - make.top.mas_equalTo(statusbarHeight); - make.height.width.mas_equalTo(44); - }]; - - [self.enterTopicButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(50); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; -} - -- (void)requestTopicDetail { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api momentsTopicDetailInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - MomentsTopicModel * info = [MomentsTopicModel modelWithDictionary:data.data]; - self.topicInfo = info; - self.headerView.topicInfo = info; - } else if(code == 7903) { - [self.navigationController popViewControllerAnimated:YES]; - } else { - [self showErrorToast:msg]; - } - } worldId:self.worldId uid:uid]; -} - - -#pragma mark - JXPagerViewDelegate -- (UIView *)tableHeaderViewInPagerView:(JXPagerView *)pagerView { - return self.headerView; -} - -- (NSUInteger)tableHeaderViewHeightInPagerView:(JXPagerView *)pagerView { - return 150 + kNavigationHeight; -} - -- (NSUInteger)heightForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return 46; -} - -- (UIView *)viewForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return self.pi_categoryView; -} - -- (NSInteger)numberOfListsInPagerView:(JXPagerView *)pagerView { - return self.titles.count; -} - -- (id)pagerView:(JXPagerView *)pagerView initListAtIndex:(NSInteger)index { - if (index == 0) { - return self.recommendVC; - } else { - return self.latestVC; - } -} - -#pragma mark - Event Response -- (void)backButtonAction:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)enterTopicButtonAction:(UIButton *)sender { - XPMonentsPublishViewController * publishVC = [[XPMonentsPublishViewController alloc] init]; - self.topicInfo.worldName = self.topicInfo.name; - self.topicInfo.worldId = self.topicInfo.tId; - publishVC.topicInfo = self.topicInfo; - [self.navigationController pushViewController:publishVC animated:YES]; - -} - -#pragma mark - Getters And Setters -- (void)setWorldId:(NSString *)worldId { - _worldId = worldId; - self.recommendVC.worldId = _worldId; - self.latestVC.worldId = _worldId; -} - -- (JXCategoryTitleView *)pi_categoryView { - if (!_pi_categoryView) { - _pi_categoryView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 46)]; - _pi_categoryView.titles = self.titles; - _pi_categoryView.backgroundColor = [UIColor whiteColor]; - _pi_categoryView.delegate = self; - _pi_categoryView.titleSelectedColor = [DJDKMIMOMColor mainTextColor]; - _pi_categoryView.titleColor = [DJDKMIMOMColor secondTextColor]; - _pi_categoryView.titleSelectedFont = [UIFont boldSystemFontOfSize:18]; - _pi_categoryView.titleFont = [UIFont systemFontOfSize:15]; - _pi_categoryView.titleColorGradientEnabled = YES; - _pi_categoryView.titleLabelZoomEnabled = NO; - _pi_categoryView.indicators = @[self.lineView]; - _pi_categoryView.listContainer = (id)self.pagerContentView.listContainerView; - _pi_categoryView.averageCellSpacingEnabled = NO; - _pi_categoryView.contentEdgeInsetLeft = 20; - _pi_categoryView.contentEdgeInsetRight = 20; - _pi_categoryView.cellSpacing = 30; - - } - return _pi_categoryView; -} - -- (JXCategoryIndicatorLineView *)lineView { - if (!_lineView) { - _lineView = [[JXCategoryIndicatorLineView alloc] init]; - _lineView.indicatorColor = [DJDKMIMOMColor appMainColor]; - _lineView.indicatorWidth = 9; - _lineView.indicatorHeight = 4; - _lineView.verticalMargin = 2; - } - return _lineView; -} - -- (JXPagerListRefreshView *)pagerContentView { - if (!_pagerContentView) { - _pagerContentView = [[JXPagerListRefreshView alloc] initWithDelegate:self]; - _pagerContentView.listContainerView.scrollView.backgroundColor = UIColor.clearColor; - _pagerContentView.pinSectionHeaderVerticalOffset = (NSInteger) kNavigationHeight; - } - return _pagerContentView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMonentsViewController0" ), YMLocalizedString(@"XPMonentTopicContainerViewController1")]; - } - return _titles; -} - -- (XPMonentsTopicHeaderView *)headerView { - if (!_headerView) { - _headerView = [[XPMonentsTopicHeaderView alloc] init]; - } - return _headerView; -} - -- (XPMonentsTopicLatestViewController *)latestVC { - if (!_latestVC) { - _latestVC = [[XPMonentsTopicLatestViewController alloc] init]; - } - return _latestVC; -} - -- (XPMonentsTopicRecommondViewController *)recommendVC { - if (!_recommendVC) { - _recommendVC = [[XPMonentsTopicRecommondViewController alloc] init]; - } - return _recommendVC; -} - - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"home_search_white_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backButton setImage:[[UIImage imageNamed:@"home_search_white_back"]ms_SetImageForRTL] forState:UIControlStateSelected]; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -- (UIButton *)enterTopicButton { - if (!_enterTopicButton) { - _enterTopicButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_enterTopicButton setTitle:YMLocalizedString(@"XPMonentTopicContainerViewController2") forState:UIControlStateNormal]; - [_enterTopicButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _enterTopicButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_enterTopicButton setBackgroundColor:[DJDKMIMOMColor appMainColor]]; - [_enterTopicButton setImage:[UIImage imageNamed:@"monents_topic_camera"] forState:UIControlStateNormal]; - [_enterTopicButton addTarget:self action:@selector(enterTopicButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _enterTopicButton; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/XPMomentsAttentionViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsAttentionViewController.h deleted file mode 100644 index 5c7e1f1..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsAttentionViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMonentsAttentionViewController.h -// YUMI -// -// Created by YUMI on 2022/5/18. -// - -#import "MvpViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN - -@interface XPMomentsAttentionViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMomentsAttentionViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsAttentionViewController.m deleted file mode 100644 index 9a3893b..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsAttentionViewController.m +++ /dev/null @@ -1,301 +0,0 @@ -// -// XPMonentsAttentionViewController.m -// xplan-ios -// -// Created by 冯硕 on 2022/5/18. -// - -#import "XPMomentsAttentionViewController.h" -///Third -#import -#import -///Tool - -#import "XPMomentsLayoutConfig.h" -#import "TTPopup.h" -///Model -#import "MomentsListInfoModel.h" -///P -#import "XPMonentsAttentionPresenter.h" -#import "XPMonentsAttentionProtocol.h" -///View -#import "XPMomentsTableViewCell.h" -#import "XPMomentsEmptyTableViewCell.h" -#import "XPMomentsDetailViewController.h" -UIKIT_EXTERN NSString *kRequestTicket; -@interface XPMomentsAttentionViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前的页数 -@property (nonatomic,assign) NSInteger page; -///是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///数据信息 -@property (nonatomic,strong) MomentsListInfoModel *listInfo; -@end - -@implementation XPMomentsAttentionViewController --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} -- (BOOL)isHiddenNavBar { - return YES; -} - -- (__kindof id)createPresenter { - return [[XPMonentsAttentionPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor clearColor]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - [self.tableView.mj_header beginRefreshing]; - [self headerRefresh]; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - if([AccountInfoStorage instance].isRequestTicket == YES){ - return; - } - self.page = 1; - [self.presenter getMonentsAttentionListPageSize:20 dynamicId:@"" state:0]; -} - -- (void)footerRefresh { - if([AccountInfoStorage instance].isRequestTicket == YES)return; - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMonentsAttentionViewController0")]; - [self.tableView.mj_footer endRefreshing]; - return; - } - self.page++; - [self.presenter getMonentsAttentionListPageSize:20 dynamicId:self.listInfo.nextDynamicId state:1]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - MomentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMomentsLayoutConfig layoutMomentsModel:monentInfo]; - if(monentInfo.squareTop && monentInfo.content.length == 0){ - return monentInfo.rowHeight + 20 ; - }else{ - return monentInfo.rowHeight; - } - - } - return KScreenHeight - kNavigationHeight - 49 - kSafeAreaBottomHeight; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - cell.momentsInfo = monentsInfo; - return cell; - } - XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; - MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - detailVC.momentsInfo = monentsInfo; - detailVC.delegate = self; - [self.navigationController pushViewController:detailVC animated:YES]; - } -} - -#pragma mark - XPMomentsDetailViewControllerDelegate -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)monentsInfo{ - [self showLoading]; - [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; -} - -- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == dynamicId.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - XPMomentsTableViewCellDelegate -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { - [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsAttentionViewController1") confirmHandler:^{ - [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; - } cancelHandler:^{ - - }]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { - __block MomentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { - monentsInfos = obj; - *stop = YES; - } - }]; - if (monentsInfos) { - NSInteger row = [self.datasource indexOfObject:monentsInfo]; - [self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:row inSection:0]] withRowAnimation:UITableViewRowAnimationFade]; - } -} - -#pragma mark -JXCategoryListContainerViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - XPMomentsRecommendProtocol -- (void)getMonentsAttentionListSuccess:(MomentsListInfoModel *)listInfo state:(int)state { - self.listInfo = listInfo; - if (state == 0) { - [self.datasource removeAllObjects]; - } - if (listInfo.dynamicList.count > 0) { - [self.datasource addObjectsFromArray:listInfo.dynamicList]; - } - - if (state == 0) { - self.hasNoMoreData = NO; - [self.tableView.mj_header endRefreshing]; - } else { - if (listInfo.dynamicList.count > 0) { - self.hasNoMoreData = NO; - } else { - self.hasNoMoreData = YES; - } - [self.tableView.mj_footer endRefreshing]; - } - [self.tableView reloadData]; -} - -- (void)getMonentsAttentionListFail:(NSString *)msg state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -- (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.dynamicId isEqualToString:dynamicId]) { - if (status) { - obj.isLike += 1; - } else { - obj.isLike -= 1; - } - *stop = YES; - } - }]; - [self.tableView reloadData]; -} --(void)requesstShieldingSuccess:(NSString *)monentsInfo{ - [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} -- (void)deleteMonentsSuccess:(NSString *)monentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMonentsAttentionViewController2")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - } - return _tableView; -} - - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} -@end diff --git a/YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.h deleted file mode 100644 index 58434d2..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMMonentsDetailViewController.h -// YUMI -// -// Created by YUMI on 2022/6/22. -// - -#import "MvpViewController.h" -#import "XPMomentsDetailViewControllerDelegate.h" - -NS_ASSUME_NONNULL_BEGIN -@class MomentsInfoModel, XPMomentsDetailViewController; -//@protocol XPMonentsDetailViewControllerDelegate -// -/////删除了动态 -//- (void)xPMonentsDetailViewController:(XPMonentsDetailViewController *)view deleteMonents:(NSString *)dynamicId; -// -//@end - -@interface XPMomentsDetailViewController : MvpViewController -@property (nonatomic,strong) MomentsInfoModel *momentsInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.m deleted file mode 100644 index 4a26e60..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsDetailViewController.m +++ /dev/null @@ -1,550 +0,0 @@ -// -// XPMonentsDetailViewController.m -// xplan-ios -// -// Created by 冯硕 on 2022/6/22. -// - -#import "XPMomentsDetailViewController.h" -///Third -#import -#import -///Tool -#import "XPMomentsLayoutConfig.h" -#import "QEmotionHelper.h" -#import "QKeyboardManager.h" -#import "TTPopup.h" -///Model -#import "MomentsInfoModel.h" -#import "MonentsCommentModel.h" -#import "MonentsCommentReplyModel.h" -///View -#import "XPMomentsTableViewCell.h" -#import "XPMonentsCommentTableViewCell.h" -#import "XPMomentsEmptyTableViewCell.h" -#import "QInputBarView.h" -#import "QKeyboardManager.h" -#import "QEmotionBoardView.h" -#import "XPMineUserInfoViewController.h" -///P -#import "XPMonentDetailPresenter.h" -#import "XPMonentsDetailProtocol.h" - -@interface XPMomentsDetailViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///头部view -@property (nonatomic,strong) UIView * sectionView; -///评论的个数 -@property (nonatomic,strong) UILabel *commentLabel; -@property(nonatomic,strong)QInputBarView *inputBarView; -@property(nonatomic,strong)QKeyboardManager *keyboardManager; -///当前选中的评论信息 -@property (nonatomic,strong) NSString *commentId; -@end - -@implementation XPMomentsDetailViewController --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} -- (__kindof id)createPresenter { - return [[XPMonentDetailPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(refreshDynamicData:) name:@"kRefreshDynamicData" object:nil]; - -} --(void)refreshDynamicData:(NSNotification *)not{ - NSDictionary *refreshData = not.object; - int type = [refreshData[@"type"] intValue]; - ///type,0=点赞，1=删除，2=屏蔽，3=评论 - switch (type) { - case 0: - { - - BOOL status = [refreshData[@"status"] boolValue]; - NSInteger count = self.momentsInfo.likeCount.integerValue; - NSString *dynamicId = refreshData[@"dynamicId"]; - if([self.momentsInfo.dynamicId isEqualToString:dynamicId]){ - self.momentsInfo.isLike = status; - if (status) { - count += 1; - } else { - count -= 1; - } - self.momentsInfo.likeCount = [NSString stringWithFormat:@"%ld", count]; - [self.tableView reloadData]; - } - break; - } - case 1: - { - - - break; - } - case 2: - { - - break; - } - default: - { - NSString *dynamicId = refreshData[@"dynamicId"]; - if([self.momentsInfo.dynamicId isEqualToString:dynamicId]){ - self.momentsInfo.commentCount = [NSString stringWithFormat:@"%ld",self.momentsInfo.commentCount.integerValue + 1]; - - - [self.tableView reloadData]; - } - - break; - } - } -} -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -- (void)headerRefresh { - [self.presenter getMonentsDetail:self.momentsInfo.dynamicId]; - [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:@"" status:0]; -} - -- (void)footerRefresh { - NSString *timestamp = @""; - if (self.datasource.count > 0) { - MonentsCommentModel * commentInfo = [self.datasource lastObject]; - timestamp = commentInfo.publishTime; - } - [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:timestamp status:1]; -} - - -#pragma mark - Private Method -- (void)initInputView { - // 初始化输入工具条，frame可以先这样临时设置，下面的addBottomInputBarView方法会重置输入条frame - // 如果你想要自定义输入条View，请参考TextFieldViewController代码 - _inputBarView = [[QInputBarView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,UIInputBarViewMinHeight)]; - QInputBarViewConfiguration *inputBarViewConfiguration = [QInputBarViewConfiguration defaultInputBarViewConfiguration]; - inputBarViewConfiguration.voiceButtonHidden = YES;//隐藏语音按钮 - inputBarViewConfiguration.extendButtonHidden = YES;//隐藏拓展按钮 - [_inputBarView setupWithConfiguration:inputBarViewConfiguration]; - _inputBarView.delegate = self; - - //keyboard管理类，用来管理键盘，各大面板的切换 - _keyboardManager = [[QKeyboardManager alloc] initWithViewController:self]; - _keyboardManager.dataSource = self; - //因为addBottomInputBarView方法会立刻触发delegate，所以这里需要先设置delegate - _keyboardManager.delegate = self; - [_keyboardManager addBottomInputBarView:_inputBarView belowViewController:NO]; - - //把输入框（如果有的话）绑定给管理类 - [_keyboardManager bindTextView:_inputBarView.inputTextView]; -} - -- (void)sendTextMessage:(NSString *)inputText { - if (inputText.length > 0) { - [_keyboardManager hideAllBoardView]; - if (self.commentId && self.commentId.length > 0) { - [self.presenter replayCommon:self.commentId dynamicId:self.momentsInfo.dynamicId content:inputText]; - } else { - [self.presenter commontMonents:self.momentsInfo.dynamicId content:inputText]; - } - self.inputBarView.inputTextView.text = nil; - } else { - [self showErrorToast:YMLocalizedString(@"XPMonentsDetailViewController0")]; - } -} - -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMonentsDetailViewController1"); - [self.view addSubview:self.tableView]; - [self.sectionView addSubview:self.commentLabel]; - [self initInputView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.inputBarView.mas_top); - }]; - - [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.sectionView).offset(15); - make.centerY.mas_equalTo(self.sectionView); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 2; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - if (section == 0) { - return 1; - } - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 0) { - [XPMomentsLayoutConfig layoutMomentsModel:self.momentsInfo]; - - if(self.momentsInfo.squareTop && self.momentsInfo.content.length == 0){ - return self.momentsInfo.rowHeight + 20 ; - }else{ - return self.momentsInfo.rowHeight; - } - } else if(indexPath.section == 1) { - if (self.datasource.count > 0) { - MonentsCommentModel * commentInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return [XPMomentsLayoutConfig commentCommentRowHeight:commentInfo]; - } else { - return 400; - } - } - return 0; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - if (section == 1) { - return 44; - } - return 0.0;; -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - self.commentLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMonentsDetailViewController2"), self.momentsInfo.commentCount]; - return self.sectionView; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { - return 0.0f; -} - -- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section { - return [UIView new]; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section ==0) { - XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - cell.delegate = self; - cell.momentsInfo = self.momentsInfo; - return cell; - } else { - if (self.datasource.count > 0) { - XPMonentsCommentTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsCommentTableViewCell class])]; - cell.commentInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; - } else { - XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - return cell; - } - } -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (indexPath.section == 1) { - if (self.datasource.count > 0) { - MonentsCommentModel* monent = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - self.commentId = monent.commentId; - self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:YMLocalizedString(@"XPMonentsDetailViewController3"), monent.nick]; - [self.inputBarView textViewBecomeFirstResponder]; - } - } -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - [_keyboardManager hideAllBoardView]; -} - -#pragma mark - XPMonentsCommentTableViewCellDelegate -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)monentsInfo{ - [self showLoading]; - [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; -} -- (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickMoreReply:(MonentsCommentModel *)commentInfo { - [self.presenter getMonentsCommentReplyList:self.momentsInfo.dynamicId commentId:commentInfo.commentId timestamp:commentInfo.replyInfo.nextTimestamp]; -} - -- (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickCommon:(MonentsReplyModel *)commentInfo { - if (commentInfo) { - self.commentId = commentInfo.replyId; - self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:YMLocalizedString(@"XPMonentsDetailViewController4"), commentInfo.nick]; - [self.inputBarView textViewBecomeFirstResponder]; - } -} -- (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickAvatar:(NSString *)commentInfo { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = commentInfo.integerValue; - [self.navigationController pushViewController:userInfoVC animated:YES]; -} -#pragma mark - XPMomentsTableViewCellDelegate -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { - [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsDetailViewController5") confirmHandler:^{ - [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; - } cancelHandler:^{ - - }]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicCommon:(MomentsInfoModel *)monentsInfo { - if (monentsInfo) { - self.commentId = nil; - self.inputBarView.inputTextView.placeholder = YMLocalizedString(@"XPMonentsDetailViewController6"); - [self.inputBarView textViewBecomeFirstResponder]; - } -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { - self.momentsInfo = monentsInfo; - [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationFade]; -} - -#pragma mark - InputBoardDataSource -//@return 点加号按钮弹出的拓展面板View，且无需设置frame -- (UIView *)keyboardManagerExtendBoardView:(QKeyboardManager *)keyboardManager { - UIView *boardView = [UIView new]; - boardView.backgroundColor = UIColor.blueColor; - return boardView; -} - -//@return 点表情按钮弹出的表情面板View，且无需设置frame -- (UIView *)keyboardManagerEmotionBoardView:(QKeyboardManager *)keyboardManager { - QEmotionBoardView *emotionView = [[QEmotionBoardView alloc] init]; - QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper]; - emotionView.emotions = faceManager.emotionArray; - emotionView.delegate = self; - if (@available(iOS 11.0, *)) { - NSBundle *bundle = [NSBundle bundleForClass:[self class]]; - emotionView.backgroundColor = [UIColor colorNamed:@"q_input_extend_bg" inBundle:bundle compatibleWithTraitCollection:nil]; - } else { - emotionView.backgroundColor = [UIColor colorWithRed:(246)/255.0f green:(246)/255.0f blue:(246)/255.0f alpha:1]; - } - return emotionView; -} - -//@return 点表情按钮弹出的表情面板View的高度 -- (CGFloat)keyboardManagerEmotionBoardHeight:(QKeyboardManager *)keyboardManager { - return 294; -} - -//@return 点加号按钮弹出的拓展面板View的高度 -- (CGFloat)keyboardManagerExtendBoardHeight:(QKeyboardManager *)keyboardManager { - return 174; -} - -- (QInputBarViewConfiguration *)inputBarViewConfiguration { - //输入条配置，子类可以重写 - QInputBarViewConfiguration *inputBarViewConfiguration = [QInputBarViewConfiguration defaultInputBarViewConfiguration]; - inputBarViewConfiguration.voiceButtonHidden = YES;//隐藏语音按钮 - inputBarViewConfiguration.extendButtonHidden = YES;//隐藏拓展按钮 - return inputBarViewConfiguration; -} - -//点击表情按钮，切换到表情面板 -- (void)inputBarView:(QInputBarView *)inputBarView onEmotionButtonClick:(UIButton *)emotionSwitchButton { - if (emotionSwitchButton.isSelected) { - [_keyboardManager switchToEmotionBoardKeyboard]; - } else { - self.commentId = nil; - _inputBarView.inputTextView.placeholder = YMLocalizedString(@"XPMonentsDetailViewController7"); - [_inputBarView textViewBecomeFirstResponder]; - } -} - -#pragma mark - QEmotionBoardViewDelegate -/** - * 选中表情时的回调 - * @param index 被选中的表情在`emotions`里的索引 - * @param emotion 被选中的表情对应的`QMUIEmotion`对象 - */ -- (void)emotionView:(QEmotionBoardView *)emotionView didSelectEmotion:(QEmotion *)emotion atIndex:(NSInteger)index { - //把😊插入到输入栏 - UIFont *font = [UIFont systemFontOfSize:17.5]; - NSTextAttachment * emotionAtt = [[NSTextAttachment alloc] init]; - UIImage *iconImage = emotion.image; - emotionAtt.bounds = CGRectMake(0, roundf(font.capHeight - emotion.image.size.width)/2.f, emotion.image.size.width, emotion.image.size.height); - emotionAtt.image = iconImage; - emotionAtt.imageName = emotion.displayName; - NSAttributedString *emotionAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)emotionAtt]; - - [_inputBarView insertEmotionAttributedString:emotionAttribute]; -} - -// 删除按钮的点击事件回调 -- (void)emotionViewDidSelectDeleteButton:(QEmotionBoardView *)emotionView { - if (![_inputBarView deleteEmotion]){ - //根据当前的光标，这次点击删除按钮并没有删除表情，那么就删除文字 - [_inputBarView.inputTextView deleteBackward]; - } -} - -// 发送按钮的点击事件回调 -- (void)emotionViewDidSelectSendButton:(QEmotionBoardView *)emotionView { - [self sendTextMessage:[_inputBarView textViewInputNormalText]]; -} - - -#pragma mark - -/** - * 点击了系统键盘的发送按钮 - * @param inputNormalText ："害~你好啊[微笑]" - */ -- (void)inputBarView:(QInputBarView *)inputBarView onKeyboardSendClick:(NSString *)inputNormalText { - [self sendTextMessage:inputNormalText]; -} - -#pragma mark - XPMonentsDetailProtocol -- (void)getMonentsDetailSuccess:(MomentsInfoModel *)commentInfo { - self.momentsInfo = commentInfo; - [self.tableView reloadData]; -} - -- (void)getMonentsCommentListSuccess:(MonentsCommentListModel *)commentInfo state:(int)state{ - if (state == 0) { - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - - if (commentInfo.commentList.count > 0) { - [self.datasource addObjectsFromArray:commentInfo.commentList]; - } - [self.tableView reloadData]; -} - -- (void)getMonentsCommentReplyListSuccess:(MonentsCommentReplyModel *)replyInfo commentId:(nonnull NSString *)commentId { - if (commentId) { - __block MonentsCommentModel * commentInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsCommentModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.commentId isEqualToString:commentId]) { - commentInfo = obj; - *stop = YES; - } - }]; - - if (commentInfo) { - NSMutableArray * replyList= commentInfo.replyInfo.replyList.mutableCopy; - [replyList addObjectsFromArray:replyInfo.replyList]; - commentInfo.replyInfo.replyList = replyList.copy; - commentInfo.replyInfo.leftCount = replyInfo.leftCount; - commentInfo.replyInfo.nextTimestamp = replyInfo.nextTimestamp; - commentInfo.isReloadHeight = YES; - } - [self.tableView reloadData]; - } -} - -- (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - if ([self.momentsInfo.dynamicId isEqualToString:dynamicId]) { - - - ///type,0=点赞，1=删除，2=屏蔽，3=评论 - [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":dynamicId,@"type":@"0",@"status":@(status)}]; - } -} - -- (void)replyMonentsSuccess { - [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:@"" status:0]; - ///type,0=点赞，1=删除，2=屏蔽，3=评论 - [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":self.momentsInfo.dynamicId,@"type":@"3"}]; -} - -- (void)commonMonentsSuccess { - [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:@"" status:0]; - ///type,0=点赞，1=删除，2=屏蔽，3=评论 - [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":self.momentsInfo.dynamicId,@"type":@"3"}]; -} --(void)requesstShieldingSuccess:(NSString *)monentsInfo{ - [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; - ///type,0=点赞，1=删除，2=屏蔽，3=评论 - [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":monentsInfo,@"type":@"2"}]; - [self.navigationController popViewControllerAnimated:YES]; - -} -- (void)deleteMonentsSuccess:(NSString *)monentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMonentsDetailViewController8")]; - ///type,0=点赞，1=删除，2=屏蔽，3=评论 - [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":monentsInfo,@"type":@"1"}]; - [self.navigationController popViewControllerAnimated:YES]; - -} - - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - [_tableView registerClass:[XPMonentsCommentTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsCommentTableViewCell class])]; - [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - } - return _tableView; -} - -- (UIView *)sectionView { - if (!_sectionView) { - _sectionView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 44)]; - _sectionView.backgroundColor = [UIColor clearColor]; - } - return _sectionView; -} - -- (UILabel *)commentLabel { - if (!_commentLabel) { - _commentLabel = [[UILabel alloc] init]; - _commentLabel.font = [UIFont systemFontOfSize:14]; - _commentLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _commentLabel; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/XPMomentsLatestViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsLatestViewController.h deleted file mode 100644 index 6c5a37a..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsLatestViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMonentsLatestViewController.h -// YUMI -// -// Created by YUMI on 2022/5/18. -// - -#import "MvpViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN - -@interface XPMomentsLatestViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMomentsLatestViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsLatestViewController.m deleted file mode 100644 index 60f5d37..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsLatestViewController.m +++ /dev/null @@ -1,304 +0,0 @@ -// -// XPMonentsLatestViewController.m -// xplan-ios -// -// Created by 冯硕 on 2022/5/18. -// - -#import "XPMomentsLatestViewController.h" -///Third -#import -#import -///Tool -#import "XPMomentsLayoutConfig.h" -#import "TTPopup.h" -///Model -#import "MomentsListInfoModel.h" -///P -#import "XPMomentsLatestPresenter.h" -#import "XPMonentsLatestProtocol.h" -///View -#import "XPMomentsTableViewCell.h" -#import "XPMomentsEmptyTableViewCell.h" -#import "XPMomentsDetailViewController.h" -UIKIT_EXTERN NSString *kRequestTicket; -@interface XPMomentsLatestViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前的页数 -@property (nonatomic,assign) NSInteger page; -///是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///数据信息 -@property (nonatomic,strong) MomentsListInfoModel *listInfo; -@end - -@implementation XPMomentsLatestViewController - --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} -- (BOOL)isHiddenNavBar { - return YES; -} - -- (__kindof id)createPresenter { - return [[XPMomentsLatestPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor clearColor]; - [self initHeaderAndFooterRefresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - -} - - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRefresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - [self.tableView.mj_header beginRefreshing]; - [self headerRefresh]; -} - -#pragma mark - 刷新 -- (void)headerRefresh { - if([AccountInfoStorage instance].isRequestTicket == YES){ - return; - } - self.page = 1; - [self.presenter getMonentsLatestListPageSize:20 dynamicId:@"" state:0]; -} - -- (void)footerRefresh { - if([AccountInfoStorage instance].isRequestTicket == YES)return; - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMonentsLatestViewController0")]; - [self.tableView.mj_footer endRefreshing]; - return; - } - self.page++; - [self.presenter getMonentsLatestListPageSize:20 dynamicId:self.listInfo.nextDynamicId state:1]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - MomentsInfoModel * momentsInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMomentsLayoutConfig layoutMomentsModel:momentsInfo]; - if(momentsInfo.squareTop && momentsInfo.content.length == 0){ - return momentsInfo.rowHeight + 20 ; - }else{ - return momentsInfo.rowHeight; - } - - } - return KScreenHeight - kNavigationHeight - 49 - kSafeAreaBottomHeight; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - MomentsInfoModel * momentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.momentsInfo = momentsInfo; - cell.delegate = self; - return cell; - } - XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; - MomentsInfoModel * momentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - detailVC.momentsInfo = momentsInfo; - detailVC.delegate = self; - [self.navigationController pushViewController:detailVC animated:YES]; - } -} -#pragma mark - XPMomentsDetailViewControllerDelegate -- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == dynamicId.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - XPMomentsTableViewCellDelegate -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)momentsInfo{ - [self showLoading]; - [self.presenter requesstShieldingWtihType:@"0" objId:momentsInfo.dynamicId]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)momentsInfo { - [self.presenter likeMonent:momentsInfo.dynamicId status:!momentsInfo.isLike likedUid:momentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", momentsInfo.worldId]]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)momentsInfo { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsLatestViewController1") confirmHandler:^{ - [self.presenter deleteMonents:momentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", momentsInfo.worldId]]; - } cancelHandler:^{ - - }]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)momentsInfo { - __block MomentsInfoModel * _momentsInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == momentsInfo.dynamicId.integerValue) { - _momentsInfo = obj; - *stop = YES; - } - }]; - if (_momentsInfo) { - NSInteger row = [self.datasource indexOfObject:_momentsInfo]; - [self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:row inSection:0]] withRowAnimation:UITableViewRowAnimationFade]; - } -} - -#pragma mark -JXCategoryListContainerViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - XPMonentsLatestProtocol -- (void)getMomentsLatestListSuccess:(MomentsListInfoModel *)listInfo state:(int)state{ - self.listInfo = listInfo; - if (state == 0) { - [self.datasource removeAllObjects]; - } - if (listInfo.dynamicList.count > 0) { - [self.datasource addObjectsFromArray:listInfo.dynamicList]; - } - - if (state == 0) { - self.hasNoMoreData = NO; - [self.tableView.mj_header endRefreshing]; - } else { - if (listInfo.dynamicList.count > 0) { - self.hasNoMoreData = NO; - } else { - self.hasNoMoreData = YES; - } - [self.tableView.mj_footer endRefreshing]; - } - [self.tableView reloadData]; -} - -- (void)getMonentsLatestListFail:(NSString *)msg state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -- (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.dynamicId isEqualToString:dynamicId]) { - NSInteger count = obj.likeCount.integerValue; - obj.isLike = status; - if (status) { - count += 1; - } else { - count -= 1; - } - obj.likeCount = [NSString stringWithFormat:@"%ld", count]; - *stop = YES; - } - }]; - [self.tableView reloadData]; -} --(void)requesstShieldingSuccess:(NSString *)monentsInfo{ - [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} -- (void)deleteMonentsSuccess:(NSString *)monentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMonentsLatestViewController2")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - } - return _tableView; -} - - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} -@end diff --git a/YuMi/Modules/YMMonents/View/XPMomentsMineViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsMineViewController.h deleted file mode 100644 index 0085412..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsMineViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMonentsMineViewController.h -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "MvpViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN -@class MomentsInfoModel; -@interface XPMomentsMineViewController : MvpViewController -@property (nonatomic,strong) NSArray*dynamicInfo; -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMomentsMineViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsMineViewController.m deleted file mode 100644 index 877f0c0..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsMineViewController.m +++ /dev/null @@ -1,250 +0,0 @@ -// -// YMMonentsMineViewController.m -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "XPMomentsMineViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "XPMomentsLayoutConfig.h" -#import "TTPopup.h" -#import "NSArray+Safe.h" -#import "ClientConfig.h" -///Model -#import "MomentsListInfoModel.h" -///P -#import "XPMomentMinePresenter.h" -#import "XPMomentsMineProtocol.h" -///View -#import "XPMomentsTableViewCell.h" -#import "XPMomentsEmptyTableViewCell.h" -#import "XPMomentsDetailViewController.h" -#import "XPMomentsSimpleDetailViewController.h" - -@interface XPMomentsMineViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///数据信息 -@property (nonatomic,strong) MomentsListInfoModel *listInfo; -@end - -@implementation XPMomentsMineViewController - -- (__kindof id)createPresenter { - return [[XPMomentMinePresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - MomentsInfoModel * momentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMomentsLayoutConfig layoutMomentsModel:momentInfo]; - return momentInfo.rowHeight; - } - return KScreenHeight - kNavigationHeight - 49 - kSafeAreaBottomHeight; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - MomentsInfoModel * momentInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - cell.momentsInfo = momentInfo; - return cell; - } - XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - MomentsInfoModel * momentInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if(momentInfo.dynamicId == nil) { - return; - } - XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; - detailVC.momentsInfo = momentInfo; - detailVC.delegate = self; - [self.navigationController pushViewController:detailVC animated:YES]; - } -} -#pragma mark - XPMomentsTableViewCellDelegate -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)momentInfo { - if(momentInfo.dynamicId == nil){ - [self showErrorToast:YMLocalizedString(@"XPMineUserDataViewController4")]; - return; - } - [self.presenter likeMoment:momentInfo.dynamicId - status:!momentInfo.isLike - likedUid:momentInfo.uid - worldId:[NSString stringWithFormat:@"%ld", momentInfo.worldId]]; -} -///点击了评论 -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicCommon:(MomentsInfoModel *)momentInfo{ - if(momentInfo.dynamicId == nil){ - [self showErrorToast:YMLocalizedString(@"XPMineUserDataViewController5")]; - return; - } - XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; - detailVC.momentsInfo = momentInfo; - detailVC.delegate = self; - [self.navigationController pushViewController:detailVC animated:YES]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)momentInfo { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMomentsMineViewController2") confirmHandler:^{ - [self.presenter deleteMoments:momentInfo.dynamicId - worldId:[NSString stringWithFormat:@"%ld", momentInfo.worldId]]; - } cancelHandler:^{ - - }]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)momentsInfo { - __block MomentsInfoModel * momentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == momentsInfo.dynamicId.integerValue) { - momentsInfos = obj; - *stop = YES; - } - }]; - if (momentsInfos) { - NSInteger row = [self.datasource indexOfObject:momentsInfos]; - [self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:row inSection:0]] withRowAnimation:UITableViewRowAnimationFade]; - } -} - -#pragma mark - XPMomentsDetailViewControllerDelegate -- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == dynamicId.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - XPMomentsMineProtocol -- (void)likeMomentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.dynamicId isEqualToString:dynamicId]) { - if (status) { - obj.isLike += 1; - } else { - obj.isLike -= 1; - } - *stop = YES; - } - }]; - [self.tableView reloadData]; -} - -- (void)deleteMomentsSuccess:(NSString *)momentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController1")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == momentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -- (void)requesstShieldingSuccess:(NSString *)monentsInfo { - -} - -#pragma mark - JXPagingViewListViewDelegate -- (UIScrollView *)listScrollView { - return self.tableView; -} - -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - self.scrollCallback = callback; -} - -- (UIView *)listView { - return self.view; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - self.scrollCallback(scrollView); -} - -#pragma mark - Getters And Setters -- (void)setDynamicInfo:(NSArray *)dynamicInfo { - [self.datasource removeAllObjects]; - [self.datasource addObjectsFromArray:dynamicInfo]; - [self.tableView reloadData]; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - } - return _tableView; -} - - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.h deleted file mode 100644 index f8f7ff2..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMonentsRecommendViewController.h -// YUMI -// -// Created by YUMI on 2022/5/11. -// - -#import "MvpViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN - -@interface XPMomentsRecommendViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.m deleted file mode 100644 index 1f53fa4..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsRecommendViewController.m +++ /dev/null @@ -1,335 +0,0 @@ -// -// XPMomentsRecommendViewController.m -// xplan-ios -// -// Created by 冯硕 on 2022/5/11. -// - -#import "XPMomentsRecommendViewController.h" -///Third -#import -#import -///Tool - - -#import "XPMomentsLayoutConfig.h" -#import "TTPopup.h" -///Model -#import "MomentsInfoModel.h" -#import "MomentsTopicModel.h" -///P -#import "XPMomentsRecommendPresenter.h" -#import "XPMomentsRecommendProtocol.h" -///View -#import "XPMomentsTableViewCell.h" -#import "XPMomentsEmptyTableViewCell.h" -#import "XPMomentsRecommendHeaderView.h" -#import "XPMomentsDetailViewController.h" -#import "XPMomentTopicContainerViewController.h" -#import "XPMomentsTopicListViewController.h" - -UIKIT_EXTERN NSString *kRequestTicket; -@interface XPMomentsRecommendViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前的页数 -@property (nonatomic,assign) NSInteger page; -///是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///顶部视图 -@property (nonatomic,strong) XPMomentsRecommendHeaderView *headerView; -@end - -@implementation XPMomentsRecommendViewController --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} -- (BOOL)isHiddenNavBar { - return YES; -} - -- (__kindof id)createPresenter { - return [[XPMomentsRecommendPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor clearColor]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initHeaderAndFooterRefresh]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; -// self.tableView.tableHeaderView = self.headerView; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRefresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - [self.tableView.mj_header beginRefreshing]; - - [self headerRefresh]; -} - -#pragma mark - 刷新的 -- (void)headerRefresh { - if([AccountInfoStorage instance].isRequestTicket == YES){ - return; - } - - self.page = 1; - [self.presenter getMomentsRecommendList:self.page pageSize:20 state:0]; - [self.presenter getMomentsTopicList:self.page pageSize:20]; -} - -- (void)footerRefresh { - if([AccountInfoStorage instance].isRequestTicket == YES)return; - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMomentsRecommendViewController0")]; - [self.tableView.mj_footer endRefreshing]; - return; - } - self.page++; - [self.presenter getMomentsRecommendList:self.page pageSize:20 state:1]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - MomentsInfoModel * momentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMomentsLayoutConfig layoutMomentsModel:momentInfo]; - - if(momentInfo.squareTop && momentInfo.content.length == 0){ - return momentInfo.rowHeight + 20 ; - }else{ - return momentInfo.rowHeight; - } - - } - return KScreenHeight - kNavigationHeight - 49 - kSafeAreaBottomHeight; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - MomentsInfoModel * momentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.momentsInfo = momentsInfo; - cell.delegate = self; - return cell; - } else { - XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - return cell; - } -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; - MomentsInfoModel * momentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - detailVC.momentsInfo = momentsInfo; - detailVC.delegate = self; - [self.navigationController pushViewController:detailVC animated:YES]; - } -} -#pragma mark - XPMomentsDetailViewControllerDelegate -- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == dynamicId.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - XPMomentsTableViewCellDelegate - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)momentsInfo{ - [self showLoading]; - [self.presenter requestShieldingWithType:@"0" objId:momentsInfo.dynamicId]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)momentsInfo { - [self.presenter likeMoment:momentsInfo.dynamicId status:!momentsInfo.isLike likedUid:momentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", momentsInfo.worldId]]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)momentsInfo { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMomentsRecommendViewController1") confirmHandler:^{ - [self.presenter deleteMoments:momentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", momentsInfo.worldId]]; - } cancelHandler:^{ - - }]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)momentsInfo { - __block MomentsInfoModel * momentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == momentsInfo.dynamicId.integerValue) { - momentsInfos = obj; - *stop = YES; - } - }]; - if (momentsInfos) { - NSInteger row = [self.datasource indexOfObject:momentsInfo]; - [self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:row inSection:0]] withRowAnimation:UITableViewRowAnimationFade]; - } -} - -#pragma mark - XPMomentsRecommendHeaderViewDelegate -- (void)XPMomentsRecommendHeaderView:(XPMomentsRecommendHeaderView *)view didSelectItem:(MomentsTopicModel *)info { - XPMomentTopicContainerViewController * topicVC = [[XPMomentTopicContainerViewController alloc] init]; - topicVC.worldId = info.tId; - [self.navigationController pushViewController:topicVC animated:YES]; -} - -- (void)XPMomentsRecommendHeaderView:(XPMomentsRecommendHeaderView *)view didClickMoreTopic:(UIButton *)sender { - XPMomentsTopicListViewController * topicListVC = [[XPMomentsTopicListViewController alloc] init]; - [self.navigationController pushViewController:topicListVC animated:YES]; -} - -#pragma mark -JXCategoryListContainerViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - XPMomentsRecommendProtocol -- (void)getMomentsRecommendListSuccess:(NSArray *)array state:(int)state { - if (state == 0) { - [self.datasource removeAllObjects]; - } - if (array.count > 0) { - [self.datasource addObjectsFromArray:array]; - } - - if (state == 0) { - self.hasNoMoreData = NO; - [self.tableView.mj_header endRefreshing]; - } else { - if (array.count > 0) { - self.hasNoMoreData = NO; - } else { - self.hasNoMoreData = YES; - } - [self.tableView.mj_footer endRefreshing]; - } - [self.tableView reloadData]; -} - -- (void)getMomentsRecommendListFail:(NSString *)msg state:(int)state { - [XNDJTDDLoadingTool hideOnlyView:self.tabBarController.view]; - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -- (void)momentsTopicListSuccess:(NSArray *)array { - self.headerView.topicList = array; -} - -- (void)likeMomentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.dynamicId isEqualToString:dynamicId]) { - if (status) { - obj.isLike += 1; - } else { - obj.isLike -= 1; - } - *stop = YES; - } - }]; - [self.tableView reloadData]; -} --(void)requestShieldingSuccess:(NSString *)momentsInfo{ - [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == momentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} -- (void)deleteMomentsSuccess:(NSString *)momentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMomentsRecommendViewController2")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == momentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - } - return _tableView; -} - - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -- (XPMomentsRecommendHeaderView *)headerView { - if (!_headerView) { - _headerView = [[XPMomentsRecommendHeaderView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 145)]; - _headerView.delegate = self; - } - return _headerView; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.h b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.h deleted file mode 100644 index 735c018..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMMomentsSimpleDetailNav.h -// YUMI -// -// Created by XY on 2023/2/22. -// - -#import - -@class MomentsInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@protocol XPMomentsSimpleDetailNavDelegate -/// 点击了返回 -- (void)momentsSimpleDetailNavBackAction; -/// 点击了头像 -- (void)momentsSimpleDetailNavAvatarAction; -/// 点击了更多 -- (void)momentsSimpleDetailNavMoreAction; - -@end - -@interface XPMomentsSimpleDetailNav : UIView - -@property (strong, nonatomic) MomentsInfoModel *infoModel; - -@property (nonatomic, weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.m b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.m deleted file mode 100644 index b9bd499..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.m +++ /dev/null @@ -1,160 +0,0 @@ -// -// YMMomentsSimpleDetailNav.m -// YUMI -// -// Created by XY on 2023/2/22. -// - -#import "XPMomentsSimpleDetailNav.h" -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import -#import "MomentsInfoModel.h" - -@interface XPMomentsSimpleDetailNav() -/// 返回 -@property (nonatomic, strong) UIButton *backBtn; -/// 头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -/// 昵称 -@property (nonatomic, strong) UILabel *nicknameLabel; -/// ID -@property (nonatomic, strong) UILabel *idLabel; -/// 更多 -@property (nonatomic, strong) UIButton *moreBtn; - -@end - -@implementation XPMomentsSimpleDetailNav - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - self.backgroundColor = UIColor.whiteColor; - [self createUI]; - } - return self; -} - -- (void)createUI { - [self addSubview:self.backBtn]; - [self addSubview:self.avatarImageView]; - [self addSubview:self.nicknameLabel]; - [self addSubview:self.idLabel]; - [self addSubview:self.moreBtn]; - - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.centerY.mas_equalTo(self); - make.width.height.mas_equalTo(44); - }]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backBtn.mas_trailing); - make.centerY.mas_equalTo(self); - make.width.height.mas_equalTo(30); - }]; - [self.nicknameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(7); - make.trailing.lessThanOrEqualTo(self.moreBtn.mas_leading).offset(-10); - }]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.avatarImageView); - make.leading.mas_equalTo(self.nicknameLabel); - make.trailing.lessThanOrEqualTo(self.moreBtn.mas_leading).offset(-10); - }]; - [self.moreBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-8); - make.centerY.mas_equalTo(self); - make.width.height.mas_equalTo(44); - }]; -} - -- (void)setInfoModel:(MomentsInfoModel *)infoModel { - _infoModel = infoModel; - if (_infoModel) { - self.avatarImageView.imageUrl = infoModel.avatar; - NSString * nick = infoModel.nick; - self.nicknameLabel.text = nick.length > 0 ? nick : @""; - self.idLabel.text = [NSString stringWithFormat:@"ID：%@",infoModel.uid]; - } -} - -#pragma mark - Action -/// 返回 -- (void)backBtnAction { - if (self.delegate && [self.delegate respondsToSelector:@selector(momentsSimpleDetailNavBackAction)]) { - [self.delegate momentsSimpleDetailNavBackAction]; - } -} - -/// 点击头像 -- (void)didTapAvatarGuest { - if (self.delegate && [self.delegate respondsToSelector:@selector(momentsSimpleDetailNavAvatarAction)]) { - [self.delegate momentsSimpleDetailNavAvatarAction]; - } -} - -/// 点击更多 -- (void)moreBtnAction { - if (self.delegate && [self.delegate respondsToSelector:@selector(momentsSimpleDetailNavMoreAction)]) { - [self.delegate momentsSimpleDetailNavMoreAction]; - } -} - -#pragma mark - 懒加载 - -- (UIButton *)backBtn { - if (!_backBtn) { - _backBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backBtn setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backBtn addTarget:self action:@selector(backBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.userInteractionEnabled = YES; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 30/2; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapAvatarGuest)]; - [_avatarImageView addGestureRecognizer:tap]; - } - return _avatarImageView; -} - -- (UILabel *)nicknameLabel { - if (!_nicknameLabel) { - _nicknameLabel = [[UILabel alloc] init]; - _nicknameLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _nicknameLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - } - return _nicknameLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _idLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightRegular]; - } - return _idLabel; -} - -- (UIButton *)moreBtn { - if (!_moreBtn) { - _moreBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_moreBtn setImage:[UIImage imageNamed:@"monents_info_like_report"] forState:UIControlStateNormal]; - [_moreBtn addTarget:self action:@selector(moreBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _moreBtn; -} - - -@end diff --git a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.h deleted file mode 100644 index 0d549b8..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// YMMomentsSimpleDetailViewController.h -// YUMI -// -// Created by XY on 2023/2/22. -// - -#import "MvpViewController.h" -#import "XPMomentsDetailViewControllerDelegate.h" - -@class MomentsInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface XPMomentsSimpleDetailViewController : MvpViewController - -@property (nonatomic,strong) MomentsInfoModel *momentsInfo; - -///代理 -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m deleted file mode 100644 index 019bc16..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m +++ /dev/null @@ -1,597 +0,0 @@ -// -// YMMomentsSimpleDetailViewController.m -// YUMI -// -// Created by XY on 2023/2/22. -// - -#import "XPMomentsSimpleDetailViewController.h" - -///Third -#import -#import -///Tool -#import "XPMomentsLayoutConfig.h" -#import "DJDKMIMOMColor.h" -#import "QEmotionHelper.h" -#import "QKeyboardManager.h" -#import "TTPopup.h" -#import "NSArray+Safe.h" -#import "AccountInfoStorage.h" -#import "YUMIHtmlUrl.h" -#import "ClientConfig.h" -#import "XNDJTDDLoadingTool.h" -///Model -#import "MomentsInfoModel.h" -#import "MonentsCommentModel.h" -#import "MonentsCommentReplyModel.h" -///View -#import "XPMomentsTableViewCell.h" -#import "XPMonentsCommentTableViewCell.h" -#import "XPMomentsEmptyTableViewCell.h" -#import "QInputBarView.h" -#import "QKeyboardManager.h" -#import "QEmotionBoardView.h" -#import "XPMineUserInfoViewController.h" - -#import "XPMomentsSimpleDetailNav.h" -#import "XPWebViewController.h" -///P -#import "XPMonentDetailPresenter.h" -#import "XPMonentsDetailProtocol.h" - -@interface XPMomentsSimpleDetailViewController () - -///导航栏 -@property(nonatomic,strong) XPMomentsSimpleDetailNav *detailNav; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///头部view -@property (nonatomic,strong) UIView * sectionView; -///评论的个数 -@property (nonatomic,strong) UILabel *commentLabel; -@property (nonatomic,strong) UIButton *likeBtn; -@property(nonatomic,strong)QInputBarView *inputBarView; -@property(nonatomic,strong)QKeyboardManager *keyboardManager; -///当前选中的评论信息 -@property (nonatomic,strong) NSString *commentId; -@end - -@implementation XPMomentsSimpleDetailViewController - -- (__kindof id)createPresenter { - return [[XPMonentDetailPresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = UIColor.whiteColor; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -- (void)headerRefresh { - [self.presenter getMonentsDetail:self.momentsInfo.dynamicId]; - [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:@"" status:0]; -} - -- (void)footerRefresh { - NSString *timestamp = @""; - if (self.datasource.count > 0) { - MonentsCommentModel * commentInfo = [self.datasource lastObject]; - timestamp = commentInfo.publishTime; - } - [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:timestamp status:1]; -} - - -#pragma mark - Private Method -- (void)initInputView { - // 初始化输入工具条，frame可以先这样临时设置，下面的addBottomInputBarView方法会重置输入条frame - // 如果你想要自定义输入条View，请参考TextFieldViewController代码 - _inputBarView = [[QInputBarView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,UIInputBarViewMinHeight)]; - QInputBarViewConfiguration *inputBarViewConfiguration = [QInputBarViewConfiguration defaultInputBarViewConfiguration]; - inputBarViewConfiguration.voiceButtonHidden = YES;//隐藏语音按钮 - inputBarViewConfiguration.extendButtonHidden = YES;//隐藏拓展按钮 - - inputBarViewConfiguration.rightSendButton = self.likeBtn; - inputBarViewConfiguration.emotionButtonHidden = YES; - - [_inputBarView setupWithConfiguration:inputBarViewConfiguration]; - _inputBarView.delegate = self; - - //keyboard管理类，用来管理键盘，各大面板的切换 - _keyboardManager = [[QKeyboardManager alloc] initWithViewController:self]; - _keyboardManager.dataSource = self; - //因为addBottomInputBarView方法会立刻触发delegate，所以这里需要先设置delegate - _keyboardManager.delegate = self; - [_keyboardManager addBottomInputBarView:_inputBarView belowViewController:NO]; - - //把输入框（如果有的话）绑定给管理类 - [_keyboardManager bindTextView:_inputBarView.inputTextView]; - - _inputBarView.inputTextView.placeholder = YMLocalizedString(@"XPMomentsSimpleDetailViewController0"); - _inputBarView.inputTextView.font = [UIFont systemFontOfSize:12]; - - -} - -- (void)sendTextMessage:(NSString *)inputText { - if (inputText.length > 0) { - [_keyboardManager hideAllBoardView]; - if (self.commentId && self.commentId.length > 0) { - [self.presenter replayCommon:self.commentId dynamicId:self.momentsInfo.dynamicId content:inputText]; - } else { - [self.presenter commontMonents:self.momentsInfo.dynamicId content:inputText]; - } - self.inputBarView.inputTextView.text = nil; - } else { - [self showErrorToast:YMLocalizedString(@"XPMomentsSimpleDetailViewController1")]; - } -} - -- (void)initSubViews { - [self.view addSubview:self.detailNav]; - [self.view addSubview:self.tableView]; - [self.sectionView addSubview:self.commentLabel]; - [self initInputView]; -} - -- (void)initSubViewConstraints { - [self.detailNav mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kStatusBarHeight); - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(44); - }]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.detailNav.mas_bottom); - make.leading.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.inputBarView.mas_top); - }]; - - [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.sectionView).offset(15); - make.top.mas_equalTo(6); - make.bottom.mas_equalTo(0); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 2; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - if (section == 0) { - return 1; - } - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 0) { - [XPMomentsLayoutConfig layoutSimpleMomentsModel:self.momentsInfo]; - return self.momentsInfo.rowHeight+20; - } else if(indexPath.section == 1) { - if (self.datasource.count > 0) { - MonentsCommentModel * commentInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return [XPMomentsLayoutConfig commentCommentRowHeight:commentInfo]; - } else { - return 400; - } - } - return 0; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - if (section == 1) { - return 44; - } - return 0.0;; -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - NSString *commentText = YMLocalizedString(@"XPMomentsSimpleDetailViewController2"); - NSMutableAttributedString *commentStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@%@",commentText,self.momentsInfo.commentCount]]; - [commentStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12 weight:UIFontWeightMedium] range:NSMakeRange(commentText.length, commentStr.length-commentText.length)]; - [commentStr addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor textThirdColor] range:NSMakeRange(commentText.length, commentStr.length-commentText.length)]; - self.commentLabel.attributedText = commentStr; - return self.sectionView; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { - return 0.0f; -} - -- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section { - return [UIView new]; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section ==0) { - NSString *identifier = [NSString stringWithFormat:@"%@_Simple",NSStringFromClass([XPMomentsTableViewCell class])]; - XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:identifier]; - cell.delegate = self; - cell.momentsInfo = self.momentsInfo; - return cell; - } else { - if (self.datasource.count > 0) { - XPMonentsCommentTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsCommentTableViewCell class])]; - cell.commentInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; - } else { - XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - return cell; - } - } -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (indexPath.section == 1) { - if (self.datasource.count > 0) { - MonentsCommentModel* monent = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - self.commentId = monent.commentId; - self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"%@: %@",YMLocalizedString(@"XPMonentsDetailViewController3"), monent.nick]; - [self.inputBarView textViewBecomeFirstResponder]; - } - } -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - [_keyboardManager hideAllBoardView]; -} - -// 点赞 -- (void)likeBtnAction { - [self.presenter likeMonent:self.momentsInfo.dynamicId status:!self.momentsInfo.isLike likedUid:self.momentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", self.momentsInfo.worldId]]; -} - -#pragma mark - XPMomentsSimpleDetailNavDelegate -/// 点击返回 -- (void)momentsSimpleDetailNavBackAction { - [self.navigationController popViewControllerAnimated:YES]; -} - -/// 点击头像 -- (void)momentsSimpleDetailNavAvatarAction { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = self.momentsInfo.uid.integerValue; - [self.navigationController pushViewController:userInfoVC animated:YES]; -} - -/// 点击更多 -- (void)momentsSimpleDetailNavMoreAction { - TTActionSheetConfig *action; - @kWeakify(self); - if (self.momentsInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMomentsSimpleDetailViewController4") clickAction:^{ - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{ - @kStrongify(self); - [self.presenter deleteMonents:self.momentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", self.momentsInfo.worldId]]; - } cancelHandler:^{}]; - }]; - } else { - action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMomentsSimpleDetailViewController6") clickAction:^{ - @kStrongify(self); - NSString * url= [NSString stringWithFormat:@"%@?reportUid=%@&source=%@", URLWithType(kReportRoomURL),self.momentsInfo.uid, @"WORLDDYNAMIC"]; - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = url; - [self.navigationController pushViewController:webVC animated:YES]; - }]; - } - [TTPopup actionSheetWithItems:@[action]]; -} - -#pragma mark - XPMonentsCommentTableViewCellDelegate -- (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickMoreReply:(MonentsCommentModel *)commentInfo { - [self.presenter getMonentsCommentReplyList:self.momentsInfo.dynamicId commentId:commentInfo.commentId timestamp:commentInfo.replyInfo.nextTimestamp]; -} - -- (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickCommon:(MonentsReplyModel *)commentInfo { - if (commentInfo) { - self.commentId = commentInfo.replyId; - self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"%@: %@",YMLocalizedString(@"XPMonentsDetailViewController3"), commentInfo.nick]; - [self.inputBarView textViewBecomeFirstResponder]; - } -} -- (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickAvatar:(NSString *)commentInfo { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = commentInfo.integerValue; - [self.navigationController pushViewController:userInfoVC animated:YES]; -} -#pragma mark - XPMomentsTableViewCellDelegate -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { - [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{ - [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; - } cancelHandler:^{ - - }]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicCommon:(MomentsInfoModel *)monentsInfo { - if (monentsInfo) { - self.commentId = nil; - self.inputBarView.inputTextView.placeholder = YMLocalizedString(@"XPMomentsSimpleDetailViewController10"); - [self.inputBarView textViewBecomeFirstResponder]; - } -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { - self.momentsInfo = monentsInfo; - [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationFade]; -} - -#pragma mark - InputBoardDataSource -//@return 点加号按钮弹出的拓展面板View，且无需设置frame -- (UIView *)keyboardManagerExtendBoardView:(QKeyboardManager *)keyboardManager { - UIView *boardView = [UIView new]; - boardView.backgroundColor = UIColor.blueColor; - return boardView; -} - -//@return 点表情按钮弹出的表情面板View，且无需设置frame -- (UIView *)keyboardManagerEmotionBoardView:(QKeyboardManager *)keyboardManager { - QEmotionBoardView *emotionView = [[QEmotionBoardView alloc] init]; - QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper]; - emotionView.emotions = faceManager.emotionArray; - emotionView.delegate = self; - if (@available(iOS 11.0, *)) { - NSBundle *bundle = [NSBundle bundleForClass:[self class]]; - emotionView.backgroundColor = [UIColor colorNamed:@"q_input_extend_bg" inBundle:bundle compatibleWithTraitCollection:nil]; - } else { - emotionView.backgroundColor = [UIColor colorWithRed:(246)/255.0f green:(246)/255.0f blue:(246)/255.0f alpha:1]; - } - return emotionView; -} - -//@return 点表情按钮弹出的表情面板View的高度 -- (CGFloat)keyboardManagerEmotionBoardHeight:(QKeyboardManager *)keyboardManager { - return 294; -} - -//@return 点加号按钮弹出的拓展面板View的高度 -- (CGFloat)keyboardManagerExtendBoardHeight:(QKeyboardManager *)keyboardManager { - return 174; -} - -- (QInputBarViewConfiguration *)inputBarViewConfiguration { - //输入条配置，子类可以重写 - QInputBarViewConfiguration *inputBarViewConfiguration = [QInputBarViewConfiguration defaultInputBarViewConfiguration]; - inputBarViewConfiguration.voiceButtonHidden = YES;//隐藏语音按钮 - inputBarViewConfiguration.extendButtonHidden = YES;//隐藏拓展按钮 - return inputBarViewConfiguration; -} - -//点击表情按钮，切换到表情面板 -- (void)inputBarView:(QInputBarView *)inputBarView onEmotionButtonClick:(UIButton *)emotionSwitchButton { - if (emotionSwitchButton.isSelected) { - [_keyboardManager switchToEmotionBoardKeyboard]; - } else { - self.commentId = nil; - _inputBarView.inputTextView.placeholder = YMLocalizedString(@"XPMomentsSimpleDetailViewController11"); - [_inputBarView textViewBecomeFirstResponder]; - } -} - -#pragma mark - QEmotionBoardViewDelegate -/** - * 选中表情时的回调 - * @param index 被选中的表情在`emotions`里的索引 - * @param emotion 被选中的表情对应的`QMUIEmotion`对象 - */ -- (void)emotionView:(QEmotionBoardView *)emotionView didSelectEmotion:(QEmotion *)emotion atIndex:(NSInteger)index { - //把😊插入到输入栏 - UIFont *font = [UIFont systemFontOfSize:17.5]; - NSTextAttachment * emotionAtt = [[NSTextAttachment alloc] init]; - UIImage *iconImage = emotion.image; - emotionAtt.bounds = CGRectMake(0, roundf(font.capHeight - emotion.image.size.width)/2.f, emotion.image.size.width, emotion.image.size.height); - emotionAtt.image = iconImage; - emotionAtt.imageName = emotion.displayName; - NSAttributedString *emotionAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)emotionAtt]; - - [_inputBarView insertEmotionAttributedString:emotionAttribute]; -} - -// 删除按钮的点击事件回调 -- (void)emotionViewDidSelectDeleteButton:(QEmotionBoardView *)emotionView { - if (![_inputBarView deleteEmotion]){ - //根据当前的光标，这次点击删除按钮并没有删除表情，那么就删除文字 - [_inputBarView.inputTextView deleteBackward]; - } -} - -// 发送按钮的点击事件回调 -- (void)emotionViewDidSelectSendButton:(QEmotionBoardView *)emotionView { - [self sendTextMessage:[_inputBarView textViewInputNormalText]]; -} - - -#pragma mark - -/** - * 点击了系统键盘的发送按钮 - * @param inputNormalText ："害~你好啊[微笑]" - */ -- (void)inputBarView:(QInputBarView *)inputBarView onKeyboardSendClick:(NSString *)inputNormalText { - [self sendTextMessage:inputNormalText]; -} - -#pragma mark - XPMonentsDetailProtocol -- (void)getMonentsDetailSuccess:(MomentsInfoModel *)commentInfo { - self.momentsInfo = commentInfo; - [self.likeBtn setTitle:self.momentsInfo.likeCount forState:UIControlStateNormal]; - self.likeBtn.selected = self.momentsInfo.isLike; - [self.tableView reloadData]; -} - -- (void)getMonentsCommentListSuccess:(MonentsCommentListModel *)commentInfo state:(int)state{ - if (state == 0) { - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - - if (commentInfo.commentList.count > 0) { - [self.datasource addObjectsFromArray:commentInfo.commentList]; - } - [self.tableView reloadData]; -} - -- (void)getMonentsCommentReplyListSuccess:(MonentsCommentReplyModel *)replyInfo commentId:(nonnull NSString *)commentId { - if (commentId) { - __block MonentsCommentModel * commentInfo; - [self.datasource enumerateObjectsUsingBlock:^(MonentsCommentModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.commentId isEqualToString:commentId]) { - commentInfo = obj; - *stop = YES; - } - }]; - - if (commentInfo) { - NSMutableArray * replyList= commentInfo.replyInfo.replyList.mutableCopy; - [replyList addObjectsFromArray:replyInfo.replyList]; - commentInfo.replyInfo.replyList = replyList.copy; - commentInfo.replyInfo.leftCount = replyInfo.leftCount; - commentInfo.replyInfo.nextTimestamp = replyInfo.nextTimestamp; - commentInfo.isReloadHeight = YES; - } - [self.tableView reloadData]; - } -} - -- (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - if ([self.momentsInfo.dynamicId isEqualToString:dynamicId]) { - NSInteger count = self.momentsInfo.likeCount.integerValue; - self.momentsInfo.isLike = status; - if (status) { - count += 1; - } else { - count -= 1; - } - self.momentsInfo.likeCount = [NSString stringWithFormat:@"%ld", count]; - [self.likeBtn setTitle:self.momentsInfo.likeCount forState:UIControlStateNormal]; - self.likeBtn.selected = self.momentsInfo.isLike; - } -} - -- (void)replyMonentsSuccess { - [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:@"" status:0]; -} - -- (void)commonMonentsSuccess { - [self.presenter getMonentsCommentList:self.momentsInfo.dynamicId timestamp:@"" status:0]; -} - -- (void)deleteMonentsSuccess:(NSString *)momentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMomentsSimpleDetailViewController12")]; - [self.navigationController popViewControllerAnimated:YES]; - if (self.delegate && [self.delegate respondsToSelector:@selector(XPMomentsDetailViewController:deleteMoments:)]) { - [self.delegate XPMomentsDetailViewController:self deleteMoments:self.momentsInfo.dynamicId]; - } -} - - -#pragma mark - Getters And Setters - -- (XPMomentsSimpleDetailNav *)detailNav { - if (!_detailNav) { - _detailNav = [[XPMomentsSimpleDetailNav alloc] init]; - _detailNav.delegate = self; - _detailNav.infoModel = self.momentsInfo; - } - return _detailNav; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - NSString *identifier = [NSString stringWithFormat:@"%@_Simple",NSStringFromClass([XPMomentsTableViewCell class])]; - [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:identifier]; - [_tableView registerClass:[XPMonentsCommentTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsCommentTableViewCell class])]; - [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - } - return _tableView; -} - -- (UIView *)sectionView { - if (!_sectionView) { - _sectionView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 44)]; - _sectionView.backgroundColor = UIColorFromRGB(0xF6F7F9); - - UIView *whiteView = [[UIView alloc] initWithFrame:CGRectMake(0, 6, _sectionView.bounds.size.width, _sectionView.bounds.size.height-6)]; - whiteView.backgroundColor = UIColor.whiteColor; - [_sectionView addSubview:whiteView]; - } - return _sectionView; -} - -- (UILabel *)commentLabel { - if (!_commentLabel) { - _commentLabel = [[UILabel alloc] init]; - _commentLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _commentLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _commentLabel; -} - -- (UIButton *)likeBtn { - if (!_likeBtn) { - _likeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - _likeBtn.frame = CGRectMake(0, 0, 80, 36); - [_likeBtn setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - _likeBtn.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; -// _likeBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - [_likeBtn setImage:[UIImage imageNamed:@"monents_info_like_count_normal"] forState:UIControlStateNormal]; - [_likeBtn setImage:[UIImage imageNamed:@"monents_info_like_count_select"] forState:UIControlStateSelected]; - [_likeBtn addTarget:self action:@selector(likeBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _likeBtn; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.h deleted file mode 100644 index f55ae02..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMoentsTopicListViewController.h -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMomentsTopicListViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.m deleted file mode 100644 index 2075eab..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsTopicListViewController.m +++ /dev/null @@ -1,166 +0,0 @@ -// -// YMMoentsTopicListViewController.m -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "XPMomentsTopicListViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -///Model -#import "MomentsTopicModel.h" -///View -#import "XPMomentTopicContainerViewController.h" -///P -#import "XPMomentsTopicListPresenter.h" -#import "XPMomentsTopicListProtocol.h" - -@interface XPMomentsTopicListViewController () -@property (nonatomic,strong) UITableView *tableView; -@property (nonatomic,strong) NSMutableArray *datasource; -@property (nonatomic,assign) int page; -@end - -@implementation XPMomentsTopicListViewController - -- (__kindof id)createPresenter { - return [[XPMomentsTopicListPresenter alloc] init]; -} - - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHeaderAndFooterRefresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)initHeaderAndFooterRefresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -- (void)headerRefresh { - self.page = 1; - [self.presenter getMoentsTopicList:self.page pageSize:20 state:0]; -} - -- (void)footerRefresh { - self.page++; - [self.presenter getMoentsTopicList:self.page pageSize:20 state:1]; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMoentsTopicListViewController0"); - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 50; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([UITableViewCell class])]; - if (cell == nil) { - cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([UITableViewCell class])]; - } - MomentsTopicModel * topicModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.textLabel.text = [NSString stringWithFormat:@"#%@", topicModel.name]; - cell.textLabel.textColor = [DJDKMIMOMColor mainTextColor]; - cell.textLabel.font = [UIFont systemFontOfSize:13]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - MomentsTopicModel * topicModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - XPMomentTopicContainerViewController * topicVC = [[XPMomentTopicContainerViewController alloc] init]; - topicVC.worldId = topicModel.tId; - [self.navigationController pushViewController:topicVC animated:YES]; - } -} - -#pragma mark - XPMonentsTopicListProtocol -- (void)getMomentsTopicListSuccess:(NSArray *)list state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - [self.datasource removeAllObjects]; - } else { - if (list.count <= 0) { - [self showErrorToast:YMLocalizedString(@"XPMoentsTopicListViewController1")]; - } - [self.tableView.mj_footer endRefreshing]; - } - - if (list.count > 0) { - [self.datasource addObjectsFromArray:list]; - } - - [self.tableView reloadData]; -} - -- (void)getMomentsTopicFail:(NSString *)message state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:NSStringFromClass([UITableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - - - -@end diff --git a/YuMi/Modules/YMMonents/View/XPMomentsViewController.h b/YuMi/Modules/YMMonents/View/XPMomentsViewController.h deleted file mode 100644 index abc8665..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMonentsViewController.h -// YUMI -// -// Created by YUMI on 2022/5/11. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMomentsViewController : BaseViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMomentsViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsViewController.m deleted file mode 100644 index f3d1ced..0000000 --- a/YuMi/Modules/YMMonents/View/XPMomentsViewController.m +++ /dev/null @@ -1,298 +0,0 @@ -// -// XPMonentsViewController.m -// xplan-ios -// -// Created by 冯硕 on 2022/5/11. -// - -#import "XPMomentsViewController.h" -///Third -#import -#import -#import -#import - -///Tool -#import "AttachMentModel.h" -#import "MonentsUnReadModel.h" -///View -#import "XPMomentsRecommendViewController.h" -#import "XPMomentsAttentionViewController.h" -#import "XPMomentsLatestViewController.h" -#import "XPMonentsInteractiveViewController.h" -#import "XPMonentsPublishViewController.h" - - -@interface XPMomentsViewController () -///标题 -@property (nonatomic,strong) NSArray *titles; -///导航栏 -@property (nonatomic,strong) UIView * navView; -///显示小红点 -@property (nonatomic,strong) UIView * dotView; -///消息的 -@property (nonatomic,strong) UIButton *messageButton; -///滑块 -@property (nonatomic,strong) JXCategoryTitleView *titleView; -@property (nonatomic, strong) JXCategoryListContainerView *listContainerView; - -///发布的按钮 -@property (nonatomic,strong) UIButton *publishButton; -///关注 -@property (nonatomic,strong) XPMomentsAttentionViewController *attentionVC ; -///最新的 -@property (nonatomic,strong) XPMomentsLatestViewController *latestVC; -///推荐 -@property (nonatomic,strong) XPMomentsRecommendViewController *recommendVC; -@end - -@implementation XPMomentsViewController - -- (void)dealloc { - [[NIMSDK sharedSDK].systemNotificationManager removeDelegate:self]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [[NIMSDK sharedSDK].systemNotificationManager addDelegate:self]; - [self setupTopTheme]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)setupTopTheme { - __block UIImageView *theme = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(140))]; - theme.image = [[ClientConfig shareConfig] navigationAreaBG]; - theme.contentMode = UIViewContentModeScaleAspectFill; - [self.view addSubview:theme]; - - [[NSNotificationCenter defaultCenter] addObserverForName:[ClientConfig shareConfig].reloadNavigationAreaImageKey - object:nil - queue:[NSOperationQueue mainQueue] - usingBlock:^(NSNotification * _Nonnull notification) { - if ([notification.object isKindOfClass:[UIImage class]]) { - theme.image = (UIImage *)notification.object; - } - }]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [[ClientConfig shareConfig] bgColor]; - - [self.view addSubview:self.navView]; - [self.view addSubview:self.listContainerView]; - [self.view addSubview:self.publishButton]; - - [self.navView addSubview:self.titleView]; - [self.navView addSubview:self.messageButton]; - [self.navView addSubview:self.dotView]; - self.dotView.hidden = self.tabBarItem.badgeValue == 0; -} - -- (void)initSubViewConstraints { - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(44+[UIApplication sharedApplication].keyWindow.safeAreaInsets.top); - }]; - - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.navView); - make.height.mas_equalTo(45); - make.bottom.mas_equalTo(self.navView);//.offset(kSafeAreaTopHeight + 20); - }]; - - [self.messageButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.titleView); - make.trailing.mas_equalTo(self.navView).offset(-15); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - - [self.dotView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(10, 10)); - make.centerY.mas_equalTo(self.messageButton.mas_top); - make.centerX.mas_equalTo(self.messageButton.mas_trailing); - }]; - - [self.listContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.navView.mas_bottom); - }]; - - [self.publishButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(45, 45)); - make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 70); - make.trailing.mas_equalTo(self.view).offset(-15); - }]; -} - -#pragma mark - JXCategoryListContainerViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - - -// 根据下标 index 返回对应遵守并实现 `JXCategoryListContentViewDelegate` 协议的列表实例 -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - UIViewController * list = (UIViewController *)[self.listContainerView.validListDict objectForKey:[NSNumber numberWithInteger:index]]; - if (list) { - return list; - } else { - if (index == 0) { - return self.recommendVC; - }else if (index == 1) { - return self.attentionVC; - } else if(index == 2) { - return self.latestVC; - } - return nil; - } - -} - -#pragma mark -NIMSystemNotificationManagerDelegate -- (void)onReceiveCustomSystemNotification:(NIMCustomSystemNotification *)notification { - if (notification.receiverType == NIMSessionTypeP2P) { - if (notification.content != nil) { - AttachmentModel *attachment = [AttachmentModel modelWithJSON:notification.content]; - if (attachment.first == CustomMessageType_Monents && attachment.second == Custom_Message_Sub_Monents_Unread_Update) { - MonentsUnReadModel * unreadModel = [MonentsUnReadModel modelWithDictionary:attachment.data]; - if (unreadModel.total > 0) { - self.dotView.hidden = NO; - } else { - self.dotView.hidden = YES; - } - [self setTabBarItemBadge:unreadModel.total]; - } - } - } -} - -- (void)setTabBarItemBadge:(NSInteger)value { - if (value > 0) { - if (value > 99) { - [self.tabBarItem setBadgeValue:@"99+"]; - } else { - [self.tabBarItem setBadgeValue:[NSString stringWithFormat:@"%ld", value]]; - } - } else { - [self.tabBarItem setBadgeValue:nil]; - } -} - -#pragma mark - Event Response -- (void)messageButtonAction:(UIButton *)sender { - XPMonentsInteractiveViewController * messageVC = [[XPMonentsInteractiveViewController alloc] init]; - [self.navigationController pushViewController:messageVC animated:YES]; -} - -- (void)publishButtonAction:(UIButton *)sender { - XPMonentsPublishViewController * publishVC = [[XPMonentsPublishViewController alloc] init]; - [self.navigationController pushViewController:publishVC animated:YES]; -} - -#pragma mark - Getters And Setters -- (JXCategoryListContainerView *)listContainerView { - if (!_listContainerView) { - _listContainerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _listContainerView.listCellBackgroundColor = [UIColor clearColor]; - } - return _listContainerView; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] initWithFrame:CGRectZero]; - _titleView.backgroundColor =[UIColor clearColor]; - _titleView.delegate = self; - _titleView.titleColor = UIColorFromRGB(0x313131); - _titleView.titleSelectedColor = UIColorFromRGB(0x313131); - _titleView.titleFont = kFontRegular(16); - _titleView.titleSelectedFont = kFontBold(20); - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleBottom; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.averageCellSpacingEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.cellSpacing = 26; - _titleView.titles = self.titles; - _titleView.listContainer = self.listContainerView; - _titleView.defaultSelectedIndex = 2; - _titleView.contentEdgeInsetLeft = 16; - } - return _titleView; -} - -- (UIView *)navView { - if (!_navView) { - _navView = [[UIView alloc] init]; - _navView.backgroundColor = [UIColor clearColor]; - } - return _navView; -} - -- (NSArray *)titles { - if (!_titles) { - _titles = @[YMLocalizedString(@"XPMonentsViewController2"), YMLocalizedString(@"XPMonentsViewController1"), YMLocalizedString(@"XPMonentsViewController3")]; - } - return _titles; -} - -- (UIButton *)messageButton { - if (!_messageButton) { - _messageButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_messageButton setImage:[UIImage imageNamed:@"monents_nav_interavtive_message"] forState:UIControlStateNormal]; - [_messageButton setImage:[UIImage imageNamed:@"monents_nav_interavtive_message"] forState:UIControlStateSelected]; - [_messageButton addTarget:self action:@selector(messageButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _messageButton; -} - -- (UIView *)dotView { - if (!_dotView) { - _dotView = [[UIView alloc] init]; - _dotView.backgroundColor = UIColorFromRGB(0xFF2D55); - _dotView.layer.masksToBounds = YES; - _dotView.layer.cornerRadius = 5; - _dotView.hidden = YES; - } - return _dotView; -} - -- (UIButton *)publishButton { - if (!_publishButton) { - _publishButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_publishButton setImage:[UIImage imageNamed:@"monents_publish"] forState:UIControlStateNormal]; - [_publishButton setImage:[UIImage imageNamed:@"monents_publish"] forState:UIControlStateSelected]; - [_publishButton addTarget:self action:@selector(publishButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _publishButton; -} - -- (XPMomentsAttentionViewController *)attentionVC { - if (!_attentionVC) { - XPMomentsAttentionViewController * attentionVC = [[XPMomentsAttentionViewController alloc] init]; - _attentionVC = attentionVC; - } - return _attentionVC; -} - -- (XPMomentsLatestViewController *)latestVC { - if (!_latestVC) { - _latestVC = [[XPMomentsLatestViewController alloc] init]; - } - return _latestVC; -} - -- (XPMomentsRecommendViewController *)recommendVC { - if (!_recommendVC) { - _recommendVC = [[XPMomentsRecommendViewController alloc] init]; - } - return _recommendVC; -} - - -@end diff --git a/YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.h b/YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.h deleted file mode 100644 index f77df9d..0000000 --- a/YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMonentsInteractiveViewController.h -// YUMI -// -// Created by YUMI on 2022/5/18. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPMonentsInteractiveViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.m deleted file mode 100644 index 87f220b..0000000 --- a/YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.m +++ /dev/null @@ -1,214 +0,0 @@ -// -// YMMonentsInteractiveViewController.m -// YUMI -// -// Created by YUMI on 2022/5/18. -// - -#import "XPMonentsInteractiveViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -#import "ClientConfig.h" -///Model -#import "MonentsInteractiveModel.h" -///P -#import "XPMonentsInteractivePresenter.h" -#import "XPMonentsInteractiveProtocol.h" -///View -#import "XPMonentsInteractiveTableViewCell.h" -#import "XPMomentsEmptyTableViewCell.h" -#import "XPMomentsDetailViewController.h" -#import "XPMomentsSimpleDetailViewController.h" - -@interface XPMonentsInteractiveViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前的页数 -@property (nonatomic,assign) NSInteger page; -///是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -@end - -@implementation XPMonentsInteractiveViewController - -- (__kindof id)createPresenter { - return [[XPMonentsInteractivePresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPMonentsInteractiveViewController0"); - [self.view addSubview:self.tableView]; - [self addNavigationItemWithImageNames:@[@"monents_interactive_delete_message"] isLeft:NO target:self action:@selector(rightButtonAction:) tags:nil]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - self.page = 1; - [self.presenter getMonentsInteractiveList:@"" pageSize:20 state:0]; -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMonentsInteractiveViewController1")]; - [self.tableView.mj_footer endRefreshing]; - return; - } - self.page++; - NSString * dynamicId = @""; - if (self.datasource.count > 0) { - MonentsInteractiveModel * model = [self.datasource lastObject]; - dynamicId = model.dynamicId; - } - [self.presenter getMonentsInteractiveList:dynamicId pageSize:20 state:1]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - MonentsInteractiveModel * model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return model.worldName.length > 0? 130 : 90; - } - return KScreenHeight - kNavigationHeight; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMonentsInteractiveTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMonentsInteractiveTableViewCell class])]; - MonentsInteractiveModel * model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.interactiveInfo = model; - return cell; - } - XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - MonentsInteractiveModel * model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - MomentsInfoModel * monents = [[MomentsInfoModel alloc] init]; - monents.dynamicId = model.dynamicId; - - XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; - detailVC.momentsInfo = monents; - [self.navigationController pushViewController:detailVC animated:YES]; - } -} -#pragma mark -JXCategoryListContainerViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - XPMonentsLatestProtocol -- (void)getMonentsInteractiveListSueccess:(NSArray *)array state:(int)state{ - if (state == 0) { - [self.datasource removeAllObjects]; - } - if (array.count > 0) { - [self.datasource addObjectsFromArray:array]; - } - - if (state == 0) { - self.hasNoMoreData = NO; - [self.tableView.mj_header endRefreshing]; - } else { - if (array.count > 0) { - self.hasNoMoreData = NO; - } else { - self.hasNoMoreData = YES; - } - [self.tableView.mj_footer endRefreshing]; - } - [self.tableView reloadData]; -} - -- (void)getMonentsInteractiveListFail:(NSString *)msg state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -- (void)clearInteractiveMessageSuccess { - [self.datasource removeAllObjects]; - [self.tableView reloadData]; -} - -#pragma mark - Event Response -- (void)rightButtonAction:(UIButton *)sender { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsInteractiveViewController2") confirmHandler:^{ - [[self presenter] clearInteractiveMessage]; - } cancelHandler:^{ - }]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMonentsInteractiveTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMonentsInteractiveTableViewCell class])]; - [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - } - return _tableView; -} - - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} -@end diff --git a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.h b/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.h deleted file mode 100644 index 04bf7a9..0000000 --- a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMMonentsPublishViewController.h -// YUMI -// -// Created by YUMI on 2022/7/1. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@class MomentsTopicModel; -@interface XPMonentsPublishViewController : MvpViewController -@property (nonatomic,strong, nullable) MomentsTopicModel *topicInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m deleted file mode 100644 index b1e28d4..0000000 --- a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m +++ /dev/null @@ -1,550 +0,0 @@ -// -// YMMonentsPublishViewController.m -// YUMI -// -// Created by YUMI on 2022/7/1. -// - -#import "XPMonentsPublishViewController.h" -///Third -#import -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "Api+Mine.h" -#import "UploadFile.h" -#import "TTPopup.h" -#import "NSArray+Safe.h" -#import "ClientConfig.h" -#import "NSMutableDictionary+Saft.h" -///Model -#import "MomentsTopicModel.h" -#import "MonentsPicResInfo.h" -///View -#import "XPMonentsPublishCollectionViewCell.h" -#import "XPMonentsPublishTopicView.h" -#import "XPMoentsTopicListView.h" -#import "XPMonentPublishSuccessView.h" - -///P -#import "XPMonentsPublishPresenter.h" -#import "XPMonentsPublishProtocol.h" -#define itemWidth (KScreenWidth - 10 * 2 - 15 * 2) / 3.0 // item 宽度 - -@interface XPMonentsPublishViewController () -///显示内容 -@property (nonatomic,strong) UIView * contentView; -///导航栏 -@property (nonatomic,strong) UIView * navView; -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///显示文本 -@property (nonatomic,strong) UILabel *titleLabel; -///发布按钮 -@property (nonatomic,strong) UIButton *publishButton; -///显示文本 -@property (nonatomic, strong) SZTextView *textView; -///限制文字 -@property (nonatomic,strong) UILabel *limitLabel; -///分割线 -@property (nonatomic,strong) UIView * lineView; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///添加话题 -@property (nonatomic,strong) XPMonentsPublishTopicView *addTopicView; -///描述 -@property (nonatomic,strong) UILabel *descriptionLabel; -///是否已经编辑过了 -@property (nonatomic,assign) BOOL isEdited; -///添加 -@property (nonatomic,strong) UIImage *addPicImage; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///图片的源 -@property (nonatomic,strong) NSMutableArray *originAssets; -///图片的上传链接 -@property (nonatomic,strong) NSArray *uploadImageList; -///上传的个数 -@property (nonatomic,assign) int imageCount; -@end - -@implementation XPMonentsPublishViewController - -- (__kindof id)createPresenter { - return [[XPMonentsPublishPresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.navView]; - [self.view addSubview:self.contentView]; - - [self.contentView addSubview:self.textView]; - [self.contentView addSubview:self.limitLabel]; - [self.contentView addSubview:self.lineView]; - [self.contentView addSubview:self.collectionView]; - [self.contentView addSubview:self.addTopicView]; - [self.contentView addSubview:self.descriptionLabel]; - - [self.navView addSubview:self.backButton]; - [self.navView addSubview:self.titleLabel]; - [self.navView addSubview:self.publishButton]; - - [self.datasource addObject:self.addPicImage]; - - for (id view in self.textView.subviews) { - if ([view isKindOfClass:[UITextView class]]){ - UITextView *textView = view; - textView.textAlignment = NSTextAlignmentLeft; - break; - } - } -} - -- (void)initSubViewConstraints { - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).mas_offset(10); - make.top.mas_equalTo(statusbarHeight); - make.height.width.mas_equalTo(44); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.navView); - make.centerY.mas_equalTo(self.backButton); - }]; - - [self.publishButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.view).offset(-15); - make.centerY.mas_equalTo(self.titleLabel); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.navView.mas_bottom); - make.bottom.mas_equalTo(self.view); - }]; - - - [self.textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.contentView).offset(10); - make.height.mas_equalTo(150); - }]; - - [self.limitLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.textView.mas_bottom).offset(5); - make.trailing.mas_equalTo(self.textView); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.limitLabel.mas_bottom).offset(10); - make.leading.trailing.mas_equalTo(self.textView); - make.height.mas_equalTo(1); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.lineView.mas_bottom).offset(10); - make.height.mas_equalTo(itemWidth); - }]; - - [self.addTopicView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.collectionView.mas_bottom).offset(15); - make.height.mas_equalTo(20); - }]; - - [self.descriptionLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(20); - make.bottom.mas_equalTo(self.view).offset(-25); - }]; -} - -- (void)uploadAlbumPicList:(NSArray *)array finish:(void(^)(NSArray *list))finish { - dispatch_semaphore_t semaphore = dispatch_semaphore_create(1); - dispatch_queue_t queue = dispatch_get_global_queue(0, 0); - NSMutableArray * dataArray = [NSMutableArray array]; - dispatch_async(queue, ^{ - for (UIImage * image in array) { - dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); - NSData *data = UIImageJPEGRepresentation(image, 0.5); - NSString *format = [UIImage getImageTypeWithImageData:data]; - NSString *name = [NSString stringWithFormat:@"image/%@.%@",[NSString createUUID],format]; - [[UploadFile share]QCloudUploadImage:data named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) { - dispatch_semaphore_signal(semaphore); - self.imageCount ++; - NSMutableDictionary *dict = [NSMutableDictionary dictionary]; - if (image.size.width > 0){ - [dict safeSetObject:@(image.size.width) forKey:@"width"]; - } - if (image.size.height){ - [dict safeSetObject:@(image.size.height) forKey:@"height"]; - } - if (key.length > 0) { - [dict safeSetObject:key forKey:@"resUrl"]; - } - [dict safeSetObject:format forKey:@"format"]; - [dataArray addObject:dict]; - if (self.imageCount == array.count) { - dispatch_async(dispatch_get_main_queue(), ^{ - finish(dataArray); - }); - } - } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) { - self.imageCount ++; - dispatch_semaphore_signal(semaphore); - }]; - } - }); -} - -#pragma mark - UITextViewDelegate -- (void)textViewDidChange:(UITextView *)textView { - if (textView.text.length > 500) { - [self showErrorToast:YMLocalizedString(@"XPMonentsPublishViewController0")]; - textView.text = [textView.text substringToIndex:500]; - } - self.limitLabel.text = [NSString stringWithFormat:@"%lu/%ld",((unsigned long)textView.text.length), (long)500]; - self.isEdited = textView.text.length > 0; -} - -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPMonentsPublishCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMonentsPublishCollectionViewCell class]) forIndexPath:indexPath]; - UIImage * image = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (indexPath.row == (self.datasource.count -1)) { - cell.isShowDelete = self.datasource.count == 9; - } else { - cell.isShowDelete = YES; - } - cell.image = image; - cell.delegate = self; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (indexPath.row == (self.datasource.count -1) && self.datasource.count != 9) { - [self.textView resignFirstResponder]; - TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self]; - imagePickerVc.modalPresentationStyle = UIModalPresentationOverFullScreen; - imagePickerVc.allowPickingVideo = NO; - imagePickerVc.allowTakeVideo = NO; - imagePickerVc.maxImagesCount = 9; - imagePickerVc.allowPickingGif = NO; - imagePickerVc.naviBgColor = [DJDKMIMOMColor appCellBackgroundColor]; - imagePickerVc.naviTitleColor = [DJDKMIMOMColor mainTextColor]; - imagePickerVc.barItemTextColor = [DJDKMIMOMColor mainTextColor]; - imagePickerVc.selectedAssets = self.originAssets; - [self presentViewController:imagePickerVc animated:YES completion:nil]; - } -} - -#pragma mark - XPMonentsPublishCollectionViewCellDelegate -- (void)XPMonentsPublishCollectionViewCell:(XPMonentsPublishCollectionViewCell *)view didDeleteItem:(UIImage *)image { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsPublishViewController1") confirmHandler:^{ - if ([self.datasource containsObject:image]) { - [self.datasource xpSafeRemoveObject:image]; - } - NSIndexPath * indexPath = [self.collectionView indexPathForCell:view]; - if (indexPath.row < self.originAssets.count) { - [self.originAssets xpSafeRemoveObjectAtIndex:indexPath.row]; - } - - [self.collectionView reloadData]; - if (self.datasource.count > 1) { - self.isEdited = YES; - } else { - self.isEdited = NO; - } - } cancelHandler:^{ - - }]; -} - -#pragma mark - TZImagePickerControllerDelegate -- (BOOL)isAssetCanBeDisplayed:(PHAsset *)asset { - return ![[asset valueForKey:@"filename"] containsString:@"GIF"]; -} - -- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray *)infos { - [self.datasource removeAllObjects]; - [self.originAssets removeAllObjects]; - [self.datasource addObjectsFromArray:photos]; - [self.originAssets addObjectsFromArray:assets]; - if (self.datasource.count >= 9) { - if ([self.datasource containsObject:self.addPicImage]) { - [self.datasource removeObject:self.addPicImage]; - } - } else { - if (![self.datasource containsObject:self.addPicImage]) { - [self.datasource addObject:self.addPicImage]; - } - } - - int page = (int)self.datasource.count / 3; - int scale = self.datasource.count % 3; - CGFloat height; - if (scale == 0) { - height = (itemWidth + 10) * page; - } else { - height = (itemWidth + 10) * (page + 1); - } - - [self.collectionView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(height); - }]; - [self.collectionView reloadData]; - if (self.datasource.count > 1) { - self.isEdited = YES; - } else { - self.isEdited = NO; - } - NSArray * array; - if([self.datasource containsObject:self.addPicImage] && self.datasource.count > 1){ - array = [self.datasource subarrayWithRange:NSMakeRange(0, self.datasource.count - 1)]; - }else if(![self.datasource containsObject:self.addPicImage] && self.datasource.count == 9){ - array = self.datasource; - } - self.uploadImageList = array; -} - -#pragma mark - XPMonentsPublishTopicViewDelegate -- (void)xPMonentsPublishTopicView:(XPMonentsPublishTopicView *)view didClickCloseButton:(UIButton *)sender { - self.topicInfo = nil; -} - -- (void)xPMonentsPublishTopicView:(XPMonentsPublishTopicView *)view didClickChooseTopic:(UIButton *)sender { - [self.textView resignFirstResponder]; - XPMoentsTopicListView * topicListView = [[XPMoentsTopicListView alloc] init]; - topicListView.delegate = self; - [TTPopup popupView:topicListView style:TTPopupStyleActionSheet]; -} - -#pragma mark - XPMoentsTopicListViewDelegate -- (void)xPMoentsTopicListView:(XPMoentsTopicListView *)view didSelectItem:(MomentsTopicModel *)topicInfo { - [TTPopup dismiss]; - self.topicInfo = topicInfo; -} - -#pragma mark - XPMonentsPublishProtocol -- (void)publishMonentsSuccess { - XPMonentPublishSuccessView * successView = [[XPMonentPublishSuccessView alloc] init]; - TTPopupService *service = [[TTPopupService alloc] init]; - service.contentView = successView; - service.filterIdentifier = NSStringFromClass([XPMonentPublishSuccessView class]); - service.shouldFilterPopup = YES; - service.didFinishDismissHandler = ^(BOOL isDismissOnBackgroundTouch) { - [self.navigationController popViewControllerAnimated:YES]; - }; - [TTPopup popupWithConfig:service]; - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [TTPopup dismiss]; - [self.navigationController popViewControllerAnimated:YES]; - }); -} -#pragma mark - Event Response -- (void)backButtonAction:(UIButton *)sender { - if (self.isEdited) { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPMonentsPublishViewController2"); - config.message = YMLocalizedString(@"XPMomentsSimpleDetailViewController12"); - config.confirmButtonConfig.title = YMLocalizedString(@"XPMonentsPublishViewController4"); - config.cancelButtonConfig.title = YMLocalizedString(@"XPMonentsPublishViewController5"); - [TTPopup alertWithConfig:config confirmHandler:^{ - - } cancelHandler:^{ - [self.navigationController popViewControllerAnimated:YES]; - }]; - } else { - [self.navigationController popViewControllerAnimated:YES]; - } -} - - -- (void)publicButtonAction:(UIButton *)sender { - [self.view endEditing:YES]; - if (self.textView.text.length > 0 || self.uploadImageList.count > 0) { - if (self.uploadImageList.count > 0) { - [self showLoading]; - [self uploadAlbumPicList:self.uploadImageList finish:^(NSArray *list) { - [self hideHUD]; - [self.presenter publishMonents:self.topicInfo.worldId type:MomentsContentType_Picture content:self.textView.text resList:list]; - }]; - } else { - [self.presenter publishMonents:self.topicInfo.worldId type:MonentsContentType_Text content:self.textView.text resList:@[]]; - } - } else { - [self showErrorToast:YMLocalizedString(@"XPMonentsPublishViewController6")]; - } -} - -#pragma mark - Getters And Setters -- (void)setTopicInfo:(MomentsTopicModel *)topicInfo { - _topicInfo = topicInfo; - self.addTopicView.topicInfo = _topicInfo; -} - -- (UIView *)navView { - if (!_navView) { - _navView = [[UIView alloc] init]; - _navView.backgroundColor = [UIColor clearColor]; - } - return _navView; -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateSelected]; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:17]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.text = YMLocalizedString(@"XPMonentsPublishViewController7"); - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (UIButton *)publishButton { - if (!_publishButton) { - _publishButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_publishButton setTitle:YMLocalizedString(@"XPMonentsPublishViewController8") forState:UIControlStateNormal]; - [_publishButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - _publishButton.titleLabel.font = [UIFont systemFontOfSize:17]; - [_publishButton addTarget:self action:@selector(publicButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _publishButton; -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = [UIColor clearColor]; - } - return _contentView; -} - - -- (UICollectionView *)collectionView { - if (!_collectionView) { - MSBaseRTLFlowLayout *flowLayout = [[MSBaseRTLFlowLayout alloc] init]; - flowLayout.minimumInteritemSpacing = 10; - flowLayout.minimumLineSpacing = 10; - flowLayout.sectionInset = UIEdgeInsetsZero; - flowLayout.itemSize = CGSizeMake(itemWidth, itemWidth); - UICollectionView *collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:flowLayout]; - collectionView.delegate = self; - collectionView.dataSource = self; - collectionView.backgroundColor = [UIColor clearColor]; - [collectionView registerClass:XPMonentsPublishCollectionViewCell.class forCellWithReuseIdentifier:NSStringFromClass([XPMonentsPublishCollectionViewCell class])]; - _collectionView = collectionView; - } - return _collectionView; -} - - -- (SZTextView *)textView { - if (!_textView) { - _textView = [[SZTextView alloc] init]; - _textView.textColor = [DJDKMIMOMColor mainTextColor]; - _textView.font = [UIFont systemFontOfSize:15]; - _textView.placeholder = [NSString stringWithFormat:@"%@...",YMLocalizedString(@"XPMonentsPublishViewController9")]; - _textView.placeholderTextColor = [DJDKMIMOMColor secondTextColor]; - _textView.backgroundColor = [UIColor clearColor]; - _textView.delegate = self; - } - return _textView; -} - -- (UILabel *)limitLabel { - if (!_limitLabel) { - _limitLabel = [[UILabel alloc] init]; - _limitLabel.text = @"0/500"; - _limitLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _limitLabel.font = [UIFont systemFontOfSize:12]; - _limitLabel.textAlignment = NSTextAlignmentRight; - } - return _limitLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (UILabel *)descriptionLabel { - if (!_descriptionLabel) { - _descriptionLabel = [[UILabel alloc] init]; - _descriptionLabel.text = YMLocalizedString(@"XPMonentsPublishViewController10"); - _descriptionLabel.font = [UIFont systemFontOfSize:11]; - _descriptionLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _descriptionLabel.textAlignment = NSTextAlignmentCenter; - _descriptionLabel.numberOfLines = 0; - } - return _descriptionLabel; -} - -- (XPMonentsPublishTopicView *)addTopicView { - if (!_addTopicView) { - _addTopicView = [[XPMonentsPublishTopicView alloc] init]; - _addTopicView.delegate = self; - } - return _addTopicView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -- (UIImage *)addPicImage { - if (!_addPicImage) { - _addPicImage = [UIImage imageNamed:@"mine_user_info_album_add"]; - } - return _addPicImage; -} - -- (NSMutableArray *)originAssets { - if (!_originAssets) { - _originAssets = [NSMutableArray array]; - } - return _originAssets; -} -@end diff --git a/YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.h b/YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.h deleted file mode 100644 index 0e94600..0000000 --- a/YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMonentsTopicLatestViewController.h -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "MvpViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN - -@interface XPMonentsTopicLatestViewController : MvpViewController -@property (nonatomic,copy) NSString *worldId; -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.m deleted file mode 100644 index 3e078a2..0000000 --- a/YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.m +++ /dev/null @@ -1,342 +0,0 @@ -// -// XPMonentsTopicLatestViewController.m -// xplan-ios -// -// Created by 冯硕 on 2022/8/18. -// - -#import "XPMonentsTopicLatestViewController.h" -///Third -#import -#import -///Tool - -#import "XPMomentsLayoutConfig.h" -#import "TTPopup.h" -///Model -#import "MomentsListInfoModel.h" -///P -#import "XPMonentsTopicLatestPresenter.h" -#import "XPMonentsTopicLatestProtocol.h" -///View -#import "XPMomentsTableViewCell.h" -#import "XPMomentsEmptyTableViewCell.h" -#import "XPMomentsDetailViewController.h" - -@interface XPMonentsTopicLatestViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///数据信息 -@property (nonatomic,strong) MomentsListInfoModel *listInfo; -@end - -@implementation XPMonentsTopicLatestViewController --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} -- (BOOL)isHiddenNavBar { - return YES; -} - -- (__kindof id)createPresenter { - return [[XPMonentsTopicLatestPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(refreshDynamicData:) name:@"kRefreshDynamicData" object:nil]; - -} --(void)refreshDynamicData:(NSNotification *)not{ - NSDictionary *refreshData = not.object; - int type = [refreshData[@"type"] intValue]; - ///type,0=点赞，1=删除，2=屏蔽，3=评论 - switch (type) { - case 0: - { - - NSString *dynamicId = refreshData[@"dynamicId"]; - BOOL status = [refreshData[@"status"] boolValue]; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.dynamicId isEqualToString:dynamicId]) { - if (status) { - obj.isLike = YES; - obj.likeCount = [NSString stringWithFormat:@"%ld",obj.likeCount.integerValue + 1]; - } else { - obj.likeCount = [NSString stringWithFormat:@"%ld",(obj.likeCount.integerValue - 1 >= 0) ? (obj.likeCount.integerValue - 1) : 0]; - obj.isLike = NO; - } - *stop = YES; - } - }]; - - [self.tableView reloadData]; - break; - } - case 1: - { - - NSString *dynamicId = refreshData[@"dynamicId"]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == dynamicId.integerValue) { - deleteInfo = obj; - - *stop = YES; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } - break; - } - case 2: - { - NSString *dynamicId = refreshData[@"dynamicId"]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == dynamicId.integerValue) { - deleteInfo = obj; - *stop = YES; - - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } - break; - } - default: - { - NSString *dynamicId = refreshData[@"dynamicId"]; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.dynamicId isEqualToString:dynamicId]) { - obj.commentCount = [NSString stringWithFormat:@"%ld",obj.commentCount.integerValue + 1]; - *stop = YES; - } - }]; - - [self.tableView reloadData]; - break; - } - } -} -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - [self.presenter getMonentsTopicLatestList:@"" worldId:self.worldId state:0]; -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMonentsTopicLatestViewController0")]; - [self.tableView.mj_footer endRefreshing]; - return; - } - [self.presenter getMonentsTopicLatestList:self.listInfo.nextDynamicId worldId:self.worldId state:1]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - MomentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMomentsLayoutConfig layoutMomentsModel:monentInfo]; - if(monentInfo.squareTop && monentInfo.content.length == 0){ - return monentInfo.rowHeight + 20 ; - }else{ - return monentInfo.rowHeight; - } - } - return KScreenHeight - kNavigationHeight - 49 - kSafeAreaBottomHeight; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - cell.momentsInfo = monentsInfo; - return cell; - } - XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; - MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - detailVC.momentsInfo = monentsInfo; - [self.navigationController pushViewController:detailVC animated:YES]; - } -} -#pragma mark - XPMomentsTableViewCellDelegate -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)monentsInfo{ - [self showLoading]; - [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { - [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{ - [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; - } cancelHandler:^{ - - }]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { - __block MomentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { - monentsInfos = obj; - *stop = YES; - } - }]; - if (monentsInfos) { - NSInteger row = [self.datasource indexOfObject:monentsInfo]; - [self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:row inSection:0]] withRowAnimation:UITableViewRowAnimationFade]; - } -} - -#pragma mark - JXPagingViewListViewDelegate -- (UIScrollView *)listScrollView { - return self.tableView; -} - -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - self.scrollCallback = callback; -} - -- (UIView *)listView { - return self.view; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - self.scrollCallback(scrollView); -} - - - -#pragma mark - XPMonentsTopicLatestProtocol -- (void)getMonentsTopicLatestListSuccess:(MomentsListInfoModel *)listInfo state:(int)state{ - self.listInfo = listInfo; - if (state == 0) { - [self.datasource removeAllObjects]; - } - if (listInfo.dynamicList.count > 0) { - [self.datasource addObjectsFromArray:listInfo.dynamicList]; - } - - if (state == 0) { - self.hasNoMoreData = NO; - [self.tableView.mj_header endRefreshing]; - } else { - if (listInfo.dynamicList.count > 0) { - self.hasNoMoreData = NO; - } else { - self.hasNoMoreData = YES; - } - [self.tableView.mj_footer endRefreshing]; - } - [self.tableView reloadData]; -} - -- (void)getMonentsTopicLatestListFail:(NSString *)msg state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -- (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - - ///type,0=点赞，1=删除，2=屏蔽，3=评论 - [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":dynamicId,@"type":@"0",@"status":@(status)}]; -} -- (void)requesstShieldingSuccess:(NSString *)monentsInfo{ - [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; - ///type,0=点赞，1=删除，2=屏蔽，3=评论 - [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":monentsInfo,@"type":@"2"}]; -} -- (void)deleteMonentsSuccess:(NSString *)monentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMonentsTopicLatestViewController2")]; - ///type,0=点赞，1=删除，2=屏蔽，3=评论 - [[NSNotificationCenter defaultCenter]postNotificationName:@"kRefreshDynamicData" object:@{@"dynamicId":monentsInfo,@"type":@"1"}]; - -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - } - return _tableView; -} - - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.h b/YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.h deleted file mode 100644 index 1589a9c..0000000 --- a/YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMMonentsTopicRecommondViewController.h -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "MvpViewController.h" -#import -NS_ASSUME_NONNULL_BEGIN - -@interface XPMonentsTopicRecommondViewController : MvpViewController -@property (nonatomic,strong) NSString *worldId; - -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.m deleted file mode 100644 index 309355b..0000000 --- a/YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.m +++ /dev/null @@ -1,302 +0,0 @@ -// -// XPMonentsTopicRecommondViewController.m -// xplan-ios -// -// Created by 冯硕 on 2022/8/18. -// - -#import "XPMonentsTopicRecommondViewController.h" -///Third -#import -#import -///Tool - -#import "XPMomentsLayoutConfig.h" -#import "TTPopup.h" -///Model -#import "MomentsListInfoModel.h" -///P -#import "XPMonentsTopicRecommendPresenter.h" -#import "XPMonentsTopicRecommendProtocol.h" -///View -#import "XPMomentsTableViewCell.h" -#import "XPMomentsEmptyTableViewCell.h" -#import "XPMomentsDetailViewController.h" - -@interface XPMonentsTopicRecommondViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///数据信息 -@property (nonatomic,strong) MomentsListInfoModel *listInfo; -@end - -@implementation XPMonentsTopicRecommondViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (__kindof id)createPresenter { - return [[XPMonentsTopicRecommendPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - [self.presenter getMonentsTopicRecommendList:@"" worldId:self.worldId state:0]; -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPMonentsTopicRecommondViewController0")]; - [self.tableView.mj_footer endRefreshing]; - return; - } - [self.presenter getMonentsTopicRecommendList:self.listInfo.nextDynamicId worldId:self.worldId state:1]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - MomentsInfoModel * monentInfo= [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [XPMomentsLayoutConfig layoutMomentsModel:monentInfo]; - if(monentInfo.squareTop && monentInfo.content.length == 0){ - return monentInfo.rowHeight + 20 ; - }else{ - return monentInfo.rowHeight; - } - } - return KScreenHeight - kNavigationHeight - 49 - kSafeAreaBottomHeight; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPMomentsTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - cell.isTopic = YES; - cell.momentsInfo = monentsInfo; - return cell; - } - XPMomentsEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - XPMomentsDetailViewController * detailVC = [[XPMomentsDetailViewController alloc] init]; - MomentsInfoModel * monentsInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - detailVC.momentsInfo = monentsInfo; - detailVC.delegate = self; - [self.navigationController pushViewController:detailVC animated:YES]; - } -} - -#pragma mark - XPMomentsDetailViewControllerDelegate - -- (void)XPMomentsDetailViewController:(XPMomentsDetailViewController *)view deleteMoments:(NSString *)dynamicId { - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == dynamicId.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - XPMomentsTableViewCellDelegate -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicShielding:(MomentsInfoModel *)monentsInfo{ - [self showLoading]; - [self.presenter requesstShieldingWtihType:@"0" objId:monentsInfo.dynamicId]; -} -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClickLike:(MomentsInfoModel *)monentsInfo { - [self.presenter likeMonent:monentsInfo.dynamicId status:!monentsInfo.isLike likedUid:monentsInfo.uid worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicDelete:(MomentsInfoModel *)monentsInfo { - [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicRecommondViewController1") confirmHandler:^{ - [self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]]; - } cancelHandler:^{ - - }]; -} - -- (void)XPMomentsTableViewCell:(XPMomentsTableViewCell *)view didClicFold:(MomentsInfoModel *)monentsInfo { - __block MomentsInfoModel * monentsInfos; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.dynamicId.integerValue) { - monentsInfos = obj; - *stop = YES; - } - }]; - if (monentsInfos) { - NSInteger row = [self.datasource indexOfObject:monentsInfo]; - [self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:row inSection:0]] withRowAnimation:UITableViewRowAnimationFade]; - } -} - -#pragma mark - JXPagingViewListViewDelegate -- (UIScrollView *)listScrollView { - return self.tableView; -} - -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - self.scrollCallback = callback; -} - -- (UIView *)listView { - return self.view; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - self.scrollCallback(scrollView); -} - -#pragma mark - XPMomentsRecommendProtocol -- (void)getMonentsTopicRecommendListSuccess:(MomentsListInfoModel *)listInfo state:(int)state { - self.listInfo = listInfo; - if (state == 0) { - [self.datasource removeAllObjects]; - } - if (listInfo.dynamicList.count > 0) { - [self.datasource addObjectsFromArray:listInfo.dynamicList]; - } - - if (state == 0) { - self.hasNoMoreData = NO; - [self.tableView.mj_header endRefreshing]; - } else { - if (listInfo.dynamicList.count > 0) { - self.hasNoMoreData = NO; - } else { - self.hasNoMoreData = YES; - } - [self.tableView.mj_footer endRefreshing]; - } - [self.tableView reloadData]; -} - -- (void)getMonentsTopicRecommendListFail:(NSString *)msg state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } -} - -- (void)likeMonentsSuccess:(NSString *)dynamicId status:(BOOL)status { - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.dynamicId isEqualToString:dynamicId]) { - if (status) { - obj.isLike += 1; - } else { - obj.isLike -= 1; - } - *stop = YES; - } - }]; - [self.tableView reloadData]; -} --(void)requesstShieldingSuccess:(NSString *)monentsInfo{ - [self hideHUD]; - [self showSuccessToast:YMLocalizedString(@"XPMomentsMineViewController2")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} -- (void)deleteMonentsSuccess:(NSString *)monentsInfo { - [self showSuccessToast:YMLocalizedString(@"XPMonentsTopicRecommondViewController2")]; - __block MomentsInfoModel * deleteInfo; - [self.datasource enumerateObjectsUsingBlock:^(MomentsInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.dynamicId.integerValue == monentsInfo.integerValue) { - deleteInfo = obj; - } - }]; - - if (deleteInfo) { - [self.datasource removeObject:deleteInfo]; - [self.tableView reloadData]; - } -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPMomentsTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsTableViewCell class])]; - [_tableView registerClass:[XPMomentsEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPMomentsEmptyTableViewCell class])]; - } - return _tableView; -} - - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} -@end diff --git a/YuMi/Modules/YMNewHome/Api/Api+EventCenter.h b/YuMi/Modules/YMNewHome/Api/Api+EventCenter.h deleted file mode 100644 index fe77223..0000000 --- a/YuMi/Modules/YMNewHome/Api/Api+EventCenter.h +++ /dev/null @@ -1,82 +0,0 @@ -// -// Api+EventCenter.h -// YuMi -// -// Created by P on 2025/5/15. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api(EventCenter) - -/// 活動配置 -+ (void)usereventGoldConfig:(HttpRequestHelperCompletion)complection - uid:(NSString *)uid; - -/// 活动广场列表 -+ (void)usereventSquare:(HttpRequestHelperCompletion)complection - page:(NSNumber *)page - pageSize:(NSNumber *)pageSize; - -/// 我发布的活动 -+ (void)usereventMySquare:(HttpRequestHelperCompletion)complection - page:(NSNumber *)page - pageSize:(NSNumber *)pageSize - uid:(NSString *)uid; - -/// 我订阅的活动 -+ (void)usereventMySub:(HttpRequestHelperCompletion)complection - page:(NSNumber *)page - pageSize:(NSNumber *)pageSize - uid:(NSString *)uid; - -/// 房间列表 -+ (void)roomRoleListRoom:(HttpRequestHelperCompletion)complection; - - -/// <#Description#> -/// - Parameters: -/// - complection: complete block -/// - eventBanner: 活动图片 -/// - eventDetail: 活动描述内容 -/// - eventDuration: 活动时长 -/// - eventStartTimeStr: 活动开始时间，格式（yyyy-MM-dd HH:mm:ss） -/// - eventTopic: 活动标题 -/// - noticeFans: 是否通知用户粉丝，0-否，1-是 -/// - payBanner: 是否上传首页第二Banner0-否，1-是 -/// - payGoldNum: 上传首页第二Banner付款金币数 -/// - roomUid: 房间uid -/// - uid: 用户uid -+ (void)usereventPublish:(HttpRequestHelperCompletion)complection - eventBanner:(NSString *)eventBanner - eventDetail:(NSString *)eventDetail - eventDuration:(NSNumber *)eventDuration - eventStartTimeStr:(NSString *)eventStartTimeStr - eventTopic:(NSString *)eventTopic - noticeFans:(NSNumber *)noticeFans - payBanner:(NSNumber *)payBanner - payGoldNum:(NSNumber *)payGoldNum - roomUid:(NSString *)roomUid - uid:(NSString *)uid; - -/// 订阅活动 -/// - Parameters: -/// - complection: complete -/// - eventId: 活动 id -/// - subStatus: 订阅状态 0-取消订阅，1-订阅 -/// - uid: uid -+ (void)usereventSub:(HttpRequestHelperCompletion)complection - eventId:(NSNumber *)eventId - subStatus:(NSNumber *)subStatus - uid:(NSString *)uid; - -/// 删除活动 -+ (void)usereventDel:(HttpRequestHelperCompletion)complection eventId:(NSNumber *)eventId; - -+ (void)homeBanner:(HttpRequestHelperCompletion)complection uid:(NSString *)uid type:(NSString *)type activityShow:(NSNumber *)activityShow; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Api/Api+EventCenter.m b/YuMi/Modules/YMNewHome/Api/Api+EventCenter.m deleted file mode 100644 index 6872851..0000000 --- a/YuMi/Modules/YMNewHome/Api/Api+EventCenter.m +++ /dev/null @@ -1,90 +0,0 @@ -// -// Api+EventCenter.m -// YuMi -// -// Created by P on 2025/5/15. -// - -#import "Api+EventCenter.h" - -@implementation Api(EventCenter) - -/// 活動配置 -+ (void)usereventGoldConfig:(HttpRequestHelperCompletion)complection - uid:(NSString *)uid{ - [self makeRequest:@"userevent/goldConfig" - method:HttpRequestHelperMethodGET - completion:complection, __FUNCTION__, uid, nil]; -} - -/// 活动广场列表 -+ (void)usereventSquare:(HttpRequestHelperCompletion)complection - page:(NSNumber *)page - pageSize:(NSNumber *)pageSize { - [self makeRequest:@"userevent/square" - method:HttpRequestHelperMethodGET - completion:complection, __FUNCTION__, page, pageSize, nil]; -} - -/// 我发布的活动 -+ (void)usereventMySquare:(HttpRequestHelperCompletion)complection - page:(NSNumber *)page - pageSize:(NSNumber *)pageSize - uid:(NSString *)uid { - [self makeRequest:@"userevent/mysquare" - method:HttpRequestHelperMethodGET - completion:complection, __FUNCTION__, page, pageSize, uid, nil]; -} - -/// 我订阅的活动 -+ (void)usereventMySub:(HttpRequestHelperCompletion)complection - page:(NSNumber *)page - pageSize:(NSNumber *)pageSize - uid:(NSString *)uid { - [self makeRequest:@"userevent/mySub" - method:HttpRequestHelperMethodGET - completion:complection, __FUNCTION__, page, pageSize, uid, nil]; -} - -/// 房间列表 -+ (void)roomRoleListRoom:(HttpRequestHelperCompletion)complection { - [self makeRequest:@"roomrole/listroom" - method:HttpRequestHelperMethodGET - completion:complection, __FUNCTION__, nil]; -} - -+ (void)usereventPublish:(HttpRequestHelperCompletion)complection - eventBanner:(NSString *)eventBanner - eventDetail:(NSString *)eventDetail - eventDuration:(NSNumber *)eventDuration - eventStartTimeStr:(NSString *)eventStartTimeStr - eventTopic:(NSString *)eventTopic - noticeFans:(NSNumber *)noticeFans - payBanner:(NSNumber *)payBanner - payGoldNum:(NSNumber *)payGoldNum - roomUid:(NSString *)roomUid - uid:(NSString *)uid { - [self makeRequest:@"/userevent/publish" - method:HttpRequestHelperMethodPOST - completion:complection, __FUNCTION__, eventBanner, eventDetail, eventDuration, eventStartTimeStr, eventTopic, noticeFans, payBanner, payGoldNum, roomUid, uid, nil]; -} - -+ (void)usereventSub:(HttpRequestHelperCompletion)complection - eventId:(NSNumber *)eventId - subStatus:(NSNumber *)subStatus - uid:(NSString *)uid { - [self makeRequest:@"userevent/sub" method:HttpRequestHelperMethodPOST completion:complection, - __FUNCTION__, eventId, subStatus, uid, nil]; -} - -+ (void)usereventDel:(HttpRequestHelperCompletion)complection eventId:(NSNumber *)eventId { - [self makeRequest:@"userevent/del" - method:HttpRequestHelperMethodPOST - completion:complection, __FUNCTION__, eventId, nil]; -} - -+ (void)homeBanner:(HttpRequestHelperCompletion)complection uid:(NSString *)uid type:(NSString *)type activityShow:(NSNumber *)activityShow { - [self makeRequest:@"home/banner" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, type, activityShow, nil]; -} - -@end diff --git a/YuMi/Modules/YMNewHome/Api/Api+Home.h b/YuMi/Modules/YMNewHome/Api/Api+Home.h deleted file mode 100644 index aa880e2..0000000 --- a/YuMi/Modules/YMNewHome/Api/Api+Home.h +++ /dev/null @@ -1,157 +0,0 @@ -// -// Api+Home.h -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (Home) - -/// 获取首页所有的tag -/// @param complection 完成 -/// @param uid 用户的uid -+ (void)homeTagComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid; - -/// 获取首页所有的直播tag -/// @param complection 完成 -/// @param uid 用户的uid -+ (void)homeLiveTagComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid; - -/// 查看推荐列表 -/// @param complection 完成 -/// @param uid 用户的uid -/// @param tabId tabid -/// @param pageNum 当前的页数 -/// @param pageSize 一页有多少个 -+ (void)getRecommendListComplection:(HttpRequestHelperCompletion)complection - uid:(NSString *)uid - tabId:(NSString *)tabId - pageNum:(NSString *)pageNum - pageSize:(NSString *)pageSize; -/// 查看推荐列表 -/// @param complection 完成 -/// @param uid 用户的uid -/// @param tabId tabid -/// @param pageNum 当前的页数 -/// @param pageSize 一页有多少个 -+ (void)getNewRecommendListComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid tabId:(NSString *)tabId pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize; -/// 搜索 -/// @param complection 完成 -/// @param key 关键字 -/// @param type 类型 1 房间 2 用户 -/// @param page 多少页 -/// @param pageSize 每页多少个 -+ (void)searchComplection:(HttpRequestHelperCompletion)complection - key:(NSString *)key - type:(NSString *)type - page:(NSString *)page - pageSize:(NSString *)pageSize; - -/// 首页推荐的轮播图 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param type 类型 2 房间的 1 首页的 9推荐页下面的 -+ (void)homeBannerList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type; - -/// 请求推荐页资源的列表 -/// @param completion 完成 -/// @param uid 用户的uid -+ (void)homeMenuList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; - -/// 请求推荐房间列表 -/// @param completion 完成 -/// @param uid 用户的uid -+ (void)homeRecommendRoomList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; - -/// 请求个播房间列表 -/// @param completion 完成 -+ (void)homeHotRoomList:(HttpRequestHelperCompletion)completion; - -/// 请求个播放更多房间列表 -/// @param completion 完成 -+ (void)homeAnchorMoreRoomList:(HttpRequestHelperCompletion)completion singleRoomSortId:(NSString *)singleRoomSortId; - -/// 请求热门房间列表 -/// @param completion 完成 -+ (void)homePersonalRoomList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; - -/// 请求组队开黑房间列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param pageNum 当前页数 -/// @param pageSize 一页多少个 -+ (void)homePlayGameTeam:(HttpRequestHelperCompletion)completion uid:(NSString *)uid pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize; - - - -/// 请求收藏房间列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param page 当前页数 -/// @param pageSize 一页多少个 -+ (void)homeCollectRoomList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize; - -/// 首页资源位要进入的 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param rid 进入的类型的id -+ (void)homePickResource:(HttpRequestHelperCompletion)completion uid:(NSString *)uid rid:(NSString *)rid; - -/// 首页小游戏列表 -/// @param completion 完成 -/// @param pageSize 一页多少个 -/// @param pageNum 多少页 -/// @param uid 用户的uid -+ (void)homeLittleGameRoomList:(HttpRequestHelperCompletion)completion pageSize:(NSString *)pageSize pageNum:(NSString *)pageNum uid:(NSString *)uid; - -/// 快速匹配 -/// @param completion 完成 -/// @param uid 用户的uid -+ (void)homeQuickMatchLittleGame:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; - -/// 获取首页个播浏览记录 -/// @param complection 完成 -/// @param uid 用户的uid -+ (void)onceLookAnchorRoomComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid; -///首页改版资源位 -+(void)requestCurrentResourceListCompletion:(HttpRequestHelperCompletion)complection; -/// 一键匹配 -/// @param completion 完成 -+ (void)homeChatPick:(HttpRequestHelperCompletion)completion; -///发现新朋友 -+(void)requsetFriendListComplection:(HttpRequestHelperCompletion)complection; -///ip检测 -+(void)checkIpRegionComplection:(HttpRequestHelperCompletion)complection; - -#pragma mark - 首页 V3 APIs -/// 获取我的房间 -+(void)getMyRoomCompletion:(HttpRequestHelperCompletion)completion; -/// 获取我收藏的房间 -+(void)getMyCollectRoomsCompletion:(HttpRequestHelperCompletion)completion - pageNum:(NSString *)num - pageSize:(NSString *)size; -/// 获取我最近去过的房间 -+(void)getMyRecentRoomsCompletion:(HttpRequestHelperCompletion)completion - pageNum:(NSString *)num - pageSize:(NSString *)size; -/// 获取标签 -+(void)getHomeTabsCompletion:(HttpRequestHelperCompletion)completion; -/// 获取首页房间列表 -+(void)getHomeTabRoomsCompletion:(HttpRequestHelperCompletion)completion - pageNum:(NSString *)pageNum - pageSize:(NSString *)pageSize - tabId:(NSString *)tabId; -/// 获取首页聚合排行榜 -+(void)getHomeRanksCompletion:(HttpRequestHelperCompletion)completion; - -+(void)getHomeSecondBannerCompletion:(HttpRequestHelperCompletion)completion - uid:(NSString *)uid - type:(NSString *)type; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Api/Api+Home.m b/YuMi/Modules/YMNewHome/Api/Api+Home.m deleted file mode 100644 index 4e6ea27..0000000 --- a/YuMi/Modules/YMNewHome/Api/Api+Home.m +++ /dev/null @@ -1,202 +0,0 @@ -// -// Api+Home.m -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "Api+Home.h" -#import "NSMutableDictionary+Saft.h" -#import -@implementation Api (Home) - - -/// 获取首页所有的tag -/// @param complection 完成 -/// @param uid 用户的uid -+ (void)homeTagComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid { - [self makeRequest:@"home/tagV2" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, nil]; -} - -/// 获取首页所有的直播tag -/// @param complection 完成 -/// @param uid 用户的uid -+ (void)homeLiveTagComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid { - [self makeRequest:@"single/broadcast/sort" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, nil]; -} -/// 查看推荐列表 -/// @param complection 完成 -/// @param uid 用户的uid -/// @param tabId tabid -/// @param pageNum 当前的页数 -/// @param pageSize 一页有多少个 -+ (void)getRecommendListComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid tabId:(NSString *)tabId pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize { - [self makeRequest:@"home/tab/mapV2" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, tabId, pageNum, pageSize, nil]; -} -/// 查看推荐列表 -/// @param complection 完成 -/// @param uid 用户的uid -/// @param tabId tabid -/// @param pageNum 当前的页数 -/// @param pageSize 一页有多少个 -+ (void)getNewRecommendListComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid tabId:(NSString *)tabId pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize { - [self makeRequest:@"home/tab/homeV2" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, tabId, pageNum, pageSize, nil]; -} -/// 搜索 -/// @param complection 完成 -/// @param key 关键字 -/// @param type 类型 1 房间 2 用户 -/// @param page 多少页 -/// @param pageSize 每页多少个 -+ (void)searchComplection:(HttpRequestHelperCompletion)complection key:(NSString *)key type:(NSString *)type page:(NSString *)page pageSize:(NSString *)pageSize { - [self makeRequest:@"search/room" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, key, type, page, pageSize, nil]; -} - -/// 首页推荐的轮播图 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param type 类型 2 房间的 1 首页的 9推荐页下面的 -+ (void)homeBannerList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type { - [self makeRequest:@"home/banner" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, type, nil]; -} - -/// 请求推荐页资源的列表 -/// @param completion 完成 -/// @param uid 用户的uid -+ (void)homeMenuList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - [self makeRequest:@"home/currentResource" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; -} - -/// 请求推荐房间列表 -/// @param completion 完成 -/// @param uid 用户的uid -+ (void)homeRecommendRoomList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - [self makeRequest:@"home/tab/homeV2" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; -} - -/// 请求热门房间列表 -/// @param completion 完成 -+ (void)homeHotRoomList:(HttpRequestHelperCompletion)completion { - [self makeRequest:@"single/broadcast/getMainPopularityAnchorList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} - -/// 请求个播放更多房间列表 -/// @param completion 完成 -+ (void)homeAnchorMoreRoomList:(HttpRequestHelperCompletion)completion singleRoomSortId:(NSString *)singleRoomSortId { - [self makeRequest:@"single/broadcast/morePopularityAnchorList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, singleRoomSortId, nil]; -} - -/// 请求热门房间列表 -/// @param completion 完成 -+ (void)homePersonalRoomList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - [self makeRequest:@"home/hotRoom" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,uid, nil]; -} - -/// 请求组队开黑房间列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param pageNum 当前页数 -/// @param pageSize 一页多少个 -+ (void)homePlayGameTeam:(HttpRequestHelperCompletion)completion uid:(NSString *)uid pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize { - [self makeRequest:@"home/playV2" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,uid , pageNum, pageSize,nil]; -} - - - -/// 请求收藏房间列表 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param page 当前页数 -/// @param pageSize 一页多少个 -+ (void)homeCollectRoomList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize { - [self makeRequest:@"fans/fansRoomList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,uid , page, pageSize,nil]; -} - -/// 首页资源位要进入的 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param rid 进入的类型的id -+ (void)homePickResource:(HttpRequestHelperCompletion)completion uid:(NSString *)uid rid:(NSString *)rid { - NSDictionary * dic = @{@"uid":uid, @"id":rid}; - [HttpRequestHelper request:@"home/pickResource" method:HttpRequestHelperMethodGET params:dic completion:completion]; -} - - -/// 首页小游戏列表 -/// @param completion 完成 -/// @param pageSize 一页多少个 -/// @param pageNum 多少页 -/// @param uid 用户的uid -+ (void)homeLittleGameRoomList:(HttpRequestHelperCompletion)completion pageSize:(NSString *)pageSize pageNum:(NSString *)pageNum uid:(NSString *)uid { - [self makeRequest:@"home/miniGameTabList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, pageSize, pageNum, uid, nil]; -} - - -/// 快速匹配 -/// @param completion 完成 -/// @param uid 用户的uid -+ (void)homeQuickMatchLittleGame:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - [self makeRequest:@"home/fastPick" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; -} - -/// 获取首页个播浏览记录 -/// @param complection 完成 -/// @param uid 用户的uid -+ (void)onceLookAnchorRoomComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid { - [self makeRequest:@"single/broadcast/onceLook" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, nil]; -} -///首页改版资源位 -+(void)requestCurrentResourceListCompletion:(HttpRequestHelperCompletion)complection{ - [self makeRequest:@"home/currentResource" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, nil]; -} -/// 一键匹配 -/// @param completion 完成 -+ (void)homeChatPick:(HttpRequestHelperCompletion)completion { - [self makeRequest:@"home/chat/pick" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} -///发现新朋友 -+(void)requsetFriendListComplection:(HttpRequestHelperCompletion)complection{ - [self makeRequest:@"home/newFriend" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, nil]; -} -///ip检测 -+(void)checkIpRegionComplection:(HttpRequestHelperCompletion)complection{ - [self makeRequest:@"ipRegion/check" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, nil]; -} - -#pragma mark - 首页 V3 APIs - -+(void)getMyRoomCompletion:(HttpRequestHelperCompletion)completion { - [self makeRequest:@"home/getMyRoom" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} -+(void)getMyCollectRoomsCompletion:(HttpRequestHelperCompletion)completion - pageNum:(NSString *)pageNum - pageSize:(NSString *)pageSize -{ - [self makeRequest:@"home/collect/pageRoom" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, pageNum, pageSize, nil]; -} -+(void)getMyRecentRoomsCompletion:(HttpRequestHelperCompletion)completion - pageNum:(NSString *)pageNum - pageSize:(NSString *)pageSize -{ - [self makeRequest:@"home/recent/pageRoom" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, pageNum, pageSize, nil]; -} -+(void)getHomeTabsCompletion:(HttpRequestHelperCompletion)completion { - [self makeRequest:@"home/tabV3/list" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} -+(void)getHomeTabRoomsCompletion:(HttpRequestHelperCompletion)completion - pageNum:(NSString *)pageNum - pageSize:(NSString *)pageSize - tabId:(NSString *)tabId -{ - [self makeRequest:@"home/tabV3/pageRoom" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, pageNum, pageSize, tabId, nil]; -} -+(void)getHomeRanksCompletion:(HttpRequestHelperCompletion)completion -{ - [self makeRequest:@"home/getRankSlideshow" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} - -+(void)getHomeSecondBannerCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type { - [self makeRequest:@"home/second/banner" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, type, nil]; -} - -@end diff --git a/YuMi/Modules/YMNewHome/Model/EventConfigModel.h b/YuMi/Modules/YMNewHome/Model/EventConfigModel.h deleted file mode 100644 index 8cd49bc..0000000 --- a/YuMi/Modules/YMNewHome/Model/EventConfigModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// EventConfigModel.h -// YuMi -// -// Created by P on 2025/5/15. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface EventConfigModel : PIBaseModel - -@property (nonatomic, assign) NSInteger latestDay; -@property (nonatomic, assign) NSInteger earliestBeginHour; -@property (nonatomic, assign) NSInteger goldNum; -@property (nonatomic, copy) NSArray *durations; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/EventConfigModel.m b/YuMi/Modules/YMNewHome/Model/EventConfigModel.m deleted file mode 100644 index 08d10ff..0000000 --- a/YuMi/Modules/YMNewHome/Model/EventConfigModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// EventConfigModel.m -// YuMi -// -// Created by P on 2025/5/15. -// - -#import "EventConfigModel.h" - -@implementation EventConfigModel - -@end diff --git a/YuMi/Modules/YMNewHome/Model/EventItemModel.h b/YuMi/Modules/YMNewHome/Model/EventItemModel.h deleted file mode 100644 index cdee30d..0000000 --- a/YuMi/Modules/YMNewHome/Model/EventItemModel.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// EventItemModel.h -// YuMi -// -// Created by P on 2025/5/15. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface EventItemModel : PIBaseModel - -@property (nonatomic, strong) NSString *eventTopic; // 事件主题 -@property (nonatomic, assign) NSTimeInterval updateTime; // 更新时间戳 -@property (nonatomic, assign) NSInteger offectTimes; // 未知字段 -@property (nonatomic, assign) NSInteger shareNum; // 分享次数 -@property (nonatomic, assign) NSInteger liveStatus; // 1未开始，2进行中，3-已结束 -@property (nonatomic, assign) NSInteger eventStatus; // 0-待审核，1-审核通过，2-拒绝，3-删除，4-过期 -@property (nonatomic, assign) NSInteger eventDuration; // 事件持续时间 -@property (nonatomic, strong) NSString *roomAvatar; // 房间头像 -@property (nonatomic, strong) NSString *eventBanner; // 事件横幅 -@property (nonatomic, assign) NSInteger subNum; // 订阅数量 -@property (nonatomic, strong) NSString *eventDetail; // 事件详情 -@property (nonatomic, assign) NSInteger id; // 事件ID -@property (nonatomic, assign) NSInteger uid; // 用户ID -@property (nonatomic, assign) NSInteger noticeFans; // 通知粉丝 -@property (nonatomic, assign) NSInteger roomErbanNo; // 房间号 -@property (nonatomic, strong) NSString *eventStartTimeStr;// 事件开始时间字符串 -@property (nonatomic, assign) NSTimeInterval eventEndTime;// 事件结束时间戳 -@property (nonatomic, assign) BOOL subStatus; // 订阅状态 -@property (nonatomic, assign) NSInteger roomUid; // 房间用户ID -@property (nonatomic, assign) NSTimeInterval eventStartTime;// 事件开始时间戳 -@property (nonatomic, assign) NSTimeInterval createTime; // 创建时间戳 -@property (nonatomic, copy) NSString *avatar; -@property (nonatomic, assign) NSInteger gender; -@property (nonatomic, copy) NSString *nick; -@property (nonatomic, copy) NSString *erbanNo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/EventItemModel.m b/YuMi/Modules/YMNewHome/Model/EventItemModel.m deleted file mode 100644 index 7a07454..0000000 --- a/YuMi/Modules/YMNewHome/Model/EventItemModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// EventItemModel.m -// YuMi -// -// Created by P on 2025/5/15. -// - -#import "EventItemModel.h" - -@implementation EventItemModel - -@end diff --git a/YuMi/Modules/YMNewHome/Model/EventRoomModel.h b/YuMi/Modules/YMNewHome/Model/EventRoomModel.h deleted file mode 100644 index ebd3b53..0000000 --- a/YuMi/Modules/YMNewHome/Model/EventRoomModel.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// EventRoomModel.h -// YuMi -// -// Created by P on 2025/5/15. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface EventRoomModel : PIBaseModel -@property (nonatomic, copy) NSString *roomName; -@property (nonatomic, assign) NSInteger roomUid; -@property (nonatomic, assign) NSInteger erbanNo; -@property (nonatomic, copy) NSString *avatar; -@end - -@interface EventRoomListModel : PIBaseModel - -@property (nonatomic, strong) EventRoomModel *selfRoom; -@property (nonatomic, copy) NSArray *manageRooms; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/EventRoomModel.m b/YuMi/Modules/YMNewHome/Model/EventRoomModel.m deleted file mode 100644 index 3da16d4..0000000 --- a/YuMi/Modules/YMNewHome/Model/EventRoomModel.m +++ /dev/null @@ -1,25 +0,0 @@ -// -// EventRoomModel.m -// YuMi -// -// Created by P on 2025/5/15. -// - -#import "EventRoomModel.h" - -@implementation EventRoomModel - - - -@end - -@implementation EventRoomListModel - -+ (NSDictionary *)objectClassInArray { - return @{ - @"selfRoom": [EventRoomModel class], - @"manageRooms": [EventRoomModel class], - }; -} - -@end diff --git a/YuMi/Modules/YMNewHome/Model/FirstRechargeModel.h b/YuMi/Modules/YMNewHome/Model/FirstRechargeModel.h deleted file mode 100644 index f096ae8..0000000 --- a/YuMi/Modules/YMNewHome/Model/FirstRechargeModel.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// FirstRechargeModel.h -// YuMi -// -// Created by P on 2025/6/25. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface FirstRechargeLevelModel : PIBaseModel - -@property (nonatomic, assign) NSInteger awardNum; -@property (nonatomic, assign) NSInteger exp; -@property (nonatomic, copy) NSString *pic; -@property (nonatomic, copy) NSString *rewardName; -@property (nonatomic, copy) NSString *rewardType; -@property (nonatomic, copy) NSString *unit; - -@end - -@interface FirstRechargeModel : PIBaseModel - -@property (nonatomic, copy) NSString *chargeBanner; -@property (nonatomic, assign) BOOL chargeStatus; -@property (nonatomic, copy) NSArray * levelCharge; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/FirstRechargeModel.m b/YuMi/Modules/YMNewHome/Model/FirstRechargeModel.m deleted file mode 100644 index 7715742..0000000 --- a/YuMi/Modules/YMNewHome/Model/FirstRechargeModel.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// FirstRechargeModel.m -// YuMi -// -// Created by P on 2025/6/25. -// - -#import "FirstRechargeModel.h" - -@implementation FirstRechargeLevelModel - - -@end - -@implementation FirstRechargeModel - -+ (NSDictionary *)objectClassInArray { - return @{ - @"levelCharge": [FirstRechargeLevelModel class], - }; -} - -@end diff --git a/YuMi/Modules/YMNewHome/Model/HomeBannerInfoModel.h b/YuMi/Modules/YMNewHome/Model/HomeBannerInfoModel.h deleted file mode 100644 index 0dc1998..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeBannerInfoModel.h +++ /dev/null @@ -1,60 +0,0 @@ -// -// HomeBannerInfoModel.h -// YUMI -// -// Created by YUMI on 2022/2/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, HomeBannerInfoSkipType) { - /// APP 內功能跳轉 - HomeBannerInfoSkipType_APP = 1, - /// 跳转房间 - HomeBannerInfoSkipType_Room = 2, - /// 跳转h5 - HomeBannerInfoSkipType_Web = 3, - /// SVGA - HomeBannerInfoSkipType_Web_CP = 4, - /// WeekStar - HomeBannerInfoSkipType_Web_WeekStar = 5, - HomeBannerInfoSkipType_Web_Custom = 6, - /// 無跳轉 - HomeBannerInfoSkipType_None = 100, -}; - -@interface HomeBannerFillVoInfoModel : PIBaseModel - -@property(nonatomic, copy) NSString *loverNick; -@property(nonatomic, copy) NSString *loverErbanNo; -@property(nonatomic, copy) NSString *loverAvatar; -@property(nonatomic, copy) NSString *nick; -@property(nonatomic, copy) NSString *erbanNo; -@property(nonatomic, copy) NSString *avatar; -@property(nonatomic, copy) NSString *picUrl; -@property(nonatomic, copy) NSString *giftName; -@property(nonatomic, copy) NSString *giftId; - -@end - -@interface HomeBannerInfoModel : PIBaseModel -///ID -@property (nonatomic,copy)NSString *bannerId; -///名字 -@property (nonatomic,copy)NSString *bannerName; -///图片 -@property (nonatomic, copy)NSString *bannerPic; -///跳转的地址 -@property (nonatomic, copy)NSString *skipUri; -///跳转的类型 -@property (nonatomic, assign)HomeBannerInfoSkipType skipType; - -@property (nonatomic, assign) NSInteger activityShow; // = 1 时，为官方活动 - -@property(nonatomic, strong) HomeBannerFillVoInfoModel *fillVo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/HomeBannerInfoModel.m b/YuMi/Modules/YMNewHome/Model/HomeBannerInfoModel.m deleted file mode 100644 index ad625ed..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeBannerInfoModel.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// HomeBannerInfoModel.m -// YUMI -// -// Created by YUMI on 2022/2/21. -// - -#import "HomeBannerInfoModel.h" - -@implementation HomeBannerFillVoInfoModel - -@end - -@implementation HomeBannerInfoModel -+ (NSDictionary *)objectClassInArray { - return @{ - @"fillVo": [HomeBannerFillVoInfoModel class], - }; -} -@end diff --git a/YuMi/Modules/YMNewHome/Model/HomeCollectRoomModel.h b/YuMi/Modules/YMNewHome/Model/HomeCollectRoomModel.h deleted file mode 100644 index 2edb343..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeCollectRoomModel.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// HomeCollectRoomModel.h -// YUMI -// -// Created by YUMI on 2022/3/2. -// - -#import -#import "HomePlayRoomModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface HomeCollectRoomModel : PIBaseModel -///昵称 -@property (nonatomic,copy) NSString *nick; -///头像 -@property (nonatomic,copy) NSString *roomAvatar; -///昵称 -@property (nonatomic,copy) NSString *roomName; -///f在线人数 -@property (nonatomic,copy) NSString *roomOnlineNum; -///是否跨房Pk -@property (nonatomic,assign) BOOL crossPking; -///平台id -@property (nonatomic,copy) NSString *erbanNo; -///tag -@property (nonatomic,copy) NSString *tagPict; -///房主的uid -@property (nonatomic,copy) NSString *roomUid; -///麦上用户 -@property (nonatomic, strong) NSArray *micUsers; -///是否选中 -@property (nonatomic, assign) BOOL isSelected; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/HomeCollectRoomModel.m b/YuMi/Modules/YMNewHome/Model/HomeCollectRoomModel.m deleted file mode 100644 index 9ae1ff9..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeCollectRoomModel.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// HomeCollectRoomModel.m -// YUMI -// -// Created by YUMI on 2022/3/2. -// - -#import "HomeCollectRoomModel.h" - -@implementation HomeCollectRoomModel - -///扩展方法 按需索取 重写即可 -///如果一个模型中 包含一个数组 数组中是另一个模型 -+ (NSDictionary *)objectClassInArray { - return @{ - @"micUsers": [HomePlayMicUserModel class], - }; -} - -@end diff --git a/YuMi/Modules/YMNewHome/Model/HomeLittleGameRoomModel.h b/YuMi/Modules/YMNewHome/Model/HomeLittleGameRoomModel.h deleted file mode 100644 index 0c6cb41..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeLittleGameRoomModel.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// HomeLittleGameRoomModel.h -// xplan-ios -// -// Created by 冯硕 on 2022/3/24. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class HomeLittleGameMicUserModel; -@interface HomeLittleGameRoomModel : PIBaseModel -///头像 -@property (nonatomic, copy) NSString *avatar; -///小游戏ID -@property(nonatomic, copy) NSString *mgId; -///小游戏名称 -@property(nonatomic, copy) NSString *mgName; -///麦上用户 -@property (nonatomic, strong) NSArray *micUsers; -///在线人数 -@property (nonatomic, assign) NSInteger onlineNum; -///房间标题 -@property (nonatomic, copy) NSString *title; -///房主的uid -@property (nonatomic,copy) NSString *uid; -///房间小游戏状态:1-游戏进行中，2-等人中 -@property (nonatomic, assign) NSInteger state; -///是否选择的房间 -@property (nonatomic, assign) BOOL isPick; -///是否打开自己房间 -@property (nonatomic, assign) BOOL needOpenSelfRoom; -@end - -@interface HomeLittleGameMicUserModel : PIBaseModel -///头像 -@property (nonatomic, copy) NSString *avatar; -///姓名 -@property (nonatomic,copy) NSString *nick; -///用户的uid -@property (nonatomic,copy) NSString *uid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/HomeLittleGameRoomModel.m b/YuMi/Modules/YMNewHome/Model/HomeLittleGameRoomModel.m deleted file mode 100644 index 983e4bb..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeLittleGameRoomModel.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// HomeLittleGameRoomModel.m -// xplan-ios -// -// Created by 冯硕 on 2022/3/24. -// - -#import "HomeLittleGameRoomModel.h" - -@implementation HomeLittleGameRoomModel -+ (NSDictionary *)objectClassInArray { - return @{ - @"micUsers": [HomeLittleGameMicUserModel class] - }; -} - -@end - - -@implementation HomeLittleGameMicUserModel - - - -@end diff --git a/YuMi/Modules/YMNewHome/Model/HomeMenuInfoModel.h b/YuMi/Modules/YMNewHome/Model/HomeMenuInfoModel.h deleted file mode 100644 index 9783480..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeMenuInfoModel.h +++ /dev/null @@ -1,38 +0,0 @@ -// -// HomeMenuInfoModel.h -// YUMI -// -// Created by YUMI on 2022/2/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, HomeMenuResourceType) { - ///进入牌照房 - HomeMenuResourceType_Room_Licnese = 1, - ///进入相亲房 - HomeMenuResourceType_Room_Dating, - ///进入PK房 - HomeMenuResourceType_Room_PK, - ///进入Game房 - HomeMenuResourceType_Room_Game, - ///进入H5 - HomeMenuResourceType_H5, - ///进入自定义房 - HomeMenuResourceType_Room_Custom, -}; - -@interface HomeMenuInfoModel : PIBaseModel -///ID 映射字段 -@property (nonatomic,copy) NSString *hid; -///显示的图片 -@property (nonatomic, copy)NSString *icon; -///类型 -@property (nonatomic, assign)HomeMenuResourceType resourceType; -///跳转h5的时候 跳转链接 -@property (nonatomic, copy)NSString *resourceContent; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/HomeMenuInfoModel.m b/YuMi/Modules/YMNewHome/Model/HomeMenuInfoModel.m deleted file mode 100644 index c60dfc8..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeMenuInfoModel.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// HomeMenuInfoModel.m -// YUMI -// -// Created by YUMI on 2022/2/21. -// - -#import "HomeMenuInfoModel.h" - -@implementation HomeMenuInfoModel - -///如果一个模型中需要字段映射的话 比如id -> ID name -> other.name -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"hid":@"id"}; -} - -@end diff --git a/YuMi/Modules/YMNewHome/Model/HomeMenuSourceModel.h b/YuMi/Modules/YMNewHome/Model/HomeMenuSourceModel.h deleted file mode 100644 index 4a067d6..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeMenuSourceModel.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// HomeMenuSourceModel.h -// xplan-ios -// -// Created by 冯硕 on 2022/3/3. -// 点击了菜单栏 需要跳转的model - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface HomeMenuSourceModel : PIBaseModel -///头像 -@property (nonatomic,copy) NSString *avatar; -///是否是进入房间 -@property (nonatomic,assign) BOOL isPick; -///房主的uid -@property (nonatomic,copy) NSString *uid; -///房间标题 -@property (nonatomic,copy) NSString *title; -///房间tag -@property (nonatomic,copy) NSString *tagPict; -///平台id -@property (nonatomic,copy) NSString *erbanNo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/HomeMenuSourceModel.m b/YuMi/Modules/YMNewHome/Model/HomeMenuSourceModel.m deleted file mode 100644 index 94046da..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeMenuSourceModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// HomeMenuSourceModel.m -// xplan-ios -// -// Created by 冯硕 on 2022/3/3. -// - -#import "HomeMenuSourceModel.h" - -@implementation HomeMenuSourceModel - -@end diff --git a/YuMi/Modules/YMNewHome/Model/HomeMineRoomModel.h b/YuMi/Modules/YMNewHome/Model/HomeMineRoomModel.h deleted file mode 100644 index f5b94b6..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeMineRoomModel.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// HomeMineRoomModel.h -// YuMi -// -// Created by P on 2024/6/20. -// - -#import "PIBaseModel.h" -#import "HomePlayRoomModel.h" -#import "YUMINNNN.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface HomeMineRoomModel : PIBaseModel - -@property (nonatomic, copy) NSString *avatar; -@property (nonatomic, copy) NSString *introduction; -@property (nonatomic, assign) NSInteger roomId; -@property (nonatomic, assign) NSInteger uid; -@property (nonatomic, copy) NSString *title; -@property (nonatomic, assign) NSInteger onlineNum; -@property (nonatomic, assign) NSInteger micUserCount; -@property (nonatomic, assign) NSInteger partitionId; -@property (nonatomic, assign) NSString *roomDesc; -@property (nonatomic, copy) NSString *regionFlag; -@property (nonatomic, strong) NSArray *micUsers; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/HomeMineRoomModel.m b/YuMi/Modules/YMNewHome/Model/HomeMineRoomModel.m deleted file mode 100644 index 4dec067..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeMineRoomModel.m +++ /dev/null @@ -1,18 +0,0 @@ -// -// HomeMineRoomModel.m -// YuMi -// -// Created by P on 2024/6/20. -// - -#import "HomeMineRoomModel.h" - -@implementation HomeMineRoomModel - -+ (NSDictionary *)objectClassInArray { - return @{ - @"micUsers": [HomePlayMicUserModel class], - }; -} - -@end diff --git a/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h b/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h deleted file mode 100644 index 669c757..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h +++ /dev/null @@ -1,97 +0,0 @@ -// -// HomePlayRoomModel.h -// YUMI -// -// Created by YUMI on 2022/2/25. -// - -#import -#import "YUMINNNN.h" -#import "HomeBannerInfoModel.h" -#import "UserInfoModel.h" -NS_ASSUME_NONNULL_BEGIN -@class HomePlayMicUserModel; -@interface HomePlayRoomModel : PIBaseModel -@property(nonatomic,assign) CGFloat width; -///头像 -@property (nonatomic, copy) NSString *avatar; -///是否在跨房PK中 -@property (nonatomic, assign) BOOL crossPking; -///平台号 -@property(nonatomic, copy) NSString *erbanNo; -///是否有列表中的banner -@property (nonatomic, assign) BOOL isBanner; -///小游戏ID -@property(nonatomic, copy) NSString *mgId; -///小游戏名称 -@property(nonatomic, copy) NSString *mgName; -///麦上用户 -@property (nonatomic, strong) NSArray *micUsers; -///在线人数 -@property (nonatomic, assign) NSInteger onlineNum; -///标签图片地址 -@property (nonatomic, strong) NSString *tagPict; -///房间标题 -@property (nonatomic, copy) NSString *title; -///房主的uid -@property (nonatomic,copy) NSString *uid; -///列表中的banner信息 -@property (nonatomic, strong) NSArray *bannerVoList; -///房间开黑广播 -@property (nonatomic, copy) NSString *broadMsg; -///性别 -@property (nonatomic,assign) GenderType gender; - -@property(nonatomic, assign) NSInteger hourTop;// 小时榜排名(0,1,2,3) -@property(nonatomic, strong) NSNumber *hotValue; // 热度值 -@property(nonatomic, assign) NSInteger homeRoomType; //(0=null,1=热门,2=客服) - -@property(nonatomic,copy) NSString *inRoomUid; -//是否在麦位 -@property(nonatomic,assign) BOOL inMic; -///是否在线 -@property(nonatomic,assign) BOOL inOnline; -///签名 -@property(nonatomic,copy) NSString *userDesc; -///语音 -@property(nonatomic,copy) NSString *userVoice; -///语音时长 -@property(nonatomic,copy) NSString *voiceDura; -///标签 -@property(nonatomic,copy) NSArray *labels; -///标签宽度 -@property(nonatomic,copy) NSArray *labelsWidthList; -///生日 -@property(nonatomic,assign) long birth; -///昵称 -@property(nonatomic,copy) NSString *nick; -@property(nonatomic,copy) NSString *introduction; -@property(nonatomic,strong) UserLevelVo *userLevelVo; -@property (nonatomic, copy) NSString *roomDesc; - -@property (nonatomic, assign) BOOL roomBoom; -@property (nonatomic, copy) NSString *roomBoomPic; -@property (nonatomic, copy) NSString *roomBoomVapUrl; - -@property (nonatomic, copy) NSString *regionFlag; -@property(nonatomic, copy) NSString *roomLevelIcon; - -@end - -@interface HomePlayMicUserModel : PIBaseModel -///头像 -@property (nonatomic, copy) NSString *avatar; -///性别 -@property (nonatomic,assign) GenderType gender; -///姓名 -@property (nonatomic,copy) NSString *nick; -///用户的uid -@property (nonatomic,copy) NSString *uid; -@property(nonatomic,copy) NSString *erbanNo; - -@property (nonatomic, copy) NSNumber *aiLevel; // > 0 为机器人 - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.m b/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.m deleted file mode 100644 index 1b86d63..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// HomePlayRoomModel.m -// YUMI -// -// Created by YUMI on 2022/2/25. -// - -#import "HomePlayRoomModel.h" - -@implementation HomePlayRoomModel - -///扩展方法 按需索取 重写即可 -///如果一个模型中 包含一个数组 数组中是另一个模型 -+ (NSDictionary *)objectClassInArray { - return @{ - @"micUsers": [HomePlayMicUserModel class], - @"bannerVoList": [HomeBannerInfoModel class] - }; -} -@end - - -@implementation HomePlayMicUserModel - - -@end diff --git a/YuMi/Modules/YMNewHome/Model/HomeRankAvatarModel.h b/YuMi/Modules/YMNewHome/Model/HomeRankAvatarModel.h deleted file mode 100644 index 9432208..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeRankAvatarModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// HomeRankAvatarModel.h -// YuMi -// -// Created by P on 2024/6/20. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface HomeRankAvatarModel : PIBaseModel - -@property (nonatomic, assign) NSInteger uid; -@property (nonatomic, assign) NSInteger erbanNo; -@property (nonatomic, copy) NSString *avatar; -@property (nonatomic, copy) NSString *nick; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/HomeRankAvatarModel.m b/YuMi/Modules/YMNewHome/Model/HomeRankAvatarModel.m deleted file mode 100644 index 58387f6..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeRankAvatarModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// HomeRankAvatarModel.m -// YuMi -// -// Created by P on 2024/6/20. -// - -#import "HomeRankAvatarModel.h" - -@implementation HomeRankAvatarModel - -@end diff --git a/YuMi/Modules/YMNewHome/Model/HomeRecommendRoomModel.h b/YuMi/Modules/YMNewHome/Model/HomeRecommendRoomModel.h deleted file mode 100644 index f484476..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeRecommendRoomModel.h +++ /dev/null @@ -1,50 +0,0 @@ -// -// HomeRecommendRoomModel.h -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface HomeRecommendRoomModel : PIBaseModel -///生日 -@property(nonatomic,assign) long birth; -///头像 -@property (nonatomic,copy) NSString *avatar; -///在线人数 -@property (nonatomic,assign) NSInteger onlineNum; -///房主的uid -@property (nonatomic,copy) NSString *roomUid; -///房间的tag -@property (nonatomic,copy) NSString *roomTag; -///标题 -@property (nonatomic,copy) NSString *title; -///tag的图片 -@property (nonatomic,copy) NSString *tagPict; -///性别 -@property (nonatomic,assign) GenderType gender; -///房主的昵称 -@property (nonatomic,copy) NSString *nick; -///房间的id -@property (nonatomic,copy) NSString *roomId; -///房主的uid -@property (nonatomic,copy) NSString *uid; -///房间简介 -@property(nonatomic, copy) NSString *roomDesc; -///排列的顺序 -@property (nonatomic,strong) NSNumber * seq; -///最新推荐上面的标签 -@property (nonatomic,copy) NSString *iconContent; -///是否在跨房PK中 -@property (nonatomic, assign) BOOL crossPking; -///是否是推荐房间 -@property (nonatomic, assign) BOOL isRecommend; - -@property (nonatomic, copy) NSString *erbanNo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/HomeRecommendRoomModel.m b/YuMi/Modules/YMNewHome/Model/HomeRecommendRoomModel.m deleted file mode 100644 index b17c0fb..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeRecommendRoomModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// HomeRecommendRoomModel.m -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "HomeRecommendRoomModel.h" - -@implementation HomeRecommendRoomModel - -@end diff --git a/YuMi/Modules/YMNewHome/Model/HomeTagModel.h b/YuMi/Modules/YMNewHome/Model/HomeTagModel.h deleted file mode 100644 index 1b9bd01..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeTagModel.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// HomeTagModel.h -// YUMI -// -// Created by YUMI on 2021/12/2. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface HomeTagModel : PIBaseModel -///id -@property (nonatomic,copy) NSString *tid; -///名字 -@property (nonatomic,copy) NSString *name; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/HomeTagModel.m b/YuMi/Modules/YMNewHome/Model/HomeTagModel.m deleted file mode 100644 index cc581b6..0000000 --- a/YuMi/Modules/YMNewHome/Model/HomeTagModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// HomeTagModel.m -// YUMI -// -// Created by YUMI on 2021/12/2. -// - -#import "HomeTagModel.h" -@implementation HomeTagModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"tid":@"id"}; -} - - -@end diff --git a/YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.h b/YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.h deleted file mode 100644 index df47214..0000000 --- a/YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// PIHomeCategoryTitleModel.h -// YuMi -// -// Created by duoban on 2024/2/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIHomeCategoryTitleModel : NSObject -@property(nonatomic,assign) BOOL isChecked; -@property(nonatomic,assign) CGFloat checkedWidth; -@property(nonatomic,assign) CGFloat noCheckedWidth; -@property(nonatomic,copy) NSString *name; -@property(nonatomic,copy) NSString *id; -@property(nonatomic,assign) BOOL isHomeRecommend; -@property(nonatomic, copy) NSString *icon; -@property(nonatomic, copy) NSString *regionId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.m b/YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.m deleted file mode 100644 index 6b2c97d..0000000 --- a/YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// PIHomeCategoryTitleModel.m -// YuMi -// -// Created by duoban on 2024/2/21. -// - -#import "PIHomeCategoryTitleModel.h" - -@implementation PIHomeCategoryTitleModel - -@end diff --git a/YuMi/Modules/YMNewHome/Model/PIHomeItemModel.h b/YuMi/Modules/YMNewHome/Model/PIHomeItemModel.h deleted file mode 100644 index 25febd6..0000000 --- a/YuMi/Modules/YMNewHome/Model/PIHomeItemModel.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// PIHomeItemModel.h -// YuMi -// -// Created by duoban on 2023/9/5. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, HomeMenuResourceType) { - ///进入牌照房 - HomeMenuResourceType_Room_Licnese = 1, - ///进入相亲房 - HomeMenuResourceType_Room_Dating, - ///进入PK房 - HomeMenuResourceType_Room_PK, - ///进入Game房 - HomeMenuResourceType_Room_Game, - ///进入H5 - HomeMenuResourceType_H5, - ///进入自定义房 - HomeMenuResourceType_Room_Custom, - ///一键匹配 - HomeMenuResourceType_Match = 8, -}; -@interface PIHomeItemModel : PIBaseModel -///id -@property (nonatomic,copy) NSString *ID; -@property(nonatomic,copy) NSString *icon; -@property(nonatomic,copy) NSString *resourceContent; -@property(nonatomic,copy) NSString *posSeq; -@property(nonatomic,assign) HomeMenuResourceType resourceType; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/PIHomeItemModel.m b/YuMi/Modules/YMNewHome/Model/PIHomeItemModel.m deleted file mode 100644 index c40dbae..0000000 --- a/YuMi/Modules/YMNewHome/Model/PIHomeItemModel.m +++ /dev/null @@ -1,15 +0,0 @@ -// -// PIHomeItemModel.m -// YuMi -// -// Created by duoban on 2023/9/5. -// - -#import "PIHomeItemModel.h" - -@implementation PIHomeItemModel -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"ID":@"id"}; -} - -@end diff --git a/YuMi/Modules/YMNewHome/Model/XPBlankRoomModel.h b/YuMi/Modules/YMNewHome/Model/XPBlankRoomModel.h deleted file mode 100644 index 746cb4f..0000000 --- a/YuMi/Modules/YMNewHome/Model/XPBlankRoomModel.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPBlankRoomModel.h -// YuMi -// -// Created by Linus on 2024/12/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPBlankRoomModel : NSObject - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Model/XPBlankRoomModel.m b/YuMi/Modules/YMNewHome/Model/XPBlankRoomModel.m deleted file mode 100644 index 0a81cd8..0000000 --- a/YuMi/Modules/YMNewHome/Model/XPBlankRoomModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// XPBlankRoomModel.m -// YuMi -// -// Created by Linus on 2024/12/19. -// - -#import "XPBlankRoomModel.h" - -@implementation XPBlankRoomModel - -@end diff --git a/YuMi/Modules/YMNewHome/Presenter/CreateEventPresenter.h b/YuMi/Modules/YMNewHome/Presenter/CreateEventPresenter.h deleted file mode 100644 index 6415890..0000000 --- a/YuMi/Modules/YMNewHome/Presenter/CreateEventPresenter.h +++ /dev/null @@ -1,78 +0,0 @@ -// -// CreateEventPresenter.h -// YuMi -// -// Created by P on 2025/5/9. -// - -#import "BaseMvpPresenter.h" -#import "EventItemModel.h" -#import "EventRoomModel.h" -#import "EventConfigModel.h" -#import "WalletInfoModel.h" -#import "HomeBannerInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol CreateEventPresenterProcotol -@optional - -- (void)loadCongfigSuccess:(EventConfigModel *)model; -- (void)loadCongfigFailure:(NSString *)msg; - -- (void)eventSquareListSuccess:(NSArray *)list; -- (void)eventSquareListFailure:(NSString *)msg; - -- (void)myCreateEventListSuccess:(NSArray *)list; -- (void)myCreateEventListFailure:(NSString *)msg; - -- (void)mySubEventListSuccess:(NSArray *)list; -- (void)mySubEventListFailure:(NSString *)msg; -- (void)myEventListFailure:(NSString *)msg; - -- (void)myRoomListSuccess:(EventRoomListModel *)listModel; -- (void)myRoomListFailure:(NSString *)msg; - -- (void)createEventSuccess; -- (void)createEventFailure:(NSString *)msg; - -- (void)eventSubActionSuccess:(BOOL)isSub eventId:(NSInteger)eventId; -- (void)eventSubActionFailure:(NSString *)msg; - -- (void)deleteEventSuccess:(NSInteger)eventId; -- (void)deleteEventFailure:(NSString *)msg; - -- (void)officialEventListSuccess:(NSArray *)listModel; -- (void)officialEventListFailure:(NSString *)msg; - - -@end - -@interface CreateEventPresenter : BaseMvpPresenter - -- (void)loadConfig; -- (void)loadOfficialEvents; -- (void)loadEventSquare:(NSInteger)page; -- (void)loadMyCreateEvents:(NSInteger)page; -- (void)loadMySubEvents:(NSInteger)page; -- (void)loadMyEvents; -- (void)loadMyRooms; - -- (void)deleteEvent:(NSInteger)eventId; - -- (void)subEvent:(BOOL)isSub eventId:(NSInteger)eventId; - -- (void)createEventWithTitle:(NSString *)title - image:(NSString *)imagePath - uploadToHome:(BOOL)uploadToHome - startTime:(NSString *)startTime - duration:(NSInteger)duration - content:(NSString *)content - gold:(NSInteger)gold - roomUid:(NSInteger)roomUid - notifyFans:(BOOL)notifyFans; - -- (void)loadMoney:(void(^)(WalletInfoModel *walletModel))success failure:(void(^)(NSError *error))failure; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Presenter/CreateEventPresenter.m b/YuMi/Modules/YMNewHome/Presenter/CreateEventPresenter.m deleted file mode 100644 index 270c990..0000000 --- a/YuMi/Modules/YMNewHome/Presenter/CreateEventPresenter.m +++ /dev/null @@ -1,253 +0,0 @@ -// -// CreateEventPresenter.m -// YuMi -// -// Created by P on 2025/5/9. -// - -#import "CreateEventPresenter.h" -#import "Api+EventCenter.h" -#import - -@interface CreateEventPresenter() - -@end - -@implementation CreateEventPresenter -// Maybe 用一个方法 + 枚举指来指代一个功能类型的 api call？ - -- (void)loadConfig { - @kWeakify(self); - [Api usereventGoldConfig:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(loadCongfigSuccess:)]) { - [[self getView] loadCongfigSuccess:[EventConfigModel modelWithJSON:data.data]]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(loadCongfigFailure:)]) { - [[self getView] loadCongfigFailure:msg]; - } - } showLoading:YES errorToast:YES] - uid:[AccountInfoStorage instance].getUid]; -} - -- (void)loadOfficialEvents { - @kWeakify(self); - [Api homeBanner:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(officialEventListSuccess:)]) { - [[self getView] officialEventListSuccess:[HomeBannerInfoModel modelsWithArray:data.data]]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(officialEventListFailure:)]) { - [[self getView] officialEventListFailure:msg]; - } - } showLoading:YES errorToast:YES] uid:[AccountInfoStorage instance].getUid type:@"1" activityShow:@(1)]; -} - -- (void)loadEventSquare:(NSInteger)page { - @kWeakify(self); - [Api usereventSquare:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(eventSquareListSuccess:)]) { - [[self getView] eventSquareListSuccess:[EventItemModel modelsWithArray:data.data]]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(eventSquareListFailure:)]) { - [[self getView] eventSquareListFailure:msg]; - } - } showLoading:YES errorToast:YES] page:@(page) pageSize:@20]; -} - -- (void)loadMyCreateEvents:(NSInteger)page { - @kWeakify(self); - [Api usereventMySquare:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(myCreateEventListSuccess:)]) { - [[self getView] myCreateEventListSuccess:[EventItemModel modelsWithArray:data.data]]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(myCreateEventListFailure:)]) { - [[self getView] myCreateEventListFailure:msg]; - } - } showLoading:YES errorToast:YES] - page:@(page) - pageSize:@20 - uid:[AccountInfoStorage instance].getUid]; -} - -- (void)loadMySubEvents:(NSInteger)page { - @kWeakify(self); - [Api usereventMySub:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(mySubEventListSuccess:)]) { - [[self getView] mySubEventListSuccess:[EventItemModel modelsWithArray:data.data]]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(mySubEventListFailure:)]) { - [[self getView] mySubEventListFailure:msg]; - } - } showLoading:YES errorToast:YES] - page:@(page) - pageSize:@20 - uid:[AccountInfoStorage instance].getUid]; -} - -- (void)loadMyEvents { - RACSubject *create = [RACSubject subject]; - RACSubject *sub = [RACSubject subject]; - - @kWeakify(self); - [[RACSignal combineLatest:@[create, sub] reduce:^id(NSArray * creates, - NSArray * subs){ - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(myCreateEventListSuccess:)]) { - [[self getView] myCreateEventListSuccess:creates]; - } - if ([[self getView] respondsToSelector:@selector(mySubEventListSuccess:)]) { - [[self getView] mySubEventListSuccess:subs]; - } - return nil; - }] subscribeError:^(NSError * _Nullable error) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(myEventListFailure:)]) { - [[self getView] myEventListFailure:error.domain]; - } - }]; - - [Api usereventMySquare:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *array = [EventItemModel modelsWithArray:data.data]; - if (array.count > 4) { - array = [array subarrayWithRange:NSMakeRange(0, 4)]; - } - [create sendNext:array]; - [create sendCompleted]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [create sendError:[NSError errorWithDomain:msg code:code userInfo:nil]]; - [create sendCompleted]; - } showLoading:YES errorToast:YES] - page:@(1) - pageSize:@20 - uid:[AccountInfoStorage instance].getUid]; - - [Api usereventMySub:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *array = [EventItemModel modelsWithArray:data.data]; - [sub sendNext:array]; - [sub sendCompleted]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [sub sendError:[NSError errorWithDomain:msg code:code userInfo:nil]]; - [sub sendCompleted]; - } showLoading:YES errorToast:YES] - page:@(1) - pageSize:@20 - uid:[AccountInfoStorage instance].getUid]; - -} - -- (void)loadMyRooms { - @kWeakify(self); - [Api roomRoleListRoom:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(myRoomListSuccess:)]) { - [[self getView] myRoomListSuccess:[EventRoomListModel modelWithJSON:data.data]]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(myRoomListFailure:)]) { - [[self getView] myRoomListFailure:msg]; - } - } showLoading:YES errorToast:YES]]; -} - -- (void)deleteEvent:(NSInteger)eventId { - @kWeakify(self); - [Api usereventDel:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(deleteEventSuccess:)]) { - [[self getView] deleteEventSuccess:eventId]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(deleteEventFailure:)]) { - [[self getView] deleteEventFailure:msg]; - } - } showLoading:YES errorToast:YES] eventId:@(eventId)]; -} - -- (void)subEvent:(BOOL)isSub - eventId:(NSInteger)eventId { - @kWeakify(self); - [Api usereventSub:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(eventSubActionSuccess: eventId:)]) { - [[self getView] eventSubActionSuccess:isSub eventId:eventId]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(eventSubActionFailure:)]) { - [[self getView] eventSubActionFailure:msg]; - } - } showLoading:YES errorToast:YES] - eventId:@(eventId) - subStatus:isSub ? @(1) : @(0) - uid:[AccountInfoStorage instance].getUid]; -} - -- (void)createEventWithTitle:(NSString *)title - image:(NSString *)imagePath - uploadToHome:(BOOL)uploadToHome - startTime:(NSString *)startTime - duration:(NSInteger)duration - content:(NSString *)content - gold:(NSInteger)gold - roomUid:(NSInteger)roomUid - notifyFans:(BOOL)notifyFans { - - @kWeakify(self); - [Api usereventPublish:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(createEventSuccess)]) { - [[self getView] createEventSuccess]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] respondsToSelector:@selector(createEventFailure:)]) { - [[self getView] createEventFailure:msg]; - } - } showLoading:YES errorToast:YES] - eventBanner:imagePath - eventDetail:content - eventDuration:@(duration) - eventStartTimeStr:startTime - eventTopic:title - noticeFans:@(notifyFans) - payBanner:@(uploadToHome) - payGoldNum:@(gold) - roomUid:@(roomUid).stringValue - uid:[AccountInfoStorage instance].getUid]; -} - -- (void)loadMoney:(void(^)(WalletInfoModel *))success - failure:(void(^)(NSError *error))failure { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api getUserWalletInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (data.code == 200) { - WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data]; - if (success) { - success(model); - } - } else { - if (failure) { - failure([NSError errorWithDomain:data.message code:data.code userInfo:nil]); - } - } - }] uid:uid ticket:ticket]; -} - -@end diff --git a/YuMi/Modules/YMNewHome/Presenter/EventCenterPresenter.h b/YuMi/Modules/YMNewHome/Presenter/EventCenterPresenter.h deleted file mode 100644 index fa455e3..0000000 --- a/YuMi/Modules/YMNewHome/Presenter/EventCenterPresenter.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// EventCenterPresenter.h -// YuMi -// -// Created by P on 2025/4/29. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface EventCenterPresenter : BaseMvpPresenter - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Presenter/EventCenterPresenter.m b/YuMi/Modules/YMNewHome/Presenter/EventCenterPresenter.m deleted file mode 100644 index 9475bee..0000000 --- a/YuMi/Modules/YMNewHome/Presenter/EventCenterPresenter.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// EventCenterPresenter.m -// YuMi -// -// Created by P on 2025/4/29. -// - -#import "EventCenterPresenter.h" - -@implementation EventCenterPresenter - -@end diff --git a/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.h b/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.h deleted file mode 100644 index 54cabb6..0000000 --- a/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// XPHomeContainerPresenter.h -// YuMi -// -// Created by YuMi on 2021/12/2. -// - -#import "BaseMvpPresenter.h" -#import "FirstRechargeModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPHomeContainerPresenter : BaseMvpPresenter -///得到首页轮播图 -- (void)getHomeTopBannerList; -/// 获取所有的房间的tag -- (void)getHomeTagList; -///首页改版资源位 --(void)getCurrentResourceList; -- (void)homeChatPick; -///ip检测 --(void)checkIpRegionAction; - -- (void)getHomeTopData; -//- (void)getHomeAllTopsData; - -- (void)getHomeRanks; - -- (void)getUserFirstChargeStatus; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m b/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m deleted file mode 100644 index e14ec33..0000000 --- a/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m +++ /dev/null @@ -1,157 +0,0 @@ -// -// XPHomeContainerPresenter.m -// YuMi -// -// Created by YuMi on 2021/12/2. -// - -#import "XPHomeContainerPresenter.h" -#import -#import "Api+Home.h" -#import "AccountInfoStorage.h" -#import "HomeTagModel.h" -#import "XPHomeContainerProtocol.h" -#import "AccountInfoStorage.h" -#import "HomeBannerInfoModel.h" -#import "PIHomeItemModel.h" -#import "PIHomeCategoryTitleModel.h" -#import "HomeRankAvatarModel.h" -#import "HomePlayRoomModel.h" -#import "Api+FirstRecharge.h" - -@implementation XPHomeContainerPresenter -- (void)getHomeTopData { - RACSubject *banner = [RACSubject subject]; - RACSubject *menu = [RACSubject subject]; - - [[RACSignal combineLatest:@[banner, menu] reduce:^id(NSArray* bannerList, NSArray* menuList){ - //在这里 进行请求后的方法，回到主线程 - dispatch_async(dispatch_get_main_queue(), ^{ - [[self getView] getHomeTopDataSuccess:bannerList menuList:menuList]; - }); - return nil; - }] subscribeError:^(NSError * _Nullable error) { - }]; - - NSString * uid = [AccountInfoStorage instance].getUid; - [Api homeBannerList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomeBannerInfoModel modelsWithArray:data.data]; - [banner sendNext:array]; - [banner sendCompleted]; - - [menu sendNext:@[]]; - [menu sendCompleted]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [banner sendError:nil]; - [banner sendCompleted]; - - [menu sendError:nil]; - [menu sendCompleted]; - } errorToast:NO] uid:uid type:@"1"]; - - [Api requestCurrentResourceListCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *list = [PIHomeItemModel modelsWithArray:data.data]; - [menu sendNext:list]; - [menu sendCompleted]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [menu sendError:nil]; - [menu sendCompleted]; - }]]; -} - -///得到首页轮播图 -- (void)getHomeTopBannerList{ - NSString * uid = [AccountInfoStorage instance].getUid; - @kWeakify(self); - [Api homeBannerList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray * array = [HomeBannerInfoModel modelsWithArray:data.data]; - [[self getView] getHomeTopBannerListSuccess:array]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - - } errorToast:NO] uid:uid type:@"1"]; -} - -/// 获取所有的房间的tag -- (void)getHomeTagList { - @kWeakify(self); - [Api getHomeTabsCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - NSArray *array = [PIHomeCategoryTitleModel modelsWithArray:data.data]; - for (PIHomeCategoryTitleModel *model in array) { - model.checkedWidth = [UILabel getWidthWithText:model.name height:kGetScaleWidth(44) font:kFontSemibold(16)]; - model.noCheckedWidth = [UILabel getWidthWithText:model.name height:kGetScaleWidth(44) font:kFontRegular(14)]; - } - [[self getView] getHomeTagListSuccess:array]; - } else { - [[self getView] getHomeTagListFailure]; - [[self getView] showErrorToast:msg]; - } - }]; -} -///首页改版资源位 --(void)getCurrentResourceList{ - @kWeakify(self); - [Api requestCurrentResourceListCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray *list = [PIHomeItemModel modelsWithArray:data.data]; - [[self getView]getCurrentResourceListSuccess:list]; - }]]; -} -/// 一键匹配 -- (void)homeChatPick { - @kWeakify(self); - [Api homeChatPick:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if (data.data) { - NSString *uid = [NSString stringWithFormat:@"%@",data.data]; - [[self getView] homeChatPickSuccess:uid]; - }else{ - [[self getView] homeChatPickFail:data.message]; - } - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] homeChatPickFail:msg]; - } showLoading:YES errorToast:YES]]; -} -///ip检测 --(void)checkIpRegionAction{ - [Api checkIpRegionComplection:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if(code == 200){ - if(data.data != nil){ - NSInteger time = [data.data integerValue]/1000; - [[self getView]checkIpRegionSuccess:time]; - } - return; - } - if(code == 401){ - [[self getView]checkIpRegionFailWithMsg:msg]; - } - }]; -} - -- (void)getHomeRanks { - @kWeakify(self); - [Api getHomeRanksCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - NSArray *list = [HomeRankAvatarModel modelsWithArray:data.data]; - [[self getView] getHomeRanksSuccess:list]; - } - }]; -} - -- (void)getUserFirstChargeStatus { - @kWeakify(self); - [Api firstchargeInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - if ([self.getView respondsToSelector:@selector(getFirstChargeSuccess:)]) { - [self.getView getFirstChargeSuccess:[FirstRechargeModel modelWithJSON:data.data]]; - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:NO errorToast:NO]]; -} - -@end diff --git a/YuMi/Modules/YMNewHome/Presenter/XPHomeMinePresenter.h b/YuMi/Modules/YMNewHome/Presenter/XPHomeMinePresenter.h deleted file mode 100644 index d6d33a2..0000000 --- a/YuMi/Modules/YMNewHome/Presenter/XPHomeMinePresenter.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPHomeMinePresenter.h -// YuMi -// -// Created by P on 2024/6/18. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPHomeMinePresenter : BaseMvpPresenter - -- (void)getMyRoom; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Presenter/XPHomeMinePresenter.m b/YuMi/Modules/YMNewHome/Presenter/XPHomeMinePresenter.m deleted file mode 100644 index 2bb0de6..0000000 --- a/YuMi/Modules/YMNewHome/Presenter/XPHomeMinePresenter.m +++ /dev/null @@ -1,34 +0,0 @@ -// -// XPHomeMinePresenter.m -// YuMi -// -// Created by P on 2024/6/18. -// - -#import "XPHomeMinePresenter.h" - -#import "XPHomeMineProtocol.h" - -#import "Api+Home.h" -#import "HomeMineRoomModel.h" -#import "HomeCollectRoomModel.h" -#import "HomeRankAvatarModel.h" - -@implementation XPHomeMinePresenter - -- (void)getMyRoom { - @kWeakify(self); - [Api getMyRoomCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - HomeMineRoomModel *model = [HomeMineRoomModel modelWithDictionary:data.data]; - [[self getView] getMyRoomSuccess:model]; - } else { - [[self getView] getMyRoomSuccess:nil]; - } - }]; -} - - - -@end diff --git a/YuMi/Modules/YMNewHome/Presenter/XPHomePresenter.h b/YuMi/Modules/YMNewHome/Presenter/XPHomePresenter.h deleted file mode 100644 index 039104d..0000000 --- a/YuMi/Modules/YMNewHome/Presenter/XPHomePresenter.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// YMHomePresenter.h -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPHomePresenter : BaseMvpPresenter - -/// 请求首页 -/// @param tabId id -/// @param page 当前的页数 -// @param pageSize 一页有多少个 - 默认 20 -- (void)getRecommendRoomList:(NSString *)tabId page:(NSInteger)page; - -- (void)loadSecondBanner; - -/// 获取更多的个播房间 -- (void)getHomeMoreAnchorRoomList; -/// 热门房间（个人房）列表 -- (void)getHomePersonalRoomList; - -- (void)getMyCollectRooms:(NSInteger)page; -- (void)getMyRecentRooms:(NSInteger)page; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Presenter/XPHomePresenter.m b/YuMi/Modules/YMNewHome/Presenter/XPHomePresenter.m deleted file mode 100644 index 13589f9..0000000 --- a/YuMi/Modules/YMNewHome/Presenter/XPHomePresenter.m +++ /dev/null @@ -1,89 +0,0 @@ -// -// YMHomePresenter.m -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "XPHomePresenter.h" -#import "Api+Home.h" -#import "AccountInfoStorage.h" -///Model -#import "HomeRecommendRoomModel.h" -///P -#import "XPHomeProtocol.h" -#import "HomePlayRoomModel.h" -@implementation XPHomePresenter - - -/// 请求首页 -/// @param tabId id -/// @param page 当前的页数 - -- (void)getRecommendRoomList:(NSString *)tabId page:(NSInteger)page { - @kWeakify(self); - [Api getHomeTabRoomsCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray * array = [HomePlayRoomModel modelsWithArray:data.data]; - [[self getView] getHomeRecommendRoomListSuccess:array]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] getHomeRecommendRoomListFail:msg ]; - } showLoading:NO] - pageNum:[NSString stringWithFormat:@"%ld", page] - pageSize:@"50" - tabId:tabId]; -} - -- (void)loadSecondBanner { - @kWeakify(self); - [Api getHomeSecondBannerCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray * array = @[]; - array = [HomeBannerInfoModel modelsWithArray:data.data]; - [[self getView] getHomeSecondBannerSuccess:array]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [XNDJTDDLoadingTool hideHUD]; - [[self getView] getHomeSecondBannerSuccess:@[]]; - } showLoading:NO] uid:[AccountInfoStorage instance].getUid type:@"1"]; -} - -/// 获取更多的个播房间 -- (void)getHomeMoreAnchorRoomList { - [Api homeAnchorMoreRoomList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomeRecommendRoomModel modelsWithArray:data.data]; - [[self getView] getHomeMoreAnchorRoomListSuccess:array]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getHomeMoreAnchorRoomListFail:msg]; - }] singleRoomSortId:@""]; -} -/// 热门房间（个人房）列表 -- (void)getHomePersonalRoomList{ - NSString * uid = [AccountInfoStorage instance].getUid; - [Api homePersonalRoomList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomePlayRoomModel modelsWithArray:data.data]; - [[self getView] getHomePersonalRoomListSuccess:array ]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView]getHomePersonalRoomListFail]; - }errorToast:NO] uid:uid]; -} - -- (void)getMyCollectRooms:(NSInteger)page { - [Api getMyCollectRoomsCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - NSArray * array = [HomePlayRoomModel modelsWithArray:data.data]; - [[self getView] getMineCollectRoomsSuccess:array]; - } - pageNum:[NSString stringWithFormat:@"%ld", page] - pageSize:@"50"]; -} - -- (void)getMyRecentRooms:(NSInteger)page { - [Api getMyRecentRoomsCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - NSArray * array = [HomePlayRoomModel modelsWithArray:data.data]; - [[self getView] getMineRecentRoomsSuccess:array]; - } - pageNum:[NSString stringWithFormat:@"%ld", page] - pageSize:@"50"]; -} - -@end diff --git a/YuMi/Modules/YMNewHome/Presenter/XPNewHomeRecommendPresenter.h b/YuMi/Modules/YMNewHome/Presenter/XPNewHomeRecommendPresenter.h deleted file mode 100644 index 576b64b..0000000 --- a/YuMi/Modules/YMNewHome/Presenter/XPNewHomeRecommendPresenter.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// XPNewHomeRecommendPresenter.h -// YuMi -// -// Created by YuMi on 2023/6/18. -// - -#import "BaseMvpPresenter.h" -typedef void(^CompleteHandle)(BOOL isSuccess,NSArray * _Nullable playGameList, NSArray * _Nullable friendList); -NS_ASSUME_NONNULL_BEGIN - -@interface XPNewHomeRecommendPresenter : BaseMvpPresenter -/// 获取首页顶部的轮播图 -- (void)getHomeTopBannerList; -/// 获取首页推荐列表 -- (void)getHomeRecommendRoomList; -/// 获取首页热门房间列表 -- (void)getHomeHotRoomList; -/// 热门房间（个人房）列表 -- (void)getHomePersonalRoomList; -/// 组队开黑房间列表 -/// @param pageNum 当前的页数 -- (void)getPlayGameWithTeam:(int)pageNum; -///发现新朋友 --(void)getFriendList; -///获取小游戏列表 -- (void)getLittleGameList; -///获取首页数据 --(void)getHomeListDataWith:(int)pageNum completeHandle:(CompleteHandle)completeHandle; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Presenter/XPNewHomeRecommendPresenter.m b/YuMi/Modules/YMNewHome/Presenter/XPNewHomeRecommendPresenter.m deleted file mode 100644 index 04e9502..0000000 --- a/YuMi/Modules/YMNewHome/Presenter/XPNewHomeRecommendPresenter.m +++ /dev/null @@ -1,203 +0,0 @@ -// -// XPNewHomeRecommendPresenter.m -// YuMi -// -// Created by YuMi on 2023/6/18. -// - -#import "XPNewHomeRecommendPresenter.h" -#import -#import "Api+Home.h" -#import "Api+Guild.h" -#import "Api+LittleGame.h" -#import "AccountInfoStorage.h" -#import "HomeMenuInfoModel.h" -#import "HomeRecommendRoomModel.h" -#import "HomeBannerInfoModel.h" -#import "HomePlayRoomModel.h" -#import "XPNewHomeRecommendProtocol.h" -#import "ClanDetailInfoModel.h" -#import "LittleGameInfoModel.h" - - - - - -@implementation XPNewHomeRecommendPresenter -/// 获取首页顶部的轮播图 -- (void)getHomeTopBannerList { - RACSubject* banner = [RACSubject subject]; - RACSubject* menu = [RACSubject subject]; - - [[RACSignal combineLatest:@[banner, menu] reduce:^id(NSArray* bannerList, NSArray* menuList){ - //在这里 进行请求后的方法，回到主线程 - dispatch_async(dispatch_get_main_queue(), ^{ - - //更新UI操作 - [[self getView] getHomeTopBannerListSuccess:bannerList menuList:menuList]; - }); - - return nil; - }] subscribeError:^(NSError * _Nullable error) { - dispatch_async(dispatch_get_main_queue(), ^{ - - //更新UI操作 - [[self getView] getHomeRecommendDataFail]; - }); - - }]; - - NSString * uid = [AccountInfoStorage instance].getUid; - [Api homeBannerList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomeBannerInfoModel modelsWithArray:data.data]; - [banner sendNext:array]; - [banner sendCompleted]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [banner sendError:nil]; - [banner sendCompleted]; - } errorToast:NO] uid:uid type:@"1"]; - - [Api homeMenuList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomeMenuInfoModel modelsWithArray:data.data]; - [menu sendNext:array]; - [menu sendCompleted]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [menu sendError:nil]; - [menu sendCompleted]; - }errorToast:NO] uid:uid]; -} -/// 获取首页推荐列表 -- (void)getHomeRecommendRoomList { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api homeRecommendRoomList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomeRecommendRoomModel modelsWithArray:data.data]; - if (array.count > 1) { - ///排列顺序 1 - 6 0 - NSArray * newArray = [array sortedArrayUsingComparator:^NSComparisonResult(id _Nonnull obj1, id _Nonnull obj2) { - HomeRecommendRoomModel * model1 = obj1; - HomeRecommendRoomModel * model2 = obj2; - return [model1.seq compare:model2.seq]; - }]; - if (newArray.count > 0) { - NSMutableArray * array = [NSMutableArray arrayWithArray:newArray]; - NSMutableArray * temAray = [NSMutableArray array]; - [newArray enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - HomeRecommendRoomModel * model = obj; - if (model.seq.intValue == 0) { - [temAray addObject:model]; - [array removeObject:model]; - } - }]; - if (temAray.count > 0) { - [array addObjectsFromArray:temAray]; - } - newArray = array.copy; - } - array = newArray; - } - - [[self getView] getHomeRecommendRoomListSuccess:array]; - - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getHomeRecommendDataFail]; - }errorToast:NO] uid:uid]; -} - -/// 获取首页热门房间列表 -- (void)getHomeHotRoomList { - [Api homeHotRoomList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomeRecommendRoomModel modelsWithArray:data.data]; - [[self getView] getHomeHotRoomListSuccess:array]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getHomeRecommendDataFail]; - }]]; -} - - -/// 组队开黑房间列表 -/// @param pageNum 当前的页数 -- (void)getPlayGameWithTeam:(int)pageNum{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * pageNumStr = [NSString stringWithFormat:@"%d", pageNum]; - [Api homePlayGameTeam:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomePlayRoomModel modelsWithArray:data.data]; - [[self getView] getPlayGameWithTeamSuccess:array]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getHomeRecommendDataFail]; - }errorToast:NO] uid:uid pageNum:pageNumStr pageSize:@"20"]; -} - --(void)getHomeListDataWith:(int)pageNum completeHandle:(CompleteHandle)completeHandle{ - RACSubject* playGame = [RACSubject subject]; - RACSubject* friend = [RACSubject subject]; - [[RACSignal combineLatest:@[playGame, friend] reduce:^id(NSArray *playGameList, NSArray *friendList){ - if(completeHandle){ - completeHandle(YES,playGameList,friendList); - } - return nil; - }] subscribeError:^(NSError * _Nullable error) { - if(completeHandle){ - completeHandle(NO,@[],@[]); - } - }]; - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * pageNumStr = [NSString stringWithFormat:@"%d", pageNum]; - [Api homePlayGameTeam:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomePlayRoomModel modelsWithArray:data.data]; - [playGame sendNext:array]; - [playGame sendCompleted]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [playGame sendError:nil]; - }errorToast:NO] uid:uid pageNum:pageNumStr pageSize:@"20"]; - if([AccountInfoStorage instance].getUid.length == 0){ - [friend sendError:nil]; - return; - } - [Api requsetFriendListComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomePlayRoomModel modelsWithArray:data.data]; - [friend sendNext:array]; - [friend sendCompleted]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [friend sendError:nil]; - }]]; -} - -/// 热门房间（个人房）列表 -- (void)getHomePersonalRoomList { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api homePersonalRoomList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomePlayRoomModel modelsWithArray:data.data]; - [[self getView] getHomePersonalRoomListSuccess:array ]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getHomeRecommendDataFail]; - }errorToast:NO] uid:uid]; -} -///发现新朋友 --(void)getFriendList{ - if([AccountInfoStorage instance].getUid.length == 0){ - [[self getView]getFriendListFail]; - return; - } - [Api requsetFriendListComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomePlayRoomModel modelsWithArray:data.data]; - [[self getView]getFriendListSuccess:array ]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView]getFriendListFail]; - }]]; -} -///获取小游戏列表 -- (void)getLittleGameList { - NSString * uid = [[AccountInfoStorage instance] getUid]; - if (!uid.length) { - [[self getView] getHomeRecommendDataFail]; - return; - } - [Api getLittleGameList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [LittleGameInfoModel modelsWithArray:data.data]; - [[self getView] onGetLittleGameListSuccess:array]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getHomeRecommendDataFail]; - }errorToast:NO] - roomUid:@""]; -} -@end diff --git a/YuMi/Modules/YMNewHome/Protocol/XPHomeContainerProtocol.h b/YuMi/Modules/YMNewHome/Protocol/XPHomeContainerProtocol.h deleted file mode 100644 index 000575f..0000000 --- a/YuMi/Modules/YMNewHome/Protocol/XPHomeContainerProtocol.h +++ /dev/null @@ -1,38 +0,0 @@ -// -// XPHomeContainerProtocol.h -// YuMi -// -// Created by YuMi on 2021/12/2. -// - -#import -@class FirstRechargeModel; -NS_ASSUME_NONNULL_BEGIN -@class PIHomeCategoryTitleModel; -@protocol XPHomeContainerProtocol -@optional -///获取所有的tag成功 -- (void)getHomeTagListSuccess:(NSArray *)array; -- (void)getHomeTagListFailure; -///获取首页轮播图列表成功 -- (void)getHomeTopBannerListSuccess:(NSArray*)list; -////首页改版资源位 --(void)getCurrentResourceListSuccess:(NSArray *)list; -///一键匹配成功 -- (void)homeChatPickSuccess:(NSString *)uid; -///一键匹配失败 -- (void)homeChatPickFail:(NSString *)msg; -/// --(void)checkIpRegionFailWithMsg:(NSString *)msg; --(void)checkIpRegionSuccess:(NSInteger)seconds; -- (void)getHomeTopDataSuccess:(NSArray*)list menuList:(NSArray *)memuList; -- (void)getHomeTopDataSuccess:(NSArray *)resourceList - banners:(NSArray *)banners - rankAvatars:(NSArray *)rankAvatars; -- (void)getHomeRanksSuccess:(NSArray *)resourceList; - -- (void)getFirstChargeSuccess:(FirstRechargeModel *)model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Protocol/XPHomeMineProtocol.h b/YuMi/Modules/YMNewHome/Protocol/XPHomeMineProtocol.h deleted file mode 100644 index e4c3d07..0000000 --- a/YuMi/Modules/YMNewHome/Protocol/XPHomeMineProtocol.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPHomeMineProtocol.h -// YuMi -// -// Created by P on 2024/6/20. -// - -#import -@class HomeMineRoomModel; - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPHomeMineProtocol -@optional -///首页推荐房间的 -- (void)getMyRoomSuccess:(nullable HomeMineRoomModel *)model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Protocol/XPHomeProtocol.h b/YuMi/Modules/YMNewHome/Protocol/XPHomeProtocol.h deleted file mode 100644 index a76d591..0000000 --- a/YuMi/Modules/YMNewHome/Protocol/XPHomeProtocol.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// YMHomeProtocol.h -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPHomeProtocol -@optional -///首页推荐房间的 -- (void)getHomeRecommendRoomListSuccess:(NSArray *)list; -- (void)getHomeSecondBannerSuccess:(NSArray *)banners; - -///首页推荐房间失败 -- (void)getHomeRecommendRoomListFail:(NSString *)message; -///请求更多个播房成功 -- (void)getHomeMoreAnchorRoomListSuccess:(NSArray *)list; -///请求更多个播房失败 -- (void)getHomeMoreAnchorRoomListFail:(NSString *)messag; -///获取个人房列表成功 -- (void)getHomePersonalRoomListSuccess:(NSArray *)list; -///获取个人房列表失败 -- (void)getHomePersonalRoomListFail; - -- (void)getMineCollectRoomsSuccess:(NSArray *)rooms; -- (void)getMineRecentRoomsSuccess:(NSArray *)rooms; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Protocol/XPHomeRecommendProtocol.h b/YuMi/Modules/YMNewHome/Protocol/XPHomeRecommendProtocol.h deleted file mode 100644 index 158ec7c..0000000 --- a/YuMi/Modules/YMNewHome/Protocol/XPHomeRecommendProtocol.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMHomeRecommendProtocol.h -// YUMI -// -// Created by YUMI on 2022/2/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPHomeRecommendProtocol -///获取首页轮播图列表成功 -- (void)getHomeTopBannerListSuccess:(NSArray*)list menuList:(NSArray *)memuList; -///获取首页推荐列表成功 -- (void)getHomeRecommendRoomListSuccess:(NSArray *)list; -///获取首页热门房列表成功 -- (void)getHomeHotRoomListSuccess:(NSArray *)list; -///获取个人房列表成功 -- (void)getHomePersonalRoomListSuccess:(NSArray *)list; -///获取组队开黑房间列表成功 -- (void)getPlayGameWithTeamSuccess:(NSArray *)list; -///获取首页数据失败 -- (void)getHomeRecommendDataFail; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Protocol/XPNewHomeRecommendProtocol.h b/YuMi/Modules/YMNewHome/Protocol/XPNewHomeRecommendProtocol.h deleted file mode 100644 index bcbd7b8..0000000 --- a/YuMi/Modules/YMNewHome/Protocol/XPNewHomeRecommendProtocol.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// XPNewHomeRecommendProtocol.h -// YuMi -// -// Created by YuMi on 2023/6/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class LittleGameInfoModel; -@protocol XPNewHomeRecommendProtocol -@optional -///获取首页轮播图列表成功 -- (void)getHomeTopBannerListSuccess:(NSArray*)list menuList:(NSArray *)memuList; -///获取首页推荐列表成功 -- (void)getHomeRecommendRoomListSuccess:(NSArray *)list; -///获取首页热门房列表成功 -- (void)getHomeHotRoomListSuccess:(NSArray *)list; -///获取个人房列表成功 -- (void)getHomePersonalRoomListSuccess:(NSArray *)list; -///获取组队开黑房间列表成功 -- (void)getPlayGameWithTeamSuccess:(NSArray *)list; -///获取首页数据失败 -- (void)getHomeRecommendDataFail; -///发现新朋友 --(void)getFriendListSuccess:(NSArray *)list; -///发现新朋友 --(void)getFriendListFail; -///获取小游戏列表 -- (void)onGetLittleGameListSuccess:(NSArray *)items; - - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/EventCenterEmptyCell.h b/YuMi/Modules/YMNewHome/View/Cell/EventCenterEmptyCell.h deleted file mode 100644 index 8ed5b14..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/EventCenterEmptyCell.h +++ /dev/null @@ -1,11 +0,0 @@ -#import "UIKit/UIKit.h" - -@interface EventCenterEmptyCell : UITableViewCell - -+ (CGFloat)cellHeight; -+ (void)registerTo:(UITableView *)tableView withCustomID:(NSString *)cid; -+ (EventCenterEmptyCell *)cellFor:(UITableView *)tableView - customID:(NSString *)cid - atIndexPath:(NSIndexPath *)indexPath; -- (void)updateTitle:(NSString *)title; -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/EventCenterEmptyCell.m b/YuMi/Modules/YMNewHome/View/Cell/EventCenterEmptyCell.m deleted file mode 100644 index 9aa126e..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/EventCenterEmptyCell.m +++ /dev/null @@ -1,61 +0,0 @@ -#import "EventCenterEmptyCell.h" - -@implementation EventCenterEmptyCell -{ - NSString *cid; - UILabel *titleLabel; - UIImageView *ufoImageView; -} - -+ (CGFloat)cellHeight { - return 170; -} - -+ (void)registerTo:(UITableView *)tableView withCustomID:(NSString *)cid{ - if ([NSString isEmpty:cid]) { - cid = NSStringFromClass([self class]); - } - [tableView registerClass:[self class] - forCellReuseIdentifier:cid]; -} - -+ (EventCenterEmptyCell *)cellFor:(UITableView *)tableView - customID:(NSString *)cid - atIndexPath:(NSIndexPath *)indexPath; { - if ([NSString isEmpty:cid]) { - cid = NSStringFromClass([self class]); - } - return [tableView dequeueReusableCellWithIdentifier:cid forIndexPath:indexPath]; -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.contentView.backgroundColor = [UIColor whiteColor]; - - titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"20.20.59_text_19") - font:kFontRegular(14) - textColor:UIColorFromRGB(0xafb1b3)]; - ufoImageView = [[UIImageView alloc] initWithImage:kImage(@"common_empty_UFO")]; - [self.contentView addSubview:ufoImageView]; - [self.contentView addSubview:titleLabel]; - [ufoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(16); - make.size.mas_equalTo(CGSizeMake(110, 110)); - }]; - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(ufoImageView.mas_bottom).offset(16); - make.height.mas_equalTo(20); - }]; - } - return self; -} - -- (void)updateTitle:(NSString *)title { - titleLabel.text = title; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/EventCenterEventCell.h b/YuMi/Modules/YMNewHome/View/Cell/EventCenterEventCell.h deleted file mode 100644 index be03f53..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/EventCenterEventCell.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// EventCenterEventCell.h -// YuMi -// -// Created by P on 2025/4/29. -// - -#import -@class EventItemModel; - -typedef enum : NSUInteger { - EventCellAction_participate, - EventCellAction_sub, - EventCellAction_unsub, - EventCellAction_delete -} EventCellActions; - -NS_ASSUME_NONNULL_BEGIN - -@interface EventCenterEventCell : UITableViewCell - -@property (nonatomic, copy) void(^statusButtonDidTap)(EventItemModel *model, EventCellActions action); - -+ (CGFloat)cellHeight; -+ (void)registerTo:(UITableView *)tableView; -+ (EventCenterEventCell *)cellFor:(UITableView *)tableView atIndexPath:(NSIndexPath *)indexPath; - -- (void)updateCell:(EventItemModel *)model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/EventCenterEventCell.m b/YuMi/Modules/YMNewHome/View/Cell/EventCenterEventCell.m deleted file mode 100644 index fdd9e18..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/EventCenterEventCell.m +++ /dev/null @@ -1,460 +0,0 @@ -// -// EventCenterEventCell.m -// YuMi -// -// Created by P on 2025/4/29. -// - -#import "EventCenterEventCell.h" -#import "EventItemModel.h" -@interface EventCenterEventCell() - -@property (nonatomic, strong) EventItemModel *model; - -@property (nonatomic, strong) NetImageView *bgImageView; -@property (nonatomic, strong) NetImageView *avatarImageView; -@property (nonatomic, strong) UILabel *nameLabel; -@property (nonatomic, strong) UILabel *idLabel; -@property (nonatomic, strong) UILabel *eventDescLabel; -@property (nonatomic, strong) UILabel *timeLabel; -@property (nonatomic, strong) UILabel *subLabel; - -@property (nonatomic, strong) UIImageView *sexImageView; -@property (nonatomic, strong) UIImageView *clockImageView; -@property (nonatomic, strong) UIImageView *ringImageView; - -@property (nonatomic, strong) UIButton *statusButton; -@property (nonatomic, strong) UIButton *deleteButton; - -@property (nonatomic, assign) EventCellActions action; - -@end - -@implementation EventCenterEventCell - -+ (CGFloat)cellHeight { - return 130; -} - -+ (void)registerTo:(UITableView *)tableView { - [tableView registerClass:[self class] - forCellReuseIdentifier:NSStringFromClass([self class])]; -} - -+ (EventCenterEventCell *)cellFor:(UITableView *)tableView atIndexPath:(NSIndexPath *)indexPath { - return [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([self class]) - forIndexPath:indexPath]; -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.separatorInset = UIEdgeInsetsZero; - self.backgroundColor = [UIColor whiteColor]; - self.contentView.backgroundColor = [UIColor whiteColor]; - - [self.contentView addSubview:self.bgImageView]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).inset(12); - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.height.mas_equalTo(118); - }]; - - UIView *mask_1 = [self blackMask]; - [self.bgImageView addSubview:mask_1]; - [mask_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.bgImageView); - }]; - - [self.contentView addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(self.bgImageView).offset(12); - make.size.mas_equalTo(CGSizeMake(35, 35)); - }]; - - [self.contentView addSubview:self.nameLabel]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView).offset(1); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); - }]; - - [self.contentView addSubview:self.sexImageView]; - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.nameLabel); - make.leading.mas_equalTo(self.nameLabel.mas_trailing).offset(2); - make.size.mas_equalTo(CGSizeMake(14, 14)); - }]; - - [self.contentView addSubview:self.idLabel]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.avatarImageView).offset(1); - make.leading.mas_equalTo(self.nameLabel); - }]; - - [self.contentView addSubview:self.eventDescLabel]; - [self.eventDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.bgImageView).inset(12); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(12); - }]; - - UIView *mask_2 = [self blackMask]; - [self.bgImageView addSubview:mask_2]; - [mask_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.bgImageView); - make.height.mas_equalTo(32); - }]; - - [self.contentView addSubview:self.clockImageView]; - [self.clockImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(mask_2); - make.leading.mas_equalTo(mask_2).offset(13); - make.size.mas_equalTo(CGSizeMake(14, 14)); - }]; - - [self.contentView addSubview:self.timeLabel]; - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.clockImageView.mas_trailing).offset(1); - make.centerY.mas_equalTo(mask_2); - }]; - - [self.contentView addSubview:self.subLabel]; - [self.subLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(mask_2).offset(-13); - make.centerY.mas_equalTo(mask_2); - }]; - - [self.contentView addSubview:self.ringImageView]; - [self.ringImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(mask_2); - make.trailing.mas_equalTo(self.subLabel.mas_leading).offset(-1); - make.size.mas_equalTo(CGSizeMake(14, 14)); - }]; - - [self.contentView addSubview:self.statusButton]; - [self.statusButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avatarImageView); - make.trailing.mas_equalTo(self.bgImageView).offset(-13); - make.height.mas_equalTo(26); - make.width.mas_greaterThanOrEqualTo(40); - }]; - - [self.contentView addSubview:self.deleteButton]; - [self.deleteButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avatarImageView); - make.trailing.mas_equalTo(self.bgImageView).offset(-13); - make.height.mas_equalTo(26); - make.width.mas_equalTo(38); - }]; - } - return self; -} - -- (void)updateCell:(EventItemModel *)model { - _model = model; - self.bgImageView.imageUrl = model.eventBanner; - self.avatarImageView.imageUrl = model.avatar; - self.nameLabel.text = model.nick; - self.idLabel.text = [NSString stringWithFormat:@"ID:%@", model.erbanNo]; - self.eventDescLabel.text = model.eventTopic; - - self.subLabel.text = @(model.subNum).stringValue; - self.sexImageView.image = model.gender == 1 ? kImage(@"common_male") : kImage(@"common_female"); - - [self updateTimeLabel]; - - [self updateStatusButton]; -} - -- (void)updateTimeLabel { - BOOL needUpdateStatus = YES; - if (self.model.uid == [AccountInfoStorage instance].getUid.integerValue) { - switch (self.model.eventStatus) { - case 0: - needUpdateStatus = NO; - self.timeLabel.text = YMLocalizedString(@"20.20.59_text_30"); - self.clockImageView.image = kImage(@"event_review"); - break; - case 2: - needUpdateStatus = NO; - self.timeLabel.text = YMLocalizedString(@"20.20.59_text_31"); - self.clockImageView.image = kImage(@"event_review"); - break; - case 4: - needUpdateStatus = NO; - self.timeLabel.text = YMLocalizedString(@"20.20.59_text_25"); - break; - - default: - break; - } - } - - self.timeLabel.textColor = [UIColor colorWithWhite:1 alpha:0.6 ]; - - if (needUpdateStatus) { - self.clockImageView.image = kImage(@"event_clock"); - switch (self.model.liveStatus) { - case 1: - self.timeLabel.text = [NSString stringWithFormat:@"%@:%@", - YMLocalizedString(@"20.20.59_text_15"), - self.model.eventStartTimeStr]; - break; - case 2: - self.timeLabel.text = YMLocalizedString(@"20.20.59_text_24"); - self.timeLabel.textColor = UIColorFromRGB(0xff8c03); - self.clockImageView.image = kImage(@"event_staring"); - break; - case 3: - self.timeLabel.text = YMLocalizedString(@"20.20.59_text_25"); - break; - default: - break; - } - } -} - -- (void)updateStatusButton { - BOOL needUpdateStatus = YES; - if (self.model.uid == [AccountInfoStorage instance].getUid.integerValue) { - switch (self.model.eventStatus) { - case 0: - needUpdateStatus = NO; - self.statusButton.hidden = YES; - self.deleteButton.hidden = YES; - break; - case 2: - case 4: - needUpdateStatus = NO; - self.statusButton.hidden = YES; - self.deleteButton.hidden = NO; - break; - - default: - break; - } - } - - if (needUpdateStatus) { - self.statusButton.alpha = 1; - self.statusButton.enabled = YES; - self.statusButton.hidden = NO; - self.deleteButton.hidden = YES; - switch (self.model.liveStatus) { - case 1: - if (self.model.subStatus) { - [self statusButtonUpdateToUnSub]; - } else { - [self statusButtonUpdateToSub]; - } - break; - case 2: - [self statusButtonUpdateToPatricipate]; - break; - case 3: - self.statusButton.alpha = 0.6; - self.statusButton.enabled = NO; - if (self.model.subStatus) { - [self statusButtonUpdateToUnSub]; - } else { - [self statusButtonUpdateToSub]; - } - break; - - default: - break; - } - } -} - -- (void)statusButtonUpdateToSub { - self.action = EventCellAction_sub; - [self.statusButton setImage:kImage(@"event_ring_sub") forState:UIControlStateNormal]; - [self.statusButton setTitle:YMLocalizedString(@"20.20.59_text_5") forState:UIControlStateNormal]; - - // 恢复默认insets - [self resetStatusButtonInsets]; -} - -- (void)statusButtonUpdateToUnSub { - self.action = EventCellAction_unsub; - [self.statusButton setImage:kImage(@"event_ring_unsub") forState:UIControlStateNormal]; - [self.statusButton setTitle:YMLocalizedString(@"20.20.59_text_6") forState:UIControlStateNormal]; - - // 恢复默认insets - [self resetStatusButtonInsets]; -} - -- (void)statusButtonUpdateToPatricipate { - self.action = EventCellAction_participate; - [self.statusButton setImage:kImage(@"room_icon") forState:UIControlStateNormal]; - [self.statusButton setTitle:YMLocalizedString(@"20.20.59_text_7") forState:UIControlStateNormal]; - - // 恢复默认insets - [self resetStatusButtonInsets]; -} - -// 添加重置按钮内边距的方法 -- (void)resetStatusButtonInsets { - CGFloat imageTitleSpacing = 4.0; - self.statusButton.contentEdgeInsets = UIEdgeInsetsMake(0, 8, 0, 8); - self.statusButton.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, imageTitleSpacing); - self.statusButton.titleEdgeInsets = UIEdgeInsetsMake(0, -imageTitleSpacing, 0, 0); -} - -- (void)didTapStatusButton { - if (self.statusButtonDidTap) { - self.statusButtonDidTap(self.model, self.action); - } -} - -- (void)didTapDeleteButton { - if (self.statusButtonDidTap) { - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.actionStyle = TTAlertActionBothStyle; - config.title = YMLocalizedString(@"20.20.59_text_28.1"); - config.message = YMLocalizedString(@"20.20.59_text_28.2"); - - TTAlertButtonConfig *buttonConfig = config.confirmButtonConfig; - buttonConfig.title = YMLocalizedString(@"XPMineCollectRoomListViewController7"); - config.confirmButtonConfig = buttonConfig; - - - @kWeakify(self); - [TTPopup alertWithConfig:config showBorder:NO confirmHandler:^{ - @kStrongify(self); - self.statusButtonDidTap(self.model, EventCellAction_delete); - } cancelHandler:^{ }]; - - - } -} - -#pragma mark - -- (NetImageView *)bgImageView { - if (!_bgImageView) { - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultBannerPlaceholder]; - _bgImageView = [[NetImageView alloc] initWithConfig:config]; - [_bgImageView setCornerRadius:12]; - } - return _bgImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - [_avatarImageView setCornerRadius:35/2 - corners:kCALayerMaxXMaxYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMinXMinYCorner - borderWidth:1 - borderColor:[UIColor whiteColor]]; - } - return _avatarImageView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(14) - textColor:[UIColor whiteColor]]; - } - return _nameLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(12) - textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - } - return _idLabel; -} - -- (UILabel *)eventDescLabel { - if (!_eventDescLabel) { - _eventDescLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(14) - textColor:[UIColor colorWithWhite:1 alpha:1]]; - _eventDescLabel.numberOfLines = 1; - } - return _eventDescLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(12) - textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - } - return _timeLabel; -} - -- (UILabel *)subLabel { - if (!_subLabel) { - _subLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(12) - textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - } - return _subLabel; -} - -- (UIImageView *)sexImageView { - if (!_sexImageView) { - _sexImageView = [UIImageView new]; - } - return _sexImageView; -} - -- (UIImageView *)clockImageView { - if (!_clockImageView) { - _clockImageView = [[UIImageView alloc] initWithImage:kImage(@"event_clock")]; - } - return _clockImageView; -} - -- (UIImageView *)ringImageView { - if (!_ringImageView) { - _ringImageView = [[UIImageView alloc] initWithImage:kImage(@"event_ring")]; - } - return _ringImageView; -} - -- (UIView *)blackMask { - UIView *v = [[UIView alloc] init]; - v.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - return v; -} - -- (UIButton *)statusButton { - if (!_statusButton) { - _statusButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_statusButton addTarget:self - action:@selector(didTapStatusButton) - forControlEvents:UIControlEventTouchUpInside]; - [_statusButton setCornerRadius:13]; - [_statusButton setBackgroundColor:[UIColor whiteColor]]; - [_statusButton.titleLabel setFont:kFontMedium(13)]; - [_statusButton setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateNormal]; - } - return _statusButton; -} - -- (UIButton *)deleteButton { - if (!_deleteButton) { - _deleteButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_deleteButton addTarget:self - action:@selector(didTapDeleteButton) - forControlEvents:UIControlEventTouchUpInside]; - [_deleteButton setCornerRadius:13]; - [_deleteButton setBackgroundColor:UIColorFromRGB(0xffe5e5)]; - [_deleteButton setImage:kImage(@"event_delete") forState:UIControlStateNormal]; - } - return _deleteButton; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/EventCenterOfficialCell.h b/YuMi/Modules/YMNewHome/View/Cell/EventCenterOfficialCell.h deleted file mode 100644 index 7b23232..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/EventCenterOfficialCell.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// EventCenterOfficialCell.h -// YuMi -// -// Created by P on 2025/4/29. -// - -#import -@class HomeBannerInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface EventCenterOfficialCell : UITableViewCell - -@property (nonatomic, strong) HomeBannerInfoModel *cellModel; - -// 更新倒计时天数 -//- (void)updateCountdownWithDays:(NSInteger)days; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/EventCenterOfficialCell.m b/YuMi/Modules/YMNewHome/View/Cell/EventCenterOfficialCell.m deleted file mode 100644 index 59d5f77..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/EventCenterOfficialCell.m +++ /dev/null @@ -1,155 +0,0 @@ -// -// EventCenterOfficialCell.m -// YuMi -// -// Created by P on 2025/4/29. -// - -#import "EventCenterOfficialCell.h" -#import "HomeBannerInfoModel.h" -#import - -@interface EventCenterOfficialCell() - -@property (nonatomic, strong) NetImageView *coverImageView; -@property (nonatomic, strong) UILabel *titleLabel; -@property(nonatomic, strong) SVGAImageView *svgaImageView; -@property(nonatomic, strong) HomeBannerFillVoInfoModel *cellFillVoMode; - -@end - -@implementation EventCenterOfficialCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.contentView.backgroundColor = [UIColor whiteColor]; - - [self.contentView addSubview:self.coverImageView]; - [self.contentView addSubview:self.svgaImageView]; - [self.contentView addSubview:self.titleLabel]; - - [self.coverImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(6); - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.height.mas_equalTo(80); - }]; - - [self.svgaImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.coverImageView); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.coverImageView.mas_bottom).offset(4); - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.height.mas_equalTo(26); - }]; - - } - return self; -} - -- (void)setCellModel:(HomeBannerInfoModel *)cellModel { - _cellModel = cellModel; - self.coverImageView.imageUrl = cellModel.bannerPic; - self.titleLabel.text = cellModel.bannerName; - - if (cellModel.skipType == HomeBannerInfoSkipType_Web_CP || - cellModel.skipType == HomeBannerInfoSkipType_Web_Custom || - cellModel.skipType == HomeBannerInfoSkipType_Web_WeekStar) { - self.coverImageView.hidden = YES; - self.svgaImageView.hidden = NO; - self.cellFillVoMode = cellModel.fillVo; - SVGAParser *p = [[SVGAParser alloc] init]; - @kWeakify(self); - [p parseWithURL:[NSURL URLWithString:cellModel.bannerPic] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - if (videoItem) { - [self playSVGAWith:videoItem]; - } else { - self.svgaImageView.hidden = YES; - self.coverImageView.hidden = NO; - self.coverImageView.imageUrl = cellModel.bannerPic; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - self.svgaImageView.hidden = YES; - self.coverImageView.hidden = NO; - self.coverImageView.imageUrl = cellModel.bannerPic; - }]; - } else { - self.svgaImageView.hidden = YES; - self.coverImageView.hidden = NO; - self.coverImageView.imageUrl = cellModel.bannerPic; - } -} - -- (void)playSVGAWith:(SVGAVideoEntity *)videoItem { - self.svgaImageView.videoItem = videoItem; - if (self.cellFillVoMode) { - [self updateSvgaImage:self.cellFillVoMode.avatar key:@"avatar"]; - [self updateSvgaImage:self.cellFillVoMode.picUrl key:@"gift"]; - [self updateSvgaImage:self.cellFillVoMode.avatar key:@"avatar_1"]; - [self updateSvgaImage:self.cellFillVoMode.loverAvatar key:@"avatar_2"]; - - [self updateSvgaText:[NSString stringWithFormat:@"ID: %@", self.cellFillVoMode.erbanNo] key:@"id"]; - [self updateSvgaText:self.cellFillVoMode.giftName key:@"name"]; - [self updateSvgaText:[NSString stringWithFormat:@"ID: %@", self.cellFillVoMode.erbanNo] key:@"id_1"]; - [self updateSvgaText:[NSString stringWithFormat:@"ID: %@", self.cellFillVoMode.loverErbanNo] key:@"id_2"]; - } - - [self.svgaImageView startAnimation]; -} - -- (void)updateSvgaImage:(NSString *)imagePath key:(NSString *)key { - if (self.svgaImageView && ![NSString isEmpty:imagePath] && ![NSString isEmpty:key]) { - [self.svgaImageView setImageWithURL:[NSURL URLWithString:imagePath] forKey:key]; - } -} - -- (void)updateSvgaText:(NSString *)content key:(NSString *)key { - if (self.svgaImageView && ![NSString isEmpty:content] && ![NSString isEmpty:key]) { - NSAttributedString *string = [[NSAttributedString alloc] initWithString:content - attributes:@{ - NSFontAttributeName: kFontMedium(16), - NSForegroundColorAttributeName: UIColorFromRGB(0xF9F8CF) - }]; - [self.svgaImageView setAttributedText:string - forKey:key]; - } -} - -#pragma mark - -- (NetImageView *)coverImageView { - if (!_coverImageView) { - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultBannerPlaceholder]; - _coverImageView = [[NetImageView alloc] initWithConfig:config]; - [_coverImageView setCornerRadius:12]; - } - return _coverImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(14) textColor:UIColorFromRGB(0x313131)]; - } - return _titleLabel; -} - -- (SVGAImageView *)svgaImageView { - if (!_svgaImageView) { - _svgaImageView = [[SVGAImageView alloc] init]; - _svgaImageView.loops = -1; - _svgaImageView.autoPlay = YES; - _svgaImageView.clearsAfterStop = NO; - [_svgaImageView setCornerRadius:12]; - } - return _svgaImageView; -} - -- (void)dealloc { - -} -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.h b/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.h deleted file mode 100644 index 53c1a10..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// XPHomeBannerTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/2/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class HomeBannerInfoModel, XPHomeBannerTableViewCell; - -@protocol XPHomeBannerTableViewCellDelegate - -///点击了某个banner -- (void)xPHomeBannerTableViewCell:(XPHomeBannerTableViewCell *)view didClickBanner:(HomeBannerInfoModel *)info; - -@end - -@interface XPHomeBannerTableViewCell : UITableViewCell -@property (nonatomic,strong) NSArray *bannerList; -///代理 -@property (nonatomic,weak) id delegate; -///是否个人中心banner -@property (nonatomic, assign) BOOL isMineViewBanner; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.m deleted file mode 100644 index b02c63f..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.m +++ /dev/null @@ -1,97 +0,0 @@ -// -// XPHomeBannerTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/2/21. -// 轮播图 - -#import "XPHomeBannerTableViewCell.h" -///Third -#import -#import -///Model -#import "HomeBannerInfoModel.h" -#import "NSArray+Safe.h" -#import "UIImageConstant.h" -@interface XPHomeBannerTableViewCell () -@property (nonatomic, strong) SDCycleScrollView *pi_BannerView; -@end - -@implementation XPHomeBannerTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.pi_BannerView]; -} - -- (void)initSubViewConstraints { - [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).mas_offset(16); - make.bottom.mas_equalTo(self.contentView); - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - }]; - -} -#pragma mark - SDCycleScrollViewDelegate -- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index { - HomeBannerInfoModel * bannerInfo = [self.bannerList xpSafeObjectAtIndex:index]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPHomeBannerTableViewCell:didClickBanner:)]) { - [self.delegate xPHomeBannerTableViewCell:self didClickBanner:bannerInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setBannerList:(NSArray *)bannerList { - _bannerList = bannerList; - if (_bannerList.count > 0) { - NSMutableArray * array = [NSMutableArray array]; - [_bannerList enumerateObjectsUsingBlock:^(HomeBannerInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.bannerPic.length > 0) { - [array addObject:obj.bannerPic]; - } - }]; - if (array.count > 0) { - self.pi_BannerView.imageURLStringsGroup = array; - [self.pi_BannerView autoScroll]; - } - } -} - -- (void)setIsMineViewBanner:(BOOL)isMineViewBanner { - [self.pi_BannerView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(self.contentView); - }]; -} - -- (SDCycleScrollView *)pi_BannerView { - if (!_pi_BannerView) { - _pi_BannerView = [[SDCycleScrollView alloc] init]; - _pi_BannerView.backgroundColor = [UIColor clearColor]; - _pi_BannerView.layer.cornerRadius = 10; - _pi_BannerView.layer.masksToBounds = YES; - _pi_BannerView.delegate = self; - _pi_BannerView.showPageControl = NO; - _pi_BannerView.autoScrollTimeInterval = 5.0; - _pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; - _pi_BannerView.placeholderImage = [UIImageConstant defaultBannerPlaceholder]; - // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 - _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - for (UIView *subView in _pi_BannerView.subviews) { - subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - } - return _pi_BannerView; -} - - -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPHomeGameCell.h b/YuMi/Modules/YMNewHome/View/Cell/XPHomeGameCell.h deleted file mode 100644 index 4987ba7..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPHomeGameCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPHomeGameCell.h -// xplan-ios -// -// Created by duoban on 2022/11/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPHomeGameCell : UICollectionViewCell -@property (nonatomic,assign) BOOL isChoose; -@property (nonatomic,copy) NSString *imageUrl; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPHomeGameCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPHomeGameCell.m deleted file mode 100644 index 01be6ce..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPHomeGameCell.m +++ /dev/null @@ -1,55 +0,0 @@ -// -// XPHomeGameCell.m -// xplan-ios -// -// Created by duoban on 2022/11/21. -// - -#import "XPHomeGameCell.h" -@interface XPHomeGameCell() -@property (nonatomic,strong) NetImageView *bgImageView; -@end -@implementation XPHomeGameCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.bgImageView]; -} -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; -} -- (void)setImageUrl:(NSString *)imageUrl{ - _imageUrl = imageUrl; - _bgImageView.imageUrl = _imageUrl; -} --(void)setIsChoose:(BOOL)isChoose{ - _isChoose = isChoose; - _bgImageView.layer.borderWidth = _isChoose == YES ? 2 : 0; - -} -#pragma mark -懒加载 - -- (NetImageView *)bgImageView{ - if (!_bgImageView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _bgImageView = [[NetImageView alloc]initWithConfig:config]; - _bgImageView.layer.cornerRadius = kGetScaleWidth(10); - _bgImageView.layer.masksToBounds = YES; - _bgImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - - } - return _bgImageView; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyAudioView.h b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyAudioView.h deleted file mode 100644 index c0f5e7d..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyAudioView.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// XPNewHomePartyAudioView.h -// YuMi -// -// Created by duoban on 2023/9/4. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPNewHomePartyAudioView; -@protocol XPNewHomePartyAudioViewDelegate - --(void)xPNewHomePartyAudioView:(XPNewHomePartyAudioView *)view didClickPlaySound:(BOOL)isPlay; - -@end -@interface XPNewHomePartyAudioView : UIView - -///签名 -@property(nonatomic,copy) NSString *userDesc; -///语音 -@property(nonatomic,copy) NSString *userVoice; -///语音时长 -@property(nonatomic,copy) NSString *voiceDura; -@property(nonatomic,assign) BOOL isPlay; -@property(nonatomic,assign) BOOL isHiddenVew; -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyAudioView.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyAudioView.m deleted file mode 100644 index 0a9726e..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyAudioView.m +++ /dev/null @@ -1,192 +0,0 @@ -// -// XPNewHomePartyAudioView.m -// YuMi -// -// Created by duoban on 2023/9/4. -// - -#import "XPNewHomePartyAudioView.h" -#import "XPSkillCardPlayerManager.h" -#import -#import -@interface XPNewHomePartyAudioView () -///背景 -@property(nonatomic,strong) UIView *bgView; -///签名 -@property(nonatomic,strong) UILabel *signatureView; -///播放按钮 -@property(nonatomic,strong) UIButton *playBnt; -///图标 -@property(nonatomic,strong) UIImageView *audioBgView; -///时间 -@property(nonatomic,strong) UILabel *timeView; -///播放动效 -@property(nonatomic,strong) SVGAParser *parser; -@property(nonatomic,strong) SVGAImageView *playImageView; -@end -@implementation XPNewHomePartyAudioView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - UIView *subView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, 20, kGetScaleWidth(13))]; - [self addSubview:subView]; - subView.tag = 100001; - subView.backgroundColor = UIColorFromRGB(0xF5F6FA); - [subView setCornerWithLeftTopCorner:kGetScaleWidth(2) rightTopCorner:0 bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(20, kGetScaleWidth(13))]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.signatureView]; - [self.bgView addSubview:self.playBnt]; - [self.bgView addSubview:self.audioBgView]; - [self.bgView addSubview:self.playImageView]; - [self.bgView addSubview:self.timeView]; - @kWeakify(self); - [self.parser parseWithNamed:@"pi_home_new_play" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.playImageView.loops = INT_MAX; - self.playImageView.clearsAfterStop = NO; - self.playImageView.videoItem = videoItem; - [self.playImageView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { - }]; -} --(void)installConstraints{ - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.bottom.equalTo(self); - make.width.mas_lessThanOrEqualTo(kGetScaleWidth(192)); - }]; - [self.playBnt mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(26)); - make.top.mas_equalTo(kGetScaleWidth(0)); - make.leading.mas_equalTo(kGetScaleWidth(6)); - }]; - [self.audioBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(31)); - make.centerY.equalTo(self.bgView); - make.width.mas_equalTo(kGetScaleWidth(22)); - make.height.mas_equalTo(kGetScaleWidth(10)); - }]; - [self.playImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.audioBgView); - }]; - [self.timeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(54)); - make.height.mas_equalTo(kGetScaleWidth(15));make.centerY.equalTo(self.bgView); - }]; - [self.signatureView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(10)); - make.centerY.equalTo(self.bgView); - }]; -} --(void)playAudioAction:(UIButton *)sender{ - _playBnt.selected = !_playBnt.selected; - _audioBgView.hidden = _playBnt.selected; - _playImageView.hidden = !_playBnt.selected; - if(self.delegate && [self.delegate respondsToSelector:@selector(xPNewHomePartyAudioView:didClickPlaySound:)]){ - [self.delegate xPNewHomePartyAudioView:self didClickPlaySound:_playBnt.selected]; - } -} --(void)setUserVoice:(NSString *)userVoice{ - _userVoice = userVoice; - _playBnt.hidden = NO; - _audioBgView.hidden = NO; - _playImageView.hidden = NO; - _timeView.hidden = NO; - _signatureView.hidden = YES; - _signatureView.text = @""; - - [self.bgView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.top.bottom.equalTo(self); - make.width.mas_equalTo(kGetScaleWidth(85)); - }]; -} --(void)setUserDesc:(NSString *)userDesc{ - _userDesc = userDesc; - _playBnt.hidden = YES; - _audioBgView.hidden = YES; - _playImageView.hidden = YES; - _timeView.hidden = YES; - _signatureView.hidden = NO; - _signatureView.text = _userDesc; - [self.bgView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.top.bottom.equalTo(self); - make.width.mas_lessThanOrEqualTo(kGetScaleWidth(192)); - }]; -} --(void)setVoiceDura:(NSString *)voiceDura{ - _voiceDura = voiceDura; - _timeView.text = [NSString stringWithFormat:@"%@\"",_voiceDura]; -} -- (void)setIsHiddenVew:(BOOL)isHiddenVew{ - _isHiddenVew = isHiddenVew; - UIView *view = [self viewWithTag:100001]; - view.hidden = _isHiddenVew; - _bgView.hidden = _isHiddenVew; -} -- (void)setIsPlay:(BOOL)isPlay{ - _isPlay = isPlay; - _playBnt.selected = _isPlay; - _playImageView.hidden = !_isPlay; - _audioBgView.hidden = _isPlay; -} -#pragma mark - 懒加载 -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = UIColorFromRGB(0xF5F6FA); - _bgView.layer.cornerRadius = kGetScaleWidth(26)/2; - _bgView.layer.masksToBounds = YES; - - } - return _bgView; -} -- (UILabel *)signatureView{ - if(!_signatureView){ - _signatureView = [UILabel labelInitWithText:@"" font:kFontRegular(10) textColor:UIColorFromRGB(0x8A8CAB)]; - } - return _signatureView; -} -- (UIButton *)playBnt{ - if(!_playBnt){ - _playBnt = [UIButton new]; - [_playBnt setImage:kImage(@"home_audio_play_play") forState:UIControlStateNormal]; - [_playBnt setImage:kImage(@"home_audio_stop") forState:UIControlStateSelected]; - [_playBnt addTarget:self action:@selector(playAudioAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _playBnt; -} -- (UIImageView *)audioBgView{ - if(!_audioBgView){ - _audioBgView = [UIImageView new]; - _audioBgView.image = kImage(@"home_audio_icon"); - } - return _audioBgView; -} -- (UILabel *)timeView{ - if(!_timeView){ - _timeView = [UILabel labelInitWithText:@"0\"" font:kFontMedium(12) textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _timeView; -} -- (SVGAParser *)parser{ - if(!_parser){ - _parser = [SVGAParser new]; - } - return _parser; -} -- (SVGAImageView *)playImageView { - if (_playImageView == nil) { - _playImageView = [[SVGAImageView alloc]init]; - _playImageView.contentMode = UIViewContentModeScaleToFill; - _playImageView.backgroundColor = [UIColor clearColor]; - _playImageView.hidden = NO; - } - return _playImageView; -} -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.h b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.h deleted file mode 100644 index e859afe..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPNewHomePartyCollectionViewCell.h -// YuMi -// -// Created by duoban on 2023/9/4. -// - -#import -#import "HomePlayRoomModel.h" -NS_ASSUME_NONNULL_BEGIN -@class HomePlayRoomModel, HomeRecommendRoomModel; -@interface XPNewHomePartyCollectionViewCell : UICollectionViewCell -@property (nonatomic,strong) HomePlayRoomModel *roomInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m deleted file mode 100644 index 5b592f2..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m +++ /dev/null @@ -1,436 +0,0 @@ -// -// XPNewHomePartyCollectionViewCell.m -// YuMi -// -// Created by duoban on 2023/9/4. -// - -#import "XPNewHomePartyCollectionViewCell.h" -#import -#import -@interface XPNewHomePartyCollectionViewCell() -///背景 -@property(nonatomic,strong) NetImageView *avatarView; -///榜单 -@property(nonatomic,strong) NetImageView *rankImageView; -///类型 -@property(nonatomic,strong) NetImageView *tagImageView; - -///房间名 -@property(nonatomic,strong) UILabel *nameLabel; -@property(nonatomic,strong) UILabel *subLabel; -///热度 -@property(nonatomic,strong) UILabel *heatNumLable; -///热度波浪 -@property(nonatomic,strong) UIImageView *heatIcon; -///pk -@property(nonatomic,strong) SVGAParser *parser; -@property(nonatomic,strong) SVGAImageView *pkImageView; - -@property (nonatomic, assign) NSInteger membersCount; - -@property (nonatomic,strong) NetImageView *boomImageView; - -@property (nonatomic, strong) NetImageView *flagImage; - -@property (nonatomic, strong) NetImageView *levelImageView; - -@property (nonatomic, strong) NSMutableArray *iconViews; -@property(nonatomic, strong) UIStackView *iconStackView; -@property(nonatomic, strong) UIStackView *nameStackView; -@property(nonatomic, strong) UIStackView *subTabStackView; - -@end -@implementation XPNewHomePartyCollectionViewCell - -- (NetImageView *)createIconViewWithTag:(NSInteger)tag { - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - NetImageView *iconView = [[NetImageView alloc] initWithConfig:config]; - iconView.tag = tag; - iconView.layer.cornerRadius = kGetScaleWidth(20)/2; - iconView.layer.masksToBounds = YES; - iconView.layer.borderWidth = 1; - iconView.layer.borderColor = [UIColor whiteColor].CGColor; - iconView.hidden = YES; // 默认隐藏 - [self.contentView addSubview:iconView]; - return iconView; -} - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - self.clipsToBounds = NO; - self.contentView.clipsToBounds = NO; - self.membersCount = (kGetScaleWidth(345) - kGetScaleWidth(90))/kGetScaleWidth(20); - self.iconViews = [NSMutableArray array]; - for (int i = 0; i < self.membersCount; i++) { - NetImageView *iconView = [self createIconViewWithTag:100 + i]; - [self.iconViews addObject:iconView]; - } - - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.contentView.backgroundColor = [UIColor clearColor]; - - UIView *bg = [[UIView alloc] init]; - bg.backgroundColor = [UIColor whiteColor]; - [bg setCornerRadius:10]; - [self.contentView addSubview:bg]; - [bg mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.contentView addSubview:self.rankImageView]; - [self.contentView addSubview:self.avatarView]; - [self.avatarView addSubview:self.pkImageView]; - [self.contentView addSubview:self.levelImageView]; - - _nameStackView = [[UIStackView alloc] initWithArrangedSubviews:@[self.flagImage, self.nameLabel]]; - _nameStackView.spacing = 4; - [self.contentView addSubview:self.nameStackView]; - - _subTabStackView = [[UIStackView alloc] initWithArrangedSubviews:@[self.tagImageView, self.subLabel]]; - _subTabStackView.spacing = 4; - [self.contentView addSubview:self.subTabStackView]; - - [self.contentView addSubview:self.heatIcon]; - [self.contentView addSubview:self.heatNumLable]; - [self.contentView addSubview:self.boomImageView]; - - @kWeakify(self); - [self.parser parseWithNamed:@"pi_home_new_pk" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.pkImageView.loops = INT_MAX; - self.pkImageView.clearsAfterStop = NO; - self.pkImageView.videoItem = videoItem; - [self.pkImageView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { - }]; -} - --(void)installConstraints{ - [self.rankImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView).insets(UIEdgeInsetsMake(-20, -10, 0, -10)); - }]; - - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(73)); - make.leading.mas_equalTo(kGetScaleWidth(10)); - make.bottom.mas_equalTo(-kGetScaleWidth(10)); - }]; - - [self.boomImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(11); - make.trailing.mas_equalTo(self.contentView).offset(-8); - make.size.mas_equalTo(CGSizeMake(40, 40)); - }]; - - [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarView); - make.leading.mas_equalTo(self.avatarView.mas_trailing).offset(12); - make.trailing.mas_equalTo(self.boomImageView.mas_leading); - make.height.mas_equalTo(22); - }]; - - [self.flagImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(18); - }]; - - [self.subTabStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nameStackView.mas_bottom).offset(4); - make.leading.mas_equalTo(self.nameStackView); - make.height.mas_equalTo(22); - make.trailing.mas_equalTo(self.boomImageView.mas_leading); - }]; - - - [self.tagImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(0); - }]; - - [self.heatNumLable mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-8); - make.bottom.mas_equalTo(-kGetScaleWidth(10)); - make.height.mas_equalTo(kGetScaleWidth(17)); - }]; - - [self.heatIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(14)); - make.height.mas_equalTo(kGetScaleWidth(14)); - make.trailing.equalTo(self.heatNumLable.mas_leading).mas_offset(-4); - make.centerY.equalTo(self.heatNumLable); - }]; - - [self.pkImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(23)); - make.height.mas_equalTo(kGetScaleWidth(22)); - make.trailing.mas_equalTo(-kGetScaleWidth(6)); - make.bottom.equalTo(self.avatarView.mas_bottom).mas_offset(-kGetScaleWidth(6)); - }]; - - [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarView).offset(-2); - make.leading.mas_equalTo(self.avatarView); - make.size.mas_equalTo(CGSizeMake(40, 16)); - }]; - - - - _iconStackView = [[UIStackView alloc] initWithArrangedSubviews:self.iconViews]; - _iconStackView.spacing = -4; - [self.contentView addSubview:self.iconStackView]; - [self.iconStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarView.mas_trailing).offset(12); - make.bottom.equalTo(self.avatarView.mas_bottom); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; -} - -- (void)prepareForReuse { - [super prepareForReuse]; - // 停止并清理动画，避免复用时占用内存 - [self.pkImageView stopAnimation]; - self.pkImageView.videoItem = nil; - self.pkImageView.hidden = YES; - - // 重置图像资源，打断潜在的异步加载引用 - [self.avatarView cancelLoadImage]; - self.avatarView.imageUrl = nil; - self.rankImageView.image = nil; - [self.tagImageView cancelLoadImage]; - self.tagImageView.image = nil; - self.tagImageView.hidden = YES; - [self.levelImageView cancelLoadImage]; - self.levelImageView.imageUrl = nil; - [self.boomImageView cancelLoadImage]; - self.boomImageView.imageUrl = nil; - - // 重置文本 - self.nameLabel.attributedText = nil; - self.nameLabel.text = @""; - self.subLabel.text = @""; - self.heatNumLable.text = @"0"; - - // 重置成员头像视图：取消下载+清空，隐藏 - for (NetImageView *iconView in self.iconViews) { - [iconView cancelLoadImage]; - iconView.imageUrl = nil; - iconView.hidden = YES; - } -} - -- (void)dealloc { - // 组件销毁时也保证动画资源释放 - [self.pkImageView stopAnimation]; - self.pkImageView.videoItem = nil; -} -- (void)setRoomInfo:(HomePlayRoomModel *)roomInfo{ - - _roomInfo = roomInfo; - _avatarView.imageUrl = _roomInfo.avatar; - self.levelImageView.imageUrl = roomInfo.roomLevelIcon; - - [self updateMicUsersDisplay]; - - switch (roomInfo.homeRoomType) { - case 1:{ - NSTextAttachment *attach = [[NSTextAttachment alloc] init]; - attach.image = kImage(@"room_type_rd"); - attach.bounds = CGRectMake(0, 2, 14, 14); - NSAttributedString *attachString = [NSAttributedString attributedStringWithAttachment:attach]; - NSAttributedString *titleString = [[NSAttributedString alloc] initWithString:roomInfo.title - attributes:@{ - NSFontAttributeName: kFontSemibold(15), - NSForegroundColorAttributeName: UIColorFromRGB(0x313131) - }]; - NSMutableAttributedString *ms = [[NSMutableAttributedString alloc] initWithAttributedString:titleString]; - [ms insertAttributedString:attachString atIndex:0]; - self.nameLabel.attributedText = ms; - } - break; - case 2: - { - NSTextAttachment *attach = [[NSTextAttachment alloc] init]; - attach.image = kImage(@"room_type_cs"); - attach.bounds = CGRectMake(0, 2, 14, 14); - NSAttributedString *attachString = [NSAttributedString attributedStringWithAttachment:attach]; - NSAttributedString *titleString = [[NSAttributedString alloc] initWithString:roomInfo.title - attributes:@{ - NSFontAttributeName: kFontSemibold(15), - NSForegroundColorAttributeName: UIColorFromRGB(0x313131) - }]; - NSMutableAttributedString *ms = [[NSMutableAttributedString alloc] initWithAttributedString:titleString]; - [ms insertAttributedString:attachString atIndex:0]; - _nameLabel.attributedText = ms; - } - break; - - default: - _nameLabel.text = _roomInfo.title; - break; - } - - if (roomInfo.roomBoom) { - self.boomImageView.hidden = NO; - self.boomImageView.imageUrl = [roomInfo roomBoomPic]; - } else { - self.boomImageView.hidden = YES; - } - - if ([NSString isEmpty:roomInfo.tagPict]) { - self.subLabel.text = roomInfo.roomDesc.length > 0 ? roomInfo.roomDesc : YMLocalizedString(@"XPHomeMineViewController3"); - self.tagImageView.hidden = YES; - } else { - @kWeakify(self); - [self.tagImageView loadImageWithUrl:roomInfo.tagPict - completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - if (image) { - self.tagImageView.hidden = NO; - self.tagImageView.image = image; - CGFloat width = kGetScaleWidth(62); - if (image.size.height > 0){ - width = image.size.width * kGetScaleWidth(19) / image.size.height; - } - [self.tagImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(width); - }]; - [self layoutIfNeeded]; - } else { - self.tagImageView.hidden = YES; - } - self.subLabel.text = [NSString stringWithFormat:@" %@", roomInfo.roomDesc.length > 0 ? roomInfo.roomDesc : YMLocalizedString(@"XPHomeMineViewController3")]; - }]; - } - - self.flagImage.imageUrl = roomInfo.regionFlag; - self.flagImage.hidden = [NSString isEmpty:roomInfo.regionFlag]; - - self.heatNumLable.text = [NSString isEmpty:roomInfo.hotValue.stringValue] ? @"0" : @(roomInfo.hotValue.integerValue).stringValue; - - self.pkImageView.hidden = !_roomInfo.crossPking; - - if (roomInfo.hourTop > 0) { - NSString *name = [NSString stringWithFormat:@"room_top_%ld", (long)roomInfo.hourTop]; - _rankImageView.image = [UIImage getLanguageImage:name]; - } else { - _rankImageView.image = nil; - } - - [self updateMicUsersDisplay]; - - [self layoutIfNeeded]; -} - -#pragma mark - Private Methods -- (void)updateMicUsersDisplay { - for (int i = 0; i < self.membersCount; i++) { - NetImageView *iconView = _iconViews[i]; - if (i < _roomInfo.micUsers.count) { - iconView.hidden = NO; - // 更新约束和内容 - [iconView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(20)); - }]; - HomePlayMicUserModel *playModel = _roomInfo.micUsers[i]; - iconView.imageUrl = playModel.avatar; - } else { - iconView.hidden = YES; - } - } -} - -#pragma mark - 懒加载 -- (NetImageView *)avatarView{ - if(!_avatarView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder]; - _avatarView = [[NetImageView alloc]initWithConfig:config]; - _avatarView.contentMode = UIViewContentModeScaleAspectFill; - [_avatarView setCornerWithLeftTopCorner:kGetScaleWidth(10) rightTopCorner:kGetScaleWidth(10) bottomLeftCorner:kGetScaleWidth(10) bottomRightCorner:kGetScaleWidth(10) size:CGSizeMake(kGetScaleWidth(72), kGetScaleWidth(72))]; - } - return _avatarView; -} -- (NetImageView *)rankImageView{ - if(!_rankImageView){ - _rankImageView = [NetImageView new]; - } - return _rankImageView; -} -- (NetImageView *)tagImageView{ - if(!_tagImageView){ - _tagImageView = [NetImageView new]; - } - return _tagImageView; -} -- (NetImageView *)boomImageView{ - if(!_boomImageView){ - _boomImageView = [NetImageView new]; - _boomImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _boomImageView; -} - -- (NetImageView *)flagImage{ - if(!_flagImage){ - _flagImage = [NetImageView new]; - _flagImage.contentMode = UIViewContentModeScaleAspectFit; - } - return _flagImage; -} - -- (UILabel *)nameLabel{ - if(!_nameLabel){ - _nameLabel = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:UIColorFromRGB(0x1E1E1F)]; - } - return _nameLabel; -} --(UILabel *)heatNumLable{ - if(!_heatNumLable){ - _heatNumLable = [UILabel labelInitWithText:@"0" font:kFontMedium(10) textColor:UIColorFromRGB(0x84868A)]; - _heatNumLable.textAlignment = NSTextAlignmentRight; - } - return _heatNumLable; -} -- (UIImageView *)heatIcon{ - if(!_heatIcon){ - _heatIcon = [UIImageView new]; - _heatIcon.image = kImage(@"ms_home_heat_icon"); - } - return _heatIcon; -} - -- (SVGAParser *)parser{ - if(!_parser){ - _parser = [SVGAParser new]; - } - return _parser; -} -- (SVGAImageView *)pkImageView { - if (_pkImageView == nil) { - _pkImageView = [[SVGAImageView alloc]init]; - _pkImageView.contentMode = UIViewContentModeScaleToFill; - _pkImageView.hidden = YES; - _pkImageView.backgroundColor = [UIColor clearColor]; - } - return _pkImageView; -} -- (UILabel *)subLabel{ - if(!_subLabel){ - _subLabel = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:UIColorFromRGB(0x1E1E1F)]; - } - return _subLabel; -} - -- (NetImageView *)levelImageView{ - if(!_levelImageView){ - _levelImageView = [[NetImageView alloc]init]; - } - return _levelImageView; -} -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.h b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.h deleted file mode 100644 index e980f89..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// XPNewHomePartyTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/10/8. -// - -#import - -@class XPNewHomePartyTableViewCell,HomePlayRoomModel; -@protocol XPNewHomePartyTableViewCellDelegate -///点击头像 - --(void)xPNewHomePartyTableViewCell:(XPNewHomePartyTableViewCell *_Nullable)cell didSelectItem:(HomePlayRoomModel *_Nullable)roomModel; -///点击聊天 --(void)xPNewHomePartyTableViewCell:(XPNewHomePartyTableViewCell *_Nullable)cell didSelectChat:(HomePlayRoomModel *_Nonnull)roomModel; -///播放音乐 --(void)xPNewHomePartyTableViewCell:(XPNewHomePartyTableViewCell *_Nullable)cell didPlayVoice:(HomePlayRoomModel *_Nonnull)roomModel didClickPlaySound:(BOOL)isPlay; -@end - - -NS_ASSUME_NONNULL_BEGIN -@class HomePlayRoomModel, HomeRecommendRoomModel; -@interface XPNewHomePartyTableViewCell : UITableViewCell - -@property (nonatomic,strong) HomePlayRoomModel *roomInfo; - -@property(nonatomic,weak) iddelegate; -///声音卡时，svga是否播放动画 --(void)setPlaySoundStatus:(BOOL)isPlay; -///声音卡倒计时 --(void)setPlaySoundTime:(NSInteger)time; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m deleted file mode 100644 index a467d66..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m +++ /dev/null @@ -1,406 +0,0 @@ -// -// XPNewHomePartyTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/10/8. -// - -#import "XPNewHomePartyTableViewCell.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -///Model -#import "HomePlayRoomModel.h" -#import "HomeRecommendRoomModel.h" - -#import "XPNewHomePartyTagView.h" -#import "XPNewHomePartyAudioView.h" - - -@interface XPNewHomePartyTableViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///背景 -@property (nonatomic,strong) UIView *bgView; -///房间标题 -@property (nonatomic,strong) UILabel *titleLabel; -///点击房间标题 -@property(nonatomic,strong) UIButton *nameTapBtn; -///标签 -@property(nonatomic,strong) XPNewHomePartyTagView *tagView; -///小绿点 -@property(nonatomic,strong) UIView *greenView; -///边框 -@property (nonatomic,strong) UIImageView *borderImageView; -///游戏背景 -@property(nonatomic,strong) UIImageView *gameBgView; -///游戏图标 -@property(nonatomic,strong) UIImageView *gameIconView; -///声音、签名 -@property(nonatomic,strong) XPNewHomePartyAudioView *audioView; -///聊天 -@property(nonatomic,strong) UIButton *chatBtn; -///生日 -@property(nonatomic,strong) UIButton *birthdayView; -///财富 -@property(nonatomic,strong) NetImageView *wealthView; -///魅力 -@property(nonatomic,strong) NetImageView *charmView; -@property(nonatomic,strong) NSDateFormatter *dateFormatter; - -@property(nonatomic, strong) NetImageView *levelIcon; - -@end - -@implementation XPNewHomePartyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.bgView]; - [self.bgView addSubview:self.borderImageView]; - [self.bgView addSubview:self.avatarImageView]; - [self.bgView addSubview:self.gameBgView]; - [self.bgView addSubview:self.gameIconView]; - [self.bgView addSubview:self.greenView]; - - [self.bgView addSubview:self.tagView]; - [self.bgView addSubview:self.audioView]; - [self.bgView addSubview:self.chatBtn]; - - [self.bgView addSubview:self.titleLabel]; - [self.bgView addSubview:self.birthdayView]; - [self.bgView addSubview:self.wealthView]; - [self.bgView addSubview:self.charmView]; - - [self.bgView addSubview:self.nameTapBtn]; -} - -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(0)); - make.width.mas_equalTo(kGetScaleWidth(351)); - make.height.mas_equalTo(kGetScaleWidth(96)); - make.centerX.equalTo(self.contentView); - }]; - - [self.borderImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(10)); - make.width.height.mas_equalTo(kGetScaleWidth(68)); - make.top.mas_equalTo(kGetScaleWidth(14)); - }]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(60), kGetScaleWidth(60))); - make.center.equalTo(self.borderImageView); - }]; - - [self.greenView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(10)); - make.leading.mas_equalTo(kGetScaleWidth(60)); - make.top.mas_equalTo(kGetScaleWidth(64)); - }]; - [self.gameBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(48)); - make.leading.mas_equalTo(kGetScaleWidth(14)); - make.width.mas_equalTo(kGetScaleWidth(60)); - make.height.mas_equalTo(kGetScaleWidth(30)); - }]; - [self.gameIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(57)); - make.leading.mas_equalTo(kGetScaleWidth(26)); - make.width.mas_equalTo(kGetScaleWidth(37)); - make.height.mas_equalTo(kGetScaleWidth(17)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(10)); - make.leading.mas_equalTo(kGetScaleWidth(84)); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; - - [self.birthdayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(28)); - make.height.mas_equalTo(kGetScaleWidth(14)); - make.leading.equalTo(self.titleLabel.mas_trailing).mas_offset(kGetScaleWidth(4)); - make.centerY.equalTo(self.titleLabel); - }]; - [self.wealthView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(36)); - make.height.mas_equalTo(kGetScaleWidth(18)); - make.leading.equalTo(self.birthdayView.mas_trailing).mas_offset(kGetScaleWidth(4)); - make.centerY.equalTo(self.titleLabel); - }]; - [self.charmView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(36)); - make.height.mas_equalTo(kGetScaleWidth(18)); - make.leading.equalTo(self.wealthView.mas_trailing).mas_offset(kGetScaleWidth(4)); - make.centerY.equalTo(self.titleLabel); - }]; - [self.chatBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(34)); - make.trailing.mas_equalTo(-kGetScaleWidth(10)); - make.height.mas_equalTo(kGetScaleWidth(28)); - make.width.mas_equalTo(kGetScaleWidth(60)); - }]; - [self.tagView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(84)); - make.top.mas_equalTo(kGetScaleWidth(34)); - make.height.mas_equalTo(kGetScaleWidth(18)); - make.trailing.equalTo(self.chatBtn.mas_leading).mas_offset(-kGetScaleWidth(5)); - }]; - [self.audioView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(84)); - make.height.mas_equalTo(kGetScaleWidth(26)); - make.top.equalTo(self.tagView.mas_bottom).mas_offset(kGetScaleWidth(6)); - make.trailing.equalTo(self.tagView); - }]; - [self.nameTapBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.leading.equalTo(self.titleLabel); - make.trailing.equalTo(self.charmView); - - }]; -} - -#pragma mark - Getters And Setters -- (void)setRoomInfo:(HomePlayRoomModel *)roomInfo { - _roomInfo = roomInfo; - if (_roomInfo) { - self.avatarImageView.imageUrl = _roomInfo.avatar; - NSString *nick = _roomInfo.nick; - if(nick.length > 7){ - nick = [NSString stringWithFormat:@"%@...",[_roomInfo.nick substringToIndex:7]]; - } - self.titleLabel.text = nick; - _tagView.itemWidthist = _roomInfo.labelsWidthList; - _tagView.itemList = [NSMutableArray arrayWithArray:_roomInfo.labels]; - [_birthdayView setTitle:[NSString getAgeWithBirth:_roomInfo.birth] forState:UIControlStateNormal]; - _birthdayView.backgroundColor = _roomInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.birthdayView.titleEdgeInsets = _roomInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.birthdayView.selected = _roomInfo.gender != GenderType_Male; - _gameBgView.hidden = YES; - _gameIconView.hidden = YES; - _borderImageView.hidden = YES; - _greenView.hidden = YES; - [_chatBtn setTitle:YMLocalizedString(@"XPSessionSayHelloTableViewCell0") forState:UIControlStateNormal]; - if(_roomInfo.inMic == YES){ - _gameBgView.hidden = NO; - _gameIconView.hidden = NO; - _borderImageView.hidden = NO; - [_chatBtn setTitle:YMLocalizedString(@"XPSessionFindNewAlertView2") forState:UIControlStateNormal]; - }else{ - if(_roomInfo.inOnline == YES){ - _greenView.hidden = NO; - } - } - - _wealthView.imageUrl = _roomInfo.userLevelVo.experUrl; - _charmView.imageUrl = _roomInfo.userLevelVo.charmUrl; - if(_roomInfo.userVoice.length == 0 && _roomInfo.userDesc.length == 0){ - _roomInfo.userDesc = YMLocalizedString(@"XPMineFriendTableViewCell0"); - } - if(_roomInfo.userVoice.length > 0){ - _audioView.voiceDura = _roomInfo.voiceDura; - _audioView.userVoice = _roomInfo.userVoice; - _audioView.isHiddenVew = NO; - }else{ - if(_roomInfo.userDesc.length > 0){ - _audioView.isHiddenVew = NO; - _audioView.userDesc = _roomInfo.userDesc; - }else{ - _audioView.isHiddenVew = YES; - } - - } - - } -} - -///声音卡时，svga是否播放动画 --(void)setPlaySoundStatus:(BOOL)isPlay{ - _audioView.isPlay = isPlay; - if(isPlay == NO){ - _audioView.voiceDura = _roomInfo.voiceDura; - } -} -///声音卡倒计时 --(void)setPlaySoundTime:(NSInteger)time{ - _audioView.voiceDura = @(time).stringValue; -} - - --(void)didSelectItemAction{ - - if(self.delegate && [self.delegate respondsToSelector:@selector(xPNewHomePartyTableViewCell:didSelectItem:)]){ - [self.delegate xPNewHomePartyTableViewCell:self didSelectItem:self.roomInfo]; - } -} --(void)didSelectChatAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(xPNewHomePartyTableViewCell:didSelectChat:)]){ - [self.delegate xPNewHomePartyTableViewCell:self didSelectChat:self.roomInfo]; - } -} -#pragma mark - XPNewHomePartyAudioViewDelegate -- (void)xPNewHomePartyAudioView:(XPNewHomePartyAudioView *)view didClickPlaySound:(BOOL)isPlay{ - if(self.delegate && [self.delegate respondsToSelector:@selector(xPNewHomePartyTableViewCell:didPlayVoice:didClickPlaySound:)]){ - [self.delegate xPNewHomePartyTableViewCell:self didPlayVoice:self.roomInfo didClickPlaySound:isPlay]; - } -} -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = kGetScaleWidth(60)/2; - _avatarImageView.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(didSelectItemAction)]; - [_avatarImageView addGestureRecognizer:tap]; - } - return _avatarImageView; -} - -- (UIView *)bgView { - if (!_bgView) { - _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = [UIColor whiteColor]; - _bgView.layer.masksToBounds = YES; - _bgView.layer.cornerRadius = kGetScaleWidth(12); - } - return _bgView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = kFontMedium(14); - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UIImageView *)borderImageView { - if (!_borderImageView) { - _borderImageView = [[UIImageView alloc] init]; - _borderImageView.userInteractionEnabled = YES; - _borderImageView.layer.cornerRadius = kGetScaleWidth(68)/2; - _borderImageView.layer.masksToBounds = YES; - _borderImageView.layer.borderWidth = kGetScaleWidth(2); - _borderImageView.layer.borderColor = UIColorFromRGB(0xA974FF).CGColor; - } - return _borderImageView; -} -- (UIView *)greenView{ - if(!_greenView){ - _greenView = [UIView new]; - _greenView.backgroundColor = UIColorFromRGB(0x3FE05F); - _greenView.layer.cornerRadius = kGetScaleWidth(10)/2; - _greenView.layer.masksToBounds = YES; - _greenView.layer.borderWidth = 1; - _greenView.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _greenView; -} -- (UIImageView *)gameBgView{ - if(!_gameBgView){ - _gameBgView = [UIImageView new]; - _gameBgView.image = kImage(@"home_palying_bg"); - } - return _gameBgView; -} -- (UIImageView *)gameIconView{ - if(!_gameIconView){ - _gameIconView = [UIImageView new]; - _gameIconView.image = [UIImage getLanguageImage:@"home_palying_icon"]; - } - return _gameIconView; -} -- (UIButton *)chatBtn{ - if(!_chatBtn){ - _chatBtn = [UIButton new]; - _chatBtn.backgroundColor = UIColorFromRGB(0x9168FA); - [_chatBtn setTitle:YMLocalizedString(@"XPSessionSayHelloTableViewCell0") forState:UIControlStateNormal]; - _chatBtn.titleLabel.font = kFontMedium(12); - [_chatBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _chatBtn.layer.cornerRadius = kGetScaleWidth(28)/2; - _chatBtn.layer.masksToBounds = YES; - [_chatBtn addTarget:self action:@selector(didSelectChatAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _chatBtn; -} - -- (UIButton *)birthdayView{ - if(!_birthdayView){ - _birthdayView = [UIButton new]; - [_birthdayView setImage:kImage(@"home_age_boy_icon") forState:UIControlStateNormal]; - [_birthdayView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected]; - _birthdayView.titleLabel.font = kFontMedium(10); - [_birthdayView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _birthdayView.imageEdgeInsets = UIEdgeInsetsMake(0, -kGetScaleWidth(2), 0, 0); - _birthdayView.layer.cornerRadius = kGetScaleWidth(14)/2; - _birthdayView.layer.masksToBounds = YES; - - } - return _birthdayView; -} -- (NetImageView *)wealthView{ - if(!_wealthView){ - _wealthView = [[NetImageView alloc]init]; - } - return _wealthView; -} -- (NetImageView *)charmView{ - if(!_charmView){ - _charmView = [[NetImageView alloc]init]; - } - return _charmView; -} - -- (NetImageView *)levelIcon{ - if(!_levelIcon){ - _levelIcon = [[NetImageView alloc]init]; - } - return _levelIcon; -} - -- (NSDateFormatter *)dateFormatter { - if (!_dateFormatter) { - _dateFormatter = [[NSDateFormatter alloc] init]; - _dateFormatter.dateFormat = @"yyyy-MM-dd"; - - } - return _dateFormatter; -} -- (XPNewHomePartyTagView *)tagView{ - if(!_tagView){ - _tagView = [[XPNewHomePartyTagView alloc]initWithFrame:CGRectZero]; - } - return _tagView; -} -- (XPNewHomePartyAudioView *)audioView{ - if(!_audioView){ - _audioView = [[XPNewHomePartyAudioView alloc]initWithFrame:CGRectZero]; - _audioView.delegate = self; - } - return _audioView; -} -- (UIButton *)nameTapBtn{ - if(!_nameTapBtn){ - _nameTapBtn = [UIButton new]; - [_nameTapBtn addTarget:self action:@selector(didSelectItemAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _nameTapBtn; -} -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTagView.h b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTagView.h deleted file mode 100644 index 5f5fedd..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTagView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPNewHomePartyTagView.h -// YuMi -// -// Created by duoban on 2023/9/4. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNewHomePartyTagView : UIView -@property (nonatomic,strong) NSMutableArray *itemList; -@property (nonatomic,copy) NSArray *itemWidthist; -@end -@interface XPNewHomePartyTagItemView : UICollectionViewCell -@property(nonatomic,copy) NSString *title; -@property(nonatomic,strong) NSIndexPath *path; -@end -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTagView.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTagView.m deleted file mode 100644 index 5c2150f..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTagView.m +++ /dev/null @@ -1,118 +0,0 @@ -// -// XPNewHomePartyTagView.m -// YuMi -// -// Created by duoban on 2023/9/4. -// - -#import "XPNewHomePartyTagView.h" -#import "XPMineUserInfoTagFlowLayout.h" -@interface XPNewHomePartyTagView() -@property (nonatomic,strong) UICollectionView *collectionView; -@end -@implementation XPNewHomePartyTagView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.collectionView]; -} --(void)installConstraints{ - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; -} -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - NSNumber *width = [self.itemWidthist xpSafeObjectAtIndex:indexPath.row]; - if(width != nil)return CGSizeMake([width floatValue], kGetScaleWidth(18));; - return CGSizeMake(kGetScaleWidth(46), kGetScaleWidth(18)); -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - - return self.itemList.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - - XPNewHomePartyTagItemView *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPNewHomePartyTagItemView class]) forIndexPath:indexPath]; - cell.path = indexPath; - cell.title = [self.itemList xpSafeObjectAtIndex:indexPath.row]; - return cell; -} --(void)setItemList:(NSMutableArray *)itemList{ - _itemList = itemList; - [_collectionView reloadData]; -} -#pragma mark - 懒加载 -- (UICollectionView *)collectionView{ - if (!_collectionView) { - XPMineUserInfoTagFlowLayout *layout = [[XPMineUserInfoTagFlowLayout alloc] init]; - layout.delegate = self; - layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0); - layout.itemSize = CGSizeMake(kGetScaleWidth(46), kGetScaleWidth(18)); - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = kGetScaleWidth(4); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.pagingEnabled = NO; - _collectionView.scrollEnabled = NO; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPNewHomePartyTagItemView class] forCellWithReuseIdentifier:NSStringFromClass([XPNewHomePartyTagItemView class])]; - _collectionView.showsVerticalScrollIndicator = NO; - } - return _collectionView; -} -@end - - -@interface XPNewHomePartyTagItemView () -@property(nonatomic,strong) UILabel *titleView; -@end - -@implementation XPNewHomePartyTagItemView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.contentView.layer.cornerRadius = kGetScaleWidth(18)/2; - self.contentView.layer.masksToBounds = YES; - [self.contentView addSubview:self.titleView]; -} -- (void)setPath:(NSIndexPath *)path{ - _path = path; - self.contentView.backgroundColor = _path.row == 0 ? UIColorRGBAlpha(0x9168FA, 0.2) :UIColorFromRGB(0xF5F6FA); - _titleView.textColor = _path.row == 0 ? UIColorFromRGB(0x9168FA) :UIColorFromRGB(0x8A8CAB); -} --(void)setTitle:(NSString *)title{ - _title = title; - _titleView.text = _title; -} --(void)installConstraints{ - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(self.contentView); - make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(8)); - }]; -} -#pragma mark - 懒加载 -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:@"" font:kFontRegular(10) textColor:UIColorFromRGB(0x8A8CAB)]; - _titleView.textAlignment = NSTextAlignmentCenter; - } - return _titleView; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayEmptyTableViewCell.h b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayEmptyTableViewCell.h deleted file mode 100644 index ae0192f..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayEmptyTableViewCell.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// XPNewHomePlayEmptyTableViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2022/10/8. -// - -#import -#import "ClanDetailInfoModel.h" - -@protocol XPNewHomePlayEmptyTableViewCellDelegate - --(void)emptyCellChooseGameAction; - -@end - - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNewHomePlayEmptyTableViewCell : UITableViewCell -@property (nonatomic,assign) BOOL isClan; -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayEmptyTableViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayEmptyTableViewCell.m deleted file mode 100644 index 42e1813..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayEmptyTableViewCell.m +++ /dev/null @@ -1,130 +0,0 @@ -// -// XPNewHomePlayEmptyTableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2022/10/8. -// - -#import "XPNewHomePlayEmptyTableViewCell.h" -///Third -#import -///Tool - -#import "UIImage+Utils.h" - -@interface XPNewHomePlayEmptyTableViewCell () - -///背景 -@property (nonatomic,strong) UIImageView *backImageView; -///添加 -@property (nonatomic,strong) UIImageView *addImageView; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -@property (nonatomic,strong) UIButton *chooseGameBtn; -@end - -@implementation XPNewHomePlayEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.backImageView]; - [self.backImageView addSubview:self.addImageView]; - [self.backImageView addSubview:self.titleLabel]; - [self.backImageView addSubview:self.chooseGameBtn]; -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.mas_equalTo(self.contentView).inset(kGetScaleWidth(12)); - make.top.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(-kGetScaleWidth(10)); - }]; - - [self.addImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(48), kGetScaleWidth(48))); - make.leading.mas_equalTo(self.backImageView).offset(kGetScaleWidth(12)); - make.centerY.mas_equalTo(self.backImageView); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.addImageView.mas_trailing).offset(kGetScaleWidth(15)); - make.trailing.equalTo(self.backImageView.mas_trailing).mas_offset(-kGetScaleWidth(12)); - make.centerY.mas_equalTo(self.backImageView); - }]; - [self.chooseGameBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.backImageView); - }]; -} --(void)chooseGameAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(emptyCellChooseGameAction)]){ - [self.delegate emptyCellChooseGameAction]; - } -} - --(void)setIsClan:(BOOL)isClan{ - _isClan = isClan; -// if(_isClan == NO){ -// _chooseGameBtn.hidden = NO; -// [self.backImageView mas_updateConstraints:^(MASConstraintMaker *make) { -// make.trailing.mas_equalTo(-kGetScaleWidth(141)); -// }]; -// return; -// } -// _chooseGameBtn.hidden = YES; -// [self.backImageView mas_updateConstraints:^(MASConstraintMaker *make) { -// make.trailing.mas_equalTo(-kGetScaleWidth(12)); -// }]; -} -#pragma mark - Getters And Setters - -- (UIImageView *)addImageView { - if (!_addImageView) { - _addImageView = [[UIImageView alloc] init]; - _addImageView.userInteractionEnabled = YES; - _addImageView.image = [UIImage imageNamed:@"home_play_create_room"]; - } - return _addImageView; -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor colorWithHexString:@"#E7D7FC"], [DJDKMIMOMColor colorWithHexString:@"#D7F8FD"]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; - _backImageView.layer.masksToBounds = YES; - _backImageView.layer.cornerRadius = kGetScaleWidth(10); - _backImageView.contentMode = UIViewContentModeScaleAspectFill; - _backImageView.userInteractionEnabled = YES; - } - return _backImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = kFontMedium(12); - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.numberOfLines = 0; - _titleLabel.text = YMLocalizedString(@"XPNewHomePlayEmptyTableViewCell0"); - } - return _titleLabel; -} -- (UIButton *)chooseGameBtn{ - if (!_chooseGameBtn){ - _chooseGameBtn = [UIButton new]; -// [_chooseGameBtn setBackgroundImage:kImage(@"home_play_game") forState:UIControlStateNormal]; - [_chooseGameBtn addTarget:self action:@selector(chooseGameAction) forControlEvents:UIControlEventTouchUpInside]; -// _chooseGameBtn.hidden = YES; - } - return _chooseGameBtn; -} -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.h b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.h deleted file mode 100644 index c20d4d8..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPNewHomePlayItemCollectionViewCell.h -// YuMi -// -// Created by YuMi on 2022/10/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class HomePlayRoomModel; -@interface XPNewHomePlayItemCollectionViewCell : UICollectionViewCell -@property (nonatomic,strong) HomePlayRoomModel *roomInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.m deleted file mode 100644 index 0dbe10f..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.m +++ /dev/null @@ -1,171 +0,0 @@ -// -// XPNewHomePlayItemCollectionViewCell.m -// YuMi -// -// Created by YuMi on 2022/10/8. -// - -#import "XPNewHomePlayItemCollectionViewCell.h" -///Third -#import -///Tool -#import "NetImageView.h" -///Model -#import "HomePlayRoomModel.h" -#import -@interface XPNewHomePlayItemCollectionViewCell () -@property(nonatomic,strong) UIView *bgView; -///边框 -@property (nonatomic,strong) UIImageView *borderImageView; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///游戏背景 -@property(nonatomic,strong) UIImageView *gameBgView; -///游戏图标 -@property(nonatomic,strong) UIImageView *gameIconView; -///在线 -@property(nonatomic,strong) FLAnimatedImageView *onlineGifView; -///用户名 -@property(nonatomic,strong) UILabel *nameView; - -@end - -@implementation XPNewHomePlayItemCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.contentView.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.bgView]; - [self.bgView addSubview:self.borderImageView]; - [self.bgView addSubview:self.avatarImageView]; - - [self.bgView addSubview:self.gameBgView]; - [self.bgView addSubview:self.gameIconView]; - [self.bgView addSubview:self.onlineGifView]; - [self.bgView addSubview:self.nameView]; -} - -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; - [self.borderImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(60)); - make.top.mas_equalTo(kGetScaleWidth(6)); - make.centerX.equalTo(self.bgView); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(52), kGetScaleWidth(52))); - make.center.mas_equalTo(self.borderImageView); - }]; - [self.gameBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(39)); - make.width.mas_equalTo(kGetScaleWidth(52)); - make.height.mas_equalTo(kGetScaleWidth(23)); - make.centerX.equalTo(self.bgView); - }]; - [self.gameIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(43)); - make.width.mas_equalTo(kGetScaleWidth(28)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.centerX.equalTo(self.bgView); - }]; - - [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_lessThanOrEqualTo(kGetScaleWidth(65)); - make.centerX.equalTo(self.bgView).mas_offset(kGetScaleWidth(5)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.top.equalTo(self.borderImageView.mas_bottom).mas_offset(kGetScaleWidth(3)); - }]; - - [self.onlineGifView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(9)); - make.height.mas_equalTo(kGetScaleWidth(8)); - make.centerY.equalTo(self.nameView); - make.trailing.equalTo(self.nameView.mas_leading).mas_offset(-kGetScaleWidth(2)); - }]; -} - -#pragma mark - Getters And Setters -- (void)setRoomInfo:(HomePlayRoomModel *)roomInfo { - _roomInfo = roomInfo; - if (_roomInfo != nil) { - self.avatarImageView.imageUrl = _roomInfo.avatar; - self.nameView.text = _roomInfo.title; - self.gameBgView.hidden = _roomInfo.mgId.length == 0 ; - self.gameIconView.hidden = _roomInfo.mgId.length == 0 ; - self.borderImageView.hidden = _roomInfo.mgId.length == 0 ; - } -} -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(10) rightTopCorner:kGetScaleWidth(10) bottomLeftCorner:kGetScaleWidth(10) bottomRightCorner:kGetScaleWidth(10) size:CGSizeMake(kGetScaleWidth(100), kGetScaleWidth(92))]; - } - return _bgView; -} -- (UIImageView *)borderImageView { - if (!_borderImageView) { - _borderImageView = [[UIImageView alloc] init]; - _borderImageView.userInteractionEnabled = YES; - _borderImageView.layer.cornerRadius = kGetScaleWidth(60)/2; - _borderImageView.layer.masksToBounds = YES; - _borderImageView.layer.borderWidth = kGetScaleWidth(2); - _borderImageView.layer.borderColor = UIColorFromRGB(0x759FFF).CGColor; - } - return _borderImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = kGetScaleWidth(52)/2; - } - return _avatarImageView; -} -- (UIImageView *)gameBgView{ - if(!_gameBgView){ - _gameBgView = [UIImageView new]; - _gameBgView.image = kImage(@"_home_game_bg"); - } - return _gameBgView; -} -- (UIImageView *)gameIconView{ - if(!_gameIconView){ - _gameIconView = [UIImageView new]; - _gameIconView.image = [UIImage getLanguageImage:@"_home_game_icon"]; - } - return _gameIconView; -} -- (FLAnimatedImageView *)onlineGifView{ - if(!_onlineGifView){ - _onlineGifView = [FLAnimatedImageView new]; - NSData *localData = [NSData dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"home_sound_wave.gif" ofType:nil]]; - FLAnimatedImage *animatedImage = [FLAnimatedImage animatedImageWithGIFData:localData]; - _onlineGifView.animatedImage = animatedImage; - - } - return _onlineGifView; -} -- (UILabel *)nameView{ - if(!_nameView){ - _nameView = [UILabel labelInitWithText:@"" font:kFontMedium(12) textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _nameView; -} -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayTableViewCell.h b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayTableViewCell.h deleted file mode 100644 index a976565..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayTableViewCell.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPNewHomePlayTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/10/8. -// - -#import -#import "ClanDetailInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN -@class HomePlayRoomModel, XPNewHomePlayTableViewCell; -@protocol XPNewHomePlayTableViewCellDelegate - -- (void)xPNewHomePlayTableViewCell:(XPNewHomePlayTableViewCell *)cell didSelectItem:(HomePlayRoomModel *)info; --(void)chooseGameAction; -@end - -@interface XPNewHomePlayTableViewCell : UITableViewCell - -@property (nonatomic,strong) NSArray *playRoomList; - - -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayTableViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayTableViewCell.m deleted file mode 100644 index c9047e2..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayTableViewCell.m +++ /dev/null @@ -1,103 +0,0 @@ -// -// XPNewHomePlayTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/10/8. -// - -#import "XPNewHomePlayTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "NSArray+Safe.h" -///View -#import "XPNewHomePlayItemCollectionViewCell.h" - -@interface XPNewHomePlayTableViewCell () -@property (nonatomic,strong) UICollectionView *collectionView; - - -@end -@implementation XPNewHomePlayTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - - --(void)chooseGameAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseGameAction)]){ - [self.delegate chooseGameAction]; - } -} -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.trailing.equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(92)); - }]; - -} - --(void)setPlayRoomList:(NSArray *)playRoomList{ - _playRoomList = playRoomList; - [self.collectionView reloadData]; -} -#pragma mark - UICollectionViewDelegate, UICollectionViewDataSource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - - return self.playRoomList.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPNewHomePlayItemCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPNewHomePlayItemCollectionViewCell class]) forIndexPath:indexPath]; - - cell.roomInfo = [self.playRoomList xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (self.playRoomList.count > 0) { - HomePlayRoomModel * roomInfo = [self.playRoomList xpSafeObjectAtIndex:indexPath.row]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNewHomePlayTableViewCell:didSelectItem:)]) { - [self.delegate xPNewHomePlayTableViewCell:self didSelectItem:roomInfo]; - } - } -} - - -#pragma mark - Getters And Setters -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(kGetScaleWidth(100), kGetScaleWidth(92)); - layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(12), 0, kGetScaleWidth(12)); - layout.minimumLineSpacing = kGetScaleWidth(8); - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.tag = 9000002; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.showsVerticalScrollIndicator = NO; - _collectionView.showsHorizontalScrollIndicator = NO; - [_collectionView registerClass:[XPNewHomePlayItemCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPNewHomePlayItemCollectionViewCell class])]; - } - return _collectionView; -} - - -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomeRecommendTableViewCell.h b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomeRecommendTableViewCell.h deleted file mode 100644 index 9254e7a..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomeRecommendTableViewCell.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// XPNewHomeRecommendTableViewCell.h -// YuMi -// -// Created by YuMi on 2022/10/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPNewHomeRecommendTableViewCell, HomeRecommendRoomModel; -@protocol XPNewHomeRecommendTableViewCellDelegate - -- (void)xPNewHomeRecommendTableViewCell:(XPNewHomeRecommendTableViewCell *)view didSelectItem:(HomeRecommendRoomModel *)info; - -@end - -@interface XPNewHomeRecommendTableViewCell : UITableViewCell - -- (void)setRecommendsList:(NSArray *)recommends; - - -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomeRecommendTableViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomeRecommendTableViewCell.m deleted file mode 100644 index c44803b..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomeRecommendTableViewCell.m +++ /dev/null @@ -1,254 +0,0 @@ -// -// XPNewHomeRecommendTableViewCell.m -// YuMi -// -// Created by YuMi on 2022/10/8. -// - -#import "XPNewHomeRecommendTableViewCell.h" -///Third -#import -#import -///Tool -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -///Model -#import "HomeRecommendRoomModel.h" - -@interface XPCycleScrollViewCell : GKCycleScrollViewCell -///显示头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///显示tag背景 -@property (nonatomic,strong) NetImageView *tagImageView; -///显示tag -@property (nonatomic,strong) UILabel *tagTitleView; - -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -@property (nonatomic,assign) BOOL isCenterView; -@property (nonatomic,strong) HomeRecommendRoomModel *recommendRoomInfo; - -@end - -@implementation XPCycleScrollViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.coverView.hidden = YES; - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.avatarImageView]; - [self addSubview:self.tagImageView]; - [self.tagImageView addSubview:self.tagTitleView]; - [self addSubview:self.titleLabel]; - -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(10 * kScreenScale); - make.width.height.mas_equalTo(123 * kScreenScale); - }]; - - [self.tagImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(18 * kScreenScale); - make.width.mas_greaterThanOrEqualTo(10); - make.leading.top.mas_equalTo(self.avatarImageView); - }]; - - [self.tagTitleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(7 * kScreenScale); - make.trailing.mas_equalTo(-7 * kScreenScale); - make.top.bottom.equalTo(self.tagImageView); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.avatarImageView); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(10 * kScreenScale); - }]; -} -- (void)setIsCenterView:(BOOL)isCenterView{ - _isCenterView = isCenterView; - if(_isCenterView == YES){ - [self.avatarImageView.superview layoutIfNeeded]; - [UIView animateWithDuration:0.5 animations:^{ - - [self.avatarImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(123 * kScreenScale); - make.top.mas_equalTo(10 * kScreenScale); - }]; - self.avatarImageView.layer.cornerRadius = 11; - - self.titleLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium]; - [self.avatarImageView.superview layoutIfNeeded]; - }]; - - return; - } - [self.avatarImageView.superview layoutIfNeeded]; - [UIView animateWithDuration:0.5 animations:^{ - self.avatarImageView.layer.cornerRadius = 8; - [self.avatarImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(100 * kScreenScale); - make.top.mas_equalTo(22 * kScreenScale); - }]; - self.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - [self.avatarImageView.superview layoutIfNeeded]; - }]; - -} -#pragma mark - Getters And Setters -- (void)setRecommendRoomInfo:(HomeRecommendRoomModel *)recommendRoomInfo { - _recommendRoomInfo = recommendRoomInfo; - if (_recommendRoomInfo) { - self.avatarImageView.imageUrl = _recommendRoomInfo.avatar; - self.titleLabel.text = _recommendRoomInfo.title; - self.tagTitleView.hidden = YES; - self.tagImageView.hidden = YES; - if(_recommendRoomInfo.iconContent.length > 0){ - self.tagTitleView.text = _recommendRoomInfo.iconContent; - self.tagTitleView.hidden = NO; - self.tagImageView.hidden = NO; - } - - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeMonentsPhoto; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 11; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _avatarImageView; -} --(NetImageView *)tagImageView{ - if (!_tagImageView){ - _tagImageView = [[NetImageView alloc]init]; - _tagImageView.image = [UIImage imageNamed:@"monents_common_room_tag"]; - - } - return _tagImageView; -} -- (UILabel *)tagTitleView{ - if (!_tagTitleView){ - _tagTitleView = [UILabel new]; - _tagTitleView.font = [UIFont systemFontOfSize:11 weight:UIFontWeightMedium]; - _tagTitleView.textColor = [UIColor whiteColor]; - } - return _tagTitleView; -} -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -@end - - -@interface XPNewHomeRecommendTableViewCell () - -@property (nonatomic,strong) GKCycleScrollView *pi_scrollView; -@property (nonatomic,strong) NSArray *recommends; -@end - -@implementation XPNewHomeRecommendTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - self.pi_scrollView = [[GKCycleScrollView alloc] initWithFrame:CGRectZero]; - self.pi_scrollView.delegate = self; - self.pi_scrollView.leftRightMargin = 0.0f; - self.pi_scrollView.topBottomMargin = 0.0f; - self.pi_scrollView.dataSource = self; - [self.contentView addSubview:self.pi_scrollView]; -} - -- (void)initSubViewConstraints { - [self.pi_scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15 * kScreenScale); - make.top.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView); - }]; -} - -- (NSInteger)numberOfCellsInCycleScrollView:(GKCycleScrollView *)cycleScrollView { - return self.recommends.count; -} - -/// 返回继承自GKCycleScrollViewCell的类 -/// @param cycleScrollView cycleScrollView description -/// @param index 索引 -- (GKCycleScrollViewCell *)cycleScrollView:(GKCycleScrollView *)cycleScrollView cellForViewAtIndex:(NSInteger)index { - XPCycleScrollViewCell *cell = (XPCycleScrollViewCell*)cycleScrollView.dequeueReusableCell; - if (!cell) { - cell = [[XPCycleScrollViewCell alloc] init]; - } - - HomeRecommendRoomModel * info = [self.recommends xpSafeObjectAtIndex:index]; - cell.recommendRoomInfo = info; - cell.isCenterView = index == self.pi_scrollView.currentSelectIndex; - return cell; -} -- (void)cycleScrollView:(GKCycleScrollView *)cycleScrollView didScrollCellToIndex:(NSInteger)index { - HomeRecommendRoomModel * info = [self.recommends xpSafeObjectAtIndex:index]; - UIView *view = cycleScrollView.subviews[0]; - for (XPCycleScrollViewCell * cell in view.subviews) { - cell.isCenterView = [cell.recommendRoomInfo.title isEqual:info.title]; - } - -} -- (void)cycleScrollView:(GKCycleScrollView *)cycleScrollView didSelectCellAtIndex:(NSInteger)index { - if(self.recommends.count > 0 && index < self.recommends.count) { - HomeRecommendRoomModel * info = [self.recommends xpSafeObjectAtIndex:index]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNewHomeRecommendTableViewCell:didSelectItem:)]) { - [self.delegate xPNewHomeRecommendTableViewCell:self didSelectItem:info]; - } - } -} - -- (CGSize)sizeForCellInCycleScrollView:(GKCycleScrollView *)cycleScrollView { - return CGSizeMake(123 * kScreenScale, 160 * kScreenScale); -} -#pragma mark - Getters And Setters -- (void)setRecommendsList:(NSArray *)recommends{ - if(recommends.count == self.recommends.count){ - return; - } - self.recommends = recommends; - [self.pi_scrollView reloadData]; -} - - - -@end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPPartyRoomItemCollectionViewCell.h b/YuMi/Modules/YMNewHome/View/Cell/XPPartyRoomItemCollectionViewCell.h deleted file mode 100644 index 7522f57..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPPartyRoomItemCollectionViewCell.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPBlankCollectionViewCell.h -// YuMi -// -// Created by Linus on 2024/12/19. -// - -#import -#import "HomePlayRoomModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPPartyRoomItemCollectionViewCell : UICollectionViewCell - -+ (NSString *)blankCellID; -+ (NSString *)itemCellID; - -@property (nonatomic,strong) HomePlayRoomModel *roomInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPPartyRoomItemCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPPartyRoomItemCollectionViewCell.m deleted file mode 100644 index 57fdbe7..0000000 --- a/YuMi/Modules/YMNewHome/View/Cell/XPPartyRoomItemCollectionViewCell.m +++ /dev/null @@ -1,342 +0,0 @@ -// -// XPBlankCollectionViewCell.m -// YuMi -// -// Created by Linus on 2024/12/19. -// - -#import "XPPartyRoomItemCollectionViewCell.h" - -@interface XPPartyRoomItemCollectionViewCell () - -@property(nonatomic,strong) NetImageView *avatarView; -@property(nonatomic,strong) NetImageView *rankImageView; -@property(nonatomic,strong) NetImageView *tagImageView; -@property (nonatomic, strong) NetImageView *flagImage; -@property (nonatomic,strong) NetImageView *boomImageView; -@property(nonatomic,strong) UILabel *nameLabel; -@property(nonatomic,strong) MarqueeLabel *subLabel; -@property(nonatomic,strong) UIImageView *heatIcon; -@property(nonatomic,strong) UILabel *heatNumLable; -@property (nonatomic, strong) UIImageView *bottomShadow; -@property (nonatomic, strong) NetImageView *levelImageView; -@end - -@implementation XPPartyRoomItemCollectionViewCell - -+ (NSString *)blankCellID { - return @"blankCellID"; -} - -+ (NSString *)itemCellID { - return NSStringFromClass([self class]); -} - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - self.contentView.backgroundColor = [UIColor clearColor]; - self.clipsToBounds = NO; - self.contentView.clipsToBounds = NO; - - [self installUI]; - } - return self; -} - -- (void)installUI { - [self.contentView addSubview:self.avatarView]; - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(14); - make.leading.trailing.mas_equalTo(self.contentView).inset(8); - make.height.mas_equalTo(self.avatarView.mas_width) ; - }]; - - [self.contentView addSubview:self.rankImageView]; - [self.rankImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView); - make.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(self.rankImageView.mas_width) ; - }]; - - [self.contentView addSubview:self.tagImageView]; - [self.tagImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarView).offset(8); - make.trailing.mas_equalTo(self.avatarView).offset(-8); - make.height.mas_equalTo(20); - make.width.mas_equalTo(60); - }]; - - [self.contentView addSubview:self.flagImage]; - [self.flagImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarView.mas_leading); - make.top.mas_equalTo(self.avatarView.mas_bottom).offset(8); - make.size.mas_equalTo(CGSizeMake(18, 14)); - }]; - - [self.contentView addSubview:self.nameLabel]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.flagImage); - make.leading.mas_equalTo(self.flagImage.mas_trailing).offset(4); - make.trailing.mas_equalTo(self.avatarView.mas_trailing); - }]; - - [self.contentView addSubview:self.subLabel]; - [self.contentView addSubview:self.heatNumLable]; - [self.heatNumLable mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.avatarView).offset(-10); - make.centerY.mas_equalTo(self.subLabel); - }]; - - [self.contentView addSubview:self.heatIcon]; - [self.heatIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.subLabel); - make.trailing.mas_equalTo(self.heatNumLable.mas_leading).offset(2); - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - - - [self.subLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarView).offset(10); - make.trailing.mas_equalTo(self.heatIcon.mas_leading).offset(-4); - make.bottom.mas_equalTo(self.avatarView).offset(-8); - }]; - - [self.contentView addSubview:self.boomImageView]; - [self.boomImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.heatNumLable); - make.bottom.mas_equalTo(self.heatNumLable.mas_top).offset(-8); - make.size.mas_equalTo(CGSizeMake(25, 37)); - }]; - - [self.contentView insertSubview:self.bottomShadow belowSubview:self.rankImageView]; - [self.bottomShadow mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.avatarView); - make.height.mas_equalTo(kGetScaleWidth(34)); - }]; - - [self.contentView addSubview:self.levelImageView]; - [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarView).offset(2); - make.top.mas_equalTo(self.tagImageView); - make.size.mas_equalTo(CGSizeMake(38, 15)); - }]; -} - -- (void)prepareForReuse { - [super prepareForReuse]; - // 重置图像，释放引用，避免复用持有 - [self.avatarView cancelLoadImage]; - self.avatarView.imageUrl = nil; - self.rankImageView.image = nil; - [self.tagImageView cancelLoadImage]; - self.tagImageView.image = nil; - [self.levelImageView cancelLoadImage]; - self.levelImageView.imageUrl = nil; - [self.boomImageView cancelLoadImage]; - self.boomImageView.imageUrl = nil; - [self.flagImage cancelLoadImage]; - self.flagImage.imageUrl = nil; - - // 重置文本 - self.nameLabel.attributedText = nil; - self.nameLabel.text = @""; - self.subLabel.text = @""; - self.heatNumLable.text = @"0"; -} - -- (void)setRoomInfo:(HomePlayRoomModel *)roomInfo { - _roomInfo = roomInfo; - self.avatarView.imageUrl = roomInfo.avatar; - self.levelImageView.imageUrl = roomInfo.roomLevelIcon; - if (roomInfo.hourTop > 0) { - NSString *name = [NSString stringWithFormat:@"room_level_top_%ld", (long)roomInfo.hourTop]; - self.rankImageView.image = [UIImage getLanguageImage:name]; - } else { - self.rankImageView.image = nil; - } - - if (roomInfo.roomBoom) { - self.boomImageView.hidden = NO; - self.boomImageView.imageUrl = [roomInfo roomBoomPic]; - } else { - self.boomImageView.hidden = YES; - } - - self.flagImage.imageUrl = roomInfo.regionFlag; - self.flagImage.hidden = [NSString isEmpty:roomInfo.regionFlag]; - self.heatNumLable.text = [NSString isEmpty:roomInfo.hotValue.stringValue] ? @"0" : @(roomInfo.hotValue.integerValue).stringValue; - - [self updateRoomName]; - [self updateSubTitleAndTag]; - -} - -- (void)updateRoomName { - NSString *title = self.roomInfo.title; - switch (self.roomInfo.homeRoomType) { - case 1:{ - NSTextAttachment *attach = [[NSTextAttachment alloc] init]; - attach.image = kImage(@"room_type_rd"); - attach.bounds = CGRectMake(0, 2, 14, 14); - NSAttributedString *attachString = [NSAttributedString attributedStringWithAttachment:attach]; - NSAttributedString *titleString = [[NSAttributedString alloc] initWithString:title - attributes:@{ - NSFontAttributeName: kFontSemibold(15), - NSForegroundColorAttributeName: UIColorFromRGB(0x313131) - }]; - NSMutableAttributedString *ms = [[NSMutableAttributedString alloc] initWithAttributedString:titleString]; - [ms insertAttributedString:attachString atIndex:0]; - self.nameLabel.attributedText = ms; - } - break; - case 2: - { - NSTextAttachment *attach = [[NSTextAttachment alloc] init]; - attach.image = kImage(@"room_type_cs"); - attach.bounds = CGRectMake(0, 2, 14, 14); - NSAttributedString *attachString = [NSAttributedString attributedStringWithAttachment:attach]; - NSAttributedString *titleString = [[NSAttributedString alloc] initWithString:title - attributes:@{ - NSFontAttributeName: kFontSemibold(15), - NSForegroundColorAttributeName: UIColorFromRGB(0x313131) - }]; - NSMutableAttributedString *ms = [[NSMutableAttributedString alloc] initWithAttributedString:titleString]; - [ms insertAttributedString:attachString atIndex:0]; - _nameLabel.attributedText = ms; - } - break; - - default: - _nameLabel.text = _roomInfo.title; - break; - } -} - -- (void)updateSubTitleAndTag { - if ([NSString isEmpty:self.roomInfo.tagPict]) { - self.subLabel.text = self.roomInfo.roomDesc.length > 0 ? self.roomInfo.roomDesc : YMLocalizedString(@"XPHomeMineViewController3"); - self.tagImageView.hidden = YES; - } else { - @kWeakify(self); - [self.tagImageView loadImageWithUrl:self.roomInfo.tagPict - completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - if (image) { - self.tagImageView.hidden = NO; - self.tagImageView.image = image; - CGFloat width = kGetScaleWidth(62); - if (image.size.height > 0){ - width = image.size.width * kGetScaleWidth(19) / image.size.height; - } - [self.tagImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(width); - }]; - [self layoutIfNeeded]; - } else { - self.tagImageView.hidden = YES; - } - self.subLabel.text = [NSString stringWithFormat:@" %@", self.roomInfo.roomDesc.length > 0 ? self.roomInfo.roomDesc : YMLocalizedString(@"XPHomeMineViewController3")]; - }]; - } -} - -#pragma mark - - -- (NetImageView *)avatarView{ - if(!_avatarView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder]; - _avatarView = [[NetImageView alloc]initWithConfig:config]; - _avatarView.contentMode = UIViewContentModeScaleAspectFill; - [_avatarView setCornerRadius:12]; - } - return _avatarView; -} - -- (NetImageView *)rankImageView{ - if(!_rankImageView){ - _rankImageView = [NetImageView new]; - } - return _rankImageView; -} - -- (NetImageView *)tagImageView{ - if(!_tagImageView){ - _tagImageView = [NetImageView new]; - } - return _tagImageView; -} - -- (NetImageView *)boomImageView{ - if(!_boomImageView){ - _boomImageView = [NetImageView new]; - _boomImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _boomImageView; -} - -- (NetImageView *)flagImage{ - if(!_flagImage){ - _flagImage = [NetImageView new]; - _flagImage.contentMode = UIViewContentModeScaleAspectFit; - } - return _flagImage; -} - -- (UILabel *)nameLabel{ - if(!_nameLabel){ - _nameLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(15) - textColor:UIColorFromRGB(0x1E1E1F)]; - _nameLabel.adjustsFontSizeToFitWidth = YES; - _nameLabel.minimumScaleFactor = 0.5; - } - return _nameLabel; -} - -- (MarqueeLabel *)subLabel{ - if(!_subLabel){ - _subLabel = [[MarqueeLabel alloc] init]; - _subLabel.text = @""; - _subLabel.font = kFontRegular(13); - _subLabel.textColor = [UIColor whiteColor]; - _subLabel.textAlignment = NSTextAlignmentLeft; - _subLabel.scrollDuration = 3.0; - _subLabel.fadeLength = 8.0f; - _subLabel.animationDelay = 1.0; - } - return _subLabel; -} - -- (UIImageView *)heatIcon{ - if(!_heatIcon){ - _heatIcon = [UIImageView new]; - _heatIcon.image = kImage(@"ms_home_heat_icon"); - } - return _heatIcon; -} - --(UILabel *)heatNumLable{ - if(!_heatNumLable){ - _heatNumLable = [UILabel labelInitWithText:@"0" font:kFontMedium(12) textColor:[UIColor whiteColor]]; - _heatNumLable.textAlignment = NSTextAlignmentRight; - } - return _heatNumLable; -} - -- (UIImageView *)bottomShadow { - if (!_bottomShadow) { - _bottomShadow = [[UIImageView alloc] initWithImage:kImage(@"room_bottom_shadow")]; - } - return _bottomShadow; -} - -- (NetImageView *)levelImageView{ - if(!_levelImageView){ - _levelImageView = [[NetImageView alloc]init]; - } - return _levelImageView; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/CreateEventPickerContainerView.h b/YuMi/Modules/YMNewHome/View/CreateEventPickerContainerView.h deleted file mode 100644 index ab36392..0000000 --- a/YuMi/Modules/YMNewHome/View/CreateEventPickerContainerView.h +++ /dev/null @@ -1,21 +0,0 @@ -#import "UIKit/UIKit.h" -@class EventConfigModel; -typedef NS_ENUM(NSInteger, CreateEventPickerType) { - CreateEventPickerTypeDuration = 0, - CreateEventPickerTypeStartTime = 1 -}; - -@interface CreateEventPickerContainerView : UIView -@property (nonatomic, assign) CreateEventPickerType pickerType; -@property (nonatomic, copy) void (^onConfirmDate)(NSDate *date, - NSString *resultString, - NSInteger dutationMinutes); - -- (void)showInView:(UIView *)parentView - initialDate:(NSDate *)date - config:(EventConfigModel *)config - pickerType:(CreateEventPickerType)type - onConfirm:(void (^)(NSDate *date, - NSString *resultString, - NSInteger dutationMinutes))onConfirm; -@end diff --git a/YuMi/Modules/YMNewHome/View/CreateEventPickerContainerView.m b/YuMi/Modules/YMNewHome/View/CreateEventPickerContainerView.m deleted file mode 100644 index b1624e3..0000000 --- a/YuMi/Modules/YMNewHome/View/CreateEventPickerContainerView.m +++ /dev/null @@ -1,458 +0,0 @@ -#import "CreateEventPickerContainerView.h" -#import "EventConfigModel.h" -@interface CreateEventPickerContainerView () -@property (nonatomic, strong) EventConfigModel *configModel; -@property (nonatomic, strong) UIPickerView *pickerView; -@property (nonatomic, strong) NSDate *minDate; -@property (nonatomic, strong) NSDate *maxDate; -@property (nonatomic, strong) NSArray *dateArray; -@property (nonatomic, strong) NSArray *monthArray; -@property (nonatomic, strong) NSArray *dayArray; -@property (nonatomic, strong) NSArray *hourArray; -@property (nonatomic, strong) NSDate *selectedDate; -// StartTime 相关 -@property (nonatomic, strong) NSArray *durationsOptions; -@property (nonatomic, strong) NSDate *defaultSelectedDate; -@end - -@implementation CreateEventPickerContainerView { - UIView *_pickerBg; - UILabel *_titleLabel; - UIButton *_okButton; -} - -- (instancetype)init { - self = [super init]; - if (self) { - [self setupUI]; - } - return self; -} - -- (void)setupUI { - self.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.3]; - - // 底部白色背景 - _pickerBg = [[UIView alloc] init]; - _pickerBg.backgroundColor = [UIColor whiteColor]; - _pickerBg.layer.cornerRadius = 16; - _pickerBg.clipsToBounds = YES; - [self addSubview:_pickerBg]; - - // 标题 - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _titleLabel.textColor = [UIColor blackColor]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - [_pickerBg addSubview:_titleLabel]; - - // OK 按钮 - _okButton = [UIButton buttonWithType:UIButtonTypeSystem]; - [_okButton setTitle:@"OK" forState:UIControlStateNormal]; - [_okButton setTitleColor:UIColorFromRGB(0xff8c03) forState:UIControlStateNormal]; - _okButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - [_okButton addTarget:self action:@selector(okTapped) forControlEvents:UIControlEventTouchUpInside]; - [_pickerBg addSubview:_okButton]; - - // Picker View - self.pickerView = [[UIPickerView alloc] init]; - self.pickerView.dataSource = self; - self.pickerView.delegate = self; - [_pickerBg addSubview:self.pickerView]; - - // 点击背景关闭 - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismiss)]; - [self addGestureRecognizer:tap]; - tap.delegate = self; - - // 布局 - [_pickerBg mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self); - make.height.mas_equalTo(320); - }]; - - [_titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(_pickerBg).offset(8); - make.centerX.equalTo(_pickerBg); - make.height.mas_equalTo(26); - }]; - - [_okButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(_titleLabel); - make.right.equalTo(_pickerBg).offset(-16); - }]; - - [self.pickerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(_titleLabel.mas_bottom).offset(8); - make.left.right.equalTo(_pickerBg); - }]; -} - -#pragma mark - UIGestureRecognizerDelegate -- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch { - if ([touch.view isDescendantOfView:_pickerBg]) { - return NO; - } - return YES; -} - -#pragma mark - Public Methods -- (NSDictionary *)formatTimeWithString:(NSString *)minutesString { - // 将字符串转换为整数 - NSInteger minutes = [minutesString integerValue]; - - NSMutableDictionary *result = [NSMutableDictionary dictionary]; - result[@"minutes"] = minutesString; - - if (minutes < 60) { - // 小于60分钟，直接显示分钟 - result[@"title"] = [NSString stringWithFormat:@"%@%@", minutesString, YMLocalizedString(@"XPFreeGiftsObtainView4")]; - } else if (minutes < 1440) { - // 大于等于60分钟且小于24小时（1440分钟） - NSInteger hours = minutes / 60; - NSInteger remainingMinutes = minutes % 60; - - if (remainingMinutes == 0) { - // 没有剩余分钟 - result[@"title"] = [NSString stringWithFormat:@"%ld%@", (long)hours, YMLocalizedString(@"XPFreeGiftsObtainView5")]; - } else { - // 有剩余分钟 - result[@"title"] = [NSString stringWithFormat:@"%ld%@ %ld%@", (long)hours, YMLocalizedString(@"XPFreeGiftsObtainView5"), (long)remainingMinutes, YMLocalizedString(@"XPFreeGiftsObtainView4")]; - } - } else { - // 大于等于24小时 - NSInteger days = minutes / 1440; - NSInteger remainingMinutes = minutes % 1440; - NSInteger hours = remainingMinutes / 60; - NSInteger mins = remainingMinutes % 60; - - if (hours == 0 && mins == 0) { - // 无小时和分钟 - result[@"title"] = [NSString stringWithFormat:@"%ld%@", - (long)days, - YMLocalizedString(@"App_Commont_Day")]; - } else if (mins == 0) { - // 有小时无分钟 - result[@"title"] = [NSString stringWithFormat:@"%ld%@ %ld%@", - (long)days, - YMLocalizedString(@"App_Commont_Day"), - (long)hours, - YMLocalizedString(@"XPFreeGiftsObtainView5")]; - } else if (hours == 0) { - // 无小时有分钟 - result[@"title"] = [NSString stringWithFormat:@"%ld%@ %ld%@", - (long)days, - YMLocalizedString(@"App_Commont_Day"), - (long)mins, - YMLocalizedString(@"XPFreeGiftsObtainView4")]; - } else { - // 有小时和分钟 - result[@"title"] = [NSString stringWithFormat:@"%ld%@ %ld%@ %ld%@", - (long)days, - YMLocalizedString(@"App_Commont_Day"), - (long)hours, - YMLocalizedString(@"XPFreeGiftsObtainView5"), - (long)mins, - YMLocalizedString(@"XPFreeGiftsObtainView4")]; - } - } - - return result; -} - -- (void)buildDurationDataSource { - NSMutableArray *arr = [NSMutableArray array]; - for (NSString *duration in self.configModel.durations) { - [arr addObject:[self formatTimeWithString:duration]]; - } - self.durationsOptions = arr.copy; -} - -- (void)buildStartTimeSourceWithInitialDate:(NSDate *)date { - NSCalendar *calendar = [NSCalendar currentCalendar]; - NSDate *now = [NSDate date]; - - // 最早：当前时间+24小时 - NSDate *start = [calendar dateByAddingUnit:NSCalendarUnitHour - value:24 - toDate:now - options:0]; - - // 最晚：当前时间+1个月 - NSDateComponents *comp = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay fromDate:now]; - comp.month += 1; - NSDate *end = [calendar dateFromComponents:comp]; - - self.minDate = start; - self.maxDate = end; - - NSMutableArray *months = [NSMutableArray array]; - NSMutableArray *days = [NSMutableArray array]; - - NSDate *iter = start; - while ([iter compare:end] != NSOrderedDescending) { - NSDateComponents *c = [calendar components:NSCalendarUnitMonth|NSCalendarUnitDay|NSCalendarUnitHour fromDate:iter]; - - NSString *monthStr = [NSString stringWithFormat:@"%02ld", (long)c.month]; - NSString *dayStr = [NSString stringWithFormat:@"%02ld", (long)c.day]; - - if (![months containsObject:monthStr]) [months addObject:monthStr]; - if (![days containsObject:dayStr]) [days addObject:dayStr]; - - iter = [calendar dateByAddingUnit:NSCalendarUnitDay value:1 toDate:iter options:0]; - } - - self.monthArray = months; - self.dayArray = days; - - // 设置初始选中的月和日 - NSDateComponents *startComp = [calendar components:NSCalendarUnitMonth|NSCalendarUnitDay|NSCalendarUnitHour fromDate:start]; - NSInteger initialMonthIndex = [months indexOfObject:[NSString stringWithFormat:@"%02ld", (long)startComp.month]]; - NSInteger initialDayIndex = [days indexOfObject:[NSString stringWithFormat:@"%02ld", (long)startComp.day]]; - - // 根据是否是明天来生成小时数组 - [self updateHourArrayForDate:start]; - - // 设置选中的初始值 - dispatch_async(dispatch_get_main_queue(), ^{ - [self.pickerView selectRow:initialMonthIndex inComponent:0 animated:NO]; - [self.pickerView selectRow:initialDayIndex inComponent:1 animated:NO]; - [self.pickerView selectRow:0 inComponent:2 animated:NO]; - }); - - self.selectedDate = start; -} - -- (void)updateHourArrayForDate:(NSDate *)date { - NSCalendar *calendar = [NSCalendar currentCalendar]; - NSDate *now = [NSDate date]; - - // 判断选中的日期是否是明天 - NSDateComponents *dateComp = [calendar components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay fromDate:date]; - NSDateComponents *tomorrowComp = [calendar components:NSCalendarUnitYear|NSCalendarUnitMonth|NSCalendarUnitDay fromDate:[calendar dateByAddingUnit:NSCalendarUnitDay value:1 toDate:now options:0]]; - - BOOL isTomorrow = dateComp.year == tomorrowComp.year && - dateComp.month == tomorrowComp.month && - dateComp.day == tomorrowComp.day; - - NSMutableArray *hours = [NSMutableArray array]; - - if (isTomorrow) { - // 如果是明天，从当前小时开始 - NSInteger currentHour = [[calendar components:NSCalendarUnitHour fromDate:now] hour]; - for (NSInteger i = currentHour; i <= 23; i++) { - [hours addObject:[NSString stringWithFormat:@"%02ld:00", (long)i]]; - } - } else { - // 如果不是明天，显示全部小时 - for (NSInteger i = 0; i <= 23; i++) { - [hours addObject:[NSString stringWithFormat:@"%02ld:00", (long)i]]; - } - } - - self.hourArray = hours; -} - -- (void)showInView:(UIView *)parentView - initialDate:(NSDate *)date - config:(EventConfigModel *)config - pickerType:(CreateEventPickerType)type - onConfirm:(void (^)(NSDate *date, - NSString *resultString, - NSInteger dutationMinutes))onConfirm{ - self.pickerType = type; - self.configModel = config; - self.onConfirmDate = onConfirm; - if (type == CreateEventPickerTypeStartTime) { - [self buildStartTimeSourceWithInitialDate:date]; - _titleLabel.text = YMLocalizedString(@"20.20.59_text_15"); - - // 保存默认选中的日期 - NSCalendar *calendar = [NSCalendar currentCalendar]; - NSInteger monthIdx = [self.pickerView selectedRowInComponent:0]; - NSInteger dayIdx = [self.pickerView selectedRowInComponent:1]; - NSInteger hourIdx = [self.pickerView selectedRowInComponent:2]; - - NSDateComponents *nowComp = [calendar components:NSCalendarUnitYear fromDate:[NSDate date]]; - NSInteger year = nowComp.year; - NSInteger month = [self.monthArray[monthIdx] integerValue]; - NSInteger day = [self.dayArray[dayIdx] integerValue]; - NSInteger hour = [[self.hourArray[hourIdx] substringToIndex:2] integerValue]; - - NSDateComponents *selComp = [[NSDateComponents alloc] init]; - selComp.year = year; - selComp.month = month; - selComp.day = day; - selComp.hour = hour; - selComp.minute = 0; - self.defaultSelectedDate = [calendar dateFromComponents:selComp]; - self.selectedDate = self.defaultSelectedDate; - - } else if (type == CreateEventPickerTypeDuration) { - [self buildDurationDataSource]; - _titleLabel.text = YMLocalizedString(@"20.20.59_text_16"); - } - self.frame = parentView.bounds; - [parentView addSubview:self]; - self.alpha = 0; - [self.pickerView reloadAllComponents]; - [UIView animateWithDuration:0.25 animations:^{ - self.alpha = 1; - }]; -} - -#pragma mark - UIPickerViewDataSource & Delegate -- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView { - switch (self.pickerType) { - case CreateEventPickerTypeStartTime: - return 3; - break; - case CreateEventPickerTypeDuration: - default: - return 1; - break; - } -} - -- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component { - switch (self.pickerType) { - case CreateEventPickerTypeStartTime: { - if (component == 0) return self.monthArray.count; - if (component == 1) return self.dayArray.count; - if (component == 2) return self.hourArray.count; - } - break; - case CreateEventPickerTypeDuration: - default: - return self.durationsOptions.count; - break; - } - return 0; -} - -- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component { - switch (self.pickerType) { - case CreateEventPickerTypeStartTime: { - NSInteger monthIdx = [pickerView selectedRowInComponent:0]; - NSInteger dayIdx = [pickerView selectedRowInComponent:1]; - - NSCalendar *calendar = [NSCalendar currentCalendar]; - NSDateComponents *nowComp = [calendar components:NSCalendarUnitYear fromDate:[NSDate date]]; - NSInteger year = nowComp.year; - NSInteger month = [self.monthArray[monthIdx] integerValue]; - NSInteger day = [self.dayArray[dayIdx] integerValue]; - - // 创建选中的日期 - NSDateComponents *selComp = [[NSDateComponents alloc] init]; - selComp.year = year; - selComp.month = month; - selComp.day = day; - selComp.hour = 0; - selComp.minute = 0; - NSDate *selectedDate = [calendar dateFromComponents:selComp]; - - // 更新小时数组 - if (component < 2) { // 只有在月份或日期改变时才更新小时 - [self updateHourArrayForDate:selectedDate]; - [pickerView reloadComponent:2]; - [pickerView selectRow:0 inComponent:2 animated:YES]; - } - - // 获取当前选中的小时 - NSInteger hourIdx = [pickerView selectedRowInComponent:2]; - NSInteger hour = [[self.hourArray[hourIdx] substringToIndex:2] integerValue]; - selComp.hour = hour; - - self.selectedDate = [calendar dateFromComponents:selComp]; - } - break; - case CreateEventPickerTypeDuration: { - NSInteger minutes = [self.durationsOptions[row][@"minutes"] integerValue]; - NSCalendar *calendar = [NSCalendar currentCalendar]; - self.selectedDate = [calendar dateByAddingUnit:NSCalendarUnitMinute value:minutes toDate:[NSDate date] options:0]; - } - break; - default: - break; - } - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [pickerView reloadComponent:component]; - }); -} - -- (UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView *)view { - NSInteger selectedRow = [pickerView selectedRowInComponent:component]; - BOOL isSelectedRow = selectedRow == row; - NSString *content = @""; - switch (self.pickerType) { - case CreateEventPickerTypeStartTime: { - if (component == 0) content = self.monthArray[row]; - if (component == 1) content = self.dayArray[row]; - if (component == 2) content = self.hourArray[row]; - } - break; - case CreateEventPickerTypeDuration: - content = self.durationsOptions[row][@"title"]; - break; - default: - break; - } - - UILabel *label = (UILabel *)view; - if (!label) { - label = [[UILabel alloc] init]; - label.textAlignment = NSTextAlignmentCenter; - label.backgroundColor = [UIColor clearColor]; - } - - label.text = content; - label.font = isSelectedRow ? kFontMedium(15) : kFontRegular(15); - label.textColor = isSelectedRow ? UIColorFromRGB(0x313131) : UIColorFromRGB(0x7b7b7d); - - return label; -} - -- (CGFloat)pickerView:(UIPickerView *)pickerView rowHeightForComponent:(NSInteger)component { - return 30; // 设置行高 -} - -#pragma mark - Actions -- (void)okTapped { - if (self.onConfirmDate) { - NSString *resultString = @""; - NSInteger durationMinutes = 0; - switch (self.pickerType) { - case CreateEventPickerTypeStartTime: { - NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; - formatter.dateFormat = @"yyyy-MM-dd HH:mm:ss"; - - // 使用默认选中日期或用户选择的日期 - NSDate *dateToUse = self.selectedDate ?: self.defaultSelectedDate; - resultString = [formatter stringFromDate:dateToUse]; - self.onConfirmDate(dateToUse, resultString, durationMinutes); - } - break; - case CreateEventPickerTypeDuration: { - NSInteger selectedRow = [self.pickerView selectedRowInComponent:0]; - resultString = self.durationsOptions[selectedRow][@"title"]; - durationMinutes = [self.durationsOptions[selectedRow][@"minutes"] integerValue]; - self.onConfirmDate(self.selectedDate, resultString, durationMinutes); - } - break; - default: - break; - } - } - [self dismiss]; -} - -- (void)dismiss { - [UIView animateWithDuration:0.25 animations:^{ - self.alpha = 0; - } completion:^(BOOL finished) { - [self removeFromSuperview]; - }]; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/CreateEventSelectRoomViewController.h b/YuMi/Modules/YMNewHome/View/CreateEventSelectRoomViewController.h deleted file mode 100644 index 6826189..0000000 --- a/YuMi/Modules/YMNewHome/View/CreateEventSelectRoomViewController.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// CreateEventSelectRoomViewController.h -// YuMi -// -// Created by P on 2025/5/12. -// - -#import "MvpViewController.h" -@class EventRoomModel; -NS_ASSUME_NONNULL_BEGIN - -@interface CreateEventSelectRoomViewController : MvpViewController - -@property (nonatomic, copy) void(^didSelectedRoom)(EventRoomModel *roomModel); - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/CreateEventSelectRoomViewController.m b/YuMi/Modules/YMNewHome/View/CreateEventSelectRoomViewController.m deleted file mode 100644 index 07ef6c7..0000000 --- a/YuMi/Modules/YMNewHome/View/CreateEventSelectRoomViewController.m +++ /dev/null @@ -1,270 +0,0 @@ -// -// CreateEventSelectRoomViewController.m -// YuMi -// -// Created by P on 2025/5/12. -// - -#import "CreateEventSelectRoomViewController.h" -#import "CreateEventPresenter.h" -#import "EventCenterEmptyCell.h" - -@interface CreateEventSelectRoomCell : UITableViewCell -{ - NetImageView *avatar; - UILabel *nameLabel; - UILabel *idLabel; -} - -+ (CGFloat)cellHeight; -+ (void)registerTo:(UITableView *)tableView; -+ (CreateEventSelectRoomCell *)cellFor:(UITableView *)tableView atIndexPath:(NSIndexPath *)indexPath; - -- (void)updateCell:(EventRoomModel *)model; - -@end - -@implementation CreateEventSelectRoomCell -{ - EventRoomModel *cellModel; -} -+ (CGFloat)cellHeight { - return 64; -} - -+ (void)registerTo:(UITableView *)tableView { - [tableView registerClass:[self class] - forCellReuseIdentifier:NSStringFromClass([self class])]; -} - -+ (CreateEventSelectRoomCell *)cellFor:(UITableView *)tableView atIndexPath:(NSIndexPath *)indexPath { - return [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([self class]) forIndexPath:indexPath]; -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.separatorInset = UIEdgeInsetsZero; - self.contentView.backgroundColor = [UIColor whiteColor]; - - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - avatar = [[NetImageView alloc]initWithConfig:config]; - [avatar setCornerRadius:8]; - [self.contentView addSubview: avatar]; - - nameLabel = [UILabel labelInitWithText:@"123" font:kFontSemibold(15) textColor:UIColorFromRGB(0x313131)]; - [self.contentView addSubview:nameLabel]; - - idLabel = [UILabel labelInitWithText:@"456" font:kFontRegular(13) textColor:UIColorFromRGB(0x7b7b7d)]; - [self.contentView addSubview:idLabel]; - - [avatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(16); - make.size.mas_equalTo(CGSizeMake(48, 48)); - }]; - - [nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(avatar).offset(4); - make.leading.mas_equalTo(avatar.mas_trailing).offset(11); - make.height.mas_equalTo(21); - }]; - - [idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(avatar).offset(-4); - make.leading.mas_equalTo(avatar.mas_trailing).offset(11); - make.height.mas_equalTo(18); - }]; - } - return self; -} - -- (void)updateCell:(EventRoomModel *)model { - cellModel = model; - avatar.imageUrl = model.avatar; - nameLabel.text = model.roomName; - idLabel.text = [NSString stringWithFormat:@"ID:%@", @(model.erbanNo)]; -} - -@end - -@interface CreateEventSelectRoomViewController () -{ - UITableView *tableView; -} - -@property (nonatomic, strong) EventRoomListModel *model; - -@end - -@implementation CreateEventSelectRoomViewController - -- (CreateEventPresenter *)createPresenter { - return [CreateEventPresenter new]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.title = YMLocalizedString(@"20.20.59_text_14"); - - [self setupUI]; - - [self.presenter loadMyRooms]; -} - -- (void)setupUI { - tableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStylePlain]; - tableView.delegate = self; - tableView.dataSource = self; - tableView.separatorInset = UIEdgeInsetsZero; - tableView.backgroundColor = [UIColor whiteColor]; - tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - [CreateEventSelectRoomCell registerTo:tableView]; - [EventCenterEmptyCell registerTo:tableView withCustomID:@""]; - [self.view addSubview:tableView]; -} - -#pragma mark - CreateEventPresenterProcotol -- (void)myRoomListSuccess:(EventRoomListModel *)listModel { - _model = listModel; - [tableView reloadData]; -} - -- (void)myRoomListFailure:(NSString *)msg { - -} - -#pragma mark - Delegate & DataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 2; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - switch (section) { - case 0: - return 1; - break; - case 1: - return self.model.manageRooms.count == 0 ? 1 : self.model.manageRooms.count; - break; - default: - return 0; - break; - } -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - switch (section) { - case 0: { - return [self sectionHeaderTitle:YMLocalizedString(@"20.20.59_text_20")]; - } - break; - case 1: { - return [self sectionHeaderTitle:YMLocalizedString(@"20.20.59_text_21")]; - } - break; - default: - return [UIView new]; - break; - } -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - return 30; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - switch (indexPath.section) { - case 0: { - return self.model.selfRoom == nil ? [EventCenterEmptyCell cellHeight] : [CreateEventSelectRoomCell cellHeight]; - } - break; - case 1: { - return self.model.manageRooms.count == 0 ? [EventCenterEmptyCell cellHeight] : [CreateEventSelectRoomCell cellHeight]; - } - break; - default: - return 0; - break; - } -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - UITableViewCell *cell = [UITableViewCell new]; - switch (indexPath.section) { - case 0: { - if (self.model.selfRoom == nil) { - cell = [EventCenterEmptyCell cellFor:tableView customID:@"" atIndexPath:indexPath]; - } else { - cell = [CreateEventSelectRoomCell cellFor:tableView atIndexPath:indexPath]; - [(CreateEventSelectRoomCell *)cell updateCell:self.model.selfRoom]; - } - } - break; - case 1: { - if (self.model.manageRooms.count == 0) { - cell = [EventCenterEmptyCell cellFor:tableView customID:@"" atIndexPath:indexPath]; - } else { - cell = [CreateEventSelectRoomCell cellFor:tableView atIndexPath:indexPath]; - [(CreateEventSelectRoomCell *)cell updateCell:[self.model.manageRooms xpSafeObjectAtIndex:indexPath.row]]; - } - } - break; - default: { - cell = [UITableViewCell new]; - } - break; - } - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:NO]; - - if (self.didSelectedRoom) { - switch (indexPath.section) { - case 0: - self.didSelectedRoom(self.model.selfRoom); - break; - case 1: - self.didSelectedRoom([self.model.manageRooms xpSafeObjectAtIndex:indexPath.row]); - break; - default: - break; - } - } - - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - -- (UIView *)sectionHeaderTitle:(NSString *)title { - UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 30)]; - view.backgroundColor = UIColorFromRGB(0xf2f3f7); - - if ([title isEqualToString:YMLocalizedString(@"20.20.59_text_21")]) { -// view.backgroundColor = [UIColor whiteColor]; - UILabel *label = [UILabel labelInitWithText:title font:kFontSemibold(14) textColor:UIColorFromRGB(0x313131)]; - [view addSubview:label]; - [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(view); - make.leading.mas_equalTo(16); - }]; - return view; - } - - UILabel *label = [UILabel labelInitWithText:title font:kFontSemibold(14) textColor:UIColorFromRGB(0x313131)]; - [view addSubview:label]; - [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(view); - make.leading.mas_equalTo(16); - }]; - return view; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/CreateEventViewControllerV2.h b/YuMi/Modules/YMNewHome/View/CreateEventViewControllerV2.h deleted file mode 100644 index a083f1e..0000000 --- a/YuMi/Modules/YMNewHome/View/CreateEventViewControllerV2.h +++ /dev/null @@ -1,67 +0,0 @@ -// -// CreateEventViewControllerV2.h -// YuMi -// -// Created by P on 2025/5/9. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface CreateEventViewControllerV2 : MvpViewController - -@property (nonatomic, copy) void(^createSuccess)(void); - -@property (nonatomic, strong) UIScrollView *scrollView; -@property (nonatomic, strong) UIView *contentView; - -@property (nonatomic, strong) UILabel *eventTitleLabel; -@property (nonatomic, strong) UITextField *eventTitleTextField; -@property (nonatomic, strong) UILabel *eventTitleCharCountLabel; - -@property (nonatomic, strong) UILabel *eventBannerLabel; -@property (nonatomic, strong) UIImageView *eventBannerImageView; -@property (nonatomic, strong) UIImageView *eventBannerCamearImageView; - -@property (nonatomic, strong) UILabel *uploadBannerLabel; -@property (nonatomic, strong) UIButton *uploadBannerYesButton; -@property (nonatomic, strong) UIButton *uploadBannerNoButton; - -@property (nonatomic, strong) UILabel *selectRoomLabel; -@property (nonatomic, strong) UIView *selectRoomView; -@property (nonatomic, strong) UILabel *selectRoomPlaceholderLabel; -@property (nonatomic, strong) UIImageView *selectRoomArrowImageView; - -@property (nonatomic, strong) UILabel *startTimeLabel; -@property (nonatomic, strong) UIView *startTimeView; -@property (nonatomic, strong) UILabel *startTimePlaceholderLabel; -@property (nonatomic, strong) UIImageView *startTimeArrowImageView; - -@property (nonatomic, strong) NSDate *selectedStartTime; // 新增：存储选择的开始时间 -@property (nonatomic, strong) UIView *datePickerContainerView; // 新增：日期选择器容器视图 -@property (nonatomic, strong) UIDatePicker *datePicker; // 新增：日期选择器 -@property (nonatomic, strong) UIToolbar *pickerToolbar; // 新增：选择器工具栏 - -@property (nonatomic, strong) UILabel *durationLabel; -@property (nonatomic, strong) UIView *durationView; -@property (nonatomic, strong) UILabel *durationPlaceholderLabel; -@property (nonatomic, strong) UIImageView *durationArrowImageView; - - -@property (nonatomic, strong) UIView *durationPickerContainerView; // 新增：时长选择器容器视图 -@property (nonatomic, strong) UIPickerView *durationPicker; // 新增：时长选择器 (UIPickerView) -@property (nonatomic, strong) UIToolbar *durationPickerToolbar; // 新增：时长选择器工具栏 - -@property (nonatomic, strong) UILabel *eventContentLabel; -@property (nonatomic, strong) UITextView *eventContentTextView; -@property (nonatomic, strong) UILabel *eventContentCharCountLabel; - -@property (nonatomic, strong) UILabel *notifyFansLabel; -@property (nonatomic, strong) UISwitch *notifyFansSwitch; - -@property (nonatomic, strong) UIButton *createEventButton; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/CreateEventViewControllerV2.m b/YuMi/Modules/YMNewHome/View/CreateEventViewControllerV2.m deleted file mode 100644 index 212d822..0000000 --- a/YuMi/Modules/YMNewHome/View/CreateEventViewControllerV2.m +++ /dev/null @@ -1,826 +0,0 @@ -// -// CreateEventViewControllerV2.m -// YuMi -// -// Created by P on 2025/5/9. -// - -#import "CreateEventViewControllerV2.h" - -#import -#import -#import - -#import "UploadFile.h" -#import "CreateEventPresenter.h" -#import "CreateEventPickerContainerView.h" -#import "CreateEventSelectRoomViewController.h" -#import "UIImage+Utils.h" -#import "XPIAPRechargeViewController.h" - -#define MAX_EVENT_TITLE_LENGTH 50 -#define MAX_EVENT_CONTENT_LENGTH 1000 -@interface CreateEventViewControllerV2 () - -@property (nonatomic, strong) EventConfigModel *configModel; -@property (nonatomic, strong) EventRoomModel *selectRoomModel; -@property (nonatomic, strong) WalletInfoModel *walletInfoModel; - -@property (nonatomic, strong) UIImage *selectedImage; -//@property (nonatomic, strong) UIView *durationPickerContainerView; -//@property (nonatomic, strong) CreateEventPickerContainerView *durationPickerView; -@property (nonatomic, strong) UILabel *durationPickerTitleLabel; -@property (nonatomic, strong) UIButton *durationPickerOkButton; -@property (nonatomic, assign) NSInteger selectedHour; -@property (nonatomic, assign) NSInteger selectedMin; -@property (nonatomic, assign) NSInteger durationMinutes; - - -// 添加私有方法声明 -- (UIButton *)createUploadBannerButtonWithTitle:(NSString *)title imageName:(NSString *)imageName selectedImageName:(NSString *)selectedImageName tag:(NSInteger)tag; - -@end - -@implementation CreateEventViewControllerV2 - -static const CGFloat kHorizontalPadding = 16.0; -static const CGFloat kVerticalPadding = 10.0; -static const CGFloat kSectionSpacing = 20.0; - -- (CreateEventPresenter *)createPresenter { - return [CreateEventPresenter new]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"20.20.59_text_8"); - - [self setupUI]; - [self updateEventTitleCharCount]; - [self updateEventContentCharCount]; - - // 键盘通知 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil]; - - // 点击空白收起键盘 - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissKeyboard)]; - tap.cancelsTouchesInView = NO; - [self.view addGestureRecognizer:tap]; - - // 设置 scrollView delegate - self.scrollView.delegate = self; - - [self.presenter loadConfig]; -} - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (void)keyboardWillShow:(NSNotification *)notification { - NSDictionary *userInfo = notification.userInfo; - CGRect keyboardFrame = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue]; - CGFloat keyboardHeight = keyboardFrame.size.height; - UIEdgeInsets insets = self.scrollView.contentInset; - insets.bottom = keyboardHeight + 20; - self.scrollView.contentInset = insets; - self.scrollView.scrollIndicatorInsets = insets; -} - -- (void)keyboardWillHide:(NSNotification *)notification { - UIEdgeInsets insets = self.scrollView.contentInset; - insets.bottom = 0; - self.scrollView.contentInset = insets; - self.scrollView.scrollIndicatorInsets = insets; -} - -- (void)dismissKeyboard { - [self.view endEditing:YES]; -} - -- (void)backButtonTapped { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)setupUI { - // ScrollView and ContentView - self.scrollView = [[UIScrollView alloc] init]; - [self.view addSubview:self.scrollView]; - - self.contentView = [[UIView alloc] init]; - [self.scrollView addSubview:self.contentView]; - - UIBlurEffect *blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]; - UIVisualEffectView *visualView = [[UIVisualEffectView alloc]initWithEffect:blurEffect]; - [self.view addSubview:visualView]; - - // Create Event Button (fixed at bottom) - self.createEventButton = [UIButton buttonWithType:UIButtonTypeSystem]; - [self.createEventButton setTitle:YMLocalizedString(@"20.20.59_text_8") forState:UIControlStateNormal]; - [self.createEventButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [self.createEventButton.titleLabel setFont:kFontSemibold(16)]; - [self.createEventButton addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xe29030), - UIColorFromRGB(0xfcc074), - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 0.5) cornerRadius:23]; - [self.createEventButton setCornerRadius:23]; - self.createEventButton.userInteractionEnabled = NO; - self.createEventButton.alpha = 0.3; - [self.createEventButton addTarget:self action:@selector(createEventButtonTapped) forControlEvents:UIControlEventTouchUpInside]; - [self.view addSubview:self.createEventButton]; - - [self.createEventButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.view).offset(20); - make.trailing.equalTo(self.view).offset(-20); - make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom).offset(-20); - make.height.mas_equalTo(46); - }]; - - [visualView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.view); - make.top.mas_equalTo(self.createEventButton.mas_top).offset(-20); - }]; - - [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.view.mas_safeAreaLayoutGuideTop); - make.bottom.leading.trailing.equalTo(self.view); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.scrollView); - make.width.equalTo(self.scrollView); - }]; - - [self setupEventTitleSection]; - [self setupEventBannerSection]; - [self setupUploadBannerSection]; - [self setupSelectRoomSection]; - [self setupStartTimeSection]; - [self setupDurationSection]; - [self setupEventContentSection]; - [self setupNotifyMyFansSection]; -} - -- (void)viewDidLayoutSubviews { - [super viewDidLayoutSubviews]; -} - -#pragma mark - CreateEventPresenterProcotol -- (void)loadCongfigSuccess:(EventConfigModel *)model { - _configModel = model; - NSString *moneyString = @(model.goldNum).stringValue; - NSTextAttachment *icon = [[NSTextAttachment alloc] init]; - icon.bounds = CGRectMake(0, -8, 24, 24); - icon.image = kImage(@"moli_money_icon"); - NSDictionary *par = @{ - NSFontAttributeName: self.uploadBannerLabel.font, - NSForegroundColorAttributeName: self.uploadBannerLabel.textColor - }; - NSAttributedString *firstPart = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:YMLocalizedString(@"20.20.59_text_11"), - @(model.goldNum)] - attributes:par]; - NSAttributedString *iconString = [NSAttributedString attributedStringWithAttachment:icon]; - NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithAttributedString:firstPart]; - NSRange r = [string.string rangeOfString:moneyString]; - [string insertAttributedString:iconString atIndex:r.location]; - self.uploadBannerLabel.attributedText = string.copy; -} - -- (void)loadCongfigFailure:(NSString *)msg { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)createEventSuccess { - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"20.20.59_text_34")]; - [self.navigationController popViewControllerAnimated:YES]; - if (self.createSuccess) { - self.createSuccess(); - } -} - -- (void)createEventFailure:(NSString *)msg { - [XNDJTDDLoadingTool hideHUD]; -} - -#pragma mark - Helper Methods - -- (UIButton *)createUploadBannerButtonWithTitle:(NSString *)title imageName:(NSString *)imageName selectedImageName:(NSString *)selectedImageName tag:(NSInteger)tag { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:kImage(imageName) forState:UIControlStateNormal]; - [b setImage:kImage(selectedImageName) forState:UIControlStateSelected]; - [b setTitle:title forState:UIControlStateNormal]; - [b setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateNormal]; - [b.titleLabel setFont:kFontMedium(14)]; - [b setTitleEdgeInsets:UIEdgeInsetsMake(0, 8, 0, 0)]; - b.tag = tag; - return b; -} - -- (UILabel *)createLabelWithText:(NSString *)text { - UILabel *label = [[UILabel alloc] init]; - label.text = text; - label.font = kFontMedium(14); - label.textColor = UIColorFromRGB(0x313131); - return label; -} - -- (UITextField *)createTextFieldWithPlaceholder:(NSString *)placeholder { - UITextField *textField = [[UITextField alloc] init]; - textField.placeholder = placeholder; - textField.font = kFontRegular(14); - textField.textColor = UIColorFromRGB(0x313131); - textField.borderStyle = UITextBorderStyleNone; - [textField setCornerRadius:8]; - textField.backgroundColor = UIColorFromRGB(0xf2f3f7); - - // 设置左侧内间距为16 - UIView *leftPaddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 16, textField.frame.size.height)]; - textField.leftView = leftPaddingView; - textField.leftViewMode = UITextFieldViewModeAlways; - - // 设置右侧内间距为16 - UIView *rightPaddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 16, textField.frame.size.height)]; - textField.rightView = rightPaddingView; - textField.rightViewMode = UITextFieldViewModeAlways; - - return textField; -} - -- (UILabel *)createCharCountLabel { - UILabel *label = [[UILabel alloc] init]; - label.font = kFontRegular(12); - label.textColor = UIColorFromRGB(0x7b7b7d); - return label; -} - -- (UIView *)createSelectionViewWithPlaceholder:(NSString *)placeholder target:(id)target action:(SEL)action { - UIView *view = [[UIView alloc] init]; - view.backgroundColor = UIColorFromRGB(0xf2f3f7); - view.layer.cornerRadius = 8; - - UILabel *label = [[UILabel alloc] init]; - label.text = placeholder; - label.font = kFontRegular(14); - label.textColor = UIColorFromRGB(0x7b7b7d); - [view addSubview:label]; - - UIImageView *arrowImageView = [[UIImageView alloc] initWithImage:[kImage(@"event_arrow") ms_SetImageForRTL]]; - [view addSubview:arrowImageView]; - - [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(view).offset(10); - make.centerY.equalTo(view); - }]; - - [arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(view).offset(-10); - make.centerY.equalTo(view); - make.width.height.mas_equalTo(22); - }]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:target action:action]; - [view addGestureRecognizer:tap]; - view.userInteractionEnabled = YES; - - if ([placeholder isEqualToString:YMLocalizedString(@"XPAnchorPKTableViewCell2")]) { // Store placeholder label for later update - if (action == @selector(selectRoomTapped)) self.selectRoomPlaceholderLabel = label; - else if (action == @selector(selectStartTimeTapped)) self.startTimePlaceholderLabel = label; - else if (action == @selector(selectDurationTapped)) self.durationPlaceholderLabel = label; - } - - return view; -} - -- (void)updateEventTitleCharCount { - NSInteger currentLength = self.eventTitleTextField.text.length; - self.eventTitleCharCountLabel.text = [NSString stringWithFormat:@"%ld/%d", (long)currentLength, MAX_EVENT_TITLE_LENGTH]; -} - -- (void)updateEventContentCharCount { - NSInteger currentLength = self.eventContentTextView.text.length; - self.eventContentCharCountLabel.text = [NSString stringWithFormat:@"%ld/%d", (long)currentLength, MAX_EVENT_CONTENT_LENGTH]; -} - -#pragma mark - Actions - -- (void)eventBannerTapped { - NSLog(@"Event Banner Tapped"); - if (@available(iOS 14, *)) { - // 使用TZImagePickerController来选择并裁剪图片 - TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self]; - imagePickerVc.allowCrop = YES; - imagePickerVc.maxImagesCount = 1; - - // 允许拍照 - imagePickerVc.allowTakePicture = NO; - imagePickerVc.allowPickingVideo = NO; // 不允许选择视频 - imagePickerVc.showSelectedIndex = YES; - // 调整裁剪比例为 690:236 - CGFloat aspectRatio = 690.0 / 236.0; // 约为2.92:1 - - // 计算裁剪框宽度，限制在屏幕宽度内 - CGFloat cropWidth = MIN(self.view.frame.size.width - (kHorizontalPadding * 2 - 2), KScreenWidth); - CGFloat cropHeight = cropWidth / aspectRatio; - - // 设置裁剪框的尺寸 - imagePickerVc.cropRect = CGRectMake((KScreenWidth-cropWidth)/2, (KScreenHeight - cropHeight) / 2, cropWidth, cropHeight); - - // 拍照裁剪设置 -// imagePickerVc.needCircleCrop = NO; // 不需要圆形裁剪 -// imagePickerVc.circleCropRadius = 0; // 圆形裁剪半径，不需要设置 - - [self presentViewController:imagePickerVc animated:YES completion:nil]; - } else { - UIImagePickerController *picker = [[UIImagePickerController alloc] init]; - picker.delegate = self; - picker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; - [self presentViewController:picker animated:YES completion:nil]; - } -} - -- (void)selectRoomTapped { - NSLog(@"Select Room Tapped"); - - CreateEventSelectRoomViewController *vc = [[CreateEventSelectRoomViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; - @kWeakify(self); - [vc setDidSelectedRoom:^(EventRoomModel * _Nonnull roomModel) { - @kStrongify(self); - self.selectRoomModel = roomModel; - self.selectRoomPlaceholderLabel.text = @(roomModel.erbanNo).stringValue; - self.selectRoomPlaceholderLabel.textColor = [UIColor blackColor]; - [self checkCreateEventButtonState]; - }]; -} - -- (void)selectStartTimeTapped { - CreateEventPickerContainerView *view = [CreateEventPickerContainerView new]; - __weak typeof(self) weakSelf = self; - [view showInView:self.view - initialDate:[NSDate date] - config:self.configModel - pickerType:CreateEventPickerTypeStartTime - onConfirm:^(NSDate *date, - NSString *resultString, - NSInteger dutationMinutes) { - weakSelf.startTimePlaceholderLabel.text = resultString; - [weakSelf checkCreateEventButtonState]; - }]; -} - -- (void)selectDurationTapped { - CreateEventPickerContainerView *view = [CreateEventPickerContainerView new]; - __weak typeof(self) weakSelf = self; - [view showInView:self.view - initialDate:[NSDate date] - config:self.configModel - pickerType:CreateEventPickerTypeDuration - onConfirm:^(NSDate *date, - NSString *resultString, - NSInteger dutationMinutes) { - weakSelf.durationPlaceholderLabel.text = resultString; - weakSelf.durationMinutes = dutationMinutes; - [weakSelf checkCreateEventButtonState]; - }]; -} - -- (void)createEventButtonTapped { - // Gather all data and proceed with event creation logic - NSString *title = self.eventTitleTextField.text; - UIImage *bannerImage = self.eventBannerImageView.image; - BOOL uploadToHomepage = self.uploadBannerYesButton.selected; - NSString *startTime = self.startTimePlaceholderLabel.text; // This is a placeholder, get actual NSDate - NSString *content = self.eventContentTextView.text; - BOOL notifyFans = self.notifyFansSwitch.isOn; - - if (uploadToHomepage) { - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"XPAnchorAudienceUpMicView2"); - config.message = [NSString stringWithFormat:YMLocalizedString(@"20.20.59_text_33"), - @(self.configModel.goldNum)]; - config.actionStyle = TTAlertActionBothStyle; - @kWeakify(self); - [TTPopup alertWithConfig:config showBorder:NO confirmHandler:^{ - @kStrongify(self); - @kWeakify(self); - [self uploadCover:bannerImage - finish:^(NSString *path) { - @kStrongify(self); - [self.presenter createEventWithTitle:title - image:path - uploadToHome:uploadToHomepage - startTime:startTime - duration:self.durationMinutes - content:content - gold:uploadToHomepage ? self.configModel.goldNum : 0 - roomUid:self.selectRoomModel.roomUid - notifyFans:notifyFans]; - }]; - } cancelHandler:^{ }]; - } else { - @kWeakify(self); - [self uploadCover:bannerImage - finish:^(NSString *path) { - @kStrongify(self); - [self.presenter createEventWithTitle:title - image:path - uploadToHome:uploadToHomepage - startTime:startTime - duration:self.durationMinutes - content:content - gold:uploadToHomepage ? self.configModel.goldNum : 0 - roomUid:self.selectRoomModel.roomUid - notifyFans:notifyFans]; - }]; - } -} - -- (void)uploadCover:(UIImage *)cover finish:(void(^)(NSString *path))finish { - [XNDJTDDLoadingTool showLoading]; - NSData *data = UIImageJPEGRepresentation(cover, 0.7); - NSString *format = [UIImage getImageTypeWithImageData:data]; - NSString *name = [NSString stringWithFormat:@"banner/%@.%@",[NSString createUUID],format]; - - [[UploadFile share]QCloudUploadImage:data named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) { - [XNDJTDDLoadingTool hideHUD]; - if (finish) { - finish(key); - } - } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) { - [XNDJTDDLoadingTool showErrorWithMessage:message]; - }]; -} - - -#pragma mark - UITextFieldDelegate - -- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { - if (textField == self.eventTitleTextField) { - NSString *newString = [textField.text stringByReplacingCharactersInRange:range withString:string]; - if (newString.length > MAX_EVENT_TITLE_LENGTH) { - return NO; - } - } - return YES; -} - -- (void)textFieldDidChangeSelection:(UITextField *)textField { - if (textField == self.eventTitleTextField) { - [self updateEventTitleCharCount]; - [self checkCreateEventButtonState]; - } -} - -#pragma mark - UITextViewDelegate - -- (void)textViewDidChange:(UITextView *)textView { - if (textView == self.eventContentTextView) { - [self updateEventContentCharCount]; - [self checkCreateEventButtonState]; - // Optional: Add placeholder behavior for UITextView if needed - } -} - -- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text { - if (textView == self.eventContentTextView) { - NSString *newText = [textView.text stringByReplacingCharactersInRange:range withString:text]; - if (newText.length > MAX_EVENT_CONTENT_LENGTH) { - return NO; - } - } - return YES; -} - -- (void)uploadBannerButtonTapped:(UIButton *)sender { - if (sender == self.uploadBannerYesButton) { - if (!self.uploadBannerYesButton.selected) { - self.uploadBannerYesButton.selected = YES; - self.uploadBannerNoButton.selected = NO; - } - } else if (sender == self.uploadBannerNoButton) { - if (!self.uploadBannerNoButton.selected) { // 避免重复设置 - self.uploadBannerYesButton.selected = NO; - self.uploadBannerNoButton.selected = YES; - } - } - [self checkCreateEventButtonState]; -} - - -- (void)checkWalletToUploadBanner { - if (self.walletInfoModel.diamonds.integerValue >= self.configModel.goldNum) { - self.uploadBannerYesButton.selected = YES; - self.uploadBannerNoButton.selected = NO; - } else { - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"UserDetail_CP_Toast_0"); - config.message = YMLocalizedString(@"XPNobleCenterViewController3"); - config.actionStyle = TTAlertActionBothStyle; - @kWeakify(self); - [TTPopup alertWithConfig:config showBorder:NO confirmHandler:^{ - @kStrongify(self); - XPIAPRechargeViewController * webVC =[[XPIAPRechargeViewController alloc] init]; - webVC.type = @"4"; - [self.navigationController pushViewController:webVC animated:YES]; - } cancelHandler:^{ }]; - } -} - -#pragma mark - UIImagePickerControllerDelegate (Legacy) - -- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { - UIImage *selectedImage = info[UIImagePickerControllerOriginalImage]; - if (selectedImage) { - // 对于iOS 14以下版本，选择图片后手动裁剪 - CGFloat aspectRatio = 690.0 / 236.0; // 约为2.92:1 - CGFloat viewWidth = self.view.frame.size.width - (kHorizontalPadding * 2 - 2); - CGFloat viewHeight = viewWidth / aspectRatio; - CGSize cropSize = CGSizeMake(viewWidth, viewHeight); - - UIImage *croppedImage = [selectedImage cutImage:cropSize]; - self.selectedImage = croppedImage; - self.eventBannerImageView.image = croppedImage; - self.eventBannerCamearImageView.hidden = NO; - } - [picker dismissViewControllerAnimated:YES completion:nil]; - [self checkCreateEventButtonState]; -} - -- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker { - [picker dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - PHPickerViewControllerDelegate (iOS 14+) - -- (void)picker:(PHPickerViewController *)picker didFinishPicking:(NSArray *)results API_AVAILABLE(ios(14)) { - [picker dismissViewControllerAnimated:YES completion:nil]; - // 我们使用TZImagePickerController代替了PHPickerViewController，这个方法不再需要 - [self checkCreateEventButtonState]; -} - -#pragma mark - Event Title Section -- (void)setupEventTitleSection { - self.eventTitleLabel = [self createLabelWithText:YMLocalizedString(@"20.20.59_text_9")]; - [self.contentView addSubview:self.eventTitleLabel]; - self.eventTitleTextField = [self createTextFieldWithPlaceholder:@""]; - self.eventTitleTextField.delegate = self; - [self.contentView addSubview:self.eventTitleTextField]; - self.eventTitleCharCountLabel = [self createCharCountLabel]; - [self.contentView addSubview:self.eventTitleCharCountLabel]; - - [self.eventTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.contentView.mas_top).offset(kSectionSpacing); - make.leading.equalTo(self.contentView).offset(kHorizontalPadding); - }]; - - [self.eventTitleTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.eventTitleLabel.mas_bottom).offset(kVerticalPadding); - make.leading.trailing.equalTo(self.contentView).inset(kHorizontalPadding); - make.height.mas_equalTo(40); - }]; - - [self.eventTitleCharCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY - .equalTo(self.eventTitleLabel); - make.trailing.equalTo(self.eventTitleTextField); - }]; -} - -#pragma mark - Event Banner Section -- (void)setupEventBannerSection { - self.eventBannerLabel = [self createLabelWithText:YMLocalizedString(@"20.20.59_text_10")]; - [self.contentView addSubview:self.eventBannerLabel]; - - self.eventBannerImageView = [[UIImageView alloc] initWithImage:kImage(@"event_take_photo")]; - self.eventBannerImageView.contentMode = UIViewContentModeScaleAspectFill; - self.eventBannerImageView.clipsToBounds = YES; - self.eventBannerImageView.layer.cornerRadius = 8; - self.eventBannerImageView.userInteractionEnabled = YES; - UITapGestureRecognizer *bannerTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(eventBannerTapped)]; - [self.eventBannerImageView addGestureRecognizer:bannerTap]; - [self.contentView addSubview:self.eventBannerImageView]; - - self.eventBannerCamearImageView = [[UIImageView alloc] initWithImage:kImage(@"event_camear")]; - self.eventBannerCamearImageView.hidden = YES; - [self.eventBannerImageView addSubview:self.eventBannerCamearImageView]; - - [self.eventBannerLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.eventTitleTextField.mas_bottom).offset(kSectionSpacing); - make.leading.equalTo(self.contentView).offset(kHorizontalPadding); - }]; - - [self.eventBannerImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.eventBannerLabel.mas_bottom).offset(kVerticalPadding); - make.leading.trailing.equalTo(self.contentView).inset(kHorizontalPadding-1); - - // 设置高度为宽度除以690:236的比例 - make.height.equalTo(self.eventBannerImageView.mas_width).multipliedBy(236.0/690.0); - }]; - [self.eventBannerCamearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.trailing.equalTo(self.eventBannerImageView); - make.width.height.mas_equalTo(32); - }]; -} - -#pragma mark - Upload Banner Section -- (void)setupUploadBannerSection { - self.uploadBannerLabel = [self createLabelWithText:YMLocalizedString(@"20.20.59_text_11")]; - - [self.contentView addSubview:self.uploadBannerLabel]; - self.uploadBannerYesButton = [self createUploadBannerButtonWithTitle:YMLocalizedString(@"20.20.59_text_12") imageName:@"event_non_select" selectedImageName:@"event_selected" tag:0]; - self.uploadBannerYesButton.selected = NO; - [self.uploadBannerYesButton addTarget:self action:@selector(uploadBannerButtonTapped:) forControlEvents:UIControlEventTouchUpInside]; - [self.contentView addSubview:self.uploadBannerYesButton]; - - self.uploadBannerNoButton = [self createUploadBannerButtonWithTitle:YMLocalizedString(@"20.20.59_text_13") imageName:@"event_non_select" selectedImageName:@"event_selected" tag:1]; - self.uploadBannerNoButton.selected = YES; - [self.uploadBannerNoButton addTarget:self action:@selector(uploadBannerButtonTapped:) forControlEvents:UIControlEventTouchUpInside]; - [self.contentView addSubview:self.uploadBannerNoButton]; - - [self.uploadBannerLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.eventBannerImageView.mas_bottom).offset(kSectionSpacing); - make.leading.equalTo(self.contentView).offset(kHorizontalPadding); - }]; - [self.uploadBannerYesButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.uploadBannerLabel.mas_bottom).offset(kVerticalPadding); - make.leading.equalTo(self.contentView).offset(kHorizontalPadding); - make.height.mas_equalTo(20); - make.width.mas_greaterThanOrEqualTo(80); - }]; - [self.uploadBannerNoButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.uploadBannerLabel.mas_bottom).offset(kVerticalPadding); - make.leading.equalTo(self.uploadBannerYesButton.mas_trailing).offset(70); - make.height.equalTo(self.uploadBannerYesButton); - make.width.mas_greaterThanOrEqualTo(80); - }]; -} - -#pragma mark - Select Room Section -- (void)setupSelectRoomSection { - self.selectRoomLabel = [self createLabelWithText:YMLocalizedString(@"20.20.59_text_14")]; - [self.contentView addSubview:self.selectRoomLabel]; - self.selectRoomView = [self createSelectionViewWithPlaceholder:YMLocalizedString(@"XPAnchorPKTableViewCell2") target:self action:@selector(selectRoomTapped)]; - [self.contentView addSubview:self.selectRoomView]; - [self.selectRoomLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.uploadBannerYesButton.mas_bottom).offset(kSectionSpacing); - make.leading.equalTo(self.contentView).offset(kHorizontalPadding); - }]; - [self.selectRoomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.selectRoomLabel.mas_bottom).offset(kVerticalPadding); - make.leading.trailing.equalTo(self.contentView).inset(kHorizontalPadding); - make.height.mas_equalTo(44); - }]; -} - -#pragma mark - Start Time Section -- (void)setupStartTimeSection { - self.startTimeLabel = [self createLabelWithText:YMLocalizedString(@"20.20.59_text_15")]; - [self.contentView addSubview:self.startTimeLabel]; - self.startTimeView = [self createSelectionViewWithPlaceholder:YMLocalizedString(@"XPAnchorPKTableViewCell2") - target:self - action:@selector(selectStartTimeTapped)]; - [self.contentView addSubview:self.startTimeView]; - [self.startTimeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.selectRoomView.mas_bottom).offset(kSectionSpacing); - make.leading.equalTo(self.contentView).offset(kHorizontalPadding); - }]; - [self.startTimeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.startTimeLabel.mas_bottom).offset(kVerticalPadding); - make.leading.trailing.equalTo(self.contentView).inset(kHorizontalPadding); - make.height.mas_equalTo(40); - }]; -} - -#pragma mark - Duration Section -- (void)setupDurationSection { - self.durationLabel = [self createLabelWithText:YMLocalizedString(@"20.20.59_text_16")]; - [self.contentView addSubview:self.durationLabel]; - self.durationView = [self createSelectionViewWithPlaceholder:YMLocalizedString(@"XPAnchorPKTableViewCell2") target:self action:@selector(selectDurationTapped)]; - [self.contentView addSubview:self.durationView]; - [self.durationLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.startTimeView.mas_bottom).offset(kSectionSpacing); - make.leading.equalTo(self.contentView).offset(kHorizontalPadding); - }]; - [self.durationView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.durationLabel.mas_bottom).offset(kVerticalPadding); - make.leading.trailing.equalTo(self.contentView).inset(kHorizontalPadding); - make.height.mas_equalTo(40); - }]; -} - -#pragma mark - Event Content Section -- (void)setupEventContentSection { - self.eventContentLabel = [self createLabelWithText:YMLocalizedString(@"20.20.59_text_17")]; - [self.contentView addSubview:self.eventContentLabel]; - - self.eventContentTextView = [[UITextView alloc] init]; - self.eventContentTextView.backgroundColor = UIColorFromRGB(0xf2f3f7); - self.eventContentTextView.font = kFontRegular(14); - self.eventContentTextView.textColor = UIColorFromRGB(0x313131); - self.eventContentTextView.layer.cornerRadius = 8; - self.eventContentTextView.delegate = self; - [self.contentView addSubview:self.eventContentTextView]; - - self.eventContentCharCountLabel = [self createCharCountLabel]; - [self.contentView addSubview:self.eventContentCharCountLabel]; - - [self.eventContentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.durationView.mas_bottom).offset(kSectionSpacing); - make.leading.equalTo(self.contentView).offset(kHorizontalPadding); - }]; - [self.eventContentTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.eventContentLabel.mas_bottom).offset(kVerticalPadding); - make.leading.trailing.equalTo(self.contentView).inset(kHorizontalPadding); - make.height.mas_equalTo(152); - }]; - [self.eventContentCharCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.eventContentLabel); - make.trailing.equalTo(self.eventContentTextView.mas_trailing); - }]; -} - -#pragma mark - Notify My Fans Section -- (void)setupNotifyMyFansSection { - self.notifyFansLabel = [self createLabelWithText:YMLocalizedString(@"20.20.59_text_18")]; - [self.contentView addSubview:self.notifyFansLabel]; - self.notifyFansSwitch = [[UISwitch alloc] init]; - self.notifyFansSwitch.tintColor = UIColorRGBAlpha(0xFFE3AF, 0.4); - self.notifyFansSwitch.onTintColor = UIColorFromRGB(0xff8c03); - self.notifyFansSwitch.transform = CGAffineTransformMakeScale(0.8, 0.8); - [self.contentView addSubview:self.notifyFansSwitch]; - [self.notifyFansLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.eventContentTextView.mas_bottom).offset(kSectionSpacing); - make.leading.equalTo(self.contentView).offset(kHorizontalPadding); - }]; - [self.notifyFansSwitch mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.notifyFansLabel); - make.trailing.equalTo(self.contentView).offset(-kHorizontalPadding); - make.bottom.equalTo(self.contentView).offset(-kSectionSpacing*5); - }]; - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.greaterThanOrEqualTo(self.notifyFansSwitch.mas_bottom).offset(kSectionSpacing*5); - }]; -} - -#pragma mark - UIScrollViewDelegate -- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView { - [self dismissKeyboard]; -} - -- (void)checkCreateEventButtonState { - - NSString *placeholder = YMLocalizedString(@"XPAnchorPKTableViewCell2"); - BOOL hasTitle = self.eventTitleTextField.text.length > 0; - BOOL hasBanner = self.selectedImage != nil; - BOOL hasRoom = self.selectRoomPlaceholderLabel.text.length > 0 && ![self.selectRoomPlaceholderLabel.text isEqualToString:placeholder]; - BOOL hasStartTime = self.startTimePlaceholderLabel.text.length > 0 && ![self.startTimePlaceholderLabel.text isEqualToString:placeholder]; - BOOL hasDuration = self.durationPlaceholderLabel.text.length > 0 && ![self.durationPlaceholderLabel.text isEqualToString:placeholder]; - BOOL hasContent = self.eventContentTextView.text.length > 0; - if (hasTitle && hasBanner && hasRoom && hasStartTime && hasDuration && hasContent) { - self.createEventButton.alpha = 1.0; - self.createEventButton.userInteractionEnabled = YES; - } else { - self.createEventButton.alpha = 0.3; - self.createEventButton.userInteractionEnabled = NO; - } -} - - -#pragma mark - TZImagePickerControllerDelegate -- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray *)infos { - if (photos.count > 0) { - UIImage *croppedImage = photos.firstObject; - self.selectedImage = croppedImage; - self.eventBannerImageView.image = croppedImage; - self.eventBannerCamearImageView.hidden = NO; - [self checkCreateEventButtonState]; - } -} - -// 添加拍照结果的处理方法 -- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingVideo:(UIImage *)coverImage sourceAssets:(PHAsset *)asset { - // 不处理视频 -} - -// 处理用户拍照的情况 -- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingImage:(UIImage *)image { - // 直接使用拍照的图片 - self.selectedImage = image; - self.eventBannerImageView.image = image; - self.eventBannerCamearImageView.hidden = NO; - [self checkCreateEventButtonState]; -} - -// 处理拍照或摄像完成的回调 -- (void)imagePickerController:(TZImagePickerController *)picker didFinishTakePhoto:(UIImage *)image sourceType:(TZAssetModelMediaType)sourceType cutImage:(UIImage *)cutImage isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto { - // 优先使用裁剪后的图片，如果有的话 - UIImage *finalImage = cutImage ? cutImage : image; - self.selectedImage = finalImage; - self.eventBannerImageView.image = finalImage; - self.eventBannerCamearImageView.hidden = NO; - [self checkCreateEventButtonState]; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.h b/YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.h deleted file mode 100644 index c7ff505..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// PIPageControl.h -// YuMi -// -// Created by duoban on 2023/10/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIPageControl : UIView -@property(nonatomic,assign) NSInteger numberOfPages; -@property(nonatomic,assign) NSInteger currentPage; -@property(nonatomic,strong) UIColor *currentPageIndicatorTintColor; -@property(nonatomic,strong) UIColor *pageIndicatorTintColor; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.m b/YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.m deleted file mode 100644 index 3242307..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.m +++ /dev/null @@ -1,35 +0,0 @@ -// -// PIPageControl.m -// YuMi -// -// Created by duoban on 2023/10/8. -// - -#import "PIPageControl.h" - -@implementation PIPageControl --(void)setNumberOfPages:(NSInteger)numberOfPages{ - _numberOfPages = numberOfPages; - for (int i = 0; i < _numberOfPages; i++) { - UIView *dosView = [[UIView alloc]init]; - dosView.tag = 100 + i; - [self addSubview:dosView]; - CGFloat left = i * kGetScaleWidth(7); - [dosView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(4)); - make.top.equalTo(self); - make.leading.mas_equalTo(left); - }]; - dosView.layer.cornerRadius = kGetScaleWidth(4)/2; - dosView.layer.masksToBounds = YES; - } -} -- (void)setCurrentPage:(NSInteger)currentPage{ - _currentPage = currentPage; - for (int i = 0; i < _numberOfPages; i++) { - UIView *dosView = [self viewWithTag:100 + i]; - dosView.backgroundColor = _currentPage == i ? _currentPageIndicatorTintColor : _pageIndicatorTintColor; - } -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeGameView.h b/YuMi/Modules/YMNewHome/View/CustomView/XPHomeGameView.h deleted file mode 100644 index b915fdd..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeGameView.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// XPHomeGameView.h -// xplan-ios -// -// Created by duoban on 2022/11/21. -// -#import "LittleGameInfoModel.h" -#import - -@protocol XPHomeGameViewDelegate - --(void)xpHomeGameViewChooseGameWithGameModel:(LittleGameInfoModel *_Nullable)gameModel; - -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface XPHomeGameView : UIView -@property (nonatomic,strong) NSArray *playGameList; -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeGameView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPHomeGameView.m deleted file mode 100644 index a63b86a..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeGameView.m +++ /dev/null @@ -1,158 +0,0 @@ -// -// XPHomeGameView.m -// xplan-ios -// -// Created by duoban on 2022/11/21. -// - -#import "XPHomeGameView.h" -#import "XPHomeGameCell.h" - -@interface XPHomeGameView() -@property (nonatomic,strong) UILabel *titleView; -@property (nonatomic,strong) UIButton *backView; -@property (nonatomic,strong) UIButton *confirmBtn; -@property (nonatomic,strong) UICollectionView *collectionView; -@property (nonatomic,strong) NSIndexPath *path; - -@property (nonatomic,strong) UIView *bgView; -@end - -@implementation XPHomeGameView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.backView]; - [self.bgView addSubview:self.collectionView]; - [self.bgView addSubview:self.confirmBtn]; -} -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.trailing.leading.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(362)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(14)); - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(22)); - }]; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(26)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.centerY.equalTo(self.titleView); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.leading.mas_equalTo(self.bgView); - make.height.mas_equalTo(kGetScaleWidth(118)); - make.top.mas_equalTo(kGetScaleWidth(74)); - }]; - [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(46)); - make.top.equalTo(self.collectionView.mas_bottom).mas_offset(kGetScaleWidth(70)); - }]; -} -- (void)setPlayGameList:(NSArray *)playGameList{ - _playGameList = playGameList; - [_collectionView reloadData]; -} -#pragma mark - UICollectionViewDelegate, UICollectionViewDataSource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - - return self.playGameList.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPHomeGameCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPHomeGameCell class]) forIndexPath:indexPath]; - LittleGameInfoModel *model = self.playGameList[indexPath.row]; - cell.imageUrl = model.pic; - if(self.path != nil){ - cell.isChoose = self.path.row == indexPath.row; - } - - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - self.confirmBtn.enabled = YES; - self.path = indexPath; - [self.collectionView reloadData]; - -} --(void)confirmAction{ - [self removeFromSuperview]; - LittleGameInfoModel *model = self.playGameList[self.path.row]; - if(self.delegate && [self.delegate respondsToSelector:@selector(xpHomeGameViewChooseGameWithGameModel:)]){ - [self.delegate xpHomeGameViewChooseGameWithGameModel:model]; - } -} --(void)backAction{ - [self removeFromSuperview]; -} -#pragma mark -懒加载 -- (UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(25) rightTopCorner:kGetScaleWidth(25) bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth, kGetScaleWidth(362))]; - } - return _bgView; -} -- (UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"XPHomeGameView0") font:kFontMedium(kGetScaleWidth(16)) textColor:[DJDKMIMOMColor inputTextColor]]; - } - return _titleView; -} - --(UIButton *)backView{ - if (!_backView){ - _backView = [UIButton buttonInitWithText:nil font:nil textColor:nil image:kImage(@"home_game_back") bgImage:nil]; - [_backView addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backView; -} - - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(kGetScaleWidth(98), kGetScaleWidth(118)); - layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(15), 0, kGetScaleWidth(15)); - layout.minimumLineSpacing = kGetScaleWidth(15); - - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPHomeGameCell class] forCellWithReuseIdentifier:NSStringFromClass([XPHomeGameCell class])]; - } - return _collectionView; -} -- (UIButton *)confirmBtn{ - if (!_confirmBtn){ - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - kGetScaleWidth(30), kGetScaleWidth(46))]; - _confirmBtn = [UIButton buttonInitWithText:YMLocalizedString(@"XPHomeGameView1") font:kFontRegular(16) textColor:[UIColor whiteColor] image:nil bgImage:image]; - _confirmBtn.layer.cornerRadius = kGetScaleWidth(23); - _confirmBtn.layer.masksToBounds = YES; - [_confirmBtn addTarget:self action:@selector(confirmAction) forControlEvents:UIControlEventTouchUpInside]; - _confirmBtn.enabled = NO; - } - return _confirmBtn; -} -@end diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeRecommendOtherRoomView.h b/YuMi/Modules/YMNewHome/View/CustomView/XPHomeRecommendOtherRoomView.h deleted file mode 100644 index c3b4bd2..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeRecommendOtherRoomView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPHomeRecommendOtherRoomView.h -// xplan-ios -// -// Created by 冯硕 on 2022/3/3. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPHomeRecommendOtherRoomView, HomeMenuSourceModel; -@protocol XPHomeRecommendOtherRoomViewDelegate -///点击了进入房间 -- (void)xPHomeRecommendOtherRoomView:(XPHomeRecommendOtherRoomView *)view didClickEnterRoom:(HomeMenuSourceModel *)model; -@end - -@interface XPHomeRecommendOtherRoomView : UIView -///房间信息 -@property (nonatomic,strong) HomeMenuSourceModel *roomInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeRecommendOtherRoomView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPHomeRecommendOtherRoomView.m deleted file mode 100644 index 80f773b..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeRecommendOtherRoomView.m +++ /dev/null @@ -1,185 +0,0 @@ -// -// XPHomeRecommendOtherRoomView.m -// xplan-ios -// -// Created by 冯硕 on 2022/3/3. -// - -#import "XPHomeRecommendOtherRoomView.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "TTPopup.h" -#import "UIImage+Utils.h" -///Model -#import "HomeMenuSourceModel.h" - -@interface XPHomeRecommendOtherRoomView () -///背景 -@property (nonatomic,strong) UIView * contentView; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///房间标题 -@property (nonatomic,strong) UILabel *roomTitleLabel; -///加入房间 -@property (nonatomic,strong) UIButton *enterRoomButton; -///关闭 -@property (nonatomic,strong) UIButton *closeButton; - -@end - -@implementation XPHomeRecommendOtherRoomView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.contentView]; - [self addSubview:self.closeButton]; - - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.roomTitleLabel]; - [self.contentView addSubview:self.enterRoomButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(300); - make.bottom.mas_equalTo(self.closeButton.mas_bottom); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self); - make.height.mas_equalTo(299); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(30, 30)); - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.contentView.mas_bottom).offset(32); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(19); - make.top.mas_equalTo(self).offset(12); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(16); - make.size.mas_equalTo(CGSizeMake(108, 108)); - make.centerX.mas_equalTo(self.contentView); - }]; - - [self.roomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(73); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(24); - }]; - - [self.enterRoomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(60); - make.bottom.mas_equalTo(self.contentView).offset(-24); - make.height.mas_equalTo(40); - }]; -} - -#pragma mark - Event Response -- (void)enterRoomButtonAction:(UIButton *)sender { - [TTPopup dismiss]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPHomeRecommendOtherRoomView:didClickEnterRoom:)]) { - [self.delegate xPHomeRecommendOtherRoomView:self didClickEnterRoom:self.roomInfo]; - } -} - -- (void)closeButtonAction:(UIButton *)sender { - [TTPopup dismiss]; -} - -#pragma mark - Getters And Setters -- (void)setRoomInfo:(HomeMenuSourceModel *)roomInfo { - _roomInfo = roomInfo; - if (_roomInfo) { - self.roomTitleLabel.text = _roomInfo.title; - self.avatarImageView.imageUrl = _roomInfo.avatar; - } -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = [UIColor whiteColor]; - _contentView.layer.masksToBounds = YES; - _contentView.layer.cornerRadius = 12; - _contentView.layer.shadowOffset = CGSizeMake(4, 4); - _contentView.layer.shadowColor = UIColorRGBAlpha(0xEBEEF3, 0.7).CGColor; - } - return _contentView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPHomeRecommendOtherRoomView0"); - _titleLabel.font = [UIFont boldSystemFontOfSize:16]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 8; - } - return _avatarImageView; -} -- (UILabel *)roomTitleLabel { - if (!_roomTitleLabel) { - _roomTitleLabel = [[UILabel alloc] init]; - _roomTitleLabel.font = [UIFont systemFontOfSize:14]; - _roomTitleLabel.numberOfLines = 2; - _roomTitleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _roomTitleLabel.textAlignment = NSTextAlignmentCenter; - } - return _roomTitleLabel; -} - -- (UIButton *)enterRoomButton { - if (!_enterRoomButton) { - _enterRoomButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_enterRoomButton setTitle:YMLocalizedString(@"XPHomeRecommendOtherRoomView1") forState:UIControlStateNormal]; - [_enterRoomButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - _enterRoomButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_enterRoomButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _enterRoomButton.layer.masksToBounds = YES; - _enterRoomButton.layer.cornerRadius = 20; - [_enterRoomButton addTarget:self action:@selector(enterRoomButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _enterRoomButton; -} -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeButton setImage:[UIImage imageNamed:@"common_close_white"] forState:UIControlStateNormal]; - [_closeButton setImage:[UIImage imageNamed:@"common_close_white"] forState:UIControlStateSelected]; - [_closeButton addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeUserView.h b/YuMi/Modules/YMNewHome/View/CustomView/XPHomeUserView.h deleted file mode 100644 index f4947d3..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeUserView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMHomeUserView.h -// YUMI -// -// Created by XY on 2023/2/17. -// - -#import - -@class HomeRecommendRoomModel; - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPHomeUserViewDelegate -/// 点击事件 -- (void)userViewClickAction:(HomeRecommendRoomModel *)model; - -@end - -@interface XPHomeUserView : UIControl - -@property (nonatomic, weak) id delegate; -/// 房间模型 -@property (nonatomic, strong) HomeRecommendRoomModel *roomModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeUserView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPHomeUserView.m deleted file mode 100644 index 1adc187..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeUserView.m +++ /dev/null @@ -1,123 +0,0 @@ -// -// YMHomeUserView.m -// YUMI -// -// Created by XY on 2023/2/17. -// - -#import "XPHomeUserView.h" -#import -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -/// M -#import "HomeRecommendRoomModel.h" - -@interface XPHomeUserView() - -/// 头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -/// 昵称 -@property (nonatomic, strong) UILabel *nicknameLabel; -/// 简介 -@property (nonatomic, strong) UILabel *introduceLabel; -/// 环形遮罩 -@property (nonatomic, strong) UIImageView *circleView; - -@end - -@implementation XPHomeUserView - -- (void)setRoomModel:(HomeRecommendRoomModel *)roomModel { - _roomModel = roomModel; - - self.nicknameLabel.text = roomModel.nick; - self.introduceLabel.text = roomModel.roomDesc; - self.avatarImageView.imageUrl = roomModel.avatar; -} - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self createUI]; - [self addTarget:self action:@selector(userViewClicked) forControlEvents:UIControlEventTouchUpInside]; - } - return self; -} - -- (void)createUI { - [self addSubview:self.avatarImageView]; - [self addSubview:self.nicknameLabel]; - [self addSubview:self.introduceLabel]; - [self addSubview:self.circleView]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(0); - make.centerX.mas_equalTo(self); - make.width.height.mas_equalTo(70); - }]; - [self.nicknameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(15); - make.centerX.mas_equalTo(self); - make.leading.mas_greaterThanOrEqualTo(2); - make.trailing.mas_lessThanOrEqualTo(-2); - }]; - [self.introduceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nicknameLabel.mas_bottom).offset(2); - make.centerX.mas_equalTo(self); - make.leading.mas_greaterThanOrEqualTo(2); - make.trailing.mas_lessThanOrEqualTo(-2); - }]; - [self.circleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(0); - make.top.mas_equalTo(self.avatarImageView); - make.bottom.mas_equalTo(self.avatarImageView); - }]; -} - -/// 点击事件 -- (void)userViewClicked { - if (self.delegate && [self.delegate respondsToSelector:@selector(userViewClickAction:)]) { - [self.delegate userViewClickAction:self.roomModel]; - } -} - -#pragma mark - 懒加载 - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - _avatarImageView = [[NetImageView alloc] init]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - _avatarImageView.layer.cornerRadius = 35; - _avatarImageView.clipsToBounds = YES; - } - return _avatarImageView; -} - -- (UILabel *)nicknameLabel { - if (!_nicknameLabel) { - _nicknameLabel = [[UILabel alloc] init]; - _nicknameLabel.textColor = [DJDKMIMOMColor appMainColor]; - _nicknameLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - } - return _nicknameLabel; -} - -- (UILabel *)introduceLabel { - if (!_introduceLabel) { - _introduceLabel = [[UILabel alloc] init]; - _introduceLabel.textColor = [DJDKMIMOMColor appMainColor]; - _introduceLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - } - return _introduceLabel; -} - -- (UIImageView *)circleView { - if (!_circleView) { - _circleView = [[UIImageView alloc] init]; - _circleView.contentMode = UIViewContentModeScaleAspectFit; - _circleView.image = [UIImage imageNamed:@"home_user_circle"]; - } - return _circleView; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.h b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.h deleted file mode 100644 index f7cd58b..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// XPNewHomeHeadView.h -// YuMi -// -// Created by duoban on 2023/9/1. -// - -#import -#import "HomeBannerInfoModel.h" -NS_ASSUME_NONNULL_BEGIN -@class PIHomeItemModel; -@protocol XPNewHomeHeadViewDelegate -///选择 --(void)selectItemAtIndexPath:(NSIndexPath *)indexPath; --(void)selectBannerListWithModel:(HomeBannerInfoModel *)model; -@end - - -@interface XPNewHomeHeadView : UIView -@property (nonatomic,copy) NSArray *bannerList; - -@property (nonatomic,copy) NSArray *rankAvatars; -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m deleted file mode 100644 index d93c3ef..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m +++ /dev/null @@ -1,294 +0,0 @@ -// -// XPNewHomeHeadView.m -// YuMi -// -// Created by duoban on 2023/9/1. -// - -#import "XPNewHomeHeadView.h" -#import -#import -#import "XPNewHomeItemCell.h" -#import "PIPageControl.h" -#import - -@interface HomeBannerCell : SDCollectionViewCell - -@property(nonatomic, assign) HomeBannerInfoSkipType type; -@property(nonatomic, strong) HomeBannerFillVoInfoModel *cellFillVoMode; -@property(nonatomic, strong) NSString *imageURLString; -@property(nonatomic, strong) NetImageView *netImageView; -@property(nonatomic, strong) SVGAImageView *svgaImageView; -//@property(nonatomic, strong) SVGAVideoEntity *videoItem; - -@end - -@implementation HomeBannerCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - _netImageView = [[NetImageView alloc] init]; - [self.contentView addSubview:self.netImageView]; - [self.netImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - _svgaImageView = [[SVGAImageView alloc] init]; - self.svgaImageView.loops = -1; - self.svgaImageView.autoPlay = YES; - self.svgaImageView.clearsAfterStop = NO; - [self.contentView addSubview:self.svgaImageView]; - [self.svgaImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - } - return self; -} - -- (void)prepareForReuse { - [super prepareForReuse]; -} - -- (void)setImageURLString:(NSString *)imageURLString { - - if (self.type == HomeBannerInfoSkipType_Web_CP || - self.type == HomeBannerInfoSkipType_Web_Custom || - self.type == HomeBannerInfoSkipType_Web_WeekStar) { - self.netImageView.hidden = YES; - self.svgaImageView.hidden = NO; - SVGAParser *p = [[SVGAParser alloc] init]; - @kWeakify(self); - [p parseWithURL:[NSURL URLWithString:imageURLString] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - if (videoItem) { - [self playSVGAWith:videoItem]; - } else { - self.svgaImageView.hidden = YES; - self.netImageView.hidden = NO; - self.netImageView.imageUrl = imageURLString; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - self.svgaImageView.hidden = YES; - self.netImageView.hidden = NO; - self.netImageView.imageUrl = imageURLString; - }]; - } else { - self.svgaImageView.hidden = YES; - self.netImageView.hidden = NO; - self.netImageView.imageUrl = imageURLString; - } -} - -- (void)playSVGAWith:(SVGAVideoEntity *)videoItem { - self.svgaImageView.videoItem = videoItem; - if (self.cellFillVoMode) { - [self updateSvgaImage:self.cellFillVoMode.avatar key:@"avatar"]; - [self updateSvgaImage:self.cellFillVoMode.picUrl key:@"gift"]; - [self updateSvgaImage:self.cellFillVoMode.avatar key:@"avatar_1"]; - [self updateSvgaImage:self.cellFillVoMode.loverAvatar key:@"avatar_2"]; - - [self updateSvgaText:[NSString stringWithFormat:@"ID: %@", self.cellFillVoMode.erbanNo] key:@"id"]; - [self updateSvgaText:self.cellFillVoMode.giftName key:@"name"]; - [self updateSvgaText:[NSString stringWithFormat:@"ID: %@", self.cellFillVoMode.erbanNo] key:@"id_1"]; - [self updateSvgaText:[NSString stringWithFormat:@"ID: %@", self.cellFillVoMode.loverErbanNo] key:@"id_2"]; - } - - [self.svgaImageView startAnimation]; -} - -- (void)updateSvgaImage:(NSString *)imagePath key:(NSString *)key { - if (self.svgaImageView && ![NSString isEmpty:imagePath] && ![NSString isEmpty:key]) { - [self.svgaImageView setImageWithURL:[NSURL URLWithString:imagePath] forKey:key]; - } -} - -- (void)updateSvgaText:(NSString *)content key:(NSString *)key { - if (self.svgaImageView && ![NSString isEmpty:content] && ![NSString isEmpty:key]) { - NSAttributedString *string = [[NSAttributedString alloc] initWithString:content - attributes:@{ - NSFontAttributeName: kFontMedium(16), - NSForegroundColorAttributeName: UIColorFromRGB(0xF9F8CF) - }]; - [self.svgaImageView setAttributedText:string - forKey:key]; - } -} - -@end - - -@interface XPNewHomeHeadView () -@property(nonatomic,strong) UICollectionView *collectionView; -///轮播图 -@property (nonatomic, strong) SDCycleScrollView *pi_BannerView; -@property(nonatomic,strong) PIPageControl *pageControl; -@end -@implementation XPNewHomeHeadView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.collectionView]; - [self addSubview:self.pi_BannerView]; - [self addSubview:self.pageControl]; -} --(void)installConstraints{ - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.trailing.mas_equalTo(0); - make.top.mas_equalTo(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(80)); - }]; - [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.collectionView.mas_bottom).mas_offset(kGetScaleWidth(10)); - make.leading.trailing.equalTo(self).inset(kGetScaleWidth(14)); - make.height.mas_equalTo(kGetScaleWidth(80)); - }]; -} -#pragma mark - SDCycleScrollViewDelegate - -- (Class)customCollectionViewCellClassForCycleScrollView:(SDCycleScrollView *)view { - return [HomeBannerCell class]; -} - -- (void)setupCustomCell:(UICollectionViewCell *)cell forIndex:(NSInteger)index cycleScrollView:(SDCycleScrollView *)view { - HomeBannerCell *bannerCell = (HomeBannerCell *)cell; - HomeBannerInfoModel * bannerInfo = [self.bannerList xpSafeObjectAtIndex:index]; - bannerCell.type = bannerInfo.skipType; - bannerCell.cellFillVoMode = bannerInfo.fillVo; - bannerCell.imageURLString = bannerInfo.bannerPic; -} - -- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index { - HomeBannerInfoModel *bannerInfo = [self.bannerList xpSafeObjectAtIndex:index]; - if(bannerInfo != nil && self.delegate && [self.delegate respondsToSelector:@selector(selectBannerListWithModel:)]){ - [self.delegate selectBannerListWithModel:bannerInfo]; - } -} -- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didScrollToIndex:(NSInteger)index{ - self.pageControl.currentPage = index; -} -#pragma mark - Getters And Setters -- (void)setBannerList:(NSArray *)bannerList { - _bannerList = bannerList; - if (_bannerList.count > 0) { - NSMutableArray * array = [NSMutableArray array]; - [_bannerList enumerateObjectsUsingBlock:^(HomeBannerInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.bannerPic.length > 0) { - NSCharacterSet *allowedCharacters = [NSCharacterSet URLFragmentAllowedCharacterSet]; - NSString *encodedURLString = [obj.bannerPic stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacters]; - [array addObject:encodedURLString]; - } else { - [array addObject:@""]; - } - }]; - if (array.count > 0) { - self.pi_BannerView.imageURLStringsGroup = array; - CGFloat width = array.count * kGetScaleWidth(7) - kGetScaleWidth(3); - [self.pageControl mas_remakeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-kGetScaleWidth(4)); - make.height.mas_equalTo(kGetScaleWidth(4)); - make.centerX.equalTo(self); - make.width.mas_equalTo(width); - }]; - self.pageControl.numberOfPages = array.count; - self.pageControl.currentPage = 0; - - [self.pi_BannerView autoScroll]; - } - _pi_BannerView.hidden = NO; - }else{ - _pi_BannerView.hidden = YES; - } -} - -- (void)setRankAvatars:(NSArray *)rankAvatars { - _rankAvatars = rankAvatars; - [self.collectionView reloadData]; -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return 2; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPNewHomeItemCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPNewHomeItemCell class]) forIndexPath:indexPath]; - if (indexPath.row == 0) { - cell.rankAvatarsModelArray = self.rankAvatars; - } - [cell setCellWith:indexPath]; - - @kWeakify(self); - cell.didTapRankArea = ^{ - @kStrongify(self); - if(self.delegate && [self.delegate respondsToSelector:@selector(selectItemAtIndexPath:)]){ - [self.delegate selectItemAtIndexPath:indexPath]; - } - }; - - return cell; -} -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - if(self.delegate && [self.delegate respondsToSelector:@selector(selectItemAtIndexPath:)]){ - [self.delegate selectItemAtIndexPath:indexPath]; - } -} - -#pragma mark - 懒加载 -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(15), 0, kGetScaleWidth(15)); - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = kGetScaleWidth(8); - layout.itemSize = CGSizeMake(kGetScaleWidth(168), kGetScaleWidth(80)); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.pagingEnabled = NO; - _collectionView.scrollEnabled = NO; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPNewHomeItemCell class] forCellWithReuseIdentifier:NSStringFromClass([XPNewHomeItemCell class])]; - _collectionView.showsVerticalScrollIndicator = NO; - } - return _collectionView; -} -#pragma mark - 懒加载 -- (SDCycleScrollView *)pi_BannerView { - if (!_pi_BannerView) { - _pi_BannerView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:[UIImageConstant defaultBannerPlaceholder]]; - _pi_BannerView.backgroundColor = [UIColor clearColor]; - _pi_BannerView.layer.cornerRadius = 10; - _pi_BannerView.layer.masksToBounds = YES; - _pi_BannerView.showPageControl = NO; - _pi_BannerView.autoScrollTimeInterval = 5.0; - _pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; - _pi_BannerView.tag = 9000001; - _pi_BannerView.hidden = YES; - // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 - _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - for (UIView *subView in _pi_BannerView.subviews) { - subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - } - return _pi_BannerView; -} -- (PIPageControl *)pageControl{ - if(!_pageControl){ - _pageControl = [[PIPageControl alloc]init]; - _pageControl.currentPageIndicatorTintColor = UIColorFromRGB(0x9168FA); - _pageControl.pageIndicatorTintColor = UIColorRGBAlpha(0xB3B3C3, 0.4); - } - return _pageControl; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.h b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.h deleted file mode 100644 index 09c4a03..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPNewHomeItemCell.h -// YuMi -// -// Created by duoban on 2023/9/5. -// - -#import -@class PIHomeItemModel; -@class HomeRankAvatarModel; -NS_ASSUME_NONNULL_BEGIN - -@interface XPNewHomeItemCell : UICollectionViewCell -@property(nonatomic, strong) PIHomeItemModel *itemModel; -@property (nonatomic, copy) NSArray *rankAvatarsModelArray; -@property (nonatomic, copy) void(^didTapRankArea)(void); -- (void)setCellWith:(NSIndexPath *)indexPath; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m deleted file mode 100644 index eec68d1..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m +++ /dev/null @@ -1,277 +0,0 @@ -// -// XPNewHomeItemCell.m -// YuMi -// -// Created by duoban on 2023/9/5. -// - -#import "XPNewHomeItemCell.h" - -#import -#import -#import "PIHomeItemModel.h" -#import "HomeRankAvatarModel.h" - -@interface XPRankAvatarsCell : SDCollectionViewCell -@property (nonatomic, strong) NSArray *cellModel; -@property (nonatomic, strong) NetImageView *avatar_1; -@property (nonatomic, strong) NetImageView *avatar_2; -@property (nonatomic, strong) NetImageView *avatar_3; -@end - -@implementation XPRankAvatarsCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self setupCell]; - } - return self; -} - -- (void)setCellModel:(NSArray *)cellModel { - if ([cellModel xpSafeObjectAtIndex:0]) { - self.avatar_1.imageUrl = [[cellModel xpSafeObjectAtIndex:0] avatar]; - } - - if ([cellModel xpSafeObjectAtIndex:1]) { - self.avatar_2.imageUrl = [[cellModel xpSafeObjectAtIndex:1] avatar]; - } - - if ([cellModel xpSafeObjectAtIndex:2]) { - self.avatar_3.imageUrl = [[cellModel xpSafeObjectAtIndex:2] avatar]; - } -} - -- (void)setupCell { - UIImageView *headDress_1 = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_rank_Headdress_first"]]; - UIImageView *headDress_2 = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_rank_Headdress_second"]]; - UIImageView *headDress_3 = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home_rank_Headdress_second"]]; - headDress_1.contentMode = UIViewContentModeScaleAspectFill; - headDress_2.contentMode = UIViewContentModeScaleAspectFill; - headDress_3.contentMode = UIViewContentModeScaleAspectFill; - - [self.contentView addSubview:headDress_3]; - [self.contentView addSubview:headDress_2]; - [self.contentView addSubview:headDress_1]; - - [headDress_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView).offset(2); - make.top.mas_equalTo(self.contentView).offset(3); - make.width.mas_equalTo(kGetScaleWidth(62)); - make.height.mas_equalTo(kGetScaleWidth(62)); - }]; - - [headDress_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.contentView).offset(-5); - make.leading.mas_equalTo(self.contentView).offset(3); - make.width.mas_equalTo(kGetScaleWidth(55)); - make.height.mas_equalTo(kGetScaleWidth(55)); - }]; - - [headDress_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.contentView).offset(-5); - make.trailing.mas_equalTo(self.contentView).offset(-3); - make.width.mas_equalTo(kGetScaleWidth(55)); - make.height.mas_equalTo(kGetScaleWidth(55)); - }]; - - [self.contentView insertSubview:self.avatar_1 belowSubview:headDress_1]; - [self.contentView insertSubview:self.avatar_2 belowSubview:headDress_2]; - [self.contentView insertSubview:self.avatar_3 belowSubview:headDress_3]; - - [self.avatar_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(13); - make.centerX.mas_equalTo(headDress_1); - make.width.height.mas_equalTo(kGetScaleWidth(38)); - }]; - - [self.avatar_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(headDress_2).offset(-9); - make.centerX.mas_equalTo(headDress_2); - make.width.height.mas_equalTo(kGetScaleWidth(38)); - }]; - - [self.avatar_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(headDress_3).offset(-9); - make.centerX.mas_equalTo(headDress_3); - make.width.height.mas_equalTo(kGetScaleWidth(38)); - }]; -} - -- (NetImageView *)avatar_1 { - if(!_avatar_1){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultBannerPlaceholder]; - _avatar_1 = [[NetImageView alloc]initWithConfig:config]; - _avatar_1.layer.cornerRadius = kGetScaleWidth(19); - _avatar_1.layer.masksToBounds = YES; - } - return _avatar_1; -} - -- (NetImageView *)avatar_2 { - if(!_avatar_2){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultBannerPlaceholder]; - _avatar_2 = [[NetImageView alloc]initWithConfig:config]; - _avatar_2.layer.cornerRadius = kGetScaleWidth(19); - _avatar_2.layer.masksToBounds = YES; - } - return _avatar_2; -} - -- (NetImageView *)avatar_3 { - if(!_avatar_3){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultBannerPlaceholder]; - _avatar_3 = [[NetImageView alloc]initWithConfig:config]; - _avatar_3.layer.cornerRadius = kGetScaleWidth(19); - _avatar_3.layer.masksToBounds = YES; - } - return _avatar_3; -} - -@end - -@interface XPNewHomeItemCell () -///背景 -@property(nonatomic,strong) NetImageView *bgImageView; -@property (nonatomic, strong) SDCycleScrollView *pi_BannerView; -@property (nonatomic, strong) UIScrollView *avatarScrollView; -@property (nonatomic, strong) NSArray *dataSource; -@property (nonatomic, strong) NSTimer *timer; -@property (nonatomic,strong) NSArray *avatarsList; - -@end - -@implementation XPNewHomeItemCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self.contentView addSubview:self.bgImageView]; -} --(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; -} --(void)setItemModel:(PIHomeItemModel *)itmeModel{ - _itemModel = itmeModel; - switch (itmeModel.resourceType) { - case HomeMenuResourceType_H5: -// if (self.rankAvatarsModelArray.count > 0) { - self.bgImageView.image = [UIImage imageNamed:@"home_rank_Heads_bg"]; -// } else { -// { -// @kWeakify(self); -// [self.bgImageView loadImageWithUrl:itmeModel.icon -// completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { -// @kStrongify(self); -// self.bgImageView.layer.cornerRadius = kGetScaleWidth(0); -// }]; -// } -// } - break; - case HomeMenuResourceType_Room_Game: - default: - self.bgImageView.image = [UIImage getLanguageImage:@"entrance_activities"]; - break; - } -} - -- (void)setCellWith:(NSIndexPath *)indexPath { - if (indexPath.row == 0) { - self.bgImageView.image = [UIImage imageNamed:@"home_rank_Heads_bg"]; - } else { - self.bgImageView.image = [UIImage getLanguageImage:@"entrance_activities"]; - } -} - -- (void)setRankAvatarsModelArray:(NSArray *)rankAvatarsModelArray { -// if (![self.itemModel.ID isEqualToString:@"3"]) { -// return; -// } - if (rankAvatarsModelArray.count>0) { - _rankAvatarsModelArray = rankAvatarsModelArray; - if (!self.pi_BannerView.superview) { - [self.contentView addSubview:self.pi_BannerView]; - [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - } - [self setupCycleScrollViews]; - } -} - -- (void)setupCycleScrollViews { - NSMutableArray * array = [NSMutableArray array]; - [self.rankAvatarsModelArray enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL * _Nonnull stop) { - [array addObject:@"Fuck"]; - }]; - self.pi_BannerView.imageURLStringsGroup = array; - [self.pi_BannerView autoScroll]; -} - -#pragma mark - SDCycleScrollViewDelegate -- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index { - if (_didTapRankArea) { - self.didTapRankArea(); - } -} - -- (Class)customCollectionViewCellClassForCycleScrollView:(SDCycleScrollView *)view { - return XPRankAvatarsCell.class; -} - -- (void)setupCustomCell:(UICollectionViewCell *)cell - forIndex:(NSInteger)index - cycleScrollView:(SDCycleScrollView *)view { - XPRankAvatarsCell *myCell = (XPRankAvatarsCell *)cell; - myCell.cellModel = [self.rankAvatarsModelArray xpSafeObjectAtIndex:index]; -} - -#pragma mark - 懒加载 -- (NetImageView *)bgImageView{ - if(!_bgImageView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultBannerPlaceholder]; - _bgImageView = [[NetImageView alloc]initWithConfig:config]; - _bgImageView.layer.cornerRadius = kGetScaleWidth(12); - _bgImageView.layer.masksToBounds = YES; - } - return _bgImageView; -} - -- (UIScrollView *)avatarScrollView { - if (!_avatarScrollView) { - _avatarScrollView = [[UIScrollView alloc] init]; - } - return _avatarScrollView; -} - -- (SDCycleScrollView *)pi_BannerView { - if (!_pi_BannerView) { - _pi_BannerView = [[SDCycleScrollView alloc] init]; - _pi_BannerView.backgroundColor = [UIColor clearColor]; - _pi_BannerView.layer.cornerRadius = 10; - _pi_BannerView.layer.masksToBounds = YES; - _pi_BannerView.delegate = self; - _pi_BannerView.showPageControl = NO; - _pi_BannerView.autoScrollTimeInterval = 5.0; - [_pi_BannerView disableScrollGesture]; - _pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; - _pi_BannerView.scrollDirection = UICollectionViewScrollDirectionVertical; - } - return _pi_BannerView; -} - -@end - diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.h b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.h deleted file mode 100644 index 38b2577..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// XPNewHomeNavView.h -// YuMi -// -// Created by YuMi on 2022/10/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPNewHomeNavView; -@protocol XPNewHomeNavViewDelegate - -///点击了排行榜 -- (void)xPNewHomeNavView:(XPNewHomeNavView *)view didClickRank:(UIButton *)sender; - -///点击了开房 -- (void)xPNewHomeNavView:(XPNewHomeNavView *)view didClickOpenRoom:(UIButton *)sender; - -///点击了搜索 -- (void)xPNewHomeNavView:(XPNewHomeNavView *)view didClickSearch:(UIView *)sender; -@end - -@interface XPNewHomeNavView : UIView -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.m deleted file mode 100644 index f3e29c7..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.m +++ /dev/null @@ -1,152 +0,0 @@ -// -// XPNewHomeNavView.m -// YuMi -// -// Created by YuMi on 2022/10/8. -// - -#import "XPNewHomeNavView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" - - -@interface XPNewHomeNavView () -@property (nonatomic,strong) UIView *searchView; -@property (nonatomic,strong) UIImageView *searchImageView; -@property (nonatomic,strong) UILabel *searchLabel; -@property (nonatomic,strong) UIButton *rankButton; -@property (nonatomic,strong) UIButton *opeRoomButton; -@end - -@implementation XPNewHomeNavView - - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.searchView]; - [self addSubview:self.opeRoomButton]; - [self addSubview:self.rankButton]; - - [self.searchView addSubview:self.searchImageView]; - [self.searchView addSubview:self.searchLabel]; -} - -- (void)initSubViewConstraints { - - [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(15); - make.height.mas_equalTo(34); - make.top.mas_equalTo(self).offset(statusbarHeight + 5); - make.trailing.mas_equalTo(self.rankButton.mas_leading).offset(-15); - }]; - - [self.searchImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(16); - make.height.mas_equalTo(16); - make.leading.mas_equalTo(self.searchView).offset(15); - make.centerY.mas_equalTo(self.searchView); - }]; - - [self.searchLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.searchImageView.mas_trailing).offset(7); - make.centerY.mas_equalTo(self.searchView); - }]; - - [self.opeRoomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(30); - make.height.mas_equalTo(32); - make.centerY.mas_equalTo(self.searchView); - make.trailing.mas_equalTo(self).offset(-15); - }]; - - [self.rankButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.centerY.mas_equalTo(self.opeRoomButton); - make.trailing.mas_equalTo(self.opeRoomButton.mas_leading).offset(-12); - }]; -} - -#pragma mark - Event Response -- (void)openRoomButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNewHomeNavView:didClickOpenRoom:)]) { - [self.delegate xPNewHomeNavView:self didClickOpenRoom:sender]; - } -} - -- (void)rankButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNewHomeNavView:didClickRank:)]) { - [self.delegate xPNewHomeNavView:self didClickRank:sender]; - } -} - -- (void)tapRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPNewHomeNavView:didClickSearch:)]) { - [self.delegate xPNewHomeNavView:self didClickSearch:self.searchView]; - } -} - -#pragma mark - Getters And Setters -- (UIView *)searchView { - if (!_searchView) { - _searchView = [[UIView alloc] init]; - _searchView.backgroundColor = UIColorFromRGB(0xFAFBFC); - _searchView.layer.cornerRadius = 17; - _searchView.layer.masksToBounds = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapRecognizer)]; - [_searchView addGestureRecognizer:tap]; - } - return _searchView; -} - -- (UIImageView *)searchImageView { - if (!_searchImageView) { - _searchImageView = [[UIImageView alloc] init]; - _searchImageView.userInteractionEnabled = YES; - _searchImageView.image = [UIImage imageNamed:@"home_nav_search"]; - } - return _searchImageView; -} - -- (UILabel *)searchLabel { - if (!_searchLabel) { - _searchLabel = [[UILabel alloc] init]; - _searchLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular]; - _searchLabel.textColor = UIColorFromRGB(0xB8B7C7); - _searchLabel.text = YMLocalizedString(@"XPNewHomeNavView0"); - } - return _searchLabel; -} - -- (UIButton *)opeRoomButton { - if (!_opeRoomButton) { - _opeRoomButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_opeRoomButton setImage:[UIImage imageNamed:@"home_nav_open_room"] forState:UIControlStateNormal]; - [_opeRoomButton setImage:[UIImage imageNamed:@"home_nav_open_room"] forState:UIControlStateSelected]; - [_opeRoomButton addTarget:self action:@selector(openRoomButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _opeRoomButton; -} - -- (UIButton *)rankButton { - if (!_rankButton) { - _rankButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_rankButton setImage:[UIImage imageNamed:@"home_nav_rank"] forState:UIControlStateNormal]; - [_rankButton setImage:[UIImage imageNamed:@"home_nav_rank"] forState:UIControlStateSelected]; - [_rankButton addTarget:self action:@selector(rankButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _rankButton; -} - - -@end diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNoteView.h b/YuMi/Modules/YMNewHome/View/CustomView/XPNoteView.h deleted file mode 100644 index b24bea4..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNoteView.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMNoteView.h -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNoteView : UIView - -///开始动画 -- (void)startAnimation; - -///结束动画 -- (void) stopAnimation; - -///柱子的宽度 -@property (assign, nonatomic) CGFloat pillarWidth; - -///柱子的颜色 -@property (strong, nonatomic) UIColor * pillarColor; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNoteView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNoteView.m deleted file mode 100644 index f6113cd..0000000 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNoteView.m +++ /dev/null @@ -1,167 +0,0 @@ -// -// YMNoteView.m -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "XPNoteView.h" - -@interface XPNoteView () { - BOOL _isAnimatoning; - NSArray *_animationLayers; -} - -@end - -@implementation XPNoteView - -#pragma mark - Life cycle -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self commonInit]; - } - return self; -} - -- (instancetype)initWithCoder:(NSCoder *)coder -{ - self = [super initWithCoder:coder]; - if (self) { - [self commonInit]; - } - return self; -} - -- (void) commonInit { - - self.backgroundColor = [UIColor clearColor]; - self.pillarWidth = 2; - self.pillarColor = [UIColor redColor]; - _isAnimatoning = NO; - - //添加4个柱状Layer - NSMutableArray *animationLayers = [NSMutableArray arrayWithCapacity:3]; - for (int i = 0; i < 3; i ++) { - CAShapeLayer *layer = [[CAShapeLayer alloc] init]; - layer.fillColor = [UIColor clearColor].CGColor; - layer.strokeColor = self.pillarColor.CGColor; - layer.masksToBounds = YES; - layer.cornerRadius = 1; - [self.layer addSublayer:layer]; - - [animationLayers addObject:layer]; - } - _animationLayers = [NSArray arrayWithArray:animationLayers]; -} - -- (void) layoutSubviews { - [super layoutSubviews]; - - //bounds改变后需要重设Layer的Frame和动画的Path - for (CAShapeLayer *layer in _animationLayers) { - layer.frame = self.bounds; - } - [self updateAnimationPath]; -} - -#pragma mark - Update Path -- (void) updateAnimationPath { - - CGFloat height = CGRectGetHeight(self.frame); - NSArray * pillarHeighs = @[@(height * 0.8),@(height),@(height*0.7),@(height*0.9)]; - NSInteger pillarNumber = pillarHeighs.count; - NSInteger pillarWidth = self.pillarWidth; - NSInteger margin = (CGRectGetWidth(self.frame) - pillarNumber * pillarWidth) / (pillarNumber - 1); - - for (int i = 0; i < _animationLayers.count; i ++) { - CAShapeLayer *layer = _animationLayers[i]; - CGFloat pillarHeight = [pillarHeighs[i] floatValue]; - CGFloat x = pillarWidth + (pillarWidth + margin) * i; - CGPoint startPoint = CGPointMake(x, CGRectGetHeight(self.frame)); - CGPoint toPoint = CGPointMake(x, height - pillarHeight); - - UIBezierPath * path = [UIBezierPath bezierPath]; - [path moveToPoint:startPoint]; - [path addLineToPoint:toPoint]; - - layer.path = path.CGPath; - } - - if (_isAnimatoning) { - [self startAnimation]; - } -} - - -#pragma mark - Setter and getter -- (void)setPillarWidth:(CGFloat)pillarWidth { - if (_pillarWidth == pillarWidth) { - return; - } - _pillarWidth = pillarWidth; - for (CAShapeLayer * layer in _animationLayers) { - layer.lineWidth = self.pillarWidth; - layer.cornerRadius = self.pillarWidth/2; - } -} - - -- (void)setPillarColor:(UIColor *)pillarColor { - if (_pillarColor == pillarColor) { - return; - } - _pillarColor = pillarColor; - for (CAShapeLayer * layer in _animationLayers) { - layer.strokeColor = self.pillarColor.CGColor; - } -} - -#pragma mark - Public method -- (void) startAnimation { - - _isAnimatoning = YES; - - //先移除所有动画 - for (CAShapeLayer * layer in _animationLayers) { - [layer removeAllAnimations]; - } - - /*通过这些数值来调整动画效果*/ - //每个Layer动画时切换的高度值（0~1） - NSArray * values = @[ - @[@1.0, @0.5, @0.1, @0.4, @0.7, @0.9, @1.0], - @[@1.0, @0.8, @0.5, @0.1, @0.5, @0.7, @1.0], - @[@1.0, @0.7, @0.4, @0.4, @0.7, @0.9, @1.0] - ]; - //每个Layer的动画时长 - NSArray * dutions = @[@(0.8),@(0.9),@(1.0)]; - - int i = 0; - for (CAShapeLayer * layer in _animationLayers) { - CAKeyframeAnimation * animation = [CAKeyframeAnimation animationWithKeyPath:@"strokeEnd"]; - animation.values = values[i]; - animation.duration = [dutions[i] floatValue]; - animation.repeatCount = HUGE_VAL; - animation.removedOnCompletion = NO; - animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - [layer addAnimation:animation forKey:@"ESSEQAnimation"]; - i ++; - } -} - -- (void) stopAnimation { - _isAnimatoning = NO; - //先移除所有动画 - for (CAShapeLayer * layer in _animationLayers) { - [layer removeAllAnimations]; - } -} - -- (void)dealloc{ - [self stopAnimation]; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/EventCenterViewController.h b/YuMi/Modules/YMNewHome/View/EventCenterViewController.h deleted file mode 100644 index a9a4852..0000000 --- a/YuMi/Modules/YMNewHome/View/EventCenterViewController.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// EventCenterViewController.h -// YuMi -// -// Created by P on 2025/4/29. -// - -#import "MvpViewController.h" -@class HomeBannerInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface EventCenterViewController : MvpViewController - - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/EventCenterViewController.m b/YuMi/Modules/YMNewHome/View/EventCenterViewController.m deleted file mode 100644 index 4949a1f..0000000 --- a/YuMi/Modules/YMNewHome/View/EventCenterViewController.m +++ /dev/null @@ -1,816 +0,0 @@ -// -// EventCenterViewController.m -// YuMi -// -// Created by P on 2025/4/29. -// - -#import "EventCenterViewController.h" -#import "EventCenterPresenter.h" -#import "EventCenterEventCell.h" -#import "EventCenterOfficialCell.h" -#import "EventCenterEmptyCell.h" -#import "CreateEventViewControllerV2.h" -#import "HomeBannerInfoModel.h" -#import "CreateEventPresenter.h" -#import "EventCenterEventCell.h" -#import "XPWebViewController.h" -#import "XPRoomViewController.h" -#import "MyEventsViewController.h" -#import "XPRoomViewController.h" - -static NSString *kOfficialEmptyID = @"official empty"; -static NSString *kSquareEmptyID = @"square empty"; -static NSString *kMyEmptyID = @"my empty"; - -static UIEdgeInsets kEventTableViewContentInset(void) { - return UIEdgeInsetsMake(0, 0, 100 + kSafeAreaBottomHeight, 0); -} -static UIEdgeInsets kOfficialTableViewContentInset(void) { - return UIEdgeInsetsMake(0, 0, 100 + kSafeAreaBottomHeight, 0); -} - -@interface EventCenterViewController () - - -@property (nonatomic, strong) NSMutableArray *officialDatasource; -@property (nonatomic, strong) NSMutableArray *eventSquareDatasource; -@property (nonatomic, strong) NSMutableArray *myCreateEventDatasource; -@property (nonatomic, strong) NSMutableArray *mySubEventDatasource; - -@property (nonatomic, strong) UITableView *officialTableView; -@property (nonatomic, strong) UITableView *myEventTableView; -@property (nonatomic, strong) UITableView *eventSquareTableView; -@property (nonatomic, assign) NSInteger myEventTableViewPage; -@property (nonatomic, assign) NSInteger eventSquareTableViewPage; - -@property (nonatomic, strong) UIView *tabView; -@property (nonatomic, strong) UIImageView *indicatorImageView; -@property (nonatomic, strong) NSArray *tabButtons; -@property (nonatomic, strong) UIPageViewController *pageViewController; -@property (nonatomic, strong) NSArray *contentViewControllers; -@property (nonatomic, assign) NSInteger currentIndex; - -@property (nonatomic, strong) UIButton *createButton; - -- (void)switchToIndex:(NSInteger)index animated:(BOOL)animated; - -@end - -@implementation EventCenterViewController - -- (CreateEventPresenter *)createPresenter { - return [[CreateEventPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor whiteColor]; - self.title = YMLocalizedString(@"20.20.59_text_1"); - - [self setupTabView]; - [self setupPageViewController]; - [self setupBottomButton]; - - // 设置初始状态下 createButton 的显示状态 - self.createButton.hidden = YES; - [self.presenter loadOfficialEvents]; -} - -#pragma mark - Setup UI -- (void)setupTabView { - self.tabView = [[UIView alloc] init]; - [self.view addSubview:self.tabView]; - [self.tabView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.view.mas_safeAreaLayoutGuideTop); - make.left.right.equalTo(self.view); - make.height.mas_equalTo(44); - }]; - - NSArray *titles = @[YMLocalizedString(@"20.20.59_text_2"), - YMLocalizedString(@"20.20.59_text_3"), - YMLocalizedString(@"20.20.59_text_4")]; - NSMutableArray *buttons = [NSMutableArray array]; - CGFloat buttonWidth = UIScreen.mainScreen.bounds.size.width / titles.count; - - for (NSInteger i = 0; i < titles.count; i++) { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - [button setTitle:titles[i] forState:UIControlStateNormal]; - [button setTitleColor:[UIColor grayColor] forState:UIControlStateNormal]; - [button setTitleColor:[UIColor blackColor] forState:UIControlStateSelected]; - button.tag = i; - [button addTarget:self action:@selector(tabButtonClicked:) forControlEvents:UIControlEventTouchUpInside]; - [self.tabView addSubview:button]; - [button mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(self.tabView); - make.leading.equalTo(self.tabView).offset(i * buttonWidth); - make.width.mas_equalTo(buttonWidth); - }]; - [buttons addObject:button]; - } - self.tabButtons = buttons; - - // 添加底部指示器 - self.indicatorImageView = [[UIImageView alloc] initWithImage:kImage(@"yellow_indicator")]; - [self.tabView addSubview:self.indicatorImageView]; - [self.indicatorImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self.tabView); - make.width.mas_equalTo(21); - make.height.mas_equalTo(6); - make.centerX.equalTo(buttons.firstObject); - }]; - - // 设置默认选中状态 - self.currentIndex = 0; - ((UIButton *)buttons.firstObject).selected = YES; -} - -- (void)setupPageViewController { - self.myEventTableViewPage = 1; - self.eventSquareTableViewPage = 1; - - // 创建内容页面控制器 - NSMutableArray *viewControllers = [NSMutableArray array]; - - // 使用懒加载的TableView - UIViewController *officialVC = [[UIViewController alloc] init]; - officialVC.view = self.officialTableView; - [viewControllers addObject:officialVC]; - - UIViewController *eventSquareVC = [[UIViewController alloc] init]; - eventSquareVC.view = self.eventSquareTableView; - [viewControllers addObject:eventSquareVC]; - - UIViewController *myEventVC = [[UIViewController alloc] init]; - myEventVC.view = self.myEventTableView; - [viewControllers addObject:myEventVC]; - self.contentViewControllers = viewControllers; - - // 配置PageViewController - self.pageViewController = [[UIPageViewController alloc] initWithTransitionStyle:UIPageViewControllerTransitionStyleScroll - navigationOrientation:UIPageViewControllerNavigationOrientationHorizontal - options:nil]; - self.pageViewController.delegate = self; - self.pageViewController.dataSource = self; - - [self addChildViewController:self.pageViewController]; - [self.view addSubview:self.pageViewController.view]; - [self.pageViewController didMoveToParentViewController:self]; - - [self.pageViewController.view mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.tabView.mas_bottom); - make.left.right.bottom.equalTo(self.view); - }]; - - // 设置初始页面 - [self.pageViewController setViewControllers:@[viewControllers.firstObject] - direction:UIPageViewControllerNavigationDirectionForward - animated:NO - completion:nil]; -} - -- (void)setupBottomButton { - [self.view addSubview:self.createButton]; - [self.createButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.view).offset(-48); - make.size.mas_equalTo(CGSizeMake(195, 40)); - }]; -} - -#pragma mark - Setup Data -- (void)setOfficialDatasource:(NSMutableArray *)officialDatasource { - _officialDatasource = officialDatasource; - // 处理空数据状态 - if (_officialDatasource.count == 0) { - self.officialTableView.mj_header.hidden = NO; - self.officialTableView.mj_footer.hidden = YES; - } else { - self.officialTableView.mj_header.hidden = NO; - self.officialTableView.mj_footer.hidden = NO; - } - - [self.officialTableView reloadData]; -} - -#pragma mark - Actions - -- (void)tabButtonClicked:(UIButton *)sender { - [self switchToIndex:sender.tag animated:YES]; -} - -- (void)switchToIndex:(NSInteger)index animated:(BOOL)animated { - if (index == self.currentIndex) return; - - // 更新按钮状态 - self.tabButtons[self.currentIndex].selected = NO; - self.tabButtons[index].selected = YES; - - // 更新指示器位置 - [self.indicatorImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self.tabView); - make.width.mas_equalTo(21); - make.height.mas_equalTo(6); - make.centerX.equalTo(self.tabButtons[index]); - }]; - - if (animated) { - [UIView animateWithDuration:0.05 animations:^{ - [self.view layoutIfNeeded]; - }]; - } - - // 切换页面 - UIPageViewControllerNavigationDirection direction = index > self.currentIndex ? UIPageViewControllerNavigationDirectionForward : UIPageViewControllerNavigationDirectionReverse; - - [self.pageViewController setViewControllers:@[self.contentViewControllers[index]] - direction:direction - animated:animated - completion:nil]; - - self.currentIndex = index; - - // 根据当前选中的tab控制createButton的显示状态 - self.createButton.hidden = (index == 0); - - // 加载数据逻辑 - switch (index) { - case 0: - if (self.officialDatasource.count == 0) { - [self.presenter loadOfficialEvents]; - } - break; - case 1: - if (self.eventSquareDatasource.count == 0) { - [self.presenter loadEventSquare:self.eventSquareTableViewPage]; - } - break; - case 2: - if (self.myCreateEventDatasource.count == 0 && self.mySubEventDatasource.count == 0) { - [self.presenter loadMyEvents]; - } - break; - - default: - break; - } -} - -- (void)didTapCreateButton { - CreateEventViewControllerV2 *createEventVC = [[CreateEventViewControllerV2 alloc] init]; - [self.navigationController pushViewController:createEventVC animated:YES]; - - @kWeakify(self); - [createEventVC setCreateSuccess:^{ - @kStrongify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.eventSquareTableView.mj_header beginRefreshing]; - [self.myEventTableView.mj_header beginRefreshing]; - }); - }]; -} - -- (void)didTapMyCreateEventSeactionTitle { - MyEventsViewController *vc = [[MyEventsViewController alloc] init]; - [self.navigationController pushViewController:vc - animated:YES]; -} - -- (void)handleCellStatusButtonDidTap:(EventItemModel *)model action:(EventCellActions)action { - switch (action) { - case EventCellAction_participate: - [XPRoomViewController openRoom:@(model.roomUid).stringValue - viewController:self]; - break; - case EventCellAction_sub: - [self.presenter subEvent:model.subStatus ? NO : YES - eventId:model.id]; - break; - case EventCellAction_unsub: - [self.presenter subEvent:model.subStatus ? NO : YES - eventId:model.id]; - break; - case EventCellAction_delete: - [self.presenter deleteEvent:model.id]; - default: - break; - } -} - -#pragma mark - UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - if (tableView == self.myEventTableView) { - return 2; - } - return 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - if (tableView == self.myEventTableView) { - return 60; - } - return 0; -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - if (tableView == self.myEventTableView) { - UIView *v = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 60)]; - v.backgroundColor = [UIColor whiteColor]; - UILabel *title = [UILabel labelInitWithText:section == 0 ? YMLocalizedString(@"20.20.59_text_4") : YMLocalizedString(@"20.20.59_text_22") - font:kFontSemibold(18) - textColor:UIColorFromRGB(0x313131)]; - [v addSubview:title]; - [title mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(v); - make.leading.mas_equalTo(15); - }]; - - if (section == 0) { - UIImageView *arrow = [[UIImageView alloc] initWithImage:[kImage(@"event_arrow_black") ms_SetImageForRTL]]; - arrow.userInteractionEnabled = YES; - [v addSubview:arrow]; - [arrow mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(v); - make.trailing.mas_equalTo(-15); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self - action:@selector(didTapMyCreateEventSeactionTitle)]; - [arrow addGestureRecognizer:tap]; - } - - return v; - } - return nil; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - if (tableView == self.officialTableView) { - return self.officialDatasource.count > 0 ? self.officialDatasource.count : 1; - } else if (tableView == self.eventSquareTableView) { - return self.eventSquareDatasource.count > 0 ? self.eventSquareDatasource.count : 1; - } else if (tableView == self.myEventTableView) { - switch (section) { - case 0: - return self.myCreateEventDatasource.count > 0 ? self.myCreateEventDatasource.count : 1; - break; - case 1: - return self.mySubEventDatasource.count > 0 ? self.mySubEventDatasource.count : 1; - break; - default: - return 0; - break; - } - } - return 0; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - @kWeakify(self); - if (tableView == self.officialTableView) { - if (self.officialDatasource.count == 0) { - EventCenterEmptyCell *cell = [EventCenterEmptyCell cellFor:tableView customID:kOfficialEmptyID atIndexPath:indexPath]; - // 设置空状态的提示文本 -// [cell updateWithTitle:YMLocalizedString(@"20.20.59_text_37") -// subTitle:msg]; - return cell; - } - - EventCenterOfficialCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([EventCenterOfficialCell class])]; - if (!cell) { - cell = [[EventCenterOfficialCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([EventCenterOfficialCell class])]; - } - cell.cellModel = [self.officialDatasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } else if (tableView == self.eventSquareTableView) { - if (self.eventSquareDatasource.count == 0) { - return [EventCenterEmptyCell cellFor:tableView customID:kSquareEmptyID atIndexPath:indexPath]; - } - - EventCenterEventCell *cell = [EventCenterEventCell cellFor:tableView atIndexPath:indexPath]; - EventItemModel *model = [self.eventSquareDatasource xpSafeObjectAtIndex:indexPath.row]; - [cell updateCell:model]; - [cell setStatusButtonDidTap:^(EventItemModel * _Nonnull model, EventCellActions action) { - @kStrongify(self); - [self handleCellStatusButtonDidTap:model action:action]; - }]; - - return cell; - } else if (tableView == self.myEventTableView) { - switch (indexPath.section) { - case 0: { - if (self.myCreateEventDatasource.count == 0) { - return [EventCenterEmptyCell cellFor:tableView customID:kMyEmptyID atIndexPath:indexPath]; - } - EventCenterEventCell *cell = [EventCenterEventCell cellFor:tableView atIndexPath:indexPath]; - EventItemModel *model = [self.myCreateEventDatasource xpSafeObjectAtIndex:indexPath.row]; - [cell updateCell:model]; - [cell setStatusButtonDidTap:^(EventItemModel * _Nonnull model, EventCellActions action) { - @kStrongify(self); - [self handleCellStatusButtonDidTap:model action:action]; - }]; - return cell; - } - break; - case 1: { - if (self.mySubEventDatasource.count == 0) { - return [EventCenterEmptyCell cellFor:tableView customID:kMyEmptyID atIndexPath:indexPath]; - } - EventCenterEventCell *cell = [EventCenterEventCell cellFor:tableView atIndexPath:indexPath]; - EventItemModel *model = [self.mySubEventDatasource xpSafeObjectAtIndex:indexPath.row]; - [cell updateCell:model]; - [cell setStatusButtonDidTap:^(EventItemModel * _Nonnull model, EventCellActions action) { - @kStrongify(self); - [self handleCellStatusButtonDidTap:model action:action]; - }]; - return cell; - } - break; - default: - break; - } - } - return [UITableViewCell new]; -} - -#pragma mark - UITableViewDelegate - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (tableView == self.officialTableView) { - return self.officialDatasource.count == 0 ? [EventCenterEmptyCell cellHeight] : 120; - } - - if (tableView == self.eventSquareTableView) { - return self.eventSquareDatasource.count == 0 ? [EventCenterEmptyCell cellHeight] : 140; - } - - if (tableView == self.myEventTableView) { - switch (indexPath.section) { - case 0: - return self.myCreateEventDatasource.count == 0 ? [EventCenterEmptyCell cellHeight] : 140; - break; - case 1: - return self.mySubEventDatasource.count == 0 ? [EventCenterEmptyCell cellHeight] : 140; - break; - default: - return 0; - break; - } - } - - return 0; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - // 处理cell点击事件 - if (tableView == self.officialTableView) { - HomeBannerInfoModel *model = [self.officialDatasource xpSafeObjectAtIndex:indexPath.row]; - if (model) { - switch (model.skipType) { - case HomeBannerInfoSkipType_Room: - { - if (model.skipUri.length > 0) { - [XPRoomViewController openRoom:model.skipUri viewController:self]; - } - } - break; - case HomeBannerInfoSkipType_Web: - case HomeBannerInfoSkipType_Web_CP: - case HomeBannerInfoSkipType_Web_Custom: - case HomeBannerInfoSkipType_Web_WeekStar: - { - XPWebViewController *vc = [[XPWebViewController alloc]initWithRoomUID:nil]; - vc.url = model.skipUri; - [self.navigationController pushViewController:vc animated:YES]; - } - break; - case HomeBannerInfoSkipType_APP: - case HomeBannerInfoSkipType_None: - default: - break; - } - } - } else if (tableView == self.eventSquareTableView) { - EventItemModel *model = [self.eventSquareDatasource xpSafeObjectAtIndex:indexPath.row]; - if (model) { - [self toEventDetail:model.id]; - } - } else if (tableView == self.myEventTableView) { - EventItemModel *model; - switch (indexPath.section) { - case 0: { - model = [self.myCreateEventDatasource xpSafeObjectAtIndex:indexPath.row]; - } - break; - case 1: { - model = [self.mySubEventDatasource xpSafeObjectAtIndex:indexPath.row];\ - } - break; - default: - break; - } - if (model) { - [self toEventDetail:model.id]; - } - } -} - -- (void)toEventDetail:(NSInteger)eventId { - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = [NSString stringWithFormat:@"%@%@", - URLWithType(kEventDetailPath), - @(eventId)]; - [self.navigationController pushViewController:webVC animated:YES]; -} - -#pragma mark - UIPageViewControllerDataSource - -- (UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerBeforeViewController:(UIViewController *)viewController { - NSInteger index = [self.contentViewControllers indexOfObject:viewController]; - if (index == 0 || index == NSNotFound) return nil; - return self.contentViewControllers[index - 1]; -} - -- (UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerAfterViewController:(UIViewController *)viewController { - NSInteger index = [self.contentViewControllers indexOfObject:viewController]; - if (index == self.contentViewControllers.count - 1 || index == NSNotFound) return nil; - return self.contentViewControllers[index + 1]; -} - -#pragma mark - UIPageViewControllerDelegate - -- (void)pageViewController:(UIPageViewController *)pageViewController didFinishAnimating:(BOOL)finished previousViewControllers:(NSArray *)previousViewControllers transitionCompleted:(BOOL)completed { - if (!completed) return; - - NSInteger index = [self.contentViewControllers indexOfObject:pageViewController.viewControllers.firstObject]; - if (index != NSNotFound) { - [self switchToIndex:index animated:YES]; - } -} - -#pragma mark - CreateEventPresenterProcotol - -- (void)officialEventListSuccess:(NSArray *)listModels { - [self setOfficialDatasource:listModels.mutableCopy]; - [self.officialTableView.mj_header endRefreshing]; -} - -- (void)officialEventListFailure:(NSString *)msg { - [self.officialTableView.mj_header endRefreshing]; - // 清空数据源并刷新表格，触发显示空状态 - [self setOfficialDatasource:[NSMutableArray array]]; -} - -- (void)eventSquareListSuccess:(NSArray *)list { - if (self.eventSquareTableViewPage == 1) { - [self.eventSquareDatasource removeAllObjects]; - } - if (list.count > 0) { - [self.eventSquareDatasource addObjectsFromArray:list]; - self.eventSquareTableViewPage++; - self.eventSquareTableView.mj_footer.hidden = NO; - } else { - if (self.eventSquareTableViewPage == 1) { - self.eventSquareTableView.mj_footer.hidden = YES; - } else { - // 没有更多数据了 - [self.eventSquareTableView.mj_footer endRefreshingWithNoMoreData]; - } - } - [self.eventSquareTableView reloadData]; - [self.eventSquareTableView.mj_header endRefreshing]; - - if (list.count < 20) { - [self.eventSquareTableView.mj_footer endRefreshingWithNoMoreData]; - } else { - [self.eventSquareTableView.mj_footer endRefreshing]; - } -} - -- (void)eventSquareListFailure:(NSString *)errorMsg { - [self.eventSquareTableView.mj_header endRefreshing]; - [self.eventSquareTableView.mj_footer setHidden:YES]; -} - -- (void)myCreateEventListSuccess:(NSArray *)list { - [self.myEventTableView.mj_header endRefreshing]; - - self.myCreateEventDatasource = list.mutableCopy; - [self.myEventTableView reloadData]; -} - -- (void)myCreateEventListFailure:(NSString *)msg { - [self.myEventTableView.mj_header endRefreshing]; - [self.myEventTableView.mj_footer setHidden:YES]; -} - -- (void)mySubEventListSuccess:(NSArray *)list { - [self.myEventTableView.mj_header endRefreshing]; - - if (self.myEventTableViewPage == 1) { - self.mySubEventDatasource = list.mutableCopy; - } else { - [self.mySubEventDatasource addObjectsFromArray:list]; - } - [self.myEventTableView reloadData]; - - if (list.count < 20) { - [self.myEventTableView.mj_footer endRefreshingWithNoMoreData]; - } else { - [self.myEventTableView.mj_footer endRefreshing]; - } -} - -- (void)mySubEventListFailure:(NSString *)msg { - [self.myEventTableView.mj_header endRefreshing]; - [self.myEventTableView.mj_footer setHidden:YES]; -} - -- (void)myEventListFailure:(NSString *)msg { - [self.myEventTableView.mj_header endRefreshing]; - if (self.myEventTableViewPage == 1) { - [self.myEventTableView.mj_footer setHidden:YES]; - } -} - -- (void)eventSubActionSuccess:(BOOL)isSub eventId:(NSInteger)eventId { - NSInteger count = 0; - if (isSub) { - count += 1; - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"20.20.59_text_35")]; - } else { - count -= 1; - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"20.20.59_text_36")]; - } - - switch (self.currentIndex) { - case 1: - for (EventItemModel *m in self.eventSquareDatasource) { - if (m.id == eventId) { - m.subStatus = isSub; - m.subNum += count; - break; - } - } - [self.eventSquareTableView reloadData]; - [self.myEventTableView.mj_header beginRefreshing]; - break; - case 2: - for (EventItemModel *m in self.mySubEventDatasource) { - if (m.id == eventId) { - m.subStatus = isSub; - m.subNum += count; - break; - } - } - for (EventItemModel *m in self.myCreateEventDatasource) { - if (m.id == eventId) { - m.subStatus = isSub; - m.subNum += count; - break; - } - } - [self.myEventTableView reloadData]; - [self.eventSquareTableView.mj_header beginRefreshing]; - break; - - default: - break; - } -} - -- (void)eventSubActionFailure:(NSString *)msg { - -} - -- (void)deleteEventSuccess:(NSInteger)eventId { - for (EventItemModel *m in self.mySubEventDatasource) { - if (m.id == eventId) { - [self.mySubEventDatasource removeObject:m]; - break; - } - } - for (EventItemModel *m in self.myCreateEventDatasource) { - if (m.id == eventId) { - [self.myCreateEventDatasource removeObject:m]; - break; - } - } - [self.myEventTableView reloadData]; -} - -- (void)deleteEventFailure:(NSString *)msg { - -} - -#pragma mark - Lazy Loading - -- (UITableView *)officialTableView { - if (!_officialTableView) { - _officialTableView = [[UITableView alloc] init]; - _officialTableView.backgroundColor = [UIColor whiteColor]; - _officialTableView.delegate = self; - _officialTableView.dataSource = self; - _officialTableView.separatorStyle = UITableViewCellSeparatorStyleNone; - if (@available(iOS 11.0, *)) { - _officialTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_officialTableView registerClass:[EventCenterOfficialCell class] forCellReuseIdentifier:NSStringFromClass([EventCenterOfficialCell class])]; - _officialTableView.contentInset = kOfficialTableViewContentInset(); - _officialTableView.scrollIndicatorInsets = kOfficialTableViewContentInset(); - [EventCenterEmptyCell registerTo:_officialTableView withCustomID:kOfficialEmptyID]; - - // 添加下拉刷新 - __weak typeof(self) weakSelf = self; - _officialTableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ - [weakSelf.presenter loadOfficialEvents]; - }]; - } - return _officialTableView; -} - -- (UITableView *)eventSquareTableView { - if (!_eventSquareTableView) { - _eventSquareTableView = [[UITableView alloc] init]; - _eventSquareTableView.backgroundColor = [UIColor whiteColor]; - _eventSquareTableView.delegate = self; - _eventSquareTableView.dataSource = self; - _eventSquareTableView.separatorStyle = UITableViewCellSeparatorStyleNone; - if (@available(iOS 11.0, *)) { - _eventSquareTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [EventCenterEmptyCell registerTo:_eventSquareTableView withCustomID:kSquareEmptyID]; - [EventCenterEventCell registerTo:_eventSquareTableView]; - - __weak typeof(self) weakSelf = self; - _eventSquareTableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ - // 下拉刷新，重置页码 - weakSelf.eventSquareTableViewPage = 1; - [(CreateEventPresenter *)weakSelf.presenter loadEventSquare:weakSelf.eventSquareTableViewPage]; - }]; - _eventSquareTableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ - // 上拉加载更多 - [(CreateEventPresenter *)weakSelf.presenter loadEventSquare:weakSelf.eventSquareTableViewPage]; - }]; - - _eventSquareTableView.contentInset = kEventTableViewContentInset(); - _eventSquareTableView.scrollIndicatorInsets = kEventTableViewContentInset(); - } - return _eventSquareTableView; -} - -- (UITableView *)myEventTableView { - if (!_myEventTableView) { - _myEventTableView = [[UITableView alloc] init]; - _myEventTableView.backgroundColor = [UIColor whiteColor]; - _myEventTableView.delegate = self; - _myEventTableView.dataSource = self; - _myEventTableView.separatorStyle = UITableViewCellSeparatorStyleNone; - if (@available(iOS 11.0, *)) { - _myEventTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [EventCenterEmptyCell registerTo:_myEventTableView withCustomID:kMyEmptyID]; - [EventCenterEventCell registerTo:_myEventTableView]; - - __weak typeof(self) weakSelf = self; - _myEventTableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ - // 下拉刷新 - weakSelf.myEventTableViewPage = 1; - [weakSelf.presenter loadMyEvents]; - }]; - _myEventTableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ - // 上拉加载更多 - weakSelf.myEventTableViewPage += 1; - [weakSelf.presenter loadMySubEvents:weakSelf.myEventTableViewPage]; - }]; - - _myEventTableView.contentInset = kEventTableViewContentInset(); - _myEventTableView.scrollIndicatorInsets = kEventTableViewContentInset(); - } - return _myEventTableView; -} - -- (UIButton *)createButton { - if (!_createButton) { - _createButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_createButton setTitle:YMLocalizedString(@"20.20.59_text_8") forState:UIControlStateNormal]; - [_createButton addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xe29030), - UIColorFromRGB(0xfcc074) - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 0.5) cornerRadius:20]; - [_createButton setCornerRadius:20]; - [_createButton addTarget:self action:@selector(didTapCreateButton) forControlEvents:UIControlEventTouchUpInside]; - } - return _createButton; -} - -- (NSMutableArray *)eventSquareDatasource { - if (!_eventSquareDatasource) { - _eventSquareDatasource = [NSMutableArray array]; - } - return _eventSquareDatasource; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/MyEventsViewController.h b/YuMi/Modules/YMNewHome/View/MyEventsViewController.h deleted file mode 100644 index 60c55b8..0000000 --- a/YuMi/Modules/YMNewHome/View/MyEventsViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MyEventsViewController.h -// YuMi -// -// Created by P on 2025/5/16. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MyEventsViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/MyEventsViewController.m b/YuMi/Modules/YMNewHome/View/MyEventsViewController.m deleted file mode 100644 index 8d763f5..0000000 --- a/YuMi/Modules/YMNewHome/View/MyEventsViewController.m +++ /dev/null @@ -1,192 +0,0 @@ -// -// MyEventsViewController.m -// YuMi -// -// Created by P on 2025/5/16. -// - -#import "MyEventsViewController.h" -#import "CreateEventPresenter.h" -#import "EventCenterEmptyCell.h" -#import "EventCenterEventCell.h" -#import "XPWebViewController.h" -#import "XPRoomViewController.h" - -@interface MyEventsViewController () - -@property (nonatomic, assign) NSInteger page; -@property (nonatomic, strong) UITableView *myEventTableView; -@property (nonatomic, strong) NSMutableArray *datasource; - -@end - -@implementation MyEventsViewController - -- (CreateEventPresenter *)createPresenter { - return [[CreateEventPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.title = YMLocalizedString(@"20.20.59_text_4"); - - [self.view addSubview:self.myEventTableView]; - [self.myEventTableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - - [self.myEventTableView.mj_header beginRefreshing]; -} - -- (void)handleCellStatusButtonDidTap:(EventItemModel *)model action:(EventCellActions)action { - switch (action) { - case EventCellAction_participate: - [XPRoomViewController openRoom:@(model.roomUid).stringValue - viewController:self]; - break; - case EventCellAction_sub: - [self.presenter subEvent:model.subStatus ? NO : YES - eventId:model.id]; - break; - case EventCellAction_unsub: - [self.presenter subEvent:model.subStatus ? NO : YES - eventId:model.id]; - break; - case EventCellAction_delete: - [self.presenter deleteEvent:model.id]; - default: - break; - } -} - -#pragma mark - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count == 0 ? 1 : self.datasource.count; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count == 0 ? [EventCenterEmptyCell cellHeight] : [EventCenterEventCell cellHeight]; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count == 0) { - return [EventCenterEmptyCell cellFor:tableView customID:@"" atIndexPath:indexPath]; - } - EventCenterEventCell *cell = [EventCenterEventCell cellFor:tableView atIndexPath:indexPath]; - EventItemModel *model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [cell updateCell:model]; - @kWeakify(self); - [cell setStatusButtonDidTap:^(EventItemModel * _Nonnull model, EventCellActions action) { - @kStrongify(self); - [self handleCellStatusButtonDidTap:model action:action]; - }]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - EventItemModel *model = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (model) { - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = [NSString stringWithFormat:@"%@%@", - URLWithType(kEventDetailPath), - @(model.id)]; - [self.navigationController pushViewController:webVC animated:YES]; - } -} - -#pragma mark - CreateEventPresenterProcotol -- (void)myCreateEventListSuccess:(NSArray *)list { - if (self.page > 1) { - [self.datasource addObjectsFromArray:list]; - } else { - self.datasource = list.mutableCopy; - - // 首次加载完成后，根据数据量添加footer - if (!self.myEventTableView.mj_footer) { - __weak typeof(self) weakSelf = self; - MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ - // 上拉加载更多 - weakSelf.page += 1; - [weakSelf.presenter loadMyCreateEvents:weakSelf.page]; - }]; - [footer setTitle:YMLocalizedString(@"20.20.59_text_23") forState:MJRefreshStateNoMoreData]; - self.myEventTableView.mj_footer = footer; - } - } - [self.myEventTableView reloadData]; - - [self.myEventTableView.mj_header endRefreshing]; - if (list.count < 20) { - [self.myEventTableView.mj_footer endRefreshingWithNoMoreData]; - } else { - [self.myEventTableView.mj_footer resetNoMoreData]; - } -} - -- (void)myCreateEventListFailure:(NSString *)msg { - [self.myEventTableView.mj_header endRefreshing]; - if (self.page > 1) { - [self.myEventTableView.mj_footer endRefreshing]; - } -} - -- (void)eventSubActionSuccess:(BOOL)isSub eventId:(NSInteger)eventId { - NSInteger count = 0; - if (isSub) { - count += 1; - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"20.20.59_text_35")]; - } else { - count -= 1; - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"20.20.59_text_36")]; - } - - for (EventItemModel *m in self.datasource) { - if (m.id == eventId) { - m.subStatus = isSub; - m.subNum += count; - break; - } - } - - [self.myEventTableView reloadData]; -} - - -- (void)deleteEventSuccess:(NSInteger)eventId { - for (EventItemModel *m in self.datasource) { - if (m.id == eventId) { - [self.datasource removeObject:m]; - break; - } - } - [self.myEventTableView reloadData]; -} - -- (void)deleteEventFailure:(NSString *)msg { - -} - -#pragma mark - -- (UITableView *)myEventTableView { - if (!_myEventTableView) { - _myEventTableView = [[UITableView alloc] init]; - _myEventTableView.backgroundColor = [UIColor whiteColor]; - _myEventTableView.delegate = self; - _myEventTableView.dataSource = self; - _myEventTableView.separatorStyle = UITableViewCellSeparatorStyleNone; - if (@available(iOS 11.0, *)) { - _myEventTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [EventCenterEmptyCell registerTo:_myEventTableView withCustomID:@""]; - [EventCenterEventCell registerTo:_myEventTableView]; - __weak typeof(self) weakSelf = self; - _myEventTableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ - // 下拉刷新 - weakSelf.page = 1; - [weakSelf.presenter loadMyCreateEvents:weakSelf.page]; - }]; - } - return _myEventTableView; -} -@end diff --git a/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.h b/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.h deleted file mode 100644 index ab57ba2..0000000 --- a/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// PIHoemCategoryCollectionView.h -// YuMi -// -// Created by duoban on 2024/2/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol PIHoemCategoryCollectionViewDelegate - --(void)pi_didSelectItemAtIndex:(NSInteger)index; - -@end - - -@interface PIHoemCategoryCollectionView : UIView -@property(nonatomic,strong) NSMutableArray *titleList; -@property(nonatomic,assign) NSInteger index; -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.m b/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.m deleted file mode 100644 index c8474db..0000000 --- a/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.m +++ /dev/null @@ -1,104 +0,0 @@ -// -// PIHoemCategoryCollectionView.m -// YuMi -// -// Created by duoban on 2024/2/21. -// - -#import "PIHoemCategoryCollectionView.h" -#import "PIHomeCategoryTitleModel.h" -#import "PIHoemCategoryTitleCell.h" -@interface PIHoemCategoryCollectionView() -@property(nonatomic,strong) UICollectionView *pi_collectionView; -@end -@implementation PIHoemCategoryCollectionView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.pi_collectionView]; -} --(void)installConstraints{ - [self.pi_collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; -} --(void)setTitleList:(NSMutableArray *)titleList{ - _titleList = titleList; - [self.pi_collectionView reloadData]; - -} -#pragma mark- UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ - return self.titleList.count; -} -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{ - PIHomeCategoryTitleModel *model = [self.titleList xpSafeObjectAtIndex:indexPath.row]; - CGFloat width = model.isChecked ? model.checkedWidth : model.noCheckedWidth; - return CGSizeMake(width + kGetScaleWidth(10), kGetScaleWidth(44)); -} -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - PIHoemCategoryTitleCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([PIHoemCategoryTitleCell class]) forIndexPath:indexPath]; - PIHomeCategoryTitleModel *model = [self.titleList xpSafeObjectAtIndex:indexPath.row]; - cell.tagModel = model; - return cell; -} -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - for (PIHomeCategoryTitleModel *model in self.titleList) { - model.isChecked = NO; - } - PIHomeCategoryTitleModel *selectModel = [self.titleList xpSafeObjectAtIndex:indexPath.row]; - selectModel.isChecked = YES; - [self.pi_collectionView reloadData]; - - if(self.delegate && [self.delegate respondsToSelector:@selector(pi_didSelectItemAtIndex:)]){ - [self.delegate pi_didSelectItemAtIndex:indexPath.row]; - } - -// int i = [selectModel.id isEqualToString:@"-1"] ? 0 : 1; -// if(self.scrolledHandle){ -// self.scrolledHandle(i); -// } -} - -- (void)setIndex:(NSInteger)index{ - _index = index; - for (int i = 0; i < self.titleList.count; i++) { - PIHomeCategoryTitleModel *model = [self.titleList xpSafeObjectAtIndex:i]; - model.isChecked = NO; - } - PIHomeCategoryTitleModel *curModel = [self.titleList xpSafeObjectAtIndex:_index]; - curModel.isChecked = YES; - [self.pi_collectionView reloadData]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.pi_collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:index inSection:0] atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES]; - }); -} -#pragma mark - 懒加载 -- (UICollectionView *)pi_collectionView{ - if (!_pi_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.minimumLineSpacing = kGetScaleWidth(10); - layout.minimumInteritemSpacing = kGetScaleWidth(10); - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(10), 0, kGetScaleWidth(10)); - - _pi_collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _pi_collectionView.dataSource = self; - _pi_collectionView.delegate = self; - _pi_collectionView.tag = 98777; - _pi_collectionView.showsVerticalScrollIndicator = NO; - _pi_collectionView.showsHorizontalScrollIndicator = NO; - _pi_collectionView.backgroundColor = [UIColor clearColor]; - [_pi_collectionView registerClass:[PIHoemCategoryTitleCell class] forCellWithReuseIdentifier:NSStringFromClass([PIHoemCategoryTitleCell class])]; - - } - return _pi_collectionView; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleCell.h b/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleCell.h deleted file mode 100644 index 328c3d4..0000000 --- a/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// PIHoemCategoryTitleCell.h -// YuMi -// -// Created by duoban on 2024/2/21. -// - -#import -#import "PIHomeCategoryTitleModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface PIHoemCategoryTitleCell : UICollectionViewCell - - -@property(nonatomic,strong) PIHomeCategoryTitleModel *tagModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleCell.m b/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleCell.m deleted file mode 100644 index 377667b..0000000 --- a/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleCell.m +++ /dev/null @@ -1,67 +0,0 @@ -// -// PIHoemCategoryTitleCell.m -// YuMi -// -// Created by duoban on 2024/2/21. -// - -#import "PIHoemCategoryTitleCell.h" -@interface PIHoemCategoryTitleCell() -@property(nonatomic,strong) UIButton *titleView; -@property(nonatomic,strong) UIImageView *lineVeiw; -@end -@implementation PIHoemCategoryTitleCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self.contentView addSubview:self.lineVeiw]; - [self.contentView addSubview:self.titleView]; -} --(void)installConstraints{ - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.centerY.trailing.equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(22)); - }]; - [self.lineVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(36)); - make.height.mas_equalTo(kGetScaleWidth(8)); - make.bottom.equalTo(self.titleView.mas_bottom).mas_offset(-kGetScaleWidth(4)); - make.trailing.equalTo(self.titleView.mas_trailing).mas_offset(-kGetScaleWidth(5)); - }]; -} - --(void)setTagModel:(PIHomeCategoryTitleModel *)tagModel{ - _tagModel = tagModel; - [_titleView setTitle:_tagModel.name forState:UIControlStateNormal]; - _titleView.selected = _tagModel.isChecked; - _titleView.titleLabel.font = _tagModel.isChecked ? kFontSemibold(16):kFontRegular(14); - _lineVeiw.hidden = !_tagModel.isChecked; -} - -#pragma mark - 懒加载 -- (UIImageView *)lineVeiw{ - if(!_lineVeiw){ - _lineVeiw = [UIImageView new]; - _lineVeiw.image = kImage(@"home_slider_bg"); - } - return _lineVeiw; -} -- (UIButton *)titleView{ - if(!_titleView){ - _titleView = [UIButton new]; - [_titleView setTitle:YMLocalizedString(@"XPNewHomeViewController1") forState:UIControlStateNormal]; - [_titleView setTitleColor:UIColorFromRGB(0x1F1B4F) forState:UIControlStateSelected]; - [_titleView setTitleColor:UIColorFromRGB(0x767585) forState:UIControlStateNormal]; - _titleView.titleLabel.font = kFontRegular(14); - _titleView.userInteractionEnabled = NO; - - } - return _titleView; -} -@end diff --git a/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.h b/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.h deleted file mode 100644 index 34029cc..0000000 --- a/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// PIHoemCategoryTitleView.h -// YuMi -// -// Created by duoban on 2023/9/1. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - - -typedef void(^ScrolledHandle)(NSInteger type); - -@interface PIHoemCategoryTitleView : JXCategoryTitleView -@property(nonatomic,assign) NSInteger index; -@property(nonatomic,copy) ScrolledHandle scrolledHandle; -@property(nonatomic,strong) NSMutableArray *titleList; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.m b/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.m deleted file mode 100644 index 75a59f5..0000000 --- a/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.m +++ /dev/null @@ -1,72 +0,0 @@ -// -// PIHoemCategoryTitleView.m -// YuMi -// -// Created by duoban on 2023/9/1. -// - -#import "PIHoemCategoryTitleView.h" -#import "PIHoemCategoryTitleCell.h" -#import "PIHoemCategoryCollectionView.h" -@interface PIHoemCategoryTitleView() - -@property(nonatomic,strong) PIHoemCategoryCollectionView *pi_collectionView; -@end -@implementation PIHoemCategoryTitleView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.pi_collectionView]; - -} --(void)installConstraints{ - - [self.pi_collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; -} --(void)setTitleList:(NSMutableArray *)titleList{ - _titleList = titleList; - self.pi_collectionView.titleList = titleList; -} - - -- (void)setIndex:(NSInteger)index{ - _index = index; - self.pi_collectionView.index = _index; -} -#pragma mark - PIHoemCategoryCollectionViewDelegate -- (void)pi_didSelectItemAtIndex:(NSInteger)index{ - if(self.scrolledHandle){ - self.scrolledHandle(index); - } -} -#pragma mark - 懒加载 -- (PIHoemCategoryCollectionView *)pi_collectionView{ - if (!_pi_collectionView) { - - _pi_collectionView = [[PIHoemCategoryCollectionView alloc] initWithFrame:CGRectZero ]; - _pi_collectionView.delegate = self; - - } - return _pi_collectionView; -} -//- (void)layoutSubviews{ -// [super layoutSubviews]; -// -// //部分使用者为了适配不同的手机屏幕尺寸，JXCategoryView的宽高比要求保持一样，所以它的高度就会因为不同宽度的屏幕而不一样。计算出来的高度，有时候会是位数很长的浮点数，如果把这个高度设置给UICollectionView就会触发内部的一个错误。所以，为了规避这个问题，在这里对高度统一向下取整。 -// //如果向下取整导致了你的页面异常，请自己重新设置JXCategoryView的高度，保证为整数即可。 -// -// CGRect targetFrame = CGRectMake(0, 0, self.bounds.size.width - kGetScaleWidth(159), floor(self.bounds.size.height)); -// self.pi_collectionView.frame = targetFrame; -// -// -//} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/Model/HomeEveryOneSearchModel.h b/YuMi/Modules/YMNewHome/View/Search/Model/HomeEveryOneSearchModel.h deleted file mode 100644 index d41af4c..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/Model/HomeEveryOneSearchModel.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// HomeEveryOneSearchModel.h -// YUMI -// -// Created by GLEN on 2022/11/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface HomeEveryOneSearchModel : PIBaseModel - -@property (nonatomic, copy) NSString *sid; -@property (nonatomic, copy) NSString *relationRoomUid; -@property (nonatomic, copy) NSString *word; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/Model/HomeEveryOneSearchModel.m b/YuMi/Modules/YMNewHome/View/Search/Model/HomeEveryOneSearchModel.m deleted file mode 100644 index 29f569e..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/Model/HomeEveryOneSearchModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// HomeEveryOneSearchModel.m -// YUMI -// -// Created by GLEN on 2022/11/29. -// - -#import "HomeEveryOneSearchModel.h" - -@implementation HomeEveryOneSearchModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"sid":@"id"}; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/Model/HomeLiveRoomModel.h b/YuMi/Modules/YMNewHome/View/Search/Model/HomeLiveRoomModel.h deleted file mode 100644 index f989159..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/Model/HomeLiveRoomModel.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// HomeLiveRoomModel.h -// YUMI -// -// Created by YUMI on 2022/3/2. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface HomeLiveRoomModel : PIBaseModel -///昵称 -@property (nonatomic, copy) NSString *nick; -///头像 -@property (nonatomic, copy) NSString *avatar; -///用户的id -@property (nonatomic,assign) NSInteger uid; -///在房间中用户的uid -@property (nonatomic, assign) NSInteger roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/Model/HomeLiveRoomModel.m b/YuMi/Modules/YMNewHome/View/Search/Model/HomeLiveRoomModel.m deleted file mode 100644 index df9c971..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/Model/HomeLiveRoomModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// HomeLiveRoomModel.m -// YUMI -// -// Created by YUMI on 2022/3/2. -// - -#import "HomeLiveRoomModel.h" - -@implementation HomeLiveRoomModel - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.h b/YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.h deleted file mode 100644 index a04b30d..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// HomeSearchResultModel.h -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import -#import "YUMINNNN.h" -#import "UserLevelVo.h" -#import "UserInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - - -@interface HomeSearchResultModel : PIBaseModel -@property(nonatomic,strong) UserLevelVo *userLevelVo; -///头像 -@property (nonatomic,copy) NSString *avatar; -///在线人数 -@property (nonatomic,assign) NSInteger onlineNum; -///房主的uid -@property (nonatomic,copy) NSString *uid; -///生日 -@property(nonatomic,assign) long birth; -///标题 -@property (nonatomic,copy) NSString *title; -///用户的昵称 -@property (nonatomic,copy) NSString *nick; -///erban -@property (nonatomic,copy) NSString *erbanNo; -///是否可用 -@property (nonatomic,assign) BOOL valid; -///性别 -@property (nonatomic,assign) GenderType gender; -///搜索用户的时候 如果用户在房间中的话 就有roomUid -@property (nonatomic,copy) NSString *roomUid; - -- (instancetype)initFromUserInfo:(UserInfoModel *)model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.m b/YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.m deleted file mode 100644 index bc28832..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// HomeSearchResultModel.m -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "HomeSearchResultModel.h" - -@implementation HomeSearchResultModel - -- (instancetype)initFromUserInfo:(UserInfoModel *)model { - if (self = [super init]) { - self.userLevelVo = model.userLevelVo; - self.avatar = model.avatar; - self.uid = @(model.uid).stringValue; - self.nick = model.nick; - self.erbanNo = @(model.erbanNo).stringValue; - } - return self; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/Presenter/XPHomeSearchPresenter.h b/YuMi/Modules/YMNewHome/View/Search/Presenter/XPHomeSearchPresenter.h deleted file mode 100644 index d3d1726..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/Presenter/XPHomeSearchPresenter.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMHomeSearchPresenter.h -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "BaseMvpPresenter.h" - -@class UserInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface XPHomeSearchPresenter : BaseMvpPresenter - -/// 搜索房间或者用户 -/// @param key 搜索的关键字 -/// @param type 类型 1 房间 2 用户 -- (void)searchRoomList:(NSString *)key type:(NSString *)type; - -/// 获取首页推荐列表 -- (void)getHomeRecommendRoomList; - -- (void)getFriends:(void(^)(NSArray *users))success - failure:(void(^)(NSError *error))failure; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/Presenter/XPHomeSearchPresenter.m b/YuMi/Modules/YMNewHome/View/Search/Presenter/XPHomeSearchPresenter.m deleted file mode 100644 index 337a696..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/Presenter/XPHomeSearchPresenter.m +++ /dev/null @@ -1,70 +0,0 @@ -// -// YMHomeSearchPresenter.m -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "XPHomeSearchPresenter.h" -#import "Api+Home.h" -#import "Api+Mine.h" -#import "UserInfoModel.h" -#import -#import "XPHomeSearchProtocol.h" -#import "AccountInfoStorage.h" -#import "HomeSearchResultModel.h" -#import "HomeRecommendRoomModel.h" - -@implementation XPHomeSearchPresenter - - -/// 搜索房间或者用户 -/// @param key 搜索的关键字 -/// @param type 类型 1 房间 2 用户 -- (void)searchRoomList:(NSString *)key type:(NSString *)type { - [Api searchComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomeSearchResultModel modelsWithArray:data.data]; - [[self getView] searchRoomSuccess:array type:type]; - } showLoading:YES] key:key type:type page:@"1" pageSize:@"50"]; -} - -/// 获取首页推荐列表 -- (void)getHomeRecommendRoomList { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api homeRecommendRoomList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [HomeRecommendRoomModel modelsWithArray:data.data]; - [[self getView] searchRoomGetRecommendSuccess:array]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] searchRoomGetRecommendFail]; - }] uid:uid]; -} - -- (void)getFriends:(void(^)(NSArray *users))success - failure:(void(^)(NSError *error))failure { - NSArray * array = [[NIMSDK sharedSDK].userManager myFriends]; - if (array.count > 0) { - NSMutableArray * uidsArray = [NSMutableArray array]; - for (int i = 0; i< array.count; i++) { - NIMUser * user = [array xpSafeObjectAtIndex:i]; - [uidsArray addObject:user.userId]; - } - NSString *uids = [uidsArray componentsJoinedByString:@","]; - [Api getUsersListInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *users= [UserInfoModel modelsWithArray:data.data]; - if (success) { - success(users); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] uids:uids]; - } else { - if (success) { - success(@[]); - } - } -} - - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/Presenter/XPInRoomRecordPresenter.h b/YuMi/Modules/YMNewHome/View/Search/Presenter/XPInRoomRecordPresenter.h deleted file mode 100644 index 4e720c3..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/Presenter/XPInRoomRecordPresenter.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMInRoomRecordPresenter.h -// YUMI -// -// Created by YUMI on 2022/9/6. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPInRoomRecordPresenter : BaseMvpPresenter - -///获取进房记录 -- (void)getInRoomRecordList; - -/// 清除进房记录 -- (void)cleanInRoomRecord; - -///大家都在搜 -- (void)getEveryoneSearchList; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/Presenter/XPInRoomRecordPresenter.m b/YuMi/Modules/YMNewHome/View/Search/Presenter/XPInRoomRecordPresenter.m deleted file mode 100644 index bda7701..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/Presenter/XPInRoomRecordPresenter.m +++ /dev/null @@ -1,48 +0,0 @@ -// -// YMInRoomRecordPresenter.m -// YUMI -// -// Created by YUMI on 2022/9/6. -// - -#import "XPInRoomRecordPresenter.h" -#import "Api+Mine.h" -#import "AccountInfoStorage.h" -#import "XPMineFootPrintModel.h" -#import "HomeEveryOneSearchModel.h" -#import "XPInRoomRecordProtocol.h" - -@implementation XPInRoomRecordPresenter - -///获取进房记录 -- (void)getInRoomRecordList { - NSString *uid = [AccountInfoStorage instance].getUid; - @kWeakify(self); - [Api requestFootPrint:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray *array = [XPMineFootPrintModel modelsWithArray:data.data]; - [[self getView] getInRoomRecordSuccess:array]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - }] uid:uid page:@"1" pageSize:@"100"]; -} - -/// 清除进房记录 -- (void)cleanInRoomRecord { - NSString *uid = [AccountInfoStorage instance].getUid; - @kWeakify(self); - [Api requestCleanFootPrint:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] cleanInRoomRecordSuccess]; - }] uid:uid roomUid:@""]; -} - -///大家都在搜 -- (void)getEveryoneSearchList { - NSString *uid = [AccountInfoStorage instance].getUid; - [Api requestEveryoneSearch:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *array = [HomeEveryOneSearchModel modelsWithArray:data.data]; - [[self getView] getEveryoneSearchListSuccess:array]; - }] uid:uid]; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/Protocol/XPHomeSearchProtocol.h b/YuMi/Modules/YMNewHome/View/Search/Protocol/XPHomeSearchProtocol.h deleted file mode 100644 index 837f0c3..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/Protocol/XPHomeSearchProtocol.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMHomeSearchProtocol.h -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@protocol XPHomeSearchProtocol - - -///搜索成功 -- (void)searchRoomSuccess:(NSArray *)data type:(NSString *)type; - -@optional -///搜索页获取推荐房间成功 -- (void)searchRoomGetRecommendSuccess:(NSArray *)data; - -@optional -///搜索页获取推荐房间失败 -- (void)searchRoomGetRecommendFail; - -@optional -/// 大家都在搜房间列表成功 -- (void)everyoneSearchListSuccess:(NSArray *)list; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/Protocol/XPInRoomRecordProtocol.h b/YuMi/Modules/YMNewHome/View/Search/Protocol/XPInRoomRecordProtocol.h deleted file mode 100644 index 4ce5aca..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/Protocol/XPInRoomRecordProtocol.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// YMInRoomRecordProtocol.h -// YUMI -// -// Created by YUMI on 2022/9/6. -// - -#import - -@class XPMineFootPrintModel; -@protocol XPInRoomRecordProtocol - -///获取个播浏览记录成功 -//- (void)getOnceLookRoomListSuccess:(HomeLiveLookRecordModel *)data; -// -/////获取所有的tag成功 -//- (void)getHomeLiveTagListSuccess:(NSArray *)array; -/////获取所有的tag失败 -//- (void)getHomeLiveTagListFail:(NSArray *)array; -// -/////获取个播房成功 -//- (void)getAnchorRoomListSuccess:(NSArray *)array; - -///获取进房记录成功 -- (void)getInRoomRecordSuccess:(NSArray *)array; - -///清除进房记录成功 -- (void)cleanInRoomRecordSuccess; - -///获取大家都在搜列表成功 -- (void)getEveryoneSearchListSuccess:(NSArray *)array; - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeAttentionCollectionViewCell.h b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeAttentionCollectionViewCell.h deleted file mode 100644 index 6e0e2e8..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeAttentionCollectionViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMHomeAttentionCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2022/3/2. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class HomeLiveRoomModel, XPMineFootPrintModel; -@interface XPHomeAttentionCollectionViewCell : UICollectionViewCell - -@property (nonatomic,strong) HomeLiveRoomModel *liveRoom; -@property (nonatomic, strong) XPMineFootPrintModel *recordRoom; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeAttentionCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeAttentionCollectionViewCell.m deleted file mode 100644 index 65cbdad..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeAttentionCollectionViewCell.m +++ /dev/null @@ -1,176 +0,0 @@ -// -// YMHomeAttentionCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2022/3/2. -// - -#import "XPHomeAttentionCollectionViewCell.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -///Model -#import "HomeLiveRoomModel.h" -#import "XPMineFootPrintModel.h" - -@interface XPHomeAttentionCollectionViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///音符背景 -@property (nonatomic, strong) UIImageView *noteBgImageView; -///直播中 -@property (nonatomic, strong) UILabel *liveLabel; -///音符动效 -@property (nonatomic,strong) UIImageView *noteImageView; -///动画的数组 -@property (nonatomic,strong) NSArray *animationArray; -@end - -@implementation XPHomeAttentionCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickLabel]; - - [self.avatarImageView addSubview:self.noteBgImageView]; - [self.noteBgImageView addSubview:self.noteImageView]; - [self.noteBgImageView addSubview:self.liveLabel]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(56, 56)); - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView); - }]; - - [self.noteBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.avatarImageView); - make.height.mas_equalTo(14); - }]; - - [self.noteImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.noteBgImageView).mas_offset(15); - make.centerY.mas_equalTo(self.noteBgImageView).mas_offset(-1); - make.height.mas_equalTo(7); - make.width.mas_equalTo(8); - }]; - [self.liveLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.noteImageView.mas_trailing).mas_offset(2); - make.centerY.mas_equalTo(self.noteImageView); - }]; - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.avatarImageView); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(4); - }]; -} - -#pragma mark - Getters And Setters -- (void)setLiveRoom:(HomeLiveRoomModel *)liveRoom { - _liveRoom = liveRoom; - if (_liveRoom) { - self.avatarImageView.imageUrl = _liveRoom.avatar; - self.nickLabel.text = _liveRoom.nick; - self.noteBgImageView.hidden = _liveRoom.roomUid <=0; - self.noteImageView.hidden = _liveRoom.roomUid <=0; - if (_liveRoom.roomUid > 0) { - self.noteImageView.animationImages = self.animationArray; - self.noteImageView.animationDuration = 0.5; - [self.noteImageView startAnimating]; - }else { - self.noteImageView.animationImages = nil; - [self.noteImageView stopAnimating]; - } - } -} - -- (void)setRecordRoom:(XPMineFootPrintModel *)recordRoom { - _recordRoom = recordRoom; - if (recordRoom) { - self.avatarImageView.imageUrl = recordRoom.avatar; - self.nickLabel.text = recordRoom.title; - self.noteBgImageView.hidden = YES; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 56/2; - _avatarImageView.layer.borderColor = [UIColor whiteColor].CGColor; - _avatarImageView.layer.borderWidth = 1; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:12]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _nickLabel.textAlignment = NSTextAlignmentCenter; - } - return _nickLabel; -} - -- (UIImageView *)noteBgImageView { - if (!_noteBgImageView) { - _noteBgImageView = [[UIImageView alloc] init]; - _noteBgImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFA936), UIColorFromRGB(0xFFCB47)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(52, 14)]; - } - return _noteBgImageView; -} - -- (UILabel *)liveLabel { - if (!_liveLabel) { - _liveLabel = [[UILabel alloc] init]; - _liveLabel.font = [UIFont systemFontOfSize:8 weight:UIFontWeightMedium]; - _liveLabel.textColor = [UIColor whiteColor]; - _liveLabel.text = YMLocalizedString(@"XPHomeAttentionCollectionViewCell0"); - } - return _liveLabel; -} - -- (UIImageView *)noteImageView { - if (!_noteImageView) { - _noteImageView = [[UIImageView alloc] init]; - _noteImageView.userInteractionEnabled = YES; - _noteImageView.animationRepeatCount = 0; - } - return _noteImageView; -} - -- (NSArray *)animationArray { - if (!_animationArray) { - NSMutableArray * array = [NSMutableArray array]; - for (int i = 0; i < 10; i++) { - NSString * imageName = [NSString stringWithFormat:@"home_note_0000%d",i]; - UIImage * image = [UIImage imageNamed:imageName]; - [array addObject:image]; - } - _animationArray = [array copy]; - } - return _animationArray; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeCollectRoomTableViewCell.h b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeCollectRoomTableViewCell.h deleted file mode 100644 index 340de13..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeCollectRoomTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMHomeCollectRoomTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/3/2. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class HomeCollectRoomModel; -@interface XPHomeCollectRoomTableViewCell : UITableViewCell -@property (nonatomic,strong) HomeCollectRoomModel *roomInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeCollectRoomTableViewCell.m b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeCollectRoomTableViewCell.m deleted file mode 100644 index 1f8456f..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeCollectRoomTableViewCell.m +++ /dev/null @@ -1,377 +0,0 @@ -// -// YMHomeCollectRoomTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/3/2. -// 收藏房间 - -#import "XPHomeCollectRoomTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "NSArray+Safe.h" -#import "UIImage+Utils.h" -///Model -#import "HomeCollectRoomModel.h" - -@interface XPHomeCollectRoomTableViewCell () -///是否在PK中 -@property (nonatomic,strong) UIButton *pkButton; -///显示头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///显示背景 -@property (nonatomic,strong) UIImageView *backImageView; -///显示名字 -@property (nonatomic,strong) UILabel *nickLabel; -///显示tag -@property (nonatomic,strong) NetImageView *tagImageView; -///显示id -@property (nonatomic,strong) UILabel *idLabel; -///容器 -@property (nonatomic,strong) UIImageView * personContainerView; -///显示🔥 -@property (nonatomic,strong) UIImageView *hotImageView; -///显示在线人数 -@property (nonatomic,strong) UILabel *numberLabel; -///房间在线人数 -@property (nonatomic,strong) UIView *micContainerView; -///第一个 -@property (nonatomic,strong) NetImageView *firstImageView; -///第二个 -@property (nonatomic,strong) NetImageView *secondImageView; -///第三个 -@property (nonatomic,strong) NetImageView *thirdImageView; -///第四个 -@property (nonatomic,strong) NetImageView *fourImageView; -///第五个 -@property (nonatomic,strong) NetImageView *fifImageView; -///用户的数组 -@property (nonatomic,strong) NSArray *micUserArray; -@end - -@implementation XPHomeCollectRoomTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.backImageView]; - [self.contentView addSubview:self.avatarImageView]; - - [self.backImageView addSubview:self.nickLabel]; - [self.backImageView addSubview:self.tagImageView]; - [self.backImageView addSubview:self.idLabel]; - [self.backImageView addSubview:self.personContainerView]; - [self.backImageView addSubview:self.micContainerView]; - - [self.personContainerView addSubview:self.hotImageView]; - [self.personContainerView addSubview:self.numberLabel]; - - [self.avatarImageView addSubview:self.pkButton]; - [self.micContainerView addSubview:self.fifImageView]; - [self.micContainerView addSubview:self.fourImageView]; - [self.micContainerView addSubview:self.thirdImageView]; - [self.micContainerView addSubview:self.secondImageView]; - [self.micContainerView addSubview:self.firstImageView]; - self.micUserArray = @[self.firstImageView, self.secondImageView, self.thirdImageView, self.fourImageView, self.fifImageView]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(74, 74)); - make.leading.mas_equalTo(self.contentView).offset(15); - make.top.mas_equalTo(self.contentView); - }]; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.contentView).offset(8); - make.height.mas_equalTo(66); - }]; - - [self.pkButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(44, 16)); - make.leading.top.mas_equalTo(self.avatarImageView); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backImageView).offset(82); - make.top.mas_equalTo(self.backImageView).offset(12); - make.trailing.mas_lessThanOrEqualTo(self.personContainerView.mas_leading).offset(-5); - }]; - - [self.tagImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(43, 18)); - make.leading.mas_equalTo(self.nickLabel); - make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(13); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.tagImageView); - make.leading.mas_equalTo(self.tagImageView.mas_trailing).offset(8); - }]; - - [self.personContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.hotImageView.mas_leading).offset(-14); - make.height.mas_equalTo(21); - make.top.mas_equalTo(self.backImageView); - make.trailing.mas_equalTo(self.backImageView); - }]; - - [self.hotImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(13, 13)); - make.trailing.mas_equalTo(self.numberLabel.mas_leading).offset(-2); - make.centerY.mas_equalTo(self.personContainerView); - }]; - - [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.personContainerView.mas_trailing).offset(-5); - make.centerY.mas_equalTo(self.personContainerView); - }]; - - [self.micContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.backImageView).offset(-13); - make.height.mas_equalTo(16); - make.centerY.mas_equalTo(self.tagImageView); - make.leading.mas_equalTo(self.fifImageView.mas_leading).offset(-5); - }]; - - [self.firstImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(16, 16)); - make.trailing.mas_equalTo(self.micContainerView); - make.centerY.mas_equalTo(self.micContainerView); - }]; - - [self.secondImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.firstImageView); - make.trailing.mas_equalTo(self.firstImageView.mas_leading).offset(2); - }]; - - [self.thirdImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.firstImageView); - make.trailing.mas_equalTo(self.secondImageView.mas_leading).offset(2); - }]; - - [self.fourImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.firstImageView); - make.trailing.mas_equalTo(self.thirdImageView.mas_leading).offset(2); - }]; - - [self.fifImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.firstImageView); - make.trailing.mas_equalTo(self.fourImageView.mas_leading).offset(2); - }]; -} -#pragma mark - Getters And Setters -- (void)setRoomInfo:(HomeCollectRoomModel *)roomInfo { - _roomInfo = roomInfo; - if (_roomInfo) { - self.avatarImageView.imageUrl = _roomInfo.roomAvatar; - self.nickLabel.text = _roomInfo.roomName; - self.tagImageView.imageUrl = _roomInfo.tagPict; - self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _roomInfo.erbanNo]; - self.numberLabel.text = _roomInfo.roomOnlineNum; - self.pkButton.hidden = !_roomInfo.crossPking; - if (_roomInfo.micUsers.count > 0) { - self.micContainerView.hidden = NO; - for (NSInteger i = 0; i < self.micUserArray.count; i++) { - NetImageView * imageView = [self.micUserArray xpSafeObjectAtIndex:i]; - if (i< _roomInfo.micUsers.count) { - HomePlayMicUserModel * micUserInfo = [_roomInfo.micUsers xpSafeObjectAtIndex:i]; - imageView.imageUrl = micUserInfo.avatar; - imageView.hidden = NO; - } else { - imageView.hidden = YES; - } - } - } else { - self.micContainerView.hidden = YES; - } - - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 8; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UIButton *)pkButton { - if (!_pkButton) { - _pkButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_pkButton setTitle:YMLocalizedString(@"XPHomeCollectRoomTableViewCell0") forState:UIControlStateNormal]; - [_pkButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _pkButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_pkButton setBackgroundImage:[UIImage imageNamed:@"home_like_across_pk_bg"] forState:UIControlStateNormal]; - _pkButton.layer.masksToBounds = YES; - _pkButton.layer.cornerRadius = 10; - } - return _pkButton; -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.layer.masksToBounds = YES; - _backImageView.layer.shadowColor = UIColorRGBAlpha(0xE5E5F2, 0.34).CGColor; - _backImageView.layer.cornerRadius = 12; - _backImageView.layer.shadowOffset = CGSizeMake(4, 4); - _backImageView.image = [UIImage imageWithColor:[DJDKMIMOMColor appCellBackgroundColor]]; - } - return _backImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:14]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (NetImageView *)tagImageView { - if (!_tagImageView) { - _tagImageView = [[NetImageView alloc] init]; - } - return _tagImageView; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:12]; - _idLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _idLabel; -} - -- (UIImageView *)personContainerView { - if (!_personContainerView) { - _personContainerView = [[UIImageView alloc] init]; - _personContainerView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFFFFF), UIColorFromRGB(0xF3F3FA)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(20, 16)]; - } - return _personContainerView; -} - -- (UIImageView *)hotImageView { - if (!_hotImageView) { - _hotImageView = [[UIImageView alloc] init]; - _hotImageView.userInteractionEnabled = YES; - _hotImageView.image = [UIImage imageNamed:@"room_like_collect_room_hot"]; - } - return _hotImageView; -} - -- (UILabel *)numberLabel { - if (!_numberLabel) { - _numberLabel = [[UILabel alloc] init]; - _numberLabel.font = [UIFont boldSystemFontOfSize:12]; - _numberLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _numberLabel; -} - -- (UIView *)micContainerView { - if (!_micContainerView) { - _micContainerView = [[UIView alloc] init]; - _micContainerView.backgroundColor = [UIColor clearColor]; - } - return _micContainerView; -} - -- (NetImageView *)firstImageView { - if (!_firstImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _firstImageView = [[NetImageView alloc] initWithConfig:config]; - _firstImageView.layer.masksToBounds = YES; - _firstImageView.layer.cornerRadius = 8; - _firstImageView.layer.borderColor = [UIColor whiteColor].CGColor; - _firstImageView.layer.borderWidth = 1; - _firstImageView.backgroundColor= [UIColor redColor]; - } - return _firstImageView; -} - -- (NetImageView *)secondImageView { - if (!_secondImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _secondImageView = [[NetImageView alloc] initWithConfig:config]; - _secondImageView.layer.masksToBounds = YES; - _secondImageView.layer.cornerRadius = 8; - _secondImageView.layer.borderColor = [UIColor whiteColor].CGColor; - _secondImageView.layer.borderWidth = 1; - _secondImageView.backgroundColor= [UIColor yellowColor]; - } - return _secondImageView; -} - -- (NetImageView *)thirdImageView { - if (!_thirdImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _thirdImageView = [[NetImageView alloc] initWithConfig:config]; - _thirdImageView.layer.masksToBounds = YES; - _thirdImageView.layer.cornerRadius = 8; - _thirdImageView.layer.borderColor = [UIColor whiteColor].CGColor; - _thirdImageView.layer.borderWidth = 1; - _thirdImageView.backgroundColor= [UIColor blueColor]; - } - return _thirdImageView; -} - -- (NetImageView *)fourImageView { - if (!_fourImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _fourImageView = [[NetImageView alloc] initWithConfig:config]; - _fourImageView.layer.masksToBounds = YES; - _fourImageView.layer.cornerRadius = 8; - _fourImageView.layer.borderColor = [UIColor whiteColor].CGColor; - _fourImageView.layer.borderWidth = 1; - } - return _fourImageView; -} - - -- (NetImageView *)fifImageView { - if (!_fifImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _fifImageView = [[NetImageView alloc] initWithConfig:config]; - _fifImageView.layer.masksToBounds = YES; - _fifImageView.layer.cornerRadius = 8; - _fifImageView.layer.borderColor = [UIColor whiteColor].CGColor; - _fifImageView.layer.borderWidth = 1; - } - return _fifImageView; -} - - - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeRedommendCollectionViewCell.h b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeRedommendCollectionViewCell.h deleted file mode 100644 index db738a6..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeRedommendCollectionViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMHomeRedommendCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2022/9/23. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class HomeRecommendRoomModel; -@interface XPHomeRedommendCollectionViewCell : UICollectionViewCell - -@property (nonatomic,strong, nullable) HomeRecommendRoomModel *recommendRoomInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeRedommendCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeRedommendCollectionViewCell.m deleted file mode 100644 index 25c0311..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeRedommendCollectionViewCell.m +++ /dev/null @@ -1,219 +0,0 @@ -// -// YMHomeRedommendCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2022/9/23. -// - -#import "XPHomeRedommendCollectionViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "HomeRecommendRoomModel.h" - -@interface XPHomeRedommendCollectionViewCell () -///背景 -@property (nonatomic,strong) UIView * backView; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///容器 -@property (nonatomic,strong) UIView * personContainerView; -///显示🔥 -@property (nonatomic,strong) UIImageView *hotImageView; -///显示在线人数 -@property (nonatomic,strong) UILabel *numberLabel; -///名字下的阴影 -@property (nonatomic,strong) UIImageView *shadowImageView; -///显示名字 -@property (nonatomic,strong) UILabel *nickLabel; -///标签 -@property (nonatomic,strong) UIButton *tagButton; -@end - -@implementation XPHomeRedommendCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backView]; - - [self.backView addSubview:self.avatarImageView]; - [self.backView addSubview:self.shadowImageView]; - [self.backView addSubview:self.personContainerView]; - [self.backView addSubview:self.nickLabel]; - [self.backView addSubview:self.tagButton]; - - [self.personContainerView addSubview:self.hotImageView]; - [self.personContainerView addSubview:self.numberLabel]; -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.hotImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(13, 13)); - make.trailing.mas_equalTo(self.numberLabel.mas_leading).offset(-2); - make.centerY.mas_equalTo(self.personContainerView); - }]; - - [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.personContainerView.mas_trailing).offset(-4); - make.centerY.mas_equalTo(self.personContainerView); - }]; - - [self.shadowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView); - make.height.mas_equalTo(48); - make.bottom.mas_equalTo(self.backView); - }]; - - [self.tagButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(self.backView); - make.size.mas_equalTo(CGSizeMake(54, 20)); - }]; - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).offset(6); - make.trailing.mas_equalTo(self.backView).offset(-6); - make.centerY.mas_equalTo(self.shadowImageView); - }]; - - [self.personContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.hotImageView.mas_leading).offset(-4); - make.height.mas_equalTo(16); - make.top.mas_equalTo(self.backView).offset(4); - make.trailing.mas_equalTo(self.backView).offset(-4); - }]; - - [self.shadowImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(28); - }]; -} - - -#pragma mark - Getters And Setters -- (void)setRecommendRoomInfo:(HomeRecommendRoomModel *)recommendRoomInfo { - _recommendRoomInfo = recommendRoomInfo; - if (_recommendRoomInfo) { - self.avatarImageView.imageUrl = _recommendRoomInfo.avatar; - self.numberLabel.text = [NSString stringWithFormat:@"%ld", _recommendRoomInfo.onlineNum]; - self.nickLabel.text = _recommendRoomInfo.title; - self.personContainerView.hidden = NO; - self.tagButton.hidden = NO; - if (_recommendRoomInfo.crossPking) { - [self.tagButton setTitle:YMLocalizedString(@"XPHomeRedommendCollectionViewCell0") forState:UIControlStateNormal]; - } else { - if (_recommendRoomInfo.iconContent.length > 0) { - [self.tagButton setTitle:_recommendRoomInfo.iconContent forState:UIControlStateNormal]; - } else { - self.tagButton.hidden = YES; - } - } - - } else { - self.avatarImageView.image = [UIImage imageNamed:@"home_recommend_room_placeholder"]; - self.nickLabel.text = YMLocalizedString(@"XPHomeRedommendCollectionViewCell1"); - self.personContainerView.hidden = YES; - self.tagButton.hidden = YES; - } -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [UIColor clearColor]; - _backView.layer.masksToBounds = YES; - _backView.layer.cornerRadius = 8; - _backView.layer.shadowColor = UIColorRGBAlpha(0xE5E5F2, 0.34).CGColor; - _backView.layer.shadowOffset = CGSizeMake(3, 3); - } - return _backView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 8; - } - return _avatarImageView; -} - -- (UIButton *)tagButton { - if (!_tagButton) { - _tagButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_tagButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _tagButton.titleLabel.font = [UIFont systemFontOfSize:10]; - [_tagButton setBackgroundImage:[UIImage imageNamed:@"home_recommend_tag_bg"] forState:UIControlStateNormal]; - } - return _tagButton; -} - -- (UIView *)personContainerView { - if (!_personContainerView) { - _personContainerView = [[UIView alloc] init]; - _personContainerView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.29]; - _personContainerView.layer.masksToBounds = YES; - _personContainerView.layer.cornerRadius = 8; - } - return _personContainerView; -} - -- (UIImageView *)hotImageView { - if (!_hotImageView) { - _hotImageView = [[UIImageView alloc] init]; - _hotImageView.userInteractionEnabled = YES; - _hotImageView.image = [UIImage imageNamed:@"room_like_collect_room_hot"]; - } - return _hotImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont boldSystemFontOfSize:12]; - _nickLabel.textColor = [UIColor whiteColor]; - _nickLabel.textAlignment = NSTextAlignmentCenter; - } - return _nickLabel; -} - -- (UILabel *)numberLabel { - if (!_numberLabel) { - _numberLabel = [[UILabel alloc] init]; - _numberLabel.font = [UIFont systemFontOfSize:9]; - _numberLabel.textColor = [UIColor whiteColor]; - } - return _numberLabel; -} - -- (UIImageView *)shadowImageView { - if (!_shadowImageView) { - _shadowImageView = [[UIImageView alloc] init]; - _shadowImageView.userInteractionEnabled = YES; - _shadowImageView.image = [UIImage imageNamed:@"home_recommend_nick_shadow_bg"]; - } - return _shadowImageView; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeSearchRecordCell.h b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeSearchRecordCell.h deleted file mode 100644 index 23416b8..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeSearchRecordCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMHomeSearchRecordCell.h -// YUMI -// -// Created by YUMI on 2022/9/5. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPHomeSearchRecordCell : UICollectionViewCell - -@property (nonatomic, copy) NSString *recordString; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeSearchRecordCell.m b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeSearchRecordCell.m deleted file mode 100644 index f312f55..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeSearchRecordCell.m +++ /dev/null @@ -1,51 +0,0 @@ -// -// YMHomeSearchRecordCell.m -// YUMI -// -// Created by YUMI on 2022/9/5. -// - -#import "XPHomeSearchRecordCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPHomeSearchRecordCell () - -///昵称 -@property (nonatomic,strong) UILabel *titleLabel; - -@end - -@implementation XPHomeSearchRecordCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - self.backgroundColor = [UIColor whiteColor]; - self.layer.cornerRadius = 13; - self.layer.masksToBounds = YES; - [self addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - }]; - } - return self; -} -- (void)setRecordString:(NSString *)recordString { - self.titleLabel.text = recordString; -} - -#pragma mark - Getter & Setter -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.font = [UIFont systemFontOfSize:12]; - } - return _titleLabel; -} - - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.h b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.h deleted file mode 100644 index 19946cf..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMSearchListTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, SearchType){ - ///搜索房间 - SearchType_Room = 1, - ///搜索用户 - SearchType_Users = 2, -}; - -@class HomeSearchResultModel, HomeRecommendRoomModel; -@interface XPSearchListTableViewCell : UITableViewCell - -///配置数据 -- (void)configData:(HomeSearchResultModel *)resultModel type:(SearchType)type; - -///配置大家都在搜房间列表 -- (void)configEveryoneData:(HomeRecommendRoomModel *)resultModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m deleted file mode 100644 index fbbe374..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m +++ /dev/null @@ -1,266 +0,0 @@ -// -// YMSearchListTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "XPSearchListTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "HomeSearchResultModel.h" -#import "HomeRecommendRoomModel.h" -///View -#import "NetImageView.h" - - -@interface XPSearchListTableViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///名字的容器 -@property (nonatomic,strong) UIStackView *nameStackView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///显示id -@property (nonatomic,strong) UILabel *idLabel; -///分割线 -@property (nonatomic,strong) UIView * lineView; -///容器 -@property (nonatomic,strong) UIView * numberView; -///音符 -@property (nonatomic,strong) UIImageView *noteImageView; -///数量 -@property (nonatomic,strong) UILabel *numberLabel; -///等级 -@property (nonatomic,strong) NetImageView *experImageView; -///魅力等级 -@property (nonatomic,strong) NetImageView *charmImageView; -@end - -@implementation XPSearchListTableViewCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Public Method -- (void)configData:(HomeSearchResultModel *)resultModel type:(SearchType)type { - if (resultModel) { - self.avatarImageView.imageUrl = resultModel.avatar; - NSString *name = type == SearchType_Room ? resultModel.title : resultModel.nick; - self.nickLabel.text = name.length > 8 ? [NSString stringWithFormat:@"%@...",[name substringToIndex:8]]:name; - self.idLabel.text = [NSString stringWithFormat:@"ID:%@", resultModel.erbanNo]; - self.charmImageView.imageUrl = resultModel.userLevelVo.charmUrl; - self.experImageView.imageUrl = resultModel.userLevelVo.experUrl; - if (type == SearchType_Users) { - self.numberLabel.text = YMLocalizedString(@"XPSearchListTableViewCell1"); - self.numberView.hidden = resultModel.roomUid.length <= 0; - } else { - if (resultModel.onlineNum > 100) { - self.numberLabel.text = [NSString stringWithFormat:@"%ld", resultModel.onlineNum]; - } else { - self.numberLabel.text = [NSString stringWithFormat:@" %ld ", resultModel.onlineNum]; - } - self.numberView.hidden = !resultModel.valid; - } - } -} - -- (void)configEveryoneData:(HomeRecommendRoomModel *)resultModel { - if (resultModel) { - self.avatarImageView.imageUrl = resultModel.avatar; - self.nickLabel.text = resultModel.title ; - self.idLabel.text = [NSString stringWithFormat:@"ID:%@", resultModel.erbanNo]; - - if (resultModel.onlineNum > 100) { - self.numberLabel.text = [NSString stringWithFormat:@"%ld", resultModel.onlineNum]; - } else { - self.numberLabel.text = [NSString stringWithFormat:@" %ld ", resultModel.onlineNum]; - } - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nameStackView]; - [self.contentView addSubview:self.idLabel]; - [self.contentView addSubview:self.numberView]; - [self.contentView addSubview:self.lineView]; - - [self.numberView addSubview:self.numberLabel]; - [self.numberView addSubview:self.noteImageView]; - - [self.nameStackView addArrangedSubview:self.nickLabel]; - [self.nameStackView addArrangedSubview:self.experImageView]; - [self.nameStackView addArrangedSubview:self.charmImageView]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(45, 45)); - make.leading.mas_equalTo(self.contentView).offset(15); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(13); - make.height.mas_equalTo(20); - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-1.5); - }]; - - - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameStackView); - make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(1.5); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameStackView); - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.bottom.mas_equalTo(self.contentView); - make.height.mas_equalTo(1); - }]; - - [self.numberView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(18); - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.noteImageView.mas_leading).offset(-8); - }]; - - [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.numberView); - make.trailing.mas_equalTo(self.numberView.mas_trailing).offset(-5); - }]; - - [self.noteImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.numberView); - make.size.mas_equalTo(CGSizeMake(10, 9)); - make.trailing.mas_equalTo(self.numberLabel.mas_leading).offset(-3); - }]; - - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(36)); - make.height.mas_equalTo(kGetScaleWidth(18)); - - }]; - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(36)); - make.height.mas_equalTo(kGetScaleWidth(18)); - - }]; -} - -#pragma mark - Getters And Setters -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 45/2; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _avatarImageView; -} - -- (UIStackView *)nameStackView { - if (!_nameStackView) { - _nameStackView = [[UIStackView alloc] init]; - _nameStackView.axis = UILayoutConstraintAxisHorizontal; - _nameStackView.distribution = UIStackViewDistributionFill; - _nameStackView.alignment = UIStackViewAlignmentCenter; - _nameStackView.spacing = 2; - } - return _nameStackView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.text = YMLocalizedString(@"XPSearchListTableViewCell3"); - _nickLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:15]; - _nickLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _nickLabel; -} - - - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:13]; - _idLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _idLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (UIView *)numberView { - if (!_numberView) { - _numberView = [[UIView alloc] init]; - _numberView.backgroundColor = [UIColor clearColor]; - _numberView.layer.masksToBounds = YES; - _numberView.layer.cornerRadius = 18/2; - _numberView.layer.borderColor = [DJDKMIMOMColor appEmphasizeColor].CGColor; - _numberView.layer.borderWidth = 1; - } - return _numberView; -} - -- (UIImageView *)noteImageView { - if (!_noteImageView) { - _noteImageView = [[UIImageView alloc] init]; - _noteImageView.userInteractionEnabled = YES; - _noteImageView.image = [UIImage imageNamed:@"home_search_user_online"]; - } - return _noteImageView; -} - -- (UILabel *)numberLabel { - if (!_numberLabel) { - _numberLabel = [[UILabel alloc] init]; - _numberLabel.text = YMLocalizedString(@"XPSearchListTableViewCell4"); - _numberLabel.font = [UIFont systemFontOfSize:10]; - _numberLabel.textColor = [DJDKMIMOMColor appEmphasizeColor]; - } - return _numberLabel; -} -- (NetImageView *)experImageView { - if (!_experImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _experImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _experImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _charmImageView; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.h b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.h deleted file mode 100644 index fc5bd45..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMHomeSearchNavView.h -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPHomeSearchNavView; -@protocol XPHomeSearchNavViewDelegate - -@optional -//点击了返回 -- (void)xPHomeSearchNavView:(XPHomeSearchNavView *)view didClickBack:(UIButton *)sender; -///点击了搜索 -- (void)xPHomeSearchNavView:(XPHomeSearchNavView *)view didClickSearch:(UIButton *)sender; -///搜索框没有文字 -- (void)xPHomeSearchNavViewClearTextField:(XPHomeSearchNavView *)view; - -@end - -@interface XPHomeSearchNavView : UIView -///输入框 -@property (nonatomic,strong,readonly) UITextField *searchTextField; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.m b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.m deleted file mode 100644 index e932f42..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.m +++ /dev/null @@ -1,179 +0,0 @@ -// -// YMHomeSearchNavView.m -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "XPHomeSearchNavView.h" - -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "UIButton+EnlargeTouchArea.h" -@interface XPHomeSearchNavView () - -///返回 -@property (nonatomic,strong) UIButton *backButton; -///输入框背景 -@property (nonatomic,strong) UIView * inputBackView; -///搜索logo -@property (nonatomic,strong) UIImageView *searchImageView; -///输入框 -@property (nonatomic,strong) MSBaseTextField *searchTextField; -///取消 -@property (nonatomic,strong) UIButton *cancleButton; - -@end - - -@implementation XPHomeSearchNavView - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textFieldChange:) name:UITextFieldTextDidChangeNotification object:nil]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backButton]; - [self addSubview:self.inputBackView]; - [self addSubview:self.cancleButton]; - - [self.inputBackView addSubview:self.searchImageView]; - [self.inputBackView addSubview:self.searchTextField]; -} - -- (void)initSubViewConstraints { - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(22, 22)); - make.leading.mas_equalTo(self).offset(8); - make.centerY.mas_equalTo(self.inputBackView); - }]; - - [self.inputBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - make.leading.mas_equalTo(self.backButton.mas_trailing).offset(5); - make.trailing.mas_equalTo(self.cancleButton.mas_leading).offset(-13); - make.top.mas_equalTo(self).offset(statusbarHeight + 10); - }]; - - [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self).offset(-15); - make.centerY.mas_equalTo(self.inputBackView); - make.height.mas_equalTo(30); - }]; - - [self.searchImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(18, 18)); - make.centerY.mas_equalTo(self.inputBackView); - make.leading.mas_equalTo(self.inputBackView).offset(9); - }]; - - [self.searchTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.searchImageView.mas_trailing); - make.trailing.top.bottom.mas_equalTo(self.inputBackView); - }]; -} - - -#pragma mark - Event Response -- (void)cancleButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPHomeSearchNavView:didClickSearch:)]) { - [self.delegate xPHomeSearchNavView:self didClickSearch:sender]; - } -} - -- (void)backButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPHomeSearchNavView:didClickBack:)]) { - [self.delegate xPHomeSearchNavView:self didClickBack:sender]; - } -} - -- (void)textFieldChange:(NSNotification *)notification { - UITextField *textField = (UITextField *)notification.object; - NSString *searchStr = textField.text; - if (searchStr.length == 0) { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPHomeSearchNavViewClearTextField:)]) { - [self.delegate xPHomeSearchNavViewClearTextField:self]; - } - } -} - -#pragma mark - Getters And Setters - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateSelected]; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_backButton setEnlargeEdgeWithTop:10 right:5 bottom:10 left:8]; - } - return _backButton; -} - -- (UIView *)inputBackView { - if (!_inputBackView) { - _inputBackView = [[UIView alloc] init]; - _inputBackView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _inputBackView.layer.masksToBounds = YES; - _inputBackView.layer.cornerRadius = 15; - } - return _inputBackView; -} - -- (UIImageView *)searchImageView { - if (!_searchImageView) { - _searchImageView = [[UIImageView alloc] init]; - _searchImageView.userInteractionEnabled = YES; - _searchImageView.image = [UIImage imageNamed:@"home_nav_search"]; - } - return _searchImageView; -} - -- (MSBaseTextField *)searchTextField { - if (!_searchTextField) { - _searchTextField = [[MSBaseTextField alloc] init]; - _searchTextField.layer.cornerRadius = 15; - _searchTextField.layer.masksToBounds = YES; - _searchTextField.tintColor = [DJDKMIMOMColor secondTextColor]; - _searchTextField.textColor = [DJDKMIMOMColor mainTextColor]; - _searchTextField.backgroundColor = [UIColor clearColor]; - _searchTextField.font = [UIFont systemFontOfSize:13]; - NSString *placeholder = YMLocalizedString(@"XPHomeSearchNavView0"); - _searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}]; - _searchTextField.clearButtonMode = UITextFieldViewModeWhileEditing; - _searchTextField.returnKeyType = UIReturnKeySearch; - _searchTextField.enablesReturnKeyAutomatically = YES; - } - return _searchTextField; -} - -- (UIButton *)cancleButton { - if (!_cancleButton) { - _cancleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_cancleButton setTitle:YMLocalizedString(@"XPHomeSearchNavView1") forState:UIControlStateNormal]; - [_cancleButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - _cancleButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:16]; - [_cancleButton addTarget:self action:@selector(cancleButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_cancleButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:0]; - } - return _cancleButton; -} - - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchRelateView.h b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchRelateView.h deleted file mode 100644 index 38a2934..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchRelateView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMHomeSearchRelateView.h -// YUMI -// -// Created by YUMI on 2022/11/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@protocol XPHomeSearchRelateViewDelegate - -///进入房间 -- (void)xPHomeSearchRelateViewEnterRoom:(NSString *)roomUid; - -@end - -@interface XPHomeSearchRelateView : UIView - -@property (nonatomic, strong) NSArray *relateArray; - -@property (nonatomic, strong) NSArray *recommendArray; - -@property (nonatomic, weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchRelateView.m b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchRelateView.m deleted file mode 100644 index 70a7a07..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchRelateView.m +++ /dev/null @@ -1,180 +0,0 @@ -// -// YMHomeSearchRelateView.m -// YUMI -// -// Created by YUMI on 2022/11/16. -// - -#import "XPHomeSearchRelateView.h" -#import "Masonry/Masonry.h" -#import "NSArray+Safe.h" -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "StatisticsServiceHelper.h" -///view -#import "XPSearchListTableViewCell.h" -#import "XPHomeRedommendCollectionViewCell.h" -#import "XPRoomSearchRecommendHeadView.h" -///Model -#import "HomeSearchResultModel.h" -#import "HomeRecommendRoomModel.h" - -@interface XPHomeSearchRelateView() - -@property (nonatomic, strong) UILabel *relateTitle; -@property (nonatomic, strong) UITableView *tableView; -@property (nonatomic, strong) UICollectionView *collectionView; - -@end - -@implementation XPHomeSearchRelateView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initView]; - [self initContraints]; - } - return self; -} - -- (void)initView { - self.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - [self addSubview:self.relateTitle]; - [self addSubview:self.tableView]; - [self addSubview:self.collectionView]; -} - -- (void)initContraints { - [self.relateTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(16); - make.leading.mas_equalTo(15); - make.height.mas_equalTo(20); - }]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(0); - make.top.mas_equalTo(self.relateTitle.mas_bottom).mas_offset(16); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; -} -#pragma mark - tableviewDelegate -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.relateArray.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPSearchListTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPSearchListTableViewCell class])]; - if (cell == nil) { - cell = [[XPSearchListTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPSearchListTableViewCell class])]; - } - HomeRecommendRoomModel * resultModel = [self.relateArray xpSafeObjectAtIndex:indexPath.row]; - [cell configEveryoneData:resultModel]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - HomeRecommendRoomModel * resultModel = [self.relateArray xpSafeObjectAtIndex:indexPath.row]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPHomeSearchRelateViewEnterRoom:)]) { - [self.delegate xPHomeSearchRelateViewEnterRoom:resultModel.uid]; - } -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 74; -} - -#pragma mark - collectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.recommendArray.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPHomeRedommendCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPHomeRedommendCollectionViewCell class]) forIndexPath:indexPath]; - HomeRecommendRoomModel * info = [self.recommendArray xpSafeObjectAtIndex:indexPath.row]; - cell.recommendRoomInfo = info; - return cell; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - return CGSizeMake(100 * kScreenScale, 100 * kScreenScale); -} - -- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath { - XPRoomSearchRecommendHeadView *headView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:NSStringFromClass([XPRoomSearchRecommendHeadView class]) forIndexPath:indexPath]; - return headView; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (self.recommendArray.count > 0) { - HomeRecommendRoomModel * recommend = [self.recommendArray xpSafeObjectAtIndex:indexPath.row]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPHomeSearchRelateViewEnterRoom:)]) { - [self.delegate xPHomeSearchRelateViewEnterRoom:recommend.roomUid]; - } - } -} - -- (void)setRelateArray:(NSArray *)relateArray { - _relateArray = relateArray; - [self.tableView reloadData]; - self.collectionView.hidden = YES; - self.relateTitle.hidden = NO; - self.tableView.hidden = NO; -} - -- (void)setRecommendArray:(NSArray *)recommendArray { - _recommendArray = recommendArray; - [self.collectionView reloadData]; - self.collectionView.hidden = NO; - self.relateTitle.hidden = YES; - self.tableView.hidden = YES; -} - -- (UILabel *)relateTitle { - if (!_relateTitle) { - UILabel *label = [[UILabel alloc] init]; - label.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - label.text = YMLocalizedString(@"XPHomeSearchRelateView0"); - _relateTitle = label; - } - return _relateTitle; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableHeaderView = [UIView new]; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - [_tableView registerClass:[XPSearchListTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPSearchListTableViewCell class])]; - } - return _tableView; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.headerReferenceSize = CGSizeMake(KScreenWidth, 200); - layout.minimumLineSpacing = 8; - layout.minimumInteritemSpacing = 0; - layout.scrollDirection = UICollectionViewScrollDirectionVertical; - layout.sectionInset = UIEdgeInsetsMake(15, 15, 0, 15); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPHomeRedommendCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPHomeRedommendCollectionViewCell class])]; - [_collectionView registerClass:[XPRoomSearchRecommendHeadView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:NSStringFromClass([XPRoomSearchRecommendHeadView class])]; - } - return _collectionView; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.h b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.h deleted file mode 100644 index 6c1b8d9..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomSearchRecommendHeadView.h -// YUMI -// -// Created by YUMI on 2022/11/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomSearchRecommendHeadView : UICollectionReusableView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m deleted file mode 100644 index 7421ae4..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m +++ /dev/null @@ -1,68 +0,0 @@ -// -// YMRoomSearchRecommendHeadView.m -// YUMI -// -// Created by YUMI on 2022/11/16. -// - -#import "XPRoomSearchRecommendHeadView.h" -#import "Masonry/Masonry.h" -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" - -@interface XPRoomSearchRecommendHeadView() - -@property (nonatomic, strong) UILabel *emptyTitle; -@property (nonatomic, strong) UILabel *recommentTitle; - -@end - -@implementation XPRoomSearchRecommendHeadView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initView]; - [self initContraints]; - } - return self; -} - -- (void)initView { - [self addSubview:self.emptyTitle]; - [self addSubview:self.recommentTitle]; -} - -- (void)initContraints { - [self.emptyTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - }]; - [self.recommentTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self); - make.leading.mas_equalTo(16); - }]; -} - -- (UILabel *)emptyTitle { - if (!_emptyTitle) { - UILabel *label = [[UILabel alloc] init]; - label.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - label.textColor = [DJDKMIMOMColor textThirdColor]; - label.text = YMLocalizedString(@"XPRoomSearchRecommendHeadView0"); - _emptyTitle = label; - } - return _emptyTitle; -} - -- (UILabel *)recommentTitle { - if (!_recommentTitle) { - UILabel *label = [[UILabel alloc] init]; - label.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - label.text = YMLocalizedString(@"XPRoomSearchRecommendHeadView1"); - _recommentTitle = label; - } - return _recommentTitle; -} -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/View/XPHomeSearchViewController.h b/YuMi/Modules/YMNewHome/View/Search/View/XPHomeSearchViewController.h deleted file mode 100644 index a0c326c..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/XPHomeSearchViewController.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMHomeSearchViewController.h -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "MvpViewController.h" -#import -#import "XPSearchListTableViewCell.h" -NS_ASSUME_NONNULL_BEGIN -@interface XPHomeSearchViewController : MvpViewController -///搜索的类型 -@property (nonatomic,assign) SearchType type; -- (void)searchText:(NSString *)text; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/View/XPHomeSearchViewController.m b/YuMi/Modules/YMNewHome/View/Search/View/XPHomeSearchViewController.m deleted file mode 100644 index 5717931..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/XPHomeSearchViewController.m +++ /dev/null @@ -1,150 +0,0 @@ -// -// YMHomeSearchViewController.m -// YUMI -// -// Created by YUMI on 2021/11/29. -// - -#import "XPHomeSearchViewController.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -#import "ClientConfig.h" -///Model -#import "HomeSearchResultModel.h" -///View -#import "XPSearchListTableViewCell.h" -///P -#import "XPHomeSearchPresenter.h" -#import "XPHomeSearchProtocol.h" -///VC -#import "XPRoomViewController.h" -#import "XPMineUserInfoViewController.h" - - -UIKIT_EXTERN NSString *kFromSearchToHomeViewKey; -UIKIT_EXTERN NSString *kTabShowAnchorCardKey; - -@interface XPHomeSearchViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSArray *datasource; -@end - -@implementation XPHomeSearchViewController - -- (XPHomeSearchPresenter *)createPresenter { - return [[XPHomeSearchPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -#pragma mark - Public Method -- (void)searchText:(NSString *)text { - NSString * type = [NSString stringWithFormat:@"%ld", self.type]; - [self.presenter searchRoomList:text type:type]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -- (void)toMineUserInfoView:(HomeSearchResultModel *)model { - XPMineUserInfoViewController *infoVC = [[XPMineUserInfoViewController alloc] init]; - infoVC.uid = model.uid.integerValue; - [(UINavigationController *)self.presentingViewController pushViewController:infoVC animated:YES]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 74; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPSearchListTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPSearchListTableViewCell class])]; - if (cell == nil) { - cell = [[XPSearchListTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPSearchListTableViewCell class])]; - } - HomeSearchResultModel * resultModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [cell configData:resultModel type:self.type]; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - - BOOL result = [[NSUserDefaults standardUserDefaults] boolForKey:kFromSearchToHomeViewKey]; - if (!result) { - [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kFromSearchToHomeViewKey]; - [[NSUserDefaults standardUserDefaults] synchronize]; - [[NSNotificationCenter defaultCenter] postNotificationName:kTabShowAnchorCardKey object:@{@"delayShow" : @(YES)}]; - } - - [self dismissViewControllerAnimated:YES completion:nil]; - - HomeSearchResultModel * resultModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (self.type == SearchType_Room) { - if (resultModel.valid) { - [XPRoomViewController openRoom:resultModel.uid viewController:self.presentingViewController]; - } else { - [self toMineUserInfoView:resultModel]; - } - } else { - [self toMineUserInfoView:resultModel]; - } -} - -#pragma mark - XPHomeSearchProtocol -- (void)searchRoomSuccess:(NSArray *)data type:(nonnull NSString *)type { - if (type.integerValue == self.type) { - self.datasource = data; - [self.tableView reloadData]; - } -} - -#pragma mark - -- (UIView *)listView { - return self.view; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableHeaderView = [UIView new]; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPSearchListTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPSearchListTableViewCell class])]; - } - return _tableView; -} -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.h b/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.h deleted file mode 100644 index cc016c7..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomSearchContaierViewController.h -// YUMI -// -// Created by YUMI on 2021/12/2. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomSearchContainerViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m b/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m deleted file mode 100644 index ce5dd38..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m +++ /dev/null @@ -1,300 +0,0 @@ -// -// YMRoomSearchContaierViewController.m -// YUMI -// -// Created by YUMI on 2021/12/2. -// - -#import "XPRoomSearchContainerViewController.h" -///Third -#import -#import -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "XPHomeSearchNavView.h" -#import "TTPopup.h" -///View -#import "XPHomeSearchViewController.h" -#import "XPRoomSearchRecordViewController.h" -#import "XPHomeSearchRelateView.h" -#import "XPRoomViewController.h" -///P -#import "XPHomeSearchPresenter.h" -#import "XPHomeSearchProtocol.h" - -UIKIT_EXTERN NSString *kFromSearchToHomeViewKey; -UIKIT_EXTERN NSString *kTabShowAnchorCardKey; - -@interface XPRoomSearchContainerViewController () -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *contentView; -///搜索 -@property (nonatomic,strong) XPHomeSearchNavView *searchView; -///房间 -@property (nonatomic,strong) XPHomeSearchViewController *roomVC; -///用户 -@property (nonatomic,strong) XPHomeSearchViewController *userVC; -///进房、搜索记录 -@property (nonatomic, strong) XPRoomSearchRecordViewController *recordVc; -///相关房间 -@property (nonatomic, strong) XPHomeSearchRelateView *relateView; - -@end - -@implementation XPRoomSearchContainerViewController - -- (void)searchRoomSuccess:(NSArray *)data type:(NSString *)type { - -} - -- (XPHomeSearchPresenter *)createPresenter { - return [[XPHomeSearchPresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - self.modalPresentationStyle = UIModalPresentationOverFullScreen; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.searchView]; - [self.view addSubview:self.titleView]; - [self.view addSubview:self.contentView]; - [self.view addSubview:self.recordVc.view]; - [self addChildViewController:self.recordVc]; -} - -- (void)initSubViewConstraints { - [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.searchView.mas_bottom).offset(10); - make.height.mas_equalTo(50); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleView.mas_bottom).offset(10); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; - [self.recordVc.view mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.searchView.mas_bottom); - make.bottom.mas_equalTo(self.view); - }]; -} - -- (void)searchVCLoadData:(NSString *)text { - self.recordVc.view.hidden = YES; - [self.roomVC searchText:text]; - [self.userVC searchText:text]; -} - -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.roomVC; - } - return self.userVC; -} - -#pragma mark - UITextFieldDelegate -- (BOOL)textFieldShouldReturn:(UITextField *)textField { - if (textField.text.length > 0) { - [textField resignFirstResponder]; - [self searchVCLoadData:textField.text]; -// [self.presenter getSearchHijack:textField.text]; - [self.recordVc storeSearchRecord:textField.text]; - } else { - [self showErrorToast:YMLocalizedString(@"XPRoomSearchContainerViewController0")]; - } - return YES; -} - -#pragma mark -XPHomeSearchNavViewDelegate -- (void)xPHomeSearchNavView:(XPHomeSearchNavView *)view didClickSearch:(UIButton *)sender { - if (view.searchTextField.text.length > 0) { - [self searchVCLoadData:view.searchTextField.text]; - [view.searchTextField resignFirstResponder]; - [self.recordVc storeSearchRecord:view.searchTextField.text]; - } else { - [self showErrorToast:YMLocalizedString(@"XPRoomSearchContainerViewController1")]; - } -} - -- (void)xPHomeSearchNavView:(XPHomeSearchNavView *)view didClickBack:(UIButton *)sender { - [view.searchTextField resignFirstResponder]; - BOOL result = [[NSUserDefaults standardUserDefaults] boolForKey:kFromSearchToHomeViewKey]; - if (!result) { - [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kFromSearchToHomeViewKey]; - [[NSUserDefaults standardUserDefaults] synchronize]; - [[NSNotificationCenter defaultCenter] postNotificationName:kTabShowAnchorCardKey object:nil]; - } - [self dismissViewControllerAnimated:YES completion:nil]; -} - -///搜索框没有文字 -- (void)xPHomeSearchNavViewClearTextField:(XPHomeSearchNavView *)view { - self.recordVc.view.hidden = NO; - [self.recordVc updateSearchRecord]; - [self.relateView removeFromSuperview]; -} - -#pragma mark - XPRoomSearchRecordViewControllerDelegate -- (void)xPRoomSearchRecordViewControllerSearchWithWord:(NSString *)word { - if (word.length > 0) { - self.searchView.searchTextField.text = word; - [self searchVCLoadData:word]; - [self.recordVc storeSearchRecord:word]; - } else { - [self showErrorToast:YMLocalizedString(@"XPRoomSearchContainerViewController2")]; - } -} - -///大家都在搜 -- (void)xPRoomSearchRecordViewControllerEveryoneSearch:(NSString *)word sid:(nonnull NSString *)sid { - self.searchView.searchTextField.text = word; -// [self.presenter getEveryOneSearchRoomList:sid]; -} - -#pragma mark - XPHomeSearchProtocol -- (void)everyoneSearchListSuccess:(NSArray *)list { - if (list.count) {//有值，显示列表 - [self.view addSubview:self.relateView]; - [self.relateView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(0); - make.top.mas_equalTo(self.searchView.mas_bottom); - }]; - self.relateView.relateArray = list; - } else {//无数据，显示推荐房间 - [self.presenter getHomeRecommendRoomList]; - } -} - -- (void)searchRoomGetRecommendSuccess:(NSArray *)data { - if (data.count) {//有值，显示列表 - [self.view addSubview:self.relateView]; - [self.relateView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(0); - make.top.mas_equalTo(self.searchView.mas_bottom); - }]; - self.relateView.recommendArray = data; - } -} - -- (void)searchRoomGetRecommendFail { - -} - -#pragma mark - XPHomeSearchRelateViewDelegate -///进入房间 -- (void)xPHomeSearchRelateViewEnterRoom:(NSString *)roomUid { - BOOL result = [[NSUserDefaults standardUserDefaults] boolForKey:kFromSearchToHomeViewKey]; - if (!result) { - [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kFromSearchToHomeViewKey]; - [[NSUserDefaults standardUserDefaults] synchronize]; - [[NSNotificationCenter defaultCenter] postNotificationName:kTabShowAnchorCardKey object:@{@"delayShow" : @(YES)}]; - } - [self dismissViewControllerAnimated:YES completion:nil]; - [XPRoomViewController openRoom:roomUid viewController:self.presentingViewController]; -} - -#pragma mark - Getters And Setters -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.titleColor = [DJDKMIMOMColor secondTextColor]; - _titleView.titleSelectedColor = [DJDKMIMOMColor mainTextColor]; - _titleView.titleFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:16]; - _titleView.titleSelectedFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:16]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.listContainer = self.contentView; - - JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init]; - lineView.indicatorColor = [DJDKMIMOMColor appMainColor]; - lineView.indicatorWidth = 8.f; - lineView.indicatorHeight = 4.f; - lineView.indicatorCornerRadius = 2.f; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - -- (JXCategoryListContainerView *)contentView { - if (!_contentView) { - _contentView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _contentView.defaultSelectedIndex = 0; - } - return _contentView; -} - -- (NSArray *)titles { - return @[YMLocalizedString(@"XPGuildIncomeSectionView0"), YMLocalizedString(@"XPRoomSearchContainerViewController4")]; -} - -- (XPHomeSearchNavView *)searchView { - if (!_searchView) { - _searchView = [[XPHomeSearchNavView alloc] init]; - _searchView.delegate = self; - _searchView.searchTextField.delegate = self; - } - return _searchView; -} - -- (XPHomeSearchViewController *)roomVC { - if (!_roomVC) { - _roomVC = [[XPHomeSearchViewController alloc] init]; - _roomVC.type = SearchType_Room; - } - return _roomVC; -} - -- (XPHomeSearchViewController *)userVC { - if (!_userVC) { - _userVC = [[XPHomeSearchViewController alloc] init]; - _userVC.type = SearchType_Users; - } - return _userVC; -} - -- (XPRoomSearchRecordViewController *)recordVc { - if (!_recordVc) { - _recordVc = [[XPRoomSearchRecordViewController alloc] init]; - _recordVc.delegate = self; - } - return _recordVc; -} - -- (XPHomeSearchRelateView *)relateView { - if (!_relateView) { - _relateView = [[XPHomeSearchRelateView alloc] init]; - _relateView.delegate = self; - } - return _relateView; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.h b/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.h deleted file mode 100644 index ba2cdfe..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// YMRoomSearchRecordViewController.h -// YUMI -// -// Created by YUMI on 2022/9/5. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPRoomSearchRecordViewControllerDelegate - -///搜索 -- (void)xPRoomSearchRecordViewControllerSearchWithWord:(NSString *)word; - -///点击了大家都在搜 -- (void)xPRoomSearchRecordViewControllerEveryoneSearch:(NSString *)word sid:(NSString *)sid; - -@end - -@interface XPRoomSearchRecordViewController : MvpViewController - -@property (nonatomic, weak) id delegate; -/// 保存搜索记录 -- (void)storeSearchRecord:(NSString *)record; - -///更新搜索记录 -- (void)updateSearchRecord; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m b/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m deleted file mode 100644 index 69bd812..0000000 --- a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m +++ /dev/null @@ -1,508 +0,0 @@ -// -// YMRoomSearchRecordViewController.m -// YUMI -// -// Created by YUMI on 2022/9/5. -// - -#import "XPRoomSearchRecordViewController.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "AccountInfoStorage.h" -#import "TTPopup.h" -#import "NSArray+Safe.h" -#import "ClientConfig.h" -///View -#import "XPHomeAttentionCollectionViewCell.h" -#import "XPHomeSearchRecordCell.h" -#import "XPRoomViewController.h" -#import "XPMineUserInfoViewController.h" - -///P -#import "XPInRoomRecordPresenter.h" -#import "XPInRoomRecordProtocol.h" -///Model -#import "XPMineFootPrintModel.h" -#import "HomeEveryOneSearchModel.h" - -NSString * const XPConstSearchRecordStoreKey = @"XPConstSearchRecordStoreKey"; - -@interface XPRoomSearchRecordViewController () - -@property (nonatomic, strong) UIStackView *contentStackView; -///大家都在搜 -@property (nonatomic, strong) UIView *allSearchContentView; -///大家都在搜标题 -@property (nonatomic, strong) UILabel *everyOneTitle; -@property (nonatomic, strong) UICollectionView *everyOneCollectionView; -///搜索记录容器 -@property (nonatomic, strong) UIView *searchContentView; -///进房记录容器 -@property (nonatomic, strong) UIView *roomContentView; -///填充占位view -@property (nonatomic, strong) UIView *placeHolderView; -///搜索记录 -@property (nonatomic, strong) UILabel *recordTitle; -///清空搜索记录 -@property (nonatomic, strong) UIButton *clearRecordBtn; -///进房记录 -@property (nonatomic, strong) UILabel *roomTitle; -///清空进房记录 -@property (nonatomic, strong) UIButton *clearRoomBtn; -///搜索记录列表 -@property (nonatomic, strong) UICollectionView *searchCollectionView; -///进房记录列表 -@property (nonatomic, strong) UICollectionView *roomCollectionView; -///搜索记录数据源 -@property (nonatomic, strong) NSMutableArray *searchList; -///进房记录数据源 -@property (nonatomic, strong) NSMutableArray *inRoomList; -///大家都在搜数据源 -@property (nonatomic, strong) NSMutableArray *everyoneSearchList; - -@end - -@implementation XPRoomSearchRecordViewController - -- (XPInRoomRecordPresenter *)createPresenter { - return [[XPInRoomRecordPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self initSearchRecordData]; - [self.presenter getInRoomRecordList]; -} - -- (void)initSearchRecordData { - [self.searchList removeAllObjects]; - NSArray *array = [self searchRecordList]; - [self.searchList addObjectsFromArray:array]; - self.searchContentView.hidden = array.count == 0; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.searchCollectionView reloadData]; - }); - -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.contentStackView]; - - [self.contentStackView addArrangedSubview:self.allSearchContentView]; - [self.contentStackView addArrangedSubview:self.searchContentView]; - [self.contentStackView addArrangedSubview:self.roomContentView]; - [self.contentStackView addArrangedSubview:self.placeHolderView]; - - [self.allSearchContentView addSubview:self.everyOneTitle]; - [self.allSearchContentView addSubview:self.everyOneCollectionView]; - - [self.searchContentView addSubview:self.recordTitle]; - [self.searchContentView addSubview:self.clearRecordBtn]; - [self.searchContentView addSubview:self.searchCollectionView]; - [self.roomContentView addSubview:self.roomTitle]; - [self.roomContentView addSubview:self.clearRoomBtn]; - [self.roomContentView addSubview:self.roomCollectionView]; -} - -- (void)initSubViewConstraints { - [self.contentStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.leading.bottom.mas_equalTo(self.view); - }]; - [self.allSearchContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(0); - make.bottom.mas_equalTo(self.everyOneCollectionView); - }]; - [self.everyOneTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.allSearchContentView).mas_offset(16); - make.top.mas_equalTo(self.allSearchContentView).mas_offset(16); - make.height.mas_equalTo(20); - }]; - [self.everyOneCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.allSearchContentView); - make.top.mas_equalTo(self.everyOneTitle.mas_bottom).mas_offset(8); - make.height.mas_equalTo(26); - }]; - - [self.searchContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(0); - make.bottom.mas_equalTo(self.searchCollectionView.mas_bottom); - }]; - - [self.recordTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.top.mas_equalTo(self.searchContentView).mas_offset(20); - make.height.mas_equalTo(20); - }]; - [self.clearRecordBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-16); - make.centerY.mas_equalTo(self.recordTitle); - make.width.height.mas_equalTo(30); - }]; - [self.searchCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(26); - make.top.mas_equalTo(self.recordTitle.mas_bottom).mas_offset(8); - }]; - - [self.roomContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(0); - make.bottom.mas_equalTo(self.roomCollectionView.mas_bottom); - }]; - - [self.roomTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.top.mas_equalTo(self.roomContentView).mas_offset(20); - make.height.mas_equalTo(20); - }]; - [self.clearRoomBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-16); - make.centerY.mas_equalTo(self.roomTitle); - make.width.height.mas_equalTo(30); - }]; - [self.roomCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(75); - make.top.mas_equalTo(self.roomTitle.mas_bottom).mas_offset(8); - }]; -} - -#pragma mark - UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - if (collectionView == self.searchCollectionView) { - return self.searchList.count; - } else if (collectionView == self.roomCollectionView) { - return self.inRoomList.count; - } else { - return self.everyoneSearchList.count; - } -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - if (collectionView == self.searchCollectionView) { - XPHomeSearchRecordCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPHomeSearchRecordCell class]) forIndexPath:indexPath]; - cell.recordString = [self.searchList xpSafeObjectAtIndex:indexPath.row]; - return cell; - } else if (collectionView == self.everyOneCollectionView) { - XPHomeSearchRecordCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPHomeSearchRecordCell class]) forIndexPath:indexPath]; - HomeEveryOneSearchModel *model = [self.everyoneSearchList xpSafeObjectAtIndex:indexPath.row]; - cell.recordString = model.word; - return cell; - } else { - XPHomeAttentionCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPHomeAttentionCollectionViewCell class]) forIndexPath:indexPath]; - cell.recordRoom = [self.inRoomList xpSafeObjectAtIndex:indexPath.row]; - return cell; - } -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - if (collectionView == self.searchCollectionView) { - NSString *str = [self.searchList xpSafeObjectAtIndex:indexPath.row]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomSearchRecordViewControllerSearchWithWord:)]) { - [self.delegate xPRoomSearchRecordViewControllerSearchWithWord:str]; - } - } else if (collectionView == self.everyOneCollectionView) { - HomeEveryOneSearchModel *model = [self.everyoneSearchList xpSafeObjectAtIndex:indexPath.row]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomSearchRecordViewControllerEveryoneSearch: sid:)]) { - [self.delegate xPRoomSearchRecordViewControllerEveryoneSearch:model.word sid:model.sid]; - } - } else { - XPMineFootPrintModel *resultModel = [self.inRoomList xpSafeObjectAtIndex:indexPath.row]; - [self dismissViewControllerAnimated:YES completion:nil]; - if (resultModel.valid) { - [XPRoomViewController openRoom:resultModel.roomUid viewController:self.presentingViewController]; - } else { - XPMineUserInfoViewController * infoVC = [[XPMineUserInfoViewController alloc] init]; - infoVC.uid = resultModel.roomUid.integerValue; - [(UINavigationController *)self.presentingViewController pushViewController:infoVC animated:YES]; - } - } -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - if (collectionView == self.searchCollectionView) { - NSString *str = [self.searchList xpSafeObjectAtIndex:indexPath.row]; - CGFloat width = [str boundingRectWithSize:CGSizeMake(200, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.width; - return CGSizeMake(width + 26, 26); - } else if(collectionView == self.everyOneCollectionView){ - HomeEveryOneSearchModel *model = [self.everyoneSearchList xpSafeObjectAtIndex:indexPath.row]; - CGFloat width = [model.word boundingRectWithSize:CGSizeMake(200, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.width; - return CGSizeMake(width + 26, 26); - } else { - return CGSizeMake(56, 75); - } -} - - -#pragma mark - 搜索记录操作 -/// 获取搜索记录 -- (NSArray *)searchRecordList { - NSString *key = [NSString stringWithFormat:@"%@_%@", XPConstSearchRecordStoreKey, [AccountInfoStorage instance].getUid]; - NSArray *list = [[NSUserDefaults standardUserDefaults] objectForKey:key]; - return list; -} - -/// 保存搜索记录 -- (void)storeSearchRecord:(NSString *)record { - if (record == nil || record.length <= 0) { - return; - } - NSString *key = [NSString stringWithFormat:@"%@_%@", XPConstSearchRecordStoreKey, [AccountInfoStorage instance].getUid]; - NSMutableArray *list = [[[NSUserDefaults standardUserDefaults] objectForKey:key] mutableCopy]; - if (list == nil) { - list = [[NSMutableArray alloc] init]; - } - - [list removeObject:record];//去重 - [list insertObject:record atIndex:0];//插入 - - if (list.count > 20) {//最多保存20条记录 - [list removeLastObject]; - } - - [[NSUserDefaults standardUserDefaults] setValue:list forKey:key]; - [[NSUserDefaults standardUserDefaults] synchronize]; -} - -/// 清空搜索记录 -- (void)cleanSearchRecord { - NSString *key = [NSString stringWithFormat:@"%@_%@", XPConstSearchRecordStoreKey, [AccountInfoStorage instance].getUid]; - [[NSUserDefaults standardUserDefaults] removeObjectForKey:key]; - [[NSUserDefaults standardUserDefaults] synchronize]; -} - -- (void)updateSearchRecord { - [self initSearchRecordData]; -} - -///获取大家都在搜列表成功 -- (void)getEveryoneSearchListSuccess:(NSArray *)array { - [self.everyoneSearchList removeAllObjects]; - [self.everyoneSearchList addObjectsFromArray:array]; - self.allSearchContentView.hidden = array.count == 0; - [self.everyOneCollectionView reloadData]; -} - -///获取进房记录成功 -- (void)getInRoomRecordSuccess:(NSArray *)array { - [self.inRoomList removeAllObjects]; - [self.inRoomList addObjectsFromArray:array]; - [self.roomCollectionView reloadData]; - if (array.count == 0) { - self.roomContentView.hidden = YES; - } -} - -///清除进房记录成功 -- (void)cleanInRoomRecordSuccess { - [self.inRoomList removeAllObjects]; - [self.roomCollectionView reloadData]; - self.roomContentView.hidden = YES; -} - -#pragma mark - action -- (void)onClearSearchRecordClick:(UIButton *)sender { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.confirmButtonConfig.title = YMLocalizedString(@"XPRoomSearchRecordViewController0"); - config.cancelButtonConfig.title = YMLocalizedString(@"XPRoomSearchRecordViewController1"); - config.message = YMLocalizedString(@"XPRoomSearchRecordViewController2"); - [TTPopup alertWithConfig:config confirmHandler:^{ - [self cleanSearchRecord]; - [self.searchList removeAllObjects]; - [self.searchCollectionView reloadData]; - self.searchContentView.hidden = YES; - } cancelHandler:^{ - }]; -} - -- (void)onClearRoomClick:(UIButton *)sender { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.confirmButtonConfig.title = YMLocalizedString(@"XPRoomSearchRecordViewController3"); - config.cancelButtonConfig.title = YMLocalizedString(@"XPRoomSearchRecordViewController4"); - config.message = YMLocalizedString(@"XPRoomSearchRecordViewController5"); - [TTPopup alertWithConfig:config confirmHandler:^{ - [self.presenter cleanInRoomRecord]; - } cancelHandler:^{ - }]; -} - -#pragma mark - getter -- (UIStackView *)contentStackView { - if (!_contentStackView) { - _contentStackView = [[UIStackView alloc] init]; - _contentStackView.axis = UILayoutConstraintAxisVertical; - _contentStackView.distribution = UIStackViewDistributionFill; - _contentStackView.alignment = UIStackViewAlignmentFill; - _contentStackView.alignment = UIStackViewAlignmentCenter; - _contentStackView.spacing = 0; - } - return _contentStackView; -} - -- (UIView *)allSearchContentView { - if (!_allSearchContentView) { - _allSearchContentView = [[UIView alloc] init]; - _allSearchContentView.hidden = YES; - } - return _allSearchContentView; -} - - -- (UILabel *)everyOneTitle { - if (!_everyOneTitle) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomSearchRecordViewController6"); - label.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - _everyOneTitle = label; - } - return _everyOneTitle; -} - -- (UICollectionView *)everyOneCollectionView{ - if (!_everyOneCollectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.minimumLineSpacing = 8; - layout.minimumInteritemSpacing = 8; - layout.sectionInset = UIEdgeInsetsMake(0, 15, 0, 15); - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _everyOneCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _everyOneCollectionView.showsHorizontalScrollIndicator = NO; - _everyOneCollectionView.dataSource = self; - _everyOneCollectionView.delegate = self; - _everyOneCollectionView.backgroundColor = [UIColor clearColor]; - [_everyOneCollectionView registerClass:[XPHomeSearchRecordCell class] forCellWithReuseIdentifier:NSStringFromClass([XPHomeSearchRecordCell class])]; - } - return _everyOneCollectionView; -} - -- (UILabel *)recordTitle { - if (!_recordTitle) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomSearchRecordViewController7"); - label.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - _recordTitle = label; - } - return _recordTitle; -} - -- (UILabel *)roomTitle { - if (!_roomTitle) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomSearchRecordViewController8"); - label.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - _roomTitle = label; - } - return _roomTitle; -} - -- (UIButton *)clearRecordBtn { - if (!_clearRecordBtn) { - UIButton *btn = [[UIButton alloc] init]; - [btn setImage:[UIImage imageNamed:@"sessionList_clear"] forState:UIControlStateNormal]; - [btn addTarget:self action:@selector(onClearSearchRecordClick:) forControlEvents:UIControlEventTouchUpInside]; - _clearRecordBtn = btn; - } - return _clearRecordBtn; -} - -- (UIButton *)clearRoomBtn { - if (!_clearRoomBtn) { - UIButton *btn = [[UIButton alloc] init]; - [btn setImage:[UIImage imageNamed:@"sessionList_clear"] forState:UIControlStateNormal]; - [btn addTarget:self action:@selector(onClearRoomClick:) forControlEvents:UIControlEventTouchUpInside]; - _clearRoomBtn = btn; - } - return _clearRoomBtn; -} - -- (UICollectionView *)searchCollectionView{ - if (!_searchCollectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.minimumLineSpacing = 8; - layout.minimumInteritemSpacing = 8; - layout.sectionInset = UIEdgeInsetsMake(0, 15, 0, 15); - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _searchCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _searchCollectionView.showsHorizontalScrollIndicator = NO; - _searchCollectionView.dataSource = self; - _searchCollectionView.delegate = self; - _searchCollectionView.backgroundColor = [UIColor clearColor]; - [_searchCollectionView registerClass:[XPHomeSearchRecordCell class] forCellWithReuseIdentifier:NSStringFromClass([XPHomeSearchRecordCell class])]; - } - return _searchCollectionView; -} - -- (UICollectionView *)roomCollectionView{ - if (!_roomCollectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.minimumLineSpacing = 8; - layout.minimumInteritemSpacing = 0; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.sectionInset = UIEdgeInsetsMake(0, 15, 0, 15); - _roomCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _roomCollectionView.showsHorizontalScrollIndicator = NO; - _roomCollectionView.dataSource = self; - _roomCollectionView.delegate = self; - _roomCollectionView.backgroundColor = [UIColor clearColor]; - [_roomCollectionView registerClass:[XPHomeAttentionCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPHomeAttentionCollectionViewCell class])]; - } - return _roomCollectionView; -} - -- (NSMutableArray *)searchList { - if (!_searchList) { - _searchList = [NSMutableArray array]; - } - return _searchList; -} - -- (NSMutableArray *)inRoomList { - if (!_inRoomList) { - _inRoomList = [NSMutableArray array]; - } - return _inRoomList; -} - -- (NSMutableArray *)everyoneSearchList { - if (!_everyoneSearchList) { - _everyoneSearchList = [NSMutableArray array]; - } - return _everyoneSearchList; -} - -- (UIView *)searchContentView { - if (!_searchContentView) { - _searchContentView = [[UIView alloc] init]; - } - return _searchContentView; -} - -- (UIView *)roomContentView { - if (!_roomContentView) { - _roomContentView = [[UIView alloc] init]; - } - return _roomContentView; -} - -- (UIView *)placeHolderView { - if (!_placeHolderView) { - _placeHolderView = [[UIView alloc] init]; - _placeHolderView.backgroundColor = [UIColor clearColor]; - [_placeHolderView setContentHuggingPriority:UILayoutPriorityDragThatCanResizeScene forAxis:UILayoutConstraintAxisHorizontal]; - [_placeHolderView setContentCompressionResistancePriority:UILayoutPriorityFittingSizeLevel forAxis:UILayoutConstraintAxisHorizontal]; - } - return _placeHolderView; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.h b/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.h deleted file mode 100644 index dc8a740..0000000 --- a/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPHomeMineViewController.h -// YuMi -// -// Created by P on 2024/6/18. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPHomeMineViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m b/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m deleted file mode 100644 index 22d92e5..0000000 --- a/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m +++ /dev/null @@ -1,491 +0,0 @@ -// -// XPHomeMineViewController.m -// YuMi -// -// Created by P on 2024/6/18. -// - -#import "XPHomeMineViewController.h" - -#import -#import -#import - -#import "XPHomeMinePresenter.h" -#import "XPHomePartyViewController.h" -#import "XPLittleGameRoomOpenView.h" -#import "XPRoomViewController.h" -#import "PIHomeCategoryTitleModel.h" - -#import "XPHomeMineProtocol.h" -#import "HomeMineRoomModel.h" -#import "AccountInfoStorage.h" -#import "Api+Room.h" - -@interface XPHomeMineRoomCard : UIView - -@property (nonatomic, strong) HomeMineRoomModel *model; - -@property (nonatomic, strong) NetImageView *avatarImageView; -@property (nonatomic, strong) UILabel *roomNameLabel; -@property (nonatomic, strong) UILabel *descLabel; -@property (nonatomic, strong) UILabel *heatLabel; -@property (nonatomic, strong) UIView *miniAvatarsContainer; -@property (nonatomic, strong) NetImageView *flagImage; -@property (nonatomic, copy) void(^didTapMyRoom)(void); - -@end - -@implementation XPHomeMineRoomCard - -- (instancetype)init -{ - self = [super init]; - if (self) { - [self setupUI]; - [self setupGesture]; - } - return self; -} - -- (void)setModel:(HomeMineRoomModel *)model { - _model = model; - if (model) { - self.avatarImageView.imageUrl = model.avatar; - self.roomNameLabel.text = model.title.length > 0 ? model.title : YMLocalizedString(@"XPMinePersonalCenterCell1"); - self.descLabel.text = model.roomDesc.length > 0 ? model.roomDesc : YMLocalizedString(@"XPHomeMineViewController3"); - self.heatLabel.text = [NSString stringWithFormat:@"%ld", model.onlineNum]; - - [self.flagImage mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(model.regionFlag.length > 0 ? kGetScaleWidth(18) : 0); - }]; - [self.descLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.roomNameLabel).offset(model.regionFlag.length > 0 ? kGetScaleWidth(18)+4 : 0); - }]; - self.flagImage.imageUrl = model.regionFlag; - - for (UIView *subView in self.miniAvatarsContainer.subviews) { - [subView removeFromSuperview]; - } - - NSInteger i = 0; - for (HomePlayMicUserModel *micUser in model.micUsers) { - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - NetImageView *iconView = [[NetImageView alloc]initWithConfig:config]; - iconView.layer.cornerRadius = kGetScaleWidth(20)/2; - iconView.layer.masksToBounds = YES; - iconView.layer.borderWidth = 1; - iconView.layer.borderColor = [UIColor whiteColor].CGColor; - iconView.imageUrl = micUser.avatar; - [self.miniAvatarsContainer addSubview:iconView]; - CGFloat left = i * kGetScaleWidth(14); - [iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.miniAvatarsContainer); - make.leading.mas_equalTo(left); - make.width.height.mas_equalTo(20); - }]; - i++; - } - } else { - self.roomNameLabel.text = YMLocalizedString(@"XPMinePersonalCenterCell1"); - self.descLabel.text = YMLocalizedString(@"XPHomeMineViewController3"); - self.heatLabel.text = @"0"; - - for (UIView *subView in self.miniAvatarsContainer.subviews) { - [subView removeFromSuperview]; - } - } -} - -- (void)setupUI { - UIImage *gradientColorImage = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor colorWithHexString:@"#FFE993"], - [DJDKMIMOMColor colorWithHexString:@"#FDC36F"]] - gradientType:GradientTypeTopToBottom - imgSize:CGSizeMake(350, 100)]; - UIImageView *backgroundImageView = [[UIImageView alloc] initWithImage:gradientColorImage]; - backgroundImageView.layer.cornerRadius = 16; - backgroundImageView.clipsToBounds = YES; - [self addSubview:backgroundImageView]; - [backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(345), kGetScaleWidth(88))); - }]; - - [self addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(backgroundImageView).offset(8); - make.leading.mas_equalTo(backgroundImageView).offset(8); - make.bottom.mas_equalTo(backgroundImageView).offset(-8); - make.width.mas_equalTo(self.avatarImageView.mas_height); - }]; - - [self addSubview:self.roomNameLabel]; - [self.roomNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(backgroundImageView).offset(16); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(8); - make.trailing.mas_equalTo(backgroundImageView).offset(-8); - }]; - - [self addSubview:self.flagImage]; - [self.flagImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.roomNameLabel); - make.height.mas_equalTo(kGetScaleWidth(14)); - make.width.mas_equalTo(kGetScaleWidth(18)); - make.top.equalTo(self.roomNameLabel.mas_bottom).mas_offset(kGetScaleWidth(6)); - }]; - - [self addSubview:self.descLabel]; - [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(backgroundImageView).offset(40); -// make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(8); - make.leading.equalTo(self.roomNameLabel).offset(0); - make.trailing.mas_equalTo(backgroundImageView).offset(-8); - }]; - - [self addSubview:self.heatLabel]; - [self.heatLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(backgroundImageView).offset(-8); - make.trailing.mas_equalTo(backgroundImageView).offset(-16); - }]; - - UIImageView *fireImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ms_home_heat_icon"]]; - [self addSubview:fireImageView]; - [fireImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(backgroundImageView).offset(-8); - make.trailing.mas_equalTo(self.heatLabel.mas_leading).offset(-8); - }]; - - _miniAvatarsContainer = [[UIView alloc] init]; - [self addSubview:_miniAvatarsContainer]; - [_miniAvatarsContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(backgroundImageView).offset(-8); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(8); - make.width.mas_equalTo(120); - make.height.mas_equalTo(20); - }]; -} - -- (void)setupGesture { - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self - action:@selector(didTapCard)]; - [self addGestureRecognizer:tap]; -} - -- (void)didTapCard { - if (_didTapMyRoom) { - _didTapMyRoom(); - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.backgroundColor = [DJDKMIMOMColor colorWithHexString:@"F5EDFF"]; - _avatarImageView.layer.masksToBounds = YES; -// _avatarImageView.layer.cornerRadius = 56/2; - _avatarImageView.layer.borderColor = [UIColor whiteColor].CGColor; - _avatarImageView.layer.borderWidth = 1; - [_avatarImageView setCornerWithLeftTopCorner:kGetScaleWidth(10) - rightTopCorner:kGetScaleWidth(10) - bottomLeftCorner:kGetScaleWidth(10) - bottomRightCorner:kGetScaleWidth(10) - size:CGSizeMake(kGetScaleWidth(72), kGetScaleWidth(72))]; - } - return _avatarImageView; -} - -- (UILabel *)roomNameLabel { - if (!_roomNameLabel) { - _roomNameLabel = [UILabel labelInitWithText:YMLocalizedString(@"XPMinePersonalCenterCell1") - font:[UIFont systemFontOfSize:15 weight:UIFontWeightBold] - textColor:[DJDKMIMOMColor colorWithHexString:@"18181A"]]; - } - return _roomNameLabel; -} - -- (UILabel *)descLabel { - if (!_descLabel) { - _descLabel = [UILabel labelInitWithText:YMLocalizedString(@"XPHomeMineViewController3") - font:[UIFont systemFontOfSize:13 weight:UIFontWeightMedium] - textColor:[DJDKMIMOMColor colorWithHexString:@"18181A"]]; - } - return _descLabel; -} - -- (UILabel *)heatLabel { - if (!_heatLabel) { - _heatLabel = [UILabel labelInitWithText:@"0" - font:[UIFont systemFontOfSize:13 weight:UIFontWeightMedium] - textColor:[DJDKMIMOMColor colorWithHexString:@"797B80"]]; - } - return _heatLabel; -} - -- (NetImageView *)flagImage{ - if(!_flagImage){ - _flagImage = [NetImageView new]; - _flagImage.contentMode = UIViewContentModeScaleAspectFit; - } - return _flagImage; -} - -@end - -@interface XPHomeMineViewController () - -@property (nonatomic, strong) XPHomeMineRoomCard *headView; - -@property (nonatomic, assign) NSInteger currentIndex; -@property (nonatomic, strong) NSMutableDictionary *validListDict; - -@property (nonatomic, strong) JXPagerView *pagingView; -@property (nonatomic, strong) JXCategoryTitleView *titleView; -@property (nonatomic, strong) NSMutableArray *tagModelList; -@end - -@implementation XPHomeMineViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.currentIndex = 0; - - [self setupNotifications]; - - [self setupUI]; - [self setupRefreshHeader]; - - [self setupDefaultTags]; -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - - [self.pagingView.mainTableView.mj_header beginRefreshing]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (XPHomeMinePresenter *)createPresenter { - return [[XPHomeMinePresenter alloc] init]; -} - -- (void)setupNotifications { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(homeVCRefreshComplete) - name:@"khomeVCRefreshComplete" - object:nil]; -} - -- (void)setupUI { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.pagingView]; - [self.pagingView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.view).mas_offset(kGetScaleWidth(8)); - make.leading.bottom.trailing.mas_equalTo(0); - }]; -} - -- (void)setupRefreshHeader { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.pagingView.mainTableView.mj_header = header; -} - -- (void)setupDefaultTags { - NSMutableArray *titleArray = [NSMutableArray array]; - for (PIHomeCategoryTitleModel *model in self.tagModelList) { - [titleArray addObject:model.name]; - } - self.titleView.titles = titleArray; - [self.titleView reloadData]; - - [self headerRefresh]; -} - -#pragma mark - -- (void)headerRefresh { - [self.presenter getMyRoom]; - - PIHomeCategoryTitleModel *tagModel = [self.tagModelList xpSafeObjectAtIndex:self.currentIndex]; - XPHomePartyViewController *homeVC = [self.validListDict objectForKey:[NSNumber numberWithInteger:self.currentIndex]]; - homeVC.tagModel = tagModel; -} - -- (void)homeVCRefreshComplete { - [self.pagingView.mainTableView.mj_header endRefreshing]; - [self.pagingView.mainTableView.mj_footer endRefreshing]; -} - --(void)pushMyRoomVC{ - - self.headView.userInteractionEnabled = NO; - [self showLoading]; - - NSString* roomUid = [[AccountInfoStorage instance] getUid]; - @kWeakify(self); - [Api getRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [self hideHUD]; - self.headView.userInteractionEnabled = YES; - if (code == 200) { - RoomInfoModel * roomInfo = [RoomInfoModel modelWithJSON:data.data]; - if (roomInfo.isReselect) { - XPLittleGameRoomOpenView * roomOpenView = [[XPLittleGameRoomOpenView alloc] init]; - roomOpenView.roomInfo = roomInfo; - roomOpenView.currentVC = self; - [TTPopup popupView:roomOpenView style:TTPopupStyleActionSheet]; - } else { - [XPRoomViewController openRoom:roomUid viewController:self]; - } - } else { - [self showErrorToast:msg]; - } - } - uid:roomUid - intoUid:roomUid - ]; -} - -#pragma mark - XPHomeMineProtocol -- (void)getMyRoomSuccess:(HomeMineRoomModel *)model { - self.headView.model = model; - [self.pagingView reloadData]; - [self.pagingView resizeTableHeaderViewHeightWithAnimatable:NO duration:0 curve:0]; - - [self.pagingView.mainTableView.mj_header endRefreshing]; -} - -#pragma mark - JXPagerMainTableViewGestureDelegate -- (BOOL)mainTableViewGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { - //禁止categoryView左右滑动的时候，上下和左右都可以滚动 - if (otherGestureRecognizer.view == self.pagingView.listContainerView) { - return NO; - } - return [gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] && [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]]; -} - -#pragma mark - JXCategoryViewDelegate -- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index{ - self.currentIndex = index; -} - -#pragma mark - JXCategoryViewDelegate -- (NSUInteger)tableHeaderViewHeightInPagerView:(JXPagerView *)pagerView { - return kGetScaleWidth(98); -} - -- (UIView *)tableHeaderViewInPagerView:(JXPagerView *)pagerView { - return self.headView; -} - -- (NSUInteger)heightForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return kGetScaleWidth(40); -} - -- (UIView *)viewForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return self.titleView; -} - -- (NSInteger)numberOfListsInPagerView:(JXPagerView *)pagerView { - return self.tagModelList.count; -} - -- (id)pagerView:(JXPagerView *)pagerView initListAtIndex:(NSInteger)index { - id homeV = [self.validListDict objectForKey:[NSNumber numberWithInteger:index]]; - if (homeV) { - return homeV; - } - XPHomePartyViewController *homeVC = [[XPHomePartyViewController alloc] init]; - homeVC.tagModel = [self.tagModelList xpSafeObjectAtIndex:index]; - [self.validListDict setObject:homeVC forKey:@(index)]; - return homeVC; -} - -#pragma mark - -- (XPHomeMineRoomCard *)headView { - if (!_headView) { - _headView = [[XPHomeMineRoomCard alloc] init]; - @kWeakify(self); - _headView.didTapMyRoom = ^{ - @kStrongify(self); - [self pushMyRoomVC]; - }; - } - return _headView; -} - -- (JXPagerView *)pagingView { - if (!_pagingView) { - _pagingView = [[JXPagerView alloc] initWithDelegate:self listContainerType:0]; - _pagingView.mainTableView.gestureDelegate = self; - _pagingView.backgroundColor = [UIColor clearColor]; - _pagingView.listContainerView.backgroundColor = [UIColor clearColor]; - _pagingView.listContainerView.listCellBackgroundColor = [UIColor clearColor]; - _pagingView.mainTableView.backgroundColor = [UIColor clearColor]; - } - return _pagingView; -} - -- (NSMutableArray *)tagModelList{ - if(!_tagModelList){ - _tagModelList = [NSMutableArray array]; - - PIHomeCategoryTitleModel *recommendModel = [PIHomeCategoryTitleModel new]; - recommendModel.id = @"-12"; - recommendModel.name = YMLocalizedString(@"XPHomeMineViewController1"); - recommendModel.checkedWidth = [UILabel getWidthWithText:recommendModel.name height:kGetScaleWidth(27) font:kFontSemibold(14)]; - recommendModel.noCheckedWidth = [UILabel getWidthWithText:recommendModel.name height:kGetScaleWidth(27) font:kFontRegular(14)]; - recommendModel.isChecked = YES; - - PIHomeCategoryTitleModel *hotModel = [PIHomeCategoryTitleModel new]; - hotModel.id = @"-11"; - hotModel.name = YMLocalizedString(@"XPMineFootPrintViewController5"); - hotModel.checkedWidth = [UILabel getWidthWithText:recommendModel.name height:kGetScaleWidth(27) font:kFontSemibold(14)]; - hotModel.noCheckedWidth = [UILabel getWidthWithText:recommendModel.name height:kGetScaleWidth(27) font:kFontRegular(14)]; - - [_tagModelList addObject:recommendModel]; - [_tagModelList addObject:hotModel]; - } - return _tagModelList; -} - -- (NSMutableDictionary *)validListDict{ - if(!_validListDict){ - _validListDict = [NSMutableDictionary dictionary]; - } - return _validListDict; -} - -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)]; - _titleView.delegate = self; - _titleView.titles = @[]; - _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = UIColorFromRGB(0x767585); - _titleView.titleSelectedColor = UIColorFromRGB(0x1E1E1E); - _titleView.titleFont = kFontBold(14); - _titleView.titleSelectedFont = kFontBold(14); - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.averageCellSpacingEnabled = NO; - - _titleView.cellSpacing = kGetScaleWidth(28); - - _titleView.listContainer = (id)self.pagingView.listContainerView; - } - return _titleView; -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.h b/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.h deleted file mode 100644 index 0776e40..0000000 --- a/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPHomePagingViewController.h -// YuMi -// -// Created by P on 2024/6/16. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPHomePagingViewController : MvpViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m b/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m deleted file mode 100644 index 53f3adf..0000000 --- a/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m +++ /dev/null @@ -1,352 +0,0 @@ -// -// XPHomePagingViewController.m -// YuMi -// -// Created by P on 2024/6/16. -// - -#import "XPHomePagingViewController.h" - -#import "XPNewHomeViewController.h" -#import "XPHomeMineViewController.h" -#import "XPRoomSearchContainerViewController.h" -#import "XPWebViewController.h" - -#import "Api+Gift.h" -#import "XPGiftStorage.h" -#import "FirstRechargeManager.h" -#import "FirstRechargeModel.h" -#import "YUMIHtmlUrl.h" -#import "YUMIMacroUitls.h" - -@interface XPHomePagingViewController () - -@property (nonatomic, strong) UIView *topControlView; -@property (nonatomic, strong) UIButton *mineButton; -@property (nonatomic, strong) UIButton *recommendButton; -@property (nonatomic, strong) UIButton *layoutButton; - -@property (nonatomic, strong) UIPageViewController *pageContainer; -@property (nonatomic, strong) NSArray *viewControllers; // 存储子视图控制器的数组 -@property (nonatomic, assign) NSUInteger currentIndex; // 当前显示的页面索引 - -@property (nonatomic, strong) XPNewHomeViewController *recommendVC; -@property (nonatomic, strong) XPHomeMineViewController *mineVC; - -// 首充弹窗引用 -@property (nonatomic, strong) XPWebViewController *firstChargeWebVC; -// 首充弹窗背景视图 -@property (nonatomic, strong) UIView *firstChargeBackgroundView; - -@end - -@implementation XPHomePagingViewController - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [FirstRechargeManager sharedManager].delegate = nil; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self setup]; - - // 注册首充管理器监听 - [FirstRechargeManager sharedManager].delegate = self; -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - - // 启动首充监控 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [[FirstRechargeManager sharedManager] startMonitoring]; - }); -} - -- (void)setup { - - self.view.backgroundColor = [[ClientConfig shareConfig] bgColor]; - - [self setupTopTheme]; - [self setupTopControl]; - - _pageContainer = [[UIPageViewController alloc] initWithTransitionStyle:UIPageViewControllerTransitionStyleScroll - navigationOrientation:UIPageViewControllerNavigationOrientationHorizontal - options:nil]; - _pageContainer.delegate = self; - _pageContainer.dataSource = self; - _recommendVC = [[XPNewHomeViewController alloc] init]; - _mineVC = [[XPHomeMineViewController alloc] init]; - _viewControllers = @[_recommendVC, _mineVC]; - [self didTapRecommendButton]; - - [self addChildViewController:_pageContainer]; - [self.view addSubview:_pageContainer.view]; - - [self.pageContainer.view mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.bottom.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.topControlView.mas_bottom); - }]; - [self.pageContainer didMoveToParentViewController:self]; - - for (UIView *view in self.pageContainer.view.subviews) { - if ([view isKindOfClass:[UIScrollView class]]) { - UIScrollView *scrollView = (UIScrollView *)view; - scrollView.scrollEnabled = NO; // 禁用滚动 - } - } -} - -- (void)setupTopTheme { - __block UIImageView *theme = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(140))]; - theme.image = [[ClientConfig shareConfig] navigationAreaBG]; - theme.contentMode = UIViewContentModeScaleAspectFill; - [self.view addSubview:theme]; - - [[NSNotificationCenter defaultCenter] addObserverForName:[ClientConfig shareConfig].reloadNavigationAreaImageKey - object:nil - queue:[NSOperationQueue mainQueue] - usingBlock:^(NSNotification * _Nonnull notification) { - if ([notification.object isKindOfClass:[UIImage class]]) { - theme.image = (UIImage *)notification.object; - } - }]; -} - -- (void)setupTopControl { - _topControlView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, - KScreenWidth, - 44+[UIApplication sharedApplication].keyWindow.safeAreaInsets.top)]; - _topControlView.backgroundColor = [UIColor clearColor]; - [self.view addSubview:_topControlView]; - - _recommendButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_recommendButton setTitle:YMLocalizedString(@"XPMonentsViewController2") forState:UIControlStateNormal]; - [_recommendButton addTarget:self - action:@selector(didTapRecommendButton) - forControlEvents:UIControlEventTouchUpInside]; - [_topControlView addSubview:_recommendButton]; - [_recommendButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.topControlView).offset(-6); - make.width.mas_greaterThanOrEqualTo(40); - make.leading.mas_equalTo(self.topControlView).offset(12); - }]; - - _mineButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_mineButton setTitle:YMLocalizedString(@"TabbarViewController5") forState:UIControlStateNormal]; - [_mineButton addTarget:self - action:@selector(didTapMineButton) - forControlEvents:UIControlEventTouchUpInside]; - [_topControlView addSubview:_mineButton]; - [_mineButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.topControlView).offset(-6); - make.width.mas_greaterThanOrEqualTo(40); - make.leading.mas_equalTo(_recommendButton.mas_trailing).offset(32); - }]; - - UIButton *searchButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [searchButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [searchButton setBackgroundImage:[UIImage imageNamed:@"home_nav_search"] forState:UIControlStateNormal]; - [searchButton addTarget:self - action:@selector(didTapSearchButton) - forControlEvents:UIControlEventTouchUpInside]; - [_topControlView addSubview:searchButton]; - [searchButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.mineButton); - make.trailing.mas_equalTo(self.topControlView).offset(-16); - make.width.height.mas_equalTo(28); - }]; - - _layoutButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_layoutButton setImage:kImage(@"room_layout_type_1") forState:UIControlStateNormal]; - [_layoutButton setImage:kImage(@"room_layout_type_2") forState:UIControlStateSelected]; - [_topControlView addSubview:_layoutButton]; - [_layoutButton addTarget:self - action:@selector(didTapLayoutButton) - forControlEvents:UIControlEventTouchUpInside]; - [_layoutButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(searchButton); - make.trailing.mas_equalTo(searchButton.mas_leading).offset(-16); - make.width.height.mas_equalTo(28); - }]; -} - -- (void)displayMineTab { - [_mineButton.titleLabel setFont:kFontBold(20)]; - [_recommendButton.titleLabel setFont:kFontRegular(16)]; - [_mineButton setTitleColor:UIColorRGBAlpha(0x313131, 1) forState:UIControlStateNormal]; - [_recommendButton setTitleColor:UIColorRGBAlpha(0x313131, 1) forState:UIControlStateNormal]; -} - -- (void)displayRecommendTab { - [_mineButton.titleLabel setFont:kFontRegular(16)]; - [_recommendButton.titleLabel setFont:kFontBold(20)]; - [_recommendButton setTitleColor:UIColorRGBAlpha(0x313131, 1) forState:UIControlStateNormal]; - [_mineButton setTitleColor:UIColorRGBAlpha(0x313131, 1) forState:UIControlStateNormal]; -} - -#pragma mark - -- (void)didTapMineButton { - [self.pageContainer setViewControllers:@[self.viewControllers[1]] - direction:UIPageViewControllerNavigationDirectionReverse - animated:NO - completion:nil]; - [self displayMineTab]; -} - -- (void)didTapRecommendButton { - [self.pageContainer setViewControllers:@[self.viewControllers[0]] - direction:UIPageViewControllerNavigationDirectionForward - animated:NO - completion:nil]; - [self displayRecommendTab]; -} - -- (void)didTapSearchButton { - XPRoomSearchContainerViewController * searchVC = [[XPRoomSearchContainerViewController alloc] init]; - searchVC.modalPresentationStyle = UIModalPresentationFullScreen; - [self.navigationController presentViewController:searchVC - animated:YES - completion:nil]; -} - -- (void)didTapLayoutButton { - self.layoutButton.selected = !self.layoutButton.isSelected; - // 发送布局切换通知 - [[NSNotificationCenter defaultCenter] postNotificationName:@"kHomeLayoutToggle" object:nil]; -} - -#pragma mark - UIPageViewController Delegate & DataSource -- (UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerBeforeViewController:(UIViewController *)viewController { - return nil; -} - -- (UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerAfterViewController:(UIViewController *)viewController { - return nil; -} - -#pragma mark - UIPageViewControllerDelegate -- (void)pageViewController:(UIPageViewController *)pageViewController willTransitionToViewControllers:(NSArray *)pendingViewControllers { - // 更新当前索引 - self.currentIndex = [self.viewControllers indexOfObject:pendingViewControllers.firstObject]; - if (self.currentIndex == 0) { - [self displayMineTab]; - } else { - [self displayRecommendTab]; - } -} - -- (void)tokenInvalid { - // 停止首充监控 - [[FirstRechargeManager sharedManager] stopMonitoring]; - -// [super tokenInvalid]; -} - -#pragma mark - FirstRechargeManagerDelegate - -- (void)firstRechargeManager:(FirstRechargeManager *)manager didCheckFirstRecharge:(FirstRechargeModel *)model shouldShow:(BOOL)shouldShow { - if (shouldShow && model.chargeStatus == NO) { - // 展示首充弹窗 - [self showFirstRechargePopup:model]; - - // 标记今天已展示过（在展示后标记） - [[FirstRechargeManager sharedManager] markTodayShown]; - } -} - -- (void)showFirstRechargePopup:(FirstRechargeModel *)model { - if (model.chargeStatus) { - return; - } - - // 如果已经有弹窗在显示，先移除它 - [self removeFirstChargePopup]; - - // 创建背景视图 - self.firstChargeBackgroundView = [[UIView alloc] initWithFrame:self.view.bounds]; - self.firstChargeBackgroundView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - self.firstChargeBackgroundView.alpha = 0; - - // 添加点击手势 - UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleBackgroundTap:)]; - [self.firstChargeBackgroundView addGestureRecognizer:tapGesture]; - - // 添加到当前视图 - [self.view addSubview:self.firstChargeBackgroundView]; - - // 创建并配置 web 视图 - self.firstChargeWebVC = [[XPWebViewController alloc] initWithRoomUID:@""]; - self.firstChargeWebVC.isPush = NO; - self.firstChargeWebVC.url = URLWithType(kFirstChargeHomeIndex); - - [self addChildViewController:self.firstChargeWebVC]; - [self.firstChargeBackgroundView addSubview:self.firstChargeWebVC.view]; - [self.firstChargeWebVC didMoveToParentViewController:self]; - - self.firstChargeWebVC.view.backgroundColor = [UIColor clearColor]; - self.firstChargeWebVC.webview.backgroundColor = [UIColor clearColor]; - self.firstChargeWebVC.webview.opaque = NO; - self.firstChargeWebVC.webview.scrollView.backgroundColor = [UIColor clearColor]; - self.firstChargeWebVC.view.frame = CGRectMake(0, - 0, - kGetScaleWidth(305), - kGetScaleWidth(403)); - self.firstChargeWebVC.view.center = self.firstChargeBackgroundView.center; - - @kWeakify(self); - [self.firstChargeWebVC setUrlLoadCompleted:^(BOOL result, NSError * _Nullable error) { - @kStrongify(self); - [UIView animateWithDuration:0.5 animations:^{ - self.firstChargeBackgroundView.alpha = 1; - } completion:^(BOOL finished) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self removeFirstChargePopup]; - }); - }]; - }]; - [self.firstChargeWebVC setDidTapCharge:^{ - @kStrongify(self); - [self removeFirstChargePopup]; - }]; -} - -// 处理背景点击事件 -- (void)handleBackgroundTap:(UITapGestureRecognizer *)gesture { - // 获取点击位置 - CGPoint location = [gesture locationInView:self.firstChargeBackgroundView]; - - // 检查是否点击在 webView 区域外 - if (self.firstChargeWebVC && self.firstChargeWebVC.view) { - CGRect webViewFrame = self.firstChargeWebVC.view.frame; - if (!CGRectContainsPoint(webViewFrame, location)) { - // 点击在 webView 外部，移除弹窗 - [self removeFirstChargePopup]; - } - } else { - // 如果 webView 不存在，直接移除弹窗 - [self removeFirstChargePopup]; - } -} - -// 移除弹窗 -- (void)removeFirstChargePopup { - if (self.firstChargeWebVC) { - [self.firstChargeWebVC willMoveToParentViewController:nil]; - [self.firstChargeWebVC.view removeFromSuperview]; - [self.firstChargeWebVC removeFromParentViewController]; - self.firstChargeWebVC = nil; - } - - if (self.firstChargeBackgroundView) { - [self.firstChargeBackgroundView removeFromSuperview]; - self.firstChargeBackgroundView = nil; - } -} - -@end diff --git a/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.h b/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.h deleted file mode 100644 index 8a214c3..0000000 --- a/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// XPHomeViewController.h -// YuMi -// -// Created by YuMi on 2021/11/29. -// - -#import "MvpViewController.h" -#import -#import "PIHomeCategoryTitleModel.h" - -@class HomeBannerInfoModel; - -NS_ASSUME_NONNULL_BEGIN - - -@interface XPHomePartyViewController : MvpViewController -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); -@property (nonatomic, copy) void(^didTapBannerItem)(HomeBannerInfoModel *itemModel); -@property (nonatomic, copy) void(^didAppear)(PIHomeCategoryTitleModel *displayModel); - -@property(nonatomic,strong) PIHomeCategoryTitleModel *tagModel; - -@property (nonatomic, copy) NSArray *bannerInfoList; - -- (void)starBeginHeaderRefresh; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m b/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m deleted file mode 100644 index da4ee1d..0000000 --- a/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m +++ /dev/null @@ -1,624 +0,0 @@ -// -// XPHomeViewController.m -// YuMi -// -// Created by YuMi on 2021/11/29. -// - -#import "XPHomePartyViewController.h" -///Third -#import -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -///Model -#import "HomeRecommendRoomModel.h" -///View -#import "XPNewHomePartyCollectionViewCell.h" -#import "XPGuildEmptyCollectionViewCell.h" -#import "XPPartyRoomItemCollectionViewCell.h" -#import "XPBlankRoomModel.h" -#import "XPWeakTimer.h" -///P -#import "XPHomePresenter.h" -#import "XPHomeProtocol.h" -///VC -#import "XPRoomViewController.h" -#import -#import "HomeBannerInfoModel.h" - -// 布局类型持久化 key -static NSString * const kHomeLayoutTypeKey = @"kHomeLayoutTypeKey"; - -@interface HomePartyBannerCell : UICollectionViewCell - -@property (nonatomic, strong) SDCycleScrollView *bannerView; -@property (nonatomic, copy) NSArray *bannerInfoList; -@property (nonatomic, copy) void(^didTapBannerItem)(HomeBannerInfoModel *model); - -@end - -@implementation HomePartyBannerCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self.contentView addSubview:self.bannerView]; - [self.bannerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - } - return self; -} - -- (void)setBannerInfoList:(NSArray *)bannerInfoList { - _bannerInfoList = bannerInfoList; - NSMutableArray *picArray = @[].mutableCopy; - for (HomeBannerInfoModel *model in bannerInfoList) { - if (![NSString isEmpty:model.bannerPic]) { - NSCharacterSet *allowedCharacters = [NSCharacterSet URLFragmentAllowedCharacterSet]; - NSString *encodedURLString = [model.bannerPic stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacters]; - [picArray addObject:encodedURLString]; - } - } - self.bannerView.imageURLStringsGroup = picArray.copy; - self.bannerView.autoScroll = YES; -} - -- (SDCycleScrollView *)bannerView { - if (!_bannerView) { - _bannerView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero - delegate:self - placeholderImage:[UIImageConstant defaultBannerPlaceholder]]; - _bannerView.backgroundColor = [UIColor clearColor]; - _bannerView.layer.cornerRadius = 12; - _bannerView.layer.masksToBounds = YES; - _bannerView.showPageControl = YES; - _bannerView.autoScrollTimeInterval = 5.0; - _bannerView.pageControlDotSize = CGSizeMake(3, 3); - _bannerView.pageDotColor = [UIColor lightGrayColor]; - _bannerView.currentPageDotColor = [UIColor darkGrayColor]; - _bannerView.bannerImageViewContentMode = UIViewContentModeScaleToFill; - if (isMSRTL()) { - for (UIView *subView in _bannerView.subviews) { - subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - } - } - return _bannerView; -} - -- (void)prepareForReuse { - [super prepareForReuse]; - // 安全释放：停止轮播并清理数据，避免离屏仍占用内存/CPU - self.bannerView.autoScroll = NO; - self.bannerView.imageURLStringsGroup = nil; -} - -- (void)stopAndRelease { - // 离屏时显式停止以释放资源 - self.bannerView.autoScroll = NO; -} - -// 进入可见区域后恢复滚动（由 VC 调用） -- (void)resumeIfNeeded { - if (self.bannerView.imageURLStringsGroup.count > 0) { - self.bannerView.autoScroll = YES; - } -} - -#pragma mark - SDCycleScrollViewDelegate -- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index { - HomeBannerInfoModel * bannerInfo = [self.bannerInfoList xpSafeObjectAtIndex:index]; - if (bannerInfo && self.didTapBannerItem) { - self.didTapBannerItem(bannerInfo); - } -} - -@end - - -@interface XPHomePartyViewController () -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; - -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///当前的页数 -@property (nonatomic,assign) int page; -///没有新的数据了 -@property (nonatomic,assign) BOOL hasNoMoreData; -///布局模式：YES为两列，NO为一列 -@property (nonatomic,assign) BOOL isTwoColumnLayout; - - -@end - -@implementation XPHomePartyViewController - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (XPHomePresenter *)createPresenter { - return [[XPHomePresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self loadLayoutTypeFromCache]; - [self initSubViews]; - [self initSubViewConstraints]; - [self setupLayoutNotification]; - [self updateCollectionViewLayout]; -} - -- (void)starBeginHeaderRefresh { - -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.collectionView]; -} - -- (void)loadLayoutTypeFromCache { - // 从 UserDefaults 读取缓存的布局类型；若无记录，则默认两列以降低进入内存消耗 - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - id storedValue = [defaults objectForKey:kHomeLayoutTypeKey]; - if (storedValue == nil) { - self.isTwoColumnLayout = YES; // 默认两列 - [defaults setBool:YES forKey:kHomeLayoutTypeKey]; - [defaults synchronize]; - } else { - self.isTwoColumnLayout = [storedValue boolValue]; - } -} - -- (void)saveLayoutTypeToCache { - // 保存当前布局类型到 UserDefaults - [[NSUserDefaults standardUserDefaults] setBool:self.isTwoColumnLayout forKey:kHomeLayoutTypeKey]; - [[NSUserDefaults standardUserDefaults] synchronize]; -} - -- (void)setupLayoutNotification { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleLayoutToggle) - name:@"kHomeLayoutToggle" - object:nil]; -} - -- (void)handleLayoutToggle { - self.isTwoColumnLayout = !self.isTwoColumnLayout; - [self saveLayoutTypeToCache]; - [self processCurrentDataSourceForLayout]; - [self updateCollectionViewLayout]; - [self.collectionView reloadData]; -} - -- (void)processCurrentDataSourceForLayout { - if (self.datasource.count == 0) return; - - // 先移除所有占位model和banner，重新构建数据源 - NSMutableArray *nonBannerItems = [NSMutableArray array]; - NSArray *bannerData = nil; - - for (id item in self.datasource) { - if ([item isKindOfClass:[NSArray class]]) { - bannerData = item; // 保存banner数据 - } else if (![item isKindOfClass:[XPBlankRoomModel class]]) { - [nonBannerItems addObject:item]; // 保存非banner、非占位的数据 - } - } - - // 根据布局模式处理数据 - if (self.isTwoColumnLayout) { - // 两列布局：为奇数个非banner元素添加占位model - NSInteger nonBannerCount = nonBannerItems.count; - - // 如果非banner元素为奇数个，添加占位model - if (nonBannerCount % 2 != 0) { - [nonBannerItems addObject:[[XPBlankRoomModel alloc] init]]; - } - } - - // 重新构建数据源：先添加非banner数据，再插入banner - NSMutableArray *newDataSource = [NSMutableArray arrayWithArray:nonBannerItems]; - - if (bannerData) { - // 根据布局模式确定banner插入位置：两列布局位置6，一列布局位置5 - NSInteger insertIndex = self.isTwoColumnLayout ? 6 : 5; - if (newDataSource.count < insertIndex) { - [newDataSource addObject:bannerData]; - } else { - [newDataSource insertObject:bannerData atIndex:insertIndex]; - } - } - - self.datasource = newDataSource; -} - -- (void)updateCollectionViewLayout { - if ([self.collectionView.collectionViewLayout isKindOfClass:[MSBaseRTLFlowLayout class]]) { - MSBaseRTLFlowLayout *layout = (MSBaseRTLFlowLayout *)self.collectionView.collectionViewLayout; - CGFloat topInset = self.isTwoColumnLayout ? 4 : 20; - CGFloat bottomInset = self.isTwoColumnLayout ? 40 : 0; - layout.sectionInset = UIEdgeInsetsMake(topInset, 15, bottomInset, 15); - } -} - -- (NSArray *)processDataSourceForLayout:(NSArray *)originalList { - if (originalList.count == 0) return originalList; - - if (self.isTwoColumnLayout) { - // 两列布局：为奇数个非banner元素添加占位model - NSMutableArray *processedDataSource = [NSMutableArray arrayWithArray:originalList]; - NSInteger nonBannerCount = 0; - - for (id item in originalList) { - if (![item isKindOfClass:[NSArray class]]) { - nonBannerCount++; - } - } - - // 如果非banner元素为奇数个，添加占位model - if (nonBannerCount % 2 != 0) { - // 找到最后一个非banner元素的位置，在其后插入占位model - NSInteger insertIndex = -1; - for (NSInteger i = processedDataSource.count - 1; i >= 0; i--) { - id item = processedDataSource[i]; - if (![item isKindOfClass:[NSArray class]]) { - insertIndex = i + 1; - break; - } - } - - if (insertIndex >= 0) { - [processedDataSource insertObject:[[XPBlankRoomModel alloc] init] atIndex:insertIndex]; - } else { - [processedDataSource addObject:[[XPBlankRoomModel alloc] init]]; - } - } - - return processedDataSource; - } else { - // 一列布局：移除所有占位model - NSMutableArray *processedDataSource = [NSMutableArray array]; - for (id item in originalList) { - if (![item isKindOfClass:[XPBlankRoomModel class]]) { - [processedDataSource addObject:item]; - } - } - return processedDataSource; - } -} - -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(0); - make.leading.trailing.bottom.equalTo(self.view); - }]; - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.collectionView.mj_footer = footer; -} - -#pragma mark - 刷新的方法 -- (void)headerRefresh { - self.page = 1; - if ([self.tagModel.id isEqualToString:@"-11"]) { - [self.presenter getMyCollectRooms:self.page]; - } else if ([self.tagModel.id isEqualToString:@"-12"]) { - [self.presenter getMyRecentRooms:self.page]; - } else if([self.tagModel.id isEqualToString:@"-1"]){ - [self.presenter getHomePersonalRoomList]; - } else{ - [XNDJTDDLoadingTool showLoading]; - [self.presenter loadSecondBanner]; - } -} - --(void)footerRefresh{ - self.page++; - if ([self.tagModel.id isEqualToString:@"-11"]) { - [self.presenter getMyCollectRooms:self.page]; - } else if ([self.tagModel.id isEqualToString:@"-12"]) { - [self.presenter getMyRecentRooms:self.page]; - } else if([self.tagModel.id isEqualToString:@"-1"]){ - [self.collectionView.mj_footer endRefreshing]; - }else{ - [self.presenter getRecommendRoomList:self.tagModel.id page:self.page]; - } -} - -#pragma mark - UICollectionViewDelegate And UICollectionViewDataSource -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - if(self.datasource.count == 0){ - XPGuildEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class]) forIndexPath:indexPath]; - [cell setConstraints]; - [cell setTitle:YMLocalizedString(@"XPGuildEmptyCollectionViewCell0")]; - return cell; - } - - id item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - - // 检查是否为占位 model - if ([item isKindOfClass:[XPBlankRoomModel class]]) { - XPPartyRoomItemCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:[XPPartyRoomItemCollectionViewCell blankCellID] - forIndexPath:indexPath]; - cell.alpha = 0.0; - cell.contentView.hidden = YES; - return cell; - } - - if ([item isKindOfClass:[NSArray class]]) { - HomePartyBannerCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([HomePartyBannerCell class]) - forIndexPath:indexPath]; - cell.bannerInfoList = item; - @kWeakify(self); - [cell setDidTapBannerItem:^(HomeBannerInfoModel *model) { - @kStrongify(self); - if (self.didTapBannerItem) { - self.didTapBannerItem(model); - } - }]; - return cell; - } else { - if (self.isTwoColumnLayout) { - XPPartyRoomItemCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:[XPPartyRoomItemCollectionViewCell itemCellID] - forIndexPath:indexPath]; - cell.roomInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } else { - XPNewHomePartyCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPNewHomePartyCollectionViewCell class]) forIndexPath:indexPath]; - cell.roomInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } - } -} - -- (NSInteger)collectionView:(nonnull UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - if(self.datasource.count == 0) { - return 1; - } - - return self.datasource.count; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{ - if(self.datasource.count == 0) { - return self.collectionView.frame.size; - } - - id item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - - // 计算尺寸：两列模式非 banner 为正方形半宽；banner 始终全宽且固定高 - BOOL isBanner = [item isKindOfClass:[NSArray class]]; - if (isBanner) { - return CGSizeMake(kGetScaleWidth(345), kGetScaleWidth(105)); - } - if (self.isTwoColumnLayout || [item isKindOfClass:[XPBlankRoomModel class]]) { - CGFloat width = kGetScaleWidth(345)/2; - CGFloat height = width + 8; - return CGSizeMake(width, height); - } - return CGSizeMake(kGetScaleWidth(345), kGetScaleWidth(92)); -} - -- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath { - // 离屏安全释放：对不同类型 cell 做最小必要释放 - if ([cell isKindOfClass:[HomePartyBannerCell class]]) { - HomePartyBannerCell *bannerCell = (HomePartyBannerCell *)cell; - [bannerCell stopAndRelease]; - } else if ([cell isKindOfClass:[XPNewHomePartyCollectionViewCell class]]) { - // 触发其内部 prepareForReuse 等价释放 - [cell prepareForReuse]; - } else if ([cell isKindOfClass:[XPPartyRoomItemCollectionViewCell class]]) { - [cell prepareForReuse]; - } -} - -- (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath { - // 进入可见区：如为 banner，恢复自动滚动（若有数据） - if ([cell isKindOfClass:[HomePartyBannerCell class]]) { - HomePartyBannerCell *bannerCell = (HomePartyBannerCell *)cell; - [bannerCell resumeIfNeeded]; - } -} - --(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - id item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - - // 跳过占位 model 的点击 - if ([item isKindOfClass:[XPBlankRoomModel class]]) { - return; - } - - if ([item isKindOfClass:[HomePlayRoomModel class]]) { - HomePlayRoomModel * roomInfo = (HomePlayRoomModel *)item; - if (roomInfo.uid.length > 0) { - [XPRoomViewController openRoom:roomInfo.uid viewController:self]; - } - } -} - -#pragma mark - XPHomeProtocol -- (void)getHomePersonalRoomListSuccess:(NSArray *)list{ - [[NSNotificationCenter defaultCenter] postNotificationName:@"khomeVCRefreshComplete" object:nil]; - for (HomePlayRoomModel *model in list) { - model.width = [UILabel getWidthWithText:@(model.onlineNum).stringValue height:kGetScaleWidth(12) font:kFontBold(10)]+1; - } - - self.datasource = [NSMutableArray arrayWithArray:[self processDataSourceForLayout:list]]; - [self.collectionView reloadData]; -} - -- (void)getHomePersonalRoomListFail{ - [[NSNotificationCenter defaultCenter] postNotificationName:@"khomeVCRefreshComplete" object:nil]; -} - -- (NSMutableArray *)insertBannerData:(NSArray *)firstPageList { - // 先处理数据布局（在插入banner之前） - NSArray *processedList = [self processDataSourceForLayout:firstPageList]; - NSMutableArray *mutableArrayA = [processedList mutableCopy]; - - if (self.bannerInfoList.count > 0) { - // 根据布局模式确定banner插入位置：两列布局位置6，一列布局位置5 - NSInteger insertIndex = self.isTwoColumnLayout ? 6 : 5; - if (mutableArrayA.count < insertIndex) { - [mutableArrayA addObject:self.bannerInfoList]; - } else { - [mutableArrayA insertObject:self.bannerInfoList atIndex:insertIndex]; - } - } - - return mutableArrayA; -} - -- (void)getHomeRecommendRoomListSuccess:(NSArray *)list{ - - for (HomePlayRoomModel *model in list) { - model.width = [UILabel getWidthWithText:@(model.onlineNum).stringValue height:kGetScaleWidth(12) font:kFontBold(10)]+1; - } - - if(self.page == 1){ - self.datasource = [self insertBannerData:list]; - }else{ - NSArray *processedList = [self processDataSourceForLayout:list]; - [self.datasource addObjectsFromArray:processedList]; - } - [self.collectionView reloadData]; - [[NSNotificationCenter defaultCenter]postNotificationName:@"khomeVCRefreshComplete" object:nil]; - [self.collectionView.mj_footer endRefreshing]; - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XNDJTDDLoadingTool hideHUD]; - }); -} - -- (void)getHomeSecondBannerSuccess:(NSArray *)banners { - self.bannerInfoList = banners; - [self.presenter getRecommendRoomList:self.tagModel.id - page:self.page]; -} - -- (void)getHomeRecommendRoomListFail:(NSString *)message{ - self.page--; - [self.collectionView.mj_footer endRefreshing]; - [[NSNotificationCenter defaultCenter]postNotificationName:@"khomeVCRefreshComplete" object:nil]; - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XNDJTDDLoadingTool hideHUD]; - }); -} - -- (void)getMineCollectRoomsSuccess:(NSArray *)rooms { - [[NSNotificationCenter defaultCenter]postNotificationName:@"khomeVCRefreshComplete" object:nil]; - [self.collectionView.mj_footer endRefreshing]; - for (HomePlayRoomModel *model in rooms) { - model.width = [UILabel getWidthWithText:@(model.onlineNum).stringValue - height:kGetScaleWidth(12) - font:kFontBold(10)] + 1; - } - if(self.page == 1){ - self.datasource = [NSMutableArray arrayWithArray:[self processDataSourceForLayout:rooms]]; - }else{ - NSArray *processedList = [self processDataSourceForLayout:rooms]; - [self.datasource addObjectsFromArray:processedList]; - } - [self.collectionView reloadData]; -} - -- (void)getMineRecentRoomsSuccess:(NSArray *)rooms { - [[NSNotificationCenter defaultCenter]postNotificationName:@"khomeVCRefreshComplete" object:nil]; - [self.collectionView.mj_footer endRefreshing]; - for (HomePlayRoomModel *model in rooms) { - model.width = [UILabel getWidthWithText:@(model.onlineNum).stringValue - height:kGetScaleWidth(12) - font:kFontBold(10)] + 1; - } - if(self.page == 1){ - self.datasource = [NSMutableArray arrayWithArray:[self processDataSourceForLayout:rooms]]; - }else{ - NSArray *processedList = [self processDataSourceForLayout:rooms]; - [self.datasource addObjectsFromArray:processedList]; - } - [self.collectionView reloadData]; -} - - -#pragma mark - JXPagingViewListViewDelegate -- (UIScrollView *)listScrollView { - return self.collectionView; -} - -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - self.scrollCallback = callback; -} - -- (UIView *)listView { - return self.view; -} - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - if(self.scrollCallback){ - self.scrollCallback(scrollView); - } -} - -- (void)listDidAppear { - if (self.didAppear && self.tagModel) { - self.didAppear(self.tagModel); - } -} - -#pragma mark - Getters And Setters - --(void)setTagModel:(PIHomeCategoryTitleModel *)tagModel{ - _tagModel = tagModel; - @kWeakify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self headerRefresh]; - }); -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.minimumInteritemSpacing = kGetScaleWidth(0); - layout.minimumLineSpacing = kGetScaleWidth(18); - CGFloat topInset = self.isTwoColumnLayout ? 4 : 20; - layout.sectionInset = UIEdgeInsetsMake(topInset, 15, 0, 15); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.tag = 78574; - [_collectionView registerClass:[XPNewHomePartyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPNewHomePartyCollectionViewCell class])]; - [_collectionView registerClass:[XPGuildEmptyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class])]; - [_collectionView registerClass:[HomePartyBannerCell class] forCellWithReuseIdentifier:NSStringFromClass([HomePartyBannerCell class])]; - [_collectionView registerClass:[XPPartyRoomItemCollectionViewCell class] forCellWithReuseIdentifier:[XPPartyRoomItemCollectionViewCell blankCellID]]; - [_collectionView registerClass:[XPPartyRoomItemCollectionViewCell class] forCellWithReuseIdentifier:[XPPartyRoomItemCollectionViewCell itemCellID]]; - } - return _collectionView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - - -@end diff --git a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.h b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.h deleted file mode 100644 index 98e1b14..0000000 --- a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPNewHomeViewController.h -// YuMi -// -// Created by YuMi on 2023/6/18. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNewHomeViewController : MvpViewController --(instancetype)initWithIsEmpty:(BOOL)isEmpty; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m deleted file mode 100644 index cb4034c..0000000 --- a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m +++ /dev/null @@ -1,982 +0,0 @@ -// -// XPNewHomeViewController.m -// YuMi -// -// Created by YuMi on 2023/6/18. -// - -#import "XPNewHomeViewController.h" -///Third -#import -#import -#import -#import -#import -#import "SDWebImageManager.h" -#import -///Tool -#import "Api+Home.h" -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "YUMIHtmlUrl.h" -#import "UIImage+Utils.h" -#import "AccountInfoStorage.h" -#import "Api+Room.h" -#import "TTPopup.h" -#import "NSArray+Safe.h" -#import "XPWeakTimer.h" -#import "XPRoomAnimationHitView.h" -///Model -#import "HomeTagModel.h" -#import "AccountModel.h" -#import "XPLittleGameRoomOpenView.h" - -#import "PIHomeItemModel.h" - -#import "HomeMenuSourceModel.h" - -///View -#import "XPRoomSearchContainerViewController.h" -#import "XPHomePartyViewController.h" -#import "XPWebViewController.h" - -#import "XPNewHomeNavView.h" -#import "XPRoomViewController.h" -#import "XPNewHomeHeadView.h" -#import "PIHoemCategoryTitleView.h" -#import "XPHomeRecommendOtherRoomView.h" -///P -#import "XPHomeContainerPresenter.h" -#import "XPHomeContainerProtocol.h" -#import "ClientConfig.h" -#import "SessionViewController.h" -#import "Api+Main.h" -#import "LoginViewController.h" -#import "BaseNavigationController.h" -#import "XPAdImageTool.h" -#import "PIHomeCategoryTitleModel.h" - -#import "RegionListViewController.h" -#import "EventCenterViewController.h" - -UIKIT_EXTERN NSString * kHomeMoreScrollPageKey; -UIKIT_EXTERN NSString * const kOpenRoomNotification; - - -@interface HomeCategoryTabListCell : UICollectionViewCell -@property(nonatomic, assign) BOOL isSelected; -@property(nonatomic, strong) UIView *selectedBackground; -@property(nonatomic, strong) NetImageView *iconImageView; -@property(nonatomic, strong) PIHomeCategoryTitleModel *cellModel; -@property(nonatomic, copy) void(^didTapCategoryModel)(PIHomeCategoryTitleModel *model); -@end - -@implementation HomeCategoryTabListCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - if (self = [super initWithFrame:frame]) { - self.backgroundColor = [UIColor clearColor]; - [self.contentView setCornerRadius:15]; - self.contentView.backgroundColor = [UIColor whiteColor]; - [self.contentView addSubview:self.selectedBackground]; - [self.selectedBackground mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.contentView addSubview:self.iconImageView]; - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(36, 23)); - }]; - } - return self; -} - -- (void)setCellModel:(PIHomeCategoryTitleModel *)cellModel { - _cellModel = cellModel; - self.iconImageView.imageUrl = cellModel.icon; -} - -- (void)setSelected:(BOOL)selected { - [super setSelected:selected]; - self.selectedBackground.hidden = !selected; - if (selected && self.didTapCategoryModel) { - self.didTapCategoryModel(self.cellModel); - } -} - -#pragma mark - -- (UIView *)selectedBackground { - if (!_selectedBackground) { - _selectedBackground = [[UIView alloc] init]; - _selectedBackground.backgroundColor = [UIColor whiteColor]; - [_selectedBackground setCornerRadius:15 - corners:kCALayerMaxXMaxYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMinXMinYCorner - borderWidth:1 - borderColor:UIColorFromRGB(0xFF8C03)]; - _selectedBackground.hidden = YES; - } - return _selectedBackground; -} - -- (NetImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[NetImageView alloc] init]; - } - return _iconImageView; -} - -@end - -@interface HomeCategoryTabList : UIView - -@property(nonatomic, assign) NSInteger lastSelectedIndex; -@property(nonatomic, strong) UIButton *arrowButton; -@property(nonatomic, strong) UIView *gradientMask; -@property(nonatomic, strong) UICollectionView *tabCollectionView; -@property(nonatomic, copy) NSArray *tabArray; -@property(nonatomic, copy) void(^didTapCategoryModel)(PIHomeCategoryTitleModel *model); -@property(nonatomic, copy) void(^didTapArrow)(void); -@property(nonatomic, assign) BOOL firstLoad; - -- (void)closeArrow; -- (void)updateIndex:(NSInteger)index; - -@end - -@implementation HomeCategoryTabList - -- (instancetype)init { - if (self = [super init]) { - self.backgroundColor = [[ClientConfig shareConfig] bgColor]; - self.lastSelectedIndex = -1; - self.firstLoad = YES; - [self addSubview:self.tabCollectionView]; - [self addSubview:self.arrowButton]; - - [self.tabCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(self); - make.leading.mas_equalTo(0); - make.trailing.mas_equalTo(self).offset(-15); - }]; - - [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(24, 24)); - make.trailing.mas_equalTo(-15); - }]; - - _gradientMask = [[UIView alloc] init]; - NSArray *colorArr = @[[UIColor colorWithWhite:1 alpha:0.0], - [[ClientConfig shareConfig] bgColor]]; - if (isMSRTL()) { - colorArr = @[[[ClientConfig shareConfig] bgColor], - [UIColor colorWithWhite:1 alpha:0.0]]; - [_gradientMask addGradientBackgroundWithColors:colorArr - startPoint:CGPointMake(0.7, 0.5) - endPoint:CGPointMake(1.0, 0.5) - cornerRadius:0]; - } else { - [_gradientMask addGradientBackgroundWithColors:colorArr - startPoint:CGPointMake(0.2, 0.5) - endPoint:CGPointMake(0.4, 0.5) - cornerRadius:0]; - } - [self insertSubview:self.gradientMask belowSubview:self.arrowButton]; - [self.gradientMask mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.arrowButton).offset(-20); - make.trailing.mas_equalTo(self); - make.top.bottom.mas_equalTo(self); - }]; - - } - return self; -} - -- (void)handleTapArrow { - if (_didTapArrow) { - self.didTapArrow(); - } -} - -- (void)setTabArray:(NSArray *)tabArray { - if (tabArray == nil) { - tabArray = @[]; - } - _tabArray = tabArray; - // 如果 tab items 总长度到达或超过边缘，要显示箭头按钮 - if (46 * self.tabArray.count + 12 * (self.tabArray.count-1) > KScreenWidth-30) { - self.gradientMask.hidden = NO; - self.arrowButton.hidden = NO; - } else { - self.gradientMask.hidden = YES; - self.arrowButton.hidden = YES; - } - [self.tabCollectionView reloadData]; - if (tabArray.count > 0 && self.firstLoad == YES) { - self.firstLoad = NO; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.tabCollectionView selectItemAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] - animated:NO - scrollPosition:UICollectionViewScrollPositionNone]; - }); - } - - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - if (!self) { - return; - } - - if (tabArray.count > 0) { - if (self.lastSelectedIndex > -1 && self.lastSelectedIndex < tabArray.count - 1) { - [self.tabCollectionView selectItemAtIndexPath:[NSIndexPath indexPathForRow:self.lastSelectedIndex inSection:0] - animated:NO - scrollPosition:UICollectionViewScrollPositionNone]; - } else { - // 阿语环境可能会出现选中错误的 index - if (isMSRTL()) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.tabCollectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] - atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally - animated:YES]; - }); - } - } - } - }); -} - -- (void)closeArrow { - -} - -- (void)updateIndex:(NSInteger)index { - if (index == self.lastSelectedIndex) { - return; - } - if (index < self.tabArray.count) { - self.lastSelectedIndex = index; - [self.tabCollectionView selectItemAtIndexPath:[NSIndexPath indexPathForRow:index inSection:0] - animated:YES - scrollPosition:UICollectionViewScrollPositionNone]; - } -} - -#pragma mark - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.tabArray.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - HomeCategoryTabListCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"HomeCategoryTabListCell" forIndexPath:indexPath]; - cell.cellModel = [self.tabArray xpSafeObjectAtIndex:indexPath.row]; - @kWeakify(self); - [cell setDidTapCategoryModel:^(PIHomeCategoryTitleModel *model) { - @kStrongify(self); - if (self.didTapCategoryModel) { - self.didTapCategoryModel(model); - } - }]; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - self.lastSelectedIndex = indexPath.row; -} - -#pragma mark - -- (UIButton *)arrowButton { - if (!_arrowButton) { - _arrowButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _arrowButton.backgroundColor = [UIColor clearColor]; - [_arrowButton setImage:kImage(@"common_down_arrow") - forState:UIControlStateNormal]; - [_arrowButton addTarget:self - action:@selector(handleTapArrow) - forControlEvents:UIControlEventTouchUpInside]; - } - return _arrowButton; -} - -- (UIScrollView *)tabCollectionView { - if (!_tabCollectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(46, 30); - layout.minimumLineSpacing = 12; - layout.minimumInteritemSpacing = 12; - layout.sectionInset = UIEdgeInsetsMake(0, 14, 0, 30); - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _tabCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero - collectionViewLayout:layout]; - _tabCollectionView.backgroundColor = [UIColor clearColor]; - _tabCollectionView.showsHorizontalScrollIndicator = NO; - _tabCollectionView.delegate = self; - _tabCollectionView.dataSource = self; - [_tabCollectionView registerClass:[HomeCategoryTabListCell class] - forCellWithReuseIdentifier:@"HomeCategoryTabListCell"]; - } - return _tabCollectionView; -} - -@end - - -@interface XPNewHomeViewController ()< -JXPagerViewDelegate, -JXPagerMainTableViewGestureDelegate, -JXCategoryViewDelegate, -XPHomeContainerProtocol, -XPNewHomeNavViewDelegate, -XPNewHomeHeadViewDelegate, -XPHomeRecommendOtherRoomViewDelegate> - -///头视图 -@property(nonatomic,strong) XPNewHomeHeadView *headView; -///分页标题 -@property (nonatomic, strong) NSMutableArray *tagModelList; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -@property(nonatomic, strong) HomeCategoryTabList *categoryTagList; - -///分页lineView -@property (nonatomic, strong) JXPagerView *pagingView; - -@property (nonatomic,strong) HomeTagModel *recommendItem; -///解决弱网时首页底部出现一片空白bug -@property (nonatomic,assign) BOOL isEmpty; -@property(nonatomic,assign) BOOL isCheckIp; -@property(nonatomic,assign) NSInteger type; -@property(nonatomic,strong) NSMutableDictionary *validListDict; - -@property (nonatomic, copy) NSArray *bannerInfoList; -@property (nonatomic, copy) NSArray *secondBannerInfoList; - -@property(nonatomic, assign) NSInteger maxReloadTagsLimitCount; -@property(nonatomic, assign) NSInteger reloadTagsLimitCount; - -@property (nonatomic, assign) bool hasLoadAPIs; - -@end - -@implementation XPNewHomeViewController --(instancetype)initWithIsEmpty:(BOOL)isEmpty{ - self = [super init]; - if(self){ - self.isEmpty = isEmpty; - } - return self; -} - --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (XPHomeContainerPresenter *)createPresenter { - return [[XPHomeContainerPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - if(self.isEmpty == NO){ - self.maxReloadTagsLimitCount = 5; - self.reloadTagsLimitCount = 0; - - [self initSubViews]; - [self initSubViewConstraints]; - - [self requestCheckIp]; - } -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - - if (!self.hasLoadAPIs) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.pagingView.mainTableView.mj_header beginRefreshing]; - }); - self.hasLoadAPIs = YES; - } - -} - -- (void)tokenInvalid { - [[AccountInfoStorage instance] saveAccountInfo:nil]; - [[AccountInfoStorage instance] saveTicket:nil]; - if ([NIMSDK sharedSDK].loginManager.isLogined) { - [[NIMSDK sharedSDK].loginManager logout:nil]; - } - LoginViewController *lvc = [[LoginViewController alloc] init]; - BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:lvc]; - nav.modalPresentationStyle = UIModalPresentationFullScreen; - kWindow.rootViewController = nav; - XPAdImageTool.shareImageTool.isImLogin = NO; -} - -- (void)createTagScrollView { - if (_categoryTagList) { - return; - } - - [self.titleView addSubview:self.categoryTagList]; - [self.categoryTagList mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.titleView); - }]; -} - -#pragma mark - Private Method - -- (void)initSubViews { - self.type = 0; - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.pagingView]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(openRoomNotification:) - name:kOpenRoomNotification - object:nil]; - - if([[AccountInfoStorage instance] getUid].length == 0){ - return; - } - - if([ClientConfig shareConfig].roomId != nil){ - [self opRoom:[ClientConfig shareConfig].roomId]; - [ClientConfig shareConfig].roomId = nil; - } - - if([ClientConfig shareConfig].chatId != nil){ - NIMSession * session = [NIMSession session:[ClientConfig shareConfig].chatId type:NIMSessionTypeP2P]; - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:session]; - sessionVC.isAttention = YES; - [self.navigationController pushViewController:sessionVC animated:YES]; - [ClientConfig shareConfig].chatId = nil; - } - - if([ClientConfig shareConfig].pushChatId != nil){ - NIMSession * session = [NIMSession session:[ClientConfig shareConfig].pushChatId type:NIMSessionTypeP2P]; - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:session]; - [self.navigationController pushViewController:sessionVC animated:YES]; - [ClientConfig shareConfig].pushChatId = nil; - } - - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.pagingView.mainTableView.mj_header = header; - [ClientConfig shareConfig].inviteCode = @""; - - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(homeVCRefreshComplete) name:@"khomeVCRefreshComplete" object:nil]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(logOut) name:@"kInLoginVC" object:nil]; - -// [header beginRefreshing]; -} - --(void)homeVCRefreshComplete{ - [self.pagingView.mainTableView.mj_header endRefreshing]; - [self.pagingView.mainTableView.mj_footer endRefreshing]; -} - --(void)logOut{ - [NSObject cancelPreviousPerformRequestsWithTarget:self - selector:@selector(requestCheckIp) - object:nil]; -} - --(void)headerRefresh{ - [self.presenter getHomeTopData]; - [self.presenter getHomeTagList]; - [self.presenter getHomeRanks]; - - PIHomeCategoryTitleModel *tagModel = [self.tagModelList xpSafeObjectAtIndex:self.type]; - XPHomePartyViewController *homeVC = [self.validListDict objectForKey:[NSNumber numberWithInteger:self.type]]; - homeVC.tagModel = tagModel; - homeVC.bannerInfoList = self.bannerInfoList; - @kWeakify(self); - [homeVC setDidTapBannerItem:^(HomeBannerInfoModel * _Nonnull itemModel) { - @kStrongify(self); - [self handleTapBannerItem:itemModel]; - }]; -} - --(void)openRoomNotification:(NSNotification *)notification{ - if([[AccountInfoStorage instance] getUid].length == 0){ - return; - } - NSString *uid = notification.userInfo[@"uid"]; - NSString *type = notification.userInfo[@"type"]; - BOOL isNoAttention = [notification.userInfo[@"isNoAttention"] boolValue]; - if([type isEqualToString:@"kOpenChat"]){ - if (uid.length > 0) { - NIMSession * session = [NIMSession session:uid type:NIMSessionTypeP2P]; - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:session]; - sessionVC.isAttention = !isNoAttention; - [self.navigationController pushViewController:sessionVC animated:YES]; - if(isNoAttention == YES){ - [ClientConfig shareConfig].pushChatId = nil; - }else{ - [ClientConfig shareConfig].chatId = nil; - } - } - return; - } - - ClientConfig *config = [ClientConfig shareConfig]; - config.chatId = uid; - if(uid != nil){ - [self opRoom:uid]; - [ClientConfig shareConfig].roomId = nil; - } -} -- (void)initSubViewConstraints { - [self.pagingView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.view).mas_offset(10); - make.leading.bottom.trailing.mas_equalTo(0); - }]; -} - -- (void)showAllTags { - RegionListViewController *vc = [[RegionListViewController alloc] initForHomeTags:self.tagModelList - currentItem:self.tagModelList[self.titleView.selectedIndex]]; - @kWeakify(self); - vc.handleDismiss = ^{ - @kStrongify(self); - [self.categoryTagList closeArrow]; - }; - vc.handleTapCategiryComfirm = ^(PIHomeCategoryTitleModel *tagModel) { - @kStrongify(self); - NSInteger index = [self.tagModelList indexOfObject:tagModel]; - [self.titleView selectItemAtIndex:index]; - [self.categoryTagList updateIndex:index]; - }; - [self presentViewController:vc animated:YES completion:^{ }]; -} - -#pragma mark - XPNewHomeNavViewDelegate -- (void)xPNewHomeNavView:(XPNewHomeNavView *)view didClickRank:(UIButton *)sender { - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kRankV2); - [self.navigationController pushViewController:webVC animated:YES]; -} - -- (void)xPNewHomeNavView:(XPNewHomeNavView *)view didClickOpenRoom:(UIButton *)sender { - NSString* roomUid = [AccountInfoStorage instance].getUid; - [self opRoom:roomUid]; -} - --(void)opRoom:(NSString *)roomUid{ - @kWeakify(self); - [Api getRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if(code == 401){ - [self tokenInvalid]; - [self showErrorToast:msg]; - return; - } - - if (code == 200) { - RoomInfoModel * roomInfo = [RoomInfoModel modelWithJSON:data.data]; - if (roomInfo.isReselect) { - XPLittleGameRoomOpenView * roomOpenView = [[XPLittleGameRoomOpenView alloc] init]; - roomOpenView.roomInfo = roomInfo; - roomOpenView.currentVC = self; - [TTPopup popupView:roomOpenView style:TTPopupStyleActionSheet]; - } else { - [XPRoomViewController openRoom:roomUid viewController:self]; - } - } else { - [self showErrorToast:msg]; - } - } uid:roomUid intoUid:roomUid]; -} - -- (void)xPNewHomeNavView:(XPNewHomeNavView *)view didClickSearch:(UIView *)sender { - XPRoomSearchContainerViewController * searchVC = [[XPRoomSearchContainerViewController alloc] init]; - searchVC.modalPresentationStyle = UIModalPresentationFullScreen; - [self.navigationController presentViewController:searchVC animated:YES completion:nil]; -} - -#pragma mark - JXCategoryViewDelegate -- (NSUInteger)tableHeaderViewHeightInPagerView:(JXPagerView *)pagerView { - if (self.headView.bannerList.count == 0){ - return kGetScaleWidth(80); - } - return kGetScaleWidth(170); -} - -- (UIView *)tableHeaderViewInPagerView:(JXPagerView *)pagerView { - return self.headView; -} -- (NSUInteger)heightForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return kGetScaleWidth(40); -} -- (UIView *)viewForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return self.titleView; -} - -- (NSInteger)numberOfListsInPagerView:(JXPagerView *)pagerView { - return self.tagModelList.count; -} - -- (id)pagerView:(JXPagerView *)pagerView initListAtIndex:(NSInteger)index { - id homeV = [self.validListDict objectForKey:@(index)]; - if (homeV) { - return homeV; - } - - XPHomePartyViewController *homeVC = [[XPHomePartyViewController alloc] init]; - homeVC.bannerInfoList = self.bannerInfoList; - homeVC.tagModel = [self.tagModelList xpSafeObjectAtIndex:index]; - @kWeakify(self); - [homeVC setDidTapBannerItem:^(HomeBannerInfoModel * _Nonnull itemModel) { - @kStrongify(self); - [self handleTapBannerItem:itemModel]; - }]; - [homeVC setDidAppear:^(PIHomeCategoryTitleModel * _Nonnull displayModel) { - @kStrongify(self); - if (self.validListDict.count > 1) { - NSInteger currentIndex = [self.tagModelList indexOfObject:displayModel]; - [self.titleView selectItemAtIndex:index]; - [self.categoryTagList updateIndex:currentIndex]; - } - }]; - [self.validListDict setObject:homeVC forKey:@(index)]; - - return homeVC; -} - -- (NSString *)pagerView:(JXPagerView *)pagerView listIdentifierAtIndex:(NSInteger)index { - - return @(index).stringValue; -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} - -#pragma mark - JXPagerMainTableViewGestureDelegate -- (BOOL)mainTableViewGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { - // 优化手势冲突处理逻辑 - - // 1. 禁止categoryView左右滑动的时候，上下和左右都可以滚动 - if (otherGestureRecognizer.view == self.pagingView.listContainerView) { - return NO; - } - - // 2. 处理特定tag的视图手势冲突 - if(otherGestureRecognizer.view.tag == 9000001){ - return NO; - } - if(otherGestureRecognizer.view.tag == 9000002){ - return NO; - } - if(otherGestureRecognizer.view.tag == 98777){ - return NO; - } - -// // 3. 处理RoomAnimationView的banner手势冲突 -// // 检查otherGestureRecognizer是否来自RoomAnimationView的bannerContainer -// if ([otherGestureRecognizer.view isKindOfClass:[XPRoomAnimationHitView class]] && -// [NSStringFromClass([otherGestureRecognizer.view class]) containsString:@"XPRoomAnimationHitView"]) { -// // 如果是bannerContainer的手势，允许同时识别，但优先级较低 -// NSLog(@"🎯 JXPagerView与Banner手势冲突处理: 允许同时识别"); -// return YES; -// } - - // 4. 默认处理：只允许Pan手势同时识别 - return [gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] && [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]]; -} -#pragma mark - XPHomeContainerProtocol -- (void)getHomeTopDataSuccess:(NSArray*)list menuList:(NSArray *)memuList{ - self.headView.bannerList = list; - self.bannerInfoList = list; - [self.pagingView reloadData]; - [self.pagingView resizeTableHeaderViewHeightWithAnimatable:NO duration:0 curve:0]; -} - -- (void)getHomeTopDataSuccess:(NSArray *)resourceList - banners:(NSArray *)banners - rankAvatars:(NSArray *)rankAvatars { - self.headView.bannerList = banners; - self.headView.rankAvatars = rankAvatars; - [self.pagingView reloadData]; - [self.pagingView resizeTableHeaderViewHeightWithAnimatable:NO duration:0 curve:0]; -} - -- (void)getHomeRanksSuccess:(NSArray *)resourceList -{ - self.headView.rankAvatars = resourceList; -} - -///获取所有的tag成功 -- (void)getHomeTagListSuccess:(NSArray *)array{ - if(array.count == 0) { - [self getHomeTagListFailure]; - return; - } - - self.reloadTagsLimitCount = 0; - - NSMutableArray *list = [NSMutableArray new]; - NSMutableArray *titleArray = [NSMutableArray array]; - for (PIHomeCategoryTitleModel *model in array) { - if (model.isHomeRecommend == 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.titles = titleArray; - [self.titleView reloadData]; - - [self createTagScrollView]; - [self.categoryTagList setTabArray:list]; -} - -- (void)getHomeTagListFailure { - [self.pagingView.mainTableView.mj_header endRefreshing]; - [self tryReloadTags]; -} - -- (void)tryReloadTags { - if (self.reloadTagsLimitCount >= self.maxReloadTagsLimitCount) { - return; - } - self.reloadTagsLimitCount += 1; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.pagingView.mainTableView.mj_header beginRefreshing]; - }); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.presenter getHomeTagList]; - }); -} - -- (void)displayEmpatyDataView { - -} - -- (void)homeChatPickSuccess:(NSString *)uid { - /// 跳聊天 - NSString *sessionId = uid; - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeP2P]; - SessionViewController *sessionVC = [[SessionViewController alloc] initWithSession:session]; - [self.navigationController pushViewController:sessionVC animated:YES]; -} - -- (void)homeChatPickFail:(NSString *)msg { - -} - -- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index{ - self.type = index; -} - - - -#pragma mark - XPNewHomeHeadViewDelegate -/// --(void)checkIpRegionSuccess:(NSInteger)seconds{ - if(seconds <= 0)return; - [self performSelector:@selector(requestCheckIp) withObject:nil afterDelay:seconds]; -} -- (void)checkIpRegionFailWithMsg:(NSString *)msg{ - [self tokenInvalid]; - [self showErrorToast:msg]; -} --(void)requestCheckIp{ - if([AccountInfoStorage instance].getTicket.length > 0 && - [AccountInfoStorage instance].name.length > 0){ - [self.presenter checkIpRegionAction]; - } -} -///选择 -- (void)selectItemAtIndexPath:(NSIndexPath *)indexPath { - switch (indexPath.row) { - case 0: { - // TODO: 通过 API 来获取最新的 排行榜 link - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kRankV2); - [self.navigationController pushViewController:webVC animated:YES]; - } - break; - case 1: { - EventCenterViewController *vc = [[EventCenterViewController alloc] init]; - [self.navigationController pushViewController:vc animated:YES]; - } - break; - default: - break; - } -} - -//-(void)selectItemWithModel:(PIHomeItemModel *)model{ -// switch (model.resourceType) { -// case HomeMenuResourceType_H5: { -// XPWebViewController * webVC = [[ XPWebViewController alloc] initWithRoomUID:nil]; -// webVC.url = model.resourceContent; -// [self.navigationController pushViewController:webVC animated:YES]; -// } -// break; -// case HomeMenuResourceType_Match: -// [self.presenter homeChatPick]; -// break; -// case HomeMenuResourceType_Room_Game: { -// @kWeakify(self); -// [Api homePickResource:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { -// @kStrongify(self); -// if (code == 200) { -// HomeMenuSourceModel * sourceModel = [HomeMenuSourceModel modelWithDictionary:data.data]; -// if (sourceModel.isPick) { -// if (sourceModel.uid.integerValue > 0) { -// [XPRoomViewController openRoom:sourceModel.uid fromNick:nil fromType:UserEnterRoomFromType_Home_Recommend fromUid:nil viewController:self]; -// } -// } else { -// XPHomeRecommendOtherRoomView * recommendView = [[XPHomeRecommendOtherRoomView alloc] init]; -// recommendView.delegate = self; -// recommendView.roomInfo = sourceModel; -// [TTPopup popupView:recommendView style:TTPopupStyleAlert]; -// } -// } else { -// [XNDJTDDLoadingTool showErrorWithMessage:msg]; -// } -// } uid:uid rid:model.ID]; -// } -// default: -// { -// EventCenterViewController *vc = [[EventCenterViewController alloc] init]; -// [self.navigationController pushViewController:vc animated:YES]; -// vc.officialEventModels = self.headView.bannerList; -// } -// break; -// } -//} - --(void)selectBannerListWithModel:(HomeBannerInfoModel *)model{ - [self handleTapBannerItem:model]; -} -///点击了进入房间 -- (void)xPHomeRecommendOtherRoomView:(XPHomeRecommendOtherRoomView *)view didClickEnterRoom:(HomeMenuSourceModel *)model{ - if (model.uid.integerValue > 0) { - [XPRoomViewController openRoom:model.uid fromNick:nil fromType:UserEnterRoomFromType_Home_Recommend fromUid:nil viewController:self]; - } -} - -#pragma mark - -- (void)handleTapBannerItem:(HomeBannerInfoModel *)model { - switch (model.skipType) { - case HomeBannerInfoSkipType_Room:{ - if (model.skipUri.length > 0) { - [XPRoomViewController openRoom:model.skipUri viewController:self]; - } - } - break; - case HomeBannerInfoSkipType_Web: - case HomeBannerInfoSkipType_Web_CP: - case HomeBannerInfoSkipType_Web_Custom: - case HomeBannerInfoSkipType_Web_WeekStar: - { - XPWebViewController *vc = [[XPWebViewController alloc] initWithRoomUID:nil]; - vc.url = model.skipUri; - [self.navigationController pushViewController:vc animated:YES]; - } - break; - case HomeBannerInfoSkipType_APP: - case HomeBannerInfoSkipType_None: - default: - break; - } -} - -#pragma mark - Getters And Setters -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] initWithFrame:CGRectZero]; - _titleView.delegate = self; - _titleView.titles = @[]; - _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = UIColorFromRGB(0x767585); - _titleView.titleSelectedColor = UIColorFromRGB(0x1E1E1E); - _titleView.titleFont = kFontBold(14); - _titleView.titleSelectedFont = kFontBold(14); - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - - _titleView.cellSpacing = kGetScaleWidth(20); - - _titleView.listContainer = (id)self.pagingView.listContainerView; - } - return _titleView; -} - - -- (NSMutableArray *)tagModelList{ - if(!_tagModelList){ - _tagModelList = [NSMutableArray array]; - } - return _tagModelList; -} -- (JXPagerView *)pagingView { - if (!_pagingView) { - _pagingView = [[JXPagerView alloc] initWithDelegate:self listContainerType:0]; - _pagingView.mainTableView.gestureDelegate = self; - _pagingView.backgroundColor = [UIColor clearColor]; - _pagingView.listContainerView.backgroundColor = [UIColor clearColor]; - _pagingView.listContainerView.listCellBackgroundColor = [UIColor clearColor]; - _pagingView.mainTableView.backgroundColor = [UIColor clearColor]; - } - return _pagingView; -} -- (HomeTagModel *)recommendItem { - if (!_recommendItem) { - _recommendItem = [[HomeTagModel alloc] init]; - _recommendItem.name = YMLocalizedString(@"XPNewHomeViewController3"); - } - return _recommendItem; -} - -- (XPNewHomeHeadView *)headView{ - if(!_headView){ - _headView = [[XPNewHomeHeadView alloc]initWithFrame:CGRectZero]; - _headView.delegate = self; - } - return _headView; -} - -- (NSMutableDictionary *)validListDict{ - if(!_validListDict){ - _validListDict = [NSMutableDictionary dictionary]; - } - return _validListDict; -} - -- (HomeCategoryTabList *)categoryTagList { - if (!_categoryTagList) { - _categoryTagList = [[HomeCategoryTabList alloc] init]; - @kWeakify(self); - [_categoryTagList setDidTapArrow:^{ - @kStrongify(self); - [self showAllTags]; - }]; - [_categoryTagList setDidTapCategoryModel:^(PIHomeCategoryTitleModel *model) { - @kStrongify(self); - NSInteger index = [self.tagModelList indexOfObject:model]; - [self.titleView selectItemAtIndex:index]; - }]; - } - return _categoryTagList; -} -@end diff --git a/YuMi/Modules/YMRTC/RtcDelegate.h b/YuMi/Modules/YMRTC/RtcDelegate.h deleted file mode 100644 index 136c5e8..0000000 --- a/YuMi/Modules/YMRTC/RtcDelegate.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// RTCDelegate.h -// YUMI -// -// Created by zu on 2021/10/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol RtcDelegate - -/** - 当前正在讲话的用户回调。 - */ -- (void)usersSpeaking:(NSMutableArray * _Nullable)uids; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRTC/RtcImpl/BaseRtcImpl.h b/YuMi/Modules/YMRTC/RtcImpl/BaseRtcImpl.h deleted file mode 100644 index a3b0ede..0000000 --- a/YuMi/Modules/YMRTC/RtcImpl/BaseRtcImpl.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// RTCBaseImpl.h -// YUMI -// -// Created by zu on 2021/10/19. -// - -#import -#import "RtcInterface.h" -#import "RtcImplDelegate.h" -#import "AccountInfoStorage.h" -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -UIKIT_EXTERN NSString * kRoomBackMusicPlayMusicFinishKey; - -@interface BaseRtcImpl : PIBaseModel - -@property (nonatomic,weak) id delegate; - -- (instancetype)initWithDelegate:(id)delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRTC/RtcImpl/BaseRtcImpl.m b/YuMi/Modules/YMRTC/RtcImpl/BaseRtcImpl.m deleted file mode 100644 index de59eff..0000000 --- a/YuMi/Modules/YMRTC/RtcImpl/BaseRtcImpl.m +++ /dev/null @@ -1,52 +0,0 @@ -// -// RTCBaseImpl.m -// YUMI -// -// Created by zu on 2021/10/19. -// - -#import "BaseRtcImpl.h" - -@implementation BaseRtcImpl - -- (instancetype)initWithDelegate:(id)delegate{ - self = [super init]; - if (self) { - self.delegate = delegate; - } - return self; -} - -- (BOOL)joinChannel:(nonnull NSString *)channelId completion:(void (^ _Nullable)(void))completion { - return NO; -} - -- (BOOL)muteRemote:(BOOL)mute { - return NO; -} - -- (void)broadcast:(BOOL)on { - -} - -- (BOOL)muteLocal:(BOOL)mute { - return NO; -} - -- (void)exitChannel:(void (^ _Nullable)(void))completion { - -} - -- (void)destory { - -} -///发起跨房PK -- (void)connectOtherRoom:(NSString *)roomUid userId:(NSString *)uid{ - -} - -///退出跨房通话 -- (void)disconnectOtherRoom{ - -} -@end diff --git a/YuMi/Modules/YMRTC/RtcImpl/RtcImplDelegate.h b/YuMi/Modules/YMRTC/RtcImpl/RtcImplDelegate.h deleted file mode 100644 index 6d465e7..0000000 --- a/YuMi/Modules/YMRTC/RtcImpl/RtcImplDelegate.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// RtcImplDelegate.h -// YUMI -// -// Created by zu on 2021/10/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol RtcImplDelegate - -/** - 用户讲话回调。 - */ -- (void)usersSpeaking:(NSMutableArray * _Nullable)uids; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRTC/RtcImpl/RtcInterface.h b/YuMi/Modules/YMRTC/RtcImpl/RtcInterface.h deleted file mode 100644 index fcd5769..0000000 --- a/YuMi/Modules/YMRTC/RtcImpl/RtcInterface.h +++ /dev/null @@ -1,76 +0,0 @@ -// -// RtcInterface.h -// YUMI -// -// Created by zu on 2021/10/20. -// - -#import -#import "RtcManager.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol RtcInterface -@required -/** - 加入频道（房间） - */ -- (BOOL)joinChannel:(NSString *)channelId completion:(void(^ __nullable)(void))completion; -/** - 静音 - */ -- (BOOL)muteRemote:(BOOL)mute; -/** - 静音某个用户 - userId: 用户ID - */ -- (BOOL)muteRemote:(BOOL)mute userId:(NSString *)userId; -/** - 上下麦（说话） - */ -- (void)broadcast:(BOOL)on; - -/** - 闭麦 - */ -- (BOOL)muteLocal:(BOOL)mute; -/** - 退出频道 - */ -- (void)exitChannel:(void(^ __nullable)(void))completion; -/** - 销毁引擎 - */ -- (void)destory; - -@optional -/** - 加入频道（房间），TRTC 进房需要动态签名。 - */ -- (BOOL)joinChannel:(NSString *)channelId sign:(NSString *)sign completion:(void(^ __nullable)(void))completion; - -///发起跨房通话 -- (void)connectOtherRoom:(NSString *)roomUId userId:(NSString *)userId; - -///退出跨房通话 -- (void)disconnectOtherRoom; - - -/// @param filePath 音频文件的地址 -/// @param musicId TRTC自己要的 -- (BOOL)playBackMusic:(NSString *)filePath musicId:(int)musicId completion:(void (^)(NSString *))completion; - -/// 改变播放器的状态 -/// @param state 播放状态 -- (BOOL)changePlayState:(BackMusicPlayState)state; - -///背景音乐的音量大小 -- (void)updateMusicSound:(int)soundVol; - -///背景人声的音量大小 -- (void)updateUserSound:(int)soundVol; - -///获取人声音量大小 -- (NSInteger)loadUserSound; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.h b/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.h deleted file mode 100644 index fbe9c35..0000000 --- a/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// TRTCRtcImpl.h -// YUMI -// -// Created by zu on 2021/12/6. -// - -#import "BaseRtcImpl.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface TRTCRtcImpl : BaseRtcImpl - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m b/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m deleted file mode 100644 index 6985de2..0000000 --- a/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m +++ /dev/null @@ -1,251 +0,0 @@ -// -// TRTCRtcImpl.m -// YUMI -// -// Created by zu on 2021/12/6. -// - -#import "TRTCRtcImpl.h" -#import "YUMIConstant.h" -#import "YUMIMacroUitls.h" -#import - -@interface TRTCRtcImpl() - -@property (strong, nonatomic) TRTCCloud *engine; -///背景音乐管理 -@property (nonatomic, strong) TXAudioEffectManager *musicManager; -///音乐播放完成 -@property (nonatomic,copy) void(^MusicCompletion)(NSString *filePath); -///音乐的id -@property (nonatomic,assign) int musicId; - -@end - -@implementation TRTCRtcImpl - -- (instancetype)initWithDelegate:(id)delegate { - self = [super initWithDelegate:delegate]; - if (self) { - _engine = [TRTCCloud sharedInstance]; - TRTCAudioVolumeEvaluateParams *AudioVolumeParams = [[TRTCAudioVolumeEvaluateParams alloc] init]; - AudioVolumeParams.interval = 300; - AudioVolumeParams.enableVadDetection = YES; - AudioVolumeParams.enablePitchCalculation = YES; - AudioVolumeParams.enableSpectrumCalculation = YES; - [self.engine enableAudioVolumeEvaluation:300 withParams:AudioVolumeParams]; - [TRTCCloud setConsoleEnabled:NO]; - [_engine addDelegate:self]; - } - return self; -} - -#pragma mark - RtcInterface impl -- (BOOL)joinChannel:(NSString *)channelId sign:(nonnull NSString *)sign completion:(void (^)(void))completion { - TRTCParams *params = [[TRTCParams alloc] init]; - UInt32 appId; - NSString *curTtcKey = [[NSUserDefaults standardUserDefaults]valueForKey:@"kTrtcAppId"]; - if(curTtcKey != nil && curTtcKey.length > 0){ - sscanf([curTtcKey UTF8String], "%u", &appId); - }else{ - sscanf([KeyWithType(KeyType_TRTC) UTF8String], "%u", &appId); - } - params.sdkAppId = appId; - UInt32 roomId; - sscanf([channelId UTF8String], "%u", &roomId); - params.roomId = roomId; - - params.userId = [[AccountInfoStorage instance] getUid]; - params.userSig = sign; - params.role = TRTCRoleAudience; - [self.engine enterRoom:params appScene:TRTCAppSceneLIVE]; - if (completion) { - completion(); - } - return YES; -} - -///发起跨房通话 -- (void)connectOtherRoom:(NSString *)roomUid userId:(NSString *)uid { - NSMutableDictionary *jsonDict = [[NSMutableDictionary alloc] init]; - if (roomUid.integerValue > INT_MAX) { - [jsonDict setObject:@(uid.integerValue) forKey:@"roomId"]; - } else { - [jsonDict setObject:@([roomUid intValue]) forKey:@"roomId"]; - } - - [jsonDict setObject:uid forKey:@"userId"]; - NSData* jsonData = [NSJSONSerialization dataWithJSONObject:jsonDict options:NSJSONWritingPrettyPrinted error:nil]; - NSString* jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; - [self.engine connectOtherRoom:jsonString]; -} - -///退出跨房通话 -- (void)disconnectOtherRoom { - [self.engine disconnectOtherRoom]; -} - -///发起跨房通话回调 -- (void)onConnectOtherRoom:(NSString *)userId errCode:(TXLiteAVError)errCode errMsg:(NSString *)errMsg { - if (errCode == ERR_NULL) { - - } -} - -///退出跨房通话回调 -- (void)onDisconnectOtherRoom:(TXLiteAVError)errCode errMsg:(NSString *)errMsg { - -} - -- (void)onUserAudioAvailable:(NSString *)userId available:(BOOL)available { -// NSLog(@"成功userid:%@", userId); - if (available) { - - } -} - -- (BOOL)muteRemote:(BOOL)mute { - [self.engine muteAllRemoteAudio:mute]; - return YES; -} - -- (BOOL)muteRemote:(BOOL)mute userId:(NSString *)userId { - [self.engine muteRemoteAudio:userId mute:mute]; - return YES; -} - -- (void)broadcast:(BOOL)on { - [self.engine switchRole:on ? TRTCRoleAnchor : TRTCRoleAudience]; - if (on) { - NSString *jsonString = @"{\"api\":\"setAudioQualityEx\",\"params\":{\"sampleRate\":48000,\"channel\":2,\"bitrate\":192,\"encodeMode\":1,\"systemVolumeType\":1}}"; - [self.engine callExperimentalAPI:jsonString]; - NSString *aecString = @"{\"api\":\"enableAudioAEC\",\"params\":{\"enable\":1,\"level\":100}}"; - [self.engine callExperimentalAPI:aecString]; - [self.engine startLocalAudio:TRTCAudioQualityDefault]; -// [self.engine.getDeviceManager setSystemVolumeType:TXSystemVolumeTypeMedia]; - [[TRTCCloud sharedInstance] startLocalAudio:TRTCAudioQualityDefault]; - - } else { - [self.engine stopLocalAudio]; - } -} - -- (BOOL)muteLocal:(BOOL)mute { - [self.engine muteLocalAudio:mute]; - return YES; -} - -- (void)exitChannel:(void (^)(void))completion { - /** - * 1.2 离开房间 - * - * 调用 exitRoom() 接口会执行退出房间的相关逻辑，例如释放音视频设备资源和编解码器资源等。 - * 待资源释放完毕，SDK 会通过 TRTCCloudDelegate 中的 onExitRoom() 回调通知到您。 - * - * 如果您要再次调用 enterRoom() 或者切换到其他的音视频 SDK，请等待 onExitRoom() 回调到来之后再执行相关操作。 - * 否则可能会遇到摄像头或麦克风（例如 iOS 里的 AudioSession）被占用等各种异常问题。 - */ - [self.engine exitRoom]; - if (completion) { - completion(); - } -} - -- (void)destory { - [TRTCCloud destroySharedInstance]; - [self.engine removeDelegate:self]; -} - -/// 播放背景音乐 -/// @param filePath 音频文件的地址 -/// @param musicId TRTC自己要的 -- (BOOL)playBackMusic:(NSString *)filePath musicId:(int)musicId completion:(void (^)(NSString *))completion{ - if (filePath) { - self.MusicCompletion = completion; - [self changePlayState:BackMusicPlayState_Stop];//切换歌曲need stop - self.musicId = musicId; - if (self.musicManager == nil) { - self.musicManager = [self.engine getAudioEffectManager]; - } - - TXAudioMusicParam *param = [[TXAudioMusicParam alloc] init]; - param.ID = musicId; - param.path = filePath; - @kWeakify(self); - [self.musicManager startPlayMusic:param onStart:^(NSInteger errCode) { - - } onProgress:^(NSInteger progressMs, NSInteger durationMs) { - - } onComplete:^(NSInteger errCode) { - @kStrongify(self); - self.MusicCompletion(filePath); - ///这个用在最小化的时候 因为最小化没办法知道当前歌曲是否播放完毕了 目前没有想到其他的好的版本就用通知吧 - [[NSNotificationCenter defaultCenter] postNotificationName:kRoomBackMusicPlayMusicFinishKey object:filePath]; - }]; - return YES; - } else { - return NO; - } - -} - -/// 改变播放器的状态 -/// @param state 播放状态 -- (BOOL)changePlayState:(BackMusicPlayState)state { - BOOL isPlaying = NO; - switch (state) { - case BackMusicPlayState_Stop: - { - [self.musicManager stopPlayMusic:self.musicId]; - isPlaying = NO; - } - break; - case BackMusicPlayState_Pause: - { - [self.musicManager pausePlayMusic:self.musicId]; - isPlaying = NO; - } - break; - case BackMusicPlayState_Resume: - { - [self.musicManager resumePlayMusic:self.musicId]; - isPlaying = YES; - } - default: - break; - } - return isPlaying; -} - -- (void)updateUserSound:(int)soundVol { - [self.engine setAudioCaptureVolume:soundVol]; -} - -- (NSInteger)loadUserSound { - return self.engine.getAudioCaptureVolume; -} - -- (void)updateMusicSound:(int)soundVol { - [self.musicManager setMusicPublishVolume:self.musicId volume:soundVol * 1.5]; - [self.musicManager setMusicPlayoutVolume:self.musicId volume:soundVol * 1.5]; -} - -#pragma mark - TRTCCloudDelegate -- (void)onUserVoiceVolume:(NSArray *)userVolumes totalVolume:(NSInteger)totalVolume { - NSMutableArray *uids = [NSMutableArray array]; - for (TRTCVolumeInfo *userInfo in userVolumes) { - NSString *uid = userInfo.userId; - if (userInfo.volume > 2){ - if (uid.integerValue == 0) { - if ([AccountInfoStorage instance].getUid.length > 0){ - [uids addObject:[[AccountInfoStorage instance] getUid]]; - } - }else { - [uids addObject:uid]; - } - } - } - [self.delegate usersSpeaking:uids]; -} - -@end diff --git a/YuMi/Modules/YMRTC/RtcManager.h b/YuMi/Modules/YMRTC/RtcManager.h deleted file mode 100644 index 05bc3d2..0000000 --- a/YuMi/Modules/YMRTC/RtcManager.h +++ /dev/null @@ -1,148 +0,0 @@ -// -// RTCManager.h -// YUMI -// -// Created by zu on 2021/10/19. -// - -#import -#import "RtcDelegate.h" -NS_ASSUME_NONNULL_BEGIN - -typedef enum : NSUInteger { - RtcEngineType_TRTC, // 腾讯TRTC -} RtcEngineType; - -typedef NS_ENUM(NSInteger, BackMusicPlayState) { - ///停止 - BackMusicPlayState_Stop = 1, - ///暂停 - BackMusicPlayState_Pause, - ///重新播放 - BackMusicPlayState_Resume -}; - -/** 音频服务管理单例，对所有音频服务 SDK 的封装。 - - **Note:** - - - ✅ 外部调用者只需要调用 RtcManager 。 - - ✅ RtcManager 对房间业务逻辑有封装。 - - ❌ 业务逻辑不要侵入 RctImpl 。 - */ -@interface RtcManager : NSObject -///因为跨房pk结束后会闭麦，用这个限制不要关麦 -@property(nonatomic,assign) BOOL isAnckorPk; -///因为最小化进房闭麦问题，用这个限制不要关麦 -@property(nonatomic,assign) BOOL isMiniEnter; -/** - * 是否静音（静别人） - * YES：🔇虽然你们麦位上在说话，但是我就是不听。🙉 - * NO：🔊我听，我听。🐵 - */ -@property(nonatomic,getter=isRemoteMuted) BOOL remoteMuted; - -/** - * 是否闭麦（闭自己） - * YES：🤐虽然我在麦位上，但是我就是不说话。🙊 - * NO：😲我说，我说。🐵 - */ -@property(nonatomic,getter=isLocalMuted) BOOL localMuted; - -/** 初始化/重新初始化 RtcManager 实例，设置音频服务类型和 RtcDelegate。 - - **Note:** - - - 切换音频服务或者更换 delegate 必须先调用该方法。 - - RtcManager 是单例，[RtcManager instance] 也可以获取到 RtcManager 实例。 - - @param type 使用的音频服务 RtcEngineType。 - @param delegate RtcDelegate。 - - @return - RtcManager instance - */ -+ (instancetype _Nonnull)initEngineWithType:(RtcEngineType)type - delegate:(id _Nullable)delegate; - -/** 获取 RtcManager instance。 - - **Note:** - - - 务必先 [RtcManager initEngineWithType:delegate:] 设置 RtcEngineType 和 RtcDelegate，否则默认使用声网服务。 - - @return - RtcManager instance - */ -+ (instancetype _Nonnull)instance; -- (instancetype)init NS_UNAVAILABLE; -+ (instancetype)new NS_UNAVAILABLE; -- (id)copy NS_UNAVAILABLE; -- (id)mutableCopy NS_UNAVAILABLE; - -/** 加入频道（房间）。 - - **Note:** - - - 重复进房会直接 return YES。 - - @return - 进房结果。 - */ -- (BOOL)enterRoom:(NSString *)roomUid; - -/** 加入频道（房间），TRTC 进房需要动态签名。 - - **Note:** - - - 重复进房会直接 return YES。 - - @return - 进房结果。 - */ -- (BOOL)enterRoom:(NSString *)roomUid trtcSign:(NSString *)sign; - -/** - * 上下麦（说话） - */ -- (void)broadcast:(BOOL)on; - -/** - * 退出频道 - */ -- (void)exitRoom; - -///发起跨房PK -- (void)connectOtherRoom:(NSString *)roomUid userId:(NSString *)uid; - -///退出跨房通话 -- (void)disconnectOtherRoom; - -/// 静音某个人 -/// @param userId 用户id -- (void)muteOne:(BOOL)mute userId:(NSString *)userId; - -/// 播放背景音乐 -/// @param filePath 音频文件的地址 -/// @param musicId TRTC自己要的 -- (BOOL)playBackMusic:(NSString *)filePath musicId:(int)musicId completion:(void (^)(NSString *))completion; - -/// 改变播放器的状态 -/// @param state 播放状态 -- (BOOL)changePlayState:(BackMusicPlayState)state; - -///背景音乐的音量大小 -- (void)updateMusicSound:(int)soundVol; - -///背景人声的音量大小 -- (void)updateUserSound:(int)soundVol; - -///用户调整麦位状态时触发，不持久化数值 -- (void)updateUserSoundWithUserInMic:(int)soundVol; - -- (NSInteger)loadUserSound; - -@property (nonatomic,assign) BOOL broadcast; - -// MARK: 指向实际使用的 stageView -- (void)updateDelegate:(id _Nullable)delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRTC/RtcManager.m b/YuMi/Modules/YMRTC/RtcManager.m deleted file mode 100644 index ee86131..0000000 --- a/YuMi/Modules/YMRTC/RtcManager.m +++ /dev/null @@ -1,208 +0,0 @@ -// -// RTCManager.m -// YUMI -// -// Created by zu on 2021/10/19. -// - -#import "RtcManager.h" -#import "RtcImplDelegate.h" -#import "TRTCRtcImpl.h" - -UIKIT_EXTERN NSString * kRoomBackMusicAudioMixingVolumeKey; -UIKIT_EXTERN NSString * kRoomBackMusicCaptureVolumeKey; - -@interface RtcManager() - -@property (nonatomic, strong) id engine; -@property (nonatomic, weak) id engineDelegate; -@property (nonatomic, assign) RtcEngineType engineType; -/** - * 当前 Rtc 所在的房间 roomUid 。 - */ -@property(nonatomic, strong) NSString * enterdRoomUid; - -@end - -@implementation RtcManager - -+ (instancetype)instance { - static dispatch_once_t onceToken; - static RtcManager *instance = nil; - dispatch_once(&onceToken,^{ - instance = [[self alloc] init]; - }); - return instance; -} - -- (instancetype)init { - self = [super init]; - if (self) { - _localMuted = NO; - _remoteMuted = NO; - _engineType = RtcEngineType_TRTC; - } - return self; -} - -+ (instancetype)initEngineWithType:(RtcEngineType)type delegate:(id _Nullable)delegate { - RtcManager* rtcManager = [self instance]; - [rtcManager setEngineType:type]; - [rtcManager setEngineDelegate:delegate]; - return rtcManager; -} - -- (BOOL)enterRoom:(NSString *)roomUid { - if (self.enterdRoomUid && [self.enterdRoomUid isEqualToString:roomUid]) { - return YES; - } - return [self.engine joinChannel:roomUid completion:^{ - [self muteRemote:NO]; - [self muteLocal:NO]; - self.enterdRoomUid = roomUid; - }]; -} - -- (BOOL)enterRoom:(NSString *)roomUid trtcSign:(nonnull NSString *)sign { - if (self.enterdRoomUid && [self.enterdRoomUid isEqualToString:roomUid]) { - return YES; - } - return [self.engine joinChannel:roomUid sign:sign completion:^{ - [self muteRemote:NO]; - [self muteLocal:NO]; - self.enterdRoomUid = roomUid; - }]; -} - -- (BOOL)muteRemote:(BOOL)mute { - return [self.engine muteRemote:mute]; -} - -- (void)broadcast:(BOOL)on { - [self.engine broadcast:on]; - if (on) { - [self.engine muteLocal:self.isLocalMuted]; - } -} - -- (BOOL)muteLocal:(BOOL)mute { - return [self.engine muteLocal:mute]; -} - -- (void)exitRoom { - @kWeakify(self); - [self.engine exitChannel:^{ - @kStrongify(self); - if (self) { - [self muteRemote:NO]; - [self muteLocal:NO]; - self.enterdRoomUid = nil; - } - }]; -} - -///发起跨房通话 -- (void)connectOtherRoom:(NSString *)roomUid userId:(NSString *)uid { - [self.engine broadcast:YES]; - [self.engine connectOtherRoom:roomUid userId:uid]; -} - -///退出跨房通话 -- (void)disconnectOtherRoom { - [self.engine disconnectOtherRoom]; -} - -/// 静音某个人 -/// @param userId 用户id -- (void)muteOne:(BOOL)mute userId:(NSString *)userId { - [self.engine muteRemote:mute userId:userId]; -} - -- (void)destory { - [self.engine destory]; -} - -/// 播放背景音乐 -/// @param filePath 音频文件的地址 -/// @param musicId TRTC自己要的 -- (BOOL)playBackMusic:(NSString *)filePath musicId:(int)musicId completion:(void (^)(NSString *))completion{ - return [self.engine playBackMusic:filePath musicId:musicId completion:completion]; -} - -/// 改变播放器的状态 -/// @param state 播放状态 -- (BOOL)changePlayState:(BackMusicPlayState)state { - return [self.engine changePlayState:state]; -} - -///背景音乐的音量大小 -- (void)updateMusicSound:(int)soundVol { - [[NSUserDefaults standardUserDefaults] setInteger:soundVol forKey:kRoomBackMusicAudioMixingVolumeKey]; - [[NSUserDefaults standardUserDefaults] synchronize]; - [self.engine updateMusicSound:soundVol]; -} - -///背景人声的音量大小 -- (void)updateUserSound:(int)soundVol { - [[NSUserDefaults standardUserDefaults] setInteger:soundVol forKey:kRoomBackMusicCaptureVolumeKey]; - [[NSUserDefaults standardUserDefaults] synchronize]; - [self.engine updateUserSound:soundVol]; -} - -- (void)updateUserSoundWithUserInMic:(int)soundVol { - [self.engine updateUserSound:soundVol]; -} - -- (NSInteger)loadUserSound { - // 查询 recEngine 的人声音量，如果没有数据，则设置为默认值 50 - if ([self.engine loadUserSound] == 0) { - [self updateUserSound:50]; - return [[NSUserDefaults standardUserDefaults] integerForKey:kRoomBackMusicCaptureVolumeKey]; - } - return [self.engine loadUserSound]; -} - -- (void)usersSpeaking:(NSMutableArray *)uids { - if (self.engineDelegate) { - [self.engineDelegate usersSpeaking:uids]; - } -} - -- (void)setRemoteMuted:(BOOL)remoteMuted { - if ([self.engine muteRemote:remoteMuted]) { - _remoteMuted = remoteMuted; - } -} - -- (void)setLocalMuted:(BOOL)localMuted { - if ([self.engine muteLocal:localMuted]) { - _localMuted = localMuted; - } -} - -- (void)setEngineType:(RtcEngineType)type { - if (_engine && type != _engineType) { - [_engine exitChannel:nil]; - [_engine destory]; - _engine = nil; - _enterdRoomUid = nil; - } - _engineType = type; -} - -- (void)setEngineDelegate:(id)delegate { - _engineDelegate = delegate; -} - -- (void)updateDelegate:(id _Nullable)delegate { - _engineDelegate = delegate; -} - -- (id)engine { - if (!_engine) { - _engine = [[TRTCRtcImpl alloc] initWithDelegate:self]; - } - return _engine; -} - -@end diff --git a/YuMi/Modules/YMRoom/Api/Api+Boom.h b/YuMi/Modules/YMRoom/Api/Api+Boom.h deleted file mode 100644 index f5810eb..0000000 --- a/YuMi/Modules/YMRoom/Api/Api+Boom.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// Api+Boom.h -// YuMi -// -// Created by P on 2024/9/29. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api(Boom) - -+ (void)getBoomRocketAnimationInfo:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid; -+ (void)getBoomDetailInfo:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Api/Api+Boom.m b/YuMi/Modules/YMRoom/Api/Api+Boom.m deleted file mode 100644 index 7ff1d76..0000000 --- a/YuMi/Modules/YMRoom/Api/Api+Boom.m +++ /dev/null @@ -1,25 +0,0 @@ -// -// Api+Boom.m -// YuMi -// -// Created by P on 2024/9/29. -// - -#import "Api+Boom.h" - -@implementation Api(Boom) - -+ (void)getBoomRocketAnimationInfo:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid { - [self makeRequest:@"room/boom/draw/info" - method:HttpRequestHelperMethodGET - completion:completion, __FUNCTION__, roomUid, nil]; -} - -+ (void)getBoomDetailInfo:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid { - [self makeRequest:@"room/boom/level/info" - method:HttpRequestHelperMethodGET - completion:completion, __FUNCTION__, roomUid, nil]; -} -@end diff --git a/YuMi/Modules/YMRoom/Api/Api+CustomBackground.h b/YuMi/Modules/YMRoom/Api/Api+CustomBackground.h deleted file mode 100644 index 7c72504..0000000 --- a/YuMi/Modules/YMRoom/Api/Api+CustomBackground.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// Api+CustomBackground.h -// YuMi -// -// Created by P on 2024/11/1. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api(CustomBackground) - -+ (void)buyRoomBackground:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - id:(NSString *)bid; - -+ (void)deleteRoomBackground:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - id:(NSString *)bid; - -+ (void)listOfRoomBackground:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid; - -+ (void)uploadCustomBackground:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - url:(NSString *)url; - -+ (void)selectedRoomBackground:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - id:(NSString *)bid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Api/Api+CustomBackground.m b/YuMi/Modules/YMRoom/Api/Api+CustomBackground.m deleted file mode 100644 index 92f2450..0000000 --- a/YuMi/Modules/YMRoom/Api/Api+CustomBackground.m +++ /dev/null @@ -1,51 +0,0 @@ -// -// Api+CustomBackground.m -// YuMi -// -// Created by P on 2024/11/1. -// - -#import "Api+CustomBackground.h" - -@implementation Api(CustomBackground) - -+ (void)buyRoomBackground:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - id:(NSString *)bid{ - [self makeRequest:@"room/background/buy" - method:HttpRequestHelperMethodPOST - completion:completion, __FUNCTION__, roomUid, bid, nil]; -} - -+ (void)deleteRoomBackground:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - id:(NSString *)bid { - [self makeRequest:@"room/background/del" - method:HttpRequestHelperMethodPOST - completion:completion, __FUNCTION__, roomUid, bid, nil]; -} - -+ (void)listOfRoomBackground:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid { - [self makeRequest:@"room/background/list" - method:HttpRequestHelperMethodGET - completion:completion, __FUNCTION__, roomUid, nil]; -} - -+ (void)uploadCustomBackground:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - url:(NSString *)url { - [self makeRequest:@"room/background/custom" - method:HttpRequestHelperMethodPOST - completion:completion, __FUNCTION__, roomUid, url, nil]; -} - -+ (void)selectedRoomBackground:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - id:(NSString *)bid { - [self makeRequest:@"room/background/select" - method:HttpRequestHelperMethodPOST - completion:completion, __FUNCTION__, roomUid, bid, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/Api/Api+LuckyPackage.h b/YuMi/Modules/YMRoom/Api/Api+LuckyPackage.h deleted file mode 100644 index 125cbbc..0000000 --- a/YuMi/Modules/YMRoom/Api/Api+LuckyPackage.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// Api+LuckyPackage.h -// YuMi -// -// Created by P on 2025/2/11. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api(LuckyPackage) - -/// {"roomUid":3456, "uid": 3456,"type":"GIFT", "countDownSecond": 300, "giftItems":[{"giftId":12,"giftNum":10},{"giftId":25,"giftNum":10}]} -+ (void)postGiftNewRedEnvelope:(HttpRequestHelperCompletion)complection - countDownSecond:(NSNumber *)countDownSecond - giftItems:(NSArray *)giftItems - roomUid:(NSNumber *)roomUid - uid:(NSString *)uid - type:(NSString *)type; - -/// {"roomUid":3456, "uid": 3456,"num": 10,"goldNum": 1000,"type":"DIAMOND", "countDownSecond": 300} -+ (void)postDiamondNewRedEnvelope:(HttpRequestHelperCompletion)complection - countDownSecond:(NSNumber *)countDownSecond - goldNum:(NSNumber *)goldNum - num:(NSNumber *)num - roomUid:(NSNumber *)roomUid - uid:(NSString *)uid - type:(NSString *)type; - -+ (void)getNewRedEnvelopeList:(HttpRequestHelperCompletion)complection - roomUid:(NSNumber *)roomUid; - -+ (void)getNewRedEnvelopeDetail:(HttpRequestHelperCompletion)complection - pageNo:(NSNumber *)pageNo - pageSize:(NSNumber *)pageSize - type:(NSNumber *)type; - -+ (void)postNewRedEnvelopeOpen:(HttpRequestHelperCompletion)complection redEnvelopeId:(NSNumber *)redEnvelopeId; - -+ (void)getNewRedEnvelopeGet:(HttpRequestHelperCompletion)complection - redEnvelopeId:(NSNumber *)redEnvelopeId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Api/Api+LuckyPackage.m b/YuMi/Modules/YMRoom/Api/Api+LuckyPackage.m deleted file mode 100644 index 23c9879..0000000 --- a/YuMi/Modules/YMRoom/Api/Api+LuckyPackage.m +++ /dev/null @@ -1,70 +0,0 @@ -// -// Api+LuckyPackage.m -// YuMi -// -// Created by P on 2025/2/11. -// - -#import "Api+LuckyPackage.h" - -@implementation Api(LuckyPackage) - -/// {"roomUid":3456, "uid": 3456,"type":"GIFT", "countDownSecond": 300, "giftItems":[{"giftId":12,"giftNum":10},{"giftId":25,"giftNum":10}]} -+ (void)postGiftNewRedEnvelope:(HttpRequestHelperCompletion)complection - countDownSecond:(NSNumber *)countDownSecond - giftItems:(NSArray *)giftItems - roomUid:(NSNumber *)roomUid - uid:(NSString *)uid - type:(NSString *)type { - NSDictionary *dic = @{ - @"countDownSecond":countDownSecond, - @"giftItems":giftItems, - @"roomUid":roomUid, - @"uid":uid, - @"type":type - }; - [HttpRequestHelper postSkillCard:@"new-red-envelope" params:dic.toJSONString completion:complection]; -} - -/// {"roomUid":3456, "uid": 3456,"num": 10,"goldNum": 1000,"type":"DIAMOND", "countDownSecond": 300} -+ (void)postDiamondNewRedEnvelope:(HttpRequestHelperCompletion)complection - countDownSecond:(NSNumber *)countDownSecond - goldNum:(NSNumber *)goldNum - num:(NSNumber *)num - roomUid:(NSNumber *)roomUid - uid:(NSString *)uid - type:(NSString *)type { - NSDictionary *dic = @{ - @"countDownSecond":countDownSecond, - @"num":num, - @"goldNum":goldNum, - @"roomUid":roomUid, - @"uid":uid, - @"type":type - }; - [HttpRequestHelper postSkillCard:@"new-red-envelope" params:dic.toJSONString completion:complection]; -} - -+ (void)getNewRedEnvelopeList:(HttpRequestHelperCompletion)complection - roomUid:(NSNumber *)roomUid { - [self makeRequest:@"new-red-envelope/list" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, roomUid, nil]; -} - -+ (void)getNewRedEnvelopeDetail:(HttpRequestHelperCompletion)complection - pageNo:(NSNumber *)pageNo - pageSize:(NSNumber *)pageSize - type:(NSNumber *)type { - [self makeRequest:@"new-red-envelope/detail" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, pageNo, pageSize, type, nil]; -} - -+ (void)postNewRedEnvelopeOpen:(HttpRequestHelperCompletion)complection redEnvelopeId:(NSNumber *)redEnvelopeId { - [self makeRequest:@"new-red-envelope/open" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, redEnvelopeId, nil]; -} - - -+ (void)getNewRedEnvelopeGet:(HttpRequestHelperCompletion)complection - redEnvelopeId:(NSNumber *)redEnvelopeId { - [self makeRequest:@"new-red-envelope/get" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, redEnvelopeId, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/Api/Api+Room.h b/YuMi/Modules/YMRoom/Api/Api+Room.h deleted file mode 100644 index 97e5e19..0000000 --- a/YuMi/Modules/YMRoom/Api/Api+Room.h +++ /dev/null @@ -1,240 +0,0 @@ -// -// Api+Room.h -// YUMI -// -// Created by YUMI on 2021/10/18. -// - -#import "Api.h" -#import "RoomInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface Api (Room) - -/// 获取房间信息 -/// @param complection 完成 -/// @param uid 用户的uid -/// @param intoUid 自己的Uid 判断当前进房用户是否是平台超管 判断进房用户是否开启青少年 -+ (void)getRoomInfo:(HttpRequestHelperCompletion)complection - uid:(NSString *)uid - intoUid:(NSString *)intoUid; - - -/// 开启房间 -/// @param complection 完成 -/// @param title 房间标题 -/// @param type 类型 -/// @param roomPwd 房间密码 -/// @param roomDesc 房间描述 -/// @param backPic 房间背景 -/// @param uid 用户的uid -/// @param ticket 用户的ticket -/// @param mgId 小游戏的id -+ (void)openRoom:(HttpRequestHelperCompletion)complection - title:(NSString *)title - type:(RoomType)type - roomPwd:(NSString *)roomPwd - roomDesc:(NSString *)roomDesc - backPic:(NSString *)backPic - uid:(NSString *)uid - ticket:(NSString *)ticket - mgId:(NSString *)mgId; - -+ (void)closeRoom:(HttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket; - -/// 房间上麦 -/// @param complection 完成 -/// @param micUid 上麦的uid -/// @param roomId 房间的id -/// @param position 坑位的序号 -/// @param ticket ticket -+ (void)roomMicUpMic:(HttpRequestHelperCompletion)complection - micUid:(NSString *)micUid - roomId:(NSString *)roomId - position:(NSString *)position - ticket:(NSString *)ticket; - -/// 房间下麦 -/// @param complection 完成 -/// @param micUid 上麦的uid -/// @param roomId 房间的id -/// @param position 坑位的序号 -/// @param ticket ticket -+ (void)roomMicDownMic:(HttpRequestHelperCompletion)complection - micUid:(NSString *)micUid - roomId:(NSString *)roomId - position:(NSString *)position - ticket:(NSString *)ticket; -/// 获取麦序礼物值 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param uid 用户的uid -+ (void)roomMicroGiftValue:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - uid:(NSString *)uid; - -/// 开启礼物值的情况下 上麦 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param micUid 上麦的uid -/// @param position 几号麦序 -/// @param uid 操作者的uid -+ (void)roomGiftValueUpMic:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - micUid:(NSString *)micUid - position:(NSString *)position - uid:(NSString *)uid; -#pragma mark - 活动 -/// 房间活动页的列表 -/// @param completion 完成 -/// @param roomId 房间的id - -+ (void)roomActivityList:(HttpRequestHelperCompletion)completion - roomId:(NSString *)roomId; -+(void)getPlayList:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId; - -/// 收藏房间 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param uid uid -/// @param type 1 收藏 2 取消收藏 3：批量取消收藏 -/// @param roomUids 批量删除的房间uid,用逗号隔开 -+ (void)collectRoom:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - uid:(NSString *)uid - type:(NSString *)type - roomUids:(NSString *)roomUids; - -/// 改变相亲的状态的 -/// @param completion 完成 -/// @param roomUserId 房主的uid -/// @param roundId 相亲进行到哪一步 -+ (void)changeRoomDatingState:(HttpRequestHelperCompletion)completion - roomUserId:(NSString *)roomUserId - roundId:(NSString *)roundId; - -/// 上报用户进房 -/// @param completion 完成 -/// @param uid 用户uid -/// @param roomUid 房间uid -/// @param ticket ticket -+ (void)requestReportUserInterRoom:(HttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid ticket:(NSString *)ticket; - -/// 上报用户退房 -/// @param completion 完成 -/// @param uid 用户uid -/// @param roomUid 房间uid -/// @param ticket ticket -+ (void)requestReportUserOutRoom:(HttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid ticket:(NSString *)ticket; - -/// 处理跨房PK的邀请 -/// @param completion 完成 -/// @param roomUid 房主的ui -/// @param roundId pk的id -/// @param isAccept o拒绝 1 接受 -+ (void)handleAcrossRoomPKInvite:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - roundId:(NSString *)roundId - isAccept:(NSString *)isAccept; - -/// 获取跨房PK详情 -/// @param completion 完成 -/// @param roomUid 房主的ui -+ (void)getAcrossRoomPKDetail:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid; - -/// 进房初始化当前用户与房间粉丝团关系 -/// @param completion 完成 -/// @param teamUid 房间uid -+ (void)requestInRoomFansTeam:(HttpRequestHelperCompletion)completion teamUid:(NSString *)teamUid; - -/// 获取加入粉丝团的内容 -/// @param completion 完成 -/// @param teamUid 要加入粉丝团的房间uid -+ (void)requestJoinFansTeam:(HttpRequestHelperCompletion)completion teamUid:(NSString *)teamUid; - -/// 获取粉丝团任务列表 -/// @param completion 完成 -/// @param teamUid 房间uid -+ (void)requestFansTeamTask:(HttpRequestHelperCompletion)completion teamUid:(NSString *)teamUid; - -/// 获取个播PK规则 -/// @param completion 完成 -+ (void)requestAnchorPkRule:(HttpRequestHelperCompletion)completion; -#pragma mark - 超管 -///获取房间超管列表 -+ (void)getRoomSuperAdminList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -///房内引流推荐 -+ (void)reqeustRecommendRoom:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId; - -/// 获取房间榜单 -/// @param completion 完成 -/// @param roomUid 房间uid -/// @param type 类型 贡献日榜"day"，贡献月榜"month" -/// @param page 页码 -/// @param pageSize 每页数量 -+ (void)requestRoomRankings:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - type:(NSString *)type - page:(NSString *)page - pageSize:(NSString *)pageSize; - -/// 新用户开始打招呼 -/// @param completion 完成 -/// @param roomUid 房主的uid -+ (void)newUserStartGreet:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -///获取用户在房间中的信息 -+ (void)requestUserInRoom:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; - -/// 获取下一个个播房 -/// @param completion 完成 -/// @param roomUid 当前房间uid -+ (void)requestNextAnchorRoom:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -/// 获取新用户进房礼物 -/// @param completion 完成 -/// @param roomUid 房间uid -+ (void)requestNewUserInRoomGift:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -/// 获取红包信息 -/// @param completion 完成 -/// @param roomUid 房间Uid -+ (void)requestRedPacket:(HttpRequestHelperCompletion)completion uid:(NSString *)roomUid isShowKind:(NSString *)isShowKind; -///获取红包信息， -/// @param completion 完成 -/// @param redEnvelopeId 红包id -+(void)getRedPacket:(HttpRequestHelperCompletion)completion redEnvelopeId:(NSString *)redEnvelopeId; -///拿到首充弹窗次数 -+(void)requestRoomFirstCharegWindow:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; -///更新首充弹窗次数 -+(void)updateRoomFirstCharegWindow:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; -/// 屏蔽 -/// @param completion 完成 -/// @param type type为0 => 屏蔽动态, objId 为 动态id, type为1 => 屏蔽房间, objId 为 用户uid -+ (void)requestShielding:(HttpRequestHelperCompletion)completion type:(NSString *)type objId:(NSString *)objId; -///得到免费礼物数据 -+(void)requestFreeGiftData:(HttpRequestHelperCompletion)completion; -/// /获解锁照片 -/// @param completion 完成 -/// @param id 相册id -/// @param roomUid 房间id -+(void)unlockRoomAlbumPhoto:(HttpRequestHelperCompletion)completion id:(NSString *)id roomUid:(NSString *)roomUid; -/// 获取已解锁照片id列表 -/// @param completion 完成 -/// @param roomUid 房间id -+(void)getUnlockRoomAlbumPhotoList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; -///获取踢人列表 -/// @param completion 完成 -/// @param roomUid 房间id -+(void)getKickUserList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -+ (void)shareGen:(HttpRequestHelperCompletion)completion targetUid:(NSString *)targetUid; - -+ (void)getRoomMicCpListByRoomUid:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -+ (void)getRoomMicCpListByUidList:(HttpRequestHelperCompletion)completion uidList:(NSString *)uidList; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Api/Api+Room.m b/YuMi/Modules/YMRoom/Api/Api+Room.m deleted file mode 100644 index d839315..0000000 --- a/YuMi/Modules/YMRoom/Api/Api+Room.m +++ /dev/null @@ -1,334 +0,0 @@ -// -// Api+Room.m -// YUMI -// -// Created by YUMI on 2021/10/18. -// - -#import "Api+Room.h" -#import - -@implementation Api (Room) - -/// 获取房间信息 -/// @param complection 完成 -/// @param uid 用户的uid -/// @param intoUid 自己的Uid 判断当前进房用户是否是平台超管 判断进房用户是否开启青少年 -+ (void)getRoomInfo:(HttpRequestHelperCompletion)complection uid:(NSString *)uid intoUid:(NSString *)intoUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9nZXQ="];///room/get - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, intoUid, nil]; -} - - -/// 开启房间 -/// @param complection 完成 -/// @param title 房间标题 -/// @param type 类型 -/// @param roomPwd 房间密码 -/// @param roomDesc 房间描述 -/// @param backPic 房间背景 -/// @param uid 用户的uid -/// @param ticket 用户的ticket -/// @param mgId 小游戏的id -+ (void)openRoom:(HttpRequestHelperCompletion)complection - title:(NSString *)title - type:(RoomType)type - roomPwd:(NSString *)roomPwd - roomDesc:(NSString *)roomDesc - backPic:(NSString *)backPic - uid:(NSString *)uid - ticket:(NSString *)ticket - mgId:(NSString *)mgId { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9vcGVu"];///room/open - [Api makeRequest:fang method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, title, @(type), roomPwd, roomDesc, backPic, uid, ticket, mgId,nil]; -} - - -/// 关闭房间 -/// @param complection 完成 -/// @param uid 用户的uid -/// @param ticket 用户的ticket -+ (void)closeRoom:(HttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9jbG9zZQ=="];///room/close - [Api makeRequest:fang method:HttpRequestHelperMethodPOST completion:complection,__FUNCTION__, uid, ticket, nil]; -} - - -/// 房间上麦 -/// @param complection 完成 -/// @param micUid 上麦的uid -/// @param roomId 房间的id -/// @param position 坑位的序号 -/// @param ticket ticket -+ (void)roomMicUpMic:(HttpRequestHelperCompletion)complection micUid:(NSString *)micUid roomId:(NSString *)roomId position:(NSString *)position ticket:(NSString *)ticket { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9taWMvdXBtaWM="];///room/mic/upmic - [Api makeRequest:fang method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, micUid, roomId, position, ticket, nil]; -} - -/// 房间下麦 -/// @param complection 完成 -/// @param micUid 上麦的uid -/// @param roomId 房间的id -/// @param position 坑位的序号 -/// @param ticket ticket -+ (void)roomMicDownMic:(HttpRequestHelperCompletion)complection micUid:(NSString *)micUid roomId:(NSString *)roomId position:(NSString *)position ticket:(NSString *)ticket { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9taWMvZG93bm1pYw=="];///room/mic/downmic - [Api makeRequest:fang method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, micUid, roomId, position, ticket, nil]; -} - - -/// 获取麦序礼物值 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param uid 用户的uid -+ (void)roomMicroGiftValue:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9naWZ0L3ZhbHVlL2dldA=="];///room/gift/value/get - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, uid, nil]; -} - - -/// 开启礼物值的情况下 上麦 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param micUid 上麦的uid -/// @param position 几号麦序 -/// @param uid 操作者的uid -+ (void)roomGiftValueUpMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid micUid:(NSString *)micUid position:(NSString *)position uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9naWZ0L3ZhbHVlL3VwL21pYw=="];///room/gift/value/up/mic - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, micUid, position, uid, nil]; -} - -#pragma mark - 活动 - -/// 房间活动页的列表 -/// @param completion 完成 -/// @param roomId 房间的id - -+ (void)roomActivityList:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId { - [self makeRequest:@"resource/list" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomId, nil]; -} -+(void)getPlayList:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId{ - [self makeRequest:@"resource/gamePlay" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,roomId, nil]; -} - -/// 收藏房间 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param uid uid -/// @param type 1 收藏 2 取消收藏 3：批量取消收藏 -/// @param roomUids 批量删除的房间uid,用逗号隔开 -+ (void)collectRoom:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid type:(NSString *)type roomUids:(NSString *)roomUids { - NSString * fang = [NSString stringFromBase64String:@"ZmFucy9mYW5zUm9vbQ=="];///fans/fansRoom - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, uid, type, roomUids, nil]; -} - - -/// 改变相亲的状态的 -/// @param completion 完成 -/// @param roomUserId 房主的uid -/// @param roundId 相亲进行到哪一步 -+ (void)changeRoomDatingState:(HttpRequestHelperCompletion)completion roomUserId:(NSString *)roomUserId roundId:(NSString *)roundId { - NSString * fang = @"blind-date/state";/// - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUserId, roundId, nil]; -} - -/// 上报用户进房 -/// @param completion 完成 -/// @param uid 用户uid -/// @param roomUid 房间uid -/// @param ticket ticket -+ (void)requestReportUserInterRoom:(HttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid ticket:(NSString *)ticket { - - [self makeRequest:@"userroom/inV2" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, roomUid, ticket, nil]; -} - -/// 上报用户退房 -/// @param completion 完成 -/// @param uid 用户uid -/// @param roomUid 房间uid -/// @param ticket ticket -+ (void)requestReportUserOutRoom:(HttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid ticket:(NSString *)ticket { - NSString * fang = [NSString stringFromBase64String:@"dXNlcnJvb20vb3V0VjI="];///userroom/outV2 - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, roomUid, ticket, nil]; -} - -/// 处理跨房PK的邀请 -/// @param completion 完成 -/// @param roomUid 房主的ui -/// @param roundId pk的id -/// @param isAccept o拒绝 1 接受 -+ (void)handleAcrossRoomPKInvite:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid roundId:(NSString *)roundId isAccept:(NSString *)isAccept { - NSString * fang = [NSString stringWithFormat:@"crossroompkround"];///crossroompkround/getCrossPkData - fang = [NSString stringWithFormat:@"%@/replyChallenge",fang]; - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, roundId, isAccept, nil]; -} - -/// 获取跨房PK详情 -/// @param completion 完成 -/// @param roomUid 房主的ui -+ (void)getAcrossRoomPKDetail:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringWithFormat:@"crossroompkround"];/// - fang = [NSString stringWithFormat:@"%@/getCrossPkData",fang]; - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, nil]; -} - -/// 进房初始化当前用户与房间粉丝团关系 -/// @param completion 完成 -/// @param teamUid 房间uid -+ (void)requestInRoomFansTeam:(HttpRequestHelperCompletion)completion teamUid:(NSString *)teamUid { - NSString * fang = [NSString stringFromBase64String:@"YW5jaG9yRmFuc1RlYW0vaW5pdEluUm9vbUZhbnNUZWFt"];///anchorFansTeam/initInRoomFansTeam - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, teamUid, nil]; -} - -/// 获取加入粉丝团的内容 -/// @param completion 完成 -/// @param teamUid 要加入粉丝团的房间uid -+ (void)requestJoinFansTeam:(HttpRequestHelperCompletion)completion teamUid:(NSString *)teamUid { - NSString * fang = [NSString stringFromBase64String:@"YW5jaG9yRmFuc1RlYW0vYXBwbHlGYW5zVGVhbVBvcEluZm9Wbw=="];///anchorFansTeam/applyFansTeamPopInfoVo - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, teamUid, nil]; -} - -/// 获取粉丝团任务列表 -/// @param completion 完成 -/// @param teamUid 房间uid -+ (void)requestFansTeamTask:(HttpRequestHelperCompletion)completion teamUid:(NSString *)teamUid { - NSString * fang = @"anchorFansTeam/getFansTaskInfo"; - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, teamUid, nil]; -} - -/// 获取个播PK规则 -/// @param completion 完成 -+ (void)requestAnchorPkRule:(HttpRequestHelperCompletion)completion { - [self makeRequest:@"crossroompkround/getSingleRoomPkRule" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, nil]; -} - -#pragma mark - 超管 -///获取房间超管列表 -+ (void)getRoomSuperAdminList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"aGFsbC9zdXBlck1hbmFnZXIvbGlzdFN1cGVyTWFuYWdlSW5Sb29t"];///hall/superManager/listSuperManageInRoom - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, nil]; -} - -///房内引流推荐 -+ (void)reqeustRecommendRoom:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId { - NSString * fang = [NSString stringFromBase64String:@"cm9vbWluc2lkZXJlY29tbWVuZC9yZWNvbW1lbmRSb29tTGlzdA=="];///roominsiderecommend/recommendRoomList - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomId, nil]; -} - -/// 获取房间榜单 -/// @param completion 完成 -/// @param roomUid 房间uid -/// @param type 类型 贡献日榜"day"，贡献月榜"month" -/// @param page 页码 -/// @param pageSize 每页数量 -+ (void)requestRoomRankings:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - type:(NSString *)type - page:(NSString *)page - pageSize:(NSString *)pageSize { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9yYW5raW5ncw=="];///room/rankings - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, type, page, pageSize, nil]; -} - - -/// 新用户开始打招呼 -/// @param completion 完成 -/// @param roomUid 房主的uid -+ (void)newUserStartGreet:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"bmV3VXNlclN0YXJ0L3Jvb21TYXlIZWxsbw=="];///newUserStart/roomSayHello - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, roomUid, nil]; -} - -///获取用户在房间中的信息 -+ (void)requestUserInRoom:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"dXNlcnJvb20vZ2V0"];///userroom/get - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; -} - - -/// 获取下一个个播房 -/// @param completion 完成 -/// @param roomUid 当前房间uid -+ (void)requestNextAnchorRoom:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"c2luZ2xlL2Jyb2FkY2FzdC9yb29tL3BhZ2U="];///single/broadcast/room/page - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, nil]; -} - -/// 获取新用户进房礼物 -/// @param completion 完成 -/// @param roomUid 房间uid -+ (void)requestNewUserInRoomGift:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { -// NSString * fang = [NSString stringFromBase64String:@"Z2lmdC9uZXdVc2VyL2luUm9vbQ=="];///gift/newUser/inRoom -// [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, nil]; -} - -/// 获取红包信息 -/// @param completion 完成 -/// @param roomUid 房间Uid -+ (void)requestRedPacket:(HttpRequestHelperCompletion)completion uid:(NSString *)roomUid isShowKind:(NSString *)isShowKind{ - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9yZWQtZW52ZWxvcA=="];///room/red-envelop - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid,isShowKind, nil]; -} - -///获取红包信息， -/// @param completion 完成 -/// @param redEnvelopeId 红包id -+(void)getRedPacket:(HttpRequestHelperCompletion)completion redEnvelopeId:(NSString *)redEnvelopeId{ - [self makeRequest:@"red-envelope/get" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, redEnvelopeId, nil]; -} -///拿到首充弹窗次数 -+(void)requestRoomFirstCharegWindow:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid{ - NSString * fang = [NSString stringFromBase64String:@"cm9vbUZpcnN0Q2hhcmdlV2luZG93L2dldA=="];///roomFirstChargeWindow/get - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,roomUid,nil]; - -} -///更新首充弹窗次数 -+(void)updateRoomFirstCharegWindow:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid{ - NSString * fang = [NSString stringFromBase64String:@"cm9vbUZpcnN0Q2hhcmdlV2luZG93L3VwZGF0ZQ=="];///roomFirstChargeWindow/update - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,roomUid,nil]; - -} -/// 屏蔽 -/// @param completion 完成 -/// @param type type为0 => 屏蔽动态, objId 为 动态id, type为1 => 屏蔽房间, objId 为 用户uid -+ (void)requestShielding:(HttpRequestHelperCompletion)completion type:(NSString *)type objId:(NSString *)objId{ - [self makeRequest:@"user/black/add" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, type,objId, nil]; -} -+(void)requestFreeGiftData:(HttpRequestHelperCompletion)completion{ - [self makeRequest:@"roomFreeGift/get" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,nil]; -} -/// /解锁照片 -/// @param completion 完成 -/// @param id 相册id -/// @param roomUid 房间id -+(void)unlockRoomAlbumPhoto:(HttpRequestHelperCompletion)completion id:(NSString *)id roomUid:(NSString *)roomUid{ - [self makeRequest:@"roomAlbum/unlockPhoto" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,id,roomUid,nil]; -} - -/// 获取已解锁照片id列表 -/// @param completion 完成 -/// @param roomUid 房间id -+(void)getUnlockRoomAlbumPhotoList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid{ - [self makeRequest:@"roomAlbum/listUnlockPhoto" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,roomUid,nil]; -} - -///获取踢人列表 -/// @param completion 完成 -/// @param roomUid 房间id -+(void)getKickUserList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid{ - [self makeRequest:@"room/kick/" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,roomUid,nil]; -} - -+ (void)shareGen:(HttpRequestHelperCompletion)completion targetUid:(NSString *)targetUid { - [self makeRequest:@"share/gen" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, targetUid, nil]; -} - -+ (void)getRoomMicCpListByRoomUid:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - [self makeRequest:@"room/mic/cp/listByRoomUid" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, nil]; -} - -+ (void)getRoomMicCpListByUidList:(HttpRequestHelperCompletion)completion uidList:(NSArray *)uidList { - [self makeRequest:@"room/mic/cp/listByUidList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uidList, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/Api/Api+SuperAdmin.h b/YuMi/Modules/YMRoom/Api/Api+SuperAdmin.h deleted file mode 100644 index 4cfa195..0000000 --- a/YuMi/Modules/YMRoom/Api/Api+SuperAdmin.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// Api+SuperAdmin.h -// YuMi -// -// Created by P on 2025/1/17. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api(SuperAdmin) -// type: 操作类型 1、解除进房限制；2、锁麦；3、闭麦；4、抱TA下麦；5、踢出房间；6、加入黑名单；7、关闭房间；8、隐藏房间；9、关闭公屏消息；10、开启公屏消息；11、移除黑名单 -+ (void)superAdminOperate:(HttpRequestHelperCompletion)complection - uid:(NSString *)uid - roomUid:(NSString *)roomUid - targetUid:(NSString *)targetUid - operateType:(NSNumber *)type; -// type: 0.关闭隐藏 1.开启隐藏 -+ (void)superAdminOperateRoom:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid type:(NSNumber *)type; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Api/Api+SuperAdmin.m b/YuMi/Modules/YMRoom/Api/Api+SuperAdmin.m deleted file mode 100644 index e9466a2..0000000 --- a/YuMi/Modules/YMRoom/Api/Api+SuperAdmin.m +++ /dev/null @@ -1,28 +0,0 @@ -// -// Api+SuperAdmin.m -// YuMi -// -// Created by P on 2025/1/17. -// - -#import "Api+SuperAdmin.h" - -@implementation Api(SuperAdmin) - -+ (void)superAdminOperate:(HttpRequestHelperCompletion)complection - uid:(NSString *)uid - roomUid:(NSString *)roomUid - targetUid:(NSString *)targetUid - operateType:(NSNumber *)type { - [self makeRequest:@"super/admin/operate/save" - method:HttpRequestHelperMethodPOST - completion:complection, __FUNCTION__, uid, roomUid, targetUid, type, nil]; -} - -+ (void)superAdminOperateRoom:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid type:(NSNumber *)type { - [self makeRequest:@"super/hide/room" - method:HttpRequestHelperMethodPOST - completion:complection, __FUNCTION__, roomUid, type, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/Features/Boom/BoomInfoViewController.h b/YuMi/Modules/YMRoom/Features/Boom/BoomInfoViewController.h deleted file mode 100644 index f57f406..0000000 --- a/YuMi/Modules/YMRoom/Features/Boom/BoomInfoViewController.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// BoomInfoViewController.h -// YuMi -// -// Created by P on 2024/9/29. -// - -#import "MvpViewController.h" - -//@class BoomDetailModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface BoomInfoViewController : MvpViewController - -//+ (BoomInfoViewController *)vcFromBoomProgress:(NSArray *)models; -@property (nonatomic, copy) void(^showGiftPanel)(void); -@property (nonatomic, assign) NSInteger roomUid; -@property (nonatomic, copy) NSString *partitionId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Features/Boom/BoomInfoViewController.m b/YuMi/Modules/YMRoom/Features/Boom/BoomInfoViewController.m deleted file mode 100644 index b17b303..0000000 --- a/YuMi/Modules/YMRoom/Features/Boom/BoomInfoViewController.m +++ /dev/null @@ -1,1168 +0,0 @@ -// -// BoomInfoViewController.m -// YuMi -// -// Created by P on 2024/9/29. -// - -#import "BoomInfoViewController.h" - -#import "Api+Boom.h" -#import "BoomInfoModel.h" -#import "RoomBoomManager.h" -#import "XPRoomHalfWebView.h" -#import "RoomBoomExplosionView.h" -#import "XPRoomGiftAnimationParser.h" - -#import - -@interface RocketBox : UIView - -@property (nonatomic, strong) NetImageView *icon; -@property (nonatomic, strong) UILabel *levelLabel; - -@property (nonatomic, assign) NSInteger level; -@property (nonatomic, assign) BOOL isSelected; -@property (nonatomic, copy) void(^didTapRocket)(NSInteger level); - -@end - -@implementation RocketBox - -- (instancetype)init { - if (self = [super init]) { - [self setupUI]; - [self setupTap]; - } - return self; -} - -- (void)setupUI { - [self addSubview:self.icon]; - [self.icon mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(0); - make.leading.mas_equalTo(4.5); - make.width.mas_equalTo(23); - make.height.mas_equalTo(36); - }]; - - [self addSubview:self.levelLabel]; - [self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self.icon.mas_trailing).offset(7); - make.trailing.mas_equalTo(0); - }]; -} - -- (void)setupTap { - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap)]; - [self addGestureRecognizer:tap]; -} - -- (void)handleTap { - if (_didTapRocket) { - self.didTapRocket(self.level); - } -} - -- (void)setLevel:(NSInteger)level { - _level = level; - self.levelLabel.text = [NSString stringWithFormat:@"LV.%ld", (long)level]; -} - -- (void)setIsSelected:(BOOL)isSelected { - _isSelected = isSelected; - if (isSelected) { - self.backgroundColor = UIColorFromRGB(0x9739FF); - } else { - self.backgroundColor = [UIColor clearColor]; - } -} - -- (NetImageView *)icon { - if (!_icon) { - _icon = [[NetImageView alloc] init]; - _icon.userInteractionEnabled = YES; - } - return _icon; -} - -- (UILabel *)levelLabel { - if (!_levelLabel) { - _levelLabel = [UILabel labelInitWithText:@"" font:kFontMedium(12) textColor:UIColorFromRGB(0xF8F4C9)]; - _levelLabel.textAlignment = NSTextAlignmentCenter; - _levelLabel.userInteractionEnabled = YES; - } - return _levelLabel; -} - -@end - - -@interface BoomInfoViewController () - -@property (nonatomic, strong) UIView *giftsView; -@property (nonatomic, strong) NetImageView *giftBig; -@property (nonatomic, strong) NetImageView *giftSmall_1; -@property (nonatomic, strong) NetImageView *giftSmall_2; -@property (nonatomic, strong) NetImageView *giftSmall_3; -@property (nonatomic, strong) NetImageView *giftSmall_4; - -@property (nonatomic, strong) RocketBox *rocket_lv_1; -@property (nonatomic, strong) RocketBox *rocket_lv_2; -@property (nonatomic, strong) RocketBox *rocket_lv_3; -@property (nonatomic, strong) RocketBox *rocket_lv_4; -@property (nonatomic, strong) RocketBox *rocket_lv_5; - -@property (nonatomic, strong) UILabel *progressLabel; - -@property (nonatomic, copy) NSArray * boomInfoArray; - -@property (nonatomic, strong) VAPView *vapView; -@property (nonatomic, strong) XPRoomGiftAnimationParser *vapParser; - -@property (nonatomic, assign) NSInteger selectedIndex; -@property (nonatomic, strong) UIImageView *progressBar; - -@property (nonatomic, strong) UIView *rankingView; -@property (nonatomic, strong) NetImageView *rankAvatar_1; -@property (nonatomic, strong) NetImageView *rankAvatar_2; -@property (nonatomic, strong) NetImageView *rankAvatar_3; -@property (nonatomic, strong) UILabel *rankName_1; -@property (nonatomic, strong) UILabel *rankName_2; -@property (nonatomic, strong) UILabel *rankName_3; - -@property (nonatomic, strong) UILabel *rankTipsLabel; -@property (nonatomic, strong) UILabel *ratioLabel; - -@end - -@implementation BoomInfoViewController - - -- (instancetype)init { - if (self = [super init]) { - self.view.backgroundColor = [UIColor clearColor]; - - } - return self; -} - -- (void)dealloc { - [self.vapView stopHWDMP4]; - [self.vapView removeFromSuperview]; - self.vapView = nil; - - [[RoomBoomManager sharedManager] removeEventListenerForTarget:self]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - [self setupUI]; - [self setupNotification]; - - @kWeakify(self); - [[RoomBoomManager sharedManager] registerBoomProgressUpdate:^(id _Nonnull sth) { - @kStrongify(self); - if ([sth isKindOfClass:[BoomDetailModel class]]) { - self.boomInfoArray = [[RoomBoomManager sharedManager] loadBoomDetails]; - } - } target:self]; - - self.selectedIndex = -1; - self.boomInfoArray = [[RoomBoomManager sharedManager] loadBoomDetails]; - - [self locateToRightLevel]; -} - -- (void)setPartitionId:(NSString *)partitionId { - _partitionId = partitionId; - self.rankTipsLabel.text = [self.partitionId isEqualToString:@"2"] ? YMLocalizedString(@"RoomBoom_6") : YMLocalizedString(@"RoomBoom_9"); -} - -- (void)setRoomUid:(NSInteger)roomUid { - _roomUid = roomUid; - [self loadDetailData]; -} - -- (void)setupNotification { - @kWeakify(self); - [[NSNotificationCenter defaultCenter] addObserverForName:@"UpdateWhenBoomExplosion" - object:nil - queue:[NSOperationQueue mainQueue] - usingBlock:^(NSNotification * _Nonnull notification) { - @kStrongify(self); - [self loadDetailData]; - }]; -} - -- (void)loadDetailData { - // 确保进入时数据正确 - @kWeakify(self); - [Api getBoomDetailInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - NSArray *array = [BoomDetailModel modelsWithArray:data.data]; - self.boomInfoArray = array; - [self locateToRightLevel]; - } - } roomUid:@(self.roomUid).stringValue]; -} - -- (void)locateToRightLevel { - for (BoomDetailModel *boom in self.boomInfoArray) { - if (boom.currLevel == 1 || boom.speed > 0) { - [self handleTapRocket:boom level:boom.level]; - } - - switch (boom.level) { - case 1: - self.rocket_lv_1.icon.imageUrl = boom.pic; - break; - case 2: - self.rocket_lv_2.icon.imageUrl = boom.pic; - break; - case 3: - self.rocket_lv_3.icon.imageUrl = boom.pic; - break; - case 4: - self.rocket_lv_4.icon.imageUrl = boom.pic; - break; - case 5: - self.rocket_lv_5.icon.imageUrl = boom.pic; - break; - - default: - break; - } - } - - if (self.selectedIndex == -1) { - [self handleTapRocket:nil level:1]; - } -} - -- (void)setBoomInfoArray:(NSArray *)boomInfoArray { - _boomInfoArray = boomInfoArray; - - if (self.selectedIndex != -1) { - [self handleTapRocket:nil level:self.selectedIndex]; - } -} - -- (void)setupUI { - UIImageView *backgroundImageView = [self backgroundImageView]; - [self.view addSubview:backgroundImageView]; - [backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.view).offset(kGetScaleWidth(154)); - }]; - - UIButton *leaveButton = [self leaveButton]; - [self.view addSubview:leaveButton]; - [leaveButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(188)); - }]; - - _vapView = [[VAPView alloc] init]; - _vapView.contentMode = UIViewContentModeScaleAspectFit; - [self.view addSubview:_vapView]; - [_vapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - if (iPhoneXSeries) { - make.top.mas_equalTo(self.view).offset(kGetScaleWidth(170) - kSafeAreaBottomHeight); - } else { - make.top.mas_equalTo(self.view).offset(kGetScaleWidth(40) - kSafeAreaBottomHeight); - } - make.width.mas_equalTo(kGetScaleWidth(211)); - make.height.mas_equalTo(kGetScaleWidth(489)); - }]; - - [self.view addSubview:self.giftsView]; - [self.giftsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(230+65) + kSafeAreaBottomHeight); - }]; - - UIButton *bottomButton = [self bottomButton]; - [self.giftsView addSubview:bottomButton]; - [bottomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.giftsView); - make.bottom.mas_equalTo(self.view).offset(kGetScaleWidth(-11)); - make.width.mas_equalTo(kGetScaleWidth(340)); - make.height.mas_equalTo(kGetScaleWidth(44)); - }]; - - UIImageView *jackpotBackgroundImageView = [self jackpotBackgroundImageView]; - [self.giftsView addSubview:jackpotBackgroundImageView]; - [jackpotBackgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.giftsView).offset(kGetScaleWidth(-65)); - make.centerX.mas_equalTo(self.giftsView); - make.width.mas_equalTo(kGetScaleWidth(355)); - make.height.mas_equalTo(kGetScaleWidth(230)); - }]; - - UIButton *helpButton = [self helpButton]; - [self.giftsView addSubview:helpButton]; - [helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(jackpotBackgroundImageView).offset(-8); - make.trailing.mas_equalTo(jackpotBackgroundImageView).offset(-5); - make.width.height.mas_equalTo(43); - }]; - - UIImageView *jackpotTitleImageView = [self jackpotTitleBG]; - [self.giftsView addSubview:jackpotTitleImageView]; - - UILabel *jackpotTitleLabel = [self jackpotTitleLabel]; - [self.giftsView addSubview:jackpotTitleLabel]; - - [jackpotTitleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(jackpotBackgroundImageView); - make.centerY.mas_equalTo(helpButton); - make.height.mas_equalTo(kGetScaleWidth(52)); - make.leading.mas_equalTo(jackpotTitleLabel).offset(-40); - make.trailing.mas_equalTo(jackpotTitleLabel).offset(40); - }]; - - [jackpotTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(jackpotTitleImageView); - }]; - - UILabel *tipsLabel = [self jackpotTipsLabel]; - [self.giftsView addSubview:tipsLabel]; - [tipsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(jackpotTitleImageView.mas_bottom).offset(4.5); - make.leading.mas_equalTo(jackpotBackgroundImageView).offset(28); - make.trailing.mas_equalTo(jackpotBackgroundImageView).offset(-28); - }]; - - UIImageView *giftBigBG = [self jackpotGiftBigBG]; - [self.giftsView addSubview:giftBigBG]; - [giftBigBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(tipsLabel.mas_bottom).offset(11.5); - make.bottom.mas_equalTo(jackpotBackgroundImageView).offset(-11); - make.leading.mas_equalTo(jackpotBackgroundImageView).offset(32); - make.width.mas_equalTo(kGetScaleWidth(120)); - }]; - - [giftBigBG addSubview:self.giftBig]; - [self.giftBig mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(giftBigBG); - make.size.mas_equalTo(giftBigBG).multipliedBy(0.8); - }]; - - UIImageView *giftSmall_1 = [self jackpotGiftSmallBG]; - [self.giftsView addSubview:giftSmall_1]; - [giftSmall_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(giftBigBG); - make.leading.mas_equalTo(giftBigBG.mas_trailing).offset(13); - make.width.height.mas_equalTo(kGetScaleWidth(73.5)); - }]; - - [giftSmall_1 addSubview:self.giftSmall_1]; - [self.giftSmall_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(giftSmall_1); - make.size.mas_equalTo(giftSmall_1).multipliedBy(0.8); - }]; - - UIImageView *giftSmall_2 = [self jackpotGiftSmallBG]; - [self.giftsView addSubview:giftSmall_2]; - [giftSmall_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(giftBigBG); - make.leading.mas_equalTo(giftSmall_1.mas_trailing).offset(13); - make.width.height.mas_equalTo(kGetScaleWidth(73.5)); - }]; - - [giftSmall_2 addSubview:self.giftSmall_2]; - [self.giftSmall_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(giftSmall_2); - make.size.mas_equalTo(giftSmall_2).multipliedBy(0.8); - }]; - - UIImageView *giftSmall_3 = [self jackpotGiftSmallBG]; - [self.giftsView addSubview:giftSmall_3]; - [giftSmall_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(giftSmall_1.mas_bottom).offset(5.5); - make.leading.mas_equalTo(giftBigBG.mas_trailing).offset(13); - make.width.height.mas_equalTo(kGetScaleWidth(73.5)); - }]; - - [giftSmall_3 addSubview:self.giftSmall_3]; - [self.giftSmall_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(giftSmall_3); - make.size.mas_equalTo(giftSmall_3).multipliedBy(0.8); - }]; - - UIImageView *giftSmall_4 = [self jackpotGiftSmallBG]; - [self.giftsView addSubview:giftSmall_4]; - [giftSmall_4 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(giftSmall_3); - make.leading.mas_equalTo(giftSmall_3.mas_trailing).offset(13); - make.width.height.mas_equalTo(kGetScaleWidth(73.5)); - }]; - - [giftSmall_4 addSubview:self.giftSmall_4]; - [self.giftSmall_4 mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(giftSmall_4); - make.size.mas_equalTo(giftSmall_4).multipliedBy(0.8); - }]; - - UIImageView *progressBG = [self progressBarBG]; - [self.view addSubview:progressBG]; - [progressBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(helpButton.mas_top).offset(-13); - make.trailing.mas_equalTo(self.view).offset(-6); - make.width.mas_equalTo(57); - make.height.mas_equalTo(kGetScaleWidth(240)); - }]; - - [progressBG addSubview:self.progressBar]; - [self.progressBar mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(progressBG).offset(isMSRTL() ? 18 : 21); - make.bottom.mas_equalTo(progressBG).offset(kGetScaleWidth(-35)); - make.width.mas_equalTo(18); - make.height.mas_equalTo(kGetScaleWidth(180)).multipliedBy(1); - }]; - - UIImageView *progressNumberBG = [self progressBarNumberBG]; - [self.view addSubview:progressNumberBG]; - [progressNumberBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(progressBG).offset(kGetScaleWidth(-13)); - make.centerX.mas_equalTo(self.progressBar); - make.width.height.mas_equalTo(43); - }]; - - [self.view addSubview:self.progressLabel]; - [self.progressLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(progressNumberBG); - }]; - - [progressBG addSubview:self.ratioLabel]; - [self.ratioLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(progressBG).offset(2); - make.centerY.mas_equalTo(progressBG); - }]; - - UIImageView *rocketsBG = [self rocketsBG]; - [self.view addSubview:rocketsBG]; - [rocketsBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view); - make.bottom.mas_equalTo(jackpotBackgroundImageView.mas_top); - make.width.mas_equalTo(kGetScaleWidth(71)); - make.height.mas_equalTo(kGetScaleWidth(247)); - }]; - - [rocketsBG addSubview:self.rocket_lv_5]; - [self.rocket_lv_5 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(rocketsBG).offset(kGetScaleWidth(11.5)); - make.leading.mas_equalTo(rocketsBG); - make.width.mas_equalTo(rocketsBG.mas_width).offset(-7.5); - make.height.mas_equalTo(kGetScaleWidth(38.5)); - }]; - - [rocketsBG addSubview:self.rocket_lv_4]; - [self.rocket_lv_4 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.rocket_lv_5.mas_bottom).offset(kGetScaleWidth(7)); - make.leading.mas_equalTo(rocketsBG); - make.width.mas_equalTo(self.rocket_lv_5); - make.height.mas_equalTo(self.rocket_lv_5); - }]; - - [rocketsBG addSubview:self.rocket_lv_3]; - [self.rocket_lv_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.rocket_lv_4.mas_bottom).offset(kGetScaleWidth(7)); - make.leading.mas_equalTo(rocketsBG); - make.width.mas_equalTo(self.rocket_lv_5); - make.height.mas_equalTo(self.rocket_lv_5); - }]; - - [rocketsBG addSubview:self.rocket_lv_2]; - [self.rocket_lv_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.rocket_lv_3.mas_bottom).offset(kGetScaleWidth(7)); - make.leading.mas_equalTo(rocketsBG); - make.width.mas_equalTo(self.rocket_lv_5); - make.height.mas_equalTo(self.rocket_lv_5); - }]; - - [rocketsBG addSubview:self.rocket_lv_1]; - [self.rocket_lv_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.rocket_lv_2.mas_bottom).offset(kGetScaleWidth(7)); - make.leading.mas_equalTo(rocketsBG); - make.width.mas_equalTo(self.rocket_lv_5); - make.height.mas_equalTo(self.rocket_lv_5); - }]; - - [self.view addSubview:self.rankingView]; - [self.rankingView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.view).offset(-16); - make.leading.mas_equalTo(self.view).offset(10); - make.trailing.mas_equalTo(self.view).offset(-10); - make.height.mas_equalTo(kGetScaleWidth(288)); - }]; - - UIImageView *rankingBG = [self rankingBG]; - [self.rankingView addSubview:rankingBG]; - [rankingBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.rankingView); - }]; - - UIButton *helpButton_2 = [self helpButton]; - [self.rankingView addSubview:helpButton_2]; - [helpButton_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(rankingBG).offset(-8); - make.trailing.mas_equalTo(rankingBG).offset(-3); - make.width.height.mas_equalTo(43); - }]; - - UIImageView *rankingTitleBG = [self rankingTitleBG]; - [self.rankingView addSubview:rankingTitleBG]; - [rankingTitleBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(rankingBG.mas_top).offset(-14); - make.centerX.mas_equalTo(self.rankingView); -// make.width.mas_equalTo(kGetScaleWidth(215)); - make.height.mas_equalTo(kGetScaleWidth(52)); - }]; - - UILabel *rankingTitleLabel = [self rankingTitleLabel]; - [self.rankingView addSubview:rankingTitleLabel]; - [rankingTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(rankingTitleBG); - make.leading.mas_equalTo(rankingTitleBG).offset(40); - make.trailing.mas_equalTo(rankingTitleBG).offset(-40); - }]; - - [self.rankingView addSubview:self.rankAvatar_1]; - [self.rankAvatar_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.rankingView); - make.top.mas_equalTo(rankingBG).offset(kGetScaleWidth(60)); - make.width.height.mas_equalTo(kGetScaleWidth(86)); - }]; - UIImageView *wear_1 = [self rankingAvatarWear]; - [self.rankingView addSubview:wear_1]; - [wear_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.rankAvatar_1); - make.width.height.mas_equalTo(kGetScaleWidth(124)); - }]; - - [self.rankingView addSubview:self.rankAvatar_2]; - [self.rankAvatar_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(rankingBG).offset(30); - make.top.mas_equalTo(rankingBG).offset(kGetScaleWidth(108)); - make.width.height.mas_equalTo(kGetScaleWidth(66)); - }]; - UIImageView *wear_2 = [self rankingAvatarWear]; - [self.rankingView addSubview:wear_2]; - [wear_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.rankAvatar_2); - make.width.height.mas_equalTo(kGetScaleWidth(94)); - }]; - - [self.rankingView addSubview:self.rankAvatar_3]; - [self.rankAvatar_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(rankingBG).offset(-30); - make.top.mas_equalTo(rankingBG).offset(kGetScaleWidth(108)); - make.width.height.mas_equalTo(kGetScaleWidth(66)); - }]; - UIImageView *wear_3 = [self rankingAvatarWear]; - [self.rankingView addSubview:wear_3]; - [wear_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.rankAvatar_3); - make.width.height.mas_equalTo(kGetScaleWidth(94)); - }]; - - UIImageView *nameBG_1 = [self rankingNameBG]; - [self.rankingView addSubview:nameBG_1]; - [nameBG_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(wear_1); - make.top.mas_equalTo(wear_1.mas_bottom).offset(6); - make.width.mas_equalTo(kGetScaleWidth(98)); - make.height.mas_equalTo(kGetScaleWidth(28)); - }]; - [self.rankingView addSubview:self.rankName_1]; - [self.rankName_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(nameBG_1); - }]; - - UIImageView *nameBG_2 = [self rankingNameBG]; - [self.rankingView addSubview:nameBG_2]; - [nameBG_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(wear_2); - make.top.mas_equalTo(wear_2.mas_bottom).offset(6); - make.width.mas_equalTo(kGetScaleWidth(98)); - make.height.mas_equalTo(kGetScaleWidth(28)); - }]; - [self.rankingView addSubview:self.rankName_2]; - [self.rankName_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(nameBG_2); - }]; - - UIImageView *nameBG_3 = [self rankingNameBG]; - [self.rankingView addSubview:nameBG_3]; - [nameBG_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(wear_3); - make.top.mas_equalTo(wear_3.mas_bottom).offset(6); - make.width.mas_equalTo(kGetScaleWidth(98)); - make.height.mas_equalTo(kGetScaleWidth(28)); - }]; - [self.rankingView addSubview:self.rankName_3]; - [self.rankName_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(nameBG_3); - }]; - - [self.rankingView addSubview:self.rankTipsLabel]; - [self.rankingView addSubview:self.rankTipsLabel]; - [self.rankTipsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.rankingView); - make.bottom.mas_equalTo(-15); - }]; -} - -- (void)handleTapBottomButton { - @kWeakify(self); - [self dismissViewControllerAnimated:YES completion:^{ - @kStrongify(self); - if (self.showGiftPanel) { - self.showGiftPanel(); - } - }]; -} - -- (void)handleTapHelpButton { - [self dismissViewControllerAnimated:YES completion:^{ - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomUid]; - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.roomUid = roomUid; - webView.url = [NSString stringWithFormat:@"%@%@", URLWithType(KBoomRule), self.partitionId]; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; - }]; -} - -- (void)handleTapEmptySpace { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)handleTapRocket:(BoomDetailModel * _Nullable )boom level:(NSInteger)level { - - self.selectedIndex = level; - - self.rocket_lv_1.isSelected = NO; - self.rocket_lv_2.isSelected = NO; - self.rocket_lv_3.isSelected = NO; - self.rocket_lv_4.isSelected = NO; - self.rocket_lv_5.isSelected = NO; - - switch (level) { - case 1: - self.rocket_lv_1.isSelected = YES; - break; - case 2: - self.rocket_lv_2.isSelected = YES; - break; - case 3: - self.rocket_lv_3.isSelected = YES; - break; - case 4: - self.rocket_lv_4.isSelected = YES; - break; - case 5: - self.rocket_lv_5.isSelected = YES; - break; - default: - break; - } - - if (boom == nil) { - for (BoomDetailModel *boomInfo in self.boomInfoArray) { - if (boomInfo.level == level) { - boom = boomInfo; - break; - } - } - } - - self.progressLabel.text = @(boom.speed).stringValue; - CGFloat progress = boom.speed * 1.0 / 100.0; - if (progress == 0) { - progress = 0.1; - } - - // 更新比值 label 并保持发光效果 - NSString *ratioText = @""; - if (boom.speed == 100) { - ratioText = [NSString stringWithFormat:@"%@/%@", @(boom.goldNum), @(boom.goldNum)]; - } else { - ratioText = [NSString stringWithFormat:@"%@/%@", @(floor(boom.exp)), @(boom.goldNum)]; - } - - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:ratioText]; - [attributedString addAttribute:NSStrokeColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(0, attributedString.length)]; - [attributedString addAttribute:NSStrokeWidthAttributeName value:@(-2.0) range:NSMakeRange(0, attributedString.length)]; - [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor blackColor] range:NSMakeRange(0, attributedString.length)]; - [attributedString addAttribute:NSFontAttributeName value:kFontMedium(14) range:NSMakeRange(0, attributedString.length)]; - self.ratioLabel.attributedText = attributedString; - - [UIView animateWithDuration:0.2 animations:^{ - [self.progressBar mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(180) * progress); // 动态调整高度 - }]; - [self.view layoutIfNeeded]; - }]; - - [self playMP4:boom.vapUrl]; - - if (boom.roomBoomRankVos.count > 0) { - self.rankingView.hidden = NO; - self.giftsView.hidden = YES; - - self.rankName_1.text = @""; - self.rankName_2.text = @""; - self.rankName_3.text = @""; - self.rankAvatar_1.imageUrl = @""; - self.rankAvatar_2.imageUrl = @""; - self.rankAvatar_3.imageUrl = @""; - - for (roomBoomRankVo *rank in boom.roomBoomRankVos) { - switch (rank.position) { - case 1: - self.rankAvatar_1.imageUrl = rank.avatar; - self.rankName_1.text = rank.nick; - break; - case 2: - self.rankAvatar_2.imageUrl = rank.avatar; - self.rankName_2.text = rank.nick; - break; - case 3: - self.rankAvatar_3.imageUrl = rank.avatar; - self.rankName_3.text = rank.nick; - break; - default: - break; - } - } - } else { - self.rankingView.hidden = YES; - self.giftsView.hidden = NO; - - self.giftBig.image = nil; - self.giftSmall_1.image = nil; - self.giftSmall_2.image = nil; - self.giftSmall_3.image = nil; - self.giftSmall_4.image = nil; - - for (roomBoomLevelAwardVo *award in boom.roomBoomLevelAwardVos) { - if (award.isShow != 1) { - continue; - } - NSString *pic = [award.awardPic stringByRemovingPercentEncoding]; - switch (award.seq) { - case 1: - self.giftBig.imageUrl = pic; - break; - case 2: - self.giftSmall_1.imageUrl = pic; - break; - case 3: - self.giftSmall_2.imageUrl = pic; - break; - case 4: - self.giftSmall_3.imageUrl = pic; - break; - case 5: - self.giftSmall_4.imageUrl = pic; - break; - default: - break; - } - } - } -} - -- (void)playMP4:(NSString *)path { - NSString *mp4Path = [path pureURLString]; - if (mp4Path.length == 0) { - return; - } - - @kWeakify(self); - [self.vapParser parseWithURL:mp4Path completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [self.vapView setMute:YES]; - [self.vapView playHWDMP4:videoUrl repeatCount:-1 delegate:self]; - } - } failureBlock:^(NSError * _Nullable error) { -// NSLog(@"%@", error); - }]; -} - -#pragma mark - HWDMP4PlayDelegate -//即将开始播放时询问，true马上开始播放，false放弃播放 -- (BOOL)shouldStartPlayMP4:(VAPView *)container config:(QGVAPConfigModel *)config { - return YES; -} - -- (void)viewDidFinishPlayMP4:(NSInteger)totalFrameCount view:(VAPView *)container { - -} - -- (void)viewDidStopPlayMP4:(NSInteger)lastFrameIndex view:(VAPView *)container { - -} - -- (void)viewDidFailPlayMP4:(NSError *)error{ - -} - -#pragma mark - -- (UILabel *)progressLabel { - if (!_progressLabel) { - _progressLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(15) - textColor:UIColorFromRGB(0xF0E7BA)]; - _progressLabel.textAlignment = NSTextAlignmentCenter; - } - return _progressLabel; -} - -- (UIButton *)leaveButton { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b addTarget:self action:@selector(handleTapEmptySpace) forControlEvents:UIControlEventTouchUpInside]; - return b; -} - -- (UIImageView *)backgroundImageView { - UIImageView *bg = [[UIImageView alloc] initWithImage:kImage(@"room_boom_progress_bg")]; - bg.contentMode = UIViewContentModeScaleAspectFill; - bg.userInteractionEnabled = YES; - return bg; -} - -- (UIView *)giftsView { - if (!_giftsView) { - _giftsView = [[UIView alloc] init]; - _giftsView.hidden = YES; - } - return _giftsView; -} - -- (UIButton *)bottomButton { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - [button setTitle:YMLocalizedString(@"RoomBoom_2") forState:UIControlStateNormal]; - [button setBackgroundImage:kImage(@"room_boom_progress_bottom_bg") forState:UIControlStateNormal]; - [button addTarget:self action:@selector(handleTapBottomButton) forControlEvents:UIControlEventTouchUpInside]; - return button; -} - -- (UIImageView *)jackpotBackgroundImageView { - UIImageView *bg = [[UIImageView alloc] initWithImage:kImage(@"room_boom_progress_jackpot_bg")]; - bg.contentMode = UIViewContentModeScaleAspectFill; - return bg; -} - -- (UIButton *)helpButton { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - [button setBackgroundImage:kImage(@"room_boom_progress_help") forState:UIControlStateNormal]; - [button addTarget:self action:@selector(handleTapHelpButton) forControlEvents:UIControlEventTouchUpInside]; - return button; -} - -- (UIImageView *)jackpotTitleBG { - UIImage *image = [kImage(@"room_boom_result_top_bg") resizableImageWithCapInsets:UIEdgeInsetsMake(0, 40, 0, 40) resizingMode:UIImageResizingModeStretch]; - UIImageView *imageView = [[UIImageView alloc] initWithImage:image]; - return imageView; -} - -- (UILabel *)jackpotTitleLabel { - UILabel *label = [UILabel labelInitWithText:YMLocalizedString(@"RoomBoom_8") - font:kFontMedium(17.5) - textColor:UIColorFromRGB(0xF0E7BA)]; - label.textAlignment = NSTextAlignmentCenter; - return label; -} - - -- (UILabel *)jackpotTipsLabel { - UILabel *label = [UILabel labelInitWithText:YMLocalizedString(@"RoomBoom_10") font:kFontRegular(10) textColor:UIColorFromRGB(0xCBA1FF)]; - label.textAlignment = NSTextAlignmentCenter; - label.numberOfLines = 2; - return label; -} - -- (UIImageView *)jackpotGiftBigBG { - UIImageView *imageView = [[UIImageView alloc] initWithImage:kImage(@"room_boom_progress_gift_big_bg")]; - return imageView; -} - -- (UIImageView *)jackpotGiftSmallBG { - UIImageView *imageView = [[UIImageView alloc] initWithImage:kImage(@"room_boom_progress_gift_small_bg")]; - return imageView; -} - -- (UIView *)rankingView { - if (!_rankingView) { - _rankingView = [[UIView alloc] init]; - _rankingView.hidden = YES; - } - return _rankingView; -} - -- (UIImageView *)rankingBG { - UIImageView *imageView = [[UIImageView alloc] initWithImage:kImage(@"room_boom_ranking_bg")]; - return imageView; -} - -- (UIImageView *)rankingTitleBG { - UIImage *image = [kImage(@"room_boom_result_top_bg") resizableImageWithCapInsets:UIEdgeInsetsMake(0, 40, 0, 40) resizingMode:UIImageResizingModeTile]; - UIImageView *imageView = [[UIImageView alloc] initWithImage:image]; - return imageView; -} - -- (UILabel *)rankingTitleLabel { - UILabel *label = [UILabel labelInitWithText:YMLocalizedString(@"RoomBoom_7") - font:kFontMedium(17.5) - textColor:UIColorFromRGB(0xF0E7BA)]; - label.textAlignment = NSTextAlignmentCenter; - return label; -} - -- (UIImageView *)rankingAvatarWear { - UIImageView *imageView = [[UIImageView alloc] initWithImage:kImage(@"room_boom_progress_avatar")]; - return imageView; -} - -- (UIImageView *)rankingNameBG { - UIImageView *imageView = [[UIImageView alloc] initWithImage:kImage(@"room_boom_ranking_name_bg")]; - return imageView; -} - -- (UILabel *)rankName_1 { - if (!_rankName_1) { - _rankName_1 = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:UIColorFromRGB(0xF0E7BA)]; - } - return _rankName_1; -} - -- (UILabel *)rankName_2 { - if (!_rankName_2) { - _rankName_2 = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:UIColorFromRGB(0xF0E7BA)]; - } - return _rankName_2; -} - -- (UILabel *)rankName_3 { - if (!_rankName_3) { - _rankName_3 = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:UIColorFromRGB(0xF0E7BA)]; - } - return _rankName_3; -} - -- (NetImageConfig *)avatarConfig { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - return config; -} - -- (NetImageView *)rankAvatar_1 { - if (!_rankAvatar_1) { - _rankAvatar_1 = [[NetImageView alloc] initWithConfig:self.avatarConfig]; - _rankAvatar_1.contentMode = UIViewContentModeScaleAspectFit; - _rankAvatar_1.layer.cornerRadius = 86/2; - _rankAvatar_1.layer.masksToBounds = YES; - } - return _rankAvatar_1; -} - -- (NetImageView *)rankAvatar_2 { - if (!_rankAvatar_2) { - _rankAvatar_2 = [[NetImageView alloc] initWithConfig:self.avatarConfig]; - _rankAvatar_2.contentMode = UIViewContentModeScaleAspectFit; - _rankAvatar_2.layer.cornerRadius = 66/2; - _rankAvatar_2.layer.masksToBounds = YES; - } - return _rankAvatar_2; -} - -- (NetImageView *)rankAvatar_3 { - if (!_rankAvatar_3) { - _rankAvatar_3 = [[NetImageView alloc] initWithConfig:self.avatarConfig]; - _rankAvatar_3.contentMode = UIViewContentModeScaleAspectFit; - _rankAvatar_3.layer.cornerRadius = 66/2; - _rankAvatar_3.layer.masksToBounds = YES; - } - return _rankAvatar_3; -} - -- (UIImageView *)progressBarBG { - UIImageView *imageView = [[UIImageView alloc] initWithImage:kImage(@"room_boom_progress_bar_bg")]; - return imageView; -} - -- (UIImageView *)progressBarNumberBG { - UIImageView *imageView = [[UIImageView alloc] initWithImage:kImage(@"room_boom_progress_number_bg")]; - return imageView; -} - -- (UIImageView *)rocketsBG { - UIImageView *imageView = [[UIImageView alloc] initWithImage:kImage(@"room_boom_progress_rockets_bg")]; - imageView.userInteractionEnabled = YES; - return imageView; -} - -- (NetImageView *)giftBig { - if (!_giftBig) { - _giftBig = [[NetImageView alloc] init]; - _giftBig.contentMode = UIViewContentModeScaleAspectFit; - } - return _giftBig; -} - -- (NetImageView *)giftSmall_1 { - if (!_giftSmall_1) { - _giftSmall_1 = [[NetImageView alloc] init]; - _giftSmall_1.contentMode = UIViewContentModeScaleAspectFit; - } - return _giftSmall_1; -} - -- (NetImageView *)giftSmall_2 { - if (!_giftSmall_2) { - _giftSmall_2 = [[NetImageView alloc] init]; - _giftSmall_2.contentMode = UIViewContentModeScaleAspectFit; - } - return _giftSmall_2; -} - -- (NetImageView *)giftSmall_3 { - if (!_giftSmall_3) { - _giftSmall_3 = [[NetImageView alloc] init]; - _giftSmall_3.contentMode = UIViewContentModeScaleAspectFit; - } - return _giftSmall_3; -} - -- (NetImageView *)giftSmall_4 { - if (!_giftSmall_4) { - _giftSmall_4 = [[NetImageView alloc] init]; - _giftSmall_4.contentMode = UIViewContentModeScaleAspectFit; - } - return _giftSmall_4; -} - -- (RocketBox *)rocket_lv_1 { - if (!_rocket_lv_1) { - _rocket_lv_1 = [[RocketBox alloc] init]; - _rocket_lv_1.level = 1; - @kWeakify(self); - _rocket_lv_1.didTapRocket = ^(NSInteger level) { - @kStrongify(self); - [self handleTapRocket:nil level:level]; - }; - } - return _rocket_lv_1; -} - -- (RocketBox *)rocket_lv_2 { - if (!_rocket_lv_2) { - _rocket_lv_2 = [[RocketBox alloc] init]; - _rocket_lv_2.level = 2; - @kWeakify(self); - _rocket_lv_2.didTapRocket = ^(NSInteger level) { - @kStrongify(self); - [self handleTapRocket:nil level:level]; - }; - } - return _rocket_lv_2; -} - -- (RocketBox *)rocket_lv_3 { - if (!_rocket_lv_3) { - _rocket_lv_3 = [[RocketBox alloc] init]; - _rocket_lv_3.level = 3; - @kWeakify(self); - _rocket_lv_3.didTapRocket = ^(NSInteger level) { - @kStrongify(self); - [self handleTapRocket:nil level:level]; - }; - } - return _rocket_lv_3; -} - -- (RocketBox *)rocket_lv_4 { - if (!_rocket_lv_4) { - _rocket_lv_4 = [[RocketBox alloc] init]; - _rocket_lv_4.level = 4; - @kWeakify(self); - _rocket_lv_4.didTapRocket = ^(NSInteger level) { - @kStrongify(self); - [self handleTapRocket:nil level:level]; - }; - } - return _rocket_lv_4; -} - -- (RocketBox *)rocket_lv_5 { - if (!_rocket_lv_5) { - _rocket_lv_5 = [[RocketBox alloc] init]; - _rocket_lv_5.level = 5; - @kWeakify(self); - _rocket_lv_5.didTapRocket = ^(NSInteger level) { - @kStrongify(self); - [self handleTapRocket:nil level:level]; - }; - } - return _rocket_lv_5; -} - -- (XPRoomGiftAnimationParser *)vapParser { - if (!_vapParser) { - _vapParser = [[XPRoomGiftAnimationParser alloc] init]; - } - return _vapParser; -} - -- (UIImageView *)progressBar { - if (!_progressBar) { - UIImage *progressImage = [kImage(@"room_boom_progress_bar") resizableImageWithCapInsets:UIEdgeInsetsMake(10, 0, 20, 0) resizingMode:UIImageResizingModeTile]; - _progressBar = [[UIImageView alloc] initWithImage:progressImage]; - _progressBar.userInteractionEnabled = YES; - _progressBar.hidden = NO; - _progressBar.clipsToBounds = YES; - } - return _progressBar; -} - -- (UILabel *)rankTipsLabel { - if (!_rankTipsLabel) { - _rankTipsLabel = [UILabel labelInitWithText:@"" font:kFontLight(12) textColor:[UIColor whiteColor]]; - _rankTipsLabel.textAlignment = NSTextAlignmentCenter; - } - return _rankTipsLabel; -} - -- (UILabel *)ratioLabel { - if (!_ratioLabel) { - _ratioLabel = [UILabel labelInitWithText:@"0/0" font:kFontMedium(12) textColor:UIColorFromRGB(0x292601)]; - _ratioLabel.textAlignment = NSTextAlignmentCenter; - _ratioLabel.transform = CGAffineTransformMakeRotation(M_PI_2); // 顺时针旋转90度 - -// // 添加发光效果 -// _ratioLabel.layer.shadowColor = [UIColor whiteColor].CGColor; -// _ratioLabel.layer.shadowOffset = CGSizeZero; -// _ratioLabel.layer.shadowRadius = 3.0; -// _ratioLabel.layer.shadowOpacity = 0.8; -// _ratioLabel.layer.masksToBounds = NO; -// -// // 添加文字描边效果 -// NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:@"0/0"]; -// [attributedString addAttribute:NSStrokeColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(0, attributedString.length)]; -// [attributedString addAttribute:NSStrokeWidthAttributeName value:@(-2.0) range:NSMakeRange(0, attributedString.length)]; -// _ratioLabel.attributedText = attributedString; - } - return _ratioLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.h b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.h deleted file mode 100644 index 497ce93..0000000 --- a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// RoomBoomBannerAnimation.h -// YuMi -// -// Created by P on 2024/9/27. -// - -#import - -@class AttachmentModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomBoomBannerAnimation : UIView - - -/// 播放房间特效的方法，后续有机会重构，所有对象按此方法进行 -/// - Parameters: -/// - superView: 加载特效的视图 -/// - attachment: 构建视图内容的数据 -/// - handleTapToRoom: 是否响应点击事件，点击后在内部处理逻辑 -/// - complete: 播放完成回调 -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - tapToRoom:(BOOL)handleTapToRoom - complete:(void(^)(void))complete; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.m b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.m deleted file mode 100644 index 7f00ed3..0000000 --- a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.m +++ /dev/null @@ -1,242 +0,0 @@ -// -// RoomBoomBannerAnimation.m -// YuMi -// -// Created by P on 2024/9/27. -// - -#import "RoomBoomBannerAnimation.h" - -#import "RoomBoomManager.h" - -#import "RoomInfoModel.h" -#import "BoomInfoModel.h" -#import "AttachmentModel.h" -#import "RoomHostDelegate.h" -#import "XPRoomViewController.h" -#import "XCCurrentVCStackManager.h" -#import "XPSkillCardPlayerManager.h" - -@interface RoomBoomBannerAnimation () - -@property (nonatomic, strong) NetImageView *avatar; -@property (nonatomic, strong) NetImageView *rocket; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UILabel *contentLabel; - -@property (nonatomic, strong) Boom632Model *model; - -@property (nonatomic, assign) BOOL needHandleTap; - -@end - -@implementation RoomBoomBannerAnimation - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - tapToRoom:(BOOL)handleTapToRoom - complete:(nonnull void (^)(void))complete { - - if (!attachment) { - return; - } - - Boom632Model *m = [Boom632Model modelWithJSON:attachment.data]; - - CGFloat width = KScreenWidth-32; - CGFloat height = kGetScaleWidth(90); - RoomBoomBannerAnimation *bannerView = [[RoomBoomBannerAnimation alloc] initWithFrame:CGRectMake(KScreenWidth, 80, width, height)]; - bannerView.model = m; - bannerView.needHandleTap = handleTapToRoom; - [superView addSubview:bannerView]; - - @kWeakify(bannerView); - [UIView animateWithDuration:0.25 animations:^{ - bannerView.center = CGPointMake(superView.center.x, height/2 + 80); - } completion:^(BOOL finished) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [UIView animateWithDuration:0.25 delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{ - bannerView.frame = CGRectMake(-KScreenWidth, 80, width, height); - } completion:^(BOOL finished) { - @kStrongify(bannerView); - [bannerView removeFromSuperview]; - - [[RoomBoomManager sharedManager] bannerDisplayEnd]; - }]; - }); - }]; -} - -- (void)setModel:(Boom632Model *)model { - _model = model; - self.avatar.imageUrl = model.avatar; - self.rocket.imageUrl = model.pic; - self.titleLabel.text = [NSString stringWithFormat:@"%@%@", YMLocalizedString(@"RoomBoom_5"), model.roomTitle]; -} - -- (void)handleTapGo { - if (self.needHandleTap) { - - // 找到當前房間 - UIViewController * controllerView = [XCCurrentVCStackManager shareManager].getCurrentVC; - __block XPRoomViewController *roomVC = nil; - [controllerView.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - [controllerView.navigationController popToRootViewControllerAnimated:NO]; - roomVC = obj; - *stop = YES; - } - }]; - - if (roomVC) { - // 是否相同房間 - if ([roomVC getRoomInfo].uid == [[XPSkillCardPlayerManager shareInstance] roomUid].integerValue) { - return; - } - - __block NSString *targetRoomUid = @(self.model.roomUid).stringValue; - [TTPopup alertWithMessage:YMLocalizedString(@"Combo_10") confirmHandler:^{ - [roomVC exitRoom]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:targetRoomUid - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } cancelHandler:^{}]; - - } else { - [XPRoomViewController openRoom:@(self.model.roomUid).stringValue - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - } - } -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - - self.backgroundColor = [UIColor clearColor]; - - UIImageView *backgroundImageView = [[UIImageView alloc] initWithImage:kImage(@"boom_banner_bg")]; - backgroundImageView.contentMode = UIViewContentModeScaleAspectFit; - [self addSubview:backgroundImageView]; - [backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.bottom.mas_equalTo(self); - make.width.mas_equalTo(kGetScaleWidth(285)); - }]; - - UIButton *goButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [goButton addTarget:self action:@selector(handleTapGo) forControlEvents:UIControlEventTouchUpInside]; - [goButton setBackgroundImage:kImage(@"boom_banner_go") forState:UIControlStateNormal]; - [self addSubview:goButton]; - [goButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.bottom.mas_equalTo(self); - make.width.mas_equalTo(kGetScaleWidth(97)); - }]; - - UIImageView *avatarWearImageView = [[UIImageView alloc] initWithImage:kImage(@"boom_banner_wear")]; - avatarWearImageView.contentMode = UIViewContentModeScaleAspectFit; - [self addSubview:avatarWearImageView]; - [avatarWearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.bottom.mas_equalTo(self); - make.width.mas_equalTo(kGetScaleWidth(94)); - }]; - - [self insertSubview:self.avatar belowSubview:avatarWearImageView]; - [self.avatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(avatarWearImageView); - make.top.mas_equalTo(avatarWearImageView).offset(19); - make.width.height.mas_equalTo(kGetScaleWidth(57)); - }]; - - [self addSubview:self.rocket]; - [self.rocket mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(avatarWearImageView.mas_right); - make.centerY.mas_equalTo(backgroundImageView); - make.width.height.mas_equalTo(kGetScaleWidth(35)); - }]; - - [self addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(38)); - make.left.mas_equalTo(self.rocket.mas_right).offset(4); - make.right.mas_equalTo(goButton.mas_left); - make.height.mas_offset(17); - }]; - - [self addSubview:self.contentLabel]; - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom); - make.left.mas_equalTo(self.rocket.mas_right).offset(4); - make.right.mas_equalTo(goButton.mas_left); -// make.height.mas_offset(17); - }]; - } - return self; -} - - -- (NetImageConfig *)avatarConfig { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - return config; -} - -- (NetImageView *)avatar { - if (!_avatar) { - _avatar = [[NetImageView alloc] initWithConfig:[self avatarConfig]]; - _avatar.layer.masksToBounds = YES; - _avatar.layer.cornerRadius = 56/2; - _avatar.layer.borderColor = [UIColor whiteColor].CGColor; - _avatar.layer.borderWidth = 1; - } - return _avatar; -} - -- (NetImageView *)rocket { - if (!_rocket) { - _rocket = [[NetImageView alloc] init]; - _rocket.contentMode = UIViewContentModeScaleAspectFit; - } - return _rocket; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(12) - textColor:[UIColor whiteColor]]; - - _titleLabel.shadowColor = [UIColor grayColor]; - _titleLabel.shadowOffset = CGSizeMake(2, 2); - } - return _titleLabel; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(10) - textColor:[UIColor whiteColor]]; - _contentLabel.numberOfLines = 2; - NSAttributedString *as_2 = [[NSAttributedString alloc] initWithString:@"Boom" - attributes:@{NSFontAttributeName: kFontMedium(10), - NSForegroundColorAttributeName: UIColorFromRGB(0xFFE018)}]; - NSAttributedString *as_3 = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"RoomBoom_4") - attributes:@{NSFontAttributeName: kFontMedium(10), - NSForegroundColorAttributeName: [UIColor whiteColor]}]; - NSMutableAttributedString *content = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"RoomBoom_3") attributes:@{NSFontAttributeName: kFontMedium(10), NSForegroundColorAttributeName: [UIColor whiteColor]}]; - if (isMSRTL()) { - [content appendAttributedString:as_3]; - } else if (isMSZH()) { - [content appendAttributedString:as_2]; - [content appendAttributedString:as_3]; - } else { - [content insertAttributedString:as_2 atIndex:0]; - } - - _contentLabel.attributedText = content; - } - return _contentLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.h b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.h deleted file mode 100644 index 1905cc7..0000000 --- a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// RoomBoomEntryView.h -// YuMi -// -// Created by P on 2024/10/8. -// - -#import - -@class BoomDetailModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomBoomEntryView : UIView - -@property (nonatomic, strong) BoomDetailModel *boomModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.m b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.m deleted file mode 100644 index 788b305..0000000 --- a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomEntryView.m +++ /dev/null @@ -1,99 +0,0 @@ -// -// RoomBoomEntryView.m -// YuMi -// -// Created by P on 2024/10/8. -// - -#import "RoomBoomEntryView.h" - -#import "BoomInfoModel.h" - -@interface RoomBoomEntryView() - -@property (nonatomic, strong) NetImageView *icon; -@property (nonatomic, strong) UIImageView *progress; -@property (nonatomic, strong) UIImageView *progressBG; - -@end - -@implementation RoomBoomEntryView - -- (void)setBoomModel:(BoomDetailModel *)boomModel { - _boomModel = boomModel; - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - self.icon.imageUrl = boomModel.pic; - CGFloat progress = boomModel.speed * 1.0 / 100.0; - if (progress == 0) { - self.progress.hidden = YES; - } else { - self.progress.hidden = NO; - [UIView animateWithDuration:0.3 animations:^{ - [self.progress mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(46 * progress); - }]; - [self layoutIfNeeded]; - }]; - } - }); -} - -- (instancetype)init { - if (self = [super init]) { - [self addSubview:self.icon]; - [self.icon mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(-10); - make.size.mas_equalTo(CGSizeMake(55,55)); - }]; - - [self addSubview:self.progressBG]; - [self.progressBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self).offset(-3); - make.centerX.mas_equalTo(self); - make.width.mas_equalTo(47); - make.height.mas_equalTo(8); - }]; - - [self.progressBG addSubview:self.progress]; - [self.progress mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.progressBG); - make.leading.mas_equalTo(self.progress);//.offset(0.5); - make.width.mas_equalTo(0); - make.height.mas_equalTo(7); - }]; - } - return self; -} - -- (UIImageView *)icon { - if (!_icon) { - _icon = [[NetImageView alloc] init]; - _icon.userInteractionEnabled = YES; - _icon.contentMode = UIViewContentModeScaleAspectFit; - _icon.transform = CGAffineTransformMakeRotation(-M_PI / 6); - } - return _icon; -} - -- (UIImageView *)progress { - if (!_progress) { - UIImage *progressImage = [kImage(@"room_boom_entry_progress_bar") resizableImageWithCapInsets:UIEdgeInsetsMake(0, 6, 0, 6) resizingMode:UIImageResizingModeStretch]; - _progress = [[UIImageView alloc] initWithImage:progressImage]; - _progress.userInteractionEnabled = YES; - _progress.hidden = NO; - } - return _progress; -} - -- (UIImageView *)progressBG { - if (!_progressBG) { - _progressBG = [[UIImageView alloc] initWithImage:kImage(@"room_boom_entry_progress_bar_bg")]; - _progressBG.userInteractionEnabled = YES; - } - return _progressBG; -} - -@end diff --git a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomExplosionView.h b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomExplosionView.h deleted file mode 100644 index d3a2345..0000000 --- a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomExplosionView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// RoomBoomProgressView.h -// YuMi -// -// Created by P on 2024/9/27. -// - -#import - -@class AttachmentModel, BoomInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomBoomExplosionView : UIView - -+ (void)display:(UIView *)superView - with:(NSArray *)vapSources - complete:(void(^)(void))complete; - -- (void)saveCurrenRoomUID:(NSInteger)room; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomExplosionView.m b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomExplosionView.m deleted file mode 100644 index 7b0f242..0000000 --- a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomExplosionView.m +++ /dev/null @@ -1,172 +0,0 @@ -// -// RoomBoomProgressView.m -// YuMi -// -// Created by P on 2024/9/27. -// - -#import "RoomBoomExplosionView.h" - -#import -#import "BoomInfoModel.h" -#import "AttachmentModel.h" -#import "RoomBoomManager.h" -#import "XPRoomGiftAnimationParser.h" - -@interface RoomBoomExplosionView() - -@property (nonatomic, strong) VAPView *vapView; -@property (nonatomic, strong) XPRoomGiftAnimationParser *vapParser; -@property (nonatomic, assign) NSInteger seq; - -@property (nonatomic, copy) NSString *countDownURLString; -@property (nonatomic, copy) NSString *endURLString; - -@property (nonatomic, copy) void(^completeDisplay)(void); - -@end - -@implementation RoomBoomExplosionView - -+ (void)display:(UIView *)superView - with:(NSArray *)vapSources - complete:(void(^)(void))complete { - if (vapSources.count < 2) { - [[RoomBoomManager sharedManager] explosionEnd]; - return; - } - - RoomBoomExplosionView *explosionView = [[RoomBoomExplosionView alloc] initWithFrame:CGRectMake(0, 0, superView.bounds.size.width, superView.bounds.size.height)]; - explosionView.userInteractionEnabled = NO; - explosionView.completeDisplay = complete; - [superView addSubview:explosionView]; - explosionView.countDownURLString = [vapSources firstObject]; - explosionView.endURLString = [vapSources lastObject]; - - [explosionView play_count]; -} - -- (void)saveCurrenRoomUID:(NSInteger)room { - -} - -- (void)dealloc -{ - [self.vapView stopHWDMP4]; - [self.vapView removeFromSuperview]; - self.vapView = nil; -} - -- (void)handleEnd { - [[RoomBoomManager sharedManager] explosionEnd]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - - self.seq = 0; - self.backgroundColor = [UIColor colorWithWhite:0.6 alpha:0.3]; - - [self addSubview:self.vapView]; - [self.vapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - } - return self; -} - -- (void)play_count { - self.seq = 1; - - NSString *path = [self.countDownURLString stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; - if (path.length == 0) { - [self handleEnd]; - return; - } - - NSString *encodingUrl = [path pureURLString]; - @kWeakify(self); - [self.vapParser parseWithURL:encodingUrl completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [self.vapView setMute:NO]; - [self.vapView playHWDMP4:videoUrl repeatCount:0 delegate:self]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - [self handleEnd]; - }]; -} - -- (void)play_boom { - self.seq = 2; - NSString *path = [self.endURLString pureURLString]; - if (path.length == 0) { - [self handleEnd]; - return; - } - - @kWeakify(self); - [self.vapParser parseWithURL:path completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [self.vapView setMute:NO]; - [self.vapView playHWDMP4:videoUrl repeatCount:0 delegate:self]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - [self handleEnd]; - }]; -} - - -#pragma mark - HWDMP4PlayDelegate -//即将开始播放时询问，true马上开始播放，false放弃播放 -- (BOOL)shouldStartPlayMP4:(VAPView *)container config:(QGVAPConfigModel *)config { - return YES; -} - -- (void)viewDidFinishPlayMP4:(NSInteger)totalFrameCount view:(VAPView *)container { - if (self.seq == 1) { - [self play_boom]; - } else if (self.seq == 2) { - self.seq = 0; - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [[RoomBoomManager sharedManager] explosionEnd]; - [self removeFromSuperview]; - }); - } -} - -- (void)viewDidStopPlayMP4:(NSInteger)lastFrameIndex view:(VAPView *)container { - -} - -- (void)viewDidFailPlayMP4:(NSError *)error{ - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [[RoomBoomManager sharedManager] explosionEnd]; - [self removeFromSuperview]; - }); -} - -#pragma mark - -- (VAPView *)vapView { - if (!_vapView) { - _vapView = [[VAPView alloc] init]; - _vapView.contentMode = UIViewContentModeScaleAspectFill; - } - return _vapView; -} - -- (XPRoomGiftAnimationParser *)vapParser { - if (!_vapParser) { - _vapParser = [[XPRoomGiftAnimationParser alloc] init]; - } - return _vapParser; -} - -@end diff --git a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomManager.h b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomManager.h deleted file mode 100644 index dc6c76f..0000000 --- a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomManager.h +++ /dev/null @@ -1,51 +0,0 @@ -// -// RoomBoomManager.h -// YuMi -// -// Created by P on 2024/9/27. -// - -#import - -@class AttachmentModel, BoomInfoModel, BoomDetailModel, UserInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -typedef void(^BoomEventBlock)(id sth); - -@interface RoomBoomManager : NSObject - -+ (instancetype)sharedManager; - -- (NSArray *)loadBoomDetails; - -- (void)saveUserInfo:(UserInfoModel *)userInfo; - -- (void)leaveRoom; - -- (void)updateBoomDetailArray:(NSArray *)array; -- (void)updateBoomDetail:(BoomDetailModel *)boomDetail; -- (void)cleanBoomDetail; - -/// 视图注册监听对应的火箭事件，通过 block 回调 -- (void)registerBoomBanner:(BoomEventBlock)block target:(id)target; -- (void)registerBoomExplosion:(BoomEventBlock)block target:(id)target; -- (void)registerBoomEnterRoomExplosion:(BoomEventBlock)block target:(id)target; -- (void)registerBoomProgressUpdate:(BoomEventBlock)block target:(id)target; -- (void)registerBoomGiftDisplay:(BoomEventBlock)block target:(id)target; - -- (void)explosionEnd; -- (void)giftDisplayEnd; -- (void)bannerDisplayEnd; - -- (void)removeEventListenerForTarget:(id)target; - -- (void)receiveEnterRoomBoom:(BoomInfoModel *)model; - -- (void)receiveNIMResponse:(AttachmentModel *)attachment; - - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomManager.m b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomManager.m deleted file mode 100644 index 8707aae..0000000 --- a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomManager.m +++ /dev/null @@ -1,365 +0,0 @@ -// -// RoomBoomManager.m -// YuMi -// -// Created by P on 2024/9/27. -// - -#import "RoomBoomManager.h" - -#import "BoomInfoModel.h" -#import "UserInfoModel.h" -#import "AttachmentModel.h" -#import "XPSkillCardPlayerManager.h" - -@interface RoomBoomManager () - -@property (nonatomic, strong) NSMutableArray *bannerListeners; -@property (nonatomic, strong) NSMutableArray *explosionListeners; -@property (nonatomic, strong) NSMutableArray *enterRoomExplosionListeners; -@property (nonatomic, strong) NSMutableArray *progressUpdateListeners; -@property (nonatomic, strong) NSMutableArray *boomGiftsListeners; - -@property (nonatomic, strong) NSMutableArray *boomDetailArray; - -@property (nonatomic, strong) NSMutableArray *boomEventsQueue; -@property (nonatomic, strong) NSMutableArray *giftEventsQueue; -@property (nonatomic, strong) NSMutableArray *bannerEventsQueue; - -@property (nonatomic, assign) BOOL isBooming; -@property (nonatomic, assign) BOOL isGifting; -@property (nonatomic, assign) BOOL isBannering; - -@property (nonatomic,strong) UserInfoModel *userInfo; - -@end - -@implementation RoomBoomManager - -+ (instancetype)sharedManager { - static RoomBoomManager *instance; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - instance = [[self alloc] init]; - - [[NIMSDK sharedSDK].chatManager addDelegate:instance]; - [[NIMSDK sharedSDK].broadcastManager addDelegate:instance]; - - [instance initArrays]; - }); - return instance; -} - -- (void)initArrays { - _bannerListeners = [[NSMutableArray alloc] init]; - _explosionListeners = [[NSMutableArray alloc] init]; - _enterRoomExplosionListeners = [[NSMutableArray alloc] init]; - _progressUpdateListeners = [[NSMutableArray alloc] init]; - _boomGiftsListeners = [[NSMutableArray alloc] init]; - _boomDetailArray = [[NSMutableArray alloc] init]; - _boomEventsQueue = [[NSMutableArray alloc] init]; - _giftEventsQueue = [[NSMutableArray alloc] init]; - _bannerEventsQueue = [[NSMutableArray alloc] init]; -} - -- (void)saveUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; -} - -- (void)test { - [self handleBannerUpdate:nil]; - [self handleExplosionUpdate:nil]; -} - -- (NSArray *)loadBoomDetails { - return self.boomDetailArray; -} - -- (void)leaveRoom { - self.boomEventsQueue = @[].mutableCopy; -} - -- (void)updateBoomDetailArray:(NSArray *)array { - self.boomDetailArray = array.mutableCopy; -} - -- (void)updateBoomDetail:(BoomDetailModel *)boomDetail { - for (int i = 0; i < self.boomDetailArray.count; i++) { - BoomDetailModel *detail = [self.boomDetailArray xpSafeObjectAtIndex:i]; - if (detail.level == boomDetail.level) { - detail.exp = boomDetail.exp; - detail.speed = boomDetail.speed; - break; - } - } -} - -- (void)cleanBoomDetail { - -} - -- (void)registerBoomBanner:(BoomEventBlock)block target:(id)target { - @synchronized (self.bannerListeners) { - [self.bannerListeners addObject:@{NSStringFromClass([target class]) : block}]; - } -} - -- (void)registerBoomExplosion:(BoomEventBlock)block target:(id)target { - @synchronized (self.explosionListeners) { - [self.explosionListeners addObject:@{NSStringFromClass([target class]) : block}]; - } -} - -- (void)registerBoomEnterRoomExplosion:(BoomEventBlock)block target:(id)target { - @synchronized (self.enterRoomExplosionListeners) { - [self.enterRoomExplosionListeners addObject:@{NSStringFromClass([target class]) : block}]; - } -} - -- (void)registerBoomProgressUpdate:(BoomEventBlock)block target:(id)target { - @synchronized (self.progressUpdateListeners) { - [self.progressUpdateListeners addObject:@{NSStringFromClass([target class]) : block}]; - } -} - -- (void)registerBoomGiftDisplay:(BoomEventBlock)block target:(id)target { - @synchronized (self.boomGiftsListeners) { - [self.boomGiftsListeners addObject:@{NSStringFromClass([target class]) : block}]; - } -} - -- (void)checkAndStartBoomEvent { - if (self.isBooming || - self.isGifting || - self.boomEventsQueue.count == 0) { - return; - } - - self.isBooming = YES; - NSString *url_1 = @""; - NSString *url_2 = @""; - id obj = self.boomEventsQueue.firstObject; - [self.boomEventsQueue xpSafeRemoveObjectAtIndex:0]; - if ([obj isKindOfClass:[AttachmentModel class]]) { - Boom632Model *m = [Boom632Model modelWithJSON:[(AttachmentModel *)obj data]]; - if ([XPSkillCardPlayerManager shareInstance].roomUid.integerValue != m.roomUid) { - [self explosionEnd]; - return; - } - - url_1 = m.countDownVapUrl; - url_2 = m.endVapUrl; - } else if ([obj isKindOfClass:[RoomBoomSignVo class]]) { - url_1 = [(RoomBoomSignVo *)obj countDownVapUrl]; - url_2 = [(RoomBoomSignVo *)obj endVapUrl]; - } - if (url_1.length > 0 && url_2.length > 0) { - [self handleExplosionUpdate:@[url_1, url_2]]; - }else { - [self explosionEnd]; - } -} - -- (void)explosionEnd { - if (self.giftEventsQueue.count > 0) { - if (self.isGifting) { - return; - } - self.isGifting = YES; - id obj = self.giftEventsQueue.firstObject; - [self.giftEventsQueue xpSafeRemoveObjectAtIndex:0]; - [self handleBoomGiftUpdate:obj]; - } else { - self.isBooming = NO; - [self checkAndStartBoomEvent]; - } -} - -- (void)giftDisplayEnd { - self.isBooming = NO; - self.isGifting = NO; - [self checkAndStartBoomEvent]; -} - -- (void)checkAndStartBannerEvent { - if (self.isBannering) { - return; - } - if (self.bannerEventsQueue.count > 0) { - self.isBannering = YES; - id obj = self.bannerEventsQueue.firstObject; - [self.bannerEventsQueue xpSafeRemoveObjectAtIndex:0]; - [self handleBannerUpdate:obj]; - } -} - -- (void)bannerDisplayEnd { - self.isBannering = NO; - [self checkAndStartBannerEvent]; -} - -- (void)removeEventListenerForTarget:(id)target { - @synchronized (self.progressUpdateListeners) { - NSString *key = NSStringFromClass([target class]); - for (NSDictionary *dic in self.progressUpdateListeners) { - if ([[dic allKeys] containsObject:key]) { - [self.progressUpdateListeners removeObject:dic]; - break; - } - } - } - - @synchronized (self.explosionListeners) { - NSString *key = NSStringFromClass([target class]); - for (NSDictionary *dic in self.explosionListeners) { - if ([[dic allKeys] containsObject:key]) { - [self.explosionListeners removeObject:dic]; - break; - } - } - } - - @synchronized (self.bannerListeners) { - NSString *key = NSStringFromClass([target class]); - for (NSDictionary *dic in self.bannerListeners) { - if ([[dic allKeys] containsObject:key]) { - [self.bannerListeners removeObject:dic]; - break; - } - } - } - - @synchronized (self.boomGiftsListeners) { - NSString *key = NSStringFromClass([target class]); - for (NSDictionary *dic in self.boomGiftsListeners) { - if ([[dic allKeys] containsObject:key]) { - [self.boomGiftsListeners removeObject:dic]; - break; - } - } - } - - @synchronized (self.enterRoomExplosionListeners) { - NSString *key = NSStringFromClass([target class]); - for (NSDictionary *dic in self.enterRoomExplosionListeners) { - if ([[dic allKeys] containsObject:key]) { - [self.enterRoomExplosionListeners removeObject:dic]; - break; - } - } - } -} - -- (void)receiveEnterRoomBoom:(BoomInfoModel *)model { - [self.boomEventsQueue addObjectsFromArray:model.roomBoomSignVoList]; - [self checkAndStartBoomEvent]; -} - -- (void)receiveNIMResponse:(AttachmentModel *)attachment { - switch (attachment.second) { - case Custom_Message_Room_Boom_EXP: { - BoomDetailModel *boomDetail = [BoomDetailModel modelWithJSON:attachment.data]; - [self handleProgressUpdate:boomDetail]; - } - break; - case Custom_Message_Room_Boom_LevelUp: { - if ([[XPSkillCardPlayerManager shareInstance] isInRoomVC]) { - [self.boomEventsQueue addObject:attachment]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"UpdateWhenBoomExplosion" object:nil]; - [self.bannerEventsQueue addObject:attachment]; - } -// [self.bannerEventsQueue addObject:attachment]; - - [self checkAndStartBoomEvent]; - [self checkAndStartBannerEvent]; - } - break; - case Custom_Message_Room_Boom_Award: - [self.giftEventsQueue addObject:attachment]; - break; - default: - break; - } -} - -- (void)handleProgressUpdate:(BoomDetailModel *)model { - [self updateBoomDetail:model]; - - @synchronized (self.progressUpdateListeners) { - for (NSDictionary *dic in self.progressUpdateListeners) { - BoomEventBlock listener = [dic allValues].firstObject; - if (listener) { - listener(model); - } - } - } -} - -- (void)handleExplosionUpdate:(id)model { - @synchronized (self.explosionListeners) { - for (NSDictionary *dic in self.explosionListeners) { - BoomEventBlock listener = [dic allValues].firstObject; - if (listener) { - listener(model); - } - } - } -} - -- (void)handleBannerUpdate:(id)model { - @synchronized (self.bannerListeners) { - for (NSDictionary *dic in self.bannerListeners) { - BoomEventBlock listener = [dic allValues].firstObject; - if (listener) { - listener(model); - } - } - } -} - -- (void)handleBoomGiftUpdate:(id)model { - @synchronized (self.boomGiftsListeners) { - for (NSDictionary *dic in self.boomGiftsListeners) { - BoomEventBlock listener = [dic allValues].firstObject; - if (listener) { - listener(model); - } - } - } -} - -#pragma mark - -- (void)onRecvMessages:(NSArray *)messages -{ - for (NIMMessage * message in messages) { - if (message.messageType == NIMMessageTypeCustom) { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel * attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_RoomBoom) { - [self receiveNIMResponse:attachment]; - } - } - } - } -} - -- (void)onReceiveBroadcastMessage:(NIMBroadcastMessage *)broadcastMessage { - if ([AccountInfoStorage instance].getUid.length == 0) { - return; - } - - if (broadcastMessage.content) { - NSDictionary *msgDictionary = [broadcastMessage.content toJSONObject]; - AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]]; - NSString *partitionId = [NSString stringWithFormat:@"%@",attachment.data[@"partitionId"]]; - if(![partitionId isEqualToString:self.userInfo.partitionId]){ - return; - } - if (attachment.first == CustomMessageType_RoomBoom) { - [self receiveNIMResponse:attachment]; - } - } -} - -@end diff --git a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomResultView.h b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomResultView.h deleted file mode 100644 index 9d55e91..0000000 --- a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomResultView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// RoomBoomResultView.h -// YuMi -// -// Created by P on 2024/9/27. -// - -#import - -@class AttachmentModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomBoomResultView : UIView - -+ (void)display:(UIView *)superView attachment:(AttachmentModel *)attachment; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomResultView.m b/YuMi/Modules/YMRoom/Features/Boom/RoomBoomResultView.m deleted file mode 100644 index 2c0ff13..0000000 --- a/YuMi/Modules/YMRoom/Features/Boom/RoomBoomResultView.m +++ /dev/null @@ -1,283 +0,0 @@ -// -// RoomBoomResultView.m -// YuMi -// -// Created by P on 2024/9/27. -// - -#import "RoomBoomResultView.h" - -#import "BoomInfoModel.h" -#import "RoomBoomManager.h" -#import "AttachmentModel.h" - -@interface RoomBoomResultCollectionViewCell : UICollectionViewCell - -@property (nonatomic, strong) NetImageView *giftPic; -@property (nonatomic, strong) BoomGiftModel *model; - -@end - -@implementation RoomBoomResultCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - self.backgroundColor = [UIColor clearColor]; - self.contentView.backgroundColor = [UIColor clearColor]; - - UIImageView *bg = [self bgView]; - [self.contentView addSubview:bg]; - [bg mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.contentView addSubview:self.giftPic]; - [self.giftPic mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(bg).insets(UIEdgeInsetsMake(10, 10, 10, 10)); - }]; - } - return self; -} - -- (void)setModel:(BoomGiftModel *)model { - _model = model; - self.giftPic.imageUrl = [model.awardPic stringByRemovingPercentEncoding]; -} - -- (UIImageView *)bgView { - UIImageView *bg = [[UIImageView alloc] initWithImage:kImage(@"room_boom_result_gift_cell_bg")]; - return bg; -} - -- (NetImageView *)giftPic { - if (!_giftPic) { - _giftPic = [[NetImageView alloc] init]; - _giftPic.contentMode = UIViewContentModeScaleAspectFit; - } - return _giftPic; -} - -@end - -@interface RoomBoomResultView() - -@property (nonatomic, strong) UIImageView *backgroundImageView; -@property (nonatomic, strong) UILabel *contentLabel; -@property (nonatomic, strong) UIButton *bottomButton; -@property (nonatomic, strong) UICollectionView *giftsCollectionView; -@property (nonatomic, copy) NSArray * dataSource; - -@end - -@implementation RoomBoomResultView - -+ (void)displayEmptyView:(UIView *)superView { - RoomBoomResultView *resultView = [[RoomBoomResultView alloc] init]; - resultView.alpha = 0; - [superView addSubview:resultView]; - [resultView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(190)); - make.leading.mas_equalTo(10); - make.trailing.mas_equalTo(-10); - make.height.mas_equalTo(kGetScaleWidth(198)); - }]; - - [resultView setupForEmpty]; - - [UIView animateWithDuration:0.2 animations:^{ - resultView.alpha = 1; - }]; -} - -+ (void)display:(UIView *)superView gifts:(NSArray *)giftsArray { - RoomBoomResultView *resultView = [[RoomBoomResultView alloc] init]; - resultView.alpha = 0; - [superView addSubview:resultView]; - [resultView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(190)); - make.leading.mas_equalTo(10); - make.trailing.mas_equalTo(-10); - make.height.mas_equalTo(kGetScaleWidth(394)); - }]; - - [resultView setupFroGifts]; - resultView.dataSource = giftsArray; - - [UIView animateWithDuration:0.2 animations:^{ - resultView.alpha = 1; - }]; -} - -+ (void)display:(UIView *)superView attachment:(AttachmentModel *)attachment { - if (!attachment || - ![attachment.data isKindOfClass:[NSArray class]] || - [attachment.data count] == 0) { - [[RoomBoomManager sharedManager] giftDisplayEnd]; - return; - } - - NSMutableArray *myGifts = @[].mutableCopy; - NSArray *gifts = [BoomGiftModel modelsWithArray:attachment.data]; - for (BoomGiftModel *model in gifts) { - if (model.uid == [[AccountInfoStorage instance].getUid integerValue]) { - [myGifts addObject:model]; - } - } - - if (myGifts.count > 0) { - [RoomBoomResultView display:superView gifts:myGifts]; - } -} - -- (instancetype)init { - if (self = [super init]) {} - return self; -} - -- (void)setDataSource:(NSArray *)dataSource { - _dataSource = dataSource; - [self.giftsCollectionView reloadData]; -} - -- (void)setupForEmpty { - self.backgroundImageView.image = kImage(@"room_boom_empty_result_bg"); - [self addSubview:self.backgroundImageView]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - self.contentLabel.text = YMLocalizedString(@"RoomBoom_0"); - [self addSubview:self.contentLabel]; - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(kGetScaleWidth(68)); - make.leading.mas_equalTo(24); - make.trailing.mas_equalTo(-24); - }]; - - [self.bottomButton setTitle:@"OK" forState:UIControlStateNormal]; - [self.bottomButton setBackgroundImage:kImage(@"room_boom_result_button_bg_1") forState:UIControlStateNormal]; - [self addSubview:self.bottomButton]; - [self.bottomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self).offset(kGetScaleWidth(-24)); - make.centerX.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(176, 44)); - }]; -} - -- (void)setupFroGifts { - self.backgroundImageView.image = kImage(@"room_boom_gifts_result_bg"); - [self addSubview:self.backgroundImageView]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - UIImageView *topContentImageView = [[UIImageView alloc] initWithImage:kImage(@"room_boom_result_top_bg")]; - [self addSubview:topContentImageView]; - [topContentImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.backgroundImageView.mas_top); - make.centerX.mas_equalTo(self.backgroundImageView); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(214.5), kGetScaleWidth(52.5))); - }]; - - UILabel *topContentLabel = [UILabel labelInitWithText:YMLocalizedString(@"Combo_6") font:kFontMedium(17.5) textColor:UIColorFromRGB(0xF0E7BA)]; - [self addSubview:topContentLabel]; - [topContentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(topContentImageView); - }]; - - self.contentLabel.text = YMLocalizedString(@"RoomBoom_1"); - self.contentLabel.font = kFontRegular(10); - [self addSubview:self.contentLabel]; - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(topContentImageView.mas_bottom).offset(kGetScaleWidth(14)); - make.leading.mas_equalTo(50); - make.trailing.mas_equalTo(-50); - }]; - - [self.bottomButton setTitle:@"GREAT" forState:UIControlStateNormal]; - [self.bottomButton setBackgroundImage:kImage(@"room_boom_result_button_bg_1") forState:UIControlStateNormal]; - [self addSubview:self.bottomButton]; - [self.bottomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self).offset(kGetScaleWidth(-26)); - make.centerX.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(176, 44)); - }]; - - [self addSubview:self.giftsCollectionView]; - [self.giftsCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentLabel.mas_bottom).offset(16); - make.leading.mas_equalTo(kGetScaleWidth(35)); - make.trailing.mas_equalTo(kGetScaleWidth(-35)); - make.bottom.mas_equalTo(self.bottomButton.mas_top).offset(kGetScaleWidth(-30)); - }]; -} - -- (void)didTapBottomButton { - [[RoomBoomManager sharedManager] giftDisplayEnd]; - [self removeFromSuperview]; -} - -#pragma mark - UICollectionView delegate & datasource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.dataSource.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - RoomBoomResultCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"GiftCell" forIndexPath:indexPath]; - cell.model = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - -#pragma mark - -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] init]; - _backgroundImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _backgroundImageView; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:UIColorFromRGB(0xCBA1FF)]; - _contentLabel.textAlignment = NSTextAlignmentCenter; - _contentLabel.numberOfLines = 0; - } - return _contentLabel; -} - -- (UIButton *)bottomButton { - if (!_bottomButton) { - _bottomButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_bottomButton.titleLabel setFont:kFontMedium(15)]; - [_bottomButton addTarget:self action:@selector(didTapBottomButton) forControlEvents:UIControlEventTouchUpInside]; - } - return _bottomButton; -} - -- (UICollectionView *)giftsCollectionView { - if (!_giftsCollectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(kGetScaleWidth(88), kGetScaleWidth(88)); // 设置每个item的大小 - layout.minimumLineSpacing = 20; // 行间距 - if (iPhoneXSeries) { - layout.minimumInteritemSpacing = 10; // 列间距 - } else { - layout.minimumInteritemSpacing = 4; - } - - layout.scrollDirection = UICollectionViewScrollDirectionVertical; // 垂直滚动 - - _giftsCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero - collectionViewLayout:layout]; - _giftsCollectionView.dataSource = self; - _giftsCollectionView.delegate = self; - _giftsCollectionView.showsVerticalScrollIndicator = NO; - _giftsCollectionView.backgroundColor = [UIColor clearColor]; - [_giftsCollectionView registerClass:[RoomBoomResultCollectionViewCell class] forCellWithReuseIdentifier:@"GiftCell"]; - } - return _giftsCollectionView; -} - - -@end diff --git a/YuMi/Modules/YMRoom/Manager/GameBannerGestureManager.h b/YuMi/Modules/YMRoom/Manager/GameBannerGestureManager.h deleted file mode 100644 index 21bd875..0000000 --- a/YuMi/Modules/YMRoom/Manager/GameBannerGestureManager.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// GameBannerGestureManager.h -// YuMi -// -// Created by P on 2025/8/27. -// -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface GameBannerGestureManager : NSObject - -@property (nonatomic, weak) UIView *bannerContainer; -@property (nonatomic, assign, readonly) BOOL isEnabled; - -- (void)enableGestureForGameMode; -- (void)disableGestureForGameMode; -- (void)cleanupAllGestures; -- (void)resetState; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Manager/GameBannerGestureManager.m b/YuMi/Modules/YMRoom/Manager/GameBannerGestureManager.m deleted file mode 100644 index f774793..0000000 --- a/YuMi/Modules/YMRoom/Manager/GameBannerGestureManager.m +++ /dev/null @@ -1,89 +0,0 @@ -// GameBannerGestureManager.m -#import "GameBannerGestureManager.h" - -@interface GameBannerGestureManager () -@property (nonatomic, assign) BOOL isEnabled; -@property (nonatomic, strong) UISwipeGestureRecognizer *swipeGesture; -@end - -@implementation GameBannerGestureManager - -- (void)enableGestureForGameMode { - if (self.isEnabled) return; - - [self cleanupAllGestures]; - - // 创建新的 swipe 手势 - self.swipeGesture = [[UISwipeGestureRecognizer alloc] - initWithTarget:self action:@selector(handleSwipe)]; - - // 配置手势识别器，确保不拦截触摸事件 - self.swipeGesture.delaysTouchesBegan = NO; - self.swipeGesture.delaysTouchesEnded = NO; - self.swipeGesture.cancelsTouchesInView = NO; - self.swipeGesture.requiresExclusiveTouchType = NO; - - // 设置 swipe 方向 - if (isMSRTL()) { - self.swipeGesture.direction = UISwipeGestureRecognizerDirectionRight; - } else { - self.swipeGesture.direction = UISwipeGestureRecognizerDirectionLeft; - } - - [self.bannerContainer addGestureRecognizer:self.swipeGesture]; - _isEnabled = YES; - - NSLog(@"🎮 GameBannerGestureManager: swipe 手势已启用"); -} - -- (void)disableGestureForGameMode { - if (!self.isEnabled) return; - - [self cleanupAllGestures]; - _isEnabled = NO; - - NSLog(@"🎮 GameBannerGestureManager: swipe 手势已禁用"); -} - -- (void)cleanupAllGestures { - if (self.swipeGesture) { - [self.bannerContainer removeGestureRecognizer:self.swipeGesture]; - self.swipeGesture = nil; - } - - // 清理可能存在的其他手势识别器 - NSArray *gestures = [self.bannerContainer.gestureRecognizers copy]; - for (UIGestureRecognizer *gesture in gestures) { - if ([gesture isKindOfClass:[UISwipeGestureRecognizer class]]) { - [self.bannerContainer removeGestureRecognizer:gesture]; - } - } -} - -- (void)resetState { - [self cleanupAllGestures]; - _isEnabled = NO; -} - -- (void)handleSwipe { - NSLog(@"🎮 GameBannerGestureManager: 检测到 swipe 手势，发送 banner 移除通知"); - - // 检查当前是否有可见的 banner - UIView *currentVisibleBanner = nil; - for (UIView *subview in self.bannerContainer.subviews) { - if (!subview.hidden && subview.alpha > 0.01) { - currentVisibleBanner = subview; - break; - } - } - - if (currentVisibleBanner) { - NSLog(@"🎮 当前有可见 banner: %@，发送 SwipeOutBanner 通知", NSStringFromClass([currentVisibleBanner class])); - [[NSNotificationCenter defaultCenter] postNotificationName:@"SwipeOutBanner" - object:currentVisibleBanner]; - } else { - NSLog(@"🎮 当前没有可见 banner，忽略 swipe 手势"); - } -} - -@end diff --git a/YuMi/Modules/YMRoom/Manager/PublicRoomManager.h b/YuMi/Modules/YMRoom/Manager/PublicRoomManager.h deleted file mode 100644 index e817abd..0000000 --- a/YuMi/Modules/YMRoom/Manager/PublicRoomManager.h +++ /dev/null @@ -1,73 +0,0 @@ -// -// PublicRoomManager.h -// YUMI -// -// Created by YUMI on 2024/12/19. -// - -#import -#import - -@class UserInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -/** - * 公共聊天房间管理器 - * 负责管理用户进入公共聊天房间的逻辑 - */ -@interface PublicRoomManager : NSObject - -#pragma mark - 单例方法 -+ (instancetype)sharedManager; - -#pragma mark - 生命周期管理 -/** - * 初始化公共房间管理器 - * 在用户登录成功后调用 - */ -- (void)initialize; - -/** - * 重置公共房间管理器 - * 在用户登出时调用，清理所有状态 - */ -- (void)reset; - -#pragma mark - 状态查询 -/** - * 是否已初始化 - */ -- (BOOL)isInitialized; - -/** - * 是否已进入公共房间 - */ -- (BOOL)isInPublicRoom; - -/** - * 获取当前公共房间ID - */ -- (NSString *)currentPublicRoomId; - -// 更新来自 config 的数据 -- (void)updateConfig; - -- (void)updateUserInfo:(UserInfoModel *)userInfo; - -#pragma mark - 手动控制 -/** - * 手动进入公共房间 - * @param completion 完成回调 - */ -- (void)enterPublicRoomWithCompletion:(void(^)(NSError * _Nullable error))completion; - -/** - * 手动退出公共房间 - * @param completion 完成回调 - */ -- (void)exitPublicRoomWithCompletion:(void(^)(NSError * _Nullable error))completion; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Manager/PublicRoomManager.m b/YuMi/Modules/YMRoom/Manager/PublicRoomManager.m deleted file mode 100644 index a7c44b9..0000000 --- a/YuMi/Modules/YMRoom/Manager/PublicRoomManager.m +++ /dev/null @@ -1,325 +0,0 @@ -// -// PublicRoomManager.m -// YUMI -// -// Created by YUMI on 2024/12/19. -// - -#import "PublicRoomManager.h" -#import "UserInfoModel.h" -#import "ClientConfig.h" -#import "AccountModel.h" -#import "AccountInfoStorage.h" -#import "XPMessageRemoteExtModel.h" -#import "AttachmentModel.h" -#import "YUMIConstant.h" -#import "XPSkillCardPlayerManager.h" - -@interface PublicRoomManager () - -@property (nonatomic, assign) BOOL isInitialized; -@property (nonatomic, assign) BOOL isInPublicRoom; -@property (nonatomic, copy) NSString *currentPublicRoomId; -@property (nonatomic, copy) NSString *currentUserId; -@property (nonatomic, strong) UserInfoModel *userInfo; - - - -@end - -@implementation PublicRoomManager - -#pragma mark - 单例方法 - -+ (instancetype)sharedManager { - static dispatch_once_t onceToken; - static PublicRoomManager *instance; - dispatch_once(&onceToken, ^{ - instance = [[self alloc] init]; - [instance initialize]; - }); - return instance; -} - -- (instancetype)init { - self = [super init]; - if (self) { - _isInitialized = NO; - _isInPublicRoom = NO; - _currentPublicRoomId = nil; - _currentUserId = nil; - _userInfo = nil; - } - return self; -} - -#pragma mark - 生命周期管理 - -- (void)initialize { - // 防止重复初始化 - if (self.isInitialized) { - NSLog(@"PublicRoomManager: 已经初始化，跳过重复初始化"); - return; - } - - // 注册云信代理 - [[NIMSDK sharedSDK].chatManager addDelegate:self]; - [[NIMSDK sharedSDK].chatroomManager addDelegate:self]; - - // 标记为已初始化 - self.isInitialized = YES; -} - -- (BOOL)checkConfigPublicRoomID:(NSString *)partitionId { - ClientDataModel *configInfo = [ClientConfig shareConfig].configInfo; - if (!configInfo || !configInfo.publicChatRoomIdMap) { - NSLog(@"PublicRoomManager: 配置信息未加载，等待配置更新"); - return NO; - } - - self.currentPublicRoomId = [configInfo.publicChatRoomIdMap objectForKey:partitionId]; - - return [NSString isEmpty:self.currentPublicRoomId]; -} - -- (void)reset { - NSLog(@"PublicRoomManager: 开始重置"); - - // 退出公共房间（同步等待完成） - if (self.isInPublicRoom && self.currentPublicRoomId) { - [self exitPublicRoomWithCompletion:^(NSError * _Nullable error) { - if (error) { - NSLog(@"PublicRoomManager: 退出公共房间失败: %@", error); - } else { - NSLog(@"PublicRoomManager: 退出公共房间成功"); - - self.currentUserId = nil; - self.userInfo = nil; - - NSLog(@"PublicRoomManager: 重置完成"); - } - }]; - } else { - NSLog(@"PublicRoomManager: 不在房间，不处理"); - } - - // 重置状态 - self.isInPublicRoom = NO; - self.currentPublicRoomId = nil; -} - -#pragma mark - 状态查询 - -- (BOOL)isInitialized { - return _isInitialized; -} - -- (BOOL)isInPublicRoom { - return _isInPublicRoom; -} - -- (NSString *)currentPublicRoomId { - return _currentPublicRoomId; -} - -#pragma mark - 私有方法 - -- (void)tryEnterPublicRoom { - if (!self.isInitialized) { - return; - } - - if (!self.userInfo) { - return; - } - - // 获取公共房间ID - NSString *partitionId = self.userInfo.partitionId; - ClientDataModel *configInfo = [ClientConfig shareConfig].configInfo; - NSDictionary *publicChatRoomIdMap = configInfo.publicChatRoomIdMap; - - if (!publicChatRoomIdMap) { - return; - } - - if (!partitionId) { - return; - } - - NSNumber *roomId = publicChatRoomIdMap[partitionId]; - if (!roomId) { - return; - } - - // 进入公共房间 - [self enterPublicRoomWithRoomId:roomId.stringValue completion:^(NSError * _Nullable error) { - if (error) { - NSLog(@"PublicRoomManager: 进入公共房间失败: %@", error); - } else { - NSLog(@"PublicRoomManager: 进入公共房间成功，房间ID: %@", roomId.stringValue); - } - }]; -} - -- (void)enterPublicRoomWithRoomId:(NSString *)roomId completion:(void(^)(NSError * _Nullable error))completion { - if (!self.userInfo) { - NSError *error = [NSError errorWithDomain:@"PublicRoomManager" - code:-1 - userInfo:@{NSLocalizedDescriptionKey: @"用户信息缺失 nnn"}]; - if (completion) { - completion(error); - } - return; - } - - // 创建进房请求 - NIMChatroomEnterRequest *request = [[NIMChatroomEnterRequest alloc] init]; - request.roomId = roomId; - // 设置扩展信息 - XPMessageRemoteExtModel *extModel = [[XPMessageRemoteExtModel alloc] init]; - extModel.defUser = self.userInfo.defUser; - extModel.erbanNo = self.userInfo.erbanNo; - extModel.carName = self.userInfo.carName; - extModel.inRoomNameplatePic = self.userInfo.nameplatePic; - extModel.inRoomNameplateWord = self.userInfo.nameplateWord; - extModel.isCustomWord = self.userInfo.isCustomWord; - extModel.charmUrl = self.userInfo.userLevelVo.charmUrl; - extModel.experLevelSeq = self.userInfo.userLevelVo.experLevelSeq; - extModel.experUrl = self.userInfo.userLevelVo.experUrl; - extModel.newUser = self.userInfo.newUser; - extModel.vipIcon = self.userInfo.userVipInfoVO.nameplateUrl; - extModel.iosBubbleUrl = self.userInfo.iosBubbleUrl; - extModel.androidBubbleUrl = self.userInfo.androidBubbleUrl; - extModel.enterHide = self.userInfo.userVipInfoVO.enterHide; - extModel.preventKick = self.userInfo.userVipInfoVO.preventKick; - extModel.enterRoomEffects = self.userInfo.userVipInfoVO.enterRoomEffects; - extModel.gender = self.userInfo.gender; - extModel.fromSayHelloChannel = self.userInfo.fromSayHelloChannel; - extModel.platformRole = self.userInfo.platformRole; - extModel.nick = self.userInfo.nick; - - NSMutableDictionary *ext = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary - forKey:[NSString stringWithFormat:@"%ld", self.userInfo.uid]]; - request.roomExt = [ext toJSONString]; - request.retryCount = 3; - - // 进入房间 - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager enterChatroom:request completion:^(NSError * _Nullable error, NIMChatroom * _Nullable chatroom, NIMChatroomMember * _Nullable me) { - @kStrongify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - if (error) { - if (completion) { - completion(error); - } - } else { - self.isInPublicRoom = YES; - self.currentPublicRoomId = roomId; - if (completion) { - completion(nil); - } - } - }); - }]; -} - -#pragma mark - 手动控制 - -- (void)enterPublicRoomWithCompletion:(void(^)(NSError * _Nullable error))completion { - if (!self.isInitialized) { - NSError *error = [NSError errorWithDomain:@"PublicRoomManager" - code:-2 - userInfo:@{NSLocalizedDescriptionKey: @"管理器未初始化"}]; - if (completion) { - completion(error); - } - } else if (self.isInPublicRoom) { - if (completion) { - completion(nil); - } - } else { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self tryEnterPublicRoom]; - }); - } -} - -- (void)exitPublicRoomWithCompletion:(void(^)(NSError * _Nullable error))completion { - if (!self.isInPublicRoom || !self.currentPublicRoomId) { - NSLog(@"PublicRoomManager: 未在公共房间中"); - if (completion) { - completion(nil); - } - return; - } - - NSLog(@"PublicRoomManager: room id-%@ 正在尝试退出公共房间", self.currentPublicRoomId); - - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager exitChatroom:self.currentPublicRoomId completion:^(NSError * _Nullable error) { - @kStrongify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - if (error) { -// NSLog(@"PublicRoomManager: 退出公共房间失败: %@", error); - } else { -// NSLog(@"PublicRoomManager: 退出公共房间成功"); - self.isInPublicRoom = NO; - self.currentPublicRoomId = nil; - } - if (completion) { - completion(error); - } - }); - }]; -} - -#pragma mark - 用户信息更新处理 - -- (void)updateUserInfo:(UserInfoModel *)userInfo { - if (!userInfo) { - return; - } - - if (!userInfo.partitionId) { - return; - } - - // 检查用户是否切换 - if (self.currentUserId && ![self.currentUserId isEqualToString:[NSString stringWithFormat:@"%ld", userInfo.uid]]) { - [self reset]; - } - - self.userInfo = userInfo; - self.currentUserId = [NSString stringWithFormat:@"%ld", userInfo.uid]; -} - - -#pragma mark - NIMChatRoomManagerDelegate -#define ConnectionStateStyleString(enum) \ - [@[@"Entering", @"EnterOK", @"EnterFailed", @"LoseConnection"] objectAtIndex:(enum)] -- (void)chatroom:(NSString *)roomId connectionStateChanged:(NIMChatroomConnectionState)state { - NSLog(@"PublicRoomManager 房间连接状态: %@", ConnectionStateStyleString(state)); -} - -#pragma mark - NIMChatManagerDelegate -- (void)onRecvMessages:(NSArray *)messages { - // 只处理公共房间的消息 - for (NIMMessage *message in messages) { - if ([message.session.sessionId isEqualToString:self.currentPublicRoomId]) { - [self handleMessageWithAttachmentAndFirstSecond:message]; - } - } -} - -- (void)handleMessageWithAttachmentAndFirstSecond:(NIMMessage *)message { - // 只有用户在房间时，才会转发 - if (![XPSkillCardPlayerManager shareInstance].isInRoom) { -// NSLog(@"PublicRoomManager: 用户未在房间中，跳过消息转发"); - return; - } - [[NSNotificationCenter defaultCenter] postNotificationName:@"MessageFromPublicRoomWithAttachmentNotification" - object:message]; -} - - -@end diff --git a/YuMi/Modules/YMRoom/Model/ActivityInfoModel.h b/YuMi/Modules/YMRoom/Model/ActivityInfoModel.h deleted file mode 100644 index b29a3f3..0000000 --- a/YuMi/Modules/YMRoom/Model/ActivityInfoModel.h +++ /dev/null @@ -1,87 +0,0 @@ -// -// ActivityInfoModel.h -// YUMI -// -// Created by YUMI on 2021/12/14. -// - -#import -@class ActivityInfoItemModel; -NS_ASSUME_NONNULL_BEGIN -///跳转的类型 -typedef NS_ENUM(NSInteger, ActivitySkipType) { - ActivitySkipType_Room = 2, - ActivitySkipType_Web, -}; - -///跳转h5的话 是全屏还是半屏 -typedef NS_ENUM(NSInteger, ActivityShowType) { - ActivityShowType_Full = 1, - ActivityShowType_Half = 2, -}; -///活动类型 -typedef NS_ENUM(NSInteger, ActivityType) { - ActivityType_Love = 1,///寻爱 - ActivityType_First = 2,///首充 - ActivityType_Fairy = 3,///夺宝精灵 -}; - -@interface ActivityInfoModel : PIBaseModel -@property(nonatomic,copy) NSString *url; -@property(nonatomic,copy) NSString *code; -@property(nonatomic,copy) NSString *icon; -@property(nonatomic,copy) NSString *skipContent; -@property(nonatomic,copy) NSString *name; -///名称 -@property (nonatomic,copy) NSString *bannerName; -///外面的活动的图片 -@property (nonatomic, copy)NSString *bannerPic; -///里面的活动的图片 -@property(nonatomic,copy) NSString *bannerUrl; -///跳转类型 -@property (nonatomic, assign)ActivitySkipType skipType; -///如果是跳转房间的话 那就是房主的uid 如果是h5的话 那就是链接 -@property (nonatomic, copy)NSString *skipUri; -///跳转h5类型 -@property (nonatomic, assign)NSInteger showType; -///活动类型 -@property (nonatomic,assign) ActivityType activityType; -@property(nonatomic,copy) NSString *ruleValue; -@property(nonatomic,strong) ActivityInfoItemModel *gameModel; -///游戏链接 -@property(nonatomic,copy) NSString *gameUrl; - -///配置资源位 id -@property (nonatomic, assign) NSInteger id; -@end - - - - -@interface ActivityInfoItemModel : PIBaseModel -///商⼾ id（BAISHUN 提供，商⼾后台可查看） -@property(nonatomic,assign) int64_t appId; -///⽤⼾ userId -@property(nonatomic,copy) NSString *userId; -///商⼾⽣成的认证令牌（⽤于游戏服务器获取⽤⼾信息） -@property(nonatomic,copy) NSString *code; -///房间 ID（不存在，可以传空） -@property(nonatomic,copy) NSString *roomId; -////房间 ID（不存在，可以传空） -@property(nonatomic,copy) NSString *gameMode; -@property(nonatomic,copy) NSString *language; -@property(nonatomic,copy) NSDictionary *gameConfig; -///游戏正式服务器节点101:新加坡（阿⾥云） 201:迪拜（AWS）301:硅⾕ (阿⾥云) 401:法兰克福(阿⾥云） -@property(nonatomic,assign) int gsp; - -///商⼾渠道（BAISHUN 提供，商⼾后台可查看） -@property(nonatomic,copy) NSString *appChannel; - -/// JOYPLAY 渠道游戏使用 -@property (nonatomic, copy) NSString *appKey; -@property (nonatomic, assign) NSInteger gameId; - -@property (nonatomic, copy) NSString *urlParam; - -@end -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/ActivityInfoModel.m b/YuMi/Modules/YMRoom/Model/ActivityInfoModel.m deleted file mode 100644 index 8c1651f..0000000 --- a/YuMi/Modules/YMRoom/Model/ActivityInfoModel.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// ActivityInfoModel.m -// YUMI -// -// Created by YUMI on 2021/12/14. -// - -#import "ActivityInfoModel.h" - -@implementation ActivityInfoModel -- (void)setRuleValue:(NSString *)ruleValue{ - _ruleValue = ruleValue; - id data = [_ruleValue mj_JSONObject]; - if([data isKindOfClass:[NSDictionary class]]){ - NSDictionary *dic = (NSDictionary *)data; - if(dic[@"RESERVE"]!=nil){ - _gameModel = [ActivityInfoItemModel modelWithJSON:dic[@"RESERVE"]]; - } - } -} -@end -@implementation ActivityInfoItemModel - -@end diff --git a/YuMi/Modules/YMRoom/Model/BoomInfoModel.h b/YuMi/Modules/YMRoom/Model/BoomInfoModel.h deleted file mode 100644 index 92cdba7..0000000 --- a/YuMi/Modules/YMRoom/Model/BoomInfoModel.h +++ /dev/null @@ -1,109 +0,0 @@ -// -// BoomInfoModel.h -// YuMi -// -// Created by P on 2024/9/29. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomBoomSignVo : PIBaseModel - -@property (nonatomic, assign) NSInteger drawTime; -@property (nonatomic, copy) NSString *vapUrl; -@property (nonatomic, copy) NSString *pic; -@property (nonatomic, copy) NSString *countDownVapUrl; -@property (nonatomic, copy) NSString *endVapUrl; -@property (nonatomic, assign) NSInteger level; - -@end - -@interface BoomInfoModel : PIBaseModel - -@property (nonatomic, assign) NSInteger exp; -@property (nonatomic, assign) NSInteger level; -@property (nonatomic, assign) NSInteger goldNum; -@property (nonatomic, assign) NSInteger speed; -@property (nonatomic, copy) NSString *vapUrl; -@property (nonatomic, copy) NSString *pic; -@property (nonatomic, copy) NSArray *roomBoomSignVoList; - -@end - - -@interface roomBoomLevelAwardVo : PIBaseModel -@property (nonatomic, copy) NSString *awardName; -@property (nonatomic, copy) NSString *awardPic; -@property (nonatomic, assign) NSInteger awardType; -@property (nonatomic, assign) NSInteger isShow; -@property (nonatomic, assign) NSInteger seq; -@end - -@interface roomBoomRankVo : PIBaseModel -@property (nonatomic, copy) NSString *avatar; -@property (nonatomic, copy) NSString *nick; -@property (nonatomic, assign) NSInteger exper; -@property (nonatomic, assign) NSInteger position; -@property (nonatomic, assign) NSInteger uid; -@end - -@interface BoomDetailModel : PIBaseModel - -@property (nonatomic, copy) NSString *countDownVapUrl; -@property (nonatomic, assign) NSInteger currLevel; -@property (nonatomic, copy) NSString *endVapUrl; -@property (nonatomic, assign) NSInteger exp; -@property (nonatomic, assign) NSInteger goldNum; -@property (nonatomic, assign) NSInteger hot; -@property (nonatomic, assign) NSInteger level; -@property (nonatomic, copy) NSString *pic; -@property (nonatomic, assign) NSInteger rank; -@property (nonatomic, copy) NSArray *roomBoomRankVos; -@property (nonatomic, copy) NSArray *roomBoomLevelAwardVos; -@property (nonatomic, assign) NSInteger speed; -@property (nonatomic, copy) NSString *vapUrl; -@property (nonatomic, assign) NSTimeInterval messTime; - -@end - -@interface Boom632Model : PIBaseModel - -@property (nonatomic, assign) NSInteger status; -@property (nonatomic, assign) NSInteger notifyStaySecond; -@property (nonatomic, copy) NSString *floatingScreenPic; -@property (nonatomic, copy) NSString *countDownVapUrl; -@property (nonatomic, assign) NSInteger erbanNo; -@property (nonatomic, copy) NSString *roomTitle; -@property (nonatomic, copy) NSString *endVapUrl; -@property (nonatomic, assign) NSInteger partitionId; -@property (nonatomic, copy) NSString *roomAvatar; -@property (nonatomic, assign) NSTimeInterval drawTime; -@property (nonatomic, assign) NSInteger id; -@property (nonatomic, copy) NSString *vapUrl; -@property (nonatomic, assign) NSInteger level; -@property (nonatomic, assign) NSInteger uid; -@property (nonatomic, copy) NSString *pic; -@property (nonatomic, assign) NSTimeInterval drawTimeLong; -@property (nonatomic, copy) NSString *nick; -@property (nonatomic, copy) NSString *avatar; -@property (nonatomic, assign) NSInteger roomUid; -@property (nonatomic, copy) NSString *targetIcon; - -@end - -@interface BoomGiftModel : PIBaseModel - -@property (nonatomic, copy) NSString *nick; -@property (nonatomic, copy) NSString *awardName; -@property (nonatomic, copy) NSString *awardPic; - -@property (nonatomic, assign) NSInteger uid; -@property (nonatomic, assign) NSInteger roomUid; -@property (nonatomic, assign) NSInteger level; -@property (nonatomic, assign) NSInteger roleType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/BoomInfoModel.m b/YuMi/Modules/YMRoom/Model/BoomInfoModel.m deleted file mode 100644 index 2ec6bf3..0000000 --- a/YuMi/Modules/YMRoom/Model/BoomInfoModel.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// BoomInfoModel.m -// YuMi -// -// Created by P on 2024/9/29. -// - -#import "BoomInfoModel.h" - -@implementation RoomBoomSignVo - - -@end - -@implementation BoomInfoModel - -+ (NSDictionary *)objectClassInArray { - return @{ - @"roomBoomSignVoList":RoomBoomSignVo.class - }; -} - -@end - -@implementation roomBoomLevelAwardVo - -@end - -@implementation roomBoomRankVo - - -@end - -@implementation BoomDetailModel - -+ (NSDictionary *)objectClassInArray { - return @{ - @"roomBoomRankVos":roomBoomRankVo.class, - @"roomBoomLevelAwardVos":roomBoomLevelAwardVo.class - }; -} - -@end - -@implementation Boom632Model - - -@end - -@implementation BoomGiftModel - - -@end diff --git a/YuMi/Modules/YMRoom/Model/BravoGiftTabInfomationModel.h b/YuMi/Modules/YMRoom/Model/BravoGiftTabInfomationModel.h deleted file mode 100644 index 78a793e..0000000 --- a/YuMi/Modules/YMRoom/Model/BravoGiftTabInfomationModel.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// BravoGiftTabInfomationModel.h -// YuMi -// -// Created by P on 2025/4/14. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface BravoGiftTabInfomationModel : PIBaseModel - -@property (nonatomic, copy) NSString *avatar; -@property (nonatomic, assign) NSInteger coin; -@property (nonatomic, assign) NSInteger erbainNo; -@property (nonatomic, assign) NSInteger giftId; -@property (nonatomic, copy) NSString *giftName; -@property (nonatomic, copy) NSString *nick; -@property (nonatomic, assign) NSInteger uid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/BravoGiftTabInfomationModel.m b/YuMi/Modules/YMRoom/Model/BravoGiftTabInfomationModel.m deleted file mode 100644 index 38fad9a..0000000 --- a/YuMi/Modules/YMRoom/Model/BravoGiftTabInfomationModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// BravoGiftTabInfomationModel.m -// YuMi -// -// Created by P on 2025/4/14. -// - -#import "BravoGiftTabInfomationModel.h" - -@implementation BravoGiftTabInfomationModel - -@end diff --git a/YuMi/Modules/YMRoom/Model/BravoGiftTipModel.h b/YuMi/Modules/YMRoom/Model/BravoGiftTipModel.h deleted file mode 100644 index b3d43bf..0000000 --- a/YuMi/Modules/YMRoom/Model/BravoGiftTipModel.h +++ /dev/null @@ -1,26 +0,0 @@ -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface BravoGiftTipInfoModel : NSObject - -@property (nonatomic, copy) NSString *times; -@property (nonatomic, copy) NSString *coins; -@property (nonatomic, assign) NSInteger level; - -@end - -@interface BravoGiftTipModel : NSObject - -@property (nonatomic, assign) NSInteger roomUid; -@property (nonatomic, assign) NSInteger roomId; -@property (nonatomic, assign) NSInteger uid; -@property (nonatomic, strong) NSArray *receiverUidList; -@property (nonatomic, copy) NSString *receiverProfit; -@property (nonatomic, strong) BravoGiftTipInfoModel *tip; - -@end - - - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/BravoGiftTipModel.m b/YuMi/Modules/YMRoom/Model/BravoGiftTipModel.m deleted file mode 100644 index b16e494..0000000 --- a/YuMi/Modules/YMRoom/Model/BravoGiftTipModel.m +++ /dev/null @@ -1,16 +0,0 @@ -#import "BravoGiftTipModel.h" - -@implementation BravoGiftTipModel - -+ (NSDictionary *)modelContainerPropertyGenericClass { - return @{ - @"receiverUidList": [NSNumber class], - @"tip": [BravoGiftTipInfoModel class] - }; -} - -@end - -@implementation BravoGiftTipInfoModel - -@end \ No newline at end of file diff --git a/YuMi/Modules/YMRoom/Model/CustomRoomBGItemModel.h b/YuMi/Modules/YMRoom/Model/CustomRoomBGItemModel.h deleted file mode 100644 index e664c27..0000000 --- a/YuMi/Modules/YMRoom/Model/CustomRoomBGItemModel.h +++ /dev/null @@ -1,51 +0,0 @@ -// -// CustomRoomBGItemModel.h -// YuMi -// -// Created by P on 2024/10/30. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - - -typedef enum : NSUInteger { - RoomBGStatus_Expired = -1, - RoomBGStatus_Reviewing = 0, - RoomBGStatus_Pass = 1, - RoomBGStatus_Rejected = 2 -} RoomBGStatus; - -typedef enum : NSUInteger { - RoomBGType_Free = 0, - RoomBGType_Pay = 1, - RoomBGType_Custom = 2 , -} RoomBGType; - -@interface CustomRoomBGItemModel : PIBaseModel - -@property (nonatomic, assign) NSInteger buyHour; -@property (nonatomic, assign) NSInteger goldPrice; -@property (nonatomic, assign) NSInteger id; -@property (nonatomic, assign) BOOL isCur; -@property (nonatomic, copy) NSString *remainHour; -@property (nonatomic, copy) NSString *url; -/// 0=免费，1=付费，2=自定义 -@property (nonatomic, assign) RoomBGType type; -/// -1=过期，0=审核中，1=通过，2=不过审 -@property (nonatomic, assign) RoomBGStatus status; - -- (NSString *)remainDays; -- (NSString *)pricePerDays; -- (BOOL)isAlreadyPay; - -@end - -@interface CustomRoomBGModel : PIBaseModel -@property (nonatomic, assign) NSInteger customHour; -@property (nonatomic, assign) NSInteger customGoldPrice; -@property (nonatomic, copy) NSArray *itemList; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/CustomRoomBGItemModel.m b/YuMi/Modules/YMRoom/Model/CustomRoomBGItemModel.m deleted file mode 100644 index ed35924..0000000 --- a/YuMi/Modules/YMRoom/Model/CustomRoomBGItemModel.m +++ /dev/null @@ -1,50 +0,0 @@ -// -// CustomRoomBGItemModel.m -// YuMi -// -// Created by P on 2024/10/30. -// - -#import "CustomRoomBGItemModel.h" - -@implementation CustomRoomBGItemModel - -- (NSString *)remainDays { - if ([NSString isEmpty:self.remainHour]) { - return @""; - } else { - NSInteger hour = self.remainHour.integerValue; - if (hour<24) { - return [NSString stringWithFormat:@"<1%@", YMLocalizedString(@"1.0.18_8")]; - } else { - return [NSString stringWithFormat:@"%@%@", @(hour/24), YMLocalizedString(@"1.0.18_14")]; - } - } -} - -- (NSString *)pricePerDays { - NSString *content =[NSString stringWithFormat:@"%@/%@", - @(self.goldPrice), - @(self.buyHour/24)]; - return [NSString stringWithFormat:YMLocalizedString(@"1.0.18_8"), content]; -} - -- (BOOL)isAlreadyPay { - if (self.status == RoomBGStatus_Pass) { - return ![NSString isEmpty:self.remainHour]; - } - return NO; -} - -@end - -@implementation CustomRoomBGModel - -+ (NSDictionary *)objectClassInArray { - return @{ - @"itemList": CustomRoomBGItemModel.class - }; -} - - -@end diff --git a/YuMi/Modules/YMRoom/Model/DatingInfoModel.h b/YuMi/Modules/YMRoom/Model/DatingInfoModel.h deleted file mode 100644 index ff369ca..0000000 --- a/YuMi/Modules/YMRoom/Model/DatingInfoModel.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// DatingInfoModel.h -// YUMI -// -// Created by YUMI on 2022/1/5. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface DatingInfoModel : PIBaseModel -///头像 -@property (nonatomic,strong) NSString *avatar; -///操作用户uid -@property (nonatomic,assign) NSInteger uid; -///操作用户昵称 -@property (nonatomic,strong) NSString *nickname; -///当前操作的坑位 -@property (nonatomic,assign) int position; -///目标用户uid -@property (nonatomic,assign) NSInteger targetUid; -///目标用户昵称 -@property (nonatomic,strong) NSString *targetNickname; -///目标的头像 -@property (nonatomic,strong) NSString *targetAvatar; -///操作用户麦位 -@property (nonatomic,assign) int targetPosition; -///相亲步骤变更提示文案 -@property (nonatomic,strong) NSString *content; -///是否有互选对象 -@property (nonatomic,assign) BOOL hasHeart; -///是否有选择的对象 -@property (nonatomic,assign) BOOL hasSelectUser; -/// 1 男性， 2 女性。 -@property (nonatomic, assign) GenderType gender; -///目标用户的性别 -@property (nonatomic,assign) GenderType targetGender; -///互选的时候动画 -@property (nonatomic,strong) NSString *svgaUrl; -///SVGA的时长 -@property (nonatomic,assign) int svgaSecond; -///起始地址的 -@property (nonatomic,assign) CGPoint originPoint; -///目标地址的坐标 -@property (nonatomic,assign) CGPoint targetPoint; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/DatingInfoModel.m b/YuMi/Modules/YMRoom/Model/DatingInfoModel.m deleted file mode 100644 index 3264b9c..0000000 --- a/YuMi/Modules/YMRoom/Model/DatingInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// DatingInfoModel.m -// YUMI -// -// Created by YUMI on 2022/1/5. -// - -#import "DatingInfoModel.h" - -@implementation DatingInfoModel - -@end diff --git a/YuMi/Modules/YMRoom/Model/MicCpInfoModel.h b/YuMi/Modules/YMRoom/Model/MicCpInfoModel.h deleted file mode 100644 index 2a6f06e..0000000 --- a/YuMi/Modules/YMRoom/Model/MicCpInfoModel.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// MicCpInfoModel.h -// YuMi -// -// Created by P on 2025/9/8. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MicCpInfoModel : PIBaseModel - -@property (nonatomic, assign) NSInteger uid; -@property (nonatomic, assign) NSInteger cpLevel; -@property (nonatomic, assign) NSInteger loverUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/MicCpInfoModel.m b/YuMi/Modules/YMRoom/Model/MicCpInfoModel.m deleted file mode 100644 index c262d75..0000000 --- a/YuMi/Modules/YMRoom/Model/MicCpInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MicCpInfoModel.m -// YuMi -// -// Created by P on 2025/9/8. -// - -#import "MicCpInfoModel.h" - -@implementation MicCpInfoModel - -@end diff --git a/YuMi/Modules/YMRoom/Model/RoomBottomEntranceModel.h b/YuMi/Modules/YMRoom/Model/RoomBottomEntranceModel.h deleted file mode 100644 index 9cdf36c..0000000 --- a/YuMi/Modules/YMRoom/Model/RoomBottomEntranceModel.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// RoomBottomEntranceModel.h -// YuMi -// -// Created by P on 2024/7/25. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomBottomEntranceModel : PIBaseModel - -@property (nonatomic, assign) NSInteger skipType; // 1 = h5, 2 = 百顺 -@property (nonatomic, copy) NSString *skipUrl; -@property (nonatomic, copy) NSString *icon1Url; // 新增内容 -@property (nonatomic, copy) NSString *icon2Url; // 原有入口内容，有则替换为新图 -@property (nonatomic, copy) NSString *reserve; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/RoomBottomEntranceModel.m b/YuMi/Modules/YMRoom/Model/RoomBottomEntranceModel.m deleted file mode 100644 index 99dcbaa..0000000 --- a/YuMi/Modules/YMRoom/Model/RoomBottomEntranceModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RoomBottomEntranceModel.m -// YuMi -// -// Created by P on 2024/7/25. -// - -#import "RoomBottomEntranceModel.h" - -@implementation RoomBottomEntranceModel - -@end diff --git a/YuMi/Modules/YMRoom/Model/RoomEnterModel.h b/YuMi/Modules/YMRoom/Model/RoomEnterModel.h deleted file mode 100644 index 1e5b5f1..0000000 --- a/YuMi/Modules/YMRoom/Model/RoomEnterModel.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// RoomEnterModel.h -// YuMi -// -// Created by P on 2025/2/17. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomEnterCPListModel : PIBaseModel - -@property(nonatomic, copy) NSString *cpNick; -@property(nonatomic, copy) NSString *cpAvatar; -@property(nonatomic, assign) NSInteger cpErbanNo; -@property(nonatomic, assign) NSInteger cpLevel; -@property(nonatomic, assign) NSInteger cpUid; - - -@end - -@interface RoomEnterModel : PIBaseModel - -@property(nonatomic, copy) NSString *androidBubbleUrl; -@property(nonatomic, copy) NSString *iosBubbleUrl; -@property(nonatomic, copy) NSString *avatar; -@property(nonatomic, copy) NSString *charmUrl; -@property(nonatomic, assign) NSInteger fromType; -@property(nonatomic, assign) NSInteger defUser; -@property(nonatomic, assign) bool enterHide; -@property(nonatomic, copy) NSString *enterRoomEffects; -@property(nonatomic, assign) NSInteger erbanNo; -@property(nonatomic, assign) NSInteger experLevelSeq; -@property(nonatomic, copy) NSString *experUrl; -@property(nonatomic, assign) bool newUser; -@property(nonatomic, copy) NSString *nick; -@property(nonatomic, assign) NSInteger screenType; //1-普通进房公屏,2-cp进房公屏,3-cp上麦公屏 -@property(nonatomic, assign) NSInteger uid; -@property(nonatomic, copy) NSString *vipIcon; -@property(nonatomic, assign) NSInteger platformRole; // 是否超管 -@property(nonatomic, copy) NSArray *cpList; //进房者的cp列表 - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/RoomEnterModel.m b/YuMi/Modules/YMRoom/Model/RoomEnterModel.m deleted file mode 100644 index 7fd2654..0000000 --- a/YuMi/Modules/YMRoom/Model/RoomEnterModel.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// RoomEnterModel.m -// YuMi -// -// Created by P on 2025/2/17. -// - -#import "RoomEnterModel.h" - -@implementation RoomEnterCPListModel - -@end - -@implementation RoomEnterModel - -+ (NSDictionary *)objectClassInArray { - return @{ - @"cpList":RoomEnterCPListModel.class - }; -} - -@end diff --git a/YuMi/Modules/YMRoom/Model/RoomInfoModel.h b/YuMi/Modules/YMRoom/Model/RoomInfoModel.h deleted file mode 100644 index d16f0fe..0000000 --- a/YuMi/Modules/YMRoom/Model/RoomInfoModel.h +++ /dev/null @@ -1,184 +0,0 @@ -// -// RoomInfoModel.h -// YUMI -// -// Created by YUMI on 2021/10/18. -// - -#import "NSObject+MJExtension.h" -#import "YUMINNNN.h" -#import "AcrossRoomPKPanelModel.h" -#import "RoomBottomEntranceModel.h" - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, RoomType) { - RoomType_Room = 3, - RoomType_Anchor = 6, // 个播房 - RoomType_MiniGame = 7,//小游戏房 - RoomType_10Mic = 8,//10 个麦位 - RoomType_15Mic = 9,//15 个麦位 - RoomType_19Mic = 19,//19 个麦位 - RoomType_20Mic = 20,//20 个麦位 -}; - -typedef NS_ENUM(NSInteger, RoomModeType){ - ///普通模式 - RoomModeType_Normal_Mode = 0, - ///排麦模式 - RoomModeType_Open_Micro_Mode = 1, - ///关闭排麦模式 - RoomModeType_Close_Micro_Mode = 2, - ///开启PK - RoomModeType_Open_PK_Mode = 3, - ///关闭PK - RoomModeType_Close_PK_Mode = 4, - ///相亲 - RoomModeType_Open_Blind = 5, - ///开启跨房PK - RoomModeType_Open_AcrossRoomPK_mode = 7, -}; - -typedef NS_ENUM(NSInteger, PermitRoomType) { - PermitRoomType_License = 1,//牌照 - PermitRoomType_YoungerStar = 3,//新秀 - PermitRoomType_Other//其他 -}; - - -typedef NS_ENUM(NSInteger, RoomPlayDateingType) { - RoomPlayDateingType_Talk = 1,///交谈 - RoomPlayDateingType_Pick = 2,///心动选人 - RoomPlayDateingType_Result = 3,///公布结果 - RoomPlayDateingType_Finish = 4,///结束 -}; - -///本地字段 房间相亲的状态 -typedef NS_ENUM(NSInteger, RoomDatingStateChangeType) { - RoomDatingStateChangeType_Normal = 0,///默认状态 - RoomDatingStateChangeType_Open = 1,/// 关闭->开启 - RoomDatingStateChangeType_Close = 2,///开启->关闭 -}; - -@interface CandyTreeSwitchModel : PIBaseModel -///幸运许愿池开关 -@property(nonatomic, assign) BOOL openBoxSwitch; -///许愿池图标 -@property(nonatomic, copy) NSString *openBoxIcon; -///寻爱之旅总开关 -@property (nonatomic,assign) BOOL open; -///寻爱之旅开关等级 -@property (nonatomic,assign) NSInteger openLevel; -///允许将中奖消息对外展示等级 -@property (nonatomic,assign) NSInteger sendMsgLevel; -@property(nonatomic,copy) NSString *price; -@end - - -@interface RoomInfoModel : PIBaseModel -@property (nonatomic , copy) NSString * nick; -@property (nonatomic , assign) NSInteger uid; -@property (nonatomic , assign) NSInteger isRecom; -@property (nonatomic , assign) NSInteger calcSumDataIndex; -@property (nonatomic , copy) NSString * roomTag; -@property (nonatomic , copy) NSString *singleRoomSortId;//房间分类 -@property (nonatomic , copy) NSString *sortName; -@property (nonatomic , copy) NSString * audioSdkType; -@property (nonatomic , copy) NSString * trtcSig; -@property (nonatomic , assign) NSInteger hideFlag; -@property (nonatomic , assign) RoomType type; -@property (nonatomic , strong) NSArray * speakTemplate; -@property (nonatomic , assign) NSInteger tagId; -@property (nonatomic , assign) BOOL isExceptionClose; -@property (nonatomic , assign) NSInteger recomSeq; -@property (nonatomic , assign) BOOL redEnvelopeOpen; -@property (nonatomic , assign) NSInteger roomId; -@property (nonatomic , assign) BOOL valid; -@property (nonatomic , copy) NSString * tagPict; -@property (nonatomic , assign) NSInteger count; -@property (nonatomic , assign) BOOL showGiftValue; -@property (nonatomic , copy) NSString * avatar; -@property (nonatomic , assign) NSInteger onlineNum; -@property (nonatomic , assign) BOOL isCloseScreen; -//@property(nonatomic,assign) BOOL closeScreen; -@property (nonatomic , assign) BOOL exceptionClose; -@property (nonatomic , assign) PermitRoomType isPermitRoom; -@property (nonatomic , assign) NSInteger abChannelType; -@property (nonatomic , assign) BOOL hasAnimationEffect; -@property (nonatomic , assign) GenderType gender; -@property (nonatomic , assign) BOOL serverRedEnvelopeSwitch; -@property (nonatomic , assign) BOOL isOpenGame; -@property (nonatomic , copy) NSString * roomDesc; -@property (nonatomic , assign) NSInteger officeUser; -@property (nonatomic , assign) NSInteger erbanNo; -@property (nonatomic , assign) NSInteger audioQuality; -@property (nonatomic , copy) NSString * title; -@property (nonatomic , assign) NSInteger closeScreenFlag; -@property (nonatomic , assign) NSInteger operatorStatus; -@property (nonatomic , copy) NSString * roomPwd; -@property (nonatomic , assign) BOOL leaveMode; -@property (nonatomic, copy) NSString *backPic; -@property (nonatomic , assign) RoomModeType roomModeType;//房间模式 -@property (nonatomic, strong) NSNumber *serialValue; -///房间介绍 -@property (nonatomic, copy) NSString *introduction; -///糖果树的配置 -@property (nonatomic,strong) CandyTreeSwitchModel *boxSwitchVo; -/// 是否已经收藏 -@property(nonatomic, assign) BOOL isRoomFans; -///当前相亲所进行到什么模式 -@property (nonatomic,assign) RoomPlayDateingType blindDateState; -///能否开启相亲 -@property (nonatomic,assign) BOOL canOpenBlindDate; -///相亲的vip坑位的用户uid -@property (nonatomic,assign) NSInteger blindDateVipUid; -///本地的字段 判断当前模式是否从相亲切换 关闭或者开启 -@property (nonatomic,assign) RoomDatingStateChangeType datingState; -///是否切换了房间类型（本地字段) -@property (nonatomic, assign) BOOL hadChangeRoomType; -///是否需要重新选择小游戏，原有小游戏玩法不在最新配置里面是需要重新选择 -@property (nonatomic, assign) BOOL isReselect; -///小游戏ID -@property (nonatomic, assign) int64_t mgId; -///小游戏名称 -@property (nonatomic, copy) NSString *mgName; -///pk场次id(本地字段) -@property (nonatomic, assign) NSInteger roundId; -//PK进行状态(1：pk中 2：惩罚中） -@property (nonatomic, assign) AcrossRoomPkStateType pkState; -///个播PK赢方uid -@property (nonatomic, copy) NSString *winUid; -///PK中的对方UID(本地字段) -@property (nonatomic, copy) NSString *pkUid; -///PK中的对方房间roomId(本地字段) -@property (nonatomic, copy) NSString *pkRoomId; -///清除公屏的时间（用于拉取此时间后的公屏消息) -@property (nonatomic , assign) double clearScreenTime; -///小游戏房麦位数量 -@property (nonatomic, assign) NSInteger mgMicNum; -///是否显示跨房PK预约倒计时 -@property (nonatomic, assign) BOOL showPkBeginTime; -///跨房PK开始时间 -@property (nonatomic, assign) long long pkBeginTime; -///个播随机PK匹配结束时间 -@property (nonatomic, assign) long long pkMatchStartTime; -///寻爱之旅的配置 -@property (nonatomic,strong) CandyTreeSwitchModel *findLoveDrawSwitchVo; -///夺宝精灵的配置 -@property(nonatomic,strong) CandyTreeSwitchModel *seizeTreasureSwitchVo; -///是否有房间相册权限 -@property(nonatomic,assign) BOOL hasRoomAlbum; -//1 厅内红包 2 全服红包 3 厅内红包+全服红包 -@property(nonatomic,assign) NSInteger redEnvelopeType; - -@property (nonatomic , assign) RoomType oldType; - -/// 右下角的配置项 -@property (nonatomic, strong) RoomBottomEntranceModel *rightBottomIconConfig; - -@property(nonatomic, copy) NSString *roomLevelIcon; //房间等级图标 -@property(nonatomic, assign) NSInteger usedMicSkinId; //使用中的麦位皮肤id -@property(nonatomic, assign) NSInteger usedMicEffectId; //使用中的麦位特效id - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/RoomInfoModel.m b/YuMi/Modules/YMRoom/Model/RoomInfoModel.m deleted file mode 100644 index d8a56af..0000000 --- a/YuMi/Modules/YMRoom/Model/RoomInfoModel.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// RoomInfoModel.m -// YUMI -// -// Created by YUMI on 2021/10/18. -// - -#import "RoomInfoModel.h" - -@implementation CandyTreeSwitchModel - -@end - - -@implementation RoomInfoModel -//-(void)setCloseScreen:(BOOL)closeScreen{ -// _closeScreen = closeScreen; -// _isCloseScreen = _closeScreen; -//} -@end diff --git a/YuMi/Modules/YMRoom/Model/RoomLevelInfoModel.h b/YuMi/Modules/YMRoom/Model/RoomLevelInfoModel.h deleted file mode 100644 index b6338c5..0000000 --- a/YuMi/Modules/YMRoom/Model/RoomLevelInfoModel.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// RoomLevelInfoModel.h -// YuMi -// -// Created by P on 2024/12/25. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -typedef enum : NSUInteger { - MicResourceType_Skin = 1, - MicResourceType_Effect = 2, -} MicResourceType; - -@interface RoomMicInfoModel : PIBaseModel - -// 通用参数 -@property(nonatomic, copy) NSString *id; -@property(nonatomic, assign) NSInteger reachLevel; -@property(nonatomic, assign) MicResourceType dressType; - -// API：client/resource 使用 -@property(nonatomic, copy) NSString *normalMicLockUrl; -@property(nonatomic, copy) NSString *bossMicLockUrl; -@property(nonatomic, copy) NSString *normalMicUrl; -@property(nonatomic, copy) NSString *bossMicUrl; - -+ (RoomMicInfoModel *)emptySkinModel; -+ (RoomMicInfoModel *)emptyEffectModel; - -@end - -@interface RoomLevelInfoModel : PIBaseModel - -@property(nonatomic, assign) NSInteger roomVal; -@property(nonatomic, assign) NSInteger usedMicSkinId; -@property(nonatomic, assign) NSInteger usedMicEffectId; - -@property(nonatomic, assign) NSInteger nextLevel; -@property(nonatomic, assign) NSInteger nextLevelExp; -@property(nonatomic, assign) NSInteger currentLevel; -@property(nonatomic, assign) NSInteger currentLevelExp; -@property(nonatomic, copy) NSString *currentLevelIcon; - -@property(nonatomic, assign) NSInteger managerLimitNum; -@property(nonatomic, assign) NSInteger currentManagerNum; - -@property(nonatomic, copy) NSArray *micSkins; -@property(nonatomic, copy) NSArray *micEffects; - -@property(nonatomic, assign) BOOL hasUnique; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/RoomLevelInfoModel.m b/YuMi/Modules/YMRoom/Model/RoomLevelInfoModel.m deleted file mode 100644 index 14737a1..0000000 --- a/YuMi/Modules/YMRoom/Model/RoomLevelInfoModel.m +++ /dev/null @@ -1,36 +0,0 @@ -// -// RoomLevelInfoModel.m -// YuMi -// -// Created by P on 2024/12/25. -// - -#import "RoomLevelInfoModel.h" - -@implementation RoomMicInfoModel - -+ (RoomMicInfoModel *)emptySkinModel { - RoomMicInfoModel *model = [[RoomMicInfoModel alloc] init]; - model.id = @"-1"; - model.dressType = MicResourceType_Skin; - return model; -} - -+ (RoomMicInfoModel *)emptyEffectModel { - RoomMicInfoModel *model = [[RoomMicInfoModel alloc] init]; - model.id = @"-1"; - model.dressType = MicResourceType_Effect; - return model; -} - -@end - -@implementation RoomLevelInfoModel -+ (NSDictionary *)objectClassInArray { - return @{ - @"micSkins":RoomMicInfoModel.class, - @"micEffects":RoomMicInfoModel.class, - }; -} - -@end diff --git a/YuMi/Modules/YMRoom/Model/RoomLuckyPackageInfoModel.h b/YuMi/Modules/YMRoom/Model/RoomLuckyPackageInfoModel.h deleted file mode 100644 index 44c669a..0000000 --- a/YuMi/Modules/YMRoom/Model/RoomLuckyPackageInfoModel.h +++ /dev/null @@ -1,157 +0,0 @@ -// -// RoomLuckyPackageInfoModel.h -// YuMi -// -// Created by P on 2025/2/11. -// - -#import "PIBaseModel.h" -#import "GiftInfoModel.h" -#import "UserInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface RedEnvelopeUserVo : PIBaseModel - -@property(nonatomic, assign) NSInteger uid; -@property(nonatomic, assign) NSInteger gender; -@property(nonatomic, assign) NSInteger erbanNo; -@property(nonatomic, assign) NSTimeInterval birth; -@property(nonatomic, copy) NSString *nick; -@property(nonatomic, copy) NSString *avatar; -@end - -@interface RedEnvelopeGiftVo : PIBaseModel - -@property(nonatomic, copy) NSString *giftName; -@property(nonatomic, assign) BOOL isSkipRoom; -@property(nonatomic, assign) NSInteger goldPrice; -@property(nonatomic, assign) NSInteger seqNo; -@property(nonatomic, assign) NSInteger giftId; -@property(nonatomic, copy) NSString *gaaUrl; -@property(nonatomic, copy) NSString *hasSvga; -@property(nonatomic, copy) NSString *giftUrl; -@property(nonatomic, assign) BOOL hasTimeLimit; -@property(nonatomic, assign) BOOL isSendMsg; -@property(nonatomic, assign) BOOL hasLastest; -@property(nonatomic, assign) NSInteger giftType; -@property(nonatomic, assign) BOOL hasVggPic; -@property(nonatomic, assign) BOOL hasEffect; -@property(nonatomic, copy) NSString *luckyGiftSvgaUrl; -@property(nonatomic, assign) BOOL isWholeServer; -@property(nonatomic, copy) NSString *giftExplainUrl; - -@end - - -@interface RedEnvelopeGiftItemVO : PIBaseModel - -@property(nonatomic, assign) NSInteger giftNum; -@property(nonatomic, strong) RedEnvelopeGiftVo *giftVo; -@end - -@interface RedEnvelopeReceiveVo : PIBaseModel - -@property(nonatomic, assign) NSInteger amount; -@property(nonatomic, assign) BOOL isME; -@property(nonatomic, strong) RedEnvelopeUserVo * userVO; -@property(nonatomic, assign) NSTimeInterval createTime; -@property(nonatomic, copy) NSString *createTimeStr; -@property(nonatomic, copy) NSArray *redEnvelopeGiftItemVOs; - -@end - - -@interface RedEnvelopeDetailVo : PIBaseModel - -//{"giftName":"DOdo11","isSkipRoom":false,"goldPrice":10000,"seqNo":-9999999,"giftId":2298,"vggUrl":null,"hasSvga":false,"giftUrl":"https:\/\/image.pekolive.com\/yuand-yingyu.png","hasTimeLimit":false,"isSendMsg":false,"hasLatest":false,"giftType":2,"hasVggPic":true,"hasEffect":false,"luckyGiftSvgaUrl":null,"isWholeServer":false,"giftExplainUrl":"https:\/\/lanhuapp.com\/web\/#\/item\/project\/stage?pid=455641a2-9e80-494a-875d-e209f9e03f70&image_id=6a19205f-c123-48b2-a0df-2c4b0df9bbff"} -@property(nonatomic, copy) NSString *giftName; -@property(nonatomic, assign) BOOL isSkipRoom; -@property(nonatomic, assign) NSInteger goldPrice; -@property(nonatomic, assign) NSInteger seqNo; -@property(nonatomic, assign) NSInteger giftId; -@property(nonatomic, copy) NSString *gaaUrl; -@property(nonatomic, copy) NSString *hasSvga; -@property(nonatomic, copy) NSString *giftUrl; -@property(nonatomic, assign) BOOL hasTimeLimit; -@property(nonatomic, assign) BOOL isSendMsg; -@property(nonatomic, assign) BOOL hasLastest; -@property(nonatomic, assign) NSInteger giftType; -@property(nonatomic, assign) BOOL hasVggPic; -@property(nonatomic, assign) BOOL hasEffect; -@property(nonatomic, copy) NSString *luckyGiftSvgaUrl; -@property(nonatomic, assign) BOOL isWholeServer; -@property(nonatomic, copy) NSStream *giftExplainUrl; - -@end - -@interface RedEnvelopeListVo : PIBaseModel -@property(nonatomic, copy) NSString *avatar; -@property(nonatomic, assign) NSInteger backCommissionAmount; -@property(nonatomic, assign) NSTimeInterval beginTime; -@property(nonatomic, assign) NSInteger commissionAmount; -@property(nonatomic, assign) NSInteger countDownSecond; -@property(nonatomic, assign) NSTimeInterval createTime; -@property(nonatomic, copy) NSString *createTimeStr; -@property(nonatomic, assign) NSTimeInterval endTime; -@property(nonatomic, copy) NSString *giftName; -@property(nonatomic, copy) NSString *id; -@property(nonatomic, assign) NSInteger kind; -@property(nonatomic, copy) NSString *message; -@property(nonatomic, copy) NSString *nick; -@property(nonatomic, assign) NSInteger num; -@property(nonatomic, assign) NSInteger originalAmount; -@property(nonatomic, copy) NSString *position; -@property(nonatomic, assign) NSInteger roomUid; -@property(nonatomic, assign) NSInteger state; -@property(nonatomic, copy) NSString *type; -@property(nonatomic, assign) NSTimeInterval updateTime; -@property(nonatomic, assign) NSInteger userId; -@property(nonatomic, assign) NSInteger validityType; - -@property(nonatomic, assign) BOOL finish; -@property(nonatomic, assign) NSInteger totalNum; -@property(nonatomic, assign) NSInteger redEnvelopeAmount; - -@property(nonatomic, assign) NSInteger redEnvelopeNum; -@property(nonatomic, assign) NSInteger redEnvelopeId; - -@property(nonatomic, copy) NSArray *userVO; - - - -@end - -@interface RedEnvelopeV2Config : PIBaseModel - -@property(nonatomic, assign) bool open; -@property(nonatomic, copy) NSArray *numItems; -@property(nonatomic, copy) NSArray *goldItems; -@property(nonatomic, copy) NSArray *timeItems; -@property(nonatomic, assign) NSInteger expireSeconds; - -@end - -@interface RoomLuckyPackageInfoModel : PIBaseModel - -@property(nonatomic, copy) NSArray * redEnvelopeListVoList; -@property(nonatomic, strong) RedEnvelopeV2Config *redEnvelopeV2Config; - -@end - -@interface OpenRedEnvelopeCurrentUserGift : PIBaseModel - -@property(nonatomic, assign) NSInteger giftNum; -@property(nonatomic, strong) GiftInfoModel *giftVo; - -@end - -@interface OpenRedEnvelopeVo : PIBaseModel - -@property(nonatomic, assign) NSInteger currentUserAmount; -@property(nonatomic, assign) NSInteger redEnvelopeState; // 3:抢光。 4:抢到。 7: 已经抢过 -@property(nonatomic, strong) RedEnvelopeListVo *redEnvelopeVO; -@property(nonatomic, copy) NSArray *currentUserGifts; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/RoomLuckyPackageInfoModel.m b/YuMi/Modules/YMRoom/Model/RoomLuckyPackageInfoModel.m deleted file mode 100644 index 846bcd3..0000000 --- a/YuMi/Modules/YMRoom/Model/RoomLuckyPackageInfoModel.m +++ /dev/null @@ -1,78 +0,0 @@ -// -// RoomLuckyPackageInfoModel.m -// YuMi -// -// Created by P on 2025/2/11. -// - -#import "RoomLuckyPackageInfoModel.h" - -@implementation RedEnvelopeUserVo - -@end - -@implementation RedEnvelopeGiftVo - -@end - -@implementation RedEnvelopeGiftItemVO - -@end - -@implementation RedEnvelopeReceiveVo - -+ (NSDictionary *)objectClassInArray { - return @{ - @"redEnvelopeGiftItemVOs":RedEnvelopeGiftItemVO.class - }; -} - -@end - - -@implementation RedEnvelopeDetailVo - -@end - -@implementation RedEnvelopeListVo -+ (NSDictionary *)objectClassInArray { - return @{ - @"userVO":UserInfoModel.class - }; -} - -//+ (NSDictionary *)replacedKeyFromPropertyName { -// return @{ -// @"redEnvelopeId":@"id" -// }; -//} - -@end - -@implementation RedEnvelopeV2Config - - -@end - -@implementation RoomLuckyPackageInfoModel -+ (NSDictionary *)objectClassInArray { - return @{ - @"redEnvelopeListVoList":RedEnvelopeListVo.class - }; -} -@end - -@implementation OpenRedEnvelopeCurrentUserGift - - -@end - -@implementation OpenRedEnvelopeVo - -+ (NSDictionary *)objectClassInArray { - return @{ - @"currentUserGifts":OpenRedEnvelopeCurrentUserGift.class - }; -} - -@end diff --git a/YuMi/Modules/YMRoom/Model/RoomNewUserGreetModel.h b/YuMi/Modules/YMRoom/Model/RoomNewUserGreetModel.h deleted file mode 100644 index 6d60178..0000000 --- a/YuMi/Modules/YMRoom/Model/RoomNewUserGreetModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// RoomNewUserGreetModel.h -// YUMI -// -// Created by YUMI on 2022/6/6. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomNewUserGreetModel : PIBaseModel -///是否弹框 -@property (nonatomic,assign) BOOL roomPopup; -///用户的头像 -@property (nonatomic,copy) NSArray *sayHelloUserAvatarList; -///有多少用户 -@property (nonatomic,assign) int sayHelloUserNum; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Model/RoomNewUserGreetModel.m b/YuMi/Modules/YMRoom/Model/RoomNewUserGreetModel.m deleted file mode 100644 index 15a2d2f..0000000 --- a/YuMi/Modules/YMRoom/Model/RoomNewUserGreetModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RoomNewUserGreetModel.m -// YUMI -// -// Created by YUMI on 2022/6/6. -// - -#import "RoomNewUserGreetModel.h" - -@implementation RoomNewUserGreetModel - -@end diff --git a/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.h b/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.h deleted file mode 100644 index a2511d9..0000000 --- a/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.h +++ /dev/null @@ -1,91 +0,0 @@ -// -// YMRoomPresenter.h -// YUMI -// -// Created by YUMI on 2021/10/18. -// - -#import "BaseMvpPresenter.h" -#import "RoomInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@class UserInfoModel; - -@interface XPRoomPresenter : BaseMvpPresenter -@property(nonatomic,strong) UserInfoModel *infoModel; - - -- (void)initEnterRoom:(NSString *)roomUid user:(NSString *)uid; - -- (void)enterNIMRoom:(NSString *)roomId user:(UserInfoModel*)userInfo; -- (void)exitNIMRoom:(NSString *)roomId; - -/// 开启用户自己的房间 -/// @param title 房间标题 -/// @param type 房间类型 -/// @param roomPwd 房间密码 -/// @param roomDesc 房间介绍 -/// @param backPic 房间背景 -/// @param mgId 小游戏的id -- (void)openRoom:(NSString *)title - type:(RoomType)type - roomPwd:(NSString *)roomPwd - roomDesc:(NSString *)roomDesc - backPic:(NSString *)backPic - mgId:(NSString *)mgId; - -///福袋礼物爆出的礼物的bug -///进入房间的时候需要获取一次礼物信息 因为如果有人送礼物的话 如果是福袋礼物的话 爆出的礼物需要从礼物列表中获取 会导致公屏不显示那个礼物 -/// 获取普通的礼物 -/// @param roomUid 房主的uid 获取房间专属礼物 -- (void)getNormalGiftList:(NSString *)roomUid; - -/// 上报用户进房 -/// @param roomUid 房间uid -- (void)reportUserInterRoom:(NSString *)roomUid; - -/// 上报用户退房 -/// @param roomUid 房间uid -- (void)reportUserOutRoom:(NSString *)roomUid; - -/// 获取房间超管列表 -/// @param roomUid 房间的uid -- (void)getRoomSuperAdmin:(NSString *)roomUid; - -///获取循环的推荐房间 -/// @param roomUid 房间的uid -- (void)getCycleAnchorRoomList:(NSString *)roomUid; - -///获取当前房间是否有效 -- (void)getCurrentRoomInfo:(NSString *)roomUid; - -///获取红包信息 -- (void)getRedPacket:(NSString *)roomUid; -///获取单个红包信息 --(void)getRedPacketInft:(NSString *)redEnvelopeId; - - -///屏蔽 -- (void)requestShieldingWithType:(NSString *)type objId:(NSString *)objId; -///获取免费礼物 --(void)getFreeGiftData; -/// 获取已解锁照片id列表 -/// @param roomUid 房间id --(void)getUnlockRoomAlbumPhotoListWithRoomUid:(NSString *)roomUid; -///得到踢人名单 -/// @param roomUid 房间id --(void)getKickUserListWithRoomUid:(NSString *)roomUid; - -- (void)getBoomRocketAnimationInfo:(NSString *)roomUid; - -- (void)getBoomDetail:(NSString *)roomUid; - -- (void)getShareLink:(NSString *)roomUid success:(void(^)(NSString *link))success failure:(void(^)(NSError *error))failure; - -- (void)micCpListByRoomUid:(NSString *)roomUid; - -- (void)micCpListByUidList:(NSArray *)uidList; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m b/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m deleted file mode 100644 index efee49b..0000000 --- a/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m +++ /dev/null @@ -1,372 +0,0 @@ -// -// YMRoomPresenter.m -// YUMI -// -// Created by YUMI on 2021/10/18. -// - -#import "XPRoomPresenter.h" -#import "ClientConfig.h" -///API -#import "Api+Room.h" -#import "Api+Gift.h" -#import "Api+Boom.h" -#import "UserInfoModel.h" -#import "GuildSuperAdminInfoModel.h" -///Tool -#import "AccountInfoStorage.h" -#import "XPGiftStorage.h" -#import "NSObject+MJExtension.h" -///Model -#import "GiftInfoModel.h" -#import "XPMessageRemoteExtModel.h" -#import "RoomNewUserGreetModel.h" -#import "XPRoomRecommendModel.h" -#import "XPRedPacketModel.h" -#import "XPFreeGiftModel.h" -#import "BoomInfoModel.h" -#import "MicCpInfoModel.h" -///P -#import "XPRoomProtocol.h" - -#import -#import - - -@interface XPRoomPresenter () - -@end - -@implementation XPRoomPresenter - -- (void)initEnterRoom:(NSString *)roomUid user:(NSString *)uid { - RACSubject* room = [RACSubject subject]; - RACSubject* user = [RACSubject subject]; - - @kWeakify(self); - [[RACSignal combineLatest:@[room, user] reduce:^id(RoomInfoModel* room, UserInfoModel* user){ - @kStrongify(self); - [[self getView] initEnterRoomSuccess:room user:user]; - return nil; - }] subscribeError:^(NSError * _Nullable error) { - @kStrongify(self); - [[self getView] enterRoomFail:error.code]; - }]; - - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - UserInfoModel * infoModel = [UserInfoModel modelWithJSON:data.data]; - self.infoModel = infoModel; - [user sendNext:infoModel]; - [user sendCompleted]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [user sendError:nil]; - } showLoading:YES errorToast:NO] uid:uid]; - - [Api getRoomInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - RoomInfoModel *model = [RoomInfoModel modelWithJSON:data.data]; - [room sendNext:model]; - [room sendCompleted]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [room sendError:nil]; - } showLoading:YES errorToast:YES] uid:roomUid intoUid:uid]; -} - -- (void)enterNIMRoom:(NSString *)roomId user:(UserInfoModel *)userInfo { - NIMChatroomEnterRequest *request = [[NIMChatroomEnterRequest alloc] init]; - request.roomId = roomId; - //设置ext - XPMessageRemoteExtModel * extModel = [[XPMessageRemoteExtModel alloc] init]; - extModel.defUser = userInfo.defUser; - extModel.erbanNo = userInfo.erbanNo; - extModel.carName = userInfo.carName; - extModel.inRoomNameplatePic = userInfo.nameplatePic; - extModel.inRoomNameplateWord = userInfo.nameplateWord; - extModel.isCustomWord = userInfo.isCustomWord; - extModel.charmUrl = userInfo.userLevelVo.charmUrl; - extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq; - extModel.experUrl = userInfo.userLevelVo.experUrl; - extModel.newUser = userInfo.newUser; - extModel.vipIcon = userInfo.userVipInfoVO.nameplateUrl; - extModel.fromUid = userInfo.fromUid; - extModel.fromType = userInfo.fromType; - extModel.fromNick = userInfo.fromNick; - extModel.iosBubbleUrl = userInfo.iosBubbleUrl; - extModel.androidBubbleUrl = userInfo.androidBubbleUrl; - extModel.enterHide = userInfo.userVipInfoVO.enterHide; - extModel.preventKick = userInfo.userVipInfoVO.preventKick; - extModel.enterRoomEffects = userInfo.userVipInfoVO.enterRoomEffects; - extModel.gender = userInfo.gender; - extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; - extModel.platformRole = userInfo.platformRole; - extModel.nick = userInfo.nick; - - NSMutableDictionary *ext = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[NSString stringWithFormat:@"%ld", userInfo.uid]]; - request.roomExt = [ext toJSONString]; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager enterChatroom:request completion:^(NSError * _Nullable error, NIMChatroom * _Nullable chatroom, NIMChatroomMember * _Nullable me) { - @kStrongify(self); - if (error) { - NSLog(@"\n云信进房异常:\n %@", error); - [[self getView] enterRoomFail:error.code]; - } else { - [[self getView] enterRoomSuccess:chatroom]; - } - }]; -} - -- (void)exitNIMRoom:(NSString *)roomId { - [[NIMSDK sharedSDK].chatroomManager exitChatroom:roomId completion:nil]; -} - -/// 开启用户自己的房间 -/// @param title 房间标题 -/// @param type 房间类型 -/// @param roomPwd 房间密码 -/// @param roomDesc 房间介绍 -/// @param backPic 房间背景 -/// @param mgId 小游戏的id -- (void)openRoom:(NSString *)title - type:(RoomType)type - roomPwd:(NSString *)roomPwd - roomDesc:(NSString *)roomDesc - backPic:(NSString *)backPic - mgId:(NSString *)mgId{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - if (title.length <= 0) { - title = @""; - } - - if (roomPwd.length <= 0) { - roomPwd = @""; - } - - if (roomDesc.length <= 0) { - roomDesc = @""; - } - - if (backPic.length <= 0) { - backPic = @""; - } - - if (mgId.length <= 0) { - mgId = @"0"; - } - - @kWeakify(self); - [Api openRoom:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - RoomInfoModel * infoModel = [RoomInfoModel modelWithJSON:data.data]; - [[self getView] openRoomSuccess:infoModel]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] enterRoomFail:code]; - } showLoading:NO] title:title type:type roomPwd:roomPwd roomDesc:roomDesc backPic:backPic uid:uid ticket:ticket mgId:mgId]; -} - -///福袋礼物爆出的礼物的bug -///进入房间的时候需要获取一次礼物信息 因为如果有人送礼物的话 如果是福袋礼物的话 爆出的礼物需要从礼物列表中获取 会导致公屏不显示那个礼物 -/// 获取普通的礼物 -/// @param roomUid 房主的uid 获取房间专属礼物 -- (void)getNormalGiftList:(NSString *)roomUid { - [[XPGiftStorage shareStorage] updateRoomUID:roomUid]; - - [Api requestAllTagsAndNormalGifts:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200 && data.data) { - [[XPGiftStorage shareStorage] cacheTagsWith:data.data inRoom:roomUid]; - } - } roomUid:roomUid]; -} - -/// 上报用户进房 -/// @param roomUid 房间uid -- (void)reportUserInterRoom:(NSString *)roomUid { - if ([[AccountInfoStorage instance] getTicket].length < 1) { - return; - } - [Api requestReportUserInterRoom:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - } uid:[[AccountInfoStorage instance] getUid] roomUid:roomUid ticket:[[AccountInfoStorage instance] getTicket]]; -} - -/// 上报用户退房 -/// @param roomUid 房间uid -- (void)reportUserOutRoom:(NSString *)roomUid { - if ([[AccountInfoStorage instance] getTicket].length < 1) { - return; - } - [Api requestReportUserOutRoom:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - } uid:[[AccountInfoStorage instance] getUid] roomUid:roomUid ticket:[[AccountInfoStorage instance] getTicket]]; -} - -/// 获取房间超管列表 -/// @param roomUid 房间的uid -- (void)getRoomSuperAdmin:(NSString *)roomUid { - @kWeakify(self); - [Api getRoomSuperAdminList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray * array = [GuildSuperAdminInfoModel modelsWithArray:data.data]; - [[self getView] getRoomSuperAdminSuccess:array]; - }] roomUid:roomUid]; -} - -///获取循环的推荐房间 -/// @param roomUid 房间的uid -- (void)getCycleAnchorRoomList:(NSString *)roomUid { - @kWeakify(self); - [Api requestNextAnchorRoom:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - RoomInfoModel * infoModel = [RoomInfoModel modelWithJSON:data.data]; - [[self getView] getNextAnchorRoomSuccess:infoModel]; - } else { - [[self getView] getNextAnchorRoomSuccess:nil]; - } - } roomUid:roomUid]; -} - -- (void)getCurrentRoomInfo:(NSString *)roomUid { - @kWeakify(self); - NSString * uid= [AccountInfoStorage instance].getUid; - [Api getRoomInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:data.data]; - [[self getView] getCurrentRoomInfoSuccess:roomInfo]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] getCurrentRoomInfoSuccess:nil]; - }] uid:roomUid intoUid:uid]; -} - -///获取房间红包 -- (void)getRedPacket:(NSString *)roomUid { - @kWeakify(self); - [Api requestRedPacket:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray *array = [XPRedPacketModel modelsWithArray:data.data]; - for (XPRedPacketModel *model in array) { - model.timestamp = data.timestamp; - } - [[self getView] getRedPacketSuccess:array]; - }] uid:roomUid isShowKind:@"1"]; -} -///获取单个红包信息 --(void)getRedPacketInft:(NSString *)redEnvelopeId{ - @kWeakify(self); - [Api getRedPacket:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - XPRedPacketModel *redModel = [XPRedPacketModel modelWithJSON:data.data]; - redModel.timestamp = data.timestamp; - redModel.sendUserNick = data.data[@"nick"]; - redModel.sendUserAvatar = data.data[@"avatar"]; - redModel.redEnvelopePosition = data.data[@"position"]; - [[self getView]getRedPacketInfoSuccess:redModel]; - }] redEnvelopeId:redEnvelopeId]; -} - -- (void)requestShieldingWithType:(NSString *)type objId:(NSString *)objId{ - @kWeakify(self); - [Api requestShielding:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] requestShieldingSuccess]; - }] type:type objId:objId]; -} --(void)getFreeGiftData{ - @kWeakify(self); - [Api requestFreeGiftData:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - XPFreeGiftModel *freeModel = [XPFreeGiftModel modelWithDictionary:data.data]; - [[self getView] getFreeGiftDataSuccess:freeModel]; - }]]; -} -/// 获取已解锁照片id列表 -/// @param roomUid 房间id --(void)getUnlockRoomAlbumPhotoListWithRoomUid:(NSString *)roomUid{ - @kWeakify(self); - [Api getUnlockRoomAlbumPhotoList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView]getUnlockRoomAlbumPhotoListSuccessWithList:data.data]; - } showLoading:NO errorToast:NO] roomUid:roomUid]; -} -///得到踢人名单 -/// @param roomUid 房间id --(void)getKickUserListWithRoomUid:(NSString *)roomUid{ - @kWeakify(self); - [Api getKickUserList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView]getKickUserListSuccessWithList:data.data]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - } showLoading:NO errorToast:NO] roomUid:roomUid]; -} - -- (void)getBoomRocketAnimationInfo:(NSString *)roomUid { - @kWeakify(self); - [Api getBoomRocketAnimationInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - BoomInfoModel *model = [BoomInfoModel modelWithJSON:data.data]; - [[self getView] getRoomBoomExplosionSuccess:model]; - } - fail:^(NSInteger code, NSString * _Nullable msg) { - - } - showLoading:NO] - roomUid:roomUid]; -} - - -- (void)getBoomDetail:(NSString *)roomUid { - @kWeakify(self); - [Api getBoomDetailInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray *array = [BoomDetailModel modelsWithArray:data.data]; - [[self getView] getRoomBoomInfoSuccess:array]; - } - fail:^(NSInteger code, NSString * _Nullable msg) { - - } - showLoading:NO errorToast:NO] - roomUid:roomUid]; -} - -- (void)getShareLink:(NSString *)roomUid - success:(void(^)(NSString *link))success - failure:(void(^)(NSError *error))failure { - [Api shareGen:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - success(data.data); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] targetUid:roomUid]; -} - -- (void)micCpListByRoomUid:(NSString *)roomUid { - @kWeakify(self); - [Api getRoomMicCpListByRoomUid:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - if ([[self getView] respondsToSelector:@selector(getMicCpListByRoomUidSuccess:)]) { - NSArray *cpList = [MicCpInfoModel modelsWithArray:data.data]; - [[self getView] getMicCpListByRoomUidSuccess:cpList]; - } - } - } roomUid:roomUid]; -} - -- (void)micCpListByUidList:(NSArray *)uidList { - NSString *uidsString = [uidList componentsJoinedByString:@","]; - [Api getRoomMicCpListByUidList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - if ([[self getView] respondsToSelector:@selector(getMicCpListByUidListSuccess:)]) { - NSArray *cpList = [MicCpInfoModel modelsWithArray:data.data]; - [[self getView] getMicCpListByUidListSuccess:cpList]; - } - } - } uidList:uidsString]; -} - -@end diff --git a/YuMi/Modules/YMRoom/Protocol/XPRoomProtocol.h b/YuMi/Modules/YMRoom/Protocol/XPRoomProtocol.h deleted file mode 100644 index a95ee5e..0000000 --- a/YuMi/Modules/YMRoom/Protocol/XPRoomProtocol.h +++ /dev/null @@ -1,54 +0,0 @@ -// -// YMRoomProtocol.h -// YUMI -// -// Created by YUMI on 2021/10/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - - -@class RoomInfoModel, UserInfoModel, NIMChatroom, FirstChargeRoomWindowModel, XPRedPacketModel, BoomInfoModel, BoomDetailModel, MicCpInfoModel; - -@protocol XPRoomProtocol - -- (void)initEnterRoomSuccess:(RoomInfoModel *)roomInfo user:(UserInfoModel *)userInfo; -///开启房间成功 -- (void)openRoomSuccess:(RoomInfoModel *)roomInfo; -///进入房间成功 -- (void)enterRoomSuccess:(NIMChatroom *)chatRoom; -///进入房间失败（当前获取用户信息、获取房间信息、开启房间、进入云信房间失败，均会导致进房失败） -- (void)enterRoomFail:(NSInteger)code; -///获取超管成功 -- (void)getRoomSuperAdminSuccess:(NSArray *)list; -///获取下一个个播房成功 -- (void)getNextAnchorRoomSuccess:(RoomInfoModel * _Nullable)roomInfo; -///获取当前房间的信息 -- (void)getCurrentRoomInfoSuccess:(RoomInfoModel * _Nullable)roomInfo; -///获取红包成功 -- (void)getRedPacketSuccess:(NSArray *)list; -///获取红包成功 -- (void)getRedPacketInfoSuccess:(XPRedPacketModel *)redInfo; - -///屏蔽 --(void)requestShieldingSuccess; -///获取免费礼物成功 --(void)getFreeGiftDataSuccess:(XPFreeGiftModel *)freeModel; -///获取已解锁照片id列表 --(void)getUnlockRoomAlbumPhotoListSuccessWithList:(NSArray *)list; -///获取踢人房间列表 --(void)getKickUserListSuccessWithList:(NSArray *)list; - -- (void)getRoomBoomInfoSuccess:(NSArray *)models; - -- (void)getRoomBoomExplosionSuccess:(BoomInfoModel *)model; - -- (void)getMicCpListByRoomUidSuccess:(NSArray *)cpList; - -- (void)getMicCpListByUidListSuccess:(NSArray *)cpList; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/RoomResourceManager.h b/YuMi/Modules/YMRoom/RoomResourceManager.h deleted file mode 100644 index 74673cc..0000000 --- a/YuMi/Modules/YMRoom/RoomResourceManager.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// RoomResourceManager.h -// YuMi -// -// Created by P on 2024/12/25. -// - -#import - -@class SVGAVideoEntity; - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomResourceManager : NSObject - -+ (instancetype)sharedManager; - -- (void)cacheAPIData:(id)data; - -- (NSString *)loadMicNormalSkin:(NSString *)skinID isForLock:(BOOL)isLock; -- (NSString *)loadMicBossSkin:(NSString *)skinID isForLock:(BOOL)isLock; -- (SVGAVideoEntity *)loadMicSVGAVideo:(NSString *)effectID; - -- (void)updateCurrentSkinID:(NSInteger )skinID effectID:(NSInteger)effectID; - -- (UIImage *)loadMicBossSkinForLock:(BOOL)isLock; -- (UIImage *)loadMicNormalSKinForLock:(BOOL)isLock; -- (SVGAVideoEntity *)loadMicEffect; - -- (NSString *)loadGiftPanelNum:(NSInteger)pID; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/RoomResourceManager.m b/YuMi/Modules/YMRoom/RoomResourceManager.m deleted file mode 100644 index 39446e9..0000000 --- a/YuMi/Modules/YMRoom/RoomResourceManager.m +++ /dev/null @@ -1,200 +0,0 @@ -// -// RoomResourceManager.m -// YuMi -// -// Created by P on 2024/12/25. -// - -#import "RoomResourceManager.h" - -#import -#import "SDWebImageManager.h" -#import "RoomLevelInfoModel.h" - -@interface RoomResourceManager() - -@property (nonatomic, strong) NSOperationQueue *svgaParseOperationQueue; - -@property(nonatomic, copy) NSArray *roomMicInfos; -@property(nonatomic, copy) NSDictionary *giftPanelNums; -@property(nonatomic, strong) NSMutableDictionary *micSkins; -@property(nonatomic, strong) NSMutableDictionary *micBossSkins; -@property(nonatomic, strong) NSMutableDictionary *micNormalSkins; -@property(nonatomic, strong) NSMutableDictionary *micBossLockSkins; -@property(nonatomic, strong) NSMutableDictionary *micNormalLockSkins; -@property(nonatomic, strong) NSMutableDictionary *micEffectVideoItems; - -@property(nonatomic, assign) NSInteger currentSkinID; -@property(nonatomic, assign) NSInteger currentEffectID; - -@end - -@implementation RoomResourceManager - -+ (instancetype)sharedManager { - static RoomResourceManager *sharedManager = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - sharedManager = [[self alloc] init]; - // 初始化操作队列 - sharedManager.svgaParseOperationQueue = [[NSOperationQueue alloc] init]; - sharedManager.svgaParseOperationQueue.maxConcurrentOperationCount = 1; // 串行执行 - - sharedManager.micSkins = [NSMutableDictionary dictionary]; - sharedManager.micEffectVideoItems = [NSMutableDictionary dictionary]; - sharedManager.micBossSkins = [NSMutableDictionary dictionary]; - sharedManager.micNormalSkins = [NSMutableDictionary dictionary]; - sharedManager.micBossLockSkins = [NSMutableDictionary dictionary]; - sharedManager.micNormalLockSkins = [NSMutableDictionary dictionary]; - }); - return sharedManager; -} - -- (void)cacheAPIData:(id)data { - if (!data) { - return; - } - if ([data isKindOfClass:[NSDictionary class]] ) { - NSArray *array = data[@"roomMicDressList"]; - self.giftPanelNums = data[@"roomGiftPanelNums"]; - self.roomMicInfos = [RoomMicInfoModel modelsWithArray:array]; - for (RoomMicInfoModel *micInfo in self.roomMicInfos) { - switch (micInfo.dressType) { - case MicResourceType_Skin: { - [self preloadNormalSkin:micInfo.bossMicUrl forID:micInfo.id isForLock:NO isForBoss:YES]; - [self preloadNormalSkin:micInfo.normalMicUrl forID:micInfo.id isForLock:NO isForBoss:NO]; - [self preloadNormalSkin:micInfo.bossMicLockUrl forID:micInfo.id isForLock:YES isForBoss:YES]; - [self preloadNormalSkin:micInfo.normalMicLockUrl forID:micInfo.id isForLock:YES isForBoss:NO]; - } - break; - case MicResourceType_Effect: { - @kWeakify(self); - NSBlockOperation *preloadOperation = [NSBlockOperation blockOperationWithBlock:^{ - @kStrongify(self); - SVGAParser *p = [[SVGAParser alloc] init]; - @kWeakify(self); - [p parseWithURL:[NSURL URLWithString:micInfo.normalMicUrl] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - [self.micEffectVideoItems setObject:videoItem forKey:micInfo.id]; - } failureBlock:nil]; - }]; -#if DEBUG - preloadOperation.completionBlock = ^{ - NSLog(@"Preload SVGA Task completed for URL: %@", micInfo.normalMicUrl); - }; -#endif - [self.svgaParseOperationQueue addOperation:preloadOperation]; - } - break; - - default: - break; - } - } - } -} - -- (void)preloadNormalSkin:(NSString *)url - forID:(NSString *)skinID - isForLock:(BOOL)isForLock - isForBoss:(BOOL)isForBoss { - @kWeakify(self); - NSBlockOperation *preloadOperation = [NSBlockOperation blockOperationWithBlock:^{ -// SVGAParser *p = [[SVGAParser alloc] init]; - @kStrongify(self); - @kWeakify(self); - [[SDWebImageManager sharedManager] loadImageWithURL:[NSURL URLWithString:url] - options:SDWebImageRetryFailed | SDWebImageHighPriority | SDWebImageHighPriority - progress:nil - completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL) { - if (image) { - @kStrongify(self); - if (isForLock) { - if (isForBoss) { - [self.micBossLockSkins setObject:image forKey:skinID]; - } else { - [self.micNormalLockSkins setObject:image forKey:skinID]; - } - } else { - if (isForBoss) { - [self.micBossSkins setObject:image forKey:skinID]; - } else { - [self.micNormalSkins setObject:image forKey:skinID]; - } - } - } - }]; - }]; -#if DEBUG - preloadOperation.completionBlock = ^{ - NSLog(@"Preload Image Task completed for URL: %@", url); - }; -#endif - [self.svgaParseOperationQueue addOperation:preloadOperation]; -} - -- (NSString *)loadMicNormalSkin:(NSString *)skinID isForLock:(BOOL)isLock { - RoomMicInfoModel *micInfo = [self.micSkins objectForKey:skinID]; - if (micInfo) { - return isLock ? micInfo.normalMicLockUrl : micInfo.normalMicUrl; - } - return @""; -} - -- (NSString *)loadMicBossSkin:(NSString *)skinID isForLock:(BOOL)isLock { - RoomMicInfoModel *micInfo = [self.micSkins objectForKey:skinID]; - if (micInfo) { - return isLock ? micInfo.bossMicLockUrl : micInfo.bossMicUrl; - } - return @""; -} - -- (SVGAVideoEntity *)loadMicSVGAVideo:(NSString *)effectID { - SVGAVideoEntity *entity = [self.micEffectVideoItems objectForKey:effectID]; - return entity; -} - -- (void)updateCurrentSkinID:(NSInteger )skinID effectID:(NSInteger)effectID { - self.currentSkinID = skinID; - self.currentEffectID = effectID; -} - -//- (NSString *)loadMicNormalSkinForLock:(BOOL)isLock { -// return [self loadMicNormalSkin:@(self.currentSkinID).stringValue -// isForLock:isLock]; -//} -// -//- (NSString *)loadMicBossSkinForLock:(BOOL)isLock { -// return [self loadMicBossSkin:@(self.currentSkinID).stringValue -// isForLock:isLock]; -//} - -- (UIImage *)loadMicBossSkinForLock:(BOOL)isLock { - if (isLock) { - return [self.micBossLockSkins objectForKey:@(self.currentSkinID).stringValue]; - } else { - if (self.currentSkinID == 0) { - return kImage(@"room_boss_mic"); - } - return [self.micBossSkins objectForKey:@(self.currentSkinID).stringValue]; - } -} - -- (UIImage *)loadMicNormalSKinForLock:(BOOL)isLock { - if (isLock) { - return [self.micNormalLockSkins objectForKey:@(self.currentSkinID).stringValue]; - } else { - return [self.micNormalSkins objectForKey:@(self.currentSkinID).stringValue]; - } -} - -- (SVGAVideoEntity *)loadMicEffect { - return [self loadMicSVGAVideo:@(self.currentEffectID).stringValue]; -} - -- (NSString *)loadGiftPanelNum:(NSInteger)pID { - return [self.giftPanelNums objectForKey:@(pID).stringValue]; -} - -@end - diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Api/Api+AcrossRoomPK.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/Api/Api+AcrossRoomPK.h deleted file mode 100644 index 5733519..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Api/Api+AcrossRoomPK.h +++ /dev/null @@ -1,52 +0,0 @@ -// -// Api+AcrossRoomPK.h -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (AcrossRoomPK) - -/// 搜索PK的房间列表 -/// @param completion 完成 -/// @param erbanNo 要搜索的房主的id -/// @param roomUid 房主的uid -/// @param pageNum 当前的页数 -/// @param pageSize 一页多少个 -+ (void)searchAcrossRoomPKRoomList:(HttpRequestHelperCompletion)completion - erbanNo:(NSString *)erbanNo - roomUid:(NSString *)roomUid - pageNum:(NSString *)pageNum - pageSize:(NSString *)pageSize; - -/// 获取可以PK的房间列表 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param pageNum 当前的页数 -/// @param pageSize 一页多少个 -+ (void)getAcrossRoomPKRoomList:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - pageNum:(NSString *)pageNum - pageSize:(NSString *)pageSize; - -/// 开启一轮PK -/// @param completion 完成 -/// @param acceptUid pk对方的uid -/// @param duration 持续的时间 分钟 -/// @param inviteUid 邀请房间的房主的id -/// @param operateUid 操作者的uid -/// @param playDesc 描述 -+ (void)beginAcrossRoomPK:(HttpRequestHelperCompletion)completion - acceptUid:(NSString *)acceptUid - duration:(NSString *)duration - inviteUid:(NSString *)inviteUid - operateUid:(NSString *)operateUid - playDesc:(NSString *)playDesc; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Api/Api+AcrossRoomPK.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/Api/Api+AcrossRoomPK.m deleted file mode 100644 index c333aac..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Api/Api+AcrossRoomPK.m +++ /dev/null @@ -1,45 +0,0 @@ -// -// Api+AcrossRoomPK.m -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import "Api+AcrossRoomPK.h" -#import -@implementation Api (AcrossRoomPK) - - -/// 搜索PK的房间列表 -/// @param completion 完成 -/// @param erbanNo 要搜索的房主的id -/// @param roomUid 房主的uid -/// @param pageNum 当前的页数 -/// @param pageSize 一页多少个 -+ (void)searchAcrossRoomPKRoomList:(HttpRequestHelperCompletion)completion erbanNo:(NSString *)erbanNo roomUid:(NSString *)roomUid pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize { - NSString * fang = [NSString stringFromBase64String:@"c2VhcmNoL3Blcm1pdFJvb20="];///search/permitRoom - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, erbanNo, roomUid, pageNum, pageSize, nil]; -} - -/// 获取可以PK的房间列表 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param pageNum 当前的页数 -/// @param pageSize 一页多少个 -+ (void)getAcrossRoomPKRoomList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize { - NSString * fang = [NSString stringFromBase64String:@"c2VhcmNoL3Blcm1pdFJvb20="];///search/permitRoom - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, roomUid, pageNum, pageSize, nil]; -} - -/// 开启一轮PK -/// @param completion 完成 -/// @param acceptUid pk对方的uid -/// @param duration 持续的时间 分钟 -/// @param inviteUid 邀请房间的房主的id -/// @param operateUid 操作者的uid -/// @param playDesc 描述 -+ (void)beginAcrossRoomPK:(HttpRequestHelperCompletion)completion acceptUid:(NSString *)acceptUid duration:(NSString *)duration inviteUid:(NSString *)inviteUid operateUid:(NSString *)operateUid playDesc:(NSString *)playDesc { - NSString * fang = [NSString stringFromBase64String:@"Y3Jvc3Nyb29tcGtyb3VuZC9pbml0aWF0ZUNoYWxsZW5nZQ=="];///crossroompkround/initiateChallenge - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, acceptUid, duration, inviteUid, operateUid, playDesc, nil]; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKInfoModel.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKInfoModel.h deleted file mode 100644 index 4628b68..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKInfoModel.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// AcrossRoomPkInfoModel.h -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface AcrossRoomPKInfoModel : PIBaseModel -@property (nonatomic, copy) NSString * roomId; -@property (nonatomic, copy) NSString * uid; -@property (nonatomic, copy) NSString * roomUid; -@property (nonatomic, copy) NSString *title; -///头像 -@property (nonatomic, copy) NSString *avatar; -///昵称 -@property (nonatomic, copy) NSString *nick; -///二般号 -@property (nonatomic, copy) NSString * erbanNo; -///是否选中 -@property (nonatomic, assign) BOOL hadSelected; -///是否PK中 -@property (nonatomic, assign) BOOL crossPking; -///是否在线 -@property (nonatomic, assign) BOOL valid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKInfoModel.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKInfoModel.m deleted file mode 100644 index 12e9003..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// AcrossRoomPkInfoModel.m -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import "AcrossRoomPKInfoModel.h" - -@implementation AcrossRoomPKInfoModel - -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPanelModel.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPanelModel.h deleted file mode 100644 index d21c18b..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPanelModel.h +++ /dev/null @@ -1,102 +0,0 @@ -// -// AcrossRoomPKPanelModel.h -// YUMI -// -// Created by YUMI on 2022/1/11. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSUInteger, AcrossRoomPkType) { - AcrossRoomPkTypeLicnese = 1, ///牌照房PK - AcrossRoomPkTypeAnchor, ///个播PK -}; - -///PK处于什么阶段 -typedef NS_ENUM(NSUInteger, AcrossRoomPkStateType) { - AcrossRoomPkStateTypePking = 1,//PK中 - AcrossRoomPkStateTypePenalty, //惩罚阶段 - AcrossRoomPkStateTypePenaltyEnd,//惩罚结束 - AcrossRoomPkStateTypePkEnd, -}; - -///个播PK对方麦克风状态 -typedef NS_ENUM(NSUInteger, AnchorPKOtherMicStatus) { - AnchorPKOtherMicStatus_Close = 0,//关闭 - AnchorPKOtherMicStatus_Open = 1,//开启 -}; - -@class AcrossRoomPkRankModel; -@interface AcrossRoomPKPanelModel : PIBaseModel -///当前时间 -@property (nonatomic, assign) long now; -///对方流水 -@property (nonatomic, assign) long long aAmount; -///对方头像 -@property (nonatomic, copy) NSString *aAvatar; -/// 所有流水 -@property (nonatomic, assign) long long allAmount; -///对方进度条比例 -@property (nonatomic, assign) float aPercent; -///对方魅力榜 -@property (nonatomic, strong) NSArray *arRank; -///对方贡献榜 -@property (nonatomic, strong) NSArray *asRank; -///对方标题 -@property (nonatomic, copy) NSString *aTitle; -///对方UID -@property (nonatomic, copy) NSString *aUid; -///我方流水 -@property (nonatomic, assign) long long cAmount; -///我方头像 -@property (nonatomic, copy) NSString *cAvatar; -///我方进度条比例 -@property (nonatomic, assign) float cPercent; -///我方魅力榜 -@property (nonatomic, strong) NSArray *crRank; -///我方贡献榜 -@property (nonatomic, strong) NSArray *csRank; -///我方标题 -@property (nonatomic, copy) NSString *cTitle; -///我方UID -@property (nonatomic, copy) NSString * cUid; -///结束时间戳 -@property (nonatomic, assign) long long endTime; -///惩罚结束时间戳 -@property (nonatomic, assign) long long penaltyEndTime; -/// 赢家uid -@property (nonatomic, copy) NSString * winUid; -///是否异常结束 -@property (nonatomic, assign) BOOL isForce; -///PK类型 1：牌照房 2：个播房 -@property (nonatomic, assign) AcrossRoomPkType pkType; -//PK进行状态(1：pk中 2：惩罚中） -@property (nonatomic, assign) AcrossRoomPkStateType pkState; -///场次id -@property (nonatomic, assign) NSInteger roundId; -///对方的房间id -@property (nonatomic, copy) NSString *aRoomId; -///对方房主昵称 -@property (nonatomic, copy) NSString *aNick; -///我方房主昵称 -@property (nonatomic, copy) NSString *cNick; -///个播PK对方麦克风状态 -@property (nonatomic, assign) AnchorPKOtherMicStatus aMicStatus; -@end - -@interface AcrossRoomPkRankModel : PIBaseModel -///金币 -@property (nonatomic, copy) NSString *amount; -///性别 -@property (nonatomic, assign) GenderType gender; -///昵称 -@property (nonatomic, copy) NSString *nick; -///头像 -@property (nonatomic, copy) NSString *avatar; -///Uid -@property (nonatomic, copy) NSString * uid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPanelModel.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPanelModel.m deleted file mode 100644 index 00b071b..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPanelModel.m +++ /dev/null @@ -1,32 +0,0 @@ -// -// AcrossRoomPKPanelModel.m -// YUMI -// -// Created by YUMI on 2022/1/11. -// - -#import "AcrossRoomPKPanelModel.h" - -@implementation AcrossRoomPKPanelModel - -///扩展方法 按需索取 重写即可 -///如果一个模型中 包含一个数组 数组中是另一个模型 -+ (NSDictionary *)objectClassInArray { - return @{@"arRank" : [AcrossRoomPkRankModel class], - @"asRank" : [AcrossRoomPkRankModel class], - @"crRank" : [AcrossRoomPkRankModel class], - @"csRank" : [AcrossRoomPkRankModel class] - }; -} -/////如果一个模型中需要字段映射的话 比如id -> ID name -> other.name -//+ (NSDictionary *)replacedKeyFromPropertyName { -// return @{@"aMicStatus":@"amicStatus"}; -//} -@end - - -@implementation AcrossRoomPkRankModel - - - -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPrizeModel.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPrizeModel.h deleted file mode 100644 index 60f7b1c..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPrizeModel.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// AcrossRoomPKPrizeModel.h -// YUMI -// -// Created by YUMI on 2022/1/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, AcrossRoomPKType) { - AcrossRoomPKTypeNormal = 0, - AcrossRoomPKTypeAnchor, -}; -@interface AcrossRoomPKPrizeModel : PIBaseModel -///赢方UID -@property (nonatomic, copy) NSString * winUid; -///输方UID -@property (nonatomic, copy) NSString * failUid; -///赢方头像 -@property (nonatomic, copy) NSString *winAvatar; -///输方头像 -@property (nonatomic, copy) NSString *failAvatar; -///赢方标题 -@property (nonatomic, copy) NSString *winTitle; -///输方标题 -@property (nonatomic, copy) NSString *failTitle; -///赢方昵称 -@property (nonatomic, copy) NSString *winNick; -///输方昵称 -@property (nonatomic, copy) NSString *failNick; -///描述 -@property (nonatomic, copy) NSString *msg; -///PK类型（0 ：普通PK， 1：个播PK） -@property (nonatomic, assign) AcrossRoomPKType pkType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPrizeModel.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPrizeModel.m deleted file mode 100644 index 53a66c6..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPrizeModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// AcrossRoomPKPrizeModel.m -// YUMI -// -// Created by YUMI on 2022/1/12. -// - -#import "AcrossRoomPKPrizeModel.h" - -@implementation AcrossRoomPKPrizeModel - -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Presenter/XPAcrossRoomPKPresenter.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/Presenter/XPAcrossRoomPKPresenter.h deleted file mode 100644 index d45c577..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Presenter/XPAcrossRoomPKPresenter.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// YMAcrossRoomPKPresenter.h -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAcrossRoomPKPresenter : BaseMvpPresenter -/// 开启跨房PK -/// @param roomUid 当前房间的房主uid -/// @param duration 持续的时间 -/// @param acceptUid 接收者的uid -/// @param playDesc 玩法 -- (void)beginAcrossRoomPK:(NSString *)roomUid - duration:(NSInteger)duration - acceptUid:(NSString *)acceptUid - playDesc:(NSString *)playDesc; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Presenter/XPAcrossRoomPKPresenter.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/Presenter/XPAcrossRoomPKPresenter.m deleted file mode 100644 index 75c4c3d..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Presenter/XPAcrossRoomPKPresenter.m +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMAcrossRoomPKPresenter.m -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import "XPAcrossRoomPKPresenter.h" -#import "Api+AcrossRoomPK.h" -#import "XPAcrossRoomProtocol.h" -#import "AccountInfoStorage.h" - -@implementation XPAcrossRoomPKPresenter - - -/// 开启跨房PK -/// @param roomUid 当前房间的房主uid -/// @param duration 持续的时间 -/// @param acceptUid 接收者的uid -/// @param playDesc 玩法 -- (void)beginAcrossRoomPK:(NSString *)roomUid duration:(NSInteger)duration acceptUid:(NSString *)acceptUid playDesc:(NSString *)playDesc { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * time = [NSString stringWithFormat:@"%ld", duration]; - [Api beginAcrossRoomPK:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] beginAcrossRoomPKSuccess]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] beginAcrossRoomPKFail:msg]; - } showLoading:YES errorToast:NO] acceptUid:acceptUid duration:time inviteUid:roomUid operateUid:uid playDesc:playDesc]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Protocol/XPAcrossRoomProtocol.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/Protocol/XPAcrossRoomProtocol.h deleted file mode 100644 index 2d9ed78..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/Protocol/XPAcrossRoomProtocol.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMAcrossRoomProtocol.h -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPAcrossRoomProtocol - -///开启咵房pk成功 -- (void)beginAcrossRoomPKSuccess; -///开启跨房Pk失败 -- (void)beginAcrossRoomPKFail:(NSString *)message; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKEmptyTableViewCell.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKEmptyTableViewCell.h deleted file mode 100644 index d2c091f..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKEmptyTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMAcrossRoomPKEmptyTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAcrossRoomPKEmptyTableViewCell : UITableViewCell - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKEmptyTableViewCell.m deleted file mode 100644 index 516ea77..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKEmptyTableViewCell.m +++ /dev/null @@ -1,71 +0,0 @@ -// -// YMAcrossRoomPKEmptyTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import "XPAcrossRoomPKEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPAcrossRoomPKEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPAcrossRoomPKEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(50); - make.centerX.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(200, 200)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImage imageNamed:@""]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKEmptyTableViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = UIColorFromRGB(0x999999); - } - return _titleLabel; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.h deleted file mode 100644 index a160e9e..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMAcrossRoomPKTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class AcrossRoomPKInfoModel,XPAcrossRoomPKTableViewCell; -@protocol XPAcrossRoomPKTableViewCellDelegate -///点击了选择的按钮 -- (void)xPAcrossRoomPKTableViewCell:(XPAcrossRoomPKTableViewCell *)view didChooseRoom:(AcrossRoomPKInfoModel *)roomInfo; -@end -@interface XPAcrossRoomPKTableViewCell : UITableViewCell -@property (nonatomic,strong) AcrossRoomPKInfoModel *roomPKInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.m deleted file mode 100644 index 741ab6f..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.m +++ /dev/null @@ -1,131 +0,0 @@ -// -// YMAcrossRoomPKTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import "XPAcrossRoomPKTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -///Model -#import "AcrossRoomPKInfoModel.h" - -@interface XPAcrossRoomPKTableViewCell () -///头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -///选择的 -@property (nonatomic, strong) UIButton *selectButton; -///名字 -@property (nonatomic, strong) UILabel *nameLabel; -///ID -@property (nonatomic, strong) UILabel *idLabel; - -@end - -@implementation XPAcrossRoomPKTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if (self) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self initSubViews]; - [self initSubViewConstraints]; - - } - return self; -} -#pragma mark - Private Method - -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nameLabel]; - [self.contentView addSubview:self.idLabel]; - [self.contentView addSubview:self.selectButton]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(13); - make.width.height.mas_equalTo(60); - make.centerY.mas_equalTo(self.contentView); - }]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(6); - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY); - make.height.mas_equalTo(14); - make.trailing.mas_equalTo(self.selectButton.mas_leading).mas_offset(-5); - }]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameLabel); - make.top.mas_equalTo(self.nameLabel.mas_bottom).mas_offset(7); - }]; - - [self.selectButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-12); - make.centerY.mas_equalTo(self.avatarImageView); - make.width.height.mas_equalTo(30); - }]; -} - -#pragma mark - Event Response -- (void)selectButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPAcrossRoomPKTableViewCell:didChooseRoom:)]) { - [self.delegate xPAcrossRoomPKTableViewCell:self didChooseRoom:self.roomPKInfo]; - } -} -#pragma mark - Getters And Setters -- (void)setRoomPKInfo:(AcrossRoomPKInfoModel *)roomPKInfo { - _roomPKInfo = roomPKInfo; - self.avatarImageView.imageUrl = _roomPKInfo.avatar; - self.nameLabel.text = _roomPKInfo.title; - self.idLabel.text = [NSString stringWithFormat:@"ID：%@", _roomPKInfo.erbanNo]; - self.selectButton.selected = _roomPKInfo.hadSelected; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 60/2; - } - return _avatarImageView; -} - -- (UIButton *)selectButton { - if (!_selectButton) { - _selectButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_selectButton setImage:[UIImage imageNamed:@"roomg_across_pk_choose_normal"] forState:UIControlStateNormal]; - [_selectButton setImage:[UIImage imageNamed:@"roomg_across_pk_choose_select"] forState:UIControlStateSelected]; - [_selectButton addTarget:self action:@selector(selectButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _selectButton.userInteractionEnabled = YES; - } - return _selectButton; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [[UILabel alloc] init]; - _nameLabel.textColor = [UIColor whiteColor]; - _nameLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - } - return _nameLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.textColor = [UIColor whiteColor]; - _idLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - } - return _idLabel; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKCountDownView.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKCountDownView.h deleted file mode 100644 index 063f253..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKCountDownView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMAcrossRoomPKCountDownView.h -// YUMI -// -// Created by YUMI on 2022/7/14. -// 跨房PK预约倒计时 - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAcrossRoomPKCountDownView : UIView - -@property (nonatomic, assign) long long startTime; -///背景 -@property (nonatomic, strong) UIImageView *backImageView; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKCountDownView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKCountDownView.m deleted file mode 100644 index 4d3dde6..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKCountDownView.m +++ /dev/null @@ -1,151 +0,0 @@ -// -// YMAcrossRoomPKCountDownView.m -// YUMI -// -// Created by YUMI on 2022/7/14. -// - -#import "XPAcrossRoomPKCountDownView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" - -@interface XPAcrossRoomPKCountDownView() - -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///显示倒计时 -@property (nonatomic, strong) UILabel *timeLabel; -///倒计时 -@property (strong, nonatomic) dispatch_source_t timer; - -@end - -@implementation XPAcrossRoomPKCountDownView - -- (void)dealloc { - if (self.timer) { - dispatch_source_cancel(self.timer); - self.timer = nil; - } -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.timeLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(52); - make.height.mas_equalTo(52); - }]; - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(25); - make.height.mas_equalTo(10); - }]; - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.titleLabel); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(2); - make.height.mas_equalTo(10); - }]; -} - -#pragma mark - 倒计时 -- (void)openCountdownWithTime:(long)time { - __block long tempTime = time; //倒计时时间 - if (self.timer == nil) { - @kWeakify(self); - dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - self.timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - dispatch_source_set_timer(self.timer,dispatch_walltime(NULL, 0),1.0*NSEC_PER_SEC, 0); //每秒执行 - dispatch_source_set_event_handler(self.timer, ^{ - @kStrongify(self); - if(tempTime <= 0){ //倒计时结束，关闭 - dispatch_source_cancel(self.timer); - self.timer = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [self removeFromSuperview]; - }); - } else { - dispatch_async(dispatch_get_main_queue(), ^{ - //设置按钮显示读秒效果 - [self acrossRoomPKCutdownOpen:tempTime]; - }); - tempTime--; - } - }); - dispatch_resume(self.timer); - } -} - -- (void)acrossRoomPKCutdownOpen:(NSInteger)time { - NSInteger minute = time / 60; - NSInteger second = (time % 60); - NSInteger hour = time/3600; - NSString *timeStr; - if (hour > 0) { - minute = minute % 60; - timeStr = [NSString stringWithFormat:@"%02zd:%02zd:%02zd", hour, minute, second]; - } else { - timeStr = [NSString stringWithFormat:@"%02zd:%02zd", minute, second]; - } - self.timeLabel.text = timeStr; - if (time <= 30) { - self.timeLabel.textColor = UIColorFromRGB(0xFF87A1); - } else { - self.timeLabel.textColor = UIColorFromRGB(0xFFF600); - } -} - -- (void)setStartTime:(long long)startTime { - long long time2 = (long long)([[NSDate date] timeIntervalSince1970]*1000); - long aTime = (long)(startTime - time2) / 1000; - [self openCountdownWithTime:aTime]; -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.image = [UIImage imageNamed:@"acrossPK_countDown_bg"]; - } - return _backImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:10]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKCountDownView0"); - } - return _titleLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _timeLabel.textColor = UIColorFromRGB(0xFFF333); - _timeLabel.text = @"00:00"; - } - return _timeLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.h deleted file mode 100644 index dbc111a..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMAcrossRoomPKForceEndResultView.h -// YUMI -// -// Created by YUMI on 2022/1/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class AcrossRoomPKPanelModel; -@interface XPAcrossRoomPKForceEndResultView : UIView -@property (nonatomic, strong) AcrossRoomPKPanelModel *data; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.m deleted file mode 100644 index 621b1c8..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.m +++ /dev/null @@ -1,236 +0,0 @@ -// -// YMAcrossRoomPKForceEndResultView.m -// YUMI -// -// Created by YUMI on 2022/1/12. -// - -#import "XPAcrossRoomPKForceEndResultView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "TTPopup.h" -///Model -#import "AcrossRoomPKPanelModel.h" - -@interface XPAcrossRoomPKForceEndResultView() - -/** bgImageView */ -@property (nonatomic, strong) UIImageView *bgImageView; -///关闭 -@property (nonatomic, strong) UIButton *closeBtn; -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///红队头像 -@property (nonatomic, strong) NetImageView *redHeadImageView; -///红队厅名 -@property (nonatomic, strong) UILabel *redRoomTitleLabel; -///红队礼物值 -@property (nonatomic, strong) UILabel *redValueLabel; - -///蓝队赢icon -@property (nonatomic, strong) UIImageView *blueWinIconView; -///蓝队头像 -@property (nonatomic, strong) NetImageView *blueHeadImageView; -///蓝队厅名 -@property (nonatomic, strong) UILabel *blueRoomTitleLabel; -///蓝队礼物值 -@property (nonatomic, strong) UILabel *blueValueLabel; - -@end - -@implementation XPAcrossRoomPKForceEndResultView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initView]; - [self initConstrations]; - } - return self; -} - -- (void)initView { - [self addSubview:self.bgImageView]; - [self addSubview:self.closeBtn]; - [self addSubview:self.titleLabel]; - - [self addSubview:self.redHeadImageView]; - [self addSubview:self.redRoomTitleLabel]; - [self addSubview:self.redValueLabel]; - - [self addSubview:self.blueHeadImageView]; - [self addSubview:self.blueRoomTitleLabel]; - [self addSubview:self.blueValueLabel]; -} - -- (void)initConstrations { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(26); - make.height.mas_equalTo(18); - }]; - [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-12); - make.top.mas_equalTo(12); - make.width.height.mas_equalTo(33); - }]; - - UIImageView *pkMark = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pk_vs_mark_big"]]; - pkMark.contentMode = UIViewContentModeScaleAspectFit; - [self addSubview:pkMark]; - [pkMark mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self).offset(-40); - make.size.mas_equalTo(CGSizeMake(118, 94)); - }]; - - [self.redHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(70); - make.leading.mas_equalTo(12.5); - make.width.height.mas_equalTo(68); - }]; - [self.redRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.redHeadImageView.mas_bottom).mas_offset(8); - make.leading.mas_equalTo(self); - make.width.mas_equalTo(70); - make.height.mas_equalTo(14); - }]; - [self.redValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.redRoomTitleLabel); - make.top.mas_equalTo(self.redRoomTitleLabel.mas_bottom).offset(6); - make.height.mas_equalTo(14); - }]; - - [self.blueHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(70); - make.trailing.mas_equalTo(-12.5); - make.width.height.mas_equalTo(68); - }]; - [self.blueRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.blueHeadImageView.mas_bottom).mas_offset(8); - make.width.mas_equalTo(70); - make.height.mas_equalTo(14); - make.trailing.mas_equalTo(self); - }]; - [self.blueValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.blueRoomTitleLabel); - make.top.mas_equalTo(self.blueRoomTitleLabel.mas_bottom).offset(6); - make.height.mas_equalTo(12); - }]; -} - -- (void)setData:(AcrossRoomPKPanelModel *)data { - if (data) { - self.redHeadImageView.imageUrl = data.cAvatar; - self.blueHeadImageView.imageUrl = data.aAvatar; - self.redRoomTitleLabel.text = data.cTitle; - self.blueRoomTitleLabel.text = data.aTitle; - self.redValueLabel.text = [NSString stringWithFormat:@"%lld", data.cAmount]; - self.blueValueLabel.text = [NSString stringWithFormat:@"%lld", data.aAmount]; - } -} - -- (void)onCloseBtnClick:(UIButton *)btn { - [TTPopup dismiss]; -} - -#pragma mark - getters and setters -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage imageNamed:@"room_acroos_pk_focus_end_bg"]; - } - return _bgImageView; -} - -- (UIButton *)closeBtn { - if (!_closeBtn) { - _closeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeBtn addTarget:self action:@selector(onCloseBtnClick:) forControlEvents:UIControlEventTouchUpInside]; - [_closeBtn setImage:[UIImage imageNamed:@"room_acroos_pk_focus_end_colse_icon"] forState:UIControlStateNormal]; - } - return _closeBtn; -} - -- (NetImageView *)redHeadImageView { - if (!_redHeadImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _redHeadImageView = [[NetImageView alloc] initWithConfig:config]; - _redHeadImageView.layer.cornerRadius = 34; - _redHeadImageView.layer.masksToBounds = YES; - _redHeadImageView.layer.borderWidth = 1; - _redHeadImageView.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _redHeadImageView; -} - -- (UILabel *)redRoomTitleLabel { - if (!_redRoomTitleLabel) { - _redRoomTitleLabel = [[UILabel alloc] init]; - _redRoomTitleLabel.textColor = [UIColor whiteColor]; - _redRoomTitleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _redRoomTitleLabel.textAlignment = NSTextAlignmentCenter; - } - return _redRoomTitleLabel; -} -- (UILabel *)redValueLabel { - if (!_redValueLabel) { - _redValueLabel = [[UILabel alloc] init]; - _redValueLabel.textColor = [UIColor whiteColor]; - _redValueLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - _redValueLabel.textAlignment = NSTextAlignmentCenter; - } - return _redValueLabel; -} - -- (NetImageView *)blueHeadImageView { - if (!_blueHeadImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _blueHeadImageView = [[NetImageView alloc] initWithConfig:config]; - _blueHeadImageView.layer.cornerRadius = 34; - _blueHeadImageView.layer.masksToBounds = YES; - _blueHeadImageView.layer.borderWidth = 1; - _blueHeadImageView.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _blueHeadImageView; -} - -- (UILabel *)blueRoomTitleLabel { - if (!_blueRoomTitleLabel) { - _blueRoomTitleLabel = [[UILabel alloc] init]; - _blueRoomTitleLabel.textColor = [UIColor whiteColor]; - _blueRoomTitleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _blueRoomTitleLabel.textAlignment = NSTextAlignmentCenter; - } - return _blueRoomTitleLabel; -} -- (UILabel *)blueValueLabel { - if (!_blueValueLabel) { - _blueValueLabel = [[UILabel alloc] init]; - _blueValueLabel.textColor = [UIColor whiteColor]; - _blueValueLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - _blueValueLabel.textAlignment = NSTextAlignmentCenter; - } - return _blueValueLabel; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightBold]; - _titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKForceEndResultView0"); - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteResultView.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteResultView.h deleted file mode 100644 index 81be969..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteResultView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMAcrossRoomPKInviteResultView.h -// YUMI -// -// Created by YUMI on 2022/1/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - - -@interface XPAcrossRoomPKInviteResultView : UIView -///是否是接受 -@property (nonatomic,assign) BOOL is_XP_Accept; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteResultView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteResultView.m deleted file mode 100644 index 83f1b93..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteResultView.m +++ /dev/null @@ -1,97 +0,0 @@ -// -// YMAcrossRoomPKInviteResultView.m -// YUMI -// -// Created by YUMI on 2022/1/11. -// - -#import "XPAcrossRoomPKInviteResultView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPAcrossRoomPKInviteResultView () -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///关闭 -@property (nonatomic, strong) UIButton *closeButton; -///背景 -@property (nonatomic, strong) UIImageView *backImageView; - -@end - -@implementation XPAcrossRoomPKInviteResultView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.closeButton]; -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(27.5); - }]; - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.trailing.mas_equalTo(-12); - make.width.height.mas_equalTo(16); - }]; -} - -#pragma mark - Event Response -- (void)closeButtonAction:(UIButton *)button { - [self removeFromSuperview]; -} -#pragma mark - getter -- (void)setIs_XP_Accept:(BOOL)is_XP_Accept{ - _is_XP_Accept = is_XP_Accept; - if (_is_XP_Accept) { - self.titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteResultView0"); - self.backImageView.image = [UIImage imageNamed:@"room_across_pk_invite_result_accept_bg"]; - } else { - self.titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteResultView1"); - self.backImageView.image = [UIImage imageNamed:@"room_across_pk_invite_result_bg"]; - } -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - } - return _backImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightBold]; - } - return _titleLabel; -} - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [[UIButton alloc] init]; - [_closeButton setImage:[UIImage imageNamed:@"room_across_pk_invite_result_close"] forState:UIControlStateNormal]; - [_closeButton addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.h deleted file mode 100644 index 3350e2e..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMAcrossRoomPKInviteView.h -// YUMI -// -// Created by YUMI on 2022/1/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAcrossRoomPKInviteView : UIView -///房主的uid -@property (nonatomic,copy) NSString *roomUid; -///数据源 -@property (nonatomic,copy) NSDictionary *dataDic; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.m deleted file mode 100644 index cb3fccd..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.m +++ /dev/null @@ -1,372 +0,0 @@ -// -// YMAcrossRoomPKInviteView.m -// YUMI -// -// Created by YUMI on 2022/1/11. -// - -#import "XPAcrossRoomPKInviteView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "Api+Room.h" -#import "XNDJTDDLoadingTool.h" - -@interface XPAcrossRoomPKInviteSubView : UIView -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///内容 -@property (nonatomic,strong) UILabel *contentLabel; - -@end - -@implementation XPAcrossRoomPKInviteSubView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.titleLabel]; - [self addSubview:self.contentLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(17); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(50); - make.top.mas_equalTo(self); - make.leading.mas_equalTo(self); - }]; - - UILabel *colonLabel = [[UILabel alloc] init]; - colonLabel.text = @": "; - colonLabel.font = self.titleLabel.font; - colonLabel.textColor = self.titleLabel.textColor; - [self addSubview:colonLabel]; - [colonLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel); - make.leading.mas_equalTo(self.titleLabel.mas_trailing); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel.mas_trailing).offset(15); - make.top.mas_equalTo(self); - make.trailing.mas_equalTo(self).offset(8); - }]; -} - -#pragma mark - Getters And Setters - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = UIColorFromRGB(0xffffff); - _titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteView0"); - } - return _titleLabel; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[UILabel alloc] init]; - _contentLabel.textColor = UIColorFromRGB(0xFFF7C0); - _contentLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - } - return _contentLabel; -} - -@end - -@interface XPAcrossRoomPKInviteView () -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///邀请方 -@property (nonatomic,strong) XPAcrossRoomPKInviteSubView *inviteView; -///PK时长 -@property (nonatomic,strong) XPAcrossRoomPKInviteSubView *timeView; -///PK玩法 -@property (nonatomic,strong) XPAcrossRoomPKInviteSubView *descView; -///操作按钮的容器 -@property (nonatomic,strong) UIStackView *operaStackView; -///拒绝 -@property (nonatomic, strong) UIButton *rejectButton; -///接受 -@property (nonatomic, strong) UIButton *acceptButton; -///背景 -@property (nonatomic, strong) UIImageView *backImageView; -///倒计时 -@property (nonatomic, strong) UIButton *countDownButton; -//拒绝邀请 -@property (strong, nonatomic) dispatch_source_t inviteTimer; - -@end - -@implementation XPAcrossRoomPKInviteView - -- (void)dealloc { - if (self.inviteTimer != nil) { - dispatch_source_cancel(self.inviteTimer); - self.inviteTimer = nil; - } -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)initSubViews { - [self addSubview:self.backImageView]; - - [self addSubview:self.titleLabel]; - [self.backImageView addSubview:self.stackView]; - [self.backImageView addSubview:self.operaStackView]; - [self.backImageView addSubview:self.countDownButton]; - - [self.stackView addArrangedSubview:self.inviteView]; - [self.stackView addArrangedSubview:self.timeView]; - [self.stackView addArrangedSubview:self.descView]; - - [self.operaStackView addArrangedSubview:self.rejectButton]; - [self.operaStackView addArrangedSubview:self.acceptButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(290); - make.height.mas_equalTo(192); - }]; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(27); - }]; - - [self.countDownButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.titleLabel); - make.trailing.mas_equalTo(-34); - make.width.mas_equalTo(40); - make.height.mas_equalTo(17); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backImageView).inset(28); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(18); - }]; - - [self.operaStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backImageView).inset(28); - make.height.mas_equalTo(38); - make.top.mas_equalTo(self.stackView.mas_bottom).offset(21); - }]; -} - -#pragma mark - Event Response -- (void)acceptButtonAction:(UIButton *)sender { - NSString *roundId = self.dataDic[@"roundId"]; - [Api handleAcrossRoomPKInvite:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - dispatch_source_cancel(self.inviteTimer); - self.inviteTimer = nil; - [self removeFromSuperview]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:self.roomUid roundId:roundId isAccept:@"1"]; -} - -- (void)rejectButtonAction:(UIButton *)sender { - NSString *roundId = self.dataDic[@"roundId"]; - [Api handleAcrossRoomPKInvite:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - dispatch_source_cancel(self.inviteTimer); - self.inviteTimer = nil; - [self removeFromSuperview]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:self.roomUid roundId:roundId isAccept:@"0"]; -} - -#pragma mark - getter -- (void)setDataDic:(NSDictionary *)dataDic { - _dataDic = dataDic; - if (_dataDic.allKeys.count > 0) { - self.inviteView.contentLabel.text = _dataDic[@"inviteRoomTitle"]; - self.timeView.contentLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAcrossRoomPKInviteView1"), _dataDic[@"pkDuration"]]; - NSString *desc = _dataDic[@"pkDesc"]; - if (desc.length > 0) { - self.descView.hidden = NO; - self.descView.contentLabel.text = desc; - [self mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(211); - }]; - } else { - self.descView.hidden = YES; - } - - if (_inviteTimer != nil) { - dispatch_source_cancel(_inviteTimer); - } - __block NSInteger time = 10; //倒计时时间 - dispatch_queue_t queue = dispatch_get_global_queue(0, 0); - _inviteTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - @kWeakify(self); - dispatch_source_set_timer(_inviteTimer,dispatch_walltime(NULL, 0),1.0*NSEC_PER_SEC, 0); //每秒执行 - dispatch_source_set_event_handler(_inviteTimer, ^{ - if(time <= 0){ //倒计时结束，关闭 - dispatch_source_cancel(self.inviteTimer); - self.inviteTimer = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self removeFromSuperview]; - - }); - }else{ - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self.countDownButton setTitle:[NSString stringWithFormat:@"%ld", time] forState:UIControlStateNormal]; - }); - time--; - } - }); - dispatch_resume(_inviteTimer); - } -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"room_across_pk_invite_bg"]; - } - return _backImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightBold]; - _titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteView2"); - } - return _titleLabel; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentLeading; - _stackView.spacing = 10; - } - return _stackView; -} - -- (XPAcrossRoomPKInviteSubView *)inviteView { - if (!_inviteView) { - _inviteView = [[XPAcrossRoomPKInviteSubView alloc] init]; - _inviteView.titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteView3"); - } - return _inviteView; -} - -- (XPAcrossRoomPKInviteSubView *)timeView { - if (!_timeView) { - _timeView = [[XPAcrossRoomPKInviteSubView alloc] init]; - _timeView.titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteView4"); - } - return _timeView; -} - -- (XPAcrossRoomPKInviteSubView *)descView { - if (!_descView) { - _descView = [[XPAcrossRoomPKInviteSubView alloc] init]; - _descView.titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteView5"); - } - return _descView; -} - -- (UIButton *)countDownButton { - if (!_countDownButton) { - _countDownButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_countDownButton setTitleColor:UIColorFromRGB(0xFFF7C0) forState:UIControlStateNormal]; - _countDownButton.titleLabel.font = [UIFont systemFontOfSize:11 weight:UIFontWeightBold]; - [_countDownButton setBackgroundImage:[UIImage imageWithColor:UIColorRGBAlpha(0xFFFFFF, 0.1)] forState:UIControlStateNormal]; - _countDownButton.layer.masksToBounds = YES; - _countDownButton.layer.cornerRadius = 8.5; - _countDownButton.layer.borderWidth = 0.5; - _countDownButton.layer.borderColor = UIColorFromRGB(0xFFF7C0).CGColor; - } - return _countDownButton; -} - -- (UIStackView *)operaStackView { - if (!_operaStackView) { - _operaStackView = [[UIStackView alloc] init]; - _operaStackView.axis = UILayoutConstraintAxisHorizontal; - _operaStackView.distribution = UIStackViewDistributionFillEqually; - _operaStackView.alignment = UIStackViewAlignmentFill; - _operaStackView.spacing = 18; - } - return _operaStackView; -} - -- (UIButton *)rejectButton { - if (!_rejectButton) { - _rejectButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _rejectButton.layer.masksToBounds = YES; - _rejectButton.layer.cornerRadius = 19; -// UIImage *gradientImage = [UIImage gradientColorImageFromColors:@[UIColorRGBAlpha(0xE6E6E6, 1), UIColorRGBAlpha(0xF3F5FA, 1)] -// gradientType:GradientTypeLeftToRight -// imgSize:CGSizeMake(100, 40)]; -// [_rejectButton setBackgroundImage:gradientImage -// forState:UIControlStateNormal]; - [_rejectButton setBackgroundColor:[UIColor colorWithWhite:1 alpha:0.4]]; - [_rejectButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_rejectButton setTitle:YMLocalizedString(@"XPAcrossRoomPKInviteView6") forState:UIControlStateNormal]; - _rejectButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightBold]; - [_rejectButton addTarget:self action:@selector(rejectButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _rejectButton; -} - -- (UIButton *)acceptButton { - if (!_acceptButton) { - _acceptButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_acceptButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x70E9FF), UIColorFromRGB(0xAE87FF), UIColorFromRGB(0xFF5CE1)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_acceptButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_acceptButton setTitle:YMLocalizedString(@"XPAcrossRoomPKInviteView7") forState:UIControlStateNormal]; - _acceptButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightBold]; - [_acceptButton addTarget:self action:@selector(acceptButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _acceptButton.layer.masksToBounds = YES; - _acceptButton.layer.cornerRadius = 19; - } - return _acceptButton; - } -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelUserView.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelUserView.h deleted file mode 100644 index d84506e..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelUserView.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// YMAcrossRoomPKPanelUserView.h -// YUMI -// -// Created by YUMI on 2022/1/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class AcrossRoomPkRankModel; -typedef NS_ENUM(NSInteger, AcrossRoomPKPanelUserType) { - ///红队贡献 - AcrossRoomPKPanelUserType_Red_Contribute = 1, - ///红队魅力榜 - AcrossRoomPKPanelUserType_Red_Charm, - ///蓝队魅力 - AcrossRoomPKPanelUserType_Blue_Contribute, - ///蓝队贡献 - AcrossRoomPKPanelUserType_Blue_Charm, -}; - -@interface XPAcrossRoomPKPanelUserView : UIView -///类型 -@property (nonatomic,assign) AcrossRoomPKPanelUserType type; - -@property (nonatomic,strong, nullable) AcrossRoomPkRankModel * panelInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelUserView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelUserView.m deleted file mode 100644 index ae31667..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelUserView.m +++ /dev/null @@ -1,142 +0,0 @@ -// -// YMAcrossRoomPKPanelUserView.m -// YUMI -// -// Created by YUMI on 2022/1/11. -// - -#import "XPAcrossRoomPKPanelUserView.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -///Model -#import "AcrossRoomPKPanelModel.h" - -@interface XPAcrossRoomPKPanelUserView () -///排位头饰 -//@property (nonatomic, strong) UIImageView *headwearImageView; -///头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -///显示金币 -@property (nonatomic,strong) UIButton *coinButton; - -@end - -@implementation XPAcrossRoomPKPanelUserView - -#pragma mark - Life Style -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.avatarImageView]; - [self addSubview:self.coinButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(32); - make.height.mas_equalTo(32); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.coinButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(32); - make.height.mas_equalTo(10); - make.bottom.centerX.mas_equalTo(self); - }]; -} - - -#pragma mark - getters and setters -- (void)setType:(AcrossRoomPKPanelUserType)type { - _type = type; - NSString * avatarPlaceName; - UIColor * coinColorStart; - UIColor * coinColorEnd; - switch (type) { - case AcrossRoomPKPanelUserType_Red_Contribute: - case AcrossRoomPKPanelUserType_Blue_Contribute: - coinColorStart = UIColorFromRGB(0xFF9813); - coinColorEnd = UIColorFromRGB(0xFFB22B); - avatarPlaceName = @"room_across_pk_panel_contribute_avatar"; - break; - case AcrossRoomPKPanelUserType_Red_Charm: - case AcrossRoomPKPanelUserType_Blue_Charm: - coinColorStart = UIColorFromRGB(0xFF5FC1); - coinColorEnd = UIColorFromRGB(0xFA81FF); - avatarPlaceName = @"room_across_pk_panel_charm_avatar"; - break; - - default: - break; - } - self.avatarImageView.image = [UIImage imageNamed:avatarPlaceName]; - [self.coinButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[coinColorStart, coinColorEnd] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(10, 10)] - forState:UIControlStateNormal]; -} - -- (void)setPanelInfo:(AcrossRoomPkRankModel *)panelInfo { - _panelInfo = panelInfo; - if (_panelInfo) { - self.avatarImageView.imageUrl = _panelInfo.avatar; - NSString * amount = _panelInfo.amount.length > 0 ? _panelInfo.amount : @""; - [self.coinButton setTitle:amount forState:UIControlStateNormal]; - self.coinButton.hidden = !amount; - self.avatarImageView.layer.borderWidth = 1; - if (self.type == AcrossRoomPKPanelUserType_Red_Contribute || self.type == AcrossRoomPKPanelUserType_Blue_Contribute) { - self.avatarImageView.layer.borderColor = UIColorFromRGB(0xFFE480).CGColor; - } else { - self.avatarImageView.layer.borderColor = UIColorFromRGB(0xFF6574).CGColor; - } - } else { - self.avatarImageView.layer.borderWidth = 0; - if (self.type == AcrossRoomPKPanelUserType_Red_Contribute || self.type == AcrossRoomPKPanelUserType_Blue_Contribute) { - self.avatarImageView.image = [UIImage imageNamed:@"room_across_pk_panel_contribute_avatar"]; - } else { - self.avatarImageView.image = [UIImage imageNamed:@"room_across_pk_panel_charm_avatar"]; - } - - [self.coinButton setTitle:@"0" forState:UIControlStateNormal]; - self.coinButton.hidden = YES; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 32 / 2; - } - return _avatarImageView; -} - -- (UIButton *)coinButton { - if (!_coinButton) { - _coinButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_coinButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _coinButton.titleLabel.font = [UIFont systemFontOfSize:9 weight:UIFontWeightBold]; - _coinButton.layer.masksToBounds = YES; - _coinButton.layer.cornerRadius = 5; - _coinButton.hidden = YES; - } - return _coinButton; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.h deleted file mode 100644 index dfa7c79..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// YMAcrpssRoomPKPanelView.h -// YUMI -// -// Created by YUMI on 2022/1/11. -// 跨房PK 正在Pk的面板数据 - -#import - -NS_ASSUME_NONNULL_BEGIN -@class AcrossRoomPKPanelModel, XPAcrossRoomPKPanelView; -@protocol XPAcrossRoomPKPanelViewDelegate -///展示用户卡片 -- (void)XPAcrossRoomPKPanelView:(XPAcrossRoomPKPanelView *)view showUserCard:(NSString *)uid; -///送礼物 -- (void)XPAcrossRoomPKPanelView:(XPAcrossRoomPKPanelView *)view sendGiftToUser:(NSString *)uid; -///去房间 -- (void)XPAcrossRoomPKPanelView:(XPAcrossRoomPKPanelView *)view onLookRoom:(NSString *)roomUid; - -@end - -@interface XPAcrossRoomPKPanelView : UIView -- (void)startInitUI; -///开启pk -- (void)openCountdownWithTime:(long)time; -///pk 信息 -@property (nonatomic,strong, nullable) AcrossRoomPKPanelModel *pkPanelInfo; -///代理 -@property (nonatomic,weak) id delegate; -///重置数据 -- (void)resetAcrossPKViewData; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.m deleted file mode 100644 index 5bf41d5..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelView.m +++ /dev/null @@ -1,1037 +0,0 @@ -// -// YMAcrpssRoomPKPanelView.m -// YUMI -// -// Created by YUMI on 2022/1/11. -// - -#import "XPAcrossRoomPKPanelView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "UIButton+EnlargeTouchArea.h" -#import "Timestamp.h" -#import "NSArray+Safe.h" -///Model -#import "UserInfoModel.h" -#import "AcrossRoomPKPanelModel.h" -///View -#import "XPAcrossRoomPKPanelUserView.h" - -static CGFloat MaxHeight = 285.5; -static CGFloat MiniHeight = 130.5; - -@interface XPAcrossRoomPKPanelView () -///背景 -@property (nonatomic, strong) UIImageView *backgroundImageView; -@property (nonatomic, strong) UIImageView *backgroundImageView_small; -#pragma mark - 规则的view -///帮助按钮 -@property (nonatomic, strong) UIButton *helpButton; -///规则背景 -@property (nonatomic, strong) UIImageView *ruleBgImageView; -///规则 -@property (nonatomic, strong) SZTextView *ruleTextView; -///显示倒计时 -@property (nonatomic, strong) UILabel *timeLabel; -///最大的容器 -@property (nonatomic,strong) UIStackView *stackView; -#pragma mark - 队伍的view -///队伍的容器 -@property (nonatomic,strong) UIView * teamContainerView; -///红队厅名 -@property (nonatomic, strong) UILabel *redTitleLabel; -/// 红队头像 -@property (nonatomic, strong) NetImageView *redAvatarImageView; -/// 助攻 -@property (nonatomic, strong) UIButton *assistButton; -///蓝队厅名 -@property (nonatomic, strong) UILabel *blueTitleLabel; -/// 蓝队头像 -@property (nonatomic, strong) NetImageView *blueAvatarImageView; -/// 去围观 -@property (nonatomic, strong) UIButton *onLookButton; -#pragma mark -进度条内容 -///PK最外面的容器 -@property (nonatomic, strong) UIView *progressView; - -///红方的进度图片 -@property (nonatomic, strong) UIImageView *redCountImageView; -///红方的礼物值 -@property (nonatomic, strong) UILabel *redCountLabel; -///动画管理类 -@property (strong, nonatomic) SVGAParser *parser; -///中间进度的动画 -//@property (nonatomic, strong) SVGAImageView *svgDisplayView; -@property (nonatomic, strong) UIImageView *fireImageView; -///蓝方的进度图片 -@property (nonatomic, strong) UIImageView *blueCountImageView; -///蓝方的礼物值 -@property (nonatomic, strong) UILabel *blueCountLabel; -#pragma mark - 展开更多 -///展开 -@property (nonatomic,strong) UIButton *foldButton; -#pragma mark - 队伍的队友的view -/// -@property (nonatomic,strong) UIStackView *userStackView; -///贡献的容器 -@property (nonatomic,strong) UIStackView *contributeStackView; -///红方的贡献用户容器 -@property (nonatomic,strong) UIStackView *redContributeStackView; -///蓝方的贡献用户容器 -@property (nonatomic,strong) UIStackView *blueContributeStackView; - -///魅力的容器 -@property (nonatomic,strong) UIStackView *charmStackView; -///红方的魅力用户容器 -@property (nonatomic,strong) UIStackView *redCharmStackView; -///蓝方的魅力用户容器 -@property (nonatomic,strong) UIStackView *blueCharmStackView; - -///倒计时 -@property (strong, nonatomic) dispatch_source_t timer; - -@property (nonatomic, assign) CGPoint centerCenter; -@end - -@implementation XPAcrossRoomPKPanelView - -#pragma mark - life cycle - -- (void)dealloc { - -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:CGRectMake(0, 0, 310, MaxHeight)]) { - UIPanGestureRecognizer *pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(changeLocation:)]; - // 这里的delaysTouchesBegan属性很明显就是对touchBegin方法是否进行延迟, - // YES表示延迟,即在系统未识别出来手势为什么手势时先不要调用touchesBegan 方法; - // NO表示不延迟,即在系统未识别出来手势为什么手势时会先调用touchesBegan 方法; - pan.delaysTouchesBegan = YES; - [self addGestureRecognizer:pan]; - } - return self; -} - -- (void)startInitUI { - if (self.backgroundImageView.superview) { - return; - } - [self initSubViews]; - [self initSubViewConstraints]; - - for (id view in self.ruleTextView.subviews) { - if ([view isKindOfClass:[UITextView class]]){ - UITextView *textView = view; - textView.textAlignment = NSTextAlignmentLeft; - break; - } - } -} - -#pragma mark - Public Method -- (void)resetAcrossPKViewData { - if (self.timer) { - dispatch_source_cancel(self.timer); - self.timer = nil; - } - self.pkPanelInfo = nil; -} - -#pragma mark - Private Method -- (void)setupBackground { - [self addSubview:self.backgroundImageView]; - [self addSubview:self.backgroundImageView_small]; - - UIImageView *topImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pk_background_top"]]; - topImageView.contentMode = UIViewContentModeScaleAspectFill; - [self addSubview:topImageView]; - - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - - [self.backgroundImageView_small mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.right.mas_equalTo(self); - make.height.mas_equalTo(MiniHeight); - }]; - - [topImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.centerY.mas_equalTo(self.mas_top).offset(7); - make.width.mas_equalTo(180); - make.height.mas_equalTo(32); - }]; - - UIView *pkTimeContent = [[UIView alloc] init]; - [self addSubview:pkTimeContent]; - [pkTimeContent mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(topImageView); - }]; - - UIImageView *pkMarkIcon = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pk_mark_icon"]]; - [pkTimeContent addSubview:pkMarkIcon]; - [pkTimeContent addSubview:self.timeLabel]; - - [pkMarkIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.leading.mas_equalTo(pkTimeContent); - make.size.mas_equalTo(CGSizeMake(30, 13)); - }]; - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(pkTimeContent); - make.leading.mas_equalTo(pkMarkIcon.mas_trailing).offset(4); - make.trailing.mas_equalTo(pkTimeContent).offset(-4); - }]; - - [self addSubview:self.helpButton]; - [self.helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-14); - make.top.mas_equalTo(12); - make.width.height.mas_equalTo(16); - }]; -} - -- (void)setupBattleArea { - [self addSubview:self.stackView]; - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.backgroundImageView).offset(34); - make.leading.trailing.mas_equalTo(self); - make.height.mas_equalTo(88); - }]; - - [self.stackView addArrangedSubview:self.teamContainerView]; - [self.teamContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.top.leading.trailing.mas_equalTo(self.stackView); - }]; - - [self.teamContainerView addSubview:self.redTitleLabel]; - [self.teamContainerView addSubview:self.blueTitleLabel]; - [self.redTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(10); - make.top.mas_equalTo(self.teamContainerView); - }]; - [self.blueTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.teamContainerView); - make.trailing.mas_equalTo(-10); - }]; - - UIImageView *vsMark = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pk_vs_icon"]]; - [self.teamContainerView addSubview:vsMark]; - [vsMark mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.teamContainerView); - make.top.mas_equalTo(self.redTitleLabel.mas_bottom).offset(-4.5); - make.size.mas_equalTo(CGSizeMake(40, 20)); - }]; - - [self.teamContainerView addSubview:self.redAvatarImageView]; - [self.teamContainerView addSubview:self.blueAvatarImageView]; - [self.redAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(10); - make.width.height.mas_equalTo(44); - make.top.mas_equalTo(self.redTitleLabel.mas_bottom).offset(4); - }]; - [self.blueAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-10); - make.width.height.mas_equalTo(44); - make.top.mas_equalTo(self.blueTitleLabel.mas_bottom).offset(4); - }]; - -// [self.teamContainerView insertSubview:self.progressView belowSubview:self.redAvatarImageView]; - [self.teamContainerView addSubview:self.progressView]; - [self.progressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.redAvatarImageView.mas_trailing).offset(-2); - make.trailing.mas_equalTo(self.blueAvatarImageView.mas_leading).offset(2); - make.height.mas_equalTo(15); - make.centerY.mas_equalTo(self.redAvatarImageView); - }]; - - [self.teamContainerView insertSubview:self.assistButton belowSubview:self.redAvatarImageView]; - [self.teamContainerView insertSubview:self.onLookButton belowSubview:self.blueAvatarImageView]; - [self.assistButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.redAvatarImageView.mas_trailing).offset(-16); - make.bottom.mas_equalTo(self.progressView.mas_top).offset(2); - make.width.mas_equalTo(70); - make.height.mas_equalTo(14); - }]; - - [self.onLookButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.blueAvatarImageView.mas_leading).offset(16); - make.bottom.mas_equalTo(self.progressView.mas_top).offset(2); - make.width.mas_equalTo(70); - make.height.mas_equalTo(14); - }]; - - [self.progressView addSubview:self.redCountImageView]; - [self.progressView addSubview:self.blueCountImageView]; - [self.progressView addSubview:self.redCountLabel]; - [self.progressView addSubview:self.blueCountLabel]; - [self.progressView addSubview:self.fireImageView]; - - [self.fireImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.progressView).offset(0); - make.centerY.mas_equalTo(self.progressView); - make.height.mas_equalTo(35); - make.width.mas_equalTo(24); - }]; - - [self.redCountImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.progressView); - }]; - - [self.blueCountImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.trailing.mas_equalTo(0); - make.leading.mas_equalTo(self.fireImageView.mas_centerX); - }]; - - [self.redCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.progressView).offset(2); - make.bottom.mas_equalTo(self.redAvatarImageView); - }]; - - [self.blueCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.progressView).offset(-2); - make.bottom.mas_equalTo(self.blueAvatarImageView); - }]; - - [self addSubview:self.foldButton]; - [self.foldButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self).offset(104); - make.size.mas_equalTo(CGSizeMake(18, 10)); - }]; -} - -- (void)setupInteractiveArea { - [self addSubview:self.userStackView]; - [self.userStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.stackView.mas_bottom).offset(8); -// make.bottom.mas_equalTo(self).offset(-24); - make.leading.trailing.mas_equalTo(self); - }]; - - UIImageView *charmTitleMark = [[UIImageView alloc] initWithImage:[UIImage getLanguageImage:@"pk_top_charms_mark"]]; - charmTitleMark.contentMode = UIViewContentModeScaleAspectFill ; - [self.userStackView addArrangedSubview:charmTitleMark]; - [charmTitleMark mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(145, 16)); - }]; - [self.userStackView addArrangedSubview:self.charmStackView]; - [self.charmStackView addArrangedSubview:self.redCharmStackView]; - [self.charmStackView addArrangedSubview:self.blueCharmStackView]; - [self.charmStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(32); - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-16); - }]; - [self.redCharmStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.blueCharmStackView); - }]; - - UIImageView *moneyTitleMark = [[UIImageView alloc] initWithImage:[UIImage getLanguageImage:@"pk_top_momey_mark"]]; - moneyTitleMark.contentMode = UIViewContentModeScaleAspectFill; - [self.userStackView addArrangedSubview:moneyTitleMark]; - [moneyTitleMark mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(145, 16)); - }]; - [self.userStackView addArrangedSubview:self.contributeStackView]; - [self.contributeStackView addArrangedSubview:self.redContributeStackView]; - [self.contributeStackView addArrangedSubview:self.blueContributeStackView]; - [self.contributeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(32); - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-16); - }]; - [self.redContributeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.blueContributeStackView); - }]; - - [self initUserSubViews]; -} - -- (void)setupRules { - [self addSubview:self.ruleBgImageView]; - [self.ruleBgImageView addSubview:self.ruleTextView]; - - [self.ruleTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.ruleBgImageView).insets(UIEdgeInsetsMake(4, 4, 4, 4)); - }]; - [self.ruleBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-8); - make.top.mas_equalTo(30); - make.width.lessThanOrEqualTo(@210); - make.width.equalTo(self.ruleTextView.mas_width).offset(20).priorityLow(); - make.height.equalTo(self.ruleTextView.mas_height).offset(20); - }]; -} - -- (void)initSubViews { - [self setupBackground]; - [self setupBattleArea]; - [self setupInteractiveArea]; - [self setupRules]; - -// NSString * anatomiser1Name = [NSString stringWithFormat:@"%@/crossRoomPk_progress.svga", API_Image_URL]; -// [self.parser parseWithURL:[NSURL URLWithString:anatomiser1Name] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { -// self.svgDisplayView.loops = INT_MAX; -// self.svgDisplayView.clearsAfterStop = NO; -// self.svgDisplayView.videoItem = videoItem; -// [self.svgDisplayView startAnimation]; -// } failureBlock:^(NSError * _Nonnull error) { -// -// }]; -} - -- (void)initUserSubViews { - for (int i = 0; i < 3; i++) { - XPAcrossRoomPKPanelUserView * userView = [[XPAcrossRoomPKPanelUserView alloc] init]; - userView.tag = (1000 + i); - userView.type = AcrossRoomPKPanelUserType_Red_Charm; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapUserRecognizer:)]; - [userView addGestureRecognizer:tap]; - [self.redCharmStackView addArrangedSubview:userView]; - } - - for (int i = 0; i < 3; i++) { - XPAcrossRoomPKPanelUserView * userView = [[XPAcrossRoomPKPanelUserView alloc] init]; - userView.tag = (1000 + i); - userView.type = AcrossRoomPKPanelUserType_Blue_Charm; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapUserRecognizer:)]; - [userView addGestureRecognizer:tap]; - [self.blueCharmStackView addArrangedSubview:userView]; - } - - for (int i = 0; i < 3; i++) { - XPAcrossRoomPKPanelUserView * userView = [[XPAcrossRoomPKPanelUserView alloc] init]; - userView.tag = (1000 + i); - userView.type = AcrossRoomPKPanelUserType_Red_Contribute; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapUserRecognizer:)]; - [userView addGestureRecognizer:tap]; - [self.redContributeStackView addArrangedSubview:userView]; - } - - for (int i = 0; i < 3; i++) { - XPAcrossRoomPKPanelUserView * userView = [[XPAcrossRoomPKPanelUserView alloc] init]; - userView.tag = (1000 + i); - userView.type = AcrossRoomPKPanelUserType_Blue_Contribute; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapUserRecognizer:)]; - [userView addGestureRecognizer:tap]; - [self.blueContributeStackView addArrangedSubview:userView]; - } -} - -- (void)initSubViewConstraints { - -} -#pragma mark - 倒计时 -- (void)openCountdownWithTime:(long)time { - __block long tempTime = time; //倒计时时间 - if (self.timer == nil) { - @kWeakify(self); - dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - self.timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - dispatch_source_set_timer(self.timer,dispatch_walltime(NULL, 0), 1.0*NSEC_PER_SEC, 0); //每秒执行 - dispatch_source_set_event_handler(self.timer, ^{ - @kStrongify(self); - if(tempTime <= 0){ //倒计时结束，关闭 - dispatch_source_cancel(self.timer); - self.timer = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - self.timeLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - self.timeLabel.text = YMLocalizedString(@"XPAcrossRoomPKPanelView0"); - }); - } else { - dispatch_async(dispatch_get_main_queue(), ^{ - //设置按钮显示读秒效果 - [self acrossRoomPKCutdownOpen:tempTime]; - }); - tempTime--; - } - }); - dispatch_resume(self.timer); - } -} - -///房间pk, 倒计时回调 -- (void)acrossRoomPKCutdownOpen:(NSInteger)time { - NSInteger minute = time / 60; - NSInteger second = (time % 60); - NSInteger hour = time/3600; - NSString *timeStr; - if (hour > 0) { - minute = minute % 60; - timeStr = [NSString stringWithFormat:@"%02zd:%02zd:%02zd", hour, minute, second]; - } else { - timeStr = [NSString stringWithFormat:@"%02zd:%02zd", minute, second]; - } - self.timeLabel.text = timeStr; - if (time <= 30) { - self.timeLabel.textColor = UIColorFromRGB(0xFFF17D); - } else { - self.timeLabel.textColor = UIColorFromRGB(0xFEFEFE); - } -} - -#pragma mark - Event Response -- (void)foldButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - CGRect newFrame = self.frame; - - if (sender.isSelected) { - self.userStackView.hidden = NO; - self.backgroundImageView.hidden = NO; - self.backgroundImageView_small.hidden = YES; - newFrame.size.height = MaxHeight; - self.foldButton.transform = CGAffineTransformIdentity; - } else { - self.userStackView.hidden = YES; - self.backgroundImageView.hidden = YES; - self.backgroundImageView_small.hidden = NO; - newFrame.size.height = MiniHeight; - self.foldButton.transform = CGAffineTransformMakeRotation(M_PI); - } - self.frame = newFrame; - [self layoutIfNeeded]; -} - -- (void)helpButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - self.ruleBgImageView.hidden = !sender.selected; -} - -- (void)tapRedAvatarRecognizer:(UITapGestureRecognizer *)ges { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPAcrossRoomPKPanelView:showUserCard:)]) { - [self.delegate XPAcrossRoomPKPanelView:self - showUserCard:self.pkPanelInfo.cUid]; - } -} - -- (void)tapBlueAvatarRecognizer:(UITapGestureRecognizer *)ges { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPAcrossRoomPKPanelView:showUserCard:)]) { - [self.delegate XPAcrossRoomPKPanelView:self - showUserCard:self.pkPanelInfo.aUid]; - } -} - -- (void)assistButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPAcrossRoomPKPanelView:sendGiftToUser:)]) { - [self.delegate XPAcrossRoomPKPanelView:self - sendGiftToUser:self.pkPanelInfo.cUid]; - } -} - -- (void)onlookButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPAcrossRoomPKPanelView:onLookRoom:)]) { - [self.delegate XPAcrossRoomPKPanelView:self - onLookRoom:self.pkPanelInfo.aUid]; - } -} - -- (void)tapUserRecognizer:(UITapGestureRecognizer *)tap { - XPAcrossRoomPKPanelUserView * userView= (XPAcrossRoomPKPanelUserView *)tap.view; - if (userView.panelInfo && userView.panelInfo.uid.length > 0 && self.delegate && [self.delegate respondsToSelector:@selector(XPAcrossRoomPKPanelView:showUserCard:)]) { - [self.delegate XPAcrossRoomPKPanelView:self showUserCard:userView.panelInfo.uid]; - } -} - -- (void)changeLocation:(UIPanGestureRecognizer*)p { - // 就是悬浮小球底下的那个的window,就是APPdelegete里面的那个window属性 - // 获取正在显示的那个界面的Window,http://www.jianshu.com/p/d23763e60e94 - UIWindow *appWindow = [UIApplication sharedApplication].delegate.window; - - CGPoint panPoint = [p locationInView:appWindow]; - if (p.state == UIGestureRecognizerStateBegan) { -// self.alpha = 1; - } else if(p.state == UIGestureRecognizerStateChanged) { - self.center = CGPointMake(panPoint.x, panPoint.y); - } else if(p.state == UIGestureRecognizerStateEnded - || p.state == UIGestureRecognizerStateCancelled) { -// self.alpha = 1; - CGFloat touchWidth = self.frame.size.width; - CGFloat touchHeight = self.frame.size.height; - CGFloat screenWidth = [[UIScreen mainScreen] bounds].size.width; - CGFloat screenHeight = [[UIScreen mainScreen] bounds].size.height; - // fabs 是取绝对值的意思 - CGFloat left = fabs(panPoint.x); - CGFloat right = fabs(screenWidth - left); - CGFloat top = fabs(panPoint.y); - CGFloat bottom = fabs(screenHeight - top); - CGFloat minSpace = 0; - minSpace = MIN(MIN(MIN(top, left), bottom), right); - CGPoint newCenter; - CGFloat targetY = 0; - //校正Y - if (panPoint.y < 15 + touchHeight / 2.0) { - targetY = 15 + touchHeight / 2.0; - }else if (panPoint.y > (screenHeight - touchHeight / 2.0 - 15)) { - targetY = screenHeight - touchHeight / 2.0 - 15; - }else{ - targetY = panPoint.y; - } - - if (minSpace == left) { - newCenter = CGPointMake(15+touchWidth/2.0, targetY); - }else if (minSpace == right) { - newCenter = CGPointMake(screenWidth - touchWidth/2.0 - 15, targetY); - }else if (minSpace == top) { - newCenter = CGPointMake(panPoint.x, touchWidth / 3); - }else { - newCenter = CGPointMake(panPoint.x, screenHeight - touchWidth / 3); - } - self.centerCenter = newCenter; - [UIView animateWithDuration:0.25 animations:^{ - if ((newCenter.y + self.frame.size.height / 2) > (KScreenHeight - kSafeAreaBottomHeight - 44)) { - self.center = CGPointMake(newCenter.x, KScreenHeight - self.frame.size.height / 2 - kSafeAreaBottomHeight - 44); - }else { - self.center = newCenter; - } - }]; - } -} - -#pragma mark - getters and setters -- (void)setPkPanelInfo:(AcrossRoomPKPanelModel *)pkPanelInfo { - _pkPanelInfo = pkPanelInfo; - if (_pkPanelInfo) { - @kWeakify(self); - [Timestamp getInternetDateWithSuccess:^(NSTimeInterval timeInterval) { - @kStrongify(self); - timeInterval = timeInterval * 1000; - long aTime = (pkPanelInfo.endTime - timeInterval) / 1000; - [self openCountdownWithTime:aTime]; - } failure:^(NSError * _Nonnull error) { - @kStrongify(self); - NSDate *datenow = [NSDate date];//现在时间 - long time2 = (long)([datenow timeIntervalSince1970]*1000); - long aTime = (pkPanelInfo.endTime - time2) / 1000; - [self openCountdownWithTime:aTime]; - }]; - - if (_pkPanelInfo.cTitle.length > 7) { - _pkPanelInfo.cTitle = [NSString stringWithFormat:@"%@…", [_pkPanelInfo.cTitle substringToIndex:7]]; - } - - if (_pkPanelInfo.aTitle.length > 7) { - _pkPanelInfo.aTitle = [NSString stringWithFormat:@"%@…", [_pkPanelInfo.aTitle substringToIndex:7]]; - } - - self.redTitleLabel.text = _pkPanelInfo.cTitle; - self.redAvatarImageView.imageUrl = _pkPanelInfo.cAvatar; - self.redCountLabel.text = [NSString stringWithFormat:@"%lld", _pkPanelInfo.cAmount]; - self.blueTitleLabel.text = _pkPanelInfo.aTitle; - self.blueAvatarImageView.imageUrl = _pkPanelInfo.aAvatar; - self.blueCountLabel.text = [NSString stringWithFormat:@"%lld", _pkPanelInfo.aAmount]; - for (int i = 0; i<_pkPanelInfo.csRank.count; i++) { - AcrossRoomPkRankModel * rankModel = [_pkPanelInfo.csRank xpSafeObjectAtIndex:i]; - if (i >= self.redContributeStackView.subviews.count) { - break; - } - XPAcrossRoomPKPanelUserView *userView = self.redContributeStackView.subviews[i]; - userView.panelInfo = rankModel; - } - for (int i = 0; i<_pkPanelInfo.crRank.count; i++) { - AcrossRoomPkRankModel * rankModel = [_pkPanelInfo.crRank xpSafeObjectAtIndex:i]; - if (i >= self.redCharmStackView.subviews.count) { - break; - } - XPAcrossRoomPKPanelUserView *userView = self.redCharmStackView.subviews[i]; - userView.panelInfo = rankModel; - } - - for (int i = 0; i<_pkPanelInfo.asRank.count; i++) { - AcrossRoomPkRankModel * rankModel = [_pkPanelInfo.asRank xpSafeObjectAtIndex:i]; - if (i >= self.blueContributeStackView.subviews.count) { - break; - } - XPAcrossRoomPKPanelUserView *userView = self.blueContributeStackView.subviews[i]; - userView.panelInfo = rankModel; - } - - for (int i = 0; i<_pkPanelInfo.arRank.count; i++) { - AcrossRoomPkRankModel * rankModel = [_pkPanelInfo.arRank xpSafeObjectAtIndex:i]; - if (i >= self.blueCharmStackView.subviews.count) { - break; - } - XPAcrossRoomPKPanelUserView *userView = self.blueCharmStackView.subviews[i]; - userView.panelInfo = rankModel; - } - - // 0.5 = centerX - if (_pkPanelInfo.aPercent > 1) { - _pkPanelInfo.aPercent = 1; - } - CGFloat progress = 1 - _pkPanelInfo.aPercent; - CGFloat width = CGRectGetWidth(self.progressView.bounds); - CGFloat centerX = progress * width; - - [self.fireImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.progressView).offset(centerX - width / 2); - }]; - [self layoutIfNeeded]; - - } else { - self.redTitleLabel.text = @""; - self.redAvatarImageView.image = nil; - self.redCountLabel.text = @"0"; - self.blueTitleLabel.text = @""; - self.blueAvatarImageView.image = nil; - self.blueCountLabel.text = @"0"; - for (int i = 0; i - -NS_ASSUME_NONNULL_BEGIN -@class AcrossRoomPKPrizeModel; -@interface XPAcrossRoomPKPrizeView : UIView -@property (nonatomic, strong) AcrossRoomPKPrizeModel *data; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPrizeView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPrizeView.m deleted file mode 100644 index fed82d6..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPrizeView.m +++ /dev/null @@ -1,246 +0,0 @@ -// -// YMAcrossRoomPKPrizeView.m -// YUMI -// -// Created by YUMI on 2022/1/12. -// 跨房PK横幅 - -#import "XPAcrossRoomPKPrizeView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "AcrossRoomPKPrizeModel.h" - -@interface XPAcrossRoomPKPrizeView () - -/** bgImageView */ -@property (nonatomic, strong) UIImageView *bgImageView; -///去围观 -@property (nonatomic, strong) UIButton *onLookBtn; -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///红队头像 -@property (nonatomic, strong) NetImageView *redHeadImageView; -///红队厅名 -@property (nonatomic, strong) UILabel *redRoomTitleLabel; -///中间PKicon -@property (nonatomic, strong) UIImageView *middleImageView; -///蓝队头像 -@property (nonatomic, strong) NetImageView *blueHeadImageView; -///蓝队厅名 -@property (nonatomic, strong) UILabel *blueRoomTitleLabel; - -@end - -@implementation XPAcrossRoomPKPrizeView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initView]; - [self initConstrations]; - } - return self; -} - -- (void)initView { - [self addSubview:self.bgImageView]; - [self addSubview:self.onLookBtn]; - [self addSubview:self.titleLabel]; - - [self addSubview:self.redHeadImageView]; - [self addSubview:self.redRoomTitleLabel]; - - [self addSubview:self.blueHeadImageView]; - [self addSubview:self.blueRoomTitleLabel]; - - [self addSubview:self.middleImageView]; - -} - -- (void)initConstrations { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.redHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(12); - make.leading.mas_equalTo(22); - make.width.height.mas_equalTo(44); - }]; - [self.redRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.redHeadImageView.mas_bottom).mas_offset(8); - make.centerX.mas_equalTo(self.redHeadImageView); - make.height.mas_equalTo(12); - make.width.mas_equalTo(72); - }]; - [self.middleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.redHeadImageView); - make.width.mas_equalTo(60); - make.height.mas_equalTo(40); - make.leading.mas_equalTo(self.redHeadImageView.mas_trailing).mas_offset(9); - }]; - [self.blueHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.redHeadImageView); - make.leading.mas_equalTo(self.middleImageView.mas_trailing).mas_offset(9); - make.width.height.mas_equalTo(44); - }]; - [self.blueRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.blueHeadImageView.mas_bottom).mas_offset(8); - make.centerX.mas_equalTo(self.blueHeadImageView); - make.height.mas_equalTo(12); - make.width.mas_equalTo(72); - }]; - [self.onLookBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(50); - make.height.mas_equalTo(18); - make.trailing.mas_equalTo(-14); - make.bottom.mas_equalTo(-14); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.redHeadImageView); - make.trailing.mas_equalTo(self.onLookBtn); - make.height.mas_equalTo(14); - make.leading.mas_equalTo(self.blueHeadImageView.mas_trailing).mas_offset(20); - }]; -} - -- (void)setData:(AcrossRoomPKPrizeModel *)data { - _data = data; - self.redHeadImageView.imageUrl = data.winAvatar; - self.blueHeadImageView.imageUrl = data.failAvatar; - self.redRoomTitleLabel.text = data.winTitle; - self.blueRoomTitleLabel.text = data.failTitle; - self.titleLabel.text = data.msg; - if (data.pkType == AcrossRoomPKTypeAnchor) { - self.redRoomTitleLabel.text = data.winNick; - self.blueRoomTitleLabel.text = data.failNick; - self.titleLabel.numberOfLines = 0; - self.titleLabel.font = [UIFont systemFontOfSize:10]; - self.titleLabel.textAlignment = NSTextAlignmentCenter; - self.bgImageView.image = [UIImage imageNamed:@"anchorPK_prize_bg"]; - self.middleImageView.image = [UIImage imageNamed:@"anchorPK_prize_KO"]; - [self.onLookBtn setBackgroundImage:[UIImage imageNamed:@"anchorPK_prize_onLook_bg"] forState:UIControlStateNormal]; - [self.onLookBtn setTitle:YMLocalizedString(@"XPAcrossRoomPKPrizeView0") forState:UIControlStateNormal]; - self.onLookBtn.layer.masksToBounds = NO; - self.onLookBtn.layer.borderWidth = 0; - [self.onLookBtn mas_remakeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(58); - make.height.mas_equalTo(20); - make.trailing.mas_equalTo(-70); - make.bottom.mas_equalTo(-14); - }]; - [self.titleLabel mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.onLookBtn); - make.width.mas_equalTo(152); - make.bottom.mas_equalTo(self.onLookBtn.mas_top).mas_offset(-5); - }]; - [self.redRoomTitleLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.redHeadImageView.mas_bottom).mas_offset(4); - }]; - [self.blueRoomTitleLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.blueHeadImageView.mas_bottom).mas_offset(4); - }]; - [self.middleImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(46); - make.height.mas_equalTo(39); - }]; - } -} - -#pragma mark - getters and setters -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage imageNamed:@"room_across_pk_prize_bg"]; - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} - -- (UIButton *)onLookBtn { - if (!_onLookBtn) { - _onLookBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_onLookBtn setBackgroundImage:[UIImage imageWithColor:[DJDKMIMOMColor disableButtonColor]] forState:UIControlStateNormal]; - [_onLookBtn setTitle:YMLocalizedString(@"XPAcrossRoomPKPrizeView1") forState:UIControlStateNormal]; - [_onLookBtn setTitleColor:UIColorFromRGB(0xffffff) forState:UIControlStateNormal]; - _onLookBtn.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _onLookBtn.userInteractionEnabled = NO; - _onLookBtn.layer.masksToBounds = YES; - _onLookBtn.layer.cornerRadius = 9; - _onLookBtn.layer.borderWidth = 1; - _onLookBtn.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _onLookBtn; -} - -- (NetImageView *)redHeadImageView { - if (!_redHeadImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _redHeadImageView = [[NetImageView alloc] initWithConfig:config]; - _redHeadImageView.layer.cornerRadius = 22; - _redHeadImageView.layer.masksToBounds = YES; - _redHeadImageView.layer.borderWidth = 1; - _redHeadImageView.layer.borderColor = UIColorFromRGB(0xec677d).CGColor; - } - return _redHeadImageView; -} - -- (UILabel *)redRoomTitleLabel { - if (!_redRoomTitleLabel) { - _redRoomTitleLabel = [[UILabel alloc] init]; - _redRoomTitleLabel.textColor = [UIColor whiteColor]; - _redRoomTitleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _redRoomTitleLabel.textAlignment = NSTextAlignmentCenter; - } - return _redRoomTitleLabel; -} - -- (UIImageView *)middleImageView { - if (!_middleImageView) { - _middleImageView = [[UIImageView alloc] init]; - _middleImageView.image = [UIImage imageNamed:@"room_across_pk_prize_ko"]; - } - return _middleImageView; -} - -- (NetImageView *)blueHeadImageView { - if (!_blueHeadImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _blueHeadImageView = [[NetImageView alloc] initWithConfig:config]; - _blueHeadImageView.layer.cornerRadius = 22; - _blueHeadImageView.layer.masksToBounds = YES; - _blueHeadImageView.layer.borderWidth = 1; - _blueHeadImageView.layer.borderColor = UIColorFromRGB(0x76c1F5).CGColor; - } - return _blueHeadImageView; -} - -- (UILabel *)blueRoomTitleLabel { - if (!_blueRoomTitleLabel) { - _blueRoomTitleLabel = [[UILabel alloc] init]; - _blueRoomTitleLabel.textColor = [UIColor whiteColor]; - _blueRoomTitleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _blueRoomTitleLabel.textAlignment = NSTextAlignmentCenter; - } - return _blueRoomTitleLabel; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium]; - _titleLabel.lineBreakMode = NSLineBreakByTruncatingMiddle; - } - return _titleLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.h deleted file mode 100644 index bc9902d..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMAcrossRoomPKResultView.h -// YUMI -// -// Created by YUMI on 2022/1/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class AcrossRoomPKPanelModel; -@interface XPAcrossRoomPKResultView : UIView -@property (nonatomic, strong) AcrossRoomPKPanelModel *data; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.m deleted file mode 100644 index 7acb863..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.m +++ /dev/null @@ -1,384 +0,0 @@ -// -// YMAcrossRoomPKResultView.m -// YUMI -// -// Created by YUMI on 2022/1/12. -// - -#import "XPAcrossRoomPKResultView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "TTPopup.h" -#import "NSArray+Safe.h" -///Model -#import "AcrossRoomPKPanelModel.h" - -@interface XPAcrossRoomPKResultView() -/** bgImageView */ -@property (nonatomic, strong) UIImageView *bgImageView; -@property (nonatomic, strong) UIImageView *topStateImageView; - -///红队头像 -@property (nonatomic, strong) NetImageView *redHeadImageView; -///红队厅名 -@property (nonatomic, strong) UILabel *redRoomTitleLabel; -///红队礼物值 -@property (nonatomic, strong) UILabel *redValueLabel; -///中间PKicon -@property (nonatomic, strong) UIImageView *middleImageView; - -///蓝队头像 -@property (nonatomic, strong) NetImageView *blueHeadImageView; -///蓝队厅名 -@property (nonatomic, strong) UILabel *blueRoomTitleLabel; -///蓝队礼物值 -@property (nonatomic, strong) UILabel *blueValueLabel; - -///贡献榜头像 -@property (nonatomic, strong) NetImageView *contributeAvatar; -///贡献榜头饰 -@property (nonatomic, strong) UIImageView *contributeHeadWear; -///贡献榜昵称 -@property (nonatomic, strong) UILabel *contributeNick; -///贡献值 -@property (nonatomic, strong) UILabel *contributeValue; - -///魅力榜头像 -@property (nonatomic, strong) NetImageView *charmAvatar; -///魅力榜头饰 -@property (nonatomic, strong) UIImageView *charmHeadWear; -///魅力榜昵称 -@property (nonatomic, strong) UILabel *charmNick; -///魅力值 -@property (nonatomic, strong) UILabel *charmValue; - -@end - -@implementation XPAcrossRoomPKResultView - -#pragma mark - life cycle - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initView]; - [self layoutViews]; - } - return self; -} - -- (void)initView { - [self addSubview:self.bgImageView]; - [self addSubview:self.topStateImageView]; - - [self addSubview:self.redHeadImageView]; - [self addSubview:self.redRoomTitleLabel]; - [self addSubview:self.redValueLabel]; - - [self addSubview:self.blueHeadImageView]; - [self addSubview:self.blueRoomTitleLabel]; - [self addSubview:self.blueValueLabel]; - - [self addSubview:self.middleImageView]; - - [self addSubview:self.contributeAvatar]; - [self addSubview:self.contributeHeadWear]; - [self addSubview:self.contributeNick]; - [self addSubview:self.contributeValue]; - - [self addSubview:self.charmAvatar]; - [self addSubview:self.charmHeadWear]; - [self addSubview:self.charmNick]; - [self addSubview:self.charmValue]; -} - -- (void)layoutViews { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.topStateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.centerY.mas_equalTo(self.mas_top).offset(14); - make.size.mas_equalTo(CGSizeMake(375, 125)); - }]; - - [self.middleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.topStateImageView.mas_bottom).offset(40); - make.centerX.mas_equalTo(self); - make.width.mas_equalTo(92); - make.height.mas_equalTo(49); - }]; - - [self.redHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.topStateImageView.mas_bottom).offset(11); - make.leading.mas_equalTo(12.5); - make.width.height.mas_equalTo(68); - }]; - [self.redRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.redHeadImageView); - make.top.mas_equalTo(self.redHeadImageView.mas_bottom).mas_offset(6); - }]; - [self.redValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.redHeadImageView); - make.top.mas_equalTo(self.redRoomTitleLabel.mas_bottom).offset(2); - }]; - - [self.blueHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.redHeadImageView); - make.trailing.mas_equalTo(-12.5); - make.width.height.mas_equalTo(68); - }]; - [self.blueRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.blueHeadImageView); - make.top.mas_equalTo(self.redRoomTitleLabel); - }]; - [self.blueValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.blueHeadImageView); - make.top.mas_equalTo(self.redValueLabel); - }]; - - [self.contributeAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.redHeadImageView); - make.bottom.mas_equalTo(self).offset(-34); - make.width.height.mas_equalTo(36); - }]; - [self.contributeHeadWear mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contributeAvatar); - make.bottom.mas_equalTo(self.contributeAvatar.mas_bottom).offset(4.5); - make.width.mas_equalTo(71.5); - make.height.mas_equalTo(54.5); - }]; - [self.contributeNick mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contributeHeadWear).offset(20.5); - make.leading.mas_equalTo(self.contributeHeadWear.mas_trailing).mas_offset(3); - make.trailing.mas_equalTo(-20); - make.height.mas_equalTo(12); - }]; - [self.contributeValue mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contributeNick); - make.top.mas_equalTo(self.contributeNick.mas_bottom).mas_offset(6.5); - make.trailing.mas_equalTo(-20); - make.height.mas_equalTo(12); - }]; - - [self.charmAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.redHeadImageView); - make.bottom.mas_equalTo(self.contributeHeadWear.mas_top).offset(-18); - make.width.height.mas_equalTo(36); - }]; - [self.charmHeadWear mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.charmAvatar); - make.centerY.mas_equalTo(self.charmAvatar.mas_centerY).offset(-6); - make.width.mas_equalTo(71.5); - make.height.mas_equalTo(54.5); - }]; - [self.charmNick mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.charmHeadWear).offset(20.5); - make.leading.mas_equalTo(self.charmHeadWear.mas_trailing).mas_offset(3); - make.trailing.mas_equalTo(-20); - make.height.mas_equalTo(12); - }]; - [self.charmValue mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.charmNick); - make.top.mas_equalTo(self.charmNick.mas_bottom).mas_offset(6.5); - make.trailing.mas_equalTo(-20); - make.height.mas_equalTo(12); - }]; -} - -- (void)setData:(AcrossRoomPKPanelModel *)data { - if (data.winUid == data.cUid) {//赢 - self.topStateImageView.image = [UIImage getLanguageImage:@"room_across_pk_result_top_win"]; - } else if (data.winUid == data.aUid) {//输 - self.topStateImageView.image = [UIImage getLanguageImage:@"room_across_pk_result_top_fail"]; - } else {//平局 - self.topStateImageView.image = [UIImage getLanguageImage:@"room_across_pk_result_top_draw"]; - } - self.redHeadImageView.imageUrl = data.cAvatar; - self.blueHeadImageView.imageUrl = data.aAvatar; - self.redRoomTitleLabel.text = data.cTitle; - self.blueRoomTitleLabel.text = data.aTitle; - self.redValueLabel.text = [NSString stringWithFormat:@"%lld", data.cAmount]; - self.blueValueLabel.text = [NSString stringWithFormat:@"%lld", data.aAmount]; - if (data.csRank.count > 0) {//有贡献 - AcrossRoomPkRankModel *contributeInfo = [data.csRank xpSafeObjectAtIndex:0]; - self.contributeNick.text = contributeInfo.nick ? contributeInfo.nick : @""; - self.contributeValue.text = [NSString stringWithFormat:@"%@：%@",YMLocalizedString(@"XPAcrossRoomPKResultView0"), contributeInfo.amount? contributeInfo.amount : @""]; - self.contributeAvatar.imageUrl = contributeInfo.avatar; - } - - if (data.crRank.count > 0) { - AcrossRoomPkRankModel *charmInfo = [data.crRank xpSafeObjectAtIndex:0]; - self.charmNick.text = charmInfo.nick ? charmInfo.nick : @""; - self.charmValue.text = [NSString stringWithFormat:@"%@：%@",YMLocalizedString(@"XPAcrossRoomPKResultView1"), charmInfo.amount? charmInfo.amount : @""]; - self.charmAvatar.imageUrl = charmInfo.avatar; - } -} - -#pragma mark - getters and setters -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage imageNamed:@"room_across_pk_result_bg"]; - } - return _bgImageView; -} - -- (UIImageView *)topStateImageView { - if (!_topStateImageView) { - _topStateImageView = [[UIImageView alloc] init]; - } - return _topStateImageView; -} - -- (NetImageView *)redHeadImageView { - if (!_redHeadImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _redHeadImageView = [[NetImageView alloc] initWithConfig:config]; - _redHeadImageView.layer.cornerRadius = 34; - _redHeadImageView.layer.masksToBounds = YES; - _redHeadImageView.layer.borderWidth = 3; - _redHeadImageView.layer.borderColor = UIColorFromRGB(0xc04ab5).CGColor; - } - return _redHeadImageView; -} - -- (UILabel *)redRoomTitleLabel { - if (!_redRoomTitleLabel) { - _redRoomTitleLabel = [[UILabel alloc] init]; - _redRoomTitleLabel.textColor = [UIColor whiteColor]; - _redRoomTitleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _redRoomTitleLabel.textAlignment = NSTextAlignmentCenter; - } - return _redRoomTitleLabel; -} -- (UILabel *)redValueLabel { - if (!_redValueLabel) { - _redValueLabel = [[UILabel alloc] init]; - _redValueLabel.textColor = [UIColor whiteColor]; - _redValueLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _redValueLabel.textAlignment = NSTextAlignmentCenter; - } - return _redValueLabel; -} - -- (UIImageView *)middleImageView { - if (!_middleImageView) { - _middleImageView = [[UIImageView alloc] init]; - _middleImageView.image = [UIImage imageNamed:@"pk_vs_mark_big"]; - } - return _middleImageView; -} - -- (NetImageView *)blueHeadImageView { - if (!_blueHeadImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _blueHeadImageView = [[NetImageView alloc] initWithConfig:config]; - _blueHeadImageView.layer.masksToBounds = YES; - _blueHeadImageView.layer.cornerRadius = 34; - _blueHeadImageView.layer.borderWidth = 3; - _blueHeadImageView.layer.borderColor = UIColorFromRGB(0x5ba5ee).CGColor; - } - return _blueHeadImageView; -} - -- (UILabel *)blueRoomTitleLabel { - if (!_blueRoomTitleLabel) { - _blueRoomTitleLabel = [[UILabel alloc] init]; - _blueRoomTitleLabel.textColor = [UIColor whiteColor]; - _blueRoomTitleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _blueRoomTitleLabel.textAlignment = NSTextAlignmentCenter; - } - return _blueRoomTitleLabel; -} -- (UILabel *)blueValueLabel { - if (!_blueValueLabel) { - _blueValueLabel = [[UILabel alloc] init]; - _blueValueLabel.textColor = [UIColor whiteColor]; - _blueValueLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _blueValueLabel.textAlignment = NSTextAlignmentCenter; - } - return _blueValueLabel; -} - -- (NetImageView *)contributeAvatar { - if (!_contributeAvatar) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _contributeAvatar = [[NetImageView alloc] initWithConfig:config]; - _contributeAvatar.layer.masksToBounds = YES; - _contributeAvatar.layer.cornerRadius = 18; - } - return _contributeAvatar; -} - -- (UIImageView *)contributeHeadWear { - if (!_contributeHeadWear) { - _contributeHeadWear = [[UIImageView alloc] init]; - _contributeHeadWear.image = [UIImage imageNamed:@"room_across_pk_panel_contribute_head"]; - } - return _contributeHeadWear; -} -- (UILabel *)contributeNick { - if (!_contributeNick) { - _contributeNick = [[UILabel alloc] init]; - _contributeNick.textColor = [UIColor whiteColor]; - _contributeNick.font = [UIFont systemFontOfSize:9 weight:UIFontWeightMedium]; - } - return _contributeNick; -} - -- (UILabel *)contributeValue { - if (!_contributeValue) { - _contributeValue = [[UILabel alloc] init]; - _contributeValue.textColor = [UIColor whiteColor]; - _contributeValue.font = [UIFont systemFontOfSize:9 weight:UIFontWeightMedium]; - } - return _contributeValue; -} - -- (NetImageView *)charmAvatar { - if (!_charmAvatar) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _charmAvatar = [[NetImageView alloc] initWithConfig:config]; - _charmAvatar.layer.masksToBounds = YES; - _charmAvatar.layer.cornerRadius = 18; - } - return _charmAvatar; -} - -- (UIImageView *)charmHeadWear { - if (!_charmHeadWear) { - _charmHeadWear = [[UIImageView alloc] init]; - _charmHeadWear.image = [UIImage imageNamed:@"room_across_pk_panel_charm_head"]; - } - return _charmHeadWear; -} -- (UILabel *)charmNick { - if (!_charmNick) { - _charmNick = [[UILabel alloc] init]; - _charmNick.textColor = [UIColor whiteColor]; - _charmNick.font = [UIFont systemFontOfSize:9 weight:UIFontWeightMedium]; - } - return _charmNick; -} - -- (UILabel *)charmValue { - if (!_charmValue) { - _charmValue = [[UILabel alloc] init]; - _charmValue.textColor = [UIColor whiteColor]; - _charmValue.font = [UIFont systemFontOfSize:9 weight:UIFontWeightMedium]; - } - return _charmValue; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.h deleted file mode 100644 index 9668193..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMAcrossRoomPKRuleView.h -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAcrossRoomPKRuleView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.m deleted file mode 100644 index 018623f..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.m +++ /dev/null @@ -1,106 +0,0 @@ -// -// YMAcrossRoomPKRuleView.m -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import "XPAcrossRoomPKRuleView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" - -@interface XPAcrossRoomPKRuleView () -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///显示内容 -@property (nonatomic, strong) SZTextView *ruleTextView; -///背景 -@property (nonatomic, strong) UIImageView *backgroundImageView; - -@end - -@implementation XPAcrossRoomPKRuleView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - for (id view in self.ruleTextView.subviews) { - if ([view isKindOfClass:[UITextView class]]){ - UITextView *textView = view; - textView.textAlignment = NSTextAlignmentLeft; - break; - } - } - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backgroundImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.ruleTextView]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(300, 300)); - }]; - - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(7); - make.centerX.mas_equalTo(self); - make.height.mas_equalTo(18); - }]; - [self.ruleTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(23); - make.leading.mas_equalTo(17); - make.trailing.mas_equalTo(-18); - make.bottom.mas_equalTo(-17); - }]; -} - -#pragma mark - Event Response -- (void)closeBtnClick:(UIButton *)button { - [TTPopup dismiss]; -} - -#pragma mark - Getters And Setters -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] init]; - _backgroundImageView.image = [UIImage imageNamed:@"room_across_pk_rule_bg"]; - } - return _backgroundImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text =YMLocalizedString(@"XPAcrossRoomPKRuleView0"); - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightBold]; - } - return _titleLabel; -} - -- (SZTextView *)ruleTextView { - if (!_ruleTextView) { - _ruleTextView = [[SZTextView alloc] init]; - _ruleTextView.textColor = UIColorFromRGB(0xffffff); - _ruleTextView.backgroundColor = [UIColor clearColor]; - _ruleTextView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _ruleTextView.scrollEnabled = NO; - _ruleTextView.editable = NO; - _ruleTextView.text = YMLocalizedString(@"XPAcrossRoomPKRuleView1"); - } - return _ruleTextView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAnchorPKMatchView.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAnchorPKMatchView.h deleted file mode 100644 index 8052c11..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAnchorPKMatchView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMAnchorPKMatchView.h -// YUMI -// -// Created by YUMI on 2022/11/22. -// - -#import -#import "RoomHostDelegate.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorPKMatchView : UIView - -- (instancetype)initWithDelegate:(id)delegate; - -@property (nonatomic, copy) NSString *roomUid; - -///处理PK超时消息 -- (void)handleMatchTimeOutMessage; - -///PK匹配中计时 -/// - Parameter startTime: 开始时间 -- (void)openCountdownWithTime:(long)startTime; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAnchorPKMatchView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAnchorPKMatchView.m deleted file mode 100644 index 7a76d6f..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAnchorPKMatchView.m +++ /dev/null @@ -1,221 +0,0 @@ -// -// YMAnchorPKMatchView.m -// YUMI -// -// Created by YUMI on 2022/11/22. -// - -#import "XPAnchorPKMatchView.h" -///Third -#import -///Tool -#import "TTPopup.h" -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "Api+AnchorPk.h" -#import "RoomInfoModel.h" -#import "Timestamp.h" - -@interface XPAnchorPKMatchView() -///host 代理 -@property (nonatomic,weak) iddelegate; -///背景 -@property (nonatomic, strong) UIImageView *backImageView; -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///显示倒计时 -@property (nonatomic, strong) UILabel *timeLabel; -///倒计时 -@property (strong, nonatomic) dispatch_source_t timer; - -@end - -@implementation XPAnchorPKMatchView - -- (void)dealloc { - if (self.timer) { - dispatch_source_cancel(self.timer); - self.timer = nil; - } - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (void)removeFromSuperview { - [super removeFromSuperview]; - if (self.timer) { - dispatch_source_cancel(self.timer); - self.timer = nil; - } -} - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super init]) { - _delegate = delegate; - [self initSubViews]; - [self initSubViewConstraints]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(cancelMatch:)]; - [self addGestureRecognizer:tap]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cancelMatchPK) name:@"cancelMatchRandomPK" object:nil]; - } - return self; -} - -- (void)cancelMatch:(UITapGestureRecognizer *)ges { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.message = YMLocalizedString(@"XPAnchorPKMatchView0"); - [TTPopup alertWithConfig:config confirmHandler:^{ - [Api cancelMatchRandomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - if (self.timer) { - dispatch_source_cancel(self.timer); - self.timer = nil; - } - self.delegate.getRoomInfo.pkMatchStartTime = nil; - [self removeFromSuperview]; - } - } roomUid:self.roomUid]; - } cancelHandler:^{ - - }]; -} - -- (void)cancelMatchPK { - if (self.timer) { - dispatch_source_cancel(self.timer); - self.timer = nil; - } - [self removeFromSuperview]; -} - -///PK匹配超时消息 -- (void)handleMatchTimeOutMessage { - if (self.timer) { - dispatch_source_cancel(self.timer); - self.timer = nil; - } - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.message = YMLocalizedString(@"XPAnchorPKMatchView1"); - [TTPopup alertWithConfig:config confirmHandler:^{ - [Api matchRandomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - long long matchPkStartTime = [data.data longLongValue]; - self.delegate.getRoomInfo.pkMatchStartTime = matchPkStartTime; - [self removeFromSuperview]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"anchorPKMatchBegin" object:@{@"matchPkStartTime" : @(matchPkStartTime)}]; - } - } roomUid:self.roomUid]; - } cancelHandler:^{ - [self removeFromSuperview]; - }]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.timeLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(52); - make.height.mas_equalTo(52); - }]; - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(25); - make.height.mas_equalTo(10); - }]; - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.titleLabel); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(2); - make.height.mas_equalTo(10); - }]; -} - -#pragma mark - 倒计时 -- (void)openCountdownWithTime:(long)startTime { - __block long tempTime; - [Timestamp getInternetDateWithSuccess:^(NSTimeInterval timeInterval) { - timeInterval = timeInterval * 1000; - tempTime = (timeInterval - startTime) / 1000; - if (tempTime < 0) { - tempTime = 0; - } - [self handleCountTime:tempTime]; - } failure:^(NSError * _Nonnull error) { - NSDate *datenow = [NSDate date]; - long time2 = (long)([datenow timeIntervalSince1970]*1000); - tempTime = (time2 - startTime) / 1000; - if (tempTime < 0) { - tempTime = 0; - } - [self handleCountTime:tempTime]; - }]; -} - -- (void)handleCountTime:(long)time { - __block long tempTime = time; - if (self.timer == nil) { - @kWeakify(self); - dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - self.timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - dispatch_source_set_timer(self.timer,dispatch_walltime(NULL, 0),1.0*NSEC_PER_SEC, 0); //每秒执行 - dispatch_source_set_event_handler(self.timer, ^{ - @kStrongify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - //设置按钮显示读秒效果 - [self acrossRoomPKCutdownOpen:tempTime]; - }); - tempTime++; - }); - dispatch_resume(self.timer); - } -} - -- (void)acrossRoomPKCutdownOpen:(NSInteger)time { - NSInteger minute = time / 60; - NSInteger second = (time % 60); - NSInteger hour = time/3600; - NSString *timeStr; - if (hour > 0) { - minute = minute % 60; - timeStr = [NSString stringWithFormat:@"%02zd:%02zd:%02zd", hour, minute, second]; - } else { - timeStr = [NSString stringWithFormat:@"%02zd:%02zd", minute, second]; - } - self.timeLabel.text = timeStr; -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.image = [UIImage imageNamed:@"acrossPK_countDown_left_bg"]; - } - return _backImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:10]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.text = YMLocalizedString(@"XPAnchorPKMatchView2"); - } - return _titleLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _timeLabel.textColor = UIColorFromRGB(0xFFF233); - _timeLabel.text = @"00:00"; - } - return _timeLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.h deleted file mode 100644 index 83ce243..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// YMAcrossRoomPKSelectRoomView.h -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPAcrossRoomPKSelectRoomView, AcrossRoomPKInfoModel; -@protocol XPAcrossRoomPKSelectRoomViewDelegate - -- (void)XPAcrossRoomPKSelectRoomView:(XPAcrossRoomPKSelectRoomView *)view didChoosePKRoom:(AcrossRoomPKInfoModel *)pkRoomInfo; - -@end -@interface XPAcrossRoomPKSelectRoomView : UIView -///代理 -@property (nonatomic,weak) id delegate; -///房间的uid -@property (nonatomic,copy) NSString *roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.m deleted file mode 100644 index fef2368..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.m +++ /dev/null @@ -1,369 +0,0 @@ -// -// YMAcrossRoomPKSelectRoomView.m -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import "XPAcrossRoomPKSelectRoomView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "XNDJTDDLoadingTool.h" -#import "UIImage+Utils.h" -#import "Api+AcrossRoomPK.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///Model -#import "AcrossRoomPKInfoModel.h" -///View -#import "XPAcrossRoomPKEmptyTableViewCell.h" -#import "XPAcrossRoomPKTableViewCell.h" - -@interface XPAcrossRoomPKSelectRoomView () - -///返回按钮 -@property (nonatomic, strong) UIButton *backButton; -@property (nonatomic, strong) UITableView *tableView; -///确认选择 -@property (nonatomic, strong) UIButton *doneButton; -///输入框背景 -@property (nonatomic,strong) UIView * inputBackView; -///搜索logo -@property (nonatomic,strong) UIButton *searchButton; -///输入框 -@property (nonatomic,strong) MSBaseTextField *searchTextField; -///数据源 -@property (nonatomic, strong) NSMutableArray *datasource; -///当前的页数 -@property (nonatomic, assign) NSInteger page; -///是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///选中的PK房间 -@property (nonatomic, strong) AcrossRoomPKInfoModel *selectRoomInfo; - -@end - -@implementation XPAcrossRoomPKSelectRoomView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - [self initHeaderAndFooterRefresh]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColorFromRGB(0x2A2A39); - [self addSubview:self.backButton]; - [self addSubview:self.inputBackView]; - [self addSubview:self.tableView]; - [self addSubview:self.doneButton]; - - [self.inputBackView addSubview:self.searchButton]; - [self.inputBackView addSubview:self.searchTextField]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onKeyBoardResign:)]; - [self addGestureRecognizer:tap]; -} - -- (void)initSubViewConstraints { - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(12); - make.width.mas_equalTo(22); - make.height.mas_equalTo(22); - make.top.mas_equalTo(27); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.inputBackView.mas_bottom).mas_offset(5); - make.leading.trailing.mas_equalTo(0); - make.bottom.mas_equalTo(self.mas_bottom); - }]; - - [self.doneButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-38); - make.width.mas_equalTo(300); - make.height.mas_equalTo(40); - make.centerX.mas_equalTo(self); - }]; - - [self.inputBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - make.leading.mas_equalTo(self.backButton.mas_trailing).offset(5); - make.trailing.mas_equalTo(self.mas_trailing).offset(-15); - make.centerY.mas_equalTo(self.backButton); - }]; - - [self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20, 20)); - make.centerY.mas_equalTo(self.inputBackView); - make.trailing.mas_equalTo(self.inputBackView).offset(-12); - }]; - - [self.searchTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.inputBackView).offset(25); - make.top.bottom.mas_equalTo(self.inputBackView); - make.trailing.mas_equalTo(self.searchButton.mas_leading).offset(-5); - }]; -} - -- (void)initHeaderAndFooterRefresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; -} - -#pragma mark - 刷新的方法 -- (void)loadData:(NSInteger)state { - @kWeakify(self); - [Api getAcrossRoomPKRoomList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - NSArray * array = [AcrossRoomPKInfoModel modelsWithArray:data.data]; - [self getAcrossRoomPKListSuccess:array state:state]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } - roomUid:self.roomUid - pageNum:[NSString stringWithFormat:@"%ld", self.page] - pageSize:@"20"]; -} - -- (void)headerRefresh { - self.page = 1; - [self loadData:0]; -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPAcrossRoomPKSelectRoomView0")]; - return; - } - self.page++; - [self loadData:1]; -} - -- (void)getAcrossRoomPKListSuccess:(NSArray *)list state:(NSInteger)state { - if (state == 0) { - self.selectRoomInfo = nil; - self.doneButton.enabled = NO; - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - if (list.count > 0) { - self.hasNoMoreData = NO; - [self.datasource addObjectsFromArray:list]; - } else { - self.hasNoMoreData = YES; - [self.tableView.mj_footer endRefreshingWithNoMoreData]; - } - [self.tableView reloadData]; -} - -- (void)onKeyBoardResign:(UITapGestureRecognizer *)ges { - [self.searchTextField resignFirstResponder]; -} - -#pragma mark - tableviewDelegate -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPAcrossRoomPKTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPAcrossRoomPKTableViewCell class])]; - if (cell == nil) { - cell = [[XPAcrossRoomPKTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPAcrossRoomPKTableViewCell class])]; - } - cell.delegate = self; - AcrossRoomPKInfoModel * pkRoomInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (pkRoomInfo.uid.integerValue == self.selectRoomInfo.uid.integerValue) { - pkRoomInfo.hadSelected = YES; - } else { - pkRoomInfo.hadSelected = NO; - } - cell.roomPKInfo = pkRoomInfo; - return cell; - } - - XPAcrossRoomPKEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPAcrossRoomPKEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPAcrossRoomPKEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPAcrossRoomPKEmptyTableViewCell class])]; - } - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - return 75; - } - return (370 + kSafeAreaBottomHeight); -} - -#pragma mark - XPAcrossRoomPKTableViewCellDelegate -- (void)xPAcrossRoomPKTableViewCell:(XPAcrossRoomPKTableViewCell *)view didChooseRoom:(AcrossRoomPKInfoModel *)roomInfo{ - if (self.selectRoomInfo && roomInfo.uid == self.selectRoomInfo.uid) {///有选中的且点击了选中的，取消掉选择 - [self.tableView reloadData]; - self.selectRoomInfo = nil; - self.doneButton.enabled = NO; - } else { - self.selectRoomInfo = roomInfo; - [self.tableView reloadData]; - self.doneButton.enabled = YES; - } -} - -#pragma mark - Event Response -- (void)searchButtonAction:(UIButton *)sender { - if (self.searchTextField.text.length > 0) { - [Api searchAcrossRoomPKRoomList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [AcrossRoomPKInfoModel modelsWithArray:data.data]; - [self getAcrossRoomPKListSuccess:array state:0]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } erbanNo:self.searchTextField.text roomUid:@"" pageNum:@"1" pageSize:@"50"]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPAnchorPKSelectRoomView1")]; - } -} - -- (void)backButtonAction:(UIButton *)sender { - [self.searchTextField resignFirstResponder]; - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromLeft; - [self.layer addAnimation:transition forKey:nil]; - [self removeFromSuperview]; -} - -- (void)doneButtonAction:(UIButton *)sender { - [self.searchTextField resignFirstResponder]; - if (self.delegate && [self.delegate respondsToSelector:@selector(XPAcrossRoomPKSelectRoomView:didChoosePKRoom:)]) { - [self.delegate XPAcrossRoomPKSelectRoomView:self didChoosePKRoom:self.selectRoomInfo]; - } - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromLeft; - [self.layer addAnimation:transition forKey:nil]; - [self removeFromSuperview]; -} - -#pragma mark - Getters And Setters -- (void)setRoomUid:(NSString *)roomUid { - _roomUid = roomUid; - [self.datasource removeAllObjects]; - [self.tableView reloadData]; - if (_roomUid.length > 0) { - [self headerRefresh]; - } -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, 100)]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPAcrossRoomPKTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPAcrossRoomPKTableViewCell class])]; - [_tableView registerClass:[XPAcrossRoomPKEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPAcrossRoomPKEmptyTableViewCell class])]; - } - return _tableView; -} - -- (UIView *)inputBackView { - if (!_inputBackView) { - _inputBackView = [[UIView alloc] init]; - _inputBackView.backgroundColor = UIColorFromRGB(0x4C4C6A); - _inputBackView.layer.masksToBounds = YES; - _inputBackView.layer.cornerRadius = 15; - } - return _inputBackView; -} - -- (UIButton *)searchButton { - if (!_searchButton) { - _searchButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_searchButton setImage:[UIImage imageNamed:@"home_search_input_search"] forState:UIControlStateNormal]; - [_searchButton setImage:[UIImage imageNamed:@"home_search_input_search"] forState:UIControlStateSelected]; - [_searchButton addTarget:self action:@selector(searchButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _searchButton; -} - -- (MSBaseTextField *)searchTextField { - if (!_searchTextField) { - _searchTextField = [[MSBaseTextField alloc] init]; - _searchTextField.layer.cornerRadius = 15; - _searchTextField.layer.masksToBounds = YES; - _searchTextField.tintColor = [UIColor whiteColor]; - _searchTextField.textColor = [UIColor whiteColor]; - _searchTextField.backgroundColor = [UIColor clearColor]; - _searchTextField.font = [UIFont systemFontOfSize:13]; - NSString *placeholder = YMLocalizedString(@"XPAnchorPKSelectRoomView1"); - _searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [UIColor colorWithWhite:1 alpha:0.4]}]; - } - return _searchTextField; -} - -- (UIButton *)doneButton { - if (!_doneButton) { - _doneButton = [[UIButton alloc] init]; - [_doneButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0x4C4C6A)] forState:UIControlStateDisabled]; - [_doneButton setTitleColor:[UIColor whiteColor] forState:UIControlStateDisabled]; - [_doneButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFF9813), UIColorFromRGB(0xFFB22B)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_doneButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_doneButton setTitle:YMLocalizedString(@"XPAcrossRoomPKSelectRoomView3") forState:UIControlStateNormal]; - _doneButton.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - [_doneButton addTarget:self action:@selector(doneButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _doneButton.enabled = NO; - _doneButton.layer.masksToBounds = YES; - _doneButton.layer.cornerRadius = 20; - } - return _doneButton; -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [[UIButton alloc] init]; - [_backButton setImage:[[UIImage imageNamed:@"home_search_white_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - _backButton.imageView.contentMode = UIViewContentModeScaleAspectFit; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.h b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.h deleted file mode 100644 index 00ec8f8..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMAcrossRoomPKViewController.h -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAcrossRoomPKViewController : MvpViewController -- (instancetype)initWithRoomUid:(NSString *)roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m deleted file mode 100644 index f952854..0000000 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m +++ /dev/null @@ -1,672 +0,0 @@ -// -// YMAcrossRoomPKViewController.m -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import "XPAcrossRoomPKViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "TTPopup.h" -///Model -#import "AcrossRoomPKInfoModel.h" -///View -#import "XPAcrossRoomPKSelectRoomView.h" -#import "XPAcrossRoomPKRuleView.h" -///P -#import "XPAcrossRoomPKPresenter.h" -#import "XPAcrossRoomProtocol.h" - -#define kContentHeight (404 + kSafeAreaBottomHeight) - -@interface XPAcrossRoomPKViewController () -///顶部点击消失的view -@property (nonatomic, strong) UIView *topView; -///显示内容的view -@property (nonatomic, strong) UIView *contentView; -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///帮助 -@property (nonatomic, strong) UIButton *helpButton; -///PK对象的容器 -@property (nonatomic,strong) UIStackView *userStackView; -///选择PK对象title -@property (nonatomic, strong) UILabel *selectPKLabel; -///选择PK对象 -@property (nonatomic, strong) UIButton *selectPKButton; -///PK对象的容器 -@property (nonatomic,strong) UIStackView *timeStackView; -///选择PK时长title -@property (nonatomic, strong) UILabel *selectPKTimeLabel; -///选择PK时间的容器 -@property (nonatomic,strong) UIStackView *chooseTimeStackView; -@property (nonatomic, strong) UIButton *tenMinuteButton; -@property (nonatomic, strong) UIButton *twentyMinuteButton; -@property (nonatomic, strong) UIButton *thirtyMinuteButton; -///自定义PK时间 -@property (nonatomic, strong) MSBaseTextField *customTimeTextField; -///玩法的容器 -@property (nonatomic,strong) UIStackView *playStackView; -///PK玩法title -@property (nonatomic, strong) UILabel *pkPlayModeLabel; -///PK玩法 -@property (nonatomic, strong) MSBaseTextField *pkPlayModeTextField; -///发起挑战按钮 -@property (nonatomic, strong) UIButton *doneButton; -///选择房间的内容 -@property (nonatomic, strong) UIView *selectRoomContentView; -///选中的房间头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -///房间标题 -@property (nonatomic, strong) UILabel *roomTitleLabel; -//平台ID -@property (nonatomic, strong) UILabel *idLabel; -///取消选择房间 -@property (nonatomic, strong) UIButton *cancelButton; -///选中的PK房间 -@property (nonatomic, strong) AcrossRoomPKInfoModel *selectRoomInfo; -///PK的时长 -@property (nonatomic, assign) NSInteger pkDuration; -///选择PK房间 -@property (nonatomic, strong) XPAcrossRoomPKSelectRoomView *selectView; -///房间信息 -@property (nonatomic,strong) NSString *roomUid; -@end - -@implementation XPAcrossRoomPKViewController - -- (instancetype)initWithRoomUid:(NSString *)roomUid { - if (self = [super init]) { - self.roomUid = roomUid; - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - } - return self; -} - -- (XPAcrossRoomPKPresenter *)createPresenter { - return [[XPAcrossRoomPKPresenter alloc] init];; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - self.pkDuration = 10; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [IQKeyboardManager sharedManager].enable = YES; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.topView]; - [self.view addSubview:self.contentView]; - - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.helpButton]; - [self.contentView addSubview:self.userStackView]; - [self.contentView addSubview:self.timeStackView]; - [self.contentView addSubview:self.playStackView]; - [self.contentView addSubview:self.customTimeTextField]; - [self.contentView addSubview:self.doneButton]; - - [self.userStackView addArrangedSubview:self.selectPKLabel]; - [self.userStackView addArrangedSubview:self.selectPKButton]; - [self.userStackView addArrangedSubview:self.selectRoomContentView]; - - [self.timeStackView addArrangedSubview:self.selectPKTimeLabel]; - [self.timeStackView addArrangedSubview:self.chooseTimeStackView]; - - [self.chooseTimeStackView addArrangedSubview:self.tenMinuteButton]; - [self.chooseTimeStackView addArrangedSubview:self.twentyMinuteButton]; - [self.chooseTimeStackView addArrangedSubview:self.thirtyMinuteButton]; - - [self.playStackView addArrangedSubview:self.pkPlayModeLabel]; - [self.playStackView addArrangedSubview:self.pkPlayModeTextField]; - - [self.selectRoomContentView addSubview:self.avatarImageView]; - [self.selectRoomContentView addSubview:self.roomTitleLabel]; - [self.selectRoomContentView addSubview:self.idLabel]; - [self.selectRoomContentView addSubview:self.cancelButton]; -} - -- (void)initSubViewConstraints { - - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.contentView.mas_top); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.height.mas_equalTo(kContentHeight); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(18); - }]; - - [self.helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-12); - make.width.height.mas_equalTo(22); - make.centerY.mas_equalTo(self.titleLabel); - }]; - - [self.userStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(32); - make.leading.mas_equalTo(self.contentView).offset(22); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(20); - }]; - - [self.selectPKLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(90); - }]; - - [self.selectPKButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(22); - }]; - - [self.selectRoomContentView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth - 85 - 12 * 2 - 16); - }]; - - [self.timeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(32); - make.leading.trailing.mas_equalTo(self.contentView).inset(22); - make.top.mas_equalTo(self.userStackView.mas_bottom).offset(30); - }]; - - [self.selectPKTimeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.selectPKLabel); - }]; - - [self.customTimeTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(32); - make.width.mas_equalTo(170); - make.top.mas_equalTo(self.timeStackView.mas_bottom).offset(16); - make.leading.mas_equalTo(self.tenMinuteButton); - }]; - - [self.playStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.height.mas_equalTo(self.timeStackView); - make.top.mas_equalTo(self.customTimeTextField.mas_bottom).offset(30); - }]; - - [self.pkPlayModeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.selectPKLabel); - }]; - - [self.doneButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(40); - make.leading.trailing.mas_equalTo(self.contentView).inset(40); - make.bottom.mas_equalTo(self.contentView.mas_bottom).offset(-34 - kSafeAreaBottomHeight); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.selectRoomContentView); - make.leading.mas_equalTo(self.selectRoomContentView); - make.height.width.mas_equalTo(60); - }]; - [self.roomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-3); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(6); - make.trailing.mas_lessThanOrEqualTo(self.cancelButton.mas_leading); - }]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_centerY).mas_offset(3); - make.leading.trailing.mas_equalTo(self.roomTitleLabel); - }]; - - [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avatarImageView); - make.trailing.mas_equalTo(self.selectRoomContentView).offset(-12); - make.height.width.mas_equalTo(22); - }]; -} - -- (void)updateDoneButtonState { - if (self.selectRoomInfo && self.pkDuration >= 5 && self.pkDuration <= 180) { - self.doneButton.enabled = YES; - } else { - self.doneButton.enabled = NO; - } -} -#pragma mark - XPAcrossRoomProtocol -- (void)beginAcrossRoomPKSuccess { - [self showSuccessToast:YMLocalizedString(@"XPAcrossRoomPKViewController0")]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)beginAcrossRoomPKFail:(NSString *)message { - if (message.length >0) { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.actionStyle = TTAlertActionConfirmStyle; - config.cancelButtonConfig.title = YMLocalizedString(@"XPAcrossRoomPKViewController1"); - config.message = message; - [TTPopup alertWithConfig:config confirmHandler:^{ - - } cancelHandler:^{ - - }]; - } -} - -#pragma mark - TTRoomPKSelectViewControllerDelegate -///选择要PK的对象按钮点击 -- (void)XPAcrossRoomPKSelectRoomView:(XPAcrossRoomPKSelectRoomView *)view didChoosePKRoom:(AcrossRoomPKInfoModel *)pkRoomInfo{ - if (pkRoomInfo) { - [self.userStackView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(60); - }]; - self.selectRoomContentView.hidden = NO; - self.selectPKButton.hidden= YES; - self.avatarImageView.imageUrl = pkRoomInfo.avatar; - self.roomTitleLabel.text = pkRoomInfo.title; - self.idLabel.text = [NSString stringWithFormat:@"ID：%@", pkRoomInfo.erbanNo]; - self.selectRoomInfo = pkRoomInfo; - [self updateDoneButtonState]; - } -} -#pragma mark - UITextFieldDelegate -- (void)textFieldDidChanged:(UITextField *)textField { - if (textField == self.customTimeTextField) { - self.tenMinuteButton.selected = YES; - self.twentyMinuteButton.selected = YES; - self.thirtyMinuteButton.selected = YES; - NSString *countStr = [self.customTimeTextField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; - NSInteger count = [countStr integerValue]; - if (count > 180) { - [self showErrorToast:YMLocalizedString(@"XPAcrossRoomPKViewController2")]; - } - else if(count < 5) { - [self showErrorToast:YMLocalizedString(@"XPAcrossRoomPKViewController3")]; - } - self.pkDuration = textField.text.integerValue; - [self updateDoneButtonState]; - } else if(textField == self.pkPlayModeTextField) { - if (self.pkPlayModeTextField.text.length > 10) { - self.pkPlayModeTextField.text = [self.pkPlayModeTextField.text substringToIndex:10]; - } - } -} - -- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { - if (textField == self.customTimeTextField) { - NSString *regex =@"[0-9]*"; - NSPredicate *pred = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",regex]; - if ([pred evaluateWithObject:string]) { - return YES; - } - return NO; - } - return YES; -} - -#pragma mark - Event Response -- (void)helpButtonAction:(UIButton *)sender { - [self.customTimeTextField resignFirstResponder]; - [self.pkPlayModeTextField resignFirstResponder]; - XPAcrossRoomPKRuleView *view = [[XPAcrossRoomPKRuleView alloc] init]; - [TTPopup popupView:view style:TTPopupStyleAlert]; -} - -- (void)selectPKButtonAction:(UIButton *)sender { - [self.customTimeTextField resignFirstResponder]; - [self.pkPlayModeTextField resignFirstResponder]; - self.selectView.roomUid = self.roomUid; - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromRight; - [self.selectView.layer addAnimation:transition forKey:nil]; - [self.contentView addSubview:self.selectView]; -} - -- (void)chooseTimeButtonAction:(UIButton *)sender { - [self.customTimeTextField resignFirstResponder]; - [self.pkPlayModeTextField resignFirstResponder]; - self.tenMinuteButton.selected = YES; - self.twentyMinuteButton.selected = YES; - self.thirtyMinuteButton.selected = YES; - sender.selected = NO; - self.pkDuration = sender.tag; - self.customTimeTextField.text = nil; -} - -- (void)doneButtonAction:(UIButton *)sender { - [self.customTimeTextField resignFirstResponder]; - [self.pkPlayModeTextField resignFirstResponder]; - NSString * pkDes = self.pkPlayModeTextField.text.length > 0 ? self.pkPlayModeTextField.text : @""; - [self.presenter beginAcrossRoomPK:self.roomUid duration:self.pkDuration acceptUid:self.selectRoomInfo.uid playDesc:pkDes]; -} - -- (void)cancelButtonAction:(UIButton *)sender { - self.selectRoomContentView.hidden = YES; - self.selectPKButton.hidden = NO; - self.selectRoomInfo = nil; - [self updateDoneButtonState]; - self.avatarImageView.image = nil; - self.roomTitleLabel.text = nil; - self.idLabel.text = nil; - [self.userStackView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(32); - }]; -} - -- (void)onKeyBoardResign:(UITapGestureRecognizer *)ges { - [self.customTimeTextField resignFirstResponder]; - [self.pkPlayModeTextField resignFirstResponder]; - if (self.selectView.superview) { - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromLeft; - [self.selectView.layer addAnimation:transition forKey:nil]; - [self.selectView removeFromSuperview]; - } else { - [self dismissViewControllerAnimated:YES completion:nil]; - } -} - -#pragma mark - Getters And Setters -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = UIColor.whiteColor; - _titleLabel.font = [UIFont boldSystemFontOfSize:18]; - _titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteView8"); - } - return _titleLabel; -} -- (UIButton *)helpButton { - if (!_helpButton) { - _helpButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_helpButton setImage:[UIImage imageNamed:@"room_across_pk_help"] forState:UIControlStateNormal]; - [_helpButton addTarget:self action:@selector(helpButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _helpButton; -} - -- (UIStackView *)userStackView { - if (!_userStackView) { - _userStackView = [[UIStackView alloc] init]; - _userStackView.axis = UILayoutConstraintAxisHorizontal; - _userStackView.distribution = UIStackViewDistributionFill; - _userStackView.alignment = UIStackViewAlignmentFill; - _userStackView.spacing = 16; - } - return _userStackView; -} -- (UILabel *)selectPKLabel { - if (!_selectPKLabel) { - _selectPKLabel = [[UILabel alloc] init]; - _selectPKLabel.textColor = [UIColor whiteColor]; - _selectPKLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _selectPKLabel.text = YMLocalizedString(@"XPAcrossRoomPKViewController5"); - [_selectPKLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _selectPKLabel; -} -- (UIButton *)selectPKButton { - if (!_selectPKButton) { - _selectPKButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_selectPKButton setImage:[UIImage imageNamed:@"room_across_pk_add_room"] forState:UIControlStateNormal]; - [_selectPKButton addTarget:self action:@selector(selectPKButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _selectPKButton; -} - -- (UIStackView *)timeStackView { - if (!_timeStackView) { - _timeStackView = [[UIStackView alloc] init]; - _timeStackView.axis = UILayoutConstraintAxisHorizontal; - _timeStackView.distribution = UIStackViewDistributionFill; - _timeStackView.alignment = UIStackViewAlignmentFill; - _timeStackView.spacing = 16; - } - return _timeStackView; -} -- (UILabel *)selectPKTimeLabel { - if (!_selectPKTimeLabel) { - _selectPKTimeLabel = [[UILabel alloc] init]; - _selectPKTimeLabel.textColor =[UIColor whiteColor]; - _selectPKTimeLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _selectPKTimeLabel.text = YMLocalizedString(@"XPAcrossRoomPKViewController6"); - } - return _selectPKTimeLabel; -} - -- (UIStackView *)chooseTimeStackView { - if (!_chooseTimeStackView) { - _chooseTimeStackView = [[UIStackView alloc] init]; - _chooseTimeStackView.axis = UILayoutConstraintAxisHorizontal; - _chooseTimeStackView.distribution = UIStackViewDistributionFillEqually; - _chooseTimeStackView.alignment = UIStackViewAlignmentFill; - _chooseTimeStackView.spacing = 5; - } - return _chooseTimeStackView; -} - -- (UIButton *)tenMinuteButton { - if (!_tenMinuteButton) { - _tenMinuteButton = [[UIButton alloc] init]; - [_tenMinuteButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFF9813), UIColorFromRGB(0xFFB22B)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_tenMinuteButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0x4C4C6A)] forState:UIControlStateSelected]; - [_tenMinuteButton setTitle:YMLocalizedString(@"XPAcrossRoomPKViewController7") forState:UIControlStateNormal]; - _tenMinuteButton.titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - [_tenMinuteButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_tenMinuteButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateSelected]; - _tenMinuteButton.tag = 10; - [_tenMinuteButton addTarget:self action:@selector(chooseTimeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _tenMinuteButton.selected = NO; - _tenMinuteButton.layer.masksToBounds = YES; - _tenMinuteButton.layer.cornerRadius = 32 / 2; - } - return _tenMinuteButton; -} - -- (UIButton *)twentyMinuteButton { - if (!_twentyMinuteButton) { - _twentyMinuteButton = [[UIButton alloc] init]; - [_twentyMinuteButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFF9813), UIColorFromRGB(0xFFB22B)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_twentyMinuteButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0x4C4C6A)] forState:UIControlStateSelected]; - [_twentyMinuteButton setTitle:YMLocalizedString(@"XPAcrossRoomPKViewController8") forState:UIControlStateNormal]; - _twentyMinuteButton.titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - [_twentyMinuteButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_twentyMinuteButton setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - _twentyMinuteButton.tag = 20; - [_twentyMinuteButton addTarget:self action:@selector(chooseTimeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _twentyMinuteButton.selected = YES; - _twentyMinuteButton.layer.masksToBounds = YES; - _twentyMinuteButton.layer.cornerRadius = 32 / 2; - } - return _twentyMinuteButton; -} - -- (UIButton *)thirtyMinuteButton { - if (!_thirtyMinuteButton) { - _thirtyMinuteButton = [[UIButton alloc] init]; - [_thirtyMinuteButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFF9813), UIColorFromRGB(0xFFB22B)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_thirtyMinuteButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0x4C4C6A)] forState:UIControlStateSelected]; - [_thirtyMinuteButton setTitle:YMLocalizedString(@"XPAcrossRoomPKViewController9") forState:UIControlStateNormal]; - _thirtyMinuteButton.titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - [_thirtyMinuteButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_thirtyMinuteButton setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - _thirtyMinuteButton.tag = 30; - _thirtyMinuteButton.layer.masksToBounds = YES; - _thirtyMinuteButton.layer.cornerRadius = 32 / 2; - [_thirtyMinuteButton addTarget:self action:@selector(chooseTimeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _thirtyMinuteButton.selected = YES; - } - return _thirtyMinuteButton; -} -- (MSBaseTextField *)customTimeTextField { - if (!_customTimeTextField) { - _customTimeTextField = [[MSBaseTextField alloc] init]; - _customTimeTextField.layer.cornerRadius = 15; - _customTimeTextField.layer.masksToBounds = YES; - _customTimeTextField.backgroundColor = UIColorFromRGB(0x4C4C6A); - _customTimeTextField.textColor = [UIColor whiteColor]; - _customTimeTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 19, 0)]; - _customTimeTextField.leftViewMode = UITextFieldViewModeAlways; - _customTimeTextField.delegate = self; - _customTimeTextField.keyboardType = UIKeyboardTypeNumberPad; - _customTimeTextField.tintColor = [UIColor whiteColor]; - _customTimeTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPAcrossRoomPKViewController10") attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName: UIColorFromRGB(0xC6C6E9)}]; - [_customTimeTextField addTarget:self action:@selector(textFieldDidChanged:) forControlEvents:UIControlEventEditingChanged]; - - } - return _customTimeTextField; -} -- (UIStackView *)playStackView { - if (!_playStackView) { - _playStackView = [[UIStackView alloc] init]; - _playStackView.axis = UILayoutConstraintAxisHorizontal; - _playStackView.distribution = UIStackViewDistributionFill; - _playStackView.alignment = UIStackViewAlignmentFill; - _playStackView.spacing = 16; - } - return _playStackView; -} - -- (UILabel *)pkPlayModeLabel { - if (!_pkPlayModeLabel) { - _pkPlayModeLabel = [[UILabel alloc] init]; - _pkPlayModeLabel.textColor = [UIColor whiteColor]; - _pkPlayModeLabel.textAlignment = NSTextAlignmentRight; - _pkPlayModeLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _pkPlayModeLabel.text = YMLocalizedString(@"XPAcrossRoomPKViewController11"); - } - return _pkPlayModeLabel; -} - -- (MSBaseTextField *)pkPlayModeTextField { - if (!_pkPlayModeTextField) { - _pkPlayModeTextField = [[MSBaseTextField alloc] init]; - _pkPlayModeTextField.layer.cornerRadius = 15; - _pkPlayModeTextField.layer.masksToBounds = YES; - _pkPlayModeTextField.backgroundColor = UIColorFromRGB(0x4C4C6A); - _pkPlayModeTextField.textColor = [UIColor whiteColor]; - _pkPlayModeTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 19, 0)]; - _pkPlayModeTextField.leftViewMode = UITextFieldViewModeAlways; - _pkPlayModeTextField.delegate = self; - _pkPlayModeTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPAcrossRoomPKViewController12") attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName: UIColorFromRGB(0xC6C6E9)}]; - [_pkPlayModeTextField addTarget:self action:@selector(textFieldDidChanged:) forControlEvents:UIControlEventEditingChanged]; - } - return _pkPlayModeTextField; -} - -- (UIButton *)doneButton { - if (!_doneButton) { - _doneButton = [[UIButton alloc] init]; - [_doneButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFF9813), UIColorFromRGB(0xFFB22B)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_doneButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0x4C4C6A)] forState:UIControlStateDisabled]; - [_doneButton setTitle:YMLocalizedString(@"XPAcrossRoomPKViewController13") forState:UIControlStateNormal]; - _doneButton.layer.masksToBounds = YES; - _doneButton.layer.cornerRadius = 20; - _doneButton.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - [_doneButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_doneButton setTitleColor:[UIColor colorWithWhite:1 alpha:0.3] forState:UIControlStateDisabled]; - [_doneButton addTarget:self action:@selector(doneButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _doneButton.enabled = NO; - } - return _doneButton; -} - -- (UIView *)selectRoomContentView { - if (!_selectRoomContentView) { - _selectRoomContentView = [[UIView alloc] init]; - _selectRoomContentView.hidden = YES; - } - return _selectRoomContentView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 60 / 2; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UILabel *)roomTitleLabel { - if (!_roomTitleLabel) { - _roomTitleLabel = [[UILabel alloc] init]; - _roomTitleLabel.textColor = [UIColor whiteColor]; - _roomTitleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - } - return _roomTitleLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.textColor = [UIColor whiteColor]; - _idLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - } - return _idLabel; -} - -- (UIButton *)cancelButton { - if (!_cancelButton) { - _cancelButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_cancelButton setImage:[UIImage imageNamed:@"room_across_delete_pk_room"] forState:UIControlStateNormal]; - [_cancelButton addTarget:self action:@selector(cancelButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _cancelButton; -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = UIColorFromRGB(0x2A2A39); - CAShapeLayer * layer = [CAShapeLayer layer]; - layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth,kContentHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)].CGPath; - _contentView.layer.mask = layer; - } - return _contentView; -} - -- (UIView *)topView { - if (!_topView) { - _topView = [[UIView alloc] init]; - _topView.backgroundColor = UIColor.blackColor; - _topView.alpha = 0.3; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onKeyBoardResign:)]; - [_topView addGestureRecognizer:tap]; - } - return _topView; -} - -- (XPAcrossRoomPKSelectRoomView *)selectView { - if (!_selectView) { - _selectView = [[XPAcrossRoomPKSelectRoomView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, kContentHeight)]; - _selectView.delegate = self; - } - return _selectView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayCell.h b/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayCell.h deleted file mode 100644 index 1c1db19..0000000 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PIRoomActivityChoosePlayCell.h -// YuMi -// -// Created by duoban on 2024/2/20. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomActivityChoosePlayCell : UICollectionViewCell -@property(nonatomic,copy) NSString *imageUrl; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayCell.m b/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayCell.m deleted file mode 100644 index cac5a91..0000000 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayCell.m +++ /dev/null @@ -1,47 +0,0 @@ -// -// PIRoomActivityChoosePlayCell.m -// YuMi -// -// Created by duoban on 2024/2/20. -// - -#import "PIRoomActivityChoosePlayCell.h" -@interface PIRoomActivityChoosePlayCell() -@property(nonatomic,strong) NetImageView *playIconView; -@end -@implementation PIRoomActivityChoosePlayCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} -- (void)setImageUrl:(NSString *)imageUrl{ - _imageUrl = imageUrl; - _playIconView.image = nil; - [_playIconView loadImageWithUrl:_imageUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - self.playIconView.image = image; - }]; -} --(void)installUI{ - self.contentView.backgroundColor = UIColorRGBAlpha(0x727272, 0.6); - self.contentView.layer.cornerRadius = 7; - self.contentView.layer.masksToBounds = YES; - [self.contentView addSubview:self.playIconView]; -} --(void)installConstraints{ - [self.playIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(43); - make.center.equalTo(self.contentView); - }]; -} -#pragma mark - 懒加载 -- (NetImageView *)playIconView{ - if(!_playIconView){ - _playIconView = [NetImageView new]; - } - return _playIconView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayView.h b/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayView.h deleted file mode 100644 index 37dfc87..0000000 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// PIRoomActivityChoosePlayView.h -// YuMi -// -// Created by duoban on 2024/2/20. -// - -#import -#import "ActivityInfoModel.h" -NS_ASSUME_NONNULL_BEGIN -@class PIRoomActivityChoosePlayView; -@protocol PIRoomActivityChoosePlayViewDelegate - --(void)hiddenViewActionWithView:(PIRoomActivityChoosePlayView *)view; --(void)choosePlayTypeWithView:(PIRoomActivityChoosePlayView *)view model:(ActivityInfoModel *)model; - -@end - - -@interface PIRoomActivityChoosePlayView : UIView -@property(nonatomic,strong) NSMutableArray *playList; -@property(nonatomic,weak) iddelegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayView.m b/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayView.m deleted file mode 100644 index f5aace0..0000000 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityChoosePlayView.m +++ /dev/null @@ -1,129 +0,0 @@ -// -// PIRoomActivityChoosePlayView.m -// YuMi -// -// Created by duoban on 2024/2/20. -// - -#import "PIRoomActivityChoosePlayView.h" -#import "PIRoomActivityChoosePlayCell.h" -#import "ActivityInfoModel.h" -@interface PIRoomActivityChoosePlayView () -@property(nonatomic,strong) UIButton *clickBtn; -@property(nonatomic,strong) UICollectionView *collectionView; -@property(nonatomic,strong) UIImageView *bgImageView; -@property (nonatomic, strong) UIVisualEffectView *effectView; -@end -@implementation PIRoomActivityChoosePlayView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.clickBtn]; - [self addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.effectView]; - [self.bgImageView addSubview:self.collectionView]; - -} --(void)installConstraints{ - [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(14); - make.leading.equalTo(self); - make.centerY.equalTo(self); - }]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-6); - make.top.bottom.equalTo(self); - make.width.mas_equalTo(180); - }]; - [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.bgImageView); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.bgImageView); - }]; -} --(void)setPlayList:(NSMutableArray *)playList{ - _playList = playList; - [self.collectionView reloadData]; -} -#pragma mark - UICollectionViewDelegate,UICollectionViewDataSource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ - return self.playList.count; -} -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - PIRoomActivityChoosePlayCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([PIRoomActivityChoosePlayCell class]) forIndexPath:indexPath]; - ActivityInfoModel *model = [self.playList xpSafeObjectAtIndex:indexPath.row]; - cell.imageUrl = model.icon; - return cell; -} --(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - ActivityInfoModel *model = [self.playList xpSafeObjectAtIndex:indexPath.row]; - if(self.delegate && [self.delegate respondsToSelector:@selector(choosePlayTypeWithView:model:)]){ - [self.delegate choosePlayTypeWithView:self model:model]; - } -} --(void)clickBtnAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(hiddenViewActionWithView:)]){ - [self.delegate hiddenViewActionWithView:self]; - } - -} -#pragma mark - 懒加载 -- (UICollectionView *)collectionView{ - if(!_collectionView){ - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.minimumLineSpacing = 8; - layout.minimumInteritemSpacing = 8; - layout.itemSize = CGSizeMake(48, 48); - layout.scrollDirection = UICollectionViewScrollDirectionVertical; - layout.sectionInset = UIEdgeInsetsMake(10, 10, 10, 10); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[ PIRoomActivityChoosePlayCell class] forCellWithReuseIdentifier:NSStringFromClass([ PIRoomActivityChoosePlayCell class])]; - - - } - return _collectionView; -} -- (UIButton *)clickBtn{ - if(!_clickBtn){ - _clickBtn = [UIButton new]; - [_clickBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_clickBtn setImage:[kImage(@"pi_room_activity_choose_play_arrow")ms_SetImageForRTL] forState:UIControlStateNormal]; - [_clickBtn addTarget:self action:@selector(clickBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _clickBtn; -} -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.layer.cornerRadius = 12; - _bgImageView.layer.masksToBounds = YES; - _bgImageView.layer.borderColor = [UIColor colorWithWhite:1 alpha:0.8].CGColor; - _bgImageView.layer.borderWidth = 1; - _bgImageView.userInteractionEnabled = YES; - - } - return _bgImageView; -} -- (UIVisualEffectView *)effectView { - if (!_effectView) { - - UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; - _effectView = [[UIVisualEffectView alloc] initWithEffect:beffect]; - _effectView.alpha = 0.8; - - } - return _effectView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityClickView.h b/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityClickView.h deleted file mode 100644 index 6b5ca22..0000000 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityClickView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// PIRoomActivityClickView.h -// YuMi -// -// Created by duoban on 2024/2/20. -// - -#import -#import "ActivityInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol PIRoomActivityClickViewDelegate - --(void)showChoosePlayViewAction; --(void)clickPlayTypeWithModel:(ActivityInfoModel *)model; -@end - - -@interface PIRoomActivityClickView : UIView -@property(nonatomic,strong) ActivityInfoModel *model; -@property(nonatomic,weak) iddelegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityClickView.m b/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityClickView.m deleted file mode 100644 index a3cae7c..0000000 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityClickView.m +++ /dev/null @@ -1,108 +0,0 @@ -// -// PIRoomActivityClickView.m -// YuMi -// -// Created by duoban on 2024/2/20. -// - -#import "PIRoomActivityClickView.h" -@interface PIRoomActivityClickView() -@property(nonatomic,strong) UIButton *clickBtn; -@property(nonatomic,strong) UIImageView *bgImageView; -@property(nonatomic,strong) NetImageView *playIconView; -@property (nonatomic, strong) UIVisualEffectView *effectView; -@end -@implementation PIRoomActivityClickView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.clickBtn]; - [self addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.effectView]; - [self.bgImageView addSubview:self.playIconView]; -} --(void)installConstraints{ - [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(14); - make.leading.centerY.equalTo(self); - }]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(66); - make.centerY.equalTo(self); - make.leading.mas_equalTo(15); - }]; - [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.bgImageView); - }]; - [self.playIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(58); - make.center.equalTo(self.bgImageView); - }]; -} -- (void)setModel:(ActivityInfoModel *)model{ - _model = model; - [_playIconView loadImageWithUrl:_model.icon completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - self.playIconView.image = image; - }]; -} --(void)clickBtnAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(showChoosePlayViewAction)]){ - [self.delegate showChoosePlayViewAction]; - } -} --(void)clickPlayImageAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(clickPlayTypeWithModel:)]){ - [self.delegate clickPlayTypeWithModel:self.model]; - } -} -#pragma mark - 懒加载 -- (UIButton *)clickBtn{ - if(!_clickBtn){ - _clickBtn = [UIButton new]; - [_clickBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_clickBtn setImage:[kImage(@"pi_room_activity_click_arrow")ms_SetImageForRTL] forState:UIControlStateNormal]; - [_clickBtn addTarget:self action:@selector(clickBtnAction) forControlEvents:UIControlEventTouchUpInside]; - - } - return _clickBtn; -} -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.layer.cornerRadius = 7; - _bgImageView.layer.masksToBounds = YES; - _bgImageView.layer.borderColor = [UIColor colorWithWhite:1 alpha:0.8].CGColor; - _bgImageView.layer.borderWidth = 1; - _bgImageView.userInteractionEnabled = YES; - - } - return _bgImageView; -} -- (UIVisualEffectView *)effectView { - if (!_effectView) { - - UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; - _effectView = [[UIVisualEffectView alloc] initWithEffect:beffect]; - _effectView.alpha = 0.8; - - } - return _effectView; -} -- (NetImageView *)playIconView{ - if(!_playIconView){ - _playIconView = [NetImageView new]; - _playIconView.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickPlayImageAction)]; - [_playIconView addGestureRecognizer:tap]; - - } - return _playIconView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.h b/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.h deleted file mode 100644 index e46f787..0000000 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// PIRoomActivityWebCell.h -// YuMi -// -// Created by duoban on 2023/11/15. -// - -#import -#import "ActivityInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomActivityWebCell : UICollectionViewCell -@property(nonatomic,assign) BOOL pi_isChoose; -@property(nonatomic,strong) ActivityInfoModel *infoModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.m b/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.m deleted file mode 100644 index dac4dfe..0000000 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.m +++ /dev/null @@ -1,52 +0,0 @@ -// -// PIRoomActivityWebCell.m -// YuMi -// -// Created by duoban on 2023/11/15. -// - -#import "PIRoomActivityWebCell.h" -@interface PIRoomActivityWebCell() -@property(nonatomic,strong) NetImageView *bgImageView; -@end -@implementation PIRoomActivityWebCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.contentView.backgroundColor = [UIColor clearColor]; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.bgImageView]; -} --(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; -} --(void)setPi_isChoose:(BOOL)pi_isChoose{ - _pi_isChoose = pi_isChoose; - _bgImageView.layer.borderWidth = _pi_isChoose ? 2 : 0; -} --(void)setInfoModel:(ActivityInfoModel *)infoModel{ - _infoModel = infoModel; - _bgImageView.imageUrl = _infoModel.url; -} -#pragma mark - 懒加载 -- (NetImageView *)bgImageView{ - if(!_bgImageView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; config.placeHolder = [UIImageConstant defaultBannerPlaceholder]; - _bgImageView = [[NetImageView alloc]initWithConfig:config]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - _bgImageView.layer.cornerRadius = kGetScaleWidth(4); - _bgImageView.layer.masksToBounds = YES; - _bgImageView.layer.borderWidth = 0; - _bgImageView.layer.borderColor = UIColorFromRGB(0x9168FA).CGColor; - } - return _bgImageView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebView.h b/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebView.h deleted file mode 100644 index 71325ee..0000000 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// PIRoomActivityWebView.h -// YuMi -// -// Created by duoban on 2023/11/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -#define kWebViewScale ((CGFloat)KScreenHeight / (CGFloat)812) -@interface PIRoomActivityWebView : UIView -@property(nonatomic,strong) NSMutableArray *infoList; -///地址 -@property (nonatomic,copy) NSString *url; -///房间uid -@property (nonatomic,copy) NSString *roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebView.m b/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebView.m deleted file mode 100644 index db01a10..0000000 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebView.m +++ /dev/null @@ -1,157 +0,0 @@ -// -// PIRoomActivityWebView.m -// YuMi -// -// Created by duoban on 2023/11/15. -// - -#import "PIRoomActivityWebView.h" -#import "PIRoomActivityWebCell.h" -#import "XPWebViewController.h" - -@interface PIRoomActivityWebView () -@property(nonatomic,strong) UIButton *pi_backBtn; -@property(nonatomic,strong) UIView *bgView; -@property(nonatomic,strong) UICollectionView *collectionView; - -///加入h5 -@property (nonatomic, strong) XPWebViewController *webVC; -@property(nonatomic,assign) NSInteger path; -@end -@implementation PIRoomActivityWebView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - @kWeakify(self); - self.webVC.CloseWebViewBlock = ^(BOOL result) { - @kStrongify(self); - [self dissViewAction]; - }; - } - return self; -} --(void)installUI{ - [self addSubview:self.pi_backBtn]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.collectionView]; - [self.bgView addSubview:self.webVC.view]; - -} --(void)installConstraints{ - [self.pi_backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self); - make.height.mas_equalTo(643 * kWebViewScale); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.bgView); - make.height.mas_equalTo(kGetScaleWidth(42)); - make.top.mas_equalTo(kGetScaleWidth(10)); - }]; - [self.webVC.view mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.bgView); - make.top.mas_equalTo(kGetScaleWidth(60)); - }]; -} -#pragma mark - UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ - return self.infoList.count; -} -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - PIRoomActivityWebCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([PIRoomActivityWebCell class]) forIndexPath:indexPath]; - cell.infoModel = [self.infoList xpSafeObjectAtIndex:indexPath.row]; - cell.pi_isChoose = self.path == indexPath.row; - return cell; -} -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - ActivityInfoModel *model = [_infoList xpSafeObjectAtIndex:indexPath.row]; - self.webVC.url = model.skipContent; - self.path = indexPath.row; - [self.collectionView reloadData]; -} --(void)dissViewAction{ - [UIView animateWithDuration:0.2 animations:^{ - self.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight); - }completion:^(BOOL finished) { - [self removeFromSuperview]; - }]; -} -- (void)setRoomUid:(NSString *)roomUid{ - _roomUid = roomUid; - self.webVC.roomUid = _roomUid; -} -- (void)setUrl:(NSString *)url{ - _url = url; - self.webVC.url = _url; -} --(void)setInfoList:(NSMutableArray *)infoList{ - _infoList = infoList; - for (int i = 0; i < _infoList.count; i++) { - ActivityInfoModel *model = _infoList[i]; - if([model.skipContent isEqualToString:_url]){ - self.path = i; - break; - } - } - [self.collectionView reloadData]; - [self.collectionView.superview layoutIfNeeded]; - if(_infoList.count > self.path && self.path > 3){ - UICollectionViewLayoutAttributes *layoutAttributes = [self.collectionView.collectionViewLayout layoutAttributesForItemAtIndexPath:[NSIndexPath indexPathForRow:self.path - 3 inSection:0]]; - // 滑动 - CGPoint poiot = CGPointMake(layoutAttributes.frame.origin.x - kGetScaleWidth(10), layoutAttributes.frame.origin.y); - [self.collectionView setContentOffset:poiot animated:YES]; - } - -} -#pragma mark - 懒加载 -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.minimumLineSpacing = kGetScaleWidth(8); - layout.minimumInteritemSpacing = kGetScaleWidth(8); - layout.itemSize = CGSizeMake(kGetScaleWidth(90), kGetScaleWidth(42)); - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(8), 0, kGetScaleWidth(8)); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.showsVerticalScrollIndicator = NO; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[PIRoomActivityWebCell class] forCellWithReuseIdentifier:NSStringFromClass([PIRoomActivityWebCell class])]; - - } - return _collectionView; -} -- (XPWebViewController *)webVC { - if (_webVC == nil) { - _webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - _webVC.isProperty = YES; - _webVC.view.backgroundColor = [UIColor clearColor]; - CGFloat heigth = 643 * kWebViewScale - kGetScaleWidth(60); - [_webVC.view setCornerWithLeftTopCorner:kGetScaleWidth(10) rightTopCorner:kGetScaleWidth(10) bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth, heigth)]; - } - return _webVC; -} - -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = UIColorFromRGB(0x262629); - - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(8) rightTopCorner:kGetScaleWidth(8) bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth,642 *kWebViewScale)]; - } - return _bgView; -} -- (UIButton *)pi_backBtn{ - if(!_pi_backBtn){ - _pi_backBtn = [UIButton new]; - [_pi_backBtn addTarget:self action:@selector(dissViewAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _pi_backBtn; -} -@end diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.h b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.h deleted file mode 100644 index 68225aa..0000000 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// YMRoomActivityView.h -// YUMI -// -// Created by YUMI on 2021/10/12. -// - -#import -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" -#import "XPRedPacketModel.h" -#import "RoomInfoModel.h" -#import "ActivityInfoModel.h" -#import "LittleGameInfoModel.h" - -@class BoomDetailModel; - -typedef void(^OpenRedPacketHandle)(XPRedPacketModel *_Nullable,RoomType type ,BOOL isChangeRoom); - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomActivityContainerView : UIView -@property(nonatomic,copy)OpenRedPacketHandle openRedPacketHandle; -@property (nonatomic, copy) void(^showSendGiftView)(void); -@property(nonatomic,strong) NSMutableArray *redPacketList; -@property(nonatomic,strong) NSMutableArray *playList; -@property(nonatomic,strong) NSMutableArray *littleGameList; -- (instancetype)initWithDelegate:(id)delegate; -- (void)updateView; -- (void)updateForBoomDetailArray:(NSArray *)models; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m deleted file mode 100644 index 4659453..0000000 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m +++ /dev/null @@ -1,833 +0,0 @@ -// -// XPRoomActivityView.m -// xplan-ios -// -// Created by 冯硕 on 2021/10/12. -// - -#import "XPRoomActivityContainerView.h" -#import -///Third -#import -#import -///Tool -#import "AccountInfoStorage.h" -#import "Api+Room.h" -#import "Api+LittleGame.h" -#import "ClientConfig.h" -#import "NetImageView.h" -#import "TTPopup.h" - -///Model -#import "UserInfoModel.h" -#import "RoomInfoModel.h" -#import "BoomInfoModel.h" -#import "AttachmentModel.h" -#import "FirstRechargeModel.h" -#import "XPRedPacketResultModel.h" - -///View -#import "XPRoomHalfWebView.h" -#import "XPCandyTreeViewController.h" -#import "XPWebViewController.h" -#import "XPRoomViewController.h" -#import "XPArrangeMicViewController.h" -#import "XPSailingViewController.h" -#import "XCCurrentVCStackManager.h" -#import "PIRoomEnterRedPacketView.h" -#import "BaseNavigationController.h" -#import "PIRoomActivityWebView.h" - -#import "MSRoomGameWebVC.h" -#import "RoomAnimationView.h" -#import "MSRoomMenuGameVC.h" - -#import "BoomInfoModel.h" -#import "RoomBoomManager.h" -#import "RoomBoomEntryView.h" -#import "BoomInfoViewController.h" - - -@interface XPRoomActivityContainerView () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///轮播图 -@property (nonatomic,strong) SDCycleScrollView *pi_cycleScrollView; -///红包 -@property(nonatomic,strong) PIRoomEnterRedPacketView *redPacketView; -/// 配置的入口，逻辑由 API 返回数据决定 -@property(nonatomic, strong) UIButton *configEntranceMenuButton; -///游戏菜单按钮 -@property(nonatomic, strong) UIButton *gambleMenuButton; -///游戏菜单按钮 -@property(nonatomic, strong) UIButton *pkMenuButton; -///参加相亲 -@property (nonatomic,strong) UIImageView *joinDatingView; -///host 代理 -@property (nonatomic,weak) idhostDelegate; -///房间活动的列表 -@property (nonatomic,strong) NSMutableArray *activityList; -///是否加载了活动 -@property (nonatomic,assign) BOOL isLoadActivity; - -@property (nonatomic, strong) RoomBoomEntryView *boomView; -@property (nonatomic, copy) NSArray *boomModels; -@property (nonatomic, strong) BoomDetailModel *currentLevelBoomModel; - -@property (nonatomic, strong) NetImageView *loader_url_1; -@property (nonatomic, strong) NetImageView *loader_url_2; - -@end - -@implementation XPRoomActivityContainerView --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; - [[RoomBoomManager sharedManager] removeEventListenerForTarget:self]; -} - -- (instancetype)initWithDelegate:(id)delegate { - self = [super init]; - if (self) { - self.hostDelegate = delegate; - [self initSubViews]; - [self initSubViewConstraints]; - - [self setupBoomManager]; - } - return self; -} - -- (void)updateView { - if (self.isLoadActivity) { - [self configLittleGameActivity]; - } else { - [self requestActivityList]; - } -} - -- (void)updateForBoomDetailArray:(NSArray *)models { - _boomModels = models; - if (!models || models.count == 0) { - self.boomView.hidden = YES; - return; - } - - self.boomView.hidden = NO; - BOOL hasBoom = NO; - if (models) { - for (BoomDetailModel *boom in models) { - if (boom.currLevel == 1) { - hasBoom = YES; - self.boomView.boomModel = boom; - break; - } - } - } - - if (!hasBoom) { - // 处理到顶级后可能找不到数据的异常 - self.boomView.boomModel = [models lastObject]; - } -} - -- (void)setupBoomManager { - @kWeakify(self); - [[RoomBoomManager sharedManager] registerBoomProgressUpdate:^(id _Nonnull sth) { - @kStrongify(self); - if ([sth isKindOfClass:[BoomDetailModel class]]) { - self.boomView.boomModel = (BoomDetailModel *)sth; - } - } target:self]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.stackView]; - UIView *emptyView = [UIView new]; - [self.stackView addArrangedSubview:self.pi_cycleScrollView]; - [self.stackView addArrangedSubview:emptyView]; - [self.stackView addArrangedSubview:self.redPacketView]; - [self.stackView addArrangedSubview:self.joinDatingView]; - [self.stackView addArrangedSubview:self.boomView]; - [self.stackView addArrangedSubview:self.pkMenuButton]; - [self.stackView addArrangedSubview:self.configEntranceMenuButton]; - [self.stackView addArrangedSubview:self.gambleMenuButton]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - CGFloat scrollItemWidth = KScreenHeight > 667 ? 65 : 55 * kScreenHeightScale; - CGSize itemSize = CGSizeMake(scrollItemWidth , scrollItemWidth); - CGSize itemSize_game_rocket = CGSizeMake(55 , 55); - [self.pi_cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(itemSize); - }]; - - [self.redPacketView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(58)); - }]; - - [self.pkMenuButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.size.mas_equalTo(itemSize_game_rocket); - }]; - - [self.gambleMenuButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.size.mas_equalTo(itemSize_game_rocket); - }]; - - [self.boomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.size.mas_equalTo(itemSize_game_rocket); - }]; - - [self.configEntranceMenuButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.size.mas_equalTo(itemSize_game_rocket); - }]; - - [self.joinDatingView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(35 * kScreenHeightScale); - }]; -} - -- (void)requestActivityList { - @kWeakify(self); - RACSubject* playRAC = [RACSubject subject]; - RACSubject* littleGameRAC = [RACSubject subject]; - [[RACSignal combineLatest:@[playRAC, littleGameRAC] - reduce:^id(NSArray *playModels, NSArray *littleGameModels){ - @kStrongify(self); - self.playList = [NSMutableArray arrayWithArray:playModels]; - self.littleGameList = [NSMutableArray arrayWithArray:littleGameModels]; - - self.gambleMenuButton.hidden = (self.playList.count == 0 && littleGameModels.count == 0) ? YES : NO; - - [self onRoomUpdate]; - return nil; - }] subscribeError:^(NSError * _Nullable error) {}]; - - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - - [Api roomActivityList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - NSArray * array = [ActivityInfoModel modelsWithArray:data.data]; - self.activityList = [NSMutableArray arrayWithArray:array]; - [self dealWithData]; - } - } roomId:roomId]; - - [Api getPlayList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [ActivityInfoModel modelsWithArray:data.data]; - [playRAC sendNext:array]; - [playRAC sendCompleted]; - } else { - [playRAC sendError:nil]; - } - } roomId:roomId]; - - NSString * roomUid = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - [Api getLittleGameList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [LittleGameInfoModel modelsWithArray:data.data]; - [littleGameRAC sendNext:array]; - [littleGameRAC sendCompleted]; - } else { - [littleGameRAC sendError:nil]; - } - } - roomUid:roomUid]; -} - --(void)dealWithData{ - self.isLoadActivity = YES; - self.pi_cycleScrollView.hidden = NO; - - self.gambleMenuButton.hidden = (self.playList.count == 0 && self.littleGameList.count == 0) ? YES : NO; - - if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) { - [self configLittleGameActivity]; - } else { - NSMutableArray *picArray = [NSMutableArray array]; - for (ActivityInfoModel *model in self.activityList) { - [picArray addObject:model.icon]; - } - self.pi_cycleScrollView.imageURLStringsGroup = picArray; - if (self.activityList.count > 1) { - [self.pi_cycleScrollView setAutoScroll:YES]; - self.pi_cycleScrollView.autoScrollTimeInterval = 3; - } else { - [self.pi_cycleScrollView setAutoScroll:NO]; - } - } -} - -- (void)configLittleGameActivity { - NSMutableArray *list = [NSMutableArray array]; - - [list addObjectsFromArray:self.activityList]; - NSMutableArray *picArray = [NSMutableArray array]; - for (ActivityInfoModel *model in list) { - [picArray addObject:model.icon ?: @""]; - } - self.pi_cycleScrollView.imageURLStringsGroup = picArray; - if (self.activityList.count > 1) { - [self.pi_cycleScrollView setAutoScroll:YES]; - self.pi_cycleScrollView.autoScrollTimeInterval = 3; - }else{ - [self.pi_cycleScrollView setAutoScroll:NO]; - } -} - -- (void)setRedPacketList:(NSMutableArray *)redPacketList{ - _redPacketList = redPacketList; - self.redPacketView.redPacketList = redPacketList; - if(self.openRedPacketHandle){ - self.openRedPacketHandle(nil,self.hostDelegate.getRoomInfo.type,YES); - } -} -#pragma mark - RoomGuestDelegat -- (void)updateConfigEntranceButtons:(RoomInfoModel *)roomInfo { - RoomBottomEntranceModel *model = roomInfo.rightBottomIconConfig; - if (model) { - @kWeakify(self); - - if (model.icon2Url.length > 0) { - if (!_loader_url_2) { - _loader_url_2 = [[NetImageView alloc] init]; - } - [self.loader_url_2 loadImageWithUrl:model.icon2Url - completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - [self.gambleMenuButton setImage:image forState:UIControlStateNormal]; - }]; - } - - if (model.icon1Url.length > 0) { - if (!_loader_url_1) { - _loader_url_1 = [[NetImageView alloc] init]; - } - self.loader_url_1 = [[NetImageView alloc] init]; - [self.loader_url_1 loadImageWithUrl:model.icon1Url - completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - [self.configEntranceMenuButton setImage:image forState:UIControlStateNormal]; - self.configEntranceMenuButton.hidden = NO; - } fail:^(NSError * _Nonnull error) { - self.configEntranceMenuButton.hidden = YES; - }]; - } else { - [self.configEntranceMenuButton removeFromSuperview]; - } - } -} - -- (void)onRoomUpdate { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - - [self updateConfigEntranceButtons:roomInfo]; - - if (roomInfo.type == RoomType_Anchor || roomInfo.roomModeType == RoomModeType_Open_Blind) { - self.pkMenuButton.hidden = YES; - } else { - self.pkMenuButton.hidden = NO; - } - - if (roomInfo.roomModeType != RoomModeType_Open_PK_Mode) { - [self.pkMenuButton removeFromSuperview]; - [self.stackView insertArrangedSubview:self.gambleMenuButton atIndex:0]; - } else { - [self.gambleMenuButton removeFromSuperview]; - [self.stackView addArrangedSubview:self.pkMenuButton]; - } - - self.redPacketView.type = roomInfo.type; - if (roomInfo.type == RoomType_MiniGame) { - self.redPacketView.hidden = YES; - - [self.pi_cycleScrollView removeFromSuperview]; - [self.stackView addArrangedSubview:self.pi_cycleScrollView]; - [self.gambleMenuButton bringSubviewToFront:self.stackView]; - if (self.isLoadActivity) { - [self configLittleGameActivity]; - } else { - [self requestActivityList]; - } - } else { - [self.gambleMenuButton removeFromSuperview]; - [self.pi_cycleScrollView removeFromSuperview]; - [self.stackView insertArrangedSubview:self.pi_cycleScrollView atIndex:0]; - [self.stackView addArrangedSubview:self.gambleMenuButton]; - self.redPacketView.redPacketList = self.redPacketList; - NSMutableArray *picArray = [NSMutableArray array]; - for (ActivityInfoModel *model in self.activityList) { - [picArray addObject:model.icon]; - } - self.pi_cycleScrollView.imageURLStringsGroup = picArray; - if (self.activityList.count > 1) { - [self.pi_cycleScrollView setAutoScroll:YES]; - self.pi_cycleScrollView.autoScrollTimeInterval = 3; - } else { - [self.pi_cycleScrollView setAutoScroll:NO]; - } - - if (roomInfo.roomModeType == RoomModeType_Open_Blind || roomInfo.roomModeType == RoomModeType_Open_PK_Mode || roomInfo.roomModeType == RoomModeType_Open_Micro_Mode) { - if (roomInfo.roomModeType == RoomModeType_Open_PK_Mode ) { - self.joinDatingView.image = [UIImage getLanguageImage:@"room_pk_normal_member_enter"]; - } else { - self.joinDatingView.image = [UIImage getLanguageImage:@"room_mode_dating_enter"]; - } - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - @kStrongify(self); - if (error == nil) { - NIMChatroomMember * member = members.firstObject; - if (member.type == NIMTeamMemberTypeOwner || member.type == NIMTeamMemberTypeManager) { - self.joinDatingView.hidden = YES; - return; - } - } - self.joinDatingView.hidden = NO; - }]; - } else { - self.joinDatingView.hidden = YES; - } - } - - if(self.openRedPacketHandle){ - self.openRedPacketHandle(nil,self.hostDelegate.getRoomInfo.type,YES); - } -} - -- (void)onRoomEntered { - [self onRoomUpdate]; -} - -- (void)handleNIMCustomMessage:(NIMMessage *)message { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_First_Recharge_Reward && attachment.second == Custom_Message_Sub_Room_First_Recharge_Reward) { - } - } -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - switch (content.eventType) { - case NIMChatroomEventTypeAddManager: - { - if (self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind || self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - for (NIMChatroomNotificationMember * member in content.targets) { - if (member.userId.intValue == [AccountInfoStorage instance].getUid.integerValue) { - self.joinDatingView.hidden = YES; - break; - } - } - } - } - break; - case NIMChatroomEventTypeRemoveManager: - { - if (self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind || self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - for (NIMChatroomNotificationMember * member in content.targets) { - if (member.userId.intValue == [AccountInfoStorage instance].getUid.integerValue) { - self.joinDatingView.hidden = NO; - break; - } - } - } - } - break; - default: - break; - } -} - -#pragma mark - SDCycleScrollViewDelegate -- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index { - NSArray *imageUrlList = cycleScrollView.imageURLStringsGroup; - if (imageUrlList.count > index) { - NSString *pic = imageUrlList[index]; - NSMutableArray *inftList = [NSMutableArray array]; - if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) { - [self jumpPlayActionWithIndex:index imageUrlList:imageUrlList]; - return; - } - ActivityInfoModel * info; - for (ActivityInfoModel * getInfo in self.activityList) { - if([getInfo.icon isEqualToString:pic]){ - info = getInfo; - } - if(getInfo.skipType == 3 ){ - [inftList addObject:getInfo]; - } - } - if(info == nil)return; - if([info.code isEqualToString:@"FIRST_CHARGE"]) { - [self firstRechargeTapRecognizer]; - }else if ([info.code isEqualToString:@"FIND_LOVE"]) { - [self lookLoveTapRecognizer]; - } else if([info.code isEqualToString:@"NAUTICAL_ADVENTURE"]) { - [self sailTapRecognizer]; - } else { - if (info.skipType == ActivitySkipType_Room) { - [self.hostDelegate exitRoom]; - [XPRoomViewController openRoom:info.skipContent viewController:kWindow.rootViewController]; - } else if(info.skipType == ActivitySkipType_Web) { - PIRoomActivityWebView * webView = [[PIRoomActivityWebView alloc]initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)]; - webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - webView.url = info.skipContent; - webView.infoList = inftList; - [kWindow addSubview:webView]; - [UIView animateWithDuration:0.2 animations:^{ - webView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - }]; - } - } - } -} - --(void)jumpPlayActionWithIndex:(NSInteger)index imageUrlList:(NSArray *)imageUrlList{ - if (imageUrlList.count > index) { - NSString *pic = imageUrlList[index]; - NSMutableArray *inftList = [NSMutableArray array]; - NSMutableArray *modelList = [NSMutableArray array]; - [modelList addObjectsFromArray:self.activityList]; - ActivityInfoModel * info; - for (int i = 0 ; i < modelList.count; i++) { - ActivityInfoModel * getInfo = modelList[i]; - if([getInfo.icon isEqualToString:pic]){ - info = getInfo; - } - if(getInfo.skipType == 3){ - [inftList addObject:getInfo]; - } - } - - if(info == nil)return; - if([info.code isEqualToString:@"FIRST_CHARGE"]) { - [self firstRechargeTapRecognizer]; - } else if ([info.code isEqualToString:@"FIND_LOVE"]) { - [self lookLoveTapRecognizer]; - } else if([info.code isEqualToString:@"NAUTICAL_ADVENTURE"]) { - [self sailTapRecognizer]; - } else { -// if(index < self.playList.count){ -// if(info.showType == ActivityShowType_Half){ -// XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; -// webView.isPlayView = YES; -// webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; -// webView.url = info.skipContent; -// [TTPopup popupView:webView style:TTPopupStyleActionSheet]; -// return; -// } -// XPWebViewController * webVC = [[XPWebViewController alloc] init]; -// webVC.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; -// webVC.url = info.skipContent; -// [self.hostDelegate.getCurrentNav pushViewController:webVC animated:YES]; -// return; -// } - - if (info.skipType == ActivitySkipType_Room) { - [self.hostDelegate exitRoom]; - [XPRoomViewController openRoom:info.skipContent viewController:kWindow.rootViewController]; - } else if(info.skipType == ActivitySkipType_Web) { - PIRoomActivityWebView * webView = [[PIRoomActivityWebView alloc]initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)]; - webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - webView.url = info.skipContent; - webView.infoList = inftList; - [kWindow addSubview:webView]; - [UIView animateWithDuration:0.2 animations:^{ - webView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - }]; - } - } - } -} - - -#pragma mark - Event Response -- (void)lookLoveTapRecognizer { - XPCandyTreeViewController * candyTreeVC = [[XPCandyTreeViewController alloc] initWithDelegate:self.hostDelegate]; - candyTreeVC.view.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight); - [[XCCurrentVCStackManager shareManager].getCurrentVC.view addSubview:candyTreeVC.view]; - [[XCCurrentVCStackManager shareManager].getCurrentVC addChildViewController:candyTreeVC]; - [candyTreeVC.navigationController setNavigationBarHidden:YES animated:NO]; - [UIView animateWithDuration:0.1 animations:^{ - candyTreeVC.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - }completion:^(BOOL finished) { - - }]; -} - -- (void)firstRechargeTapRecognizer { -} - -- (void)didTapJoinDatingRecognizer { - if (self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode && self.hostDelegate.isRoomPKPlaying) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomActivityContainerView2")]; - return; - } - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - NIMChatroomMember * member; - if (error == nil) { - member = members.firstObject; - } - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - XPArrangeMicInfoModel * info = [[XPArrangeMicInfoModel alloc] init]; - info.roomUid = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - info.roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - info.nick = roomInfo.nick; - info.roomAvatar = roomInfo.avatar; - info.roomTitle = roomInfo.title; - info.micQueue = [self.hostDelegate getMicroQueue]; - info.isManager = (member.type == NIMChatroomMemberTypeCreator || member.type == NIMChatroomMemberTypeManager); - info.type = roomInfo.roomModeType == RoomModeType_Open_Blind ? ArrangeMicType_Dating : roomInfo.roomModeType == RoomModeType_Open_PK_Mode ? ArrangeMicType_Room_PK : ArrangeMicType_Normal; - XPArrangeMicViewController * arrangeMicVC = [[XPArrangeMicViewController alloc] initWithInfo:info]; - [self.hostDelegate.getCurrentNav presentViewController:arrangeMicVC animated:YES completion:nil]; - }]; -} - -- (void)sailTapRecognizer { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - XPSailingViewController * sailingVC = [[XPSailingViewController alloc] initWithRoomUid:roomUid]; - [self.hostDelegate.getCurrentNav presentViewController:sailingVC animated:YES completion:nil]; -} - -- (void)didTapGameMenuButton { - MSRoomMenuGameVC *vc = [[MSRoomMenuGameVC alloc] initWithDelegate:self.hostDelegate roomMenuType:MSRoomMenuTypeGame]; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:vc animated:YES completion:nil]; -} - -- (void)displayBoomInfoProgress { - BoomInfoViewController *vc = [[BoomInfoViewController alloc] init]; - vc.roomUid = self.hostDelegate.getRoomInfo.uid; - vc.partitionId = self.hostDelegate.getUserInfo.partitionId; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:vc animated:YES completion:nil]; - - @kWeakify(self); - [vc setShowGiftPanel:^{ - @kStrongify(self); - if (self.showSendGiftView) { - self.showSendGiftView(); - } - }]; -} - -- (void)didTapConfigEntranceButton { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - RoomBottomEntranceModel *model = roomInfo.rightBottomIconConfig; - - if (!model) { - return; - } - if (model.skipUrl.length == 0) { - return; - } - - switch (model.skipType) { - case 1: { - XPWebViewController *vc = [[XPWebViewController alloc] initWithRoomUID:@(roomInfo.uid).stringValue]; - vc.url = model.skipUrl; - [self.hostDelegate.getCurrentNav pushViewController:vc animated:YES]; - } - break; - case 2: { - if ([self.hostDelegate isKindOfClass:[XPRoomViewController class]]){ - ActivityInfoModel *activityModel = [[ActivityInfoModel alloc] init]; - activityModel.skipContent = model.skipUrl; - activityModel.skipType = ActivitySkipType_Web; - activityModel.showType = 1; - activityModel.code = @"BAISHUN"; - activityModel.ruleValue = model.reserve; - if (activityModel.gameModel) { - MSRoomGameWebVC *vc = [[MSRoomGameWebVC alloc] initWithDelegate:self.hostDelegate - gameModel:activityModel]; - vc.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - XPRoomViewController *roomVC = (XPRoomViewController *)self.hostDelegate; - [roomVC addChildViewController:vc]; - RoomAnimationView *animationView; - for (id obj in self.hostDelegate.getSuperView.subviews) { - if ([obj isKindOfClass:[RoomAnimationView class]]){ - animationView = obj; - break; - } - } - [self.hostDelegate.getSuperView addSubview:vc.view]; - vc.view.tag = 913; - } - } - } - - default: - break; - } -} - -- (void)didTapPKMenuButton { - [self.hostDelegate showPKPanel]; -} - -#pragma mark- PIRoomEnterRedPacketViewDelegate --(void)openRedPacketWithModel:(XPRedPacketModel *)redModel{ - if(self.openRedPacketHandle){ - self.openRedPacketHandle(redModel,self.hostDelegate.getRoomInfo.type,NO); - } -} - --(void)clickPlayTypeWithModel:(ActivityInfoModel *)model{ - if ([model.code isEqualToString:@"FIND_LOVE"]) { - [self lookLoveTapRecognizer]; - } else if([model.code isEqualToString:@"NAUTICAL_ADVENTURE"]) { - [self sailTapRecognizer]; - } else if(model.skipType == ActivitySkipType_Web) { - if(model.showType == ActivityShowType_Half){ - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.isPlayView = YES; - webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - webView.url = model.skipContent; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; - return; - } - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:@(self.hostDelegate.getRoomInfo.uid).stringValue]; - webVC.url = model.skipContent; - [self.hostDelegate.getCurrentNav pushViewController:webVC animated:YES]; - } -} - -#pragma mark - Getters And Setters -- (SDCycleScrollView *)pi_cycleScrollView { - if (!_pi_cycleScrollView) { - _pi_cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:nil]; - _pi_cycleScrollView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter; - _pi_cycleScrollView.currentPageDotColor = [UIColor whiteColor]; - _pi_cycleScrollView.pageDotColor = [UIColor colorWithWhite:1 alpha:0.2]; - - _pi_cycleScrollView.pageControlDotSize = CGSizeMake(5, 2); - _pi_cycleScrollView.pageControlStyle = SDCycleScrollViewPageContolStyleClassic; - _pi_cycleScrollView.currentPageDotImage = [UIImage imageNamed:@"room_activity_banner_select"]; - _pi_cycleScrollView.pageDotImage = [UIImage imageNamed:@"room_activity_banner_normal"]; - _pi_cycleScrollView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.00]; - _pi_cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFit; - _pi_cycleScrollView.pageControlBottomOffset = -10; - _pi_cycleScrollView.hidden = YES; - // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 - _pi_cycleScrollView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - for (UIView *subView in _pi_cycleScrollView.subviews) { - subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - } - return _pi_cycleScrollView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFillEqually; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 14; - } - return _stackView; -} - -- (UIImageView *)joinDatingView { - if (!_joinDatingView) { - _joinDatingView = [[UIImageView alloc] init]; - _joinDatingView.image = [UIImage getLanguageImage:@"room_mode_dating_enter"]; - _joinDatingView.userInteractionEnabled = YES; - _joinDatingView.hidden = YES; - _joinDatingView.contentMode = UIViewContentModeScaleAspectFit; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapJoinDatingRecognizer)]; - [_joinDatingView addGestureRecognizer:tap]; - } - return _joinDatingView; -} - -- (NSMutableArray *)activityList { - if (!_activityList) { - _activityList = [NSMutableArray array]; - } - return _activityList; -} - -- (PIRoomEnterRedPacketView *)redPacketView{ - if(!_redPacketView){ - _redPacketView = [[PIRoomEnterRedPacketView alloc]initWithFrame:CGRectZero]; - _redPacketView.hidden = YES; - _redPacketView.delegate = self; - } - return _redPacketView; -} - -- (UIButton *)gambleMenuButton { - if (!_gambleMenuButton) { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:[UIImage imageNamed:@"ms_room_game_button"] forState:UIControlStateNormal]; - [b addTarget:self action:@selector(didTapGameMenuButton) forControlEvents:UIControlEventTouchUpInside]; - b.imageView.contentMode = UIViewContentModeScaleAspectFit; - b.contentHorizontalAlignment = UIControlContentHorizontalAlignmentFill; - b.contentVerticalAlignment = UIControlContentVerticalAlignmentFill; - b.hidden = YES; - _gambleMenuButton = b; - } - return _gambleMenuButton; -} - -- (UIButton *)configEntranceMenuButton { - if (!_configEntranceMenuButton) { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:[UIImage imageNamed:@"ms_room_game_add_coin"] forState:UIControlStateNormal]; - [b addTarget:self action:@selector(didTapConfigEntranceButton) forControlEvents:UIControlEventTouchUpInside]; - b.imageView.contentMode = UIViewContentModeScaleAspectFit; - b.contentHorizontalAlignment = UIControlContentHorizontalAlignmentFill; - b.contentVerticalAlignment = UIControlContentVerticalAlignmentFill; -// b.imageEdgeInsets = UIEdgeInsetsMake(10, 10, 10, 10); - b.hidden = YES; - _configEntranceMenuButton = b; - } - return _configEntranceMenuButton; -} - -- (UIButton *)pkMenuButton { - if (!_pkMenuButton) { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:[UIImage imageNamed:@"room_pk_panel_mini_icon"] forState:UIControlStateNormal]; - [b addTarget:self action:@selector(didTapPKMenuButton) forControlEvents:UIControlEventTouchUpInside]; - b.imageView.contentMode = UIViewContentModeScaleAspectFill; - b.hidden = YES; - _pkMenuButton = b; - } - return _pkMenuButton; -} - -- (RoomBoomEntryView *)boomView { - if (!_boomView) { - _boomView = [[RoomBoomEntryView alloc] init]; - _boomView.hidden = YES; - _boomView.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(displayBoomInfoProgress)]; - [_boomView addGestureRecognizer:tap]; - } - return _boomView; -} - -@end - diff --git a/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomScrollView.h b/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomScrollView.h deleted file mode 100644 index d31715c..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomScrollView.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// AnchorRoomScrollView.h -// YUMI -// -// Created by YUMI on 2022/7/11. -// - -#import -#import "NetImageView.h" -#import "RoomHostDelegate.h" -@class AnchorRoomScrollView; - -@protocol AnchorRoomScrollViewDelegate -@optional -///滚动到上一个时回调 -- (void)anchorScrollViewScrollToPrevious:(AnchorRoomScrollView *)anchorScrollView; -///滚动到下一个时回调 -- (void)anchorScrollViewScrollToNext:(AnchorRoomScrollView *)anchorScrollView; -///开始停止 -- (void)anchorScrollVieStartScroll:(AnchorRoomScrollView *)anchorScrollView; -///滚动停止 -- (void)anchorScrollVieEndScroll:(AnchorRoomScrollView *)anchorScrollView; - -@end - -@interface AnchorRoomScrollView : UIScrollView -@property (nonatomic,weak) idhostDelegate; - -- (instancetype)initWithdelegate:(id)delegate; - -@property (nonatomic, assign) id anchorScrollDelegate; -@property (nonatomic, strong) UIView *middleImageView; -@property (nonatomic,assign) BOOL isCanScrollTop; - -- (instancetype)initWithFrame:(CGRect)frame; - - -@end - diff --git a/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomScrollView.m b/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomScrollView.m deleted file mode 100644 index be70b08..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomScrollView.m +++ /dev/null @@ -1,233 +0,0 @@ -// -// AnchorRoomScrollView.m -// YUMI -// -// Created by YUMI on 2022/7/11. -// - -#import "AnchorRoomScrollView.h" -#import "YUMIMacroUitls.h" -#import "RoomInfoModel.h" -#import "MicroQueueModel.h" -#import "AccountInfoStorage.h" -#import "UserInfoModel.h" -//SVGA动画播放 - -#import "SVGAParserManager.h" -#import - -@interface AnchorRoomScrollView() - -///动态背景 -@property (nonatomic, strong) SVGAImageView *middleDisplayView; -@property (nonatomic, strong) SVGAParserManager *parserManager; - -@property (nonatomic, strong) SVGAImageView *topDisplayView; - -@property (nonatomic, strong) SVGAImageView *downDisplayView; - -@property (nonatomic, assign) BOOL animatePlay; - -@end - -@implementation AnchorRoomScrollView - - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if(self) - { - self.backgroundColor = [UIColor clearColor]; - self.pagingEnabled = YES; - self.showsHorizontalScrollIndicator = NO; - self.showsVerticalScrollIndicator = NO; - self.delegate = self; - self.alwaysBounceVertical = NO; - self.bounces = NO; - self.delaysContentTouches = NO; - self.scrollsToTop = NO; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(roomMessageTabelViewStopScroll) name:@"roomMessageTabelViewStopScroll" object:nil]; - self.isCanScrollTop = NO; - [self addSubview:self.topDisplayView]; - [self addSubview:self.middleDisplayView]; - [self addSubview:self.downDisplayView]; - - } - return self; -} - -- (void)startAnimate:(SVGAImageView *)displayView { - self.animatePlay = YES; - NSString * bgString = [NSString stringWithFormat:@"%@/anchor_room_bg.svga", API_Image_URL]; - NSURL *bgUrl = [NSURL fileURLWithPath:bgString]; - [self.parserManager loadSvgaWithURL:bgUrl completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - if (videoItem != nil) { - CGFloat width = videoItem.videoSize.width; - CGFloat height = videoItem.videoSize.height; - if (width > height) { - displayView.contentMode = UIViewContentModeScaleAspectFit; - } else {//高大于宽 - CGFloat resizeH = KScreenWidth * height / width;//按照屏幕的宽度去缩放，获得高度 - if (resizeH > KScreenHeight) {//如果大于屏幕高度，填充 - displayView.contentMode = UIViewContentModeScaleAspectFill; - } else {//小于屏幕高度， - displayView.contentMode = UIViewContentModeScaleAspectFit; - } - } - displayView.loops = INT_MAX; - displayView.clearsAfterStop = NO; - displayView.videoItem = videoItem; - [displayView startAnimation]; - } - } failureBlock:^(NSError * _Nullable error) { - }]; -} - -- (void)stopAnimate { - [self.middleDisplayView stopAnimation]; - [self.topDisplayView stopAnimation]; - [self.downDisplayView stopAnimation]; - self.animatePlay = NO; -} - -- (void)roomMessageTabelViewStopScroll { - BOOL isOnMic = false; - - for (MicroQueueModel * info in self.hostDelegate.getMicroQueue.allValues) { - if (info.userInfo.uid > 0 && [AccountInfoStorage instance].getUid.integerValue == info.userInfo.uid) { - isOnMic = YES; - break; - } - } - if (isOnMic) { - self.scrollEnabled = NO; - } else { - self.scrollEnabled = YES; - } -} - -- (void)switchPlayer:(UIScrollView*)scrollView { - CGFloat offset = scrollView.contentOffset.y; - if (offset >= self.frame.size.height * 2) - { - if (self.anchorScrollDelegate && [self.anchorScrollDelegate respondsToSelector:@selector(anchorScrollViewScrollToNext:)]) { - [self.anchorScrollDelegate anchorScrollViewScrollToNext:self]; - } - [self stopAnimate]; - } else if (offset <= 0) { - if (self.anchorScrollDelegate && [self.anchorScrollDelegate respondsToSelector:@selector(anchorScrollViewScrollToPrevious:)]) { - [self.anchorScrollDelegate anchorScrollViewScrollToPrevious:self]; - } - [self stopAnimate]; - } -} - --(void)scrollViewDidScroll:(UIScrollView *)scrollView { - if (scrollView.contentOffset.y > KScreenHeight) {///乡上滚动 - if (!self.animatePlay) { - [self startAnimate:self.downDisplayView]; - } - } else {///向下滚动 - if (self.isCanScrollTop) { - if (!self.animatePlay) { - [self startAnimate:self.topDisplayView]; - } - } else { - ///刚进来的时候 还不能向上滚动的时候 - if (!self.animatePlay) { - [self startAnimate:self.downDisplayView]; - } - } - } -} - -- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView { - if (self.isCanScrollTop) { - if (scrollView.contentOffset.y >= KScreenHeight * 2) { - if (self.anchorScrollDelegate && [self.anchorScrollDelegate respondsToSelector:@selector(anchorScrollViewScrollToNext:)]) { - [self.anchorScrollDelegate anchorScrollViewScrollToNext:self]; - } - } else if(scrollView.contentOffset.y <= 0) { - if (self.anchorScrollDelegate && [self.anchorScrollDelegate respondsToSelector:@selector(anchorScrollViewScrollToPrevious:)]) { - [self.anchorScrollDelegate anchorScrollViewScrollToPrevious:self]; - } - } - } else { - if (scrollView.contentOffset.y >= KScreenHeight) { - if (self.anchorScrollDelegate && [self.anchorScrollDelegate respondsToSelector:@selector(anchorScrollViewScrollToNext:)]) { - [self.anchorScrollDelegate anchorScrollViewScrollToNext:self]; - } - } - } - [self stopAnimate]; -} - - -- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { - ///666是外部的公屏消息列表 8888房间半屏弹框顶部消失的view - if (otherGestureRecognizer.view.tag == 666 || otherGestureRecognizer.view.tag == 8888 || otherGestureRecognizer.view.tag == 888) { - self.scrollEnabled = NO; - return NO; - } - self.scrollEnabled = YES; - return YES; -} - -- (void)setIsCanScrollTop:(BOOL)isCanScrollTop { - _isCanScrollTop = isCanScrollTop; - CGRect frame = self.frame; - if (_isCanScrollTop) { - self.contentSize = CGSizeMake(0, frame.size.height * 3); - self.topDisplayView.frame = CGRectMake(0, 0, frame.size.width, frame.size.height); - self.middleDisplayView.frame = CGRectMake(0, frame.size.height, frame.size.width, frame.size.height); - self.downDisplayView.frame = CGRectMake(0, frame.size.height * 2, frame.size.width, frame.size.height); - self.middleImageView = self.middleDisplayView; - } else { - self.contentSize = CGSizeMake(0, frame.size.height * 2); - self.topDisplayView.frame = CGRectMake(0, 0, frame.size.width, frame.size.height); - self.middleDisplayView.frame = CGRectMake(0, 0, frame.size.width, frame.size.height); - self.downDisplayView.frame = CGRectMake(0, frame.size.height, frame.size.width, frame.size.height); - self.middleImageView = self.middleDisplayView; - } -} - -- (SVGAImageView *)middleDisplayView { - if (_middleDisplayView == nil) { - _middleDisplayView = [[SVGAImageView alloc] init]; - _middleDisplayView.contentMode = UIViewContentModeScaleToFill; - _middleDisplayView.userInteractionEnabled = NO; - _middleDisplayView.backgroundColor = [UIColor clearColor]; - } - return _middleDisplayView; -} - -- (SVGAImageView *)topDisplayView { - if (_topDisplayView == nil) { - _topDisplayView = [[SVGAImageView alloc] init]; - _topDisplayView.contentMode = UIViewContentModeScaleToFill; - _topDisplayView.userInteractionEnabled = NO; - _topDisplayView.backgroundColor = [UIColor clearColor]; - } - return _topDisplayView; -} - - -- (SVGAImageView *)downDisplayView { - if (_downDisplayView == nil) { - _downDisplayView = [[SVGAImageView alloc] init]; - _downDisplayView.contentMode = UIViewContentModeScaleToFill; - _downDisplayView.userInteractionEnabled = NO; - _downDisplayView.backgroundColor = [UIColor clearColor]; - } - return _downDisplayView; -} - -- (SVGAParserManager *)parserManager { - if (!_parserManager) { - _parserManager = [[SVGAParserManager alloc] init]; - } - return _parserManager; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.h b/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.h deleted file mode 100644 index 91dfcba..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// AnchorRoomSrollTipView.h -// YUMI -// -// Created by YUMI on 2022/7/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface AnchorRoomSrollTipView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.m b/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.m deleted file mode 100644 index e6b3e19..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.m +++ /dev/null @@ -1,99 +0,0 @@ -// -// AnchorRoomSrollTipView.m -// YUMI -// -// Created by YUMI on 2022/7/14. -// - -#import "AnchorRoomSrollTipView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" - -@interface AnchorRoomSrollTipView() - -@property (nonatomic, strong) UIView *bgView; - -@property (nonatomic, strong) UIImageView *tipImageView; - -@property (nonatomic, strong) UILabel *titleLabel; - -@end - -@implementation AnchorRoomSrollTipView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Response -- (void)onTapSkillTip:(UITapGestureRecognizer *)ges { - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - [defaults setObject:@"isShow" forKey:@"kHadShowAnchorRoomTipKey"]; - [defaults synchronize]; - [self removeFromSuperview]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgView]; - [self addSubview:self.tipImageView]; - [self addSubview:self.titleLabel]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTapSkillTip:)]; - [self addGestureRecognizer:tap]; -} - -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - - [self.tipImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.centerY.mas_equalTo(self).mas_offset(-40); - make.size.mas_equalTo(CGSizeMake(87, 92)); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.tipImageView.mas_bottom).mas_offset(46); - make.leading.trailing.equalTo(self).inset(10); - }]; -} - -- (UIView *)bgView { - if (!_bgView) { - _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = UIColorRGBAlpha(0x000000, 0.6); - } - return _bgView; -} - -- (UIImageView *)tipImageView { - if (!_tipImageView) { - _tipImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"anchor_scroll_tip"]]; - _tipImageView.contentMode = UIViewContentModeScaleAspectFit; - _tipImageView.userInteractionEnabled = YES; - } - return _tipImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"AnchorRoomSrollTipView0"); - _titleLabel.adjustsFontSizeToFitWidth = YES; - _titleLabel.font = [UIFont systemFontOfSize:20]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/Api/Api+AnchorPk.h b/YuMi/Modules/YMRoom/View/AnchorPK/Api/Api+AnchorPk.h deleted file mode 100644 index eeb157e..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/Api/Api+AnchorPk.h +++ /dev/null @@ -1,75 +0,0 @@ -// -// Api+AnchorPk.h -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (AnchorPk) - -/// 搜索PK的房间列表 -/// @param completion 完成 -/// @param erbanNo 要搜索的房主的id -/// @param roomUid 房主的uid -/// @param pageNum 当前的页数 -/// @param pageSize 一页多少个 -/// @param pkType pk类型 个播：2 -+ (void)searchAnchorPKRoomList:(HttpRequestHelperCompletion)completion - erbanNo:(NSString *)erbanNo - roomUid:(NSString *)roomUid - pageNum:(NSString *)pageNum - pageSize:(NSString *)pageSize - pkType:(NSString *)pkType; - -/// 获取可以PK的房间列表 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param pageNum 当前的页数 -/// @param pageSize 一页多少个 -/// @param pkType pk类型 个播：2 -+ (void)getAnchorPKRoomList:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - pageNum:(NSString *)pageNum - pageSize:(NSString *)pageSize - pkType:(NSString *)pkType; - -/// 开启一轮PK -/// @param completion 完成 -/// @param acceptUid pk对方的uid -/// @param duration 持续的时间 分钟 -/// @param inviteUid 邀请房间的房主的id -/// @param operateUid 操作者的uid -/// @param playDesc 描述 -/// @param pkType pk类型 个播：2 -+ (void)beginAnchorPK:(HttpRequestHelperCompletion)completion - acceptUid:(NSString *)acceptUid - duration:(NSString *)duration - inviteUid:(NSString *)inviteUid - operateUid:(NSString *)operateUid - playDesc:(NSString *)playDesc - pkType:(NSString *)pkType; - -/// 开始匹配个播随机PK -/// @param completion 完成 -/// @param roomUid 房间UID -+ (void)matchRandomPK:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -/// 取消匹配个播随机PK -/// @param completion 完成 -/// @param roomUid 房间UID -+ (void)cancelMatchRandomPK:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -/// 个播PK屏蔽对方麦位 -/// @param completion 完成 -/// @param micStatus 对方麦位状态 0:屏蔽 1:开启 -/// @param roundId 场次ID -/// @param roomUid 当前房间UID -+ (void)anchorPKMuteOtherMic:(HttpRequestHelperCompletion)completion micStatus:(NSString *)micStatus roundId:(NSString *)roundId roomUid:(NSString *)roomUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/Api/Api+AnchorPk.m b/YuMi/Modules/YMRoom/View/AnchorPK/Api/Api+AnchorPk.m deleted file mode 100644 index 08aa47b..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/Api/Api+AnchorPk.m +++ /dev/null @@ -1,74 +0,0 @@ -// -// Api+AnchorPk.m -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "Api+AnchorPk.h" -#import -@implementation Api (AnchorPk) - -/// 搜索PK的房间列表 -/// @param completion 完成 -/// @param erbanNo 要搜索的房主的id -/// @param roomUid 房主的uid -/// @param pageNum 当前的页数 -/// @param pageSize 一页多少个 -/// @param pkType pk类型 -+ (void)searchAnchorPKRoomList:(HttpRequestHelperCompletion)completion erbanNo:(NSString *)erbanNo roomUid:(NSString *)roomUid pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize pkType:(NSString *)pkType { - NSString * fang = [NSString stringFromBase64String:@"c2VhcmNoL3NpbmdsZVJvb20="];///search/singleRoom - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, erbanNo, roomUid, pageNum, pageSize, pkType, nil]; -} - -/// 获取可以PK的房间列表 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param pageNum 当前的页数 -/// @param pageSize 一页多少个 -/// @param pkType pk类型 -+ (void)getAnchorPKRoomList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize pkType:(NSString *)pkType { - NSString * fang = [NSString stringFromBase64String:@"c2VhcmNoL3NpbmdsZVJvb20="];///search/singleRoom - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, roomUid, pageNum, pageSize, pkType, nil]; -} - -/// 开启一轮PK -/// @param completion 完成 -/// @param acceptUid pk对方的uid -/// @param duration 持续的时间 分钟 -/// @param inviteUid 邀请房间的房主的id -/// @param operateUid 操作者的uid -/// @param playDesc 描述 -/// @param pkType pk类型 -+ (void)beginAnchorPK:(HttpRequestHelperCompletion)completion acceptUid:(NSString *)acceptUid duration:(NSString *)duration inviteUid:(NSString *)inviteUid operateUid:(NSString *)operateUid playDesc:(NSString *)playDesc pkType:(NSString *)pkType{ - NSString * fang = [NSString stringFromBase64String:@"Y3Jvc3Nyb29tcGtyb3VuZC9pbml0aWF0ZUNoYWxsZW5nZQ=="];///crossroompkround/initiateChallenge - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, acceptUid, duration, inviteUid, operateUid, playDesc, pkType, nil]; -} - -/// 开始匹配个播随机PK -/// @param completion 完成 -/// @param roomUid 房间UID -+ (void)matchRandomPK:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"Y3Jvc3Nyb29tcGtyb3VuZC9tYXRjaC9pbml0"];///crossroompkround/match/init - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, nil]; -} - -/// 取消匹配个播随机PK -/// @param completion 完成 -/// @param roomUid 房间UID -+ (void)cancelMatchRandomPK:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"Y3Jvc3Nyb29tcGtyb3VuZC9tYXRjaC9jYW5jZWw="];///crossroompkround/match/cancel - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, nil]; -} - -/// 个播PK屏蔽对方麦位 -/// @param completion 完成 -/// @param micStatus 对方麦位状态 0:屏蔽 1:开启 -/// @param roundId 场次ID -/// @param roomUid 当前房间UID -+ (void)anchorPKMuteOtherMic:(HttpRequestHelperCompletion)completion micStatus:(NSString *)micStatus roundId:(NSString *)roundId roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"Y3Jvc3Nyb29tcGtyb3VuZC9vdGhlck1pYw=="];///crossroompkround/otherMic - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, micStatus, roundId, roomUid, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/Presenter/XPAnchorPKPresenter.h b/YuMi/Modules/YMRoom/View/AnchorPK/Presenter/XPAnchorPKPresenter.h deleted file mode 100644 index 70e79c6..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/Presenter/XPAnchorPKPresenter.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMAnchorPKPresenter.h -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorPKPresenter : BaseMvpPresenter - -/// 开启主播PK -/// @param roomUid 当前房间的房主uid -/// @param duration 持续的时间 -/// @param acceptUid 接收者的uid -/// @param playDesc 玩法 -/// @param pkType pk类型 个播：2 -- (void)beginAnchorPK:(NSString *)roomUid duration:(NSInteger)duration acceptUid:(NSString *)acceptUid playDesc:(NSString *)playDesc pkType:(NSString *)pkType; - -/// 匹配随机PK -/// @param roomUid 房间UID -- (void)matchRandomPK:(NSString *)roomUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/Presenter/XPAnchorPKPresenter.m b/YuMi/Modules/YMRoom/View/AnchorPK/Presenter/XPAnchorPKPresenter.m deleted file mode 100644 index f9a1455..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/Presenter/XPAnchorPKPresenter.m +++ /dev/null @@ -1,39 +0,0 @@ -// -// YMAnchorPKPresenter.m -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "XPAnchorPKPresenter.h" -#import "Api+AnchorPk.h" -#import "AccountInfoStorage.h" -#import "XPAnchorPKProtocol.h" - -@implementation XPAnchorPKPresenter - -/// 开启主播PK -/// @param roomUid 当前房间的房主uid -/// @param duration 持续的时间 -/// @param acceptUid 接收者的uid -/// @param playDesc 玩法 -- (void)beginAnchorPK:(NSString *)roomUid duration:(NSInteger)duration acceptUid:(NSString *)acceptUid playDesc:(NSString *)playDesc pkType:(NSString *)pkType { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * time = [NSString stringWithFormat:@"%ld", duration]; - [Api beginAnchorPK:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] beginAnchorPKSuccess]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] beginAnchorPKFail:msg]; - } showLoading:YES errorToast:NO] acceptUid:acceptUid duration:time inviteUid:roomUid operateUid:uid playDesc:playDesc pkType:pkType]; -} - -/// 匹配随机PK -/// @param roomUid 房间UID -- (void)matchRandomPK:(NSString *)roomUid { - [Api matchRandomPK:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - long long number = [data.data longLongValue]; - [[self getView] matchRandomPKSuccess:number]; - }] roomUid:roomUid]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/Protocol/XPAnchorPKProtocol.h b/YuMi/Modules/YMRoom/View/AnchorPK/Protocol/XPAnchorPKProtocol.h deleted file mode 100644 index 1a11f7d..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/Protocol/XPAnchorPKProtocol.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// YMAnchorPKProtocol.h -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPAnchorPKProtocol - -///开启主播pk成功 -- (void)beginAnchorPKSuccess; -///开启主播Pk失败 -- (void)beginAnchorPKFail:(NSString *)message; - -///随机PK匹配开始 -- (void)matchRandomPKSuccess:(long long)matchPkStartTime; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.h b/YuMi/Modules/YMRoom/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.h deleted file mode 100644 index e8795c9..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMAnchorPKTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class AcrossRoomPKInfoModel, XPAnchorPKTableViewCell; -@protocol XPAnchorPKTableViewCellDelegate -///点击了选择的按钮 -- (void)xPAnchorPKTableViewCell:(XPAnchorPKTableViewCell *)view didChooseRoom:(AcrossRoomPKInfoModel *)roomInfo; -@end - -@interface XPAnchorPKTableViewCell : UITableViewCell - -@property (nonatomic,strong) AcrossRoomPKInfoModel *roomPKInfo; -///代理 -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.m deleted file mode 100644 index ed34080..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.m +++ /dev/null @@ -1,155 +0,0 @@ -// -// YMAnchorPKTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "XPAnchorPKTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "AcrossRoomPKInfoModel.h" - -@interface XPAnchorPKTableViewCell() - -///头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -///选择的 -@property (nonatomic, strong) UIButton *selectButton; -///名字 -@property (nonatomic, strong) UILabel *nameLabel; -///ID -@property (nonatomic, strong) UILabel *idLabel; - -@end - -@implementation XPAnchorPKTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if (self) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self initSubViews]; - [self initSubViewConstraints]; - - } - return self; -} -#pragma mark - Private Method - -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nameLabel]; - [self.contentView addSubview:self.idLabel]; - [self.contentView addSubview:self.selectButton]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(13); - make.width.height.mas_equalTo(60); - make.centerY.mas_equalTo(self.contentView); - }]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(6); - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY); - make.height.mas_equalTo(14); - make.trailing.mas_equalTo(self.selectButton.mas_leading).mas_offset(-5); - }]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameLabel); - make.top.mas_equalTo(self.nameLabel.mas_bottom).mas_offset(7); - }]; - - [self.selectButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-15); - make.centerY.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(64); - make.height.mas_equalTo(24); - }]; -} - -#pragma mark - Event Response -- (void)selectButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPAnchorPKTableViewCell:didChooseRoom:)]) { - [self.delegate xPAnchorPKTableViewCell:self didChooseRoom:self.roomPKInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setRoomPKInfo:(AcrossRoomPKInfoModel *)roomPKInfo { - _roomPKInfo = roomPKInfo; - self.avatarImageView.imageUrl = _roomPKInfo.avatar; - self.nameLabel.text = _roomPKInfo.nick; - self.idLabel.text = [NSString stringWithFormat:@"ID：%@", _roomPKInfo.erbanNo]; - self.selectButton.userInteractionEnabled = !roomPKInfo.crossPking; - if (roomPKInfo.crossPking) { - [_selectButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x4C4C6A), UIColorFromRGB(0x4C4C6A)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_selectButton setTitle:YMLocalizedString(@"XPAnchorPKTableViewCell0") forState:UIControlStateNormal]; - [_selectButton setTitleColor:UIColorFromRGB(0xC6C6E9) forState:UIControlStateNormal]; - } else if(!roomPKInfo.valid) { - [_selectButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x4C4C6A), UIColorFromRGB(0x4C4C6A)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_selectButton setTitle:YMLocalizedString(@"XPAnchorPKTableViewCell1") forState:UIControlStateNormal]; - [_selectButton setTitleColor:UIColorFromRGB(0xC6C6E9) forState:UIControlStateNormal]; - } else { - [_selectButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x1CD7FD), UIColorFromRGB(0x9377FF), UIColorFromRGB(0xFF6BA3)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_selectButton setTitle:YMLocalizedString(@"XPAnchorPKTableViewCell2") forState:UIControlStateNormal]; - [_selectButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 60/2; - _avatarImageView.layer.borderWidth = 1; - _avatarImageView.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _avatarImageView; -} - -- (UIButton *)selectButton { - if (!_selectButton) { - _selectButton = [[UIButton alloc] init]; - [_selectButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x1CD7FD), UIColorFromRGB(0x9377FF), UIColorFromRGB(0xFF6BA3)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_selectButton addTarget:self action:@selector(selectButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _selectButton.userInteractionEnabled = YES; - _selectButton.layer.cornerRadius = 12; - _selectButton.layer.masksToBounds = YES; - [_selectButton setTitle:YMLocalizedString(@"XPAnchorPKTableViewCell2") forState:UIControlStateNormal]; - _selectButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_selectButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - } - return _selectButton; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [[UILabel alloc] init]; - _nameLabel.textColor = [UIColor whiteColor]; - _nameLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - } - return _nameLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.textColor = [UIColor whiteColor]; - _idLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - } - return _idLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKFinishView.h b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKFinishView.h deleted file mode 100644 index fd9ca49..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKFinishView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMAnchorPKFinishView.h -// YUMI -// -// Created by YUMI on 2022/4/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class AcrossRoomPKPanelModel; -@interface XPAnchorPKFinishView : UIView - -@property (nonatomic, strong) AcrossRoomPKPanelModel *data; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKFinishView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKFinishView.m deleted file mode 100644 index aceeaf6..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKFinishView.m +++ /dev/null @@ -1,236 +0,0 @@ -// -// YMAnchorPKFinishView.m -// YUMI -// -// Created by YUMI on 2022/4/13. -// - -#import "XPAnchorPKFinishView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "TTPopup.h" -///Model -#import "AcrossRoomPKPanelModel.h" - -@interface XPAnchorPKFinishView () - -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///背景 -@property (nonatomic, strong) UIImageView *backgroundImageView; -///我方头像 -@property (nonatomic, strong) NetImageView *redAvatarImageView; -///对方头像 -@property (nonatomic, strong) NetImageView *blueAvatarImageView; -///vs图标 -@property (nonatomic, strong) UIImageView *vsImageView; -///红方pk值背景 -@property (nonatomic, strong) UIImageView *redValueBgImageView; -///蓝方pk值背景 -@property (nonatomic, strong) UIImageView *blueValueBgImageView; -///红方PK值 -@property (nonatomic, strong) UILabel *redValueLabel; -///蓝方PK值 -@property (nonatomic, strong) UILabel *blueValueLabel; -///关闭 -@property (nonatomic, strong) UIButton *closeBtn; - -@end - -@implementation XPAnchorPKFinishView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backgroundImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.redAvatarImageView]; - [self addSubview:self.blueAvatarImageView]; - [self addSubview:self.vsImageView]; - [self addSubview:self.redValueBgImageView]; - [self addSubview:self.blueValueBgImageView]; - [self addSubview:self.redValueLabel]; - [self addSubview:self.blueValueLabel]; - [self addSubview:self.closeBtn]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(300); - make.height.mas_equalTo(324); - make.bottom.mas_equalTo(self.backgroundImageView.mas_bottom); - }]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.backgroundImageView).mas_offset(82); - make.height.mas_equalTo(21); - }]; - [self.redAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(52); - make.width.height.mas_equalTo(80); - make.leading.mas_equalTo(24); - }]; - [self.vsImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.centerY.mas_equalTo(self.redAvatarImageView); - make.width.mas_equalTo(64); - make.height.mas_equalTo(74); - }]; - [self.blueAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.redAvatarImageView); - make.width.height.mas_equalTo(80); - make.trailing.mas_equalTo(-24); - }]; - [self.redValueBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.redAvatarImageView.mas_bottom).mas_offset(6); - make.height.mas_equalTo(26); - make.width.mas_equalTo(110); - make.centerX.mas_equalTo(self.redAvatarImageView); - }]; - [self.blueValueBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.redValueBgImageView); - make.height.mas_equalTo(26); - make.width.mas_equalTo(110); - make.centerX.mas_equalTo(self.blueAvatarImageView); - }]; - [self.redValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self.redValueBgImageView); - }]; - [self.blueValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self.blueValueBgImageView); - }]; - [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.top.mas_equalTo(self.backgroundImageView); - make.width.height.mas_equalTo(32); - }]; -} - -#pragma mark - Event Response -- (void)onCloseBtnClick:(UIButton *)button { - [TTPopup dismiss]; -} - -- (void)setData:(AcrossRoomPKPanelModel *)data { - self.redValueLabel.text = [NSString stringWithFormat:@"%lld", data.cAmount]; - self.blueValueLabel.text = [NSString stringWithFormat:@"%lld", data.aAmount]; - self.redAvatarImageView.imageUrl = data.cAvatar; - self.blueAvatarImageView.imageUrl = data.aAvatar; -} - -#pragma mark - Getters And Setters -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] init]; - _backgroundImageView.image = [UIImage imageNamed:@"anchorPK_invite_bg"]; - } - return _backgroundImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPAnchorPKFinishView0"); - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - } - return _titleLabel; -} - -- (UIButton *)closeBtn { - if (!_closeBtn) { - _closeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeBtn addTarget:self action:@selector(onCloseBtnClick:) forControlEvents:UIControlEventTouchUpInside]; - [_closeBtn setBackgroundImage:[UIImage imageNamed:@"anchorPk_result_close"] forState:UIControlStateNormal]; - } - return _closeBtn; -} - -- (NetImageView *)redAvatarImageView { - if (!_redAvatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _redAvatarImageView = [[NetImageView alloc] initWithConfig:config]; - _redAvatarImageView.layer.masksToBounds = YES; - _redAvatarImageView.layer.cornerRadius = 80 / 2; - _redAvatarImageView.layer.borderWidth = 2; - _redAvatarImageView.layer.borderColor = UIColorFromRGB(0xFE6464).CGColor; - } - return _redAvatarImageView; -} - -- (NetImageView *)blueAvatarImageView { - if (!_blueAvatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _blueAvatarImageView = [[NetImageView alloc] initWithConfig:config]; - _blueAvatarImageView.layer.masksToBounds = YES; - _blueAvatarImageView.layer.cornerRadius = 80 / 2; - _blueAvatarImageView.layer.borderWidth = 2; - _blueAvatarImageView.layer.borderColor = UIColorFromRGB(0x3794FE).CGColor; - } - return _blueAvatarImageView; -} - -- (UIImageView *)redValueBgImageView { - if (!_redValueBgImageView) { - _redValueBgImageView = [[UIImageView alloc] init]; - _redValueBgImageView.image = [UIImage imageNamed:@"anchorPK_result_redValue_bg"]; - } - return _redValueBgImageView; -} - -- (UIImageView *)blueValueBgImageView { - if (!_blueValueBgImageView) { - _blueValueBgImageView = [[UIImageView alloc] init]; - _blueValueBgImageView.image = [UIImage imageNamed:@"anchorPK_result_blueValue_bg"]; - } - return _blueValueBgImageView; -} - -- (UILabel *)redValueLabel { - if (!_redValueLabel) { - _redValueLabel = [[UILabel alloc] init]; - _redValueLabel.font = [UIFont systemFontOfSize:12]; - _redValueLabel.textColor = UIColorFromRGB(0xFF0000); - _redValueLabel.textAlignment = NSTextAlignmentCenter; - } - return _redValueLabel; -} - -- (UILabel *)blueValueLabel { - if (!_blueValueLabel) { - _blueValueLabel = [[UILabel alloc] init]; - _blueValueLabel.font = [UIFont systemFontOfSize:12]; - _blueValueLabel.textColor = UIColorFromRGB(0x0060D1); - _blueValueLabel.textAlignment = NSTextAlignmentCenter; - } - return _blueValueLabel; -} - -- (UIImageView *)vsImageView { - if (!_vsImageView) { - _vsImageView = [[UIImageView alloc] init]; - _vsImageView.image = [UIImage imageNamed:@"anchorPk_panel_vs"]; - } - return _vsImageView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.h b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.h deleted file mode 100644 index 22e8b8d..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMAnchorPKInviteView.h -// YUMI -// -// Created by YUMI on 2022/4/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorPKInviteView : UIView - -///房主的uid -@property (nonatomic,copy) NSString *roomUid; -///数据源 -@property (nonatomic,copy) NSDictionary *dataDic; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.m deleted file mode 100644 index c96ecbc..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.m +++ /dev/null @@ -1,359 +0,0 @@ -// -// YMAnchorPKInviteView.m -// YUMI -// -// Created by YUMI on 2022/4/12. -// - -#import "XPAnchorPKInviteView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "Api+Room.h" -#import "XNDJTDDLoadingTool.h" -#import "TTPopup.h" - -@interface XPAnchorPKInviteSubView : UIView -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///内容 -@property (nonatomic,strong) UILabel *contentLabel; -@end - -@implementation XPAnchorPKInviteSubView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.titleLabel]; - [self addSubview:self.contentLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(17); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(55); - make.leading.centerY.mas_equalTo(self); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel.mas_trailing).offset(15); - make.centerY.mas_equalTo(self); - make.trailing.mas_lessThanOrEqualTo(self).offset(-5); - }]; -} - -#pragma mark - Getters And Setters - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.font = [UIFont systemFontOfSize:14]; - _titleLabel.text = YMLocalizedString(@"XPAnchorPKInviteView0"); - _titleLabel.textAlignment = NSTextAlignmentRight; - } - return _titleLabel; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[UILabel alloc] init]; - _contentLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _contentLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - } - return _contentLabel; -} - -@end - -@interface XPAnchorPKInviteView () -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///邀请方 -@property (nonatomic,strong) XPAnchorPKInviteSubView *inviteView; -///PK时长 -@property (nonatomic,strong) XPAnchorPKInviteSubView *timeView; -///PK玩法 -@property (nonatomic,strong) XPAnchorPKInviteSubView *descView; -///操作按钮的容器 -@property (nonatomic,strong) UIStackView *operaStackView; -///拒绝 -@property (nonatomic, strong) UIButton *rejectButton; -///接受 -@property (nonatomic, strong) UIButton *acceptButton; -///背景 -@property (nonatomic, strong) UIImageView *backImageView; -///倒计时 -@property (nonatomic, strong) UIButton *countDownButton; -//拒绝邀请 -@property (strong, nonatomic) dispatch_source_t inviteTimer; - -@end - -@implementation XPAnchorPKInviteView - -- (void)dealloc { - if (self.inviteTimer != nil) { - dispatch_source_cancel(self.inviteTimer); - self.inviteTimer = nil; - } -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)initSubViews { - [self addSubview:self.backImageView]; - - [self.backImageView addSubview:self.titleLabel]; - [self.backImageView addSubview:self.stackView]; - [self.backImageView addSubview:self.operaStackView]; - [self.backImageView addSubview:self.countDownButton]; - - [self.stackView addArrangedSubview:self.inviteView]; - [self.stackView addArrangedSubview:self.timeView]; - [self.stackView addArrangedSubview:self.descView]; - - [self.operaStackView addArrangedSubview:self.rejectButton]; - [self.operaStackView addArrangedSubview:self.acceptButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(300); - make.height.mas_equalTo(324); - make.bottom.mas_equalTo(self.backImageView.mas_bottom); - }]; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.backImageView).mas_offset(82); - make.height.mas_equalTo(21); - }]; - - [self.countDownButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.top.mas_equalTo(0); - make.width.mas_equalTo(36); - make.height.mas_equalTo(26); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backImageView).offset(26); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(32); - make.trailing.mas_equalTo(self.backImageView); - }]; - - [self.operaStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backImageView).inset(20); - make.height.mas_equalTo(40); - make.bottom.mas_equalTo(-25); - }]; -} - -#pragma mark - Event Response -- (void)acceptButtonAction:(UIButton *)sender { - NSString *roundId = self.dataDic[@"roundId"]; - [Api handleAcrossRoomPKInvite:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - if (self.inviteTimer != nil) { - dispatch_source_cancel(self.inviteTimer); - self.inviteTimer = nil; - } - [TTPopup dismiss]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:self.roomUid roundId:roundId isAccept:@"1"]; -} - -- (void)rejectButtonAction:(UIButton *)sender { - NSString *roundId = self.dataDic[@"roundId"]; - [Api handleAcrossRoomPKInvite:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - if (self.inviteTimer != nil) { - dispatch_source_cancel(self.inviteTimer); - self.inviteTimer = nil; - } - [TTPopup dismiss]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:self.roomUid roundId:roundId isAccept:@"0"]; -} - -#pragma mark - getter -- (void)setDataDic:(NSDictionary *)dataDic { - _dataDic = dataDic; - if (_dataDic.allKeys.count > 0) { - self.inviteView.contentLabel.text = _dataDic[@"inviteNick"]; - self.timeView.contentLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorPKInviteView1"), _dataDic[@"pkDuration"]]; - NSString *desc = _dataDic[@"pkDesc"]; - if (desc.length > 0) { - self.descView.hidden = NO; - self.descView.contentLabel.text = desc; - } else { - self.descView.hidden = YES; - } - - if (_inviteTimer != nil) { - dispatch_source_cancel(_inviteTimer); - } - __block NSInteger time = 10; //倒计时时间 - dispatch_queue_t queue = dispatch_get_global_queue(0, 0); - _inviteTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - @kWeakify(self); - dispatch_source_set_timer(_inviteTimer,dispatch_walltime(NULL, 0),1.0*NSEC_PER_SEC, 0); //每秒执行 - dispatch_source_set_event_handler(_inviteTimer, ^{ - if(time <= 0){ //倒计时结束，关闭 - dispatch_source_cancel(self.inviteTimer); - self.inviteTimer = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self removeFromSuperview]; - - }); - }else{ - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self.countDownButton setTitle:[NSString stringWithFormat:@"%02lds", time] forState:UIControlStateNormal]; - }); - time--; - } - }); - dispatch_resume(_inviteTimer); - } -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"anchorPK_invite_bg"]; - } - return _backImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.text = YMLocalizedString(@"XPAnchorPKInviteView2"); - } - return _titleLabel; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 16; - } - return _stackView; -} - -- (XPAnchorPKInviteSubView *)inviteView { - if (!_inviteView) { - _inviteView = [[XPAnchorPKInviteSubView alloc] init]; - _inviteView.titleLabel.text = YMLocalizedString(@"XPAnchorPKInviteView3"); - } - return _inviteView; -} - -- (XPAnchorPKInviteSubView *)timeView { - if (!_timeView) { - _timeView = [[XPAnchorPKInviteSubView alloc] init]; - _timeView.titleLabel.text = YMLocalizedString(@"XPAnchorPKInviteView4"); - } - return _timeView; -} - -- (XPAnchorPKInviteSubView *)descView { - if (!_descView) { - _descView = [[XPAnchorPKInviteSubView alloc] init]; - _descView.titleLabel.text = YMLocalizedString(@"XPAnchorPKInviteView5"); - } - return _descView; -} - -- (UIButton *)countDownButton { - if (!_countDownButton) { - _countDownButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_countDownButton setTitleColor:UIColorFromRGB(0xFFFFFF) forState:UIControlStateNormal]; - _countDownButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_countDownButton setBackgroundImage:[UIImage imageWithColor:UIColorRGBAlpha(0xFFFFFF, 0.4)] forState:UIControlStateNormal]; - _countDownButton.layer.masksToBounds = YES; - _countDownButton.layer.cornerRadius = 13; - } - return _countDownButton; -} - -- (UIStackView *)operaStackView { - if (!_operaStackView) { - _operaStackView = [[UIStackView alloc] init]; - _operaStackView.axis = UILayoutConstraintAxisHorizontal; - _operaStackView.distribution = UIStackViewDistributionFillEqually; - _operaStackView.alignment = UIStackViewAlignmentFill; - _operaStackView.spacing = 12; - } - return _operaStackView; -} - -- (UIButton *)rejectButton { - if (!_rejectButton) {\ - _rejectButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _rejectButton.layer.masksToBounds = YES; - _rejectButton.layer.cornerRadius = 40 / 2; - [_rejectButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xF4E0FF), UIColorFromRGB(0xF4E0FF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_rejectButton setTitleColor:UIColorFromRGB(0x5486FD) forState:UIControlStateNormal]; - [_rejectButton setTitle:YMLocalizedString(@"XPAnchorPKInviteView6") forState:UIControlStateNormal]; - _rejectButton.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - [_rejectButton addTarget:self action:@selector(rejectButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _rejectButton; -} - -- (UIButton *)acceptButton { - if (!_acceptButton) { - _acceptButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_acceptButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x1CD7FD), UIColorFromRGB(0x9377FF), UIColorFromRGB(0xFF6BA3)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_acceptButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_acceptButton setTitle:YMLocalizedString(@"XPAnchorPKInviteView7") forState:UIControlStateNormal]; - _acceptButton.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - [_acceptButton addTarget:self action:@selector(acceptButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _acceptButton.layer.masksToBounds = YES; - _acceptButton.layer.cornerRadius = 40 / 2; - } - return _acceptButton; - } - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKPanelUserView.h b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKPanelUserView.h deleted file mode 100644 index e4c1aec..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKPanelUserView.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// YMAnchorPKPanelUserView.h -// YUMI -// -// Created by YUMI on 2022/4/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class AcrossRoomPkRankModel; -typedef NS_ENUM(NSInteger, AnchorPKPanelUserType) { - ///红队贡献 - AnchorPKPanelUserType_Red_Contribute = 1, - ///红队魅力榜 - AnchorPKPanelUserType_Red_Charm, - ///蓝队贡献 - AnchorPKPanelUserType_Blue_Contribute, - ///蓝队魅力 - AnchorPKPanelUserType_Blue_Charm, -}; - -@interface XPAnchorPKPanelUserView : UIView - -///类型 -@property (nonatomic,assign) AnchorPKPanelUserType type; - -@property (nonatomic,strong, nullable) AcrossRoomPkRankModel * panelInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKPanelUserView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKPanelUserView.m deleted file mode 100644 index 2c43142..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKPanelUserView.m +++ /dev/null @@ -1,143 +0,0 @@ -// -// YMAnchorPKPanelUserView.m -// YUMI -// -// Created by YUMI on 2022/4/11. -// - -#import "XPAnchorPKPanelUserView.h" - -///Third -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -///Model -#import "AcrossRoomPKPanelModel.h" - -@interface XPAnchorPKPanelUserView () -///排位头饰 -@property (nonatomic, strong) UIImageView *mvpImageView; -///头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -///显示金币 -@property (nonatomic,strong) UIButton *coinButton; - -@end - -@implementation XPAnchorPKPanelUserView - -#pragma mark - Life Style -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.avatarImageView]; - [self addSubview:self.mvpImageView]; - [self addSubview:self.coinButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(36); - make.height.mas_equalTo(42); - }]; - - [self.mvpImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.bottom.trailing.mas_equalTo(self.avatarImageView); - make.height.mas_equalTo(11); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self); - make.width.height.mas_equalTo(24); - make.centerX.mas_equalTo(self); - }]; - - [self.coinButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self); - make.height.mas_equalTo(11); - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).mas_offset(4); - }]; -} - - -#pragma mark - getters and setters -- (void)setType:(AnchorPKPanelUserType)type { - _type = type; - NSString * avatarPlaceName; - switch (type) { - case AnchorPKPanelUserType_Red_Contribute: - case AnchorPKPanelUserType_Red_Charm: - avatarPlaceName = @"anchorPK_panel_red_micState"; - break; - case AnchorPKPanelUserType_Blue_Contribute: - case AnchorPKPanelUserType_Blue_Charm: - avatarPlaceName = @"anchorPK_panel_blue_micState"; - break; - - default: - break; - } - self.avatarImageView.image = [UIImage imageNamed:avatarPlaceName]; -} - -- (void)setPanelInfo:(AcrossRoomPkRankModel *)panelInfo { - _panelInfo = panelInfo; - if (_panelInfo) { - self.avatarImageView.imageUrl = _panelInfo.avatar; - [self.coinButton setTitle:panelInfo.amount forState:UIControlStateNormal]; - self.coinButton.hidden = !panelInfo.amount; - } else { - if (self.type == AnchorPKPanelUserType_Red_Contribute || self.type == AnchorPKPanelUserType_Red_Charm) { - self.avatarImageView.image = [UIImage imageNamed:@"anchorPK_panel_red_micState"]; - } else { - self.avatarImageView.image = [UIImage imageNamed:@"anchorPK_panel_red_micState"]; - } - [self.coinButton setTitle:@"0" forState:UIControlStateNormal]; - self.coinButton.hidden = YES; - } - if (self.tag == 1000) { - self.mvpImageView.hidden = NO; - } -} - -- (UIImageView *)mvpImageView { - if (!_mvpImageView) { - _mvpImageView = [[UIImageView alloc] init]; - _mvpImageView.image = [UIImage imageNamed:@"anchorPK_panel_MVP"]; - _mvpImageView.hidden = YES; - } - return _mvpImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 24 / 2; - } - return _avatarImageView; -} - -- (UIButton *)coinButton { - if (!_coinButton) { - _coinButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_coinButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _coinButton.titleLabel.font = [UIFont systemFontOfSize:10]; - } - return _coinButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.h b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.h deleted file mode 100644 index 107c311..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMAnchorPKResultView.h -// YUMI -// -// Created by YUMI on 2022/4/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class AcrossRoomPKPanelModel; -@interface XPAnchorPKResultView : UIView - -@property (nonatomic, strong) AcrossRoomPKPanelModel *data; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.m deleted file mode 100644 index 643cdd5..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.m +++ /dev/null @@ -1,438 +0,0 @@ -// -// YMAnchorPKResultView.m -// YUMI -// -// Created by YUMI on 2022/4/13. -// - -#import "XPAnchorPKResultView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "TTPopup.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///Model -#import "AcrossRoomPKPanelModel.h" - -@interface XPAnchorPKResultContributeView : UIView - -///背景 -@property (nonatomic, strong) UIImageView *bgImageView; -///mvpIcon -@property (nonatomic, strong) UIImageView *mvpIconView; -///头像 -@property (nonatomic, strong) NetImageView *headImageView; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///内容 -@property (nonatomic,strong) UILabel *contentLabel; - -@property (nonatomic, strong) AcrossRoomPkRankModel *data; - -@end - -@implementation XPAnchorPKResultContributeView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self addSubview:self.headImageView]; - [self addSubview:self.mvpIconView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.contentLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(40); - make.width.mas_equalTo(159); - }]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - - [self.headImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(16); - make.width.height.mas_equalTo(34); - }]; - [self.mvpIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(32); - make.height.mas_equalTo(12); - make.centerX.mas_equalTo(self.headImageView); - make.bottom.mas_equalTo(self.headImageView).mas_offset(1); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.headImageView).mas_offset(2); - make.leading.mas_equalTo(self.headImageView.mas_trailing).mas_offset(8); - make.height.mas_equalTo(13); - make.trailing.mas_equalTo(0); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(4); - make.height.mas_equalTo(11); - }]; -} - -#pragma mark - Getters And Setters -- (void)setData:(AcrossRoomPkRankModel *)data { - - self.titleLabel.text = data.nick ? data.nick : @""; - self.contentLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorPKResultView6"), data.amount? data.amount : @""]; - self.headImageView.imageUrl = data.avatar; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.font = [UIFont systemFontOfSize:12]; - _titleLabel.text = @""; - } - return _titleLabel; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[UILabel alloc] init]; - _contentLabel.textColor = [UIColor whiteColor]; - _contentLabel.font = [UIFont systemFontOfSize:10]; - } - return _contentLabel; -} - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage imageNamed:@"anchorPK_result_contribute_bg"]; - } - return _bgImageView; -} - -- (UIImageView *)mvpIconView { - if (!_mvpIconView) { - _mvpIconView = [[UIImageView alloc] init]; - _mvpIconView.image = [UIImage imageNamed:@"anchorPK_result_mvp_icon"]; - _mvpIconView.hidden = YES; - } - return _mvpIconView; -} - -- (NetImageView *)headImageView { - if (!_headImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _headImageView = [[NetImageView alloc] initWithConfig:config]; - _headImageView.layer.masksToBounds = YES; - _headImageView.layer.cornerRadius = 17; - _headImageView.layer.borderColor = [UIColor whiteColor].CGColor; - _headImageView.layer.borderWidth = 0.5; - } - return _headImageView; -} - -@end - -@interface XPAnchorPKResultView() - -/** bgImageView */ -@property (nonatomic, strong) UIImageView *bgImageView; -///关闭 -@property (nonatomic, strong) UIButton *closeBtn; -///内容view -@property (nonatomic, strong) UIView *mainView; -///头饰 -@property (nonatomic, strong) UIImageView *headWearImageView; -///头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -///厅名 -@property (nonatomic, strong) UILabel *roomTitleLabel; -///pk值 -@property (nonatomic, strong) UILabel *pkValueLabel; -///贡献标题背景 -@property (nonatomic, strong) UIImageView *contributeTitleBgImageView; -///贡献榜标题 -@property (nonatomic, strong) UILabel *contributeTitleLabel; -///无人送礼tip -@property (nonatomic, strong) UILabel *noneContrbuteLabel; -///倒计时 -@property (strong, nonatomic) dispatch_source_t timer; - -@end - -@implementation XPAnchorPKResultView - -- (void)dealloc { - - if (self.timer) { - dispatch_source_cancel(self.timer); - self.timer = nil; - } -} - -#pragma mark - life cycle - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initView]; - [self initConstrations]; - } - return self; -} - -- (void)initView { - [self addSubview:self.bgImageView]; - [self addSubview:self.closeBtn]; - [self addSubview:self.mainView]; - [self addSubview:self.avatarImageView]; - [self addSubview:self.headWearImageView]; - - [self.mainView addSubview:self.roomTitleLabel]; - [self.mainView addSubview:self.pkValueLabel]; - [self.mainView addSubview:self.contributeTitleBgImageView]; - [self.mainView addSubview:self.contributeTitleLabel]; - [self.mainView addSubview:self.noneContrbuteLabel]; -} - -- (void)initConstrations { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(0); - make.top.mas_equalTo(47); - make.height.mas_equalTo(370); - }]; - [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.bgImageView.mas_bottom).mas_offset(23); - make.width.mas_equalTo(72); - make.height.mas_equalTo(32); - }]; - [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.bgImageView); - }]; - [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(0); - make.centerX.mas_equalTo(self); - make.width.mas_equalTo(148); - make.height.mas_equalTo(114); - }]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(27); - make.width.height.mas_equalTo(64); - make.centerX.mas_equalTo(self); - }]; - [self.roomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.headWearImageView.mas_bottom).mas_offset(15); - make.centerX.mas_equalTo(self.avatarImageView); - make.height.mas_equalTo(15); - }]; - [self.pkValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.avatarImageView); - make.top.mas_equalTo(self.roomTitleLabel.mas_bottom).offset(8); - make.height.mas_equalTo(13); - }]; - [self.contributeTitleBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.pkValueLabel.mas_bottom).mas_offset(17); - make.centerX.mas_equalTo(self.mainView); - make.width.mas_equalTo(160); - make.height.mas_equalTo(24); - }]; - [self.contributeTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self.contributeTitleBgImageView); - }]; - [self.noneContrbuteLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.pkValueLabel.mas_bottom).mas_offset(92); - make.centerX.mas_equalTo(self); - }]; -} - - -- (void)setData:(AcrossRoomPKPanelModel *)data { - if (data.winUid == data.cUid) {//赢 - self.bgImageView.image = [UIImage imageNamed:@"anchorPK_result_win_bg"]; - self.headWearImageView.image = [UIImage getLanguageImage:@"anchorPK_result_win_headWear"]; - self.contributeTitleBgImageView.image = [UIImage imageNamed:@"anchorPK_result_win_title_bg"]; - } else if (data.winUid == data.aUid) {//输 - self.bgImageView.image = [UIImage imageNamed:@"anchorPK_result_fail_bg"]; - self.headWearImageView.image = [UIImage getLanguageImage:@"anchorPK_result_fail_headWear"]; - self.contributeTitleBgImageView.image = [UIImage imageNamed:@"anchorPK_result_fail_title_bg"]; - } else {//平局 - self.bgImageView.image = [UIImage imageNamed:@"anchorPK_result_tie_bg"]; - self.headWearImageView.image = [UIImage getLanguageImage:@"anchorPK_result_tie_headWear"]; - self.contributeTitleBgImageView.image = [UIImage imageNamed:@"anchorPK_result_tie_title_bg"]; - } - self.avatarImageView.imageUrl = data.cAvatar; - self.roomTitleLabel.text = data.cNick; - self.pkValueLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorPKResultView6"), @(data.cAmount)]; - if (data.csRank.count > 0) {//有贡献 - self.contributeTitleBgImageView.hidden = NO; - self.contributeTitleLabel.hidden = NO; - self.noneContrbuteLabel.hidden = YES; - for (int i = 0; i - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorPKRuleView : UIView - -@property (nonatomic, copy) NSString *ruleString; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKRuleView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKRuleView.m deleted file mode 100644 index 4fd71c3..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKRuleView.m +++ /dev/null @@ -1,133 +0,0 @@ -// -// YMAnchorPKRuleView.m -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "XPAnchorPKRuleView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" -#import "UIImage+Utils.h" - -@interface XPAnchorPKRuleView () -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///背景 -@property (nonatomic, strong) UIImageView *backgroundImageView; -///显示内容 -@property (nonatomic, strong) SZTextView *ruleTextView; -///关闭 -@property (nonatomic, strong) UIButton *closeBtn; - -@end - - -@implementation XPAnchorPKRuleView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - for (id view in self.ruleTextView.subviews) { - if ([view isKindOfClass:[UITextView class]]){ - UITextView *textView = view; - textView.textAlignment = NSTextAlignmentLeft; - break; - } - } - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backgroundImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.ruleTextView]; - [self addSubview:self.closeBtn]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(300); - make.height.mas_equalTo(324); - make.bottom.mas_equalTo(self.backgroundImageView.mas_bottom); - }]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.backgroundImageView).mas_offset(82); - make.height.mas_equalTo(21); - }]; - [self.ruleTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(30); - make.leading.mas_equalTo(18); - make.trailing.mas_equalTo(-18); - make.bottom.mas_equalTo(-20); - }]; - [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.top.mas_equalTo(self.backgroundImageView); - make.width.height.mas_equalTo(32); - }]; -} - -#pragma mark - Event Response -- (void)onCloseBtnClick:(UIButton *)button { - [TTPopup dismiss]; -} - -- (void)setRuleString:(NSString *)ruleString { - if ([ruleString containsString:@"\\n"]) { - ruleString = [ruleString stringByReplacingOccurrencesOfString:@"\\n" withString:@"\n"]; - } - self.ruleTextView.text = ruleString; -} - -#pragma mark - Getters And Setters -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] init]; - _backgroundImageView.image = [UIImage imageNamed:@"anchorPK_invite_bg"]; - } - return _backgroundImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPAnchorPKRuleView0"); - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - } - return _titleLabel; -} - -- (SZTextView *)ruleTextView { - if (!_ruleTextView) { - _ruleTextView = [[SZTextView alloc] init]; - _ruleTextView.textColor = [DJDKMIMOMColor mainTextColor]; - _ruleTextView.backgroundColor = [UIColor clearColor]; - _ruleTextView.font = [UIFont systemFontOfSize:12]; - _ruleTextView.scrollEnabled = NO; - _ruleTextView.editable = NO; - _ruleTextView.text = @""; - } - return _ruleTextView; -} - -- (UIButton *)closeBtn { - if (!_closeBtn) { - _closeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeBtn addTarget:self action:@selector(onCloseBtnClick:) forControlEvents:UIControlEventTouchUpInside]; - [_closeBtn setBackgroundImage:[UIImage imageNamed:@"anchorPk_result_close"] forState:UIControlStateNormal]; - } - return _closeBtn; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.h b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.h deleted file mode 100644 index 32cf9aa..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// YMAnchorPkPanelView.h -// YUMI -// -// Created by YUMI on 2022/4/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPAnchorPkPanelView, AcrossRoomPKPanelModel, AttachmentModel; -@protocol XPAnchorPkPanelViewDelegate - -///展示用户卡片 -- (void)xPAnchorPKPanelView:(XPAnchorPkPanelView *)view showUserCard:(NSString *)uid; - -///去房间 -- (void)xPAnchorPKPanelView:(XPAnchorPkPanelView *)view onlookRoom:(NSString *)roomUid; -///关注房主成功 -- (void)xPAnchorPKPanelViewAttentionSuccess; -///惩罚时间倒计时结束 -- (void)xPAnchorPKPanelViewPenaltyCountDownEnd; - -@end - -@interface XPAnchorPkPanelView : UIView - -///开启pk -- (void)openCountdownWithTime:(long)time; -///pk 信息 -@property (nonatomic,strong, nullable) AcrossRoomPKPanelModel *pkPanelInfo; -///代理 -@property (nonatomic,weak) id delegate; -///重置数据 -- (void)resetAcrossPKViewData; -///更新对方麦状态 -- (void)updateOtherMicStatus:(AttachmentModel *)attachment; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m deleted file mode 100644 index a2a4db7..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m +++ /dev/null @@ -1,825 +0,0 @@ -// -// YMAnchorPkPanelView.m -// YUMI -// -// Created by YUMI on 2022/4/11. -// - -#import "XPAnchorPkPanelView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "UIButton+EnlargeTouchArea.h" -#import "Timestamp.h" -#import "Api+UserCard.h" -#import "XNDJTDDLoadingTool.h" -#import "AccountInfoStorage.h" -#import "NSArray+Safe.h" -#import "RtcManager.h" -///Model -#import "UserInfoModel.h" -#import "AcrossRoomPKPanelModel.h" -#import "AttachmentModel.h" -///View -#import "XPAnchorPKPanelUserView.h" -///Api -#import "Api+AnchorPk.h" - -@interface XPAnchorPkPanelView () - -///背景 -@property (nonatomic, strong) UIImageView *backImageView; -#pragma mark - 规则的view -///红方⭐️ -@property (nonatomic, strong) UIImageView *redStarImageView; -///蓝方⭐️ -@property (nonatomic, strong) UIImageView *blueStarImageView; -///PK状态 -@property (nonatomic, strong) UILabel *pkStateLabel; -///显示倒计时 -@property (nonatomic, strong) UILabel *timeLabel; -///最大的容器 -@property (nonatomic,strong) UIStackView *stackView; -#pragma mark -进度条内容 -///PK最外面的容器 -@property (nonatomic, strong) UIView *progressView; -///PK条容器 -@property (nonatomic, strong) UIView *progressContentView; -///红方的进度图片 -@property (nonatomic, strong) UIImageView *redCountImageView; -///红方的礼物值 -@property (nonatomic, strong) UILabel *redCountLabel; -///蓝方的进度图片 -@property (nonatomic, strong) UIImageView *blueCountImageView; -///蓝方的礼物值 -@property (nonatomic, strong) UILabel *blueCountLabel; -///动画管理类 -@property (strong, nonatomic) SVGAParser *parser; -///中间进度的动画 -@property (nonatomic, strong) SVGAImageView *svgDisplayView; -#pragma mark - 队伍的队友的view -///红方的贡献用户容器 -@property (nonatomic,strong) UIStackView *redContributeStackView; -///蓝方的贡献用户容器 -@property (nonatomic,strong) UIStackView *blueContributeStackView; -///倒计时 -@property (strong, nonatomic) dispatch_source_t timer; -///红方PK结果 -@property (nonatomic, strong) UIImageView *redResultImageView; -///对方头像 -@property (nonatomic, strong) NetImageView *otherAvatarImageView; -///对方PK结果 -@property (nonatomic, strong) UIImageView *otherResultImageView; -///红方昵称容器 -@property (nonatomic, strong) UIStackView *redNickStackView; -///红方昵称 -@property (nonatomic, strong) UILabel *redNickLabel; -///关注按钮 -@property (nonatomic, strong) UIButton *attentionButton; -///对方昵称容器 -@property (nonatomic, strong) UIStackView *otherStackView; -///对方昵称 -@property (nonatomic, strong) UILabel *otherNickLabel; -///跟随按钮 -@property (nonatomic, strong) UIButton *followButton; -///对方的麦克风状态 -@property (nonatomic, strong) UIButton *otherMicButton; -///是否第一次展示 -@property (nonatomic, assign) BOOL isHadShow; - -@end - -@implementation XPAnchorPkPanelView - -#pragma mark - life cycle - -- (void)dealloc { - - [self resetAcrossPKViewData]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Public Method -- (void)resetAcrossPKViewData { - if (self.timer) { - dispatch_source_cancel(self.timer); - self.timer = nil; - } - self.pkPanelInfo = nil; -} - -///更新对方麦状态 -- (void)updateOtherMicStatus:(AttachmentModel *)attachment { - NSNumber *micStatus = attachment.data[@"aMicStatus"]; - NSNumber *aUid = attachment.data[@"aUid"]; - self.otherMicButton.selected = !micStatus.boolValue; - [[RtcManager instance] muteOne:!micStatus.boolValue userId:[NSString stringWithFormat:@"%@", aUid]]; - if (!micStatus.boolValue) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPAnchorPkPanelView0")]; - self.otherMicButton.hidden = NO; - } else { - self.otherMicButton.hidden = YES; - } - if ([self.pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid]) { - self.otherMicButton.hidden = NO; - } -} - -- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event { - UIView *view = [super hitTest:point withEvent:event]; - return view == self?nil:view; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self.backImageView addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.pkStateLabel]; - [self.stackView addArrangedSubview:self.timeLabel]; - ///进度条 - [self.backImageView addSubview:self.progressView]; - [self.progressView addSubview:self.progressContentView]; - [self.progressContentView addSubview:self.redCountImageView]; - [self.progressContentView addSubview:self.blueCountImageView]; - [self.progressContentView addSubview:self.redStarImageView]; - [self.progressContentView addSubview:self.blueStarImageView]; - [self.progressContentView addSubview:self.svgDisplayView]; - ///贡献榜 - [self.backImageView addSubview:self.redContributeStackView]; - [self.backImageView addSubview:self.blueContributeStackView]; - [self.progressContentView addSubview:self.redCountLabel]; - [self.progressContentView addSubview:self.blueCountLabel]; - - [self addSubview:self.redResultImageView]; - [self addSubview:self.otherAvatarImageView]; - [self addSubview:self.otherResultImageView]; - [self addSubview:self.redNickStackView]; - [self addSubview:self.otherMicButton]; - [self.redNickStackView addArrangedSubview:self.redNickLabel]; - [self.redNickStackView addArrangedSubview:self.attentionButton]; - [self addSubview:self.otherStackView]; - [self.otherStackView addArrangedSubview:self.otherNickLabel]; - [self.otherStackView addArrangedSubview:self.followButton]; - [self initUserSubViews]; - NSString * anatomiser1Name = [NSString stringWithFormat:@"%@/anchorPK_progress.svga", API_Image_URL]; - [self.parser parseWithURL:[NSURL URLWithString:anatomiser1Name] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - self.svgDisplayView.loops = INT_MAX; - self.svgDisplayView.clearsAfterStop = NO; - self.svgDisplayView.videoItem = videoItem; - [self.svgDisplayView startAnimation]; - } failureBlock:^(NSError * _Nonnull error) { - - }]; -} - -- (void)initUserSubViews { - for (int i = 0; i < 3; i++) { - XPAnchorPKPanelUserView * userView = [[XPAnchorPKPanelUserView alloc] init]; - userView.tag = (1000 + i); - userView.type = AnchorPKPanelUserType_Red_Contribute; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapUserRecognizer:)]; - [userView addGestureRecognizer:tap]; - [self.redContributeStackView addArrangedSubview:userView]; - } - - for (int i = 0; i < 3; i++) { - XPAnchorPKPanelUserView * userView = [[XPAnchorPKPanelUserView alloc] init]; - userView.tag = (1000 + i); - userView.type = AnchorPKPanelUserType_Blue_Contribute; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapUserRecognizer:)]; - [userView addGestureRecognizer:tap]; - [self.blueContributeStackView addArrangedSubview:userView]; - } -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(330 - 87); - }]; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-16); - make.width.mas_equalTo(284); - make.height.mas_equalTo(84); - make.centerX.mas_equalTo(self); - }]; - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.backImageView); - make.centerX.mas_equalTo(self); - make.height.mas_equalTo(21); - }]; - - [self.redStarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.backImageView).mas_offset(15); - make.leading.mas_equalTo(self.backImageView.mas_leading).mas_offset(-30); - make.width.height.mas_equalTo(26); - }]; - [self.blueStarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.redStarImageView); - make.leading.mas_equalTo(self.backImageView.mas_trailing).mas_offset(4); - make.width.height.mas_equalTo(26); - }]; - - ///进度条 - [self.progressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backImageView); - make.width.mas_equalTo(305); - make.height.mas_equalTo(16); - make.centerY.mas_equalTo(self.redStarImageView); - }]; - - [self.progressContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.progressView); - }]; - - [self.redCountImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.height.mas_equalTo(16); - make.top.mas_equalTo(0); - make.trailing.mas_equalTo(self.blueCountImageView.mas_leading); - }]; - - [self.redCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.progressContentView.mas_leading).offset(17); - make.centerY.mas_equalTo(self.progressContentView); - }]; - - [self.blueCountImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(0); - make.height.mas_equalTo(self.redCountImageView); - make.centerY.mas_equalTo(self.redCountImageView); - make.width.mas_equalTo(305 * 0.5); - }]; - - [self.blueCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.progressContentView.mas_trailing).offset(-17); - make.centerY.mas_equalTo(self.progressContentView); - }]; - - [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.blueCountImageView.mas_leading); - make.centerY.mas_equalTo(self.redCountImageView); - make.height.mas_equalTo(26); - make.width.mas_equalTo(25); - }]; - - [self.redContributeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.backImageView); - make.leading.mas_equalTo(self.backImageView).mas_offset(12); - make.height.mas_equalTo(42); - }]; - [self.blueContributeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.redContributeStackView); - make.trailing.mas_equalTo(self.backImageView).mas_offset(-12); - make.bottom.mas_equalTo(self.redContributeStackView); - }]; - - [self.redResultImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo((KScreenWidth - 64) * 0.5 - 26 - 85 * 0.5 - 66 * 0.5); - make.bottom.mas_equalTo(self.otherResultImageView); - make.width.mas_equalTo(66); - make.height.mas_equalTo(48); - }]; - - ///对方信息 - [self.otherAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo((KScreenWidth + 64) * 0.5 + 26 - 2.5); - make.top.mas_equalTo(0); - make.width.height.mas_equalTo(90); - }]; - [self.otherResultImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.otherAvatarImageView); - make.bottom.mas_equalTo(self.otherAvatarImageView).mas_offset(12); - make.width.mas_equalTo(66); - make.height.mas_equalTo(48); - }]; - [self.otherMicButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.trailing.mas_equalTo(self.otherAvatarImageView); - make.width.height.mas_equalTo(24); - }]; - [self.redNickStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.otherStackView); - make.centerX.mas_equalTo(self.redResultImageView); - make.height.mas_equalTo(20); - }]; - [self.attentionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(30, 20)); - }]; - - [self.otherStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.otherAvatarImageView.mas_bottom).mas_offset(17); - make.centerX.mas_equalTo(self.otherAvatarImageView); - make.height.mas_equalTo(20); - }]; - [self.followButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(30, 20)); - }]; -} - -#pragma mark - 倒计时 -- (void)openCountdownWithTime:(long)time { - __block long tempTime = time; //倒计时时间 - if (self.timer == nil) { - @kWeakify(self); - dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - self.timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - dispatch_source_set_timer(self.timer,dispatch_walltime(NULL, 0),1.0*NSEC_PER_SEC, 0); //每秒执行 - dispatch_source_set_event_handler(self.timer, ^{ - @kStrongify(self); - if(tempTime <= 0){ //倒计时结束，关闭 - if (self.timer != nil){ - dispatch_source_cancel(self.timer); - self.timer = nil; - } - ; - dispatch_async(dispatch_get_main_queue(), ^{ - if (self.pkPanelInfo.pkState == AcrossRoomPkStateTypePking) { - self.timeLabel.text = YMLocalizedString(@"XPAnchorPkPanelView1"); - } else { - self.timeLabel.text = @"00:00"; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPAnchorPKPanelViewPenaltyCountDownEnd)]) { - [self.delegate xPAnchorPKPanelViewPenaltyCountDownEnd]; - } - } - }); - } else { - dispatch_async(dispatch_get_main_queue(), ^{ - //设置按钮显示读秒效果 - [self AnchorPKCutdownOpen:tempTime]; - }); - tempTime--; - } - }); - dispatch_resume(self.timer); - } -} - -///房间pk, 倒计时回调 -- (void)AnchorPKCutdownOpen:(NSInteger)time { - NSInteger minute = time / 60; - NSInteger second = (time % 60); - NSInteger hour = time/3600; - NSString *timeStr; - if (hour > 0) { - minute = minute % 60; - timeStr = [NSString stringWithFormat:@"%02zd:%02zd:%02zd", hour, minute, second]; - } else { - timeStr = [NSString stringWithFormat:@"%02zd:%02zd", minute, second]; - } - self.timeLabel.text = timeStr; - if (time <= 30) { - self.timeLabel.textColor = UIColorFromRGB(0xFF87A1); - } else { - self.timeLabel.textColor = UIColorFromRGB(0xFFFFFF); - } -} - -- (void)tapUserRecognizer:(UITapGestureRecognizer *)tap { - XPAnchorPKPanelUserView * userView= (XPAnchorPKPanelUserView *)tap.view; - if (userView.panelInfo && userView.panelInfo.uid.length > 0 && self.delegate && [self.delegate respondsToSelector:@selector(xPAnchorPKPanelView:showUserCard:)]) { - [self.delegate xPAnchorPKPanelView:self showUserCard:userView.panelInfo.uid]; - } -} - -- (void)onFollowButtonClick:(UIButton *)button { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPAnchorPKPanelView:onlookRoom:)]) { - [self.delegate xPAnchorPKPanelView:self onlookRoom:self.pkPanelInfo.aUid]; - } -} - -- (void)onAttentionButtonClick:(UIButton *)button { - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - [Api attentionCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - self.attentionButton.hidden = YES; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPAnchorPkPanelView2")]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPAnchorPKPanelViewAttentionSuccess)]) { - [self.delegate xPAnchorPKPanelViewAttentionSuccess]; - } - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } uid:uid likedUid:self.pkPanelInfo.cUid ticket:ticket type:@"1"]; -} - -- (void)onShowUserCard:(UITapGestureRecognizer *)ges { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPAnchorPKPanelView:showUserCard:)]) { - [self.delegate xPAnchorPKPanelView:self showUserCard:self.pkPanelInfo.aUid]; - } -} - -#pragma mark - getters and setters -- (void)setPkPanelInfo:(AcrossRoomPKPanelModel *)pkPanelInfo { - _pkPanelInfo = pkPanelInfo; - if (_pkPanelInfo) { - if (!self.isHadShow) { - self.isHadShow = YES; - NSString * uid = [[AccountInfoStorage instance] getUid]; - if ([uid isEqualToString:pkPanelInfo.cUid]) { - self.attentionButton.hidden = YES; - } else if(pkPanelInfo.cUid){ - [Api attentionStatusCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - BOOL isLike = ((NSNumber *)data.data).boolValue; - self.attentionButton.hidden = isLike; - } uid:uid isLikeUid:pkPanelInfo.cUid]; - } - } - if (pkPanelInfo.pkState == AcrossRoomPkStateTypePenalty) { - self.pkStateLabel.text = YMLocalizedString(@"XPAnchorPkPanelView3"); - if (self.timer) { - dispatch_source_cancel(self.timer); - self.timer = nil; - } - [Timestamp getInternetDateWithSuccess:^(NSTimeInterval timeInterval) { - timeInterval = timeInterval * 1000; - long aTime = (pkPanelInfo.penaltyEndTime - timeInterval) / 1000; - [self openCountdownWithTime:aTime]; - } failure:^(NSError * _Nonnull error) { - NSDate *datenow = [NSDate date];//现在时间 - long time2 = (long)([datenow timeIntervalSince1970]*1000); - long aTime = (pkPanelInfo.penaltyEndTime - time2) / 1000; - [self openCountdownWithTime:aTime]; - }]; - self.redResultImageView.hidden = NO; - self.otherResultImageView.hidden = NO; - if ([pkPanelInfo.winUid isEqualToString:pkPanelInfo.cUid]) { - self.redResultImageView.image = [UIImage getLanguageImage:@"anchorPk_micro_result_win"]; - self.otherResultImageView.image = [UIImage getLanguageImage:@"anchorPk_micro_result_fail"]; - } else if ([pkPanelInfo.winUid isEqualToString:pkPanelInfo.aUid]) {//输 - self.redResultImageView.image = [UIImage getLanguageImage:@"anchorPk_micro_result_fail"]; - self.otherResultImageView.image = [UIImage getLanguageImage:@"anchorPk_micro_result_win"]; - } else {//平局 - self.redResultImageView.image = [UIImage getLanguageImage:@"anchorPk_micro_result_tie"]; - self.otherResultImageView.image = [UIImage getLanguageImage:@"anchorPk_micro_result_tie"]; - } - } else { - self.redResultImageView.hidden = YES; - self.otherResultImageView.hidden = YES; - self.pkStateLabel.text = @"PK"; - [Timestamp getInternetDateWithSuccess:^(NSTimeInterval timeInterval) { - timeInterval = timeInterval * 1000; - long aTime = (pkPanelInfo.endTime - timeInterval) / 1000; - [self openCountdownWithTime:aTime]; - } failure:^(NSError * _Nonnull error) { - NSDate *datenow = [NSDate date];//现在时间 - long time2 = (long)([datenow timeIntervalSince1970]*1000); - long aTime = (pkPanelInfo.endTime - time2) / 1000; - [self openCountdownWithTime:aTime]; - }]; - } - if (_pkPanelInfo.cNick.length > 7) { - _pkPanelInfo.cNick = [NSString stringWithFormat:@"%@…", [_pkPanelInfo.cNick substringToIndex:7]]; - } - - if (_pkPanelInfo.aNick.length > 7) { - _pkPanelInfo.aNick = [NSString stringWithFormat:@"%@…", [_pkPanelInfo.aNick substringToIndex:7]]; - } - - self.redCountLabel.text = [NSString stringWithFormat:@"%lld", _pkPanelInfo.cAmount]; - self.blueCountLabel.text = [NSString stringWithFormat:@"%lld", _pkPanelInfo.aAmount]; - for (int i = 0; i<_pkPanelInfo.csRank.count; i++) { - AcrossRoomPkRankModel * rankModel = [_pkPanelInfo.csRank xpSafeObjectAtIndex:i]; - if (i >= self.redContributeStackView.subviews.count) { - break; - } - XPAnchorPKPanelUserView *userView = self.redContributeStackView.subviews[i]; - userView.panelInfo = rankModel; - } - - for (int i = 0; i<_pkPanelInfo.asRank.count; i++) { - AcrossRoomPkRankModel * rankModel = [_pkPanelInfo.asRank xpSafeObjectAtIndex:i]; - if (i >= self.blueContributeStackView.subviews.count) { - break; - } - XPAnchorPKPanelUserView *userView = self.blueContributeStackView.subviews[i]; - userView.panelInfo = rankModel; - } - - if (_pkPanelInfo.aPercent > 1) { - _pkPanelInfo.aPercent = 1; - } - CGFloat width = 305 * _pkPanelInfo.aPercent; - if (width <= 6.5) { - width = 6.5; - } else if (width >= 305 - 5.5) { - width = 305 - 5.5; - } - [self.blueCountImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(width); - }]; - self.otherAvatarImageView.imageUrl = pkPanelInfo.aAvatar; - self.otherNickLabel.text = pkPanelInfo.aNick; - self.redNickLabel.text = pkPanelInfo.cNick; - self.followButton.hidden = [pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid]; - if (pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close) { - self.otherMicButton.hidden = NO; - } else { - self.otherMicButton.hidden = ![pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid]; - } - - [RtcManager instance].isAnckorPk = YES; - self.otherMicButton.selected = pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close; - [[RtcManager instance] muteOne:pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close userId:pkPanelInfo.aUid]; - - - } else { - self.redCountLabel.text = @"0"; - self.blueCountLabel.text = @"0"; - for (int i = 0; i - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorRandomPKRuleView : UIView -/// -@property (nonatomic,copy) NSString *ruleString; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m deleted file mode 100644 index 4958ce5..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m +++ /dev/null @@ -1,280 +0,0 @@ -// -// YMAnchorRandomPKRuleView.m -// YUMI -// -// Created by YUMI on 2022/12/23. -// - -#import "XPAnchorRandomPKRuleView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" -#import "UIImage+Utils.h" - -@interface XPAnchorRandomPKRuleView () -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///背景 -@property (nonatomic, strong) UIImageView *backgroundImageView; - -///滚动 -@property (nonatomic,strong) UIScrollView *scrollView; -///规则 -@property (nonatomic,strong) UILabel *ruleLabel; -///随机标题 -@property (nonatomic,strong) UILabel *randomLabel; -///随机背景 -@property (nonatomic,strong) UIImageView *randomImageView; -///随机文案 -@property (nonatomic,strong) UILabel *randomContentLb; - -///邀请标题 -@property (nonatomic,strong) UILabel *inviteLabel; -///邀请背景 -@property (nonatomic,strong) UIImageView *inviteImageView; -///邀请文案 -@property (nonatomic,strong) UILabel *inviteContentLb; -///关闭 -@property (nonatomic, strong) UIButton *closeBtn; - -@end - - -@implementation XPAnchorRandomPKRuleView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backgroundImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.closeBtn]; - [self.backgroundImageView addSubview:self.scrollView]; - - [self.scrollView addSubview:self.ruleLabel]; - -// [self.scrollView addSubview:self.randomImageView]; -// [self.scrollView addSubview:self.randomLabel]; -// [self.scrollView addSubview:self.randomContentLb]; -// -// [self.scrollView addSubview:self.inviteImageView]; -// [self.scrollView addSubview:self.inviteLabel]; -// [self.scrollView addSubview:self.inviteContentLb]; - - -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(300); - make.height.mas_equalTo(324); - make.bottom.mas_equalTo(self.backgroundImageView.mas_bottom); - }]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.backgroundImageView).mas_offset(82); - make.height.mas_equalTo(21); - }]; - - - [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.backgroundImageView).offset(120); - make.leading.trailing.mas_equalTo(self.backgroundImageView).inset(18); - make.bottom.mas_equalTo(self.backgroundImageView).offset(-15); - }]; - - [self.ruleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.scrollView); - make.leading.trailing.mas_equalTo(self.backgroundImageView).inset(18); - }]; - -// [self.randomLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.top.mas_equalTo(self.ruleLabel.mas_bottom).offset(16); -// make.centerX.mas_equalTo(self.scrollView); -// }]; -// -// [self.randomImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.size.mas_equalTo(CGSizeMake(88, 8)); -// make.top.mas_equalTo(self.randomLabel.mas_bottom).offset(-6); -// make.centerX.mas_equalTo(self.randomLabel); -// }]; -// -// [self.randomContentLb mas_makeConstraints:^(MASConstraintMaker *make) { -// make.leading.trailing.mas_equalTo(self.backgroundImageView).inset(18); -// make.top.mas_equalTo(self.randomImageView.mas_bottom).offset(8); -// }]; -// -// [self.inviteLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.top.mas_equalTo(self.randomContentLb.mas_bottom).offset(16); -// make.centerX.mas_equalTo(self.scrollView); -// }]; -// -// [self.inviteImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.size.mas_equalTo(CGSizeMake(88, 8)); -// make.top.mas_equalTo(self.inviteLabel.mas_bottom).offset(-6); -// make.centerX.mas_equalTo(self.inviteLabel); -// }]; -// -// [self.inviteContentLb mas_makeConstraints:^(MASConstraintMaker *make) { -// make.leading.trailing.mas_equalTo(self.backgroundImageView).inset(18); -// make.top.mas_equalTo(self.inviteImageView.mas_bottom).offset(8); -// }]; - - [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.top.mas_equalTo(self.backgroundImageView); - make.width.height.mas_equalTo(32); - }]; -} - -#pragma mark - Event Response -- (void)onCloseBtnClick:(UIButton *)button { - [TTPopup dismiss]; -} - -- (void)setRuleString:(NSString *)ruleString { - if ([ruleString containsString:@"\\n"]) { - ruleString = [ruleString stringByReplacingOccurrencesOfString:@"\\n" withString:@"\n"]; - } - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - paragraphStyle.lineSpacing = 5; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:ruleString attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}]; - [attribute addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, ruleString.length)]; - self.ruleLabel.attributedText = attribute; -CGSize size = [self.ruleLabel sizeThatFits:CGSizeMake(300 -36, CGFLOAT_MAX)]; - self.scrollView.contentSize = CGSizeMake(0, size.height + 70 * 2 + 20); -} - -#pragma mark - Getters And Setters -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] init]; - _backgroundImageView.userInteractionEnabled = YES; - _backgroundImageView.image = [UIImage imageNamed:@"anchorPK_invite_bg"]; - } - return _backgroundImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPAnchorRandomPKRuleView0"); - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - } - return _titleLabel; -} - - -- (UIImageView *)randomImageView { - if (!_randomImageView) { - _randomImageView = [[UIImageView alloc] init]; - _randomImageView.userInteractionEnabled = YES; - _randomImageView.image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor colorWithHexString:@"#1CD7FD"], [DJDKMIMOMColor colorWithHexString:@"#9277FF"], [DJDKMIMOMColor colorWithHexString:@"FF6BA3"]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; - _randomImageView.contentMode = UIViewContentModeScaleAspectFill; - _randomImageView.layer.masksToBounds = YES; - _randomImageView.layer.cornerRadius = 4; - } - return _randomImageView; -} - -- (UILabel *)randomLabel { - if (!_randomLabel) { - _randomLabel = [[UILabel alloc] init]; - _randomLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _randomLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _randomLabel.text= YMLocalizedString(@"XPAnchorRandomPKRuleView1"); - } - return _randomLabel; -} - -- (UILabel *)ruleLabel { - if (!_ruleLabel) { - _ruleLabel = [[UILabel alloc] init]; - _ruleLabel.font = [UIFont systemFontOfSize:12]; - _ruleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _ruleLabel.numberOfLines = 0; - } - return _ruleLabel; -} - -- (UIScrollView *)scrollView { - if (!_scrollView) { - _scrollView = [[UIScrollView alloc] init]; - _scrollView.backgroundColor = [UIColor clearColor]; - _scrollView.showsHorizontalScrollIndicator = NO; - } - return _scrollView; -} - - -- (UILabel *)randomContentLb { - if (!_randomContentLb) { - _randomContentLb = [[UILabel alloc] init]; - NSString * title = YMLocalizedString(@"XPAnchorRandomPKRuleView2"); - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}]; - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - paragraphStyle.lineSpacing = 5; - [attribute addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, title.length)]; - _randomContentLb.attributedText = attribute; - _randomContentLb.numberOfLines = 0; - } - return _randomContentLb; -} - -- (UIImageView *)inviteImageView { - if (!_inviteImageView) { - _inviteImageView = [[UIImageView alloc] init]; - _inviteImageView.userInteractionEnabled = YES; - _inviteImageView.image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor colorWithHexString:@"#1CD7FD"], [DJDKMIMOMColor colorWithHexString:@"#9277FF"], [DJDKMIMOMColor colorWithHexString:@"FF6BA3"]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; - _inviteImageView.contentMode = UIViewContentModeScaleAspectFill; - _inviteImageView.layer.masksToBounds = YES; - _inviteImageView.layer.cornerRadius = 4; - } - return _inviteImageView; -} - -- (UILabel *)inviteLabel { - if (!_inviteLabel) { - _inviteLabel = [[UILabel alloc] init]; - _inviteLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _inviteLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _inviteLabel.text= YMLocalizedString(@"XPAnchorRandomPKRuleView3"); - } - return _inviteLabel; -} - -- (UILabel *)inviteContentLb { - if (!_inviteContentLb) { - _inviteContentLb = [[UILabel alloc] init]; - NSString * title = YMLocalizedString(@"XPAnchorRandomPKRuleView4"); - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}]; - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - paragraphStyle.lineSpacing = 5; - [attribute addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, title.length)]; - _inviteContentLb.attributedText = attribute; - _inviteContentLb.numberOfLines = 0; - - } - return _inviteContentLb; -} - -- (UIButton *)closeBtn { - if (!_closeBtn) { - _closeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeBtn addTarget:self action:@selector(onCloseBtnClick:) forControlEvents:UIControlEventTouchUpInside]; - [_closeBtn setBackgroundImage:[UIImage imageNamed:@"anchorPk_result_close"] forState:UIControlStateNormal]; - } - return _closeBtn; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.h b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.h deleted file mode 100644 index ca7b103..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMAnchorPKSelectRoomView.h -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class XPAnchorPKSelectRoomView, AcrossRoomPKInfoModel; -@protocol XPAnchorPKSelectRoomViewDelegate - -- (void)XPAnchorPKSelectRoomView:(XPAnchorPKSelectRoomView *)view didChoosePKRoom:(AcrossRoomPKInfoModel *)pkRoomInfo; - -@end - -@interface XPAnchorPKSelectRoomView : UIView - -///代理 -@property (nonatomic,weak) id delegate; -///房间的uid -@property (nonatomic,copy) NSString *roomUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.m deleted file mode 100644 index 727adc0..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.m +++ /dev/null @@ -1,338 +0,0 @@ -// -// YMAnchorPKSelectRoomView.m -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "XPAnchorPKSelectRoomView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "XNDJTDDLoadingTool.h" -#import "UIImage+Utils.h" -#import "Api+AnchorPk.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///Model -#import "AcrossRoomPKInfoModel.h" -///View -#import "XPAcrossRoomPKEmptyTableViewCell.h" -#import "XPAnchorPKTableViewCell.h" - -@interface XPAnchorPKSelectRoomView () - -///返回按钮 -@property (nonatomic, strong) UIButton *backButton; -@property (nonatomic, strong) UITableView *tableView; -///输入框背景 -@property (nonatomic,strong) UIView * inputBackView; -///搜索logo -@property (nonatomic,strong) UIButton *searchButton; -///输入框 -@property (nonatomic,strong) MSBaseTextField *searchTextField; -///数据源 -@property (nonatomic, strong) NSMutableArray *datasource; -///当前的页数 -@property (nonatomic, assign) NSInteger page; -///是否有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///选中的PK房间 -@property (nonatomic, strong) AcrossRoomPKInfoModel *selectRoomInfo; - -@end - -@implementation XPAnchorPKSelectRoomView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - [self initHeaderAndFooterRrfresh]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColorFromRGB(0x2A2A39); - [self addSubview:self.backButton]; - [self addSubview:self.inputBackView]; - [self addSubview:self.tableView]; - - [self.inputBackView addSubview:self.searchButton]; - [self.inputBackView addSubview:self.searchTextField]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onKeyBoardResign:)]; - [self addGestureRecognizer:tap]; -} - -- (void)initSubViewConstraints { - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(12); - make.width.mas_equalTo(22); - make.height.mas_equalTo(22); - make.top.mas_equalTo(27); - }]; - - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.inputBackView.mas_bottom).mas_offset(5); - make.leading.trailing.mas_equalTo(0); - make.bottom.mas_equalTo(self.mas_bottom); - }]; - [self.inputBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - make.leading.mas_equalTo(self.backButton.mas_trailing).offset(5); - make.trailing.mas_equalTo(self.mas_trailing).offset(-15); - make.centerY.mas_equalTo(self.backButton); - }]; - - [self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(18, 18)); - make.centerY.mas_equalTo(self.inputBackView); - make.trailing.mas_equalTo(self.inputBackView).offset(-12); - }]; - - [self.searchTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.inputBackView).offset(25); - make.top.bottom.mas_equalTo(self.inputBackView); - make.trailing.mas_equalTo(self.searchButton.mas_leading).offset(-5); - }]; -} - -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - self.page = 1; - [Api getAnchorPKRoomList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [AcrossRoomPKInfoModel modelsWithArray:data.data]; - [self getAcrossRoomPKListSuccess:array state:0]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:self.roomUid pageNum:[NSString stringWithFormat:@"%ld", self.page] pageSize:@"20" pkType:@"2"]; -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPAnchorPKSelectRoomView0")]; - return; - } - self.page++; - [Api getAnchorPKRoomList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [AcrossRoomPKInfoModel modelsWithArray:data.data]; - [self getAcrossRoomPKListSuccess:array state:1]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:self.roomUid pageNum:[NSString stringWithFormat:@"%ld", self.page] pageSize:@"20" pkType:@"2"]; -} - -- (void)getAcrossRoomPKListSuccess:(NSArray *)list state:(int)state { - if (state == 0) { - self.selectRoomInfo = nil; - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - if (list.count > 0) { - self.hasNoMoreData = NO; - [self.datasource addObjectsFromArray:list]; - } else { - self.hasNoMoreData = YES; - [self.tableView.mj_footer endRefreshingWithNoMoreData]; - } - [self.tableView reloadData]; -} - -- (void)onKeyBoardResign:(UITapGestureRecognizer *)ges { - [self.searchTextField resignFirstResponder]; -} -#pragma mark - tableviewDelegate -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPAnchorPKTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPAnchorPKTableViewCell class])]; - if (cell == nil) { - cell = [[XPAnchorPKTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPAnchorPKTableViewCell class])]; - } - cell.delegate = self; - AcrossRoomPKInfoModel * pkRoomInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (pkRoomInfo.uid.integerValue == self.selectRoomInfo.uid.integerValue) { - pkRoomInfo.hadSelected = YES; - } else { - pkRoomInfo.hadSelected = NO; - } - cell.roomPKInfo = pkRoomInfo; - return cell; - } - - XPAcrossRoomPKEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPAcrossRoomPKEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPAcrossRoomPKEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPAcrossRoomPKEmptyTableViewCell class])]; - } - return cell; - -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - return 75; - } - return (370 + kSafeAreaBottomHeight); -} - -#pragma mark - XPAnchorPKTableViewCellDelegate -- (void)xPAnchorPKTableViewCell:(XPAnchorPKTableViewCell *)view didChooseRoom:(AcrossRoomPKInfoModel *)roomInfo { -// if (self.selectRoomInfo && roomInfo.uid == self.selectRoomInfo.uid) {///有选中的且点击了选中的，取消掉选择 -// [self.tableView reloadData]; -// self.selectRoomInfo = nil; -// self.doneButton.enabled = NO; -// } else { -// [self.tableView reloadData]; -// self.doneButton.enabled = YES; -// } - - self.selectRoomInfo = roomInfo; - [self.searchTextField resignFirstResponder]; - if (self.delegate && [self.delegate respondsToSelector:@selector(XPAnchorPKSelectRoomView:didChoosePKRoom:)]) { - [self.delegate XPAnchorPKSelectRoomView:self didChoosePKRoom:self.selectRoomInfo]; - } - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromLeft; - [self.layer addAnimation:transition forKey:nil]; - [self removeFromSuperview]; -} - -#pragma mark - Event Response -- (void)searchButtonAction:(UIButton *)sender { - if (self.searchTextField.text.length > 0) { - [Api searchAnchorPKRoomList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [AcrossRoomPKInfoModel modelsWithArray:data.data]; - [self getAcrossRoomPKListSuccess:array state:0]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } erbanNo:self.searchTextField.text roomUid:@"" pageNum:@"1" pageSize:@"50" pkType:@"2"]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPAnchorPKSelectRoomView1")]; - } -} - -- (void)backButtonAction:(UIButton *)sender { - [self.searchTextField resignFirstResponder]; - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromLeft; - [self.layer addAnimation:transition forKey:nil]; - [self removeFromSuperview]; -} - -#pragma mark - Getters And Setters -- (void)setRoomUid:(NSString *)roomUid { - _roomUid = roomUid; - [self.datasource removeAllObjects]; - [self.tableView reloadData]; - if (_roomUid.length > 0) { - [self headerRefresh]; - } -} -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPAnchorPKTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPAnchorPKTableViewCell class])]; - [_tableView registerClass:[XPAcrossRoomPKEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPAcrossRoomPKEmptyTableViewCell class])]; - } - return _tableView; -} - - -- (UIView *)inputBackView { - if (!_inputBackView) { - _inputBackView = [[UIView alloc] init]; - _inputBackView.backgroundColor = UIColorFromRGB(0x4C4C6A); - _inputBackView.layer.masksToBounds = YES; - _inputBackView.layer.cornerRadius = 15; - } - return _inputBackView; -} - -- (UIButton *)searchButton { - if (!_searchButton) { - _searchButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_searchButton setImage:[UIImage imageNamed:@"home_search_input_search"] forState:UIControlStateNormal]; - [_searchButton setImage:[UIImage imageNamed:@"home_search_input_search"] forState:UIControlStateSelected]; - [_searchButton addTarget:self action:@selector(searchButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _searchButton; -} - -- (MSBaseTextField *)searchTextField { - if (!_searchTextField) { - _searchTextField = [[MSBaseTextField alloc] init]; - _searchTextField.layer.cornerRadius = 15; - _searchTextField.layer.masksToBounds = YES; - _searchTextField.tintColor = [UIColor whiteColor]; - _searchTextField.textColor = [UIColor whiteColor]; - _searchTextField.backgroundColor = [UIColor clearColor]; - _searchTextField.font = [UIFont systemFontOfSize:13]; - NSString *placeholder = YMLocalizedString(@"XPAnchorPKSelectRoomView2"); - _searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [UIColor colorWithWhite:1 alpha:0.4]}]; - } - return _searchTextField; -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [[UIButton alloc] init]; - [_backButton setImage:[[UIImage imageNamed:@"home_search_white_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - _backButton.imageView.contentMode = UIViewContentModeScaleAspectFit; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.h b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.h deleted file mode 100644 index 02e3182..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMAnchorSelectTypeViewController.h -// YUMI -// -// Created by YUMI on 2022/11/17. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorPKSelectTypeController : MvpViewController - -- (instancetype)initWithRoomUid:(NSString *)roomUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.m deleted file mode 100644 index 857d5bd..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.m +++ /dev/null @@ -1,202 +0,0 @@ -// -// YMAnchorSelectTypeViewController.m -// YUMI -// -// Created by YUMI on 2022/11/17. -// - -#import "XPAnchorPKSelectTypeController.h" -#import "DJDKMIMOMColor.h" -#import -#import "YUMIMacroUitls.h" -#import "TTPopup.h" -#import "XPAnchorPKRuleView.h" -#import "XPAnchorPKViewController.h" -#import "XCCurrentVCStackManager.h" -#import "Api+Room.h" -#import "XPAnchorRandomPKRuleView.h" -///P -#import "XPAnchorPKPresenter.h" -#import "XPAnchorPKProtocol.h" - -@interface XPAnchorPKSelectTypeController () - -@property (nonatomic, copy) NSString *roomUid; - -@property (nonatomic, strong) UIView *gesView; -@property (nonatomic, strong) UIView *bgView; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UIButton *ruleButton; -@property (nonatomic, strong) UIView *lineView; -@property (nonatomic, strong) UIButton *randomPKButton; -@property (nonatomic, strong) UIButton *invitePKButton; - -@end - -@implementation XPAnchorPKSelectTypeController - -- (XPAnchorPKPresenter *)createPresenter { - return [[XPAnchorPKPresenter alloc] init];; -} - -- (instancetype)initWithRoomUid:(NSString *)roomUid { - if (self = [super init]) { - self.roomUid = roomUid; - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - } - return self; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self addSubView]; - [self setupContraints]; - self.view.backgroundColor = [UIColor clearColor]; -} - -- (void)addSubView { - [self.view addSubview:self.gesView]; - [self.view addSubview:self.bgView]; - [self.bgView addSubview:self.titleLabel]; - [self.bgView addSubview:self.ruleButton]; - [self.bgView addSubview:self.lineView]; - [self.bgView addSubview:self.randomPKButton]; - [self.bgView addSubview:self.invitePKButton]; -} - -- (void)setupContraints { - [self.gesView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(0); - make.bottom.mas_equalTo(self.bgView.mas_top); - }]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(0); - make.height.mas_equalTo(250); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(16); - make.centerX.mas_equalTo(self.bgView); - make.height.mas_equalTo(18); - }]; - [self.ruleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-16); - make.centerY.mas_equalTo(self.titleLabel); - make.width.height.mas_equalTo(21); - }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(8); - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(0.5); - }]; - [self.randomPKButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.bgView.mas_centerX).mas_offset(-22); - make.size.mas_equalTo(CGSizeMake(100, 135)); - make.top.mas_equalTo(self.lineView.mas_bottom).mas_offset(16); - }]; - [self.invitePKButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.randomPKButton.mas_trailing).mas_offset(44); - make.size.mas_equalTo(CGSizeMake(100, 135)); - make.top.mas_equalTo(self.randomPKButton); - }]; -} - -- (void)ruleButtonAction:(UIButton *)sender { - [Api requestAnchorPkRule:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - XPAnchorRandomPKRuleView *view = [[XPAnchorRandomPKRuleView alloc] init]; - view.ruleString = data.data; - [TTPopup popupView:view style:TTPopupStyleAlert]; - } - }]; - -} - -- (void)randomButtonAction:(UIButton *)sender { - [self.presenter matchRandomPK:self.roomUid]; -} - -- (void)inviteButtonAction:(UIButton *)sender { - [self dismissViewControllerAnimated:YES completion:^{ - XPAnchorPKViewController * acrossRoomPKVC = [[XPAnchorPKViewController alloc] initWithRoomUid:self.roomUid]; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController presentViewController:acrossRoomPKVC animated:YES completion:nil]; - }]; -} - -- (void)dismiss:(UITapGestureRecognizer *)ges { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - XPAnchorPKProtocol -///随机PK匹配开始 -- (void)matchRandomPKSuccess:(long long)matchPkStartTime { - [[NSNotificationCenter defaultCenter] postNotificationName:@"anchorPKMatchBegin" object:@{@"matchPkStartTime" : @(matchPkStartTime)}]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - getter -- (UIView *)gesView { - if (!_gesView) { - _gesView = [[UIView alloc] init]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismiss:)]; - [_gesView addGestureRecognizer:tap]; - } - return _gesView; -} - -- (UIView *)bgView { - if (!_bgView) { - _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = UIColorFromRGB(0x0D0E2C); - CAShapeLayer * layer = [CAShapeLayer layer]; - layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, 250) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(8, 8)].CGPath; - _bgView.layer.mask = layer; - } - return _bgView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPAnchorPKSelectTypeController0"); - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.font = [UIFont systemFontOfSize:14]; - } - return _titleLabel; -} - -- (UIButton *)ruleButton { - if (!_ruleButton) { - _ruleButton = [[UIButton alloc] init]; - [_ruleButton setImage:[UIImage imageNamed:@"room_across_pk_help"] forState:UIControlStateNormal]; - [_ruleButton addTarget:self action:@selector(ruleButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _ruleButton; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = UIColorRGBAlpha(0xffffff, 0.1); - } - return _lineView; -} - -- (UIButton *)randomPKButton { - if (!_randomPKButton) { - _randomPKButton = [[UIButton alloc] init]; - [_randomPKButton setImage:[UIImage getLanguageImage:@"anchor_pk_random_icon"] forState:UIControlStateNormal]; - [_randomPKButton addTarget:self action:@selector(randomButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _randomPKButton; -} - -- (UIButton *)invitePKButton { - if (!_invitePKButton) { - _invitePKButton = [[UIButton alloc] init]; - [_invitePKButton setImage:[UIImage getLanguageImage:@"anchor_pk_invite_icon"] forState:UIControlStateNormal]; - [_invitePKButton addTarget:self action:@selector(inviteButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _invitePKButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.h b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.h deleted file mode 100644 index dbb1383..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMAnchorPKViewController.h -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorPKViewController : MvpViewController - -- (instancetype)initWithRoomUid:(NSString *)roomUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m deleted file mode 100644 index c46c1cb..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m +++ /dev/null @@ -1,650 +0,0 @@ -// -// YMAnchorPKViewController.m -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "XPAnchorPKViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "TTPopup.h" -///Model -#import "AcrossRoomPKInfoModel.h" -///View -#import "XPAnchorPKSelectRoomView.h" -///P -#import "XPAnchorPKPresenter.h" -#import "XPAnchorPKProtocol.h" - -#define kContentHeight (404 + kSafeAreaBottomHeight) - -@interface XPAnchorPKViewController () -///顶部点击消失的view -@property (nonatomic, strong) UIView *topView; -///显示内容的view -@property (nonatomic, strong) UIView *contentView; -///标题 -@property (nonatomic, strong) UILabel *titleLabel; -///PK对象的容器 -@property (nonatomic,strong) UIStackView *userStackView; -///选择PK对象title -@property (nonatomic, strong) UILabel *selectPKLabel; -///选择PK对象 -@property (nonatomic, strong) UIButton *selectPKButton; -///PK对象的容器 -@property (nonatomic,strong) UIStackView *timeStackView; -///选择PK时长title -@property (nonatomic, strong) UILabel *selectPKTimeLabel; -///选择PK时间的容器 -@property (nonatomic,strong) UIStackView *chooseTimeStackView; -@property (nonatomic, strong) UIButton *tenMinuteButton; -@property (nonatomic, strong) UIButton *twentyMinuteButton; -@property (nonatomic, strong) UIButton *thirtyMinuteButton; -///自定义PK时间 -@property (nonatomic, strong) MSBaseTextField *customTimeTextField; -///玩法的容器 -@property (nonatomic,strong) UIStackView *playStackView; -///PK玩法title -@property (nonatomic, strong) UILabel *pkPlayModeLabel; -///PK玩法 -@property (nonatomic, strong) MSBaseTextField *pkPlayModeTextField; -///发起挑战按钮 -@property (nonatomic, strong) UIButton *doneButton; -///选择房间的内容 -@property (nonatomic, strong) UIView *selectRoomContentView; -///选中的房间头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -///房间标题 -@property (nonatomic, strong) UILabel *roomTitleLabel; -//平台ID -@property (nonatomic, strong) UILabel *idLabel; -///取消选择房间 -@property (nonatomic, strong) UIButton *cancelButon; -///选中的PK房间 -@property (nonatomic, strong) AcrossRoomPKInfoModel *selectRoomInfo; -///PK的时长 -@property (nonatomic, assign) NSInteger pkDuration; -///选择PK房间 -@property (nonatomic, strong) XPAnchorPKSelectRoomView *selectView; -///房间信息 -@property (nonatomic,strong) NSString *roomUid; -@end - -@implementation XPAnchorPKViewController - -- (instancetype)initWithRoomUid:(NSString *)roomUid { - if (self = [super init]) { - self.roomUid = roomUid; - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - } - return self; -} - -- (XPAnchorPKPresenter *)createPresenter { - return [[XPAnchorPKPresenter alloc] init];; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - self.pkDuration = 10; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [IQKeyboardManager sharedManager].enable = YES; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.topView]; - [self.view addSubview:self.contentView]; - - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.userStackView]; - [self.contentView addSubview:self.timeStackView]; - [self.contentView addSubview:self.playStackView]; - [self.contentView addSubview:self.customTimeTextField]; - [self.contentView addSubview:self.doneButton]; - - [self.userStackView addArrangedSubview:self.selectPKLabel]; - [self.userStackView addArrangedSubview:self.selectPKButton]; - [self.userStackView addArrangedSubview:self.selectRoomContentView]; - - [self.timeStackView addArrangedSubview:self.selectPKTimeLabel]; - [self.timeStackView addArrangedSubview:self.chooseTimeStackView]; - - [self.chooseTimeStackView addArrangedSubview:self.tenMinuteButton]; - [self.chooseTimeStackView addArrangedSubview:self.twentyMinuteButton]; - [self.chooseTimeStackView addArrangedSubview:self.thirtyMinuteButton]; - - [self.playStackView addArrangedSubview:self.pkPlayModeLabel]; - [self.playStackView addArrangedSubview:self.pkPlayModeTextField]; - - [self.selectRoomContentView addSubview:self.avatarImageView]; - [self.selectRoomContentView addSubview:self.roomTitleLabel]; - [self.selectRoomContentView addSubview:self.idLabel]; - [self.selectRoomContentView addSubview:self.cancelButon]; -} - -- (void)initSubViewConstraints { - - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.contentView.mas_top); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.height.mas_equalTo(kContentHeight); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(18); - }]; - [self.userStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(32); - make.leading.mas_equalTo(self.contentView).offset(22); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(20); - }]; - - [self.selectPKLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(90); - }]; - - [self.selectPKButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(22); - }]; - - [self.selectRoomContentView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth - 85 - 12 * 2 - 16); - }]; - - [self.timeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(32); - make.leading.trailing.mas_equalTo(self.contentView).inset(22); - make.top.mas_equalTo(self.userStackView.mas_bottom).offset(30); - }]; - - [self.selectPKTimeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.selectPKLabel); - }]; - - [self.customTimeTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(32); - make.width.mas_equalTo(170); - make.top.mas_equalTo(self.timeStackView.mas_bottom).offset(16); - make.leading.mas_equalTo(self.tenMinuteButton); - }]; - - [self.playStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.height.mas_equalTo(self.timeStackView); - make.top.mas_equalTo(self.customTimeTextField.mas_bottom).offset(30); - }]; - - [self.pkPlayModeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.selectPKLabel); - }]; - - [self.doneButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(40); - make.leading.trailing.mas_equalTo(self.contentView).inset(40); - make.bottom.mas_equalTo(self.contentView.mas_bottom).offset(-34 - kSafeAreaBottomHeight); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.selectRoomContentView); - make.leading.mas_equalTo(self.selectRoomContentView); - make.height.width.mas_equalTo(60); - }]; - [self.roomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-3); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(6); - make.trailing.mas_lessThanOrEqualTo(self.cancelButon.mas_leading); - }]; - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_centerY).mas_offset(3); - make.leading.trailing.mas_equalTo(self.roomTitleLabel); - }]; - - [self.cancelButon mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avatarImageView); - make.trailing.mas_equalTo(self.selectRoomContentView).offset(-12); - make.height.width.mas_equalTo(22); - }]; -} - -- (void)updateDoneButtonState { - if (self.selectRoomInfo && self.pkDuration >= 5 && self.pkDuration <= 30) { - self.doneButton.enabled = YES; - } else { - self.doneButton.enabled = NO; - } -} -#pragma mark - XPAnchorPKProtocol -///开启pk成功 -- (void)beginAnchorPKSuccess { - [self showSuccessToast:YMLocalizedString(@"XPAnchorPKViewController0")]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -///开启Pk失败 -- (void)beginAnchorPKFail:(NSString *)message { - if (message.length >0) { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.actionStyle = TTAlertActionConfirmStyle; - config.cancelButtonConfig.title = YMLocalizedString(@"XPAnchorPKViewController1"); - config.message = message; - [TTPopup alertWithConfig:config confirmHandler:^{ - - } cancelHandler:^{ - - }]; - } -} - -#pragma mark - XPAnchorPKSelectRoomViewDelegate -///选择要PK的对象按钮点击 -- (void)XPAnchorPKSelectRoomView:(XPAnchorPKSelectRoomView *)view didChoosePKRoom:(AcrossRoomPKInfoModel *)pkRoomInfo { - if (pkRoomInfo) { - [self.userStackView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(60); - }]; - self.selectRoomContentView.hidden = NO; - self.selectPKButton.hidden= YES; - self.avatarImageView.imageUrl = pkRoomInfo.avatar; - self.roomTitleLabel.text = pkRoomInfo.title; - self.idLabel.text = [NSString stringWithFormat:@"ID：%@", pkRoomInfo.erbanNo]; - self.selectRoomInfo = pkRoomInfo; - [self updateDoneButtonState]; - } -} - -#pragma mark - UITextFieldDelegate -- (void)textFieldDidChanged:(UITextField *)textField { - if (textField == self.customTimeTextField) { - self.tenMinuteButton.selected = YES; - self.twentyMinuteButton.selected = YES; - self.thirtyMinuteButton.selected = YES; - NSString *countStr = [self.customTimeTextField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; - NSInteger count = [countStr integerValue]; - if (count > 30) { - [self showErrorToast:YMLocalizedString(@"XPAnchorPKViewController2")]; - textField.text = @"30"; - } - else if(count < 5) { - [self showErrorToast:YMLocalizedString(@"XPAnchorPKViewController3")]; - } - self.pkDuration = textField.text.integerValue; - [self updateDoneButtonState]; - } else if(textField == self.pkPlayModeTextField) { - if (self.pkPlayModeTextField.text.length > 10) { - self.pkPlayModeTextField.text = [self.pkPlayModeTextField.text substringToIndex:10]; - } - } -} - -- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { - if (textField == self.customTimeTextField) { - NSString *regex =@"[0-9]*"; - NSPredicate *pred = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",regex]; - if ([pred evaluateWithObject:string]) { - return YES; - } - return NO; - } - return YES; -} - -#pragma mark - Event Response -- (void)selectPKButtonAction:(UIButton *)sender { - [self.customTimeTextField resignFirstResponder]; - [self.pkPlayModeTextField resignFirstResponder]; - self.selectView.roomUid = self.roomUid; - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromRight; - [self.selectView.layer addAnimation:transition forKey:nil]; - [self.contentView addSubview:self.selectView]; -} - -- (void)chooseTimeButtonAction:(UIButton *)sender { - [self.customTimeTextField resignFirstResponder]; - [self.pkPlayModeTextField resignFirstResponder]; - self.tenMinuteButton.selected = YES; - self.twentyMinuteButton.selected = YES; - self.thirtyMinuteButton.selected = YES; - sender.selected = NO; - self.pkDuration = sender.tag; - self.customTimeTextField.text = nil; -} - -- (void)doneButtonAction:(UIButton *)sender { - [self.customTimeTextField resignFirstResponder]; - [self.pkPlayModeTextField resignFirstResponder]; - NSString * pkDes = self.pkPlayModeTextField.text.length > 0 ? self.pkPlayModeTextField.text : @""; - [self.presenter beginAnchorPK:self.roomUid duration:self.pkDuration acceptUid:self.selectRoomInfo.uid playDesc:pkDes pkType:@"2"]; -} - -- (void)cancelButtonAction:(UIButton *)sender { - self.selectRoomContentView.hidden = YES; - self.selectPKButton.hidden = NO; - self.selectRoomInfo = nil; - [self updateDoneButtonState]; - self.avatarImageView.image = nil; - self.roomTitleLabel.text = nil; - self.idLabel.text = nil; - [self.userStackView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(32); - }]; -} - -- (void)onKeyBoardResign:(UITapGestureRecognizer *)ges { - [self.customTimeTextField resignFirstResponder]; - [self.pkPlayModeTextField resignFirstResponder]; - if (self.selectView.superview) { - CATransition *transition = [CATransition animation]; - transition.duration = 0.3f; - transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - transition.type = kCATransitionPush; - transition.subtype = kCATransitionFromLeft; - [self.selectView.layer addAnimation:transition forKey:nil]; - [self.selectView removeFromSuperview]; - } else { - [self dismissViewControllerAnimated:YES completion:nil]; - } -} - -#pragma mark - Getters And Setters -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = UIColor.whiteColor; - _titleLabel.font = [UIFont boldSystemFontOfSize:18]; - _titleLabel.text = YMLocalizedString(@"XPAnchorPKViewController4"); - } - return _titleLabel; -} - -- (UIStackView *)userStackView { - if (!_userStackView) { - _userStackView = [[UIStackView alloc] init]; - _userStackView.axis = UILayoutConstraintAxisHorizontal; - _userStackView.distribution = UIStackViewDistributionFill; - _userStackView.alignment = UIStackViewAlignmentFill; - _userStackView.spacing = 16; - } - return _userStackView; -} -- (UILabel *)selectPKLabel { - if (!_selectPKLabel) { - _selectPKLabel = [[UILabel alloc] init]; - _selectPKLabel.textColor = [UIColor whiteColor]; - _selectPKLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _selectPKLabel.text = YMLocalizedString(@"XPAnchorPKViewController5"); - [_selectPKLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _selectPKLabel; -} -- (UIButton *)selectPKButton { - if (!_selectPKButton) { - _selectPKButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_selectPKButton setImage:[UIImage imageNamed:@"room_across_pk_add_room"] forState:UIControlStateNormal]; - [_selectPKButton addTarget:self action:@selector(selectPKButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _selectPKButton; -} - -- (UIStackView *)timeStackView { - if (!_timeStackView) { - _timeStackView = [[UIStackView alloc] init]; - _timeStackView.axis = UILayoutConstraintAxisHorizontal; - _timeStackView.distribution = UIStackViewDistributionFill; - _timeStackView.alignment = UIStackViewAlignmentFill; - _timeStackView.spacing = 16; - } - return _timeStackView; -} -- (UILabel *)selectPKTimeLabel { - if (!_selectPKTimeLabel) { - _selectPKTimeLabel = [[UILabel alloc] init]; - _selectPKTimeLabel.textColor =[UIColor whiteColor]; - _selectPKTimeLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _selectPKTimeLabel.text = YMLocalizedString(@"XPAnchorPKViewController6"); - } - return _selectPKTimeLabel; -} - -- (UIStackView *)chooseTimeStackView { - if (!_chooseTimeStackView) { - _chooseTimeStackView = [[UIStackView alloc] init]; - _chooseTimeStackView.axis = UILayoutConstraintAxisHorizontal; - _chooseTimeStackView.distribution = UIStackViewDistributionFillEqually; - _chooseTimeStackView.alignment = UIStackViewAlignmentFill; - _chooseTimeStackView.spacing = 5; - } - return _chooseTimeStackView; -} - -- (UIButton *)tenMinuteButton { - if (!_tenMinuteButton) { - _tenMinuteButton = [[UIButton alloc] init]; - [_tenMinuteButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x1CD7FD), UIColorFromRGB(0x9377FF), UIColorFromRGB(0xFF6BA3)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_tenMinuteButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0x4C4C6A)] forState:UIControlStateSelected]; - [_tenMinuteButton setTitle:YMLocalizedString(@"XPAnchorPKViewController7") forState:UIControlStateNormal]; - _tenMinuteButton.titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - [_tenMinuteButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_tenMinuteButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateSelected]; - _tenMinuteButton.tag = 10; - [_tenMinuteButton addTarget:self action:@selector(chooseTimeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _tenMinuteButton.selected = NO; - _tenMinuteButton.layer.masksToBounds = YES; - _tenMinuteButton.layer.cornerRadius = 32 / 2; - } - return _tenMinuteButton; -} - -- (UIButton *)twentyMinuteButton { - if (!_twentyMinuteButton) { - _twentyMinuteButton = [[UIButton alloc] init]; - [_twentyMinuteButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x1CD7FD), UIColorFromRGB(0x9377FF), UIColorFromRGB(0xFF6BA3)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_twentyMinuteButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0x4C4C6A)] forState:UIControlStateSelected]; - [_twentyMinuteButton setTitle:YMLocalizedString(@"XPAnchorPKViewController8") forState:UIControlStateNormal]; - _twentyMinuteButton.titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - [_twentyMinuteButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_twentyMinuteButton setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - _twentyMinuteButton.tag = 20; - [_twentyMinuteButton addTarget:self action:@selector(chooseTimeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _twentyMinuteButton.selected = YES; - _twentyMinuteButton.layer.masksToBounds = YES; - _twentyMinuteButton.layer.cornerRadius = 32 / 2; - } - return _twentyMinuteButton; -} - -- (UIButton *)thirtyMinuteButton { - if (!_thirtyMinuteButton) { - _thirtyMinuteButton = [[UIButton alloc] init]; - [_thirtyMinuteButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x1CD7FD), UIColorFromRGB(0x9377FF), UIColorFromRGB(0xFF6BA3)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_thirtyMinuteButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0x4C4C6A)] forState:UIControlStateSelected]; - [_thirtyMinuteButton setTitle:YMLocalizedString(@"XPAnchorPKViewController9") forState:UIControlStateNormal]; - _thirtyMinuteButton.titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - [_thirtyMinuteButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_thirtyMinuteButton setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - _thirtyMinuteButton.tag = 30; - _thirtyMinuteButton.layer.masksToBounds = YES; - _thirtyMinuteButton.layer.cornerRadius = 32 / 2; - [_thirtyMinuteButton addTarget:self action:@selector(chooseTimeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _thirtyMinuteButton.selected = YES; - } - return _thirtyMinuteButton; -} -- (MSBaseTextField*)customTimeTextField { - if (!_customTimeTextField) { - _customTimeTextField = [[MSBaseTextField alloc] init]; - _customTimeTextField.layer.cornerRadius = 15; - _customTimeTextField.layer.masksToBounds = YES; - _customTimeTextField.backgroundColor = UIColorFromRGB(0x4C4C6A); - _customTimeTextField.textColor = UIColorFromRGB(0x43BDFF); - _customTimeTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 19, 0)]; - _customTimeTextField.leftViewMode = UITextFieldViewModeAlways; - _customTimeTextField.delegate = self; - _customTimeTextField.keyboardType = UIKeyboardTypeNumberPad; - _customTimeTextField.tintColor = [UIColor whiteColor]; - _customTimeTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPAnchorPKViewController10") attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName: UIColorFromRGB(0xC6C6E9)}]; - [_customTimeTextField addTarget:self action:@selector(textFieldDidChanged:) forControlEvents:UIControlEventEditingChanged]; - - } - return _customTimeTextField; -} -- (UIStackView *)playStackView { - if (!_playStackView) { - _playStackView = [[UIStackView alloc] init]; - _playStackView.axis = UILayoutConstraintAxisHorizontal; - _playStackView.distribution = UIStackViewDistributionFill; - _playStackView.alignment = UIStackViewAlignmentFill; - _playStackView.spacing = 16; - } - return _playStackView; -} - -- (UILabel *)pkPlayModeLabel { - if (!_pkPlayModeLabel) { - _pkPlayModeLabel = [[UILabel alloc] init]; - _pkPlayModeLabel.textColor = [UIColor whiteColor]; - _pkPlayModeLabel.textAlignment = NSTextAlignmentRight; - _pkPlayModeLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _pkPlayModeLabel.text = YMLocalizedString(@"XPAnchorPKViewController11"); - } - return _pkPlayModeLabel; -} - -- (MSBaseTextField *)pkPlayModeTextField { - if (!_pkPlayModeTextField) { - _pkPlayModeTextField = [[MSBaseTextField alloc] init]; - _pkPlayModeTextField.layer.cornerRadius = 15; - _pkPlayModeTextField.layer.masksToBounds = YES; - _pkPlayModeTextField.backgroundColor = UIColorFromRGB(0x4C4C6A); - _pkPlayModeTextField.textColor = [UIColor whiteColor]; - _pkPlayModeTextField.leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 19, 0)]; - _pkPlayModeTextField.leftViewMode = UITextFieldViewModeAlways; - _pkPlayModeTextField.delegate = self; - _pkPlayModeTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPAnchorPKViewController12") attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName: UIColorFromRGB(0xC6C6E9)}]; - [_pkPlayModeTextField addTarget:self action:@selector(textFieldDidChanged:) forControlEvents:UIControlEventEditingChanged]; - } - return _pkPlayModeTextField; -} - -- (UIButton *)doneButton { - if (!_doneButton) { - _doneButton = [[UIButton alloc] init]; - [_doneButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x1CD7FD), UIColorFromRGB(0x9377FF), UIColorFromRGB(0xFF6BA3)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_doneButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0x4C4C6A)] forState:UIControlStateDisabled]; - [_doneButton setTitle:YMLocalizedString(@"XPAnchorPKViewController13") forState:UIControlStateNormal]; - _doneButton.layer.masksToBounds = YES; - _doneButton.layer.cornerRadius = 20; - _doneButton.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - [_doneButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_doneButton setTitleColor:[UIColor whiteColor] forState:UIControlStateDisabled]; - [_doneButton addTarget:self action:@selector(doneButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _doneButton.enabled = NO; - } - return _doneButton; -} - -- (UIView *)selectRoomContentView { - if (!_selectRoomContentView) { - _selectRoomContentView = [[UIView alloc] init]; - _selectRoomContentView.hidden = YES; - } - return _selectRoomContentView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 60 / 2; - _avatarImageView.layer.borderColor = [UIColor whiteColor].CGColor; - _avatarImageView.layer.borderWidth = 1; - } - return _avatarImageView; -} - -- (UILabel *)roomTitleLabel { - if (!_roomTitleLabel) { - _roomTitleLabel = [[UILabel alloc] init]; - _roomTitleLabel.textColor = [UIColor whiteColor]; - _roomTitleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - } - return _roomTitleLabel; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.textColor = [UIColor whiteColor]; - _idLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - } - return _idLabel; -} - -- (UIButton *)cancelButon { - if (!_cancelButon) { - _cancelButon = [UIButton buttonWithType:UIButtonTypeCustom]; - [_cancelButon setImage:[UIImage imageNamed:@"room_across_delete_pk_room"] forState:UIControlStateNormal]; - [_cancelButon addTarget:self action:@selector(cancelButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _cancelButon; -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = UIColorFromRGB(0x2A2A39); - CAShapeLayer * layer = [CAShapeLayer layer]; - layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth,kContentHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)].CGPath; - _contentView.layer.mask = layer; - } - return _contentView; -} - -- (UIView *)topView { - if (!_topView) { - _topView = [[UIView alloc] init]; - _topView.backgroundColor = UIColor.blackColor; - _topView.alpha = 0.3; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onKeyBoardResign:)]; - [_topView addGestureRecognizer:tap]; - } - return _topView; -} - -- (XPAnchorPKSelectRoomView *)selectView { - if (!_selectView) { - _selectView = [[XPAnchorPKSelectRoomView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, kContentHeight)]; - _selectView.delegate = self; - } - return _selectView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Api/Api+FansTeam.h b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Api/Api+FansTeam.h deleted file mode 100644 index 7b91562..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Api/Api+FansTeam.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// Api+FansTeam.h -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (FansTeam) - -/// 请求退出粉丝团 -/// @param completion 完成 -/// @param teamUid 房间uid -+ (void)requestOutFansTeam:(HttpRequestHelperCompletion)completion teamUid:(NSString *)teamUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Api/Api+FansTeam.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Api/Api+FansTeam.m deleted file mode 100644 index 4fa0f5f..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Api/Api+FansTeam.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// Api+FansTeam.m -// YUMI -// -// Created by YUMI on 2022/4/8. -// - -#import "Api+FansTeam.h" -#import -@implementation Api (FansTeam) - -/// 请求退出粉丝团 -/// @param completion 完成 -/// @param teamUid 房间uid -+ (void)requestOutFansTeam:(HttpRequestHelperCompletion)completion teamUid:(NSString *)teamUid { - NSString * fang = [NSString stringFromBase64String:@"YW5jaG9yRmFuc1RlYW0vb3V0QW5jaG9yRmFuc1RlYW0="];///anchorFansTeam/outAnchorFansTeam - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, teamUid, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansJoinModel.h b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansJoinModel.h deleted file mode 100644 index 2a6eafc..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansJoinModel.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// YMAnchorFansJoinModel.h -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import -#import "XPAnchorFansPrivilegeModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorFansJoinModel : PIBaseModel - -///粉丝团id -@property (nonatomic, assign) long long teamId; -///主播uid -@property (nonatomic, assign) long long teamUid; -///主播头像 -@property (nonatomic, copy) NSString *anchorAvatar; -///主播名称 -@property (nonatomic, copy) NSString *anchorNick; -///粉丝团总人数 -@property (nonatomic, assign) NSInteger teamNum; -///榜单前三用户头像 -@property (nonatomic, strong) NSArray *avatarList; -///是否在退出粉丝团重新加入的24小时限制 -@property (nonatomic, assign) BOOL isJoinLimit; -///粉丝特权 -@property (nonatomic, strong) NSArray *privilegeConfigVos; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansJoinModel.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansJoinModel.m deleted file mode 100644 index 5a01e8a..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansJoinModel.m +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMAnchorFansJoinModel.m -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import "XPAnchorFansJoinModel.h" - -@implementation XPAnchorFansJoinModel - -+ (NSDictionary *)objectClassInArray { - return @{ - @"privilegeConfigVos":XPAnchorFansPrivilegeModel.class - }; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansPrivilegeModel.h b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansPrivilegeModel.h deleted file mode 100644 index e195432..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansPrivilegeModel.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// YMAnchorFansJoinModel.h -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, AnchorFansTeamPrivilegeType) { - AnchorFansTeamPrivilegeTypeNameplate = 1, ///铭牌 - AnchorFansTeamPrivilegeTypeGift = 2, - AnchorFansTeamPrivilegeTypeTeamGift, -}; - -@interface XPAnchorFansPrivilegeModel : PIBaseModel - -///粉丝团id -@property (nonatomic, assign) NSInteger privilegeId; -///特权名称 -@property (nonatomic, copy) NSString *name; -///特权对应的铭牌/礼物id -@property (nonatomic, assign) NSInteger normalId; -///特权描述 -@property (nonatomic, copy) NSString *desc; -//特权类型 1铭牌 2专属礼物 3入团礼物 -@property (nonatomic, assign) AnchorFansTeamPrivilegeType type; -///图标 -@property (nonatomic, copy) NSString *icon; -///状态 日效1有效 -@property (nonatomic, assign) NSInteger status; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansPrivilegeModel.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansPrivilegeModel.m deleted file mode 100644 index 878e5b8..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansPrivilegeModel.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMAnchorFansJoinModel.m -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import "XPAnchorFansPrivilegeModel.h" - -@implementation XPAnchorFansPrivilegeModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"desc": @"description" - }; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansRelationModel.h b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansRelationModel.h deleted file mode 100644 index cf61718..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansRelationModel.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMAnchorFansRelationModel.h -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorFansRelationModel : PIBaseModel - -///当前房间是否开通粉丝团 -@property (nonatomic, assign) BOOL hasFansTeamCurrentRoom; -///是否为粉丝团成员 -@property (nonatomic, assign) BOOL isAnchorFans; -///是否为当前房间的主播 -@property (nonatomic, assign) BOOL isCurrentRoomAnchor; -///菜单栏入口是否展示红点提示 -@property (nonatomic, assign) BOOL isRedPop; -///粉丝团成员总数 -@property (nonatomic, assign) NSInteger anchorFansNum; -///粉丝等级 -@property (nonatomic, assign) NSInteger fansLevelSeq; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansRelationModel.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansRelationModel.m deleted file mode 100644 index d23579e..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansRelationModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMAnchorFansRelationModel.m -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import "XPAnchorFansRelationModel.h" - -@implementation XPAnchorFansRelationModel - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskDetailModel.h b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskDetailModel.h deleted file mode 100644 index 1e7baaf..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskDetailModel.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMAnchorFansTaskDetailModel.h -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorFansTaskDetailModel : PIBaseModel - -@property (nonatomic, assign) NSInteger taskId; -@property (nonatomic, copy) NSString *taskCode; -@property (nonatomic, copy) NSString *taskName; -@property (nonatomic, copy) NSString *icon; -@property (nonatomic, copy) NSString *taskDesc; -@property (nonatomic, assign) NSInteger awardVal; -@property (nonatomic, assign) NSInteger totalNum; -@property (nonatomic, assign) BOOL isFinished; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskDetailModel.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskDetailModel.m deleted file mode 100644 index 5ddab9f..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskDetailModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMAnchorFansTaskDetailModel.m -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import "XPAnchorFansTaskDetailModel.h" - -@implementation XPAnchorFansTaskDetailModel - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskModel.h b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskModel.h deleted file mode 100644 index 9c5a25d..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskModel.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMAnchorFansTaskModel.h -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import -#import "XPAnchorFansTaskDetailModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorFansTaskModel : PIBaseModel - -@property (nonatomic, copy) NSString *teamUid; -@property (nonatomic, copy) NSString *anchorAvatar; -@property (nonatomic, copy) NSString *anchorNick; -@property (nonatomic, assign) NSInteger teamNum; -@property (nonatomic, assign) NSInteger memberUid; -@property (nonatomic, copy) NSString *memberAvatar; -@property (nonatomic, strong) NSArray *avatarList; -@property (nonatomic, strong) NSArray *taskVos; -@property (nonatomic, assign) NSInteger levelSeq; -@property (nonatomic, assign) NSInteger levelExper; -@property (nonatomic, assign) NSInteger nextLevelExper; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskModel.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskModel.m deleted file mode 100644 index 5e361e6..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Model/XPAnchorFansTaskModel.m +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMAnchorFansTaskModel.m -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import "XPAnchorFansTaskModel.h" - -@implementation XPAnchorFansTaskModel - -+ (NSDictionary *)objectClassInArray { - return @{ - @"taskVos":XPAnchorFansTaskDetailModel.class - }; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Presenter/XPAnchorFansTeamPresenter.h b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Presenter/XPAnchorFansTeamPresenter.h deleted file mode 100644 index 7425df3..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Presenter/XPAnchorFansTeamPresenter.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMAnchorFansTeamPresenter.h -// YUMI -// -// Created by YUMI on 2022/4/6. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorFansTeamPresenter : BaseMvpPresenter - -/// 退出粉丝团 -/// @param teamUid 用户uid -- (void)outAnchorFansTeam:(NSString *)teamUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Presenter/XPAnchorFansTeamPresenter.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Presenter/XPAnchorFansTeamPresenter.m deleted file mode 100644 index e138c32..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Presenter/XPAnchorFansTeamPresenter.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMAnchorFansTeamPresenter.m -// YUMI -// -// Created by YUMI on 2022/4/6. -// - -#import "XPAnchorFansTeamPresenter.h" -#import "Api+FansTeam.h" -#import "XPAnchorFansTeamProtocol.h" - -@implementation XPAnchorFansTeamPresenter - -/// 退出粉丝团 -/// @param teamUid 用户uid -- (void)outAnchorFansTeam:(NSString *)teamUid { - [Api requestOutFansTeam:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] outFansTeamSuccess]; - }] teamUid:teamUid]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Protocol/XPAnchorFansTeamProtocol.h b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Protocol/XPAnchorFansTeamProtocol.h deleted file mode 100644 index 0bd2963..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/Protocol/XPAnchorFansTeamProtocol.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// YMAnchorFansTeamProtocol.h -// YUMI -// -// Created by YUMI on 2022/4/6. -// - -@protocol XPAnchorFansTeamProtocol - -///退出粉丝团成功 -- (void)outFansTeamSuccess; - -@end - diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskTableViewCell.h b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskTableViewCell.h deleted file mode 100644 index a11c629..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskTableViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMAnchorFansTaskTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import -#import "XPAnchorFansTaskDetailModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorFansTaskTableViewCell : UITableViewCell - -@property (nonatomic, strong) XPAnchorFansTaskDetailModel *model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskTableViewCell.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskTableViewCell.m deleted file mode 100644 index edabd6a..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskTableViewCell.m +++ /dev/null @@ -1,156 +0,0 @@ -// -// YMAnchorFansTaskTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import "XPAnchorFansTaskTableViewCell.h" -///Third -#import -#import -///Model -#import "HomeBannerInfoModel.h" -#import "NetImageView.h" -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPAnchorFansTaskTableViewCell () - -///专属铭牌背景 -@property (nonatomic, strong) UIView *nameplateBgView; -///专属铭牌图片 -@property (nonatomic, strong) NetImageView *nameplateImageView; -///专属铭牌名称 -@property (nonatomic, strong) UILabel *nameplateLabel; -///专属铭牌描述 -@property (nonatomic, strong) UILabel *nameplateDescLabel; -///进度按钮 -@property (nonatomic, strong) UIButton *doneButton; - -@end - -@implementation XPAnchorFansTaskTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.nameplateBgView]; - [self.nameplateBgView addSubview:self.nameplateImageView]; - [self.nameplateBgView addSubview:self.nameplateLabel]; - [self.nameplateBgView addSubview:self.nameplateDescLabel]; - [self.nameplateBgView addSubview:self.doneButton]; -} - -- (void)initSubViewConstraints { - [self.nameplateBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView).offset(-8); - make.leading.trailing.mas_equalTo(0); - }]; - - [self.nameplateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(10); - make.centerY.mas_equalTo(self.nameplateBgView); - make.width.height.mas_equalTo(38); - }]; - - [self.nameplateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameplateImageView.mas_trailing).mas_offset(8); - make.top.mas_equalTo(self.nameplateImageView).mas_offset(1); - make.height.mas_equalTo(21); - }]; - [self.nameplateDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nameplateLabel.mas_bottom); - make.leading.mas_equalTo(self.nameplateLabel); - make.height.mas_equalTo(15); - }]; - [self.doneButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.nameplateBgView); - make.height.mas_equalTo(20); - make.trailing.mas_equalTo(-10); - make.width.mas_equalTo(48); - }]; -} - -- (void)setModel:(XPAnchorFansTaskDetailModel *)model { - self.nameplateImageView.imageUrl = model.icon; - self.nameplateLabel.text = model.taskName; - self.nameplateDescLabel.text = model.taskDesc; - if (model.isFinished) { - [self.doneButton setTitle:YMLocalizedString(@"XPAnchorFansTaskTableViewCell0") forState:UIControlStateNormal]; - [self.doneButton setBackgroundColor:[DJDKMIMOMColor appBackgroundColor]]; - [self.doneButton setTitleColor:[DJDKMIMOMColor textThirdColor] forState:UIControlStateNormal]; - } else if(model.awardVal > 0){ - [self.doneButton setTitle:[NSString stringWithFormat:@"%ld/%ld", model.awardVal, model.totalNum] forState:UIControlStateNormal]; - [self.doneButton setBackgroundColor:UIColorFromRGB(0xFF4E7F)]; - [self.doneButton setTitleColor:[DJDKMIMOMColor appCellBackgroundColor] forState:UIControlStateNormal]; - } else { - [self.doneButton setTitle:[NSString stringWithFormat:@"%ld/%ld", model.awardVal, model.totalNum] forState:UIControlStateNormal]; - [self.doneButton setBackgroundColor:[DJDKMIMOMColor appBackgroundColor]]; - [self.doneButton setTitleColor:[DJDKMIMOMColor textThirdColor] forState:UIControlStateNormal]; - } -} - -- (UIView *)nameplateBgView { - if (!_nameplateBgView) { - _nameplateBgView = [[UIView alloc] init]; - _nameplateBgView.backgroundColor = [UIColor whiteColor]; - _nameplateBgView.layer.cornerRadius = 8; - _nameplateBgView.layer.masksToBounds = YES; - } - return _nameplateBgView; -} - -- (NetImageView *)nameplateImageView { - if (!_nameplateImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _nameplateImageView = [[NetImageView alloc] initWithConfig:config]; - _nameplateImageView.layer.masksToBounds = YES; - _nameplateImageView.layer.cornerRadius = 8; - } - return _nameplateImageView; -} - -- (UILabel *)nameplateLabel; { - if (!_nameplateLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - label.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - _nameplateLabel = label; - } - return _nameplateLabel; -} - -- (UILabel *)nameplateDescLabel; { - if (!_nameplateDescLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textColor = [DJDKMIMOMColor textThirdColor]; - label.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _nameplateDescLabel = label; - } - return _nameplateDescLabel; -} - -- (UIButton *)doneButton { - if (!_doneButton) { - _doneButton = [[UIButton alloc] init]; - _doneButton.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _doneButton.layer.cornerRadius = 4; - _doneButton.layer.masksToBounds = YES; - } - return _doneButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.h b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.h deleted file mode 100644 index 16b5c39..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMAnchorFansTaskViewController.h -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import "MvpViewController.h" -#import "XPAnchorFansTaskModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorFansTaskViewController : MvpViewController - -- (instancetype)initWithRoomUid:(NSString *)roomUid; - -@property (nonatomic, strong) XPAnchorFansTaskModel *model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.m deleted file mode 100644 index 17ee4e8..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.m +++ /dev/null @@ -1,598 +0,0 @@ -// -// YMAnchorFansTaskViewController.m -// YUMI -// -// Created by YUMI on 2022/4/7. -// - -#import "XPAnchorFansTaskViewController.h" -///P -#import "XPAnchorFansTeamPresenter.h" -#import "XPAnchorFansTeamProtocol.h" -///Third -#import "NetImageView.h" -#import -///Tool -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" -#import "YUMIHtmlUrl.h" -#import "UIButton+EnlargeTouchArea.h" -#import "NSArray+Safe.h" -///View -#import "XPAnchorFansTaskTableViewCell.h" -#import "XPRoomHalfWebView.h" - -@interface XPAnchorFansTaskViewController() - -///房间Uid -@property (nonatomic, strong) NSString *roomUid; -///顶部点击消失的view -@property (nonatomic, strong) UIView *topView; -///显示内容的view -@property (nonatomic, strong) UIView *contentView; -///背景图片 -@property (nonatomic, strong) UIImageView *bgImageView; -///帮助按钮 -@property (nonatomic, strong) UIButton *helpButton; -///头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -///粉丝团名称 -@property (nonatomic, strong) UILabel *nameLabel; -///人数背景 -@property (nonatomic, strong) UIView *countContentView; -///粉丝团人 -@property (nonatomic, strong) UILabel *countLabel; - -@property (nonatomic, strong) UIView *stackView; -///排行榜 -@property (nonatomic, strong) UIImageView *rankImageView; -///粉丝专属特权 -@property (nonatomic, strong) UIImageView *privilegeTitleImageView; - -@property (nonatomic, strong) UITableView *tableView; - -@property (nonatomic, strong) UIView *bottomView; -@property (nonatomic, strong) NetImageView *myAvatarImageView; -///亲密值 -@property (nonatomic, strong) UILabel *intimateLabel; -///进度条背景 -@property (nonatomic, strong) UIView *progressBgView; -///进度条 -@property (nonatomic, strong) UIImageView *progressView; -///进度值 -@property (nonatomic, strong) UILabel *progressLabel; -///说明弹窗背景 -@property (nonatomic, strong) UIImageView *explainBgImageView; -///查看粉丝团说明 -@property (nonatomic, strong) UIButton *explainButton; -///分割线 -@property (nonatomic, strong) UIView *devideView; -///退出粉丝团 -@property (nonatomic, strong) UIButton *exitButton; - -@end - -@implementation XPAnchorFansTaskViewController - -- (instancetype)initWithRoomUid:(NSString *)roomUid { - if (self = [super init]) { - self.roomUid = roomUid; - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - } - return self; -} - -- (XPAnchorFansTeamPresenter *)createPresenter { - return [[XPAnchorFansTeamPresenter alloc] init];; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self setupInfo]; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.topView]; - [self.view addSubview:self.contentView]; - - [self.contentView addSubview:self.bgImageView]; - [self.contentView addSubview:self.helpButton]; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nameLabel]; - [self.contentView addSubview:self.countContentView]; - [self.countContentView addSubview:self.countLabel]; - [self.contentView addSubview:self.stackView]; - [self.stackView addSubview:self.rankImageView]; - [self.contentView addSubview:self.privilegeTitleImageView]; - [self.contentView addSubview:self.tableView]; - - [self.contentView addSubview:self.bottomView]; - [self.bottomView addSubview:self.myAvatarImageView]; - [self.bottomView addSubview:self.intimateLabel]; - [self.bottomView addSubview:self.progressBgView]; - [self.progressBgView addSubview:self.progressView]; - [self.progressBgView addSubview:self.progressLabel]; - - [self.contentView addSubview:self.explainBgImageView]; - [self.explainBgImageView addSubview:self.explainButton]; - [self.explainBgImageView addSubview:self.devideView]; - [self.explainBgImageView addSubview:self.exitButton]; -} - -- (void)initSubViewConstraints { - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.contentView.mas_top); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.height.mas_equalTo(454); - }]; - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make){ - make.top.trailing.leading.bottom.mas_equalTo(0); - }]; - - [self.helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-10); - make.top.mas_equalTo(10); - make.width.height.mas_equalTo(30); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.width.height.mas_equalTo(64); - make.top.mas_equalTo(36); - }]; - - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(21); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(8); - make.top.mas_equalTo(self.avatarImageView).offset(6); - make.trailing.mas_equalTo(self.countContentView.mas_leading).mas_offset(-4); - }]; - - [self.countContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.nameLabel); - make.trailing.mas_lessThanOrEqualTo(-26); - make.height.mas_equalTo(15); - make.leading.mas_equalTo(self.nameLabel.mas_trailing).mas_offset(4); - }]; - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(self.countContentView); - make.leading.mas_equalTo(self.countContentView).mas_offset(5); - make.trailing.mas_equalTo(self.countContentView).mas_offset(-5); - }]; - - [self.countLabel setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; - [self.nameLabel setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; - - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(8); - make.bottom.mas_equalTo(self.avatarImageView).mas_offset(-3); - make.height.mas_equalTo(28); - make.width.mas_equalTo(3 * (20 + 8) + 34); - }]; - - [self.rankImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.stackView); - make.leading.mas_equalTo(9); - make.width.mas_equalTo(16); - make.height.mas_equalTo(18); - }]; - - [self.privilegeTitleImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).mas_offset(21); - make.centerX.mas_equalTo(self.contentView); - make.width.mas_equalTo(88); - make.height.mas_equalTo(34); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(25); - make.top.mas_equalTo(self.privilegeTitleImageView.mas_bottom).offset(12); - make.height.mas_equalTo(200); - }]; - - [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(0); - make.height.mas_equalTo(88); - }]; - [self.myAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(24); - make.top.mas_equalTo(10); - make.width.height.mas_equalTo(40); - }]; - - [self.intimateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.myAvatarImageView.mas_trailing).mas_offset(8); - make.top.mas_equalTo(self.myAvatarImageView).mas_offset(4); - make.height.mas_equalTo(15); - }]; - - [self.progressBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.intimateLabel); - make.trailing.mas_equalTo(-24); - make.height.mas_equalTo(16); - make.top.mas_equalTo(self.intimateLabel.mas_bottom).mas_offset(2); - }]; - - [self.progressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.bottom.mas_equalTo(self.progressBgView); - make.width.mas_equalTo(0); - }]; - [self.progressLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self.progressBgView); - }]; - - [self.explainBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-13); - make.top.mas_equalTo(29); - make.width.mas_equalTo(111); - make.height.mas_equalTo(98); - }]; - [self.explainButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(43); - make.top.mas_equalTo(12); - }]; - - [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(7); - make.trailing.mas_equalTo(-12); - make.height.mas_equalTo(1); - make.top.mas_equalTo(self.explainButton.mas_bottom); - }]; - [self.exitButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(43); - make.top.mas_equalTo(self.devideView.mas_bottom); - }]; -} - -#pragma mark - tableviewDelegate -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.model.taskVos.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPAnchorFansTaskTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPAnchorFansTaskTableViewCell class])]; - XPAnchorFansTaskDetailModel *model = [self.model.taskVos xpSafeObjectAtIndex:indexPath.row]; - cell.model = model; - - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 66; -} - -#pragma mark - private -- (void)onDismiss:(UITapGestureRecognizer *)ges { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)setModel:(XPAnchorFansTaskModel *)model { - _model = model; -} - -- (void)setupInfo { - if (self.model) { - self.avatarImageView.imageUrl = self.model.anchorAvatar; - self.nameLabel.text = self.model.anchorNick; - self.countLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorFansTaskViewController0"), self.model.teamNum]; - - CGFloat margin = 8; - for (int i = 0; i < 3; i++) { - NSString *str; - if (self.model.avatarList.count > i) { - str = self.model.avatarList[i]; - } - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder]; - NetImageView *imageView = [[NetImageView alloc] initWithConfig:config]; - if (str) { - imageView.imageUrl = str; - } - imageView.layer.cornerRadius = 10; - imageView.layer.masksToBounds = YES; - [self.stackView addSubview:imageView]; - [imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.stackView); - make.width.height.mas_equalTo(20); - make.leading.mas_equalTo(i * 27 + 25 + margin); - }]; - } - - float progress = self.model.levelExper * 1.0 / self.model.nextLevelExper; - [self.progressView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.progressBgView.mas_width).multipliedBy(progress); - make.top.leading.bottom.mas_equalTo(self.progressBgView); - }]; - - self.myAvatarImageView.imageUrl = self.model.memberAvatar; - self.intimateLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorFansTaskViewController1"), self.model.levelSeq]; - self.progressLabel.text = [NSString stringWithFormat:@"%ld/%ld", self.model.levelExper, self.model.nextLevelExper]; - - [self.tableView reloadData]; - } -} - -- (void)gotoFansRank:(UITapGestureRecognizer *)ges { - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.roomUid = self.roomUid; - webView.url = [NSString stringWithFormat:@"%@?roomUid=%@", URLWithType(kAnchorFansRankURL), self.roomUid]; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; -} - -- (void)moreButtonAction:(UIButton *)button { - self.explainBgImageView.hidden = NO; -} - -- (void)explainButtonAction:(UIButton *)button { - self.explainBgImageView.hidden = YES; - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = [NSString stringWithFormat:@"%@?roomUid=%@", URLWithType(kAnchorFansRuleURL), self.roomUid]; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; -} - -- (void)exitButtonAction:(UIButton *)button { - self.explainBgImageView.hidden = YES; - [TTPopup alertWithMessage:YMLocalizedString(@"XPAnchorFansTaskViewController2") confirmHandler:^{ - [self.presenter outAnchorFansTeam:self.roomUid]; - } cancelHandler:^{ - - }]; -} - -- (void)hideRuleView:(UITapGestureRecognizer *)ges { - self.explainBgImageView.hidden = YES; -} - -#pragma mark - XPAnchorFansTeamProtocol -- (void)outFansTeamSuccess { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - getter -- (UIView *)topView { - if (!_topView) { - _topView = [[UIView alloc] init]; - _topView.backgroundColor = UIColor.blackColor; - _topView.alpha = 0.3; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onDismiss:)]; - [_topView addGestureRecognizer:tap]; - } - return _topView; -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - CAShapeLayer * layer = [CAShapeLayer layer]; - layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth,454) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)].CGPath; - _contentView.layer.mask = layer; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(hideRuleView:)]; - [_contentView addGestureRecognizer:tap]; - } - return _contentView; -} - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage getLanguageImage:@"anchor_fansTeam_Task_bg"]; - _bgImageView.contentMode = UIViewContentModeScaleToFill; - } - return _bgImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 64 / 2; - } - return _avatarImageView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - label.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - _nameLabel = label; - [_nameLabel setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; - [_nameLabel setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; - } - return _nameLabel; -} - -- (UIView *)countContentView { - if (!_countContentView) { - _countContentView = [[UIView alloc] init]; - _countContentView.backgroundColor = [UIColor whiteColor]; - _countContentView.layer.cornerRadius = 7.5; - _countContentView.layer.masksToBounds = YES; - } - return _countContentView; -} - -- (UILabel *)countLabel { - if (!_countLabel) { - _countLabel = [[UILabel alloc] init]; - _countLabel.textColor = UIColorFromRGB(0xFE3478); - _countLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - } - return _countLabel; -} - -- (UIView *)stackView { - if (!_stackView) { - _stackView = [[UIView alloc] init]; - _stackView.backgroundColor = [UIColor whiteColor]; - _stackView.layer.cornerRadius = 14; - _stackView.layer.masksToBounds = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(gotoFansRank:)]; - [_stackView addGestureRecognizer:tap]; - } - return _stackView; -} - -- (UIImageView *)rankImageView { - if (!_rankImageView) { - _rankImageView = [[UIImageView alloc] init]; - _rankImageView.image = [UIImage imageNamed:@"anchor_fansTeam_rank"]; - } - return _rankImageView; -} - -- (UIImageView *)privilegeTitleImageView { - if (!_privilegeTitleImageView) { - _privilegeTitleImageView = [[UIImageView alloc] init]; - _privilegeTitleImageView.image = [UIImage getLanguageImage:@"anchor_fansTeam_task"]; - _privilegeTitleImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _privilegeTitleImageView; -} - -- (UIButton *)helpButton { - if (!_helpButton) { - _helpButton = [[UIButton alloc] init]; - [_helpButton addTarget:self action:@selector(moreButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_helpButton setImage:[UIImage imageNamed:@"anchor_fansTeam_more"] forState:UIControlStateNormal]; - [_helpButton setEnlargeEdgeWithTop:5 right:5 bottom:5 left:5]; - } - return _helpButton; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] init]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - [_tableView registerClass:[XPAnchorFansTaskTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPAnchorFansTaskTableViewCell class])]; - _tableView.scrollEnabled = NO; - } - return _tableView; -} - -- (UIView *)bottomView { - if (!_bottomView) { - _bottomView = [[UIView alloc] init]; - _bottomView.backgroundColor = [UIColor whiteColor]; - } - return _bottomView; -} - -- (NetImageView *)myAvatarImageView { - if (!_myAvatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _myAvatarImageView = [[NetImageView alloc] initWithConfig:config]; - _myAvatarImageView.layer.masksToBounds = YES; - _myAvatarImageView.layer.cornerRadius = 40 / 2; - } - return _myAvatarImageView; -} - -- (UILabel *)progressLabel { - if (!_progressLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textColor = [UIColor whiteColor]; - label.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _progressLabel = label; - } - return _progressLabel; -} - -- (UILabel *)intimateLabel { - if (!_intimateLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - label.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _intimateLabel = label; - } - return _intimateLabel; -} - -- (UIView *)progressBgView { - if (!_progressBgView) { - _progressBgView = [[UIView alloc] init]; - _progressBgView.backgroundColor = UIColorFromRGB(0xE4E4E4); - _progressBgView.layer.cornerRadius = 8; - _progressBgView.layer.masksToBounds = YES; - } - return _progressBgView; -} - -- (UIImageView *)progressView { - if (!_progressView) { - _progressView = [[UIImageView alloc] init]; - [_progressView setImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFF49A3), UIColorFromRGB(0xFF2B4C)] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(10, 10)]]; - _progressView.layer.cornerRadius = 8; - _progressView.layer.masksToBounds = YES; - } - return _progressView; -} - -- (UIImageView *)explainBgImageView { - if (!_explainBgImageView) { - _explainBgImageView = [[UIImageView alloc] init]; - _explainBgImageView.image = [UIImage imageNamed:@"anchor_fansTeam_ruleBg"]; - _explainBgImageView.userInteractionEnabled = YES; - _explainBgImageView.hidden = YES; - } - return _explainBgImageView; -} - -- (UIButton *)explainButton { - if (!_explainButton) { - _explainButton = [[UIButton alloc] init]; - [_explainButton setTitle:YMLocalizedString(@"XPAnchorFansTaskViewController3") forState:UIControlStateNormal]; - _explainButton.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - [_explainButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - [_explainButton addTarget:self action:@selector(explainButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _explainButton; -} - -- (UIButton *)exitButton { - if (!_exitButton) { - _exitButton = [[UIButton alloc] init]; - [_exitButton setTitle:YMLocalizedString(@"XPAnchorFansTaskViewController4") forState:UIControlStateNormal]; - _exitButton.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - [_exitButton setTitleColor:UIColorFromRGB(0xFE3478) forState:UIControlStateNormal]; - [_exitButton addTarget:self action:@selector(exitButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _exitButton; -} - -- (UIView *)devideView { - if (!_devideView) { - _devideView = [[UIView alloc] init]; - _devideView.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - } - return _devideView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.h b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.h deleted file mode 100644 index aadde84..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMAnchorFansTeamEntranceView.h -// YUMI -// -// Created by YUMI on 2022/4/6. -// - -#import -#import "XPAnchorFansRelationModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorFansTeamEntranceView : UIView - -@property (nonatomic, copy) NSString *title; - -@property (nonatomic, strong) XPAnchorFansRelationModel *model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m deleted file mode 100644 index 68e81a6..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m +++ /dev/null @@ -1,157 +0,0 @@ -// -// YMAnchorFansTeamEntranceView.m -// YUMI -// -// Created by YUMI on 2022/4/6. -// - -#import "XPAnchorFansTeamEntranceView.h" -///Third -#import -#import "UIImage+Utils.h" -#import "DJDKMIMOMColor.h" - -@interface XPAnchorFansTeamEntranceView() - -///背景图 -@property (nonatomic, strong) UIImageView *bgImageView; -///心形图标 -@property (nonatomic, strong) UIImageView *iconImageView; -///礼物值 -@property (nonatomic, strong) UILabel *titleLabel; - -@end - -@implementation XPAnchorFansTeamEntranceView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self addSubview:self.iconImageView]; - [self addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.iconImageView); - }]; - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self); - make.leading.mas_equalTo(-11); - make.trailing.mas_equalTo(self.iconImageView.mas_trailing).mas_offset(-8); - make.height.mas_equalTo(22); - }]; - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.bgImageView.mas_centerY); - make.width.height.mas_equalTo(22); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.bgImageView); - make.trailing.mas_equalTo(self.iconImageView.mas_leading); - make.leading.mas_equalTo(8); - }]; - -} -#pragma mark - Getters And Setters -- (void)setTitle:(NSString *)title { - self.titleLabel.text = title; -} - -- (void)setModel:(XPAnchorFansRelationModel *)model { - _model = model; - if (model.isCurrentRoomAnchor) {///是房主 - self.iconImageView.image = [UIImage imageNamed:@"anchor_fansTeam_entrance_hadOpen"]; - [self.iconImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(20); - make.height.mas_equalTo(14); - make.centerY.mas_equalTo(self.bgImageView); - }]; - [self.bgImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.iconImageView).mas_offset(8); - }]; - if (model.hasFansTeamCurrentRoom) {//已开通粉丝团 - self.titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorFansTeamEntranceView0"), model.anchorFansNum]; - } else { - self.titleLabel.text = YMLocalizedString(@"XPAnchorFansTeamEntranceView1"); - } - } else { - if (model.hasFansTeamCurrentRoom) {//已开通粉丝团 - if (model.isAnchorFans) { - self.titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorFansTeamEntranceView2"), model.fansLevelSeq]; - self.iconImageView.image = [UIImage imageNamed:@"anchor_fansTeam_entrance_hadOpen"]; - [self.iconImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(20); - make.height.mas_equalTo(14); - make.centerY.mas_equalTo(self.titleLabel); - }]; - [self.bgImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.iconImageView).mas_offset(8); - make.height.mas_equalTo(22); - }]; - } else { - self.titleLabel.text = YMLocalizedString(@"XPAnchorFansTeamEntranceView3"); - self.iconImageView.image = [UIImage imageNamed:@"anchor_fansTeam_entrance_icon"]; - [self.iconImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.bgImageView); - make.width.height.mas_equalTo(25); - }]; - [self.bgImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.iconImageView.mas_trailing).mas_offset(8); - }]; - } - } else { - self.titleLabel.text = YMLocalizedString(@"XPAnchorFansTeamEntranceView4"); - [self.iconImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(0); - }]; - [self.bgImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.titleLabel).mas_offset(8); - }]; - } - } -} - -- (UIImageView *)bgImageView { - if (_bgImageView == nil) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFC37D6), UIColorFromRGB(0xFC7FDC)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(92, 22)]; - _bgImageView.userInteractionEnabled = YES; - _bgImageView.layer.cornerRadius = 11; - _bgImageView.layer.masksToBounds = YES; - _bgImageView.layer.borderWidth = 1; - _bgImageView.layer.borderColor = [UIColor colorWithWhite:1 alpha:0.35].CGColor; - } - return _bgImageView; -} - -- (UIImageView *)iconImageView { - if (_iconImageView == nil) { - _iconImageView = [[UIImageView alloc] init]; - _iconImageView.userInteractionEnabled = YES; - _iconImageView.image = [UIImage imageNamed:@"anchor_fansTeam_entrance_icon"]; - _iconImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _iconImageView; -} - -- (UILabel *)titleLabel { - if (_titleLabel == nil) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = UIColor.whiteColor; - _titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _titleLabel.text = @"0"; - } - return _titleLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.h b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.h deleted file mode 100644 index c34d5d0..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMAnchorFansTeamViewController.h -// YUMI -// -// Created by YUMI on 2022/4/6. -// - -#import "MvpViewController.h" -#import "XPAnchorFansJoinModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorFansTeamViewController : MvpViewController - -- (instancetype)initWithRoomUid:(NSString *)roomUid; - -@property (nonatomic, strong) XPAnchorFansJoinModel *model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.m deleted file mode 100644 index f40ff9c..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.m +++ /dev/null @@ -1,587 +0,0 @@ -// -// YMAnchorFansTeamViewController.m -// YUMI -// -// Created by YUMI on 2022/4/6. -// - -#import "XPAnchorFansTeamViewController.h" -///P -#import "XPAnchorFansTeamPresenter.h" -#import "XPAnchorFansTeamProtocol.h" -///Third -#import "NetImageView.h" -#import -///Tool -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "DJDKMIMOMColor.h" -#import "XPRoomHalfWebView.h" -#import "TTPopup.h" -#import "YUMIHtmlUrl.h" -#import "Api+Gift.h" -#import "AccountInfoStorage.h" -#import "UIButton+EnlargeTouchArea.h" - -@interface XPAnchorFansTeamViewController() - -///房间Uid -@property (nonatomic, strong) NSString *roomUid; -///顶部点击消失的view -@property (nonatomic, strong) UIView *topView; -///显示内容的view -@property (nonatomic, strong) UIView *contentView; -///背景图片 -@property (nonatomic, strong) UIImageView *bgImageView; -///帮助按钮 -@property (nonatomic, strong) UIButton *helpButton; -///头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -///粉丝团名称 -@property (nonatomic, strong) UILabel *nameLabel; -///人数背景 -@property (nonatomic, strong) UIView *countContentView; -///粉丝团人 -@property (nonatomic, strong) UILabel *countLabel; - -@property (nonatomic, strong) UIView *stackView; -///排行榜 -@property (nonatomic, strong) UIImageView *rankImageView; -///粉丝专属特权 -@property (nonatomic, strong) UIImageView *privilegeTitleImageView; -///专属铭牌背景 -@property (nonatomic, strong) UIView *nameplateBgView; -///专属铭牌图片 -@property (nonatomic, strong) NetImageView *nameplateImageView; -///专属铭牌名称 -@property (nonatomic, strong) UILabel *nameplateLabel; -///专属铭牌描述 -@property (nonatomic, strong) UILabel *nameplateDescLabel; -///专属礼物背景 -@property (nonatomic, strong) UIView *giftBgView; -///专属礼物图片 -@property (nonatomic, strong) NetImageView *giftImageView; -///专属礼物名称 -@property (nonatomic, strong) UILabel *giftLabel; -///专属礼物描述 -@property (nonatomic, strong) UILabel *giftDescLabel; -///加入按钮的icon -@property (nonatomic, strong) NetImageView *iconImageView; -///加入按钮 -@property (nonatomic, strong) UIButton *joinButton; -///加入按钮描述 -@property (nonatomic, strong) UILabel *joinLabel; - -@end - -@implementation XPAnchorFansTeamViewController - -- (instancetype)initWithRoomUid:(NSString *)roomUid { - if (self = [super init]) { - self.roomUid = roomUid; - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - } - return self; -} - -- (XPAnchorFansTeamPresenter *)createPresenter { - return [[XPAnchorFansTeamPresenter alloc] init];; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self setupInfo]; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.topView]; - [self.view addSubview:self.contentView]; - - [self.contentView addSubview:self.bgImageView]; - [self.contentView addSubview:self.helpButton]; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nameLabel]; - [self.contentView addSubview:self.countContentView]; - [self.countContentView addSubview:self.countLabel]; - [self.contentView addSubview:self.stackView]; - [self.stackView addSubview:self.rankImageView]; - - [self.contentView addSubview:self.privilegeTitleImageView]; - [self.contentView addSubview:self.nameplateBgView]; - - [self.nameplateBgView addSubview:self.nameplateImageView]; - [self.nameplateBgView addSubview:self.nameplateLabel]; - [self.nameplateBgView addSubview:self.nameplateDescLabel]; - - [self.contentView addSubview:self.giftBgView]; - [self.giftBgView addSubview:self.giftImageView]; - [self.giftBgView addSubview:self.giftLabel]; - [self.giftBgView addSubview:self.giftDescLabel]; - - [self.contentView addSubview:self.joinButton]; - [self.contentView addSubview:self.iconImageView]; - [self.contentView addSubview:self.joinLabel]; -} - -- (void)initSubViewConstraints { - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.contentView.mas_top); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.height.mas_equalTo(416); - }]; - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make){ - make.edges.mas_equalTo(0); - }]; - - [self.helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-10); - make.top.mas_equalTo(10); - make.width.height.mas_equalTo(30); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.width.height.mas_equalTo(64); - make.top.mas_equalTo(36); - }]; - - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(21); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(8); - make.top.mas_equalTo(self.avatarImageView).offset(6); - make.trailing.mas_equalTo(self.countContentView.mas_leading).mas_offset(-4); - }]; - - [self.countContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.nameLabel); - make.trailing.mas_lessThanOrEqualTo(-26); - make.height.mas_equalTo(15); - make.leading.mas_equalTo(self.nameLabel.mas_trailing).mas_offset(4); - }]; - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(self.countContentView); - make.leading.mas_equalTo(self.countContentView).mas_offset(5); - make.trailing.mas_equalTo(self.countContentView).mas_offset(-5); - }]; - - [self.countLabel setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; - [self.nameLabel setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(8); - make.bottom.mas_equalTo(self.avatarImageView).mas_offset(-3); - make.height.mas_equalTo(28); - make.width.mas_equalTo(3 * (20 + 8) + 34); - }]; - - [self.rankImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.stackView); - make.leading.mas_equalTo(9); - make.width.mas_equalTo(16); - make.height.mas_equalTo(18); - }]; - [self.privilegeTitleImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).mas_offset(15); - make.centerX.mas_equalTo(self.contentView); - make.width.mas_equalTo(103); - make.height.mas_equalTo(38); - }]; - - [self.nameplateBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.privilegeTitleImageView.mas_bottom).offset(7); - make.height.mas_equalTo(58); - }]; - - [self.nameplateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(10); - make.centerY.mas_equalTo(self.nameplateBgView); - make.width.height.mas_equalTo(38); - }]; - - [self.nameplateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nameplateImageView.mas_trailing).mas_offset(8); - make.top.mas_equalTo(self.nameplateImageView).mas_offset(1); - make.height.mas_equalTo(21); - }]; - [self.nameplateDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nameplateLabel.mas_bottom); - make.leading.mas_equalTo(self.nameplateLabel); - make.height.mas_equalTo(15); - }]; - - [self.giftBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.nameplateBgView.mas_bottom).offset(12); - make.height.mas_equalTo(58); - }]; - - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(10); - make.centerY.mas_equalTo(self.giftBgView); - make.width.height.mas_equalTo(38); - }]; - - [self.giftLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.giftImageView.mas_trailing).mas_offset(8); - make.top.mas_equalTo(self.giftImageView).mas_offset(1); - make.height.mas_equalTo(21); - }]; - [self.giftDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.giftLabel.mas_bottom); - make.leading.mas_equalTo(self.giftLabel); - make.height.mas_equalTo(15); - }]; - - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.joinButton); - make.leading.mas_equalTo(self.joinButton).mas_offset(15); - make.width.height.mas_equalTo(75); - }]; - [self.joinButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.height.mas_equalTo(48); - make.bottom.mas_equalTo(-kSafeAreaBottomHeight - 14); - }]; - [self.joinLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.iconImageView.mas_trailing); - make.centerY.mas_equalTo(self.joinButton); - }]; -} - -- (void)setModel:(XPAnchorFansJoinModel *)model { - _model = model; -} - -- (void)setupInfo { - if (self.model) { - self.avatarImageView.imageUrl = self.model.anchorAvatar; - self.nameLabel.text = self.model.anchorNick; - self.countLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorFansTeamViewController0"), self.model.teamNum]; - - for (XPAnchorFansPrivilegeModel *obj in self.model.privilegeConfigVos) { - if(obj.type == 1){ - XPAnchorFansPrivilegeModel *nameplateModel = obj; - self.nameplateImageView.imageUrl = nameplateModel.icon; - self.nameplateLabel.text = nameplateModel.name; - self.nameplateDescLabel.text = nameplateModel.desc; - }else if(obj.type == 2){ - XPAnchorFansPrivilegeModel *giftModel = obj; - self.giftImageView.imageUrl = giftModel.icon; - self.giftLabel.text = giftModel.name; - self.giftDescLabel.text = giftModel.desc; - }else if(obj.type == 3){ - XPAnchorFansPrivilegeModel *joinModel = obj; - self.joinLabel.text = joinModel.name; - self.iconImageView.imageUrl = joinModel.icon; - } - } - - - CGFloat margin = 8; - for (int i = 0; i < 3; i++) { - NSString *str; - if (self.model.avatarList.count > i) { - str = self.model.avatarList[i]; - } - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder]; - NetImageView *imageView = [[NetImageView alloc] initWithConfig:config]; - imageView.layer.cornerRadius = 10; - imageView.layer.masksToBounds = YES; - if (str) { - imageView.imageUrl = str; - } - [self.stackView addSubview:imageView]; - [imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.stackView); - make.width.height.mas_equalTo(20); - make.leading.mas_equalTo(i * 27 + 25 + margin); - }]; - } - } -} - -#pragma mark - private -- (void)onDismiss:(UITapGestureRecognizer *)ges { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)helpButtonAction:(UIButton *)button { - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = [NSString stringWithFormat:@"%@?roomUid=%@", URLWithType(kAnchorFansRuleURL), self.roomUid]; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; -} - -- (void)joinButtonAction:(UIButton *)button { - button.userInteractionEnabled = NO; - XPAnchorFansPrivilegeModel *joinModel; - for (XPAnchorFansPrivilegeModel *obj in self.model.privilegeConfigVos) { - if(obj.type == 3){ - joinModel = obj; - } - } - if(joinModel == nil)return; - - [Api requestSendAnchorFansGift:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - [self showSuccessToast:YMLocalizedString(@"XPAnchorFansTeamViewController1")]; - [self dismissViewControllerAnimated:YES completion:nil]; - } else { - [self showErrorToast:msg]; - button.userInteractionEnabled = YES; - } - } targetUids:[NSString stringWithFormat:@"%lld", self.model.teamUid] giftNum:@"1" sendType:@"1" giftId:[NSString stringWithFormat:@"%ld", joinModel.normalId] giftSource:@"1" giftType:@"" roomUid:self.roomUid msg:@"" uid:[[AccountInfoStorage instance] getUid]]; -} - -- (void)gotoFansRank:(UITapGestureRecognizer *)ges { - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = [NSString stringWithFormat:@"%@?roomUid=%@", URLWithType(kAnchorFansRankURL), self.roomUid]; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; -} - -#pragma mark - getter -- (UIView *)topView { - if (!_topView) { - _topView = [[UIView alloc] init]; - _topView.backgroundColor = UIColor.blackColor; - _topView.alpha = 0.3; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onDismiss:)]; - [_topView addGestureRecognizer:tap]; - } - return _topView; -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - CAShapeLayer * layer = [CAShapeLayer layer]; - layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth,416) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)].CGPath; - _contentView.layer.mask = layer; - } - return _contentView; -} - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage imageNamed:@"join_anchor_fansTeam_bg"]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _bgImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 64 / 2; - } - return _avatarImageView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - label.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - _nameLabel = label; - } - return _nameLabel; -} - -- (UIView *)countContentView { - if (!_countContentView) { - _countContentView = [[UIView alloc] init]; - _countContentView.backgroundColor = [UIColor whiteColor]; - _countContentView.layer.cornerRadius = 7.5; - _countContentView.layer.masksToBounds = YES; - } - return _countContentView; -} - -- (UILabel *)countLabel { - if (!_countLabel) { - _countLabel = [[UILabel alloc] init]; - _countLabel.textColor = UIColorFromRGB(0xFE3478); - _countLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - } - return _countLabel; -} - -- (UIView *)stackView { - if (!_stackView) { - _stackView = [[UIView alloc] init]; - _stackView.backgroundColor = [UIColor whiteColor]; - _stackView.layer.cornerRadius = 14; - _stackView.layer.masksToBounds = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(gotoFansRank:)]; - [_stackView addGestureRecognizer:tap]; - } - return _stackView; -} - -- (UIImageView *)rankImageView { - if (!_rankImageView) { - _rankImageView = [[UIImageView alloc] init]; - _rankImageView.image = [UIImage imageNamed:@"anchor_fansTeam_rank"]; - } - return _rankImageView; -} - -- (UIImageView *)privilegeTitleImageView { - if (!_privilegeTitleImageView) { - _privilegeTitleImageView = [[UIImageView alloc] init]; - _privilegeTitleImageView.image = [UIImage getLanguageImage:@"anchor_fansTeam_nameplate"]; - _privilegeTitleImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _privilegeTitleImageView; -} - -- (UIView *)nameplateBgView { - if (!_nameplateBgView) { - _nameplateBgView = [[UIView alloc] init]; - _nameplateBgView.backgroundColor = [UIColor whiteColor]; - _nameplateBgView.layer.cornerRadius = 8; - _nameplateBgView.layer.masksToBounds = YES; - } - return _nameplateBgView; -} - -- (NetImageView *)nameplateImageView { - if (!_nameplateImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _nameplateImageView = [[NetImageView alloc] initWithConfig:config]; - _nameplateImageView.layer.masksToBounds = YES; - _nameplateImageView.layer.cornerRadius = 8; - _nameplateImageView.contentMode = UIViewContentModeScaleAspectFit; - _nameplateImageView.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - } - return _nameplateImageView; -} - -- (UILabel *)nameplateLabel; { - if (!_nameplateLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - label.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - _nameplateLabel = label; - } - return _nameplateLabel; -} - -- (UILabel *)nameplateDescLabel; { - if (!_nameplateDescLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textColor = [DJDKMIMOMColor textThirdColor]; - label.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _nameplateDescLabel = label; - } - return _nameplateDescLabel; -} - -- (UIView *)giftBgView { - if (!_giftBgView) { - _giftBgView = [[UIView alloc] init]; - _giftBgView.backgroundColor = [UIColor whiteColor]; - _giftBgView.layer.cornerRadius = 8; - _giftBgView.layer.masksToBounds = YES; - } - return _giftBgView; -} - -- (NetImageView *)giftImageView { - if (!_giftImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _giftImageView = [[NetImageView alloc] initWithConfig:config]; - _giftImageView.layer.masksToBounds = YES; - _giftImageView.layer.cornerRadius = 8; - _giftImageView.contentMode = UIViewContentModeScaleAspectFit; - _giftImageView.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - } - return _giftImageView; -} - -- (UILabel *)giftLabel; { - if (!_giftLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - label.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - _giftLabel = label; - } - return _giftLabel; -} - -- (UILabel *)giftDescLabel; { - if (!_giftDescLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textColor = [DJDKMIMOMColor textThirdColor]; - label.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _giftDescLabel = label; - } - return _giftDescLabel; -} - -- (NetImageView *)iconImageView { - if (!_iconImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - _iconImageView = [[NetImageView alloc] initWithConfig:config]; - _iconImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _iconImageView; -} - -- (UIButton *)joinButton { - if (!_joinButton) { - _joinButton = [[UIButton alloc] init]; - [_joinButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFF49A3), UIColorFromRGB(0xFF2B4C)] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _joinButton.layer.masksToBounds = YES; - _joinButton.layer.cornerRadius = 24; - [_joinButton addTarget:self action:@selector(joinButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _joinButton; -} - -- (UILabel *)joinLabel { - if (!_joinLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textColor = [UIColor whiteColor]; - label.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _joinLabel = label; - } - return _joinLabel; -} - -- (UIButton *)helpButton { - if (!_helpButton) { - _helpButton = [[UIButton alloc] init]; - [_helpButton addTarget:self action:@selector(helpButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_helpButton setImage:[UIImage imageNamed:@"anchor_fansTeam_help"] forState:UIControlStateNormal]; - [_helpButton setEnlargeEdgeWithTop:5 right:5 bottom:5 left:5]; - } - return _helpButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/Model/XPAnchorAttentSendInfo.h b/YuMi/Modules/YMRoom/View/AnchorView/Model/XPAnchorAttentSendInfo.h deleted file mode 100644 index e49c3b5..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/Model/XPAnchorAttentSendInfo.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMAnchorAttentSendInfo.h -// YUMI -// -// Created by YUMI on 2022/2/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPAnchorAttentSendInfo : PIBaseModel - -@property (assign, nonatomic) NSInteger uid; -@property (copy, nonatomic) NSString *nick; -@property (assign, nonatomic) NSInteger targetUid; -@property (copy, nonatomic) NSString *targetNick; -@property(nonatomic, strong)NSDictionary *encodeAttachemt; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/Model/XPAnchorAttentSendInfo.m b/YuMi/Modules/YMRoom/View/AnchorView/Model/XPAnchorAttentSendInfo.m deleted file mode 100644 index d668597..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/Model/XPAnchorAttentSendInfo.m +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMAnchorAttentSendInfo.m -// YUMI -// -// Created by YUMI on 2022/2/15. -// - -#import "XPAnchorAttentSendInfo.h" -#import "NSMutableDictionary+Saft.h" -@implementation XPAnchorAttentSendInfo - -- (NSDictionary *)encodeAttachemt { - - NSMutableDictionary * info = [NSMutableDictionary dictionary]; - [info safeSetObject:self.nick forKey:@"nick"]; - [info safeSetObject:@(self.targetUid) forKey:@"targetUid"]; - [info safeSetObject:self.targetNick forKey:@"targetNick"]; - - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - [dic safeSetObject:@(self.uid) forKey:@"uid"]; - [dic safeSetObject:info forKey:@"data"]; - return info; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.h b/YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.h deleted file mode 100644 index d5aa03c..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// TTAnchorAudienceUpMicView.h -// PlanetStar -// -// Created by YUMI on 2021/12/29. -// Copyright © 2021 WUJIE INTERACTIVE. All rights reserved. -// - -#import -#import "RoomHostDelegate.h" - -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel; -@interface XPAnchorAudienceUpMicView : UIView - -- (instancetype)initWithFrame:(CGRect)frame delegate:(id)delegate; - -@property (nonatomic, strong) UserInfoModel *info; - -@property (nonatomic, weak, readonly) id hostDelegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.m b/YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.m deleted file mode 100644 index abbf846..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.m +++ /dev/null @@ -1,220 +0,0 @@ -// -// TTAnchorAudienceUpMicView.m -// PlanetStar -// -// Created by YUMI on 2021/12/29. -// Copyright © 2021 WUJIE INTERACTIVE. All rights reserved. -// - -#import "XPAnchorAudienceUpMicView.h" -///Third -#import -#import -#import -///Tool -#import "TTPopup.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "NetImageView.h" -///Model -#import "MicroQueueModel.h" -#import "AttachmentModel.h" -#import "RoomInfoModel.h" -#import "UserInfoModel.h" - -@interface XPAnchorAudienceUpMicView() - -// 头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -// 昵称 -@property (nonatomic, strong) UILabel *nickLabel; -//描述 -@property (nonatomic, strong) UILabel *descripLabel; -//取消 -@property (nonatomic, strong) UIButton *cancelButton; -//确认 -@property (nonatomic, strong) UIButton *confirmButton; - -@property (nonatomic, weak) id hostDelegate; - -@end - -@implementation XPAnchorAudienceUpMicView - -- (instancetype)initWithFrame:(CGRect)frame delegate:(nonnull id)delegate{ - if (self = [super initWithFrame:frame]) { - self.hostDelegate = delegate; - [self setUpUI]; - [self setupConstraints]; - [self setEvents]; - } - return self; -} - - -- (void)setUpUI { - self.backgroundColor = [UIColor whiteColor]; - self.layer.cornerRadius = 12; - self.layer.masksToBounds = YES; - [self addSubview:self.avatarImageView]; - [self addSubview:self.nickLabel]; - [self addSubview:self.descripLabel]; - [self addSubview:self.cancelButton]; - [self addSubview:self.confirmButton]; -} - -- (void)setupConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(16); - make.width.height.mas_equalTo(80); - }]; - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).mas_offset(4); - make.centerX.mas_equalTo(self.mas_centerX); - make.height.mas_equalTo(18); - }]; - [self.descripLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.mas_centerX); - make.height.mas_equalTo(40); - make.top.mas_equalTo(self.nickLabel.mas_bottom).mas_offset(6); - make.leading.mas_equalTo(20); - }]; - [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.descripLabel.mas_bottom).offset(12); - make.width.mas_equalTo(126); - make.trailing.mas_equalTo(self.mas_centerX).mas_offset(-8); - make.height.mas_equalTo(38); - }]; - [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.cancelButton); - make.width.mas_equalTo(126); - make.leading.mas_equalTo(self.cancelButton.mas_trailing).mas_offset(16); - make.height.mas_equalTo(38); - }]; -} - -- (void)setEvents { - @weakify(self); - [[self.confirmButton rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(__kindof UIControl * _Nullable x) { - @strongify(self); - NSDictionary *micQueue = [self.hostDelegate getMicroQueue]; - NSString *position = [self findFreePositionWithMic:micQueue]; - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - RoomInfoModel *roomInfo = [self.hostDelegate getRoomInfo]; - NSString *roomId = [NSString stringWithFormat:@"%zd", roomInfo.roomId]; - request.roomId = roomId; - NSString* uid = [NSString stringWithFormat:@"%ld", self.info.uid]; - request.userIds = @[uid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - NIMChatroomMember * member = members.firstObject; - [self dismiss]; - if (!member) return; - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - [dic setValue:@(position.integerValue) forKey:@"micPosition"]; - [dic setValue:@(member.userId.integerValue) forKey:@"uid"]; - AttachmentModel *attachement = [[AttachmentModel alloc]init]; - attachement.first = CustomMessageType_Queue; - attachement.second = Custom_Message_Sub_Queue_Invite; - attachement.data = dic; - - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachement; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:roomId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - }]; - }]; - [[self.cancelButton rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(__kindof UIControl * _Nullable x) { - [self dismiss]; - }]; -} - -- (void)setInfo:(UserInfoModel *)info { - _info = info; - self.avatarImageView.imageUrl = info.avatar; - self.nickLabel.text = info.nick; -} - -- (void)dismiss { - [TTPopup dismiss]; -} - -- (NSString *)findFreePositionWithMic:(NSDictionary *)micQueue { - if (micQueue != nil && micQueue.allKeys.count > 0) { - NSArray *keys = [micQueue allKeys]; - if (keys.count > 0) { - for (NSString *key in keys) { - MicroQueueModel* model = [micQueue objectForKey:key]; - if (!model.userInfo) { - return key; - } - } - } - } - return nil; -} - -#pragma mark - views -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.cornerRadius = 40; - _avatarImageView.layer.masksToBounds = YES; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _nickLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightBold]; - } - return _nickLabel; -} - -- (UILabel *)descripLabel { - if (!_descripLabel) { - _descripLabel = [[UILabel alloc] init]; - _descripLabel.text = YMLocalizedString(@"XPAnchorAudienceUpMicView0"); - _descripLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _descripLabel.textAlignment = NSTextAlignmentCenter; - _descripLabel.font = [UIFont systemFontOfSize:12]; - _descripLabel.numberOfLines = 0; - } - return _descripLabel; -} - -- (UIButton *)cancelButton { - if (!_cancelButton) { - _cancelButton = [[UIButton alloc] init]; - [_cancelButton setTitle:YMLocalizedString(@"XPAnchorAudienceUpMicView1") forState:UIControlStateNormal]; - _cancelButton.layer.cornerRadius = 19; - _cancelButton.layer.masksToBounds = YES; - _cancelButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_cancelButton setTitleColor:[DJDKMIMOMColor cancelButtonTextColor] forState:UIControlStateNormal]; - [_cancelButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _cancelButton; -} - -- (UIButton *)confirmButton { - if (!_confirmButton) { - _confirmButton = [[UIButton alloc] init]; - [_confirmButton setTitle:YMLocalizedString(@"XPAnchorAudienceUpMicView2") forState:UIControlStateNormal]; - _confirmButton.layer.cornerRadius = 19; - _confirmButton.layer.masksToBounds = YES; - _confirmButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_confirmButton setTitleColor:UIColorFromRGB(0xffffff) forState:UIControlStateNormal]; - [_confirmButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _confirmButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.h b/YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.h deleted file mode 100644 index f155a00..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// TTRoomAnchorInfoCardView.h -// PlanetStar -// -// Created by YUMI on 2021/6/28. -// Copyright © 2021 WUJIE INTERACTIVE. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class UserInfoModel; -@interface XPRoomAnchorInfoCardView : UIView - -@property (nonatomic, strong) UserInfoModel *userInfo; - -@property (nonatomic, strong) UserInfoModel *targetUserInfo; - -@property (nonatomic, assign) NSInteger roomId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.m b/YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.m deleted file mode 100644 index 627d723..0000000 --- a/YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.m +++ /dev/null @@ -1,215 +0,0 @@ -// -// TTRoomAnchorInfoCardView.m -// PlanetStar -// -// Created by YUMI on 2021/6/28. -// Copyright © 2021 WUJIE INTERACTIVE. All rights reserved. -// - -#import "XPRoomAnchorInfoCardView.h" -///Third -#import -#import "TTPopup.h" -///Tool -#import "XNDJTDDLoadingTool.h" -#import -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "Api+UserCard.h" -#import "AccountInfoStorage.h" -///View -#import "NetImageView.h" -///Model -#import "UserInfoModel.h" -#import "XPAnchorAttentSendInfo.h" -#import "AttachmentModel.h" - -@interface XPRoomAnchorInfoCardView() - -@property (nonatomic, strong) UIButton *closeBtn;//关闭按钮 -@property (nonatomic, strong) NetImageView *avatarImageView;//头像 -@property (nonatomic, strong) UILabel *nameLabel;//昵称 -@property (nonatomic, strong) UILabel *descLabel;//描述 -@property (nonatomic, strong) UIButton *followBtn;//关注按钮 - -@end - -@implementation XPRoomAnchorInfoCardView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initView]; - [self initConstraint]; - } - return self; -} - -- (void)initView { - self.backgroundColor = [UIColor whiteColor]; - [self addSubview:self.closeBtn]; - [self addSubview:self.avatarImageView]; - [self addSubview:self.nameLabel]; - [self addSubview:self.descLabel]; - [self addSubview:self.followBtn]; -} - -- (void)initConstraint { - CGFloat margin = 16; - [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(margin); - make.top.mas_equalTo(margin); - make.width.height.mas_equalTo(30); - }]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.mas_centerX); - make.width.height.mas_equalTo(80); - make.top.mas_equalTo(55); - }]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).mas_offset(10); - make.centerX.mas_equalTo(self.mas_centerX); - make.leading.mas_equalTo(margin); - }]; - [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nameLabel.mas_bottom).mas_offset(8); - make.leading.trailing.mas_equalTo(self).inset(30); - make.bottom.mas_equalTo(self.followBtn.mas_top).offset(-8); - }]; - [self.followBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(kSafeAreaBottomHeight > 0 ? -kSafeAreaBottomHeight : -20); - make.centerX.mas_equalTo(self.mas_centerX); - make.width.mas_equalTo(225); - make.height.mas_equalTo(30); - }]; -} - -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; -} - -- (void)setTargetUserInfo:(UserInfoModel *)targetUserInfo { - _targetUserInfo = targetUserInfo; - self.avatarImageView.imageUrl = targetUserInfo.avatar; - self.nameLabel.text = targetUserInfo.nick; -} - -- (void)drawRect:(CGRect)rect { - UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:self.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(15, 15)]; - CAShapeLayer *maskLayer = [CAShapeLayer layer]; - maskLayer.path = path.CGPath; - self.layer.mask = maskLayer; -} - -- (void)layoutSubviews { - [super layoutSubviews]; - CGFloat imageWidth = _followBtn.imageView.frame.size.width; - CGFloat space = 5.f; //定义两个元素交换后的间距 - _followBtn.titleEdgeInsets = UIEdgeInsetsMake(0, imageWidth + space,0,imageWidth + space); -} - -- (void)followBtnClick:(UIButton *)btn { - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * type = @"1"; - @kWeakify(self); - - [Api attentionCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - [self.followBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [self.followBtn setTitle:YMLocalizedString(@"XPRoomAnchorInfoCardView0") forState:UIControlStateNormal]; - [self.followBtn setTitleColor:[DJDKMIMOMColor cancelButtonTextColor] forState:UIControlStateNormal]; - - XPAnchorAttentSendInfo *info = [[XPAnchorAttentSendInfo alloc] init]; - info.uid = self.userInfo.uid; - info.targetNick = self.targetUserInfo.nick; - info.targetUid = self.targetUserInfo.uid; - info.nick = self.userInfo.nick; - - AttachmentModel *attachment = [[AttachmentModel alloc]init]; - attachment.first = CustomMessageType_Room_Tip; - attachment.second = Custom_Message_Sub_Room_Tip_Attention_Owner; - attachment.data = info.encodeAttachemt; - - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:[NSString stringWithFormat:@"%zd", self.roomId] type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [TTPopup dismiss]; - }); - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } uid:uid likedUid:[NSString stringWithFormat:@"%zd", self.targetUserInfo.uid] ticket:ticket type:type]; -} - -- (void)close:(UIButton *)btn { - [TTPopup dismiss]; -} - -#pragma mark - lazy -- (UIButton *)closeBtn { - if (!_closeBtn) { - _closeBtn = [UIButton buttonWithType:UIButtonTypeCustom] ; - [_closeBtn setImage:[UIImage imageNamed:@"messageChat_popup_game_close_slices"] forState:UIControlStateNormal]; - [_closeBtn addTarget:self action:@selector(close:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeBtn; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.cornerRadius = 40; - _avatarImageView.layer.masksToBounds = YES; - } - return _avatarImageView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [[UILabel alloc] init]; - _nameLabel.font = [UIFont boldSystemFontOfSize:14]; - _nameLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _nameLabel.textAlignment = NSTextAlignmentCenter; - } - return _nameLabel; -} - -- (UILabel *)descLabel { - if (!_descLabel) { - _descLabel = [[UILabel alloc] init]; - _descLabel.font = [UIFont boldSystemFontOfSize:14]; - _descLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _descLabel.textAlignment = NSTextAlignmentCenter; - _descLabel.text = YMLocalizedString(@"XPRoomAnchorInfoCardView1"); - _descLabel.numberOfLines = 0; - - } - return _descLabel; -} - -- (UIButton *)followBtn { - if (!_followBtn) { - _followBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_followBtn setImage:[UIImage imageNamed:@"personalAnchor_add"] forState:UIControlStateNormal]; - [_followBtn setTitle:YMLocalizedString(@"XPRoomAnchorInfoCardView2") forState:UIControlStateNormal]; - [_followBtn.titleLabel setFont:[UIFont boldSystemFontOfSize:15]]; - [_followBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _followBtn.layer.cornerRadius = 15; - _followBtn.layer.masksToBounds = YES; - [_followBtn addTarget:self action:@selector(followBtnClick:) forControlEvents:UIControlEventTouchUpInside]; - [_followBtn setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _followBtn; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/BannerScheduler.h b/YuMi/Modules/YMRoom/View/AnimationView/BannerScheduler.h deleted file mode 100644 index 1103e8e..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/BannerScheduler.h +++ /dev/null @@ -1,146 +0,0 @@ -// -// BannerScheduler.h -// YuMi -// -// Created by AI Assistant on 2025/1/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class BannerScheduler; - -/** - * Banner 播放调度器代理协议 - * 负责处理具体的 Banner 播放逻辑 - */ -@protocol BannerSchedulerDelegate - -@required -/** - * 调度器要求播放指定的 Banner - * @param scheduler 调度器实例 - * @param banner 要播放的 Banner 数据 - */ -- (void)bannerScheduler:(BannerScheduler *)scheduler - shouldPlayBanner:(id)banner; - -@optional -/** - * 调度器完成播放 Banner - * @param scheduler 调度器实例 - */ -- (void)bannerSchedulerDidFinishPlaying:(BannerScheduler *)scheduler; - -/** - * 调度器开始播放 Banner - * @param scheduler 调度器实例 - * @param banner 开始播放的 Banner 数据 - */ -- (void)bannerScheduler:(BannerScheduler *)scheduler - didStartPlayingBanner:(id)banner; - -@end - -/** - * Banner 播放调度器 - * 统一管理 V2 Banner 的播放队列和状态 - */ -@interface BannerScheduler : NSObject - -/** - * Banner 播放队列 - */ -@property (nonatomic, strong, readonly) NSMutableArray *bannerQueue; - -/** - * 当前是否正在播放 Banner - */ -@property (nonatomic, assign, readonly) BOOL isPlaying; - -/** - * 调度器代理 - */ -@property (nonatomic, weak) id delegate; - -/** - * 队列中的 Banner 数量 - */ -@property (nonatomic, assign, readonly) NSInteger queueCount; - -/** - * 初始化调度器 - * @param delegate 代理对象 - * @return 调度器实例 - */ -- (instancetype)initWithDelegate:(id)delegate; - -/** - * 将 Banner 添加到播放队列 - * @param banner Banner 数据 - */ -- (void)enqueueBanner:(id)banner; - -/** - * 处理队列中的下一个 Banner - */ -- (void)processNextBanner; - -/** - * 清空播放队列 - */ -- (void)clearQueue; - -/** - * 根据优先级对队列进行排序 - */ -- (void)sortQueueByPriority; - -/** - * 暂停播放（保持队列状态） - */ -- (void)pause; - -/** - * 恢复播放 - */ -- (void)resume; - -/** - * 检查队列是否为空 - * @return 队列是否为空 - */ -- (BOOL)isQueueEmpty; - -/** - * 获取队列中指定索引的 Banner - * @param index 索引 - * @return Banner 数据，如果索引无效则返回 nil - */ -- (nullable id)bannerAtIndex:(NSInteger)index; - -/** - * 移除队列中指定索引的 Banner - * @param index 索引 - * @return 是否移除成功 - */ -- (BOOL)removeBannerAtIndex:(NSInteger)index; - -/** - * 获取队列状态信息（用于调试） - * @return 状态信息字符串 - */ -- (NSString *)queueStatusDescription; - -/** - * 标记 Banner 播放完成 - * 这个方法应该由代理在 Banner 播放完成后调用 - */ -- (void)markBannerFinished; - -- (NSString *)debugStatus; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/BannerScheduler.m b/YuMi/Modules/YMRoom/View/AnimationView/BannerScheduler.m deleted file mode 100644 index 53e664d..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/BannerScheduler.m +++ /dev/null @@ -1,230 +0,0 @@ -// -// BannerScheduler.m -// YuMi -// -// Created by AI Assistant on 2025/1/13. -// - -#import "BannerScheduler.h" - -@interface BannerScheduler () - -@property (nonatomic, strong) NSMutableArray *bannerQueue; -@property (nonatomic, assign) BOOL isPlaying; -@property (nonatomic, assign) BOOL isPaused; - -@end - -@implementation BannerScheduler - -#pragma mark - Initialization - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super init]) { - _delegate = delegate; - _bannerQueue = [NSMutableArray array]; - _isPlaying = NO; - _isPaused = NO; - } - return self; -} - -#pragma mark - Public Methods - -- (void)enqueueBanner:(id)banner { - if (!banner) { - return; - } - - [self.bannerQueue addObject:banner]; - - // 如果当前没有在播放且未暂停，则开始处理 - if (!self.isPlaying && !self.isPaused) { - [self processNextBanner]; - } -} - -- (void)processNextBanner { - if (self.isPaused) { - return; - } - - // 🔧 新增：检查 delegate 是否有效 - if (!self.delegate) { - [self clearQueue]; - self.isPlaying = NO; - return; - } - - if (self.isPaused) { - return; - } - - if (self.bannerQueue.count == 0) { - self.isPlaying = NO; - return; - } - - if (self.isPlaying) { - return; - } - - // 对队列进行优先级排序 - [self sortQueueByPriority]; - - // 取出队列中的第一个 Banner - id nextBanner = [self.bannerQueue firstObject]; - [self.bannerQueue removeObjectAtIndex:0]; - - self.isPlaying = YES; - - // 通知代理开始播放 - if ([self.delegate respondsToSelector:@selector(bannerScheduler:didStartPlayingBanner:)]) { - [self.delegate bannerScheduler:self didStartPlayingBanner:nextBanner]; - } - - // 通知代理播放 Banner - if ([self.delegate respondsToSelector:@selector(bannerScheduler:shouldPlayBanner:)]) { - [self.delegate bannerScheduler:self shouldPlayBanner:nextBanner]; - } -} - -- (void)clearQueue { - [self.bannerQueue removeAllObjects]; -} - -- (void)sortQueueByPriority { - // 保持先进先出（FIFO）策略，不需要排序 - // 队列顺序就是添加顺序，确保公平性 - NSLog(@"🔄 BannerScheduler: 使用先进先出策略，保持队列原有顺序"); -} - -- (void)pause { - if (self.isPaused) { - NSLog(@"⏸️ BannerScheduler: 调度器已经处于暂停状态"); - return; - } - - NSLog(@"⏸️ BannerScheduler: 暂停调度器"); - self.isPaused = YES; -} - -- (void)resume { - NSLog(@"▶️ BannerScheduler: 恢复调度器"); - self.isPaused = NO; - - // 如果当前没有在播放，则开始处理队列 - if (!self.isPlaying) { - [self processNextBanner]; - } -} - -- (BOOL)isQueueEmpty { - return self.bannerQueue.count == 0; -} - -- (nullable id)bannerAtIndex:(NSInteger)index { - if (index < 0 || index >= self.bannerQueue.count) { - return nil; - } - return [self.bannerQueue objectAtIndex:index]; -} - -- (BOOL)removeBannerAtIndex:(NSInteger)index { - if (index < 0 || index >= self.bannerQueue.count) { - return NO; - } - - id removedBanner = [self.bannerQueue objectAtIndex:index]; - [self.bannerQueue removeObjectAtIndex:index]; - - NSLog(@"🗑️ BannerScheduler: 从队列中移除 Banner - 索引: %ld, 类型: %@", - (long)index, [removedBanner class]); - - return YES; -} - -- (NSString *)queueStatusDescription { - NSMutableString *description = [NSMutableString string]; - [description appendFormat:@"BannerScheduler 状态:\n"]; - [description appendFormat:@"- 播放状态: %@\n", self.isPlaying ? @"播放中" : @"空闲"]; - [description appendFormat:@"- 暂停状态: %@\n", self.isPaused ? @"已暂停" : @"运行中"]; - [description appendFormat:@"- 队列长度: %ld\n", (long)self.bannerQueue.count]; - - if (self.bannerQueue.count > 0) { - [description appendString:@"- 队列内容:\n"]; - for (NSInteger i = 0; i < self.bannerQueue.count; i++) { - id banner = self.bannerQueue[i]; - [description appendFormat:@" [%ld] 类型: %@\n", (long)i, [banner class]]; - } - } - - return description; -} - -#pragma mark - Public Properties - -- (NSInteger)queueCount { - return self.bannerQueue.count; -} - -#pragma mark - Internal Methods - -/** - * 标记 Banner 播放完成 - * 这个方法应该由代理在 Banner 播放完成后调用 - */ -- (void)markBannerFinished { - if (!self.isPlaying) { - NSLog(@"⚠️ BannerScheduler: 尝试标记未播放的 Banner 为完成"); - return; - } - - // 防止过快标记完成，确保 banner 有足够的显示时间 - static NSTimeInterval lastFinishTime = 0; - NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970]; - - // 如果距离上次完成时间太短，延迟处理 - if (currentTime - lastFinishTime < 0.3) { - NSLog(@"⏳ BannerScheduler: Banner 完成间隔过短，延迟处理 (间隔: %.2f秒)", currentTime - lastFinishTime); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self markBannerFinished]; - }); - return; - } - lastFinishTime = currentTime; - - NSLog(@"✅ BannerScheduler: Banner 播放完成"); - self.isPlaying = NO; - - // 通知代理播放完成 - if ([self.delegate respondsToSelector:@selector(bannerSchedulerDidFinishPlaying:)]) { - [self.delegate bannerSchedulerDidFinishPlaying:self]; - } - - // 处理队列中的下一个 Banner - [self processNextBanner]; -} - -/** - * 调试方法：检查调度器状态 - * @return 调试信息字符串 - */ -- (NSString *)debugStatus { - NSMutableString *debugInfo = [NSMutableString string]; - [debugInfo appendFormat:@"BannerScheduler Debug Status:\n"]; - [debugInfo appendFormat:@"- 播放状态: %@\n", self.isPlaying ? @"播放中" : @"空闲"]; - [debugInfo appendFormat:@"- 暂停状态: %@\n", self.isPaused ? @"已暂停" : @"运行中"]; - [debugInfo appendFormat:@"- 队列长度: %ld\n", (long)self.bannerQueue.count]; - - if (self.bannerQueue.count > 0) { - [debugInfo appendString:@"- 队列内容:\n"]; - for (NSInteger i = 0; i < self.bannerQueue.count; i++) { - id banner = self.bannerQueue[i]; - [debugInfo appendFormat:@" [%ld] 类型: %@\n", (long)i, [banner class]]; - } - } - return debugInfo; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/BravoGiftWinningFlagView.h b/YuMi/Modules/YMRoom/View/AnimationView/BravoGiftWinningFlagView.h deleted file mode 100644 index cbfaa38..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/BravoGiftWinningFlagView.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// BravoGiftWinningFlagView.h -// YuMi -// -// Created by P on 2025/3/25. -// - -#import -@class AttachmentModel; -NS_ASSUME_NONNULL_BEGIN - -@interface BravoGiftWinningFlagViewModel : PIBaseModel - -@property (nonatomic, assign) NSInteger uid; -@property (nonatomic, copy) NSArray *receiverUidList; -@property (nonatomic, assign) NSInteger roomUid; -@property (nonatomic, assign) NSInteger roomId; -@property (nonatomic, assign) CGFloat receiverProfit; -@property (nonatomic, copy) NSDictionary *tip; - -@end - - -@interface BravoGiftWinningFlagView : UIView - -+ (BravoGiftWinningFlagViewModel *)display:(UIView *)superView - with:(AttachmentModel *)attachment - roomID:(NSInteger)roomID - uID:(NSString *)UID; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/BravoGiftWinningFlagView.m b/YuMi/Modules/YMRoom/View/AnimationView/BravoGiftWinningFlagView.m deleted file mode 100644 index 4f52f2b..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/BravoGiftWinningFlagView.m +++ /dev/null @@ -1,191 +0,0 @@ -// -// BravoGiftWinningFlagView.m -// YuMi -// -// Created by P on 2025/3/25. -// - -#import "BravoGiftWinningFlagView.h" -#import "MoliMoneyLabel.h" -#import "AttachmentModel.h" - -//{"data":"{\"uid\":3224,\"receiverUidList\":[3224],\"roomUid\":3184,\"tip\":{\"times\":\"0.70\",\"coins\":\"700.0\",\"level\":1},\"receiverProfit\":\"50.00\",\"roomId\":6076861580}","first":106,"second":1065} - - -@implementation BravoGiftWinningFlagViewModel - -@end - -@interface BravoGiftWinningFlagView () - -@property (nonatomic, strong) BravoGiftWinningFlagViewModel *model; -@property (nonatomic, strong) UIImageView *backgroundImageView; -//@property (nonatomic, strong) MoliMoneyLabel *moneyLabel; -@property (nonatomic, strong) UILabel *moneyLabel_2; -@property (nonatomic, strong) UILabel *timesLabel; - -@end - -@implementation BravoGiftWinningFlagView - -+ (BravoGiftWinningFlagViewModel *)display:(UIView *)superView with:(AttachmentModel *)attachment roomID:(NSInteger)roomID uID:(NSString *)UID { - BravoGiftWinningFlagViewModel *model = [BravoGiftWinningFlagViewModel modelWithJSON:attachment.data]; - if (model.roomId != roomID || model.uid != UID.integerValue || !model.tip) { - return model; - } - - BravoGiftWinningFlagView *flagView = [[BravoGiftWinningFlagView alloc] init]; - flagView.model = model; - flagView.alpha = 0; - flagView.frame = CGRectMake(0, 0, kGetScaleWidth(274), kGetScaleWidth(216)); - - // 🔧 修复：重新计算位置，确保视图在屏幕可见范围内 - CGFloat viewWidth = kGetScaleWidth(274); - CGFloat viewHeight = kGetScaleWidth(216); - CGFloat screenWidth = KScreenWidth; - CGFloat screenHeight = KScreenHeight; - - // 计算安全的 Y 位置：屏幕高度的 40% 位置 - CGFloat safeY = screenHeight * 0.4; - - // 确保视图不会超出屏幕边界 - CGFloat maxY = screenHeight - viewHeight/2 - 20; // 留20点边距 - CGFloat minY = viewHeight/2 + 20; // 留20点边距 - CGFloat finalY = MAX(minY, MIN(safeY, maxY)); - - flagView.center = CGPointMake(screenWidth/2, finalY); - flagView.transform = CGAffineTransformMakeScale(0.1, 0.1); - - NSLog(@"🎯 BravoGiftWinningFlagView: 位置计算 - screenSize: %.0fx%.0f, viewSize: %.0fx%.0f, center: (%.0f, %.0f)", - screenWidth, screenHeight, viewWidth, viewHeight, flagView.center.x, flagView.center.y); - - [superView addSubview:flagView]; - - // 使用弹簧动画执行放大动画，alpha从0变为1，带有弹性效果 - [UIView animateWithDuration:0.8 - delay:0 - usingSpringWithDamping:0.3 // 弹性系数，数值越小弹性越强 - initialSpringVelocity:0.5 // 初始速度 - options:UIViewAnimationOptionCurveEaseInOut - animations:^{ - flagView.alpha = 1.0; - flagView.transform = CGAffineTransformMakeScale(1.0, 1.0); // 还原为正常大小 - } completion:^(BOOL finished) { - // 动画完成后，等待2秒再执行反向动画 - [UIView animateWithDuration:0.5 - delay:2.0 // 延迟2秒执行反向动画 - options:UIViewAnimationOptionCurveEaseInOut - animations:^{ - flagView.alpha = 0.0; - flagView.transform = CGAffineTransformMakeScale(0.1, 0.1); // 缩小回原始大小 - } completion:^(BOOL finished) { - // 动画完成后移除 view - [flagView removeFromSuperview]; - }]; - }]; - - return model; -} - -- (instancetype)init -{ - self = [super init]; - if (self) { - [self setupUI]; - } - return self; -} - -- (void)setupUI { - [self addSubview:self.backgroundImageView]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.moneyLabel_2]; - [self.moneyLabel_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(-70); - make.height.mas_equalTo(24); - }]; - - UIStackView *stackView = [[UIStackView alloc] initWithArrangedSubviews:@[ - [self winLabel], - self.timesLabel - ]]; - stackView.spacing = 4; - stackView.alignment = UIStackViewAlignmentCenter; - [self addSubview:stackView]; - [stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(-48); - }]; - [self.timesLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(10); - }]; -} - -- (void)setModel:(BravoGiftWinningFlagViewModel *)model { - NSNumber *level = [model.tip objectForKey:@"level"]; - NSString *times = [model.tip objectForKey:@"times"]; - NSNumber *coins = [model.tip objectForKey:@"coins"]; -// [self.moneyLabel updateContent:coins.stringValue]; - self.backgroundImageView.image = level.integerValue >= 3 ? kImage(@"brove_tips_high") : kImage(@"brove_tips_low"); - self.timesLabel.text = [NSString stringWithFormat:@"%@ %@", [NSString stringByRemovingRedundantZeros:times], YMLocalizedString(@"Combo_9")]; - - NSTextAttachment *moneyIcon = [[NSTextAttachment alloc] init]; - moneyIcon.image = kImage(@"moli_money_icon"); - NSMutableAttributedString *money = [[NSMutableAttributedString alloc] initWithString:[NSString stringByRemovingRedundantZeros:coins.stringValue] attributes:@{ - NSFontAttributeName: kFontMedium(26), - NSForegroundColorAttributeName: UIColorFromRGB(0xffe169) - }]; - [money appendAttributedString:[NSAttributedString attributedStringWithAttachment:moneyIcon]]; - self.moneyLabel_2.attributedText = money.copy; -} - -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] init];//WithImage:kImage(@"brove_tips_high")]; - _backgroundImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _backgroundImageView; -} - -//- (MoliMoneyLabel *)moneyLabel { -// if (!_moneyLabel) { -// _moneyLabel = [MoliMoneyLabel moneyLabelWithTextColot:UIColorFromRGB(0xFFE169) -// font:kFontMedium(26) -// moneyPostion:2 -// moneySize:CGSizeMake(24, 24)]; -// [_moneyLabel removeSpace]; -// [_moneyLabel updateSpacing:0]; -// [_moneyLabel updateLabelAlignment:NSTextAlignmentRight]; -// [_moneyLabel insertSpaceAtLeast]; -// -// } -// return _moneyLabel; -//} - -- (UILabel *)moneyLabel_2 { - if (!_moneyLabel_2) { - _moneyLabel_2 = [[UILabel alloc] init]; - } - return _moneyLabel_2; -} - -- (UILabel *)winLabel { - return [UILabel labelInitWithText:YMLocalizedString(@"Combo_4") - font:kFontRegular(13) - textColor:[UIColor whiteColor]]; -} - -- (UILabel *)timesLabel { - if (!_timesLabel) { - _timesLabel = [UILabel labelInitWithText:@"" - font:kFontMedium(13) - textColor:UIColorFromRGB(0xFFE169)]; - } - return _timesLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.h b/YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.h deleted file mode 100644 index 5977387..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// GameUniversalBannerView.h -// YuMi -// -// Created by P on 2024/10/15. -// - -#import - -@class SVGAVideoEntity, PIUniversalBannerModel, AttachmentModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface GameUniversalBannerView : UIView - -@property (nonatomic, strong) SVGAVideoEntity *entity; -@property (nonatomic, strong) PIUniversalBannerModel *model; - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete - goToGame:(void(^)(NSInteger gameID))go; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.m b/YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.m deleted file mode 100644 index 988fd0f..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/GameUniversalBannerView.m +++ /dev/null @@ -1,407 +0,0 @@ -// -// GameUniversalBannerView.m -// YuMi -// -// Created by P on 2024/10/15. -// - -#import "GameUniversalBannerView.h" - -#import -#import -#import "AttachmentModel.h" -#import "PIUniversalBannerModel.h" - -@interface GameUniversalBannerView () - -@property (nonatomic, strong) NetImageView *bgImageView; -@property (nonatomic, strong) SVGAImageView *bgSVGA; -@property (nonatomic, strong) NetImageView *gameIcon; -@property (nonatomic, strong) NetImageView *avatarIcon; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UIButton *goButton; -@property (nonatomic, assign) NSString *gameID; -@property (nonatomic, strong) SVGAParser *parser; -@property(nonatomic, assign) bool alreadyCancel; - -@property (nonatomic, copy) void(^completeDisplay)(void); -@property (nonatomic, copy) void(^didTapGo)(NSInteger gameID); - -@end - -@implementation GameUniversalBannerView - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete - goToGame:(void(^)(NSInteger gameID))go { - - CGFloat width = KScreenWidth; - CGFloat height = kGetScaleWidth(70); - - PIUniversalBannerModel *model = [PIUniversalBannerModel modelWithDictionary:attachment.data]; - GameUniversalBannerView *bannerView = [[GameUniversalBannerView alloc] initWithFrame:CGRectMake(KScreenWidth, 0, width, height)]; - bannerView.model = model; - bannerView.completeDisplay = complete; - bannerView.didTapGo = go; - bannerView.gameID = model.skipContent; - [superView addSubview:bannerView]; - - @kWeakify(bannerView); - [bannerView popEnterAnimation:^(BOOL finished) { - @kStrongify(bannerView); - [bannerView addNotification]; - if (finished && bannerView.alreadyCancel == NO) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [bannerView popLeaveAnimation:^(bool finished) { - if (bannerView.completeDisplay) { - bannerView.completeDisplay(); - } - [bannerView removeNotification]; - [bannerView removeFromSuperview]; - }]; - }); - } - }]; -} - -- (void)handleSwipeNotification { - [self dismissBanner]; -} - -- (void)handleTapNotification:(NSNotification *)note { - NSValue *value = note.userInfo[@"point"]; - CGPoint point = [value CGPointValue]; - - NSLog(@"🔄 GameUniversalBannerView: 接收到点击点 %@ (bannerContainer坐标系)", NSStringFromCGPoint(point)); - - // 将 bannerContainer 坐标系中的点转换为 GameUniversalBannerView 坐标系中的点 - CGPoint bannerPoint = [self convertPoint:point fromView:self.superview]; - - NSLog(@"🔄 GameUniversalBannerView: 转换为 banner 坐标系 %@", NSStringFromCGPoint(bannerPoint)); - NSLog(@"%@", CGRectContainsPoint(self.goButton.frame, bannerPoint) ? @"YES" : @"NO"); - // 检查点击是否与 go 按钮重合 - CGPoint goButtonPoint = [self.goButton convertPoint:bannerPoint fromView:self]; - if ([self.goButton pointInside:goButtonPoint withEvent:nil]) { - NSLog(@"🎯 GameUniversalBannerView: tap 点与 go 按钮重合，触发游戏跳转事件"); - [self handleTapGo]; - } else { - CGPoint screenPoint = [self convertPoint:point toView:nil]; - // 发送通知给 FunctionContainer 处理，传递屏幕坐标 - [[NSNotificationCenter defaultCenter] postNotificationName:@"BannerTapToFunctionContainer" - object:nil - userInfo:@{@"point": [NSValue valueWithCGPoint:screenPoint]}]; - } -} - -- (void)addNotification { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleSwipeNotification) - name:@"SwipeOutBanner" - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTapNotification:) - name:@"TapBanner" - object:nil]; -} - -- (void)removeNotification { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (void)dismissBanner { - NSLog(@"🚨 GameUniversalBannerView dismissBanner 被调用"); - self.alreadyCancel = YES; - [self pop_removeAllAnimations]; // 停止所有动画 - - [self popLeaveAnimation:^(bool finished) { - NSLog(@"🚨 GameUniversalBannerView 动画完成，调用回调"); - if (self.completeDisplay) { - self.completeDisplay(); - } else { - NSLog(@"🚨 警告: completeDisplay 回调为空"); - } - [self removeFromSuperview]; - }]; -} - -- (void)popEnterAnimation:(void(^)(BOOL finished))finish { - NSInteger height = kGetScaleWidth(70); - POPSpringAnimation *enterAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewFrame]; - enterAnimation.toValue = [NSValue valueWithCGRect:CGRectMake(0, 0, KScreenWidth, height)]; - enterAnimation.springBounciness = 10; // 弹性系数 - enterAnimation.springSpeed = 12; // 动画速度 - enterAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finish) { - finish(finished); - } - }; - [self pop_addAnimation:enterAnimation forKey:@"enterAnimation"]; -} - -- (void)popLeaveAnimation:(void(^)(bool finished))finish { - NSInteger height = kGetScaleWidth(70); - POPBasicAnimation *exitAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewFrame]; - exitAnimation.toValue = [NSValue valueWithCGRect:CGRectMake(-KScreenWidth, 0, KScreenWidth, height)]; - exitAnimation.duration = 0.25; // 动画持续时间 - exitAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - exitAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finish) { - finish(finished); - } - }; - [self pop_addAnimation:exitAnimation forKey:@"exitAnimation"]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self addSubview:self.bgSVGA]; - [self.bgSVGA mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.bgImageView]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.gameIcon]; - [self.gameIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(44); - make.height.mas_equalTo(44); - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(35); - }]; - - [self addSubview:self.avatarIcon]; - [self.avatarIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(28); - make.height.mas_equalTo(28); - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self.gameIcon.mas_trailing).offset(5); - }]; - - [self addSubview:self.goButton]; - [self.goButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.trailing.mas_equalTo(-36); - make.size.mas_equalTo(CGSizeMake(35, 20)); - }]; - - [self addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(117); - make.trailing.mas_equalTo(-80); - make.centerY.mas_equalTo(self.goButton); - make.height.mas_equalTo(70); - }]; - } - return self; -} - -- (void)setEntity:(SVGAVideoEntity *)entity { - _entity = entity; - self.bgSVGA.videoItem = entity; - [self.bgSVGA autoPlay]; -} - -- (void)setModel:(PIUniversalBannerModel *)model { - _model = model; - NSDictionary *textDic = model.template; - if(textDic.allKeys.count == 0) { - return ; - } - - NSString *key = [NSBundle uploadLanguageText]; - NSString *title = textDic[key] == nil ? textDic[textDic.allKeys.firstObject] : textDic[key]; - if(title.length == 0) { - return; - } - - [title stringByReplacingOccurrencesOfString:@"\n" withString:@""]; - if (_model.fontSize <= 0){ - _model.fontSize = 12; - } - CGFloat font = _model.fontSize; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title - attributes:@{ - NSFontAttributeName:[UIFont systemFontOfSize:font], - NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:_model.textColor]}]; - - for (PIUniversalBannerItemModel *model in _model.contents) { - if([model.type isEqualToString:@"TEXT"]){ - NSDictionary *subTextDic = model.text; - if(subTextDic.allKeys.count > 0){ - NSString *subText = subTextDic[key] == nil ? subTextDic[subTextDic.allKeys.firstObject] : subTextDic[key]; - NSAttributedString *attText = [[NSAttributedString alloc]initWithString:subText attributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:model.textColor],NSFontAttributeName:[UIFont systemFontOfSize:font]}]; - if ([attribute.string containsString:[NSString stringWithFormat:@"{%@}",model.key]]){ - [attribute replaceCharactersInRange:[attribute.string rangeOfString:[NSString stringWithFormat:@"{%@}",model.key]] withAttributedString:attText]; - } - } - } else if ([model.type isEqualToString:@"IMAGE"]) { - if ([model.key isEqualToString:@"avatar"]) { - [self.avatarIcon loadImageWithUrl:model.image completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - if (!image) { - [self.avatarIcon mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(0); - }]; - } else { - self.avatarIcon.image = image; - } - }]; - } else if ([model.key isEqualToString:@"gameIcon"]) { - [self.gameIcon loadImageWithUrl:model.image completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - if (!image) { - [self.gameIcon mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(0); - }]; - } else { - self.gameIcon.image = image; - } - }]; - } - - if ([attribute.string containsString:[NSString stringWithFormat:@"{%@}",model.key]]){ - [attribute replaceCharactersInRange:[attribute.string rangeOfString:[NSString stringWithFormat:@"{%@}",model.key]] withAttributedString:[NSAttributedString new]]; - } - } - } - - self.titleLabel.attributedText = attribute; - - BOOL isSvga = [model.resourceType.uppercaseString isEqualToString:@"SVGA"]; - @kWeakify(self); - if (isSvga == YES) { - self.bgSVGA.hidden = NO; - self.bgImageView.hidden = YES; - if (!_parser) { - _parser = [SVGAParser new]; - } - [self.parser parseWithURL:[NSURL URLWithString:model.resourceContent] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.bgSVGA.videoItem = videoItem; - } failureBlock:^(NSError * _Nonnull error) { - @kStrongify(self); - [self loadLocalSVGA]; - }]; - }else{ - self.bgSVGA.hidden = YES; - self.bgImageView.hidden = NO; - @kWeakify(self); - [self.bgImageView loadImageWithUrl:model.resourceContent completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - if (image) { - self.bgImageView.image = image; - } else { - [self loadLocalSVGA]; - } - }]; - } -} - -- (void)loadLocalSVGA { - self.bgSVGA.hidden = NO; - self.bgImageView.hidden = YES; - - @kWeakify(self); - [self.parser parseWithNamed:@"game_floating_bg" - inBundle:[NSBundle mainBundle] - completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.bgSVGA.videoItem = videoItem; - } failureBlock:^(NSError * _Nonnull error) { - }]; -} - -- (void)setupNotification { - -} - -- (void)handleTapGo { - if (self.didTapGo) { - self.didTapGo(self.gameID.integerValue); - } -} - -#pragma mark - -- (NetImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[NetImageView alloc] init]; - _bgImageView.layer.cornerRadius = 2; - _bgImageView.layer.masksToBounds = YES; - } - return _bgImageView; -} - -- (SVGAImageView *)bgSVGA { - if (!_bgSVGA) { - _bgSVGA = [[SVGAImageView alloc] init]; - _bgSVGA.autoPlay = YES; - _bgSVGA.loops = -1; - } - return _bgSVGA; -} - -- (NetImageConfig *)avatarConfig { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - return config; -} - -- (NetImageView *)gameIcon { - if (!_gameIcon) { - _gameIcon = [[NetImageView alloc] initWithConfig:[self avatarConfig]]; - _gameIcon.layer.cornerRadius = 2; - _gameIcon.layer.masksToBounds = YES; - } - return _gameIcon; -} - -- (NetImageView *)avatarIcon { - if (!_avatarIcon) { - _avatarIcon = [[NetImageView alloc] initWithConfig:[self avatarConfig]]; - _avatarIcon.layer.cornerRadius = 28/2; - _avatarIcon.layer.masksToBounds = YES; - } - return _avatarIcon; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.numberOfLines = 0; - _titleLabel.adjustsFontSizeToFitWidth = YES; - _titleLabel.minimumScaleFactor = 0.5; - } - return _titleLabel; -} - -- (UIButton *)goButton { - if (!_goButton) { - _goButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_goButton setImage:kImage(@"game_banner_go") - forState:UIControlStateNormal]; - [_goButton addTarget:self - action:@selector(handleTapGo) - forControlEvents:UIControlEventTouchUpInside]; - } - return _goButton; -} - -// 在主实现体内添加事件穿透逻辑 -//- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event { -// if (!self.userInteractionEnabled || self.hidden || self.alpha <= 0.01) { -// return nil; -// } -// CGPoint goButtonPoint = [self.goButton convertPoint:point fromView:self]; -// if ([self.goButton pointInside:goButtonPoint withEvent:event]) { -// return self.goButton; -// } -// // 其他区域返回self，允许触摸事件被处理（包括手势识别器） -// return self; -//} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/GestureOptimizer.h b/YuMi/Modules/YMRoom/View/AnimationView/GestureOptimizer.h deleted file mode 100644 index 5ffbf9c..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/GestureOptimizer.h +++ /dev/null @@ -1,75 +0,0 @@ -// -// GestureOptimizer.h -// YuMi -// -// Created by AI Assistant on 2025/1/13. -// - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -/** - * 手势区域类型 - */ -typedef NS_ENUM(NSInteger, GestureAreaType) { - GestureAreaType_Left, // 左侧区域 (1/6) - GestureAreaType_Center, // 中央区域 (2/3) - GestureAreaType_Right // 右侧区域 (1/6) -}; - -/** - * 手势识别器优化管理器 - * 负责优化 Banner 区域的手势识别性能 - */ -@interface GestureOptimizer : NSObject - -/** - * 单例方法 - */ -+ (instancetype)sharedOptimizer; - -/** - * 计算手势区域类型 - * @param point 触摸点 - * @param containerWidth 容器宽度 - * @return 手势区域类型 - */ -- (GestureAreaType)gestureAreaTypeForPoint:(CGPoint)point - containerWidth:(CGFloat)containerWidth; - -/** - * 检查手势是否应该在指定区域生效 - * @param gestureRecognizer 手势识别器 - * @param point 触摸点 - * @param containerWidth 容器宽度 - * @return 是否应该生效 - */ -- (BOOL)shouldGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer - receiveTouchAtPoint:(CGPoint)point - containerWidth:(CGFloat)containerWidth; - -/** - * 获取区域边界 - * @param containerWidth 容器宽度 - * @return 包含左边界和右边界的字典 - */ -- (NSDictionary *)getAreaBoundariesForContainerWidth:(CGFloat)containerWidth; - -/** - * 调试方法：打印手势区域信息 - * @param point 触摸点 - * @param containerWidth 容器宽度 - */ -- (void)debugGestureAreaForPoint:(CGPoint)point - containerWidth:(CGFloat)containerWidth; - -/** - * 清理缓存 - */ -- (void)clearCache; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/GestureOptimizer.m b/YuMi/Modules/YMRoom/View/AnimationView/GestureOptimizer.m deleted file mode 100644 index 0f078b7..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/GestureOptimizer.m +++ /dev/null @@ -1,163 +0,0 @@ -// -// GestureOptimizer.m -// YuMi -// -// Created by AI Assistant on 2025/1/13. -// - -#import "GestureOptimizer.h" - -@interface GestureOptimizer () - -@property (nonatomic, strong) NSMutableDictionary *boundaryCache; - -@end - -@implementation GestureOptimizer - -#pragma mark - Singleton - -+ (instancetype)sharedOptimizer { - static GestureOptimizer *instance = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - instance = [[GestureOptimizer alloc] init]; - }); - return instance; -} - -#pragma mark - Initialization - -- (instancetype)init { - if (self = [super init]) { - _boundaryCache = [NSMutableDictionary dictionary]; - - NSLog(@"🎯 GestureOptimizer: 初始化完成"); - } - return self; -} - -#pragma mark - Public Methods - -- (GestureAreaType)gestureAreaTypeForPoint:(CGPoint)point - containerWidth:(CGFloat)containerWidth { - // 计算区域边界 - CGFloat leftBoundary = containerWidth / 6.0; // 1/6 宽度 - CGFloat rightBoundary = containerWidth * 5.0 / 6.0; // 5/6 宽度 - - if (point.x < leftBoundary) { - return GestureAreaType_Left; - } else if (point.x > rightBoundary) { - return GestureAreaType_Right; - } else { - return GestureAreaType_Center; - } -} - -- (BOOL)shouldGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer - receiveTouchAtPoint:(CGPoint)point - containerWidth:(CGFloat)containerWidth { - - GestureAreaType areaType = [self gestureAreaTypeForPoint:point - containerWidth:containerWidth]; - - if ([gestureRecognizer isKindOfClass:[UISwipeGestureRecognizer class]]) { - // Swipe 手势只在中央区域生效 - BOOL shouldReceive = (areaType == GestureAreaType_Center); - - if (shouldReceive) { - NSLog(@"🎯 GestureOptimizer: Swipe 手势在中央区域生效 - 点: %@", NSStringFromCGPoint(point)); - } - - return shouldReceive; - - } else if ([gestureRecognizer isKindOfClass:[UITapGestureRecognizer class]]) { - // Tap 手势根据容器类型决定区域 - BOOL shouldReceive = NO; - - // 根据手势识别器所在容器的 tag 来判断区域 - if (gestureRecognizer.view.tag == 1001) { // 中央容器 tag 为 1001 - // 中央区域的 tap 手势 - shouldReceive = (areaType == GestureAreaType_Center); - } else if (gestureRecognizer.view.tag == 1002) { // 左侧容器 tag 为 1002 - // 左侧区域的 tap 手势 - shouldReceive = (areaType == GestureAreaType_Left); - } else if (gestureRecognizer.view.tag == 1003) { // 右侧容器 tag 为 1003 - // 右侧区域的 tap 手势 - shouldReceive = (areaType == GestureAreaType_Right); - } - - if (shouldReceive) { - NSLog(@"🎯 GestureOptimizer: Tap 手势在 %@ 区域生效 (容器tag: %ld) - 点: %@", - [self areaTypeString:areaType], (long)gestureRecognizer.view.tag, NSStringFromCGPoint(point)); - } - - return shouldReceive; - } - - return YES; -} - -- (NSDictionary *)getAreaBoundariesForContainerWidth:(CGFloat)containerWidth { - NSString *widthKey = [NSString stringWithFormat:@"%.0f", containerWidth]; - - // 检查缓存 - if (self.boundaryCache[widthKey]) { - return self.boundaryCache[widthKey]; - } - - // 计算边界 - CGFloat leftBoundary = containerWidth / 6.0; - CGFloat rightBoundary = containerWidth * 5.0 / 6.0; - - NSDictionary *boundaries = @{ - @"leftBoundary": @(leftBoundary), - @"rightBoundary": @(rightBoundary), - @"containerWidth": @(containerWidth) - }; - - // 缓存结果 - self.boundaryCache[widthKey] = boundaries; - - NSLog(@"🎯 GestureOptimizer: 计算区域边界 - 宽度: %.0f, 左边界: %.1f, 右边界: %.1f", - containerWidth, leftBoundary, rightBoundary); - - return boundaries; -} - -- (void)debugGestureAreaForPoint:(CGPoint)point - containerWidth:(CGFloat)containerWidth { - GestureAreaType areaType = [self gestureAreaTypeForPoint:point - containerWidth:containerWidth]; - - NSDictionary *boundaries = [self getAreaBoundariesForContainerWidth:containerWidth]; - - NSLog(@"🎯 GestureOptimizer 调试信息:"); - NSLog(@" - 触摸点: %@", NSStringFromCGPoint(point)); - NSLog(@" - 容器宽度: %.0f", containerWidth); - NSLog(@" - 左边界: %.1f", [boundaries[@"leftBoundary"] floatValue]); - NSLog(@" - 右边界: %.1f", [boundaries[@"rightBoundary"] floatValue]); - NSLog(@" - 区域类型: %@", [self areaTypeString:areaType]); -} - -#pragma mark - Private Methods - -- (NSString *)areaTypeString:(GestureAreaType)areaType { - switch (areaType) { - case GestureAreaType_Left: - return @"左侧区域"; - case GestureAreaType_Center: - return @"中央区域"; - case GestureAreaType_Right: - return @"右侧区域"; - default: - return @"未知区域"; - } -} - -- (void)clearCache { - [_boundaryCache removeAllObjects]; - NSLog(@"🎯 GestureOptimizer: 清空边界缓存"); -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationHelper.h b/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationHelper.h deleted file mode 100644 index a661f34..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationHelper.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// GiftAnimationManager.h -// YuMi -// -// Created by P on 2024/12/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface GiftAnimationHelper : NSObject - -/** - * Begins a gift animation from a start point to an end point - * @param giftUrl URL of the gift image to display - * @param startPoint Starting position of the animation - * @param endPoint Ending position of the animation - * @param isGiftCombing Flag to determine if this is a combo animation - */ -- (void)beginGiftAnimation:(NSString *)giftUrl - startPoint:(CGPoint)startPoint - endPoint:(CGPoint)endPoint - isGiftCombing:(BOOL)isGiftCombing - toTargetView:(UIView *)targetView; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationHelper.m b/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationHelper.m deleted file mode 100644 index 47b3598..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationHelper.m +++ /dev/null @@ -1,338 +0,0 @@ -// -// GiftAnimationManager.m -// YuMi -// -// Created by P on 2024/12/9. -// - -#import "GiftAnimationHelper.h" - -// Constants -static const CGFloat kGiftImageSize = 55.0f; -static const CGFloat kStandardAnimationDuration = 3.2f; -static const CGFloat kComboAnimationDuration = 1.0f; -static const CGFloat kCleanupDelay = 0.25f; - -static const CGFloat kComboInitialScale = 0.4f; -static const CGFloat kComboFinalScale = 1.5; //2.0f; -static const CGFloat kComboScaleDuration = 0.1f; -static const CGFloat kComboMoveDuration = 0.5f; -static const CGFloat kComboTotalDuration = 0.6f; - -static const CGFloat kStandardScaleDuration = 0.8f; -static const CGFloat kStandardTotalDuration = 3.2f; -static const CGFloat kStandardSecondPhaseDelay = 0.8f; -static const CGFloat kStandardFinalPhaseDelay = 2.6f; - -@interface GiftAnimationHelper () - -@property (nonatomic, strong) NSMutableSet *giftReuseArray; -@property (nonatomic, strong) NSMutableSet *giftVisibleArray; -@property (nonatomic, strong) UIView *lowLevelView; -@end - -@implementation GiftAnimationHelper - -- (instancetype)init { - if (self = [super init]) { - self.giftReuseArray = [NSMutableSet set]; - self.giftVisibleArray = [NSMutableSet set]; - } - return self; -} - -- (void)beginGiftAnimation:(NSString *)giftUrl - startPoint:(CGPoint)startPoint - endPoint:(CGPoint)endPoint - isGiftCombing:(BOOL)isGiftCombing - toTargetView:(UIView *)targetView { - // Input validation - if ([NSString isEmpty:giftUrl] ){//|| CGPointEqualToPoint(startPoint, endPoint)) { -// NSLog(@"Invalid input parameters for gift animation"); - return; - } - - if (targetView == nil) { - return; - } - - self.lowLevelView = targetView; - - // Get or create gift image view - NetImageView *giftImageView = [self dequeueGiftImageView]; - [self configureGiftImageView:giftImageView - withGiftUrl:giftUrl - startPoint:startPoint]; - - // Add to view hierarchy - [self.lowLevelView addSubview:giftImageView]; - - // Create and apply animation - CGFloat animationDuration = isGiftCombing ? kComboAnimationDuration : kStandardAnimationDuration; - CAAnimationGroup *animationGroup = isGiftCombing ? - [self createGiftComboAnimationStartPoint:startPoint endPoint:endPoint] : - [self createGiftAnimationStartPoint:startPoint endPoint:endPoint]; - - // Ensure correct starting position - giftImageView.layer.position = startPoint; - [giftImageView.layer addAnimation:animationGroup forKey:@"giftDisplayViewAnimation"]; - - // Schedule cleanup - [self performSelector:@selector(animationDidFinish:) - withObject:giftImageView - afterDelay:(animationDuration + kCleanupDelay)]; -} - -- (NetImageView *)dequeueGiftImageView { - NetImageView *giftImageView = [self.giftReuseArray anyObject]; - if (giftImageView) { - [self.giftReuseArray removeObject:giftImageView]; - } else { - giftImageView = [[NetImageView alloc] initWithFrame:CGRectMake(0, 0, kGiftImageSize, kGiftImageSize)]; - [self.giftVisibleArray addObject:giftImageView]; - } - return giftImageView; -} - -- (void)configureGiftImageView:(NetImageView *)giftImageView - withGiftUrl:(NSString *)giftUrl - startPoint:(CGPoint)startPoint { - giftImageView.center = startPoint; - giftImageView.alpha = 1.0; - giftImageView.layer.anchorPoint = CGPointMake(0.5, 0.5); - giftImageView.imageUrl = giftUrl; - giftImageView.hidden = NO; -} - -- (void)animationDidFinish:(NetImageView *)giftImageView { - [giftImageView removeFromSuperview]; - giftImageView.hidden = YES; - [self.giftReuseArray addObject:giftImageView]; -} - -- (CAAnimationGroup *)createGiftComboAnimationStartPoint:(CGPoint)startPoint - endPoint:(CGPoint)endPoint { - // Initial shrink animation - CAKeyframeAnimation *initialScale = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"]; - initialScale.duration = kComboScaleDuration; - initialScale.values = @[@1.0, @(kComboInitialScale)]; - initialScale.repeatCount = 1; - initialScale.calculationMode = kCAAnimationCubic; - initialScale.removedOnCompletion = NO; - initialScale.fillMode = kCAFillModeForwards; - - // Movement animation - CAKeyframeAnimation *movement = [CAKeyframeAnimation animationWithKeyPath:@"position"]; - movement.duration = kComboMoveDuration; - movement.beginTime = kComboScaleDuration; - movement.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - movement.values = @[ - [NSValue valueWithCGPoint:startPoint], - [NSValue valueWithCGPoint:endPoint] - ]; - movement.repeatCount = 1; - movement.removedOnCompletion = NO; - movement.fillMode = kCAFillModeForwards; - - // Growth during movement animation - CAKeyframeAnimation *growthDuringMove = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"]; - growthDuringMove.duration = kComboMoveDuration; - growthDuringMove.beginTime = kComboScaleDuration; - growthDuringMove.values = @[@(kComboInitialScale), @(kComboFinalScale)]; - growthDuringMove.repeatCount = 1; - growthDuringMove.calculationMode = kCAAnimationCubic; - growthDuringMove.removedOnCompletion = NO; - growthDuringMove.fillMode = kCAFillModeForwards; - - // Combine animations - CAAnimationGroup *group = [CAAnimationGroup animation]; - group.duration = kComboTotalDuration; - group.animations = @[initialScale, movement, growthDuringMove]; - group.repeatCount = 1; - group.removedOnCompletion = NO; - group.fillMode = kCAFillModeForwards; - - return group; -} - -/** - * Creates a complex gift animation with multiple phases - * @param startPoint Initial position of the gift - * @param endPoint Final position of the gift - * @return CAAnimationGroup containing multiple scale and position animations - */ -- (CAAnimationGroup *)createGiftAnimationStartPoint:(CGPoint)startPoint - endPoint:(CGPoint)endPoint { - CGPoint centerPoint = CGPointMake(KScreenWidth / 2, KScreenHeight / 2); - - // Initial scale up animation - CAKeyframeAnimation *initialScale = [CAKeyframeAnimation animation]; - initialScale.duration = kStandardScaleDuration; - initialScale.keyPath = @"transform.scale"; -// initialScale.values = @[@1.0, @1.5, @2.0, @1.5]; - initialScale.values = @[@1.0, @1.2, @1.5, @1.2]; - initialScale.repeatCount = 1; - initialScale.calculationMode = kCAAnimationCubic; - initialScale.removedOnCompletion = NO; - initialScale.fillMode = kCAFillModeForwards; - - // Second phase scale animation - CAKeyframeAnimation *secondScale = [CAKeyframeAnimation animation]; - secondScale.duration = kStandardScaleDuration; - secondScale.beginTime = kStandardSecondPhaseDelay; - secondScale.keyPath = @"transform.scale"; -// secondScale.values = @[@1.5, @2.0, @2.5, @3.0]; - secondScale.values = @[@1.2, @1.5, @2.0, @2.5]; - secondScale.repeatCount = 1; - secondScale.calculationMode = kCAAnimationCubic; - secondScale.removedOnCompletion = NO; - secondScale.fillMode = kCAFillModeForwards; - - // Move to center animation - CAKeyframeAnimation *moveToCenter = [CAKeyframeAnimation animation]; - moveToCenter.duration = kStandardScaleDuration; - moveToCenter.beginTime = kStandardSecondPhaseDelay; - moveToCenter.keyPath = @"position"; - moveToCenter.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut]; - moveToCenter.values = @[ - [NSValue valueWithCGPoint:startPoint], - [NSValue valueWithCGPoint:centerPoint] - ]; - moveToCenter.repeatCount = 1; - moveToCenter.removedOnCompletion = NO; - moveToCenter.fillMode = kCAFillModeForwards; - - // Final scale down animation - CAKeyframeAnimation *finalScale = [CAKeyframeAnimation animation]; - finalScale.duration = kStandardScaleDuration; - finalScale.beginTime = kStandardFinalPhaseDelay; - finalScale.keyPath = @"transform.scale"; -// finalScale.values = @[@3.0, @2.5, @2.0, @1.5, @1.0]; - finalScale.values = @[@2.5, @2.0, @1.5, @1.2, @1.0]; - finalScale.repeatCount = 1; - - // Move to final position animation - CAKeyframeAnimation *moveToEnd = [CAKeyframeAnimation animation]; - moveToEnd.duration = kStandardScaleDuration; - moveToEnd.beginTime = kStandardFinalPhaseDelay; - moveToEnd.keyPath = @"position"; - moveToEnd.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut]; - moveToEnd.values = @[ - [NSValue valueWithCGPoint:centerPoint], - [NSValue valueWithCGPoint:endPoint] - ]; - moveToEnd.repeatCount = 1; - - // Combine all animations - CAAnimationGroup *group = [CAAnimationGroup animation]; - group.duration = kStandardTotalDuration; - group.animations = @[initialScale, secondScale, moveToCenter, finalScale, moveToEnd]; - group.repeatCount = 1; - group.removedOnCompletion = NO; - group.fillMode = kCAFillModeForwards; - - return group; -} - -//- (CAAnimationGroup *)createGiftComboAnimationStartPoint:(CGPoint)startPoint -// endPoint:(CGPoint)endPoint { -// // 缩放动画1: 动画开始时缩放至 0.4 -// CAKeyframeAnimation *scaleAnimation1 = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"]; -// scaleAnimation1.duration = 0.1; -// scaleAnimation1.values = @[@1.0, @0.4]; -// scaleAnimation1.repeatCount = 1; -// scaleAnimation1.calculationMode = kCAAnimationCubic; -// scaleAnimation1.removedOnCompletion = NO; -// scaleAnimation1.fillMode = kCAFillModeForwards; -// -// // 位移动画: 0.5秒内从起点移动到目标点 -// CAKeyframeAnimation *positionAnimation = [CAKeyframeAnimation animationWithKeyPath:@"position"]; -// positionAnimation.duration = 0.5; -// positionAnimation.beginTime = 0.1; // 缩放结束后开始位移 -// positionAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; -// positionAnimation.values = @[[NSValue valueWithCGPoint:startPoint], [NSValue valueWithCGPoint:endPoint]]; -// positionAnimation.repeatCount = 1; -// positionAnimation.removedOnCompletion = NO; -// positionAnimation.fillMode = kCAFillModeForwards; -// -// // 缩放动画2: 在位移的过程中逐渐变大到 1.2 -// CAKeyframeAnimation *scaleAnimation2 = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"]; -// scaleAnimation2.duration = 0.5; -// scaleAnimation2.beginTime = 0.1; // 同时与位移动画进行 -// scaleAnimation2.values = @[@0.4, @2]; -// scaleAnimation2.repeatCount = 1; -// scaleAnimation2.calculationMode = kCAAnimationCubic; -// scaleAnimation2.removedOnCompletion = NO; -// scaleAnimation2.fillMode = kCAFillModeForwards; -// -// // 创建动画组 -// CAAnimationGroup *group = [CAAnimationGroup animation]; -// group.duration = 0.6; // 总时间为 0.1 (缩放) + 0.5 (位移与缩放) -// group.animations = @[scaleAnimation1, positionAnimation, scaleAnimation2]; -// group.repeatCount = 1; -// group.removedOnCompletion = NO; -// group.fillMode = kCAFillModeForwards; -// -// return group; -//} -// -///// 图片运动的动画组 -///// @param startPoint 开始的点 -///// @param endPoint 结束的点 -//- (CAAnimationGroup *)createGiftAnimationStartPoint:(CGPoint)startPoint endPoint:(CGPoint)endPoint { -// CGPoint centerPoint = CGPointMake(KScreenWidth / 2, KScreenHeight / 2); -// CAKeyframeAnimation *animation0 = [CAKeyframeAnimation animation]; -// animation0.duration = 0.8; -// animation0.keyPath = @"transform.scale"; -// animation0.values = @[@1.0,@1.5,@2.0,@1.5]; -// animation0.repeatCount = 1; -// animation0.calculationMode = kCAAnimationCubic; -// animation0.removedOnCompletion = NO; -// animation0.fillMode = kCAFillModeForwards; -// -// CAKeyframeAnimation *animation1 = [CAKeyframeAnimation animation]; -// animation1.duration = 0.8; -// animation1.beginTime = 0.8; -// animation1.keyPath = @"transform.scale"; -// animation1.values = @[@1.5,@2.0,@2.5,@3.0]; -// animation1.repeatCount = 1; -// animation1.calculationMode = kCAAnimationCubic; -// animation1.removedOnCompletion = NO; -// animation1.fillMode = kCAFillModeForwards; -// -// CAKeyframeAnimation *animation2 = [CAKeyframeAnimation animation]; -// animation2.duration = 0.8; -// animation2.beginTime = 0.8; -// animation2.keyPath = @"position"; -// animation2.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];; -// animation2.values = @[[NSValue valueWithCGPoint:startPoint],[NSValue valueWithCGPoint:CGPointMake(centerPoint.x ,centerPoint.y)]]; -// animation2.repeatCount = 1; -// animation2.removedOnCompletion = NO; -// animation2.fillMode = kCAFillModeForwards; -// -// CAKeyframeAnimation *animation3 = [CAKeyframeAnimation animation]; -// animation3.duration = 0.8; -// animation3.beginTime = 2.6;//0.8+0.8+1 -// animation3.keyPath = @"transform.scale"; -// animation3.values = @[@3,@2.5,@2,@1.5,@1]; -// animation3.repeatCount = 1; -// -// CAKeyframeAnimation *animation4 = [CAKeyframeAnimation animation]; -// animation4.duration = 0.8; -// animation4.beginTime = 2.6; -// animation4.keyPath = @"position"; -// animation4.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut]; -// animation4.values = @[[NSValue valueWithCGPoint:CGPointMake(centerPoint.x ,centerPoint.y)],[NSValue valueWithCGPoint:endPoint]]; -// animation4.repeatCount = 1; -// -// CAAnimationGroup *group = [CAAnimationGroup animation]; -// group.duration = 3.2; -// group.animations = @[animation0,animation1,animation2, animation3,animation4]; -// group.repeatCount = 1; -// group.removedOnCompletion = NO; -// group.fillMode = kCAFillModeForwards; -// -// return group; -//} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationManager.h b/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationManager.h deleted file mode 100644 index 8fc030c..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationManager.h +++ /dev/null @@ -1,65 +0,0 @@ -// -// GiftAnimationManager.h -// YuMi -// -// Created by P on 2024/12/9. -// - -#import -@class UIView; -@class GiftReceiveInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@protocol GiftAnimationDelegate - -/** - * Returns the animation point for a given user ID in the stage view - * @param uid The user ID to get the animation point for - * @return CGPoint The point in the view's coordinate system where the animation should occur - */ -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid; - -@optional -/** - * Called when a gift animation starts - * @param giftInfo The gift information model - */ -//- (void)didStartGiftAnimation:(GiftInfoModel *)giftInfo; - -/** - * Called when a gift animation completes - * @param giftInfo The gift information model - */ -//- (void)didCompleteGiftAnimation:(GiftInfoModel *)giftInfo; - -/** - * Called when the gift queue becomes empty - */ -- (void)didEmptyGiftQueue; - -@end - -@interface GiftAnimationManager : NSObject -@property (nonatomic, weak) id delegate; -@property (nonatomic, strong) UIView *containerView; - -// Configurable properties -@property (nonatomic, assign) NSTimeInterval animationInterval; -@property (nonatomic, assign) NSTimeInterval comboAnimationDelay; -@property (nonatomic, assign) NSTimeInterval standardAnimationDelay; - -- (instancetype)initWithContainerView:(UIView *)containerView; -- (void)enqueueGift:(GiftReceiveInfoModel *)giftInfo; -- (void)startGiftQueue; -- (void)stopGiftQueue; - -// 🔧 新增：Combo状态管理方法 -- (void)setUserComboState:(BOOL)isCombo forUser:(NSString *)uid; -- (void)clearUserComboState:(NSString *)uid; -- (void)updateUserGiftTime:(NSString *)uid; -- (void)cleanupExpiredStates; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationManager.m b/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationManager.m deleted file mode 100644 index f372891..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/GiftAnimationManager.m +++ /dev/null @@ -1,331 +0,0 @@ -// -// GiftAnimationManager.m -// YuMi -// -// Created by P on 2024/12/9. -// - -#import "GiftAnimationManager.h" - -#import "GiftComboManager.h" -#import "GiftAnimationHelper.h" -#import "GiftReceiveInfoModel.h" - -@interface GiftAnimationManager () - -@property (nonatomic, strong) dispatch_source_t giftTimer; - -@property (nonatomic, strong) dispatch_queue_t queue; -@property (nonatomic, strong) NSMutableArray *giftQueue; - -@property (nonatomic, strong) GiftAnimationHelper *animationHelper; - -// 🔧 新增：Combo状态管理属性 -@property (nonatomic, strong) NSMutableDictionary *userComboStates; -@property (nonatomic, strong) NSMutableDictionary *userLastGiftTime; -@property (nonatomic, assign) NSTimeInterval comboTimeWindow; - -@end - -@implementation GiftAnimationManager - -- (void)dealloc { - if (_queue) { - _queue = NULL; - } - if (_giftTimer) { - dispatch_source_cancel(_giftTimer); - _giftTimer = nil; - } - - // 🔧 新增：清理combo状态管理 - [self cleanupExpiredStates]; - [self.userComboStates removeAllObjects]; - [self.userLastGiftTime removeAllObjects]; -} - -- (instancetype)initWithContainerView:(UIView *)containerView { - self = [super init]; - if (self) { - _containerView = containerView; - _giftQueue = [NSMutableArray array]; - _animationHelper = [[GiftAnimationHelper alloc] init]; - _animationInterval = 0.2; - _comboAnimationDelay = 0.2; - _standardAnimationDelay = 0.3; - _queue = dispatch_queue_create("com.GiftAnimationManager.queue", DISPATCH_QUEUE_SERIAL); - - // 🔧 新增：初始化Combo状态管理属性 - _userComboStates = [NSMutableDictionary dictionary]; - _userLastGiftTime = [NSMutableDictionary dictionary]; - _comboTimeWindow = 2.0; // 2秒combo窗口 - } - return self; -} - -- (void)startGiftQueue { - if (self.giftTimer) { - return; - } - - dispatch_source_t timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, - dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)); - - dispatch_source_set_timer(timer, - DISPATCH_TIME_NOW, - self.animationInterval * NSEC_PER_SEC, - 0.01 * NSEC_PER_SEC); - - @kWeakify(self); - dispatch_source_set_event_handler(timer, ^{ - @kStrongify(self); - [self processNextGift]; - }); - -// dispatch_async(dispatch_get_main_queue(), ^{ -// @kStrongify(self); -// [self processNextGift]; -// }); - - dispatch_resume(timer); - self.giftTimer = timer; -} - -- (void)processNextGift { - dispatch_async(self.queue, ^{ - if (self.giftQueue.count == 0) { - [self stopGiftQueue]; - return; - } - - GiftReceiveInfoModel *giftInfo = self.giftQueue.firstObject; - if (!giftInfo) { - return; - } - - // 检查并修复连击计数 - if (giftInfo.comboCount < 1) { - giftInfo.comboCount = 1; - } - - - // 在同一线程中移除元素 - [self.giftQueue xpSafeRemoveObjectAtIndex:0]; - - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - if (self) { - [self distributeGiftAnimation:giftInfo]; - } else { - } - }); - }); -} - -- (void)distributeGiftAnimation:(GiftReceiveInfoModel *)giftInfo { - - NSArray *targetUids = [self resolveTargetUids:giftInfo]; - - CGPoint startPoint = CGPointZero; - BOOL isComboAnimation = [self shouldUseComboAnimationForSender:giftInfo.uid]; - - if (isComboAnimation) { - startPoint = [self comboAnimationStartPoint]; - } else { - startPoint = [self calculateAnimationPoint:giftInfo.uid isEndPoint:NO]; - } - NSTimeInterval delay = isComboAnimation ? self.comboAnimationDelay : self.standardAnimationDelay; - - for (NSString *targetUid in targetUids) { - CGPoint endPoint = [self calculateAnimationPoint:targetUid isEndPoint:YES]; - [self scheduleAnimationWithDelay:delay - giftInfo:giftInfo.gift - startPoint:startPoint - endPoint:endPoint - isComboAnimation:isComboAnimation]; - } -} - -- (NSArray *)resolveTargetUids:(GiftReceiveInfoModel *)giftInfo { - if (!giftInfo) { - return @[]; - } - - if (giftInfo.isLuckyBagGift) { - return @[giftInfo.targetUid]; - } - - if (giftInfo.targetUids.count > 0) { - return [giftInfo.targetUids valueForKey:@"stringValue"]; - } - - if (giftInfo.targetUsers) { - NSArray *uidDatas = [self ensureArrayContainsOnlyStrings:[giftInfo.targetUsers valueForKeyPath:@"uid"]]; - - return uidDatas;//[giftInfo.targetUsers valueForKeyPath:@"uid"]; - } - - return [NSString isEmpty:giftInfo.targetUid] ? @[] : @[giftInfo.targetUid]; -} - -- (NSArray *)ensureArrayContainsOnlyStrings:(NSArray *)inputArray { - // 用于存放最终结果 - NSMutableArray *resultArray = [NSMutableArray array]; - - for (id item in inputArray) { - if ([item isKindOfClass:[NSString class]]) { - // 如果是 NSString，直接添加到结果数组 - [resultArray addObject:item]; - } else if ([item isKindOfClass:[NSNumber class]]) { - // 如果是 NSNumber，转换为 NSString 后添加 - [resultArray addObject:[item stringValue]]; - } else { - // 对于非 NSString 或 NSNumber 的类型，可以选择忽略或者抛出异常 -// NSLog(@"Warning: Unsupported item type: %@", [item class]); - } - } - - return [resultArray copy]; // 返回不可变数组 -} - -- (CGPoint)calculateAnimationPoint:(NSString *)uid isEndPoint:(BOOL)isEndPoint { - if (uid.length == 0) { - return [self fallbackPointForEndPoint:isEndPoint]; - } - - CGPoint point = [self.delegate animationPointAtStageViewByUid:uid]; - if (!CGPointEqualToPoint(point, CGPointZero)) { - return point; - } - - return [self fallbackPointForEndPoint:isEndPoint]; -} - -- (void)scheduleAnimationWithDelay:(NSTimeInterval)delay - giftInfo:(GiftInfoModel *)giftInfo - startPoint:(CGPoint)startPoint - endPoint:(CGPoint)endPoint - isComboAnimation:(BOOL)isComboAnimation { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delay * NSEC_PER_SEC), - dispatch_get_main_queue(), ^{ - [self.animationHelper beginGiftAnimation:giftInfo.giftUrl - startPoint:startPoint - endPoint:endPoint - isGiftCombing:isComboAnimation - toTargetView:self.containerView]; - }); -} - -- (void)stopGiftQueue { - if (self.giftTimer) { - // 取消定时器 - dispatch_source_cancel(self.giftTimer); - - // 设置取消回调，在资源完全释放后将 timer 置为 nil - dispatch_source_set_cancel_handler(self.giftTimer, ^{ - self.giftTimer = nil; - }); - } -} - -- (void)enqueueGift:(GiftReceiveInfoModel *)giftInfo { - if (!giftInfo) { - return; - } - - - dispatch_async(self.queue, ^{ - [self.giftQueue addObject:giftInfo]; - [self startGiftQueue]; - }); -} - -// Helper methods -- (BOOL)shouldUseComboAnimationForSender:(NSString *)uid { - if (!uid || uid.length == 0) { - return NO; - } - - // 优先使用精确状态判断 - BOOL isUserInCombo = [self.userComboStates[uid] boolValue]; - if (isUserInCombo) { - BOOL isCurrentUser = [uid isEqualToString:[AccountInfoStorage instance].getUid]; - return isCurrentUser; - } - - // 兜底：时间窗口判断 - NSDate *lastGiftTime = self.userLastGiftTime[uid]; - if (lastGiftTime) { - NSTimeInterval timeSinceLastGift = [[NSDate date] timeIntervalSinceDate:lastGiftTime]; - if (timeSinceLastGift <= self.comboTimeWindow) { - BOOL isCurrentUser = [uid isEqualToString:[AccountInfoStorage instance].getUid]; - return isCurrentUser; - } - } - - return NO; -} - -- (CGPoint)fallbackPointForEndPoint:(BOOL)isEndPoint { - CGFloat x = [UIScreen mainScreen].bounds.size.width / 2; - if (isEndPoint) { - x += 30; - } - return CGPointMake(x, 44 + kSafeAreaTopHeight); -} - -- (CGPoint)comboAnimationStartPoint { - CGFloat x = 0; - if (isMSRTL()) { - x = kGetScaleWidth(90); - } else { - x = KScreenWidth - kGetScaleWidth(90); - } - return CGPointMake(x, - KScreenHeight - kSafeAreaBottomHeight - kGetScaleWidth(140)); -} - -// 🔧 新增：Combo状态管理方法实现 - -- (void)setUserComboState:(BOOL)isCombo forUser:(NSString *)uid { - if (!uid || uid.length == 0) { - return; - } - - if (isCombo) { - self.userComboStates[uid] = @(YES); - } else { - [self.userComboStates removeObjectForKey:uid]; - } -} - -- (void)clearUserComboState:(NSString *)uid { - [self setUserComboState:NO forUser:uid]; -} - -- (void)updateUserGiftTime:(NSString *)uid { - if (!uid || uid.length == 0) { - return; - } - - self.userLastGiftTime[uid] = [NSDate date]; -} - -- (void)cleanupExpiredStates { - NSDate *now = [NSDate date]; - NSMutableArray *expiredUsers = [NSMutableArray array]; - - [self.userLastGiftTime enumerateKeysAndObjectsUsingBlock:^(NSString *uid, NSDate *lastTime, BOOL *stop) { - if ([now timeIntervalSinceDate:lastTime] > self.comboTimeWindow * 2) { - [expiredUsers addObject:uid]; - } - }]; - - for (NSString *uid in expiredUsers) { - [self.userLastGiftTime removeObjectForKey:uid]; - [self.userComboStates removeObjectForKey:uid]; - } -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.h b/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.h deleted file mode 100644 index b9824ec..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// LuckyGiftWinningBannerView.h -// YuMi -// -// Created by P on 2024/9/10. -// - -#import - -@class AttachmentModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface LuckyGiftWinningBannerView : UIView - -@property (nonatomic, copy) void(^didTapBanner)(NSInteger roomID); - -+ (void)display:(UIView *)superView - inRoomUid:(NSInteger)roomUid - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete -exitCurrentRoom:(void(^)(void))exit; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m b/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m deleted file mode 100644 index 0a8c512..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m +++ /dev/null @@ -1,417 +0,0 @@ -// -// LuckyGiftWinningBannerView.m -// YuMi -// -// Created by P on 2024/9/10. -// - -#import "LuckyGiftWinningBannerView.h" - -#import - -#import "AttachmentModel.h" -#import "i18nGiftNameMap.h" - -#import "XPRoomViewController.h" -#import "XCCurrentVCStackManager.h" - -// Constants -static const CGFloat kBannerWidth = 346.5f; -static const CGFloat kBannerHeight = 55.0; -static const CGFloat kBannerTopMargin = 0;// 80.0f; -//static const CGFloat kAvatarSize = 43.0f; -//static const CGFloat kAnimationDuration = 0.25f; -//static const CGFloat kDisplayDuration = 2.0f; -//static const CGFloat kRoomTransitionDelay = 2.0f; - -@interface LuckyGiftWinningBannerViewModel : PIBaseModel - -@property (nonatomic, copy, readonly) NSString *times; -@property (nonatomic, copy, readonly) NSString *avatar; -@property (nonatomic, copy, readonly) NSString *coins; -@property (nonatomic, copy, readonly) NSDictionary *giftNameMap; -@property (nonatomic, copy, readonly) NSString *roomUid; -@property (nonatomic, copy, readonly) NSString *giftName; - -@end - -@implementation LuckyGiftWinningBannerViewModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"avatar": @"sender.avatar"}; -} - -- (NSString *)giftName { - if (isMSRTL() && [self.giftNameMap[@"ar"] length]) { - return self.giftNameMap[@"ar"]; - } - if (isMSZH() && [self.giftNameMap[@"zh"] length]) { - return self.giftNameMap[@"zh"]; - } - return self.giftNameMap[@"en"] ?: @""; -} - -@end - -@interface LuckyGiftWinningBannerView () - -@property (nonatomic, strong) LuckyGiftWinningBannerViewModel *model; -@property (nonatomic, strong) UIImageView *backgroundImageView; -@property (nonatomic, strong) UIImageView *ballImageView; -@property (nonatomic, strong) UIImageView *bigBallImageView; -@property (nonatomic, strong) NetImageView *avatarImageView; -@property (nonatomic, strong) UILabel *giftNameLabel; -@property (nonatomic, strong) UILabel *timesLabel; -@property (nonatomic, strong) UILabel *coinsLabel; -@property (nonatomic, assign) NSInteger currentRoomUid; -@property (nonatomic, copy) void(^completeDisplay)(void); -@property (nonatomic, copy) void(^exitCurrentRoom)(void); - -@property (nonatomic, assign) BOOL isAnimationCancelled; - -@end - -@implementation LuckyGiftWinningBannerView - -- (void)dealloc -{ - -} - -+ (void)display:(UIView *)superView - inRoomUid:(NSInteger)roomUid - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete -exitCurrentRoom:(void(^)(void))exit { -#if DEBUG - NSParameterAssert(superView); - NSParameterAssert(attachment); -#else - if (!superView || !attachment) { - if (complete) { - complete(); - } - return; - } -#endif - LuckyGiftWinningBannerViewModel *model = [LuckyGiftWinningBannerViewModel modelWithDictionary:attachment.data]; - - CGFloat width = KScreenWidth;//kGetScaleWidth(kBannerWidth); - CGFloat height = kBannerHeight;// kGetScaleWidth(kBannerHeight); - CGRect frame = CGRectMake(KScreenWidth, kBannerTopMargin, width, height); - - LuckyGiftWinningBannerView *bannerView = [[LuckyGiftWinningBannerView alloc] initWithFrame:frame]; - bannerView.model = model; - bannerView.completeDisplay = complete; - bannerView.exitCurrentRoom = exit; - bannerView.currentRoomUid = roomUid; - [superView addSubview:bannerView]; - - NSInteger time = 3; - - @kWeakify(bannerView); - [bannerView popEnterAnimation:^(BOOL finished) { - @kStrongify(bannerView); - [bannerView addNotification]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(time * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [bannerView popLeaveAnimation:^(bool finished) { - if (bannerView.completeDisplay) { - bannerView.completeDisplay(); - } - [bannerView removeNotification]; - [bannerView removeFromSuperview]; - }]; - }); - }]; -} - -- (void)handleSwipeNotification { - [self dismissBanner]; -} - -- (void)handleTapNotification:(NSNotification *)note { - NSValue *value = note.userInfo[@"point"]; - CGPoint point = [value CGPointValue]; - // 计算中央 2/3 区域 - CGFloat totalW = KScreenWidth; - CGFloat regionW = totalW * 2.0 / 3.0; - CGFloat originX = (totalW - regionW) / 2.0; - - CGRect centerRegion = CGRectMake(originX, - 0, // 高度不做限制就填 0 - regionW, - self.bounds.size.height); - - if (CGRectContainsPoint(centerRegion, point)) { - NSLog(@" Banner tap 点落在中央 2/3 区域"); - [self handelTap]; - } else { - NSLog(@" Banner tap 点不落在中央 2/3 区域"); - // 将 banner 中的点转换为屏幕坐标系 - CGPoint screenPoint = [self convertPoint:point toView:nil]; - - // 发送通知给 FunctionContainer 处理，传递屏幕坐标 - [[NSNotificationCenter defaultCenter] postNotificationName:@"BannerTapToFunctionContainer" - object:nil - userInfo:@{@"point": [NSValue valueWithCGPoint:screenPoint]}]; - } -} - -- (void)addNotification { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleSwipeNotification) - name:@"SwipeOutBanner" - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTapNotification:) - name:@"TapBanner" - object:nil]; -} - -- (void)removeNotification { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (void)dismissBanner { - NSLog(@"🚨 LuckyGiftWinningBannerView dismissBanner 被调用"); - [self pop_removeAllAnimations]; // 停止所有动画 - - [self popLeaveAnimation:^(bool finished) { - NSLog(@"🚨 LuckyGiftWinningBannerView 动画完成，调用回调"); - if (self.completeDisplay) { - self.completeDisplay(); - } else { - NSLog(@"🚨 警告: completeDisplay 回调为空"); - } - [self removeFromSuperview]; - }]; -} - -- (void)popEnterAnimation:(void(^)(BOOL finished))finish { - POPSpringAnimation *enterAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewFrame]; - enterAnimation.toValue = [NSValue valueWithCGRect:CGRectMake((KScreenWidth - kGetScaleWidth(kBannerWidth))/2, 0, kGetScaleWidth(kBannerWidth), kGetScaleWidth(kBannerHeight))]; - enterAnimation.springBounciness = 10; // 弹性系数 - enterAnimation.springSpeed = 12; // 动画速度 - enterAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finish) { - finish(finished); - } - }; - [self pop_addAnimation:enterAnimation forKey:@"enterAnimation"]; -} - -- (void)popLeaveAnimation:(void(^)(bool finished))finish { - POPBasicAnimation *exitAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewFrame]; - exitAnimation.toValue = [NSValue valueWithCGRect:CGRectMake(-KScreenWidth, 0, kGetScaleWidth(kBannerWidth), kGetScaleWidth(kBannerHeight))]; - exitAnimation.duration = 0.25; // 动画持续时间 - exitAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - exitAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finish) { - finish(finished); - } - }; - [self pop_addAnimation:exitAnimation forKey:@"exitAnimation"]; -} - -- (void)setModel:(LuckyGiftWinningBannerViewModel *)model { - _model = model; - self.avatarImageView.imageUrl = model.avatar; - self.giftNameLabel.text = [model giftName]; - self.timesLabel.text = model.times; - self.coinsLabel.text = model.coins; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self setupUI]; - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [self addSubview:b]; - [b mas_remakeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; -// [b addTarget:self action:@selector(handelTap) forControlEvents:UIControlEventTouchUpInside]; - } - return self; -} - -- (void)handelTap { - if (self.model.roomUid.integerValue == self.currentRoomUid) { - return; - } - - // 在弹框显示前保存必要数据，避免依赖banner对象 - NSString *targetRoomUid = self.model.roomUid; - void(^exitCurrentRoomBlock)(void) = self.exitCurrentRoom; - - @kWeakify(self); - [TTPopup alertWithMessage:YMLocalizedString(@"Combo_10") confirmHandler:^{ - @kStrongify(self); - - // 检查banner是否还存在 - if (!self) { - NSLog(@"⚠️ LuckyGiftWinningBannerView: banner已被移除，但弹框回调仍在执行"); - // 即使banner被移除，仍然执行跳转逻辑 - if (exitCurrentRoomBlock) { - exitCurrentRoomBlock(); - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:targetRoomUid - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - return; - } - - // banner还存在，正常执行 - if (self.exitCurrentRoom) { - self.exitCurrentRoom(); - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:targetRoomUid - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } cancelHandler:^{}]; -} - -- (void)setupUI { - [self addSubview:self.backgroundImageView]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.ballImageView]; - [self.ballImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.trailing.mas_equalTo(self).offset(-30); - make.width.height.mas_equalTo(59); - }]; - - [self addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(kGetScaleWidth(36)); - if (iPhoneXSeries) { - make.width.height.mas_equalTo(34); - } else { - make.width.height.mas_equalTo(29); - } - }]; - - UILabel *titleLabel_1 = [UILabel labelInitWithText:YMLocalizedString(@"Combo_0") font:kFontSemibold(14) textColor:[UIColor whiteColor]]; - [self addSubview:titleLabel_1]; - [titleLabel_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView).offset(-3); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(5); - }]; - - [self addSubview:self.giftNameLabel]; - [self.giftNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(titleLabel_1); - make.leading.mas_equalTo(titleLabel_1.mas_trailing).offset(3); - }]; - - UILabel *titleLabel_2 = [UILabel labelInitWithText:YMLocalizedString(@"Combo_4") font:kFontSemibold(14) textColor:[UIColor whiteColor]]; - [self addSubview:titleLabel_2]; - [titleLabel_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.avatarImageView.mas_bottom); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(5); - }]; - - [self addSubview:self.timesLabel]; - [self.timesLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(titleLabel_2); - make.leading.mas_equalTo(titleLabel_2.mas_trailing).offset(3); - }]; - - UILabel *titleLabel_3 = [UILabel labelInitWithText:YMLocalizedString(@"Combo_9") font:kFontSemibold(14) textColor:[UIColor whiteColor]]; - [self addSubview:titleLabel_3]; - [titleLabel_3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.timesLabel); - make.leading.mas_equalTo(self.timesLabel.mas_trailing).offset(3); - }]; - - [self addSubview:self.coinsLabel]; - [self.coinsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.ballImageView); - make.top.mas_equalTo(self).offset(14); - make.height.mas_equalTo(22); - make.width.mas_lessThanOrEqualTo(self.ballImageView).multipliedBy(0.8); - }]; - - UILabel *titleLabel_4 = [UILabel labelInitWithText:YMLocalizedString(@"Combo_5") font:kFontMedium(12) textColor:[UIColor whiteColor]]; - [self addSubview:titleLabel_4]; - [titleLabel_4 mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.coinsLabel); - make.top.mas_equalTo(self.coinsLabel.mas_bottom).offset(-2); - }]; -} - -#pragma mark - -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] initWithImage:[kImage(@"luck_gift_flag") ms_SetImageForRTL]]; - _backgroundImageView.contentMode = UIViewContentModeScaleAspectFit; - _backgroundImageView.alpha = 0.9; - } - return _backgroundImageView; -} - -- (UIImageView *)ballImageView { - if (!_ballImageView) { - _ballImageView = [[UIImageView alloc] initWithImage:kImage(@"luck_gift_flag_ball")]; - _ballImageView.contentMode = UIViewContentModeScaleAspectFill; -// _ballImageView.hidden = YES; - } - return _ballImageView; -} - -- (UIImageView *)bigBallImageView { - if (!_bigBallImageView) { - _bigBallImageView = [[UIImageView alloc] initWithImage:kImage(@"luck_gift_flag_ball_BIG")]; - _bigBallImageView.contentMode = UIViewContentModeScaleAspectFill; - _bigBallImageView.hidden = YES; - } - return _bigBallImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeCornerAvatar; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.backgroundColor = [UIColor clearColor]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - [_avatarImageView setCornerRadius: iPhoneXSeries ? 34/2 : 29/2 - corners:kCALayerMaxXMaxYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMinXMinYCorner - borderWidth:1 - borderColor:[UIColor whiteColor]]; - } - return _avatarImageView; -} - -- (UILabel *)giftNameLabel { - if (!_giftNameLabel) { - _giftNameLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(14) textColor:UIColorFromRGB(0xffe375)]; - } - return _giftNameLabel; -} - -- (UILabel *)coinsLabel { - if (!_coinsLabel) { - _coinsLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(15) textColor:UIColorFromRGB(0xffe375)]; - _coinsLabel.adjustsFontSizeToFitWidth = YES; - _coinsLabel.minimumScaleFactor = 0.5; - _coinsLabel.textAlignment = NSTextAlignmentCenter; - } - return _coinsLabel; -} - -- (UILabel *)timesLabel { - if (!_timesLabel) { - _timesLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(14) textColor:UIColorFromRGB(0xffe375)]; - } - return _timesLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningFlagView.h b/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningFlagView.h deleted file mode 100644 index 0c4745e..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningFlagView.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// LuckyGiftWinningFlagView.h -// YuMi -// -// Created by P on 2024/9/10. -// - -#import -@class AttachmentModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface LuckyGiftWinningFlagView : UIView - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - roomID:(NSInteger)roomID - uID:(NSString *)UID; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningFlagView.m b/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningFlagView.m deleted file mode 100644 index c4d5bde..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningFlagView.m +++ /dev/null @@ -1,212 +0,0 @@ -// -// LuckyGiftWinningFlagView.m -// YuMi -// -// Created by P on 2024/9/10. -// - -#import "LuckyGiftWinningFlagView.h" -#import "AttachmentModel.h" - -@interface LuckyGiftWinningFlagViewModel : PIBaseModel - -@property (nonatomic, assign) NSInteger uid; -@property (nonatomic, assign) NSInteger level; -@property (nonatomic, assign) NSInteger roomId; - -@property (nonatomic, copy) NSString *times; -@property (nonatomic, copy) NSString *coins; -@property (nonatomic, copy) NSString *roomUid; - -@end - - -@implementation LuckyGiftWinningFlagViewModel - -@end - -@interface LuckyGiftWinningFlagView () - -@property (nonatomic, strong) LuckyGiftWinningFlagViewModel *model; - -@property (nonatomic, strong) UILabel *winLabel; -@property (nonatomic, strong) UILabel *winPriceLabel; -@property (nonatomic, strong) UILabel *winTimesLabel; - -@property (nonatomic, strong) UIImageView *coinIcon; -@property (nonatomic, strong) UIImageView *backgroundImageView; - -@end - -@implementation LuckyGiftWinningFlagView - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - roomID:(NSInteger)roomID - uID:(NSString *)UID -{ - LuckyGiftWinningFlagViewModel *model = [LuckyGiftWinningFlagViewModel modelWithDictionary:attachment.data]; - if (model.roomId != roomID || model.uid != UID.integerValue) { - return; - } - - LuckyGiftWinningFlagView *winningFlagView = [[LuckyGiftWinningFlagView alloc] init]; - winningFlagView.model = model; - winningFlagView.alpha = 0; - winningFlagView.frame = CGRectMake(0, 0, kGetScaleWidth(162), kGetScaleWidth(162)); - - // 🔧 修复：重新计算位置，确保视图在屏幕可见范围内 - CGFloat viewWidth = kGetScaleWidth(162); - CGFloat viewHeight = kGetScaleWidth(162); - CGFloat screenWidth = KScreenWidth; - CGFloat screenHeight = KScreenHeight; - - // 计算安全的 Y 位置：屏幕高度的 35% 位置 - CGFloat safeY = screenHeight * 0.35; - - // 确保视图不会超出屏幕边界 - CGFloat maxY = screenHeight - viewHeight/2 - 20; // 留20点边距 - CGFloat minY = viewHeight/2 + 20; // 留20点边距 - CGFloat finalY = MAX(minY, MIN(safeY, maxY)); - - winningFlagView.center = CGPointMake(screenWidth/2, finalY); - winningFlagView.transform = CGAffineTransformMakeScale(0.1, 0.1); - - NSLog(@"🎯 LuckyGiftWinningFlagView: 位置计算 - screenSize: %.0fx%.0f, viewSize: %.0fx%.0f, center: (%.0f, %.0f)", - screenWidth, screenHeight, viewWidth, viewHeight, winningFlagView.center.x, winningFlagView.center.y); - - [superView addSubview:winningFlagView]; - - // 使用弹簧动画执行放大动画，alpha从0变为1，带有弹性效果 - [UIView animateWithDuration:0.8 - delay:0 - usingSpringWithDamping:0.3 // 弹性系数，数值越小弹性越强 - initialSpringVelocity:0.5 // 初始速度 - options:UIViewAnimationOptionCurveEaseInOut - animations:^{ - winningFlagView.alpha = 1.0; - winningFlagView.transform = CGAffineTransformMakeScale(1.0, 1.0); // 还原为正常大小 - } completion:^(BOOL finished) { - // 动画完成后，等待2秒再执行反向动画 - [UIView animateWithDuration:0.5 - delay:2.0 // 延迟2秒执行反向动画 - options:UIViewAnimationOptionCurveEaseInOut - animations:^{ - winningFlagView.alpha = 0.0; - winningFlagView.transform = CGAffineTransformMakeScale(0.1, 0.1); // 缩小回原始大小 - } completion:^(BOOL finished) { - // 动画完成后移除 view - [winningFlagView removeFromSuperview]; - }]; - }]; -} - -- (instancetype)init -{ - self = [super init]; - if (self) { - [self setupUI]; - } - return self; -} - -- (void)setupUI { - [self addSubview:self.backgroundImageView]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.winLabel]; - [self.winLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(kGetScaleWidth(40)); - }]; - - UIStackView *stackView = [[UIStackView alloc] init]; - stackView.spacing = 6; - [self addSubview:stackView]; - [stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backgroundImageView); - make.width.mas_lessThanOrEqualTo(self.backgroundImageView); -// make.leading.trailing.mas_equalTo(self.backgroundImageView).inset(4); - make.top.mas_equalTo(self.winLabel.mas_bottom).offset(11); - make.height.mas_equalTo(35); - }]; - - [stackView addArrangedSubview:self.coinIcon]; - [stackView addArrangedSubview:self.winPriceLabel]; - - UIStackView *stackView_2 = [[UIStackView alloc] init]; - stackView_2.spacing = 4; - [self addSubview:stackView_2]; - [stackView_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backgroundImageView); - make.width.mas_lessThanOrEqualTo(self.backgroundImageView); -// make.leading.trailing.mas_equalTo(self.backgroundImageView).inset(4); - make.top.mas_equalTo(stackView.mas_bottom).offset(11); - make.height.mas_equalTo(17); - }]; - - UILabel *titleLeft = [UILabel labelInitWithText:YMLocalizedString(@"Combo_4") font:kFontRegular(12) textColor:[UIColor whiteColor]]; - UILabel *titleRight = [UILabel labelInitWithText:YMLocalizedString(@"Combo_9") font:kFontRegular(12) textColor:[UIColor whiteColor]]; - - [stackView_2 addArrangedSubview:titleLeft]; - [stackView_2 addArrangedSubview:self.winTimesLabel]; - [stackView_2 addArrangedSubview:titleRight]; -} - -- (void)setModel:(LuckyGiftWinningFlagViewModel *)model { - _model = model; - self.winPriceLabel.text = model.coins; - self.winTimesLabel.text = model.times; - self.backgroundImageView.image = model.level == 1 ? kImage(@"luck_gift_gold") : kImage(@"luck_gift_pruple"); - - [[NSNotificationCenter defaultCenter] postNotificationName:@"receiveLuckGiftWinning" object:model.coins]; -} - -#pragma mark - -- (UIImageView *)coinIcon { - if (!_coinIcon) { - _coinIcon = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - _coinIcon.contentMode = UIViewContentModeScaleAspectFit; - } - return _coinIcon; -} - -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] initWithImage:kImage(@"luck_gift_gold")]; - _backgroundImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _backgroundImageView; -} - -- (UILabel *)winLabel { - if (!_winLabel) { - _winLabel = [UILabel labelInitWithText:YMLocalizedString(@"Combo_4") font:kFontSemibold(14) textColor:UIColorFromRGB(0xffe375)]; - _winLabel.textAlignment = NSTextAlignmentCenter; - } - return _winLabel; -} - -- (UILabel *)winPriceLabel { - if (!_winPriceLabel) { - _winPriceLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(26) textColor:UIColorFromRGB(0xffe375)]; - _winPriceLabel.adjustsFontSizeToFitWidth = YES; - _winPriceLabel.minimumScaleFactor = 0.5f; - } - return _winPriceLabel; -} - -- (UILabel *)winTimesLabel { - if (!_winTimesLabel) { - _winTimesLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(14) textColor:UIColorFromRGB(0xffe375)]; - _winTimesLabel.adjustsFontSizeToFitWidth = YES; - _winTimesLabel.minimumScaleFactor = 0.5f; - } - return _winTimesLabel; -} - - - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/PIBaseAnimationViewModel.h b/YuMi/Modules/YMRoom/View/AnimationView/Model/PIBaseAnimationViewModel.h deleted file mode 100644 index 849724c..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/PIBaseAnimationViewModel.h +++ /dev/null @@ -1,53 +0,0 @@ -// -// PIBaseAnimationViewModel.h -// YuMi -// -// Created by duoban on 2023/7/11. -// - -#import -typedef enum : NSUInteger { - GiftBannerType_Lucky,///福袋 - GiftBannerType_Love,///寻爱之旅 - GiftBannerType_Nobleman,///VIP - GiftBannerType_kitchen,///厨房 - GiftBannerType_AnchorHour,///个播小时榜 - GiftBannerType_LicneseHour,///牌照房小时榜 - GiftBannerType_Fairy,///夺宝精灵 - GiftBannerType_Tarrow,//塔罗 - GiftBannerType_Common_H5,//通用h5 - GiftBannerType_Magic_House,//魔法屋 - GiftBannerType_General_Floating_Screen,///通用飘屏 -} GiftBannerType; -NS_ASSUME_NONNULL_BEGIN - -@interface PIBaseAnimationViewModel : PIBaseModel -@property (nonatomic,assign) int first; -@property (nonatomic,assign) int second; - -@property(nonatomic, copy)NSString *nick; -@property(nonatomic, copy)NSString *giftName; -@property(nonatomic, copy) NSString *giftNum; -@property (nonatomic,copy) NSString *luckyBagName; -@property (nonatomic,copy) NSString *roomTitle; -@property (nonatomic,assign) NSInteger uid; -@property (nonatomic,copy) NSString *roomUid; -@property (nonatomic,copy) NSString *goldPrice; -@property (nonatomic,assign) BOOL isInRoomVisable; -@property(nonatomic,assign) GiftBannerType type; -@property (nonatomic,copy) NSDictionary *data; - -@property (nonatomic,copy) NSString *skipUrl; -@property (nonatomic,copy) NSString *itemId; -@property (nonatomic,copy) NSString *itemMultiple; -@property (nonatomic,copy) NSString *diamonds; -@property (nonatomic,copy) NSString * bannerId; -@property(nonatomic,copy) NSString *drawGoldNum; -@property(nonatomic,copy) NSString *content; -///福袋图片 -@property(nonatomic,copy) NSString *luckyBagGiftPic; -///礼物图片 -@property(nonatomic,copy) NSString *giftPic; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/PIBaseAnimationViewModel.m b/YuMi/Modules/YMRoom/View/AnimationView/Model/PIBaseAnimationViewModel.m deleted file mode 100644 index 069cd6a..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/PIBaseAnimationViewModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// PIBaseAnimationViewModel.m -// YuMi -// -// Created by duoban on 2023/7/11. -// - -#import "PIBaseAnimationViewModel.h" - -@implementation PIBaseAnimationViewModel - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/PIUniversalBannerModel.h b/YuMi/Modules/YMRoom/View/AnimationView/Model/PIUniversalBannerModel.h deleted file mode 100644 index 0359b8c..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/PIUniversalBannerModel.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// PIUniversalBannerModel.h -// YuMi -// -// Created by duoban on 2024/3/19. -// - -#import -#import -NS_ASSUME_NONNULL_BEGIN - - - - -@class PIUniversalBannerItemModel; -@interface PIUniversalBannerModel : NSObject -@property(nonatomic,copy) NSDictionary *template; -@property(nonatomic,copy) NSString *textColor; -@property(nonatomic,assign) CGFloat fontSize; -@property(nonatomic,copy) NSString *resourceType; -@property(nonatomic,copy) NSString *resourceContent; -@property(nonatomic,assign) int skipType; -@property(nonatomic,copy) NSString *skipContent; // 当 skip 为 7 时，skipContent 内容为游戏 id -@property(nonatomic,copy) NSString *svgaTextKey; -@property(nonatomic,copy) NSArray *contents; -@property(nonatomic,assign) CGFloat resourceWidth; -@property(nonatomic,assign) CGFloat resourceHeight; -@property(nonatomic,strong) SVGAVideoEntity *videoItem; -@property(nonatomic,strong) UIImage *image; -@property(nonatomic,assign) CGFloat resourceTop; -@property (nonatomic, assign) NSInteger partitionId; -@end - - - -@interface PIUniversalBannerItemModel : NSObject -@property(nonatomic,copy) NSString *type; -@property(nonatomic,copy) NSString *textColor; -@property(nonatomic,copy) NSString *key; -@property(nonatomic,copy) NSDictionary *text; -@property(nonatomic,assign) int skipType; -@property(nonatomic,copy) NSString *skipContent; -@property (nonatomic, assign) NSInteger height; -@property (nonatomic, assign) NSInteger width; -@property (nonatomic, copy) NSString *image; -@end -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/PIUniversalBannerModel.m b/YuMi/Modules/YMRoom/View/AnimationView/Model/PIUniversalBannerModel.m deleted file mode 100644 index f88bcfc..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/PIUniversalBannerModel.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// PIUniversalBannerModel.m -// YuMi -// -// Created by duoban on 2024/3/19. -// - -#import "PIUniversalBannerModel.h" - -@implementation PIUniversalBannerModel -+ (NSDictionary *)objectClassInArray { - return @{@"contents":PIUniversalBannerItemModel.class}; -} -@end -@implementation PIUniversalBannerItemModel - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/RoomHalfHourRankModel.h b/YuMi/Modules/YMRoom/View/AnimationView/Model/RoomHalfHourRankModel.h deleted file mode 100644 index a0d291c..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/RoomHalfHourRankModel.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// RoomHalfHourRankModel.h -// YUMI -// -// Created by YUMI on 2022/6/7. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomHalfHourRankModel : PIBaseModel -///个播房字段 -///用户uid -@property (nonatomic,copy) NSString *uid; -///昵称 -@property (nonatomic,copy) NSString *nick; -///头像 -@property (nonatomic,copy) NSString *avatar; -///描述 -@property (nonatomic,copy) NSString *desc; - -///牌照房中显示 -@property (nonatomic,copy) NSString *title; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/RoomHalfHourRankModel.m b/YuMi/Modules/YMRoom/View/AnimationView/Model/RoomHalfHourRankModel.m deleted file mode 100644 index b98f7d9..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/RoomHalfHourRankModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RoomHalfHourRankModel.m -// YUMI -// -// Created by YUMI on 2022/6/7. -// - -#import "RoomHalfHourRankModel.h" - -@implementation RoomHalfHourRankModel - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBannerUserInfoModel.h b/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBannerUserInfoModel.h deleted file mode 100644 index 2a31728..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBannerUserInfoModel.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMGiftBannerUserInfoModel.h -// YUMI -// -// Created by YUMI on 2021/11/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGiftBannerUserInfoModel : PIBaseModel -/// -@property (nonatomic,assign) int position; -/// -@property (nonatomic,assign) NSInteger uid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBannerUserInfoModel.m b/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBannerUserInfoModel.m deleted file mode 100644 index b58d9cd..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBannerUserInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMGiftBannerUserInfoModel.m -// YUMI -// -// Created by YUMI on 2021/11/18. -// - -#import "XPGiftBannerUserInfoModel.h" - -@implementation XPGiftBannerUserInfoModel - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBigPrizeModel.h b/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBigPrizeModel.h deleted file mode 100644 index b52e0c5..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBigPrizeModel.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMGiftBigPrizeModel.h -// YUMI -// -// Created by YUMI on 2021/11/18. -// -///四级礼物的模型 -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGiftBigPrizeModel : PIBaseModel -///送礼物的人 -@property(nonatomic, copy)NSString *nick; -///礼物的名称 -@property(nonatomic, copy)NSString *giftName; -///幸运的礼物 -@property (nonatomic,copy) NSString *luckyBagName; -///房间名称 -@property (nonatomic,copy) NSString *roomTitle; -///yoghurtuid -@property (nonatomic,copy) NSString *uid; -///房主的uid -@property (nonatomic,copy) NSString *roomUid; -///礼物的价值 -@property (nonatomic,copy) NSString *goldPrice; -///是否仅自己房间可见 -@property (nonatomic,assign) BOOL isInRoomVisiable; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBigPrizeModel.m b/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBigPrizeModel.m deleted file mode 100644 index 4af4356..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftBigPrizeModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMGiftBigPrizeModel.m -// YUMI -// -// Created by YUMI on 2021/11/18. -// - -#import "XPGiftBigPrizeModel.h" - -@implementation XPGiftBigPrizeModel - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftCompoundModel.h b/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftCompoundModel.h deleted file mode 100644 index 28c857e..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftCompoundModel.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMGiftCompoundModel.h -// YUMI -// -// Created by YUMI on 2022/8/5. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGiftCompoundModel : PIBaseModel - -///昵称 -@property(nonatomic, copy)NSString *nick; -///礼物的名称 -@property(nonatomic, copy)NSString *giftName; -///礼物id -@property (nonatomic,copy) NSString *giftId; -///用户uid -@property (nonatomic,copy) NSString *uid; -///消息 -@property (nonatomic,copy) NSString *msg; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftCompoundModel.m b/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftCompoundModel.m deleted file mode 100644 index a5438da..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPGiftCompoundModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMGiftCompoundModel.m -// YUMI -// -// Created by YUMI on 2022/8/5. -// - -#import "XPGiftCompoundModel.h" - -@implementation XPGiftCompoundModel - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.h b/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.h deleted file mode 100644 index 35d5696..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// PIRoomGiftBroadcastWindow.h -// YuMi -// -// Created by duoban on 2023/10/23. -// - -#import - -@protocol PIRoomGiftBroadcastWindowDelegate - --(void)confirmLeaveForTheRoom:(NSString *_Nonnull)roomUid; - -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomGiftBroadcastWindow : UIView -@property(nonatomic,assign) BOOL isLuck;///是否是福袋 -@property(nonatomic,copy) NSString *roomName; -@property(nonatomic,copy) NSString *roodUid; -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.m b/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.m deleted file mode 100644 index cbc49c9..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.m +++ /dev/null @@ -1,199 +0,0 @@ -// -// PIRoomGiftBroadcastWindow.m -// YuMi -// -// Created by duoban on 2023/10/23. -// - -#import "PIRoomGiftBroadcastWindow.h" -@interface PIRoomGiftBroadcastWindow () -///背景 -@property(nonatomic,strong) UIView *bgView; -///标题 -@property(nonatomic,strong) UILabel *titleView; -///提示 -@property(nonatomic,strong) UILabel *pi_tipsView; -///房间名 -@property(nonatomic,strong) UILabel *roomNameView; -///选中 -@property(nonatomic,strong) UIButton *pi_selectView; -///选中提示 -@property(nonatomic,strong) UILabel *pi_selectTipsView; -///取消 -@property(nonatomic,strong) UIButton *pi_cancelBtn; -///确认 -@property(nonatomic,strong) UIButton *pi_confirmBtn; -@end -@implementation PIRoomGiftBroadcastWindow - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.pi_tipsView]; - [self.bgView addSubview:self.roomNameView]; - [self.bgView addSubview:self.pi_selectView]; - [self.bgView addSubview:self.pi_selectTipsView]; - [self.bgView addSubview:self.pi_cancelBtn]; - [self.bgView addSubview:self.pi_confirmBtn]; -} --(void)installConstraints{ - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(319)); - make.height.mas_equalTo(kGetScaleWidth(230)); - make.center.equalTo(self); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(24)); - make.centerX.equalTo(self.bgView); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.pi_tipsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(68)); - make.centerX.equalTo(self.bgView); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.roomNameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(90)); - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(10)); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.pi_selectTipsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.bgView.mas_centerX).mas_equalTo(kGetScaleWidth(9)); - make.top.mas_equalTo(kGetScaleWidth(124)); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.pi_selectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(14)); - make.trailing.equalTo(self.pi_selectTipsView.mas_leading).mas_offset(-kGetScaleWidth(4)); - make.centerY.equalTo(self.pi_selectTipsView); - }]; - - [self.pi_cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(124)); - make.height.mas_equalTo(kGetScaleWidth(42)); - make.top.mas_equalTo(kGetScaleWidth(164)); - make.leading.mas_equalTo(kGetScaleWidth(28)); - }]; - [self.pi_confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(124)); - make.height.mas_equalTo(kGetScaleWidth(42)); - make.top.mas_equalTo(kGetScaleWidth(164)); - make.trailing.mas_equalTo(-kGetScaleWidth(28)); - }]; - -} --(void)pi_cancelAction{ - [self removeFromSuperview]; -} --(void)selectAction:(UIButton *)sender{ - sender.selected = !sender.selected; - - if(self.isLuck == YES){ - if(sender.selected == YES){ - [[NSUserDefaults standardUserDefaults]setValue:@(YES) forKey:@"kSaveLuckSelectState"]; - [[NSUserDefaults standardUserDefaults]synchronize]; - }else{ - [[NSUserDefaults standardUserDefaults]removeObjectForKey:@"kSaveLuckSelectState"]; - } - return; - } - if(sender.selected == YES){ - [[NSUserDefaults standardUserDefaults]setValue:@(YES) forKey:@"kSaveBrooadcastSelectState"]; - [[NSUserDefaults standardUserDefaults]synchronize]; - }else{ - [[NSUserDefaults standardUserDefaults]removeObjectForKey:@"kSaveBrooadcastSelectState"]; - } -} -- (void)setRoomName:(NSString *)roomName{ - _roomName = roomName; - self.roomNameView.text = [NSString stringWithFormat:@"“%@”",_roomName]; -} --(void)piConfirmAction{ - [self removeFromSuperview]; - if(self.delegate && [self.delegate respondsToSelector:@selector(confirmLeaveForTheRoom:)]){ - [self.delegate confirmLeaveForTheRoom:self.roodUid]; - } -} -#pragma mark - 懒加载 -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(20) rightTopCorner:kGetScaleWidth(20) bottomLeftCorner:kGetScaleWidth(20) bottomRightCorner:kGetScaleWidth(20) size:CGSizeMake(kGetScaleWidth(319), kGetScaleWidth(230))]; - } - return _bgView; -} -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"PIRoomGiftBroadcastWindow0") font:kFontSemibold(18) textColor:UIColorFromRGB(0x1F1B4F)]; - _titleView.textAlignment = NSTextAlignmentCenter; - } - return _titleView; -} -- (UILabel *)pi_tipsView{ - if(!_pi_tipsView){ - _pi_tipsView = [UILabel labelInitWithText:YMLocalizedString(@"PIRoomGiftBroadcastWindow1") font:kFontRegular(14) textColor:UIColorFromRGB(0x1F1B4F)]; - _pi_tipsView.textAlignment = NSTextAlignmentCenter; - } - return _pi_tipsView; -} -- (UILabel *)roomNameView{ - if(!_roomNameView){ - _roomNameView = [UILabel labelInitWithText:YMLocalizedString(@"") font:kFontRegular(14) textColor:UIColorFromRGB(0x9168FA)]; - _roomNameView.textAlignment = NSTextAlignmentCenter; - } - return _roomNameView; -} -- (UIButton *)pi_selectView{ - if(!_pi_selectView){ - _pi_selectView = [UIButton new]; - [_pi_selectView setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_pi_selectView setImage:kImage(@"pi_room_gift_broadcast_window_select") forState:UIControlStateSelected]; - [_pi_selectView setImage:kImage(@"pi_room_gift_broadcast_window_no_select") forState:UIControlStateNormal]; - [_pi_selectView addTarget:self action:@selector(selectAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _pi_selectView; -} -- (UILabel *)pi_selectTipsView{ - if(!_pi_selectTipsView){ - _pi_selectTipsView = [UILabel labelInitWithText:YMLocalizedString(@"PIRoomGiftBroadcastWindow2") font:kFontRegular(12) textColor:UIColorFromRGB(0xB3B3C3)]; - } - return _pi_selectTipsView; -} -- (UIButton *)pi_cancelBtn{ - if(!_pi_cancelBtn){ - _pi_cancelBtn = [UIButton new]; - _pi_cancelBtn.backgroundColor = UIColorFromRGB(0xE6E6F0); - [_pi_cancelBtn setTitle:YMLocalizedString(@"PIRoomGiftBroadcastWindow3") forState:UIControlStateNormal]; - _pi_cancelBtn.titleLabel.font = kFontMedium(16); - [_pi_cancelBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _pi_cancelBtn.layer.cornerRadius = kGetScaleWidth(42)/2; - _pi_cancelBtn.layer.masksToBounds = YES; - [_pi_cancelBtn addTarget:self action:@selector(pi_cancelAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _pi_cancelBtn; -} -- (UIButton *)pi_confirmBtn{ - if(!_pi_confirmBtn){ - _pi_confirmBtn = [UIButton new]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(124), kGetScaleWidth(42))]; - [_pi_confirmBtn setBackgroundImage:image forState:UIControlStateNormal]; - [_pi_confirmBtn setTitle:YMLocalizedString(@"PIRoomGiftBroadcastWindow4") forState:UIControlStateNormal]; - _pi_confirmBtn.titleLabel.font = kFontMedium(16); - [_pi_confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _pi_confirmBtn.layer.cornerRadius = kGetScaleWidth(42)/2; - _pi_confirmBtn.layer.masksToBounds = YES; - [_pi_confirmBtn addTarget:self action:@selector(piConfirmAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _pi_confirmBtn; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.h b/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.h deleted file mode 100644 index 9cfc976..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// PIUniversalBannerView.h -// YuMi -// -// Created by duoban on 2024/3/19. -// - -#import -#import "PIUniversalBannerModel.h" - -NS_ASSUME_NONNULL_BEGIN -@class PIUniversalBannerView; -@protocol PIUniversalBannerViewDelegate - -- (void)pIUniversalBannerView:(PIUniversalBannerView *)view didClick:(PIUniversalBannerModel *)model; - -@end - -@interface PIUniversalBannerView : UIView -@property (nonatomic,assign) BOOL isSvga; -@property (nonatomic,strong) PIUniversalBannerModel *model; -@property (nonatomic, copy) void(^allowToPlay)(void); -@property (nonatomic,weak) id delegate; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m b/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m deleted file mode 100644 index f2cde6b..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m +++ /dev/null @@ -1,185 +0,0 @@ -// -// PIUniversalBannerView.m -// YuMi -// -// Created by duoban on 2024/3/19. -// -#import -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "PIUniversalBannerView.h" -#import -#import "DJDKMIMOMColor.h" -#import "YuMi-swift.h" -@interface PIUniversalBannerView() -@property (strong, nonatomic) SVGAParser *parser; -@property (nonatomic,strong) SVGAImageView *svgaView; -@property (nonatomic,strong) UIImageView *bgImageView; -@property(nonatomic, strong) NetImageView *imageView; -@property (nonatomic,strong) UILabel *titleView; -@property (nonatomic,strong) UIButton *clickBtn; -@property(nonatomic,strong) SVGAVideoEntity *videoItem; - -@end -@implementation PIUniversalBannerView - - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self addSubview:self.svgaView]; - [self addSubview:self.titleView]; - [self addSubview:self.clickBtn]; - -} -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.svgaView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerX.bottom.equalTo(self); - make.width.height.mas_equalTo(kGetScaleWidth(255)); - }]; - - [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - -} --(void)setModel:(PIUniversalBannerModel *)model{ - _model = model; - NSDictionary *textDic = model.template; - if(textDic.allKeys.count == 0)return ; - NSString *key = [NSBundle uploadLanguageText]; - NSString *title = textDic[key] == nil ? textDic[textDic.allKeys.firstObject] : textDic[key]; - if(title.length == 0)return; - [title stringByReplacingOccurrencesOfString:@"\n" withString:@""]; - if (_model.fontSize <= 0){ - _model.fontSize = 12; - } - CGFloat font = _model.fontSize; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:kFontRegular(font), NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:_model.textColor]}]; - - dispatch_group_t g = dispatch_group_create(); - @kWeakify(self); - dispatch_async(dispatch_get_global_queue(0, 0), ^{ - for (PIUniversalBannerItemModel *model in self.model.contents) { - if([model.type isEqualToString:@"TEXT"]){ - dispatch_group_enter(g); - NSDictionary *subTextDic = model.text; - if(subTextDic.allKeys.count > 0){ - NSString *subText = subTextDic[key] == nil ? subTextDic[subTextDic.allKeys.firstObject] : subTextDic[key]; - NSAttributedString *attText = [[NSAttributedString alloc]initWithString:subText attributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:model.textColor],NSFontAttributeName:[UIFont systemFontOfSize:font]}]; - if ([attribute.string containsString:[NSString stringWithFormat:@"{%@}",model.key]]){ - [attribute replaceCharactersInRange:[attribute.string rangeOfString:[NSString stringWithFormat:@"{%@}",model.key]] withAttributedString:attText]; - } - } - dispatch_group_leave(g); - }else if ([model.type isEqualToString:@"IMAGE"]) { - if (![NSString isEmpty:model.key] || - ![NSString isEmpty:model.image]) { - dispatch_group_enter(g); - [[[NSURLSession sharedSession] dataTaskWithURL:[NSURL URLWithString:model.image] completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) { - if (error == nil && data != nil) { - UIImage *image = [UIImage imageWithData:data]; - if (image != nil) { - if ([attribute.string containsString:[NSString stringWithFormat:@"{%@}",model.key]]){ - NSTextAttachment *attachment = [[NSTextAttachment alloc] init]; - - attachment.image = [image setCornerWithRadius:model.height/2 andSize:CGSizeMake(model.width, model.height)]; - attachment.bounds = CGRectMake(0, -model.height/3, model.width, model.height); - NSAttributedString *attImage = [NSAttributedString attributedStringWithAttachment:attachment]; - [attribute replaceCharactersInRange:[attribute.string rangeOfString:[NSString stringWithFormat:@"{%@}",model.key]] withAttributedString:attImage]; - } - } - } - dispatch_group_leave(g); - }] resume]; - } - } - } - - dispatch_group_notify(g, dispatch_get_main_queue(), ^{ - @kStrongify(self); - if(self.isSvga == YES){ - self.bgImageView.hidden = YES; - self.svgaView.hidden = NO; - self.titleView.hidden = NO; - self.svgaView.loops = 1; - self.titleView.attributedText = attribute; - self.svgaView.clearsAfterStop = NO; - self.svgaView.videoItem = self.model.videoItem; - [self.svgaView startAnimation]; - }else{ - self.bgImageView.hidden = NO; - self.bgImageView.image = self.model.image; - self.titleView.hidden = NO; - self.svgaView.hidden = YES; - self.titleView.attributedText = attribute; - } - - if (self.allowToPlay) { - self.allowToPlay(); - } - }); - }); -} - --(void)clickAction{ - if(self.delegate && - [self.delegate respondsToSelector:@selector(pIUniversalBannerView:didClick:)]){ - [self.delegate pIUniversalBannerView:self didClick:self.model]; - } -} -#pragma mark -懒加载 -- (UIImageView *)bgImageView{ - if (!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} --(UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel new]; - _titleView.textAlignment = NSTextAlignmentCenter; - _titleView.numberOfLines = 0; - } - return _titleView; -} -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} -- (SVGAImageView *)svgaView { - if (!_svgaView) { - _svgaView= [[SVGAImageView alloc]init]; - _svgaView.backgroundColor = [UIColor clearColor]; - _svgaView.userInteractionEnabled = YES; - } - return _svgaView; -} --(UIButton *)clickBtn{ - if (!_clickBtn){ - _clickBtn = [UIButton new]; - [_clickBtn addTarget:self action:@selector(clickAction) forControlEvents:UIControlEventTouchUpInside]; - - } - return _clickBtn; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.h b/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.h deleted file mode 100644 index ca8f4c9..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// RoomAnimationView.h -// YuMi -// -// Created by P on 2025/1/13. -// - -#import -#import "XPRoomAnimationHitView.h" -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" - -// Banner区域枚举 -typedef NS_ENUM(NSInteger, BannerZone) { - BannerZoneNone = 0, // 无效区域 - BannerZoneCenter, // 中央区域（滑动手势） - BannerZoneLeft, // 左侧区域（点击透传） - BannerZoneRight // 右侧区域（点击透传） -}; - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomAnimationView : XPRoomAnimationHitView - -- (instancetype)initWithHostDelegate:(id)hDelegate; -- (void)resumeTimer; -- (void)removeItSelf; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m deleted file mode 100644 index a3e4828..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m +++ /dev/null @@ -1,4476 +0,0 @@ -// -// RoomAnimationView.m -// YuMi -// -// Created by P on 2025/1/13. -// - -//banner 手势处理会有遮挡其他视图操作的问题 - -#import "RoomAnimationView.h" - -#import -#import -#import -#import -#import -#import -#import - -#import "UIView+VAP.h" - -#import "ClientConfig.h" -#import "XPGiftStorage.h" -#import "UserInfoModel.h" -#import "RoomInfoModel.h" -#import "MicroQueueModel.h" -#import "AttachmentModel.h" -#import "QGVAPConfigModel.h" -#import "ActivityInfoModel.h" -#import "GiftReceiveInfoModel.h" -#import "XPRoomEnterHideTipView.h" -#import "XPMessageRemoteExtModel.h" -#import "PIBaseAnimationViewModel.h" -#import "XPRoomGiftAnimationParser.h" - -#import "GiftComboManager.h" -#import "GiftAnimationManager.h" -#import "BannerScheduler.h" -#import "TouchAreaCacheManager.h" -#import "GestureOptimizer.h" - -#import "MSRoomGameWebVC.h" -#import "XPRoomViewController.h" -#import "PIUniversalBannerView.h" -#import "PIUniversalBannerModel.h" - -#import "CPGiftBanner.h" -#import "CPLevelUpAnimation.h" -#import "CPBindingAnimation.h" -#import "GameUniversalBannerView.h" -#import "LuckyGiftWinningFlagView.h" -#import "LuckyGiftWinningBannerView.h" -#import "RoomHighValueGiftBannerAnimation.h" -#import "LuckyPackageBannerView.h" -#import "BravoGiftBannerView.h" -#import "XCCurrentVCStackManager.h" -#import "BravoGiftWinningFlagView.h" -#import "RoomEnterModel.h" - -// Old Methods -#import "DatingInfoModel.h" -#import "XPWebViewController.h" -#import "XPRoomCandyGiftView.h" -#import "XPSailingAnimationView.h" -#import "AcrossRoomPKPrizeModel.h" -#import "XPRoomNobleLevelUpView.h" - -#import "XPRoomGiftCompoundView.h" -#import "XPRoomGiftBroadcastView.h" -#import "XPRoomLuckyBigPrizeView.h" -#import "XPAcrossRoomPKPrizeView.h" -#import "PIRoomGiftBroadcastWindow.h" -#import "XPRoomDatingAnimationView.h" -#import "XPRoomAnchorRankBannerView.h" - -#import "XPRoomGraffitiGiftAnimationView.h" -#import "XPRoomFunctionContainerView.h" -#import "XPRoomRankEntranceView.h" -#import "XPRoomAnchorRankEnterView.h" -#import "SocialStageView.h" -#import "MSRoomOnLineView.h" -#import "XPTurboModeConstants.h" -#import "TurboModeStateManager.h" - -#import "BannerScheduler.h" -#import "GameBannerGestureManager.h" - -static const CGFloat kTipViewStayDuration = 3.0; -//static const CGFloat kTipViewMoveDuration = 0.5; - -@interface RoomAnimationView () < -PAGViewListener, -SVGAPlayerDelegate, -HWDMP4PlayDelegate, -GiftAnimationDelegate, -NIMBroadcastManagerDelegate, - -PIUniversalBannerViewDelegate, -XPRoomGiftBroadcastViewDelegate, -XPRoomLuckyBigPrizeViewDelegate, -PIRoomGiftBroadcastWindowDelegate, -XPRoomAnchorRankBannerViewDelegate, - -XPRoomGraffitiGiftAnimationViewDelegate, -UIGestureRecognizerDelegate, -BannerSchedulerDelegate -> - -@property (nonatomic, weak) idhostDelegate; - -///最底层 -@property (nonatomic, strong) XPRoomAnimationHitView *bottomContainer; -///中层 -@property (nonatomic, strong) XPRoomAnimationHitView *middleContainer; -///顶层 -@property (nonatomic, strong) XPRoomAnimationHitView *topContainer; - -@property (nonatomic, strong) XPRoomAnimationHitView *bannerContainer; -@property (nonatomic, strong) UIView *bannerSwipeGestureContainer; -@property (nonatomic, strong) UIView *bannerLeftTapGestureContainer; -@property (nonatomic, strong) UIView *bannerRightTapGestureContainer; - -/// --- 进场 -/// 存放进房待播放动画的"队列"（这里用数组模拟队列 FIFO） -@property (nonatomic, strong) NSMutableArray *enterRoomAnimationQueue; -/// 标记当前是否有进房动画在执行 -@property (nonatomic, assign) BOOL isEnterRoomAnimating; -@property (nonatomic, strong) SVGAImageView *enterEffectView; - -/// --- 礼物 -@property(nonatomic, strong) PAGView *pagGiftEffectView; -@property(nonatomic, strong) SVGAParser *vggParser; -@property(nonatomic, assign) BOOL isPlayingGiftEffect; -@property(nonatomic, strong) NSMutableArray *svgaQueue; -@property(nonatomic, strong) VAPView *vapGiftEffectView; -@property(nonatomic, strong) SVGAImageView *vggGiftEffectView; -@property(nonatomic, strong) NSMutableArray *mp4AvatarLoaders; -@property(nonatomic, copy) NSString *GiftDynamicEffectListPath; -@property(nonatomic, strong) dispatch_source_t giftEffectTimer; -@property(nonatomic, strong) dispatch_queue_t giftEffectsQueue; -@property(nonatomic, strong) XPRoomGiftAnimationParser *vapParser; -@property(nonatomic, strong) GiftAnimationManager *giftAnimationManager; -@property(nonatomic, strong) GiftReceiveInfoModel *mp4TempReceiveInfoModel; - -/// --- 飘屏 -@property (nonatomic, strong) NSMutableArray *roomBannertModelsQueueV2; // 特效播放队列，包括幸运礼物 banner， CP banner 和 CP 特效 -@property (nonatomic, assign) BOOL isRoomBannerV2Displaying; -@property (nonatomic, strong) BannerScheduler *bannerScheduler; // 统一的 Banner 播放调度器 - -// --- Brove 金币动画 -@property (nonatomic, strong) SVGAVideoEntity *broveSVGAEntity_lv_1; -@property (nonatomic, strong) SVGAVideoEntity *broveSVGAEntity_lv_2; -@property (nonatomic, strong) SVGAVideoEntity *broveSVGAEntity_lv_3; -@property (nonatomic, strong) NSMutableArray *broveSVGAQueue; -@property (nonatomic, assign) BOOL isBroveSVGAPlaying; -@property (nonatomic, assign) NSInteger viewIndex; - -/// --- 座驾 -///座驾pag动效 -@property(nonatomic, strong) PAGView *carPagEffectView; -///座驾VAP特效 -@property(nonatomic, strong) VAPView *carVapEffectView; -@property(nonatomic, strong) SVGAImageView *carSVGAEffectView; -@property(nonatomic, strong) NSMutableArray *carEffectQueue; - -/// --- 旧逻辑，有需要再重构 -@property(nonatomic, assign) BOOL isPlayOfB; -@property(nonatomic, strong) NSMutableArray *animationListB; // 玩法 -@property (nonatomic, assign) CGFloat broadCastHieght; -@property (nonatomic, strong) NetImageView *imageLoader; -@property (nonatomic, strong) SVGAImageView *datingEffectView; -@property (nonatomic, strong) NSMutableArray *sailingQueue; -@property (nonatomic, strong) NSMutableArray *datingEffectQueue; -@property (nonatomic, strong) NSMutableArray *graffitiGiftQueue; -@property (nonatomic, strong) NSMutableArray *acrossRoomPKQueue; -@property (nonatomic,strong) SVGAImageView *luckyGiftEffectView; ///福袋礼物送礼物的特效 -@property (nonatomic, strong) VAPView *luckyVapGiftEffectView; ///福袋礼物VAP特效 - -@property(nonatomic, strong) NSMutableArray * universalBannerViewCaches; - -// Banner 手势相关属性 -@property(nonatomic, assign) CGPoint savedTapPoint; -@property(nonatomic, assign) BOOL hasSavedTapPoint; - -@property (nonatomic, strong) GameBannerGestureManager *gameGestureManager; -@property (nonatomic, assign) BOOL isGameModeActive; - -@property (nonatomic, strong) UISwipeGestureRecognizer *swipeWhenPlayGame; - -// 🔧 移除：本地开关状态，改为使用 TurboModeStateManager -@property (nonatomic, strong) NSString *currentRoomId; // 当前房间 ID - -// 移除本地开关缓存：直接向 TurboModeStateManager 询问实时值 - -@end - -@implementation RoomAnimationView - -- (void)setIsPlayOfB:(BOOL)isPlayOfB { - _isPlayOfB = isPlayOfB; -} - -- (void)dealloc -{ - NSLog(@" RoomAnimationView: dealloc 开始"); - [self removeItSelf]; - NSLog(@" RoomAnimationView: dealloc 完成"); -} - -- (void)removeItSelf { - NSLog(@"�� RoomAnimationView: 开始销毁"); - [self smartDestroy]; -} - -- (void)cancelAllAnimations { - NSLog(@"�� 取消所有动画"); - - // �� 新增：检查是否有正在播放的重要动画 - BOOL hasImportantAnimation = [self hasImportantAnimationPlaying]; - - if (hasImportantAnimation) { - NSLog(@"⚠️ 检测到重要动画正在播放，延迟清理"); - // 延迟清理，给动画完成的时间 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self cancelAllAnimations]; - }); - return; - } - - // 执行实际的取消动画逻辑 - [self pop_removeAllAnimations]; - - // 取消所有容器的子视图动画 - NSArray *containers = @[self.bannerContainer, self.topContainer, self.middleContainer, self.bottomContainer]; - for (UIView *container in containers) { - if (!container) continue; - for (UIView *subview in container.subviews) { - [subview pop_removeAllAnimations]; - } - } -} - - -- (void)cleanupAllSubviews { - NSLog(@"🔄 清理所有子视图"); - - // �� 新增：检查是否有正在播放的重要动画 - BOOL hasImportantAnimation = [self hasImportantAnimationPlaying]; - - if (hasImportantAnimation) { - NSLog(@"⚠️ 检测到重要动画正在播放，延迟清理子视图"); - // 延迟清理，给动画完成的时间 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self cleanupAllSubviews]; - }); - return; - } - - // 执行实际的清理逻辑 - [self forceCleanupAllSubviews]; -} - -- (void)forceCleanupAllSubviews { - NSLog(@"�� 强制清理所有子视图"); - - // 清理所有容器的子视图 - NSArray *containers = @[self.bannerContainer, self.topContainer, self.middleContainer, self.bottomContainer]; - - for (UIView *container in containers) { - if (!container) continue; - - NSMutableArray *viewsToRemove = [NSMutableArray array]; - for (UIView *subview in container.subviews) { - [viewsToRemove addObject:subview]; - NSLog(@"�� 标记移除视图: %@ (从容器: %@)", NSStringFromClass([subview class]), NSStringFromClass([container class])); - } - - for (UIView *view in viewsToRemove) { - // 取消视图上的所有动画 - [view pop_removeAllAnimations]; - - // 清理视图上的手势识别器 - if (view.gestureRecognizers.count > 0) { - NSLog(@"�� 清理视图 %@ 上的 %lu 个手势识别器", NSStringFromClass([view class]), (unsigned long)view.gestureRecognizers.count); - for (UIGestureRecognizer *gesture in view.gestureRecognizers.copy) { - [view removeGestureRecognizer:gesture]; - } - } - - // 强制移除视图 - [view removeFromSuperview]; - } - } - - NSLog(@"🔄 所有子视图清理完成"); -} - -- (void)__cleanupAllBannerViews { - NSLog(@"�� 清理所有 Banner 视图"); - - // 清理 bannerContainer 中的所有子视图 - NSMutableArray *viewsToRemove = [NSMutableArray array]; - for (UIView *subview in self.bannerContainer.subviews) { - [viewsToRemove addObject:subview]; - NSLog(@"🔄 标记移除 banner: %@", NSStringFromClass([subview class])); - } - - for (UIView *view in viewsToRemove) { - [view removeFromSuperview]; - } - - // 清理 topContainer 中的所有子视图（可能包含 CP 相关的 banner） - viewsToRemove = [NSMutableArray array]; - for (UIView *subview in self.topContainer.subviews) { - if ([subview isKindOfClass:[CPBindingAnimation class]] || - [subview isKindOfClass:[CPLevelUpAnimation class]]) { - [viewsToRemove addObject:subview]; - NSLog(@"�� 标记移除 CP banner: %@", NSStringFromClass([subview class])); - } - } - - for (UIView *view in viewsToRemove) { - [view removeFromSuperview]; - } - - NSLog(@"🔄 Banner 视图清理完成"); -} - --(void)resumeTimer{ - if(self.giftEffectTimer != nil){ - dispatch_source_cancel(self.giftEffectTimer); - self.giftEffectTimer = nil; - } - [self.pagGiftEffectView removeListener:self]; - self.hostDelegate = nil; - [[GiftComboManager sharedManager] removeComboFlag]; -} - -- (instancetype)initWithHostDelegate:(id)hDelegate { - if (self = [super init]) { - self.hostDelegate = hDelegate; - [[NIMSDK sharedSDK].broadcastManager addDelegate:self]; - - // 确保RoomAnimationView可以接收用户交互 - self.userInteractionEnabled = YES; - - [self setup]; - } - return self; -} - -#pragma mark - SETUP -- (void)setup { - [self setupUI]; - [self setupEnterRoom]; - [self setupGiftEffects]; - [self setupBanner]; - [self setupCar]; - [self setupOldMethods]; - - [self addBnnerContainGesture]; - - // 🔧 新增：监听房间类型变化 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleRoomTypeChanged:) - name:@"RoomTypeChanged" - object:nil]; - - // 🔧 新增：监听combo状态变化 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleComboStateChanged:) - name:@"GiftComboStateChanged" - object:nil]; - - // 🎮 新增：初始化小游戏手势管理器 - self.gameGestureManager = [[GameBannerGestureManager alloc] init]; - self.gameGestureManager.bannerContainer = self.bannerContainer; - - // 🎮 新增：监听房间类型变化 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleRoomTypeChanged:) - name:@"RoomTypeChanged" - object:nil]; - - // 🔧 新增：初始化Turbo Mode开关状态 - [self setupTurboModeSwitches]; - - // 🔧 新增：监听Turbo Mode开关变化 - [self setupTurboModeNotifications]; -} - -- (void)setupUI { - [self addSubview:self.bottomContainer]; - [self insertSubview:self.middleContainer aboveSubview:self.bottomContainer]; - [self insertSubview:self.topContainer aboveSubview:self.middleContainer]; - [self insertSubview:self.bannerContainer aboveSubview:self.topContainer]; - - [self.bottomContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - [self.middleContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - [self.topContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - [self.bannerContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(kNavigationHeight); - make.leading.trailing.mas_equalTo(self); - make.height.mas_equalTo(80); - }]; -} - -- (void)setupEnterRoom { - self.enterRoomAnimationQueue = [NSMutableArray array]; -} - -- (void)setupGiftEffects { - self.GiftDynamicEffectListPath = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) xpSafeObjectAtIndex:0] stringByAppendingPathComponent:@"GiftDynamicEffectList"]; - - self.giftAnimationManager = [[GiftAnimationManager alloc] initWithContainerView:self.bottomContainer]; - self.giftAnimationManager.delegate = self; - - _giftEffectsQueue = dispatch_queue_create("com.RoomGiftEffects.queue", DISPATCH_QUEUE_SERIAL); -} - -- (void)setupBanner { - _roomBannertModelsQueueV2 = [NSMutableArray array]; - - // 初始化 Banner 调度器 - self.bannerScheduler = [[BannerScheduler alloc] initWithDelegate:self]; -} - - -#pragma mark - Legacy Support - -- (void)setupCar { - _carEffectQueue = [NSMutableArray array]; -} - -- (void)setupOldMethods { - _broadCastHieght = 190 - 150 + kGetScaleWidth(69); - _sailingQueue = @[].mutableCopy; - _datingEffectQueue = @[].mutableCopy; - _graffitiGiftQueue = @[].mutableCopy; - _acrossRoomPKQueue = @[].mutableCopy; - _animationListB = @[].mutableCopy; -} - -// 🔧 新增：初始化Turbo Mode开关状态 -- (void)setupTurboModeSwitches { - // 🔧 修改：不再在这里设置房间ID，等待 TurboModeStateManager 设置 - // 如果 TurboModeStateManager 已经有当前房间ID，则使用它 - NSString *roomId = [[TurboModeStateManager sharedManager] loadCurrentRoomId]; - - if (roomId && roomId.length > 0) { - self.currentRoomId = roomId; - - // 更新礼物特效开关状态（基于房间信息） - [[TurboModeStateManager sharedManager] updateGiftEffectsForRoom:roomId - enabled:self.hostDelegate.getRoomInfo.hasAnimationEffect]; - - NSLog(@"🎮 RoomAnimationView Turbo Mode开关初始化完成 - 房间ID: %@", roomId); - } else { - NSLog(@"🎮 RoomAnimationView: 等待 TurboModeStateManager 设置房间ID"); - } -} - - -// 🔧 新增：设置Turbo Mode通知监听 -- (void)setupTurboModeNotifications { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTurboGiftEffectsChanged:) - name:kTurboGiftEffectsEnabledChanged - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTurboGlobalGiftScreenChanged:) - name:kTurboGlobalGiftScreenEnabledChanged - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTurboGlobalGameScreenChanged:) - name:kTurboGlobalGameScreenEnabledChanged - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTurboCpMicChanged:) - name:kTurboCpMicEnabledChanged - object:nil]; - - // 🔧 新增：监听当前房间ID设置通知 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleCurrentRoomIdSet:) - name:kTurboCurrentRoomIdSet - object:nil]; - - // 🔧 新增：监听 Turbo Mode 状态变化通知 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTurboModeStateChanged:) - name:@"TurboModeStateChanged" - object:nil]; - - NSLog(@"🎮 Turbo Mode通知监听设置完成"); -} - -#pragma mark - Method: Enter Roooooom -- (void)enterRoom:(NIMMessage *)message content:(NIMChatroomNotificationContent *)content { - NIMMessageChatroomExtension *messageExt = (NIMMessageChatroomExtension *)message.messageExt; - NSDictionary * dic = [(NSDictionary *)messageExt.roomExt.toJSONObject objectForKey:message.from]; - XPMessageRemoteExtModel *extModel = [XPMessageRemoteExtModel modelWithJSON:dic]; - - if (extModel.platformRole == 1) { - return; - } - - if (extModel.enterHide) { - //隐身进房 - if ([message.from isEqualToString:[AccountInfoStorage instance].getUid]) { - [self createEnterHideAnimation]; - } - } else { - [self userEnterRoom:content ext:extModel]; - } -} - -///自己的隐身进房提示 -- (void)createEnterHideAnimation { - NSDictionary * dic= @{@"title":@"隐身进房", - @"isMe":@"", - @"experLevelSeq":@"", - @"effectPath" : @""}; - [self.enterRoomAnimationQueue addObject:dic]; - [self tryDequeueAnimation]; -} - - -- (void)userEnterRoom:(NIMChatroomNotificationContent *)content ext:(XPMessageRemoteExtModel *)extModel { - NSString *userName = [self _resolveUserNameFromContent:content extModel:extModel]; - NSString *title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomAnimationView0"), userName]; - - NSDictionary * dic= @{@"title":title, - @"experLevelSeq":[NSString stringWithFormat:@"%ld", extModel.experLevelSeq], - @"effectPath" : extModel.enterRoomEffects.length ? extModel.enterRoomEffects : @""}; - [self.enterRoomAnimationQueue addObject:dic]; - [self tryDequeueAnimation]; -} - -- (void)tryDequeueAnimation { - // 如果当前正有动画在播放，或者队列里啥都没有，直接return - if (self.isEnterRoomAnimating || self.enterRoomAnimationQueue.count == 0) { - return; - } - self.isEnterRoomAnimating = YES; - - // 取出队列头部的动画信息并移除 - NSDictionary *dic = [self.enterRoomAnimationQueue firstObject]; - if (self.enterRoomAnimationQueue.count > 0) { - [self.enterRoomAnimationQueue xpSafeRemoveObjectAtIndex:0]; - } - - NSString *title = [dic objectForKey:@"title"]; - if ([title isEqualToString:@"隐身进房"]) { - [self playHideEnterRoomAnimation]; - } else { - // 开始执行动画 - [self playUserEnterRoomAnimation:[dic objectForKey:@"title"] - experLevelSeq:[dic objectForKey:@"experLevelSeq"] - effectPath:[dic objectForKey:@"effectPath"] - isCPEnter:[[dic objectForKey:@"isCP"] boolValue]]; - } -} - -- (void)playHideEnterRoomAnimation { - XPRoomEnterHideTipView *enterHideTipView = [[XPRoomEnterHideTipView alloc] initWithFrame:CGRectMake(KScreenWidth, - (KScreenHeight - 48) * 0.5, - KScreenWidth, - 48)]; - [self.bottomContainer addSubview:enterHideTipView]; - - @kWeakify(self); - [self enterRoomAnimationFor:enterHideTipView - startFrom:enterHideTipView.center - startTo:CGPointMake(enterHideTipView.frame.size.width / 2, enterHideTipView.center.y) - endFrom:CGPointMake(0, enterHideTipView.center.y) - endTo:CGPointMake(-KScreenWidth / 2, enterHideTipView.center.y) - duration:CACurrentMediaTime() + kTipViewStayDuration - completion:^(BOOL finished) { - @kStrongify(self); - [self endAnimationEnterEffect]; - }]; -} - -- (void)playUserEnterRoomAnimation:(NSString *)title - experLevelSeq:(NSString *)experLevelSeq - effectPath:(NSString *)effectPath - isCPEnter:(BOOL)isCP { - - // 🔧 修复：实时查询开关：礼物特效，使用正确的公开接口 - NSString *roomIdForTurbo = self.currentRoomId ?: @([self.hostDelegate getRoomInfo].roomId).stringValue; - BOOL giftEffectsEnabled = [[TurboModeStateManager sharedManager] isGiftEffectsEnabledForRoom:roomIdForTurbo]; - if (!giftEffectsEnabled) { - NSLog(@"🎮 Turbo Mode进房特效已关闭，跳过进房动画 - 房间ID: %@", roomIdForTurbo); - return; - } - - NSDictionary *attributes = @{ - NSFontAttributeName:kFontRegular(26), - NSForegroundColorAttributeName:[UIColor whiteColor] - }; - NSMutableAttributedString *attributeString = [[NSMutableAttributedString alloc] initWithString:title - attributes:attributes]; - [attributeString setYy_alignment:NSTextAlignmentLeft]; - - BOOL hasEffectPath = ![NSString isEmpty:effectPath]; - [self addEnterEffectView: hasEffectPath]; - - if (isCP) { - [self playCPPPPEnterRoomSvgaWith:attributeString]; - } else if (hasEffectPath) { - [self playEnterRoomSvga:effectPath - content:attributeString - needMoveAnimation:YES]; - } else { - [self playEnterRoomSvgaWith:experLevelSeq - content:attributeString]; - } -} - -- (void)addEnterEffectView:(BOOL)hasEffectPath { - if (self.enterEffectView.superview == nil) { - [self.bottomContainer addSubview:self.enterEffectView]; - } - - self.enterEffectView.loops = hasEffectPath ? 0 : 1; - - self.enterEffectView.frame = CGRectMake(hasEffectPath ? KScreenWidth : 0, - 340 + kSafeAreaTopHeight, - KScreenWidth, - hasEffectPath ? 75 : 50); -} - -- (void)playEnterRoomSvga:(NSString *)path - content:(NSAttributedString *)content - needMoveAnimation:(BOOL)isNeed { - @kWeakify(self); - SVGAParser *parser = [[SVGAParser alloc] init]; - [parser parseWithURL:[NSURL URLWithString:path] - completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - self.enterEffectView.alpha = 1; - self.enterEffectView.hidden = NO; - self.enterEffectView.videoItem = videoItem; - [self.enterEffectView setAttributedText:content forKey:@"room_text"]; - [self.enterEffectView startAnimation]; - if (isNeed) { - [self popAnimationEnterEffect]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - [self endAnimationEnterEffect]; - }]; -} - -- (void)playEnterRoomSvgaWith:(NSString *)seq - content:(NSAttributedString *)content { - NSInteger seqNum = [NSString isEmpty:seq] ? 0 : [seq integerValue]; - NSString *path = [self _mapExperLevelSeqToLocalKey:seqNum]; - if ([NSString isEmpty:path]) { - [self endAnimationEnterEffect]; - return; - } - - NSString *targetPath = [NSString stringWithFormat:@"%@/%@.svga", @"https://image.molistar.xyz", path]; - [self playEnterRoomSvga:targetPath content:content needMoveAnimation:NO]; -} - -- (void)playCPPPPEnterRoomSvgaWith:(NSAttributedString *)content { - if ([NSString isEmpty:content.string]) { - [self endAnimationEnterEffect]; - return; - } - NSString *path = @"CP进场"; - @kWeakify(self); - SVGAParser *parser = [[SVGAParser alloc] init]; - [parser parseWithNamed:path inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.enterEffectView.loops = 0; - self.enterEffectView.alpha = 1; - self.enterEffectView.hidden = NO; - self.enterEffectView.videoItem = videoItem; - [self.enterEffectView setAttributedText:content forKey:@"room_text"]; - [self.enterEffectView startAnimation]; - [self popAnimationEnterEffect]; - } failureBlock:^(NSError * _Nonnull error) { - @kStrongify(self); - [self endAnimationEnterEffect]; - }]; -} - -- (void)popAnimationEnterEffect { - @kWeakify(self); - [self enterRoomAnimationFor:self.enterEffectView - startFrom:self.enterEffectView.center - startTo:CGPointMake(self.enterEffectView.frame.size.width / 2, self.enterEffectView.center.y) - endFrom:CGPointMake(0, self.enterEffectView.center.y) - endTo:CGPointMake(-KScreenWidth / 2, self.enterEffectView.center.y) - duration:CACurrentMediaTime() + kTipViewStayDuration - completion:^(BOOL finished) { - @kStrongify(self); - [self endAnimationEnterEffect]; - }]; -} - -- (void)endAnimationEnterEffect { - self.isEnterRoomAnimating = NO; - [self.enterEffectView stopAnimation]; - self.enterEffectView.hidden = YES; - [self.enterEffectView removeFromSuperview]; - [self tryDequeueAnimation]; -} - -#pragma mark - Method: Banner -- (void)inserBannerModelToQueue:(AttachmentModel *)obj { - // 参数验证 - if (!obj || ![obj isKindOfClass:[AttachmentModel class]]) { - NSLog(@"⚠️ 警告: inserBannerModelToQueue 接收到无效参数: %@", obj); - return; - } - - // 🔧 修复：统一在 inserBannerModelToQueue 中检查所有开关，使用正确的公开接口 - NSString *roomIdForTurbo = self.currentRoomId ?: @([self.hostDelegate getRoomInfo].roomId).stringValue; - - if (obj.second == Custom_Message_Sub_General_Floating_Screen_One_Room || - obj.second == Custom_Message_Sub_General_Floating_Screen_All_Room) { - // 游戏相关banner - BOOL allowGameScreen = [[TurboModeStateManager sharedManager] isGlobalGameScreenEnabledForRoom:roomIdForTurbo]; - if (!allowGameScreen) { - NSLog(@"🎮 Turbo Mode全局游戏屏幕已关闭，跳过游戏banner - 房间ID: %@", roomIdForTurbo); - return; - } - } else if (obj.second == Custom_Message_Sub_Super_Gift_Banner || - obj.second == Custom_Message_Sub_Gift_ChannelNotify || - obj.second == Custom_Message_Sub_LuckyPackage || - obj.second == Custom_Message_Sub_Super_Gift_Winning_Coins_ALL_Room || - obj.second == Custom_Message_Sub_Room_Gift_LuckBag || - obj.second == Custom_Message_Sub_Room_Gift_LuckBag_Server || - obj.second == Custom_Message_Sub_Room_Gift_LuckBag_FullScree) { - // 礼物相关banner - BOOL allowGiftScreen = [[TurboModeStateManager sharedManager] isGlobalGiftScreenEnabledForRoom:roomIdForTurbo]; - if (!allowGiftScreen) { - NSLog(@"🎮 Turbo Mode全局礼物屏幕已关闭，跳过礼物banner - 房间ID: %@", roomIdForTurbo); - return; - } - } else if (obj.second == Custom_Message_Sub_CP_Gift || - obj.second == Custom_Message_Sub_CP_Upgrade || - obj.second == Custom_Message_Sub_CP_Binding) { - // 🔧 修复：CP相关banner - 需要检查礼物特效开关，使用正确的公开接口 - NSString *roomIdForTurbo = self.currentRoomId ?: @([self.hostDelegate getRoomInfo].roomId).stringValue; - BOOL giftEffectsEnabled = [[TurboModeStateManager sharedManager] isGiftEffectsEnabledForRoom:roomIdForTurbo]; - if (!giftEffectsEnabled) { - NSLog(@"🎮 Turbo Mode礼物特效已关闭，跳过CP banner - 房间ID: %@", roomIdForTurbo); - return; - } - } - - #if 0 - // DEBUG环境：复制banner数据用于测试 - BOOL enableBannerCopy = obj.second == Custom_Message_Sub_Super_Gift_Banner;// YES; // 设置为NO可以禁用复制功能 - NSInteger copyCount = 10; // 可以调整这个数字来改变复制数量 - - if (enableBannerCopy) { - NSLog(@"🧪 DEBUG环境：收到banner数据，复制%ld份用于测试", (long)copyCount); - NSLog(@"🧪 原始banner类型: %@", NSStringFromClass([obj class])); - - // 添加原始数据到新调度器 - [self.bannerScheduler enqueueBanner:obj]; - - // 复制指定份数 - for (int i = 1; i < copyCount; i++) { - AttachmentModel *copiedObj = [[AttachmentModel alloc] init]; - - // 安全复制data - if ([obj.data respondsToSelector:@selector(mutableCopy)]) { - copiedObj.data = [obj.data mutableCopy]; - } else if ([obj.data respondsToSelector:@selector(copy)]) { - copiedObj.data = [obj.data copy]; - } else { - copiedObj.data = obj.data; // 直接引用，注意这可能不是深拷贝 - } - - copiedObj.first = obj.first; - copiedObj.second = obj.second; - copiedObj.isBroadcast = obj.isBroadcast; - copiedObj.seq = obj.seq; - - NSLog(@"🧪 复制第%d份banner数据", i + 1); - [self.bannerScheduler enqueueBanner:copiedObj]; - } - - NSLog(@"🧪 队列中banner总数: %ld", (long)self.bannerScheduler.queueCount); - - // 显示队列中banner类型的分布 - NSLog(@"🧪 队列状态: %@", [self.bannerScheduler queueStatusDescription]); - } else { - // 禁用复制功能，正常添加 - NSLog(@"🧪 DEBUG环境：复制功能已禁用，正常添加banner"); - [self.bannerScheduler enqueueBanner:obj]; - } - #else - // 生产环境：正常添加 - [self.bannerScheduler enqueueBanner:obj]; - #endif -} - -- (void)sortBannerQueue { - // 保持先进先出（FIFO）策略，不需要排序 - // 队列顺序就是添加顺序，确保公平性 - NSLog(@"🔄 RoomAnimationView: 使用先进先出策略，保持队列原有顺序"); -} - -- (void)processNextRoomEffectAttachment { - NSLog(@"🔄 processNextRoomEffectAttachment 被调用 - 当前状态: isRoomBannerV2Displaying=%@, 队列数量: %ld", - self.isRoomBannerV2Displaying ? @"YES" : @"NO", (long)self.roomBannertModelsQueueV2.count); - - // 检查队列是否有元素 - if (self.roomBannertModelsQueueV2.count == 0) { - // 如果队列为空，停止处理 - self.isRoomBannerV2Displaying = NO; - NSLog(@"🔄 队列为空，停止处理"); - return; - } - if (self.isRoomBannerV2Displaying) { - NSLog(@"🔄 已有banner正在显示，跳过处理"); - return; - } - - [self sortBannerQueue]; - - // 从队列中取出第一个元素并移出队列 - AttachmentModel *nextAttachment = [self.roomBannertModelsQueueV2 firstObject]; - if (self.roomBannertModelsQueueV2.count > 0) { - [self.roomBannertModelsQueueV2 xpSafeRemoveObjectAtIndex:0]; - } - - // 设置为正在显示的状态 - self.isRoomBannerV2Displaying = YES; - NSLog(@"🔄 设置状态为正在显示: %@", NSStringFromClass([nextAttachment class])); - - // 清理之前的banner，防止多个banner同时显示（保留debug视图） - NSMutableArray *viewsToRemove = [NSMutableArray array]; - for (UIView *subview in self.bannerContainer.subviews) { - [viewsToRemove addObject:subview]; - NSLog(@"🔄 标记移除banner: %@", NSStringFromClass([subview class])); - } - - for (UIView *view in viewsToRemove) { - [view removeFromSuperview]; - } - - switch (nextAttachment.second) { - case Custom_Message_Sub_General_Floating_Screen_One_Room: - case Custom_Message_Sub_General_Floating_Screen_All_Room: - // 通用飘屏 - [self playGameBanner:nextAttachment]; - break; - case Custom_Message_Sub_Super_Gift_Winning_Coins_ALL_Room: - [self playLuckyWinningBanner:nextAttachment]; - break; - case Custom_Message_Sub_CP_Gift: - [self playCPGiftBanner:nextAttachment]; - break; - case Custom_Message_Sub_CP_Upgrade: - [self playCPLevelUp:nextAttachment]; - break; - case Custom_Message_Sub_CP_Binding: - [self playCPBinding:nextAttachment]; - break; - case Custom_Message_Sub_Gift_ChannelNotify: - [self playRoomGiftBanner:nextAttachment]; - break; - case Custom_Message_Sub_LuckyPackage: - [self playLuckyPackageBanner:nextAttachment]; - break; - case Custom_Message_Sub_Super_Gift_Banner: - [self playBroveBanner:nextAttachment]; - break; - default: - break; - } -} - -- (void)playBroveBanner:(AttachmentModel *)obj { - if (!obj.data) { - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - return; - } - self.isRoomBannerV2Displaying = YES; - @kWeakify(self); - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - - // �� 新增：检查是否正在销毁 - if (!self || !self.superview) { - NSLog(@"⚠️ RoomAnimationView 正在销毁，跳过 banner 播放"); - return; - } - - [BravoGiftBannerView display:self.bannerContainer - inRoomUid:roomInfo.uid - with:obj - complete:^{ - @kStrongify(self); - if (!self || !self.superview) { - NSLog(@"⚠️ RoomAnimationView 已被释放，跳过 complete 回调"); - return; - } - NSLog(@"🔄 BravoGiftBannerView complete 回调被调用"); - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - - // 🔧 新增：确保手势容器状态正确 - [self ensureBannerGestureContainersEnabled]; - - // 🔧 新增：重置触摸状态 - [self resetTouchState]; - } exitCurrentRoom:^{ - @kStrongify(self); - if (!self || !self.superview) { - NSLog(@"⚠️ RoomAnimationView 已被释放，跳过 exitCurrentRoom 回调"); - return; - } - [self.hostDelegate exitRoom]; - }]; -} - -- (void)playLuckyPackageBanner:(AttachmentModel *)obj { - if (!obj.data) { - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - return; - } - self.isRoomBannerV2Displaying = YES; - @kWeakify(self); - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - [LuckyPackageBannerView display:self.bannerContainer - inRoomUid:roomInfo.uid - with:obj - complete:^{ - @kStrongify(self); - NSLog(@"🔄 LuckyPackageBannerView complete 回调被调用"); - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - - // 🔧 新增：确保手势容器状态正确 - [self ensureBannerGestureContainersEnabled]; - [self resetTouchState]; - } exitCurrentRoom:^{ - @kStrongify(self); - [self.hostDelegate exitRoom]; - }]; -} - -- (void)receiveRoomGiftBanner:(AttachmentModel *)obj { - // 🔧 优化：开关检查已移至 inserBannerModelToQueue 统一处理 - [self inserBannerModelToQueue:obj]; -} - -- (void)playRoomGiftBanner:(AttachmentModel *)obj { - if (!obj.data) { - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - return; - } - self.isRoomBannerV2Displaying = YES; - @kWeakify(self); - [RoomHighValueGiftBannerAnimation display:self.bannerContainer - with:obj - complete:^{ - @kStrongify(self); - NSLog(@"🔄 RoomHighValueGiftBannerAnimation complete 回调被调用"); - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - - // 🔧 新增：确保手势容器状态正确 - [self ensureBannerGestureContainersEnabled]; - [self resetTouchState]; - }]; -} - -- (void)receiveCPEvent:(AttachmentModel *)attachment { - // 🔧 优化：开关检查已移至 inserBannerModelToQueue 统一处理 - [self inserBannerModelToQueue:attachment]; -} - -- (void)playCPBinding:(AttachmentModel *)attachment { - @kWeakify(self); - [CPBindingAnimation display:self.topContainer - with:attachment - complete:^{ - @kStrongify(self); - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - - // 🔧 新增：确保手势容器状态正确 - [self ensureBannerGestureContainersEnabled]; - [self resetTouchState]; - }]; -} - -- (void)playCPGiftBanner:(AttachmentModel *)attachMent { - @kWeakify(self); - [CPGiftBanner display:self.bannerContainer - with:attachMent - complete:^{ - @kStrongify(self); - NSLog(@"🔄 CPGiftBanner complete 回调被调用"); - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - - // 🔧 新增：确保手势容器状态正确 - [self ensureBannerGestureContainersEnabled]; - [self resetTouchState]; - }]; -} - -- (void)playCPLevelUp:(AttachmentModel *)attachMent { - @kWeakify(self); - [CPLevelUpAnimation display:self.topContainer - with:attachMent - complete:^{ - @kStrongify(self); - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - - // 🔧 新增：确保手势容器状态正确 - [self ensureBannerGestureContainersEnabled]; - [self resetTouchState]; - }]; -} - -- (void)receiveLuckGiftWinning:(AttachmentModel *)attachment { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - [LuckyGiftWinningFlagView display:self.topContainer - with:attachment - roomID:roomInfo.roomId - uID:[AccountInfoStorage instance].getUid]; -} - -- (void)receiveBravoGiftWinning:(AttachmentModel *)attachment { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - BravoGiftWinningFlagViewModel *flagModel = [BravoGiftWinningFlagView display:self.topContainer - with:attachment - roomID:roomInfo.roomId - uID:[AccountInfoStorage instance].getUid]; - if (flagModel.roomId != roomInfo.roomId || flagModel.uid != [AccountInfoStorage instance].getUid.integerValue) { - return; - } - if ([flagModel.receiverUidList containsObject:@([AccountInfoStorage instance].getUid.integerValue)]) { - // 数据同步到 combo - [[NSNotificationCenter defaultCenter] postNotificationName:@"receiveLuckGiftWinning" object:[NSString stringByRemovingRedundantZeros:@(flagModel.receiverProfit).stringValue]]; - } - - if (!self.hostDelegate.getRoomInfo.hasAnimationEffect) { - return; - } - NSDictionary *tip = [attachment.data objectForKey:@"tip"]; - if (tip) { - NSNumber *level = [tip objectForKey:@"level"]; - NSNumber *coins = [tip objectForKey:@"coins"]; - if (level) { - [self loadBroveSVGAVideoItem:level.integerValue]; - } - if (coins) { - [[NSNotificationCenter defaultCenter] postNotificationName:@"receiveLuckGiftWinning" object:[NSString stringByRemovingRedundantZeros:coins.stringValue]]; - } - } -} - -- (void)loadBroveSVGAVideoItem:(NSInteger)level { - if (level < 3) { - return; - } - NSString *svgaItemName = @""; - SVGAVideoEntity *entity; - svgaItemName = @"大"; - entity = self.broveSVGAEntity_lv_3; - /* - switch (level) { - case 1: - svgaItemName = @"小"; - entity = self.broveSVGAEntity_lv_1; - break; - case 2: - svgaItemName = @"中"; - entity = self.broveSVGAEntity_lv_2; - break; - case 3: - svgaItemName = @"大"; - entity = self.broveSVGAEntity_lv_3; - break; - - default: - break; - } - */ - if ([NSString isEmpty:svgaItemName]) { - return; - } - - if (self.broveSVGAQueue.count >=3) { - return; - } - - SVGAImageView *svgaView = [[SVGAImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - svgaView.backgroundColor = [UIColor clearColor]; - svgaView.contentMode = UIViewContentModeScaleAspectFill; - svgaView.userInteractionEnabled = NO; - if (!entity) { - @kWeakify(self); - SVGAParser *parser = [[SVGAParser alloc] init]; - [parser parseWithNamed:svgaItemName - inBundle:[NSBundle mainBundle] - completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.broveSVGAEntity_lv_3 = videoItem; - /* - switch (level) { - case 1: - self.broveSVGAEntity_lv_1 = videoItem; - break; - case 2: - self.broveSVGAEntity_lv_2 = videoItem; - break; - case 3: - self.broveSVGAEntity_lv_3 = videoItem; - break; - - default: - break; - } - */ - [self startPlayBroveSVGA:svgaView level:level]; - } failureBlock:^(NSError * _Nonnull error) { - - }]; - } else { - [self startPlayBroveSVGA:svgaView level:level]; - } -} - -- (void)startPlayBroveSVGA:(SVGAImageView *)svgaView level:(NSInteger)level { - if (!_broveSVGAQueue) { - _broveSVGAQueue = [[NSMutableArray alloc] init]; - self.viewIndex = 0; - } - if (![self.broveSVGAQueue containsObject:svgaView]) { - [self.broveSVGAQueue addObject:svgaView]; - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)((0.3 + (self.viewIndex * 0.1)) * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - SVGAVideoEntity *entity; - switch (level) { - case 1: - entity = self.broveSVGAEntity_lv_1; - break; - case 2: - entity = self.broveSVGAEntity_lv_2; - break; - case 3: - entity = self.broveSVGAEntity_lv_3; - break; - - default: - break; - } -// [self insertSubview:svgaView atIndex:self.viewIndex]; - [self _addSubviewToMiddleContainer:svgaView]; - svgaView.tag = 913; - svgaView.delegate = self; - svgaView.videoItem = entity; - svgaView.loops = 1; - [svgaView startAnimation]; - self.viewIndex += 1; - }); -} - -- (void)receiveLuckGiftBanner:(AttachmentModel *)attachment { - // 🔧 优化：开关检查已移至 inserBannerModelToQueue 统一处理 - [self inserBannerModelToQueue:attachment]; -} - -- (void)playLuckyWinningBanner:(AttachmentModel *)nextAttachment { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - @kWeakify(self); - [LuckyGiftWinningBannerView display:self.bannerContainer - inRoomUid:roomInfo.uid - with:nextAttachment - complete:^{ - @kStrongify(self); - NSLog(@"🔄 LuckyGiftWinningBannerView complete 回调被调用"); - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - - // 🔧 新增：确保手势容器状态正确 - [self ensureBannerGestureContainersEnabled]; - [self resetTouchState]; - } exitCurrentRoom:^{ - @kStrongify(self); - [self.hostDelegate exitRoom]; - }]; -} - --(void)receiveRoomGeneralFloatingScreen:(AttachmentModel *)attachment{ - PIBaseAnimationViewModel *roomGraffiti = [PIBaseAnimationViewModel new]; - roomGraffiti.data = attachment.data; - roomGraffiti.type = GiftBannerType_General_Floating_Screen; - roomGraffiti.first = attachment.first; - roomGraffiti.second = attachment.second; - - PIUniversalBannerModel *model = [PIUniversalBannerModel modelWithDictionary:attachment.data]; - if (model.skipType == 7 && - (attachment.second == Custom_Message_Sub_General_Floating_Screen_One_Room || - attachment.second == Custom_Message_Sub_General_Floating_Screen_All_Room)) { - [self receiveGameBanner:attachment]; - } else { - if(self.animationListB.count == 0 && self.isPlayOfB == NO){ - [self createGeneralFloatingScreenAnimation:roomGraffiti bannerModel:model]; - } - [self.animationListB addObject:roomGraffiti]; - } -} - -- (void)receiveGameBanner:(AttachmentModel *)attachment { - // 🔧 优化：开关检查已移至 inserBannerModelToQueue 统一处理 - [self inserBannerModelToQueue:attachment]; -} - -- (void)playGameBanner:(AttachmentModel *)attachment { - @kWeakify(self); - [GameUniversalBannerView display:self.bannerContainer - with:attachment - complete:^{ - @kStrongify(self); - NSLog(@"🔄 GameUniversalBannerView complete 回调被调用"); - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - - // 🔧 新增：确保手势容器状态正确 - [self ensureBannerGestureContainersEnabled]; - [self resetTouchState]; - } goToGame:^(NSInteger gameID) { - @kStrongify(self); - NSArray *baishunList = [self.hostDelegate getPlayList]; - for (ActivityInfoModel *model in baishunList) { - if (model.id == gameID) { - MSRoomGameWebVC *vc = [[MSRoomGameWebVC alloc]initWithDelegate:self.hostDelegate - gameModel:model]; - vc.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - XPRoomViewController *roomVC = (XPRoomViewController *)self.hostDelegate; - [roomVC addChildViewController:vc]; - RoomAnimationView *animationView; - for (id obj in self.hostDelegate.getSuperView.subviews) { - if ([obj isKindOfClass:[RoomAnimationView class]]){ - animationView = obj; - break; - } - } - [self.hostDelegate.getSuperView addSubview:vc.view]; - vc.view.tag = 913; - break; - } - } - }]; -} - -#pragma mark - Method: Car -- (void)handleCarEnter:(AttachmentModel *)attachment { - if (attachment.second == Custom_Message_Sub_Car_EnterRoom) { - if (self.isPlayingGiftEffect) { - return; - } - if ([self _isInSudGame]) { - return; - } - if (!self.hostDelegate.getRoomInfo.hasAnimationEffect) { - return; - } - if (self.hostDelegate.getUserInfo.platformRole == 1) { - return; - } - NSInteger otherViewType = [attachment.data[@"otherViewType"] integerValue]; - NSString *viewUrl = attachment.data[@"viewUrl"]; - NSString *effect = attachment.data[@"effect"]; - NSDictionary *dic = nil; - if (![NSString isEmpty:viewUrl]) { - dic = @{@"otherViewType":@(otherViewType), @"viewUrl":viewUrl}; - } else if(![NSString isEmpty:effect]) { - dic = @{@"effect":effect}; - } - - [self starHandleCarEffect:dic]; - } -} - -- (void)starHandleCarEffect:(NSDictionary *)dic { - if (!dic) { - return; - } - [self.carEffectQueue addObject:dic]; - [self playCarEffect:dic]; -} - -- (void)nextCarEffect { - if (self.carEffectQueue.count > 0) { - if (self.carEffectQueue.count > 0) { - [self.carEffectQueue xpSafeRemoveObjectAtIndex:0]; - } - } - if (self.carEffectQueue.count > 0) { - [self playCarEffect:self.carEffectQueue.firstObject]; - } -} - -- (void)playCarEffect:(NSDictionary *)effectDict { - NSString *viewUrl = [effectDict objectForKey:@"viewUrl"]; - NSString *carEffect = [effectDict objectForKey:@"effect"]; - @kWeakify(self); - if (![NSString isEmpty:viewUrl]) { - [self.vapParser parseWithURL:viewUrl completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (![NSString isEmpty:videoUrl]) { - if([videoUrl.lowercaseString containsString:@".pag"]){ - self.carPagEffectView.hidden = NO; - [self _addSubviewToMiddleContainer:self.carPagEffectView]; - [self.carPagEffectView setPath:videoUrl]; - [self.carPagEffectView play]; - } else { - self.carVapEffectView.hidden = NO; - [self _addSubviewToMiddleContainer:self.carVapEffectView]; - [self.carVapEffectView setMute:NO]; - [self.carVapEffectView playHWDMP4:videoUrl repeatCount:1 delegate:self]; - } - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - [self nextCarEffect]; - }]; - } else if (![NSString isEmpty:carEffect]) { - [self.vggParser parseWithURL:[NSURL URLWithString:carEffect] - completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - if (videoItem) { - [self _addSubviewToMiddleContainer:self.carSVGAEffectView]; - [self _updateGiftEffectContentMode:self.carSVGAEffectView - size:videoItem.videoSize]; - self.carSVGAEffectView.videoItem = videoItem; - [self.carSVGAEffectView startAnimation]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - [self nextCarEffect]; - }]; - } -} - -#pragma mark - Method: Send Gifts -- (void)receiveGiftHandleSendGiftAnimationWith:(GiftReceiveInfoModel *)receiveInfo attachment:(AttachmentModel *)attachment { - // 🔧 修复：实时查询开关：礼物特效，使用正确的公开接口 - { - NSString *roomIdForTurbo = self.currentRoomId ?: @([self.hostDelegate getRoomInfo].roomId).stringValue; - BOOL giftEffectsEnabled = [[TurboModeStateManager sharedManager] isGiftEffectsEnabledForRoom:roomIdForTurbo]; - if (!giftEffectsEnabled) { - NSLog(@"🎮 RoomAnimationView 礼物特效已关闭，跳过动画 - 房间ID: %@", roomIdForTurbo); - return; - } - } - - if (!self.hostDelegate.getRoomInfo.hasAnimationEffect) { - return; - } - - // 🔧 新增：更新用户送礼时间 - [self.giftAnimationManager updateUserGiftTime:receiveInfo.uid]; - - GiftInfoModel *giftInfo = receiveInfo.gift; - if (attachment.second == Custom_Message_Sub_AllMicroLuckySend || - attachment.second == Custom_Message_Sub_AllBatchMicroLuckySend || - attachment.second == Custom_Message_Sub_Gift_LuckySend) { - NSString * giftId = [NSString stringWithFormat:@"%ld", receiveInfo.luckyGiftList.giftList.firstObject.giftId]; - NSString *roomUid = receiveInfo.roomUid == 0 ? receiveInfo.uid : @(receiveInfo.roomUid).stringValue; - giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:giftId inRoom:roomUid]; - } - - if (giftInfo == nil) { - giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:receiveInfo.giftId inRoom:@(receiveInfo.roomUid).stringValue]; - } - if (giftInfo == nil) { - giftInfo = [receiveInfo.displayGift xpSafeObjectAtIndex:0]; - } - - receiveInfo.gift = giftInfo; - RoomInfoModel * roomInfo = [self.hostDelegate getRoomInfo]; - if ((giftInfo.otherViewType == GiftOtherViewTypeMp4 || - giftInfo.otherViewType == GiftOtherViewTypePag) && - giftInfo.viewUrl.length > 0 && roomInfo.hasAnimationEffect) { - receiveInfo.mp4Url = giftInfo.viewUrl; - } else if (giftInfo.hasVggPic && - giftInfo.vggUrl.length > 0 - && roomInfo.hasAnimationEffect) {///SVGA动画 - receiveInfo.vggUrl = giftInfo.vggUrl; - } - - if (attachment.second != Custom_Message_Sub_Gift_EmbeddedStyle) { - // Custom_Message_Sub_Gift_EmbeddedStyle 只需播放特效 - [self.giftAnimationManager enqueueGift:receiveInfo]; - } -} - -- (void)receiveGift:(GiftReceiveInfoModel *)receiveInfo { - if (receiveInfo.isHomeShow) { - return; - } - - // 处理 combo - [[GiftComboManager sharedManager] receiveGiftInfoForDisplayComboFlags:receiveInfo - container:self]; - - if (receiveInfo.isLuckyBagGift) { - if (receiveInfo.isShowAnimation) { - [self handleLuckyBagGifts:receiveInfo]; - } - } else { - if (![NSString isEmpty:receiveInfo.mp4Url] || ![NSString isEmpty:receiveInfo.vggUrl]) { - [self addToSvgaQueue:receiveInfo]; - } - } - - dispatch_async(self.giftEffectsQueue, ^{ - if (self.giftEffectTimer == nil && - self.svgaQueue.count > 0) { - [self startHandleGiftEffectTimer]; - } - }); - -} - -- (void)handleLuckyBagGifts:(GiftReceiveInfoModel *)receiveInfo { - //如果是福袋礼物的话 就不用看他的价值了 只要有SVGA的话 就播放 - // MARK: 此代码从 XPRoomAnimationView copy 而来，暂时无法确认其正确性 - RoomInfoModel * roomInfo = [self.hostDelegate getRoomInfo]; - if (receiveInfo.displayGift.count > 0) { - [receiveInfo.displayGift enumerateObjectsUsingBlock:^(GiftInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ((obj.otherViewType == GiftOtherViewTypeMp4 || obj.otherViewType == GiftOtherViewTypePag) && obj.viewUrl && obj.viewUrl.length > 0 && roomInfo.hasAnimationEffect) { - GiftReceiveInfoModel * model = [[GiftReceiveInfoModel alloc] init]; - model.mp4Url = obj.viewUrl; - model.avatar = receiveInfo.sendUserAvatar; - model.gift = obj; - model.giftNum = [obj.giftNum integerValue];; - model.nick = receiveInfo.nick; - model.targetUids = receiveInfo.targetUids; - model.isBatch = receiveInfo.isBatch; - model.targetAvatar = receiveInfo.targetAvatar; - model.targetNick = receiveInfo.targetNick; - [self addToSvgaQueue:model]; - } else if (obj.hasVggPic && roomInfo.hasAnimationEffect) { - GiftReceiveInfoModel * model = [[GiftReceiveInfoModel alloc] init]; - model.mp4Url = obj.viewUrl; - model.avatar = receiveInfo.sendUserAvatar; - model.gift = obj; - model.giftNum = [obj.giftNum integerValue];; - model.nick = receiveInfo.nick; - model.targetUids = receiveInfo.targetUids; - model.isBatch = receiveInfo.isBatch; - model.targetAvatar = receiveInfo.targetAvatar; - model.targetNick = receiveInfo.targetNick; - [self addToSvgaQueue:model]; - } - }]; - } -} - -- (void)startHandleGiftEffectTimer { - NSTimeInterval period = 2.0; - dispatch_queue_t queue = dispatch_get_global_queue(0, 0); - dispatch_source_t timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - dispatch_source_set_timer(timer, dispatch_walltime(NULL, 0), period * NSEC_PER_SEC, 0); //每秒执行 - @kWeakify(self); - dispatch_source_set_event_handler(timer, ^{ - @kStrongify(self) - if (!self) { - return; - } - dispatch_async(self.giftEffectsQueue, ^{ - NSLog(@"******************* 当前队列个数: %@，image loader 个数： %@", @(self.svgaQueue.count), @(self.mp4AvatarLoaders.count)); - if (self.svgaQueue.count == 0) { - dispatch_source_cancel(timer); - dispatch_async(dispatch_get_main_queue(), ^{ - self.giftEffectTimer = nil; - }); - } else { - if (self.isPlayingGiftEffect == NO) { - self.isPlayingGiftEffect = YES; - GiftReceiveInfoModel *receiveModel = [self.svgaQueue xpSafeObjectAtIndex:0]; - if ([receiveModel isKindOfClass:[GiftReceiveInfoModel class]]) { - dispatch_async(dispatch_get_main_queue(), ^{ - [self createGiftSvgaAnimation:receiveModel]; - }); - }else { - [self removeFromSvgaQueueAtIndex:0]; - self.isPlayingGiftEffect = NO; - } - } - } - }); - }); - - self.giftEffectTimer = timer; - dispatch_resume(timer); -} - --(void)createGiftSvgaAnimation:(GiftReceiveInfoModel *)receiveInfo { - GiftInfoModel *giftInfo = receiveInfo.gift; - NSString *targetURL = @""; - - if (receiveInfo.isLuckyBagGift) { - // 播放背包礼物动画 - if (![NSString isEmpty:receiveInfo.mp4Url]) { - [self stopCarEffect:giftInfo.goldPrice]; - targetURL = receiveInfo.mp4Url; - [self playLuckyGiftEffectWithVapUrl:receiveInfo.mp4Url]; - } else if (![NSString isEmpty:receiveInfo.luckyGiftSvgaUrl]) { - [self stopCarEffect:giftInfo.goldPrice]; - targetURL = receiveInfo.luckyGiftSvgaUrl; - [self playGiftEffectWithVapUrl:receiveInfo.luckyGiftSvgaUrl]; - } else if (![NSString isEmpty:giftInfo.luckyGiftSvgaUrl]) { - [self stopCarEffect:giftInfo.goldPrice]; - targetURL = giftInfo.luckyGiftSvgaUrl; - [self playGiftEffectWithVapUrl:giftInfo.luckyGiftSvgaUrl]; - } - } else { - [self stopCarEffect:giftInfo.goldPrice]; - if (giftInfo.otherViewType == GiftOtherViewTypePag || - giftInfo.otherViewType == GiftOtherViewTypeMp4) { - if (giftInfo.otherViewType == GiftOtherViewTypePag) { - [self playGiftEffectWithPagUrl:giftInfo.viewUrl]; - targetURL = giftInfo.viewUrl; - } else { - self.mp4TempReceiveInfoModel = receiveInfo; - [self playGiftEffectWithVapUrl:giftInfo.viewUrl]; - targetURL = giftInfo.viewUrl; - } - } - // 兜底，同时判断是否可以执行 svga - if ([NSString isEmpty:targetURL] && giftInfo.hasVggPic && giftInfo.vggUrl.length > 0) { - [self playGiftEffectWithVggUrl:giftInfo.vggUrl]; - targetURL = giftInfo.vggUrl; - } - } - - // NSLog(@"******************* 执行播放， 是否MP4:%@，URL: %@, self.svgaQueue num: %@", @(giftInfo.otherViewType), targetURL, @(self.svgaQueue.count)); - - [[NSNotificationCenter defaultCenter] postNotificationName:@"kExchangeRoomAnimationViewAndGameViewIndex" - object:nil]; - @kWeakify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self removeFromSvgaQueueAtIndex:0]; - }); -} - -- (void)stopCarEffect:(double)goldPrice { - if ([ClientConfig shareConfig].configInfo.hideCarEffectGiftPrice <= goldPrice) { - [self.carEffectQueue removeAllObjects]; - [self.carSVGAEffectView stopAnimation]; - [self.carVapEffectView stopHWDMP4]; - [self.carPagEffectView stop]; - } -} - -- (void)playGiftEffectWithPagUrl:(NSString *)pagUrl { - @kWeakify(self); - [self.vapParser parseWithURL:pagUrl - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if ([NSString isEmpty:videoUrl]) { - [self playPAGFailure]; - } else { - [self _addSubviewToMiddleContainer:self.pagGiftEffectView]; - [self.pagGiftEffectView setPath:videoUrl]; - [self.pagGiftEffectView play]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - [self playPAGFailure]; - }]; -} - -- (void)playGiftEffectWithVapUrl:(NSString *)vapUrl { - NSString *encodingUrl = [vapUrl pureURLString]; - NSString *fullPath = [self _findFullPath:vapUrl]; - - self.mp4AvatarLoaders = @[].mutableCopy; - if ([[NSFileManager defaultManager] fileExistsAtPath:fullPath]){ - [self playVAG:fullPath]; - }else { - @kWeakify(self); - [self.vapParser parseWithURL:encodingUrl - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if ([NSString isEmpty:videoUrl]) { - [self playVAGFailure]; - } else { - [self playVAG:videoUrl]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - [self playVAGFailure]; - }]; - } -} - -- (void)playGiftEffectWithVggUrl:(NSString *)vggUrl { - NSString *encodingUrl = [vggUrl pureURLString]; - NSString *fullPath = [self _findFullPath:vggUrl]; - // NSLog(@"******************* 解释 SVGA : %@ | %@", encodingUrl, fullPath); - if (![NSString isEmpty:fullPath] && [[NSFileManager defaultManager] fileExistsAtPath:fullPath]) { - NSData *data = [NSData dataWithContentsOfFile:fullPath options:0 error:NULL]; - NSString *fileName = [[encodingUrl componentsSeparatedByString:@"/"] lastObject]; - @kWeakify(self); - [self.vggParser parseWithData:data - cacheKey:fileName - completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - if (videoItem) { - [self playVGG:videoItem]; - } else { - [self playVGGFailure]; - } - } failureBlock:^(NSError * _Nonnull error) { - @kStrongify(self); - [self playVGGFailure]; - }]; - } else { - @kWeakify(self); - [self.vggParser parseWithURL:[NSURL URLWithString:encodingUrl] - completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - // NSLog(@"******************* 解释 SVGA 成功"); - if (videoItem) { - [self playVGG:videoItem]; - } else { - [self playVGGFailure]; - } - } failureBlock:^(NSError * _Nullable error) { - @kStrongify(self); - // NSLog(@"******************* 解释 SVGA 失败：%@", error); - [self playVGGFailure]; - }]; - } -} - -- (void)playVGG:(SVGAVideoEntity *)videoItem { - [self.vggGiftEffectView stopAnimation]; - [self _addSubviewToMiddleContainer:self.vggGiftEffectView]; - [self _updateGiftEffectContentMode:self.vggGiftEffectView - size:videoItem.videoSize]; - self.vggGiftEffectView.videoItem = videoItem; - [self.vggGiftEffectView startAnimation]; -} - -- (void)playVGGFailure { - [self playVGGEnd]; -} - -- (void)playVGGEnd { - self.isPlayingGiftEffect = NO; - self.vggGiftEffectView.hidden = YES; -} - -- (void)playVAG:(NSString *)url { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self _addSubviewToMiddleContainer:self.vapGiftEffectView]; - [self.vapGiftEffectView setMute:NO]; - [self.vapGiftEffectView playHWDMP4:url - repeatCount:1 - delegate:self]; - }); -} - -- (void)playVAGFailure { - [self playVAGEnd]; -} - -- (void)playVAGEnd { - self.isPlayingGiftEffect = NO; - self.vapGiftEffectView.hidden = YES; - [self.vapGiftEffectView setMute:YES]; - [self.vapGiftEffectView stopHWDMP4]; - [self.vapGiftEffectView removeFromSuperview]; - self.vapGiftEffectView = nil; -} - -- (void)playPAGFailure { - self.isPlayingGiftEffect = NO; - self.pagGiftEffectView.hidden = YES; -} - -#pragma mark - Delegates -#pragma mark - SVGA delegate -- (void)svgaPlayerDidFinishedAnimation:(SVGAPlayer *)player { - if (player.tag == 913) { - [player clear]; - player.delegate = nil; - [player removeFromSuperview]; - self.viewIndex -= 1; - if ([self.broveSVGAQueue containsObject:player]) { - [self.broveSVGAQueue removeObject:player]; - } - return; - } - if (player == self.enterEffectView && player.loops == 1) { - [self endAnimationEnterEffect]; - } - else if (player == self.vggGiftEffectView) { - [self playVGGEnd]; - } - else if (player == self.carSVGAEffectView) { - self.carSVGAEffectView.hidden = YES; - [self.carSVGAEffectView removeFromSuperview]; - [self nextCarEffect]; - } -} - -#pragma mark - HWDMP4PlayDelegate -- (BOOL)shouldStartPlayMP4:(VAPView *)container config:(QGVAPConfigModel *)config { - CGFloat width = config.info.size.width; - CGFloat height = config.info.size.height; - - container.center = self.center; - [container mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(KScreenWidth * height / width); - }]; - return YES; -} - -- (void)viewDidFinishPlayMP4:(NSInteger)totalFrameCount view:(VAPView *)container { - dispatch_async(dispatch_get_main_queue(), ^{ - container.hidden = YES; - if (container == self.carVapEffectView) { - [self.carVapEffectView removeFromSuperview]; - self.carVapEffectView = nil; - [self nextCarEffect]; - } - else if (container == self.vapGiftEffectView) { - [self playVAGEnd]; - } - else if(container == self.luckyVapGiftEffectView) { - [self.luckyVapGiftEffectView removeFromSuperview]; - self.luckyVapGiftEffectView = nil; - } - }); -} - -- (void)viewDidStopPlayMP4:(NSInteger)lastFrameIndex view:(VAPView *)container { - dispatch_async(dispatch_get_main_queue(), ^{ - container.hidden = YES; - if (container == self.carVapEffectView) { - [self.carVapEffectView removeFromSuperview]; - [self nextCarEffect]; - } - else if (container == self.vapGiftEffectView) { - [self playVAGEnd]; - } - else if(container == self.luckyVapGiftEffectView) { - [self.luckyVapGiftEffectView removeFromSuperview]; - self.luckyVapGiftEffectView = nil; - } - }); -} - -- (void)viewDidFailPlayMP4:(NSError *)error{ - [self playVAGFailure]; -} - -- (void)loadVapImageWithURL:(NSString *)urlStr - context:(NSDictionary *)context - completion:(VAPImageCompletionBlock)completionBlock { - if (self.mp4TempReceiveInfoModel) { - dispatch_async(dispatch_get_main_queue(), ^{ - QGVAPSourceInfo *info = (QGVAPSourceInfo *)context[@"resource"]; - - // NSLog(@" MP4 的 key - info.contentTag : %@", info.contentTag); - [self _loadMP4AvatarURL:urlStr - info:info - completion:completionBlock]; - }); - } -} - -- (void)_loadMP4AvatarURL:(NSString *)urlStr - info:(QGVAPSourceInfo *)info - completion:(VAPImageCompletionBlock)completionBlock { - NSString *path = @""; - switch (self.mp4TempReceiveInfoModel.gift.showAvatarType) { - case 1: // 只使用 avatar - case 3: - path = self.mp4TempReceiveInfoModel.avatar; - if ([NSString isEmpty:path]) { - path = self.mp4TempReceiveInfoModel.sendUserAvatar; - } - break; - case 2: // 只使用 target avatar - path = self.mp4TempReceiveInfoModel.targetAvatar; - if ([NSString isEmpty:path]) { - path = self.mp4TempReceiveInfoModel.recvUserAvatar; - } - break; - default: - break; - } - - if ([NSString isEmpty:path]) { - completionBlock(kImage(@"common_avatar"), nil, @"dafeult image"); - } else { - NetImageView *avatar_Loader = [[NetImageView alloc] init]; - [avatar_Loader loadImageWithUrl:path - completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - completionBlock(image, nil, urlStr); - }]; - - [self.mp4AvatarLoaders addObject:avatar_Loader]; - } -} - -#pragma mark - PAGViewListener -- (void)onAnimationEnd:(PAGView*)pagView{ - dispatch_async(dispatch_get_main_queue(), ^{ - pagView.hidden = YES; - if (pagView == self.pagGiftEffectView) { - self.isPlayingGiftEffect = NO; - } - else if(pagView == self.carPagEffectView){ - [self.carPagEffectView removeFromSuperview]; - self.carPagEffectView = nil; - [self nextCarEffect]; - } - }); -} - -- (void)onAnimationCancel:(PAGView*)pagView{ - dispatch_async(dispatch_get_main_queue(), ^{ - pagView.hidden = YES; - if (pagView == self.pagGiftEffectView) { - self.isPlayingGiftEffect = NO; - } - }); -} - -#pragma mark - RoomHostDelegate -#pragma mark - RoomGuestDelegate: NIMCustomMessage -- (void)handleNIMCustomMessage:(NIMMessage *)message { - if (![message.messageObject isKindOfClass:[NIMCustomObject class]]) { - return; - } - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment == nil || ![obj.attachment isKindOfClass:[AttachmentModel class]]) { - return; - } - - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; -#if DEBUG - // 自定义消息处理入口排查日志：first/second、payload size、线程 - NSData *payloadJSON = nil; - @try { payloadJSON = [NSJSONSerialization dataWithJSONObject:attachment.data ?: @{} options:0 error:nil]; } @catch (__unused NSException *e) {} -#endif - switch (attachment.first) { - case CustomMessageType_User_Enter_Room: - [self _handleEnterRoomMessage:message]; - break; - case CustomMessageType_RedPacket: - [self _handleLuckyPackageMessage:attachment]; - break; - case CustomMessageType_Gift: - [self _handleGiftMessage:attachment]; - break; - case CustomMessageType_AllMicroSend: - [self _handleGiftMessage:attachment]; - break; - case CustomMessageType_Car_Notify: - [self handleCarEnter:attachment]; - break; - case CustomMessageType_CP: - [self receiveCPEvent:attachment]; - break; - case CustomMessageType_Super_Gift: - [self _handleSuperGift:attachment]; - break; - case CustomMessageType_General_Floating_Screen: - [self _handleCommonBanner:attachment]; - break; - case CustomMessageType_LuckyBag: - [self handleLuckyBag:attachment]; - break; - case CustomMessageType_Look_Love: - [self handle98:attachment]; - break; - case CustomMessageType_RoomPlay_Dating: - [self handleDating:attachment]; - break; - case CustomMessageType_Across_Room_PK: - [self handleAcrossRoomPK:attachment]; - break; - case CustomMessageType_Anchor_FansTeam: - [self handleAnchorFansTeam:attachment]; - break; - case CustomMessageType_Anchor_Hour_Rank: - [self handleAnchorHourRank:attachment]; - break; - case CustomMessageType_License_Hour_Rank: - [self handleLicenseHourRank:attachment]; - break; - case CustomMessageType_Gift_Compound: - [self handle93:attachment]; - break; - case CustomMessageType_Room_Sailing: - [self handle81:attachment]; - break; - case CustomMessageType_Graffiti_Gift: { - [self receiveRoomGraffitiGift:attachment]; - } - break; - case CustomMessageType_Graffiti_Star_Kitchen: - [self handle104:attachment]; - break; - case CustomMessageType_Tarot: - [self handleTarot:attachment]; - break; - case CustomMessageType_Common_H5: - [self handleCommonH5:attachment]; - break; - default: - break; - } -} - -- (void)_handleEnterRoomMessage:(NIMMessage *)message { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment == nil || ![obj.attachment isKindOfClass:[AttachmentModel class]]) { - return; - } - - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - switch (attachment.second) { - case Custom_Message_Sub_User_Enter_Room: { - RoomEnterModel *model = [RoomEnterModel modelWithJSON:attachment.data]; - if (model.platformRole == 1) { - return; - } - if (model.enterHide) { - //隐身进房 - if (model.uid == [AccountInfoStorage instance].getUid.integerValue) { - [self createEnterHideAnimation]; - } - } else { - NSString *userName = model.nick; - if (model.cpList.count > 0 && model.screenType < 3) { - NSString *title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomAnimationView0"), userName]; - NSDictionary * dic= @{@"title":title, - @"experLevelSeq":[NSString stringWithFormat:@"%ld", model.experLevelSeq], - @"effectPath" : @"", - @"isCP":@(YES) - }; - [self.enterRoomAnimationQueue addObject:dic]; - } else { - NSString *title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomAnimationView0"), userName]; - - NSDictionary * dic= @{@"title":title, - @"experLevelSeq":[NSString stringWithFormat:@"%ld", model.experLevelSeq], - @"effectPath" : model.enterRoomEffects.length ? model.enterRoomEffects : @""}; - [self.enterRoomAnimationQueue addObject:dic]; - } - [self tryDequeueAnimation]; - } - } - break; - - default: - break; - } -} - -- (void)_handleLuckyPackageMessage:(AttachmentModel *)attachment { - if ([self _isInSudGame]) { - return; - } - - switch (attachment.second) { - case Custom_Message_Sub_LuckyPackage: - [self receiveLuckGiftBanner:attachment]; - break; - - default: - return; - break; - } -} - -- (void)_handleGiftMessage:(AttachmentModel *)attachment { - if ([self _isInSudGame]) { - return; - } - - GiftReceiveInfoModel * receiveInfo = [GiftReceiveInfoModel modelWithJSON:attachment.data]; - [receiveInfo giftDataAlignment]; - - // 检查并修复连击计数 - if (receiveInfo.comboCount < 1) { - // 尝试从 attachment.data 中获取正确的连击计数 - NSNumber *dataComboCount = attachment.data[@"comboCount"]; - if (dataComboCount && [dataComboCount integerValue] >= 1) { - receiveInfo.comboCount = [dataComboCount integerValue]; - } else { - receiveInfo.comboCount = 1; - } - } - - - - - - - receiveInfo.isLuckyBagGift = (attachment.second == Custom_Message_Sub_Gift_LuckySend || - attachment.second == Custom_Message_Sub_AllMicroLuckySend || - attachment.second == Custom_Message_Sub_AllBatchMicroLuckySend); - receiveInfo.isBatch = (attachment.second == Custom_Message_Sub_AllBatchSend || - attachment.second == Custom_Message_Sub_AllBatchMicroLuckySend); - receiveInfo.isComboBatch = (attachment.second == Custom_Message_Sub_AllMicroSend); - - switch (attachment.second) { - case Custom_Message_Sub_Gift_Send: - [self _handleGift:receiveInfo attachment:attachment]; - break; - case Custom_Message_Sub_AllMicroSend: - case Custom_Message_Sub_AllBatchSend: - [self _handleGift:receiveInfo attachment:attachment]; - break; - case Custom_Message_Sub_Gift_ChannelNotify: - //处理原广播通用飘屏 banner 逻辑 - [self receiveRoomGiftBanner:attachment]; - return; - break; - case Custom_Message_Sub_Gift_EmbeddedStyle: - [self _handleGiftEmbeddedStyle:receiveInfo attachment:attachment]; - break; - case 607: - [self receiveLuckGiftBanner:attachment]; - break; - case Custom_Message_Sub_Gift_LuckySend: - case Custom_Message_Sub_AllMicroLuckySend: - case Custom_Message_Sub_AllBatchMicroLuckySend: - { - [self _handleGift:receiveInfo attachment:attachment]; -// if (receiveInfo.mp4Url.length > 0) { -// [self playLuckyGiftEffectWithVapUrl:receiveInfo.mp4Url]; -// } else { -// NSString * svgaString = receiveInfo.luckyGiftSvgaUrl.length > 0 ? receiveInfo.luckyGiftSvgaUrl : receiveInfo.gift.luckyGiftSvgaUrl; -// NSURL * luckyGiftSvgaUrl = [NSURL URLWithString:svgaString]; -// if (luckyGiftSvgaUrl.absoluteString.length > 0) { -// [self play:luckyGiftSvgaUrl]; -// } -// } -// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ -// [self receiveGift:receiveInfo]; -// }); - } - break; - - default: - break; - } - - if (receiveInfo.isLuckyBagGift) { - [self receiveGiftHandleSendGiftAnimationWith:receiveInfo - attachment:attachment]; - [self _handleBagGift:receiveInfo]; - } else { - if (receiveInfo.gift.notifyFull == 1 && - attachment.second == Custom_Message_Sub_Gift_Send) { - // 全服礼物，但由自己发送，不在此逻辑播放 - return; - } - // 处理从位置 发送者 到 接受者 的礼物移动动画 - [self receiveGiftHandleSendGiftAnimationWith:receiveInfo - attachment:attachment]; - // 播放礼物动画（svga/mp4）（如果有的话） - [self receiveGift:receiveInfo]; - } -} - -- (void)_handleBagGift:(GiftReceiveInfoModel *)receiveInfo { - if (!self.hostDelegate.getRoomInfo.hasAnimationEffect) { - return; - } - [self receiveGift:receiveInfo]; -} - -- (void)_handleGift:(GiftReceiveInfoModel *)receiveInfo - attachment:(AttachmentModel *)attachment { - // 确认接受者有 uid - if (receiveInfo.targetUsers.count == 0) { - GiftReceiveUserInfoModel *model = [[GiftReceiveUserInfoModel alloc] init]; - model.nick = receiveInfo.targetNick; - model.avatar = receiveInfo.targetAvatar; - model.uid = receiveInfo.uid.integerValue; - receiveInfo.targetUsers = @[model]; - } - // 确认接受者有 uid - if (receiveInfo.targetUsers.count > 0 && receiveInfo.targetUids.count <= 0) { - receiveInfo.targetUids = [receiveInfo.targetUsers valueForKeyPath:@"uid"]; - } -} - -- (void)_handleGiftEmbeddedStyle:(GiftReceiveInfoModel *)receiveInfo - attachment:(AttachmentModel *)attachment { - // 数据对齐 - receiveInfo.targetUid = [[attachment.data objectForKey:@"recvUserUid"] stringValue]; - receiveInfo.targetNick = [attachment.data objectForKey:@"recvUserNick"]; - receiveInfo.targetAvatar = [attachment.data objectForKey:@"recvUserAvatar"]; - receiveInfo.avatar = [attachment.data objectForKey:@"sendUserAvatar"]; - receiveInfo.nick = [attachment.data objectForKey:@"sendUserNick"]; - receiveInfo.uid = [[attachment.data objectForKey:@"sendUserUid"] stringValue]; - - // 确认接受者有 uid - if (receiveInfo.targetUsers.count > 0 && receiveInfo.targetUids.count <= 0) { - receiveInfo.targetUids = [receiveInfo.targetUsers valueForKeyPath:@"uid"]; - } -} - -- (void)_handleSuperGift:(AttachmentModel *)attachment { - switch (attachment.second) { - case Custom_Message_Sub_Super_Gift_Winning_Coins: - [self receiveLuckGiftWinning:attachment]; - break; - case Custom_Message_Sub_Super_Gift_Winning_Coins_ALL_Room: - [self receiveLuckGiftBanner:attachment]; - break; - case Custom_Message_Sub_Super_Gift_Banner: - [self handleBroveGiftBanner:attachment]; - break; - case Custom_Message_Sub_Super_Gift_UI_Rffect: - [self receiveBravoGiftWinning:attachment]; - default: - break; - } -} - -- (void)_handleCommonBanner:(AttachmentModel *)attachment { - switch (attachment.second) { - case Custom_Message_Sub_General_Floating_Screen_One_Room: - case Custom_Message_Sub_General_Floating_Screen_All_Room: - [self receiveRoomGeneralFloatingScreen:attachment]; - break; - - default: - break; - } -} - -- (NSString *)_findFullPath:(NSString *)url { - NSString *encodingUrl = [url pureURLString]; - NSString *fileName = [[encodingUrl componentsSeparatedByString:@"/"] lastObject]; - NSString *fullPath = [self.GiftDynamicEffectListPath stringByAppendingPathComponent:fileName]; - return fullPath; -} - -- (void)_updateGiftEffectContentMode:(UIView *)view - size:(CGSize)size { - CGFloat width = size.width; - CGFloat height = size.height; - if (width > height) { - view.contentMode = UIViewContentModeScaleAspectFit; - } else {//高大于宽 - CGFloat resizeH = KScreenWidth * height / width;//按照屏幕的宽度去缩放，获得高度 - if (resizeH > KScreenHeight) {//如果大于屏幕高度，填充 - view.contentMode = UIViewContentModeScaleAspectFill; - } else {//小于屏幕高度， - view.contentMode = UIViewContentModeScaleAspectFit; - } - } -} - -- (void)handleCommonH5:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - - switch (attachment.second) { - - - default: - break; - } -} - -- (void)handleTarot:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - switch (attachment.second) { - - - default: - break; - } -} - -- (void)handle98:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - switch (attachment.second) { - case Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend: - [self receiveCandyTreeGiftHighLevle:attachment]; - break; - - default: - break; - } -} - -- (void)handle104:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - switch (attachment.second) { - - - default: - break; - } -} - -- (void)handleLuckyBag:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - switch (attachment.second) { - case Custom_Message_Sub_Room_Gift_LuckBag_FullScree: - case Custom_Message_Sub_Room_Gift_LuckBag_Server: - [self receiveLuckyGiftBigPrize:attachment]; - break; - - default: - break; - } -} - -- (void)handleVIPLevelUp:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - switch (attachment.second) { - case Custom_Message_Sub_Room_Noble_LevelUp_Suspend: - [self receiveNobleLevelUp:attachment]; - break; - - default: - break; - } -} - -- (void)handleDating:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - switch (attachment.second) { - case Custom_Message_Sub_Room_Play_Dating_Public_Result: - [self roomDatingPublicResult:attachment]; - break; - - default: - break; - } -} - -- (void)handleAcrossRoomPK:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - switch (attachment.second) { - case Custom_Message_Sub_AcrossRoomPK_Result: - [self acrossRoomPKBannerAnimation:attachment]; - break; - - default: - break; - } -} - -- (void)handleAnchorFansTeam:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - switch (attachment.second) { - case Custom_Message_Sub_FansTeam_Join_Success: { - GiftReceiveInfoModel *receiveInfo = [[GiftReceiveInfoModel alloc] init]; - GiftInfoModel *giftInfo = [GiftInfoModel modelWithJSON:attachment.data[@"giftVo"]]; - receiveInfo.gift = giftInfo; - receiveInfo.giftInfo = giftInfo; - [self receiveFansTeamGiftHandleSendGiftAnimation:attachment]; - [self receiveGift:receiveInfo]; - } - break; - - default: - break; - } -} - -- (void)handleAnchorHourRank:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - switch (attachment.second) { - case Custom_Message_Sub_Anchor_Hour_Rank: - [self receiveAnchorHourRank:attachment]; - break; - - default: - break; - } -} - -- (void)handleLicenseHourRank:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - switch (attachment.second) { - case Custom_Message_Sub_License_Hour_Rank: - [self receiveAnchorHourRank:attachment]; - break; - - default: - break; - } -} - -- (void)handle93:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - switch (attachment.second) { - case Custom_Message_Sub_Gift_Compound: - [self receiveGiftCompound:attachment]; - break; - - default: - break; - } -} - -- (void)handle81:(AttachmentModel *)attachment { - if (!attachment) { - return; - } - switch (attachment.second) { - case Custom_Message_Sub_Sailing_AllRoom_Notify: - case Custom_Message_Sub_Sailing_InRoom_NeedAllMicSend: - [self receiveRoomSailing:attachment]; - break; - - default: - break; - } -} - -- (void)handleBroveGiftBanner:(AttachmentModel *)attachment { - [self inserBannerModelToQueue:attachment]; -} - - -#pragma mark - RoomGuestDelegate: NIMNotificationMessageDelegate -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - return; -// NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; -// NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; -// if (!content) { -// return; -// } -// -// switch (content.eventType) { -// case NIMChatroomEventTypeEnter: -// [self enterRoom:message content:content]; -// break; -// -// default: -// break; -// } -} - -#pragma mark - NIMBroadcastManagerDelegate -- (void)onReceiveBroadcastMessage:(NIMBroadcastMessage *)broadcastMessage { - if (broadcastMessage.content) { - NSDictionary *msgDictionary = [broadcastMessage.content toJSONObject]; - AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]]; - NSString *partitionId = [NSString stringWithFormat:@"%@",attachment.data[@"partitionId"]]; - if(![partitionId isEqualToString:self.hostDelegate.getUserInfo.partitionId]){ - return; - } - - switch (attachment.first) { - case CustomMessageType_General_Floating_Screen: - [self _handleCommonBanner:attachment]; - break; - case CustomMessageType_Noble_VIP: - [self handleVIPLevelUp:attachment]; - break; - case CustomMessageType_LuckyBag: - [self handleLuckyBag:attachment]; - break; - case CustomMessageType_Graffiti_Star_Kitchen: - [self handle104:attachment]; - break; - case CustomMessageType_Look_Love: - [self handle98:attachment]; - break; - case CustomMessageType_Tarot: - [self handleTarot:attachment]; - break; - case CustomMessageType_Common_H5: - [self handleCommonH5:attachment]; - break; - - default: - break; - } - } -} - -#pragma mark - GiftAnimationManagerDelegate -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { - return [self.hostDelegate animationPointAtStageViewByUid:uid]; -} - -#pragma mark - Gesture -- (void)addBnnerContainGesture { - [self insertSubview:self.bannerSwipeGestureContainer aboveSubview:self.bannerContainer]; - [self insertSubview:self.bannerLeftTapGestureContainer aboveSubview:self.bannerContainer]; - [self insertSubview:self.bannerRightTapGestureContainer aboveSubview:self.bannerContainer]; - - // 设置容器 tag 用于手势优化器识别 - self.bannerSwipeGestureContainer.tag = 1001; // 中央容器 - self.bannerLeftTapGestureContainer.tag = 1002; // 左侧容器 - self.bannerRightTapGestureContainer.tag = 1003; // 右侧容器 - - [self.bannerSwipeGestureContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.bannerContainer); - make.top.bottom.mas_equalTo(self.bannerContainer); - make.width.mas_equalTo(self.bannerContainer.mas_width).multipliedBy(2.0/3.0); - }]; - - [self.bannerLeftTapGestureContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.bottom.mas_equalTo(self.bannerContainer); - make.trailing.mas_equalTo(self.bannerSwipeGestureContainer.mas_leading); - }]; - - [self.bannerRightTapGestureContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.bottom.mas_equalTo(self.bannerContainer); - make.leading.mas_equalTo(self.bannerSwipeGestureContainer.mas_trailing); - }]; - - // 创建中央区域的 swipe 手势（2/3 宽度） - UISwipeGestureRecognizer *swipe = [[UISwipeGestureRecognizer alloc] initWithTarget:self - action:@selector(handleSwipe)]; - if (isMSRTL()) { - swipe.direction = UISwipeGestureRecognizerDirectionRight; - } else { - swipe.direction = UISwipeGestureRecognizerDirectionLeft; - } - swipe.delegate = self; - - // 创建中央区域的 tap 手势（2/3 宽度） - UITapGestureRecognizer *centerTap = [[UITapGestureRecognizer alloc] initWithTarget:self - action:@selector(handleBannerTap:)]; - centerTap.delegate = self; - - // 创建左侧区域的 tap 手势（1/6 宽度） - UITapGestureRecognizer *leftTap = [[UITapGestureRecognizer alloc] initWithTarget:self - action:@selector(handleBannerTap:)]; - leftTap.delegate = self; - - // 创建右侧区域的 tap 手势（1/6 宽度） - UITapGestureRecognizer *rightTap = [[UITapGestureRecognizer alloc] initWithTarget:self - action:@selector(handleBannerTap:)]; - rightTap.delegate = self; - - // 只有当 swipe 判定失败后，tap 才允许成功 - [centerTap requireGestureRecognizerToFail:swipe]; - - // 添加手势识别器 - [self.bannerSwipeGestureContainer addGestureRecognizer:swipe]; - [self.bannerSwipeGestureContainer addGestureRecognizer:centerTap]; - [self.bannerLeftTapGestureContainer addGestureRecognizer:leftTap]; - [self.bannerRightTapGestureContainer addGestureRecognizer:rightTap]; - - NSLog(@"🎯 手势识别器设置完成 - 中央容器: %@, 左侧容器: %@, 右侧容器: %@", - NSStringFromClass([self.bannerSwipeGestureContainer class]), - NSStringFromClass([self.bannerLeftTapGestureContainer class]), - NSStringFromClass([self.bannerRightTapGestureContainer class])); -} - -- (void)handleSwipe { - // 只对当前显示的 banner 发送 swipe 通知 - // 通过检查当前 bannerContainer 中是否有可见的 banner 来决定是否发送通知 - UIView *currentVisibleBanner = nil; - for (UIView *subview in self.bannerContainer.subviews) { - if (!subview.hidden && subview.alpha > 0.01) { - currentVisibleBanner = subview; - break; - } - } - - if (currentVisibleBanner) { - NSLog(@"🎯 检测到 swipe 手势，当前有可见 banner: %@，发送 SwipeOutBanner 通知", NSStringFromClass([currentVisibleBanner class])); - // 传递当前 banner 信息，让监听者知道是哪个 banner 被 swipe - [[NSNotificationCenter defaultCenter] postNotificationName:@"SwipeOutBanner" - object:currentVisibleBanner]; - } else { - NSLog(@"🎯 检测到 swipe 手势，但当前没有可见 banner，忽略此手势"); - } -} - -- (void)handleBannerTap:(UITapGestureRecognizer *)tapGesture { - CGPoint tapPoint = [tapGesture locationInView:self.bannerContainer]; - - // 🔧 新增：检查是否有可见的 banner - BOOL hasVisibleBanner = NO; - for (UIView *subview in self.bannerContainer.subviews) { - if (!subview.hidden && subview.alpha > 0.01) { - hasVisibleBanner = YES; - break; - } - } - - // 如果没有可见的 banner，直接转发点击事件到下层 - if (!hasVisibleBanner) { - NSLog(@"🎯 没有可见 banner，直接转发点击事件到下层"); - self.savedTapPoint = tapPoint; - self.hasSavedTapPoint = YES; - CGPoint screenPoint = [self.bannerContainer convertPoint:tapPoint toView:nil]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"BannerTapToFunctionContainer" - object:nil - userInfo:@{@"point": [NSValue valueWithCGPoint:screenPoint]}]; - return; - } - - // 有可见 banner 时的原有逻辑 - if ([self isPointInBannerInteractiveArea:tapPoint]) { - // banner 可以响应，不处理，让 banner 继续原有逻辑 - NSLog(@"🎯 Banner tap 位置在可交互区域，banner 将处理此事件"); - [[NSNotificationCenter defaultCenter] postNotificationName:@"TapBanner" - object:nil - userInfo:@{@"point": [NSValue valueWithCGPoint:tapPoint]}]; - } else { - // banner 不能响应，保存 tap 位置 - self.savedTapPoint = tapPoint; - self.hasSavedTapPoint = YES; - NSLog(@"💾 Banner tap 位置不在可交互区域，已保存位置: %@", NSStringFromCGPoint(tapPoint)); - // 将 bannerContainer 中的点转换为屏幕坐标系 - CGPoint screenPoint = [self.bannerContainer convertPoint:tapPoint toView:nil]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"BannerTapToFunctionContainer" - object:nil - userInfo:@{@"point": [NSValue valueWithCGPoint:screenPoint]}]; - } -} - -- (BOOL)isPointInBannerInteractiveArea:(CGPoint)point { - // 使用缓存管理器进行快速检查 - TouchAreaCacheManager *cacheManager = [TouchAreaCacheManager sharedManager]; - - // 首先尝试使用缓存 - if ([cacheManager isPointInInteractiveArea:point]) { - NSLog(@"🎯 isPointInBannerInteractiveArea: 缓存命中 - 点 %@ 在可交互区域内", NSStringFromCGPoint(point)); - return YES; - } - - // 缓存未命中，使用传统方法检查 - NSLog(@"🎯 isPointInBannerInteractiveArea: 缓存未命中，使用传统方法检查"); - for (UIView *subview in self.bannerContainer.subviews) { - if (subview.hidden || subview.alpha <= 0.01) { - continue; - } - - // 检查点是否在子视图范围内 - if (CGRectContainsPoint(subview.bounds, point)) { - // 检查子视图是否支持用户交互 - if (subview.userInteractionEnabled) { - // 进一步检查子视图是否有可点击的元素 - CGPoint subviewPoint = [subview convertPoint:point fromView:self.bannerContainer]; - UIView *hitView = [subview hitTest:subviewPoint withEvent:nil]; - if (hitView && hitView.userInteractionEnabled) { - // 更新缓存 - CGRect bannerBounds = subview.bounds; - CGRect interactiveBounds = [self calculateInteractiveBoundsForView:subview]; - [cacheManager updateBannerBounds:bannerBounds - interactiveBounds:interactiveBounds - forBanner:subview]; - - NSLog(@"🎯 isPointInBannerInteractiveArea: 传统方法命中，已更新缓存"); - return YES; - } - } - } - } - - NSLog(@"🎯 isPointInBannerInteractiveArea: 点 %@ 不在可交互区域内", NSStringFromCGPoint(point)); - return NO; -} - -#pragma mark - UIGestureRecognizerDelegate - -- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { - // 允许手势同时识别 - return YES; -} - -- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch { - CGPoint touchPoint = [touch locationInView:self.bannerContainer]; - CGFloat containerWidth = self.bannerContainer.bounds.size.width; - - // 使用手势优化器进行优化 - GestureOptimizer *optimizer = [GestureOptimizer sharedOptimizer]; - BOOL shouldReceive = [optimizer shouldGestureRecognizer:gestureRecognizer - receiveTouchAtPoint:touchPoint - containerWidth:containerWidth]; - - // 调试信息 - if (shouldReceive) { - [optimizer debugGestureAreaForPoint:touchPoint containerWidth:containerWidth]; - } - - return shouldReceive; -} - -#pragma mark - Animations -- (void)enterRoomAnimationFor:(UIView *)targetView - startFrom:(CGPoint)sfPoint - startTo:(CGPoint)stPoint - endFrom:(CGPoint)efPoint - endTo:(CGPoint)etPoint - duration:(CFTimeInterval)duration - completion:(void (^)(BOOL finished))completion { - @kWeakify(self); - [self enterRoomMoveInAnimationFor:targetView - fromValue:sfPoint - toValue:stPoint - completion:^(BOOL finished) { - if (finished) { - @kStrongify(self); - @kWeakify(self); - [self enterRoomMoveOutAnimationFor:targetView - fromValue:efPoint - toValue:etPoint - beginTime:duration - completion:^(BOOL finished) { - if (finished) { - @kStrongify(self); - [self cleanupAnimationsForView:targetView]; - if (completion) { - completion(finished); - } - } - }]; - } - }]; -} - -- (void)enterRoomMoveInAnimationFor:(UIView *)view - fromValue:(CGPoint)fromValue - toValue:(CGPoint)toValue - completion:(void (^)(BOOL finished))completion { - POPSpringAnimation *springAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter]; - springAnimation.springSpeed = 12; - springAnimation.springBounciness = 10.f; - springAnimation.fromValue = [NSValue valueWithCGPoint:fromValue]; - springAnimation.toValue = [NSValue valueWithCGPoint:toValue]; - [springAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - if (completion) completion(finished); - }]; - [view pop_addAnimation:springAnimation forKey:@"amationSpringIn"]; -} - -- (void)enterRoomMoveOutAnimationFor:(UIView *)view - fromValue:(CGPoint)fromValue - toValue:(CGPoint)toValue - beginTime:(CFTimeInterval)beginTime - completion:(void (^)(BOOL finished))completion { - POPSpringAnimation *moveAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter]; - moveAnimation.fromValue = [NSValue valueWithCGPoint:fromValue]; - moveAnimation.toValue = [NSValue valueWithCGPoint:toValue]; - moveAnimation.beginTime = beginTime; - moveAnimation.springSpeed = 8; - moveAnimation.springBounciness = 15.f; - [moveAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - if (completion) completion(finished); - }]; - [view pop_addAnimation:moveAnimation forKey:@"animetionMoveOut"]; -} - -- (void)cleanupAnimationsForView:(UIView *)view { - [view pop_removeAllAnimations]; - [view removeFromSuperview]; -} - -#pragma mark - Common methods -- (NSString *)_resolveUserNameFromContent:(NIMChatroomNotificationContent *)content - extModel:(XPMessageRemoteExtModel *)extModel { - // 1) extModel.nick 优先 - if (![NSString isEmpty:extModel.nick]) { - return extModel.nick; - } - // 2) 如果 extModel.nick 为空，看 content.source.nick - if (![NSString isEmpty:content.source.nick]) { - return content.source.nick; - } - // 3) 如果依然空，并且是自己，则取本地 nick - if (content.source.userId.intValue == self.hostDelegate.getUserInfo.uid && - ![NSString isEmpty:self.hostDelegate.getUserInfo.nick]) { - return self.hostDelegate.getUserInfo.nick; - } - // 4) 兜底 - return @""; -} - -- (NSString *)_mapExperLevelSeqToLocalKey:(NSInteger)seq { - if (seq >= 30 && seq <= 39) { - return @"experience_entre_effect_30"; - } else if (seq >= 40 && seq <= 49) { - return @"experience_entre_effect_40"; - } else if (seq >= 50 && seq <= 59) { - return @"experience_entre_effect_50"; - } else if (seq >= 60 && seq <= 69) { - return @"experience_entre_effect_60"; - } else if (seq >= 70 && seq <= 79) { - return @"experience_entre_effect_70"; - } else if (seq >= 80 && seq <= 89) { - return @"experience_entre_effect_80"; - } else if (seq >= 90) { - return @"experience_entre_effect_90"; - } - return @""; -} - -- (BOOL)_isInSudGame { - BOOL isGamePlaying = NO; - if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) { - NSInteger micCount = self.hostDelegate.getRoomInfo.mgMicNum; - for (int i = -1; i 0) { - [self.animationListB xpSafeRemoveObjectAtIndex:0]; - } - self.isPlayOfB = NO; - [self playAnimationWithModel]; - } - }]; - [luckyGiftEffectView pop_addAnimation:moveAnimation forKey:@"moveOutAnimation"]; - }); - [luckyGiftEffectView pop_addAnimation:springAnimation forKey:@"nobleLevelUpspingOutAnimation"]; -} - -- (void)receiveCandyTreeGiftHighLevle:(AttachmentModel *)attatchment { - if ([self _isInSudGame]) {return;} - PIBaseAnimationViewModel *giftModel = [PIBaseAnimationViewModel new]; - giftModel.data = attatchment.data; - giftModel.second = attatchment.second; - giftModel.first = attatchment.first; - giftModel.type = GiftBannerType_Love; - if (self.animationListB.count == 0 && self.isPlayOfB == NO) { - [self createCandyTreeBannerAnimation:giftModel]; - } - [self.animationListB addObject:giftModel]; -} - -- (void)createCandyTreeBannerAnimation:(PIBaseAnimationViewModel *)attatchment { - CGFloat kscale = (CGFloat)60 / (CGFloat)375; - self.isPlayOfB = YES; - CGFloat top = (kNavigationHeight + 15); - XPRoomCandyGiftView *candyTreeView = [[XPRoomCandyGiftView alloc] initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)]; - candyTreeView.isMaxLargeGift = attatchment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend; - candyTreeView.candyInfo = attatchment.data; - [self.middleContainer addSubview:candyTreeView]; - POPSpringAnimation *springAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter]; - springAnimation.springSpeed = 12; - springAnimation.springBounciness = 10.f; - springAnimation.fromValue = [NSValue valueWithCGPoint:candyTreeView.center]; - springAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(candyTreeView.frame.size.width / 2, candyTreeView.center.y)]; - @kWeakify(self); - [springAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - @kStrongify(self); - if (finished) { - POPBasicAnimation *moveAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewCenter]; - moveAnimation.fromValue = [NSValue valueWithCGPoint:CGPointMake(0, candyTreeView.center.y)]; - moveAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(-KScreenWidth/2, candyTreeView.center.y)]; - moveAnimation.beginTime = CACurrentMediaTime() + 3; - moveAnimation.duration = 0.5; - moveAnimation.repeatCount = 1; - moveAnimation.removedOnCompletion = YES; - @kWeakify(self); - [moveAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - @kStrongify(self); - if (finished) { - [candyTreeView removeFromSuperview]; - self.isPlayOfB = NO; - if (self.animationListB.count > 0) { - [self.animationListB xpSafeRemoveObjectAtIndex:0]; - } - [self playAnimationWithModel]; - } - }]; - [candyTreeView pop_addAnimation:moveAnimation forKey:@"moveOutAnimation"]; - } - }]; - [candyTreeView pop_addAnimation:springAnimation forKey:@"candyTreespingOutAnimation"]; -} - -- (void)receiveNobleLevelUp:(AttachmentModel *)attachment { - @kWeakify(self); - [[NetImageView new]loadImageWithUrl:attachment.data[@"avatar"] completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - PIBaseAnimationViewModel *nobleModel = [PIBaseAnimationViewModel new]; - nobleModel.data = attachment.data; - nobleModel.type = GiftBannerType_Nobleman; - if (self.animationListB.count == 0 && self.isPlayOfB == NO) { - [self createNobleLevelUpBannerAnimation:nobleModel]; - } - [self.animationListB addObject:nobleModel]; - }]; -} - -- (void)createNobleLevelUpBannerAnimation:(PIBaseAnimationViewModel *)model { - self.isPlayOfB = YES; - CGFloat top = (kNavigationHeight + 15); - XPRoomNobleLevelUpView *nobleLevelUpView = [[XPRoomNobleLevelUpView alloc] initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth, 90)]; - nobleLevelUpView.nobleInfo = model.data; - [self.topContainer addSubview:nobleLevelUpView]; - @kWeakify(self); - @kWeakify(nobleLevelUpView); - nobleLevelUpView.completionBlock = ^{ - @kStrongify(self); - @kStrongify(nobleLevelUpView); - POPSpringAnimation *springAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter]; - springAnimation.springSpeed = 12; - springAnimation.springBounciness = 10.f; - springAnimation.fromValue = [NSValue valueWithCGPoint:nobleLevelUpView.center]; - springAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(nobleLevelUpView.frame.size.width / 2, nobleLevelUpView.center.y)]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(6.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - POPBasicAnimation *moveAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewCenter]; - moveAnimation.fromValue = [NSValue valueWithCGPoint:CGPointMake(0, nobleLevelUpView.center.y)]; - moveAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(-KScreenWidth/2, nobleLevelUpView.center.y)]; - moveAnimation.beginTime = CACurrentMediaTime() + 3; - moveAnimation.duration = 0.5; - moveAnimation.repeatCount = 1; - moveAnimation.removedOnCompletion = YES; - @kWeakify(self); - [moveAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - @kStrongify(self); - if (finished) { - self.isPlayOfB = NO; - [nobleLevelUpView removeFromSuperview]; - if (self.animationListB.count > 0) { - [self.animationListB xpSafeRemoveObjectAtIndex:0]; - } - [self playAnimationWithModel]; - } - }]; - [nobleLevelUpView pop_addAnimation:moveAnimation forKey:@"moveOutAnimation"]; - }); - [nobleLevelUpView pop_addAnimation:springAnimation forKey:@"nobleLevelUpspingOutAnimation"]; - }; -} - -- (void)createAnchorHourRankAnimation:(PIBaseAnimationViewModel *)attachment { - self.isPlayOfB = YES; - CGFloat top = (kNavigationHeight + 15); - XPRoomAnchorRankBannerView *anchorRankView = [[XPRoomAnchorRankBannerView alloc] initWithFrame:CGRectMake(KScreenWidth,top, KScreenWidth, kGetScaleWidth(55))]; - anchorRankView.anchorRankInfo = [RoomHalfHourRankModel modelWithDictionary:attachment.data]; - anchorRankView.delegate = self; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(gotoTopRankAnchorRoom:)]; - [anchorRankView addGestureRecognizer:tap]; - [self.topContainer addSubview:anchorRankView]; - POPSpringAnimation *springAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter]; - springAnimation.springSpeed = 12; - springAnimation.springBounciness = 10.f; - springAnimation.fromValue = [NSValue valueWithCGPoint:anchorRankView.center]; - springAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(anchorRankView.frame.size.width / 2, anchorRankView.center.y)]; - [springAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - if (finished) { - POPBasicAnimation *moveAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewCenter]; - moveAnimation.fromValue = [NSValue valueWithCGPoint:CGPointMake(0, anchorRankView.center.y)]; - moveAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(-KScreenWidth/2, anchorRankView.center.y)]; - moveAnimation.beginTime = CACurrentMediaTime() + 3; - moveAnimation.duration = 0.5; - moveAnimation.repeatCount = 1; - moveAnimation.removedOnCompletion = YES; - [moveAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - [anchorRankView removeFromSuperview]; - self.isPlayOfB = NO; - if(self.animationListB.count > 0){ - [self.animationListB xpSafeRemoveObjectAtIndex:0]; - [self playAnimationWithModel]; - } - }]; - [anchorRankView pop_addAnimation:moveAnimation forKey:@"moveOutAnimation"]; - } - }]; - [anchorRankView pop_addAnimation:springAnimation forKey:@"nobleLevelUpspingOutAnimation"]; -} - -- (void)gotoTopRankAnchorRoom:(UITapGestureRecognizer *)tap { - XPRoomAnchorRankBannerView * view = (XPRoomAnchorRankBannerView *)tap.view; - if (view.anchorRankInfo.uid.integerValue > 0) { - [self.hostDelegate exitRoom]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:view.anchorRankInfo.uid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } -} - -- (void)createGiftCompoundBannerAnimation:(PIBaseAnimationViewModel *)attachment { - self.isPlayOfB = YES; - XPRoomGiftCompoundView *compoundGiftView = [[XPRoomGiftCompoundView alloc] initWithFrame:CGRectMake(KScreenWidth, kNavigationHeight + 15, KScreenWidth, 45)]; - compoundGiftView.compoundGiftInfo = attachment.data; - [self.middleContainer addSubview:compoundGiftView]; - POPSpringAnimation *springAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter]; - springAnimation.springSpeed = 12; - springAnimation.springBounciness = 10.f; - springAnimation.fromValue = [NSValue valueWithCGPoint:compoundGiftView.center]; - springAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(compoundGiftView.frame.size.width / 2, compoundGiftView.center.y)]; - [springAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - if (finished) { - POPBasicAnimation *moveAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewCenter]; - moveAnimation.fromValue = [NSValue valueWithCGPoint:CGPointMake(0, compoundGiftView.center.y)]; - moveAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(-KScreenWidth/2, compoundGiftView.center.y)]; - moveAnimation.beginTime = CACurrentMediaTime() + 3; - moveAnimation.duration = 0.5; - moveAnimation.repeatCount = 1; - moveAnimation.removedOnCompletion = YES; - @kWeakify(self); - [moveAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - @kStrongify(self); - if (finished) { - [compoundGiftView removeFromSuperview]; - self.isPlayOfB = NO; - if(self.animationListB.count > 0){ - [self.animationListB xpSafeRemoveObjectAtIndex:0]; - } - [self playAnimationWithModel]; - } - }]; - [compoundGiftView pop_addAnimation:moveAnimation forKey:@"moveOutAnimation"]; - } - }]; - [compoundGiftView pop_addAnimation:springAnimation forKey:@"compoundGiftSpingOutAnimation"]; -} - -- (void)createGeneralFloatingScreenAnimation:(PIBaseAnimationViewModel *)attachment bannerModel:(PIUniversalBannerModel *)model { - self.isPlayOfB = YES; - CGFloat top = (kNavigationHeight + 15); - - if (!model) { - model = [PIUniversalBannerModel modelWithDictionary:attachment.data]; - } - - BOOL isSvga = [model.resourceType.uppercaseString isEqualToString:@"SVGA"]; - __block PIUniversalBannerView *bannerView; - @kWeakify(self); - if (isSvga == YES) { - SVGAParser *parser = [SVGAParser new]; - [parser parseWithURL:[NSURL URLWithString:model.resourceContent] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - model.videoItem = videoItem; - CGFloat height = kGetScaleWidth(60); - if(videoItem.videoSize.width > 0){ - height = KScreenWidth * videoItem.videoSize.height / videoItem.videoSize.width; - } - - bannerView = [[PIUniversalBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth, height)]; - [self showGeneralFloatingScreenView:bannerView model:model]; - } failureBlock:^(NSError * _Nonnull error) { - @kStrongify(self); - [bannerView removeFromSuperview]; - self.isPlayOfB = NO; - if(self.animationListB.count > 0){ - [self.animationListB xpSafeRemoveObjectAtIndex:0]; - } - [self playAnimationWithModel]; - }]; - }else{ - if (!_imageLoader) { - _imageLoader = [[NetImageView alloc] init]; - } - [self.imageLoader loadImageWithUrl:model.resourceContent - completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - model.image = image; - CGFloat width = image.size.width <= 0 ? kGetScaleWidth(60) : image.size.width; - CGFloat height = image.size.height ; - CGFloat getHeight = KScreenWidth * height / width; - if (getHeight > 100) { - getHeight = 100; - } - bannerView = [[PIUniversalBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth, getHeight) ]; - [self showGeneralFloatingScreenView:bannerView model:model]; - - } - fail:^(NSError * _Nonnull error) { - @kStrongify(self); - [bannerView removeFromSuperview]; - self.isPlayOfB = NO; - if(self.animationListB.count > 0){ - [self.animationListB xpSafeRemoveObjectAtIndex:0]; - } - [self playAnimationWithModel]; - }]; - } -} - --(void)showGeneralFloatingScreenView:(PIUniversalBannerView *)bannerView model:(PIUniversalBannerModel *)model{ - BOOL isSvga = [model.resourceType isEqualToString:@"SVGA"]; - bannerView.isSvga = isSvga; - bannerView.delegate = self; - if (!_universalBannerViewCaches) { - _universalBannerViewCaches = @[].mutableCopy; - } - [self.universalBannerViewCaches addObject:bannerView]; - @kWeakify(bannerView); - @kWeakify(self); - [bannerView setAllowToPlay:^{ - @kStrongify(self); - @kStrongify(bannerView); - [self.topContainer addSubview:bannerView]; - POPSpringAnimation *springAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter]; - springAnimation.springSpeed = 12; - springAnimation.springBounciness = 10.f; - springAnimation.fromValue = [NSValue valueWithCGPoint:bannerView.center]; - springAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(bannerView.frame.size.width / 2, bannerView.center.y)]; - @kWeakify(self); - [springAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - if (finished) { - POPBasicAnimation *moveAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewCenter]; - moveAnimation.fromValue = [NSValue valueWithCGPoint:CGPointMake(0, bannerView.center.y)]; - moveAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(-KScreenWidth/2, bannerView.center.y)]; - moveAnimation.beginTime = CACurrentMediaTime() + 5; - moveAnimation.duration = 0.5; - moveAnimation.repeatCount = 1; - moveAnimation.removedOnCompletion = YES; - - [moveAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - @kStrongify(self); - if (finished) { - [bannerView removeFromSuperview]; - [self.universalBannerViewCaches removeObject:bannerView]; - self.isPlayOfB = NO; - if(self.animationListB.count > 0){ - [self.animationListB xpSafeRemoveObjectAtIndex:0]; - } - [self playAnimationWithModel]; - } - }]; - [bannerView pop_addAnimation:moveAnimation forKey:@"moveOutAnimation"]; - } - }]; - [bannerView pop_addAnimation:springAnimation forKey:@"starKitchenOutAnimation"]; - }]; - - bannerView.model = model; -} - -- (void)roomDatingPublicResult:(AttachmentModel *)attachment { - self.datingEffectQueue = [NSMutableArray array]; - ///心动结果公布的话 结果是一个数组 - NSArray * results = [DatingInfoModel modelsWithArray:attachment.data[@"list"]]; - [self.datingEffectQueue addObjectsFromArray:results]; - if (self.datingEffectQueue.count > 0) { - [self startDatingAnimation:self.datingEffectQueue.firstObject]; - } -} - -- (void)startDatingAnimation:(DatingInfoModel *)datingModel { - [[NSNotificationCenter defaultCenter] postNotificationName:@"message" object:[self createRoomDatingResultMessage:datingModel]]; - NSString * targetUid= [NSString stringWithFormat:@"%ld", datingModel.targetUid]; - NSString * uid= [NSString stringWithFormat:@"%ld", datingModel.uid]; - if (datingModel.hasHeart || datingModel.hasSelectUser) { - datingModel.originPoint = [self.hostDelegate animationPointAtStageViewByUid:uid]; - datingModel.targetPoint = [self.hostDelegate animationPointAtStageViewByUid:targetUid]; - } - XPRoomDatingAnimationView *datingView = [[XPRoomDatingAnimationView alloc] init]; - [self.topContainer addSubview:datingView]; - [datingView startAnimationWithModel:datingModel finishBlock:^(BOOL finish) { - [datingView removeFromSuperview]; - [self.datingEffectQueue removeObject:datingModel]; - if (self.datingEffectQueue.count > 0) { - DatingInfoModel * datingModel = [self.datingEffectQueue firstObject]; - [self startDatingAnimation:datingModel]; - } - }]; -} - -- (NIMMessage *)createRoomDatingResultMessage:(DatingInfoModel *)datingModel { - NIMMessage * message = [[NIMMessage alloc] init]; - NIMSession * session = [NIMSession session:[NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId] type:NIMSessionTypeChatroom]; - [message setValue:session forKey:@"session"]; - AttachmentModel * attach = [[AttachmentModel alloc] init]; - attach.first = CustomMessageType_RoomPlay_Dating; - if (datingModel.hasHeart) {///如果是互选的话 - attach.second = Custom_Message_Sub_Room_Play_Dating_Result_Mutual; - } else { - attach.second = Custom_Message_Sub_Room_Play_Dating_Result_Not_Mutual; - } - attach.data = [datingModel model2dictionary]; - NIMCustomObject * object = [[NIMCustomObject alloc] init]; - object.attachment = attach; - message.messageObject = object; - return message; -} - -- (void)acrossRoomPKBannerAnimation:(AttachmentModel *)attacment { - AcrossRoomPKPrizeModel * prizeModel = [AcrossRoomPKPrizeModel modelWithJSON:attacment.data]; - if (attacment.second == Custom_Message_Sub_AnchorPK_Result) { - prizeModel.pkType = 1; - } else { - prizeModel.pkType = 0; - } - [self.acrossRoomPKQueue addObject:prizeModel]; - if (self.acrossRoomPKQueue.count == 1 ) {//判断为1个时开始播放，防止多条消息回来后重叠播放 - [self startAcrossRoomPKAnimation:self.acrossRoomPKQueue.firstObject]; - } -} - -- (void)startAcrossRoomPKAnimation:(AcrossRoomPKPrizeModel *)model { - XPAcrossRoomPKPrizeView *wishEffectView = [[XPAcrossRoomPKPrizeView alloc] initWithFrame:CGRectMake(KScreenWidth, kNavigationHeight+40, KScreenWidth, 87)]; - wishEffectView.data = model; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(gotoPkWinRoom:)]; - [wishEffectView addGestureRecognizer:tap]; - [self.topContainer addSubview:wishEffectView]; - [UIView animateWithDuration:0.5 animations:^{ - wishEffectView.frame = CGRectMake(0, kNavigationHeight+40, KScreenWidth, 87); - } completion:^(BOOL finished) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [UIView animateWithDuration:0.5 animations:^{ - wishEffectView.hidden = YES; - } completion:^(BOOL finished) { - [wishEffectView removeFromSuperview]; - [self.acrossRoomPKQueue removeObject:model]; - if (self.acrossRoomPKQueue.count > 0) { - [self startAcrossRoomPKAnimation:self.acrossRoomPKQueue.firstObject]; - } - }]; - }); - }]; -} - -- (void)gotoPkWinRoom:(UITapGestureRecognizer *)tap { - XPAcrossRoomPKPrizeView * view = (XPAcrossRoomPKPrizeView *)tap.view; - if (view.data.winUid.length > 0) { - [self.hostDelegate exitRoom]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:view.data.winUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } -} - -- (void)receiveFansTeamGiftHandleSendGiftAnimation:(AttachmentModel *)attachment { - if ([self _isInSudGame]) {return;} - if (!self.hostDelegate.getRoomInfo.hasAnimationEffect) {return;} - GiftReceiveInfoModel *receiveInfo = [[GiftReceiveInfoModel alloc] init]; - GiftInfoModel *gift = [GiftInfoModel modelWithJSON:attachment.data[@"giftVo"]]; - receiveInfo.gift = gift; - receiveInfo.giftInfo = gift; - receiveInfo.targetUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - GiftInfoModel * giftInfo = receiveInfo.gift ? receiveInfo.gift : receiveInfo.giftInfo; - if (attachment.second == Custom_Message_Sub_AllMicroLuckySend || attachment.second == Custom_Message_Sub_AllBatchMicroLuckySend || attachment.second == Custom_Message_Sub_Gift_LuckySend) { - NSString * giftId = [NSString stringWithFormat:@"%ld", receiveInfo.luckyGiftList.giftList.firstObject.giftId]; - giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:giftId inRoom:@(receiveInfo.roomUid).stringValue]; - } - if (giftInfo == nil) { - giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:receiveInfo.giftId inRoom:@(receiveInfo.roomUid).stringValue]; - } - - ///在最外面判断是否可以拿到那个礼物 后面使用就不用判断了 - receiveInfo.gift = giftInfo; - receiveInfo.isLuckyBagGift = (attachment.second == Custom_Message_Sub_AllMicroLuckySend || attachment.second == Custom_Message_Sub_AllBatchMicroLuckySend || attachment.second == Custom_Message_Sub_Gift_LuckySend); - [self.giftAnimationManager enqueueGift:receiveInfo]; -} - -- (void)receiveAnchorHourRank:(AttachmentModel *)attachment { - PIBaseAnimationViewModel *anchorModel =[PIBaseAnimationViewModel new]; - anchorModel.data = attachment.data; - anchorModel.type = GiftBannerType_AnchorHour; - if(self.animationListB.count == 0 && self.isPlayOfB == NO){ - [self createAnchorHourRankAnimation:anchorModel]; - } - [self.animationListB addObject:anchorModel]; -} - -- (void)receiveGiftCompound:(AttachmentModel *)attachment { - if ([self _isInSudGame]) {return;} - PIBaseAnimationViewModel *magicModel =[PIBaseAnimationViewModel new]; - magicModel.data = attachment.data; - magicModel.type = GiftBannerType_Magic_House; - if(self.animationListB.count == 0 && self.isPlayOfB == NO){ - [self createGiftCompoundBannerAnimation:magicModel]; - } - [self.animationListB addObject:magicModel]; -} - -- (void)receiveRoomSailing:(AttachmentModel *)attachment { - if ([self _isInSudGame]) {return;} - if (self.sailingQueue.count == 0) { - [self createSailingBannerAnimation:attachment]; - } - [self.sailingQueue addObject:attachment]; -} - -- (void)createSailingBannerAnimation:(AttachmentModel *)attatchment { - CGFloat kscale = (CGFloat)60 / (CGFloat)375; - XPSailingAnimationView *sailingView = [[XPSailingAnimationView alloc] initWithFrame:CGRectMake(KScreenWidth, kNavigationHeight + 15, KScreenWidth, KScreenWidth * kscale)]; - sailingView.prizeInfo = attatchment.data; - [self.middleContainer addSubview:sailingView]; - POPSpringAnimation *springAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter]; - springAnimation.springSpeed = 12; - springAnimation.springBounciness = 10.f; - springAnimation.fromValue = [NSValue valueWithCGPoint:sailingView.center]; - springAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(sailingView.frame.size.width / 2, sailingView.center.y)]; - [springAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - if (finished) { - POPBasicAnimation *moveAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewCenter]; - moveAnimation.fromValue = [NSValue valueWithCGPoint:CGPointMake(0, sailingView.center.y)]; - moveAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(-KScreenWidth/2, sailingView.center.y)]; - moveAnimation.beginTime = CACurrentMediaTime() + 3; - moveAnimation.duration = 0.5; - moveAnimation.repeatCount = 1; - moveAnimation.removedOnCompletion = YES; - @kWeakify(self); - [moveAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - @kStrongify(self); - if (finished) { - [sailingView removeFromSuperview]; - if (self.sailingQueue.count > 0) { - [self.sailingQueue xpSafeRemoveObjectAtIndex:0]; - } - if (self.sailingQueue.count > 0) { - [self createSailingBannerAnimation:self.sailingQueue.firstObject]; - } - } - }]; - [sailingView pop_addAnimation:moveAnimation forKey:@"moveOutAnimation"]; - } - }]; - [sailingView pop_addAnimation:springAnimation forKey:@"candyTreespingOutAnimation"]; -} - -- (void)receiveRoomGraffitiGift:(AttachmentModel *)attachment { - if (self.graffitiGiftQueue.count == 0) { - [self startGraffitiGiftAnimation:attachment]; - } - [self.graffitiGiftQueue addObject:attachment]; -} - -- (void)startGraffitiGiftAnimation:(AttachmentModel *)model { - NSDictionary * dic = model.data; - NSNumber * giftId = dic[@"giftId"]; - GiftInfoModel * giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:giftId.stringValue inRoom:@""]; - NSArray * array = dic[@"drawFixedArray"]; - if (giftInfo.giftUrl.length > 0 && array.count > 0) { - [[SDWebImageManager sharedManager] loadImageWithURL:[NSURL URLWithString:giftInfo.giftUrl] options:SDWebImageProgressiveLoad progress:nil completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL) { - if (error == nil && image) { - XPRoomGraffitiGiftAnimationView *graffitiView = [[XPRoomGraffitiGiftAnimationView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - graffitiView.giftImage = image; - graffitiView.delegate = self; - graffitiView.model = model; - graffitiView.pointArray = array; - [graffitiView beginDrawAnimation]; - [self.topContainer addSubview:graffitiView]; - } else { - [self.graffitiGiftQueue removeObject:model]; - if (self.graffitiGiftQueue.count > 0) { - [self startGraffitiGiftAnimation:self.graffitiGiftQueue.firstObject]; - } - } - }]; - } else { - [self.graffitiGiftQueue removeObject:model]; - if (self.graffitiGiftQueue.count > 0) { - [self startGraffitiGiftAnimation:self.graffitiGiftQueue.firstObject]; - } - } -} - -- (void)playLuckyGiftEffectWithVapUrl:(NSString *)vapUrl { - NSString *encodingUrl = [vapUrl pureURLString]; - encodingUrl = [encodingUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]; - NSString *fileName = [[encodingUrl componentsSeparatedByString:@"/"] lastObject]; - NSString *fullPath = [self.GiftDynamicEffectListPath stringByAppendingPathComponent:fileName]; - - if ([[NSFileManager defaultManager] fileExistsAtPath:fullPath]){ - vapUrl = fullPath; - [self _addSubviewToMiddleContainer:self.luckyVapGiftEffectView]; - [self.luckyVapGiftEffectView setMute:NO]; - [self.luckyVapGiftEffectView playHWDMP4:vapUrl repeatCount:1 delegate:self]; - } else { - @kWeakify(self); - [self.vapParser parseWithURL:encodingUrl completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [self _addSubviewToMiddleContainer:self.luckyVapGiftEffectView]; - [self.luckyVapGiftEffectView setMute:NO]; - [self.luckyVapGiftEffectView playHWDMP4:videoUrl repeatCount:1 delegate:self]; - } - } failureBlock:^(NSError * _Nullable error) { - self.luckyVapGiftEffectView.hidden = YES; - }]; - } -} - --(void)playAnimationWithModel{ - if(self.animationListB.count <= 0){ - return; - } - - if(self.isPlayOfB == YES) { - return; - } - - PIBaseAnimationViewModel *model = self.animationListB.firstObject; - switch (model.type) { - case GiftBannerType_Lucky: - [self createBigPrizeAnimation:model]; - break; - case GiftBannerType_Love: - [self createCandyTreeBannerAnimation:model]; - break; - case GiftBannerType_Nobleman: - [self createNobleLevelUpBannerAnimation:model]; - break; - case GiftBannerType_AnchorHour: - [self createAnchorHourRankAnimation:model]; - break; - case GiftBannerType_LicneseHour: - [self createAnchorHourRankAnimation:model]; - break; - case GiftBannerType_Magic_House: - [self createGiftCompoundBannerAnimation:model]; - break; - case GiftBannerType_General_Floating_Screen: - [self createGeneralFloatingScreenAnimation:model bannerModel:nil]; - break; - default: - // 其他未处理的枚举值类型 - // 可能包括但不限于：GiftBannerType_Unknown, GiftBannerType_Normal, - // GiftBannerType_Special, GiftBannerType_Event 等 - break; - } -} - -- (SVGAImageView *)luckyGiftEffectView { - if (!_luckyGiftEffectView) { - _luckyGiftEffectView = [[SVGAImageView alloc]init]; - _luckyGiftEffectView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - _luckyGiftEffectView.userInteractionEnabled = NO; - _luckyGiftEffectView.delegate = self; - _luckyGiftEffectView.hidden = YES; - } - return _luckyGiftEffectView; -} - -- (VAPView *)luckyVapGiftEffectView { - if (!_luckyVapGiftEffectView) { - _luckyVapGiftEffectView = [[VAPView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - _luckyVapGiftEffectView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - _luckyVapGiftEffectView.contentMode = UIViewContentModeScaleAspectFill; - _luckyVapGiftEffectView.hidden = YES; - } - return _luckyVapGiftEffectView; -} - -#pragma mark - Old Methods Delegate: XPRoomGiftBroadcastViewDelegate -- (void)xPRoomGiftBroadcastView:(XPRoomGiftBroadcastView *)view enterRoom:(NSString *)roomUid roomName:(NSString *)roomName{ - id isShowBroadcastView = [[NSUserDefaults standardUserDefaults]valueForKey:@"kSaveBrooadcastSelectState"]; - if(isShowBroadcastView == nil){ - PIRoomGiftBroadcastWindow *broadcastView = [[PIRoomGiftBroadcastWindow alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - broadcastView.roodUid = roomUid; - broadcastView.roomName = roomName; - broadcastView.delegate = self; - [kWindow addSubview:broadcastView]; - return; - } - - if (roomUid.length > 0 && self.hostDelegate.getRoomInfo.uid != roomUid.integerValue) { - [self.hostDelegate exitRoom]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.7 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } -} - -- (void)xPRoomLuckyBigPrizeView:(XPRoomLuckyBigPrizeView *)view luckyGiftInfo:(PIBaseAnimationViewModel *)giftInfo { - id isShowBroadcastView = [[NSUserDefaults standardUserDefaults]valueForKey:@"kSaveLuckSelectState"]; - if(isShowBroadcastView == nil){ - PIRoomGiftBroadcastWindow *broadcastView = [[PIRoomGiftBroadcastWindow alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - broadcastView.isLuck = YES; - broadcastView.roodUid = giftInfo.roomUid; - broadcastView.roomName = giftInfo.roomTitle; - broadcastView.delegate = self; - [kWindow addSubview:broadcastView]; - return; - } - if (!giftInfo.isInRoomVisable && giftInfo.roomUid.length > 0 && giftInfo.roomUid.integerValue != self.hostDelegate.getRoomInfo.uid) { - [self.hostDelegate exitRoom]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:giftInfo.roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } -} - - - -- (void)xPRoomAnchorRankBannerView:(XPRoomAnchorRankBannerView *)view rankInfo:(RoomHalfHourRankModel *)rankInfo{ - if (rankInfo.uid.integerValue > 0 && self.hostDelegate.getRoomInfo.uid != rankInfo.uid.integerValue) { - [self.hostDelegate exitRoom]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:rankInfo.uid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } -} - --(void)confirmLeaveForTheRoom:(NSString *_Nonnull)roomUid{ - if (roomUid.length > 0 && self.hostDelegate.getRoomInfo.uid != roomUid.integerValue) { - [self.hostDelegate exitRoom]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.7 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } -} - -- (void)pIUniversalBannerView:(PIUniversalBannerView *)view didClick:(PIUniversalBannerModel *)model{ - if (model.skipType == 2){ - [self.hostDelegate exitRoom]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:model.skipContent viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - }else if (model.skipType == 3){ - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.isPush = YES; - webVC.url = model.skipContent; - [self.hostDelegate.getCurrentNav pushViewController:webVC animated:YES]; - } -} - -- (void)xPRoomGraffitiGiftAnimationViewCompletion:(XPRoomGraffitiGiftAnimationView *)view attachment:(nonnull AttachmentModel *)attachment{ - [view removeFromSuperview]; - if ([self.graffitiGiftQueue containsObject:attachment]) { - [self.graffitiGiftQueue removeObject:attachment]; - } - if (self.graffitiGiftQueue.count > 0) { - [self startGraffitiGiftAnimation:self.graffitiGiftQueue.firstObject]; - } -} - -#pragma mark - Touch Event Handling - -// 移除pointInside重写，让触摸事件正常传递 - -#pragma mark - Public Methods - -- (CGPoint)getSavedTapPoint { - return self.savedTapPoint; -} - -- (BOOL)hasSavedTapPointAvailable { - return self.hasSavedTapPoint; -} - -- (void)clearSavedTapPoint { - self.hasSavedTapPoint = NO; - self.savedTapPoint = CGPointZero; -} - -/// 调试方法：在界面上绘制所有符合条件（横向相邻，1-4 或 5-8）的麦位中点 75x75 半透明矩形 -- (void)debug_drawMicMidpointRects { - // 移除旧的调试矩形 - NSArray *subviews = [self.topContainer.subviews copy]; - for (UIView *view in subviews) { - if (view.tag == 56001) { - [view removeFromSuperview]; - } - } - - // 在宿主视图层级中查找 SocialStageView - SocialStageView *stageView = nil; - for (UIView *obj in self.hostDelegate.getSuperView.subviews) { - if ([obj isKindOfClass:[SocialStageView class]]) { - stageView = (SocialStageView *)obj; - break; - } - } - if (!stageView) { - return; - } - - // 定义所有横向相邻的有效麦位对 - NSArray *> *pairs = @[ - @[@1, @2], @[@2, @3], @[@3, @4], - @[@5, @6], @[@6, @7], @[@7, @8] - ]; - - for (NSArray *pair in pairs) { - NSInteger left = pair.firstObject.integerValue; - NSInteger right = pair.lastObject.integerValue; - - CGRect stageRect = [stageView rectForMidpointBetweenMicAtIndex:left andIndex:right]; - if (CGRectIsEmpty(stageRect)) { - continue; - } - - // 转换到当前视图坐标系 - CGRect rectInSelf = [self convertRect:stageRect fromView:stageView]; - - UIView *overlay = [[UIView alloc] initWithFrame:rectInSelf]; - overlay.backgroundColor = [[UIColor redColor] colorWithAlphaComponent:0.25]; - overlay.layer.borderColor = [UIColor.redColor colorWithAlphaComponent:0.6].CGColor; - overlay.layer.borderWidth = 1.0; - overlay.layer.cornerRadius = 8.0; - overlay.clipsToBounds = YES; - overlay.tag = 56001; - [self.topContainer addSubview:overlay]; - } -} - -- (CGRect)calculateInteractiveBoundsForView:(UIView *)view { - // 计算视图的可交互区域 - // 这里可以根据具体的 Banner 类型来调整可交互区域 - CGRect bounds = view.bounds; - - // 如果是通用 Banner，可能需要调整可交互区域 - // 例如：排除某些不可点击的区域 - if ([view isKindOfClass:[PIUniversalBannerView class]]) { - // 可以根据需要调整可交互区域 - // 这里暂时使用整个视图区域 - return bounds; - } - - // 默认使用整个视图区域作为可交互区域 - return bounds; -} - - -#pragma mark - Cleanup Methods - -- (void)cleanupGestureRecognizers { - NSLog(@"🔄 清理手势识别器"); - - // 清理中央容器的手势识别器 - if (self.bannerSwipeGestureContainer) { - for (UIGestureRecognizer *gesture in self.bannerSwipeGestureContainer.gestureRecognizers.copy) { - [self.bannerSwipeGestureContainer removeGestureRecognizer:gesture]; - } - } - - // 清理左侧容器的手势识别器 - if (self.bannerLeftTapGestureContainer) { - for (UIGestureRecognizer *gesture in self.bannerLeftTapGestureContainer.gestureRecognizers.copy) { - [self.bannerLeftTapGestureContainer removeGestureRecognizer:gesture]; - } - } - - // 清理右侧容器的手势识别器 - if (self.bannerRightTapGestureContainer) { - for (UIGestureRecognizer *gesture in self.bannerRightTapGestureContainer.gestureRecognizers.copy) { - [self.bannerRightTapGestureContainer removeGestureRecognizer:gesture]; - } - } - - NSLog(@"🔄 手势识别器清理完成"); -} - -- (void)cleanupCacheManagers { - NSLog(@"🔄 清理缓存管理器"); - - // 清理 BannerScheduler - [self cleanupBannerScheduler]; - - // 清理触摸区域缓存 - TouchAreaCacheManager *touchCacheManager = [TouchAreaCacheManager sharedManager]; - [touchCacheManager clearCache]; - - // 清理手势优化器缓存 - GestureOptimizer *gestureOptimizer = [GestureOptimizer sharedOptimizer]; - [gestureOptimizer clearCache]; - - NSLog(@"🔄 缓存管理器清理完成"); -} - -// 🔧 新增：清理礼物特效 -- (void)cleanupGiftEffects { - NSLog(@"🎮 清理礼物特效"); - - // 停止当前播放的礼物特效 - if (self.isPlayingGiftEffect) { - self.isPlayingGiftEffect = NO; - } - - // 清理礼物特效视图 - if (self.pagGiftEffectView && self.pagGiftEffectView.superview) { - [self.pagGiftEffectView stop]; - [self.pagGiftEffectView removeFromSuperview]; - } - - if (self.vapGiftEffectView && self.vapGiftEffectView.superview) { - [self.vapGiftEffectView stopHWDMP4]; - [self.vapGiftEffectView removeFromSuperview]; - } - - if (self.vggGiftEffectView && self.vggGiftEffectView.superview) { - [self.vggGiftEffectView stopAnimation]; - [self.vggGiftEffectView removeFromSuperview]; - } - - // 清空礼物队列 - [self.svgaQueue removeAllObjects]; - - NSLog(@"🎮 礼物特效清理完成"); -} - -// 🔧 新增：清理礼物相关banner -- (void)cleanupGiftBanners { - NSLog(@"🎮 清理礼物相关banner"); - - // 清理礼物相关的banner - NSMutableArray *viewsToRemove = [NSMutableArray array]; - for (UIView *subview in self.bannerContainer.subviews) { - if ([subview isKindOfClass:[BravoGiftBannerView class]] || - [subview isKindOfClass:[LuckyGiftWinningBannerView class]] || - [subview isKindOfClass:[RoomHighValueGiftBannerAnimation class]] || - [subview isKindOfClass:[LuckyPackageBannerView class]]) { - [viewsToRemove addObject:subview]; - } - } - - for (UIView *view in viewsToRemove) { - [view removeFromSuperview]; - } - - // 清空队列中礼物相关的banner（包括：超级礼物banner、礼物频道通知、福袋banner） - if (self.bannerScheduler) { - // 逆序移除以避免索引移动问题 - for (NSInteger i = self.bannerScheduler.queueCount - 1; i >= 0; i--) { - id queued = [self.bannerScheduler bannerAtIndex:i]; - if ([queued isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *att = (AttachmentModel *)queued; - if (att.second == Custom_Message_Sub_Super_Gift_Banner || - att.second == Custom_Message_Sub_Gift_ChannelNotify || - att.second == Custom_Message_Sub_LuckyPackage) { - [self.bannerScheduler removeBannerAtIndex:i]; - } - } - } - } - - // 标记banner播放完成，继续下一个 - if (self.isRoomBannerV2Displaying) { - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - } - - NSLog(@"🎮 礼物相关banner清理完成"); -} - -// 🔧 新增：清理游戏相关banner -- (void)cleanupGameBanners { - NSLog(@"🎮 清理游戏相关banner"); - - // 清理游戏相关的banner - NSMutableArray *viewsToRemove = [NSMutableArray array]; - for (UIView *subview in self.bannerContainer.subviews) { - if ([subview isKindOfClass:[GameUniversalBannerView class]]) { - [viewsToRemove addObject:subview]; - } - } - - for (UIView *view in viewsToRemove) { - [view removeFromSuperview]; - } - - // 清空队列中游戏相关的banner（通用飘屏：单房/全房） - if (self.bannerScheduler) { - for (NSInteger i = self.bannerScheduler.queueCount - 1; i >= 0; i--) { - id queued = [self.bannerScheduler bannerAtIndex:i]; - if ([queued isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *att = (AttachmentModel *)queued; - if (att.second == Custom_Message_Sub_General_Floating_Screen_One_Room || - att.second == Custom_Message_Sub_General_Floating_Screen_All_Room) { - [self.bannerScheduler removeBannerAtIndex:i]; - } - } - } - } - - // 标记banner播放完成，继续下一个 - if (self.isRoomBannerV2Displaying) { - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - } - - NSLog(@"🎮 游戏相关banner清理完成"); -} - -- (void)cleanupBannerScheduler { - if (self.bannerScheduler) { - NSLog(@"�� 清理 BannerScheduler"); - [self.bannerScheduler clearQueue]; - [self.bannerScheduler pause]; - self.bannerScheduler = nil; - } -} - -- (void)removeNotificationObservers { - NSLog(@"🔄 移除通知监听"); - - // 移除所有相关的通知监听 - [[NSNotificationCenter defaultCenter] removeObserver:self name:@"SwipeOutBanner" object:nil]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:@"TapBanner" object:nil]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:@"BannerTapToFunctionContainer" object:nil]; - - // 🔧 新增：移除房间类型变化通知监听 - [[NSNotificationCenter defaultCenter] removeObserver:self name:@"RoomTypeChanged" object:nil]; - - // 🔧 新增：移除Turbo Mode通知监听 - [[NSNotificationCenter defaultCenter] removeObserver:self name:kTurboGiftEffectsEnabledChanged object:nil]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:kTurboGlobalGiftScreenEnabledChanged object:nil]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:kTurboGlobalGameScreenEnabledChanged object:nil]; - - // 移除其他可能添加的通知监听 - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - NSLog(@"🔄 通知监听移除完成"); -} - -#pragma mark - BannerSchedulerDelegate - -- (void)bannerScheduler:(BannerScheduler *)scheduler shouldPlayBanner:(id)banner { - // 将 Banner 数据转换为 AttachmentModel - if (![banner isKindOfClass:[AttachmentModel class]]) { - NSLog(@"⚠️ BannerSchedulerDelegate: Banner 不是 AttachmentModel 类型"); - [self.bannerScheduler markBannerFinished]; - return; - } - AttachmentModel *attachment = (AttachmentModel *)banner; - - // 二次校验：出队播放前按 TurboMode 再过滤一次，防止进房竞态导致漏过滤 - NSString *roomIdForTurbo = self.currentRoomId ?: @([self.hostDelegate getRoomInfo].roomId).stringValue; - BOOL allowed = YES; - - if (attachment.second == Custom_Message_Sub_General_Floating_Screen_One_Room || - attachment.second == Custom_Message_Sub_General_Floating_Screen_All_Room) { - allowed = [[TurboModeStateManager sharedManager] isGlobalGameScreenEnabledForRoom:roomIdForTurbo]; - } else if (attachment.second == Custom_Message_Sub_Super_Gift_Banner || - attachment.second == Custom_Message_Sub_Gift_ChannelNotify || - attachment.second == Custom_Message_Sub_LuckyPackage) { - allowed = [[TurboModeStateManager sharedManager] isGlobalGiftScreenEnabledForRoom:roomIdForTurbo]; - } else if (attachment.second == Custom_Message_Sub_CP_Gift || - attachment.second == Custom_Message_Sub_CP_Upgrade || - attachment.second == Custom_Message_Sub_CP_Binding) { - allowed = [[TurboModeStateManager sharedManager] isGiftEffectsEnabledForRoom:roomIdForTurbo]; - } - - if (!allowed) { - NSLog(@"🎮 TurboMode 二次校验拒绝播放 banner(second=%ld) - 房间ID:%@", (long)attachment.second, roomIdForTurbo); - [self.bannerScheduler markBannerFinished]; - return; - } - - [self _playBannerWithAttachment:attachment]; -} - -- (void)bannerSchedulerDidFinishPlaying:(BannerScheduler *)scheduler { - // Banner 播放完成，可以在这里进行清理工作 - - // 🔧 新增：确保手势容器状态正确 - [self ensureBannerGestureContainersEnabled]; - [self resetTouchState]; -} - -- (void)bannerScheduler:(BannerScheduler *)scheduler didStartPlayingBanner:(id)banner { - // Banner 开始播放 -} - -#pragma mark - Private Methods - -- (void)_playBannerWithAttachment:(AttachmentModel *)attachment { - NSLog(@"🎯 _playBannerWithAttachment: 开始处理 Banner - 类型: %ld", (long)attachment.second); - - // 清理之前的 banner，防止多个banner同时显示 - NSMutableArray *viewsToRemove = [NSMutableArray array]; - for (UIView *subview in self.bannerContainer.subviews) { - [viewsToRemove addObject:subview]; - NSLog(@"🔄 标记移除banner: %@", NSStringFromClass([subview class])); - - // 从缓存中移除旧的 Banner - TouchAreaCacheManager *cacheManager = [TouchAreaCacheManager sharedManager]; - [cacheManager removeBannerFromCache:subview]; - } - - for (UIView *view in viewsToRemove) { - [view removeFromSuperview]; - } - - // 根据 Banner 类型分发到不同的播放方法 - switch (attachment.second) { - case Custom_Message_Sub_General_Floating_Screen_One_Room: - case Custom_Message_Sub_General_Floating_Screen_All_Room: - NSLog(@"🎯 分发到 playGameBanner"); - [self playGameBanner:attachment]; - break; - case Custom_Message_Sub_Super_Gift_Winning_Coins_ALL_Room: - NSLog(@"🎯 分发到 playLuckyWinningBanner"); - [self playLuckyWinningBanner:attachment]; - break; - case Custom_Message_Sub_CP_Gift: - NSLog(@"🎯 分发到 playCPGiftBanner"); - [self playCPGiftBanner:attachment]; - break; - case Custom_Message_Sub_CP_Upgrade: - NSLog(@"🎯 分发到 playCPLevelUp"); - [self playCPLevelUp:attachment]; - break; - case Custom_Message_Sub_CP_Binding: - NSLog(@"🎯 分发到 playCPBinding"); - [self playCPBinding:attachment]; - break; - case Custom_Message_Sub_Gift_ChannelNotify: - NSLog(@"🎯 分发到 playRoomGiftBanner"); - [self playRoomGiftBanner:attachment]; - break; - case Custom_Message_Sub_LuckyPackage: - NSLog(@"🎯 分发到 playLuckyPackageBanner"); - [self playLuckyPackageBanner:attachment]; - break; - case Custom_Message_Sub_Super_Gift_Banner: - NSLog(@"🎯 分发到 playBroveBanner"); - [self playBroveBanner:attachment]; - break; - default: - NSLog(@"⚠️ 未知的 Banner 类型: %ld", (long)attachment.second); - // 标记播放完成，继续下一个 - [self.bannerScheduler markBannerFinished]; - break; - } -} - -#pragma mark - 房间类型手势容器控制 - -// 处理房间类型变化 -- (void)handleRoomTypeChanged:(NSNotification *)notification { - NSDictionary *userInfo = notification.userInfo; - NSInteger roomType = [userInfo[@"roomType"] integerValue]; - - if (roomType == RoomType_MiniGame) { - NSLog(@" RoomAnimationView: 检测到小游戏房间，设置 banner 手势穿透模式 + 启用 swipe 手势"); - [self setBannerGesturePassthroughMode]; - self.isGameModeActive = YES; - } else { - NSLog(@" RoomAnimationView: 检测到非小游戏房间，恢复 banner 手势正常模式 + 移除 swipe 手势"); - [self restoreBannerGestureNormalMode]; - self.isGameModeActive = NO; - } -} - -// 重构手势穿透模式设置 -- (void)setBannerGesturePassthroughMode { - // 隐藏和禁用所有手势容器 - [self hideAllGestureContainers]; - - // 完全禁用 bannerContainer 的用户交互 - self.bannerContainer.userInteractionEnabled = YES; - - // 启用小游戏手势管理器（包含 swipe 手势） - [self.gameGestureManager enableGestureForGameMode]; - - NSLog(@"�� Banner 手势已设置为穿透模式，swipe 手势已启用"); -} - -// 重构手势正常模式恢复 -- (void)restoreBannerGestureNormalMode { - // 显示和启用所有手势容器 - [self showAllGestureContainers]; - - // 恢复 bannerContainer 的用户交互 - self.bannerContainer.userInteractionEnabled = YES; - - // 禁用小游戏手势管理器（移除 swipe 手势） - [self.gameGestureManager disableGestureForGameMode]; - - NSLog(@"🎮 Banner 手势已恢复正常模式，swipe 手势已移除"); -} - -- (void)hideAllGestureContainers { - self.bannerSwipeGestureContainer.hidden = YES; - self.bannerLeftTapGestureContainer.hidden = YES; - self.bannerRightTapGestureContainer.hidden = YES; - - self.bannerSwipeGestureContainer.userInteractionEnabled = NO; - self.bannerLeftTapGestureContainer.userInteractionEnabled = NO; - self.bannerRightTapGestureContainer.userInteractionEnabled = NO; -} - -- (void)showAllGestureContainers { - self.bannerSwipeGestureContainer.hidden = NO; - self.bannerLeftTapGestureContainer.hidden = NO; - self.bannerRightTapGestureContainer.hidden = NO; - - self.bannerSwipeGestureContainer.userInteractionEnabled = YES; - self.bannerLeftTapGestureContainer.userInteractionEnabled = YES; - self.bannerRightTapGestureContainer.userInteractionEnabled = YES; -} - -// 优化手势状态确保方法 -- (void)ensureBannerGestureContainersEnabled { - if (self.isGameModeActive) { - // 小游戏模式下，确保手势管理器正常工作（包含 swipe 手势） - if (!self.gameGestureManager.isEnabled) { - NSLog(@"🔧 检测到小游戏手势管理器未启用，重新启用（包含 swipe 手势）"); - [self.gameGestureManager enableGestureForGameMode]; - } - return; - } - - // 非小游戏模式下的原有逻辑（不包含 swipe 手势） - [self showAllGestureContainers]; - - // 确保小游戏手势管理器已禁用 - if (self.gameGestureManager.isEnabled) { - NSLog(@"�� 检测到小游戏手势管理器仍启用，禁用（移除 swipe 手势）"); - [self.gameGestureManager disableGestureForGameMode]; - } -} - -// 优化触摸状态重置 -- (void)resetTouchState { - self.savedTapPoint = CGPointZero; - self.hasSavedTapPoint = NO; - - if (self.isGameModeActive) { - [self.gameGestureManager resetState]; - [self.gameGestureManager enableGestureForGameMode]; - NSLog(@" 小游戏模式：触摸状态已重置，swipe 手势已重新启用"); - } else { - NSLog(@" 非小游戏模式：触摸状态已重置，swipe 手势保持禁用"); - } -} - -// 🔧 新增：处理combo状态变化 -- (void)handleComboStateChanged:(NSNotification *)notification { - NSDictionary *userInfo = notification.userInfo; - NSString *uid = userInfo[@"uid"]; - BOOL isCombo = [userInfo[@"isCombo"] boolValue]; - - - // 通知动画管理器更新combo状态 - if (isCombo) { - [self.giftAnimationManager setUserComboState:YES forUser:uid]; - } else { - [self.giftAnimationManager clearUserComboState:uid]; - } -} - -// 🔧 修改：处理Turbo Mode礼物特效开关变化 -- (void)handleTurboGiftEffectsChanged:(NSNotification *)notification { - BOOL enabled = [notification.userInfo[@"on"] boolValue]; - - // 如果关闭，清理当前效果 - if (!enabled) { - [self cleanupGiftEffects]; - // 同时清理 CP 类 Banner（礼物特效开关关闭时不应再展示 CP 相关） - if (self.currentRoomId.length > 0) { - [self cleanupCpBanners]; - } else { - [self cleanupCpBanners]; - } - } - - NSLog(@"🎮 RoomAnimationView 礼物特效状态变化: %@", enabled ? @"开启" : @"关闭"); -} - -// 🔧 修改：处理Turbo Mode全局礼物屏幕开关变化 -- (void)handleTurboGlobalGiftScreenChanged:(NSNotification *)notification { - BOOL enabled = [notification.userInfo[@"on"] boolValue]; - - // 如果关闭，清理礼物相关 banner - if (!enabled) { - [self cleanupGiftBanners]; - } - - NSLog(@"🎮 RoomAnimationView 全局礼物屏幕状态变化: %@", enabled ? @"开启" : @"关闭"); -} - -// 🔧 修改：处理Turbo Mode全局游戏屏幕开关变化 -- (void)handleTurboGlobalGameScreenChanged:(NSNotification *)notification { - BOOL enabled = [notification.userInfo[@"on"] boolValue]; - - // 如果关闭，清理游戏相关 banner - if (!enabled) { - [self cleanupGameBanners]; - } - - NSLog(@"🎮 RoomAnimationView 全局游戏屏幕状态变化: %@", enabled ? @"开启" : @"关闭"); -} - -// 🔧 新增：处理Turbo Mode CP麦位开关变化 -- (void)handleTurboCpMicChanged:(NSNotification *)notification { - BOOL enabled = [notification.userInfo[@"on"] boolValue]; - - // CP麦位开关的变化由 MicMidpointRectManager 处理，这里只记录日志 - NSLog(@"🎮 RoomAnimationView CP麦位开关状态变化: %@", enabled ? @"开启" : @"关闭"); -} - -// 🔧 新增：清理 CP 相关 banner（受礼物特效开关影响） -- (void)cleanupCpBanners { - NSLog(@"🎮 清理 CP 相关banner"); - - // 清理可见的 CP 相关视图 - NSMutableArray *viewsToRemove = [NSMutableArray array]; - for (UIView *subview in self.bannerContainer.subviews) { - if ([subview isKindOfClass:[CPGiftBanner class]]) { - [viewsToRemove addObject:subview]; - } - } - for (UIView *subview in self.topContainer.subviews) { - if ([subview isKindOfClass:[CPBindingAnimation class]] || - [subview isKindOfClass:[CPLevelUpAnimation class]]) { - [viewsToRemove addObject:subview]; - } - } - for (UIView *v in viewsToRemove) { - [v removeFromSuperview]; - } - - // 清空队列中 CP 相关的 banner（CP 礼物/升级/绑定） - if (self.bannerScheduler) { - for (NSInteger i = self.bannerScheduler.queueCount - 1; i >= 0; i--) { - id queued = [self.bannerScheduler bannerAtIndex:i]; - if ([queued isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *att = (AttachmentModel *)queued; - if (att.second == Custom_Message_Sub_CP_Gift || - att.second == Custom_Message_Sub_CP_Upgrade || - att.second == Custom_Message_Sub_CP_Binding) { - [self.bannerScheduler removeBannerAtIndex:i]; - } - } - } - } - - if (self.isRoomBannerV2Displaying) { - self.isRoomBannerV2Displaying = NO; - [self.bannerScheduler markBannerFinished]; - } - - NSLog(@"🎮 CP 相关banner清理完成"); -} - -// 🔧 新增：处理当前房间ID设置通知 -- (void)handleCurrentRoomIdSet:(NSNotification *)notification { - NSString *roomId = notification.userInfo[@"roomId"]; - - if (roomId && roomId.length > 0) { - self.currentRoomId = roomId; - - // 更新礼物特效开关状态（基于房间信息） - [[TurboModeStateManager sharedManager] updateGiftEffectsForRoom:roomId - enabled:self.hostDelegate.getRoomInfo.hasAnimationEffect]; - - NSLog(@"🎮 RoomAnimationView: 收到房间ID设置通知，房间ID: %@", roomId); - } -} - -// 🔧 新增：更新本地开关状态缓存 -// 移除本地缓存更新：统一直接查 TurboModeStateManager - -// 🔧 新增：处理 Turbo Mode 状态变化通知 -- (void)handleTurboModeStateChanged:(NSNotification *)notification { - BOOL turboModeEnabled = [notification.userInfo[@"enabled"] boolValue]; - - if (turboModeEnabled) { - // Turbo Mode 开启时，停止所有 banner 和动画 - [self stopAllBannersAndAnimations]; - NSLog(@"🎮 RoomAnimationView: Turbo Mode 已开启，停止所有 banner 和动画"); - } else { - // Turbo Mode 关闭时，恢复正常的 banner 和动画控制 - if (self.bannerScheduler) { - // 关键：恢复调度器，清除 isPaused 并在空闲时自动触发下一条 - [self.bannerScheduler resume]; - } - NSLog(@"🎮 RoomAnimationView: Turbo Mode 已关闭，恢复 banner 调度"); - } -} - -// 🔧 新增：停止所有 banner 和动画 -- (void)stopAllBannersAndAnimations { - // 停止所有 banner - if (self.bannerScheduler) { - [self.bannerScheduler clearQueue]; - [self.bannerScheduler pause]; - } - - // 注意：礼物动画清理由 cleanupGiftEffects 专门处理，避免重复 - - // 停止其他可能的动画 - for (UIView *subview in self.topContainer.subviews) { - if ([subview respondsToSelector:@selector(stopAnimation)]) { - [subview performSelector:@selector(stopAnimation)]; - } - } - - // 停止中间容器的动画 - for (UIView *subview in self.middleContainer.subviews) { - if ([subview respondsToSelector:@selector(stopAnimation)]) { - [subview performSelector:@selector(stopAnimation)]; - } - } - - // 停止底部容器的动画 - for (UIView *subview in self.bottomContainer.subviews) { - if ([subview respondsToSelector:@selector(stopAnimation)]) { - [subview performSelector:@selector(stopAnimation)]; - } - } -} - -// 🔧 新增：检查重要动画状态 -- (BOOL)hasImportantAnimationPlaying { - // 检查 topContainer 中是否有正在播放的重要动画 - for (UIView *subview in self.topContainer.subviews) { - if ([subview isKindOfClass:[BravoGiftWinningFlagView class]] || - [subview isKindOfClass:[LuckyGiftWinningFlagView class]]) { - NSLog(@"🎯 检测到重要动画正在播放: %@", NSStringFromClass([subview class])); - return YES; - } - } - - // 检查 middleContainer 中是否有正在播放的礼物动画 - for (UIView *subview in self.middleContainer.subviews) { - if ([subview isKindOfClass:[SVGAImageView class]] || - [subview isKindOfClass:[VAPView class]] || - [subview isKindOfClass:[PAGView class]]) { - NSLog(@"🎯 检测到礼物动画正在播放: %@", NSStringFromClass([subview class])); - return YES; - } - } - - return NO; -} - -// �� 新增：智能销毁方法 -- (void)smartDestroy { - // 检查是否有正在播放的重要动画 - BOOL hasImportantAnimation = [self hasImportantAnimationPlaying]; - - if (hasImportantAnimation) { - NSLog(@"⚠️ 检测到重要动画正在播放，延迟销毁"); - // 延迟销毁，给动画完成的时间 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self forceDestroy]; - }); - return; - } - - [self forceDestroy]; -} - -- (void)forceDestroy { - NSLog(@"�� RoomAnimationView: 强制销毁"); - - // 移除广播代理 - [[NIMSDK sharedSDK].broadcastManager removeDelegate:self]; - - // 取消所有延迟执行 - [NSObject cancelPreviousPerformRequestsWithTarget:self]; - - // 清理所有 POP 动画 - [self pop_removeAllAnimations]; - - // 清理定时器 - if (_giftEffectTimer && !dispatch_source_testcancel(_giftEffectTimer)) { - dispatch_source_cancel(_giftEffectTimer); - _giftEffectTimer = nil; - } - - // 清理队列 - if (_giftEffectsQueue) { - self.giftEffectsQueue = NULL; - } - - // 清理所有 banner 视图，防止 block 强引用 - [self cleanupAllSubviews]; - - // 清理 BannerScheduler - if (self.bannerScheduler) { - NSLog(@"�� 清理 BannerScheduler"); - [self.bannerScheduler clearQueue]; - [self.bannerScheduler pause]; - self.bannerScheduler = nil; - } - - // 清理手势识别器 - [self cleanupGestureRecognizers]; - - // 清理缓存管理器 - [self cleanupCacheManagers]; - - // 移除通知监听 - [self removeNotificationObservers]; - - NSLog(@"�� RoomAnimationView: 销毁完成"); -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/RoomHighValueGiftBannerAnimation.h b/YuMi/Modules/YMRoom/View/AnimationView/RoomHighValueGiftBannerAnimation.h deleted file mode 100644 index d60b64e..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/RoomHighValueGiftBannerAnimation.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// RoomHighValueGiftBanner.h -// YuMi -// -// Created by P on 2024/11/1. -// - -#import - -@class AttachmentModel; -NS_ASSUME_NONNULL_BEGIN - -@interface RoomHighValueGiftBannerAnimation : UIView - - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/RoomHighValueGiftBannerAnimation.m b/YuMi/Modules/YMRoom/View/AnimationView/RoomHighValueGiftBannerAnimation.m deleted file mode 100644 index adb4a57..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/RoomHighValueGiftBannerAnimation.m +++ /dev/null @@ -1,456 +0,0 @@ -// -// RoomHighValueGiftBanner.m -// YuMi -// -// Created by P on 2024/11/1. -// - -#import "RoomHighValueGiftBannerAnimation.h" - -#import -#import "SVGA.h" -#import "AttachmentModel.h" -#import "GiftReceiveInfoModel.h" -#import "XCCurrentVCStackManager.h" -#import "XPRoomViewController.h" -#import "RoomHostDelegate.h" -#import "RoomInfoModel.h" -#import "XPSkillCardPlayerManager.h" - -@interface RoomHighValueGiftBannerAnimation () - -///背景 -@property (nonatomic,strong) UIImageView *backImageView; -@property (nonatomic, strong) SVGAImageView *svgaImageView; -///赠送者头像 -@property(nonatomic,strong) NetImageView *senderAvatarView; -///赠送内容，who send who -@property(nonatomic,strong) MarqueeLabel *senderScrollLabel; -///房间名称 -@property(nonatomic,strong) MarqueeLabel *roomNameScrollLabel; -///礼物 -@property (nonatomic,strong) NetImageView *giftImageView; -///礼物内容 -@property (nonatomic,strong) UILabel *giftNameLabel; -@property (nonatomic,strong) UILabel *giftCountLabel; -///去围观 -@property(nonatomic,strong) UIButton *goButton; -@property (nonatomic, assign) NSInteger roomUid; -@property (nonatomic, copy) NSString *bgSourceName; - -@property (nonatomic, copy) void(^animationComplete)(void); - -@end - -@implementation RoomHighValueGiftBannerAnimation - -+ (void)display:(UIView *)superView - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete { - - NSInteger height = kGetScaleWidth(110); - NSInteger y = 0; - - GiftReceiveInfoModel *giftNotifyInfo = [GiftReceiveInfoModel modelWithJSON:attachment.data]; - - __block RoomHighValueGiftBannerAnimation *banner = [[RoomHighValueGiftBannerAnimation alloc] initWithFrame:CGRectMake(KScreenWidth, y, KScreenWidth, height)]; - banner.animationComplete = complete; - banner.senderAvatarView.imageUrl = giftNotifyInfo.sendUserAvatar; - banner.giftImageView.imageUrl = giftNotifyInfo.giftUrl; - banner.roomNameScrollLabel.text = giftNotifyInfo.roomTitle; - banner.senderScrollLabel.text = [NSString stringWithFormat:@"%@ %@ %@", giftNotifyInfo.sendUserNick, YMLocalizedString(@"XPSessionFindNewGreetListView3"), giftNotifyInfo.recvUserNick]; - banner.giftNameLabel.text = giftNotifyInfo.giftName; - banner.giftCountLabel.text = [NSString stringWithFormat:@"x %ld", (long)giftNotifyInfo.giftNum]; - banner.roomUid = giftNotifyInfo.roomUid; - - switch (giftNotifyInfo.bgLevel) { - case 1: - banner.bgSourceName = @"gift_normal_1"; - break; - case 2: - banner.bgSourceName = @"gift_normal_2"; - break; - case 3: - banner.bgSourceName = @"gift_normal_3"; - break; - case 4: - banner.bgSourceName = @"gift_VIP_1"; - break; - case 5: - banner.bgSourceName = @"gift_VIP_2"; - break; - case 6: - banner.bgSourceName = @"gift_VIP_3"; - break; - - default: - banner.bgSourceName = @"gift_normal_1"; - break; - } - - - [superView addSubview:banner]; - - @kWeakify(banner); - // 使用 POP 动画移动 banner 到目标位置 - [banner popEnterAnimation:^(BOOL finished) { - @kStrongify(banner); - [banner addNotification]; - if (finished) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [banner popLeaveAnimation:^(bool finished) { - if (banner.animationComplete) { - banner.animationComplete(); - } - [banner removeNotification]; - [banner removeFromSuperview]; - }]; - }); - } - }]; -} - -- (void)dealloc { - [self.svgaImageView stopAnimation]; -} - -- (void)handleSwipeNotification { - [self dismissBanner]; -} - -- (void)handleTapNotification:(NSNotification *)note { - NSValue *value = note.userInfo[@"point"]; - CGPoint point = [value CGPointValue]; - - NSLog(@"🔄 RoomHighValueGiftBannerAnimation: 接收到点击点 %@ (bannerContainer坐标系)", NSStringFromCGPoint(point)); - - // 将 bannerContainer 坐标系中的点转换为 GameUniversalBannerView 坐标系中的点 - CGPoint bannerPoint = [self convertPoint:point fromView:self.superview]; - - NSLog(@"🔄 RoomHighValueGiftBannerAnimation: 转换为 banner 坐标系 %@", NSStringFromCGPoint(bannerPoint)); - NSLog(@"%@", CGRectContainsPoint(self.goButton.frame, bannerPoint) ? @"YES" : @"NO"); - // 检查点击是否与 go 按钮重合 - CGPoint goButtonPoint = [self.goButton convertPoint:bannerPoint fromView:self]; - if ([self.goButton pointInside:goButtonPoint withEvent:nil]) { - NSLog(@"🎯 RoomHighValueGiftBannerAnimation: tap 点与 go 按钮重合，触发游戏跳转事件"); - [self handleTapGo]; - } else { - CGPoint screenPoint = [self convertPoint:point toView:nil]; - // 发送通知给 FunctionContainer 处理，传递屏幕坐标 - [[NSNotificationCenter defaultCenter] postNotificationName:@"BannerTapToFunctionContainer" - object:nil - userInfo:@{@"point": [NSValue valueWithCGPoint:screenPoint]}]; - } -} - -- (void)addNotification { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleSwipeNotification) - name:@"SwipeOutBanner" - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTapNotification:) - name:@"TapBanner" - object:nil]; -} - -- (void)removeNotification { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (void)dismissBanner { - NSLog(@"🚨 RoomHighValueGiftBannerAnimation dismissBanner 被调用"); - [self pop_removeAllAnimations]; // 停止所有动画 - - [self popLeaveAnimation:^(bool finished) { - NSLog(@"🚨 RoomHighValueGiftBannerAnimation 动画完成，调用回调"); - if (self.animationComplete) { - self.animationComplete(); - } else { - NSLog(@"🚨 警告: animationComplete 回调为空"); - } - [self removeFromSuperview]; - }]; -} - -- (void)popEnterAnimation:(void(^)(BOOL finished))finish { - NSInteger height = kGetScaleWidth(110); - POPSpringAnimation *enterAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewFrame]; - enterAnimation.toValue = [NSValue valueWithCGRect:CGRectMake(0, 0, KScreenWidth, height)]; - enterAnimation.springBounciness = 10; // 弹性系数 - enterAnimation.springSpeed = 12; // 动画速度 - enterAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finish) { - finish(finished); - } - }; - [self pop_addAnimation:enterAnimation forKey:@"enterAnimation"]; -} - -- (void)popLeaveAnimation:(void(^)(bool finished))finish { - NSInteger height = kGetScaleWidth(110); - POPBasicAnimation *exitAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewFrame]; - exitAnimation.toValue = [NSValue valueWithCGRect:CGRectMake(-KScreenWidth, 0, KScreenWidth, height)]; - exitAnimation.duration = 0.25; // 动画持续时间 - exitAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - exitAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finish) { - finish(finished); - } - }; - [self pop_addAnimation:exitAnimation forKey:@"exitAnimation"]; -} - -- (void)handleTapGo { - // 找到當前房間 - UIViewController * controllerView = [XCCurrentVCStackManager shareManager].getCurrentVC; - __block XPRoomViewController *roomVC = nil; - [controllerView.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - [controllerView.navigationController popToRootViewControllerAnimated:NO]; - roomVC = obj; - *stop = YES; - } - }]; - - if (roomVC) { - // 是否相同房間 - if ([roomVC getRoomInfo].uid == self.roomUid) { - return; - } - - __block NSString *targetRoomUid = @(self.roomUid).stringValue; - [TTPopup alertWithMessage:YMLocalizedString(@"Combo_10") confirmHandler:^{ - [roomVC exitRoom]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:targetRoomUid - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } cancelHandler:^{}]; - - } else { - [XPRoomViewController openRoom:@(self.roomUid).stringValue - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - } -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self setupUI]; - } - return self; -} - -- (void)setBgSourceName:(NSString *)bgSourceName { - _bgSourceName = bgSourceName; - @kWeakify(self); - SVGAParser *parser = [[SVGAParser alloc] init]; - [parser parseWithNamed:self.bgSourceName - inBundle:[NSBundle mainBundle] - completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.svgaImageView.videoItem = videoItem; - [self.svgaImageView startAnimation]; - } failureBlock:^(NSError * _Nonnull error) { - @kStrongify(self); - if (self.animationComplete) { - self.animationComplete(); - } - }]; -} - -- (void)setupUI { - [self addSubview:self.backImageView]; - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.svgaImageView]; - [self.svgaImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.senderAvatarView]; - [self.senderAvatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(kGetScaleWidth(38)); - make.size.mas_equalTo(CGSizeMake(36, 36)); - }]; - - [self addSubview:self.giftImageView]; - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.trailing.mas_equalTo(kGetScaleWidth(-106)); - make.size.mas_equalTo(CGSizeMake(46, 46)); - }]; - - [self addSubview:self.senderScrollLabel]; - [self.senderScrollLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(40); - make.leading.mas_equalTo(self.senderAvatarView.mas_trailing).offset(4); - make.trailing.mas_equalTo(self.giftImageView.mas_leading).offset(-4); - make.height.mas_equalTo(16); - }]; - - [self addSubview:self.giftNameLabel]; - [self.giftNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.senderScrollLabel.mas_bottom).offset(8); - make.leading.mas_equalTo(self.senderAvatarView.mas_trailing).offset(4); - make.height.mas_equalTo(16); - }]; - - [self addSubview:self.giftCountLabel]; - [self.giftCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.giftNameLabel); - make.leading.mas_equalTo(self.giftNameLabel.mas_trailing).offset(7); - make.height.mas_equalTo(22); - }]; - - UIImageView *room = [[UIImageView alloc] initWithImage:kImage(@"gift_banner_room")]; - [self addSubview:room]; - [room mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.giftImageView.mas_trailing).offset(2); - make.top.mas_equalTo(self.giftImageView); - make.width.height.mas_equalTo(16); - }]; - - [self addSubview:self.roomNameScrollLabel]; - [self.roomNameScrollLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(room); - make.leading.mas_equalTo(room.mas_trailing).offset(2); - make.trailing.mas_equalTo(self).offset(-34); - }]; - - [self addSubview:self.goButton]; - [self.goButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.giftImageView.mas_trailing).offset(8); - make.top.mas_equalTo(self.roomNameScrollLabel.mas_bottom).offset(4); - make.size.mas_equalTo(CGSizeMake(55, 20)); - }]; -} - - -#pragma mark - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - } - return _backImageView; -} - -- (SVGAImageView *)svgaImageView { - if (!_svgaImageView) { - _svgaImageView = [[SVGAImageView alloc] init]; - _svgaImageView.clearsAfterStop = YES; - } - return _svgaImageView; -} - -- (NetImageView *)senderAvatarView { - if (!_senderAvatarView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - _senderAvatarView = [[NetImageView alloc] initWithConfig:config]; - _senderAvatarView.layer.masksToBounds = YES; - _senderAvatarView.layer.cornerRadius = 18; - _senderAvatarView.contentMode = UIViewContentModeScaleAspectFill; - } - return _senderAvatarView; -} - -- (MarqueeLabel *)senderScrollLabel{ - if(!_senderScrollLabel){ - _senderScrollLabel = [[MarqueeLabel alloc] init]; - _senderScrollLabel.scrollDuration = 6.0; - _senderScrollLabel.textColor = [UIColor whiteColor]; - _senderScrollLabel.fadeLength = 8.0f; - _senderScrollLabel.font = kFontMedium(11); - _senderScrollLabel.textAlignment = NSTextAlignmentLeft; - } - return _senderScrollLabel; -} - -- (MarqueeLabel *)roomNameScrollLabel{ - if(!_roomNameScrollLabel){ - _roomNameScrollLabel = [[MarqueeLabel alloc] init]; - _roomNameScrollLabel.textColor = [UIColor whiteColor]; - _roomNameScrollLabel.scrollDuration = 6.0; - _roomNameScrollLabel.fadeLength = 8.0f; - _roomNameScrollLabel.font = kFontMedium(11); - _roomNameScrollLabel.textAlignment = NSTextAlignmentLeft; - } - return _roomNameScrollLabel; -} - -- (NetImageView *)giftImageView { - if (!_giftImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - _giftImageView = [[NetImageView alloc] initWithConfig:config]; - _giftImageView.layer.masksToBounds = YES; - _giftImageView.layer.cornerRadius = 4; - _giftImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _giftImageView; -} - -- (UILabel *)giftNameLabel { - if (!_giftNameLabel) { - _giftNameLabel = [[UILabel alloc] init]; - _giftNameLabel.textColor = UIColorFromRGB(0xFFE468); - _giftNameLabel.font = kFontMedium(11); - } - return _giftNameLabel; -} - -- (UILabel *)giftCountLabel { - if (!_giftCountLabel) { - _giftCountLabel = [[UILabel alloc] init]; - _giftCountLabel.textColor = UIColorFromRGB(0xFFE468); - _giftCountLabel.font = kFontMedium(17); - } - return _giftCountLabel; -} - -- (UIButton *)goButton{ - if(!_goButton){ - _goButton = [UIButton new]; - [_goButton setTitle:YMLocalizedString(@"XPAcrossRoomPKPanelView3") forState:UIControlStateNormal]; - [_goButton setTitleColor:UIColorFromRGB(0x442a00) forState:UIControlStateNormal]; - _goButton.titleLabel.font = kFontRegular(10); - _goButton.layer.cornerRadius = kGetScaleWidth(20)/2; - _goButton.layer.masksToBounds = YES; - // 创建渐变图层 - CAGradientLayer *gradientLayer = [CAGradientLayer layer]; - gradientLayer.colors = @[(__bridge id)UIColorFromRGB(0xFFFADE).CGColor, - (__bridge id)UIColorFromRGB(0xFFE184).CGColor]; - gradientLayer.startPoint = CGPointMake(0.0, 0.5); // 顶部中央 - gradientLayer.endPoint = CGPointMake(1.0, 0.5); // 底部中央 - gradientLayer.frame = CGRectMake(0, 0, 55, 20); // 设置渐变图层大小 - - // 将渐变图层添加到按钮图层 - [_goButton.layer insertSublayer:gradientLayer atIndex:0]; - [_goButton addTarget:self - action:@selector(handleTapGo) - forControlEvents:UIControlEventTouchUpInside]; - } - return _goButton; -} - -// ========== 事件穿透实现 ========== -//- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event { -// if (!self.userInteractionEnabled || self.hidden || self.alpha <= 0.01) { -// return nil; -// } -// CGPoint goButtonPoint = [self.goButton convertPoint:point fromView:self]; -// if ([self.goButton pointInside:goButtonPoint withEvent:event]) { -// return self.goButton; -// } -// // 其他区域返回self，允许触摸事件被父视图的手势识别器处理 -// return self; -//} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/TouchAreaCacheManager.h b/YuMi/Modules/YMRoom/View/AnimationView/TouchAreaCacheManager.h deleted file mode 100644 index 8d23ff9..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/TouchAreaCacheManager.h +++ /dev/null @@ -1,105 +0,0 @@ -// -// TouchAreaCacheManager.h -// YuMi -// -// Created by AI Assistant on 2025/1/13. -// - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -/** - * 缓存的触摸区域信息 - */ -@interface CachedTouchArea : NSObject - -@property (nonatomic, assign) CGRect bounds; // Banner 边界 -@property (nonatomic, assign) CGRect interactiveBounds; // 可交互区域边界 -@property (nonatomic, strong) id banner; // Banner 对象 -@property (nonatomic, assign) NSTimeInterval lastUpdateTime; // 最后更新时间 - -- (instancetype)initWithBanner:(id)banner - bounds:(CGRect)bounds - interactiveBounds:(CGRect)interactiveBounds; - -@end - -/** - * 触摸区域缓存管理器 - * 负责缓存 Banner 的触摸区域信息，提供快速的空间查询功能 - */ -@interface TouchAreaCacheManager : NSObject - -/** - * Banner 边界缓存 - * Key: Banner 对象的指针地址字符串 - * Value: CachedTouchArea 对象 - */ -@property (nonatomic, strong, readonly) NSMutableDictionary *bannerBoundsCache; - -/** - * 可交互区域列表 - */ -@property (nonatomic, strong, readonly) NSMutableArray *interactiveAreas; - -/** - * 缓存是否启用 - */ -@property (nonatomic, assign) BOOL cacheEnabled; - -/** - * 单例方法 - */ -+ (instancetype)sharedManager; - -/** - * 更新 Banner 的边界信息 - * @param bounds Banner 的边界 - * @param interactiveBounds Banner 的可交互区域边界 - * @param banner Banner 对象 - */ -- (void)updateBannerBounds:(CGRect)bounds - interactiveBounds:(CGRect)interactiveBounds - forBanner:(id)banner; - -/** - * 检查指定点是否在可交互区域内 - * @param point 要检查的点 - * @return 是否在可交互区域内 - */ -- (BOOL)isPointInInteractiveArea:(CGPoint)point; - -/** - * 获取指定点所在的 Banner - * @param point 要检查的点 - * @return Banner 对象，如果不在任何 Banner 内则返回 nil - */ -- (nullable id)bannerAtPoint:(CGPoint)point; - -/** - * 移除指定 Banner 的缓存 - * @param banner Banner 对象 - */ -- (void)removeBannerFromCache:(id)banner; - -/** - * 清空所有缓存 - */ -- (void)clearCache; - -/** - * 获取缓存统计信息 - * @return 统计信息字符串 - */ -- (NSString *)cacheStatistics; - -/** - * 调试方法：打印缓存内容 - */ -- (void)debugPrintCache; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/TouchAreaCacheManager.m b/YuMi/Modules/YMRoom/View/AnimationView/TouchAreaCacheManager.m deleted file mode 100644 index 018259f..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/TouchAreaCacheManager.m +++ /dev/null @@ -1,198 +0,0 @@ -// -// TouchAreaCacheManager.m -// YuMi -// -// Created by AI Assistant on 2025/1/13. -// - -#import "TouchAreaCacheManager.h" - -@implementation CachedTouchArea - -- (instancetype)initWithBanner:(id)banner - bounds:(CGRect)bounds - interactiveBounds:(CGRect)interactiveBounds { - if (self = [super init]) { - _banner = banner; - _bounds = bounds; - _interactiveBounds = interactiveBounds; - _lastUpdateTime = [[NSDate date] timeIntervalSince1970]; - } - return self; -} - -- (NSString *)description { - return [NSString stringWithFormat:@"CachedTouchArea: banner=%@, bounds=%@, interactiveBounds=%@, lastUpdate=%.2f", - self.banner, NSStringFromCGRect(self.bounds), NSStringFromCGRect(self.interactiveBounds), self.lastUpdateTime]; -} - -@end - -@interface TouchAreaCacheManager () - -// 使用实例变量而不是重新声明属性 -{ - NSMutableDictionary *_bannerBoundsCache; - NSMutableArray *_interactiveAreas; - BOOL _cacheEnabled; -} - -@end - -@implementation TouchAreaCacheManager - -#pragma mark - Singleton - -+ (instancetype)sharedManager { - static TouchAreaCacheManager *instance = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - instance = [[TouchAreaCacheManager alloc] init]; - }); - return instance; -} - -#pragma mark - Initialization - -- (instancetype)init { - if (self = [super init]) { - _bannerBoundsCache = [NSMutableDictionary dictionary]; - _interactiveAreas = [NSMutableArray array]; - _cacheEnabled = YES; - - NSLog(@"🎯 TouchAreaCacheManager: 初始化完成"); - } - return self; -} - -#pragma mark - Public Methods - -- (void)updateBannerBounds:(CGRect)bounds - interactiveBounds:(CGRect)interactiveBounds - forBanner:(id)banner { - if (!_cacheEnabled || !banner) { - return; - } - - NSString *bannerKey = [NSString stringWithFormat:@"%p", banner]; - CachedTouchArea *cachedArea = [[CachedTouchArea alloc] initWithBanner:banner - bounds:bounds - interactiveBounds:interactiveBounds]; - - // 更新缓存 - _bannerBoundsCache[bannerKey] = cachedArea; - - // 更新可交互区域列表 - [self updateInteractiveAreas]; - - NSLog(@"🎯 TouchAreaCacheManager: 更新 Banner 缓存 - Key: %@, Bounds: %@, Interactive: %@", - bannerKey, NSStringFromCGRect(bounds), NSStringFromCGRect(interactiveBounds)); -} - -- (BOOL)isPointInInteractiveArea:(CGPoint)point { - if (!_cacheEnabled) { - return NO; - } - - // 使用缓存快速检查 - for (CachedTouchArea *cachedArea in _interactiveAreas) { - if (CGRectContainsPoint(cachedArea.interactiveBounds, point)) { - NSLog(@"🎯 TouchAreaCacheManager: 命中缓存 - 点 %@ 在可交互区域内", NSStringFromCGPoint(point)); - return YES; - } - } - - NSLog(@"🎯 TouchAreaCacheManager: 缓存未命中 - 点 %@ 不在可交互区域内", NSStringFromCGPoint(point)); - return NO; -} - -- (nullable id)bannerAtPoint:(CGPoint)point { - if (!_cacheEnabled) { - return nil; - } - - // 使用缓存快速查找 - for (CachedTouchArea *cachedArea in _interactiveAreas) { - if (CGRectContainsPoint(cachedArea.interactiveBounds, point)) { - NSLog(@"🎯 TouchAreaCacheManager: 找到 Banner - 点 %@ 对应的 Banner: %@", - NSStringFromCGPoint(point), cachedArea.banner); - return cachedArea.banner; - } - } - - NSLog(@"🎯 TouchAreaCacheManager: 未找到 Banner - 点 %@", NSStringFromCGPoint(point)); - return nil; -} - -- (void)removeBannerFromCache:(id)banner { - if (!banner) { - return; - } - - NSString *bannerKey = [NSString stringWithFormat:@"%p", banner]; - CachedTouchArea *removedArea = _bannerBoundsCache[bannerKey]; - - if (removedArea) { - [_bannerBoundsCache removeObjectForKey:bannerKey]; - [self updateInteractiveAreas]; - - NSLog(@"🎯 TouchAreaCacheManager: 移除 Banner 缓存 - Key: %@", bannerKey); - } -} - -- (void)clearCache { - [_bannerBoundsCache removeAllObjects]; - [_interactiveAreas removeAllObjects]; - - NSLog(@"🎯 TouchAreaCacheManager: 清空所有缓存"); -} - -- (NSString *)cacheStatistics { - NSMutableString *stats = [NSMutableString string]; - [stats appendFormat:@"TouchAreaCacheManager 统计信息:\n"]; - [stats appendFormat:@"- 缓存启用状态: %@\n", _cacheEnabled ? @"启用" : @"禁用"]; - [stats appendFormat:@"- 缓存的 Banner 数量: %ld\n", (long)_bannerBoundsCache.count]; - [stats appendFormat:@"- 可交互区域数量: %ld\n", (long)_interactiveAreas.count]; - - if (_bannerBoundsCache.count > 0) { - [stats appendString:@"- 缓存的 Banner 详情:\n"]; - for (NSString *key in _bannerBoundsCache.allKeys) { - CachedTouchArea *area = _bannerBoundsCache[key]; - [stats appendFormat:@" [%@] %@\n", key, area.description]; - } - } - - return stats; -} - -- (void)debugPrintCache { - NSLog(@"🎯 TouchAreaCacheManager 调试信息:"); - NSLog(@"%@", [self cacheStatistics]); -} - -#pragma mark - Private Methods - -- (void)updateInteractiveAreas { - [_interactiveAreas removeAllObjects]; - - // 重新构建可交互区域列表 - for (CachedTouchArea *cachedArea in _bannerBoundsCache.allValues) { - if (!CGRectIsEmpty(cachedArea.interactiveBounds)) { - [_interactiveAreas addObject:cachedArea]; - } - } - - NSLog(@"🎯 TouchAreaCacheManager: 更新可交互区域列表 - 数量: %ld", (long)_interactiveAreas.count); -} - -#pragma mark - Public Properties - -- (NSMutableDictionary *)bannerBoundsCache { - return _bannerBoundsCache; -} - -- (NSMutableArray *)interactiveAreas { - return _interactiveAreas; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnchorRankBannerView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnchorRankBannerView.h deleted file mode 100644 index a4abe95..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnchorRankBannerView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMRoomAnchorRankBannerView.h -// YUMI -// -// Created by YUMI on 2022/4/15. -// 个播小时榜飘屏 - -#import -#import "RoomHalfHourRankModel.h" -NS_ASSUME_NONNULL_BEGIN -@class XPRoomAnchorRankBannerView; -@protocol XPRoomAnchorRankBannerViewDelegate - -- (void)xPRoomAnchorRankBannerView:(XPRoomAnchorRankBannerView *)view rankInfo:(RoomHalfHourRankModel *)rankInfo; - -@end - -@class RoomHalfHourRankModel; -@interface XPRoomAnchorRankBannerView : UIView -@property(nonatomic,weak) iddelegate; -///个播小时榜信息 -@property (nonatomic,copy) RoomHalfHourRankModel * anchorRankInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnchorRankBannerView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnchorRankBannerView.m deleted file mode 100644 index f9a4954..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnchorRankBannerView.m +++ /dev/null @@ -1,116 +0,0 @@ -// -// YMRoomAnchorRankBannerView.m -// YUMI -// -// Created by YUMI on 2022/4/15. -// - -#import "XPRoomAnchorRankBannerView.h" -///Third -#import -///Tool -#import "ThemeColor+Room.h" -#import "DJDKMIMOMColor.h" -///Model -#import "RoomHalfHourRankModel.h" -///View -#import "NetImageView.h" - -@interface XPRoomAnchorRankBannerView() - -///背景 -@property (nonatomic,strong) UIImageView *bgImageView; -///恭喜 -@property (nonatomic,strong) UILabel *titleLabel; -///围观 -@property(nonatomic,strong) UIButton *lookUpBtn; -@end - -@implementation XPRoomAnchorRankBannerView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)layoutSubviews { - [super layoutSubviews]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.titleLabel]; - [self.bgImageView addSubview:self.lookUpBtn]; -} - -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.lookUpBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.width.mas_equalTo(kGetScaleWidth(60)); - make.height.mas_equalTo(kGetScaleWidth(28)); - make.centerY.equalTo(self.bgImageView); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(65)); - make.trailing.equalTo(self.lookUpBtn.mas_leading).mas_offset(-kGetScaleWidth(7)); - make.centerY.equalTo(self.bgImageView); - }]; -} - -- (void)setAnchorRankInfo:(RoomHalfHourRankModel *)anchorRankInfo { - _anchorRankInfo = anchorRankInfo; - if (anchorRankInfo) { - NSString *nick = _anchorRankInfo.nick; - if(nick.length > 5) { - nick = [NSString stringWithFormat:@"%@…", [nick substringToIndex:5]]; - } - NSString *title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomAnchorRankBannerView0"),nick]; - NSMutableAttributedString *titleAtt = [[NSMutableAttributedString alloc]initWithString:title attributes:@{NSFontAttributeName:kFontMedium(12),NSForegroundColorAttributeName:[UIColor whiteColor]}]; - [titleAtt addAttributes:@{NSFontAttributeName:kFontMedium(12),NSForegroundColorAttributeName:UIColorFromRGB(0xF4FF48)} range:[title rangeOfString:nick]]; - [titleAtt addAttributes:@{NSFontAttributeName:kFontMedium(12),NSForegroundColorAttributeName:UIColorFromRGB(0xF4FF48)} range:[title rangeOfString:YMLocalizedString(@"XPRoomAnchorRankBannerView1")]]; - _titleLabel.attributedText = titleAtt; - } -} --(void)lookUpAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(xPRoomAnchorRankBannerView:rankInfo:)]){ - [self.delegate xPRoomAnchorRankBannerView:self rankInfo:self.anchorRankInfo]; - } -} -#pragma mark - Getters And Setters -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage imageNamed:@"anchor_hour_rank_bg"]; - } - return _bgImageView; -} - - - -- (UILabel *)titleLabel { - if (!_titleLabel) { - UILabel *label = [[UILabel alloc] init]; - - _titleLabel = label; - } - return _titleLabel; -} - - -- (UIButton *)lookUpBtn{ - if(!_lookUpBtn){ - _lookUpBtn = [UIButton new]; - [_lookUpBtn setBackgroundImage:[UIImage getLanguageImage:@"anchor_hour_rank_icon"] forState:UIControlStateNormal]; - [_lookUpBtn addTarget:self action:@selector(lookUpAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _lookUpBtn; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationHitView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationHitView.h deleted file mode 100644 index c2f3195..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationHitView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomAnimationBaseView.h -// YUMI -// -// Created by YUMI on 2021/11/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomAnimationHitView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationHitView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationHitView.m deleted file mode 100644 index 3b4ec08..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationHitView.m +++ /dev/null @@ -1,49 +0,0 @@ -// -// YMRoomAnimationBaseView.m -// YUMI -// -// Created by YUMI on 2021/11/22. -// - -#import "XPRoomAnimationHitView.h" -// MARK: 只要有子视图命中，就交给子视图处理；子视图都没命中就放弃处理，自己不接收任何触摸事件。 -@implementation XPRoomAnimationHitView - -//- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event { -// for (NSInteger i = (self.subviews.count - 1) ; i >= 0 ; i--) { -// UIView * subView = [self.subviews xpSafeObjectAtIndex:i]; -// CGPoint convertPoint = [subView convertPoint:point fromView:self]; -// if (CGRectContainsPoint(subView.bounds, convertPoint)) { -// return [subView hitTest:convertPoint withEvent:event]; -// } -// } -// return nil; -//} - -- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event { - - // 应该先判断自身是否可以接收事件 - if (!self.userInteractionEnabled || self.hidden || self.alpha <= 0.01) { - return nil; - } - - // 从后往前遍历子视图 - for (NSInteger i = self.subviews.count - 1; i >= 0; i--) { - UIView *subView = [self.subviews xpSafeObjectAtIndex:i]; - if (!subView) continue; - - CGPoint convertPoint = [subView convertPoint:point fromView:self]; - UIView *hitTestView = [subView hitTest:convertPoint withEvent:event]; - - if (hitTestView) { - return hitTestView; - } - } - - // 如果子视图都不响应，则返回nil，让触摸事件传递给下层视图 - // 这是关键：不拦截触摸事件，让它们正常传递 - return nil; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomCandyGiftView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomCandyGiftView.h deleted file mode 100644 index b47f8ae..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomCandyGiftView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMRoomCandyGiftView.h -// YUMI -// -// Created by YUMI on 2021/12/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomCandyGiftView : UIView -///是否是最大的礼物 -@property (nonatomic,assign) BOOL isMaxLargeGift; -///糖果的信息 -@property (nonatomic,copy) NSDictionary * candyInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomCandyGiftView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomCandyGiftView.m deleted file mode 100644 index f0b894f..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomCandyGiftView.m +++ /dev/null @@ -1,152 +0,0 @@ -// -// XPRoomCandyGiftView.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import "XPRoomCandyGiftView.h" -///Third -#import -#import -#import "ThemeColor+Room.h" -#import "CandyTreeResultModel.h" -#import "NSObject+MJExtension.h" - - -@interface XPRoomCandyGiftView () -///动画管理类 -@property (strong, nonatomic) SVGAParser *parser; -///糖果树特效 -@property (nonatomic,strong) SVGAImageView *candyTreeView; -///背景图 -@property (nonatomic,strong) UIImageView *backImageView; -///显示文本内容 -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPRoomCandyGiftView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.candyTreeView]; - [self addSubview:self.backImageView]; - [self addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.candyTreeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(55)); - }]; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.candyTreeView); - make.height.mas_equalTo(kGetScaleWidth(55)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(self.backImageView); - make.leading.mas_equalTo(kGetScaleWidth(84)); - make.trailing.mas_equalTo(-kGetScaleWidth(70.5)); - - }]; -} - -- (NSAttributedString *)createAttribute:(NSString * )text color:(UIColor *)color fontSize:(CGFloat)fonSize { - if(text.length == 0)return nil; - NSDictionary * attribute = @{NSFontAttributeName:[UIFont systemFontOfSize:fonSize], NSForegroundColorAttributeName:color}; - NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:text attributes:attribute]; - return attr; -} - -#pragma mark - Getters And Setters -- (void)setCandyInfo:(NSDictionary *)candyInfo { - if (candyInfo) { - CandyTreeGiftInfoModel * giftInfo = [CandyTreeGiftInfoModel modelWithDictionary:candyInfo]; - if(giftInfo.nick.length > 8){ - giftInfo.nick = [NSString stringWithFormat:@"%@...",[giftInfo.nick substringToIndex:8]]; - } - NSString *text = [NSString stringWithFormat:YMLocalizedString(@"XPRoomCandyGiftView0"),giftInfo.nick,giftInfo.prizeName,[NSString stringWithFormat:@" X %d", giftInfo.prizeNum]]; - CGFloat fontSize = self.isMaxLargeGift ? 12 : 12; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithAttributedString:[self createAttribute:text color:[UIColor whiteColor] fontSize:fontSize]]; - - [attribute addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:fontSize],NSForegroundColorAttributeName:UIColorFromRGB(0xFFE44E)} range:[text rangeOfString:giftInfo.nick]]; - - [attribute addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:fontSize],NSForegroundColorAttributeName:UIColorFromRGB(0xFFE44E)} range:[text rangeOfString:giftInfo.prizeName]]; - - if (giftInfo.prizeNum > 1) { - [attribute addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:fontSize],NSForegroundColorAttributeName:[UIColor whiteColor]} range:[text rangeOfString:[NSString stringWithFormat:@" X %d", giftInfo.prizeNum]]]; - } - self.titleLabel.attributedText = attribute; - self.titleLabel.textAlignment = NSTextAlignmentCenter; - if (self.isMaxLargeGift) { -// self.backImageView.hidden = YES; -// self.candyTreeView.hidden = NO; -// @kWeakify(self); -// -// [self.parser parseWithNamed:@"pi_room_game_fine_love" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { -// @kStrongify(self); -// self.candyTreeView.loops = 2; -// self.candyTreeView.clearsAfterStop = NO; -// self.candyTreeView.videoItem = videoItem; -// [self.candyTreeView startAnimation]; -// -// } failureBlock:^(NSError * _Nonnull error) { -// -// }]; - self.backImageView.image = [kImage(@"room_candytree_large_big_gift_bg") ms_SetImageForRTL]; - self.backImageView.hidden = NO; - self.candyTreeView.hidden = YES; - } else { - self.backImageView.hidden = NO; - self.candyTreeView.hidden = YES; - self.backImageView.image = [kImage(@"room_candytree_large_gift_bg") ms_SetImageForRTL]; - - } - } -} - -- (SVGAImageView *)candyTreeView { - if (!_candyTreeView) { - _candyTreeView = [[SVGAImageView alloc]init]; - _candyTreeView.backgroundColor = [UIColor clearColor]; - _candyTreeView.userInteractionEnabled = NO; - } - return _candyTreeView; -} - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"room_candytree_large_gift_bg"]; - } - return _backImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.numberOfLines = 2; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.h deleted file mode 100644 index 6f0697b..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomDatingAnimationView.h -// YUMI -// -// Created by YUMI on 2022/1/5. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class DatingInfoModel; -@interface XPRoomDatingAnimationView : UIView -- (void)startAnimationWithModel:(DatingInfoModel *)model finishBlock:(void (^)(BOOL))finishBlock; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.m deleted file mode 100644 index 8031b0a..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.m +++ /dev/null @@ -1,371 +0,0 @@ -// -// YMRoomDatingAnimationView.m -// YUMI -// -// Created by YUMI on 2022/1/5. -// - -#import "XPRoomDatingAnimationView.h" -///Third -#import -#import -#import -///Model -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "UIButton+EnlargeTouchArea.h" -///Model -#import "DatingInfoModel.h" - -@interface XPRoomDatingAnimationView () -///背景 -@property (nonatomic,strong) UIView *backView; -///动画管理类 -@property (strong, nonatomic) SVGAParser *parser; -///播放相亲结果的SVGA -@property (nonatomic, strong) SVGAImageView *datingSvgaImageView; -///倒计时的背景 -@property (nonatomic,strong) UIView *cutTimeBackView; -///倒计时 -@property (nonatomic,strong) UILabel *timeLabel; -///分割线 -@property (nonatomic,strong) UIView *lineView; -///关闭的按钮 -@property (nonatomic,strong) UIButton *closeButton; -///❤的动画 -@property (nonatomic,strong) UIImageView *heartImageView; -/// -@property (nonatomic,copy) void(^FinishBlock)(BOOL result); -/// 定时器 -@property (nonatomic,strong) id timer; -@end - -@implementation XPRoomDatingAnimationView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self addSubview:self.backView]; - [self addSubview:self.datingSvgaImageView]; - [self addSubview:self.cutTimeBackView]; - [self addSubview:self.heartImageView]; - [self.cutTimeBackView addSubview:self.timeLabel]; - [self.cutTimeBackView addSubview:self.lineView]; - [self.cutTimeBackView addSubview:self.closeButton]; - [self initContrations]; - } - return self; -} -#pragma mark - Resonse -- (void)closetButtonAction:(UIButton *)sender { - if (self.FinishBlock) { - [NSObject cancelPreviousPerformRequestsWithTarget:self]; - self.FinishBlock(YES); - } -} - -#pragma mark - Pirvate Method -- (void)initContrations { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(KScreenHeight); - }]; - - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.datingSvgaImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.cutTimeBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(70, 25)); - make.trailing.mas_equalTo(self).offset(-12); - make.top.mas_equalTo(self).offset(41 + kSafeAreaTopHeight); - }]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.cutTimeBackView).offset(13); - make.centerY.mas_equalTo(self.cutTimeBackView); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.cutTimeBackView); - make.size.mas_equalTo(CGSizeMake(0.5, 13)); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(14, 14)); - make.centerY.mas_equalTo(self.cutTimeBackView); - make.leading.mas_equalTo(self.lineView.mas_trailing).offset(8); - }]; -} - -- (void)stopAnimation { - if (self.FinishBlock) { - [NSObject cancelPreviousPerformRequestsWithTarget:self]; - self.FinishBlock(YES); - } -} - -- (UIImage *)setCornerWithRadius:(CGFloat)radius andSize:(CGSize)size image:(UIImage *)image { - //开启图形上下文 - UIGraphicsBeginImageContext(size); - //绘制圆角矩形 - CGRect rect = CGRectMake(0, 0, size.width, size.height); - UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:rect byRoundingCorners:UIRectCornerAllCorners cornerRadii:CGSizeMake(radius, radius)]; - //将Path添加到上下文中 - CGContextAddPath(UIGraphicsGetCurrentContext(), path.CGPath); - //裁剪上下文 - CGContextClip(UIGraphicsGetCurrentContext()); - //将图片绘制到上下文中 - [image drawInRect:rect]; - //设置绘制模式 - CGContextDrawPath(UIGraphicsGetCurrentContext(), kCGPathStroke); - //获取图片 - UIImage *output = UIGraphicsGetImageFromCurrentImageContext(); - //关闭上下文 - UIGraphicsEndImageContext(); - //返回裁剪好的图片 - return output; -} - -- (CAAnimationGroup *)createRoomDatingPickAnimatioOriginPoint:(CGPoint)orginPoint destinationPoint:(CGPoint)destinationPoint { - ///刚出来的时候 进行慢慢放大的效果 - CAKeyframeAnimation * scaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"]; - scaleAnimation.duration = 0.5; - scaleAnimation.repeatCount = 1; - scaleAnimation.values = @[@(0),@(0.2),@(0.4), @(0.6), @(0.8), @(0.9), @(1)]; - scaleAnimation.calculationMode = kCAAnimationCubic; - scaleAnimation.removedOnCompletion = NO; - scaleAnimation.fillMode = kCAFillModeForwards; - /// - CAKeyframeAnimation * transformAnimation = [CAKeyframeAnimation animationWithKeyPath:@"position"]; - transformAnimation.beginTime = 0.5; - transformAnimation.duration = 1; - transformAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];; - transformAnimation.values = @[[NSValue valueWithCGPoint:orginPoint],[NSValue valueWithCGPoint:destinationPoint]]; - transformAnimation.repeatCount = 1; - transformAnimation.removedOnCompletion = NO; - transformAnimation.fillMode = kCAFillModeForwards; - - CAKeyframeAnimation * desScaleformAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"]; - desScaleformAnimation.beginTime = 1.5; - desScaleformAnimation.duration = 0.5; - desScaleformAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];; - desScaleformAnimation.values = @[@(1), @(1.2), @(1.4), @(1.6)]; - desScaleformAnimation.repeatCount = 1; - desScaleformAnimation.removedOnCompletion = NO; - desScaleformAnimation.fillMode = kCAFillModeForwards; - - - CAKeyframeAnimation * opacityAnimation = [CAKeyframeAnimation animationWithKeyPath:@"opacity"]; - opacityAnimation.beginTime = 1.5; - opacityAnimation.duration = 0.5; - opacityAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];; - opacityAnimation.values = @[@(1),@(0.8),@(0.6),@(0)]; - opacityAnimation.repeatCount = 1; - opacityAnimation.removedOnCompletion = NO; - opacityAnimation.fillMode = kCAFillModeForwards; - - - CAAnimationGroup * group = [CAAnimationGroup animation]; - group.animations = @[scaleAnimation, transformAnimation, desScaleformAnimation, opacityAnimation]; - group.duration = 2; - group.removedOnCompletion = NO; - group.fillMode = kCAFillModeForwards; - return group;; -} - -- (void)startBeginCutCountWithTotalTime:(int)time { - __block int totalTime = time; - dispatch_source_t times = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_global_queue(0, 0)); - _timer = times; - dispatch_source_set_timer(times, DISPATCH_TIME_NOW, 1* NSEC_PER_SEC, 0 * NSEC_PER_SEC); - dispatch_source_set_event_handler(times, ^{ - dispatch_async(dispatch_get_main_queue(), ^{ - if (totalTime <= 5 && totalTime >= 0) { - ///开始显示倒计时 - self.cutTimeBackView.hidden = NO; - self.timeLabel.text = [NSString stringWithFormat:@"%ds", totalTime]; - } - if (totalTime <= 0) { - dispatch_source_cancel(times); - self.cutTimeBackView.hidden = YES; - } - totalTime--; - }); - }); - dispatch_resume(times); -} - -- (void)startPickHeartPersonAnimationOriginPoint:(CGPoint)originPoint targetPoint:(CGPoint)targetPoint { - if (originPoint.x > 0 && targetPoint.x > 0) { - self.heartImageView.frame = CGRectMake(0, 0, 55, 55); - self.heartImageView.hidden = YES; - self.backView.hidden = YES; - self.heartImageView.hidden = NO; - self.heartImageView.center = originPoint; - CAAnimationGroup * group = [self createRoomDatingPickAnimatioOriginPoint:originPoint destinationPoint:targetPoint]; - [self.heartImageView.layer addAnimation:group forKey:nil]; - [self performSelector:@selector(aniationDidFinish:) withObject:self.heartImageView afterDelay:(2)]; - } -} - -- (void)aniationDidFinish:(UIImageView *)giftImageView{ - [giftImageView.layer removeAllAnimations]; - giftImageView.hidden = YES; -} - -#pragma mark - Public Method - -- (void)startAnimationWithModel:(DatingInfoModel *)model finishBlock:(void (^)(BOOL))finishBlock { - self.FinishBlock = finishBlock; - if (model.hasHeart) { - if (model.svgaUrl) { - [self startPalySVGAWithUrl:model]; - } else { - ///如果是心动选人的话 但是没有SVGA的话 直接结束 - ///播完之后直接结束这次 - if (self.FinishBlock) { - self.FinishBlock(YES); - } - } - } else { - ///不是心动选人的话 那就不用播两次 爱心的动画 - [self startPickHeartPersonAnimationOriginPoint:model.originPoint targetPoint:model.targetPoint]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - ///心动结束了 直接结束此次 - if (self.FinishBlock) { - self.FinishBlock(YES); - } - }); - } - -} - -///播放SVGA的时候 需要先播放选人的动画 -- (void)startPalySVGAWithUrl:(DatingInfoModel *)model { - if (model.svgaUrl) { - self.backView.hidden = NO; - [[SDWebImageManager sharedManager] loadImageWithURL:[NSURL URLWithString:model.avatar] options:SDWebImageRetryFailed progress:nil completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL) { - if (image) { - image = [self setCornerWithRadius:200 andSize:CGSizeMake(400, 400) image:image]; - [self.datingSvgaImageView setImage:image forKey:@"z_tx"]; - } - }]; - - NSString * title = model.nickname ? model.nickname : @""; - if (title.length >= 5) { - title = [NSString stringWithFormat:@"%@…", [title substringToIndex:5]]; - } - NSMutableAttributedString * rightAttribut = [[NSMutableAttributedString alloc] initWithString:title]; - [rightAttribut addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:28], NSForegroundColorAttributeName:[UIColor whiteColor]} range:NSMakeRange(0, title.length)]; - [self.datingSvgaImageView setAttributedText:rightAttribut forKey:@"z_yhname"]; - - [[SDWebImageManager sharedManager] loadImageWithURL:[NSURL URLWithString:model.targetAvatar] options:SDWebImageRetryFailed progress:nil completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL) { - if (image) { - image = [self setCornerWithRadius:200 andSize:CGSizeMake(400, 400) image:image]; - [self.datingSvgaImageView setImage:image forKey:@"y_tx"]; - } - }]; - NSString * leftTitle = model.targetNickname ? model.targetNickname : @""; - if (leftTitle.length >= 5) { - leftTitle = [NSString stringWithFormat:@"%@…", [leftTitle substringToIndex:5]]; - } - NSMutableAttributedString * leftAttribut = [[NSMutableAttributedString alloc] initWithString:leftTitle]; - [leftAttribut addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:28], NSForegroundColorAttributeName:[UIColor whiteColor]} range:NSMakeRange(0, leftTitle.length)]; - [self.datingSvgaImageView setAttributedText:leftAttribut forKey:@"y_yhname"]; - @kWeakify(self); - NSString *url = [model.svgaUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]; - [self.parser parseWithURL:[NSURL URLWithString:url] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.datingSvgaImageView.hidden = NO; - self.datingSvgaImageView.videoItem = videoItem; - self.datingSvgaImageView.loops = 1; - self.datingSvgaImageView.alpha = 1; - self.datingSvgaImageView.clearsAfterStop = YES; - [ self.datingSvgaImageView startAnimation]; - [self startBeginCutCountWithTotalTime:model.svgaSecond]; - } failureBlock:^(NSError * _Nonnull error) { - - }]; - [self performSelector:@selector(stopAnimation) withObject:nil afterDelay:model.svgaSecond]; - } -} - -- (UIImageView *)heartImageView { - if (!_heartImageView) { - _heartImageView = [[UIImageView alloc] init]; - _heartImageView.image = [UIImage imageNamed:@"room_mode_dating_pick_heart"]; - _heartImageView.hidden = YES; - } - return _heartImageView; -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = UIColorRGBAlpha(0x000000, 0.3); - _backView.hidden = YES; - } - return _backView; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.text = @"5S"; - _timeLabel.font = [UIFont systemFontOfSize:15]; - _timeLabel.textColor = UIColorFromRGB(0xFFFEFE); - } - return _timeLabel; -} - -- (UIView *)cutTimeBackView { - if (!_cutTimeBackView) { - _cutTimeBackView = [[UIView alloc] init]; - _cutTimeBackView.backgroundColor = UIColorRGBAlpha(0x000000, 0.3); - _cutTimeBackView.layer.masksToBounds = YES; - _cutTimeBackView.layer.cornerRadius = 25/2; - _cutTimeBackView.hidden = YES; - } - return _cutTimeBackView; -} - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [UIButton buttonWithType: UIButtonTypeCustom]; - [_closeButton setImage:[UIImage imageNamed:@"common_close_white"] forState:UIControlStateNormal]; - [_closeButton addTarget:self action:@selector(closetButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_closeButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _closeButton; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = UIColor.whiteColor; - } - return _lineView; -} - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} - -- (SVGAImageView *)datingSvgaImageView { - if (!_datingSvgaImageView) { - _datingSvgaImageView = [[SVGAImageView alloc]init]; - _datingSvgaImageView.backgroundColor = [UIColor clearColor]; - _datingSvgaImageView.frame = self.bounds; - _datingSvgaImageView.userInteractionEnabled = YES; - } - return _datingSvgaImageView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.h deleted file mode 100644 index fcd2361..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomEnterHideTipView.h -// YUMI -// -// Created by YUMI on 2022/4/26. -// 隐身进房提示 - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomEnterHideTipView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.m deleted file mode 100644 index e703f59..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.m +++ /dev/null @@ -1,94 +0,0 @@ -// -// YMRoomEnterHideTipView.m -// YUMI -// -// Created by YUMI on 2022/4/26. -// - -#import "XPRoomEnterHideTipView.h" -///Third -#import -///Tool -#import "ThemeColor+Room.h" -#import "DJDKMIMOMColor.h" - -@interface XPRoomEnterHideTipView() - -///背景 -@property (nonatomic,strong) UIView *bgView; -///icon -@property (nonatomic,strong) UIImageView *iconImageView; -///描述 -@property (nonatomic, strong) UILabel *descLabel; - -@end - -@implementation XPRoomEnterHideTipView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)layoutSubviews { - [super layoutSubviews]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgView]; - [self.bgView addSubview:self.iconImageView]; - [self.bgView addSubview:self.descLabel]; -} - -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self); - make.width.mas_equalTo(190); - make.height.mas_equalTo(48); - }]; - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.bgView).mas_offset(12); - make.centerY.mas_equalTo(self.bgView); - make.width.height.mas_equalTo(32); - }]; - [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.iconImageView.mas_trailing).mas_offset(8); - make.centerY.mas_equalTo(self.bgView); - }]; -} - -#pragma mark - Getters And Setters -- (UIView *)bgView { - if (!_bgView) { - _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = UIColorRGBAlpha(0x000000, 0.5); - _bgView.layer.cornerRadius = 24; - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} - -- (UIImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[UIImageView alloc] init]; - _iconImageView.image = [UIImage imageNamed:@"room_enterRoom_hide"]; - } - return _iconImageView; -} - -- (UILabel *)descLabel { - if (!_descLabel) { - UILabel *label = [[UILabel alloc] init]; - label.font = [UIFont systemFontOfSize:14]; - label.textColor = [UIColor whiteColor]; - label.text = YMLocalizedString(@"XPRoomEnterHideTipView0"); - _descLabel = label; - } - return _descLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftAnimationParser.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftAnimationParser.h deleted file mode 100644 index c902c53..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftAnimationParser.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMRoomGiftAnimationParser.h -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomGiftAnimationParser : NSObject - -- (void)parseWithURL:(nonnull NSString *)URL - completionBlock:(void ( ^ _Nonnull )(NSString * _Nullable videoUrl))completionBlock - failureBlock:(void ( ^ _Nullable)(NSError * _Nullable error))failureBlock; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftAnimationParser.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftAnimationParser.m deleted file mode 100644 index d3074af..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftAnimationParser.m +++ /dev/null @@ -1,93 +0,0 @@ -// -// YMRoomGiftAnimationParser.m -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import "XPRoomGiftAnimationParser.h" -#import -#import -#import -#import -#import "GCDHelper.h" - -@implementation XPRoomGiftAnimationParser - - - -- (void)parseWithURL:(nonnull NSString *)URL - completionBlock:(void ( ^ _Nonnull )(NSString * _Nullable videoUrl))completionBlock - failureBlock:(void ( ^ _Nullable)(NSError * _Nullable error))failureBlock { - [self parseWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:URL] cachePolicy:NSURLRequestReturnCacheDataElseLoad timeoutInterval:20.0] - completionBlock:completionBlock - failureBlock:failureBlock]; -} - -- (void)parseWithURLRequest:(NSURLRequest *)URLRequest completionBlock:(void (^)(NSString * _Nullable))completionBlock failureBlock:(void (^)(NSError * _Nullable))failureBlock { - if (URLRequest.URL == nil) { - if (failureBlock) { - [[NSOperationQueue mainQueue] addOperationWithBlock:^{ - failureBlock([NSError errorWithDomain:@"vapParser" code:411 userInfo:@{NSLocalizedDescriptionKey: @"URL cannot be nil."}]); - }]; - } - return; - } - if ([[NSFileManager defaultManager] fileExistsAtPath:[self cacheDirectory:[self cacheKey:URLRequest.URL]]]) { - if (completionBlock) { - [[NSOperationQueue mainQueue] addOperationWithBlock:^{ - completionBlock([self cacheDirectory:[self cacheKey:URLRequest.URL]]); - }]; - } - return; - } - [[[AFHTTPSessionManager manager] downloadTaskWithRequest:URLRequest progress:^(NSProgress * _Nonnull downloadProgress) { - } destination:^NSURL * _Nonnull(NSURL * _Nonnull targetPath, NSURLResponse * _Nonnull response) { - return [NSURL fileURLWithPath:[self cacheDirectory:[self cacheKey:URLRequest.URL]]]; - } completionHandler:^(NSURLResponse * _Nonnull response, NSURL * _Nullable filePath, NSError * _Nullable error) { - if (!error) { - [[NSOperationQueue mainQueue] addOperationWithBlock:^{ - NSString *str; - if ([filePath.absoluteString hasPrefix:@"file:///"]) { - str = [filePath.absoluteString stringByReplacingOccurrencesOfString:@"file://" withString:@""]; - } else { - str = filePath.absoluteString; - } - completionBlock(str); - }]; - } else { - [[NSOperationQueue mainQueue] addOperationWithBlock:^{ - completionBlock(nil); - }]; - } - }] resume]; -} - -- (void)clearCache:(nonnull NSString *)cacheKey { - NSString *cacheDir = [self cacheDirectory:cacheKey]; - [[NSFileManager defaultManager] removeItemAtPath:cacheDir error:NULL]; -} - -- (nonnull NSString *)cacheKey:(NSURL *)URL { - return [self MD5String:URL.absoluteString]; -} - -- (nullable NSString *)cacheDirectory:(NSString *)cacheKey { - NSString *cacheDir = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) firstObject]; - return [cacheDir stringByAppendingFormat:@"/%@.mp4", cacheKey]; -} - -- (NSString *)MD5String:(NSString *)str { - const char *cstr = [str UTF8String]; - unsigned char result[16]; - CC_MD5(cstr, (CC_LONG)strlen(cstr), result); - return [NSString stringWithFormat: - @"%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X", - result[0], result[1], result[2], result[3], - result[4], result[5], result[6], result[7], - result[8], result[9], result[10], result[11], - result[12], result[13], result[14], result[15] - ]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.h deleted file mode 100644 index 308c662..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMRoomGiftBroadcastView.h -// YUMI -// -// Created by YUMI on 2021/11/18. -// 广播横幅 - -#import -#import "GiftReceiveInfoModel.h" -NS_ASSUME_NONNULL_BEGIN -@class XPRoomGiftBroadcastView; - -@protocol XPRoomGiftBroadcastViewDelegate - -///点击了进入房间 -- (void)xPRoomGiftBroadcastView:(XPRoomGiftBroadcastView *)view enterRoom:(NSString *)roomUid roomName:(NSString *)roomName; - -@end - -@interface XPRoomGiftBroadcastView : UIView -/// -@property (nonatomic,strong) GiftReceiveInfoModel *broadcastModel; - -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.m deleted file mode 100644 index 63112a5..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.m +++ /dev/null @@ -1,302 +0,0 @@ -// -// XPRoomGiftBroadcastView.m -// xplan-ios -// -// Created by 冯硕 on 2021/11/18. -// - -#import "XPRoomGiftBroadcastView.h" -///Third -#import -///Tool -#import "ThemeColor+Room.h" - -///Model -#import "GiftReceiveInfoModel.h" -///View -#import "NetImageView.h" - - - - - -@interface XPRoomGiftBroadcastView () -///背景 -@property (nonatomic,strong) UIImageView *backImageView; -///赠送者头像 -@property(nonatomic,strong) NetImageView *senderAvatarView; -///赠送内容 -@property(nonatomic,strong) MarqueeLabel *pi_contentView; - -///礼物 -@property (nonatomic,strong) NetImageView *giftImageView; -///数量 -@property (nonatomic,strong) UILabel *countLabel; - -///房间名 -@property (nonatomic,strong) UILabel *roomNameLabel; -///房间背景 -@property (nonatomic,strong) UIImageView *pi_roomIconView; -///去围观 -@property(nonatomic,strong) UIButton *circuseeBtn; -@end - -@implementation XPRoomGiftBroadcastView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - [self initEvents]; - } - return self; -} -#pragma mark - Response - - -- (void)didClickEnterRoom { - if(self.broadcastModel.roomTitle == nil)return; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomGiftBroadcastView:enterRoom:roomName:)]) { - [self.delegate xPRoomGiftBroadcastView:self enterRoom:[NSString stringWithFormat:@"%ld", self.broadcastModel.roomUid] roomName:self.broadcastModel.roomTitle]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - - [self.backImageView addSubview:self.senderAvatarView]; - [self.backImageView addSubview:self.pi_contentView]; - [self.backImageView addSubview:self.pi_roomIconView]; - [self.backImageView addSubview:self.roomNameLabel]; - [self.backImageView addSubview:self.circuseeBtn]; - [self.backImageView addSubview:self.giftImageView]; - [self.backImageView addSubview:self.countLabel]; -} - -- (void)initSubViewConstraints { - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - - [self.senderAvatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(44)); - make.leading.mas_equalTo(kGetScaleWidth(23)); - make.centerY.equalTo(self.backImageView); - }]; - [self.pi_contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.senderAvatarView.mas_trailing).mas_offset(kGetScaleWidth(13)); - make.top.mas_equalTo(kGetScaleWidth(18)); - make.trailing.mas_equalTo(-kGetScaleWidth(133)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - - [self.pi_roomIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(12)); - make.leading.equalTo(self.senderAvatarView.mas_trailing).mas_offset(kGetScaleWidth(11)); - make.top.mas_equalTo(kGetScaleWidth(39)); - }]; - [self.roomNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(92)); - make.top.mas_equalTo(kGetScaleWidth(40)); - make.height.mas_equalTo(kGetScaleWidth(12)); - make.width.mas_equalTo(kGetScaleWidth(105)); - - }]; - [self.circuseeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(44)); - make.height.mas_equalTo(kGetScaleWidth(20)); - make.leading.equalTo(self.roomNameLabel.mas_trailing).mas_offset(kGetScaleWidth(5)); - make.centerY.equalTo(self.roomNameLabel); - }]; - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(64), kGetScaleWidth(64))); - make.centerY.mas_equalTo(self.backImageView); - make.trailing.mas_equalTo(-kGetScaleWidth(64)); - }]; - - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.giftImageView.mas_trailing).offset(kGetScaleWidth(2)); - make.centerY.mas_equalTo(self.backImageView); - }]; -} - -- (void)initEvents { - [self.circuseeBtn addTarget:self action:@selector(didClickEnterRoom) forControlEvents:UIControlEventTouchUpInside]; -} - -- (void)updateSubviews:(BroadCastLevel)level { - UIColor * lineColor; - UIColor *bgBtnColor; - NSString * bgImageName; - - switch (level) { - case BroadCastLevel_Normal: - { - lineColor = UIColorFromRGB(0x66B5FF); - bgBtnColor = UIColorFromRGB(0x283889); - bgImageName = @"pi_room_gift_broadcast_low_bg"; - } - break; - case BroadCastLevel_Middle: - { - lineColor = UIColorFromRGB(0xFE9FFF); - bgBtnColor = UIColorFromRGB(0x49157D); - bgImageName = @"pi_room_gift_broadcast_middle_bg"; - } - break; - case BroadCastLevel_High: - { - lineColor = UIColorFromRGB(0xFFED77); - bgBtnColor = UIColorFromRGB(0x87152D); - bgImageName = @"pi_room_gift_broadcast_high_bg"; - } - break; - default: - { - lineColor = UIColorFromRGB(0x66B5FF); - bgBtnColor = UIColorFromRGB(0x283889); - bgImageName = @"pi_room_gift_broadcast_low_bg"; - } - break; - } - self.backImageView.image = [UIImage imageNamed:bgImageName]; - self.circuseeBtn.layer.borderColor = lineColor.CGColor; - self.circuseeBtn.backgroundColor = bgBtnColor; -} - --(void)showRoomVC{ - [self didClickEnterRoom]; -} - -#pragma mark - Getters And Setters -- (void)setBroadcastModel:(GiftReceiveInfoModel *)broadcastModel { - _broadcastModel = broadcastModel; - if (_broadcastModel) { - _roomNameLabel.hidden = _broadcastModel.roomTitle.length == 0; - _pi_roomIconView.hidden = _broadcastModel.roomTitle.length == 0; - _circuseeBtn.hidden = _broadcastModel.roomTitle.length == 0; - if(_broadcastModel.roomTitle.length == 0){ - [self.pi_contentView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.senderAvatarView.mas_trailing).mas_offset(kGetScaleWidth(13)); - make.centerY.equalTo(self.backImageView); - make.trailing.mas_equalTo(-kGetScaleWidth(133)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - } - NSString *sendUserNick = _broadcastModel.sendUserNick ?: @""; - NSString *recvUserNick = _broadcastModel.recvUserNick ?: @""; - self.senderAvatarView.imageUrl = _broadcastModel.sendUserAvatar; - sendUserNick = sendUserNick.length > 6 ? [NSString stringWithFormat:@"%@...",[sendUserNick substringToIndex:6]] : sendUserNick; - recvUserNick = recvUserNick.length > 6 ? [NSString stringWithFormat:@"%@...",[recvUserNick substringToIndex:6]] : recvUserNick; - - NSString *giftName = _broadcastModel.giftName; - if (isMSRTL() && _broadcastModel.i18nGiftNameMap.ar.length > 0) { - giftName = _broadcastModel.i18nGiftNameMap.ar; - } else if (isMSEN() && _broadcastModel.i18nGiftNameMap.en.length > 0) { - giftName = _broadcastModel.i18nGiftNameMap.en; - } else if (isMSZH() && _broadcastModel.i18nGiftNameMap.zh.length > 0) { - giftName = _broadcastModel.i18nGiftNameMap.zh; - } else if (isMSTR() && _broadcastModel.i18nGiftNameMap.tr.length > 0) { - giftName = _broadcastModel.i18nGiftNameMap.tr; - } - - NSString *message = [NSString stringWithFormat:@"%@ %@ %@ %@",sendUserNick,YMLocalizedString(@"XPRoomYearActivityView0"),recvUserNick,giftName]; - - NSMutableAttributedString *giftNameAtt = [[NSMutableAttributedString alloc]initWithString:message attributes:@{NSFontAttributeName:kFontMedium(14),NSForegroundColorAttributeName:[UIColor whiteColor]}]; - [giftNameAtt addAttributes:@{NSFontAttributeName:kFontMedium(14),NSForegroundColorAttributeName:UIColorFromRGB(0xFFE468)} range:[message rangeOfString:sendUserNick]]; - [giftNameAtt addAttributes:@{NSFontAttributeName:kFontMedium(14),NSForegroundColorAttributeName:UIColorFromRGB(0xFFE468)} range:[message rangeOfString:recvUserNick]]; - self.pi_contentView.attributedText = giftNameAtt; - self.giftImageView.imageUrl = _broadcastModel.giftUrl; - self.roomNameLabel.text = _broadcastModel.roomTitle; - if(_broadcastModel.giftNum > 1){ - self.countLabel.text = [NSString stringWithFormat:@"x%ld", _broadcastModel.giftNum]; - } - [self updateSubviews:_broadcastModel.levelNum]; - } -} - - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - } - return _backImageView; -} --(NetImageView *)senderAvatarView{ - if(!_senderAvatarView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _senderAvatarView = [[NetImageView alloc]initWithConfig:config]; - _senderAvatarView.layer.cornerRadius = kGetScaleWidth(44)/2; - _senderAvatarView.layer.masksToBounds = YES; - _senderAvatarView.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(showRoomVC)]; - [_senderAvatarView addGestureRecognizer:tap]; - } - return _senderAvatarView; -} - -- (MarqueeLabel *)pi_contentView{ - if(!_pi_contentView){ - _pi_contentView = [[MarqueeLabel alloc] init]; - _pi_contentView.scrollDuration = 6.0; - _pi_contentView.fadeLength = 8.0f; - _pi_contentView.textAlignment = NSTextAlignmentCenter; - } - return _pi_contentView; -} - - -- (NetImageView *)giftImageView { - if (!_giftImageView) { - - _giftImageView = [[NetImageView alloc] init]; - } - return _giftImageView; -} - -- (UILabel *)countLabel { - if (!_countLabel) { - _countLabel = [[UILabel alloc] init]; - _countLabel.textColor = UIColorFromRGB(0xFFE468); - _countLabel.font = kFontHeavy(16); - - } - return _countLabel; -} - - - - -- (UILabel *)roomNameLabel { - if (!_roomNameLabel) { - _roomNameLabel = [[UILabel alloc] init]; - _roomNameLabel.font = kFontRegular(12); - _roomNameLabel.textColor = [UIColor whiteColor]; - } - return _roomNameLabel; -} -- (UIImageView *)pi_roomIconView{ - if(!_pi_roomIconView){ - _pi_roomIconView = [UIImageView new]; - _pi_roomIconView.image = kImage(@"pi_room_gift_broadcast_room_icon"); - } - return _pi_roomIconView; -} -- (UIButton *)circuseeBtn{ - if(!_circuseeBtn){ - _circuseeBtn = [UIButton new]; - [_circuseeBtn setTitle:YMLocalizedString(@"XPAcrossRoomPKPanelView3") forState:UIControlStateNormal]; - _circuseeBtn.titleLabel.font = kFontRegular(10); - _circuseeBtn.layer.cornerRadius = kGetScaleWidth(20)/2; - _circuseeBtn.layer.borderWidth = 1; - _circuseeBtn.layer.masksToBounds = YES; - } - return _circuseeBtn; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftCompoundView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftCompoundView.h deleted file mode 100644 index 6685f83..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftCompoundView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMRoomGiftCompoundView.h -// YUMI -// -// Created by YUMI on 2022/8/5. -// 魔法小屋礼物合成 - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomGiftCompoundView : UIView - -///礼物合成的信息 -@property (nonatomic,copy) NSDictionary * compoundGiftInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftCompoundView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftCompoundView.m deleted file mode 100644 index a307f7e..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftCompoundView.m +++ /dev/null @@ -1,113 +0,0 @@ -// -// YMRoomGiftCompoundView.m -// YUMI -// -// Created by YUMI on 2022/8/5. -// - -#import "XPRoomGiftCompoundView.h" -///Third -#import -#import -#import "YUMIMacroUitls.h" -#import "ThemeColor+Room.h" -#import "XPGiftCompoundModel.h" -#import "NSObject+MJExtension.h" - -@interface XPRoomGiftCompoundView () - -///动画管理类 -@property (strong, nonatomic) SVGAParser *parser; -///礼物合成特效 -@property (nonatomic,strong) SVGAImageView *compoundGiftView; -///显示文本内容 -@property (nonatomic,strong) UILabel *titleLabel; - -@end - -@implementation XPRoomGiftCompoundView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.compoundGiftView]; - [self addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.compoundGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - make.height.mas_equalTo(45); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.compoundGiftView); - }]; -} - -- (NSAttributedString *)createAttribute:(NSString * )text color:(UIColor *)color fontSize:(CGFloat)fonSize { - NSDictionary * attribute = @{NSFontAttributeName:[UIFont systemFontOfSize:fonSize], NSForegroundColorAttributeName:color}; - NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:text attributes:attribute]; - return attr; -} - -#pragma mark - Getters And Setters -- (void)setCompoundGiftInfo:(NSDictionary *)compoundGiftInfo { - if (compoundGiftInfo) { - XPGiftCompoundModel * giftInfo = [XPGiftCompoundModel modelWithDictionary:compoundGiftInfo]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - CGFloat fontSize = 22; - NSString *nickStr = giftInfo.nick; - if (nickStr.length > 6) { - nickStr = [NSString stringWithFormat:@"%@…", [giftInfo.nick substringToIndex:6]]; - } - [attribute appendAttributedString:[self createAttribute:YMLocalizedString(@"XPRoomGiftCompoundView0") color:[UIColor whiteColor] fontSize:fontSize]]; - [attribute appendAttributedString:[self createAttribute:nickStr color:[DJDKMIMOMColor messageNickColor] fontSize:fontSize]]; - [attribute appendAttributedString:[self createAttribute:giftInfo.msg color:[UIColor whiteColor] fontSize:fontSize]]; - [attribute appendAttributedString:[self createAttribute:giftInfo.giftName color:[DJDKMIMOMColor messageNickColor] fontSize:fontSize]]; - - @kWeakify(self); - NSString * anatomiser1Name = [NSString stringWithFormat:@"%@/compound_gift_banner.svga", API_Image_URL]; - [self.parser parseWithURL:[NSURL URLWithString:anatomiser1Name] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.compoundGiftView.loops = 1; - self.compoundGiftView.clearsAfterStop = NO; - self.compoundGiftView.videoItem = videoItem; - [self.compoundGiftView setAttributedText:attribute forKey:@"noble_text_tx"]; - [self.compoundGiftView startAnimation]; - } failureBlock:^(NSError * _Nonnull error) { - - }]; - } -} - -- (SVGAImageView *)compoundGiftView { - if (!_compoundGiftView) { - _compoundGiftView = [[SVGAImageView alloc]init]; - _compoundGiftView.backgroundColor = [UIColor clearColor]; - _compoundGiftView.userInteractionEnabled = NO; - } - return _compoundGiftView; -} - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGraffitiGiftAnimationView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGraffitiGiftAnimationView.h deleted file mode 100644 index 947614c..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGraffitiGiftAnimationView.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMRoomGraffitiGiftAnimationView.h -// YUMI -// -// Created by YUMI on 2022/8/23. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPRoomGraffitiGiftAnimationView, AttachmentModel; -@protocol XPRoomGraffitiGiftAnimationViewDelegate - -///动画完成 -- (void)xPRoomGraffitiGiftAnimationViewCompletion:(XPRoomGraffitiGiftAnimationView *)view attachment:(AttachmentModel *)attachment; - -@end - -@interface XPRoomGraffitiGiftAnimationView : UIView -@property (nonatomic,strong) UIImage *giftImage; -///代理 -@property (nonatomic,weak) id delegate; -@property (nonatomic,strong) NSArray *pointArray; -@property (nonatomic,strong) AttachmentModel *model; -///开始涂鸦动画 -- (void)beginDrawAnimation; -///结束涂鸦动画 -- (void)endDrawAnimation; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGraffitiGiftAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGraffitiGiftAnimationView.m deleted file mode 100644 index 0fd7d40..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGraffitiGiftAnimationView.m +++ /dev/null @@ -1,86 +0,0 @@ -// -// YMRoomGraffitiGiftAnimationView.m -// YUMI -// -// Created by YUMI on 2022/8/23. -// - -#import "XPRoomGraffitiGiftAnimationView.h" -#import "XPWeakTimer.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" - -@interface XPRoomGraffitiGiftAnimationView () -@property (nonatomic,strong) NSTimer *timer; -@property (nonatomic,assign) int index; -///数据 -@property (nonatomic,strong) NSMutableArray *datasource; -@end - -@implementation XPRoomGraffitiGiftAnimationView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - self.userInteractionEnabled = NO; - self.timer = [XPWeakTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(dramGraffitiAnimationView) userInfo:@"" repeats:YES]; - } - return self; -} - -- (void)beginDrawAnimation { - self.index = 0; - for (int i = 0; i < self.pointArray.count; i++) { - NSArray * pointArray = self.pointArray[i]; - NSNumber * first = [pointArray firstObject]; - NSNumber * second = [pointArray lastObject]; - CGFloat x = first.floatValue / 1000.0 * KScreenWidth; - CGFloat y = second.floatValue / 1000.0 * KScreenHeight; - if (x <= 0 || x >= KScreenWidth || y <= 0 || y >= KScreenHeight) { - continue; - } - CGPoint point = CGPointMake(x, y); - [self.datasource addObject:[NSValue valueWithCGPoint:point]]; - } - self.timer.fireDate = NSDate.distantPast; -} - -- (void)endDrawAnimation { - self.timer.fireDate = NSDate.distantFuture; - [self.datasource removeAllObjects]; - self.index = 0; -} - - -- (void)dramGraffitiAnimationView { - if (self.index >= (self.datasource.count -1)) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - self.timer.fireDate = NSDate.distantFuture; - [self.datasource removeAllObjects]; - self.index = 0; - [self.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomGraffitiGiftAnimationViewCompletion:attachment:)]) { - [self.delegate xPRoomGraffitiGiftAnimationViewCompletion:self attachment:self.model]; - } - }); - return; - } - NSValue * valeu= [self.datasource xpSafeObjectAtIndex:self.index]; - CGPoint point = valeu.CGPointValue; - UIImageView * imageView = [[UIImageView alloc] init]; - imageView.layer.masksToBounds = YES; - imageView.contentMode = UIViewContentModeScaleAspectFill; - imageView.image = self.giftImage; - imageView.frame = CGRectMake(point.x, point.y, 20, 20); - [self addSubview:imageView]; - self.index++; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.h deleted file mode 100644 index 2339d7b..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMRoomLuckyBigPrizeView.h -// YUMI -// -// Created by YUMI on 2022/6/15. -// - -#import -#import "PIBaseAnimationViewModel.h" -NS_ASSUME_NONNULL_BEGIN -@class XPGiftBigPrizeModel, XPRoomLuckyBigPrizeView; -@protocol XPRoomLuckyBigPrizeViewDelegate - -- (void)xPRoomLuckyBigPrizeView:(XPRoomLuckyBigPrizeView *)view luckyGiftInfo:(PIBaseAnimationViewModel *)giftInfo; - -@end - -@interface XPRoomLuckyBigPrizeView : UIView -///礼物信息 -@property (nonatomic,strong) PIBaseAnimationViewModel *giftInfo; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.m deleted file mode 100644 index ae021bd..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.m +++ /dev/null @@ -1,179 +0,0 @@ -// -// YMRoomLuckyBigPrizeView.m -// YUMI -// -// Created by YUMI on 2022/6/15. -// - -#import "XPRoomLuckyBigPrizeView.h" -///Third -#import -#import "SVGAParser.h" -#import "SVGA.h" -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -///Model -#import "XPGiftBigPrizeModel.h" -///View -#import "XPSVGAPlayer.h" - - -@interface XPRoomLuckyBigPrizeView () -///动画管理类 -@property (strong, nonatomic) SVGAParser *parser; -@property (nonatomic, strong) XPSVGAPlayer *giftSvgaView; -@property(nonatomic,strong) NetImageView *chestImageView; -@property(nonatomic,strong) NetImageView *giftImageView; -@property(nonatomic,strong) UILabel *contentView; -@end - -@implementation XPRoomLuckyBigPrizeView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.giftSvgaView]; - [self addSubview:self.chestImageView]; - [self addSubview:self.giftImageView]; - [self addSubview:self.contentView]; - -} - -- (void)initSubViewConstraints { - [self.giftSvgaView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - [self.chestImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(9); - make.centerY.equalTo(self); - make.height.width.mas_equalTo(60); - }]; - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-9); - make.centerY.equalTo(self); - make.height.width.mas_equalTo(60); - }]; - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self).inset(69); - make.centerY.equalTo(self); - }]; -} - -#pragma mark - Event Response -- (void)tapRecognizer:(UITapGestureRecognizer *)tap { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomLuckyBigPrizeView:luckyGiftInfo:)]) { - [self.delegate xPRoomLuckyBigPrizeView:self luckyGiftInfo:self.giftInfo]; - } -} -- (void)chestImageViewTapRecognizer:(UITapGestureRecognizer *)tap{ - [self tapRecognizer:tap]; -} -- (void)giftImageViewTapRecognizer:(UITapGestureRecognizer *)tap{ - [self tapRecognizer:tap]; -} -#pragma mark - Getters And Setters -- (void)setGiftInfo:(PIBaseAnimationViewModel*)giftInfo { - _giftInfo = giftInfo; - if (_giftInfo) { - NSString * nick = _giftInfo.nick ?: @""; - if (nick.length > 5) { - nick = [nick substringToIndex:5]; - } - NSString *goldPrice = _giftInfo.goldPrice ?: @"0"; - NSString *giftName = _giftInfo.giftName ?: @""; - NSString *luckyBagName = _giftInfo.luckyBagName ?: @""; - NSString *giftNum = _giftInfo.giftNum ?: @"0"; - NSString *mainText = [NSString stringWithFormat:YMLocalizedString(@"XPRoomLuckyBigPrizeView0"),nick,luckyBagName,goldPrice,giftName]; - if (isMSRTL()){ - mainText = [NSString stringWithFormat:YMLocalizedString(@"XPRoomLuckyBigPrizeView0"),nick,giftName,goldPrice,luckyBagName]; - } - if([giftNum integerValue] > 1){ - mainText = [NSString stringWithFormat:@"%@ X%@",mainText,giftNum]; - } - CGFloat fontSize = 12; - NSDictionary * dic = @{NSFontAttributeName:[UIFont systemFontOfSize:fontSize weight:UIFontWeightMedium], NSForegroundColorAttributeName:UIColorFromRGB(0xFFF45E)}; - NSDictionary * mainDic = @{NSFontAttributeName:[UIFont systemFontOfSize:fontSize weight:UIFontWeightMedium], NSForegroundColorAttributeName:[UIColor whiteColor]}; - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; - [attributedString appendAttributedString:[[NSMutableAttributedString alloc] initWithString:mainText attributes:mainDic]]; - - [attributedString addAttributes:dic range:[mainText rangeOfString:nick]]; - [attributedString addAttributes:dic range:[mainText rangeOfString:luckyBagName]]; - [attributedString addAttributes:dic range:[mainText rangeOfString:goldPrice]]; - [attributedString addAttributes:dic range:[mainText rangeOfString:giftName]]; - if([giftNum integerValue] > 1){ - [attributedString addAttributes:dic range:[mainText rangeOfString:giftNum]]; - } - _contentView.attributedText = attributedString; - _chestImageView.imageUrl = _giftInfo.luckyBagGiftPic; - _giftImageView.imageUrl = _giftInfo.giftPic; - @kWeakify(self); - - [self.parser parseWithNamed:@"pi_room_lucky_gift" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.hidden = NO; - self.giftSvgaView.hidden = NO; - self.giftSvgaView.videoItem = videoItem; - self.giftSvgaView.loops = 10000; - self.giftSvgaView.clearsAfterStop = YES; - [self.giftSvgaView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { - }]; - - - } -} -- (void)svgaPlayerDidFinishedAnimation:(SVGAPlayer *)player{ - -} -- (XPSVGAPlayer *)giftSvgaView { - if (!_giftSvgaView) { - _giftSvgaView = [[XPSVGAPlayer alloc]init]; - _giftSvgaView.backgroundColor = [UIColor clearColor]; - _giftSvgaView.userInteractionEnabled = NO; - _giftSvgaView.delegate = self; - } - return _giftSvgaView; -} - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} -- (NetImageView *)chestImageView{ - if(!_chestImageView){ - _chestImageView = [NetImageView new]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(chestImageViewTapRecognizer:)]; - _chestImageView.userInteractionEnabled = YES; - [_chestImageView addGestureRecognizer:tap]; - } - return _chestImageView; -} -- (NetImageView *)giftImageView{ - if(!_giftImageView){ - _giftImageView = [NetImageView new]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(giftImageViewTapRecognizer:)]; - _giftImageView.userInteractionEnabled = YES; - [_giftImageView addGestureRecognizer:tap]; - } - return _giftImageView; -} -- (UILabel *)contentView{ - if(!_contentView){ - _contentView = [UILabel labelInitWithText:@"" font:kFontMedium(10) textColor:[UIColor whiteColor]]; - _contentView.textAlignment = NSTextAlignmentCenter; - _contentView.numberOfLines = 2; - } - return _contentView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.h deleted file mode 100644 index 83bf174..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMRoomNobleLevelUpView.h -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef void(^CompletionBlock)(void); - -@interface XPRoomNobleLevelUpView : UIView - -///VIP升级的信息 -@property (nonatomic,copy) NSDictionary * nobleInfo; -@property(nonatomic,copy) CompletionBlock completionBlock; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m deleted file mode 100644 index d7d106f..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m +++ /dev/null @@ -1,159 +0,0 @@ -// -// YMRoomNobleLevelUpView.m -// YUMI -// -// Created by YUMI on 2022/1/10. -// - -#import "XPRoomNobleLevelUpView.h" -///Third -#import -#import -#import "YUMIMacroUitls.h" -#import "ThemeColor+Room.h" -#import "NetImageView.h" -#import - - -@interface XPRoomNobleLevelUpView () -///动画管理类 -@property (strong, nonatomic) SVGAParser *parser; - -///VIP特效 -@property (nonatomic,strong) SVGAImageView *nobleView; - - -///用户头像 -@property (nonatomic, strong) NetImageView *imageView; - -///赠送内容 -@property(nonatomic,strong) MarqueeLabel *pi_contentView; -@end - - -@implementation XPRoomNobleLevelUpView -- (void)dealloc -{ - -} -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.nobleView]; - [self addSubview:self.pi_contentView]; -} - -- (void)initSubViewConstraints { - [self.nobleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - make.height.mas_equalTo(90); - }]; - [self.pi_contentView mas_makeConstraints:^(MASConstraintMaker *make) { - - make.top.mas_equalTo(kGetScaleWidth(33)); - make.leading.mas_equalTo(kGetScaleWidth(40)); - make.trailing.mas_equalTo(-kGetScaleWidth(40)); - }]; -} - -- (NSMutableAttributedString *)createAttribute:(NSString * )text color:(UIColor *)color { - NSDictionary * attribute = @{NSFontAttributeName:[UIFont systemFontOfSize:11], NSForegroundColorAttributeName:color}; - NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:text attributes:attribute]; - return attr; -} - -#pragma mark - Getters And Setters -- (void)setNobleInfo:(NSDictionary *)nobleInfo { - _nobleInfo = nobleInfo; - if (nobleInfo) { - @kWeakify(self); - self.imageView.imageUrl = nobleInfo[@"avatar"]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - [attribute appendAttributedString:[self createAttribute:YMLocalizedString(@"XPRoomNobleLevelUpView0") color:[UIColor whiteColor]]]; - - - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [self.imageView.image roundedImageWithCornerRadius:self.imageView.image.size.height/2 size:self.imageView.image.size]; - attachment.bounds = CGRectMake(0, roundf([UIFont systemFontOfSize:11].capHeight - 25)/2.f, 25, 25); - attachment.image =iconImage; - NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; - [attribute appendAttributedString:starAttribute]; - - NSMutableAttributedString * attribute1 = [[NSMutableAttributedString alloc] init]; - [attribute1 appendAttributedString:[self createAttribute:@" " color:[DJDKMIMOMColor giftBroadcastNumberColor]]]; - [attribute1 appendAttributedString:[self createAttribute:nobleInfo[@"nick"] color:[DJDKMIMOMColor giftBroadcastNumberColor]]]; - [attribute1 appendAttributedString:[self createAttribute:@" " color:[DJDKMIMOMColor giftBroadcastNumberColor]]]; - [attribute1 appendAttributedString:[self createAttribute:[NSString stringWithFormat:YMLocalizedString(@"XPRoomNobleLevelUpView1"), nobleInfo[@"currVipName"]] color:[UIColor whiteColor]]]; - [attribute appendAttributedString:attribute1]; - - [self.parser parseWithURL:[NSURL URLWithString:nobleInfo[@"floatPic"]] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - self.nobleView.loops = 1; - self.nobleView.clearsAfterStop = NO; - self.nobleView.videoItem = videoItem; - [self.nobleView startAnimation]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - self.pi_contentView.attributedText = attribute; - - }); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.nobleView pauseAnimation]; - - }); - if(self.completionBlock){ - self.completionBlock(); - } - - } failureBlock:^(NSError * _Nonnull error) { - - }]; - - } -} - - -- (SVGAImageView *)nobleView { - if (!_nobleView) { - _nobleView = [[SVGAImageView alloc]init]; - _nobleView.backgroundColor = [UIColor clearColor]; - _nobleView.userInteractionEnabled = NO; - } - return _nobleView; -} - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} - - - -- (NetImageView *)imageView { - if (!_imageView) { - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.autoLoad = YES; - _imageView = [[NetImageView alloc] initWithConfig:config]; - } - return _imageView; -} -- (MarqueeLabel *)pi_contentView{ - if(!_pi_contentView){ - _pi_contentView = [[MarqueeLabel alloc] init]; - _pi_contentView.scrollDuration = 6.0; - _pi_contentView.fadeLength = 8.0f; - _pi_contentView.textAlignment = NSTextAlignmentCenter; - } - return _pi_contentView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.h deleted file mode 100644 index 6a93e25..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMRoomYearActivityView.h -// YUMI -// -// Created by GLEN on 2022/11/26. -// 年度活动 - -#import -#import "GiftReceiveInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPRoomYearActivityViewDelegate - -///点击了进入房间 -- (void)xPRoomYearActivityViewEnterRoom:(NSString *)roomUid; - -@end - -@interface XPRoomYearActivityView : UIView - -@property (nonatomic, strong) GiftReceiveInfoModel *model; -///代理 -@property (nonatomic,weak) id delegate; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.m deleted file mode 100644 index 31a9d2d..0000000 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.m +++ /dev/null @@ -1,214 +0,0 @@ -// -// YMRoomYearActivityView.m -// YUMI -// -// Created by GLEN on 2022/11/26. -// - -#import "XPRoomYearActivityView.h" -///Third -#import -///Tool -#import "ThemeColor+Room.h" -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -///Model -#import "RoomHalfHourRankModel.h" -///View -#import "NetImageView.h" - -@interface XPRoomYearActivityView() - -///背景 -@property (nonatomic,strong) UIImageView *bgImageView; -///icon -@property (nonatomic,strong) NetImageView *sendAvatar; -///头像 -@property (nonatomic,strong) NetImageView *receiveAvatar; -///恭喜 -@property (nonatomic,strong) UILabel *sendNick; -///昵称 -@property (nonatomic,strong) UILabel *receiveNick; -///描述 -@property (nonatomic, strong) UILabel *descLabel; -///数量 -@property (nonatomic,strong) UILabel *countLabel; -///排行 -@property (nonatomic, strong) UIButton *gotoButton; - -@end - -@implementation XPRoomYearActivityView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)layoutSubviews { - [super layoutSubviews]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self addSubview:self.sendNick]; - [self addSubview:self.sendAvatar]; - [self addSubview:self.descLabel]; - [self addSubview:self.receiveNick]; - [self addSubview:self.receiveAvatar]; - [self addSubview:self.countLabel]; - [self addSubview:self.gotoButton]; -} - -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.sendNick mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(35*KScreenWidth/375); - make.centerY.mas_equalTo(self.bgImageView); - }]; - [self.sendAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.sendNick.mas_trailing).mas_offset(3); - make.centerY.mas_equalTo(self); - make.width.height.mas_equalTo(20); - }]; - [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.sendAvatar.mas_trailing).mas_offset(3); - make.centerY.mas_equalTo(self); - }]; - [self.receiveNick mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.descLabel.mas_trailing).mas_offset(3); - make.centerY.mas_equalTo(self); - }]; - [self.receiveAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.receiveNick.mas_trailing).mas_offset(3); - make.centerY.mas_equalTo(self); - make.width.height.mas_equalTo(20); - }]; - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.receiveAvatar.mas_trailing).mas_offset(3); - make.centerY.mas_equalTo(self); - }]; - [self.gotoButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-31*KScreenWidth / 375); - make.centerY.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(40, 18)); - }]; -} - -- (void)setModel:(GiftReceiveInfoModel *)model { - _model = model; - if (model) { - self.receiveAvatar.imageUrl = model.recvUserAvatar; - self.sendAvatar.imageUrl = model.sendUserAvatar; - if (model.recvUserNick.length > 4) { - model.recvUserNick = [NSString stringWithFormat:@"%@...", [model.recvUserNick substringToIndex:4]]; - } - if (model.sendUserNick.length > 4) { - model.sendUserNick = [NSString stringWithFormat:@"%@...", [model.sendUserNick substringToIndex:4]]; - } - if (model.giftName.length > 6) { - model.giftName = [model.giftName substringToIndex:6]; - } - self.sendNick.text = model.sendUserNick; - self.receiveNick.text = model.recvUserNick; - self.countLabel.text = [NSString stringWithFormat:@"%@ x%ld", model.giftName, model.giftNum]; - } -} - -- (void)onGotoButtonClick:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomYearActivityViewEnterRoom:)]) { - [self.delegate xPRoomYearActivityViewEnterRoom:[NSString stringWithFormat:@"%ld", self.model.roomUid]]; - } -} - -#pragma mark - Getters And Setters -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage imageNamed:@"YearActivity_bg"]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _bgImageView; -} - -- (NetImageView *)sendAvatar { - if (!_sendAvatar) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - _sendAvatar = [[NetImageView alloc] initWithConfig:config]; - _sendAvatar.layer.masksToBounds = YES; - _sendAvatar.layer.cornerRadius = 10; - _sendAvatar.layer.borderColor = UIColorFromRGB(0xFBC200).CGColor; - _sendAvatar.layer.borderWidth = 1; - } - return _sendAvatar; -} - -- (UILabel *)sendNick { - if (!_sendNick) { - UILabel *label = [[UILabel alloc] init]; - label.font = [UIFont systemFontOfSize:12]; - label.textColor = UIColorFromRGB(0xFBC200); - _sendNick = label; - } - return _sendNick; -} - -- (NetImageView *)receiveAvatar { - if (!_receiveAvatar) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - _receiveAvatar = [[NetImageView alloc] initWithConfig:config]; - _receiveAvatar.layer.masksToBounds = YES; - _receiveAvatar.layer.cornerRadius = 10; - _receiveAvatar.layer.borderColor = UIColorFromRGB(0xFBC200).CGColor; - _receiveAvatar.layer.borderWidth = 1; - } - return _receiveAvatar; -} - -- (UILabel *)receiveNick { - if (!_receiveNick) { - UILabel *label = [[UILabel alloc] init]; - label.font = [UIFont systemFontOfSize:12]; - label.textColor = UIColorFromRGB(0xFBC200); - _receiveNick = label; - } - return _receiveNick; -} - -- (UILabel *)descLabel { - if (!_descLabel) { - UILabel *label = [[UILabel alloc] init]; - label.font = [UIFont systemFontOfSize:12]; - label.textColor = [UIColor whiteColor]; - label.text = YMLocalizedString(@"XPRoomYearActivityView0"); - _descLabel = label; - } - return _descLabel; -} - -- (UILabel *)countLabel { - if (!_countLabel) { - _countLabel = [[UILabel alloc] init]; - _countLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightBold]; - _countLabel.textColor = UIColorFromRGB(0x80F9FF); - } - return _countLabel; -} -- (UIButton *)gotoButton { - if (!_gotoButton) { - _gotoButton = [[UIButton alloc] init]; - [_gotoButton setBackgroundImage:[UIImage getLanguageImage:@"YearActivity_goto"] forState:UIControlStateNormal]; - [_gotoButton addTarget:self action:@selector(onGotoButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _gotoButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/AnimationView/addMoveAnimationToView.m b/YuMi/Modules/YMRoom/View/AnimationView/addMoveAnimationToView.m deleted file mode 100644 index e69de29..0000000 diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/Api/Api+ArrangeMic.h b/YuMi/Modules/YMRoom/View/ArrangeMic/Api/Api+ArrangeMic.h deleted file mode 100644 index f7db90a..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/Api/Api+ArrangeMic.h +++ /dev/null @@ -1,64 +0,0 @@ -// -// Api+ArrangeMic.h -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (ArrangeMic) - -/// 获取房间排麦列表 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param operUid 操作者的uid -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -+ (void)getRoomArrangeMicList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid page:(NSString *)page pageSize:(NSString *)pageSize; - -/// 申请排麦 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -/// @param groupType 类型 -+ (void)applyArrangeMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid groupType:(NSString *)groupType; -/// 取消排麦 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -/// @param groupType 类型 -+ (void)cancelArrangeMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid groupType:(NSString *)groupType; - -/// 房间内PK的用户列表 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -+ (void)getRoomPKUserList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid page:(NSString *)page pageSize:(NSString *)pageSize; - -/// 获取当前房间PK的长度 -/// @param completion 完成 -/// @param roomUid 房主的uid -//+ (void)getRoomPKSize:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -/// 申请房间内PK排麦 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -/// @param groupType 类型 -+ (void)applyRoomPKArrangeMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid groupType:(NSString *)groupType; - -/// 取消房间内PK排麦 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -/// @param groupType 类型 -+ (void)cancelRoomPKArrangeMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid groupType:(NSString *)groupType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/Api/Api+ArrangeMic.m b/YuMi/Modules/YMRoom/View/ArrangeMic/Api/Api+ArrangeMic.m deleted file mode 100644 index 1a0ae8f..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/Api/Api+ArrangeMic.m +++ /dev/null @@ -1,77 +0,0 @@ -// -// Api+ArrangeMic.m -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import "Api+ArrangeMic.h" -#import -@implementation Api (ArrangeMic) - - -/// 获取房间排麦列表 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param operUid 操作者的uid -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -+ (void)getRoomArrangeMicList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid page:(NSString *)page pageSize:(NSString *)pageSize { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9xdWV1ZS9saXN0"];///room/queue/list - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, operUid,page, pageSize, nil]; -} - - -/// 申请排麦 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -/// @param groupType 类型 -+ (void)applyArrangeMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid groupType:(NSString *)groupType { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9xdWV1ZQ=="];/// - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, operUid, groupType, nil]; -} - -/// 取消排麦 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -/// @param groupType 类型 -+ (void)cancelArrangeMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid groupType:(NSString *)groupType { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9xdWV1ZQ=="];///"room/queue - [self makeRequest:fang method:HttpRequestHelperMethodDELETE completion:completion, __FUNCTION__, roomUid, operUid, groupType, nil]; -} - - -/// 房间内PK的用户列表 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -+ (void)getRoomPKUserList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid page:(NSString *)page pageSize:(NSString *)pageSize { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9way9xdWV1ZS9saXN0"];///room/pk/queue/list - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,roomUid, operUid, page, pageSize, nil]; -} - -/// 申请房间内PK排麦 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -/// @param groupType 类型 -+ (void)applyRoomPKArrangeMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid groupType:(NSString *)groupType { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9way9qb2lu"];///room/pk/join - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, operUid, groupType, nil]; -} - -/// 取消房间内PK排麦 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -/// @param groupType 类型 -+ (void)cancelRoomPKArrangeMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid groupType:(NSString *)groupType { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9way9qb2lu"];///room/pk/join - [self makeRequest:fang method:HttpRequestHelperMethodDELETE completion:completion, __FUNCTION__, roomUid, operUid, groupType, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/Model/ArrangeMicModel.h b/YuMi/Modules/YMRoom/View/ArrangeMic/Model/ArrangeMicModel.h deleted file mode 100644 index 5be011c..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/Model/ArrangeMicModel.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// ArrangeMicModel.h -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import -#import "YUMINNNN.h" -#import "XPArrangeMicInfoModel.h" -NS_ASSUME_NONNULL_BEGIN -@class ArrangeMicUserModel; -@interface ArrangeMicModel : PIBaseModel -///参与排麦人数 -@property (nonatomic, strong) NSString * count; -///我的排麦位置 -@property (nonatomic, strong) NSString * myPos; -///排麦的人 -@property (nonatomic,copy) NSArray *queue; -@end - -@interface ArrangeMicUserModel : PIBaseModel -///生日 -@property(nonatomic,assign) long birth; -///uid -@property (nonatomic,copy) NSString * uid; -///性别 -@property (nonatomic,assign) GenderType gender; -///头像 -@property (nonatomic,copy) NSString *avatar; -///名字 -@property (nonatomic,copy) NSString *nick; -///当前的编号 -@property (nonatomic,assign) NSInteger number; -///红队或者蓝队 男神后者女神 -@property (nonatomic,assign) GroupType groupType; -///排麦的类型 本地加的字段 -@property (nonatomic,assign) ArrangeMicType arrangeMicType; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/Model/ArrangeMicModel.m b/YuMi/Modules/YMRoom/View/ArrangeMic/Model/ArrangeMicModel.m deleted file mode 100644 index d9c6ab2..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/Model/ArrangeMicModel.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// ArrangeMicModel.m -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import "ArrangeMicModel.h" - -@implementation ArrangeMicModel - -+ (NSDictionary *)objectClassInArray { - return @{@"queue":ArrangeMicUserModel.class}; -} - -@end - - -@implementation ArrangeMicUserModel - - - -@end diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/Model/XPArrangeMicInfoModel.h b/YuMi/Modules/YMRoom/View/ArrangeMic/Model/XPArrangeMicInfoModel.h deleted file mode 100644 index e42d809..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/Model/XPArrangeMicInfoModel.h +++ /dev/null @@ -1,43 +0,0 @@ -// -// YMArrangeMicInfoModel.h -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import -#import "MicroQueueModel.h" -#import "MicroStateModel.h" -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, ArrangeMicType) { - ///普通模式的排麦 - ArrangeMicType_Normal = 0, - ///相亲模式的排麦 - ArrangeMicType_Dating, - ///相亲模式的排麦 - ArrangeMicType_Room_PK, -}; - -@interface XPArrangeMicInfoModel : PIBaseModel -///房间id -@property (nonatomic,copy) NSString *roomId; -///房主的uid -@property (nonatomic,copy) NSString *roomUid; -///需要抱上麦的 -@property (nonatomic, strong) NSMutableDictionary *micQueue; -///用户类型 -@property (nonatomic,assign) BOOL isManager; -///房间标题 -@property (nonatomic,copy) NSString *roomTitle; -///房间头像 -@property (nonatomic,copy) NSString *roomAvatar; -///房间昵称 -@property (nonatomic,copy) NSString * nick; -///排麦的类型 -@property (nonatomic,assign) ArrangeMicType type; - -@property(nonatomic, assign) NSInteger roomType; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/Model/XPArrangeMicInfoModel.m b/YuMi/Modules/YMRoom/View/ArrangeMic/Model/XPArrangeMicInfoModel.m deleted file mode 100644 index 455759b..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/Model/XPArrangeMicInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMArrangeMicInfoModel.m -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import "XPArrangeMicInfoModel.h" - -@implementation XPArrangeMicInfoModel - -@end diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/Presenter/XPArrangeMicPresenter.h b/YuMi/Modules/YMRoom/View/ArrangeMic/Presenter/XPArrangeMicPresenter.h deleted file mode 100644 index 783d9bb..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/Presenter/XPArrangeMicPresenter.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// YMArrangeMicPresenter.h -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import "BaseMvpPresenter.h" -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPArrangeMicPresenter : BaseMvpPresenter - -/// 获取房间排麦列表 -/// @param roomUid 房主的uid -/// @param page 当前的页数 -/// @param pageSize 一页的个数 -/// @param state 顶部刷新还是尾部刷新 -- (void)getRoomArrangeMicList:(NSString *)roomUid page:(int)page pageSize:(int)pageSize state:(int)state; - -/// 申请排麦 -/// @param roomUid 房主的uid -/// @param groupType 类型 -- (void)applyRoomArrangeMic:(NSString *)roomUid groupType:(GroupType)groupType; - -/// 取消申请排麦 -/// @param roomUid 房主的uid -/// @param groupType 类型 -- (void)cancelRoomArrangeMic:(NSString *)roomUid groupType:(GroupType)groupType; - -/// 获取房间PK用户的列表 -/// @param roomUid 房主的uid -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param state 上啦 1还是下拉0 -- (void)getRoomPKMemberList:(NSString *)roomUid page:(int)page pageSize:(int)pageSize state:(int)state; - -/// 申请房间内PK排麦 -/// @param roomUid 房主的uid -/// @param groupType 类型 -- (void)applyRoomPKArrangeMic:(NSString *)roomUid groupType:(GroupType)groupType; - -/// 取消申请房间内排麦 -/// @param roomUid 房主的uid -/// @param groupType 类型 -- (void)cancelRoomPKArrangeMic:(NSString *)roomUid groupType:(GroupType)groupType; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/Presenter/XPArrangeMicPresenter.m b/YuMi/Modules/YMRoom/View/ArrangeMic/Presenter/XPArrangeMicPresenter.m deleted file mode 100644 index 424f4b4..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/Presenter/XPArrangeMicPresenter.m +++ /dev/null @@ -1,95 +0,0 @@ -// -// YMArrangeMicPresenter.m -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import "XPArrangeMicPresenter.h" -#import "Api+ArrangeMic.h" -#import "AccountInfoStorage.h" -#import "ArrangeMicModel.h" -#import "XPArrangeMicProtocol.h" - -@implementation XPArrangeMicPresenter - - -/// 获取房间排麦列表 -/// @param roomUid 房主的uid -/// @param page 当前的页数 -/// @param pageSize 一页的个数 -/// @param state 顶部刷新还是尾部刷新 -- (void)getRoomArrangeMicList:(NSString *)roomUid page:(int)page pageSize:(int)pageSize state:(int)state { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * pageStr = [NSString stringWithFormat:@"%d", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize]; - [Api getRoomArrangeMicList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ArrangeMicModel * model = [ArrangeMicModel modelWithDictionary:data.data]; - [[self getView] getRoomArrangeMicListSuccess:model state:state]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getRoomArrangeMicListFail:msg state:state]; - } showLoading:NO] roomUid:roomUid operUid:uid page:pageStr pageSize:pageSizeStr]; -} - -/// 申请排麦 -/// @param roomUid 房主的uid -/// @param groupType 类型 -- (void)applyRoomArrangeMic:(NSString *)roomUid groupType:(GroupType)groupType { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * groupTypeStr = [NSString stringWithFormat:@"%ld", groupType]; - [Api applyArrangeMic:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] applyArrangeMicSuccess]; - } showLoading:YES] roomUid:roomUid operUid:uid groupType:groupTypeStr]; -} - -/// 取消申请排麦 -/// @param roomUid 房主的uid -/// @param groupType 类型 -- (void)cancelRoomArrangeMic:(NSString *)roomUid groupType:(GroupType)groupType { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * groupTypeStr = [NSString stringWithFormat:@"%ld", groupType]; - [Api cancelArrangeMic:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] cancelArrangeMicSuccess]; - } showLoading:YES] roomUid:roomUid operUid:uid groupType:groupTypeStr]; -} - -/// 获取房间PK用户的列表 -/// @param roomUid 房主的uid -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param state 上啦 1还是下拉0 -- (void)getRoomPKMemberList:(NSString *)roomUid page:(int)page pageSize:(int)pageSize state:(int)state { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * pageStr = [NSString stringWithFormat:@"%d", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize]; - [Api getRoomPKUserList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - ArrangeMicModel * model = [ArrangeMicModel modelWithDictionary:data.data]; - [[self getView] getRoomPKMemberListSuccess:model state:state]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getRoomPKMemberListFail:msg state:state]; - } showLoading:NO] roomUid:roomUid operUid:uid page:pageStr pageSize:pageSizeStr]; -} - -/// 申请房间内PK排麦 -/// @param roomUid 房主的uid -/// @param groupType 类型 -- (void)applyRoomPKArrangeMic:(NSString *)roomUid groupType:(GroupType)groupType { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * groupTypeStr = [NSString stringWithFormat:@"%ld", groupType]; - [Api applyRoomPKArrangeMic:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] applyArrangeMicSuccess]; - } showLoading:YES] roomUid:roomUid operUid:uid groupType:groupTypeStr]; -} - -/// 取消申请房间内排麦 -/// @param roomUid 房主的uid -/// @param groupType 类型 -- (void)cancelRoomPKArrangeMic:(NSString *)roomUid groupType:(GroupType)groupType { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * groupTypeStr = [NSString stringWithFormat:@"%ld", groupType]; - [Api cancelRoomPKArrangeMic:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] cancelArrangeMicSuccess]; - } showLoading:YES] roomUid:roomUid operUid:uid groupType:groupTypeStr]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/Protocol/XPArrangeMicProtocol.h b/YuMi/Modules/YMRoom/View/ArrangeMic/Protocol/XPArrangeMicProtocol.h deleted file mode 100644 index c3a87c0..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/Protocol/XPArrangeMicProtocol.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMArrangeMicProtocol.h -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class ArrangeMicModel; -@protocol XPArrangeMicProtocol -///获取排麦列表 -- (void)getRoomArrangeMicListSuccess:(ArrangeMicModel *)listModel state:(int)state; -///获取排麦列表 -- (void)getRoomArrangeMicListFail:(NSString *)msg state:(int)state; -///申请排麦成功 -- (void)applyArrangeMicSuccess; -///取消排麦成功 -- (void)cancelArrangeMicSuccess; -///获取当前pk房间列表成功 -- (void)getRoomPKMemberListSuccess:(ArrangeMicModel *)listModel state:(int)state; -///获取当前房间PK列表失败 -- (void)getRoomPKMemberListFail:(NSString *)msg state:(int)state; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicEmptyTableViewCell.h b/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicEmptyTableViewCell.h deleted file mode 100644 index fe96a0b..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicEmptyTableViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMArrangeMicEmptyTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPArrangeMicEmptyTableViewCell : UITableViewCell -///空白的文案 -@property (nonatomic,copy) NSString *emptyTitle; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicEmptyTableViewCell.m deleted file mode 100644 index 23d8867..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicEmptyTableViewCell.m +++ /dev/null @@ -1,81 +0,0 @@ -// -// YMArrangeMicEmptyTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import "XPArrangeMicEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPArrangeMicEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPArrangeMicEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(50); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (void)setEmptyTitle:(NSString *)emptyTitle { - _emptyTitle = emptyTitle; - if (_emptyTitle.length > 0) { - self.titleLabel.text = _emptyTitle; - } -} - -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPArrangeMicEmptyTableViewCell0"); - _titleLabel.numberOfLines = 2; - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.h b/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.h deleted file mode 100644 index 723afd7..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMArrangeMicTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPArrangeMicTableViewCell, ArrangeMicUserModel; -@protocol XPArrangeMicTableViewCellDelegate - -- (void)xPArrangeMicTableViewCell:(XPArrangeMicTableViewCell *)view inviteUser:(ArrangeMicUserModel *)userInfo; - -@end -@interface XPArrangeMicTableViewCell : UITableViewCell -///是否是管理 -@property (nonatomic,assign) BOOL isManager; -///代理 -@property (nonatomic,weak) id delegate; -///用户信息 -@property (nonatomic,strong) ArrangeMicUserModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m b/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m deleted file mode 100644 index 945eb33..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m +++ /dev/null @@ -1,205 +0,0 @@ -// -// YMArrangeMicTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import "XPArrangeMicTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "UIImage+Utils.h" -///Model -#import "ArrangeMicModel.h" -@interface XPArrangeMicTableViewCell() -///排名 -@property (nonatomic, strong) UILabel * rankLabel; -///头像 -@property (nonatomic, strong) NetImageView * avaratImageView; -///名称 -@property (nonatomic, strong) UILabel * nameLabel; -///性别 -@property (nonatomic,strong) UIButton *sexImageView; -///排麦中 -@property (nonatomic, strong) UIButton * arrangeMicButton; -@end - -@implementation XPArrangeMicTableViewCell -#pragma mark - life cycle -- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{ - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initView]; - [self initConstrations]; - } - return self; -} - -#pragma mark - private method -- (void)initView{ - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.rankLabel]; - [self.contentView addSubview:self.avaratImageView]; - [self.contentView addSubview:self.nameLabel]; - [self.contentView addSubview:self.sexImageView]; - [self.contentView addSubview:self.arrangeMicButton]; -} - -- (void)initConstrations{ - [self.rankLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(15); - make.width.height.mas_equalTo(20); - }]; - - [self.avaratImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.width.mas_equalTo(46); - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.rankLabel.mas_trailing).offset(13); - }]; - - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avaratImageView.mas_trailing).offset(10); - make.centerY.mas_equalTo(self.contentView); -// make.width.mas_lessThanOrEqualTo(KScreenWidth - 20 - 30 - 75); - }]; - - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(28, 14)); - make.leading.mas_equalTo(self.nameLabel.mas_trailing).offset(2); - make.centerY.mas_equalTo(self.nameLabel); - }]; - - [self.arrangeMicButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(75); - make.height.mas_equalTo(25); - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_greaterThanOrEqualTo(self.sexImageView.mas_trailing).offset(2); - }]; -} - -#pragma mark - Event Response -- (void)arrangeMicButtonAction:(UIButton *)sender { - if (self.isManager && self.delegate && [self.delegate respondsToSelector:@selector(xPArrangeMicTableViewCell:inviteUser:)]) { - [self.delegate xPArrangeMicTableViewCell:self inviteUser:self.userInfo]; - } -} - -#pragma mark - setters and getters -- (void)setUserInfo:(ArrangeMicUserModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - NSString * nick = _userInfo.nick; - self.nameLabel.text= nick; - self.avaratImageView.imageUrl = _userInfo.avatar; - [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.rankLabel.text = [NSString stringWithFormat:@"%ld", _userInfo.number]; - if (self.isManager) { - if (_userInfo.arrangeMicType == ArrangeMicType_Dating) { - NSString * title = _userInfo.groupType == GroupType_Blue ? YMLocalizedString(@"XPArrangeMicTableViewCell10") : YMLocalizedString(@"XPArrangeMicTableViewCell1"); - UIColor * color = _userInfo.groupType == GroupType_Blue ? UIColorFromRGB(0x518EFF) : UIColorFromRGB(0xFF6B77); - [self.arrangeMicButton setTitle:title forState:UIControlStateNormal]; - [self.arrangeMicButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [self.arrangeMicButton setBackgroundColor:color]; - }if (_userInfo.arrangeMicType == ArrangeMicType_Room_PK) { - NSString * title = _userInfo.groupType == GroupType_Blue ? YMLocalizedString(@"XPArrangeMicTableViewCell11") : YMLocalizedString(@"XPArrangeMicTableViewCell3"); - UIColor * color = _userInfo.groupType == GroupType_Blue ? UIColorFromRGB(0x518EFF) : UIColorFromRGB(0xFF6B77); - [self.arrangeMicButton setTitle:title forState:UIControlStateNormal]; - [self.arrangeMicButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [self.arrangeMicButton setBackgroundColor:color]; - } else { - [self.arrangeMicButton setTitle:YMLocalizedString(@"XPArrangeMicTableViewCell4") forState:UIControlStateNormal]; - [self.arrangeMicButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [self.arrangeMicButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - }else { - if (_userInfo.arrangeMicType == ArrangeMicType_Dating) { - NSString * title = _userInfo.groupType == GroupType_Blue ? YMLocalizedString(@"XPArrangeMicTableViewCell12") : YMLocalizedString(@"XPArrangeMicTableViewCell6"); - UIColor * color = _userInfo.groupType == GroupType_Blue ? UIColorFromRGB(0x518EFF) : UIColorFromRGB(0xFF6B77); - [self.arrangeMicButton setTitle:title forState:UIControlStateNormal]; - [self.arrangeMicButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [self.arrangeMicButton setBackgroundColor:color]; - } else if(_userInfo.arrangeMicType == ArrangeMicType_Room_PK) { - NSString * title = _userInfo.groupType == GroupType_Blue ?YMLocalizedString(@"XPArrangeMicTableViewCell13") : YMLocalizedString(@"XPArrangeMicTableViewCell8"); - UIColor * color = _userInfo.groupType == GroupType_Blue ? UIColorFromRGB(0x518EFF) : UIColorFromRGB(0xFF6B77); - [self.arrangeMicButton setTitle:title forState:UIControlStateNormal]; - [self.arrangeMicButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [self.arrangeMicButton setBackgroundColor:color]; - } else { - [self.arrangeMicButton setTitle:YMLocalizedString(@"XPArrangeMicTableViewCell9") forState:UIControlStateNormal]; - [self.arrangeMicButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateNormal]; - [self.arrangeMicButton setBackgroundImage:[UIImage imageWithColor:[DJDKMIMOMColor disableButtonColor]] forState:UIControlStateNormal]; - } - } - } -} - -- (UILabel *)rankLabel{ - if (!_rankLabel) { - _rankLabel = [[UILabel alloc] init]; - _rankLabel.textColor = [UIColor whiteColor]; - _rankLabel.font = [UIFont systemFontOfSize:13]; - _rankLabel.backgroundColor = [DJDKMIMOMColor appMainColor]; - _rankLabel.textAlignment = NSTextAlignmentCenter; - _rankLabel.layer.masksToBounds = YES; - _rankLabel.layer.cornerRadius = 10; - } - return _rankLabel; -} - - -- (UILabel *)nameLabel{ - if (!_nameLabel) { - _nameLabel = [[UILabel alloc] init]; - _nameLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _nameLabel.font = [UIFont systemFontOfSize:15]; - _nameLabel.textAlignment = NSTextAlignmentLeft; - } - return _nameLabel; -} - -- (UIButton *)arrangeMicButton{ - if (!_arrangeMicButton) { - _arrangeMicButton = [UIButton buttonWithType:UIButtonTypeCustom];; - _arrangeMicButton.titleLabel.font = [UIFont systemFontOfSize:13]; - _arrangeMicButton.layer.masksToBounds = YES; - _arrangeMicButton.layer.cornerRadius = 25/ 2; - [_arrangeMicButton addTarget:self action:@selector(arrangeMicButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _arrangeMicButton; -} - -- (NetImageView *)avaratImageView{ - if (!_avaratImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - _avaratImageView = [[NetImageView alloc] initWithConfig:config]; - _avaratImageView.layer.masksToBounds = YES; - _avaratImageView.layer.cornerRadius = 23; - } - return _avaratImageView; -} - -- (UIButton *)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; - } - return _sexImageView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.h b/YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.h deleted file mode 100644 index 9eea1ef..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMArrangeMicViewController.h -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import "MvpViewController.h" -#import "XPArrangeMicInfoModel.h" -#import "ArrangeMicModel.h" -NS_ASSUME_NONNULL_BEGIN -@interface XPArrangeMicViewController : MvpViewController -- (instancetype)initWithInfo:(XPArrangeMicInfoModel *)info; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.m b/YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.m deleted file mode 100644 index 80809ac..0000000 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.m +++ /dev/null @@ -1,873 +0,0 @@ -// -// YMArrangeMicViewController.m -// YUMI -// -// Created by YUMI on 2021/12/20. -// - -#import "XPArrangeMicViewController.h" -///Third -#import -#import -#import -///Tool -#import "TTPopup.h" -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "AccountInfoStorage.h" -#import "YUMIHtmlUrl.h" -#import "UIImage+Utils.h" -#import "NSArray+Safe.h" -#import "NSMutableDictionary+Saft.h" -///Model -#import "ArrangeMicModel.h" -#import "AttachmentModel.h" -#import "UserInfoModel.h" -///View -#import "XPArrangeMicEmptyTableViewCell.h" -#import "XPArrangeMicTableViewCell.h" -#import "XPShareView.h" -///P -#import "XPArrangeMicPresenter.h" -#import "XPArrangeMicProtocol.h" - -@interface XPArrangeMicViewController () -///点击消失 -@property (nonatomic,strong) UIView * topView; -///内容区域 -@property (nonatomic,strong) UIView * contentView; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///分割线 -@property (nonatomic,strong) UIView * lineView; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///申请的 -@property (nonatomic,strong) UIStackView *applyStackView; -///立即邀请或者点击报名 -@property (nonatomic,strong) UIButton *applyButton; -///男神 -@property (nonatomic,strong) UIButton *maleButton; -///女神 -@property (nonatomic,strong) UIButton *femaleButton; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前页数 -@property (nonatomic,assign) int page; -///是否有更多数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -///需要的用户信息 -@property (nonatomic,strong) XPArrangeMicInfoModel *userInfo; -///排麦的信息 -@property (nonatomic,strong) ArrangeMicModel *arrangeMicInfo; -///需要抱上麦的 -@property (nonatomic, strong) NSMutableDictionary *micQueue; -@end - -@implementation XPArrangeMicViewController - -- (void)dealloc { - [[NIMSDK sharedSDK].chatManager removeDelegate:self]; -} - -- (XPArrangeMicPresenter *)createPresenter { - return [[XPArrangeMicPresenter alloc] init]; -} - -- (instancetype)initWithInfo:(XPArrangeMicInfoModel *)info { - if (self = [super init]) { - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - self.userInfo = info; - self.micQueue = info.micQueue; - } - return self; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [[NIMSDK sharedSDK].chatManager addDelegate:self]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; - [self configDefaultData]; - [self headerRefresh]; - -} -#pragma mark - 下拉刷新 -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - self.page = 1; - if (self.userInfo.type == ArrangeMicType_Room_PK) { - [self.presenter getRoomPKMemberList:self.userInfo.roomUid page:self.page pageSize:20 state:0]; - } else { - [self.presenter getRoomArrangeMicList:self.userInfo.roomUid page:self.page pageSize:20 state:0]; - } - -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [self showErrorToast:YMLocalizedString(@"XPArrangeMicViewController0")]; - return; - } - self.page++; - if (self.userInfo.type == ArrangeMicType_Room_PK) { - [self.presenter getRoomPKMemberList:self.userInfo.roomUid page:self.page pageSize:20 state:1]; - } else { - [self.presenter getRoomArrangeMicList:self.userInfo.roomUid page:self.page pageSize:20 state:1];; - } -} - - -#pragma mark - Private Method -- (void)configDefaultData { - if (self.userInfo.isManager) { - [self.applyButton setTitle:YMLocalizedString(@"XPArrangeMicViewController1") forState:UIControlStateNormal]; - } else { - [self.applyButton setTitle:YMLocalizedString(@"XPArrangeMicViewController2") forState:UIControlStateNormal]; - } - - if (self.userInfo.type == ArrangeMicType_Dating) { - self.femaleButton.hidden = self.userInfo.isManager; - self.maleButton.hidden = self.userInfo.isManager; - self.applyButton.hidden = !self.userInfo.isManager; - } else if(self.userInfo.type == ArrangeMicType_Room_PK) { - self.femaleButton.hidden = self.userInfo.isManager; - self.maleButton.hidden = self.userInfo.isManager; - self.applyButton.hidden = !self.userInfo.isManager; - [self.maleButton setTitle:YMLocalizedString(@"XPArrangeMicViewController3") forState:UIControlStateNormal]; - [self.femaleButton setTitle:YMLocalizedString(@"XPArrangeMicViewController4") forState:UIControlStateNormal]; - } else { - self.femaleButton.hidden = YES; - self.maleButton.hidden = YES; - self.applyButton.hidden = NO; - } -} - -- (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.topView]; - [self.view addSubview:self.contentView]; - - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.lineView]; - [self.contentView addSubview:self.tableView]; - [self.contentView addSubview:self.applyStackView]; - - [self.applyStackView addArrangedSubview:self.maleButton]; - [self.applyStackView addArrangedSubview:self.applyButton]; - [self.applyStackView addArrangedSubview:self.femaleButton]; -} - -- (void)initSubViewConstraints { - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.contentView.mas_top); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.height.mas_equalTo(450); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.contentView); - make.height.mas_equalTo(44); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.titleLabel.mas_bottom); - make.height.mas_equalTo(1); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.lineView.mas_bottom); - }]; - - [self.applyStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(45); - make.height.mas_equalTo(38); - make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 20); - }]; - -} - -- (NSMutableAttributedString *)createArrangeMicNavTitleWith:(NSString *)count{ - if (self.datasource.count == 0) { - if (self.userInfo.isManager) { - NSMutableAttributedString *attributString = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPArrangeMicViewController5") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}]; - return attributString; - }else{ - NSMutableAttributedString *attributString = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPArrangeMicViewController6") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}]; - return attributString; - } - }else{ - if (self.userInfo.isManager) { - NSString * str = [NSString stringWithFormat:YMLocalizedString(@"XPArrangeMicViewController7"), count]; - - NSMutableAttributedString *attributString = [[NSMutableAttributedString alloc] initWithString:str attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}]; - [attributString addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor appEmphasizeColor] range:[str rangeOfString:count]]; - return attributString; - }else{ - if ([count intValue] > 0) { - count = count.length > 0 ? count : @"0"; - NSString * str = [NSString stringWithFormat:YMLocalizedString(@"XPArrangeMicViewController8"), [count integerValue]]; - NSMutableAttributedString *attributString = [[NSMutableAttributedString alloc] initWithString:str attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}]; - [attributString addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor appEmphasizeColor] range:[str rangeOfString:count]]; - return attributString; - }else{ - NSMutableAttributedString *attributString = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPArrangeMicViewController6") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}]; - return attributString; - } - - } - } -} - -#pragma mark - 上麦操作 -//查看锁定的麦序（排麦模式中使用） -- (NSString *)findLockPosition { - if (self.micQueue != nil && self.micQueue.allKeys.count > 0) { - NSArray *keys = [self.micQueue allKeys]; - NSArray *result = [keys sortedArrayUsingComparator:^NSComparisonResult(id _Nonnull obj1, id _Nonnull obj2) { - return [obj1 compare:obj2]; //升序 - }]; - if (result.count > 0) { - for (NSString *key in result) { - MicroQueueModel *microQueue = [self.micQueue objectForKey:key]; - MicroStateModel *micstatus= microQueue.microState; - if (self.userInfo.roomType == 3) { // == RoomType_Game - if (![key isEqualToString:@"-1"] && !microQueue.userInfo && micstatus.posState == MicroPosStateType_Lock) { - return key; - break; - } - } else if (self.userInfo.roomType == 19) { - if (![key isEqualToString:@"6"] && !microQueue.userInfo && micstatus.posState == MicroPosStateType_Lock) { - return key; - break; - } - } else { - if (!microQueue.userInfo && micstatus.posState == MicroPosStateType_Lock) { - return key; - break; - } - } - } - } - } - return nil; -} - -//查看锁定的麦序（排麦模式中使用） -- (NSString *)findLockBlindPosition:(GroupType)groupType { - if (self.micQueue != nil && self.micQueue.allKeys.count > 0) { - NSArray *keys = [self.micQueue allKeys]; - NSArray *result = [keys sortedArrayUsingComparator:^NSComparisonResult(id _Nonnull obj1, id _Nonnull obj2) { - return [obj1 compare:obj2]; //升序 - }]; - if (result.count > 0) { - if (groupType == GroupType_Red) { - for (NSString *key in result) { - MicroQueueModel *microQueue = [self.micQueue objectForKey:key]; - UserInfoModel *userInfo = microQueue.userInfo; - MicroStateModel * micstatus= microQueue.microState; - if (![key isEqualToString:@"-1"] && - !userInfo && - micstatus.posState == MicroPosStateType_Lock && - ([key isEqualToString:@"2"] || - [key isEqualToString:@"3"] || - [key isEqualToString:@"6"] || - [key isEqualToString:@"7"])) { - return key; - break; - } - } - }else { - for (NSString *key in result) { - MicroQueueModel *microQueue = [self.micQueue objectForKey:key]; - UserInfoModel *userInfo = microQueue.userInfo; - MicroStateModel * micstatus= microQueue.microState; - if (![key isEqualToString:@"-1"] && - !userInfo && - micstatus.posState == MicroPosStateType_Lock && - ([key isEqualToString:@"0"] || - [key isEqualToString:@"1"] || - [key isEqualToString:@"4"] || - [key isEqualToString:@"5"])) { - return key; - break; - } - } - } - } - } - return nil; -} - -//判断是否在麦上 -- (BOOL)isOnMicro:(NSString *)uid{ - NSArray *chatRoomMicSequences = [self.micQueue allValues] ; - if (chatRoomMicSequences != nil && chatRoomMicSequences.count > 0) { - for (int i = 0; i < chatRoomMicSequences.count; i ++) { - MicroQueueModel *microQueue = chatRoomMicSequences[i]; - if (microQueue.userInfo.uid == uid.integerValue) { - return YES; - } - } - } - return NO; -} - -#pragma mark - NIMChatManagerDelegate -- (void)onRecvMessages:(NSArray *)messages { - for (NIMMessage * message in messages) { - // 非房间内消息不处理 - if (message.session.sessionType != NIMSessionTypeChatroom) { - continue; - } - // 非本房间不处理 - if (![message.session.sessionId isEqualToString:self.userInfo.roomId]) { - continue; - } - if (message.messageType == NIMMessageTypeCustom) { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel * attachment = obj.attachment; - if (attachment.first == CustomMessageType_Arrange_Mic) { - switch (attachment.second) { - case Custom_Message_Sub_Room_PK_Empty: - case Custom_Message_Sub_Room_PK_Non_Empty: - case Custom_Message_Sub_Arrange_Mic_Non_Empty: - case Custom_Message_Sub_Arrange_Mic_Empty: - [self headerRefresh]; - break; - case Custom_Message_Sub_Room_PK_Mode_Close: - case Custom_Message_Sub_Arrange_Mic_Mode_Close: - [self dismissViewControllerAnimated:YES completion:nil]; - break; - - default: - break; - } - } else if(attachment.first == CustomMessageType_Queue && attachment.second == Custom_Message_Sub_Queue_Invite) { - ArrangeMicUserModel * userInfo = [ArrangeMicUserModel modelWithDictionary:attachment.data]; - if (userInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - [self headerRefresh]; - } - } else if(attachment.first == CustomMessageType_Room_PK && attachment.second == Custom_Message_Sub_Room_PK_Manager_Up_Mic) { - ArrangeMicUserModel * userInfo = [ArrangeMicUserModel modelWithDictionary:[attachment.data objectForKey:[AccountInfoStorage instance].getUid]]; - if (userInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - [self headerRefresh]; - } - } - } - } else if(message.messageType == NIMMessageTypeNotification) { - [self handleNIMNotificationMessage:message]; - } - } -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - - if (![notiMsg.content isKindOfClass:[NIMChatroomNotificationContent class]]) { - return; - } - - switch (content.eventType) { - case NIMChatroomEventTypeInfoUpdated: // 麦序状态更新 - { - NSDictionary *data = [content.notifyExt toJSONObject]; - int type = [data[@"type"] intValue]; - NSArray* microStates; - switch (type) { - case 2: - microStates = @[[MicroStateModel modelWithJSON:data[@"micInfo"]]]; - break; - case 3: - microStates = [MicroStateModel modelsWithArray:data[@"micInfo"]]; - break; - } - if (microStates && microStates.count > 0) { - for (MicroStateModel *microState in microStates) { - MicroQueueModel *micSequence = [self.micQueue objectForKey:[NSString stringWithFormat:@"%d", microState.position]]; - micSequence.microState = microState; - } - } - } - break; - - case NIMChatroomEventTypeQueueChange: // 麦序上下麦 - { - NSDictionary* data = (NSDictionary *)content.ext; - NSString* position = [data objectForKey:NIMChatroomEventInfoQueueChangeItemKey]; - UserInfoModel* userInfo = [UserInfoModel modelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]]; - NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue]; - - // 先清除该用户旧的麦位 - for (MicroQueueModel *sequence in self.micQueue.allValues) { - if (userInfo.uid == sequence.userInfo.uid) { - sequence.userInfo = nil; - } - } - - if (changeType == 1) { // 上麦 - MicroQueueModel *sequence = [self.micQueue objectForKey:position]; - sequence.userInfo = userInfo; - } - } - break; - case NIMChatroomEventTypeExit: - case NIMChatroomEventTypeKicked: - { - for (NIMChatroomNotificationMember *member in content.targets) { - for (MicroQueueModel *sequence in self.micQueue.allValues) { - if (member.userId.integerValue == sequence.userInfo.uid) { - sequence.userInfo = nil; - } - } - } - } - break; - default: - break; - } -} - -#pragma mark - XPArrangeMicProtocol -- (void)getRoomArrangeMicListSuccess:(ArrangeMicModel *)listModel state:(int)state{ - self.arrangeMicInfo = listModel; - if (state == 0) { - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - if (listModel.queue.count > 0) { - self.hasNoMoreData = NO; - [self.datasource addObjectsFromArray:listModel.queue]; - } else { - self.hasNoMoreData = YES; - [self.tableView.mj_footer endRefreshingWithNoMoreData]; - } - [self.tableView reloadData]; - - if (self.userInfo.isManager) { - self.applyButton.hidden = self.datasource.count > 0; - } else { - if (listModel.myPos.intValue > 0) { - self.applyButton.hidden = NO; - self.maleButton.hidden = YES; - self.femaleButton.hidden = YES; - [self.applyButton setTitle:YMLocalizedString(@"XPArrangeMicViewController10") forState:UIControlStateNormal]; - } else { - if (self.userInfo.type == ArrangeMicType_Dating) { - self.femaleButton.hidden = NO; - self.maleButton.hidden = NO; - self.applyButton.hidden = YES; - } else { - self.femaleButton.hidden = YES; - self.maleButton.hidden = YES; - self.applyButton.hidden = NO; - } - } - } - self.titleLabel.attributedText = [self createArrangeMicNavTitleWith:listModel.count]; - self.titleLabel.textAlignment = NSTextAlignmentCenter; -} - -- (void)getRoomArrangeMicListFail:(NSString *)msg state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_header endRefreshing]; - } -} - -- (void)applyArrangeMicSuccess { - [self headerRefresh]; -} - -- (void)cancelArrangeMicSuccess { - [self headerRefresh]; -} - -- (void)getRoomPKMemberListFail:(NSString *)msg state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_header endRefreshing]; - } -} - -- (void)getRoomPKMemberListSuccess:(ArrangeMicModel *)listModel state:(int)state { - - self.arrangeMicInfo = listModel; - if (state == 0) { - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - if (listModel.queue.count > 0) { - self.hasNoMoreData = NO; - [self.datasource addObjectsFromArray:listModel.queue]; - } else { - self.hasNoMoreData = YES; - [self.tableView.mj_footer endRefreshingWithNoMoreData]; - } - [self.tableView reloadData]; - - if (self.userInfo.isManager) { - self.applyButton.hidden = self.datasource.count > 0; - } else { - if (listModel.myPos.intValue > 0) { - self.applyButton.hidden = NO; - self.maleButton.hidden = YES; - self.femaleButton.hidden = YES; - [self.applyButton setTitle:YMLocalizedString(@"XPArrangeMicViewController11") forState:UIControlStateNormal]; - } else { - self.femaleButton.hidden = NO; - self.maleButton.hidden = NO; - self.applyButton.hidden = YES; - } - } - self.titleLabel.attributedText = [self createArrangeMicNavTitleWith:listModel.count]; - self.titleLabel.textAlignment = NSTextAlignmentCenter; -} - -#pragma mark - XCShareViewDelegate -- (void)shareView:(XPShareView *)shareView shareFail:(NSString *)message { - [TTPopup dismiss]; - [self showErrorToast:message]; -} - -- (void)shareView:(XPShareView *)shareView didSuccess:(XPShareInfoModel *)shareInfo{ - [TTPopup dismiss]; -} - -- (void)shareViewDidClickCancel:(XPShareView *)shareView { - [TTPopup dismiss]; -} - -#pragma mark - XPArrangeMicTableViewCellDelegate -- (void)xPArrangeMicTableViewCell:(XPArrangeMicTableViewCell *)view inviteUser:(ArrangeMicUserModel *)userInfo { - NSString *position; - if (self.userInfo.type == ArrangeMicType_Dating) { - position = [self findLockBlindPosition:userInfo.groupType]; - }else { - position = [self findLockPosition]; - } - NSString * uid = userInfo.uid; - if (position.length > 0) { - if (self.userInfo.type == ArrangeMicType_Room_PK) { - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - [dic safeSetObject:position forKey:@"position"]; - [dic safeSetObject:uid forKey:@"uid"]; - [dic safeSetObject:@(userInfo.groupType) forKey:@"groupType"]; - [dic safeSetObject:userInfo.nick forKey:@"nick"]; - AttachmentModel * attachment = [[AttachmentModel alloc] init]; - attachment.first = CustomMessageType_Room_PK; - attachment.second = Custom_Message_Sub_Room_PK_Manager_Up_Mic; - attachment.data = @{uid:dic}; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:self.userInfo.roomId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - } else { - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - [dic safeSetObject:@(position.integerValue) forKey:@"micPosition"]; - [dic safeSetObject:@(uid.integerValue) forKey:@"uid"]; - AttachmentModel *attachement = [[AttachmentModel alloc]init]; - attachement.first = CustomMessageType_Queue; - attachement.second = Custom_Message_Sub_Queue_Invite; - attachement.data = dic; - - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachement; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:self.userInfo.roomId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - [self dismissViewControllerAnimated:YES completion:nil]; - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self headerRefresh]; - }); - } else { - [self showErrorToast:YMLocalizedString(@"XPArrangeMicViewController12")]; - } -} -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPArrangeMicTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPArrangeMicTableViewCell class])]; - if (cell == nil) { - cell = [[XPArrangeMicTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPArrangeMicTableViewCell class])]; - } - ArrangeMicUserModel * userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - userInfo.arrangeMicType = self.userInfo.type; - cell.isManager = self.userInfo.isManager; - userInfo.number = indexPath.row + 1; - cell.userInfo = userInfo; - cell.delegate = self; - return cell; - } - - XPArrangeMicEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPArrangeMicEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPArrangeMicEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPArrangeMicEmptyTableViewCell class])]; - } - cell.emptyTitle = self.userInfo.isManager ? YMLocalizedString(@"XPArrangeMicViewController26") : YMLocalizedString(@"XPArrangeMicViewController27"); - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - return 65; - } - return 400; -} - -#pragma mark - Event Response -- (void)applyButtonAction:(UIButton *)sender { -#if DEBUG - self.userInfo.isManager = NO; -#endif - if (self.userInfo.isManager) { - XPShareItem *cycle = [XPShareItem itemWitTag:XPShareItemTagFaceBook title:@"FaceBook" imageName:@"share_fb" disableImageName:@"share_fb"]; - XPShareItem *wechat = [XPShareItem itemWitTag:XPShareItemTagLine title:@"Line" imageName:@"share_line" disableImageName:@"share_line"]; - XPShareItem *qq = [XPShareItem itemWitTag:XPShareItemTagCopyLink title:YMLocalizedString(@"RoomHeaderView3") imageName:@"share_copy_link" disableImageName:@"share_copy_link"]; - NSArray * items = @[wechat,cycle, qq]; - XPShareInfoModel * shareInfo = [[XPShareInfoModel alloc] init]; - shareInfo.shareTitle = self.userInfo.roomTitle; - shareInfo.shareContent = self.userInfo.nick; - shareInfo.shareImageUrl = self.userInfo.roomAvatar; - shareInfo.type = ShareType_Room; - shareInfo.roomUid = self.userInfo.roomUid.integerValue; - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * urlString = [NSString stringWithFormat:@"%@/%@?shareUid=%@&uid=%@&room_name=%@&room_id=%@&room_avatar=%@&share_name=%@",[HttpRequestHelper getHostUrl],URLWithType(kShareRoomURL),uid,self.userInfo.roomUid,self.userInfo.nick,self.userInfo.roomId,self.userInfo.roomAvatar,self.userInfo.nick]; - shareInfo.shareUrl = urlString; - CGFloat margin = 15; - CGSize itemSize = CGSizeMake((KScreenWidth-2*margin)/4, 65); - XPShareView *shareView = [[XPShareView alloc] initWithItems:items itemSize:itemSize shareInfo:shareInfo]; - shareView.delegate = self; - [TTPopup popupView:shareView style:TTPopupStyleActionSheet]; - } else { - if (self.arrangeMicInfo.myPos.integerValue > 0) { - [TTPopup alertWithMessage:YMLocalizedString(@"XPArrangeMicViewController19") confirmHandler:^{ - if (self.userInfo.type == ArrangeMicType_Dating) { - __block GroupType grouptype = GroupType_default; - [self.arrangeMicInfo.queue enumerateObjectsUsingBlock:^(ArrangeMicUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - grouptype = obj.groupType; - *stop = YES; - } - }]; - [self.presenter cancelRoomArrangeMic:self.userInfo.roomUid groupType:grouptype]; - } else if(self.userInfo.type == ArrangeMicType_Room_PK) { - __block GroupType grouptype = GroupType_default; - [self.arrangeMicInfo.queue enumerateObjectsUsingBlock:^(ArrangeMicUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - grouptype = obj.groupType; - *stop = YES; - } - }]; - [self.presenter cancelRoomPKArrangeMic:self.userInfo.roomUid groupType:grouptype]; - } else { - [self.presenter cancelRoomArrangeMic:self.userInfo.roomUid groupType:0]; - } - } cancelHandler:^{ - }]; - } else { - if ([self isOnMicro:[AccountInfoStorage instance].getUid]) { - [self showErrorToast:YMLocalizedString(@"XPArrangeMicViewController20")]; - } else { - if (self.userInfo.type== ArrangeMicType_Room_PK) { - [self.presenter applyRoomPKArrangeMic:self.userInfo.roomUid groupType:0]; - } else { - [self.presenter applyRoomArrangeMic:self.userInfo.roomUid groupType:0]; - } - } - } - } -} - -- (void)disMissArrangeMicRecognizer { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)maleButtonAction:(UIButton *)sender { - if ([self isOnMicro:[AccountInfoStorage instance].getUid]) { - [self showErrorToast:YMLocalizedString(@"XPArrangeMicViewController21")]; - } else { - if (self.userInfo.type == ArrangeMicType_Room_PK) { - [self.presenter applyRoomPKArrangeMic:self.userInfo.roomUid groupType:GroupType_Blue]; - } else { - [self.presenter applyRoomArrangeMic:self.userInfo.roomUid groupType:GroupType_Blue]; - } - - } -} - -- (void)femaleButtonAction:(UIButton *)sender { - if ([self isOnMicro:[AccountInfoStorage instance].getUid]) { - [self showErrorToast:YMLocalizedString(@"XPArrangeMicViewController22")]; - } else { - if (self.userInfo.type == ArrangeMicType_Room_PK) { - [self.presenter applyRoomPKArrangeMic:self.userInfo.roomUid groupType:GroupType_Red]; - } else{ - [self.presenter applyRoomArrangeMic:self.userInfo.roomUid groupType:GroupType_Red]; - } - } -} - -#pragma mark - Getters And Setters -- (void)setType:(ArrangeMicType)type { - -} - -- (UIView *)topView { - if (!_topView) { - _topView = [[UIView alloc] init]; - _topView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(disMissArrangeMicRecognizer)]; - [_topView addGestureRecognizer:tap]; - } - return _topView; -} -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = [UIColor whiteColor]; - CAShapeLayer * layer = [CAShapeLayer layer]; - UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, 450) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)]; - layer.path = path.CGPath; - _contentView.layer.mask = layer; - } - return _contentView; -} - -- (UIButton *)maleButton{ - if (!_maleButton) { - _maleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_maleButton setBackgroundColor:UIColorFromRGB(0x518EFF)]; - [_maleButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_maleButton setTitle:YMLocalizedString(@"XPArrangeMicViewController23") forState:UIControlStateNormal]; - _maleButton.titleLabel.font = [UIFont systemFontOfSize:16]; - _maleButton.layer.masksToBounds = YES; - _maleButton.layer.cornerRadius = 38 / 2; - [_maleButton addTarget:self action:@selector(maleButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _maleButton; -} - -- (UIButton *)femaleButton{ - if (!_femaleButton) { - _femaleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_femaleButton setBackgroundColor:UIColorFromRGB(0xFF6B77)]; - [_femaleButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_femaleButton setTitle:YMLocalizedString(@"XPArrangeMicViewController24") forState:UIControlStateNormal]; - _femaleButton.titleLabel.font = [UIFont systemFontOfSize:16]; - _femaleButton.layer.masksToBounds = YES; - _femaleButton.layer.cornerRadius = 38 / 2; - [_femaleButton addTarget:self action:@selector(femaleButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _femaleButton; -} - -- (UIButton *)applyButton{ - if (!_applyButton) { - _applyButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_applyButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_applyButton setTitle:YMLocalizedString(@"XPArrangeMicViewController25") forState:UIControlStateNormal]; - _applyButton.titleLabel.font = [UIFont systemFontOfSize:16]; - _applyButton.layer.masksToBounds = YES; - _applyButton.layer.cornerRadius = 38 / 2; - [_applyButton addTarget:self action:@selector(applyButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _applyButton; -} - -- (UIStackView *)applyStackView { - if (!_applyStackView) { - _applyStackView = [[UIStackView alloc] init]; - _applyStackView.axis = UILayoutConstraintAxisHorizontal; - _applyStackView.distribution = UIStackViewDistributionFillEqually; - _applyStackView.alignment = UIStackViewAlignmentFill; - _applyStackView.spacing = 20; - } - return _applyStackView; -} - -- (UILabel *)titleLabel{ - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - } - return _titleLabel; -} - -- (UIView *)lineView{ - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.rowHeight = 65; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPArrangeMicTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPArrangeMicTableViewCell class])]; - [_tableView registerClass:[XPArrangeMicEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPArrangeMicEmptyTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataClass.h b/YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataClass.h deleted file mode 100644 index c34df06..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataClass.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// Music+CoreDataClass.h -// -// -// Created by YUMI on 2022/5/9. -// -// - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface Music : NSManagedObject - -@end - -NS_ASSUME_NONNULL_END - -#import "Music+CoreDataProperties.h" diff --git a/YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataClass.m b/YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataClass.m deleted file mode 100644 index c4e2b16..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataClass.m +++ /dev/null @@ -1,13 +0,0 @@ -// -// Music+CoreDataClass.m -// -// -// Created by YUMI on 2022/5/9. -// -// - -#import "Music+CoreDataClass.h" - -@implementation Music - -@end diff --git a/YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataProperties.h b/YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataProperties.h deleted file mode 100644 index 65f0fe9..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataProperties.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// Music+CoreDataProperties.h -// -// -// Created by YUMI on 2022/5/9. -// -// - -#import "Music+CoreDataClass.h" - - -NS_ASSUME_NONNULL_BEGIN - -@interface Music (CoreDataProperties) -+(NSString *)getMusicName; -+ (NSFetchRequest *)fetchRequest NS_SWIFT_NAME(fetchRequest()); - -@property (nullable, nonatomic, copy) NSString *author; -@property (nullable, nonatomic, copy) NSString *filePath; -@property (nullable, nonatomic, copy) NSString *musicArtists; -@property (nullable, nonatomic, copy) NSString *musicId; -@property (nullable, nonatomic, copy) NSString *musicName; -@property (nullable, nonatomic, retain) NSData *songAlbum; -@property (nullable, nonatomic, copy) NSString *songName; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataProperties.m b/YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataProperties.m deleted file mode 100644 index 3e7bb64..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/Model/Music+CoreDataProperties.m +++ /dev/null @@ -1,34 +0,0 @@ -// -// Music+CoreDataProperties.m -// -// -// Created by YUMI on 2022/5/9. -// -// - -#import "Music+CoreDataProperties.h" - -@implementation Music (CoreDataProperties) -///因为代码混沌时，music关键字，混沌后不改会闪退 -+(NSString *)getMusicName{ - NSString *musicName = [NSString stringWithFormat:@"M"]; - musicName = [NSString stringWithFormat:@"%@u",musicName]; - musicName = [NSString stringWithFormat:@"%@s",musicName]; - musicName = [NSString stringWithFormat:@"%@i",musicName]; - musicName = [NSString stringWithFormat:@"%@c",musicName]; - - return musicName; -} -+ (NSFetchRequest *)fetchRequest { - return [NSFetchRequest fetchRequestWithEntityName:[Music getMusicName]]; -} - -@dynamic author; -@dynamic filePath; -@dynamic musicArtists; -@dynamic musicId; -@dynamic musicName; -@dynamic songAlbum; -@dynamic songName; - -@end diff --git a/YuMi/Modules/YMRoom/View/BackMusic/Presenter/XPCoreDataManager.h b/YuMi/Modules/YMRoom/View/BackMusic/Presenter/XPCoreDataManager.h deleted file mode 100644 index 099438f..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/Presenter/XPCoreDataManager.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// YMCoreDataManager.h -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import -#import -NS_ASSUME_NONNULL_BEGIN - -@interface XPCoreDataManager : NSObject -+(XPCoreDataManager *)shareInstance; -/** - 管理上下文 - */ -@property(nonatomic,strong)NSManagedObjectContext *managedObjectContext; -/** - 模型对象 - */ -@property(nonatomic,strong)NSManagedObjectModel *managedObjectModel; -/** - 存储调度器 - */ -@property(nonatomic,strong)NSPersistentStoreCoordinator *persistentStoreCoordinator; - -/** - 保存操作 - */ --(void)save; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BackMusic/Presenter/XPCoreDataManager.m b/YuMi/Modules/YMRoom/View/BackMusic/Presenter/XPCoreDataManager.m deleted file mode 100644 index 098a01e..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/Presenter/XPCoreDataManager.m +++ /dev/null @@ -1,78 +0,0 @@ -// -// YMCoreDataManager.m -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import "XPCoreDataManager.h" - -@implementation XPCoreDataManager -static XPCoreDataManager *manager = nil; -+(XPCoreDataManager *)shareInstance{ - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - manager = [[XPCoreDataManager alloc]init]; - }); - return manager; -} - -//获取数据库的路径 --(NSURL *)getDocumnetUrlpath{ - return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject]; -} - --(NSManagedObjectContext *)managedObjectContext{ - if (!_managedObjectContext) { - /** - 参数:CoreData环境线程 - NSMainQueueConcurrencyType:主线程 储存无延迟 - NSPrivateQueueConcurrencyType:分支线程 存储有延迟 - */ - _managedObjectContext = [[NSManagedObjectContext alloc]initWithConcurrencyType:NSMainQueueConcurrencyType]; - //设置存储调度器 - _managedObjectContext.persistentStoreCoordinator = self.persistentStoreCoordinator; - } - return _managedObjectContext; -} - --(NSManagedObjectModel *)managedObjectModel{ - if (!_managedObjectModel) { - /** - 初始化NSManagedObjectModel - 参数是:模型文件的路径 - 后缀不能是xcdatamodeld 只能是momd - _managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:[[NSBundle mainBundle] URLForResource:@"Teacher" withExtension:@"momd"]]; - - 参数是模型文件的bundle数组 如果是nil 自动获取所有bundle的模型文件 - */ - _managedObjectModel = [NSManagedObjectModel mergedModelFromBundles:nil]; - } - return _managedObjectModel; -} - --(NSPersistentStoreCoordinator *)persistentStoreCoordinator{ - if (!_persistentStoreCoordinator) { - /** - 参数：要存储的模型 - */ - _persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc]initWithManagedObjectModel:self.managedObjectModel]; - - /** - 参数： - * type:一般使用数据库存储方式NSSQLiteStoreType - * configuration:配置信息 一般无需配置 - * URL:要保存的文件路径 - * options:参数信息 一般无需设置 - */ - NSURL *url = [[self getDocumnetUrlpath] URLByAppendingPathComponent:@"sqlit.db" isDirectory:true]; - [_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:url options:nil error:nil]; - } - return _persistentStoreCoordinator; -} - --(void)save{ - [self.managedObjectContext save:nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/BackMusic/Presenter/YuMi.xcdatamodeld/xplan-ios.xcdatamodel/contents b/YuMi/Modules/YMRoom/View/BackMusic/Presenter/YuMi.xcdatamodeld/xplan-ios.xcdatamodel/contents deleted file mode 100644 index 217702c..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/Presenter/YuMi.xcdatamodeld/xplan-ios.xcdatamodel/contents +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.h b/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.h deleted file mode 100644 index e3661ed..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMRoomMusicLibraryEmptyTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPRoomMusicLibraryEmptyTableViewCell; -@protocol XPRoomMusicLibraryEmptyTableViewCellDelegate - -- (void)xPRoomMusicLibraryEmptyTableViewCell:(XPRoomMusicLibraryEmptyTableViewCell *)cell didClickAdd:(UIButton *)sender; - -@end -@interface XPRoomMusicLibraryEmptyTableViewCell : UITableViewCell -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.m deleted file mode 100644 index ce599f0..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.m +++ /dev/null @@ -1,100 +0,0 @@ -// -// YMRoomMusicLibraryEmptyTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import "XPRoomMusicLibraryEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPRoomMusicLibraryEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -///更错 -@property (nonatomic,strong) UIButton *addButton; -@end - -@implementation XPRoomMusicLibraryEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.addButton]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(150); - make.centerX.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(200, 200)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; - - [self.addButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(100, 30)); - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(20); - }]; -} -#pragma mark - Event Response -- (void)addButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomMusicLibraryEmptyTableViewCell:didClickAdd:)]) { - [self.delegate xPRoomMusicLibraryEmptyTableViewCell:self didClickAdd:sender]; - } -} - -#pragma mark - Getters And Setters -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPRoomMusicLibraryEmptyTableViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} - -- (UIButton *)addButton { - if (!_addButton) { - _addButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_addButton setTitle:YMLocalizedString(@"XPRoomMusicLibraryEmptyTableViewCell1") forState:UIControlStateNormal]; - [_addButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _addButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_addButton addTarget:self action:@selector(addButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _addButton; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.h b/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.h deleted file mode 100644 index ca68113..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMRoomMusicLibraryTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class Music; -@interface XPRoomMusicLibraryTableViewCell : UITableViewCell -///歌曲信息 -@property (nonatomic,strong) Music *musicInfo; -///是否是选中的 -@property (nonatomic,assign) BOOL isSelect; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.m b/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.m deleted file mode 100644 index 66dd2bf..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.m +++ /dev/null @@ -1,134 +0,0 @@ -// -// YMRoomMusicLibraryTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import "XPRoomMusicLibraryTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "Music+CoreDataClass.h" -@interface XPRoomMusicLibraryTableViewCell () -///背景 -@property (nonatomic,strong) UIView * backView; -///歌曲的背景 -@property (nonatomic,strong) UIImageView *musicAlbumImageView; -///歌曲的名称 -@property (nonatomic,strong) UILabel * songNameLabel; -///歌曲的作者 -@property (nonatomic,strong) UILabel *authorLabel; -///分割线 -@property (nonatomic,strong) UIView * lineView; -@end - -@implementation XPRoomMusicLibraryTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.backView]; - - [self.backView addSubview:self.musicAlbumImageView]; - [self.backView addSubview:self.songNameLabel]; - [self.backView addSubview:self.authorLabel]; -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.musicAlbumImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).offset(15); - make.centerY.mas_equalTo(self.backView); - make.size.mas_equalTo(CGSizeMake(45, 45)); - }]; - - [self.songNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.musicAlbumImageView.mas_trailing).offset(10); - make.bottom.mas_equalTo(self.musicAlbumImageView.mas_centerY).offset(-3); - }]; - - [self.authorLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.songNameLabel); - make.top.mas_equalTo(self.musicAlbumImageView.mas_centerY).offset(3); - }]; -} -#pragma mark - Getters And Setters -- (void)setMusicInfo:(Music *)musicInfo { - _musicInfo = musicInfo; - if (_musicInfo) { - self.musicAlbumImageView.image = [UIImage imageWithData:_musicInfo.songAlbum]; - NSString *name = _musicInfo.musicName.length == 0 ? _musicInfo.songName : _musicInfo.musicName; - self.songNameLabel.text = name; - self.authorLabel.text = _musicInfo.author; - } -} - -- (void)setIsSelect:(BOOL)isSelect { - _isSelect = isSelect; - if (_isSelect) { - self.songNameLabel.textColor = [DJDKMIMOMColor appMainColor]; - self.authorLabel.textColor = [DJDKMIMOMColor appMainColor]; - } else { - self.songNameLabel.textColor = [DJDKMIMOMColor mainTextColor]; - self.authorLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [UIColor clearColor]; - } - return _backView; -} - -- (UIImageView *)musicAlbumImageView { - if (!_musicAlbumImageView) { - _musicAlbumImageView = [[UIImageView alloc] init]; - _musicAlbumImageView.userInteractionEnabled = YES; - _musicAlbumImageView.layer.masksToBounds = YES; - _musicAlbumImageView.layer.cornerRadius = 8; - } - return _musicAlbumImageView; -} - -- (UILabel *)songNameLabel { - if (!_songNameLabel) { - _songNameLabel = [[UILabel alloc] init]; - _songNameLabel.font = [UIFont systemFontOfSize:15]; - _songNameLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _songNameLabel; -} - -- (UILabel *)authorLabel { - if (!_authorLabel) { - _authorLabel = [[UILabel alloc] init]; - _authorLabel.font = [UIFont systemFontOfSize:12]; - _authorLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _authorLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.h b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.h deleted file mode 100644 index 6802dc5..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMMusicLibraryPlayView.h -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class Music; -@class XPMusicLibraryPlayView; -@protocol XPMusicLibraryPlayViewDelegate -///音调的设置 -- (void)xPMusicLibraryPlayView:(XPMusicLibraryPlayView *)view didClickVoiceSetting:(UIButton *)sender; -///点击了播放按钮 -- (void)xPMusicLibraryPlayView:(XPMusicLibraryPlayView *)view didClickPlayButton:(UIButton *)sender; -@end -@interface XPMusicLibraryPlayView : UIView -///歌曲 -@property (nonatomic,strong, nullable) Music *music; -///是否正在播放 -@property (nonatomic,assign) BOOL isPlaying; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.m b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.m deleted file mode 100644 index 4310951..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.m +++ /dev/null @@ -1,123 +0,0 @@ -// -// YMMusicLibraryPlayView.m -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import "XPMusicLibraryPlayView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "RtcManager.h" -///Model -#import "Music+CoreDataClass.h" - -@interface XPMusicLibraryPlayView () -///显示播放按钮 -@property (nonatomic,strong) UIButton *playButton; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///设置 -@property (nonatomic,strong) UIButton *settingButton; -@end - -@implementation XPMusicLibraryPlayView -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColorRGBAlpha(0x000000, 0.2); - - [self addSubview:self.playButton]; - [self addSubview:self.titleLabel]; - [self addSubview:self.settingButton]; -} - -- (void)initSubViewConstraints { - [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(44, 44)); - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self).offset(15); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.playButton.mas_trailing).offset(5); - make.trailing.mas_equalTo(self.settingButton.mas_leading).offset(-5); - make.centerY.mas_equalTo(self.playButton); - }]; - - [self.settingButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(22, 22)); - make.centerY.mas_equalTo(self); - make.trailing.mas_equalTo(self).offset(-15); - }]; -} -#pragma mark - Event Response -- (void)playButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMusicLibraryPlayView:didClickPlayButton:)]) { - [self.delegate xPMusicLibraryPlayView:self didClickPlayButton:sender]; - } -} - -- (void)settingButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPMusicLibraryPlayView:didClickVoiceSetting:)]) { - [self.delegate xPMusicLibraryPlayView:self didClickVoiceSetting:sender]; - } -} - -#pragma mark - Getters And Setters -- (void)setMusic:(Music *)music { - _music = music; - if (_music) { - self.titleLabel.text = _music.musicName; - } else { - self.titleLabel.text = YMLocalizedString(@"XPMusicLibraryPlayView0"); - } -} - -- (void)setIsPlaying:(BOOL)isPlaying { - _isPlaying = isPlaying; - self.playButton.selected = _isPlaying; -} - -- (UIButton *)playButton { - if (!_playButton) { - _playButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_playButton setImage:[UIImage imageNamed:@"room_music_library_play"] forState:UIControlStateNormal]; - [_playButton setImage:[UIImage imageNamed:@"room_music_library_pause"] forState:UIControlStateSelected]; - [_playButton addTarget:self action:@selector(playButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _playButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:14]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.text = YMLocalizedString(@"XPMusicLibraryPlayView1"); - } - return _titleLabel; -} - -- (UIButton *)settingButton { - if (!_settingButton) { - _settingButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_settingButton setImage:[UIImage imageNamed:@"room_music_library_volum_setting"] forState:UIControlStateNormal]; - [_settingButton setImage:[UIImage imageNamed:@"room_music_library_volum_setting"] forState:UIControlStateSelected]; - [_settingButton addTarget:self action:@selector(settingButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _settingButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.h b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.h deleted file mode 100644 index c043690..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// YMRoomBackMusicPlayerView.h -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class Music, XPRoomBackMusicPlayerView; - -@protocol XPRoomBackMusicPlayerViewDelegate -///歌曲是否正在播放 -- (void)xPRoomBackMusicPlayerView:(XPRoomBackMusicPlayerView *)view musicPlaying:(BOOL)musicPlaying; - -@end - -@interface XPRoomBackMusicPlayerView : UIView -///是否正在播放 -@property (nonatomic,assign, readonly) BOOL isPlaying; -///正在播放的音乐 -@property (nonatomic,strong, readonly) Music *currentMusic; -///代理 -@property (nonatomic,weak) id delegate; -- (void)resetData; -- (void)configCurrentPlayingMusic:(Music *)music isPlaying:(BOOL)isPlaying; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m deleted file mode 100644 index f261292..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m +++ /dev/null @@ -1,455 +0,0 @@ -// -// YMRoomBackMusicPlayerView.m -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import "XPRoomBackMusicPlayerView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "XCCurrentVCStackManager.h" -#import "XPCoreDataManager.h" -#import "RtcManager.h" -#import "YUMIConstant.h" -#import "XNDJTDDLoadingTool.h" -#import "NSArray+Safe.h" -///Model -#import "Music+CoreDataClass.h" -///View -#import "XPRoomMusicLibraryViewController.h" - -UIKIT_EXTERN NSString * kRoomBackMusicAudioMixingVolumeKey; -UIKIT_EXTERN NSString * kRoomBackMusicCaptureVolumeKey; -UIKIT_EXTERN NSString * kRoomBackMusicPlayMusicOrderKey; - -@interface XPRoomBackMusicPlayerView () - -///显示歌曲的名字 -@property (nonatomic,strong) UILabel *titleLabel; -///声音的logo -@property (nonatomic,strong) UIImageView *voiceImageView; -///调节声音 -@property (nonatomic,strong) UISlider *voiceSliderView; -///播放暂停 -@property (nonatomic,strong) UIButton *playButton; -///下一首 -@property (nonatomic,strong) UIButton *nextButton; -///播放顺序 -@property (nonatomic,strong) UIButton *playOrderButton; -///更多 -@property (nonatomic,strong) UIButton *moreButton; -///是否正在播放 -@property (nonatomic,assign) BOOL isPlaying; -///正在播放的音乐 -@property (nonatomic,strong) Music *currentMusic; -///当前的下表 -@property (nonatomic,assign) NSInteger currentIndex; -///歌曲库 -@property (nonatomic,strong) XPRoomMusicLibraryViewController *musicLibraryVC; -///数据的请求 -@property (nonatomic,strong) NSFetchRequest *request; - -@property(nonatomic, strong) UIVisualEffectView *blurEffectView; -@end - -@implementation XPRoomBackMusicPlayerView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Public Method -- (void)resetData { - self.isPlaying = NO; - self.currentMusic = nil; -} - -- (void)configCurrentPlayingMusic:(Music *)music isPlaying:(BOOL)isPlaying { - self.currentMusic = music; - self.isPlaying = isPlaying; -} - -#pragma mark - Private Method -- (void)handleTapBackground { - [UIView animateWithDuration:0.25 - animations:^{ - self.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight); - } completion:^(BOOL finished) { - [self removeFromSuperview]; - }]; -} - -- (void)initSubViews { - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.0]; - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - b.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight - 250); - [b addTarget:self action:@selector(handleTapBackground) forControlEvents:UIControlEventTouchUpInside]; - [self addSubview:b]; - - [self setCornerRadius:16 - cornerMask:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner]; - [self addSubview:self.blurEffectView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.voiceImageView]; - [self addSubview:self.voiceSliderView]; - [self addSubview:self.playButton]; - [self addSubview:self.playOrderButton]; - [self addSubview:self.nextButton]; - [self addSubview:self.moreButton]; -} - -- (void)initSubViewConstraints { - [self.blurEffectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(200)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(30); - make.bottom.mas_equalTo(self.blurEffectView.mas_centerY).offset(-24); - }]; - - [self.voiceImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(12, 15)); - make.leading.mas_equalTo(self.titleLabel); - make.centerY.mas_equalTo(self.blurEffectView); - }]; - - [self.voiceSliderView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.voiceImageView.mas_trailing).offset(5); - make.trailing.mas_equalTo(self.playButton.mas_leading).offset(-10); - make.centerY.mas_equalTo(self.voiceImageView); - }]; - - [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(22, 22)); - make.centerY.mas_equalTo(self.voiceImageView); - make.trailing.mas_equalTo(self.nextButton.mas_leading).offset(-15); - }]; - - [self.nextButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.playButton); - make.trailing.mas_equalTo(self.playOrderButton.mas_leading).offset(-15); - }]; - - [self.playOrderButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.playButton);; - make.trailing.mas_equalTo(self.moreButton.mas_leading).offset(-15); - }]; - - [self.moreButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.playButton); - make.trailing.mas_equalTo(self).offset(-30); - }]; -} - -- (void)playNextMusic:(NSInteger)index { - NSArray * array = [[XPCoreDataManager shareInstance].managedObjectContext executeFetchRequest:self.request error:nil]; - if (index >= array.count) { - index = 0; - if (!self.isPlaying && self.currentMusic) { - self.isPlaying = [[RtcManager instance] changePlayState:BackMusicPlayState_Resume]; - } else { - Music * music = [array xpSafeObjectAtIndex:index]; - [self playCurrentMusic:music index:index]; - } - } else { - Music * music = [array xpSafeObjectAtIndex:index]; - [self playCurrentMusic:music index:index]; - } -} - -- (void)playCurrentMusic:(Music *)music index:(NSInteger)index { - NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults]; - int musicVolum = (int)[defaults integerForKey:kRoomBackMusicAudioMixingVolumeKey]; - musicVolum = musicVolum > 0 ? musicVolum : 50; - - int captureVolum = (int)[defaults integerForKey:kRoomBackMusicCaptureVolumeKey]; - captureVolum = captureVolum > 0 ? captureVolum : 50; - - self.currentMusic = music; - self.currentIndex = index; - NSString * documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject]; - documentsPath = [NSString stringWithFormat:@"%@/music/",documentsPath]; - NSString * musicPath; - if (music.musicName) { - musicPath = [documentsPath stringByAppendingString:music.musicName]; - } else { - return; - } - self.isPlaying =[[RtcManager instance] playBackMusic:musicPath musicId:0 completion:^(NSString * filePath) { - NSInteger order = [[NSUserDefaults standardUserDefaults] integerForKey:kRoomBackMusicPlayMusicOrderKey]; -// NSLog(@"当前的顺序%ld", order); - if (order == 0) { - NSInteger index = self.currentIndex + 1; - [self playNextMusic:index]; - } else { - NSInteger index= self.currentIndex; - [self playNextMusic:index]; - } - }]; - - [[RtcManager instance] updateMusicSound:musicVolum]; -} - -#pragma mark - Event Response -- (void)voiceSliderViewValueChange:(UISlider *)slider { - [[NSUserDefaults standardUserDefaults] setInteger:slider.value forKey:kRoomBackMusicAudioMixingVolumeKey]; - [[NSUserDefaults standardUserDefaults] synchronize]; - [[RtcManager instance] updateMusicSound:(int)slider.value]; -} - -- (void)moreButtonAction:(UIButton *)sender { - XPRoomMusicLibraryViewController * musicLibraryVC = [[XPRoomMusicLibraryViewController alloc] init]; - musicLibraryVC.isPlaying = self.isPlaying; - musicLibraryVC.currentMusic = self.currentMusic; - musicLibraryVC.delegate = self; - self.musicLibraryVC = musicLibraryVC; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:musicLibraryVC animated:YES]; -} - -- (void)playButtonAction:(UIButton *)sender { - NSArray * array = [[XPCoreDataManager shareInstance].managedObjectContext executeFetchRequest:self.request error:nil]; - if (array.count <=0) { - XPRoomMusicLibraryViewController * musicLibraryVC = [[XPRoomMusicLibraryViewController alloc] init]; - musicLibraryVC.delegate = self; - self.musicLibraryVC = musicLibraryVC; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:musicLibraryVC animated:YES]; - } else { - NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults]; - int musicVolum = (int)[defaults integerForKey:kRoomBackMusicAudioMixingVolumeKey]; - musicVolum = musicVolum > 0 ? musicVolum : 50; - - int captureVolum = (int)[defaults integerForKey:kRoomBackMusicCaptureVolumeKey]; - captureVolum = captureVolum > 0 ? captureVolum : 50; - - switch (sender.tag) { - case 1000: - { - if (self.isPlaying == NO && self.currentMusic == nil) { - NSArray * array = [[XPCoreDataManager shareInstance].managedObjectContext executeFetchRequest:self.request error:nil]; - Music * music = [array xpSafeObjectAtIndex:0]; - [self playCurrentMusic:music index:0]; - } else { - if (self.isPlaying) { - self.isPlaying = [[RtcManager instance] changePlayState:BackMusicPlayState_Pause]; - } else { - self.isPlaying = [[RtcManager instance] changePlayState:BackMusicPlayState_Resume]; - } - } - } - break; - case 1001: - { - NSArray * array = [[XPCoreDataManager shareInstance].managedObjectContext executeFetchRequest:self.request error:nil]; - if (self.isPlaying == NO && self.currentMusic == nil) { - Music * music = [array xpSafeObjectAtIndex:0]; - [self playCurrentMusic:music index:0]; - } else { - NSInteger index = self.currentIndex + 1; - [self playNextMusic:index]; - } - } - break; - case 1002: - - break; - - default: - break; - } - } -} - -- (void)playOrderButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - NSString * title = sender.selected ? YMLocalizedString(@"XPRoomBackMusicPlayerView5") : YMLocalizedString(@"XPRoomBackMusicPlayerView1"); - [XNDJTDDLoadingTool showSuccessWithMessage:title]; - NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults]; - NSInteger type = sender.selected ? 1 : 0; - [defaults setInteger:type forKey:kRoomBackMusicPlayMusicOrderKey]; - [defaults synchronize]; -} - -#pragma mark - XPRoomMusicLibraryViewControllerDelegate -- (void)xPRoomMusicLibraryViewController:(XPRoomMusicLibraryViewController *)view musicInfo:(Music *)musicInfo { - if (musicInfo) { - NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults]; - int musicVolum = (int)[defaults integerForKey:kRoomBackMusicAudioMixingVolumeKey]; - musicVolum = musicVolum > 0 ? musicVolum : 50; - - int captureVolum = (int)[defaults integerForKey:kRoomBackMusicCaptureVolumeKey]; - captureVolum = captureVolum > 0 ? captureVolum : 50; - NSArray * array = [[XPCoreDataManager shareInstance].managedObjectContext executeFetchRequest:self.request error:nil]; - __block NSInteger currentIndex = 0; - if (array.count > 0) { - [array enumerateObjectsUsingBlock:^(Music * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.musicId isEqualToString:musicInfo.musicId]) { - currentIndex = idx; - } - }]; - - if (self.isPlaying == NO && self.currentMusic == nil) { - [self playCurrentMusic:musicInfo index:currentIndex]; - } else { - if (self.isPlaying) { - if ([self.currentMusic.musicId isEqualToString:musicInfo.musicId]) { - self.isPlaying = [[RtcManager instance] changePlayState:BackMusicPlayState_Pause]; - } else { - [self playCurrentMusic:musicInfo index:currentIndex]; - } - } else { - [self playCurrentMusic:musicInfo index:currentIndex]; - } - } - } - } else { - self.titleLabel.text = YMLocalizedString(@"XPRoomBackMusicPlayerView2"); - } -} - -- (void)xPRoomMusicLibraryViewController:(XPRoomMusicLibraryViewController *)view isPlaying:(BOOL)isPlaying { - self.isPlaying = isPlaying; -} - -- (void)xPRoomMusicLibraryViewController:(XPRoomMusicLibraryViewController *)view backMusicVolum:(NSInteger)backMusicVolum { - self.voiceSliderView.value = backMusicVolum; -} - -#pragma mark - Getters And Setters -- (void)setIsPlaying:(BOOL)isPlaying { - _isPlaying = isPlaying; - self.playButton.selected = _isPlaying; - self.musicLibraryVC.isPlaying = _isPlaying; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomBackMusicPlayerView:musicPlaying:)]) { - [self.delegate xPRoomBackMusicPlayerView:self musicPlaying:_isPlaying]; - } -} - -- (void)setCurrentMusic:(Music *)currentMusic { - _currentMusic = currentMusic; - if (_currentMusic) { - NSString *name = _currentMusic.musicName.length == 0 ? _currentMusic.songName : _currentMusic.musicName; - self.titleLabel.text = name; - } else { - self.titleLabel.text = YMLocalizedString(@"XPRoomBackMusicPlayerView3"); - } - self.musicLibraryVC.currentMusic = _currentMusic; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:13]; - _titleLabel.textColor = UIColor.whiteColor; - _titleLabel.text = YMLocalizedString(@"XPRoomBackMusicPlayerView4"); - } - return _titleLabel; -} - -- (UIImageView *)voiceImageView { - if (!_voiceImageView) { - _voiceImageView = [[UIImageView alloc] init]; - _voiceImageView.userInteractionEnabled = YES; - _voiceImageView.image = [UIImage imageNamed:@"room_music_small_player_voice"]; - } - return _voiceImageView; -} - -- (UISlider *)voiceSliderView { - if (!_voiceSliderView) { - _voiceSliderView = [[UISlider alloc]init]; - _voiceSliderView.minimumValue = 0; - _voiceSliderView.maximumValue = 100; - NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults]; - int captureVolum = (int)[defaults integerForKey:kRoomBackMusicAudioMixingVolumeKey]; - captureVolum = captureVolum > 0 ? captureVolum : 50; - _voiceSliderView.value = captureVolum; - _voiceSliderView.minimumTrackTintColor = [UIColor whiteColor]; - _voiceSliderView.maximumTrackTintColor = UIColorFromRGB(0x999999); - [_voiceSliderView setThumbImage:[UIImage imageNamed:@"room_music_small_player_white_dot"] forState:UIControlStateNormal]; - [_voiceSliderView addTarget:self action:@selector(voiceSliderViewValueChange:) forControlEvents:UIControlEventValueChanged]; - - } - return _voiceSliderView; -} - -- (UIButton *)playButton { - if (!_playButton) { - _playButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_playButton setImage:[UIImage imageNamed:@"room_music_small_player_play"] forState:UIControlStateNormal]; - [_playButton setImage:[UIImage imageNamed:@"room_music_small_player_pause"] forState:UIControlStateSelected]; - _playButton.tag = 1000; - [_playButton addTarget:self action:@selector(playButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _playButton; -} - -- (UIButton *)moreButton { - if (!_moreButton) { - _moreButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_moreButton setImage:[UIImage imageNamed:@"room_music_small_player_more"] forState:UIControlStateNormal]; - [_moreButton setImage:[UIImage imageNamed:@"room_music_small_player_more"] forState:UIControlStateSelected]; - [_moreButton addTarget:self action:@selector(moreButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _moreButton.transform = CGAffineTransformMakeRotation(-M_PI /2); - } - return _moreButton; -} - -- (UIButton *)nextButton { - if (!_nextButton) { - _nextButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_nextButton setImage:[UIImage imageNamed:@"room_music_small_player_next"] forState:UIControlStateNormal]; - [_nextButton setImage:[UIImage imageNamed:@"room_music_small_player_next"] forState:UIControlStateSelected]; - _nextButton.tag = 1001; - [_nextButton addTarget:self action:@selector(playButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _nextButton; -} - -- (UIButton *)playOrderButton { - if (!_playOrderButton) { - _playOrderButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_playOrderButton setImage:[UIImage imageNamed:@"room_music_small_player_order"] forState:UIControlStateNormal]; - [_playOrderButton setImage:[UIImage imageNamed:@"room_music_small_player_single"] forState:UIControlStateSelected]; - NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults]; - NSInteger type = [defaults integerForKey:kRoomBackMusicPlayMusicOrderKey]; - _playOrderButton.selected = type == 1; - [_playOrderButton addTarget:self action:@selector(playOrderButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _playOrderButton; -} - -- (NSFetchRequest *)request { - if (!_request) { - _request = [NSFetchRequest fetchRequestWithEntityName:[Music getMusicName]]; - } - return _request; -} - -- (UIVisualEffectView *)blurEffectView { - if (!_blurEffectView) { - // 创建模糊效果 - UIBlurEffect *blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; // 选择模糊样式（例如：Light, Dark, ExtraLight 等） - - // 创建包含模糊效果的视图 - _blurEffectView = [[UIVisualEffectView alloc] initWithEffect:blurEffect]; - - // 设置模糊视图的大小与目标视图一致 - _blurEffectView.frame = CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(200)); - _blurEffectView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; // 使模糊视图适应目标视图的尺寸变化 - - [_blurEffectView setCornerRadius:16]; - } - return _blurEffectView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.h b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.h deleted file mode 100644 index 3599661..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// YMRoomMusicVoiceSettingView.h -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, MusicVoiceSettingType) { - ///人声 - MusicVoiceSettingType_User, - ///背景音乐 - MusicVoiceSettingType_Music, -}; -@class XPRoomMusicVoiceSettingView; -@protocol XPRoomMusicVoiceSettingViewDelegate - -- (void)xPRoomMusicVoiceSettingView:(XPRoomMusicVoiceSettingView *)view didSliderValueChange:(UISlider *)slider; - -@end - -@interface XPRoomMusicVoiceSettingView : UIView - -///代理 -@property (nonatomic,weak) id delegate; -///背景音乐 -@property (nonatomic,assign) NSInteger musicVolum; -///采集的声音大小 -@property (nonatomic,assign) NSInteger captureVolum; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.m b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.m deleted file mode 100644 index a9fd662..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.m +++ /dev/null @@ -1,227 +0,0 @@ -// -// YMRoomMusicVoiceSettingView.m -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import "XPRoomMusicVoiceSettingView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPRoomMusicVoiceSettingView () -///最大的容器 -@property (nonatomic,strong) UIStackView *stackView; -///人声 -@property (nonatomic,strong) UIStackView *userStackView; -///人声 -@property (nonatomic,strong) UILabel *userTitleLabel; -///人生音量调节滑块 -@property (strong, nonatomic) UISlider *userVolumeSlider; -///% -@property (nonatomic,strong) UILabel *userVoiceLabel; -///音乐的 -@property (nonatomic,strong) UIStackView *musicStackView; -///人声 -@property (nonatomic,strong) UILabel *musicTitleLabel; -///人生音量调节滑块 -@property (strong, nonatomic) UISlider *musicVolumeSlider; -///音乐的% -@property (nonatomic,strong) UILabel *musicVoiceLabel; -@end - - -@implementation XPRoomMusicVoiceSettingView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColorRGBAlpha(0x000000, 0.2); - [self addSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.userStackView]; - [self.stackView addArrangedSubview:self.musicStackView]; - - [self.userStackView addArrangedSubview:self.userTitleLabel]; - [self.userStackView addArrangedSubview:self.userVolumeSlider]; - [self.userStackView addArrangedSubview:self.userVoiceLabel]; - - [self.musicStackView addArrangedSubview:self.musicTitleLabel]; - [self.musicStackView addArrangedSubview:self.musicVolumeSlider]; - [self.musicStackView addArrangedSubview:self.musicVoiceLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(60); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(15); - make.top.bottom.mas_equalTo(self); - - }]; - - [self.userStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(40); - }]; - - [self.userTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(40); - }]; - - [self.userVoiceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(40); - }]; - - [self.musicTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(40); - }]; - - [self.musicVoiceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(40); - }]; -} - -#pragma mark - Event Response -- (void)userVolumeSliderValueChange:(UISlider *)slider { - if (slider == self.userVolumeSlider) { - self.userVoiceLabel.text = [[NSString stringWithFormat:@"%ld",(NSInteger)slider.value] stringByAppendingString:@"%"]; - } else { - self.musicVoiceLabel.text = [[NSString stringWithFormat:@"%ld",(NSInteger)slider.value] stringByAppendingString:@"%"]; - } - - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomMusicVoiceSettingView:didSliderValueChange:)]) { - [self.delegate xPRoomMusicVoiceSettingView:self didSliderValueChange:slider]; - } -} - -#pragma mark - Getters And Setters -- (void)setMusicVolum:(NSInteger)musicVolum { - _musicVolum = musicVolum; - self.musicVolumeSlider.value = musicVolum; - self.musicVoiceLabel.text = [[NSString stringWithFormat:@"%ld", musicVolum] stringByAppendingString:@"%"]; -} - -- (void)setCaptureVolum:(NSInteger)captureVolum { - _captureVolum = captureVolum; - self.userVolumeSlider.value = captureVolum; - self.userVoiceLabel.text = [[NSString stringWithFormat:@"%ld",(NSInteger)captureVolum] stringByAppendingString:@"%"]; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 5; - } - return _stackView; -} - -- (UIStackView *)userStackView { - if (!_userStackView) { - _userStackView = [[UIStackView alloc] init]; - _userStackView.axis = UILayoutConstraintAxisHorizontal; - _userStackView.distribution = UIStackViewDistributionFill; - _userStackView.alignment = UIStackViewAlignmentCenter; - _userStackView.spacing = 5; - } - return _userStackView; -} - -- (UILabel *)userTitleLabel { - if (!_userTitleLabel) { - _userTitleLabel = [[UILabel alloc] init]; - _userTitleLabel.font = [UIFont systemFontOfSize:13]; - _userTitleLabel.textColor = UIColorFromRGB(0x999999); - _userTitleLabel.text = YMLocalizedString(@"XPRoomMusicVoiceSettingView0"); - } - return _userTitleLabel; -} - -- (UISlider *)userVolumeSlider { - if (!_userVolumeSlider) { - _userVolumeSlider = [[UISlider alloc]init]; - _userVolumeSlider.minimumValue = 0; - _userVolumeSlider.maximumValue = 100; - _userVolumeSlider.value = 50; - _userVolumeSlider.minimumTrackTintColor = [DJDKMIMOMColor appMainColor]; - _userVolumeSlider.maximumTrackTintColor = UIColor.whiteColor; - _userVolumeSlider.tag = MusicVoiceSettingType_User; - [_userVolumeSlider setThumbImage:[UIImage imageNamed:@"room_music_voice_setting_dot"] forState:UIControlStateNormal]; - [_userVolumeSlider addTarget:self action:@selector(userVolumeSliderValueChange:) forControlEvents:UIControlEventValueChanged]; - - } - return _userVolumeSlider; -} - -- (UILabel *)userVoiceLabel { - if (!_userVoiceLabel) { - _userVoiceLabel = [[UILabel alloc] init]; - _userVoiceLabel.font = [UIFont systemFontOfSize:13]; - _userVoiceLabel.textColor = UIColorFromRGB(0x999999); - _userVoiceLabel.text = @"50%"; - } - return _userVoiceLabel; -} - -- (UIStackView *)musicStackView { - if (!_musicStackView) { - _musicStackView = [[UIStackView alloc] init]; - _musicStackView.axis = UILayoutConstraintAxisHorizontal; - _musicStackView.distribution = UIStackViewDistributionFill; - _musicStackView.alignment = UIStackViewAlignmentFill; - _musicStackView.spacing = 5; - } - return _musicStackView; -} - -- (UILabel *)musicTitleLabel { - if (!_musicTitleLabel) { - _musicTitleLabel = [[UILabel alloc] init]; - _musicTitleLabel.font = [UIFont systemFontOfSize:13]; - _musicTitleLabel.textColor = UIColorFromRGB(0x999999); - _musicTitleLabel.text = YMLocalizedString(@"XPRoomMusicVoiceSettingView1"); - } - return _musicTitleLabel; -} - -- (UISlider *)musicVolumeSlider { - if (!_musicVolumeSlider) { - _musicVolumeSlider = [[UISlider alloc]init]; - _musicVolumeSlider.minimumValue = 0; - _musicVolumeSlider.maximumValue = 100; - _musicVolumeSlider.value = 50; - _musicVolumeSlider.minimumTrackTintColor = [DJDKMIMOMColor appMainColor]; - _musicVolumeSlider.maximumTrackTintColor = UIColor.whiteColor; - _musicVolumeSlider.tag = MusicVoiceSettingType_Music; - [_musicVolumeSlider setThumbImage:[UIImage imageNamed:@"room_music_voice_setting_dot"] forState:UIControlStateNormal]; - [_musicVolumeSlider addTarget:self action:@selector(userVolumeSliderValueChange:) forControlEvents:UIControlEventValueChanged]; - - } - return _musicVolumeSlider; -} - -- (UILabel *)musicVoiceLabel { - if (!_musicVoiceLabel) { - _musicVoiceLabel = [[UILabel alloc] init]; - _musicVoiceLabel.font = [UIFont systemFontOfSize:13]; - _musicVoiceLabel.textColor = UIColorFromRGB(0x999999); - _musicVoiceLabel.text = @"50%"; - } - return _musicVoiceLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.h b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.h deleted file mode 100644 index c02e121..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMRoomMusicLibraryViewController.h -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import "BaseViewController.h" -#import "RoomHostDelegate.h" -NS_ASSUME_NONNULL_BEGIN -@class Music, XPRoomMusicLibraryViewController; - -@protocol XPRoomMusicLibraryViewControllerDelegate -///当前选中的音乐 -- (void)xPRoomMusicLibraryViewController:(XPRoomMusicLibraryViewController *)view musicInfo:(Music *)musicInfo; -///是否开始播放 -- (void)xPRoomMusicLibraryViewController:(XPRoomMusicLibraryViewController *)view isPlaying:(BOOL)isPlaying; -///改变了背景音乐的声音大小 -- (void)xPRoomMusicLibraryViewController:(XPRoomMusicLibraryViewController *)view backMusicVolum:(NSInteger)backMusicVolum; -@end -@interface XPRoomMusicLibraryViewController : BaseViewController -///是否正在播放 -@property (nonatomic,assign) BOOL isPlaying; -///当前播放的音乐 -@property (nonatomic,strong) Music *currentMusic; -///代理 -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m deleted file mode 100644 index 0ad9b23..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m +++ /dev/null @@ -1,355 +0,0 @@ -// -// YMRoomMusicLibraryViewController.m -// YUMI -// -// Created by YUMI on 2022/5/9. -// - -#import "XPRoomMusicLibraryViewController.h" -///Third -#import -///Tool -#import "XPCoreDataManager.h" -#import "YUMIConstant.h" -#import "RtcManager.h" -#import "YUMIMacroUitls.h" -#import "XPCoreDataManager.h" -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -///Model -#import "Music+CoreDataClass.h" -///View -#import "XPRoomMusicLibraryTableViewCell.h" -#import "XPRoomMusicLibraryEmptyTableViewCell.h" -#import "XPMusicLibraryPlayView.h" -#import "XPRoomMusicVoiceSettingView.h" -#import "XPRoomTransferMusicViewController.h" - -UIKIT_EXTERN NSString * kRoomBackMusicAudioMixingVolumeKey; -UIKIT_EXTERN NSString * kRoomBackMusicCaptureVolumeKey; - -@interface XPRoomMusicLibraryViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///底部播放器 -@property (nonatomic,strong) XPMusicLibraryPlayView *playView; -///设置声音 -@property (nonatomic,strong) XPRoomMusicVoiceSettingView *voiceSettingView; -@property(nonatomic,strong)NSFetchedResultsController *fetchedResultController; -///当前选中播放的音乐 -@property (nonatomic,strong, nullable) Music *selectMusic; -///数据源 -@property (nonatomic,strong) NSArray *datasource; -///数据的请求 -@property (nonatomic,strong) NSFetchRequest *request; -///顶部视图 -@property (nonatomic,strong) UIView * headerView; -///歌曲数量的 -@property (nonatomic,strong) UILabel *numberMusicLabel; -@end - -@implementation XPRoomMusicLibraryViewController -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - NSArray *data = [[XPCoreDataManager shareInstance].managedObjectContext executeFetchRequest:self.request error:nil]; - self.datasource = data; - [self.tableView reloadData]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = YMLocalizedString(@"XPRoomMusicLibraryViewController0"); - [self initData]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initData { - self.playView.music = self.currentMusic; - self.playView.isPlaying = self.isPlaying; - - NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults]; - NSInteger musicVolum = [defaults integerForKey:kRoomBackMusicAudioMixingVolumeKey]; - musicVolum = musicVolum > 0 ? musicVolum : 50; - self.voiceSettingView.musicVolum = musicVolum; - - NSInteger captureVolum = [defaults integerForKey:kRoomBackMusicCaptureVolumeKey]; - captureVolum = captureVolum > 0 ? captureVolum : 50; - self.voiceSettingView.captureVolum = captureVolum; -} - -- (void)initSubViews { - [self addNavigationItemWithImageNames:@[@"room_music_library_nav_add"] isLeft:NO target:self action:@selector(addMusicAction:) tags:nil]; - [self.view addSubview:self.tableView]; - [self.view addSubview:self.playView]; - [self.view addSubview:self.voiceSettingView]; -} - -- (void)initSubViewConstraints { - [self.playView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(55); - make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight ); - make.leading.trailing.mas_equalTo(self.view); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.playView.mas_top); - }]; - - [self.voiceSettingView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.playView.mas_top); - make.leading.trailing.mas_equalTo(self.view); - }]; -} -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPRoomMusicLibraryTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomMusicLibraryTableViewCell class])]; - Music * musicInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (musicInfo.musicId == self.selectMusic.musicId) { - cell.isSelect = YES; - } else { - cell.isSelect = NO; - } - cell.musicInfo = musicInfo; - return cell; - } - - XPRoomMusicLibraryEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomMusicLibraryEmptyTableViewCell class])]; - cell.delegate = self; - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? 60 : (KScreenHeight - kNavigationHeight); -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - Music * musicInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - self.selectMusic = musicInfo; - self.playView.music = musicInfo; - [self.tableView reloadData]; - - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomMusicLibraryViewController:musicInfo:)]) { - [self.delegate xPRoomMusicLibraryViewController:self musicInfo:self.selectMusic]; - } - } - if (!self.voiceSettingView.hidden) { - self.voiceSettingView.hidden = YES; - } -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - if (self.datasource.count > 0) { - return 20; - } - return 0.01f; -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - if (self.datasource.count > 0) { - self.headerView.frame = CGRectMake(0, 0, KScreenWidth, 20); - if (!self.numberMusicLabel.superview) { - [self.headerView addSubview:self.numberMusicLabel]; - [self.numberMusicLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.headerView).offset(15); - make.centerY.mas_equalTo(self.headerView); - }]; - } - - self.numberMusicLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMusicLibraryViewController1"), self.datasource.count]; - return self.headerView; - } - return [UIView new]; -} - -- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - return YES; - } - return NO; -} - -- (NSString *)tableView:(UITableView *)tableView titleForDeleteConfirmationButtonForRowAtIndexPath:(NSIndexPath *)indexPath { - return YMLocalizedString(@"XPRoomMusicLibraryViewController2"); -} - -- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { - if (editingStyle == UITableViewCellEditingStyleDelete) { - Music * music = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - [self showLoading]; - if ([music.musicId isEqualToString:self.currentMusic.musicId]) { - self.playView.music = nil; - self.playView.isPlaying = NO; - self.selectMusic = nil; - self.isPlaying = NO; - [[RtcManager instance] changePlayState:BackMusicPlayState_Stop]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomMusicLibraryViewController:isPlaying:)]) { - [self.delegate xPRoomMusicLibraryViewController:self isPlaying:self.isPlaying]; - } - - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomMusicLibraryViewController:musicInfo:)]) { - [self.delegate xPRoomMusicLibraryViewController:self musicInfo:self.selectMusic]; - } - } - - if (music.musicName) { - NSString * documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject]; - documentsPath = [NSString stringWithFormat:@"%@/music/",documentsPath]; - NSString * musicPath = [documentsPath stringByAppendingString:music.musicName]; - NSFileManager *fileManager = [NSFileManager defaultManager]; - if ([fileManager fileExistsAtPath:musicPath]) { - NSError * error; - [fileManager removeItemAtPath:musicPath error:&error]; - } - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [[XPCoreDataManager shareInstance].managedObjectContext deleteObject:music]; - [[XPCoreDataManager shareInstance] save]; - NSArray *data = [[XPCoreDataManager shareInstance].managedObjectContext executeFetchRequest:self.request error:nil]; - self.datasource = data; - [self.tableView reloadData]; - [self hideHUD]; - }); - } -} - -#pragma mark - XPRoomMusicLibraryEmptyTableViewCellDelegate -- (void)xPRoomMusicLibraryEmptyTableViewCell:(XPRoomMusicLibraryEmptyTableViewCell *)cell - didClickAdd:(UIButton *)sender { - XPRoomTransferMusicViewController * transferVC = [[XPRoomTransferMusicViewController alloc] init]; - [self.navigationController pushViewController:transferVC animated:YES]; -} -#pragma mark - XPMusicLibraryPlayViewDelegate -- (void)xPMusicLibraryPlayView:(XPMusicLibraryPlayView *)view didClickVoiceSetting:(UIButton *)sender { - self.voiceSettingView.hidden = !sender.selected; -} - -- (void)xPMusicLibraryPlayView:(XPMusicLibraryPlayView *)view didClickPlayButton:(UIButton *)sender { - if (self.currentMusic) { - sender.selected = !sender.selected; - if (self.isPlaying) { - [[RtcManager instance] changePlayState:BackMusicPlayState_Pause]; - sender.selected = NO; - self.isPlaying = NO; - } else { - [[RtcManager instance] changePlayState:BackMusicPlayState_Resume]; - sender.selected = YES; - self.isPlaying = YES; - } - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomMusicLibraryViewController:isPlaying:)]) { - [self.delegate xPRoomMusicLibraryViewController:self isPlaying:self.isPlaying]; - } - } -} - -#pragma mark - XPRoomMusicVoiceSettingViewDelegate -- (void)xPRoomMusicVoiceSettingView:(XPRoomMusicVoiceSettingView *)view didSliderValueChange:(UISlider *)slider { - switch (slider.tag) { - case MusicVoiceSettingType_User: - { - [[RtcManager instance] updateUserSound:(int)slider.value]; - } - break; - case MusicVoiceSettingType_Music: - { - [[RtcManager instance] updateMusicSound:(int)slider.value]; - - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomMusicLibraryViewController:backMusicVolum:)]) { - [self.delegate xPRoomMusicLibraryViewController:self backMusicVolum:slider.value]; - } - } - break; - default: - break; - } -} - -#pragma mark - Event Response -- (void)addMusicAction:(UIButton *)sender { - XPRoomTransferMusicViewController * transferVC = [[XPRoomTransferMusicViewController alloc] init]; - [self.navigationController pushViewController:transferVC animated:YES]; -} -#pragma mark - Getters And Setters -- (void)setIsPlaying:(BOOL)isPlaying { - _isPlaying = isPlaying; - self.playView.isPlaying = _isPlaying; -} - -- (void)setCurrentMusic:(Music *)currentMusic { - _currentMusic = currentMusic; - self.playView.music = _currentMusic; - self.selectMusic = _currentMusic; - [self.tableView reloadData]; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPRoomMusicLibraryTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomMusicLibraryTableViewCell class])]; - [_tableView registerClass:[XPRoomMusicLibraryEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomMusicLibraryEmptyTableViewCell class])]; - } - return _tableView; -} - -- (XPMusicLibraryPlayView *)playView { - if (!_playView) { - _playView = [[XPMusicLibraryPlayView alloc] init]; - _playView.delegate = self; - } - return _playView; -} - -- (XPRoomMusicVoiceSettingView *)voiceSettingView { -if (!_voiceSettingView) { - _voiceSettingView = [[XPRoomMusicVoiceSettingView alloc] init]; - _voiceSettingView.delegate = self; - _voiceSettingView.hidden = YES; - } - return _voiceSettingView; -} - -- (NSFetchRequest *)request { - if (!_request) { - _request = [NSFetchRequest fetchRequestWithEntityName:[Music getMusicName]]; - } - return _request; -} - -- (UIView *)headerView { - if (!_headerView) { - _headerView = [[UIView alloc] init]; - _headerView.backgroundColor = [UIColor clearColor]; - } - return _headerView; -} - -- (UILabel *)numberMusicLabel { - if (!_numberMusicLabel) { - _numberMusicLabel = [[UILabel alloc] init]; - _numberMusicLabel.font = [UIFont systemFontOfSize:10]; - _numberMusicLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _numberMusicLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.h b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.h deleted file mode 100644 index a35c4ff..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomTransferMusicViewController.h -// YUMI -// -// Created by YUMI on 2022/5/7. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomTransferMusicViewController : BaseViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m deleted file mode 100644 index b1e2e8d..0000000 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m +++ /dev/null @@ -1,402 +0,0 @@ -// -// YMRoomTransferMusicViewController.m -// YUMI -// -// Created by YUMI on 2022/5/7. -// - -#import "XPRoomTransferMusicViewController.h" -///Third -#import -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "HTTPServer.h" -#import "MyHTTPConnection.h" -#import "SJXCSMIPHelper.h" -#import "XPCoreDataManager.h" -#import "GCDHelper.h" -#import "NSArray+Safe.h" -///Model -#import "Music+CoreDataClass.h" - -static NSInteger spacing = 47 * 2; - -@interface XPRoomTransferMusicViewController () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///wifi -@property (nonatomic,strong) UIView * wifiView; -///显示wift的图标 -@property (nonatomic,strong) UIImageView *wifiImaegView; -///显示wift -@property (nonatomic,strong) UILabel *wifiLabel; -///显示ip -@property (nonatomic,strong) UILabel *ipLabel; -///📶 -@property (nonatomic,strong) UILabel *singleTypeLabel; -///电脑 -@property (nonatomic,strong) UIImageView *computerImageView; -///描述 -@property (nonatomic,strong) UILabel *descriptionLabel; -///歌曲的数量 -@property (nonatomic,strong) UIButton *musicCountButton; -///保存 -@property (nonatomic,strong) UIButton *saveButton; -@property (nonatomic,strong) UIButton *copyButton; -@property (nonatomic,strong) HTTPServer *httpServer; -@property (strong, nonatomic) NSString *ipAddress; -///歌曲的个数 -@property (nonatomic,assign) NSInteger numberSong; -///当前的歌曲 -@property (nonatomic,strong) Music * currentMusic; -@end - -@implementation XPRoomTransferMusicViewController -- (void)viewDidLoad { - [super viewDidLoad]; - [self connectHttpServer]; - [self monitorNet]; - [self initSubViews]; - [self initSubViewConstraints]; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPRoomTransferMusicViewController0"); - self.numberSong = 0; - [self.view addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.wifiView]; - [self.stackView addArrangedSubview:self.ipLabel]; - [self.stackView addArrangedSubview:self.singleTypeLabel]; - [self.stackView addArrangedSubview:self.computerImageView]; - [self.stackView addArrangedSubview:self.descriptionLabel]; - [self.stackView addArrangedSubview:self.musicCountButton]; - [self.stackView addArrangedSubview:self.saveButton]; - [self.stackView addArrangedSubview:self.copyButton]; - - [self.wifiView addSubview:self.wifiImaegView]; - [self.wifiView addSubview:self.wifiLabel]; -} - -- (void)initSubViewConstraints { - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.view).offset(15); - }]; - - [self.wifiView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - make.width.mas_greaterThanOrEqualTo(150); - }]; - - [self.wifiImaegView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.wifiLabel.mas_leading).offset(-5); - make.centerY.mas_equalTo(self.wifiView); - make.width.mas_equalTo(22); - make.height.mas_equalTo(22); - }]; - - [self.wifiLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-10); - make.leading.mas_equalTo(37); - make.centerY.mas_equalTo(self.wifiView); - }]; - - [self.ipLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth - spacing); - }]; - - [self.singleTypeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.ipLabel); - }]; - - [self.computerImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(187, 114)); - }]; - - [self.descriptionLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth - spacing); - }]; - - [self.musicCountButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(178, 35)); - }]; - - [self.saveButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KScreenWidth - spacing, 45)); - }]; - - [self.copyButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KScreenWidth - spacing, 45)); - }]; -} - -- (void)monitorNet { - AFNetworkReachabilityStatus status = [AFNetworkReachabilityManager sharedManager].networkReachabilityStatus; - - NSError * err; - if ([self.httpServer start:&err]) { - self.ipAddress = @""; - if (status == AFNetworkReachabilityStatusReachableViaWWAN) { - self.ipAddress = YMLocalizedString(@"XPRoomTransferMusicViewController1"); - self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController2"); - } else if (status == AFNetworkReachabilityStatusNotReachable) { - self.ipAddress = YMLocalizedString(@"XPRoomTransferMusicViewController3"); - self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController2"); - } else { - self.ipAddress = [NSString stringWithFormat:@"http://%@:%d/?lang=%@",[SJXCSMIPHelper deviceIPAddress],[self.httpServer listeningPort],[NSBundle getLanguageText]]; - self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController5"); - } - self.ipLabel.text = self.ipAddress; - } - @kWeakify(self); - [[AFNetworkReachabilityManager sharedManager] setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) { - @kStrongify(self); - switch (status) { - case AFNetworkReachabilityStatusNotReachable: - { - self.ipLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController6"); - self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController2"); - } - break; - case AFNetworkReachabilityStatusReachableViaWWAN: - { - self.ipLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController8"); - self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController2"); - } - break; - default: - self.ipLabel.text = self.ipAddress; - self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController5"); - break; - } - }]; -} - -- (void)connectHttpServer { - self.httpServer = [[HTTPServer alloc] init]; - self.httpServer.viewcontroller = self; - [self.httpServer setPort:12345]; - [self.httpServer setType:@"_http._tcp."]; - // webPath是server搜寻HTML等文件的路径 - NSString *webPagePath = [[NSBundle mainBundle] resourcePath]; - [self.httpServer setDocumentRoot:webPagePath]; - [self.httpServer setConnectionClass:[MyHTTPConnection class]]; -} - -#pragma mark - MyHTTPConnectionDelegate - -- (NSString *)onSetDestinationPathHttpFileTranSportDestination:(MyHTTPConnection *)server { - NSString* uploadDirPath =[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject]; - uploadDirPath = [NSString stringWithFormat:@"%@/music",uploadDirPath]; - BOOL isDir = YES; - if (![[NSFileManager defaultManager]fileExistsAtPath:uploadDirPath isDirectory:&isDir ]) { - [[NSFileManager defaultManager]createDirectoryAtPath:uploadDirPath withIntermediateDirectories:YES attributes:nil error:nil]; - } - return uploadDirPath; - -} - -- (void)onHttpFileTranSportServer:(MyHTTPConnection *)server successWithPath:(NSString *)filePath { - AVURLAsset *mp3Asset = [AVURLAsset URLAssetWithURL:[NSURL fileURLWithPath:filePath] options:nil]; - if (mp3Asset && self.currentMusic != nil) { - NSString * songName;///歌曲 - NSString *singer;//歌手 - UIImage *image;//图片 - NSMutableArray *artists = [[AVMetadataItem metadataItemsFromArray:mp3Asset.commonMetadata withKey:AVMetadataCommonKeyArtist keySpace:AVMetadataKeySpaceCommon] mutableCopy]; - NSArray *albumNames = [AVMetadataItem metadataItemsFromArray:mp3Asset.commonMetadata withKey:AVMetadataCommonKeyArtwork keySpace:AVMetadataKeySpaceCommon]; - NSArray *titles = [AVMetadataItem metadataItemsFromArray:mp3Asset.commonMetadata withKey:AVMetadataCommonKeyTitle keySpace:AVMetadataKeySpaceCommon]; - NSString *randomNum = @""; - - if (artists.count > 0) { - AVMetadataItem *artist = [artists xpSafeObjectAtIndex:0]; - singer = [artist.value copyWithZone:nil]; - }else{ - int64_t i = random() % 1000000000; - randomNum = [NSString stringWithFormat:@"%lld",i]; - singer = YMLocalizedString(@"XPRoomTransferMusicViewController11"); - } - - if (albumNames.count > 0) { - AVMetadataItem *artist = [albumNames xpSafeObjectAtIndex:0]; - image = [UIImage imageWithData:[artist.value copyWithZone:nil]]; - }else{ - image = [UIImage imageNamed:@"common_avatar"]; - } - - if (titles.count > 0) { - AVMetadataItem *artist = [titles xpSafeObjectAtIndex:0]; - songName = [artist.value copyWithZone:nil]; - }else{ - songName = YMLocalizedString(@"XPRoomTransferMusicViewController12"); - } - - NSUUID * uuid = [UIDevice currentDevice].identifierForVendor; - NSString * musicId = [uuid.UUIDString stringByAppendingString:[NSString stringWithFormat:@"%@%@",songName,randomNum]]; - self.currentMusic.author = singer; - self.currentMusic.musicId = musicId; - self.currentMusic.songName = songName; - self.currentMusic.songAlbum = UIImageJPEGRepresentation(image, 1); - [[XPCoreDataManager shareInstance] save]; - dispatch_main_sync_safe(^{ - self.numberSong++; - [self.musicCountButton setTitle:[NSString stringWithFormat:YMLocalizedString(@"XPRoomTransferMusicViewController13"), self.numberSong] forState:UIControlStateNormal]; - self.currentMusic = nil; - }); - } -} - -- (BOOL)onHttpFileDataEstimateDuplicateCanPassTranSportServer:(MyHTTPConnection *)server withPath:(NSString *)filePath andFileName:(NSString *)fileName { - if ([[NSFileManager defaultManager] fileExistsAtPath:filePath] == NO) { - self.currentMusic = [NSEntityDescription insertNewObjectForEntityForName:[Music getMusicName] inManagedObjectContext:[XPCoreDataManager shareInstance].managedObjectContext]; - self.currentMusic.musicName = fileName; - return YES; - }else { - return NO; - } -} - -#pragma mark - Event Response -- (void)saveButtonAction:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)didTapCopyButton { - UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; - pasteboard.string = self.ipLabel.text; - - [self showSuccessToast:YMLocalizedString(@"XPRoomTransferMusicViewController20")]; -} - -#pragma mark - Getters And Setters -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 15; - } - return _stackView; -} - -- (UIView *)wifiView { - if (!_wifiView) { - _wifiView = [[UIView alloc] init]; - _wifiView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4]; - _wifiView.layer.masksToBounds = YES; - _wifiView.layer.cornerRadius = 15; - } - return _wifiView; -} - -- (UIImageView *)wifiImaegView { - if (!_wifiImaegView) { - _wifiImaegView = [[UIImageView alloc] init]; - _wifiImaegView.userInteractionEnabled = YES; - _wifiImaegView.image = [UIImage imageNamed:@"room_music_transfer_wifi"]; - } - return _wifiImaegView; -} - -- (UILabel *)wifiLabel { - if (!_wifiLabel) { - _wifiLabel = [[UILabel alloc] init]; - _wifiLabel.font = [UIFont systemFontOfSize:15]; - _wifiLabel.textColor = [UIColor whiteColor]; - _wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController5"); - } - return _wifiLabel; -} - -- (UILabel *)ipLabel { - if (!_ipLabel) { - _ipLabel = [[UILabel alloc] init]; - _ipLabel.font = [UIFont systemFontOfSize:15]; - _ipLabel.textColor = [DJDKMIMOMColor appEmphasizeColor]; - _ipLabel.textAlignment = NSTextAlignmentCenter; - } - return _ipLabel; -} - -- (UILabel *)singleTypeLabel { - if (!_singleTypeLabel) { - _singleTypeLabel = [[UILabel alloc] init]; - _singleTypeLabel.font = [UIFont systemFontOfSize:15]; - _singleTypeLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _singleTypeLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController15"); - _singleTypeLabel.numberOfLines = 0; - _singleTypeLabel.textAlignment = NSTextAlignmentCenter; - } - return _singleTypeLabel; -} - -- (UIImageView *)computerImageView { - if (!_computerImageView) { - _computerImageView = [[UIImageView alloc] init]; - _computerImageView.userInteractionEnabled = YES; - _computerImageView.image = [UIImage getLanguageImage:@"room_music_transfer_computer"]; - } - return _computerImageView; -} - -- (UILabel *)descriptionLabel { - if (!_descriptionLabel) { - _descriptionLabel = [[UILabel alloc] init]; - _descriptionLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _descriptionLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController16"); - _descriptionLabel.font = [UIFont systemFontOfSize:13]; - _descriptionLabel.numberOfLines = 0; - _descriptionLabel.textAlignment = NSTextAlignmentCenter; - } - return _descriptionLabel; -} - -- (UIButton *)musicCountButton { - if (!_musicCountButton) { - _musicCountButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_musicCountButton setTitle:YMLocalizedString(@"XPRoomTransferMusicViewController17") forState:UIControlStateNormal]; - [_musicCountButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _musicCountButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_musicCountButton setBackgroundColor:[UIColor colorWithWhite:0 alpha:0.4]]; - _musicCountButton.layer.masksToBounds = YES; - _musicCountButton.layer.cornerRadius = 35/2; - } - return _musicCountButton; -} - -- (UIButton *)copyButton { - if (!_copyButton) { - _copyButton = [[UIButton alloc] init]; - [_copyButton setTitle:YMLocalizedString(@"XPRoomTransferMusicViewController19") forState:UIControlStateNormal]; - [_copyButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal]; - _copyButton.titleLabel.font = [UIFont systemFontOfSize:16]; - [_copyButton addTarget:self action:@selector(didTapCopyButton) forControlEvents:UIControlEventTouchUpInside]; - _copyButton.layer.cornerRadius = 45/2; - _copyButton.layer.masksToBounds = YES; - [_copyButton setBackgroundColor:[DJDKMIMOMColor alertBackgroundColor]]; - } - return _copyButton; -} - -- (UIButton *)saveButton { - if (!_saveButton) { - _saveButton = [[UIButton alloc] init]; - [_saveButton setTitle:YMLocalizedString(@"XPRoomTransferMusicViewController18") forState:UIControlStateNormal]; - [_saveButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - _saveButton.titleLabel.font = [UIFont systemFontOfSize:16]; - [_saveButton addTarget:self action:@selector(saveButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _saveButton.layer.cornerRadius = 45/2; - _saveButton.layer.masksToBounds = YES; - [_saveButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _saveButton; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.h b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.h deleted file mode 100644 index 6084f00..0000000 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomAnchorRankEnterView.h -// YUMI -// -// Created by YUMI on 2022/5/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomAnchorRankEnterView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m deleted file mode 100644 index 8a61b19..0000000 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m +++ /dev/null @@ -1,100 +0,0 @@ -// -// YMRoomAnchorRankEnterView.m -// YUMI -// -// Created by YUMI on 2022/5/12. -// - -#import "XPRoomAnchorRankEnterView.h" -///Third -#import -#import "DJDKMIMOMColor.h" -///Tool -#import "NetImageView.h" - -@interface XPRoomAnchorRankEnterView () - -///背景图 -@property (nonatomic, strong) UIImageView *bgImageView; -/// -@property (nonatomic, strong) UILabel *titleLabel; -///图标 -@property (nonatomic, strong) UIImageView *iconImageView; - -@end - - -@implementation XPRoomAnchorRankEnterView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -- (void)layoutSubviews { - [super layoutSubviews]; - CAGradientLayer *layer = [CAGradientLayer new]; - layer.colors=@[(__bridge id)UIColorRGBAlpha(0x2B00CA, 0.55).CGColor,(__bridge id)UIColorRGBAlpha(0x170ACD, 0.2).CGColor]; - layer.startPoint = CGPointMake(0, 0); - layer.endPoint = CGPointMake(1, 0); - layer.frame = self.bounds; - [self.bgImageView.layer addSublayer:layer]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.iconImageView]; -} - -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.leading.trailing.mas_equalTo(0); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self.iconImageView.mas_trailing).mas_offset(4); - make.trailing.mas_equalTo(-kGetScaleWidth(0)); - }]; - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(22); - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(0); - }]; -} - -#pragma mark - Getters And Setters -- (UIImageView *)bgImageView { - if (_bgImageView == nil) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.layer.cornerRadius = 11; - _bgImageView.layer.masksToBounds = YES; - } - return _bgImageView; -} - -- (UIImageView *)iconImageView { - if (_iconImageView == nil) { - _iconImageView = [[UIImageView alloc] init]; - _iconImageView.image = [UIImage imageNamed:@"anchor_hourRank_btn"]; - _iconImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _iconImageView; -} - -- (UILabel *)titleLabel { - if (_titleLabel == nil) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = UIColor.whiteColor; - _titleLabel.font = [UIFont systemFontOfSize:9 weight:UIFontWeightMedium]; - _titleLabel.text = YMLocalizedString(@"XPRoomAnchorRankEnterView0"); - _titleLabel.numberOfLines = 2; - - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomBackContainerView.h b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomBackContainerView.h deleted file mode 100644 index 752876b..0000000 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomBackContainerView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMRoomBaseUIView.h -// YUMI -// -// Created by YUMI on 2021/10/11. -// - -#import -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomBackContainerView : UIView -- (instancetype)initWithdelegate:(id)delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomBackContainerView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomBackContainerView.m deleted file mode 100644 index 42c55fa..0000000 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomBackContainerView.m +++ /dev/null @@ -1,178 +0,0 @@ -// -// YMRoomBaseUIView.m -// YUMI -// -// Created by YUMI on 2021/10/11. -// 最下面的View - -#import "XPRoomBackContainerView.h" -///Third -#import -#import -///Model -#import "RoomInfoModel.h" -//SVGA动画播放 -#import "SVGA.h" -#import "SVGAParserManager.h" -///Tool -#import "YUMIMacroUitls.h" -#import "XNDJTDDLoadingTool.h" -#import "NetImageView.h" - -@interface XPRoomBackContainerView () -///背景图片 -@property (nonatomic,strong) NetImageView *backImageView; -///动态背景 -@property (nonatomic, strong) SVGAImageView *svgDisplayView; -@property (nonatomic, strong) SVGAParserManager *parserManager; -///host 代理 -@property (nonatomic,weak) iddelegate; - -@end - -@implementation XPRoomBackContainerView - -- (instancetype)initWithdelegate:(id)delegate { - self = [super init]; - if (self) { - self.delegate = delegate; - [self initSubViews]; - [self initSubViewConstraints]; - self.clipsToBounds = YES; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self addSubview:self.svgDisplayView]; -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; -} - -- (void)onRoomEntered { - [self updateRoomBg]; -} - -- (void)onRoomUpdate { - [self updateRoomBg]; -} - -- (void)updateRoomBg { - RoomInfoModel *roomInfo = [self.delegate getRoomInfo]; - if (roomInfo.backPic.length > 0) { - ///MARK:更改图片拉伸策略 BY lvjunhang, 2018-12-03,原值为：UIViewContentModeScaleAspectFit - self.backImageView.contentMode = UIViewContentModeScaleAspectFill; - if ([roomInfo.backPic containsString:@".svga"]) { //房间背景是SVGA动态背景 - - @weakify(self); - [self.parserManager loadSvgaWithURL:[NSURL URLWithString:[roomInfo.backPic stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @strongify(self); - if (videoItem != nil) { - self.svgDisplayView.hidden = NO; - CGFloat width = videoItem.videoSize.width; - CGFloat height = videoItem.videoSize.height; - if (width > height) { - self.svgDisplayView.contentMode = UIViewContentModeScaleAspectFit; - } else {//高大于宽 - CGFloat resizeH = KScreenWidth * height / width;//按照屏幕的宽度去缩放，获得高度 - if (resizeH > KScreenHeight) {//如果大于屏幕高度，填充 - self.svgDisplayView.contentMode = UIViewContentModeScaleAspectFill; - } else {//小于屏幕高度， - self.svgDisplayView.contentMode = UIViewContentModeScaleAspectFit; - } - } - self.svgDisplayView.loops = INT_MAX; - self.svgDisplayView.clearsAfterStop = NO; - self.svgDisplayView.videoItem = videoItem; - [self.svgDisplayView startAnimation]; - } - } failureBlock:^(NSError * _Nullable error) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomBackContainerView0")]; - }]; - } else { //房间背景是静态背景 - [self.svgDisplayView stopAnimation]; - self.svgDisplayView.hidden = YES; - self.backImageView.imageUrl = roomInfo.backPic; - } - }else { //没有设置背景，显示默认背景加高斯模糊 - if (roomInfo.type == RoomType_Anchor) { - self.svgDisplayView.hidden = NO; - @weakify(self); - NSString * bgString = [NSString stringWithFormat:@"%@/anchor_room_bg.svga", API_Image_URL]; - NSURL *bgUrl = [NSURL URLWithString:bgString]; - [self.parserManager loadSvgaWithURL:bgUrl completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @strongify(self); - if (videoItem != nil) { - CGFloat width = videoItem.videoSize.width; - CGFloat height = videoItem.videoSize.height; - if (width > height) { - self.svgDisplayView.contentMode = UIViewContentModeScaleAspectFit; - } else {//高大于宽 - CGFloat resizeH = KScreenWidth * height / width;//按照屏幕的宽度去缩放，获得高度 - if (resizeH > KScreenHeight) {//如果大于屏幕高度，填充 - self.svgDisplayView.contentMode = UIViewContentModeScaleAspectFill; - } else {//小于屏幕高度， - self.svgDisplayView.contentMode = UIViewContentModeScaleAspectFit; - } - } - self.svgDisplayView.loops = INT_MAX; - self.svgDisplayView.clearsAfterStop = NO; - self.svgDisplayView.videoItem = videoItem; - [self.svgDisplayView startAnimation]; - } - } failureBlock:^(NSError * _Nullable error) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomBackContainerView1")]; - }]; - return; - } - self.backImageView.image = [[UIImage imageNamed:@"room_background"]ms_SetImageForRTL]; - [self.svgDisplayView stopAnimation]; - self.svgDisplayView.hidden = YES; - self.backImageView.contentMode = UIViewContentModeScaleAspectFill; - } -} - -#pragma mark - Getters And Setters -- (NetImageView *)backImageView { - if (!_backImageView) { - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [[UIImage imageNamed:@"room_background"]ms_SetImageForRTL]; - _backImageView = [[NetImageView alloc] initWithConfig:config]; - _backImageView.userInteractionEnabled = YES; - -\ - _backImageView.layer.masksToBounds = YES; - _backImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _backImageView; -} - -- (SVGAImageView *)svgDisplayView { - if (_svgDisplayView == nil) { - _svgDisplayView = [[SVGAImageView alloc]init]; - _svgDisplayView.contentMode = UIViewContentModeScaleToFill; - _svgDisplayView.userInteractionEnabled = NO; - _svgDisplayView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - _svgDisplayView.hidden = YES; - _svgDisplayView.backgroundColor = [UIColor clearColor]; - } - return _svgDisplayView; -} - -- (SVGAParserManager *)parserManager { - if (!_parserManager) { - _parserManager = [[SVGAParserManager alloc]init]; - } - return _parserManager; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.h b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.h deleted file mode 100644 index 3dc5c17..0000000 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomDatingVipUpMicView.h -// YUMI -// -// Created by YUMI on 2022/1/4. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomDatingVipUpMicView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.m deleted file mode 100644 index a7f7696..0000000 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.m +++ /dev/null @@ -1,107 +0,0 @@ -// -// YMRoomDatingVipUpMicView.m -// YUMI -// -// Created by YUMI on 2022/1/4. -// - -#import "XPRoomDatingVipUpMicView.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" - -@interface XPRoomDatingVipUpMicView () -///背景 -@property (nonatomic,strong) UIImageView *backImageView; -///显示内容 -@property (nonatomic,strong) SZTextView *contentView; -///关闭按钮 -@property (nonatomic,strong) UIButton *closeButton; -@end - -@implementation XPRoomDatingVipUpMicView -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - for (id view in self.contentView.subviews) { - if ([view isKindOfClass:[UITextView class]]){ - UITextView *textView = view; - textView.textAlignment = NSTextAlignmentLeft; - break; - } - } - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self addSubview:self.contentView]; - [self addSubview:self.closeButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(260); - make.height.mas_equalTo(325 + 55); - }]; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.trailing.mas_equalTo(self); - make.height.mas_equalTo(325); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(44); - make.leading.mas_equalTo(16); - make.centerX.mas_equalTo(self.backImageView); - make.height.mas_equalTo(271); - }]; - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.backImageView.mas_bottom).offset(20); - make.centerX.mas_equalTo(self); - make.width.height.mas_equalTo(35); - }]; -} - -#pragma mark - Event Response -- (void)closeButtonAction:(UIButton *)sender { - [TTPopup dismiss]; -} - -#pragma mark - Getters And Setters -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.image = [UIImage getLanguageImage:@"room_mode_dating_vip_rule_bg"]; - } - return _backImageView; -} - -- (SZTextView *)contentView { - if (!_contentView) { - _contentView = [[SZTextView alloc] init]; - _contentView.text = YMLocalizedString(@"XPRoomDatingVipUpMicView0"); - _contentView.backgroundColor = [UIColor clearColor]; - _contentView.textColor = UIColorFromRGB(0xFFF9BC); - _contentView.font = [UIFont systemFontOfSize:12]; - } - return _contentView; -} - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [[UIButton alloc] init]; - [_closeButton setImage:[UIImage imageNamed:@"room_mode_dating_alert_close"] forState:UIControlStateNormal]; - [_closeButton addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingWebAlertView.h b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingWebAlertView.h deleted file mode 100644 index b672e4d..0000000 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingWebAlertView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMRoomDatingWebAlertView.h -// YUMI -// -// Created by YUMI on 2022/1/4. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomDatingWebAlertView : UIView -///需要打开的url -@property (nonatomic,copy) NSString *url; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingWebAlertView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingWebAlertView.m deleted file mode 100644 index f6a1945..0000000 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingWebAlertView.m +++ /dev/null @@ -1,114 +0,0 @@ -// -// YMRoomDatingWebAlertView.m -// YUMI -// -// Created by YUMI on 2022/1/4. -// - -#import "XPRoomDatingWebAlertView.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "TTPopup.h" -#import "UIButton+EnlargeTouchArea.h" -///View -#import "XPWebViewController.h" - -static CGFloat const kContentAspectRatio = 2/3.f; - -@interface XPRoomDatingWebAlertView () -///导航栏 -@property (nonatomic,strong) UIImageView *backImageView; -///显示webView -@property (nonatomic, strong) XPWebViewController *webVC; -///关闭按钮 -@property (nonatomic, strong) UIButton *closeButton; -@end - -@implementation XPRoomDatingWebAlertView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initView]; - [self initContrations]; - } - return self; -} - -- (void)initView { - [self addSubview:self.backImageView]; - [self addSubview:self.closeButton]; - [self.backImageView addSubview:self.webVC.view]; - -} - -- (void)initContrations { - CGFloat kscale = 351/315;///宽和高的比 - CGFloat height = (KScreenWidth - 60) * kscale; - - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth-60); - make.height.mas_equalTo(height + 55); - }]; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - make.height.mas_equalTo(height); - }]; - - [self.webVC.view mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backImageView).inset(30); - make.bottom.mas_equalTo(self.backImageView).offset(-20); - make.top.mas_equalTo(self.backImageView).offset(45); - }]; - - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(35, 35)); - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.backImageView.mas_bottom).offset(22); - }]; -} - -#pragma mark - Action -- (void)didClickCloseButton { - [TTPopup dismiss]; -} - -#pragma mark - Lazy Load -- (void)setUrl:(NSString *)url { - if (url) { - self.webVC.url = url; - } -} - - -- (XPWebViewController *)webVC { - if (_webVC == nil) { - _webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - _webVC.view.backgroundColor = UIColor.clearColor; - } - return _webVC; -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.image = [UIImage getLanguageImage:@"room_mode_dating_background"]; - _backImageView.userInteractionEnabled = YES; - } - return _backImageView; -} - -- (UIButton *)closeButton { - if (_closeButton == nil) { - _closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeButton setImage:[UIImage imageNamed:@"room_mode_dating_alert_close"] forState:UIControlStateNormal]; - [_closeButton addTarget:self action:@selector(didClickCloseButton) forControlEvents:UIControlEventTouchUpInside]; - [_closeButton enlargeTouchArea:UIEdgeInsetsMake(10, 10, 10, 10)]; - } - return _closeButton; -} -@end diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.h b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.h deleted file mode 100644 index 395ebf8..0000000 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// YMRoomFunctionContainerView.h -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" -#import "RoomInfoModel.h" -NS_ASSUME_NONNULL_BEGIN -@class Music; -@interface XPRoomFunctionContainerView : UIView -///是否第一次更新在线人数 -@property(nonatomic,assign) BOOL isFirstUpdate; -- (instancetype)initWithDelegate:(id)delegate; -- (void)hiddenSudGamePostionView; -///获取当前的音乐 -- (Music *)getCurrentMusic; -///是否正在播放 -- (BOOL)isPlaying; -///获取房间PK队伍的 -- (NSArray *)getRoomPKGroupTeamList; -///房间内PK是否正在进行 -- (BOOL)isRoomPKPlaying; -///更新在线人数 --(void)updateOnlineCount:(NSString *)count countList:(NSArray *)countList isUpdateCount:(BOOL)isUpdateCount; - -- (void)showPKPanelView; - -- (void)showMusicPanel; - -// 处理主动传递的点击事件 -- (void)onlineTapRecognizer; -- (void)tapFansTeamRecognizer; -- (void)contributionButtonAction:(UITapGestureRecognizer *)tap; -- (void)onAnchorHourRankButtonAction:(UITapGestureRecognizer *)ges; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m deleted file mode 100644 index 6336fbb..0000000 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m +++ /dev/null @@ -1,1899 +0,0 @@ -// -// YMRoomFunctionContainerView.m -// YUMI -// -// Created by YUMI on 2021/12/15. -// - -#import "XPRoomFunctionContainerView.h" -///Third -#import -#import -#import -#import -///Tool -#import "YUMIMacroUitls.h" -#import "AccountInfoStorage.h" -#import "UIImage+Utils.h" -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" -#import "Api+Room.h" -#import "XNDJTDDLoadingTool.h" -#import "YUMIHtmlUrl.h" -#import "Api+Mine.h" -#import "ClientConfig.h" -#import "XCCurrentVCStackManager.h" -#import "YUMIConstant.h" -#import "Api+RoomSetting.h" -#import "RtcManager.h" -#import "XPRoomMiniManager.h" -#import "Api+RoomPK.h" -#import "Api+Room.h" -#import "NSObject+MJExtension.h" -#import "NSArray+Safe.h" -#import "NSMutableDictionary+Saft.h" -#import "ClientConfig.h" -///Model -#import "RoomInfoModel.h" -#import "MicroQueueModel.h" -#import "UserInfoModel.h" -#import "AttachmentModel.h" -#import "GiftValueInfoModel.h" -#import "AcrossRoomPKPanelModel.h" -#import "XPAnchorFansRelationModel.h" -#import "XPAnchorFansJoinModel.h" -#import "XPAnchorFansTaskModel.h" -#import "AcrossRoomPKPanelModel.h" -#import "RoomPKDetailInfoModel.h" -#import "RoomPKChooseUserModel.h" -#import "GiftReceiveInfoModel.h" -#import "GiftInfoModel.h" -#import "RoomPKTeamModel.h" -#import "RoomNewUserGreetModel.h" -///View -#import "XPRoomHalfWebView.h" -#import "XPAnchorAudienceUpMicView.h" -#import "XPRoomAnchorInfoCardView.h" -#import "XPRoomTopicViewController.h" -#import "XPRoomTopicAlertView.h" -#import "XPAcrossRoomPKInviteView.h" -#import "XPAcrossRoomPKInviteResultView.h" -#import "XPAcrossRoomPKPanelView.h" -#import "XPAcrossRoomPKResultView.h" -#import "XPAcrossRoomPKForceEndResultView.h" -#import "XPAnchorPKInviteView.h" -#import "XPAnchorPKResultView.h" -#import "XPAnchorPKFinishView.h" -#import "XPSendGiftView.h" -#import "UserRoomCardViewController.h" -#import "XPRoomViewController.h" -#import "AcrossRoomPKPrizeModel.h" -#import "XPMineUserInfoViewController.h" - -#import "XPRoomRankEntranceView.h" -#import "XPRoomAnchorRankEnterView.h" -#import "XPRoomBackMusicPlayerView.h" -#import "XPRoomNewUserGreetView.h" -#import "XPRoomHalfMessageView.h" -#import "XPAcrossRoomPKCountDownView.h" -#import "XPNewUserRoomGiftView.h" -///个播PK -#import "XPAnchorFansTeamEntranceView.h" -#import "XPAnchorFansTeamViewController.h" -#import "XPAnchorFansTaskViewController.h" -#import "XPAnchorPkPanelView.h" -#import "XPWebViewController.h" -#import "XPAnchorPKMatchView.h" - -#import "XPRoomOnLineViewController.h" -#import "XPRoomTrumpetView.h" -#import "LittleGameInfoModel.h" -#import "XPLittleGameMiniStageView.h" -#import "XPLittleGameRoomListView.h" -#import "MSRoomOnLineView.h" - -#import "XPRoomPKPanelView.h" - -@interface XPRoomFunctionContainerView () -///host 代理 -@property (nonatomic,weak) iddelegate; -///榜单容器 -@property(nonatomic,strong) UIStackView *rankStackView; -///房间榜 -@property (nonatomic,strong) XPRoomRankEntranceView *contributeEnterView; -///相亲阶段的按钮 -@property (nonatomic,strong) UIButton *datingProgresButton; -///小游戏 最小化的坑位 -@property (nonatomic,strong) XPLittleGameMiniStageView *littleGameMiniView; -///显示游戏的切换 -@property (nonatomic,strong) XPLittleGameRoomListView *gameListView; -///关注个播房主倒计时 -@property (nonatomic, strong) dispatch_source_t followAnchorTimer; -///个播粉丝团入口 -@property (nonatomic, strong) XPAnchorFansTeamEntranceView *fansTeamEntranceView; -///个播小时榜入口按钮 -@property (nonatomic, strong) XPRoomAnchorRankEnterView *hourRankEntranceView; -///跨房pk的面板 -@property (nonatomic,strong) XPAcrossRoomPKPanelView *acrossPKPanelView; -///跨房PK预约倒计时 -@property (nonatomic, strong) XPAcrossRoomPKCountDownView *acrossPKCountView; -///个播PK匹配 -@property (nonatomic, strong) XPAnchorPKMatchView *anchorPKMatchView; -///粉丝团数据 -@property (nonatomic, strong) XPAnchorFansRelationModel *relationFansModel; -///个播PK面板 -@property (nonatomic, strong) XPAnchorPkPanelView *anchorPKPanelView; -///小喇叭 -@property (nonatomic, strong) XPRoomTrumpetView *trumpetView; -///小喇叭队列 -@property (nonatomic, strong) NSMutableArray *trumpetQueue; -///小喇叭动画定时器 -@property (nonatomic, strong) dispatch_source_t trumpetTimer; -///播放器的入口 -@property (nonatomic,strong) UIButton *musicEnterButton; -///播放器 -@property (nonatomic,strong) XPRoomBackMusicPlayerView *musicPlayView; -///pk详情 -@property (nonatomic,strong) RoomPKDetailInfoModel *pkDetailInfo; -///是否正在加载打招呼 -@property (nonatomic,assign) BOOL isLoadGreet; -///获取新用户礼物倒计时3s -@property (nonatomic, strong) dispatch_source_t userGiftTimer; - -///在线人数 -@property(nonatomic,strong) MSRoomOnLineView *onlineView; -// 房间PK面板 -@property(nonatomic, strong) XPRoomPKPanelView *pkPanelView; - -@end - -@implementation XPRoomFunctionContainerView - -- (void)dealloc { - if (self.followAnchorTimer != nil) { - dispatch_source_cancel(self.followAnchorTimer); - } - if (self.trumpetTimer != nil) { - dispatch_source_cancel(self.trumpetTimer); - } - if (self.userGiftTimer != nil) { - dispatch_source_cancel(self.userGiftTimer); - } - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (instancetype)initWithDelegate:(id)delegate { - self = [super init]; - if (self) { - self.delegate = delegate; - [self initSubViews]; - [self initSubViewConstraints]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(beginMatchAnchorPK:) name:@"anchorPKMatchBegin" object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleTapToFunctionContainer:) name:@"BannerTapToFunctionContainer" object:nil]; - } - return self; -} - -- (void)handleTapToFunctionContainer:(NSNotification *)note { - NSValue *tapPointValue = note.userInfo[@"point"]; -// UIView *bannerContainer = note.userInfo[@"gesture container"]; - - if (!tapPointValue) { - return; - } - - CGPoint tapPoint = [tapPointValue CGPointValue]; - - // 将 bannerContainer 中的点转换为 FunctionContainer 坐标系中的点 - CGPoint convertedPoint = [self convertPoint:tapPoint fromView:nil]; - - NSLog(@"�� 坐标转换: 原始点 %@ -> 转换后点 %@", NSStringFromCGPoint(tapPoint), NSStringFromCGPoint(convertedPoint)); - - // 检查点是否与各个功能视图重合 - [self checkPointIntersectionWithSubviews:convertedPoint]; -} - -- (void)checkPointIntersectionWithSubviews:(CGPoint)point { - // 检查 contributeEnterView - if (self.contributeEnterView && !self.contributeEnterView.hidden) { - CGPoint contributePoint = [self.contributeEnterView convertPoint:point fromView:self]; - if (CGRectContainsPoint(self.contributeEnterView.bounds, contributePoint)) { - NSLog(@"🎯 点击位置与 contributeEnterView 重合，触发贡献榜事件"); - [self contributionButtonAction:nil]; - return; - } - } - - // 检查 onlineView - if (self.onlineView && !self.onlineView.hidden) { - CGPoint onlinePoint = [self.onlineView convertPoint:point fromView:self]; - if (CGRectContainsPoint(self.onlineView.bounds, onlinePoint)) { - NSLog(@"🎯 点击位置与 onlineView 重合，触发在线人数事件"); - [self onlineTapRecognizer]; - return; - } - } - - // 检查 hourRankEntranceView - if (self.hourRankEntranceView && !self.hourRankEntranceView.hidden) { - CGPoint hourRankPoint = [self.hourRankEntranceView convertPoint:point fromView:self]; - if (CGRectContainsPoint(self.hourRankEntranceView.bounds, hourRankPoint)) { - NSLog(@"🎯 点击位置与 hourRankEntranceView 重合，触发小时榜事件"); - [self onAnchorHourRankButtonAction:nil]; - return; - } - } - - // 检查 fansTeamEntranceView - if (self.fansTeamEntranceView && !self.fansTeamEntranceView.hidden) { - CGPoint fansTeamPoint = [self.fansTeamEntranceView convertPoint:point fromView:self]; - if (CGRectContainsPoint(self.fansTeamEntranceView.bounds, fansTeamPoint)) { - NSLog(@"🎯 点击位置与 fansTeamEntranceView 重合，触发粉丝团事件"); - [self tapFansTeamRecognizer]; - return; - } - } - - // 检查 musicEnterButton - if (self.musicEnterButton && !self.musicEnterButton.hidden) { - CGPoint musicPoint = [self.musicEnterButton convertPoint:point fromView:self]; - if (CGRectContainsPoint(self.musicEnterButton.bounds, musicPoint)) { - NSLog(@"🎯 点击位置与 musicEnterButton 重合，触发音乐播放器事件"); - [self musicEnterButtonAction:self.musicEnterButton]; - return; - } - } - - // 检查 trumpetView（如果存在且可见） - if (self.trumpetView && !self.trumpetView.hidden) { - CGPoint trumpetPoint = [self.trumpetView convertPoint:point fromView:self]; - if (CGRectContainsPoint(self.trumpetView.bounds, trumpetPoint)) { - NSLog(@"�� 点击位置与 trumpetView 重合，触发小喇叭事件"); - // 这里需要根据 trumpetView 的具体实现来触发相应事件 - return; - } - } - - NSLog(@"❌ 点击位置未与任何功能视图重合"); -} - -- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event { - // 先检查自身状态 - if (!self.userInteractionEnabled || self.hidden || self.alpha <= 0.01) { - return nil; - } - - // 从后往前遍历子视图，检查是否有子视图能响应 - for (NSInteger i = (self.subviews.count - 1) ; i >= 0 ; i--) { - UIView *subView = [self.subviews xpSafeObjectAtIndex:i]; - if (!subView) continue; - - CGPoint convertPoint = [subView convertPoint:point fromView:self]; - - // 只有点击在子视图的实际区域内才继续处理 - if (CGRectContainsPoint(subView.bounds, convertPoint)) { - UIView *hitTestView = [subView hitTest:convertPoint withEvent:event]; - if (hitTestView) { - // 保留音乐播放器的特殊逻辑 - if (self.musicPlayView.superview && self.musicEnterButton.hidden == YES && ![subView isEqual:self.musicPlayView]) { - [UIView animateWithDuration:0.2 animations:^{ - self.musicEnterButton.hidden = NO; - } completion:nil]; - - POPBasicAnimation *moveAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewCenter]; - moveAnimation.fromValue = [NSValue valueWithCGPoint:self.musicPlayView.center]; - moveAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(-KScreenWidth, self.musicPlayView.center.y)]; - moveAnimation.beginTime = CACurrentMediaTime(); - moveAnimation.duration = 0.5; - moveAnimation.repeatCount = 1; - moveAnimation.removedOnCompletion = YES; - [self.musicPlayView pop_addAnimation:moveAnimation forKey:@"moveOutAnimation"]; - } - - return hitTestView; - } - } - } - - // 如果没有子视图能响应，返回 nil 实现点击穿透 - return nil; -} -#pragma mark - Public Method -- (void)hiddenSudGamePostionView { - if (self.delegate.getRoomInfo.mgMicNum > 6) { - return; - } - [self.littleGameMiniView hiddenSudGamePostionView]; -} -#pragma mark - Public Method - -- (Music *)getCurrentMusic { - return self.musicPlayView.currentMusic; -} - -- (BOOL)isPlaying { - return self.musicPlayView.isPlaying; -} - - -- (NSArray *)getRoomPKGroupTeamList { - NSArray * redArray = @[]; - if (self.pkPanelView.redChooseArray > 0) { - redArray = self.pkPanelView.redChooseArray; - } - - NSArray * blueArray = @[]; - if (self.pkPanelView.blueChooseArray > 0) { - blueArray = self.pkPanelView.blueChooseArray; - } - return @[redArray, blueArray]; -} - -///房间内PK是否正在进行 -- (BOOL)isRoomPKPlaying { - return [self.pkPanelView isRoomPKPlaying]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.rankStackView]; - [self addSubview:self.onlineView]; - - [self.rankStackView addArrangedSubview:self.hourRankEntranceView]; - [self.rankStackView addArrangedSubview:self.contributeEnterView]; - [self.rankStackView addArrangedSubview:self.musicEnterButton]; - - self.musicEnterButton.hidden = YES; - self.hourRankEntranceView.hidden = YES; -} - -- (void)initSubViewConstraints { - - [self.rankStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(12); - make.top.mas_equalTo(kNavigationHeight+4); - make.height.mas_equalTo(27); - }]; - - [self.hourRankEntranceView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(66); - make.height.mas_equalTo(27); - }]; - - [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(27); - }]; - - [self.contributeEnterView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(27); - make.width.mas_greaterThanOrEqualTo(50); - }]; - - [self.onlineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-6); - make.height.mas_equalTo(24); - make.width.mas_equalTo(110); - make.centerY.equalTo(self.rankStackView); - }]; -} - -- (void)configLittleGameState { - RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - - if (roomInfo.isPermitRoom != PermitRoomType_License && - roomInfo.roomModeType != RoomModeType_Open_Blind && - roomInfo.roomModeType != RoomModeType_Open_PK_Mode && - roomInfo.roomModeType != RoomModeType_Open_AcrossRoomPK_mode && - roomInfo.roomModeType != RoomModeType_Open_Micro_Mode && - !roomInfo.leaveMode && roomInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - if (!self.gameListView.superview) { - [self addSubview:self.gameListView]; - [self.gameListView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self).offset(-45); - make.top.mas_equalTo(self).offset(kNavigationHeight - 14 - 11 - 19.0 / 2.0); - }]; - } - self.gameListView.mgId = roomInfo.mgId > 0 ? [NSString stringWithFormat:@"%lld", roomInfo.mgId] : @"0"; - } else { - if (self.gameListView.superview) { - [self.gameListView removeFromSuperview]; - } - } -} -//自己是否在游戏中 -- (BOOL)isInSudGame { - BOOL isGamePlaying = NO; - if (self.delegate.getRoomInfo.type == RoomType_MiniGame) { - for (int i = -1; i<5; i++) { - NSMutableDictionary * micQueue = self.delegate.getMicroQueue; - MicroQueueModel *micSequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i]]; - if (micSequence == nil || micSequence.userInfo == nil) { - continue; - } - if (micSequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue && micSequence.userInfo.gameStatus == LittleGamePlayStatus_Plying) { - isGamePlaying = YES; - break; - } - } - } - return isGamePlaying; -} - -///当前房间是否在游戏中 -- (BOOL)currentRoomIsInSudGame { - BOOL isGamePlaying = NO; - if (self.delegate.getRoomInfo.type == RoomType_MiniGame) { - for (int i = -1; i<5; i++) { - NSMutableDictionary * micQueue = self.delegate.getMicroQueue; - MicroQueueModel *micSequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i]]; - if (micSequence == nil || micSequence.userInfo == nil) { - continue; - } - if (micSequence.userInfo.gameStatus == LittleGamePlayStatus_Plying) { - isGamePlaying = YES; - break; - } - } - } - return isGamePlaying; -} -#pragma mark - 新用户打招呼动画 -- (void)handleNewUserGreet { - if (self.delegate.getUserInfo.fromType == UserEnterRoomFromType_New_User_Greet && !self.isLoadGreet) { - self.isLoadGreet = YES; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.uid]; - [Api newUserStartGreet:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - RoomNewUserGreetModel * info = [RoomNewUserGreetModel modelWithDictionary:data.data]; - if (info.roomPopup) { - XPRoomNewUserGreetView * greetView = [[XPRoomNewUserGreetView alloc] initWithFrame:CGRectMake(KScreenWidth, kSafeAreaTopHeight + 52, KScreenWidth, 80)]; - greetView.delegate = self; - greetView.sayHelloUserAvatarList = info.sayHelloUserAvatarList; - [self addSubview:greetView]; - [UIView animateWithDuration:.35 animations:^{ - CGRect rect = greetView.frame; - rect.origin.x = 0; - greetView.frame = rect; - } completion:nil]; - } - } - } roomUid:roomUid]; - }); - } -} - -- (void)xPRoomNewUserGreetView:(XPRoomNewUserGreetView *)view didClickCheckout:(UIButton *)sender { - UIViewController * controller = (UIViewController *)self.delegate; - XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight) controller:controller]; - [controller.view addSubview:halfMessageView]; - [UIView animateWithDuration:.35 animations:^{ - CGRect rect = halfMessageView.frame; - rect.origin.y = 0; - halfMessageView.frame = rect; - }]; -} - -#pragma mark - DJ 抓个Beat -- (void)showMusicPanel { - [self addSubview:self.musicPlayView]; - [self bringSubviewToFront:self.musicPlayView]; - self.musicPlayView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, 200); - - [UIView animateWithDuration:0.25 animations:^{ - self.musicPlayView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - } completion:nil]; -} - -#pragma mark - 房间PK -// MARK: ----- 修改开始 -- (void)showPKPanelView { - [self showPKPanel_]; -} -- (void)showPKPanel_ { - if (self.pkPanelView.superview) { - return; - } - [self addSubview:self.pkPanelView]; -} - -- (void)removePKPanel_ { - if (_pkPanelView) { - [self.pkPanelView removeFromSuperview]; - self.pkPanelView = nil; - } -} -// MARK: ----- 修改结束 -- (void)configRoomPKPanelView:(BOOL)isEnter{ - RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - if (roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - - self.pkPanelView.roomInfo = roomInfo; - if (self.pkPanelView.isPanelMinion == NO) { - [self showPKPanel_]; - } - - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - NSString * uid = [AccountInfoStorage instance].getUid; - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = roomId; - request.userIds = @[uid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember * member = members.firstObject; - self.pkPanelView.isManager = (member.type == NIMChatroomMemberTypeCreator || member.type == NIMChatroomMemberTypeManager); - if (isEnter) { - [self.pkPanelView enterRoomGetRoomPKDetailInfo]; - } - } - }]; - } else { - [self removePKPanel_]; - } -} - -#pragma mark - 个播PK -- (void)beginMatchAnchorPK:(NSNotification *)noti { - if (!self.anchorPKMatchView.superview) { - [self addSubview:self.anchorPKMatchView]; - self.anchorPKMatchView.roomUid = [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].uid]; - [self.anchorPKMatchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.rankStackView.mas_bottom).mas_offset(5+37+5); - make.leading.mas_equalTo(0); - make.width.height.mas_equalTo(52); - }]; - NSDictionary *dict = noti.object; - NSNumber *startTime = dict[@"matchPkStartTime"]; - self.delegate.getRoomInfo.pkMatchStartTime = [startTime longLongValue]; - [self.anchorPKMatchView openCountdownWithTime:[startTime longValue]]; - } -} - -#pragma mark - RoomGuestDelegate -- (void)onRoomChange { - if (self.followAnchorTimer != nil) { - dispatch_source_cancel(self.followAnchorTimer); - } - if (self.trumpetTimer != nil) { - dispatch_source_cancel(self.trumpetTimer); - } - if (self.userGiftTimer != nil) { - dispatch_source_cancel(self.userGiftTimer); - } -} -///更新在线人数 --(void)updateOnlineCount:(NSString *)count countList:(NSArray *)countList isUpdateCount:(BOOL)isUpdateCount{ - self.onlineView.count = count; - if(isUpdateCount == NO){ - self.onlineView.avatarList = countList; - } - - self.isFirstUpdate = YES; -} -- (void)onlineTapRecognizer { - XPRoomOnLineViewController *onlineVC = [[XPRoomOnLineViewController alloc] initWithDelegate:self.delegate]; - [self.delegate.getCurrentNav pushViewController:onlineVC animated:YES]; -} -- (void)onRoomUpdate { - RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - - MicroQueueModel * model = [self.delegate.getMicroQueue objectForKey:@"-1"]; - if (roomInfo.roomModeType == RoomModeType_Open_Blind && model.userInfo && model.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - if (!self.datingProgresButton.superview) { - [self addSubview:self.datingProgresButton]; - [self.datingProgresButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(70, 30)); - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self).offset(354 + kSafeAreaTopHeight + 35); - }]; - } - - switch (roomInfo.blindDateState) { - case RoomPlayDateingType_Talk: - [self.datingProgresButton setTitle:YMLocalizedString(@"XPRoomFunctionContainerView0") forState:UIControlStateNormal]; - break; - case RoomPlayDateingType_Pick: - [self.datingProgresButton setTitle:YMLocalizedString(@"XPRoomFunctionContainerView1") forState:UIControlStateNormal]; - break; - case RoomPlayDateingType_Result: - [self.datingProgresButton setTitle:YMLocalizedString(@"XPRoomFunctionContainerView2") forState:UIControlStateNormal]; - break; - case RoomPlayDateingType_Finish: - [self.datingProgresButton setTitle:YMLocalizedString(@"XPRoomFunctionContainerView3") forState:UIControlStateNormal]; - break; - default: - break; - } - } else { - if (self.datingProgresButton.superview) { - [self.datingProgresButton removeFromSuperview]; - } - } - [self updateHourRankEntrance]; - if (roomInfo.type == RoomType_Anchor) { - if (roomInfo.hadChangeRoomType) { - ///切换房间类型初始化当前用户与房间粉丝团关系 - [Api requestInRoomFansTeam:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - XPAnchorFansRelationModel *model = [XPAnchorFansRelationModel modelWithJSON:data.data]; - [self updateFansTeamEntranceView:model]; - } teamUid:[NSString stringWithFormat:@"%ld", roomInfo.uid]]; - [self updateContrionEntranceWithRoomUid:[NSString stringWithFormat:@"%ld", roomInfo.uid] type:@"month"]; - } - } else { - [self.fansTeamEntranceView removeFromSuperview]; - if (roomInfo.hadChangeRoomType) { - [self updateContrionEntranceWithRoomUid:[NSString stringWithFormat:@"%ld", roomInfo.uid] type:@"day"]; - } - } - - [self updateRoomTopic]; - [self configLittleGameState]; - [self configPlayMusicRoomTypeChange]; - [self configRoomPKPanelView:NO]; - ///相亲模式下 隐藏许愿礼物 和vip坑位重叠了 -// [self roomInfoUpdateConfigWishGift]; -} - -- (void)onRoomEntered { - RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - self.contributeEnterView.title = [NSString stringWithFormat:@"%.2f", - roomInfo.serialValue.floatValue];// roomInfo.serialValue.stringValue; - NSString * roomUid = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - [self updateHourRankEntrance]; - if (roomInfo.type == RoomType_Anchor) {//个播房 - ///进房初始化当前用户与房间粉丝团关系 - @kWeakify(self); - [Api requestInRoomFansTeam:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - XPAnchorFansRelationModel *model = [XPAnchorFansRelationModel modelWithJSON:data.data]; - [self updateFansTeamEntranceView:model]; - } teamUid:roomUid]; - [self updateContrionEntranceWithRoomUid:roomUid type:@"month"];//获取房间榜前三名 - } else { - [self updateContrionEntranceWithRoomUid:roomUid type:@"day"];//获取房间榜前三名 - } - if (![[AccountInfoStorage instance].getUid isEqualToString:roomUid]) {//非房主 - NSString * uid = [[AccountInfoStorage instance] getUid]; - @kWeakify(self); - [Api attentionStatusCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {//是否关注了房主 - @kStrongify(self); - BOOL isLike = ((NSNumber *)data.data).boolValue; - if (!isLike && !roomInfo.isRoomFans) { - [self setFollowAnchorTimer]; - } - } uid:uid isLikeUid:roomUid]; - } - if (roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { - [Api getAcrossRoomPKDetail:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:data.data]; - if (data.data[@"amicStatus"] != nil){ - acrossPKPanelInfo.aMicStatus = [data.data[@"amicStatus"] intValue]; - } - - [self updateAnchorPkInfo:acrossPKPanelInfo]; - if (acrossPKPanelInfo.pkType == AcrossRoomPkTypeAnchor) { - if (acrossPKPanelInfo.aUid.integerValue > 0) { - if (!self.anchorPKPanelView.superview) { - [self addSubview:self.anchorPKPanelView]; - [self.anchorPKPanelView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(kNavigationHeight + 87); - }]; - } - self.anchorPKPanelView.pkPanelInfo = acrossPKPanelInfo; - } - } else { - AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:data.data]; - if (data.data[@"amicStatus"] != nil){ - acrossPKPanelInfo.aMicStatus = [data.data[@"amicStatus"] intValue]; - } - if (acrossPKPanelInfo.aUid.integerValue > 0) { - if (!self.acrossPKPanelView.superview) { - [self addSubview:self.acrossPKPanelView]; - [self.acrossPKPanelView startInitUI]; - self.acrossPKPanelView.center = self.center; - } - self.acrossPKPanelView.pkPanelInfo = acrossPKPanelInfo; - } - } - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:roomUid]; - } - if (roomInfo.showPkBeginTime && roomInfo.roomModeType != RoomModeType_Open_AcrossRoomPK_mode) {//显示PK倒计时 - [self handleAcrollPKCountView:roomInfo.pkBeginTime]; - } - [self updateRoomTopic]; - [self configLittleGameState]; - [self configRoomPKPanelView:YES]; - [self handleNewUserGreet]; - - ///随机PK匹配 - [self handleMatchAnchorPK]; -} - -- (void)onRoomMiniEntered { - if ([XPRoomMiniManager shareManager].getCurrentMusic) { -// if (!self.musicPlayView.superview) { -// [self addSubview:self.musicPlayView]; -// self.musicPlayView.frame = CGRectMake(-KScreenWidth, kNavigationHeight + 4, KScreenWidth - 85, 80); -// } - [self.musicPlayView configCurrentPlayingMusic:[XPRoomMiniManager shareManager].getCurrentMusic isPlaying:[XPRoomMiniManager shareManager].musicPlaying]; - [[XPRoomMiniManager shareManager] configCurrentMusic:nil isPlaying:NO]; - } -} - -- (void)updateContributeEnterViewTitle:(AttachmentModel *)attachment { - if (attachment.first == CustomMessageType_MoneyFlow && attachment.second == Custom_Message_Sub_Money_Flow) { - NSNumber *num = [attachment.data objectForKey:@"serialValue"]; - if (num) { - self.contributeEnterView.title = num.stringValue; - } - } -} - -- (void)handleNIMCustomMessage:(NIMMessage *)message { - RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - - [self updateContributeEnterViewTitle:attachment]; - - if (attachment.first == CustomMessageType_AnchorRoom_AudienceUpMic) { - [self showAskForUpMic:attachment.data]; - } else if(attachment.first == CustomMessageType_Gift && (attachment.second == Custom_Message_Sub_Gift_Send || attachment.second == Custom_Message_Sub_Gift_LuckySend || attachment.second == Custom_Message_Sub_Gift_ChannelNotify)) { - if (roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - [self.pkPanelView roomPKReceiveGift:attachment]; - } - }else if(attachment.first == CustomMessageType_AllMicroSend && (attachment.second == Custom_Message_Sub_AllMicroSend || attachment.second == Custom_Message_Sub_AllBatchSend || attachment.second == Custom_Message_Sub_AllMicroLuckySend || attachment.second == Custom_Message_Sub_AllBatchMicroLuckySend)) { - if (roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - [self.pkPanelView roomPKReceiveGift:attachment]; - } - } else if(attachment.first == CustomMessageType_Room_PK) { - [self.pkPanelView handleRoomPKCustomMessage:attachment]; - } else if (attachment.first == CustomMessageType_Across_Room_PK) { - ///自己是公会超管 - BOOL meIsSuperAdmin = NO; - for (GuildSuperAdminInfoModel *managerInfo in self.delegate.getRoomSuperAdminList) { - if ([managerInfo.uid isEqualToString:[AccountInfoStorage instance].getUid]) { - meIsSuperAdmin = YES; - break; - } - } - switch (attachment.second) { - case Custom_Message_Sub_AcrossRoomPK_Invite: - { - [self.acrossPKCountView removeFromSuperview]; - self.acrossPKCountView = nil; - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember * member = [members firstObject]; - if (member.type == NIMChatroomMemberTypeCreator || meIsSuperAdmin) { - XPAcrossRoomPKInviteView * inviteView = [[XPAcrossRoomPKInviteView alloc] init]; - inviteView.roomUid = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.uid]; - inviteView.dataDic = attachment.data; - [self addSubview:inviteView]; - [inviteView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - }]; - } - } - }]; - - } - break; - case Custom_Message_Sub_AcrossRoomPK_Accept: - { - [self.acrossPKCountView removeFromSuperview]; - self.acrossPKCountView = nil; - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember * member = [members firstObject]; - if (member.type == NIMChatroomMemberTypeCreator || meIsSuperAdmin) { - XPAcrossRoomPKInviteResultView * inviteResultView = [[XPAcrossRoomPKInviteResultView alloc] init]; - inviteResultView.is_XP_Accept = YES; - [self addSubview:inviteResultView]; - [inviteResultView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(114 + kSafeAreaTopHeight); - make.centerX.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(KScreenWidth - 40, 42)); - }]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [inviteResultView removeFromSuperview]; - }); - } - } - }]; - } - break; - case Custom_Message_Sub_AcrossRoomPK_Reject: - { - [self.acrossPKCountView removeFromSuperview]; - self.acrossPKCountView = nil; - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember * member = [members firstObject]; - if (member.type == NIMChatroomMemberTypeCreator || meIsSuperAdmin) { - XPAcrossRoomPKInviteResultView * inviteResutView = [[XPAcrossRoomPKInviteResultView alloc] init]; - inviteResutView.is_XP_Accept = NO; - [self addSubview:inviteResutView]; - [inviteResutView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(114 + kSafeAreaTopHeight); - make.centerX.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(201, 42)); - }]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [inviteResutView removeFromSuperview]; - }); - } - } - }]; - } - break; - case Custom_Message_Sub_AcrossRoomPK_Panel: - { - [self.acrossPKCountView removeFromSuperview]; - self.acrossPKCountView = nil; - if (!self.acrossPKPanelView.superview) { - [self addSubview:self.acrossPKPanelView]; - [self.acrossPKPanelView startInitUI]; - self.acrossPKPanelView.center = self.center; - } - AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:attachment.data]; - if (attachment.data[@"amicStatus"] != nil){ - acrossPKPanelInfo.aMicStatus = [attachment.data[@"amicStatus"] intValue]; - } - self.acrossPKPanelView.pkPanelInfo = acrossPKPanelInfo; - } - break; - case Custom_Message_Sub_AcrossRoomPK_End: - { - [self.acrossPKCountView removeFromSuperview]; - self.acrossPKCountView = nil; - [self.acrossPKPanelView resetAcrossPKViewData]; - [self.acrossPKPanelView removeFromSuperview]; - AcrossRoomPKPanelModel * model = [AcrossRoomPKPanelModel modelWithJSON:attachment.data]; - if (attachment.data[@"amicStatus"] != nil){ - model.aMicStatus = [attachment.data[@"amicStatus"] intValue]; - } - if (model.isForce) { - XPAcrossRoomPKForceEndResultView *view = [[XPAcrossRoomPKForceEndResultView alloc] initWithFrame:CGRectMake(0, 0, 290, 211)]; - view.data = model; - [TTPopup popupView:view style:TTPopupStyleAlert]; - } else { - XPAcrossRoomPKResultView *view = [[XPAcrossRoomPKResultView alloc] initWithFrame:CGRectMake(0, 0, 310, 363)]; - view.data = model; - [TTPopup popupView:view style:TTPopupStyleAlert]; - } - } - break; - ///个播跨房PK - case Custom_Message_Sub_AnchorPK_Invite://收到个播PK邀请 - { - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember * member = [members firstObject]; - if (member.type == NIMChatroomMemberTypeCreator) { - XPAnchorPKInviteView * inviteView = [[XPAnchorPKInviteView alloc] init]; - inviteView.roomUid = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.uid]; - inviteView.dataDic = attachment.data; - [TTPopup popupView:inviteView style:TTPopupStyleAlert]; - } - } - }]; - } - break; - case Custom_Message_Sub_AnchorPK_Accept://对方接受个播PK邀请 - { - [self.anchorPKMatchView removeFromSuperview]; - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember * member = [members firstObject]; - if (member.type == NIMChatroomMemberTypeCreator) { - AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:attachment.data]; - if (attachment.data[@"amicStatus"] != nil){ - acrossPKPanelInfo.aMicStatus = [attachment.data[@"amicStatus"] intValue]; - } - [[RtcManager instance] connectOtherRoom:acrossPKPanelInfo.aRoomId userId:acrossPKPanelInfo.aUid]; - [self updateAnchorPkInfo:acrossPKPanelInfo]; - } - } - }]; - } - break; - case Custom_Message_Sub_AnchorPK_Reject://对方拒绝个播PK邀请 - { - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember * member = [members firstObject]; - if (member.type == NIMChatroomMemberTypeCreator) { - XPAcrossRoomPKInviteResultView * inviteResutView = [[XPAcrossRoomPKInviteResultView alloc] init]; - inviteResutView.is_XP_Accept = NO; - [self addSubview:inviteResutView]; - [inviteResutView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(114 + kSafeAreaTopHeight); - make.centerX.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(201, 42)); - }]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [inviteResutView removeFromSuperview]; - }); - } - } - }]; - } - break; - case Custom_Message_Sub_AnchorPK_Panel://个播PK面板消息 - { - [self.anchorPKMatchView removeFromSuperview]; - self.delegate.getRoomInfo.pkMatchStartTime = 0; - if (!self.anchorPKPanelView.superview) { - [self addSubview:self.anchorPKPanelView]; - [self.anchorPKPanelView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(kNavigationHeight + 87); - }]; - } - AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:attachment.data]; - if (attachment.data[@"amicStatus"] != nil){ - acrossPKPanelInfo.aMicStatus = [attachment.data[@"amicStatus"] intValue]; - } - self.anchorPKPanelView.pkPanelInfo = acrossPKPanelInfo; - [self updateAnchorPkInfo:acrossPKPanelInfo]; - } - break; - case Custom_Message_Sub_AnchorPK_End://个播PK结束，进入惩罚阶段 - { - if (!self.anchorPKPanelView.superview) { - [self addSubview:self.anchorPKPanelView]; - [self.anchorPKPanelView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(kNavigationHeight + 87); - }]; - } - AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:attachment.data]; - if (attachment.data[@"amicStatus"] != nil){ - acrossPKPanelInfo.aMicStatus = [attachment.data[@"amicStatus"] intValue]; - } - self.anchorPKPanelView.pkPanelInfo = acrossPKPanelInfo; - [self updateAnchorPkInfo:acrossPKPanelInfo]; - if (acrossPKPanelInfo.isForce) { - XPAnchorPKFinishView *view = [[XPAnchorPKFinishView alloc] init]; - view.data = acrossPKPanelInfo; - [TTPopup popupView:view style:TTPopupStyleAlert]; - } else { - XPAnchorPKResultView *view = [[XPAnchorPKResultView alloc] initWithFrame:CGRectMake(0, 0, 300, 472)]; - view.data = acrossPKPanelInfo; - [TTPopup popupView:view style:TTPopupStyleAlert]; - } - } - break; - case Custom_Message_Sub_AnchorPK_Finish://个播PK完成 - { - [self.anchorPKPanelView resetAcrossPKViewData]; - [self.anchorPKPanelView removeFromSuperview]; - self.anchorPKPanelView = nil; - [self resetAnchorPkInfo]; - [[RtcManager instance] disconnectOtherRoom]; - } - break; - case Custom_Message_Sub_PK_BeginTime:{ - long long time = [attachment.data[@"beginTime"] longLongValue]; - [self showAcrossPkCountDownViewWithTime:time]; - } - break; - case Custom_Message_Sub_AnchorPK_Match_TimeOut: - {///PK匹配超时 - self.delegate.getRoomInfo.pkMatchStartTime = 0; - self.anchorPKMatchView.roomUid = [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].uid]; - [self.anchorPKMatchView handleMatchTimeOutMessage]; - } - break; - case Custom_Message_Sub_AnchorPK_MuteOtherMic:///PK时禁用对方声音 - { - [self.anchorPKPanelView updateOtherMicStatus:attachment]; - } - break; - default: - break; - } - } else if (attachment.first == CustomMessageType_Anchor_FansTeam) { - [self handleAnchorFansTeam:attachment]; - }else if (attachment.first == CustomMessageType_Noble_VIP && attachment.second == Custom_Message_Sub_Room_Trumpet) { - [self handleTrumpet:attachment]; - } - } -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; -// [self updateContributeEnterViewTitle:attachment]; - switch (content.eventType) { - case NIMChatroomEventTypeAddManager: - { - for (NIMChatroomNotificationMember * member in content.targets) { - if (member.userId.intValue == [AccountInfoStorage instance].getUid.integerValue) { -// self.editButton.hidden = NO; - self.pkPanelView.isManager = YES; - break; - } - } - } - break; - case NIMChatroomEventTypeRemoveManager: - { - for (NIMChatroomNotificationMember * member in content.targets) { - if (member.userId.intValue == [AccountInfoStorage instance].getUid.integerValue) { -// self.editButton.hidden = YES; - self.pkPanelView.isManager = NO; - break; - } - } - } - break; - default: - break; - - } -} - -- (void)onMicroQueueUpdate:(NSMutableDictionary *)queue { - if (self.delegate.getRoomInfo.type == RoomType_MiniGame) { - [self.littleGameMiniView needRefreshPosition:queue]; - } else if(self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - self.pkPanelView.micQueue = queue; - }else { - MicroQueueModel * currentUserModel; - NSString * uid = [AccountInfoStorage instance].getUid; - for (MicroQueueModel * microModel in queue.allValues) { - if (microModel.userInfo && microModel.userInfo.uid == uid.integerValue) { - currentUserModel = microModel; - } - } - if (currentUserModel) { - self.musicEnterButton.hidden = NO; - } else { - [[RtcManager instance] changePlayState:BackMusicPlayState_Stop]; - self.musicEnterButton.hidden = YES; - POPBasicAnimation *moveAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewCenter]; - moveAnimation.fromValue = [NSValue valueWithCGPoint:self.musicPlayView.center]; - moveAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(-KScreenWidth, self.musicPlayView.center.y)]; - moveAnimation.beginTime = CACurrentMediaTime(); - moveAnimation.duration = 0.5; - moveAnimation.repeatCount = 1; - moveAnimation.removedOnCompletion = YES; - [self.musicPlayView pop_addAnimation:moveAnimation forKey:@"moveOutAnimation"]; - [self.musicPlayView resetData]; - [self.musicPlayView removeFromSuperview]; - } - } -} -#pragma mark - XPAcrossRoomPKPanelViewDelegate -- (void)XPAcrossRoomPKPanelView:(XPAcrossRoomPKPanelView *)view onLookRoom:(NSString *)roomUid { - [self.delegate exitRoom]; - ///这个为啥加个延迟的 因为会先退房 有一个dismiss的动画 所以加个延迟吧 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); -} - -- (void)XPAcrossRoomPKPanelView:(XPAcrossRoomPKPanelView *)view sendGiftToUser:(NSString *)uid { - NSString * roomUid = [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].uid]; - XPSendGiftView * giftView = [[XPSendGiftView alloc] initWithType:SendGiftType_Room uid:roomUid]; - giftView.delegate = self.delegate; - NSArray * giftUses = [self configGiftUsers:[self.delegate getMicroQueue]]; - [giftView configGiftUsers:giftUses]; - [self.delegate.getCurrentNav presentViewController:giftView animated:YES completion:nil]; -} - -- (NSArray *)configGiftUsers:(NSMutableDictionary *)queue { - NSMutableArray * array = [NSMutableArray array]; - for (MicroQueueModel * microModel in queue.allValues) { - if (microModel.userInfo && microModel.userInfo.uid >0) { - UserInfoModel * userInfo = microModel.userInfo; - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = userInfo.avatar; - userModel.vipMic = userInfo.vipMic; - userModel.position = [NSString stringWithFormat:@"%d", microModel.microState.position]; - userModel.uid = userInfo.uid; - if (self.delegate.getRoomInfo.type == RoomType_Anchor && microModel.microState.position == -1) {///个播房一直为离开模式，不需要添加房主位 - continue; - } - [array addObject:userModel]; - } - } - - if (self.delegate.getRoomInfo.leaveMode) { - RoomInfoModel * roomInfo= self.delegate.getRoomInfo; - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = roomInfo.avatar; - userModel.position = @"-1"; - userModel.uid = roomInfo.uid; - [array addObject:userModel]; - } else if (self.delegate.getRoomInfo.type == RoomType_Anchor) { - RoomInfoModel * roomInfo= self.delegate.getRoomInfo; - BOOL hadContainerOwner = NO; - for (UserInfoModel *userModel in array) { - if (userModel.uid == roomInfo.uid) { - hadContainerOwner = YES; - break; - } - } - if (!hadContainerOwner) { - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = roomInfo.avatar; - userModel.position = @"-1"; - userModel.uid = roomInfo.uid; - [array addObject:userModel]; - } - } - return array; -} - -- (void)XPAcrossRoomPKPanelView:(XPAcrossRoomPKPanelView *)view showUserCard:(NSString *)uid { - RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - NSString * targetUid = uid; - XPUserCardInfoModel * model = [[XPUserCardInfoModel alloc] init]; - __block MicroQueueModel *micModel = nil; - [[self.delegate.getMicroQueue allValues] enumerateObjectsUsingBlock:^(MicroQueueModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (targetUid.integerValue == obj.userInfo.uid) { - model.position = [NSString stringWithFormat:@"%d", obj.microState.position]; - model.posState = obj.microState.posState; - model.micState = obj.microState.micState; - micModel = obj; - *stop = YES; - } - }]; - model.nick = self.delegate.getUserInfo.nick; - model.uid = targetUid; - model.delegate = self.delegate; - model.roomInfo = roomInfo; - model.micQueue = self.delegate.getMicroQueue; - model.superMangerList = self.delegate.getRoomSuperAdminList; - model.platformRole = micModel.userInfo.platformRole; - UserRoomCardViewController *vc = [[UserRoomCardViewController alloc] initWithUser:model controlUser:self.delegate.getUserInfo]; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.delegate.getCurrentNav presentViewController:vc animated:NO completion:nil]; -} - -#pragma mark - XPAnchorPkPanelViewDelegate -- (void)xPAnchorPKPanelView:(XPAnchorPkPanelView *)view showUserCard:(NSString *)uid { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = uid.integerValue; - [self.delegate.getCurrentNav pushViewController:userInfoVC animated:YES]; -} - -///去房间 -- (void)xPAnchorPKPanelView:(XPAnchorPkPanelView *)view onlookRoom:(NSString *)roomUid { - [self.delegate exitRoom]; - ///这个为啥加个延迟的 因为会先退房 有一个dismiss的动画 所以加个延迟吧 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); -} - -///关注房主成功 -- (void)xPAnchorPKPanelViewAttentionSuccess { - if (self.followAnchorTimer != nil) { - dispatch_source_cancel(self.followAnchorTimer); - self.followAnchorTimer = nil; - } -} - -- (void)xPAnchorPKPanelViewPenaltyCountDownEnd { - self.delegate.getRoomInfo.pkState = AcrossRoomPkStateTypePenaltyEnd; -} - -#pragma mark - XPRoomBackMusicPlayerViewDelegate -- (void)xPRoomBackMusicPlayerView:(XPRoomBackMusicPlayerView *)view musicPlaying:(BOOL)musicPlaying { - if (musicPlaying) { - [self resumeLayer:self.musicEnterButton.imageView.layer]; - } else { - [self pauseLayer:self.musicEnterButton.imageView.layer]; - } -} - -#pragma mark - Event Response -- (void)contributionButtonAction:(UITapGestureRecognizer *)tap { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.uid]; - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = [NSString stringWithFormat:@"%@?roomUid=%@", URLWithType(kRoomRankURL), roomUid]; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; - if (self.delegate.getRoomInfo.type == RoomType_Anchor) {//点击的时候更新一下 - [self updateContrionEntranceWithRoomUid:roomUid type:@"month"]; - } else { - [self updateContrionEntranceWithRoomUid:roomUid type:@"day"]; - } -} - -- (void)onAnchorHourRankButtonAction:(UITapGestureRecognizer *)ges { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.uid]; - NSString * url = self.delegate.getRoomInfo.type == RoomType_Anchor ? URLWithType(kRoomHourRankURL) : URLWithType(kLicenseHourRankURL); - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = [NSString stringWithFormat:@"%@?roomUid=%@", url, roomUid]; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; -} - -- (void)datingProgresButtonAction:(UIButton *)sender { - [TTPopup dismiss]; - RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - NSString * message = @""; - if (roomInfo.blindDateState == RoomPlayDateingType_Talk) { - message = YMLocalizedString(@"XPRoomFunctionContainerView8"); - } else if(roomInfo.blindDateState == RoomPlayDateingType_Pick) { - message =YMLocalizedString(@"XPRoomFunctionContainerView9"); - } else if(roomInfo.blindDateState == RoomPlayDateingType_Result) { - message = YMLocalizedString(@"XPRoomFunctionContainerView10"); - } else if (roomInfo.blindDateState == RoomPlayDateingType_Finish) { - message =YMLocalizedString(@"XPRoomFunctionContainerView11"); - } - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.message = message; - [TTPopup alertWithConfig:config confirmHandler:^{ - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.uid]; - NSString * roundId = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.blindDateState]; - [Api changeRoomDatingState:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUserId:roomUid roundId:roundId]; - } cancelHandler:^{ - - }]; -} - -- (void)foldButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; -} - -- (void)tapFansTeamRecognizer { - NSString *roomUid = [NSString stringWithFormat:@"%zd", self.delegate.getRoomInfo.uid]; - if (self.relationFansModel.isCurrentRoomAnchor) {///是房主 - if (self.relationFansModel.hasFansTeamCurrentRoom) { - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = [NSString stringWithFormat:@"%@?roomUid=%@", URLWithType(kAnchorFansListURL), roomUid]; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; - } else { - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:roomUid]; - webVC.url = URLWithType(kAnchorFansOpenURL); - [self.delegate.getCurrentNav pushViewController:webVC animated:YES]; - } - } else { - if (self.relationFansModel.hasFansTeamCurrentRoom) {//开通了粉丝团 - if (self.relationFansModel.isAnchorFans) { - [Api requestFansTeamTask:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code != 200) { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - return; - } - XPAnchorFansTaskModel *model = [XPAnchorFansTaskModel modelWithJSON:data.data]; - XPAnchorFansTaskViewController *fansTaskVc = [[XPAnchorFansTaskViewController alloc] initWithRoomUid:roomUid]; - fansTaskVc.model = model; - [self.delegate.getCurrentNav presentViewController:fansTaskVc animated:YES completion:nil]; - } teamUid:roomUid]; - } else { - [Api requestJoinFansTeam:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code != 200) { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - return; - } - XPAnchorFansJoinModel *model = [XPAnchorFansJoinModel modelWithJSON:data.data]; - XPAnchorFansTeamViewController *fansTeamVc = [[XPAnchorFansTeamViewController alloc] initWithRoomUid:roomUid]; - fansTeamVc.model = model; - [self.delegate.getCurrentNav presentViewController:fansTeamVc animated:YES completion:nil]; - } teamUid:roomUid]; - } - } - } -} - -- (void)musicEnterButtonAction:(UIButton *)sender { - [self showMusicPanel]; -// if (!self.musicPlayView.superview) { -// [self addSubview:self.musicPlayView]; -// self.musicPlayView.frame = CGRectMake(-KScreenWidth, kNavigationHeight + 4, KScreenWidth - 85, 80); -// } -} - -#pragma mark - 房间话题 -- (void)updateRoomTopicViewConstraint { -// self.topicStackView.hidden = YES; -// RoomInfoModel * roomInfo = self.delegate.getRoomInfo; -// CGFloat offsetY = kNavigationHeight; -// if (roomInfo.roomModeType == RoomModeType_Open_Blind) { -// offsetY += ((50 + 5) * kScreenScale + 10 + 12 + 3 + 40); -// } else if (roomInfo.type == RoomType_Anchor) { -// self.topicStackView.hidden = NO; -// offsetY += (120 + 5 + 6 + 20 +60 + 3); -// } else { -// offsetY += (50 + 5 + 10 + 12 + 3 + 40); -// } -// -// [self.topicStackView mas_updateConstraints:^(MASConstraintMaker *make) { -// make.top.mas_equalTo(offsetY); -// }]; -} - -- (void)updateRoomTopic { -// if (self.delegate.getRoomInfo.type == RoomType_Anchor && self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { -// self.topicStackView.hidden = YES; -// } else { -// self.topicStackView.hidden = ([ClientConfig shareConfig].configInfo.appStoreAuditNoticeVersion || self.delegate.getRoomInfo.type == RoomType_MiniGame) == YES; -// } -// [self updateRoomTopicViewConstraint]; -// if ([AccountInfoStorage instance].getUid.length > 0) { -// NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; -// request.roomId = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.roomId]; -// request.userIds = @[[AccountInfoStorage instance].getUid]; -// [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { -// if (error== nil) { -// NIMChatroomMember* member = members.firstObject; -// if (member.type == NIMChatroomMemberTypeCreator || member.type == NIMChatroomMemberTypeManager) { -// self.editButton.hidden = NO; -// } else { -// self.editButton.hidden = YES; -// } -// } -// }]; -// } -// self.topicLabel.text = self.delegate.getRoomInfo.roomDesc.length > 0 ? self.delegate.getRoomInfo.roomDesc : YMLocalizedString(@"XPRoomFunctionContainerView12"); -} - -- (void)topicGestureRecognizer:(UITapGestureRecognizer *)tap { - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error== nil) { - NIMChatroomMember* member = members.firstObject; - RoomInfoModel * roomInfo= self.delegate.getRoomInfo; - if (member.type == NIMChatroomMemberTypeCreator || member.type == NIMChatroomMemberTypeManager) { - XPRoomTopicViewController * editTopicVC = [[XPRoomTopicViewController alloc] init]; - editTopicVC.roomInfo = roomInfo; - [self.delegate.getCurrentNav pushViewController:editTopicVC animated:YES]; - } else { - TTPopupService * config = [[TTPopupService alloc] init]; - XPRoomTopicAlertView * alertView = [[XPRoomTopicAlertView alloc] init]; - alertView.title = roomInfo.roomDesc; - alertView.message = roomInfo.introduction; - config.contentView = alertView; - [TTPopup popupWithConfig:config]; - } - } - }]; -} - -#pragma mark - 弹窗关注房主 -- (void)setFollowAnchorTimer { - if (self.followAnchorTimer != nil) { - dispatch_source_cancel(self.followAnchorTimer); - } -#ifdef DEBUG - NSInteger totalTime = 5; - NSString *isProduction = [[NSUserDefaults standardUserDefaults]valueForKey:@"kIsProductionEnvironment"]; - if([isProduction isEqualToString:@"YES"]){ - totalTime = 420; - } - -#else - NSInteger totalTime = 420; -#endif - dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - self.followAnchorTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - dispatch_source_set_timer(self.followAnchorTimer,dispatch_walltime(NULL, totalTime*NSEC_PER_SEC), totalTime*NSEC_PER_SEC, 0); //每秒执行 - @weakify(self); - dispatch_source_set_event_handler(self.followAnchorTimer, ^{ - dispatch_async(dispatch_get_main_queue(), ^{ - @strongify(self); - if (self.followAnchorTimer != nil) { - dispatch_source_cancel(self.followAnchorTimer); - self.followAnchorTimer = nil; - } - RoomInfoModel* roomInfo = self.delegate.getRoomInfo; - NSString *roomUid = [NSString stringWithFormat:@"%zd", roomInfo.uid]; - NSString * uid = [[AccountInfoStorage instance] getUid]; - [Api attentionStatusCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - BOOL isLike = ((NSNumber *)data.data).boolValue; - if (!isLike && !roomInfo.isRoomFans && self.window) { // 还没有关注或收藏房间 - [self showFollowAnchorView]; - } - } uid:uid isLikeUid:roomUid]; - }); - }); - dispatch_resume(self.followAnchorTimer); -} - -//弹出关注主播的窗口 -- (void)showFollowAnchorView { - RoomInfoModel* roomInfo = self.delegate.getRoomInfo; - NSString *roomUid = [NSString stringWithFormat:@"%zd", roomInfo.uid]; - [Api getUserInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - UserInfoModel *userInfo = [UserInfoModel modelWithDictionary:data.data]; - XPRoomAnchorInfoCardView *view = [[XPRoomAnchorInfoCardView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 300)]; - view.userInfo = self.delegate.getUserInfo; - view.targetUserInfo = userInfo; - view.roomId =roomInfo.roomId; - [TTPopup popupView:view style:TTPopupStyleActionSheet]; - } uid:roomUid]; -} - -///个播房用户请求上麦弹窗 -- (void)showAskForUpMic:(NSDictionary *)dict { - NSString *roomUid = [NSString stringWithFormat:@"%zd", self.delegate.getRoomInfo.uid]; - if (![roomUid isEqualToString:[AccountInfoStorage instance].getUid]) { - return; - } - UserInfoModel *model = [UserInfoModel modelWithJSON:dict]; - XPAnchorAudienceUpMicView *upMicView = [[XPAnchorAudienceUpMicView alloc] initWithFrame:CGRectMake(0, 0, 300, 226) delegate:self.delegate]; - upMicView.info = model; - TTPopupConfig *config = [[TTPopupConfig alloc] init]; - config.filterIdentifier = @"audienceRequestUpMic"; - config.shouldFilterPopup = YES; - config.contentView = upMicView; - config.style = TTPopupStyleAlert; - [TTPopup popupWithConfig:config]; -} - -#pragma mark - 个播粉丝团 -- (void)updateFansTeamEntranceView:(XPAnchorFansRelationModel *)model { - if (!self.fansTeamEntranceView.superview) { - [self insertSubview:self.fansTeamEntranceView atIndex:0]; - [self.fansTeamEntranceView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.rankStackView.mas_bottom).mas_offset(5); - make.leading.mas_equalTo(0); - make.height.mas_equalTo(37); - }]; - } - self.fansTeamEntranceView.model = model; - self.relationFansModel = model; -} - -- (void)handleAnchorFansTeam:(AttachmentModel *)attachment { - if (attachment.second == Custom_Message_Sub_FansTeam_Open_Success || attachment.second == Custom_Message_Sub_FansTeam_Join_Success || attachment.second == Custom_Message_Sub_FansTeam_Out_Success) { - NSString *roomUid = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.uid]; - NSString *uid; - if ([attachment.data[@"uid"] isKindOfClass:[NSNumber class]]) { - uid = [NSString stringWithFormat:@"%@", attachment.data[@"uid"]]; - } else if ([attachment.data[@"uid"] isKindOfClass:[NSString class]]) { - uid = attachment.data[@"uid"]; - } - if ([uid isEqualToString:[AccountInfoStorage instance].getUid] || [[AccountInfoStorage instance].getUid isEqualToString:roomUid]) { - [Api requestInRoomFansTeam:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - XPAnchorFansRelationModel *model = [XPAnchorFansRelationModel modelWithJSON:data.data]; - [self updateFansTeamEntranceView:model]; - } teamUid:roomUid]; - } - } else if (attachment.second == Custom_Message_Sub_FansTeam_Open_Fail) { - - } -} - -- (void)updateAnchorPkInfo:(AcrossRoomPKPanelModel *)acrossPKPanelInfo { - self.delegate.getRoomInfo.roundId = acrossPKPanelInfo.roundId; - self.delegate.getRoomInfo.pkUid = acrossPKPanelInfo.aUid; - self.delegate.getRoomInfo.pkRoomId = acrossPKPanelInfo.aRoomId; - self.delegate.getRoomInfo.pkState = acrossPKPanelInfo.pkState; - self.delegate.getRoomInfo.winUid = acrossPKPanelInfo.winUid; -} - -- (void)resetAnchorPkInfo { - self.delegate.getRoomInfo.roundId = 0; - self.delegate.getRoomInfo.pkUid = @""; - self.delegate.getRoomInfo.pkRoomId = @""; - self.delegate.getRoomInfo.pkState = AcrossRoomPkStateTypePkEnd; - self.delegate.getRoomInfo.winUid = @""; - self.delegate.getRoomInfo.pkMatchStartTime = 0; -} -#pragma mark - 房间VIP小喇叭 -- (void)handleTrumpet:(AttachmentModel *)attachment { - if (self.trumpetQueue.count) { - [self.trumpetQueue addObject:attachment.data]; - } else { - [self.trumpetQueue addObject:attachment.data]; - __block NSInteger time = 5.0; //倒计时时间 - if (_trumpetTimer == nil) { - dispatch_queue_t queue = dispatch_get_global_queue(0, 0); - _trumpetTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - dispatch_source_set_timer(_trumpetTimer,dispatch_walltime(NULL, 0), time*NSEC_PER_SEC, 0); //每秒执行 - @weakify(self); - dispatch_source_set_event_handler(_trumpetTimer, ^{ - @strongify(self); - if (self.trumpetQueue.count) { - dispatch_sync(dispatch_get_main_queue(), ^{ - [self createTrumpetAnimation:self.trumpetQueue.firstObject]; - [self.trumpetQueue xpSafeRemoveObjectAtIndex:0]; - }); - } else { - dispatch_sync(dispatch_get_main_queue(), ^{ - [self.trumpetView removeFromSuperview]; - }); - - if (self.trumpetTimer != nil) { - dispatch_source_cancel(self.trumpetTimer); - self.trumpetTimer = nil; - } - } - }); - dispatch_resume(_trumpetTimer); - } - } -} -- (void)createTrumpetAnimation:(NSDictionary *)attatchment { - if (!self.trumpetView.superview) { - [self addSubview:self.trumpetView]; - [self.trumpetView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.delegate.getRoomInfo.type == RoomType_MiniGame ? kNavigationHeight: kNavigationHeight + 110); - make.leading.mas_equalTo(0); - make.trailing.mas_equalTo(0); - make.height.mas_equalTo(153); - }]; - } - self.trumpetView.data = attatchment; - POPBasicAnimation *animation2 = [POPBasicAnimation animationWithPropertyNamed:kPOPViewFrame]; - animation2.beginTime = CACurrentMediaTime(); - animation2.duration = 0.1; - CGFloat width = self.frame.size.width - 15; - CGFloat height = 28; - animation2.fromValue = [NSValue valueWithCGRect:CGRectMake(0, 153-34-28, width, height)]; - animation2.toValue = [NSValue valueWithCGRect:CGRectMake(0, 153-34-28-14, width, height)]; - animation2.removedOnCompletion = NO; - animation2.repeatCount = 1; - - POPBasicAnimation *animation3 = [POPBasicAnimation animationWithPropertyNamed:kPOPLayerOpacity]; - animation3.duration = 0.1; - animation3.beginTime = CACurrentMediaTime(); - animation3.fromValue = @1; - animation3.toValue = @0; - animation3.repeatCount = 1; - animation3.removedOnCompletion = NO; - - [animation2 setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - if (finished) { - POPBasicAnimation *animation2 = [POPBasicAnimation animationWithPropertyNamed:kPOPViewFrame]; - animation2.beginTime = CACurrentMediaTime(); - animation2.duration = 0.1; - CGFloat width = self.frame.size.width - 15; - CGFloat height = 28; - animation2.fromValue = [NSValue valueWithCGRect:CGRectMake(0, 153 - 34 - 14, width, height)]; - animation2.toValue = [NSValue valueWithCGRect:CGRectMake(0, 153 - 34 - 28, width, height)]; - animation2.removedOnCompletion = NO; - animation2.repeatCount = 1; - - POPBasicAnimation *animation3 = [POPBasicAnimation animationWithPropertyNamed:kPOPLayerOpacity]; - animation3.duration = 0.1; - animation3.beginTime = CACurrentMediaTime(); - animation3.fromValue = @0; - animation3.toValue = @1; - animation3.repeatCount = 1; - animation3.removedOnCompletion = NO; - [self.trumpetView.mainView.layer pop_addAnimation:animation2 forKey:@"animation4"]; - [self.trumpetView.mainView.layer pop_addAnimation:animation3 forKey:@"animation5"]; - } - }]; - [self.trumpetView.mainView.layer pop_addAnimation:animation2 forKey:@"animation2"]; - [self.trumpetView.mainView.layer pop_addAnimation:animation3 forKey:@"animation3"]; -} -#pragma mark - 房间榜入口榜单 -- (void)updateContrionEntranceWithRoomUid:(NSString *)roomUid type:(NSString *)type { - -} - -#pragma mark - 个播小时榜入口 -- (void)updateHourRankEntrance { - - if (self.delegate.getRoomInfo.type == RoomType_Anchor || self.delegate.getRoomInfo.isPermitRoom == PermitRoomType_License) { - self.hourRankEntranceView.hidden = NO; - } else { - self.hourRankEntranceView.hidden = YES; - } -} -#pragma mark - XPRoomLittleGameListViewDelegate -- (void)xPRoomLittleGameListView:(XPLittleGameRoomListView *)view didSelectItem:(LittleGameInfoModel *)itemInfo { - RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - NSMutableDictionary * params = [NSMutableDictionary dictionary]; - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [params setObject:ticket forKey:@"ticket"]; - [params setObject:uid forKey:@"uid"]; - [params setObject:[NSString stringWithFormat:@"%ld", roomInfo.uid] forKey:@"roomUid"]; - if (roomInfo.title.length > 0) { - [params setObject:roomInfo.title forKey:@"title"]; - } - - if (roomInfo.roomPwd.length > 0) { - [params setObject:roomInfo.roomPwd forKey:@"roomPwd"]; - } else{ - [params setObject:@"" forKey:@"roomPwd"]; - } - - if (roomInfo.tagId > 0) { - [params setObject:[NSString stringWithFormat:@"%ld", roomInfo.tagId] forKey:@"tagId"]; - } - if ([itemInfo.mgId isEqualToString:@"0"]) { - [params setObject:@(RoomType_Room) forKey:@"type"]; - [params setObject:@"0" forKey:@"mgId"]; - } else { - [params setObject:@(RoomType_MiniGame) forKey:@"type"]; - [params setObject:itemInfo.mgId forKey:@"mgId"]; - } - [params setObject:@(roomInfo.hasAnimationEffect) forKey:@"hasAnimationEffect"]; - [Api ownerUpdateRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } params:params]; -} - -- (void)xPRoomLittleGameListView:(XPLittleGameRoomListView *)view didSelectChooseType:(UIButton *)sender { - if ([self currentRoomIsInSudGame]) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomFunctionContainerView18")]; - } else { - sender.selected = !sender.selected; - view.tableView.hidden = !sender.selected; - } -} - -#pragma mark - 房间背景音乐 --(void)pauseLayer:(CALayer*)layer { - CFTimeInterval pausedTime = [layer convertTime:CACurrentMediaTime() fromLayer:nil]; - layer.speed = 0.0; - layer.timeOffset = pausedTime; -} - --(void)resumeLayer:(CALayer*)layer { - CFTimeInterval pausedTime = [layer timeOffset]; - layer.speed = 1.0; - layer.timeOffset = 0.0; - layer.beginTime = 0.0; - CFTimeInterval timeSincePause = [layer convertTime:CACurrentMediaTime() fromLayer:nil] - pausedTime; - layer.beginTime = timeSincePause; -} - -- (void)configPlayMusicRoomTypeChange { - RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - - if (roomInfo.type == RoomType_MiniGame) { - [self pauseLayer:self.musicEnterButton.imageView.layer]; - [self.musicEnterButton removeFromSuperview]; - [self.musicPlayView resetData]; - [self.musicPlayView removeFromSuperview]; - [[RtcManager instance] changePlayState:BackMusicPlayState_Stop]; - } else { - MicroQueueModel * currentUserModel; - NSString * uid = [AccountInfoStorage instance].getUid; - for (MicroQueueModel * microModel in self.delegate.getMicroQueue.allValues) { - if (microModel.userInfo && microModel.userInfo.uid == uid.integerValue) { - currentUserModel = microModel; - } - } - if (currentUserModel) { - self.musicEnterButton.hidden = NO; - } - } -} - -///跨房PK预约倒计时 -- (void)showAcrossPkCountDownViewWithTime:(long long)time { - if (self.acrossPKCountView.superview) { - return; - } - if (self.acrossPKPanelView.superview) {//正在PK中 - return; - } - if ([self.delegate getRoomInfo].roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { - return; - } - [self handleAcrollPKCountView:time]; -} - -- (void)handleAcrollPKCountView:(long long)time { - RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - - if (!self.acrossPKCountView.superview) { - [self addSubview:self.acrossPKCountView]; - [self bringSubviewToFront:self.acrossPKCountView]; - self.acrossPKCountView.startTime = time ? time : roomInfo.pkBeginTime; - self.acrossPKCountView.backImageView.image = [UIImage imageNamed:@"acrossPK_countDown_left_bg"]; - [self.acrossPKCountView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kNavigationHeight+4+24+4); - make.leading.mas_equalTo(0); - make.width.height.mas_equalTo(52); - }]; - } -} - - -#pragma mark - 随机PK匹配 -- (void)handleMatchAnchorPK { - if (self.delegate.getRoomInfo.pkMatchStartTime) { - [self addSubview:self.anchorPKMatchView]; - self.anchorPKMatchView.roomUid = [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].uid]; - [self.anchorPKMatchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.rankStackView.mas_bottom).mas_offset(5+37+5); - make.leading.mas_equalTo(0); - make.width.height.mas_equalTo(52); - }]; - [self.anchorPKMatchView openCountdownWithTime:self.delegate.getRoomInfo.pkMatchStartTime]; - } -} - -#pragma mark - Getters And Setters -- (XPRoomRankEntranceView *)contributeEnterView { - if (!_contributeEnterView) { - _contributeEnterView = [[XPRoomRankEntranceView alloc] init]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(contributionButtonAction:)]; - [_contributeEnterView addGestureRecognizer:tap]; - } - return _contributeEnterView; -} - -- (XPRoomAnchorRankEnterView *)hourRankEntranceView { - if (!_hourRankEntranceView) { - _hourRankEntranceView = [[XPRoomAnchorRankEnterView alloc] init]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onAnchorHourRankButtonAction:)]; - [_hourRankEntranceView addGestureRecognizer:tap]; - } - return _hourRankEntranceView; -} - -- (UIButton *)datingProgresButton { - if (!_datingProgresButton) { - _datingProgresButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_datingProgresButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFA7186), UIColorFromRGB(0xFA4972)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(65, 30)] forState:UIControlStateNormal]; - [_datingProgresButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _datingProgresButton.titleLabel.font = [UIFont systemFontOfSize:13]; - [_datingProgresButton setTitle:YMLocalizedString(@"XPRoomFunctionContainerView13") forState:UIControlStateNormal]; - [_datingProgresButton addTarget:self action:@selector(datingProgresButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _datingProgresButton.layer.masksToBounds = YES; - _datingProgresButton.layer.cornerRadius = 15; - } - return _datingProgresButton; -} - -- (XPAnchorFansTeamEntranceView *)fansTeamEntranceView { - if (!_fansTeamEntranceView) { - _fansTeamEntranceView = [[XPAnchorFansTeamEntranceView alloc]init]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapFansTeamRecognizer)]; - [_fansTeamEntranceView addGestureRecognizer:tap]; - } - return _fansTeamEntranceView; -} - -- (UIStackView *)rankStackView{ - if(!_rankStackView){ - _rankStackView = [[UIStackView alloc] init]; - _rankStackView.axis = UILayoutConstraintAxisHorizontal; - _rankStackView.distribution = UIStackViewDistributionFill; - _rankStackView.alignment = UIStackViewAlignmentFill; - _rankStackView.spacing = 9; - } - return _rankStackView; -} - -- (XPAcrossRoomPKPanelView *)acrossPKPanelView { - if (!_acrossPKPanelView) { - _acrossPKPanelView = [[XPAcrossRoomPKPanelView alloc] init]; - _acrossPKPanelView.delegate = self; - } - return _acrossPKPanelView; -} -- (XPLittleGameMiniStageView *)littleGameMiniView { - if (!_littleGameMiniView) { - _littleGameMiniView = [[XPLittleGameMiniStageView alloc] init]; - } - return _littleGameMiniView; -} - -- (XPLittleGameRoomListView *)gameListView { - if (!_gameListView) { - _gameListView = [[XPLittleGameRoomListView alloc] init]; - _gameListView.delegate = self; - } - return _gameListView; -} - -- (XPAnchorPkPanelView *)anchorPKPanelView { - if (!_anchorPKPanelView) { - _anchorPKPanelView = [[XPAnchorPkPanelView alloc] init]; - _anchorPKPanelView.delegate = self; - } - return _anchorPKPanelView; -} - -- (UIButton *)musicEnterButton { - if (!_musicEnterButton) { - _musicEnterButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_musicEnterButton setImage:[UIImage imageNamed:@"room_music_player_enter"] forState:UIControlStateNormal]; - _musicEnterButton.layer.masksToBounds = YES; - _musicEnterButton.layer.cornerRadius = 27/2; - _musicEnterButton.backgroundColor = UIColorRGBAlpha(0xffffff, 0.2); - [_musicEnterButton addTarget:self action:@selector(musicEnterButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - CAKeyframeAnimation *lAni = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"]; - lAni.duration = 1.5; - lAni.repeatCount = HUGE; - lAni.values=@[@0,@(M_PI*2)]; - //使得动画结束后，保持动画效果 - lAni.removedOnCompletion = NO; - lAni.fillMode = kCAFillModeForwards; - [_musicEnterButton.layer addAnimation:lAni forKey:nil]; - } - return _musicEnterButton; -} - -- (XPRoomBackMusicPlayerView *)musicPlayView { - if (!_musicPlayView) { - _musicPlayView = [[XPRoomBackMusicPlayerView alloc] init]; - _musicPlayView.delegate = self; - } - return _musicPlayView; -} - -- (XPRoomPKPanelView *)pkPanelView { - if (!_pkPanelView) { - _pkPanelView = [[XPRoomPKPanelView alloc] init]; - } - return _pkPanelView; -} - -- (XPAcrossRoomPKCountDownView *)acrossPKCountView { - if (!_acrossPKCountView) { - _acrossPKCountView = [[XPAcrossRoomPKCountDownView alloc] initWithFrame:CGRectMake(-52, kNavigationHeight+4+24+4, 52, 52)]; - } - return _acrossPKCountView; -} - -- (XPAnchorPKMatchView *)anchorPKMatchView { - if (!_anchorPKMatchView) { - _anchorPKMatchView = [[XPAnchorPKMatchView alloc] initWithDelegate:self.delegate]; - } - return _anchorPKMatchView; -} - -- (XPRoomTrumpetView *)trumpetView { - if (!_trumpetView) { - _trumpetView = [[XPRoomTrumpetView alloc] init]; - } - return _trumpetView; -} - -- (NSMutableArray *)trumpetQueue { - if (!_trumpetQueue) { - _trumpetQueue = [NSMutableArray array]; - } - return _trumpetQueue; -} -- (MSRoomOnLineView *)onlineView{ - if(!_onlineView){ - _onlineView = [[MSRoomOnLineView alloc]initWithFrame:CGRectZero]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(onlineTapRecognizer)]; - [_onlineView addGestureRecognizer:tap]; - } - return _onlineView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.h b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.h deleted file mode 100644 index 37c0691..0000000 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMRoomRankEntranceView.h -// YUMI -// -// Created by YUMI on 2022/4/27. -// 房间榜入口 - -#import -#import "RoomInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomRankEntranceView : UIView - -@property (nonatomic, copy) NSString *title; - - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m deleted file mode 100644 index 7e13b02..0000000 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m +++ /dev/null @@ -1,156 +0,0 @@ -// -// YMRoomRankEntranceView.m -// YUMI -// -// Created by YUMI on 2022/4/27. -// - -#import "XPRoomRankEntranceView.h" -///Third -#import -#import "DJDKMIMOMColor.h" -///Tool -#import "NetImageView.h" - -@interface XPRoomRankEntranceView () - -///背景图 -@property (nonatomic, strong) UIView *bgView; -///礼物值 -@property (nonatomic, strong) UILabel *titleLabel; -///箭头图标 -@property (nonatomic, strong) UIImageView *iconImageView; - -@end - -@implementation XPRoomRankEntranceView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgView]; - [self.bgView addSubview:self.titleLabel]; - [self.bgView addSubview:self.iconImageView]; -} - -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.trailing.leading.equalTo(self); - }]; - [self.iconImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(19); - make.centerY.mas_equalTo(self.bgView); - make.leading.mas_equalTo(9); - }]; - [self.titleLabel mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.bgView); - make.leading.mas_equalTo(self.iconImageView.mas_trailing).offset(3); - make.trailing.mas_equalTo(-9); - }]; -} - -BOOL isNumeric(NSString *string) { - NSError *error = nil; - // 修改正则表达式，支持整数和包含小数点的数字 - NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"^[0-9]*\\.?[0-9]+$" options:0 error:&error]; - - if (error) { -// NSLog(@"Error creating regex: %@", error.localizedDescription); - return NO; - } - - NSRange range = NSMakeRange(0, string.length); - NSTextCheckingResult *match = [regex firstMatchInString:string options:0 range:range]; - return match != nil; -} - -- (NSString *)formatCoins:(NSInteger)coins { - NSString *formattedString; - if (coins >= 1000000) { - // 转换为M单位，保留小数点后1位 - double valueInMillions = coins / 1000000.0; - formattedString = [NSString stringWithFormat:@"%.1fM", valueInMillions]; - } else if (coins >= 1000) { - // 转换为K单位，保留小数点后1位 - double valueInThousands = coins / 1000.0; - formattedString = [NSString stringWithFormat:@"%.1fK", valueInThousands]; - } else { - // 保持原始值 - formattedString = [NSString stringWithFormat:@"%ld", (long)coins]; - } - return formattedString; -} - -- (NSString *)formatCoinsWithDouble:(double)coins { - NSString *formattedString; - NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init]; - [formatter setMinimumFractionDigits:0]; // 设置最少保留 0 位小数 - [formatter setMaximumFractionDigits:2]; // 设置最多保留 2 位小数 - [formatter setNumberStyle:NSNumberFormatterDecimalStyle]; // 使用小数格式 - - if (coins >= 1000000.0) { - // 转换为M单位 - double valueInMillions = coins / 1000000.0; - formattedString = [NSString stringWithFormat:@"%@M", [formatter stringFromNumber:@(valueInMillions)]]; - } else if (coins >= 1000.0) { - // 转换为K单位 - double valueInThousands = coins / 1000.0; - formattedString = [NSString stringWithFormat:@"%@K", [formatter stringFromNumber:@(valueInThousands)]]; - } else { - // 保持原始值 - formattedString = [formatter stringFromNumber:@(coins)]; - } - return formattedString; -} -#pragma mark - Getters And Setters -- (void)setTitle:(NSString *)title { - if (![title isKindOfClass:[NSString class]]) { - return; - } - if (title.length == 0) { - return; - } - - _titleLabel.text = title; -} - -- (UIView *)bgView { - if (_bgView == nil) { - _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6]; - _bgView.layer.cornerRadius = 27/2; - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} - -- (UIImageView *)iconImageView { - if (_iconImageView == nil) { - _iconImageView = [[UIImageView alloc] init]; - _iconImageView.image = [[UIImage imageNamed:@"room_rank_iocn"]ms_SetImageForRTL]; - _iconImageView.contentMode = UIViewContentModeScaleAspectFit; - - } - return _iconImageView; -} - -- (UILabel *)titleLabel { - if (_titleLabel == nil) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [UIColor colorWithWhite:1 alpha:0.8]; - _titleLabel.font = kFontRegular(12); - _titleLabel.text = @"0"; - _titleLabel.numberOfLines = 2; - } - return _titleLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Api/Api+CandyTree.h b/YuMi/Modules/YMRoom/View/CandyTree/Api/Api+CandyTree.h deleted file mode 100644 index 0fcd614..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Api/Api+CandyTree.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// Api+CandyTree.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/9. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (CandyTree) -/// 获取糖果树的信息 -/// @param complection 完成 -/// @param uid 用的uid -+ (void)candyTreeKeyComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid; - -/// 摘糖果 -/// @param complection 完成 -/// @param sendMessage 是否发送消息 目前默认发送 -/// @param num 糖果的个数 -/// @param roomUid 房间的uid -/// @param uid 用户自己的uid -+ (void)pickCandyComplection:(HttpRequestHelperCompletion)complection - sendMessage:(NSString *)sendMessage - num:(NSString *)num - roomUid:(NSString *)roomUid - uid:(NSString *)uid; -/// 获取糖果树排行榜 -/// @param complection 完成 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param type 类型 今天榜单的话 1 昨日榜 2 -+ (void)candyTreeRankListComplection:(HttpRequestHelperCompletion)complection - page:(NSString *)page - pageSize:(NSString *)pageSize - type:(NSString *)type; -///获取寻爱配置信息 -+(void)requestLoveSettingInfoComplection:(HttpRequestHelperCompletion)complection; -///购买门票 -+(void)buyLoveTicketComplection:(HttpRequestHelperCompletion)complection num:(NSString *)num; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Api/Api+CandyTree.m b/YuMi/Modules/YMRoom/View/CandyTree/Api/Api+CandyTree.m deleted file mode 100644 index e1a3b1e..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Api/Api+CandyTree.m +++ /dev/null @@ -1,47 +0,0 @@ -// -// Api+CandyTree.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/9. -// - -#import "Api+CandyTree.h" - -@implementation Api (CandyTree) - - -/// 获取糖果树的信息 -/// @param complection 完成 -/// @param uid 用的uid -+ (void)candyTreeKeyComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid { - [self makeRequest:@"box/userkey" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, nil]; -} - -/// 摘糖果 -/// @param complection 完成 -/// @param sendMessage 是否发送消息 1:发送， 0不发送 -/// @param num 糖果的个数 -/// @param roomUid 房间的uid -+ (void)pickCandyComplection:(HttpRequestHelperCompletion)complection sendMessage:(NSString *)sendMessage num:(NSString *)num roomUid:(NSString *)roomUid uid:(NSString *)uid{ - [self makeRequest:@"findLove/draw" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, sendMessage, num, roomUid, uid, nil]; -} - - -/// 获取糖果树排行榜 -/// @param complection 完成 -/// @param page 当前的页数 -/// @param pageSize 一页多少个 -/// @param type 类型 今天榜单的话 1 昨日榜 2 -+ (void)candyTreeRankListComplection:(HttpRequestHelperCompletion)complection page:(NSString *)page pageSize:(NSString *)pageSize type:(NSString *)type { - [self makeRequest:@"findLove/rank" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, page, pageSize, type, nil]; -} -///获取寻爱配置信息 -+(void)requestLoveSettingInfoComplection:(HttpRequestHelperCompletion)complection{ - [self makeRequest:@"findLove/user" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, nil]; - -} -///购买门票 -+(void)buyLoveTicketComplection:(HttpRequestHelperCompletion)complection num:(NSString *)num{ - [self makeRequest:@"findLove/buyTicket" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__,num, nil]; -} -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeInfoModel.h b/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeInfoModel.h deleted file mode 100644 index 27d8fea..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeInfoModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// CandyTreeInfoModel.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface CandyTreeInfoModel : PIBaseModel -///糖果的数量 -@property (nonatomic, assign) NSInteger keyNum; -///糖果树展示消息开关需要的等级 -@property (nonatomic, assign) NSInteger sendMessageSwitchLevel; -/// -@property (nonatomic,copy) NSString *goldNum; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeInfoModel.m b/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeInfoModel.m deleted file mode 100644 index f2ca600..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// CandyTreeInfoModel.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/9. -// - -#import "CandyTreeInfoModel.h" - -@implementation CandyTreeInfoModel - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeRecordModel.h b/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeRecordModel.h deleted file mode 100644 index 1b86eb4..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeRecordModel.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// CandyTreeRecordModel.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface CandyTreeRecordModel : PIBaseModel - -@property (nonatomic,assign) NSInteger uid; - -///昵称 -@property (copy, nonatomic) NSString *nick; -///头像 -@property (copy, nonatomic) NSString *avatar; -///排名 -@property (nonatomic,copy) NSString *ranking; -///糖果树排行榜钻石 -@property (nonatomic,copy) NSString *diamonds; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeRecordModel.m b/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeRecordModel.m deleted file mode 100644 index 886a7f0..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeRecordModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// CandyTreeRecordModel.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import "CandyTreeRecordModel.h" - -@implementation CandyTreeRecordModel - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeResultModel.h b/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeResultModel.h deleted file mode 100644 index 7e40612..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeResultModel.h +++ /dev/null @@ -1,64 +0,0 @@ -// -// CandyTreeResultModel.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, CandyTreeGiftLevel) { - CandyTreeGiftLevel_First = 1, - CandyTreeGiftLevel_Second, - CandyTreeGiftLevel_Third, - CandyTreeGiftLevel_Fourth, - CandyTreeGiftLevel_Fifth, -}; - -@interface CandyTreeGiftInfoModel : PIBaseModel -///奖品数量 -@property (nonatomic, assign) int prizeNum; -///奖品数量 -@property (nonatomic, assign) int num; -///相关实体id -@property (nonatomic, assign) NSInteger referenceId; -///相关实体id -@property (nonatomic, assign) NSInteger rewardId; - -///奖品等级 -@property (nonatomic, assign) CandyTreeGiftLevel prizeLevel; -///奖品等级 -@property (nonatomic, assign) CandyTreeGiftLevel level; - -///奖品名称 -@property (nonatomic, copy) NSString *prizeName; -///奖品名称 -@property (nonatomic, copy) NSString *rewardName; -@property(nonatomic,copy) NSString *diamonds; - -///奖品icon -@property (nonatomic, copy) NSString *prizeImgUrl; - -@property (nonatomic, copy) NSString *picUrl; - -///奖品id -@property (nonatomic, assign) NSInteger prizeId; -///价格 -@property (nonatomic, assign) CGFloat platformValue; -///送礼物的人 -@property (nonatomic,copy) NSString *uid; -//送礼物的人所在的房间 -@property (nonatomic,copy) NSString *roomUid; -///送礼物人的名称 -@property (nonatomic,copy) NSString *nick; -@end - -@interface CandyTreeResultModel : PIBaseModel - - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeResultModel.m b/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeResultModel.m deleted file mode 100644 index 414da9d..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Model/CandyTreeResultModel.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// CandyTreeResultModel.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import "CandyTreeResultModel.h" - -@implementation CandyTreeGiftInfoModel - - - -@end - -@implementation CandyTreeResultModel - -+ (NSDictionary *)objectClassInArray { - return @{@"prizeItemList": CandyTreeGiftInfoModel.class}; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Model/PICandyTreeSetModel.h b/YuMi/Modules/YMRoom/View/CandyTree/Model/PICandyTreeSetModel.h deleted file mode 100644 index bc73a1b..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Model/PICandyTreeSetModel.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// PICandyTreeSetModel.h -// YuMi -// -// Created by duoban on 2023/9/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PICandyTreeSetModel : UIView -@property(nonatomic,copy) NSString *diamond; -@property(nonatomic,copy) NSString *ticketNum; -@property(nonatomic,copy) NSString *ticketPrice; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Model/PICandyTreeSetModel.m b/YuMi/Modules/YMRoom/View/CandyTree/Model/PICandyTreeSetModel.m deleted file mode 100644 index fbf79fc..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Model/PICandyTreeSetModel.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// PICandyTreeSetModel.m -// YuMi -// -// Created by duoban on 2023/9/11. -// - -#import "PICandyTreeSetModel.h" - -@implementation PICandyTreeSetModel - -/* -// Only override drawRect: if you perform custom drawing. -// An empty implementation adversely affects performance during animation. -- (void)drawRect:(CGRect)rect { - // Drawing code -} -*/ - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Model/XPCandyTreeAnimationModel.h b/YuMi/Modules/YMRoom/View/CandyTree/Model/XPCandyTreeAnimationModel.h deleted file mode 100644 index 4f0ba4b..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Model/XPCandyTreeAnimationModel.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// XPCandyTreeAnimationModel.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/11. -// -///当前的view 需要进行什么样式的动画 -#import -#import -NS_ASSUME_NONNULL_BEGIN - -@interface XPCandyTreeAnimationModel : PIBaseModel -///移除的时间 -@property (nonatomic,assign) CGFloat removeTime; -///是不是移除动画 默认动画完 不移除 -@property (nonatomic,assign) BOOL isRemoveAnimation; -///开始的时间 -@property (nonatomic,assign) CGFloat beginTime; -///动画的key -@property (nonatomic,strong) NSString *animationKey; -///透明度起始值 -@property (nonatomic,assign) CGFloat alphaFromValue; -///透明度变化到的值 -@property (nonatomic,assign) CGFloat alphaToValue; -///持续的时间 -@property (nonatomic,assign) CGFloat durationTime; -///平移的时候动画的开始位置 -@property (nonatomic,assign) CGFloat offsetFromY; -///平移的时候动画的结束位置 -@property (nonatomic,assign) CGFloat offsetToY; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Model/XPCandyTreeAnimationModel.m b/YuMi/Modules/YMRoom/View/CandyTree/Model/XPCandyTreeAnimationModel.m deleted file mode 100644 index f12dce1..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Model/XPCandyTreeAnimationModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// XPCandyTreeAnimationModel.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/11. -// - -#import "XPCandyTreeAnimationModel.h" - -@implementation XPCandyTreeAnimationModel - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Presenter/XPCandyTreePresenter.h b/YuMi/Modules/YMRoom/View/CandyTree/Presenter/XPCandyTreePresenter.h deleted file mode 100644 index 2cd88d4..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Presenter/XPCandyTreePresenter.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// XPCandyTreePresenter.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/9. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPCandyTreePresenter : BaseMvpPresenter -/// 获取糖果树信息 -- (void)getCandyTreeInfo; -///获取寻爱配置信息 --(void)getLoveSettingInfo; -/// 摘糖果 -/// @param keyNum 摘取的个数 -/// @param roomUid 房主的uid -- (void)pickCandy:(NSString *)keyNum roomUid:(NSString *)roomUid isSendMessage:(BOOL)isSendMessage; -///购买门票 --(void)buyLoveTicket:(NSString *)num; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Presenter/XPCandyTreePresenter.m b/YuMi/Modules/YMRoom/View/CandyTree/Presenter/XPCandyTreePresenter.m deleted file mode 100644 index 26c6ca2..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Presenter/XPCandyTreePresenter.m +++ /dev/null @@ -1,69 +0,0 @@ -// -// XPCandyTreePresenter.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/9. -// - -#import "XPCandyTreePresenter.h" -#import "Api+CandyTree.h" -#import "AccountInfoStorage.h" -#import "XPCandyTreeProtocol.h" -#import "CandyTreeInfoModel.h" -#import "CandyTreeResultModel.h" -#import "PICandyTreeSetModel.h" -@implementation XPCandyTreePresenter - - -/// 获取糖果树信息 -- (void)getCandyTreeInfo { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api candyTreeKeyComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - CandyTreeInfoModel * infor = [CandyTreeInfoModel modelWithJSON:data.data]; - [[self getView] getCandyTreeInfoSuccess:infor]; - } showLoading:YES] uid:uid]; -} - - -/// 摘糖果 -/// @param keyNum 摘取的个数 -/// @param roomUid 房主的uid -- (void)pickCandy:(NSString *)keyNum roomUid:(NSString *)roomUid isSendMessage:(BOOL)isSendMessage{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString *showSwitch = [[NSUserDefaults standardUserDefaults] objectForKey:@"kCandyTreeHideMessage"]; - NSString *sendMessage; - if(showSwitch != nil){ - sendMessage = @"0"; - }else{ - sendMessage = isSendMessage == YES ? @"1":@"0"; - } - - [Api pickCandyComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *resultModel = [CandyTreeGiftInfoModel modelsWithArray:data.data]; - [[self getView] pickCandySuccess:resultModel]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - if(code == 31005){ - [[self getView]pickCandyPay]; - return; - } - [[self getView] pickCandyFail]; - }] sendMessage:sendMessage num:keyNum roomUid:roomUid uid:uid]; -} -///获取寻爱配置信息 --(void)getLoveSettingInfo{ - [Api requestLoveSettingInfoComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - PICandyTreeSetModel *setModel = [PICandyTreeSetModel modelWithDictionary:data.data]; - [[self getView]getLoveSettingInfoSuccess:setModel]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } errorToast:YES]]; -} -///购买门票 --(void)buyLoveTicket:(NSString *)num{ - [Api buyLoveTicketComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView]buyLoveTicketSuccessWithNum:num]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES] num:num]; -} -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/Protocol/XPCandyTreeProtocol.h b/YuMi/Modules/YMRoom/View/CandyTree/Protocol/XPCandyTreeProtocol.h deleted file mode 100644 index 9b426a2..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/Protocol/XPCandyTreeProtocol.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// XPCandyTreeProtocol.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class CandyTreeInfoModel, CandyTreeGiftInfoModel,PICandyTreeSetModel; -@protocol XPCandyTreeProtocol -///获取糖果树信息成功 -- (void)getCandyTreeInfoSuccess:(CandyTreeInfoModel *)info; -///摘糖果成功 -- (void)pickCandySuccess:(NSArray * )result; -///摘糖果失败 -- (void)pickCandyFail; -///摘糖果余额不足，要充值 --(void)pickCandyPay; -///获取寻爱配置信息成功 --(void)getLoveSettingInfoSuccess:(PICandyTreeSetModel *)setModel; -///购买门票 --(void)buyLoveTicketSuccessWithNum:(NSString *)num; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeEmptyableViewCell.h b/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeEmptyableViewCell.h deleted file mode 100644 index 6f2caa8..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeEmptyableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPCandyTreeEmptyableViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPCandyTreeEmptyableViewCell : UITableViewCell - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeEmptyableViewCell.m b/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeEmptyableViewCell.m deleted file mode 100644 index e0d1b4c..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeEmptyableViewCell.m +++ /dev/null @@ -1,71 +0,0 @@ -// -// XPCandyTreeEmptyableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import "XPCandyTreeEmptyableViewCell.h" -///Third -#import -#import "UIImageConstant.h" - - -@interface XPCandyTreeEmptyableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPCandyTreeEmptyableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(50); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPCandyTreeEmptyableViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeMoreRuleCell.h b/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeMoreRuleCell.h deleted file mode 100644 index a7cae86..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeMoreRuleCell.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// XPCandyTreeMoreRuleCell.h -// xplan-ios -// -// Created by GreenLand on 2022/4/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class XPCandyTreeMoreRuleCell; -@protocol XPCandyTreeMoreRuleCellDelegate - -- (void)xPCandyTreeMoreRuleCell:(XPCandyTreeMoreRuleCell *)cell switchChange:(UISwitch *)change; - -@end - -@interface XPCandyTreeMoreRuleCell : UITableViewCell -@property (nonatomic, copy) NSString *title; -@property (nonatomic, assign) BOOL isShow; -///是否可以切换 -@property (nonatomic,assign) BOOL isSwitchEnable; -///等级 -@property (nonatomic,assign) NSInteger sendMessageSwitchLevel; - -@property (nonatomic, weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeMoreRuleCell.m b/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeMoreRuleCell.m deleted file mode 100644 index 065a498..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeMoreRuleCell.m +++ /dev/null @@ -1,119 +0,0 @@ -// -// XPCandyTreeMoreRuleCell.m -// xplan-ios -// -// Created by GreenLand on 2022/4/29. -// - -#import "XPCandyTreeMoreRuleCell.h" -///Third -#import - - - -@interface XPCandyTreeMoreRuleCell () - -@property (nonatomic,strong) UILabel *titleLabel; -@property (nonatomic, strong) UISwitch *switchButton; -@property (nonatomic,strong) UIButton *disableButton; - -@end - - -@implementation XPCandyTreeMoreRuleCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.switchButton]; - [self.contentView addSubview:self.disableButton]; -} - -- (void)initSubViewConstraints { - [self.switchButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.trailing.mas_equalTo(-16); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(-70); - }]; - - - [self.disableButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.switchButton); - }]; -} - -- (void)switchDidChange:(UISwitch *)switchButton { - if (self.isSwitchEnable && self.delegate && [self.delegate respondsToSelector:@selector(xPCandyTreeMoreRuleCell:switchChange:)]) { - [self.delegate xPCandyTreeMoreRuleCell:self switchChange:switchButton]; - } -} - -- (void)disableButtonAction:(UIButton *)sender { - if (!self.isSwitchEnable && self.sendMessageSwitchLevel > 0) { - [XNDJTDDLoadingTool showErrorWithMessage:[NSString stringWithFormat:YMLocalizedString(@"XPCandyTreeMoreRuleCell0"), self.sendMessageSwitchLevel]]; - } -} - -#pragma mark - Getters And Setters -- (void)setTitle:(NSString *)title { - self.titleLabel.text = title; -} - -- (void)setIsShow:(BOOL)isShow { - self.switchButton.on = isShow; -} - -- (void)setIsSwitchEnable:(BOOL)isSwitchEnable { - _isSwitchEnable = isSwitchEnable; - if (_isSwitchEnable) { - [self.switchButton setOnTintColor:[DJDKMIMOMColor appMainColor]]; - self.disableButton.hidden = YES; - } else { - [self.switchButton setOnTintColor:[DJDKMIMOMColor disableButtonColor]]; - self.switchButton.on = NO; - self.disableButton.hidden = NO; - } -} - -- (UISwitch *)switchButton { - if (!_switchButton) { - _switchButton = [[UISwitch alloc] init]; - [_switchButton addTarget:self action:@selector(switchDidChange:) forControlEvents:UIControlEventValueChanged]; - - } - return _switchButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - - _titleLabel.textColor = [DJDKMIMOMColor alertTitleColor]; - _titleLabel.numberOfLines = 0; - } - return _titleLabel; -} - -- (UIButton *)disableButton { - if (!_disableButton) { - _disableButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_disableButton addTarget:self action:@selector(disableButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _disableButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeRankTableViewCell.h b/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeRankTableViewCell.h deleted file mode 100644 index fcecdf4..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeRankTableViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPCandyTreeRankTableViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class CandyTreeRecordModel; -@interface XPCandyTreeRankTableViewCell : UITableViewCell -/// -@property (nonatomic,strong) CandyTreeRecordModel *roomRankModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeRankTableViewCell.m b/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeRankTableViewCell.m deleted file mode 100644 index cfab27e..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeRankTableViewCell.m +++ /dev/null @@ -1,175 +0,0 @@ -// -// XPCandyTreeRankTableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import "XPCandyTreeRankTableViewCell.h" -///Third -#import -///Tool -#import "ThemeColor+Room.h" -#import "NetImageView.h" -///Model -#import "CandyTreeRecordModel.h" -@interface XPCandyTreeRankTableViewCell () -///排行榜图片 -@property (nonatomic, strong) UIImageView *rankImageView; - -///头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -///性别 -@property (nonatomic, strong) UIImageView *genderImageView; -///昵称 -@property (nonatomic, strong) UILabel *nickNameLabel; -///金币数 -@property (nonatomic, strong) UILabel *coinNumberLabel; -/// 钻石 -@property (nonatomic, strong) UIImageView *coinImageView; - -@end - -@implementation XPCandyTreeRankTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.rankImageView]; - - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickNameLabel]; - [self.contentView addSubview:self.coinNumberLabel]; - [self.contentView addSubview:self.coinImageView]; -} - -- (void)initSubViewConstraints { - - - [self.rankImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(12)); - make.width.height.mas_equalTo(kGetScaleWidth(22)); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.width.height.mas_equalTo(kGetScaleWidth(58)); - make.leading.mas_equalTo(self.rankImageView.mas_trailing).offset(kGetScaleWidth(20)); - }]; - - [self.nickNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(kGetScaleWidth(8)); - make.centerY.mas_equalTo(self.avatarImageView); - make.trailing.mas_lessThanOrEqualTo(self.coinNumberLabel.mas_leading).offset(-kGetScaleWidth(5)); - }]; - - [self.coinImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - make.centerY.mas_equalTo(self.avatarImageView.mas_centerY); - make.width.mas_equalTo(kGetScaleWidth(14)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; - - [self.coinNumberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.coinImageView.mas_leading).offset(-kGetScaleWidth(3)); - make.centerY.mas_equalTo(self.avatarImageView); - make.width.mas_greaterThanOrEqualTo(10); - }]; - - -} - -#pragma mark - Getters And Setters -- (void)setRoomRankModel:(CandyTreeRecordModel *)roomRankModel { - _roomRankModel = roomRankModel; - NSString *rankImage = [NSString stringWithFormat:@"room_candytree_wish_num%d", _roomRankModel.ranking.intValue]; - if (roomRankModel.ranking.intValue <= 3) { - self.rankImageView.image = [UIImage imageNamed:rankImage]; - self.rankImageView.hidden = NO; - - }else { - - self.rankImageView.hidden = YES; - - } - self.coinNumberLabel.text = roomRankModel.diamonds; - self.avatarImageView.imageUrl = _roomRankModel.avatar; - self.nickNameLabel.text = _roomRankModel.nick;; -} - -- (UIImageView *)rankImageView { - if (!_rankImageView) { - _rankImageView = [[UIImageView alloc] init]; - } - return _rankImageView; -} - - - - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = kGetScaleWidth(58)/2; - _avatarImageView.layer.borderWidth = 1; - _avatarImageView.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _avatarImageView; -} - - -- (UIImageView *)genderImageView { - if (!_genderImageView) { - _genderImageView = [[UIImageView alloc] init]; - _genderImageView.hidden = YES; - [_genderImageView setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _genderImageView; -} - -- (UILabel *)nickNameLabel { - if (!_nickNameLabel) { - _nickNameLabel = [[UILabel alloc] init]; - _nickNameLabel.font = kFontRegular(14); - _nickNameLabel.textColor = [UIColor whiteColor]; - } - return _nickNameLabel; -} - - -- (UILabel *)coinNumberLabel{ - if (!_coinNumberLabel) { - _coinNumberLabel = [[UILabel alloc] init]; - _coinNumberLabel.font = kFontMedium(14); - _coinNumberLabel.textColor = UIColorFromRGB(0xF8FF7B); - _coinNumberLabel.textAlignment = NSTextAlignmentRight; - [_coinNumberLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _coinNumberLabel; -} - -- (UIImageView *)coinImageView { - if (!_coinImageView) { - _coinImageView = [[UIImageView alloc] init]; - _coinImageView.image = [UIImage imageNamed:@"moli_money_icon"]; - } - return _coinImageView; -} - - - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyRankContainerView.h b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyRankContainerView.h deleted file mode 100644 index 0d3601c..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyRankContainerView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPCandyRankContainerView.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - - -@protocol XPCandyRankContainerViewDelegate - --(void)didClickHeadHandle:(NSInteger)uid; - -@end - - -@interface XPCandyRankContainerView : UIView -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyRankContainerView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyRankContainerView.m deleted file mode 100644 index 7bcccaa..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyRankContainerView.m +++ /dev/null @@ -1,201 +0,0 @@ -// -// XPCandyRankContainerView.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import "XPCandyRankContainerView.h" - - -///Tool -#import "ThemeColor+Room.h" -///View -#import "XPCandyTreeRankView.h" -@interface XPCandyRankContainerView () -@property(nonatomic,strong) UIImageView *bgImageView; -///刷新 -@property (nonatomic,strong) UIButton *refreshButton; -///今日榜单 -@property (nonatomic,strong) XPCandyTreeRankView *todayListView; -///昨日榜单 -@property (nonatomic,strong) XPCandyTreeRankView *yesterdayListView; -@property(nonatomic,strong) UIButton *todayBtn; -@property(nonatomic,strong) UIButton *yesterdayBtn; -@property(nonatomic,strong) UIImageView *btnBgView; - -@end - -@implementation XPCandyRankContainerView -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - - [self addSubview:self.bgImageView]; - [self addSubview:self.btnBgView]; - [self.btnBgView addSubview:self.todayBtn]; - [self.btnBgView addSubview:self.yesterdayBtn]; - [self addSubview:self.todayListView]; - [self addSubview:self.yesterdayListView]; - - - CAShapeLayer * layer = [CAShapeLayer layer]; - UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth,kGetScaleWidth(552)) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(kGetScaleWidth(20), kGetScaleWidth(20))]; - layer.path = path.CGPath; - self.layer.mask = layer; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(kGetScaleWidth(552)); - }]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.btnBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(225)); - make.height.mas_equalTo(kGetScaleWidth(40)); - make.top.mas_equalTo(kGetScaleWidth(22)); - make.centerX.equalTo(self); - }]; - [self.todayBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(113)); - make.height.mas_equalTo(kGetScaleWidth(40)); - make.leading.top.mas_equalTo(0); - - - }]; - [self.yesterdayBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(113)); - make.height.mas_equalTo(kGetScaleWidth(40)); - make.trailing.top.mas_equalTo(0); - }]; - [self.todayListView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self); - make.top.equalTo(self.btnBgView.mas_bottom).mas_offset(kGetScaleWidth(26)); - }]; - [self.yesterdayListView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.todayListView); - }]; -} - -#pragma mark - Event Response -- (void)refreshButtonAction:(UIButton *)sender { - self.todayListView.type = CandyTreeRecordType_Today; - self.yesterdayListView.type = CandyTreeRecordType_Yesterday; -} --(void)clickTodayBtnAction:(UIButton *)sender{ - if(sender == self.todayBtn){ - self.todayBtn.selected = YES; - self.yesterdayBtn.selected = NO; - self.todayListView.hidden = NO; - self.yesterdayListView.hidden = YES; - return; - } - self.todayBtn.selected = NO; - self.yesterdayBtn.selected = YES; - self.todayListView.hidden = YES; - self.yesterdayListView.hidden = NO; -} -#pragma mark - Getters And Setters - - - - -- (UIButton *)refreshButton { - if (!_refreshButton) { - _refreshButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_refreshButton setImage:[UIImage imageNamed:@"room_candy_tree_record_refresh"] forState:UIControlStateNormal]; - [_refreshButton setImage:[UIImage imageNamed:@"room_candy_tree_record_refresh"] forState:UIControlStateSelected]; - [_refreshButton addTarget:self action:@selector(refreshButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_refreshButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _refreshButton; -} - -- (XPCandyTreeRankView *)todayListView { - if (!_todayListView) { - _todayListView = [[XPCandyTreeRankView alloc] init]; - _todayListView.type = CandyTreeRecordType_Today; - @kWeakify(self) - _todayListView.didClickHandle = ^(NSInteger uid) { - @kStrongify(self) - if(self.delegate && [self.delegate respondsToSelector:@selector(didClickHeadHandle:)]){ - [self.delegate didClickHeadHandle:uid]; - } - }; - } - return _todayListView; -} - -- (XPCandyTreeRankView *)yesterdayListView { - if (!_yesterdayListView) { - _yesterdayListView = [[XPCandyTreeRankView alloc] init]; - _yesterdayListView.type = CandyTreeRecordType_Yesterday; - @kWeakify(self) - _yesterdayListView.didClickHandle = ^(NSInteger uid) { - @kStrongify(self) - if(self.delegate && [self.delegate respondsToSelector:@selector(didClickHeadHandle:)]){ - [self.delegate didClickHeadHandle:uid]; - } - }; - _yesterdayListView.hidden = YES; - } - return _yesterdayListView; -} -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = [kImage(@"ms_joyful_egg_smash_rank_bg") ms_SetImageForRTL]; - _bgImageView.layer.cornerRadius = kGetScaleWidth(40)/2; - _bgImageView.layer.masksToBounds = YES; - } - return _bgImageView; -} -- (UIImageView *)btnBgView{ - if(!_btnBgView){ - _btnBgView = [UIImageView new]; - _btnBgView.userInteractionEnabled = YES; - _btnBgView.image = kImage(@"ms_joyful_egg_smash_rank_btn_bg"); - } - return _btnBgView; -} -- (UIButton *)todayBtn{ - if(!_todayBtn){ - _todayBtn = [UIButton new]; - [_todayBtn setBackgroundImage:nil forState:UIControlStateNormal]; - [_todayBtn setBackgroundImage:[kImage(@"ms_joyful_egg_smash_rank_btn_today")ms_SetImageForRTL] forState:UIControlStateSelected]; - [_todayBtn setTitleColor:[UIColor colorWithWhite:1 alpha:0.7] forState:UIControlStateNormal]; - [_todayBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - [_todayBtn setTitle:YMLocalizedString(@"XPCandyRankContainerView0") forState:UIControlStateNormal]; - _todayBtn.titleLabel.font = kFontMedium(15); - _todayBtn.selected = YES; - [_todayBtn addTarget:self action:@selector(clickTodayBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _todayBtn; -} -- (UIButton *)yesterdayBtn{ - if(!_yesterdayBtn){ - _yesterdayBtn = [UIButton new]; - [_yesterdayBtn setBackgroundImage:nil forState:UIControlStateNormal]; - [_yesterdayBtn setBackgroundImage:[kImage(@"ms_joyful_egg_smash_rank_btn_yesterday")ms_SetImageForRTL] forState:UIControlStateSelected]; - [_yesterdayBtn setTitleColor:[UIColor colorWithWhite:1 alpha:0.7] forState:UIControlStateNormal]; - [_yesterdayBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - [_yesterdayBtn setTitle:YMLocalizedString(@"XPCandyRankContainerView1") forState:UIControlStateNormal]; - _yesterdayBtn.titleLabel.font = kFontMedium(15); - [_yesterdayBtn addTarget:self action:@selector(clickTodayBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _yesterdayBtn; -} -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.h b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.h deleted file mode 100644 index 0914f2e..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPCandyTreeBuySuccessView.h -// YuMi -// -// Created by duoban on 2023/9/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPCandyTreeBuySuccessView : UIView -@property(nonatomic,copy) NSString *num; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m deleted file mode 100644 index 21ef71a..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m +++ /dev/null @@ -1,182 +0,0 @@ -// -// XPCandyTreeBuySuccessView.m -// YuMi -// -// Created by duoban on 2023/9/11. -// - -#import "XPCandyTreeBuySuccessView.h" -@interface XPCandyTreeBuySuccessView() -///返回 -@property(nonatomic,strong) UIButton *closeView; -@property(nonatomic,strong) UIImageView *pi_bgIconView; -///精灵图标 -@property(nonatomic,strong) UIImageView *pi_iconView; -///背景 -@property(nonatomic,strong) UIImageView *bgImageView; - -///得到 -@property(nonatomic,strong) UILabel *getView; -///数量 -@property(nonatomic,strong) UILabel *numView; -///选择今天不显示 -@property(nonatomic,strong) UIButton *chooseBnt; -///今天不显示 -@property(nonatomic,strong) UILabel *tipsView; -@end -@implementation XPCandyTreeBuySuccessView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - - - [self addSubview:self.bgImageView]; - - [self.bgImageView addSubview:self.closeView]; - [self.bgImageView addSubview:self.getView]; - [self.bgImageView addSubview:self.pi_bgIconView]; - [self.pi_bgIconView addSubview:self.pi_iconView]; - [self.bgImageView addSubview:self.numView]; - [self.bgImageView addSubview:self.chooseBnt]; - [self.bgImageView addSubview:self.tipsView]; -} --(void)installConstraints{ - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(240)); - make.width.mas_equalTo(kGetScaleWidth(238)); - make.center.equalTo(self); - }]; - [self.closeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(20)); - make.top.mas_equalTo(kGetScaleWidth(6)); - make.trailing.mas_equalTo(-kGetScaleWidth(8)); - }]; - - [self.getView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(46)); - make.height.mas_equalTo(kGetScaleWidth(20)); - make.centerX.equalTo(self.bgImageView); - }]; - [self.pi_bgIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(80)); - make.centerX.equalTo(self.bgImageView); - make.top.equalTo(self.getView.mas_bottom).mas_offset(4); - }]; - [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(58)); - make.center.equalTo(self.pi_bgIconView); - }]; - [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.bgImageView); - make.height.mas_equalTo(kGetScaleWidth(22)); - make.top.equalTo(self.pi_bgIconView.mas_bottom).mas_offset(kGetScaleWidth(4)); - }]; - [self.tipsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.bgImageView).mas_offset(kGetScaleWidth(6)); - make.height.mas_equalTo(kGetScaleWidth(14)); - make.top.equalTo(self.numView.mas_bottom).mas_offset(kGetScaleWidth(13)); - }]; - [self.chooseBnt mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(10)); - make.trailing.equalTo(self.tipsView.mas_leading).mas_offset(-kGetScaleWidth(2)); - make.centerY.equalTo(self.tipsView); - }]; - -} --(void)setNum:(NSString *)num{ - _num = num; - _numView.text = [NSString stringWithFormat:@"x%@",_num]; -} --(void)closeViewAction{ - [TTPopup dismiss]; -} --(void)chooseTipAction{ - _chooseBnt.selected = !_chooseBnt.selected; - NSString *time = [NSDate getNowTimeTimestamp]; - NSString *curTime = [NSDate timestampSwitchTime:[time integerValue] andFormatter:@"yyyy-MM-dd"]; - NSDictionary *timeDic = [[NSUserDefaults standardUserDefaults]valueForKey:@"kBuyLoveNumSuccessNoPrompt"]; - if(timeDic == nil){ - if(_chooseBnt.selected == NO)return; - NSMutableDictionary *curDic = [[NSMutableDictionary alloc]initWithDictionary:timeDic]; - [curDic setValue:@(YES) forKey:curTime]; - [[NSUserDefaults standardUserDefaults]setValue:curDic forKey:@"kBuyLoveNumSuccessNoPrompt"]; - [[NSUserDefaults standardUserDefaults]synchronize]; - }else{ - NSMutableDictionary *curDic = [[NSMutableDictionary alloc]initWithDictionary:timeDic]; - [curDic removeAllObjects]; - if(_chooseBnt.selected == YES){ - [curDic setValue:@(YES) forKey:curTime]; - } - [[NSUserDefaults standardUserDefaults]setValue:curDic forKey:@"kBuyLoveNumSuccessNoPrompt"]; - [[NSUserDefaults standardUserDefaults]synchronize]; - } -} -#pragma mark - 懒加载 -- (UIButton *)closeView{ - if(!_closeView){ - _closeView = [UIButton new]; - [_closeView setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_closeView setBackgroundImage:kImage(@"room_candy_tree_buy_love_close") forState:UIControlStateNormal]; - [_closeView addTarget:self action:@selector(closeViewAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeView; -} -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = [UIImage getLanguageImage:@"room_candy_tree_buy_love__bg"];//kImage(@"room_candy_tree_buy_love__bg"); - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} --(UIImageView *)pi_iconView{ - if(!_pi_iconView){ - _pi_iconView = [UIImageView new]; - _pi_iconView.image = kImage(@"room_candy_tree_buy_love_icon"); - } - return _pi_iconView; -} -- (UIImageView *)pi_bgIconView{ - if(!_pi_bgIconView){ - _pi_bgIconView = [UIImageView new]; - _pi_bgIconView.image = kImage(@"room_candy_tree_buy_love_icon_bg"); - } - return _pi_bgIconView; -} -- (UILabel *)numView{ - if(!_numView){ - _numView = [UILabel labelInitWithText:@"0" font:kFontMedium(16) textColor:UIColorFromRGB(0x7147E6)]; - } - return _numView; -} -- (UIButton *)chooseBnt{ - if(!_chooseBnt){ - _chooseBnt = [UIButton new]; - [_chooseBnt setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_chooseBnt setImage:kImage(@"room_candy_tree_buy_love_choose") forState:UIControlStateSelected]; - [_chooseBnt setImage:kImage(@"room_candy_tree_buy_love_no_choose") forState:UIControlStateNormal]; - [_chooseBnt addTarget:self action:@selector(chooseTipAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _chooseBnt; -} -- (UILabel *)tipsView{ - if(!_tipsView){ - _tipsView = [UILabel labelInitWithText:YMLocalizedString(@"PITreasureFairyBuyElfShardSuccessView0") font:kFontRegular(10) textColor:UIColorFromRGB(0xA3A0AD)]; - } - return _tipsView; -} -- (UILabel *)getView{ - if(!_getView){ - _getView = [UILabel labelInitWithText:YMLocalizedString(@"PITreasureFairyBuyElfShardSuccessView1") font:kFontMedium(14) textColor:UIColorFromRGB(0x7147E6)]; - } - return _getView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.h b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.h deleted file mode 100644 index 73b2d44..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPCandyTreeBuyView.h -// YuMi -// -// Created by duoban on 2023/9/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@protocol XPCandyTreeBuyViewDelegate -///购买爱心 --(void)buyLoveNumWithNum:(NSString *)num; - -@end -@interface XPCandyTreeBuyView : UIView -@property(nonatomic,weak) iddelegate; -@property(nonatomic,copy) NSString *num; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.m deleted file mode 100644 index 93062ef..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.m +++ /dev/null @@ -1,295 +0,0 @@ -// -// XPCandyTreeBuyView.m -// YuMi -// -// Created by duoban on 2023/9/8. -// - -#import "XPCandyTreeBuyView.h" -@interface XPCandyTreeBuyView() -///背景 -@property(nonatomic,strong) UIImageView *bgImageView; -///爱心logo -@property(nonatomic,strong) UIImageView *iconView; -///爱心数量背景 -@property(nonatomic,strong) UIView *loveNumBgVeiw; -///爱心数量 -@property(nonatomic,strong) UILabel *loveNumVeiw; -///购买一个爱心 -@property(nonatomic,strong) UIButton *oneTapBtn; -///购买十个爱心 -@property(nonatomic,strong) UIButton *tenTapBtn; -///购买百个爱心 -@property(nonatomic,strong) UIButton *hundredTapBtn; -///输入爱心背景 -@property(nonatomic,strong) UIView *textFieldBgView; -///输入爱心数量 -@property(nonatomic,strong) MSBaseTextField *textField; -///购买 -@property(nonatomic,strong) UIButton *purchaseBtn; -///购买的数量 -@property(nonatomic,copy) NSString *chooseNum; -@end -@implementation XPCandyTreeBuyView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.bgImageView]; - - [self.bgImageView addSubview:self.loveNumBgVeiw]; - [self.loveNumBgVeiw addSubview:self.loveNumVeiw]; - [self.bgImageView addSubview:self.iconView]; - [self.bgImageView addSubview:self.oneTapBtn]; - [self.bgImageView addSubview:self.tenTapBtn]; - [self.bgImageView addSubview:self.hundredTapBtn]; - [self.bgImageView addSubview:self.textFieldBgView]; - [self.textFieldBgView addSubview:self.textField]; - [self.bgImageView addSubview:self.purchaseBtn]; -} --(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - - [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(4)); - make.width.height.mas_equalTo(kGetScaleWidth(24)); - make.centerY.equalTo(self.bgImageView); - }]; - [self.loveNumBgVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(16)); - make.height.mas_equalTo(kGetScaleWidth(16)); - make.width.mas_equalTo(kGetScaleWidth(42)); - make.centerY.equalTo(self.bgImageView); - }]; - [self.loveNumVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(12)); - make.top.bottom.trailing.equalTo(self.loveNumBgVeiw); - }]; - [self.oneTapBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(31)); - make.height.mas_equalTo(kGetScaleWidth(16)); - make.centerY.equalTo(self.bgImageView); - make.leading.equalTo(self.loveNumBgVeiw.mas_trailing).mas_offset(kGetScaleWidth(8)); - }]; - [self.tenTapBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(31)); - make.height.mas_equalTo(kGetScaleWidth(16)); - make.centerY.equalTo(self.bgImageView); - make.leading.equalTo(self.oneTapBtn.mas_trailing).mas_offset(kGetScaleWidth(0)); - }]; - [self.hundredTapBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(31)); - make.height.mas_equalTo(kGetScaleWidth(16)); - make.centerY.equalTo(self.bgImageView); - make.leading.equalTo(self.tenTapBtn.mas_trailing).mas_offset(kGetScaleWidth(0)); - }]; - [self.purchaseBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(52)); - make.height.mas_equalTo(kGetScaleWidth(22)); - make.centerY.equalTo(self.bgImageView); - make.trailing.mas_equalTo(-kGetScaleWidth(3)); - }]; - [self.textFieldBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(65)); - make.height.mas_equalTo(kGetScaleWidth(18)); - make.centerY.equalTo(self.bgImageView); - make.trailing.equalTo(self.purchaseBtn.mas_leading).mas_offset(-kGetScaleWidth(6)); - }]; - [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(self.textFieldBgView); - make.leading.trailing.equalTo(self.textFieldBgView).inset(kGetScaleWidth(8)); - }]; -} -#pragma mark -UITextFieldDelegate -- (void)textFieldDidChange:(UITextField *)textField { - if(textField.text.integerValue <= 0){ - textField.text = @""; - }else if(textField.text.integerValue > 99999){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPCandyTreeViewController5")]; - textField.text = @"99999"; - } - self.chooseNum = textField.text; - - NSArray *btnArr = @[self.oneTapBtn,self.tenTapBtn,self.hundredTapBtn]; - for (UIButton *btn in btnArr) { - btn.backgroundColor = [UIColor clearColor]; - [btn setTitleColor:[UIColor colorWithWhite:1 alpha:0.6] forState:UIControlStateNormal]; - } -} -- (void)textFieldDidEndEditing:(UITextField *)textField{ - if(textField.text.length <= 0){ - textField.text = @""; - }else if(textField.text.integerValue > 99999){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPCandyTreeViewController5")]; - textField.text = @"99999"; - } - self.chooseNum = textField.text; - NSArray *btnArr = @[self.oneTapBtn,self.tenTapBtn,self.hundredTapBtn]; - for (UIButton *btn in btnArr) { - btn.backgroundColor = [UIColor clearColor]; - [btn setTitleColor:[UIColor colorWithWhite:1 alpha:0.6] forState:UIControlStateNormal]; - } -} -- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { - return [self validateNumber:string]; -} - -- (BOOL)validateNumber:(NSString*)number { - BOOL res = YES; - NSCharacterSet* tmpSet = [NSCharacterSet characterSetWithCharactersInString:@"0123456789"]; - int i = 0; - while (i < number.length) { - NSString * string = [number substringWithRange:NSMakeRange(i, 1)]; - NSRange range = [string rangeOfCharacterFromSet:tmpSet]; - if (range.length == 0) { - res = NO; - break; - } - i++; - } - return res; -} --(void)choosePurchaseNumAction:(UIButton *)sender{ - self.chooseNum = sender.currentTitle; - NSArray *btnArr = @[self.oneTapBtn,self.tenTapBtn,self.hundredTapBtn]; - self.textField.text = @""; - for (UIButton *btn in btnArr) { - if(btn == sender){ - btn.backgroundColor = [UIColor colorWithWhite:1 alpha:0.2]; - [btn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - }else{ - btn.backgroundColor = [UIColor clearColor]; - [btn setTitleColor:[UIColor colorWithWhite:1 alpha:0.6] forState:UIControlStateNormal]; - } - } -} --(void)purechaseLoveAction{ - if(self.self.chooseNum.length ==0){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPCandyTreeBuyView0")]; - return; - } - if(self.delegate && [self.delegate respondsToSelector:@selector(buyLoveNumWithNum:)]){ - [self.delegate buyLoveNumWithNum:self.chooseNum]; - } - [self.textField resignFirstResponder]; -} --(void)setNum:(NSString *)num{ - _num = num; - _loveNumVeiw.text = _num; -} -#pragma mark - 懒加载 -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = kImage(@"room_candy_tree_buy_bg"); - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} --(UIImageView *)iconView{ - if(!_iconView){ - _iconView = [UIImageView new]; - _iconView.image = kImage(@"room_candy_tree_buy_icon"); - } - return _iconView; -} -- (UIButton *)purchaseBtn{ - if(!_purchaseBtn){ - _purchaseBtn = [UIButton new]; - [_purchaseBtn setBackgroundImage:kImage(@"room_candy_tree_buy_tap_bg") forState:UIControlStateNormal]; - [_purchaseBtn setTitle:YMLocalizedString(@"XPTreasureFairyBottomView1") forState:UIControlStateNormal]; - _purchaseBtn.titleLabel.font = kFontMedium(10); - [_purchaseBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_purchaseBtn addTarget:self action:@selector(purechaseLoveAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _purchaseBtn; -} -- (UIView *)loveNumBgVeiw{ - if(!_loveNumBgVeiw){ - _loveNumBgVeiw = [UIView new]; - _loveNumBgVeiw.backgroundColor = [UIColor colorWithWhite:1 alpha:0.2]; - _loveNumBgVeiw.layer.cornerRadius = kGetScaleWidth(16)/2; - _loveNumBgVeiw.layer.masksToBounds = YES; - } - return _loveNumBgVeiw; -} -- (UILabel *)loveNumVeiw{ - if(!_loveNumVeiw){ - _loveNumVeiw = [UILabel labelInitWithText:@"0" font:kFontRegular(10) textColor:[UIColor whiteColor]]; - _loveNumVeiw.textAlignment = NSTextAlignmentCenter; - } - return _loveNumVeiw; -} -- (UIButton *)oneTapBtn{ - if(!_oneTapBtn){ - _oneTapBtn = [UIButton new]; - [_oneTapBtn setTitle:@"1" forState:UIControlStateNormal]; - [_oneTapBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - [_oneTapBtn setTitleColor:[UIColor colorWithWhite:1 alpha:0.6] forState:UIControlStateNormal]; - - _oneTapBtn.titleLabel.font = kFontMedium(10); - _oneTapBtn.layer.cornerRadius = kGetScaleWidth(16)/2; - _oneTapBtn.layer.masksToBounds = YES; - [_oneTapBtn addTarget:self action:@selector(choosePurchaseNumAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _oneTapBtn; -} -- (UIButton *)tenTapBtn{ - if(!_tenTapBtn){ - _tenTapBtn = [UIButton new]; - [_tenTapBtn setTitle:@"10" forState:UIControlStateNormal]; - [_tenTapBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - [_tenTapBtn setTitleColor:[UIColor colorWithWhite:1 alpha:0.6] forState:UIControlStateNormal]; - _tenTapBtn.titleLabel.font = kFontMedium(10); - _tenTapBtn.layer.cornerRadius = kGetScaleWidth(16)/2; - _tenTapBtn.layer.masksToBounds = YES; - [_tenTapBtn addTarget:self action:@selector(choosePurchaseNumAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _tenTapBtn; -} -- (UIButton *)hundredTapBtn{ - if(!_hundredTapBtn){ - _hundredTapBtn = [UIButton new]; - [_hundredTapBtn setTitle:@"100" forState:UIControlStateNormal]; - [_hundredTapBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - [_hundredTapBtn setTitleColor:[UIColor colorWithWhite:1 alpha:0.6] forState:UIControlStateNormal]; - _hundredTapBtn.titleLabel.font = kFontMedium(10); - _hundredTapBtn.layer.cornerRadius = kGetScaleWidth(16)/2; - _hundredTapBtn.layer.masksToBounds = YES; - [_hundredTapBtn addTarget:self action:@selector(choosePurchaseNumAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _hundredTapBtn; -} -- (UIView *)textFieldBgView{ - if(!_textFieldBgView){ - _textFieldBgView = [UIView new]; - _textFieldBgView.backgroundColor = UIColorFromRGB(0x7748C7); - [_textFieldBgView setCornerWithLeftTopCorner:kGetScaleWidth(9) rightTopCorner:kGetScaleWidth(9) bottomLeftCorner:kGetScaleWidth(9) bottomRightCorner:kGetScaleWidth(9) size:CGSizeMake(kGetScaleWidth(65), kGetScaleWidth(18))]; - } - return _textFieldBgView; -} -- (MSBaseTextField *)textField{ - if(!_textField){ - _textField = [[MSBaseTextField alloc]init]; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPTreasureFairyBottomView0") attributes:@{NSFontAttributeName:kFontMedium(10),NSForegroundColorAttributeName:[UIColor colorWithWhite:1 alpha:0.6]}]; - _textField.attributedPlaceholder = textAtt; - _textField.font = kFontMedium(10); - _textField.textColor = [UIColor whiteColor]; - _textField.keyboardType = UIKeyboardTypeNumberPad; - _textField.textAlignment = NSTextAlignmentCenter; - _textField.delegate = self; - _textField.adjustsFontSizeToFitWidth = YES; - _textField.backgroundColor = [UIColor clearColor]; - [_textField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; - } - return _textField; -} -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.h b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.h deleted file mode 100644 index 3ba89cd..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// XPCandyTreeConfirmBuyNumView.h -// YuMi -// -// Created by duoban on 2023/9/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@protocol XPCandyTreeConfirmBuyNumViewDelegate - --(void)inputLoveNum:(NSString *)num; - -@end -@interface XPCandyTreeConfirmBuyNumView : UIView -@property(nonatomic,copy) NSString *text; -@property(nonatomic,weak) iddelegate; -///爱心碎片数量 -@property(nonatomic,copy) NSString *loveNum; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.m deleted file mode 100644 index a6eb9ef..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.m +++ /dev/null @@ -1,188 +0,0 @@ -// -// XPCandyTreeConfirmBuyNumView.m -// YuMi -// -// Created by duoban on 2023/9/11. -// - -#import "XPCandyTreeConfirmBuyNumView.h" -@interface XPCandyTreeConfirmBuyNumView() -///加 -@property(nonatomic,strong) UIButton *addBtn; -///减 -@property(nonatomic,strong) UIButton *subtractBtn; -///背景 -@property(nonatomic,strong) UIImageView *bgView; -///输入框 -@property(nonatomic,strong) MSBaseTextField *textFiled; - -@end -@implementation XPCandyTreeConfirmBuyNumView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.bgView]; - [self.bgView addSubview:self.subtractBtn]; - - [self.bgView addSubview:self.addBtn]; - - [self.bgView addSubview:self.textFiled]; -} --(void)installConstraints{ - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - - [self.subtractBtn mas_makeConstraints:^(MASConstraintMaker *make) { - - - make.width.mas_equalTo(kGetScaleWidth(40)); - make.height.mas_equalTo(21); - make.centerY.equalTo(self.subtractBtn); - make.trailing.mas_equalTo(-kGetScaleWidth(6)); - }]; - [self.addBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(40)); - make.height.mas_equalTo(21); - make.top.mas_equalTo(1.2); - make.leading.mas_equalTo(kGetScaleWidth(6)); - }]; - - [self.textFiled mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.subtractBtn.mas_leading).mas_offset(-kGetScaleWidth(0)); - make.leading.equalTo(self.addBtn.mas_trailing).mas_offset(kGetScaleWidth(0)); - make.bottom.top.equalTo(self); - }]; - -} --(void)setLoveNum:(NSString *)loveNum{ - _loveNum = loveNum; - _textFiled.text = _loveNum; - - -} -#pragma mark -UITextFieldDelegate -- (void)textFieldDidChanged:(UITextField *)textField { - if(textField.text.integerValue <= 0){ - textField.text = @""; - }else if(textField.text.integerValue > 99999){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPCandyTreeViewController5")]; - textField.text = @"99999"; - } - - - if(self.delegate && [self.delegate respondsToSelector:@selector(inputLoveNum:)]){ - [self.delegate inputLoveNum:textField.text]; - } -} -- (void)textFieldDidEndEditing:(UITextField *)textField{ - if(textField.text.length <= 0){ - textField.text = @""; - }else if(textField.text.integerValue > 99999){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPCandyTreeViewController5")]; - textField.text = @"99999"; - } - - if(self.delegate && [self.delegate respondsToSelector:@selector(inputLoveNum:)]){ - [self.delegate inputLoveNum:textField.text]; - } -} -- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { - return [self validateNumber:string]; -} - -- (BOOL)validateNumber:(NSString*)number { - BOOL res = YES; - NSCharacterSet* tmpSet = [NSCharacterSet characterSetWithCharactersInString:@"0123456789"]; - int i = 0; - while (i < number.length) { - NSString * string = [number substringWithRange:NSMakeRange(i, 1)]; - NSRange range = [string rangeOfCharacterFromSet:tmpSet]; - if (range.length == 0) { - res = NO; - break; - } - i++; - } - return res; -} --(void)addBtnAction{ - - NSInteger num = self.textFiled.text.integerValue + 10; - if(num > 99999){ - num = 99999; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPCandyTreeViewController5")]; - } - self.textFiled.text = @(num).stringValue; - if(self.delegate && [self.delegate respondsToSelector:@selector(inputLoveNum:)]){ - [self.delegate inputLoveNum:self.textFiled.text]; - } -} --(void)subtractAction{ - NSInteger num = self.textFiled.text.integerValue - 10; - if(num <= 0){ - self.textFiled.text = @"1"; - if(self.delegate && [self.delegate respondsToSelector:@selector(inputLoveNum:)]){ - [self.delegate inputLoveNum:self.textFiled.text]; - } - return; - } - - self.textFiled.text = @(num).stringValue; - if(self.delegate && [self.delegate respondsToSelector:@selector(inputLoveNum:)]){ - [self.delegate inputLoveNum:self.textFiled.text]; - } -} -#pragma mark - 懒加载 -- (NSString *)text{ - return self.textFiled.text; -} -- (UIImageView *)bgView{ - if(!_bgView){ - _bgView = [UIImageView new]; - _bgView.image = kImage(@"room_candy_tree_confirm_buy_num_bg"); - _bgView.userInteractionEnabled = YES; - _bgView.contentMode = UIViewContentModeScaleAspectFill; - } - return _bgView; -} -- (MSBaseTextField *)textFiled { - if (!_textFiled) { - _textFiled = [[MSBaseTextField alloc] init]; - _textFiled.tintColor = [UIColor whiteColor]; - _textFiled.textColor = [UIColor whiteColor]; - _textFiled.backgroundColor = [UIColor clearColor]; - _textFiled.textAlignment = NSTextAlignmentCenter; - _textFiled.font = kFontMedium(12); - _textFiled.text = @"1"; - _textFiled.delegate = self; - [_textFiled addTarget:self action:@selector(textFieldDidChanged:) forControlEvents:UIControlEventEditingChanged]; - _textFiled.keyboardType = UIKeyboardTypeNumberPad; - } - return _textFiled; -} -- (UIButton *)addBtn{ - if(!_addBtn){ - _addBtn = [UIButton new]; - [_addBtn setBackgroundImage:kImage(@"room_candy_tree_confirm_buy_num_add") forState:UIControlStateNormal]; - [_addBtn addTarget:self action:@selector(addBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _addBtn; -} -- (UIButton *)subtractBtn{ - if(!_subtractBtn){ - _subtractBtn = [UIButton new]; - [_subtractBtn setBackgroundImage:kImage(@"room_candy_tree_confirm_buy_num_subtract") forState:UIControlStateNormal]; - [_subtractBtn addTarget:self action:@selector(subtractAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _subtractBtn; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.h b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.h deleted file mode 100644 index 388826e..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// XPCandyTreeConfirmBuyView.h -// YuMi -// -// Created by duoban on 2023/9/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@protocol XPCandyTreeConfirmBuyViewDelegate - --(void)buyLoveNumWithType:(int)type num:(NSString *)num; - -@end -@interface XPCandyTreeConfirmBuyView : UIView -///爱心数量 -@property(nonatomic,copy) NSString *loveNum; -///爱心价格 -@property(nonatomic,copy) NSString *price; -@property(nonatomic,weak) iddelegate; --(instancetype)initWithFrame:(CGRect)frame type:(int)type; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m deleted file mode 100644 index afd42a4..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m +++ /dev/null @@ -1,347 +0,0 @@ -// -// XPCandyTreeConfirmBuyView.m -// YuMi -// -// Created by duoban on 2023/9/11. -// - -#import "XPCandyTreeConfirmBuyView.h" -#import "XPCandyTreeConfirmBuyNumView.h" -@interface XPCandyTreeConfirmBuyView() -///返回 -@property(nonatomic,strong) UIButton *closeView; - -///精灵图标 -@property(nonatomic,strong) UIImageView *pi_bgIconView; -@property(nonatomic,strong) UIImageView *pi_iconView; -///背景 -@property(nonatomic,strong) UIImageView *bgImageView; - -///标题提示 -@property(nonatomic,strong) UILabel *titleTipsView; -///数量 -@property(nonatomic,strong) UILabel *numView; -///选择今天不显示 -@property(nonatomic,strong) UIButton *chooseBnt; -///今天不显示 -@property(nonatomic,strong) UILabel *tipsView; -///输入数量 -@property(nonatomic,strong) XPCandyTreeConfirmBuyNumView *inputNumView; -///购买 -@property(nonatomic,strong) UIButton *buyBtn; -///类型，0，提示购买，1，购买 -@property(nonatomic,assign) int type; -@end -@implementation XPCandyTreeConfirmBuyView --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} --(instancetype)initWithFrame:(CGRect)frame type:(int)type{ - self = [super initWithFrame:frame]; - if(self){ - self.type = type; - if(type == 0){ - [self installUI]; - [self installConstraints]; - }else{ - [self installUIWithBuy]; - [self installConstraintsWithBuy]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil]; - } - - } - return self; -} -- (void)keyboardWillShow:(NSNotification *)notification { - - CGRect keyboardRect = [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]; - CGFloat time = [[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] floatValue]; - - CGFloat height = KScreenHeight - keyboardRect.size.height - 315; - - [UIView animateWithDuration:time animations:^{ - CGRect rect = self.bgImageView.frame; - rect.origin.y = height; - self.bgImageView.frame = rect; - - - }]; - -} - -//键盘隐藏 -- (void)keyboardWillHidden:(NSNotification *)notification { - CGFloat time = [[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] floatValue]; - [UIView animateWithDuration:time animations:^{ - CGRect rect = self.bgImageView.frame; - rect.origin.y = (KScreenHeight - 315)/2; - self.bgImageView.frame = rect; - - }]; - - -} --(void)installUI{ - - [self addSubview:self.bgImageView]; - - [self.bgImageView addSubview:self.closeView]; - [self.bgImageView addSubview:self.pi_bgIconView]; - [self.pi_bgIconView addSubview:self.pi_iconView]; - [self.bgImageView addSubview:self.numView]; - [self.bgImageView addSubview:self.titleTipsView]; - [self.bgImageView addSubview:self.buyBtn]; - [self.bgImageView addSubview:self.chooseBnt]; - [self.bgImageView addSubview:self.tipsView]; - - -} --(void)installConstraints{ - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(288)); - make.width.mas_equalTo(kGetScaleWidth(240)); - make.center.equalTo(self); - }]; - [self.closeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(20)); - make.top.mas_equalTo(kGetScaleWidth(6)); - make.trailing.mas_equalTo(-kGetScaleWidth(8)); - }]; - - [self.titleTipsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(46)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.centerX.equalTo(self.bgImageView); - }]; - [self.pi_bgIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(80)); - make.centerX.equalTo(self.bgImageView); - make.top.equalTo(self.titleTipsView.mas_bottom).mas_offset(8); - }]; - [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(58)); - make.center.equalTo(self.pi_bgIconView); - }]; - [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.bgImageView); - make.height.mas_equalTo(kGetScaleWidth(22)); - make.top.equalTo(self.pi_bgIconView.mas_bottom).mas_offset(kGetScaleWidth(5)); - }]; - - [self.buyBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(152)); - make.height.mas_equalTo(kGetScaleWidth(32)); - make.top.equalTo(self.numView.mas_bottom).mas_offset(kGetScaleWidth(13)); - make.centerX.equalTo(self.bgImageView); - }]; - [self.tipsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.bgImageView).mas_offset(kGetScaleWidth(6)); - make.height.mas_equalTo(kGetScaleWidth(14)); - make.top.equalTo(self.buyBtn.mas_bottom).mas_offset(kGetScaleWidth(16)); - }]; - [self.chooseBnt mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(10); - make.trailing.equalTo(self.tipsView.mas_leading).mas_offset(-kGetScaleWidth(2)); - make.centerY.equalTo(self.tipsView); - }]; - - - -} --(void)installUIWithBuy{ - [self addSubview:self.bgImageView]; - - [self.bgImageView addSubview:self.closeView]; - [self.bgImageView addSubview:self.titleTipsView]; - [self.bgImageView addSubview:self.pi_bgIconView]; - [self.pi_bgIconView addSubview:self.pi_iconView]; - [self.bgImageView addSubview:self.numView]; - [self.bgImageView addSubview:self.inputNumView]; - [self.bgImageView addSubview:self.buyBtn]; - -} --(void)installConstraintsWithBuy{ - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(298)); - make.width.mas_equalTo(kGetScaleWidth(240)); - make.center.equalTo(self); - }]; - [self.closeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(20)); - make.top.mas_equalTo(kGetScaleWidth(6)); - make.trailing.mas_equalTo(-kGetScaleWidth(8)); - }]; - - [self.titleTipsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(46)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.centerX.equalTo(self.bgImageView); - }]; - [self.pi_bgIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(80)); - make.centerX.equalTo(self.bgImageView); - make.top.equalTo(self.titleTipsView.mas_bottom).mas_offset(8); - }]; - [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(58)); - make.center.equalTo(self.pi_bgIconView); - }]; - [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.bgImageView); - make.height.mas_equalTo(kGetScaleWidth(22)); - make.top.equalTo(self.pi_bgIconView.mas_bottom).mas_offset(kGetScaleWidth(5)); - }]; - [self.inputNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.numView.mas_bottom).mas_offset(kGetScaleWidth(5)); - make.height.mas_equalTo(25); - make.width.mas_equalTo(kGetScaleWidth(146)); - make.centerX.equalTo(self.bgImageView); - }]; - [self.buyBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(32)); - make.width.mas_equalTo(kGetScaleWidth(152)); - make.centerX.equalTo(self.bgImageView); - make.top.equalTo(self.inputNumView.mas_bottom).mas_offset(kGetScaleWidth(11)); - }]; - -} --(void)closeViewAction{ - [TTPopup dismiss]; -} --(void)chooseTipAction{ - _chooseBnt.selected = !_chooseBnt.selected; - NSString *time = [NSDate getNowTimeTimestamp]; - NSString *curTime = [NSDate timestampSwitchTime:[time integerValue] andFormatter:@"yyyy-MM-dd"]; - NSDictionary *timeDic = [[NSUserDefaults standardUserDefaults]valueForKey:@"kBuyLoveNoPrompt"]; - if(timeDic == nil){ - if(_chooseBnt.selected == NO)return; - NSMutableDictionary *curDic = [[NSMutableDictionary alloc]initWithDictionary:timeDic]; - [curDic setValue:@(YES) forKey:curTime]; - [[NSUserDefaults standardUserDefaults]setValue:curDic forKey:@"kBuyLoveNoPrompt"]; - [[NSUserDefaults standardUserDefaults]synchronize]; - }else{ - NSMutableDictionary *curDic = [[NSMutableDictionary alloc]initWithDictionary:timeDic]; - [curDic removeAllObjects]; - if(_chooseBnt.selected == YES){ - [curDic setValue:@(YES) forKey:curTime]; - } - [[NSUserDefaults standardUserDefaults]setValue:curDic forKey:@"kBuyLoveNoPrompt"]; - [[NSUserDefaults standardUserDefaults]synchronize]; - } -} --(void)setLoveNum:(NSString *)loveNum{ - _loveNum = loveNum; - if(_type == 0){ - _titleTipsView.text = [NSString stringWithFormat:YMLocalizedString(@"XPCandyTreeConfirmBuyView1"),_loveNum]; - } - _inputNumView.loveNum = _loveNum; -} - --(void)setPrice:(NSString *)price{ - _price = price; - [self setPriceView]; -} --(void)setPriceView{ - NSString *getPrice = @(self.price.integerValue * self.loveNum.integerValue).stringValue; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@" %@",getPrice] attributes:@{NSFontAttributeName:self.numView.font,NSForegroundColorAttributeName:UIColorFromRGB(0xFF9A1F)}]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"moli_money_icon"];; - attachment.bounds = CGRectMake(0, roundf(self.numView.font.capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height); - attachment.image = iconImage; - [textAtt insertAttributedString:[NSMutableAttributedString attributedStringWithAttachment:attachment] atIndex:0]; - self.numView.attributedText = textAtt; -} --(void)bugShardAction{ - [TTPopup dismiss]; - if(self.delegate && [self.delegate respondsToSelector:@selector(buyLoveNumWithType:num:)]){ - [self.delegate buyLoveNumWithType:self.type num:self.loveNum]; - } -} -#pragma mark- PITreasureFairyBuyElfShardInputNumViewDelegate --(void)inputLoveNum:(NSString *)num{ - self.loveNum = num; - [self setPriceView]; -} -#pragma mark - 懒加载 -- (UIButton *)closeView{ - if(!_closeView){ - _closeView = [UIButton new]; - [_closeView setBackgroundImage:kImage(@"room_candy_tree_buy_love_close") forState:UIControlStateNormal]; - [_closeView addTarget:self action:@selector(closeViewAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeView; -} -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = [UIImage getLanguageImage:@"room_candy_tree_confirm_buy_bg"];//kImage(@"room_candy_tree_confirm_buy_bg"); - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} --(UIImageView *)pi_iconView{ - if(!_pi_iconView){ - _pi_iconView = [UIImageView new]; - _pi_iconView.image = kImage(@"room_candy_tree_buy_love_icon"); - } - return _pi_iconView; -} -- (UIImageView *)pi_bgIconView{ - if(!_pi_bgIconView){ - _pi_bgIconView = [UIImageView new]; - _pi_bgIconView.image = kImage(@"room_candy_tree_buy_love_icon_bg"); - } - return _pi_bgIconView; -} -- (UILabel *)numView{ - if(!_numView){ - _numView = [UILabel labelInitWithText:@"0" font:[UIFont systemFontOfSize:16 weight:UIFontWeightRegular] textColor:[UIColor whiteColor]]; - } - return _numView; -} -- (UIButton *)chooseBnt{ - if(!_chooseBnt){ - _chooseBnt = [UIButton new]; - [_chooseBnt setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_chooseBnt setImage:kImage(@" ") forState:UIControlStateSelected]; - [_chooseBnt setImage:kImage(@"room_candy_tree_buy_love_no_choose") forState:UIControlStateNormal]; - [_chooseBnt addTarget:self action:@selector(chooseTipAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _chooseBnt; -} -- (UILabel *)tipsView{ - if(!_tipsView){ - _tipsView = [UILabel labelInitWithText:YMLocalizedString(@"PITreasureFairyBuyElfShardSuccessView0") font:kFontRegular(10) textColor:UIColorFromRGB(0xA3A0AD)]; - } - return _tipsView; -} -- (UILabel *)titleTipsView{ - if(!_titleTipsView){ - _titleTipsView = [UILabel labelInitWithText:YMLocalizedString(@"XPCandyTreeConfirmBuyView0") font:kFontMedium(12) textColor:UIColorFromRGB(0x7147E6)]; - } - return _titleTipsView; -} -- (XPCandyTreeConfirmBuyNumView *)inputNumView{ - if(!_inputNumView){ - _inputNumView = [[XPCandyTreeConfirmBuyNumView alloc]initWithFrame:CGRectZero]; - _inputNumView.delegate = self; - } - return _inputNumView; -} -- (UIButton *)buyBtn{ - if(!_buyBtn){ - _buyBtn = [UIButton new]; - [_buyBtn setBackgroundImage:[UIImage getLanguageImage:@"room_candy_tree_buy_love_but_btn"]//kImage(@"room_candy_tree_buy_love_but_btn") - forState:UIControlStateNormal]; -// [_buyBtn setTitle:YMLocalizedString(@"PITreasureFairyBuyElfShardView1") forState:UIControlStateNormal]; -// [_buyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; -// _buyBtn.titleLabel.font = kFontMedium(14); - [_buyBtn addTarget:self action:@selector(bugShardAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _buyBtn; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeGiftView.h b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeGiftView.h deleted file mode 100644 index 1c09c63..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeGiftView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPCandyTreeGiftView.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class CandyTreeGiftInfoModel, XPCandyTreeAnimationModel; -@interface XPCandyTreeGiftView : UIView -///礼物的信息 -@property (nonatomic,strong) CandyTreeGiftInfoModel *giftInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeGiftView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeGiftView.m deleted file mode 100644 index 77b4797..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeGiftView.m +++ /dev/null @@ -1,152 +0,0 @@ -// -// XPCandyTreeGiftView.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import "XPCandyTreeGiftView.h" -///Third -#import -#import -#import "CandyTreeResultModel.h" -#import "XPCandyTreeAnimationModel.h" - -@interface XPCandyTreeGiftView () -///礼物背景 -@property (nonatomic,strong) UIImageView *backImageView; - -@property(nonatomic,strong) NetImageView *giftImageView; -///显示文字 -@property (nonatomic,strong) UILabel *titleLabel; -@property(nonatomic,strong) UILabel *priceLabel; -@property(nonatomic,strong) UILabel *numLabel; -@property(nonatomic,strong) UIImageView *diamondsImage; -///动画完成 -@property (nonatomic,copy) void(^FinishBlock)(BOOL finish); -@end - -@implementation XPCandyTreeGiftView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self.backImageView addSubview:self.giftImageView]; - [self.backImageView addSubview:self.titleLabel]; - [self.backImageView addSubview:self.diamondsImage]; - [self.backImageView addSubview:self.priceLabel]; - [self.backImageView addSubview:self.numLabel]; - -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.mas_equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(18)); - make.width.mas_lessThanOrEqualTo(200); - }]; - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(6)); - make.width.height.mas_equalTo(kGetScaleWidth(16)); - make.centerY.equalTo(self.backImageView); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(22)); - make.centerY.mas_equalTo(self.backImageView); - make.height.mas_equalTo(kGetScaleWidth(18)); - }]; - [self.diamondsImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.titleLabel.mas_trailing).mas_offset(kGetScaleWidth(2)); - make.width.height.mas_equalTo(kGetScaleWidth(11)); - make.centerY.mas_equalTo(self.backImageView); - }]; - [self.priceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.diamondsImage.mas_trailing).mas_offset(kGetScaleWidth(2)); - make.centerY.mas_equalTo(self.backImageView); - make.height.mas_equalTo(kGetScaleWidth(18)); - }]; - [self.numLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.priceLabel.mas_trailing).mas_offset(kGetScaleWidth(4)); - make.centerY.mas_equalTo(self.backImageView); - make.trailing.mas_equalTo(-kGetScaleWidth(6)); - make.height.mas_equalTo(kGetScaleWidth(18)); - }]; - -} -#pragma mark - Getters And Setters -- (void)setGiftInfo:(CandyTreeGiftInfoModel *)giftInfo { - _giftInfo = giftInfo; - if (_giftInfo) { - - if (_giftInfo.rewardName.length > 7) { - _giftInfo.rewardName = [_giftInfo.rewardName substringToIndex:7]; - } - _numLabel.text = [NSString stringWithFormat:@"X%d",_giftInfo.num]; - - _titleLabel.text = [NSString stringWithFormat:@"%@",_giftInfo.rewardName]; - self.priceLabel.text = [NSString stringWithFormat:@"%@",_giftInfo.diamonds]; - [self layoutIfNeeded]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x934AEE),UIColorFromRGB(0x2E2B99)] gradientType:GradientTypeLeftToRight imgSize:_backImageView.frame.size]; - _backImageView.backgroundColor = [UIColor colorWithPatternImage:image]; - _giftImageView.imageUrl = _giftInfo.picUrl; - } - -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.layer.cornerRadius = kGetScaleWidth(18)/2; - _backImageView.layer.masksToBounds = YES; - _backImageView.layer.borderWidth = 0.5; - _backImageView.layer.borderColor = UIColorRGBAlpha(0xFFCDFC, 0.6).CGColor; - - } - return _backImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = kFontRegular(10); - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} -- (NetImageView *)giftImageView{ - if(!_giftImageView){ - _giftImageView = [[NetImageView alloc]init]; - } - return _giftImageView; -} -- (UILabel *)priceLabel{ - if(!_priceLabel){ - _priceLabel = [UILabel new]; - _priceLabel.font = kFontMedium(10); - _priceLabel.textColor = [UIColor whiteColor]; - } - return _priceLabel; -} -- (UILabel *)numLabel{ - if(!_numLabel){ - _numLabel = [UILabel labelInitWithText:@"X0" font:kFontBold(12) textColor:UIColorFromRGB(0xFFD95C)]; - } - return _numLabel; -} -- (UIImageView *)diamondsImage{ - if(!_diamondsImage){ - _diamondsImage = [UIImageView new]; - _diamondsImage.image = kImage(@"moli_money_icon"); - } - return _diamondsImage; -} -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeInsufficientBalanceView.h b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeInsufficientBalanceView.h deleted file mode 100644 index 95dacc9..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeInsufficientBalanceView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPCandyTreeInsufficientBalanceView.h -// xplan-ios -// -// Created by duoban on 2023/3/23. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPCandyTreeInsufficientBalanceViewDelegate - --(void)payBalanceAction; - -@end - - -@interface XPCandyTreeInsufficientBalanceView : UIView -/// -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeInsufficientBalanceView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeInsufficientBalanceView.m deleted file mode 100644 index da9b2c7..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeInsufficientBalanceView.m +++ /dev/null @@ -1,135 +0,0 @@ -// -// XPCandyTreeInsufficientBalanceView.m -// xplan-ios -// -// Created by duoban on 2023/3/23. -// - -#import "XPCandyTreeInsufficientBalanceView.h" -@interface XPCandyTreeInsufficientBalanceView() -///返回 -@property (nonatomic,strong) UIButton *backView; -///背景 -@property (nonatomic,strong) UIView *bgView; -///标题 -@property (nonatomic,strong) UILabel *titleView; -/// -@property (nonatomic,strong) UIImageView *iconView; -///内容 -@property (nonatomic,strong) UILabel *contentView; -///去充值 -@property (nonatomic,strong) UIButton *payBtn; -@end -@implementation XPCandyTreeInsufficientBalanceView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6]; - [self addSubview:self.backView]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.iconView]; - [self.bgView addSubview:self.contentView]; - [self.bgView addSubview:self.payBtn]; -} -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.equalTo(self); - make.width.mas_equalTo(kGetScaleWidth(306)); - make.height.mas_equalTo(kGetScaleWidth(212)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(20)); - make.height.mas_equalTo(kGetScaleWidth(16)); - make.centerX.equalTo(self.bgView); - }]; - [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(52)); - make.width.height.mas_equalTo(kGetScaleWidth(43)); - make.centerX.equalTo(self.bgView); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(108)); - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(10)); - }]; - [self.payBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(152)); - make.width.mas_equalTo(kGetScaleWidth(137)); - make.height.mas_equalTo(kGetScaleWidth(39)); - make.centerX.equalTo(self.bgView); - }]; - -} --(void)backAction{ - [self removeFromSuperview]; -} --(void)payAction{ - [self removeFromSuperview]; - if(self.delegate && [self.delegate respondsToSelector:@selector(payBalanceAction)]){ - [self.delegate payBalanceAction]; - } -} -#pragma mark -懒加载 -- (UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(26) rightTopCorner:kGetScaleWidth(26) bottomLeftCorner:kGetScaleWidth(26) bottomRightCorner:kGetScaleWidth(26) size:CGSizeMake(kGetScaleWidth(308), kGetScaleWidth(202))]; - } - return _bgView; -} --(UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"XPCandyTreeInsufficientBalanceView0") font:kFontSemibold(17) textColor:[DJDKMIMOMColor alertTitleColor]]; - } - return _titleView; -} -- (UIImageView *)iconView{ - if (!_iconView){ - _iconView = [UIImageView new]; - _iconView.image = kImage(@"room_candytree_prompt"); - } - return _iconView; -} -- (UILabel *)contentView{ - if (!_contentView){ - _contentView = [UILabel labelInitWithText:YMLocalizedString(@"XPCandyTreeInsufficientBalanceView1") font:kFontMedium(14) textColor:[DJDKMIMOMColor alertTitleColor]]; - _contentView.numberOfLines = 0; - _contentView.textAlignment = NSTextAlignmentCenter; - } - return _contentView; -} --(UIButton *)payBtn{ - if (!_payBtn){ - _payBtn = [UIButton new]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(137), kGetScaleWidth(39))]; - [_payBtn setBackgroundImage:image forState:UIControlStateNormal]; - _payBtn.layer.cornerRadius = kGetScaleWidth(39)/2; - _payBtn.layer.masksToBounds = YES; - [_payBtn setTitle:YMLocalizedString(@"XPCandyTreeInsufficientBalanceView2") forState:UIControlStateNormal]; - [_payBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_payBtn addTarget:self action:@selector(payAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _payBtn; -} -- (UIButton *)backView{ - if (!_backView){ - _backView = [UIButton new]; - [_backView addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeMoreView.h b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeMoreView.h deleted file mode 100644 index aa13c52..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeMoreView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPCandyTreeMoreView.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPCandyTreeMoreView : UIView -///是否可以切换最小等级 -@property (nonatomic,assign) NSInteger sendMessageSwitchLevel; -///展示中奖消息的开关 -@property (nonatomic, assign) BOOL showMessageSwitch; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeMoreView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeMoreView.m deleted file mode 100644 index 581a0ed..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeMoreView.m +++ /dev/null @@ -1,175 +0,0 @@ -// -// XPCandyTreeMoreView.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import "XPCandyTreeMoreView.h" -///Third -#import -///Tool - - - -#import "TTPopup.h" - -///View -#import "XPRoomHalfWebView.h" -#import "XPCandyTreeMoreRuleCell.h" - -///是否隐藏中奖消息 -NSString * const kCandyTreeHideMessage = @"kCandyTreeHideMessage"; - -@interface XPCandyTreeMoreView () -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据 -@property (nonatomic,strong) NSMutableArray *datasource; -@end - -@implementation XPCandyTreeMoreView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - [self addSubview:self.titleLabel]; - [self addSubview:self.tableView]; - CAShapeLayer * layer = [CAShapeLayer layer]; - UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, 256+44) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)]; - layer.path = path.CGPath; - self.layer.mask = layer; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(256+44); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - make.height.mas_equalTo(44); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self); - make.top.mas_equalTo(self.titleLabel.mas_bottom); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 50; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.row != self.datasource.count - 1) { - UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([UITableViewCell class])]; - if (cell == nil) { - cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([UITableViewCell class])]; - } - cell.backgroundColor = [UIColor whiteColor]; - cell.textLabel.text = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.textLabel.textColor = [DJDKMIMOMColor alertTitleColor]; - cell.textLabel.font = [UIFont systemFontOfSize:15]; - return cell; - } - XPCandyTreeMoreRuleCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPCandyTreeMoreRuleCell class])]; - cell.title = self.datasource[indexPath.row]; - cell.delegate = self; - NSString *showSwitch = [[NSUserDefaults standardUserDefaults] objectForKey:kCandyTreeHideMessage]; - cell.isShow = !showSwitch.length; - cell.isSwitchEnable = self.showMessageSwitch; - cell.sendMessageSwitchLevel = self.sendMessageSwitchLevel; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - [TTPopup dismiss]; - switch (indexPath.row) { - - case 0: - { - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = URLWithType(kCandyTreeRecordURL); - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; - } - break; - case 1: - { - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = URLWithType(kCandyTreeRuleURL); - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; - } - break; - - default: - break; - } -} - -#pragma mark - XPCandyTreeMoreRuleCellDelegate -- (void)xPCandyTreeMoreRuleCell:(XPCandyTreeMoreRuleCell *)cell switchChange:(UISwitch *)change { - if (change.on) { - [[NSUserDefaults standardUserDefaults] setObject:nil forKey:kCandyTreeHideMessage]; - } else { - [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:kCandyTreeHideMessage]; - } - [[NSUserDefaults standardUserDefaults] synchronize]; -} - -#pragma mark - Getters And Setters -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPCandyTreeMoreView0"); - _titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor alertTitleColor]; - } - return _titleLabel; -} -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:NSStringFromClass([UITableViewCell class])]; - [_tableView registerClass:[XPCandyTreeMoreRuleCell class] forCellReuseIdentifier:NSStringFromClass([XPCandyTreeMoreRuleCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray arrayWithObjects:YMLocalizedString(@"XPCandyTreeMoreView2"), YMLocalizedString(@"XPCandyTreeMoreView3"),YMLocalizedString(@"XPCandyTreeMoreView4") ,nil]; - } - return _datasource; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeRankView.h b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeRankView.h deleted file mode 100644 index 8a52682..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeRankView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// XPCandyTreeRankView.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import -#import -NS_ASSUME_NONNULL_BEGIN - - -typedef void(^CandyTreeRankViewDidClickHandle)(NSInteger uid); - - -typedef NS_ENUM(NSInteger, CandyTreeRecordType) { - ///今天榜单 - CandyTreeRecordType_Today = 1, - ///昨日榜单 - CandyTreeRecordType_Yesterday = 2, -}; - -@interface XPCandyTreeRankView : UIView -///榜单类型 -@property (nonatomic,assign) CandyTreeRecordType type; -@property (nonatomic,copy) CandyTreeRankViewDidClickHandle didClickHandle; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeRankView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeRankView.m deleted file mode 100644 index 9d136e7..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeRankView.m +++ /dev/null @@ -1,196 +0,0 @@ -// -// XPCandyTreeRankView.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/10. -// - -#import "XPCandyTreeRankView.h" -///Third -#import -#import -///Tool - - -#import "Api+CandyTree.h" -///Model -#import "CandyTreeRecordModel.h" -///View -#import "XPCandyTreeRankTableViewCell.h" -#import "XPCandyTreeEmptyableViewCell.h" -#import "XPMineUserInfoViewController.h" -#import "XCCurrentVCStackManager.h" -@interface XPCandyTreeRankView () -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据列表 -@property (nonatomic,strong) NSMutableArray *datasource; -///当前 的页数 -@property (nonatomic,assign) int page; -///还有更多的数据 -@property (nonatomic,assign) BOOL hasNoMoreData; -@end - -@implementation XPCandyTreeRankView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Public Method -- (void)reloadNewData { - [self.tableView.mj_header beginRefreshing]; - [self headerRefresh]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; -} - -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [UIColor colorWithWhite:1 alpha:0.7]; - header.lastUpdatedTimeLabel.textColor = [UIColor colorWithWhite:1 alpha:0.7]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [UIColor colorWithWhite:1 alpha:0.7]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; -} - -#pragma mark - 刷新的方法 -- (void)headerRefresh { - self.page = 1; - NSString * page = [NSString stringWithFormat:@"%d", self.page]; - NSString * datetype = [NSString stringWithFormat:@"%ld", self.type]; - [Api candyTreeRankListComplection:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [CandyTreeRecordModel modelsWithArray:data.data]; - [self getCandtyTreeRankListSuccess:array state:0]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } page:page pageSize:@"20" type:datetype]; -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPCandyTreeRankView0")]; - return; - } - self.page++; - NSString * page = [NSString stringWithFormat:@"%d", self.page]; - NSString * datetype = [NSString stringWithFormat:@"%ld", self.type]; - [Api candyTreeRankListComplection:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [CandyTreeRecordModel modelsWithArray:data.data]; - [self getCandtyTreeRankListSuccess:array state:1]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - [self.tableView.mj_header endRefreshing]; - [self.tableView.mj_footer endRefreshing]; - } - } page:page pageSize:@"20" type:datetype]; -} - -- (void)getCandtyTreeRankListSuccess:(NSArray *)array state:(BOOL)state { - if (state == 0) { - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - if (array.count > 0) { - self.hasNoMoreData = NO; - [self.datasource addObjectsFromArray:array]; - } else { - self.hasNoMoreData = YES; - [self.tableView.mj_footer endRefreshingWithNoMoreData]; - } - [self.tableView reloadData]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? kGetScaleWidth(80) : kGetScaleWidth(300); -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count <= 0) { - XPCandyTreeEmptyableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPCandyTreeEmptyableViewCell class])]; - if (cell == nil) { - cell = [[XPCandyTreeEmptyableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPCandyTreeEmptyableViewCell class])]; - } - return cell; - } - XPCandyTreeRankTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPCandyTreeRankTableViewCell class])]; - if (cell == nil) { - cell = [[XPCandyTreeRankTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPCandyTreeRankTableViewCell class])]; - } - cell.roomRankModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; -} -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{if (self.datasource.count <= 0) {return;} - CandyTreeRecordModel *model = self.datasource[indexPath.row]; - if(self.didClickHandle){ - self.didClickHandle(model.uid); - } -} -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self; -} - -#pragma mark - Getters And Setters -- (void)setType:(CandyTreeRecordType)type { - _type = type; - [self.tableView.mj_header beginRefreshing]; - [self headerRefresh]; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPCandyTreeRankTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPCandyTreeRankTableViewCell class])]; - [_tableView registerClass:[XPCandyTreeEmptyableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPCandyTreeEmptyableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource= [NSMutableArray array]; - } - return _datasource; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.h b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.h deleted file mode 100644 index a637b98..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPCandyTreeViewController.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/9. -// - -#import "MvpViewController.h" -#import "RoomHostDelegate.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPCandyTreeViewController : MvpViewController -- (instancetype)initWithDelegate:(id)delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m deleted file mode 100644 index 6c9dd21..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m +++ /dev/null @@ -1,658 +0,0 @@ -// -// XPCandyTreeViewController.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/9. -// - -#import "XPCandyTreeViewController.h" -///Third -#import -#import -#import -///Tool - -#import "TTPopup.h" - -///Model -#import "RoomInfoModel.h" -#import "AttachmentModel.h" -#import "CandyTreeInfoModel.h" -#import "CandyTreeResultModel.h" -#import "UserInfoModel.h" -#import "PICandyTreeSetModel.h" -///View -#import "XPRoomHalfWebView.h" -#import "XPCandyTreeMoreView.h" -#import "XPCandyRankContainerView.h" -#import "XPCandyTreeGiftView.h" -#import "XPMineUserInfoViewController.h" -#import "XCCurrentVCStackManager.h" -#import "XPCandyTreeInsufficientBalanceView.h" -#import "XPWebViewController.h" -#import "XPIAPRechargeViewController.h" -#import "XPCandyTreeBuyView.h" -#import "XPCandyTreeConfirmBuyView.h" -#import "XPCandyTreeBuySuccessView.h" -///P -#import "XPCandyTreePresenter.h" -#import "XPCandyTreeProtocol.h" -#import "Api+Room.h" -#define KitemHeight (20 + 5) - - -@interface XPCandyTreeViewController () -@property(nonatomic,strong) UIButton *backView; - -///中间内容的容器 -@property (nonatomic,strong) UIImageView * bgImageView; -///排行榜 -@property (nonatomic,strong) UIImageView * rankImageView; - -///获得糖果 -@property (nonatomic,strong) UIImageView *moreImageView; -///动画管理类 -@property (strong, nonatomic) SVGAParser *parser; -///糖果树魔天輪 -@property (nonatomic,strong) UIImageView *candyTreeView; -@property(nonatomic,strong) UIImageView *plateView; -@property(nonatomic,strong) UIImageView *eggView; - -@property(nonatomic,strong) UIImageView *lampView; - -///砸蛋特效 -@property (nonatomic,strong) SVGAImageView *candyTreeOpenView; - -///寻爱一次 -@property(nonatomic,strong) UIButton *fristLoveBtn; -///寻爱十次 -@property(nonatomic,strong) UIButton *tenthLoveBtn; -///寻爱百次 -@property(nonatomic,strong) UIButton *hundredthLoveBtn; -///寻爱两百次 -@property(nonatomic,strong) UIButton *twoHundredhLoveBtn; -///动画的容器 -@property (nonatomic,strong) UIView * animationView; - -///糖果的信息 -@property (nonatomic,strong) CandyTreeInfoModel *candyInfo; -///host代理 -@property (nonatomic,weak) idhostDelegate; -///是否正在采摘 -@property (nonatomic,assign) BOOL isPicking; - -@property(nonatomic,strong) XPCandyTreeBuyView *buyView; -@property(nonatomic,strong) PICandyTreeSetModel *setModel; -@end - -@implementation XPCandyTreeViewController - -- (void)dealloc { - [[NIMSDK sharedSDK].systemNotificationManager removeDelegate:self]; -} - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super init]) { - self.hostDelegate = delegate; - [[NIMSDK sharedSDK].systemNotificationManager addDelegate:self]; - } - return self; -} - -- (XPCandyTreePresenter *)createPresenter { - return [[XPCandyTreePresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - [self.presenter getCandyTreeInfo]; - [self.presenter getLoveSettingInfo]; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -#pragma mark -XPCandyRankContainerViewDelegate -- (void)didClickHeadHandle:(NSInteger)uid{ - [TTPopup dismiss]; - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = uid; - [self.hostDelegate.getCurrentNav pushViewController:userInfoVC animated:YES]; -} - -#pragma mark - XPCandyTreeProtocol -- (void)getCandyTreeInfoSuccess:(CandyTreeInfoModel *)info { - [self hideHUD]; - self.candyInfo = info; -} - --(void)getLoveSettingInfoSuccess:(PICandyTreeSetModel *)setModel{ - self.setModel = setModel; - self.buyView.num = self.setModel.ticketNum; -} - -- (void)buyLoveTicketSuccessWithNum:(NSString *)num{ - NSString *time = [NSDate getNowTimeTimestamp]; - NSString *curTime = [NSDate timestampSwitchTime:[time integerValue] andFormatter:@"yyyy-MM-dd"]; - NSDictionary *timeDic = [[NSUserDefaults standardUserDefaults]valueForKey:@"kBuyLoveNumSuccessNoPrompt"]; - BOOL isShow = YES; - if(timeDic != nil){ - isShow = timeDic[curTime] == nil; - } - if(isShow == NO){ - [self.presenter getLoveSettingInfo]; - return; - }; - - XPCandyTreeBuySuccessView *successView = [[XPCandyTreeBuySuccessView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - successView.num = num; - [TTPopup popupView:successView style:TTPopupStyleAlert]; - [self.presenter getLoveSettingInfo]; -} -- (void)pickCandyFail { - [self hideHUD]; - self.isPicking = NO; -} --(void)pickCandyPay{ - [self hideHUD]; - self.isPicking = NO; - XPCandyTreeInsufficientBalanceView *balanceView = [[XPCandyTreeInsufficientBalanceView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - balanceView.delegate = self; - [self.view addSubview:balanceView]; -} -- (void)pickCandySuccess:(NSArray *)result { - [self hideHUD]; - self.isPicking = NO; - [self.presenter getLoveSettingInfo]; - [result enumerateObjectsUsingBlock:^(CandyTreeGiftInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.level > 2) { - ///取消所有的延迟加载的方法 - [NSObject cancelPreviousPerformRequestsWithTarget:self]; - - XPCandyTreeGiftView * newAnimaView = [[XPCandyTreeGiftView alloc] init]; - newAnimaView.giftInfo = obj; - - newAnimaView.frame = CGRectMake(0, 0,200,kGetScaleWidth(18)); - [self.animationView addSubview:newAnimaView]; - - if (self.animationView.subviews.count > 5) { - [self.animationView.subviews.firstObject removeFromSuperview]; - } - for (int i=0; i < self.animationView.subviews.count; i++) { - XPCandyTreeGiftView * view = [self.animationView.subviews xpSafeObjectAtIndex:i]; - NSInteger offsetY= (self.animationView.subviews.count - i) * kGetScaleWidth(23); - [UIView animateWithDuration:0.1 animations:^{ - CGRect rect = view.frame; - rect.origin.y = kGetScaleWidth(23) * 5 - offsetY; - view.frame = rect; - } completion:^(BOOL finished) { - if (i == (self.animationView.subviews.count -1)) { - [self.animationView.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - [self performSelector:@selector(giftViewRemoveFromSuperView:) withObject:obj afterDelay:3]; - }]; - } - }]; - } - } - }]; -} -#pragma mark - SVGAPlayerDelegate -- (void)svgaPlayerDidFinishedAnimation:(SVGAPlayer *)player{ - if (self.isPicking){ - @kWeakify(self); - [self.parser parseWithNamed:@"pi_happy_egg_smash" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.candyTreeOpenView.loops = 1; - self.candyTreeOpenView.clearsAfterStop = NO; - self.candyTreeOpenView.videoItem = videoItem; - [self.candyTreeOpenView startAnimation]; - } failureBlock:^(NSError * _Nonnull error) { - - }]; - }else{ - @kWeakify(self); - [self.parser parseWithNamed:@"pi_happy_egg_smash" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.candyTreeOpenView.loops = 1; - self.candyTreeOpenView.clearsAfterStop = NO; - self.candyTreeOpenView.videoItem = videoItem; - } failureBlock:^(NSError * _Nonnull error) { - - }]; - } -} -#pragma mark - NIMSystemNotificationManagerDelegate -- (void)onReceiveCustomSystemNotification:(NIMCustomSystemNotification *)notification { - if (notification.receiverType == NIMSessionTypeP2P) { - AttachmentModel *attachment = [AttachmentModel modelWithJSON:notification.content]; - if (attachment.first == CustomMessageType_Account && attachment.second == Custom_Message_Sub_Account_Changed){ - if (attachment.second == Custom_Message_Sub_Account_Changed) { - [self.presenter getCandyTreeInfo]; - } - } - } -} -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - - [self.view addSubview:self.backView]; - [self.view addSubview:self.bgImageView]; - - [self.bgImageView addSubview:self.rankImageView]; - [self.bgImageView addSubview:self.moreImageView]; - [self.bgImageView addSubview:self.candyTreeView]; - - [self.bgImageView addSubview:self.lampView]; - [self.bgImageView addSubview:self.plateView]; - [self.bgImageView addSubview:self.eggView]; - self.eggView.hidden = YES; - [self.bgImageView addSubview:self.fristLoveBtn]; - [self.bgImageView addSubview:self.tenthLoveBtn]; - [self.bgImageView addSubview:self.hundredthLoveBtn]; - [self.bgImageView addSubview:self.twoHundredhLoveBtn]; - - [self.view addSubview:self.candyTreeOpenView]; - - [self.bgImageView addSubview:self.animationView]; - [self.bgImageView addSubview:self.buyView]; - - @kWeakify(self); - [self.parser parseWithNamed:@"pi_happy_egg_smash" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.candyTreeOpenView.loops = 1; - self.candyTreeOpenView.clearsAfterStop = NO; - self.candyTreeOpenView.videoItem = videoItem; - } failureBlock:^(NSError * _Nonnull error) { - - }]; -} - -- (void)initSubViewConstraints { - - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); - }]; - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(kGetScaleWidth(552)); - make.leading.bottom.equalTo(self.view); - }]; - - [self.rankImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(36)); - make.leading.mas_equalTo(kGetScaleWidth(12)); - make.top.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.moreImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(30)); - make.height.mas_equalTo(kGetScaleWidth(28)); - make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.top.mas_equalTo(kGetScaleWidth(20)); - }]; - - - - - [self.candyTreeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-kGetScaleWidth(0)); - make.leading.trailing.mas_equalTo(self.bgImageView); - make.height.mas_equalTo(kGetScaleWidth(434)); - }]; - - [self.lampView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.candyTreeView.mas_top).mas_offset(kGetScaleWidth(48)); - make.width.mas_equalTo(kGetScaleWidth(316)); - make.height.mas_equalTo(kGetScaleWidth(244)); - make.centerX.equalTo(self.bgImageView); - }]; - [self.plateView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.lampView.mas_top).mas_offset(kGetScaleWidth(49)); - make.width.mas_equalTo(kGetScaleWidth(230)); - make.height.mas_equalTo(kGetScaleWidth(186)); - make.centerX.equalTo(self.bgImageView); - }]; - [self.eggView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.lampView.mas_top).mas_offset(kGetScaleWidth(50)); - make.width.mas_equalTo(kGetScaleWidth(97)); - make.height.mas_equalTo(kGetScaleWidth(126)); - make.centerX.equalTo(self.bgImageView); - }]; - CGFloat top = KScreenHeight == 667 ? -8 : 132; - [self.candyTreeOpenView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.width.height.mas_equalTo(self.view); - make.top.mas_equalTo(kGetScaleWidth(top)); - }]; - - [self.fristLoveBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.lampView.mas_bottom).mas_offset(kGetScaleWidth(13)); - make.leading.mas_equalTo(kGetScaleWidth(17)); - make.width.mas_equalTo(kGetScaleWidth(78)); - make.height.mas_equalTo(kGetScaleWidth(53)); - }]; - [self.tenthLoveBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.lampView.mas_bottom).mas_offset(kGetScaleWidth(13)); - make.leading.mas_equalTo(kGetScaleWidth(105)); - make.width.mas_equalTo(kGetScaleWidth(78)); - make.height.mas_equalTo(kGetScaleWidth(53)); - }]; - [self.hundredthLoveBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.lampView.mas_bottom).mas_offset(kGetScaleWidth(13)); - make.leading.mas_equalTo(kGetScaleWidth(193)); - make.width.mas_equalTo(kGetScaleWidth(78)); - make.height.mas_equalTo(kGetScaleWidth(53)); - }]; - - [self.twoHundredhLoveBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.lampView.mas_bottom).mas_offset(kGetScaleWidth(13)); - make.leading.mas_equalTo(kGetScaleWidth(281)); - make.width.mas_equalTo(kGetScaleWidth(78)); - make.height.mas_equalTo(kGetScaleWidth(53)); - }]; - - - [self.buyView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-kGetScaleWidth(23)); - make.height.mas_equalTo(kGetScaleWidth(28)); - make.width.mas_equalTo(kGetScaleWidth(288)); - make.centerX.equalTo(self.bgImageView); - }]; - [self.animationView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(8)); - make.bottom.mas_equalTo(self.bgImageView.mas_bottom).offset(-kGetScaleWidth(142)); - make.trailing.mas_equalTo(-kGetScaleWidth(8)); - make.height.mas_equalTo(kGetScaleWidth(23) * 5); - }]; - -} - -- (void)giftViewRemoveFromSuperView:(UIView *)view { - [view removeFromSuperview]; -} - -#pragma mark - Event Response -- (void)moreTapRecognizer:(UITapGestureRecognizer *)tap { - UserInfoModel * userInfo = self.hostDelegate.getUserInfo; - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - XPCandyTreeMoreView * moreView = [[XPCandyTreeMoreView alloc] init]; - moreView.sendMessageSwitchLevel = roomInfo.findLoveDrawSwitchVo.sendMsgLevel; - moreView.showMessageSwitch = userInfo.userLevelVo.experLevelSeq >= roomInfo.findLoveDrawSwitchVo.sendMsgLevel; - [TTPopup popupView:moreView style:TTPopupStyleActionSheet]; -} - -- (void)rankTapRecognizer:(UITapGestureRecognizer *)tap { - XPCandyRankContainerView * rankView = [[XPCandyRankContainerView alloc] init]; - rankView.delegate = self; - [TTPopup popupView:rankView style:TTPopupStyleActionSheet]; -} - - - - -#pragma mark -XPCandyTreeInsufficientBalanceViewDelegate -- (void)payBalanceAction{ - XPIAPRechargeViewController * webVC =[[XPIAPRechargeViewController alloc] init]; - webVC.delegate = self; - webVC.type = @"4"; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; -} -#pragma mark - XPIAPRechargeViewControllerDelegate --(void)paySuccess{ - [self.presenter getLoveSettingInfo]; -} -- (void)pickButtonActionWithNum:(NSInteger)num{ - if (self.isPicking) return; - self.isPicking = YES; - [self.candyTreeOpenView startAnimation]; - ///摘 - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - NSString * candyNumber = [NSString stringWithFormat:@"%ld", num]; - BOOL showMessageSwitch = self.hostDelegate.getUserInfo.userLevelVo.experLevelSeq >= roomInfo.findLoveDrawSwitchVo.sendMsgLevel; - [self.presenter pickCandy:candyNumber roomUid:roomUid isSendMessage:showMessageSwitch]; - -} - -- (void)dismissTapRecognizer{ - self.backView.backgroundColor = [UIColor clearColor]; - [UIView animateWithDuration:0.1 animations:^{ - self.view.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight); - }completion:^(BOOL finished) { - [self willMoveToParentViewController:nil]; //1 - [self.view removeFromSuperview]; //2 - [self removeFromParentViewController]; //3 - }]; -} - -#pragma mark - XPCandyTreeBuyViewDelegate -- (void)buyLoveNumWithNum:(NSString *)num{ - NSString *time = [NSDate getNowTimeTimestamp]; - NSString *curTime = [NSDate timestampSwitchTime:[time integerValue] andFormatter:@"yyyy-MM-dd"]; - NSDictionary *timeDic = [[NSUserDefaults standardUserDefaults]valueForKey:@"kBuyLoveNoPrompt"]; - BOOL isShow = YES; - if(timeDic != nil){ - isShow = timeDic[curTime] == nil; - } - - if(isShow == NO){ - NSInteger price = num.integerValue * self.setModel.ticketPrice.integerValue; - if(price > self.setModel.diamond.integerValue){ - [self pickCandyPay]; - return; - } - if(num.integerValue <= 0){ - [self showErrorToast:YMLocalizedString(@"XPCandyTreeViewController2")]; - return; - } - [self.presenter buyLoveTicket:num]; - return; - }; - XPCandyTreeConfirmBuyView *buyView = [[XPCandyTreeConfirmBuyView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight) type:0]; - buyView.delegate = self; - buyView.loveNum = num; - buyView.price = self.setModel.ticketPrice; - [TTPopup popupView:buyView style:TTPopupStyleAlert]; - -} -#pragma mark -XPCandyTreeConfirmBuyViewDelegate --(void)buyLoveNumWithType:(int)type num:(NSString *)num{ - NSInteger price = num.integerValue * self.setModel.ticketPrice.integerValue; - if(price > self.setModel.diamond.integerValue){ - [self pickCandyPay]; - return; - } - if(num.integerValue <= 0){ - [self showErrorToast:YMLocalizedString(@"XPCandyTreeViewController2")]; - return; - } - [self.presenter buyLoveTicket:num]; -} --(void)fineLoveAction:(UIButton *)sender{ - NSInteger num = 1; - if(sender == self.fristLoveBtn){ - num = 1; - }else if(sender == self.tenthLoveBtn){ - num = 10; - }else if(sender == self.hundredthLoveBtn){ - num = 100; - }else{ - num = 200; - } - if(self.setModel.ticketNum.integerValue >= num){ - [self pickButtonActionWithNum:num]; - return; - } - XPCandyTreeConfirmBuyView *buyView = [[XPCandyTreeConfirmBuyView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight) type:1]; - buyView.delegate = self; - buyView.loveNum = @(num).stringValue; - buyView.price = self.setModel.ticketPrice; - [TTPopup popupView:buyView style:TTPopupStyleAlert]; -} -#pragma mark - Getters And Setters -- (void)setIsPicking:(BOOL)isPicking { - _isPicking = isPicking; -} -- (UIButton *)backView{ - if(!_backView){ - _backView = [UIButton new]; - _backView.backgroundColor = [UIColor clearColor]; - [_backView addTarget:self action:@selector(dismissTapRecognizer) forControlEvents:UIControlEventTouchUpInside]; - } - return _backView; -} - - - - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.userInteractionEnabled = YES; - _bgImageView.image = [UIImage getLanguageImage:@"room_candy_tree_back"]; - - } - return _bgImageView; -} - - - -- (UIImageView *)rankImageView { - if (!_rankImageView) { - _rankImageView = [[UIImageView alloc] init]; - _rankImageView.userInteractionEnabled = YES; - _rankImageView.image = [UIImage getLanguageImage:@"room_candy_tree_rank"]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(rankTapRecognizer:)]; - [_rankImageView addGestureRecognizer:tap]; - } - return _rankImageView; -} - - - -- (UIImageView *)moreImageView { - if (!_moreImageView) { - _moreImageView = [[UIImageView alloc] init]; - _moreImageView.userInteractionEnabled = YES; - _moreImageView.image = [UIImage imageNamed:@"room_candy_tree_more"]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(moreTapRecognizer:)]; - [_moreImageView addGestureRecognizer:tap]; - } - return _moreImageView; -} - - - - - - -- (UIImageView *)candyTreeView { - if (!_candyTreeView) { - _candyTreeView = [[UIImageView alloc]init]; - _candyTreeView.backgroundColor = [UIColor clearColor]; - _candyTreeView.userInteractionEnabled = NO; - _candyTreeView.image = [UIImage imageNamed:@"room_candy_tree_bg"]; - } - return _candyTreeView; -} - - - -- (SVGAImageView *)candyTreeOpenView { - if (!_candyTreeOpenView) { - _candyTreeOpenView = [[SVGAImageView alloc]init]; - _candyTreeOpenView.backgroundColor = [UIColor clearColor]; - _candyTreeOpenView.userInteractionEnabled = NO; - _candyTreeOpenView.delegate = self; - } - return _candyTreeOpenView; -} - - - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} - - -- (UIView *)animationView { - if (!_animationView) { - _animationView = [[UIView alloc] init]; - _animationView.backgroundColor = [UIColor clearColor]; - } - return _animationView; -} -- (UIButton *)fristLoveBtn{ - if(!_fristLoveBtn){ - _fristLoveBtn = [UIButton new]; - _fristLoveBtn.yn_acceptEventInterval = 1; - [_fristLoveBtn setBackgroundImage:[UIImage getLanguageImage:@"room_candy_tree_frist_tap_bg"] forState:UIControlStateNormal]; - [_fristLoveBtn addTarget:self action:@selector(fineLoveAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _fristLoveBtn; -} -- (UIButton *)tenthLoveBtn{ - if(!_tenthLoveBtn){ - _tenthLoveBtn = [UIButton new]; - _tenthLoveBtn.yn_acceptEventInterval = 1; - [_tenthLoveBtn setBackgroundImage:[UIImage getLanguageImage:@"room_candy_tree_ten_tap_bg"] forState:UIControlStateNormal]; - [_tenthLoveBtn addTarget:self action:@selector(fineLoveAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _tenthLoveBtn; -} -- (UIButton *)hundredthLoveBtn{ - if(!_hundredthLoveBtn){ - _hundredthLoveBtn = [UIButton new]; - _hundredthLoveBtn.yn_acceptEventInterval = 1; - [_hundredthLoveBtn setBackgroundImage:[UIImage getLanguageImage:@"room_candy_tree_hundredth_tap_bg"] forState:UIControlStateNormal]; - [_hundredthLoveBtn addTarget:self action:@selector(fineLoveAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _hundredthLoveBtn; -} -- (UIButton *)twoHundredhLoveBtn{ - if(!_twoHundredhLoveBtn){ - _twoHundredhLoveBtn = [UIButton new]; - _twoHundredhLoveBtn.yn_acceptEventInterval = 1; - [_twoHundredhLoveBtn setBackgroundImage:[UIImage getLanguageImage:@"room_candy_two_hundredth_tap_bg"] forState:UIControlStateNormal]; - [_twoHundredhLoveBtn addTarget:self action:@selector(fineLoveAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _twoHundredhLoveBtn; -} -- (XPCandyTreeBuyView *)buyView{ - if(!_buyView){ - _buyView = [[XPCandyTreeBuyView alloc]initWithFrame:CGRectZero]; - _buyView.delegate = self; - } - return _buyView; -} -- (UIImageView *)plateView{ - if(!_plateView){ - _plateView = [UIImageView new]; - _plateView.image = kImage(@"ms_smash_eggs_plate_iocn"); - } - return _plateView; -} -- (UIImageView *)eggView{ - if(!_eggView){ - _eggView = [UIImageView new]; - _eggView.image = kImage(@"ms_smash_eggs_iocn"); - } - return _eggView; -} -- (UIImageView *)lampView{ - if(!_lampView){ - _lampView = [UIImageView new]; - _lampView.image = kImage(@"ms_smash_eggs_lamp_iocn"); - } - return _lampView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPRoomHalfWebView.h b/YuMi/Modules/YMRoom/View/CandyTree/View/XPRoomHalfWebView.h deleted file mode 100644 index f479e83..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPRoomHalfWebView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// XPRoomHalfWebView.h -// xplan-ios -// -// Created by 冯硕 on 2021/12/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@interface XPRoomHalfWebView : UIView -/// -@property (nonatomic,assign) BOOL isPay; -/// -@property (nonatomic,assign) BOOL isPush; -///地址 -@property (nonatomic,copy) NSString *url; -///房间uid -@property (nonatomic,copy) NSString *roomUid; - -///地区码 -@property (nonatomic, assign) NSInteger partitionId; - -///资源位玩法 -@property (nonatomic,assign) BOOL isPlayView; -@property(nonatomic,assign) BOOL isSailing; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPRoomHalfWebView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPRoomHalfWebView.m deleted file mode 100644 index e774b80..0000000 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPRoomHalfWebView.m +++ /dev/null @@ -1,218 +0,0 @@ -// -// XPRoomHalfWebView.m -// xplan-ios -// -// Created by 冯硕 on 2021/12/9. -// - -#import "XPRoomHalfWebView.h" -///Third -#import -#import "XPWebViewController.h" -#import "XPSkillCardPlayerManager.h" -///Tool -#import "PIRoomActivityWebView.h" - -#import "TTPopup.h" - - -@interface XPRoomHalfWebView () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///点击消失的view -@property (nonatomic,strong) UIView * topView; -/// 导航栏 -@property (nonatomic,strong) UIView * toolView; -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///关闭按钮 -@property (nonatomic,strong) UIButton *closeButton; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///加入h5 -@property (nonatomic, strong) XPWebViewController *webVC; -@end - -@implementation XPRoomHalfWebView -- (void)dealloc { - -} - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - - [self addSubview:self.topView]; - [self addSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.toolView]; - [self.stackView addArrangedSubview:self.webVC.view]; - - [self.toolView addSubview:self.backButton]; - [self.toolView addSubview:self.titleLabel]; - @kWeakify(self); - self.webVC.InitShowNavBlock = ^(BOOL show) { - @kStrongify(self); - self.toolView.hidden = YES; - }; - - self.webVC.CloseWebViewBlock = ^(BOOL result) { - [TTPopup dismiss]; - }; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(KScreenHeight); - }]; - - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - make.bottom.mas_equalTo(self.toolView.mas_top); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self); - make.height.mas_equalTo(kHalfScreenHeight); - }]; - - - [self.toolView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(44); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.toolView); - make.centerY.mas_equalTo(self.toolView); - }]; - - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(6); - make.width.mas_equalTo(40); - make.top.bottom.mas_equalTo(self.toolView); - }]; -} --(void)setIsPlayView:(BOOL)isPlayView{ - _isPlayView = isPlayView; - - [self.stackView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self); - make.height.mas_equalTo(643 * kWebViewScale); - }]; -} -#pragma mark - Event Response -- (void)didClickCloseButton:(UIButton *)sender { - [TTPopup dismiss]; -} - -- (void)topViewRecognizer { - [TTPopup dismiss]; -} --(void)setIsPay:(BOOL)isPay{ - _isPay = isPay; - if(_isPay == YES){ - _webVC.isPush = YES; - } - -} --(void)setIsPush:(BOOL)isPush{ - _isPush = isPush; - _webVC.isPush = _isPush; -} -#pragma mark - Getters And Setters -- (void)setUrl:(NSString *)url { - _url = url; - if (_url.length > 0) { - self.webVC.roomUid = self.roomUid; - self.webVC.url = _url; - } -} - -- (void)setIsSailing:(BOOL)isSailing { - _isSailing = isSailing; - if (_isSailing) { - self.webVC.webview.scrollView.backgroundColor = [UIColor clearColor]; - self.webVC.webview.opaque = NO; - } -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 0; - _stackView.layer.cornerRadius = 10; - _stackView.layer.masksToBounds = YES; - } - return _stackView; -} - -- (UIView *)topView { - if (!_topView) { - _topView = [[UIView alloc] init]; - _topView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(topViewRecognizer)]; - [_topView addGestureRecognizer:tap]; - } - return _topView; -} - -- (UIView *)toolView { - if (!_toolView) { - _toolView = [[UIView alloc] init]; - _toolView.backgroundColor = [UIColor whiteColor]; - CAShapeLayer * layer = [CAShapeLayer layer]; - UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, 44) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)]; - layer.path = path.CGPath; - _toolView.layer.mask = layer; - } - return _toolView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [UIColor blackColor]; - _titleLabel.font = [UIFont systemFontOfSize:17]; - } - return _titleLabel; -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [[UIButton alloc] init]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backButton addTarget:self action:@selector(didClickCloseButton:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -- (XPWebViewController *)webVC { - if (_webVC == nil) { - _webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - _webVC.isProperty = YES; - - _webVC.view.backgroundColor = [UIColor clearColor]; - __weak typeof(self) weakSelf = self; - _webVC.urlLoadCompleted = ^(BOOL result, NSError *error) { - weakSelf.titleLabel.text = weakSelf.webVC.navigationItem.title; - }; - } - return _webVC; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/Common/BaseRoomBannerView.h b/YuMi/Modules/YMRoom/View/Common/BaseRoomBannerView.h deleted file mode 100644 index 58c8022..0000000 --- a/YuMi/Modules/YMRoom/View/Common/BaseRoomBannerView.h +++ /dev/null @@ -1,36 +0,0 @@ -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface BaseRoomBannerView : UIView - -// 基础属性 -@property (nonatomic, strong) UIView *containerView; -@property (nonatomic, strong) UIImageView *backgroundImageView; - -// 动画相关 -@property (nonatomic, assign) CGFloat showDuration; -@property (nonatomic, assign) CGFloat hideDuration; -@property (nonatomic, assign) CGFloat stayDuration; - -// 显示状态 -@property (nonatomic, assign, readonly) BOOL isShowing; - -// 初始化方法 -- (instancetype)initWithFrame:(CGRect)frame; - -// 显示方法 -- (void)show; -- (void)showWithCompletion:(void(^)(void))completion; - -// 隐藏方法 -- (void)hide; -- (void)hideWithCompletion:(void(^)(void))completion; - -// 子类需要实现的方法 -- (void)setupUI; -- (void)setupAnimation; - -@end - -NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/YuMi/Modules/YMRoom/View/Common/BaseRoomBannerView.m b/YuMi/Modules/YMRoom/View/Common/BaseRoomBannerView.m deleted file mode 100644 index f639324..0000000 --- a/YuMi/Modules/YMRoom/View/Common/BaseRoomBannerView.m +++ /dev/null @@ -1,119 +0,0 @@ -#import "BaseRoomBannerView.h" - -@interface BaseRoomBannerView () - -@property (nonatomic, assign) BOOL isShowing; - -@end - -@implementation BaseRoomBannerView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self setupDefaultValues]; - [self setupUI]; - [self setupAnimation]; - } - return self; -} - -- (void)setupDefaultValues { - self.showDuration = 0.3; - self.hideDuration = 0.3; - self.stayDuration = 2.0; - self.isShowing = NO; -} - -- (void)setupUI { - // 容器视图 - self.containerView = [[UIView alloc] init]; - [self addSubview:self.containerView]; - - // 背景图 - self.backgroundImageView = [[UIImageView alloc] init]; - self.backgroundImageView.contentMode = UIViewContentModeScaleAspectFill; - [self.containerView addSubview:self.backgroundImageView]; - - // 设置初始状态 - self.alpha = 0; - self.hidden = YES; - self.transform = CGAffineTransformMakeScale(0.8, 0.8); -} - -- (void)setupAnimation { - // 子类可以重写此方法设置特定的动画参数 -} - -- (void)show { - [self showWithCompletion:nil]; -} - -- (void)showWithCompletion:(void(^)(void))completion { - if (self.isShowing) { - return; - } - - self.isShowing = YES; - self.hidden = NO; - - // 显示动画 - [UIView animateWithDuration:self.showDuration - delay:0 - usingSpringWithDamping:0.6 - initialSpringVelocity:0.5 - options:UIViewAnimationOptionCurveEaseOut - animations:^{ - self.alpha = 1; - self.transform = CGAffineTransformMakeScale(1.2, 1.2); - } completion:^(BOOL finished) { -// if (finished) { -// // 恢复原始大小 -// [UIView animateWithDuration:0.2 animations:^{ -// self.transform = CGAffineTransformIdentity; -// } completion:^(BOOL finished) { -// if (finished) { -// // 延迟隐藏 -// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(self.stayDuration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ -// [self hideWithCompletion:completion]; -// }); -// } -// }]; -// } - }]; -} - -- (void)hide { - [self hideWithCompletion:nil]; -} - -- (void)hideWithCompletion:(void(^)(void))completion { - if (!self.isShowing) { - return; - } - - // 隐藏动画 - [UIView animateWithDuration:self.hideDuration - delay:0 - usingSpringWithDamping:0.6 - initialSpringVelocity:0.5 - options:UIViewAnimationOptionCurveEaseIn - animations:^{ - self.alpha = 0; - self.transform = CGAffineTransformMakeScale(0.8, 0.8); - } completion:^(BOOL finished) { - if (finished) { - self.hidden = YES; - self.isShowing = NO; - if (completion) { - completion(); - } - } - }]; -} - -- (void)updateContent:(NSDictionary *)content { - // 子类实现具体内容更新 -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Common/BravoGiftBannerView.h b/YuMi/Modules/YMRoom/View/Common/BravoGiftBannerView.h deleted file mode 100644 index 6e5b059..0000000 --- a/YuMi/Modules/YMRoom/View/Common/BravoGiftBannerView.h +++ /dev/null @@ -1,18 +0,0 @@ -#import - -@class AttachmentModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface BravoGiftBannerView : UIView - - -+ (void)display:(UIView *)superView - inRoomUid:(NSInteger)roomUid - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete -exitCurrentRoom:(void(^)(void))exit; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Common/BravoGiftBannerView.m b/YuMi/Modules/YMRoom/View/Common/BravoGiftBannerView.m deleted file mode 100644 index 1159f5f..0000000 --- a/YuMi/Modules/YMRoom/View/Common/BravoGiftBannerView.m +++ /dev/null @@ -1,324 +0,0 @@ -#import "BravoGiftBannerView.h" -#import "UserInfoModel.h" -#import "AttachmentModel.h" -#import -#import -#import "XPRoomViewController.h" -#import "XCCurrentVCStackManager.h" - -//{"data":"{\"times\":\"1.65\",\"sender\":{\"avatar\":\"https://image.pekolive.com/14a8039a-df7f-4a4b-a6b9-99c6d3f9918e.gif\",\"erbanNo\":6228657,\"gender\":1,\"nick\":\"Molistar\",\"uid\":3224},\"coins\":\"1650.0\",\"giftPic\":\"https://image.pekolive.com/1000.png\",\"giftNameMap\":{\"ar\":\"lucky1000\",\"en\":\"lucky1000\",\"zh\":\"lucky1000\",\"tr\":\"lucky1000\"},\"roomUid\":3224}","first":106,"second":1066} - -@interface BravoGiftBannerViewModel : PIBaseModel - -@property (nonatomic, assign, readonly) CGFloat times; -@property (nonatomic, assign, readonly) CGFloat coins; -@property (nonatomic, copy, readonly) NSString *giftPic; -@property (nonatomic, copy, readonly) NSDictionary *giftNameMap; -@property (nonatomic, copy) NSNumber *roomUid; -@property (nonatomic, strong, readonly) UserInfoModel *sender; - -@end - -@implementation BravoGiftBannerViewModel - -@end - - -@interface BravoGiftBannerView () -@property (nonatomic, strong) BravoGiftBannerViewModel *model; -@property (nonatomic, strong) NetImageView *sendAvatarImageView; -@property (nonatomic, strong) NetImageView *giftImageView; -@property (nonatomic, strong) UILabel *goldNumLabel; -//@property (nonatomic, strong) UIImageView *backgroundImageView; -@property (nonatomic, strong) UIImageView *moneyIconImageView; -@property(nonatomic, strong) SVGAImageView *svgaView; -@property (nonatomic, assign) NSInteger currentRoomUid; -@property (nonatomic, copy) void(^completeDisplay)(void); -@property (nonatomic, copy) void(^exitCurrentRoom)(void); -@property (nonatomic, assign) BOOL isLeaveAnimating; - -@end - -@implementation BravoGiftBannerView - -+ (void)display:(UIView *)superView - inRoomUid:(NSInteger)roomUid - with:(AttachmentModel *)attachment - complete:(void (^)(void))complete -exitCurrentRoom:(void(^)(void))exit { - BravoGiftBannerViewModel *model = [BravoGiftBannerViewModel modelWithDictionary:attachment.data]; - CGRect frame = CGRectMake(KScreenWidth, 0, KScreenWidth, kGetScaleWidth(90)); - BravoGiftBannerView *banner = [[BravoGiftBannerView alloc] initWithFrame:frame]; - banner.model = model; - banner.currentRoomUid = roomUid; - banner.completeDisplay = complete; - banner.exitCurrentRoom = exit; - [superView addSubview:banner]; - - NSInteger time = 3; - - @kWeakify(banner); - [banner popEnterAnimation:^(BOOL finished) { - @kStrongify(banner); - if (finished) { - [banner addNotification]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(time * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [banner removeNotification]; - [banner popLeaveAnimation:^(bool finished) { - if (banner.completeDisplay) { - banner.completeDisplay(); - } - [banner removeFromSuperview]; - }]; - }); - } - }]; -} - -- (void)handleSwipeNotification { - NSLog(@"🎯 BravoGiftBannerView: 响应 swipe 手势，开始移除动画"); - [self dismissBanner]; -} - -- (void)handleTapNotification:(NSNotification *)note { - NSValue *value = note.userInfo[@"point"]; - CGPoint point = [value CGPointValue]; - // 计算中央 2/3 区域 - CGFloat totalW = KScreenWidth; - CGFloat regionW = totalW * 2.0 / 3.0; - CGFloat originX = (totalW - regionW) / 2.0; - - CGRect centerRegion = CGRectMake(originX, - 0, // 高度不做限制就填 0 - regionW, - self.bounds.size.height); - - if (CGRectContainsPoint(centerRegion, point)) { - NSLog(@" Banner tap 点落在中央 2/3 区域"); - [self handleTap]; - } else { - NSLog(@" Banner tap 点不落在中央 2/3 区域"); - // 将 banner 中的点转换为屏幕坐标系 - CGPoint screenPoint = [self convertPoint:point toView:nil]; - - // 发送通知给 FunctionContainer 处理，传递屏幕坐标 - [[NSNotificationCenter defaultCenter] postNotificationName:@"BannerTapToFunctionContainer" - object:nil - userInfo:@{@"point": [NSValue valueWithCGPoint:screenPoint]}]; - } -} - -- (void)addNotification { - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleSwipeNotification) - name:@"SwipeOutBanner" - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTapNotification:) - name:@"TapBanner" - object:nil]; -} - -- (void)removeNotification { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (void)setModel:(BravoGiftBannerViewModel *)model { - _model = model; - self.sendAvatarImageView.imageUrl = model.sender.avatar; - self.giftImageView.imageUrl = model.giftPic; - self.goldNumLabel.text = [NSString stringByRemovingRedundantZeros:@(model.coins).stringValue]; -} - -- (void)dismissBanner { - [self pop_removeAllAnimations]; // 停止所有动画 - - [self popLeaveAnimation:^(bool finished) { - if (self.completeDisplay) { - self.completeDisplay(); - } - [self removeFromSuperview]; - }]; -} - -- (void)popEnterAnimation:(void(^)(BOOL finished))finish { - POPSpringAnimation *enterAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewFrame]; - enterAnimation.toValue = [NSValue valueWithCGRect:CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(100))]; - enterAnimation.springBounciness = 10; // 弹性系数 - enterAnimation.springSpeed = 12; // 动画速度 - enterAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finish) { - finish(finished); - } - }; - [self pop_addAnimation:enterAnimation forKey:@"enterAnimation"]; -} - -- (void)popLeaveAnimation:(void(^)(bool finished))finish { - if (self.isLeaveAnimating) { - return; - } - self.isLeaveAnimating = YES; - POPBasicAnimation *exitAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewFrame]; - exitAnimation.toValue = [NSValue valueWithCGRect:CGRectMake(-KScreenWidth, 0, KScreenWidth, kGetScaleWidth(100))]; - exitAnimation.duration = 0.25; // 动画持续时间 - exitAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - exitAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finish) { - finish(finished); - } - }; - [self pop_addAnimation:exitAnimation forKey:@"exitAnimation"]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self setupUI]; - self.userInteractionEnabled = YES; - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [self addSubview:b]; - [b mas_remakeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; -// [b addTarget:self action:@selector(handleTap) forControlEvents:UIControlEventTouchUpInside]; - } - return self; -} - -- (void)handleTap { - if (self.model.roomUid.integerValue == self.currentRoomUid) { - return; - } - - // 在弹框显示前保存必要数据，避免依赖banner对象 - NSNumber *targetRoomUid = self.model.roomUid; - void(^exitCurrentRoomBlock)(void) = self.exitCurrentRoom; - - @kWeakify(self); - [TTPopup alertWithMessage:YMLocalizedString(@"Combo_10") confirmHandler:^{ - @kStrongify(self); - - // 检查banner是否还存在 - if (!self) { - NSLog(@"⚠️ BravoGiftBannerView: banner已被移除，但弹框回调仍在执行"); - // 即使banner被移除，仍然执行跳转逻辑 - if (exitCurrentRoomBlock) { - exitCurrentRoomBlock(); - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:targetRoomUid.stringValue - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - return; - } - - // banner还存在，正常执行 - if (self.exitCurrentRoom) { - self.exitCurrentRoom(); - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:targetRoomUid.stringValue - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } cancelHandler:^{}]; -} - -- (void)setupUI { - // 设置背景图 - self.svgaView = [[SVGAImageView alloc] init]; - self.svgaView.loops = 0; - self.svgaView.clearsAfterStop = YES; - [self addSubview:self.svgaView]; - [self.svgaView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - SVGAParser *p = [[SVGAParser alloc] init]; - @kWeakify(self); - [p parseWithNamed:@"brove_gift" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - if (videoItem) { - self.svgaView.videoItem = videoItem; - [self.svgaView startAnimation]; - } - } failureBlock:^(NSError * _Nonnull error) { - @kStrongify(self); - if (self.completeDisplay) { - self.completeDisplay(); - } - }]; - - UILabel *sendLabel = [self sendLabel]; - UILabel *winLabel = [self winLabel]; - - // 发送者头像 - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - self.sendAvatarImageView = [[NetImageView alloc] initWithConfig:config]; - [self.sendAvatarImageView setCornerRadius:kGetScaleWidth(15)]; - - // 礼物头像 - self.giftImageView = [[NetImageView alloc] initWithConfig:config]; - [self.giftImageView setCornerRadius:2]; - - // 金币数量 - self.goldNumLabel = [[UILabel alloc] init]; - self.goldNumLabel.font = kFontSemibold(18); - self.goldNumLabel.textColor = UIColorFromRGB(0xffec6f); - - // 金币图标 - self.moneyIconImageView = [[UIImageView alloc] init]; - self.moneyIconImageView.image = kImage(@"moli_money_icon"); - - UIStackView *stackView = [[UIStackView alloc] initWithArrangedSubviews:@[ - self.sendAvatarImageView, - sendLabel, - self.giftImageView, - winLabel, - self.goldNumLabel, - self.moneyIconImageView - ]]; - stackView.spacing = 4; - stackView.alignment = UIStackViewAlignmentCenter; - [self addSubview:stackView]; - [stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self).offset(kGetScaleWidth(28)); - }]; - - [sendLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(24); - }]; - [winLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(24); - }]; - - [self.sendAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(30)); - }]; - - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(32)); - }]; - - [self.moneyIconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(24)); - }]; -} - -- (UILabel *)sendLabel { - return [UILabel labelInitWithText:YMLocalizedString(@"Combo_0") - font:kFontRegular(14) - textColor:[UIColor whiteColor]]; -} - -- (UILabel *)winLabel { - return [UILabel labelInitWithText:YMLocalizedString(@"Combo_4") - font:kFontRegular(14) - textColor:[UIColor whiteColor]]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGCell.h b/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGCell.h deleted file mode 100644 index c2cb6f2..0000000 --- a/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGCell.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// CustomRoomBGCell.h -// YuMi -// -// Created by P on 2024/10/30. -// - -#import - -@class CustomRoomBGItemModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface CustomRoomBGCell : UICollectionViewCell - -@property (nonatomic, assign) BOOL isSelectedCell; -@property (nonatomic, copy) void(^handleTapActionButton)(CustomRoomBGItemModel *obj); -@property (nonatomic, copy) void(^handleTapTrash)(CustomRoomBGItemModel *model); - -+ (void)registerTo:(UICollectionView *)collectionView; -+ (CustomRoomBGCell *)reuseFrom:(UICollectionView *)collectionView - model:(CustomRoomBGItemModel *)model - atIndexPath:(NSIndexPath *)indexPath; - -- (void)playSVGA; -- (void)pauseSVGA; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGCell.m b/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGCell.m deleted file mode 100644 index 9b82776..0000000 --- a/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGCell.m +++ /dev/null @@ -1,548 +0,0 @@ -// -// CustomRoomBGCell.m -// YuMi -// -// Created by P on 2024/10/30. -// - -#import "CustomRoomBGCell.h" - -#import "SVGA.h" -#import "CustomRoomBGItemModel.h" - -@interface CustomRoomBGCell () - -@property (nonatomic, strong) NetImageView *bgImageView; -@property (nonatomic, strong) UIView *selectedStateView; -@property (nonatomic, strong) UILabel *freeDefaultTagLabel; -@property (nonatomic, strong) UILabel *remainingDaysLabel; -@property (nonatomic, strong) UILabel *typeLabel; -@property (nonatomic, strong) UIButton *previewButton; -@property (nonatomic, strong) UILabel *pricePerDayLabel; -@property (nonatomic, strong) UIButton *actionButton; -@property (nonatomic, strong) UIImageView *bgTypeImageView; -@property (nonatomic, strong) UIButton *playButton; -@property (nonatomic, strong) UIButton *trashButton; -@property (nonatomic, strong) UIImageView *goldIcon; -@property (nonatomic, strong) CustomRoomBGItemModel *cellModel; -@property (nonatomic, strong) NSIndexPath *cellIndexPath; -@property (nonatomic, strong) SVGAImageView *svgaImageView; -@property (nonatomic, strong) SVGAParser *parser; -//@property (nonatomic, strong) SVGAVideoEntity *svgaEntity; - -@property (nonatomic, strong) CAGradientLayer *actionButtonLayer; - -@end - -@implementation CustomRoomBGCell - -+ (void)registerTo:(UICollectionView *)collectionView { - NSString *cellID_free = [NSString stringWithFormat:@"%@%@", NSStringFromClass([self class]), @(0)]; - NSString *cellID_pay = [NSString stringWithFormat:@"%@%@", NSStringFromClass([self class]), @(1)]; - NSString *cellID_custom = [NSString stringWithFormat:@"%@%@", NSStringFromClass([self class]), @(2)]; - [collectionView registerClass:[self class] - forCellWithReuseIdentifier:cellID_pay]; - [collectionView registerClass:[self class] - forCellWithReuseIdentifier:cellID_free]; - [collectionView registerClass:[self class] - forCellWithReuseIdentifier:cellID_custom]; -} - -+ (CustomRoomBGCell *)reuseFrom:(UICollectionView *)collectionView - model:(CustomRoomBGItemModel *)model - atIndexPath:(NSIndexPath *)indexPath { - NSString *cellID = [NSString stringWithFormat:@"%@%@", NSStringFromClass([self class]), @(model.type)]; - CustomRoomBGCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:cellID - forIndexPath:indexPath]; - cell.cellIndexPath = indexPath; - cell.cellModel = model; - return cell; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self setupUI]; - } - return self; -} - -- (void)prepareForReuse { - [super prepareForReuse]; - [self pauseSVGA]; -} - -- (void)playSVGA { - self.bgImageView.hidden = YES; - self.svgaImageView.hidden = YES; - if ([self.cellModel.url.lowercaseString hasSuffix:@"svga"]) { - self.svgaImageView.hidden = NO; - if (self.svgaImageView.videoItem) { - [self.svgaImageView startAnimation]; - } else { - @kWeakify(self); - [self.parser parseWithURL:[NSURL URLWithString:[self.cellModel.url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]] - completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - self.svgaImageView.videoItem = videoItem; - [self.svgaImageView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { -// NSLog(@"%@", error); - }]; - } - } else { - self.bgImageView.hidden = NO; - self.bgImageView.imageUrl = self.cellModel.url; - } -} -- (void)pauseSVGA { - if ([self.cellModel.url.lowercaseString hasSuffix:@"svga"]) { - [self.svgaImageView stopAnimation]; // 停止动画 - self.svgaImageView.videoItem = nil; // 清除视频资源 - } -} - -- (void)displayFreeDefaultTag:(BOOL)needDisplay { - self.freeDefaultTagLabel.hidden = !needDisplay; -} - -- (void)displayPayRemainTag:(BOOL)needDisplay { - self.remainingDaysLabel.hidden = !needDisplay; -} - -- (void)displayGIFTag:(BOOL)needDisplay { - self.bgTypeImageView.hidden = !needDisplay; - self.playButton.hidden = !needDisplay; -} - -- (void)updateActionButtonToRenew { - [self removeAllActionButtonSublayers]; - [self.actionButton setTitle:YMLocalizedString(@"1.0.18_10") forState:UIControlStateNormal]; - [self.actionButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - self.actionButton.backgroundColor = [UIColor colorWithWhite:1 alpha:0.2]; - [self.actionButton setCornerRadius:10 - corners:(kCALayerMinXMinYCorner | - kCALayerMaxXMinYCorner | - kCALayerMinXMaxYCorner | - kCALayerMaxXMaxYCorner) - borderWidth:1 - borderColor:[UIColor whiteColor]]; - - self.actionButton.userInteractionEnabled = YES; -} - -- (void)updateActionButtonToInReview { - [self removeAllActionButtonSublayers]; - [self.actionButton setTitle:YMLocalizedString(@"1.0.18_18") forState:UIControlStateNormal]; - [self.actionButton setTitleColor:UIColorFromRGB(0xff9741) forState:UIControlStateNormal]; - self.actionButton.backgroundColor = UIColorRGBAlpha(0xff9741, 0.2); - [self.actionButton setCornerRadius:10 - corners:(kCALayerMinXMinYCorner | - kCALayerMaxXMinYCorner | - kCALayerMinXMaxYCorner | - kCALayerMaxXMaxYCorner) - borderWidth:1 - borderColor:UIColorFromRGB(0xff9741)]; - - self.actionButton.userInteractionEnabled = YES; -} - -- (void)updateActionButtonToInReject { - [self removeAllActionButtonSublayers]; - [self.actionButton setTitle:YMLocalizedString(@"1.0.18_19") forState:UIControlStateNormal]; - [self.actionButton setTitleColor:UIColorFromRGB(0xff5656) forState:UIControlStateNormal]; - self.actionButton.backgroundColor = UIColorRGBAlpha(0xff5656, 0.2); - [self.actionButton setCornerRadius:10 - corners:(kCALayerMinXMinYCorner | - kCALayerMaxXMinYCorner | - kCALayerMinXMaxYCorner | - kCALayerMaxXMaxYCorner) - borderWidth:1 - borderColor:UIColorFromRGB(0xff5656)]; - - self.actionButton.userInteractionEnabled = YES; -} - -- (void)updateActionButtonToBuy { - [self removeAllActionButtonSublayers]; - [self.actionButton setTitle:YMLocalizedString(@"1.0.18_9") forState:UIControlStateNormal]; - [self.actionButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - - if (!_actionButtonLayer) { - // 创建渐变图层 - CAGradientLayer *gradientLayer = [CAGradientLayer layer]; - gradientLayer.colors = @[(__bridge id)UIColorFromRGB(0xE29030).CGColor, - (__bridge id)UIColorFromRGB(0xFCC074).CGColor]; - gradientLayer.startPoint = CGPointMake(0.0, 0.0); // 顶部中央 - gradientLayer.endPoint = CGPointMake(0.0, 1.0); // 底部中央 - gradientLayer.frame = CGRectMake(0, 0, 72, 22); // 设置渐变图层大小 - - _actionButtonLayer = gradientLayer; - // 将渐变图层添加到按钮图层 - [self.actionButton.layer insertSublayer:self.actionButtonLayer atIndex:0]; - } else { - self.actionButtonLayer.hidden = NO; - } - - [self.actionButton setCornerRadius:10 - corners:(kCALayerMinXMinYCorner | - kCALayerMaxXMinYCorner | - kCALayerMinXMaxYCorner | - kCALayerMaxXMaxYCorner) - borderWidth:0 - borderColor:[UIColor clearColor]]; - - self.actionButton.userInteractionEnabled = NO; -} - -- (void)removeAllActionButtonSublayers { - if (self.actionButtonLayer) { - self.actionButtonLayer.hidden = YES; - } -} - -- (void)setIsSelectedCell:(BOOL)isSelectedCell { - _isSelectedCell = isSelectedCell; - self.selectedStateView.hidden = !isSelectedCell; -} - -- (void)setCellModel:(CustomRoomBGItemModel *)cellModel { - _cellModel = cellModel; - - self.isSelectedCell = cellModel.isCur; - switch (cellModel.type) { - case RoomBGType_Free: - [self layoutFreeUI]; - [self displayFreeDefaultTag:self.cellIndexPath.row == 0]; - [self displayGIFTag:[cellModel.url hasSuffix:@"svga"]]; - break; - case RoomBGType_Pay: - [self layoutPayUI]; - [self setupBottomArea]; - self.pricePerDayLabel.text = [cellModel pricePerDays]; - [self displayGIFTag:[cellModel.url hasSuffix:@"svga"]]; - [self displayPayRemainTag:cellModel.status == RoomBGStatus_Expired || cellModel.status == RoomBGStatus_Pass]; - [self updateActionButtonToBuy]; - switch (cellModel.status) { - case RoomBGStatus_Expired: - self.remainingDaysLabel.text = YMLocalizedString(@"1.0.18_7"); - [self updateActionButtonToRenew]; - break; - case RoomBGStatus_Reviewing: - self.remainingDaysLabel.text = @""; - break; - case RoomBGStatus_Pass: - self.remainingDaysLabel.text = [cellModel remainDays]; - self.remainingDaysLabel.hidden = [NSString isEmpty:[cellModel remainDays]]; - if (![NSString isEmpty:cellModel.remainHour]) { - [self updateActionButtonToRenew]; - } - break; - case RoomBGStatus_Rejected: - self.remainingDaysLabel.text = @""; - break; - default: - break; - } - break; - case RoomBGType_Custom: - [self layoutCustomUI]; - [self setupBottomArea]; - self.pricePerDayLabel.text = [cellModel pricePerDays]; - [self displayGIFTag:NO]; - [self displayPayRemainTag:cellModel.status == RoomBGStatus_Expired || cellModel.status == RoomBGStatus_Pass]; - self.trashButton.hidden = NO; - switch (cellModel.status) { - case RoomBGStatus_Expired: - self.remainingDaysLabel.text = YMLocalizedString(@"1.0.18_7"); - self.remainingDaysLabel.hidden = NO; - [self updateRemainLabel:YES]; - [self updateActionButtonToRenew]; - break; - case RoomBGStatus_Reviewing: - self.remainingDaysLabel.text = @""; - self.remainingDaysLabel.hidden = YES; - self.trashButton.hidden = YES; - [self updateActionButtonToInReview]; - break; - case RoomBGStatus_Pass: - self.remainingDaysLabel.text = [cellModel remainDays]; - self.remainingDaysLabel.hidden = [NSString isEmpty:[cellModel remainDays]]; - [self updateRemainLabel:NO]; - [self updateActionButtonToRenew]; - break; - case RoomBGStatus_Rejected: - self.remainingDaysLabel.hidden = YES; - [self updateActionButtonToInReject]; - break; - - default: - break; - } - break; - default: - break; - } -} - -- (void)layoutFreeUI { - [self.contentView addSubview:self.freeDefaultTagLabel]; - [self.freeDefaultTagLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(6); - make.height.mas_equalTo(20); - make.width.mas_greaterThanOrEqualTo(52); - }]; - - [self.contentView addSubview:self.bgTypeImageView]; - [self.bgTypeImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.top.mas_equalTo(self.contentView).inset(6); - make.size.mas_equalTo(CGSizeMake(27, 19)); - }]; -} - -- (void)layoutPayUI { - [self.contentView addSubview:self.remainingDaysLabel]; - [self.remainingDaysLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(6); - make.height.mas_equalTo(20); - make.width.mas_greaterThanOrEqualTo(50); - }]; - - [self.contentView addSubview:self.playButton]; - [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.top.mas_equalTo(self.contentView).inset(6); - make.size.mas_equalTo(CGSizeMake(24, 19)); - }]; - - [self.contentView addSubview:self.bgTypeImageView]; - [self.bgTypeImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.playButton); - make.trailing.mas_equalTo(self.playButton.mas_leading).offset(-6); - make.size.mas_equalTo(CGSizeMake(27, 19)); - }]; -} - -- (void)layoutCustomUI { - [self.contentView addSubview:self.remainingDaysLabel]; - [self.remainingDaysLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(6); - make.height.mas_equalTo(20); - make.width.mas_greaterThanOrEqualTo(50); - }]; - - [self.contentView addSubview:self.trashButton]; - [self.trashButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.top.mas_equalTo(self.contentView).inset(6); - make.size.mas_equalTo(CGSizeMake(24, 19)); - }]; -} - -- (void)setupUI { - [self.contentView addSubview:self.bgImageView]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(6); - make.top.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(180)); - }]; - - [self.contentView addSubview:self.svgaImageView]; - [self.svgaImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(6); - make.top.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(180)); - }]; - - [self.contentView addSubview:self.selectedStateView]; - [self.selectedStateView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.bgImageView); - }]; -} - -- (void)setupBottomArea { - UIStackView *stack = [[UIStackView alloc] init]; - stack.spacing = 3; - [self.contentView addSubview: stack]; - [stack mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.selectedStateView.mas_bottom).offset(6); - make.centerX.mas_equalTo(self.selectedStateView); - make.height.mas_equalTo(22); - }]; - - [stack addArrangedSubview:self.goldIcon]; - [self.goldIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - - [stack addArrangedSubview:self.pricePerDayLabel]; - - [self.contentView addSubview:self.actionButton]; - [self.actionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(stack.mas_bottom).offset(6); - make.width.mas_greaterThanOrEqualTo(72); - make.height.mas_equalTo(22); - }]; -} - -- (void)updateRemainLabel:(BOOL)isForExpired { - self.remainingDaysLabel.textColor = [UIColor whiteColor]; - if (isForExpired) { - self.remainingDaysLabel.backgroundColor = UIColorFromRGB(0x696969); - } else { - self.remainingDaysLabel.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - } -} - -#pragma mark - -- (void)didTapActionButton { - if (self.handleTapActionButton) { - self.handleTapActionButton(self.cellModel); - } -} - -- (void)didTapPlayButton { -// if (self.handleTapPlayButton) { -// self.handleTapPlayButton(@""); -// } -} - -- (void)didTapTrashButton { - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"XPMineUserInfoAlbumViewController12"); - config.message = YMLocalizedString(@"XPMineUserInfoAlbumViewController13"); - @kWeakify(self); - [TTPopup alertWithConfig:config - showBorder:NO - confirmHandler:^{ - @kStrongify(self); - if (self.handleTapTrash) { - self.handleTapTrash(self.cellModel); - } - } - cancelHandler:^{}]; -} - - -#pragma mark - -- (NetImageView *)bgImageView { - if (!_bgImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultEmptyPlaceholder]; - _bgImageView = [[NetImageView alloc] initWithConfig:config]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - _bgImageView.layer.masksToBounds = YES; - _bgImageView.layer.cornerRadius = 10; - } - return _bgImageView; -} - -- (SVGAImageView *)svgaImageView { - if (!_svgaImageView) { - _svgaImageView = [[SVGAImageView alloc] init]; - _svgaImageView.contentMode = UIViewContentModeScaleAspectFill; - _svgaImageView.clipsToBounds = YES; - _svgaImageView.loops = 0; - } - return _svgaImageView; -} - -- (UIView *)selectedStateView { - if (!_selectedStateView) { - _selectedStateView = [[UIView alloc] init]; - _selectedStateView.backgroundColor = [UIColor clearColor]; - _selectedStateView.layer.cornerRadius = 10; - _selectedStateView.layer.borderColor = UIColorFromRGB(0xFF8C03).CGColor; - _selectedStateView.layer.borderWidth = 2; - _selectedStateView.layer.masksToBounds = YES; - _selectedStateView.hidden = YES; - } - return _selectedStateView; -} - -- (UILabel *)remainingDaysLabel { - if (!_remainingDaysLabel) { - _remainingDaysLabel = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:[UIColor whiteColor]]; - _remainingDaysLabel.backgroundColor = UIColorFromRGB(0x696969); - _remainingDaysLabel.textAlignment = NSTextAlignmentCenter; - [_remainingDaysLabel setCornerRadius:10]; - } - return _remainingDaysLabel; -} - -- (UIImageView *)goldIcon { - if (!_goldIcon) { - _goldIcon = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - } - - return _goldIcon; -} - -- (UILabel *)pricePerDayLabel { - if (!_pricePerDayLabel) { - _pricePerDayLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.18_8") - font:kFontRegular(14) - textColor:[UIColor whiteColor]]; - } - return _pricePerDayLabel; -} - -- (UIButton *)actionButton { - if (!_actionButton) { - _actionButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_actionButton setTitle:YMLocalizedString(@"1.0.18_9") - forState:UIControlStateNormal]; - _actionButton.layer.cornerRadius = 10; - _actionButton.layer.masksToBounds = YES; - [_actionButton addTarget:self - action:@selector(didTapActionButton) - forControlEvents:UIControlEventTouchUpInside]; - } - return _actionButton; -} - -- (UIImageView *)bgTypeImageView { - if (!_bgTypeImageView) { - _bgTypeImageView = [[UIImageView alloc] initWithImage:kImage(@"custom_bg_gif")]; - } - return _bgTypeImageView; -} - -- (UIButton *)playButton { - if (!_playButton) { - _playButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_playButton setImage:kImage(@"custom_bg_play") forState:UIControlStateNormal]; - [_playButton addTarget:self - action:@selector(didTapPlayButton) - forControlEvents:UIControlEventTouchUpInside]; - } - return _playButton; -} - -- (UIButton *)trashButton { - if (!_trashButton) { - _trashButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_trashButton setImage:kImage(@"custom_bg_trash") forState:UIControlStateNormal]; - [_trashButton addTarget:self - action:@selector(didTapTrashButton) - forControlEvents:UIControlEventTouchUpInside]; - } - return _trashButton; -} - -- (UILabel *)freeDefaultTagLabel { - if (!_freeDefaultTagLabel) { - _freeDefaultTagLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.18_17") font:kFontRegular(12) textColor:[UIColor whiteColor]]; - _freeDefaultTagLabel.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - _freeDefaultTagLabel.textAlignment = NSTextAlignmentCenter; - [_freeDefaultTagLabel setCornerRadius:10]; - } - return _freeDefaultTagLabel; -} - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc] init]; - } - return _parser; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGContentViewController.h b/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGContentViewController.h deleted file mode 100644 index 6ea2206..0000000 --- a/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGContentViewController.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// CustomRoomBGContentViewController.h -// YuMi -// -// Created by P on 2024/10/29. -// - -#import "MvpViewController.h" - -@class RoomInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface CustomRoomBGContentViewController : MvpViewController - -@property (nonatomic, strong) RoomInfoModel *roomInfo; -@property (nonatomic, copy) NSString *roomUID; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGContentViewController.m b/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGContentViewController.m deleted file mode 100644 index 8903199..0000000 --- a/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGContentViewController.m +++ /dev/null @@ -1,988 +0,0 @@ -// -// CustomRoomBGContentViewController.m -// YuMi -// -// Created by P on 2024/10/29. -// -#import "CustomRoomBGContentViewController.h" - -#import "SVGA.h" -#import "CustomRoomBGCell.h" -#import "CustomRoomBGPresenter.h" -#import "XPRoomSettingPresenter.h" - -@interface CustomRoomBGContentViewController () - -@property (nonatomic, strong) UIView *bottomAreaBackGround; -@property (nonatomic, strong) UIView *emptyStateView; - -@property (nonatomic, strong) UIButton *freeButton; -@property (nonatomic, strong) UIButton *payButton; -@property (nonatomic, strong) UIButton *customButton; - -@property (nonatomic, strong) UICollectionView *collectionView; - -@property (nonatomic, strong) UIView *previewMask; -@property (nonatomic, strong) UIImageView *previewFrontImageView; -@property (nonatomic, strong) NetImageView *previewBackImageView; -@property (nonatomic, strong) SVGAImageView *previewBackSvgaView; -@property (nonatomic, strong) UIView *previewBottomBackground; -@property (nonatomic, strong) UILabel *previewTipsContentLabel; -@property (nonatomic, strong) UIButton *previewActionButton; -@property (nonatomic, strong) UIButton *cancelPreviewButton; -@property (nonatomic, strong) UIButton *createCustomButton; -@property (nonatomic, strong) UIButton *helpButton; - -@property (nonatomic, strong) NSMutableArray *payBackgrounds; -@property (nonatomic, strong) NSMutableArray *freeBackgrounds; -@property (nonatomic, strong) NSMutableArray *customBackgrounds; - -@property (nonatomic, assign) NSInteger currentSelectedTabIndex; -@property (nonatomic, assign) NSInteger currentSelectedItemIndex; -@property (nonatomic, strong) CustomRoomBGItemModel *currentSelectedModel; - -@property (nonatomic, strong) UIView *previewArea; -@property (nonatomic, strong) UIButton *dismissPreviewButton; -@property (nonatomic, strong) UIImageView *previewGold; -@property (nonatomic, strong) UILabel *previewPricePerDay; - -@property (nonatomic, strong) UIImage *customSelectedImage; - -@property (nonatomic, assign) NSInteger customBGUsageHours; -@property (nonatomic, assign) NSInteger customBGUsageGolds; - -@property (nonatomic, assign) NSInteger jumpToTab; -@property (nonatomic, assign) BOOL isCreating; - -@end - -@implementation CustomRoomBGContentViewController - -- (CustomRoomBGPresenter *)createPresenter { - return [[CustomRoomBGPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.jumpToTab = -1; - self.currentSelectedTabIndex = 0; - self.currentSelectedItemIndex = 0; - - [self setupUI]; - - [self setupData]; -} - -- (void)setupData { - - self.payBackgrounds = @[].mutableCopy; - self.freeBackgrounds = @[].mutableCopy; - self.customBackgrounds = @[].mutableCopy; - - @kWeakify(self); - [self.presenter loadListOfRoomBG:self.roomUID - complete:^(CustomRoomBGModel *roomBGModel) { - @kStrongify(self); - self.customBGUsageHours = roomBGModel.customHour; - self.customBGUsageGolds = roomBGModel.customGoldPrice; - - for (CustomRoomBGItemModel *model in roomBGModel.itemList) { - switch (model.type) { - case RoomBGType_Free: - [self.freeBackgrounds addObject:model]; - break; - case RoomBGType_Pay: - [self.payBackgrounds addObject:model]; - break; - case RoomBGType_Custom: - [self.customBackgrounds addObject:model]; - break; - - default: - break; - } - } - - switch (self.jumpToTab) { - case 1: - [self didSelectedButton:self.freeButton]; - break; - case 2: - [self didSelectedButton:self.payButton]; - break; - case 3: - [self didSelectedButton:self.customButton]; - break; - - default: - [self didSelectedButton:self.freeButton]; - break; - } - - self.jumpToTab = -1; - - [self.collectionView reloadData]; - } failure:^{ - @kStrongify(self); - [self didTapEmptySpace]; - }]; -} - -- (void)updateTabButtonStatus:(CustomRoomBGItemModel *)model { - self.currentSelectedModel = nil; - self.currentSelectedTabIndex = model.type; - switch (model.type) { - case RoomBGType_Pay: - [self didSelectedButton:self.payButton]; - break; - case RoomBGType_Free: - [self didSelectedButton:self.freeButton]; - break; - case RoomBGType_Custom: - [self didSelectedButton:self.customButton]; - break; - - default: - break; - } -} - -- (void)setupUI { - self.view.backgroundColor = [UIColor clearColor]; - [self setupBackgroundContent]; - - [self setupTopButtons]; - - [self.view addSubview:self.collectionView]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bottomAreaBackGround).offset(50); - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(180 + 32 + 32)); - }]; -} - -- (void)setupBackgroundContent { - [self.view addSubview:[self bottomAreaBackGround]]; - - UIButton *b = [self dismissButton]; - [self.view addSubview:b]; - [b mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.bottomAreaBackGround.mas_top).offset(-16); - }]; - - [self.view addSubview:self.emptyStateView]; - [self.emptyStateView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bottomAreaBackGround).offset(72); - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(26 + 110); - }]; -} - -- (void)setupTopButtons { - self.freeButton = [self bgCategoryButton:100]; - self.payButton = [self bgCategoryButton:101]; - self.customButton = [self bgCategoryButton:102]; - - [self.view addSubview:self.freeButton]; - [self.freeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bottomAreaBackGround).offset(10); - make.leading.mas_equalTo(15); - make.height.mas_equalTo(22); - make.width.mas_greaterThanOrEqualTo(20); - - }]; - - [self.view addSubview:self.payButton]; - [self.payButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.freeButton); - make.leading.mas_equalTo(self.freeButton.mas_trailing).offset(25); - make.height.mas_equalTo(22); - make.width.mas_greaterThanOrEqualTo(20); - }]; - - [self.view addSubview:self.customButton]; - [self.customButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.freeButton); - make.leading.mas_equalTo(self.payButton.mas_trailing).offset(25); - make.height.mas_equalTo(22); - make.width.mas_greaterThanOrEqualTo(20); - }]; - - [self.view addSubview:self.helpButton]; - [self.helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.freeButton); - make.trailing.mas_equalTo(self.view).offset(-15); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - - [self.view addSubview:self.createCustomButton]; - [self.createCustomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.freeButton); - make.trailing.mas_equalTo(self.helpButton.mas_leading).offset(-5); - make.size.mas_equalTo(CGSizeMake(82, 22)); - }]; -} - -#pragma mark - -- (void)updateDataSource:(NSInteger)tag { - - self.currentSelectedTabIndex = tag - 100; - self.currentSelectedItemIndex = 0; - [self.collectionView reloadData]; - - self.helpButton.hidden = YES; - self.createCustomButton.hidden = YES; - - switch (tag) { - case 100: - self.emptyStateView.hidden = YES; - break; - case 101: - self.emptyStateView.hidden = self.payBackgrounds.count != 0; - break; - case 102: - self.helpButton.hidden = NO; - self.createCustomButton.hidden = NO; - self.emptyStateView.hidden = self.customBackgrounds.count != 0; - break; - default: - self.emptyStateView.hidden = YES; - break; - } -} - -- (void)displayPreviewArea { - UIView *view = [self previewMask]; - [self.view addSubview:view]; - self.previewArea = view; - - [view addSubview:self.dismissPreviewButton]; - [self.dismissPreviewButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(view); - }]; - - [view addSubview:self.previewBottomBackground]; - - [self.previewBottomBackground addSubview:self.previewTipsContentLabel]; - [self.previewTipsContentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.previewBottomBackground).offset(47); - make.leading.trailing.mas_equalTo(self.previewBottomBackground).inset(15); - }]; - - [self.previewBottomBackground addSubview:self.previewGold]; - [self.previewGold mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.previewBottomBackground).offset(103); - make.leading.mas_equalTo(self.previewBottomBackground).offset(15); - make.size.mas_equalTo(CGSizeMake(26, 26)); - }]; - - [self.previewBottomBackground addSubview:self.previewPricePerDay]; - [self.previewPricePerDay mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.previewGold); - make.leading.mas_equalTo(self.previewGold.mas_trailing).offset(4); - }]; - - [self.previewBottomBackground addSubview:self.previewActionButton]; - [self.previewActionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.previewBottomBackground).offset(103); - make.trailing.mas_equalTo(self.previewBottomBackground).offset(-15); - make.size.mas_equalTo(CGSizeMake(120, 38)); - }]; - - [view addSubview:self.previewFrontImageView]; - [self.previewFrontImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.previewBottomBackground.mas_top).offset(-16); - make.top.mas_equalTo(100); - make.leading.trailing.mas_equalTo(view).inset(64); - }]; - - [view insertSubview:self.previewBackImageView belowSubview:self.previewFrontImageView]; - [self.previewBackImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.previewFrontImageView); - }]; - - [view insertSubview:self.previewBackSvgaView belowSubview:self.previewFrontImageView]; - [self.previewBackSvgaView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.previewFrontImageView); - }]; -} - -- (void)updatePreviewArea:(CustomRoomBGItemModel *)model { - - self.currentSelectedModel = model; - - BOOL isSvga = [model.url hasSuffix:@"svga"]; - self.previewBackImageView.hidden = isSvga; - self.previewBackSvgaView.hidden = !isSvga; - - switch (model.type) { - case RoomBGType_Free: -// [self.previewPricePerDay removeFromSuperview]; -// [self.previewGold removeFromSuperview]; -// [self.previewActionButton setTitle:YMLocalizedString(@"1.0.18_15") forState:UIControlStateNormal]; - break; - case RoomBGType_Pay: - self.previewPricePerDay.text = [model pricePerDays]; - self.previewTipsContentLabel.text = YMLocalizedString(@"1.0.18_13"); - [self.previewActionButton setTitle:YMLocalizedString(@"1.0.18_16") forState:UIControlStateNormal]; - break; - case RoomBGType_Custom: - self.previewPricePerDay.text = [model pricePerDays]; - self.previewTipsContentLabel.text = YMLocalizedString(@"1.0.18_12"); - [self.previewActionButton setTitle:YMLocalizedString(@"1.0.18_15") forState:UIControlStateNormal]; - break; - default: - break; - } - - if (isSvga) { - SVGAParser *_parser = [SVGAParser new]; - @kWeakify(self); - [_parser parseWithURL:[NSURL URLWithString:[model.url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]] - completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - self.previewBackSvgaView.loops = 0; - self.previewBackSvgaView.videoItem = videoItem; - [self.previewBackSvgaView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { -// NSLog(@"%@", error); - }]; - } else { - self.previewBackImageView.imageUrl = model.url; - } -} - -- (void)updatePreviewWith:(UIImage *)image { - self.isCreating = YES; - self.previewBackImageView.image = image; - self.previewPricePerDay.text = [NSString stringWithFormat:@"%@/%@%@", - @(self.customBGUsageGolds), - @(self.customBGUsageHours/24), - YMLocalizedString(@"1.0.18_8")];; - [self.previewActionButton setTitle:YMLocalizedString(@"1.0.18_16") forState:UIControlStateNormal]; -} - -#pragma mark - -- (void)didTapEmptySpace { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)didSelectedButton:(UIButton *)button { - self.freeButton.selected = NO; - self.payButton.selected = NO; - self.customButton.selected = NO; - - button.selected = YES; - - [self updateDataSource:button.tag]; -} - -- (void)didTapCreate { - @kWeakify(self); - [YYUtility checkAssetsLibrayAvailable:^{ - @kStrongify(self); - UIImagePickerController *imagePicker = [[UIImagePickerController alloc] init]; - imagePicker.modalPresentationCapturesStatusBarAppearance = YES; - imagePicker.delegate = self; - imagePicker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; - imagePicker.allowsEditing = NO; - [self presentViewController:imagePicker animated:YES completion:NULL]; - } denied:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"SessionViewController21") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController8")]; - } restriction:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"SessionViewController21") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController10")]; - }]; -} - -- (void)didTapHelp { - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"UserDetail_CP_Toast_0"); - config.message = YMLocalizedString(@"1.0.18_6"); - config.actionStyle = TTAlertActionConfirmStyle; - [TTPopup alertWithConfig:config - showBorder:NO - confirmHandler:^{} - cancelHandler:^{}]; -} - -- (void)didTapActionButton { - if (self.isCreating) { - [self uploadBG]; - } else { - [self updateRoomBG]; - } -} - -- (void)didTapCancelPreview { - self.isCreating = NO; - [self.previewArea removeFromSuperview]; -} - -- (void)updateRoomBG { - if (!self.currentSelectedModel) { - [self uploadBG]; - return; - } - - switch (self.currentSelectedModel.type) { - case RoomBGType_Free: - [self applyBG]; - break; - case RoomBGType_Pay: - [self buyBG]; - break; - case RoomBGType_Custom: - if (self.currentSelectedModel.status == RoomBGStatus_Pass) { - [self buyBG]; - } else { - [self uploadBG]; - } - break; - - default: - break; - } -} - -- (void)buyBG { - @kWeakify(self); - [self.presenter buyRoomBG:self.roomUID - itemID:@(self.currentSelectedModel.id).stringValue - complete:^{ - @kStrongify(self); - [self applyBG]; - } - failure:^{}]; -} - -- (void)uploadBG { - [self showLoading]; - @kWeakify(self); - [self.presenter uploadRoomBG:self.roomUID photo:self.customSelectedImage complete:^{ - @kStrongify(self); - [self hideHUD]; - [self didTapCancelPreview]; - self.jumpToTab = 3; - [self setupData]; - } failure:^{ - [self hideHUD]; - }]; -} - -- (void)applyBG { - @kWeakify(self); - [self.presenter useRoomBG:self.roomUID - itemID:@(self.currentSelectedModel.id).stringValue - complete:^{ - @kStrongify(self); - [self didTapEmptySpace]; - } - failure:^{}]; -} - -- (void)removeBG:(CustomRoomBGItemModel *)model { - @kWeakify(self); - [self.presenter deleteRoomBG:self.roomUID itemID:@(model.id).stringValue complete:^{ - @kStrongify(self); - [self setupData]; - } failure:^{ }]; -} - -#pragma mark - UIImagePickerControllerDelegate -- (void)showNotPhoto:(NSString *)title content:(NSString *)content{ - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = title; - config.message = content; - [TTPopup alertWithConfig:config confirmHandler:^{ - NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - if ([[UIApplication sharedApplication] canOpenURL:url]) { - [[UIApplication sharedApplication] openURL:url]; - } - } cancelHandler:^{ - }]; -} - -- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { - @kWeakify(self); - [picker dismissViewControllerAnimated:YES completion:^{ - @kStrongify(self); - UIImage *selectedPhoto = [info objectForKey:UIImagePickerControllerOriginalImage]; - if (selectedPhoto) { - self.customSelectedImage = selectedPhoto; - [self displayPreviewArea]; - [self updatePreviewWith:selectedPhoto]; - } - }]; -} - -- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker { - [picker dismissViewControllerAnimated:YES completion:^{ - - }]; -} - -#pragma mark - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - switch (self.currentSelectedTabIndex) { - case 0: - return self.freeBackgrounds.count; - break; - case 1: - return self.payBackgrounds.count; - break; - case 2: - return self.customBackgrounds.count; - break; - default: - return 0; - break; - } -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - CustomRoomBGItemModel *model; - switch (self.currentSelectedTabIndex) { - case 0: - model = [self.freeBackgrounds xpSafeObjectAtIndex:indexPath.row]; - break; - case 1: - model = [self.payBackgrounds xpSafeObjectAtIndex:indexPath.row]; - break; - case 2: - model = [self.customBackgrounds xpSafeObjectAtIndex:indexPath.row]; - break; - default: - break; - } - - if (model) { - CustomRoomBGCell *cell = [CustomRoomBGCell reuseFrom:collectionView - model:model - atIndexPath:indexPath]; - @kWeakify(self); -// [cell setHandleTapPlayButton:^(id _Nonnull obj) { -// @kStrongify(self); -// [self displayPreviewArea]; -// }]; - - [cell setHandleTapActionButton:^(CustomRoomBGItemModel * _Nonnull obj) { - @kStrongify(self); - [self handleCellModelAction:obj isFromButton:YES]; - }]; - [cell setHandleTapTrash:^(CustomRoomBGItemModel * _Nonnull model) { - @kStrongify(self); - [self removeBG:model]; - }]; - return cell; - } - - return nil; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - CustomRoomBGItemModel *model; - switch (self.currentSelectedTabIndex) { - case 0: - model = [self.freeBackgrounds xpSafeObjectAtIndex:indexPath.row]; - break; - case 1: - model = [self.payBackgrounds xpSafeObjectAtIndex:indexPath.row]; - break; - case 2: - model = [self.customBackgrounds xpSafeObjectAtIndex:indexPath.row]; - break; - default: - break; - } - self.currentSelectedItemIndex = indexPath.row; - self.currentSelectedModel = model; - [self handleCellModelAction:model isFromButton:NO]; -} - -- (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath { - CustomRoomBGCell *bgCell = (CustomRoomBGCell *)cell; - [bgCell playSVGA]; -} - -- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath { - CustomRoomBGCell *bgCell = (CustomRoomBGCell *)cell; - [bgCell pauseSVGA]; -} - -- (void)handleCellModelAction:(CustomRoomBGItemModel *)model isFromButton:(BOOL)isFromButton { - if (model) { - if (model.isCur && !isFromButton) { - return; - } - - switch (model.type) { - case RoomBGType_Pay: { - if (model.status == RoomBGStatus_Pass) { - if ([model isAlreadyPay] && !isFromButton) { - [self applyBG]; - } else { - [self displayPreviewArea]; - [self updatePreviewArea:model]; - } - } else { - [self displayPreviewArea]; - [self updatePreviewArea:model]; - } - } - break; - case RoomBGType_Free: - [self applyBG]; - break; - case RoomBGType_Custom: - if (model.status == RoomBGStatus_Rejected) { - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"1.0.18_20"); - config.message = YMLocalizedString(@"1.0.18_23"); - config.actionStyle = TTAlertActionConfirmStyle; - [TTPopup alertWithConfig:config - showBorder:NO - confirmHandler:^{} - cancelHandler:^{}]; - } else if (model.status == RoomBGStatus_Reviewing) { - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"1.0.18_20"); - config.message = YMLocalizedString(@"1.0.18_21"); - config.actionStyle = TTAlertActionConfirmStyle; - [TTPopup alertWithConfig:config - showBorder:NO - confirmHandler:^{} - cancelHandler:^{}]; - } else if (model.status == RoomBGStatus_Pass) { - if (isFromButton) { - [self displayPreviewArea]; - [self updatePreviewArea:model]; - } else { - [self applyBG]; - } - } - break; - - default: - break; - } - } -} - -#pragma mark - -- (UIButton *)dismissButton { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setBackgroundColor:[UIColor clearColor]]; - [b addTarget:self action:@selector(didTapEmptySpace) forControlEvents:UIControlEventTouchUpInside]; - return b; -} - -- (UIView *)bottomAreaBackGround { - if (!_bottomAreaBackGround) { - CGFloat height = kGetScaleWidth(323) + kSafeAreaBottomHeight; - UIView *v = [[UIView alloc] initWithFrame:CGRectMake(0, KScreenHeight - height, KScreenWidth, height)]; - v.userInteractionEnabled = YES; - v.backgroundColor = [UIColor clearColor]; - v.layer.cornerRadius = 16; - v.layer.maskedCorners = kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner; - v.layer.masksToBounds = YES; - - // 创建模糊效果 - UIBlurEffect *blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; // 选择模糊样式（例如：Light, Dark, ExtraLight 等） - - // 创建包含模糊效果的视图 - UIVisualEffectView *blurEffectView = [[UIVisualEffectView alloc] initWithEffect:blurEffect]; - - // 设置模糊视图的大小与目标视图一致 - blurEffectView.frame = CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(180 + 32 + 32)); - blurEffectView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; // 使模糊视图适应目标视图的尺寸变化 - - [v addSubview:blurEffectView]; - [blurEffectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(v); - }]; - - _bottomAreaBackGround = v; - } - return _bottomAreaBackGround; -} - -- (UIButton *)bgCategoryButton:(NSInteger)tag { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - b.tag = tag; - - // 设置普通状态字体 - UIFont *normalFont = kFontRegular(15); - NSDictionary *normalAttributes = @{NSFontAttributeName: normalFont, - NSForegroundColorAttributeName: [UIColor colorWithWhite:1 alpha:0.6]}; - NSAttributedString *normalTitle = [[NSAttributedString alloc] initWithString:[self titleForTag:tag] - attributes:normalAttributes]; - [b setAttributedTitle:normalTitle forState:UIControlStateNormal]; - - // 设置选中状态字体 - UIFont *selectedFont = kFontMedium(15); - NSDictionary *selectedAttributes = @{NSFontAttributeName: selectedFont, - NSForegroundColorAttributeName: [UIColor whiteColor]}; - NSAttributedString *selectedTitle = [[NSAttributedString alloc] initWithString:[self titleForTag:tag] - attributes:selectedAttributes]; - [b setAttributedTitle:selectedTitle forState:UIControlStateSelected]; - [b addTarget:self - action:@selector(didSelectedButton:) -forControlEvents:UIControlEventTouchUpInside]; - [b setContentHuggingPriority:UILayoutPriorityRequired - forAxis:UILayoutConstraintAxisHorizontal]; - [b setContentCompressionResistancePriority:UILayoutPriorityRequired - forAxis:UILayoutConstraintAxisHorizontal]; - return b; -} - -- (UIButton *)createCustomButton { - if (!_createCustomButton) { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - button.hidden = YES; - button.frame = CGRectMake(0, 0, 82, 22); - [button setTitle:YMLocalizedString(@"1.0.18_4") forState:UIControlStateNormal]; - [button.titleLabel setFont:kFontRegular(12)]; - button.layer.cornerRadius = 11; // 设置圆角 - button.clipsToBounds = YES; // 使圆角生效 - - // 创建渐变图层 - CAGradientLayer *gradientLayer = [CAGradientLayer layer]; - gradientLayer.colors = @[(__bridge id)UIColorFromRGB(0xE29030).CGColor, - (__bridge id)UIColorFromRGB(0xFCC074).CGColor]; - gradientLayer.startPoint = CGPointMake(0.0, 0.0); // 顶部中央 - gradientLayer.endPoint = CGPointMake(0.0, 1.0); // 底部中央 - gradientLayer.frame = button.bounds; // 设置渐变图层大小 - - // 将渐变图层添加到按钮图层 - [button.layer insertSublayer:gradientLayer atIndex:0]; - - [button addTarget:self - action:@selector(didTapCreate) - forControlEvents:UIControlEventTouchUpInside]; - - _createCustomButton = button; - } - - return _createCustomButton; -} - -- (UIButton *)helpButton { - if (!_helpButton) { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - b.hidden = YES; - [b setImage:kImage(@"custom_bg_help") forState:UIControlStateNormal]; - [b addTarget:self - action:@selector(didTapHelp) - forControlEvents:UIControlEventTouchUpInside]; - - _helpButton = b; - } - return _helpButton; -} - -- (UIView *)emptyStateView { - if (!_emptyStateView) { - UIView *v = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 26 + 110)]; - UIImageView *imageView = [[UIImageView alloc] initWithImage:[UIImageConstant defaultEmptyPlaceholder_UFO]]; - [v addSubview:imageView]; - [imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerX.mas_equalTo(v); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(110), kGetScaleWidth(110))); - }]; - UILabel *messageLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.18_5") - font:kFontRegular(14) - textColor:[UIColor colorWithWhite:1 alpha:0.4]]; - messageLabel.textAlignment = NSTextAlignmentCenter; - [v addSubview:messageLabel]; - [messageLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(v).inset(52); - make.top.mas_equalTo(imageView.mas_bottom).offset(6); - make.height.mas_equalTo(22); - }]; - v.hidden = YES; - _emptyStateView = v; - } - return _emptyStateView; -} - -- (UICollectionView *)collectionView { - if (!_collectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(kGetScaleWidth(135), kGetScaleWidth(180 + 32 + 32)); - layout.minimumLineSpacing = 10; - layout.minimumInteritemSpacing = 10; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.sectionInset = UIEdgeInsetsMake(0, 15, 0, 15); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.clipsToBounds = NO; - _collectionView.showsHorizontalScrollIndicator = NO; - [CustomRoomBGCell registerTo:_collectionView]; - } - return _collectionView; -} - -- (UIView *)previewMask { - UIView *v = [[UIView alloc] initWithFrame:self.view.bounds]; - v.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - return v; -} - -- (UIView *)previewBottomBackground { - if (!_previewBottomBackground) { - CGFloat height = kGetScaleWidth(174) + kSafeAreaBottomHeight; - UIView *v = [[UIView alloc] initWithFrame:CGRectMake(0, KScreenHeight - height, KScreenWidth, height)]; - v.userInteractionEnabled = YES; - v.backgroundColor = [UIColor blackColor]; - v.layer.cornerRadius = 16; - v.layer.maskedCorners = kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner; - v.layer.masksToBounds = YES; - - UILabel *tipsTitleLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.18_11") - font:kFontMedium(15) - textColor:[UIColor whiteColor]]; - tipsTitleLabel.textAlignment = NSTextAlignmentCenter; - [v addSubview:tipsTitleLabel]; - [tipsTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(v).offset(13); - make.centerX.mas_equalTo(v); - }]; - - UIButton *b = [self cancelPreviewButton]; - [v addSubview:b]; - [b mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.mas_equalTo(15); - make.size.mas_equalTo(22); - }]; - - _previewBottomBackground = v; - } - return _previewBottomBackground; -} - -- (NetImageView *)previewBackImageView { - if (!_previewBackImageView) { - _previewBackImageView = [[NetImageView alloc] init]; - _previewBackImageView.layer.cornerRadius = 14; - _previewBackImageView.layer.masksToBounds = YES; - _previewBackImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _previewBackImageView; -} - -- (SVGAImageView *)previewBackSvgaView { - if (!_previewBackSvgaView) { - _previewBackSvgaView = [[SVGAImageView alloc] init]; - _previewBackSvgaView.layer.cornerRadius = 14; - _previewBackSvgaView.layer.masksToBounds = YES; - _previewBackSvgaView.autoPlay = YES; - } - return _previewBackSvgaView; -} - -- (UIImageView *)previewFrontImageView { - if (!_previewFrontImageView) { - _previewFrontImageView = [[UIImageView alloc] initWithImage:kImage(@"custom_bg_preview")]; - _previewFrontImageView.layer.cornerRadius = 14; - _previewFrontImageView.layer.masksToBounds = YES; - _previewFrontImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _previewFrontImageView; -} - -- (UILabel *)previewTipsContentLabel { - if (!_previewTipsContentLabel) { - _previewTipsContentLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.18_12") - font:kFontMedium(15) - textColor:[UIColor colorWithWhite:1 alpha:0.6]]; - _previewTipsContentLabel.numberOfLines = 0; - _previewTipsContentLabel.textAlignment = NSTextAlignmentCenter; - } - return _previewTipsContentLabel; -} - -- (UIImageView *)previewGold { - if (!_previewGold) { - _previewGold = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - } - return _previewGold; -} - -- (UILabel *)previewPricePerDay { - if (!_previewPricePerDay) { - _previewPricePerDay = [UILabel labelInitWithText:YMLocalizedString(@"1.0.18_14") - font:kFontMedium(16) - textColor:UIColorFromRGB(0xFF8C03)]; - } - return _previewPricePerDay; -} - -- (UIButton *)previewActionButton { - if (!_previewActionButton) { - _previewActionButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_previewActionButton setTitle:YMLocalizedString(@"1.0.18_15") - forState:UIControlStateNormal]; - _previewActionButton.layer.cornerRadius = 19; - _previewActionButton.layer.masksToBounds = YES; - [_previewActionButton addTarget:self - action:@selector(didTapActionButton) - forControlEvents:UIControlEventTouchUpInside]; - - // 创建渐变图层 - CAGradientLayer *gradientLayer = [CAGradientLayer layer]; - gradientLayer.colors = @[(__bridge id)UIColorFromRGB(0xE29030).CGColor, - (__bridge id)UIColorFromRGB(0xFCC074).CGColor]; - gradientLayer.startPoint = CGPointMake(0.0, 0.0); // 顶部中央 - gradientLayer.endPoint = CGPointMake(0.0, 1.0); // 底部中央 - gradientLayer.frame = CGRectMake(0, 0, 120, 38); // 设置渐变图层大小 - - // 将渐变图层添加到按钮图层 - [_previewActionButton.layer insertSublayer:gradientLayer atIndex:0]; - } - return _previewActionButton; -} - -- (UIButton *)cancelPreviewButton { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:kImage(@"common_nav_back_white") forState:UIControlStateNormal]; - [b addTarget:self action:@selector(didTapCancelPreview) forControlEvents:UIControlEventTouchUpInside]; - return b; -} - -- (UIButton *)dismissPreviewButton { - if (!_dismissPreviewButton) { - _dismissPreviewButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _dismissPreviewButton.backgroundColor = [UIColor clearColor]; - [_dismissPreviewButton addTarget:self - action:@selector(didTapCancelPreview) - forControlEvents:UIControlEventTouchUpInside]; - } - return _dismissPreviewButton; -} - - -#pragma mark - -- (NSString *)titleForTag:(NSInteger)tag { - NSString *title = @""; - switch (tag) { - case 100: - title = YMLocalizedString(@"1.0.18_1"); - break; - case 101: - title = YMLocalizedString(@"1.0.18_2"); - break; - case 102: - title = YMLocalizedString(@"1.0.18_3"); - break; - default: - break; - } - return title; -} -@end diff --git a/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGPresenter.h b/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGPresenter.h deleted file mode 100644 index 1c1e195..0000000 --- a/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGPresenter.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// CustomRoomBGPresenter.h -// YuMi -// -// Created by P on 2024/10/30. -// - -#import "BaseMvpPresenter.h" -#import "CustomRoomBGItemModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface CustomRoomBGPresenter : BaseMvpPresenter - -- (void)buyRoomBG:(NSString *)roomUID - itemID:(NSString *)itemID - complete:(void(^)(void))complete - failure:(void(^)(void))failure; - -- (void)deleteRoomBG:(NSString *)roomUID - itemID:(NSString *)itemID - complete:(void(^)(void))complete - failure:(void(^)(void))failure; - -- (void)useRoomBG:(NSString *)roomUID - itemID:(NSString *)itemID - complete:(void(^)(void))complete - failure:(void(^)(void))failure; - -- (void)uploadRoomBG:(NSString *)roomUID - photo:(UIImage *)photo - complete:(void(^)(void))complete - failure:(void(^)(void))failure; - -- (void)loadListOfRoomBG:(NSString *)roomUID - complete:(void(^)(CustomRoomBGModel *model))complete - failure:(void(^)(void))failure; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGPresenter.m b/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGPresenter.m deleted file mode 100644 index 62d5ef2..0000000 --- a/YuMi/Modules/YMRoom/View/Custom Background/CustomRoomBGPresenter.m +++ /dev/null @@ -1,165 +0,0 @@ -// -// CustomRoomBGPresenter.m -// YuMi -// -// Created by P on 2024/10/30. -// - -#import "CustomRoomBGPresenter.h" - -#import "UploadFile.h" -#import "Api+CustomBackground.h" - -@implementation CustomRoomBGPresenter - -- (void)buyRoomBG:(NSString *)roomUID - itemID:(NSString *)itemID - complete:(void(^)(void))complete - failure:(void(^)(void))failure { -// @kWeakify(self); - [Api buyRoomBackground:[self createHttpCompletion:^(BaseModel * _Nonnull data) { -// @kStrongify(self); - if (complete) { - complete(); - } - } - fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure(); - } - } - showLoading:YES - errorToast:YES] - roomUid:roomUID - id:itemID]; -} - -- (void)deleteRoomBG:(NSString *)roomUID - itemID:(NSString *)itemID - complete:(void(^)(void))complete - failure:(void(^)(void))failure { -// @kWeakify(self); - [Api deleteRoomBackground:[self createHttpCompletion:^(BaseModel * _Nonnull data) { -// @kStrongify(self); - if (complete) { - complete(); - } - } - fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure(); - } - } - showLoading:YES - errorToast:YES] - roomUid:roomUID - id:itemID]; -} - -- (void)useRoomBG:(NSString *)roomUID - itemID:(NSString *)itemID - complete:(void(^)(void))complete - failure:(void(^)(void))failure { - [Api selectedRoomBackground:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (complete) { - complete(); - } - } - fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure(); - } - } - showLoading:YES - errorToast:YES] - roomUid:roomUID - id:itemID]; -} - -- (void)uploadRoomBG:(NSString *)roomUID - photo:(UIImage *)photo - complete:(void(^)(void))complete - failure:(void(^)(void))failure { - NSData *data = UIImageJPEGRepresentation(photo, 0.7); - NSString *format = [UIImage getImageTypeWithImageData:data]; - NSString *name = [NSString stringWithFormat:@"image/%@.%@",[NSString createUUID],format]; - [[UploadFile share]QCloudUploadImage:data named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) { - if ([NSString isEmpty:key]) { - if (failure) { - failure(); - } - } else { - [Api uploadCustomBackground:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (complete) { - complete(); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure(); - } - }] roomUid:roomUID url:key]; - } - } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) { - if (failure) { - failure(); - } - }]; -} - -- (void)loadListOfRoomBG:(NSString *)roomUID - complete:(void(^)(CustomRoomBGModel *model))complete - failure:(void(^)(void))failure { - [Api listOfRoomBackground:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (complete) { - CustomRoomBGModel *model = [CustomRoomBGModel modelWithJSON:data.data]; - NSArray *sortItems = [self __sortedArrayByCustomCriteria:model.itemList]; - model.itemList = sortItems.copy; - complete(model); - } - } - fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure(); - } - } - showLoading:YES - errorToast:YES] - roomUid:roomUID]; -} - -- (NSArray *)__sortedArrayByCustomCriteria:(NSArray *)datas { - NSArray *sortedById = [datas sortedArrayUsingComparator:^NSComparisonResult(CustomRoomBGItemModel *obj1, CustomRoomBGItemModel *obj2) { - NSNumber *id1 = @(obj1.id); - NSNumber *id2 = @(obj2.id); - return [id1 compare:id2]; - }]; - - // 2. 链式按条件排序，按优先级依次进行筛选 - NSMutableArray *priority1Array = [NSMutableArray array]; - NSMutableArray *priority2Array = [NSMutableArray array]; - NSMutableArray *priority3Array = [NSMutableArray array]; - - for (CustomRoomBGItemModel *obj in sortedById) { - BOOL type = obj.status == RoomBGStatus_Pass; - BOOL isBuy = [obj isAlreadyPay]; - - if (type && isBuy) { - [priority1Array addObject:obj]; // 条件1：type == 1 && isBuy == YES - } else if (type && !isBuy) { - [priority2Array addObject:obj]; // 条件2：type == 1 && isBuy == NO - } else { - [priority3Array addObject:obj]; // 条件3：其他情况 - } - } - - // 3. 最终组合数组 - NSMutableArray *finalArray = [NSMutableArray array]; - [finalArray addObjectsFromArray:priority1Array]; - [finalArray addObjectsFromArray:priority2Array]; - [finalArray addObjectsFromArray:priority3Array]; - - return [finalArray copy]; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/FaceView/Model/ChatFaceVo.h b/YuMi/Modules/YMRoom/View/FaceView/Model/ChatFaceVo.h deleted file mode 100644 index 49c93af..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Model/ChatFaceVo.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// ChatFaceVo.h -// YuMi -// -// Created by P on 2025/5/7. -// -// 对应 http://beta.api.molistar.xyz/swagger-ui/index.html#/face-tab-new-controller/faceListUsingGET - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface ChatFaceVo : PIBaseModel -@property (nonatomic, assign) NSInteger seqNo; -@property (nonatomic, copy) NSString *faceUrl; -@property (nonatomic, copy) NSString *faceIndex; -@property (nonatomic, assign) NSInteger showTimes; -@end - -@interface ChatFaceResponse : PIBaseModel -@property (nonatomic, assign) BOOL useVip; -@property (nonatomic, copy) NSString *tabUrl; -@property (nonatomic, assign) NSInteger tabId; -@property (nonatomic, assign) NSInteger tabSeq; -@property (nonatomic, copy) NSArray *faceNewVoList; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FaceView/Model/ChatFaceVo.m b/YuMi/Modules/YMRoom/View/FaceView/Model/ChatFaceVo.m deleted file mode 100644 index 6d7d860..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Model/ChatFaceVo.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// ChatFaceVo.m -// YuMi -// -// Created by P on 2025/5/7. -// - -#import "ChatFaceVo.h" - -@implementation ChatFaceVo - -@end - -@implementation ChatFaceResponse -+ (NSDictionary *)mj_objectClassInArray { - return @{ - @"faceNewVoList" : [ChatFaceVo class] - }; -} -@end diff --git a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceInfoModel.h b/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceInfoModel.h deleted file mode 100644 index 9ba9a47..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceInfoModel.h +++ /dev/null @@ -1,70 +0,0 @@ -// -// RoomFaceInfoModel.h -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, FaceDisplayType) { - FaceDisplayType_OnlyOne = 0, - FaceDisplayType_Flow = 1, - FaceDisplayType_OverLay = 2, - FaceDisplayType_OnlyOneLine = 3, -}; - - -@class RoomVipFaceInfoModel; -@interface RoomFaceInfoModel : PIBaseModel -///表情的id -@property (nonatomic,assign) NSInteger fid; -///动画的持续时间 需要除以1000 -@property (nonatomic, assign) NSInteger animDuration; -///开始 -@property (nonatomic, assign) NSInteger animStartPos; -///动画有多少张 -@property (nonatomic, assign) NSInteger animEndPos; -///重复次数 -@property (nonatomic, assign) NSInteger animRepeatCount; -///结果是否可以重复 -@property (nonatomic,assign) BOOL canResultRepeat; -///展示的样式 -@property (nonatomic, assign) FaceDisplayType displayType; -///目前应该只有普通表情 -@property (nonatomic,assign) NSInteger faceType; -///当前要显示的表情的编号 -@property (nonatomic, assign) NSInteger iconPos; -///是否是幸运表情 -@property (nonatomic,assign) BOOL isLuckFace; -///是否是VIP表情 -@property (nonatomic,assign) BOOL isNobleFace; -///表情的名字 -@property (nonatomic,copy) NSString *name; -///表情名字的pinyin -@property (nonatomic,copy) NSString *pinyin; -///结果的表情的数量 -@property (nonatomic, assign) NSInteger resultCount; -///结果表情的持续时间 -@property (nonatomic, assign) NSInteger resultDuration; -///结果表情的结束 -@property (nonatomic, assign) NSInteger resultEndPos; -///结果表情的开始 -@property (nonatomic, assign) NSInteger resultStartPos; -///vip -@property (nonatomic,strong) RoomVipFaceInfoModel *faceVipInfo; -///本地字段 表情的图片 -@property (nonatomic,strong) UIImage *faceImage; -@end - -@interface RoomVipFaceInfoModel : PIBaseModel -///vip的类型 -@property (nonatomic,copy) NSString *vipIcon; -///等级 -@property (nonatomic,assign) NSInteger vipLevel; -///vip的名字 -@property (nonatomic,copy) NSString *vipName; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceInfoModel.m b/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceInfoModel.m deleted file mode 100644 index 6a8faa9..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceInfoModel.m +++ /dev/null @@ -1,21 +0,0 @@ -// -// RoomFaceInfoModel.m -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import "RoomFaceInfoModel.h" - -@implementation RoomFaceInfoModel -///如果一个模型中需要字段映射的话 比如id -> ID name -> other.name -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"fid":@"id"}; -} -@end - -@implementation RoomVipFaceInfoModel - - - -@end diff --git a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceSendInfoModel.h b/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceSendInfoModel.h deleted file mode 100644 index 4bebecc..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceSendInfoModel.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// RoomSendFaceInfoModel.h -// YUMI -// -// Created by YUMI on 2022/3/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomFaceSendInfoModel : PIBaseModel -///用户ID -@property (assign, nonatomic) NSInteger uid; -///用户昵称 -@property (copy, nonatomic) NSString *nick; -///表情的id -@property (assign, nonatomic) NSInteger faceId; -///结果的图片 -@property (strong, nonatomic) UIImage *resultImage; -///🎲数 -@property (strong, nonatomic) NSMutableArray *resultIndexes; - -@property (nonatomic, copy) NSString *svgaURL; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceSendInfoModel.m b/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceSendInfoModel.m deleted file mode 100644 index 815d7d6..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceSendInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RoomSendFaceInfoModel.m -// YUMI -// -// Created by YUMI on 2022/3/10. -// - -#import "RoomFaceSendInfoModel.h" - -@implementation RoomFaceSendInfoModel - -@end diff --git a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceTitleItemModel.h b/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceTitleItemModel.h deleted file mode 100644 index a9ebac8..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceTitleItemModel.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// RoomFaceTitleItemModel.h -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import -@class ChatFaceResponse; -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, RoomFaceTitleItemType) { - ///普通的表情 - RoomFaceTitleItemType_Normal = 1, - ///VIP表情 - RoomFaceTitleItemType_Nobel, -}; - -@interface RoomFaceTitleItemModel : PIBaseModel -///表情 -@property (nonatomic,copy) NSString *title; -///是否选择 -@property (nonatomic,assign) BOOL isSelect; -///类型 -@property (nonatomic,assign) RoomFaceTitleItemType faceType; - -@property (nonatomic, strong) ChatFaceResponse *tabModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceTitleItemModel.m b/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceTitleItemModel.m deleted file mode 100644 index 5e608ab..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceTitleItemModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RoomFaceTitleItemModel.m -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import "RoomFaceTitleItemModel.h" - -@implementation RoomFaceTitleItemModel - -@end diff --git a/YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFacePresenter.h b/YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFacePresenter.h deleted file mode 100644 index 24313b6..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFacePresenter.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMRoomFacePresenter.h -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomFacePresenter : BaseMvpPresenter -///获取当前用户信息 -- (void)getUserInfo; -///普通表情 -- (void)getRoomNormalFace; -/// 规则表情 -- (void)getRoomNobelFace; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFacePresenter.m b/YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFacePresenter.m deleted file mode 100644 index e6624b3..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFacePresenter.m +++ /dev/null @@ -1,93 +0,0 @@ -// -// YMRoomFacePresenter.m -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import "XPRoomFacePresenter.h" -#import "Api.h" -#import "AccountInfoStorage.h" -#import "XPRoomFaceTool.h" -#import "ClientConfig.h" -#import "RoomFaceInfoModel.h" -#import "UserInfoModel.h" -#import "XPRoomFaceProtocol.h" -#import "NSArray+Safe.h" - -@implementation XPRoomFacePresenter - -///获取当前用户信息 -- (void)getUserInfo { - NSString * uid = [[AccountInfoStorage instance] getUid]; - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - UserInfoModel * userInfo = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] getUserInfoSuccess:userInfo]; - }showLoading:YES] uid:uid]; -} - -///普通表情 -- (void)getRoomNormalFace { - NSDictionary * dic = [ClientConfig shareConfig].configInfo.faceInitData; - NSArray * originArray = [RoomFaceInfoModel modelsWithArray:dic[@"faces"]]; - NSArray * sortArray = [self sortFaceInfosWithfaceInfoArr:originArray]; - NSString * faceFile = [XPRoomFaceTool shareFaceTool].faceDirectory; - NSMutableArray * faceArray = [NSMutableArray array]; - for (int i = 0; i< sortArray.count; i++) { - RoomFaceInfoModel * faceInfo = [sortArray xpSafeObjectAtIndex:i]; - if (!faceInfo.isNobleFace && faceInfo.faceType == 1) { - NSString *faceName = [NSString stringWithFormat:@"%@_%ld_%ld",faceInfo.pinyin,faceInfo.fid,faceInfo.iconPos]; - NSString *dirName = [NSString stringWithFormat:@"%@_%ld",faceInfo.pinyin,faceInfo.fid]; - NSString *targetPath = [NSString stringWithFormat:@"%@/%@/%@",faceFile,dirName,faceName]; - UIImage * faceImage = [UIImage imageWithContentsOfFile:targetPath]; - if (faceImage) { - faceInfo.faceImage = faceImage; - } - [faceArray addObject:faceInfo]; - } - } - [[self getView] getRoomNormalFaceListSuccess:faceArray]; -} - - -/// 规则表情 -- (void)getRoomNobelFace { - NSDictionary * dic = [ClientConfig shareConfig].configInfo.faceInitData; - NSArray * originArray = [RoomFaceInfoModel modelsWithArray:dic[@"vipFaces"]]; - NSArray * sortArray = [self sortFaceInfosWithfaceInfoArr:originArray]; - NSString * faceFile = [XPRoomFaceTool shareFaceTool].faceDirectory; - NSMutableArray * faceArray = [NSMutableArray array]; - for (int i = 0; i< sortArray.count; i++) { - RoomFaceInfoModel * faceInfo = [sortArray xpSafeObjectAtIndex:i]; - if (faceInfo.faceType == 1) { - NSString *faceName = [NSString stringWithFormat:@"%@_%ld_%ld",faceInfo.pinyin,faceInfo.fid,faceInfo.iconPos]; - NSString *dirName = [NSString stringWithFormat:@"%@_%ld",faceInfo.pinyin,faceInfo.fid]; - NSString *targetPath = [NSString stringWithFormat:@"%@/%@/%@",faceFile,dirName,faceName]; - UIImage * faceImage = [UIImage imageWithContentsOfFile:targetPath]; - if (faceImage) { - faceInfo.faceImage = faceImage; - } - [faceArray addObject:faceInfo]; - } - } - [[self getView] getRoomVipFaceListSuccess:faceArray]; - -} - -#pragma mark - Private Method -///排序 -- (NSArray *)sortFaceInfosWithfaceInfoArr:(NSArray *)faceInfoArr { - NSMutableArray *temp = [NSMutableArray array]; - NSMutableArray *temp2 = [NSMutableArray array]; //运气表情 - for (RoomFaceInfoModel *item in faceInfoArr) { - if (item.resultCount <= 0) { - [temp addObject:item]; - }else { - [temp2 addObject:item]; - } - } - [temp addObjectsFromArray:temp2]; - return temp; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFaceTool.h b/YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFaceTool.h deleted file mode 100644 index 8e8db5c..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFaceTool.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// YMRoomFaceTool.h -// YUMI -// -// Created by YUMI on 2022/3/9. -// 下载表情的工具 只是下载 不做其他的任何处理 - -#import -@class ChatFaceVo, ChatFaceResponse; - -NS_ASSUME_NONNULL_BEGIN -@class RoomFaceInfoModel; -@interface XPRoomFaceTool : PIBaseModel -+ (instancetype)shareFaceTool; -///判断和本地的versio是否相同 -@property (nonatomic,copy) NSString *version; -///解压的地址MD5 -@property (nonatomic,copy) NSString *zipMd5; -///资源所在的地址 -@property (nonatomic,copy) NSString *zipUrl; -///解压缩之后 表情资源所在的位置 这个有值的时候才会有表情 如果没值 请使用的时候下载 -@property (nonatomic,copy,readonly) NSString *faceDirectory; -///下载表情数据 -- (void)downFaceData; -///下载表情数据 带完成的 -- (void)downFaceDataCompletion:(nullable void(^)(NSString * path))completion; -///保存一份表情信息 -- (void)saveFaceInfoList:(NSDictionary *)faceDic; - -//查找图片 -- (UIImage *)findFaceImageById:(NSInteger)faceId index:(NSInteger)index; -/// 通过faceid 查找本地的表情信息 -/// @param faceId faceId -- (RoomFaceInfoModel *)findFaceInfoById:(NSInteger)faceId; - - -#pragma mark - New Face(SVGA) -- (NSArray *)loadFaceTabs; -- (void)cacheChatFaces:(NSArray *)data; -- (void)loadFace:(void(^)(NSString *path))fileBlock - with:(ChatFaceVo *)vo; -- (void)loadFace:(void(^)(NSString *path))fileBlock - withUrl:(NSString *)url; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFaceTool.m b/YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFaceTool.m deleted file mode 100644 index 29ccc06..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Presenter/XPRoomFaceTool.m +++ /dev/null @@ -1,409 +0,0 @@ -// -// YMRoomFaceTool.m -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import "XPRoomFaceTool.h" -#import -#import -#import -#import "NSObject+MJExtension.h" -#import "RoomFaceInfoModel.h" -#import "NSArray+Safe.h" -#import "ChatFaceVo.h" -#define FileHashDefaultChunkSizeForReadingData 1024*8 // 8K - -NSString * const kRoomFaceVersion = @"kRoomFaceVersion"; -NSString * const kNewFacePath = @"MoliFaceCache"; - -@interface XPRoomFaceTool () -///解压缩之后 表情资源所在的位置 -@property (nonatomic,copy) NSString *faceDirectory; -///重试的次数 -@property (nonatomic,assign) NSInteger retryCount; -///表情信息 -@property (nonatomic,strong) NSArray *faceInfoList; - -@property (nonatomic, copy) NSArray *chatFaceTabList; - -@end - -@implementation XPRoomFaceTool - -+ (instancetype)shareFaceTool { - static dispatch_once_t onceToken; - static XPRoomFaceTool * tool; - dispatch_once(&onceToken, ^{ - tool = [[XPRoomFaceTool alloc] init]; - tool.retryCount = 0; - }); - return tool; -} - -- (void)downFaceData { - [self downFaceDataCompletion:nil]; -} - -- (void)downFaceDataCompletion:(nullable void (^)(NSString * nullable))completion { - //获取沙盒doucument路径 - NSArray*pathsss =NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,NSUserDomainMask,YES); - NSString *documentsDirectory = [pathsss xpSafeObjectAtIndex:0]; - NSString*faceDirectory = [documentsDirectory stringByAppendingPathComponent:@"Face"]; - ///首先判断 本地的数据是否 需要更新了 - NSString *version = [[NSUserDefaults standardUserDefaults]objectForKey: kRoomFaceVersion]; -//#if DEBUG -// version = @"1"; -//#endif - if (version == nil || version.integerValue < self.version.integerValue) {///本地没有保存的话 就走下载 - if (self.zipUrl.length > 0 && [self.zipUrl hasPrefix:@"http"]) { - NSURL *URL = [NSURL URLWithString:self.zipUrl]; - NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration]; - AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:configuration]; - //请求 - NSURLRequest *request = [NSURLRequest requestWithURL:URL]; - //下载Task操作 - [[manager downloadTaskWithRequest:request progress:^(NSProgress * _Nonnull downloadProgress) { - - } destination:^NSURL * _Nonnull(NSURL * _Nonnull targetPath, NSURLResponse * _Nonnull response) { - //要求返回一个URL, 返回的这个URL就是文件的位置的路径 - NSString *cachesPath = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) lastObject]; - NSString *path = [cachesPath stringByAppendingPathComponent:response.suggestedFilename]; - return [NSURL fileURLWithPath:path]; - } completionHandler:^(NSURLResponse * _Nonnull response, NSURL * _Nullable filePath, NSError * _Nullable error) { - if (error == nil) { - NSString *filePathStr = [filePath path]; - NSString *fileMD5Str = [self getFileMD5WithPath:filePathStr]; - fileMD5Str = [fileMD5Str uppercaseString]; - if (![self.zipMd5 isEqualToString:fileMD5Str]) { //MD5校验 如果不相等就重新下载 - [self performSelector:@selector(downFaceData) withObject:nil afterDelay:3]; - }else { - // filePath就是你下载文件的位置，你可以解压，也可以直接拿来使用 - NSString *imgFilePath = [filePath path]; -// NSLog(@"img == %@", imgFilePath); - NSString *zipPath = imgFilePath; - NSFileManager *fileManager = [NSFileManager defaultManager]; - //删除老的数据 - [[NSFileManager defaultManager] removeItemAtPath:faceDirectory error:nil]; - [fileManager createDirectoryAtPath:faceDirectory withIntermediateDirectories:YES attributes:nil error:nil]; -// NSLog(@"test == %@",faceDirectory); //解压后的路径 - dispatch_async(dispatch_get_global_queue(0, 0), ^{ - //解压 - [SSZipArchive unzipFileAtPath:zipPath toDestination:faceDirectory overwrite:YES password:nil progressHandler:^(NSString * _Nonnull entry, unz_file_info zipInfo, long entryNumber, long total) { - - } completionHandler:^(NSString * _Nonnull path, BOOL succeeded, NSError * _Nullable error) { - if (error == nil) { - self.retryCount = 0; - ///如果解压完成的话 就保存一下值 - [[NSUserDefaults standardUserDefaults]setObject:self.version forKey:kRoomFaceVersion]; - self.faceDirectory = faceDirectory; - if (completion) { - completion(faceDirectory); - } - } else { - self.retryCount ++; - if (self.retryCount <=10) { - [self downFaceData]; - } - if (completion) { - completion(nil); - } - } - }]; - }); - } - } else { - self.retryCount ++; - if (self.retryCount <=10) { - [self downFaceData]; - } - if (completion) { - completion(nil); - } - } - - }] resume]; - } else { - if (completion) { - completion(nil); - } - } - } else { - self.faceDirectory = faceDirectory; - if (completion) { - completion(faceDirectory); - } - } -} - - -/// 保存表情信息 -/// @param faceDic 初始化中的表情信息 -- (void)saveFaceInfoList:(NSDictionary *)faceDic { - self.faceInfoList = nil; - NSArray * normalArray = [RoomFaceInfoModel modelsWithArray:faceDic[@"faces"]]; - NSArray * vipFaceArray = [RoomFaceInfoModel modelsWithArray:faceDic[@"vipFaces"]]; - NSMutableArray * array = [NSMutableArray array]; - [array addObjectsFromArray:normalArray]; - [array addObjectsFromArray:vipFaceArray]; - self.faceInfoList = array.copy; -} - - -/// 通过faceid 查找本地的表情信息 -/// @param faceId faceId -- (RoomFaceInfoModel *)findFaceInfoById:(NSInteger)faceId{ - for (int i = 0; i < self.faceInfoList.count; i++) { - RoomFaceInfoModel *faceInfo = self.faceInfoList[i]; - if (faceInfo.fid == faceId) { - return faceInfo; - } - } - return nil; -} - -//查找图片 -- (UIImage *)findFaceImageById:(NSInteger)faceId index:(NSInteger)index { - if (self.faceDirectory) { - RoomFaceInfoModel * faceInfo =[self findFaceInfoById:faceId]; - NSString *faceName = [NSString stringWithFormat:@"%@_%ld_%ld",faceInfo.pinyin,faceInfo.fid,index]; - NSString *dirName = [NSString stringWithFormat:@"%@_%ld",faceInfo.pinyin,faceInfo.fid]; - NSString *targetPath = [NSString stringWithFormat:@"%@/%@/%@",self.faceDirectory,dirName,faceName]; - UIImage * faceImage = [UIImage imageWithContentsOfFile:targetPath]; - return faceImage; - } - return nil; -} - - -- (NSString*)getFileMD5WithPath:(NSString*)path { - return (__bridge NSString *)FileMD5HashCreateWithPath((__bridge CFStringRef)path,FileHashDefaultChunkSizeForReadingData); -} - -CFStringRef FileMD5HashCreateWithPath(CFStringRef filePath, - size_t chunkSizeForReadingData) { - - // Declare needed variables - CFStringRef result = NULL; - CFReadStreamRef readStream = NULL; - - // Get the file URL - CFURLRef fileURL = - CFURLCreateWithFileSystemPath(kCFAllocatorDefault, - (CFStringRef)filePath, - kCFURLPOSIXPathStyle, - (Boolean)false); - - CC_MD5_CTX hashObject; - bool hasMoreData = true; - bool didSucceed; - - if (!fileURL) goto done; - - // Create and open the read stream - readStream = CFReadStreamCreateWithFile(kCFAllocatorDefault, - (CFURLRef)fileURL); - if (!readStream) goto done; - didSucceed = (bool)CFReadStreamOpen(readStream); - if (!didSucceed) goto done; - - // Initialize the hash object - CC_MD5_Init(&hashObject); - - // Make sure chunkSizeForReadingData is valid - if (!chunkSizeForReadingData) { - chunkSizeForReadingData = FileHashDefaultChunkSizeForReadingData; - } - - // Feed the data to the hash object - while (hasMoreData) { - uint8_t buffer[chunkSizeForReadingData]; - CFIndex readBytesCount = CFReadStreamRead(readStream, - (UInt8 *)buffer, - (CFIndex)sizeof(buffer)); - if (readBytesCount == -1)break; - if (readBytesCount == 0) { - hasMoreData =false; - continue; - } - CC_MD5_Update(&hashObject,(const void *)buffer,(CC_LONG)readBytesCount); - } - - // Check if the read operation succeeded - didSucceed = !hasMoreData; - - // Compute the hash digest - unsigned char digest[CC_MD5_DIGEST_LENGTH]; - CC_MD5_Final(digest, &hashObject); - - // Abort if the read operation failed - if (!didSucceed) goto done; - - // Compute the string result - char hash[2 *sizeof(digest) + 1]; - for (size_t i =0; i < sizeof(digest); ++i) { - snprintf(hash + (2 * i),3, "%02x", (int)(digest[i])); - } - result = CFStringCreateWithCString(kCFAllocatorDefault, - (const char *)hash, - kCFStringEncodingUTF8); - -done: - - if (readStream) { - CFReadStreamClose(readStream); - CFRelease(readStream); - } - if (fileURL) { - CFRelease(fileURL); - } - return result; -} - - -#pragma mark - New Face(SVGA) -- (NSArray *)loadFaceTabs { - return self.chatFaceTabList; -} - -- (void)loadFace:(void(^)(NSString *path))fileBlock with:(ChatFaceVo *)vo { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ - [self loadFace:fileBlock withUrl:vo.faceUrl]; - }); -} - -- (void)loadFace:(void(^)(NSString *path))fileBlock - withUrl:(NSString *)url { - NSString *cachePath = [self getFaceCachePath]; - NSString *fileName = [url lastPathComponent]; - NSString *filePath = [cachePath stringByAppendingPathComponent:fileName]; -// 确认缓存的地址和实际使用的地址 - NSString *resultPath = [[NSFileManager defaultManager] fileExistsAtPath:filePath] ? filePath : nil; - - NSLog(@"-------------- 加载表情文件: %@", url); - NSLog(@"-------------- 查找路径: %@", filePath); - NSLog(@"-------------- 文件存在: %@", resultPath ? @"是" : @"否"); - - dispatch_async(dispatch_get_main_queue(), ^{ - if (fileBlock) { - fileBlock(resultPath); - } - }); -} - -- (void)cacheChatFaces:(NSArray *)data { - self.chatFaceTabList = [ChatFaceResponse modelsWithArray:data]; - NSString *cachePath = [self getFaceCachePath]; - - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSMutableDictionary *cachedUrls = [[defaults objectForKey:@"SVGACachedUrls"] mutableCopy] ?: [NSMutableDictionary dictionary]; - - for (ChatFaceResponse *response in self.chatFaceTabList) { - for (ChatFaceVo *faceVo in response.faceNewVoList) { - // 从URL中获取文件名 - NSString *fileName = [faceVo.faceUrl lastPathComponent]; - NSString *filePath = [cachePath stringByAppendingPathComponent:fileName]; - - // 检查URL是否已缓存且文件存在 - if ([cachedUrls[faceVo.faceUrl] isEqualToString:fileName] && - [[NSFileManager defaultManager] fileExistsAtPath:filePath]) { - continue; - } - - [self downloadFaceFile:faceVo.faceUrl savePath:cachePath completion:^(BOOL success) { - if (success) { - // 下载成功后更新缓存记录 - cachedUrls[faceVo.faceUrl] = fileName; - [defaults setObject:cachedUrls forKey:@"SVGACachedUrls"]; - [defaults synchronize]; - } - }]; - } - } -} - -- (NSString *)md5HashOfString:(NSString *)string { - const char *ptr = [string UTF8String]; - unsigned char md5Buffer[CC_MD5_DIGEST_LENGTH]; - CC_MD5(ptr, (CC_LONG)strlen(ptr), md5Buffer); - NSMutableString *output = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH * 2]; - for(int i = 0; i < CC_MD5_DIGEST_LENGTH; i++) { - [output appendFormat:@"%02x", md5Buffer[i]]; - } - return output; -} - -- (BOOL)verifyFileMD5:(NSString *)filePath expectedMD5:(NSString *)expectedMD5 { - NSString *fileMD5 = [[self getFileMD5WithPath:filePath] lowercaseString]; - return [fileMD5 isEqualToString:[expectedMD5 lowercaseString]]; -} - -- (void)downloadFaceFile:(NSString *)urlString savePath:(NSString *)savePath completion:(void(^)(BOOL))completion { - // 清理URL字符串 - NSString *cleanedUrlString = [urlString stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; - - // 验证URL格式 - if (cleanedUrlString.length == 0 || - (![cleanedUrlString hasPrefix:@"http://"] && ![cleanedUrlString hasPrefix:@"https://"])) { - NSLog(@"-------------- URL格式无效：%@", urlString); - if (completion) { - completion(NO); - } - return; - } - - // URL编码处理，支持中文等非ASCII字符 - NSString *encodedUrlString = [self encodeURL:cleanedUrlString]; - NSLog(@"-------------- URL编码: %@ -> %@", cleanedUrlString, encodedUrlString); - - NSURL *url = [NSURL URLWithString:encodedUrlString]; - if (!url) { - NSLog(@"-------------- 无法创建URL对象：%@", cleanedUrlString); - if (completion) { - completion(NO); - } - return; - } - - NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration]; - AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:configuration]; - - NSURLRequest *request = [NSURLRequest requestWithURL:url]; - NSLog(@"-------------- 下载表情：%@ : %@", cleanedUrlString, savePath); - [[manager downloadTaskWithRequest:request progress:nil destination:^NSURL *(NSURL *targetPath, NSURLResponse *response) { - [[NSFileManager defaultManager] createDirectoryAtPath:savePath withIntermediateDirectories:YES attributes:nil error:nil]; - return [NSURL fileURLWithPath:[savePath stringByAppendingPathComponent:response.suggestedFilename]]; - } completionHandler:^(NSURLResponse *response, NSURL *filePath, NSError *error) { - if (error) { - NSLog(@"-------------- 下载失败：%@ : %@\n%@", cleanedUrlString, savePath, error); - } else { - NSLog(@"-------------- 下载成功：%@ -> %@", cleanedUrlString, filePath.path); - } - if (completion) { - completion(error == nil); - } - }] resume]; -} - -- (NSString *)encodeURL:(NSString *)urlString { - // 使用NSURLComponents来正确处理URL编码 - NSURLComponents *components = [NSURLComponents componentsWithString:urlString]; - if (components) { - // NSURLComponents会自动处理URL编码 - return components.URL.absoluteString; - } - - // 如果NSURLComponents失败，则手动编码 - NSCharacterSet *allowedCharacters = [NSCharacterSet URLQueryAllowedCharacterSet]; - NSString *encodedString = [urlString stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacters]; - return encodedString ?: urlString; -} - -#pragma mark - Helper Methods -- (NSString *)getFaceCachePath { - return [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject - stringByAppendingPathComponent:kNewFacePath]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/FaceView/Protocol/XPRoomFaceProtocol.h b/YuMi/Modules/YMRoom/View/FaceView/Protocol/XPRoomFaceProtocol.h deleted file mode 100644 index ffff674..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/Protocol/XPRoomFaceProtocol.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMRoomFaceProtocol.h -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel; -@protocol XPRoomFaceProtocol - -///获取房间普通礼物成功 -- (void)getRoomNormalFaceListSuccess:(NSArray *)list; -///获取房间VIP礼物成功 -- (void)getRoomVipFaceListSuccess:(NSArray *)list; -///用户用户信息成功 -- (void)getUserInfoSuccess:(UserInfoModel *)userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionFlowLayout.h b/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionFlowLayout.h deleted file mode 100644 index eb4874f..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionFlowLayout.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomFaceCollectionFlowLayout.h -// YUMI -// -// Created by YUMI on 2022/3/10. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomFaceCollectionFlowLayout : MSBaseRTLFlowLayout - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionFlowLayout.m b/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionFlowLayout.m deleted file mode 100644 index b94d805..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionFlowLayout.m +++ /dev/null @@ -1,150 +0,0 @@ -// -// YMRoomFaceCollectionFlowLayout.m -// YUMI -// -// Created by YUMI on 2022/3/10. -// - -#import "XPRoomFaceCollectionFlowLayout.h" - -@interface XPRoomFaceCollectionFlowLayout () -@property (nonatomic, copy) NSMutableDictionary *sectionDic; -@property (nonatomic, strong) NSMutableArray *allAttributes; -@end - -@implementation XPRoomFaceCollectionFlowLayout -#pragma mark - life cycle -- (instancetype)init { - self = [super init]; - if (self) { - self.scrollDirection = UICollectionViewScrollDirectionHorizontal; - } - return self; -} - -#pragma mark - overload - -- (void)prepareLayout { - - [super prepareLayout]; - - _sectionDic = [NSMutableDictionary dictionary]; - self.allAttributes = [NSMutableArray array]; - //获取section的数量 - NSUInteger section = [self.collectionView numberOfSections]; - - for (int sec = 0; sec < section; sec++) { - //获取每个section的cell个数 - NSUInteger count = [self.collectionView numberOfItemsInSection:sec]; - - for (NSUInteger item = 0; item *)layoutAttributesForElementsInRect:(CGRect)rect { - - return self.allAttributes; -} - -#pragma mark - private method - -- (void)applyLayoutAttributes:(UICollectionViewLayoutAttributes *)attributes { - - if(attributes.representedElementKind != nil){ - return; - } - CGFloat minLine = self.minimumLineSpacing; - CGFloat minSpacing = self.minimumInteritemSpacing; - - //attributes 的宽度 - CGFloat itemW = attributes.frame.size.width; - //attributes 的高度 - CGFloat itemH = attributes.frame.size.height; - UIEdgeInsets sectionInsets = self.sectionInset; - //collectionView 的宽度 - CGFloat width = self.collectionView.frame.size.width; - //collectionView 的高度 - CGFloat height = self.collectionView.frame.size.height; - //每个attributes的下标值 从0开始 - NSInteger itemIndex = attributes.indexPath.item; - - CGFloat stride = (self.scrollDirection == UICollectionViewScrollDirectionHorizontal) ? width : height; - - - //获取现在的attributes是第几组 - NSInteger section = attributes.indexPath.section; - //获取每个section的item的个数 - NSInteger itemCount = [self.collectionView numberOfItemsInSection:section]; - - - CGFloat offset = section * stride; - - //计算x方向item个数 - NSInteger xCount = (width / itemW); - //计算y方向item个数 - NSInteger yCount = (height / itemH); - //计算一页总个数 - NSInteger allCount = (xCount * yCount); - //获取每个section的页数，从0开始 - NSInteger page = itemIndex / allCount; - - //余数，用来计算item的x的偏移量 - NSInteger remain = (itemIndex % xCount); - //取商，用来计算item的y的偏移量 - NSInteger merchant = (itemIndex-page*allCount)/xCount; - - - //x方向每个item的偏移量 - CGFloat xCellOffset = remain * (itemW + minLine)+ sectionInsets.left; - //y方向每个item的偏移量 - CGFloat yCellOffset = merchant * (itemH + minSpacing); - - //获取每个section中item占了几页 - NSInteger pageRe = (itemCount % allCount == 0)? (itemCount / allCount) : (itemCount / allCount) + 1; - //将每个section与pageRe对应，计算下面的位置 - [_sectionDic setValue:@(pageRe) forKey:[NSString stringWithFormat:@"%ld", section]]; - - if(self.scrollDirection == UICollectionViewScrollDirectionHorizontal) { - - NSInteger actualLo = 0; - //将每个section中的页数相加 - for (NSString *key in [_sectionDic allKeys]) { - actualLo += [_sectionDic[key] integerValue]; - } - //获取到的最后的数减去最后一组的页码数 - actualLo -= [_sectionDic[[NSString stringWithFormat:@"%ld", [_sectionDic allKeys].count-1]] integerValue]; - xCellOffset += page*width + actualLo*width; - - } else { - - yCellOffset += offset; - } - - attributes.frame = CGRectMake(xCellOffset, yCellOffset, itemW, itemH); -} - -@end diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.h b/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.h deleted file mode 100644 index f324fc5..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// YMRoomFaceCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import -@class ChatFaceVo; - -NS_ASSUME_NONNULL_BEGIN -@class RoomFaceInfoModel; -@interface XPRoomFaceCollectionViewCell : UICollectionViewCell -///VIP的等级 -@property (nonatomic,assign) NSInteger vipLevel; -///表情信息 -@property (nonatomic,strong) RoomFaceInfoModel *faceInfo; - -@property (nonatomic, assign) ChatFaceVo *chatFace; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m b/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m deleted file mode 100644 index 52a9527..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m +++ /dev/null @@ -1,151 +0,0 @@ -// -// YMRoomFaceCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import "XPRoomFaceCollectionViewCell.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -///Model -#import "RoomFaceInfoModel.h" -#import "ChatFaceVo.h" - -@interface XPRoomFaceCollectionViewCell () -///表情的图片 -@property (nonatomic,strong) NetImageView *faceImageView; -///表情的标题 -@property (nonatomic,strong) UILabel *faceTitleLabel; -///VIP的类型 -@property (nonatomic,strong) NetImageView *nobleTypeImageView; -///是否是VIP🔐 -//@property (nonatomic,strong) UIImageView *nobleLockImageView; -///覆盖的背景 -@property (nonatomic,strong) UIView * coverView; -@end - -@implementation XPRoomFaceCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.faceImageView]; - [self.contentView addSubview:self.coverView]; - [self.contentView addSubview:self.nobleTypeImageView]; - [self.contentView addSubview:self.faceTitleLabel]; -// [self.contentView addSubview:self.nobleLockImageView]; -} - -- (void)initSubViewConstraints { - [self.faceImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(60, 60)); - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView); - }]; - - [self.coverView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.faceImageView); - }]; - - [self.nobleTypeImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(12 * 1.4); - make.height.mas_equalTo(10 * 1.4); - make.leading.top.mas_equalTo(self.contentView); - }]; - - [self.faceTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.faceImageView.mas_bottom).offset(4); - }]; - -// [self.nobleLockImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.size.mas_equalTo(CGSizeMake(11, 11)); -// make.bottom.trailing.mas_equalTo(self.faceImageView); -// }]; -} -#pragma mark - Getters And Setters -- (void)setChatFace:(ChatFaceVo *)chatFace { - _chatFace = chatFace; - if (chatFace) { - self.faceImageView.imageUrl = chatFace.faceIndex; - } -} - -- (void)setFaceInfo:(RoomFaceInfoModel *)faceInfo { - _faceInfo = faceInfo; - if (_faceInfo) { - self.faceImageView.image = _faceInfo.faceImage; - self.faceTitleLabel.text = _faceInfo.name; - if (_faceInfo.faceVipInfo) { - self.nobleTypeImageView.imageUrl = _faceInfo.faceVipInfo.vipIcon; - self.nobleTypeImageView.hidden = NO; -// if (_faceInfo.faceVipInfo.vipLevel > self.vipLevel) { -// self.nobleLockImageView.hidden = NO; -// } else { -// self.nobleLockImageView.hidden = YES; -// } - } else { - self.nobleTypeImageView.hidden = YES; -// self.nobleLockImageView.hidden = YES; - } - } -} - -- (NetImageView *)faceImageView { - if (!_faceImageView) { - _faceImageView = [[NetImageView alloc] init]; - _faceImageView.userInteractionEnabled = YES; - } - return _faceImageView; -} - -- (NetImageView *)nobleTypeImageView { - if (!_nobleTypeImageView) { - _nobleTypeImageView = [[NetImageView alloc] init]; - _nobleTypeImageView.layer.masksToBounds = YES; - _nobleTypeImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _nobleTypeImageView; -} - -//- (UIImageView *)nobleLockImageView { -// if (!_nobleLockImageView) { -// _nobleLockImageView = [[UIImageView alloc] init]; -// _nobleLockImageView.image = [UIImage imageNamed:@"room_face_nobel_lock"]; -// } -// return _nobleLockImageView; -//} - -- (UILabel *)faceTitleLabel { - if (!_faceTitleLabel) { - _faceTitleLabel = [[UILabel alloc] init]; - _faceTitleLabel.font = [UIFont systemFontOfSize:10]; - _faceTitleLabel.textColor = [UIColor whiteColor]; - _faceTitleLabel.textAlignment = NSTextAlignmentCenter; - } - return _faceTitleLabel; -} - -- (UIView *)coverView { - if (!_coverView) { - _coverView = [[UIView alloc] init]; - _coverView.backgroundColor = UIColorRGBAlpha(0x000000, 0.3); - } - return _coverView; -} - - - -@end diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceTitleCollectionViewCell.h b/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceTitleCollectionViewCell.h deleted file mode 100644 index 7991fda..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceTitleCollectionViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomFaceTitleCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomFaceTitleItemModel; -@interface XPRoomFaceTitleCollectionViewCell : UICollectionViewCell -@property (nonatomic,strong) RoomFaceTitleItemModel *titleModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceTitleCollectionViewCell.m b/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceTitleCollectionViewCell.m deleted file mode 100644 index 74e6810..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceTitleCollectionViewCell.m +++ /dev/null @@ -1,94 +0,0 @@ -// -// YMRoomFaceTitleCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import "XPRoomFaceTitleCollectionViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -///Model -#import "RoomFaceTitleItemModel.h" -#import "ChatFaceVo.h" - -@interface XPRoomFaceTitleCollectionViewCell () - -@property (nonatomic, strong) UIView *selectedBG; -@property (nonatomic, strong) NetImageView *imageView; -@end - -@implementation XPRoomFaceTitleCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)prepareForReuse { - [super prepareForReuse]; -} - -- (void)setSelected:(BOOL)selected { - [super setSelected:selected]; - - // 根据选中状态显示或隐藏selectedBG - self.selectedBG.hidden = !selected; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.selectedBG]; - [self.contentView addSubview:self.imageView]; - - // 默认隐藏选中背景 - self.selectedBG.hidden = YES; -} - -- (void)initSubViewConstraints { - [self.selectedBG mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView).insets(UIEdgeInsetsMake(4, 4, 4, 4)); - }]; -} -#pragma mark - Getters And Setters -- (void)setTitleModel:(RoomFaceTitleItemModel *)titleModel { - _titleModel = titleModel; - if (titleModel.tabModel) { - [self.imageView setImageUrl:titleModel.tabModel.tabUrl]; - } else { - self.imageView.image = kImage(@"鸭子"); - } - - // 根据model的isSelect属性更新选中状态UI - self.selectedBG.hidden = !titleModel.isSelect; -} - -- (NetImageView *)imageView { - if (!_imageView) { - _imageView = [[NetImageView alloc] init]; - _imageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _imageView; -} - -- (UIView *)selectedBG { - if (!_selectedBG) { - _selectedBG = [[UIView alloc] init]; - _selectedBG.backgroundColor = UIColorFromRGB(0x272727); - [_selectedBG setCornerRadius:8]; - } - return _selectedBG; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.h b/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.h deleted file mode 100644 index f9eacfe..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomFaceViewController.h -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@interface XPRoomFaceViewController : MvpViewController -///房间的id -@property (nonatomic,copy) NSString *roomId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m b/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m deleted file mode 100644 index 2baac55..0000000 --- a/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m +++ /dev/null @@ -1,520 +0,0 @@ -// -// YMRoomFaceViewController.m -// YUMI -// -// Created by YUMI on 2022/3/9. -// - -#import "XPRoomFaceViewController.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "XPRoomFaceTool.h" -#import "TTPopup.h" -#import "NSArray+Safe.h" -///Model -#import "RoomFaceTitleItemModel.h" -#import "RoomFaceInfoModel.h" -#import "UserInfoModel.h" -#import "RoomFaceSendInfoModel.h" -#import "AttachmentModel.h" -#import "XPMessageRemoteExtModel.h" -///View -#import "XPRoomFaceCollectionViewCell.h" -#import "XPRoomFaceTitleCollectionViewCell.h" -#import "XPRoomFaceCollectionFlowLayout.h" -///P -#import "XPRoomFacePresenter.h" -#import "XPRoomFaceProtocol.h" - -#import "ChatFaceVo.h" - -@interface XPRoomFaceViewController () -///顶部的View -@property (nonatomic,strong) UIView * topView; -///显示的内容 -@property (nonatomic,strong) UIView * contentView; -///最外层的容器 -@property (nonatomic,strong) UIStackView *stackView; -///列表 -@property (nonatomic,strong) UICollectionView *titleCollectionView; - -///列表 -@property (nonatomic,strong) UICollectionView *faceCollectionView; -///分页控件 -@property (nonatomic, strong) UIPageControl *pageView; -///滑块的内容 -@property (nonatomic,strong) NSMutableArray *titleList; -///当前选中的 -@property (nonatomic,strong) RoomFaceTitleItemModel *selectTitleItem; -///表情 -@property (nonatomic,strong) NSArray *faceList; -///VIP表情 -@property (nonatomic,strong) NSArray *nobelFaceList; -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; - - -@end - -@implementation XPRoomFaceViewController - -- (XPRoomFacePresenter *)createPresenter { - return [[XPRoomFacePresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initData]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - [UIView animateWithDuration:0.5 animations:^{ - self.topView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.0]; - }]; -} - -#pragma mark - Private Method -- (void)initData { - [self.presenter getUserInfo]; - if ([XPRoomFaceTool shareFaceTool].faceDirectory) { - [self.presenter getRoomNormalFace]; - } else { - [self showLoading]; - [[XPRoomFaceTool shareFaceTool] downFaceDataCompletion:^(NSString * _Nonnull path) { - [self hideHUD]; - if (path.length > 0) { - [self.presenter getRoomNormalFace]; - } else { - [self showErrorToast:YMLocalizedString(@"XPRoomFaceViewController0")]; - } - }]; - } -} - -- (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.topView]; - [self.view addSubview:self.contentView]; - - [self.contentView addSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.titleCollectionView]; - [self.stackView addArrangedSubview:self.faceCollectionView]; - [self.stackView addArrangedSubview:self.pageView]; - - NSArray *faceTabs = [[XPRoomFaceTool shareFaceTool] loadFaceTabs]; - for (ChatFaceResponse *tab in faceTabs) { - RoomFaceTitleItemModel *item = [[RoomFaceTitleItemModel alloc] init]; - item.title= @(tab.tabId).stringValue; - item.isSelect = NO; - item.faceType = RoomFaceTitleItemType_Normal; - item.tabModel = tab; - [self.titleList addObject:item]; - -// NetImageView *tabImageView = [[NetImageView alloc] init]; -// [self.titleStackView addArrangedSubview:tabImageView]; -// [tabImageView loadImageWithUrl:tab.tabUrl -// completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { -// CGSize s = image.size; -// CGFloat scale = 28 / s.height; -// CGFloat width = s.width * scale; -// [tabImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.size.mas_equalTo(CGSizeMake(width, 28)); -// }]; -// }]; - } - self.selectTitleItem = [self.titleList firstObject]; -} - -- (void)initSubViewConstraints { - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.contentView.mas_bottom); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.view); - make.height.mas_equalTo(self.stackView).offset(42 + kSafeAreaBottomHeight); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.contentView); - }]; - - - [self.titleCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(44); - }]; - - [self.pageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(10); - }]; - - CGFloat itemHeight = (CGFloat)(KScreenWidth - 15 * 2 - 10 * 4) / (CGFloat)5 + 20; - CGFloat collectionViewHeight = itemHeight * 3 + 10 * 2; - [self.faceCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(collectionViewHeight); - }]; -} - -- (void)updatePageViewState:(NSArray *)array { - NSInteger page = 0; - if (array.count % 15 == 0) { //刚好满页 - page = array.count / 15; - } else { - page = array.count / 15 + 1; - } - [self.pageView setNumberOfPages:page]; - self.pageView.currentPage = 0; -} - -- (void)sendVIPFaceCustomMessage:(ChatFaceVo *)vo { - NSMutableArray *faceRecieveInfos = [NSMutableArray array]; - RoomFaceSendInfoModel *sendInfo = [[RoomFaceSendInfoModel alloc]init]; - sendInfo.svgaURL = vo.faceUrl; - sendInfo.nick = self.userInfo.nick; - sendInfo.faceId = vo.seqNo; - sendInfo.uid = self.userInfo.uid; - [faceRecieveInfos addObject:sendInfo.model2dictionary]; - - AttachmentModel * attachment = [[AttachmentModel alloc] init]; - attachment.first = CustomMessageType_Face; - attachment.second = Custom_Message_Sub_Face_Send; - NSDictionary * dic = @{@"data":faceRecieveInfos, @"uid": @(self.userInfo.uid)}; - attachment.data = dic; - NSString *sessionID = self.roomId; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - //构造会话 - NSError *error; - NIMSession *session = [NIMSession session:sessionID type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:&error]; - if (error) { - NSLog(@" !!!!!!!!!! 发送消息失败： %@", error); - } - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)sendFaceCustomMessage:(RoomFaceInfoModel *)faceInfo { - - UserInfoModel * userInfo = self.userInfo; - XPMessageRemoteExtModel *extModel = [[XPMessageRemoteExtModel alloc] init]; - extModel.defUser = userInfo.defUser; - extModel.erbanNo = userInfo.erbanNo; - extModel.carName = userInfo.carName; - extModel.inRoomNameplatePic = userInfo.nameplatePic; - extModel.inRoomNameplateWord = userInfo.nameplateWord; - extModel.isCustomWord = userInfo.isCustomWord; - extModel.charmUrl = userInfo.userLevelVo.charmUrl; - extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq; - extModel.experUrl = userInfo.userLevelVo.experUrl; - extModel.newUser = userInfo.newUser; - extModel.vipIcon = userInfo.userVipInfoVO.nameplateUrl; - extModel.androidBubbleUrl = userInfo.androidBubbleUrl; - extModel.iosBubbleUrl = userInfo.iosBubbleUrl; - extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; - extModel.platformRole = userInfo.platformRole; - extModel.nick = userInfo.nick; - extModel.avatar = userInfo.avatar; - NSString * headwearUrl= userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - extModel.headWearUrl = headwearUrl; - - NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[AccountInfoStorage instance].getUid]; - - RoomFaceSendInfoModel *sendInfo = [[RoomFaceSendInfoModel alloc] init]; - NSMutableArray *resultIndexs = [NSMutableArray array]; - sendInfo.resultIndexes = [resultIndexs copy]; - if (faceInfo.resultStartPos > 0 && faceInfo.resultEndPos > 0) { - int value; - if (faceInfo.canResultRepeat) { //结果可以重复 - for (int i = 0; i < faceInfo.resultCount; i++) { - value = [self getRandomNumber:(short)faceInfo.resultStartPos to:(short)faceInfo.resultEndPos]; - [resultIndexs addObject:@(value)]; - sendInfo.resultIndexes = [resultIndexs copy]; - } - }else { - sendInfo.resultIndexes = [[self randomArray:(short)faceInfo.resultStartPos to:(short)faceInfo.resultEndPos count:(short)faceInfo.resultCount] mutableCopy]; - } - } - NSMutableArray *faceRecieveInfos = [NSMutableArray array]; - sendInfo.nick = self.userInfo.nick; - sendInfo.faceId = faceInfo.fid; - sendInfo.uid = self.userInfo.uid; - [faceRecieveInfos addObject:sendInfo.model2dictionary]; - - AttachmentModel * attachment = [[AttachmentModel alloc] init]; - attachment.first = CustomMessageType_Face; - attachment.second = Custom_Message_Sub_Face_Send; - NSDictionary * dic = @{@"data":faceRecieveInfos, @"uid": @(self.userInfo.uid)}; - attachment.data = dic; - NSString *sessionID = self.roomId; - NIMMessage *message = [[NIMMessage alloc]init]; - message.remoteExt = remoteExt; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:sessionID type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -/// 生成随机数 -/// @param from 最小值 -/// @param to 最大值 -- (int)getRandomNumber:(int)from to:(int)to { - return (int)(from + (arc4random() % (to - from + 1))); -} - -/// 生成固定区间的不重复随机数 -/// @param from 最小值 -/// @param to 最大值 -- (NSArray *)randomArray:(int)from to:(int)to count:(int)count { - - //随机数从这里边产生 - NSMutableArray *startArray= [NSMutableArray array]; - for (int i = from; i <= to; i++) { - [startArray addObject:@(i)]; - } - //随机数产生结果 - NSMutableArray *resultArray=[[NSMutableArray alloc] initWithCapacity:0]; - //随机数个数 - NSInteger m = count; - for (int i=0; i 0) { - [startArray removeLastObject]; - } - } - return resultArray; -} - -#pragma mark - Gesture Delegate -- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { - return YES; -} - -#pragma mark - scrollviewdelegate -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - CGFloat offX = scrollView.contentOffset.x; - CGFloat width = CGRectGetWidth(scrollView.frame); - self.pageView.currentPage = ceilf(offX/width); -} - -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - if (collectionView == self.titleCollectionView) { - return CGSizeMake(34, 34); - } else if (collectionView == self.faceCollectionView) { - CGFloat itemWidth = (CGFloat)(KScreenWidth - 15 * 2 - 10 * 4) / (CGFloat)5; - return CGSizeMake(itemWidth, itemWidth + 20); - } - return CGSizeZero; -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - if (collectionView == self.titleCollectionView) { - return self.titleList.count; - } else if (collectionView == self.faceCollectionView) { - if (self.selectTitleItem.tabModel) { - return self.selectTitleItem.tabModel.faceNewVoList.count; - } else { - return self.selectTitleItem.faceType == RoomFaceTitleItemType_Normal? self.faceList.count : self.nobelFaceList.count; - } - } - return 0; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - if (collectionView == self.titleCollectionView) { - XPRoomFaceTitleCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPRoomFaceTitleCollectionViewCell class]) forIndexPath:indexPath]; - RoomFaceTitleItemModel * model = [self.titleList xpSafeObjectAtIndex:indexPath.item]; - if (model == self.selectTitleItem) { - model.isSelect = YES; - } else { - model.isSelect = NO; - } - cell.titleModel = model; - return cell; - } - - if (self.selectTitleItem.tabModel) { - XPRoomFaceCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"NewChatFace" forIndexPath:indexPath]; - cell.chatFace = [self.selectTitleItem.tabModel.faceNewVoList xpSafeObjectAtIndex:indexPath.row]; - return cell; - } else { - XPRoomFaceCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPRoomFaceCollectionViewCell class]) forIndexPath:indexPath]; - RoomFaceInfoModel * faceInfo; - if (self.selectTitleItem.faceType == RoomFaceTitleItemType_Normal) { - faceInfo = [self.faceList xpSafeObjectAtIndex:indexPath.row]; - } else { - faceInfo = [self.nobelFaceList xpSafeObjectAtIndex:indexPath.row]; - } - cell.vipLevel = self.userInfo.userVipInfoVO.vipLevel; - cell.faceInfo =faceInfo; - return cell; - } -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - if (collectionView == self.titleCollectionView) { - - RoomFaceTitleItemModel * titleModel = [self.titleList xpSafeObjectAtIndex:indexPath.row]; - self.selectTitleItem = titleModel; - [self.titleCollectionView reloadData]; - - NSArray * list = titleModel.faceType == RoomFaceTitleItemType_Normal ? self.faceList : self.nobelFaceList; - [self updatePageViewState:list]; - [self.faceCollectionView reloadData]; - } else { - if (self.selectTitleItem.tabModel) { - ChatFaceVo *vo = [self.selectTitleItem.tabModel.faceNewVoList xpSafeObjectAtIndex:indexPath.row]; - if (vo) { - [self sendVIPFaceCustomMessage:vo]; - } - } else { - if (self.selectTitleItem.faceType == RoomFaceTitleItemType_Normal) { - RoomFaceInfoModel * faceInfo = [self.faceList xpSafeObjectAtIndex:indexPath.row]; - [self sendFaceCustomMessage:faceInfo]; - } else { - if (indexPath.row < self.nobelFaceList.count) { - RoomFaceInfoModel * faceInfo = [self.nobelFaceList xpSafeObjectAtIndex:indexPath.row]; - if (faceInfo.faceVipInfo.vipLevel > self.userInfo.userVipInfoVO.vipLevel) { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.message = [NSString stringWithFormat:YMLocalizedString(@"XPRoomFaceViewController1"), faceInfo.name,faceInfo.faceVipInfo.vipName]; - config.actionStyle = TTAlertActionConfirmStyle; - [TTPopup alertWithConfig:config confirmHandler:^{ - - } cancelHandler:^{ - - }]; - } else { - [self sendFaceCustomMessage:faceInfo]; - } - } - } - } - } -} - -#pragma mark - XPRoomFaceProtocol -- (void)getRoomNormalFaceListSuccess:(NSArray *)list { - self.faceList = list; - [self updatePageViewState:list]; - [self.faceCollectionView reloadData]; -} - -- (void)getRoomVipFaceListSuccess:(NSArray *)list { - self.nobelFaceList = list; - [self.faceCollectionView reloadData]; -} - -- (void)getUserInfoSuccess:(UserInfoModel *)userInfo { - self.userInfo = userInfo; - [self.faceCollectionView reloadData]; -} -#pragma mark - Event Response -- (void)noblePrivilButtonAction:(UIButton *)sender { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)disMissViewRecognizer { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - Getters And Setters -- (UIView *)topView { - if (!_topView) { - _topView = [[UIView alloc] init]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(disMissViewRecognizer)]; - tap.cancelsTouchesInView = NO; - tap.delegate = self; - [_topView addGestureRecognizer:tap]; - } - return _topView; -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = UIColorFromRGB(0x0D0C11); - } - return _contentView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing =10; - } - return _stackView; -} - -- (UICollectionView *)titleCollectionView{ - if (!_titleCollectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.minimumLineSpacing = 15; - _titleCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _titleCollectionView.dataSource = self; - _titleCollectionView.delegate = self; - _titleCollectionView.backgroundColor = [UIColor clearColor]; - [_titleCollectionView registerClass:[XPRoomFaceTitleCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPRoomFaceTitleCollectionViewCell class])]; - } - return _titleCollectionView; -} - -- (UICollectionView *)faceCollectionView{ - if (!_faceCollectionView) { - XPRoomFaceCollectionFlowLayout *layout = [[XPRoomFaceCollectionFlowLayout alloc] init]; - layout.minimumLineSpacing = 10; - layout.minimumInteritemSpacing = 10; - layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0); - _faceCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _faceCollectionView.dataSource = self; - _faceCollectionView.delegate = self; - _faceCollectionView.backgroundColor = [UIColor clearColor]; - _faceCollectionView.pagingEnabled = YES; - [_faceCollectionView registerClass:[XPRoomFaceCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPRoomFaceCollectionViewCell class])]; - [_faceCollectionView registerClass:[XPRoomFaceCollectionViewCell class] forCellWithReuseIdentifier:@"NewChatFace"]; - } - return _faceCollectionView; -} - -- (UIPageControl *)pageView { - if (!_pageView) { - _pageView = [[UIPageControl alloc] init]; - _pageView.currentPageIndicatorTintColor = [UIColor whiteColor]; - } - return _pageView; -} - -- (NSMutableArray *)titleList { - if (!_titleList) { - RoomFaceTitleItemModel * normalItem = [[RoomFaceTitleItemModel alloc] init]; - normalItem.title= YMLocalizedString(@"XPRoomFaceViewController2"); - normalItem.isSelect = YES; - normalItem.faceType = RoomFaceTitleItemType_Normal; - - _titleList = @[normalItem].mutableCopy; - } - return _titleList; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/FirstRecharge/Api/Api+FirstRecharge.h b/YuMi/Modules/YMRoom/View/FirstRecharge/Api/Api+FirstRecharge.h deleted file mode 100644 index 0e27588..0000000 --- a/YuMi/Modules/YMRoom/View/FirstRecharge/Api/Api+FirstRecharge.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// Api+FirstRecharge.h -// YUMI -// -// Created by YUMI on 2021/12/23. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (FirstRecharge) - - - -/// 用户首充状态 -/// @param completion complete -+ (void)firstchargeInfo:(HttpRequestHelperCompletion)completion; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FirstRecharge/Api/Api+FirstRecharge.m b/YuMi/Modules/YMRoom/View/FirstRecharge/Api/Api+FirstRecharge.m deleted file mode 100644 index db94e7d..0000000 --- a/YuMi/Modules/YMRoom/View/FirstRecharge/Api/Api+FirstRecharge.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// Api+FirstRecharge.m -// YUMI -// -// Created by YUMI on 2021/12/23. -// - -#import "Api+FirstRecharge.h" - -@implementation Api (FirstRecharge) - -+ (void)firstchargeInfo:(HttpRequestHelperCompletion)completion { - [self makeRequest:@"firstcharge/info" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.h b/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.h deleted file mode 100644 index 5087e08..0000000 --- a/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPFreeGiftsObtainView.h -// xplan-ios -// -// Created by duoban on 2022/12/6. -// - -#import -#import "XPFreeGiftModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPFreeGiftsObtainView : UIView -@property (nonatomic,strong) XPFreeGiftModel *freeModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.m b/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.m deleted file mode 100644 index d09e019..0000000 --- a/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.m +++ /dev/null @@ -1,148 +0,0 @@ -// -// XPFreeGiftsObtainView.m -// xplan-ios -// -// Created by duoban on 2022/12/6. -// - -#import "XPFreeGiftsObtainView.h" -@interface XPFreeGiftsObtainView() -///背景view -@property (nonatomic,strong) UIView *bgView; -///返回 -@property (nonatomic,strong) UIButton *backBtn; -///标题 -@property (nonatomic,strong) UILabel *titleView; -///icon图 -@property (nonatomic,strong) NetImageView *iconView; -///说明 -@property (nonatomic,strong) UILabel *instructionsView; -///确认 -@property (nonatomic,strong) UIButton *knowBtn; - -@end -@implementation XPFreeGiftsObtainView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgView]; - [self.bgView addSubview:self.backBtn]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.iconView]; - [self.bgView addSubview:self.instructionsView]; - [self.bgView addSubview:self.knowBtn]; - -} -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(349)); - make.leading.trailing.equalTo(self); - make.bottom.equalTo(self); - }]; - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(26)); - make.top.mas_equalTo(kGetScaleWidth(10)); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(41)); - make.height.mas_equalTo(kGetScaleWidth(21)); - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(5)); - }]; - [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(78)); - make.width.mas_equalTo(kGetScaleWidth(120)); - make.height.mas_equalTo(kGetScaleWidth(106)); - make.centerX.equalTo(self.bgView); - }]; - [self.instructionsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(206)); - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(23)); - }]; - [self.knowBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.instructionsView.mas_bottom).mas_offset(kGetScaleWidth(14)); - make.width.mas_equalTo(kGetScaleWidth(200)); - make.height.mas_equalTo(kGetScaleWidth(46)); - make.centerX.equalTo(self.bgView); - }]; -} --(void)setFreeModel:(XPFreeGiftModel *)freeModel{ - _freeModel = freeModel; - _instructionsView.text = [NSString stringWithFormat:YMLocalizedString(@"XPFreeGiftsObtainView2"),_freeModel.giftName,_freeModel.maxStage]; - _iconView.imageUrl = _freeModel.giftUrl; - int hours = (_freeModel.firstSecond.integerValue)%(24*3600)/3600; - int minutes = (_freeModel.firstSecond.integerValue)%3600/60; - int second = (_freeModel.firstSecond.integerValue)%60; - NSString *hoursStr = hours > 0 ? [NSString stringWithFormat:@"%d%@",hours,YMLocalizedString(@"XPFreeGiftsObtainView5")] : @""; - NSString *minutesStr = minutes > 0 ? [NSString stringWithFormat:@"%d%@",minutes,YMLocalizedString(@"XPFreeGiftsObtainView4")] : @""; - NSString *secondStr = second > 0 ? [NSString stringWithFormat:@"%d%@",second,YMLocalizedString(@"XPFreeGiftsObtainView3")] : @""; - NSString *time = [NSString stringWithFormat:@"%@%@%@",hoursStr,minutesStr,secondStr]; - _titleView.text = [NSString stringWithFormat:YMLocalizedString(@"XPFreeGiftsObtainView1"),time]; -} --(void)backAction{ - [self removeFromSuperview]; -} -#pragma mark -懒加载 -- (UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.9]; - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(25) rightTopCorner:kGetScaleWidth(25) bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth, kGetScaleWidth(349))]; - } - return _bgView; -} -- (UIButton *)backBtn{ - if (!_backBtn){ - _backBtn = [UIButton new]; - [_backBtn setBackgroundImage:kImage(@"free_gifts_view_close") forState:UIControlStateNormal]; - [_backBtn addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} -- (UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:[UIColor whiteColor]]; - _titleView.textAlignment = NSTextAlignmentCenter; - _titleView.numberOfLines = 2; - } - return _titleView; -} -- (NetImageView *)iconView{ - if (!_iconView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder]; - _iconView = [[NetImageView alloc]initWithConfig:config]; - - } - return _iconView; -} - -- (UILabel *)instructionsView{ - if (!_instructionsView){ - _instructionsView = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:[DJDKMIMOMColor disableButtonTextColor]]; - _instructionsView.textAlignment = NSTextAlignmentCenter; - _instructionsView.numberOfLines = 0; - } - return _instructionsView; -} --(UIButton *)knowBtn{ - if (!_knowBtn){ - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(200), kGetScaleWidth(46))]; - _knowBtn = [UIButton buttonInitWithText:YMLocalizedString(@"XPFreeGiftsObtainView0") font:kFontRegular(16) textColor:[UIColor whiteColor] image:nil bgImage:image]; - _knowBtn.layer.cornerRadius = kGetScaleWidth(23); - _knowBtn.layer.masksToBounds = YES; - [_knowBtn addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _knowBtn; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Api/Api+LittleGame.h b/YuMi/Modules/YMRoom/View/LittleGame/Api/Api+LittleGame.h deleted file mode 100644 index c04c274..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Api/Api+LittleGame.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// Api+LittleGame.h -// xplan-ios -// -// Created by 冯硕 on 2022/1/21. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (LittleGame) -/// 获取小游戏列表 -/// @param completion 完成 -+ (void)getLittleGameList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -/// 获取小游戏的code -/// @param completion 完成 -/// @param uid 用户的uid -+ (void)getSudGameCode:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; - -/// 开始游戏检查 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param mgId 游戏的id -+ (void)startGameCheck:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid mgId:(NSString *)mgId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Api/Api+LittleGame.m b/YuMi/Modules/YMRoom/View/LittleGame/Api/Api+LittleGame.m deleted file mode 100644 index 3cf4689..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Api/Api+LittleGame.m +++ /dev/null @@ -1,36 +0,0 @@ -// -// Api+LittleGame.m -// xplan-ios -// -// Created by 冯硕 on 2022/1/21. -// - -#import "Api+LittleGame.h" - -@implementation Api (LittleGame) - -/// 获取小游戏列表 -/// @param roomUid 房主的 uid, 房间类型切换的时候传入 -/// @param completion 完成 -+ (void)getLittleGameList:(HttpRequestHelperCompletion)completion roomUid:(nonnull NSString *)roomUid { - [self makeRequest:@"miniGame/record/miniGameList" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, nil]; -} - - -/// 获取小游戏的code -/// @param completion 完成 -/// @param uid 用户的uid -+ (void)getSudGameCode:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - [self makeRequest:@"miniGame/getCode" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, nil]; -} - - -/// 开始游戏检查 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param mgId 游戏的id -+ (void)startGameCheck:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid mgId:(NSString *)mgId { - [self makeRequest:@"miniGame/room/startGameCheck" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, mgId, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.h b/YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.h deleted file mode 100644 index 40d6623..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// LittleGameInfoModel.h -// xplan-ios -// -// Created by 冯硕 on 2022/1/21. -// - -#import -@class LittleGameInfoItemModel; -NS_ASSUME_NONNULL_BEGIN - -@interface LittleGameInfoModel : PIBaseModel -///游戏ID -@property (nonatomic, copy) NSString *mgId; -///名称 -@property (nonatomic, copy) NSString *name; -///封面 -@property (nonatomic, copy) NSString *pic; -@property(nonatomic,copy) NSString *pic2; -///是否选择 -@property (nonatomic,assign) BOOL isSelect; -///游戏类型 ///SUD/BAISHUN -@property(nonatomic,copy) NSString *gameType; -@property(nonatomic,copy) NSString *configJson; -@property(nonatomic,strong) LittleGameInfoItemModel *gameItem; -@end - - - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.m b/YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.m deleted file mode 100644 index 79ec4df..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Model/LittleGameInfoModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// LittleGameInfoModel.m -// xplan-ios -// -// Created by 冯硕 on 2022/1/21. -// - -#import "LittleGameInfoModel.h" - -@implementation LittleGameInfoModel - -@end - - - - diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSData+RW.h b/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSData+RW.h deleted file mode 100644 index e4bc1cf..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSData+RW.h +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright © Sud.Tech - * https://sud.tech - */ - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface NSData (RW) - -#pragma mark - Hash -///============================================================================= -/// @name Hash -///========== -/** - Returns a lowercase NSString for md5 hash. - */ -- (NSString *)md5String; - -/** - Returns an NSData for md5 hash. - */ -- (NSData *)md5Data; - -/** -Returns a lowercase NSString for sha256 hash. -*/ -- (NSString *)sha256String; - -/** - Returns a lowercase NSString for sha1 hash. - */ -- (NSString *)sha1String; - -/** - Returns an NSData for sha256 hash. - */ -- (NSData *)sha256Data; - -#pragma mark - Encode and decode -///============================================================================= -/// @name Encode and decode -///============================================================================= - -/** - Returns string decoded in UTF8. - */ -- (nullable NSString *)utf8String; - -/** - Returns an NSString for base64 encoded. - */ -- (nullable NSString *)base64EncodedString; - -/** - Returns an NSData from base64 encoded string. - - @warning This method has been implemented in iOS7. - - @param base64EncodedString The encoded string. - */ -+ (nullable NSData *)dataWithBase64EncodedString:(NSString *)base64EncodedString; - -- (NSString *)base64EncodedStringWithWrapWidth:(NSUInteger)wrapWidth; - -/** - Returns an NSDictionary or NSArray for decoded self. - Returns nil if an error occurs. - */ -- (nullable id)jsonValueDecoded; - -#pragma mark - Encrypt and Decrypt -///============================================================================= -/// @name Encrypt and Decrypt -///============================================================================= - -/** - Returns an encrypted NSData using AES. - - @param key A key length of 16, 24 or 32 (128, 192 or 256bits). - - @param iv An initialization vector length of 16(128bits). - Pass nil when you don't want to use iv. - - @return An NSData encrypted, or nil if an error occurs. - */ -- (nullable NSData *)aesEncryptWithKey:(NSData *)key iv:(nullable NSData *)iv; - -/** - Returns an decrypted NSData using AES. - - @param key A key length of 16, 24 or 32 (128, 192 or 256bits). - - @param iv An initialization vector length of 16(128bits). - Pass nil when you don't want to use iv. - - @return An NSData decrypted, or nil if an error occurs. - */ -- (nullable NSData *)aesDecryptWithkey:(NSData *)key iv:(nullable NSData *)iv; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSData+RW.m b/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSData+RW.m deleted file mode 100644 index e4113f0..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSData+RW.m +++ /dev/null @@ -1,276 +0,0 @@ -/** - * Copyright © Sud.Tech - * https://sud.tech - */ - -#import "NSData+RW.h" -#include - - -@implementation NSData (RW) - -- (NSString *)md5String { - unsigned char result[CC_MD5_DIGEST_LENGTH]; - CC_MD5(self.bytes, (CC_LONG)self.length, result); - return [NSString stringWithFormat: - @"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", - result[0], result[1], result[2], result[3], - result[4], result[5], result[6], result[7], - result[8], result[9], result[10], result[11], - result[12], result[13], result[14], result[15] - ]; -} - -- (NSData *)md5Data { - unsigned char result[CC_MD5_DIGEST_LENGTH]; - CC_MD5(self.bytes, (CC_LONG)self.length, result); - return [NSData dataWithBytes:result length:CC_MD5_DIGEST_LENGTH]; -} - -- (NSString *)sha256String { - unsigned char result[CC_SHA256_DIGEST_LENGTH]; - CC_SHA256(self.bytes, (CC_LONG)self.length, result); - NSMutableString *hash = [NSMutableString - stringWithCapacity:CC_SHA256_DIGEST_LENGTH * 2]; - for (int i = 0; i < CC_SHA256_DIGEST_LENGTH; i++) { - [hash appendFormat:@"%02x", result[i]]; - } - return hash; -} - -- (NSString *)sha1String { - unsigned char result[CC_SHA1_DIGEST_LENGTH]; - CC_SHA1(self.bytes, (CC_LONG)self.length, result); - NSMutableString*hash = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2]; - for(int i = 0; i 0) { - return [[NSString alloc] initWithData:self encoding:NSUTF8StringEncoding]; - } - return @""; -} - -static const char base64EncodingTable[64] -= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static const short base64DecodingTable[256] = { - -2, -2, -2, -2, -2, -2, -2, -2, -2, -1, -1, -2, -1, -1, -2, -2, - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, - -1, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, 62, -2, -2, -2, 63, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -2, -2, -2, -2, -2, -2, - -2, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -2, -2, -2, -2, -2, - -2, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -2, -2, -2, -2, -2, - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2 -}; - -- (NSString *)base64EncodedString { - NSUInteger length = self.length; - if (length == 0) - return @""; - - NSUInteger out_length = ((length + 2) / 3) * 4; - uint8_t *output = malloc(((out_length + 2) / 3) * 4); - if (output == NULL) - return nil; - - const char *input = self.bytes; - NSInteger i, value; - for (i = 0; i < length; i += 3) { - value = 0; - for (NSInteger j = i; j < i + 3; j++) { - value <<= 8; - if (j < length) { - value |= (0xFF & input[j]); - } - } - NSInteger index = (i / 3) * 4; - output[index + 0] = base64EncodingTable[(value >> 18) & 0x3F]; - output[index + 1] = base64EncodingTable[(value >> 12) & 0x3F]; - output[index + 2] = ((i + 1) < length) - ? base64EncodingTable[(value >> 6) & 0x3F] - : '='; - output[index + 3] = ((i + 2) < length) - ? base64EncodingTable[(value >> 0) & 0x3F] - : '='; - } - - NSString *base64 = [[NSString alloc] initWithBytes:output - length:out_length - encoding:NSASCIIStringEncoding]; - free(output); - return base64; -} - -+ (NSData *)dataWithBase64EncodedString:(NSString *)base64EncodedString { - NSInteger length = base64EncodedString.length; - const char *string = [base64EncodedString cStringUsingEncoding:NSASCIIStringEncoding]; - if (string == NULL) - return nil; - - while (length > 0 && string[length - 1] == '=') - length--; - - NSInteger outputLength = length * 3 / 4; - NSMutableData *data = [NSMutableData dataWithLength:outputLength]; - if (data == nil) - return nil; - if (length == 0) - return data; - - uint8_t *output = data.mutableBytes; - NSInteger inputPoint = 0; - NSInteger outputPoint = 0; - while (inputPoint < length) { - char i0 = string[inputPoint++]; - char i1 = string[inputPoint++]; - char i2 = inputPoint < length ? string[inputPoint++] : 'A'; - char i3 = inputPoint < length ? string[inputPoint++] : 'A'; - - output[outputPoint++] = (base64DecodingTable[i0] << 2) - | (base64DecodingTable[i1] >> 4); - if (outputPoint < outputLength) { - output[outputPoint++] = ((base64DecodingTable[i1] & 0xf) << 4) - | (base64DecodingTable[i2] >> 2); - } - if (outputPoint < outputLength) { - output[outputPoint++] = ((base64DecodingTable[i2] & 0x3) << 6) - | base64DecodingTable[i3]; - } - } - - return data; -} - -- (id)jsonValueDecoded { - NSError *error = nil; - id value = [NSJSONSerialization JSONObjectWithData:self options:kNilOptions error:&error]; -// if (error) { -// NSLog(@"jsonValueDecoded error:%@", error); -// } - return value; -} - -- (NSData *)aesEncryptWithKey:(NSData *)key iv:(NSData *)iv { - return [self aesOperation:kCCEncrypt key:key iv:iv]; -} - -- (NSData *)aesDecryptWithkey:(NSData *)key iv:(NSData *)iv { - return [self aesOperation:kCCDecrypt key:key iv:iv]; -} - -- (nullable NSData *)aesOperation:(CCOperation)operation key:(NSData *)key iv:(nullable NSData *)iv { - if (key.length != 16 && key.length != 24 && key.length != 32) { - return nil; - } - if (iv.length != 16 && iv.length != 0) { - return nil; - } - - NSData *result = nil; - size_t bufferSize = self.length + kCCBlockSizeAES128; - void *buffer = malloc(bufferSize); - if (!buffer) return nil; - size_t encryptedSize = 0; - CCCryptorStatus cryptStatus = CCCrypt(operation, - kCCAlgorithmAES128, - kCCOptionPKCS7Padding, - key.bytes, - key.length, - iv.bytes, - self.bytes, - self.length, - buffer, - bufferSize, - &encryptedSize); - if (cryptStatus == kCCSuccess) { - result = [[NSData alloc]initWithBytes:buffer length:encryptedSize]; - free(buffer); - return result; - } else { - free(buffer); - return nil; - } -} - -- (NSString *)base64EncodedStringWithWrapWidth:(NSUInteger)wrapWidth -{ - //ensure wrapWidth is a multiple of 4 - wrapWidth = (wrapWidth / 4) * 4; - - const char lookup[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - - long long inputLength = [self length]; - const unsigned char *inputBytes = [self bytes]; - - long long maxOutputLength = (inputLength / 3 + 1) * 4; - maxOutputLength += wrapWidth? (maxOutputLength / wrapWidth) * 2: 0; - unsigned char *outputBytes = (unsigned char *)malloc(maxOutputLength); - - long long i; - long long outputLength = 0; - for (i = 0; i < inputLength - 2; i += 3) - { - outputBytes[outputLength++] = lookup[(inputBytes[i] & 0xFC) >> 2]; - outputBytes[outputLength++] = lookup[((inputBytes[i] & 0x03) << 4) | ((inputBytes[i + 1] & 0xF0) >> 4)]; - outputBytes[outputLength++] = lookup[((inputBytes[i + 1] & 0x0F) << 2) | ((inputBytes[i + 2] & 0xC0) >> 6)]; - outputBytes[outputLength++] = lookup[inputBytes[i + 2] & 0x3F]; - - //add line break - if (wrapWidth && (outputLength + 2) % (wrapWidth + 2) == 0) - { - outputBytes[outputLength++] = '\r'; - outputBytes[outputLength++] = '\n'; - } - } - - //handle left-over data - if (i == inputLength - 2) - { - // = terminator - outputBytes[outputLength++] = lookup[(inputBytes[i] & 0xFC) >> 2]; - outputBytes[outputLength++] = lookup[((inputBytes[i] & 0x03) << 4) | ((inputBytes[i + 1] & 0xF0) >> 4)]; - outputBytes[outputLength++] = lookup[(inputBytes[i + 1] & 0x0F) << 2]; - outputBytes[outputLength++] = '='; - } - else if (i == inputLength - 1) - { - // == terminator - outputBytes[outputLength++] = lookup[(inputBytes[i] & 0xFC) >> 2]; - outputBytes[outputLength++] = lookup[(inputBytes[i] & 0x03) << 4]; - outputBytes[outputLength++] = '='; - outputBytes[outputLength++] = '='; - } - - //truncate data to match actual output length - outputBytes = realloc(outputBytes, outputLength); - NSString *result = [[NSString alloc] initWithBytesNoCopy:outputBytes length:outputLength encoding:NSASCIIStringEncoding freeWhenDone:YES]; - -#if !__has_feature(objc_arc) - [result autorelease]; -#endif - - return (outputLength >= 4)? result: nil; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSString+RW.h b/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSString+RW.h deleted file mode 100644 index 85dc0f7..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSString+RW.h +++ /dev/null @@ -1,272 +0,0 @@ -/** - * Copyright © Sud.Tech - * https://sud.tech - */ - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface NSString (RW) -#pragma mark - Hash -///============================================================================= -/// @name Hash -///============================================================================= - -/** - Returns a lowercase NSString for md5 hash. - */ -- (nullable NSString *)md5String; - -/** - Returns a lowercase NSString for sha256 hash. - */ -- (nullable NSString *)sha256String; - -/** - Returns a lowercase NSString for sha1 hash. - */ -- (nullable NSString *)sha1String; - -/** - 对self进行AES加密（返回加密后的Base64字符） - - @param key A key length of 16, 24 or 32 (128, 192 or 256bits). - @param iv An initialization vector length of 16(128bits). - Pass nil when you don't want to use iv. - - @return An NSString encrypted, or nil if an error occurs. - */ -- (nullable NSString *)aesEncryptWithKey:(NSString *)key iv:(nullable NSString *)iv; - -/** - 对self进行AES解密（self为Base64字符） - - @param key A key length of 16, 24 or 32 (128, 192 or 256bits). - @param iv An initialization vector length of 16(128bits). - Pass nil when you don't want to use iv. - - @return An NSString encrypted, or nil if an error occurs. - */ -- (nullable NSString *)aesDecryptWithkey:(NSString *)key iv:(nullable NSString *)iv; - -#pragma mark - Encode and decode -///============================================================================= -/// @name Encode and decode -///============================================================================= - -/** - Returns an NSString for base64 encoded. - */ -- (nullable NSString *)base64EncodedString; - -/** - Returns an NSString from base64 encoded string. - @param base64EncodedString string. - */ -+ (nullable NSString *)stringWithBase64EncodedString:(NSString *)base64EncodedString; - -/** - URL encode a string in utf-8. - @return the encoded string. - */ -- (NSString *)stringByURLEncode; - -/** - URL decode a string in utf-8. - @return the decoded string. - */ -- (NSString *)stringByURLDecode; - -#pragma mark - Drawing -///============================================================================= -/// @name Drawing -///============================================================================= - -/** - * 获取文本标签size - * 截断方式为NSLineBreakByWordWrapping, 对齐方式默认为NSTextAlignmentLeft - * @param font 字体 - * @param size 限定范围 - * - * @return 返回文本标签实际size - */ -- (CGSize)textSizeWithFont:(UIFont *)font constrainedToSize:(CGSize)size; - -/** - * 获取文本标签size - * 对齐方式为NSTextAlignmentLeft - * @param font 字体 - * @param size 限定范围 - * @param lineBreakMode 截断方式 - * - * @return 返回文本标签实际size - */ -- (CGSize)textSizeWithFont:(UIFont *)font constrainedToSize:(CGSize)size withLineBreakingMode:(NSLineBreakMode)lineBreakMode; - -/** - * 获取文本标签size - * - * @param font 字体 - * @param size 限定范围 - * @param lineBreakingMode 截断方式 - * @param textAlignment 文字对齐类型 - * - * @return 返回文本标签实际size - */ -- (CGSize)textSizeWithFont:(UIFont *)font constrainedToSize:(CGSize)size withLineBreakingMode:(NSLineBreakMode)lineBreakingMode withTextAlignment:(NSTextAlignment)textAlignment; - - -/** - Returns the width of the string if it were to be rendered with the specified - font on a single line. - - @param font The font to use for computing the string width. - - @return The width of the resulting string's bounding box. These values may be - rounded up to the nearest whole number. - */ -- (CGFloat)widthForFont:(UIFont *)font; - -/** - Returns the height of the string if it were rendered with the specified constraints. - - @param font The font to use for computing the string size. - - @param width The maximum acceptable width for the string. This value is used - to calculate where line breaks and wrapping would occur. - - @return The height of the resulting string's bounding box. These values - may be rounded up to the nearest whole number. - */ -- (CGFloat)heightForFont:(UIFont *)font width:(CGFloat)width; - - -#pragma mark - Utilities -///============================================================================= -/// @name Utilities -///============================================================================= - -/** - Returns a new UUID NSString - e.g. "D1178E50-2A4D-4F1F-9BD3-F6AAB00E06B1" - */ -+ (NSString *)stringWithUUID; - -/** - Trim blank characters (space and newline) in head and tail. - @return the trimmed string. - */ -- (NSString *)stringByTrim; - -/** - nil, @"", @" ", @"\n" will Returns NO; otherwise Returns YES. - */ -- (BOOL)isNotBlank; - -/** - Returns YES if the target string is contained within the receiver. - @param string A string to test the the receiver. - - @discussion Apple has implemented this method in iOS8. - */ -- (BOOL)containsString:(NSString *)string; - -/** - Returns YES if the target string is contained within the receiver. - @param string A string to test the the receiver. - @param mask NSStringCompareOptions - - */ -- (BOOL)containsString:(NSString *)string options:(NSStringCompareOptions)mask; - -/** - Returns YES if the target string is hasPrefix within the receiver. - default NSCaseInsensitiveSearch - @param string A string to test the the receiver. - - */ -- (BOOL)hasInsensitivePrefix:(NSString *)string; - -/** - Returns YES if the target string is hasPrefix within the receiver. - @param string A string to test the the receiver. - @param mask NSStringCompareOptions - - */ -- (BOOL)hasPrefix:(NSString *)string options:(NSStringCompareOptions)mask; - -/** - Returns YES if the target CharacterSet is contained within the receiver. - @param set A character set to test the the receiver. - */ -- (BOOL)containsCharacterSet:(NSCharacterSet *)set; - -/** - Returns an NSData using UTF-8 encoding. - */ -- (NSData *)dataValue; - -/** - Returns NSMakeRange(0, self.length). - */ -- (NSRange)rangeOfAll; - -/** - Returns an NSDictionary/NSArray which is decoded from receiver. - Returns nil if an error occurs. - - e.g. NSString: @"{"name":"a","count":2}" => NSDictionary: @[@"name":@"a",@"count":@2] - */ -- (id)jsonValueDecoded; - -+ (NSString *) jsonStringWithDictionary:(NSDictionary *)dictionary; - - -//密码需8-16位，至少包含字母、数字、符号2种组合 -+(BOOL)checkIsHaveNumAndLetter:(NSString*)sting; - -/** - 中国电信号段为：133、149、153、173、177。还有180、181、189、199。 - - 中国联通号段：130、131、132、145、155、156、166、171、175、176、185、186、166。 - - 中国移动号段：134(0-8)、135、136、137、138、139、147、150、151、152、157、158、159、172、178、182、183、184、187、188、198 - */ -///判断是否为手机号 -- (BOOL)isPhoneNum; - -///判断是否包含中文 -- (BOOL)isContainsChinese; - -///包含特殊字符Special characters -- (BOOL)isContainsSpecialCharacters; - -///是否是纯数字 -+ (BOOL)isAllNumText:(NSString *)str; - -///纯中文字符串 -+ (BOOL)isChineseCharacter:(NSString*)source; - -///纯英文字符串 -+ (BOOL)isEnglishCharacter:(NSString*)source; - -///纯特殊字符 -+ (BOOL)isAllCharacterString:(NSString *)string; - -/// 包含emoji -+ (BOOL)stringContainsEmoji:(NSString *)string; - -/// 是否 email -+ (BOOL)isEmail:(NSString *)string; - -///去除字符串两端的空格和换行符 -- (NSString *)RW_stringByTrimmingCharacters; - -/// 汉字转成拼音的方法 -+ (NSString *)chineseTransformToPinyin:(NSString *)chinese; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSString+RW.m b/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSString+RW.m deleted file mode 100644 index 62f427f..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/NSString+RW.m +++ /dev/null @@ -1,530 +0,0 @@ -/** - * Copyright © Sud.Tech - * https://sud.tech - */ - -#import "NSString+RW.h" -#import "NSData+RW.h" - - -@implementation NSString (RW) - - -(NSString *)md5String { - return [[self dataUsingEncoding:NSUTF8StringEncoding] md5String]; -} - -- (NSString *)sha256String { - return [[self dataUsingEncoding:NSUTF8StringEncoding] sha256String]; -} - -- (NSString *)sha1String { - return [[self dataUsingEncoding:NSUTF8StringEncoding] sha1String]; -} - -- (nullable NSString *)aesEncryptWithKey:(NSString *)key iv:(nullable NSString *)iv { - NSData * data = [self dataUsingEncoding:NSUTF8StringEncoding]; - data = [data aesEncryptWithKey:[key dataUsingEncoding:NSUTF8StringEncoding] - iv:[iv dataUsingEncoding:NSUTF8StringEncoding]]; - //一般使用Base64, 使用UTF-8,一般会返回nil - return [data base64EncodedString]; -} - -- (nullable NSString *)aesDecryptWithkey:(NSString *)key iv:(nullable NSString *)iv { - NSData * data = [NSData dataWithBase64EncodedString:self]; - data = [data aesDecryptWithkey:[key dataUsingEncoding:NSUTF8StringEncoding] - iv:[iv dataUsingEncoding:NSUTF8StringEncoding]]; - NSString * result = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; - return result; -} - -- (NSString *)base64EncodedString { - return [[self dataUsingEncoding:NSUTF8StringEncoding] base64EncodedString]; -} - -+ (NSString *)stringWithBase64EncodedString:(NSString *)base64EncodedString { - NSData *data = [NSData dataWithBase64EncodedString:base64EncodedString]; - return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; -} - -- (NSString *)stringByURLEncode { - if ([self respondsToSelector:@selector(stringByAddingPercentEncodingWithAllowedCharacters:)]) { - - static NSString * const kAFCharactersGeneralDelimitersToEncode = @":#[]@"; // does not include "?" or "/" due to RFC 3986 - Section 3.4 - static NSString * const kAFCharactersSubDelimitersToEncode = @"!$&'()*+,;="; - - NSMutableCharacterSet * allowedCharacterSet = [[NSCharacterSet URLQueryAllowedCharacterSet] mutableCopy]; - [allowedCharacterSet removeCharactersInString:[kAFCharactersGeneralDelimitersToEncode stringByAppendingString:kAFCharactersSubDelimitersToEncode]]; - static NSUInteger const batchSize = 50; - - NSUInteger index = 0; - NSMutableString *escaped = @"".mutableCopy; - - while (index < self.length) { - NSUInteger length = MIN(self.length - index, batchSize); - NSRange range = NSMakeRange(index, length); - // To avoid breaking up character sequences such as 👴🏻👮🏽 - range = [self rangeOfComposedCharacterSequencesForRange:range]; - NSString *substring = [self substringWithRange:range]; - NSString *encoded = [substring stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacterSet]; - [escaped appendString:encoded]; - - index += range.length; - } - return escaped; - } else { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - CFStringEncoding cfEncoding = CFStringConvertNSStringEncodingToEncoding(NSUTF8StringEncoding); - NSString *encoded = (__bridge_transfer NSString *) - CFURLCreateStringByAddingPercentEscapes( - kCFAllocatorDefault, - (__bridge CFStringRef)self, - NULL, - CFSTR("!#$&'()*+,/:;=?@[]"), - cfEncoding); - return encoded; -#pragma clang diagnostic pop - } -} - -- (NSString *)stringByURLDecode { - if ([self respondsToSelector:@selector(stringByRemovingPercentEncoding)]) { - return [self stringByRemovingPercentEncoding]; - } else { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - CFStringEncoding en = CFStringConvertNSStringEncodingToEncoding(NSUTF8StringEncoding); - NSString *decoded = [self stringByReplacingOccurrencesOfString:@"+" - withString:@" "]; - decoded = (__bridge_transfer NSString *) - CFURLCreateStringByReplacingPercentEscapesUsingEncoding( - NULL, - (__bridge CFStringRef)decoded, - CFSTR(""), - en); - return decoded; -#pragma clang diagnostic pop - } -} - -- (CGSize)textSizeWithFont:(UIFont *)font constrainedToSize:(CGSize)size -{ - return [self textSizeWithFont:font constrainedToSize:size withLineBreakingMode:NSLineBreakByWordWrapping]; -} - -- (CGSize)textSizeWithFont:(UIFont *)font constrainedToSize:(CGSize)size withLineBreakingMode:(NSLineBreakMode)lineBreakMode { - return [self textSizeWithFont:font constrainedToSize:size withLineBreakingMode:NSLineBreakByWordWrapping withTextAlignment:NSTextAlignmentLeft]; -} - -- (CGSize)textSizeWithFont:(UIFont *)font constrainedToSize:(CGSize)size withLineBreakingMode:(NSLineBreakMode)lineBreakingMode withTextAlignment:(NSTextAlignment)textAlignment -{ - CGSize textSize; - - NSMutableParagraphStyle *style = nil; - style = [[NSMutableParagraphStyle alloc] init]; - style.lineBreakMode = lineBreakingMode; - style.alignment = textAlignment; - - NSMutableDictionary *attributes = [NSMutableDictionary new]; - attributes[NSFontAttributeName] = font; - [attributes setValue:style forKey:NSParagraphStyleAttributeName]; - - if (CGSizeEqualToSize(size, CGSizeZero)) { - textSize = [self sizeWithAttributes:attributes]; - } - else { - //NSStringDrawingTruncatesLastVisibleLine如果文本内容超出指定的矩形限制，文本将被截去并在最后一个字符后加上省略号。 如果指定了NSStringDrawingUsesLineFragmentOrigin选项，则该选项被忽略 NSStringDrawingUsesFontLeading计算行高时使用行间距。（译者注：字体大小+行间距=行高） - NSStringDrawingOptions option = NSStringDrawingTruncatesLastVisibleLine | NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading; - CGRect rect = [self boundingRectWithSize:size - options:option - attributes:attributes - context:nil]; - textSize = rect.size; - } - - return textSize; -} - -- (CGFloat)widthForFont:(UIFont *)font { - CGSize size = [self textSizeWithFont:font constrainedToSize:CGSizeMake(HUGE, HUGE)]; - return size.width; -} - - -- (CGFloat)heightForFont:(UIFont *)font width:(CGFloat)width { - CGSize size = [self textSizeWithFont:font constrainedToSize:CGSizeMake(width, HUGE)]; - return size.height; -} - - -+ (NSString *)stringWithUUID { - CFUUIDRef uuid = CFUUIDCreate(NULL); - CFStringRef string = CFUUIDCreateString(NULL, uuid); - CFRelease(uuid); - return (__bridge_transfer NSString *)string; -} - -- (NSString *)stringByTrim { - NSCharacterSet *set = [NSCharacterSet whitespaceAndNewlineCharacterSet]; - return [self stringByTrimmingCharactersInSet:set]; -} - -- (BOOL)isNotBlank { - NSCharacterSet *blank = [NSCharacterSet whitespaceAndNewlineCharacterSet]; - for (NSInteger i = 0; i < self.length; ++i) { - unichar c = [self characterAtIndex:i]; - if (![blank characterIsMember:c]) { - return YES; - } - } - return NO; -} - -- (BOOL)containsString:(NSString *)string { - if(![string isKindOfClass:[NSString class]])return NO; - if (string == nil) return NO; - return [self rangeOfString:string].location != NSNotFound; -} - -- (BOOL)containsString:(NSString *)string options:(NSStringCompareOptions)mask{ - if (string == nil) return NO; - return [self rangeOfString:string options:mask].location != NSNotFound; -} - -- (BOOL)hasInsensitivePrefix:(NSString *)string{ - if (string == nil) return NO; - NSString *commonStr = [self commonPrefixWithString:string options:NSCaseInsensitiveSearch]; - if ([commonStr caseInsensitiveCompare:string] == NSOrderedSame) { - return YES; - }else{ - return NO; - } -} - -- (BOOL)hasPrefix:(NSString *)string options:(NSStringCompareOptions)mask{ - if (string == nil) return NO; - NSString *commonStr = [self commonPrefixWithString:string options:mask]; - if ([commonStr caseInsensitiveCompare:string] == NSOrderedSame) { - return YES; - }else{ - return NO; - } -} - -- (BOOL)containsCharacterSet:(NSCharacterSet *)set { - if (set == nil) return NO; - return [self rangeOfCharacterFromSet:set].location != NSNotFound; -} - -- (NSData *)dataValue { - return [self dataUsingEncoding:NSUTF8StringEncoding]; -} - -- (NSRange)rangeOfAll { - return NSMakeRange(0, self.length); -} - -- (id)jsonValueDecoded { - return [[self dataValue] jsonValueDecoded]; -} - - --(NSString*)coverBodyWithLength:(NSInteger)length -{ - NSMutableString* body = [NSMutableString new]; - for(int i=0;i?,.\\/]) 表示含英文的特殊字符，里面的符合可以自动补充或删除 -// -// 5、[^\\u4e00-\\u9fa5] 表示不允许有中文 ；表示允许有中文的，即：[\\u4e00-\\u9fa5] -// -// 6、{6,12} 表示长度要求，6~12位 -// 表示的是不含中文的特殊字符，以及空格与回车，里面的符合可以自动补充或删除； -// NSString *regex = @"^(?!.*[！·（）{}【】“”：；，》￥、。‘’——\\s-……%\\n])(?=.*[a-zA-Z])(?=.*\\d)(?=.*[~!@#$%^&*()_+`\\-={}:\";'<>?,.\\/])[^\\u4e00-\\u9fa5]{8,16}$"; - - -// -// //数字条件 -// NSRegularExpression *tNumRegularExpression = [NSRegularExpression regularExpressionWithPattern:@"[0-9]" options:NSRegularExpressionCaseInsensitive error:nil]; -// -// //符合数字条件的有几个字节 -// NSUInteger tNumMatchCount = [tNumRegularExpression numberOfMatchesInString:sting -// options:NSMatchingReportProgress -// range:NSMakeRange(0, sting.length)]; -// //英文字条件 -// NSRegularExpression *tLetterRegularExpression = [NSRegularExpression regularExpressionWithPattern:@"[A-Za-z]" options:NSRegularExpressionCaseInsensitive error:nil]; -// -// //英文特殊字符条件 -// NSRegularExpression *specialRegularExpression = [NSRegularExpression regularExpressionWithPattern:@"[~!@#$%^&*()_+`\\-={}[]:\";'<>?,.\\/！·（）{}【】“”：；，》￥、。‘’——\\s-……%\\n]" options:NSRegularExpressionCaseInsensitive error:nil]; -// -// //符合英文字条件的有几个字节 -// NSUInteger tLetterMatchCount = [tLetterRegularExpression numberOfMatchesInString:sting options:NSMatchingReportProgress range:NSMakeRange(0, sting.length)]; -// if (tNumMatchCount == sting.length) { //全部符合数字，表示沒有英文 -// return 1; -// -// } else if (tLetterMatchCount == sting.length) { //全部符合英文，表示沒有数字 -// return 2; -// -// } else if (tNumMatchCount + tLetterMatchCount == sting.length) { //符合英文和符合数字条件的相加等于密码长度 -// return 3; -// -// }else { //可能包含标点符号的情況，或是包含非英文的文字 -// return 4; -// } -} - - -- (BOOL)isPhoneNum -{ - NSString *MOBILE = @"^1(3[0-9]|4[579]|5[0-35-9]|6[6]|7[0-35-9]|8[0-9]|9[89])\\d{8}$"; - NSPredicate *regextestmobile = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", MOBILE]; - return [regextestmobile evaluateWithObject:self]; -} - --(BOOL)isContainsChinese{ - - for(int i=0; i< [self length];i++) - { - int a = [self characterAtIndex:i]; - if( a > 0x4E00 && a < 0x9FFF) - { - return YES; - } - } - return NO; -} - -- (BOOL)isContainsSpecialCharacters{ - - NSString *str =@"^[A-Za-z0-9\\u4e00-\u9fa5]+$"; - NSPredicate* emailTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", str]; - if (![emailTest evaluateWithObject:self]) { - return YES; - } - return NO; -} - -//是否是纯数字 -+ (BOOL)isAllNumText:(NSString *)str{ - - NSString *regex =@"[0-9]*"; - - NSPredicate *pred = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",regex]; - - if ([pred evaluateWithObject:str]) { - - return YES; - - } - - return NO; - -} - -/// 是否 email -+ (BOOL)isEmail:(NSString *)string{ - NSString *pattern = @"^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,}$"; - NSPredicate *regexTest = [NSPredicate predicateWithFormat:@"SELF MATCHES[c] %@", pattern]; - return [regexTest evaluateWithObject:string]; -} - -+ (BOOL)isChineseCharacter:(NSString*)source { - - NSString *regex = @"^[\\u4E00-\\u9FEA]+$"; - - return ([source rangeOfString:regex options:NSRegularExpressionSearch].length>0); - -} - -+ (BOOL)isEnglishCharacter:(NSString*)source { - - NSString *upperRegex = @"^[\\u0041-\\u005A]+$"; - - NSString *lowerRegex = @"^[\\u0061-\\u007A]+$"; - - BOOL isEnglish = (([source rangeOfString:upperRegex options:NSRegularExpressionSearch].length>0) || ([source rangeOfString:lowerRegex options:NSRegularExpressionSearch].length>0)); - - return isEnglish; - -} - -+ (BOOL)isAllCharacterString:(NSString *)string -{ - NSString *regex = @"[~`!@#$%^&*()_+-=[]|{};':\",./<>?]{,}/";//规定的特殊字符，可以自己随意添加 - - //计算字符串长度 - NSInteger str_length = [string length]; - - NSInteger allIndex = 0; - for (int i = 0; i 1){ - const unichar ls = [substring characterAtIndex:1]; - const int uc = ((hs - 0xd800) * 0x400) + (ls - 0xdc00) + 0x10000; - if (0x1d000 <= uc && uc <= 0x1f918){ - returnValue = YES; - } - } - }else if (substring.length > 1){ - - const unichar ls = [substring characterAtIndex:1]; - if (ls == 0x20e3 || ls == 0xFE0F || ls == 0xd83c){ - returnValue = YES; - } - }else{ - if (0x2100 <= hs && hs <= 0x27ff){ - - if (0x278b <= hs && 0x2792 >= hs){ - returnValue = NO; - }else{ - returnValue = YES; - } - - }else if (0x2B05 <= hs && hs <= 0x2b07){ - returnValue = YES; - }else if (0x2934 <= hs && hs <= 0x2935){ - returnValue = YES; - }else if (0x3297 <= hs && hs <= 0x3299){ - returnValue = YES; - }else if (hs == 0xa9 || hs == 0xae || hs == 0x303d || hs == 0x3030 || hs == 0x2b55 || hs == 0x2b1c || hs == 0x2b1b || hs == 0x2b50 || hs == 0xd83e){ - returnValue = YES; - } - } - - }]; - - return returnValue; -} - - -- (NSString *)RW_stringByTrimmingCharacters{ - return [self stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; -} - -+ (NSString *)chineseTransformToPinyin:(NSString *)chinese{ - CFStringRef hanzi = (__bridge CFStringRef)(chinese); - CFMutableStringRef string = CFStringCreateMutableCopy(NULL, 0, hanzi); - - // Boolean CFStringTransform(CFMutableStringRef string, CFRange *range, CFStringRef transform, Boolean reverse); - //string 为要转换的字符串 - // range 要转换的范围，NULL 则为全部 - //transform 要进行怎么样的转换 //kCFStringTransformMandarinLatin 将汉字转拼音 - //reverse 是否支持逆向转换 - CFStringTransform(string, NULL, kCFStringTransformMandarinLatin, NO); - - //kCFStringTransformStripDiacritics去掉声调 - CFStringTransform(string, NULL, kCFStringTransformStripDiacritics, NO); - - NSString * pinyin = (NSString *) CFBridgingRelease(string); - //将中间分隔符号去掉 - pinyin = [pinyin stringByReplacingOccurrencesOfString:@" " withString: @""]; - - return pinyin; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIColor+RW.h b/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIColor+RW.h deleted file mode 100644 index 0d8ab36..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIColor+RW.h +++ /dev/null @@ -1,93 +0,0 @@ -/** - * Copyright © Sud.Tech - * https://sud.tech - */ - -#import - -NS_ASSUME_NONNULL_BEGIN - -#ifndef RGBA -#define RGBA(r, g, b, a) [UIColor colorWithRed:r/255.0f green:g/255.0f blue:b/255.0f alpha:a] -#endif - -#ifndef RGB -#define RGB(r, g, b) RGBA(r, g, b, 1.0f) -#endif - -/* - Create UIColor with a hex string. - Example: UIColorHex(0xF0F), UIColorHex(66ccff), UIColorHex(#66CCFF88) - - Valid format: #RGB #RGBA #RRGGBB #RRGGBBAA 0xRGB ... - The `#` or "0x" sign is not required. - */ -#ifndef UIColorHex -#define UIColorHex(_hex_) [UIColor RW_colorWithHexString:((__bridge NSString *)CFSTR(#_hex_))] -#endif - - -/** - * 所有方法前面全部加pawf_, 避免与其他接入的库的category重名导致未知问题. - * 注: colorWithHexString 与接入的某个库有冲突 - */ -@interface UIColor (RW) - -#pragma mark - Create a UIColor Object -///============================================================================= -/// @name Creating a UIColor Object -///============================================================================= - -/** -Creates and returns a color object using the hex RGB color values. - -@param rgbValue The rgb value such as 0x66ccff. - -@return The color object. The color information represented by this -object is in the device RGB colorspace. -*/ -+ (UIColor *)RW_colorWithRGB:(uint32_t)rgbValue; - -/** - Creates and returns a color object using the hex RGBA color values. - - @param rgbaValue The rgb value such as 0x66ccffff. - -@return The color object. The color information represented by this -object is in the device RGB colorspace. - */ -+ (UIColor *)RW_colorWithRGBA:(uint32_t)rgbaValue; - -/** - Creates and returns a color object using the specified opacity and RGB hex value. - - @param rgbValue The rgb value such as 0x66CCFF. - - @param alpha The opacity value of the color object, - specified as a value from 0.0 to 1.0. - - @return The color object. The color information represented by this - object is in the device RGB colorspace. - */ -+ (UIColor *)RW_colorWithRGB:(uint32_t)rgbValue alpha:(CGFloat)alpha; - -/** - Creates and returns a color object from hex string. - - @discussion: - Valid format: #RGB #RGBA #RRGGBB #RRGGBBAA 0xRGB ... - The `#` or "0x" sign is not required. - The alpha will be set to 1.0 if there is no alpha component. - It will return nil when an error occurs in parsing. - - Example: @"0xF0F", @"66ccff", @"#66CCFF88" - - @param hexStr The hex string value for the new color. - - @return An UIColor object from string, or nil if an error occurs. - */ -+ (nullable UIColor *)RW_colorWithHexString:(NSString *)hexStr; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIColor+RW.m b/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIColor+RW.m deleted file mode 100644 index fef8133..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIColor+RW.m +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright © Sud.Tech - * https://sud.tech - */ - -#import "UIColor+RW.h" -#import "NSString+RW.h" - - -@implementation UIColor (RW) - -+ (UIColor *)RW_colorWithRGB:(uint32_t)rgbValue { - return [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16) / 255.0f - green:((rgbValue & 0xFF00) >> 8) / 255.0f - blue:(rgbValue & 0xFF) / 255.0f - alpha:1]; -} - -+ (UIColor *)RW_colorWithRGBA:(uint32_t)rgbaValue { - return [UIColor colorWithRed:((rgbaValue & 0xFF000000) >> 24) / 255.0f - green:((rgbaValue & 0xFF0000) >> 16) / 255.0f - blue:((rgbaValue & 0xFF00) >> 8) / 255.0f - alpha:(rgbaValue & 0xFF) / 255.0f]; -} - -+ (UIColor *)rw_colorWithRGB:(uint32_t)rgbValue alpha:(CGFloat)alpha { - return [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16) / 255.0f - green:((rgbValue & 0xFF00) >> 8) / 255.0f - blue:(rgbValue & 0xFF) / 255.0f - alpha:alpha]; -} - -+ (instancetype)RW_colorWithHexString:(NSString *)hexStr { - CGFloat r, g, b, a; - if (hexStrToRGBA(hexStr, &r, &g, &b, &a)) { - return [UIColor colorWithRed:r green:g blue:b alpha:a]; - } - return nil; -} - -static inline NSUInteger hexStrToInt(NSString *str) { - uint32_t result = 0; - sscanf([str UTF8String], "%X", &result); - return result; -} - -static BOOL hexStrToRGBA(NSString *str, - CGFloat *r, CGFloat *g, CGFloat *b, CGFloat *a) { - str = [[str stringByTrim] uppercaseString]; - if ([str hasPrefix:@"#"]) { - str = [str substringFromIndex:1]; - } else if ([str hasPrefix:@"0X"]) { - str = [str substringFromIndex:2]; - } - - NSUInteger length = [str length]; - // RGB RGBA RRGGBB RRGGBBAA - if (length != 3 && length != 4 && length != 6 && length != 8) { - return NO; - } - - //RGB,RGBA,RRGGBB,RRGGBBAA - if (length < 5) { - *r = hexStrToInt([str substringWithRange:NSMakeRange(0, 1)]) / 255.0f; - *g = hexStrToInt([str substringWithRange:NSMakeRange(1, 1)]) / 255.0f; - *b = hexStrToInt([str substringWithRange:NSMakeRange(2, 1)]) / 255.0f; - if (length == 4) *a = hexStrToInt([str substringWithRange:NSMakeRange(3, 1)]) / 255.0f; - else *a = 1; - } else { - *r = hexStrToInt([str substringWithRange:NSMakeRange(0, 2)]) / 255.0f; - *g = hexStrToInt([str substringWithRange:NSMakeRange(2, 2)]) / 255.0f; - *b = hexStrToInt([str substringWithRange:NSMakeRange(4, 2)]) / 255.0f; - if (length == 8) *a = hexStrToInt([str substringWithRange:NSMakeRange(6, 2)]) / 255.0f; - else *a = 1; - } - return YES; -} - - - -@end diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIImage+RW.h b/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIImage+RW.h deleted file mode 100644 index 9500943..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIImage+RW.h +++ /dev/null @@ -1,322 +0,0 @@ -/** - * Copyright © Sud.Tech - * https://sud.tech - */ - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface UIImage (RW) - -#pragma mark - Create image -///============================================================================= -/// @name Create image -///============================================================================= - -/** - Create an animated image with GIF data. After created, you can access - the images via property '.images'. If the data is not animated gif, this - function is same as [UIImage imageWithData:data scale:scale]; - - @discussion It has a better display performance, but costs more memory - (width * height * frames Bytes). It only suited to display small - gif such as animated emoticon. If you want to display large gif, - see `YYImage`. - - @param data GIF data. - - @param scale The scale factor - - @return A new image created from GIF, or nil when an error occurs. - */ -+ (nullable UIImage *)imageWithSmallGIFData:(NSData *)data scale:(CGFloat)scale; - -/** - Whether the data is animated GIF. - - @param data Image data - - @return Returns YES only if the data is gif and contains more than one frame, - otherwise returns NO. - */ -+ (BOOL)isAnimatedGIFData:(NSData *)data; - -/** - Whether the file in the specified path is GIF. - - @param path An absolute file path. - - @return Returns YES if the file is gif, otherwise returns NO. - */ -+ (BOOL)isAnimatedGIFFile:(NSString *)path; - -/** - Create an image from a PDF file data or path. - - @discussion If the PDF has multiple page, is just return's the first page's - content. Image's scale is equal to current screen's scale, size is same as - PDF's origin size. - - @param dataOrPath PDF data in `NSData`, or PDF file path in `NSString`. - - @return A new image create from PDF, or nil when an error occurs. - */ -+ (nullable UIImage *)imageWithPDF:(id)dataOrPath; - -/** - Create an image from a PDF file data or path. - - @discussion If the PDF has multiple page, is just return's the first page's - content. Image's scale is equal to current screen's scale. - - @param dataOrPath PDF data in `NSData`, or PDF file path in `NSString`. - - @param size The new image's size, PDF's content will be stretched as needed. - - @return A new image create from PDF, or nil when an error occurs. - */ -+ (nullable UIImage *)imageWithPDF:(id)dataOrPath size:(CGSize)size; - -/** - Create a square image from apple emoji. - - @discussion It creates a square image from apple emoji, image's scale is equal - to current screen's scale. The original emoji image in `AppleColorEmoji` font - is in size 160*160 px. - - @param emoji single emoji, such as @"😄". - - @param size image's size. - - @return Image from emoji, or nil when an error occurs. - */ -+ (nullable UIImage *)imageWithEmoji:(NSString *)emoji size:(CGFloat)size; - -/** - Create and return a 1x1 point size image with the given color. - - @param color The color. - */ -+ (nullable UIImage *)imageWithColor:(UIColor *)color; - -/** - Create and return a pure color image with the given color and size. - - @param color The color. - @param size New image's type. - */ -+ (nullable UIImage *)imageWithColor:(UIColor *)color size:(CGSize)size; - -/** - Create and return an image with custom draw code. - - @param size The image size. - @param drawBlock The draw block. - - @return The new image. - */ -+ (nullable UIImage *)imageWithSize:(CGSize)size drawBlock:(void (^)(CGContextRef context))drawBlock; - -#pragma mark - Image Info -///============================================================================= -/// @name Image Info -///============================================================================= - -/** - Whether this image has alpha channel. - */ -- (BOOL)hasAlphaChannel; - - -#pragma mark - Modify Image -///============================================================================= -/// @name Modify Image -///============================================================================= - -/** - Returns a new image which is scaled from this image. - The image will be stretched as needed. - - @param size The new size to be scaled, values should be positive. - - @return The new image with the given size. - */ -- (nullable UIImage *)imageByResizeToSize:(CGSize)size; - - -/** - Returns a new image which is cropped from this image. - - @param rect Image's inner rect. - - @return The new image, or nil if an error occurs. - */ -- (nullable UIImage *)imageByCropToRect:(CGRect)rect; - -/** - Returns a new image which is edge inset from this image. - - @param insets Inset (positive) for each of the edges, values can be negative to 'outset'. - - @param color Extend edge's fill color, nil means clear color. - - @return The new image, or nil if an error occurs. - */ -- (nullable UIImage *)imageByInsetEdge:(UIEdgeInsets)insets withColor:(nullable UIColor *)color; - -/** - Rounds a new image with a given corner size. - - @param radius The radius of each corner oval. Values larger than half the - rectangle's width or height are clamped appropriately to half - the width or height. - */ -- (nullable UIImage *)imageByRoundCornerRadius:(CGFloat)radius; - - -/// high speed get RoundCornerRadius Image -/// @param radius radius -- (UIImage *)imageByRoundCornerRadius2:(CGFloat)radius; -/** - Rounds a new image with a given corner size. - - @param radius The radius of each corner oval. Values larger than half the - rectangle's width or height are clamped appropriately to - half the width or height. - @param borderWidth The inset border line width. Values larger than half the rectangle's - width or height are clamped appropriately to half the width - or height. - - @param borderColor The border stroke color. nil means clear color. - */ -- (nullable UIImage *)imageByRoundCornerRadius:(CGFloat)radius - borderWidth:(CGFloat)borderWidth - borderColor:(nullable UIColor *)borderColor; - -/** - Rounds a new image with a given corner size. - - @param radius The radius of each corner oval. Values larger than half the - rectangle's width or height are clamped appropriately to - half the width or height. - - @param corners A bitmask value that identifies the corners that you want - rounded. You can use this parameter to round only a subset - of the corners of the rectangle. - - @param borderWidth The inset border line width. Values larger than half the rectangle's - width or height are clamped appropriately to half the width - or height. - - @param borderColor The border stroke color. nil means clear color. - - @param borderLineJoin The border line join. - */ -- (nullable UIImage *)imageByRoundCornerRadius:(CGFloat)radius - corners:(UIRectCorner)corners - borderWidth:(CGFloat)borderWidth - borderColor:(nullable UIColor *)borderColor - borderLineJoin:(CGLineJoin)borderLineJoin; - -/** - Returns a new rotated image (relative to the center). - - @param radians Rotated radians in counterclockwise.⟲ - - @param fitSize YES: new image's size is extend to fit all content. - NO: image's size will not change, content may be clipped. - */ -- (nullable UIImage *)imageByRotate:(CGFloat)radians fitSize:(BOOL)fitSize; - -/** - Returns a new image rotated counterclockwise by a quarter‑turn (90°). ⤺ - The width and height will be exchanged. - */ -- (nullable UIImage *)imageByRotateLeft90; - -/** - Returns a new image rotated clockwise by a quarter‑turn (90°). ⤼ - The width and height will be exchanged. - */ -- (nullable UIImage *)imageByRotateRight90; - -/** - Returns a new image rotated 180° . ↻ - */ -- (nullable UIImage *)imageByRotate180; - -/** - Returns a vertically flipped image. ⥯ - */ -- (nullable UIImage *)imageByFlipVertical; - -/** - Returns a horizontally flipped image. ⇋ - */ -- (nullable UIImage *)imageByFlipHorizontal; - -- (UIImage *)imageByGrayscale; - -/** - Applies a blur effect to this image. Suitable for blur any content. - */ -- (nullable UIImage *)imageByBlurSoft; - -/** - Applies a blur effect to this image. Suitable for blur any content except pure white. - (same as iOS Control Panel) - */ -- (nullable UIImage *)imageByBlurLight; - -/** - Applies a blur effect to this image. Suitable for displaying black text. - (same as iOS Navigation Bar White) - */ -- (nullable UIImage *)imageByBlurExtraLight; - -/** - Applies a blur effect to this image. Suitable for displaying white text. - (same as iOS Notification Center) - */ -- (nullable UIImage *)imageByBlurDark; - -- (UIImage *)imageByBlurWithTint:(UIColor *)tintColor; - -- (UIImage *)imageByTintColor:(UIColor *)color; - -/** - * 高斯模糊 - */ -+ (UIImage *)gaussianFilter:(UIImage *)originImage; -+ (UIImage *)blurryImage:(UIImage *)image withBlurLevel:(CGFloat)blur; -+ (UIImage *)blurryImage1:(UIImage *)image withBlurLevel:(CGFloat)blur; - -/** -* 拍照图片旋转 -*/ -- (UIImage *)normalizedImage; - -/// 合成两张图片，btmImg在底部，topImg在顶部，rect是顶部图片相对底部图片的位置 -+ (UIImage*)synthesisWithBottomImage:(UIImage *)btmImg topImage:(UIImage*)topImg withTopRect:(CGRect)rect; - -/** - * 指定图片大小压缩 -*/ -+ (UIImage *)compressImage:(UIImage *)image toByte:(NSUInteger)maxLength; - -/// 缩小图片到指定尺寸 -- (nullable UIImage*)scaleToSize:(CGSize)size; - - -/// 给图片加上标签 -- (UIImage*)addText:(NSString*)text - XPos:(int)xpos - YPos:(int)ypos - bgColor:(UIColor*)bgColor - textColor:(UIColor*)textColor; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIImage+RW.m b/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIImage+RW.m deleted file mode 100644 index 3fd0383..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/Category/UIImage+RW.m +++ /dev/null @@ -1,1040 +0,0 @@ -/** - * Copyright © Sud.Tech - * https://sud.tech - */ - -#import "UIImage+RW.h" -#import -#import -#import -#import - - -#ifndef LB_SWAP // swap two value -#define LB_SWAP(_a_, _b_) do { __typeof__(_a_) _tmp_ = (_a_); (_a_) = (_b_); (_b_) = _tmp_; } while (0) -#endif - -static NSTimeInterval _yy_CGImageSourceGetGIFFrameDelayAtIndex(CGImageSourceRef source, size_t index) { - NSTimeInterval delay = 0; - CFDictionaryRef dic = CGImageSourceCopyPropertiesAtIndex(source, index, NULL); - if (dic) { - CFDictionaryRef dicGIF = CFDictionaryGetValue(dic, kCGImagePropertyGIFDictionary); - if (dicGIF) { - NSNumber *num = CFDictionaryGetValue(dicGIF, kCGImagePropertyGIFUnclampedDelayTime); - if (num.doubleValue <= __FLT_EPSILON__) { - num = CFDictionaryGetValue(dicGIF, kCGImagePropertyGIFDelayTime); - } - delay = num.doubleValue; - } - CFRelease(dic); - } - - // http://nullsleep.tumblr.com/post/16524517190/animated-gif-minimum-frame-delay-browser-compatibility - if (delay < 0.02) delay = 0.1; - return delay; -} - -/// Convert degrees to radians. -static inline CGFloat DegreesToRadians(CGFloat degrees) { - return degrees * M_PI / 180; -} - -/// Convert radians to degrees. -static inline CGFloat RadiansToDegrees(CGFloat radians) { - return radians * 180 / M_PI; -} - - -@implementation UIImage (RW) - -+ (UIImage *)imageWithSmallGIFData:(NSData *)data scale:(CGFloat)scale { - CGImageSourceRef source = CGImageSourceCreateWithData((__bridge CFTypeRef)(data), NULL); - if (!source) return nil; - - size_t count = CGImageSourceGetCount(source); - if (count <= 1) { - CFRelease(source); - return [self.class imageWithData:data scale:scale]; - } - - NSUInteger frames[count]; - double oneFrameTime = 1 / 50.0; // 50 fps - NSTimeInterval totalTime = 0; - NSUInteger totalFrame = 0; - NSUInteger gcdFrame = 0; - for (size_t i = 0; i < count; i++) { - NSTimeInterval delay = _yy_CGImageSourceGetGIFFrameDelayAtIndex(source, i); - totalTime += delay; - NSInteger frame = lrint(delay / oneFrameTime); - if (frame < 1) frame = 1; - frames[i] = frame; - totalFrame += frames[i]; - if (i == 0) gcdFrame = frames[i]; - else { - NSUInteger frame = frames[i], tmp; - if (frame < gcdFrame) { - tmp = frame; frame = gcdFrame; gcdFrame = tmp; - } - while (true) { - tmp = frame % gcdFrame; - if (tmp == 0) break; - frame = gcdFrame; - gcdFrame = tmp; - } - } - } - NSMutableArray *array = [NSMutableArray new]; - for (size_t i = 0; i < count; i++) { - CGImageRef imageRef = CGImageSourceCreateImageAtIndex(source, i, NULL); - if (!imageRef) { - CFRelease(source); - return nil; - } - size_t width = CGImageGetWidth(imageRef); - size_t height = CGImageGetHeight(imageRef); - if (width == 0 || height == 0) { - CFRelease(source); - CFRelease(imageRef); - return nil; - } - - CGImageAlphaInfo alphaInfo = CGImageGetAlphaInfo(imageRef) & kCGBitmapAlphaInfoMask; - BOOL hasAlpha = NO; - if (alphaInfo == kCGImageAlphaPremultipliedLast || - alphaInfo == kCGImageAlphaPremultipliedFirst || - alphaInfo == kCGImageAlphaLast || - alphaInfo == kCGImageAlphaFirst) { - hasAlpha = YES; - } - // BGRA8888 (premultiplied) or BGRX8888 - // same as UIGraphicsBeginImageContext() and -[UIView drawRect:] - CGBitmapInfo bitmapInfo = kCGBitmapByteOrder32Host; - bitmapInfo |= hasAlpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaNoneSkipFirst; - CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB(); - CGContextRef context = CGBitmapContextCreate(NULL, width, height, 8, 0, space, bitmapInfo); - CGColorSpaceRelease(space); - if (!context) { - CFRelease(source); - CFRelease(imageRef); - return nil; - } - CGContextDrawImage(context, CGRectMake(0, 0, width, height), imageRef); // decode - CGImageRef decoded = CGBitmapContextCreateImage(context); - CFRelease(context); - if (!decoded) { - CFRelease(source); - CFRelease(imageRef); - return nil; - } - UIImage *image = [UIImage imageWithCGImage:decoded scale:scale orientation:UIImageOrientationUp]; - CGImageRelease(imageRef); - CGImageRelease(decoded); - if (!image) { - CFRelease(source); - return nil; - } - for (size_t j = 0, max = frames[i] / gcdFrame; j < max; j++) { - [array addObject:image]; - } - } - CFRelease(source); - UIImage *image = [self.class animatedImageWithImages:array duration:totalTime]; - return image; -} - -+ (BOOL)isAnimatedGIFData:(NSData *)data { - if (data.length < 16) return NO; - UInt32 magic = *(UInt32 *)data.bytes; - // http://www.w3.org/Graphics/GIF/spec-gif89a.txt - if ((magic & 0xFFFFFF) != '\0FIG') return NO; - CGImageSourceRef source = CGImageSourceCreateWithData((__bridge CFTypeRef)data, NULL); - if (!source) return NO; - size_t count = CGImageSourceGetCount(source); - CFRelease(source); - return count > 1; -} - -+ (BOOL)isAnimatedGIFFile:(NSString *)path { - if (path.length == 0) return NO; - const char *cpath = path.UTF8String; - FILE *fd = fopen(cpath, "rb"); - if (!fd) return NO; - - BOOL isGIF = NO; - UInt32 magic = 0; - if (fread(&magic, sizeof(UInt32), 1, fd) == 1) { - if ((magic & 0xFFFFFF) == '\0FIG') isGIF = YES; - } - fclose(fd); - return isGIF; -} - -+ (UIImage *)imageWithPDF:(id)dataOrPath { - return [self _yy_imageWithPDF:dataOrPath resize:NO size:CGSizeZero]; -} - -+ (UIImage *)imageWithPDF:(id)dataOrPath size:(CGSize)size { - return [self _yy_imageWithPDF:dataOrPath resize:YES size:size]; -} - -+ (UIImage *)imageWithEmoji:(NSString *)emoji size:(CGFloat)size { - if (emoji.length == 0) return nil; - if (size < 1) return nil; - - CGFloat scale = [UIScreen mainScreen].scale; - CTFontRef font = CTFontCreateWithName(CFSTR("AppleColorEmoji"), size * scale, NULL); - if (!font) return nil; - - NSAttributedString *str = [[NSAttributedString alloc] initWithString:emoji attributes:@{ (__bridge id)kCTFontAttributeName:(__bridge id)font, (__bridge id)kCTForegroundColorAttributeName:(__bridge id)[UIColor whiteColor].CGColor }]; - CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); - CGContextRef ctx = CGBitmapContextCreate(NULL, size * scale, size * scale, 8, 0, colorSpace, kCGBitmapByteOrderDefault | kCGImageAlphaPremultipliedFirst); - CGContextSetInterpolationQuality(ctx, kCGInterpolationHigh); - CTLineRef line = CTLineCreateWithAttributedString((__bridge CFTypeRef)str); - CGRect bounds = CTLineGetBoundsWithOptions(line, kCTLineBoundsUseGlyphPathBounds); - CGContextSetTextPosition(ctx, 0, -bounds.origin.y); - CTLineDraw(line, ctx); - CGImageRef imageRef = CGBitmapContextCreateImage(ctx); - UIImage *image = [[UIImage alloc] initWithCGImage:imageRef scale:scale orientation:UIImageOrientationUp]; - - CFRelease(font); - CGColorSpaceRelease(colorSpace); - CGContextRelease(ctx); - if (line)CFRelease(line); - if (imageRef) CFRelease(imageRef); - - return image; -} - -+ (UIImage *)_yy_imageWithPDF:(id)dataOrPath resize:(BOOL)resize size:(CGSize)size { - CGPDFDocumentRef pdf = NULL; - if ([dataOrPath isKindOfClass:[NSData class]]) { - CGDataProviderRef provider = CGDataProviderCreateWithCFData((__bridge CFDataRef)dataOrPath); - pdf = CGPDFDocumentCreateWithProvider(provider); - CGDataProviderRelease(provider); - } else if ([dataOrPath isKindOfClass:[NSString class]]) { - pdf = CGPDFDocumentCreateWithURL((__bridge CFURLRef)[NSURL fileURLWithPath:dataOrPath]); - } - if (!pdf) return nil; - - CGPDFPageRef page = CGPDFDocumentGetPage(pdf, 1); - if (!page) { - CGPDFDocumentRelease(pdf); - return nil; - } - - CGRect pdfRect = CGPDFPageGetBoxRect(page, kCGPDFCropBox); - CGSize pdfSize = resize ? size : pdfRect.size; - CGFloat scale = [UIScreen mainScreen].scale; - CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); - CGContextRef ctx = CGBitmapContextCreate(NULL, pdfSize.width * scale, pdfSize.height * scale, 8, 0, colorSpace, kCGBitmapByteOrderDefault | kCGImageAlphaPremultipliedFirst); - if (!ctx) { - CGColorSpaceRelease(colorSpace); - CGPDFDocumentRelease(pdf); - return nil; - } - - CGContextScaleCTM(ctx, scale, scale); - CGContextTranslateCTM(ctx, -pdfRect.origin.x, -pdfRect.origin.y); - CGContextDrawPDFPage(ctx, page); - CGPDFDocumentRelease(pdf); - - CGImageRef image = CGBitmapContextCreateImage(ctx); - UIImage *pdfImage = [[UIImage alloc] initWithCGImage:image scale:scale orientation:UIImageOrientationUp]; - CGImageRelease(image); - CGContextRelease(ctx); - CGColorSpaceRelease(colorSpace); - - return pdfImage; -} - -+ (UIImage *)imageWithColor:(UIColor *)color { - return [self imageWithColor:color size:CGSizeMake(1, 1)]; -} - -+ (UIImage *)imageWithColor:(UIColor *)color size:(CGSize)size { - if (!color || size.width <= 0 || size.height <= 0) return nil; - CGRect rect = CGRectMake(0.0f, 0.0f, size.width, size.height); - UIGraphicsBeginImageContextWithOptions(rect.size, NO, 0); - CGContextRef context = UIGraphicsGetCurrentContext(); - CGContextSetFillColorWithColor(context, color.CGColor); - CGContextFillRect(context, rect); - UIImage *image = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - return image; -} - -+ (UIImage *)imageWithSize:(CGSize)size drawBlock:(void (^)(CGContextRef context))drawBlock { - if (!drawBlock) return nil; - UIGraphicsBeginImageContextWithOptions(size, NO, 0); - CGContextRef context = UIGraphicsGetCurrentContext(); - if (!context) return nil; - drawBlock(context); - UIImage *image = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - return image; -} - -- (BOOL)hasAlphaChannel { - if (self.CGImage == NULL) return NO; - CGImageAlphaInfo alpha = CGImageGetAlphaInfo(self.CGImage) & kCGBitmapAlphaInfoMask; - return (alpha == kCGImageAlphaFirst || - alpha == kCGImageAlphaLast || - alpha == kCGImageAlphaPremultipliedFirst || - alpha == kCGImageAlphaPremultipliedLast); -} - - -- (UIImage *)imageByResizeToSize:(CGSize)size { - if (size.width <= 0 || size.height <= 0) return nil; - UIGraphicsBeginImageContextWithOptions(size, NO, self.scale); - [self drawInRect:CGRectMake(0, 0, size.width, size.height)]; - UIImage *image = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - return image; -} - - --(UIImage*)scaleToSize:(CGSize)size{ - // 创建一个bitmap的context - // 并把它设置成为当前正在使用的context - //Determine whether the screen is retina - if([[UIScreen mainScreen] scale] == 2.0){ - UIGraphicsBeginImageContextWithOptions(size, NO, 2.0); - }else{ - UIGraphicsBeginImageContext(size); - } - // 绘制改变大小的图片 - [self drawInRect:CGRectMake(0, 0, size.width, size.height)]; - // 从当前context中创建一个改变大小后的图片 - UIImage* scaledImage = UIGraphicsGetImageFromCurrentImageContext(); - // 使当前的context出堆栈 - UIGraphicsEndImageContext(); - // 返回新的改变大小后的图片 - return scaledImage; -} - -- (UIImage *)imageByCropToRect:(CGRect)rect { - rect.origin.x *= self.scale; - rect.origin.y *= self.scale; - rect.size.width *= self.scale; - rect.size.height *= self.scale; - if (rect.size.width <= 0 || rect.size.height <= 0) return nil; - CGImageRef imageRef = CGImageCreateWithImageInRect(self.CGImage, rect); - UIImage *image = [UIImage imageWithCGImage:imageRef scale:self.scale orientation:self.imageOrientation]; - CGImageRelease(imageRef); - return image; -} - -- (UIImage *)imageByInsetEdge:(UIEdgeInsets)insets withColor:(UIColor *)color { - CGSize size = self.size; - size.width -= insets.left + insets.right; - size.height -= insets.top + insets.bottom; - if (size.width <= 0 || size.height <= 0) return nil; - CGRect rect = CGRectMake(-insets.left, -insets.top, self.size.width, self.size.height); - UIGraphicsBeginImageContextWithOptions(size, NO, self.scale); - CGContextRef context = UIGraphicsGetCurrentContext(); - if (color) { - CGContextSetFillColorWithColor(context, color.CGColor); - CGMutablePathRef path = CGPathCreateMutable(); - CGPathAddRect(path, NULL, CGRectMake(0, 0, size.width, size.height)); - CGPathAddRect(path, NULL, rect); - CGContextAddPath(context, path); - CGContextEOFillPath(context); - CGPathRelease(path); - } - [self drawInRect:rect]; - UIImage *image = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - return image; -} - -- (UIImage *)imageByRoundCornerRadius2:(CGFloat)c { - // 1.CGDataProviderRef 把 CGImage 转 二进制流 - CGDataProviderRef provider = CGImageGetDataProvider(self.CGImage); - void *imgData = (void *)CFDataGetBytePtr(CGDataProviderCopyData(provider)); - int width = self.size.width * self.scale; - int height = self.size.height * self.scale; - - // 2.处理 imgData -// dealImage(imgData, width, height); - cornerImage(imgData, width, height, c); - - // 3.CGDataProviderRef 把 二进制流 转 CGImage - CGDataProviderRef pv = CGDataProviderCreateWithData(NULL, imgData, width * height * 4, releaseData); - CGImageRef content = CGImageCreate(width , height, 8, 32, 4 * width, CGColorSpaceCreateDeviceRGB(), kCGBitmapByteOrder32Big | kCGImageAlphaPremultipliedLast, pv, NULL, true, kCGRenderingIntentDefault); - UIImage *result = [UIImage imageWithCGImage:content]; - CGDataProviderRelease(pv); // 释放空间 - CGImageRelease(content); - - return result; -} - -void releaseData(void *info, const void *data, size_t size) { - free((void *)data); -} - -// 判断点 (px, py) 在不在圆心 (cx, cy) 半径 r 的圆内 -static inline bool isCircle(float cx, float cy, float r, float px, float py) { - if ((px-cx) * (px-cx) + (py-cy) * (py-cy) > r * r) { - return false; - } - return true; -} - -// 裁剪圆角 -void cornerImage(UInt32 *const img, int w, int h, CGFloat cornerRadius) { - CGFloat c = cornerRadius; - CGFloat min = w > h ? h : w; - - if (c < 0) { c = 0; } - if (c > min * 0.5) { c = min * 0.5; } - - // 左上 y:[0, c), x:[x, c-y) - for (int y=0; y 0) { - CGFloat strokeInset = (floor(borderWidth * self.scale) + 0.5) / self.scale; - CGRect strokeRect = CGRectInset(rect, strokeInset, strokeInset); - CGFloat strokeRadius = radius > self.scale / 2 ? radius - self.scale / 2 : 0; - UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:strokeRect byRoundingCorners:corners cornerRadii:CGSizeMake(strokeRadius, borderWidth)]; - [path closePath]; - - path.lineWidth = borderWidth; - path.lineJoinStyle = borderLineJoin; - [borderColor setStroke]; - [path stroke]; - } - - UIImage *image = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - return image; -} - -- (UIImage *)imageByRotate:(CGFloat)radians fitSize:(BOOL)fitSize { - size_t width = (size_t)CGImageGetWidth(self.CGImage); - size_t height = (size_t)CGImageGetHeight(self.CGImage); - CGRect newRect = CGRectApplyAffineTransform(CGRectMake(0., 0., width, height), - fitSize ? CGAffineTransformMakeRotation(radians) : CGAffineTransformIdentity); - - CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); - CGContextRef context = CGBitmapContextCreate(NULL, - (size_t)newRect.size.width, - (size_t)newRect.size.height, - 8, - (size_t)newRect.size.width * 4, - colorSpace, - kCGBitmapByteOrderDefault | kCGImageAlphaPremultipliedFirst); - CGColorSpaceRelease(colorSpace); - if (!context) return nil; - - CGContextSetShouldAntialias(context, true); - CGContextSetAllowsAntialiasing(context, true); - CGContextSetInterpolationQuality(context, kCGInterpolationHigh); - - CGContextTranslateCTM(context, +(newRect.size.width * 0.5), +(newRect.size.height * 0.5)); - CGContextRotateCTM(context, radians); - - CGContextDrawImage(context, CGRectMake(-(width * 0.5), -(height * 0.5), width, height), self.CGImage); - CGImageRef imgRef = CGBitmapContextCreateImage(context); - UIImage *img = [UIImage imageWithCGImage:imgRef scale:self.scale orientation:self.imageOrientation]; - CGImageRelease(imgRef); - CGContextRelease(context); - return img; -} - -- (UIImage *)_yy_flipHorizontal:(BOOL)horizontal vertical:(BOOL)vertical { - if (!self.CGImage) return nil; - size_t width = (size_t)CGImageGetWidth(self.CGImage); - size_t height = (size_t)CGImageGetHeight(self.CGImage); - size_t bytesPerRow = width * 4; - CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); - CGContextRef context = CGBitmapContextCreate(NULL, width, height, 8, bytesPerRow, colorSpace, kCGBitmapByteOrderDefault | kCGImageAlphaPremultipliedFirst); - CGColorSpaceRelease(colorSpace); - if (!context) return nil; - - CGContextDrawImage(context, CGRectMake(0, 0, width, height), self.CGImage); - UInt8 *data = (UInt8 *)CGBitmapContextGetData(context); - if (!data) { - CGContextRelease(context); - return nil; - } - vImage_Buffer src = { data, height, width, bytesPerRow }; - vImage_Buffer dest = { data, height, width, bytesPerRow }; - if (vertical) { - vImageVerticalReflect_ARGB8888(&src, &dest, kvImageBackgroundColorFill); - } - if (horizontal) { - vImageHorizontalReflect_ARGB8888(&src, &dest, kvImageBackgroundColorFill); - } - CGImageRef imgRef = CGBitmapContextCreateImage(context); - CGContextRelease(context); - UIImage *img = [UIImage imageWithCGImage:imgRef scale:self.scale orientation:self.imageOrientation]; - CGImageRelease(imgRef); - return img; -} - -- (UIImage *)imageByRotateLeft90 { - return [self imageByRotate:DegreesToRadians(90) fitSize:YES]; -} - -- (UIImage *)imageByRotateRight90 { - return [self imageByRotate:DegreesToRadians(-90) fitSize:YES]; -} - -- (UIImage *)imageByRotate180 { - return [self _yy_flipHorizontal:YES vertical:YES]; -} - -- (UIImage *)imageByFlipVertical { - return [self _yy_flipHorizontal:NO vertical:YES]; -} - -- (UIImage *)imageByFlipHorizontal { - return [self _yy_flipHorizontal:YES vertical:NO]; -} - -- (UIImage *)imageByTintColor:(UIColor *)color { - UIGraphicsBeginImageContextWithOptions(self.size, NO, self.scale); - CGRect rect = CGRectMake(0, 0, self.size.width, self.size.height); - [color set]; - UIRectFill(rect); - [self drawAtPoint:CGPointMake(0, 0) blendMode:kCGBlendModeDestinationIn alpha:1]; - UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - return newImage; -} - -- (UIImage *)imageByGrayscale { - return [self imageByBlurRadius:0 tintColor:nil tintMode:0 saturation:0 maskImage:nil]; -} - -- (UIImage *)imageByBlurSoft { - return [self imageByBlurRadius:60 tintColor:[UIColor colorWithWhite:0.84 alpha:0.36] tintMode:kCGBlendModeNormal saturation:1.8 maskImage:nil]; -} - -- (UIImage *)imageByBlurLight { - return [self imageByBlurRadius:60 tintColor:[UIColor colorWithWhite:1.0 alpha:0.3] tintMode:kCGBlendModeNormal saturation:1.8 maskImage:nil]; -} - -- (UIImage *)imageByBlurExtraLight { - return [self imageByBlurRadius:40 tintColor:[UIColor colorWithWhite:0.97 alpha:0.82] tintMode:kCGBlendModeNormal saturation:1.8 maskImage:nil]; -} - -- (UIImage *)imageByBlurDark { - return [self imageByBlurRadius:40 tintColor:[UIColor colorWithWhite:0.11 alpha:0.73] tintMode:kCGBlendModeNormal saturation:1.8 maskImage:nil]; -} - -- (UIImage *)imageByBlurWithTint:(UIColor *)tintColor { - const CGFloat EffectColorAlpha = 0.6; - UIColor *effectColor = tintColor; - size_t componentCount = CGColorGetNumberOfComponents(tintColor.CGColor); - if (componentCount == 2) { - CGFloat b; - if ([tintColor getWhite:&b alpha:NULL]) { - effectColor = [UIColor colorWithWhite:b alpha:EffectColorAlpha]; - } - } else { - CGFloat r, g, b; - if ([tintColor getRed:&r green:&g blue:&b alpha:NULL]) { - effectColor = [UIColor colorWithRed:r green:g blue:b alpha:EffectColorAlpha]; - } - } - return [self imageByBlurRadius:20 tintColor:effectColor tintMode:kCGBlendModeNormal saturation:-1.0 maskImage:nil]; -} - - -// Helper function to handle deferred cleanup of a buffer. -static void _yy_cleanupBuffer(void *userData, void *buf_data) { - free(buf_data); -} - -- (UIImage *)imageByBlurRadius:(CGFloat)blurRadius - tintColor:(UIColor *)tintColor - tintMode:(CGBlendMode)tintBlendMode - saturation:(CGFloat)saturation - maskImage:(UIImage *)maskImage { - if (self.size.width < 1 || self.size.height < 1) { - // NSLog(@"UIImage+XHAdd error: invalid size: (%.2f x %.2f). Both dimensions must be >= 1: %@", self.size.width, self.size.height, self); - return nil; - } - if (!self.CGImage) { - // NSLog(@"UIImage+XHAdd error: inputImage must be backed by a CGImage: %@", self); - return nil; - } - if (maskImage && !maskImage.CGImage) { - // NSLog(@"UIImage+XHAdd error: effectMaskImage must be backed by a CGImage: %@", maskImage); - return nil; - } - - // iOS7 and above can use new func. - BOOL hasNewFunc = (long)vImageBuffer_InitWithCGImage != 0 && (long)vImageCreateCGImageFromBuffer != 0; - BOOL hasBlur = blurRadius > __FLT_EPSILON__; - BOOL hasSaturation = fabs(saturation - 1.0) > __FLT_EPSILON__; - - CGSize size = self.size; - CGRect rect = { CGPointZero, size }; - CGFloat scale = self.scale; - CGImageRef imageRef = self.CGImage; - BOOL opaque = NO; - - if (!hasBlur && !hasSaturation) { - return [self _yy_mergeImageRef:imageRef tintColor:tintColor tintBlendMode:tintBlendMode maskImage:maskImage opaque:opaque]; - } - - vImage_Buffer effect = { 0 }, scratch = { 0 }; - vImage_Buffer *input = NULL, *output = NULL; - - vImage_CGImageFormat format = { - .bitsPerComponent = 8, - .bitsPerPixel = 32, - .colorSpace = NULL, - .bitmapInfo = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little, //requests a BGRA buffer. - .version = 0, - .decode = NULL, - .renderingIntent = kCGRenderingIntentDefault - }; - - if (hasNewFunc) { - vImage_Error err; - err = vImageBuffer_InitWithCGImage(&effect, &format, NULL, imageRef, kvImagePrintDiagnosticsToConsole); - if (err != kvImageNoError) { - // NSLog(@"UIImage+XHAdd error: vImageBuffer_InitWithCGImage returned error code %zi for inputImage: %@", err, self); - return nil; - } - err = vImageBuffer_Init(&scratch, effect.height, effect.width, format.bitsPerPixel, kvImageNoFlags); - if (err != kvImageNoError) { - // NSLog(@"UIImage+XHAdd error: vImageBuffer_Init returned error code %zi for inputImage: %@", err, self); - return nil; - } - } else { - UIGraphicsBeginImageContextWithOptions(size, opaque, scale); - CGContextRef effectCtx = UIGraphicsGetCurrentContext(); - CGContextScaleCTM(effectCtx, 1.0, -1.0); - CGContextTranslateCTM(effectCtx, 0, -size.height); - CGContextDrawImage(effectCtx, rect, imageRef); - effect.data = CGBitmapContextGetData(effectCtx); - effect.width = CGBitmapContextGetWidth(effectCtx); - effect.height = CGBitmapContextGetHeight(effectCtx); - effect.rowBytes = CGBitmapContextGetBytesPerRow(effectCtx); - - UIGraphicsBeginImageContextWithOptions(size, opaque, scale); - CGContextRef scratchCtx = UIGraphicsGetCurrentContext(); - scratch.data = CGBitmapContextGetData(scratchCtx); - scratch.width = CGBitmapContextGetWidth(scratchCtx); - scratch.height = CGBitmapContextGetHeight(scratchCtx); - scratch.rowBytes = CGBitmapContextGetBytesPerRow(scratchCtx); - } - - input = &effect; - output = &scratch; - - if (hasBlur) { - // A description of how to compute the box kernel width from the Gaussian - // radius (aka standard deviation) appears in the SVG spec: - // http://www.w3.org/TR/SVG/filters.html#feGaussianBlurElement - // - // For larger values of 's' (s >= 2.0), an approximation can be used: Three - // successive box-blurs build a piece-wise quadratic convolution kernel, which - // approximates the Gaussian kernel to within roughly 3%. - // - // let d = floor(s * 3*sqrt(2*pi)/4 + 0.5) - // - // ... if d is odd, use three box-blurs of size 'd', centered on the output pixel. - // - CGFloat inputRadius = blurRadius * scale; - if (inputRadius - 2.0 < __FLT_EPSILON__) inputRadius = 2.0; - uint32_t radius = floor((inputRadius * 3.0 * sqrt(2 * M_PI) / 4 + 0.5) / 2); - radius |= 1; // force radius to be odd so that the three box-blur methodology works. - int iterations; - if (blurRadius * scale < 0.5) iterations = 1; - else if (blurRadius * scale < 1.5) iterations = 2; - else iterations = 3; - NSInteger tempSize = vImageBoxConvolve_ARGB8888(input, output, NULL, 0, 0, radius, radius, NULL, kvImageGetTempBufferSize | kvImageEdgeExtend); - void *temp = malloc(tempSize); - for (int i = 0; i < iterations; i++) { - vImageBoxConvolve_ARGB8888(input, output, temp, 0, 0, radius, radius, NULL, kvImageEdgeExtend); - LB_SWAP(input, output); - } - free(temp); - } - - - if (hasSaturation) { - // These values appear in the W3C Filter Effects spec: - // https://dvcs.w3.org/hg/FXTF/raw-file/default/filters/Publish.html#grayscaleEquivalent - CGFloat s = saturation; - CGFloat matrixFloat[] = { - 0.0722 + 0.9278 * s, 0.0722 - 0.0722 * s, 0.0722 - 0.0722 * s, 0, - 0.7152 - 0.7152 * s, 0.7152 + 0.2848 * s, 0.7152 - 0.7152 * s, 0, - 0.2126 - 0.2126 * s, 0.2126 - 0.2126 * s, 0.2126 + 0.7873 * s, 0, - 0, 0, 0, 1, - }; - const int32_t divisor = 256; - NSUInteger matrixSize = sizeof(matrixFloat) / sizeof(matrixFloat[0]); - int16_t matrix[matrixSize]; - for (NSUInteger i = 0; i < matrixSize; ++i) { - matrix[i] = (int16_t)roundf(matrixFloat[i] * divisor); - } - vImageMatrixMultiply_ARGB8888(input, output, matrix, divisor, NULL, NULL, kvImageNoFlags); - LB_SWAP(input, output); - } - - UIImage *outputImage = nil; - if (hasNewFunc) { - CGImageRef effectCGImage = NULL; - effectCGImage = vImageCreateCGImageFromBuffer(input, &format, &_yy_cleanupBuffer, NULL, kvImageNoAllocate, NULL); - if (effectCGImage == NULL) { - effectCGImage = vImageCreateCGImageFromBuffer(input, &format, NULL, NULL, kvImageNoFlags, NULL); - free(input->data); - } - free(output->data); - outputImage = [self _yy_mergeImageRef:effectCGImage tintColor:tintColor tintBlendMode:tintBlendMode maskImage:maskImage opaque:opaque]; - CGImageRelease(effectCGImage); - } else { - CGImageRef effectCGImage; - UIImage *effectImage; - if (input != &effect) effectImage = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - if (input == &effect) effectImage = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - effectCGImage = effectImage.CGImage; - outputImage = [self _yy_mergeImageRef:effectCGImage tintColor:tintColor tintBlendMode:tintBlendMode maskImage:maskImage opaque:opaque]; - } - return outputImage; -} - -// Helper function to add tint and mask. -- (UIImage *)_yy_mergeImageRef:(CGImageRef)effectCGImage - tintColor:(UIColor *)tintColor - tintBlendMode:(CGBlendMode)tintBlendMode - maskImage:(UIImage *)maskImage - opaque:(BOOL)opaque { - BOOL hasTint = tintColor != nil && CGColorGetAlpha(tintColor.CGColor) > __FLT_EPSILON__; - BOOL hasMask = maskImage != nil; - CGSize size = self.size; - CGRect rect = { CGPointZero, size }; - CGFloat scale = self.scale; - - if (!hasTint && !hasMask) { - return [UIImage imageWithCGImage:effectCGImage]; - } - - UIGraphicsBeginImageContextWithOptions(size, opaque, scale); - CGContextRef context = UIGraphicsGetCurrentContext(); - CGContextScaleCTM(context, 1.0, -1.0); - CGContextTranslateCTM(context, 0, -size.height); - if (hasMask) { - CGContextDrawImage(context, rect, self.CGImage); - CGContextSaveGState(context); - CGContextClipToMask(context, rect, maskImage.CGImage); - } - CGContextDrawImage(context, rect, effectCGImage); - if (hasTint) { - CGContextSaveGState(context); - CGContextSetBlendMode(context, tintBlendMode); - CGContextSetFillColorWithColor(context, tintColor.CGColor); - CGContextFillRect(context, rect); - CGContextRestoreGState(context); - } - if (hasMask) { - CGContextRestoreGState(context); - } - UIImage *outputImage = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - return outputImage; -} - -+ (UIImage *)gaussianFilter:(UIImage *)originImage -{ - - CIContext *context = [CIContext contextWithOptions:nil]; - CIImage *inputImage = [[CIImage alloc] initWithImage:originImage]; - // create gaussian blur filter - CIFilter *filter = [CIFilter filterWithName:@"CIGaussianBlur"]; - [filter setValue:inputImage forKey:kCIInputImageKey]; - [filter setValue:[NSNumber numberWithFloat:10.0] forKey:@"inputRadius"]; - // blur image - CIImage *result = [filter valueForKey:kCIOutputImageKey]; - CGImageRef cgImage = [context createCGImage:result fromRect:[result extent]]; - UIImage *image = [UIImage imageWithCGImage:cgImage]; - CGImageRelease(cgImage); - return image; -} - -+ (UIImage *)blurryImage:(UIImage *)image withBlurLevel:(CGFloat)blur { - CIContext *context = [CIContext contextWithOptions:nil]; - CIImage *inputImage = [CIImage imageWithCGImage:image.CGImage]; - CIFilter *filter = [CIFilter filterWithName:@"CIGaussianBlur" - keysAndValues:kCIInputImageKey, inputImage, - @"inputRadius", @(blur), - nil]; - - CIImage *outputImage = filter.outputImage; - - CGImageRef outImage = [context createCGImage:outputImage - fromRect:[outputImage extent]]; - return [UIImage imageWithCGImage:outImage]; -} - -+ (UIImage *)blurryImage1:(UIImage *)image withBlurLevel:(CGFloat)blur { - if (blur < 0.f || blur > 1.f) { - blur = 0.5f; - } - int boxSize = (int)(blur * 100); - boxSize = boxSize - (boxSize % 2) + 1; - - CGImageRef img = image.CGImage; - - vImage_Buffer inBuffer, outBuffer; - vImage_Error error; - - void *pixelBuffer; - - CGDataProviderRef inProvider = CGImageGetDataProvider(img); - CFDataRef inBitmapData = CGDataProviderCopyData(inProvider); - - inBuffer.width = CGImageGetWidth(img); - inBuffer.height = CGImageGetHeight(img); - inBuffer.rowBytes = CGImageGetBytesPerRow(img); - - inBuffer.data = (void*)CFDataGetBytePtr(inBitmapData); - - pixelBuffer = malloc(CGImageGetBytesPerRow(img) * - CGImageGetHeight(img)); - - if(pixelBuffer == NULL) - // NSLog(@"No pixelbuffer"); - - outBuffer.data = pixelBuffer; - outBuffer.width = CGImageGetWidth(img); - outBuffer.height = CGImageGetHeight(img); - outBuffer.rowBytes = CGImageGetBytesPerRow(img); - - error = vImageBoxConvolve_ARGB8888(&inBuffer, - &outBuffer, - NULL, - 0, - 0, - boxSize, - boxSize, - NULL, - kvImageEdgeExtend); - - - if (error) { - // NSLog(@"error from convolution %ld", error); - } - - CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); - CGContextRef ctx = CGBitmapContextCreate( - outBuffer.data, - outBuffer.width, - outBuffer.height, - 8, - outBuffer.rowBytes, - colorSpace, - kCGImageAlphaNoneSkipLast); - CGImageRef imageRef = CGBitmapContextCreateImage (ctx); - UIImage *returnImage = [UIImage imageWithCGImage:imageRef]; - - //clean up - CGContextRelease(ctx); - CGColorSpaceRelease(colorSpace); - - free(pixelBuffer); - CFRelease(inBitmapData); - - CGColorSpaceRelease(colorSpace); - CGImageRelease(imageRef); - - return returnImage; -} - -- (UIImage *)normalizedImage { - if (self.imageOrientation == UIImageOrientationUp) return self; - - UIGraphicsBeginImageContextWithOptions(self.size, NO, self.scale); - [self drawInRect:(CGRect){0, 0, self.size}]; - UIImage *normalizedImage = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - return normalizedImage; -} - -+ (UIImage *)synthesisWithBottomImage:(UIImage *)btmImg topImage:(UIImage *)topImg withTopRect:(CGRect)rect{ - //将底部的一张的大小作为所截取的合成图的尺寸 - CGSize btmsize = btmImg.size; - CGSize topsize = topImg.size; - UIGraphicsBeginImageContext(CGSizeMake(btmsize.width, btmsize.height)); - [btmImg drawInRect:CGRectMake(0, 0, btmsize.width, btmsize.height)]; - if(CGRectEqualToRect(rect, CGRectZero)) {// 两个区域相等 - [topImg drawInRect:CGRectMake((btmsize.width - topsize.width) * 0.5, (btmsize.height - topsize.height) * 0.5, topsize.width, topsize.height)]; - }else{ - [topImg drawInRect:rect]; - } - UIImage *resultingImage = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - return resultingImage; -} - -#pragma mark - 压缩图片 -+ (UIImage *)compressImage:(UIImage *)image toByte:(NSUInteger)maxLength { - // Compress by quality - CGFloat compression = 1; - NSData *data = UIImageJPEGRepresentation(image, compression); - if (data.length < maxLength) return image; - - CGFloat max = 1; - CGFloat min = 0; - for (int i = 0; i < 6; ++i) { - compression = (max + min) / 2; - data = UIImageJPEGRepresentation(image, compression); - if (data.length < maxLength * 0.9) { - min = compression; - } else if (data.length > maxLength) { - max = compression; - } else { - break; - } - } - UIImage *resultImage = [UIImage imageWithData:data]; - if (data.length < maxLength) return resultImage; - - // Compress by size - NSUInteger lastDataLength = 0; - while (data.length > maxLength && data.length != lastDataLength) { - lastDataLength = data.length; - CGFloat ratio = (CGFloat)maxLength / data.length; - CGSize size = CGSizeMake((NSUInteger)(resultImage.size.width * sqrtf(ratio)), - (NSUInteger)(resultImage.size.height * sqrtf(ratio))); // Use NSUInteger to prevent white blank - UIGraphicsBeginImageContext(size); - [resultImage drawInRect:CGRectMake(0, 0, size.width, size.height)]; - resultImage = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - data = UIImageJPEGRepresentation(resultImage, compression); - } - - return resultImage; -} - -- (UIImage*)addText:(NSString*)text - XPos:(int)xpos - YPos:(int)ypos - bgColor:(UIColor*)bgColor - textColor:(UIColor*)textColor{ - int w = self.size.width; - int h = self.size.height; - - CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); - CGContextRef context = CGBitmapContextCreate(NULL, w, h, 8, 4 * w, colorSpace, kCGImageAlphaPremultipliedFirst); - - CGContextDrawImage(context, CGRectMake(0, 0, w, h), self.CGImage); - CGContextSetRGBFillColor(context, 0.0, 0.0, 1.0, 1); - - char *txt = (char*)[text cStringUsingEncoding:NSUTF8StringEncoding]; - char *font = (char*)[@"PingFangSC-Semibold" cStringUsingEncoding:NSUTF8StringEncoding]; - - CGContextSelectFont(context, font, (10), kCGEncodingMacRoman); - CGContextSetTextDrawingMode(context, kCGTextFill); - CGContextSetFillColorWithColor(context, textColor.CGColor); - CGContextShowTextAtPoint(context, xpos, ypos, txt, strlen(txt)); - - CGImageRef imageRef = CGBitmapContextCreateImage(context); - CGContextSetAllowsAntialiasing(context, YES); - - UIImage *result = [UIImage imageWithCGImage:imageRef]; - - CGImageRelease(imageRef); - CGContextRelease(context); - CGColorSpaceRelease(colorSpace); - - return result; - -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/SudCommon.h b/YuMi/Modules/YMRoom/View/LittleGame/Presenter/SudCommon.h deleted file mode 100644 index 7592fc0..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/SudCommon.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright © Sud.Tech - * https://sud.tech - */ - -#import - -NS_ASSUME_NONNULL_BEGIN -@class UILabel; -/// 登录接入方服务器url -#warning 登录接入方服务器url修改地址 -static NSString* LOGIN_URL = @"https://fat-mgp-hello.sudden.ltd/login"; - -@interface SudCommon : NSObject -/// 获取用户名 -+ (NSString *)getUserName; -/// 字典转JSON -/// @param dic 字典 -+ (NSString*)dictionaryToJson:(NSDictionary *)dic; -/// JSON转字典 -/// @param turnString JSON -+ (NSDictionary *)turnStringToDictionary:(NSString *)turnString; -/// 登录到接入方服务器 -/// @param userid 用户id -/// @param resultCb 回调 -+ (void)loginWithUserId:(NSString *)userid resultCallbckBlock:(void(^)(NSString *code, NSError *error))resultCb; - -/// 获取带颜色的NSMutableAttributedString -/// @param string string -/// @param color color -+ (NSMutableAttributedString *)getAttributedStringWithString:(NSString *)string color:(NSString*)color; - -/// 获取游戏错误表 -+ (NSDictionary *)getErrorMap; - -/// 获取sdk版本Label -+ (UILabel *)getSDKVersionLabel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/SudCommon.m b/YuMi/Modules/YMRoom/View/LittleGame/Presenter/SudCommon.m deleted file mode 100644 index dcf14aa..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/SudCommon.m +++ /dev/null @@ -1,148 +0,0 @@ -/** - * Copyright © Sud.Tech - * https://sud.tech - */ - -#import "SudCommon.h" -#import -#import "UIColor+RW.h" -#import -#import - - -@implementation SudCommon -/// 获取用户名 -+ (NSString *)getUserName { - return [self MD5ForLower8Bate:[self getUUID]]; -} - -/// 获取uuid -+ (NSString *)getUUID { - return [UIDevice currentDevice].identifierForVendor.UUIDString;; -} - -// 8位小写 -+(NSString *)MD5ForLower8Bate:(NSString *)str { - NSString *md5Str = [self MD5ForLower32Bate:str]; - NSString *string = [md5Str substringWithRange:NSMakeRange(8, 8)]; - return string; -} - -// 32位 小写 -+(NSString *)MD5ForLower32Bate:(NSString *)str{ - //要进行UTF8的转码 - const char* input = [str UTF8String]; - unsigned char result[CC_MD5_DIGEST_LENGTH]; - CC_MD5(input, (CC_LONG)strlen(input), result); - - NSMutableString *digest = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH * 2]; - for (NSInteger i = 0; i < CC_MD5_DIGEST_LENGTH; i++) { - [digest appendFormat:@"%02x", result[i]]; - } - - return digest; -} - -#pragma mark - =======login======= -/// 登录到接入方服务器 -+ (void)loginWithUserId:(NSString *)userid resultCallbckBlock:(void(^)(NSString *code, NSError *error))resultCb { - AFHTTPSessionManager * manager = [AFHTTPSessionManager manager]; - manager.requestSerializer = [AFJSONRequestSerializer serializer]; - /// 这里的user_id是设置游戏中用户名，由接入方传入,这里uuid只是示例 - NSDictionary * param = @{@"user_id":[self getUserName]}; - [manager POST:LOGIN_URL parameters:param headers:@{} progress:^(NSProgress * _Nonnull uploadProgress) {} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { - NSDictionary * dic = [responseObject objectForKey:@"data"]; - /// 这里的code用于登录游戏sdk服务器 - NSString * code = [dic objectForKey:@"code"]; - resultCb(code, nil); - [self invalidateHttpSession:manager]; - } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { - resultCb(nil, error); - [self invalidateHttpSession:manager]; - }]; - -} - -+ (void)invalidateHttpSession:(AFHTTPSessionManager *)manager{ - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ - [manager invalidateSessionCancelingTasks:YES resetSession:NO]; - }); -} - -#pragma mark - 字典 json字符串互转 -+ (NSString*)dictionaryToJson:(NSDictionary *)dic { - NSError *parseError = nil; - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:&parseError]; - return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; -} - -+ (NSDictionary *)turnStringToDictionary:(NSString *)turnString { - NSData *turnData = [turnString dataUsingEncoding:NSUTF8StringEncoding]; - NSDictionary *turnDic = [NSJSONSerialization JSONObjectWithData:turnData options:NSJSONReadingMutableLeaves error:nil]; - return turnDic; -} - -+ (NSMutableAttributedString *)getAttributedStringWithString:(NSString *)string color:(NSString*)color { - NSMutableAttributedString * attributedString = [[NSMutableAttributedString alloc]initWithString:string]; - [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor RW_colorWithHexString:color] range:NSMakeRange(0, attributedString.length)]; - return attributedString; -} - -+ (UILabel *)getSDKVersionLabel { - UILabel * versionLabel = [[UILabel alloc]init]; - versionLabel.text = [SudCommon getSDKVersion]; - versionLabel.font = [UIFont boldSystemFontOfSize:10]; - versionLabel.textColor = [UIColor whiteColor]; - versionLabel.textAlignment = NSTextAlignmentRight; - return versionLabel; -} - -+ (NSString *)getSDKVersion { - return [NSString stringWithFormat:@"v%@",[SudMGP getVersion]]; -} - -+ (NSDictionary *)getErrorMap { - return @{ - // 通用错误 - @"100000" : YMLocalizedString(@"SudCommon0"), - @"100001" : YMLocalizedString(@"SudCommon1"), - @"100002" : YMLocalizedString(@"SudCommon2"), - @"100003" : YMLocalizedString(@"SudCommon3"), - @"100004" : YMLocalizedString(@"SudCommon4"), - @"100005" : YMLocalizedString(@"SudCommon5"), - @"100006" : YMLocalizedString(@"SudCommon6"), - @"100007" : YMLocalizedString(@"SudCommon7"), - @"100008" : YMLocalizedString(@"SudCommon8"), - @"100009" : YMLocalizedString(@"SudCommon9"), - @"100010" : YMLocalizedString(@"SudCommon10"), - // 业务错误 - @"100100" : YMLocalizedString(@"SudCommon11"), - @"100200" : YMLocalizedString(@"SudCommon12"), - @"100201" : YMLocalizedString(@"SudCommon13"), - @"100202" : YMLocalizedString(@"SudCommon14"), - @"100203" : YMLocalizedString(@"SudCommon15"), - @"100204" : YMLocalizedString(@"SudCommon16"), - @"100300" : YMLocalizedString(@"SudCommon17"), - @"100301" : YMLocalizedString(@"SudCommon18"), - @"100302" : YMLocalizedString(@"SudCommon19"), - @"100400" : YMLocalizedString(@"SudCommon20"), - @"100401" : YMLocalizedString(@"SudCommon21"), - @"100500" : YMLocalizedString(@"SudCommon22"), - @"100501" : YMLocalizedString(@"SudCommon23"), - @"100502" : YMLocalizedString(@"SudCommon24"), - @"100503" : YMLocalizedString(@"SudCommon25"), - @"100504" : YMLocalizedString(@"SudCommon26"), - @"100600" : YMLocalizedString(@"SudCommon27"), - @"100601" : YMLocalizedString(@"SudCommon28"), - @"100602" : YMLocalizedString(@"SudCommon29"), - @"100700" : YMLocalizedString(@"SudCommon30"), - @"100800" : YMLocalizedString(@"SudCommon31"), - @"100801" : YMLocalizedString(@"SudCommon32"), - @"100802" : YMLocalizedString(@"SudCommon33"), - @"100900" : YMLocalizedString(@"SudCommon34"), - @"100901" : YMLocalizedString(@"SudCommon35"), - @"100902" : YMLocalizedString(@"SudCommon36"), - }; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/SudGameConfig.h b/YuMi/Modules/YMRoom/View/LittleGame/Presenter/SudGameConfig.h deleted file mode 100644 index 08847f9..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/Presenter/SudGameConfig.h +++ /dev/null @@ -1,79 +0,0 @@ -/** - * Copyright © Sud.Tech - * https://sud.tech - */ - -#ifndef HelloSud_iOS_Define_h -#define HelloSud_iOS_Define_h - -#pragma mark - APP-->MG 状态 -/// 加入状态 -static NSString* APP_COMMON_SELF_IN = @"app_common_self_in"; -/// 准备状态 -static NSString* APP_COMMON_SELF_READY = @"app_common_self_ready"; -/// 游戏状态 -static NSString* APP_COMMON_SELF_PLAYING = @"app_common_self_playing"; -/// 队长状态 -static NSString* APP_COMMON_SELF_CAPTAIN = @"app_common_self_captain"; -/// 踢人 -static NSString* APP_COMMON_SELF_KICK = @"app_common_self_kick"; -/// 结束游戏 -static NSString* APP_COMMON_SELF_END = @"app_common_self_end"; -/// 房间状态 -static NSString* APP_COMMON_SELF_ROOM = @"app_common_self_room"; -/// 麦位状态 -static NSString* APP_COMMON_SELF_SEAT = @"app_common_self_seat"; -/// 麦克风状态 -static NSString* APP_COMMON_SELF_MICROPHONE = @"app_common_self_microphone"; -/// 文字命中状态 -static NSString* APP_COMMON_SELF_TEXT_HIT = @"app_common_self_text_hit"; - -#pragma mark - 通用状态-游戏 -/// 公屏消息 -static NSString* MG_COMMON_PUBLIC_MESSAGE = @"mg_common_public_message"; -/// 关键词状态 -static NSString* MG_COMMON_KEY_WORD_TO_HIT = @"mg_common_key_word_to_hit"; -/// 游戏结算状态 -static NSString* MG_COMMON_GAME_SETTLE = @"mg_common_game_settle"; -/// 加入游戏按钮点击状态 -static NSString* MG_COMMON_SELF_CLICK_JOIN_BTN = @"mg_common_self_click_join_btn"; -/// 取消加入游戏按钮点击状态 -static NSString* MG_COMMON_SELF_CLICK_CANCEL_JOIN_BTN = @"mg_common_self_click_cancel_join_btn"; -/// 准备按钮点击状态 -static NSString* MG_COMMON_SELF_CLICK_READY_BTN = @"mg_common_self_click_ready_btn"; -/// 取消准备按钮点击状态 -static NSString* MG_COMMON_SELF_CLICK_CANCEL_READY_BTN = @"mg_common_self_click_cancel_ready_btn"; -/// 开始游戏按钮点击状态 -static NSString* MG_COMMON_SELF_CLICK_START_BTN = @"mg_common_self_click_start_btn"; - -#pragma mark - 通用状态-玩家 -/// 加入状态 -static NSString* MG_COMMON_PLAYER_IN = @"mg_common_player_in"; -/// 准备状态 -static NSString* MG_COMMON_PLAYER_READY = @"mg_common_player_ready"; -/// 队长状态 -static NSString* MG_COMMON_PLAYER_CAPTAIN = @"mg_common_player_captain"; -/// 游戏状态 -static NSString* MG_COMMON_PLAYER_PLAYING = @"mg_common_player_playing"; - -/// 你画我猜 -/// 选词中 -static NSString* MG_DG_SELECTING = @"mg_dg_selecting"; -/// 作画中 -static NSString* MG_DG_PAINTING = @"mg_dg_painting"; -/// 错误答案 -static NSString* MG_DG_ERRORANSWER = @"mg_dg_erroranswer"; -/// 总积分 -static NSString* MG_DG_TOTALSCORE = @"mg_dg_totalscore"; -/// 本次积分 -static NSString* MG_DG_SCORE = @"mg_dg_score"; - -#define mRoomID @"9009" -#define mLanguage @"zh-CN" - -#define MG_ID_BUMPER_CAR 1461227817776713818L//游戏ID:碰碰车 -#define MG_ID_FLY_CUTTER 1461228379255603251L//游戏ID:飞刀达人 -#define MG_ID_DRAW_GUESS 1461228410184400899L//游戏ID:你画我猜 -#define MG_ID_GO_BANG 1461297734886621238L//游戏ID:五子棋 - -#endif /* AppConfig.h */ diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPCreateLittleGameCollectionViewCell.h b/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPCreateLittleGameCollectionViewCell.h deleted file mode 100644 index c21272c..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPCreateLittleGameCollectionViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPCreateLittleGameCollectionViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2022/1/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class LittleGameInfoModel; -@interface XPCreateLittleGameCollectionViewCell : UICollectionViewCell -///游戏的信息 -@property (nonatomic,strong) LittleGameInfoModel *gameInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPCreateLittleGameCollectionViewCell.m b/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPCreateLittleGameCollectionViewCell.m deleted file mode 100644 index ab14d41..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPCreateLittleGameCollectionViewCell.m +++ /dev/null @@ -1,75 +0,0 @@ -// -// XPCreateLittleGameCollectionViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2022/1/21. -// - -#import "XPCreateLittleGameCollectionViewCell.h" -///Third -#import -#import "NetImageView.h" - -///Model -#import "LittleGameInfoModel.h" - -@interface XPCreateLittleGameCollectionViewCell () -///显示图片 -@property (nonatomic, strong) NetImageView *logoImageView; -@end - - -@implementation XPCreateLittleGameCollectionViewCell - --(instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)initSubViews { - [self.contentView addSubview:self.logoImageView]; - self.backgroundColor = [UIColor clearColor]; -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(90, 110)); - }]; -} - -- (void)initViews { - [self.contentView addSubview:self.logoImageView]; - self.backgroundColor = [UIColor clearColor]; -} -- (void)setGameInfo:(LittleGameInfoModel *)gameInfo{ - if (gameInfo) { - self.logoImageView.imageUrl = gameInfo.pic; - if (gameInfo.isSelect) { - self.logoImageView.layer.borderWidth = 2; - self.logoImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } else { - self.logoImageView.layer.borderWidth = 0; - self.logoImageView.layer.borderColor = [UIColor clearColor].CGColor; - } - } -} - -#pragma mark - Getter && Setter -- (NetImageView *)logoImageView { - if (!_logoImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _logoImageView = [[NetImageView alloc] initWithConfig:config]; - _logoImageView.layer.masksToBounds = YES; - _logoImageView.layer.cornerRadius = 12; - } - return _logoImageView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPLittleGameTableViewCell.h b/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPLittleGameTableViewCell.h deleted file mode 100644 index cc6c74d..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPLittleGameTableViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPLittleGameTableViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2022/1/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class LittleGameInfoModel; -@interface XPLittleGameTableViewCell : UITableViewCell -///游戏的信息 -@property (nonatomic, strong) LittleGameInfoModel *info; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPLittleGameTableViewCell.m b/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPLittleGameTableViewCell.m deleted file mode 100644 index 162e5d6..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPLittleGameTableViewCell.m +++ /dev/null @@ -1,74 +0,0 @@ -// -// XPLittleGameTableViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2022/1/22. -// - -#import "XPLittleGameTableViewCell.h" -///Third -#import -///Tool - -///Model -#import "LittleGameInfoModel.h" - -@interface XPLittleGameTableViewCell () -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UIView *devideView; -@end - -@implementation XPLittleGameTableViewCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if (self) { - [self initViews]; - [self initConstraints]; - } - return self; -} - -- (void)initViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - self.contentView.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.devideView]; -} - -- (void)initConstraints { - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(8); - }]; - - [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(8); - make.top.mas_equalTo(0); - make.height.mas_equalTo(1); - }]; -} - -- (void)setInfo:(LittleGameInfoModel *)info { - self.titleLabel.text = info.name; -} -#pragma mark - Getters And Setters -- (UILabel *)titleLabel { - if (_titleLabel == nil) { - _titleLabel = [[UILabel alloc]init]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.font = [UIFont systemFontOfSize:12]; - _titleLabel.userInteractionEnabled = YES; - } - return _titleLabel; -} - -- (UIView *)devideView { - if (!_devideView) { - _devideView = [[UIView alloc] init]; - _devideView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _devideView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameMiniStageView.h b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameMiniStageView.h deleted file mode 100644 index 9762a43..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameMiniStageView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPLittleGameMiniStageView.h -// xplan-ios -// -// Created by 冯硕 on 2022/2/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPLittleGameMiniStageView; -@protocol XPLittleGameMiniStageViewDelegate - -- (void)XPLittleGameMiniStageView:(XPLittleGameMiniStageView *)view didClickFoldButton:(UIButton *)sender; - -@end -@interface XPLittleGameMiniStageView : UIView - -- (void)needRefreshPosition:(NSMutableDictionary *)micQueue; -///代理 -@property (nonatomic,weak) id delegate; -///隐藏小游戏房大坑位 -- (void)hiddenSudGamePostionView; -///需要的坑位数量 -@property (nonatomic, assign) NSInteger micCount; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameMiniStageView.m b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameMiniStageView.m deleted file mode 100644 index fba8233..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameMiniStageView.m +++ /dev/null @@ -1,161 +0,0 @@ -// -// XPLittleGameMiniStageView.m -// xplan-ios -// -// Created by 冯硕 on 2022/2/11. -// - -#import "XPLittleGameMiniStageView.h" -///Third -#import -///Tool - -#import "NetImageView.h" -///Model -#import "UserInfoModel.h" -#import "MicroQueueModel.h" - -UIKIT_EXTERN NSString * const kRoomRoomLittleGameMiniStageNotificationKey; - -@interface XPLittleGameMiniStageView () -///外面的容器 -@property (nonatomic,strong) UIStackView *stackView; -///折叠的按钮 -@property (nonatomic,strong) UIButton *foldButton; -///坑位的容器 -@property (nonatomic,strong) UIStackView *stageStackView; -@end - -@implementation XPLittleGameMiniStageView - -- (void)drawRect:(CGRect)rect { - UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:self.bounds byRoundingCorners:UIRectCornerBottomLeft | UIRectCornerTopLeft cornerRadii:CGSizeMake(11.5, 11.5)]; - CAShapeLayer *maskLayer = [CAShapeLayer layer]; - maskLayer.path = path.CGPath; - self.layer.mask = maskLayer; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Public Method -- (void)hiddenSudGamePostionView { - self.foldButton.selected = NO; - [self tapAvatarRecognizer]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColorRGBAlpha(0x000000, 0.2); - [self addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.foldButton]; - [self.stackView addArrangedSubview:self.stageStackView]; - - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAvatarRecognizer)]; - [self addGestureRecognizer:tap]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.stackView).offset(6); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(6); - make.top.bottom.mas_equalTo(self); - }]; - - [self.stageStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(23); - }]; - - [self.foldButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.width.mas_equalTo(16); - }]; -} - -- (void)needRefreshPosition:(NSMutableDictionary *)micQueue { - for (int i = 0; i 0) { - imageView.imageUrl = micModel.userInfo.avatar; - } - } -} -#pragma mark - Event Response -- (void)tapAvatarRecognizer { - self.foldButton.selected = !self.foldButton.selected; - self.stageStackView.hidden = !self.foldButton.selected; - [self setNeedsDisplay]; - [UIView animateWithDuration:0.2 animations:^{ - if (self.foldButton.selected) { - self.foldButton.transform = CGAffineTransformMakeRotation(M_PI); - } else { - self.foldButton.transform = CGAffineTransformIdentity; - } - }]; - [[NSNotificationCenter defaultCenter] postNotificationName:kRoomRoomLittleGameMiniStageNotificationKey object:@{@"isMini": @(self.foldButton.selected)}]; -} - -#pragma mark - Getters And Setters -- (void)setMicCount:(NSInteger)micCount { - _micCount = micCount; - for (UIView *view in self.stageStackView.subviews) { - [view removeFromSuperview]; - } - CGFloat width = 16; - for (int i = 0; i - -NS_ASSUME_NONNULL_BEGIN -@class LittleGameInfoModel, XPLittleGameRoomListView; -@protocol XPRoomLittleGameListViewDelegate - -///选择某一个类型 -- (void)xPRoomLittleGameListView:(XPLittleGameRoomListView *)view didSelectItem:(LittleGameInfoModel *)itemInfo; - -///选择类型 -- (void)xPRoomLittleGameListView:(XPLittleGameRoomListView *)view didSelectChooseType:(UIButton *)sender; - -@end - -@interface XPLittleGameRoomListView : UIView -///代理 -@property (nonatomic,weak) id delegate; -///当前的mgId -@property (nonatomic,copy) NSString *mgId; -///列表 -@property (nonatomic,strong,readonly) UITableView *tableView; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.m b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.m deleted file mode 100644 index 393a698..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.m +++ /dev/null @@ -1,175 +0,0 @@ -// -// XPRoomLittleGameListView.m -// xplan-ios -// -// Created by 冯硕 on 2022/1/22. -// - -#import "XPLittleGameRoomListView.h" -///Third -#import -///Tool - -#import "Api+LittleGame.h" -///Model -#import "LittleGameInfoModel.h" -#import "XPLittleGameTableViewCell.h" -@interface XPLittleGameRoomListView () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///原始数据源 -@property (nonatomic,strong) NSArray *gameList; -///显示的数据源 -@property (nonatomic,strong) NSArray *datasource; -///游戏信息 -@property (nonatomic,strong) LittleGameInfoModel *gameInfo; -@end - -@implementation XPLittleGameRoomListView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.layer.cornerRadius = 12.5; - self.layer.masksToBounds = YES; - self.layer.borderWidth = 0.5; - self.layer.borderColor = UIColorRGBAlpha(0xffffff, 0.6).CGColor; - self.backgroundColor = UIColorRGBAlpha(0x000000, 0.2); - [self addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(120); - make.bottom.mas_equalTo(self.stackView.mas_bottom); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(25); - }]; -} - -- (NSArray *)handleGameListData:(NSArray *)array { - NSMutableArray * dataArray= [NSMutableArray array]; - for (int i = 0; i 0) { - self.tableView.hidden = YES; - LittleGameInfoModel *info = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (info.mgId.integerValue != self.mgId.integerValue) { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomLittleGameListView:didSelectItem:)]) { - [self.delegate xPRoomLittleGameListView:self didSelectItem:info]; - } - } - } -} - -#pragma mark - Getters And Setters -- (void)setMgId:(NSString *)mgId { - _mgId = mgId; - -// if (self.gameList.count > 0) { -// self.datasource = [self handleGameListData:self.gameList]; -// } else { -// [Api getLittleGameList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { -// if (code == 200) { -// NSArray * array = [LittleGameInfoModel modelsWithArray:data.data]; -// LittleGameInfoModel * gameInfo = [[LittleGameInfoModel alloc] init]; -// gameInfo.mgId = @"0"; -// gameInfo.name = YMLocalizedString(@"XPLittleGameRoomListView0"); -// NSMutableArray * dataArray = [NSMutableArray array]; -// [dataArray addObjectsFromArray:array]; -// [dataArray addObject:gameInfo]; -// self.gameList = [dataArray copy]; -// self.datasource = [self handleGameListData:self.gameList]; -// } -// } -// roomUid:@""]; -// } -} - -- (void)setDatasource:(NSArray *)datasource { - _datasource = datasource; - [self.tableView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(25 * self.datasource.count); - }]; - [self.tableView reloadData]; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 0; - } - return _stackView; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.hidden = YES; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPLittleGameTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPLittleGameTableViewCell class])]; - } - return _tableView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.h b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.h deleted file mode 100644 index a7c151c..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPLittleGameRoomOpenView.h -// xplan-ios -// -// Created by 冯硕 on 2022/1/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomInfoModel; -@interface XPLittleGameRoomOpenView : UIView -///当前房间的信息 -@property (nonatomic,weak) UIViewController *currentVC; -///当前房间的信息 -@property (nonatomic,strong) RoomInfoModel *roomInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.m b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.m deleted file mode 100644 index c9e274c..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.m +++ /dev/null @@ -1,327 +0,0 @@ -// -// XPLittleGameRoomOpenView.m -// xplan-ios -// -// Created by 冯硕 on 2022/1/21. -// - -#import "XPLittleGameRoomOpenView.h" -///Third -#import -///Tool - -#import "UIImage+Utils.h" -#import "TTPopup.h" - -#import "Api+LittleGame.h" -#import "AccountInfoStorage.h" -#import "DESEncrypt.h" - -#import "Api+RoomSetting.h" - -///Model -#import "LittleGameInfoModel.h" -#import "RoomInfoModel.h" -///View -#import "XPCreateLittleGameCollectionViewCell.h" -#import "XPRoomViewController.h" - -@interface XPLittleGameRoomOpenView () -///背景图 -@property (nonatomic,strong) UIImageView *backImageView; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///玩法 -@property (nonatomic,strong) UILabel *playModeLabel; -///关闭按钮 -@property (nonatomic,strong) UIButton *closeButton; -///房间玩法的容器 玩法 和小游戏 列表 -@property (nonatomic,strong) UIStackView *stackView; -/// 玩法容器 -@property (nonatomic,strong) UIStackView *modelStackView; -///普通的房间 -@property (nonatomic,strong) UIButton *normalRoomButton; -///小游戏的房间 -@property (nonatomic,strong) UIButton *gameRoomButton; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///创建房间 -@property (nonatomic,strong) UIButton *createRoomButton; -/// -@property (nonatomic,strong) NSArray *datasource; -///当前选中的游戏 -@property (nonatomic,strong) LittleGameInfoModel *selectGameInfo; -@end - -@implementation XPLittleGameRoomOpenView - -- (instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if (self) { - [self initHttpRequest]; - [self initSubViews]; - [self initSubViewConstraints]; - - } - return self; -} - -#pragma mark - Private Method -- (void)initHttpRequest { - [Api getLittleGameList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [LittleGameInfoModel modelsWithArray:data.data]; - self.datasource = array; - [self.collectionView reloadData]; - } - } - roomUid:@""]; -} - -- (void)initSubViews { - self.layer.masksToBounds = YES; - self.layer.cornerRadius = 12; - self.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - [self addSubview:self.backImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.closeButton]; - [self addSubview:self.playModeLabel]; - [self addSubview:self.stackView]; - [self addSubview:self.createRoomButton]; - - [self.stackView addArrangedSubview:self.modelStackView]; - [self.stackView addArrangedSubview:self.collectionView]; - - [self.modelStackView addArrangedSubview:self.normalRoomButton]; - [self.modelStackView addArrangedSubview:self.gameRoomButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(430); - }]; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.bottom.mas_equalTo(0); - make.size.mas_equalTo(CGSizeMake(141, 123)); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(16); - make.height.mas_equalTo(22); - }]; - [self.playModeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(24); - make.leading.mas_equalTo(self.titleLabel); - make.height.mas_equalTo(17); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(16); - make.trailing.mas_equalTo(-11); - make.width.height.mas_equalTo(22); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.playModeLabel.mas_bottom).mas_offset(3); - make.leading.mas_equalTo(16); - make.trailing.mas_equalTo(self).offset(-16); - }]; - - [self.createRoomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(68); - make.height.mas_equalTo(40); - make.top.mas_equalTo(self.stackView.mas_bottom).mas_offset(51); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(118); - make.width.mas_equalTo(KScreenWidth - 16 * 2); - }]; - - [self.gameRoomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(125); - }]; - - [self.normalRoomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(125); - }]; - [self.modelStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(65); - }]; -} - -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPCreateLittleGameCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPCreateLittleGameCollectionViewCell class]) forIndexPath:indexPath]; - LittleGameInfoModel * gameInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (gameInfo.mgId == self.selectGameInfo.mgId) { - gameInfo.isSelect = YES; - } else { - gameInfo.isSelect = NO; - } - cell.gameInfo = gameInfo; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - LittleGameInfoModel * gameInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - self.selectGameInfo = gameInfo; - [self.collectionView reloadData]; - self.createRoomButton.enabled = YES; -} - -#pragma mark - Event Response -- (void)gameRoomButtonAction:(UIButton *)sender { - self.normalRoomButton.selected = NO; - sender.selected = YES; - if (self.datasource.count > 0) { - self.collectionView.hidden = NO; - } -} - -- (void)normalRoomButtonAction:(UIButton *)sender { - self.gameRoomButton.selected = NO; - sender.selected = YES; - self.collectionView.hidden = YES; -} - -- (void)closeButtonAction:(UIButton *)sender { - [TTPopup dismiss]; -} - -- (void)createRoomButtonAction:(UIButton *)sender { - [TTPopup dismiss]; - if (self.normalRoomButton.selected) { - [XPRoomViewController openRoom:[AccountInfoStorage instance].getUid viewController:self.currentVC]; - }else { - RoomInfoModel * roomInfo = self.roomInfo; - if (self.selectGameInfo.mgId.length > 0 && roomInfo) { - [XPRoomViewController openRoom:[AccountInfoStorage instance].getUid mgId:self.selectGameInfo.mgId viewController:self.currentVC]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPLittleGameRoomOpenView0")]; - } - } -} - -#pragma mark - Getters And Setters -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"room_little_game_bg"]; - } - return _backImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightBold]; - _titleLabel.text = YMLocalizedString(@"XPLittleGameRoomOpenView1"); - } - return _titleLabel; -} -- (UILabel *)playModeLabel { - if (!_playModeLabel) { - _playModeLabel = [[UILabel alloc] init]; - _playModeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _playModeLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _playModeLabel.textAlignment = NSTextAlignmentCenter; - _playModeLabel.text = YMLocalizedString(@"XPLittleGameRoomOpenView2"); - } - return _playModeLabel; -} -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentLeading; - _stackView.spacing = 16; - } - return _stackView; -} - -- (UICollectionView *)collectionView { - if (!_collectionView) { - MSBaseRTLFlowLayout *flowLayout = [[MSBaseRTLFlowLayout alloc] init]; - flowLayout.minimumLineSpacing = 0; - flowLayout.minimumInteritemSpacing = 7; - flowLayout.itemSize = CGSizeMake(98, 118); - flowLayout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:flowLayout]; - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.showsVerticalScrollIndicator = NO; - _collectionView.showsHorizontalScrollIndicator = NO; - [_collectionView registerClass:[XPCreateLittleGameCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPCreateLittleGameCollectionViewCell class])]; - _collectionView.hidden = YES; - _collectionView.backgroundColor = [UIColor clearColor]; - } - return _collectionView; -} - -- (UIStackView *)modelStackView { - if (!_modelStackView) { - _modelStackView = [[UIStackView alloc] init]; - _modelStackView.axis = UILayoutConstraintAxisHorizontal; - _modelStackView.distribution = UIStackViewDistributionFill; - _modelStackView.alignment = UIStackViewAlignmentFill; - _modelStackView.spacing = 10; - } - return _modelStackView; -} -- (UIButton *)normalRoomButton { - if (!_normalRoomButton) { - _normalRoomButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_normalRoomButton setImage:[UIImage getLanguageImage:@"room_little_game_normal_room"] forState:UIControlStateNormal]; - [_normalRoomButton setImage:[UIImage getLanguageImage:@"room_little_game_normal_room_select"] forState:UIControlStateSelected]; - [_normalRoomButton addTarget:self action:@selector(normalRoomButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _normalRoomButton.selected = YES; - } - return _normalRoomButton; -} - -- (UIButton *)gameRoomButton { - if (!_gameRoomButton) { - _gameRoomButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_gameRoomButton setImage:[UIImage getLanguageImage:@"room_little_game_game_room"] forState:UIControlStateNormal]; - [_gameRoomButton setImage:[UIImage getLanguageImage:@"room_little_game_game_room_select"] forState:UIControlStateSelected]; - [_gameRoomButton addTarget:self action:@selector(gameRoomButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _gameRoomButton.selected = NO; - } - return _gameRoomButton; -} - -- (UIButton *)createRoomButton { - if (!_createRoomButton) { - _createRoomButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_createRoomButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeUpleftToLowright imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_createRoomButton setTitle:YMLocalizedString(@"XPLittleGameRoomOpenView3") forState:UIControlStateNormal]; - _createRoomButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _createRoomButton.titleLabel.textColor = [DJDKMIMOMColor confirmButtonTextColor]; - _createRoomButton.layer.cornerRadius = 20; - _createRoomButton.layer.masksToBounds = YES; - [_createRoomButton addTarget:self action:@selector(createRoomButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _createRoomButton; -} - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeButton setImage:[UIImage imageNamed:@"room_little_game_close"] forState:UIControlStateNormal]; - [_closeButton setImage:[UIImage imageNamed:@"room_little_game_close"] forState:UIControlStateSelected]; - [_closeButton addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.h b/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.h deleted file mode 100644 index 612137a..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// XPRoomLittleGameContainerView.h -// xplan-ios -// -// Created by 冯硕 on 2022/2/14. -// - -#import -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol XPRoomLittleGameContainerViewDelegate - -- (void)hiddenSudGamePostionView; - -@end - -@interface XPRoomLittleGameContainerView : UIView -- (instancetype)initWithDelegate:(id)delegate; - -///代理 -@property (nonatomic,weak) id delegate; - -///销毁游戏的引擎 -- (void)destroyMG; - -/// 退出游戏 -- (void)handleSelfInExitEvent; - -//自己是否在游戏中 -- (BOOL)isInSudGame; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m b/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m deleted file mode 100644 index aec14b9..0000000 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m +++ /dev/null @@ -1,885 +0,0 @@ -// -// XPRoomLittleGameContainerView.m -// xplan-ios -// -// Created by 冯硕 on 2022/2/14. -// - -#import "XPRoomLittleGameContainerView.h" -///Third -#import -#import -#import -///Tool -#import "Api+LittleGame.h" -#import "AccountInfoStorage.h" - -#import "ClientConfig.h" - -#import "SudCommon.h" -#import "SudGameConfig.h" -///Model -#import "RoomInfoModel.h" -#import "MicroQueueModel.h" -#import "UserInfoModel.h" -#import "MicroExtModel.h" -#import "AttachmentModel.h" -#import "XPKickUserModel.h" -#import "GuildSuperAdminInfoModel.h" -///P -#import -#import -#import -#import -#import -@interface XPRoomLittleGameContainerView () -///当前小游戏ID -@property (nonatomic, assign) int64_t currentmgId; -///小游戏code -@property (nonatomic, copy) NSString *code; -/// -@property (nonatomic,weak) id hostDelegate; -@property (nonatomic, strong) id fsmAPP2MG; -/// 你画我猜专用，游戏中选中的关键词，会回调出来，通过 DrawSomethingKeyWord 进行保存。 -@property (nonatomic, copy) NSString * DrawSomethingKeyWord; -/// 你画我猜，进入猜词环节，用来公屏识别关键字的状态标识 -@property (nonatomic, assign) BOOL keyWordHiting; -///游戏状态 -@property (nonatomic, assign) LittleGamePlayStatus sudGameStatus; -@end - -@implementation XPRoomLittleGameContainerView - -- (instancetype)initWithDelegate:(id)delegate -{ - self = [super init]; - if (self) { - self.hostDelegate = delegate; - } - return self; -} - -#pragma mark - Private Method -- (void)updateSudGame { - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - if (roomInfo.type == RoomType_MiniGame) { - if (self.currentmgId == 0) {//第一次加载游戏 - self.currentmgId = roomInfo.mgId; - if (self.currentmgId != 0) {//房间信息已加载 - // NSLog(@"initLittleGame---%lld", self.currentmgId); - [self initLittleGame]; - } - } else { - if (self.currentmgId != roomInfo.mgId) { - //切换游戏玩法 - self.currentmgId = roomInfo.mgId; - // NSLog(@"updateLittleGame---%lld", self.currentmgId); - if (self.currentmgId != 0) { - [self.fsmAPP2MG destroyMG]; - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; - [self gameSetUp]; - } - } - } - } -} - -- (void)initLittleGame { - [Api getSudGameCode:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSString * gameCode = data.data[@"code"]; - self.code = gameCode; - [self gameSetUp]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } uid:[AccountInfoStorage instance].getUid]; -} - -- (void)gameSetUp { - // NSLog(@"小游戏的版本号是：%@", [SudMGP getVersion]); - BOOL isTestEnv = NO; -#ifdef DEBUG - isTestEnv = YES; - - NSString *isProduction = [[NSUserDefaults standardUserDefaults]valueForKey:@"kIsProductionEnvironment"]; - if([isProduction isEqualToString:@"YES"]){ - isTestEnv = NO; - } - -#else - isTestEnv = NO; -#endif - NSString *SUDAPPID = [[ClientConfig shareConfig].configInfo sudId]; - NSString *SUDAPPKEY = [[ClientConfig shareConfig].configInfo sudkey]; - if ([NSString isEmpty:SUDAPPID]) { - SUDAPPID = KeyWithType(KeyType_SudGameAppID); - } - if ([NSString isEmpty:SUDAPPKEY]) { - SUDAPPKEY = KeyWithType(KeyType_SudGameAppKey); - } - [SudMGP initSDK:SUDAPPID appKey:SUDAPPKEY isTestEnv:isTestEnv listener:^(int retCode, const NSString *retMsg) { - if (retCode == 0) { - if (!self.currentmgId) { - return; - } - NSString * userId = [AccountInfoStorage instance].getUid; - NSString * roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - // NSLog(@"用户ID：%@，房间ID：%@, 游戏ID：%lld, code:%@", userId, roomId, self.currentmgId, self.code); - - NSString *language = @"en-US"; - if (isMSZH()) { - language = @"zh-TW"; - } else if (isMSPT()) { - language = @"pt-BR"; - }else if (isMSES()) { - language = @"es-ES"; - } else if (isMSRU()) { - language = @"ru-RU"; - } else if (isMSUZ()) { - language = @"uz-UZ"; - } - - self.fsmAPP2MG = [SudMGP loadMG:userId roomId:roomId code:self.code mgId:self.currentmgId language:language fsmMG:self rootView:self]; - } else { - /// 初始化失败, 可根据业务重试 - // NSLog(@"ISudFSMMG:initGameSDKWithAppID:初始化sdk失败 :%@",retMsg); - } - }]; -} - -//判断是否在麦上 -- (BOOL)isOnMicro:(NSInteger)uid{ - NSArray *chatRoomMicSequences = [self.hostDelegate.getMicroQueue allValues] ; - if (chatRoomMicSequences != nil && chatRoomMicSequences.count > 0) { - for (int i = 0; i < chatRoomMicSequences.count; i ++) { - MicroQueueModel *chatRoomMicSequence = chatRoomMicSequences[i]; - if (chatRoomMicSequence.userInfo.uid == uid) { - return YES; - } - } - } - return NO; -} - -- (NSString *)findFreePosition{ - NSMutableDictionary * micQueue = self.hostDelegate.getMicroQueue; - if (micQueue != nil && micQueue.allKeys.count > 0) { - NSArray *keys = [micQueue allKeys]; - if (keys.count > 0) { - ///重新排序，按照升序 - NSArray *resultArr = [keys sortedArrayUsingComparator:^NSComparisonResult(id _Nonnull obj1, id _Nonnull obj2) { - return [obj1 compare:obj2]; - }]; - for (NSString *key in resultArr) { - UserInfoModel *userInfo = [[micQueue objectForKey:key] userInfo]; - if ( !userInfo) { - return key; - } - } - } - } - return nil; -} - -//通过uid判断麦位 -- (NSString *)findThePositionByUid:(NSInteger)uid{ - if (uid > 0) { - NSMutableDictionary * micQueue = self.hostDelegate.getMicroQueue; - NSArray *keys = [micQueue allKeys]; - if (keys.count > 0) { - for (NSString *key in keys) { - UserInfoModel *userInfo = [[micQueue objectForKey:key] userInfo]; - if (userInfo.uid == uid) { - return key; - } - } - } - } - return nil; -} - -//上麦以加入游戏 -- (void)upMicToJoinGame { - NSString *position = [self findFreePosition]; - if (position.length > 0) { - NSString * userId = [AccountInfoStorage instance].getUid; - UserInfoModel * userInfo = self.hostDelegate.getUserInfo; - //清空该uid之前在队列中的信息 - if ([self isOnMicro:userId.integerValue]) { - if (position) { - NSString *findOldPosition = [self findThePositionByUid:userInfo.uid]; - NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; - request.key = findOldPosition; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - if (findOldPosition) { - [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { - if (error == nil) { - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = position; - request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - [self notifySelfInState:YES seatIndex:-1]; - }]; - } - }]; - } - } - }else{ - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = position; - request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - [self notifySelfInState:YES seatIndex:-1]; - }]; - } - } -} - -- (void)updateMicInfoWithGameStatus:(LittleGamePlayStatus)status { - NSString * position = [self findThePositionByUid:[AccountInfoStorage instance].getUid.integerValue]; - if (position != nil) { - UserInfoModel * userInfo = self.hostDelegate.getUserInfo; - userInfo.gameStatus = status; - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = position; - request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - - }]; - } -} - -/** - * 麦位更新扩展字段。 - */ -- (NSDictionary *)userInfoToQueueExt:(UserInfoModel *)userInfo { - MicroExtModel * extModel = [[MicroExtModel alloc] init]; - extModel.gender = userInfo.gender; - extModel.avatar = userInfo.avatar; - extModel.uid = userInfo.uid; - extModel.nick = userInfo.nick; - extModel.gameStatus = userInfo.gameStatus; - extModel.headWearUrl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - extModel.preventKick = userInfo.userVipInfoVO.preventKick; - extModel.enterHide = userInfo.userVipInfoVO.enterHide; - return [extModel model2dictionary]; -} - -//自己是否在游戏中 -- (BOOL)isInSudGame { - BOOL isGamePlaying = NO; - if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) { - for (int i = -1; i<5; i++) { - NSMutableDictionary * micQueue = self.hostDelegate.getMicroQueue; - MicroQueueModel *micSequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i]]; - if (micSequence == nil || micSequence.userInfo == nil) { - continue; - } - if (micSequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue && micSequence.userInfo.gameStatus == LittleGamePlayStatus_Plying) { - isGamePlaying = YES; - break; - } - } - } - return isGamePlaying; -} - -//游戏状态 -- (LittleGamePlayStatus)getCurrentUserSudGameStatus { - LittleGamePlayStatus gameStatus = LittleGamePlayStatus_NoIn; - for (int i = -1; i<5; i++) { - NSMutableDictionary * micQueue = self.hostDelegate.getMicroQueue; - MicroQueueModel *micSequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i]]; - if (micSequence == nil || micSequence.userInfo == nil) { - continue; - } - if (micSequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - gameStatus = micSequence.userInfo.gameStatus; - break; - } - } - return gameStatus; -} - -///下麦 -- (void)onDownMic:(NSInteger)uid { - if (uid == [AccountInfoStorage instance].getUid.integerValue) {//自己下麦 - [self notifyIsPlayingState:false]; - [self nofityPlayerPlaying:NO]; - [self notifySetReady:false]; - /// 下游戏麦 - [self notifySelfInState:false seatIndex:-1]; - } -} - -#pragma mark =======ISudFSMMG Delegate======= -/** -* 游戏日志 -*/ --(void)onGameLog:(NSString*)dataJson { - // NSLog(@"ISudFSMMG:onGameLog:%@", dataJson); - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - NSString * msg_string = [dic objectForKey:@"msg"]; - if (!msg_string) { - return; - } -} - -/** -* 游戏开始 -*/ --(void)onGameStarted { - // NSLog(@"ISudFSMMG:onGameStarted:游戏开始"); -} - -/** - * 游戏销毁 - */ --(void)onGameDestroyed { - // NSLog(@"ISudFSMMG:onGameDestroyed:游戏开始"); -} - -/** - * Code过期 - * @param dataJson {"code":"value"} - */ --(void)onExpireCode:(id)handle dataJson:(NSString*)dataJson { - // NSLog(@"ISudFSMMG:onExpireCode:Code过期"); - // 请求业务服务器刷新令牌 - [Api getSudGameCode:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSString * gameCode = data.data[@"code"]; - self.code = gameCode; - [self.fsmAPP2MG updateCode:gameCode listener:^(int retCode, const NSString *retMsg, const NSString *dataJson) { - // NSLog(@"ISudFSMMG:updateGameCode retCode=%@ retMsg=%@ dataJson=%@", @(retCode), retMsg, dataJson); - }]; - // 回调结果 - NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:@(0), @"ret_code", @"return form APP onExpireCode", @"ret_msg", nil]; - [handle success:[SudCommon dictionaryToJson:dict]]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } uid:[AccountInfoStorage instance].getUid]; -} - -/** - * 获取游戏View信息 - * @param handle 回调句柄 - * @param dataJson {} - */ --(void)onGetGameViewInfo:(id)handle dataJson:(NSString*)dataJson { - CGRect rect = [[UIScreen mainScreen] bounds]; - CGFloat scale = [[UIScreen mainScreen] nativeScale]; - - CGFloat top = (kNavigationHeight+105) * scale; - CGFloat bottom; - if (iPhoneXSeries) { - bottom = (47+kSafeAreaBottomHeight+30 + 70) * scale; - } else { - bottom = (47 + 10 + 70 + 30) * scale; - } - CGFloat width = rect.size.width * scale; - CGFloat height = rect.size.height * scale; - NSDictionary *rectDict = [NSDictionary dictionaryWithObjectsAndKeys:@(top), @"top", @(0), @"left", @(bottom), @"bottom", @(0), @"right", nil]; - NSDictionary *viewDict = [NSDictionary dictionaryWithObjectsAndKeys:@(width), @"width", @(height), @"height", nil]; - NSDictionary *dataDict = [NSDictionary dictionaryWithObjectsAndKeys:@(0), @"ret_code", @"return form APP onGetGameViewInfo", @"ret_msg", viewDict, @"view_size", rectDict, @"view_game_rect", nil]; - /// 回调 - [handle success:[SudCommon dictionaryToJson:dataDict]]; -} - -/** - * 获取游戏配置 - * @param handle 回调句柄 - * @param dataJson {} - */ --(void)onGetGameCfg:(id)handle dataJson:(NSString*)dataJson { - NSMutableDictionary *dict = [[NSMutableDictionary alloc] init]; - dict[@"ret_code"] = @(0); - dict[@"ret_msg"] = @"return form APP onGetGameCfg"; - - dict[@"ui"] = @{ - @"join_btn" : @{@"custom": @(YES), @"hide": @(NO)},//加入游戏 - @"start_btn" : @{@"custom": @(YES), @"hide": @(NO)},//开始游戏 - @"lobby_players" : @{@"custom": @(YES), @"hide": @(NO)},//游戏中坑位点击 - @"level" : @{@"custom": @(YES), @"hide" : @(YES)},//段位信息 - }; - NSString *dataJsonRet = @""; - NSData *dataJsonData = [NSJSONSerialization dataWithJSONObject:dict options:NSJSONWritingPrettyPrinted error:nil]; - if (dataJsonData != nil) { - dataJsonRet = [[NSString alloc]initWithData:dataJsonData encoding:NSUTF8StringEncoding]; - } - [handle success:dataJsonRet]; -} - -/** - * 游戏状态变化 - * @param handle 回调句柄 - * @param state 游戏状态 - * @param dataJson 回调json - */ --(void)onGameStateChange:(id) handle state:(NSString*) state dataJson:(NSString*) dataJson { - if ([state isEqualToString:MG_COMMON_PUBLIC_MESSAGE]) { - // NSLog(@"ISudFSMMG:onGameStateChange:游戏->APP:公屏消息"); - } else if ([state isEqualToString:MG_COMMON_KEY_WORD_TO_HIT]) { - NSDictionary *dic = [SudCommon turnStringToDictionary:dataJson]; - NSString *word = [dic objectForKey:@"word"]; - // NSLog(@"ISudFSMMG:onGameStateChange:游戏->APP:你画我猜关键词获取:%@",word); - /// 记录你画我猜关键字 - self.DrawSomethingKeyWord = word; - if (word == (id) [NSNull null] || [word isEqualToString:@""]) { - /// 关闭公屏关键词hit状态 - self.keyWordHiting = NO; - } else { - /// 开启公屏关键词hit状态 - self.keyWordHiting = YES; - } - }else if ([state isEqualToString:MG_COMMON_SELF_CLICK_JOIN_BTN]) {//加入游戏按钮点击 - NSDictionary *dic = [SudCommon turnStringToDictionary:dataJson]; - int seatIndex = -1; - if ([dic objectForKey:@"seatIndex"]) { - seatIndex = [[dic objectForKey:@"seatIndex"] intValue]; - } - if (seatIndex == -1) { - // NSLog(@"来自加入按钮%d",seatIndex); - }else { - // NSLog(@"来自麦位+入%d",seatIndex); - } - if ([self isOnMicro:[AccountInfoStorage instance].getUid.integerValue]) {//判断是否在麦上 - [self notifySelfInState:YES seatIndex:seatIndex]; - } else { - //不在麦上 - [self upMicToJoinGame]; - } - } else if([state isEqualToString:MG_COMMON_SELF_CLICK_START_BTN]) {//开始游戏按钮点击 - [self notifyIsPlayingState:YES]; - } else if ([state isEqualToString:MG_COMMON_SELF_CLICK_CANCEL_JOIN_BTN]) { - /// 取消加入游戏（退出游戏按钮点击） - [self handleSelfInExitEvent]; - } else { - /// 其他状态 - // NSLog(@"ISudFSMMG:onGameStateChange:游戏->APP:state:%@",MG_COMMON_PUBLIC_MESSAGE); - } -} - -/** - * 游戏玩家状态变化 - * @param handle 回调句柄 - * @param userId 用户id - * @param state 玩家状态 - * @param dataJson 回调JSON - */ --(void)onPlayerStateChange:(nullable id) handle userId:(NSString*) userId state:(NSString*) state dataJson:(NSString*) dataJson { - // NSLog(@"ISudFSMMG:onPlayerStateChange:游戏->APP:游戏玩家状态变化:userId: %@ --state: %@ --dataJson: %@", userId, state, dataJson); - /// 状态解析 - NSString *dataStr = @""; - if ([state isEqualToString:MG_COMMON_PLAYER_IN]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView0"); - [self handleState_MG_COMMON_PLAYER_IN_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_COMMON_PLAYER_READY]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView1"); - [self handleState_MG_COMMON_PLAYER_READY_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_COMMON_PLAYER_CAPTAIN]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView2"); - [self handleState_MG_COMMON_PLAYER_CAPTAIN_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_COMMON_PLAYER_PLAYING]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView3"); - [self handleState_MG_COMMON_PLAYER_PLAYING_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_SELECTING]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView4"); - [self handleState_MG_DG_SELECTING_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_PAINTING]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView5"); - [self handleState_MG_DG_PAINTING_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_ERRORANSWER]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView6"); - [self handleState_MG_DG_ERRORANSWER_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_TOTALSCORE]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView7"); - [self handleState_MG_DG_TOTALSCORE_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_SCORE]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView8"); - [self handleState_MG_DG_SCORE_WithUserId:userId dataJson:dataJson]; - }else { - // NSLog(@"ISudFSMMG:onPlayerStateChange:未做解析状态:%@", MG_DG_SCORE); - } - // NSLog(@"ISudFSMMG:onPlayerStateChange:dataStr:%@", dataStr); - /// 回调 - NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:@(0), @"ret_code", @"return form APP onPlayerStateChange", @"ret_msg", nil]; - [handle success:[SudCommon dictionaryToJson:dict]]; -} - -/// 退出游戏 -- (void)handleSelfInExitEvent { - if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) { - return; - } - /// 正在游戏中，只退出游戏 - if ([self getCurrentUserSudGameStatus] == LittleGamePlayStatus_Plying) { - [self notifyIsPlayingState:false]; - [self nofityPlayerPlaying:NO]; - [self notifySetReady:false]; - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; - } else if ([self getCurrentUserSudGameStatus] == LittleGamePlayStatus_Ready) { /// 非游戏状态下 - /// 如果已经准备先退出准备状态 - [self notifySetReady:false]; - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; - } else { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; - } - /// 下游戏麦 - [self notifySelfInState:false seatIndex:-1]; - - self.currentmgId = -1; -} - -/// 准备游戏 -- (void)handleSelfReadyEvent { - [self notifySetReady:true]; -} - -/// 取消准备 -- (void)handleSelfCancelReadyEvent { - [self notifySetReady:false]; -} - -/// 开始游戏 -- (void)handleGameStartEvent { - [self notifyIsPlayingState:YES]; -} - -#pragma mark =======APP->游戏状态处理======= -/// 状态通知（app to mg） -/// @param state 状态名称 -/// @param dataJson 需传递的json -- (void)notifyStateChange:(NSString *) state dataJson:(NSString*) dataJson { - [self.fsmAPP2MG notifyStateChange:state dataJson:dataJson listener:^(int retCode, const NSString *retMsg, const NSString *dataJson) { - // NSLog(@"ISudFSMMG:notifyStateChange:retCode=%@ retMsg=%@ dataJson=%@", @(retCode), retMsg, dataJson); - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - if (retCode == 0 && [state isEqualToString:APP_COMMON_SELF_PLAYING]) {//开始游戏 - //上报游戏开始 - NSString *mgid = [NSString stringWithFormat:@"%lld", self.currentmgId]; - if (mgid.length <= 0) { - return; - } - [Api startGameCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code != 200) { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:[NSString stringWithFormat:@"%ld", roomInfo.uid] mgId:mgid]; - } else if (retCode == 0 && [state isEqualToString:APP_COMMON_SELF_END]) {//结束游戏 - - } - }]; -} - -/// 加入,退出游戏 -/// @param isIn YES:加入 NO:退出 -- (void)notifySelfInState:(BOOL)isIn uid:(NSInteger)uid { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isIn), @"isIn", @(1), @"teamId", nil]; - [self notifyStateChange:APP_COMMON_SELF_IN dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 加入,退出游戏 -/// @param isIn YES:加入 NO:退出 -- (void)notifySelfInState:(BOOL)isIn seatIndex:(int)seatIndex { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(seatIndex), @"seatIndex", @(isIn), @"isIn", @(1), @"teamId", nil]; - [self notifyStateChange:APP_COMMON_SELF_IN dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 踢出用户 -/// @param userId 踢出用户id -- (void)notifyKickStateWithUserId:(NSString *)userId { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:userId, @"kickedUID", nil]; - [self notifyStateChange:APP_COMMON_SELF_KICK dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 设置用户为队长 -/// @param userId 被设置用户id -- (void)notifySetCaptainStateWithUserId:(NSString *)userId { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:userId, @"curCaptainUID", nil]; - [self notifyStateChange:APP_COMMON_SELF_CAPTAIN dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 命中 关键词状态 （你画我猜） -- (void)notifyChangeTextHitState:(NSString *)keyWord { - if([keyWord isKindOfClass:[NSNull class]])return; - if (keyWord.length && [keyWord containsString:self.DrawSomethingKeyWord]) { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(true), @"isHit", self.DrawSomethingKeyWord, @"keyWord", self.DrawSomethingKeyWord, @"text", nil]; - [self notifyStateChange:APP_COMMON_SELF_TEXT_HIT dataJson:[SudCommon dictionaryToJson:dic]]; - } -} - -/// 是否设置为准备状态 -- (void)notifySetReady:(BOOL)isReady { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isReady), @"isReady", nil]; - [self notifyStateChange:APP_COMMON_SELF_READY dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 停止游戏状态设置 -- (void)notifySetEnd { - [self notifyStateChange:APP_COMMON_SELF_END dataJson:[SudCommon dictionaryToJson:@{}]]; -} - -/// 游戏中状态设置 -- (void)notifyIsPlayingState:(BOOL)isPlaying { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isPlaying), @"isPlaying", nil]; - [self notifyStateChange:APP_COMMON_SELF_PLAYING dataJson:[SudCommon dictionaryToJson:dic]]; -} - -///游戏中退出游戏 -- (void)nofityPlayerPlaying:(BOOL)isPlaying { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isPlaying), @"isPlaying", nil]; - [self notifyStateChange:MG_COMMON_PLAYER_PLAYING dataJson:[SudCommon dictionaryToJson:dic]]; -} - -#pragma mark =======游戏->APP状态处理======= -- (void)handleState_MG_COMMON_PLAYER_IN_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - /// 加入状态：YES加入，NO退出 - BOOL isIn = NO; - if (dic) { - NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; - if (retCode != 0) { - return; - } - isIn = [[dic objectForKey:@"isIn"] boolValue]; - } - if ([userId isEqualToString:[AccountInfoStorage instance].getUid]) {//是当前用户 - if (isIn) {//加入了游戏 - //判断是否在麦上 - if ([self isOnMicro:[userId longLongValue]]) { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_IsIn]; - } else {//不在麦上 - [self upMicToJoinGame]; - } - //判断是否为房主，房主需要设为队长 - if (self.hostDelegate.getRoomInfo.uid == userId.integerValue) { - [self notifySetCaptainStateWithUserId:userId]; - } - self.sudGameStatus = LittleGamePlayStatus_IsIn; - }else {//退出了游戏 - //判断是否在麦上 - if ([self isOnMicro:[userId longLongValue]]) { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; - } - self.sudGameStatus = LittleGamePlayStatus_NoIn; - } - } else {//退出游戏 - if (self.sudGameStatus == LittleGamePlayStatus_Plying) {//游戏进行中，用户退出 - ///自己是公会超管 - BOOL meIsSuperAdmin = NO; - for (GuildSuperAdminInfoModel *managerInfo in self.hostDelegate.getRoomSuperAdminList) { - if ([managerInfo.uid isEqualToString:[AccountInfoStorage instance].getUid]) { - meIsSuperAdmin = YES; - break; - } - } - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember *member = members.firstObject; - if (member.type == NIMChatroomMemberTypeManager || member.type == NIMChatroomMemberTypeCreator || meIsSuperAdmin) { - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.userIds = @[userId]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember *member = members.firstObject; - [XNDJTDDLoadingTool showErrorWithMessage:[NSString stringWithFormat:YMLocalizedString(@"XPRoomLittleGameContainerView9"), member.roomNickname]]; - } - }]; - } - } - }]; - - } - } -} - -- (void)handleState_MG_COMMON_PLAYER_READY_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 玩家是否准备,YES:已准备，NO:未准备 - BOOL isReady = NO; - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - if (dic) { - NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; - if (retCode != 0) { - return; - } - isReady = [[dic objectForKey:@"isReady"] boolValue]; - } - if ([userId isEqualToString:[AccountInfoStorage instance].getUid]) { - if (isReady) { - //判断是否在麦上 - if ([self isOnMicro:[userId longLongValue]]) { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_Ready]; - } - self.sudGameStatus = LittleGamePlayStatus_Ready; - }else { - if ([self isOnMicro:[userId longLongValue]]) { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_IsIn]; - } - self.sudGameStatus = LittleGamePlayStatus_IsIn; - } - } -} - -- (void)handleState_MG_COMMON_PLAYER_CAPTAIN_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 是否是队长：YES：是队长 NO：不是队长 - BOOL isCaptain = NO; - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - if (dic) { - /// 错误处理 - NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; - if (retCode != 0) { - return; - } - isCaptain = [[dic objectForKey:@"isCaptain"] boolValue]; - } -} - -- (void)handleState_MG_COMMON_PLAYER_PLAYING_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 是否正在游戏中 - BOOL isPlaying = NO; - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - if (dic) { - /// 错误处理 - NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; - if (retCode != 0) { - return; - } - isPlaying = [[dic objectForKey:@"isPlaying"] boolValue]; - } - if ([userId isEqualToString:[AccountInfoStorage instance].getUid]) { - if (isPlaying) { - //判断是否在麦上 - if ([self isOnMicro:[userId longLongValue]]) { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_Plying]; - } - if (self.delegate && [self.delegate respondsToSelector:@selector(hiddenSudGamePostionView)]) { - [self.delegate hiddenSudGamePostionView]; - } - self.sudGameStatus = LittleGamePlayStatus_Plying; - }else { - if ([self isOnMicro:[userId longLongValue]]) { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_IsIn]; - } - self.sudGameStatus = LittleGamePlayStatus_IsIn; - } - } -} - -- (void)handleState_MG_DG_SELECTING_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - // NSLog(@"handleState_MG_DG_SELECTING_WithUserId%@",dataJson); -} - -- (void)handleState_MG_DG_PAINTING_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - // NSLog(@"handleState_MG_DG_PAINTING_WithUserId%@",dataJson); - /// 设置麦位状态为作画中 - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - bool isPainting = NO; - if (dic) { - isPainting = [dic[@"isPainting"] boolValue]; - } -} - -- (void)handleState_MG_DG_ERRORANSWER_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 错误答案 - // NSLog(@"handleState_MG_DG_ERRORANSWER_WithUserId%@",dataJson); - -} - -- (void)handleState_MG_DG_TOTALSCORE_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 总积分 - // NSLog(@"handleState_MG_DG_TOTALSCORE_WithUserId%@",dataJson); -} - -- (void)handleState_MG_DG_SCORE_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 本次积分 - // NSLog(@"handleState_MG_DG_SCORE_WithUserId%@",dataJson); -} - -/// 销毁MG -- (void)destroyMG { - if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.fsmAPP2MG destroyMG]; - }); - } -} - -#pragma mark - RoomGuestDelegate -- (void)onRoomEntered { - if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) { - self.hidden = YES; - return; - } else { - self.hidden = NO; - } - [self updateSudGame]; -} - -- (void)onRoomUpdate { - if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) { - self.hidden = YES; - [self.fsmAPP2MG destroyMG]; - } else { - self.hidden = NO; - } - [self updateSudGame]; -} -#pragma mark - RoomGuestDelegate -- (void)handleNIMCustomMessage:(NIMMessage *)message { - if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) { - return; - } - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_Kick_User) { - XPKickUserModel * kickModel = [XPKickUserModel modelWithJSON:attachment.data]; - [self onDownMic:kickModel.uid]; - } else if(attachment.first == CustomMessageType_Queue && attachment.second == Custom_Message_Sub_Queue_Kick) { - XPKickUserModel * kickModel = [XPKickUserModel modelWithJSON:attachment.data]; - [self onDownMic:kickModel.uid]; - } - } -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) {return;} - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - switch (content.eventType) { - case NIMChatroomEventTypeQueueChange: // 麦序上下麦 - { - NSDictionary* data = (NSDictionary *)content.ext; - UserInfoModel* userInfo = [UserInfoModel modelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]]; - NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue]; - if (changeType != 1) { - [self onDownMic:userInfo.uid]; - } - } - break; - default: - break; - } -} - -- (void)handleNIMTextMessage:(NIMMessage *)message { - if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) {return;} - if (message.from.integerValue == [AccountInfoStorage instance].getUid.integerValue && [self isInSudGame]) { - [self notifyChangeTextHitState:message.text]; - } -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageBannerView.h b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageBannerView.h deleted file mode 100644 index 0f208c8..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageBannerView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// LuckyPackageBannerView.h -// YuMi -// -// Created by P on 2025/2/12. -// - -#import - -@class AttachmentModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface LuckyPackageBannerView : UIView - -@property (nonatomic, copy) void(^didTapBanner)(NSInteger roomID); - -+ (void)display:(UIView *)superView - inRoomUid:(NSInteger)roomUid - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete -exitCurrentRoom:(void(^)(void))exit; - -+ (LuckyPackageBannerView *)demoBanner; -- (void)updateDemoFor:(NSInteger)type nick:(NSString *)nick avatar:(NSString *)avatar; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageBannerView.m b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageBannerView.m deleted file mode 100644 index fbe2829..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageBannerView.m +++ /dev/null @@ -1,322 +0,0 @@ -// -// LuckyPackageBannerView.m -// YuMi -// -// Created by P on 2025/2/12. -// - -#import "LuckyPackageBannerView.h" -#import - -#import "AttachmentModel.h" -#import "XPRoomViewController.h" -#import "XCCurrentVCStackManager.h" -//{"data":{"beginTime":1739348804074,"kind":5,"redEnvelopeId":28,"redEnvelopeNum":2,"redEnvelopeType":"GIFT","roomTitle":"hansome's Room","roomUid":3184,"sendUserAvatar":"https://image.pekolive.com/image/0eaecfbbb78f600a0bbdde3e3a64d66e.gif","sendUserNick":"hansome","timestamp":1739347604265,"type":"GIFT"},"first":60,"second":607} - -@interface LuckyPackageBannerViewModel : PIBaseModel - -@property (nonatomic, assign, readonly) NSTimeInterval beginTime; -@property (nonatomic, assign, readonly) NSInteger kind; -@property (nonatomic, assign, readonly) NSInteger redEnvelopeId; -@property (nonatomic, assign, readonly) NSInteger redEnvelopeNum; -@property (nonatomic, assign, readonly) NSInteger roomUid; -@property (nonatomic, assign, readonly) NSTimeInterval timestamp; -@property (nonatomic, copy, readonly) NSString *redEnvelopeType; -@property (nonatomic, copy, readonly) NSDictionary *giftNameMap; -@property (nonatomic, copy, readonly) NSString *roomTitle; -@property (nonatomic, copy, readonly) NSString *sendUserAvatar; -@property (nonatomic, copy, readonly) NSString *sendUserNick; -@property (nonatomic, copy, readonly) NSString *type; - -@end - -@implementation LuckyPackageBannerViewModel - -@end - -@interface LuckyPackageBannerView() - -@property (nonatomic, strong) LuckyPackageBannerViewModel *model; - -@property (nonatomic, strong) UIImageView *backgroundImageView; -@property (nonatomic, strong) NetImageView *avatarImageView; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UILabel *subTitleLabel; -@property (nonatomic, strong) UIButton *goButton; -@property (nonatomic, assign) NSInteger currentRoomUid; -@property (nonatomic, copy) void(^completeDisplay)(void); -@property (nonatomic, copy) void(^exitCurrentRoom)(void); - -@end - -@implementation LuckyPackageBannerView - -+ (void)display:(UIView *)superView - inRoomUid:(NSInteger)roomUid - with:(AttachmentModel *)attachment - complete:(void(^)(void))complete -exitCurrentRoom:(void(^)(void))exit { - LuckyPackageBannerViewModel *model = [LuckyPackageBannerViewModel modelWithDictionary:attachment.data]; - - CGRect frame = CGRectMake(KScreenWidth, 0, KScreenWidth, kGetScaleWidth(100)); - LuckyPackageBannerView *banner = [[LuckyPackageBannerView alloc] initWithFrame:frame]; - banner.model = model; - banner.completeDisplay = complete; - banner.exitCurrentRoom = exit; - banner.currentRoomUid = roomUid; - - [superView addSubview:banner]; - - @kWeakify(banner); - [banner popEnterAnimation:^(BOOL finished) { - @kStrongify(banner); - [banner addNotification]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [banner popLeaveAnimation:^(bool finished) { - if (banner.completeDisplay) { - banner.completeDisplay(); - } - [banner removeNotification]; - [banner removeFromSuperview]; - }]; - }); - }]; -} - -- (void)updateDemoFor:(NSInteger)type nick:(NSString *)nick avatar:(NSString *)avatar { - self.avatarImageView.imageUrl = avatar; - self.titleLabel.text = nick; - - if (type == 1) { - self.backgroundImageView.image = kImage(@"luck_package_banner_gift"); - self.subTitleLabel.text = YMLocalizedString(@"1.0.37_text_24"); - } else { - self.backgroundImageView.image = kImage(@"luck_package_banner_coin"); - self.subTitleLabel.text = YMLocalizedString(@"1.0.37_text_25"); - } -} - -+ (LuckyPackageBannerView *)demoBanner { - CGRect frame = CGRectMake(KScreenWidth, 80, KScreenWidth, kGetScaleWidth(100)); - LuckyPackageBannerView *banner = [[LuckyPackageBannerView alloc] initWithFrame:frame]; - return banner; -} - -- (void)handleSwipeNotification { - [self dismissBanner]; -} - -- (void)handleTapNotification:(NSNotification *)note { - NSValue *value = note.userInfo[@"point"]; - CGPoint point = [value CGPointValue]; - - NSLog(@"🔄 GameUniversalBannerView: 接收到点击点 %@ (bannerContainer坐标系)", NSStringFromCGPoint(point)); - - // 将 bannerContainer 坐标系中的点转换为 GameUniversalBannerView 坐标系中的点 - CGPoint bannerPoint = [self convertPoint:point fromView:self.superview]; - - NSLog(@"🔄 GameUniversalBannerView: 转换为 banner 坐标系 %@", NSStringFromCGPoint(bannerPoint)); - NSLog(@"%@", CGRectContainsPoint(self.goButton.frame, bannerPoint) ? @"YES" : @"NO"); - // 检查点击是否与 go 按钮重合 - CGPoint goButtonPoint = [self.goButton convertPoint:bannerPoint fromView:self]; - if ([self.goButton pointInside:goButtonPoint withEvent:nil]) { - NSLog(@"🎯 GameUniversalBannerView: tap 点与 go 按钮重合，触发游戏跳转事件"); - [self handleTapGo]; - } else { - CGPoint screenPoint = [self convertPoint:point toView:nil]; - // 发送通知给 FunctionContainer 处理，传递屏幕坐标 - [[NSNotificationCenter defaultCenter] postNotificationName:@"BannerTapToFunctionContainer" - object:nil - userInfo:@{@"point": [NSValue valueWithCGPoint:screenPoint]}]; - } -} - -- (void)addNotification { - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleSwipeNotification) - name:@"SwipeOutBanner" - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTapNotification:) - name:@"TapBanner" - object:nil]; -} - -- (void)removeNotification { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (void)dismissBanner { - [self pop_removeAllAnimations]; // 停止所有动画 - - [self popLeaveAnimation:^(bool finished) { - if (self.completeDisplay) { - self.completeDisplay(); - } - [self removeFromSuperview]; - }]; -} - -- (void)popEnterAnimation:(void(^)(BOOL finished))finish { - POPSpringAnimation *enterAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewFrame]; - enterAnimation.toValue = [NSValue valueWithCGRect:CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(100))]; - enterAnimation.springBounciness = 10; // 弹性系数 - enterAnimation.springSpeed = 12; // 动画速度 - enterAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finish) { - finish(finished); - } - }; - [self pop_addAnimation:enterAnimation forKey:@"enterAnimation"]; -} - -- (void)popLeaveAnimation:(void(^)(bool finished))finish { - POPBasicAnimation *exitAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewFrame]; - exitAnimation.toValue = [NSValue valueWithCGRect:CGRectMake(-KScreenWidth, 0, KScreenWidth, kGetScaleWidth(100))]; - exitAnimation.duration = 0.25; // 动画持续时间 - exitAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - exitAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finish) { - finish(finished); - } - }; - [self pop_addAnimation:exitAnimation forKey:@"exitAnimation"]; -} - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self addSubview:self.backgroundImageView]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self).offset(-7); - make.leading.mas_equalTo(self).offset(29); - make.width.height.mas_equalTo(kGetScaleWidth(36)); - }]; - - [self addSubview:self.titleLabel]; - [self addSubview:self.subTitleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView).offset(1); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(4); - }]; - [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-7); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(4); - }]; - - [self addSubview:self.goButton]; - [self.goButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avatarImageView); - make.trailing.mas_equalTo(self).offset(-29); - make.size.mas_equalTo(CGSizeMake(45, 27)); - }]; - } - return self; -} - -- (void)setModel:(LuckyPackageBannerViewModel *)model { - _model = model; - if ([model.redEnvelopeType isEqualToString:@"GIFT"]) { - self.backgroundImageView.image = kImage(@"luck_package_banner_gift"); - self.subTitleLabel.text = YMLocalizedString(@"1.0.37_text_15.1"); - } else { - self.backgroundImageView.image = kImage(@"luck_package_banner_coin"); - self.subTitleLabel.text = YMLocalizedString(@"1.0.37_text_15.2"); - } - self.avatarImageView.imageUrl = model.sendUserAvatar; - self.titleLabel.text = model.sendUserNick; - -} - -- (void)handleTapGo { - if (self.model.roomUid == self.currentRoomUid) { - return; - } - - // 在弹框显示前保存必要数据，避免依赖banner对象 - NSInteger targetRoomUid = self.model.roomUid; - void(^exitCurrentRoomBlock)(void) = self.exitCurrentRoom; - - @kWeakify(self); - [TTPopup alertWithMessage:YMLocalizedString(@"Combo_10") confirmHandler:^{ - @kStrongify(self); - - // 检查banner是否还存在 - if (!self) { - NSLog(@"⚠️ LuckyPackageBannerView: banner已被移除，但弹框回调仍在执行"); - // 即使banner被移除，仍然执行跳转逻辑 - if (exitCurrentRoomBlock) { - exitCurrentRoomBlock(); - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:@(targetRoomUid).stringValue - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - return; - } - - // banner还存在，正常执行 - if (self.exitCurrentRoom) { - self.exitCurrentRoom(); - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:@(targetRoomUid).stringValue - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } cancelHandler:^{}]; -} - -#pragma mark - -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] init]; - _backgroundImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _backgroundImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeCornerAvatar; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.backgroundColor = [UIColor clearColor]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - [_avatarImageView setAllCornerRadius:kGetScaleWidth(18) borderWidth:1 borderColor:UIColorFromRGB(0xffea5c)]; - } - return _avatarImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:UIColorFromRGB(0xffea5c)]; - } - return _titleLabel; -} - -- (UILabel *)subTitleLabel { - if (!_subTitleLabel) { - _subTitleLabel = [UILabel labelInitWithText:@"" font:kFontRegular(14) textColor:UIColorFromRGB(0xffea5c)]; - } - return _subTitleLabel; -} - -- (UIButton *)goButton { - if (!_goButton) { - _goButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_goButton setBackgroundImage:kImage(@"luck_package_banner_go") forState:UIControlStateNormal]; - [_goButton addTarget:self action:@selector(handleTapGo) forControlEvents:UIControlEventTouchUpInside]; - } - return _goButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageLogicManager.h b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageLogicManager.h deleted file mode 100644 index ebbc3d2..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageLogicManager.h +++ /dev/null @@ -1,82 +0,0 @@ -// -// LuckyPackageLogicManager.h -// YuMi -// -// Created by P on 2025/2/7. -// - -#import -@class GiftInfoModel, WalletInfoModel, RoomLuckyPackageInfoModel, OpenRedEnvelopeVo, AttachmentModel, RedEnvelopeReceiveVo; -NS_ASSUME_NONNULL_BEGIN - -@interface LuckyPackageLogicManager : NSObject - -@property(nonatomic, strong) NSString *roomUid; - -+ (instancetype)sharedInstance; - -- (void)reset; - -- (void)requestRoomLuckyPackageAPI:(NSInteger)roomUid success:(void(^)(RoomLuckyPackageInfoModel *model))success; -- (void)requestOpenLockyPackageAPI:(NSInteger)packageID success:(void(^)(OpenRedEnvelopeVo *model))success failure:(void(^)(NSError *error))failure; -- (void)requestLuckyPackageReceiversAPI:(NSInteger)packageID success:(void(^)(NSArray *array))success failure:(void(^)(NSError *error))failure; -- (void)saveWalletInfo:(WalletInfoModel *)info; -- (WalletInfoModel *)loadSavedWalletInfo; - -- (void)receiveNewPostLuckyPackage:(AttachmentModel *)obj; -- (void)removeReceivedLuckyPackage; - -- (void)registerLuckyPackageUpdate:(void(^)(RoomLuckyPackageInfoModel *model))block; - -/// 更新选中的礼物 -- (void)updateSelectedGift:(GiftInfoModel *)gift - count:(NSInteger)count; -/// 更新礼物红包的等待时间 -- (void)updateSelectedGiftWaitingTime:(NSInteger)time; -/// 注册礼物红包总成本的内容更新 block -- (void)registerGiftTotalCostString:(void(^)(NSAttributedString *content))block key:(NSString *)key; -- (void)removeGiftTotalCostRegister:(NSString *)key; -/// 注册金币红包总成本的内容更新 block -- (void)registerCoinTotalCostString:(void(^)(NSAttributedString *content))block; -/// 获取最新的礼物红包总成本 -//- (NSString *)loadGiftTotalCostString; -- (NSAttributedString *)loadGiftTotalCostString; -/// 获取最新的金币红包总成本 -- (NSAttributedString *)loadCoinTotalCostString; -/// 更新选中金币红包的金额 -- (void)updateSelectedBag:(NSInteger)money; -/// 更新选中金币红包的数量 -- (void)updateSelectedBagNum:(NSInteger)num; -/// 更新金币红包的等待时间 -- (void)updateSelectedBagWaitingTime:(NSInteger)time; -/// 获取最新的礼物红包等待时间 -- (NSInteger)loadGiftWaitingTime; -/// 获取最新的金币红包等待时间 -- (NSInteger)loadCoinWaitingTime; -/// 获取最新的金币红包选中金额 -- (NSInteger)loadSelectedBagMoney; -/// 获取最新的金币红包选中数量 -- (NSInteger)loadSelectedBagNum; -/// 获取礼物红包中所有选中的礼物 -- (NSArray *)loadAllSelectedGifts; -/// 获取礼物红包中所有选中的礼物的总数 -- (NSInteger)numberOfGifts; -/// 获取礼物红包中指定下标的礼物 -- (GiftInfoModel *)giftForIndex:(NSInteger)index; -/// 获取礼物红包中指定下标的礼物数量 -- (NSInteger)countOfGiftForIndex:(NSInteger)index; -/// 获取配置中的所有等待时间（单位：秒） -- (NSArray *)loadConfigWaitingTimes; -/// 获取配置中的所有等待时间（单位：分） -- (NSArray *)loadConfigWaitingTimesMins; -/// 获取配置中的金币红包可选数量 -- (NSArray *)loadConfigLuckyBagNumbers; -/// 获取配置中的金币红包可选金额 -- (NSArray *)loadConfigLuckyBagMoneys; -/// 获取红包数量 -- (NSInteger)packageBadgeNum; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageLogicManager.m b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageLogicManager.m deleted file mode 100644 index d975257..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageLogicManager.m +++ /dev/null @@ -1,331 +0,0 @@ -// -// LuckyPackageLogicManager.m -// YuMi -// -// Created by P on 2025/2/7. -// - -#import "LuckyPackageLogicManager.h" - -#import "GiftInfoModel.h" -#import "AttachmentModel.h" -#import "WalletInfoModel.h" -#import "LuckyPackagePresenter.h" - -@interface LuckyPackageLogicManager() - -@property(nonatomic, strong) WalletInfoModel *walletInfo; -@property(nonatomic, strong) RoomLuckyPackageInfoModel *infoModel; - -// 礼物红包 -@property(nonatomic, strong) NSMutableArray *selectedGiftModels; -@property(nonatomic, strong) NSMutableArray *selectedGiftCounts; -@property(nonatomic, assign) NSInteger selectedWaitingTime_gift; -@property(nonatomic, strong) NSMutableAttributedString *totalCostString_Gift; -//@property(nonatomic, copy) void(^giftTotalCostBlock)(NSString *content); - -@property(nonatomic, strong) NSMutableArray *giftTotalCostBlockArray; - -// 金币红包 -@property(nonatomic, assign) NSInteger selectedWaitingTime_coin; -@property(nonatomic, assign) NSInteger selectedBagMoney; -@property(nonatomic, assign) NSInteger selectedBagCount; -@property(nonatomic, strong) NSMutableAttributedString *totalCostString_Coin; - -@property(nonatomic, assign) NSInteger packageNum; - -@property(nonatomic, copy) void(^coinTotalCostBlock)(NSAttributedString *content); -@property(nonatomic, copy) void(^luckyPackageUpdate)(RoomLuckyPackageInfoModel *model); -@end - -@implementation LuckyPackageLogicManager - -+ (instancetype)sharedInstance { - static LuckyPackageLogicManager *instance = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - instance = [[self alloc] init]; - instance.selectedGiftCounts = @[].mutableCopy; - instance.selectedGiftModels = @[].mutableCopy; - instance.giftTotalCostBlockArray = @[].mutableCopy; - }); - - return instance; -} - -- (void)requestRoomLuckyPackageAPI:(NSInteger)roomUid success:(void(^)(RoomLuckyPackageInfoModel *model))success{ - [self reset]; - LuckyPackagePresenter *presenter = [[LuckyPackagePresenter alloc] init]; - @kWeakify(self); - [presenter loadRoomLuckyPackageInfo:roomUid success:^(RoomLuckyPackageInfoModel * _Nonnull model) { - @kStrongify(self); - NSArray *temp = [model.redEnvelopeListVoList sortedArrayUsingComparator:^NSComparisonResult(RedEnvelopeListVo * _Nonnull obj1, RedEnvelopeListVo * _Nonnull obj2) { - return [@(obj1.beginTime) compare:@(obj2.beginTime)]; - }]; - model.redEnvelopeListVoList = temp; - self.packageNum = model.redEnvelopeListVoList.count; - self.infoModel = model; - self.selectedWaitingTime_coin = [[model.redEnvelopeV2Config.timeItems xpSafeObjectAtIndex:0] integerValue]; - self.selectedWaitingTime_gift = [[model.redEnvelopeV2Config.timeItems xpSafeObjectAtIndex:0] integerValue]; - [self updateSelectedBag:[[model.redEnvelopeV2Config.goldItems xpSafeObjectAtIndex:0] integerValue]]; - [self updateSelectedBagNum:[[model.redEnvelopeV2Config.numItems xpSafeObjectAtIndex:0] integerValue]]; - if (success) { - success(model); - } - }]; -} - -- (void)receiveNewPostLuckyPackage:(AttachmentModel *)obj { - NSDictionary *data = obj.data; - if (data) { - RedEnvelopeListVo *vo = [RedEnvelopeListVo modelWithJSON:data]; - if (vo.roomUid != self.roomUid.integerValue) { - return; - } - - vo.avatar = [data objectForKey:@"sendUserAvatar"]; - vo.nick = [data objectForKey:@"sendUserNick"]; - NSMutableArray *temp = [self.infoModel.redEnvelopeListVoList mutableCopy]; - [temp addObject:vo]; - self.infoModel.redEnvelopeListVoList = [temp sortedArrayUsingComparator:^NSComparisonResult(RedEnvelopeListVo * _Nonnull obj1, RedEnvelopeListVo * _Nonnull obj2) { - return [@(obj1.beginTime) compare:@(obj2.beginTime)]; - }]; - self.packageNum = self.infoModel.redEnvelopeListVoList.count; - if (_luckyPackageUpdate) { - self.luckyPackageUpdate(self.infoModel); - } - } -} - -- (void)removeReceivedLuckyPackage { - NSMutableArray *array = [self.infoModel.redEnvelopeListVoList mutableCopy]; - if (array.count>0) { - [array xpSafeRemoveObjectAtIndex:0]; - } - self.infoModel.redEnvelopeListVoList = array.copy; - self.packageNum = self.infoModel.redEnvelopeListVoList.count; - if (_luckyPackageUpdate) { - self.luckyPackageUpdate(self.infoModel); - } -} - -- (void)registerLuckyPackageUpdate:(void(^)(RoomLuckyPackageInfoModel *model))block { - _luckyPackageUpdate = block; -} - -- (void)requestOpenLockyPackageAPI:(NSInteger)packageID success:(void(^)(OpenRedEnvelopeVo *model))success failure:(void(^)(NSError *error))failure { - LuckyPackagePresenter *presenter = [[LuckyPackagePresenter alloc] init]; - [presenter open:packageID success:success failure:failure]; -} - -- (void)requestLuckyPackageReceiversAPI:(NSInteger)packageID success:(void(^)(NSArray *array))success failure:(void(^)(NSError *error))failure { - LuckyPackagePresenter *presenter = [[LuckyPackagePresenter alloc] init]; - [presenter loadReceiversOfLuckyPackage:packageID success:success failure:failure]; -} - -- (void)saveWalletInfo:(WalletInfoModel *)info { - self.walletInfo = info; -} - -- (WalletInfoModel *)loadSavedWalletInfo { - return self.walletInfo; -} - -- (void)reset { - LuckyPackagePresenter *presenter = [[LuckyPackagePresenter alloc] init]; - [presenter resetGiftsCount:[self roomUid]]; - [self.selectedGiftCounts removeAllObjects]; - [self.selectedGiftModels removeAllObjects]; - [self.giftTotalCostBlockArray removeAllObjects]; - self.selectedWaitingTime_gift = [[self.infoModel.redEnvelopeV2Config.timeItems xpSafeObjectAtIndex:0] integerValue]; - [self updateGiftTotalCostString]; - - self.selectedWaitingTime_coin = [[self.infoModel.redEnvelopeV2Config.timeItems xpSafeObjectAtIndex:0] integerValue]; - [self updateSelectedBag:[[self.infoModel.redEnvelopeV2Config.goldItems xpSafeObjectAtIndex:0] integerValue]]; - [self updateSelectedBagNum:[[self.infoModel.redEnvelopeV2Config.numItems xpSafeObjectAtIndex:0] integerValue]]; -} - -#pragma mark - 礼物红包 - - -#pragma mark - 金币红包 - -- (void)updateSelectedGift:(GiftInfoModel *)gift - count:(NSInteger)count { - NSUInteger index = [self.selectedGiftModels indexOfObjectPassingTest:^BOOL(GiftInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - return [obj isEqual:gift]; - }]; - - if (count == 0 && index != NSNotFound) { - [self.selectedGiftModels xpSafeRemoveObjectAtIndex:index]; - [self.selectedGiftCounts xpSafeRemoveObjectAtIndex:index]; - } else { - if (index != NSNotFound) { - [self.selectedGiftCounts replaceObjectAtIndex:index withObject:@(count)]; - } else { - [self.selectedGiftModels addObject:gift]; - [self.selectedGiftCounts addObject:@(count)]; - } - } - - [self updateGiftTotalCostString]; -} - -- (void)updateSelectedGiftWaitingTime:(NSInteger)time { - self.selectedWaitingTime_gift = time; - [self updateGiftTotalCostString]; -} - -- (void)registerGiftTotalCostString:(void(^)(NSAttributedString *content))block key:(nonnull NSString *)key{ - // 检查是否已经存在该 key - for (NSDictionary *blockDict in self.giftTotalCostBlockArray) { - if (blockDict.allKeys.firstObject && [blockDict.allKeys.firstObject isEqualToString:key]) { - // 如果 key 已经存在，则不添加，直接返回 - return; - } - } - - [self.giftTotalCostBlockArray addObject:@{key: block}]; -} - -- (void)removeGiftTotalCostRegister:(NSString *)key { - // 查找并移除对应 key 的 block - for (NSDictionary *blockDict in self.giftTotalCostBlockArray) { - if (blockDict.allKeys.firstObject && [blockDict.allKeys.firstObject isEqualToString:key]) { - [self.giftTotalCostBlockArray removeObject:blockDict]; - break; // 找到并移除后退出循环 - } - } -} - -- (void)registerCoinTotalCostString:(void(^)(NSAttributedString *content))block { - _coinTotalCostBlock = block; -} - -- (void)updateGiftTotalCostString { - NSNumber *count = [self.selectedGiftCounts valueForKeyPath:@"@sum.self"]; - __block double price = 0; - [self.selectedGiftModels enumerateObjectsUsingBlock:^(GiftInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - NSNumber *giftCount = [self.selectedGiftCounts xpSafeObjectAtIndex:idx]; - double giftPrice = [obj goldPrice]; - price += giftCount.integerValue * giftPrice; - }]; - - NSString *string = [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_11"), count, @(price)]; - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:string - attributes:@{ - NSFontAttributeName : kFontRegular(12), - NSForegroundColorAttributeName : UIColorFromRGB(0xffea5c) - }]; - NSRange countRange = [string rangeOfString:count.stringValue]; - NSRange priceRange = [string rangeOfString:@(price).stringValue options:NSBackwardsSearch]; // 从后向前查找 price，避免匹配到 count - - [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:countRange]; - [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:priceRange]; - - self.totalCostString_Gift = attributedString; - for (NSDictionary *dic in self.giftTotalCostBlockArray) { - void(^block)(NSAttributedString *) = dic.allValues.firstObject; - // 执行 block，并传入所需的参数 - if (block) { - block(self.totalCostString_Gift); - } - } -} - -- (void)updateSelectedBag:(NSInteger)money { - self.selectedBagMoney = money; - [self updateCoinTotalCostString]; -} - -- (void)updateSelectedBagNum:(NSInteger)num { - self.selectedBagCount = num; - [self updateCoinTotalCostString]; -} - -- (void)updateSelectedBagWaitingTime:(NSInteger)time { - self.selectedWaitingTime_coin = time; -} - -- (void)updateCoinTotalCostString { - NSInteger totalCoast = self.selectedBagMoney; - NSString *string = [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_9"), @(totalCoast)]; - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:string - attributes:@{ - NSFontAttributeName : kFontRegular(12), - NSForegroundColorAttributeName : UIColorFromRGB(0xffea5c) - }]; - NSRange countRange = [string rangeOfString:@(totalCoast).stringValue]; - [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:countRange]; - self.totalCostString_Coin = attributedString; - if (_coinTotalCostBlock) { - self.coinTotalCostBlock(self.totalCostString_Coin.copy); - } -} - -- (NSAttributedString *)loadGiftTotalCostString { - return self.totalCostString_Gift.copy; -} - -- (NSAttributedString *)loadCoinTotalCostString { - return self.totalCostString_Coin.copy; -} - -- (NSInteger)loadGiftWaitingTime { - return self.selectedWaitingTime_gift; -} - -- (NSInteger)loadCoinWaitingTime { - return self.selectedWaitingTime_coin; -} - -- (NSInteger)loadSelectedBagMoney { - return self.selectedBagMoney; -} - -- (NSInteger)loadSelectedBagNum { - return self.selectedBagCount; -} - -- (NSArray *)loadAllSelectedGifts { - return self.selectedGiftModels; -} - -- (NSInteger)numberOfGifts { - return self.selectedGiftModels.count; -} - -- (GiftInfoModel *)giftForIndex:(NSInteger)index { - return [self.selectedGiftModels xpSafeObjectAtIndex:index]; -} - -- (NSInteger)countOfGiftForIndex:(NSInteger)index { - return [[self.selectedGiftCounts xpSafeObjectAtIndex:index] integerValue]; -} - -- (NSArray *)loadConfigWaitingTimes { - return self.infoModel.redEnvelopeV2Config.timeItems; -} - -- (NSArray *)loadConfigWaitingTimesMins { - NSMutableArray *arr = @[].mutableCopy; - for (NSNumber *time in self.infoModel.redEnvelopeV2Config.timeItems) { - [arr addObject:@(time.integerValue/60)]; - } - return arr.copy; -} - -- (NSArray *)loadConfigLuckyBagNumbers { - return self.infoModel.redEnvelopeV2Config.numItems; -} - -- (NSArray *)loadConfigLuckyBagMoneys { - return self.infoModel.redEnvelopeV2Config.goldItems; -} - -- (NSInteger)packageBadgeNum { - return self.packageNum; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageMessageTableViewCell.h b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageMessageTableViewCell.h deleted file mode 100644 index b406aa1..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageMessageTableViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// LuckyPackageMessageTableViewCell.h -// YuMi -// -// Created by P on 2025/2/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface LuckyPackageMessageTableViewCell : UITableViewCell - -@property(nonatomic, copy) NSDictionary *dataSource; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageMessageTableViewCell.m b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageMessageTableViewCell.m deleted file mode 100644 index a007dc5..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageMessageTableViewCell.m +++ /dev/null @@ -1,114 +0,0 @@ -// -// LuckyPackageMessageTableViewCell.m -// YuMi -// -// Created by P on 2025/2/14. -// - -#import "LuckyPackageMessageTableViewCell.h" - -@interface LuckyPackageMessageTableViewCell() - -@property(nonatomic, strong) UIImageView *bgImageView; -@property(nonatomic, strong) NetImageView *avatarImageView; -@property(nonatomic, strong) UILabel *nickLabel; -@property(nonatomic, strong) UILabel *contentLabel; - -@end - -@implementation LuckyPackageMessageTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.backgroundColor = [UIColor clearColor]; - - self.selectionStyle = UITableViewCellSelectionStyleNone; - - [self.contentView addSubview:self.bgImageView]; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.contentLabel]; - - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView).insets(UIEdgeInsetsMake(0, 0, 10, 0)); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(9); - make.size.mas_equalTo(CGSizeMake(26, 26)); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.avatarImageView); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(4); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(6); - make.leading.trailing.mas_equalTo(self.contentView).inset(9); - }]; - } - return self; -} - -- (void)setDataSource:(NSDictionary *)dataSource { - _dataSource = dataSource; - - NSString *bgImageName = isMSRTL() ? @"_ar" : @""; - NSString *type = [dataSource objectForKey:@"type"]; - NSString *content = @""; - if ([type isEqualToString:@"GIFT"]) { - bgImageName = [NSString stringWithFormat:@"luck_package_message_gift%@", bgImageName]; - content = YMLocalizedString(@"1.0.37_text_24"); - } else { - bgImageName = [NSString stringWithFormat:@"luck_package_message_coin%@", bgImageName]; - content = YMLocalizedString(@"1.0.37_text_25"); - } - [self.bgImageView setImage:kImage(bgImageName)]; - - NSString *avatarURL = [dataSource objectForKey:@"sendUserAvatar"]; - self.avatarImageView.imageUrl = avatarURL; - - NSString *name = [dataSource objectForKey:@"sendUserNick"]; - self.nickLabel.text = name; - - self.contentLabel.text = content; -} - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _bgImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeCornerAvatar; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.backgroundColor = [UIColor clearColor]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - [_avatarImageView setAllCornerRadius:13 borderWidth:1 borderColor:UIColorFromRGB(0xFFEA5C)]; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:UIColorFromRGB(0xffea5c)]; - } - return _nickLabel; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [UILabel labelInitWithText:@"" font:kFontMedium(13) textColor:UIColorFromRGB(0xffea5c)]; - _contentLabel.numberOfLines = 0; - } - return _contentLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackagePresenter.h b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackagePresenter.h deleted file mode 100644 index f9a930b..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackagePresenter.h +++ /dev/null @@ -1,51 +0,0 @@ -// -// LuckyPackagePresenter.h -// YuMi -// -// Created by P on 2025/2/7. -// - -#import "BaseMvpPresenter.h" -#import "GiftInfoModel.h" -#import "WalletInfoModel.h" -#import "RoomLuckyPackageInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@protocol LuckyPackagePresenterProtocol - -- (void)loadGiftsSuccess:(NSArray *)gifts; -- (void)loadWalletInfoSuccess:(WalletInfoModel *)walletInfo; - -@end - -@interface LuckyPackagePresenter : BaseMvpPresenter -- (void)resetGiftsCount:(NSString *)roomUid; -- (void)loadGifts:(NSString *)roomUid; - -- (void)loadWalletInfo; - -- (void)sendGiftLuckyPackage:(NSInteger)roomUid - uid:(NSString *)uid - waitingTime:(NSInteger)time - selectedGifts:(NSArray *)gifts - success:(void(^)(void))success; - -- (void)sendCoinLuckyPackage:(NSInteger)roomUid - uid:(NSString *)uid - waitingTime:(NSInteger)time - num:(NSNumber *)num - goldNum:(NSNumber *)goldNum - success:(void(^)(void))success; - -- (void)loadRoomLuckyPackageInfo:(NSInteger)roomUid success:(void(^)(RoomLuckyPackageInfoModel *model))success; - -- (void)loadLuckyPackageRecords:(NSInteger)page type:(NSInteger)type success:(void(^)(NSArray *array))success; - -- (void)open:(NSInteger)packageId success:(void(^)(OpenRedEnvelopeVo *model))success failure:(void(^)(NSError *error))failure; - -- (void)loadReceiversOfLuckyPackage:(NSInteger)luckyPackageID success:(void(^)(NSArray *array))success failure:(void(^)(NSError *error))failure; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackagePresenter.m b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackagePresenter.m deleted file mode 100644 index 430a2ab..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackagePresenter.m +++ /dev/null @@ -1,144 +0,0 @@ -// -// LuckyPackagePresenter.m -// YuMi -// -// Created by P on 2025/2/7. -// - -#import "LuckyPackagePresenter.h" - -#import "Api.h" -#import "Api+LuckyPackage.h" -#import "XPGiftStorage.h" -#import "LuckyPackageLogicManager.h" - -@implementation LuckyPackagePresenter - -- (void)resetGiftsCount:(NSString *)roomUid { - NSArray *array = [[XPGiftStorage shareStorage] getGiftPanelTagsDatasource:roomUid]; - if (array.count > 0) { - GiftPanelTabModel *firstTab = array.firstObject; - NSArray *arr = firstTab.gifts; - for (GiftInfoModel *gift in arr) { - gift.luckyPackageCount = 0; - } - } -} - -- (void)loadGifts:(NSString *)roomUid { - NSArray *array = [[XPGiftStorage shareStorage] getGiftPanelTagsDatasource:roomUid]; - if (array.count > 0) { - GiftPanelTabModel *firstTab = array.firstObject; - NSArray *arr = firstTab.gifts; - [[self getView] loadGiftsSuccess:arr]; - } -} - - -- (void)loadWalletInfo { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - @kWeakify(self); - [Api getUserWalletInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data]; - [[self getView] loadWalletInfoSuccess:model]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:NO] uid:uid ticket:ticket]; -} - -- (void)sendGiftLuckyPackage:(NSInteger)roomUid - uid:(NSString *)uid - waitingTime:(NSInteger)time - selectedGifts:(NSArray *)gifts - success:(void(^)(void))success{ - NSMutableArray *giftItems = @[].mutableCopy; - for (GiftInfoModel *model in gifts) { - [giftItems addObject:@{@"giftId":@(model.giftId), - @"giftNum":@(model.luckyPackageCount)}]; - } - - [Api postGiftNewRedEnvelope:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - success(); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES] - countDownSecond:@(time) - giftItems:giftItems.copy - roomUid:@(roomUid) - uid:uid - type:@"GIFT"]; -} - -- (void)sendCoinLuckyPackage:(NSInteger)roomUid - uid:(NSString *)uid - waitingTime:(NSInteger)time - num:(NSNumber *)num - goldNum:(NSNumber *)goldNum - success:(void(^)(void))success { - [Api postDiamondNewRedEnvelope:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - success(); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES] - countDownSecond:@(time) - goldNum:goldNum - num:num - roomUid:@(roomUid) - uid:uid - type:@"DIAMOND"]; -} - -- (void)loadRoomLuckyPackageInfo:(NSInteger)roomUid success:(void(^)(RoomLuckyPackageInfoModel *model))success { - [Api getNewRedEnvelopeList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - success([RoomLuckyPackageInfoModel modelWithJSON:data.data]); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:NO errorToast:NO] roomUid:@(roomUid)]; -} - -- (void)loadLuckyPackageRecords:(NSInteger)page type:(NSInteger)type success:(void(^)(NSArray *array))success { - [Api getNewRedEnvelopeDetail:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - success([RedEnvelopeListVo modelsWithArray:data.data]); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:NO errorToast:YES] - pageNo:@(page) - pageSize:@(100) - type:@(type)]; -} - -- (void)open:(NSInteger)packageId success:(void(^)(OpenRedEnvelopeVo *model))success failure:(void(^)(NSError *error))failure { - [Api postNewRedEnvelopeOpen:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - success([OpenRedEnvelopeVo modelWithJSON:data.data]); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:msg code:code userInfo:nil]); - } - } showLoading:NO errorToast:NO] redEnvelopeId:@(packageId)]; -} - -- (void)loadReceiversOfLuckyPackage:(NSInteger)luckyPackageID success:(void(^)(NSArray *array))success failure:(void(^)(NSError *error))failure { - [Api getNewRedEnvelopeGet:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - success([RedEnvelopeReceiveVo modelsWithArray:data.data]); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] redEnvelopeId:@(luckyPackageID)]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageStatusView.h b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageStatusView.h deleted file mode 100644 index ead4923..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageStatusView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// LuckyPackageStatusView.h -// YuMi -// -// Created by P on 2025/2/12. -// - -#import -@class RedEnvelopeListVo; - -NS_ASSUME_NONNULL_BEGIN - -@interface LuckyPackageStatusView : UIView - - -- (instancetype)initWithModel:(RedEnvelopeListVo *)model gap:(NSInteger)gap; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageStatusView.m b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageStatusView.m deleted file mode 100644 index eda1fc7..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageStatusView.m +++ /dev/null @@ -1,877 +0,0 @@ -// -// LuckyPackageStatusView.m -// YuMi -// -// Created by P on 2025/2/12. -// - -#import "LuckyPackageStatusView.h" - -#import "LuckyPackageLogicManager.h" -#import "RoomLuckyPackageInfoModel.h" -#import "UserInfoModel.h" -#import "XPSkillCardPlayerManager.h" -#import -#import "XPRoomGiftAnimationParser.h" -#import "MoliMoneyLabel.h" - -@interface LuckyPackageOtherListTableViewCell: UITableViewCell - -@property(nonatomic, strong) RedEnvelopeReceiveVo *cellModel; -@property(nonatomic, strong) NetImageView *avatarImageView; -@property(nonatomic, strong) UIView *meBackgroundView; -@property(nonatomic, strong) UILabel *meLabel; -@property(nonatomic, strong) UILabel *titleLabel; -@property(nonatomic, strong) UILabel *dateLabel; -@property(nonatomic, strong) MoliMoneyLabel *moneyLabel; - -@end - -@implementation LuckyPackageOtherListTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.backgroundColor = [UIColor clearColor]; - - [self.contentView addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.leading.mas_equalTo(0); - make.size.mas_equalTo(45); - }]; - - [self.contentView addSubview:self.meBackgroundView]; - [self.contentView addSubview:self.meLabel]; - [self.meLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.avatarImageView); - make.centerY.mas_equalTo(self.avatarImageView.mas_bottom).offset(-4); - make.height.mas_equalTo(14); - make.width.mas_equalTo(28); - }]; - - [self.meBackgroundView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.meLabel); - }]; - - [self.contentView addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(7);; - make.top.mas_equalTo(self.avatarImageView).offset(2); - }]; - - [self.contentView addSubview:self.moneyLabel]; - [self.moneyLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.titleLabel); - }]; - - [self.contentView addSubview:self.dateLabel]; - [self.dateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(7); - make.trailing.mas_equalTo(self.contentView).offset(-8); - make.bottom.mas_equalTo(self.avatarImageView).offset(-4); - }]; - } - return self; -} - -- (void)setCellModel:(RedEnvelopeReceiveVo *)cellModel { - _cellModel = cellModel; - self.avatarImageView.imageUrl = cellModel.userVO.avatar; - self.titleLabel.text = cellModel.userVO.nick; - self.dateLabel.text = cellModel.createTimeStr; - self.meLabel.hidden = !cellModel.isME; - self.meBackgroundView.hidden = !cellModel.isME; - - RedEnvelopeGiftItemVO *giftItem = [cellModel.redEnvelopeGiftItemVOs xpSafeObjectAtIndex:0]; - if (giftItem) { - [self.moneyLabel displayIcon:NO]; - [self.moneyLabel updateContent:[NSString stringWithFormat:@"%@*%@", giftItem.giftVo.giftName, @(giftItem.giftNum)]]; - } else { - [self.moneyLabel displayIcon:YES]; - [self.moneyLabel updateContent:@(cellModel.amount).stringValue]; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeCornerAvatar; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.backgroundColor = [UIColor clearColor]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - [_avatarImageView setAllCornerRadius:45/2 borderWidth:2 borderColor:UIColorFromRGB(0xffd168)]; - } - return _avatarImageView; -} - -- (UIView *)meBackgroundView { - if (!_meBackgroundView) { - _meBackgroundView = [[UIView alloc]init]; - [_meBackgroundView addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xFFDC8B), - UIColorFromRGB(0xFBCC5F) - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 0.5) cornerRadius:7]; - } - return _meBackgroundView; -} - -- (UILabel *)meLabel { - if (!_meLabel) { - _meLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.37_text_22") font:kFontMedium(11) textColor:UIColorFromRGB(0x292601)]; - _meLabel.textAlignment = NSTextAlignmentCenter; - _meLabel.backgroundColor = [UIColor clearColor]; - } - return _meLabel; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:UIColorFromRGB(0x292601)]; - } - return _titleLabel; -} - -- (UILabel *)dateLabel { - if (!_dateLabel) { - _dateLabel = [UILabel labelInitWithText:@"" font:kFontMedium(12) textColor:UIColorFromRGB(0x292601)]; - _dateLabel.alpha = 0.8; - } - return _dateLabel; -} - -- (MoliMoneyLabel *)moneyLabel { - if (!_moneyLabel) { - _moneyLabel = [MoliMoneyLabel moneyLabelWithTextColot:UIColorFromRGB(0x292601) font:kFontMedium(14) moneyPostion:2 moneySize:CGSizeMake(16, 16)]; - [_moneyLabel updateSpacing:0]; - [_moneyLabel removeSpace]; - } - return _moneyLabel; -} - -@end - -@interface LuckyPackageStatusView () - -@property(nonatomic, strong) RedEnvelopeListVo *model; -@property(nonatomic, strong) OpenRedEnvelopeVo *openModel; -@property(nonatomic, strong) NSArray *receiveVoArray; - -@property(nonatomic, strong) UIImageView *bgShortImageView; -@property(nonatomic, strong) UIImageView *bgLongImageView; -@property(nonatomic, strong) UIImageView *centerIconImageView; -@property(nonatomic, strong) UILabel *titleLabel; -@property(nonatomic, strong) UILabel *subTitleLabel; -@property(nonatomic, strong) UILabel *counterLabel; -@property(nonatomic, strong) UILabel *giftNumLabel; -@property(nonatomic, strong) UIView *giftNumBGView; -@property(nonatomic, strong) UILabel *tipsLabel; -@property(nonatomic, strong) MoliMoneyLabel *giftCoinLabel; -@property(nonatomic, strong) UIButton *viewOthersButton; -@property(nonatomic, strong) UIButton *okButton; -@property(nonatomic, strong) UIView *giftImageBGView; -@property(nonatomic, strong) NetImageView *giftImageView; -@property(nonatomic, strong) UILabel *giftNameLabel; -@property(nonatomic, strong) NetImageView *avatarImageView; -@property(nonatomic, strong) UITableView *tableView; -@property(nonatomic, strong) UILabel *moneyLabel; -@property(nonatomic, strong) UIImageView *moneyIcon; -@property(nonatomic, strong) UIImageView *emptyImageView; -@property(nonatomic, assign) NSInteger gap; -@property(nonatomic, strong) NSTimer *timer; - -@property(nonatomic, strong) VAPView *mp4View; -@property(nonatomic, strong) XPRoomGiftAnimationParser *mp4Parser; - -@end - -@implementation LuckyPackageStatusView - -- (instancetype)initWithModel:(RedEnvelopeListVo *)model gap:(NSInteger)gap { - if (self = [super init]) { - self.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - self.userInteractionEnabled = YES; - self.backgroundColor = [UIColor clearColor]; - - UIButton *exit = [UIButton buttonWithType:UIButtonTypeCustom]; - exit.frame = self.bounds; - [self addSubview:exit]; - [exit addTarget:self action:@selector(exitView) forControlEvents:UIControlEventTouchUpInside]; - - self.gap = gap; - self.model = model; - } - return self; -} - -- (void)updateUserInfo:(UserInfoModel *)userInfo { - -} - -- (void)exitView { - [TTPopup dismiss]; -} - -- (void)setModel:(RedEnvelopeListVo *)model { - _model = model; - - [self setupUIForReadyOpen]; -} - -#pragma mark - -- (void)setupUIForReadyOpen { - [self addSubview:self.bgShortImageView]; - [self.bgShortImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - make.height.mas_equalTo(338); -// make.height.mas_equalTo(kGetScaleWidth(338)); - make.width.mas_equalTo(KScreenWidth - 37*2); - }]; - - [self addSubview:self.centerIconImageView]; - [self.centerIconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bgShortImageView).offset(77); - make.size.mas_equalTo(CGSizeMake(123,123)); - make.centerX.mas_equalTo(self.bgShortImageView); - }]; - - [self addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.centerY.mas_equalTo(self.bgShortImageView.mas_top); - make.size.mas_equalTo(CGSizeMake(77, 77)); - }]; - - [self addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.bgShortImageView).inset(16); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(8); - }]; - - [self addSubview:self.subTitleLabel]; - [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(2); - }]; - - [self addSubview:self.okButton]; - [self.okButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self.bgShortImageView).offset(-19); - make.size.mas_equalTo(CGSizeMake(190, 47)); - }]; - - [self addSubview:self.giftImageBGView]; - [self addSubview:self.giftImageView]; - [self.giftImageBGView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom); - make.centerX.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(98, 98)); - }]; - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.giftImageBGView); - make.size.mas_equalTo(CGSizeMake(90, 90)); - }]; - - [self.giftImageView addSubview:self.giftNumBGView]; - [self.giftImageView addSubview:self.giftNumLabel]; - [self.giftNumBGView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.mas_equalTo(self.giftImageBGView); - make.height.mas_equalTo(18); - make.width.mas_equalTo(30); - }]; - [self.giftNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.giftNumBGView); - make.height.mas_equalTo(18); - }]; - - - [self addSubview:self.giftNameLabel]; - [self.giftNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.bgShortImageView); - make.top.mas_equalTo(self.giftImageBGView.mas_bottom).offset(8); - }]; - - - [self addSubview:self.giftCoinLabel]; - [self addSubview:self.tipsLabel]; - [self addSubview:self.viewOthersButton]; - - [self.giftCoinLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.bgShortImageView); - make.top.mas_equalTo(self.giftNameLabel.mas_bottom); - make.height.mas_equalTo(16); - }]; - - UIStackView *stack = [[UIStackView alloc] initWithArrangedSubviews:@[ - self.moneyLabel, - self.moneyIcon - ]]; - stack.spacing = 7; - [self addSubview:stack]; - [stack mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.bgShortImageView); - make.height.mas_equalTo(30); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(55); - }]; - [self.moneyIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(30, 30)); - }]; - - NSTimeZone *gmt8TimeZone = [NSTimeZone timeZoneForSecondsFromGMT:8 * 3600]; - NSCalendar *calendar = [NSCalendar currentCalendar]; - calendar.timeZone = gmt8TimeZone; - NSDateComponents *components = [calendar componentsInTimeZone:gmt8TimeZone fromDate:[NSDate date]]; - NSDate *gmt8Date = [calendar dateFromComponents:components]; - NSTimeInterval local = [gmt8Date timeIntervalSince1970]; - self.gap = (self.model.beginTime - local * 1000)/1000; - - if (self.gap > 0) { - [self updateUIForCounting]; - } else { - [self updateUIForReadyOpen]; - } -} - -- (void)updateUIForCounting { - self.counterLabel.hidden = NO; - self.centerIconImageView.hidden = NO; - - self.giftNumLabel.hidden = YES; - self.giftNumBGView.hidden = YES; - self.giftImageView.hidden = YES; - self.giftImageBGView.hidden = YES; - self.giftNameLabel.hidden = YES; - self.viewOthersButton.hidden = YES; - self.moneyIcon.hidden = YES; - self.moneyLabel.hidden = YES; - - [self addSubview:self.counterLabel]; - [self.counterLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.centerIconImageView.mas_bottom); - }]; - - self.avatarImageView.imageUrl = self.model.avatar; - self.subTitleLabel.text = YMLocalizedString(@"1.0.37_text_18"); - [self.okButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - - if ([self.model.type isEqualToString:@"GIFT"]) { - self.titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_17.1"), self.model.nick]; - self.centerIconImageView.image = kImage(@"luck_package_entrance_gift"); - } else { - self.titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_17.2"), self.model.nick]; - self.centerIconImageView.image = kImage(@"luck_package_entrance_coin"); - } - - [self startTimer]; -} - -- (void)updateUIForReadyOpen { - self.centerIconImageView.hidden = NO; - - self.subTitleLabel.hidden = YES; - self.counterLabel.hidden = YES; - self.giftNumLabel.hidden = YES; - self.giftNumBGView.hidden = YES; - self.giftImageView.hidden = YES; - self.giftImageBGView.hidden = YES; - self.giftNameLabel.hidden = YES; - self.viewOthersButton.hidden = YES; - self.moneyIcon.hidden = YES; - self.moneyLabel.hidden = YES; - - self.avatarImageView.imageUrl = self.model.avatar; - [self.okButton setTitle:YMLocalizedString(@"1.0.37_text_20") forState:UIControlStateNormal]; - - if ([self.model.type isEqualToString:@"GIFT"]) { - self.titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_17.1"), self.model.nick]; - self.centerIconImageView.image = kImage(@"luck_package_entrance_gift"); - } else { - self.titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_17.2"), self.model.nick]; - self.centerIconImageView.image = kImage(@"luck_package_entrance_coin"); - } -} - -- (void)updateUIForAlreadyGet { - self.centerIconImageView.hidden = YES; - self.viewOthersButton.hidden = NO; - - OpenRedEnvelopeCurrentUserGift *receivedGift = [self.openModel.currentUserGifts xpSafeObjectAtIndex:0]; - if (receivedGift) { - self.tipsLabel.text = YMLocalizedString(@"1.0.37_text_51"); - [self.tipsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.giftCoinLabel.mas_bottom); - make.height.mas_equalTo(20); - }]; - [self.viewOthersButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.bgShortImageView); - make.top.mas_equalTo(self.tipsLabel.mas_bottom); - make.height.mas_equalTo(10); - }]; - - self.giftCoinLabel.hidden = NO; - self.giftNumLabel.hidden = NO; - self.giftNumBGView.hidden = NO; - self.giftImageBGView.hidden = NO; - self.giftImageView.hidden = NO; - self.giftNameLabel.hidden = NO; - self.giftNumLabel.text = [NSString stringWithFormat:@" x%@ ", @(receivedGift.giftNum)]; - self.giftImageView.imageUrl = receivedGift.giftVo.giftUrl; - self.giftNameLabel.text = receivedGift.giftVo.giftName; - [self.giftCoinLabel updateContent:@(receivedGift.giftVo.goldPrice).stringValue]; - } else { - self.tipsLabel.text = YMLocalizedString(@"1.0.37_text_50"); - [self.tipsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.moneyIcon.mas_bottom).offset(25); - make.height.mas_equalTo(20); - }]; - [self.viewOthersButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.bgShortImageView); - make.top.mas_equalTo(self.tipsLabel.mas_bottom).offset(20); - }]; - - self.moneyIcon.hidden = NO; - self.moneyLabel.hidden = NO; - self.moneyLabel.text = @(self.openModel.currentUserAmount).stringValue; - } - - [self.okButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; -} - -- (void)updateUIForEmptyBag { - self.centerIconImageView.hidden = YES; - self.viewOthersButton.hidden = NO; - self.subTitleLabel.hidden = NO; - self.giftImageBGView.hidden = YES; - self.subTitleLabel.text = YMLocalizedString(@"1.0.37_text_21"); - [self.okButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - - [self addSubview:self.emptyImageView]; - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.subTitleLabel.mas_bottom); - make.size.mas_equalTo(self.giftImageBGView).multipliedBy(1.5); - }]; - - [self.viewOthersButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.emptyImageView); - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(4); - make.height.mas_equalTo(10); - }]; -} - -- (void)startTimer { - [self stopTimer]; - self.timer = [NSTimer scheduledTimerWithTimeInterval:1.0 - target:self - selector:@selector(timerTick) - userInfo:nil - repeats:YES]; -} - -- (void)stopTimer { - if (self.timer) { - [self.timer invalidate]; - self.timer = nil; - } -} - -- (void)timerTick { - self.gap--; - [self updateLabel]; - - if (self.gap <= 0) { - [self stopTimer]; - self.counterLabel.hidden = YES; - } -} - -- (void)updateLabel { - NSInteger hours = self.gap / 3600; - NSInteger minutes = (self.gap % 3600)/60; - NSInteger second = self.gap % 60; - if (hours > 0) { - self.counterLabel.text = [NSString stringWithFormat:@" %02ld:%02ld ", (long)hours, (long)minutes]; - } else { - self.counterLabel.text = [NSString stringWithFormat:@" %02ld:%02ld ", (long)minutes, (long)second]; - } -} - -- (void)displayOthersList { - [self.giftImageBGView removeFromSuperview]; - [self.giftNumLabel removeFromSuperview]; - [self.giftImageView removeFromSuperview]; - [self.emptyImageView removeFromSuperview]; - [self.viewOthersButton removeFromSuperview]; - - [self addSubview:self.bgLongImageView]; - [self.bgLongImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - make.height.mas_equalTo(414); - make.width.mas_equalTo(KScreenWidth - 37*2); - }]; - - [self.avatarImageView removeFromSuperview]; - [self.bgLongImageView addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.bgLongImageView); - make.centerY.mas_equalTo(self.bgLongImageView.mas_top); - make.size.mas_equalTo(CGSizeMake(77, 77)); - }]; - - [self.titleLabel removeFromSuperview]; - [self.bgLongImageView addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.bgLongImageView).offset(49); - }]; - - [self.subTitleLabel removeFromSuperview]; - [self.bgLongImageView addSubview:self.subTitleLabel]; - [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self.bgLongImageView).offset(-63); - }]; - self.subTitleLabel.text = YMLocalizedString(@"1.0.37_text_23"); - self.subTitleLabel.textColor = [UIColor whiteColor]; - - [self.okButton removeFromSuperview]; - [self.bgLongImageView addSubview:self.okButton]; - [self.okButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self.bgLongImageView).offset(-9); - make.size.mas_equalTo(CGSizeMake(190, 47)); - }]; - - [self.bgLongImageView addSubview:self.tableView]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(4); - make.bottom.mas_equalTo(self.subTitleLabel.mas_top).offset(-30); - make.leading.trailing.mas_equalTo(self.bgLongImageView).inset(40); - }]; - - [self.tableView reloadData]; -} - -#pragma mark - -- (void)didTapViewOthers { - [XNDJTDDLoadingTool showLoading]; - @kWeakify(self); - NSInteger packageID = self.openModel.redEnvelopeVO.redEnvelopeId; - if (packageID == 0) { - packageID = [self.openModel.redEnvelopeVO.id integerValue]; - } - - [[LuckyPackageLogicManager sharedInstance] requestLuckyPackageReceiversAPI:packageID - success:^(NSArray *array) { - @kStrongify(self); - [XNDJTDDLoadingTool hideHUD]; - for (RedEnvelopeReceiveVo *vo in array) { - if (vo.userVO.uid == [[AccountInfoStorage instance] getUid].integerValue) { - vo.isME = YES; - } - } - self.receiveVoArray = array; - [self displayOthersList]; - } failure:^(NSError * _Nonnull error) { - [XNDJTDDLoadingTool showErrorWithMessage:error.domain]; - }]; -} - -- (void)didTapOK { - if ([self.okButton.titleLabel.text isEqualToString:YMLocalizedString(@"TTAlertConfig0")]) { - [TTPopup dismiss]; - } else { - - [XNDJTDDLoadingTool showLoading]; - NSInteger packageID = self.model.redEnvelopeId; - if (packageID == 0) { - packageID = [self.model.id integerValue]; - } - @kWeakify(self); - [[LuckyPackageLogicManager sharedInstance] requestOpenLockyPackageAPI:packageID success:^(OpenRedEnvelopeVo * _Nonnull model) { - [XNDJTDDLoadingTool hideHUD]; - @kStrongify(self); - self.openModel = model; - switch (model.redEnvelopeState) { - case 3: - [self updateUIForEmptyBag]; - [[LuckyPackageLogicManager sharedInstance] removeReceivedLuckyPackage]; - break; - case 4: - [self playOpenAnimation]; - [[LuckyPackageLogicManager sharedInstance] removeReceivedLuckyPackage]; - break; - case 7: - [self updateUIForAlreadyGet]; - [[LuckyPackageLogicManager sharedInstance] removeReceivedLuckyPackage]; - break; - - default: - [TTPopup dismiss]; - break; - } - } failure:^(NSError * _Nonnull error) { - [XNDJTDDLoadingTool showErrorWithMessage:error.domain]; - }]; - } -} - -- (void)playOpenAnimation { - NSString *fileName = @"coincoin"; - if ([self.model.type isEqualToString:@"GIFT"]) { - fileName = @"giftgift"; - } - if (!_mp4View) { - _mp4View = [[VAPView alloc] init]; - [self addSubview:_mp4View]; - [self.mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(self.centerIconImageView).multipliedBy(3); - make.center.mas_equalTo(self.centerIconImageView); - }]; - [self layoutIfNeeded]; - } else { - _mp4View.hidden = NO; - } - - NSString *filePath = [[NSBundle mainBundle] pathForResource:fileName ofType:@"mp4"]; - [self.mp4View playHWDMP4:filePath repeatCount:10 delegate:self]; -} - -#pragma mark - HWDMP4PlayDelegate -- (BOOL)shouldStartPlayMP4:(VAPView *)container config:(QGVAPConfigModel *)config { - dispatch_async(dispatch_get_main_queue(), ^{ - self.centerIconImageView.hidden = YES; - }); - return YES; -} - -- (void)viewDidStopPlayMP4:(NSInteger)lastFrameIndex view:(VAPView *)container { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - container.hidden = YES; - [container removeFromSuperview]; - @kStrongify(self); - [self updateUIForAlreadyGet]; - }); -} - -- (void)viewDidFinishPlayMP4:(NSInteger)totalFrameCount view:(VAPView *)container { - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - container.hidden = YES; - [container removeFromSuperview]; - @kStrongify(self); - [self updateUIForAlreadyGet]; - }); -} - -- (void)viewDidFailPlayMP4:(NSError *)error { -// NSLog(@"%@", error); -} - -#pragma mark - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.receiveVoArray.count; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 61; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - LuckyPackageOtherListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"LuckyPackageOtherListTableViewCell" forIndexPath:indexPath]; - cell.cellModel = [self.receiveVoArray xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - -#pragma mark - -- (UIImageView *)bgShortImageView { - if (!_bgShortImageView) { - _bgShortImageView = [[UIImageView alloc] initWithImage:kImage(@"luck_package_bg_short")]; - _bgShortImageView.userInteractionEnabled = YES; - } - return _bgShortImageView; -} - -- (UIImageView *)bgLongImageView { - if (!_bgLongImageView) { - _bgLongImageView = [[UIImageView alloc] initWithImage:kImage(@"luck_package_bg_long")]; - _bgLongImageView.userInteractionEnabled = YES; - } - return _bgLongImageView; -} - -- (UIImageView *)centerIconImageView { - if (!_centerIconImageView) { - _centerIconImageView = [[UIImageView alloc] init]; - _centerIconImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _centerIconImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.37_text_17.1") font:kFontSemibold(15) textColor:UIColorFromRGB(0x292601)]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.minimumScaleFactor = 0.7; - _titleLabel.adjustsFontSizeToFitWidth = YES; - } - return _titleLabel; -} - -- (UILabel *)subTitleLabel { - if (!_subTitleLabel) { - _subTitleLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.37_text_18") font:kFontRegular(12) textColor:UIColorRGBAlpha(0x292601, 0.8)]; - _subTitleLabel.textAlignment = NSTextAlignmentCenter; - } - return _subTitleLabel; -} - -- (UILabel *)counterLabel { - if (!_counterLabel) { - _counterLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(20) textColor:UIColorFromRGB(0x292601)]; - _counterLabel.textAlignment = NSTextAlignmentCenter; - } - return _counterLabel; -} - -- (UILabel *)tipsLabel { - if (!_tipsLabel) { - _tipsLabel = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:UIColorFromRGB(0x292601)]; - _tipsLabel.textAlignment = NSTextAlignmentCenter; - } - return _tipsLabel; -} - -- (UIView *)giftNumBGView { - if (!_giftNumBGView) { - _giftNumBGView = [[UIView alloc] init]; - [_giftNumBGView addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xfff437), - UIColorFromRGB(0xff9f00) - ] startPoint:CGPointMake(0.5, 0) endPoint:CGPointMake(0.5, 1) cornerRadius:9]; - [_giftNumBGView setAllCornerRadius:9 borderWidth:1 borderColor:UIColorFromRGB(0x9f6f41)]; - } - return _giftNumBGView; -} - -- (UILabel *)giftNumLabel { - if (!_giftNumLabel) { - _giftNumLabel = [UILabel labelInitWithText:@" x1 " font:kFontMedium(13) textColor:UIColorFromRGB(0x292601)]; - _giftNumLabel.textAlignment = NSTextAlignmentCenter; - } - return _giftNumLabel; -} - -- (UILabel *)giftNameLabel { - if (!_giftNameLabel) { - _giftNameLabel = [UILabel labelInitWithText:@"" font:kFontMedium(16) textColor:UIColorFromRGB(0x292601)]; - _giftNameLabel.textAlignment = NSTextAlignmentCenter; - } - return _giftNameLabel; -} - -- (UIButton *)viewOthersButton { - if (!_viewOthersButton) { - _viewOthersButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_viewOthersButton.titleLabel setFont:kFontSemibold(12)]; - [_viewOthersButton setTitle:YMLocalizedString(@"1.0.37_text_19") forState:UIControlStateNormal]; - [_viewOthersButton setTitleColor:UIColorFromRGB(0x292601) forState:UIControlStateNormal]; - [_viewOthersButton addTarget:self action:@selector(didTapViewOthers) forControlEvents:UIControlEventTouchUpInside]; - } - return _viewOthersButton; -} - -- (UIButton *)okButton { - if (!_okButton) { - _okButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_okButton setBackgroundImage:kImage(@"luck_package_send_bg") forState:UIControlStateNormal]; - [_okButton setTitleColor:UIColorFromRGB(0x292601) forState:UIControlStateNormal]; - [_okButton.titleLabel setFont:kFontSemibold(15)]; - [_okButton addTarget:self action:@selector(didTapOK) forControlEvents:UIControlEventTouchUpInside]; - } - return _okButton; -} - -- (UIView *)giftImageBGView { - if (!_giftImageBGView) { - _giftImageBGView = [[UIView alloc] init]; - [_giftImageBGView setBackgroundColor:UIColorFromRGB(0xf5d2b1)]; - [_giftImageBGView setAllCornerRadius:12 borderWidth:1 borderColor:UIColorFromRGB(0x9f6f41)]; - } - return _giftImageBGView; -} - -- (NetImageView *)giftImageView { - if (!_giftImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeCornerAvatar; - _giftImageView = [[NetImageView alloc] initWithConfig:config]; - _giftImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _giftImageView; -} - -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] initWithImage:kImage(@"缺省")]; - } - return _emptyImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeCornerAvatar; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.backgroundColor = [UIColor clearColor]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - [_avatarImageView setAllCornerRadius:77/2 borderWidth:2 borderColor:UIColorFromRGB(0xffd168)]; - } - return _avatarImageView; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.dataSource = self; - _tableView.delegate = self; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.separatorInset = UIEdgeInsetsZero; - _tableView.separatorColor = UIColorFromRGB(0xEDC59F); - [_tableView registerClass:[LuckyPackageOtherListTableViewCell class] forCellReuseIdentifier:@"LuckyPackageOtherListTableViewCell"]; - } - return _tableView; -} - -- (UILabel *)moneyLabel { - if (!_moneyLabel) { - _moneyLabel = [UILabel labelInitWithText:@"0" font:kFontMedium(30) textColor:UIColorFromRGB(0x292601)]; - } - return _moneyLabel; -} - -- (UIImageView *)moneyIcon { - if (!_moneyIcon) { - _moneyIcon = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - } - return _moneyIcon; -} - -- (MoliMoneyLabel *)giftCoinLabel { - if (!_giftCoinLabel) { - _giftCoinLabel = [MoliMoneyLabel moneyLabelWithTextColot:UIColorFromRGB(0x292601) font:kFontRegular(13) moneyPostion:1 moneySize:CGSizeMake(16, 16)]; - _giftCoinLabel.hidden = YES; - [_giftCoinLabel removeSpace]; - } - return _giftCoinLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.h b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.h deleted file mode 100644 index 2955867..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// LuckyPackageViewController.h -// YuMi -// -// Created by P on 2025/1/10. -// - -#import "MvpViewController.h" -#import "RoomHostDelegate.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface LuckyPackageViewController : MvpViewController - -- (instancetype)initWithdelegate:(id)delegate; - -@property(nonatomic, copy) void(^close)(void); - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.m b/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.m deleted file mode 100644 index 23a124a..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/LuckyPackageViewController.m +++ /dev/null @@ -1,2342 +0,0 @@ -// -// LuckyPackageViewController.m -// YuMi -// -// Created by P on 2025/1/10. -// - -#import "LuckyPackageViewController.h" - -#import "MoliMoneyLabel.h" -#import "EmptyDataView.h" -#import "NSDate+DateUtils.h" -#import "RoomInfoModel.h" -#import "UserInfoModel.h" -#import "LuckyPackagePresenter.h" -#import "XPIAPRechargeViewController.h" -#import "XCCurrentVCStackManager.h" -#import "LuckyPackageLogicManager.h" -#import "LuckyPackageBannerView.h" -#import "XPWebViewController.h" -#import "XPGiftCollectionViewFlowLayout.h" - -@interface LuckyPackageRuleView : UIView - -@property(nonatomic, assign) UIButton *backButton; -@property(nonatomic, strong) XPWebViewController *webView; - -@end - -@implementation LuckyPackageRuleView - - - -@end - -@interface LuckyPackageRecordsCell : UITableViewCell - -@property(nonatomic, strong) RedEnvelopeListVo *cellModel; -@property(nonatomic, assign) NSInteger type; -@property(nonatomic, strong) UILabel *titleLabel; -@property(nonatomic, strong) UILabel *timeLabel; -@property(nonatomic, strong) UILabel *moneyLabel; -@property(nonatomic, strong) UILabel *giftNumLabel; -@property(nonatomic, strong) UIImageView *moneyImageView; - -@end - -@implementation LuckyPackageRecordsCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - self.backgroundColor = [UIColor clearColor]; - self.contentView.backgroundColor = [UIColor clearColor]; - - [self.contentView addSubview:self.timeLabel]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.moneyLabel]; - [self.contentView addSubview:self.giftNumLabel]; - [self.contentView addSubview:self.moneyImageView]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView).offset(-12); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(8); - }]; - - [self.moneyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.centerY.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(17, 17)); - }]; - - [self.moneyLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.moneyImageView.mas_leading).offset(-4); - make.centerY.mas_equalTo(self.moneyImageView); - }]; - - [self.giftNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.centerY.mas_equalTo(self.contentView); - }]; - } - return self; -} - -- (void)setCellModel:(RedEnvelopeListVo *)cellModel { - _cellModel = cellModel; - - if (self.type == 1) { - self.timeLabel.text = [[NSDate dateWithTimeIntervalSince1970:cellModel.beginTime/1000] stringForYearMonthDayDashed]; - } else { - self.timeLabel.text = [[NSDate dateWithTimeIntervalSince1970:cellModel.createTime/1000] stringForYearMonthDayDashed]; - } - - if ([cellModel.type isEqualToString:@"DIAMOND"]) { - self.giftNumLabel.hidden = YES; - self.moneyLabel.hidden = NO; - self.moneyImageView.hidden = NO; - self.moneyLabel.text = @(cellModel.originalAmount).stringValue; - if (self.type == 1) { - self.titleLabel.text = YMLocalizedString(@"1.0.37_text_2"); - } else { - self.titleLabel.text = cellModel.nick; - } - } else if ([cellModel.type isEqualToString:@"GIFT"]) { - self.giftNumLabel.hidden = NO; - self.moneyLabel.hidden = YES; - self.moneyImageView.hidden = YES; - - if (self.type == 1) { - self.titleLabel.text = YMLocalizedString(@"1.0.37_text_1"); - self.giftNumLabel.text = [NSString stringWithFormat:@"%@*%@", YMLocalizedString(@"1.0.37_text_10"), @(cellModel.num)]; - } else { - self.titleLabel.text = cellModel.nick; - self.giftNumLabel.text = [NSString stringWithFormat:@"%@*%@", cellModel.giftName, @(cellModel.originalAmount)]; - } - } -} - -#pragma mark - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:UIColorFromRGB(0xffea5c)]; - } - return _titleLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [UILabel labelInitWithText:@"" font:kFontMedium(12) textColor:UIColorFromRGB(0xffea5c)]; - _timeLabel.alpha = 0.6; - } - return _timeLabel; -} - -- (UILabel *)moneyLabel { - if (!_moneyLabel) { - _moneyLabel = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:UIColorFromRGB(0xffea5c)]; - } - return _moneyLabel; -} - -- (UILabel *)giftNumLabel { - if (!_giftNumLabel) { - _giftNumLabel = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:UIColorFromRGB(0xffea5c)]; - } - return _giftNumLabel; -} - -- (UIImageView *)moneyImageView { - if (!_moneyImageView) { - _moneyImageView = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - } - return _moneyImageView; -} - -@end - -@interface LuckyPackageRecordsListView : UIView - -@property(nonatomic, strong) NSMutableArray *dataSource; -@property(nonatomic, strong) UITableView *tableView; -@property(nonatomic, assign) NSInteger type; -@property(nonatomic, strong) UIImageView *emptyImage; - -@end - -@implementation LuckyPackageRecordsListView - -- (instancetype)init -{ - self = [super init]; - if (self) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.separatorColor = UIColorFromRGB(0xb75a6f); - _tableView.separatorInset = UIEdgeInsetsMake(0, 0, 0, 0); // 左右间距 15 - [_tableView registerClass:[LuckyPackageRecordsCell class] forCellReuseIdentifier:@"LuckyPackageRecordsCell"]; - [self addSubview:_tableView]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(self); - make.leading.trailing.mas_equalTo(self).inset(22.5); - }]; - - _emptyImage = [[UIImageView alloc] initWithImage:kImage(@"缺省")]; - _emptyImage.hidden = YES; - [self addSubview:_emptyImage]; - [self.emptyImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerX.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(123, 123)); - }]; - } - return self; -} - -- (void)setDataSource:(NSMutableArray *)dataSource { - _dataSource = dataSource; - [self.tableView reloadData]; - - self.emptyImage.hidden = dataSource.count > 0; - -} - -#pragma mark - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 60; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.dataSource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - LuckyPackageRecordsCell *cell = [tableView dequeueReusableCellWithIdentifier:@"LuckyPackageRecordsCell" forIndexPath:indexPath]; - cell.type = self.type; - cell.cellModel = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - - -@end - - -@interface LuckyPackageRecordsView : UIView -{ - UIImageView *backgroundImageView; - UIView *topButtonsContainer; - UIView *selectedPill; -} -@property(nonatomic, strong) NetImageView *avatarImageView; -@property(nonatomic, strong) UILabel *nickLabel; -@property(nonatomic, strong) LuckyPackageRecordsListView *sentRecordsView; -@property(nonatomic, strong) LuckyPackageRecordsListView *receiveRecordsView; -@property(nonatomic, strong) UIButton *backButton; -@property(nonatomic, strong) UIButton *receivedButton; -@property(nonatomic, strong) UIButton *sentButton; -@property(nonatomic, assign) BOOL currentSelectedIsReceive; -@property(nonatomic, copy)void(^tapBackButton)(void); -@property(nonatomic, copy)void(^switchTap)(BOOL isReceive); - -@property(nonatomic, copy)NSArray *dateSource; - -- (void)updateWithUserInfo:(UserInfoModel *)userInfo; - -@end - -@implementation LuckyPackageRecordsView - -- (instancetype)init -{ - self = [super init]; - if (self) { - backgroundImageView = [[UIImageView alloc] initWithImage:kImage(@"luck_package_records_bg")]; - [self addSubview:backgroundImageView]; - [backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - topButtonsContainer = [[UIView alloc] init]; - topButtonsContainer.backgroundColor = [UIColor colorWithWhite:0 alpha:0.2]; - [topButtonsContainer setCornerRadius:17.5]; - [self addSubview:topButtonsContainer]; - [topButtonsContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(40); - make.leading.trailing.mas_equalTo(self).inset(23); - make.height.mas_equalTo(35); - }]; - - selectedPill = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 165, 35)]; - [selectedPill addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xfff437), - UIColorFromRGB(0xff9f00) - ] - startPoint:CGPointMake(0.5, 0) - endPoint:CGPointMake(0.5, 1) - cornerRadius:17.5]; - - [self addSubview:selectedPill]; - - [self addSubview:self.sentButton]; - [self addSubview:self.receivedButton]; - [self.sentButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.bottom.mas_equalTo(topButtonsContainer); - make.width.mas_equalTo(topButtonsContainer.mas_width).multipliedBy(0.5); - }]; - [self.receivedButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.bottom.mas_equalTo(topButtonsContainer); - make.width.mas_equalTo(topButtonsContainer.mas_width).multipliedBy(0.5); - }]; - - [selectedPill mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.receivedButton); - make.size.mas_equalTo(self.receivedButton); - }]; - - [self addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(topButtonsContainer.mas_bottom).offset(14); - make.size.mas_equalTo(65); - }]; - - [self addSubview:self.nickLabel]; - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(9); - }]; - - [self addSubview:self.backButton]; - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self); - make.leading.mas_equalTo(11); - make.size.mas_equalTo(CGSizeMake(30, 30)); - }]; - - [self addSubview:self.sentRecordsView]; - [self addSubview:self.receiveRecordsView]; - [self.sentRecordsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(20); - make.leading.bottom.trailing.mas_equalTo(self); - }]; - [self.receiveRecordsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(20); - make.leading.bottom.trailing.mas_equalTo(self); - }]; - - [self didTapReceive]; - } - return self; -} - -- (void)setDateSource:(NSArray *)dateSource { - _dateSource = dateSource; - if (self.currentSelectedIsReceive) { - [self.receiveRecordsView setDataSource:dateSource.mutableCopy]; - } else { - [self.sentRecordsView setDataSource:dateSource.mutableCopy]; - } - self.avatarImageView.hidden = dateSource.count == 0; - self.nickLabel.hidden = dateSource.count == 0; -} - -- (void)didTapBack { - if (_tapBackButton) { - _tapBackButton(); - } -} - -- (void)didTapSent { - if (!self.currentSelectedIsReceive) { - return; - } - [selectedPill mas_remakeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.sentButton); - make.size.mas_equalTo(self.sentButton); - }]; - self.sentButton.selected = YES; - self.receivedButton.selected = NO; - self.sentRecordsView.hidden = NO; - self.receiveRecordsView.hidden = YES; - self.currentSelectedIsReceive = NO; - if (_switchTap) { - self.switchTap(NO); - } -} - -- (void)didTapReceive { - if (self.currentSelectedIsReceive) { - return; - } - [selectedPill mas_remakeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.receivedButton); - make.size.mas_equalTo(self.receivedButton); - }]; - self.sentButton.selected = NO; - self.receivedButton.selected = YES; - self.sentRecordsView.hidden = YES; - self.receiveRecordsView.hidden = NO; - self.currentSelectedIsReceive = YES; - if (_switchTap) { - self.switchTap(YES); - } -} - -- (void)updateWithUserInfo:(UserInfoModel *)userInfo { - self.avatarImageView.imageUrl = userInfo.avatar; - self.nickLabel.text = userInfo.nick; -} - -#pragma mark - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - [_avatarImageView setAllCornerRadius:65/2 - borderWidth:2 - borderColor:UIColorFromRGB(0xffd168)]; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:UIColorFromRGB(0xffea5c)]; - _nickLabel.textAlignment = NSTextAlignmentCenter; - } - return _nickLabel; -} - -- (LuckyPackageRecordsListView *)sentRecordsView { - if (!_sentRecordsView) { - _sentRecordsView = [[LuckyPackageRecordsListView alloc] init]; - _sentRecordsView.type = 1; - } - return _sentRecordsView; -} - -- (LuckyPackageRecordsListView *)receiveRecordsView { - if (!_receiveRecordsView) { - _receiveRecordsView = [[LuckyPackageRecordsListView alloc] init]; - _receiveRecordsView.type = 2; - } - return _receiveRecordsView; -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:kImage(@"luck_package_records_back") forState:UIControlStateNormal]; - [_backButton addTarget:self action:@selector(didTapBack) forControlEvents:UIControlEventTouchUpInside]; - } - return _backButton; -} - -- (UIButton *)sentButton { - if (!_sentButton) { - _sentButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sentButton setTitle:YMLocalizedString(@"1.0.37_text_15") forState:UIControlStateNormal]; - [_sentButton setTitleColor:UIColorFromRGB(0xffea5c) forState:UIControlStateNormal]; - [_sentButton setTitleColor:UIColorFromRGB(0x292601) forState:UIControlStateSelected]; - [_sentButton addTarget:self action:@selector(didTapSent) forControlEvents:UIControlEventTouchUpInside]; - } - return _sentButton; -} - -- (UIButton *)receivedButton { - if (!_receivedButton) { - _receivedButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_receivedButton setTitle:YMLocalizedString(@"1.0.37_text_14") forState:UIControlStateNormal]; - [_receivedButton setTitleColor:UIColorFromRGB(0xffea5c) forState:UIControlStateNormal]; - [_receivedButton setTitleColor:UIColorFromRGB(0x292601) forState:UIControlStateSelected]; - [_receivedButton addTarget:self action:@selector(didTapReceive) forControlEvents:UIControlEventTouchUpInside]; - _receivedButton.selected = YES; - } - return _receivedButton; -} -@end - -@interface GiftCountCalculator : UIView -@property(nonatomic, assign) NSInteger count; - -@property(nonatomic, strong) UILabel *countLabel; -@property(nonatomic, strong) UIButton *reduceButton; -@property(nonatomic, strong) UIButton *increaseButton; - -@property(nonatomic, copy) void(^tapReduce)(NSInteger count); -@property(nonatomic, copy) void(^tapIncrease)(NSInteger count); -@property(nonatomic, copy) void(^tapCountLabel)(void); - -- (void)reset; -- (void)updateCount:(NSInteger)count; -@end - -@implementation GiftCountCalculator - -- (instancetype)init -{ - self = [super init]; - if (self) { - self.count = 0; - - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.2]; - [self setCornerRadius:4]; - - _countLabel = [UILabel labelInitWithText:@"0" font:kFontMedium(12) textColor:[UIColor whiteColor]]; - _countLabel.textAlignment = NSTextAlignmentCenter; - _countLabel.backgroundColor = [UIColor colorWithWhite:0 alpha:0.3]; - _countLabel.userInteractionEnabled = YES; - [_countLabel setCornerRadius:4]; - - _reduceButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_reduceButton setImage:kImage(@"luck_package_item_reduce") forState:UIControlStateNormal]; - [_reduceButton addTarget:self action:@selector(didTapReduce) forControlEvents:UIControlEventTouchUpInside]; - - _increaseButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_increaseButton setImageEdgeInsets:UIEdgeInsetsMake(2, 2, 2, 2)]; - [_increaseButton setImage:kImage(@"mine_guild_add_room") forState:UIControlStateNormal]; - [_increaseButton addTarget:self action:@selector(didTapIncrease) forControlEvents:UIControlEventTouchUpInside]; - - [self addSubview:self.countLabel]; - [self addSubview:self.reduceButton]; - [self addSubview:self.increaseButton]; - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(22, 18)); - }]; - [self.reduceButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.bottom.mas_equalTo(self); - make.width.mas_equalTo(self.reduceButton.mas_height); - }]; - - [self.increaseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.bottom.mas_equalTo(self); - make.width.mas_equalTo(self.reduceButton.mas_height); - }]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(displayKeyboard)]; - [self.countLabel addGestureRecognizer:tap]; - } - return self; -} - -- (void)reset { - self.count = 0; - self.countLabel.text = @"0"; -} - -- (void)updateCount:(NSInteger)count { - self.count = count; - self.countLabel.text = @(self.count).stringValue; -} - -- (void)didTapReduce { - _count = MAX(0, _count-1); - self.countLabel.text = @(self.count).stringValue; - if (_tapReduce) { - _tapReduce(_count); - } -} - -- (void)didTapIncrease { - _count = MIN(99, _count+1); - self.countLabel.text = @(self.count).stringValue; - if (_tapIncrease) { - _tapIncrease(_count); - } -} - -- (void)displayKeyboard { - if (_tapCountLabel) { - self.tapCountLabel(); - } -} - -@end - -@interface OneLineImageItemCell : UICollectionViewCell - -- (void)updateCell:(NSNumber *)content index:(NSInteger)index; - -@end - -@implementation OneLineImageItemCell -{ - UIImageView *normalBGImageView; - UIImageView *selectedBGImageView; - UIImageView *iconImageView; - UILabel *numberLabel; - UIImageView *moneyImageView; -} - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self.contentView setCornerRadius:12 - corners:UIRectCornerTopLeft|UIRectCornerTopRight | UIRectCornerBottomLeft | UIRectCornerBottomRight - borderWidth:1 - borderColor:UIColorFromRGB(0xffd168)]; - normalBGImageView = [[UIImageView alloc] initWithImage:[UIImage gradientColorImageFromColors:@[ - UIColorFromRGB(0x97000c), - UIColorFromRGB(0x610015) - ] - gradientType:GradientTypeTopToBottom - imgSize:CGSizeMake(75, 100)]]; - selectedBGImageView = [[UIImageView alloc] initWithImage:[UIImage gradientColorImageFromColors:@[ - UIColorFromRGB(0xFFF437), - UIColorFromRGB(0xFF9f00) - ] - gradientType:GradientTypeTopToBottom - imgSize:CGSizeMake(75, 100)]]; - selectedBGImageView.hidden = YES; - - iconImageView = [[UIImageView alloc] init]; - numberLabel = [UILabel labelInitWithText:@"0" font:kFontRegular(13) textColor:UIColorFromRGB(0xffea5c)]; - moneyImageView = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - moneyImageView.contentMode = UIViewContentModeScaleAspectFit; - UIStackView *stack = [[UIStackView alloc] initWithArrangedSubviews:@[ - numberLabel, - moneyImageView - ]]; - stack.spacing = 2.5; - stack.axis = UILayoutConstraintAxisHorizontal; - - [self.contentView addSubview:normalBGImageView]; - [self.contentView addSubview:selectedBGImageView]; - [self.contentView addSubview:iconImageView]; - [self.contentView addSubview:stack]; - - [normalBGImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - [selectedBGImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - [iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.contentView).inset(6.5); - make.height.mas_equalTo(iconImageView.mas_width); - }]; - [stack mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView).offset(-6); - make.height.mas_equalTo(16); - }]; - } - return self; -} - -- (void)setSelected:(BOOL)selected { - [super setSelected:selected]; - - if (selected) { - normalBGImageView.hidden = YES; - selectedBGImageView.hidden = NO; - numberLabel.textColor = UIColorFromRGB(0x292601); - } else { - normalBGImageView.hidden = NO; - selectedBGImageView.hidden = YES; - numberLabel.textColor = UIColorFromRGB(0xffea5c); - } -} - -- (void)updateCell:(NSNumber *)content index:(NSInteger)index { - switch (index) { - case 0: - iconImageView.image = kImage(@"luck_package_bag_lv1"); - break; - case 1: - iconImageView.image = kImage(@"luck_package_bag_lv2"); - break; - case 2: - iconImageView.image = kImage(@"luck_package_bag_lv3"); - break; - case 3: - iconImageView.image = kImage(@"luck_package_bag_lv4"); - break; - - default: - break; - } - numberLabel.text = content.stringValue; -} - -@end - -@interface OneLineImageButtons : UIView -@property(nonatomic, copy) NSArray *dataSource; -@property(nonatomic, copy) void(^didSelected)(NSInteger index); -@end - -@implementation OneLineImageButtons -{ - UICollectionView *collectionView; -} - -- (instancetype)init -{ - self = [super init]; - if (self) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(kGetScaleWidth(75), kGetScaleWidth(100)); - layout.sectionInset = UIEdgeInsetsMake(0, 20, 0, 20); - collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - collectionView.backgroundColor = [UIColor clearColor]; - collectionView.delegate = self; - collectionView.dataSource = self; - [collectionView registerClass:[OneLineImageItemCell class] forCellWithReuseIdentifier:@"OneLineImageItemCell"]; - [self addSubview:collectionView]; - [collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - } - return self; -} - -- (void)setDataSource:(NSArray *)dataSource { - _dataSource = dataSource; - [collectionView reloadData]; - dispatch_async(dispatch_get_main_queue(), ^{ - NSIndexPath *firstIndexPath = [NSIndexPath indexPathForItem:0 inSection:0]; - [self->collectionView selectItemAtIndexPath:firstIndexPath - animated:NO - scrollPosition:UICollectionViewScrollPositionNone]; - }); -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.dataSource.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - OneLineImageItemCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"OneLineImageItemCell" forIndexPath:indexPath]; - [cell updateCell:[self.dataSource xpSafeObjectAtIndex:indexPath.item] index:indexPath.item]; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - if (_didSelected) { - self.didSelected(indexPath.item); - } -} - -@end - -@interface OneLineButtons : UIView -@property(nonatomic, copy) NSArray *dataSource; -@property(nonatomic, copy) void(^didSelected)(NSInteger index); -@end - -@implementation OneLineButtons -{ - UIButton *button_1; - UIButton *button_2; - UIButton *button_3; - UIButton *button_4; -} -- (instancetype)init -{ - self = [super init]; - if (self) { - button_1 = [self createButton:0]; - button_2 = [self createButton:1]; - button_3 = [self createButton:2]; - button_4 = [self createButton:3]; - UIStackView *stack = [[UIStackView alloc] initWithArrangedSubviews:@[ - button_1, - button_2, - button_3, - button_4 - ]]; - stack.spacing = 10; - stack.distribution = UIStackViewDistributionFillEqually; - [self addSubview:stack]; - [stack mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self).insets(UIEdgeInsetsMake(0, 20, 0, 20)); - }]; - - button_1.selected = YES; - } - return self; -} - -- (UIButton *)createButton:(NSInteger)tag { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - b.tag = tag; - b.frame = CGRectMake(0, 0, kGetScaleWidth(80), 30); - UIImage *normalImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x97000C), UIColorFromRGB(0x610015)] - gradientType:GradientTypeTopToBottom - imgSize:CGSizeMake(kGetScaleWidth(80), 30)]; - UIImage *selectedImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFF437), UIColorFromRGB(0xFF9F00)] - gradientType:GradientTypeTopToBottom - imgSize:CGSizeMake(kGetScaleWidth(80), 30)]; - [b setCornerRadius:6 - corners:UIRectCornerTopLeft|UIRectCornerTopRight | UIRectCornerBottomLeft | UIRectCornerBottomRight - borderWidth:0.5 - borderColor:UIColorFromRGB(0xFEF057)]; - [b setBackgroundImage:normalImage forState:UIControlStateNormal]; - [b setBackgroundImage:selectedImage forState:UIControlStateSelected]; - [b setTitleColor:UIColorFromRGB(0xFFEA5C) forState:UIControlStateNormal]; - [b setTitleColor:UIColorFromRGB(0x292601) forState:UIControlStateSelected]; - [b.titleLabel setFont:kFontRegular(12)]; - [b addTarget:self action:@selector(handleTapEvent:) forControlEvents:UIControlEventTouchUpInside]; - - return b; -} - -- (void)setDataSource:(NSArray *)dataSource { - _dataSource = dataSource; - [button_1 setTitle:dataSource[0] forState:UIControlStateNormal]; - [button_2 setTitle:dataSource[1] forState:UIControlStateNormal]; - [button_3 setTitle:dataSource[2] forState:UIControlStateNormal]; - [button_4 setTitle:dataSource[3] forState:UIControlStateNormal]; -} - -- (void)handleTapEvent:(UIButton *)sender { - button_1.selected = NO; - button_2.selected = NO; - button_3.selected = NO; - button_4.selected = NO; - - sender.selected = YES; - - if (_didSelected) { - self.didSelected(sender.tag); - } -} - -@end - -@interface WalletBalanceDisplayView : UIView - -@property(nonatomic, strong) UIImageView *moneyImageView; -@property(nonatomic, strong) UILabel *balanceLabel; -@property(nonatomic, strong) UIButton *addButton; -@property(nonatomic, strong) UIView *spacer; -@property(nonatomic, strong) UIStackView *stack; -@property(nonatomic, copy) void(^tapAddButton)(void); - -- (void)hideAddButton; -- (void)updatePrice:(double)price; - -@end - -@implementation WalletBalanceDisplayView - -- (instancetype)init -{ - self = [super init]; - if (self) { - _moneyImageView = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - _moneyImageView.contentMode = UIViewContentModeScaleAspectFit; -// [self addSubview:self.moneyImageView]; - - _balanceLabel = [UILabel labelInitWithText:@"0" font:kFontMedium(15) textColor:UIColorFromRGB(0xFFEA5C)]; -// [self addSubview:self.balanceLabel]; - - _addButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_addButton setImage:kImage(@"luck_package_add") forState:UIControlStateNormal]; - [self.addButton addTarget:self action:@selector(didTapAddButton) forControlEvents:UIControlEventTouchUpInside]; - - _spacer = [[UIView alloc] init]; - self.spacer.backgroundColor = [UIColor clearColor]; - - _stack = [[UIStackView alloc] initWithArrangedSubviews:@[ - self.moneyImageView, - self.balanceLabel, - self.addButton, - self.spacer - ]]; - self.stack.spacing = 4; - self.stack.alignment = UIStackViewAlignmentLeading; - self.stack.distribution = UIStackViewDistributionFill; - [self addSubview:self.stack]; - [self.stack mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - // **让 spacer 充满右侧空间** - [self.spacer setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; - } - return self; -} - -- (void)hideAddButton { - self.addButton.hidden = YES; - self.spacer.hidden = YES; - self.stack.alignment = UIStackViewAlignmentCenter; -} - -- (void)updatePrice:(double)price { - self.balanceLabel.text = @(price).stringValue; -} - -- (void)didTapAddButton { - if (_tapAddButton) { - self.tapAddButton(); - } -} - -@end - -@interface ChooseViewTitleBar : UIView -@property(nonatomic, strong) UILabel *titleLabel; -@property(nonatomic, strong) UIImageView *leftImageView; -@property(nonatomic, strong) UIImageView *rightImageView; -- (void)updateTitle:(NSString *)content; -@end - -@implementation ChooseViewTitleBar - -- (instancetype)init -{ - self = [super init]; - if (self) { - _titleLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:UIColorFromRGB(0xffea5c)]; - if (isMSRTL()) { - _leftImageView = [[UIImageView alloc] initWithImage:kImage(@"luck_package_right")]; - _rightImageView = [[UIImageView alloc] initWithImage:kImage(@"luck_package_left")]; - } else { - _leftImageView = [[UIImageView alloc] initWithImage:kImage(@"luck_package_left")]; - _rightImageView = [[UIImageView alloc] initWithImage:kImage(@"luck_package_right")]; - } - - _leftImageView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - _rightImageView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - - [self addSubview:self.titleLabel]; - [self addSubview:self.leftImageView]; - [self addSubview:self.rightImageView]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - make.height.mas_equalTo(18); - }]; - [self.leftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.titleLabel); - make.trailing.mas_equalTo(self.titleLabel.mas_leading).offset(-15); - make.size.mas_equalTo(CGSizeMake(80, 15)); - }]; - [self.rightImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.titleLabel); - make.leading.mas_equalTo(self.titleLabel.mas_trailing).offset(15); - make.size.mas_equalTo(CGSizeMake(80, 15)); - }]; - } - return self; -} - -- (void)updateTitle:(NSString *)content { - self.titleLabel.text = content; -} - -@end - -@interface ChooseCoinView : UIView -@property(nonatomic, strong) UIScrollView *scrollView; -@property(nonatomic, strong) OneLineImageButtons *oneLineImageButtons; -@property(nonatomic, strong) ChooseViewTitleBar *luckyBagTitleBar; -@property(nonatomic, strong) ChooseViewTitleBar *waitingTitleBar; -@property(nonatomic, strong) OneLineButtons *luckyBagOneLineButtons; -@property(nonatomic, strong) OneLineButtons *waitingTimeOneLineButtons; -@property(nonatomic, strong) UILabel *totalCostLabel; -@property(nonatomic, strong) WalletBalanceDisplayView *walletView; -@property(nonatomic, strong) UIButton *sendButton; -@property(nonatomic, copy) void(^tapSendCoin)(void); -@end - -@implementation ChooseCoinView - -- (instancetype)init -{ - self = [super init]; - if (self) { - - _scrollView = [[UIScrollView alloc] init]; - [self addSubview:self.scrollView]; - [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - // 创建容器视图，承载所有内容 - UIView *contentView = [[UIView alloc] init]; - contentView.backgroundColor = [UIColor clearColor]; - [self.scrollView addSubview:contentView]; - - // 使用 Masonry 设置容器视图的约束 - [contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.scrollView); // 与 scrollView 对齐 - make.width.mas_equalTo(self.scrollView); // 宽度与 scrollView 相同 - }]; - - _oneLineImageButtons = [[OneLineImageButtons alloc] init]; - [contentView addSubview:self.oneLineImageButtons]; - [self.oneLineImageButtons mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(50); - make.leading.trailing.mas_equalTo(contentView); - make.height.mas_equalTo(kGetScaleWidth(100)); - }]; - - _luckyBagTitleBar = [[ChooseViewTitleBar alloc] init]; - [contentView addSubview:self.luckyBagTitleBar]; - [self.luckyBagTitleBar updateTitle:YMLocalizedString(@"1.0.37_text_8")]; - [self.luckyBagTitleBar mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.oneLineImageButtons.mas_bottom).offset(46); - make.leading.trailing.mas_equalTo(contentView); - make.height.mas_equalTo(18); - }]; - - _luckyBagOneLineButtons = [[OneLineButtons alloc] init]; - [contentView addSubview:self.luckyBagOneLineButtons]; - [self.luckyBagOneLineButtons mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.luckyBagTitleBar.mas_bottom).offset(12.5); - make.leading.trailing.mas_equalTo(contentView); - make.height.mas_equalTo(30); - }]; - - _waitingTitleBar = [[ChooseViewTitleBar alloc] init]; - [contentView addSubview:self.waitingTitleBar]; - [self.waitingTitleBar updateTitle:YMLocalizedString(@"1.0.37_text_5")]; - [self.waitingTitleBar mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.luckyBagOneLineButtons.mas_bottom).offset(46); - make.leading.trailing.mas_equalTo(contentView); - make.height.mas_equalTo(18); - }]; - - - _waitingTimeOneLineButtons = [[OneLineButtons alloc] init]; - [contentView addSubview:self.waitingTimeOneLineButtons]; - [self.waitingTimeOneLineButtons mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.waitingTitleBar.mas_bottom).offset(12.5); - make.leading.trailing.mas_equalTo(contentView); - make.height.mas_equalTo(30); - }]; - - _totalCostLabel = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:UIColorFromRGB(0xffea5c)]; - _totalCostLabel.textAlignment = NSTextAlignmentCenter; - [contentView addSubview:self.totalCostLabel]; - [self.totalCostLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.waitingTimeOneLineButtons.mas_bottom).offset(30); - make.leading.trailing.mas_equalTo(contentView); - }]; - - UIView *space = [[UIView alloc] init]; - - [contentView addSubview:space]; - [space mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(contentView); - make.top.mas_equalTo(self.totalCostLabel.mas_bottom); - make.height.mas_equalTo(100); - }]; - - _walletView = [[WalletBalanceDisplayView alloc] init]; - [_walletView setTapAddButton:^{ -// @kStrongify(self); -// [self gotoChargeView]; - }]; - [self addSubview:self.walletView]; - [self.walletView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self).offset(-32); - make.leading.mas_equalTo(self).offset(23); - make.width.mas_equalTo(150); - make.height.mas_equalTo(24); - }]; - - _sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sendButton.titleLabel setFont:kFontSemibold(15)]; - [_sendButton setBackgroundImage:kImage(@"luck_package_send_bg") forState:UIControlStateNormal]; - [_sendButton setTitle:YMLocalizedString(@"1.0.37_text_15.2") forState:UIControlStateNormal]; - [_sendButton setTitleColor:UIColorFromRGB(0x292601) forState:UIControlStateNormal]; - [_sendButton addTarget:self action:@selector(didTapSendButton) forControlEvents:UIControlEventTouchUpInside]; - [self addSubview:self.sendButton]; - [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.trailing.mas_equalTo(self).offset(-18); - make.width.mas_equalTo(190); - make.height.mas_equalTo(50); - }]; - - - - [self setupDataSource]; - } - return self; -} - -- (void)setupDataSource { - NSArray *moneys = [[LuckyPackageLogicManager sharedInstance] loadConfigLuckyBagMoneys]; - [self.oneLineImageButtons setDataSource:moneys]; - [self.oneLineImageButtons setDidSelected:^(NSInteger index) { - [[LuckyPackageLogicManager sharedInstance] updateSelectedBag:[moneys[index] integerValue]]; - }]; - - NSMutableArray *arr_bag = @[].mutableCopy; - NSArray *bagNumber = [[LuckyPackageLogicManager sharedInstance] loadConfigLuckyBagNumbers]; - for (NSNumber *num in bagNumber) { - [arr_bag addObject:num.stringValue]; - } - [self.luckyBagOneLineButtons setDataSource:arr_bag.copy]; - [self.luckyBagOneLineButtons setDidSelected:^(NSInteger index) { - [[LuckyPackageLogicManager sharedInstance] updateSelectedBagNum:[bagNumber[index] integerValue]]; - }]; - - NSArray *times = [[LuckyPackageLogicManager sharedInstance] loadConfigWaitingTimesMins]; - NSMutableArray *arr_time = @[].mutableCopy; - for (NSNumber *time in times) { - [arr_time addObject:[NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_7"), time]]; - } - [self.waitingTimeOneLineButtons setDataSource:arr_time.copy]; - [self.waitingTimeOneLineButtons setDidSelected:^(NSInteger index) { - [[LuckyPackageLogicManager sharedInstance] updateSelectedBagWaitingTime:[times[index] integerValue] * 60]; - }]; - - [self.walletView updatePrice:[[LuckyPackageLogicManager sharedInstance] loadSavedWalletInfo].diamonds.doubleValue]; - - self.totalCostLabel.attributedText = [[LuckyPackageLogicManager sharedInstance] loadCoinTotalCostString]; - - @kWeakify(self); - [[LuckyPackageLogicManager sharedInstance] registerCoinTotalCostString:^(NSAttributedString * _Nonnull content) { - @kStrongify(self); - self.totalCostLabel.attributedText = content; - }]; -} - -- (void)didTapSendButton { - if (_tapSendCoin) { - _tapSendCoin(); - } -} - -@end - -@interface ChooseGiftCell : UICollectionViewCell - -@property(nonatomic, strong) GiftInfoModel *cellModel; -@property(nonatomic, assign) NSInteger giftCount; - -@property(nonatomic, strong) UIView *bgView; -@property(nonatomic, strong) NetImageView *giftIconImageView; -@property(nonatomic, strong) MarqueeLabel *giftNameLabel; -@property(nonatomic, strong) UILabel *giftCountLabel; -@property(nonatomic, strong) GiftCountCalculator *giftCountView; -@property(nonatomic, strong) MoliMoneyLabel *priceLabel; - -@property(nonatomic, copy) void(^modifySelectedGift)(GiftInfoModel *model, NSInteger count); -@property(nonatomic, copy) void(^editGiftCount)(GiftInfoModel *model); - -@end - -@implementation ChooseGiftCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - self.contentView.backgroundColor = [UIColor clearColor]; - - [self.contentView addSubview:self.bgView]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(self.bgView.mas_width); - }]; - - [self.contentView addSubview:self.giftIconImageView]; - [self.giftIconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.bgView).insets(UIEdgeInsetsMake(6, 6, 6, 6)); - }]; - - [self.contentView addSubview:self.giftNameLabel]; - [self.giftNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.bgView.mas_bottom).offset(6); - make.height.mas_equalTo(14); - }]; - - [self.contentView addSubview:self.priceLabel]; - [self.priceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.giftNameLabel.mas_bottom).offset(3); - make.height.mas_equalTo(16); - }]; - - [self.contentView addSubview:self.giftCountView]; - [self.giftCountView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.priceLabel.mas_bottom).offset(4); - make.height.mas_equalTo(20); - make.width.mas_equalTo(60); - }]; - } - return self; -} - -- (void)prepareForReuse { - [super prepareForReuse]; - [self.giftCountView reset]; -} - -- (void)setCellModel:(GiftInfoModel *)cellModel { - _cellModel = cellModel; - self.giftIconImageView.imageUrl = cellModel.giftUrl; - self.giftNameLabel.text = cellModel.giftName; - [self.priceLabel updateContent:@(cellModel.goldPrice).stringValue]; - [self.giftCountView updateCount:cellModel.luckyPackageCount]; -} - -- (void)setGiftCount:(NSInteger)giftCount { - _giftCount = giftCount; - if (!_giftCountLabel) { - [self.giftCountView removeFromSuperview]; - _giftCountLabel = [UILabel labelInitWithText:[NSString stringWithFormat:@"x%@", @(giftCount)] - font:kFontRegular(13) - textColor:UIColorFromRGB(0xffea5c)]; - [self.contentView addSubview:_giftCountLabel]; - [self.giftCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.priceLabel.mas_bottom).offset(2); - make.height.mas_equalTo(14); - }]; - } - self.giftCountLabel.text = [NSString stringWithFormat:@"x%@", @(giftCount)]; -} - -- (UIView *)bgView { - if (!_bgView) { - _bgView = [[UIView alloc] init]; - [_bgView addGradientBackgroundWithColors:@[UIColorFromRGB(0x610015), UIColorFromRGB(0x97000c)] - startPoint:CGPointMake(0.5, 0) - endPoint:CGPointMake(0.5, 1) - cornerRadius:12]; - [_bgView setCornerRadius:12 - corners:UIRectCornerTopLeft | UIRectCornerTopRight | UIRectCornerBottomLeft | UIRectCornerBottomRight - borderWidth:1 - borderColor:UIColorFromRGB(0xFEF057)]; - } - return _bgView; -} - -- (NetImageView *)giftIconImageView { - if (!_giftIconImageView) { - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _giftIconImageView = [[NetImageView alloc] initWithConfig:config]; - _giftIconImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _giftIconImageView; -} - -- (MarqueeLabel *)giftNameLabel { - if (!_giftNameLabel) { - _giftNameLabel = [[MarqueeLabel alloc] init]; - _giftNameLabel.text = @"Name"; - _giftNameLabel.font = kFontRegular(13); - _giftNameLabel.textColor = UIColorFromRGB(0xffea5c); - _giftNameLabel.textAlignment = NSTextAlignmentCenter; - _giftNameLabel.scrollDuration = 3.0; - _giftNameLabel.fadeLength = 8.0f; - _giftNameLabel.animationDelay = 1.0; - } - return _giftNameLabel; -} - -- (GiftCountCalculator *)giftCountView { - if (!_giftCountView) { - _giftCountView = [[GiftCountCalculator alloc] init]; - @kWeakify(self); - [_giftCountView setTapIncrease:^(NSInteger count){ - @kStrongify(self); - if (self.modifySelectedGift) { - self.modifySelectedGift(self.cellModel, count); - } - }]; - [_giftCountView setTapReduce:^(NSInteger count) { - @kStrongify(self); - if (self.modifySelectedGift) { - self.modifySelectedGift(self.cellModel, count); - } - }]; - [_giftCountView setTapCountLabel:^{ - @kStrongify(self); - if (self.editGiftCount) { - self.editGiftCount(self.cellModel); - } - }]; - } - return _giftCountView; -} - -- (MoliMoneyLabel *)priceLabel { - if (!_priceLabel) { - _priceLabel = [MoliMoneyLabel moneyLabelWithTextColot:UIColorFromRGB(0xffea5c) font:kFontRegular(13) moneyPostion:1 moneySize:CGSizeMake(16, 16)]; - [_priceLabel removeSpace]; - } - return _priceLabel; -} - -@end - -@interface ChooseGiftView : UIView - -@property(nonatomic, assign) NSInteger watiingTime; -@property(nonatomic, strong) UIScrollView *scrollView; -@property(nonatomic, strong) ChooseViewTitleBar *chooseGiftTitleBar; -@property(nonatomic, strong) ChooseViewTitleBar *waitingTitleBar; -@property(nonatomic, strong) UICollectionView *giftsCollectionView; -@property(nonatomic, strong) UIPageControl *pageControl; -@property(nonatomic, strong) NSArray *dataSources; -@property(nonatomic, assign) NSInteger pageCount; -@property(nonatomic, strong) OneLineButtons *waitingTimeOneLineButtons; -@property(nonatomic, strong) UILabel *totalCostLabel; -@property(nonatomic, strong) WalletBalanceDisplayView *walletView; -@property(nonatomic, strong) UIButton *sendButton; - -@property(nonatomic, strong) UITextField *hiddenTextField; -@property(nonatomic, strong) UITextField *inputTextField; -@property(nonatomic, strong) GiftInfoModel *editingModel; -@property (nonatomic, strong) UIView *customInputView; - -@property(nonatomic, copy) void(^forceClose)(void); -@property(nonatomic, copy) void(^tapSendGift)(void); - -- (void)refreshData; - -@end - -@implementation ChooseGiftView - -- (instancetype)init -{ - self = [super init]; - if (self) { - - self.watiingTime = 5; - - @kWeakify(self); - - [[LuckyPackageLogicManager sharedInstance] registerGiftTotalCostString:^(NSAttributedString * _Nonnull content) { - @kStrongify(self); - self.totalCostLabel.attributedText = content; - } key:@"ChooseGiftView"]; - - _scrollView = [[UIScrollView alloc] init]; - [self addSubview:self.scrollView]; - [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - // 创建容器视图，承载所有内容 - UIView *contentView = [[UIView alloc] init]; - contentView.backgroundColor = [UIColor clearColor]; - [self.scrollView addSubview:contentView]; - - // 使用 Masonry 设置容器视图的约束 - [contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.scrollView); // 与 scrollView 对齐 - make.width.mas_equalTo(self.scrollView); // 宽度与 scrollView 相同 - }]; - - _chooseGiftTitleBar = [[ChooseViewTitleBar alloc] init]; - [self.chooseGiftTitleBar updateTitle:YMLocalizedString(@"1.0.37_text_3")]; - _waitingTitleBar = [[ChooseViewTitleBar alloc] init]; - [self.waitingTitleBar updateTitle:YMLocalizedString(@"1.0.37_text_5")]; - - [contentView addSubview:self.chooseGiftTitleBar]; - [self.chooseGiftTitleBar mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(contentView).offset(6); - make.leading.trailing.mas_equalTo(contentView); - make.height.mas_equalTo(18); - }]; - - CGFloat itemWidth = (KScreenWidth - 40 - 30)/4.0; - CGFloat itemHeight = kGetScaleWidth(75) + 6 + 12 + 3 + 16 + 4 + 28; - XPGiftCollectionViewFlowLayout *layout = [[XPGiftCollectionViewFlowLayout alloc] init]; - layout.minimumInteritemSpacing = 10; - layout.minimumLineSpacing = 10; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.itemSize = CGSizeMake(itemWidth, itemHeight); - layout.sectionInset = UIEdgeInsetsMake(10, 0, 0, 0); - - _giftsCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _giftsCollectionView.clipsToBounds = YES; - _giftsCollectionView.backgroundColor = [UIColor clearColor]; - _giftsCollectionView.delegate = self; - _giftsCollectionView.dataSource = self; - _giftsCollectionView.pagingEnabled = YES; - _giftsCollectionView.showsHorizontalScrollIndicator = NO; - [_giftsCollectionView registerClass:[ChooseGiftCell class] forCellWithReuseIdentifier:@"ChooseGiftCell"]; - _giftsCollectionView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - [contentView addSubview:self.giftsCollectionView]; - [self.giftsCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(contentView).inset(20); - make.top.mas_equalTo(self.chooseGiftTitleBar.mas_bottom).offset(10); - make.height.mas_equalTo(itemHeight * 2 + 30); - }]; - - _pageControl = [[UIPageControl alloc] init]; - _pageControl.numberOfPages = 1; - _pageControl.currentPage = 0; - _pageControl.pageIndicatorTintColor = [UIColor colorWithWhite:0 alpha:0.3]; - _pageControl.currentPageIndicatorTintColor = UIColorFromRGB(0xffea5c); - [contentView addSubview:self.pageControl]; - [self.pageControl mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.giftsCollectionView.mas_bottom).offset(3); - make.leading.trailing.mas_equalTo(contentView); - make.height.mas_equalTo(10); - }]; - - [contentView addSubview:self.waitingTitleBar]; - [self.waitingTitleBar mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.pageControl.mas_bottom).offset(10); - make.leading.trailing.mas_equalTo(contentView); - make.height.mas_equalTo(18); - }]; - - _waitingTimeOneLineButtons = [[OneLineButtons alloc] init]; - [_waitingTimeOneLineButtons setDidSelected:^(NSInteger index) { - @kStrongify(self); - [self selectWaitingTime:index]; - }]; - [contentView addSubview:_waitingTimeOneLineButtons]; - [self.waitingTimeOneLineButtons mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.waitingTitleBar.mas_bottom).offset(12); - make.leading.trailing.mas_equalTo(contentView); - make.height.mas_equalTo(30); - }]; - - _walletView = [[WalletBalanceDisplayView alloc] init]; - [_walletView setTapAddButton:^{ - @kStrongify(self); - [self gotoChargeView]; - }]; - [self addSubview:self.walletView]; - [self.walletView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self).offset(-32); - make.leading.mas_equalTo(self).offset(23); - make.width.mas_equalTo(150); - make.height.mas_equalTo(24); - }]; - - _sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sendButton.titleLabel setFont:kFontSemibold(15)]; - [_sendButton setBackgroundImage:kImage(@"luck_package_send_bg") forState:UIControlStateNormal]; - [_sendButton setTitle:YMLocalizedString(@"1.0.37_text_15.1") forState:UIControlStateNormal]; - [_sendButton setTitleColor:UIColorFromRGB(0x292601) forState:UIControlStateNormal]; - [_sendButton addTarget:self action:@selector(didTapSendButton) forControlEvents:UIControlEventTouchUpInside]; - [self addSubview:self.sendButton]; - [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.trailing.mas_equalTo(self).offset(-18); - make.width.mas_equalTo(190); - make.height.mas_equalTo(50); - }]; - - _totalCostLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(12) - textColor:UIColorFromRGB(0xFFEA5C)]; - _totalCostLabel.attributedText = [[LuckyPackageLogicManager sharedInstance] loadGiftTotalCostString]; - _totalCostLabel.textAlignment = NSTextAlignmentCenter; - [contentView addSubview:_totalCostLabel]; - [self.totalCostLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.waitingTimeOneLineButtons.mas_bottom).offset(12); - make.leading.trailing.mas_equalTo(contentView); - make.height.mas_equalTo(20); - }]; - - NSArray *times = [[LuckyPackageLogicManager sharedInstance] loadConfigWaitingTimesMins]; - NSMutableArray *arr = @[].mutableCopy; - for (NSNumber *time in times) { - [arr addObject:[NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_7"), time]]; - } - [self.waitingTimeOneLineButtons setDataSource:arr.copy]; - - self.hiddenTextField = [[UITextField alloc] initWithFrame:CGRectMake(KScreenWidth, KScreenHeight, KScreenWidth, 50)]; - self.hiddenTextField.keyboardType = UIKeyboardTypeNumberPad; - [self addSubview:self.hiddenTextField]; - self.customInputView = [self createInputAccessoryView]; - self.hiddenTextField.inputAccessoryView = self.customInputView; - - UIView *space = [[UIView alloc] init]; - - [contentView addSubview:space]; - [space mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(contentView); - make.top.mas_equalTo(self.totalCostLabel.mas_bottom); - make.height.mas_equalTo(100); - }]; - } - return self; -} - -- (void)refreshData { - [self.giftsCollectionView reloadData]; -} - -- (void)setDataSources:(NSArray *)dataSources { - _dataSources = dataSources; - - self.pageCount = ceil(self.dataSources.count / 8.0); - self.pageControl.numberOfPages = self.pageCount; - [self.giftsCollectionView reloadData]; - dispatch_async(dispatch_get_main_queue(), ^{ - [self adjustCollectionViewContentInset]; - }); -} - -// **创建 inputAccessoryView（输入栏 + 确认按钮）** -- (UIView *)createInputAccessoryView { - UIView *toolbar = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 50)]; - toolbar.backgroundColor = UIColorFromRGB(0xf4f4f4); - - // **确认按钮** - UIButton *confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [confirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - [confirmButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [confirmButton.titleLabel setFont:kFontRegular(14)]; - [confirmButton setCornerRadius:17]; - [confirmButton addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xe29030), - UIColorFromRGB(0xfcc074) - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 1) cornerRadius:17]; - [confirmButton addTarget:self action:@selector(confirmButtonTapped:) forControlEvents:UIControlEventTouchUpInside]; - [toolbar addSubview:confirmButton]; - [confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(toolbar); - make.trailing.mas_equalTo(toolbar).offset(-15); - make.size.mas_equalTo(CGSizeMake(74, 34)); - }]; - - // 输入栏 - UITextField *inputField = [[UITextField alloc] init]; - inputField.backgroundColor = [UIColor whiteColor]; - [inputField setCornerRadius:17]; - inputField.borderStyle = UITextBorderStyleNone; - inputField.keyboardType = UIKeyboardTypeNumberPad; - inputField.placeholder = YMLocalizedString(@"1.0.37_text_30"); - [inputField addTarget:self - action:@selector(textFieldDidChange:) - forControlEvents:UIControlEventEditingChanged]; - [toolbar addSubview:inputField]; - UIView *paddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 8, 1)]; - inputField.leftView = paddingView; - inputField.leftViewMode = UITextFieldViewModeAlways; - [inputField mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(toolbar); - make.leading.mas_equalTo(toolbar).offset(15); - make.trailing.mas_equalTo(confirmButton.mas_leading).offset(-10); - make.height.mas_equalTo(34); - }]; - self.inputTextField = inputField; - - return toolbar; -} - -// **确认按钮点击事件** -- (void)confirmButtonTapped:(UIButton *)sender { - if (self.inputTextField.text.length > 0) { - self.editingModel.luckyPackageCount = self.inputTextField.text.integerValue; - } else { - self.editingModel.luckyPackageCount = 0; - } - [[LuckyPackageLogicManager sharedInstance] updateSelectedGift:self.editingModel - count:self.editingModel.luckyPackageCount]; - [self.giftsCollectionView reloadData]; - - // **收起键盘** - [self.hiddenTextField resignFirstResponder]; - [self.inputTextField resignFirstResponder]; - [self endEditing:YES]; -} - -#pragma mark - -- (void)textFieldDidChange:(UITextField *)textField { - NSInteger value = [textField.text integerValue]; - - if (value > 99) { - textField.text = @"99"; // 超过 99，强制改成 99 - } -} - -#pragma mark - -- (void)didTapSendButton { - if (_tapSendGift) { - _tapSendGift(); - } -} - -- (void)gotoChargeView { - XPIAPRechargeViewController * rechargeVC = [[XPIAPRechargeViewController alloc] init]; - rechargeVC.type = @"4"; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:rechargeVC animated:YES]; - - if (_forceClose) { - self.forceClose(); - } -} - -- (void)selectWaitingTime:(NSInteger)index { - NSArray *times = [[LuckyPackageLogicManager sharedInstance] loadConfigWaitingTimesMins]; - NSNumber *num = [times xpSafeObjectAtIndex:index]; - self.watiingTime = num.integerValue; - [[LuckyPackageLogicManager sharedInstance] updateSelectedGiftWaitingTime:self.watiingTime * 60]; -} - -#pragma mark - - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.dataSources.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - ChooseGiftCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ChooseGiftCell" forIndexPath:indexPath]; - - cell.cellModel = [self.dataSources xpSafeObjectAtIndex:indexPath.item]; - - [cell setModifySelectedGift:^(GiftInfoModel *model, NSInteger count) { - model.luckyPackageCount = count; - [[LuckyPackageLogicManager sharedInstance] updateSelectedGift:model count:count]; - }]; - - @kWeakify(self); - [cell setEditGiftCount:^(GiftInfoModel *model) { - @kStrongify(self); - self.editingModel = model; - [self.hiddenTextField becomeFirstResponder]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - self.inputTextField.text = @(model.luckyPackageCount).stringValue; - [self.inputTextField becomeFirstResponder]; - }); - }]; - - return cell; -} - -// 监听滑动，更新 PageControl -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - CGFloat pageWidth = self.giftsCollectionView.frame.size.width; - NSInteger currentPage = (self.giftsCollectionView.contentOffset.x + pageWidth / 2) / pageWidth; - self.pageControl.currentPage = currentPage; -} - -- (void)adjustCollectionViewContentInset { - CGFloat pageWidth = self.giftsCollectionView.frame.size.width; - NSInteger totalPages = ceil((double)self.dataSources.count / 8.0); - CGFloat fullContentWidth = totalPages * pageWidth; - - CGFloat remainingWidth = fullContentWidth - self.giftsCollectionView.contentSize.width; - - if (remainingWidth > 0) { - self.giftsCollectionView.contentInset = UIEdgeInsetsMake(0, 0, 0, remainingWidth); - } -} - -@end - -@interface ComfirmChooseGiftView : UIView - -@property(nonatomic, strong) UIScrollView *scrollView; -@property(nonatomic, strong) UICollectionView *giftsCollectionView; // 不需要分页了 -@property(nonatomic, strong) UILabel *waitingTimeLabel; -@property(nonatomic, strong) UILabel *totalCostLabel; -@property(nonatomic, strong) UIButton *sendButton; -@property(nonatomic, strong) UIButton *modifyButton; -@property(nonatomic, strong) NSArray *dataSources; - -@property(nonatomic, copy) void(^returnToModity)(void); -@property(nonatomic, copy) void(^tapButtonForGiftLuckyPackage)(void); - -- (void)refreshContent; - -@end - -@implementation ComfirmChooseGiftView - -- (instancetype)init -{ - self = [super init]; - if (self) { - self.backgroundColor = [UIColor clearColor]; - - @kWeakify(self); - [[LuckyPackageLogicManager sharedInstance] registerGiftTotalCostString:^(NSAttributedString * _Nonnull content) { - @kStrongify(self); - self.totalCostLabel.attributedText = content; - } key:@"ComfirmChooseGiftView"]; - - _scrollView = [[UIScrollView alloc] init]; - [self addSubview:self.scrollView]; - [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - // 创建容器视图，承载所有内容 - UIView *contentView = [[UIView alloc] init]; - contentView.backgroundColor = [UIColor clearColor]; - [self.scrollView addSubview:contentView]; - // 使用 Masonry 设置容器视图的约束 - [contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.scrollView); // 与 scrollView 对齐 - make.width.mas_equalTo(self.scrollView); // 宽度与 scrollView 相同 - }]; - UIView *space = [[UIView alloc] init]; - - [contentView addSubview:space]; - - CGFloat itemWidth = (KScreenWidth - 40 - 30)/4.0; - CGFloat itemHeight = kGetScaleWidth(75) + 6 + 12 + 3 + 16 + 4 + 28; - XPGiftCollectionViewFlowLayout *layout = [[XPGiftCollectionViewFlowLayout alloc] init]; - layout.minimumInteritemSpacing = 10; - layout.minimumLineSpacing = 10; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.itemSize = CGSizeMake(itemWidth, itemHeight); - _giftsCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _giftsCollectionView.clipsToBounds = YES; - _giftsCollectionView.backgroundColor = [UIColor clearColor]; - _giftsCollectionView.delegate = self; - _giftsCollectionView.dataSource = self; - _giftsCollectionView.pagingEnabled = YES; - _giftsCollectionView.showsHorizontalScrollIndicator = NO; - - [_giftsCollectionView registerClass:[ChooseGiftCell class] forCellWithReuseIdentifier:@"ChooseGiftCell"]; - [contentView addSubview:self.giftsCollectionView]; - [self.giftsCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(contentView).inset(20); - make.top.mas_equalTo(contentView).offset(60); - make.height.mas_equalTo(itemHeight * 2 + 30); - }]; - - _waitingTimeLabel = [UILabel labelInitWithText: - [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_13"), @([[LuckyPackageLogicManager sharedInstance] loadGiftWaitingTime]/60)] - font:kFontMedium(14) - textColor:UIColorFromRGB(0xFFEA5C)]; - _waitingTimeLabel.textAlignment = NSTextAlignmentCenter; - [contentView addSubview:_waitingTimeLabel]; - [self.waitingTimeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.giftsCollectionView.mas_bottom).offset(30); - make.centerX.mas_equalTo(contentView); - make.height.mas_equalTo(16); - }]; - - _modifyButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_modifyButton.titleLabel setFont:kFontRegular(12)]; - [_modifyButton setTitleColor:UIColorFromRGB(0xffea5c) forState:UIControlStateNormal]; - NSTextAttachment *attchment = [[NSTextAttachment alloc] init]; - attchment.image = kImage(@"luck_package_arrow"); - attchment.bounds = CGRectMake(0, -1, 11, 11); - NSAttributedString *string = [NSAttributedString attributedStringWithAttachment:attchment]; - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"1.0.37_text_12") - attributes:@{ - NSFontAttributeName: kFontRegular(12), - NSForegroundColorAttributeName: UIColorFromRGB(0xffea5c) - }]; - [attributedString appendAttributedString:string]; - [_modifyButton setAttributedTitle:attributedString forState:UIControlStateNormal]; - [_modifyButton addTarget:self action:@selector(didTapModifyButton) forControlEvents:UIControlEventTouchUpInside]; - [contentView addSubview:_modifyButton]; - [self.modifyButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.waitingTimeLabel.mas_bottom).offset(24); - make.centerX.mas_equalTo(contentView); - make.height.mas_equalTo(16); - }]; - - _totalCostLabel = [UILabel labelInitWithText:@"" - font:kFontRegular(12) - textColor:UIColorFromRGB(0xFFEA5C)]; - _totalCostLabel.textAlignment = NSTextAlignmentCenter; - [contentView addSubview:_totalCostLabel]; - [self.totalCostLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.modifyButton.mas_bottom).offset(24); - make.centerX.mas_equalTo(contentView); - make.height.mas_equalTo(16); - }]; - - [space mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(contentView); - make.top.mas_equalTo(self.totalCostLabel.mas_bottom); - make.height.mas_equalTo(100); - }]; - - _sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sendButton.titleLabel setFont:kFontSemibold(15)]; - [_sendButton setBackgroundImage:kImage(@"luck_package_send_bg") forState:UIControlStateNormal]; - [_sendButton setTitle:YMLocalizedString(@"1.0.37_text_15.1") forState:UIControlStateNormal]; - [_sendButton setTitleColor:UIColorFromRGB(0x292601) forState:UIControlStateNormal]; - [_sendButton addTarget:self action:@selector(didTapSendButton) forControlEvents:UIControlEventTouchUpInside]; - [self addSubview:self.sendButton]; - [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self).offset(-18); - make.width.mas_equalTo(190); - make.height.mas_equalTo(50); - }]; - } - return self; -} - -- (void)refreshContent { - [self.scrollView setContentOffset:CGPointZero]; - - _dataSources = [[LuckyPackageLogicManager sharedInstance] loadAllSelectedGifts]; - [self.giftsCollectionView reloadData]; - dispatch_async(dispatch_get_main_queue(), ^{ - [self adjustCollectionViewContentInset]; - }); - - self.waitingTimeLabel.text = [NSString stringWithFormat:YMLocalizedString(@"1.0.37_text_13"), @([[LuckyPackageLogicManager sharedInstance] loadGiftWaitingTime]/60)]; - self.totalCostLabel.attributedText = [[LuckyPackageLogicManager sharedInstance] loadGiftTotalCostString]; -} - -- (void)didTapModifyButton { - if (_returnToModity) { - self.returnToModity(); - } -} - -- (void)didTapSendButton { - if (_tapButtonForGiftLuckyPackage) { - self.tapButtonForGiftLuckyPackage(); - } -} - -#pragma mark - -- (void)adjustCollectionViewContentInset { - CGFloat pageWidth = self.giftsCollectionView.frame.size.width; - NSInteger totalPages = ceil((double)self.dataSources.count / 8.0); - - CGFloat fullContentWidth = totalPages * pageWidth; - - CGFloat remainingWidth = fullContentWidth - self.giftsCollectionView.contentSize.width; - - if (remainingWidth > 0) { - self.giftsCollectionView.contentInset = UIEdgeInsetsMake(0, 0, 0, remainingWidth); - } else { - self.giftsCollectionView.contentInset = UIEdgeInsetsZero; - } -} -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.dataSources.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - ChooseGiftCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ChooseGiftCell" forIndexPath:indexPath]; - cell.cellModel = [self.dataSources xpSafeObjectAtIndex:indexPath.item]; - - [cell setModifySelectedGift:^(GiftInfoModel *model, NSInteger count) { - model.luckyPackageCount = count; - [[LuckyPackageLogicManager sharedInstance] updateSelectedGift:model count:count]; - }]; - - return cell; -} - -@end - -@interface LuckyPackageViewController () - -@property (nonatomic,weak) idhostDelegate; - -@property(nonatomic, strong) UIButton *closeButton; -@property(nonatomic, strong) UIImageView *bgImageView; -@property(nonatomic, strong) UIButton *giftButton; -@property(nonatomic, strong) UIButton *coinButton; -@property(nonatomic, strong) UIImageView *gemImageView; -@property(nonatomic, strong) UIButton *recordsButton; -@property(nonatomic, strong) UIButton *rulesButton; - -@property(nonatomic, strong) UIView *coinContainer; -@property(nonatomic, strong) UIView *giftContainer; - -@property(nonatomic, strong) UIView *createLuckyPackageContainer; -@property(nonatomic, strong) ChooseCoinView *chooseCoin; -@property(nonatomic, strong) ChooseGiftView *chooseGift; -@property(nonatomic, strong) ComfirmChooseGiftView *comfirmChooseGift; - -@property(nonatomic, strong) LuckyPackageRecordsView *recordsView; - -@property(nonatomic, strong) LuckyPackageBannerView *demoBanner; - -@end - -@implementation LuckyPackageViewController - - -- (instancetype)initWithdelegate:(id)delegate { - self = [super init]; - if (self) { - self.hiddenNavBar = YES; - self.hostDelegate = delegate; - } - return self; -} - -- (LuckyPackagePresenter *)createPresenter { - return [[LuckyPackagePresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.hiddenNavBar = YES; - - [self setupUI]; - [self displayChooseGift]; -} - -- (void)setupUI { - self.view.backgroundColor = [UIColor colorWithWhite:0 alpha:0.2]; - [self.view addSubview:self.createLuckyPackageContainer]; - [self.createLuckyPackageContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - - [self setupBG]; - [self setupControlArea]; -} - -- (void)setupBG { - [self.view addSubview:self.closeButton]; - - [self.createLuckyPackageContainer addSubview:self.bgImageView]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - if (iPhoneXSeries) { - make.edges.mas_equalTo(self.createLuckyPackageContainer).insets(UIEdgeInsetsMake(kGetScaleWidth(162), 0, 0, 0)); - } else { - make.edges.mas_equalTo(self.createLuckyPackageContainer).insets(UIEdgeInsetsMake(kNavigationHeight, 0, 0, 0)); - } - }]; - - [self.createLuckyPackageContainer addSubview:self.demoBanner]; - [self.demoBanner mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.bgImageView.mas_top).offset(40); - make.leading.trailing.mas_equalTo(self.createLuckyPackageContainer); - make.height.mas_equalTo(kGetScaleWidth(100)); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.createLuckyPackageContainer); - make.bottom.mas_equalTo(self.demoBanner.mas_bottom); - }]; -} - -- (void)setupControlArea { - [self.createLuckyPackageContainer addSubview:self.giftButton]; - [self.createLuckyPackageContainer addSubview:self.coinButton]; - [self.createLuckyPackageContainer addSubview:self.gemImageView]; - - [self.giftButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(47); - make.top.mas_equalTo(self.bgImageView).offset(kGetScaleWidth(108)); - make.left.mas_equalTo(self.createLuckyPackageContainer).offset(8); - make.right.mas_equalTo(self.createLuckyPackageContainer.mas_centerX).offset(-1.5); - }]; - - [self.coinButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(47); - make.top.mas_equalTo(self.bgImageView).offset(kGetScaleWidth(108)); - make.right.mas_equalTo(self.createLuckyPackageContainer).offset(-8); - make.left.mas_equalTo(self.createLuckyPackageContainer.mas_centerX).offset(1.5); - }]; - - [self.gemImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.createLuckyPackageContainer); - make.centerY.mas_equalTo(self.giftButton); - make.size.mas_equalTo(CGSizeMake(62, 31)); - }]; - - [self.createLuckyPackageContainer addSubview:self.rulesButton]; - [self.createLuckyPackageContainer addSubview:self.recordsButton]; - [self.rulesButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.coinButton.mas_bottom).offset(2); - make.trailing.mas_equalTo(self.createLuckyPackageContainer).offset(-5); - make.size.mas_equalTo(CGSizeMake(27, 27)); - }]; - - [self.recordsButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.coinButton.mas_bottom).offset(2); - make.trailing.mas_equalTo(self.rulesButton.mas_leading).offset(-3); - make.size.mas_equalTo(CGSizeMake(27, 27)); - }]; -} - -- (void)setupChooseGift { - if (!_giftContainer) { - _giftContainer = [[UIView alloc] init]; - [self.giftContainer addSubview:self.chooseGift]; - [self.chooseGift mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.giftContainer); - }]; - } - [self.createLuckyPackageContainer addSubview:self.giftContainer]; - [self.giftContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.rulesButton); - make.bottom.leading.trailing.mas_equalTo(self.view); - }]; - - [self.createLuckyPackageContainer bringSubviewToFront:self.rulesButton]; - [self.createLuckyPackageContainer bringSubviewToFront:self.recordsButton]; -} - -- (void)setupChooseCoin { - if (!_coinContainer) { - _coinContainer = [[UIView alloc] init]; - [self.coinContainer addSubview:self.chooseCoin]; - [self.chooseCoin mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.coinContainer); - }]; - } - [self.createLuckyPackageContainer addSubview:self.coinContainer]; - [self.coinContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.rulesButton); - make.bottom.leading.trailing.mas_equalTo(self.view); - }]; - - [self.createLuckyPackageContainer bringSubviewToFront:self.rulesButton]; - [self.createLuckyPackageContainer bringSubviewToFront:self.recordsButton]; -} - -- (void)setupComfirmChooseGift { - [self.giftContainer addSubview:self.comfirmChooseGift]; - [self.comfirmChooseGift mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.giftContainer); - }]; -} - -- (void)readyToSendGift { - if ([[LuckyPackageLogicManager sharedInstance] loadAllSelectedGifts].count == 0) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"1.0.37_text_29")]; - return; - } - - self.comfirmChooseGift.alpha = 0; - [self setupComfirmChooseGift]; - [self.comfirmChooseGift refreshContent]; - [UIView animateWithDuration:0.25 animations:^{ - self.comfirmChooseGift.alpha = 1; - self.chooseGift.alpha = 0; - }]; -} - -- (void)returnToModify { - [UIView animateWithDuration:0.25 animations:^{ - self.comfirmChooseGift.alpha = 0; - self.chooseGift.alpha = 1; - [self.chooseGift refreshData]; - } completion:^(BOOL finished) { - [self.comfirmChooseGift removeFromSuperview]; - }]; -} - -#pragma mark - -- (void)setupData { - NSString *roomUid = @(self.hostDelegate.getRoomInfo.uid).stringValue; - [self.presenter loadGifts:roomUid]; - [self.presenter loadWalletInfo]; -} - -- (void)loadGiftsSuccess:(NSArray *)gifts { - self.chooseGift.dataSources = gifts; -} - -- (void)loadWalletInfoSuccess:(WalletInfoModel *)walletInfo { - [[LuckyPackageLogicManager sharedInstance] saveWalletInfo:walletInfo]; - [self.chooseGift.walletView updatePrice:walletInfo.diamonds.doubleValue]; -} - -- (void)loadSentLuckyBag { - @kWeakify(self); - [self.presenter loadLuckyPackageRecords:1 type:1 success:^(NSArray * _Nonnull array) { - @kStrongify(self); - [self.recordsView setDateSource:array]; - }]; -} - -- (void)loadReceivedLuckyBag { - @kWeakify(self); - [self.presenter loadLuckyPackageRecords:1 type:2 success:^(NSArray * _Nonnull array) { - @kStrongify(self); - [self.recordsView setDateSource:array]; - }]; -} - -- (void)sendGiftLuckyPackage { - @kWeakify(self); - [self.presenter sendGiftLuckyPackage:self.hostDelegate.getRoomInfo.uid - uid:[[AccountInfoStorage instance] getUid] - waitingTime:[[LuckyPackageLogicManager sharedInstance] loadGiftWaitingTime] - selectedGifts:[[LuckyPackageLogicManager sharedInstance] loadAllSelectedGifts] - success:^{ - @kStrongify(self); - [self didTapCloseButton]; - }]; -} - - -- (void)sendCoinLuckyPackage { - @kWeakify(self); - [self.presenter sendCoinLuckyPackage:self.hostDelegate.getRoomInfo.uid - uid:[[AccountInfoStorage instance] getUid] - waitingTime:[[LuckyPackageLogicManager sharedInstance] loadCoinWaitingTime] - num:@([[LuckyPackageLogicManager sharedInstance] loadSelectedBagNum]) - goldNum:@([[LuckyPackageLogicManager sharedInstance] loadSelectedBagMoney]) - success:^{ - @kStrongify(self); - [self didTapCloseButton]; - }]; -} - -#pragma mark - -- (void)displayChooseGift { - if (_coinContainer) { - [self.coinContainer removeFromSuperview]; - } - [self setupChooseGift]; - [self setupData]; - - UserInfoModel *currentUser = [self.hostDelegate getUserInfo]; - [self.demoBanner updateDemoFor:1 nick:currentUser.nick avatar:currentUser.avatar]; -} - -- (void)displayChooseCoin { - if (_giftContainer) { - [self.giftContainer removeFromSuperview]; - } - [self setupChooseCoin]; - - UserInfoModel *currentUser = [self.hostDelegate getUserInfo]; - [self.demoBanner updateDemoFor:2 nick:currentUser.nick avatar:currentUser.avatar]; -} - -#pragma mark - -- (void)didTapCloseButton { - [self removeFromParentViewController]; - [self.view removeFromSuperview]; - if (_close) { - self.close(); - } - - [[LuckyPackageLogicManager sharedInstance] reset]; -} - -- (void)didTapGiftTabButton:(UIButton *)sender { - if (sender.isSelected) { - return; - } - sender.selected = YES; - self.coinButton.selected = NO; - - [self displayChooseGift]; -} - -- (void)didTapCoinTabButton:(UIButton *)sender { - if (sender.isSelected) { - return; - } - sender.selected = YES; - self.giftButton.selected = NO; - - [self displayChooseCoin]; -} - -- (void)didTapRecordsButton { - if (!_recordsView) { - _recordsView = [[LuckyPackageRecordsView alloc] init]; - @kWeakify(self); - [self.recordsView setTapBackButton:^{ - @kStrongify(self); - [UIView animateWithDuration:0.25 animations:^{ - self.recordsView.alpha = 0; - self.createLuckyPackageContainer.alpha = 1; - } completion:^(BOOL finished) { - [self.recordsView removeFromSuperview]; - }]; - }]; - - [self.recordsView setSwitchTap:^(BOOL isReceive) { - @kStrongify(self); - if (isReceive) { - [self loadReceivedLuckyBag]; - } else { - [self loadSentLuckyBag]; - } - }]; - - [self loadReceivedLuckyBag]; - } - self.recordsView.alpha = 0; - [self.view addSubview:self.recordsView]; - [self.recordsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(485); - }]; - - [self.recordsView updateWithUserInfo:self.hostDelegate.getUserInfo]; - - [UIView animateWithDuration:0.25 animations:^{ - self.recordsView.alpha = 1; - self.createLuckyPackageContainer.alpha = 0; - }]; -} - -- (void)didTapRulesButton { - BOOL giftContainerHiddenStatus = self.createLuckyPackageContainer.hidden; - self.createLuckyPackageContainer.hidden = YES; - - XPWebViewController *vc = [[XPWebViewController alloc] initWithRoomUID:[LuckyPackageLogicManager sharedInstance].roomUid]; - vc.hiddenNavBar = YES; - vc.url = URLWithType(KLuckyPackageRule); - @kWeakify(vc); - [vc setCloseWebViewBlock:^(BOOL result) { - @kStrongify(vc); - [vc.view removeFromSuperview]; - [vc removeFromParentViewController]; - - self.createLuckyPackageContainer.hidden = giftContainerHiddenStatus; - }]; - vc.view.hidden = YES; - [self addChildViewController:vc]; - [self.view addSubview:vc.view]; - [vc.view mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(470)); - }]; - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - vc.view.hidden = NO; - }); -} - -#pragma mark - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeButton addTarget:self action:@selector(didTapCloseButton) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] initWithImage:kImage(@"luck_package_main_bg")]; - _bgImageView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - return _bgImageView; -} - -- (UIButton *)giftButton { - if (!_giftButton) { - _giftButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _giftButton.adjustsImageWhenHighlighted = NO; - [_giftButton.titleLabel setFont:kFontSemibold(16)]; - [_giftButton setTitleColor:UIColorFromRGB(0xffea5c) forState:UIControlStateNormal]; - [_giftButton setTitle:YMLocalizedString(@"1.0.37_text_1") forState:UIControlStateNormal]; - [_giftButton setBackgroundImage:kImage(@"luck_package_gift_button_normal") forState:UIControlStateNormal]; - [_giftButton setBackgroundImage:kImage(@"luck_package_gift_button_selected") forState:UIControlStateSelected]; - [_giftButton addTarget:self action:@selector(didTapGiftTabButton:) forControlEvents:UIControlEventTouchUpInside]; - _giftButton.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - - _giftButton.selected = YES; - } - return _giftButton; -} - -- (UIButton *)coinButton { - if (!_coinButton) { - _coinButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _coinButton.adjustsImageWhenHighlighted = NO; - [_coinButton.titleLabel setFont:kFontSemibold(16)]; - [_coinButton setTitleColor:UIColorFromRGB(0xffea5c) forState:UIControlStateNormal]; - [_coinButton setTitle:YMLocalizedString(@"1.0.37_text_2") forState:UIControlStateNormal]; - [_coinButton setBackgroundImage:kImage(@"luck_package_coin_button_normal") forState:UIControlStateNormal]; - [_coinButton setBackgroundImage:kImage(@"luck_package_coin_button_selected") forState:UIControlStateSelected]; - [_coinButton addTarget:self action:@selector(didTapCoinTabButton:) forControlEvents:UIControlEventTouchUpInside]; - _coinButton.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - return _coinButton; -} - -- (UIImageView *)gemImageView { - if (!_gemImageView) { - _gemImageView = [[UIImageView alloc] initWithImage:kImage(@"luck_package_gem")]; - } - return _gemImageView; -} - -- (UIButton *)recordsButton { - if (!_recordsButton) { - _recordsButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_recordsButton setBackgroundImage:kImage(@"luck_package_records") forState:UIControlStateNormal]; - [_recordsButton addTarget:self action:@selector(didTapRecordsButton) forControlEvents:UIControlEventTouchUpInside]; - } - return _recordsButton; -} - -- (UIButton *)rulesButton { - if (!_rulesButton) { - _rulesButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_rulesButton setBackgroundImage:kImage(@"luck_package_rules") forState:UIControlStateNormal]; - [_rulesButton addTarget:self action:@selector(didTapRulesButton) forControlEvents:UIControlEventTouchUpInside]; - } - return _rulesButton; -} - -- (ChooseCoinView *)chooseCoin { - if (!_chooseCoin) { - _chooseCoin = [[ChooseCoinView alloc] init]; - @kWeakify(self); - [_chooseCoin setTapSendCoin:^{ - @kStrongify(self); - [self sendCoinLuckyPackage]; - }]; - } - return _chooseCoin; -} - -- (ChooseGiftView *)chooseGift { - if (!_chooseGift) { - _chooseGift = [[ChooseGiftView alloc] init]; - @kWeakify(self); - [_chooseGift setForceClose:^{ - @kStrongify(self); - [self didTapCloseButton]; - }]; - [_chooseGift setTapSendGift:^{ - @kStrongify(self); - [self readyToSendGift]; - }]; - } - return _chooseGift; -} - -- (ComfirmChooseGiftView *)comfirmChooseGift { - if (!_comfirmChooseGift) { - _comfirmChooseGift = [[ComfirmChooseGiftView alloc] init]; - @kWeakify(self); - [_comfirmChooseGift setReturnToModity:^{ - @kStrongify(self); - [self returnToModify]; - }]; - [_comfirmChooseGift setTapButtonForGiftLuckyPackage:^{ - @kStrongify(self); - [self sendGiftLuckyPackage]; - }]; - } - return _comfirmChooseGift; -} - -- (UIView *)createLuckyPackageContainer { - if (!_createLuckyPackageContainer) { - _createLuckyPackageContainer = [[UIView alloc] init]; - } - return _createLuckyPackageContainer; -} - -- (LuckyPackageBannerView *)demoBanner { - if (!_demoBanner) { - _demoBanner = [LuckyPackageBannerView demoBanner]; - } - return _demoBanner; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/OpenLuckyPackageEntranceView.h b/YuMi/Modules/YMRoom/View/LuckyPackage/OpenLuckyPackageEntranceView.h deleted file mode 100644 index 1e79765..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/OpenLuckyPackageEntranceView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// OpenLuckyPackageEntranceView.h -// YuMi -// -// Created by P on 2025/2/12. -// - -#import -@class RoomLuckyPackageInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface OpenLuckyPackageEntranceView : UIView - -- (void)updateEntrance:(RoomLuckyPackageInfoModel *)model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/LuckyPackage/OpenLuckyPackageEntranceView.m b/YuMi/Modules/YMRoom/View/LuckyPackage/OpenLuckyPackageEntranceView.m deleted file mode 100644 index 0a2c291..0000000 --- a/YuMi/Modules/YMRoom/View/LuckyPackage/OpenLuckyPackageEntranceView.m +++ /dev/null @@ -1,217 +0,0 @@ -// -// OpenLuckyPackageEntranceView.m -// YuMi -// -// Created by P on 2025/2/12. -// - -#import "OpenLuckyPackageEntranceView.h" -#import "RoomLuckyPackageInfoModel.h" -#import "LuckyPackageLogicManager.h" -#import "LuckyPackageStatusView.h" -#import "XPSkillCardPlayerManager.h" - -@interface OpenLuckyPackageEntranceView () - -@property(nonatomic, strong) RoomLuckyPackageInfoModel *packageInfomodel; - -@property(nonatomic, strong) UIImageView *iconImageView; -@property(nonatomic, strong) UILabel *badgeLabel; -@property(nonatomic, strong) UILabel *counterLabel; -@property(nonatomic, strong) UIView *counterBgView; - -@property(nonatomic, strong) NSTimer *timer; -@property(nonatomic, assign) NSInteger gap; - -@property(nonatomic, strong) UIButton *button; -@property(nonatomic, strong) RedEnvelopeListVo *currentDisplayModel; - -@property(nonatomic, strong) UIActivityIndicatorView *loadingIndicator; - -@end - -@implementation OpenLuckyPackageEntranceView - -- (instancetype)init -{ - self = [super init]; - if (self) { - [self addSubview:self.iconImageView]; - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(-4); - make.centerX.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(50, 50)); - }]; - - [self addSubview:self.badgeLabel]; - [self.badgeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(-9); - make.trailing.mas_equalTo(self.iconImageView).offset(9); - make.height.mas_equalTo(18); - make.width.mas_greaterThanOrEqualTo(18); - }]; - - [self addSubview:self.counterBgView]; - [self addSubview:self.counterLabel]; - [self.counterLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self).offset(-4); - make.height.mas_equalTo(18); - }]; - [self.counterBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self).offset(-4); - make.height.mas_equalTo(18); - make.width.mas_equalTo(48); - }]; - - _button = [UIButton buttonWithType:UIButtonTypeCustom]; - [_button addTarget:self action:@selector(didTapSelf) forControlEvents:UIControlEventTouchUpInside]; - [self addSubview:_button]; - [self.button mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.loadingIndicator]; - [self.loadingIndicator mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - } - return self; -} - -- (void)updateEntrance:(RoomLuckyPackageInfoModel *)model { - _packageInfomodel = model; - RedEnvelopeListVo *firstModel = [model.redEnvelopeListVoList xpSafeObjectAtIndex:0]; - if (!firstModel) { - self.hidden = YES; - return; - } - self.hidden = NO; - - self.currentDisplayModel = firstModel; - - self.iconImageView.image = [firstModel.type isEqualToString:@"GIFT"] ? kImage(@"luck_package_entrance_gift") : kImage(@"luck_package_entrance_coin"); - - NSInteger badgeNum = [[LuckyPackageLogicManager sharedInstance] packageBadgeNum]; - self.badgeLabel.text = badgeNum > 99 ? @"99+" : @(badgeNum).stringValue; - self.badgeLabel.hidden = badgeNum == 1; - - NSTimeZone *gmt8TimeZone = [NSTimeZone timeZoneForSecondsFromGMT:8 * 3600]; - NSCalendar *calendar = [NSCalendar currentCalendar]; - calendar.timeZone = gmt8TimeZone; - NSDateComponents *components = [calendar componentsInTimeZone:gmt8TimeZone fromDate:[NSDate date]]; - NSDate *gmt8Date = [calendar dateFromComponents:components]; - NSTimeInterval local = [gmt8Date timeIntervalSince1970]; - self.gap = (firstModel.beginTime - local * 1000)/1000; - if (self.gap > 0) { - [self startTimer]; - } else { - self.counterLabel.hidden = YES; - } -} - -- (void)startTimer { - [self stopTimer]; - self.counterLabel.hidden = NO; - self.counterBgView.hidden = NO; - self.timer = [NSTimer scheduledTimerWithTimeInterval:1.0 - target:self - selector:@selector(timerTick) - userInfo:nil - repeats:YES]; -} - -- (void)stopTimer { - if (self.timer) { - [self.timer invalidate]; - self.timer = nil; - self.counterLabel.hidden = YES; - self.counterBgView.hidden = YES; - } -} - -- (void)timerTick { - self.gap--; - [self updateLabel]; - - if (self.gap <= 0) { - [self stopTimer]; - } -} - -- (void)updateLabel { - NSInteger hours = self.gap / 3600; - NSInteger minutes = (self.gap % 3600)/60; - NSInteger second = self.gap % 60; - if (hours > 0) { - self.counterLabel.text = [NSString stringWithFormat:@"%02ld:%02ld", (long)hours, (long)minutes]; - } else { - self.counterLabel.text = [NSString stringWithFormat:@"%02ld:%02ld", (long)minutes, (long)second]; - } -} - -- (void)didTapSelf { - if ([[[XPSkillCardPlayerManager shareInstance] userInfoModel] isRechargeUser]) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"1.0.37_text_52")]; - return; - } - RedEnvelopeListVo *firstModel = [self.packageInfomodel.redEnvelopeListVoList xpSafeObjectAtIndex:0]; - LuckyPackageStatusView *view = [[LuckyPackageStatusView alloc] initWithModel:firstModel gap:self.gap]; - - TTPopupConfig *config = [[TTPopupConfig alloc] init]; - config.contentView = view; - config.maskBackgroundAlpha = 0.2; - config.shouldDismissOnBackgroundTouch = NO; - [TTPopup popupWithConfig:config]; -} - -#pragma mark - -- (UIImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[UIImageView alloc] init]; - } - return _iconImageView; -} - -- (UILabel *)badgeLabel { - if (!_badgeLabel) { - _badgeLabel = [UILabel labelInitWithText:@"" font:kFontMedium(10) textColor:[UIColor whiteColor]]; - _badgeLabel.textAlignment = NSTextAlignmentCenter; - _badgeLabel.backgroundColor = UIColorFromRGB(0xF33A49); - [_badgeLabel setCornerRadius:9]; - } - return _badgeLabel; -} - -- (UIView *)counterBgView { - if (!_counterBgView) { - _counterBgView = [[UIView alloc] init]; - _counterBgView.hidden = YES; - [_counterBgView addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xE55F00), - UIColorFromRGB(0xCD1700) - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 0.5) cornerRadius:17/2]; - [_counterBgView setAllCornerRadius:17/2 borderWidth:1 borderColor:UIColorFromRGB(0xfff2ca)]; - } - return _counterBgView; -} - -- (UILabel *)counterLabel { - if (!_counterLabel) { - _counterLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(12) textColor:UIColorFromRGB(0xFFF4D3)]; - _counterLabel.textAlignment = NSTextAlignmentCenter; - } - return _counterLabel; -} - -- (UIActivityIndicatorView *)loadingIndicator { - if (!_loadingIndicator) { - _loadingIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; - _loadingIndicator.hidesWhenStopped = YES; - _loadingIndicator.userInteractionEnabled = YES; - } - return _loadingIndicator; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineAvatarView.h b/YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineAvatarView.h deleted file mode 100644 index 52c3271..0000000 --- a/YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineAvatarView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MSRoomOnLineAvatarView.h -// YuMi -// -// Created by duoban on 2024/5/20. -// - -#import -#import "XPMessageRemoteExtModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MSRoomOnLineAvatarView : UIView -@property(nonatomic,strong) XPMessageRemoteExtModel *model; -@property(nonatomic,assign) BOOL isHiddenSubView; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineAvatarView.m b/YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineAvatarView.m deleted file mode 100644 index dc38dad..0000000 --- a/YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineAvatarView.m +++ /dev/null @@ -1,63 +0,0 @@ -// -// MSRoomOnLineAvatarView.m -// YuMi -// -// Created by duoban on 2024/5/20. -// - -#import "MSRoomOnLineAvatarView.h" -@interface MSRoomOnLineAvatarView() -@property(nonatomic,strong) NetImageView *avatarView; -@property(nonatomic,strong) UIImageView *borderView; -@end -@implementation MSRoomOnLineAvatarView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.avatarView]; - [self addSubview:self.borderView]; -} -- (void)setIsHiddenSubView:(BOOL)isHiddenSubView{ - _isHiddenSubView = isHiddenSubView; - _borderView.hidden = _isHiddenSubView; - _avatarView.hidden = _isHiddenSubView; -} --(void)installConstraints{ - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.borderView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; -} -- (void)setModel:(XPMessageRemoteExtModel *)model{ - _model = model; - _avatarView.imageUrl = _model.avatar; -} -#pragma mark - 懒加载 -- (NetImageView *)avatarView{ - if(!_avatarView){ - NetImageConfig *config = [NetImageConfig new]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - NetImageView *imageView = [[NetImageView alloc]initWithConfig:config]; - imageView.layer.cornerRadius = 12; - imageView.layer.masksToBounds = YES; - _avatarView = imageView; - } - return _avatarView; -} -- (UIImageView *)borderView{ - if(!_borderView){ - _borderView = [UIImageView new]; - _borderView.image = kImage(@"ms_room_online_border"); - } - return _borderView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineView.h b/YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineView.h deleted file mode 100644 index 0e99c17..0000000 --- a/YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MSRoomOnLineView.h -// YuMi -// -// Created by duoban on 2024/5/20. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface MSRoomOnLineView : UIView -@property(nonatomic,copy) NSString *count; -@property(nonatomic,copy) NSArray *avatarList; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineView.m b/YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineView.m deleted file mode 100644 index 78e6763..0000000 --- a/YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineView.m +++ /dev/null @@ -1,164 +0,0 @@ -// -// MSRoomOnLineView.m -// YuMi -// -// Created by duoban on 2024/5/20. -// - -#import "MSRoomOnLineView.h" -#import "XPMessageRemoteExtModel.h" -#import "MSRoomOnLineAvatarView.h" -@interface MSRoomOnLineView() -///在线数量背景 -@property(nonatomic,strong) UIView *countBgView; -///在线数量logo -@property(nonatomic,strong) UIImageView *countIconView; -///在线数量 -@property(nonatomic,strong) UILabel *countView; -///头像背景 -@property(nonatomic,strong) UIScrollView *onlineStackView; -@property(nonatomic,strong) UIStackView *stackView; -@end -@implementation MSRoomOnLineView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.countBgView]; - - [self addSubview:self.onlineStackView]; - - [self.countBgView addSubview:self.countIconView]; - [self.countBgView addSubview:self.countView]; - - [self.onlineStackView addSubview:self.stackView]; -} --(void)installConstraints{ - - [self.countBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(24); - make.top.equalTo(self); - make.trailing.mas_equalTo(0); - }]; - - [self.countIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(10); - make.top.mas_equalTo(2); - make.centerX.equalTo(self.countBgView); - }]; - [self.countView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.countIconView.mas_bottom).mas_offset(0); - make.leading.trailing.equalTo(self.countBgView).inset(2); - }]; - [self.onlineStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(76); - make.height.mas_equalTo(24); - make.top.leading.equalTo(self); - - }]; - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.onlineStackView); - }]; - for (int i = 0; i < 3; i++) { - MSRoomOnLineAvatarView *avatarView = [[MSRoomOnLineAvatarView alloc]initWithFrame:CGRectZero]; - avatarView.tag = 100 + i; - [self.stackView addArrangedSubview:avatarView]; - avatarView.isHiddenSubView = YES; - [avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(24); - }]; - - } - if (isMSRTL()) { - self.onlineStackView.transform = CGAffineTransformMakeRotation(M_PI); - self.stackView.transform = CGAffineTransformMakeRotation(M_PI); - } -} -- (void)setCount:(NSString *)count{ - _count = count; - _countView.text = _count; -} -- (void)setAvatarList:(NSArray *)avatarList{ - _avatarList = avatarList; - if(_avatarList.count == 0)return; - MSRoomOnLineAvatarView *imageView1 = [self.stackView viewWithTag:100]; - MSRoomOnLineAvatarView *imageView2 = [self.stackView viewWithTag:101]; - MSRoomOnLineAvatarView *imageView3 = [self.stackView viewWithTag:102]; - imageView1.isHiddenSubView = YES; - imageView2.isHiddenSubView = YES; - imageView3.isHiddenSubView = YES; - if(_avatarList.count == 1){ - imageView3.isHiddenSubView = NO; - XPMessageRemoteExtModel *model3 = _avatarList[0]; - imageView3.model = model3; - }else if(_avatarList.count == 2){ - imageView2.isHiddenSubView = NO; - XPMessageRemoteExtModel *model2 = _avatarList[0]; - imageView2.model = model2; - - imageView3.isHiddenSubView = NO; - XPMessageRemoteExtModel *model3 = _avatarList[1]; - imageView3.model = model3; - }else{ - imageView1.isHiddenSubView = NO; - XPMessageRemoteExtModel *model1 = _avatarList[0]; - imageView1.model = model1; - - imageView2.isHiddenSubView = NO; - XPMessageRemoteExtModel *model2 = _avatarList[1]; - imageView2.model = model2; - - imageView3.isHiddenSubView = NO; - XPMessageRemoteExtModel *model3 = _avatarList[2]; - imageView3.model = model3; - } -} -#pragma mark - 懒加载 -- (UIView *)countBgView{ - if(!_countBgView){ - _countBgView = [UIView new]; - _countBgView.layer.cornerRadius = 12; - _countBgView.layer.masksToBounds = YES; - _countBgView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.2]; - } - return _countBgView; -} - -- (UIImageView *)countIconView{ - if(!_countIconView){ - _countIconView = [UIImageView new]; - _countIconView.image = kImage(@"ms_room_onLine_icon"); - } - return _countIconView; -} -- (UILabel *)countView{ - if(!_countView){ - _countView = [UILabel labelInitWithText:@"0" font:[UIFont systemFontOfSize:9 weight:UIFontWeightBold] textColor:[UIColor whiteColor]]; - _countView.textAlignment = NSTextAlignmentCenter; - } - return _countView; -} -- (UIScrollView *)onlineStackView { - if (!_onlineStackView) { - _onlineStackView = [[UIScrollView alloc] init]; - _onlineStackView.scrollEnabled = NO; - } - return _onlineStackView; -} - - (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 5; - } - return _stackView; - } -@end diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.h b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.h deleted file mode 100644 index c58dae7..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// MSRoomMenuGameCell.h -// YuMi -// -// Created by duoban on 2024/4/29. -// - -#import -#import "ActivityInfoModel.h" -#import "LittleGameInfoModel.h" -#import "XPRoomMoreItemModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MSRoomMenuGameCell : UICollectionViewCell -@property(nonatomic,strong) ActivityInfoModel *model; -@property(nonatomic,strong) XPRoomMoreItemModel *moreItemModel; -@property(nonatomic,strong) LittleGameInfoModel *littleGameModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.m b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.m deleted file mode 100644 index 8abac03..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameCell.m +++ /dev/null @@ -1,86 +0,0 @@ -// -// MSRoomMenuGameCell.m -// YuMi -// -// Created by duoban on 2024/4/29. -// - -#import "MSRoomMenuGameCell.h" -@interface MSRoomMenuGameCell() -@property(nonatomic,strong) NetImageView *gameView; -@property(nonatomic,strong) UILabel *textView; -@end -@implementation MSRoomMenuGameCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self.contentView addSubview:self.gameView]; - [self.contentView addSubview:self.textView]; -} --(void)installConstraints{ - [self.gameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.contentView).inset(4); - make.height.mas_equalTo(self.gameView.mas_width); -// make.centerX.equalTo(self.contentView); - }]; - [self.textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.gameView.mas_bottom).mas_offset(7); - make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(5)); - }]; -} - -- (void)setModel:(ActivityInfoModel *)model{ - _model = model; - _gameView.image = nil; - @kWeakify(self); - [_gameView loadImageWithUrl:_model.icon completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - self.gameView.image = image; - }]; - _textView.text = _model.name; -} - -- (void)setMoreItemModel:(XPRoomMoreItemModel *)moreItemModel { - _moreItemModel = moreItemModel; - _gameView.image = [UIImage getLanguageImage:moreItemModel.imageName]; -} - -- (void)setLittleGameModel:(LittleGameInfoModel *)littleGameModel{ - _littleGameModel = littleGameModel; - _gameView.image = nil; - @kWeakify(self); - [_gameView loadImageWithUrl:littleGameModel.pic2 completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - self.gameView.image = image; - }]; - _textView.text = littleGameModel.name; -} - -#pragma mark - 懒加载 -- (NetImageView *)gameView{ - if(!_gameView){ - NetImageConfig *config = [NetImageConfig new]; - config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder]; - _gameView = [[NetImageView alloc]initWithConfig:config]; - _gameView.contentMode = UIViewContentModeScaleToFill; - _gameView.layer.cornerRadius = kGetScaleWidth(6); - _gameView.layer.masksToBounds = YES; - } - return _gameView; -} -- (UILabel *)textView{ - if(!_textView){ - _textView = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:[UIColor whiteColor]]; - _textView.textAlignment = NSTextAlignmentCenter; - _textView.numberOfLines = 2; - _textView.hidden = NO; - } - return _textView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameEmptyCell.h b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameEmptyCell.h deleted file mode 100644 index 7ba3a0a..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameEmptyCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MSRoomMenuGameEmptyCell.h -// YuMi -// -// Created by duoban on 2024/4/30. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface MSRoomMenuGameEmptyCell : UICollectionViewCell - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameEmptyCell.m b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameEmptyCell.m deleted file mode 100644 index 8004bdb..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameEmptyCell.m +++ /dev/null @@ -1,54 +0,0 @@ -// -// MSRoomMenuGameEmptyCell.m -// YuMi -// -// Created by duoban on 2024/4/30. -// - -#import "MSRoomMenuGameEmptyCell.h" -@interface MSRoomMenuGameEmptyCell() -@property(nonatomic,strong) UIImageView *iconView; -@property(nonatomic,strong) UILabel *textView; -@end -@implementation MSRoomMenuGameEmptyCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self.contentView addSubview:self.iconView]; - [self.contentView addSubview:self.textView]; -} --(void)installConstraints{ - [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(101)); - make.height.mas_equalTo(kGetScaleWidth(106)); - make.centerX.equalTo(self.contentView); - make.top.mas_equalTo(kGetScaleWidth(50)); - }]; - [self.textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.iconView.mas_bottom).mas_offset(kGetScaleWidth(14)); - make.centerX.equalTo(self.contentView); - }]; -} -#pragma mark - 懒加载 -- (UIImageView *)iconView{ - if(!_iconView){ - _iconView = [UIImageView new]; - _iconView.image = kImage(@"ms_room_bottom_game_icon"); - } - return _iconView; -} -- (UILabel *)textView{ - if(!_textView){ - _textView = [UILabel labelInitWithText:YMLocalizedString(@"XPCandyTreeEmptyableViewCell0") font:kFontRegular(14) textColor:[UIColor whiteColor]]; - } - return _textView; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.h b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.h deleted file mode 100644 index a1a40c6..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// MSRoomMenuGameVC.h -// YuMi -// -// Created by duoban on 2024/4/29. -// - -#import "MvpViewController.h" -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, MSRoomMenuType) { - MSRoomMenuTypePK, // 只有 PK - MSRoomMenuTypeGame, // 玩法 - MSRoomMenuTypeLittleGame, // 小游戏, 百顺的 -}; - - -@interface MSRoomMenuGameVC : MvpViewController -@property (nonatomic, copy) void(^updatePlayListAndGameList)(NSArray *playList, NSArray *gameList); -- (instancetype)initWithDelegate:(id)delegate roomMenuType:(MSRoomMenuType)type; -//- (instancetype)initWithDelegate:(id)delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.m b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.m deleted file mode 100644 index ae4bc1e..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.m +++ /dev/null @@ -1,420 +0,0 @@ -// -// MSRoomMenuGameVC.m -// YuMi -// -// Created by duoban on 2024/4/29. -// -#import "Api+Room.h" -#import "MSRoomMenuGameVC.h" -#import "MSRoomMenuGameView.h" -#import "XPRoomHalfWebView.h" -#import "XPWebViewController.h" -#import "XPCandyTreeViewController.h" -#import "XPSailingViewController.h" -#import "XPRoomViewController.h" -#import "MSRoomGameWebVC.h" -#import "RoomAnimationView.h" -#import "XPRoomMoreItemModel.h" -#import "GuildSuperAdminInfoModel.h" -#import "XPRoomPKViewController.h" -#import "XPAcrossRoomPKViewController.h" -#import "LuckyPackageViewController.h" -#import "XCCurrentVCStackManager.h" -#import -#import "Api+LittleGame.h" -#import "Api+RoomSetting.h" -#import "UserInfoModel.h" -#import - -@interface MSRoomMenuGameVC () -@property(nonatomic,strong) MSRoomMenuGameView *gameView; -@property(nonatomic, assign) MSRoomMenuType type; -///host 代理 -@property (nonatomic,weak) idhostDelegate; - -@property (nonatomic, assign) CGPoint startTouchPoint; -@end - -@implementation MSRoomMenuGameVC --(void)dealloc{ - -} - -- (instancetype)initWithDelegate:(id)delegate{ - self = [super init]; - if(self){ - self.hostDelegate = delegate; - } - return self; -} - -- (instancetype)initWithDelegate:(id)delegate - roomMenuType:(MSRoomMenuType)type { - self = [super init]; - if(self){ - self.type = type; - self.hostDelegate = delegate; - } - return self; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self installUI]; - [self installConstraints]; - [self loadMenuData]; - [self addTargetViewSwipeDownGesture]; -} - -- (void)addTargetViewSwipeDownGesture { - // 创建下滑手势识别器 - UIPanGestureRecognizer *pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handlePan:)]; - - // 将手势添加到目标视图 - [self.gameView addGestureRecognizer:pan]; -} - -- (void)handlePan:(UIPanGestureRecognizer *)gesture { - // 获取触摸点 - CGPoint touchPoint = [gesture locationInView:self.gameView]; - switch (gesture.state) { - case UIGestureRecognizerStateBegan: - // 记录起始触摸点 - self.startTouchPoint = touchPoint; - break; - case UIGestureRecognizerStateChanged: { - // 计算滑动距离 - CGFloat distance = touchPoint.y - self.startTouchPoint.y; - - // 判断滑动方向是否向下 - if (distance > 0) { - // 判断滑动距离是否超过阈值 - if (distance >= 150.0) { - [self handleSwipeDown]; - } - } - } - break; - case UIGestureRecognizerStateEnded: - // 重置起始触摸点 - self.startTouchPoint = CGPointZero; - break; - default: - break; - } -} - -- (void)handleSwipeDown { - // 处理下滑手势 - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)loadMenuData { - switch (self.type) { - case MSRoomMenuTypePK: - [self updateGamePlayList:@[]]; - break; - case MSRoomMenuTypeGame: - case MSRoomMenuTypeLittleGame:{ - [self getGameData]; - [self getLittleGameList]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self updateGameModels]; - }); - } - break; - default: - break; - } -} - -- (void)updateGameModels { - RACSubject* playRAC = [RACSubject subject]; - RACSubject* littleGameRAC = [RACSubject subject]; - - @kWeakify(self); - [[RACSignal combineLatest:@[playRAC, - littleGameRAC] - reduce:^id(NSArray *playModels, - NSArray *littleGameModels){ - @kStrongify(self); - [self.gameView updateDataSource:playModels gameList:littleGameModels]; - if (self.updatePlayListAndGameList) { - self.updatePlayListAndGameList(playModels, littleGameModels); - } - return nil; - }] subscribeError:^(NSError * _Nullable error) { - [XNDJTDDLoadingTool showErrorWithMessage:error.domain]; - }]; - - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - [Api getPlayList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [ActivityInfoModel modelsWithArray:data.data]; - [playRAC sendNext:array]; - [playRAC sendCompleted]; - } else { - [playRAC sendError:[NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]]; - } - } roomId:roomId]; - - NSString *roomUid = [NSString stringWithFormat:@"%ld", - self.hostDelegate.getRoomInfo.uid]; - [Api getLittleGameList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [LittleGameInfoModel modelsWithArray:data.data]; - [littleGameRAC sendNext:array]; - [littleGameRAC sendCompleted]; - } else { - [littleGameRAC sendError:[NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]]; - } - } roomUid:roomUid]; -} - --(void)getGameData{ - NSMutableArray *resourceList = [self.hostDelegate getPlayList]; - if(resourceList.count > 0){ - self.gameView.playList = resourceList; - } -} - -- (void)updateGamePlayList:(NSArray *)array { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - NSMutableArray *tempArray = [[NSMutableArray alloc] initWithArray:@[ - [self createRoomPKModel:roomInfo], - [self createCrossRoomPKModel:roomInfo] - ]]; - self.gameView.playList = tempArray; -} - -- (XPRoomMoreItemModel *)createRoomPKModel:(RoomInfoModel *)roomInfo { - XPRoomMoreItemModel * roomPK = [[XPRoomMoreItemModel alloc] init]; - roomPK.imageName= @"room_pk_menu_icon"; - roomPK.type = (roomInfo.roomModeType == RoomModeType_Open_PK_Mode) ? - RoomMoreMenuType_Room_PK_Close : - RoomMoreMenuType_Room_PK_Open; - return roomPK; -} - -- (XPRoomMoreItemModel *)createCrossRoomPKModel:(RoomInfoModel *)roomInfo { - XPRoomMoreItemModel * acrossRoomPK = [[XPRoomMoreItemModel alloc] init]; - acrossRoomPK.imageName = @"crossroom_pk_menu_icon"; - acrossRoomPK.type = (roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) ? - RoomMoreMenuType_Room_Across_PK_Close : - RoomMoreMenuType_Room_Across_PK_Open; - return acrossRoomPK; -} - -- (void)getLittleGameList { - NSMutableArray *resourceList = [self.hostDelegate getLittleGameList]; - if(resourceList.count > 0){ - self.gameView.littleGameList = resourceList; - } -} - --(void)installUI{ - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.gameView]; -} --(void)installConstraints{ - [self.gameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); - }]; -} - -#pragma mark- MSRoomMenuGameViewDelegate -- (void)didClickBackBtnAction{ - [self dismissViewControllerAnimated:YES completion:nil]; -} - --(void)ms_didSelectLittleGameItemAtIndexPath:(LittleGameInfoModel *)model { - if (self.hostDelegate.isManagerOrOwner) { - @kWeakify(self); - [TTPopup alertWithMessage:YMLocalizedString(@"MSRoomMenuGameVC0") confirmHandler:^{ - @kStrongify(self); - [self startLittleGameWith:model]; - } cancelHandler:^{}]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"MSRoomMenuGameVC1")]; - } -} - -- (void)startLittleGameWith:(LittleGameInfoModel *)model { - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - NSMutableDictionary * params = [NSMutableDictionary dictionary]; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [params setObject:ticket forKey:@"ticket"]; - [params setObject:@(roomInfo.uid).stringValue forKey:@"uid"]; - [params setObject:[NSString stringWithFormat:@"%ld", roomInfo.uid] forKey:@"roomUid"]; - if (roomInfo.title.length > 0) { - [params setObject:roomInfo.title forKey:@"title"]; - } - - if (roomInfo.roomPwd.length > 0) { - [params setObject:roomInfo.roomPwd forKey:@"roomPwd"]; - } else{ - [params setObject:@"" forKey:@"roomPwd"]; - } - - if (roomInfo.tagId > 0) { - [params setObject:[NSString stringWithFormat:@"%ld", roomInfo.tagId] forKey:@"tagId"]; - } - if ([model.mgId isEqualToString:@"0"]) { - [params setObject:@(RoomType_Room) forKey:@"type"]; - [params setObject:@"0" forKey:@"mgId"]; - } else { - [params setObject:@(RoomType_MiniGame) forKey:@"type"]; - [params setObject:model.mgId forKey:@"mgId"]; - } - [params setObject:@(roomInfo.hasAnimationEffect) forKey:@"hasAnimationEffect"]; - - @kWeakify(self); - [Api ownerUpdateRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [self dismissViewControllerAnimated:YES completion:nil]; - if (code == 200) { - - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } params:params]; -} - -- (void)handleMoreItem:(XPRoomMoreItemModel *)model { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - switch (model.type) { - case RoomMoreMenuType_Room_PK_Close: { - XPRoomPKViewController * roomPKVC = [[XPRoomPKViewController alloc] initWithDelegate:self.hostDelegate]; - [self.hostDelegate.getCurrentNav pushViewController:roomPKVC animated:YES]; - } - break; - case RoomMoreMenuType_Room_PK_Open: { - if (roomInfo.roomModeType == RoomModeType_Open_Blind) { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController20")]; - } else if (roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController21")]; - } else { - XPRoomPKViewController * roomPKVC = [[XPRoomPKViewController alloc] initWithDelegate:self.hostDelegate]; - [self.hostDelegate.getCurrentNav pushViewController:roomPKVC animated:YES]; - } - } - break; - case RoomMoreMenuType_Room_Across_PK_Close: { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController15")]; - } - break; - case RoomMoreMenuType_Room_Across_PK_Open:{ - if (roomInfo.roomModeType == RoomModeType_Open_Blind) { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController13")]; - } else if (roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController14")]; - } else { - XPAcrossRoomPKViewController *acrossRoomPKVC = [[XPAcrossRoomPKViewController alloc] initWithRoomUid:[NSString stringWithFormat:@"%ld", roomInfo.uid]]; - [self.hostDelegate.getCurrentNav presentViewController:acrossRoomPKVC animated:YES completion:nil]; - } - } - break; - default: - break; - } -} - -- (void)handleActivityInfo:(ActivityInfoModel *)model { - if ([model.code isEqualToString:@"JOYPLAY"]) { - [self clickGameVC:model]; - } else if ([model.code isEqualToString:@"LUCKY_BAG"]) { - if ([[self.hostDelegate getUserInfo] isRechargeUser]) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"1.0.37_text_52")]; - return; - } - LuckyPackageViewController *giftVC = [[LuckyPackageViewController alloc] initWithdelegate:self.hostDelegate]; - [[XCCurrentVCStackManager shareManager].getCurrentVC addChildViewController:giftVC]; - [[XCCurrentVCStackManager shareManager].getCurrentVC.view addSubview:giftVC.view]; - } else if ([model.code isEqualToString:@"FIND_LOVE"]) { - [self lookLoveTapRecognizer]; - } else if([model.code isEqualToString:@"NAUTICAL_ADVENTURE"]) { - [self sailTapRecognizer]; - }else if([model.code isEqualToString:@"BAISHUN"]){ - [self clickGameVC:model]; - } else if ([model.code isEqualToString:@"LEADERCC"]) { - [self clickGameVC:model]; - } else if(model.skipType == ActivitySkipType_Web) { - if(model.showType == ActivityShowType_Half){ - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.isPlayView = YES; - webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - webView.url = model.skipContent; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; - return; - } - - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:@(self.hostDelegate.getRoomInfo.uid).stringValue]; - webVC.url = model.skipContent; - [self.hostDelegate.getCurrentNav pushViewController:webVC animated:YES]; - } -} - --(void)ms_didSelectItemAtIndexPath:(id)model { - self.gameView.hidden = YES; - [self dismissViewControllerAnimated:YES completion:^{ - if ([model isKindOfClass:[XPRoomMoreItemModel class]]) { - [self handleMoreItem:(XPRoomMoreItemModel *)model]; - } else if ([model isKindOfClass:[ActivityInfoModel class]]) { - [self handleActivityInfo:(ActivityInfoModel *)model]; - } - }]; -} --(void)clickGameVC:(ActivityInfoModel *)model{ - if ([self.hostDelegate isKindOfClass:[XPRoomViewController class]]){ - MSRoomGameWebVC *vc = [[MSRoomGameWebVC alloc] initWithDelegate:self.hostDelegate gameModel:model]; - vc.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - XPRoomViewController *roomVC = (XPRoomViewController *)self.hostDelegate; - [roomVC addChildViewController:vc]; - RoomAnimationView *animationView; - for (id obj in self.hostDelegate.getSuperView.subviews) { - if ([obj isKindOfClass:[RoomAnimationView class]]){ - animationView = obj; - break; - } - } - [self.hostDelegate.getSuperView addSubview:vc.view]; - vc.view.tag = 913; - } -} - -- (void)lookLoveTapRecognizer { - if ([self.hostDelegate isKindOfClass:[XPRoomViewController class]]){ - XPCandyTreeViewController * candyTreeVC = [[XPCandyTreeViewController alloc] initWithDelegate:self.hostDelegate]; - candyTreeVC.view.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight); - [self.hostDelegate.getSuperView addSubview:candyTreeVC.view]; - XPRoomViewController *vc = (XPRoomViewController *)self.hostDelegate; - [vc addChildViewController:candyTreeVC]; - [candyTreeVC.navigationController setNavigationBarHidden:YES animated:NO]; - [UIView animateWithDuration:0.1 animations:^{ - candyTreeVC.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - }completion:^(BOOL finished) { - - }]; - } -} - -- (void)sailTapRecognizer { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - XPSailingViewController * sailingVC = [[XPSailingViewController alloc] initWithRoomUid:roomUid]; - [self.hostDelegate.getCurrentNav presentViewController:sailingVC animated:YES completion:nil]; -} - -#pragma mark - 懒加载 -- (MSRoomMenuGameView *)gameView{ - if(!_gameView){ - _gameView = [[MSRoomMenuGameView alloc]initWithFrame:CGRectZero]; - _gameView.delegate = self; - } - return _gameView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameView.h b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameView.h deleted file mode 100644 index 085b3fc..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameView.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// MSRoomMenuGameView.h -// YuMi -// -// Created by duoban on 2024/4/29. -// - -#import -#import "ActivityInfoModel.h" -#import "LittleGameInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol MSRoomMenuGameViewDelegate - --(void)didClickBackBtnAction; --(void)ms_didSelectLittleGameItemAtIndexPath:(LittleGameInfoModel *)model; --(void)ms_didSelectItemAtIndexPath:(id)model; -@end - - -@interface MSRoomMenuGameView : UIView -@property(nonatomic,strong) NSMutableArray *playList; // ActivityInfoModel & XPRoomMoreItemModel -@property(nonatomic,strong) NSMutableArray *littleGameList; -@property (nonatomic, strong) NSMutableArray *dataSource; -@property(nonatomic,weak) iddelegate; - -- (void)updateDataSource:(NSArray *)playList gameList:(NSArray *)littleGameList; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameView.m deleted file mode 100644 index 9133fa7..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameView.m +++ /dev/null @@ -1,196 +0,0 @@ -// -// MSRoomMenuGameView.m -// YuMi -// -// Created by duoban on 2024/4/29. -// - -#import "MSRoomMenuGameView.h" -#import "MSRoomMenuGameCell.h" -#import "XNDJTDDLoadingTool.h" -#import "MSRoomMenuGameEmptyCell.h" - -static const NSInteger kItemsPerRow = 5; - -@interface MSRoomMenuGameView() -@property(nonatomic,strong) UIButton *backBtn; -@property(nonatomic,strong) UIView *ms_bgView; -@property(nonatomic, strong) UIVisualEffectView *blurEffectView; -@property(nonatomic,strong) UICollectionView *collectionView; - -@property (nonatomic, assign) CGFloat itemHeight; -@property (nonatomic, assign) CGFloat emptyHeight; - -@end -@implementation MSRoomMenuGameView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - self.itemHeight = kGetScaleWidth(120); - self.emptyHeight = kGetScaleWidth(100); - self.dataSource = @[].mutableCopy; - - [self installUI]; - [self installConstraints]; - } - return self; -} - --(void)installUI{ - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.backBtn]; - [self addSubview:self.ms_bgView]; - [self addSubview:self.blurEffectView]; - [self addSubview:self.collectionView]; -} - --(void)installConstraints{ - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.blurEffectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self).inset(0); - make.bottom.equalTo(self).offset(12); - make.height.mas_equalTo(KScreenHeight*2/3); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self); - make.leading.trailing.equalTo(self).inset(16); -// make.height.mas_equalTo(kGetScaleWidth(246)); - make.height.mas_equalTo(KScreenHeight*2/3 - 30); - }]; -} - --(void)backBtnAction{ - if (self.delegate && [self.delegate respondsToSelector:@selector(didClickBackBtnAction)]){ - [self.delegate didClickBackBtnAction]; - } -} - --(void)setPlayList:(NSMutableArray *)playList { - _playList = playList; - [self.dataSource addObjectsFromArray:playList]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.collectionView reloadData]; - }); -} - -- (void)setLittleGameList:(NSMutableArray *)littleGameList { - _littleGameList = littleGameList; - [self.dataSource addObjectsFromArray:littleGameList]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.collectionView reloadData]; - }); -} - -- (void)updateDataSource:(NSArray *)playList gameList:(NSArray *)littleGameList { - _playList = playList.mutableCopy; - _littleGameList = littleGameList.mutableCopy; - self.dataSource = [NSMutableArray array]; - [self.dataSource addObjectsFromArray:playList]; - [self.dataSource addObjectsFromArray:littleGameList]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.collectionView reloadData]; - }); -} - -- (NSInteger)countOfCurrentType { - return self.dataSource.count;// self.littleGameList.count > 0 ? self.littleGameList.count : self.playList.count; -} - -#pragma mark- UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{ - CGFloat width = (KScreenWidth - 64)/4; - return [self countOfCurrentType] > 0 ? CGSizeMake(width, self.itemHeight) : CGSizeMake(KScreenWidth, self.emptyHeight); -} -- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ - return [self countOfCurrentType] > 0 ? UIEdgeInsetsMake(0, kGetScaleWidth(3), 0, kGetScaleWidth(3)) : UIEdgeInsetsZero; -} -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ - return [self countOfCurrentType] > 0 ? [self countOfCurrentType] : 1; -} -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - if ([self countOfCurrentType] == 0){ - MSRoomMenuGameEmptyCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([MSRoomMenuGameEmptyCell class]) forIndexPath:indexPath]; - return cell; - } - - MSRoomMenuGameCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([MSRoomMenuGameCell class]) forIndexPath:indexPath]; - id model = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; - if ([model isKindOfClass:[XPRoomMoreItemModel class]]) { - cell.moreItemModel = model; - } else if ([model isKindOfClass:[ActivityInfoModel class]]) { - cell.model = model; - } else { - cell.littleGameModel = model; - } - return cell; -} --(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - if (self.dataSource.count > 0 && self.delegate) { - id model = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; - if ([model isKindOfClass:[LittleGameInfoModel class]]) { - if ([self.delegate respondsToSelector:@selector(ms_didSelectLittleGameItemAtIndexPath:)]) { - [self.delegate ms_didSelectLittleGameItemAtIndexPath:model]; - } - } else { - if ([self.delegate respondsToSelector:@selector(ms_didSelectItemAtIndexPath:)]) { - [self.delegate ms_didSelectItemAtIndexPath:model]; - } - } - } -} -#pragma mark - 懒加载 -- (UIButton *)backBtn{ - if(!_backBtn){ - _backBtn = [UIButton new]; - [_backBtn addTarget:self action:@selector(backBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} -- (UIView *)ms_bgView{ - if(!_ms_bgView){ - _ms_bgView = [UIView new]; - _ms_bgView.backgroundColor = UIColorFromRGB(0x2D1E4D); - _ms_bgView.layer.cornerRadius = 12; - _ms_bgView.layer.masksToBounds = YES; - } - return _ms_bgView; -} -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 8; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.showsVerticalScrollIndicator = NO; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[MSRoomMenuGameCell class] forCellWithReuseIdentifier:NSStringFromClass([MSRoomMenuGameCell class])]; - [_collectionView registerClass:[MSRoomMenuGameEmptyCell class] forCellWithReuseIdentifier:NSStringFromClass([MSRoomMenuGameEmptyCell class])]; - } - return _collectionView; -} - -- (UIVisualEffectView *)blurEffectView { - if (!_blurEffectView) { - // 创建模糊效果 - UIBlurEffect *blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; - - // 创建包含模糊效果的视图 - _blurEffectView = [[UIVisualEffectView alloc] initWithEffect:blurEffect]; - - // 设置模糊视图的大小与目标视图一致 - _blurEffectView.frame = CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(246)); - _blurEffectView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; - - [_blurEffectView setCornerRadius:24]; - } - return _blurEffectView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/Model/XPRoomMenuItem.h b/YuMi/Modules/YMRoom/View/MenuContainerView/Model/XPRoomMenuItem.h deleted file mode 100644 index f2fc4e3..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/Model/XPRoomMenuItem.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMRoomMenuItem.h -// YUMI -// -// Created by YUMI on 2021/10/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, XPRoomMenuItemType) { - XPRoomMenuItemType_Input = 1, - XPRoomMenuItemType_Mic,///话筒 - XPRoomMenuItemType_Voice, ///声音 - XPRoomMenuItemType_Face,///表情 - XPRoomMenuItemType_Message,///房间私聊 - XPRoomMenuItemType_More,///更多 - XPRoomMenuItemType_ArrangeMic,///排麦 - XPRoomMenuItemType_Gift,///礼物 - XPRoomMenuItemType_Noble,///VIP - XPRoomMenuItemType_PK,/// PK 菜单 - MSRoomMenuItemType_BAISHUN_GAME,///显示百顺游戏 -}; - -@interface XPRoomMenuItem : NSObject - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/Model/XPRoomMenuItem.m b/YuMi/Modules/YMRoom/View/MenuContainerView/Model/XPRoomMenuItem.m deleted file mode 100644 index a47b574..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/Model/XPRoomMenuItem.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMRoomMenuItem.m -// YUMI -// -// Created by YUMI on 2021/10/14. -// - -#import "XPRoomMenuItem.h" - -@implementation XPRoomMenuItem - -@end diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/RoomMenuBar.h b/YuMi/Modules/YMRoom/View/MenuContainerView/RoomMenuBar.h deleted file mode 100644 index 618ccaa..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/RoomMenuBar.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// RoomMenuBar.h -// YuMi -// -// Created by P on 2024/9/13. -// - -#import -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomMenuBar : UIView - -- (instancetype)initWithDelegate:(id)delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/RoomMenuBar.m b/YuMi/Modules/YMRoom/View/MenuContainerView/RoomMenuBar.m deleted file mode 100644 index 956a00c..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/RoomMenuBar.m +++ /dev/null @@ -1,35 +0,0 @@ -// -// RoomMenuBar.m -// YuMi -// -// Created by P on 2024/9/13. -// - -#import "RoomMenuBar.h" - -@interface RoomMenuBar () - -@property (nonatomic,weak) id delegate; - -@end - -@implementation RoomMenuBar - -- (instancetype)initWithDelegate:(id)delegate { - self = [super init]; - if (self) { - self.delegate = delegate; - [self setupUI]; - - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showGiftView:) name:@"kShowGiftView" object:nil]; - } - return self; -} - -- (void)setupUI { - - - -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.h b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.h deleted file mode 100644 index ebbc3b3..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMRoomBottomMenuView.h -// YUMI -// -// Created by YUMI on 2021/10/11. -// - -#import -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" -#import "XPArrangeMicViewController.h" -#import "XPFreeGiftModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomMenuContainerView : UIView - -@property (nonatomic,strong) XPFreeGiftModel *freeModel; -@property (nonatomic, copy) void(^updateHeight)(CGFloat height); - -- (instancetype)initWithDelegate:(id)delegate; --(void)showInputView:(NSString *)text; -- (void)menuResignFirstResponder; -- (void)recheckMicState; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m deleted file mode 100644 index c7c8f34..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m +++ /dev/null @@ -1,917 +0,0 @@ -// -// XPRoomBottomMenuView.m -// xplan-ios -// -// Created by 冯硕 on 2021/10/11. -// - -#import "XPRoomMenuContainerView.h" -///Third -#import -///Tool -#import "AccountInfoStorage.h" -#import "TTPopup.h" -#import "RtcManager.h" - -#import "XCCurrentVCStackManager.h" -#import "UIImage+Utils.h" -///Model -#import "UserInfoModel.h" -#import "XPRoomMenuItem.h" -#import "MicroQueueModel.h" -#import "UserInfoModel.h" -#import "MicroStateModel.h" -#import "RoomInfoModel.h" -#import "AttachmentModel.h" -#import "GuildSuperAdminInfoModel.h" -///View -#import "XPWebViewController.h" -#import "XPRoomSendTextView.h" -#import "XPSendGiftView.h" -#import "SessionListViewController.h" -#import "XPRoomMoreMenuViewController.h" -#import "VIPCenterViewController.h" -#import "XPRoomFaceViewController.h" -#import "XPRoomHalfMessageView.h" -#import "XPRoomMessageBubbleView.h" -#import "MSRoomMenuGameVC.h" -#import "SVGA.h" - -#import "XPRoomMiniManager.h" -#import "XPSkillCardPlayerManager.h" - -UIKIT_EXTERN NSString * kRoomBackMusicCaptureVolumeKey; - -@interface XPRoomMenuContainerView () - -///输入框 -@property (nonatomic,strong) UIButton *inputButton; -@property (nonatomic,strong) UILabel *inputLabel; -///麦 -@property (nonatomic,strong) UIButton *micButton; -@property (nonatomic,strong) UIButton *micButton_open; -@property (nonatomic,strong) UIButton *micButton_close_all; -@property (nonatomic,strong) UIButton *micButton_close_butMusic; -///声音 -@property (nonatomic,strong) UIButton *voiceButton; -///表情 -@property (nonatomic,strong) UIButton *faceButton; -///私聊 -@property (nonatomic,strong) UIButton *messageButton; -///更多 -@property (nonatomic,strong) UIButton *moreButton; - -///礼物 -@property (nonatomic,strong) UIButton *giftButton; -///排麦 -@property (nonatomic,strong) UIButton *arrangeMicButton; - -///输入框 -@property (nonatomic,strong) XPRoomSendTextView *inputTextView; -@property (nonatomic,strong) XPRoomMessageBubbleView *miniMessageView; -///代理 -@property (nonatomic,weak) id delegate; - -@property (nonatomic, strong) UIStackView *stackView; - -@property (nonatomic, assign) NSInteger defaultVoiceVolume; - -@property (nonatomic, assign) BOOL isDisplayMicStatusControl; - -@property(nonatomic, assign) BOOL isOnMic; - -@property(nonatomic, strong) UIButton *closeMicControlButton; -@end - - -@implementation XPRoomMenuContainerView - -- (instancetype)initWithDelegate:(id)delegate { - self = [super init]; - if (self) { - self.clipsToBounds = NO; - self.defaultVoiceVolume = [[RtcManager instance] loadUserSound]; - - self.delegate = delegate; - [self initSubViews]; - [self initSubViewConstraints]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showGiftView:) name:@"kShowGiftView" object:nil]; - } - return self; -} -- (void)menuResignFirstResponder { - [self.inputTextView.editTextFiled resignFirstResponder]; -} --(void)showInputView:(NSString *)text{ - [self menuButtonAction:self.inputButton]; - [self.inputTextView showInputView:text]; -} -#pragma mark - Response -- (void)menuButtonAction:(UIButton *)sender { - XPRoomMenuItemType type = sender.tag; - switch (type) { - case XPRoomMenuItemType_Input: - { - if (self.delegate.getRoomInfo.isCloseScreen){//} && self.delegate.getPublicScreenType == 0) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomMenuContainerView0")]; - return; - } - if (self.delegate.getRoomInfo.type == RoomType_Anchor) { - self.inputTextView = [XPRoomSendTextView showTextView:self.superview.superview delegate:self.delegate atUid:nil atNick:nil]; - } else { - self.inputTextView = [XPRoomSendTextView showTextView:self.superview delegate:self.delegate atUid:nil atNick:nil]; - } - } - break; - - case XPRoomMenuItemType_Mic: { - [self showMicControlMenu]; - } - break; - - case XPRoomMenuItemType_Voice: { - [RtcManager instance].remoteMuted = !self.voiceButton.isSelected; - self.voiceButton.selected = [RtcManager instance].isRemoteMuted; - } - break; - - case XPRoomMenuItemType_Face: { - XPRoomFaceViewController * faceVC = [[XPRoomFaceViewController alloc] init]; - faceVC.modalPresentationStyle = UIModalPresentationOverFullScreen; - faceVC.roomId = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.roomId]; - [self.delegate.getCurrentNav presentViewController:faceVC animated:YES completion:nil]; - } - break; - case XPRoomMenuItemType_Gift: { - NSString * roomUid = [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].uid]; - XPSendGiftView * giftView = [[XPSendGiftView alloc] initWithType:SendGiftType_Room uid:roomUid]; - giftView.delegate = self.delegate; - giftView.freeModel = self.freeModel; - NSArray * giftUses = [self configGiftUsers:[self.delegate getMicroQueue]]; - [giftView configGiftUsers:giftUses]; - [self.delegate.getCurrentNav presentViewController:giftView animated:YES completion:nil]; - } - break; - case XPRoomMenuItemType_Message: - { - UIViewController * controller = (UIViewController *)self.delegate; - XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight) controller:controller]; - [controller.view addSubview:halfMessageView]; - [UIView animateWithDuration:.35 animations:^{ - CGRect rect = halfMessageView.frame; - rect.origin.y = 0; - halfMessageView.frame = rect; - }]; - } - break; - case XPRoomMenuItemType_More: { - [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"XP didTapForNewFunction"]; - [self.moreButton setImage:[UIImage imageNamed:@"room_menu_more"] forState:UIControlStateNormal]; - XPRoomMoreMenuViewController * moreMenuVC = [[XPRoomMoreMenuViewController alloc] initWithDelegate:self.delegate isUserOnMic:self.isOnMic]; - [self.delegate.getCurrentNav presentViewController:moreMenuVC animated:YES completion:nil]; - } - break; - case XPRoomMenuItemType_ArrangeMic:{ - if (self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode && self.delegate.isRoomPKPlaying) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomMenuContainerView1")]; - return; - } - - self.arrangeMicButton.selected = NO; - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - NIMChatroomMember * member; - if (error == nil) { - member = members.firstObject; - } - RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - XPArrangeMicInfoModel * info = [[XPArrangeMicInfoModel alloc] init]; - info.roomUid = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - info.roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - info.nick = roomInfo.nick; - info.roomAvatar = roomInfo.avatar; - info.roomTitle = roomInfo.title; - info.micQueue = [self.delegate getMicroQueue]; - info.isManager = (member.type == NIMChatroomMemberTypeCreator || member.type == NIMChatroomMemberTypeManager); - info.type = roomInfo.roomModeType == RoomModeType_Open_Blind ? ArrangeMicType_Dating : roomInfo.roomModeType == RoomModeType_Open_PK_Mode ? ArrangeMicType_Room_PK : ArrangeMicType_Normal; - info.roomType = roomInfo.type; - XPArrangeMicViewController * arrangeMicVC = [[XPArrangeMicViewController alloc] initWithInfo:info]; - [self.delegate.getCurrentNav presentViewController:arrangeMicVC animated:YES completion:nil]; - }]; - } - break; - case XPRoomMenuItemType_Noble: { -// VIPCenterViewController * nobleVC = [[VIPCenterViewController alloc] initWithRoomUid:self.delegate.getRoomInfo.uid]; -// [self.delegate.getCurrentNav pushViewController:nobleVC animated:YES]; - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:@(self.delegate.getRoomInfo.uid).stringValue]; - webVC.url = URLWithType(kVIP); - [self.delegate.getCurrentNav pushViewController:webVC animated:YES]; - } - break; - case MSRoomMenuItemType_BAISHUN_GAME: - { - MSRoomMenuGameVC *vc = [[MSRoomMenuGameVC alloc]initWithDelegate:self.delegate roomMenuType:MSRoomMenuTypeLittleGame]; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.delegate.getCurrentNav presentViewController:vc animated:YES completion:nil]; - break; - } - case XPRoomMenuItemType_PK: - { - MSRoomMenuGameVC *vc = [[MSRoomMenuGameVC alloc] initWithDelegate:self.delegate roomMenuType:MSRoomMenuTypePK]; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.delegate.getCurrentNav presentViewController:vc animated:YES completion:nil]; - break; - } - - default: - break; - } -} - -- (void)showMicControlMenu { - if (self.isDisplayMicStatusControl) { - [self hideMicControlMenu]; - return; - } else { - if (!self.closeMicControlButton.superview) { - [self.stackView insertSubview:self.closeMicControlButton atIndex:0]; - [self.closeMicControlButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.stackView); - }]; - } - self.isDisplayMicStatusControl = YES; - } - self.defaultVoiceVolume = [[RtcManager instance] loadUserSound] > 0 ? [[RtcManager instance] loadUserSound] : 50; - - @kWeakify(self); - [self _micControlButton:self.micButton_open isShow:YES complete:^{ - @kStrongify(self); - @kWeakify(self); - [self _micControlButton:self.micButton_close_all isShow:YES complete:^{ - @kStrongify(self); - [self _micControlButton:self.micButton_close_butMusic isShow:YES complete:^{ - if (self.updateHeight) { - self.updateHeight(KScreenWidth); - } - }]; - }]; - }]; -} - -- (void)hideMicControlMenu { - self.isDisplayMicStatusControl = NO; - - [self.closeMicControlButton removeFromSuperview]; - - @kWeakify(self); - [self _micControlButton:self.micButton_close_butMusic isShow:NO complete:^{ - @kStrongify(self); - @kWeakify(self); - [self _micControlButton:self.micButton_close_all isShow:NO complete:^{ - @kStrongify(self); - [self _micControlButton:self.micButton_open isShow:NO complete:^{ - if (self.updateHeight) { - self.updateHeight(52); - } - }]; - }]; - }]; -} - -- (void)_micControlButton:(UIButton *)button - isShow:(BOOL)isShow - complete:(void(^)(void))complete { - [UIView animateWithDuration:0.05 animations:^{ - button.alpha = isShow ? 1 : 0; - } completion:^(BOOL finished) { - if (complete) { - complete(); - } - }]; -} - -- (void)handleMicControl:(UIButton *)sender { - NSString *message = @""; - switch (sender.tag) { - case 1: { - message = YMLocalizedString(@"RoomMicState_0"); - self.defaultVoiceVolume = [[RtcManager instance] loadUserSound]; - [RtcManager instance].localMuted = NO; - [[RtcManager instance] updateUserSound:(int)self.defaultVoiceVolume]; - for (MicroQueueModel *sequence in [self.delegate getMicroQueue].allValues) { - if ([AccountInfoStorage instance].getUid.integerValue == sequence.userInfo.uid) { - [[RtcManager instance] broadcast:YES]; - } - } - } - break; - case 2: { - message = YMLocalizedString(@"RoomMicState_2"); - [RtcManager instance].localMuted = YES; - } - break; - case 3: { - message = YMLocalizedString(@"RoomMicState_1"); - [RtcManager instance].localMuted = NO; - [[RtcManager instance] updateUserSoundWithUserInMic:0]; - } - break; - - default: - break; - } - - [self micButtonUpdate:sender.tag]; - [self hideMicControlMenu]; - [XNDJTDDLoadingTool showErrorWithMessage:message]; - [[XPSkillCardPlayerManager shareInstance] setMicState:sender.tag]; -} - -- (void)micButtonUpdate:(NSInteger)type { - switch (type) { - case MICState_Open: - // 开麦 - [self.micButton setImage:kImage(@"room_menu_mic_open") forState:UIControlStateNormal]; - break; - case MICState_Close: - // 闭麦 - [self.micButton setImage:kImage(@"room_menu_mic_close") forState:UIControlStateNormal]; - break; - case MICState_Music: - // 人声降为 0 - [self.micButton setImage:kImage(@"room_menu_mic_close_but_music") forState:UIControlStateNormal]; - break; - - default: - break; - } -} - -- (void)recheckMicState { - if ([XPSkillCardPlayerManager shareInstance].micState == MICState_Music) { - [RtcManager instance].localMuted = NO; - [[RtcManager instance] updateUserSoundWithUserInMic:0]; - [self micButtonUpdate:MICState_Music]; - } -} - -#pragma mark - notification -- (void)showGiftView:(NSNotification *)noti { - NSDictionary *dict = noti.object; - NSString *giftId = dict[@"giftId"]; - NSString * roomUid = [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].uid]; - XPSendGiftView * giftView = [[XPSendGiftView alloc] initWithType:SendGiftType_Room uid:roomUid]; - giftView.delegate = self.delegate; - NSArray * giftUses = [self configGiftUsers:[self.delegate getMicroQueue]]; - [giftView configGiftUsers:giftUses]; - giftView.selectGiftId = giftId; - [self.delegate.getCurrentNav presentViewController:giftView animated:YES completion:nil]; -} - -#pragma mark - Private Method -- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event { - // 允许 subButton 响应点击事件 - UIView *hitView = [super hitTest:point withEvent:event]; - - if (hitView == self) { - // 如果点击的是 parentView 的空白区域，返回 nil，允许事件透传到下层 - return nil; - } - - // 否则返回点击的子视图（如 subButton） - return hitView; -} - -- (void)initSubViews { - [self setExclusiveTouch:YES]; - - [self addSubview:self.stackView]; - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self).offset(-kSafeAreaBottomHeight); - make.leading.mas_equalTo(self).offset(15); - make.trailing.mas_equalTo(self).offset(-15); - make.top.mas_equalTo(self); - }]; - - [self.stackView addArrangedSubview:self.inputButton]; -// [self.stackView addArrangedSubview:self.faceButton]; - [self.stackView addArrangedSubview:self.micButton]; - [self.stackView addArrangedSubview:self.voiceButton]; - [self.stackView addArrangedSubview:self.arrangeMicButton]; - [self.stackView addArrangedSubview:self.messageButton]; - [self.stackView addArrangedSubview:self.moreButton]; - [self.stackView addArrangedSubview:self.giftButton]; - - [self.stackView addSubview:self.inputLabel]; - [self.stackView addSubview:self.faceButton]; - - [self.stackView addSubview:self.micButton_open]; - [self.stackView addSubview:self.micButton_close_all]; - [self.stackView addSubview:self.micButton_close_butMusic]; - - - [self.micButton_open mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.micButton); - make.bottom.mas_equalTo(self.micButton.mas_top).offset(-10); - make.size.mas_equalTo(self.micButton); - }]; - - [self.micButton_close_all mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.micButton); - make.bottom.mas_equalTo(self.micButton_open.mas_top).offset(-10); - make.size.mas_equalTo(self.micButton); - }]; - - [self.micButton_close_butMusic mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.micButton); - make.bottom.mas_equalTo(self.micButton_close_all.mas_top).offset(-10); - make.size.mas_equalTo(self.micButton); - }]; -} - -- (void)initSubViewConstraints { - - [self.inputButton mas_makeConstraints:^(MASConstraintMaker *make) { -// make.size.mas_equalTo(CGSizeMake(110, 36)); - make.width.mas_greaterThanOrEqualTo(50); - make.height.mas_equalTo(36); - }]; - - [self.faceButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.inputButton); - make.trailing.mas_equalTo(self.inputButton).offset(-4); - make.width.height.mas_equalTo(36); - }]; - - [self.inputLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.inputButton); - make.leading.mas_equalTo(self.inputButton).offset(8); - make.trailing.mas_equalTo(self.faceButton.mas_leading).offset(-4); - }]; - - [self.micButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(36); - }]; - [self.voiceButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(36); - }]; - [self.messageButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(36); - }]; - [self.moreButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(36); - }]; - [self.arrangeMicButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(36); - }]; - - [self.giftButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(46, 46)); - }]; -} - -- (NSArray *)configGiftUsers:(NSMutableDictionary *)queue { - NSMutableArray * array = [NSMutableArray array]; - for (MicroQueueModel * microModel in queue.allValues) { - if (microModel.userInfo && microModel.userInfo.uid >0) { - UserInfoModel * userInfo = microModel.userInfo; - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = userInfo.avatar; - userModel.vipMic = userInfo.vipMic; - userModel.position = [NSString stringWithFormat:@"%d", microModel.microState.position]; - userModel.uid = userInfo.uid; - if (self.delegate.getRoomInfo.type == RoomType_Anchor && microModel.microState.position == -1) {///个播房一直为离开模式，不需要添加房主位 - continue; - } - [array addObject:userModel]; - } - } - - if (self.delegate.getRoomInfo.leaveMode) { - RoomInfoModel * roomInfo= self.delegate.getRoomInfo; - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = roomInfo.avatar; - userModel.position = @"-1"; - userModel.uid = roomInfo.uid; - [array addObject:userModel]; - } else if (self.delegate.getRoomInfo.type == RoomType_Anchor) { - RoomInfoModel * roomInfo= self.delegate.getRoomInfo; - BOOL hadContainerOwner = NO; - for (UserInfoModel *userModel in array) { - if (userModel.uid == roomInfo.uid) { - hadContainerOwner = YES; - break; - } - } - if (!hadContainerOwner) { - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = roomInfo.avatar; - userModel.position = @"-1"; - userModel.uid = roomInfo.uid; - [array addObject:userModel]; - } - } - return array; -} - -- (MicroQueueModel *)findMySelfMicro:(NSMutableDictionary *)queue { - NSString * uid = [AccountInfoStorage instance].getUid; - for (MicroQueueModel * microModel in queue.allValues) { - if (microModel.userInfo && microModel.userInfo.uid == uid.integerValue) { - return microModel; - } - } - return nil; -} - -- (void)updateMoreRedDotState { - RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - if (roomInfo.uid == [[AccountInfoStorage instance].getUid integerValue] && // 房主 - roomInfo.isPermitRoom != PermitRoomType_License && // 普通 - (roomInfo.type != RoomType_Anchor && roomInfo.type != RoomType_MiniGame)) { // 非個播 / 非小遊戲 - if ([[NSUserDefaults standardUserDefaults] boolForKey:@"XP didTapForNewFunction"]) { - [self.moreButton setImage:[UIImage imageNamed:@"room_menu_more"] forState:UIControlStateNormal]; - } else { - [self.moreButton setImage:[UIImage imageNamed:@"room_menu_more_red"] forState:UIControlStateNormal]; - } - } else { - [self.moreButton setImage:[UIImage imageNamed:@"room_menu_more"] forState:UIControlStateNormal]; - } -} - -#pragma mark - RoomGuestDelegate -- (void)onMicroQueueUpdate:(NSMutableDictionary *)queue { - MicroQueueModel *model = [self findMySelfMicro:queue]; - if (model) { - self.isOnMic = YES; - self.micButton.hidden = NO; - if ([RtcManager instance].isLocalMuted) { - [self micButtonUpdate:2]; - } else { - [self micButtonUpdate:1]; - } - - if (model.microState.micState == MicroMicStateType_Open) { - self.micButton.enabled = YES; - [self recheckMicState]; - } else { - [[RtcManager instance] setLocalMuted:YES]; - [self micButtonUpdate:MICState_None]; - self.micButton.enabled = NO; - } - - self.micButton.enabled = model.microState.micState == MicroMicStateType_Open; - - self.faceButton.hidden = NO; - } else { - self.isOnMic = NO; - self.micButton.hidden = YES; - self.faceButton.hidden = YES; - [self hideMicControlMenu]; - } - - [self updateMoreRedDotState]; -} - -- (void)onRoomEntered { - NSInteger unreadCount = [[NIMSDK sharedSDK].conversationManager allUnreadCount]; - self.messageButton.selected = unreadCount > 0; - - [[RtcManager instance] setLocalMuted:YES]; - - [self onRoomUpdate]; -} - -- (void)onRoomMiniEntered { - NSInteger unreadCount = [[NIMSDK sharedSDK].conversationManager allUnreadCount]; - self.messageButton.selected = unreadCount > 0; - - [self onRoomUpdate]; -} - -- (void)superAdminLayout { - [self.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)]; - [self.stackView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)]; - [self addSubview:self.stackView]; - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self).offset(-kSafeAreaBottomHeight); - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self); - }]; - self.stackView.distribution = UIStackViewDistributionFillEqually; - self.stackView.alignment = UIStackViewAlignmentCenter; - [self.stackView addArrangedSubview:self.voiceButton]; - [self.stackView addArrangedSubview:self.messageButton]; - [self.stackView addArrangedSubview:self.moreButton]; -} - -- (void)onRoomUpdate { - RoomInfoModel *roomInfo = self.delegate.getRoomInfo; - UserInfoModel *userInfo = self.delegate.getUserInfo; - if (userInfo.platformRole == 1) { - [self superAdminLayout]; - return; - } - - self.arrangeMicButton.hidden = roomInfo.roomModeType != RoomModeType_Open_Micro_Mode; - if (roomInfo.roomModeType == RoomModeType_Open_Blind || roomInfo.roomModeType == RoomModeType_Open_PK_Mode || roomInfo.roomModeType == RoomModeType_Open_Micro_Mode) { - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - if([AccountInfoStorage instance].getUid != nil){ - request.userIds = @[[AccountInfoStorage instance].getUid]; - } - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - @kStrongify(self); - if (error == nil) { - NIMChatroomMember * member = members.firstObject; - if (member.type == NIMChatroomMemberTypeCreator || member.type == NIMChatroomMemberTypeManager) { - self.arrangeMicButton.hidden = NO; - return; - } - } - self.arrangeMicButton.hidden = YES; - }]; - } - - [self updateMoreRedDotState]; -} - -- (void)handleNIMCustomMessage:(NIMMessage *)message { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - switch (attachment.first) { - case CustomMessageType_Arrange_Mic: { - if (attachment.first == CustomMessageType_Room_PK) { - if (attachment.second == Custom_Message_Sub_Arrange_Mic_Non_Empty || attachment.second == Custom_Message_Sub_Arrange_Mic_Empty || attachment.second == Custom_Message_Sub_Room_PK_Empty || attachment.second == Custom_Message_Sub_Room_PK_Non_Empty) { - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - @kStrongify(self); - NIMChatroomMember * member; - if (error == nil) { - member = members.firstObject; - } - if (member.type == NIMChatroomMemberTypeCreator || member.type == NIMChatroomMemberTypeManager) { - self.arrangeMicButton.selected = (attachment.second == Custom_Message_Sub_Arrange_Mic_Non_Empty || attachment.second == Custom_Message_Sub_Room_PK_Non_Empty); - }; - }]; - } - } - } - break; - default: - break; - } - } - - [self updateMoreRedDotState]; -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - switch (content.eventType) { - case NIMChatroomEventTypeAddManager: - { - if (self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind || self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - for (NIMChatroomNotificationMember * member in content.targets) { - if (member.userId.intValue == [AccountInfoStorage instance].getUid.integerValue) { - self.arrangeMicButton.hidden = NO; - break; - } - } - } - } - break; - case NIMChatroomEventTypeRemoveManager: - { - if (self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind || self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - for (NIMChatroomNotificationMember * member in content.targets) { - if (member.userId.intValue == [AccountInfoStorage instance].getUid.integerValue) { - self.arrangeMicButton.hidden = YES; - break; - } - } - } - } - break; - default: - break; - } -} - -- (void)addNIMRecentSession:(NIMRecentSession *)session { - if (!self.miniMessageView.superview) { - [self.superview insertSubview:self.miniMessageView aboveSubview:self]; - [self.miniMessageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.messageButton); - make.bottom.mas_equalTo(self.messageButton.mas_top).offset(-2); - make.size.mas_equalTo(CGSizeMake(87, 55)); - }]; - } - [self.miniMessageView addRecentSession:session]; - NSInteger unreadCount = [[NIMSDK sharedSDK].conversationManager allUnreadCount]; - self.messageButton.selected = unreadCount > 0; -} - -- (void)removeNIMRecentSession:(NIMRecentSession *)session { - NSInteger unreadCount = [[NIMSDK sharedSDK].conversationManager allUnreadCount]; - self.messageButton.selected = unreadCount > 0; -} - -#pragma mark - XPRoomMessageBubbleViewDelegate -- (void)xPRoomMessageBubbleView:(XPRoomMessageBubbleView *)view didSelectSession:(NIMRecentSession *)session { - UIViewController * controller = (UIViewController *)self.delegate; - XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight) controller:controller]; - halfMessageView.chatUserId = session.session.sessionId; - [controller.view addSubview:halfMessageView]; - [UIView animateWithDuration:.35 animations:^{ - CGRect rect = halfMessageView.frame; - rect.origin.y = 0; - halfMessageView.frame = rect; - }]; -} - -#pragma mark - Getters And Setters -- (UIButton *)inputButton { - if (!_inputButton) { - _inputButton = [UIButton buttonWithType:UIButtonTypeCustom]; -// [_inputButton setTitle:YMLocalizedString(@"XPRoomMenuContainerView2") forState:UIControlStateNormal]; -// [_inputButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; -// _inputButton.titleLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium]; -// _inputButton.titleLabel.numberOfLines = 2; - _inputButton.layer.masksToBounds = YES; - _inputButton.layer.cornerRadius = 18; - if (isMSRTL()) { - _inputButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight; - } else { - _inputButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - } - // 设置标题的边距 - _inputButton.titleEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 0); - _inputButton.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4]; - _inputButton.tag = XPRoomMenuItemType_Input; - [_inputButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _inputButton; -} - -- (UILabel *)inputLabel { - if (!_inputLabel) { - _inputLabel = [UILabel labelInitWithText:YMLocalizedString(@"XPRoomMenuContainerView2") - font:kFontMedium(13) - textColor:[UIColor whiteColor]]; - _inputLabel.adjustsFontSizeToFitWidth = YES; - _inputLabel.minimumScaleFactor = 0.7; - _inputLabel.numberOfLines = 2; - } - return _inputLabel; -} - -- (UIButton *)micButton { - if (!_micButton) { - _micButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_micButton setImage:[UIImage imageNamed:@"room_menu_mic_open"] forState:UIControlStateNormal]; - _micButton.tag = XPRoomMenuItemType_Mic; - [_micButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _micButton.hidden = YES; - } - return _micButton; -} - -- (UIButton *)micButton_open { - if (!_micButton_open) { - _micButton_open = [UIButton buttonWithType:UIButtonTypeCustom]; - [_micButton_open setImage:[UIImage imageNamed:@"room_menu_mic_open"] forState:UIControlStateNormal]; - _micButton_open.tag = 1; - [_micButton_open addTarget:self action:@selector(handleMicControl:) forControlEvents:UIControlEventTouchUpInside]; - _micButton_open.alpha = 0; - } - return _micButton_open; -} - -- (UIButton *)micButton_close_all { - if (!_micButton_close_all) { - _micButton_close_all = [UIButton buttonWithType:UIButtonTypeCustom]; - [_micButton_close_all setImage:[UIImage imageNamed:@"room_menu_mic_close"] forState:UIControlStateNormal]; - _micButton_close_all.tag = 2; - [_micButton_close_all addTarget:self action:@selector(handleMicControl:) forControlEvents:UIControlEventTouchUpInside]; - _micButton_close_all.alpha = 0; - } - return _micButton_close_all; -} - -- (UIButton *)micButton_close_butMusic { - if (!_micButton_close_butMusic) { - _micButton_close_butMusic = [UIButton buttonWithType:UIButtonTypeCustom]; - [_micButton_close_butMusic setImage:[UIImage imageNamed:@"room_menu_mic_close_but_music"] forState:UIControlStateNormal]; - _micButton_close_butMusic.tag = 3; - [_micButton_close_butMusic addTarget:self action:@selector(handleMicControl:) forControlEvents:UIControlEventTouchUpInside]; - _micButton_close_butMusic.alpha = 0; - } - return _micButton_close_butMusic; -} - -- (UIButton *)voiceButton { - if (!_voiceButton) { - _voiceButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_voiceButton setImage:[UIImage imageNamed:@"room_menu_voice_open"] forState:UIControlStateNormal]; - [_voiceButton setImage:[UIImage imageNamed:@"room_menu_voice_close"] forState:UIControlStateSelected]; - _voiceButton.tag = XPRoomMenuItemType_Voice; - [_voiceButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _voiceButton; -} - -- (UIButton *)faceButton { - if (!_faceButton) { - _faceButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_faceButton setImage:[UIImage imageNamed:@"room_menu_face"] forState:UIControlStateNormal]; - [_faceButton setImage:[UIImage imageNamed:@"room_menu_face"] forState:UIControlStateSelected]; - _faceButton.tag = XPRoomMenuItemType_Face; - [_faceButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _faceButton.hidden = YES; - } - return _faceButton; -} - -- (UIButton *)messageButton { - if (!_messageButton) { - _messageButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_messageButton setImage:[UIImage imageNamed:@"room_menu_message"] forState:UIControlStateNormal]; - [_messageButton setImage:[UIImage imageNamed:@"room_menu_new_message"] forState:UIControlStateSelected]; - _messageButton.tag = XPRoomMenuItemType_Message; - [_messageButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _messageButton; -} - -- (UIButton *)moreButton { - if (!_moreButton) { - _moreButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _moreButton.imageView.contentMode = UIViewContentModeScaleAspectFit; - _moreButton.tag = XPRoomMenuItemType_More; - [_moreButton setImage:[UIImage imageNamed:@"room_menu_more"] forState:UIControlStateNormal]; - [_moreButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _moreButton; -} - -- (UIButton *)giftButton { - if (!_giftButton) { - _giftButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_giftButton setImage:kImage(@"big_gift_button") forState:UIControlStateNormal]; - _giftButton.tag = XPRoomMenuItemType_Gift; - [_giftButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _giftButton; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.spacing = 9; - _stackView.clipsToBounds = NO; - _stackView.alignment = UIStackViewAlignmentBottom; - _stackView.userInteractionEnabled = YES; - } - return _stackView; -} - -- (UIButton *)arrangeMicButton { - if (!_arrangeMicButton) { - _arrangeMicButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_arrangeMicButton setImage:kImage(@"room_menu_arrange_mic") forState:UIControlStateNormal]; - [_arrangeMicButton setImage:kImage(@"room_menu_arrange_mic_new") forState:UIControlStateSelected]; - _arrangeMicButton.tag = XPRoomMenuItemType_ArrangeMic; - [_arrangeMicButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _arrangeMicButton.hidden = YES; - } - return _arrangeMicButton; -} - -- (XPRoomMessageBubbleView *)miniMessageView { - if (!_miniMessageView) { - _miniMessageView = [[XPRoomMessageBubbleView alloc] init]; - _miniMessageView.delegate = self; - } - return _miniMessageView; -} - - -- (UIButton *)closeMicControlButton { - if (!_closeMicControlButton) { - _closeMicControlButton = [UIButton buttonWithType:UIButtonTypeCustom]; -// _closeMicControlButton.backgroundColor = [UIColor colorWithWhite:1 alpha:0.5]; - [_closeMicControlButton addTarget:self action:@selector(hideMicControlMenu) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeMicControlButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.h b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.h deleted file mode 100644 index c22f0af..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMRoomSendTextView.h -// YUMI -// -// Created by YUMI on 2021/10/29. -// - -#import -#import "RoomHostDelegate.h" -NS_ASSUME_NONNULL_BEGIN - - - - - -@interface XPRoomSendTextView : UIView - -- (instancetype)initWithDelegate:(id)delegate; -///输入框 -@property (nonatomic, strong, readonly) UITextField *editTextFiled; --(void)showInputView:(NSString *)text; -///发小消息的弹框 -+ (instancetype)showTextView:(UIView *)view delegate:(id)delegate atUid:(nullable NSString *)uid atNick:(nullable NSString *)nick; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m deleted file mode 100644 index c674889..0000000 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m +++ /dev/null @@ -1,461 +0,0 @@ -// -// XPRoomSendTextView.m -// xplan-ios -// -// Created by 冯硕 on 2021/10/29. -// - -#import "XPRoomSendTextView.h" -///Third -#import -#import -#import "NSObject+MJExtension.h" -#import -///Tool -#import "ThemeColor+Room.h" -#import "UIImage+Utils.h" -#import "AccountInfoStorage.h" -///Model -#import "XPMessageRemoteExtModel.h" -#import "UserInfoModel.h" -#import "RoomInfoModel.h" -#import "ClientConfig.h" - -#import "Api+Message.h" -#import "UploadFile.h" -#import "TZImagePickerController.h" -//公屏限制最大字数 -#define MAX_STARWORDS_LENGTH 300 - -@interface XPRoomSendTextView () - -///输入框 -@property (nonatomic, strong) MSBaseTextField *editTextFiled; -@property (nonatomic, strong) UIView *bgEditTextFiled; -///发送按钮 -@property (nonatomic, strong) UIButton *sendButton; -///发图片 -@property(nonatomic, strong) UIButton *imageButton; -///文本输入的内容 -@property (nonatomic,copy) NSString *inputMessage; -///代理 -@property (nonatomic,weak) id delegate; - -///被@的人的数组 such as:@["'@小明','"@小红'] -@property (nonatomic, strong) NSMutableArray *atNames; -///被@的人的uid 需要跟上面的名字对应位置 -@property (nonatomic, strong) NSMutableArray *atUids; -@end - -@implementation XPRoomSendTextView - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (instancetype)initWithDelegate:(id)delegate { - self = [super initWithFrame:CGRectMake(0, KScreenHeight - 60, KScreenWidth, 60)]; - if (self) { - self.delegate = delegate; - [[NIMSDK sharedSDK].chatManager addDelegate:self]; - [self addNotification]; - [self initSubViews]; - [self initSubViewConstraints]; - [IQKeyboardManager sharedManager].enable = NO; - } - return self; -} - -- (void)sendMessage:(NIMMessage *)message didCompleteWithError:(NSError *)error { - -} - -- (void)didTapImageButton { - UserVipInfoVo *vipVO = [[self.delegate getUserInfo] userVipInfoVO]; - if (!vipVO || vipVO.roomPicScreen == NO) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"1.0.37_text_33")]; - return; - } - - TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self]; - imagePickerVc.modalPresentationStyle = UIModalPresentationOverFullScreen; - imagePickerVc.allowPickingVideo = NO; - imagePickerVc.allowTakeVideo = NO; - imagePickerVc.maxImagesCount = 1; - imagePickerVc.naviBgColor = [DJDKMIMOMColor appCellBackgroundColor]; - imagePickerVc.naviTitleColor = [DJDKMIMOMColor mainTextColor]; - imagePickerVc.barItemTextColor = [DJDKMIMOMColor mainTextColor]; - [self.delegate.getCurrentNav presentViewController:imagePickerVc animated:YES completion:nil]; -} - -#pragma mark - TZImagePickerControllerDelegate -- (void)imagePickerController:(TZImagePickerController *)picker - didFinishPickingPhotos:(NSArray *)photos - sourceAssets:(NSArray *)assets - isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto - infos:(NSArray *)infos { - - [self.editTextFiled resignFirstResponder]; - - [XNDJTDDLoadingTool showOnlyView:kWindow enabled:YES]; - - [self uploadAlbumPicList:photos finish:^(NSArray *list) { - [XNDJTDDLoadingTool hideHUD]; - NSDictionary *dic = [list xpSafeObjectAtIndex:0]; - NSString *picUrl = [dic objectForKey:@"resUrl"]; - if ([NSString isEmpty:picUrl]) { - return; - } - [Api sendRoomImageMessage:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } picUrl:picUrl roomUid:[self.delegate.getRoomInfo uid]]; - }]; -} - -///上传图片 -- (void)uploadAlbumPicList:(NSArray *)array - finish:(void(^)(NSArray *list))finish { - dispatch_semaphore_t semaphore = dispatch_semaphore_create(1); - dispatch_queue_t queue = dispatch_get_global_queue(0, 0); - NSMutableArray * dataArray = [NSMutableArray array]; - __block NSInteger imageCount = 0; - dispatch_async(queue, ^{ - for (UIImage * image in array) { - dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); - NSData *data = UIImageJPEGRepresentation(image, 0.5); - NSString *format = [UIImage getImageTypeWithImageData:data]; - NSString *name = [NSString stringWithFormat:@"image/%@.%@",[NSString createUUID],format]; - [[UploadFile share]QCloudUploadImage:data named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) { - dispatch_semaphore_signal(semaphore); - imageCount ++; - NSMutableDictionary *dict = [NSMutableDictionary dictionary]; - if (image.size.width > 0){ - [dict safeSetObject:@(image.size.width) forKey:@"width"]; - } - if (image.size.height){ - [dict safeSetObject:@(image.size.height) forKey:@"height"]; - } - if (key.length > 0) { - [dict safeSetObject:key forKey:@"resUrl"]; - } - [dict safeSetObject:format forKey:@"format"]; - [dataArray addObject:dict]; - if (imageCount == array.count) { - dispatch_async(dispatch_get_main_queue(), ^{ - finish(dataArray); - }); - } - } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) { - imageCount ++; - dispatch_semaphore_signal(semaphore); - [XNDJTDDLoadingTool showErrorWithMessage:message]; - }]; - } - }); -} - -#pragma mark - Response - -- (void)sendButtonDidClick:(UIButton *)sender { - UserInfoModel * userInfo = [self.delegate getUserInfo]; - XPMessageRemoteExtModel *extModel = [[XPMessageRemoteExtModel alloc] init]; - extModel.defUser = userInfo.defUser; - extModel.erbanNo = userInfo.erbanNo; - extModel.carName = userInfo.carName; - extModel.inRoomNameplatePic = userInfo.nameplatePic; - extModel.inRoomNameplateWord = userInfo.nameplateWord; - extModel.isCustomWord = userInfo.isCustomWord; - extModel.charmUrl = userInfo.userLevelVo.charmUrl; - extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq; - extModel.experUrl = userInfo.userLevelVo.experUrl; - extModel.newUser = userInfo.newUser; - extModel.vipIcon = userInfo.userVipInfoVO.nameplateUrl; - extModel.androidBubbleUrl = userInfo.androidBubbleUrl; - extModel.iosBubbleUrl = userInfo.iosBubbleUrl; - extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; - extModel.platformRole = userInfo.platformRole; - extModel.nick = userInfo.nick; - - if([self.delegate getPublicScreenType]==1){ - extModel.avatar = userInfo.avatar; - extModel.nick = userInfo.nick; - NSString * headwearUrl= userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - extModel.headWearUrl = headwearUrl; - } - - NIMMessage * message = [[NIMMessage alloc] init]; - message.text = self.inputMessage; - NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[AccountInfoStorage instance].getUid]; - if([self.delegate getPublicScreenType] == 0){ - //查找消息中是否有@人 - NSMutableArray *nickArray = [NSMutableArray array]; - NSMutableArray *uidArray = [NSMutableArray array]; - for (int i = 0; i MAX_STARWORDS_LENGTH){ - NSRange rangeIndex = [toBeString rangeOfComposedCharacterSequenceAtIndex:MAX_STARWORDS_LENGTH]; - if (rangeIndex.length == 1){ - - textField.text = [toBeString substringToIndex:MAX_STARWORDS_LENGTH]; - }else{ - NSRange rangeRange = [toBeString rangeOfComposedCharacterSequencesForRange:NSMakeRange(0, MAX_STARWORDS_LENGTH)]; - textField.text = [toBeString substringWithRange:rangeRange]; - } - } - } - }else{ // 中文输入法以外的直接对其统计限制即可，不考虑其他语种情况 - if (toBeString.length > MAX_STARWORDS_LENGTH){ - NSRange rangeIndex = [toBeString rangeOfComposedCharacterSequenceAtIndex:MAX_STARWORDS_LENGTH]; - if (rangeIndex.length == 1){ - - textField.text = [toBeString substringToIndex:MAX_STARWORDS_LENGTH]; - }else{ - - NSRange rangeRange = [toBeString rangeOfComposedCharacterSequencesForRange:NSMakeRange(0, MAX_STARWORDS_LENGTH)]; - textField.text = [toBeString substringWithRange:rangeRange]; - } - } - } - - self.inputMessage = textField.text; - - if (self.inputMessage.length > 0) { - self.sendButton.enabled = YES; - } else { - self.sendButton.enabled = NO; - } -} - -#pragma mark - Public Method -+ (instancetype)showTextView:(UIView *)view delegate:(id)delegate atUid:(NSString *)uid atNick:(NSString *)nick { - __block XPRoomSendTextView * textView; - [view.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomSendTextView class]]) { - textView = obj; - *stop = YES; - } - }]; - if (textView == nil) { - textView = [[XPRoomSendTextView alloc] initWithDelegate:delegate]; - [view addSubview:textView]; - }else{ - UIButton *sendButton = [textView viewWithTag:101]; - [sendButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(58); - make.height.mas_equalTo(29); - make.trailing.mas_equalTo(-15); - make.centerY.equalTo(textView); - }]; - } - textView.hidden = NO; - - [textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(view); - make.height.mas_equalTo(60); - }]; - [textView.editTextFiled becomeFirstResponder]; - if (nick) { - [textView.atUids addObject:uid]; - [textView.atNames addObject:[NSString stringWithFormat:@"@%@", nick]]; - textView.editTextFiled.text = [NSString stringWithFormat:@"%@@%@\u2004", textView.editTextFiled.text, nick]; - textView.inputMessage = textView.editTextFiled.text; - textView.sendButton.enabled = YES; - } - return textView; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColorFromRGB(0x260159); - [self addSubview:self.bgEditTextFiled]; - [self.bgEditTextFiled addSubview:self.editTextFiled]; - [self addSubview:self.sendButton]; - [self addSubview:self.imageButton]; -} - -- (void)initSubViewConstraints { - - [self.bgEditTextFiled mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(6); - make.height.mas_equalTo(36); - make.top.mas_equalTo(12); - make.trailing.equalTo(self.sendButton.mas_leading).mas_offset(-8); - - }]; - - [self.imageButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.bgEditTextFiled); - make.size.mas_equalTo(CGSizeMake(26, 26)); - make.trailing.mas_equalTo(self.bgEditTextFiled).offset(-10); - }]; - - [self.editTextFiled mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(20); - make.trailing.mas_equalTo(self.imageButton.mas_leading).offset(-8); - make.top.bottom.mas_equalTo(0); - }]; - - [self.sendButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(58); - make.height.mas_equalTo(29); - make.trailing.mas_equalTo(-15); - make.centerY.equalTo(self); - }]; -} - -- (void)addNotification { - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textFieldEditChanged:) name:UITextFieldTextDidChangeNotification object:self.editTextFiled]; -} - --(void)showInputView:(NSString *)text{ - self.editTextFiled.text = text; - self.inputMessage = text; - if(text.length > 0){ - self.sendButton.enabled = YES; - } -} - -#pragma mark - Getters And Setters -- (MSBaseTextField *)editTextFiled{ - if (!_editTextFiled) { - _editTextFiled = [[MSBaseTextField alloc] init]; - NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPRoomSendTextView0") attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [UIColor colorWithWhite:1 alpha:0.5]}]; - _editTextFiled.attributedPlaceholder = attribute; - _editTextFiled.borderStyle = UITextBorderStyleNone; - _editTextFiled.textColor = [UIColor whiteColor]; - _editTextFiled.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium]; - [_editTextFiled setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; - - } - return _editTextFiled; -} -- (UIButton *)sendButton{ - if (!_sendButton) { - _sendButton = [[UIButton alloc] init]; - [_sendButton setTitle:YMLocalizedString(@"XPRoomSendTextView1") forState:UIControlStateNormal]; - _sendButton.titleLabel.textColor = [UIColor whiteColor]; - _sendButton.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - [_sendButton setBackgroundImage:[UIImage imageWithColor:[DJDKMIMOMColor disableButtonColor] ]forState:UIControlStateDisabled]; - [_sendButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x7E5AFF), UIColorFromRGB(0x52CAD3)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _sendButton.enabled = NO; - _sendButton.layer.cornerRadius = 7.5; - _sendButton.layer.masksToBounds = YES; - [_sendButton addTarget:self action:@selector(sendButtonDidClick:) forControlEvents:UIControlEventTouchUpInside]; - _sendButton.tag = 101; - } - return _sendButton; -} - -- (NSMutableArray *)atNames { - if (!_atNames) { - _atNames = [NSMutableArray array]; - } - return _atNames; -} - -- (NSMutableArray *)atUids { - if (!_atUids) { - _atUids = [NSMutableArray array]; - } - return _atUids; -} -- (UIButton *)imageButton{ - if(!_imageButton){ - _imageButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_imageButton setBackgroundImage:kImage(@"send_image_icon") forState:UIControlStateNormal]; - [_imageButton addTarget:self action:@selector(didTapImageButton) forControlEvents:UIControlEventTouchUpInside]; - } - return _imageButton; -} -- (UIView *)bgEditTextFiled{ - if(!_bgEditTextFiled){ - _bgEditTextFiled = [UIView new]; - _bgEditTextFiled.backgroundColor = UIColorFromRGB(0x361661); - _bgEditTextFiled.layer.cornerRadius = 18; - _bgEditTextFiled.layer.masksToBounds = YES; - } - return _bgEditTextFiled; -} -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/PIGeneralPublicScreenModel.h b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/PIGeneralPublicScreenModel.h deleted file mode 100644 index 363a149..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/PIGeneralPublicScreenModel.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// PIGeneralPublicScreenModel.h -// YuMi -// -// Created by duoban on 2024/2/22. -// - -#import -@class PIGeneralPublicScreenItemModel; -NS_ASSUME_NONNULL_BEGIN - -@interface PIGeneralPublicScreenModel : NSObject -@property(nonatomic,copy) NSDictionary *template; -@property(nonatomic,copy) NSString *textColor; -@property(nonatomic,copy) NSArray *contents; -@end -@interface PIGeneralPublicScreenItemModel : NSObject -@property(nonatomic,copy) NSString *type; -@property(nonatomic,copy) NSString *key; -@property(nonatomic,copy) NSDictionary *text; -@property(nonatomic,copy) NSString *textColor; -@property(nonatomic,assign) int skipType; -@property(nonatomic,assign) NSString *skipContent; -@property(nonatomic,copy) NSString *image; -@property(nonatomic,assign) CGFloat width; -@property(nonatomic,assign) CGFloat height; -@end -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/PIGeneralPublicScreenModel.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/PIGeneralPublicScreenModel.m deleted file mode 100644 index 47e8037..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/PIGeneralPublicScreenModel.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// PIGeneralPublicScreenModel.m -// YuMi -// -// Created by duoban on 2024/2/22. -// - -#import "PIGeneralPublicScreenModel.h" - -@implementation PIGeneralPublicScreenModel -+ (NSDictionary *)objectClassInArray { - return @{@"contents":PIGeneralPublicScreenItemModel.class}; -} -@end -@implementation PIGeneralPublicScreenItemModel - -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageDataSourceManager.h b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageDataSourceManager.h deleted file mode 100644 index 95a34fd..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageDataSourceManager.h +++ /dev/null @@ -1,94 +0,0 @@ -// -// XPMessageDataSourceManager.h -// YUMI -// -// Created by YUMI on 2024/12/19. -// - -#import -#import "XPMessageItem.h" - -NS_ASSUME_NONNULL_BEGIN - -/** - * 消息数据源管理器 - * 统一管理所有消息数据，提供线程安全的数据操作 - * 支持 DiffableDataSource 的单一数据源架构 - */ -@interface XPMessageDataSourceManager : NSObject - -/// 所有消息（只读） -@property (nonatomic, strong, readonly) NSArray *allMessages; - -/// 聊天消息（只读） -@property (nonatomic, strong, readonly) NSArray *chatMessages; - -/// 礼物消息（只读） -@property (nonatomic, strong, readonly) NSArray *giftMessages; - -/// 最大消息数量，超过此数量会自动清理旧消息 -@property (nonatomic, assign) NSInteger maxMessages; - -/** - * 初始化方法 - * @param maxMessages 最大消息数量，默认1000 - */ -- (instancetype)initWithMaxMessages:(NSInteger)maxMessages; - -/** - * 添加消息 - * @param message 要添加的消息项 - */ -- (void)addMessage:(XPMessageItem *)message; - -/** - * 同步添加单条消息（调用返回即已写入），适合随后立刻刷新快照的场景 - */ -- (void)addMessageSync:(XPMessageItem *)message; - -/** - * 批量添加消息 - * @param messages 要添加的消息数组 - */ -- (void)addMessages:(NSArray *)messages; - -/** - * 移除消息 - * @param message 要移除的消息项 - */ -- (void)removeMessage:(XPMessageItem *)message; - -/** - * 清空所有消息 - */ -- (void)clearAllMessages; - -/** - * 根据显示类型获取消息 - * @param displayType 显示类型：1=所有, 2=聊天, 3=礼物 - * @return 对应类型的消息数组 - */ -- (NSArray *)messagesForDisplayType:(NSInteger)displayType; - -/** - * 手动清理旧消息 - * 当消息数量超过 maxMessages 时自动调用 - */ -- (void)cleanupOldMessages; - -/** - * 获取当前消息总数 - * @return 消息总数 - */ -- (NSInteger)totalMessageCount; - -/** - * 获取指定类型的消息数量 - * @param displayType 显示类型 - * @return 消息数量 - */ -- (NSInteger)messageCountForDisplayType:(NSInteger)displayType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageDataSourceManager.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageDataSourceManager.m deleted file mode 100644 index 3fe2dac..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageDataSourceManager.m +++ /dev/null @@ -1,254 +0,0 @@ -// -// XPMessageDataSourceManager.m -// YUMI -// -// Created by YUMI on 2024/12/19. -// - -#import "XPMessageDataSourceManager.h" - -@interface XPMessageDataSourceManager () - -/// 所有消息（内部可变） -@property (nonatomic, strong) NSMutableArray *allMessages; - -/// 聊天消息（内部可变） -@property (nonatomic, strong) NSMutableArray *chatMessages; - -/// 礼物消息（内部可变） -@property (nonatomic, strong) NSMutableArray *giftMessages; - -/// 数据操作串行队列 -@property (nonatomic, strong) dispatch_queue_t dataQueue; - -@end - -@implementation XPMessageDataSourceManager - -#pragma mark - Initialization - -- (instancetype)init { - return [self initWithMaxMessages:1000]; -} - -- (instancetype)initWithMaxMessages:(NSInteger)maxMessages { - self = [super init]; - if (self) { - _allMessages = [NSMutableArray array]; - _chatMessages = [NSMutableArray array]; - _giftMessages = [NSMutableArray array]; - _dataQueue = dispatch_queue_create("com.yumi.message.data", DISPATCH_QUEUE_SERIAL); - _maxMessages = maxMessages; - } - return self; -} - -#pragma mark - Public Methods - -- (void)addMessage:(XPMessageItem *)message { - if (!message) return; - - dispatch_async(self.dataQueue, ^{ - NSMutableArray *allMessages = (NSMutableArray *)_allMessages; - NSMutableArray *chatMessages = (NSMutableArray *)_chatMessages; - NSMutableArray *giftMessages = (NSMutableArray *)_giftMessages; - - [allMessages addObject:message]; - - // 根据消息类型分发到对应的子数据源 - if ([message isChatMessage]) { - [chatMessages addObject:message]; - } - if ([message isGiftMessage]) { - [giftMessages addObject:message]; - } - - // 检查是否需要清理 - if (allMessages.count > self.maxMessages) { - [self cleanupOldMessages]; - } - }); -} - -// 同步写入版本，确保调用返回时数据已落入数组（适合随后立刻刷新快照的场景） -- (void)addMessageSync:(XPMessageItem *)message { - if (!message) return; - - dispatch_sync(self.dataQueue, ^{ - NSMutableArray *allMessages = (NSMutableArray *)_allMessages; - NSMutableArray *chatMessages = (NSMutableArray *)_chatMessages; - NSMutableArray *giftMessages = (NSMutableArray *)_giftMessages; - - [allMessages addObject:message]; - if ([message isChatMessage]) { - [chatMessages addObject:message]; - } - if ([message isGiftMessage]) { - [giftMessages addObject:message]; - } - if (allMessages.count > self.maxMessages) { - [self cleanupOldMessages]; - } - }); -} - -- (void)addMessages:(NSArray *)messages { - if (!messages || messages.count == 0) return; - - dispatch_async(self.dataQueue, ^{ - NSMutableArray *allMessages = (NSMutableArray *)_allMessages; - NSMutableArray *chatMessages = (NSMutableArray *)_chatMessages; - NSMutableArray *giftMessages = (NSMutableArray *)_giftMessages; - - for (XPMessageItem *message in messages) { - [allMessages addObject:message]; - - // 根据消息类型分发到对应的子数据源 - if ([message isChatMessage]) { - [chatMessages addObject:message]; - } - if ([message isGiftMessage]) { - [giftMessages addObject:message]; - } - } - - // 检查是否需要清理 - if (allMessages.count > self.maxMessages) { - [self cleanupOldMessages]; - } - }); -} - -- (void)removeMessage:(XPMessageItem *)message { - if (!message) return; - - dispatch_async(self.dataQueue, ^{ - NSMutableArray *allMessages = (NSMutableArray *)_allMessages; - NSMutableArray *chatMessages = (NSMutableArray *)_chatMessages; - NSMutableArray *giftMessages = (NSMutableArray *)_giftMessages; - - [allMessages removeObject:message]; - [chatMessages removeObject:message]; - [giftMessages removeObject:message]; - }); -} - -- (void)clearAllMessages { - dispatch_async(self.dataQueue, ^{ - NSMutableArray *allMessages = (NSMutableArray *)_allMessages; - NSMutableArray *chatMessages = (NSMutableArray *)_chatMessages; - NSMutableArray *giftMessages = (NSMutableArray *)_giftMessages; - - [allMessages removeAllObjects]; - [chatMessages removeAllObjects]; - [giftMessages removeAllObjects]; - }); -} - -- (NSArray *)messagesForDisplayType:(NSInteger)displayType { - __block NSArray *result = nil; - dispatch_sync(self.dataQueue, ^{ - switch (displayType) { - case 1: // 所有消息 - result = [_allMessages copy]; - break; - case 2: // 聊天消息 - result = [_chatMessages copy]; - break; - case 3: // 礼物消息 - result = [_giftMessages copy]; - break; - default: - result = [_allMessages copy]; - break; - } - }); - return result; -} - -- (void)cleanupOldMessages { - if (_allMessages.count <= self.maxMessages) return; - - // 计算需要移除的消息数量（移除一半） - NSInteger removeCount = self.maxMessages / 2; - NSArray *itemsToRemove = [_allMessages subarrayWithRange:NSMakeRange(0, removeCount)]; - - NSMutableArray *allMessages = (NSMutableArray *)_allMessages; - NSMutableArray *chatMessages = (NSMutableArray *)_chatMessages; - NSMutableArray *giftMessages = (NSMutableArray *)_giftMessages; - - // 从所有数据源中移除这些消息 - for (XPMessageItem *item in itemsToRemove) { - [allMessages removeObject:item]; - [chatMessages removeObject:item]; - [giftMessages removeObject:item]; - } - - NSLog(@"[XPMessageDataSourceManager] Cleaned up %ld old messages, remaining: %ld", - (long)removeCount, (long)_allMessages.count); -} - -- (NSInteger)totalMessageCount { - __block NSInteger count = 0; - dispatch_sync(self.dataQueue, ^{ - count = _allMessages.count; - }); - return count; -} - -- (NSInteger)messageCountForDisplayType:(NSInteger)displayType { - __block NSInteger count = 0; - dispatch_sync(self.dataQueue, ^{ - switch (displayType) { - case 1: // 所有消息 - count = _allMessages.count; - break; - case 2: // 聊天消息 - count = _chatMessages.count; - break; - case 3: // 礼物消息 - count = _giftMessages.count; - break; - default: - count = _allMessages.count; - break; - } - }); - return count; -} - -#pragma mark - Readonly Properties - -- (NSArray *)allMessages { - __block NSArray *result = nil; - dispatch_sync(self.dataQueue, ^{ - result = [_allMessages copy]; - }); - return result; -} - -- (NSArray *)chatMessages { - __block NSArray *result = nil; - dispatch_sync(self.dataQueue, ^{ - result = [_chatMessages copy]; - }); - return result; -} - -- (NSArray *)giftMessages { - __block NSArray *result = nil; - dispatch_sync(self.dataQueue, ^{ - result = [_giftMessages copy]; - }); - return result; -} - -#pragma mark - Debug - -- (NSString *)description { - return [NSString stringWithFormat:@"", - self, (long)[self totalMessageCount], (long)[self messageCountForDisplayType:2], - (long)[self messageCountForDisplayType:3], (long)self.maxMessages]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.h b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.h deleted file mode 100644 index 1c93df8..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.h +++ /dev/null @@ -1,55 +0,0 @@ -// -// YMMessageInfoModel.h -// YUMI -// -// Created by YUMI on 2022/10/21. -// - -#import -#import "PIBaseModel.h" -#import "PIRoomPhotoAlbumItemModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMessageInfoModel : PIBaseModel -@property(nonatomic,assign) BOOL isChatHall; -@property(nonatomic,assign) BOOL isBoom; -@property(nonatomic,strong) PIRoomPhotoAlbumItemModel *albumModel; -@property(nonatomic,copy) NSString *vipIcon; -@property(nonatomic,strong) NSString *charmUrl; -@property(nonatomic,strong) NSString *experUrl; -@property(nonatomic,assign) int first; -@property(nonatomic,assign) int second; -@property(nonatomic,copy) NSString *nameText; -///显示文本 -@property (nonatomic,strong) NSAttributedString *content; -///cell的高度 -@property (nonatomic,assign) CGFloat rowHeight; -@property (nonatomic,assign) CGFloat textWidth; -//@property(nonatomic, strong) YYTextLayout *textLayout; -//@property(nonatomic, strong) NSMutableArray *extraSizeArray; -///文本内容的 -@property (nonatomic,assign) CGFloat contentLeftMargin; -///文本右边的间隙 -@property (nonatomic,assign) CGFloat contentRightMargin; -///文本上面的间隙 -@property (nonatomic,assign) CGFloat contentTopMargin; -///文本底部的间隙 -@property (nonatomic,assign) CGFloat contentBottomMargin; -///底部的间隙 -@property (nonatomic,assign) CGFloat cellBottomMargin; -///是否要隐藏背景 -@property (nonatomic,assign) BOOL isHiddenBubble; -///是否改变内容的区域 -@property (nonatomic,assign) BOOL isUpdateContentFrame; -///气泡url -@property (nonatomic, copy) NSString *bubbleImageUrl; - -@property (nonatomic, copy) NSString *boomImageUrl; - -@property(nonatomic, copy) NSString *cellKey; - -@property(nonatomic, strong) NSDictionary *customInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.m deleted file mode 100644 index 7ac8881..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.m +++ /dev/null @@ -1,93 +0,0 @@ -// -// YMMessageInfoModel.m -// YUMI -// -// Created by YUMI on 2022/10/21. -// - -#import "XPMessageInfoModel.h" -#import "XPRoomMessageConstant.h" - - - -@implementation XPMessageInfoModel - -- (instancetype)init { - if ([super init]) { - self.contentLeftMargin = 12; - self.contentRightMargin = 0; - self.contentTopMargin = 10; - self.contentBottomMargin = 10; - self.cellBottomMargin = 6; - self.isUpdateContentFrame = NO; - self.isHiddenBubble = NO; - } - return self; -} - -- (void)setContent:(NSAttributedString *)content { - _content = content; - - if (self.first == 9 && self.second == 91) { - self.rowHeight = 100; - return; - } - - if (self.isBoom) { - self.rowHeight = kGetScaleWidth(60)+6+6+20; - return; - } - - // 减去 contentLabel 的左右边距 (UIEdgeInsetsMake(4, 12, 4, 12) 中的左右各12px) - CGFloat width = kRoomMessageMaxWidth - 24; - if (self.isBoom) { - width = kRoomMessageMaxWidth - 24 - kGetScaleWidth(60); - } - - YYTextContainer *container = [YYTextContainer containerWithSize:CGSizeMake(width, CGFLOAT_MAX)]; - container.maximumNumberOfRows = 0; - - // 根据文本方向配置容器 - if (isMSRTL()) { - container.truncationType = YYTextTruncationTypeStart; - } else { - container.truncationType = YYTextTruncationTypeEnd; - } - - container.insets = UIEdgeInsetsMake(self.contentTopMargin, self.contentLeftMargin, self.contentBottomMargin, self.contentLeftMargin); - YYTextLayout *textLayout = [YYTextLayout layoutWithContainer:container text:content]; - - CGSize textSize = textLayout.textBoundingRect.size; - self.textWidth = textSize.width; - self.rowHeight = textSize.height; - -// if ([NSString isEmpty:self.bubbleImageUrl]) { - self.rowHeight = - ceil(textSize.height) + - self.cellBottomMargin + - self.contentTopMargin; -// (isMSRTL() ? self.contentTopMargin : (self.isBoom ? 20 : 8)); - -// } else { -// self.rowHeight = -// ceil(textSize.height) + -// (isMSRTL() ? self.contentTopMargin : (self.isBoom ? 20 : 8)) + -//// self.contentBottomMargin + -// self.cellBottomMargin; -// } - self.rowHeight += 10; - self.rowHeight += (self.isBoom ? 20 : 0); - // 移除额外的阿拉伯文本高度调整，YYTextLayout 已能正确处理 RTL 文本 -} - -- (BOOL)isStringContainArabic:(NSString *)string { - for (NSUInteger i = 0; i < string.length; i++) { - unichar c = [string characterAtIndex:i]; - if (c >= 0x0600 && c <= 0x06FF) { - return YES; - } - } - return NO; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageItem.h b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageItem.h deleted file mode 100644 index d86c641..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageItem.h +++ /dev/null @@ -1,60 +0,0 @@ -// -// XPMessageItem.h -// YUMI -// -// Created by YUMI on 2024/12/19. -// - -#import -#import "XPMessageInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN - -/** - * DiffableDataSource 兼容的消息项模型 - * 用于替代原有的多数据源架构，提供统一的消息管理 - */ -@interface XPMessageItem : NSObject - -/// 消息模型 -@property (nonatomic, strong) XPMessageInfoModel *messageModel; - -/// 唯一标识符，用于 DiffableDataSource 的 itemIdentifier -@property (nonatomic, strong) NSString *uniqueIdentifier; - -/// 时间戳，用于排序和清理 -@property (nonatomic, assign) NSTimeInterval timestamp; - -/// 显示类型：1=所有消息, 2=聊天消息, 3=礼物消息 -@property (nonatomic, assign) NSInteger displayType; - -/** - * 初始化方法 - * @param model 消息模型 - * @param identifier 唯一标识符 - */ -- (instancetype)initWithMessageModel:(XPMessageInfoModel *)model - uniqueIdentifier:(NSString *)identifier; - -/** - * 判断是否为聊天消息 - * @return YES 如果是聊天消息 - */ -- (BOOL)isChatMessage; - -/** - * 判断是否为礼物消息 - * @return YES 如果是礼物消息 - */ -- (BOOL)isGiftMessage; - -/** - * 判断是否应该显示在指定类型中 - * @param displayType 显示类型 - * @return YES 如果应该显示 - */ -- (BOOL)shouldDisplayInType:(NSInteger)displayType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageItem.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageItem.m deleted file mode 100644 index c48a8b9..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageItem.m +++ /dev/null @@ -1,99 +0,0 @@ -// -// XPMessageItem.m -// YUMI -// -// Created by YUMI on 2024/12/19. -// - -#import "XPMessageItem.h" - -@implementation XPMessageItem - -- (instancetype)initWithMessageModel:(XPMessageInfoModel *)model - uniqueIdentifier:(NSString *)identifier { - self = [super init]; - if (self) { - _messageModel = model; - _uniqueIdentifier = identifier; - _timestamp = [[NSDate date] timeIntervalSince1970]; - _displayType = 1; // 默认显示在所有类型中 - } - return self; -} - -- (BOOL)isChatMessage { - if (!self.messageModel) return NO; - - // 文本消息 (NIMMessageTypeText = 0) - if (self.messageModel.first == 0) { - return YES; - } - - // 表情消息 (CustomMessageType_Face = 9) - if (self.messageModel.first == 9) { - return YES; - } - - return NO; -} - -- (BOOL)isGiftMessage { - if (!self.messageModel) return NO; - - // 礼物相关消息类型 - switch (self.messageModel.first) { - case 3: // CustomMessageType_Gift - 单人送礼物 - case 63: // CustomMessageType_RoomBoom - 房间爆炸 - case 26: // CustomMessageType_Candy_Tree - 糖果树 - case 12: // CustomMessageType_AllMicroSend - 全麦送礼物 - return YES; - default: - return NO; - } -} - -- (BOOL)shouldDisplayInType:(NSInteger)displayType { - switch (displayType) { - case 1: // 所有消息 - return YES; - case 2: // 聊天消息 - return [self isChatMessage]; - case 3: // 礼物消息 - return [self isGiftMessage]; - default: - return YES; - } -} - -#pragma mark - NSCopying - -- (id)copyWithZone:(NSZone *)zone { - XPMessageItem *copy = [[XPMessageItem alloc] init]; - copy.messageModel = self.messageModel; - copy.uniqueIdentifier = self.uniqueIdentifier; - copy.timestamp = self.timestamp; - copy.displayType = self.displayType; - return copy; -} - -#pragma mark - NSObject - -- (BOOL)isEqual:(id)object { - if (![object isKindOfClass:[XPMessageItem class]]) { - return NO; - } - - XPMessageItem *other = (XPMessageItem *)object; - return [self.uniqueIdentifier isEqualToString:other.uniqueIdentifier]; -} - -- (NSUInteger)hash { - return [self.uniqueIdentifier hash]; -} - -- (NSString *)description { - return [NSString stringWithFormat:@"", - self, self.uniqueIdentifier, (long)self.displayType, self.timestamp]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h deleted file mode 100644 index 3bd83b0..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h +++ /dev/null @@ -1,79 +0,0 @@ -// -// YMMessageRepoteExtModel.h -// YUMI -// -// Created by YUMI on 2021/10/27. -// 解析message 的扩展的模型 - -#import "NSObject+MJExtension.h" -#import "UserLevelVo.h" -#import "YUMINNNN.h" -#import "UserVipInfoVo.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPMessageRemoteExtModel : PIBaseModel -@property (nonatomic , strong) UserLevelVo * userLevelVo; -///VIP信息 -@property (nonatomic, strong) UserVipInfoVo *userVipInfoVO; -///魅力等级 -@property (nonatomic,copy) NSString *charmUrl; -@property (nonatomic,assign) NSInteger erbanNo; -///经验等级 -@property (nonatomic,copy) NSString *experUrl; -///账号的类型 -@property(nonatomic, assign) UserLevelType defUser; -///是否是新用户 -@property (nonatomic,assign) BOOL newUser; -///是否是靓号 -@property (nonatomic,assign) BOOL hasPrettyErbanNo; -///是否是官方 安卓是这样用的 写上吧 -@property (nonatomic,assign) BOOL official; -///座驾名称 -@property (nonatomic,copy) NSString *carName; -///等级编号 -@property (nonatomic,assign) NSInteger experLevelSeq; -///跟随的 -@property (nonatomic,copy) NSString *fromNick; -@property (nonatomic,assign) UserEnterRoomFromType fromType; -@property (nonatomic,copy) NSString *fromUid; -@property(nonatomic,copy) NSString *uid; -///名牌的 -@property (nonatomic,copy) NSString *inRoomNameplatePic; -///铭牌的字 -@property (nonatomic,copy) NSString *inRoomNameplateWord; -///VIPicon -@property (nonatomic, copy) NSString *vipIcon; -///安卓房间公屏气泡 -@property (nonatomic, copy) NSString *androidBubbleUrl; -///iOS房间公屏气泡 -@property (nonatomic, copy) NSString *iosBubbleUrl; -///是否隐身进房 0：不隐身；1：隐身 -@property (nonatomic, assign) BOOL enterHide; -///是否防被踢 -@property (nonatomic, assign) BOOL preventKick; -///进房特效 -@property (nonatomic, copy) NSString *enterRoomEffects; -///性别 -@property (nonatomic, assign) GenderType gender; -///是否符合渠道打招呼 -@property (nonatomic,assign) BOOL fromSayHelloChannel; -/// 0 普通 1超管 -@property (nonatomic,assign) NSInteger platformRole; -@property(nonatomic,copy) NSString *avatar; -@property(nonatomic,copy) NSString *nick; -@property(nonatomic,assign) BOOL inMic; -@property(nonatomic,copy) NSString *memberType; -///铭牌, -@property(nonatomic,copy) NSString *nameplatePic; -@property(nonatomic,copy) NSString *nameplateWord; -///是否自定义铭牌, -@property(nonatomic,assign) BOOL isCustomWord; -@property(nonatomic,copy) NSString * headWearUrl; -@property(nonatomic,assign) NSInteger headWearType; - -// 用于新旧版本兼容时的判断 -@property (nonatomic, assign) NSInteger versionType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.m deleted file mode 100644 index 5598644..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.m +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMMessageRepoteExtModel.m -// YUMI -// -// Created by YUMI on 2021/10/27. -// - -#import "XPMessageRemoteExtModel.h" - -@implementation XPMessageRemoteExtModel - -- (instancetype)init -{ - self = [super init]; - if (self) { - self.versionType = 1; - } - return self; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessageMainView.h b/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessageMainView.h deleted file mode 100644 index 6048d52..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessageMainView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// MsRoomMessageMainView.h -// YuMi -// -// Created by duoban on 2024/5/10. -// - -#import -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" -#import "XPRoomMessageContainerView.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MsRoomMessageMainView : UIView -- (void)showUserCard:(NSInteger)uid; -- (instancetype)initWithDelegate:(id)delegate; -- (void)handleNIMImageMessage:(NIMMessage *)message; -///0房间，1.聊天大厅 -@property(nonatomic,assign) NSInteger type; - -@property(nonatomic,strong) XPRoomMessageContainerView *messageListView; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessageMainView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessageMainView.m deleted file mode 100644 index 0575e35..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessageMainView.m +++ /dev/null @@ -1,241 +0,0 @@ -// -// MsRoomMessageMainView.m -// YuMi -// -// Created by duoban on 2024/5/10. -// -#import "MsRoomMessageMainView.h" - -#import "ClientConfig.h" -#import "UserInfoModel.h" -#import -#import "Api+Message.h" -#import "AttachmentModel.h" -#import "RoomInfoModel.h" -#import "BoomInfoModel.h" -#import "XPSkillCardPlayerManager.h" - -@interface MsRoomMessageMainView() - - - -///房间的代理 -@property (nonatomic,weak) id hostDelegate; -///是否是大的 只有在小游戏的时候有用 -@property (nonatomic,assign) BOOL isLarge; - -@property (nonatomic, strong) UIButton *buttonRoom; -@property (nonatomic, strong) UIButton *buttonChat; -@property (nonatomic, strong) UIButton *buttonGift; -@property (nonatomic, strong) UIImageView *selectedMark; - -@end - -@implementation MsRoomMessageMainView - -- (instancetype)initWithDelegate:(id)delegate { - self = [super init]; - if (self) { - self.hostDelegate = delegate; - self.hidden = YES; - [self installUI]; - [self installConstraints]; - - [[NIMSDK sharedSDK].broadcastManager addDelegate:self]; - } - return self; -} - -- (void)dealloc { - [[NIMSDK sharedSDK].broadcastManager removeDelegate:self]; -} - --(void)installUI{ - [self addSubview:self.buttonRoom]; - [self addSubview:self.buttonChat]; - [self addSubview:self.buttonGift]; - [self addSubview:self.selectedMark]; - [self addSubview:self.messageListView]; -} --(void)installConstraints{ - [self.buttonRoom mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self); - make.leading.mas_equalTo(self).offset(15); - make.height.mas_equalTo(20); - }]; - - [self.buttonChat mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self); - make.leading.mas_equalTo(self.buttonRoom.mas_trailing).offset(20); - make.height.mas_equalTo(20); - }]; - - [self.buttonGift mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self); - make.leading.mas_equalTo(self.buttonChat.mas_trailing).offset(20); - make.height.mas_equalTo(20); - }]; - - [self.selectedMark mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(19); - make.centerX.mas_equalTo(self.buttonRoom); - make.size.mas_equalTo(CGSizeMake(9, 3)); - }]; - - [self.messageListView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.buttonRoom.mas_bottom).offset(16); - make.leading.bottom.trailing.mas_equalTo(self); - }]; -} -- (void)showUserCard:(NSInteger)uid{ - [self.messageListView showUserCard:uid]; -} - -- (void)didTapButton:(UIButton *)sender { - [self.messageListView changeType:sender.tag - 100]; - - [UIView animateWithDuration:0.2 animations:^{ - [self.selectedMark mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(19); - if (sender.tag == 101) { - make.centerX.mas_equalTo(self.buttonRoom); - } else if (sender.tag == 102) { - make.centerX.mas_equalTo(self.buttonChat); - } else { - make.centerX.mas_equalTo(self.buttonGift); - } - make.size.mas_equalTo(CGSizeMake(10, 3)); - }]; - [self layoutIfNeeded]; - }]; -} - -#pragma mark - RoomGuestDelegate -- (void)handleNIMCustomMessage:(NIMMessage *)message { - dispatch_async(dispatch_get_main_queue(), ^{ - [self.messageListView handleNIMCustomMessage:message]; - }); -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - dispatch_async(dispatch_get_main_queue(), ^{ - [self.messageListView handleNIMNotificationMessage:message]; - }); -} - -- (void)handleNIMTextMessage:(NIMMessage *)message { - dispatch_async(dispatch_get_main_queue(), ^{ - [self.messageListView handleNIMTextMessage:message]; - }); -} - -- (void)handleNIMImageMessage:(NIMMessage *)message { - -} - -- (void)onRoomMiniEntered { - self.hidden = NO; - dispatch_async(dispatch_get_main_queue(), ^{ - [self.messageListView onRoomMiniEntered]; - }); -} - -- (void)onRoomEntered { - self.hidden = NO; - dispatch_async(dispatch_get_main_queue(), ^{ - [self.messageListView onRoomEntered]; - }); -} - -- (void)onRoomUpdate { - dispatch_async(dispatch_get_main_queue(), ^{ - [self.messageListView onRoomUpdate]; - }); -} -#pragma mark - XPRoomMessageContainerViewDelegate -- (void)xPRoomMessageContainerViewlDidTapEmpty:(XPRoomMessageContainerView *)view{ - if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) { - self.isLarge = !self.isLarge; - CGFloat height = self.isLarge ? 200 : (iPhoneXSeries ? 100 : 80); - [self mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(height); - }]; - } -} - -#pragma mark - -- (void)onReceiveBroadcastMessage:(NIMBroadcastMessage *)broadcastMessage { - if ([AccountInfoStorage instance].getUid.length == 0) { - return; - } - if (broadcastMessage.content) { - NSDictionary *msgDictionary = [broadcastMessage.content toJSONObject]; - AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]]; - Boom632Model *m = [Boom632Model modelWithJSON:[attachment data]]; - if (m.roomUid != [XPSkillCardPlayerManager shareInstance].roomUid.integerValue) { - return; - } - } - - dispatch_async(dispatch_get_main_queue(), ^{ - [self.messageListView handleBroadcastMessage:broadcastMessage]; - }); -} - -#pragma mark - 懒加载 -- (NSInteger)type{ - return 0; -} - -- (XPRoomMessageContainerView *)messageListView{ - if(!_messageListView){ - _messageListView = [[XPRoomMessageContainerView alloc] initWithDelegate:self.hostDelegate]; - _messageListView.delegate = self; - } - return _messageListView; -} - -- (UIButton *)buttonRoom { - if (!_buttonRoom) { - _buttonRoom = [UIButton buttonWithType:UIButtonTypeCustom]; - _buttonRoom.tag = 101; - [_buttonRoom.titleLabel setFont:kFontMedium(14)]; - [_buttonRoom setTitle:YMLocalizedString(@"RoomMessageTitle_0") forState:UIControlStateNormal]; - [_buttonRoom addTarget:self action:@selector(didTapButton:) forControlEvents:UIControlEventTouchUpInside]; - } - return _buttonRoom; -} - -- (UIButton *)buttonChat { - if (!_buttonChat) { - _buttonChat = [UIButton buttonWithType:UIButtonTypeCustom]; - _buttonChat.tag = 102; - [_buttonChat.titleLabel setFont:kFontMedium(14)]; - [_buttonChat setTitle:YMLocalizedString(@"RoomMessageTitle_1") forState:UIControlStateNormal]; - [_buttonChat addTarget:self action:@selector(didTapButton:) forControlEvents:UIControlEventTouchUpInside]; - } - return _buttonChat; -} - -- (UIButton *)buttonGift { - if (!_buttonGift) { - _buttonGift = [UIButton buttonWithType:UIButtonTypeCustom]; - _buttonGift.tag = 103; - [_buttonGift.titleLabel setFont:kFontMedium(14)]; - [_buttonGift setTitle:YMLocalizedString(@"RoomMessageTitle_2") forState:UIControlStateNormal]; - [_buttonGift addTarget:self action:@selector(didTapButton:) forControlEvents:UIControlEventTouchUpInside]; - } - return _buttonGift; -} - -- (UIImageView *)selectedMark { - if (!_selectedMark) { - _selectedMark = [[UIImageView alloc] init]; - _selectedMark.backgroundColor = UIColorFromRGB(0x04D5C6); - _selectedMark.layer.cornerRadius = 1; - _selectedMark.layer.masksToBounds = YES; - } - return _selectedMark; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageConstant.h b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageConstant.h deleted file mode 100644 index d7de4c4..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageConstant.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMRoomMessageConstant.h -// YUMI -// -// Created by YUMI on 2021/10/26. -// -#import -#import "YUMIMacroUitls.h" - -#ifndef XPRoomMessageConstant_h -#define XPRoomMessageConstant_h - -#define kRoomMessageMaxWidth (KScreenWidth - 15 - 90 - 8) - -///公屏文本字体的大小 -static CGFloat kRoomMessageDefalutFont = 15; -///文字上下的间隙 -static CGFloat kRoomMessageTextSpaceHeight = 10; - -static CGFloat kRoomMessageBubbleCornerRadius = 7; -///公屏保存的最大数 -static NSInteger kRoomMessageMaxLength = 1000; - - -#endif /* XPRoomMessageConstant_h */ diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.h b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.h deleted file mode 100644 index ef3de88..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMRoomMessageParser.h -// YUMI -// -// Created by YUMI on 2021/10/26. -// - -#import -#import "RoomHostDelegate.h" -NS_ASSUME_NONNULL_BEGIN - -@class NIMMessage, NIMBroadcastMessage, XPMessageInfoModel; - -@interface XPRoomMessageParser : NSObject - -- (XPMessageInfoModel*)parseMessageAttribute:(NIMMessage *)message; -- (NSString *)parseMessageBubble:(NIMMessage *)message; -- (XPMessageInfoModel*)parseMessageAttributeForChatHall:(NIMMessage *)message; -- (XPMessageInfoModel*)parseBroadcastMessageAttribute:(NIMBroadcastMessage *)message; - -///房间的代理 -@property (nonatomic,weak) id hostDelegate; -- (void)showUserCard:(NSInteger)uid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m deleted file mode 100644 index 6e85e54..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m +++ /dev/null @@ -1,1742 +0,0 @@ -// -// YMRoomMessageParser.m -// YUMI -// -// Created by YUMI on 2021/10/26. -// - -#import "XPRoomMessageParser.h" - -#import -#import -///Tool -#import "ThemeColor+Room.h" -#import "XPRoomMessageConstant.h" -#import "AccountInfoStorage.h" -#import "YUMIMacroUitls.h" -#import "XPGiftStorage.h" -#import "XPRoomFaceTool.h" -#import "TTPopup.h" -#import "NSArray+Safe.h" -#import "ClientConfig.h" -///Model -#import "XPMessageRemoteExtModel.h" -#import "AttachmentModel.h" -#import "GiftReceiveInfoModel.h" -#import "XPKickUserModel.h" -#import "MicroQueueModel.h" -#import "UserInfoModel.h" -#import "MicroStateModel.h" -#import "RoomInfoModel.h" -#import "DatingInfoModel.h" -#import "RoomFaceInfoModel.h" -#import "RoomFaceSendInfoModel.h" -#import "GuildSuperAdminInfoModel.h" -#import "RoomPKChooseUserModel.h" -#import "RoomPKInfoModel.h" -#import "CandyTreeResultModel.h" -#import "XPGiftBigPrizeModel.h" -#import "XPGiftCompoundModel.h" -#import "RoomSailingPrizeModel.h" -#import "XPOpenRedPacketModel.h" -#import "XPMessageInfoModel.h" - -#import "NetImageView.h" - -#import "XPRoomTopicAlertView.h" -#import "XPRoomSendTextView.h" -#import "XPRoomPKResultView.h" -#import "XPWebViewController.h" -#import "XCCurrentVCStackManager.h" -#import "PIGeneralPublicScreenModel.h" -#import "QEmotionHelper.h" - -#import "BoomInfoModel.h" -#import "UserRoomCardViewController.h" - -@implementation XPRoomMessageParser - -- (XPMessageInfoModel*)parseMessageAttributeForChatHall:(NIMMessage *)message{ - NIMMessageType messageType = message.messageType; - XPMessageInfoModel * messageInfo = [[XPMessageInfoModel alloc] init]; - messageInfo.isChatHall = YES; - switch (messageType) { - case NIMMessageTypeText: - { - XPMessageInfoModel *model = [self makeChatAttribute:message messageInfo:messageInfo]; - return model != nil ? model : [XPMessageInfoModel new]; - break; - } - - case NIMMessageTypeCustom: - { - XPMessageInfoModel *model = [self makeCustomAttribute:message messageInfo:messageInfo]; - return model != nil ? model : [XPMessageInfoModel new]; - break; - } - default: - return [XPMessageInfoModel new]; - } -} - -- (XPMessageInfoModel*)parseBroadcastMessageAttribute:(NIMBroadcastMessage *)message { - if (message.content) { - NSDictionary *msgDictionary = [message.content toJSONObject]; - AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]]; - if (attachment.first == CustomMessageType_RoomBoom) { - Boom632Model *model = [Boom632Model modelWithJSON:attachment.data]; - - XPMessageInfoModel * messageInfo = [[XPMessageInfoModel alloc] init]; - NSString *text = [NSString stringWithFormat:@"%@%@%@", YMLocalizedString(@"RoomMessageBoom_0"), model.nick, YMLocalizedString(@"RoomMessageBoom_1")]; - - NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:text]; - [attributedString addAttribute:NSFontAttributeName value:kFontMedium(11) range:NSMakeRange(0, text.length)]; - [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(0, text.length)]; - [attributedString addAttribute:NSForegroundColorAttributeName value:UIColorFromRGB(0xFF3B3B) range:NSMakeRange([YMLocalizedString(@"RoomMessageBoom_0") length], model.nick.length)]; - - messageInfo.isBoom = YES; - messageInfo.boomImageUrl = model.pic; - messageInfo.rowHeight = 80; - messageInfo.first = attachment.first; - messageInfo.content = attributedString; - return messageInfo; - } - } - return nil; -} - -- (XPMessageInfoModel*)parseMessageAttribute:(NIMMessage *)message { - NIMMessageType messageType = message.messageType; - XPMessageInfoModel * messageInfo = [[XPMessageInfoModel alloc] init]; - - if([message.messageObject isKindOfClass:[NIMCustomObject class]] ){ - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel * attachment = (AttachmentModel *)obj.attachment; - if(attachment.isBroadcast == YES){ - return [self makeCustomAttribute:message messageInfo:messageInfo]; - } - } - } - - switch (messageType) { - case NIMMessageTypeText: - { - XPMessageInfoModel *model = [self makeChatAttribute:message messageInfo:messageInfo]; - return model != nil ? model : [XPMessageInfoModel new]; - break; - } - case NIMMessageTypeTip: - { - XPMessageInfoModel *model = [self makeTipsAttribute:message messageInfo:messageInfo]; - return model != nil ? model : [XPMessageInfoModel new]; - break; - } - case NIMMessageTypeNotification: - { - XPMessageInfoModel *model = [self makeNotificationAttribute:message messageInfo:messageInfo]; - return model != nil ? model : [XPMessageInfoModel new]; - break; - } - case NIMMessageTypeCustom: - { - XPMessageInfoModel *model = [self makeCustomAttribute:message messageInfo:messageInfo]; - return model != nil ? model : [XPMessageInfoModel new]; - break; - } - default: - return [XPMessageInfoModel new]; - } -} - -- (NSString *)parseMessageBubble:(NIMMessage *)message { - if (![message isKindOfClass:[NIMMessage class]] || ![message respondsToSelector:@selector(remoteExt)]) { - return @""; - } - XPMessageRemoteExtModel * model = [XPMessageRemoteExtModel modelWithJSON:message.remoteExt[message.from]]; - return model.iosBubbleUrl ? model.iosBubbleUrl : @""; -} - -/// 用户公屏聊天 -- (XPMessageInfoModel *)makeCustomAttribute:(NIMMessage *)message messageInfo:(XPMessageInfoModel*)messageInfo{ - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - - if (![message isKindOfClass:[NIMMessage class]] || ![message respondsToSelector:@selector(remoteExt)]) { - return nil; - } - - XPMessageRemoteExtModel * model = [XPMessageRemoteExtModel modelWithJSON:message.remoteExt[message.from]]; - messageInfo.bubbleImageUrl = [self parseMessageBubble:message]; - int first = attachment.first; - int second = attachment.second; - if (first == CustomMessageType_Gift) {///单人送 - return [self createSendGiftAttribute:attachment sendInfo:model messageInfo:messageInfo]; - } else if(first == CustomMessageType_AllMicroSend) {///全麦送 多人送 - return [self createBatchMicroSendGiftAttribute:attachment sendInfo:model messageInfo:messageInfo]; - } else if(first == CustomMessageType_Room_Tip) {///分享/收藏房间 - return [self createShareOrAttentionRoomAttribute:attachment sendInfo:model uid:message.from messageInfo:messageInfo]; - } else if(first == CustomMessageType_Kick_User || first == CustomMessageType_Queue) { - XPKickUserModel * kickModel = [XPKickUserModel modelWithJSON:attachment.data]; - return [self createKickUserAttribute:attachment info:kickModel messageInfo:messageInfo]; - } else if(first == CustomMessageType_Look_Love) {//糖果树 - return [self createCandyTreeHighLevelAttribute:attachment messageInfo:messageInfo]; - } else if(first == CustomMessageType_Arrange_Mic) { - return [self createArrangeMicAttribute:attachment messageInfo:messageInfo]; - }else if(first == CustomMessageType_Update_RoomInfo) { - return [self createRoomInfoUpdateAttribute:attachment messageInfo:messageInfo]; - } else if(first == CustomMessageType_Collection_Room) { - return [self createCollectRoomAttribute:attachment messageInfo:messageInfo]; - } else if(first == CustomMessageType_RoomPlay_Dating) { - return [self createRoomDatingAttribute:attachment messageInfo:messageInfo]; - } else if (first == CustomMessageType_Noble_VIP) {//VIP - return [self createNobleLevelAttribute:attachment messageInfo:messageInfo]; - } else if (first == CustomMessageType_Face) {//表情 - return [self createRoomFaceAttribute:attachment messageInfo:messageInfo remoteExtModel:model]; - } else if (first == CustomMessageType_Tarot) {//塔罗 - return [self createTarotAttribute:attachment messageInfo:messageInfo]; - } else if (first == CustomMessageType_Anchor_FansTeam) {//粉丝团 - return [self createAnchorFansTeamAttribute:attachment messageInfo:messageInfo]; - } else if (first == CustomMessageType_Room_PK) {///房内PK - return [self createRoomPKAttribute:attachment messageInfo:messageInfo]; - } else if (first == CustomMessageType_LuckyBag) {///幸运礼物 - return [self createRoomLuckyBigPrizeAttribute:attachment messageInfo:messageInfo]; - } else if(first == CustomMessageType_Gift_Compound) {///礼物合成 - return [self createRoomGiftCompoundAttribute:attachment messageInfo:messageInfo]; - } else if(first == CustomMessageType_Room_Sailing) {///航海 - return [self createRoomSailingAttribute:attachment messageInfo:messageInfo]; - } else if (first == CustomMessageType_RedPacket) { - if (attachment.second == Custom_Message_Sub_OpenRedPacketSuccess) { - return [self createRedPacketAttribute:attachment messageInfo:messageInfo]; - } else if (attachment.second == Custom_Message_Sub_LuckyPackage){ - return [self createNewRedPacketAttribute:attachment messageInfo:messageInfo]; - } - } else if (first == CustomMessageType_Room_Album) { - NSDictionary *userInfo = attachment.data[@"user"]; - NSDictionary *userLevel = attachment.data[@"userLevel"]; - if(userLevel != nil){ - NSString *charmUrl = userLevel[@"charmUrl"]; - NSString *experUrl = userLevel[@"experUrl"]; - messageInfo.charmUrl = charmUrl; - messageInfo.experUrl = experUrl; - } - PIRoomPhotoAlbumItemModel *albumModel = [PIRoomPhotoAlbumItemModel modelWithDictionary:attachment.data[@"roomPhoto"]]; - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * nick = @""; - if(userInfo != nil){ - nick = [NSString stringWithFormat:@"%@:", userInfo[@"nick"]]; - } - if ([message.from isEqualToString:uid]) { - nick = YMLocalizedString(@"XPRoomMessageParser0"); - } - messageInfo.first = CustomMessageType_Room_Album; - messageInfo.nameText = nick; - messageInfo.albumModel = albumModel; - messageInfo.content = [self makeUserNameAttribute:message messageInfo:messageInfo]; - messageInfo.rowHeight = 240; - return messageInfo; - - }else if(first == CustomMessageType_General_Public_Screen){ - return [self createGeneralPublicScreenAttribute:attachment messageInfo:messageInfo]; - }else if(first == CustomMessageType_Super_Gift){ - return [self createGeneralPublicScreenAttribute:attachment messageInfo:messageInfo]; - } else if (first == CustomMessageType_Hall_Super_Admin) { - messageInfo.bubbleImageUrl = @""; - NSString *content = @""; - NSDictionary *dic = attachment.data; - NSString *highLightContent = @""; - - switch (attachment.second) { - case Custom_Message_Sub_Hall_Super_Admin_Lock_Mic: { - NSNumber *micNum = [dic objectForKey:@"micNumber"]; - if (micNum) { - content = [NSString stringWithFormat:YMLocalizedString(@"1.0.34_text_8"), @(micNum.integerValue + 2)]; - } - } - break; - case Custom_Message_Sub_Hall_Super_Admin_Mute_Mic: { - NSNumber *micNum = [dic objectForKey:@"micNumber"]; - if (micNum) { - content = [NSString stringWithFormat:YMLocalizedString(@"1.0.34_text_9"), @(micNum.integerValue + 2)]; - } - } - break; - case Custom_Message_Sub_Hall_Super_Admin_Kick_Down_Mic: { - NSString *targetNick = [dic objectForKey:@"targetNick"]; - if (targetNick) { - content = [NSString stringWithFormat:YMLocalizedString(@"1.0.34_text_10"), targetNick]; - highLightContent = targetNick; - } - } - break; - case Custom_Message_Sub_Hall_Super_Admin_Kick_Out_Room: { - NSString *targetNick = [dic objectForKey:@"targetNick"]; - if (targetNick) { - content = [NSString stringWithFormat:YMLocalizedString(@"1.0.34_text_11"), targetNick]; - highLightContent = targetNick; - } - } - break; - case Custom_Message_Sub_Hall_Super_Admin_Mark_Black: { - NSString *targetNick = [dic objectForKey:@"targetNick"]; - if (targetNick) { - content = [NSString stringWithFormat:YMLocalizedString(@"1.0.34_text_12"), targetNick]; - highLightContent = targetNick; - } - } - break; - case Custom_Message_Sub_Hall_Super_Admin_Kick_Manager_Out_Room: { - XPKickUserModel * kickModel = [XPKickUserModel modelWithJSON:attachment.data]; - return [self createKickUserAttribute:attachment info:kickModel messageInfo:messageInfo]; - } - break; - - default: - break; - } - - if ([NSString isEmpty:content]) { - return nil; - } else { - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:content - attributes:@{ - NSFontAttributeName: kFontSemibold(14), - NSForegroundColorAttributeName: [UIColor lightTextColor] - }]; - NSRange range = [content rangeOfString:highLightContent]; - if (range.location != NSNotFound) { - // 设置目标文本颜色为红色 - [attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor messageNickColor] range:range]; - } - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; - } - - } else if (first == CustomMessageType_User_Enter_Room) { - switch (second) { - case Custom_Message_Sub_User_Enter_Room: - return [self createCPEnterRoomAttribute:attachment messageInfo:messageInfo]; - break; - case Custom_Message_Sub_Pic_Message: { - PIRoomPhotoAlbumItemModel *albumModel = [PIRoomPhotoAlbumItemModel modelWithDictionary:attachment.data]; - albumModel.photoUrl = albumModel.picUrl; - albumModel.type = @"1"; - albumModel.status = 1; - - messageInfo.first = CustomMessageType_Room_Album; - messageInfo.nameText = albumModel.nick; - messageInfo.albumModel = albumModel; - messageInfo.charmUrl = albumModel.charmUrl; - messageInfo.experUrl = albumModel.experUrl; - messageInfo.bubbleImageUrl = albumModel.iosBubbleUrl; - messageInfo.vipIcon = albumModel.vipIcon; - messageInfo.content = [self makeUserNameAttribute:message messageInfo:messageInfo]; - messageInfo.rowHeight = 240; - return messageInfo; - } - break; - default: - break; - } - } -// else if(first == 106){ -// switch (second) { -// case Custom_Message_Sub_Super_Gift_Room_Message: -// return [self createGeneralPublicScreenAttribute:attachment messageInfo:messageInfo]; -// break; -// -// default: -// break; -// } -// } - - return nil; -} - -- (NSAttributedString *)makeUserNameAttribute:(NIMMessage *)message - messageInfo:(XPMessageInfoModel *)messageInfo { - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - - NSString *nick = messageInfo.albumModel.nick; - if ([NSString isEmpty:nick]) { - nick = messageInfo.nameText; - } - - NSString *experUrl = messageInfo.albumModel.experUrl; - if ([NSString isEmpty:experUrl]) { - experUrl = messageInfo.experUrl; - } - - NSString *charmUrl = messageInfo.albumModel.charmUrl; - if ([NSString isEmpty:charmUrl]) { - charmUrl = messageInfo.charmUrl; - } - - NSString *vipIcon = messageInfo.albumModel.vipIcon; - if ([NSString isEmpty:vipIcon]) { - vipIcon = messageInfo.vipIcon; - } - - NSString *inRoomNameplatePic = messageInfo.albumModel.inRoomNameplatePic; - - ///官方新用户 - [attribute appendAttributedString:[self createOfficalAndNewuserAttribute:messageInfo.albumModel.defUser - newUser:messageInfo.albumModel.newUser - fromSayHelloChannel:NO]]; - if ([self isCurrentRoomSuperAdmin:message.from]) { - [attribute appendAttributedString:[self createLanguageImageAttribute:@"common_super_admin"]]; - } - if (![NSString isEmpty:experUrl]) { - [attribute appendAttributedString:[self createUrlImageAttribute:experUrl]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - if (![NSString isEmpty:charmUrl]) {//等级 - [attribute appendAttributedString:[self createUrlImageAttribute:charmUrl]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - if (![NSString isEmpty:vipIcon]) { - [attribute appendAttributedString:[self createUrlImageAttribute:vipIcon]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - if (![NSString isEmpty:inRoomNameplatePic]) { - [attribute appendAttributedString:[self createUrlImageAttribute:inRoomNameplatePic]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - - [attribute appendAttributedString:[self createTextAttribute:nick color:[UIColor colorWithWhite:1 alpha:0.7] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - return attribute.copy; -} - -/// @param message 消息的实体 -- (XPMessageInfoModel*)makeChatAttribute:(NIMMessage *)message messageInfo:(XPMessageInfoModel *)messageInfo{ - - if (![message isKindOfClass:[NIMMessage class]] || ![message respondsToSelector:@selector(remoteExt)]) { - return messageInfo; - } - - NSString * uid = [AccountInfoStorage instance].getUid; - XPMessageRemoteExtModel * model = [XPMessageRemoteExtModel modelWithJSON:message.remoteExt[message.from]]; - messageInfo.bubbleImageUrl = [self parseMessageBubble:message]; - NSString *getNick = ((NIMMessageChatroomExtension *)message.messageExt).roomNickname; - if(getNick == nil && model.nick != nil){ - getNick = model.nick; - } - - NSString * nick = [NSString stringWithFormat:@"%@:", getNick]; - if ([message.from isEqualToString:uid]) { - nick = YMLocalizedString(@"XPRoomMessageParser0"); - } - - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - - ///官方新用户 - [attribute appendAttributedString:[self createOfficalAndNewuserAttribute:model.defUser newUser:model.newUser fromSayHelloChannel:model.fromSayHelloChannel]]; - if ([self isCurrentRoomSuperAdmin:message.from]) { - [attribute appendAttributedString:[self createLanguageImageAttribute:@"common_super_admin"]]; - } - if (![NSString isEmpty:model.experUrl]) { - messageInfo.experUrl = model.experUrl; - [attribute appendAttributedString:[self createUrlImageAttribute:model.experUrl]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - if (![NSString isEmpty:model.charmUrl]) {//等级 - messageInfo.charmUrl = model.charmUrl; - [attribute appendAttributedString:[self createUrlImageAttribute:model.charmUrl]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - if (![NSString isEmpty:model.vipIcon]) { - messageInfo.vipIcon = model.vipIcon; - [attribute appendAttributedString:[self createUrlImageAttribute:model.vipIcon]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - if (model.inRoomNameplatePic.length > 0) { - [attribute appendAttributedString:[self createUrlImageAttribute:model.inRoomNameplatePic]]; -// [attribute appendAttributedString:[self createUrlImageAttribute:model.inRoomNameplatePic -// size:CGSizeMake(72, kFontRegular(kRoomMessageDefalutFont).lineHeight)]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - [attribute appendAttributedString:[self createTextAttribute:nick color:[UIColor colorWithWhite:1 alpha:0.7] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - - id nickNameNifo = message.remoteExt[@"atNames"]; - - if (message.text) { - NSMutableAttributedString *msgStr; - msgStr = [[NSMutableAttributedString alloc] initWithString:message.text]; - [msgStr addAttribute:NSForegroundColorAttributeName - value:[DJDKMIMOMColor messageTextColor] - range:NSMakeRange(0, msgStr.length)]; - [msgStr addAttribute:NSFontAttributeName - value:kFontRegular(kRoomMessageDefalutFont) - range:NSMakeRange(0, msgStr.length)]; - if ([nickNameNifo isKindOfClass:[NSArray class]]) { - for (NSString *nick in nickNameNifo) { - NSRange range = [message.text rangeOfString:nick]; - if (range.length) { - [msgStr yy_setTextHighlightRange:range color:UIColorFromRGB(0xFD85C9) backgroundColor:[UIColor clearColor] userInfo:nil]; - } - } - } - [attribute appendAttributedString:msgStr]; - } - - [self attributeAddLongPressHihtLight:attribute uid:message.from nick:((NIMMessageChatroomExtension *)message.messageExt).roomNickname]; - - messageInfo.cellKey = @"ChatMessage"; - messageInfo.content = attribute; - - return messageInfo; -} - -/// 房间tips消息 -/// @param message 消息的实体 -- (XPMessageInfoModel*)makeTipsAttribute:(NIMMessage *)message messageInfo:(XPMessageInfoModel *)messageInfo{ - messageInfo.bubbleImageUrl = [self parseMessageBubble:message]; - if ([message.localExt.allKeys containsObject:@"isRoomTopic"]) { - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - [attribute appendAttributedString: [self createTextAttribute:message.text color:[UIColor whiteColor] font:kRoomMessageDefalutFont]]; - if ([[message.localExt objectForKey:@"isRoomTopic"] boolValue] == YES) { - [attribute yy_setTextHighlightRange:NSMakeRange(0, attribute.length) color:nil backgroundColor:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - TTPopupService * config = [[TTPopupService alloc] init]; - XPRoomTopicAlertView * alertView = [[XPRoomTopicAlertView alloc] init]; - alertView.title = roomInfo.roomDesc; - alertView.message = roomInfo.introduction; - config.contentView = alertView; - [TTPopup popupWithConfig:config]; - }]; - } - messageInfo.content = attribute; - } else { - NSAttributedString * attribute = [self createTextAttribute:message.text color:UIColorFromRGB(0xFE5D7F) font:kRoomMessageDefalutFont]; - messageInfo.content = attribute; - } - messageInfo.first = 10; - return messageInfo; -} - -/// 房间通知类消息 -/// @param message 消息的实体 -- (XPMessageInfoModel*)makeNotificationAttribute:(NIMMessage *)message messageInfo:(XPMessageInfoModel *)messageInfo{ - messageInfo.bubbleImageUrl = [self parseMessageBubble:message]; - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - NIMChatroomNotificationMember *member = content.targets[0]; - NIMMessageChatroomExtension * messageExt = (NIMMessageChatroomExtension *)message.messageExt; - switch (content.eventType) { - case NIMChatroomEventTypeEnter:///进入房间 - { - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - NSDictionary * dic = [(NSDictionary *)messageExt.roomExt.toJSONObject objectForKey:message.from]; - XPMessageRemoteExtModel * extModel = [XPMessageRemoteExtModel modelWithDictionary:dic]; - - NSString* nick = member.nick.length > 0 ? member.nick : @""; - if ([nick.lowercaseString isEqualToString:@"Platform New User".lowercaseString] || [NSString isEmpty:nick]) { - nick = extModel.nick; - } - - ///官方新用户 - [attribute appendAttributedString:[self createOfficalAndNewuserAttribute:extModel.defUser newUser:extModel.newUser fromSayHelloChannel:extModel.fromSayHelloChannel]]; - - if ([self isCurrentRoomSuperAdmin:message.from]) { - [attribute appendAttributedString:[self createLanguageImageAttribute:@"common_super_admin"]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - - if (extModel.experUrl.length > 0) {//等级 - [attribute appendAttributedString:[self createUrlImageAttribute:extModel.experUrl]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - - if (extModel.charmUrl.length > 0) {//等级 - [attribute appendAttributedString:[self createUrlImageAttribute:extModel.charmUrl]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - - if (extModel.vipIcon.length > 0) {//VIPicon - messageInfo.vipIcon = extModel.vipIcon; - [attribute appendAttributedString:[self createUrlImageAttribute:extModel.vipIcon]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - - if (extModel.inRoomNameplatePic.length > 0) { - [attribute appendAttributedString:[self createUrlImageAttribute:extModel.inRoomNameplatePic]]; -// [attribute appendAttributedString:[self createUrlImageAttribute:extModel.inRoomNameplatePic -// size:CGSizeMake(72, kFontRegular(kRoomMessageDefalutFont).lineHeight)]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - - [attribute appendAttributedString:[self createNickAtrribute:nick uid:message.from.integerValue]]; - - if (extModel.carName.length > 0) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser1") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:extModel.carName color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - - if (extModel.fromType > 0) { - if (extModel.fromType == UserEnterRoomFromType_Home_Recommend) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser2") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } else if(extModel.fromType == UserEnterRoomFromType_Follow_User || extModel.fromType == UserEnterRoomFromType_New_User_Greet) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser3") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createNickAtrribute:extModel.fromNick uid:extModel.fromUid.integerValue]]; - } else if(extModel.fromType == UserEnterRoomFromType_Follow_Game_Detail) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser4") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createNickAtrribute:extModel.fromNick uid:extModel.fromUid.integerValue]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser5") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } - } - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser6") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - - messageInfo.content = attribute; - messageInfo.first = 10; - return messageInfo; - } - break; - case NIMChatroomEventTypeInfoUpdated:{ - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - if (self.hostDelegate.getRoomInfo.datingState == RoomDatingStateChangeType_Open) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser8") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - messageInfo.content = attribute; - messageInfo.first = 10; - return messageInfo; - } - } - break; - default: - return nil; - } - return nil; -} - -- (XPMessageInfoModel *)createGeneralPublicScreenAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - - PIGeneralPublicScreenModel *screenModel = [PIGeneralPublicScreenModel modelWithDictionary:attachment.data]; - NSDictionary *textDic = screenModel.template; - if(textDic.allKeys.count == 0) { - return messageInfo; - } - NSString *key = [NSBundle uploadLanguageText]; - NSString *title = textDic[key] == nil ? textDic[textDic.allKeys.firstObject] : textDic[key]; - - if(title.length == 0) { - return messageInfo; - } - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title - attributes:@{ - NSFontAttributeName:kFontRegular(kRoomMessageDefalutFont), - NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:screenModel.textColor]}]; - for (PIGeneralPublicScreenItemModel *model in screenModel.contents) { - if([model.type isEqualToString:@"TEXT"]){ - NSDictionary *subTextDic = model.text; - if(subTextDic.allKeys.count > 0){ - NSString *subText = subTextDic[key] == nil ? subTextDic[subTextDic.allKeys.firstObject] : subTextDic[key]; - NSAttributedString *attText = [[NSAttributedString alloc] initWithString:subText - attributes:@{ - NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:model.textColor]}]; - if ([attribute.string containsString:[NSString stringWithFormat:@"{%@}",model.key]]){ - [attribute replaceCharactersInRange:[attribute.string rangeOfString:[NSString stringWithFormat:@"{%@}",model.key]] withAttributedString:attText]; - } - - @kWeakify(self) - [attribute yy_setTextHighlightRange:[attribute.string rangeOfString:subText] - color:nil - backgroundColor:nil - tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - @kStrongify(self); - if(model.skipType == 6){ - if(model.skipContent.length == 0)return; - [self showUserCard:model.skipContent.integerValue]; - } - }]; - } - - }else if ([model.type isEqualToString:@"IMAGE"]){ - NSMutableAttributedString *attImage = [self createUrlImageAttribute:model.image size:CGSizeMake(model.width, model.height)]; - [attImage appendAttributedString:[self createSapceAttribute:2]]; - if ([attribute.string containsString:[NSString stringWithFormat:@"{%@}",model.key]]){ - [attribute replaceCharactersInRange:[attribute.string rangeOfString:[NSString stringWithFormat:@"{%@}",model.key]] withAttributedString:attImage]; - } - } - } - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - - - - -#pragma mark - 红包 -- (XPMessageInfoModel *)createRedPacketAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - XPOpenRedPacketModel *info = [XPOpenRedPacketModel modelWithDictionary:attachment.data]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - [attribute appendAttributedString:[self createNickAtrribute:info.openRedEnvelopeUserNick uid:info.openRedEnvelopeId.integerValue]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser9") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createNickAtrribute:info.redEnvelopeMasterNick uid:info.redEnvelopeMasterId.integerValue]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser10") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - if (info.amount.floatValue>0) { - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser11"), info.amount] color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - } - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -- (XPMessageInfoModel *)createNewRedPacketAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - NSDictionary *dic = attachment.data; - if (dic) { - messageInfo.customInfo = dic; - } - messageInfo.rowHeight = 100; - messageInfo.first = attachment.first; - messageInfo.second = attachment.second; - return messageInfo; -} - -#pragma mark - CP 进场 -- (XPMessageInfoModel *)createCPEnterRoomAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - NSMutableDictionary *dic = [attachment.data mutableCopy]; - [dic setObject:@(attachment.seq) forKey:@"cpIndex"]; - messageInfo.customInfo = dic.copy; - messageInfo.rowHeight = 81; - messageInfo.first = attachment.first; - messageInfo.second = attachment.second; - return messageInfo; -} - -#pragma mark - 航海 -- (XPMessageInfoModel *)createRoomSailingAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - RoomSailingPrizeModel *info = [RoomSailingPrizeModel modelWithDictionary:attachment.data]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomCandyGiftView0") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:info.nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser13") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:info.prizeName color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - if (info.prizeNum>1) { - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"x%d", info.prizeNum] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } - [self attributeAddHihtLight:attribute uid:info.uid.integerValue]; - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -#pragma mark - 礼物合成 -- (XPMessageInfoModel *)createRoomGiftCompoundAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - XPGiftCompoundModel *info = [XPGiftCompoundModel modelWithDictionary:attachment.data]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser14") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:info.nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:info.msg color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:info.giftName color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - [self attributeAddHihtLight:attribute uid:info.uid.integerValue]; - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -#pragma mark - 房间内幸运礼物 大价值 -- (XPMessageInfoModel *)createRoomLuckyBigPrizeAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - XPGiftBigPrizeModel * info= [XPGiftBigPrizeModel modelWithDictionary:attachment.data]; - NSString *text = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser15"),info.nick,info.luckyBagName,info.roomTitle,info.giftName]; - if (isMSZH()){ - text = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser15"),info.nick,info.roomTitle,info.luckyBagName,info.giftName]; - } - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:text attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:kRoomMessageDefalutFont],NSForegroundColorAttributeName:[DJDKMIMOMColor messageTextColor],NSParagraphStyleAttributeName:[self paragraphStyle]}]; - [attribute addAttributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor messageNickColor]} range:[text rangeOfString:info.nick]]; - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -#pragma mark - 房间内PK -- (XPMessageInfoModel *)createRoomPKAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - if (attachment.second == Custom_Message_Sub_Room_PK_Manager_Up_Mic) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser19") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - for (NSDictionary * selectuUser in [attachment.data allValues]) { - RoomPKChooseUserModel * userInfoModel = [RoomPKChooseUserModel modelWithDictionary:selectuUser]; - if (userInfoModel.groupType != GroupType_default && userInfoModel.nick.length > 0) { - [attribute appendAttributedString:[self createNickAtrribute:userInfoModel.nick uid:userInfoModel.uid.integerValue]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser20") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - NSString * groupTypeStr; - UIColor * groupColor; - if (userInfoModel.groupType == GroupType_Red) { - groupTypeStr= YMLocalizedString(@"XPRoomMessageParser21"); - groupColor = UIColorFromRGB(0xFB3D74); - }else{ - groupTypeStr = YMLocalizedString(@"XPRoomMessageParser22"); - groupColor = UIColorFromRGB(0x3291FC); - } - [attribute appendAttributedString:[self createTextAttribute:groupTypeStr color:groupColor font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:@"," color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } - } - [attribute deleteCharactersInRange:NSMakeRange(attribute.string.length - 1, 1)]; - } else { - RoomPKInfoModel * model = [RoomPKInfoModel modelWithDictionary:attachment.data]; - if (attachment.second == Custom_Message_Sub_Room_PK_Mode_Close) { - NSString * title = YMLocalizedString(@"XPRoomMessageParser23"); - [attribute appendAttributedString:[self createTextAttribute:title color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - NSRange range = [title rangeOfString:YMLocalizedString(@"XPRoomMessageParser24")]; - [attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor messageDefaultTextColor] range:range]; - } else if(attachment.second == Custom_Message_Sub_Room_PK_Result) { - NSString * victoryStr; - if (model.result == RoomPKResultType_Draw) { - RoomPKTeamModel * blueTeam; - RoomPKTeamModel * redTeam; - for (int i = 0 ; i < model.teams.count; i++) { - RoomPKTeamModel * team = [model.teams xpSafeObjectAtIndex:i]; - if (team.team == GroupType_Red) { - redTeam = team; - }else{ - blueTeam = team; - } - } - RoomPKTeamModel * team = [model.teams firstObject]; - if (model.voteMode == RoomPKVoteModeType_NumberPerson) { - victoryStr = YMLocalizedString(@"XPRoomMessageParser25"); - NSString * resultScale = [NSString stringWithFormat:@"%@:%@",[NSString stringWithFormat:@"%lld", team.score],[NSString stringWithFormat:@"%lld", team.score]]; - NSString * result = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser26"),victoryStr, resultScale]; - [attribute appendAttributedString:[self createTextAttribute:result color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - }else{ - if (team.protecScore > 0) { - NSString * resultScale = [NSString stringWithFormat:@"%@:%@",[NSString stringWithFormat:@"%lld", team.score],[NSString stringWithFormat:@"%lld", team.score]]; - victoryStr = YMLocalizedString(@"XPRoomMessageParser27"); - NSString * result = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser28"),victoryStr, resultScale]; - [attribute appendAttributedString:[self createTextAttribute:result color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - }else{ - victoryStr = YMLocalizedString(@"XPRoomMessageParser29"); - NSString * result = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser28"),victoryStr, @"0:0"]; - [attribute appendAttributedString:[self createTextAttribute:result color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } - } - if (team.protector > 0) { - [attribute appendAttributedString:[[NSMutableAttributedString alloc] initWithString:@"\n"]]; - NSString * teamStr = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser31"), blueTeam.protector.nick.length > 0 ? blueTeam.protector.nick : @"", [[NSNumber numberWithLongLong:blueTeam.protecScore] stringValue], redTeam.protector.nick.length > 0 ? redTeam.protector.nick : @"", [[NSNumber numberWithLongLong:redTeam.protecScore] stringValue]]; - [attribute appendAttributedString:[self createTextAttribute:teamStr color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } - }else{ - RoomPKTeamModel * victoryTeam; - RoomPKTeamModel * failTeam; - for (int i = 0 ; i < model.teams.count; i++) { - RoomPKTeamModel * team = [model.teams xpSafeObjectAtIndex:i]; - if (team.team == (GroupType)model.result) { - victoryTeam = team; - }else{ - failTeam = team; - } - } - if (model.result == RoomPKResultType_Red){ - victoryStr = YMLocalizedString(@"XPRoomMessageParser32"); - }else if (model.result == RoomPKResultType_Blue){ - victoryStr = YMLocalizedString(@"XPRoomMessageParser33"); - } - NSString * resultScale = [NSString stringWithFormat:@"%@:%@",[NSString stringWithFormat:@"%lld", victoryTeam.score],[NSString stringWithFormat:@"%lld", failTeam.score]]; - NSString * result; - if (model.voteMode == RoomPKVoteModeType_NumberPerson) { - result = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser34"),victoryStr, resultScale,[NSNumber numberWithLongLong:victoryTeam.score]]; - }else{ - if (victoryTeam.protector) { - NSString * victoryProteror = victoryTeam.protector.nick.length > 0 ? victoryTeam.protector.nick : @""; - result = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser35"),victoryStr, resultScale,victoryStr, victoryProteror, victoryStr,[[NSNumber numberWithLongLong:victoryTeam.protecScore] stringValue]]; - }else{ - result = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser36"),victoryStr, resultScale,victoryStr,[[NSNumber numberWithLongLong:victoryTeam.protecScore] stringValue]]; - } - } - [attribute appendAttributedString:[self createTextAttribute:result color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } - - @kWeakify(self); - [attribute yy_setTextHighlightRange:NSMakeRange(0, attribute.length) color:nil backgroundColor:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - @kStrongify(self); - [self showRoomPKResult:attachment.data]; - }]; - } else if(attachment.second == Custom_Message_Sub_Room_PK_Mode_Open) { - NSString * pkType; - if (model.voteMode == RoomPKVoteModeType_GiftValue) { - pkType = YMLocalizedString(@"XPRoomMessageParser37"); - }else if (model.voteMode == RoomPKVoteModeType_NumberPerson){ - pkType = YMLocalizedString(@"XPRoomMessageParser38"); - } - NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser114"), model.duration, pkType]; - [attribute appendAttributedString:[self createTextAttribute:title color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - }else if (attachment.second == Custom_Message_Sub_Room_PK_Start){ - NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser40"), model.duration]; - [attribute appendAttributedString:[self createTextAttribute:title color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - }else if (attachment.second == Custom_Message_Sub_Room_PK_Re_Start){ - NSString * pkType; - if (model.voteMode == RoomPKVoteModeType_GiftValue) { - pkType = YMLocalizedString(@"XPRoomMessageParser41"); - }else if (model.voteMode == RoomPKVoteModeType_NumberPerson){ - pkType = YMLocalizedString(@"XPRoomMessageParser42"); - } - NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser43"), model.duration, pkType]; - [attribute appendAttributedString:[self createTextAttribute:title color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } - } - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -- (void)showRoomPKResult:(NSDictionary *)dic { - RoomPKInfoModel * pkInfo = [RoomPKInfoModel modelWithDictionary:dic]; - if (pkInfo.pkStatus == RoomPKStatusType_End || pkInfo.pkStatus == RoomPKStatusType_ReStart) { - XPRoomPKResultView * result = [[XPRoomPKResultView alloc] init]; - result.roomPKResultInfoModel = pkInfo; - [TTPopup popupView:result style:TTPopupStyleAlert]; - } -} - -#pragma mark - 表情显示 -- (XPMessageInfoModel*)createRoomFaceAttribute:(AttachmentModel *)attachment - messageInfo:(XPMessageInfoModel *)messageInfo - remoteExtModel:(XPMessageRemoteExtModel *)model { - messageInfo.first = attachment.first; - messageInfo.second = attachment.second; - - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - ///官方新用户 - [attribute appendAttributedString:[self createOfficalAndNewuserAttribute:model.defUser newUser:model.newUser fromSayHelloChannel:model.fromSayHelloChannel]]; - if ([self isCurrentRoomSuperAdmin:model.fromUid]) { - [attribute appendAttributedString:[self createLanguageImageAttribute:@"common_super_admin"]]; - } - if (![NSString isEmpty:model.experUrl]) { - messageInfo.experUrl = model.experUrl; - [attribute appendAttributedString:[self createUrlImageAttribute:model.experUrl]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - if (![NSString isEmpty:model.charmUrl]) {//等级 - messageInfo.charmUrl = model.charmUrl; - [attribute appendAttributedString:[self createUrlImageAttribute:model.charmUrl]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - if (![NSString isEmpty:model.vipIcon]) { - messageInfo.vipIcon = model.vipIcon; - [attribute appendAttributedString:[self createUrlImageAttribute:model.vipIcon]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - if (model.inRoomNameplatePic.length > 0) { - [attribute appendAttributedString:[self createUrlImageAttribute:model.inRoomNameplatePic]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - - if ([attachment.data[@"data"] isKindOfClass:[NSArray class]]) { - NSArray * array = [RoomFaceSendInfoModel modelsWithArray:attachment.data[@"data"]]; - if (array.count > 0) { - RoomFaceSendInfoModel * sendFaceInfo = [array xpSafeObjectAtIndex:0]; - [attribute appendAttributedString:[self createTextAttribute:sendFaceInfo.nick color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:@":" color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:@"\n" color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - -#if DEBUG - NSInteger originalID = sendFaceInfo.faceId; - if (sendFaceInfo.faceId == 42) { - sendFaceInfo.faceId = 1; - } -#endif - if (sendFaceInfo.faceId == 1) { - UIImage *image = kImage(@"幸运数字"); - [attribute appendAttributedString:[self createImageAttribute:image size:CGSizeMake(40, 40)]]; - } -#if DEBUG - sendFaceInfo.faceId = originalID; -#endif - } - - for (int i = 0; i< array.count; i++) { - RoomFaceSendInfoModel * sendFaceInfo = [array xpSafeObjectAtIndex:i]; - if (sendFaceInfo.resultIndexes.count == 0) { - RoomFaceInfoModel *configInfo = [[XPRoomFaceTool shareFaceTool] findFaceInfoById:sendFaceInfo.faceId]; - UIImage *face = [[XPRoomFaceTool shareFaceTool] findFaceImageById:sendFaceInfo.faceId index:configInfo.animStartPos]; - if (face) { - UIImageView *imageView = [[UIImageView alloc]init]; - imageView.image = face; - imageView.contentMode = UIViewContentModeScaleAspectFit; - imageView.bounds = CGRectMake(0, 0, 40, 40); - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageView.frame.size.width, imageView.frame.size.height) alignToFont:kFontRegular(kRoomMessageDefalutFont) alignment:YYTextVerticalAlignmentCenter]; - [attribute appendAttributedString:[self createSapceAttribute:1]]; - [attribute appendAttributedString:attrString]; - } - } else { - for (int j = 0; j < sendFaceInfo.resultIndexes.count; j++) { - NSNumber *index = sendFaceInfo.resultIndexes[j]; - UIImage *face = [[XPRoomFaceTool shareFaceTool] findFaceImageById:sendFaceInfo.faceId index:[index integerValue]]; - if (face) { - UIImageView *imageView = [[UIImageView alloc]init]; - imageView.image = face; - imageView.contentMode = UIViewContentModeScaleAspectFit; - imageView.bounds = CGRectMake(0, 0, 30, 30); - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageView.frame.size.width, imageView.frame.size.height) alignToFont:kFontRegular(kRoomMessageDefalutFont) alignment:YYTextVerticalAlignmentCenter]; - [attribute appendAttributedString:[self createSapceAttribute:1]]; - [attribute appendAttributedString:attrString]; - } - } - } - - } - } - messageInfo.content = attribute; - return messageInfo; -} - -#pragma mark - 收藏房间 -- (XPMessageInfoModel*)createCollectRoomAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - NSDictionary *data = attachment.data[@"data"]; - NSString *nick = [NSString stringWithFormat:@"%@",data[@"nick"]]; - [attribute appendAttributedString:[self createTextAttribute:nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - NSString *tipString = @""; - if (attachment.second == Custom_Message_Sub_Collect_Room_Tips) { - tipString = YMLocalizedString(@"XPRoomMessageParser44"); - } - [attribute appendAttributedString:[self createTextAttribute:tipString color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -#pragma mark - 房间信息更新 -- (XPMessageInfoModel*)createRoomInfoUpdateAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - if (attachment.second == Custom_Message_Sub_Update_RoomInfo_MessageState) { - NSDictionary * dic= attachment.data[@"roomInfo"]; - if (dic.allKeys.count <=0) { - dic = attachment.data; - } - RoomInfoModel *roomInfo = [RoomInfoModel modelWithDictionary:dic]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser45") color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - if (roomInfo.isCloseScreen) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser46") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - } else { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser47") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - } - messageInfo.content = attribute; - } else if(attachment.second == Custom_Message_Sub_Update_RoomInfo_AnimateEffect) { - NSDictionary * dic = attachment.data[@"roomInfo"]; - if (dic.allKeys.count <=0) { - dic = attachment.data; - } - RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:dic]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser45") color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - if (roomInfo.hasAnimationEffect) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser49") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - } else { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser50") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createImageAttribute:[UIImage imageNamed:@"room_menu_more"]]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser51") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - } - messageInfo.content = attribute; - } else if (attachment.second == Custom_Message_Sub_Update_RoomInfo_CleanScreen) { - NSNumber *roleType = attachment.data[@"roleType"]; - NSString *nick = attachment.data[@"nick"]; - NSInteger uid = 0; - if ([attachment.data[@"uid"] isKindOfClass:[NSNumber class]]) { - uid = ((NSNumber *)attachment.data[@"uid"]).integerValue; - } else if ([attachment.data[@"uid"] isKindOfClass:[NSString class]]) { - uid = ((NSString *)attachment.data[@"uid"]).integerValue; - } - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser45") color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - if (roleType.integerValue == 1) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser53") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - } else if (roleType.integerValue == 2) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser54") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - } - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser55") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [self attributeAddHihtLight:attribute uid:uid]; - messageInfo.content = attribute; - } - messageInfo.first = attachment.first; - return messageInfo; -} - -#pragma mark - 相亲 -- (XPMessageInfoModel *)createRoomDatingAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - if(attachment.second == Custom_Message_Sub_Room_Play_Dating_Pick_Heart) { - DatingInfoModel * datingModel = [DatingInfoModel modelWithDictionary:attachment.data]; - NSString * targetGender = datingModel.targetGender == GenderType_Male ? YMLocalizedString(@"XPSessionFindNewFiltrateView2") : YMLocalizedString(@"XPRoomMessageParser57"); - NSString * pickString = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser58"), (datingModel.targetPosition + 1), targetGender]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser59") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:pickString color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - NSString * targetNick = datingModel.targetNickname ? datingModel.targetNickname : @""; - [attribute appendAttributedString:[self createNickAtrribute:targetNick uid:datingModel.targetUid]]; - NSString * heartContent = YMLocalizedString(@"XPRoomMessageParser60"); - [attribute appendAttributedString:[self createTextAttribute:heartContent color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } else if(attachment.second == Custom_Message_Sub_Room_Play_Dating_Result_Mutual) {///互选 - DatingInfoModel * datingModel = [DatingInfoModel modelWithDictionary:attachment.data]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser61") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - NSString * nick = datingModel.nickname ? datingModel.nickname : @""; - [attribute appendAttributedString:[self createNickAtrribute:nick uid:datingModel.uid]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser62") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - NSString * targetNick = datingModel.targetNickname ? datingModel.targetNickname : @""; - [attribute appendAttributedString:[self createNickAtrribute:targetNick uid:datingModel.targetUid]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser63") color:[UIColor whiteColor] font:kRoomMessageDefalutFont]]; - } else if (attachment.second == Custom_Message_Sub_Room_Play_Dating_Result_Not_Mutual) {///不是互选 - DatingInfoModel * datingModel = [DatingInfoModel modelWithDictionary:attachment.data]; - NSString * nick = datingModel.nickname ? datingModel.nickname : @""; - [attribute appendAttributedString:[self createNickAtrribute:nick uid:datingModel.uid]]; - if (datingModel.hasSelectUser) {//选择的有人 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser64") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - NSString * targetNick = datingModel.targetNickname ? datingModel.targetNickname : @""; - [attribute appendAttributedString:[self createNickAtrribute:targetNick uid:datingModel.targetUid]]; - } else {///没有选择人 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser65") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } - } - messageInfo.content = attribute; - return messageInfo; -} - -#pragma mark - 排麦 -- (XPMessageInfoModel *)createArrangeMicAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser66") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - if (attachment.second == Custom_Message_Sub_Arrange_Mic_Mode_Open) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser67") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser68") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } else if (attachment.second == Custom_Message_Sub_Arrange_Mic_Mode_Close) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser69") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser70") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } else if (attachment.second == Custom_Message_Sub_Arrange_Mic_Free_Mic_Open) { - NSDictionary * dic = attachment.data; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser71") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser72"), ((NSNumber *)dic[@"micPos"]).intValue + 1 ] color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser73") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } else if (attachment.second == Custom_Message_Sub_Arrange_Mic_Free_Mic_Close) { - NSDictionary * dic = attachment.data; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser74") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser75"), ((NSNumber *)dic[@"micPos"]).intValue + 1 ] color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser76") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -#pragma mark - 糖果树公屏消息 -- (XPMessageInfoModel *)createCandyTreeHighLevelAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - - CandyTreeGiftInfoModel * giftInfo = [CandyTreeGiftInfoModel modelWithDictionary:attachment.data]; - //action - NSString *text = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser77"),giftInfo.nick,giftInfo.prizeName,[NSString stringWithFormat:@" X %d", giftInfo.prizeNum]]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithAttributedString:[self createTextAttribute:text color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - - [attribute addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:kRoomMessageDefalutFont],NSForegroundColorAttributeName:[DJDKMIMOMColor messageNickColor],NSParagraphStyleAttributeName:[self paragraphStyle]} range:[text rangeOfString:giftInfo.nick]]; - - [attribute addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:kRoomMessageDefalutFont],NSForegroundColorAttributeName:[DJDKMIMOMColor messageTextColor],NSParagraphStyleAttributeName:[self paragraphStyle]} range:[text rangeOfString:giftInfo.prizeName]]; - - if (giftInfo.prizeNum > 1) { - [attribute addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:kRoomMessageDefalutFont],NSForegroundColorAttributeName:[DJDKMIMOMColor messageTextColor],NSParagraphStyleAttributeName:[self paragraphStyle]} range:[text rangeOfString:[NSString stringWithFormat:@" X %d", giftInfo.prizeNum]]]; - } - - if (attachment.second == Custom_Message_Sub_Candy_Tree_Me && giftInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser79") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } - - [self attributeAddHihtLight:attribute uid:giftInfo.uid.integerValue]; - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -#pragma mark - VIP -- (XPMessageInfoModel *)createNobleLevelAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - NSInteger uid = 0; - if ([attachment.data[@"uid"] isKindOfClass:[NSNumber class]]) { - uid = ((NSNumber *)attachment.data[@"uid"]).integerValue; - } else if ([attachment.data[@"uid"] isKindOfClass:[NSString class]]) { - uid = ((NSString *)attachment.data[@"uid"]).integerValue; - } - if (attachment.second == Custom_Message_Sub_Room_Open_Noble_VIP) {/// 开通VIP房内消息 851 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser80") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%@(%@)", attachment.data[@"nick"], attachment.data[@"erbanNo"]] color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser81") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:attachment.data[@"currVipName"] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser82") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - } else if (attachment.second == Custom_Message_Sub_Room_Noble_LevelUp || attachment.second == Custom_Message_Sub_AllRoom_Noble_LevelUp_Suspend) {///VIP升级 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser83") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:attachment.data[@"nick"] color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser84") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:attachment.data[@"currVipName"] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:@"！" color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - } - [self attributeAddHihtLight:attribute uid:uid]; - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -#pragma mark - 塔罗 -- (XPMessageInfoModel *)createTarotAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - if (attachment.second == Custom_Message_Sub_Tarot_Novice || attachment.second == Custom_Message_Sub_Tarot_Advanced || attachment.second == Custom_Message_Sub_Tarot_Intermediate) { - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser85") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:attachment.data[@"nick"] color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - NSString *text = [NSString stringWithFormat:@" %@", YMLocalizedString(@"XPRoomMessageParser125")]; - [attribute appendAttributedString:[self createTextAttribute:text color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - if ([attachment.data[@"drawGoldNum"] intValue] > 1) { - - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%d",[attachment.data[@"drawGoldNum"] intValue]] color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - - } - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPNobleCenterPayView1") color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - - } - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -#pragma mark - 个播粉丝团 -- (XPMessageInfoModel *)createAnchorFansTeamAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - NSInteger uid = 0; - if ([attachment.data[@"uid"] isKindOfClass:[NSNumber class]]) { - uid = ((NSNumber *)attachment.data[@"uid"]).integerValue; - } else if ([attachment.data[@"uid"] isKindOfClass:[NSString class]]) { - uid = ((NSString *)attachment.data[@"uid"]).integerValue; - } - NSString *idString = [NSString stringWithFormat:@"%ld", uid]; - NSString *nickName = attachment.data[@"nickname"]; - if ([idString isEqualToString:[[AccountInfoStorage instance] getUid]]) { - nickName = YMLocalizedString(@"XPRoomMessageParser86"); - } - if (attachment.second == Custom_Message_Sub_FansTeam_Open_Success) {/// 开通粉丝团成功 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser87") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:nickName color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser88") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - } else if (attachment.second == Custom_Message_Sub_FansTeam_Join_Success) {///加入粉丝团 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser89") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:nickName color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser90") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - } else if (attachment.second == Custom_Message_Sub_FansTeam_Out_Success) {//退出粉丝团 - [attribute appendAttributedString:[self createTextAttribute:nickName color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser91") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - } - [self attributeAddHihtLight:attribute uid:uid]; - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -#pragma mark - 踢出房间/拉黑/下麦 -- (XPMessageInfoModel *)createKickUserAttribute:(AttachmentModel *)attachment info:(XPKickUserModel *)info messageInfo:(XPMessageInfoModel *)messageInfo{ - - NSString * content= @""; - NSString * targetName = [NSString isEmpty:info.targetNick] ? @"" : info.targetNick; - NSString * handleName = [NSString isEmpty:info.handleNick] ? @"" : info.handleNick; - if (attachment.second == Custom_Message_Sub_Kick_BeKicked || attachment.second == Custom_Message_Sub_Hall_Super_Admin_Kick_Manager_Out_Room) { - content = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser93"),targetName,handleName]; - } else if(attachment.second == Custom_Message_Sub_Kick_BlackList) { - content = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser94"),targetName,handleName]; - } else if(attachment.second == Custom_Message_Sub_Queue_Kick) { - content = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser95"),targetName,handleName]; - } - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:content attributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor messageDefaultTextColor],NSFontAttributeName:[UIFont systemFontOfSize:kRoomMessageDefalutFont]}]; - if (![NSString isEmpty:targetName]) { - [attribute addAttributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor messageNickColor],NSFontAttributeName:[UIFont systemFontOfSize:kRoomMessageDefalutFont]} range:[content rangeOfString:targetName]]; - [self attributeAddHihtLight:attribute range:[content rangeOfString:targetName] uid:info.targetUid]; - } - if (![NSString isEmpty:handleName]) { - [attribute addAttributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor messageNickColor],NSFontAttributeName:[UIFont systemFontOfSize:kRoomMessageDefalutFont]} range:[content rangeOfString:handleName]]; - [self attributeAddHihtLight:attribute range:[content rangeOfString:handleName] uid:info.handleUid]; - } - - messageInfo.content = attribute; - return messageInfo; -} - - -#pragma mark - 分享房间 -- (XPMessageInfoModel *)createShareOrAttentionRoomAttribute:(AttachmentModel *)attachment sendInfo:(XPMessageRemoteExtModel *)sendInfo uid:(NSString *)uid messageInfo:(XPMessageInfoModel *)messageInfo{ - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - NSDictionary *data = attachment.data; - NSString *nick = [NSString stringWithFormat:@"%@",data[@"nick"]]; - [attribute appendAttributedString:[self createTextAttribute:nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - NSString *tipString = @""; - if (attachment.second == Custom_Message_Sub_Room_Tip_ShareRoom) { - tipString = YMLocalizedString(@"XPRoomMessageParser96"); - }else if (attachment.second == Custom_Message_Sub_Room_Tip_Attention_Owner) { - tipString = YMLocalizedString(@"XPRoomMessageParser97"); - } - [attribute appendAttributedString:[self createTextAttribute:tipString color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [self attributeAddHihtLight:attribute uid:uid.integerValue]; - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -#pragma mark - 送礼物的公屏 -- (XPMessageInfoModel *)createBatchMicroSendGiftAttribute:(AttachmentModel *)attachment sendInfo:(XPMessageRemoteExtModel *)sendInfo messageInfo:(XPMessageInfoModel *)messageInfo{ - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - GiftReceiveInfoModel *info = [GiftReceiveInfoModel modelWithJSON:attachment.data]; - GiftInfoModel *giftInfo = info.gift == nil ? info.giftInfo : info.gift; - if (giftInfo == nil) { - NSString *roomUid = info.roomUid == 0 ? info.uid : @(info.roomUid).stringValue; - giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:info.giftId inRoom:roomUid]; - } - - ///官方新用户 - [attribute appendAttributedString:[self createOfficalAndNewuserAttribute:sendInfo.defUser newUser:sendInfo.newUser fromSayHelloChannel:sendInfo.fromSayHelloChannel]]; - //nick - [attribute appendAttributedString:[self createNickAtrribute:info.nick uid:info.uid.integerValue]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - if (attachment.second == Custom_Message_Sub_AllBatchSend || attachment.second == Custom_Message_Sub_AllMicroSend) {///普通礼物 - if (attachment.second == Custom_Message_Sub_AllBatchSend) { - //打赏 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser98") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - for (int i = 0; i < info.targetUsers.count; i++) { - GiftReceiveUserInfoModel *targetInfo = [info.targetUsers xpSafeObjectAtIndex:i]; - //nick - [attribute appendAttributedString:[self createNickAtrribute:targetInfo.nick uid:targetInfo.uid]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - if (i < (info.targetUsers.count -1)) { - //nick - [attribute appendAttributedString:[self createTextAttribute:@"," color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - } - } else { - //打赏 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser99") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - - //img - if (giftInfo.giftUrl) { - [attribute appendAttributedString:[self createUrlImageAttribute:giftInfo.giftUrl size:CGSizeMake(40, 40)]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - - //x N - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@" X%ld",info.giftNum] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } else if(attachment.second == Custom_Message_Sub_AllMicroLuckySend || attachment.second == Custom_Message_Sub_AllBatchMicroLuckySend) {///福袋礼物 - //action - NSString * sendTitle = YMLocalizedString(@"XPRoomMessageParser100"); - if (attachment.second == Custom_Message_Sub_AllMicroLuckySend) { - sendTitle = YMLocalizedString(@"XPRoomMessageParser101"); - } - //打赏 - [attribute appendAttributedString:[self createTextAttribute:sendTitle color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - - // 福袋名称 - [attribute appendAttributedString:[self createTextAttribute:info.giftName color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - - // 福袋名称 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser102") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - if (info.luckyGiftList) { - //target - [attribute appendAttributedString:[self createNickAtrribute:info.luckyGiftList.user.nick uid:info.luckyGiftList.user.uid]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - - // 福袋名称 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser103") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - - [info.luckyGiftList.giftList enumerateObjectsUsingBlock:^(GiftListsInfo * _Nonnull giftListInfo, NSUInteger idx, BOOL * _Nonnull stop) { - NSString *roomUid = info.roomUid == 0 ? info.uid : @(info.roomUid).stringValue; - GiftInfoModel *luckGiftInfo = [[XPGiftStorage shareStorage] findGiftInfo:[NSString stringWithFormat:@"%ld", giftListInfo.giftId] - inRoom:roomUid]; - // 价值 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser104") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - // 礼物价格 - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%ld",(NSInteger)luckGiftInfo.goldPrice] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - // 的礼物 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser105") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - //img - [attribute appendAttributedString:[self createUrlImageAttribute:luckGiftInfo.giftUrl]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - - //x N - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@" X%ld",giftListInfo.giftNum] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - if (info.luckyGiftList.giftList.count-1 != idx) { - //, - [attribute appendAttributedString:[self createTextAttribute:@"," color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - } - }]; - } - } - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -- (XPMessageInfoModel *)createSendGiftAttribute:(AttachmentModel *)attachment sendInfo:(XPMessageRemoteExtModel *)sendInfo messageInfo:(XPMessageInfoModel *)messageInfo{ - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - GiftReceiveInfoModel *info = [GiftReceiveInfoModel modelWithJSON:attachment.data]; - GiftInfoModel *giftInfo = info.gift == nil ? info.giftInfo : info.gift; - if (giftInfo == nil) { - giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:info.giftId inRoom:@(info.roomUid).stringValue]; - } - if (giftInfo == nil) { - giftInfo = [info.displayGift xpSafeObjectAtIndex:0]; - } - ///官方新用户 - [attribute appendAttributedString:[self createOfficalAndNewuserAttribute:sendInfo.defUser newUser:sendInfo.newUser fromSayHelloChannel:sendInfo.fromSayHelloChannel]]; - //nick - [attribute appendAttributedString:[self createNickAtrribute:info.nick uid:info.uid.integerValue]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - if (attachment.second == Custom_Message_Sub_Gift_LuckySend) { - //action - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser106") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - // 福袋名称 - [attribute appendAttributedString:[self createTextAttribute:info.giftName color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser107") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - //target - [attribute appendAttributedString:[self createNickAtrribute:info.luckyGiftList.user.nick uid:info.luckyGiftList.user.uid]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - //lucky - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser108") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [info.luckyGiftList.giftList enumerateObjectsUsingBlock:^(GiftListsInfo * _Nonnull giftListInfo, NSUInteger idx, BOOL * _Nonnull stop) { - GiftInfoModel *luckyGiftInfo = [[XPGiftStorage shareStorage] findGiftInfo:[NSString stringWithFormat:@"%ld", giftListInfo.giftId] - inRoom:@(info.roomUid).stringValue]; - if (luckyGiftInfo == nil) { - luckyGiftInfo = giftInfo; - } - // 价值 - [attribute appendAttributedString: [self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser109") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - // 礼物价格 - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%ld",(NSInteger)luckyGiftInfo.goldPrice] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - // 的礼物 - [attribute appendAttributedString: [self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser110") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - //img - [attribute appendAttributedString:[self createUrlImageAttribute:luckyGiftInfo.giftUrl]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - //x N - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@" X%ld",giftListInfo.giftNum] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - if (info.luckyGiftList.giftList.count-1 != idx) { - //, - [attribute appendAttributedString: [self createTextAttribute:@"," color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - } - }]; - } else { - //打赏 - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser111") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - //target - [attribute appendAttributedString: [self createNickAtrribute:info.targetNick uid:info.targetUid.integerValue]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - //img - [attribute appendAttributedString:[self createUrlImageAttribute:giftInfo.giftUrl size:CGSizeMake(40, 40)]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - //x N - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@" X%ld",info.giftNum] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; - } - messageInfo.content = attribute; - messageInfo.first = attachment.first; - return messageInfo; -} - -#pragma mark - Commond Mehotd -///用户是否当前房间的超管 -- (BOOL)isCurrentRoomSuperAdmin:(NSString *)uid { - for (GuildSuperAdminInfoModel *info in self.hostDelegate.getRoomSuperAdminList) { - if ([info.uid isEqualToString:uid]) { - return YES; - } - } - return NO; -} - -- (NSAttributedString *)createOfficalAndNewuserAttribute:(UserLevelType)levelType newUser:(BOOL)newUser fromSayHelloChannel:(BOOL)fromSayHelloChannel{ - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - //offical - if (levelType == UserLevelType_Offical) { - [attribute appendAttributedString: [self createLocalImageAttribute:@"app_admin_icon"]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - if (newUser) { - if (fromSayHelloChannel) { - [attribute appendAttributedString:[self createLanguageImageAttribute:@"room_new_user_greet_new"]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } else { - [attribute appendAttributedString: [self createLocalImageAttribute:[UIImage getLanguageText:@"common_new_user"]]]; - [attribute appendAttributedString:[self createSapceAttribute:2]]; - } - } - return attribute; -} - -///名字点击的 -- (NSMutableAttributedString *)createNickAtrribute:(NSString *)nick uid:(NSInteger)uid { - NSMutableAttributedString * attribute = [self createTextAttribute:nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]; - [self attributeAddHihtLight:attribute uid:uid]; - return attribute; -} -- (void)attributeAddHihtLight:(NSMutableAttributedString *)attribute range:(NSRange)range uid:(NSInteger)uid { - @kWeakify(self); - [attribute yy_setTextHighlightRange:range color:nil backgroundColor:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - @kStrongify(self); - if (uid <= 0) {return;} - [self showUserCard:uid]; - }]; -} -- (void)attributeAddHihtLight:(NSMutableAttributedString *)attribute uid:(NSInteger)uid { - @kWeakify(self); - [attribute yy_setTextHighlightRange:NSMakeRange(0, attribute.length) color:nil backgroundColor:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - @kStrongify(self); - if (uid <= 0) {return;} - [self showUserCard:uid]; - }]; -} - -- (void)attributeAddLongPressHihtLight:(NSMutableAttributedString *)attribute uid:(NSString *)uid nick:(NSString *)nick { - @kWeakify(self); - [attribute yy_setTextHighlightRange:NSMakeRange(0, attribute.length) color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - @kStrongify(self); - if (uid <= 0) {return;} - [self showUserCard:uid.integerValue]; - } longPressAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - @kStrongify(self); - if ([uid isEqualToString:[AccountInfoStorage instance].getUid] || uid.length < 1) { - return; - } - UIViewController *vc = self.hostDelegate.getCurrentNav.viewControllers[0]; - [XPRoomSendTextView showTextView:vc.view delegate:self.hostDelegate atUid:uid atNick:nick]; - }]; -} - - -- (void)showUserCard:(NSInteger)uid { - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - NSString * targetUid = [NSString stringWithFormat:@"%ld", uid]; - XPUserCardInfoModel * model = [[XPUserCardInfoModel alloc] init]; - __block MicroQueueModel *micModel = nil; - [[self.hostDelegate.getMicroQueue allValues] enumerateObjectsUsingBlock:^(MicroQueueModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (uid == obj.userInfo.uid) { - model.position = [NSString stringWithFormat:@"%d", obj.microState.position]; - model.posState = obj.microState.posState; - model.micState = obj.microState.micState; - model.platformRole = obj.userInfo.platformRole; - micModel = obj; - *stop = YES; - } - }]; - model.nick = self.hostDelegate.getUserInfo.nick; - model.uid = targetUid; - model.micQueue = self.hostDelegate.getMicroQueue; - model.roomInfo = roomInfo; - model.delegate = self.hostDelegate; - model.superMangerList = self.hostDelegate.getRoomSuperAdminList; - model.platformRole = micModel.userInfo.platformRole; - UserRoomCardViewController *vc = [[UserRoomCardViewController alloc] initWithUser:model controlUser:self.hostDelegate.getUserInfo]; - [self.hostDelegate.getCurrentNav presentViewController:vc animated:YES completion:nil]; -} - -#pragma mark - private base methods -///铭牌 -- (NSMutableAttributedString *)createNameplateAttibute:(NSString *)tagName - image:(NSString *)imageName - textFont:(UIFont *)textFont { - NetImageConfig *config = [[NetImageConfig alloc]init]; - ///先这样吧 - CGSize defaultSize = CGSizeMake(60, kFontRegular(kRoomMessageDefalutFont).lineHeight); - config.autoLoad = YES; - NetImageView *imageView = [[NetImageView alloc] initWithUrl:imageName config:config]; - imageView.bounds = CGRectMake(0, 0, defaultSize.width, defaultSize.height); - - // 异步加载图片 -// @kWeakify(self); - [imageView loadImageWithUrl:imageName completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { -// @kStrongify(self); - if (image) { - CGFloat scale = image.size.width / image.size.height; - CGSize newSize = scale > 0 ? CGSizeMake(60 * scale, kFontRegular(kRoomMessageDefalutFont).lineHeight) : defaultSize; - dispatch_async(dispatch_get_main_queue(), ^{ - imageView.bounds = CGRectMake(0, 0, newSize.width, newSize.height); - }); - } - }]; -// [imageView loadImageWithUrl:imageName completion:^(UIImage * _Nullable loadedImage) { -// @kStrongify(self); -// if (loadedImage) { -// CGFloat scale = loadedImage.size.width / loadedImage.size.height; -// CGSize newSize = scale > 0 ? CGSizeMake(18 * scale, 18) : defaultSize; -// dispatch_async(dispatch_get_main_queue(), ^{ -// imageView.bounds = CGRectMake(0, 0, newSize.width, newSize.height); -// }); -// } -// }]; - -// UIImage* image = imageView.image; -// if (image) { -// CGFloat scale = image.size.width / image.size.height; -// } else { -// NSURL *imgUrl = [NSURL URLWithString:imageName]; -// UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]]; -// if (myImage) { -// CGFloat scale = myImage.size.width / myImage.size.height; -// if (scale == 0) { -// imageView.bounds = CGRectMake(0, 0, 60, 18); -// }else { -// imageView.bounds = CGRectMake(0, 0, 18* scale, 18); -// } -// } else { -// imageView.bounds = CGRectMake(0, 0, 60, 18); -// } -// } - - imageView.contentMode = UIViewContentModeScaleAspectFit; - // 铭牌文字 - if (![NSString isEmpty:tagName]) { - UILabel *label = [[UILabel alloc] init]; - label.textAlignment = NSTextAlignmentCenter; - label.font = [UIFont boldSystemFontOfSize:12]; - label.adjustsFontSizeToFitWidth = YES; - label.textColor = UIColor.whiteColor; - label.text = tagName; - [imageView addSubview:label]; - [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(27); - make.trailing.mas_equalTo(-8); - make.centerY.mas_equalTo(0); - }]; - } - - NSMutableAttributedString *string = [NSMutableAttributedString yy_attachmentStringWithContent:imageView - contentMode:UIViewContentModeScaleAspectFit - attachmentSize:imageView.bounds.size - alignToFont:kFontRegular(kRoomMessageDefalutFont) - alignment:YYTextVerticalAlignmentCenter]; - return string; -} - - -/// 生成一个图片的富文本 -/// @param imageUrl 网络图片的地址 -- (NSMutableAttributedString *)createUrlImageAttribute:(NSString *)imageUrl { - NetImageConfig *config = [[NetImageConfig alloc]init]; - ///先这样吧 - config.autoLoad = YES; - NetImageView *imageView = [[NetImageView alloc]initWithUrl:imageUrl config:config]; - UIImage* image = imageView.image; - if (image) { - CGFloat scale = image.size.width / image.size.height; - imageView.bounds = CGRectMake(0, 0, kFontRegular(kRoomMessageDefalutFont).lineHeight * scale, kFontRegular(kRoomMessageDefalutFont).lineHeight); - } else { - imageView.bounds = CGRectMake(0, 0, kFontRegular(kRoomMessageDefalutFont).lineHeight, kFontRegular(kRoomMessageDefalutFont).lineHeight); - } - imageView.layer.masksToBounds = YES; - imageView.contentMode = UIViewContentModeScaleAspectFit; - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageView.bounds.size.width, imageView.bounds.size.height) alignToFont:kFontRegular(kRoomMessageDefalutFont) alignment:YYTextVerticalAlignmentCenter]; - return attrString; -} -/// 生成一个图片的富文本 -/// @param imageUrl 网络图片的地址 -- (NSMutableAttributedString *)createUrlImageAttribute:(NSString *)imageUrl size:(CGSize)size { - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.autoLoad = YES; - NetImageView *imageView = [[NetImageView alloc] initWithUrl:imageUrl config:config]; - imageView.backgroundColor = [UIColor clearColor]; - imageView.bounds = CGRectMake(0, 0, size.width, size.height); - imageView.layer.masksToBounds = YES; - imageView.contentMode = UIViewContentModeScaleAspectFit; - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageView.bounds.size.width, imageView.bounds.size.height) alignToFont:kFontRegular(kRoomMessageDefalutFont) alignment:YYTextVerticalAlignmentCenter]; - return attrString; -} - -/// 生成本地一个图片的富文本 -/// @param imageName 网络图片的地址 -- (NSMutableAttributedString *)createLocalImageAttribute:(NSString *)imageName { - if (imageName == nil && imageName.length <= 0) { - return nil; - } - UIImageView *imaveView = [[UIImageView alloc]init]; - imaveView.image = [UIImage imageNamed:imageName]; - CGFloat scale = (CGFloat)imaveView.image.size.width / (CGFloat)imaveView.image.size.height; - imaveView.bounds = CGRectMake(0, 0, kFontRegular(kRoomMessageDefalutFont).lineHeight * scale, kFontRegular(kRoomMessageDefalutFont).lineHeight); - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imaveView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imaveView.frame.size.width, imaveView.frame.size.height) alignToFont:kFontRegular(kRoomMessageDefalutFont) alignment:YYTextVerticalAlignmentCenter]; - return attrString; - -} -/// 生成本地一个图片的富文本 -/// @param imageName 网络图片的地址 -- (NSMutableAttributedString *)createLanguageImageAttribute:(NSString *)imageName { - if (imageName == nil && imageName.length <= 0) { - return nil; - } - UIImageView *imaveView = [[UIImageView alloc]init]; - imaveView.image = [UIImage getLanguageImage:imageName]; - CGFloat scale = (CGFloat)imaveView.image.size.width / (CGFloat)imaveView.image.size.height; - imaveView.bounds = CGRectMake(0, 0, kFontRegular(kRoomMessageDefalutFont).lineHeight * scale, kFontRegular(kRoomMessageDefalutFont).lineHeight); - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imaveView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imaveView.frame.size.width, imaveView.frame.size.height) alignToFont:kFontRegular(kRoomMessageDefalutFont) alignment:YYTextVerticalAlignmentCenter]; - return attrString; - -} -/// 生成本地一个图片的富文本 -/// @param image 本地的图片 -- (NSMutableAttributedString *)createImageAttribute:(UIImage *)image { - UIImageView *imaveView = [[UIImageView alloc]init]; - imaveView.image = image; - CGFloat scale = (CGFloat)imaveView.image.size.width / (CGFloat)imaveView.image.size.height; - imaveView.bounds = CGRectMake(0, 0, kFontRegular(kRoomMessageDefalutFont).lineHeight * scale, kFontRegular(kRoomMessageDefalutFont).lineHeight); - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imaveView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imaveView.frame.size.width, imaveView.frame.size.height) alignToFont:kFontRegular(kRoomMessageDefalutFont) alignment:YYTextVerticalAlignmentCenter]; - return attrString; -} - -- (NSMutableAttributedString *)createImageAttribute:(UIImage *)image size:(CGSize)size{ - UIImageView *imaveView = [[UIImageView alloc]init]; - imaveView.image = image; -// CGFloat scale = (CGFloat)imaveView.image.size.width / (CGFloat)imaveView.image.size.height; - imaveView.bounds = CGRectMake(0, - 0, - size.width, - size.height); - NSMutableAttributedString * attrString = [NSMutableAttributedString yy_attachmentStringWithContent:imaveView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imaveView.frame.size.width, imaveView.frame.size.height) alignToFont:kFontRegular(kRoomMessageDefalutFont) alignment:YYTextVerticalAlignmentCenter]; - return attrString; -} - -/// 生成一个富文本 -/// @param text 富文本的文字 -/// @param color 文字的颜色 -/// @param font 文字的大小 -- (NSMutableAttributedString *)createTextAttribute:(NSString *)text color:(UIColor *)color font:(CGFloat)font { - if (text == nil || text.length <= 0) { - text = @""; - } - NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithString:text attributes:nil]; - attribute.yy_font = [UIFont systemFontOfSize:font]; - attribute.yy_color = color; - attribute.yy_paragraphStyle = [self paragraphStyle]; - return attribute; -} - -/// 设置文本的样式 间隙 缩进 ... -- (NSMutableParagraphStyle *)paragraphStyle { - NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init]; - paraStyle.lineSpacing = 4.0f;//行间距 - // 强制排版(从左到右) - paraStyle.alignment = NSTextAlignmentNatural; - paraStyle.baseWritingDirection = isMSRTL() ? NSWritingDirectionRightToLeft : NSWritingDirectionLeftToRight; - return paraStyle; -} - -/// 占位的富文本 -/// @param width 需要的间隙 -- (NSMutableAttributedString *)createSapceAttribute:(CGFloat)width { - UIView *spaceView = [[UIView alloc]init]; - spaceView.backgroundColor = [UIColor clearColor]; - spaceView.bounds = CGRectMake(0, 0, width, kFontRegular(kRoomMessageDefalutFont).lineHeight); - NSMutableAttributedString * attribute = [NSMutableAttributedString yy_attachmentStringWithContent:spaceView contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(spaceView.frame.size.width, spaceView.frame.size.height) alignToFont:kFontRegular(kRoomMessageDefalutFont) alignment:YYTextVerticalAlignmentCenter]; - return attribute; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.h b/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.h deleted file mode 100644 index 199450e..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// PIRoomMessagePhotoAlbumCell.h -// YuMi -// -// Created by duoban on 2023/10/12. -// - -#import -#import "RoomInfoModel.h" -#import "PIRoomPhotoAlbumItemModel.h" -@class PIRoomMessagePhotoAlbumCell,XPNetImageYYLabel, XPMessageInfoModel,XPRoomMessageParser, YYLabel,XPMessageInfoModel; - -@protocol PIRoomMessagePhotoAlbumCellDelegate - -- (void)pIRoomMessagePhotoAlbumCellDelegateDidTapEmpty:(PIRoomMessagePhotoAlbumCell *_Nonnull)view; -///解锁 --(void)unlockAlbumHandleWithInfo:(PIRoomPhotoAlbumItemModel *_Nonnull)info; -///查看图片 --(void)pIRoomMessagePhotoAlbumCell:(PIRoomMessagePhotoAlbumCell *_Nonnull)cell lookUpAlbumPhotoWithAlbumModel:(PIRoomPhotoAlbumItemModel *_Nonnull)albumModel; -///查看资料卡 --(void)pIRoomMessagePhotoAlbumCell:(PIRoomMessagePhotoAlbumCell *_Nonnull)cell lookUpUserCardModel:(PIRoomPhotoAlbumItemModel *_Nonnull)albumModel; -@end -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomMessagePhotoAlbumCell : UITableViewCell - -///当前房间的类型 -@property (nonatomic,assign) RoomType roomType; - -@property (nonatomic,strong) XPMessageInfoModel *messageInfo; - -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.m deleted file mode 100644 index d6ed34a..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.m +++ /dev/null @@ -1,252 +0,0 @@ -// -// PIRoomMessagePhotoAlbumCell.m -// YuMi -// -// Created by duoban on 2023/10/12. -// - -#import "PIRoomMessagePhotoAlbumCell.h" -///Third -#import -#import "XPNetImageYYLabel.h" -#import "NetImageView.h" -///Tool -#import "YUMIMacroUitls.h" -#import "ThemeColor+Room.h" -#import "UIImage+Utils.h" -#import "XPMessageInfoModel.h" -#import "XPNetImageYYLabel.h" - -#import "PIRoomMessagePhotoAlbumView.h" -#import "XPRoomMessageConstant.h" -#import "XPSkillCardPlayerManager.h" -@interface PIRoomMessagePhotoAlbumCell() -///气泡 -@property (nonatomic,strong) NetImageView *bubbleImageView; -///昵称 -@property(nonatomic,strong) XPNetImageYYLabel *nameView; - -///解锁的图片 -@property(nonatomic,strong) PIRoomMessagePhotoAlbumView *unlockPhotoView; -///点击空白区域的手势 -@property (nonatomic,strong) UITapGestureRecognizer *tapEmptyRecognizer; -///数据 -@property(nonatomic,strong) PIRoomPhotoAlbumItemModel *albumModel; -///查看个人资料卡 -@property(nonatomic,strong) UIButton *loopUserCardBtn; -@end -@implementation PIRoomMessagePhotoAlbumCell --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} --(instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{ - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if(self){ - [self installUI]; - [self installConstraints]; - - } - return self; -} - --(void)installUI{ - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(updateUnlockRoomAlbumPhotoList) name:@"kGetgetUnlockRoomAlbumPhotoListNot" object:nil]; - - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - - [self.contentView addSubview:self.bubbleImageView]; - [self.contentView addSubview:self.nameView]; -// [self.contentView addSubview:self.loopUserCardBtn]; - [self.contentView addSubview:self.unlockPhotoView]; - - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTap)]; - tap.delegate = self; - self.tapEmptyRecognizer = tap; - [self.contentView addGestureRecognizer:self.tapEmptyRecognizer]; -} --(void)updateUnlockRoomAlbumPhotoList{ - if([[XPSkillCardPlayerManager shareInstance].photoIdList containsObject:self.albumModel.ID] && ![self.albumModel.uid isEqualToString:[AccountInfoStorage instance].getUid] && self.albumModel.type.intValue == 2) { - self.albumModel.status = 1; - self.unlockPhotoView.albumModel = self.albumModel; - }else{ - if(self.albumModel != nil){ - self.albumModel.status = 0; - self.unlockPhotoView.albumModel = self.albumModel; - } - } -} --(void)installConstraints{ - [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.trailing.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView).offset(-6); - }]; - - [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bubbleImageView).offset(8); - make.leading.mas_equalTo(self.bubbleImageView).offset(8); - make.trailing.mas_equalTo(self.bubbleImageView).offset(-12); - }]; - - [self.unlockPhotoView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bubbleImageView).offset(37); - make.bottom.mas_equalTo(self.bubbleImageView).offset(-6); - make.leading.mas_equalTo(self.bubbleImageView).inset(12); - make.width.mas_equalTo(self.unlockPhotoView.mas_height); - }]; - -} -#pragma mark - tool -- (UIImage*)resizableImage:(UIImage *)image { - //图片拉伸区域 - CGFloat top = (image.size.height - 1) / 2; - CGFloat left = (image.size.width - 1) / 2; - CGFloat right = (image.size.width - 1) / 2; - CGFloat bottom = (image.size.height - 1) / 2; - return [image resizableImageWithCapInsets:UIEdgeInsetsMake(top, left, bottom, right) resizingMode:UIImageResizingModeStretch]; -} -#pragma mark - UIGestureRecognizerDelegate -- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch { - if (gestureRecognizer == self.tapEmptyRecognizer) { - if (touch.view == self.bubbleImageView) { - return NO; - } - } - return YES; -} - -#pragma mark - Event Response -- (void)didTap { - if (self.delegate && [self.delegate respondsToSelector:@selector(pIRoomMessagePhotoAlbumCellDelegateDidTapEmpty:)]) { - [self.delegate pIRoomMessagePhotoAlbumCellDelegateDidTapEmpty:self]; - } -} -- (UIImage *)scaleToSize:(UIImage *)img { - // 创建一个bitmap的context - // 并把它设置成为当前正在使用的context - CGFloat width = img.size.width * 0.5; - CGFloat height = img.size.height * 0.5; - UIGraphicsBeginImageContextWithOptions(CGSizeMake(width, height), NO, 1); - // 绘制改变大小的图片 - [img drawInRect:CGRectMake(0, 0, width, height)]; - // 从当前context中创建一个改变大小后的图片 - UIImage* scaledImage = UIGraphicsGetImageFromCurrentImageContext(); - // 使当前的context出堆栈 - UIGraphicsEndImageContext(); - // 返回新的改变大小后的图片 - return scaledImage; -} - -- (void)setRoomType:(RoomType)roomType { - _roomType = roomType; - if (self.messageInfo.bubbleImageUrl.length > 0) { - return; - } - if (_roomType == RoomType_MiniGame) { - _bubbleImageView.image = [UIImage imageWithColor:[UIColor colorWithWhite:1 alpha:0.2]]; - } else { - _bubbleImageView.image = [UIImage imageWithColor:[DJDKMIMOMColor messageBubbleColor]]; - } -} -- (void)setMessageInfo:(XPMessageInfoModel *)messageInfo { - _messageInfo = messageInfo; - if (_messageInfo) { - PIRoomPhotoAlbumItemModel *albumModel = _messageInfo.albumModel; - if([[XPSkillCardPlayerManager shareInstance].photoIdList containsObject:albumModel.ID] && ![albumModel.uid isEqualToString:[AccountInfoStorage instance].getUid] && albumModel.type.intValue == 2) { - albumModel.status = 1; - }else{ - albumModel.status = 0; - } - - self.albumModel = albumModel; - self.unlockPhotoView.albumModel = albumModel; - if ([NSString isEmpty:messageInfo.content.string]) { - self.nameView.text = _messageInfo.nameText; - } else { - self.nameView.attributedText = _messageInfo.content; - } - - if (_messageInfo.bubbleImageUrl.length) { - [self.bubbleImageView loadImageWithUrl:_messageInfo.bubbleImageUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp]; - UIImage *cutImage = [image1 cropRightAndBottomPixels:2]; - self.bubbleImageView.image = [self resizableImage:cutImage]; - }]; - } else { - _bubbleImageView.image = [UIImage imageWithColor:[DJDKMIMOMColor messageBubbleColor]]; - } - - _bubbleImageView.hidden = _messageInfo.isHiddenBubble; - } -} -#pragma mark - PIRoomMessagePhotoAlbumViewDelegate -- (void)unlockAlbumHandle{ - if(self.delegate && [self.delegate respondsToSelector:@selector(unlockAlbumHandleWithInfo:)]){ - [self.delegate unlockAlbumHandleWithInfo:self.albumModel]; - } -} --(void)lookUpAlbumPhotoHandle{ - if(self.albumModel.type.intValue == 2 && ![self.albumModel.uid isEqualToString:[AccountInfoStorage instance].getUid] && self.albumModel.status == 0){ - if(self.delegate && [self.delegate respondsToSelector:@selector(unlockAlbumHandleWithInfo:)]){ - [self.delegate unlockAlbumHandleWithInfo:self.albumModel]; - } - return; - } - if(self.delegate && [self.delegate respondsToSelector:@selector(pIRoomMessagePhotoAlbumCell:lookUpAlbumPhotoWithAlbumModel:)]){ - [self.delegate pIRoomMessagePhotoAlbumCell:self lookUpAlbumPhotoWithAlbumModel:self.albumModel]; - } -} --(void)loopUserCardAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(pIRoomMessagePhotoAlbumCell:lookUpUserCardModel:)]){ - [self.delegate pIRoomMessagePhotoAlbumCell:self lookUpUserCardModel:self.albumModel]; - } -} -#pragma mark - 懒加载 -- (NetImageView *)bubbleImageView { - if (!_bubbleImageView) { - _bubbleImageView = [[NetImageView alloc] init]; - _bubbleImageView.layer.masksToBounds = YES; - _bubbleImageView.layer.cornerRadius = 12; - _bubbleImageView.userInteractionEnabled = YES; - - } - return _bubbleImageView; -} - -- (XPNetImageYYLabel *)nameView { - if (!_nameView) { - _nameView = [[XPNetImageYYLabel alloc] init]; - _nameView.preferredMaxLayoutWidth = kRoomMessageMaxWidth; - _nameView.numberOfLines = 0; - _nameView.userInteractionEnabled = YES; - @kWeakify(self); - [_nameView setUpdateLayoutSize:^(CGSize size) { - @kStrongify(self); - [self.unlockPhotoView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bubbleImageView).offset(16 + size.height); - }]; - }]; - } - return _nameView; -} - -- (PIRoomMessagePhotoAlbumView *)unlockPhotoView{ - if(!_unlockPhotoView){ - _unlockPhotoView = [[PIRoomMessagePhotoAlbumView alloc]initWithFrame:CGRectZero]; - _unlockPhotoView.delegate = self; - } - return _unlockPhotoView; -} -- (UIButton *)loopUserCardBtn{ - if(!_loopUserCardBtn){ - _loopUserCardBtn = [UIButton new]; - [_loopUserCardBtn addTarget:self action:@selector(loopUserCardAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _loopUserCardBtn; -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumView.h b/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumView.h deleted file mode 100644 index d92552d..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// PIRoomMessagePhotoAlbumView.h -// YuMi -// -// Created by duoban on 2023/10/12. -// - -#import -#import "PIRoomPhotoAlbumItemModel.h" - -@protocol PIRoomMessagePhotoAlbumViewDelegate -///解锁 --(void)unlockAlbumHandle; -///查看图片 --(void)lookUpAlbumPhotoHandle; -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomMessagePhotoAlbumView : UIView -@property(nonatomic,strong) NSMutableArray *photoIdList; -@property(nonatomic,weak) iddelegate; -@property(nonatomic,strong) PIRoomPhotoAlbumItemModel *albumModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumView.m deleted file mode 100644 index 5f1e7d3..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumView.m +++ /dev/null @@ -1,211 +0,0 @@ -// -// PIRoomMessagePhotoAlbumView.m -// YuMi -// -// Created by duoban on 2023/10/12. -// - -#import "PIRoomMessagePhotoAlbumView.h" -#import "XPSkillCardPlayerManager.h" -@interface PIRoomMessagePhotoAlbumView() -///解锁的图片 -@property(nonatomic,strong) NetImageView *unlockPhotoView; -///蒙层 -@property(nonatomic,strong) UIView *pi_maskView; -///礼物 -@property(nonatomic,strong) NetImageView *giftView; -///钻石icon -@property(nonatomic,strong) UIImageView *diamondView; -///钻石数量 -@property(nonatomic,strong) UILabel *pi_priceView; -///解锁 -@property(nonatomic,strong) UIButton *unlockView; -///已解锁 -@property(nonatomic,strong) UILabel *lockedView; -@end -@implementation PIRoomMessagePhotoAlbumView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.unlockPhotoView]; - [self addSubview:self.lockedView]; - [self.unlockPhotoView addSubview:self.pi_maskView]; - - - [self.pi_maskView addSubview:self.giftView]; - [self.pi_maskView addSubview:self.diamondView]; - [self.pi_maskView addSubview:self.pi_priceView]; - [self.pi_maskView addSubview:self.unlockView]; -} - --(void)installConstraints{ - [self.unlockPhotoView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.lockedView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(48); - make.height.mas_equalTo(24); - make.trailing.bottom.equalTo(self.unlockPhotoView).inset(2); - }]; - [self.pi_maskView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.unlockPhotoView); - make.height.mas_equalTo(28); - }]; - [self.giftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(20); - make.leading.mas_equalTo(6); - make.centerY.equalTo(self.pi_maskView); - }]; - [self.diamondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(14); - make.leading.mas_equalTo(28); - make.centerY.equalTo(self.pi_maskView); - }]; - [self.unlockView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-2); - make.height.mas_equalTo(24); - make.width.mas_equalTo(44); - make.centerY.equalTo(self.pi_maskView); - }]; - [self.pi_priceView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(43); - make.centerY.equalTo(self.pi_maskView); - make.trailing.equalTo(self.unlockView.mas_leading).mas_offset(-5); - }]; -} --(void)setAlbumModel:(PIRoomPhotoAlbumItemModel *)albumModel{ - _albumModel = albumModel; - self.lockedView.hidden = YES; - if(_albumModel.type.intValue == 1){ - self.pi_maskView.hidden = YES; - self.unlockPhotoView.imageUrl = _albumModel.photoUrl; - return; - } - - - _giftView.imageUrl = _albumModel.giftUrl; - _pi_priceView.text = _albumModel.totalGoldPrice; - self.pi_maskView.hidden = NO; - if([_albumModel.uid isEqualToString:[AccountInfoStorage instance].getUid]){ - self.unlockView.hidden = YES; - self.lockedView.hidden = YES; - self.unlockPhotoView.imageUrl = _albumModel.photoUrl; - }else{ - self.unlockView.hidden = _albumModel.status == 1; - self.lockedView.hidden = _albumModel.status == 0; - @kWeakify(self); - if(_albumModel.status == 0){ - [self.unlockPhotoView loadImageWithUrl:_albumModel.photoUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - // UI更新代码 - self.unlockPhotoView.image = [UIImage setBlurImage:image value:30]; - }); - - }]; - }else{ - self.unlockPhotoView.image = nil; - [self.unlockPhotoView loadImageWithUrl:_albumModel.photoUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - self.unlockPhotoView.image = image; - }]; - self.pi_maskView.hidden = YES; - self.lockedView.hidden = NO; - } - } - -} - --(void)unlockAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(unlockAlbumHandle)]){ - [self.delegate unlockAlbumHandle]; - } -} --(void)lookUpPhoto{ - if(self.delegate && [self.delegate respondsToSelector:@selector(lookUpAlbumPhotoHandle)]){ - [self.delegate lookUpAlbumPhotoHandle]; - } -} -#pragma mark - 懒加载 - -- (NetImageView *)unlockPhotoView{ - if(!_unlockPhotoView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _unlockPhotoView = [[NetImageView alloc]initWithConfig:config]; - [_unlockPhotoView setCornerRadius:8]; - _unlockPhotoView.userInteractionEnabled = YES; - _unlockPhotoView.contentMode = UIViewContentModeScaleAspectFill; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(lookUpPhoto)]; - [_unlockPhotoView addGestureRecognizer:tap]; - } - return _unlockPhotoView; -} -- (UIView *)pi_maskView{ - if(!_pi_maskView){ - _pi_maskView = [UIView new]; - _pi_maskView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6]; - [_pi_maskView setCornerWithLeftTopCorner:0 rightTopCorner:kGetScaleWidth(6) bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(138, 28)]; - } - return _pi_maskView; -} -- (NetImageView *)giftView{ - if(!_giftView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _giftView = [[NetImageView alloc]initWithConfig:config]; - _giftView.backgroundColor = UIColorFromRGB(0x001338); - _giftView.layer.cornerRadius = kGetScaleWidth(4); - _giftView.layer.masksToBounds = YES; - _giftView.layer.borderWidth = 0.5; - _giftView.layer.borderColor = UIColorFromRGB(0xD6D6D6).CGColor; - } - return _giftView; -} -- (UIImageView *)diamondView{ - if(!_diamondView){ - _diamondView = [UIImageView new]; - _diamondView.image = kImage(@"moli_money_icon"); - } - return _diamondView; -} -- (UILabel *)pi_priceView{ - if(!_pi_priceView){ - _pi_priceView = [UILabel labelInitWithText:@"0" font:[UIFont systemFontOfSize:12 weight:UIFontWeightRegular] textColor:[UIColor whiteColor]]; - } - return _pi_priceView; -} -- (UIButton *)unlockView{ - if(!_unlockView){ - _unlockView = [UIButton new]; - _unlockView.backgroundColor = UIColorFromRGB(0x9168FA); - [_unlockView setCornerWithLeftTopCorner:6 rightTopCorner:6 bottomLeftCorner:6 bottomRightCorner:6 size:CGSizeMake(44, 24)]; - [_unlockView setTitle:YMLocalizedString(@"PIRoomMessagePhotoAlbumView0") forState:UIControlStateNormal]; - [_unlockView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _unlockView.titleLabel.font = [UIFont systemFontOfSize:11 weight:UIFontWeightRegular]; - [_unlockView addTarget:self action:@selector(unlockAction) forControlEvents:UIControlEventTouchUpInside]; - ; - - } - return _unlockView; -} -- (UILabel *)lockedView{ - if(!_lockedView){ - _lockedView = [UILabel labelInitWithText:YMLocalizedString(@"PIRoomMessagePhotoAlbumView1") font:[UIFont systemFontOfSize:11 weight:UIFontWeightRegular] textColor:UIColorFromRGB(0xffffff)]; - _lockedView.backgroundColor = UIColorRGBAlpha(0x9E9EA8, 0.8); - _lockedView.hidden = YES; - _lockedView.textAlignment = NSTextAlignmentCenter; - [_lockedView setCornerWithLeftTopCorner:6 rightTopCorner:6 bottomLeftCorner:6 bottomRightCorner:6 size:CGSizeMake(48, 24)]; - } - return _lockedView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessageUnlockPhotoAlbumView.h b/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessageUnlockPhotoAlbumView.h deleted file mode 100644 index 030d8c1..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessageUnlockPhotoAlbumView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// PIRoomMessageUnlockPhotoAlbumView.h -// YuMi -// -// Created by duoban on 2023/10/13. -// - -#import -#import "PIRoomPhotoAlbumItemModel.h" - -@protocol PIRoomMessageUnlockPhotoAlbumViewDelegate - --(void)unlockRoomAlbumImageWithAlbumModel:(PIRoomPhotoAlbumItemModel *_Nonnull)albumModel; - -@end - - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomMessageUnlockPhotoAlbumView : UIView -@property(nonatomic,strong) PIRoomPhotoAlbumItemModel *albumModel; -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessageUnlockPhotoAlbumView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessageUnlockPhotoAlbumView.m deleted file mode 100644 index 667b4e8..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessageUnlockPhotoAlbumView.m +++ /dev/null @@ -1,181 +0,0 @@ -// -// PIRoomMessageUnlockPhotoAlbumView.m -// YuMi -// -// Created by duoban on 2023/10/13. -// - -#import "PIRoomMessageUnlockPhotoAlbumView.h" -@interface PIRoomMessageUnlockPhotoAlbumView() -///背景 -@property(nonatomic,strong) UIView *bgView; -///返回 -@property(nonatomic,strong) UIButton *pi_backBtn; -///标题 -@property(nonatomic,strong) UILabel *titleView; -///礼物 -@property(nonatomic,strong) NetImageView *giftView; -///礼物名字 -@property(nonatomic,strong) UILabel *giftNameVeiw; -///礼物价格 -@property(nonatomic,strong) UILabel *giftNumView; -///解锁 -@property(nonatomic,strong) UIButton *unlockView; -@end -@implementation PIRoomMessageUnlockPhotoAlbumView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.bgView]; - [self.bgView addSubview:self.pi_backBtn]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.giftView]; - [self.bgView addSubview:self.giftNameVeiw]; - [self.bgView addSubview:self.giftNumView]; - [self.bgView addSubview:self.unlockView]; -} --(void)installConstraints{ - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(295)); - make.height.mas_equalTo(kGetScaleWidth(285)); - make.center.equalTo(self); - }]; - [self.pi_backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(16)); - make.trailing.mas_equalTo(-kGetScaleWidth(16)); - make.top.mas_equalTo(kGetScaleWidth(14)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(24)); - make.height.mas_equalTo(kGetScaleWidth(22)); - make.centerX.equalTo(self.bgView); - }]; - [self.giftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(80)); - make.top.mas_equalTo(kGetScaleWidth(70)); - make.centerX.equalTo(self.bgView); - }]; - [self.giftNameVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(152)); - make.centerX.equalTo(self.bgView); - make.height.mas_equalTo(kGetScaleWidth(22)); - }]; - [self.giftNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(175)); - make.height.mas_equalTo(kGetScaleWidth(18)); - make.centerX.equalTo(self.bgView); - }]; - [self.unlockView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(249)); - make.height.mas_equalTo(kGetScaleWidth(44)); - make.top.mas_equalTo(kGetScaleWidth(217)); - make.centerX.equalTo(self.bgView); - }]; -} --(void)dissViewAction{ - [TTPopup dismiss]; -} --(void)unlockImageAction{ - [self dissViewAction]; - if(self.delegate && [self.delegate respondsToSelector:@selector(unlockRoomAlbumImageWithAlbumModel:)]){ - [self.delegate unlockRoomAlbumImageWithAlbumModel:self.albumModel]; - } -} -- (void)setAlbumModel:(PIRoomPhotoAlbumItemModel *)albumModel{ - _albumModel = albumModel; - _giftView.imageUrl = _albumModel.giftUrl; - _giftNameVeiw.text = _albumModel.giftName; - NSMutableAttributedString *numText = [[NSMutableAttributedString alloc]initWithString:_albumModel.totalGoldPrice attributes:@{NSFontAttributeName:kFontRegular(14),NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)}]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"moli_money_icon"];; - attachment.bounds = CGRectMake(0, roundf(_giftNumView.font.capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height); - - attachment.image =iconImage; - NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; - [numText insertAttributedString:starAttribute atIndex:0]; - _giftNumView.attributedText = numText; - -} -#pragma mark - 懒加载 -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(20) rightTopCorner:kGetScaleWidth(20) bottomLeftCorner:kGetScaleWidth(20) bottomRightCorner:kGetScaleWidth(20) size:CGSizeMake(kGetScaleWidth(295), kGetScaleWidth(285))]; - } - return _bgView; -} -- (UIButton *)pi_backBtn{ - if(!_pi_backBtn){ - _pi_backBtn = [UIButton new]; - [_pi_backBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_pi_backBtn setImage:kImage(@"pi_room_photo_album_choose_photo_back") forState:UIControlStateNormal]; - [_pi_backBtn addTarget:self action:@selector(dissViewAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _pi_backBtn; -} -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"PIRoomMessageUnlockPhotoAlbumView0") font:kFontMedium(16) textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _titleView; -} -- (NetImageView *)giftView{ - if(!_giftView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _giftView = [[NetImageView alloc]initWithConfig:config]; - _giftView.backgroundColor = UIColorFromRGB(0x001338); - _giftView.layer.cornerRadius = kGetScaleWidth(10); - _giftView.layer.masksToBounds = YES; - _giftView.layer.borderWidth = 0.5; - _giftView.layer.borderColor = UIColorFromRGB(0xD6D6D6).CGColor; - } - return _giftView; -} -- (UILabel *)giftNameVeiw{ - if(!_giftNameVeiw){ - _giftNameVeiw = [UILabel labelInitWithText:@"" font:kFontRegular(14) textColor:UIColorFromRGB(0x1F1B4F)]; - _giftNameVeiw.textAlignment = NSTextAlignmentCenter; - } - return _giftNameVeiw; -} -- (UILabel *)giftNumView{ - if(!_giftNumView){ - _giftNumView = [UILabel labelInitWithText:@"0" font:kFontRegular(14) textColor:UIColorFromRGB(0x1F1B4F)];; - _giftNumView.textAlignment = NSTextAlignmentCenter; - NSMutableAttributedString *numText = [[NSMutableAttributedString alloc]initWithString:@"0" attributes:@{NSFontAttributeName:kFontRegular(14),NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)}]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"moli_money_icon"];; - attachment.bounds = CGRectMake(0, roundf(_giftNumView.font.capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height); - - attachment.image =iconImage; - NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; - [numText insertAttributedString:starAttribute atIndex:0]; - _giftNumView.attributedText = numText; - } - return _giftNumView; -} -- (UIButton *)unlockView{ - if(!_unlockView){ - _unlockView = [UIButton new]; - [_unlockView setTitle:YMLocalizedString(@"PIRoomMessageUnlockPhotoAlbumView1") forState:UIControlStateNormal]; - [_unlockView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _unlockView.titleLabel.font = kFontMedium(16); - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(249), kGetScaleWidth(44))]; - [_unlockView setBackgroundImage:image forState:UIControlStateNormal]; - _unlockView.layer.cornerRadius = kGetScaleWidth(44)/2; - _unlockView.layer.masksToBounds = YES; - [_unlockView addTarget:self action:@selector(unlockImageAction) forControlEvents:UIControlEventTouchUpInside]; - _unlockView.yn_acceptEventInterval = 1; - } - return _unlockView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/RoomCahtCell.h b/YuMi/Modules/YMRoom/View/MessageContainerView/View/RoomCahtCell.h deleted file mode 100644 index d92bd39..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/RoomCahtCell.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// RoomCahtCell.h -// YuMi -// -// Created by P on 2024/11/28. -// - -#import - -#import "XPMessageInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomCahtCell : UITableViewCell - -+ (void)registerTo:(UITableView *)tableView; -+ (RoomCahtCell *)cellFor:(UITableView *)tableView; - -@property (nonatomic,strong) XPMessageInfoModel *messageInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/RoomCahtCell.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/RoomCahtCell.m deleted file mode 100644 index 4bd7485..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/RoomCahtCell.m +++ /dev/null @@ -1,170 +0,0 @@ -// -// MessageCell.m -// YuMi -// -// Created by P on 2024/11/28. -// - -#import "RoomCahtCell.h" - -#import "NetImageView.h" -#import "XPNetImageYYLabel.h" -#import "XPRoomMessageConstant.h" - -static NSString *MessageCellID = @"MessageCell"; - -@interface RoomCahtCell () - -@property (nonatomic,strong) NetImageView *bubbleImageView; -@property (nonatomic,strong) XPNetImageYYLabel *contentLabel; - -@end - -@implementation RoomCahtCell - -+ (void)registerTo:(UITableView *)tableView { - [tableView registerClass:[self class] forCellReuseIdentifier:MessageCellID]; -} - -+ (RoomCahtCell *)cellFor:(UITableView *)tableView { - return [tableView dequeueReusableCellWithIdentifier:MessageCellID]; -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if (self) { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - - [self setupViews]; - [self setupConstraints]; - } - return self; -} - -#pragma mark - 配置数据 -- (void)setMessageInfo:(XPMessageInfoModel *)messageInfo { - _messageInfo = messageInfo; - if (messageInfo) { - - if ([NSString isEmpty:messageInfo.bubbleImageUrl]) { - self.bubbleImageView.hidden = NO; - self.bubbleImageView.image = [UIImage imageWithColor:[UIColor colorWithWhite:0 alpha:0.3]]; - } else { - @kWeakify(self); - [self.bubbleImageView loadImageWithUrl:messageInfo.bubbleImageUrl - completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp]; - UIImage *cutImage = [image1 cropRightAndBottomPixels:2]; - self.bubbleImageView.image = [self resizableImage:cutImage]; - }]; - self.bubbleImageView.hidden = messageInfo.isHiddenBubble; - } - - self.contentLabel.attributedText = messageInfo.content; - - // 更新 contentLabel 高度 - [self.contentLabel layoutIfNeeded]; - CGSize labelSize = [self.contentLabel systemLayoutSizeFittingSize:UILayoutFittingCompressedSize]; - [self.contentLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(labelSize.height); - }]; - - // 更新气泡背景约束 - [self.bubbleImageView layoutIfNeeded]; - [self.bubbleImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentLabel).insets(UIEdgeInsetsMake(-8, -8, -8, -8)); - }]; - } -} - -#pragma mark - 设置视图 - -- (void)setupViews { - // 背景图片 - self.bubbleImageView = [[NetImageView alloc] init]; - self.bubbleImageView.contentMode = UIViewContentModeScaleAspectFill; - self.bubbleImageView.clipsToBounds = YES; - [self.contentView addSubview:self.bubbleImageView]; - - // 消息标签 - self.contentLabel = [[XPNetImageYYLabel alloc] init]; - self.contentLabel.numberOfLines = 0; - self.contentLabel.preferredMaxLayoutWidth = kRoomMessageMaxWidth - 24;//UIScreen.mainScreen.bounds.size.width * (3.0 / 2.0); - [self.contentView addSubview:self.contentLabel]; - [self.bubbleImageView setCornerRadius:8]; -} - -#pragma mark - 设置约束 - -- (void)setupConstraints { - // 消息标签约束 - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.contentView).offset(16); - make.bottom.equalTo(self.contentView).offset(-16); - if (isMSRTL()) { - make.leading.equalTo(self.contentView).offset(12).priorityHigh(); - make.trailing.lessThanOrEqualTo(self.contentView).offset(-12); - } else { - make.leading.equalTo(self.contentView).offset(12); - make.trailing.lessThanOrEqualTo(self.contentView).offset(-12).priorityHigh(); - } - }]; - - // 背景图片约束 - [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentLabel).insets(UIEdgeInsetsMake(-8, -8, -8, -8)); // 比 label 多 padding - }]; - - -// [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// if (isMSRTL()) { -// make.right.equalTo(self.contentView).offset(-8); // 右对齐 -// } else { -// make.left.equalTo(self.contentView).offset(8); // 左对齐 -// } -// make.top.equalTo(self.contentView).offset(8); // 距顶部8 -// make.bottom.equalTo(self.contentView).offset(-8); // 距底部8 -//// make.width.mas_lessThanOrEqualTo(kRoomMessageMaxWidth - 24); // 最大宽度 -// }]; -// -// [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.edges.equalTo(self.contentLabel); // 背景图片与标签尺寸一致 -// }]; - - -// // 背景图片的约束 -// [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// if (isMSRTL()) { -// make.right.equalTo(self.contentView).offset(-8); -// } else { -// make.left.equalTo(self.contentView).offset(8); -// } -// make.top.equalTo(self.contentView).offset(8); -// make.width.lessThanOrEqualTo(@(UIScreen.mainScreen.bounds.size.width * 3.0 / 2.0)); -// make.bottom.equalTo(self.contentView).offset(-8); -// make.edges.equalTo(self.contentView).insets(UIEdgeInsetsMake(8, 8, 8, 8)); -// }]; -// -// // 消息标签的约束 -// [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.left.equalTo(self.bubbleImageView.mas_left).offset(12); -// make.right.equalTo(self.bubbleImageView.mas_right).offset(-12); -// make.top.equalTo(self.bubbleImageView.mas_top).offset(16); -// make.bottom.equalTo(self.bubbleImageView.mas_bottom).offset(-16); -// }]; -} - -- (UIImage*)resizableImage:(UIImage *)image { - //图片拉伸区域 - CGSize size = image.size; - CGFloat top = size.height * 0.3; - CGFloat left = size.width * 0.3; - CGFloat right = size.width * 0.3; - CGFloat bottom = size.height * 0.3; - return [image resizableImageWithCapInsets:UIEdgeInsetsMake(top, left, bottom, right) - resizingMode:UIImageResizingModeStretch]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPNetImageYYLabel.h b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPNetImageYYLabel.h deleted file mode 100644 index a584494..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPNetImageYYLabel.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// NetImageYYLabel.h -// YUMI -// -// Created by zu on 2021/11/2. -// - - - -NS_ASSUME_NONNULL_BEGIN - -/** 支持 NetImageView 的 YYLabel。 - * - * - 使用者不再需要处理富文本的网络图片。 - * - 使用场景目前还有较多局限性。 - */ -@interface XPNetImageYYLabel : YYLabel - -@property(nonatomic, assign) BOOL hasBubble; -@property(nonatomic, copy) void(^updateLayoutSize)(CGSize size); - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPNetImageYYLabel.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPNetImageYYLabel.m deleted file mode 100644 index c2663d8..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPNetImageYYLabel.m +++ /dev/null @@ -1,190 +0,0 @@ -// -// NetImageYYLabel.m -// YUMI -// -// Created by zu on 2021/11/2. -// - -#import "XPNetImageYYLabel.h" -#import "NetImageView.h" -#import "XPRoomMessageConstant.h" -#import "NSArray+Safe.h" - -#define kMessagePadding 24*2 -#define kMessageWithBubblePadding 24 - -@implementation XPNetImageYYLabel - -//- (void)drawRect:(CGRect)rect { -// [super drawRect:rect]; -// if (!self.asyncDraw) return; -// -// CGContextRef context = UIGraphicsGetCurrentContext(); -// dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ -// // 在后台线程创建绘制内容 -// UIImage *image = [self createOffscreenImage]; -// dispatch_async(dispatch_get_main_queue(), ^{ -// CGContextDrawImage(context, rect, image.CGImage); -// }); -// }); -// } -// -//// 建议2：优化图片缓存 -//- (void)setAttributedText:(NSAttributedString *)attributedText { -// [self.previousAttributedText release]; // 需要管理内存 -// _previousAttributedText = [attributedText copy]; -// -// if ([self hasImageAttachments]) { -// [self preloadImages]; // 需要实现图片预加载 -// } -//} - -- (instancetype)init -{ - self = [super init]; - if (self) { - self.layer.shouldRasterize = YES; - self.layer.rasterizationScale = [UIScreen mainScreen].scale; - } - return self; -} - -- (void)setAttributedText:(NSAttributedString *)attributedText { - if (!attributedText) return; - - NSMutableAttributedString* attributedTextCopy = [attributedText mutableCopy]; -// CGSize maxSize = CGSizeMake(kRoomMessageMaxWidth, MAXFLOAT); -// CGSize size = [attributedText boundingRectWithSize:maxSize -// options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin -// context:nil].size; - - YYTextContainer *container = [self createTextContainerForText:attributedText]; - YYTextLayout *layout = [YYTextLayout layoutWithContainer:container - text:attributedTextCopy]; - - BOOL hasUpdateLayout = NO; - - for (NSUInteger i = 0; i < layout.attachments.count; i++) { - YYTextAttachment *attachment = [layout.attachments xpSafeObjectAtIndex:i]; - if (![attachment.content isKindOfClass:[NetImageView class]]) { - continue; - } - - NetImageView *imageView = (NetImageView *)attachment.content; - if (!imageView.imageUrl){ - continue; - } - - NSValue *value = [layout.attachmentRanges xpSafeObjectAtIndex:i]; - if (!value) { - continue; - } - - NSRange range = value.rangeValue; - if (imageView.state == NetImageStateLoaded) { - attributedTextCopy = [self updateNetImageAttribute:imageView - attributes:attributedTextCopy - range:range]; - [self updateLayoutWithAttributedText:attributedTextCopy]; - } else { - @kWeakify(self); - [imageView loadImage:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - @kWeakify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self updateImageAndRefresh:imageView - attributedText:attributedTextCopy - range:range]; - }); - }]; - } - - hasUpdateLayout = YES; - } - - [super setAttributedText:attributedTextCopy]; - - if (!hasUpdateLayout) { - if (self.updateLayoutSize) { - self.updateLayoutSize(layout.textBoundingSize); - } - } -} - -- (YYTextContainer *)createTextContainerForText:(NSAttributedString *)text { - YYTextContainer *container = [YYTextContainer new]; - // 减去 contentLabel 的左右边距 (UIEdgeInsetsMake(4, 12, 4, 12) 中的左右各12px) - container.size = CGSizeMake(kRoomMessageMaxWidth - 24, MAXFLOAT); - container.maximumNumberOfRows = 0; // 不限制行数，避免文本截断 - - // 根据文本方向配置容器 - if (isMSRTL()) { - container.truncationType = YYTextTruncationTypeStart; - } else { - container.truncationType = YYTextTruncationTypeEnd; - } - - return container; -} - -- (void)updateLayoutWithAttributedText:(NSAttributedString *)attributedText { - // 统一使用 YYTextLayout 进行文本尺寸计算 - YYTextContainer *container = [self createTextContainerForText:attributedText]; - YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:attributedText]; - CGSize finalSize = layout.textBoundingSize; - - if (self.updateLayoutSize) { - self.updateLayoutSize(finalSize); - } -} - -- (void)updateImageAndRefresh:(NetImageView *)imageView - attributedText:(NSMutableAttributedString *)attributedText - range:(NSRange)range { - if (!imageView || !attributedText) return; - imageView.image = imageView.image ?: [UIImage new]; - NSMutableAttributedString *updatedAttributes = [self updateNetImageAttribute:imageView - attributes:attributedText - range:range]; - [super setAttributedText:updatedAttributes]; - - // 统一使用 YYTextLayout 进行文本尺寸计算 - YYTextContainer *container = [self createTextContainerForText:updatedAttributes]; - YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:updatedAttributes]; - - if (self.updateLayoutSize) { - self.updateLayoutSize(layout.textBoundingSize); - } -} - -- (NSMutableAttributedString*)updateNetImageAttribute:(NetImageView*)imageView - attributes:(NSMutableAttributedString*)attributes - range:(NSRange)range{ - if (!imageView || !attributes) { - return attributes; - } - - CGSize size = imageView.bounds.size; - if (CGSizeEqualToSize(size, CGSizeZero)) { - size = CGSizeMake(kFontRegular(kRoomMessageDefalutFont).lineHeight, - kFontRegular(kRoomMessageDefalutFont).lineHeight); - } - UIImage *image = imageView.image; - if (image) { - CGFloat scale = image.size.width / image.size.height; - size = CGSizeMake(imageView.bounds.size.height * scale, imageView.bounds.size.height); - } - - imageView.bounds = CGRectMake(0, 0, size.width, size.height); - - NSMutableAttributedString *replaceAttr = [NSMutableAttributedString yy_attachmentStringWithContent:imageView - contentMode:UIViewContentModeScaleAspectFit - attachmentSize:size - alignToFont:kFontRegular(kRoomMessageDefalutFont) - alignment:YYTextVerticalAlignmentCenter]; - [attributes replaceCharactersInRange:range withAttributedString:replaceAttr]; - return attributes; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.h b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.h deleted file mode 100644 index 68dd7e3..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMRoomMessageHeaderView.h -// YUMI -// -// Created by YUMI on 2021/10/26. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomMessageHeaderView : UIView -///头部的背景颜色 -@property (nonatomic,strong) UIColor *bubbleColor; -@property (nonatomic,strong) UIColor *titleColor; -@property(nonatomic,copy) NSString *title; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.m deleted file mode 100644 index a80c49d..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.m +++ /dev/null @@ -1,121 +0,0 @@ -// -// YMRoomMessageHeaderView.m -// YUMI -// -// Created by YUMI on 2021/10/26. -// - -#import "XPRoomMessageHeaderView.h" -///Third -#import -///Tool -#import "ThemeColor+Room.h" -#import "XPRoomMessageConstant.h" -#import "YUMIMacroUitls.h" - -@interface XPRoomMessageHeaderView () -///背景 -@property (nonatomic,strong) UIView *bubbleView; -///显示 -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPRoomMessageHeaderView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bubbleView]; - [self addSubview:self.titleLabel]; -} -- (void)setTitle:(NSString *)title{ - _title = title; - _titleLabel.text = title; -} --(void)setTitleColor:(UIColor *)titleColor{ - _titleColor = titleColor; - _titleLabel.textColor = _titleColor; -} -- (void)initSubViewConstraints { - /// 设置绿色消息 - NSString *title = YMLocalizedString(@"XPRoomMessageHeaderView0"); - self.titleLabel.text = title; - CGFloat height = [self getHeaderViewHeight:title] + kRoomMessageTextSpaceHeight *2; - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kRoomMessageMaxWidth); - make.height.mas_equalTo(height); - }]; -// if (isMSRTL()){ -// [self.bubbleView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.leading.mas_equalTo(10); -// make.top.mas_equalTo(self); -// make.width.mas_equalTo(kRoomMessageMaxWidth-10); -// make.bottom.mas_equalTo(self).offset(-10); -// }]; -// -// [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.leading.trailing.mas_equalTo(self).inset(15); -// make.centerY.mas_equalTo(self.bubbleView); -// }]; -// return; -// } - [self.bubbleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.mas_equalTo(self); - make.width.mas_equalTo(kRoomMessageMaxWidth-10); - make.bottom.mas_equalTo(self).offset(-10); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(10); - make.centerY.mas_equalTo(self.bubbleView); - }]; -} - -///获取头部的高度 -- (CGFloat)getHeaderViewHeight:(NSString *)title { - CGFloat width = kRoomMessageMaxWidth - 20; //isMSRTL() ? kRoomMessageMaxWidth - 30 : - return [title boundingRectWithSize:CGSizeMake(width, CGFLOAT_MAX) - options:NSStringDrawingTruncatesLastVisibleLine | NSStringDrawingUsesLineFragmentOrigin - attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:kRoomMessageDefalutFont]} - context:nil] - .size - .height; -} - -#pragma mark - Getters And Setters -- (void)setBubbleColor:(UIColor *)bubbleColor { - _bubbleColor = bubbleColor; - if (_bubbleColor) { - _bubbleView.backgroundColor = _bubbleColor; - } -} - -- (UIView *)bubbleView { - if (!_bubbleView) { - _bubbleView = [[UIView alloc] init]; - _bubbleView.backgroundColor = [DJDKMIMOMColor messageBubbleColor]; - _bubbleView.layer.masksToBounds = YES; - _bubbleView.layer.cornerRadius = kRoomMessageBubbleCornerRadius; - } - return _bubbleView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:kRoomMessageDefalutFont]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.numberOfLines = 0; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.h b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.h deleted file mode 100644 index 5450f21..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// YMRoomMessageTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/10/26. -// - -#import -#import "RoomInfoModel.h" -@class XPNetImageYYLabel, XPMessageInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@class XPRoomMessageParser, YYLabel, XPRoomMessageTableViewCell; -@protocol XPRoomMessageTableViewCellDelegate - -- (void)xPRoomMessageTableViewCellDidTapEmpty:(XPRoomMessageTableViewCell *)view; - -@end - -@interface XPRoomMessageTableViewCell : UITableViewCell - -@property (nonatomic, assign) BOOL isLeftBigImage; - -///当前房间的类型 -@property (nonatomic,assign) RoomType roomType; - -@property (nonatomic,strong) XPMessageInfoModel *messageInfo; - -///代理 -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m deleted file mode 100644 index 9d378e8..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m +++ /dev/null @@ -1,321 +0,0 @@ -// -// YMRoomMessageTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/10/26. -// - -#import "XPRoomMessageTableViewCell.h" -///Third -#import -#import "XPNetImageYYLabel.h" -#import "NetImageView.h" -///Tool -#import "YUMIMacroUitls.h" -#import "ThemeColor+Room.h" -#import "UIImage+Utils.h" -#import "XPMessageInfoModel.h" - -#import "XPRoomMessageConstant.h" - -@interface XPRoomMessageTableViewCell () -@property(nonatomic,strong) UIButton *clickBtn; -///气泡 -@property (nonatomic,strong) NetImageView *bubbleImageView; -@property (nonatomic, strong) NetImageView *leftBigImageView; -///展示的内容 -@property (nonatomic,strong) XPNetImageYYLabel *contentLabel; -///点击空白区域的手势 -@property (nonatomic,strong) UITapGestureRecognizer *tapEmptyRecognizer; - -@property (nonatomic, strong) UIView *bottomSpace; -/// 是否正在动画中，用于避免动画期间的布局更新 -@property (nonatomic, assign) BOOL isAnimating; - -@end - -@implementation XPRoomMessageTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.clipsToBounds = NO; - self.contentView.clipsToBounds = NO; - - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.bubbleImageView]; - [self.contentView addSubview:self.contentLabel]; - [self.contentView addSubview:self.bottomSpace]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTap)]; - tap.delegate = self; - self.tapEmptyRecognizer = tap; - [self.contentView addGestureRecognizer:self.tapEmptyRecognizer]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - // MARK: Oringinal Layout -// make.edges.mas_equalTo(UIEdgeInsetsMake(4, 8, 4, 8)); - - // MARK: 完全不做间距，可以完整显示 -// make.edges.mas_equalTo(UIEdgeInsetsMake(0, 0, 0, 0)); - - make.top.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(12); - make.bottom.mas_equalTo(self.contentView).offset(-20); - make.width.mas_equalTo(kRoomMessageMaxWidth); - }]; - - [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentLabel).insets(UIEdgeInsetsMake(0, -10, 0, -10)); - }]; - - [self.bottomSpace mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(20); - }]; -} - -- (void)setIsLeftBigImage:(BOOL)isLeftBigImage { - if (_isLeftBigImage == isLeftBigImage) { - return; - } - - _isLeftBigImage = isLeftBigImage; - if (isLeftBigImage) { - [self.contentView addSubview:self.leftBigImageView]; - [self.leftBigImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.top.mas_equalTo(6); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(60), kGetScaleWidth(60))); - }]; - - [self.bubbleImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.leftBigImageView.mas_centerX); - make.top.mas_equalTo(0); - make.bottom.mas_equalTo(self.leftBigImageView).offset(6); - make.trailing.mas_equalTo(-8); - }]; - } else { - // 需要添加移除大图的逻辑 - [_leftBigImageView removeFromSuperview]; - [self rebuildNormalConstraints]; - } -} - -// 新增方法优化约束更新 -- (void)rebuildNormalConstraints { - [self.contentLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(12); - make.bottom.mas_equalTo(self.contentView).offset(-20); - make.width.mas_equalTo(kRoomMessageMaxWidth); - }]; - - [self.bubbleImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentLabel).insets(UIEdgeInsetsMake(0, -10, 0, -10)); - }]; -} - -#pragma mark - tool -- (UIImage*)resizableImage:(UIImage *)image { - //图片拉伸区域 - CGFloat top = (image.size.height - 1) / 2; - CGFloat left = (image.size.width - 1) / 2; - CGFloat right = (image.size.width - 1) / 2; - CGFloat bottom = (image.size.height - 1) / 2; - return [image resizableImageWithCapInsets:UIEdgeInsetsMake(top, left, bottom, right) - resizingMode:UIImageResizingModeStretch]; -} -#pragma mark - UIGestureRecognizerDelegate -- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch { - if (gestureRecognizer == self.tapEmptyRecognizer) { - if (touch.view == self.contentLabel || touch.view == self.bubbleImageView) { - return NO; - } - } - return YES; -} - -#pragma mark - Event Response -- (void)didTap { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomMessageTableViewCellDidTapEmpty:)]) { - [self.delegate xPRoomMessageTableViewCellDidTapEmpty:self]; - } -} - --(void)clickBtnAction{ - -} - -#pragma mark - Getters And Setters -- (void)setMessageInfo:(XPMessageInfoModel *)messageInfo { - // 更严格的比较，避免不必要的更新 - if (_messageInfo && - [messageInfo.content isEqualToAttributedString:_messageInfo.content] && - [messageInfo.bubbleImageUrl isEqualToString:_messageInfo.bubbleImageUrl] && - [messageInfo.boomImageUrl isEqualToString:_messageInfo.boomImageUrl] && - messageInfo.first == _messageInfo.first && - messageInfo.second == _messageInfo.second) { - return; - } - - _messageInfo = messageInfo; - if (messageInfo) { - // 如果正在动画中，延迟更新以避免闪烁 - if (self.isAnimating) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self setMessageInfo:messageInfo]; - }); - return; - } - - // 批量更新，减少布局触发次数，使用 performWithoutAnimation 避免布局动画 - [UIView performWithoutAnimation:^{ - // 确保在设置attributedText之前先设置hasBubble属性 - BOOL hasBubble = ![NSString isEmpty:messageInfo.bubbleImageUrl]; - if (self.contentLabel.hasBubble != hasBubble) { - self.contentLabel.hasBubble = hasBubble; - } - - self.contentLabel.attributedText = messageInfo.content; - }]; - - // 延迟图片加载，避免与礼物动画冲突 - if (self.isLeftBigImage && messageInfo.boomImageUrl) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - self.leftBigImageView.imageUrl = messageInfo.boomImageUrl; - }); - } - } -} - -- (void)updateLayoutWithoutBubble:(BOOL)hasBubble layoutSize:(CGSize)size { - if (self.isLeftBigImage) { - - [self.contentLabel mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.leftBigImageView); - make.leading.mas_equalTo(self.leftBigImageView.mas_trailing); - make.trailing.mas_equalTo(self.contentView).offset(-8); - make.height.mas_equalTo(self.contentView); - }]; - - return; - } - - // 使用更平滑的布局更新，减少闪烁 - [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{ - [self.contentLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(size.width); - }]; - [self layoutIfNeeded]; - } completion:nil]; - -// [self.bubbleImageView mas_updateConstraints:^(MASConstraintMaker *make) { -// if (size.width + 32 >= kRoomMessageMaxWidth) { -// make.width.mas_equalTo(kRoomMessageMaxWidth); -// }else { -// make.width.mas_equalTo(size.width+32); -// } -// -// make.height.mas_equalTo(size.height - 20); -// }]; - - if (hasBubble) { - @kWeakify(self); - // 延迟图片加载，避免与动画冲突 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.bubbleImageView loadImageWithUrl:self.messageInfo.bubbleImageUrl - completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp]; - UIImage *cutImage = [image1 cropRightAndBottomPixels:2]; - self.bubbleImageView.image = [self resizableImage:cutImage]; - }]; - }); - - [self.bubbleImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentLabel).insets(UIEdgeInsetsMake(-10, -10, -10, -10)); - }]; - } else { - self.bubbleImageView.image = [UIImage imageWithColor:[DJDKMIMOMColor messageBubbleColor]]; - [self.bubbleImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentLabel).insets(UIEdgeInsetsMake(0, -10, 0, -10)); - }]; - } -} - -- (void)setRoomType:(RoomType)roomType { - _roomType = roomType; - if (self.messageInfo.bubbleImageUrl.length > 0) { - return; - } - if (_roomType == RoomType_MiniGame) { - _bubbleImageView.image = [UIImage imageWithColor:[UIColor colorWithWhite:1 alpha:0.2]]; - } else { - _bubbleImageView.image = [UIImage imageWithColor:[DJDKMIMOMColor messageBubbleColor]]; - } -} - -- (NetImageView *)bubbleImageView { - if (!_bubbleImageView) { - _bubbleImageView = [[NetImageView alloc] init]; - _bubbleImageView.clipsToBounds = NO; - _bubbleImageView.userInteractionEnabled = YES; - [_bubbleImageView setCornerRadius:8]; - } - return _bubbleImageView; -} - -- (NetImageView *)leftBigImageView { - if (!_leftBigImageView) { - _leftBigImageView = [[NetImageView alloc] init]; - _leftBigImageView.userInteractionEnabled = YES; - _leftBigImageView.contentMode = UIViewContentModeScaleAspectFit; -//#if DEBUG -// _leftBigImageView.backgroundColor = [UIColor purpleColor]; -//#endif - } - return _leftBigImageView; -} - -- (XPNetImageYYLabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[XPNetImageYYLabel alloc] init]; -// _contentLabel.preferredMaxLayoutWidth = kRoomMessageMaxWidth; - _contentLabel.numberOfLines = 0; - _contentLabel.userInteractionEnabled = YES; - @kWeakify(self); - [_contentLabel setUpdateLayoutSize:^(CGSize size) { - @kStrongify(self); - [self updateLayoutWithoutBubble:![NSString isEmpty:self.messageInfo.bubbleImageUrl] - layoutSize:size]; - }]; -//#if DEBUG -// _contentLabel.backgroundColor = [UIColor colorWithWhite:0.9 alpha:0.4]; -//#endif - } - return _contentLabel; -} - -- (UIButton *)clickBtn{ - if(!_clickBtn){ - _clickBtn = [UIButton new]; - [_clickBtn addTarget:self action:@selector(clickBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _clickBtn; -} - -- (UIView *)bottomSpace { - if (!_bottomSpace) { - _bottomSpace = [[UIView alloc] init]; - } - return _bottomSpace; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.h b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.h deleted file mode 100644 index a239f6b..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.h +++ /dev/null @@ -1,65 +0,0 @@ -// -// YMRoomMessageView.h -// YUMI -// -// Created by YUMI on 2021/10/11. -// - -#import -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" -#import - -// DiffableDataSource 相关导入 -#import "XPMessageItem.h" -#import "XPMessageDataSourceManager.h" - -NS_ASSUME_NONNULL_BEGIN -@class XPRoomMessageContainerView, AttachmentModel, NIMBroadcastMessage; -@protocol XPRoomMessageContainerViewDelegate - -- (void)xPRoomMessageContainerViewlDidTapEmpty:(XPRoomMessageContainerView *)view; - -@end - - -@interface XPRoomMessageContainerView : UIView - -@property(nonatomic,weak) iddelegate; -- (void)showUserCard:(NSInteger)uid; -- (instancetype)initWithDelegate:(id)delegate; - -- (void)changeType:(NSInteger)type; - -- (void)handleBroadcastMessageAttachment:(AttachmentModel *)attachment; -- (void)handleBroadcastMessage:(NIMBroadcastMessage *)message; - -#pragma mark - DiffableDataSource Support - -/// 是否使用 DiffableDataSource（开关控制） -@property (nonatomic, assign) BOOL useDiffableDataSource; - -/// DiffableDataSource 数据源 -@property (nonatomic, strong) UITableViewDiffableDataSource *diffableDataSource; - -/// 数据源管理器 -@property (nonatomic, strong) XPMessageDataSourceManager *dataSourceManager; - -/// 设置 DiffableDataSource -- (void)setupDiffableDataSource; - -/// 使用 DiffableDataSource 添加消息 -- (void)addMessageWithDiffableDataSource:(NIMMessage *)message; - -/// 使用 DiffableDataSource 切换显示类型 -- (void)changeTypeWithDiffableDataSource:(NSInteger)type; - -/// 使用 DiffableDataSource 滚动到底部 -- (void)scrollToBottomWithDiffableDataSource:(BOOL)animated; - -/// 更新 DiffableDataSource 快照 -- (void)updateDiffableDataSourceSnapshot; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m deleted file mode 100644 index e4fafc6..0000000 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m +++ /dev/null @@ -1,2024 +0,0 @@ -// -// YMRoomMessageView.m -// YUMI -// -// Created by YUMI on 2021/10/11. -// - -#import "XPRoomMessageContainerView.h" -///Third -#import -#import - -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "XPRoomMessageConstant.h" -#import "XPRoomMessageParser.h" -#import "AccountInfoStorage.h" -#import "XPRoomMiniManager.h" -#import "PLTimeUtil.h" -#import "ClientConfig.h" -#import -#import "ThemeColor+Room.h" -#import "NSArray+Safe.h" -#import "Api+Room.h" -///Model -#import "RoomInfoModel.h" -#import "AttachmentModel.h" -#import "RoomFaceSendInfoModel.h" -#import "XPMessageRemoteExtModel.h" -#import "RoomPKChooseUserModel.h" -#import "CandyTreeResultModel.h" -#import "RoomSailingPrizeModel.h" -#import "UserInfoModel.h" -#import "XPMessageInfoModel.h" -#import "GiftReceiveInfoModel.h" -#import "XPGiftStorage.h" - -///View -#import "XPRoomMessageTableViewCell.h" -#import "XPRoomMessageHeaderView.h" -#import "PIRoomMessagePhotoAlbumCell.h" -#import "PIRoomMessageUnlockPhotoAlbumView.h" -#import "PIRoomPhotoAlbumItemModel.h" -#import "SDPhotoBrowser.h" -#import "XPSkillCardPlayerManager.h" - -// Boom -#import "BoomInfoModel.h" - -// 红包 -#import "LuckyPackageMessageTableViewCell.h" - -// CP 进场提示 -#import "CPEnterRoomTableViewCell.h" - -#import "RoomEnterModel.h" - -NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey"; - -@interface XPRoomMessageContainerView () -///房间的代理 -@property (nonatomic,weak) id hostDelegate; -///列表 -@property (nonatomic,strong) UITableView *messageTableView; -///头部 -@property (nonatomic,strong) XPRoomMessageHeaderView *headerView; -///底部有新的消息 -@property (nonatomic,strong) UIButton *messageTipsBtn; -///有人at你 -@property (nonatomic, strong) UIButton *atTipBtn; -///是否处于正在爬楼 -@property (nonatomic,assign) BOOL isPending; -///是否是最小化进房的 -@property (nonatomic,assign) BOOL isMiniEnter; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -@property (nonatomic,strong) NSMutableArray *datasource_chat; -@property (nonatomic,strong) NSMutableArray *datasource_gift; -///临时存放消息的数组 -@property (nonatomic,strong) NSMutableArray *incomingMessages; -///有多少人at我 -@property (nonatomic, assign) NSInteger atCount; -///@我的消息位置集合 -@property (nonatomic, strong) NSMutableArray *locationArray; -///messageView 持有这个工具类 进行数据的分发操作 -@property (nonatomic,strong) XPRoomMessageParser *messageParser; - -@property(nonatomic,strong) PIRoomPhotoAlbumItemModel *lookUpModel; -@property(nonatomic,assign) BOOL isLoadHistoryMessage; - -@property (nonatomic, assign) NSInteger displayType; -/// 清空公屏后下次追加强制走 reload，避免插入动画与数据源不一致 -@property (nonatomic, assign) BOOL forceReloadNextAppend; - -/// 视图是否已经完成首次布局，未就绪期间的 UI 更新将排队 -@property (atomic, assign) BOOL viewReady; -/// 是否正在刷新，避免嵌套批量更新 -@property (atomic, assign) BOOL isFlushing; -/// 待执行的 UI 操作队列（在 viewReady 之前累积） -@property (nonatomic, strong) NSMutableArray *pendingOps; - -@end - - -@implementation XPRoomMessageContainerView - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (instancetype)initWithDelegate:(id)delegate { - self = [super init]; - if (self) { - self.displayType = 1; - self.isLoadHistoryMessage = YES; - self.forceReloadNextAppend = NO; - self.hostDelegate = delegate; - - // DiffableDataSource 支持（默认关闭） - self.useDiffableDataSource = NO; - - [self initSubViews]; - [self initSubViewConstraints]; - - // 如果启用 DiffableDataSource，则设置它 - if (self.useDiffableDataSource) { - [self setupDiffableDataSource]; - } - } - return self; -} - -/// 统一的安全插入实现：在数据与 UI 不一致时回退为 reload，永不崩溃 -- (void)safeApplyInsertsFromStartIndex:(NSInteger)startIndex - newItemsCount:(NSInteger)newItemsCount - needReload:(BOOL)needReload { - if (needReload || newItemsCount <= 0) { - [self.messageTableView reloadData]; - return; - } - - if (self.isFlushing) { - // 合并到下一帧，避免嵌套更新 - dispatch_async(dispatch_get_main_queue(), ^{ - [self safeApplyInsertsFromStartIndex:startIndex newItemsCount:newItemsCount needReload:NO]; - }); - return; - } - - self.isFlushing = YES; - - // 校验一致性 - NSInteger beforeRows = [self.messageTableView numberOfRowsInSection:0]; - NSInteger expectedRows = [self getCurrentDataSourceCount]; - BOOL indexValid = (startIndex >= 0 && startIndex <= beforeRows); - BOOL countValid = (beforeRows + newItemsCount == expectedRows); - if (!indexValid || !countValid) { - [self.messageTableView reloadData]; - self.isFlushing = NO; - return; - } - - // 生成 indexPaths - NSMutableArray *indexPaths = [NSMutableArray array]; - for (NSInteger i = 0; i < newItemsCount; i++) { - [indexPaths addObject:[NSIndexPath indexPathForRow:startIndex + i inSection:0]]; - } - - // 原子提交 - [self.messageTableView beginUpdates]; - @try { - [self.messageTableView insertRowsAtIndexPaths:indexPaths withRowAnimation:UITableViewRowAnimationFade]; - } @catch (__unused NSException *e) { - [self.messageTableView reloadData]; - } @finally { - [self.messageTableView endUpdates]; - self.isFlushing = NO; - } -} - -- (void)changeType:(NSInteger)type { - if (self.displayType == type) { - return; - } - self.displayType = type; - [self.messageTableView reloadData]; - - if (self.displayType == 1) { - self.messageTableView.tableHeaderView = self.headerView; - } else { - self.messageTableView.tableHeaderView = nil; - } - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self scrollToBottom:YES]; - }); -} - -/// 更新其他 tag 的数据源，若传入空数组，则初始化并从 datasource 中获取数据 -- (void)updateAllDataSource:(NSArray *)datas { - if (!datas || datas.count == 0) { - // 清空分类数据源 - [self.datasource_chat removeAllObjects]; - [self.datasource_gift removeAllObjects]; - // 从主数据源重新构建分类数据源 - datas = self.datasource; - } - - for (XPMessageInfoModel *model in datas) { - switch (model.first) { - case NIMMessageTypeText: - case CustomMessageType_Face: - [self.datasource_chat addObject:model]; - break; - case CustomMessageType_Gift: - case CustomMessageType_RoomBoom: - case CustomMessageType_Candy_Tree: - case CustomMessageType_Super_Gift: - case CustomMessageType_AllMicroSend: - [self.datasource_gift addObject:model]; - break; - default: - break; - } - } -} - -- (UIView *)listView { - return self; -} -- (void)showUserCard:(NSInteger)uid{ - [self.messageParser showUserCard:uid]; -} -#pragma mark - Response -- (void)messageTipsBtnAction:(UIButton *)sender { - self.isPending = NO; - self.messageTipsBtn.hidden = YES; - [self appendAndScrollToBottom]; -} - -- (void)atTipsBtnAction:(UIButton *)sender { - self.isPending = YES; - [self appendAndScrollToAtUser]; -} - -///追加数据源 -- (void)appendAndScrollToAtUser { - // 在未就绪时排队 - if (![NSThread isMainThread]) { - dispatch_async(dispatch_get_main_queue(), ^{ - [self appendAndScrollToAtUser]; - }); - return; - } - if (!self.viewReady) { - if (!self.pendingOps) self.pendingOps = [NSMutableArray array]; - __weak typeof(self) weakSelf = self; - [self.pendingOps addObject:^{ __strong typeof(weakSelf) self = weakSelf; [self appendAndScrollToAtUser]; }]; - return; - } - // 1. 检查 incomingMessages 是否为空 - if (self.incomingMessages.count < 1) { - // 2. 安全检查 locationArray 是否为空 - if (self.locationArray.count == 0) { - [self scrollToBottomWithTipsHidden:YES]; - return; - } - - // 3. 获取首个 @ 消息的索引，并进行安全检查 - NSInteger index = [self safeGetIndexFromLocationArrayAt:0]; - if (index == NSNotFound) { - [self scrollToBottomWithTipsHidden:YES]; - return; - } - - // 将 datasource 的索引转换为当前显示数据源的索引 - NSInteger convertedIndex = [self convertDataSourceIndexToCurrentDisplayIndex:index]; - if (convertedIndex == NSNotFound) { - [self scrollToBottomWithTipsHidden:YES]; - } else { - NSIndexPath *indexPath = [NSIndexPath indexPathForRow:convertedIndex inSection:0]; - NSInteger currentRows = [self getCurrentDataSourceCount]; - if (currentRows > indexPath.row) { - [self.messageTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES]; - if (currentRows == indexPath.row + 1) { - self.messageTipsBtn.hidden = YES; - self.isPending = NO; - } - } else { - [self scrollToBottomWithTipsHidden:YES]; - } - } - - [self safelyRemoveLocationAtIndex:0]; - [self updateAtTipButton]; - return; - } - - // 4. 超长消息处理逻辑 - BOOL needReloadData = NO; - if (self.datasource.count > kRoomMessageMaxLength) { - NSInteger removedCount = kRoomMessageMaxLength / 2; - [self safelyRemoveMessages:removedCount]; - needReloadData = YES; // 标记需要重新加载数据 - } - - // 5. 在更新数据源之前获取当前行数 - NSInteger currentRows = [self getCurrentDataSourceCount]; - - // 6. 插入新消息 - NSMutableArray *tempNewDatas = @[].mutableCopy; - for (id item in self.incomingMessages) { - XPMessageInfoModel *model = [self parseMessage:item]; - if (!model) continue; - - [tempNewDatas addObject:model]; - [self.datasource addObject:model]; - [self processAtMentionsForMessage:item]; - } - [self updateAllDataSource:tempNewDatas]; - [self.incomingMessages removeAllObjects]; - - // 7. 更新 UITableView - [self safeApplyInsertsFromStartIndex:currentRows newItemsCount:tempNewDatas.count needReload:(needReloadData || self.forceReloadNextAppend)]; - self.forceReloadNextAppend = NO; - - // 6. 滚动到指定位置或底部 - [self scrollToFirstLocationOrBottom]; -} - -- (void)scrollToBottomWithTipsHidden:(BOOL)hidden { - NSInteger rows = [self getCurrentDataSourceCount]; - if (rows > 0) { - NSIndexPath *indexPath = [NSIndexPath indexPathForRow:(rows - 1) inSection:0]; - [self.messageTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES]; - } - self.messageTipsBtn.hidden = hidden; - self.isPending = NO; - self.atCount = 0; - self.atTipBtn.hidden = hidden; -} - -- (void)updateLocationArrayForMessageRemoval:(NSInteger)removedCount { - NSMutableIndexSet *indexSet = [NSMutableIndexSet indexSet]; - for (int i = 0; i < self.locationArray.count; i++) { - NSNumber *number = self.locationArray[i]; - if (number.integerValue < removedCount) { - self.atCount--; - [indexSet addIndex:i]; - } - } - [self.locationArray removeObjectsAtIndexes:indexSet]; - for (int i = 0; i < self.locationArray.count; i++) { - NSNumber *number = self.locationArray[i]; - self.locationArray[i] = @(number.integerValue - removedCount); - } -} - -- (void)updateAtTipButton { - if (self.locationArray.count == 0) { - self.atTipBtn.hidden = YES; - } else { - [self.atTipBtn setTitle:[NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageContainerView0"), (unsigned long)self.locationArray.count] forState:UIControlStateNormal]; - self.atTipBtn.hidden = NO; - } -} - -- (NSInteger)safeGetIndexFromLocationArrayAt:(NSUInteger)index { - if (index < self.locationArray.count) { - NSNumber *number = self.locationArray[index]; - return [number intValue]; - } - return NSNotFound; // 返回一个无效值，避免崩溃 -} - -- (void)safelyRemoveLocationAtIndex:(NSUInteger)index { - if (index < self.locationArray.count) { - [self.locationArray xpSafeRemoveObjectAtIndex:index]; - self.atCount = MAX(0, self.atCount - 1); - } -} - -- (void)safelyRemoveMessages:(NSInteger)count { - if (self.datasource.count >= count) { - // 获取要删除的消息 - NSIndexSet *set = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, count)]; - NSArray *removedMessages = [self.datasource objectsAtIndexes:set]; - - // 从主数据源删除 - [self.datasource removeObjectsAtIndexes:set]; - - // 从分类数据源中删除对应的消息 - for (XPMessageInfoModel *removedModel in removedMessages) { - switch (removedModel.first) { - case NIMMessageTypeText: - case CustomMessageType_Face: - [self.datasource_chat removeObject:removedModel]; - break; - case CustomMessageType_Gift: - case CustomMessageType_RoomBoom: - case CustomMessageType_Candy_Tree: - case CustomMessageType_Super_Gift: - case CustomMessageType_AllMicroSend: - [self.datasource_gift removeObject:removedModel]; - break; - default: - break; - } - } - - // 更新 locationArray - NSMutableIndexSet *indexSet = [NSMutableIndexSet indexSet]; - for (NSUInteger i = 0; i < self.locationArray.count; i++) { - NSNumber *number = self.locationArray[i]; - if (number.integerValue < count) { - [indexSet addIndex:i]; - } else { - self.locationArray[i] = @(number.integerValue - count); - } - } - [self.locationArray removeObjectsAtIndexes:indexSet]; - } -} - -- (XPMessageInfoModel *)parseMessage:(id)item { - if ([item isKindOfClass:[NIMMessage class]]) { - return [self.messageParser parseMessageAttribute:item]; - } else if ([item isKindOfClass:[NIMBroadcastMessage class]]) { - return [self.messageParser parseBroadcastMessageAttribute:item]; - } - return nil; -} - -- (void)processAtMentionsForMessage:(id)item { - if ([item isKindOfClass:[NIMMessage class]]) { - NSArray *nickNameInfos = [(NIMMessage *)item remoteExt][@"atUids"]; - if ([nickNameInfos isKindOfClass:[NSArray class]]) { - for (NSString *nick in nickNameInfos) { - if ([nick isEqualToString:[AccountInfoStorage instance].getUid]) { - [self.locationArray addObject:@(self.datasource.count - 1)]; - } - } - } - } -} - -/// 检查是否为礼物消息 -- (BOOL)isGiftMessage:(id)messageData { - if ([messageData isKindOfClass:[NIMMessage class]]) { - NIMMessage *message = (NIMMessage *)messageData; - if ([message.messageObject isKindOfClass:[NIMCustomObject class]]) { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - return (attachment.first == CustomMessageType_Gift || - attachment.first == CustomMessageType_AllMicroSend || - attachment.first == CustomMessageType_Super_Gift); - } - } - } - return NO; -} - -- (NSInteger)getCurrentDataSourceCount { - NSInteger count = 0; - switch (self.displayType) { - case 1: - count = self.datasource.count; - break; - case 2: - count = self.datasource_chat.count; - break; - case 3: - count = self.datasource_gift.count; - break; - default: - count = self.datasource.count; - break; - } - // 确保返回非负数 - return MAX(0, count); -} - -- (NSInteger)convertDataSourceIndexToCurrentDisplayIndex:(NSInteger)dataSourceIndex { - if (self.displayType == 1) { - return dataSourceIndex; - } - - if (dataSourceIndex >= self.datasource.count) { - return NSNotFound; - } - - XPMessageInfoModel *targetModel = [self.datasource objectAtIndex:dataSourceIndex]; - if (!targetModel) { - return NSNotFound; - } - - NSArray *currentDataSource = nil; - switch (self.displayType) { - case 2: - currentDataSource = self.datasource_chat; - break; - case 3: - currentDataSource = self.datasource_gift; - break; - default: - return dataSourceIndex; - } - - // 在当前数据源中查找对应的模型 - for (NSInteger i = 0; i < currentDataSource.count; i++) { - XPMessageInfoModel *model = [currentDataSource objectAtIndex:i]; - if ([model isEqual:targetModel]) { - return i; - } - } - - return NSNotFound; -} - -- (void)scrollToFirstLocationOrBottom { - if (self.locationArray.count == 0) { - [self scrollToBottomWithTipsHidden:YES]; - return; - } - - NSInteger index = [self safeGetIndexFromLocationArrayAt:0]; - if (index == NSNotFound) { - [self scrollToBottomWithTipsHidden:YES]; - return; - } - - // 将 datasource 的索引转换为当前显示数据源的索引 - NSInteger convertedIndex = [self convertDataSourceIndexToCurrentDisplayIndex:index]; - if (convertedIndex == NSNotFound) { - [self scrollToBottomWithTipsHidden:YES]; - } else { - NSIndexPath *indexPath = [NSIndexPath indexPathForRow:convertedIndex inSection:0]; - [self.messageTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES]; - [self safelyRemoveLocationAtIndex:0]; - } - [self updateAtTipButton]; -} - -#pragma mark - @我 -///查找有多少人@我 -- (void)findAtMeNumber { - if (self.incomingMessages.count) { - NIMMessage *message = self.incomingMessages.lastObject; - if (![message isKindOfClass:[NIMMessage class]] || ![message respondsToSelector:@selector(remoteExt)]) { - return; - } - id nickNameNifo = message.remoteExt[@"atUids"]; - if ([nickNameNifo isKindOfClass:[NSArray class]]) { - for (NSString *nick in nickNameNifo) { - if ([nick isEqualToString:[AccountInfoStorage instance].getUid]) { - self.atCount += 1; - } - } - } - if (self.atCount > 0) { - self.atTipBtn.hidden = NO; - [self.atTipBtn setTitle:[NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageContainerView2"), self.atCount] forState:UIControlStateNormal]; - } else { - self.atTipBtn.hidden = YES; - } - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.clipsToBounds = YES; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(addCustomMessage:) name:@"message" object:nil]; - [self addSubview:self.messageTableView]; - [self addSubview:self.messageTipsBtn]; - [self addSubview:self.atTipBtn]; - self.messageTableView.tableHeaderView = self.headerView; - - // 标记未就绪，等待首次布局完成后再 flush 队列 - self.viewReady = NO; - self.isFlushing = NO; -} - -- (void)initSubViewConstraints { - RoomInfoModel *infoModel = self.hostDelegate.getRoomInfo; - CGFloat top = infoModel.type == RoomType_MiniGame ? 0 : 10; - [self.messageTableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(15); - make.bottom.trailing.mas_equalTo(self); - make.top.equalTo(self).mas_offset(top); - }]; - - [self.messageTipsBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(100); - make.height.mas_equalTo(30); - make.bottom.mas_equalTo(self.mas_bottom).offset(-5); - make.leading.mas_equalTo(self); - }]; - [self.atTipBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(100); - make.height.mas_equalTo(30); - make.bottom.mas_equalTo(self.mas_bottom).offset(-5); - make.leading.mas_equalTo(self); - }]; - - // 首次约束完成后，标记就绪并 flush 排队操作 - dispatch_async(dispatch_get_main_queue(), ^{ - if (!self.viewReady) { - self.viewReady = YES; - if (self.pendingOps.count > 0) { - NSArray *ops = [self.pendingOps copy]; - [self.pendingOps removeAllObjects]; - for (void (^op)(void) in ops) { op(); } - } - } - }); -} - -///是否是当前房间 -- (BOOL)isCurrentRoom:(NSString *)sessionId { - if ([sessionId isEqualToString:[NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]]) { - return YES; - } - return NO; -} - -///判断是否隐身进房 -- (BOOL)handleHideEnter:(NIMMessage *)message { - NIMMessageChatroomExtension * messageExt = (NIMMessageChatroomExtension *)message.messageExt; - NSDictionary * dic = [(NSDictionary *)messageExt.roomExt.toJSONObject objectForKey:message.from]; - XPMessageRemoteExtModel * extModel = [XPMessageRemoteExtModel modelWithJSON:dic]; - return (extModel.enterHide || extModel.platformRole == 1); -} - -#pragma mark - 添加数据并且做自动滚动 -///添加信息 -- (void)addRoomMessage:(id)messageData { - if(self.isLoadHistoryMessage == YES)return; - [self.incomingMessages addObject:messageData]; - - if ([messageData isKindOfClass:[NIMBroadcastMessage class]]) { - NIMBroadcastMessage *broadcastMessage = (NIMBroadcastMessage *)messageData; - [[XPRoomMiniManager shareManager] saveRoomMessage:broadcastMessage]; - } else if ([messageData isKindOfClass:[NIMMessage class]]) { - NIMMessage *message = (NIMMessage *)messageData; - if (!self.isMiniEnter) {/// 最小化进房的话 不需要重新保存 - if (self.hostDelegate.getRoomInfo.isCloseScreen) { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_Update_RoomInfo && - attachment.second == Custom_Message_Sub_Update_RoomInfo_MessageState){ - [[XPRoomMiniManager shareManager] saveRoomMessage:message]; - } - } - } else { - [[XPRoomMiniManager shareManager] saveRoomMessage:message]; - } - } - } - - if (self.isPending) { - self.messageTipsBtn.hidden = NO; - [self findAtMeNumber]; - } else { - // 对于礼物消息，使用更平滑的更新策略 - if ([self isGiftMessage:messageData]) { - // 稍微延迟处理礼物消息，让动画先执行 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self appendAndScrollToBottom]; - }); - } else { - [self appendAndScrollToBottom]; - } - } -} - -///追加数据源 -- (void)appendAndScrollToBottom { - // 在未就绪时排队 - if (![NSThread isMainThread]) { - dispatch_async(dispatch_get_main_queue(), ^{ - [self appendAndScrollToBottom]; - }); - return; - } - if (!self.viewReady) { - if (!self.pendingOps) self.pendingOps = [NSMutableArray array]; - __weak typeof(self) weakSelf = self; - [self.pendingOps addObject:^{ __strong typeof(weakSelf) self = weakSelf; [self appendAndScrollToBottom]; }]; - return; - } - if (self.incomingMessages.count < 1) { - ///滚动到底部（如果有人at自己后，income消息在点击at按钮处做了拼接处理，因为点击at按钮跳转到的是对应的at人消息，如果后面有其他消息时，点有更多按钮时需要滚动到最底部） - [self scrollToBottom:YES]; - return; - } - - BOOL needReloadData = NO; - if (self.datasource.count > kRoomMessageMaxLength) { - NSInteger removedCount = kRoomMessageMaxLength / 2; - [self safelyRemoveMessages:removedCount]; - needReloadData = YES; // 标记需要重新加载数据 - } - - // 在更新数据源之前获取当前行数 - NSInteger currentRows = [self getCurrentDataSourceCount]; - - NSMutableArray *tempArray = @[].mutableCopy; - @kWeakify(self); - [self.incomingMessages enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - @kStrongify(self); - id model = nil; - if ([obj isKindOfClass:[NIMMessage class]]) { - model = [self.messageParser parseMessageAttribute:(NIMMessage *)obj]; - } else if ([obj isKindOfClass:[NIMBroadcastMessage class]]) { - model = [self.messageParser parseBroadcastMessageAttribute:(NIMBroadcastMessage *)obj]; - } - if (model) { - [tempArray addObject:model]; - [self.datasource addObject:model]; - } - }]; - - [self.incomingMessages removeAllObjects]; - - [self updateAllDataSource:tempArray]; - - // 如果有删除操作或清空标记，使用 reloadData；否则使用增量更新 - [self safeApplyInsertsFromStartIndex:currentRows newItemsCount:tempArray.count needReload:(needReloadData || self.forceReloadNextAppend)]; - self.forceReloadNextAppend = NO; - - //执行插入动画并滚动 - // 延迟滚动执行，避免与礼物动画产生视觉冲突 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self scrollToBottom:NO]; - }); -} - -///执行插入动画并滚动 -- (void)scrollToBottom:(BOOL)animated { - NSArray *source = @[]; - switch (self.displayType) { - case 1: - source = self.datasource; - break; - case 2: - source = self.datasource_chat; - break; - case 3: - source = self.datasource_gift; - break; - - default: - source = self.datasource; - break; - } - if(source.count > 0){ - NSIndexPath *ip = [NSIndexPath indexPathForRow:source.count-1 inSection:0]; //取最后一行数据 - - // 优化滚动动画，减少与布局更新的冲突 - if (animated) { - // 使用 dispatch_async 确保布局更新完成后再滚动 - dispatch_async(dispatch_get_main_queue(), ^{ - [self.messageTableView scrollToRowAtIndexPath:ip atScrollPosition:UITableViewScrollPositionBottom animated:YES]; - }); - } else { - // 使用更平滑的滚动动画，减少与礼物动画的视觉冲突 - [UIView animateWithDuration:0.3 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{ - [self.messageTableView scrollToRowAtIndexPath:ip atScrollPosition:UITableViewScrollPositionBottom animated:NO]; - } completion:nil]; - } - - self.atCount = 0; - self.atTipBtn.hidden = YES; - [self.locationArray removeAllObjects]; - } -} - -///自定义消息 是否可以加到 公屏 需要自己维护 -- (BOOL)isCanDisplayMessage:(NIMMessage *)message { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - - if (attachment.first == CustomMessageType_Face && attachment.second == Custom_Message_Sub_Face_Send) { - return NO; - } - - if (attachment.first == CustomMessageType_User_Enter_Room && attachment.second == Custom_Message_Sub_User_Enter_Room) { - return NO; - } - if (attachment.first == CustomMessageType_RedPacket) { - return NO; - } - - if (attachment.first == CustomMessageType_Room_PK && attachment.second == Custom_Message_Sub_Room_PK_Manager_Up_Mic) { - if (attachment.data && [attachment.data allKeys].count > 0) { - for (NSDictionary * dic in [attachment.data allValues]) { - RoomPKChooseUserModel * userModel = [RoomPKChooseUserModel modelWithDictionary:dic]; - if (userModel.groupType == GroupType_Red || userModel.groupType == GroupType_Blue) { - return YES; - } - } - } - return NO; - } else if(attachment.first == CustomMessageType_Room_Sailing && (attachment.second == Custom_Message_Sub_Sailing_AllRoom_Notify || attachment.second == Custom_Message_Sub_Sailing_InRoom_NeedAllMicSend)) { - RoomSailingPrizeModel * prizeModel = [RoomSailingPrizeModel modelWithDictionary:attachment.data]; - if (self.hostDelegate.getUserInfo.userLevelVo.experLevelSeq > prizeModel.userLevelLimit) { - return YES; - } - } else if(attachment.first == CustomMessageType_Room_Album){ - return YES; - }else if(attachment.first == CustomMessageType_Gift) { - if(attachment.data[@"isRoomAlbum"] != nil){ - BOOL isRoomAlbum = [attachment.data[@"isRoomAlbum"] boolValue]; - if(isRoomAlbum == YES){ - return NO; - } - } - GiftReceiveInfoModel *info = [GiftReceiveInfoModel modelWithJSON:attachment.data]; - GiftInfoModel *giftInfo = info.gift == nil ? info.giftInfo : info.gift; - if (giftInfo == nil) { - giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:info.giftId inRoom:@(info.roomUid).stringValue]; - } - if (giftInfo.giftType == GiftType_super){ - return NO; - } - }else if(attachment.first == CustomMessageType_AllMicroSend){ - GiftReceiveInfoModel *info = [GiftReceiveInfoModel modelWithJSON:attachment.data]; - GiftInfoModel *giftInfo = info.gift == nil ? info.giftInfo : info.gift; - if (giftInfo == nil) { - giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:info.giftId inRoom:@(info.roomUid).stringValue]; - } - if (giftInfo.giftType == GiftType_super){ - return NO; - } - } - return [[[self supportMessageDic] objectForKey:@(attachment.first)] containsObject:@(attachment.second)]; - } - return NO; -} - -- (NSDictionary *)supportMessageDic { - return @{ - @(CustomMessageType_AllMicroSend): - [NSSet setWithObjects: - @(Custom_Message_Sub_AllMicroSend), - @(Custom_Message_Sub_AllMicroLuckySend), - @(Custom_Message_Sub_AllBatchSend), - @(Custom_Message_Sub_AllBatchMicroLuckySend), - nil], - @(CustomMessageType_Gift): - [NSSet setWithObjects: - @(Custom_Message_Sub_Gift_Send), - @(Custom_Message_Sub_Gift_LuckySend), - nil], - @(CustomMessageType_Room_Tip): - [NSSet setWithObjects: - @(Custom_Message_Sub_Room_Tip_ShareRoom), - @(Custom_Message_Sub_Room_Tip_Attention_Owner), - nil], - @(CustomMessageType_Kick_User): - [NSSet setWithObjects: - @(Custom_Message_Sub_Kick_BeKicked), - @(Custom_Message_Sub_Kick_BlackList), - nil], - @(CustomMessageType_Queue): - [NSSet setWithObjects: - @(Custom_Message_Sub_Queue_Kick), - nil], - @(CustomMessageType_Look_Love): - [NSSet setWithObjects: - @(Custom_Message_Sub_Look_Love_Me), - @(Custom_Message_Sub_Look_Love_InRoom), - @(Custom_Message_Sub_Look_Love_AllRoom), - @(Custom_Message_Sub_Look_Love_AllRoom_Notify), - @(Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend), - nil], - @(CustomMessageType_Arrange_Mic): - [NSSet setWithObjects: - @(Custom_Message_Sub_Arrange_Mic_Mode_Open), - @(Custom_Message_Sub_Arrange_Mic_Mode_Close), - @(Custom_Message_Sub_Arrange_Mic_Free_Mic_Open), - @(Custom_Message_Sub_Arrange_Mic_Free_Mic_Close), - nil], - @(CustomMessageType_Update_RoomInfo): - [NSSet setWithObjects: - @(Custom_Message_Sub_Update_RoomInfo_MessageState), - @(Custom_Message_Sub_Update_RoomInfo_AnimateEffect), - nil], - @(CustomMessageType_Collection_Room): - [NSSet setWithObjects: - @(Custom_Message_Sub_Collect_Room_Tips), - nil], - @(CustomMessageType_RoomPlay_Dating): - [NSSet setWithObjects: - @(Custom_Message_Sub_Room_Play_Dating_Pick_Heart), - @(Custom_Message_Sub_Room_Play_Dating_Result_Mutual), - @(Custom_Message_Sub_Room_Play_Dating_Result_Not_Mutual), - nil], - @(CustomMessageType_Noble_VIP): - [NSSet setWithObjects: - @(Custom_Message_Sub_Room_Open_Noble_VIP), - @(Custom_Message_Sub_Room_Noble_LevelUp), - @(Custom_Message_Sub_AllRoom_Noble_LevelUp_Suspend), - nil], - @(CustomMessageType_Face): - [NSSet setWithObjects: - @(Custom_Message_Sub_Face_Send), - nil], - @(CustomMessageType_Anchor_FansTeam): - [NSSet setWithObjects: - @(Custom_Message_Sub_FansTeam_Open_Success), - @(Custom_Message_Sub_FansTeam_Open_Fail), - @(Custom_Message_Sub_FansTeam_Join_Success), - @(Custom_Message_Sub_FansTeam_Out_Success), - nil], - @(CustomMessageType_Hall_Super_Admin): - [NSSet setWithObjects: - @(Custom_Message_Sub_Hall_Super_Admin_Kick_Manager_Out_Room), - nil], - @(CustomMessageType_Room_PK): - [NSSet setWithObjects: - @(Custom_Message_Sub_Room_PK_Manager_Up_Mic), - @(Custom_Message_Sub_Room_PK_Mode_Close), - @(Custom_Message_Sub_Room_PK_Result), - @(Custom_Message_Sub_Room_PK_Mode_Open), - @(Custom_Message_Sub_Room_PK_Start), - @(Custom_Message_Sub_Room_PK_Re_Start), - nil], - @(CustomMessageType_LuckyBag): - [NSSet setWithObjects: - @(Custom_Message_Sub_Room_Gift_LuckBag_Server), - @(Custom_Message_Sub_Room_Gift_LuckBag_FullScree), - nil], - @(CustomMessageType_Gift_Compound): - [NSSet setWithObjects:@(Custom_Message_Sub_Gift_Compound), - nil], - @(CustomMessageType_Tarot): - [NSSet setWithObjects: - @(Custom_Message_Sub_Tarot_Novice), - @(Custom_Message_Sub_Tarot_Advanced), - @(Custom_Message_Sub_Tarot_Intermediate), - nil], - @(CustomMessageType_Room_Sailing): - [NSSet setWithObjects: - @(Custom_Message_Sub_Sailing_Me), - @(Custom_Message_Sub_Sailing_InRoom), - @(Custom_Message_Sub_Sailing_AllRoom), - @(Custom_Message_Sub_Sailing_AllRoom_Notify), - @(Custom_Message_Sub_Sailing_InRoom_NeedAllMicSend), - nil], - @(CustomMessageType_RedPacket): - [NSSet setWithObjects: - @(Custom_Message_Sub_OpenRedPacketSuccess), - @(Custom_Message_Sub_LuckyPackage), - nil], - @(CustomMessageType_General_Public_Screen): - [NSSet setWithObjects: - @(Custom_Message_Sub_General_Public_Screen_One_Room), - @(Custom_Message_Sub_General_Public_Screen_All_Room), - nil], - @(CustomMessageType_Super_Gift): - [NSSet setWithObjects: - @(Custom_Message_Sub_Super_Gift), - @(Custom_Message_Sub_Super_Gift_Room_Message), - nil], - }; -} - -- (void)addCustomMessage:(NSNotification *)notification { - self.isMiniEnter = NO; - if (self.hostDelegate.getRoomInfo.isCloseScreen) {return;} - NIMMessage * message = notification.object; - [self addRoomMessage:message]; -} - -///用户进入房间显示 房间话题 -- (void)createUserEnterRoomAddRoomTopicMessage { - if ([ClientConfig shareConfig].configInfo.hideNoticeVersion == YES) { - return; - } - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - if (roomInfo.uid == [AccountInfoStorage instance].getUid.integerValue) {return;} - NSString * key = [NSString stringWithFormat:@"%@_%@_%ld", kRoomShowTopicKey, [AccountInfoStorage instance].getUid, roomInfo.uid]; - NSDate * oldDate = [[NSUserDefaults standardUserDefaults] valueForKey:key]; - NSDate * date = [NSDate date]; - if (roomInfo.introduction.length > 0) { - if (oldDate) { - NSDateComponents *compons = [PLTimeUtil compareTwoDate:date secondDate:[NSDate date]]; - if (ABS(compons.year) > 0 || ABS(compons.month) > 0 || ABS(compons.day) > 0) { - NIMMessage * message = [[NIMMessage alloc] init]; - NIMTipObject *tipObject = [[NIMTipObject alloc] init]; - message.messageObject = tipObject; - NSString * content = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageContainerView3"), roomInfo.introduction]; - message.text = content; - message.localExt = @{@"isRoomTopic": @(NO)}; - [message setValue:@(NIMMessageTypeTip) forKey:@"messageType"]; - [message setValue:[NIMSession session:[NSString stringWithFormat:@"%ld", roomInfo.roomId] type:NIMSessionTypeChatroom] forKey:@"session"]; - [self addRoomMessage:message]; - - [[NSUserDefaults standardUserDefaults] setValue:@(YES) forKey:key]; - [[NSUserDefaults standardUserDefaults] synchronize]; - } - } else { - NIMMessage * message = [[NIMMessage alloc] init]; - NSString * content = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageContainerView3"), roomInfo.introduction]; - message.text = content; - message.localExt = @{@"isRoomTopic": @(NO)}; - [message setValue:@(NIMMessageTypeTip) forKey:@"messageType"]; - [message setValue:[NIMSession session:[NSString stringWithFormat:@"%ld", roomInfo.roomId] type:NIMSessionTypeChatroom] forKey:@"session"]; - [self addRoomMessage:message]; - - [[NSUserDefaults standardUserDefaults] setValue:@(YES) forKey:key]; - [[NSUserDefaults standardUserDefaults] synchronize]; - } - } - - NIMMessage * message = [[NIMMessage alloc] init]; - NIMTipObject *tipObject = [[NIMTipObject alloc] init]; - message.messageObject = tipObject; - message.text = YMLocalizedString(@"XPRoomMessageContainerView5"); - message.localExt = @{@"isRoomTopic": @(YES)}; - [message setValue:@(NIMMessageTypeTip) forKey:@"messageType"]; - [message setValue:[NIMSession session:[NSString stringWithFormat:@"%ld", roomInfo.roomId] type:NIMSessionTypeChatroom] forKey:@"session"]; - [self addRoomMessage:message]; -} - -- (void)handleBroadcastMessageAttachment:(AttachmentModel *)attachment; { -// if (attachment.first == CustomMessageType_RoomBoom) { -// Boom632Model *m = [Boom632Model modelWithJSON:attachment.data]; -// NIMMessage * message = [[NIMMessage alloc] init]; -// message.text = YMLocalizedString(@"XPRoomMessageContainerView5"); -// message.localExt = @{@"isRoomTopic": @(YES)}; -// [message setValue:@(NIMMessageTypeTip) forKey:@"messageType"]; -// [message setValue:[NIMSession session:[NSString stringWithFormat:@"%ld", roomInfo.roomId] type:NIMSessionTypeChatroom] forKey:@"session"]; -// [self addRoomMessage:message]; -// } -} - -- (void)handleBroadcastMessage:(NIMBroadcastMessage *)message { - [self addRoomMessage:message]; -} - -#pragma mark - RoomGuestDelegate -- (void)handleNIMCustomAttachment:(AttachmentModel *)attachment{ - -} -- (void)handleNIMCustomMessage:(NIMMessage *)message { - self.isMiniEnter = NO; - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - - // 这里其实是特殊处理 - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - switch (attachment.first) { - case CustomMessageType_Update_RoomInfo: { - if (attachment.second == Custom_Message_Sub_Update_RoomInfo_MessageState) { - [self.datasource removeAllObjects]; - [self updateAllDataSource:nil]; - [self.incomingMessages removeAllObjects]; - [self.locationArray removeAllObjects]; - self.forceReloadNextAppend = YES; - self.atCount = 0; - self.atTipBtn.hidden = YES; - self.messageTipsBtn.hidden = YES; - self.isPending = NO; - [[XPRoomMiniManager shareManager] resetLocalMessage]; - [self addRoomMessage:message]; - } else if (attachment.second == Custom_Message_Sub_Update_RoomInfo_CleanScreen) { - [self.datasource removeAllObjects]; - [self updateAllDataSource:nil]; - [self.incomingMessages removeAllObjects]; - [self.locationArray removeAllObjects]; - self.forceReloadNextAppend = YES; - self.atCount = 0; - self.atTipBtn.hidden = YES; - self.messageTipsBtn.hidden = YES; - self.isPending = NO; - [[XPRoomMiniManager shareManager] resetLocalMessage]; - [self addRoomMessage:message]; - } - } - break; - case CustomMessageType_Candy_Tree: { - if(attachment.second == Custom_Message_Sub_Candy_Tree_Me) { - CandyTreeGiftInfoModel * model = [CandyTreeGiftInfoModel modelWithDictionary:attachment.data]; - if (model.uid.integerValue != [AccountInfoStorage instance].getUid.integerValue) { - return; - } - } - } - break; - case CustomMessageType_Kick_User: { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = roomId; - request.userIds = @[uid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember * member = members.firstObject; - BOOL isCreator = member.type == NIMChatroomMemberTypeCreator; - BOOL isManager = member.type == NIMChatroomMemberTypeManager; - if (isCreator || isManager) { - [self addRoomMessage:message]; - } - } - }]; - } - break; - case CustomMessageType_Hall_Super_Admin: { - [self addRoomMessage:message]; - } - break; - case CustomMessageType_RedPacket: { - NSDictionary *data = attachment.data; - if (data) { - NSInteger currentRoomUID = self.hostDelegate.getRoomInfo.uid; - NSNumber *messageRoomUI = [data objectForKey:@"roomUid"]; - if (messageRoomUI) { - if (currentRoomUID == messageRoomUI.integerValue) { - [self addRoomMessage:message]; - } - } - } - } - break; - case CustomMessageType_User_Enter_Room: { - if (attachment.second == Custom_Message_Sub_Pic_Message) { - [self addRoomMessage:message]; - } else if (attachment.second == Custom_Message_Sub_User_Enter_Room) { - RoomEnterModel *model = [RoomEnterModel modelWithJSON:attachment.data]; - if (model.screenType == 1 || model.enterHide == 1) { - return; - } - for (int index = 0; index 0) { - delay = 2.5; - } - } - } - } - - if (delay > 0 ) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self addRoomMessage:message]; - }); - } - } - break; - default: - break; - } - } - - if (self.hostDelegate.getRoomInfo.isCloseScreen) { - return; - } - - // isCanDisplayMessage 是通用的过滤 - if ([self isCanDisplayMessage:message]) { - [self addRoomMessage:message]; - } -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - self.isMiniEnter = NO; - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - if (![notiMsg.content isKindOfClass:[NIMChatroomNotificationContent class]]) { - return; - } - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - if (content.eventType == NIMChatroomEventTypeEnter) { - - if (roomInfo.isCloseScreen) { - self.isLoadHistoryMessage = NO; - AttachmentModel *attachment = [[AttachmentModel alloc]init]; - attachment.first = CustomMessageType_Update_RoomInfo; - attachment.second = Custom_Message_Sub_Update_RoomInfo_MessageState; - attachment.data = @{@"roomInfo":self.hostDelegate.getRoomInfo.model2dictionary}; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - [self addRoomMessage:message]; - return; - } else { - NIMChatroomNotificationMember *member = content.targets[0]; - if (member.userId.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - ///自己进房成功后拉取历史消息 - if(self.datasource.count > 0) - { - self.isLoadHistoryMessage = NO; - return; - } - [self handleFetchHistoryMessage:message]; - } else { - self.isLoadHistoryMessage = NO; - BOOL hideEnter = [self handleHideEnter:message]; - if (!hideEnter) { - ///插入进房消息及房间公告提示 - [self addRoomMessage:message]; - } - } - } - } else if(content.eventType == NIMChatroomEventTypeInfoUpdated) { - if (roomInfo.isCloseScreen) {return;} - if (roomInfo.datingState == RoomDatingStateChangeType_Open) { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = roomId; - request.userIds = @[uid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember * member = members.firstObject; - BOOL isCreator = member.type == NIMChatroomMemberTypeCreator; - BOOL isManager = member.type == NIMChatroomMemberTypeManager; - if (isCreator || isManager) { - [self addRoomMessage:message]; - } - } - }]; - }// else if (roomInfo) - } -} - -- (void)handleFetchNewestMessage:(NIMMessage *)message { - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - NSString *roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - NIMHistoryMessageSearchOption *option = [[NIMHistoryMessageSearchOption alloc] init]; - option.limit = [ClientConfig shareConfig].configInfo.roomMessageCount; - option.order = NIMMessageSearchOrderDesc; - option.messageTypes = @[@(NIMMessageTypeText),@(NIMMessageTypeCustom)]; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchMessageHistory:roomId - option:option - result:^(NSError * _Nullable error, NSArray * _Nullable messages) { - @kStrongify(self); - if(error != nil){ - self.isLoadHistoryMessage = NO; - } - if (self.datasource.count > kRoomMessageMaxLength) { - NSIndexSet *set = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, kRoomMessageMaxLength/2)]; - NSArray *needRemoveMsgArray = [self.datasource objectsAtIndexes:set]; - [self.datasource removeObjectsInArray:needRemoveMsgArray]; - } - // 执行插入 - for (NIMMessage *item in messages.reverseObjectEnumerator) { - [self dealWithHistoryDataWithMessage:item]; - } - self.isLoadHistoryMessage = NO; - BOOL hideEnter = [self handleHideEnter:message]; - if (!hideEnter) { - ///插入进房消息及房间公告提示 - [self addRoomMessage:message]; - } - if (!roomInfo.hasAnimationEffect) { - [self roomInfoNoGiftAnimationMessage:message]; - } - [self createUserEnterRoomAddRoomTopicMessage]; - - [self updateAllDataSource:nil]; - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.messageTableView reloadData]; - [self scrollToBottom:YES]; - }); - }]; -} - -- (void)handleFetchHistoryMessage:(NIMMessage *)message { - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - NSString *roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - NIMHistoryMessageSearchOption *option = [[NIMHistoryMessageSearchOption alloc] init]; - option.limit = [ClientConfig shareConfig].configInfo.roomMessageCount; - option.startTime = self.hostDelegate.getRoomInfo.clearScreenTime / 1000.0; - option.order = NIMMessageSearchOrderAsc; - option.messageTypes = @[@(NIMMessageTypeText),@(NIMMessageTypeCustom)]; - [[NIMSDK sharedSDK].chatroomManager fetchMessageHistory:roomId - option:option - result:^(NSError * _Nullable error, NSArray * _Nullable messages) { - if(error != nil){ - self.isLoadHistoryMessage = NO; - } - if (messages.count) { - //如果拉取的数量等于请求的数量，说明这个时间点以后的消息数量大于等于需要拉取的数量，直接拉取最新的50条 - if (messages.count == [ClientConfig shareConfig].configInfo.roomMessageCount) { - [self handleFetchNewestMessage:message]; - } else { - if (self.datasource.count > kRoomMessageMaxLength) { - NSIndexSet *set = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, kRoomMessageMaxLength/2)]; - NSArray *needRemoveMsgArray = [self.datasource objectsAtIndexes:set]; - [self.datasource removeObjectsInArray:needRemoveMsgArray]; - } - // 执行插入 - for (NIMMessage *item in messages) { - [self dealWithHistoryDataWithMessage:item]; - } - - self.isLoadHistoryMessage = NO; - BOOL hideEnter = [self handleHideEnter:message]; - if (!hideEnter) { - ///插入进房消息及房间公告提示 - [self addRoomMessage:message]; - } - if (!roomInfo.hasAnimationEffect) { - [self roomInfoNoGiftAnimationMessage:message]; - } - [self createUserEnterRoomAddRoomTopicMessage]; - - [self updateAllDataSource:nil]; - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.messageTableView reloadData]; - [self scrollToBottom:YES]; - }); - } - }else{ - dispatch_async(dispatch_get_main_queue(), ^{///回到主线程 - self.isLoadHistoryMessage = NO; - BOOL hideEnter = [self handleHideEnter:message]; - if (!hideEnter) { - ///插入进房消息及房间公告提示 - [self addRoomMessage:message]; - } - if (!roomInfo.hasAnimationEffect) { - [self roomInfoNoGiftAnimationMessage:message]; - } - [self createUserEnterRoomAddRoomTopicMessage]; - }); - } - - }]; -} --(void)dealWithHistoryDataWithMessage:(NIMMessage *)item{ - BOOL isHaveSave = NO; - if(item.messageType == NIMMessageTypeText){ - isHaveSave = YES; - }else if(item.messageType == NIMMessageTypeCustom){ - NIMCustomObject *obj = (NIMCustomObject *)item.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_Room_Album && attachment.second == Custom_Message_Sub_Room_Album) { - isHaveSave = YES; - } else if (attachment.first == CustomMessageType_User_Enter_Room && attachment.second == Custom_Message_Sub_Pic_Message) { - isHaveSave = YES; - } - } - } - if(isHaveSave == NO)return; - [self.datasource addObject:[self.messageParser parseMessageAttribute:item]]; - if (!self.isMiniEnter) {/// 最小化进房的话 不需要重新保存 - if (self.hostDelegate.getRoomInfo.isCloseScreen) { - NIMCustomObject *obj = (NIMCustomObject *)item.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_Update_RoomInfo && attachment.second == Custom_Message_Sub_Update_RoomInfo_MessageState){ - [[XPRoomMiniManager shareManager] saveRoomMessage:item]; - } - } - } else { - [[XPRoomMiniManager shareManager] saveRoomMessage:item]; - } - } -} -- (void)handleNIMTextMessage:(NIMMessage *)message { - self.isMiniEnter = NO; - if (self.hostDelegate.getRoomInfo.isCloseScreen) {return;} - [self addRoomMessage:message]; -} - -- (void)roomInfoNoGiftAnimationMessage:(NIMMessage *)message { - self.isMiniEnter = NO; - AttachmentModel *attachement = [[AttachmentModel alloc]init]; - attachement.first = CustomMessageType_Update_RoomInfo; - attachement.second = Custom_Message_Sub_Update_RoomInfo_AnimateEffect; - NIMMessage *tempMessage = [[NIMMessage alloc]init]; - NIMCustomObject *customObject = [[NIMCustomObject alloc]init]; - customObject.attachment = attachement; - tempMessage.messageObject = customObject; - [self addRoomMessage:tempMessage]; -} - -- (void)onRoomMiniEntered { - self.isMiniEnter = YES; - self.isLoadHistoryMessage = NO; - ///最小化进房 不需要请求任何接口 但是如果不加延迟的话 无法滚动到底部 原因还不知道 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - NSMutableArray *tempArray = @[].mutableCopy; - NSArray * temArray = [XPRoomMiniManager shareManager].getLocalCurrentRoomMessage; - [temArray enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - id model = nil; - if ([obj isKindOfClass:[NIMMessage class]]) { - model = [self.messageParser parseMessageAttribute:(NIMMessage *)obj]; - } else if ([obj isKindOfClass:[NIMBroadcastMessage class]]) { - model = [self.messageParser parseBroadcastMessageAttribute:(NIMBroadcastMessage *)obj]; - } - if (model) { - [tempArray addObject:model]; - [self.datasource addObject:model]; - } - }]; - - [self updateAllDataSource:tempArray]; - [self.messageTableView reloadData]; - //执行插入动画并滚动 - [self scrollToBottom:YES]; - }); -} - -- (void)onRoomEntered { - [[XPRoomMiniManager shareManager] resetLocalMessage]; - self.headerView.bubbleColor = self.hostDelegate.getRoomInfo.type == RoomType_MiniGame ? [UIColor colorWithWhite:1 alpha:0.2] : [UIColor colorWithWhite:1 alpha:0.3]; -} - -- (void)onRoomUpdate { - ///改变公屏的背景样式 - if (self.hostDelegate.getRoomInfo.hadChangeRoomType) { - self.headerView.bubbleColor = self.hostDelegate.getRoomInfo.type == RoomType_MiniGame ? [UIColor colorWithWhite:1 alpha:0.2] : [UIColor colorWithWhite:1 alpha:0.3]; - [self.messageTableView reloadData]; - } - RoomInfoModel *infoModel = self.hostDelegate.getRoomInfo; - CGFloat top = infoModel.type == RoomType_MiniGame ? 0 : 10; - [self.messageTableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(15); - make.bottom.trailing.mas_equalTo(self); - make.top.equalTo(self).mas_offset(top); - }]; -} - -#pragma mark - ScrollViewDelegate -- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView { - // 手动拖拽开始 - self.isPending = YES; -} -- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate { - // 手动拖拽结束（decelerate：0松手时静止；1松手时还在运动,会触发DidEndDecelerating方法） - if (!decelerate) { - [self finishDraggingWith:scrollView]; - } -} -- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView { - // 静止后触发（手动） - [self finishDraggingWith:scrollView]; -} -- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView { - if (!self.isPending && self.incomingMessages.count <= 0) { - [self scrollToBottom:YES]; - } -} - -/** - 手动拖拽动作彻底完成(减速到零) - */ -- (void)finishDraggingWith:(UIScrollView *)scrollView { - CGFloat contentSizeH = scrollView.contentSize.height; - CGFloat contentOffsetY = scrollView.contentOffset.y; - CGFloat sizeH = scrollView.frame.size.height; - self.isPending = contentSizeH - contentOffsetY - sizeH > 20.0; - if (!self.isPending) { - self.messageTipsBtn.hidden = YES; - self.atTipBtn.hidden = YES; - self.atCount = 0; - [self.locationArray removeAllObjects]; - if (self.incomingMessages.count > 0) { - [self appendAndScrollToBottom]; - } - } - [[NSNotificationCenter defaultCenter] postNotificationName:@"roomMessageTabelViewStopScroll" object:nil]; -} - - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - // 在 DiffableDataSource 模式下，使用 dataSourceManager 的数据计算行高 - XPMessageInfoModel *model = nil; - if (self.useDiffableDataSource) { - NSArray *messages = [self.dataSourceManager messagesForDisplayType:self.displayType]; - if (indexPath.row < messages.count) { - XPMessageItem *item = [messages objectAtIndex:indexPath.row]; - model = item.messageModel; - } - } else { - NSArray *source = @[]; - switch (self.displayType) { - case 1: - source = self.datasource; - break; - case 2: - source = self.datasource_chat; - break; - case 3: - source = self.datasource_gift; - break; - default: - source = self.datasource; - break; - } - model = [source xpSafeObjectAtIndex:indexPath.row]; - } - - // 预计算并缓存高度，避免使用 UITableViewAutomaticDimension - if (model.rowHeight <= 0) { - [self calculateRowHeightForModel:model]; - } - - if (model && model.first == CustomMessageType_RedPacket && model.second == Custom_Message_Sub_LuckyPackage) { - return model.rowHeight; - } - - return model.rowHeight + 20; -} - -// 新增方法：预计算行高 -- (void)calculateRowHeightForModel:(XPMessageInfoModel *)model { - if (!model || !model.content) { - model.rowHeight = 44; // 默认高度 - return; - } - - // 使用 YYTextLayout 计算文本高度 - YYTextContainer *container = [YYTextContainer new]; - container.size = CGSizeMake(kRoomMessageMaxWidth - 24, MAXFLOAT); - container.maximumNumberOfRows = 0; - - YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:model.content]; - model.rowHeight = layout.textBoundingSize.height; - - // 确保最小高度 - if (model.rowHeight < 44) { - model.rowHeight = 44; - } -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - NSInteger count = 0; - switch (self.displayType) { - case 1: - count = self.datasource.count; - break; - case 2: - count = self.datasource_chat.count; - break; - case 3: - count = self.datasource_gift.count; - break; - default: - count = self.datasource.count; - break; - } - // 确保返回非负数 - return MAX(0, count); -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - NSArray *source = @[]; - switch (self.displayType) { - case 1: - source = self.datasource; - break; - case 2: - source = self.datasource_chat; - break; - case 3: - source = self.datasource_gift; - break; - - default: - source = self.datasource; - break; - } - XPMessageInfoModel *model = [source xpSafeObjectAtIndex:indexPath.row]; - NSString *cellKey = [NSString isEmpty:model.cellKey] ? NSStringFromClass([XPRoomMessageTableViewCell class]) : model.cellKey; - if(model.first == CustomMessageType_Room_Album || - (model.first == CustomMessageType_User_Enter_Room && model.second == Custom_Message_Sub_Pic_Message)){ - PIRoomMessagePhotoAlbumCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([PIRoomMessagePhotoAlbumCell class])]; - cell.delegate = self; - cell.messageInfo = model; - cell.roomType = self.hostDelegate.getRoomInfo.type; - return cell; - } else if (model.first == CustomMessageType_RedPacket && model.second == Custom_Message_Sub_LuckyPackage) { - LuckyPackageMessageTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"LuckyPackageMessageTableViewCell" forIndexPath:indexPath]; - cell.dataSource = model.customInfo; - return cell; - } else if (model.first == CustomMessageType_User_Enter_Room && model.second == Custom_Message_Sub_User_Enter_Room) { - CPEnterRoomTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"CPEnterRoomTableViewCell" forIndexPath:indexPath]; - cell.cpIndex = [[model.customInfo objectForKey:@"cpIndex"] integerValue]; - cell.dataSource = model.customInfo; - return cell; - } - else if (model.isBoom) { - cellKey = @"XPRoomMessageTableViewCell_Boom"; - } - - XPRoomMessageTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:cellKey]; - cell.delegate = self; - cell.isLeftBigImage = model.isBoom; - - cell.messageInfo = model; - cell.roomType = self.hostDelegate.getRoomInfo.type; - - return cell; -} - -//- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath { -// NSArray *source = @[]; -// switch (self.displayType) { -// case 1: -// source = self.datasource; -// break; -// case 2: -// source = self.datasource_chat; -// break; -// case 3: -// source = self.datasource_gift; -// break; -// -// default: -// source = self.datasource; -// break; -// } -// XPMessageInfoModel *model = [source xpSafeObjectAtIndex:indexPath.row]; -// if (model.rowHeight == 0) { -// model.rowHeight = CGRectGetHeight(cell.frame); -// } -//} - - -#pragma mark - XPRoomMessageTableViewCellDelegate -- (void)xPRoomMessageTableViewCellDidTapEmpty:(XPRoomMessageTableViewCell *)view { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomMessageContainerViewlDidTapEmpty:)]) { - [self.delegate xPRoomMessageContainerViewlDidTapEmpty:self]; - } -} --(void)clickDidTapEmptyAction{ - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomMessageContainerViewlDidTapEmpty:)]) { - [self.delegate xPRoomMessageContainerViewlDidTapEmpty:self]; - } -} -#pragma mark - PIRoomMessagePhotoAlbumCell -- (void)pIRoomMessagePhotoAlbumCellDelegateDidTapEmpty:(PIRoomMessagePhotoAlbumCell *)view{ - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomMessageContainerViewlDidTapEmpty:)]) { - [self.delegate xPRoomMessageContainerViewlDidTapEmpty:self]; - } -} --(void)unlockAlbumHandleWithInfo:(PIRoomPhotoAlbumItemModel *_Nonnull)info{ - PIRoomMessageUnlockPhotoAlbumView *albumView = [[PIRoomMessageUnlockPhotoAlbumView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - albumView.albumModel = info; - albumView.delegate = self; - [TTPopup popupView:albumView style:TTPopupStyleAlert]; -} --(void)pIRoomMessagePhotoAlbumCell:(PIRoomMessagePhotoAlbumCell *_Nonnull)cell lookUpAlbumPhotoWithAlbumModel:(PIRoomPhotoAlbumItemModel *_Nonnull)albumModel;{ - SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init]; - browser.sourceImagesContainerView = cell; - browser.delegate = self; - browser.imageCount = 1; - browser.currentImageIndex = 0; - browser.isMe = NO; - self.lookUpModel = albumModel; - [browser show]; -} -- (void)pIRoomMessagePhotoAlbumCell:(PIRoomMessagePhotoAlbumCell *)cell lookUpUserCardModel:(PIRoomPhotoAlbumItemModel *)albumModel{ - [self.messageParser showUserCard:albumModel.uid.integerValue]; -} -#pragma mark - PIRoomMessageUnlockPhotoAlbumViewDelegate -- (void)unlockRoomAlbumImageWithAlbumModel:(PIRoomPhotoAlbumItemModel *)albumModel{ - [XNDJTDDLoadingTool showLoading]; - [Api unlockRoomAlbumPhoto:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - [XNDJTDDLoadingTool hideHUD]; - if(code == 200){ - NSMutableDictionary *getData = [NSMutableDictionary dictionary]; - [getData addEntriesFromDictionary:data.data]; - AttachmentModel *attachment = [[AttachmentModel alloc] init]; - attachment.first = CustomMessageType_Gift; - attachment.second = Custom_Message_Sub_Gift_Send; - NSDictionary *targetUsers = ((NSArray *)[getData objectForKey:@"targetUsers"]).firstObject; - [getData setObject:[targetUsers valueForKeyPath:@"uid"] forKey:@"targetUid"]; - [getData setObject:[targetUsers valueForKeyPath:@"nick"] forKey:@"targetNick"]; - [getData setObject:[targetUsers valueForKeyPath:@"avatar"] forKey:@"targetAvatar"]; - [getData setObject:@(YES) forKey:@"isRoomAlbum"]; - attachment.data = getData; - [self sendCustomMessage:attachment]; - if(albumModel.ID != nil){ - if(![[XPSkillCardPlayerManager shareInstance].photoIdList containsObject:albumModel.ID]){ - if([XPSkillCardPlayerManager shareInstance].photoIdList == nil){ - [XPSkillCardPlayerManager shareInstance].photoIdList = [NSMutableArray arrayWithArray:@[albumModel.ID]]; - }else{ - [[XPSkillCardPlayerManager shareInstance].photoIdList addObject:albumModel.ID]; - } - } - [[NSNotificationCenter defaultCenter]postNotificationName:@"kGetgetUnlockRoomAlbumPhotoListNot" object:nil]; - } - return; - } - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } id:albumModel.ID roomUid:@(self.hostDelegate.getRoomInfo.uid).stringValue]; -} -- (void)sendCustomMessage:(AttachmentModel *)attachment { - - NSString *sessionID = [NSString stringWithFormat:@"%ld", [self.hostDelegate getRoomInfo].roomId]; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - - UserInfoModel *userInfo = [self.hostDelegate getUserInfo]; - XPMessageRemoteExtModel *extModel = [[XPMessageRemoteExtModel alloc] init]; - extModel.androidBubbleUrl = userInfo.androidBubbleUrl; - extModel.iosBubbleUrl = userInfo.iosBubbleUrl; - extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; - extModel.platformRole = userInfo.platformRole; - NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[NSString stringWithFormat:@"%ld", userInfo.uid]]; - message.remoteExt = remoteExt; - NIMSessionType sessionType = NIMSessionTypeChatroom; - //构造会话 - NIMSession *session = [NIMSession session:sessionID type:sessionType]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; -} - -#pragma mark - SDPhotoBrowserDelegate -- (NSURL *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageURLForIndex:(NSInteger)index{ - if(self.lookUpModel != nil){ - return [[NSURL alloc]initWithString:self.lookUpModel.photoUrl]; - } - return nil; -} -- (UIImage *)photoBrowser:(SDPhotoBrowser *)browser placeholderImageForIndex:(NSInteger)index { - return [UIImageConstant defaultBannerPlaceholder]; -} -#pragma mark - Getters And Setters -- (UITableView *)messageTableView { - if (!_messageTableView) { - _messageTableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _messageTableView.delegate = self; - _messageTableView.dataSource = self; - // 移除 UITableViewAutomaticDimension，使用预计算的高度 - _messageTableView.rowHeight = 64; // 设置一个合理的默认高度 - _messageTableView.tableFooterView = [UIView new]; - _messageTableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _messageTableView.backgroundColor = [UIColor clearColor]; - _messageTableView.showsVerticalScrollIndicator = NO; - _messageTableView.clipsToBounds = NO; - _messageTableView.tag = 666; - if (@available(iOS 11.0, *)) { - _messageTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_messageTableView registerClass:[XPRoomMessageTableViewCell class] forCellReuseIdentifier:@"XPRoomMessageTableViewCell_Boom"]; - [_messageTableView registerClass:[XPRoomMessageTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomMessageTableViewCell class])]; - [_messageTableView registerClass:[XPRoomMessageTableViewCell class] forCellReuseIdentifier:@"ChatMessage"]; - [_messageTableView registerClass:[PIRoomMessagePhotoAlbumCell class] forCellReuseIdentifier:NSStringFromClass([PIRoomMessagePhotoAlbumCell class])]; - [_messageTableView registerClass:[LuckyPackageMessageTableViewCell class] forCellReuseIdentifier:@"LuckyPackageMessageTableViewCell"]; - [_messageTableView registerClass:[CPEnterRoomTableViewCell class] forCellReuseIdentifier:@"CPEnterRoomTableViewCell"]; - } - return _messageTableView; -} - -- (XPRoomMessageHeaderView *)headerView { - if (!_headerView) { - _headerView = [[XPRoomMessageHeaderView alloc] init]; - } - return _headerView; -} - -- (UIButton *)messageTipsBtn { - if (!_messageTipsBtn) { - _messageTipsBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_messageTipsBtn setTitle:YMLocalizedString(@"XPRoomMessageContainerView6") forState:UIControlStateNormal]; - [_messageTipsBtn setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - _messageTipsBtn.layer.cornerRadius = 15.0; - _messageTipsBtn.layer.masksToBounds = YES; - _messageTipsBtn.titleLabel.font = [UIFont systemFontOfSize:12.0]; - _messageTipsBtn.backgroundColor = [UIColor whiteColor]; - [_messageTipsBtn addTarget:self action:@selector(messageTipsBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - _messageTipsBtn.hidden = YES; - } - return _messageTipsBtn; -} - -- (UIButton *)atTipBtn { - if (!_atTipBtn) { - _atTipBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_atTipBtn setTitle:YMLocalizedString(@"XPRoomMessageContainerView7") forState:UIControlStateNormal]; - [_atTipBtn setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - _atTipBtn.layer.cornerRadius = 15.0; - _atTipBtn.layer.masksToBounds = YES; - _atTipBtn.titleLabel.font = [UIFont systemFontOfSize:12.0]; - _atTipBtn.backgroundColor = [UIColor whiteColor]; - [_atTipBtn addTarget:self action:@selector(atTipsBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - _atTipBtn.hidden = YES; - } - return _atTipBtn; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -- (NSMutableArray *)datasource_chat { - if (!_datasource_chat) { - _datasource_chat = [NSMutableArray array]; - } - return _datasource_chat; -} - -- (NSMutableArray *)datasource_gift { - if (!_datasource_gift) { - _datasource_gift = [NSMutableArray array]; - } - return _datasource_gift; -} - -- (NSMutableArray *)incomingMessages { - if (!_incomingMessages) { - _incomingMessages = [NSMutableArray array]; - } - return _incomingMessages; -} - -- (NSMutableArray *)locationArray { - if (!_locationArray) { - _locationArray = [NSMutableArray array]; - } - return _locationArray; -} - -- (XPRoomMessageParser *)messageParser { - if (!_messageParser) { - _messageParser = [[XPRoomMessageParser alloc] init]; - _messageParser.hostDelegate = self.hostDelegate; - } - return _messageParser; -} - -#pragma mark - DiffableDataSource Implementation - -- (void)setupDiffableDataSource { - if (!self.useDiffableDataSource) return; - - // 初始化数据源管理器 - self.dataSourceManager = [[XPMessageDataSourceManager alloc] initWithMaxMessages:1000]; - - // 设置 DiffableDataSource - self.diffableDataSource = [[UITableViewDiffableDataSource alloc] initWithTableView:self.messageTableView cellProvider:^UITableViewCell *(UITableView *tableView, NSIndexPath *indexPath, XPMessageItem *item) { - return [self dequeueCellForMessageItem:item atIndexPath:indexPath]; - }]; - - // 重要：设置 UITableView 的 dataSource - self.messageTableView.dataSource = self.diffableDataSource; - - // 设置初始快照 - NSDiffableDataSourceSnapshot *snapshot = [[NSDiffableDataSourceSnapshot alloc] init]; - [snapshot appendSectionsWithIdentifiers:@[@"messages"]]; - [self.diffableDataSource applySnapshot:snapshot animatingDifferences:NO]; - - NSLog(@"[XPRoomMessageContainerView] DiffableDataSource setup completed, tableView.dataSource=%@", self.messageTableView.dataSource); -} - -- (UITableViewCell *)dequeueCellForMessageItem:(XPMessageItem *)item atIndexPath:(NSIndexPath *)indexPath { - NSLog(@"[DiffableDataSource] dequeueCellForMessageItem called, indexPath=%@, item=%@", indexPath, item); - - XPMessageInfoModel *model = item.messageModel; - NSString *cellKey = [NSString isEmpty:model.cellKey] ? NSStringFromClass([XPRoomMessageTableViewCell class]) : model.cellKey; - - // 复用现有的 cell 创建逻辑 - if(model.first == 59 || // CustomMessageType_Room_Album - (model.first == 1 && model.second == 1)){ // CustomMessageType_User_Enter_Room && Custom_Message_Sub_Pic_Message - PIRoomMessagePhotoAlbumCell * cell = [self.messageTableView dequeueReusableCellWithIdentifier:NSStringFromClass([PIRoomMessagePhotoAlbumCell class])]; - cell.delegate = self; - cell.messageInfo = model; - cell.roomType = self.hostDelegate.getRoomInfo.type; - return cell; - } else if (model.first == 60 && model.second == 1) { // CustomMessageType_RedPacket && Custom_Message_Sub_LuckyPackage - LuckyPackageMessageTableViewCell *cell = [self.messageTableView dequeueReusableCellWithIdentifier:@"LuckyPackageMessageTableViewCell" forIndexPath:indexPath]; - cell.dataSource = model.customInfo; - return cell; - } else if (model.first == 1 && model.second == 1) { // CustomMessageType_User_Enter_Room && Custom_Message_Sub_User_Enter_Room - CPEnterRoomTableViewCell *cell = [self.messageTableView dequeueReusableCellWithIdentifier:@"CPEnterRoomTableViewCell" forIndexPath:indexPath]; - cell.cpIndex = [[model.customInfo objectForKey:@"cpIndex"] integerValue]; - cell.dataSource = model.customInfo; - return cell; - } - else if (model.isBoom) { - cellKey = @"XPRoomMessageTableViewCell_Boom"; - } - - XPRoomMessageTableViewCell * cell = [self.messageTableView dequeueReusableCellWithIdentifier:cellKey]; - cell.delegate = self; - cell.messageInfo = model; - return cell; -} - -- (void)addMessageWithDiffableDataSource:(NIMMessage *)message { - NSLog(@"[DiffableDataSource] addMessageWithDiffableDataSource called, messageType=%ld", (long)message.messageType); - - if (!self.useDiffableDataSource) { - NSLog(@"[DiffableDataSource] useDiffableDataSource is NO, falling back to addRoomMessage"); - // 回退到原有方法 - [self addRoomMessage:message]; - return; - } - - // parser 内部创建了 UI 对象（如 NetImageView），必须在主线程执行 - dispatch_async(dispatch_get_main_queue(), ^{ - // 解析消息（主线程） - XPMessageInfoModel *model = [self.messageParser parseMessageAttribute:message]; - if (!model) { - NSLog(@"[DiffableDataSource] Failed to parse message, messageType=%ld", (long)message.messageType); - return; - } - - NSLog(@"[DiffableDataSource] Parsed message successfully, first=%ld, second=%ld", (long)model.first, (long)model.second); - - // 创建消息项（主线程） - NSString *identifier = [NSString stringWithFormat:@"%@_%f", - message.from, - message.timestamp]; - XPMessageItem *item = [[XPMessageItem alloc] initWithMessageModel:model uniqueIdentifier:identifier]; - - NSLog(@"[DiffableDataSource] Created XPMessageItem, identifier=%@", identifier); - - // 添加到数据源管理器（同步写入，保证后续快照看到最新数据） - if ([self.dataSourceManager respondsToSelector:@selector(addMessageSync:)]) { - [self.dataSourceManager addMessageSync:item]; - } else { - [self.dataSourceManager addMessage:item]; - } - - NSLog(@"[DiffableDataSource] Added to dataSourceManager, total count=%ld", (long)[self.dataSourceManager totalMessageCount]); - - // 直接更新 UI 快照 - [self updateDiffableDataSourceSnapshot]; - }); -} - -- (void)changeTypeWithDiffableDataSource:(NSInteger)type { - if (self.displayType == type) return; - - self.displayType = type; - - if (!self.useDiffableDataSource) { - // 回退到原有方法 - [self changeType:type]; - return; - } - - // 更新 tableHeaderView - if (self.displayType == 1) { - self.messageTableView.tableHeaderView = self.headerView; - } else { - self.messageTableView.tableHeaderView = nil; - } - - // 更新数据源 - [self updateDiffableDataSourceSnapshot]; - - // 延迟滚动到底部 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self scrollToBottomWithDiffableDataSource:YES]; - }); -} - -- (void)scrollToBottomWithDiffableDataSource:(BOOL)animated { - if (!self.useDiffableDataSource) { - [self scrollToBottom:animated]; - return; - } - - NSArray *messages = [self.dataSourceManager messagesForDisplayType:self.displayType]; - if (messages.count > 0) { - NSIndexPath *lastIndexPath = [NSIndexPath indexPathForRow:messages.count - 1 inSection:0]; - [self.messageTableView scrollToRowAtIndexPath:lastIndexPath atScrollPosition:UITableViewScrollPositionBottom animated:animated]; - } -} - -- (void)updateDiffableDataSourceSnapshot { - if (!self.useDiffableDataSource) return; - - NSArray *messages = [self.dataSourceManager messagesForDisplayType:self.displayType]; - NSLog(@"[DiffableDataSource] updateDiffableDataSourceSnapshot called, displayType=%ld, messages count=%ld", (long)self.displayType, (long)messages.count); - - NSDiffableDataSourceSnapshot *snapshot = [[NSDiffableDataSourceSnapshot alloc] init]; - [snapshot appendSectionsWithIdentifiers:@[@"messages"]]; - - // 注意：appendItemsWithIdentifiers 需要的是对象本身作为“标识符”（需实现 isEqual/hash） - if (messages.count > 0) { - [snapshot appendItemsWithIdentifiers:messages intoSectionWithIdentifier:@"messages"]; - NSLog(@"[DiffableDataSource] Added %ld items to snapshot", (long)messages.count); - } else { - NSLog(@"[DiffableDataSource] No messages to add to snapshot"); - } - - NSLog(@"[DiffableDataSource] Applying snapshot with %ld items", (long)snapshot.numberOfItems); - [self.diffableDataSource applySnapshot:snapshot animatingDifferences:YES]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MicroQueueProtocol.h b/YuMi/Modules/YMRoom/View/MicroQueueProtocol.h deleted file mode 100644 index 8612de9..0000000 --- a/YuMi/Modules/YMRoom/View/MicroQueueProtocol.h +++ /dev/null @@ -1,38 +0,0 @@ -// -// MicroQueueProtocol.h -// YUMI -// -// Created by zu on 2021/11/4. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class MicroQueueModel; - -/** 麦序数据的协议。 - - RoomVC 的子 View 之间的通信协议，通过 RoomHostDelegate 和 RoomGuestDelegate 继承实现。 - - 调用方向： - - - getMicroQueue：RoomVC 子 View —> RoomHostDelegate —> StageView - - onMicroQueueUpdate：StageView —> RoomHostDelegate —> RoomVC 子 View - - */ -@protocol MicroQueueProtocol - -@optional -/** - * 获取麦序。 - */ -- (NSMutableDictionary*)getMicroQueue; -/** - * 麦序更新通知。 - */ -- (void)onMicroQueueUpdate:(NSMutableDictionary*)queue; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPPKAction.h b/YuMi/Modules/YMRoom/View/MoreView/Action/XPPKAction.h deleted file mode 100644 index d3dd5ef..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPPKAction.h +++ /dev/null @@ -1,54 +0,0 @@ -// -// XPPKAction.h -// YUMI -// -// Created by YUMI on 2024/01/01. -// - -#import "XPRoomMoreMenuAction.h" - -@class RoomInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface XPPKAction : XPRoomMoreMenuAction - -// MARK: - 同房PK模式 -/// 开启同房PK模式 -+ (instancetype)roomPKOpenAction; - -/// 关闭同房PK模式 -+ (instancetype)roomPKCloseAction; - -// MARK: - 跨房PK -/// 开启跨房PK -+ (instancetype)acrossRoomPKOpenAction; - -/// 关闭跨房PK -+ (instancetype)acrossRoomPKCloseAction; - -// MARK: - 主播PK -/// 开启主播PK -+ (instancetype)anchorPKOpenAction; - -/// 关闭主播PK -+ (instancetype)anchorPKCloseAction; - -// MARK: - 相亲模式 -/// 开启相亲模式 -+ (instancetype)datingOpenAction; - -/// 关闭相亲模式 -+ (instancetype)datingCloseAction; - -// MARK: - 根据房间信息创建对应的Action -/// 根据房间信息创建对应的PK Action -/// @param roomInfo 房间信息 -+ (instancetype)roomPKActionWithRoomInfo:(RoomInfoModel *)roomInfo; -+ (instancetype)corssPKActionWithRoomInfo:(RoomInfoModel *)roomInfo; -+ (instancetype)anchorPKActionWithRoomInfo:(RoomInfoModel *)roomInfo; -+ (instancetype)blindActionWithRoomInfo:(RoomInfoModel *)roomInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPPKAction.m b/YuMi/Modules/YMRoom/View/MoreView/Action/XPPKAction.m deleted file mode 100644 index 79d6b78..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPPKAction.m +++ /dev/null @@ -1,127 +0,0 @@ -// -// XPPKAction.m -// YUMI -// -// Created by YUMI on 2024/01/01. -// - -#import "XPPKAction.h" -#import "RoomInfoModel.h" - -@implementation XPPKAction - -#pragma mark - 同房PK模式 - -+ (instancetype)roomPKOpenAction { - XPPKAction *action = [[XPPKAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter1"); - action.imageName = @"room_pk_menu_icon"; - action.type = RoomMoreMenuType_Room_PK_Open; - action.titleColor = [DJDKMIMOMColor appCellBackgroundColor]; - return action; -} - -+ (instancetype)roomPKCloseAction { - XPPKAction *action = [[XPPKAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter26"); - action.imageName = @"room_pk_menu_icon"; - action.type = RoomMoreMenuType_Room_PK_Close; - action.titleColor = [DJDKMIMOMColor appCellBackgroundColor]; - return action; -} - -#pragma mark - 跨房PK - -+ (instancetype)acrossRoomPKOpenAction { - XPPKAction *action = [[XPPKAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter31"); - action.imageName = @"crossroom_pk_menu_icon"; - action.type = RoomMoreMenuType_Room_Across_PK_Open; - action.titleColor = [DJDKMIMOMColor appCellBackgroundColor]; - return action; -} - -+ (instancetype)acrossRoomPKCloseAction{ - XPPKAction *action = [[XPPKAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter31"); - action.imageName = @"crossroom_pk_menu_icon"; - action.type = RoomMoreMenuType_Room_Across_PK_Close; - action.titleColor = [DJDKMIMOMColor appCellBackgroundColor]; - return action; -} - -#pragma mark - 主播PK - -+ (instancetype)anchorPKOpenAction { - XPPKAction *action = [[XPPKAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter33"); - action.imageName = @"room_more_menu_anchor_pk"; - action.type = RoomMoreMenuType_Room_Anchor_PK_Open; - action.titleColor = [DJDKMIMOMColor appCellBackgroundColor]; - return action; -} - -+ (instancetype)anchorPKCloseAction { - XPPKAction *action = [[XPPKAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter32"); - action.imageName = @"room_more_menu_anchor_pk"; - action.type = RoomMoreMenuType_Room_Anchor_PK_Close; - action.titleColor = [DJDKMIMOMColor appCellBackgroundColor]; - return action; -} - -#pragma mark - 相亲模式 - -+ (instancetype)datingOpenAction { - XPPKAction *action = [[XPPKAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter8"); - action.imageName = @"room_more_menu_dating"; - action.type = RoomMoreMenuType_Room_Dating_Open; - action.titleColor = [DJDKMIMOMColor appCellBackgroundColor]; - return action; -} - -+ (instancetype)datingCloseAction { - XPPKAction *action = [[XPPKAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter29"); - action.imageName = @"room_more_menu_dating"; - action.type = RoomMoreMenuType_Room_Dating_Close; - action.titleColor = [DJDKMIMOMColor appCellBackgroundColor]; - return action; -} - -#pragma mark - 根据房间信息创建Action -+ (instancetype)roomPKActionWithRoomInfo:(RoomInfoModel *)roomInfo { - return roomInfo.roomModeType == RoomModeType_Open_PK_Mode ? [self roomPKCloseAction] : [self roomPKOpenAction]; -} - -+ (instancetype)corssPKActionWithRoomInfo:(RoomInfoModel *)roomInfo { - return roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode ? [self acrossRoomPKCloseAction] : [self acrossRoomPKOpenAction]; -} - -+ (instancetype)anchorPKActionWithRoomInfo:(RoomInfoModel *)roomInfo { - XPPKAction *action = roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode ? [self anchorPKCloseAction] : [self anchorPKOpenAction]; - - if (roomInfo.pkState == AcrossRoomPkStateTypePenalty) { - if ([roomInfo.winUid isEqualToString:[AccountInfoStorage instance].getUid]) { - action.title = YMLocalizedString(@"XPMoreMenuPresenter15"); - } else if ([roomInfo.winUid isEqualToString:roomInfo.pkUid]) { - action.title = YMLocalizedString(@"XPMoreMenuPresenter14"); - } else { - action.title = YMLocalizedString(@"XPMoreMenuPresenter15"); - } - } else if (roomInfo.pkState == AcrossRoomPkStateTypePenaltyEnd) { - action.title = YMLocalizedString(@"XPMoreMenuPresenter15"); - } - if (roomInfo.pkMatchStartTime) { - action.title = YMLocalizedString(@"XPMoreMenuPresenter17"); - } - - return action; -} - -+ (instancetype)blindActionWithRoomInfo:(RoomInfoModel *)roomInfo { - return roomInfo.roomModeType == RoomModeType_Open_Blind ? [self datingCloseAction] : [self datingOpenAction]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomAppManagerAction.h b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomAppManagerAction.h deleted file mode 100644 index f895a1e..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomAppManagerAction.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPRoomAppManagerAction.h -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomMoreMenuAction.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomAppManagerAction : XPRoomMoreMenuAction -+ (instancetype)action; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomAppManagerAction.m b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomAppManagerAction.m deleted file mode 100644 index 000269d..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomAppManagerAction.m +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPRoomAppManagerAction.m -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomAppManagerAction.h" - -@implementation XPRoomAppManagerAction -+ (instancetype)action { - XPRoomAppManagerAction *action = [[XPRoomAppManagerAction alloc] init]; - action.title = YMLocalizedString(@"34_text_1"); - action.imageName = @"app_admin_icon"; - action.type = RoomMoreMenuType_App_Manager; - action.titleColor = [UIColor orangeColor]; - return action; -} -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomBackGroundSettingAction.h b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomBackGroundSettingAction.h deleted file mode 100644 index e5d3d4e..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomBackGroundSettingAction.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPRoomBackGroundSettingAction.h -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomMoreMenuAction.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomBackGroundSettingAction : XPRoomMoreMenuAction - -+ (instancetype)action; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomBackGroundSettingAction.m b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomBackGroundSettingAction.m deleted file mode 100644 index 698aa85..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomBackGroundSettingAction.m +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPRoomBackGroundSettingAction.m -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomBackGroundSettingAction.h" - -@implementation XPRoomBackGroundSettingAction - -+ (instancetype)action { - XPRoomBackGroundSettingAction *action = [[XPRoomBackGroundSettingAction alloc] init]; - action.title = YMLocalizedString(@"1.0.18_0"); - action.imageName = @"room_menu_background"; - action.type = RoomMoreMenuType_Room_Type_Background; - action.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor]; - return action; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomCleanMessagesAction.h b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomCleanMessagesAction.h deleted file mode 100644 index 7b889a7..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomCleanMessagesAction.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPRoomBackCleanMessagesAction.h -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomMoreMenuAction.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomCleanMessagesAction : XPRoomMoreMenuAction -+ (instancetype)action; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomCleanMessagesAction.m b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomCleanMessagesAction.m deleted file mode 100644 index 9f8bfc7..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomCleanMessagesAction.m +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPRoomBackCleanMessagesAction.m -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomCleanMessagesAction.h" - -@implementation XPRoomCleanMessagesAction - -+ (instancetype)action { - XPRoomCleanMessagesAction *action = [[XPRoomCleanMessagesAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter20"); - action.imageName = @"room_more_menu_message_clean"; - action.type = RoomMoreMenuType_Message_Screen_Clear; - action.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor]; - return action; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomEffectAction.h b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomEffectAction.h deleted file mode 100644 index a24d332..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomEffectAction.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPTurboModeAction.h -// YuMi -// -// Created by P on 2025/9/2. -// - -#import "XPRoomMoreMenuAction.h" - -NS_ASSUME_NONNULL_BEGIN - -/** - * Turbo模式操作 - */ -@interface XPRoomEffectAction : XPRoomMoreMenuAction - -/** - * 创建Turbo模式操作 - */ -+ (instancetype)action; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomEffectAction.m b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomEffectAction.m deleted file mode 100644 index 89f9991..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomEffectAction.m +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPTurboModeAction.m -// YuMi -// -// Created by P on 2025/9/2. -// - -#import "XPRoomEffectAction.h" - -@implementation XPRoomEffectAction - -+ (instancetype)action { - XPRoomEffectAction *action = [[XPRoomEffectAction alloc] init]; - action.title = YMLocalizedString(@"20.20.62_text_14"); - action.imageName = @"room_more_menu_gift_effect"; - action.type = RoomMoreMenuType_MyAnimationEffects_Mode; - action.titleColor = [DJDKMIMOMColor appCellBackgroundColor]; - return action; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomMusicPanelAction.h b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomMusicPanelAction.h deleted file mode 100644 index f013c2e..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomMusicPanelAction.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPRoomMusicPanelAction.h -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomMoreMenuAction.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomMusicPanelAction : XPRoomMoreMenuAction -+ (instancetype)action; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomMusicPanelAction.m b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomMusicPanelAction.m deleted file mode 100644 index 1a03b93..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomMusicPanelAction.m +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPRoomMusicPanelAction.m -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomMusicPanelAction.h" - -@implementation XPRoomMusicPanelAction -+ (instancetype)action { - XPRoomMusicPanelAction *action = [[XPRoomMusicPanelAction alloc] init]; - action.title = YMLocalizedString(@"XPRoomMusicVoiceSettingView1"); - action.imageName = @"menu_music"; - action.type = RoomMoreMenuType_Room_Music_Panel; - action.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor]; - return action; -} -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRedPacketAction.h b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRedPacketAction.h deleted file mode 100644 index 773845e..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRedPacketAction.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPRoomRedPacketAction.h -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomMoreMenuAction.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomRedPacketAction : XPRoomMoreMenuAction -+ (instancetype)action; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRedPacketAction.m b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRedPacketAction.m deleted file mode 100644 index 26b7898..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRedPacketAction.m +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPRoomRedPacketAction.m -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomRedPacketAction.h" - -@implementation XPRoomRedPacketAction -+ (instancetype)action { - XPRoomRedPacketAction *action = [[XPRoomRedPacketAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter24"); - action.imageName = @"pi_red_packet_entrance"; - action.type = RoomMoreMenuType_Room_redPacket; - action.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor]; - return action; -} -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRoomPhotoAction.h b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRoomPhotoAction.h deleted file mode 100644 index 2b649d4..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRoomPhotoAction.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// XPRoomRoomPhotoAction.h -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomMoreMenuAction.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomRoomPhotoAction : XPRoomMoreMenuAction -+ (instancetype)action; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRoomPhotoAction.m b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRoomPhotoAction.m deleted file mode 100644 index a7acd21..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomRoomPhotoAction.m +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPRoomRoomPhotoAction.m -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomRoomPhotoAction.h" - -@implementation XPRoomRoomPhotoAction -+ (instancetype)action { - XPRoomRoomPhotoAction *action = [[XPRoomRoomPhotoAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter37"); - action.imageName = @"room_info_photo_album"; - action.type = RoomMoreMenuType_Room_Room_Photo_Album; - action.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor]; - return action; -} -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomSettingAction.h b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomSettingAction.h deleted file mode 100644 index 5de19c9..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomSettingAction.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// XPRoomSettingAction.h -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import "XPRoomMoreMenuAction.h" - -NS_ASSUME_NONNULL_BEGIN - -/** - * 房间设置操作 - */ -@interface XPRoomSettingAction : XPRoomMoreMenuAction - -/** - * 创建房间设置操作 - */ -+ (instancetype)action; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomSettingAction.m b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomSettingAction.m deleted file mode 100644 index 5d43c30..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomSettingAction.m +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPRoomSettingAction.m -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import "XPRoomSettingAction.h" - -@implementation XPRoomSettingAction - -+ (instancetype)action { - XPRoomSettingAction *action = [[XPRoomSettingAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter21"); - action.imageName = @"room_more_menu_setting"; - action.type = RoomMoreMenuType_Room_Setting; - action.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor]; - return action; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomTypeSettingAction.h b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomTypeSettingAction.h deleted file mode 100644 index ac04339..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomTypeSettingAction.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPRoomTypeSettingAction.h -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomMoreMenuAction.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomTypeSettingAction : XPRoomMoreMenuAction - -+ (instancetype)action; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomTypeSettingAction.m b/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomTypeSettingAction.m deleted file mode 100644 index f180f2d..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPRoomTypeSettingAction.m +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPRoomTypeSettingAction.m -// YuMi -// -// Created by P on 2025/9/1. -// - -#import "XPRoomTypeSettingAction.h" - -@implementation XPRoomTypeSettingAction - -+ (instancetype)action { - XPRoomTypeSettingAction *action = [[XPRoomTypeSettingAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter25"); - action.imageName = @"room_type_selection_icon"; - action.type = RoomMoreMenuType_Room_Type_Setting; - action.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor]; - return action; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPSocialAction.h b/YuMi/Modules/YMRoom/View/MoreView/Action/XPSocialAction.h deleted file mode 100644 index f4534b0..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPSocialAction.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// XPSocialAction.h -// YUMI -// -// Created by YUMI on 2024/12/19. -// - -#import "XPRoomMoreMenuAction.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSocialAction : XPRoomMoreMenuAction - -// 邀请粉丝 -//+ (instancetype)inviteFansAction; - -// 发布广播 -//+ (instancetype)releaseRadioAction; - -// VIP小喇叭 -+ (instancetype)trumpetAction; - -// 举报房间 -+ (instancetype)reportAction; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPSocialAction.m b/YuMi/Modules/YMRoom/View/MoreView/Action/XPSocialAction.m deleted file mode 100644 index b5fb315..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPSocialAction.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// XPSocialAction.m -// YUMI -// -// Created by YUMI on 2024/12/19. -// - -#import "XPSocialAction.h" - -@implementation XPSocialAction - -#pragma mark - Factory Methods - -//+ (instancetype)inviteFansAction { -// XPSocialAction *action = [[XPSocialAction alloc] init]; -// action.title = @"邀请粉丝"; // 暂时使用硬编码，后续改为本地化 -// action.imageName = @"room_more_menu_invite_friend"; // 使用正确的图片名称 -// action.type = RoomMoreMenuType_Invite_Fans; -// action.isEnabled = YES; -// action.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor]; // 使用正确的标题颜色 -// return action; -//} - -//+ (instancetype)releaseRadioAction { -// XPSocialAction *action = [[XPSocialAction alloc] init]; -// action.title = @"发布广播"; // 暂时使用硬编码，后续改为本地化 -// action.imageName = @"room_more_menu_release_radio"; // 使用正确的图片名称 -// action.type = RoomMoreMenuType_Release_Radio; -// action.isEnabled = YES; -// action.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor]; // 使用正确的标题颜色 -// return action; -//} - -+ (instancetype)trumpetAction { - XPSocialAction *action = [[XPSocialAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter35"); // 暂时使用硬编码，后续改为本地化 - action.imageName = @"room_more_menu_trumpet"; // 使用正确的图片名称 - action.type = RoomMoreMenuType_Room_trumpet; - action.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor]; // 使用正确的标题颜色 - return action; -} - -+ (instancetype)reportAction { - XPSocialAction *action = [[XPSocialAction alloc] init]; - action.title = YMLocalizedString(@"XPMoreMenuPresenter36"); - action.imageName = @"room_info_report"; - action.type = RoomMoreMenuType_Room_report; - action.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor]; // 使用正确的标题颜色 - return action; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPTurboModeAction.h b/YuMi/Modules/YMRoom/View/MoreView/Action/XPTurboModeAction.h deleted file mode 100644 index 1dea847..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPTurboModeAction.h +++ /dev/null @@ -1,38 +0,0 @@ -// -// XPGiftEffectAction.h -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import "XPRoomMoreMenuAction.h" - -@class RoomInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -/** - * 礼物特效开关操作 - */ -@interface XPTurboModeAction : XPRoomMoreMenuAction - -/** - * 创建开启礼物特效的操作 - */ -+ (instancetype)openAction; - -/** - * 创建关闭礼物特效的操作 - */ -+ (instancetype)closeAction; - -/** - * 根据房间状态创建对应的 Action - * @param roomInfo 房间信息 - * @return 对应的 Action 实例 - */ -+ (instancetype)actionWithRoomInfo:(RoomInfoModel *)roomInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Action/XPTurboModeAction.m b/YuMi/Modules/YMRoom/View/MoreView/Action/XPTurboModeAction.m deleted file mode 100644 index 02a7179..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Action/XPTurboModeAction.m +++ /dev/null @@ -1,47 +0,0 @@ -// -// XPGiftEffectAction.m -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import "XPTurboModeAction.h" -#import "RoomInfoModel.h" -#import "TurboModeStateManager.h" - -@implementation XPTurboModeAction - -+ (instancetype)openAction { - XPTurboModeAction *action = [[XPTurboModeAction alloc] init]; - action.title = YMLocalizedString(@"20.20.62_text_9.1"); - action.imageName = @"icon_turbo_mode_on"; - action.type = Room_Turbo_Mode_Open; - action.titleColor = [DJDKMIMOMColor appCellBackgroundColor]; - return action; -} - -+ (instancetype)closeAction { - XPTurboModeAction *action = [[XPTurboModeAction alloc] init]; - action.title = YMLocalizedString(@"20.20.62_text_9.2"); - action.imageName = @"icon_turbo_mode_off"; - action.type = Room_Turbo_Mode_Close; - action.titleColor = [DJDKMIMOMColor appCellBackgroundColor]; - return action; -} - -// 根据全局 turbo mode 状态创建对应的 Action -+ (instancetype)actionWithRoomInfo:(RoomInfoModel *)roomInfo { - // 导入 TurboModeStateManager 头文件 - BOOL turboModeEnabled = [[TurboModeStateManager sharedManager] isTurboModeEnabled]; - - if (turboModeEnabled) { - // turbo mode 已开启，显示关闭 Action - return [self closeAction]; - } else { - // turbo mode 已关闭，显示开启 Action - return [self openAction]; - } -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.h b/YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.h deleted file mode 100644 index 0befd5f..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.h +++ /dev/null @@ -1,75 +0,0 @@ -// -// Api+MoreMenu.h -// YUMI -// -// Created by YUMI on 2021/12/11. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (MoreMenu) -/// 开启房间礼物值 -/// @param completion 完成 -/// @param uid 操作人的uid -/// @param roomUid 房主的uid -+ (void)openRoomGiftValue:(HttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid; - -/// 关闭房间礼物值 -/// @param completion 完成 -/// @param uid 操作人的uid -/// @param roomUid 房主的uid -+ (void)closeRoomGiftValue:(HttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid; - -/// 更新房间信息 公屏开关 -/// @param complection 完成 -/// @param roomId 房间的id -/// @param isCloseScreen 是否关闭公屏 -/// @param ticket ticket -/// @param uid uid -+ (void)updateRoomInfoMessageState:(HttpRequestHelperCompletion)complection roomId:(NSString *)roomId isCloseScreen:(NSString *)isCloseScreen ticket:(NSString *)ticket uid:(NSString *)uid; -/// 邀请粉丝的 -/// @param completion 完成 -/// @param roomUid 房间的uid -+ (void)inviteRoomFans:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -/// 获取当前邀请粉丝的状态 -/// @param completion 完成 -/// @param roomUid 房间的uid -+ (void)checkInviteRoomFans:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -/// 开启相亲模式 -/// @param completion 完成 -/// @param roomUid 房主的uid -+ (void)openRoomDating:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -/// 关闭相亲模式 -/// @param completion 完成 -/// @param roomUid 房主的uid -+ (void)closeRoomDating:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -/// 获取开黑广播消息 -/// @param completion 完成 -/// @param type 房间类型 -+ (void)roomRadioGetMsg:(HttpRequestHelperCompletion)completion roomType:(NSString *)type; - -/// 获取房间VIP小喇叭 -/// @param completion 完成 -/// @param roomUid 房主的uid -+ (void)getUserVipRoomTrumpet:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -/// 结束个播房PK -/// @param completion 完成 -/// @param roundId PK场次id -+ (void)requestEndAnchorRoomPk:(HttpRequestHelperCompletion)completion roundId:(NSString *)roundId; - -/// 清空公屏 -/// @param completion 完成 -/// @param roomUid 房间uid -/// @param uid 操作人uid -+ (void)requestCleanScreen:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.m b/YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.m deleted file mode 100644 index 685bfe6..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.m +++ /dev/null @@ -1,103 +0,0 @@ -// -// Api+MoreMenu.m -// YUMI -// -// Created by YUMI on 2021/12/11. -// - -#import "Api+MoreMenu.h" -#import -@implementation Api (MoreMenu) - -/// 开启房间礼物值 -/// @param completion 完成 -/// @param uid 操作人的uid -/// @param roomUid 房主的uid -+ (void)openRoomGiftValue:(HttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9naWZ0L3ZhbHVlL29wZW4="];///room/gift/value/open - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, roomUid, nil]; -} - -/// 关闭房间礼物值 -/// @param completion 完成 -/// @param uid 操作人的uid -/// @param roomUid 房主的uid -+ (void)closeRoomGiftValue:(HttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9naWZ0L3ZhbHVlL2Nsb3Nl"];///room/gift/value/close - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, roomUid, nil]; -} - -/// 更新房间信息 公屏开关 -/// @param complection 完成 -/// @param roomId 房间的id -/// @param isCloseScreen 是否关闭公屏 -/// @param ticket ticket -/// @param uid uid -+ (void)updateRoomInfoMessageState:(HttpRequestHelperCompletion)complection roomId:(NSString *)roomId isCloseScreen:(NSString *)isCloseScreen ticket:(NSString *)ticket uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9zZXRDbG9zZVNjcmVlbg=="];///room/setCloseScreen - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, roomId, isCloseScreen, ticket, uid, nil]; -} - -/// 邀请粉丝的 -/// @param completion 完成 -/// @param roomUid 房间的uid -+ (void)inviteRoomFans:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9pbnZpdGVGYW5z"];///room/inviteFans - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, nil]; -} - -/// 获取当前邀请粉丝的状态 -/// @param completion 完成 -/// @param roomUid 房间的uid -+ (void)checkInviteRoomFans:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9pbnZpdGVGYW5z"];///room/inviteFans - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, nil]; -} - -/// 开启相亲模式 -/// @param completion 完成 -/// @param roomUid 房主的uid -+ (void)openRoomDating:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"YmxpbmQtZGF0ZS9lbmFibGU="];///blind-date/enable - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, nil]; -} - -/// 关闭相亲模式 -/// @param completion 完成 -/// @param roomUid 房主的uid -+ (void)closeRoomDating:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"YmxpbmQtZGF0ZS9kaXNhYmxl"];///blind-date/disable - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, nil]; -} - -/// 获取开黑广播消息 -+ (void)roomRadioGetMsg:(HttpRequestHelperCompletion)completion roomType:(NSString *)type { - NSString * fang = [NSString stringFromBase64String:@"YnJvYWQvZ2V0TXNn"];///broad/getMsg - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, type, nil]; -} - -/// 获取房间VIP小喇叭 -/// @param completion 完成 -+ (void)getUserVipRoomTrumpet:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"dmlwL2dldFVzZXJWaXBSb29tSG9ybg=="];///vip/getUserVipRoomHorn - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, nil]; -} - -/// 结束个播房PK -/// @param completion 完成 -/// @param roundId PK场次id -+ (void)requestEndAnchorRoomPk:(HttpRequestHelperCompletion)completion roundId:(NSString *)roundId { - NSString * fang = [NSString stringFromBase64String:@"Y3Jvc3Nyb29tcGtyb3VuZC9lbmRTaW5nbGVSb29tUGs="];///crossroompkround/endSingleRoomPk - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roundId, nil]; -} - -/// 清空公屏 -/// @param completion 完成 -/// @param roomUid 房间uid -/// @param uid 操作人uid -+ (void)requestCleanScreen:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9jbGVhci9oaXN0b3J5L3JlY3JvZA=="];///room/clear/history/recrod - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, uid, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Factory/XPRoomMoreMenuActionFactory.h b/YuMi/Modules/YMRoom/View/MoreView/Factory/XPRoomMoreMenuActionFactory.h deleted file mode 100644 index dfb2684..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Factory/XPRoomMoreMenuActionFactory.h +++ /dev/null @@ -1,43 +0,0 @@ -// -// XPRoomMoreMenuActionFactory.h -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import - -@class XPRoomMoreMenuActionContext; -@class XPRoomMoreMenuAction; - -NS_ASSUME_NONNULL_BEGIN - -/** - * 房间更多菜单操作工厂类 - * 负责根据上下文创建合适的操作列表 - * 原意是替换通过 action 替换 item model，并将点击后的事件也封装到 action - */ -@interface XPRoomMoreMenuActionFactory : NSObject - -/** - * 创建操作列表 - * @param context 操作上下文 - * @return 操作列表 - */ - -/// 超管直接回使用固定组合 models (trumpet, giftEffect, appManager, report) -+ (NSArray *)createSuperAdminActionsWithContext:(XPRoomMoreMenuActionContext *)context; - -/// 普通用户需要综合判断 -+ (NSArray *)createPanelActionsWithContext:(XPRoomMoreMenuActionContext *)context - isCreator:(BOOL)isCreator - isManager:(BOOL)isManager - isSuperAdmin:(BOOL)isSuperAdmin - isOnMic:(BOOL)isOnMic; - -/// 没有取到云信用户数据的情况 -+ (NSArray *)createPanelActionsForNoCharRoomMembersWithContext:(XPRoomMoreMenuActionContext *)context; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Factory/XPRoomMoreMenuActionFactory.m b/YuMi/Modules/YMRoom/View/MoreView/Factory/XPRoomMoreMenuActionFactory.m deleted file mode 100644 index 1426c48..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Factory/XPRoomMoreMenuActionFactory.m +++ /dev/null @@ -1,156 +0,0 @@ -// -// XPRoomMoreMenuActionFactory.m -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import "XPRoomMoreMenuActionFactory.h" -#import "XPRoomMoreMenuActionContext.h" -#import "XPRoomMoreMenuAction.h" -#import "XPTurboModeAction.h" -#import "XPRoomSettingAction.h" -#import "XPRoomBackGroundSettingAction.h" -#import "XPSocialAction.h" -#import "XPPKAction.h" -#import "XPRoomTypeSettingAction.h" -#import "XPRoomRedPacketAction.h" -#import "XPRoomMusicPanelAction.h" -#import "XPRoomRoomPhotoAction.h" -#import "XPRoomAppManagerAction.h" -#import "XPRoomCleanMessagesAction.h" -#import "XPRoomEffectAction.h" -#import "RoomInfoModel.h" -#import "ClientConfig.h" - -@implementation XPRoomMoreMenuActionFactory - -+ (NSArray *)createActionsWithContext:(XPRoomMoreMenuActionContext *)context { - NSMutableArray *actions = [NSMutableArray array]; - -// [actions addObject:[XPSocialAction trumpetAction]]; - [actions addObject:[XPTurboModeAction actionWithRoomInfo:context.roomInfo]]; - [actions addObject:[XPRoomAppManagerAction action]]; - [actions addObject:[XPSocialAction reportAction]]; - - return actions; -} - -+ (NSArray *)createPanelActionsWithContext:(XPRoomMoreMenuActionContext *)context - isCreator:(BOOL)isCreator - isManager:(BOOL)isManager - isSuperAdmin:(BOOL)isSuperAdmin - isOnMic:(BOOL)isOnMic { - NSMutableArray *actions = [NSMutableArray array]; - RoomInfoModel *roomInfo = context.roomInfo; - RoomType type = roomInfo.type; - BOOL userNotNormal = (isCreator || isManager || isSuperAdmin); - - // 1. PK相关功能 - 按优先级顺序 - if (userNotNormal && - type != RoomType_MiniGame && type != RoomType_Anchor) { - [actions addObject:[XPPKAction roomPKActionWithRoomInfo:roomInfo]]; - } - - if (isCreator && - type != RoomType_MiniGame && - type != RoomType_Anchor) { - [actions addObject:[XPPKAction corssPKActionWithRoomInfo:roomInfo]]; - } - - if (isCreator && - type == RoomType_Anchor) { - [actions addObject:[XPPKAction anchorPKActionWithRoomInfo:roomInfo]]; - } - - // 2. 相亲模式 - 插入到最前面 - if (userNotNormal && - roomInfo.canOpenBlindDate && - type != RoomType_Anchor && - type != RoomType_MiniGame) { - [actions insertObject:[XPPKAction blindActionWithRoomInfo:roomInfo] atIndex:0]; - } - - // 3. 音乐面板 - 根据麦上状态 - if (isOnMic) { - [actions addObject:[XPRoomMusicPanelAction action]]; - } - - // 4. 基础功能 - 根据权限 - if (userNotNormal) { -// [actions addObject:[XPSocialAction trumpetAction]]; - [actions addObject:[XPRoomEffectAction action]]; - [actions addObject:[XPRoomSettingAction action]]; - [actions addObject:[XPRoomBackGroundSettingAction action]]; - [actions addObject:[XPRoomCleanMessagesAction action]]; - } else { -// [actions addObject:[XPSocialAction trumpetAction]]; - [actions addObject:[XPRoomEffectAction action]]; - } - - // 5. 通用功能 - [actions addObject:[XPSocialAction reportAction]]; - - // 6. 房间类型设置 - if (userNotNormal && - roomInfo.isPermitRoom != PermitRoomType_License && - roomInfo.roomModeType != RoomModeType_Open_Blind && - type != RoomType_MiniGame && - type != RoomType_Anchor) { - [actions addObject:[XPRoomTypeSettingAction action]]; - } - - // 7. 房间相册 - 插入到指定位置 - if (roomInfo.hasRoomAlbum) { - NSInteger insertIndex = [self calculateRoomAlbumInsertIndex:actions]; - [actions insertObject:[XPRoomRoomPhotoAction action] atIndex:insertIndex]; - } - - // 8. 红包功能 - 插入到指定位置 - if ([ClientConfig shareConfig].configInfo.redEnvelopeConfig.open && - roomInfo.redEnvelopeOpen) { - [actions insertObject:[XPRoomRedPacketAction action] atIndex:1]; - } - - // 9. 极速模式 - [actions addObject:[XPTurboModeAction actionWithRoomInfo:roomInfo]]; - - return actions; -} - -+ (NSArray *)createPanelActionsForNoCharRoomMembersWithContext:(XPRoomMoreMenuActionContext *)context { - NSMutableArray *actions = [NSMutableArray array]; - RoomInfoModel *roomInfo = context.roomInfo; - - if(roomInfo.hasRoomAlbum == YES){ - [actions addObject:[XPRoomRoomPhotoAction action]]; - } - - if ([ClientConfig shareConfig].configInfo.redEnvelopeConfig.open && roomInfo.redEnvelopeOpen) { - [actions addObject:[XPRoomRedPacketAction action]]; - } - - [actions addObject:[XPSocialAction reportAction]]; - - return actions; -} - -+ (NSArray *)createSuperAdminActionsWithContext:(XPRoomMoreMenuActionContext *)context { - NSMutableArray *actions = [NSMutableArray array]; - -// [actions addObject:[XPSocialAction trumpetAction]]; - [actions addObject:[XPTurboModeAction actionWithRoomInfo:context.roomInfo]]; - [actions addObject:[XPRoomAppManagerAction action]]; - [actions addObject:[XPSocialAction reportAction]]; - - return actions; -} - -// 计算房间相册插入位置的辅助方法 -+ (NSInteger)calculateRoomAlbumInsertIndex:(NSArray *)actions { - // 根据原有逻辑计算插入位置 - // 这里可以简化逻辑，避免复杂的计数 - return MIN(actions.count, 3); // 插入到前3个位置 -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Manager/TurboModeStateManager.h b/YuMi/Modules/YMRoom/View/MoreView/Manager/TurboModeStateManager.h deleted file mode 100644 index d022dbf..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Manager/TurboModeStateManager.h +++ /dev/null @@ -1,63 +0,0 @@ -// -// TurboModeStateManager.h -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface TurboModeStateManager : NSObject - -+ (instancetype)sharedManager; - -// 全局 turbo mode 开关（不按房间） -- (void)setTurboModeEnabled:(BOOL)enabled; -- (void)setTurboModeEnabledSilently:(BOOL)enabled; // 🔧 新增：静默设置，不发送通知 -- (BOOL)isTurboModeEnabled; - -// 将当前全局 turbo mode 应用到指定房间的三个开关（礼物特效临时、两全局屏幕持久化） -- (void)applyTurboModeToSwitchesForRoom:(NSString *)roomId; - -// 获取应用全局 turbo 后的房间三开关视图态 -- (NSDictionary *)getSwitchStatesAfterTurboModeForRoom:(NSString *)roomId; - -// 重置全局 turbo mode -- (void)resetTurboMode; - -// 🔧 新增：启动 TurboModeStateManager，在用户登录成功后调用 -- (void)startupWithCurrentUser:(NSString *)userId; - -// 🔧 新增：更新礼物特效开关状态（通过 RoomInfo.hasAnimationEffect 更新） -- (void)updateGiftEffectsForRoom:(NSString *)roomId enabled:(BOOL)enabled; -// 支持来源标记：fromUser=YES 表示用户手动开关，打上覆盖标记 -- (void)updateGiftEffectsForRoom:(NSString *)roomId enabled:(BOOL)enabled fromUser:(BOOL)fromUser; - -// 用户覆盖标记：用于阻止服务端推送覆盖用户选择 -- (void)setGiftEffectsOverrideForRoom:(NSString *)roomId enabled:(BOOL)enabled; -- (BOOL)isGiftEffectsUserOverriddenForRoom:(NSString *)roomId; - -// 🔧 新增：获取各开关状态 -- (BOOL)isGiftEffectsEnabledForRoom:(NSString *)roomId; -- (BOOL)isGlobalGiftScreenEnabledForRoom:(NSString *)roomId; -- (BOOL)isGlobalGameScreenEnabledForRoom:(NSString *)roomId; -- (BOOL)isCpMicEnabledForRoom:(NSString *)roomId; - -// 🔧 新增：设置各开关状态 -- (void)setGlobalGiftScreenEnabledForRoom:(NSString *)roomId enabled:(BOOL)enabled; -- (void)setGlobalGameScreenEnabledForRoom:(NSString *)roomId enabled:(BOOL)enabled; -- (void)setCpMicEnabledForRoom:(NSString *)roomId enabled:(BOOL)enabled; - -// 🔧 新增：设置当前房间ID（进房成功后调用） -- (void)setCurrentRoomId:(NSString *)roomId; -- (NSString *)loadCurrentRoomId; - -// 🔧 新增：强制打开/关闭当前房间的所有开关（含通知与缓存更新） -- (void)forceCloseAllSwitches:(NSString *)roomId; -- (void)forceOpenAllSwitches:(NSString *)roomId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Manager/TurboModeStateManager.m b/YuMi/Modules/YMRoom/View/MoreView/Manager/TurboModeStateManager.m deleted file mode 100644 index aec3a16..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Manager/TurboModeStateManager.m +++ /dev/null @@ -1,523 +0,0 @@ -// -// TurboModeStateManager.m -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import "TurboModeStateManager.h" -#import "XPTurboModeConstants.h" - -@interface TurboModeStateManager () - -@property (nonatomic, assign) BOOL globalTurboEnabled; // 全局 turbo 模式 -@property (nonatomic, strong) NSMutableDictionary *roomSwitchStates; // 所有房间的开关状态 -@property (nonatomic, copy) NSString *currentUserId; // 当前用户ID -@property (nonatomic, copy) NSString *currentRoomId; - -@end - -@implementation TurboModeStateManager - -#pragma mark - Singleton - -+ (instancetype)sharedManager { - static TurboModeStateManager *instance = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - instance = [[TurboModeStateManager alloc] init]; - }); - return instance; -} - -- (instancetype)init { - if (self = [super init]) { - // 🔧 修复：按照规则2，app启动后首次初始化时turbo mode为关闭状态 - // 只有在用户主动操作过turbo mode后才从缓存加载 - self.globalTurboEnabled = NO; - self.roomSwitchStates = [NSMutableDictionary dictionary]; - self.currentUserId = nil; - } - return self; -} - -#pragma mark - Public Methods - -// 🔧 新增：启动 TurboModeStateManager，在用户登录成功后调用 -- (void)startupWithCurrentUser:(NSString *)userId { - if (!userId) return; - - self.currentUserId = userId; - [self loadAllRoomSwitchStates]; - - NSLog(@"🎮 TurboModeStateManager: 已启动，用户ID: %@", userId); -} - -// 🔧 新增：加载所有房间的开关状态 -- (void)loadAllRoomSwitchStates { - if (!self.currentUserId) return; - - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSString *prefix = [NSString stringWithFormat:@"Turbo_%@_", self.currentUserId]; - - // 遍历所有 UserDefaults 中的 key，找到属于当前用户的房间开关状态 - NSDictionary *allDefaults = [defaults dictionaryRepresentation]; - for (NSString *key in allDefaults.allKeys) { - if ([key hasPrefix:prefix] && [key containsString:@"_Room_"]) { - // 提取房间ID - NSString *roomId = [self extractRoomIdFromKey:key]; - if (roomId) { - [self loadSwitchStatesForRoom:roomId]; - } - } - } - - NSLog(@"🎮 TurboModeStateManager: 已加载 %lu 个房间的开关状态", (unsigned long)self.roomSwitchStates.count); -} - -// 🔧 新增：更新礼物特效开关状态（通过 RoomInfo.hasAnimationEffect 更新） -- (void)updateGiftEffectsForRoom:(NSString *)roomId enabled:(BOOL)enabled { - if (!roomId) return; - - [self ensureRoomSwitchStatesExist:roomId]; - NSMutableDictionary *roomStates = [self.roomSwitchStates[roomId] mutableCopy]; - roomStates[@"giftEffects"] = @(enabled); - self.roomSwitchStates[roomId] = roomStates; - - // 🔧 修复：发送通知以便UI能够更新 - [[NSNotificationCenter defaultCenter] postNotificationName:kTurboGiftEffectsEnabledChanged - object:nil - userInfo:@{ @"roomId": roomId, @"on": @(enabled) }]; - - NSLog(@"🎮 TurboModeStateManager: 房间 %@ 礼物特效开关更新为 %@", roomId, enabled ? @"开启" : @"关闭"); -} - -// 向后兼容：默认视为非用户来源 -- (void)updateGiftEffectsForRoom:(NSString *)roomId enabled:(BOOL)enabled fromUser:(BOOL)fromUser { - if (!roomId) return; - [self ensureRoomSwitchStatesExist:roomId]; - NSMutableDictionary *roomStates = [self.roomSwitchStates[roomId] mutableCopy]; - roomStates[@"giftEffects"] = @(enabled); - if (fromUser) { - roomStates[@"giftEffectsOverride"] = @(YES); - } - self.roomSwitchStates[roomId] = roomStates; - - [[NSNotificationCenter defaultCenter] postNotificationName:kTurboGiftEffectsEnabledChanged - object:nil - userInfo:@{ @"roomId": roomId, @"on": @(enabled) }]; - NSLog(@"🎮 TurboModeStateManager: 房间 %@ 礼物特效开关更新为 %@ (fromUser=%@)", roomId, enabled ? @"开启" : @"关闭", fromUser ? @"YES" : @"NO"); -} - -// 用户覆盖标记控制 -- (void)setGiftEffectsOverrideForRoom:(NSString *)roomId enabled:(BOOL)enabled { - if (!roomId) return; - [self ensureRoomSwitchStatesExist:roomId]; - NSMutableDictionary *roomStates = [self.roomSwitchStates[roomId] mutableCopy]; - roomStates[@"giftEffectsOverride"] = @(enabled); - self.roomSwitchStates[roomId] = roomStates; -} - -- (BOOL)isGiftEffectsUserOverriddenForRoom:(NSString *)roomId { - if (!roomId) return NO; - [self ensureRoomSwitchStatesExist:roomId]; - return [self.roomSwitchStates[roomId][@"giftEffectsOverride"] boolValue]; -} - -// 🔧 修复：获取礼物特效开关状态，考虑全局turbo mode影响 -- (BOOL)isGiftEffectsEnabledForRoom:(NSString *)roomId { - if (!roomId) return NO; - - [self ensureRoomSwitchStatesExist:roomId]; - - // 如果全局turbo mode开启，所有非CP开关都应该关闭 - if ([self isTurboModeEnabled]) { - return NO; - } - - // 否则返回本地状态 - return [self.roomSwitchStates[roomId][@"giftEffects"] boolValue]; -} - -// 🔧 修复：获取全局礼物屏幕开关状态，考虑全局turbo mode影响 -- (BOOL)isGlobalGiftScreenEnabledForRoom:(NSString *)roomId { - if (!roomId) return NO; - - [self ensureRoomSwitchStatesExist:roomId]; - - // 如果全局turbo mode开启，所有非CP开关都应该关闭 - if ([self isTurboModeEnabled]) { - return NO; - } - - // 否则返回本地状态 - return [self.roomSwitchStates[roomId][@"globalGiftScreen"] boolValue]; -} - -// 🔧 修复：获取全局游戏屏幕开关状态，考虑全局turbo mode影响 -- (BOOL)isGlobalGameScreenEnabledForRoom:(NSString *)roomId { - if (!roomId) return NO; - - [self ensureRoomSwitchStatesExist:roomId]; - - // 如果全局turbo mode开启，所有非CP开关都应该关闭 - if ([self isTurboModeEnabled]) { - return NO; - } - - // 否则返回本地状态 - return [self.roomSwitchStates[roomId][@"globalGameScreen"] boolValue]; -} - -// 🔧 新增：获取CP麦位开关状态 -- (BOOL)isCpMicEnabledForRoom:(NSString *)roomId { - if (!roomId) return NO; - - [self ensureRoomSwitchStatesExist:roomId]; - return [self.roomSwitchStates[roomId][@"cpMic"] boolValue]; -} - -// 🔧 新增：设置全局礼物屏幕开关 -- (void)setGlobalGiftScreenEnabledForRoom:(NSString *)roomId enabled:(BOOL)enabled { - if (!roomId) return; - - [self ensureRoomSwitchStatesExist:roomId]; - NSMutableDictionary *roomStates = [self.roomSwitchStates[roomId] mutableCopy]; - roomStates[@"globalGiftScreen"] = @(enabled); - self.roomSwitchStates[roomId] = roomStates; - - // 持久化到 NSUserDefaults - [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:kTurboGlobalGiftScreenEnabledKey(roomId)]; - [[NSUserDefaults standardUserDefaults] synchronize]; - - // 发送通知 - [[NSNotificationCenter defaultCenter] postNotificationName:kTurboGlobalGiftScreenEnabledChanged - object:nil - userInfo:@{@"on": @(enabled), @"roomId": roomId}]; - - NSLog(@"🎮 TurboModeStateManager: 房间 %@ 全局礼物屏幕开关设置为 %@", roomId, enabled ? @"开启" : @"关闭"); -} - -// 🔧 新增：设置全局游戏屏幕开关 -- (void)setGlobalGameScreenEnabledForRoom:(NSString *)roomId enabled:(BOOL)enabled { - if (!roomId) return; - - [self ensureRoomSwitchStatesExist:roomId]; - NSMutableDictionary *roomStates = [self.roomSwitchStates[roomId] mutableCopy]; - roomStates[@"globalGameScreen"] = @(enabled); - self.roomSwitchStates[roomId] = roomStates; - - // 持久化到 NSUserDefaults - [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:kTurboGlobalGameScreenEnabledKey(roomId)]; - [[NSUserDefaults standardUserDefaults] synchronize]; - - // 发送通知 - [[NSNotificationCenter defaultCenter] postNotificationName:kTurboGlobalGameScreenEnabledChanged - object:nil - userInfo:@{@"on": @(enabled), @"roomId": roomId}]; - - NSLog(@"🎮 TurboModeStateManager: 房间 %@ 全局游戏屏幕开关设置为 %@", roomId, enabled ? @"开启" : @"关闭"); -} - -// 🔧 新增：设置CP麦位开关 -- (void)setCpMicEnabledForRoom:(NSString *)roomId enabled:(BOOL)enabled { - if (!roomId) return; - - [self ensureRoomSwitchStatesExist:roomId]; - NSMutableDictionary *roomStates = [self.roomSwitchStates[roomId] mutableCopy]; - roomStates[@"cpMic"] = @(enabled); - self.roomSwitchStates[roomId] = roomStates; - - // 持久化到 NSUserDefaults - [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:kTurboCpMicEnabledKey(roomId)]; - [[NSUserDefaults standardUserDefaults] synchronize]; - - // 发送通知 - [[NSNotificationCenter defaultCenter] postNotificationName:kTurboCpMicEnabledChanged - object:nil - userInfo:@{@"on": @(enabled), @"roomId": roomId}]; - - NSLog(@"🎮 TurboModeStateManager: 房间 %@ CP麦位开关设置为 %@", roomId, enabled ? @"开启" : @"关闭"); -} - -- (void)setTurboModeEnabled:(BOOL)enabled { - self.globalTurboEnabled = enabled; - [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"TurboMode_Global"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - - NSLog(@"🎮 TurboModeStateManager: 全局 turbo mode 设置为 %@", enabled ? @"开启" : @"关闭"); - - // 发送状态变化通知 - [[NSNotificationCenter defaultCenter] postNotificationName:@"TurboModeStateChanged" - object:nil - userInfo:@{@"enabled": @(enabled)}]; -} - -// 🔧 新增：静默设置 turbo mode 状态，不发送通知 -- (void)setTurboModeEnabledSilently:(BOOL)enabled { - self.globalTurboEnabled = enabled; - [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:@"TurboMode_Global"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - - NSLog(@"🎮 TurboModeStateManager: 全局 turbo mode 静默设置为 %@", enabled ? @"开启" : @"关闭"); -} - -- (BOOL)isTurboModeEnabled { - return self.globalTurboEnabled; -} - -- (void)applyTurboModeToSwitchesForRoom:(NSString *)roomId { - if (!roomId) return; - - BOOL turboModeEnabled = [self isTurboModeEnabled]; - - if (turboModeEnabled) { - // turbo mode = YES，仅影响非CP三开关 - [self forceCloseAllSwitches:roomId]; - NSLog(@"🎮 TurboModeStateManager: 应用 turbo mode，房间 %@ 的3个非CP开关全部关闭", roomId); - } else { - // turbo mode = NO，仅影响非CP三开关 - [self forceOpenAllSwitches:roomId]; - NSLog(@"🎮 TurboModeStateManager: turbo mode 关闭，房间 %@ 的3个非CP开关全部打开", roomId); - } -} - -- (NSDictionary *)getSwitchStatesAfterTurboModeForRoom:(NSString *)roomId { - if (!roomId) return @{}; - - BOOL turboModeEnabled = [self isTurboModeEnabled]; - - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - - // 礼物特效：按需求不持久化，这里默认开启（面板或 RoomAnimationView 会基于 roomInfo 决定） - BOOL giftEffects = YES; - BOOL giftEffectsOverride = NO; - - id giftScreenObj = [defaults objectForKey:kTurboGlobalGiftScreenEnabledKey(roomId)]; - BOOL globalGiftScreen = (giftScreenObj != nil) ? [defaults boolForKey:kTurboGlobalGiftScreenEnabledKey(roomId)] : NO; - - id gameScreenObj = [defaults objectForKey:kTurboGlobalGameScreenEnabledKey(roomId)]; - BOOL globalGameScreen = (gameScreenObj != nil) ? [defaults boolForKey:kTurboGlobalGameScreenEnabledKey(roomId)] : NO; - - id cpMicObj = [defaults objectForKey:kTurboCpMicEnabledKey(roomId)]; - BOOL cpMic = (cpMicObj != nil) ? [defaults boolForKey:kTurboCpMicEnabledKey(roomId)] : NO; - - if (turboModeEnabled) { - return @{ - @"giftEffects": @(NO), - @"globalGiftScreen": @(NO), - @"globalGameScreen": @(NO), - @"cpMic": @(cpMic) - }; - } else { - return @{ - @"giftEffects": @(giftEffects), - @"globalGiftScreen": @(globalGiftScreen), - @"globalGameScreen": @(globalGameScreen), - @"cpMic": @(cpMic) - }; - } -} - -- (void)resetTurboMode { - self.globalTurboEnabled = NO; - [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"TurboMode_Global"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - NSLog(@"🎮 TurboModeStateManager: 全局 turbo mode 状态已重置"); -} - -#pragma mark - Private Methods - -- (void)forceCloseAllSwitches:(NSString *)roomId { - if (!roomId) return; - - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - - // 🔧 修复：强制关闭所有开关并更新roomSwitchStates - [self ensureRoomSwitchStatesExist:roomId]; - NSMutableDictionary *roomStates = [self.roomSwitchStates[roomId] mutableCopy]; - - // 强制关闭礼物特效开关：不持久化，只更新内存状态 - roomStates[@"giftEffects"] = @(NO); - - // 强制关闭全局礼物屏幕开关 - roomStates[@"globalGiftScreen"] = @(NO); - [defaults setBool:NO forKey:kTurboGlobalGiftScreenEnabledKey(roomId)]; - - // 强制关闭全局游戏屏幕开关 - roomStates[@"globalGameScreen"] = @(NO); - [defaults setBool:NO forKey:kTurboGlobalGameScreenEnabledKey(roomId)]; - - // 不改动 CP 麦位开关 - - self.roomSwitchStates[roomId] = roomStates; - [defaults synchronize]; - - // 发送通知，让相关组件更新状态 - [self sendSwitchStateChangeNotifications:roomId]; -} - -- (void)forceOpenAllSwitches:(NSString *)roomId { - if (!roomId) return; - - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - - // 🔧 修复：强制打开所有开关并更新roomSwitchStates - [self ensureRoomSwitchStatesExist:roomId]; - NSMutableDictionary *roomStates = [self.roomSwitchStates[roomId] mutableCopy]; - - // 强制打开礼物特效开关：不持久化，只更新内存状态 - roomStates[@"giftEffects"] = @(YES); - - // 强制打开全局礼物屏幕开关 - roomStates[@"globalGiftScreen"] = @(YES); - [defaults setBool:YES forKey:kTurboGlobalGiftScreenEnabledKey(roomId)]; - - // 强制打开全局游戏屏幕开关 - roomStates[@"globalGameScreen"] = @(YES); - [defaults setBool:YES forKey:kTurboGlobalGameScreenEnabledKey(roomId)]; - - // 不改动 CP 麦位开关 - - self.roomSwitchStates[roomId] = roomStates; - [defaults synchronize]; - - // 发送通知，让相关组件更新状态 - [self sendSwitchStateChangeNotificationsForOpen:roomId]; -} - -- (void)sendSwitchStateChangeNotifications:(NSString *)roomId { - // 发送礼物特效开关状态变化通知 - [[NSNotificationCenter defaultCenter] - postNotificationName:kTurboGiftEffectsEnabledChanged - object:nil - userInfo:@{@"on": @(NO), @"roomId": roomId}]; - - // 发送全局礼物屏幕开关状态变化通知 - [[NSNotificationCenter defaultCenter] - postNotificationName:kTurboGlobalGiftScreenEnabledChanged - object:nil - userInfo:@{@"on": @(NO), @"roomId": roomId}]; - - // 发送全局游戏屏幕开关状态变化通知 - [[NSNotificationCenter defaultCenter] - postNotificationName:kTurboGlobalGameScreenEnabledChanged - object:nil - userInfo:@{@"on": @(NO), @"roomId": roomId}]; - - // 不发送 CP 麦位开关状态变化通知 -} - -- (void)sendSwitchStateChangeNotificationsForOpen:(NSString *)roomId { - // 发送礼物特效开关状态变化通知 - [[NSNotificationCenter defaultCenter] - postNotificationName:kTurboGiftEffectsEnabledChanged - object:nil - userInfo:@{@"on": @(YES), @"roomId": roomId}]; - - // 发送全局礼物屏幕开关状态变化通知 - [[NSNotificationCenter defaultCenter] - postNotificationName:kTurboGlobalGiftScreenEnabledChanged - object:nil - userInfo:@{@"on": @(YES), @"roomId": roomId}]; - - // 发送全局游戏屏幕开关状态变化通知 - [[NSNotificationCenter defaultCenter] - postNotificationName:kTurboGlobalGameScreenEnabledChanged - object:nil - userInfo:@{@"on": @(YES), @"roomId": roomId}]; - - // 不发送 CP 麦位开关状态变化通知 -} - -- (void)loadTurboModeStatesFromCache { - // 不再按房间加载，已改为全局 -} - -// 🔧 新增：从 key 中提取房间ID -- (NSString *)extractRoomIdFromKey:(NSString *)key { - // key 格式: Turbo_UserId_Room_RoomId_GlobalGiftScreen - NSArray *components = [key componentsSeparatedByString:@"_"]; - if (components.count >= 4) { - // 找到 "Room" 的位置 - NSInteger roomIndex = -1; - for (NSInteger i = 0; i < components.count; i++) { - if ([components[i] isEqualToString:@"Room"]) { - roomIndex = i; - break; - } - } - if (roomIndex != -1 && roomIndex + 1 < components.count) { - return components[roomIndex + 1]; - } - } - return nil; -} - -// 🔧 新增：确保房间开关状态存在 -- (void)ensureRoomSwitchStatesExist:(NSString *)roomId { - if (!roomId) return; - - if (!self.roomSwitchStates[roomId]) { - [self loadSwitchStatesForRoom:roomId]; - } -} - -// 🔧 新增：加载指定房间的开关状态 -- (void)loadSwitchStatesForRoom:(NSString *)roomId { - if (!roomId) return; - - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - - // 礼物特效：从房间信息获取，这里先设为默认值 - BOOL giftEffects = YES; - BOOL giftEffectsOverride = NO; - - // 其他三个开关：从 NSUserDefaults 读取 - id giftScreenObj = [defaults objectForKey:kTurboGlobalGiftScreenEnabledKey(roomId)]; - BOOL globalGiftScreen = (giftScreenObj != nil) ? [defaults boolForKey:kTurboGlobalGiftScreenEnabledKey(roomId)] : NO; - - id gameScreenObj = [defaults objectForKey:kTurboGlobalGameScreenEnabledKey(roomId)]; - BOOL globalGameScreen = (gameScreenObj != nil) ? [defaults boolForKey:kTurboGlobalGameScreenEnabledKey(roomId)] : NO; - - id cpMicObj = [defaults objectForKey:kTurboCpMicEnabledKey(roomId)]; - BOOL cpMic = (cpMicObj != nil) ? [defaults boolForKey:kTurboCpMicEnabledKey(roomId)] : NO; - - self.roomSwitchStates[roomId] = @{ - @"giftEffects": @(giftEffects), - @"giftEffectsOverride": @(giftEffectsOverride), - @"globalGiftScreen": @(globalGiftScreen), - @"globalGameScreen": @(globalGameScreen), - @"cpMic": @(cpMic) - }; -} - -#pragma mark - 当前房间ID管理 - -// 🔧 新增：设置当前房间ID（进房成功后调用） -- (void)setCurrentRoomId:(NSString *)roomId { - if (!roomId) return; - if ([roomId isEqualToString:_currentRoomId]) { - return; - } - - _currentRoomId = roomId; - - // 🔧 修复：按照规则1，进房后先读取缓存状态，然后应用turbo mode的影响 - [self ensureRoomSwitchStatesExist:roomId]; - [self applyTurboModeToSwitchesForRoom:roomId]; - - // 发送通知，告知其他组件房间ID已设置 - [[NSNotificationCenter defaultCenter] postNotificationName:kTurboCurrentRoomIdSet - object:nil - userInfo:@{@"roomId": roomId}]; - - NSLog(@"🎮 TurboModeStateManager: 设置当前房间ID: %@，已应用turbo mode影响", roomId); -} - -// 🔧 新增：获取当前房间ID -- (NSString *)loadCurrentRoomId { - return self.currentRoomId; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Manager/XPTurboModeTipsManager.h b/YuMi/Modules/YMRoom/View/MoreView/Manager/XPTurboModeTipsManager.h deleted file mode 100644 index e76f3fb..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Manager/XPTurboModeTipsManager.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// XPTurboModeTipsManager.h -// YuMi -// -// Created by AI Assistant -// Copyright © 2024 YuMi. All rights reserved. -// - -#import -#import "XPTurboModeTipsView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPTurboModeTipsManager : NSObject - -+ (instancetype)sharedManager; - -// 在房间中启动 Tips 监听 -- (void)startTipsMonitoringInRoom; - -// 停止 Tips 监听 -- (void)stopTipsMonitoring; - -// 手动显示 Tips（用于测试） -- (void)showTipsManually; - -// 直接开启 Turbo Mode（用于 Tips View 显示时） -- (void)enableTurboModeDirectly; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Manager/XPTurboModeTipsManager.m b/YuMi/Modules/YMRoom/View/MoreView/Manager/XPTurboModeTipsManager.m deleted file mode 100644 index 69c3417..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Manager/XPTurboModeTipsManager.m +++ /dev/null @@ -1,254 +0,0 @@ -// -// XPTurboModeTipsManager.m -// YuMi -// -// Created by AI Assistant -// Copyright © 2024 YuMi. All rights reserved. -// - -#import "XPTurboModeTipsManager.h" -#import "XPTurboModeTipsView.h" -#import "TurboModeStateManager.h" - -@interface XPTurboModeTipsManager () - -@property (nonatomic, strong) XPTurboModeTipsView *currentTipsView; -@property (nonatomic, assign) BOOL isMonitoring; -@property (nonatomic, strong) NSString *currentRoomId; // 🔧 新增：保存当前房间ID -//@property (nonatomic, assign) BOOL hasShownTipsInCurrentSession; - -@end - -@implementation XPTurboModeTipsManager - -#pragma mark - Singleton - -+ (instancetype)sharedManager { - static XPTurboModeTipsManager *instance = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - instance = [[XPTurboModeTipsManager alloc] init]; - }); - return instance; -} - -- (instancetype)init { - self = [super init]; - if (self) { - _isMonitoring = NO; - [self setupNotifications]; - } - return self; -} - -#pragma mark - Public Methods - -- (void)startTipsMonitoringInRoom { - if (self.isMonitoring) { - NSLog(@"🎮 XPTurboModeTipsManager 已经在监听中"); - return; - } - - self.isMonitoring = YES; - NSLog(@"🎮 XPTurboModeTipsManager 开始在房间中监听卡顿"); -} - -- (void)stopTipsMonitoring { - if (!self.isMonitoring) { - return; - } - - self.isMonitoring = NO; - NSLog(@"🎮 XPTurboModeTipsManager 停止监听卡顿"); -} - -- (void)showTipsManually { - [self showTipsWithReason:@"手动触发"]; -} - -#pragma mark - Private Methods - -- (void)setupNotifications { - // 监听卡顿检测通知 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleLagDetection:) - name:@"BuglyManagerDidDetectLag" - object:nil]; - - // 🔧 新增：监听房间进入通知，保存房间ID - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleRoomEnter:) - name:@"RoomDidEnter" - object:nil]; - - // 监听房间退出通知 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleRoomExit:) - name:@"RoomDidExit" - object:nil]; -} - -- (void)handleLagDetection:(NSNotification *)notification { - if (!self.isMonitoring) { - NSLog(@"🎮 XPTurboModeTipsManager 未在监听状态，跳过卡顿处理"); - return; - } - - NSDictionary *userInfo = notification.userInfo; - NSTimeInterval duration = [userInfo[@"duration"] doubleValue]; - NSString *stackTrace = userInfo[@"stackTrace"]; - NSNumber *shouldShowTips = userInfo[@"shouldShowTips"]; - NSNumber *lagCount = userInfo[@"lagCount"]; - - NSLog(@"🎮 XPTurboModeTipsManager 收到卡顿通知 - 持续时间: %.2f秒, 计数: %@/3", duration, lagCount); - - // 检查是否应该显示 Tips（基于新的计数逻辑） - if (shouldShowTips && [shouldShowTips boolValue]) { - NSLog(@"🎮 累计卡顿 %@ 次，显示 Turbo Mode Tips", lagCount); - - // 延迟显示 Tips，避免在卡顿期间立即显示 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self showTipsWithReason:[NSString stringWithFormat:@"累计卡顿%@次", lagCount]]; - }); - } else { - NSLog(@"🎮 卡顿计数: %@/3，暂不显示 Tips", lagCount); - } -} - -- (void)handleRoomEnter:(NSNotification *)notification { - // 保存当前房间ID - NSString *roomId = notification.userInfo[@"roomId"]; - if (roomId && ![roomId isEqualToString:@"unknown"]) { - self.currentRoomId = roomId; - NSLog(@"🎮 XPTurboModeTipsManager 保存当前房间ID: %@", roomId); - } else { - NSLog(@"🎮 XPTurboModeTipsManager 收到无效的房间ID: %@", roomId); - } -} - -- (void)handleRoomExit:(NSNotification *)notification { - NSLog(@"🎮 XPTurboModeTipsManager 房间退出，停止监听"); - [self stopTipsMonitoring]; - - // 关闭当前 Tips 弹窗 - if (self.currentTipsView) { - [self.currentTipsView dismiss]; - self.currentTipsView = nil; - } -} - -- (void)showTipsWithReason:(NSString *)reason { - NSLog(@"🎮 XPTurboModeTipsManager 显示 Tips - 原因: %@", reason); - - // 获取当前窗口来显示弹窗 - UIWindow *window = [UIApplication sharedApplication].keyWindow; - if (!window) { - // 尝试获取其他窗口 - NSArray *windows = [UIApplication sharedApplication].windows; - for (UIWindow *w in windows) { - if (w.isKeyWindow) { - window = w; - break; - } - } - } - - if (!window) { - NSLog(@"🎮 XPTurboModeTipsManager 无法获取窗口，Tips 弹窗显示失败"); - return; - } - - // 创建并显示 Tips - self.currentTipsView = [XPTurboModeTipsView showInView:window]; - self.currentTipsView.delegate = self; - - NSLog(@"🎮 Tips 弹窗创建成功，已添加到窗口"); -} - -#pragma mark - XPTurboModeTipsViewDelegate - -- (void)turboModeTipsViewDidTapUnderstand { - NSLog(@"🎮 XPTurboModeTipsManager 用户点击了 'I understand' 按钮"); - - // 关闭 Tips 弹窗 - if (self.currentTipsView) { - [self.currentTipsView dismiss]; - self.currentTipsView = nil; - } -} - -- (void)turboModeTipsViewDidEnableTurboMode { - NSLog(@"🎮 XPTurboModeTipsManager 用户确认开启 Turbo Mode"); - - // 开启全局 turbo mode - [[TurboModeStateManager sharedManager] setTurboModeEnabled:YES]; - - // 获取当前房间ID（如果有的话） - NSString *currentRoomId = [self getCurrentRoomId]; - if (currentRoomId) { - // 应用 turbo mode 到当前房间的开关 - [[TurboModeStateManager sharedManager] applyTurboModeToSwitchesForRoom:currentRoomId]; - NSLog(@"🎮 已为房间 %@ 应用 Turbo Mode 设置", currentRoomId); - } else { - NSLog(@"🎮 无法获取当前房间ID，仅设置全局 Turbo Mode 状态"); - } - - // 显示成功提示 - [self showTurboModeEnabledToast]; -} - -#pragma mark - 直接开启 Turbo Mode - -- (void)enableTurboModeDirectly { - NSLog(@"🎮 XPTurboModeTipsManager 直接开启 Turbo Mode"); - - // 开启全局 turbo mode - [[TurboModeStateManager sharedManager] setTurboModeEnabled:YES]; - - // 获取当前房间ID（如果有的话） - NSString *currentRoomId = [self getCurrentRoomId]; - if (currentRoomId) { - // 应用 turbo mode 到当前房间的开关 - [[TurboModeStateManager sharedManager] applyTurboModeToSwitchesForRoom:currentRoomId]; - NSLog(@"🎮 已为房间 %@ 应用 Turbo Mode 设置", currentRoomId); - } else { - NSLog(@"🎮 无法获取当前房间ID，仅设置全局 Turbo Mode 状态"); - } - - // 显示成功提示 - [self showTurboModeEnabledToast]; -} - -#pragma mark - Helper Methods - -- (NSString *)getCurrentRoomId { - // 🔧 修复：返回保存的当前房间ID - if (self.currentRoomId) { - NSLog(@"🎮 获取当前房间ID: %@", self.currentRoomId); - return self.currentRoomId; - } else { - NSLog(@"🎮 当前房间ID为空，请检查房间进入逻辑"); - return nil; - } -} - -- (void)showTurboModeEnabledToast { - // 显示 Turbo Mode 已开启的提示 - dispatch_async(dispatch_get_main_queue(), ^{ - // 这里可以使用项目中的 Toast 组件 - // 例如：[[ToastManager sharedManager] showToast:@"Turbo Mode 已开启"]; - - NSLog(@"🎮 显示提示：Turbo Mode 已开启"); - - // 如果需要显示 UI 提示，可以在这里添加 - // 例如：使用 UIAlertController 或者自定义 Toast - }); -} - -#pragma mark - Dealloc - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Model/InviteFansModel.h b/YuMi/Modules/YMRoom/View/MoreView/Model/InviteFansModel.h deleted file mode 100644 index f613677..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Model/InviteFansModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// InviteFansModel.h -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface InviteFansModel : PIBaseModel -///粉丝数 -@property (nonatomic,assign) NSInteger fansNum; -///下次邀请的时间 -@property (nonatomic,assign) int inviteInterval; -///邀请次数 -@property (nonatomic,assign) int inviteTimes; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Model/InviteFansModel.m b/YuMi/Modules/YMRoom/View/MoreView/Model/InviteFansModel.m deleted file mode 100644 index 5c2e8db..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Model/InviteFansModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// InviteFansModel.m -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import "InviteFansModel.h" - -@implementation InviteFansModel - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreItemModel.h b/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreItemModel.h deleted file mode 100644 index a67ce5f..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreItemModel.h +++ /dev/null @@ -1,91 +0,0 @@ -// -// YMRoomMoreItemModel.h -// YUMI -// -// Created by YUMI on 2021/12/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, RoomMoreMenuType) { - ///礼物值关闭 -// RoomMoreMenuType_Gift_Value_Close = 1, -// ///礼物值开启 -// RoomMoreMenuType_Gift_Value_Open = 2, - ///公屏关闭 -// RoomMoreMenuType_Message_Screen_Close = 3, -// ///公屏开启 -// RoomMoreMenuType_Message_Screen_Open = 4, -// ///我的礼物特效关闭 - Room_Turbo_Mode_Close = 5, - ///我的礼物特效开启 - Room_Turbo_Mode_Open = 6, - ///房间设置 - RoomMoreMenuType_Room_Setting = 7, - ///邀请粉丝 - RoomMoreMenuType_Invite_Fans = 8, - ///开启相亲 - RoomMoreMenuType_Room_Dating_Open = 9, - ///关闭相亲 - RoomMoreMenuType_Room_Dating_Close = 10, - ///发布广播 - RoomMoreMenuType_Release_Radio = 11, - ///房间小喇叭 - RoomMoreMenuType_Room_trumpet = 12, - ///开启跨房PK - RoomMoreMenuType_Room_Across_PK_Open = 13, - ///关闭跨房pk - RoomMoreMenuType_Room_Across_PK_Close = 14, - ///开启主播PK - RoomMoreMenuType_Room_Anchor_PK_Open = 15, - ///关闭主播Pk - RoomMoreMenuType_Room_Anchor_PK_Close = 16, - ///清空公屏 - RoomMoreMenuType_Message_Screen_Clear = 17, - ///开启房间pk - RoomMoreMenuType_Room_PK_Open = 18, - ///关闭房间pk - RoomMoreMenuType_Room_PK_Close = 19, - ///发红包 - RoomMoreMenuType_Room_redPacket = 20, - ///扬声器 -// RoomMoreMenuType_Room_Voice = 21, - ///心愿礼物 -// RoomMoreMenuType_Room_Wish_Gift = 22, - ///举报 - RoomMoreMenuType_Room_report = 23, - ///房间相册 - RoomMoreMenuType_Room_Room_Photo_Album = 24, - /// 设置房间 mic 位类型 - RoomMoreMenuType_Room_Type_Setting = 25, - - RoomMoreMenuType_Room_Type_Background = 26, - - RoomMoreMenuType_Room_Music_Panel = 27, - - RoomMoreMenuType_App_Manager = 28, - - RoomMoreMenuType_MyAnimationEffects_Mode = 29, -}; - -@interface XPRoomMoreItemModel : PIBaseModel -///礼物的名称 -@property (nonatomic,copy) NSString *imageName; -///选中状态 -@property (nonatomic, assign) BOOL isSelected; -///显示的文字 -@property (nonatomic,copy) NSString *title; -///标题的颜色 -@property (nonatomic,strong) UIColor *titleColor; -///类型 -@property (nonatomic,assign) RoomMoreMenuType type; - -@property(nonatomic, strong) UIColor *imageTintColor; - -+(XPRoomMoreItemModel *)initWithTitle:(NSString *)title imageName:(NSString *)imageName type:(RoomMoreMenuType)type titleColor:(UIColor *)titleColor; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreItemModel.m b/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreItemModel.m deleted file mode 100644 index 15c057d..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreItemModel.m +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMRoomMoreItemModel.m -// YUMI -// -// Created by YUMI on 2021/12/11. -// - -#import "XPRoomMoreItemModel.h" - -@implementation XPRoomMoreItemModel - -+ (XPRoomMoreItemModel *)initWithTitle:(NSString *)title imageName:(NSString *)imageName type:(RoomMoreMenuType)type titleColor:(UIColor *)titleColor { - XPRoomMoreItemModel * model = [[self alloc] init]; - model.title = title; - model.imageName = imageName; - model.type = type; - model.titleColor = titleColor; - return model; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuAction.h b/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuAction.h deleted file mode 100644 index abe5da8..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuAction.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// XPRoomMoreMenuAction.h -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import -#import "XPRoomMoreItemModel.h" -#import "ThemeColor+Room.h" -#import "RoomHostDelegate.h" -#import "XPRoomMoreMenuActionContext.h" - -@class XPRoomMoreMenuActionContext; - -NS_ASSUME_NONNULL_BEGIN - -/** - * 房间更多菜单操作抽象基类 - * 每个具体的菜单操作都应该继承此类 - */ -@interface XPRoomMoreMenuAction : NSObject - -/// 操作标题 -@property (nonatomic, copy) NSString *title; - -/// 图标名称 -@property (nonatomic, copy) NSString *imageName; - -/// 操作类型 -@property (nonatomic, assign) RoomMoreMenuType type; - -/// 标题颜色 -@property (nonatomic, strong) UIColor *titleColor; - -/// 图标颜色 -@property (nonatomic, strong) UIColor *imageTintColor; - -/** - * 转换为数据模型 - * @return XPRoomMoreItemModel 实例 - */ -- (XPRoomMoreItemModel *)toItemModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuAction.m b/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuAction.m deleted file mode 100644 index 3a2b019..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuAction.m +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPRoomMoreMenuAction.m -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import "XPRoomMoreMenuAction.h" - -@implementation XPRoomMoreMenuAction -- (XPRoomMoreItemModel *)toItemModel { - XPRoomMoreItemModel *model = [[XPRoomMoreItemModel alloc] init]; - model.title = self.title; - model.imageName = self.imageName; - model.titleColor = self.titleColor; - model.imageTintColor = self.imageTintColor; - model.type = self.type; - return model; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuActionContext.h b/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuActionContext.h deleted file mode 100644 index 36a3c58..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuActionContext.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// XPRoomMoreMenuActionContext.h -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import - -@class RoomInfoModel; -@class UserInfoModel; -@protocol RoomHostDelegate; - -NS_ASSUME_NONNULL_BEGIN - -/** - * 房间更多菜单操作上下文 - * 包含执行操作所需的所有依赖 - */ -@interface XPRoomMoreMenuActionContext : NSObject - -/// 房间信息 -@property (nonatomic, strong) RoomInfoModel *roomInfo; - -/// 用户信息 -@property (nonatomic, strong) UserInfoModel *userInfo; - -/// 房间代理 -@property (nonatomic, assign) id hostDelegate; - -/// 当前展示的视图控制器 -@property (nonatomic, assign) id presentingViewController; - -/// 用户是否在麦上 -@property (nonatomic, assign) BOOL isOnMic; - -/// 是否是超级管理员 -@property (nonatomic, assign) BOOL isSuperAdmin; - -/// 是否是应用超级管理员 -@property (nonatomic, assign) BOOL isAppSuperAdmin; - -/** - * 便利构造方法 - */ -+ (instancetype)contextWithRoomInfo:(RoomInfoModel *)roomInfo - userInfo:(UserInfoModel * _Nullable)userInfo - hostDelegate:(id _Nullable)hostDelegate - presentingViewController:(id _Nullable)presentingViewController - isOnMic:(BOOL)isOnMic - isSuperAdmin:(BOOL)isSuperAdmin - isAppSuperAdmin:(BOOL)isAppSuperAdmin; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuActionContext.m b/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuActionContext.m deleted file mode 100644 index 19df39d..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Model/XPRoomMoreMenuActionContext.m +++ /dev/null @@ -1,34 +0,0 @@ -// -// XPRoomMoreMenuActionContext.m -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import "XPRoomMoreMenuActionContext.h" -#import "XPMoreMenuPresenter.h" - -@implementation XPRoomMoreMenuActionContext - -+ (instancetype)contextWithRoomInfo:(RoomInfoModel *)roomInfo - userInfo:(UserInfoModel * _Nullable)userInfo - hostDelegate:(id _Nullable)hostDelegate - presentingViewController:(id _Nullable)presentingViewController - isOnMic:(BOOL)isOnMic - isSuperAdmin:(BOOL)isSuperAdmin - isAppSuperAdmin:(BOOL)isAppSuperAdmin { - - XPRoomMoreMenuActionContext *context = [[XPRoomMoreMenuActionContext alloc] init]; - context.roomInfo = roomInfo; - context.userInfo = userInfo; - context.hostDelegate = hostDelegate; - context.presentingViewController = presentingViewController; - context.isOnMic = isOnMic; - context.isSuperAdmin = isSuperAdmin; - context.isAppSuperAdmin = isAppSuperAdmin; - - return context; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.h b/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.h deleted file mode 100644 index 19f9407..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.h +++ /dev/null @@ -1,50 +0,0 @@ -// -// YMMoreMenuPresenter.h -// YUMI -// -// Created by YUMI on 2021/12/11. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN -@class RoomInfoModel; -@interface XPMoreMenuPresenter : BaseMvpPresenter - -///获取更多菜单 -- (void)getMoreMenuDataSourceWithNewArchitecture:(RoomInfoModel *)roomInfo - isSuperAdmin:(BOOL)isSuperAdmin - isOnMic:(BOOL)isOnMic - isAppSuperAdmin:(BOOL)isAppSuperAdmin; - - -/// 开启相亲模式 -/// @param roomUid 房主的uid -- (void)openRoomDating:(NSString *)roomUid; - -/// 关闭相亲模式 -/// @param roomUid 房主的uid -- (void)closeRoomDating:(NSString *)roomUid; - -///获取房间广播模板内容 -/// @param type 房间类型 -- (void)getRoomRadioMessageListWithType:(NSString *)type; - -/// 获取房间VIP小喇叭信息 -- (void)getRoomgetUserVipRoomTrumpet:(NSString *)roomUid; - -///结束个播跨房PK -- (void)requestFinishAnchorPK:(NSString *)roundId; - -/// 清空公屏 -/// @param roomUid 房主的uid -/// @param uid 操作人的uid -- (void)cleanScreen:(NSString *)roomUid uid:(NSString *)uid; - -/// 取消匹配随机PK -/// @param roomUid 房间UID -- (void)requestCancelMatchRandomPK:(NSString *)roomUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.m b/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.m deleted file mode 100644 index fbdb403..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.m +++ /dev/null @@ -1,163 +0,0 @@ -// -// YMMoreMenuPresenter.m -// YUMI -// -// Created by YUMI on 2021/12/11. -// - -#import "XPMoreMenuPresenter.h" -#import -#import "Api+MoreMenu.h" -#import "ThemeColor+Room.h" -#import "AccountInfoStorage.h" -#import "ClientConfig.h" -#import "RtcManager.h" -#import "Api+AnchorPk.h" -///Model -#import "XPRoomMoreItemModel.h" -#import "RoomInfoModel.h" -#import "XPReleaseRadioModel.h" -#import "XPNobleTrumpetModel.h" -#import "XPRoomMoreMenuAction.h" -#import "XPRoomMoreMenuActionContext.h" -#import "XPRoomMoreMenuActionFactory.h" -///P -#import "XPMoreMenuProtocol.h" -#import "DJDKMIMOMColor.h" - -@implementation XPMoreMenuPresenter - -- (void)loadNIMMemberData:(void(^)(NSArray * _Nullable members))finish withRoomInfo:(RoomInfoModel *)roomInfo{ - if (!finish) { - return; - } - - NSString * uid = [AccountInfoStorage instance].getUid; - if (uid.length <= 0) { - finish(nil); - return; - } - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = roomId; - request.userIds = @[uid]; - - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (members) { - finish(members); - } else { - finish(nil); - } - }]; -} - -- (void)getMoreMenuDataSourceWithNewArchitecture:(RoomInfoModel *)roomInfo - isSuperAdmin:(BOOL)isSuperAdmin - isOnMic:(BOOL)isOnMic - isAppSuperAdmin:(BOOL)isAppSuperAdmin { - // 创建上下文 - XPRoomMoreMenuActionContext *context = [XPRoomMoreMenuActionContext - contextWithRoomInfo:roomInfo - userInfo:nil - hostDelegate:nil - presentingViewController:nil - isOnMic:isOnMic - isSuperAdmin:isSuperAdmin - isAppSuperAdmin:isAppSuperAdmin]; - - if (isAppSuperAdmin) { - // 超管使用固定组合 - NSArray *actions = [XPRoomMoreMenuActionFactory createSuperAdminActionsWithContext:context]; - [self convertActionsToModels:actions]; - } else { - // 普通用户根据权限创建 - @kWeakify(self); - [self loadNIMMemberData:^(NSArray * _Nullable members) { - @kStrongify(self); - - BOOL isCreator = NO; - BOOL isManager = NO; - - if (members && members.count > 0) { - NIMChatroomMember *member = members.firstObject; - isCreator = member.type == NIMChatroomMemberTypeCreator; - isManager = member.type == NIMChatroomMemberTypeManager; - } - - NSArray *actions = [XPRoomMoreMenuActionFactory - createPanelActionsWithContext:context - isCreator:isCreator - isManager:isManager - isSuperAdmin:isSuperAdmin - isOnMic:isOnMic]; - - [self convertActionsToModels:actions]; - } withRoomInfo:roomInfo]; - } -} - -// 将 Action 转换为数据模型 -- (void)convertActionsToModels:(NSArray *)actions { - NSMutableArray *models = [NSMutableArray array]; - for (XPRoomMoreMenuAction *action in actions) { - [models addObject:[action toItemModel]]; - } - [[self getView] getMoreMenuDataSuccess:models]; -} - -/// 开启相亲模式 -/// @param roomUid 房主的uid -- (void)openRoomDating:(NSString *)roomUid { - [Api openRoomDating:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] openRoomDatingSuccess]; - }] roomUid:roomUid]; -} - -/// 关闭相亲模式 -/// @param roomUid 房主的uid -- (void)closeRoomDating:(NSString *)roomUid { - [Api closeRoomDating:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] closeRoomDatingSuccess]; - }] roomUid:roomUid]; -} - -///获取房间广播模板内容 -/// @param type 房间类型 -- (void)getRoomRadioMessageListWithType:(NSString *)type { - [Api roomRadioGetMsg:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - XPReleaseRadioModel * model = [XPReleaseRadioModel modelWithJSON:data.data]; - [[self getView] getReleaseRadioSuccess:model]; - }] roomType:type]; -} -/// 获取房间VIP小喇叭信息 -- (void)getRoomgetUserVipRoomTrumpet:(NSString *)roomUid { - [Api getUserVipRoomTrumpet:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - XPNobleTrumpetModel *model = [XPNobleTrumpetModel modelWithJSON:data.data]; - [[self getView] getTrumpetSuccess:model]; - }] roomUid:roomUid]; -} -///结束个播跨房PK -- (void)requestFinishAnchorPK:(NSString *)roundId { - [Api requestEndAnchorRoomPk:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [[self getView] endAnchorPkSuccess:code == 200 msg:msg]; - } roundId:roundId]; -} - -/// 清空公屏 -/// @param roomUid 房主的uid -/// @param uid 操作人的uid -- (void)cleanScreen:(NSString *)roomUid uid:(NSString *)uid { - [Api requestCleanScreen:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] cleanScreenSuccess]; - }] roomUid:roomUid uid:uid]; -} - -/// 取消匹配随机PK -/// @param roomUid 房间UID -- (void)requestCancelMatchRandomPK:(NSString *)roomUid { - [Api cancelMatchRandomPK:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] cancelMatchRandomPKSuccess]; - }] roomUid:roomUid]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/Protocol/XPMoreMenuProtocol.h b/YuMi/Modules/YMRoom/View/MoreView/Protocol/XPMoreMenuProtocol.h deleted file mode 100644 index 802449d..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/Protocol/XPMoreMenuProtocol.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// YMMoreMenuProtocol.h -// YUMI -// -// Created by YUMI on 2021/12/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class XPRoomMoreItemModel, RoomInfoModel, XPReleaseRadioModel, XPNobleTrumpetModel; -@protocol XPMoreMenuProtocol - -///更多菜单要展示的内容 -- (void)getMoreMenuDataSuccess:(NSArray *)list; -///开启房间礼物值成功 -- (void)openRoomGiftValueSuccess; -///关闭房间礼物值成功 -- (void)closeRoomGiftValueSuccess; -///更新房间信息 成功 公屏的开启和关闭 -- (void)updateRoomMessageScreenStateSuccess:(RoomInfoModel * )roomInfo; -///开启相亲成功 -- (void)openRoomDatingSuccess; -///关闭相亲成功 -- (void)closeRoomDatingSuccess; -///获取房间广播信息成功 -- (void)getReleaseRadioSuccess:(XPReleaseRadioModel *)model; -///获取房间VIP喇叭成功 -- (void)getTrumpetSuccess:(XPNobleTrumpetModel *)model; -///结束个播跨房PK回调 -- (void)endAnchorPkSuccess:(BOOL)success msg:(NSString *)msg; -///清空公屏成功 -- (void)cleanScreenSuccess; - -- (void)cancelMatchRandomPKSuccess; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/AppOfficalManagerActionsViewController.h b/YuMi/Modules/YMRoom/View/MoreView/View/AppOfficalManagerActionsViewController.h deleted file mode 100644 index 44936b4..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/View/AppOfficalManagerActionsViewController.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// AppOfficalManagerActionsViewController.h -// YuMi -// -// Created by P on 2025/1/17. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface AppOfficalManagerActionsViewController : MvpViewController - -@property(nonatomic, assign) BOOL isRoomHide; - -@property(nonatomic, copy) NSString *controlUid; -@property(nonatomic, copy) NSString *targetUid; -@property(nonatomic, copy) NSString *roomUid; -@property(nonatomic, copy) NSString *roomID; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/AppOfficalManagerActionsViewController.m b/YuMi/Modules/YMRoom/View/MoreView/View/AppOfficalManagerActionsViewController.m deleted file mode 100644 index 9506fc2..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/View/AppOfficalManagerActionsViewController.m +++ /dev/null @@ -1,251 +0,0 @@ -// -// AppOfficalManagerActionsViewController.m -// YuMi -// -// Created by P on 2025/1/17. -// - -#import "AppOfficalManagerActionsViewController.h" - -#import "Api+Room.h" -#import "Api+SuperAdmin.h" -#import "XPRoomRoleViewController.h" - -@interface AppOfficalManagerActionsViewController () - -@property(nonatomic, strong) UIView *hideRoom; -@property(nonatomic, strong) UILabel *hideRoomTitle; -@property(nonatomic, strong) UISwitch *hideRoomSwitch; - -@property(nonatomic, strong) UIView *blackList; -@property(nonatomic, strong) UILabel *blackListTitle; -@property(nonatomic, strong) UIImageView *blackListArrow; - -@property(nonatomic, strong) UIView *closeRoom; -@property(nonatomic, strong) UILabel *closeRoomTitle; -@property(nonatomic, strong) UIImageView *closeRoomMark; - -@end - -@implementation AppOfficalManagerActionsViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.title = YMLocalizedString(@"1.0.34_text_1"); - -// [self.view addSubview:self.hideRoom]; - [self.view addSubview:self.blackList]; - [self.view addSubview:self.closeRoom]; - -// [self.hideRoom mas_makeConstraints:^(MASConstraintMaker *make) { -// make.leading.trailing.mas_equalTo(self.view).inset(15); -// make.top.mas_equalTo(16); -// make.height.mas_equalTo(64); -// }]; - - [self.blackList mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(15); -// make.top.mas_equalTo(self.hideRoom.mas_bottom).offset(8); - make.top.mas_equalTo(16); - make.height.mas_equalTo(64); - }]; - - [self.closeRoom mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(15); - make.top.mas_equalTo(self.blackList.mas_bottom).offset(8); - make.height.mas_equalTo(64); - }]; - -// [self.hideRoom addSubview:self.hideRoomTitle]; -// [self.hideRoom addSubview:self.hideRoomSwitch]; -// [self.hideRoomTitle mas_makeConstraints:^(MASConstraintMaker *make) { -// make.centerY.mas_equalTo(self.hideRoom); -// make.leading.mas_equalTo(15); -// make.height.mas_equalTo(18); -// }]; -// [self.hideRoomSwitch mas_makeConstraints:^(MASConstraintMaker *make) { -// make.centerY.mas_equalTo(self.hideRoom); -// make.trailing.mas_equalTo(-15); -// }]; - - [self.blackList addSubview:self.blackListTitle]; - [self.blackList addSubview:self.blackListArrow]; - [self.blackListTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.blackList); - make.leading.mas_equalTo(15); - make.height.mas_equalTo(18); - }]; - [self.blackListArrow mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.blackList); - make.trailing.mas_equalTo(-15); - make.size.mas_equalTo(CGSizeMake(18, 18)); - }]; - - [self.closeRoom addSubview:self.closeRoomTitle]; - [self.closeRoom addSubview:self.closeRoomMark]; - [self.closeRoomTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.closeRoom); - make.leading.mas_equalTo(15); - make.height.mas_equalTo(18); - }]; - [self.closeRoomMark mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.closeRoom); - make.trailing.mas_equalTo(-15); - make.size.mas_equalTo(CGSizeMake(18, 18)); - }]; -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - self.hideRoomSwitch.on = self.isRoomHide; -} - -#pragma mark - -- (void)switchDidChange:(UISwitch *)sender { - BOOL newState = sender.isOn; // 用户意图改变的状态 - sender.on = !newState; // 立即恢复到原来的状态，等待用户确认后改变 - - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"1.0.18_20"); - config.message = YMLocalizedString(@"1.0.34_text_4"); - config.actionStyle = TTAlertActionBothStyle; - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ - @kStrongify(self); - [XNDJTDDLoadingTool showLoading]; - [Api superAdminOperateRoom:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [XNDJTDDLoadingTool hideHUD]; - if (code == 200) { - sender.on = newState; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:self.roomUid type:sender.isOn ? @1 : @0]; - } cancelHandler:^{ - - }]; -} - -- (void)handleCloseRoom { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"1.0.18_20"); - config.message = YMLocalizedString(@"1.0.34_text_5"); - config.actionStyle = TTAlertActionBothStyle; - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ - [XNDJTDDLoadingTool showLoading]; - @kStrongify(self); - [Api closeRoom:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - [Api superAdminOperate:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [XNDJTDDLoadingTool hideHUD]; - - } uid:self.controlUid roomUid:self.roomUid targetUid:self.targetUid operateType:@7]; - }else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } uid:self.roomUid ticket:[[AccountInfoStorage instance] getTicket]]; - } cancelHandler:^{ - - }]; -} - -- (void)handleBlackList { - XPRoomRoleViewController * managerVC = [[XPRoomRoleViewController alloc] init]; - managerVC.roomId = self.roomID; - managerVC.type = RoomRoleListType_Black; - managerVC.isAppAdmin = YES; - [self.navigationController pushViewController:managerVC animated:YES]; -} - -#pragma mark - -- (UIView *)hideRoom { - if (!_hideRoom) { - _hideRoom = [[UIView alloc] init]; - _hideRoom.backgroundColor = [UIColor whiteColor]; - [_hideRoom setCornerRadius:8]; - } - return _hideRoom; -} - -- (UILabel *)hideRoomTitle { - if (!_hideRoomTitle) { - _hideRoomTitle = [UILabel labelInitWithText:YMLocalizedString(@"1.0.34_text_2") - font:kFontSemibold(14) - textColor:UIColorFromRGB(0x313131)]; - } - return _hideRoomTitle; -} - -- (UISwitch *)hideRoomSwitch { - if (!_hideRoomSwitch) { - _hideRoomSwitch = [[UISwitch alloc] init]; - _hideRoomSwitch.onTintColor = [DJDKMIMOMColor appEmphasizeColor]; - _hideRoomSwitch.tintColor = [DJDKMIMOMColor appMainColor]; - _hideRoomSwitch.backgroundColor = [UIColor clearColor]; - [_hideRoomSwitch addTarget:self action:@selector(switchDidChange:) forControlEvents:UIControlEventValueChanged]; - } - return _hideRoomSwitch; -} - -- (UIView *)blackList { - if (!_blackList) { - _blackList = [[UIView alloc] init]; - _blackList.backgroundColor = [UIColor whiteColor]; - [_blackList setCornerRadius:8]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleBlackList)]; - [_blackList addGestureRecognizer:tap]; - } - return _blackList; -} - -- (UILabel *)blackListTitle { - if (!_blackListTitle) { - _blackListTitle = [UILabel labelInitWithText:YMLocalizedString(@"XPMineSettingPresent20") - font:kFontSemibold(14) - textColor:UIColorFromRGB(0x313131)]; - } - return _blackListTitle; -} - -- (UIImageView *)blackListArrow { - if (!_blackListArrow) { - _blackListArrow = [[UIImageView alloc] initWithImage:kImage(@"pi_room_photo_album_choose_photo_gift_arrow")]; - } - return _blackListArrow; -} - - -- (UIView *)closeRoom { - if (!_closeRoom) { - _closeRoom = [[UIView alloc] init]; - _closeRoom.backgroundColor = [UIColor whiteColor]; - [_closeRoom setCornerRadius:8]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleCloseRoom)]; - [_closeRoom addGestureRecognizer:tap]; - } - return _closeRoom; -} - -- (UILabel *)closeRoomTitle { - if (!_closeRoomTitle) { - _closeRoomTitle = [UILabel labelInitWithText:YMLocalizedString(@"1.0.34_text_3") - font:kFontSemibold(14) - textColor:UIColorFromRGB(0x313131)]; - _closeRoomTitle.userInteractionEnabled = NO; - } - return _closeRoomTitle; -} - -- (UIImageView *)closeRoomMark { - if (!_closeRoomMark) { - _closeRoomMark = [[UIImageView alloc] initWithImage:kImage(@"room_across_pk_invite_result_close")]; - _closeRoomMark.userInteractionEnabled = NO; - } - return _closeRoomMark; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.h b/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.h deleted file mode 100644 index efda769..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMRoomMoreMenuTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPRoomMoreItemModel; -@interface XPRoomMoreMenuCollectionViewCell : UICollectionViewCell - -@property (nonatomic,strong) XPRoomMoreItemModel *itemModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.m b/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.m deleted file mode 100644 index d834e1b..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.m +++ /dev/null @@ -1,86 +0,0 @@ -// -// YMRoomMoreMenuTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/11. -// - -#import "XPRoomMoreMenuCollectionViewCell.h" -///Third -#import -///Tool -#import "ThemeColor+Room.h" -///Model -#import "XPRoomMoreItemModel.h" -@interface XPRoomMoreMenuCollectionViewCell () -///显示图片 -@property (nonatomic,strong) UIImageView *logoImageView; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; - -@end - -@implementation XPRoomMoreMenuCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.logoImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(30, 30)); - make.top.centerX.mas_equalTo(self.contentView); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(4); - }]; -} - -#pragma mark - Getters And Setters -- (void)setItemModel:(XPRoomMoreItemModel *)itemModel { - _itemModel = itemModel; - if (_itemModel) { - self.titleLabel.text = _itemModel.title; - self.titleLabel.textColor = _itemModel.titleColor ? _itemModel.titleColor : [DJDKMIMOMColor mainTextColor]; - if (itemModel.imageTintColor) { - self.logoImageView.image = [[UIImage getLanguageImage:_itemModel.imageName] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; - self.logoImageView.tintColor = itemModel.imageTintColor; - } else { - self.logoImageView.image = [UIImage getLanguageImage:_itemModel.imageName]; - } - } -} - -- (UIImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[UIImageView alloc] init]; - _logoImageView.userInteractionEnabled = YES; - } - return _logoImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:10]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.numberOfLines = 2; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPEffectPanelViewController.h b/YuMi/Modules/YMRoom/View/MoreView/View/XPEffectPanelViewController.h deleted file mode 100644 index 0144d7a..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/View/XPEffectPanelViewController.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// XPTurboModeViewController.h -// YuMi -// -// Created by P on 2025/9/2. -// - -#import "MvpViewController.h" - -@class RoomInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -/** - * Turbo模式设置控制器 - */ -@interface XPEffectPanelViewController : MvpViewController - -@property (nonatomic, strong) RoomInfoModel *roomInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPEffectPanelViewController.m b/YuMi/Modules/YMRoom/View/MoreView/View/XPEffectPanelViewController.m deleted file mode 100644 index b2c6075..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/View/XPEffectPanelViewController.m +++ /dev/null @@ -1,416 +0,0 @@ -// -// XPTurboModeViewController.m -// YuMi -// -// Created by Linus on 2025/1/13. -// - -#import "XPEffectPanelViewController.h" -#import "RoomInfoModel.h" -#import "XPTurboModeConstants.h" -#import "TurboModeStateManager.h" - -@interface XPEffectPanelViewController () - -@property (nonatomic, strong) UIView *bottomAreaBackground; -@property (nonatomic, strong) UIButton *dismissButton; -@property (nonatomic, strong) UILabel *titleLabel; - -// 开关 -@property (nonatomic, strong) UISwitch *giftEffectsSwitch; // 礼物特效开关 -@property (nonatomic, strong) UISwitch *globalGiftScreenSwitch; // 全局礼物屏幕开关 -@property (nonatomic, strong) UISwitch *globalGameScreenSwitch; // 全局游戏屏幕开关 - -// 🔧 移除：本地开关状态，改为使用 TurboModeStateManager - -// 房间信息 -@property (nonatomic, strong) NSString *roomId; // 当前房间 ID - -@end - -@implementation XPEffectPanelViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - [self setupUI]; - [self setupSwitchStates]; - [self setupNotifications]; -} - -- (void)setupUI { - self.view.backgroundColor = [UIColor clearColor]; - - [self setupBottomArea]; - [self setupDismissButton]; - [self setupTitle]; - [self setupSwitches]; - [self setupTapGesture]; -} - -- (void)setupBottomArea { - self.bottomAreaBackground = [[UIView alloc] init]; - self.bottomAreaBackground.backgroundColor = [UIColor colorWithWhite:0.1 alpha:0.95]; - self.bottomAreaBackground.layer.cornerRadius = 20; - self.bottomAreaBackground.layer.maskedCorners = kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner; - [self.view addSubview:self.bottomAreaBackground]; - - // 设置约束 - 使用 Masonry - [self.bottomAreaBackground mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.height.mas_equalTo(320); - }]; -} - -- (void)setupDismissButton { - self.dismissButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [self.dismissButton setTitle:@"✕" forState:UIControlStateNormal]; - [self.dismissButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - self.dismissButton.titleLabel.font = [UIFont systemFontOfSize:24]; - [self.dismissButton addTarget:self action:@selector(dismissViewController) forControlEvents:UIControlEventTouchUpInside]; - [self.bottomAreaBackground addSubview:self.dismissButton]; - - // 设置约束 - 使用 Masonry - [self.dismissButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bottomAreaBackground).offset(20); - make.trailing.mas_equalTo(self.bottomAreaBackground).offset(-20); - make.width.height.mas_equalTo(44); - }]; - - self.dismissButton.hidden = YES; -} - -- (void)setupTitle { - self.titleLabel = [[UILabel alloc] init]; - self.titleLabel.text = YMLocalizedString(@"20.20.62_text_9"); // Turbo Mode - self.titleLabel.textColor = [UIColor whiteColor]; - self.titleLabel.font = kFontMedium(15); - self.titleLabel.textAlignment = NSTextAlignmentCenter; - [self.bottomAreaBackground addSubview:self.titleLabel]; - - // 设置约束 - 使用 Masonry - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.dismissButton); -// make.centerX.mas_equalTo(self.bottomAreaBackground); - make.leading.mas_greaterThanOrEqualTo(self.bottomAreaBackground).offset(16); -// make.trailing.mas_lessThanOrEqualTo(self.bottomAreaBackground).offset(-60); - }]; -} - -- (void)setupSwitches { - // 礼物特效开关（临时状态） - [self setupSwitchItem:YMLocalizedString(@"20.20.62_text_10") // Gift effects - atIndex:0]; - - // 全局礼物屏幕开关（持久化） - [self setupSwitchItem:YMLocalizedString(@"20.20.62_text_11") // Global gift screen - atIndex:1]; - - // 全局游戏屏幕开关（持久化） - [self setupSwitchItem:YMLocalizedString(@"20.20.62_text_12") // Global game screen - atIndex:2]; -} - -- (void)setupSwitchItem:(NSString *)title - atIndex:(NSInteger)index { - UIView *switchView = [[UIView alloc] init]; - switchView.backgroundColor = [UIColor clearColor]; - switchView.layer.cornerRadius = 12; - [self.bottomAreaBackground addSubview:switchView]; - - UILabel *titleLabel = [[UILabel alloc] init]; - titleLabel.text = title; - titleLabel.textColor = [UIColor whiteColor]; - titleLabel.font = kFontRegular(14); - [switchView addSubview:titleLabel]; - - UISwitch *switchViewControl = [[UISwitch alloc] init]; - switchViewControl.onTintColor = UIColorFromRGB(0xff8c03); - [switchView addSubview:switchViewControl]; - - // 设置约束 - 使用 Masonry - [switchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.bottomAreaBackground).inset(16); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(20 + index * 50); - make.height.mas_equalTo(50); - }]; - - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(switchView); - make.centerY.mas_equalTo(switchView); - }]; - - [switchViewControl mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(switchView); - make.centerY.mas_equalTo(switchView); - }]; - - // 添加开关事件 - [switchViewControl addTarget:self action:@selector(switchValueChanged:) forControlEvents:UIControlEventValueChanged]; - switchViewControl.tag = index; - - // 保存 switch 引用 - if (index == 0) { - self.giftEffectsSwitch = switchViewControl; - } else if (index == 1) { - self.globalGiftScreenSwitch = switchViewControl; - } else if (index == 2) { - self.globalGameScreenSwitch = switchViewControl; - } -} - -- (void)setupSwitchStates { - // 🔧 修复：统一使用roomInfo.roomId，确保与TurboModeStateManager一致 - NSString *roomId = @(self.roomInfo.roomId).stringValue; - self.roomId = roomId; - - TurboModeStateManager *manager = [TurboModeStateManager sharedManager]; - - // 🔧 修复：使用正确的公开接口获取开关状态 - BOOL giftEffectsEnabled = [manager isGiftEffectsEnabledForRoom:roomId]; - BOOL globalGiftScreenEnabled = [manager isGlobalGiftScreenEnabledForRoom:roomId]; - BOOL globalGameScreenEnabled = [manager isGlobalGameScreenEnabledForRoom:roomId]; - - // 设置开关初始状态 - self.giftEffectsSwitch.on = giftEffectsEnabled; - self.globalGiftScreenSwitch.on = globalGiftScreenEnabled; - self.globalGameScreenSwitch.on = globalGameScreenEnabled; - - NSLog(@"🎮 Turbo Mode开关初始化完成 - 房间ID: %@, 全局TurboMode: %@, 礼物特效: %@, 全局礼物屏幕: %@, 全局游戏屏幕: %@", - roomId, - [manager isTurboModeEnabled] ? @"开启" : @"关闭", - self.giftEffectsSwitch.on ? @"开启" : @"关闭", - self.globalGiftScreenSwitch.on ? @"开启" : @"关闭", - self.globalGameScreenSwitch.on ? @"开启" : @"关闭"); -} - -- (void)switchValueChanged:(UISwitch *)sender { - BOOL isOn = sender.isOn; - - // 检查当前 turbo mode 状态 - BOOL currentTurboMode = [[TurboModeStateManager sharedManager] isTurboModeEnabled]; - - if (currentTurboMode && isOn) { - // turbo mode 开启时，用户点击开启开关，静默关闭 turbo mode（不发送通知） - [[TurboModeStateManager sharedManager] setTurboModeEnabledSilently:NO]; - - // 🔧 修复：只更新被操作的开关状态，不触发所有开关打开 - TurboModeStateManager *manager = [TurboModeStateManager sharedManager]; - if (sender.tag == 0) { // 礼物特效开关 - [manager updateGiftEffectsForRoom:self.roomId enabled:YES]; - } else if (sender.tag == 1) { // 全局礼物屏幕 - [manager setGlobalGiftScreenEnabledForRoom:self.roomId enabled:YES]; - } else if (sender.tag == 2) { // 全局游戏屏幕 - [manager setGlobalGameScreenEnabledForRoom:self.roomId enabled:YES]; - } - - NSLog(@"🎮 Turbo Mode 已静默关闭，开关 %ld 已开启", (long)sender.tag); - return; - } - - // 🔧 修改：直接使用 TurboModeStateManager 处理开关状态变化 - TurboModeStateManager *manager = [TurboModeStateManager sharedManager]; - - if (sender.tag == 0) { // 礼物特效开关 - // 礼物特效开关不持久化，只更新临时状态，并记录用户覆盖 - [manager updateGiftEffectsForRoom:self.roomId enabled:isOn fromUser:YES]; - - } else if (sender.tag == 1) { // 全局礼物屏幕 - [manager setGlobalGiftScreenEnabledForRoom:self.roomId enabled:isOn]; - - // 🔧 新增：显示 toast 提示 - NSString *toastMessage = isOn ? YMLocalizedString(@"20.20.62_text_17") : YMLocalizedString(@"20.20.62_text_18"); - [self showToastWithMessage:toastMessage]; - - } else if (sender.tag == 2) { // 全局游戏屏幕 - [manager setGlobalGameScreenEnabledForRoom:self.roomId enabled:isOn]; - - // 🔧 新增：显示 toast 提示 - NSString *toastMessage = isOn ? YMLocalizedString(@"20.20.62_text_19") : YMLocalizedString(@"20.20.62_text_20"); - [self showToastWithMessage:toastMessage]; - } - - // 通知父控制器更新 Turbo_Mode 按钮状态 - [self notifyParentUpdateTurboModeButton]; - - NSLog(@"🎮 Turbo Mode开关变化 - 索引: %ld, 状态: %@", (long)sender.tag, isOn ? @"开启" : @"关闭"); -} - - -- (void)notifyParentUpdateTurboModeButton { - // 🔧 修复：使用正确的公开接口获取开关状态 - TurboModeStateManager *manager = [TurboModeStateManager sharedManager]; - - BOOL allSwitchesOn = [manager isGiftEffectsEnabledForRoom:self.roomId] && - [manager isGlobalGiftScreenEnabledForRoom:self.roomId] && - [manager isGlobalGameScreenEnabledForRoom:self.roomId]; - - [[NSNotificationCenter defaultCenter] - postNotificationName:kTurboModeButtonStateChanged - object:nil - userInfo:@{@"allOn": @(allSwitchesOn)}]; -} - -#pragma mark - Notification Methods -// 🔧 移除：通知发送方法，由 TurboModeStateManager 统一处理 - -- (void)setupTapGesture { - // 创建点击手势识别器，点击空白区域时关闭 VC - UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleBackgroundTap:)]; - tapGesture.delegate = self; - [self.view addGestureRecognizer:tapGesture]; -} - -- (void)handleBackgroundTap:(UITapGestureRecognizer *)gesture { - // 获取点击位置 - CGPoint location = [gesture locationInView:self.view]; - - // 检查点击位置是否在底部黑色背景区域外 - if (!CGRectContainsPoint(self.bottomAreaBackground.frame, location)) { - // 点击在空白区域，关闭 VC - [self dismissViewController]; - } -} - -- (void)dismissViewController { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - Toast Methods - -- (void)showToastWithMessage:(NSString *)message { - // 创建 toast 视图 - UIView *toastView = [[UIView alloc] init]; - toastView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.8]; - toastView.layer.cornerRadius = 8; - [self.view addSubview:toastView]; - - // 创建文本标签 - UILabel *messageLabel = [[UILabel alloc] init]; - messageLabel.text = message; - messageLabel.textColor = [UIColor whiteColor]; - messageLabel.font = [UIFont systemFontOfSize:14]; - messageLabel.textAlignment = NSTextAlignmentCenter; - messageLabel.numberOfLines = 0; - [toastView addSubview:messageLabel]; - - // 设置约束 - [toastView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.view); - make.top.equalTo(self.view).offset(100); - make.leading.greaterThanOrEqualTo(self.view).offset(20); - make.trailing.lessThanOrEqualTo(self.view).offset(-20); - }]; - - [messageLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(toastView).insets(UIEdgeInsetsMake(12, 16, 12, 16)); - }]; - - // 显示动画 - toastView.alpha = 0; - [UIView animateWithDuration:0.3 animations:^{ - toastView.alpha = 1; - }]; - - // 自动隐藏 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [UIView animateWithDuration:0.3 animations:^{ - toastView.alpha = 0; - } completion:^(BOOL finished) { - [toastView removeFromSuperview]; - }]; - }); - - NSLog(@"🎮 显示 Toast: %@", message); -} - -#pragma mark - Notifications - -- (void)setupNotifications { - // 监听 Turbo Mode 状态变化 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTurboModeStateChanged:) - name:@"TurboModeStateChanged" - object:nil]; - - // 监听各个开关状态变化 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleGiftEffectsChanged:) - name:kTurboGiftEffectsEnabledChanged - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleGlobalGiftScreenChanged:) - name:kTurboGlobalGiftScreenEnabledChanged - object:nil]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleGlobalGameScreenChanged:) - name:kTurboGlobalGameScreenEnabledChanged - object:nil]; - - -} - -- (void)handleTurboModeStateChanged:(NSNotification *)notification { - BOOL turboModeEnabled = [notification.userInfo[@"enabled"] boolValue]; - - NSLog(@"🎮 XPEffectPanelViewController: 收到 Turbo Mode 状态变化通知 - 状态: %@", turboModeEnabled ? @"开启" : @"关闭"); - - // 🔧 修复：不要重复调用 forceCloseAllSwitches/forceOpenAllSwitches - // 这些方法已经在 TurboModeStateManager 的 setTurboModeEnabled 中被调用 - // 这里只需要更新UI显示状态 - [self updateSwitchesUIForTurboMode:turboModeEnabled]; -} - -- (void)updateSwitchesUIForTurboMode:(BOOL)turboModeEnabled { - TurboModeStateManager *manager = [TurboModeStateManager sharedManager]; - - // 🔧 修复：使用正确的公开接口获取开关状态 - self.giftEffectsSwitch.on = [manager isGiftEffectsEnabledForRoom:self.roomId]; - self.globalGiftScreenSwitch.on = [manager isGlobalGiftScreenEnabledForRoom:self.roomId]; - self.globalGameScreenSwitch.on = [manager isGlobalGameScreenEnabledForRoom:self.roomId]; - - NSLog(@"🎮 XPEffectPanelViewController: UI开关已更新 - 全局TurboMode: %@, 礼物特效: %@, 全局礼物屏幕: %@, 全局游戏屏幕: %@", - turboModeEnabled ? @"开启" : @"关闭", - self.giftEffectsSwitch.on ? @"开启" : @"关闭", - self.globalGiftScreenSwitch.on ? @"开启" : @"关闭", - self.globalGameScreenSwitch.on ? @"开启" : @"关闭"); -} - -- (void)handleGiftEffectsChanged:(NSNotification *)notification { - BOOL enabled = [notification.userInfo[@"on"] boolValue]; - NSString *roomId = notification.userInfo[@"roomId"]; - - if ([roomId isEqualToString:self.roomId]) { - self.giftEffectsSwitch.on = enabled; - NSLog(@"🎮 礼物特效开关状态已更新: %@", enabled ? @"开启" : @"关闭"); - } -} - -- (void)handleGlobalGiftScreenChanged:(NSNotification *)notification { - BOOL enabled = [notification.userInfo[@"on"] boolValue]; - NSString *roomId = notification.userInfo[@"roomId"]; - - if ([roomId isEqualToString:self.roomId]) { - self.globalGiftScreenSwitch.on = enabled; - NSLog(@"🎮 全局礼物屏幕开关状态已更新: %@", enabled ? @"开启" : @"关闭"); - } -} - -- (void)handleGlobalGameScreenChanged:(NSNotification *)notification { - BOOL enabled = [notification.userInfo[@"on"] boolValue]; - NSString *roomId = notification.userInfo[@"roomId"]; - - if ([roomId isEqualToString:self.roomId]) { - self.globalGameScreenSwitch.on = enabled; - NSLog(@"🎮 全局游戏屏幕开关状态已更新: %@", enabled ? @"开启" : @"关闭"); - } -} - - - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomInviteFansView.h b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomInviteFansView.h deleted file mode 100644 index 5dc2b9c..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomInviteFansView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMRoomInviteFriendView.h -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomInviteFansView : UIView - -- (instancetype)initWithRoomUid:(NSString *)roomUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomInviteFansView.m b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomInviteFansView.m deleted file mode 100644 index b92bfc8..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomInviteFansView.m +++ /dev/null @@ -1,305 +0,0 @@ -// -// YMRoomInviteFriendView.m -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import "XPRoomInviteFansView.h" -///Third -#import -///Tool -#import "ThemeColor+Room.h" -#import "UIImage+Utils.h" -#import "Api+MoreMenu.h" -#import "XNDJTDDLoadingTool.h" -#import "YUMIMacroUitls.h" -///Model -#import "InviteFansModel.h" - -@interface XPRoomInviteFriendTitleView : UIView -///显示小圆点 -@property (nonatomic,strong) UIView * circleView; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPRoomInviteFriendTitleView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.circleView]; - [self addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.titleLabel.mas_trailing); - }]; - - [self.circleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(4, 4)); - make.centerY.leading.mas_equalTo(self); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.circleView.mas_trailing).offset(8); - make.centerY.mas_equalTo(self); - }]; -} - -#pragma mark - Getters And Setters -- (UIView *)circleView { - if (!_circleView) { - _circleView = [[UIView alloc] init]; - _circleView.backgroundColor = UIColorFromRGB(0xCAC2FF); - _circleView.layer.masksToBounds = YES; - _circleView.layer.cornerRadius = 2; - } - return _circleView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:13]; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} - -@end - - -@interface XPRoomInviteFansView () -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -///文案一 -@property (nonatomic,strong) XPRoomInviteFriendTitleView *firstView; -///文案二 -@property (nonatomic,strong) XPRoomInviteFriendTitleView *secondView; -///文案三 -@property (nonatomic,strong) XPRoomInviteFriendTitleView *thirdView; -///邀请 -@property (nonatomic,strong) UIButton *inviteButton; -///剩余 -@property (nonatomic,strong) UILabel *residueLabel; -///房主的uid -@property (nonatomic,copy) NSString *roomUid; -///邀请粉丝 -@property (nonatomic,strong) InviteFansModel *fansInfoModel; -///定时器 -@property (nonatomic,strong) dispatch_source_t timer; -@end - -@implementation XPRoomInviteFansView - - -- (instancetype)initWithRoomUid:(NSString *)roomUid { - self = [super init]; - if (self) { - self.roomUid = roomUid; - [self getInviteFansState]; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.titleLabel]; - [self addSubview:self.firstView]; - [self addSubview:self.secondView]; - [self addSubview:self.thirdView]; - [self addSubview:self.inviteButton]; - [self addSubview:self.residueLabel]; - - self.backgroundColor = [UIColor whiteColor]; - CAShapeLayer * layer = [CAShapeLayer layer]; - layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, 273) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(15, 15)].CGPath; - self.layer.mask = layer; -} - -- (void)initSubViewConstraints { - self.frame = CGRectMake(0, 0, KScreenWidth, 273); - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(20); - make.trailing.leading.mas_equalTo(self); - }]; - - [self.firstView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(16); - make.leading.mas_equalTo(self).offset(30); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(23); - }]; - - [self.secondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.leading.mas_equalTo(self.firstView); - make.top.mas_equalTo(self.firstView.mas_bottom).offset(15); - }]; - - [self.thirdView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.leading.mas_equalTo(self.firstView); - make.top.mas_equalTo(self.secondView.mas_bottom).offset(15); - }]; - - [self.inviteButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(160, 38)); - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.thirdView.mas_bottom).offset(40); - }]; - - [self.residueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.mas_equalTo(self); - make.top.mas_equalTo(self.inviteButton.mas_bottom).offset(16); - }]; -} - -- (void)getInviteFansState { - [Api checkInviteRoomFans:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - InviteFansModel * model = [InviteFansModel modelWithDictionary:data.data]; - self.fansInfoModel = model; - [self configFansView:model]; - [self openCutDownTimer]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:self.roomUid]; -} - -- (void)configFansView:(InviteFansModel *)model { - NSString * residueTitle = [NSString stringWithFormat:YMLocalizedString(@"XPRoomInviteFansView0"), model.inviteTimes]; - NSMutableAttributedString * residueAttribute = [[NSMutableAttributedString alloc] initWithString:residueTitle attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13], NSForegroundColorAttributeName:[DJDKMIMOMColor secondTextColor]}]; - NSRange range = [residueTitle rangeOfString:[NSString stringWithFormat:@"%d", model.inviteTimes]]; - [residueAttribute addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:18] range:range]; - [residueAttribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor appEmphasizeColor] range:range]; - self.residueLabel.attributedText = residueAttribute; - self.residueLabel.textAlignment = NSTextAlignmentCenter; - - self.inviteButton.enabled = model.inviteInterval <= 0; - if (model.inviteTimes <= 0) { - [self.inviteButton setTitle:YMLocalizedString(@"XPRoomInviteFansView1") forState:UIControlStateDisabled]; - self.inviteButton.enabled = NO; - } - - NSString * fansNumberTitle = [NSString stringWithFormat:YMLocalizedString(@"XPRoomInviteFansView2"), model.fansNum]; - NSMutableAttributedString * fansAttribute = [[NSMutableAttributedString alloc] initWithString:fansNumberTitle attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13], NSForegroundColorAttributeName:[DJDKMIMOMColor secondTextColor]}]; - NSRange fansRange = [fansNumberTitle rangeOfString:[NSString stringWithFormat:@"%ld", model.fansNum]]; - [fansAttribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor appEmphasizeColor] range:fansRange]; - self.firstView.titleLabel.attributedText = fansAttribute; -} - -- (void)openCutDownTimer { - dispatch_source_t _timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_global_queue(0, 0)); - dispatch_source_set_timer(_timer, DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC, 0 * NSEC_PER_SEC); - dispatch_source_set_event_handler(_timer, ^{ - dispatch_async(dispatch_get_main_queue(), ^{ - self.fansInfoModel.inviteInterval --; - if (self.fansInfoModel.inviteInterval <= 0) { - dispatch_source_cancel(_timer); - self.timer = nil; - [self.inviteButton setTitle:YMLocalizedString(@"XPRoomInviteFansView3") forState:UIControlStateNormal]; - self.inviteButton.enabled = YES; - } else { - int seconds = self.fansInfoModel.inviteInterval % 60; - int minutes = (self.fansInfoModel.inviteInterval / 60) % 60; - NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomInviteFansView4"),minutes, seconds]; - [self.inviteButton setTitle:title forState:UIControlStateDisabled]; - } - }); - }); - self.timer = _timer; - dispatch_resume(_timer); -} - -#pragma mark - Event Response -- (void)inviteButtonAction:(UIButton *)sender { - sender.enabled = NO; - [Api inviteRoomFans:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - InviteFansModel * model = [InviteFansModel modelWithDictionary:data.data]; - self.fansInfoModel = model; - [self configFansView:model]; - [self openCutDownTimer]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - sender.enabled = YES; - } - } roomUid:self.roomUid]; -} - -#pragma mark - Getters And Setters -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPRoomInviteFansView5"); - _titleLabel.font = [UIFont boldSystemFontOfSize:16]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (XPRoomInviteFriendTitleView *)firstView { - if (!_firstView) { - _firstView = [[XPRoomInviteFriendTitleView alloc] init]; - } - return _firstView; -} - -- (XPRoomInviteFriendTitleView *)secondView { - if (!_secondView) { - _secondView = [[XPRoomInviteFriendTitleView alloc] init]; - _secondView.titleLabel.text= YMLocalizedString(@"XPRoomInviteFansView6"); - } - return _secondView; -} - -- (XPRoomInviteFriendTitleView *)thirdView { - if (!_thirdView) { - _thirdView = [[XPRoomInviteFriendTitleView alloc] init]; - _thirdView.titleLabel.text = YMLocalizedString(@"XPRoomInviteFansView7"); - } - return _thirdView; -} - - -- (UIButton *)inviteButton { - if (!_inviteButton) { - _inviteButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_inviteButton setTitle:YMLocalizedString(@"XPRoomInviteFansView8") forState:UIControlStateNormal]; - [_inviteButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_inviteButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateDisabled]; - _inviteButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_inviteButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientEndColor] ] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_inviteButton setBackgroundImage:[UIImage imageWithColor:[DJDKMIMOMColor disableButtonColor]] forState:UIControlStateDisabled]; - _inviteButton.layer.masksToBounds = YES; - _inviteButton.layer.cornerRadius = 38 / 2; - [_inviteButton addTarget:self action:@selector(inviteButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _inviteButton; -} - -- (UILabel *)residueLabel { - if (!_residueLabel) { - _residueLabel = [[UILabel alloc] init]; - } - return _residueLabel; -} - - - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.h b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.h deleted file mode 100644 index a344925..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomMoreMenuViewController.h -// YUMI -// -// Created by YUMI on 2021/12/11. -// - -#import "MvpViewController.h" -#import "RoomHostDelegate.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomMoreMenuViewController : MvpViewController -- (instancetype)initWithDelegate:(id)delegate isUserOnMic:(BOOL)isOnMic; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m deleted file mode 100644 index af4c5ef..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m +++ /dev/null @@ -1,708 +0,0 @@ -// -// YMRoomMoreMenuViewController.m -// YUMI -// -// Created by YUMI on 2021/12/11. -// - -#import "XPRoomMoreMenuViewController.h" -#import -#import -///Third -#import -#import "FFPopup.h" -///Tool -#import "YUMIMacroUitls.h" -#import "TTPopup.h" -#import "YUMIConstant.h" -#import "AccountInfoStorage.h" -#import "DJDKMIMOMColor.h" -#import "RtcManager.h" -///Model -#import "XPRoomMoreItemModel.h" -///Manager -#import "TurboModeStateManager.h" -#import "RoomInfoModel.h" -#import "AttachmentModel.h" -#import "GuildSuperAdminInfoModel.h" -#import "AccountInfoStorage.h" -#import "NSArray+Safe.h" -#import "UserInfoModel.h" -///View -#import "AppOfficalManagerActionsViewController.h" -#import "XPRoomMoreMenuCollectionViewCell.h" -#import "XPRoomInviteFansView.h" -#import "XPAcrossRoomPKViewController.h" -#import "XPAnchorPKViewController.h" -#import "XPRoomSettingViewController.h" -#import "XPReleaseRadioViewController.h" -#import "XPRoomPKViewController.h" -#import "BaseNavigationController.h" -#import "XPAnchorPKSelectTypeController.h" -#import "XPRoomTrumpetViewController.h" -#import "XPWebViewController.h" -#import "PIRoomPhotoAlbumVC.h" -#import "PIRoomSendRedPacketVC.h" -#import "XPRoomTypeSelectionViewController.h" -///P -#import "XPMoreMenuPresenter.h" -#import "XPMoreMenuProtocol.h" -#import "CustomRoomBGContentViewController.h" - -#import "RoomModeViewController.h" - -#import "XPRoomMoreMenuActionFactory.h" -#import "XPRoomMoreMenuAction.h" -#import "XPPKAction.h" - -#import "XPEffectPanelViewController.h" -#import "XPTurboModeConstants.h" -#import "XPTurboModeTipsView.h" -#import "XPRoomSettingPresenter.h" -#import "TurboModeStateManager.h" - -UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey; - -// 🔧 新增：Turbo Mode 相关常量声明 -extern NSString *const kTurboModeButtonStateChanged; - -@interface XPRoomMoreMenuViewController () -///顶部的View -@property (nonatomic,strong) UIView * topView; -///模糊背景 -@property (nonatomic, strong) UIVisualEffectView *effectView; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///底部的View -@property (nonatomic,strong) UIView * bottomView; -///数据源 -@property (nonatomic,strong) NSArray *datasource; -///房间信息 -@property (nonatomic,strong) RoomInfoModel *roomInfo; - -@property (nonatomic,assign) id hostDelegate; - -@property(nonatomic, assign) BOOL isOnMic; - -// 🔧 新增：Turbo_Mode 按钮 -@property (nonatomic, strong) UIButton *turboModeButton; - -@end - -@implementation XPRoomMoreMenuViewController - - -// 🔧 新增：设置 Turbo Mode 通知监听 -- (void)setupTurboModeNotifications { - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(handleTurboModeButtonStateChanged:) - name:kTurboModeButtonStateChanged - object:nil]; -} - -// 🔧 新增：处理 Turbo Mode 按钮状态变化 -- (void)handleTurboModeButtonStateChanged:(NSNotification *)notification { - BOOL allOn = [notification.userInfo[@"allOn"] boolValue]; - [self updateTurboModeButtonState:allOn]; -} - -// 🔧 新增：更新 Turbo Mode 按钮状态 -- (void)updateTurboModeButtonState:(BOOL)allOn { - if (allOn) { - [self.turboModeButton setTitleColor:[UIColor greenColor] forState:UIControlStateNormal]; - self.turboModeButton.backgroundColor = [UIColor colorWithRed:0.2 green:0.8 blue:0.2 alpha:0.8]; - } else { - [self.turboModeButton setTitleColor:[UIColor grayColor] forState:UIControlStateNormal]; - self.turboModeButton.backgroundColor = [UIColor colorWithWhite:0.1 alpha:0.8]; - } -} - -// 🔧 新增：Turbo Mode 按钮点击事件 -- (void)turboModeButtonTapped { - // 打开 Turbo 配置面板 - [self dismissViewControllerAnimated:NO completion:nil]; - XPEffectPanelViewController *vc = [[XPEffectPanelViewController alloc] init]; - vc.roomInfo = self.roomInfo; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:vc - animated:YES - completion:nil]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; -} - -- (instancetype)initWithDelegate:(id)delegate isUserOnMic:(BOOL)isOnMic { - if (self = [super init]) { - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - self.isOnMic = isOnMic; - self.roomInfo = delegate.getRoomInfo; - self.hostDelegate = delegate; - } - return self; -} - -- (XPMoreMenuPresenter *)createPresenter { - return [[XPMoreMenuPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self setupTurboModeNotifications]; - [self initSubViewConstraints]; - - ///自己是公会超管 - BOOL meIsSuperAdmin = NO; - for (GuildSuperAdminInfoModel *managerInfo in self.hostDelegate.getRoomSuperAdminList) { - if ([managerInfo.uid isEqualToString:[AccountInfoStorage instance].getUid]) { - meIsSuperAdmin = YES; - break; - } - } - - [self.presenter getMoreMenuDataSourceWithNewArchitecture:self.roomInfo - isSuperAdmin:meIsSuperAdmin - isOnMic:self.isOnMic - isAppSuperAdmin:[self.hostDelegate.getUserInfo platformRole]==1]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.topView]; - [self.view addSubview:self.effectView]; - [self.view addSubview:self.collectionView]; - [self.view addSubview:self.bottomView]; -} - -- (void)initSubViewConstraints { - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.collectionView.mas_top); - }]; - - [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(0); - make.top.mas_equalTo(self.collectionView); - make.bottom.mas_equalTo(self.bottomView); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(0); - make.bottom.mas_equalTo(self.bottomView.mas_top); - }]; - - [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.height.mas_equalTo(kSafeAreaBottomHeight); - }]; -} - -#pragma mark - XPMoreMenuProtocol -- (void)getMoreMenuDataSuccess:(NSArray *)list { - self.datasource = list; - [self.collectionView reloadData]; - - CGFloat contentHeight= 24 + 36; - CGFloat itemHeight = 50; - int page = list.count % 5; - int scale = (int)list.count / (int)5; - if (page == 0) { - contentHeight += (scale *itemHeight); - } else { - contentHeight += ((scale+1) *itemHeight + scale * 12); - } - CAShapeLayer * layer = [CAShapeLayer layer]; - UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, contentHeight) - byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight - cornerRadii:CGSizeMake(8, 8)]; - layer.path = path.CGPath; - self.collectionView.layer.mask = layer; - [self.collectionView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(contentHeight); - }]; -} - -- (void)openRoomGiftValueSuccess { - [self showSuccessToast:YMLocalizedString(@"XPRoomMoreMenuViewController0")]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)closeRoomGiftValueSuccess { - [self showSuccessToast:YMLocalizedString(@"XPRoomMoreMenuViewController1")]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -/// 设置公屏开关 -- (void)updateRoomMessageScreenStateSuccess:(RoomInfoModel *)roomInfo { - AttachmentModel *attachement = [[AttachmentModel alloc]init]; - attachement.first = CustomMessageType_Update_RoomInfo; - attachement.second = Custom_Message_Sub_Update_RoomInfo_MessageState; - attachement.data = @{@"roomInfo":roomInfo.model2dictionary}; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachement; - message.messageObject = object; - //构造会话 - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - NIMSession *session = [NIMSession session:roomId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -///清空公屏成功 -- (void)cleanScreenSuccess { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)openRoomDatingSuccess { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)closeRoomDatingSuccess { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -///发布房间广播 -- (void)getReleaseRadioSuccess:(XPReleaseRadioModel *)model { - [self dismissViewControllerAnimated:YES completion:nil]; - XPReleaseRadioViewController * releaseRadioVC = [[XPReleaseRadioViewController alloc] initWithDelegate:self.hostDelegate]; - releaseRadioVC.model = model; - releaseRadioVC.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:releaseRadioVC animated:YES completion:nil]; -} -///获取房间VIP小喇叭 -- (void)getTrumpetSuccess:(XPNobleTrumpetModel *)model { - [self dismissViewControllerAnimated:YES completion:nil]; - XPRoomTrumpetViewController * trumpetVC = [[XPRoomTrumpetViewController alloc] initWithDelegate:self.hostDelegate]; - trumpetVC.model = model; - trumpetVC.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:trumpetVC animated:YES completion:nil]; -} - -///结束个播PK失败 -- (void)endAnchorPkSuccess:(BOOL)success msg:(NSString *)msg { - if (!success) { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.message = msg; - config.actionStyle = TTAlertActionConfirmStyle; - [TTPopup alertWithConfig:config confirmHandler:^{ - } cancelHandler:^{ - }]; - } else { - [self dismissViewControllerAnimated:YES completion:nil]; - } -} - -- (void)cancelMatchRandomPKSuccess { - self.hostDelegate.getRoomInfo.pkMatchStartTime = 0; - [[NSNotificationCenter defaultCenter] postNotificationName:@"cancelMatchRandomPK" object:nil]; - [self dismissViewControllerAnimated:YES completion:nil]; - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - - XPAnchorPKViewController * acrossRoomPKVC = [[XPAnchorPKViewController alloc] initWithRoomUid:roomUid]; - [self.hostDelegate.getCurrentNav presentViewController:acrossRoomPKVC animated:YES completion:nil]; -} - -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPRoomMoreMenuCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPRoomMoreMenuCollectionViewCell class]) forIndexPath:indexPath]; - cell.itemModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - XPRoomMoreItemModel * item = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - - NSLog(@"=== 点击菜单项 ==="); - NSLog(@"点击的菜单项: 标题=%@, 类型=%ld", item.title, (long)item.type); - [self handleItemWithLegacyLogic:item]; -} - -- (void)handleItemWithLegacyLogic:(XPRoomMoreItemModel *)item { - NSString * roomUid = [NSString stringWithFormat:@"%ld",self.roomInfo.uid]; - - switch (item.type) { - case Room_Turbo_Mode_Open: - case Room_Turbo_Mode_Close: - { - [self dismissViewControllerAnimated:YES completion:nil]; - // 获取当前房间的 turbo mode 状态 - NSString *roomId = @(self.roomInfo.roomId).stringValue; - BOOL currentTurboMode = [[TurboModeStateManager sharedManager] isTurboModeEnabled]; - BOOL newTurboMode = !currentTurboMode; - - if (newTurboMode) { - // 用户主动开启 turbo mode，显示弹窗 - [self showTurboModeTipsForUserAction]; - } else { - // 用户主动关闭 turbo mode，直接设置状态并显示提示 - [[TurboModeStateManager sharedManager] setTurboModeEnabled:newTurboMode]; - [[TurboModeStateManager sharedManager] applyTurboModeToSwitchesForRoom:roomId]; - [self showSuccessToast:YMLocalizedString(@"20.20.62_text_24")]; - } - } - break; - case RoomMoreMenuType_Invite_Fans: - { - [self dismissViewControllerAnimated:YES completion:nil]; - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - XPRoomInviteFansView * inviteFansView = [[XPRoomInviteFansView alloc]initWithRoomUid:roomUid]; - [TTPopup popupView:inviteFansView style:TTPopupStyleActionSheet]; - } - break; - case RoomMoreMenuType_Room_Setting: - { - [self dismissViewControllerAnimated:YES completion:nil]; - XPRoomSettingViewController * roomsettingVC = [[XPRoomSettingViewController alloc] initWithDelegate:self.hostDelegate]; - [self.hostDelegate.getCurrentNav pushViewController:roomsettingVC animated:YES]; - } - break; - case RoomMoreMenuType_Room_Dating_Open: - { - if (self.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController6")]; - [self dismissViewControllerAnimated:NO completion:nil]; - return; - } - - if (self.roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController7")]; - [self dismissViewControllerAnimated:NO completion:nil]; - return; - } - - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.message = YMLocalizedString(@"XPRoomMoreMenuViewController8"); - config.confirmButtonConfig.title = YMLocalizedString(@"XPRoomMoreMenuViewController9"); - [TTPopup alertWithConfig:config confirmHandler:^{ - [self.presenter openRoomDating:roomUid]; - } cancelHandler:^{ - }]; - } - break; - case RoomMoreMenuType_Room_Dating_Close: - { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPRoomMoreMenuViewController10"); - config.message = YMLocalizedString(@"XPRoomMoreMenuViewController11"); - config.confirmButtonConfig.title = YMLocalizedString(@"XPRoomMoreMenuViewController12"); - [TTPopup alertWithConfig:config confirmHandler:^{ - [self.presenter closeRoomDating:roomUid]; - } cancelHandler:^{ - - }]; - } - break; - case RoomMoreMenuType_Release_Radio: - { - [self.presenter getRoomRadioMessageListWithType:[NSString stringWithFormat:@"%zd", self.roomInfo.type]]; - } - break; - case RoomMoreMenuType_Room_trumpet: - [self.presenter getRoomgetUserVipRoomTrumpet:roomUid]; - break; - case RoomMoreMenuType_Room_Across_PK_Open: - { - if (self.roomInfo.roomModeType == RoomModeType_Open_Blind) { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController13")]; - [self dismissViewControllerAnimated:NO completion:nil]; - return; - } - - if (self.roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController14")]; - [self dismissViewControllerAnimated:NO completion:nil]; - return; - } - [self dismissViewControllerAnimated:NO completion:nil]; - XPAcrossRoomPKViewController * acrossRoomPKVC = [[XPAcrossRoomPKViewController alloc] initWithRoomUid:roomUid]; - [self.hostDelegate.getCurrentNav presentViewController:acrossRoomPKVC animated:YES completion:nil]; - } - break; - case RoomMoreMenuType_Room_Across_PK_Close: - { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController15")]; - [self dismissViewControllerAnimated:NO completion:nil]; - } - break; - case RoomMoreMenuType_Room_Anchor_PK_Open: - { - if (self.hostDelegate.getRoomInfo.pkMatchStartTime) {//PK匹配中 - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.message = YMLocalizedString(@"XPRoomMoreMenuViewController16"); - [TTPopup alertWithConfig:config confirmHandler:^{ - [self.presenter requestCancelMatchRandomPK:roomUid]; - } cancelHandler:^{ - }]; - } else { - [self dismissViewControllerAnimated:NO completion:nil]; - XPAnchorPKViewController * acrossRoomPKVC = [[XPAnchorPKViewController alloc] initWithRoomUid:roomUid]; - [self.hostDelegate.getCurrentNav presentViewController:acrossRoomPKVC animated:YES completion:nil]; - } - } - break; - case RoomMoreMenuType_Room_Anchor_PK_Close: - { - if (self.roomInfo.pkState == AcrossRoomPkStateTypePenalty) { - if ([self.roomInfo.winUid isEqualToString:[AccountInfoStorage instance].getUid]) {//赢 - if (self.roomInfo.roundId) { - [self.presenter requestFinishAnchorPK:[NSString stringWithFormat:@"%ld", self.roomInfo.roundId]]; - } - } else if ([self.roomInfo.winUid isEqualToString:self.roomInfo.pkUid]) {//输 - - } else {//平局 - if (self.roomInfo.roundId) { - [self.presenter requestFinishAnchorPK:[NSString stringWithFormat:@"%ld", self.roomInfo.roundId]]; - } - } - } else { - if (self.roomInfo.roundId) { - [self.presenter requestFinishAnchorPK:[NSString stringWithFormat:@"%ld", self.roomInfo.roundId]]; - } - } - - } - break; - case RoomMoreMenuType_Message_Screen_Clear: - { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPRoomMoreMenuViewController17"); - config.message = YMLocalizedString(@"XPRoomMoreMenuViewController18"); - config.confirmButtonConfig.title = YMLocalizedString(@"TTAlertConfig0"); - [TTPopup alertWithConfig:config confirmHandler:^{ - [self.presenter cleanScreen:roomUid uid:[AccountInfoStorage instance].getUid]; - } cancelHandler:^{ - }]; - } - break; - - case RoomMoreMenuType_Room_PK_Open: - { - if (self.roomInfo.roomModeType == RoomModeType_Open_Blind) { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController20")]; - [self dismissViewControllerAnimated:NO completion:nil]; - return; - } - - if (self.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController21")]; - [self dismissViewControllerAnimated:NO completion:nil]; - return; - } - - [self dismissViewControllerAnimated:NO completion:nil]; - XPRoomPKViewController * roomPKVC = [[XPRoomPKViewController alloc] initWithDelegate:self.hostDelegate]; - [self.hostDelegate.getCurrentNav pushViewController:roomPKVC animated:YES]; - } - break; - case RoomMoreMenuType_Room_PK_Close: - { - [self dismissViewControllerAnimated:NO completion:nil]; - XPRoomPKViewController * roomPKVC = [[XPRoomPKViewController alloc] initWithDelegate:self.hostDelegate]; - [self.hostDelegate.getCurrentNav pushViewController:roomPKVC animated:YES]; - } - break; - case RoomMoreMenuType_Room_redPacket: - { - [self dismissViewControllerAnimated:YES completion:nil]; - PIRoomSendRedPacketVC *sendRedPacketVC = [[PIRoomSendRedPacketVC alloc] initWithDelegate:self.hostDelegate]; - sendRedPacketVC.roomUid = roomUid; - sendRedPacketVC.modalPresentationStyle = UIModalPresentationOverFullScreen; - BaseNavigationController *nav = [[BaseNavigationController alloc] initWithRootViewController:sendRedPacketVC]; - nav.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:nav animated:YES completion:nil]; - } - break; - case RoomMoreMenuType_Room_report: - { - [self dismissViewControllerAnimated:YES completion:nil]; - TTActionSheetConfig *action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"RoomHeaderView10") clickAction:^{ - [FFPopup dismissPopupForView:self.view animated:NO]; - [self.hostDelegate requesstShieldingAction]; - }]; - TTActionSheetConfig *action1 = [TTActionSheetConfig normalTitle:YMLocalizedString(@"RoomHeaderView12") clickAction:^{ - [FFPopup dismissPopupForView:self.view animated:NO]; - - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:@(self.roomInfo.roomId).stringValue]; - NSString *urlstr = [NSString stringWithFormat:@"%@?reportUid=%ld&source=ROOM", URLWithType(kReportRoomURL),self.hostDelegate.getRoomInfo.uid]; - webVC.url = urlstr; - [[self.hostDelegate getCurrentNav] pushViewController:webVC animated:YES]; - - }]; - [TTPopup actionSheetWithItems:@[action,action1]]; - break; - } - case RoomMoreMenuType_Room_Room_Photo_Album: - { - [self dismissViewControllerAnimated:NO completion:nil]; - PIRoomPhotoAlbumVC *albumVC = [PIRoomPhotoAlbumVC new]; - albumVC.roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - [self.hostDelegate.getCurrentNav pushViewController:albumVC animated:YES]; - } - break; - case RoomMoreMenuType_Room_Type_Setting: { - [self dismissViewControllerAnimated:NO completion:nil]; - RoomModeViewController *vc = [[RoomModeViewController alloc] init]; - vc.roomInfo = self.hostDelegate.getRoomInfo; - [self.hostDelegate.getCurrentNav pushViewController:vc animated:YES]; - } - break; - case RoomMoreMenuType_Room_Type_Background: { - [self dismissViewControllerAnimated:NO completion:nil]; - CustomRoomBGContentViewController *vc = [[CustomRoomBGContentViewController alloc] init]; - vc.roomInfo = self.roomInfo; - vc.roomUID = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:vc - animated:YES - completion:nil]; - } - break; - case RoomMoreMenuType_Room_Music_Panel: { - @kWeakify(self); - [self dismissViewControllerAnimated:YES - completion:^{ - @kStrongify(self); - [self.hostDelegate displayMusicPanel]; - }]; - } - break; - case RoomMoreMenuType_App_Manager:{ - [self dismissViewControllerAnimated:NO completion:nil]; - AppOfficalManagerActionsViewController *vc = [[AppOfficalManagerActionsViewController alloc] init]; - vc.roomID = @(self.roomInfo.roomId).stringValue; - vc.roomUid = roomUid; - vc.targetUid = roomUid; - vc.controlUid = @(self.hostDelegate.getUserInfo.uid).stringValue; - vc.isRoomHide = self.roomInfo.hideFlag; - [self.hostDelegate.getCurrentNav pushViewController:vc animated:YES]; - } - break; - case RoomMoreMenuType_MyAnimationEffects_Mode: { - [self dismissViewControllerAnimated:NO completion:nil]; - XPEffectPanelViewController *vc = [[XPEffectPanelViewController alloc] init]; - vc.roomInfo = self.roomInfo; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:vc - animated:YES - completion:nil]; - } - break; - default: - break; - } -} - -#pragma mark - Turbo Mode Methods - -- (void)showTurboModeTipsForUserAction { - NSLog(@"🎮 用户主动开启 Turbo Mode，显示 Tips 弹窗"); - - // 获取当前窗口来显示弹窗 - UIWindow *window = [UIApplication sharedApplication].keyWindow; - if (!window) { - // 尝试获取其他窗口 - NSArray *windows = [UIApplication sharedApplication].windows; - for (UIWindow *w in windows) { - if (w.isKeyWindow) { - window = w; - break; - } - } - } - - if (!window) { - NSLog(@"🎮 无法获取窗口，Tips 弹窗显示失败"); - // 如果无法显示弹窗，直接开启 turbo mode - [self enableTurboModeDirectly]; - return; - } - - // 创建并显示 Tips（复用现有的 XPTurboModeTipsView） - XPTurboModeTipsView *tipsView = [XPTurboModeTipsView showInView:window]; - NSLog(@"🎮 用户主动触发的 Turbo Mode Tips 弹窗已创建"); -} - -- (void)enableTurboModeDirectly { - NSLog(@"🎮 直接开启 Turbo Mode（备用方案）"); - - // 获取当前房间ID - NSString *roomId = @(self.roomInfo.roomId).stringValue; - - // 开启全局 turbo mode - [[TurboModeStateManager sharedManager] setTurboModeEnabled:YES]; - - // 应用 turbo mode 到当前房间的开关 - [[TurboModeStateManager sharedManager] applyTurboModeToSwitchesForRoom:roomId]; - - // 显示成功提示 - [self showSuccessToast:YMLocalizedString(@"Turbo Mode 已开启")]; -} - -#pragma mark - Event Response -- (void)disMissRecognizer { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - Getters And Setters -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.sectionInset = UIEdgeInsetsMake(24, 0, 10, 0); - layout.itemSize = CGSizeMake(KScreenWidth /5, 50); - layout.minimumLineSpacing = 12; - layout.minimumInteritemSpacing = 0; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.alpha = 0.9; - _collectionView.scrollEnabled = NO; - [_collectionView registerClass:[XPRoomMoreMenuCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPRoomMoreMenuCollectionViewCell class])]; - } - return _collectionView; -} - -- (UIView *)topView { - if (!_topView) { - _topView = [[UIView alloc] init]; - _topView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(disMissRecognizer)]; - tap.cancelsTouchesInView = NO; - [_topView addGestureRecognizer:tap]; - } - return _topView; -} - -- (UIView *)bottomView { - if (!_bottomView) { - _bottomView = [[UIView alloc] init]; - } - return _bottomView; -} - -- (UIVisualEffectView *)effectView { - if (!_effectView) { - UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; - _effectView = [[UIVisualEffectView alloc] initWithEffect:beffect]; - - UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, KScreenHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(8, 8)]; - CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init]; - maskLayer.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - maskLayer.path = maskPath.CGPath; - _effectView.layer.mask = maskLayer; - } - return _effectView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPTurboModeTipsView.h b/YuMi/Modules/YMRoom/View/MoreView/View/XPTurboModeTipsView.h deleted file mode 100644 index 8938d87..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/View/XPTurboModeTipsView.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// XPTurboModeTipsView.h -// YuMi -// -// Created by AI Assistant -// Copyright © 2024 YuMi. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPTurboModeTipsViewDelegate - -@optional -- (void)turboModeTipsViewDidTapUnderstand; -- (void)turboModeTipsViewDidEnableTurboMode; - -@end - -@interface XPTurboModeTipsView : UIView - -@property (nonatomic, weak) id delegate; - -+ (instancetype)showInView:(UIView *)parentView; -- (void)dismiss; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPTurboModeTipsView.m b/YuMi/Modules/YMRoom/View/MoreView/View/XPTurboModeTipsView.m deleted file mode 100644 index 27a94c6..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/View/XPTurboModeTipsView.m +++ /dev/null @@ -1,290 +0,0 @@ -// -// XPTurboModeTipsView.m -// YuMi -// -// Created by AI Assistant -// Copyright © 2024 YuMi. All rights reserved. -// - -#import "XPTurboModeTipsView.h" -#import "XPTurboModeTipsManager.h" - -@interface XPTurboModeTipsView () - -@property (nonatomic, strong) UIView *backgroundView; -@property (nonatomic, strong) UIView *contentView; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UIScrollView *scrollView; -@property (nonatomic, strong) UIView *scrollContentView; -@property (nonatomic, strong) UILabel *contentLabel; -@property (nonatomic, strong) UILabel *contentLabel2; -@property (nonatomic, strong) UIButton *understandButton; -@property (nonatomic, strong) UIView *parentView; -@property (nonatomic, strong) UIImageView *tipsImageView; - -@end - -@implementation XPTurboModeTipsView - -#pragma mark - Public Methods - -+ (instancetype)showInView:(UIView *)parentView { - XPTurboModeTipsView *tipsView = [[XPTurboModeTipsView alloc] init]; - tipsView.parentView = parentView; - [tipsView setupUI]; - - // 🔧 修改：在显示时自动开启 turbo mode - [tipsView enableTurboModeOnShow]; - - [tipsView showWithAnimation]; - return tipsView; -} - -- (void)dismiss { - [self dismissWithAnimation]; -} - -#pragma mark - Turbo Mode Management - -- (void)enableTurboModeOnShow { - NSLog(@"🎮 Tips View 显示时自动开启 Turbo Mode"); - - // 🔧 修复：直接使用 XPTurboModeTipsManager 单例开启 turbo mode - // 因为此时 delegate 可能还没有设置 - [[XPTurboModeTipsManager sharedManager] enableTurboModeDirectly]; -} - -#pragma mark - Private Methods - -- (void)setupUI { - // 设置自身属性 - self.frame = self.parentView.bounds; - self.backgroundColor = [UIColor clearColor]; - - // 添加背景遮罩 - [self setupBackgroundView]; - - // 添加内容视图 - [self setupContentView]; - - // 添加标题 - [self setupTitleLabel]; - - // 添加滚动视图 - [self setupScrollView]; - - // 添加内容文字 - [self setupContentLabel]; - - // 添加图片视图 - [self setupTipsImageView]; - - // 添加第二个内容标签 - [self setupContentLabel2]; - - // 添加按钮 - [self setupUnderstandButton]; - - // 设置约束 - [self setupConstraints]; -} - -- (void)setupBackgroundView { - self.backgroundView = [[UIView alloc] init]; - self.backgroundView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; - [self addSubview:self.backgroundView]; - - // 添加点击手势 - UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(backgroundTapped)]; - [self.backgroundView addGestureRecognizer:tapGesture]; -} - -- (void)setupContentView { - self.contentView = [[UIView alloc] init]; - self.contentView.backgroundColor = [UIColor whiteColor]; - self.contentView.layer.cornerRadius = 16.0; - self.contentView.layer.shadowColor = [UIColor blackColor].CGColor; - self.contentView.layer.shadowOffset = CGSizeMake(0, 4); - self.contentView.layer.shadowOpacity = 0.15; - self.contentView.layer.shadowRadius = 8.0; - [self addSubview:self.contentView]; -} - -- (void)setupTitleLabel { - self.titleLabel = [[UILabel alloc] init]; - self.titleLabel.text = YMLocalizedString(@"UserDetail_CP_Toast_0"); - self.titleLabel.font = [UIFont boldSystemFontOfSize:20.0]; - self.titleLabel.textColor = [UIColor blackColor]; - self.titleLabel.textAlignment = NSTextAlignmentCenter; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)setupScrollView { - self.scrollView = [[UIScrollView alloc] init]; - self.scrollView.showsVerticalScrollIndicator = YES; - self.scrollView.showsHorizontalScrollIndicator = NO; - self.scrollView.alwaysBounceVertical = YES; - self.scrollView.alwaysBounceHorizontal = NO; - [self.contentView addSubview:self.scrollView]; - - self.scrollContentView = [[UIView alloc] init]; - [self.scrollView addSubview:self.scrollContentView]; -} - -- (void)setupContentLabel { - self.contentLabel = [[UILabel alloc] init]; - self.contentLabel.text = YMLocalizedString(@"20.20.62_text_15.1"); - self.contentLabel.font = [UIFont systemFontOfSize:16.0]; - self.contentLabel.textColor = [UIColor darkGrayColor]; - self.contentLabel.numberOfLines = 0; - self.contentLabel.textAlignment = NSTextAlignmentLeft; - [self.scrollContentView addSubview:self.contentLabel]; -} - -- (void)setupTipsImageView { - self.tipsImageView = [[UIImageView alloc] init]; - self.tipsImageView.image = [UIImage imageNamed:@"turbo_mode_tips"]; - self.tipsImageView.contentMode = UIViewContentModeScaleAspectFit; - [self.scrollContentView addSubview:self.tipsImageView]; -} - -- (void)setupContentLabel2 { - self.contentLabel2 = [[UILabel alloc] init]; - self.contentLabel2.text = YMLocalizedString(@"20.20.62_text_15.2"); - self.contentLabel2.font = [UIFont systemFontOfSize:16.0]; - self.contentLabel2.textColor = [UIColor darkGrayColor]; - self.contentLabel2.numberOfLines = 0; - self.contentLabel2.textAlignment = NSTextAlignmentLeft; - [self.scrollContentView addSubview:self.contentLabel2]; -} - -- (void)setupUnderstandButton { - self.understandButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [self.understandButton setTitle:YMLocalizedString(@"PKIDLoginViewController4") forState:UIControlStateNormal]; - [self.understandButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - self.understandButton.titleLabel.font = [UIFont boldSystemFontOfSize:18.0]; - self.understandButton.backgroundColor = [UIColor colorWithRed:1.0 green:0.5 blue:0.0 alpha:1.0]; // 橙色 - self.understandButton.layer.cornerRadius = 22.0; - [self.understandButton addTarget:self action:@selector(understandButtonTapped) forControlEvents:UIControlEventTouchUpInside]; - [self.contentView addSubview:self.understandButton]; -} - -- (void)setupConstraints { - // 背景遮罩 - [self.backgroundView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - - // 内容容器 - 屏幕的 3/5 尺寸，居中显示 - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.equalTo(self); - make.width.equalTo(self).multipliedBy(0.8); // 屏幕宽度的 3/5 - make.height.equalTo(self).multipliedBy(0.6); // 屏幕高度的 3/5 - }]; - - // 标题 - 固定位置 - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.contentView).offset(24); - make.leading.trailing.equalTo(self.contentView).insets(UIEdgeInsetsMake(0, 24, 0, 24)); - make.height.equalTo(@30); - }]; - - // 滚动视图 - 在标题和按钮之间 - [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.titleLabel.mas_bottom).offset(16); - make.leading.trailing.equalTo(self.contentView); - make.bottom.equalTo(self.understandButton.mas_top).offset(-16); - }]; - - // 滚动内容容器 - [self.scrollContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.scrollView); - make.width.equalTo(self.scrollView); // 重要：设置宽度约束 - }]; - - // 上层：原 contentLabel - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.scrollContentView).offset(0); - make.leading.trailing.equalTo(self.scrollContentView).insets(UIEdgeInsetsMake(0, 24, 0, 24)); - }]; - - // 中层：图片视图 - [self.tipsImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.contentLabel.mas_bottom).offset(20); - make.centerX.equalTo(self.scrollContentView); - make.width.equalTo(self.scrollContentView).multipliedBy(0.6); // 相对宽度 - make.height.equalTo(self.tipsImageView.mas_width).multipliedBy(0.6); // 保持宽高比 - }]; - - // 下层：新增 contentLabel2 - [self.contentLabel2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.tipsImageView.mas_bottom).offset(20); - make.leading.trailing.equalTo(self.scrollContentView).insets(UIEdgeInsetsMake(0, 24, 0, 24)); - make.bottom.equalTo(self.scrollContentView).offset(-16); // 重要：设置底部约束 - }]; - - // 按钮 - 固定位置 - [self.understandButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self.contentView).offset(-24); - make.centerX.equalTo(self.contentView); - make.width.equalTo(self.contentView).multipliedBy(0.6); // 相对宽度 - make.height.equalTo(@44); - }]; -} - -#pragma mark - Actions - -- (void)backgroundTapped { - NSLog(@"🎮 用户点击了背景，关闭 Tips 弹窗"); - - // 点击背景关闭弹窗，但不触发开启 turbo mode - if (self.delegate && [self.delegate respondsToSelector:@selector(turboModeTipsViewDidTapUnderstand)]) { - [self.delegate turboModeTipsViewDidTapUnderstand]; - } - - [self dismiss]; -} - -- (void)understandButtonTapped { - NSLog(@"🎮 用户点击了 'I understand' 按钮，关闭 Tips 弹窗"); - - // 🔧 修改：只触发理解回调，不重复开启 turbo mode（已在显示时开启） - if (self.delegate && [self.delegate respondsToSelector:@selector(turboModeTipsViewDidTapUnderstand)]) { - [self.delegate turboModeTipsViewDidTapUnderstand]; - } - - [self dismiss]; -} - -#pragma mark - Animation - -- (void)showWithAnimation { - [self.parentView addSubview:self]; - - // 初始状态 - self.backgroundView.alpha = 0; - self.contentView.transform = CGAffineTransformMakeScale(0.8, 0.8); - self.contentView.alpha = 0; - - // 动画显示 - [UIView animateWithDuration:0.3 delay:0 usingSpringWithDamping:0.8 initialSpringVelocity:0.6 options:UIViewAnimationOptionCurveEaseOut animations:^{ - self.backgroundView.alpha = 1; - self.contentView.transform = CGAffineTransformIdentity; - self.contentView.alpha = 1; - } completion:nil]; - - NSLog(@"🎮 Tips 弹窗已添加到父视图，动画开始"); -} - -- (void)dismissWithAnimation { - [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseIn animations:^{ - self.backgroundView.alpha = 0; - self.contentView.transform = CGAffineTransformMakeScale(0.8, 0.8); - self.contentView.alpha = 0; - } completion:^(BOOL finished) { - [self removeFromSuperview]; - NSLog(@"🎮 Tips 弹窗已从父视图移除"); - }]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/MoreView/XPTurboModeConstants.h b/YuMi/Modules/YMRoom/View/MoreView/XPTurboModeConstants.h deleted file mode 100644 index afe0bb0..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/XPTurboModeConstants.h +++ /dev/null @@ -1,72 +0,0 @@ -// -// XPTurboModeConstants.h -// YuMi -// -// Created by P on 2025/1/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -// MARK: - 缓存 Key 生成函数 -/** - * 生成礼物特效开关的缓存 Key - * @param roomId 房间 ID - * @return 格式化的缓存 Key - */ -NSString *kTurboGiftEffectsEnabledKey(NSString *roomId); - -/** - * 生成全局礼物屏幕开关的缓存 Key - * @param roomId 房间 ID - * @return 格式化的缓存 Key - */ -NSString *kTurboGlobalGiftScreenEnabledKey(NSString *roomId); - -/** - * 生成全局游戏屏幕开关的缓存 Key - * @param roomId 房间 ID - * @return 格式化的缓存 Key - */ -NSString *kTurboGlobalGameScreenEnabledKey(NSString *roomId); - -/** - * 生成CP麦位开关的缓存 Key - * @param roomId 房间 ID - * @return 格式化的缓存 Key - */ -NSString *kTurboCpMicEnabledKey(NSString *roomId); - -// MARK: - 通知名称常量 -/** - * 礼物特效开关状态改变通知 - */ -extern NSString *const kTurboGiftEffectsEnabledChanged; - -/** - * 全局礼物屏幕开关状态改变通知 - */ -extern NSString *const kTurboGlobalGiftScreenEnabledChanged; - -/** - * 全局游戏屏幕开关状态改变通知 - */ -extern NSString *const kTurboGlobalGameScreenEnabledChanged; - -/** - * CP麦位开关状态改变通知 - */ -extern NSString *const kTurboCpMicEnabledChanged; - -/** - * 当前房间ID设置通知 - */ -extern NSString *const kTurboCurrentRoomIdSet; - -/** - * Turbo Mode 按钮状态改变通知 - */ -extern NSString *const kTurboModeButtonStateChanged; - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/MoreView/XPTurboModeConstants.m b/YuMi/Modules/YMRoom/View/MoreView/XPTurboModeConstants.m deleted file mode 100644 index 1b1fa35..0000000 --- a/YuMi/Modules/YMRoom/View/MoreView/XPTurboModeConstants.m +++ /dev/null @@ -1,33 +0,0 @@ -// -// XPTurboModeConstants.m -// YuMi -// -// Created by P on 2025/1/13. -// - -#import "XPTurboModeConstants.h" - -// MARK: - 缓存 Key 生成函数实现 -NSString *kTurboGiftEffectsEnabledKey(NSString *roomId) { - return [NSString stringWithFormat:@"TurboGiftEffects_%@", roomId]; -} - -NSString *kTurboGlobalGiftScreenEnabledKey(NSString *roomId) { - return [NSString stringWithFormat:@"TurboGlobalGiftScreen_%@", roomId]; -} - -NSString *kTurboGlobalGameScreenEnabledKey(NSString *roomId) { - return [NSString stringWithFormat:@"TurboGlobalGameScreen_%@", roomId]; -} - -NSString *kTurboCpMicEnabledKey(NSString *roomId) { - return [NSString stringWithFormat:@"TurboCpMic_%@", roomId]; -} - -// MARK: - 通知名称常量定义 -NSString *const kTurboGiftEffectsEnabledChanged = @"kTurboGiftEffectsEnabledChanged"; -NSString *const kTurboGlobalGiftScreenEnabledChanged = @"kTurboGlobalGiftScreenEnabledChanged"; -NSString *const kTurboGlobalGameScreenEnabledChanged = @"kTurboGlobalGameScreenEnabledChanged"; -NSString *const kTurboCpMicEnabledChanged = @"kTurboCpMicEnabledChanged"; -NSString *const kTurboCurrentRoomIdSet = @"kTurboCurrentRoomIdSet"; -NSString *const kTurboModeButtonStateChanged = @"kTurboModeButtonStateChanged"; diff --git a/YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.h b/YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.h deleted file mode 100644 index a4b6d9b..0000000 --- a/YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMNewUserRoomGiftView.h -// YUMI -// -// Created by YUMI on 2022/7/26. -// - -#import -#import "GiftInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNewUserRoomGiftView : UIView - -@property (nonatomic, strong) GiftInfoModel *giftInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.m b/YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.m deleted file mode 100644 index 6a5a66b..0000000 --- a/YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.m +++ /dev/null @@ -1,149 +0,0 @@ -// -// YMNewUserRoomGiftView.m -// YUMI -// -// Created by YUMI on 2022/7/26. -// - -#import "XPNewUserRoomGiftView.h" -///Third -#import -#import "NetImageView.h" -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "TTPopup.h" -#import "YUMIMacroUitls.h" - -@interface XPNewUserRoomGiftView () - -@property (nonatomic, strong) UIImageView *bgImageView; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -@property (nonatomic, strong) NetImageView *iconImageView; -@property (nonatomic, strong) UILabel *descLabel; -///关闭按钮 -@property (nonatomic,strong) UIButton *closeButton; - -@end - - -@implementation XPNewUserRoomGiftView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.layer.masksToBounds = YES; - self.layer.cornerRadius = 15; - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.bgImageView]; - [self addSubview:self.titleLabel]; - [self addSubview:self.iconImageView]; - [self addSubview:self.descLabel]; - [self addSubview:self.closeButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(260); - make.height.mas_equalTo(376); - }]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(320); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(130); - make.leading.trailing.mas_equalTo(self).inset(15); - make.height.mas_equalTo(17); - }]; - - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.width.height.mas_equalTo(100); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(13); - }]; - - [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.iconImageView.mas_bottom).mas_offset(19); - make.height.mas_equalTo(17); - make.leading.trailing.mas_equalTo(self).inset(15); - }]; - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(32, 32)); - make.top.mas_equalTo(self.bgImageView.mas_bottom).offset(24); - make.centerX.mas_equalTo(self); - }]; -} - -#pragma mark - Event Response -- (void)closeButtonAction:(UIButton *)sender { - [TTPopup dismiss]; -} - -#pragma mark - Getters And Setters -- (void)setGiftInfo:(GiftInfoModel *)giftInfo { - NSString *giftStr = [NSString stringWithFormat:@"%@*%zd", giftInfo.giftName, giftInfo.count]; - NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPNewUserRoomGiftView0") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12],NSForegroundColorAttributeName:UIColorFromRGB(0xEEFEEC)}]; - [str appendAttributedString:[[NSMutableAttributedString alloc] initWithString:giftStr attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12 weight:UIFontWeightHeavy],NSForegroundColorAttributeName:UIColorFromRGB(0xEEFEEC)}]]; - self.titleLabel.attributedText = str; - self.iconImageView.imageUrl = giftInfo.giftUrl; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:12]; - _titleLabel.textColor = UIColorFromRGB(0xEEFEEC); - } - return _titleLabel; -} - -- (UILabel *)descLabel { - if (!_descLabel) { - _descLabel = [[UILabel alloc] init]; - _descLabel.textAlignment = NSTextAlignmentCenter; - _descLabel.font = [UIFont systemFontOfSize:12]; - _descLabel.textColor = UIColorFromRGB(0xEEFEEC); - _descLabel.text = YMLocalizedString(@"XPNewUserRoomGiftView1"); - } - return _descLabel; -} - -- (NetImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[NetImageView alloc] init]; - _iconImageView.layer.cornerRadius = 12; - _iconImageView.layer.masksToBounds = YES; - } - return _iconImageView; -} - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage imageNamed:@"room_newUser_gift_bg"]; - } - return _bgImageView; -} - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeButton setImage:[UIImage imageNamed:@"anchorPk_result_close"] forState:UIControlStateNormal]; - [_closeButton addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.h b/YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.h deleted file mode 100644 index dca15fa..0000000 --- a/YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// YMRoomNewUserGreetView.h -// YUMI -// -// Created by YUMI on 2022/6/6. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPRoomNewUserGreetView; -@protocol XPRoomNewUserGreetViewDelegate -///点击查看 -- (void)xPRoomNewUserGreetView:(XPRoomNewUserGreetView *)view didClickCheckout:(UIButton *)sender; - -@end - -@interface XPRoomNewUserGreetView : UIView -@property (nonatomic,strong) NSArray *sayHelloUserAvatarList; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.m b/YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.m deleted file mode 100644 index 46175d5..0000000 --- a/YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.m +++ /dev/null @@ -1,196 +0,0 @@ -// -// YMRoomNewUserGreetView.m -// YUMI -// -// Created by YUMI on 2022/6/6. -// - -#import "XPRoomNewUserGreetView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" - -@interface XPRoomNewUserGreetView () -///背景 -@property (nonatomic,strong) UIImageView *backImageView; -///内容 -@property (nonatomic,strong) UIView * contentView; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///点击查看 -@property (nonatomic,strong) UIButton *checkButton; -///关闭 -@property (nonatomic,strong) UIButton *closeButton; -@property (nonatomic,strong) NSArray *avatarViewList; -@end - -@implementation XPRoomNewUserGreetView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self.backImageView addSubview:self.contentView]; - [self.backImageView addSubview:self.closeButton]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.checkButton]; -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(345, 80)); - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self.backImageView); - make.height.mas_equalTo(55); - make.leading.mas_equalTo(self.titleLabel.mas_leading).offset(-12); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView.mas_centerY).offset(-3); - }]; - - [self.checkButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(80, 20)); - make.top.mas_equalTo(self.contentView.mas_centerY).offset(3); - make.centerX.mas_equalTo(self.titleLabel); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(22, 22)); - make.top.trailing.mas_equalTo(self.backImageView); - }]; -} - -#pragma mark - Event Response -- (void)closeButtonAction:(UIButton *)sender { - [UIView animateWithDuration:.35 animations:^{ - CGRect frame = self.frame; - frame.origin.x = -KScreenWidth; - self.frame= frame; - } completion:^(BOOL finished) { - [self removeFromSuperview]; - }]; -} - -- (void)checkButtonAction:(UIButton *)sender { - [UIView animateWithDuration:.35 animations:^{ - CGRect frame = self.frame; - frame.origin.x = -KScreenWidth; - self.frame= frame; - } completion:^(BOOL finished) { - [self removeFromSuperview]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomNewUserGreetView:didClickCheckout:)]) { - [self.delegate xPRoomNewUserGreetView:self didClickCheckout:sender]; - } - }]; -} - -#pragma mark - Getters And Setters -- (void)setSayHelloUserAvatarList:(NSArray *)sayHelloUserAvatarList { - if (sayHelloUserAvatarList.count > 0) { - if (sayHelloUserAvatarList.count == 1) { - self.titleLabel.text = YMLocalizedString(@"XPRoomNewUserGreetView0"); - }else { - self.titleLabel.text = YMLocalizedString(@"XPRoomNewUserGreetView1"); - } - [self.titleLabel sizeToFit]; - } - - for (int i = 0; i < sayHelloUserAvatarList.count; i++) { - NSString * avatar = [sayHelloUserAvatarList xpSafeObjectAtIndex:i]; - NetImageView * avatarImageView = [[NetImageView alloc] init]; - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - avatarImageView = [[NetImageView alloc] initWithConfig:config]; - avatarImageView.layer.masksToBounds = YES; - avatarImageView.layer.cornerRadius = 44/2; - avatarImageView.layer.borderColor = [UIColor whiteColor].CGColor; - avatarImageView.layer.borderWidth = 1; - avatarImageView.imageUrl = avatar; - [self.contentView addSubview:avatarImageView]; - [self.contentView sendSubviewToBack:avatarImageView]; - [avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(44, 44)); - make.trailing.mas_equalTo(self.titleLabel.mas_leading).offset(-12 - 44 * i + 12 * i); - make.centerY.mas_equalTo(self.contentView); - }]; - - if (i == (sayHelloUserAvatarList.count -1)) { - [self.contentView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel.mas_leading).offset(-12 - 44 * (i + 1) + 12 * (i + 1)); - }]; - } - } -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = [UIColor clearColor]; - } - return _contentView; -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"room_new_user_greet_bg"]; - } - return _backImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.text = YMLocalizedString(@"XPRoomNewUserGreetView2"); - } - return _titleLabel; -} - -- (UIButton *)checkButton { - if (!_checkButton) { - _checkButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_checkButton setTitle:YMLocalizedString(@"XPRoomNewUserGreetView3") forState:UIControlStateNormal]; - [_checkButton setTitleColor:UIColorFromRGB(0x333333) forState:UIControlStateNormal]; - _checkButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_checkButton setBackgroundColor:[UIColor whiteColor]]; - _checkButton.layer.masksToBounds = YES; - _checkButton.layer.cornerRadius = 6; - [_checkButton addTarget:self action:@selector(checkButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _checkButton; -} - - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeButton setImage:[UIImage imageNamed:@"room_setting_tag_close"] forState:UIControlStateNormal]; - [_closeButton setImage:[UIImage imageNamed:@"room_setting_tag_close"] forState:UIControlStateSelected]; - [_closeButton addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.h b/YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.h deleted file mode 100644 index f03afa6..0000000 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// Api+RoomTrumpet.h -// xplan-ios -// -// Created by GreenLand on 2022/3/16. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (RoomTrumpet) - -// 发送VIP小喇叭消息 -+ (void)sendRoomTrumpet:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid content:(NSString *)content; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.m b/YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.m deleted file mode 100644 index 28cdb28..0000000 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// Api+RoomTrumpet.m -// xplan-ios -// -// Created by GreenLand on 2022/3/16. -// - -#import "Api+RoomTrumpet.h" - -@implementation Api (RoomTrumpet) - -// 发送VIP小喇叭消息 -+ (void)sendRoomTrumpet:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid content:(NSString *)content { - [self makeRequest:@"vip/sendRoomHorn" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, content, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/Model/XPNobleTrumpetModel.h b/YuMi/Modules/YMRoom/View/NobleTrumpet/Model/XPNobleTrumpetModel.h deleted file mode 100644 index 14335fb..0000000 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/Model/XPNobleTrumpetModel.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// XPNobleTrumpetModel.h -// xplan-ios -// -// Created by GreenLand on 2022/3/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPNobleTrumpetModel : PIBaseModel - -///上次发送的时间 -@property (nonatomic, assign) long long lastSendTime; -///剩余次数 -@property (nonatomic, assign) NSInteger remainCount; -///总数 -@property (nonatomic, assign) NSInteger totalCount; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/Model/XPNobleTrumpetModel.m b/YuMi/Modules/YMRoom/View/NobleTrumpet/Model/XPNobleTrumpetModel.m deleted file mode 100644 index 3f84559..0000000 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/Model/XPNobleTrumpetModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// XPNobleTrumpetModel.m -// xplan-ios -// -// Created by GreenLand on 2022/3/15. -// - -#import "XPNobleTrumpetModel.h" - -@implementation XPNobleTrumpetModel - -@end diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/Presenter/XPTrumpetPresenter.h b/YuMi/Modules/YMRoom/View/NobleTrumpet/Presenter/XPTrumpetPresenter.h deleted file mode 100644 index 9c5a39c..0000000 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/Presenter/XPTrumpetPresenter.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPTrumpetPresenter.h -// xplan-ios -// -// Created by GreenLand on 2022/3/16. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPTrumpetPresenter : BaseMvpPresenter - -///发送房间小喇叭 -/// @param roomId 房间ID -/// @param message 小喇叭内容 -- (void)releaseRoomTrumpetWithRoomUid:(NSString *)roomUid message:(NSString *)message; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/Presenter/XPTrumpetPresenter.m b/YuMi/Modules/YMRoom/View/NobleTrumpet/Presenter/XPTrumpetPresenter.m deleted file mode 100644 index e0ae709..0000000 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/Presenter/XPTrumpetPresenter.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// XPTrumpetPresenter.m -// xplan-ios -// -// Created by GreenLand on 2022/3/16. -// - -#import "XPTrumpetPresenter.h" -#import "Api+RoomTrumpet.h" -#import "XPRoomTrumpetProtocol.h" - -@implementation XPTrumpetPresenter - -///发送房间小喇叭 -/// @param roomUid 房间ID -/// @param message 小喇叭内容 -- (void)releaseRoomTrumpetWithRoomUid:(NSString *)roomUid message:(NSString *)message { - [Api sendRoomTrumpet:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] releaseRoomTrumpetSuccess]; - }] roomUid:roomUid content:message]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/Protocol/XPRoomTrumpetProtocol.h b/YuMi/Modules/YMRoom/View/NobleTrumpet/Protocol/XPRoomTrumpetProtocol.h deleted file mode 100644 index f937e30..0000000 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/Protocol/XPRoomTrumpetProtocol.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// XPRoomTrumpetProtocol.h -// xplan-ios -// -// Created by GreenLand on 2022/3/16. -// -#import - -@protocol XPRoomTrumpetProtocol - -///发布房间小喇叭成功 -- (void)releaseRoomTrumpetSuccess; - -@end diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.h b/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.h deleted file mode 100644 index 0812937..0000000 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPRoomTrumpetView.h -// xplan-ios -// -// Created by GreenLand on 2022/3/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomTrumpetView : UIView - -@property (nonatomic, strong) UIView *mainView; - -@property (nonatomic, strong) NSDictionary *data; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.m b/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.m deleted file mode 100644 index 555b71d..0000000 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.m +++ /dev/null @@ -1,176 +0,0 @@ -// -// XPRoomTrumpetView.m -// xplan-ios -// -// Created by GreenLand on 2022/3/18. -// - -#import "XPRoomTrumpetView.h" -#import "NetImageView.h" -///tool - -#import "ThemeColor+NobleCenter.h" - - -///Third -#import - - -@interface XPRoomTrumpetView() - -///背景 -@property (nonatomic, strong) UIImageView *backView; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///VIP勋章 -@property (nonatomic,strong) NetImageView *nobleImageView; -///昵称 -@property (nonatomic, strong) UILabel *nickLabel; -///内容 -@property (nonatomic, strong) MarqueeLabel *contentLabel; - -@end - -@implementation XPRoomTrumpetView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initContraints]; - } - return self; -} - -- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event { - return nil; -} - -- (void)initSubViews { - [self addSubview:self.backView]; - [self addSubview:self.mainView]; - [self.mainView addSubview:self.avatarImageView]; - [self.mainView addSubview:self.nobleImageView]; - [self.mainView addSubview:self.nickLabel]; - [self.mainView addSubview:self.contentLabel]; -} - -- (void)initContraints { - [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self); - make.trailing.mas_equalTo(self.backView); - make.height.mas_equalTo(28); - make.bottom.mas_equalTo(self.backView).mas_offset(-34); - }]; - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self); - make.width.mas_equalTo(375); - make.height.mas_equalTo(153); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backView).mas_offset(58); - make.width.height.mas_equalTo(28); - make.centerY.mas_equalTo(self.mainView); - }]; - - [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(4); - make.width.mas_equalTo(25); - make.height.mas_equalTo(22); - make.centerY.mas_equalTo(self.mainView); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nobleImageView.mas_trailing).mas_offset(5); - make.centerY.mas_equalTo(self.mainView); - make.width.mas_greaterThanOrEqualTo(40).priority(500); - }]; - // 水平方向别扯我 - [self.nickLabel setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel.mas_trailing).mas_offset(2); - make.trailing.mas_equalTo(0); - make.centerY.mas_equalTo(self.mainView); - }]; - [self.contentLabel setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; -} - -- (void)setData:(NSDictionary *)data { - _data = data; - self.avatarImageView.imageUrl = data[@"avatar"]; - self.nobleImageView.imageUrl = data[@"vipIcon"]; - NSString *nickStr = data[@"nick"]; - if (nickStr.length > 5) { - nickStr = [NSString stringWithFormat:@"%@…:", [nickStr substringToIndex:5]]; - } else { - nickStr = [NSString stringWithFormat:@"%@:", nickStr]; - } - self.nickLabel.text = nickStr; - self.contentLabel.text = data[@"content"]; - [self layoutIfNeeded]; -} - -#pragma mark - getter -- (UIView *)mainView { - if (!_mainView) { - _mainView = [[UIView alloc] init]; - } - return _mainView; -} - -- (UIImageView *)backView { - if (!_backView) { - _backView = [[UIImageView alloc] init]; - _backView.userInteractionEnabled = YES; - _backView.image = [UIImage imageNamed:@"rooom_trumpet_bgImage"]; - _backView.contentMode = UIViewContentModeScaleAspectFit; - } - return _backView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFit; - _avatarImageView.layer.cornerRadius = 14; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.borderWidth = 0.75; - _avatarImageView.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _avatarImageView; -} - -- (NetImageView *)nobleImageView { - if (!_nobleImageView) { - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - _nobleImageView = [[NetImageView alloc] initWithConfig:config]; - _nobleImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _nobleImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - UILabel *label = [[UILabel alloc] init]; - label.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium]; - label.textColor = UIColorFromRGB(0x392700); - [label sizeToFit]; - _nickLabel = label; - } - return _nickLabel; -} - -- (MarqueeLabel *)contentLabel{ - if (!_contentLabel) { - _contentLabel = [[MarqueeLabel alloc] init]; - _contentLabel.scrollDuration = 5.0; - _contentLabel.fadeLength = 6.0f; - _contentLabel.font = [UIFont systemFontOfSize:12]; - _contentLabel.textColor = UIColorFromRGB(0x392700); - } - return _contentLabel; -} -@end diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetViewController.h b/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetViewController.h deleted file mode 100644 index 37657c5..0000000 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetViewController.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPRoomTrumpetViewController.h -// xplan-ios -// -// Created by GreenLand on 2022/3/16. -// - -#import "MvpViewController.h" -#import "RoomHostDelegate.h" - -NS_ASSUME_NONNULL_BEGIN - -@class XPNobleTrumpetModel; -@interface XPRoomTrumpetViewController : MvpViewController - -- (instancetype)initWithDelegate:(id)delegate; - -@property (nonatomic, strong) XPNobleTrumpetModel *model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetViewController.m b/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetViewController.m deleted file mode 100644 index 6f400f8..0000000 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetViewController.m +++ /dev/null @@ -1,446 +0,0 @@ -// -// XPRoomTrumpetViewController.m -// xplan-ios -// -// Created by GreenLand on 2022/3/16. -// - -#import "XPRoomTrumpetViewController.h" -///tool - - -#import "ThemeColor+NobleCenter.h" - - -///Third -#import -#import "UIImage+Utils.h" -///view -///P -#import "XPTrumpetPresenter.h" -#import "XPRoomTrumpetProtocol.h" -///model -#import "XPNobleTrumpetModel.h" -#import "RoomInfoModel.h" - -@interface XPRoomTrumpetViewController () -///host代理 -@property (nonatomic,weak) idhostDelegate; - -///上面点击的view -@property (nonatomic,strong) UIView *topTapView; -///下面点击的view -@property (nonatomic,strong) UIView *bottomTapView; -///中间内容的容器 -@property (nonatomic,strong) UIImageView *backView; -///顶部标题 -@property (nonatomic,strong) UILabel *headLabel; -///广播内容标题 -@property (nonatomic,strong) UILabel *radioTitleLabel; -///剩余次数容器 -@property (nonatomic, strong) UIStackView *releaseNumView; -///剩余次数标题 -@property (nonatomic, strong) UILabel *releaseNumTitle; -///剩余次数 -@property (nonatomic, strong) UILabel *releaseNumLabel; -///广播输入框 -@property (nonatomic,strong) YYTextView *trumpetTextView; -///字数计数 -@property (nonatomic,strong) UILabel *maxCountLabel; -///发布按钮 -@property (nonatomic, strong) UIButton *releaseButton; -///发布时间说明(可以发布时显示) -@property (nonatomic, strong) UILabel *releaseTimeDescLabel; -///发布后倒计时说明容器 -@property (nonatomic,strong) UIView *countDownStackView; -///倒计时 -@property (nonatomic,strong) UILabel *countDownLabel; -///倒计时说明 -@property (nonatomic, strong) UILabel *countDownDescLabel; - -@property (strong, nonatomic) dispatch_source_t timer; - -@end - -@implementation XPRoomTrumpetViewController - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super init]) { - self.hostDelegate = delegate; - } - return self; -} - -- (XPTrumpetPresenter *)createPresenter { - return [[XPTrumpetPresenter alloc] init]; -} - -- (void)dealloc { - if (self.timer != nil) { - dispatch_source_cancel(self.timer); - } -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - XPRoomTrumpetProtocol -///发布小喇叭成功 -- (void)releaseRoomTrumpetSuccess { - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPRoomTrumpetViewController0")]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -- (void)setModel:(XPNobleTrumpetModel *)model { - _model = model; - self.releaseNumLabel.text = [NSString stringWithFormat:@"%zd/%zd",self.model.remainCount, self.model.totalCount]; - if ([self intervalSinceNow:model.lastSendTime] < 60) { - [self openCountdown:60 - [self intervalSinceNow:model.lastSendTime]]; - self.countDownStackView.hidden = NO; - self.releaseTimeDescLabel.hidden = YES; - self.releaseButton.enabled = NO; - } else { - self.countDownStackView.hidden = YES; - self.releaseTimeDescLabel.hidden = NO; - self.releaseButton.enabled = YES; - } - if (self.model.remainCount < 1) { - self.releaseButton.enabled = NO; - } -} - -- (NSInteger)intervalSinceNow:(long long)theDate { - NSDate *nowDate = [NSDate date]; // 当前日期 - NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; - formatter.dateFormat = @"yyyy-MM-dd HH-mm-ss"; - NSTimeInterval time= theDate/1000; - NSDate *creat =[NSDate dateWithTimeIntervalSince1970:time]; - NSTimeInterval delta = [nowDate timeIntervalSinceDate:creat]; // 计算出相差多少秒 - if (delta/60 < 1) { - return (NSInteger)delta % 60; - } else { - return 61; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.topTapView]; - [self.view addSubview:self.backView]; - [self.view addSubview:self.bottomTapView]; - - [self.backView addSubview:self.headLabel]; - [self.backView addSubview:self.radioTitleLabel]; - [self.backView addSubview:self.releaseNumView]; - [self.releaseNumView addArrangedSubview:self.releaseNumTitle]; - [self.releaseNumView addArrangedSubview:self.releaseNumLabel]; - - [self.backView addSubview:self.trumpetTextView]; - [self.backView addSubview:self.maxCountLabel]; - [self.backView addSubview:self.releaseButton]; - [self.backView addSubview:self.releaseTimeDescLabel]; - [self.backView addSubview:self.countDownStackView]; - - [self.countDownStackView addSubview:self.countDownLabel]; - [self.countDownStackView addSubview:self.countDownDescLabel]; -} - -- (void)initSubViewConstraints { - [self.topTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.backView.mas_top); - }]; - - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(300); - make.height.mas_equalTo(286); - make.centerY.centerX.mas_equalTo(self.view); - }]; - - [self.bottomTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.backView.mas_bottom); - make.bottom.mas_equalTo(self.view); - }]; - - [self.headLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backView); - make.top.mas_equalTo(self.backView).offset(24); - make.height.mas_equalTo(24); - }]; - - [self.radioTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.headLabel.mas_bottom).offset(16); - make.height.mas_equalTo(16); - make.leading.mas_equalTo(self.backView).mas_offset(16); - }]; - - [self.releaseNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.radioTitleLabel); - make.leading.mas_equalTo(self.radioTitleLabel.mas_trailing).mas_offset(4); - make.height.mas_equalTo(20); - }]; - - [self.trumpetTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView).inset(16); - make.top.mas_equalTo(self.radioTitleLabel.mas_bottom).mas_offset(8); - make.height.mas_equalTo(82); - }]; - - [self.maxCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.bottom.mas_equalTo(self.trumpetTextView).inset(3); - make.height.mas_equalTo(12); - }]; - - - [self.releaseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.trumpetTextView.mas_bottom).mas_offset(32); - make.centerX.mas_equalTo(self.backView); - make.width.mas_equalTo(160); - make.height.mas_equalTo(44); - }]; - - [self.releaseTimeDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backView); - make.top.mas_equalTo(self.releaseButton.mas_bottom).mas_offset(10); - make.height.mas_equalTo(14); - }]; - - [self.countDownStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(15); - make.centerX.mas_equalTo(self.backView); - make.top.mas_equalTo(self.releaseButton.mas_bottom).mas_offset(10); - }]; - [self.countDownLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.bottom.mas_equalTo(self.countDownStackView); - make.trailing.mas_equalTo(self.countDownDescLabel.mas_leading); - }]; - [self.countDownDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.bottom.mas_equalTo(self.countDownStackView); - }]; -} - -- (void)openCountdown:(NSInteger)countDown{ - __block NSInteger time = countDown; //倒计时时间 - if (_timer != nil) { - dispatch_source_cancel(_timer); - } - dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - _timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - dispatch_source_set_timer(_timer,dispatch_walltime(NULL, 0),1.0*NSEC_PER_SEC, 0); //每秒执行 - dispatch_source_set_event_handler(_timer, ^{ - if(time <= 0){ //倒计时结束，关闭 - @kWeakify(self); - dispatch_source_cancel(self.timer); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - self.releaseTimeDescLabel.hidden = NO; - self.countDownStackView.hidden = YES; - if (self.model.remainCount < 1) { - self.releaseButton.enabled = NO; - } else { - self.releaseButton.enabled = YES; - } - }); - }else{ - NSInteger seconds = time; - dispatch_async(dispatch_get_main_queue(), ^{ - //设置按钮显示读秒效果 - self.countDownLabel.text = [NSString stringWithFormat:@"%zds", seconds]; - }); - time--; - } - }); - dispatch_resume(_timer); -} - -- (void)onReleaseButtonClick:(UIButton *)button { - if (self.trumpetTextView.text.length < 1) { - [self showErrorToast:YMLocalizedString(@"XPRoomTrumpetViewController1")]; - return; - } - [self.presenter releaseRoomTrumpetWithRoomUid:@(self.hostDelegate.getRoomInfo.uid).stringValue message:self.trumpetTextView.text]; -} - -#pragma mark - Event Response -- (void)dismissTapRecognizer:(UITapGestureRecognizer *)tap { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - YYTextViewDelegate -- (void)textViewDidChange:(YYTextView *)textView { - NSInteger maxLength = 20; - NSInteger minLength = 1; - if (textView.text.length > maxLength) { - textView.text = [textView.text substringToIndex:maxLength]; - } - self.maxCountLabel.text = [NSString stringWithFormat:@"%zd/%ld", textView.text.length, maxLength]; - if (textView.text.length >= minLength) { - if (self.model.lastSendTime > 0 && self.countDownStackView.hidden) { -// self.releaseButton.enabled = YES; - } - } else { -// self.releaseButton.enabled = NO; - } -} - -#pragma mark - Getters And Setters -- (UIView *)topTapView { - if (!_topTapView) { - _topTapView = [[UIView alloc] init]; - _topTapView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissTapRecognizer:)]; - [_topTapView addGestureRecognizer:tap]; - } - return _topTapView; -} -- (UIView *)bottomTapView { - if (!_bottomTapView) { - _bottomTapView = [[UIView alloc] init]; - _bottomTapView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissTapRecognizer:)]; - [_bottomTapView addGestureRecognizer:tap]; - } - return _bottomTapView; -} -- (UIImageView *)backView { - if (!_backView) { - _backView = [[UIImageView alloc] init]; - _backView.userInteractionEnabled = YES; - _backView.image = [UIImage imageNamed:@"noble_time_popBg"]; - } - return _backView; -} - -- (UILabel *)headLabel { - if (!_headLabel) { - _headLabel = [[UILabel alloc] init]; - _headLabel.text = YMLocalizedString(@"XPRoomTrumpetViewController2"); - _headLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - _headLabel.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; - } - return _headLabel; -} -- (UILabel *)radioTitleLabel { - if (!_radioTitleLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomTrumpetViewController3"); - label.font = [UIFont systemFontOfSize:14]; - label.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; - _radioTitleLabel = label; - } - return _radioTitleLabel; -} -- (UIStackView *)releaseNumView { - if (!_releaseNumView) { - _releaseNumView = [[UIStackView alloc] init]; - _releaseNumView.axis = UILayoutConstraintAxisHorizontal; - _releaseNumView.distribution = UIStackViewDistributionFill; - _releaseNumView.alignment = UIStackViewAlignmentCenter; - _releaseNumView.spacing = 2; - } - return _releaseNumView; -} -- (UILabel *)releaseNumTitle { - if (!_releaseNumTitle) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomTrumpetViewController4"); - label.font = [UIFont systemFontOfSize:10]; - label.textColor = [DJDKMIMOMColor normalNobleTextColor]; - _releaseNumTitle = label; - } - return _releaseNumTitle; -} -- (UILabel *)releaseNumLabel { - if (!_releaseNumLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = @"100/100"; - label.font = [UIFont systemFontOfSize:10]; - label.textColor = [DJDKMIMOMColor normalNobleTextColor]; - _releaseNumLabel = label; - } - return _releaseNumLabel; -} - -- (YYTextView *)trumpetTextView { - if (!_trumpetTextView) { - _trumpetTextView = [[YYTextView alloc] init]; - _trumpetTextView.backgroundColor = UIColorFromRGB(0x2C200E); - _trumpetTextView.layer.cornerRadius = 8; - _trumpetTextView.layer.masksToBounds = YES; - _trumpetTextView.placeholderText = YMLocalizedString(@"XPRoomTrumpetViewController5"); - _trumpetTextView.placeholderTextColor = [DJDKMIMOMColor noContainDescTextColor]; - _trumpetTextView.placeholderFont = [UIFont systemFontOfSize:12]; - _trumpetTextView.font = [UIFont systemFontOfSize:12]; - _trumpetTextView.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; - _trumpetTextView.delegate = self; - } - return _trumpetTextView; -} - -- (UIButton *)releaseButton { - if (!_releaseButton) { - _releaseButton = [[UIButton alloc] init]; - [_releaseButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_releaseButton setBackgroundImage:[UIImage getLanguageImage:@"rooom_trumpet_send"] forState:UIControlStateNormal]; - [_releaseButton addTarget:self action:@selector(onReleaseButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _releaseButton; -} -- (UILabel *)releaseTimeDescLabel { - if (!_releaseTimeDescLabel) { - _releaseTimeDescLabel = [[UILabel alloc] init]; - _releaseTimeDescLabel.text = YMLocalizedString(@"XPRoomTrumpetViewController6"); - _releaseTimeDescLabel.font = [UIFont systemFontOfSize:10]; - _releaseTimeDescLabel.textColor = [DJDKMIMOMColor normalNobleTextColor]; - } - return _releaseTimeDescLabel; -} -- (UIView *)countDownStackView { - if (!_countDownStackView) { - _countDownStackView = [[UIView alloc] init]; - _countDownStackView.hidden = YES; - } - return _countDownStackView; -} -- (UILabel *)countDownLabel { - if (!_countDownLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = @"0s"; - label.font = [UIFont systemFontOfSize:10]; - label.textColor = UIColorFromRGB(0xFDA615); - _countDownLabel = label; - } - return _countDownLabel; -} -- (UILabel *)countDownDescLabel { - if (!_countDownDescLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomTrumpetViewController7"); - label.font = [UIFont systemFontOfSize:10]; - label.textColor = [DJDKMIMOMColor textThirdColor]; - _countDownDescLabel = label; - } - return _countDownDescLabel; -} - -- (UILabel *)maxCountLabel { - if (!_maxCountLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = @"0/20"; - label.font = [UIFont systemFontOfSize:12]; - label.textColor = [DJDKMIMOMColor textThirdColor]; - _maxCountLabel = label; - } - return _maxCountLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.h b/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.h deleted file mode 100644 index bf14ccf..0000000 --- a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMRoomQuickMessageContainView.h -// YUMI -// -// Created by YUMI on 2022/9/28. -// - -#import -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomQuickMessageContainView : UIView - -- (instancetype)initWithDelegate:(id)delegate; - -@property (nonatomic, strong) NSArray *titleArray; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m b/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m deleted file mode 100644 index d8d6cb6..0000000 --- a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m +++ /dev/null @@ -1,192 +0,0 @@ -// -// YMRoomQuickMessageContainView.m -// YUMI -// -// Created by YUMI on 2022/9/28. -// - -#import "XPRoomQuickMessageContainView.h" -#import "XPRoomQuidkMessageCell.h" -#import -#import -///Tool -#import "AccountInfoStorage.h" -#import "YUMIConstant.h" -#import "XNDJTDDLoadingTool.h" -#import "NSArray+Safe.h" -#import "ClientConfig.h" -///Model -#import "XPMessageRemoteExtModel.h" -#import "UserInfoModel.h" -#import "RoomInfoModel.h" - -@interface XPRoomQuickMessageContainView () - -@property (nonatomic, strong) UICollectionView *collectionView; -///关闭 -@property (nonatomic,strong) UIButton *closeButton; -///代理 -@property (nonatomic,weak) id delegate; -///最后发送消息的时间 -@property (nonatomic, assign) long long lastSendTime; - -@end - -@implementation XPRoomQuickMessageContainView - -- (instancetype)initWithDelegate:(id)delegate { - self = [super init]; - if (self) { - self.delegate = delegate; - self.clipsToBounds = YES; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.collectionView]; - [self addSubview:self.closeButton]; -} - -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(15); - make.trailing.mas_equalTo(self.closeButton.mas_leading).offset(-8); - make.top.bottom.mas_equalTo(self); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-8); - make.width.height.mas_equalTo(30); - make.centerY.mas_equalTo(self); - }]; -} - -#pragma mark - UICollectionViewDataSource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.titleArray.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPRoomQuidkMessageCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPRoomQuidkMessageCell class]) forIndexPath:indexPath]; - if (self.titleArray.count > 0) { - cell.title = [self.titleArray xpSafeObjectAtIndex:indexPath.row]; - } - return cell; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - NSString *str = [self.titleArray xpSafeObjectAtIndex:indexPath.row]; - NSDictionary *dic = @{NSFontAttributeName:[UIFont systemFontOfSize:12]}; - CGSize size = [str boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, 25) options:NSStringDrawingUsesLineFragmentOrigin attributes:dic context:nil].size; - return CGSizeMake(size.width + 10, 30); -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.titleArray.count > 0) { - NSDate *datenow = [NSDate date];//现在时间 - long time2 = (long)([datenow timeIntervalSince1970]*1000); - long aTime = (time2 - self.lastSendTime) / 1000; - if (aTime < 10) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomQuickMessageContainView0")]; - return; - } - self.lastSendTime = time2; - NSString *str = [self.titleArray xpSafeObjectAtIndex:indexPath.row]; - [self sendText:str]; - } -} - -- (void)sendText:(NSString *)text { - if ([self.delegate getRoomInfo].isCloseScreen) { - return; - } - //移除记录关闭次数 - [[NSUserDefaults standardUserDefaults] removeObjectForKey:kRoomQuickMessageCloseCount]; - [[NSUserDefaults standardUserDefaults] synchronize]; - - UserInfoModel * userInfo = [self.delegate getUserInfo]; - XPMessageRemoteExtModel *extModel = [[XPMessageRemoteExtModel alloc] init]; - extModel.defUser = userInfo.defUser; - extModel.erbanNo = userInfo.erbanNo; - extModel.carName = userInfo.carName; - extModel.inRoomNameplatePic = userInfo.nameplatePic; - extModel.inRoomNameplateWord = userInfo.nameplateWord; - extModel.isCustomWord = userInfo.isCustomWord; - extModel.charmUrl = userInfo.userLevelVo.charmUrl; - extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq; - extModel.experUrl = userInfo.userLevelVo.experUrl; - extModel.newUser = userInfo.newUser; - extModel.vipIcon = userInfo.userVipInfoVO.nameplateUrl; - extModel.androidBubbleUrl = userInfo.androidBubbleUrl; - extModel.iosBubbleUrl = userInfo.iosBubbleUrl; - extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; - extModel.platformRole = userInfo.platformRole; - extModel.nick = userInfo.nick; - - NIMMessage * message = [[NIMMessage alloc] init]; - message.text = text; - NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[AccountInfoStorage instance].getUid]; - message.remoteExt = remoteExt; - - ///网易易盾 拦截高风险 -// NIMAntiSpamOption *option = [[NIMAntiSpamOption alloc]init]; -// option.yidunEnabled = YES; -// option.businessId = KeyWithType(keyType_YiDunBussinessId); -// message.antiSpamOption = option; - NSString * sessionId = [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].roomId]; - //构造会话 - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - }]; -} - -- (void)onCloseButtonClick { - [self mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(0); - }]; - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - //记录关闭的次数 - NSNumber *count = [defaults objectForKey:kRoomQuickMessageCloseCount]; - [defaults setObject:@(count.intValue +1) forKey:kRoomQuickMessageCloseCount]; - [defaults synchronize]; - -} - -#pragma mark - Getters And Setters -- (void)setTitleArray:(NSArray *)titleArray { - _titleArray = titleArray; - if (titleArray.count == 0){ - [self onCloseButtonClick]; - } - [self.collectionView reloadData]; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.minimumInteritemSpacing = 8; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - [_collectionView registerClass:[XPRoomQuidkMessageCell class] forCellWithReuseIdentifier:NSStringFromClass([XPRoomQuidkMessageCell class])]; - } - return _collectionView; -} - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [[UIButton alloc] init]; - [_closeButton setImage:[UIImage imageNamed:@"room_gift_graffiti_close"] forState:UIControlStateNormal]; - [_closeButton addTarget:self action:@selector(onCloseButtonClick) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuidkMessageCell.h b/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuidkMessageCell.h deleted file mode 100644 index 9f05105..0000000 --- a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuidkMessageCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMRoomQuidkMessageCell.h -// YUMI -// -// Created by YUMI on 2022/9/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomQuidkMessageCell : UICollectionViewCell - -@property (nonatomic, copy) NSString *title; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuidkMessageCell.m b/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuidkMessageCell.m deleted file mode 100644 index 170b6ce..0000000 --- a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuidkMessageCell.m +++ /dev/null @@ -1,68 +0,0 @@ -// -// YMRoomQuidkMessageCell.m -// YUMI -// -// Created by YUMI on 2022/9/28. -// - -#import "XPRoomQuidkMessageCell.h" -///Third -#import -///Model -#import "RoomTagModel.h" -#import "DJDKMIMOMColor.h" -#import "RoomClassifyModel.h" - -@interface XPRoomQuidkMessageCell () - -@property (nonatomic, strong) UIView *bgView; - -@property (nonatomic, strong) UILabel *tagLabel; - -@end - -@implementation XPRoomQuidkMessageCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self addSubview:self.bgView]; - [self addSubview:self.tagLabel]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(22); - make.leading.trailing.mas_equalTo(self.contentView); - make.centerY.mas_equalTo(self.contentView); - }]; - [self.tagLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - }]; - } - return self; -} - -- (void)setTitle:(NSString *)title { - self.tagLabel.text = title; -} - -#pragma mark - Getter & Setter -- (UILabel *)tagLabel { - if (!_tagLabel) { - _tagLabel = [[UILabel alloc] init]; - _tagLabel.textColor = UIColor.whiteColor; - _tagLabel.font = [UIFont systemFontOfSize:12]; - _tagLabel.textAlignment = NSTextAlignmentCenter; - } - return _tagLabel; -} - -- (UIView *)bgView { - if (!_bgView) { - _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = UIColorRGBAlpha(0xffffff, 0.3); - _bgView.layer.cornerRadius = 11; - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/Api/Api+RoomRadio.h b/YuMi/Modules/YMRoom/View/ReleaseRadio/Api/Api+RoomRadio.h deleted file mode 100644 index 40e1cdb..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/Api/Api+RoomRadio.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// Api+RoomRadio.h -// YUMI -// -// Created by YUMI on 2021/12/31. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (RoomRadio) - -// 发送开黑广播消息 -/// @param completion 完成 -/// @param roomId 房间ID -/// @param message 消息内容 -+ (void)sendRoomRadio:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId msg:(NSString *)msg; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/Api/Api+RoomRadio.m b/YuMi/Modules/YMRoom/View/ReleaseRadio/Api/Api+RoomRadio.m deleted file mode 100644 index 8c959da..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/Api/Api+RoomRadio.m +++ /dev/null @@ -1,18 +0,0 @@ -// -// Api+RoomRadio.m -// YUMI -// -// Created by YUMI on 2021/12/31. -// - -#import "Api+RoomRadio.h" -#import -@implementation Api (RoomRadio) - -// 发送开黑广播消息 -+ (void)sendRoomRadio:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId msg:(NSString *)msg { - NSString * fang = [NSString stringFromBase64String:@"YnJvYWQvc2VuZA=="];// - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomId, msg, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/Model/XPReleaseRadioModel.h b/YuMi/Modules/YMRoom/View/ReleaseRadio/Model/XPReleaseRadioModel.h deleted file mode 100644 index 6107080..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/Model/XPReleaseRadioModel.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// YMReleaseRadioModel.h -// YUMI -// -// Created by YUMI on 2021/12/31. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPReleaseRadioModel : PIBaseModel - -///剩余次数 -@property (nonatomic, assign) NSInteger availableTimes; -///广播最大字数限制 -@property (nonatomic, assign) NSInteger maxWords; -///广播最少字数限制 -@property (nonatomic, assign) NSInteger minWords; -///再次发送广播时间间隔(分钟) -@property (nonatomic, assign) NSInteger minutes; -///再次发送广播的倒计秒数 -@property (nonatomic, assign) NSInteger seconds; -///发布广播总次数 -@property (nonatomic, assign) NSInteger total; -///推荐广播消息集合 -@property (nonatomic, strong) NSArray *recommends; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/Model/XPReleaseRadioModel.m b/YuMi/Modules/YMRoom/View/ReleaseRadio/Model/XPReleaseRadioModel.m deleted file mode 100644 index 1970e2e..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/Model/XPReleaseRadioModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMReleaseRadioModel.m -// YUMI -// -// Created by YUMI on 2021/12/31. -// - -#import "XPReleaseRadioModel.h" - -@implementation XPReleaseRadioModel - -@end diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/Presenter/XPReleaseRadioPresenter.h b/YuMi/Modules/YMRoom/View/ReleaseRadio/Presenter/XPReleaseRadioPresenter.h deleted file mode 100644 index 9dedc5c..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/Presenter/XPReleaseRadioPresenter.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMReleaseRadioPresenter.h -// YUMI -// -// Created by YUMI on 2021/12/31. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPReleaseRadioPresenter : BaseMvpPresenter - -///发送房间广播 -/// @param roomId 房间ID -/// @param message 广播内容 -- (void)releaseRoomRadioWithRoomId:(NSString *)roomId message:(NSString *)message; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/Presenter/XPReleaseRadioPresenter.m b/YuMi/Modules/YMRoom/View/ReleaseRadio/Presenter/XPReleaseRadioPresenter.m deleted file mode 100644 index 66fd563..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/Presenter/XPReleaseRadioPresenter.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMReleaseRadioPresenter.m -// YUMI -// -// Created by YUMI on 2021/12/31. -// - -#import "XPReleaseRadioPresenter.h" -#import "Api+RoomRadio.h" -#import "XPReleaseRadioModel.h" -#import "XPReleaseRadioProtocol.h" -#import "AccountInfoStorage.h" - -@implementation XPReleaseRadioPresenter - -- (void)releaseRoomRadioWithRoomId:(NSString *)roomId message:(NSString *)message { - [Api sendRoomRadio:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] releaseRoomRadioSuccess]; - }] roomId:roomId msg:message]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/Protocol/XPReleaseRadioProtocol.h b/YuMi/Modules/YMRoom/View/ReleaseRadio/Protocol/XPReleaseRadioProtocol.h deleted file mode 100644 index 31c82ca..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/Protocol/XPReleaseRadioProtocol.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// YMReleaseRadioProtocol.h -// YUMI -// -// Created by YUMI on 2021/12/31. -// - -#import - -@protocol XPReleaseRadioProtocol - -///发布广播成功 -- (void)releaseRoomRadioSuccess; - -@end diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/Cell/XPReleaseRadioTableViewCell.h b/YuMi/Modules/YMRoom/View/ReleaseRadio/View/Cell/XPReleaseRadioTableViewCell.h deleted file mode 100644 index 11722db..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/Cell/XPReleaseRadioTableViewCell.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMReleaseRadioTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/30. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPReleaseRadioTableViewCell; -@protocol XPReleaseRadioTableViewCellDelegate - -- (void)xPReleaseRadioTableViewCellDidSelectCell:(XPReleaseRadioTableViewCell *)cell; - -@end - -@interface XPReleaseRadioTableViewCell : UITableViewCell - -@property (nonatomic, copy) NSString *title; - -@property (nonatomic, weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/Cell/XPReleaseRadioTableViewCell.m b/YuMi/Modules/YMRoom/View/ReleaseRadio/View/Cell/XPReleaseRadioTableViewCell.m deleted file mode 100644 index 4bafb41..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/Cell/XPReleaseRadioTableViewCell.m +++ /dev/null @@ -1,87 +0,0 @@ -// -// YMReleaseRadioTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/30. -// - -#import "XPReleaseRadioTableViewCell.h" -#import "DJDKMIMOMColor.h" -#import - -@interface XPReleaseRadioTableViewCell() - -///背景 -@property (nonatomic, strong) UIView *bgView; -///标题 -@property (nonatomic, strong) UILabel *titleLabel; - -@end - -@implementation XPReleaseRadioTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.bgView]; - [self.contentView addSubview:self.titleLabel]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onBgViewClick:)]; - [self.bgView addGestureRecognizer:tap]; -} - -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView); - make.centerY.mas_equalTo(self.contentView); - make.height.mas_equalTo(24); - make.trailing.mas_equalTo(self.titleLabel).mas_offset(8); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.bgView).mas_offset(8); - make.centerY.mas_equalTo(self.contentView); - make.height.mas_equalTo(18); - }]; -} - -- (void)setTitle:(NSString *)title { - self.titleLabel.text = title; -} - -#pragma mark - event -- (void)onBgViewClick:(UITapGestureRecognizer *)ges { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPReleaseRadioTableViewCellDidSelectCell:)]) { - [self.delegate xPReleaseRadioTableViewCellDidSelectCell:self]; - } -} - -#pragma mark - Getters And Setters -- (UIView *)bgView { - if (!_bgView) { - _bgView = [[UIView alloc] init]; - _bgView.layer.cornerRadius = 12; - _bgView.layer.masksToBounds = YES; - _bgView.layer.borderColor = UIColorFromRGB(0xE9EBEC).CGColor; - _bgView.layer.borderWidth = 1; - _bgView.backgroundColor = UIColorFromRGB(0xFAFAFE); - } - return _bgView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:12]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioView.h b/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioView.h deleted file mode 100644 index f65f6d0..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMReleaseRadioView.h -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPReleaseRadioView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioView.m b/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioView.m deleted file mode 100644 index 30f07dd..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioView.m +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMReleaseRadioView.m -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import "XPReleaseRadioView.h" - -@implementation XPReleaseRadioView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - - } - return self; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.h b/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.h deleted file mode 100644 index ac81e5c..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMReleaseRadioViewController.h -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import "MvpViewController.h" -#import "RoomHostDelegate.h" - -NS_ASSUME_NONNULL_BEGIN - -@class XPReleaseRadioModel; -@interface XPReleaseRadioViewController : MvpViewController - -- (instancetype)initWithDelegate:(id)delegate; - -@property (nonatomic, strong) XPReleaseRadioModel *model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.m b/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.m deleted file mode 100644 index 0a5723b..0000000 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.m +++ /dev/null @@ -1,516 +0,0 @@ -// -// YMReleaseRadioViewController.m -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import "XPReleaseRadioViewController.h" -///tool - -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "XNDJTDDLoadingTool.h" -///Third -#import -#import "UIImage+Utils.h" -#import "NSArray+Safe.h" -///view -#import "XPReleaseRadioTableViewCell.h" -///P -#import "XPReleaseRadioPresenter.h" -#import "XPReleaseRadioProtocol.h" -///model -#import "RoomInfoModel.h" -#import "XPReleaseRadioModel.h" - -static NSString *const KXPReleaseRadioTableViewCellIdentifier = @"KXPReleaseRadioTableViewCellIdentifier"; - -@interface XPReleaseRadioViewController () - -///host代理 -@property (nonatomic,weak) idhostDelegate; - -///上面点击的view -@property (nonatomic,strong) UIView *topTapView; -///下面点击的view -@property (nonatomic,strong) UIView *bottomTapView; -///中间内容的容器 -@property (nonatomic,strong) UIImageView *backView; -///关闭按钮 -@property (nonatomic, strong) UIButton *closeButton; -///顶部标题 -@property (nonatomic,strong) UILabel *headLabel; -///顶部描述 -@property (nonatomic,strong) UILabel *headDescLabel; -///广播内容标题 -@property (nonatomic,strong) UILabel *radioTitleLabel; -///剩余次数容器 -@property (nonatomic, strong) UIStackView *releaseNumView; -///剩余次数标题 -@property (nonatomic, strong) UILabel *releaseNumTitle; -///剩余次数 -@property (nonatomic, strong) UILabel *releaseNumLabel; -///广播输入框 -@property (nonatomic,strong) YYTextView *radioTextView; -///字数计数 -@property (nonatomic,strong) UILabel *maxCountLabel; -///广播文字列表 -@property (nonatomic, strong) UITableView *tableView; -///发布按钮 -@property (nonatomic, strong) UIButton *releaseButton; -///发布时间说明(可以发布时显示) -@property (nonatomic, strong) UILabel *releaseTimeDescLabel; -///发布后倒计时说明容器 -@property (nonatomic,strong) UIView *countDownStackView; -///倒计时 -@property (nonatomic,strong) UILabel *countDownLabel; -///倒计时说明 -@property (nonatomic, strong) UILabel *countDownDescLabel; - -@property (strong, nonatomic) dispatch_source_t timer; - -@end - -@implementation XPReleaseRadioViewController - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super init]) { - self.hostDelegate = delegate; - } - return self; -} - -- (XPReleaseRadioPresenter *)createPresenter { - return [[XPReleaseRadioPresenter alloc] init]; -} - -- (void)dealloc { - if (self.timer != nil) { - dispatch_source_cancel(self.timer); - } -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - XPReleaseRadioProtocol -///发布广播成功 -- (void)releaseRoomRadioSuccess { - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPReleaseRadioViewController0")]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -#pragma mark - tableViewDelegate -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.model.recommends.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPReleaseRadioTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:KXPReleaseRadioTableViewCellIdentifier]; - cell.title = [self.model.recommends xpSafeObjectAtIndex:indexPath.row]; - cell.selectionStyle = UITableViewCellSelectionStyleNone; - cell.delegate = self; - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [self.radioTextView resignFirstResponder]; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 32; -} - -#pragma mark - XPReleaseRadioTableViewCellDelegate -- (void)xPReleaseRadioTableViewCellDidSelectCell:(XPReleaseRadioTableViewCell *)cell { - NSIndexPath *indexPath = [self.tableView indexPathForCell:cell]; - self.radioTextView.text = [self.model.recommends xpSafeObjectAtIndex:indexPath.row]; - [self.radioTextView endEditing:YES]; -} - -- (void)setModel:(XPReleaseRadioModel *)model { - _model = model; - [self setupData]; - [self.tableView reloadData]; -} - -- (void)setupData { - self.releaseNumLabel.text = [NSString stringWithFormat:@"%zd/%zd",self.model.availableTimes, self.model.total]; - self.releaseTimeDescLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPReleaseRadioViewController1"), self.model.minutes]; - self.radioTextView.placeholderText = [NSString stringWithFormat:YMLocalizedString(@"XPReleaseRadioViewController2"), self.model.minWords] ; - self.releaseTimeDescLabel.hidden = self.model.seconds > 0; - self.countDownStackView.hidden = self.model.seconds <= 0; - if (self.model.seconds > 0) { - [self openCountdown:self.model.seconds]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.topTapView]; - [self.view addSubview:self.backView]; - [self.view addSubview:self.bottomTapView]; - - [self.backView addSubview:self.closeButton]; - [self.backView addSubview:self.headLabel]; - [self.backView addSubview:self.headDescLabel]; - [self.backView addSubview:self.radioTitleLabel]; - [self.backView addSubview:self.releaseNumView]; - [self.releaseNumView addArrangedSubview:self.releaseNumTitle]; - [self.releaseNumView addArrangedSubview:self.releaseNumLabel]; - - [self.backView addSubview:self.radioTextView]; - [self.backView addSubview:self.maxCountLabel]; - [self.backView addSubview:self.tableView]; - [self.backView addSubview:self.releaseButton]; - [self.backView addSubview:self.releaseTimeDescLabel]; - [self.backView addSubview:self.countDownStackView]; - - [self.countDownStackView addSubview:self.countDownLabel]; - [self.countDownStackView addSubview:self.countDownDescLabel]; -} - -- (void)initSubViewConstraints { - [self.topTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.backView.mas_top); - }]; - - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(300); - make.height.mas_equalTo(398); - make.centerY.centerX.mas_equalTo(self.view); - }]; - - [self.bottomTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.backView.mas_bottom); - make.bottom.mas_equalTo(self.view); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(22); - make.top.mas_equalTo(self.backView).mas_offset(11); - make.trailing.mas_equalTo(self.backView).mas_offset(-15); - }]; - - [self.headLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backView); - make.top.mas_equalTo(self.backView).offset(24); - make.height.mas_equalTo(24); - }]; - - [self.headDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backView); - make.top.mas_equalTo(self.headLabel.mas_bottom).offset(12); - make.height.mas_equalTo(14); - }]; - - [self.radioTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.headDescLabel.mas_bottom).offset(16); - make.height.mas_equalTo(16); - make.leading.mas_equalTo(self.backView).mas_offset(16); - }]; - - [self.releaseNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.radioTitleLabel); - make.leading.mas_equalTo(self.radioTitleLabel.mas_trailing).mas_offset(4); - make.height.mas_equalTo(20); - }]; - - [self.radioTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView).inset(16); - make.top.mas_equalTo(self.radioTitleLabel.mas_bottom).mas_offset(8); - make.height.mas_equalTo(65); - }]; - - [self.maxCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.bottom.mas_equalTo(self.radioTextView).inset(3); - make.height.mas_equalTo(12); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.radioTextView); - make.top.mas_equalTo(self.radioTextView.mas_bottom).mas_offset(8); - make.height.mas_equalTo(115); - }]; - - [self.releaseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.tableView.mas_bottom).mas_offset(8); - make.centerX.mas_equalTo(self.backView); - make.width.mas_equalTo(188); - make.height.mas_equalTo(40); - }]; - - [self.releaseTimeDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backView); - make.top.mas_equalTo(self.releaseButton.mas_bottom).mas_offset(10); - make.height.mas_equalTo(14); - }]; - - [self.countDownStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(15); - make.centerX.mas_equalTo(self.backView); - make.top.mas_equalTo(self.releaseButton.mas_bottom).mas_offset(10); - }]; - [self.countDownLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.bottom.mas_equalTo(self.countDownStackView); - make.trailing.mas_equalTo(self.countDownDescLabel.mas_leading); - }]; - [self.countDownDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.bottom.mas_equalTo(self.countDownStackView); - }]; -} - -- (void)openCountdown:(NSInteger)countDown{ - __block NSInteger time = countDown; //倒计时时间 - if (_timer != nil) { - dispatch_source_cancel(_timer); - } - dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - _timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - dispatch_source_set_timer(_timer,dispatch_walltime(NULL, 0),1.0*NSEC_PER_SEC, 0); //每秒执行 - dispatch_source_set_event_handler(_timer, ^{ - if(time <= 0){ //倒计时结束，关闭 - @kWeakify(self); - dispatch_source_cancel(self.timer); - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - self.releaseTimeDescLabel.hidden = NO; - self.countDownStackView.hidden = YES; - if (self.model.availableTimes > 0 && self.radioTextView.text.length >= self.model.minWords) { - self.releaseButton.enabled = YES; - } - }); - }else{ - NSInteger seconds = time; - dispatch_async(dispatch_get_main_queue(), ^{ - //设置按钮显示读秒效果 - self.countDownLabel.text = [NSString stringWithFormat:@"%zds", seconds]; - }); - time--; - } - }); - dispatch_resume(_timer); -} - -- (void)onReleaseButtonClick:(UIButton *)button { - [self.presenter releaseRoomRadioWithRoomId:@(self.hostDelegate.getRoomInfo.roomId).stringValue message:self.radioTextView.text]; -} - -#pragma mark - Event Response -- (void)dismissTapRecognizer:(UITapGestureRecognizer *)tap { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)onCloseButtonClick:(UIButton *)button { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - YYTextViewDelegate -- (void)textViewDidChange:(YYTextView *)textView { - NSInteger maxLength = self.model.maxWords ? self.model.maxWords : 20; - NSInteger minLength = self.model.minWords ? self.model.minWords : 5; - if (textView.text.length > maxLength) { - textView.text = [textView.text substringToIndex:maxLength]; - } - self.maxCountLabel.text = [NSString stringWithFormat:@"%zd/%ld", textView.text.length, maxLength]; - if (textView.text.length >= minLength) { - if (self.model.availableTimes > 0 && self.countDownStackView.hidden) { - self.releaseButton.enabled = YES; - } - } else { - self.releaseButton.enabled = NO; - } -} - -#pragma mark - Getters And Setters -- (UIView *)topTapView { - if (!_topTapView) { - _topTapView = [[UIView alloc] init]; - _topTapView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissTapRecognizer:)]; - [_topTapView addGestureRecognizer:tap]; - } - return _topTapView; -} -- (UIView *)bottomTapView { - if (!_bottomTapView) { - _bottomTapView = [[UIView alloc] init]; - _bottomTapView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissTapRecognizer:)]; - [_bottomTapView addGestureRecognizer:tap]; - } - return _bottomTapView; -} -- (UIImageView *)backView { - if (!_backView) { - _backView = [[UIImageView alloc] init]; - _backView.userInteractionEnabled = YES; - _backView.image = [[UIImage imageNamed:@"room_radio_back"]ms_SetImageForRTL]; - } - return _backView; -} -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [[UIButton alloc] init]; - [_closeButton setBackgroundImage:[UIImage imageNamed:@"room_radio_release_close"] forState:UIControlStateNormal]; - [_closeButton addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} -- (UILabel *)headLabel { - if (!_headLabel) { - _headLabel = [[UILabel alloc] init]; - _headLabel.text = YMLocalizedString(@"XPReleaseRadioViewController3"); - _headLabel.font = [UIFont systemFontOfSize:24 weight:UIFontWeightSemibold]; - _headLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _headLabel; -} -- (UILabel *)headDescLabel { - if (!_headDescLabel) { - _headDescLabel = [[UILabel alloc] init]; - _headDescLabel.text = YMLocalizedString(@"XPReleaseRadioViewController4"); - _headDescLabel.font = [UIFont systemFontOfSize:10]; - _headDescLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _headDescLabel; -} -- (UILabel *)radioTitleLabel { - if (!_radioTitleLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPReleaseRadioViewController5"); - label.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - _radioTitleLabel = label; - } - return _radioTitleLabel; -} -- (UIStackView *)releaseNumView { - if (!_releaseNumView) { - _releaseNumView = [[UIStackView alloc] init]; - _releaseNumView.axis = UILayoutConstraintAxisHorizontal; - _releaseNumView.distribution = UIStackViewDistributionFill; - _releaseNumView.alignment = UIStackViewAlignmentCenter; - _releaseNumView.spacing = 2; - } - return _releaseNumView; -} -- (UILabel *)releaseNumTitle { - if (!_releaseNumTitle) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPReleaseRadioViewController6"); - label.font = [UIFont systemFontOfSize:12]; - label.textColor = [DJDKMIMOMColor secondTextColor]; - _releaseNumTitle = label; - } - return _releaseNumTitle; -} -- (UILabel *)releaseNumLabel { - if (!_releaseNumLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = @"0/3"; - label.font = [UIFont systemFontOfSize:12]; - label.textColor = UIColorFromRGB(0xFF9F00); - _releaseNumLabel = label; - } - return _releaseNumLabel; -} -- (YYTextView *)radioTextView { - if (!_radioTextView) { - _radioTextView = [[YYTextView alloc] init]; - _radioTextView.backgroundColor = UIColorFromRGB(0xF1F1FA); - _radioTextView.layer.cornerRadius = 8; - _radioTextView.layer.masksToBounds = YES; - _radioTextView.placeholderText = YMLocalizedString(@"XPReleaseRadioViewController7"); - _radioTextView.placeholderTextColor = [DJDKMIMOMColor textThirdColor]; - _radioTextView.placeholderFont = [UIFont systemFontOfSize:12]; - _radioTextView.font = [UIFont systemFontOfSize:12]; - _radioTextView.textColor = [DJDKMIMOMColor mainTextColor]; - _radioTextView.delegate = self; - } - return _radioTextView; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] init]; - _tableView.delegate = self; - _tableView.dataSource = self; - [_tableView registerClass:XPReleaseRadioTableViewCell.class forCellReuseIdentifier:KXPReleaseRadioTableViewCellIdentifier]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - } - return _tableView; -} -- (UIButton *)releaseButton { - if (!_releaseButton) { - _releaseButton = [[UIButton alloc] init]; - [_releaseButton setTitle:YMLocalizedString(@"XPReleaseRadioViewController8") forState:UIControlStateNormal]; - [_releaseButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_releaseButton setBackgroundImage:[UIImage imageWithColor:UIColorFromRGB(0xD2D5D7)] forState:UIControlStateDisabled]; - [_releaseButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFA936), UIColorFromRGB(0xFFCB47)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(188, 40)] forState:UIControlStateNormal]; - _releaseButton.enabled = NO; - _releaseButton.layer.cornerRadius = 20; - _releaseButton.layer.masksToBounds = YES; - [_releaseButton addTarget:self action:@selector(onReleaseButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _releaseButton; -} -- (UILabel *)releaseTimeDescLabel { - if (!_releaseTimeDescLabel) { - _releaseTimeDescLabel = [[UILabel alloc] init]; - _releaseTimeDescLabel.text = YMLocalizedString(@"XPReleaseRadioViewController9"); - _releaseTimeDescLabel.font = [UIFont systemFontOfSize:10]; - _releaseTimeDescLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _releaseTimeDescLabel; -} -- (UIView *)countDownStackView { - if (!_countDownStackView) { - _countDownStackView = [[UIView alloc] init]; - _countDownStackView.hidden = YES; - } - return _countDownStackView; -} -- (UILabel *)countDownLabel { - if (!_countDownLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = @"0s"; - label.font = [UIFont systemFontOfSize:10]; - label.textColor = UIColorFromRGB(0xFDA615); - _countDownLabel = label; - } - return _countDownLabel; -} -- (UILabel *)countDownDescLabel { - if (!_countDownDescLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPReleaseRadioViewController10"); - label.font = [UIFont systemFontOfSize:10]; - label.textColor = [DJDKMIMOMColor textThirdColor]; - _countDownDescLabel = label; - } - return _countDownDescLabel; -} - -- (UILabel *)maxCountLabel { - if (!_maxCountLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = @"0/20"; - label.font = [UIFont systemFontOfSize:12]; - label.textColor = [DJDKMIMOMColor textThirdColor]; - _maxCountLabel = label; - } - return _maxCountLabel; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomAnimationProtocol.h b/YuMi/Modules/YMRoom/View/RoomAnimationProtocol.h deleted file mode 100644 index 4aec632..0000000 --- a/YuMi/Modules/YMRoom/View/RoomAnimationProtocol.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// RoomAnimationProtocol.h -// YUMI -// -// Created by zu on 2022/1/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -/** XPRoomAnimationView 用到的协议。 - - RoomVC 的子 View 之间的通信协议，通过 RoomHostDelegate 和 RoomGuestDelegate 继承实现。 - - 调用方向：XPRoomAnimationView —> RoomHostDelegate —> RoomAnimationProtocol（RoomGuestDelegate继承） - - */ -@protocol RoomAnimationProtocol - -@optional -/** - * StageView 专用。 - */ -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid; - -- (CGPoint)animationPointAtStageViewByIndex:(NSInteger)index; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.h b/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.h deleted file mode 100644 index 3b9275c..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// Api+MSRoomGameApi.h -// YuMi -// -// Created by duoban on 2024/5/28. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (MSRoomGameApi) -///等到房间游戏配置 -+(void)getRoomGameHomeConfig:(HttpRequestHelperCompletion)completion; -///开始匹配游戏 -+(void)startMatchGame:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId mgId:(NSString *)mgId gameMode:(NSString *)gameMode; -///得到房间详情 -+(void)getRoomGameDetails:(HttpRequestHelperCompletion)completion roomType:(NSString *)roomType; -///退出房间 -+(void)closeRoomGame:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId; - -///首页得到房间详情 -+(void)getRoomGameDetailsForHoem:(HttpRequestHelperCompletion)completion; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.m b/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.m deleted file mode 100644 index e49eeba..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.m +++ /dev/null @@ -1,31 +0,0 @@ -// -// Api+MSRoomGameApi.m -// YuMi -// -// Created by duoban on 2024/5/28. -// - -#import "Api+MSRoomGameApi.h" - -@implementation Api (MSRoomGameApi) -///等到房间游戏配置 -+(void)getRoomGameHomeConfig:(HttpRequestHelperCompletion)completion{ - [self makeRequest:@"miniGame/nav/config" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} -///开始匹配游戏 -+(void)startMatchGame:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId mgId:(NSString *)mgId gameMode:(NSString *)gameMode{ - [self makeRequest:@"miniGame/nav/start" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,roomId,mgId,gameMode,nil]; -} -///得到房间详情 -+(void)getRoomGameDetails:(HttpRequestHelperCompletion)completion roomType:(NSString *)roomType{ - [self makeRequest:@"chatRoom/getByType" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,roomType,nil]; -} -///首页得到房间详情 -+(void)getRoomGameDetailsForHoem:(HttpRequestHelperCompletion)completion { - [self makeRequest:@"miniGame/nav/resumeRoom" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,nil]; -} -///退出房间 -+(void)closeRoomGame:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId{ - [self makeRequest:@"miniGame/nav/close" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,roomId,nil]; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.h b/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.h deleted file mode 100644 index 8339e05..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// MSRoomGameModel.h -// YuMi -// -// Created by duoban on 2024/5/29. -// - -#import "PIBaseModel.h" -#import "HomePlayRoomModel.h" -NS_ASSUME_NONNULL_BEGIN - - -typedef enum : NSUInteger { - MSRoomGameInfoModelMatchmaking,// 匹配中 - MSRoomGameInfoModelMatchSuccessfully,//匹配成功 - MSRoomGameInfoModelGameEnd,///游戏结束 - MSRoomGameInfoModelMatchFail ,/// 匹配失败 -} MSRoomGameInfoModelType; - - - - -@class MSRoomGameMicModel,MSRoomGameInfoModel; -@interface MSRoomGameModel : PIBaseModel -@property(nonatomic,strong) MSRoomGameInfoModel *data; -@property(nonatomic,assign) int roomType; -@property(nonatomic,copy)NSString *chatRoomId; -@property(nonatomic,copy) NSString *roomId; -@property(nonatomic,copy) NSArray *roomMics; -@end - - -@interface MSRoomGameMicModel : PIBaseModel - -@property(nonatomic,assign)BOOL micState; -@property(nonatomic,copy) NSString *roomId; -@property(nonatomic,strong) HomePlayMicUserModel *micUser; -@property(nonatomic,assign) int posState; -@property(nonatomic,assign) int position; - - -@end - -@interface MSRoomGameInfoModel : PIBaseModel -@property(nonatomic,copy) NSString *gameRoomIcon; -@property(nonatomic,copy) NSString *mgId; -//"轮次状态 0 进行中 1 结束 -@property(nonatomic,assign) int roundStatus; -///结果分值 -@property(nonatomic,copy) NSArray *scores; -@property(nonatomic,copy) NSString *configJson; -@property(nonatomic,assign) MSRoomGameInfoModelType matchStatus; -@property(nonatomic,copy) NSString *matchRoundId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.m b/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.m deleted file mode 100644 index 8856fb8..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// MSRoomGameModel.m -// YuMi -// -// Created by duoban on 2024/5/29. -// - -#import "MSRoomGameModel.h" - -@implementation MSRoomGameModel -+ (NSDictionary *)objectClassInArray{ - return @{@"roomMics":MSRoomGameMicModel.class}; -} -@end - -@implementation MSRoomGameMicModel - -@end -@implementation MSRoomGameInfoModel - -@end - diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameResultsModel.h b/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameResultsModel.h deleted file mode 100644 index 6ba0432..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameResultsModel.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// MSRoomGameResultsModel.h -// YuMi -// -// Created by duoban on 2024/5/30. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MSRoomGameResultsModel : PIBaseModel -@property(nonatomic,assign) int rank; -@property(nonatomic,copy) NSString *uid; -@property(nonatomic,copy) NSString *avatar; -@property(nonatomic,copy) NSString *nick; -@property(nonatomic,strong) NSNumber *winNum; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameResultsModel.m b/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameResultsModel.m deleted file mode 100644 index 41c0df4..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameResultsModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MSRoomGameResultsModel.m -// YuMi -// -// Created by duoban on 2024/5/30. -// - -#import "MSRoomGameResultsModel.h" - -@implementation MSRoomGameResultsModel - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSTabbarRoomGameModel.h b/YuMi/Modules/YMRoom/View/RoomGame/Model/MSTabbarRoomGameModel.h deleted file mode 100644 index 4b4b317..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSTabbarRoomGameModel.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// MSTabbarRoomGameModel.h -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "PIBaseModel.h" -@class MSTabbarRoomGameItemModel; -NS_ASSUME_NONNULL_BEGIN - -@interface MSTabbarRoomGameModel : PIBaseModel -@property(nonatomic,copy) NSArray *gameModes; -@property(nonatomic,assign) BOOL isShow ; -@property(nonatomic,copy) NSString *mgId; -@property(nonatomic,copy) NSString *mgIdStr; -@property(nonatomic,assign) int micNum; -@property(nonatomic,copy) NSString *name; -@property(nonatomic,copy) NSString *pic; -@property(nonatomic,copy) NSString *remark; -@end -@interface MSTabbarRoomGameItemModel : PIBaseModel -@property(nonatomic,copy) NSString * gameMode; -@property(nonatomic,copy) NSString *modeIcon; -@property(nonatomic,copy) NSArray *scores; -@property(nonatomic,copy) NSString *modeName; -@property(nonatomic,copy) NSString *ruleUrl; -@property(nonatomic,copy) NSString *ticket; -@property(nonatomic,copy) NSString *roomId; -@end -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSTabbarRoomGameModel.m b/YuMi/Modules/YMRoom/View/RoomGame/Model/MSTabbarRoomGameModel.m deleted file mode 100644 index 6d011d2..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSTabbarRoomGameModel.m +++ /dev/null @@ -1,18 +0,0 @@ -// -// MSTabbarRoomGameModel.m -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MSTabbarRoomGameModel.h" - -@implementation MSTabbarRoomGameModel -+ (NSDictionary *)objectClassInArray{ - return @{@"gameModes":MSTabbarRoomGameItemModel.class}; -} -@end - -@implementation MSTabbarRoomGameItemModel - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.h b/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.h deleted file mode 100644 index 499dd1e..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// MSRoomGamePresenter.h -// YuMi -// -// Created by duoban on 2024/5/28. -// - -#import "BaseMvpPresenter.h" -#import "UserInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MSRoomGamePresenter : BaseMvpPresenter -///获取游戏配置 --(void)getRoomGameConfig; -///开始匹配游戏 --(void)startMatchGameWithRoomId:(NSString *)roomId mgId:(NSString *)mgId gameMode:(NSString *)gameMode; -///得到房间详情 --(void)getRoomGameDetailWithRoomType:(NSString *)roomType; -///进入房间 -- (void)enterNIMRoom:(NSString *)roomId user:(UserInfoModel *)userInfo; -///退出房间 -- (void)exitNIMRoom:(NSString *)roomId; -///退出房间 --(void)closeRoomGameWithRoomId:(NSString *)roomId; -///得到金币数量 --(void)getCoinNum; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m b/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m deleted file mode 100644 index f34972c..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m +++ /dev/null @@ -1,141 +0,0 @@ -// -// MSRoomGamePresenter.m -// YuMi -// -// Created by duoban on 2024/5/28. -// - -#import "MSRoomGamePresenter.h" -#import "Api+MSRoomGameApi.h" -#import "Api.h" -#import -#import "UserInfoModel.h" -#import "WalletInfoModel.h" -#import "MSTabbarRoomGameModel.h" -#import "MSRoomGameProtocol.h" -#import "MSRoomGameModel.h" -#import -#import "XPMessageRemoteExtModel.h" -#import "XPSkillCardPlayerManager.h" - -@implementation MSRoomGamePresenter - --(void)getCoinNum{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - @kWeakify(self); - [Api getUserWalletInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data]; - [[self getView]getCoinNumSuccess:model]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES] uid:uid ticket:ticket]; -} - --(void)getRoomGameConfig{ - NSString * uid = [AccountInfoStorage instance].getUid; - RACSubject* user = [RACSubject subject]; - RACSubject* game = [RACSubject subject]; - @kWeakify(self); - [[RACSignal combineLatest:@[user,game] reduce:^id(UserInfoModel* userModel,MSTabbarRoomGameModel *gameModel){ - @kStrongify(self); - [[self getView] getRoomGameConfigSuccessWithUser:userModel gameModel:gameModel]; - return nil; - }] subscribeError:^(NSError * _Nullable error) { - - }]; - - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - UserInfoModel * infoModel = [UserInfoModel modelWithJSON:data.data]; - [[XPSkillCardPlayerManager shareInstance] setUserInfoModel:infoModel]; - [user sendNext:infoModel]; - [user sendCompleted]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [user sendError:nil]; - } showLoading:NO errorToast:NO] uid:uid]; - - [Api getRoomGameHomeConfig:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - MSTabbarRoomGameModel *model = [MSTabbarRoomGameModel modelWithJSON:data.data]; - [game sendNext:model]; - [game sendCompleted]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [game sendError:nil]; - }]]; -} -///开始匹配游戏 --(void)startMatchGameWithRoomId:(NSString *)roomId mgId:(NSString *)mgId gameMode:(NSString *)gameMode{ - @kWeakify(self); - [Api startMatchGame:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView]startMatchGameSuccess]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (code == 34792) { // 特殊操作，后续优化 - [TTPopup alertWithMessage:msg confirmHandler:^{ - @kStrongify(self); - [[self getView] forceExitRoom]; - } cancelHandler:^{}]; - } else { - [[self getView] showErrorToast:msg]; - } - } showLoading:YES errorToast:NO] roomId:roomId mgId:mgId gameMode:gameMode]; -} -///得到房间详情 --(void)getRoomGameDetailWithRoomType:(NSString *)roomType{ - [Api getRoomGameDetails:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - MSRoomGameModel *model = [MSRoomGameModel modelWithJSON:data.data]; - [[self getView]getRoomGameDetailsSuccessWithModel:model]; - }] roomType:roomType]; -} - -- (void)enterNIMRoom:(NSString *)roomId user:(UserInfoModel *)userInfo { - NIMChatroomEnterRequest *request = [[NIMChatroomEnterRequest alloc] init]; - request.roomId = roomId; - //设置ext - XPMessageRemoteExtModel * extModel = [[XPMessageRemoteExtModel alloc] init]; - extModel.defUser = userInfo.defUser; - extModel.erbanNo = userInfo.erbanNo; - extModel.carName = userInfo.carName; - extModel.inRoomNameplatePic = userInfo.nameplatePic; - extModel.inRoomNameplateWord = userInfo.nameplateWord; - extModel.isCustomWord = userInfo.isCustomWord; - extModel.charmUrl = userInfo.userLevelVo.charmUrl; - extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq; - extModel.experUrl = userInfo.userLevelVo.experUrl; - extModel.newUser = userInfo.newUser; - extModel.vipIcon = userInfo.userVipInfoVO.nameplateUrl; - extModel.fromUid = userInfo.fromUid; - extModel.fromType = userInfo.fromType; - extModel.fromNick = userInfo.fromNick; - extModel.iosBubbleUrl = userInfo.iosBubbleUrl; - extModel.androidBubbleUrl = userInfo.androidBubbleUrl; - extModel.enterHide = userInfo.userVipInfoVO.enterHide; - extModel.preventKick = userInfo.userVipInfoVO.preventKick; - extModel.enterRoomEffects = userInfo.userVipInfoVO.enterRoomEffects; - extModel.gender = userInfo.gender; - extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; - extModel.platformRole = userInfo.platformRole; - extModel.nick = userInfo.nick; - - NSMutableDictionary *ext = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[NSString stringWithFormat:@"%ld", userInfo.uid]]; - request.roomExt = [ext toJSONString]; - [[NIMSDK sharedSDK].chatroomManager enterChatroom:request completion:^(NSError * _Nullable error, NIMChatroom * _Nullable chatroom, NIMChatroomMember * _Nullable me) { - if (error) { - - } else { - - } - }]; -} - -- (void)exitNIMRoom:(NSString *)roomId { - [[NIMSDK sharedSDK].chatroomManager exitChatroom:roomId completion:nil]; - -} -///退出房间 --(void)closeRoomGameWithRoomId:(NSString *)roomId{ - [Api closeRoomGame:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { -// NSLog(@"111"); - } roomId:roomId]; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Protocol/MSRoomGameProtocol.h b/YuMi/Modules/YMRoom/View/RoomGame/Protocol/MSRoomGameProtocol.h deleted file mode 100644 index 572b332..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/Protocol/MSRoomGameProtocol.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// MSRoomGameProtocol.h -// YuMi -// -// Created by duoban on 2024/5/28. -// - -#import -#import "UserInfoModel.h" -#import "WalletInfoModel.h" -#import "MSTabbarRoomGameModel.h" -#import "MSRoomGameModel.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol MSRoomGameProtocol -@optional -///请求游戏配置 --(void)getRoomGameConfigSuccessWithUser:(UserInfoModel *)user gameModel:(MSTabbarRoomGameModel *)gameModel; -///开始游戏 --(void)startMatchGameSuccess; -///用户选择退出房间并重新排位 --(void)forceExitRoom; -///得到游戏详情 --(void)getRoomGameDetailsSuccessWithModel:(MSRoomGameModel *)model; -///得到金币数量 --(void)getCoinNumSuccess:(WalletInfoModel *)model; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSRoomGameVictoryCell.h b/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSRoomGameVictoryCell.h deleted file mode 100644 index bcf1627..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSRoomGameVictoryCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MSRoomGameVictoryCell.h -// YuMi -// -// Created by duoban on 2024/5/28. -// - -#import -#import "MSRoomGameResultsModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MSRoomGameVictoryCell : UITableViewCell -@property(nonatomic,strong) MSRoomGameResultsModel *resultsModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSRoomGameVictoryCell.m b/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSRoomGameVictoryCell.m deleted file mode 100644 index fd87f5e..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSRoomGameVictoryCell.m +++ /dev/null @@ -1,166 +0,0 @@ -// -// MSRoomGameVictoryCell.m -// YuMi -// -// Created by duoban on 2024/5/28. -// - -#import "MSRoomGameVictoryCell.h" -@interface MSRoomGameVictoryCell() -@property(nonatomic,strong) UIImageView *bgImageView; -@property(nonatomic,strong) UIImageView *rankView; -@property(nonatomic,strong) NetImageView *avatarView; -@property(nonatomic,strong) UIImageView *borderImageView; -@property(nonatomic,strong) UILabel *nameView; -@property(nonatomic,strong) UIImageView *bgCoinView; -@property(nonatomic,strong) UIImageView *coinView; -@property(nonatomic,strong) UILabel *coinNumView; -@end -@implementation MSRoomGameVictoryCell --(instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{ - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} - --(void)installUI{ - self.contentView.backgroundColor = [UIColor clearColor]; - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.rankView]; - [self.bgImageView addSubview:self.avatarView]; - [self.bgImageView addSubview:self.borderImageView]; - [self.bgImageView addSubview:self.nameView]; - [self.bgImageView addSubview:self.bgCoinView]; - [self.bgImageView addSubview:self.coinView]; - [self.bgCoinView addSubview:self.coinNumView]; -} --(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(60)); - }]; - [self.rankView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(7)); - make.width.mas_equalTo(kGetScaleWidth(44)); - make.height.mas_equalTo(kGetScaleWidth(43)); - make.centerY.equalTo(self.bgImageView); - }]; - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(49)); - make.leading.mas_equalTo(kGetScaleWidth(53)); - make.centerY.equalTo(self.bgImageView); - }]; - [self.borderImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.avatarView); - }]; - [self.bgCoinView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(9)); - make.width.mas_equalTo(kGetScaleWidth(65)); - make.height.mas_equalTo(kGetScaleWidth(24)); - make.centerY.equalTo(self.bgImageView); - }]; - [self.coinView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(25)); - make.trailing.mas_equalTo(-kGetScaleWidth(58)); - make.centerY.equalTo(self.bgImageView); - }]; - [self.coinNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.centerY.equalTo(self.bgCoinView); - - }]; - [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.bgImageView); - make.leading.mas_equalTo(kGetScaleWidth(106)); - make.trailing.equalTo(self.coinView.mas_leading).mas_offset(-kGetScaleWidth(5)); - }]; -} -- (void)setResultsModel:(MSRoomGameResultsModel *)resultsModel{ - _resultsModel = resultsModel; - _rankView.image = _resultsModel.rank == 1 ? kImage(@"ms_room_game_victory_rank_first"):kImage(@"ms_room_game_victory_rank_second"); - _avatarView.image = nil; - [_avatarView loadImageWithUrl:_resultsModel.avatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - self.avatarView.image = image; - }]; - _nameView.text = _resultsModel.nick; - _bgImageView.image = _resultsModel.rank == 1 ? kImage(@"ms_room_game_victory_bg_first"):kImage(@"ms_room_game_victory_bg_second"); - _bgCoinView.image = _resultsModel.rank == 1 ? kImage(@"ms_room_game_victory_coin_bg_first"):kImage(@"ms_room_game_victory_coin_bg_second"); - _coinNumView.text = _resultsModel.rank == 1 ? [NSString stringWithFormat:@"+%@",_resultsModel.winNum.stringValue]:_resultsModel.winNum.stringValue; - _borderImageView.image = _resultsModel.rank == 1 ? kImage(@"ms_room_game_victory_border_first") : kImage(@"ms_room_game_victory_border_second"); -} -#pragma mark - 懒加载 -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = kImage(@"ms_room_game_victory_bg_second"); - } - return _bgImageView; -} -- (UIImageView *)rankView{ - if(!_rankView){ - _rankView = [UIImageView new]; - _rankView.image = kImage(@"ms_room_game_victory_rank_second"); - } - return _rankView; -} -- (NetImageView *)avatarView{ - if(!_avatarView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarView = [[NetImageView alloc]initWithConfig:config]; - _avatarView.layer.cornerRadius = kGetScaleWidth(49)/2; - _avatarView.layer.masksToBounds = YES; - } - return _avatarView; -} -- (UIImageView *)borderImageView{ - if(!_borderImageView){ - _borderImageView = [UIImageView new]; - _borderImageView.image = kImage(@"ms_room_game_victory_border_second"); - } - return _borderImageView; -} -- (UILabel *)nameView{ - if(!_nameView){ - _nameView = [UILabel labelInitWithText:@"王者明" font:kFontBold(14) textColor:[UIColor whiteColor]]; - } - return _nameView; -} -- (UIImageView *)bgCoinView{ - if(!_bgCoinView){ - _bgCoinView = [UIImageView new]; - _bgCoinView.image = kImage(@"ms_room_game_victory_coin_bg_second"); - } - return _bgCoinView; -} -- (UIImageView *)coinView{ - if(!_coinView){ - _coinView = [UIImageView new]; - _coinView.image = kImage(@"moli_money_icon"); - } - return _coinView; -} -- (UILabel *)coinNumView{ - if(!_coinNumView){ - _coinNumView = [UILabel labelInitWithText:@"0" font:kFontBold(15) textColor:UIColorFromRGB(0xFFE829)]; - _coinNumView.textAlignment = NSTextAlignmentCenter; - } - return _coinNumView; -} -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSTabbarRoomGameCell.h b/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSTabbarRoomGameCell.h deleted file mode 100644 index 9375a37..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSTabbarRoomGameCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MSTabbarRoomGameCell.h -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import -#import "MSTabbarRoomGameModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MSTabbarRoomGameCell : UICollectionViewCell -@property(nonatomic,strong) MSTabbarRoomGameItemModel *itemMode; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSTabbarRoomGameCell.m b/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSTabbarRoomGameCell.m deleted file mode 100644 index 0005a2f..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSTabbarRoomGameCell.m +++ /dev/null @@ -1,48 +0,0 @@ -// -// MSTabbarRoomGameCell.m -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MSTabbarRoomGameCell.h" -@interface MSTabbarRoomGameCell() -@property(nonatomic,strong) NetImageView *bgImageView; -@end -@implementation MSTabbarRoomGameCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self.contentView addSubview:self.bgImageView]; -} --(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; - -} -- (void)setItemMode:(MSTabbarRoomGameItemModel *)itemMode{ - _itemMode = itemMode; - if(_itemMode == nil)return; - _bgImageView.image = nil; - [_bgImageView loadImageWithUrl:_itemMode.modeIcon completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - self.bgImageView.image = image; - }]; -} -#pragma mark - 懒加载 -- (NetImageView *)bgImageView{ - if(!_bgImageView){ - NetImageConfig *config = [NetImageConfig new]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _bgImageView = [[NetImageView alloc]initWithConfig:config]; - - } - return _bgImageView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/LudoGameViewController.h b/YuMi/Modules/YMRoom/View/RoomGame/View/LudoGameViewController.h deleted file mode 100644 index a9e3ff4..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/LudoGameViewController.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// LudoGameViewController.h -// YuMi -// -// Created by P on 2025/4/7. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface LudoGameViewController : MvpViewController - -@property (nonatomic, copy) void(^needForceExitRoom)(void); - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/LudoGameViewController.m b/YuMi/Modules/YMRoom/View/RoomGame/View/LudoGameViewController.m deleted file mode 100644 index b46c6de..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/LudoGameViewController.m +++ /dev/null @@ -1,228 +0,0 @@ -// -// LudoGameViewController.m -// YuMi -// -// Created by P on 2025/4/7. -// - -#import "LudoGameViewController.h" -#import "MSTabbarRoomGameHeadView.h" -#import "MSTabbarRoomGameView.h" -#import "MSTabbarBeginGameView.h" -#import "MSRoomGameVC.h" -#import "BaseNavigationController.h" -#import "MSRoomGamePresenter.h" -#import "XPIAPRechargeViewController.h" -#import "XPWebViewController.h" -#import "XPRoomHalfWebView.h" -#import "MSRoomGameProtocol.h" - -#pragma mark -MSTabbarRoomGameViewDelegate -@interface LudoPresentationController : UIPresentationController -@property(nonatomic,strong) UIView *dimmingView; -@end - -@implementation LudoPresentationController -- (void)presentationTransitionWillBegin { - self.dimmingView = [[UIView alloc] initWithFrame:self.containerView.bounds]; - self.dimmingView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6]; - [self.containerView addSubview:self.dimmingView]; - - id coordinator = [self.presentedViewController transitionCoordinator]; - [coordinator animateAlongsideTransition:^(id context) { - self.dimmingView.alpha = 1.0; - } completion:nil]; -} - -- (void)dismissalTransitionWillBegin { - id coordinator = [self.presentedViewController transitionCoordinator]; - [coordinator animateAlongsideTransition:^(id context) { - self.dimmingView.alpha = 0.0; - } completion:nil]; -} - -- (CGRect)frameOfPresentedViewInContainerView { - return CGRectMake(0, - 0, - KScreenWidth, - KScreenHeight); -} -@end - -@interface LudoGameViewController () - -@property(nonatomic,strong) MSTabbarRoomGameHeadView *headView; -@property(nonatomic,strong) MSTabbarRoomGameView *gameView; -@property(nonatomic,strong) MSTabbarRoomGameModel *gameModel; -@property(nonatomic,strong) MSTabbarRoomGameItemModel *chooseGameModel; - -@end - -@implementation LudoGameViewController - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (MSRoomGamePresenter *)createPresenter { - return [[MSRoomGamePresenter alloc] init]; -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - if (!self.gameModel) { - [self.presenter getRoomGameConfig]; - } - [self.presenter getCoinNum]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self setupTopTheme]; - [self setupUIComponents]; - [self setupConstraints]; - [self setupThemeObservers]; -} - -- (void)setupUIComponents { - self.view.backgroundColor = [[ClientConfig shareConfig] bgColor]; - - self.headView = [[MSTabbarRoomGameHeadView alloc] initWithFrame:CGRectZero]; - self.headView.delegate = self; - - self.gameView = [[MSTabbarRoomGameView alloc] initWithFrame:CGRectZero]; - self.gameView.delegate = self; - - [self.view addSubview:self.headView]; - [self.view addSubview:self.gameView]; -} - -- (void)setupConstraints { - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.view); - make.top.mas_equalTo(kStatusBarHeight); - make.height.mas_equalTo(kGetScaleWidth(44)); - }]; - - [self.gameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.headView.mas_bottom).offset(kGetScaleWidth(59)); - make.leading.trailing.bottom.equalTo(self.view); - }]; -} - -- (void)setupThemeObservers { - [[NSNotificationCenter defaultCenter] addObserverForName:[ClientConfig shareConfig].reloadViewBackgroundColorKey - object:nil - queue:[NSOperationQueue mainQueue] - usingBlock:^(NSNotification *note) { - self.view.backgroundColor = [[ClientConfig shareConfig] bgColor]; - }]; -} - -#pragma mark - MSRoomGameProtocol - -/// 更新金币数量 -- (void)getCoinNumSuccess:(WalletInfoModel *)model { - self.headView.coinModel = model; -} - -/// 加载游戏配置 -- (void)getRoomGameConfigSuccessWithUser:(UserInfoModel *)user - gameModel:(MSTabbarRoomGameModel *)gameModel { - self.gameModel = gameModel; - self.headView.userModel = user; - self.gameView.gameModel = gameModel; -} - -#pragma mark - MSTabbarBeginGameViewDelegate -- (void)startMatchGameActionWithModel:(MSTabbarRoomGameItemModel *)model { - if (self.headView.coinModel.diamonds.integerValue < model.ticket.integerValue) { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"UserDetail_CP_Toast_0"); - config.message = YMLocalizedString(@"XPTreasureFairyViewController5"); - config.confirmButtonConfig.title = YMLocalizedString(@"XPTreasureFairyViewController6"); - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ - @kStrongify(self); - XPIAPRechargeViewController *rechargeVC = [[XPIAPRechargeViewController alloc] init]; - [self.navigationController pushViewController:rechargeVC animated:YES]; - } cancelHandler:^{}]; - } else { - [self.presenter startMatchGameWithRoomId:@"" - mgId:self.gameModel.mgId - gameMode:model.gameMode]; - } -} - -- (void)clickRuleActionWithModel:(MSTabbarRoomGameItemModel *)model { - XPRoomHalfWebView *webView = [[XPRoomHalfWebView alloc] init]; - webView.url = model.ruleUrl; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; -} - -- (void)leave { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - Match Success Handling -- (void)startMatchGameSuccess { - MSRoomGameVC *gameVC = [MSRoomGameVC new]; - gameVC.chooseGameModel = self.chooseGameModel; - gameVC.userinfo = self.headView.userModel; - BaseNavigationController *nav = [[BaseNavigationController alloc] initWithRootViewController:gameVC]; - nav.modalPresentationStyle = UIModalPresentationFullScreen; - [self presentViewController:nav animated:YES completion:nil]; - - UIViewPropertyAnimator *animator = [[UIViewPropertyAnimator alloc] initWithDuration:0.3 curve:UIViewAnimationCurveEaseInOut animations:^{ - nav.view.alpha = 1.0; - }]; - [animator startAnimation]; -} - -#pragma mark - MSTabbarRoomGameHeadViewDelegate -- (void)clickPayAction{ - XPIAPRechargeViewController *iapVC = [XPIAPRechargeViewController new]; - [self.navigationController pushViewController:iapVC animated:YES]; -} -- (void)clickRankAction{ - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kLUDOUrl); - [self.navigationController pushViewController:webVC animated:YES]; -} - -#pragma mark -MSTabbarRoomGameViewDelegate --(void)chooseGameType:(MSTabbarRoomGameItemModel *)model{ - MSTabbarBeginGameView *beginGameView = [[MSTabbarBeginGameView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(252))]; - beginGameView.itemModel = model; - beginGameView.delegate = self; - self.chooseGameModel = model; - - UIViewController *presenterVC = [[UIViewController alloc] init]; - presenterVC.view.backgroundColor = [UIColor clearColor]; - presenterVC.view = beginGameView; - presenterVC.view.frame = CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(252)); - presenterVC.modalPresentationStyle = UIModalPresentationCustom; - presenterVC.transitioningDelegate = (id)self; - - [self presentViewController:presenterVC animated:YES completion:nil]; -} - -- (void)forceExitRoom NS_REFINED_FOR_SWIFT { - if (_needForceExitRoom) { - self.needForceExitRoom(); - @kWeakify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self startMatchGameActionWithModel:self.chooseGameModel]; - }); - } -} - -#pragma mark - UIViewControllerTransitioningDelegate -- (UIPresentationController *)presentationControllerForPresentedViewController:(UIViewController *)presented - presentingViewController:(UIViewController *)presenting - sourceViewController:(UIViewController *)source { - return [[LudoPresentationController alloc] initWithPresentedViewController:presented presentingViewController:presenting]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.h b/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.h deleted file mode 100644 index 192c964..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// MSRoomGameVC.h -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MvpViewController.h" -#import "MSTabbarRoomGameModel.h" -#import "UserInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MSRoomGameVC : MvpViewController -@property(nonatomic,strong) MSTabbarRoomGameItemModel *chooseGameModel; -@property(nonatomic,strong) UserInfoModel *userinfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m b/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m deleted file mode 100644 index 2024291..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m +++ /dev/null @@ -1,419 +0,0 @@ -// -// MSRoomGameVC.m -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MSRoomGameVC.h" -#import "MSRoomGameHeadView.h" -#import "MSRoomGameMsgView.h" -#import "MSRoomGameSendMsgView.h" -#import -#import "MSRoomGameVictoryView.h" -#import "MSRoomGameQuitGameView.h" -#import "MSRoomGamePresenter.h" -#import "MSRoomGameProtocol.h" -#import -#import "AttachmentModel.h" -#import "MSRoomGameSendTextView.h" -#import "MSRoomGameView.h" -#import "MSRoomGameResultsModel.h" -#import "Api.h" -#import "XPIAPRechargeViewController.h" -@interface MSRoomGameVC () -@property(nonatomic,strong) UIImageView *bgImageView; -@property(nonatomic,strong) MSRoomGameHeadView *headView; -@property(nonatomic,strong) MSRoomGameMsgView *msgView; -@property(nonatomic,copy) NSString *roomId; -@property(nonatomic,strong) MSRoomGameSendMsgView *sendMsgView; -///小游戏的容器 -@property(nonatomic,strong) MSRoomGameView *roomGameView; -@property(nonatomic,strong) WalletInfoModel *coinModel; -@property(nonatomic,assign) BOOL isShowResults; -@property (nonatomic, strong) MSRoomGameModel *roomGameModel; -@end - -@implementation MSRoomGameVC -- (MSRoomGamePresenter *)createPresenter { - return [[MSRoomGamePresenter alloc] init]; -} --(void)dealloc{ - [[NIMSDK sharedSDK].chatroomManager removeDelegate:self]; - [[NIMSDK sharedSDK].chatManager removeDelegate:self]; - [[NIMSDK sharedSDK].loginManager removeDelegate:self]; - [[NIMSDK sharedSDK].conversationManager removeDelegate:self]; - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} -- (void)viewDidLoad { - [super viewDidLoad]; - [self installUI]; - [self installConstraints]; - [[NIMSDK sharedSDK].chatroomManager addDelegate:self]; - [[NIMSDK sharedSDK].chatManager addDelegate:self]; - [[NIMSDK sharedSDK].loginManager addDelegate:self]; - [[NIMSDK sharedSDK].conversationManager addDelegate:self]; - [self getCoinNum]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(appDidBecomeActive) name:@"kAppDidBecomeActive" object:nil]; - [self networkReachability]; -} --(void)getCoinNum{ - [self.presenter getCoinNum]; -} --(void)installUI{ - [self.view addSubview:self.bgImageView]; - [self.view addSubview:self.headView]; - [self.view addSubview:self.msgView]; - [self.view addSubview:self.sendMsgView]; -} - --(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); - }]; - - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(22)); - make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(236)); - }]; - [self.sendMsgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(70)); - }]; - [self.msgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(101)); - make.bottom.equalTo(self.sendMsgView.mas_top).mas_offset(-kGetScaleWidth(10)); - }]; -} -- (BOOL)isHiddenNavBar { - return YES; -} --(void)appDidBecomeActive{ - [self.presenter getRoomGameDetailWithRoomType:@"0"]; -} -///网络监听 --(void)networkReachability{ - @kWeakify(self); - [[AFNetworkReachabilityManager sharedManager] startMonitoring]; - [[AFNetworkReachabilityManager sharedManager] setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) { - @kStrongify(self); - switch (status) { - case AFNetworkReachabilityStatusUnknown: - break; - case AFNetworkReachabilityStatusNotReachable: - break; - case AFNetworkReachabilityStatusReachableViaWWAN: - case AFNetworkReachabilityStatusReachableViaWiFi: - { - [self.presenter getRoomGameDetailWithRoomType:@"0"]; - } - break; - default: - break; - } - }]; -} - -#pragma mark -MSRoomGameViewDelegate -- (void)getGameRsultsWithList:(NSArray *)list{ - if(self.isShowResults == YES)return; - self.isShowResults = YES; - MSRoomGameVictoryView *victoryView = [[MSRoomGameVictoryView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - for (MSRoomGameResultsModel *obj in list) { - if([obj.uid isEqualToString:self.headView.mineModel.uid]){ - obj.avatar = self.headView.mineModel.avatar; - obj.nick = self.headView.mineModel.nick; - - } - if([obj.uid isEqualToString:self.headView.rivalModel.uid]){ - obj.avatar = self.headView.rivalModel.avatar; - obj.nick = self.headView.rivalModel.nick; - } - obj.winNum = obj.rank == 1 ? self.roomGameModel.data.scores.firstObject : self.roomGameModel.data.scores.lastObject; -// obj.winNum = obj.rank == 1 ? self.chooseGameModel.scores.firstObject : self.chooseGameModel.scores.lastObject; - } - victoryView.delegate = self; - victoryView.resultsList = list; - [TTPopup popupView:victoryView style:TTPopupStyleAlert]; - [self.presenter exitNIMRoom:self.roomId]; - [self.roomGameView handleSelfInExitEvent]; - [self.roomGameView destroyMG]; - [self.roomGameView removeFromSuperview]; - self.roomGameView = nil; - [self.headView setDataInNull]; -} -#pragma mark- MSRoomGameSendMsgViewDelegate -- (void)clickSendMsgAction{ - MSRoomGameSendTextView *sendTextView = [[MSRoomGameSendTextView alloc]initWithRoomId:self.roomId userInfo:self.userinfo]; - [self.view addSubview:sendTextView]; -} - -#pragma mark - MSRoomGameProtocol -- (void)getCoinNumSuccess:(WalletInfoModel *)model{ - self.coinModel = model; -} - --(void)getRoomGameDetailsSuccessWithModel:(MSRoomGameModel *)model{ - if(model == nil && - self.isShowResults == NO){ - [self quitGameActionWhenClose:YES]; - return; - } - self.headView.roomGameModel = model; - self.headView.userInfo = self.userinfo; - self.roomId = model.roomId; - [self enterNIMRoomWithRoomId:self.roomId]; -//#if DEBUG -// if(![self.roomId isEqualToString:model.roomId]){ -// [self.presenter exitNIMRoom:self.roomId]; -// self.roomId = model.roomId; -// [self enterNIMRoomWithRoomId:self.roomId]; -// } -// self.headView.roomGameModel = model; -// self.roomGameView.gameModel = model; -// if(self.roomGameView.superview == nil){ -// [self.bgImageView addSubview:self.roomGameView]; -// [self.roomGameView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.edges.equalTo(self.bgImageView); -// }]; -// [self.roomGameView onRoomEntered]; -// } -//// self.roomGameView.gameModel = model; -//// if(self.roomGameView.superview == nil){ -//// [self.bgImageView addSubview:self.roomGameView]; -//// [self.roomGameView mas_makeConstraints:^(MASConstraintMaker *make) { -//// make.edges.equalTo(self.bgImageView); -//// }]; -//// [self.roomGameView onRoomEntered]; -//// } -// return; -//#endif - if(model.data.matchStatus == MSRoomGameInfoModelMatchSuccessfully && - model.data.roundStatus == 0){ - self.roomGameView.gameModel = model; - if(self.roomGameView.superview == nil){ - [self.bgImageView addSubview:self.roomGameView]; - [self.roomGameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.bgImageView); - }]; - [self.roomGameView onRoomEntered]; - } - }else{ - [self.roomGameView handleSelfInExitEvent]; - [self.roomGameView destroyMG]; - [self.roomGameView removeFromSuperview]; - self.roomGameView = nil; - [self.headView setDataInNull]; - } -} - --(void)enterNIMRoomWithRoomId:(NSString *)roomUid{ - NIMChatroomMemberRequest *request = [[NIMChatroomMemberRequest alloc]init]; - request. roomId = [NSString stringWithFormat:@"%@", self.roomId]; - request. type = NIMChatroomFetchMemberTypeRegular; - [[NIMSDK sharedSDK]. chatroomManager fetchChatroomMembers:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - BOOL isEnterRoom = NO; - NSString *uid = [[AccountInfoStorage instance]getUid]; - for (NIMChatroomMember *obj in members) { - if([obj.userId isEqualToString:uid]){ - isEnterRoom = YES; - break; - } - } - if(isEnterRoom == NO){ - [self.presenter enterNIMRoom:roomUid user:self.userinfo]; - } - }]; -} -#pragma mark -MSRoomGameVictoryViewDelegate -- (void)closeGameAction{ - self.isShowResults = NO; - [self quitGameActionWhenClose:YES]; -} - --(void)rematchGameAction{ - self.isShowResults = NO; - if(self.coinModel.diamonds.integerValue < self.chooseGameModel.ticket.integerValue){ - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.message = YMLocalizedString(@"XPTreasureFairyViewController5"); - config.confirmButtonConfig.title = YMLocalizedString(@"XPTreasureFairyViewController6"); - [TTPopup alertWithConfig:config confirmHandler:^{ - XPIAPRechargeViewController * rechargeVC = [[XPIAPRechargeViewController alloc] init]; - rechargeVC.delegate = self; - [self.navigationController pushViewController:rechargeVC animated:YES]; - } cancelHandler:^{ - - }]; - return; - } - [self.presenter startMatchGameWithRoomId:@"" mgId:self.headView.roomGameModel.data.mgId gameMode:self.chooseGameModel.gameMode]; -} - --(void)startMatchGameSuccess{ - [self.presenter getRoomGameDetailWithRoomType:@"0"]; -} - -#pragma mark -XPIAPRechargeViewControllerDelegate --(void)paySuccess{ - [self getCoinNum]; -} -#pragma mark - MSRoomGameQuitGameViewDelegate -- (void)quitGameAction{ - [self quitGameActionWhenClose:YES]; -} - --(void)quitGameActionWhenClose:(BOOL)isColse{ - self.isShowResults = YES; - if(isColse == YES){ - [self.presenter closeRoomGameWithRoomId:self.roomId]; - } - [self.presenter exitNIMRoom:self.roomId]; - [self.roomGameView handleSelfInExitEvent]; - [self.roomGameView destroyMG]; - - if(self.headView.roomGameModel.data.matchStatus == MSRoomGameInfoModelMatchmaking){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"20.20.56_text_2")]; - } - - [self dismissViewControllerAnimated:YES completion:nil]; -} -#pragma mark -MSRoomGameHeadViewDelegate -- (void)clickQuitGameAction{ - MSRoomGameQuitGameView *quitGameView = [[MSRoomGameQuitGameView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - if(self.headView.roomGameModel.data.matchStatus == MSRoomGameInfoModelMatchmaking){ - quitGameView.text = YMLocalizedString(@"MSRoomGameQuitGameView5"); - } - quitGameView.delegate = self; - [TTPopup popupView:quitGameView style:TTPopupStyleAlert]; -} - -#pragma mark - NIMChatManagerDelegate -- (void)onRecvMessages:(NSArray *)messages { - for (NIMMessage * message in messages) { - NSLog(@" --- Game Message Raw Attach Content: %@, %@, %ld", @(message.senderClientType), message.rawAttachContent, (long)message.messageType); - // 非房间内消息不处理 - if (message.session.sessionType != NIMSessionTypeChatroom) { - continue; - } - if(![message.session.sessionId isEqualToString:self.roomId]){ - continue; - } - if (message.messageType == NIMMessageTypeNotification) { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - - if (![notiMsg.content isKindOfClass:[NIMChatroomNotificationContent class]]) { - return; - } - - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - switch (content.eventType) { - case NIMChatroomEventTypeEnter: - { - [self.msgView handleNIMNotificationMessage:message]; - break; - }; - - default: - break; - } - }else if (message.messageType == NIMMessageTypeText) { - [self.msgView handleNIMTextMessage:message]; - }else if (message.messageType == NIMMessageTypeCustom) { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel * attachment = (AttachmentModel *)obj.attachment; - if(attachment.first == CustomMessageType_Chat_Room_Game && attachment.second == Custom_Message_Sub_Room_Game_Match_Success){ - MSRoomGameModel *model = [MSRoomGameModel modelWithJSON:attachment.data]; - self.roomGameModel = model; - if(![self.roomId isEqualToString:model.roomId]){ - [self.presenter exitNIMRoom:self.roomId]; - self.roomId = model.roomId; - [self enterNIMRoomWithRoomId:self.roomId]; - } - self.headView.roomGameModel = model; - self.roomGameView.gameModel = model; - if(self.roomGameView.superview == nil){ - [self.bgImageView addSubview:self.roomGameView]; - [self.roomGameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.bgImageView); - }]; - [self.roomGameView onRoomEntered]; - } - }if(attachment.first == CustomMessageType_Chat_Room_Game && attachment.second == Custom_Message_Sub_Room_Game_Match_Fail){ - MSRoomGameQuitGameView *quitGameView = [[MSRoomGameQuitGameView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - quitGameView.delegate = self; - quitGameView.isNormalFail = YES; - [TTPopup popupView:quitGameView style:TTPopupStyleAlert]; - }if(attachment.first == CustomMessageType_Chat_Room_Game && attachment.second == Custom_Message_Sub_Room_Game_Early_Exit){ - if(self.isShowResults == YES)return; - self.isShowResults = YES; - NSArray *list = [MSRoomGameResultsModel modelsWithArray:attachment.data[@"results"]]; - MSRoomGameVictoryView *victoryView = [[MSRoomGameVictoryView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - victoryView.delegate = self; - victoryView.resultsList = list; - [TTPopup popupView:victoryView style:TTPopupStyleAlert]; - [self.presenter exitNIMRoom:self.roomId]; - [self.roomGameView handleSelfInExitEvent]; - [self.roomGameView destroyMG]; - [self.roomGameView removeFromSuperview]; - self.roomGameView = nil; - [self.headView setDataInNull]; - } - } - } - } -} -#pragma mark - NIMBroadcastDelegate - -//发送消息成功回调 -- (void)sendMessage:(NIMMessage *)message didCompleteWithError:(NSError *)error { - // 非本房间不处理 - if(![message.session.sessionId isEqualToString:self.roomId]){ - return;; - } - if (message.messageType == NIMMessageTypeText) { - [self.msgView handleNIMTextMessage:message]; - } -} - -#pragma mark - 懒加载 -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = kImage(@"ms_room_game_underwa_bg"); - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} -- (MSRoomGameHeadView *)headView{ - if(!_headView){ - _headView = [[MSRoomGameHeadView alloc]initWithFrame:CGRectZero]; - _headView.delegate = self; - _headView.chooseGameModel = self.chooseGameModel; - } - return _headView; -} -- (MSRoomGameMsgView *)msgView{ - if(!_msgView){ - _msgView = [[MSRoomGameMsgView alloc]initWithFrame:CGRectZero]; - } - return _msgView; -} -- (MSRoomGameSendMsgView *)sendMsgView{ - if(!_sendMsgView){ - _sendMsgView = [[MSRoomGameSendMsgView alloc]initWithFrame:CGRectZero]; - _sendMsgView.delegate = self; - } - return _sendMsgView; -} -- (MSRoomGameView *)roomGameView{ - if(!_roomGameView){ - _roomGameView = [[MSRoomGameView alloc]initWithFrame:CGRectZero]; - _roomGameView.delegate = self; - - } - return _roomGameView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.h b/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.h deleted file mode 100644 index 9310606..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// MSTabbarRoomGameVC.h -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MSTabbarRoomGameVC : MvpViewController - -@property (nonatomic, copy) void(^needForceExitRoom)(void); - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m b/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m deleted file mode 100644 index 0620911..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m +++ /dev/null @@ -1,190 +0,0 @@ -// -// MSTabbarRoomGameVC.m -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MSTabbarRoomGameVC.h" -#import "MSTabbarRoomGameHeadView.h" -#import "MSTabbarRoomGameView.h" -#import "MSTabbarBeginGameView.h" -#import "MSRoomGameVC.h" -#import "BaseNavigationController.h" -#import "MSRoomGamePresenter.h" -#import "MSRoomGameProtocol.h" -#import "XPIAPRechargeViewController.h" -#import "XPWebViewController.h" -#import "XPRoomHalfWebView.h" - -static const CGFloat kHeadViewTopMargin = 44.0; -static const CGFloat kGameViewTopMargin = 59.0; - -@interface MSTabbarRoomGameVC () - -@property(nonatomic,strong) MSTabbarRoomGameHeadView *headView; -@property(nonatomic,strong) MSTabbarRoomGameView *gameView; -@property(nonatomic,strong) MSTabbarRoomGameModel *gameModel; -@property(nonatomic,strong) MSTabbarRoomGameItemModel *chooseGameModel; - -@end - -@implementation MSTabbarRoomGameVC -- (MSRoomGamePresenter *)createPresenter { - return [[MSRoomGamePresenter alloc] init]; -} -- (void)viewWillAppear:(BOOL)animated{ - [super viewWillAppear:animated]; - if(self.gameModel == nil){ - [self.presenter getRoomGameConfig]; - } - [self.presenter getCoinNum]; - -} -- (void)viewDidLoad { - [super viewDidLoad]; - [self installUI]; - [self installConstraints]; - - [[NSNotificationCenter defaultCenter] addObserverForName:[ClientConfig shareConfig].reloadViewBackgroundColorKey - object:nil - queue:[NSOperationQueue mainQueue] - usingBlock:^(NSNotification * _Nonnull notification) { - self.view.backgroundColor = [[ClientConfig shareConfig] bgColor]; - }]; -} - --(void)installUI{ - self.view.backgroundColor = [[ClientConfig shareConfig] bgColor]; - [self setupTopTheme]; - - [self.view addSubview:self.headView]; - [self.view addSubview:self.gameView]; -} - -- (void)setupTopTheme { - __block UIImageView *theme = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, kGetScaleWidth(140))]; - theme.image = [[ClientConfig shareConfig] navigationAreaBG]; - theme.contentMode = UIViewContentModeScaleAspectFill; - [self.view addSubview:theme]; - - [[NSNotificationCenter defaultCenter] addObserverForName:[ClientConfig shareConfig].reloadNavigationAreaImageKey - object:nil - queue:[NSOperationQueue mainQueue] - usingBlock:^(NSNotification * _Nonnull notification) { - if ([notification.object isKindOfClass:[UIImage class]]) { - theme.image = (UIImage *)notification.object; - } - }]; -} - --(void)installConstraints{ - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(0)); - make.top.mas_equalTo(kStatusBarHeight); - make.height.mas_equalTo(kGetScaleWidth(kHeadViewTopMargin)); - }]; - [self.gameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.headView.mas_bottom).mas_offset(kGetScaleWidth(kGameViewTopMargin)); - make.leading.trailing.bottom.equalTo(self.view); - }]; -} -- (BOOL)isHiddenNavBar { - return YES; -} -#pragma mark - MSTabbarBeginGameViewDelegate -- (void)startMatchGameActionWithModel:(MSTabbarRoomGameItemModel *)model{ - if(self.headView.coinModel.diamonds.integerValue < model.ticket.integerValue){ - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.message = YMLocalizedString(@"XPTreasureFairyViewController5"); - config.confirmButtonConfig.title = YMLocalizedString(@"XPTreasureFairyViewController6"); - [TTPopup alertWithConfig:config confirmHandler:^{ - XPIAPRechargeViewController * rechargeVC = [[XPIAPRechargeViewController alloc] init]; - [self.navigationController pushViewController:rechargeVC animated:YES]; - } cancelHandler:^{ - - }]; - return; - } - [self.presenter startMatchGameWithRoomId:@"" - mgId:self.gameModel.mgId - gameMode:model.gameMode]; -} -///规则 --(void)clickRuleActionWithModel:(MSTabbarRoomGameItemModel *)model{ - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = model.ruleUrl; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; -} -#pragma mark - MSTabbarRoomGameHeadViewDelegate -- (void)clickPayAction{ - XPIAPRechargeViewController *iapVC = [XPIAPRechargeViewController new]; - [self.navigationController pushViewController:iapVC animated:YES]; -} -- (void)clickRankAction{ - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = URLWithType(kLUDOUrl); - [self.navigationController pushViewController:webVC animated:YES]; -} -#pragma mark -MSTabbarRoomGameViewDelegate --(void)chooseGameType:(MSTabbarRoomGameItemModel *)model{ - MSTabbarBeginGameView *beginGameView = [[MSTabbarBeginGameView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - beginGameView.itemModel = model; - beginGameView.delegate = self; - self.chooseGameModel = model; - [kWindow addSubview:beginGameView]; -} --(void)startMatchGameSuccess{ - [self.presenter getCoinNum]; - - MSRoomGameVC *gameVC = [MSRoomGameVC new]; - gameVC.chooseGameModel = self.chooseGameModel; - gameVC.userinfo = self.headView.userModel; - BaseNavigationController *nav = [[BaseNavigationController alloc]initWithRootViewController:gameVC]; - nav.modalPresentationStyle = UIModalPresentationFullScreen; - [self presentViewController:nav animated:YES completion:nil]; - - UIViewPropertyAnimator *animator = [[UIViewPropertyAnimator alloc] initWithDuration:0.3 curve:UIViewAnimationCurveEaseInOut animations:^{ - nav.view.alpha = 1.0; - }]; - [animator startAnimation]; -} - -- (void)forceExitRoom NS_REFINED_FOR_SWIFT { - if (_needForceExitRoom) { - _needForceExitRoom(); - @kWeakify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self startMatchGameActionWithModel:self.chooseGameModel]; - }); - } -} - -#pragma mark - MSRoomGameProtocol -///得到金币数量 --(void)getCoinNumSuccess:(WalletInfoModel *)model{ - self.headView.coinModel= model; -} --(void)getRoomGameConfigSuccessWithUser:(UserInfoModel *)user gameModel:(MSTabbarRoomGameModel *)gameModel{ - self.headView.userModel = user; - self.gameView.gameModel = gameModel; - self.gameModel = gameModel; - -} -#pragma mark - 懒加载 -- (MSTabbarRoomGameHeadView *)headView{ - if(!_headView){ - _headView = [[MSTabbarRoomGameHeadView alloc]initWithFrame:CGRectZero]; - _headView.delegate = self; - } - return _headView; -} -- (MSTabbarRoomGameView *)gameView{ - if(!_gameView){ - _gameView = [[MSTabbarRoomGameView alloc]initWithFrame:CGRectZero]; - _gameView.delegate = self; - } - return _gameView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.h deleted file mode 100644 index 61c6f48..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MSRoomGameHeadAvatarView.h -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface MSRoomGameHeadAvatarView : UIView -@property(nonatomic,copy) NSString *__nullable imageUrl; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.m deleted file mode 100644 index 116f02f..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.m +++ /dev/null @@ -1,65 +0,0 @@ -// -// MSRoomGameHeadAvatarView.m -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MSRoomGameHeadAvatarView.h" -@interface MSRoomGameHeadAvatarView() -@property(nonatomic,strong) NetImageView *avatarView; -@property(nonatomic,strong) UIImageView *borderView; - -@end -@implementation MSRoomGameHeadAvatarView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.avatarView]; - [self.avatarView addSubview:self.borderView]; - -} --(void)installConstraints{ - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.borderView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.avatarView); - }]; - -} --(void)setImageUrl:(NSString *__nullable)imageUrl{ - _imageUrl = imageUrl; - if(_imageUrl == nil){ - _avatarView.imageUrl = nil; - return; - } - _avatarView.imageUrl = imageUrl; -} -#pragma mark - 懒加载 -- (NetImageView *)avatarView{ - if(!_avatarView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarView = [[NetImageView alloc]initWithConfig:config]; - _avatarView.layer.cornerRadius = kGetScaleWidth(57)/2; - _avatarView.layer.masksToBounds = YES; - } - return _avatarView; -} -- (UIImageView *)borderView{ - if(!_borderView){ - _borderView = [UIImageView new]; - _borderView.image = kImage(@"ms_room_game_underwa_border"); - } - return _borderView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.h deleted file mode 100644 index fe8c8b5..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// MSRoomGameHeadView.h -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import -#import "MSRoomGameModel.h" -#import "MSTabbarRoomGameModel.h" -#import "UserInfoModel.h" -NS_ASSUME_NONNULL_BEGIN -@protocol MSRoomGameHeadViewDelegate - -- (void)clickQuitGameAction; - -@end -@interface MSRoomGameHeadView : UIView -@property(nonatomic,copy) NSString *gainProfit; -@property(nonatomic,weak) iddelegate; -@property(nonatomic,strong) MSRoomGameModel *__nullable roomGameModel; -@property(nonatomic,strong) MSTabbarRoomGameItemModel *chooseGameModel; -@property(nonatomic,strong) HomePlayMicUserModel *mineModel; -@property(nonatomic,strong) HomePlayMicUserModel *rivalModel; -@property(nonatomic,strong) UserInfoModel *userInfo; --(void)setDataInNull; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.m deleted file mode 100644 index f535dbc..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.m +++ /dev/null @@ -1,239 +0,0 @@ -// -// MSRoomGameHeadView.m -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MSRoomGameHeadView.h" -#import "MSRoomGameHeadAvatarView.h" -#import "HomePlayRoomModel.h" -@interface MSRoomGameHeadView() - -@property(nonatomic,strong) NetImageView *topImageView; -@property(nonatomic,strong) UIButton *backBtn; -@property(nonatomic,strong) UILabel *titleView; -@property(nonatomic,strong) UIImageView *pkImageView; -@property(nonatomic,strong) MSRoomGameHeadAvatarView *mineView; -@property(nonatomic,strong) MSRoomGameHeadAvatarView *rivalView; -@property(nonatomic,strong) UILabel *hintView; -@property(nonatomic,strong) UIImageView *bgCoinView; -@property(nonatomic,strong) UIImageView *coinView; -@property(nonatomic,strong) UILabel *coinNumView; -@end -@implementation MSRoomGameHeadView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.topImageView]; - [self addSubview:self.backBtn]; - [self addSubview:self.titleView]; - [self addSubview:self.pkImageView]; - [self addSubview:self.mineView]; - [self addSubview:self.rivalView]; - [self addSubview:self.hintView]; - [self addSubview:self.bgCoinView]; - [self addSubview:self.coinView]; - [self.bgCoinView addSubview:self.coinNumView]; -} --(void)installConstraints{ - [self.topImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(0); - make.width.mas_equalTo(kGetScaleWidth(90)); - make.height.mas_equalTo(kGetScaleWidth(80)); - make.leading.mas_equalTo(kGetScaleWidth(5)); - }]; - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(21)); - make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.top.equalTo(self.topImageView.mas_top).mas_offset(kGetScaleWidth(22)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.backBtn.mas_bottom).offset(-kGetScaleWidth(9)); - make.centerX.equalTo(self); - }]; - [self.pkImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.titleView.mas_bottom).mas_offset(kGetScaleWidth(12)); - make.width.mas_equalTo(kGetScaleWidth(60)); - make.height.mas_equalTo(kGetScaleWidth(53)); - make.centerX.equalTo(self); - }]; - [self.rivalView mas_makeConstraints:^(MASConstraintMaker *make) { - - make.width.height.mas_equalTo(kGetScaleWidth(57)); - make.centerY.equalTo(self.pkImageView); - - make.leading.equalTo(self.pkImageView.mas_trailing).offset(-kGetScaleWidth(5)); - }]; - [self.mineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(self.rivalView); - make.trailing.equalTo(self.rivalView.mas_leading).mas_offset(-kGetScaleWidth(52)); - }]; - - [self.hintView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.mineView.mas_bottom).mas_offset(kGetScaleWidth(10)); - make.leading.trailing.equalTo(self).inset(kGetScaleWidth(10)); - - }]; - - [self.bgCoinView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(21)); - make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(81)); - make.height.mas_equalTo(kGetScaleWidth(25)); - make.top.equalTo(self.topImageView.mas_bottom).mas_offset(kGetScaleWidth(66)); - }]; - [self.coinView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(26)); - make.leading.equalTo(self.bgCoinView.mas_leading).mas_offset(kGetScaleWidth(0)); - make.centerY.equalTo(self.bgCoinView); - }]; - [self.coinNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(40)); - make.trailing.mas_equalTo(-kGetScaleWidth(22)); - make.centerY.equalTo(self.bgCoinView); - }]; -} -- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event { - for (NSInteger i = (self.subviews.count - 1) ; i >= 0 ; i--) { - UIView * subView = [self.subviews xpSafeObjectAtIndex:i]; - CGPoint convertPoint = [subView convertPoint:point fromView:self]; - if (CGRectContainsPoint(subView.bounds, convertPoint)) { - return [subView hitTest:convertPoint withEvent:event]; - } - } - return nil; -} --(void)clickBackBtnAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(clickQuitGameAction)]){ - [self.delegate clickQuitGameAction]; - } -} --(void)setChooseGameModel:(MSTabbarRoomGameItemModel *)chooseGameModel{ - _chooseGameModel = chooseGameModel; - id coin = _chooseGameModel.scores.firstObject; - if(coin != nil){ - self.coinNumView.text = [NSString stringWithFormat:@"%@",coin]; - NSMutableAttributedString *attText = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:YMLocalizedString(@"MSRoomGameHeadView2"),self.coinNumView.text] attributes:@{NSFontAttributeName:kFontMedium(14),NSForegroundColorAttributeName:[UIColor whiteColor]}]; - [attText addAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0xFF6629)} range:[attText.string rangeOfString:[NSString stringWithFormat:YMLocalizedString(@"MSRoomGameHeadView3"),self.coinNumView.text]]]; - _hintView.attributedText = attText; - } -} --(void)setDataInNull{ - self.titleView.text = YMLocalizedString(@"MSRoomGameHeadView0"); - self.rivalView.imageUrl = nil; -} -- (void)setRoomGameModel:(MSRoomGameModel *__nullable)roomGameModel{ - _roomGameModel = roomGameModel; - - if(_roomGameModel == nil){ - return; - } - NSString *uid = [[AccountInfoStorage instance]getUid]; - for (MSRoomGameMicModel *obj in _roomGameModel.roomMics) { - if(![obj.micUser.uid isEqualToString:uid]){ - self.rivalModel = obj.micUser; - self.rivalView.imageUrl = obj.micUser.avatar; - } - } - - MSRoomGameInfoModel *data = _roomGameModel.data; - if(data != nil){ - _topImageView.imageUrl = data.gameRoomIcon; - if (data.matchStatus == MSRoomGameInfoModelMatchmaking){ - _titleView.text = YMLocalizedString(@"MSRoomGameHeadView0"); - }else if(data.matchStatus == MSRoomGameInfoModelMatchSuccessfully){ - _titleView.text = YMLocalizedString(@"MSRoomGameHeadView1"); - } - } -} -- (void)setUserInfo:(UserInfoModel *)userInfo{ - _userInfo = userInfo; - HomePlayMicUserModel *mineModel = [HomePlayMicUserModel new]; - mineModel.uid = @(_userInfo.uid).stringValue; - mineModel.nick = _userInfo.nick; - mineModel.avatar = _userInfo.avatar; - self.mineView.imageUrl = mineModel.avatar; - self.mineModel = mineModel; -} -#pragma mark - 懒加载 -- (NetImageView *)topImageView{ - if(!_topImageView){ - _topImageView = [NetImageView new]; - } - return _topImageView; -} -- (UIButton *)backBtn{ - if(!_backBtn){ - _backBtn = [UIButton new]; - [_backBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_backBtn setImage:kImage(@"ms_room_game_underwa_back_icon") forState:UIControlStateNormal]; - [_backBtn addTarget:self action:@selector(clickBackBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"MSRoomGameHeadView0") font:kFontBold(18) textColor:[UIColor whiteColor]]; - } - return _titleView; -} -- (MSRoomGameHeadAvatarView *)mineView{ - if(!_mineView){ - _mineView = [[MSRoomGameHeadAvatarView alloc]initWithFrame:CGRectZero]; - } - return _mineView; -} -- (UIImageView *)pkImageView{ - if(!_pkImageView){ - _pkImageView = [UIImageView new]; - _pkImageView.image = kImage(@"ms_room_game_underwa_pk_bg"); - } - return _pkImageView; -} -- (MSRoomGameHeadAvatarView *)rivalView{ - if(!_rivalView){ - _rivalView = [[MSRoomGameHeadAvatarView alloc]initWithFrame:CGRectZero]; - } - return _rivalView; -} -- (UILabel *)hintView{ - if(!_hintView){ - _hintView = [UILabel new]; - - _hintView.numberOfLines = 0; - _hintView.textAlignment = NSTextAlignmentCenter; - } - return _hintView; -} -- (UIImageView *)bgCoinView{ - if(!_bgCoinView){ - _bgCoinView = [UIImageView new]; - _bgCoinView.backgroundColor = UIColorRGBAlpha(0x006263, 0.4); - _bgCoinView.layer.cornerRadius = kGetScaleWidth(25)/2; - _bgCoinView.layer.masksToBounds = YES; - _bgCoinView.layer.borderWidth = 1; - _bgCoinView.layer.borderColor = UIColorRGBAlpha(0x36c0c8 , 0.4).CGColor; - } - return _bgCoinView; -} -- (UIImageView *)coinView{ - if(!_coinView){ - _coinView = [UIImageView new]; - _coinView.image = kImage(@"moli_money_icon"); - } - return _coinView; -} -- (UILabel *)coinNumView{ - if(!_coinNumView){ - _coinNumView = [UILabel labelInitWithText:@"0" font:kFontBold(17) textColor:[UIColor whiteColor]]; - } - return _coinNumView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.h deleted file mode 100644 index 2b164d8..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// MSRoomGameMsgView.h -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import -#import -#import "UserInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MSRoomGameMsgView : UIView -@property(nonatomic,strong) UserInfoModel *userInfo; -- (void)handleNIMNotificationMessage:(NIMMessage *)message; -- (void)handleNIMTextMessage:(NIMMessage *)message; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.m deleted file mode 100644 index 83f99b3..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.m +++ /dev/null @@ -1,322 +0,0 @@ -// -// MSRoomGameMsgView.m -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MSRoomGameMsgView.h" -///Third -#import - - -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "XPRoomMessageConstant.h" -#import "XPRoomMessageParser.h" -#import "AccountInfoStorage.h" -#import "XPRoomMiniManager.h" -#import "PLTimeUtil.h" -#import "ClientConfig.h" -#import -#import "ThemeColor+Room.h" -#import "NSArray+Safe.h" -#import "Api+Room.h" -#import "Api+Message.h" -#import "XPMessageRemoteExtModel.h" -///Model -#import "RoomInfoModel.h" -#import "AttachmentModel.h" -#import "RoomFaceSendInfoModel.h" -#import "XPMessageRemoteExtModel.h" -#import "RoomPKChooseUserModel.h" -#import "CandyTreeResultModel.h" -#import "RoomSailingPrizeModel.h" -#import "UserInfoModel.h" -#import "XPMessageInfoModel.h" -#import "GiftReceiveInfoModel.h" -#import "XPGiftStorage.h" -///View -#import "XPRoomMessageTableViewCell.h" -#import "XPRoomMessageHeaderView.h" -#import "XPRoomMessageHeaderView.h" -#import "PIRoomMessagePhotoAlbumCell.h" -#import "PIRoomMessageUnlockPhotoAlbumView.h" -#import "PIRoomPhotoAlbumItemModel.h" -#import "SDPhotoBrowser.h" -#import "XPSkillCardPlayerManager.h" - -@interface MSRoomGameMsgView() -///房间的代理 -@property (nonatomic,copy)NSString *roomUid; -///列表 -@property (nonatomic,strong) UITableView *messageTableView; -///头部 -@property (nonatomic,strong) XPRoomMessageHeaderView *headerView; - -///messageView 持有这个工具类 进行数据的分发操作 -@property (nonatomic,strong) XPRoomMessageParser *messageParser; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -@property(nonatomic,assign) BOOL isLoadHistoryMessage; -@end -@implementation MSRoomGameMsgView - -- (void)dealloc { - -} --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - 懒加载 - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self; -} -- (void)showUserCard:(NSInteger)uid{ - [self.messageParser showUserCard:uid]; -} -#pragma mark - Response - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.messageTableView]; - self.messageTableView.tableHeaderView = self.headerView; -} - -- (void)initSubViewConstraints { - - [self.messageTableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(kGetScaleWidth(15)); - make.bottom.trailing.mas_equalTo(self); - make.top.mas_equalTo(kGetScaleWidth(10)); - }]; -} - -#pragma mark - 添加数据并且做自动滚动 -///执行插入动画并滚动 -- (void)scrollToBottom:(BOOL)animated { - if(self.datasource.count > 0){ - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - NSIndexPath *ip = [NSIndexPath indexPathForRow:self.datasource.count-1 inSection:0]; //取最后一行数据 - [self.messageTableView scrollToRowAtIndexPath:ip atScrollPosition:UITableViewScrollPositionBottom animated:animated]; //滚动到最后一行 - }); - } -} - --(void)addRoomMessage:(NIMMessage *)msg{ - [self.datasource addObject:[self.messageParser parseMessageAttributeForChatHall:msg]]; - [self.messageTableView reloadData]; - [self scrollToBottom:YES]; -} -- (void)addCustomMessage:(NSNotification *)notification { - NIMMessage * message = notification.object; - [self addRoomMessage:message]; -} - -#pragma mark - RoomGuestDelegate -- (void)handleNIMCustomAttachment:(AttachmentModel *)attachment{ - -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - - if (content.eventType == NIMChatroomEventTypeEnter) { - NIMChatroomNotificationMember *member = content.targets[0]; - if (member.userId.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - ///自己进房成功后拉取历史消息 - if(self.datasource.count > 0) - { - self.isLoadHistoryMessage = NO; - return; - } - [self handleFetchHistoryMessage]; - } else { - self.isLoadHistoryMessage = NO; - } - } -} - -- (void)handleFetchHistoryMessage{ - NSString *roomId = self.roomUid; - NIMHistoryMessageSearchOption *option = [[NIMHistoryMessageSearchOption alloc] init]; - option.limit = 100; - option.startTime = 0; - option.order = NIMMessageSearchOrderAsc; - option.messageTypes = @[@(NIMMessageTypeText)]; - [[NIMSDK sharedSDK].chatroomManager fetchMessageHistory:roomId option:option result:^(NSError * _Nullable error, NSArray * _Nullable messages) { - if(error != nil){ - self.isLoadHistoryMessage = NO; - } - - //如果拉取的数量等于请求的数量，说明这个时间点以后的消息数量大于等于需要拉取的数量，直接拉取最新的50条 - if (messages.count == 100) { - NIMHistoryMessageSearchOption *option = [[NIMHistoryMessageSearchOption alloc] init]; - option.limit = 100; - option.order = NIMMessageSearchOrderDesc; - option.messageTypes = @[@(NIMMessageTypeText)]; - [[NIMSDK sharedSDK].chatroomManager fetchMessageHistory:roomId option:option result:^(NSError * _Nullable error, NSArray * _Nullable messages) { - if(error != nil){ - self.isLoadHistoryMessage = NO; - } - dispatch_async(dispatch_get_main_queue(), ^{///回到主线程 - if (self.datasource.count > kRoomMessageMaxLength) { - NSIndexSet *set = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, kRoomMessageMaxLength/2)]; - NSArray *needRemoveMsgArray = [self.datasource objectsAtIndexes:set]; - [self.datasource removeObjectsInArray:needRemoveMsgArray]; - } - // 执行插入 - for (NIMMessage *item in messages.reverseObjectEnumerator) { - [self dealWithHistoryDataWithMessage:item]; - - } - [self.messageTableView reloadData]; - //执行插入动画并滚动 - [self scrollToBottom:YES]; - self.isLoadHistoryMessage = NO; - - - }); - }]; - return; - } - dispatch_async(dispatch_get_main_queue(), ^{///回到主线程 - if (self.datasource.count > kRoomMessageMaxLength) { - NSIndexSet *set = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, kRoomMessageMaxLength/2)]; - NSArray *needRemoveMsgArray = [self.datasource objectsAtIndexes:set]; - [self.datasource removeObjectsInArray:needRemoveMsgArray]; - } - // 执行插入 - for (NIMMessage *item in messages) { - [self dealWithHistoryDataWithMessage:item]; - } - - [self.messageTableView reloadData]; - //执行插入动画并滚动 - [self scrollToBottom:YES]; - self.isLoadHistoryMessage = NO; - }); - }]; -} --(void)dealWithHistoryDataWithMessage:(NIMMessage *)item{ - BOOL isHaveSave = NO; - if(item.messageType == NIMMessageTypeText){ - isHaveSave = YES; - } - if(isHaveSave == NO)return; - [self.datasource addObject:[self.messageParser parseMessageAttributeForChatHall:item]]; -} -- (void)handleNIMTextMessage:(NIMMessage *)message { - [self addRoomMessage:message]; -} - -- (void)onRoomEntered { - self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2); -} - -- (void)onRoomUpdate { - ///改变公屏的背景样式 - self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2); -} - - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPMessageInfoModel* attr = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - - XPRoomMessageTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomMessageTableViewCell class])]; - cell.delegate = self; - cell.messageInfo = attr; - - return cell; -} - - -#pragma mark - XPRoomMessageTableViewCellDelegate -- (void)xPRoomMessageTableViewCellDidTapEmpty:(XPRoomMessageTableViewCell *)view { - -} - -- (void)sendCustomMessage:(AttachmentModel *)attachment { - - NSString *sessionID = self.roomUid; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - - UserInfoModel *userInfo = self.userInfo; - XPMessageRemoteExtModel *extModel = [[XPMessageRemoteExtModel alloc] init]; - extModel.androidBubbleUrl = userInfo.androidBubbleUrl; - extModel.iosBubbleUrl = userInfo.iosBubbleUrl; - extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; - extModel.platformRole = userInfo.platformRole; - NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[NSString stringWithFormat:@"%ld", userInfo.uid]]; - message.remoteExt = remoteExt; - NIMSessionType sessionType = NIMSessionTypeChatroom; - //构造会话 - NIMSession *session = [NIMSession session:sessionID type:sessionType]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; -} - - - -#pragma mark - Getters And Setters -- (UITableView *)messageTableView { - if (!_messageTableView) { - _messageTableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _messageTableView.delegate = self; - _messageTableView.dataSource = self; - _messageTableView.clipsToBounds = NO; - _messageTableView.tableFooterView = [UIView new]; - _messageTableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _messageTableView.backgroundColor = [UIColor clearColor]; - _messageTableView.showsVerticalScrollIndicator = NO; - _messageTableView.tag = 666; - if (@available(iOS 11.0, *)) { - _messageTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_messageTableView registerClass:[XPRoomMessageTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomMessageTableViewCell class])]; - } - return _messageTableView; -} - -- (XPRoomMessageHeaderView *)headerView { - if (!_headerView) { - _headerView = [[XPRoomMessageHeaderView alloc] init]; - } - return _headerView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -- (XPRoomMessageParser *)messageParser { - if (!_messageParser) { - _messageParser = [[XPRoomMessageParser alloc] init]; - } - return _messageParser; -} - - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.h deleted file mode 100644 index c7ad68f..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// MSRoomGameQuitGameView.h -// YuMi -// -// Created by duoban on 2024/5/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class MSTabbarRoomGameItemModel; -@protocol MSRoomGameQuitGameViewDelegate -@optional -///退出游戏 -- (void)quitGameAction; -///继续游戏 --(void)rematchGameAction; -///强杀app打开后,是否重新玩游戏 --(void)replayTheGameWithModel:(MSTabbarRoomGameItemModel *)model; -///强杀app打开后,退出游戏 -- (void)closeGameActionWithModel:(MSTabbarRoomGameItemModel *)model; -@end -@interface MSRoomGameQuitGameView : UIView -@property(nonatomic,copy) NSString *text; -@property(nonatomic,strong) MSTabbarRoomGameItemModel *chooseGameModel; -@property(nonatomic,assign) BOOL isNormalFail; -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.m deleted file mode 100644 index bb7ce95..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.m +++ /dev/null @@ -1,142 +0,0 @@ -// -// MSRoomGameQuitGameView.m -// YuMi -// -// Created by duoban on 2024/5/28. -// - -#import "MSRoomGameQuitGameView.h" -@interface MSRoomGameQuitGameView() -@property(nonatomic,strong) UIView *bgView; -@property(nonatomic,strong) UILabel *titleView; -@property(nonatomic,strong) UIButton *quitBtn; -@property(nonatomic,strong) UIButton *resumeBtn; -@end -@implementation MSRoomGameQuitGameView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.quitBtn]; - [self.bgView addSubview:self.resumeBtn]; -} --(void)installConstraints{ - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(290)); - make.height.mas_greaterThanOrEqualTo(kGetScaleWidth(182)); - make.center.equalTo(self); - }]; - [self.quitBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(120)); - make.height.mas_equalTo(kGetScaleWidth(38)); - make.leading.mas_equalTo(kGetScaleWidth(15)); - make.bottom.mas_equalTo(-kGetScaleWidth(15)); - }]; - [self.resumeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(self.quitBtn); - make.trailing.mas_equalTo(-kGetScaleWidth(15)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(33)); - make.bottom.mas_equalTo(-kGetScaleWidth(88)); - make.top.mas_equalTo(kGetScaleWidth(48)); - }]; -} --(void)setText:(NSString *)text{ - _text = text; - _titleView.text = _text; -} --(void)setChooseGameModel:(MSTabbarRoomGameItemModel *)chooseGameModel{ - _chooseGameModel = chooseGameModel; - - _titleView.text = YMLocalizedString(@"MSRoomGameQuitGameView4"); - -} -- (void)setIsNormalFail:(BOOL)isNormalFail{ - _isNormalFail = isNormalFail; - _titleView.text = YMLocalizedString(@"MSRoomGameQuitGameView3"); - [_resumeBtn setTitle:YMLocalizedString(@"MSRoomGameVictoryView0") forState:UIControlStateNormal]; -} --(void)qutiBtnAction{ - [TTPopup dismiss]; - if(self.chooseGameModel != nil){ - if(self.delegate && [self.delegate respondsToSelector:@selector(closeGameActionWithModel:)]){ - [self.delegate closeGameActionWithModel:self.chooseGameModel]; - } - return; - } - - if(self.delegate && [self.delegate respondsToSelector:@selector(quitGameAction)]){ - [self.delegate quitGameAction]; - } -} --(void)resumeBtnAction{ - [TTPopup dismiss]; - if(self.chooseGameModel != nil){ - if(self.delegate && [self.delegate respondsToSelector:@selector(replayTheGameWithModel:)]){ - [self.delegate replayTheGameWithModel:self.chooseGameModel]; - } - return; - } - if(self.isNormalFail == NO)return; - if(self.delegate && [self.delegate respondsToSelector:@selector(rematchGameAction)]){ - [self.delegate rematchGameAction]; - } -} -#pragma mark - 懒加载 -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - _bgView.layer.cornerRadius = kGetScaleWidth(15); - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"MSRoomGameQuitGameView0") font:kFontBold(16) textColor:UIColorFromRGB(0x333333)]; - _titleView.textAlignment = NSTextAlignmentCenter; - _titleView.numberOfLines = 0; - } - return _titleView; -} -- (UIButton *)quitBtn{ - if(!_quitBtn){ - _quitBtn = [UIButton new]; - [_quitBtn setTitle:YMLocalizedString(@"MSRoomGameQuitGameView1") forState:UIControlStateNormal]; - [_quitBtn setTitleColor:UIColorFromRGB(0x999999) forState:UIControlStateNormal]; - _quitBtn.titleLabel.font = kFontBold(14); - _quitBtn.layer.cornerRadius = kGetScaleWidth(38)/2; - _quitBtn.layer.masksToBounds = YES; - _quitBtn.backgroundColor = UIColorFromRGB(0xF5F5F5); - [_quitBtn addTarget:self action:@selector(qutiBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _quitBtn; -} -- (UIButton *)resumeBtn{ - if(!_resumeBtn){ - _resumeBtn = [UIButton new]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x53C7D4),UIColorFromRGB(0x7C5EFD)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(120), kGetScaleWidth(38))]; - [_resumeBtn setBackgroundImage:image forState:UIControlStateNormal]; - [_resumeBtn setTitle:YMLocalizedString(@"MSRoomGameQuitGameView2") forState:UIControlStateNormal]; - [_resumeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _resumeBtn.titleLabel.font = kFontBold(14); - _resumeBtn.layer.cornerRadius = kGetScaleWidth(38)/2; - _resumeBtn.layer.masksToBounds = YES; - _resumeBtn.titleLabel.numberOfLines = 2; - _resumeBtn.titleLabel.textAlignment = NSTextAlignmentCenter; - [_resumeBtn addTarget:self action:@selector(resumeBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _resumeBtn; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendMsgView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendMsgView.h deleted file mode 100644 index 8de8028..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendMsgView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// MSRoomGameSendMsgView.h -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@protocol MSRoomGameSendMsgViewDelegate - -- (void)clickSendMsgAction; - -@end -@interface MSRoomGameSendMsgView : UIView -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendMsgView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendMsgView.m deleted file mode 100644 index f9b407c..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendMsgView.m +++ /dev/null @@ -1,63 +0,0 @@ -// -// MSRoomGameSendMsgView.m -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MSRoomGameSendMsgView.h" -@interface MSRoomGameSendMsgView() -@property(nonatomic,strong) UIButton *sendBtn; -@property(nonatomic,strong) UILabel *titleView; -@end -@implementation MSRoomGameSendMsgView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.backgroundColor = [UIColor colorWithWhite:1 alpha:0.2]; - [self setCornerWithLeftTopCorner:kGetScaleWidth(23) rightTopCorner:kGetScaleWidth(23) bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth, kGetScaleWidth(70))]; - [self addSubview:self.sendBtn]; - [self.sendBtn addSubview:self.titleView]; -} --(void)installConstraints{ - [self.sendBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(28)); - make.width.height.mas_equalTo(kGetScaleWidth(300)); - make.top.mas_equalTo(kGetScaleWidth(16)); - make.centerX.equalTo(self); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(22)); - make.centerY.equalTo(self.sendBtn); - }]; -} --(void)clickSendBtnAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(clickSendMsgAction)]){ - [self.delegate clickSendMsgAction]; - } -} -#pragma mark - 懒加载 -- (UIButton *)sendBtn{ - if(!_sendBtn){ - _sendBtn = [UIButton new]; - _sendBtn.backgroundColor = UIColorRGBAlpha(0x0B032D , 0.1); - _sendBtn.layer.cornerRadius = kGetScaleWidth(28)/2; - _sendBtn.layer.masksToBounds = YES; - [_sendBtn addTarget:self action:@selector(clickSendBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _sendBtn; -} --(UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"XPRoomMenuContainerView2") font:kFontMedium(10) textColor:[UIColor whiteColor]]; - } - return _titleView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.h deleted file mode 100644 index 7107cd9..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MSRoomGameSendTextView.h -// YuMi -// -// Created by duoban on 2024/5/30. -// - -#import -#import "UserInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MSRoomGameSendTextView : UIView -///输入框 -@property (nonatomic, strong, readonly) UITextField *editTextFiled; --(void)showInputView:(NSString *)text; -- (instancetype)initWithRoomId:(NSString *)roomId userInfo:(UserInfoModel *)userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.m deleted file mode 100644 index 4f06c78..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.m +++ /dev/null @@ -1,273 +0,0 @@ -// -// MSRoomGameSendTextView.m -// YuMi -// -// Created by duoban on 2024/5/30. -// -#import -#import -#import "NSObject+MJExtension.h" -#import -///Tool -#import "ThemeColor+Room.h" -#import "UIImage+Utils.h" -#import "AccountInfoStorage.h" -///Model -#import "XPMessageRemoteExtModel.h" -#import "UserInfoModel.h" -#import "RoomInfoModel.h" -#import "ClientConfig.h" -#import "MSRoomGameSendTextView.h" -#import "MSRoomGameSendTextView.h" -//公屏限制最大字数 -#define MAX_STARWORDS_LENGTH 300 -@interface MSRoomGameSendTextView() -///输入框 -@property (nonatomic, strong) MSBaseTextField *editTextFiled; -@property (nonatomic, strong) UIView *bgEditTextFiled; -///发送按钮 -@property (nonatomic, strong) UIButton *sendButton; -///文本输入的内容 -@property (nonatomic,copy) NSString *inputMessage; -@property(nonatomic,strong) UserInfoModel * userInfo; -@property(nonatomic,copy) NSString *roomId; - -@end -@implementation MSRoomGameSendTextView -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (instancetype)initWithRoomId:(NSString *)roomId userInfo:(UserInfoModel *)userInfo { - self = [super initWithFrame:CGRectMake(0, KScreenHeight - 60, KScreenWidth, 60)]; - if (self) { - self.roomId = roomId; - self.userInfo = userInfo; - [self addNotification]; - [self initSubViews]; - [self initSubViewConstraints]; - [IQKeyboardManager sharedManager].enable = NO; - [self.editTextFiled becomeFirstResponder]; - } - return self; -} - -#pragma mark - Response - -- (void)sendButtonDidClick:(UIButton *)sender { - UserInfoModel * userInfo = self.userInfo; - XPMessageRemoteExtModel *extModel = [[XPMessageRemoteExtModel alloc] init]; - extModel.defUser = userInfo.defUser; - extModel.erbanNo = userInfo.erbanNo; - extModel.carName = userInfo.carName; - extModel.inRoomNameplatePic = userInfo.nameplatePic; - extModel.inRoomNameplateWord = userInfo.nameplateWord; - extModel.isCustomWord = userInfo.isCustomWord; - extModel.charmUrl = userInfo.userLevelVo.charmUrl; - extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq; - extModel.experUrl = userInfo.userLevelVo.experUrl; - extModel.newUser = userInfo.newUser; - extModel.vipIcon = userInfo.userVipInfoVO.nameplateUrl; - extModel.androidBubbleUrl = userInfo.androidBubbleUrl; - extModel.iosBubbleUrl = userInfo.iosBubbleUrl; - extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; - extModel.platformRole = userInfo.platformRole; - extModel.nick = userInfo.nick; - - NIMMessage * message = [[NIMMessage alloc] init]; - message.text = self.inputMessage; - NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[AccountInfoStorage instance].getUid]; - message.remoteExt = remoteExt; - - ///网易易盾 拦截高风险 -// NIMAntiSpamOption *option = [[NIMAntiSpamOption alloc]init]; -// option.yidunEnabled = YES; -// option.businessId = KeyWithType(keyType_YiDunBussinessId); -// message.antiSpamOption = option; - NSString * sessionId = self.roomId; - //构造会话 - self.sendButton.enabled = NO; - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - self.editTextFiled.text = @""; - [self.editTextFiled resignFirstResponder]; - self.inputMessage = nil; - }]; -} - -- (void)keyboardWillShow:(NSNotification *)notification { - [self.superview bringSubviewToFront:self]; - NSDictionary *info = [notification userInfo]; - NSValue *value = [info objectForKey:UIKeyboardFrameEndUserInfoKey]; - CGFloat keyBoardEndY = value.CGRectValue.origin.y; - NSNumber *curve = [info objectForKey:UIKeyboardAnimationCurveUserInfoKey]; - CGFloat duration = [[info objectForKey:UIKeyboardAnimationDurationUserInfoKey] floatValue]; - CGRect endKeyboardRect = [[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]; - CGFloat h = endKeyboardRect.size.height; - [UIView animateWithDuration:duration animations:^{ - if(self.superview){ - [self mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.superview); - make.height.equalTo(@60); - make.bottom.equalTo(self.superview).offset(-h); - }]; - } - [UIView setAnimationBeginsFromCurrentState:YES]; - [UIView setAnimationCurve:[curve intValue]]; - self.center = CGPointMake(self.center.x, keyBoardEndY - statusbarHeight - self.bounds.size.height/2.0); - }]; -} - -//键盘隐藏 -- (void)keyboardWillHidden:(NSNotification *)notification { - - NSDictionary *info = [notification userInfo]; - CGFloat duration = [[info objectForKey:UIKeyboardAnimationDurationUserInfoKey] floatValue]; - [UIView animateWithDuration:duration animations:^{ - [self mas_remakeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.equalTo(self.superview); - make.height.equalTo(@60); - }]; - self.hidden = YES; - }]; -} - --(void)textFieldEditChanged:(NSNotification *)notification{ - - UITextField *textField = (UITextField *)notification.object; - NSString *toBeString = textField.text; - NSString *lang = [textField.textInputMode primaryLanguage]; - if ([lang isEqualToString:@"zh-Hans"]){// 简体中文输入 - //获取高亮部分 - UITextRange *selectedRange = [textField markedTextRange]; - UITextPosition *position = [textField positionFromPosition:selectedRange.start offset:0]; - // 没有高亮选择的字，则对已输入的文字进行字数统计和限制 - if (!position){ - if (toBeString.length > MAX_STARWORDS_LENGTH){ - NSRange rangeIndex = [toBeString rangeOfComposedCharacterSequenceAtIndex:MAX_STARWORDS_LENGTH]; - if (rangeIndex.length == 1){ - - textField.text = [toBeString substringToIndex:MAX_STARWORDS_LENGTH]; - }else{ - NSRange rangeRange = [toBeString rangeOfComposedCharacterSequencesForRange:NSMakeRange(0, MAX_STARWORDS_LENGTH)]; - textField.text = [toBeString substringWithRange:rangeRange]; - } - } - } - }else{ // 中文输入法以外的直接对其统计限制即可，不考虑其他语种情况 - if (toBeString.length > MAX_STARWORDS_LENGTH){ - NSRange rangeIndex = [toBeString rangeOfComposedCharacterSequenceAtIndex:MAX_STARWORDS_LENGTH]; - if (rangeIndex.length == 1){ - - textField.text = [toBeString substringToIndex:MAX_STARWORDS_LENGTH]; - }else{ - - NSRange rangeRange = [toBeString rangeOfComposedCharacterSequencesForRange:NSMakeRange(0, MAX_STARWORDS_LENGTH)]; - textField.text = [toBeString substringWithRange:rangeRange]; - } - } - } - - self.inputMessage = textField.text; - - if (self.inputMessage.length > 0) { - self.sendButton.enabled = YES; - } else { - self.sendButton.enabled = NO; - } -} - - - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = UIColorFromRGB(0x260159); - [self addSubview:self.bgEditTextFiled]; - [self.bgEditTextFiled addSubview:self.editTextFiled]; - [self addSubview:self.sendButton]; - -} - -- (void)initSubViewConstraints { - - - - - [self.bgEditTextFiled mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(6); - make.height.mas_equalTo(36); - make.top.mas_equalTo(12); - make.trailing.equalTo(self.sendButton.mas_leading).mas_offset(-8); - - }]; - [self.editTextFiled mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(20); - make.trailing.mas_equalTo(-kGetScaleWidth(20)); - make.top.bottom.mas_equalTo(0); - }]; - - - [self.sendButton mas_remakeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(58); - make.height.mas_equalTo(29); - make.trailing.mas_equalTo(-15); - make.centerY.equalTo(self); - }]; - - -} - -- (void)addNotification { - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textFieldEditChanged:) name:UITextFieldTextDidChangeNotification object:self.editTextFiled]; -} --(void)showInputView:(NSString *)text{ - self.editTextFiled.text = text; - self.inputMessage = text; - if(text.length > 0){ - self.sendButton.enabled = YES; - } - -} -#pragma mark - Getters And Setters -- (MSBaseTextField *)editTextFiled{ - if (!_editTextFiled) { - _editTextFiled = [[MSBaseTextField alloc] init]; - NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPRoomSendTextView0") attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [UIColor colorWithWhite:1 alpha:0.5]}]; - _editTextFiled.attributedPlaceholder = attribute; - _editTextFiled.borderStyle = UITextBorderStyleNone; - _editTextFiled.textColor = [UIColor whiteColor]; - _editTextFiled.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium]; - [_editTextFiled setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; - - } - return _editTextFiled; -} -- (UIButton *)sendButton{ - if (!_sendButton) { - _sendButton = [[UIButton alloc] init]; - [_sendButton setTitle:YMLocalizedString(@"XPRoomSendTextView1") forState:UIControlStateNormal]; - _sendButton.titleLabel.textColor = [UIColor whiteColor]; - _sendButton.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - [_sendButton setBackgroundImage:[UIImage imageWithColor:[DJDKMIMOMColor disableButtonColor] ]forState:UIControlStateDisabled]; - [_sendButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x7E5AFF), UIColorFromRGB(0x52CAD3)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _sendButton.enabled = NO; - _sendButton.layer.cornerRadius = 7.5; - _sendButton.layer.masksToBounds = YES; - [_sendButton addTarget:self action:@selector(sendButtonDidClick:) forControlEvents:UIControlEventTouchUpInside]; - _sendButton.tag = 101; - } - return _sendButton; -} - -- (UIView *)bgEditTextFiled{ - if(!_bgEditTextFiled){ - _bgEditTextFiled = [UIView new]; - _bgEditTextFiled.backgroundColor = UIColorFromRGB(0x361661); - _bgEditTextFiled.layer.cornerRadius = 18; - _bgEditTextFiled.layer.masksToBounds = YES; - } - return _bgEditTextFiled; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameVictoryView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameVictoryView.h deleted file mode 100644 index d4051b1..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameVictoryView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// MSRoomGameVictoryView.h -// YuMi -// -// Created by duoban on 2024/5/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@protocol MSRoomGameVictoryViewDelegate - -- (void)closeGameAction; --(void)rematchGameAction; -@end -@interface MSRoomGameVictoryView : UIView -@property(nonatomic,copy) NSArray *resultsList; -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameVictoryView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameVictoryView.m deleted file mode 100644 index 55f8901..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameVictoryView.m +++ /dev/null @@ -1,162 +0,0 @@ -// -// MSRoomGameVictoryView.m -// YuMi -// -// Created by duoban on 2024/5/28. -// - -#import "MSRoomGameVictoryView.h" -#import "MSRoomGameVictoryCell.h" -#import "MSRoomGameResultsModel.h" -@interface MSRoomGameVictoryView() -@property(nonatomic,strong) UIView *bgView; -@property(nonatomic,strong) UIView *bgSubView; -@property(nonatomic,strong) UIImageView *topView; -@property(nonatomic,strong) UITableView *tableView; -@property(nonatomic,strong) UIButton *closeBtn; -@property(nonatomic,strong) UIButton *restartBtn; -@end -@implementation MSRoomGameVictoryView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6]; - [self addSubview:self.bgView]; - [self addSubview:self.topView]; - [self.bgView addSubview:self.bgSubView]; - [self.bgSubView addSubview:self.tableView]; - [self.bgSubView addSubview:self.closeBtn]; - [self.bgSubView addSubview:self.restartBtn]; -} --(void)installConstraints{ - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(312)); - make.height.mas_equalTo(kGetScaleWidth(287)); - make.center.equalTo(self); - }]; - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(kGetScaleWidth(317)); - make.leading.mas_equalTo(kGetScaleWidth(0)); - make.bottom.equalTo(self.bgView.mas_top).mas_offset(kGetScaleWidth(85)); - }]; - [self.bgSubView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(297)); - make.height.mas_equalTo(kGetScaleWidth(238)); - make.top.mas_equalTo(kGetScaleWidth(41)); - make.centerX.equalTo(self.bgView); - }]; - - [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(134)); - make.height.mas_equalTo(kGetScaleWidth(42)); - make.leading.mas_equalTo(kGetScaleWidth(13)); - make.bottom.mas_equalTo(-kGetScaleWidth(27)); - }]; - [self.restartBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.top.equalTo(self.closeBtn); - make.trailing.mas_equalTo(-kGetScaleWidth(13)); - }]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(15)); - make.leading.trailing.equalTo(self.bgSubView).inset(kGetScaleWidth(13)); - make.bottom.equalTo(self.closeBtn.mas_top).mas_offset(-kGetScaleWidth(5)); - }]; -} -#pragma mark- UITableViewDelegate,UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ - return self.resultsList.count; -} -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - MSRoomGameVictoryCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([MSRoomGameVictoryCell class]) forIndexPath:indexPath]; - cell.resultsModel = [self.resultsList xpSafeObjectAtIndex:indexPath.row]; - return cell; -} --(void)closeBtnAction{ - [TTPopup dismiss]; - if(self.delegate && [self.delegate respondsToSelector:@selector(closeGameAction)]){ - [self.delegate closeGameAction]; - } -} --(void)restartBtnAction{ - [TTPopup dismiss]; - if(self.delegate && [self.delegate respondsToSelector:@selector(rematchGameAction)]){ - [self.delegate rematchGameAction]; - } -} --(void)setResultsList:(NSArray *)resultsList{ - _resultsList = resultsList; - MSRoomGameResultsModel *resultsModel = _resultsList.firstObject; - NSString *uid = [AccountInfoStorage instance].getUid; - self.topView.image = [resultsModel.uid isEqualToString:uid] ? [UIImage getLanguageImage:@"ms_room_game_victory_top_icon"]: [UIImage getLanguageImage:@"ms_room_game_victory_top_fail_icon"]; - [_tableView reloadData]; -} -#pragma mark - 懒加载 -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = UIColorFromRGB(0x1ADCE5); - _bgView.layer.cornerRadius = kGetScaleWidth(16); - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} -- (UIImageView *)topView{ - if(!_topView){ - _topView = [UIImageView new]; - _topView.image = kImage(@"ms_room_game_victory_top_icon"); - } - return _topView; -} -- (UIView *)bgSubView{ - if(!_bgSubView){ - _bgSubView = [UIView new]; - _bgSubView.backgroundColor = UIColorFromRGB(0xE2F6FF); - _bgSubView.layer.cornerRadius = kGetScaleWidth(12); - _bgSubView.layer.masksToBounds = YES; - } - return _bgSubView; -} -- (UITableView *)tableView{ - if(!_tableView){ - _tableView = [[UITableView alloc]initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.rowHeight = kGetScaleWidth(70); - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - [_tableView registerClass:[MSRoomGameVictoryCell class] forCellReuseIdentifier:NSStringFromClass([MSRoomGameVictoryCell class])]; - } - return _tableView; -} -- (UIButton *)closeBtn{ - if(!_closeBtn){ - _closeBtn = [UIButton new]; - [_closeBtn setBackgroundImage:kImage(@"ms_room_game_victory_close_bg") forState:UIControlStateNormal]; - [_closeBtn setTitle:YMLocalizedString(@"XPAnchorPKResultView2") forState:UIControlStateNormal]; - [_closeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _closeBtn.titleLabel.font = kFontBold(18); - [_closeBtn addTarget:self action:@selector(closeBtnAction) forControlEvents:UIControlEventTouchUpInside]; - - } - return _closeBtn; -} -- (UIButton *)restartBtn{ - if(!_restartBtn){ - _restartBtn = [UIButton new]; - [_restartBtn setBackgroundImage:kImage(@"ms_room_game_victory_restart_bg") forState:UIControlStateNormal]; - [_restartBtn setTitle:YMLocalizedString(@"MSRoomGameVictoryView0") forState:UIControlStateNormal]; - [_restartBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _restartBtn.titleLabel.font = kFontBold(18); - [_restartBtn addTarget:self action:@selector(restartBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _restartBtn; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameView.h deleted file mode 100644 index ca84016..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameView.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// MSRoomGameView.h -// YuMi -// -// Created by duoban on 2024/5/28. -// - -#import -#import "MSRoomGameModel.h" -NS_ASSUME_NONNULL_BEGIN -@protocol MSRoomGameViewDelegate - -- (void)getGameRsultsWithList:(NSArray *)list; - -@end -@interface MSRoomGameView : UIView -@property(nonatomic,strong) MSRoomGameModel *gameModel; - -@property(nonatomic,weak) iddelegate; - -- (void)onRoomEntered; -///销毁游戏的引擎 -- (void)destroyMG; - -/// 退出游戏 -- (void)handleSelfInExitEvent; -- (void)handleNIMNotificationMessage:(NIMMessage *)message; -//自己是否在游戏中 -- (BOOL)isInSudGame; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameView.m deleted file mode 100644 index b24e715..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameView.m +++ /dev/null @@ -1,692 +0,0 @@ -// -// MSRoomGameView.m -// YuMi -// -// Created by duoban on 2024/5/28. -// -///Third -#import -#import -#import -///Tool -#import "Api+LittleGame.h" -#import "AccountInfoStorage.h" - - -#import "MSRoomGameResultsModel.h" -#import "SudCommon.h" -#import "SudGameConfig.h" -///Model -#import "RoomInfoModel.h" -#import "MicroQueueModel.h" -#import "UserInfoModel.h" -#import "MicroExtModel.h" -#import "AttachmentModel.h" -#import "XPKickUserModel.h" -#import "GuildSuperAdminInfoModel.h" -///P -#import -#import -#import -#import -#import -#import "MSRoomGameView.h" -@interface MSRoomGameView() -///当前小游戏ID -@property (nonatomic, assign) int64_t currentmgId; -///小游戏code -@property (nonatomic, copy) NSString *code; -/// - -@property (nonatomic, strong) id fsmAPP2MG; -///游戏状态 -@property (nonatomic, assign) LittleGamePlayStatus sudGameStatus; - -@property(nonatomic,strong) NSMutableArray *userList; - -@end - -@implementation MSRoomGameView - -#pragma mark - Private Method -- (void)updateSudGame { - if(self.currentmgId == self.gameModel.data.mgId.integerValue)return; - self.currentmgId = self.gameModel.data.mgId.integerValue; - [self initLittleGame]; -} - -- (void)initLittleGame { - @kWeakify(self); - [Api getSudGameCode:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - NSString * gameCode = data.data[@"code"]; - self.code = gameCode; - [self gameSetUp]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } uid:[AccountInfoStorage instance].getUid]; -} - -- (void)gameSetUp { - NSLog(@"ISudFSMMG:小游戏的版本号是：%@", [SudMGP getVersion]); - BOOL isTestEnv = NO; -#ifdef DEBUG - isTestEnv = YES; -#else - isTestEnv = NO; -#endif - if(isEnterprise == NO){ - [[SudMGP getCfg]setBackgroundMode:NO]; - } - [SudMGP initSDK:KeyWithType(KeyType_SudGameAppID) - appKey:KeyWithType(KeyType_SudGameAppKey) - isTestEnv:isTestEnv - listener:^(int retCode, const NSString *retMsg) { - if (retCode == 0) { - if (!self.currentmgId) { - return; - } - NSString * userId = [AccountInfoStorage instance].getUid; - NSString * roomId = self.gameModel.roomId; - NSLog(@"ISudFSMMG:用户ID：%@，房间ID：%@, 游戏ID：%lld, code:%@", userId, roomId, self.currentmgId, self.code); - NSString *language = @"en-US"; - if (isMSZH()) { - language = @"zh-TW"; - } else if (isMSPT()) { - language = @"pt-BR"; - } - self.fsmAPP2MG = [SudMGP loadMG:userId roomId:roomId code:self.code mgId:self.currentmgId language:language fsmMG:self rootView:self]; - } else { - /// 初始化失败, 可根据业务重试 - NSLog(@"ISudFSMMG:initGameSDKWithAppID:初始化sdk失败 :%@",retMsg); - } - }]; -} - -//判断是否在麦上 - - -//通过uid判断麦位 - - -//上麦以加入游戏 -- (void)upMicToJoinGame { - -} - -- (void)updateMicInfoWithGameStatus:(LittleGamePlayStatus)status { - -} - -/** - * 麦位更新扩展字段。 - */ -- (NSDictionary *)userInfoToQueueExt:(UserInfoModel *)userInfo { - MicroExtModel * extModel = [[MicroExtModel alloc] init]; - extModel.gender = userInfo.gender; - extModel.avatar = userInfo.avatar; - extModel.uid = userInfo.uid; - extModel.nick = userInfo.nick; - extModel.gameStatus = userInfo.gameStatus; - extModel.headWearUrl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - extModel.preventKick = userInfo.userVipInfoVO.preventKick; - extModel.enterHide = userInfo.userVipInfoVO.enterHide; - return [extModel model2dictionary]; -} - -///下麦 -- (void)onDownMic:(NSInteger)uid { - if (uid == [AccountInfoStorage instance].getUid.integerValue) {//自己下麦 - [self notifyIsPlayingState:false]; - [self nofityPlayerPlaying:NO]; - [self notifySetReady:false]; - /// 下游戏麦 - [self notifySelfInState:false seatIndex:-1]; - } -} - -#pragma mark =======ISudFSMMG Delegate======= -/** -* 游戏日志 -*/ --(void)onGameLog:(NSString*)dataJson { - NSLog(@"ISudFSMMG:onGameLog:%@", dataJson); - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - NSString * msg_string = [dic objectForKey:@"msg"]; - if (!msg_string) { - return; - } -} - -/** -* 游戏开始 -*/ --(void)onGameStarted { - NSLog(@"ISudFSMMG:onGameStarted:游戏开始"); - [self notifySelfInState:YES seatIndex:-1];///加入房间 - [self handleSelfReadyEvent];///准备游戏 -} - -/** - * 游戏销毁 - */ --(void)onGameDestroyed { - NSLog(@"ISudFSMMG:onGameDestroyed:游戏销毁"); -} - -/** - * Code过期 - * @param dataJson {"code":"value"} - */ --(void)onExpireCode:(id)handle dataJson:(NSString*)dataJson { - NSLog(@"ISudFSMMG:onExpireCode:Code过期"); - // 请求业务服务器刷新令牌 - [Api getSudGameCode:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSString * gameCode = data.data[@"code"]; - self.code = gameCode; - [self.fsmAPP2MG updateCode:gameCode listener:^(int retCode, const NSString *retMsg, const NSString *dataJson) { - NSLog(@"ISudFSMMG:updateGameCode retCode=%@ retMsg=%@ dataJson=%@", @(retCode), retMsg, dataJson); - }]; - // 回调结果 - NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:@(0), @"ret_code", @"return form APP onExpireCode", @"ret_msg", nil]; - [handle success:[SudCommon dictionaryToJson:dict]]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } uid:[AccountInfoStorage instance].getUid]; -} - -/** - * 获取游戏View信息 - * @param handle 回调句柄 - * @param dataJson {} - */ --(void)onGetGameViewInfo:(id)handle dataJson:(NSString*)dataJson { - CGRect rect = [[UIScreen mainScreen] bounds]; - CGFloat scale = [[UIScreen mainScreen] nativeScale]; - - CGFloat top = kGetScaleWidth(185) * scale; - CGFloat bottom = kGetScaleWidth(175) *scale; - - CGFloat width = rect.size.width * scale; - CGFloat height = rect.size.height * scale; - NSDictionary *rectDict = [NSDictionary dictionaryWithObjectsAndKeys:@(top), @"top", @(0), @"left", @(bottom), @"bottom", @(0), @"right", nil]; - NSDictionary *viewDict = [NSDictionary dictionaryWithObjectsAndKeys:@(width), @"width", @(height), @"height", nil]; - NSDictionary *dataDict = [NSDictionary dictionaryWithObjectsAndKeys:@(0), @"ret_code", @"return form APP onGetGameViewInfo", @"ret_msg", viewDict, @"view_size", rectDict, @"view_game_rect", nil]; - /// 回调 - [handle success:[SudCommon dictionaryToJson:dataDict]]; -} - -/** - * 获取游戏配置 - * @param handle 回调句柄 - * @param dataJson {} - */ --(void)onGetGameCfg:(id)handle dataJson:(NSString*)dataJson { - NSString *configJson = self.gameModel.data.configJson; - if(configJson != nil){ - [handle success:configJson]; - return; - } - NSMutableDictionary *dict = [[NSMutableDictionary alloc] init]; - dict[@"ret_code"] = @(0); - dict[@"ret_msg"] = @"return form APP onGetGameCfg"; - - // 将 JSON 字符串转换为 NSData - NSData *jsonData = [configJson dataUsingEncoding:NSUTF8StringEncoding]; - - // 解析 JSON 数据为字典 - NSError *error; - NSMutableDictionary *dictionary = [[NSJSONSerialization JSONObjectWithData:jsonData - options:NSJSONReadingMutableContainers - error:&error] mutableCopy]; - - // 检查是否解析成功 - if (error) { - NSLog(@"ISudFSMMG:JSON 解析失败: %@", error.localizedDescription); - } else { - NSLog(@"ISudFSMMG:解析后的字典: %@", dictionary); - // 禁止模式选择 - NSMutableDictionary *ui = [[NSMutableDictionary alloc] initWithDictionary:dictionary[@"ui"]]; - [ui setObject: @{@"hide" : @(YES)} - forKey:@"lobby_game_setting"]; - [dictionary setObject:ui forKey:@"ui"]; - NSLog(@"ISudFSMMG:更新后的字典: %@", dictionary); - } - -// dict[@"ui"] = @{ -// @"join_btn" : @{@"custom": @(YES), @"hide": @(YES)},//加入游戏 -// @"start_btn" : @{@"custom": @(YES), @"hide": @(YES)},//开始游戏 -// @"ready_btn" : @{@"custom": @(YES), @"hide": @(YES)},//准备游戏 -// @"lobby_players" : @{@"custom": @(NO), @"hide": @(NO)},//游戏中坑位点击 -// @"level" : @{@"custom": @(YES), @"hide" : @(YES)},//段位信息 -// @"cancel_join" : @{@"custom": @(YES), @"hide" : @(YES)},//退出游戏 -// @"dt_custom_hide_lobby_settings" : @{@"custom":@(YES), @"hide" : @(YES)} -// }; -// dict[@"ui"] = dictionary; - NSString *dataJsonRet = @""; - NSData *dataJsonData = [NSJSONSerialization dataWithJSONObject:dictionary.copy options:NSJSONWritingPrettyPrinted error:nil]; - if (dataJsonData != nil) { - dataJsonRet = [[NSString alloc]initWithData:dataJsonData encoding:NSUTF8StringEncoding]; - } - if ([NSString isEmpty:dataJsonRet]) { - dataJsonRet = configJson; - } - [handle success:dataJsonRet]; -} - -/** - * 游戏状态变化 - * @param handle 回调句柄 - * @param state 游戏状态 - * @param dataJson 回调json - */ --(void)onGameStateChange:(id) handle state:(NSString*) state dataJson:(NSString*) dataJson { - NSLog(@"ISudFSMMG:onGameStateChange 回调: %@ \n%@", state, dataJson); - if ([state isEqualToString:MG_COMMON_SELF_CLICK_READY_BTN]) { -// [self addAI]; - } else if ([state isEqualToString:@"mg_common_game_add_ai_players"]) { - NSLog(@"ISudFSMMG: ????????????????????????????????????????????? "); - } else if([state isEqualToString:MG_COMMON_GAME_SETTLE]){ - NSDictionary *data = @{@"value0":self.gameModel.data.matchRoundId ?: @""}; - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:[data mj_JSONString] , @"reportGameInfoExtras",@"value0" , @"reportGameInfoKey" ,nil]; - [self notifyStateChange:MG_COMMON_GAME_SETTLE dataJson:[SudCommon dictionaryToJson:dic]]; - if([dataJson containsString:@"value0"]){ - return; - } - NSDictionary *results = [dataJson mj_JSONObject]; - NSArray *list = [MSRoomGameResultsModel modelsWithArray:results[@"results"]]; - if(self.delegate && [self.delegate respondsToSelector:@selector(getGameRsultsWithList:)]){ - [self.delegate getGameRsultsWithList:list]; - } - }else if ([state isEqualToString:MG_COMMON_PUBLIC_MESSAGE]) { - NSLog(@"ISudFSMMG:ISudFSMMG:onGameStateChange:游戏->APP:公屏消息"); - } else if ([state isEqualToString:MG_COMMON_KEY_WORD_TO_HIT]) { - - }else if ([state isEqualToString:MG_COMMON_SELF_CLICK_JOIN_BTN]) {//加入游戏按钮点击 - NSDictionary *dic = [SudCommon turnStringToDictionary:dataJson]; - int seatIndex = -1; - if ([dic objectForKey:@"seatIndex"]) { - seatIndex = [[dic objectForKey:@"seatIndex"] intValue]; - } - if (seatIndex == -1) { - NSLog(@"ISudFSMMG:来自加入按钮%d",seatIndex); - }else { - NSLog(@"ISudFSMMG:来自麦位+入%d",seatIndex); - } - [self notifySelfInState:YES seatIndex:-1]; - } else if([state isEqualToString:MG_COMMON_SELF_CLICK_START_BTN]) {//开始游戏按钮点击 - [self notifyIsPlayingState:YES]; - } else if ([state isEqualToString:MG_COMMON_SELF_CLICK_CANCEL_JOIN_BTN]) { - /// 取消加入游戏（退出游戏按钮点击） - [self handleSelfInExitEvent]; - } else { - /// 其他状态 - NSLog(@"ISudFSMMG:onGameStateChange:游戏->APP:state:%@",MG_COMMON_PUBLIC_MESSAGE); - } -} - -/** - * 游戏玩家状态变化 - * @param handle 回调句柄 - * @param userId 用户id - * @param state 玩家状态 - * @param dataJson 回调JSON - */ --(void)onPlayerStateChange:(nullable id) handle userId:(NSString*) userId state:(NSString*) state dataJson:(NSString*) dataJson { - NSLog(@"ISudFSMMG:onPlayerStateChange:游戏->APP:游戏玩家状态变化:userId: %@ --state: %@ --dataJson: %@", userId, state, dataJson); - /// 状态解析 - NSString *dataStr = @""; - if ([state isEqualToString:MG_COMMON_PLAYER_IN]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView0"); - [self handleState_MG_COMMON_PLAYER_IN_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_COMMON_PLAYER_READY]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView1"); - [self handleState_MG_COMMON_PLAYER_READY_WithUserId:userId dataJson:dataJson]; - if(userId != nil && ![self.userList containsObject:userId]){ - [self.userList addObject:userId]; - } - if(self.userList.count > 1 && self.sudGameStatus != LittleGamePlayStatus_Plying){ - [self handleGameStartEvent];///开始游戏 - [self.userList removeAllObjects]; - - self.sudGameStatus = LittleGamePlayStatus_Plying; - } - } else if ([state isEqualToString:MG_COMMON_PLAYER_CAPTAIN]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView2"); - [self handleState_MG_COMMON_PLAYER_CAPTAIN_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_COMMON_PLAYER_PLAYING]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView3"); - [self handleState_MG_COMMON_PLAYER_PLAYING_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_SELECTING]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView4"); - [self handleState_MG_DG_SELECTING_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_PAINTING]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView5"); - [self handleState_MG_DG_PAINTING_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_ERRORANSWER]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView6"); - [self handleState_MG_DG_ERRORANSWER_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_TOTALSCORE]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView7"); - [self handleState_MG_DG_TOTALSCORE_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_SCORE]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView8"); - [self handleState_MG_DG_SCORE_WithUserId:userId dataJson:dataJson]; - }else { - NSLog(@"ISudFSMMG:onPlayerStateChange:未做解析状态:%@", MG_DG_SCORE); - } - NSLog(@"ISudFSMMG:onPlayerStateChange:dataStr:%@", dataStr); - /// 回调 - NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:@(0), @"ret_code", @"return form APP onPlayerStateChange", @"ret_msg", nil]; - [handle success:[SudCommon dictionaryToJson:dict]]; -} - -/// 退出游戏 -- (void)handleSelfInExitEvent { - - /// 下游戏麦 - [self notifyIsPlayingState:false]; - [self nofityPlayerPlaying:NO]; - [self notifySetReady:false]; - [self notifySetEnd]; - /// 下游戏麦 - [self notifySelfInState:false seatIndex:-1]; - self.sudGameStatus = LittleGamePlayStatus_NoIn; -} - -/// 准备游戏 -- (void)handleSelfReadyEvent { - [self notifySetReady:true]; - [self addAI]; -} - -/// 取消准备 -- (void)handleSelfCancelReadyEvent { - [self notifySetReady:false]; -} - -/// 开始游戏 -- (void)handleGameStartEvent { - [self notifyIsPlayingState:YES]; -} - -- (void)addAI { - for (MSRoomGameMicModel *micModel in self.gameModel.roomMics) { - HomePlayMicUserModel *aiUser = micModel.micUser; - if (aiUser && ![aiUser.uid isEqualToString:[[AccountInfoStorage instance] getUid]] && aiUser.aiLevel) { - [self notifyStateChange:@"app_common_game_add_ai_players" - dataJson:[SudCommon dictionaryToJson:@{ - @"aiPlayers":@[@{ - @"userId": aiUser.uid, - @"avatar": aiUser.avatar, - @"name": aiUser.nick, - @"gender": aiUser.gender == GenderType_Male ? @"male" : @"female", - @"level": aiUser.aiLevel, - }], - @"isReady":@"1", - }]]; - } - } -} - -#pragma mark =======APP->游戏状态处理======= -/// 状态通知（app to mg） -/// @param state 状态名称 -/// @param dataJson 需传递的json -- (void)notifyStateChange:(NSString *) state dataJson:(NSString*) dataJson { - NSLog(@"ISudFSMMG: START notifyStateChange:state=%@ \ndataJson=%@", state, dataJson); - [self.fsmAPP2MG notifyStateChange:state dataJson:dataJson listener:^(int retCode, const NSString *retMsg, const NSString *dataJson) { - NSLog(@"ISudFSMMG:notifyStateChange:retCode=%@ retMsg=%@ dataJson=%@", @(retCode), retMsg, dataJson); - - if (retCode == 0 && [state isEqualToString:APP_COMMON_SELF_PLAYING]) {//开始游戏 - //上报游戏开始 - NSString *mgid = [NSString stringWithFormat:@"%lld", self.currentmgId]; - if (mgid.length <= 0) { - return; - } - - } else if (retCode == 0 && [state isEqualToString:APP_COMMON_SELF_END]) {//结束游戏 - - } - }]; -} - -/// 加入,退出游戏 -/// @param isIn YES:加入 NO:退出 -- (void)notifySelfInState:(BOOL)isIn uid:(NSInteger)uid { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isIn), @"isIn", @(1), @"teamId", nil]; - [self notifyStateChange:APP_COMMON_SELF_IN dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 加入,退出游戏 -/// @param isIn YES:加入 NO:退出 -- (void)notifySelfInState:(BOOL)isIn seatIndex:(int)seatIndex { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(seatIndex), @"seatIndex", @(isIn), @"isIn", @(1), @"teamId", nil]; - [self notifyStateChange:APP_COMMON_SELF_IN dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 踢出用户 -/// @param userId 踢出用户id -- (void)notifyKickStateWithUserId:(NSString *)userId { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:userId, @"kickedUID", nil]; - [self notifyStateChange:APP_COMMON_SELF_KICK dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 设置用户为队长 -/// @param userId 被设置用户id -- (void)notifySetCaptainStateWithUserId:(NSString *)userId { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:userId, @"curCaptainUID", nil]; - [self notifyStateChange:APP_COMMON_SELF_CAPTAIN dataJson:[SudCommon dictionaryToJson:dic]]; - -} - -/// 命中 关键词状态 （你画我猜） -- (void)notifyChangeTextHitState:(NSString *)keyWord { - -} - -/// 是否设置为准备状态 -- (void)notifySetReady:(BOOL)isReady { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isReady), @"isReady", nil]; - [self notifyStateChange:APP_COMMON_SELF_READY dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 停止游戏状态设置 -- (void)notifySetEnd { - [self notifyStateChange:APP_COMMON_SELF_END dataJson:[SudCommon dictionaryToJson:@{}]]; -} - -/// 游戏中状态设置 -- (void)notifyIsPlayingState:(BOOL)isPlaying { - NSDictionary *data = @{@"value0":self.gameModel.data.matchRoundId ?: @""}; - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isPlaying), @"isPlaying",[data mj_JSONString] , @"reportGameInfoExtras",@"value0", @"reportGameInfoKey" ,nil]; - [self notifyStateChange:APP_COMMON_SELF_PLAYING dataJson:[SudCommon dictionaryToJson:dic]]; -} - -///游戏中退出游戏 -- (void)nofityPlayerPlaying:(BOOL)isPlaying { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isPlaying), @"isPlaying", nil]; - [self notifyStateChange:MG_COMMON_PLAYER_PLAYING dataJson:[SudCommon dictionaryToJson:dic]]; -} - -#pragma mark =======游戏->APP状态处理======= -- (void)handleState_MG_COMMON_PLAYER_IN_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - /// 加入状态：YES加入，NO退出 - BOOL isIn = NO; - if (dic) { - NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; - if (retCode != 0) { - return; - } - isIn = [[dic objectForKey:@"isIn"] boolValue]; - } - if ([userId isEqualToString:[AccountInfoStorage instance].getUid]) {//是当前用户 - if (isIn) {//加入了游戏 - //判断是否在麦上 - - //判断是否为房主，房主需要设为队长 - if (self.gameModel.roomId.integerValue == userId.integerValue) { - [self notifySetCaptainStateWithUserId:userId]; - } - }else {//退出了游戏 - - } - } else {//退出游戏 - if (self.sudGameStatus == LittleGamePlayStatus_Plying) {//游戏进行中，用户退出 - - } - } -} - -- (void)handleState_MG_COMMON_PLAYER_READY_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 玩家是否准备,YES:已准备，NO:未准备 - BOOL isReady = NO; - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - if (dic) { - NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; - if (retCode != 0) { - return; - } - isReady = [[dic objectForKey:@"isReady"] boolValue]; - } - if ([userId isEqualToString:[AccountInfoStorage instance].getUid]) { - if (isReady) { - //判断是否在麦上 - }else { - - } - } -} - -- (void)handleState_MG_COMMON_PLAYER_CAPTAIN_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 是否是队长：YES：是队长 NO：不是队长 - BOOL isCaptain = NO; - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - if (dic) { - /// 错误处理 - NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; - if (retCode != 0) { - return; - } - isCaptain = [[dic objectForKey:@"isCaptain"] boolValue]; - } -} - -- (void)handleState_MG_COMMON_PLAYER_PLAYING_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 是否正在游戏中 - BOOL isPlaying = NO; - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - if (dic) { - /// 错误处理 - NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; - if (retCode != 0) { - return; - } - isPlaying = [[dic objectForKey:@"isPlaying"] boolValue]; - } - if ([userId isEqualToString:[AccountInfoStorage instance].getUid]) { - if (isPlaying) { - - - }else { - - - } - } -} - -- (void)handleState_MG_DG_SELECTING_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - NSLog(@"handleState_MG_DG_SELECTING_WithUserId%@",dataJson); -} - -- (void)handleState_MG_DG_PAINTING_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - NSLog(@"handleState_MG_DG_PAINTING_WithUserId%@",dataJson); - /// 设置麦位状态为作画中 - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - bool isPainting = NO; - if (dic) { - isPainting = [dic[@"isPainting"] boolValue]; - } -} - -- (void)handleState_MG_DG_ERRORANSWER_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 错误答案 - NSLog(@"handleState_MG_DG_ERRORANSWER_WithUserId%@",dataJson); - -} - -- (void)handleState_MG_DG_TOTALSCORE_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 总积分 - NSLog(@"handleState_MG_DG_TOTALSCORE_WithUserId%@",dataJson); -} - -- (void)handleState_MG_DG_SCORE_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 本次积分 - NSLog(@"handleState_MG_DG_SCORE_WithUserId%@",dataJson); -} - -/// 销毁MG -- (void)destroyMG { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.fsmAPP2MG destroyMG]; - }); -} - -#pragma mark - RoomGuestDelegate -- (void)onRoomEntered { - [self updateSudGame]; -} - -- (void)onRoomUpdate { - [self.fsmAPP2MG destroyMG]; - - [self updateSudGame]; -} - -#pragma mark - RoomGuestDelegate -- (void)handleNIMCustomMessage:(NIMMessage *)message { - -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - switch (content.eventType) { - case NIMChatroomEventTypeQueueChange: // 麦序上下麦 - { - NSDictionary* data = (NSDictionary *)content.ext; - UserInfoModel* userInfo = [UserInfoModel modelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]]; - NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue]; - if (changeType != 1) { - [self onDownMic:userInfo.uid]; - } - } - break; - default: - break; - } -} - -- (void)handleNIMTextMessage:(NIMMessage *)message { - if (message.from.integerValue == [AccountInfoStorage instance].getUid.integerValue && [self isInSudGame]) { - [self notifyChangeTextHitState:message.text]; - } -} - -- (NSMutableArray *)userList{ - if(!_userList){ - _userList = [NSMutableArray array]; - } - return _userList; -} - -- (BOOL)isInSudGame { - return YES; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarBeginGameView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarBeginGameView.h deleted file mode 100644 index fa19f95..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarBeginGameView.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// MSTabbarBeginGameView.h -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import -#import "MSTabbarRoomGameModel.h" -NS_ASSUME_NONNULL_BEGIN -@protocol MSTabbarBeginGameViewDelegate -//开始游戏 --(void)startMatchGameActionWithModel:(MSTabbarRoomGameItemModel *)model; -///规则 --(void)clickRuleActionWithModel:(MSTabbarRoomGameItemModel *)model; -- (void)leave; -@end -@interface MSTabbarBeginGameView : UIView -@property(nonatomic,weak) iddelegate; -@property(nonatomic,strong) MSTabbarRoomGameItemModel *itemModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarBeginGameView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarBeginGameView.m deleted file mode 100644 index 0d2e922..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarBeginGameView.m +++ /dev/null @@ -1,175 +0,0 @@ -// -// MSTabbarBeginGameView.m -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MSTabbarBeginGameView.h" -#import "MoliMoneyLabel.h" - -@interface MSTabbarBeginGameView() -@property(nonatomic,strong) UIImageView *bgImageView; -@property(nonatomic,strong) UIImageView *bgSubImageView; -@property(nonatomic,strong) UIView *bgCoinView; -@property(nonatomic,strong) MoliMoneyLabel *coinNumLabel; -@property(nonatomic,strong) UIButton *beginBtn; -@property(nonatomic,strong) UIButton *ruleBtn; -@property(nonatomic,strong) UILabel *titleView; -@property(nonatomic,strong) UIButton *backBtn; -@end -@implementation MSTabbarBeginGameView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.backBtn]; - [self addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.titleView]; - [self.bgImageView addSubview:self.ruleBtn]; - [self.bgImageView addSubview:self.bgSubImageView]; - [self.bgSubImageView addSubview:self.bgCoinView]; - [self.bgCoinView addSubview:self.coinNumLabel]; - [self.bgSubImageView addSubview:self.beginBtn]; -} --(void)installConstraints{ - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(252)); - }]; - [self.ruleBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(32)); - make.top.mas_equalTo(kGetScaleWidth(21)); - make.trailing.mas_equalTo(-kGetScaleWidth(21)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.ruleBtn); - make.centerX.equalTo(self.bgImageView); - }]; - [self.bgSubImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(348)); - make.height.mas_equalTo(kGetScaleWidth(162)); - make.top.mas_equalTo(kGetScaleWidth(69)); - make.centerX.equalTo(self.bgImageView); - }]; - [self.bgCoinView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(44)); - make.width.mas_equalTo(kGetScaleWidth(297)); - make.top.mas_equalTo(kGetScaleWidth(20)); - make.centerX.equalTo(self.bgSubImageView); - }]; - [self.coinNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.bgCoinView); - make.centerX.equalTo(self.bgCoinView).offset(-kGetScaleWidth(14)); - - }]; - [self.beginBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(55)); - make.width.mas_equalTo(kGetScaleWidth(205)); - make.centerX.equalTo(self.bgSubImageView); - make.top.mas_equalTo(kGetScaleWidth(91)); - }]; -} --(void)backBtnAction{ - if ([self.delegate respondsToSelector:@selector(leave)]) { - [self.delegate leave]; - } -} --(void)beginGameAction{ - [self backBtnAction]; - if(self.delegate && [self.delegate respondsToSelector:@selector(startMatchGameActionWithModel:)]){ - [self.delegate startMatchGameActionWithModel:self.itemModel]; - } -} -- (void)setItemModel:(MSTabbarRoomGameItemModel *)itemModel{ - _itemModel = itemModel; - [_coinNumLabel updateContent:itemModel.ticket]; - _titleView.text = [NSString stringWithFormat:YMLocalizedString(@"MSRoomGameHeadView4"),_itemModel.modeName]; - -} --(void)ruleBtnAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(clickRuleActionWithModel:)]){ - [self.delegate clickRuleActionWithModel:self.itemModel]; - } -} -#pragma mark - 懒加载 -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = kImage(@"ms_room_game_begin_bg"); - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} -- (UIImageView *)bgSubImageView{ - if(!_bgSubImageView){ - _bgSubImageView = [UIImageView new]; - _bgSubImageView.image = kImage(@"ms_room_game_sub_begin_bg"); - _bgSubImageView.userInteractionEnabled = YES; - } - return _bgSubImageView; -} -- (UIView *)bgCoinView{ - if(!_bgCoinView){ - _bgCoinView = [UIView new]; - _bgCoinView.backgroundColor = UIColorFromRGB(0x00757B); - _bgCoinView.layer.cornerRadius = kGetScaleWidth(8); - _bgCoinView.layer.masksToBounds = YES; - } - return _bgCoinView; -} - -- (MoliMoneyLabel *)coinNumLabel{ - if(!_coinNumLabel){ -// _coinNumLabel = [UILabel labelInitWithText:@"0" font:kFontBold(18) textColor:UIColorFromRGB(0xF2EF25)]; - _coinNumLabel = [MoliMoneyLabel moneyLabelWithTextColot:UIColorFromRGB(0xF2EF25) - font:kFontBold(18) - moneyPostion:1 - moneySize:CGSizeMake(kGetScaleWidth(22), kGetScaleWidth(22))]; - } - return _coinNumLabel; -} -- (UIButton *)beginBtn{ - if(!_beginBtn){ - _beginBtn = [UIButton new]; - [_beginBtn setBackgroundImage:kImage(@"ms_room_game_begin_btn_bg") forState:UIControlStateNormal]; - [_beginBtn setTitle:YMLocalizedString(@"MSTabbarBeginGameView0") forState:UIControlStateNormal]; - [_beginBtn setTitleColor:UIColorFromRGB(0xA75906) forState:UIControlStateNormal]; - _beginBtn.titleLabel.font = kFontBold(20); - [_beginBtn addTarget:self action:@selector(beginGameAction) forControlEvents:UIControlEventTouchUpInside]; - } - - return _beginBtn; -} -- (UIButton *)ruleBtn{ - if(!_ruleBtn){ - _ruleBtn = [UIButton new]; - [_ruleBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_ruleBtn setBackgroundImage:kImage(@"ms_room_game_begin_rule_icon") forState:UIControlStateNormal]; - [_ruleBtn addTarget:self action:@selector(ruleBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _ruleBtn; -} -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:@"" font:kFontBold(18) textColor:[UIColor whiteColor]]; - } - return _titleView; -} -- (UIButton *)backBtn{ - if(!_backBtn){ - _backBtn = [UIButton new]; - [_backBtn addTarget:self action:@selector(backBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameHeadView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameHeadView.h deleted file mode 100644 index 762051c..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameHeadView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// MSTabbarRoomGameHeadView.h -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import -#import "UserInfoModel.h" -#import "WalletInfoModel.h" -NS_ASSUME_NONNULL_BEGIN -@protocol MSTabbarRoomGameHeadViewDelegate -///点击充值 --(void)clickPayAction; -///点击排行榜 --(void)clickRankAction; - -@end -@interface MSTabbarRoomGameHeadView : UIView -@property(nonatomic,weak) iddelegate; -@property(nonatomic,strong) WalletInfoModel *coinModel; -@property(nonatomic,strong) UserInfoModel *userModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameHeadView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameHeadView.m deleted file mode 100644 index 6e34be9..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameHeadView.m +++ /dev/null @@ -1,146 +0,0 @@ -// -// MSTabbarRoomGameHeadView.m -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MSTabbarRoomGameHeadView.h" -@interface MSTabbarRoomGameHeadView() -@property(nonatomic,strong) NetImageView *avatarView; -@property(nonatomic,strong) UIView *bgIconView; -@property(nonatomic,strong) UIImageView *iconView; -@property(nonatomic,strong) UILabel *iconNumView; -@property(nonatomic,strong) UIImageView *addIconView; -@property(nonatomic,strong) UIImageView *rankIconView; - -@end -@implementation MSTabbarRoomGameHeadView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.avatarView]; - [self addSubview:self.bgIconView]; - [self.bgIconView addSubview:self.iconView]; - [self.bgIconView addSubview:self.iconNumView]; - [self addSubview:self.addIconView]; - [self addSubview:self.rankIconView]; -} --(void)installConstraints{ - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(37)); - make.leading.mas_equalTo(kGetScaleWidth(19)); - make.centerY.equalTo(self); - }]; - [self.bgIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(101)); - make.height.mas_equalTo(kGetScaleWidth(36)); - make.leading.equalTo(self.avatarView.mas_trailing).mas_offset(kGetScaleWidth(12)); - make.centerY.equalTo(self); - }]; - [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(22)); - make.leading.mas_equalTo(kGetScaleWidth(6)); - make.centerY.equalTo(self.bgIconView); - }]; - - [self.addIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(37)); - make.trailing.equalTo(self.bgIconView.mas_trailing).mas_offset(-kGetScaleWidth(0)); - make.centerY.equalTo(self.bgIconView); - }]; - [self.iconNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(30)); - make.trailing.mas_equalTo(-kGetScaleWidth(40)); - make.centerY.equalTo(self.bgIconView); - }]; - [self.rankIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(34)); - make.height.mas_equalTo(kGetScaleWidth(34)); - make.trailing.mas_equalTo(-kGetScaleWidth(13)); - make.centerY.equalTo(self.avatarView); - }]; -} --(void)clickPayBtnction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(clickPayAction)]){ - [self.delegate clickPayAction]; - } -} --(void)clickRankBtnAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(clickRankAction)]){ - [self.delegate clickRankAction]; - } -} --(void)setUserModel:(UserInfoModel *)userModel{ - _userModel = userModel; - _avatarView.imageUrl = _userModel.avatar; -} --(void)setCoinModel:(WalletInfoModel *)coinModel{ - _coinModel = coinModel; - _iconNumView.text = _coinModel.diamonds; -} -#pragma mark - 懒加载 -- (NetImageView *)avatarView{ - if(!_avatarView){ - NetImageConfig *config = [NetImageConfig new]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarView = [[NetImageView alloc]initWithConfig:config]; - _avatarView.layer.cornerRadius = kGetScaleWidth(37)/2; - _avatarView.layer.masksToBounds = YES; - } - return _avatarView; -} - -- (UIView *)bgIconView{ - if(!_bgIconView){ - _bgIconView = [UIView new]; - _bgIconView.backgroundColor = UIColorFromRGB(0xFAF6D3); - _bgIconView.layer.cornerRadius = kGetScaleWidth(36)/2; - _bgIconView.layer.masksToBounds = YES; - _bgIconView.layer.borderWidth = 0.5; - _bgIconView.layer.borderColor = UIColorFromRGB(0xFFE358).CGColor; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickPayBtnction)]; - [_bgIconView addGestureRecognizer:tap]; - } - return _bgIconView; -} -- (UIImageView *)iconView{ - if(!_iconView){ - _iconView = [UIImageView new]; - _iconView.image = kImage(@"moli_money_icon"); - } - return _iconView; -} -- (UILabel *)iconNumView{ - if(!_iconNumView){ - _iconNumView = [UILabel labelInitWithText:@"0" font:kFontBold(17) textColor:UIColorFromRGB(0x273132)]; - _iconNumView.textAlignment = NSTextAlignmentCenter; - } - return _iconNumView; -} --(UIImageView *)addIconView{ - if(!_addIconView){ - _addIconView = [UIImageView new]; - _addIconView.image = kImage(@"ms_room_game_add_coin"); - } - return _addIconView; -} -- (UIImageView *)rankIconView{ - if(!_rankIconView){ - _rankIconView = [UIImageView new]; - _rankIconView.image = kImage(@"ms_room_game_rank_coin"); - _rankIconView.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickRankBtnAction)]; - [_rankIconView addGestureRecognizer:tap]; - } - return _rankIconView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameView.h deleted file mode 100644 index f66be83..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// MSTabbarRoomGameView.h -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import -#import "MSTabbarRoomGameModel.h" -#import "MSTabbarRoomGameModel.h" -NS_ASSUME_NONNULL_BEGIN -@protocol MSTabbarRoomGameViewDelegate - --(void)chooseGameType:(MSTabbarRoomGameItemModel *)model; - -@end - - -@interface MSTabbarRoomGameView : UIView -@property(nonatomic,strong) MSTabbarRoomGameModel *gameModel; -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameView.m deleted file mode 100644 index 3cb5f4f..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSTabbarRoomGameView.m +++ /dev/null @@ -1,87 +0,0 @@ -// -// MSTabbarRoomGameView.m -// YuMi -// -// Created by duoban on 2024/5/27. -// - -#import "MSTabbarRoomGameView.h" -#import "MSTabbarRoomGameCell.h" -@interface MSTabbarRoomGameView() -@property(nonatomic,strong) UIImageView *topIconView; -@property(nonatomic,strong) UICollectionView *collectionView ; - -@end -@implementation MSTabbarRoomGameView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.topIconView]; - [self addSubview:self.collectionView]; -} --(void)installConstraints{ - [self.topIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(0)); - make.width.mas_equalTo(kGetScaleWidth(187)); - make.height.mas_equalTo(kGetScaleWidth(139)); - make.centerX.equalTo(self); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self); - make.top.equalTo(self.topIconView.mas_bottom).mas_offset(kGetScaleWidth(10)); - }]; -} --(void)setGameModel:(MSTabbarRoomGameModel *)gameModel{ - _gameModel = gameModel; - [self.collectionView reloadData]; -} -#pragma mark -UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ - return self.gameModel.gameModes.count; -} -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - MSTabbarRoomGameCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([MSTabbarRoomGameCell class]) forIndexPath:indexPath]; - cell.itemMode = [self.gameModel.gameModes xpSafeObjectAtIndex:indexPath.row]; - return cell; -} -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - MSTabbarRoomGameItemModel *itemModel = [self.gameModel.gameModes xpSafeObjectAtIndex:indexPath.row]; - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseGameType:)]){ - [self.delegate chooseGameType:itemModel]; - } -} -#pragma mark - 懒加载 -- (UIImageView *)topIconView{ - if(!_topIconView){ - _topIconView = [UIImageView new]; - _topIconView.image = kImage(@"ms_room_game_top_icon"); - } - return _topIconView; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(kGetScaleWidth(179), kGetScaleWidth(247)); - layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0); - layout.minimumLineSpacing = kGetScaleWidth(18); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[MSTabbarRoomGameCell class] forCellWithReuseIdentifier:NSStringFromClass([MSTabbarRoomGameCell class])]; - } - return _collectionView; -} - - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomGuestDelegate.h b/YuMi/Modules/YMRoom/View/RoomGuestDelegate.h deleted file mode 100644 index 0264633..0000000 --- a/YuMi/Modules/YMRoom/View/RoomGuestDelegate.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// RoomGuestDelegate.h -// YUMI -// -// Created by zu on 2021/10/27. -// - -#import -#import "MicroQueueProtocol.h" -#import "RoomAnimationProtocol.h" - -@class NIMMessage, NIMRecentSession; -@class AttachmentModel; - -NS_ASSUME_NONNULL_BEGIN - -/** RoomVC 子 View 的通用协议。 - - 调用方向：RoomVC —> RoomGuestDelegate - - **Note:** - - 继承 MicroQueueProtocol、RoomAnimationProtocol 等协议用于子 View 做实现。 - 实现后的调用方向：子 View —> RoomHostDelegate —> XXXProtocol（RoomGuestDelegate）。 - - */ -@protocol RoomGuestDelegate - -@optional - -- (void)onRoomUpdate; -- (void)onUserUpdate; -- (void)onRoomEntered; -/// 个播 可以切换房间 -- (void)onRoomChange; -- (void)onRoomMiniEntered;///最小化进房 -- (void)handleNIMNotificationMessage:(NIMMessage *)message; -- (void)handleNIMCustomMessage:(NIMMessage *)message; -- (void)handleNIMTextMessage:(NIMMessage *)message; -- (void)addNIMRecentSession:(NIMRecentSession *)session; -- (void)removeNIMRecentSession:(NIMRecentSession *)session; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.h b/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.h deleted file mode 100644 index 9a03a3a..0000000 --- a/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMRoomInfoView.h -// YUMI -// -// Created by YUMI on 2021/10/11. -// - -#import -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomHeaderView : UIView - -- (void)updateLevel:(NSString *)levelIcon; -- (instancetype)initWithDelegate:(id)delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m b/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m deleted file mode 100644 index 44f64e7..0000000 --- a/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m +++ /dev/null @@ -1,568 +0,0 @@ -// -// XPRoomInfoView.m -// xplan-ios -// -// Created by 冯硕 on 2021/10/11. -// - -#import "RoomHeaderView.h" -///Third -#import -#import - -#import "TTPopup.h" -#import -#import "HttpRequestHelper.h" -///Tool -#import "UIImage+Utils.h" -#import "UIButton+EnlargeTouchArea.h" -#import "ThemeColor+Room.h" -#import "TTPopup.h" -#import "AccountInfoStorage.h" -#import "HttpRequestHelper.h" -#import "Api+Room.h" -#import "XCCurrentVCStackManager.h" -///Model -#import "RoomInfoModel.h" -#import "UserInfoModel.h" -#import "AttachMentModel.h" -#import "MicroQueueModel.h" -#import "XPRoomRecommendModel.h" -///View -#import "XPRoomTopicAlertView.h" -#import "XPRoomRecommendView.h" -///VC -#import "XPWebViewcontroller.h" -#import "XPRoomOnLineViewController.h" -#import "XPRoomViewController.h" -#import "XPRoomTypeSelectionViewController.h" -#import "XPRoomTopicViewController.h" - -#import "ShareHelder.h" -#import "XPRoomPresenter.h" -#import "TurboModeStateManager.h" -#import "XPTurboModeConstants.h" - - -@interface RoomHeaderView () -///容器 -@property (nonatomic,strong) UIStackView *nickStackView; -/// -@property (nonatomic,strong) UIStackView *titleStackView; - -@property(nonatomic,strong) NetImageView *avatarView; -///房间名字 -@property (nonatomic,strong) MarqueeLabel *titleLabel; -@property(nonatomic, strong) NetImageView *levelImageView; -///礼物特效 -@property (nonatomic,strong) UIImageView *noGiftEffectImageView; -///锁房标识 -@property (nonatomic,strong) UIImageView *lockRoomImageView; -/// -@property (nonatomic,strong) UIStackView *onlineStackView; -///id和在线人数 -@property (nonatomic,strong) YYLabel *idLabel; -///分享 -@property (nonatomic,strong) UIButton *shareButton; -///收藏 -@property (nonatomic,strong) UIButton *collectButton; -///设置 -@property (nonatomic,strong) UIButton *settingButton; -///话题设置 -@property (nonatomic, strong) UIButton *topicButton; -///代理 -@property (nonatomic, weak) id hostDelegate; -///右侧推荐房间 -@property (nonatomic, strong) XPRoomRecommendView *recommendRoomView; -///返回按钮，最小化 -@property (nonatomic,strong) UIButton *backBtn; -///是否已发送过收藏房间公屏消息 -@property (nonatomic, assign) BOOL hadShowCollectInScreen; -@end - -@implementation RoomHeaderView - -- (instancetype)initWithDelegate:(id)delegate { - self = [super init]; - if (self) { - _hostDelegate = delegate; - [self initSubViews]; - [self initSubViewConstraints]; - [self setupTurboModeNotifications]; - } - return self; -} - -#pragma mark - Event Response -- (void)backButtonAction:(UIButton *)sender { - [self.hostDelegate miniRoom]; -} - -- (void)settingButtonAction:(UIButton *)sender { - self.recommendRoomView.frame = CGRectMake(KScreenWidth, 0, 250, KScreenHeight); - FFPopup *popup = [FFPopup popupWithContentView:self.recommendRoomView]; - popup.showType = isMSRTL() ? FFPopupShowType_SlideInFromLeft:FFPopupShowType_SlideInFromRight; - popup.dismissType = isMSRTL() ? FFPopupDismissType_SlideOutToLeft : FFPopupDismissType_SlideOutToRight; - popup.maskType = FFPopupMaskType_Dimmed; - popup.dimmedMaskAlpha = 0.0; - popup.shouldDismissOnBackgroundTouch = YES; - FFPopupHorizontalLayout horizontalLayout = isMSRTL() ? FFPopupHorizontalLayout_Left : FFPopupHorizontalLayout_Right; - FFPopupVerticalLayout verticalLayout = FFPopupVerticalLayout_Center; - [popup showWithLayout:FFPopupLayoutMake(horizontalLayout, verticalLayout) duration:0.0]; - @kWeakify(self); - popup.didFinishDismissingBlock = ^{ - @kStrongify(self); - [self.recommendRoomView removeFromSuperview]; - }; - popup.didFinishShowingBlock = ^{ - - }; - [Api reqeustRecommendRoom:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - NSArray *array = [XPRoomRecommendModel modelsWithArray:data.data]; - self.recommendRoomView.roomList = [NSMutableArray arrayWithArray:array]; - } - } roomId:[NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]]; -} - -- (void)topicButtonAction:(UIButton *)sender { - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request - completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error== nil) { - NIMChatroomMember* member = members.firstObject; - RoomInfoModel * roomInfo= self.hostDelegate.getRoomInfo; - if (member.type == NIMChatroomMemberTypeCreator || member.type == NIMChatroomMemberTypeManager) { - XPRoomTopicViewController * editTopicVC = [[XPRoomTopicViewController alloc] init]; - editTopicVC.roomInfo = roomInfo; - [self.hostDelegate.getCurrentNav pushViewController:editTopicVC animated:YES]; - } else { - TTPopupService * config = [[TTPopupService alloc] init]; - XPRoomTopicAlertView * alertView = [[XPRoomTopicAlertView alloc] init]; - alertView.title = roomInfo.roomDesc; - alertView.message = roomInfo.introduction; - config.contentView = alertView; - [TTPopup popupWithConfig:config]; - } - } - }]; -} - -- (void)shareButtonAction:(UIButton *)sender { -// @kWeakify(self); - XPRoomPresenter *presenter = [[XPRoomPresenter alloc] init]; - [presenter getShareLink:@(self.hostDelegate.getRoomInfo.uid).stringValue - success:^(NSString * _Nonnull link) { -// @kStrongify(self); - if (![NSString isEmpty:link]) { - [ShareHelder shareImage:kImage(@"share_icon") //self.hostDelegate.getRoomInfo.avatar - url:link - fromController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - } - } failure:^(NSError * _Nonnull error) { - - }]; -} - -#pragma mark - Private Method -- (void)initSubViews { - - - [self addSubview:self.avatarView]; - [self addSubview:self.nickStackView]; - [self addSubview:self.collectButton]; - - [self addSubview:self.settingButton]; - [self addSubview:self.topicButton]; - [self addSubview:self.shareButton]; - [self addSubview:self.backBtn]; - [self.nickStackView addArrangedSubview:self.titleStackView]; - [self.nickStackView addArrangedSubview:self.onlineStackView]; - - - [self.onlineStackView addArrangedSubview:self.idLabel]; - - [self.titleStackView addArrangedSubview:self.titleLabel]; - [self.titleStackView addArrangedSubview:self.noGiftEffectImageView]; - [self.titleStackView addArrangedSubview:self.lockRoomImageView]; - [self.titleStackView addArrangedSubview:self.levelImageView]; -} - -- (void)initSubViewConstraints { - // 设置 - [self.settingButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-15); - make.bottom.mas_equalTo(-11); - make.width.height.mas_equalTo(22); - }]; - - [self.topicButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-45); - make.bottom.mas_equalTo(-11); - make.width.height.mas_equalTo(22); - }]; - - [self.collectButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.settingButton); - make.trailing.mas_equalTo(-75); -// make.trailing.equalTo(self.topicButton.mas_leading).mas_offset(-5); - make.size.mas_equalTo(CGSizeMake(20, 20)); - }]; - [self.shareButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.collectButton); - make.trailing.mas_equalTo(self.collectButton.mas_leading).offset(-6); - make.size.mas_equalTo(CGSizeMake(24, 24)); - }]; - - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self).offset(35); - make.width.height.mas_equalTo(31); - make.centerY.mas_equalTo(self.settingButton); - }]; - [self.nickStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.settingButton); - make.leading.equalTo(self.avatarView.mas_trailing).mas_offset(6); - make.trailing.mas_equalTo(self.shareButton.mas_leading); - }]; - [self.titleStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_greaterThanOrEqualTo(50); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_lessThanOrEqualTo(150); -// make.height.mas_equalTo(12); - }]; - - [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(7); - }]; - - [self.noGiftEffectImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20,20)); - }]; - - [self.lockRoomImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20,20)); - }]; - - [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(40,16)); - }]; - - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.height.width.mas_equalTo(20); - make.centerY.mas_equalTo(self.settingButton); - }]; -} - -- (void)updateLevel:(NSString *)levelIcon { - self.levelImageView.imageUrl = levelIcon; -} - -#pragma mark - RoomGuestDelegate -- (void)onRoomEntered { - [self handleRoomInfoChange:NO]; -} - -- (void)onRoomUpdate { - [self handleRoomInfoChange:YES]; -} - -- (void)handleRoomInfoChange:(BOOL)isUpdate { - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - if (roomInfo) { - self.idLabel.text = [NSString stringWithFormat:@"ID：%ld",(long)roomInfo.erbanNo]; - self.avatarView.imageUrl = roomInfo.avatar; - self.titleLabel.text = roomInfo.title; - - // 初始化时直接使用 isGiftEffectsEnabledForRoom: 的状态 - [self updateGiftEffectImageViewVisibility]; - - if (roomInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - self.collectButton.hidden = YES; - } else { - self.collectButton.hidden = NO; - } - if (!isUpdate) { - self.collectButton.selected = roomInfo.isRoomFans; // 收藏后，房间数据没有及时更新到 room info，此时不需读 room info 状态 - } - self.lockRoomImageView.hidden = roomInfo.roomPwd.length <= 0; - self.levelImageView.hidden = [NSString isEmpty:roomInfo.roomLevelIcon]; - self.levelImageView.imageUrl = roomInfo.roomLevelIcon; - } -} - - - -#pragma mark - Event Response -- (void)collectButtonAction:(UIButton *)sender { - NSString * type = self.collectButton.selected ? @"2" : @"1"; - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - @kWeakify(self); - [Api collectRoom:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - self.collectButton.selected = !self.collectButton.selected; - if ([type isEqualToString:@"1"]) {///收藏的话 - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"RoomHeaderView6")]; - if (self.hadShowCollectInScreen) { - return; - } - self.hadShowCollectInScreen = YES; - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - [dic setValue:[AccountInfoStorage instance].getUid forKey:@"uid"]; - [dic setValue:self.hostDelegate.getUserInfo.nick forKey:@"nick"]; - [dic setValue:[NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid] forKey:@"targetUid"]; - [dic setValue:self.hostDelegate.getRoomInfo.nick forKey:@"targetNick"]; - NSDictionary * data = @{@"data":dic}; - AttachmentModel *attachment = [[AttachmentModel alloc]init]; - attachment.first = CustomMessageType_Collection_Room; - attachment.second = Custom_Message_Sub_Collect_Room_Tips; - attachment.data = data; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - NSString *sessionId = [NSString stringWithFormat:@"%ld",self.hostDelegate.getRoomInfo.roomId]; - //构造会话 - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - } - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:roomUid uid:uid type:type roomUids:@""]; -} - - -#pragma mark - XPRoomRecommendViewDelegate -- (void)xPRoomRecommendViewReport { - TTActionSheetConfig *action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"RoomHeaderView10") clickAction:^{ - [FFPopup dismissPopupForView:self.recommendRoomView animated:NO]; - [self.hostDelegate requesstShieldingAction]; - }]; - TTActionSheetConfig *action1 = [TTActionSheetConfig normalTitle:YMLocalizedString(@"RoomHeaderView12") clickAction:^{ - [FFPopup dismissPopupForView:self.recommendRoomView animated:NO]; - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:@(self.hostDelegate.getRoomInfo.uid).stringValue]; - NSString *urlstr = [NSString stringWithFormat:@"%@?reportUid=%ld&source=ROOM", URLWithType(kReportRoomURL),self.hostDelegate.getRoomInfo.uid]; - webVC.url = urlstr; - [[self.hostDelegate getCurrentNav] pushViewController:webVC animated:YES]; - }]; - [TTPopup actionSheetWithItems:@[action,action1]]; -} - -- (void)xPRoomRecommendViewMiniRoom { - [FFPopup dismissPopupForView:self.recommendRoomView animated:NO]; - [self.hostDelegate miniRoom]; -} - -- (void)xPRoomRecommendViewExitRoom { - [FFPopup dismissPopupForView:self.recommendRoomView animated:NO]; - [self.hostDelegate exitRoom]; -} - -- (void)xPRoomRecommendViewJumpToRoom:(NSString *)roomUid { - [FFPopup dismissPopupForView:self.recommendRoomView animated:NO]; - [self.hostDelegate exitRoom]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); -} - -#pragma mark - Getters And Setters -- (UIButton *)settingButton { - if (!_settingButton) { - _settingButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_settingButton setImage:kImage(@"room_info_setting") forState:UIControlStateNormal]; - [_settingButton addTarget:self action:@selector(settingButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_settingButton setEnlargeEdgeWithTop:8 right:8 bottom:8 left:8]; - } - return _settingButton; -} - -- (UIButton *)shareButton { - if (!_shareButton) { - _shareButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_shareButton setImage:[UIImage imageNamed:@"room_share"] forState:UIControlStateNormal]; - [_shareButton addTarget:self action:@selector(shareButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_shareButton setEnlargeEdgeWithTop:8 right:8 bottom:8 left:8]; - } - return _shareButton; -} - -- (UIButton *)topicButton { - if (!_topicButton) { - _topicButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_topicButton setImage:[UIImage imageNamed:@"room_header_topic_icon"] forState:UIControlStateNormal]; - [_topicButton addTarget:self action:@selector(topicButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_topicButton setEnlargeEdgeWithTop:8 right:8 bottom:8 left:8]; - } - return _topicButton; -} - -- (UIButton *)collectButton { - if (!_collectButton) { - _collectButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_collectButton setImage:kImage(@"ms_room_top_no_collect") forState:UIControlStateNormal]; - [_collectButton setImage:kImage(@"ms_room_top_collect") forState:UIControlStateSelected]; - _collectButton.hidden = YES; - [_collectButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_collectButton addTarget:self action:@selector(collectButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _collectButton; -} - -- (UIStackView *)nickStackView { - if (!_nickStackView) { - _nickStackView = [[UIStackView alloc] init]; - _nickStackView.axis = UILayoutConstraintAxisVertical; - _nickStackView.distribution = UIStackViewDistributionFill; - _nickStackView.alignment = UIStackViewAlignmentLeading; - _nickStackView.spacing = 4; - } - return _nickStackView; -} - -- (UIStackView *)titleStackView { - if (!_titleStackView) { - _titleStackView = [[UIStackView alloc] init]; - _titleStackView.axis = UILayoutConstraintAxisHorizontal; - _titleStackView.distribution = UIStackViewDistributionFill; - _titleStackView.alignment = UIStackViewAlignmentCenter; - _titleStackView.spacing = 5; - } - return _titleStackView; -} - -- (MarqueeLabel *)titleLabel{ - if (!_titleLabel) { - _titleLabel = [[MarqueeLabel alloc] init]; - _titleLabel.scrollDuration = 8.0; - _titleLabel.fadeLength = 6.0f; - _titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightBold]; - _titleLabel.textColor = UIColorFromRGB(0xEFEBF3); - _titleLabel.userInteractionEnabled = YES; - } - return _titleLabel; -} - -- (UIImageView *)noGiftEffectImageView { - if (!_noGiftEffectImageView) { - _noGiftEffectImageView = [[UIImageView alloc] init]; - _noGiftEffectImageView.userInteractionEnabled = YES; - _noGiftEffectImageView.image = [UIImage imageNamed:@"room_info_disable_gift_effect"]; - _noGiftEffectImageView.hidden = YES; - } - return _noGiftEffectImageView; -} - -- (UIImageView *)lockRoomImageView { - if (!_lockRoomImageView) { - _lockRoomImageView = [[UIImageView alloc] init]; - _lockRoomImageView.userInteractionEnabled = YES; - _lockRoomImageView.image = [UIImage imageNamed:@"room_info_lock_room"]; - _lockRoomImageView.hidden = YES; - } - return _lockRoomImageView; -} - -- (UIStackView *)onlineStackView { - if (!_onlineStackView) { - _onlineStackView = [[UIStackView alloc] init]; - _onlineStackView.axis = UILayoutConstraintAxisHorizontal; - _onlineStackView.distribution = UIStackViewDistributionFill; - _onlineStackView.alignment = UIStackViewAlignmentCenter; - _onlineStackView.spacing = 2; - } - return _onlineStackView; -} - -- (YYLabel *)idLabel { - if (!_idLabel) { - _idLabel = [[YYLabel alloc] init]; - _idLabel.textColor = [UIColor whiteColor]; - _idLabel.font = [UIFont systemFontOfSize:9 weight:UIFontWeightBold]; - - } - return _idLabel; -} - -- (XPRoomRecommendView *)recommendRoomView { - if (!_recommendRoomView) { - _recommendRoomView = [[XPRoomRecommendView alloc] init]; - self.recommendRoomView.delegate = self; - } - return _recommendRoomView; -} - -- (UIButton *)backBtn{ - if (!_backBtn){ - _backBtn = [UIButton new]; - [_backBtn setBackgroundImage:[[UIImage imageNamed:@"common_nav_back_white"] ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backBtn addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; -// [_backBtn setCornerWithLeftTopCorner:10 rightTopCorner:10 bottomLeftCorner:10 bottomRightCorner:10 size:CGSizeMake(20,20)]; - [_backBtn setEnlargeEdgeWithTop:5 right:5 bottom:5 left:5]; - - } - return _backBtn; -} -- (NetImageView *)avatarView{ - if(!_avatarView){ - NetImageConfig *config = [NetImageConfig new]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarView = [[NetImageView alloc]initWithConfig:config]; - _avatarView.layer.cornerRadius = 31/2; - _avatarView.layer.masksToBounds = YES; - _avatarView.layer.borderWidth = 1; - _avatarView.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _avatarView; -} - -- (NetImageView *)levelImageView{ - if(!_levelImageView){ - _levelImageView = [[NetImageView alloc]init]; - } - return _levelImageView; -} - -#pragma mark - Turbo Mode Methods - -- (void)setupTurboModeNotifications { - // 监听 Turbo Mode 礼物特效开关状态变化 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTurboGiftEffectsStateChanged:) - name:kTurboGiftEffectsEnabledChanged - object:nil]; -} - -- (void)updateGiftEffectImageViewVisibility { - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - if (!roomInfo) return; - - NSString *roomId = @(roomInfo.roomId).stringValue; - BOOL turboGiftEffectsEnabled = [[TurboModeStateManager sharedManager] isGiftEffectsEnabledForRoom:roomId]; - - // 当 turboGiftEffectsEnabled 为 NO 时，显示 noGiftEffectImageView - // 只使用 turboGiftEffectsEnabled 状态，不依赖 roomInfo.hasAnimationEffect - BOOL shouldShow = !turboGiftEffectsEnabled; - self.noGiftEffectImageView.hidden = !shouldShow; - - NSLog(@"🎮 RoomHeaderView: giftEffectImageView 显示状态更新 - 房间ID: %@, turboGiftEffects: %@, 显示: %@", - roomId, turboGiftEffectsEnabled ? @"开启" : @"关闭", shouldShow ? @"是" : @"否"); -} - -- (void)handleTurboGiftEffectsStateChanged:(NSNotification *)notification { - NSLog(@"🎮 RoomHeaderView: 收到 Turbo Mode 礼物特效状态变化通知"); - [self updateGiftEffectImageViewVisibility]; -} - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomHostDelegate.h b/YuMi/Modules/YMRoom/View/RoomHostDelegate.h deleted file mode 100644 index 7fb47f9..0000000 --- a/YuMi/Modules/YMRoom/View/RoomHostDelegate.h +++ /dev/null @@ -1,62 +0,0 @@ -// -// RoomDelegate.h -// YUMI -// -// Created by zu on 2021/10/26. -// - -#import -#import "MicroQueueProtocol.h" -#import "RoomAnimationProtocol.h" - -NS_ASSUME_NONNULL_BEGIN - -@class RoomInfoModel; -@class UserInfoModel; - -/** RoomVC 与子 View 之间的通信协议。 - - 调用方向：子 View —> RoomHostDelegate。 - - **Note:** - - 继承 MicroQueueProtocol、RoomAnimationProtocol 等协议是为了做桥接。 - 实现后的调用方向：子 View —> RoomHostDelegate —> XXXProtocol（RoomGuestDelegate）。 - - */ -@protocol RoomHostDelegate - -@optional //MARK: 不清楚哪些是必要的，添加 @optional 只是为了重构时忽略 warning - -- (RoomInfoModel*)getRoomInfo; -- (UserInfoModel*)getUserInfo; -- (BOOL)isManagerOrOwner; -- (void)exitRoom; -- (void)miniRoom; -- (void)showPKPanel; -- (UINavigationController *)getCurrentNav; --(UIView *)getSuperView; -- (NSArray *)getRoomSuperAdminList; -///获取房间PK队伍的 -- (NSArray *)getRoomPKGroupTeamList; -///房间内PK是否正在进行 -- (BOOL)isRoomPKPlaying; -- (BOOL)getIsMiniEnter; -///屏蔽 --(void)requesstShieldingAction; - -///获取活动列表 --(NSMutableArray *)getPlayList; - -///获取小游戏列表 --(NSMutableArray *)getLittleGameList; - --(NSInteger)getPublicScreenType; - -- (void)displayMusicPanel; - -- (void)updateScreenMessageState:(BOOL)isClose; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomMode/RoomModePresenter.h b/YuMi/Modules/YMRoom/View/RoomMode/RoomModePresenter.h deleted file mode 100644 index 6580633..0000000 --- a/YuMi/Modules/YMRoom/View/RoomMode/RoomModePresenter.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// RoomModePresenter.h -// YuMi -// -// Created by P on 2024/12/23. -// - -#import "BaseMvpPresenter.h" - -#import "RoomInfoModel.h" -#import "RoomLevelInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomModePresenter : BaseMvpPresenter - -- (void)loadRoomLevelInfo:(NSInteger)roomUid - success:(void(^)(RoomLevelInfoModel *model))success - failure:(void(^)(NSError *error))failure; - -- (void)updateRoomMode:(RoomType)type - micSkinID:(NSInteger)micSkinID - micEffectID:(NSInteger)micEffectID - forRoom:(RoomInfoModel *)roomInfo - success:(void(^)(void))success - failure:(void(^)(NSError *error))failure; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomMode/RoomModePresenter.m b/YuMi/Modules/YMRoom/View/RoomMode/RoomModePresenter.m deleted file mode 100644 index a01e64d..0000000 --- a/YuMi/Modules/YMRoom/View/RoomMode/RoomModePresenter.m +++ /dev/null @@ -1,66 +0,0 @@ -// -// RoomModePresenter.m -// YuMi -// -// Created by P on 2024/12/23. -// - -#import "RoomModePresenter.h" - -#import "Api+RoomSetting.h" - -@implementation RoomModePresenter - -- (void)loadRoomLevelInfo:(NSInteger)roomUid - success:(void(^)(RoomLevelInfoModel *model))success - failure:(void(^)(NSError *error))failure { - [Api roomLevelInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - RoomLevelInfoModel *model = [RoomLevelInfoModel modelWithJSON:data.data]; - NSMutableArray *tempArray_micSkin = @[[RoomMicInfoModel emptySkinModel]].mutableCopy; - [tempArray_micSkin addObjectsFromArray:model.micSkins]; - NSMutableArray *tempArray_micEffect = @[[RoomMicInfoModel emptyEffectModel]].mutableCopy; - [tempArray_micEffect addObjectsFromArray:model.micEffects]; - model.micEffects = tempArray_micEffect.copy; - model.micSkins = tempArray_micSkin.copy; - success(model); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] roomUid:@(roomUid).stringValue]; -} - -- (void)updateRoomMode:(RoomType)type - micSkinID:(NSInteger)micSkinID - micEffectID:(NSInteger)micEffectID - forRoom:(RoomInfoModel *)roomInfo - success:(void(^)(void))success - failure:(void(^)(NSError *error))failure { - NSMutableDictionary * params = [NSMutableDictionary dictionary]; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [params setObject:ticket forKey:@"ticket"]; - [params setObject:@(roomInfo.uid).stringValue forKey:@"uid"]; - [params setObject:[NSString stringWithFormat:@"%ld", roomInfo.uid] forKey:@"roomUid"]; - if (roomInfo.title.length > 0) { - [params setObject:roomInfo.title forKey:@"title"]; - } - - [params setObject:@(micSkinID) forKey:@"usedMicSkinId"]; - [params setObject:@(micEffectID) forKey:@"usedMicEffectId"]; - - [params setObject:@(type) forKey:@"type"]; - - [Api ownerUpdateRoomInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - success(); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] params:params]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.h b/YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.h deleted file mode 100644 index 1de7df7..0000000 --- a/YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// RoomModeViewController.h -// YuMi -// -// Created by P on 2024/12/23. -// - -#import "MvpViewController.h" -@class RoomInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface RoomModeViewController : MvpViewController - -@property(nonatomic, strong) RoomInfoModel *roomInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.m b/YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.m deleted file mode 100644 index a9e4206..0000000 --- a/YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.m +++ /dev/null @@ -1,1209 +0,0 @@ -// -// RoomModeViewController.m -// YuMi -// -// Created by P on 2024/12/23. -// - -#import "RoomModeViewController.h" - -#import - -#import "RoomModePresenter.h" -#import "RoomResourceManager.h" -#import "XPWebViewController.h" - -@interface RoomModeCollectionCell : UICollectionViewCell -@property(nonatomic, strong) RoomMicInfoModel *micInfoModel; -@property(nonatomic, strong) UIView *statusView; -@property(nonatomic, strong) NetImageView *imageView; -@property(nonatomic, strong) SVGAImageView *svgaImageView; -@property(nonatomic, strong) SVGAParser *parser; -@property(nonatomic, strong) UILabel *nameLabel; -@property(nonatomic, assign) BOOL isForRoomType; -@property(nonatomic, copy) NSString *roomTypeImageName; - -+ (void)registerTo:(UICollectionView *)collectionView; -+ (RoomModeCollectionCell *)cellFro:(UICollectionView *)collectionView indexPath:(NSIndexPath *)indexPath displayName:(BOOL)displayName; - -// 阿语布局环境下可能会有重复的内容显示，尝试每个 cell 都独立一个 id -+ (void)registerTo:(UICollectionView *)collectionView forIndex:(NSInteger)index; -+ (RoomModeCollectionCell *)cellFroIndex:(UICollectionView *)collectionView indexPath:(NSIndexPath *)indexPath displayName:(BOOL)displayName; -@end - -@implementation RoomModeCollectionCell - -+ (void)registerTo:(UICollectionView *)collectionView { - [collectionView registerClass:[self class] forCellWithReuseIdentifier:@"RoomModeCollectionCell"]; -} - -+ (void)registerTo:(UICollectionView *)collectionView forIndex:(NSInteger)index { - [collectionView registerClass:[self class] forCellWithReuseIdentifier:[NSString stringWithFormat:@"RoomModeCollectionCell_%@", @(index)]]; -} - -+ (RoomModeCollectionCell *)cellFro:(UICollectionView *)collectionView indexPath:(NSIndexPath *)indexPath displayName:(BOOL)displayName { - RoomModeCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"RoomModeCollectionCell" forIndexPath:indexPath]; - cell.nameLabel.hidden = !displayName; - return cell; -} - -+ (RoomModeCollectionCell *)cellFroIndex:(UICollectionView *)collectionView indexPath:(NSIndexPath *)indexPath displayName:(BOOL)displayName { - RoomModeCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:[NSString stringWithFormat:@"RoomModeCollectionCell_%@", @(indexPath.row)] - forIndexPath:indexPath]; - cell.nameLabel.hidden = !displayName; - return cell; -} - -- (void)dealloc { - if (_svgaImageView) { - [self.svgaImageView stopAnimation]; - } -} - -- (void)layoutSubviews { - [super layoutSubviews]; -} - -- (void)prepareForReuse { - [super prepareForReuse]; - self.imageView.image = nil; - if (_svgaImageView) { - [self.svgaImageView stopAnimation]; - } -} - -- (void)setMicInfoModel:(RoomMicInfoModel *)micInfoModel { - _micInfoModel = micInfoModel; - - if ([micInfoModel.id isEqualToString:@"-1"]) { - if (micInfoModel.dressType == MicResourceType_Skin) { - self.imageView.image = kImage(@"room_mode_default_skin"); - }else { - self.imageView.image = kImage(@"room_mic_normal"); - [self.imageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.statusView); - make.width.height.mas_equalTo(self.statusView.mas_height).multipliedBy(0.9); - }]; - } - } else { - if (micInfoModel.dressType == MicResourceType_Skin) { - self.imageView.imageUrl = micInfoModel.normalMicUrl; - } else { - [self playSVGA:micInfoModel.normalMicUrl]; - } - } -} - -- (void)setIsForRoomType:(BOOL)isForRoomType { - _isForRoomType = isForRoomType; - if (isForRoomType) { - [self.imageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.statusView); - make.width.height.mas_equalTo(self.statusView.mas_height).multipliedBy(0.8); - }]; - } -} - -- (void)playSVGA:(NSString *)path{ - if (!_svgaImageView) { - [self.contentView addSubview:self.svgaImageView]; - [self.svgaImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.statusView); - make.width.height.mas_equalTo(self.statusView.mas_height).multipliedBy(0.85); - }]; - } - @kWeakify(self); - [self.parser parseWithURL:[NSURL URLWithString:path] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - self.svgaImageView.loops = INT_MAX; - self.svgaImageView.clearsAfterStop = YES; - self.svgaImageView.videoItem = videoItem; - [self.svgaImageView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { }]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self.contentView addSubview:self.statusView]; - [self.statusView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(87); - }]; - - [self.contentView addSubview:self.nameLabel]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.statusView.mas_bottom).offset(4); - make.leading.trailing.mas_equalTo(self.statusView); - make.height.mas_equalTo(18); - }]; - - [self.contentView addSubview:self.imageView]; - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.statusView); - make.width.height.mas_equalTo(self.statusView.mas_height).multipliedBy(0.65); - }]; - } - return self; -} - -- (void)setSelected:(BOOL)selected { - self.statusView.layer.borderWidth = selected ? 1 : 0; - self.statusView.backgroundColor = selected ? UIColorRGBAlpha(0xFF8C03, 0.1) : UIColorFromRGB(0x1b1b1d); - self.nameLabel.textColor = [UIColor colorWithWhite:1 alpha:selected ? 1 : 0.5]; - if (self.isForRoomType) { - NSString *imageName = [NSString stringWithFormat:@"%@_%@", self.roomTypeImageName, selected ? @"on" : @"off"]; - self.imageView.image = kImage(imageName); - } -} - -- (UIView *)statusView { - if (!_statusView) { - _statusView = [[UIView alloc] init]; - _statusView.backgroundColor = UIColorFromRGB(0x1b1b1d); - _statusView.layer.borderColor = UIColorFromRGB(0xFF8C03).CGColor; - _statusView.layer.borderWidth = 0; - [_statusView setCornerRadius:12]; - } - return _statusView; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [UILabel labelInitWithText:@"?" font:kFontRegular(13) textColor:[UIColor whiteColor]]; - _nameLabel.textAlignment = NSTextAlignmentCenter; - } - return _nameLabel; -} - -- (NetImageView *)imageView { - if (!_imageView) { - _imageView = [[NetImageView alloc] init]; - _imageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _imageView; -} - -- (SVGAImageView *)svgaImageView { - if (!_svgaImageView) { - _svgaImageView = [[SVGAImageView alloc] init]; - _svgaImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _svgaImageView; -} - -- (SVGAParser *)parser{ - if(!_parser){ - _parser = [SVGAParser new]; - } - return _parser; -} - -@end - -@interface RoomModeOwnerCard : UITableViewCell -@property(nonatomic, strong) RoomInfoModel *roomInfo; -@property(nonatomic, strong) RoomLevelInfoModel *LevelInfo; -@property(nonatomic, strong) UIImageView *backgroundImageView; -@property(nonatomic, strong) NetImageView *avatarImage; -@property(nonatomic, strong) UILabel *nameLabel; -@property(nonatomic, strong) NetImageView *levelImage; -@property(nonatomic, strong) UILabel *valueLabel; -@property(nonatomic, strong) UILabel *adminLabel; -@property(nonatomic, strong) UILabel *currentLevelLabel; -@property(nonatomic, strong) UILabel *nextLevelLabel; -@property(nonatomic, strong) UIProgressView *expProgressView; -@property(nonatomic, strong) UILabel *expToNextLabel; - -+ (void)registerTo:(UITableView *)tableView; -+ (RoomModeOwnerCard *)cellFro:(UITableView *)tableView - indexPath:(NSIndexPath *)indexPath - roomInfo:(RoomInfoModel *)roomInfo - levelInfo:(RoomLevelInfoModel *)levelInfo; -@end - -@implementation RoomModeOwnerCard - -+ (CGFloat)cellHeight { - return 7 + 176 + 0; -} - -+ (void)registerTo:(UITableView *)tableView { - [tableView registerClass:[self class] forCellReuseIdentifier:@"RoomModeOwnerCard"]; -} - -+ (RoomModeOwnerCard *)cellFro:(UITableView *)tableView - indexPath:(NSIndexPath *)indexPath - roomInfo:(RoomInfoModel *)roomInfo - levelInfo:(RoomLevelInfoModel *)levelInfo { - RoomModeOwnerCard *card = [tableView dequeueReusableCellWithIdentifier:@"RoomModeOwnerCard" forIndexPath:indexPath]; - card.selectionStyle = UITableViewCellSelectionStyleNone; - card.backgroundColor = [UIColor clearColor]; - card.contentView.backgroundColor = [UIColor clearColor]; - card.roomInfo = roomInfo; - card.LevelInfo = levelInfo; - return card; -} - -- (void)setRoomInfo:(RoomInfoModel *)roomInfo { - _roomInfo = roomInfo; - self.avatarImage.imageUrl = roomInfo.avatar; - self.nameLabel.text = roomInfo.title; -} - -- (void)setLevelInfo:(RoomLevelInfoModel *)LevelInfo { - _LevelInfo = LevelInfo; - self.levelImage.imageUrl = LevelInfo.currentLevelIcon; - self.expProgressView.progress = (LevelInfo.roomVal - LevelInfo.currentLevelExp) * 100.0 / (LevelInfo.nextLevelExp - LevelInfo.currentLevel) / 100.0; - - if (LevelInfo.nextLevel == 0) { - self.nextLevelLabel.text = [NSString stringWithFormat:@"%@%@", YMLocalizedString(@"1.0.33_text_9"), @(LevelInfo.currentLevel)]; - self.currentLevelLabel.text = [NSString stringWithFormat:@"%@%@", YMLocalizedString(@"1.0.33_text_9"), @(LevelInfo.currentLevel - 1)]; - self.expProgressView.progress = 1; - self.expToNextLabel.hidden = YES; - } else { - self.expToNextLabel.hidden = NO; - self.nextLevelLabel.text = [NSString stringWithFormat:@"%@%@", YMLocalizedString(@"1.0.33_text_9"), @(LevelInfo.nextLevel)]; - self.currentLevelLabel.text = [NSString stringWithFormat:@"%@%@", YMLocalizedString(@"1.0.33_text_9"), @(LevelInfo.currentLevel)]; - } - self.valueLabel.text = [NSString stringWithFormat:@"%@%@", YMLocalizedString(@"1.0.33_text_6"), @(LevelInfo.roomVal)]; - self.adminLabel.text = [NSString stringWithFormat:YMLocalizedString(@"1.0.33_text_7"), @(LevelInfo.currentManagerNum), @(LevelInfo.managerLimitNum)]; - self.expToNextLabel.text = [NSString stringWithFormat:@"%@%@", YMLocalizedString(@"1.0.33_text_8"), @(LevelInfo.nextLevelExp - LevelInfo.roomVal)]; -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self.contentView addSubview:self.backgroundImageView]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(7); - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.height.mas_equalTo(176); - }]; - - [self.contentView addSubview:self.avatarImage]; - [self.avatarImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.mas_equalTo(self.backgroundImageView).offset(18); - make.size.mas_equalTo(CGSizeMake(79, 79)); - }]; - - [self.contentView addSubview:self.nameLabel]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImage); - make.leading.mas_equalTo(self.avatarImage.mas_trailing).offset(12); - make.trailing.mas_equalTo(self.backgroundImageView); - make.height.mas_equalTo(22); - }]; - - [self.contentView addSubview:self.levelImage]; - [self.levelImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.nameLabel.mas_bottom).offset(1); - make.leading.mas_equalTo(self.nameLabel); - make.size.mas_equalTo(CGSizeMake(52, 20)); - }]; - - [self.contentView addSubview:self.valueLabel]; - [self.valueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.levelImage.mas_bottom).offset(1); - make.leading.mas_equalTo(self.nameLabel); - make.height.mas_equalTo(18); - }]; - - [self.contentView addSubview:self.adminLabel]; - [self.adminLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.valueLabel.mas_bottom).offset(1); - make.leading.mas_equalTo(self.nameLabel); - make.height.mas_equalTo(18); - }]; - - [self.contentView addSubview:self.currentLevelLabel]; - [self.currentLevelLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImage); - make.top.mas_equalTo(self.avatarImage.mas_bottom).offset(12); - make.height.mas_equalTo(18); - }]; - - [self.contentView addSubview:self.nextLevelLabel]; - [self.nextLevelLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.backgroundImageView).offset(-16); - make.top.mas_equalTo(self.avatarImage.mas_bottom).offset(12); - make.height.mas_equalTo(18); - }]; - - [self.contentView addSubview:self.expProgressView]; - [self.expProgressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.currentLevelLabel); - make.trailing.mas_equalTo(self.nextLevelLabel); - make.top.mas_equalTo(self.currentLevelLabel.mas_bottom).offset(4); - make.height.mas_equalTo(6); - }]; - - [self.contentView addSubview:self.expToNextLabel]; - [self.expToNextLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backgroundImageView); - make.bottom.mas_equalTo(self.backgroundImageView).offset(-13); - make.height.mas_equalTo(18); - }]; - } - return self; -} - -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] initWithImage:kImage(@"room_mode_card_bg")]; - } - return _backgroundImageView; -} - -- (NetImageView *)avatarImage { - if (!_avatarImage) { - _avatarImage = [[NetImageView alloc] init]; - [_avatarImage setCornerRadius:8 - corners:kCALayerMaxXMaxYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMinXMinYCorner - borderWidth:1 borderColor:[UIColor whiteColor]]; - } - return _avatarImage; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [UILabel labelInitWithText:@"" font:kFontMedium(16) textColor:[UIColor whiteColor]]; - } - return _nameLabel; -} - -- (NetImageView *)levelImage { - if (!_levelImage) { - _levelImage = [[NetImageView alloc] init]; - } - return _levelImage; -} - -- (UILabel *)valueLabel { - if (!_valueLabel) { - _valueLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.33_text_6") font:kFontRegular(12) textColor:[UIColor colorWithWhite:1 alpha:0.8]]; - } - return _valueLabel; -} - -- (UILabel *)adminLabel { - if (!_adminLabel) { - _adminLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.33_text_7") font:kFontRegular(12) textColor:[UIColor colorWithWhite:1 alpha:0.8]]; - } - return _adminLabel; -} - -- (UILabel *)currentLevelLabel { - if (!_currentLevelLabel) { - _currentLevelLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.33_text_9") font:kFontMedium(12) textColor:[UIColor whiteColor]]; - } - return _currentLevelLabel; -} - -- (UILabel *)nextLevelLabel { - if (!_nextLevelLabel) { - _nextLevelLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.33_text_9") font:kFontMedium(12) textColor:[UIColor whiteColor]]; - _nextLevelLabel.textAlignment = NSTextAlignmentRight; - } - return _nextLevelLabel; -} - -- (UIProgressView *)expProgressView { - if (!_expProgressView) { - _expProgressView = [[UIProgressView alloc] init]; - _expProgressView.progressTintColor = [UIColor whiteColor]; - _expProgressView.trackTintColor = [UIColor colorWithWhite:1 alpha:0.2]; - _expProgressView.progress = 0.0; - } - return _expProgressView; -} - -- (UILabel *)expToNextLabel { - if (!_expToNextLabel) { - _expToNextLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.33_text_8") font:kFontRegular(12) textColor:[UIColor colorWithWhite:1 alpha:0.8]]; - } - return _expToNextLabel; -} - -@end - -@interface RoomModeTypeCard : UITableViewCell - -@property(nonatomic, strong) UICollectionView *collectionView; - -@property(nonatomic, assign) RoomType type; -@property(nonatomic, copy)NSArray *dataSource; -@property(nonatomic, copy) void(^updateSelectedType)(RoomType type); -+ (void)registerTo:(UITableView *)tableView; -+ (RoomModeTypeCard *)cellFro:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath dataSource:(NSArray *)dataSource currentType:(RoomType)type; - -@end - -@implementation RoomModeTypeCard - -+ (CGFloat)cellHeight:(NSInteger)cellCount { - NSInteger line = (cellCount + 3 - 1)/3; - return line * (90 + 4 + 18) + MAX(0, line-1) * 10; -} - -+ (void)registerTo:(UITableView *)tableView { - [tableView registerClass:[self class] forCellReuseIdentifier:@"RoomModeTypeCard"]; -} - -+ (RoomModeTypeCard *)cellFro:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath dataSource:(NSArray *)dataSource currentType:(RoomType)type { - RoomModeTypeCard *card = [tableView dequeueReusableCellWithIdentifier:@"RoomModeTypeCard" forIndexPath:indexPath]; - card.selectionStyle = UITableViewCellSelectionStyleNone; - card.backgroundColor = [UIColor clearColor]; - card.contentView.backgroundColor = [UIColor clearColor]; - card.dataSource = dataSource; - card.type = type; - [card.collectionView reloadData]; - - NSInteger row = 0; - switch (type) { - case RoomType_Room: - row = 0; - break; - case RoomType_10Mic: - row = 1; - break; - case RoomType_15Mic: - row = 2; - break; - case RoomType_19Mic: - if (dataSource.count<4) { - row = 0; - } else { - row = 4; - } - break; - case RoomType_20Mic: - if (dataSource.count<4) { - row = 0; - } else { - row = 3; - } - break; - - default: - row = 0; - break; - } - dispatch_async(dispatch_get_main_queue(), ^{ - if (row < dataSource.count) { - [card.collectionView selectItemAtIndexPath:[NSIndexPath indexPathForRow:row inSection:0] - animated:NO - scrollPosition:UICollectionViewScrollPositionNone]; - } - }); - - return card; -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self.contentView addSubview:self.collectionView]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.bottom.mas_equalTo(self.contentView); - }]; - } - return self; -} - -- (void)setDataSource:(NSArray *)dataSource { - _dataSource = dataSource; - [self.collectionView reloadData]; -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.dataSource.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - RoomModeCollectionCell *cell = [RoomModeCollectionCell cellFro:collectionView indexPath:indexPath displayName:YES]; - cell.isForRoomType = YES; - NSDictionary *dic = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; - if (dic) { - cell.selected = [[dic objectForKey:@"isUses"] boolValue]; - - NSString *imageName = [NSString stringWithFormat:@"room_mode_mic_%@_%@", [dic objectForKey:@"type"], cell.selected ? @"on" : @"off"]; - cell.imageView.image = kImage(imageName); - cell.roomTypeImageName = [NSString stringWithFormat:@"room_mode_mic_%@", [dic objectForKey:@"type"]]; - - cell.nameLabel.text = [dic objectForKey:@"name"]; - } - - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - if (_updateSelectedType) { - RoomType selectedType = RoomType_Room; - switch (indexPath.row) { - case 0: - selectedType = RoomType_Room; - break; - case 1: - selectedType = RoomType_10Mic; - break; - case 2: - selectedType = RoomType_15Mic; - break; - case 3: - selectedType = RoomType_20Mic; - break; - case 4: - selectedType = RoomType_19Mic; - break; - - default: - break; - } - self.updateSelectedType(selectedType); - } -} - -- (UICollectionView *)collectionView { - if (!_collectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake((KScreenWidth - 31 - 14)/3, 87 + 4 + 18); - layout.minimumLineSpacing = 10; - layout.minimumInteritemSpacing = 4; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.scrollEnabled = NO; - [RoomModeCollectionCell registerTo:_collectionView]; - } - return _collectionView; -} - -@end - - -@interface RoomModeMicSkinCard : UITableViewCell - -@property(nonatomic, assign) NSInteger usedID; -@property(nonatomic, assign) NSInteger roomLevel; -@property(nonatomic, strong) UICollectionView *collectionView; -@property(nonatomic, strong) NSMutableArray *skins; - -@property(nonatomic, copy) void(^updateSelectedSkinID)(NSString *skinID); - -+ (void)registerTo:(UITableView *)tableView; -+ (RoomModeMicSkinCard *)cellFro:(UITableView *)tableView - indexPath:(NSIndexPath *)indexPath - skins:(NSArray *)skins - usedID:(NSInteger)usedID - roomLevel:(NSInteger)roomLevel; - -@end - -@implementation RoomModeMicSkinCard - -+ (CGFloat)cellHeight:(NSInteger)cellCount { - NSInteger line = (cellCount + 3 - 1)/3; - return MAX(0, line) * (87) + MAX(0, line-1) * 10; -} - -+ (void)registerTo:(UITableView *)tableView { - [tableView registerClass:[self class] forCellReuseIdentifier:@"RoomModeMicSkinCard"]; -} -+ (RoomModeMicSkinCard *)cellFro:(UITableView *)tableView - indexPath:(NSIndexPath *)indexPath - skins:(NSArray *)skins - usedID:(NSInteger)usedID - roomLevel:(NSInteger)roomLevel { - RoomModeMicSkinCard *card = [tableView dequeueReusableCellWithIdentifier:@"RoomModeMicSkinCard" forIndexPath:indexPath]; - card.selectionStyle = UITableViewCellSelectionStyleNone; - card.backgroundColor = [UIColor clearColor]; - card.contentView.backgroundColor = [UIColor clearColor]; - - card.usedID = usedID; - card.roomLevel = roomLevel; - card.skins = skins.mutableCopy; - if (skins.count > 0) { - [card.collectionView reloadData]; - [card manualSelectedCell]; - } - - return card; -} - -- (void)manualSelectedCell { - __block NSInteger row = 0; - @kWeakify(self); - [self.skins enumerateObjectsUsingBlock:^(RoomMicInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - @kStrongify(self); - if ([obj.id isEqualToString:@(self.usedID).stringValue]) { - row = idx; - *stop = YES; - } - }]; - - [self.collectionView selectItemAtIndexPath:[NSIndexPath indexPathForRow:row inSection:0] - animated:NO - scrollPosition:UICollectionViewScrollPositionNone]; -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self.contentView addSubview:self.collectionView]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.bottom.mas_equalTo(self.contentView); - }]; - [self.collectionView reloadData]; - } - return self; -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.skins.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - RoomModeCollectionCell *cell = [RoomModeCollectionCell cellFro:collectionView indexPath:indexPath displayName:NO]; - cell.micInfoModel = [self.skins xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - RoomMicInfoModel *model = [self.skins xpSafeObjectAtIndex:indexPath.row]; -// if ([model.id isEqualToString:@(self.usedID).stringValue] || (model.id.integerValue == -1 && self.usedID == 0)) { -// return; -// } - if (model.reachLevel <= self.roomLevel) { - if (self.updateSelectedSkinID) { - self.updateSelectedSkinID(model.id); - } - } else { - [self manualSelectedCell]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"1.0.33_text_15")]; - } -} - -- (UICollectionView *)collectionView { - if (!_collectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake((KScreenWidth - 31 - 14)/3, 87); - layout.minimumLineSpacing = 10; - layout.minimumInteritemSpacing = 4; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.scrollEnabled = NO; - [RoomModeCollectionCell registerTo:_collectionView]; - } - return _collectionView; -} - -@end - -@interface RoomModeMicEffectCard : UITableViewCell -@property(nonatomic, assign) NSInteger usedID; -@property(nonatomic, assign) NSInteger roomLevel; -@property(nonatomic, strong) NSMutableArray *effects; -@property(nonatomic, strong) UICollectionView *collectionView; -@property(nonatomic, copy) void(^updateSelectedEffectID)(NSString *effectID); - -+ (void)registerTo:(UITableView *)tableView; -+ (RoomModeMicEffectCard *)cellFro:(UITableView *)tableView - indexPath:(NSIndexPath *)indexPath - effects:(NSArray *)effects - usedID:(NSInteger)usedID - roomLevel:(NSInteger)roomLevel ; - -@end - -@implementation RoomModeMicEffectCard - -+ (CGFloat)cellHeight:(NSInteger)cellCount { - NSInteger line = (cellCount + 3 - 1)/3; - return MAX(0, line) * (87) + MAX(0, line-1) * 10; -} - -+ (void)registerTo:(UITableView *)tableView { - [tableView registerClass:[self class] forCellReuseIdentifier:@"RoomModeMicEffectCard"]; -} - -+ (RoomModeMicEffectCard *)cellFro:(UITableView *)tableView - indexPath:(NSIndexPath *)indexPath - effects:(NSArray *)effects - usedID:(NSInteger)usedID - roomLevel:(NSInteger)roomLevel { - RoomModeMicEffectCard *card = [tableView dequeueReusableCellWithIdentifier:@"RoomModeMicEffectCard" forIndexPath:indexPath]; - card.selectionStyle = UITableViewCellSelectionStyleNone; - card.backgroundColor = [UIColor clearColor]; - card.contentView.backgroundColor = [UIColor clearColor]; - - card.usedID = usedID; - card.roomLevel = roomLevel; - card.effects = effects.mutableCopy; - if (effects.count > 0) { - [card.collectionView reloadData]; - [card manualSelectedCell]; - } - - return card; -} - -- (void)manualSelectedCell { - __block NSInteger row = 0; - @kWeakify(self); - [self.effects enumerateObjectsUsingBlock:^(RoomMicInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - @kStrongify(self); - if ([obj.id isEqualToString:@(self.usedID).stringValue]) { - row = idx; - *stop = YES; - } - }]; - - [self.collectionView selectItemAtIndexPath:[NSIndexPath indexPathForRow:row inSection:0] animated:NO scrollPosition:UICollectionViewScrollPositionNone]; -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self.contentView addSubview:self.collectionView]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.bottom.mas_equalTo(self.contentView); - }]; - [self.collectionView reloadData]; - } - return self; -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.effects.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - RoomModeCollectionCell *cell = [RoomModeCollectionCell cellFro:collectionView indexPath:indexPath displayName:NO]; - cell.micInfoModel = [self.effects xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - RoomMicInfoModel *model = [self.effects xpSafeObjectAtIndex:indexPath.row]; -// if ([model.id isEqualToString:@(self.usedID).stringValue] || (model.id.integerValue == -1 && self.usedID == 0)) { -// return; -// } - if (model.reachLevel <= self.roomLevel) { - if (self.updateSelectedEffectID) { - self.updateSelectedEffectID(model.id); - } - } else { - [self manualSelectedCell]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"1.0.33_text_15")]; - } -} - -- (UICollectionView *)collectionView { - if (!_collectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake((KScreenWidth - 31 - 14)/3, 87); - layout.minimumLineSpacing = 10; - layout.minimumInteritemSpacing = 4; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.scrollEnabled = NO; - [RoomModeCollectionCell registerTo:_collectionView]; - } - return _collectionView; -} - -@end - -@interface RoomModeViewController () - -@property(nonatomic, strong) RoomLevelInfoModel *levelInfo; - -@property(nonatomic, assign) RoomType originalRoomType; -@property(nonatomic, assign) RoomType updatedRoomType; -@property(nonatomic, copy) NSString *updatedMicSkinID; -@property(nonatomic, copy) NSString *updatedMicEffectID; - -@property(nonatomic, strong) UIButton *useButton; -@property(nonatomic, strong) UITableView *tableView; - -@property(nonatomic, strong) NSMutableArray *typeDataSource; -@property(nonatomic, strong) NSMutableArray *micSkinDataSource; -@property(nonatomic, strong) NSMutableArray *micEffectDataSource; - -@end - -@implementation RoomModeViewController - -- (RoomModePresenter *)createPresenter { - return [[RoomModePresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.typeDataSource = @[ - @{@"type":@(9), @"name":YMLocalizedString(@"1.0.33_text_10"), @"isUsed":@(YES)}, - @{@"type":@(10), @"name":YMLocalizedString(@"1.0.33_text_11"), @"isUsed":@(NO)}, - @{@"type":@(15), @"name":YMLocalizedString(@"1.0.33_text_12"), @"isUsed":@(NO)}, - @{@"type":@(20), @"name":YMLocalizedString(@"1.0.33_text_13"), @"isUsed":@(NO)}, - @{@"type":@(19), @"name":YMLocalizedString(@"1.0.33_text_14"), @"isUsed":@(NO)}, - ].mutableCopy; - self.micSkinDataSource = @[].mutableCopy; - self.micEffectDataSource = @[].mutableCopy; - - [self setupUI]; - - [self loadRoomLevelInfo]; -} - -#pragma mark - -- (void)setupUI { - self.view.backgroundColor = [UIColor blackColor]; - [self setupNavigationBar]; - [self setupTableView]; - [self setupUseButton]; -} - -- (void)setupNavigationBar { - UILabel *titleLabel = [self titleLabel]; - UIButton *backButton = [self backButton]; - UIButton *helpButton = [self helpButton]; - [self.view addSubview:titleLabel]; - [self.view addSubview:backButton]; - [self.view addSubview:helpButton]; - - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.view).offset(kStatusBarHeight); - make.height.mas_equalTo(22); - }]; - - [backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.view).offset(16); - make.centerY.mas_equalTo(titleLabel); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - - [helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.view).offset(-16); - make.centerY.mas_equalTo(titleLabel); - make.width.height.mas_equalTo(44); - }]; -} - -- (void)setupTableView { - [self.view addSubview:self.tableView]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.view).offset(kNavigationHeight); - make.leading.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.view).offset(-(kSafeAreaBottomHeight + 40)); - }]; -} - -- (void)setupUseButton { - [self.view addSubview:self.useButton]; - [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight); - make.leading.trailing.mas_equalTo(self.view).inset(15); - make.height.mas_equalTo(40); - }]; -} - -#pragma mark - -- (void)didTapBack { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)didTapHelp { - XPWebViewController *vc = [[XPWebViewController alloc] initWithRoomUID:@(self.roomInfo.uid).stringValue]; - vc.url = URLWithType(KRoomLevelRule); - [self.navigationController pushViewController:vc animated:YES]; -} - -- (void)didTapUse { - [self updateRoomMode]; -} - -#pragma mark - -- (void)loadRoomLevelInfo { - self.updatedRoomType = self.roomInfo.type; - self.originalRoomType = self.roomInfo.type; - self.updatedMicSkinID = @(self.roomInfo.usedMicSkinId).stringValue; - self.updatedMicEffectID = @(self.roomInfo.usedMicEffectId).stringValue; - - @kWeakify(self); - [self.presenter loadRoomLevelInfo:self.roomInfo.uid - success:^(RoomLevelInfoModel * _Nonnull model) { - @kStrongify(self); - - self.levelInfo = model; - [self.tableView reloadData]; - } failure:^(NSError * _Nonnull error) { - - }]; -} - -- (void)updateRoomMode { - if (self.updatedRoomType < self.originalRoomType) { - @kWeakify(self); - [TTPopup alertWithMessage:YMLocalizedString(@"XPRoomTypeSelectionViewController3") - confirmHandler:^{ - @kStrongify(self); - [self requestRoomUpdate]; - } cancelHandler:^{}]; - } else { - [self requestRoomUpdate]; - } -} - -- (void)requestRoomUpdate { - @kWeakify(self); - [self.presenter updateRoomMode:self.updatedRoomType - micSkinID:self.updatedMicSkinID.integerValue - micEffectID:self.updatedMicEffectID.integerValue - forRoom:self.roomInfo - success:^{ - @kStrongify(self); - [self.navigationController popViewControllerAnimated:YES]; - } failure:^(NSError * _Nonnull error) { - - }]; -} - -#pragma mark - UITableView DataSource & Delegate -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 4; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - switch (section) { - case 0: - return 0; - break; - case 1: - case 2: - case 3: - return 46; - break; - - default: - return 0; - break; - } -} - -- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - NSString *content = @""; - switch (section) { - case 1: - content = YMLocalizedString(@"1.0.33_text_2"); - break; - case 2: - content = YMLocalizedString(@"1.0.33_text_3"); - break; - case 3: - content = YMLocalizedString(@"1.0.33_text_4"); - break; - case 0: - default: - content = @""; - break; - } - - UILabel *label = [UILabel labelInitWithText:content - font:kFontMedium(16) - textColor:[UIColor whiteColor]]; - - UIView *headerView = [[UIView alloc] init]; - [headerView addSubview:label]; - [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(headerView); - make.leading.mas_equalTo(15); - make.height.mas_equalTo(22); - }]; - - return headerView; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - switch (section) { - case 0: - return 1; - break; - case 1: - case 2: - case 3: - return 1; - break; - default: - return 0; - break; - } - return 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - switch (indexPath.section) { - case 0: - return [RoomModeOwnerCard cellHeight]; - break; - case 1:{ - NSArray *arr = [self.typeDataSource subarrayWithRange:NSMakeRange(0, 3)].mutableCopy; - if (self.levelInfo && self.levelInfo.hasUnique) { - arr = self.typeDataSource.copy; - } - return [RoomModeTypeCard cellHeight:arr.count]; - } - break; - case 2: { - if (self.levelInfo) { - return [RoomModeMicSkinCard cellHeight:self.levelInfo.micSkins.count]; - } else { - return 10; - } - } - break; - case 3: - if (self.levelInfo) { - return [RoomModeMicEffectCard cellHeight:self.levelInfo.micEffects.count]; - } else { - return 10; - } - break; - default: - return 0; - break; - } -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - switch (indexPath.section) { - case 0: { - RoomModeOwnerCard *cell = [RoomModeOwnerCard cellFro:tableView - indexPath:indexPath - roomInfo:self.roomInfo - levelInfo:self.levelInfo]; - return cell; - } - break; - case 1: { - NSArray *arr = [self.typeDataSource subarrayWithRange:NSMakeRange(0, 3)].mutableCopy; - if (self.levelInfo && self.levelInfo.hasUnique) { - arr = self.typeDataSource.copy; - } - RoomModeTypeCard *cell = [RoomModeTypeCard cellFro:tableView - indexPath:indexPath - dataSource:arr - currentType:self.roomInfo.type]; - @kWeakify(self); - [cell setUpdateSelectedType:^(RoomType type) { - @kStrongify(self); - self.updatedRoomType = type; - }]; - return cell; - } - break; - case 2: { - RoomModeMicSkinCard *cell = [RoomModeMicSkinCard cellFro:tableView - indexPath:indexPath - skins:self.levelInfo.micSkins - usedID:self.updatedMicSkinID.integerValue - roomLevel:self.levelInfo.currentLevel]; - @kWeakify(self); - [cell setUpdateSelectedSkinID:^(NSString *skinID) { - @kStrongify(self); - self.updatedMicSkinID = skinID; - }]; - return cell; - } - break; - case 3: { - RoomModeMicEffectCard *cell = [RoomModeMicEffectCard cellFro:tableView - indexPath:indexPath - effects:self.levelInfo.micEffects - usedID:self.updatedMicEffectID.integerValue - roomLevel:self.levelInfo.currentLevel]; - @kWeakify(self); - [cell setUpdateSelectedEffectID:^(NSString *effectID) { - @kStrongify(self); - self.updatedMicEffectID = effectID; - }]; - return cell; - } - break; - - default: - return [UITableViewCell new]; - break; - } -} - -#pragma mark - -- (UIButton *)backButton { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:[kImage(@"common_nav_back_white") ms_SetImageForRTL] - forState:UIControlStateNormal]; - [b addTarget:self - action:@selector(didTapBack) - forControlEvents:UIControlEventTouchUpInside]; - return b; -} - -- (UILabel *)titleLabel { - UILabel *label = [[UILabel alloc] init]; - label.textAlignment = NSTextAlignmentCenter; - label.font = kFontMedium(17); - label.text = YMLocalizedString(@"1.0.33_text_1"); - label.textColor = UIColorFromRGB(0xD9E7F7); - return label; -} - -- (UIButton *)helpButton { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:kImage(@"room_mode_help") forState:UIControlStateNormal]; - - [b addTarget:self action:@selector(didTapHelp) forControlEvents:UIControlEventTouchUpInside]; - return b; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, kNavigationHeight, KScreenWidth, KScreenHeight - kNavigationHeight) style:UITableViewStyleGrouped]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - [RoomModeOwnerCard registerTo:_tableView]; - [RoomModeTypeCard registerTo:_tableView]; - [RoomModeMicSkinCard registerTo:_tableView]; - [RoomModeMicEffectCard registerTo:_tableView]; - - UIView *footer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 60)]; - _tableView.tableFooterView = footer; - } - return _tableView; -} - -- (UIButton *)useButton { - if (!_useButton) { - _useButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_useButton addGradientBackgroundWithColors:@[UIColorFromRGB(0xE29030), UIColorFromRGB(0xfcc074)] - startPoint:CGPointMake(0, 0.5) - endPoint:CGPointMake(1, 0.5) - cornerRadius:20]; - [_useButton setTitle:YMLocalizedString(@"1.0.33_text_5") forState:UIControlStateNormal]; - [_useButton addTarget:self action:@selector(didTapUse) forControlEvents:UIControlEventTouchUpInside]; - } - return _useButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Api/Api+RoomPK.h b/YuMi/Modules/YMRoom/View/RoomPK/Api/Api+RoomPK.h deleted file mode 100644 index 4a6b951..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Api/Api+RoomPK.h +++ /dev/null @@ -1,77 +0,0 @@ -// -// Api+RoomPK.h -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (RoomPK) - -/// 获取房间内PK记录 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param pageSize 一页多少个 -/// @param page 多少页 -+ (void)getRoomPKRecordList:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - pageSize:(NSString *)pageSize - page:(NSString *)page; - -/// 获取当前房间PK 详情 -/// @param completion 完成 -/// @param roomUid 房主的uid -+ (void)getRoomPKDetail:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid; - -/// 开启房间PK -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -+ (void)openRoomPK:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - operUid:(NSString *)operUid; - -/// 关闭房间PK -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -+ (void)closeRoomPK:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - operUid:(NSString *)operUid; -/// 创建一个PK -/// @param completion 完成 -/// @param pkMode pk的类型 目前只有团队 2 -/// @param voteMode 统计类型 1礼物价值 2 送礼人数 -/// @param duration 持续的时间 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -+ (void)createRoomPK:(HttpRequestHelperCompletion)completion - pkMode:(NSString *)pkMode - voteMode:(NSString *)voteMode - duration:(NSString *)duration - roomUid:(NSString *)roomUid - operUid:(NSString *)operUid; - -/// 查询房间PK结果 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -/// @param pkId Pk的id -+ (void)checkRoomPKResult:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - operUid:(NSString *)operUid - pkId:(NSString *)pkId; - -/// 开始PK -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param pkId 当前PK的ID -/// @param joinUsers 参加的人 jsonstring -+ (void)begainRoomPK:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid pkId:(NSString *)pkId joinUsers:(NSString *)joinUsers; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Api/Api+RoomPK.m b/YuMi/Modules/YMRoom/View/RoomPK/Api/Api+RoomPK.m deleted file mode 100644 index 99147c3..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Api/Api+RoomPK.m +++ /dev/null @@ -1,82 +0,0 @@ -// -// Api+RoomPK.m -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import "Api+RoomPK.h" -#import -@implementation Api (RoomPK) - - -/// 获取房间内PK记录 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param pageSize 一页多少个 -/// @param page 多少页 -+ (void)getRoomPKRecordList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid pageSize:(NSString *)pageSize page:(NSString *)page { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9way9yZWNvcmVk"];///room/pk/recored - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, pageSize, page, nil]; -} - -/// 获取当前房间PK 详情 -/// @param completion 完成 -/// @param roomUid 房主的uid -+ (void)getRoomPKDetail:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9way9nZXQ="];///room/pk/get - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, nil]; -} - -/// 开启房间PK -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -+ (void)openRoomPK:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9way9lbmFibGU="];///room/pk/enable - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, operUid, nil]; -} - -/// 关闭房间PK -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -+ (void)closeRoomPK:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9way9lbmFibGU="];///room/pk/enable - [self makeRequest:fang method:HttpRequestHelperMethodDELETE completion:completion, __FUNCTION__, roomUid, operUid, nil]; -} - -/// 创建一个PK -/// @param completion 完成 -/// @param pkMode pk的类型 目前只有团队 2 -/// @param voteMode 统计类型 1礼物价值 2 送礼人数 -/// @param duration 持续的时间 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -+ (void)createRoomPK:(HttpRequestHelperCompletion)completion pkMode:(NSString *)pkMode voteMode:(NSString *)voteMode duration:(NSString *)duration roomUid:(NSString *)roomUid operUid:(NSString *)operUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9way9jcmVhdGU="];///room/pk/create - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion,__FUNCTION__, pkMode, voteMode, duration, roomUid, operUid, nil]; -} - -/// 查询房间PK结果 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param operUid 操作者的uid -/// @param pkId Pk的id -+ (void)checkRoomPKResult:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid pkId:(NSString *)pkId { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9way9xdWVyeQ=="];///room/pk/query - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, operUid, pkId, nil]; -} - -/// 开始PK -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param pkId 当前PK的ID -/// @param joinUsers 参加的人 jsonstring -+ (void)begainRoomPK:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid pkId:(NSString *)pkId joinUsers:(NSString *)joinUsers { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9way9iZWdpbg=="];///room/pk/begin - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, pkId, joinUsers, nil]; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKChooseUserModel.h b/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKChooseUserModel.h deleted file mode 100644 index e497bbf..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKChooseUserModel.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// RoomPKChooseUserModel.h -// YUMI -// -// Created by YUMI on 2022/3/21. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface RoomPKChooseUserModel : PIBaseModel -///类型 -@property (nonatomic,assign) GroupType groupType; -///用户名 -@property (nonatomic,copy) NSString *nick; -///用户的uid -@property (nonatomic,copy) NSString *uid; -///坑位 -@property (nonatomic,assign) int position; -///标题 -@property (nonatomic,copy) NSString *title; -///图片的名称 -@property (nonatomic,copy) NSString *imageName; -///用户的头像 -@property (nonatomic,copy) NSString *avatar; -///是否选中了 -@property (nonatomic,assign) BOOL isSelect; -///是否可选 -@property (nonatomic,assign) BOOL isEnableChoose; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKChooseUserModel.m b/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKChooseUserModel.m deleted file mode 100644 index cd5a777..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKChooseUserModel.m +++ /dev/null @@ -1,31 +0,0 @@ -// -// RoomPKChooseUserModel.m -// YUMI -// -// Created by YUMI on 2022/3/21. -// - -#import "RoomPKChooseUserModel.h" - -@implementation RoomPKChooseUserModel -- (BOOL)isEqual:(id)object { - if (self == object) { - return YES; - } - if (![object isKindOfClass:[RoomPKChooseUserModel class]]) { - return NO; - } - RoomPKChooseUserModel *other = (RoomPKChooseUserModel *)object; - return [self.uid isEqualToString:other.uid] && - [self.nick isEqualToString:other.nick] && - [self.avatar isEqualToString:self.avatar] && - self.groupType == other.groupType && - self.isSelect == other.isSelect && - self.isEnableChoose == other.isEnableChoose; -} - -- (NSUInteger)hash { - return self.nick.hash ^ self.uid.integerValue; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKDetailInfoModel.h b/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKDetailInfoModel.h deleted file mode 100644 index 40b1d13..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKDetailInfoModel.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// RoomPKDetailInfoModel.h -// YUMI -// -// Created by YUMI on 2022/3/29. -// - -#import -#import "RoomPKInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface RoomPKDetailInfoModel : PIBaseModel -/** 当前时间*/ -@property (nonatomic, assign) long now; -/** PK的实体*/ -@property (nonatomic, strong) RoomPKInfoModel *roomPK; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKDetailInfoModel.m b/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKDetailInfoModel.m deleted file mode 100644 index 56e51ac..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKDetailInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RoomPKDetailInfoModel.m -// YUMI -// -// Created by YUMI on 2022/3/29. -// - -#import "RoomPKDetailInfoModel.h" - -@implementation RoomPKDetailInfoModel - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKInfoModel.h b/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKInfoModel.h deleted file mode 100644 index f9d9098..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKInfoModel.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// RoomPKInfoModel.h -// YUMI -// -// Created by YUMI on 2022/3/21. -// - -#import -#import "YUMINNNN.h" -#import "RoomPKTeamModel.h" -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger,RoomPKStatusType){ - ///准备中 - RoomPKStatusType_NonStart= 1, - ///正在进行中 - RoomPKStatusType_Playing = 2, - ///结束 - RoomPKStatusType_End = 3, - ///重新开始 - RoomPKStatusType_ReStart = 4, -}; - -@interface RoomPKInfoModel : PIBaseModel -///持续的时间 -@property (nonatomic,assign) CGFloat duration; -///操作者的uid -@property (nonatomic,copy) NSString *operUid; -///当前PK的id -@property (nonatomic,copy) NSString * pkId; -///pk统计的模式 -@property (nonatomic, assign) RoomPKVoteModeType voteMode; -///房主的uid -@property (nonatomic,copy) NSString *roomUid; -///当前PK的状态 -@property (nonatomic,assign) RoomPKStatusType pkStatus; -///PK结束时间(重新开始立即结束，否则为beginTime+duration) -@property (nonatomic, assign) long endTime; -///PK的模式（1:个人模式;2.团队模式） 都是团队模式 就不写枚举了 -@property (nonatomic,assign) NSInteger pkMode; -///pk的结果 -@property (nonatomic, assign) RoomPKResultType result; -/// {红队or蓝队 : { 队员uid : 送礼人uid }} -@property (nonatomic, copy) NSDictionary *> *> *sendGiftUids; -///参与PK的队伍 -@property (nonatomic, strong) NSArray * teams; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKInfoModel.m b/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKInfoModel.m deleted file mode 100644 index b28185c..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKInfoModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// RoomPKInfoModel.m -// YUMI -// -// Created by YUMI on 2022/3/21. -// - -#import "RoomPKInfoModel.h" - -@implementation RoomPKInfoModel -+ (NSDictionary *)objectClassInArray { - return @{@"teams":RoomPKTeamModel.class}; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKRecordModel.h b/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKRecordModel.h deleted file mode 100644 index eb8a68a..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKRecordModel.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// RoomPKRecordModel.h -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import -#import "YUMINNNN.h" -#import "RoomPKTeamModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface RoomPKRecordModel : PIBaseModel -///pk的主键 -@property (nonatomic, copy) NSString * pkId; -///PK结果 -@property (nonatomic, assign) RoomPKResultType result; -///投票类型(1.按礼物价值;2.按送礼物人数) -@property (nonatomic, assign) RoomPKVoteModeType voteMode; -///参与PK的队伍 -@property (nonatomic, strong) NSArray * teams; -///PK开始时间 -@property (nonatomic, assign) long beginTime; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKRecordModel.m b/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKRecordModel.m deleted file mode 100644 index fb28b4f..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKRecordModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// RoomPKRecordModel.m -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import "RoomPKRecordModel.h" - -@implementation RoomPKRecordModel -///扩展方法 按需索取 重写即可 -///如果一个模型中 包含一个数组 数组中是另一个模型 -+ (NSDictionary *)objectClassInArray { - return @{@"teams":RoomPKTeamModel.class}; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTeamModel.h b/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTeamModel.h deleted file mode 100644 index 5eea2d8..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTeamModel.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// RoomPKTeamModel.h -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN -@class RoomPKTeamUserModel; -@interface RoomPKTeamModel : PIBaseModel -///队伍的类型 -@property (nonatomic, assign) GroupType team; -///队伍成员 -@property (nonatomic, strong) NSArray* teamMembers; -///队伍MVP -@property (nonatomic, assign) NSInteger mvp; -///队伍战斗值 -@property (nonatomic, assign) long long score; -///队伍守护者 -@property (nonatomic, strong) RoomPKTeamUserModel * protector; -///守护值 -@property (nonatomic, assign) long long protecScore; -@end - - -@interface RoomPKTeamUserModel : PIBaseModel -///头像 -@property (nonatomic,copy) NSString *avatar; -///id -@property (nonatomic,copy) NSString *erbanNo; -///昵称 -@property (nonatomic,copy) NSString *nick; -///用户的uid -@property (nonatomic,copy) NSString *uid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTeamModel.m b/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTeamModel.m deleted file mode 100644 index 5c1f900..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTeamModel.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// RoomPKTeamModel.m -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import "RoomPKTeamModel.h" - -@implementation RoomPKTeamModel -///扩展方法 按需索取 重写即可 -///如果一个模型中 包含一个数组 数组中是另一个模型 -+ (NSDictionary *)objectClassInArray { - return @{@"teamMembers":RoomPKTeamUserModel.class}; -} -@end - - -@implementation RoomPKTeamUserModel - - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTimeItemModel.h b/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTimeItemModel.h deleted file mode 100644 index 7856209..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTimeItemModel.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// RoomPKTimeItemModel.h -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomPKTimeItemModel : PIBaseModel -///标题 -@property (nonatomic,copy) NSString *title; -///时间 秒 -@property (nonatomic,assign) int time; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTimeItemModel.m b/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTimeItemModel.m deleted file mode 100644 index 06dac66..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Model/RoomPKTimeItemModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RoomPKTimeItemModel.m -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import "RoomPKTimeItemModel.h" - -@implementation RoomPKTimeItemModel - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKPresenter.h b/YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKPresenter.h deleted file mode 100644 index 8e72155..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKPresenter.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMRoomPKPresenter.h -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import "BaseMvpPresenter.h" -#import "RoomPKRecordModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomPKPresenter : BaseMvpPresenter -/// 开启房间内PK -/// @param roomUid 房主的uid -- (void)openRoomPK:(NSString *)roomUid; - -/// 关闭房间PK -/// @param roomUid 房主的uid -- (void)closeRoomPK:(NSString *)roomUid; - -/// 创建PK -/// @param pkMode pk的模式 -/// @param voteMode 投票的模式 -/// @param duration 持续的时间 -/// @param roomUid 房主的uid -- (void)createRoomPKMode:(NSInteger)pkMode voteMode:(RoomPKVoteModeType)voteMode duration:(int)duration roomUid:(NSString *)roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKPresenter.m b/YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKPresenter.m deleted file mode 100644 index 0442f0b..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKPresenter.m +++ /dev/null @@ -1,51 +0,0 @@ -// -// YMRoomPKPresenter.m -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import "XPRoomPKPresenter.h" -#import "RoomPKInfoModel.h" -#import "Api+RoomPK.h" -#import "XPRoomPKProtocol.h" -#import "AccountInfoStorage.h" -@implementation XPRoomPKPresenter - -/// 开启房间内PK -/// @param roomUid 房主的uid -- (void)openRoomPK:(NSString *)roomUid{ - NSString * operUid = [AccountInfoStorage instance].getUid; - [Api openRoomPK:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] openRoomPKSuccess]; - } showLoading:YES] roomUid:roomUid operUid:operUid]; -} - - -/// 关闭房间PK -/// @param roomUid 房主的uid -- (void)closeRoomPK:(NSString *)roomUid { - NSString * operUid = [AccountInfoStorage instance].getUid; - [Api closeRoomPK:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] closeRoomPKSuccess]; - }] roomUid:roomUid operUid:operUid]; -} - - -/// 创建PK -/// @param pkMode pk的模式 -/// @param voteMode 投票的模式 -/// @param duration 持续的时间 -/// @param roomUid 房主的uid -- (void)createRoomPKMode:(NSInteger)pkMode voteMode:(RoomPKVoteModeType)voteMode duration:(int)duration roomUid:(NSString *)roomUid { - NSString *pkModeStr = [NSString stringWithFormat:@"%ld", pkMode]; - NSString *voteModeStr = [NSString stringWithFormat:@"%ld", voteMode]; - NSString *durationStr = [NSString stringWithFormat:@"%d", duration]; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api createRoomPK:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - RoomPKInfoModel * roomPkInfo = [RoomPKInfoModel modelWithDictionary:data.data]; - [[self getView] createRoomPKSuccess:roomPkInfo]; - } showLoading:YES] pkMode:pkModeStr voteMode:voteModeStr duration:durationStr roomUid:roomUid operUid:uid]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKRecordPresenter.h b/YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKRecordPresenter.h deleted file mode 100644 index f6ee238..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKRecordPresenter.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMRoomPKRecordPresenter.h -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomPKRecordPresenter : BaseMvpPresenter - -/// 获取房间pk记录 -/// @param roomUid 房主uid -/// @param page 当前页数 -/// @param pageSize 一页多少 -/// @param state 上啦还是 下拉 -- (void)getRoomPKRecordList:(NSString *)roomUid page:(int)page pageSize:(int)pageSize state:(int)state; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKRecordPresenter.m b/YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKRecordPresenter.m deleted file mode 100644 index 7ca6f86..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Presenter/XPRoomPKRecordPresenter.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMRoomPKRecordPresenter.m -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import "XPRoomPKRecordPresenter.h" -#import "Api+RoomPK.h" -#import "RoomPKRecordModel.h" -#import "XPRoomPKRecordProtocol.h" -#import "AccountInfoStorage.h" -@implementation XPRoomPKRecordPresenter - -- (void)getRoomPKRecordList:(NSString *)roomUid page:(int)page pageSize:(int)pageSize state:(int)state { - NSString * pageStr = [NSString stringWithFormat:@"%d", page]; - NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize]; - [Api getRoomPKRecordList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray *list = [RoomPKRecordModel modelsWithArray:data.data[@"records"]]; - [[self getView] getRoomPKRecordListSuccess:list state:state]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] getRoomPKRecordListFail:msg state:state]; - }] roomUid:roomUid pageSize:pageSizeStr page:pageStr]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Protocol/XPRoomPKProtocol.h b/YuMi/Modules/YMRoom/View/RoomPK/Protocol/XPRoomPKProtocol.h deleted file mode 100644 index 0d6290a..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Protocol/XPRoomPKProtocol.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMRoomPKProtocol.h -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomPKInfoModel; -@protocol XPRoomPKProtocol - -///开启房间PK成功 -- (void)openRoomPKSuccess; - -///开启房间PK成功 -- (void)closeRoomPKSuccess; - -///创建pk成功 -- (void)createRoomPKSuccess:(RoomPKInfoModel *)roompkInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/Protocol/XPRoomPKRecordProtocol.h b/YuMi/Modules/YMRoom/View/RoomPK/Protocol/XPRoomPKRecordProtocol.h deleted file mode 100644 index 414aa13..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/Protocol/XPRoomPKRecordProtocol.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMRoomPKRecordProtocol.h -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPRoomPKRecordProtocol - -- (void)getRoomPKRecordListSuccess:(NSArray *)recordList state:(int)state; -- (void)getRoomPKRecordListFail:(NSString *)message state:(int)state; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKEmptyTableViewCell.h b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKEmptyTableViewCell.h deleted file mode 100644 index 2202729..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKEmptyTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomPKEmptyTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomPKEmptyTableViewCell : UITableViewCell - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKEmptyTableViewCell.m deleted file mode 100644 index 8e48e9c..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKEmptyTableViewCell.m +++ /dev/null @@ -1,72 +0,0 @@ -// -// YMRoomPKEmptyTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import "XPRoomPKEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPRoomPKEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPRoomPKEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(250); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPRoomPKEmptyTableViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.h b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.h deleted file mode 100644 index 83fa7d9..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMRoomPKRecordTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomPKRecordModel; -@interface XPRoomPKRecordTableViewCell : UITableViewCell -//pk详情 -@property (nonatomic,strong) RoomPKRecordModel *pkDetailInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.m b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.m deleted file mode 100644 index 5ae3c68..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.m +++ /dev/null @@ -1,273 +0,0 @@ -// -// YMRoomPKRecordTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import "XPRoomPKRecordTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "PLTimeUtil.h" -///Model -#import "RoomPKRecordModel.h" -///View -#import "XPRoomPKRecordNickView.h" - -@interface XPRoomPKRecordTableViewCell () -///成功的人 -@property (nonatomic,strong) XPRoomPKRecordNickView *winerUserView; -///失败的人 -@property (nonatomic,strong) XPRoomPKRecordNickView *loseUserView; -///vs -@property (nonatomic,strong) UIImageView *vsImageView; -///成功的分数 -@property (nonatomic,strong) UILabel * winerScoreLabel; -///成功 -@property (nonatomic,strong) UIButton *winerButton; -///失败的分数 -@property (nonatomic,strong) UILabel * loseScoreLabel; -///失败 -@property (nonatomic,strong) UIButton *loseButton; -///类型 -@property (nonatomic,strong) UILabel *pkTypeLabel; -///时间 -@property (nonatomic,strong) UILabel *dateLabel; -@end - -@implementation XPRoomPKRecordTableViewCell - - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - [self.contentView addSubview:self.winerUserView]; - [self.contentView addSubview:self.loseUserView]; - [self.contentView addSubview:self.vsImageView]; - [self.contentView addSubview:self.winerScoreLabel]; - [self.contentView addSubview:self.pkTypeLabel]; - [self.contentView addSubview:self.loseScoreLabel]; - [self.contentView addSubview:self.winerButton]; - [self.contentView addSubview:self.dateLabel]; - [self.contentView addSubview:self.loseButton]; -} - -- (void)initSubViewConstraints { - - [self.winerUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(15); - make.top.mas_equalTo(self.contentView).offset(31); - make.trailing.mas_equalTo(self.vsImageView.mas_leading).offset(-20); - }]; - - [self.vsImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(29); - make.height.mas_equalTo(43); - make.centerY.mas_equalTo(self.winerUserView); - make.centerX.mas_equalTo(self.contentView); - }]; - - [self.loseUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.vsImageView.mas_trailing).offset(20); - make.width.centerY.mas_equalTo(self.winerUserView); - make.trailing.mas_equalTo(self.contentView).offset(-15); - }]; - - [self.winerScoreLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.width.mas_equalTo(self.winerUserView); - make.top.mas_equalTo(self.winerUserView.mas_bottom).offset(10); - }]; - - [self.pkTypeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.centerY.mas_equalTo(self.winerScoreLabel); - }]; - - [self.loseScoreLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.width.mas_equalTo(self.loseUserView); - make.centerY.mas_equalTo(self.winerScoreLabel); - }]; - - [self.winerButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.winerUserView); - make.top.mas_equalTo(self.winerScoreLabel.mas_bottom).offset(7); - make.width.mas_equalTo(85); - make.height.mas_equalTo(19); - }]; - - [self.dateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.winerButton); - make.centerX.mas_equalTo(self.contentView); - make.width.mas_equalTo(71); - }]; - - [self.loseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.centerY.mas_equalTo(self.winerButton); - make.centerX.mas_equalTo(self.loseUserView); - }]; -} - -#pragma mark - Getters And Setters -- (void)setPkDetailInfo:(RoomPKRecordModel *)pkDetailInfo { - _pkDetailInfo = pkDetailInfo; - if (_pkDetailInfo) { - //先找出胜利的队伍和失败的队伍 - RoomPKTeamModel *redTeam; - RoomPKTeamModel * blueTeam; - for (RoomPKTeamModel *team in _pkDetailInfo.teams) { - if (team.team == GroupType_Red) { - redTeam = team; - }else{ - blueTeam = team; - } - } - - UIColor * winnerMemberViewColor; - UIColor * loseMemberViewColor; - UIImage * winnerImage;//红队胜利 - UIImage * loseImage;//胜利失败的按钮的颜色 - NSString * winnerTitle; - NSString * loseString; - //平局 - if (_pkDetailInfo.result == RoomPKResultType_Draw) { - winnerMemberViewColor = UIColorFromRGB(0xcccccc); - loseMemberViewColor = UIColorFromRGB(0xcccccc); - winnerImage = [UIImage imageNamed:@"room_pk_record_lose"]; - loseImage = [UIImage imageNamed:@"room_pk_record_lose"]; - winnerTitle = YMLocalizedString(@"XPRoomPKRecordTableViewCell0"); - loseString = YMLocalizedString(@"XPRoomPKRecordTableViewCell1"); - - //红方胜 - }else if (_pkDetailInfo.result == RoomPKResultType_Red){ - winnerMemberViewColor= UIColorFromRGB(0xFC4895); - loseMemberViewColor = UIColorFromRGB(0xcccccc); - winnerImage = [UIImage imageNamed:@"room_pk_record_winner"]; - loseImage = [UIImage imageNamed:@"room_pk_record_lose"]; - winnerTitle = YMLocalizedString(@"XPRoomPKRecordTableViewCell2"); - loseString = YMLocalizedString(@"XPRoomPKRecordTableViewCell3"); - //蓝方胜 - }else if (_pkDetailInfo.result == RoomPKResultType_Blue){ - winnerMemberViewColor = UIColorFromRGB(0xcccccc); - loseMemberViewColor = UIColorFromRGB(0x3B74FE); - winnerImage = [UIImage imageNamed:@"room_pk_record_lose"]; - loseImage = [UIImage imageNamed:@"room_pk_result_blue_victory_bg"]; - winnerTitle = YMLocalizedString(@"XPRoomPKRecordTableViewCell4"); - loseString = YMLocalizedString(@"XPRoomPKRecordTableViewCell5"); - } - - [self.winerButton setBackgroundImage:winnerImage forState:UIControlStateNormal]; - [self.loseButton setBackgroundImage:loseImage forState:UIControlStateNormal]; - [self.winerButton setTitle:winnerTitle forState:UIControlStateNormal]; - [self.loseButton setTitle:loseString forState:UIControlStateNormal]; - - self.winerScoreLabel.text = [NSString stringWithFormat:@"%lld",redTeam.score]; - self.loseScoreLabel.text = [NSString stringWithFormat:@"%lld",blueTeam.score]; - self.winerUserView.backgroundColor = winnerMemberViewColor; - self.loseUserView.backgroundColor = loseMemberViewColor; - - if (_pkDetailInfo.voteMode == RoomPKVoteModeType_GiftValue) { - self.pkTypeLabel.text = YMLocalizedString(@"XPRoomPKRecordTableViewCell6"); - }else{ - self.pkTypeLabel.text = YMLocalizedString(@"XPRoomPKRecordTableViewCell7"); - } - - self.winerUserView.userList = redTeam.teamMembers; - self.loseUserView.userList = blueTeam.teamMembers; - - self.dateLabel.text = [PLTimeUtil getDateWithTotalTimeWith:[NSString stringWithFormat:@"%ld", _pkDetailInfo.beginTime]]; - } -} - -- (XPRoomPKRecordNickView *)winerUserView { - if (!_winerUserView) { - _winerUserView = [[XPRoomPKRecordNickView alloc] init]; - } - return _winerUserView; -} - -- (XPRoomPKRecordNickView *)loseUserView { - if (!_loseUserView) { - _loseUserView = [[XPRoomPKRecordNickView alloc] init]; - } - return _loseUserView; -} - -- (UILabel *)pkTypeLabel{ - if (!_pkTypeLabel) { - _pkTypeLabel = [[UILabel alloc] init]; - _pkTypeLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _pkTypeLabel.font = [UIFont systemFontOfSize:13]; - _pkTypeLabel.textAlignment = NSTextAlignmentCenter; - } - return _pkTypeLabel; -} - -- (UILabel *)dateLabel{ - if (!_dateLabel) { - _dateLabel = [[UILabel alloc] init]; - _dateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _dateLabel.font = [UIFont systemFontOfSize:12]; - _dateLabel.textAlignment = NSTextAlignmentCenter; - _dateLabel.numberOfLines = 2; - } - return _dateLabel; -} - -- (UIButton *)winerButton{ - if (!_winerButton) { - _winerButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _winerButton.titleLabel.font = [UIFont systemFontOfSize:13]; - [_winerButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - } - return _winerButton; -} - -- (UIButton *)loseButton{ - if (!_loseButton) { - _loseButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _loseButton.titleLabel.font = [UIFont systemFontOfSize:13]; - [_loseButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - } - return _loseButton; -} - -- (UILabel *)loseScoreLabel{ - if (!_loseScoreLabel) { - _loseScoreLabel = [[UILabel alloc] init]; - _loseScoreLabel.font = [UIFont systemFontOfSize:18]; - _loseScoreLabel.textColor = [DJDKMIMOMColor appEmphasizeColor]; - _loseScoreLabel.textAlignment = NSTextAlignmentCenter; - } - return _loseScoreLabel; -} - -- (UILabel *)winerScoreLabel{ - if (!_winerScoreLabel) { - _winerScoreLabel = [[UILabel alloc] init]; - _winerScoreLabel.font = [UIFont systemFontOfSize:18]; - _winerScoreLabel.textColor = UIColorFromRGB(0xFE5372); - _winerScoreLabel.textAlignment = NSTextAlignmentCenter; - } - return _winerScoreLabel; -} - -- (UIImageView *)vsImageView{ - if (!_vsImageView) { - _vsImageView = [[UIImageView alloc] init]; - _vsImageView.image = [UIImage imageNamed:@"room_pk_vs_logo"]; - } - return _vsImageView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTimeTableViewCell.h b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTimeTableViewCell.h deleted file mode 100644 index 949412a..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTimeTableViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMRoomPKTimeTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomPKTimeTableViewCell : UITableViewCell - -///选择的时间 -@property (nonatomic,copy) NSString *time; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTimeTableViewCell.m b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTimeTableViewCell.m deleted file mode 100644 index 6843ad7..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTimeTableViewCell.m +++ /dev/null @@ -1,92 +0,0 @@ -// -// YMRoomPKTimeTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import "XPRoomPKTimeTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPRoomPKTimeTableViewCell () -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///显示时间 -@property (nonatomic,strong) UILabel *timeLabel; -///箭头 -@property (nonatomic,strong) UIImageView *arrowImageView; -@end - -@implementation XPRoomPKTimeTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.contentView.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.timeLabel]; - [self.contentView addSubview:self.arrowImageView]; -} - -- (void)initSubViewConstraints { - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(15); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.size.mas_equalTo(CGSizeMake(6.5, 11)); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.arrowImageView.mas_leading).offset(-3); - make.centerY.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (void)setTime:(NSString *)time { - _time = time; - self.timeLabel.text = _time; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPRoomPKTimeTableViewCell0"); - _titleLabel.font = [UIFont boldSystemFontOfSize:15]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.text = YMLocalizedString(@"XPRoomPKTimeTableViewCell1"); - _timeLabel.font = [UIFont systemFontOfSize:14]; - _timeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _timeLabel; -} - -- (UIImageView *)arrowImageView { - if (!_arrowImageView) { - _arrowImageView = [[UIImageView alloc] init]; - _arrowImageView.userInteractionEnabled = YES; - _arrowImageView.image = [[UIImage imageNamed:@"common_right_arrow"]ms_SetImageForRTL]; - } - return _arrowImageView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.h b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.h deleted file mode 100644 index 486c022..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomPKTypeTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomPKTypeTableViewCell : UITableViewCell - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.m b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.m deleted file mode 100644 index 5120c6d..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.m +++ /dev/null @@ -1,88 +0,0 @@ -// -// YMRoomPKTypeTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import "XPRoomPKTypeTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPRoomPKTypeTableViewCell () -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///类型 -@property (nonatomic,strong) UILabel *typeLabel; -///分割线 -@property (nonatomic,strong) UIView * lineView; -@end - -@implementation XPRoomPKTypeTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.contentView.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.typeLabel]; - [self.contentView addSubview:self.lineView]; -} - -- (void)initSubViewConstraints { - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(15); - make.centerY.mas_equalTo(self.contentView); - }]; - - - [self.typeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel.mas_trailing).offset(20); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.contentView); - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.height.mas_equalTo(1); - }]; -} -#pragma mark - Getters And Setters -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPRoomPKTypeTableViewCell0"); - _titleLabel.font = [UIFont boldSystemFontOfSize:15]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UILabel *)typeLabel { - if (!_typeLabel) { - _typeLabel = [[UILabel alloc] init]; - _typeLabel.text = YMLocalizedString(@"XPRoomPKTypeTableViewCell1"); - _typeLabel.font = [UIFont systemFontOfSize:14]; - _typeLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _typeLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKUserCollectionViewCell.h b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKUserCollectionViewCell.h deleted file mode 100644 index 31d81cc..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKUserCollectionViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMRoomPKUserCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2022/3/21. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomPKChooseUserModel; -@interface XPRoomPKUserCollectionViewCell : UICollectionViewCell -///用户信息 -@property (nonatomic,strong) RoomPKChooseUserModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKUserCollectionViewCell.m b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKUserCollectionViewCell.m deleted file mode 100644 index 0c69944..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKUserCollectionViewCell.m +++ /dev/null @@ -1,124 +0,0 @@ -// -// YMRoomPKUserCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2022/3/21. -// - -#import "XPRoomPKUserCollectionViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "RoomPKChooseUserModel.h" - -@interface XPRoomPKUserCollectionViewCell () -///头像 -@property (nonatomic,strong) NetImageView *ownerAvatarImageView; -///房主 -@property (nonatomic,strong) UILabel *ownerLabel; -///是否选择过了 -@property (nonatomic,strong) UIButton *chooseButton; -@end - -@implementation XPRoomPKUserCollectionViewCell -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.ownerAvatarImageView]; - [self.contentView addSubview:self.ownerLabel]; - [self.contentView addSubview:self.chooseButton]; -} - -- (void)initSubViewConstraints { - [self.ownerAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.contentView); - make.height.mas_equalTo(self.ownerAvatarImageView.mas_width); - }]; - - [self.ownerLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.ownerAvatarImageView.mas_bottom).offset(5); - make.height.mas_equalTo(14); - }]; - - [self.chooseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.bottom.mas_equalTo(self.ownerAvatarImageView); - make.width.height.mas_equalTo(16); - }]; -} - -#pragma mark - Event Response - -#pragma mark - Getters And Setters -- (void)setUserInfo:(RoomPKChooseUserModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - if (_userInfo.imageName) { - _ownerAvatarImageView.image = [UIImage imageNamed:_userInfo.imageName]; - } - - if (_userInfo.avatar) { - _ownerAvatarImageView.imageUrl = _userInfo.avatar; - } - self.ownerLabel.text = _userInfo.title; - - if (_userInfo.uid.length > 0 && _userInfo.isEnableChoose) { - self.chooseButton.hidden = NO; - self.chooseButton.selected = _userInfo.isSelect; - } else { - self.chooseButton.hidden = YES; - } - } -} - -- (NetImageView *)ownerAvatarImageView { - if (!_ownerAvatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _ownerAvatarImageView = [[NetImageView alloc] initWithConfig:config]; - _ownerAvatarImageView.layer.masksToBounds = YES; - _ownerAvatarImageView.layer.cornerRadius = 46/2; - _ownerAvatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _ownerAvatarImageView; -} - -- (UILabel *)ownerLabel { - if (!_ownerLabel) { - _ownerLabel = [[UILabel alloc] init]; - _ownerLabel.font = [UIFont systemFontOfSize:10]; - _ownerLabel.backgroundColor = [UIColor colorWithRed:(CGFloat)204 / (CGFloat)255 green:(CGFloat)204 / (CGFloat)255 blue:(CGFloat)204 / (CGFloat)255 alpha:1]; - _ownerLabel.layer.masksToBounds = YES; - _ownerLabel.layer.cornerRadius = 7; - _ownerLabel.textColor = [UIColor whiteColor]; - _ownerLabel.textAlignment = NSTextAlignmentCenter; - } - return _ownerLabel; -} - - -- (UIButton *)chooseButton { - if (!_chooseButton) { - _chooseButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_chooseButton setImage:[UIImage imageNamed:@"room_pk_user_unselect"] forState:UIControlStateNormal]; - [_chooseButton setImage:[UIImage imageNamed:@"room_pk_vote_select"] forState:UIControlStateSelected]; - _chooseButton.userInteractionEnabled = NO; - _chooseButton.hidden = YES; - } - return _chooseButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKVoteTableViewCell.h b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKVoteTableViewCell.h deleted file mode 100644 index 5e29eff..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKVoteTableViewCell.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMRoomPKVoteTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import -#import "RoomPKRecordModel.h" -NS_ASSUME_NONNULL_BEGIN - -@class XPRoomPKVoteTableViewCell; -@protocol XPRoomPKVoteTableViewCellDelegate - -///选择了什么类型 -- (void)xPRoomPKVoteTableViewCell:(XPRoomPKVoteTableViewCell *)view didChooseVoteType:(RoomPKVoteModeType)VoteType; - -@end - - -@interface XPRoomPKVoteTableViewCell : UITableViewCell -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKVoteTableViewCell.m b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKVoteTableViewCell.m deleted file mode 100644 index 846d66e..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKVoteTableViewCell.m +++ /dev/null @@ -1,187 +0,0 @@ -// -// YMRoomPKVoteTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import "XPRoomPKVoteTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPRoomPKVoteTableViewCell () -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///礼物价值容器 -@property (nonatomic,strong) UIStackView *giftValueStackView; -///选择礼物价值 -@property (nonatomic,strong) UIButton *giftValueChooseButton; -///礼物价值 -@property (nonatomic,strong) UILabel *giftValueLabel; -///送礼人数容器 -@property (nonatomic,strong) UIStackView *giftNumStackView; -///选择送礼人数 -@property (nonatomic,strong) UIButton *giftNumChooseButton; -///送礼人数 -@property (nonatomic,strong) UILabel *giftNumLabel; -///类型 -@property (nonatomic,strong) UILabel *typeLabel; -///分割线 -@property (nonatomic,strong) UIView * lineView; -@end - -@implementation XPRoomPKVoteTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.contentView.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.giftValueStackView]; - [self.contentView addSubview:self.giftNumStackView]; - [self.contentView addSubview:self.lineView]; - - [self.giftValueStackView addArrangedSubview:self.giftValueChooseButton]; - [self.giftValueStackView addArrangedSubview:self.giftValueLabel]; - - [self.giftNumStackView addArrangedSubview:self.giftNumChooseButton]; - [self.giftNumStackView addArrangedSubview:self.giftNumLabel]; -} - -- (void)initSubViewConstraints { - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(15); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.giftValueStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel.mas_trailing).offset(12); - make.top.bottom.mas_equalTo(self.contentView); - }]; - - [self.giftValueChooseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - - [self.giftNumStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.giftValueStackView.mas_trailing).offset(15); - make.top.bottom.mas_equalTo(self.contentView); - }]; - - [self.giftNumChooseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.contentView); - make.leading.mas_equalTo(self.contentView).offset(15); - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.height.mas_equalTo(1); - }]; -} - -#pragma mark - Event Response -- (void)chooseRoomPKVoteAction:(UIButton *)sender { - self.giftValueChooseButton.selected = NO; - self.giftNumChooseButton.selected = NO; - sender.selected = !sender.selected; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomPKVoteTableViewCell:didChooseVoteType:)]) { - [self.delegate xPRoomPKVoteTableViewCell:self didChooseVoteType:sender.tag]; - } -} - -#pragma mark - Getters And Setters -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPRoomPKVoteTableViewCell0"); - _titleLabel.font = [UIFont boldSystemFontOfSize:15]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (UIStackView *)giftValueStackView { - if (!_giftValueStackView) { - _giftValueStackView = [[UIStackView alloc] init]; - _giftValueStackView.axis = UILayoutConstraintAxisHorizontal; - _giftValueStackView.distribution = UIStackViewDistributionFill; - _giftValueStackView.alignment = UIStackViewAlignmentCenter; - _giftValueStackView.spacing = 5; - } - return _giftValueStackView; -} - -- (UIButton *)giftValueChooseButton { - if (!_giftValueChooseButton) { - _giftValueChooseButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_giftValueChooseButton setImage:[UIImage imageNamed:@"room_pk_vote_normal"] forState:UIControlStateNormal]; - [_giftValueChooseButton setImage:[UIImage imageNamed:@"room_pk_vote_select"] forState:UIControlStateSelected]; - _giftValueChooseButton.tag = RoomPKVoteModeType_GiftValue; - [_giftValueChooseButton addTarget:self action:@selector(chooseRoomPKVoteAction:) forControlEvents:UIControlEventTouchUpInside]; - _giftValueChooseButton.selected = YES; - } - return _giftValueChooseButton; -} - -- (UILabel *)giftValueLabel { - if (!_giftValueLabel) { - _giftValueLabel = [[UILabel alloc] init]; - _giftValueLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _giftValueLabel.font = [UIFont systemFontOfSize:14]; - _giftValueLabel.text = YMLocalizedString(@"XPRoomPKVoteTableViewCell1"); - } - return _giftValueLabel; -} - -- (UIStackView *)giftNumStackView { - if (!_giftNumStackView) { - _giftNumStackView = [[UIStackView alloc] init]; - _giftNumStackView.axis = UILayoutConstraintAxisHorizontal; - _giftNumStackView.distribution = UIStackViewDistributionFill; - _giftNumStackView.alignment = UIStackViewAlignmentCenter; - _giftNumStackView.spacing = 5; - } - return _giftNumStackView; -} - -- (UIButton *)giftNumChooseButton { - if (!_giftNumChooseButton) { - _giftNumChooseButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_giftNumChooseButton setImage:[UIImage imageNamed:@"room_pk_vote_normal"] forState:UIControlStateNormal]; - [_giftNumChooseButton setImage:[UIImage imageNamed:@"room_pk_vote_select"] forState:UIControlStateSelected]; - _giftNumChooseButton.tag = RoomPKVoteModeType_NumberPerson; - [_giftNumChooseButton addTarget:self action:@selector(chooseRoomPKVoteAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _giftNumChooseButton; -} - -- (UILabel *)giftNumLabel { - if (!_giftNumLabel) { - _giftNumLabel = [[UILabel alloc] init]; - _giftNumLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _giftNumLabel.font = [UIFont systemFontOfSize:14]; - _giftNumLabel.text = YMLocalizedString(@"XPRoomPKVoteTableViewCell2"); - } - return _giftNumLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.h b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.h deleted file mode 100644 index 420edeb..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMRomPKResultTitleLabel.h -// YUMI -// -// Created by YUMI on 2022/3/31. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPRomPKResultTitleLabel : UIView -///类型 -@property (nonatomic,assign) GroupType groupType; -///显示标题 -@property (nonatomic,copy) NSString *title; -///显示内容 -@property (nonatomic,copy) NSString *content; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.m deleted file mode 100644 index 00629ec..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.m +++ /dev/null @@ -1,92 +0,0 @@ -// -// YMRomPKResultTitleLabel.m -// YUMI -// -// Created by YUMI on 2022/3/31. -// - -#import "XPRomPKResultTitleLabel.h" -///Third -#import -#import "DJDKMIMOMColor.h" - -@interface XPRomPKResultTitleLabel () -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///显示内容 -@property (nonatomic,strong) UILabel *contentLabel; -@end - -@implementation XPRomPKResultTitleLabel - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.titleLabel]; - [self addSubview:self.contentLabel]; -} - -- (void)initSubViewConstraints { - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self); - make.centerY.mas_equalTo(self); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.titleLabel.mas_trailing).offset(10); - make.centerY.mas_equalTo(self.titleLabel); - }]; -} - -#pragma mark - Getters And Setters -- (void)setGroupType:(GroupType)groupType { - _groupType = groupType; - if (_groupType == GroupType_Red) { - self.contentLabel.textColor = UIColorFromRGB(0xff396f); - } else if(_groupType == GroupType_Blue) { - self.contentLabel.textColor = UIColorFromRGB(0x73b8ff); - } -} - -- (void)setContent:(NSString *)content { - _content = content; - if (_content) { - self.contentLabel.text = _content; - } -} - -- (void)setTitle:(NSString *)title { - _title = title; - if (_title) { - self.titleLabel.text = _title; - } -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[UILabel alloc] init]; - _contentLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - } - return _contentLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPaneAvatarView.h b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPaneAvatarView.h deleted file mode 100644 index 9960b74..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPaneAvatarView.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// XPRoomPKPaneAvatarView.h -// YuMi -// -// Created by P on 2024/6/14. -// - -#import -@class RoomPKChooseUserModel; - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger,XPRoomPKPaneAvatarType) { - XPRoomPKPaneAvatarType_Red = 1, - XPRoomPKPaneAvatarType_Blue, - XPRoomPKPaneAvatarType_Leader_Red, - XPRoomPKPaneAvatarType_Leader_Blue, -// XPRoomPKPaneAvatarType_Red_Default, -// XPRoomPKPaneAvatarType_Blue_Default, -// XPRoomPKPaneAvatarType_Leader_Red_Default, -// XPRoomPKPaneAvatarType_Leader_Blue_Default, -}; - -@protocol XPRoomPKPanelUserViewDelegate -///选择红队还是蓝队的添加人 -- (void)didTapAvatar:(RoomPKChooseUserModel *)userModel didClickAddButton:(GroupType)gType; - -@end - -@interface XPRoomPKPaneAvatarView : UIView - -@property (nonatomic, assign) GroupType gType; -@property (nonatomic, assign) XPRoomPKPaneAvatarType type; -@property (nonatomic, weak) id delegate; -@property (nonatomic, strong) RoomPKChooseUserModel *userModel; -@property (nonatomic, copy) void (^didTapAvatar)(XPRoomPKPaneAvatarType type); - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPaneAvatarView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPaneAvatarView.m deleted file mode 100644 index 68dc1d2..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPaneAvatarView.m +++ /dev/null @@ -1,122 +0,0 @@ -// -// XPRoomPKPaneAvatarView.m -// YuMi -// -// Created by P on 2024/6/14. -// - -#import "XPRoomPKPaneAvatarView.h" - -#import "RoomPKChooseUserModel.h" - -@interface XPRoomPKPaneAvatarView() - -@property (nonatomic, strong) UIImageView *avatarBackgroundImageView; -@property (nonatomic, strong) NetImageView *avatarImageView; - -@end - -@implementation XPRoomPKPaneAvatarView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - self.clipsToBounds = NO; - [self setupUI]; - [self setupGesture]; - } - return self; -} - -- (void)setupUI { - [self addSubview:self.avatarBackgroundImageView]; - [self.avatarBackgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self addSubview:self.avatarImageView]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarBackgroundImageView); - make.width.equalTo(self.avatarBackgroundImageView.mas_width).offset(-4); - make.height.equalTo(self.avatarBackgroundImageView.mas_height).offset(-4); - }]; -} - -- (void)setupGesture { - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self - action:@selector(handleTapGesture)]; - [self addGestureRecognizer:tap]; -} - -- (void)handleTapGesture { - if (self.didTapAvatar) { - self.didTapAvatar(self.type); - } - - if (self.delegate) { - [self.delegate didTapAvatar:self.userModel - didClickAddButton:self.gType]; - } -} - -- (void)setType:(XPRoomPKPaneAvatarType)type { - _type = type; - switch (type) { - case XPRoomPKPaneAvatarType_Red: - self.avatarBackgroundImageView.image = [UIImage imageNamed:@"room_pk_avatar_bg_red"]; - self.avatarImageView.hidden = YES; - self.avatarImageView.layer.cornerRadius = 15; - self.gType = GroupType_Red; - break; - case XPRoomPKPaneAvatarType_Blue: - self.avatarBackgroundImageView.image = [UIImage imageNamed:@"room_pk_avatar_bg_blue"]; - self.avatarImageView.hidden = YES; - self.avatarImageView.layer.cornerRadius = 15; - self.gType = GroupType_Blue; - break; - case XPRoomPKPaneAvatarType_Leader_Red: - self.avatarBackgroundImageView.image = [UIImage imageNamed:@"room_pk_avatar_bg_red"]; - self.avatarImageView.layer.cornerRadius = 31; - self.gType = GroupType_Red; - break; - case XPRoomPKPaneAvatarType_Leader_Blue: - self.avatarBackgroundImageView.image = [UIImage imageNamed:@"room_pk_avatar_bg_blue"]; - self.avatarImageView.layer.cornerRadius = 31; - self.gType = GroupType_Blue; - break; - default: - break; - } -} - -- (void)setUserModel:(RoomPKChooseUserModel *)userModel -{ - _userModel = userModel; - if (_userModel) { - self.avatarImageView.imageUrl = userModel.avatar; - } - - self.avatarImageView.hidden = _userModel == nil; -} - -#pragma mark - -- (UIImageView *)avatarBackgroundImageView { - if (!_avatarBackgroundImageView) { - _avatarBackgroundImageView = [[UIImageView alloc] init]; - _avatarBackgroundImageView.contentMode = UIViewContentModeScaleAspectFit; - _avatarBackgroundImageView.clipsToBounds = NO; - } - return _avatarBackgroundImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - } - return _avatarImageView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPanelUserView.h b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPanelUserView.h deleted file mode 100644 index 6b7715e..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPanelUserView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMRoomPKPanelUserView.h -// YUMI -// -// Created by YUMI on 2022/3/28. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN -@class XPRoomPKPanelUserView, RoomPKChooseUserModel; -@protocol XPRoomPKPanelUserViewDelegate -///选择红队还是蓝队的添加人 -- (void)xPRoomPKPanelUserView:(XPRoomPKPanelUserView *)view didClickAddButton:(GroupType)type; - -@end -@interface XPRoomPKPanelUserView : UIView -///是否展示添加的按钮 -@property (nonatomic,assign) BOOL isShowAdd; -///高度 -@property (nonatomic,assign) CGFloat itemHeight; -@property (nonatomic,assign) GroupType type; -@property (nonatomic,strong, nullable) NSArray *userArray; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPanelUserView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPanelUserView.m deleted file mode 100644 index 43dcba1..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPanelUserView.m +++ /dev/null @@ -1,310 +0,0 @@ -// -// YMRoomPKPanelUserView.m -// YUMI -// -// Created by YUMI on 2022/3/28. -// - -#import "XPRoomPKPanelUserView.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -///Model -#import "RoomPKChooseUserModel.h" - -@interface XPRoomPKPanelUserView () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///人员 -@property (nonatomic,strong) UIView * userView; -///第一个人 -@property (nonatomic,strong) NetImageView *firstUserView; -///第二个人 -@property (nonatomic,strong) NetImageView *secondUserView; -///第三个人 -@property (nonatomic,strong) NetImageView *thirdUserView; -///第四个人 -@property (nonatomic,strong) NetImageView *fourthUserView; -///第五个人 -@property (nonatomic,strong) NetImageView *fifthUserView; -///添加按钮 -@property (nonatomic,strong) UIButton *addButton; -/// -@property (nonatomic,strong) NSArray *viewArray; -@end - -@implementation XPRoomPKPanelUserView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)layoutSubviews { - [super layoutSubviews]; - CGFloat itemheight = self.itemHeight; - self.firstUserView.layer.cornerRadius = itemheight / 2; - self.secondUserView.layer.cornerRadius = itemheight / 2; - self.thirdUserView.layer.cornerRadius = itemheight / 2; - self.fourthUserView.layer.cornerRadius = itemheight / 2; - self.fifthUserView.layer.cornerRadius = itemheight / 2; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.isShowAdd = YES; - [self addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.addButton]; - [self.stackView addArrangedSubview:self.userView]; - [self.userView addSubview:self.fifthUserView]; - [self.userView addSubview:self.fourthUserView]; - [self.userView addSubview:self.thirdUserView]; - [self.userView addSubview:self.secondUserView]; - [self.userView addSubview:self.firstUserView]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.stackView.mas_leading); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.top.bottom.mas_equalTo(self); - }]; - - [self.addButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(25); - }]; - - [self.userView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(0); - }]; -} - -#pragma mark - Event Response -- (void)addButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomPKPanelUserView:didClickAddButton:)]) { - [self.delegate xPRoomPKPanelUserView:self didClickAddButton:self.type]; - } -} - -- (void)didTapUserViewRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomPKPanelUserView:didClickAddButton:)]) { - [self.delegate xPRoomPKPanelUserView:self didClickAddButton:self.type]; - } -} - -#pragma mark - Getters And Setters -- (void)setUserArray:(NSArray *)userArray { - _userArray = userArray; - if (_userArray.count > 0) { - self.userView.hidden = NO; - self.addButton.hidden = YES; - for (int i = 0 ; i< self.viewArray.count; i++) { - NetImageView * view = [self.viewArray xpSafeObjectAtIndex:i]; - if (i < self.userArray.count) { - RoomPKChooseUserModel * userInfo = [self.userArray xpSafeObjectAtIndex:i]; - view.hidden = NO; - view.imageUrl = userInfo.avatar; - } else { - view.hidden = YES; - } - } - CGFloat userViewWidth = (_userArray.count - 1) * 5 + self.itemHeight; - [self.userView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(userViewWidth); - }]; - } else { - self.userView.hidden = YES; - self.addButton.hidden = self.isShowAdd ? NO : YES; - } -} - -- (void)setType:(GroupType)type { - _type = type; - if (_type == GroupType_Red) { - CGColorRef color = UIColorFromRGB(0xFFA572).CGColor; - self.firstUserView.layer.borderColor = color; - self.secondUserView.layer.borderColor = color; - self.thirdUserView.layer.borderColor = color; - self.fourthUserView.layer.borderColor = color; - self.fifthUserView.layer.borderColor = color; - [self.addButton setImage:[UIImage imageNamed:@"room_pk_progrss_red_add"] forState:UIControlStateNormal]; - [self.firstUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(self.mas_height); - make.trailing.centerY.mas_equalTo(self.userView); - }]; - - [self.secondUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.firstUserView); - make.leading.mas_equalTo(self.firstUserView.mas_leading).offset(-5); - }]; - - [self.thirdUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.firstUserView); - make.leading.mas_equalTo(self.secondUserView.mas_leading).offset(-5); - }]; - - [self.fourthUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.firstUserView); - make.leading.mas_equalTo(self.thirdUserView.mas_leading).offset(-5); - }]; - - [self.fifthUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.firstUserView); - make.leading.mas_equalTo(self.fourthUserView.mas_leading).offset(-5); - }]; - self.viewArray = @[self.firstUserView, self.secondUserView, self.thirdUserView, self.fourthUserView, self.fifthUserView]; - } else { - CGColorRef color = UIColorFromRGB(0x3ECAFC).CGColor; - self.firstUserView.layer.borderColor = color; - self.secondUserView.layer.borderColor = color; - self.thirdUserView.layer.borderColor = color; - self.fourthUserView.layer.borderColor = color; - self.fifthUserView.layer.borderColor = color; - [self.addButton setImage:[UIImage imageNamed:@"room_pk_progrss_blue_add"] forState:UIControlStateNormal]; - [self.fifthUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(self.mas_height); - make.leading.centerY.mas_equalTo(self.userView); - }]; - - [self.fourthUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.fifthUserView); - make.leading.mas_equalTo(self.fifthUserView.mas_leading).offset(5); - }]; - - [self.thirdUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.fifthUserView); - make.leading.mas_equalTo(self.fourthUserView.mas_leading).offset(5); - }]; - - - [self.secondUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.fifthUserView); - make.leading.mas_equalTo(self.thirdUserView.mas_leading).offset(5); - }]; - - [self.firstUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.fifthUserView); - make.leading.mas_equalTo(self.secondUserView.mas_leading).offset(5); - }]; - self.viewArray = @[self.fifthUserView, self.fourthUserView, self.thirdUserView, self.secondUserView, self.firstUserView]; - } -} - -- (void)setIsShowAdd:(BOOL)isShowAdd { - _isShowAdd = isShowAdd; - self.addButton.hidden = !_isShowAdd; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 0; - } - return _stackView; -} - -- (UIView *)userView { - if (!_userView) { - _userView = [[UIView alloc] init]; - _userView.backgroundColor = [UIColor clearColor]; - _userView.hidden = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapUserViewRecognizer)]; - [_userView addGestureRecognizer:tap]; - } - return _userView; -} - -- (NetImageView *)firstUserView { - if (!_firstUserView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _firstUserView = [[NetImageView alloc] initWithConfig:config]; - _firstUserView.layer.masksToBounds = YES; - _firstUserView.layer.cornerRadius = 25/2; - _firstUserView.layer.borderWidth = 1; - _firstUserView.userInteractionEnabled = YES; - } - return _firstUserView; -} - -- (NetImageView *)secondUserView { - if (!_secondUserView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _secondUserView = [[NetImageView alloc] initWithConfig:config]; - _secondUserView.layer.masksToBounds = YES; - _secondUserView.layer.cornerRadius = 25/2; - _secondUserView.layer.borderWidth = 1; - _secondUserView.userInteractionEnabled = YES; - } - return _secondUserView; -} - - -- (NetImageView *)thirdUserView { - if (!_thirdUserView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _thirdUserView = [[NetImageView alloc] initWithConfig:config]; - _thirdUserView.layer.masksToBounds = YES; - _thirdUserView.layer.cornerRadius = 25/2; - _thirdUserView.layer.borderWidth = 1; - _secondUserView.userInteractionEnabled = YES; - } - return _thirdUserView; -} - -- (NetImageView *)fourthUserView { - if (!_fourthUserView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _fourthUserView = [[NetImageView alloc] initWithConfig:config]; - _fourthUserView.layer.masksToBounds = YES; - _fourthUserView.layer.cornerRadius = 25/2; - _fourthUserView.layer.borderWidth = 1; - _fourthUserView.userInteractionEnabled = YES; - } - return _fourthUserView; -} - -- (NetImageView *)fifthUserView { - if (!_fifthUserView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _fifthUserView = [[NetImageView alloc] initWithConfig:config]; - _fifthUserView.layer.masksToBounds = YES; - _fifthUserView.layer.cornerRadius = 25/2; - _fifthUserView.layer.borderWidth = 1; - _fifthUserView.userInteractionEnabled = YES; - } - return _fifthUserView; -} - -- (UIButton *)addButton { - if (!_addButton) { - _addButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_addButton addTarget:self action:@selector(addButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _addButton; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.h b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.h deleted file mode 100644 index fed5822..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMRoomPKRecordNickView.h -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomPKTeamUserModel; -@interface XPRoomPKRecordNickView : UIView -///用户列表 -@property (nonatomic,strong) NSArray *userList; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.m deleted file mode 100644 index 3b9235c..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.m +++ /dev/null @@ -1,232 +0,0 @@ -// -// YMRoomPKRecordNickView.m -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import "XPRoomPKRecordNickView.h" -///Third -#import -///Model -#import "RoomPKTeamModel.h" -#import "NSArray+Safe.h" - -@interface XPRoomPKRecordNickView () -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///左边的容器 -@property (nonatomic,strong) UIStackView *leftStackView; -///第一个名字 -@property (nonatomic,strong) UILabel *firstNickLabel; -///第二个名字 -@property (nonatomic,strong) UILabel *secondNickLabel; -///右边的容器 -@property (nonatomic,strong) UIStackView *rightStackView; -///第三个名字 -@property (nonatomic,strong) UILabel *thirdNickLabel; -///第四个名字 -@property (nonatomic,strong) UILabel *fourthNickLabel; -///分割线 -@property (nonatomic,strong) UIImageView *lineImageView; -/// -@property (nonatomic,strong) NSArray *viewArray; -@end - -@implementation XPRoomPKRecordNickView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.layer.masksToBounds = YES; - self.layer.cornerRadius = 8; - [self addSubview:self.stackView]; - [self addSubview:self.lineImageView]; - [self.stackView addArrangedSubview:self.leftStackView]; - [self.stackView addArrangedSubview:self.rightStackView]; - - [self.leftStackView addArrangedSubview:self.firstNickLabel]; - [self.leftStackView addArrangedSubview:self.thirdNickLabel]; - - [self.rightStackView addArrangedSubview:self.secondNickLabel]; - [self.rightStackView addArrangedSubview:self.fourthNickLabel]; - - self.viewArray = @[self.firstNickLabel, self.secondNickLabel, self.thirdNickLabel, self.fourthNickLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.stackView).offset(10); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(10); - make.leading.trailing.mas_equalTo(self); - }]; - - [self.firstNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(15); - }]; - - [self.secondNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(15); - }]; - - [self.thirdNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(15); - }]; - - [self.fourthNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(15); - }]; - - [self.lineImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self).offset(5); - make.bottom.mas_equalTo(self).offset(-5); - make.width.mas_equalTo(1); - }]; -} - -#pragma mark - Getters And Setters -- (void)setUserList:(NSArray *)userList { - _userList = userList; - if (_userList.count > 0) { - self.firstNickLabel.hidden = YES; - self.secondNickLabel.hidden = YES; - self.thirdNickLabel.hidden = YES; - self.fourthNickLabel.hidden = YES; - self.lineImageView.hidden = YES; - self.leftStackView.hidden = YES; - self.rightStackView.hidden = YES; - if (_userList.count == 1) { - self.firstNickLabel.hidden = NO; - self.leftStackView.hidden = NO; - } else if(_userList.count ==2) { - self.firstNickLabel.hidden = NO; - self.leftStackView.hidden = NO; - self.rightStackView.hidden = NO; - self.secondNickLabel.hidden = NO; - self.lineImageView.hidden = NO; - } else if(_userList.count == 3) { - self.firstNickLabel.hidden = NO; - self.leftStackView.hidden = NO; - self.rightStackView.hidden = NO; - self.secondNickLabel.hidden = NO; - self.thirdNickLabel.hidden = NO; - self.lineImageView.hidden = NO; - } else { - self.firstNickLabel.hidden = NO; - self.secondNickLabel.hidden = NO; - self.thirdNickLabel.hidden = NO; - self.fourthNickLabel.hidden = NO; - self.lineImageView.hidden = NO; - self.leftStackView.hidden = NO; - self.rightStackView.hidden = NO; - self.lineImageView.hidden = NO; - } - for (int i = 0; i < _userList.count; i++) { - RoomPKTeamUserModel * userInfo = [_userList xpSafeObjectAtIndex:i]; - UILabel * label = [self.viewArray xpSafeObjectAtIndex:i]; - label.text = userInfo.nick; - } - } -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFillEqually; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 2; - } - return _stackView; -} - - -- (UIStackView *)leftStackView { - if (!_leftStackView) { - _leftStackView = [[UIStackView alloc] init]; - _leftStackView.axis = UILayoutConstraintAxisVertical; - _leftStackView.distribution = UIStackViewDistributionFill; - _leftStackView.alignment = UIStackViewAlignmentFill; - _leftStackView.spacing = 2; - } - return _leftStackView; -} - -- (UILabel *)firstNickLabel { - if (!_firstNickLabel) { - _firstNickLabel = [[UILabel alloc] init]; - _firstNickLabel.font = [UIFont systemFontOfSize:12]; - _firstNickLabel.textColor = [UIColor whiteColor]; - _firstNickLabel.textAlignment = NSTextAlignmentCenter; - } - return _firstNickLabel; -} - -- (UILabel *)secondNickLabel { - if (!_secondNickLabel) { - _secondNickLabel = [[UILabel alloc] init]; - _secondNickLabel.font = [UIFont systemFontOfSize:12]; - _secondNickLabel.textColor = [UIColor whiteColor]; - _secondNickLabel.textAlignment = NSTextAlignmentCenter; - } - return _secondNickLabel; -} - - -- (UIStackView *)rightStackView { - if (!_rightStackView) { - _rightStackView = [[UIStackView alloc] init]; - _rightStackView.axis = UILayoutConstraintAxisVertical; - _rightStackView.distribution =UIStackViewDistributionFill; - _rightStackView.alignment = UIStackViewAlignmentFill; - _rightStackView.spacing = 2; - } - return _rightStackView; -} - -- (UILabel *)thirdNickLabel { - if (!_thirdNickLabel) { - _thirdNickLabel = [[UILabel alloc] init]; - _thirdNickLabel.font = [UIFont systemFontOfSize:12]; - _thirdNickLabel.textColor = [UIColor whiteColor]; - _thirdNickLabel.textAlignment = NSTextAlignmentCenter; - } - return _thirdNickLabel; -} - -- (UILabel *)fourthNickLabel { - if (!_fourthNickLabel) { - _fourthNickLabel = [[UILabel alloc] init]; - _fourthNickLabel.font = [UIFont systemFontOfSize:12]; - _fourthNickLabel.textColor = [UIColor whiteColor]; - _fourthNickLabel.textAlignment = NSTextAlignmentCenter; - } - return _fourthNickLabel; -} - -- (UIImageView *)lineImageView { - if (!_lineImageView) { - _lineImageView = [[UIImageView alloc] init]; - _lineImageView.userInteractionEnabled = YES; - _lineImageView.image = [UIImage imageNamed:@"room_pk_record_line_bg"]; - } - return _lineImageView; -} - - - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.h b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.h deleted file mode 100644 index e093e54..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// YMRoomPKSelectUserView.h -// YUMI -// -// Created by YUMI on 2022/3/21. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN -@class MicroQueueModel, XPRoomPKSelectUserView, RoomPKChooseUserModel; - -@protocol XPRoomPKSelectUserViewDelegate - -- (void)xPRoomPKSelectUserView:(XPRoomPKSelectUserView *)view groupType:(GroupType)groupType didChooseUserInfos:(NSArray *)userInfos; - -@end - -@interface XPRoomPKSelectUserView : UIView -///红队的成员 -@property (nonatomic,copy) NSArray *redUserArray; -///蓝队的成员 -@property (nonatomic,copy) NSArray *blueUserArray; -///红队的还是蓝队的 -@property (nonatomic,assign) GroupType groupType; -///麦序的信息 -@property (nonatomic,copy) NSArray *microQueueArray; -///代理 -@property (nonatomic,weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.m deleted file mode 100644 index 94bbc27..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.m +++ /dev/null @@ -1,435 +0,0 @@ -// -// YMRoomPKSelectUserView.m -// YUMI -// -// Created by YUMI on 2022/3/21. -// - -#import "XPRoomPKSelectUserView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "NSArray+Safe.h" -///Model -#import "RoomPKChooseUserModel.h" -#import "MicroQueueModel.h" -#import "UserInfoModel.h" -///View -#import "XPRoomPKUserCollectionViewCell.h" -@interface XPRoomPKSelectUserView () -///头像 -@property (nonatomic,strong) NetImageView *ownerAvatarImageView; -///房主 -@property (nonatomic,strong) UILabel *ownerLabel; -///是否选择 -@property (nonatomic,strong) UIButton *chooseButton; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///确定 -@property (nonatomic,strong) UIButton *confirmButton; -///坑位的数组 -@property (nonatomic,strong) NSArray * userPositionArray; -///房主信息 -@property (nonatomic,strong) RoomPKChooseUserModel *ownerUserInfo; -///选中的数组 -@property (nonatomic,strong) NSMutableArray *chooseArray; - -@end - -@implementation XPRoomPKSelectUserView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - self.layer.masksToBounds = YES; - self.layer.cornerRadius = 12; - [self addSubview:self.ownerAvatarImageView]; - [self addSubview:self.ownerLabel]; - [self addSubview:self.chooseButton]; - [self addSubview:self.collectionView]; - [self addSubview:self.confirmButton]; -} - -- (void)initSubViewConstraints { - [self.ownerAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(22); - make.centerX.mas_equalTo(self); - make.width.mas_equalTo(46); - make.height.mas_equalTo(46); - }]; - - [self.ownerLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.ownerAvatarImageView); - make.top.mas_equalTo(self.ownerAvatarImageView.mas_bottom).offset(5); - make.height.mas_equalTo(14); - }]; - - [self.chooseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.bottom.mas_equalTo(self.ownerAvatarImageView); - make.width.height.mas_equalTo(16); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self); - make.top.mas_equalTo(self.ownerLabel.mas_bottom).offset(10); - make.height.mas_equalTo(65 * 2 + 10); - }]; - - [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.collectionView.mas_bottom).offset(15); - make.centerX.mas_equalTo(self); - make.width.mas_equalTo(140); - make.height.mas_equalTo(38); - }]; - - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth - 40 * 2); - make.bottom.mas_equalTo(self.confirmButton.mas_bottom).offset(15); - }]; -} - - -#pragma mark - UICollectionViewDelegate And UICollectionViewDatasource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.userPositionArray.count; -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section { - return 10; -} - -- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { - return (KScreenWidth - 40 * 2 - 46 * 4 - 15 * 2)/ 3; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - return CGSizeMake(46, 65); -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPRoomPKUserCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPRoomPKUserCollectionViewCell class]) forIndexPath:indexPath]; - RoomPKChooseUserModel * model = [self.userPositionArray xpSafeObjectAtIndex:indexPath.row]; - cell.userInfo = model; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - RoomPKChooseUserModel * model = [self.userPositionArray xpSafeObjectAtIndex:indexPath.row]; - if (!model.isEnableChoose) { - return; - } - if (model.uid.length > 0) { - model.isSelect = !model.isSelect; - __block RoomPKChooseUserModel * selectModel; - [self.chooseArray enumerateObjectsUsingBlock:^(RoomPKChooseUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid == model.uid) { - selectModel = obj; - *stop = YES; - } - }]; - if (selectModel && !model.isSelect) { - selectModel.groupType = GroupType_default; - } - - if (model.isSelect && selectModel == nil) { - [self.chooseArray addObject:model]; - } - -// @kWeakify(self); -// dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ -// @kStrongify(self); -// [self.chooseArray enumerateObjectsUsingBlock:^(RoomPKChooseUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { -// if (obj.uid == model.uid) { -// selectModel = obj; -// *stop = YES; -// } -// }]; -// if (selectModel) { -// selectModel.groupType = model.isSelect ? model.groupType : GroupType_default; -// selectModel.isSelect = model.isSelect; -// } -// if (model.isSelect) { -// if (![self.chooseArray containsObject:model]) { -// [self.chooseArray addObject:model]; -// } -// } else { -// if ([self.chooseArray containsObject:model]) { -// [self.chooseArray removeObject:model]; -// } else { -// [self.chooseArray removeObject:selectModel]; -// } -// } -// dispatch_async(dispatch_get_main_queue(), ^{ -// [self.collectionView reloadData]; -// }); -// }); - } - [self.collectionView reloadData]; -} - -#pragma mark - Event Response -- (void)confirmButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomPKSelectUserView:groupType:didChooseUserInfos:)]) { - [self.delegate xPRoomPKSelectUserView:self groupType:self.groupType didChooseUserInfos:self.chooseArray]; - } -} - -- (void)chooseButtonAction:(UIButton *)sender { - if (self.chooseButton.hidden) {return;} - sender.selected = !sender.selected; - self.ownerUserInfo.isSelect = !self.ownerUserInfo.isSelect; - __block RoomPKChooseUserModel * selectModel; - [self.chooseArray enumerateObjectsUsingBlock:^(RoomPKChooseUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid == self.ownerUserInfo.uid) { - selectModel = obj; - *stop = YES; - } - }]; - if (selectModel && !self.ownerUserInfo.isSelect) { - selectModel.groupType = GroupType_default; - } - - if (self.ownerUserInfo.isSelect && selectModel == nil) { - [self.chooseArray addObject:self.ownerUserInfo]; - } -} - -- (void)didTapRecognizer:(UITapGestureRecognizer *)tap { - if (self.chooseButton.hidden) {return;} - self.chooseButton.selected = !self.chooseButton.selected; - self.ownerUserInfo.isSelect = !self.ownerUserInfo.isSelect; - __block RoomPKChooseUserModel * selectModel; - [self.chooseArray enumerateObjectsUsingBlock:^(RoomPKChooseUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid == self.ownerUserInfo.uid) { - selectModel = obj; - *stop = YES; - } - }]; - if (selectModel && !self.ownerUserInfo.isSelect) { - selectModel.groupType = GroupType_default; - } - - if (self.ownerUserInfo.isSelect && selectModel == nil) { - [self.chooseArray addObject:self.ownerUserInfo]; - } -} - -#pragma mark - Getters And Setters -- (void)setGroupType:(GroupType)groupType { - _groupType = groupType; - if (_groupType == GroupType_Red) { - [self.chooseArray addObjectsFromArray:self.redUserArray]; - } else if (_groupType == GroupType_Blue) { - [self.chooseArray addObjectsFromArray:self.blueUserArray]; - } -} - -- (void)setMicroQueueArray:(NSArray *)microQueueArray { - _microQueueArray = microQueueArray; - for (int i = 0; i< microQueueArray.count; i++) { - MicroQueueModel * microModel = [microQueueArray xpSafeObjectAtIndex:i]; - if (microModel.userInfo && microModel.userInfo.uid > 0) { - int position = microModel.microState.position; - if (position < self.userPositionArray.count) { - - RoomPKChooseUserModel * userInfoModel = [self.userPositionArray xpSafeObjectAtIndex:position]; - userInfoModel.title = microModel.userInfo.nick; - userInfoModel.avatar = microModel.userInfo.avatar; - userInfoModel.uid = [NSString stringWithFormat:@"%ld", microModel.userInfo.uid]; - userInfoModel.position = position; - userInfoModel.nick = microModel.userInfo.nick; - userInfoModel.groupType = self.groupType; - userInfoModel.isEnableChoose = YES; - if (self.groupType == GroupType_Red) { - for (int i = 0; i *)chooseArray { - if (!_chooseArray) { - _chooseArray = [NSMutableArray array]; - } - return _chooseArray; -} - -- (RoomPKChooseUserModel *)ownerUserInfo { - if (!_ownerUserInfo) { - _ownerUserInfo = [[RoomPKChooseUserModel alloc] init]; - } - return _ownerUserInfo; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.h b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.h deleted file mode 100644 index f560b00..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// YMRoomPKTimePickerView.h -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomPKTimeItemModel, XPRoomPKTimePickerView; -@protocol XPRoomPKTimePickerViewDelegate - -- (void)xPRoomPKTimePickerView:(XPRoomPKTimePickerView *)view timeModel:(RoomPKTimeItemModel *)model; - -@end - -@interface XPRoomPKTimePickerView : UIView -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m deleted file mode 100644 index 306d5a8..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m +++ /dev/null @@ -1,254 +0,0 @@ -// -// YMRoomPKTimePickerView.m -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import "XPRoomPKTimePickerView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "TTPopup.h" -#import "NSArray+Safe.h" -///Model -#import "RoomPKTimeItemModel.h" -@interface XPRoomPKTimePickerView () -///选择器 -@property (nonatomic,strong) UIPickerView *pickView; -///取消 -@property (nonatomic,strong) UIButton *cancelButton; -///确定 -@property (nonatomic,strong) UIButton *confirmButton; -///数据源 -@property (nonatomic,strong) NSMutableArray *> *datasource; -///0秒钟 -@property (nonatomic,strong) RoomPKTimeItemModel *zeroModel; -///30秒钟 -@property (nonatomic,strong) RoomPKTimeItemModel *thirdModel; -///选择的分钟 -@property (nonatomic,strong) RoomPKTimeItemModel *selectMinModel; -///选择的秒钟 -@property (nonatomic,strong) RoomPKTimeItemModel *selectSecondModel; -///最终选中的 -@property (nonatomic,strong) RoomPKTimeItemModel *selectModel; -@end - -@implementation XPRoomPKTimePickerView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - - [self addSubview:self.cancelButton]; - [self addSubview:self.confirmButton]; - [self addSubview:self.pickView]; - - NSMutableArray * minArray = [NSMutableArray array]; - for (int i = 0 ; i < 31; i++) { - RoomPKTimeItemModel * timeModel = [[RoomPKTimeItemModel alloc] init]; - timeModel.title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomPKTimePickerView0"), i]; - timeModel.time = i; - [minArray addObject:timeModel]; - } - self.selectMinModel = minArray.firstObject; - self.selectSecondModel = self.zeroModel; - NSMutableArray * secondArray = [NSMutableArray array]; - [secondArray addObject:self.thirdModel]; - - self.selectSecondModel = self.thirdModel; - - [self.datasource addObject:minArray]; - [self.datasource addObject:secondArray]; - - CAShapeLayer * layer = [CAShapeLayer layer]; - layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, 234+ kSafeAreaBottomHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)].CGPath; - self.layer.masksToBounds = YES; - self.layer.mask = layer; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(234 + kSafeAreaBottomHeight); - }]; - - [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(10); - make.top.mas_equalTo(10); - make.width.mas_equalTo(40); - make.height.mas_equalTo(25); - }]; - - [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-10); - make.top.mas_equalTo(10); - make.width.mas_equalTo(40); - make.height.mas_equalTo(25); - }]; - - [self.pickView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(45); - make.leading.trailing.mas_equalTo(10); - make.bottom.mas_equalTo(-kSafeAreaBottomHeight); - }]; -} - -#pragma mark - UIPickerViewDataSource -- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView { - return self.datasource.count; -} - -- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component { - return self.datasource[component].count; -} - -- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component { - RoomPKTimeItemModel * model = [[self.datasource xpSafeObjectAtIndex:component] xpSafeObjectAtIndex:row]; - return model.title; -} -#pragma mark - UIPickerViewDelegate -- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component { - if (component == 0) { - RoomPKTimeItemModel * model = [[self.datasource xpSafeObjectAtIndex:component] xpSafeObjectAtIndex:row]; - self.selectMinModel = model; - if ([model.title isEqualToString:YMLocalizedString(@"XPRoomPKTimePickerView1")]) { - self.selectSecondModel = self.thirdModel; - NSMutableArray * array = [self.datasource xpSafeObjectAtIndex:1]; - if ([array containsObject:self.zeroModel]) { - [array removeObject:self.zeroModel]; - } - - if (![array containsObject:self.thirdModel]) { - [array addObject:self.thirdModel]; - } - }else if ([model.title isEqualToString:YMLocalizedString(@"XPRoomPKTimePickerView2")]) { - self.selectSecondModel = self.zeroModel; - NSMutableArray * array = [self.datasource xpSafeObjectAtIndex:1]; - if ([array containsObject:self.thirdModel]) { - [array removeObject:self.thirdModel]; - } - - if (![array containsObject:self.zeroModel]) { - [array insertObject:self.zeroModel atIndex:0]; - } - } else { - self.selectSecondModel = self.zeroModel; - NSMutableArray * array = [self.datasource xpSafeObjectAtIndex:1]; - if (![array containsObject:self.zeroModel]) { - [array insertObject:self.zeroModel atIndex:0]; - } - - if (![array containsObject:self.thirdModel]) { - [array addObject:self.thirdModel]; - } - } - [pickerView reloadComponent:1]; - } else { - RoomPKTimeItemModel * model = [[self.datasource xpSafeObjectAtIndex:component] xpSafeObjectAtIndex:row]; - self.selectSecondModel = model; - } -} - -#pragma mark - Event Response -- (void)confirmButtonAction:(UIButton *)sender { - [TTPopup dismiss]; - NSString * title; - if (self.selectMinModel.time > 0) { - title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomPKTimePickerView3"), self.selectMinModel.time, self.selectSecondModel.time]; - } else { - title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomPKTimePickerView4"), self.selectSecondModel.time]; - } - self.selectModel.title = title; - self.selectModel.time = self.selectMinModel.time * 60 + self.selectSecondModel.time; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomPKTimePickerView:timeModel:)]) { - [self.delegate xPRoomPKTimePickerView:self timeModel:self.selectModel]; - } -} - -- (void)cancelButtonAction:(UIButton *)sender { - [TTPopup dismiss]; -} - -#pragma mark - Getters And Setters -- (UIButton *)cancelButton { - if (!_cancelButton) { - _cancelButton = [[UIButton alloc] init]; - [_cancelButton setTitle:YMLocalizedString(@"XPRoomPKTimePickerView5") forState:UIControlStateNormal]; - [_cancelButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - _cancelButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_cancelButton addTarget:self action:@selector(cancelButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _cancelButton; -} - -- (UIButton *)confirmButton { - if (!_confirmButton) { - _confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_confirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - [_confirmButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - _confirmButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_confirmButton addTarget:self action:@selector(confirmButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _confirmButton; -} - -- (UIPickerView *)pickView { - if (!_pickView) { - _pickView = [[UIPickerView alloc] init]; - _pickView.backgroundColor = [UIColor whiteColor]; - if (@available(iOS 13.0, *)) { - _pickView.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; - } - _pickView.delegate = self; - _pickView.dataSource = self; - } - return _pickView; -} - -- (NSMutableArray *> *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -- (RoomPKTimeItemModel *)zeroModel { - if (!_zeroModel) { - RoomPKTimeItemModel * zeroModel = [[RoomPKTimeItemModel alloc] init]; - zeroModel.title = YMLocalizedString(@"XPRoomPKTimePickerView7"); - zeroModel.time = 0; - _zeroModel = zeroModel; - } - return _zeroModel; -} - -- (RoomPKTimeItemModel *)thirdModel { - if (!_thirdModel) { - _thirdModel = [[RoomPKTimeItemModel alloc] init]; - _thirdModel.title = YMLocalizedString(@"XPRoomPKTimePickerView8"); - _thirdModel.time = 30; - } - return _thirdModel; -} - -- (RoomPKTimeItemModel *)selectModel { - if (!_selectModel) { - _selectModel = [[RoomPKTimeItemModel alloc] init]; - } - return _selectModel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKUserView.h b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKUserView.h deleted file mode 100644 index cb5dc33..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKUserView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// YMRoomPKUserView.h -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger,RoomPKUserViewType) { - RoomPKUserViewType_Red = 1, - RoomPKUserViewType_Blue -}; -@class RoomPKChooseUserModel; - -@interface XPRoomPKUserView : UIView -@property(nonatomic,assign) NSInteger index; -@property (nonatomic,assign) RoomPKUserViewType type; -///用户信息 -@property (nonatomic,strong, nullable) RoomPKChooseUserModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKUserView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKUserView.m deleted file mode 100644 index 4a2bc69..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKUserView.m +++ /dev/null @@ -1,128 +0,0 @@ -// -// YMRoomPKUserView.m -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import "XPRoomPKUserView.h" -///Third -#import -///Tool -#import "NetImageView.h" -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -///Model -#import "RoomPKChooseUserModel.h" - -@interface XPRoomPKUserView () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///昵称 -@property (nonatomic,strong) UIButton *nickButton; -@end - -@implementation XPRoomPKUserView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.avatarImageView]; - [self addSubview:self.nickButton]; -} - -- (void)initSubViewConstraints { - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.top.mas_equalTo(self); - make.height.width.mas_equalTo(50); - }]; - - [self.nickButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(3); - make.height.mas_equalTo(14); - }]; -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(RoomPKChooseUserModel *)userInfo { - _userInfo = userInfo; - if (_userInfo) { - if (_userInfo.avatar.length > 0) { - self.avatarImageView.imageUrl = _userInfo.avatar; - } - if (_userInfo.title.length > 0) { - [self.nickButton setTitle:_userInfo.title forState:UIControlStateNormal]; - } - } else { - if (self.type == RoomPKUserViewType_Red) { - self.avatarImageView.image = [UIImage imageNamed:@"room_pk_position_red_bg"]; - [self.nickButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFC4A95), UIColorFromRGB(0xFE6075)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } else if(self.type == RoomPKUserViewType_Blue) { - self.avatarImageView.image = [UIImage imageNamed:@"room_pk_position_blue_bg"]; - [self.nickButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x3571FE), UIColorFromRGB(0x7994FC)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - [self.nickButton setTitle:[NSString stringWithFormat:@"%ld",_index] forState:UIControlStateNormal]; - } -} --(void)setIndex:(NSInteger)index{ - _index = index; - [self.nickButton setTitle:[NSString stringWithFormat:@"%ld",_index] forState:UIControlStateNormal]; -} -- (void)setType:(RoomPKUserViewType)type { - _type = type; - switch (_type) { - case RoomPKUserViewType_Red: - { - self.avatarImageView.image = [UIImage imageNamed:@"room_pk_position_red_bg"]; - [self.nickButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFC4A95), UIColorFromRGB(0xFE6075)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - break; - case RoomPKUserViewType_Blue: - { - self.avatarImageView.image = [UIImage imageNamed:@"room_pk_position_blue_bg"]; - [self.nickButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x3571FE), UIColorFromRGB(0x7994FC)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - - default: - break; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 50/2; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UIButton *)nickButton { - if (!_nickButton) { - _nickButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_nickButton setTitle:YMLocalizedString(@"XPRoomPKUserView1") forState:UIControlStateNormal]; - [_nickButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _nickButton.titleLabel.font = [UIFont systemFontOfSize:10]; - _nickButton.layer.masksToBounds = YES; - _nickButton.layer.cornerRadius = 7; - } - return _nickButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.h b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.h deleted file mode 100644 index d793434..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// XPRoomPKPanelView.h -// YuMi -// -// Created by P on 2024/6/13. -// - -#import - - -NS_ASSUME_NONNULL_BEGIN -@class MicroQueueModel, AttachmentModel, RoomInfoModel, RoomPKChooseUserModel; -@interface XPRoomPKPanelView : UIView - -@property (nonatomic, strong) UIView *pkPanelContentView; - -@property (nonatomic, strong) NSMutableDictionary *micQueue; -///房间信息 -@property (nonatomic, strong) RoomInfoModel *roomInfo; -///是否是管理员 -@property (nonatomic, assign) BOOL isManager; - -///红色的 -@property (nonatomic,strong, readonly) NSArray *redChooseArray; -///蓝色的 -@property (nonatomic,strong, readonly) NSArray *blueChooseArray; - -- (void)enterRoomGetRoomPKDetailInfo; -///处理pK的状态 -- (void)handleRoomPKCustomMessage:(AttachmentModel *)attachment; - -- (BOOL)isRoomPKPlaying; - -- (BOOL)isPanelMinion; - -///收到礼物 -- (void)roomPKReceiveGift:(AttachmentModel *)attachment; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.m deleted file mode 100644 index 879d2d0..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPanelView.m +++ /dev/null @@ -1,1451 +0,0 @@ -// -// XPRoomPKPanelView.m -// YuMi -// -// Created by P on 2024/6/13. -// - -#import "XPRoomPKPanelView.h" -#import "XPRoomPKPaneAvatarView.h" - -#import "NSArray+Safe.h" - -#import "Api+RoomPK.h" -#import "UserInfoModel.h" -#import "MicroQueueModel.h" -#import "RoomInfoModel.h" -#import "GiftReceiveInfoModel.h" -#import "XPArrangeMicInfoModel.h" -#import "RoomPKDetailInfoModel.h" -#import "RoomPKChooseUserModel.h" - -#import "XPGiftStorage.h" -#import "MicroExtModel.h" -#import "AttachmentModel.h" - -#import "XPRoomPKResultView.h" -#import "XPRoomPKSelectUserView.h" -#import "XCCurrentVCStackManager.h" -#import "XPArrangeMicViewController.h" - -@interface XPRoomPKPanelView() -///pk详情 -@property (nonatomic,strong) RoomPKInfoModel *pkInfo; -///是否正在进行中 -@property (nonatomic,assign) BOOL isPlaying; -///是否收到了Pk的结果 -@property (nonatomic,assign) BOOL isReceivePKResult; -///倒计时 -@property (strong, nonatomic) dispatch_source_t timer; -///当前的时间 -@property (nonatomic,assign) CGFloat currentTime; - -///红队的分数 -@property (nonatomic,assign) long redTeamScore; -///蓝的分数 -@property (nonatomic,assign) long blueTeamScore; -///红色的 -@property (nonatomic,strong) NSArray *redChooseArray; -///蓝色的 -@property (nonatomic,strong) NSArray *blueChooseArray; -///红队收到礼物个数(按照收礼个数) -@property (nonatomic, strong) NSMutableDictionary * redTeamGiftPersonDic; -///蓝队收到礼物个数(按照收礼个数) -@property (nonatomic, strong) NSMutableDictionary * blueTeamGiftPersonDic; - -@property (nonatomic, strong) UIImageView *backgroundImageView; -@property (nonatomic, strong) UIImageView *topImageView; -@property (nonatomic, strong) UIButton *minionButton; - -@property (nonatomic, strong) UIView *progressArea; - -@property (nonatomic, strong) XPRoomPKPaneAvatarView *leaderRed; -@property (nonatomic, strong) XPRoomPKPaneAvatarView *leaderBlue; - -@property (nonatomic, strong) XPRoomPKPaneAvatarView *memberRed_1; -@property (nonatomic, strong) XPRoomPKPaneAvatarView *memberRed_2; -@property (nonatomic, strong) XPRoomPKPaneAvatarView *memberRed_3; -@property (nonatomic, strong) XPRoomPKPaneAvatarView *memberBlue_1; -@property (nonatomic, strong) XPRoomPKPaneAvatarView *memberBlue_2; -@property (nonatomic, strong) XPRoomPKPaneAvatarView *memberBlue_3; - -@property (nonatomic, strong) UIStackView *redTeamStackView; -@property (nonatomic, strong) UIStackView *blueTeamStackView; - -@property (nonatomic, strong) UILabel *countDownLabel; - -@property (nonatomic, strong) UIButton *actionButton; - -///红方的进度图片 -@property (nonatomic, strong) UIImageView *redCountImageView; -///红方的礼物值 -@property (nonatomic, strong) UILabel *redCountLabel; -///蓝方的进度图片 -@property (nonatomic, strong) UIImageView *blueCountImageView; -///蓝方的礼物值 -@property (nonatomic, strong) UILabel *blueCountLabel; -@property (nonatomic, strong) UIImageView *fireImageView; - -@property (nonatomic, assign) BOOL isMinion; - -@end - -@implementation XPRoomPKPanelView -- (instancetype)init { - if (self = [super init]) { - self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6]; - [self setupUI]; - } - return self; -} - -- (void)dealloc -{ - [self stopRoomPKCountDown]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { -// [self setupUI]; - } - return self; -} - -- (void)setupUI { - self.frame = CGRectMake(0, - 0, - KScreenWidth, - KScreenHeight - 86); - - [self addSubview:self.pkPanelContentView]; - [self.pkPanelContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - make.size.mas_equalTo([self roomFrame].size); - }]; - - [self.pkPanelContentView addSubview:self.backgroundImageView]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.pkPanelContentView); - }]; - - [self.pkPanelContentView addSubview:self.topImageView]; - [self.topImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.pkPanelContentView); - make.centerY.mas_equalTo(self.pkPanelContentView.mas_top); - make.size.mas_equalTo(CGSizeMake(375, 120)); - }]; - - [self setupCenterVSMark]; - - [self.pkPanelContentView addSubview:self.minionButton]; - [self.minionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.pkPanelContentView).offset(12); - make.trailing.mas_equalTo(self.pkPanelContentView).offset(-12); - make.size.mas_equalTo(CGSizeMake(30, 30)); - }]; - - [self.pkPanelContentView addSubview:self.leaderRed]; - [self.leaderRed mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.topImageView.mas_bottom).offset(21); - make.leading.mas_equalTo(self.pkPanelContentView).offset(12.5); - make.size.mas_equalTo(CGSizeMake(68, 68)); - }]; - - [self.pkPanelContentView addSubview:self.leaderBlue]; - [self.leaderBlue mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.topImageView.mas_bottom).offset(21); - make.trailing.mas_equalTo(self.pkPanelContentView).offset(-12.5); - make.size.mas_equalTo(CGSizeMake(68, 68)); - }]; - - [self.pkPanelContentView addSubview:self.redTeamStackView]; - [self.redTeamStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.pkPanelContentView).offset(4); - make.top.mas_equalTo(self.leaderRed.mas_bottom).offset(36); - make.size.mas_equalTo(CGSizeMake(110, 36)); - }]; - [self.redTeamStackView addArrangedSubview:self.memberRed_1]; - [self.redTeamStackView addArrangedSubview:self.memberRed_2]; - [self.redTeamStackView addArrangedSubview:self.memberRed_3]; - - [self.pkPanelContentView addSubview:self.blueTeamStackView]; - [self.blueTeamStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.pkPanelContentView).offset(-4); - make.top.mas_equalTo(self.leaderRed.mas_bottom).offset(36); - make.size.mas_equalTo(CGSizeMake(110, 36)); - }]; - [self.blueTeamStackView addArrangedSubview:self.memberBlue_1]; - [self.blueTeamStackView addArrangedSubview:self.memberBlue_2]; - [self.blueTeamStackView addArrangedSubview:self.memberBlue_3]; - - [self setupCountDownView]; - - [self setupProgressArea]; - - [self.pkPanelContentView addSubview:self.actionButton]; - [self.actionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.pkPanelContentView); - make.bottom.mas_equalTo(self.pkPanelContentView).offset(-26.5); - make.size.mas_equalTo(CGSizeMake(144, 32.5)); - }]; -} - -- (void)setupCallBack { - self.leaderRed.didTapAvatar = ^(XPRoomPKPaneAvatarType type) { - - }; - - self.leaderBlue.didTapAvatar = ^(XPRoomPKPaneAvatarType type) { - - }; -} - -- (void)handleTapAvatar { - -} - -#pragma mark - -- (void)enterRoomGetRoomPKDetailInfo { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - @kWeakify(self); - [Api getRoomPKDetail:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - RoomPKDetailInfoModel * pkDetailInfo = [RoomPKDetailInfoModel modelWithDictionary:data.data]; - self.pkInfo = pkDetailInfo.roomPK; - [self handleRoomPKInfoChangeState]; - if (self.pkInfo.pkStatus == RoomPKStatusType_Playing) { - [self startRoomPKCountDown:(self.pkInfo.endTime - pkDetailInfo.now) / 1000]; - } - - ///配置一下麦序的信息 - NSMutableArray * redArray = [NSMutableArray array]; - NSMutableArray * blueArray = [NSMutableArray array]; - if (self.pkInfo.pkStatus == RoomPKStatusType_Playing) { - for (int i = 0; i < self.pkInfo.teams.count; i++) { - RoomPKTeamModel * teamInfo = [self.pkInfo.teams xpSafeObjectAtIndex:i]; - if (teamInfo.team == GroupType_Red) { - self.redTeamScore = teamInfo.score; - for (int i = 0; i < teamInfo.teamMembers.count; i++) { - RoomPKTeamUserModel * teamUserModel = [teamInfo.teamMembers xpSafeObjectAtIndex:i]; - RoomPKChooseUserModel * redInfo = [[RoomPKChooseUserModel alloc] init]; - redInfo.avatar = teamUserModel.avatar; - redInfo.uid = teamUserModel.uid; - redInfo.groupType = GroupType_Red; - redInfo.position = [self findMicroInfoByUid:teamUserModel.uid].microState.position; - redInfo.nick = teamUserModel.nick; - [redArray addObject:redInfo]; - } - } else if(teamInfo.team == GroupType_Blue) { - self.blueTeamScore = teamInfo.score; - for (int i = 0; i < teamInfo.teamMembers.count; i++) { - RoomPKTeamUserModel * teamUserModel = [teamInfo.teamMembers xpSafeObjectAtIndex:i]; - RoomPKChooseUserModel * blueInfo = [[RoomPKChooseUserModel alloc] init]; - blueInfo.avatar = teamUserModel.avatar; - blueInfo.uid = teamUserModel.uid; - blueInfo.groupType = GroupType_Blue; - blueInfo.position = [self findMicroInfoByUid:teamUserModel.uid].microState.position; - blueInfo.nick = teamUserModel.nick; - [blueArray addObject:blueInfo]; - } - } - } - [self configRedTeamScore:self.redTeamScore blueTeamScore:self.blueTeamScore]; - } else { - NSMutableDictionary * queue = self.micQueue; - for (int i = 0 ; i < queue.allValues.count; i++) { - MicroQueueModel * micModel = [queue.allValues xpSafeObjectAtIndex:i]; - if (micModel.userInfo && micModel.userInfo.uid > 0) { - UserInfoModel * userInfo = micModel.userInfo; - if (userInfo.groupType == GroupType_Red) { - RoomPKChooseUserModel * redInfo = [[RoomPKChooseUserModel alloc] init]; - redInfo.avatar = userInfo.avatar; - redInfo.uid = [NSString stringWithFormat:@"%ld", userInfo.uid]; - redInfo.groupType = userInfo.groupType; - redInfo.position = micModel.microState.position; - redInfo.nick = userInfo.nick; - [redArray addObject:redInfo]; - } else if(userInfo.groupType == GroupType_Blue) { - RoomPKChooseUserModel * blueInfo = [[RoomPKChooseUserModel alloc] init]; - blueInfo.avatar = userInfo.avatar; - blueInfo.uid = [NSString stringWithFormat:@"%ld", userInfo.uid]; - blueInfo.groupType = userInfo.groupType; - blueInfo.position = micModel.microState.position; - blueInfo.nick = userInfo.nick; - [blueArray addObject:blueInfo]; - } - } - } - } - self.redChooseArray = redArray.copy; - self.blueChooseArray = blueArray.copy; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:roomUid]; -} - -///处理pK的状态 -- (void)handleRoomPKCustomMessage:(AttachmentModel *)attachment { - switch (attachment.second) { - case Custom_Message_Sub_Room_PK_Start:{ - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPRoomPKProgressView0")]; - RoomPKInfoModel * pkInfo = [RoomPKInfoModel modelWithDictionary:attachment.data]; - self.pkInfo = pkInfo; - [self startRoomPKCountDown:pkInfo.duration]; - [self handleRoomPKInfoChangeState]; - } - break; - case Custom_Message_Sub_Room_PK_Mode_Open: { - RoomPKInfoModel * pkInfo = [RoomPKInfoModel modelWithDictionary:attachment.data]; - self.pkInfo = pkInfo; - [self handleRoomPKInfoChangeState]; - } - break; - case Custom_Message_Sub_Room_PK_Re_Start:{ - RoomPKInfoModel * pkInfo = [RoomPKInfoModel modelWithDictionary:attachment.data]; - self.pkInfo = pkInfo; - [self handleRoomPKInfoChangeState]; - } - break; - case Custom_Message_Sub_Room_PK_Result:{ -// [TTPopup dismiss]; - [self didTapMinion]; - - RoomPKInfoModel * pkInfo = [RoomPKInfoModel modelWithDictionary:attachment.data]; - self.isReceivePKResult = YES; - [self stopRoomPKCountDown]; - [self clearRoomPKTeamData]; - // self.checkResultNum = 1; - if (pkInfo.pkStatus == RoomPKStatusType_ReStart) {///重新开始了 需要重新赋值 - self.pkInfo = pkInfo; - } else { - if ([pkInfo.pkId isEqualToString:self.pkInfo.pkId]) { - [self clearRoomPKTeamData]; - self.pkInfo = pkInfo; - [self resetRoomPKGroupType]; - } - } - if (pkInfo.pkStatus == RoomPKStatusType_End) { - XPRoomPKResultView * result = [[XPRoomPKResultView alloc] initWithFrame:CGRectMake(0, 0, 300, 304)]; - result.roomPKResultInfoModel = pkInfo; - [TTPopup popupView:result style:TTPopupStyleAlert]; - } - [self handleRoomPKInfoChangeState]; - } - break; - case Custom_Message_Sub_Room_PK_Mode_Close:{ - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPRoomPKProgressView1")]; - [self stopRoomPKCountDown]; - // [self clearRoomPKTeamData]; - [self removeFromSuperview]; - [self resetRoomPKGroupType]; - } - break; - default: - break; - } -} - -- (void)handleRoomPKInfoChangeState { - self.isPlaying = NO; - if (self.pkInfo) { - switch (self.pkInfo.pkStatus) { - case RoomPKStatusType_End: - [self handleBeginButtonState]; - break; - case RoomPKStatusType_Playing: { -// [TTPopup dismiss]; - [self handleBeginButtonState]; - self.isPlaying = YES; - [self configRedTeamScore:self.redTeamScore blueTeamScore:self.blueTeamScore]; -// self.roomPKPlayingView.pkDetailInfo = self.roomPKInfo; -// self.roomPKPlayingView.redChooseArray = self.redChooseArray; -// self.roomPKPlayingView.blueChooseArray = self.blueChooseArray; -// [self.roomPKPlayingView configRedTeamScore:self.redTeamScore blueTeamScore:self.blueTeamScore]; -// [TTPopup popupView:self.roomPKPlayingView style:TTPopupStyleAlert]; - } - break; - case RoomPKStatusType_ReStart: - case RoomPKStatusType_NonStart: { - [self handleBeginButtonState]; - [self clearRoomPKTeamData]; - [self stopRoomPKCountDown]; - } - break; - default: - break; - } - } -} - -- (void)handleBeginButtonState { - if (!self.isManager) { - return; - } - if (self.pkInfo) { - if (self.pkInfo.pkStatus == RoomPKStatusType_Playing) { - [self.actionButton setTitle:YMLocalizedString(@"XPRoomPKPlayingView2") forState:UIControlStateNormal]; - } else { - [self.actionButton setTitle:YMLocalizedString(@"XPRoomPKProgressView9") forState:UIControlStateNormal]; - } - } -} - -- (void)startRoomPKCountDown:(CGFloat)time { - __block long tempTime = time; //倒计时时间 - __weak typeof(self) weakSelf = self; - self.currentTime = tempTime; - if (self.timer != nil) { - dispatch_source_cancel(self.timer); - } - dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - self.timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - dispatch_source_set_timer(self.timer,dispatch_walltime(NULL, 0),1.0*NSEC_PER_SEC, 0); //每秒执行 - dispatch_source_set_event_handler(self.timer, ^{ - typeof(weakSelf) self = weakSelf; - if(tempTime <= 0){ //倒计时结束，关闭 - self.currentTime = 0; - dispatch_source_cancel(self.timer); - [self checkRoomPKResult]; - } else { - dispatch_async(dispatch_get_main_queue(), ^{ - //设置按钮显示读秒效果 - NSInteger minute = tempTime / 60; - NSInteger second = (tempTime % 60); - NSString *timeStr = [NSString stringWithFormat:@"%02zd:%02zd", minute, second]; - self.countDownLabel.text= timeStr; - }); - tempTime--; - self.currentTime = tempTime; - } - }); - dispatch_resume(self.timer); -} - -- (void)stopRoomPKCountDown { - if (self.timer) { - dispatch_source_cancel(_timer); - _timer = nil; - } -} - -- (MicroQueueModel *)findMicroInfoByUid:(NSString *)uid { - for (MicroQueueModel *model in self.micQueue.allValues) { - if (model.userInfo && model.userInfo.uid == uid.intValue) { - return model; - } - } - return nil; -} - -- (void)resetRoomPKGroupType { - NSString *uid = [AccountInfoStorage instance].getUid; - if ([self isOnMicro:uid]) { - MicroQueueModel * micModel = [self findMicroInfoByUid:uid]; - if (micModel.userInfo && micModel.userInfo.uid > 0 && micModel.userInfo.groupType != GroupType_default) { - micModel.userInfo.groupType = GroupType_default; - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = [NSString stringWithFormat:@"%d", micModel.microState.position]; - NSMutableDictionary *curUserInfo = [[NSMutableDictionary alloc]initWithDictionary:[self userInfoToQueueExt:micModel.userInfo]]; - [curUserInfo setValue:@(YES) forKey:@"isNoProhibitMic"]; - request.value = [curUserInfo toJSONString]; - NSString * roomId = [NSString stringWithFormat:@"%ld", self.roomInfo.roomId]; - request.roomId = roomId; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request - completion:^(NSError * _Nullable error) { - }]; - } - } -} - -- (BOOL)isOnMicro:(NSString *)uid { - for (MicroQueueModel *micModel in [self.micQueue allValues]) { - if (micModel.userInfo && - micModel.userInfo.uid > 0 && - micModel.userInfo.uid == uid.integerValue) { - return YES; - } - } - return NO; -} - -- (NSDictionary *)userInfoToQueueExt:(UserInfoModel *)userInfo { - MicroExtModel * extModel = [[MicroExtModel alloc] init]; - extModel.gender = userInfo.gender; - extModel.avatar = userInfo.avatar; - extModel.uid = userInfo.uid; - extModel.nick = userInfo.nick; - extModel.headWearUrl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - extModel.micCircle = userInfo.micCircle; - extModel.micNickColor = userInfo.micNickColor; - extModel.groupType = userInfo.groupType; - return [extModel model2dictionary]; -} - -- (void)configRedTeamScore:(long)redTeamScore - blueTeamScore:(long)blueTeamScore { - self.redTeamScore = redTeamScore; - self.blueTeamScore = blueTeamScore; - self.redCountLabel.text = [NSString stringWithFormat:@"%ld", redTeamScore]; - self.blueCountLabel.text = [NSString stringWithFormat:@"%ld", blueTeamScore]; - if (redTeamScore > 0 || blueTeamScore > 0) { - CGFloat redScale = (CGFloat)redTeamScore / (CGFloat)(redTeamScore + blueTeamScore); -// if (redScale > 1) { -// redScale = 1; -// } - -// CGFloat progress = 1 - redScale; - CGFloat width = CGRectGetWidth(self.progressArea.bounds) - 47.5*2; - CGFloat centerX = redScale * width; -// NSLog(@" ......... %f", self.fireImageView.center.x); -// [UIView animateWithDuration:0.1 animations:^{ -// [self.fireImageView mas_updateConstraints:^(MASConstraintMaker *make) { -// make.centerX.equalTo(self.progressArea).offset(centerX - width / 2); -// }]; -// [self layoutIfNeeded]; -// }]; - - [UIView animateWithDuration:0.1 delay:0.5 options:UIViewAnimationOptionCurveEaseInOut animations:^{ -// [self.fireImageView mas_updateConstraints:^(MASConstraintMaker *make) { -// make.centerX.equalTo(self.progressArea).offset(centerX - width / 2); -// }]; - [self.fireImageView mas_remakeConstraints:^(MASConstraintMaker *make) { -// make.centerX.mas_equalTo(self.progressArea).offset(0); - make.centerX.equalTo(self.progressArea).offset(centerX - width / 2); - make.centerY.mas_equalTo(self.progressArea).mas_offset(2); - make.height.mas_equalTo(35); - make.width.mas_equalTo(24); - }]; - [self layoutIfNeeded]; - } completion:nil]; - -// [self.redProgressView mas_updateConstraints:^(MASConstraintMaker *make) { -// make.width.mas_equalTo(85 * 2 * redScale); -// }]; - } -// [self.roomPKPlayingView configRedTeamScore:redTeamScore blueTeamScore:blueTeamScore]; -} - -- (BOOL)isRoomPKPlaying { - return self.isPlaying; -} - -- (BOOL)isPanelMinion { - return self.isMinion; -} - -///收到礼物 -- (void)roomPKReceiveGift:(AttachmentModel *)attachment { - if (self.pkInfo.pkStatus != RoomPKStatusType_Playing) { - return; - } - GiftReceiveInfoModel *giftReceiveInfo = [GiftReceiveInfoModel modelWithJSON:attachment.data]; - GiftInfoModel *giftInfo = giftReceiveInfo.gift == nil ? giftReceiveInfo.giftInfo : giftReceiveInfo.gift; - if (giftInfo == nil) { - giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:giftReceiveInfo.giftId inRoom:@(giftReceiveInfo.roomUid).stringValue]; - } - if (attachment.first == CustomMessageType_AllMicroSend) { - if (attachment.second == Custom_Message_Sub_AllBatchSend || attachment.second == Custom_Message_Sub_AllMicroSend) {///普通礼物 - NSArray *targetUids = giftReceiveInfo.targetUids; - if (giftReceiveInfo.targetUids.count <=0) { - if (giftReceiveInfo.targetUsers.count > 0) { - targetUids = [giftReceiveInfo.targetUsers valueForKeyPath:@"uid"]; - } else { - targetUids = giftReceiveInfo.targetUid.integerValue > 0? @[giftReceiveInfo.targetUid] : @[]; - } - } - if (self.pkInfo.voteMode == RoomPKVoteModeType_NumberPerson) { // 按送礼人数计算 - [self canculeRoomPKSendGiftNumPerson:targetUids sendUid:giftReceiveInfo.uid]; - } else { - [self canculeRoomGiftValueReceiveInfo:targetUids giftPrice:giftInfo.goldPrice * giftReceiveInfo.giftNum]; - } - } else if(attachment.second == Custom_Message_Sub_AllMicroLuckySend || - attachment.second == Custom_Message_Sub_AllBatchMicroLuckySend) {///福袋礼物 - if (giftReceiveInfo.luckyGiftList) { - __block NSInteger goldPrice = 0; - [giftReceiveInfo.luckyGiftList.giftList enumerateObjectsUsingBlock:^(GiftListsInfo * _Nonnull giftListInfo, NSUInteger idx, BOOL * _Nonnull stop) { - GiftInfoModel *giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:[NSString stringWithFormat:@"%ld", giftListInfo.giftId] - inRoom:@(self.roomInfo.uid).stringValue]; - goldPrice += giftInfo.goldPrice * giftListInfo.giftNum; - }]; - NSArray *targetUids; - if (giftReceiveInfo.luckyGiftList.user.uid > 0) { - targetUids = @[[NSString stringWithFormat:@"%ld", giftReceiveInfo.luckyGiftList.user.uid]]; - } - if (self.pkInfo.voteMode == RoomPKVoteModeType_NumberPerson) { // 按送礼人数计算 - [self canculeRoomPKSendGiftNumPerson:targetUids sendUid:giftReceiveInfo.uid]; - } else { - [self canculeRoomGiftValueReceiveInfo:targetUids giftPrice:goldPrice]; - } - } - } - } else if(attachment.first == CustomMessageType_Gift) { - if (attachment.second == Custom_Message_Sub_Gift_LuckySend) { - __block NSInteger goldPrice = 0; - [giftReceiveInfo.luckyGiftList.giftList enumerateObjectsUsingBlock:^(GiftListsInfo * _Nonnull giftListInfo, NSUInteger idx, BOOL * _Nonnull stop) { - GiftInfoModel *giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:[NSString stringWithFormat:@"%ld", giftListInfo.giftId] - inRoom:@(self.roomInfo.uid).stringValue]; - goldPrice += giftInfo.goldPrice * giftListInfo.giftNum; - }]; - NSArray *targetUids; - if (giftReceiveInfo.luckyGiftList.user.uid > 0) { - targetUids = @[[NSString stringWithFormat:@"%ld", giftReceiveInfo.luckyGiftList.user.uid]]; - } - if (self.pkInfo.voteMode == RoomPKVoteModeType_NumberPerson) { // 按送礼人数计算 - [self canculeRoomPKSendGiftNumPerson:targetUids sendUid:giftReceiveInfo.uid]; - } else { - [self canculeRoomGiftValueReceiveInfo:targetUids giftPrice:goldPrice]; - } - } else { - NSArray *targetUids = giftReceiveInfo.targetUids; - if (giftReceiveInfo.targetUids.count <=0) { - if (giftReceiveInfo.targetUsers.count > 0) { - targetUids = [giftReceiveInfo.targetUsers valueForKeyPath:@"uid"]; - } else { - targetUids = giftReceiveInfo.targetUid.integerValue > 0? @[giftReceiveInfo.targetUid] : @[]; - } - } - if (self.pkInfo.voteMode == RoomPKVoteModeType_NumberPerson) { // 按送礼人数计算 - if (giftInfo.giftType != GiftType_super){ - [self canculeRoomPKSendGiftNumPerson:targetUids sendUid:giftReceiveInfo.uid]; - } - } else { - if (giftInfo.giftType != GiftType_super){ - [self canculeRoomGiftValueReceiveInfo:targetUids giftPrice:giftInfo.goldPrice * giftReceiveInfo.giftNum]; - } - } - } - } -} - -- (void)canculeRoomPKSendGiftNumPerson:(NSArray *)sendGiftUses sendUid:(NSString *)sendUid{ - /** - 1.先取出红队队员 -> 判断这个队员是否是接收礼物者 -> 是接收礼物则先判断送礼uid中是否存在送礼人 -> 存在不变, 不存在则+1 - 2.蓝队同理 - **/ - if (!self.redTeamGiftPersonDic) { - self.redTeamGiftPersonDic = [NSMutableDictionary dictionary]; - // 取出红队 - NSDictionary *redDict = self.pkInfo.sendGiftUids[@"2"]; - // 先创建好 {队员uid : Set} - for (RoomPKTeamUserModel *info in self.redChooseArray) { - [self.redTeamGiftPersonDic setObject:[NSMutableSet set] forKey:info.uid]; - } - for (NSString *key in redDict) { - // key为队员uid 值为数组 - NSArray *sendGiftUids = [redDict objectForKey:key]; - NSMutableSet *set = [NSMutableSet set]; - [set addObjectsFromArray:sendGiftUids]; - [self.redTeamGiftPersonDic setObject:set forKey:key]; - } - } - - if (!self.blueTeamGiftPersonDic) { - self.blueTeamGiftPersonDic = [NSMutableDictionary dictionary]; - // 取出蓝队 - NSDictionary *blueDict = self.pkInfo.sendGiftUids[@"1"]; - // 先创建好 {队员uid : Set} - for (RoomPKTeamUserModel *info in self.blueChooseArray) { - [self.blueTeamGiftPersonDic setObject:[NSMutableSet set] forKey:info.uid]; - } - - for (NSString *key in blueDict) { - // key为队员uid 值为数组 - NSArray *sendGiftUids = [blueDict objectForKey:key]; - NSMutableSet *set = [NSMutableSet set]; - [set addObjectsFromArray:sendGiftUids]; - [self.blueTeamGiftPersonDic setObject:set forKey:key]; - } - } - - for (RoomPKTeamUserModel *infor in self.redChooseArray) { - for (NSString *uid in sendGiftUses) { - NSString * userId = uid; - if ([userId isKindOfClass:[NSNumber class]]) { - userId = ((NSNumber *)userId).stringValue; - } - if (userId.integerValue == infor.uid.integerValue) { - NSMutableSet *set = [self.redTeamGiftPersonDic objectForKey:infor.uid]; - if ([set containsObject:sendUid]) { - continue; - } else { - [set addObject:sendUid]; - } - } - } - } - - for (RoomPKTeamUserModel *infor in self.blueChooseArray) { - for (NSString *uid in sendGiftUses) { - NSString * userId = uid; - if ([userId isKindOfClass:[NSNumber class]]) { - userId = ((NSNumber *)userId).stringValue; - } - if (userId.integerValue == infor.uid.integerValue) { - NSMutableSet *set = [self.blueTeamGiftPersonDic objectForKey:infor.uid]; - if ([set containsObject:sendUid]) { - continue; - } else { - [set addObject:sendUid]; - } - } - } - } - - long blueTeamtotal = 0; - long redTeamtotal = 0; - for (NSString *key in self.redTeamGiftPersonDic) { - NSMutableSet *set = [self.redTeamGiftPersonDic objectForKey:key]; - redTeamtotal = redTeamtotal + set.count; - } - - for (NSString *key in self.blueTeamGiftPersonDic) { - NSMutableSet *set = [self.blueTeamGiftPersonDic objectForKey:key]; - blueTeamtotal = blueTeamtotal + set.count; - } - [self configRedTeamScore:redTeamtotal blueTeamScore:blueTeamtotal]; -} - -- (void)canculeRoomGiftValueReceiveInfo:(NSArray *)targetUids giftPrice:(NSInteger)giftPrice{ - for (RoomPKChooseUserModel * userInfo in self.redChooseArray) { - for (NSString * uid in targetUids) { - NSString * userId = uid; - if ([userId isKindOfClass:[NSNumber class]]) { - userId = ((NSNumber *)userId).stringValue; - } - if (userId.integerValue == userInfo.uid.integerValue) { - self.redTeamScore += giftPrice; - break; - } - } - } - - for (RoomPKChooseUserModel * userInfo in self.blueChooseArray) { - for (NSString * uid in targetUids) { - NSString * userId = uid; - if ([userId isKindOfClass:[NSNumber class]]) { - userId = ((NSNumber *)userId).stringValue; - } - if (userId.integerValue == userInfo.uid.integerValue) { - self.blueTeamScore += giftPrice; - break; - } - } - } - [self configRedTeamScore:self.redTeamScore blueTeamScore:self.blueTeamScore]; -} - -///查询pk结果的 -- (void)checkRoomPKResult{ -// if (self.checkResultNum > 2) { -// //pk请求已经不行了 只能结束了 -// [self clearRoomPKTeamData]; -// [self resetRoomPKGroupType]; -// return; -// } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - if (!self.isReceivePKResult) { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - if (self.pkInfo.pkId.length > 0) { - NSString * pkId = self.pkInfo.pkId; - [Api checkRoomPKResult:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { -// self.checkResultNum = 1; - self.isReceivePKResult = YES; - } else { -// self.checkResultNum++; - [self checkRoomPKResult]; - } - } roomUid:roomUid operUid:uid pkId:pkId]; - } - } - }); -} - -- (void)clearRoomPKTeamData { - self.redTeamScore = 0; - self.blueTeamScore = 0; - self.redCountLabel.text = @"0"; - self.blueCountLabel.text = @"0"; - [self.actionButton setTitle:YMLocalizedString(@"XPRoomPKProgressView9") forState:UIControlStateNormal]; - [self.fireImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.progressArea).offset(0); - }]; -} - -#pragma mark - -- (void)showSelectUserPanelWith:(GroupType)type { - XPRoomPKSelectUserView * chooseUserView = [[XPRoomPKSelectUserView alloc] init]; - chooseUserView.delegate = self; - chooseUserView.redUserArray = self.redChooseArray; - chooseUserView.blueUserArray = self.blueChooseArray; - chooseUserView.groupType = type; - chooseUserView.microQueueArray = self.micQueue.allValues; - [TTPopup popupView:chooseUserView style:TTPopupStyleAlert]; -} - -#pragma mark - -- (void)setIsManager:(BOOL)isManager { - _isManager = isManager; -// [self.pkPanelContentView mas_updateConstraints:^(MASConstraintMaker *make) { -// make.size.mas_equalTo([self roomFrame].size); -// }]; - [self.pkPanelContentView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - make.size.mas_equalTo([self roomFrame].size); - }]; - self.backgroundImageView.image = [self backgroundImage]; - self.actionButton.hidden = !isManager; -} - -- (void)setPkInfo:(RoomPKInfoModel *)pkInfo { - _pkInfo = pkInfo; - [self updateCountDownTime:pkInfo.duration]; -} - -- (void)setMicQueue:(NSMutableDictionary *)micQueue { - _micQueue = micQueue; - if (self.pkInfo.pkStatus != RoomPKStatusType_Playing) { - NSMutableArray * redArray = [NSMutableArray array]; - NSMutableArray * blueArray = [NSMutableArray array]; - - for (MicroQueueModel *micModel in _micQueue.allValues) { - UserInfoModel *userInfo = micModel.userInfo; - if (userInfo && [userInfo isUserValid]) { - RoomPKChooseUserModel *userModel = [[RoomPKChooseUserModel alloc] init]; - userModel.avatar = userInfo.avatar; - userModel.uid = [userInfo userIDString]; - userModel.nick = userInfo.nick; - userModel.groupType = userInfo.groupType; - userModel.position = micModel.microState.position; - - if (userInfo.groupType == GroupType_Red) { - [redArray addObject:userModel]; - } else if (userInfo.groupType == GroupType_Blue) { - [blueArray addObject:userModel]; - } - } - } - - if (![self isSameTeamMember:redArray forOriginals:self.redChooseArray]) { - self.redChooseArray = redArray.copy; - } - if (![self isSameTeamMember:blueArray forOriginals:self.blueChooseArray]) { - self.blueChooseArray = blueArray.copy; - } - } -} - -- (void)setRedChooseArray:(NSArray *)redChooseArray -{ - _redChooseArray = redChooseArray; - self.leaderRed.userModel = [redChooseArray xpSafeObjectAtIndex:0]; - self.memberRed_1.userModel = [redChooseArray xpSafeObjectAtIndex:1]; - self.memberRed_2.userModel = [redChooseArray xpSafeObjectAtIndex:2]; - self.memberRed_3.userModel = [redChooseArray xpSafeObjectAtIndex:3]; -} - -- (void)setBlueChooseArray:(NSArray *)blueChooseArray -{ - _blueChooseArray = blueChooseArray; - self.leaderBlue.userModel = [blueChooseArray xpSafeObjectAtIndex:0]; - self.memberBlue_1.userModel = [blueChooseArray xpSafeObjectAtIndex:1]; - self.memberBlue_2.userModel = [blueChooseArray xpSafeObjectAtIndex:2]; - self.memberBlue_3.userModel = [blueChooseArray xpSafeObjectAtIndex:3]; -} - -#pragma mark - -- (void)didTapMinion { - self.isMinion = true; - [self removeFromSuperview]; -} - -- (void)didTapActionButton { - if (self.pkInfo == nil) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomPKProgressView7")]; - [self enterRoomGetRoomPKDetailInfo]; - } else { - NSString *roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - if (self.redChooseArray.count > 0 && self.blueChooseArray.count > 0) { - switch (self.pkInfo.pkStatus) { - case RoomPKStatusType_End: - case RoomPKStatusType_ReStart: { - @kWeakify(self); - [TTPopup alertWithMessage:YMLocalizedString(@"XPRoomPKProgressView10") confirmHandler:^{ - [Api createRoomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - RoomPKInfoModel *newRoomPKInfo = [RoomPKInfoModel modelWithDictionary:data.data]; - self.pkInfo = newRoomPKInfo; - NSString * teamJsonStr = [self roomPKTeamJsonString]; - ///开始PK - [Api begainRoomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - RoomPKInfoModel * roomPKInfo = [RoomPKInfoModel modelWithDictionary:data.data]; - self.pkInfo = roomPKInfo; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:roomUid pkId:newRoomPKInfo.pkId joinUsers:teamJsonStr]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } - pkMode:[NSString stringWithFormat:@"%ld", self.pkInfo.pkMode] - voteMode:[NSString stringWithFormat:@"%ld", self.pkInfo.voteMode] - duration:[NSString stringWithFormat:@"%0.f", self.pkInfo.duration] - roomUid:roomUid - operUid:[AccountInfoStorage instance].getUid]; - } cancelHandler:^{}]; - } - break; - case RoomPKStatusType_Playing:{ - //MARK: 原来的方法是打开 PK 面板，这里应该是重新开始？ - // [self didTapBackImageRecognizer]; - [TTPopup alertWithMessage:YMLocalizedString(@"XPRoomPKProgressView3") confirmHandler:^{ -// RoomPKInfoModel * roompkInfo = self.roomPKInfo; - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - @kWeakify(self); - [Api createRoomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - RoomPKInfoModel * newRoomPKInfo = [RoomPKInfoModel modelWithDictionary:data.data]; - self.pkInfo = newRoomPKInfo; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } - pkMode:[NSString stringWithFormat:@"%ld", self.pkInfo.pkMode] - voteMode:[NSString stringWithFormat:@"%ld", self.pkInfo.voteMode] - duration:[NSString stringWithFormat:@"%0.f", self.pkInfo.duration] - roomUid:roomUid operUid:[AccountInfoStorage instance].getUid]; - } cancelHandler:^{ -// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ -// if (self.roomPKInfo.pkStatus == RoomPKStatusType_Playing) { -// self.roomPKPlayingView.pkDetailInfo = self.roomPKInfo; -// self.roomPKPlayingView.redChooseArray = self.redChooseArray; -// self.roomPKPlayingView.blueChooseArray = self.blueChooseArray; -// [self.roomPKPlayingView configRedTeamScore:self.redTeamScore blueTeamScore:self.blueTeamScore]; -// [TTPopup popupView:self.roomPKPlayingView style:TTPopupStyleAlert]; -// } -// }); - }]; - } - break; - case RoomPKStatusType_NonStart: { - @kWeakify(self); - [TTPopup alertWithMessage:YMLocalizedString(@"XPRoomPKProgressView5" ) - confirmHandler:^{ - @kStrongify(self); - NSString *teamJsonStr = [self roomPKTeamJsonString]; - ///开始PK - [Api begainRoomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - RoomPKInfoModel * roomPKInfo = [RoomPKInfoModel modelWithDictionary:data.data]; - self.pkInfo = roomPKInfo; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } - roomUid:roomUid - pkId:self.pkInfo.pkId - joinUsers:teamJsonStr]; - } cancelHandler:^{}]; - } - break; - default: - break; - } - } else { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomPKProgressView6")]; - } - } -} - -- (NSString *)roomPKTeamJsonString { - NSMutableArray * teamArray = [NSMutableArray array]; - for (int i = 0; i < self.redChooseArray.count; i++) { - RoomPKChooseUserModel * userInfo = [self.redChooseArray xpSafeObjectAtIndex:i]; - NSMutableDictionary * redDic = [NSMutableDictionary dictionary]; - [redDic setObject:userInfo.uid forKey:@"uid"]; - [redDic setObject:@(userInfo.groupType) forKey:@"type"]; - [teamArray addObject:redDic]; - } - - for (int i = 0; i < self.blueChooseArray.count; i++) { - RoomPKChooseUserModel * userInfo = [self.blueChooseArray xpSafeObjectAtIndex:i]; - NSMutableDictionary * blueDic = [NSMutableDictionary dictionary]; - [blueDic setObject:userInfo.uid forKey:@"uid"]; - [blueDic setObject:@(userInfo.groupType) forKey:@"type"]; - [teamArray addObject:blueDic]; - } - if (teamArray.count > 0) { - return [teamArray toJSONString]; - } - return @""; -} - -#pragma mark - Delegates -- (void)didTapAvatar:(RoomPKChooseUserModel *)userModel didClickAddButton:(GroupType)gType { - if (self.pkInfo.pkStatus == RoomPKStatusType_Playing) { - // MARK: 原逻辑是打开 PK 面板，这里应该是？ - } else { - if (self.isManager) { - XPRoomPKSelectUserView * chooseUserView = [[XPRoomPKSelectUserView alloc] init]; - chooseUserView.delegate = self; - chooseUserView.redUserArray = self.redChooseArray; - chooseUserView.blueUserArray = self.blueChooseArray; - chooseUserView.groupType = gType; - chooseUserView.microQueueArray = self.micQueue.allValues; - [TTPopup popupView:chooseUserView style:TTPopupStyleAlert]; - } else { - XPArrangeMicInfoModel *info = [[XPArrangeMicInfoModel alloc] init]; - info.roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - info.roomId = [NSString stringWithFormat:@"%ld", self.roomInfo.roomId]; - info.nick = self.roomInfo.nick; - info.roomAvatar = self.roomInfo.avatar; - info.roomTitle = self.roomInfo.title; - info.micQueue = self.micQueue; - info.isManager = self.isManager; - info.type = ArrangeMicType_Room_PK; - XPArrangeMicViewController * arrangeMicVC = [[XPArrangeMicViewController alloc] initWithInfo:info]; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController - presentViewController:arrangeMicVC - animated:YES - completion:nil]; - } - } -} - -- (void)xPRoomPKSelectUserView:(XPRoomPKSelectUserView *)view - groupType:(GroupType)groupType - didChooseUserInfos:(NSArray *)userInfos { - [TTPopup dismiss]; - if (groupType == GroupType_Red) { - self.redChooseArray = userInfos; - } else { - self.blueChooseArray = userInfos; - } -// if (groupType == GroupType_Red) { -// if ([self isSameTeamMember:userInfos forOriginals:self.redChooseArray]) { -// return; -// } -// self.redChooseArray = userInfos; -// } else { -// if ([self isSameTeamMember:userInfos forOriginals:self.blueChooseArray]) { -// return; -// } -// self.blueChooseArray = userInfos; -// } - if (self.redChooseArray.count > 0 || self.blueChooseArray.count > 0) { - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - for (int i = 0 ; i< self.redChooseArray.count; i++) { - RoomPKChooseUserModel * model = [self.redChooseArray xpSafeObjectAtIndex:i]; - if (model.uid.integerValue <= 0) { - continue; - } - NSMutableDictionary *data =[[model model2dictionary] mutableCopy]; - [data removeObjectForKey:@"title"]; - [data removeObjectForKey:@"imageName"]; - [data removeObjectForKey:@"userUrl"]; - [data removeObjectForKey:@"isSelect"]; - [data removeObjectForKey:@"isEnableChoose"]; - [data setValue:@(YES) forKey:@"isNoProhibitMic"]; - [dic setValue:data forKey:model.uid]; - } - - for (int i = 0 ; i< self.blueChooseArray.count; i++) { - RoomPKChooseUserModel * model = [self.blueChooseArray xpSafeObjectAtIndex:i]; - if (model.uid.integerValue <= 0 ) { - continue; - } - NSMutableDictionary *data =[[model model2dictionary] mutableCopy]; - [data removeObjectForKey:@"title"]; - [data removeObjectForKey:@"imageName"]; - [data removeObjectForKey:@"userUrl"]; - [data removeObjectForKey:@"isSelect"]; - [data removeObjectForKey:@"isEnableChoose"]; - [data setValue:@(YES) forKey:@"isNoProhibitMic"]; - [dic setValue:data forKey:model.uid]; - } - - if (dic.allKeys.count > 0) { - AttachmentModel * attachment = [[AttachmentModel alloc] init]; - attachment.first = CustomMessageType_Room_PK; - attachment.second = Custom_Message_Sub_Room_PK_Manager_Up_Mic; - attachment.data = dic; - NSString * roomId = [NSString stringWithFormat:@"%ld", self.roomInfo.roomId]; - NSString *sessionID = roomId; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:sessionID type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - } - } -} - -- (BOOL)isSameTeamMember:(NSArray *)userModels forOriginals:(NSArray *)originals { - NSSet *originalSet = [NSSet setWithArray:originals]; - NSSet *compareSet = [NSSet setWithArray:userModels]; - - return [originalSet isEqualToSet:compareSet]; -} - -#pragma mark - -- (CGRect)roomFrame { - return CGRectMake(0, 0, 309, self.isManager ? 379 : 324); -} - -- (UIView *)pkPanelContentView { - if (!_pkPanelContentView) { - _pkPanelContentView = [[UIView alloc] init]; - } - return _pkPanelContentView; -} - -- (UIImage *)backgroundImage { - return self.isManager ? [UIImage imageNamed:@"room_pk_panel_bg_manager"] : [UIImage imageNamed:@"room_pk_panel_bg_normal"]; -} - -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] init]; - _backgroundImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _backgroundImageView; -} - -- (void)setupCenterVSMark { - UIImageView *vs = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pk_vs_mark_big"]]; - [self.pkPanelContentView addSubview:vs]; - [vs mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.pkPanelContentView); - make.top.mas_equalTo(self.topImageView.mas_bottom).offset(32.5); - make.size.mas_equalTo(CGSizeMake(112.5, 60.5)); - }]; -} - -- (UIImageView *)topImageView { - if (!_topImageView) { - _topImageView = [[UIImageView alloc] init]; - _topImageView.image = [UIImage imageNamed:@"room_pk_panel_top"]; - _topImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _topImageView; -} - -- (UIButton *)minionButton { - if (!_minionButton) { - _minionButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_minionButton setBackgroundImage:[UIImage imageNamed:@"room_pk_panel_be_mini_icon"] - forState:UIControlStateNormal]; - [_minionButton addTarget:self - action:@selector(didTapMinion) - forControlEvents:UIControlEventTouchUpInside]; - } - return _minionButton; -} - -- (XPRoomPKPaneAvatarView *)leaderRed { - if (!_leaderRed) { - _leaderRed = [[XPRoomPKPaneAvatarView alloc] initWithFrame:CGRectMake(0, 0, 112.5, 60.5)]; - _leaderRed.type = XPRoomPKPaneAvatarType_Leader_Red; - _leaderRed.delegate = self; - } - return _leaderRed; -} - -- (XPRoomPKPaneAvatarView *)memberRed_1 { - if (!_memberRed_1) { - _memberRed_1 = [[XPRoomPKPaneAvatarView alloc] initWithFrame:CGRectMake(0, 0, 35, 35)]; - _memberRed_1.type = XPRoomPKPaneAvatarType_Red; - _memberRed_1.delegate = self; - } - return _memberRed_1; -} - -- (XPRoomPKPaneAvatarView *)memberRed_2 { - if (!_memberRed_2) { - _memberRed_2 = [[XPRoomPKPaneAvatarView alloc] initWithFrame:CGRectMake(0, 0, 35, 35)]; - _memberRed_2.type = XPRoomPKPaneAvatarType_Red; - _memberRed_2.delegate = self; - } - return _memberRed_2; -} - -- (XPRoomPKPaneAvatarView *)memberRed_3 { - if (!_memberRed_3) { - _memberRed_3 = [[XPRoomPKPaneAvatarView alloc] initWithFrame:CGRectMake(0, 0, 35, 35)]; - _memberRed_3.type = XPRoomPKPaneAvatarType_Red; - _memberRed_3.delegate = self; - } - return _memberRed_3; -} - -- (XPRoomPKPaneAvatarView *)leaderBlue { - if (!_leaderBlue) { - _leaderBlue = [[XPRoomPKPaneAvatarView alloc] initWithFrame:CGRectMake(0, 0, 112.5, 60.5)]; - _leaderBlue.type = XPRoomPKPaneAvatarType_Leader_Blue; - _leaderBlue.delegate = self; - } - return _leaderBlue; -} - -- (XPRoomPKPaneAvatarView *)memberBlue_1 { - if (!_memberBlue_1) { - _memberBlue_1 = [[XPRoomPKPaneAvatarView alloc] initWithFrame:CGRectMake(0, 0, 35, 35)]; - _memberBlue_1.type = XPRoomPKPaneAvatarType_Blue; - _memberBlue_1.delegate = self; - } - return _memberBlue_1; -} - -- (XPRoomPKPaneAvatarView *)memberBlue_2 { - if (!_memberBlue_2) { - _memberBlue_2 = [[XPRoomPKPaneAvatarView alloc] initWithFrame:CGRectMake(0, 0, 35, 35)]; - _memberBlue_2.type = XPRoomPKPaneAvatarType_Blue; - _memberBlue_2.delegate = self; - } - return _memberBlue_2; -} - -- (XPRoomPKPaneAvatarView *)memberBlue_3 { - if (!_memberBlue_3) { - _memberBlue_3 = [[XPRoomPKPaneAvatarView alloc] initWithFrame:CGRectMake(0, 0, 35, 35)]; - _memberBlue_3.type = XPRoomPKPaneAvatarType_Blue; - _memberBlue_3.delegate = self; - } - return _memberBlue_3; -} - -- (UIStackView *)redTeamStackView { - if (!_redTeamStackView) { - _redTeamStackView = [[UIStackView alloc] init]; - _redTeamStackView.axis = UILayoutConstraintAxisHorizontal; - _redTeamStackView.distribution = UIStackViewDistributionFillEqually; - _redTeamStackView.alignment = UIStackViewAlignmentLeading; - _redTeamStackView.spacing = 4; - } - return _redTeamStackView; -} - -- (UIStackView *)blueTeamStackView { - if (!_blueTeamStackView) { - _blueTeamStackView = [[UIStackView alloc] init]; - _blueTeamStackView.axis = UILayoutConstraintAxisHorizontal; - _blueTeamStackView.distribution = UIStackViewDistributionFillEqually; - _blueTeamStackView.alignment = UIStackViewAlignmentTrailing; - _blueTeamStackView.spacing = 4; - } - return _blueTeamStackView; -} - -- (void)setupCountDownView { - UIView *transparentRoundedCornersBackgroundView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 122, 30)]; - transparentRoundedCornersBackgroundView.layer.cornerRadius = 14.5; - transparentRoundedCornersBackgroundView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.7]; - [self.pkPanelContentView addSubview:transparentRoundedCornersBackgroundView]; - [transparentRoundedCornersBackgroundView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.pkPanelContentView); - make.top.mas_equalTo(self.redTeamStackView.mas_bottom).offset(8); - make.width.mas_greaterThanOrEqualTo(120); - make.height.mas_equalTo(30); - }]; - - UIImageView *clockImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"room_pk_clock_icon"]]; - [transparentRoundedCornersBackgroundView addSubview:clockImageView]; - [clockImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(transparentRoundedCornersBackgroundView); - make.leading.mas_equalTo(transparentRoundedCornersBackgroundView).offset(12); - make.size.mas_equalTo(CGSizeMake(13, 13)); - }]; - - [transparentRoundedCornersBackgroundView addSubview:self.countDownLabel]; - [self.countDownLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(transparentRoundedCornersBackgroundView).offset(-0.5); - make.trailing.mas_equalTo(transparentRoundedCornersBackgroundView.mas_trailing).offset(-12); - make.width.mas_greaterThanOrEqualTo(40); - }]; - - UILabel *titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"XPRoomPKProgressView11") - font:[UIFont systemFontOfSize:11 weight:UIFontWeightMedium] - textColor:[UIColor colorWithWhite:1 alpha:0.7]]; - [transparentRoundedCornersBackgroundView addSubview:titleLabel]; - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(transparentRoundedCornersBackgroundView); - make.leading.mas_equalTo(clockImageView.mas_trailing).offset(6); - make.trailing.mas_equalTo(self.countDownLabel.mas_leading).offset(-6); - }]; -} - -- (void)updateCountDownTime:(CGFloat)seconds { - if (seconds <= 0.0) { - seconds = 0.0; - } - NSInteger minute = seconds / 60; - NSInteger second = (NSInteger)round(seconds) % 60; - NSString *timeStr = [NSString stringWithFormat:@"%02ld:%02ld", minute, (long)second]; - self.countDownLabel.text = timeStr; -} - -- (UIView *)progressArea { - if (!_progressArea) { - _progressArea = [[UIView alloc] init]; - } - return _progressArea; -} - -- (void)setupProgressArea { - [self.pkPanelContentView addSubview:self.progressArea]; - [self.progressArea mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.redTeamStackView.mas_bottom).offset(28.5); - make.leading.mas_equalTo(self.leaderRed.mas_leading).offset(-4.5); - make.trailing.mas_equalTo(self.leaderBlue.mas_trailing).offset(4.5); - make.height.mas_equalTo(56.5); - }]; - - UIImageView *redPinImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"room_pk_panel_red_mark"]]; - [self.progressArea addSubview:redPinImageView]; - [redPinImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.progressArea); - make.leading.mas_equalTo(self.progressArea); - make.size.mas_equalTo(CGSizeMake(47.5, 56.5)); - }]; - - UIImageView *bluePinImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"room_pk_panel_blue_mark"]]; - [self.progressArea addSubview:bluePinImageView]; - [bluePinImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.mas_equalTo(self.progressArea); - make.size.mas_equalTo(CGSizeMake(47.5, 56.5)); - }]; - - [self.progressArea insertSubview:self.redCountImageView belowSubview:redPinImageView]; - [self.redCountImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.progressArea); - make.centerY.mas_equalTo(self.progressArea).mas_offset(4); - make.leading.mas_equalTo(self.progressArea).offset(46); - make.trailing.mas_equalTo(self.progressArea).offset(-46); - make.height.mas_equalTo(14); - }]; - - [self.progressArea addSubview:self.fireImageView]; - [self.fireImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.progressArea); - make.centerY.mas_equalTo(self.progressArea).mas_offset(2); - make.height.mas_equalTo(35); - make.width.mas_equalTo(24); - }]; - - [self.progressArea insertSubview:self.blueCountImageView aboveSubview:self.redCountImageView]; - [self.blueCountImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.top.mas_equalTo(self.redCountImageView); - make.leading.mas_equalTo(self.fireImageView.mas_centerX); - make.height.mas_equalTo(14); - }]; - - UILabel *giftLabel_red = [UILabel labelInitWithText:@"Gift" - font:[UIFont systemFontOfSize:15 weight:UIFontWeightBold] - textColor:[UIColor whiteColor]]; - [redPinImageView addSubview:giftLabel_red]; - [giftLabel_red mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(redPinImageView); - make.bottom.mas_equalTo(redPinImageView).offset(-14); - }]; - UILabel *giftLabel_blue = [UILabel labelInitWithText:@"Gift" - font:[UIFont systemFontOfSize:15 weight:UIFontWeightBold] - textColor:[UIColor whiteColor]]; - [bluePinImageView addSubview:giftLabel_blue]; - [giftLabel_blue mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(bluePinImageView); - make.bottom.mas_equalTo(bluePinImageView).offset(-16); - }]; - - [self.progressArea addSubview:self.redCountLabel]; - [self.redCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.redCountImageView.mas_bottom); - make.leading.mas_equalTo(redPinImageView.mas_trailing); - }]; - - [self.progressArea addSubview:self.blueCountLabel]; - [self.blueCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.redCountImageView.mas_bottom); - make.trailing.mas_equalTo(bluePinImageView.mas_leading); - }]; -} - -- (UILabel *)countDownLabel { - if (!_countDownLabel) { - _countDownLabel = [UILabel labelInitWithText:@"00:00" - font:[UIFont systemFontOfSize:15 weight:UIFontWeightBold] - textColor:[UIColor whiteColor]]; - } - return _countDownLabel; -} - -- (UIImageView *)redCountImageView { - if (!_redCountImageView) { - _redCountImageView = [[UIImageView alloc] init]; - _redCountImageView.image = [[UIImage imageNamed:@"pk_progress_red"] - resizableImageWithCapInsets:UIEdgeInsetsZero - resizingMode:UIImageResizingModeTile]; - } - return _redCountImageView; -} - -- (UILabel *)redCountLabel { - if (!_redCountLabel) { - _redCountLabel = [UILabel labelInitWithText:@"0" - font:[UIFont boldSystemFontOfSize:12] - textColor:[UIColor whiteColor]]; - _redCountLabel.textAlignment = NSTextAlignmentLeft; - } - return _redCountLabel; -} -- (UIImageView *)blueCountImageView { - if (!_blueCountImageView) { - _blueCountImageView = [[UIImageView alloc] init]; - _blueCountImageView.image = [[UIImage imageNamed:@"pk_progress_blue"] - resizableImageWithCapInsets:UIEdgeInsetsZero - resizingMode:UIImageResizingModeTile]; - } - return _blueCountImageView; -} - -- (UILabel *)blueCountLabel { - if (!_blueCountLabel) { - _blueCountLabel = [UILabel labelInitWithText:@"0" - font:[UIFont boldSystemFontOfSize:12] - textColor:[UIColor whiteColor]]; - _blueCountLabel.textAlignment = NSTextAlignmentRight; - } - return _blueCountLabel; -} - -- (UIImageView *)fireImageView { - if (!_fireImageView) { - _fireImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pk_progress_fire_icon"]]; - _fireImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _fireImageView; -} - -- (UIButton *)actionButton { - if (!_actionButton) { - _actionButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_actionButton setBackgroundImage:[UIImage imageNamed:@"room_pk_panel_button_bg"] - forState:UIControlStateNormal]; - [_actionButton addTarget:self - action:@selector(didTapActionButton) - forControlEvents:UIControlEventTouchUpInside]; - _actionButton.hidden = YES; - } - return _actionButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKRecordViewController.h b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKRecordViewController.h deleted file mode 100644 index 5f4e34a..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKRecordViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomPKRecordViewController.h -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomPKRecordViewController : MvpViewController -@property (nonatomic,copy) NSString *roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKRecordViewController.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKRecordViewController.m deleted file mode 100644 index ffba4ef..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKRecordViewController.m +++ /dev/null @@ -1,169 +0,0 @@ -// -// YMRoomPKRecordViewController.m -// YUMI -// -// Created by YUMI on 2022/3/18. -// - -#import "XPRoomPKRecordViewController.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///Model -#import "RoomPKRecordModel.h" -///View -#import "XPRoomPKRecordTableViewCell.h" -#import "XPRoomPKEmptyTableViewCell.h" -///P -#import "XPRoomPKRecordPresenter.h" -#import "XPRoomPKRecordProtocol.h" -@interface XPRoomPKRecordViewController () -///列表 -@property (nonatomic,strong) UITableView *tableView; -/// -@property (nonatomic,strong) NSMutableArray *datasource; -///当前的页数 -@property (nonatomic,assign) int page; -///是否有跟多的数据 -@property (nonatomic,assign) BOOL hasMoreData; -@end - -@implementation XPRoomPKRecordViewController - -- (XPRoomPKRecordPresenter *)createPresenter { - return [[XPRoomPKRecordPresenter alloc] init];; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPRoomPKRecordViewController0"); - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -- (void)initHeaderAndFooterRrfresh { - self.hasMoreData = YES; - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -- (void)headerRefresh { - self.page = 1; - [self.presenter getRoomPKRecordList:self.roomUid page:self.page pageSize:20 state:0]; -} - -- (void)footerRefresh { - if (!self.hasMoreData) { - [self showErrorToast:YMLocalizedString(@"XPRoomPKRecordViewController1")]; - return; - } - self.page++; - [self.presenter getRoomPKRecordList:self.roomUid page:self.page pageSize:20 state:1]; -} - - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - return 170; - } - return (KScreenHeight - kNavigationHeight); -} -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPRoomPKRecordTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomPKRecordTableViewCell class])]; - if (cell == nil) { - cell = [[XPRoomPKRecordTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomPKRecordTableViewCell class])]; - } - RoomPKRecordModel * recordModel = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.pkDetailInfo = recordModel; - return cell; - } - - XPRoomPKEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomPKEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPRoomPKEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomPKEmptyTableViewCell class])]; - } - return cell; -} - -#pragma mark - XPRoomPKRecordProtocol -- (void)getRoomPKRecordListFail:(NSString *)message state:(int)state { - if (state == 0) { - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_header endRefreshing]; - } -} - -- (void)getRoomPKRecordListSuccess:(NSArray *)recordList state:(int)state { - if (state == 0) { - [self.datasource removeAllObjects]; - [self.tableView.mj_header endRefreshing]; - } else { - [self.tableView.mj_footer endRefreshing]; - } - self.hasMoreData = recordList.count > 0; - if (recordList.count > 0) { - [self.datasource addObjectsFromArray:recordList]; - } - [self.tableView reloadData]; -} -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPRoomPKRecordTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomPKRecordTableViewCell class])]; - [_tableView registerClass:[XPRoomPKEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomPKEmptyTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.h b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.h deleted file mode 100644 index 80bad6b..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomPKResultView.h -// YUMI -// -// Created by YUMI on 2022/3/31. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomPKInfoModel; -@interface XPRoomPKResultView : UIView -@property (nonatomic,strong) RoomPKInfoModel *roomPKResultInfoModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m deleted file mode 100644 index d4626ed..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m +++ /dev/null @@ -1,702 +0,0 @@ -// -// YMRoomPKResultView.m -// YUMI -// -// Created by YUMI on 2022/3/31. -// - -#import "XPRoomPKResultView.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "NetImageView.h" -#import "AccountInfoStorage.h" -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -///Model -#import "RoomPKInfoModel.h" -///View -#import "XPRomPKResultTitleLabel.h" - -#define kRedTeamColor UIColorFromRGB(0xfd4B81) -#define kBlueTeamColor UIColorFromRGB(0x73b8ff) - - -@interface XPRoomPKResultView () -/// -@property (nonatomic,strong) UIImageView *topImageView; - -///背景 -@property (nonatomic,strong) UIImageView *contentImageView; -///第一个人 -@property (nonatomic,strong) NetImageView *firstUserView; -///第二个人 -@property (nonatomic,strong) NetImageView *secondUserView; -///第三个人 -@property (nonatomic,strong) NetImageView *thirdUserView; -///第四个人 -@property (nonatomic,strong) NetImageView *fourthUserView; -///第五个人 -//@property (nonatomic,strong) NetImageView *fifthUserView; -///是否是MVP -//@property (nonatomic,strong) UIImageView *mvpImageView; -///容器 -@property (nonatomic,strong) UIStackView *avatarStackView; -///选手的容器 -//@property (nonatomic,strong) UIView * pkUserContainerView; -///PK选手 -//@property (nonatomic,strong) UILabel *pkUserLabel; -///输的一方显示文案 -//@property (nonatomic,strong) UILabel *failDesLabel; -///战斗值 -@property (nonatomic,strong) XPRomPKResultTitleLabel *fightScoreLabel; -///守护者 -@property (nonatomic,strong) XPRomPKResultTitleLabel *guardPersonLabel; -///守护值 -@property (nonatomic,strong) XPRomPKResultTitleLabel *guardScoreLabel; -///红队后者蓝队战绩 -@property (nonatomic,strong) UIButton *resultButton; -///查看对方的战绩 -@property (nonatomic,strong) UIButton *checkButton; -///存放用户的数组 -@property (nonatomic,strong) NSArray *userBackgroundLightViewArray; -@property (nonatomic,strong) NSArray *userViewArray; -///查看其他的 -@property (nonatomic,assign) BOOL isCheckingOthers; -@end - -@implementation XPRoomPKResultView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.contentImageView]; - [self addSubview:self.topImageView]; - - [self.contentImageView addSubview:self.avatarStackView]; - - [self.contentImageView addSubview:self.resultButton]; - [self.contentImageView addSubview:self.checkButton]; - - [self.contentImageView addSubview:self.fightScoreLabel]; - [self.contentImageView addSubview:self.guardPersonLabel]; - [self.contentImageView addSubview:self.guardScoreLabel]; - - self.userBackgroundLightViewArray = @[[[UIImageView alloc] init], [[UIImageView alloc] init], [[UIImageView alloc] init], [[UIImageView alloc] init]]; - self.userViewArray = @[self.firstUserView, self.secondUserView, self.thirdUserView, self.fourthUserView]; -} - -- (void)initSubViewConstraints { - // 260. 304 - [self.contentImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.trailing.mas_equalTo(self); - make.height.mas_equalTo(260); - }]; - - [self.topImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.mas_top); - make.centerX.mas_equalTo(self); - make.width.mas_equalTo(UIScreen.mainScreen.bounds.size.width); - make.height.mas_equalTo(125); - }]; - - [self.avatarStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.topImageView.mas_bottom); - make.centerX.mas_equalTo(self.topImageView); - make.width.mas_equalTo(self.contentImageView.mas_width); - make.height.mas_equalTo(65); - }]; - - [self.fightScoreLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarStackView.mas_bottom).offset(8); - make.leading.mas_equalTo(self.avatarStackView).offset(8); - make.height.mas_equalTo(15); - }]; - - [self.guardPersonLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentImageView).offset(8); - make.top.mas_equalTo(self.fightScoreLabel.mas_bottom).offset(8); - make.height.mas_equalTo(15); - }]; - - [self.guardScoreLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentImageView).offset(8); - make.top.mas_equalTo(self.guardPersonLabel.mas_bottom).offset(8); - make.height.mas_equalTo(15); - }]; - - [self.resultButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.leading.mas_equalTo(self).offset(30); - make.trailing.mas_equalTo(self).offset(-30); - make.bottom.mas_equalTo(self.checkButton.mas_top).offset(-12); - make.height.mas_equalTo(16); - }]; - - [self.checkButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(16); - make.centerX.mas_equalTo(self.contentImageView); - make.bottom.mas_equalTo(self.contentImageView.mas_bottom).offset(-10); - }]; -} - -- (void)loadTeamMemberUserAvatar:(NSArray *)members - resultType:(NSInteger)type { // 1: win, 2: draw, 3: fail - for (UIView *addedView in self.avatarStackView.arrangedSubviews) { - [addedView removeFromSuperview]; - } - for (UIImageView *light in self.userBackgroundLightViewArray) { - [light removeFromSuperview]; - } - [self.avatarStackView addArrangedSubview:[UIView new]]; - for (int i = 0; i< members.count; i++) { - RoomPKTeamUserModel *userInfo = [members xpSafeObjectAtIndex:i]; - UIImageView *light = [self.userBackgroundLightViewArray xpSafeObjectAtIndex:i]; - switch (i) { - case 0: - self.firstUserView.imageUrl = userInfo.avatar; - [self.avatarStackView addArrangedSubview:self.firstUserView]; -// self.firstUserView.backgroundLightType = type; - [self insertLightForAvatar:self.firstUserView light:light type:type]; - break; - case 1: - self.secondUserView.imageUrl = userInfo.avatar; - [self.avatarStackView addArrangedSubview:self.secondUserView]; - [self insertLightForAvatar:self.secondUserView light:light type:type]; - break; - case 2: - self.thirdUserView.imageUrl = userInfo.avatar; - [self.avatarStackView addArrangedSubview:self.thirdUserView]; - [self insertLightForAvatar:self.thirdUserView light:light type:type]; - break; - case 3: - self.fourthUserView.imageUrl = userInfo.avatar; - [self.avatarStackView addArrangedSubview:self.fourthUserView]; - [self insertLightForAvatar:self.fourthUserView light:light type:type]; - break; - default: - break; - } - [self.avatarStackView addArrangedSubview:[UIView new]]; - } -} - -- (void)insertLightForAvatar:(NetImageView *)avatar - light:(UIImageView *)light - type:(NSInteger)type { - if (light) { - [self.avatarStackView insertSubview:light belowSubview:avatar]; - light.image = [avatar lightImage:type]; - [light mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(avatar); - make.size.mas_equalTo(avatar).offset(16); - }]; - } -} - -#pragma mark - Event Response -- (void)checkButtonAction:(UIButton *)sender { - self.isCheckingOthers = !self.isCheckingOthers; - if (self.roomPKResultInfoModel) { - RoomPKTeamModel * redTeam; - RoomPKTeamModel * blueTeam; - GroupType myType = GroupType_default; - for (RoomPKTeamModel * teamInfo in _roomPKResultInfoModel.teams) { - if (myType == GroupType_default) { - for (RoomPKTeamUserModel * userInfo in teamInfo.teamMembers) { - if (userInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - myType = teamInfo.team; - break; - } - } - } - if (teamInfo.team == GroupType_Red) { - redTeam = teamInfo; - } else if(teamInfo.team == GroupType_Blue) { - blueTeam = teamInfo; - } - } - if (myType == GroupType_Red) {///我是红队的 - [self handleMyInRedPKTeam:redTeam bluePKTeam:blueTeam]; - } else if(myType == GroupType_Blue) {///我是蓝队的 - [self handleMyInBluePKTeam:redTeam bluePKTeam:blueTeam]; - } else { - [self handleMyInAudiencePKTeam:redTeam bluePKTeam:blueTeam]; - } - } -} - -#pragma mark - Getters And Setters -- (void)setRoomPKResultInfoModel:(RoomPKInfoModel *)roomPKResultInfoModel { - _roomPKResultInfoModel = roomPKResultInfoModel; - if (_roomPKResultInfoModel) { - RoomPKTeamModel * redTeam; - RoomPKTeamModel * blueTeam; - GroupType myType = GroupType_default; - for (RoomPKTeamModel * teamInfo in _roomPKResultInfoModel.teams) { - if (teamInfo.team == GroupType_Red) { - redTeam = teamInfo; - } else if(teamInfo.team == GroupType_Blue) { - blueTeam = teamInfo; - } - - if (myType == GroupType_default) { - for (RoomPKTeamUserModel * userInfo in teamInfo.teamMembers) { - if (userInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - myType = teamInfo.team; - break; - } - } - } - } - if (myType == GroupType_Red) {///我是红队的 - [self handleMyInRedPKTeam:redTeam bluePKTeam:blueTeam]; - } else if(myType == GroupType_Blue) {///我是蓝队的 - [self handleMyInBluePKTeam:redTeam bluePKTeam:blueTeam]; - } else { - [self handleMyInAudiencePKTeam:redTeam bluePKTeam:blueTeam]; - } - } -} - -- (void)topImageWin { - self.topImageView.image = [UIImage getLanguageImage:@"room_pk_panel_result_win"]; - self.contentImageView.image = [UIImage imageNamed:@"room_pk_panel_bg_win"]; -} - -- (void)topImageDraw { - self.topImageView.image = [UIImage getLanguageImage:@"room_pk_panel_result_draw"]; - self.contentImageView.image = [UIImage imageNamed:@"room_pk_panel_bg_draw"]; -} - -- (void)topImageFail { - self.topImageView.image = [UIImage getLanguageImage:@"room_pk_panel_result_fail"]; - self.contentImageView.image = [UIImage imageNamed:@"room_pk_panel_bg_draw"]; -} - -- (void)descAreaGroupType:(GroupType)type { - self.fightScoreLabel.groupType = type; - self.guardScoreLabel.groupType = type; - self.guardPersonLabel.groupType = type; -} - -- (void)updateUI_1 { - CGFloat height = 260; - if (self.roomPKResultInfoModel.result == RoomPKResultType_Draw || - self.roomPKResultInfoModel.voteMode == RoomPKVoteModeType_NumberPerson) { - self.guardScoreLabel.hidden = YES; - self.guardPersonLabel.hidden = YES; - } else { - self.guardScoreLabel.hidden = NO; - self.guardPersonLabel.hidden = NO; - height = 304; - } - [self.contentImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(height); // 根据类型变化 - }]; -} - -- (void)updateUI_2 { - CGFloat height = 260; - if (self.roomPKResultInfoModel.voteMode == RoomPKVoteModeType_GiftValue) { - self.guardScoreLabel.hidden = NO; - self.guardPersonLabel.hidden = NO; - height = 304; - } else { // RoomPKVoteModeType_NumberPerson - self.guardScoreLabel.hidden = YES; - self.guardPersonLabel.hidden = YES; - } - [self.contentImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(height); // 根据类型变化 - }]; -} - -- (void)updateUI_3 { - CGFloat height = 260; - self.guardScoreLabel.hidden = YES; - self.guardPersonLabel.hidden = YES; - [self.contentImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(height); // 根据类型变化 - }]; -} - -- (void)updateBottomTwoButtonsContent:(NSInteger)type { - switch (type) { - case 0: - // 蓝队战绩 - [self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView0") forState:UIControlStateNormal]; - [self.resultButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal]; - // 查看我的战绩 - [self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView1") forState:UIControlStateNormal]; - [self.checkButton setTitleColor:kRedTeamColor forState:UIControlStateNormal]; - break; - case 1: - // 红队战绩 - [self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView3") forState:UIControlStateNormal]; - // 查看对方战绩 - [self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView4") forState:UIControlStateNormal]; - [self.resultButton setTitleColor:kRedTeamColor forState:UIControlStateNormal]; - [self.checkButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal]; - break; - case 2: - // 红队战绩 - [self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView6") forState:UIControlStateNormal]; - [self.resultButton setTitleColor:kRedTeamColor forState:UIControlStateNormal]; - // 查看我的战绩 - [self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView7") forState:UIControlStateNormal]; - [self.checkButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal]; - case 3: - // 蓝队战绩 - [self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView9") forState:UIControlStateNormal]; - [self.resultButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal]; - // 查看红队战绩 - [self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView10") forState:UIControlStateNormal]; - [self.checkButton setTitleColor:kRedTeamColor forState:UIControlStateNormal]; - break; - case 4: - // 红队战绩 - [self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView6") forState:UIControlStateNormal]; - [self.resultButton setTitleColor:kRedTeamColor forState:UIControlStateNormal]; - // 查看蓝队战绩 - [self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView13") forState:UIControlStateNormal]; - [self.checkButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal]; - break; - case 5: - // 蓝队战绩 - [self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView0") forState:UIControlStateNormal]; - [self.resultButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal]; - // 查看对方战绩 - [self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView4") forState:UIControlStateNormal]; - [self.checkButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal]; - break; - default: - break; - } - [self setNeedsLayout]; -} - -- (void)updateScoreLabel:(RoomPKTeamModel *)model - GroupType:(GroupType)type { - self.fightScoreLabel.content = [NSString stringWithFormat:@"%lld", model.score]; - self.guardScoreLabel.content = [NSString stringWithFormat:@"%lld", model.protecScore]; - if (model.protector.nick.length) { - self.guardPersonLabel.content = [NSString stringWithFormat:@"%@", model.protector.nick]; - } else { - self.guardPersonLabel.content = YMLocalizedString(@"XPRoomPKResultView2"); - } -} - -// 自己是红队时布局 -- (void)handleMyInRedPKTeam:(RoomPKTeamModel *)redPKTeam - bluePKTeam:(RoomPKTeamModel *)bluePKTeam { - NSInteger resultType = 0; - if (self.isCheckingOthers) { - // 查看对方战绩 - if (self.roomPKResultInfoModel.result == RoomPKResultType_Draw) { // 平局 - resultType = 2; - [self topImageDraw]; - } else if(self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { // loser, 蓝队 win - resultType = 1; - [self topImageWin]; - } else { // win - resultType = 3; - [self topImageFail]; - } - - [self descAreaGroupType:GroupType_Blue]; - - [self updateBottomTwoButtonsContent:0]; - - [self updateScoreLabel:bluePKTeam GroupType:GroupType_Blue]; - - [self loadTeamMemberUserAvatar:bluePKTeam.teamMembers - resultType:resultType]; - } else { - if (self.roomPKResultInfoModel.result == RoomPKResultType_Red) { // win - resultType = 1; - [self topImageWin]; - } else if (self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { // loser - resultType = 3; - [self topImageFail]; - } else { // 平局 - resultType = 2; - [self topImageDraw]; - } - - [self descAreaGroupType:GroupType_Red]; - - [self updateBottomTwoButtonsContent:1]; - - [self updateScoreLabel:redPKTeam GroupType:GroupType_Red]; - - [self loadTeamMemberUserAvatar:redPKTeam.teamMembers resultType:resultType]; - } - [self updateUI_1]; -} - -// 自己是蓝队时布局 -- (void)handleMyInBluePKTeam:(RoomPKTeamModel *)redPKTeam bluePKTeam:(RoomPKTeamModel *)bluePKTeam { - NSInteger resultType = 0; - if (self.isCheckingOthers) { // 查看对方战绩 - if (self.roomPKResultInfoModel.result == RoomPKResultType_Draw) { // win - resultType = 2; - [self topImageDraw]; - } else if(self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { // loser - resultType = 3; - [self topImageFail]; - } else { - resultType = 1; - [self topImageWin]; - } - - [self descAreaGroupType:GroupType_Red]; - - [self updateBottomTwoButtonsContent:1]; - - [self updateScoreLabel:redPKTeam GroupType:GroupType_Red]; - - [self updateUI_1]; - - [self loadTeamMemberUserAvatar:redPKTeam.teamMembers resultType:resultType]; - } else { - if (self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { // win - resultType = 1; - [self topImageWin]; - } else if (self.roomPKResultInfoModel.result == RoomPKResultType_Red) { // loser - resultType = 3; - [self topImageFail]; - } else { // 平局 - resultType = 2; - [self topImageDraw]; - } - - [self updateBottomTwoButtonsContent:3]; - [self descAreaGroupType:GroupType_Blue]; - - [self updateScoreLabel:bluePKTeam GroupType:GroupType_Blue]; - - [self updateUI_1]; - - [self loadTeamMemberUserAvatar:bluePKTeam.teamMembers resultType:resultType]; - } -} - -// 观众时的布局 -- (void)handleMyInAudiencePKTeam:(RoomPKTeamModel *)redPKTeam bluePKTeam:(RoomPKTeamModel *)bluePKTeam { - // 观众弹的是胜利方, 点击查看其它的则是查看失败方 - // 平局默认红队, 点击查看其他是蓝队 - if (self.isCheckingOthers) { // 查看失败方战绩 - if (self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { - [self topImageFail]; - [self updateBottomTwoButtonsContent:3]; - [self descAreaGroupType:GroupType_Red]; - [self updateScoreLabel:redPKTeam GroupType:GroupType_Red]; - [self updateUI_2]; - [self loadTeamMemberUserAvatar:redPKTeam.teamMembers resultType:3]; - } else if (self.roomPKResultInfoModel.result == RoomPKResultType_Red) { - [self topImageFail]; - [self updateBottomTwoButtonsContent:4]; - [self descAreaGroupType:GroupType_Blue]; - [self updateScoreLabel:bluePKTeam GroupType:GroupType_Blue]; - [self updateUI_2]; - [self loadTeamMemberUserAvatar:bluePKTeam.teamMembers resultType:3]; - } else { - [self topImageDraw]; - [self updateBottomTwoButtonsContent:3]; - [self descAreaGroupType: GroupType_Blue]; - [self updateScoreLabel:bluePKTeam GroupType:GroupType_Blue]; - [self updateUI_3]; - [self loadTeamMemberUserAvatar:bluePKTeam.teamMembers resultType:2]; - } - } else { - // 弹胜利方的框 - if (self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { - [self topImageWin]; - [self updateBottomTwoButtonsContent:3]; - [self descAreaGroupType: GroupType_Blue]; - [self updateScoreLabel:bluePKTeam GroupType:GroupType_Blue]; - [self updateUI_1]; - [self loadTeamMemberUserAvatar:bluePKTeam.teamMembers resultType:1]; - } else if (self.roomPKResultInfoModel.result == RoomPKResultType_Red) { - [self topImageWin]; - [self updateBottomTwoButtonsContent:4]; - [self descAreaGroupType: GroupType_Red]; - [self updateScoreLabel:redPKTeam GroupType:GroupType_Red]; - [self updateUI_1]; - [self loadTeamMemberUserAvatar:redPKTeam.teamMembers resultType:1]; - } else { // 平局 - [self topImageDraw]; - [self updateBottomTwoButtonsContent:4]; - [self descAreaGroupType: GroupType_Red]; - [self updateScoreLabel:redPKTeam GroupType:GroupType_Red]; - [self updateUI_3]; - [self loadTeamMemberUserAvatar:redPKTeam.teamMembers resultType:2]; - } - } -} - -- (UIImageView *)topImageView { - if (!_topImageView) { - _topImageView = [[UIImageView alloc] init]; - _topImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _topImageView; -} - -- (UIImageView *)contentImageView { - if (!_contentImageView) { - _contentImageView = [[UIImageView alloc] init]; - _contentImageView.userInteractionEnabled = YES; - _contentImageView.image = [UIImage imageNamed:@"room_pk_panel_bg_draw"]; - } - return _contentImageView; -} - -- (UIStackView *)avatarStackView { - if (!_avatarStackView) { - _avatarStackView = [[UIStackView alloc] init]; -// _avatarStackView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4]; - _avatarStackView.axis = UILayoutConstraintAxisHorizontal; - _avatarStackView.distribution = UIStackViewDistributionEqualCentering; - _avatarStackView.alignment = UIStackViewAlignmentCenter; -// _avatarStackView.translatesAutoresizingMaskIntoConstraints = NO; - _avatarStackView.spacing = 10; - _avatarStackView.clipsToBounds = NO; - } - return _avatarStackView; -} - -- (XPRomPKResultTitleLabel *)fightScoreLabel { - if (!_fightScoreLabel) { - _fightScoreLabel = [[XPRomPKResultTitleLabel alloc] init]; - _fightScoreLabel.title = YMLocalizedString(@"XPRoomPKResultView27"); - } - return _fightScoreLabel; -} - -- (XPRomPKResultTitleLabel *)guardPersonLabel { - if (!_guardPersonLabel) { - _guardPersonLabel = [[XPRomPKResultTitleLabel alloc] init]; - _guardPersonLabel.title = YMLocalizedString(@"XPRoomPKResultView28"); - } - return _guardPersonLabel; -} - -- (XPRomPKResultTitleLabel *)guardScoreLabel { - if (!_guardScoreLabel) { - _guardScoreLabel = [[XPRomPKResultTitleLabel alloc] init]; - _guardScoreLabel.title = YMLocalizedString(@"XPRoomPKResultView29"); - } - return _guardScoreLabel; -} - -- (UIButton *)resultButton { - if (!_resultButton) { - _resultButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_resultButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _resultButton.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightBold]; - [_resultButton setBackgroundImage:[UIImage imageNamed:@"room_pk_result_team_bg"] forState:UIControlStateNormal]; - } - return _resultButton; -} - -- (UIButton *)checkButton { - if (!_checkButton) { - _checkButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView4") forState:UIControlStateNormal]; - [_checkButton setTitleColor:[UIColor colorWithWhite:1 alpha:0.6] forState:UIControlStateNormal]; - _checkButton.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _checkButton.layer.masksToBounds = YES; - [_checkButton addTarget:self action:@selector(checkButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _checkButton; -} - -- (NetImageView *)firstUserView { - if (!_firstUserView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _firstUserView = [[NetImageView alloc] initWithConfig:config]; - _firstUserView.translatesAutoresizingMaskIntoConstraints = NO; - _firstUserView.layer.masksToBounds = YES; - _firstUserView.layer.cornerRadius = 65/2; - _firstUserView.layer.borderWidth = 1; - _firstUserView.layer.borderColor = [UIColor whiteColor].CGColor; - _firstUserView.userInteractionEnabled = YES; - [_firstUserView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(65, 65)); - }]; - } - return _firstUserView; -} - -- (NetImageView *)secondUserView { - if (!_secondUserView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _secondUserView = [[NetImageView alloc] initWithConfig:config]; - _secondUserView.translatesAutoresizingMaskIntoConstraints = NO; - _secondUserView.layer.masksToBounds = YES; - _secondUserView.layer.cornerRadius = 65/2; - _secondUserView.layer.borderWidth = 1; - _secondUserView.layer.borderColor = [UIColor whiteColor].CGColor; - _secondUserView.userInteractionEnabled = YES; - [_secondUserView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(65, 65)); - }]; - } - return _secondUserView; -} - - -- (NetImageView *)thirdUserView { - if (!_thirdUserView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _thirdUserView = [[NetImageView alloc] initWithConfig:config]; - _thirdUserView.translatesAutoresizingMaskIntoConstraints = NO; - _thirdUserView.layer.masksToBounds = YES; - _thirdUserView.layer.cornerRadius = 65/2; - _thirdUserView.layer.borderWidth = 1; - _thirdUserView.layer.borderColor = [UIColor whiteColor].CGColor; - _thirdUserView.userInteractionEnabled = YES; - [_thirdUserView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(65, 65)); - }]; - } - return _thirdUserView; -} - -- (NetImageView *)fourthUserView { - if (!_fourthUserView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _fourthUserView = [[NetImageView alloc] initWithConfig:config]; - _fourthUserView.translatesAutoresizingMaskIntoConstraints = NO; - _fourthUserView.layer.masksToBounds = YES; - _fourthUserView.layer.cornerRadius = 65/2; - _fourthUserView.layer.borderWidth = 1; - _fourthUserView.layer.borderColor = [UIColor whiteColor].CGColor; - _fourthUserView.userInteractionEnabled = YES; - [_fourthUserView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(65, 65)); - }]; - } - return _fourthUserView; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.h b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.h deleted file mode 100644 index 9819e8d..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomPKViewController.h -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import "MvpViewController.h" -#import "RoomHostDelegate.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomPKViewController : MvpViewController -- (instancetype)initWithDelegate:(id)delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m deleted file mode 100644 index 28bf454..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m +++ /dev/null @@ -1,514 +0,0 @@ -// -// YMRoomPKViewController.m -// YUMI -// -// Created by YUMI on 2022/3/17. -// - -#import "XPRoomPKViewController.h" -///Third -#import -///Tool -#import "TTPopup.h" -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "NSObject+MJExtension.h" -#import "NSArray+Safe.h" -///Model -#import "RoomPKTimeItemModel.h" -#import "RoomInfoModel.h" -#import "RoomPKChooseUserModel.h" -#import "AttachmentModel.h" -#import "RoomPKChooseUserModel.h" -///View -#import "XPRoomPKVoteTableViewCell.h" -#import "XPRoomPKTypeTableViewCell.h" -#import "XPRoomPKTimeTableViewCell.h" -#import "XPRoomPKUserView.h" -#import "XPRoomPKTimePickerView.h" -#import "XPRoomPKRecordViewController.h" -#import "XPRoomPKSelectUserView.h" -///P -#import "XPRoomPKPresenter.h" -#import "XPRoomPKProtocol.h" -@interface XPRoomPKViewController () -///用户的容器 -@property (nonatomic,strong) UIView * userContainerView; -///红队 -@property (nonatomic,strong) NSArray *redTeamViews; -///蓝队 -@property (nonatomic,strong) NSArray *blueTeamViews; -///房间pklogo -@property (nonatomic,strong) UIImageView *roomPKLogoImageView; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///创建pk的容器 -@property (nonatomic,strong) UIStackView *createPKStackView; -///创建PK -@property (nonatomic,strong) UIButton *createPKButton; -///再次创建 -@property (nonatomic,strong) UIButton *onceAgainPKButton; -///关闭PK -@property (nonatomic,strong) UIButton *closePKButton; -///代理 -@property (nonatomic,assign) id hostDelegate; -///类型 -@property (nonatomic,assign) RoomPKVoteModeType voteType; -///时间 -@property (nonatomic,assign) int duraTime; -///红队的成员 -@property (nonatomic,strong) NSMutableArray *redUserArray; -///蓝队的成员 -@property (nonatomic,strong) NSMutableArray *blueUserArray; -@end - -@implementation XPRoomPKViewController - -- (XPRoomPKPresenter *)createPresenter { - return [[XPRoomPKPresenter alloc] init]; -} - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super init]) { - self.hostDelegate = delegate; - } - return self; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPRoomPKViewController0"); - self.duraTime = 30; - self.voteType = RoomPKVoteModeType_GiftValue; - NSArray * array = self.hostDelegate.getRoomPKGroupTeamList; - self.redUserArray = [NSMutableArray arrayWithArray:[array xpSafeObjectAtIndex:0]]; - self.blueUserArray = [NSMutableArray arrayWithArray:[array xpSafeObjectAtIndex:1]]; - for (RoomPKChooseUserModel * userInfo in self.redUserArray) { - userInfo.groupType = GroupType_default; - } - - for (RoomPKChooseUserModel * userInfo in self.blueUserArray) { - userInfo.groupType = GroupType_default; - } - - [self addNavigationItemWithTitles:@[YMLocalizedString(@"XPRoomPKViewController1")] titleColor:[DJDKMIMOMColor mainTextColor] isLeft:NO target:self action:@selector(rightNavAction:) tags:nil]; - [self.view addSubview:self.userContainerView]; - [self.view addSubview:self.tableView]; - [self.view addSubview:self.createPKStackView]; - - [self.createPKStackView addArrangedSubview:self.createPKButton]; - [self.createPKStackView addArrangedSubview:self.onceAgainPKButton]; - [self.createPKStackView addArrangedSubview:self.closePKButton]; - - [self.userContainerView addSubview:self.roomPKLogoImageView]; - [self initUserContainerSubViews]; - - - if (self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - self.onceAgainPKButton.hidden = NO; - self.closePKButton.hidden = NO; - self.createPKButton.hidden = YES; - } else { - self.createPKButton.hidden = NO; - } -} - -- (void)initSubViewConstraints { - XPRoomPKUserView * userView = [self.redTeamViews lastObject]; - [self.userContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.view).offset(10); - make.bottom.mas_equalTo(userView.mas_bottom).offset(20); - }]; - - [self.roomPKLogoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.userContainerView); - make.width.mas_equalTo(43); - make.height.mas_equalTo(64); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.userContainerView.mas_bottom); - }]; - - [self.createPKStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(47); - make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 20); - }]; - - [self.createPKButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(44); - }]; - - [self.onceAgainPKButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(44); - }]; - - [self.closePKButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(44); - }]; -} - -- (void)initUserContainerSubViews { - CGFloat itemWidth = 60; - CGFloat itemHeight = 67; - CGFloat pkItemWidth = 72; - CGFloat pkItemMargeHeight = 10; - CGFloat itemSpace = (KScreenWidth - itemWidth * 4 - 72 - 13 * 2)/ 2; - NSMutableArray * redArray = [NSMutableArray array]; - for (int i = 0; i< 4; i++) { - XPRoomPKUserView * redView = [[XPRoomPKUserView alloc] init]; - [redArray addObject:redView]; - redView.type = RoomPKUserViewType_Red; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(redDidTapRecognizer:)]; - redView.index = i + 1; - [redView addGestureRecognizer:tap]; - [self.userContainerView addSubview:redView]; - [redView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(itemWidth, itemHeight)); - make.leading.mas_equalTo(self.userContainerView).offset(13+ i % 2 * (itemWidth + itemSpace)); - make.top.mas_equalTo(self.userContainerView).offset(i / 2 *(itemHeight + pkItemMargeHeight)); - }]; - } - self.redTeamViews = [redArray copy]; - - NSMutableArray * blueArray = [NSMutableArray array]; - for (int i = 0; i< 4; i++) { - XPRoomPKUserView * blueView = [[XPRoomPKUserView alloc] init]; - [blueArray addObject:blueView]; - blueView.type = RoomPKUserViewType_Blue; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(blueDidTapRecognizer:)]; - [blueView addGestureRecognizer:tap]; - blueView.index = i + 1; - [self.userContainerView addSubview:blueView]; - [blueView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(itemWidth, itemHeight)); - make.leading.mas_equalTo(self.userContainerView).offset(13 + itemWidth * 2 + itemSpace + pkItemWidth + i % 2 * (itemWidth + itemSpace)); - make.top.mas_equalTo(self.userContainerView).offset(i / 2 *(itemHeight + pkItemMargeHeight)); - }]; - } - self.blueTeamViews = [blueArray copy]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return 3; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 50; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.row == 0) { - XPRoomPKTypeTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomPKTypeTableViewCell class])]; - if (cell == nil) { - cell = [[XPRoomPKTypeTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomPKTypeTableViewCell class])]; - } - return cell; - } else if(indexPath.row == 1) { - XPRoomPKVoteTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomPKVoteTableViewCell class])]; - if (cell == nil) { - cell = [[XPRoomPKVoteTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomPKVoteTableViewCell class])]; - } - cell.delegate = self; - return cell; - } else { - XPRoomPKTimeTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomPKTimeTableViewCell class])]; - if (cell == nil) { - cell = [[XPRoomPKTimeTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomPKTimeTableViewCell class])]; - } - return cell; - } -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (indexPath.row == 2) { - XPRoomPKTimePickerView * timePicker = [[XPRoomPKTimePickerView alloc] init]; - timePicker.delegate = self; - [TTPopup popupView:timePicker style:TTPopupStyleActionSheet]; - } -} -#pragma mark - XPRoomPKTimePickerViewDelegate -- (void)xPRoomPKTimePickerView:(XPRoomPKTimePickerView *)view timeModel:(RoomPKTimeItemModel *)model { - XPRoomPKTimeTableViewCell * cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:2 inSection:0]]; - self.duraTime = model.time; - cell.time = model.title; -} - -#pragma mark - XPRoomPKVoteTableViewCellDelegate -- (void)xPRoomPKVoteTableViewCell:(XPRoomPKVoteTableViewCell *)view didChooseVoteType:(RoomPKVoteModeType)VoteType { - self.voteType = VoteType; -} - -#pragma mark - XPRoomPKSelectUserViewDelegate -- (void)xPRoomPKSelectUserView:(XPRoomPKSelectUserView *)view groupType:(GroupType)groupType didChooseUserInfos:(NSArray *)userInfos { - [TTPopup dismiss]; - if (groupType == GroupType_Red) { - self.redUserArray = [NSMutableArray arrayWithArray:userInfos];; - } else { - self.blueUserArray = [NSMutableArray arrayWithArray:userInfos]; - } - - if (self.redUserArray.count > 0) { - for (int i = 0; i< self.redTeamViews.count; i++) { - XPRoomPKUserView * userView = [self.redTeamViews xpSafeObjectAtIndex:i]; - userView.userInfo = nil; - } - } - - if (self.blueUserArray.count > 0) { - for (int i = 0; i< self.blueTeamViews.count; i++) { - XPRoomPKUserView * userView = [self.blueTeamViews xpSafeObjectAtIndex:i]; - userView.userInfo = nil; - } - } - - - NSMutableArray *redArray = [[NSMutableArray alloc]initWithArray:self.redUserArray]; - for (int i = 0; i < redArray.count; i++) { - RoomPKChooseUserModel * userInfo = [redArray xpSafeObjectAtIndex:i]; - if (i < self.redTeamViews.count) { - XPRoomPKUserView * userView = [self.redTeamViews xpSafeObjectAtIndex:i]; - if (userInfo.groupType == GroupType_Red) { - userView.userInfo = userInfo; - } else { - userView.userInfo = nil; - [self.redUserArray removeObject:userInfo]; - } - } - } - NSMutableArray *blueUserArray = [[NSMutableArray alloc]initWithArray:self.blueUserArray]; - for (int i = 0; i < blueUserArray.count; i++) { - RoomPKChooseUserModel * userInfo = [blueUserArray xpSafeObjectAtIndex:i]; - if (i < self.blueTeamViews.count) { - XPRoomPKUserView * userView = [self.blueTeamViews xpSafeObjectAtIndex:i]; - if (userInfo.groupType == GroupType_Blue) { - userView.userInfo = userInfo; - } else { - userView.userInfo = nil; - - [self.blueUserArray removeObject:userInfo]; - } - } - } -} - -#pragma mark - XPRoomPKProtocol -- (void)openRoomPKSuccess { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - [self.presenter createRoomPKMode:2 voteMode:self.voteType duration:self.duraTime roomUid:roomUid]; -} - -- (void)closeRoomPKSuccess { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)createRoomPKSuccess:(RoomPKInfoModel *)roompkInfo { - [self showSuccessToast:YMLocalizedString(@"XPRoomPKViewController2")]; - if (self.redUserArray.count > 0 || self.blueUserArray.count > 0) { - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - for (int i = 0 ; i< self.redUserArray.count; i++) { - RoomPKChooseUserModel * model = [self.redUserArray xpSafeObjectAtIndex:i]; - if (model.uid.integerValue <= 0) { - continue; - } - NSMutableDictionary * data =[[model model2dictionary] mutableCopy]; - [data removeObjectForKey:@"title"]; - [data removeObjectForKey:@"imageName"]; - [data removeObjectForKey:@"userUrl"]; - [data removeObjectForKey:@"isSelect"]; - [data removeObjectForKey:@"isEnableChoose"]; - [dic setValue:data forKey:model.uid]; - } - - for (int i = 0 ; i< self.blueUserArray.count; i++) { - RoomPKChooseUserModel * model = [self.blueUserArray xpSafeObjectAtIndex:i]; - if (model.uid.integerValue <= 0) { - continue; - } - NSMutableDictionary * data =[[model model2dictionary] mutableCopy]; - [data removeObjectForKey:@"title"]; - [data removeObjectForKey:@"imageName"]; - [data removeObjectForKey:@"userUrl"]; - [data removeObjectForKey:@"isSelect"]; - [data removeObjectForKey:@"isEnableChoose"]; - [dic setValue:data forKey:model.uid]; - } - - if (dic.allKeys.count > 0) { - AttachmentModel * attachment = [[AttachmentModel alloc] init]; - attachment.first = CustomMessageType_Room_PK; - attachment.second = Custom_Message_Sub_Room_PK_Manager_Up_Mic; - attachment.data = dic; - NSString *sessionID = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:sessionID type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - } - } - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - Event Response -- (void)createPKButtonAction:(UIButton *)sender { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - [self.presenter openRoomPK:roomUid]; -} - -- (void)closePKButtonAction:(UIButton *)sender { - NSString * title = YMLocalizedString(@"XPRoomPKViewController3"); - [TTPopup alertWithMessage:title confirmHandler:^{ - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - [self.presenter closeRoomPK:roomUid]; - } cancelHandler:^{ - - }]; - -} - -- (void)onceAgainPKButtonAction:(UIButton *)sender { - NSString * title = YMLocalizedString(@"XPRoomPKViewController4"); - [TTPopup alertWithMessage:title confirmHandler:^{ - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - [self.presenter createRoomPKMode:2 voteMode:self.voteType duration:self.duraTime roomUid:roomUid]; - } cancelHandler:^{ - - }]; -} - -- (void)rightNavAction:(UIButton *)sender { - XPRoomPKRecordViewController * recordVC = [[XPRoomPKRecordViewController alloc] init]; - recordVC.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - [self.navigationController pushViewController:recordVC animated:YES]; -} - -- (void)redDidTapRecognizer:(UITapGestureRecognizer *)tap { - XPRoomPKSelectUserView * chooseUserView = [[XPRoomPKSelectUserView alloc] init]; - chooseUserView.delegate = self; - chooseUserView.redUserArray = self.redUserArray; - chooseUserView.blueUserArray = self.blueUserArray; - chooseUserView.groupType = GroupType_Red; - chooseUserView.microQueueArray = self.hostDelegate.getMicroQueue.allValues; - [TTPopup popupView:chooseUserView style:TTPopupStyleAlert]; -} - -- (void)blueDidTapRecognizer:(UITapGestureRecognizer *)tap { - XPRoomPKSelectUserView * chooseUserView = [[XPRoomPKSelectUserView alloc] init]; - chooseUserView.delegate = self; - chooseUserView.redUserArray = self.redUserArray; - chooseUserView.blueUserArray = self.blueUserArray; - chooseUserView.groupType = GroupType_Blue; - chooseUserView.microQueueArray = self.hostDelegate.getMicroQueue.allValues; - [TTPopup popupView:chooseUserView style:TTPopupStyleAlert]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.scrollEnabled = NO; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPRoomPKVoteTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomPKVoteTableViewCell class])]; - [_tableView registerClass:[XPRoomPKTypeTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomPKTypeTableViewCell class])]; - [_tableView registerClass:[XPRoomPKTimeTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomPKTimeTableViewCell class])]; - } - return _tableView; -} - -- (UIStackView *)createPKStackView { - if (!_createPKStackView) { - _createPKStackView = [[UIStackView alloc] init]; - _createPKStackView.axis = UILayoutConstraintAxisVertical; - _createPKStackView.distribution = UIStackViewDistributionFill; - _createPKStackView.alignment = UIStackViewAlignmentFill; - _createPKStackView.spacing = 10; - } - return _createPKStackView; -} - -- (UIButton *)createPKButton { - if (!_createPKButton) { - _createPKButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_createPKButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - [_createPKButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _createPKButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_createPKButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _createPKButton.layer.masksToBounds = YES; - _createPKButton.layer.cornerRadius = 22; - [_createPKButton addTarget:self action:@selector(createPKButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _createPKButton; -} - -- (UIButton *)onceAgainPKButton { - if (!_onceAgainPKButton) { - _onceAgainPKButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_onceAgainPKButton setTitle:YMLocalizedString(@"XPRoomPKViewController6") forState:UIControlStateNormal]; - [_onceAgainPKButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _onceAgainPKButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_onceAgainPKButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _onceAgainPKButton.layer.masksToBounds = YES; - _onceAgainPKButton.layer.cornerRadius = 22; - [_onceAgainPKButton addTarget:self action:@selector(onceAgainPKButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _onceAgainPKButton.hidden = YES; - } - return _onceAgainPKButton; -} - -- (UIButton *)closePKButton { - if (!_closePKButton) { - _closePKButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closePKButton setTitle:YMLocalizedString(@"XPRoomPKViewController7") forState:UIControlStateNormal]; - [_closePKButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateNormal]; - _closePKButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_closePKButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor disableButtonColor], [DJDKMIMOMColor disableButtonColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _closePKButton.layer.masksToBounds = YES; - _closePKButton.layer.cornerRadius = 22; - [_closePKButton addTarget:self action:@selector(closePKButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _closePKButton.hidden= YES; - } - return _closePKButton; -} - - -- (UIView *)userContainerView { - if (!_userContainerView) { - _userContainerView = [[UIView alloc] init]; - _userContainerView.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - } - return _userContainerView; -} - -- (UIImageView *)roomPKLogoImageView { - if (!_roomPKLogoImageView) { - _roomPKLogoImageView = [[UIImageView alloc] init]; - _roomPKLogoImageView.userInteractionEnabled = YES; - _roomPKLogoImageView.image = [UIImage imageNamed:@"room_pk_vs_logo"]; - } - return _roomPKLogoImageView; -} - - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Api/Api+PhotoAlbum.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Api/Api+PhotoAlbum.h deleted file mode 100644 index d5c1c1a..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Api/Api+PhotoAlbum.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// Api+PhotoAlbum.h -// YuMi -// -// Created by duoban on 2023/10/16. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (PhotoAlbum) -///获取已上传图片 -/// - Parameters: -/// - completion: 完成 -/// - roomUid: 房间id -/// - type: null=全部，1=普通，2=礼物解锁 -+ (void)getRoomAlbumList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid page:(NSString *)page pageSize:(NSString *)pageSize uid:(NSString *)uid ticket:(NSString *)ticket type:(NSString *_Nullable)type; -/// 上传房间房间图片 -/// - Parameters: -/// - completion: 完成 -/// - giftId: 当type=2时传入礼物id -/// - photoUrls: 照片数组 -/// - roomUid: 房间UId -/// - type:类型 1=普通，2=礼物解锁 -+(void)uploadRoomAlbumList:(HttpRequestHelperCompletion)completion photoUrls:(NSString *)photoUrls roomUid:(NSString *)roomUid uid:(NSString *)uid ticket:(NSString *)ticket type:(NSString *)type giftId:(NSString *_Nullable)giftId; - -/// 删除房间图片 -/// - Parameters: -/// - completion: 完成 -/// - photoId: 图片id -+(void)deleteRoomAlbumPhoto:(HttpRequestHelperCompletion)completion id:(NSString *)id; -/// 发送房间图片 -/// - Parameters: -/// - completion: 完成 -/// - photoId: 图片id -+(void)sendRoomAlbumPhoto:(HttpRequestHelperCompletion)completion id:(NSString *)id roomUid:(NSString *)roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Api/Api+PhotoAlbum.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Api/Api+PhotoAlbum.m deleted file mode 100644 index b745d13..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Api/Api+PhotoAlbum.m +++ /dev/null @@ -1,55 +0,0 @@ -// -// Api+PhotoAlbum.m -// YuMi -// -// Created by duoban on 2023/10/16. -// - -#import "Api+PhotoAlbum.h" - - -@implementation Api (PhotoAlbum) - -///获取已上传图片 -/// - Parameters: -/// - completion: 完成 -/// - roomUid: 房间id -/// - type: null=全部，1=普通，2=礼物解锁 -+ (void)getRoomAlbumList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid page:(NSString *)page pageSize:(NSString *)pageSize uid:(NSString *)uid ticket:(NSString *)ticket type:(NSString *_Nullable)type{ - - - [self makeRequest:@"roomAlbum/pagePhoto" method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__,roomUid,page,pageSize,uid,ticket,type, nil]; -} - -/// 上传房间房间图片 -/// - Parameters: -/// - completion: 完成 -/// - giftId: 当type=2时传入礼物id -/// - photoUrls: 照片数组 -/// - roomUid: 房间UId -/// - type:类型 1=普通，2=礼物解锁 -+(void)uploadRoomAlbumList:(HttpRequestHelperCompletion)completion photoUrls:(NSString *)photoUrls roomUid:(NSString *)roomUid uid:(NSString *)uid ticket:(NSString *)ticket type:(NSString *)type giftId:(NSString *_Nullable)giftId{ - - if(giftId != nil){ - [self makeRequest:@"roomAlbum/upload" method:HttpRequestHelperMethodPOST completion:completion,__FUNCTION__,photoUrls,roomUid,uid,ticket,type,giftId, nil]; - return; - } - [self makeRequest:@"roomAlbum/upload" method:HttpRequestHelperMethodPOST completion:completion,__FUNCTION__,photoUrls,roomUid,uid,ticket,type, nil]; - -} -/// 删除房间图片 -/// - Parameters: -/// - completion: 完成 -/// - photoId: 图片id -+(void)deleteRoomAlbumPhoto:(HttpRequestHelperCompletion)completion id:(NSString *)id{ - - [self makeRequest:@"roomAlbum/delete" method:HttpRequestHelperMethodPOST completion:completion,__FUNCTION__,id, nil]; -} -/// 发送房间图片 -/// - Parameters: -/// - completion: 完成 -/// - photoId: 图片id -+(void)sendRoomAlbumPhoto:(HttpRequestHelperCompletion)completion id:(NSString *)id roomUid:(NSString *)roomUid{ - [self makeRequest:@"roomAlbum/sendPhoto" method:HttpRequestHelperMethodPOST completion:completion,__FUNCTION__,id,roomUid, nil]; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemChoosePhotoModel.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemChoosePhotoModel.h deleted file mode 100644 index eede0d1..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemChoosePhotoModel.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// PIRoomPhotoAlbumItemChoosePhotoModel.h -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumItemChoosePhotoModel : PIBaseModel -@property(nonatomic,assign) BOOL isDefault; -@property(nonatomic,strong) UIImage *chooseImage; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemChoosePhotoModel.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemChoosePhotoModel.m deleted file mode 100644 index e3c551d..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemChoosePhotoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// PIRoomPhotoAlbumItemChoosePhotoModel.m -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import "PIRoomPhotoAlbumItemChoosePhotoModel.h" - -@implementation PIRoomPhotoAlbumItemChoosePhotoModel - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemModel.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemModel.h deleted file mode 100644 index eb6e575..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemModel.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// PIRoomPhotoAlbumItemModel.h -// YuMi -// -// Created by duoban on 2023/10/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumItemModel : PIBaseModel -@property(nonatomic,copy) NSString *giftName; -@property(nonatomic,copy) NSString *giftId; -@property(nonatomic,copy) NSString *giftNum; -@property(nonatomic,copy) NSString *giftUrl; -@property(nonatomic,copy) NSString *ID; -@property(nonatomic,copy) NSString *photoUrl; -@property(nonatomic,copy) NSString *roomUid; -//1=普通，2=礼物解锁 -@property(nonatomic,copy) NSString *type; -///1=可以看，0=高斯模糊 -@property(nonatomic,assign) int status; -@property(nonatomic,copy) NSString *uid; -@property(nonatomic,copy) NSString *totalGoldPrice; - -// 以下参数用于 vip 发图消息 -@property(nonatomic, copy) NSString *picUrl; -@property(nonatomic, copy) NSString *androidBubbleUrl; -@property(nonatomic, copy) NSString *avatar; -@property(nonatomic, copy) NSString *charmUrl; -@property(nonatomic, assign) NSInteger defUser; -@property(nonatomic, assign) NSInteger enterHide; -@property(nonatomic, assign) NSInteger erbanNo; -@property(nonatomic, assign) NSInteger experLevelSeq; -@property(nonatomic, copy) NSString *experUrl; -@property(nonatomic, copy) NSString *iosBubbleUrl; -@property(nonatomic, assign) NSInteger newUser; -@property(nonatomic, copy) NSString *nick; -@property(nonatomic, copy) NSString *vipIcon; -@property(nonatomic, copy) NSString *inRoomNameplatePic; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemModel.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemModel.m deleted file mode 100644 index e2f2d21..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Model/PIRoomPhotoAlbumItemModel.m +++ /dev/null @@ -1,15 +0,0 @@ -// -// PIRoomPhotoAlbumItemModel.m -// YuMi -// -// Created by duoban on 2023/10/16. -// - -#import "PIRoomPhotoAlbumItemModel.h" - -@implementation PIRoomPhotoAlbumItemModel -///如果一个模型中需要字段映射的话 比如id -> ID name -> other.name -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"ID":@"id"}; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Presenter/PIRoomPhotoAlbumItemPresenter.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Presenter/PIRoomPhotoAlbumItemPresenter.h deleted file mode 100644 index 0d1af01..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Presenter/PIRoomPhotoAlbumItemPresenter.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// PIRoomPhotoAlbumItemPresenter.h -// YuMi -// -// Created by duoban on 2023/10/16. -// - -#import -#import "BaseMvpPresenter.h" -#import "Api+PhotoAlbum.h" -NS_ASSUME_NONNULL_BEGIN - - -@interface PIRoomPhotoAlbumItemPresenter : BaseMvpPresenter -///获取已上传图片 -/// - Parameters: -/// - roomUid: 房间id -/// - type: null=全部，1=普通，2=礼物解锁 -- (void)getRoomAlbumListWithroomUid:(NSString *)roomUid type:(NSString *_Nullable)type page:(NSString *)page pageSize:(NSString *)pageSize; -/// 上传房间房间图片 -/// - Parameters: -/// - giftId: 当type=2时传入礼物id -/// - photoUrls: 照片数组 -/// - roomUid: 房间UId -/// - type:类型 1=普通，2=礼物解锁 --(void)uploadRoomAlbumListWithGiftId:(NSString *_Nullable)giftId photoUrls:(NSArray *)photoUrls roomUid:(NSString *)roomUid type:(NSString *)type; -///删除房间相册 --(void)deleteRoomAlbumPhotoWithId:(NSString *)id; -/// 发送房间图片 -/// - Parameters: -/// - photoId: 图片id --(void)sendRoomAlbumPhotoWithId:(NSString *)id roomUid:(NSString *)roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Presenter/PIRoomPhotoAlbumItemPresenter.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Presenter/PIRoomPhotoAlbumItemPresenter.m deleted file mode 100644 index 2d47e18..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Presenter/PIRoomPhotoAlbumItemPresenter.m +++ /dev/null @@ -1,73 +0,0 @@ -// -// PIRoomPhotoAlbumItemPresenter.m -// YuMi -// -// Created by duoban on 2023/10/16. -// - -#import "PIRoomPhotoAlbumItemPresenter.h" -#import "PIRoomPhotoAlbumItemProtocol.h" -#import "PIRoomPhotoAlbumItemModel.h" - -@implementation PIRoomPhotoAlbumItemPresenter -///获取已上传图片 -/// - Parameters: -/// - roomUid: 房间id -/// - type: null=全部，1=普通，2=礼物解锁 -- (void)getRoomAlbumListWithroomUid:(NSString *)roomUid type:(NSString *_Nullable)type page:(NSString *)page pageSize:(NSString *)pageSize{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - @kWeakify(self); - [Api getRoomAlbumList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray *list = [PIRoomPhotoAlbumItemModel modelsWithArray:data.data]; - [[self getView]getRoomAlbumListSuccessWithList:list]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView]getRoomAlbumListFailWithCode:code]; - } showLoading:NO errorToast:YES] roomUid:roomUid page:page pageSize:pageSize uid:uid ticket:ticket type:type] ; - -} -/// 上传房间房间图片 -/// - Parameters: -/// - giftId: 当type=2时传入礼物id -/// - photoUrls: 照片数组 -/// - roomUid: 房间UId -/// - type:类型 1=普通，2=礼物解锁 --(void)uploadRoomAlbumListWithGiftId:(NSString *_Nullable)giftId photoUrls:(NSArray *)photoUrls roomUid:(NSString *)roomUid type:(NSString *)type{ - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - NSString *photoUrl = [photoUrls componentsJoinedByString:@","]; - @kWeakify(self); - [Api uploadRoomAlbumList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView]uploadRoomAlbumListSuccess]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView]uploadRoomAlbumListFail]; - } showLoading:NO errorToast:YES] photoUrls:photoUrl roomUid:roomUid uid:uid ticket:ticket type:type giftId:giftId]; -} -///删除房间相册 --(void)deleteRoomAlbumPhotoWithId:(NSString *)id{ - @kWeakify(self); - [Api deleteRoomAlbumPhoto:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView]deleteRoomAlbumPhotoSuccessWithPhotoId:id]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:YES errorToast:YES] id:id]; -} -/// 发送房间图片 -/// - Parameters: -/// - photoId: 图片id --(void)sendRoomAlbumPhotoWithId:(NSString *)id roomUid:(NSString *)roomUid{ - @kWeakify(self); - [Api sendRoomAlbumPhoto:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView]sendRoomAlbumPhotoSuccess]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView]sendRoomAlbumPhotoFail]; - } showLoading:NO errorToast:YES] id:id roomUid:roomUid]; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Protocol/PIRoomPhotoAlbumItemProtocol.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Protocol/PIRoomPhotoAlbumItemProtocol.h deleted file mode 100644 index 663d417..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/Protocol/PIRoomPhotoAlbumItemProtocol.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// PIRoomPhotoAlbumItemProtocol.h -// YuMi -// -// Created by duoban on 2023/10/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol PIRoomPhotoAlbumItemProtocol -///获取已上传图片 --(void)getRoomAlbumListSuccessWithList:(NSArray *)list; -///获取已上传图片失败 --(void)getRoomAlbumListFailWithCode:(NSInteger )code; -///上传房间图片成功 --(void)uploadRoomAlbumListSuccess; -///上传房间图片失败 --(void)uploadRoomAlbumListFail; -///删除房间图片成功 --(void)deleteRoomAlbumPhotoSuccessWithPhotoId:(NSString *)photoId; -///发送图片成功 --(void)sendRoomAlbumPhotoSuccess; -///发送图片失败 --(void)sendRoomAlbumPhotoFail; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChooseGiftCell.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChooseGiftCell.h deleted file mode 100644 index 61b22ad..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChooseGiftCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// PIRoomPhotoAlbumChooseGiftCell.h -// YuMi -// -// Created by duoban on 2023/10/12. -// - -#import -#import "GiftInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumChooseGiftCell : UICollectionViewCell -@property(nonatomic,strong) GiftInfoModel *giftModel; -@property(nonatomic,assign) BOOL pi_isChoose; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChooseGiftCell.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChooseGiftCell.m deleted file mode 100644 index 4ceae53..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChooseGiftCell.m +++ /dev/null @@ -1,103 +0,0 @@ -// -// PIRoomPhotoAlbumChooseGiftCell.m -// YuMi -// -// Created by duoban on 2023/10/12. -// - -#import "PIRoomPhotoAlbumChooseGiftCell.h" -@interface PIRoomPhotoAlbumChooseGiftCell() -@property(nonatomic,strong) NetImageView *giftView; -@property(nonatomic,strong) UILabel *giftNameVeiw; -@property(nonatomic,strong) UILabel *giftNumView; -@end -@implementation PIRoomPhotoAlbumChooseGiftCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.contentView.layer.cornerRadius = kGetScaleWidth(8); - self.contentView.layer.masksToBounds = YES; - self.contentView.layer.borderColor = UIColorFromRGB(0x9168FA).CGColor; - self.contentView.layer.borderWidth = 0; - [self.contentView addSubview:self.giftView]; - [self.contentView addSubview:self.giftNameVeiw]; - [self.contentView addSubview:self.giftNumView]; - -} --(void)installConstraints{ - [self.giftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(60)); - make.top.mas_equalTo(kGetScaleWidth(8)); - make.centerX.equalTo(self.contentView); - }]; - [self.giftNameVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.giftView.mas_bottom).mas_offset(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(20)); - make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(5)); - }]; - [self.giftNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.giftNameVeiw.mas_bottom).mas_offset(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(20)); - make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(5)); - }]; - -} -- (void)setPi_isChoose:(BOOL)pi_isChoose{ - _pi_isChoose = pi_isChoose; - self.contentView.layer.borderWidth = _pi_isChoose == YES ? 1 : 0; -} -- (void)setGiftModel:(GiftInfoModel *)giftModel{ - _giftModel = giftModel; - _giftView.imageUrl = _giftModel.giftUrl; - _giftNameVeiw.text = _giftModel.giftName; - NSMutableAttributedString *numText = [[NSMutableAttributedString alloc]initWithString:@(_giftModel.goldPrice).stringValue attributes:@{NSFontAttributeName:kFontRegular(14),NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)}]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"moli_money_icon"];; - attachment.bounds = CGRectMake(0, roundf(_giftNumView.font.capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height); - - attachment.image =iconImage; - NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; - [numText insertAttributedString:starAttribute atIndex:0]; - _giftNumView.attributedText = numText; -} -#pragma mark - 懒加载 -- (NetImageView *)giftView{ - if(!_giftView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _giftView = [[NetImageView alloc]initWithConfig:config]; - _giftView.layer.cornerRadius = kGetScaleWidth(8); - _giftView.layer.masksToBounds = YES; - } - return _giftView; -} -- (UILabel *)giftNameVeiw{ - if(!_giftNameVeiw){ - _giftNameVeiw = [UILabel labelInitWithText:@"" font:kFontRegular(14) textColor:UIColorFromRGB(0x1F1B4F)]; - _giftNameVeiw.textAlignment = NSTextAlignmentCenter; - } - return _giftNameVeiw; -} -- (UILabel *)giftNumView{ - if(!_giftNumView){ - _giftNumView = [UILabel labelInitWithText:@"0" font:kFontRegular(14) textColor:UIColorFromRGB(0x1F1B4F)];; - _giftNumView.textAlignment = NSTextAlignmentCenter; - NSMutableAttributedString *numText = [[NSMutableAttributedString alloc]initWithString:@"0" attributes:@{NSFontAttributeName:kFontRegular(14),NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)}]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"moli_money_icon"];; - attachment.bounds = CGRectMake(0, roundf(_giftNumView.font.capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height); - - attachment.image =iconImage; - NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; - [numText insertAttributedString:starAttribute atIndex:0]; - _giftNumView.attributedText = numText; - } - return _giftNumView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChoosePhotoCell.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChoosePhotoCell.h deleted file mode 100644 index 631b63e..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChoosePhotoCell.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// PIRoomPhotoAlbumChoosePhotoCell.h -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import -#import "PIRoomPhotoAlbumItemChoosePhotoModel.h" - - -@protocol PIRoomPhotoAlbumChoosePhotoCellDelegate - --(void)delPhotoHandleWtihModel:(PIRoomPhotoAlbumItemChoosePhotoModel *_Nonnull)chooseModel; - -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumChoosePhotoCell : UICollectionViewCell -@property(nonatomic,strong) PIRoomPhotoAlbumItemChoosePhotoModel *chooseModel; -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChoosePhotoCell.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChoosePhotoCell.m deleted file mode 100644 index 5d82b15..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChoosePhotoCell.m +++ /dev/null @@ -1,106 +0,0 @@ -// -// PIRoomPhotoAlbumChoosePhotoCell.m -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import "PIRoomPhotoAlbumChoosePhotoCell.h" -@interface PIRoomPhotoAlbumChoosePhotoCell() -///选择的图片 -@property(nonatomic,strong) UIImageView *bgImageView; -///标题提示 -@property(nonatomic,strong) UILabel *titleView; -///icon -@property(nonatomic,strong) UIImageView *pi_iconView; -///删除 -@property(nonatomic,strong) UIButton *pi_delBtn; -@end -@implementation PIRoomPhotoAlbumChoosePhotoCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self.contentView addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.pi_delBtn]; - [self.bgImageView addSubview:self.pi_iconView]; - [self.bgImageView addSubview:self.titleView]; -} --(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; - [self.pi_delBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(14)); - make.top.mas_equalTo(kGetScaleWidth(4)); - make.trailing.mas_equalTo(-kGetScaleWidth(6)); - }]; - [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(54)); - make.height.mas_equalTo(kGetScaleWidth(47)); - make.centerX.equalTo(self.bgImageView); - make.top.mas_equalTo(kGetScaleWidth(17)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - - make.leading.trailing.equalTo(self.bgImageView).inset(1); - make.top.mas_equalTo(kGetScaleWidth(68)); - - }]; -} -- (void)setChooseModel:(PIRoomPhotoAlbumItemChoosePhotoModel *)chooseModel{ - _chooseModel = chooseModel; - _pi_iconView.hidden = !_chooseModel.isDefault; - _titleView.hidden = !_chooseModel.isDefault; - _pi_delBtn.hidden = _chooseModel.isDefault; - _bgImageView.image = _chooseModel.isDefault == YES ? kImage(@"pi_room_photo_album_choose_photo_bg") : _chooseModel.chooseImage; - -} --(void)delPhotoAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(delPhotoHandleWtihModel:)]){ - [self.delegate delPhotoHandleWtihModel:self.chooseModel]; - } -} -#pragma mark - 懒加载 -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = kImage(@"pi_room_photo_album_choose_photo_bg"); - _bgImageView.userInteractionEnabled = YES; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - _bgImageView.layer.cornerRadius = kGetScaleWidth(8); - _bgImageView.layer.masksToBounds = YES; - - } - return _bgImageView; -} -- (UIImageView *)pi_iconView{ - if(!_pi_iconView){ - _pi_iconView = [UIImageView new]; - _pi_iconView.image = kImage(@"pi_room_photo_album_choose_photo_icon"); - } - return _pi_iconView; -} -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"PIRoomPhotoAlbumChoosePhotoCell0") font:kFontRegular(10) textColor:UIColorFromRGB(0xB3B3C3)]; - _titleView.textAlignment = NSTextAlignmentCenter; - _titleView.numberOfLines = 2; - } - return _titleView; -} -- (UIButton *)pi_delBtn{ - if(!_pi_delBtn){ - _pi_delBtn = [UIButton new]; - [_pi_delBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_pi_delBtn setImage:kImage(@"pi_room_photo_album_choose_photo_del_photo") forState:UIControlStateNormal]; - [_pi_delBtn addTarget:self action:@selector(delPhotoAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _pi_delBtn; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumItemCell.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumItemCell.h deleted file mode 100644 index fce7139..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumItemCell.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// PIRoomPhotoAlbumItemCell.h -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import -#import "PIRoomPhotoAlbumItemModel.h" -#import "PIRoomPhotoAlbumItemVC.h" -@class PIRoomPhotoAlbumItemCell; -@protocol PIRoomPhotoAlbumItemCellDelegate - --(void)pIRoomPhotoAlbumItemCell:(PIRoomPhotoAlbumItemCell *_Nonnull)cell clickMornWithModel:(PIRoomPhotoAlbumItemModel *_Nonnull )model; - -@end - - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumItemCell : UICollectionViewCell -@property(nonatomic,weak) iddelegate; -@property(nonatomic,strong) PIRoomPhotoAlbumItemModel *albumModel; -@property(nonatomic,assign) PIRoomPhotoAlbumItemVCType roomType; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumItemCell.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumItemCell.m deleted file mode 100644 index 1ba7ce7..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumItemCell.m +++ /dev/null @@ -1,190 +0,0 @@ -// -// PIRoomPhotoAlbumItemCell.m -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import "PIRoomPhotoAlbumItemCell.h" -@interface PIRoomPhotoAlbumItemCell() -///操作 -@property(nonatomic,strong) UIButton *operateBtn; -///背景图片 -@property(nonatomic,strong) NetImageView *bgImageView; -///底部遮影 -@property(nonatomic,strong) UIView *coverView; -///礼物 -@property(nonatomic,strong) NetImageView *giftView; - -///钻石icon -@property(nonatomic,strong) UIImageView *diamondView; -///钻石数量 -@property(nonatomic,strong) UILabel *pi_priceView; -///锁 -@property(nonatomic,strong) UIImageView *lockView; -@end -@implementation PIRoomPhotoAlbumItemCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self.contentView addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.operateBtn]; - [self.bgImageView addSubview:self.coverView]; - [self.bgImageView addSubview:self.lockView]; - - [self.coverView addSubview:self.giftView]; - [self.coverView addSubview:self.diamondView]; - [self.coverView addSubview:self.pi_priceView]; -} --(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; - [self.operateBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(28)); - make.height.mas_equalTo(kGetScaleWidth(18)); - make.top.trailing.equalTo(self.bgImageView); - }]; - [self.coverView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.bottom.trailing.equalTo(self.bgImageView); - make.height.mas_equalTo(kGetScaleWidth(32)); - }]; - [self.giftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(24)); - make.leading.mas_equalTo(kGetScaleWidth(8)); - make.centerY.equalTo(self.coverView); - }]; - - [self.diamondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(16)); - make.centerY.equalTo(self.coverView); - make.leading.mas_equalTo(kGetScaleWidth(38)); - }]; - [self.pi_priceView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(55)); - make.centerY.equalTo(self.coverView); - make.trailing.mas_equalTo(-kGetScaleWidth(8)); - }]; - [self.lockView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(36)); - make.centerX.equalTo(self.contentView); - make.top.mas_equalTo(kGetScaleWidth(54)); - }]; -} --(void)setAlbumModel:(PIRoomPhotoAlbumItemModel *)albumModel{ - _albumModel = albumModel; - @kWeakify(self); - self.coverView.hidden = _albumModel.type.intValue == 1; - self.operateBtn.hidden = !([_albumModel.uid isEqualToString:[AccountInfoStorage instance].getUid] && self.roomType == Photo_Album_Type_Mine); - if(_albumModel.type.intValue == 2){ - _pi_priceView.text = _albumModel.totalGoldPrice; - _lockView.hidden = _albumModel.status == 1; - _giftView.imageUrl = _albumModel.giftUrl; - - if(_albumModel.status == 0){ - - [self.bgImageView loadImageWithUrl:_albumModel.photoUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - // UI更新代码 - self.bgImageView.image = [UIImage setBlurImage:image value:30]; - }); - }]; - }else{ - self.bgImageView.image = nil; - [self.bgImageView loadImageWithUrl:_albumModel.photoUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - self.bgImageView.image = image; - }]; - - } - }else{ - _lockView.hidden = YES; - _pi_priceView.text = _albumModel.totalGoldPrice; - self.bgImageView.image = nil; - [self.bgImageView loadImageWithUrl:_albumModel.photoUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - self.bgImageView.image = image; - }]; - _giftView.image = nil; - } - -} - --(void)operateAction{ - if(self.delegate && [self.delegate respondsToSelector:@selector(pIRoomPhotoAlbumItemCell:clickMornWithModel:)]){ - [self.delegate pIRoomPhotoAlbumItemCell:self clickMornWithModel:self.albumModel]; - } -} -#pragma mark - 懒加载 -- (NetImageView *)bgImageView{ - if(!_bgImageView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _bgImageView = [[NetImageView alloc]initWithConfig:config]; - _bgImageView.userInteractionEnabled = YES; - [_bgImageView setCornerWithLeftTopCorner:kGetScaleWidth(10) rightTopCorner:kGetScaleWidth(10) bottomLeftCorner:kGetScaleWidth(10) bottomRightCorner:kGetScaleWidth(10) size:CGSizeMake(kGetScaleWidth(168), kGetScaleWidth(170))]; - _bgImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _bgImageView; -} -- (UIView *)coverView{ - if(!_coverView){ - _coverView = [UIView new]; - _coverView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6]; - [_coverView setCornerWithLeftTopCorner:0 rightTopCorner:kGetScaleWidth(8) bottomLeftCorner:kGetScaleWidth(8) bottomRightCorner:kGetScaleWidth(8) size:CGSizeMake(kGetScaleWidth(168), kGetScaleWidth(32))]; - } - return _coverView; -} - -- (NetImageView *)giftView{ - if(!_giftView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _giftView = [[NetImageView alloc]initWithConfig:config]; - _giftView.backgroundColor = UIColorFromRGB(0x001338); - _giftView.layer.cornerRadius = kGetScaleWidth(4); - _giftView.layer.masksToBounds = YES; - _giftView.layer.borderWidth = 0.5; - _giftView.layer.borderColor = UIColorFromRGB(0xD6D6D6).CGColor; - - } - return _giftView; -} - -- (UIImageView *)diamondView{ - if(!_diamondView){ - _diamondView = [UIImageView new]; - _diamondView.image = kImage(@"moli_money_icon"); - } - return _diamondView; -} -- (UIImageView *)lockView{ - if(!_lockView){ - _lockView = [UIImageView new]; - _lockView.image = kImage(@"pi_room_photo_album_lock"); - } - return _lockView; -} -- (UILabel *)pi_priceView{ - if(!_pi_priceView){ - _pi_priceView = [UILabel labelInitWithText:@"0" font:kFontRegular(14) textColor:[UIColor whiteColor]]; - } - return _pi_priceView; -} -- (UIButton *)operateBtn{ - if(!_operateBtn){ - _operateBtn = [UIButton new]; - [_operateBtn setBackgroundImage:kImage(@"pi_room_photo_album_operate") forState:UIControlStateNormal]; - [_operateBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_operateBtn addTarget:self action:@selector(operateAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _operateBtn; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumOperateCell.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumOperateCell.h deleted file mode 100644 index 8511cbd..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumOperateCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PIRoomPhotoAlbumOperateCell.h -// YuMi -// -// Created by duoban on 2023/10/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumOperateCell : UITableViewCell -@property(nonatomic,strong) NSString *title; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumOperateCell.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumOperateCell.m deleted file mode 100644 index a19da4d..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumOperateCell.m +++ /dev/null @@ -1,67 +0,0 @@ -// -// PIRoomPhotoAlbumOperateCell.m -// YuMi -// -// Created by duoban on 2023/10/13. -// - -#import "PIRoomPhotoAlbumOperateCell.h" -@interface PIRoomPhotoAlbumOperateCell() -@property(nonatomic,strong) UILabel *titleView; -@property(nonatomic,strong) UIView *lienView; - -@end -@implementation PIRoomPhotoAlbumOperateCell --(instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{ - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)setTitle:(NSString *)title{ - _title = title; - _titleView.text = _title; -} --(void)installUI{ - self.contentView.backgroundColor = [UIColor whiteColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.titleView]; - [self.contentView addSubview:self.lienView]; -} --(void)installConstraints{ - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.equalTo(self.contentView); - }]; - [self.lienView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.contentView); - make.height.mas_equalTo(1); - }]; -} -#pragma mark - 懒加载 -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:@"" font:kFontRegular(16) textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _titleView; -} -- (UIView *)lienView{ - if(!_lienView){ - _lienView = [UIView new]; - _lienView.backgroundColor = UIColorFromRGB(0xEBEEF5); - } - return _lienView; -} -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumItemVC.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumItemVC.h deleted file mode 100644 index 57493c6..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumItemVC.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// PIRoomPhotoAlbumItemVC.h -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import "MvpViewController.h" -#import - -typedef enum : NSUInteger { - Photo_Album_Type_Mine = 0,///我上传的照片 - Photo_Album_Type_Normal,///普通照片 - Photo_Album_Type_Unlock,///解锁照片 -} PIRoomPhotoAlbumItemVCType; - -@protocol PIRoomPhotoAlbumItemVCDelegate -///没权限返回 --(void)backWitNoPermissionAction; - -@end - - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumItemVC : MvpViewController -@property(nonatomic,weak) iddelegate; -- (instancetype)initWithType:(PIRoomPhotoAlbumItemVCType)type roomUid:(NSString *)roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumItemVC.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumItemVC.m deleted file mode 100644 index 0c7f819..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumItemVC.m +++ /dev/null @@ -1,486 +0,0 @@ -// -// PIRoomPhotoAlbumItemVC.m -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import "PIRoomPhotoAlbumItemVC.h" -#import "PIRoomPhotoAlbumItemCell.h" -#import "PIRoomPhotoAlbumChoosePhotoView.h" -#import "XPGuildEmptyCollectionViewCell.h" -#import "TZImagePickerController.h" -#import "UploadFile.h" -#import "Api+Mine.h" -#import "MonentsPicResInfo.h" -#import "PIRoomPhotoAlbumOperateView.h" -#import "PIRoomPhotoAlbumItemPresenter.h" -#import "PIRoomPhotoAlbumItemProtocol.h" -#import "SDPhotoBrowser.h" -@interface PIRoomPhotoAlbumItemVC () -@property(nonatomic,strong) UICollectionView *collectionView; -@property(nonatomic,strong) UILabel *sendImageBtn; -@property(nonatomic,strong) UIButton *sendImageView; -@property(nonatomic,strong) UIImageView *sendBgImageView; -@property(nonatomic,strong) NSMutableArray *photoList; -///数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///图片的源 -@property (nonatomic,strong) NSMutableArray *originAssets; -///图片的上传链接 -@property (nonatomic,strong) NSArray *uploadImageList; -///上传的个数 -@property (nonatomic,assign) int imageCount; -@property(nonatomic,assign) PIRoomPhotoAlbumItemVCType type; -@property(nonatomic,strong) NSString *roomUid; -@property(nonatomic,assign) NSInteger page; -@property(nonatomic,strong) PIRoomPhotoAlbumItemModel *lookUpModel; -@end - -@implementation PIRoomPhotoAlbumItemVC --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} -- (__kindof id)createPresenter { - return [[PIRoomPhotoAlbumItemPresenter alloc] init]; -} -- (instancetype)initWithType:(PIRoomPhotoAlbumItemVCType)type roomUid:(NSString *)roomUid{ - self = [super init]; - if(self){ - self.type = type; - self.roomUid = roomUid; - } - return self; -} -- (void)viewDidLoad { - [super viewDidLoad]; - - [self installUI]; - [self installConstraints]; - [self initHeaderAndFooterRrfresh]; -} --(void)headerRefresh{ - self.page = 1; - if(self.type == Photo_Album_Type_Mine){ - [self.presenter getRoomAlbumListWithroomUid:self.roomUid type:@"0" page:@(self.page).stringValue pageSize:@"20"]; - } else { - [self.presenter getRoomAlbumListWithroomUid:self.roomUid type:self.type == Photo_Album_Type_Normal ? @"1":@"2" page:@(self.page).stringValue pageSize:@"20"]; - } -} --(void)footerRefresh{ - self.page++; - if(self.type == Photo_Album_Type_Mine){ - [self.presenter getRoomAlbumListWithroomUid:self.roomUid type:@"0" page:@(self.page).stringValue pageSize:@"20"]; - } else { - [self.presenter getRoomAlbumListWithroomUid:self.roomUid type:self.type == Photo_Album_Type_Normal ? @"1":@"2" page:@(self.page).stringValue pageSize:@"20"]; - } -} -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.collectionView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.collectionView.mj_footer = footer; - - [self.collectionView.mj_header beginRefreshing]; - - [self headerRefresh]; -} --(void)installUI{ - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(headerRefresh) name:@"kPhotoAlbumRefreshData" object:nil]; - [self.view addSubview:self.collectionView]; - [self.view addSubview:self.sendBgImageView]; - [self.view addSubview:self.sendImageView]; - [self.sendImageView addSubview:self.sendImageBtn]; -} --(void)installConstraints{ - self.collectionView.contentInset = UIEdgeInsetsMake(0, 0, kGetScaleWidth(92), 0); - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); - }]; - [self.sendBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(120)); - make.bottom.leading.trailing.equalTo(self.view); - }]; - [self.sendImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(-kGetScaleWidth(21)); - make.width.mas_equalTo(kGetScaleWidth(323)); - make.height.mas_equalTo(kGetScaleWidth(94)); - make.centerX.equalTo(self.view); - }]; - [self.sendImageBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(36)); - make.centerX.equalTo(self.sendImageView); - make.height.mas_equalTo(kGetScaleWidth(22)); - }]; -} -#pragma mark- PIRoomPhotoAlbumItemProtocol -///获取已上传图片 --(void)getRoomAlbumListSuccessWithList:(NSArray *)list{ - if(self.page == 1){ - [self.photoList removeAllObjects]; - } - [self.collectionView.mj_header endRefreshing]; - [self.collectionView.mj_footer endRefreshing]; - if(list.count > 0){ - [self.photoList addObjectsFromArray:list]; - [self.collectionView reloadData]; - } -} -///获取已上传图片失败 --(void)getRoomAlbumListFailWithCode:(NSInteger )code{ - if(code == 1900){ - if(self.delegate && [self.delegate respondsToSelector:@selector(backWitNoPermissionAction)]){ - [self.delegate backWitNoPermissionAction]; - } - } - [self.collectionView.mj_header endRefreshing]; - [self.collectionView.mj_footer endRefreshing]; -} -///上传房间图片成功 --(void)uploadRoomAlbumListSuccess{ - [XNDJTDDLoadingTool hideOnlyView:kWindow]; - [self headerRefresh]; - [self showSuccessToast:YMLocalizedString(@"PIRoomPhotoAlbumItemVC3")]; - PIRoomPhotoAlbumChoosePhotoView *photoView = [kWindow viewWithTag:1000001]; - [photoView dissViewAction]; - [[NSNotificationCenter defaultCenter]postNotificationName:@"kPhotoAlbumRefreshData" object:nil]; -} -///上传房间图片失败 --(void)uploadRoomAlbumListFail{ - [XNDJTDDLoadingTool hideOnlyView:kWindow]; -} -///删除房间图片成功 --(void)deleteRoomAlbumPhotoSuccessWithPhotoId:(NSString *)photoId{ - NSInteger index = 0; - for (int i = 0; i < self.photoList.count; i++) { - PIRoomPhotoAlbumItemModel *model = self.photoList[i]; - if([model.ID isEqualToString:photoId]){ - index = i; - break; - } - } - if(self.photoList.count > 0){ - [self.photoList xpSafeRemoveObjectAtIndex:index]; - [self.collectionView reloadData]; - } -} -///发送图片成功 --(void)sendRoomAlbumPhotoSuccess{ - [XNDJTDDLoadingTool hideOnlyView:kWindow]; - [self showSuccessToast:YMLocalizedString(@"XPSessionFindNewGreetListView0")]; -} -///发送图片失败 --(void)sendRoomAlbumPhotoFail{ - [XNDJTDDLoadingTool hideOnlyView:kWindow]; -} -#pragma mark -UICollectionViewDelegate,UICollectionViewDataSource -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{ - if(self.photoList.count == 0)return self.collectionView.frame.size; - return CGSizeMake(kGetScaleWidth(168), kGetScaleWidth(170));; -} --(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ - return self.photoList.count == 0 ? 1 : self.photoList.count; -} --(__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - if(self.photoList.count == 0){ - XPGuildEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class]) forIndexPath:indexPath]; - [cell setConstraints]; - [cell setTitle:YMLocalizedString(@"XPGuildEmptyCollectionViewCell0")]; - return cell; - } - PIRoomPhotoAlbumItemCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([PIRoomPhotoAlbumItemCell class]) forIndexPath:indexPath]; - cell.roomType = self.type; - cell.albumModel = [self.photoList xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; -} -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - if (self.type != Photo_Album_Type_Mine) { - PIRoomPhotoAlbumItemModel *albumModel = [self.photoList xpSafeObjectAtIndex:indexPath.row]; - if(albumModel.type.intValue == 2 && albumModel.status == 0)return; - PIRoomPhotoAlbumItemCell *cell = (PIRoomPhotoAlbumItemCell *)[self.collectionView cellForItemAtIndexPath:indexPath]; - self.lookUpModel = albumModel; - SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init]; - browser.sourceImagesContainerView = cell; - browser.delegate = self; - browser.imageCount = 1; - browser.currentImageIndex = 0; - browser.isMe = NO; - [browser show]; - } -} -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self.view; -} --(void)sendImageAction{ - PIRoomPhotoAlbumChoosePhotoView *photoView = [[PIRoomPhotoAlbumChoosePhotoView alloc]initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)]; - photoView.roomUid = self.roomUid; - photoView.delegate = self; - photoView.tag = 1000001; - [kWindow addSubview:photoView]; - [UIView animateWithDuration:0.2 animations:^{ - photoView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - } completion:^(BOOL finished) { - photoView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4]; - }]; -} -#pragma mark- PIRoomPhotoAlbumChoosePhotoViewDelegate -///选择相册图片 --(void)clickChoosePictures{ - TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self]; - imagePickerVc.modalPresentationStyle = UIModalPresentationOverFullScreen; - imagePickerVc.allowPickingVideo = NO; - imagePickerVc.allowTakeVideo = NO; - imagePickerVc.maxImagesCount = 6; - imagePickerVc.naviBgColor = [DJDKMIMOMColor appCellBackgroundColor]; - imagePickerVc.naviTitleColor = [DJDKMIMOMColor mainTextColor]; - imagePickerVc.barItemTextColor = [DJDKMIMOMColor mainTextColor]; - imagePickerVc.selectedAssets = self.originAssets; - [self presentViewController:imagePickerVc animated:YES completion:nil]; -} -///删除图片 --(void)delPhotoWidthIndex:(NSInteger)index{ - [self.datasource xpSafeRemoveObjectAtIndex:index]; - [self.originAssets xpSafeRemoveObjectAtIndex:index]; -} -///返回，需要清空图片 --(void)cleanPhotoList{ - [self.datasource removeAllObjects]; - [self.originAssets removeAllObjects]; -} -///确认上传图片 -- (void)clickUploadPictures:(NSArray *)picList giftModel:(GiftInfoModel * _Nullable)giftModel{ - if(self.datasource.count == 0){ - [self showErrorToast:YMLocalizedString(@"PIRoomPhotoAlbumItemVC2")]; - return; - } - - self.imageCount = 0; - [XNDJTDDLoadingTool showOnlyView:kWindow enabled:YES]; - @kWeakify(self); - [self uploadAlbumPicList:self.datasource finish:^(NSArray *list) { - @kStrongify(self); - if(list.count == 0){ - [XNDJTDDLoadingTool hideOnlyView:kWindow]; - [self showErrorToast:YMLocalizedString(@"PIRoomPhotoAlbumItemVC1")]; - return; - } - - NSMutableArray *photoUrls = @[].mutableCopy; - for (NSDictionary *dic in list) { - NSString *url = [dic objectForKey:@"resUrl"]; - if (url && url.length > 0) { - [photoUrls addObject:dic[@"resUrl"]]; - } - } - - if(giftModel){ - [self.presenter uploadRoomAlbumListWithGiftId:@(giftModel.giftId).stringValue - photoUrls:photoUrls - roomUid:self.roomUid - type:@"2"]; - } else { - [self.presenter uploadRoomAlbumListWithGiftId:nil - photoUrls:photoUrls - roomUid:self.roomUid - type: @"1"]; - } - }]; -} -///上传图片 -- (void)uploadAlbumPicList:(NSArray *)array finish:(void(^)(NSArray *list))finish { - - @kWeakify(self); - dispatch_semaphore_t semaphore = dispatch_semaphore_create(1); - dispatch_queue_t queue = dispatch_get_global_queue(0, 0); - NSMutableArray * dataArray = [NSMutableArray array]; - dispatch_async(queue, ^{ - for (UIImage * image in array) { - dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); - NSData *data = UIImageJPEGRepresentation(image, 0.5); - NSString *format = [UIImage getImageTypeWithImageData:data]; - NSString *name = [NSString stringWithFormat:@"image/%@.%@",[NSString createUUID],format]; - [[UploadFile share]QCloudUploadImage:data named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) { - @kStrongify(self); - dispatch_semaphore_signal(semaphore); - self.imageCount ++; - NSMutableDictionary *dict = [NSMutableDictionary dictionary]; - if (image.size.width > 0){ - [dict safeSetObject:@(image.size.width) forKey:@"width"]; - } - if (image.size.height){ - [dict safeSetObject:@(image.size.height) forKey:@"height"]; - } - if (key.length > 0) { - [dict safeSetObject:key forKey:@"resUrl"]; - } - [dict safeSetObject:format forKey:@"format"]; - [dataArray addObject:dict]; - if (self.imageCount == array.count) { - dispatch_async(dispatch_get_main_queue(), ^{ - finish(dataArray); - }); - } - } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) { - @kStrongify(self); - self.imageCount ++; - dispatch_semaphore_signal(semaphore); - }]; - } - }); -} - - -#pragma mark - TZImagePickerControllerDelegate -- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray *)infos { - [self.datasource removeAllObjects]; - [self.originAssets removeAllObjects]; - [self.datasource addObjectsFromArray:photos]; - [self.originAssets addObjectsFromArray:assets]; - PIRoomPhotoAlbumChoosePhotoView *photoView = [kWindow viewWithTag:1000001]; - if(photoView != nil){ - photoView.picList = self.datasource; - } - -} -#pragma mark- PIRoomPhotoAlbumItemCellDelegate --(void)pIRoomPhotoAlbumItemCell:(PIRoomPhotoAlbumItemCell *_Nonnull)cell clickMornWithModel:(PIRoomPhotoAlbumItemModel *_Nonnull )model -{ - PIRoomPhotoAlbumOperateView *operateView = [[PIRoomPhotoAlbumOperateView alloc]initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)]; - operateView.albumModel = model; - operateView.delegate = self; - [kWindow addSubview:operateView]; - [UIView animateWithDuration:0.2 animations:^{ - operateView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - }completion:^(BOOL finished) { - operateView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4]; - }]; -} -#pragma mark- PIRoomPhotoAlbumOperateViewDelegate -- (void)clickOperateIncidentWithType:(PIRoomPhotoAlbumOperateType)type albumModel:(PIRoomPhotoAlbumItemModel *)albumModel{ - if(type == Photo_Album_Operate_Type_Send){ - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"XPIAPRechargeViewController7"); - config.message = YMLocalizedString(@"PIRoomPhotoAlbumItemVC5"); - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ - @kStrongify(self); - [XNDJTDDLoadingTool showOnlyView:kWindow enabled:YES]; - [self.presenter sendRoomAlbumPhotoWithId:albumModel.ID roomUid:self.roomUid]; - } cancelHandler:^{ - - }]; - - }else if(type == Photo_Album_Operate_Type_Delete){ - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"XPIAPRechargeViewController7"); - config.message = YMLocalizedString(@"PIRoomPhotoAlbumItemVC4"); - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ - @kStrongify(self); - [self.presenter deleteRoomAlbumPhotoWithId:albumModel.ID]; - } cancelHandler:^{ - - }]; - - }else{ - if(albumModel.type.intValue == 2 && ![albumModel.uid isEqualToString:[AccountInfoStorage instance].getUid] && albumModel.status == 0){ - return; - } - NSInteger row = [self.photoList indexOfObject:albumModel]; - PIRoomPhotoAlbumItemCell *cell = (PIRoomPhotoAlbumItemCell *)[self.collectionView cellForItemAtIndexPath:[NSIndexPath indexPathForRow:row inSection:0]]; - SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init]; - if(cell != nil){ - browser.sourceImagesContainerView = cell; - } - browser.delegate = self; - browser.imageCount = 1; - browser.currentImageIndex = 0; - browser.isMe = NO; - self.lookUpModel = albumModel; - [browser show]; - } -} -#pragma mark - SDPhotoBrowserDelegate -- (NSURL *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageURLForIndex:(NSInteger)index{ - if(self.lookUpModel != nil){ - return [[NSURL alloc]initWithString:self.lookUpModel.photoUrl]; - } - return nil; -} -- (UIImage *)photoBrowser:(SDPhotoBrowser *)browser placeholderImageForIndex:(NSInteger)index { - return [UIImageConstant defaultBannerPlaceholder]; -} -#pragma mark - 懒加载 -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - - layout.scrollDirection = UICollectionViewScrollDirectionVertical; - layout.minimumLineSpacing = kGetScaleWidth(12); - layout.minimumInteritemSpacing = kGetScaleWidth(12); - layout.sectionInset = UIEdgeInsetsMake(kGetScaleWidth(12), kGetScaleWidth(12), kGetScaleWidth(12), kGetScaleWidth(12)); - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.showsHorizontalScrollIndicator = NO; - if (@available(iOS 11.0, *)) { - _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - _collectionView.backgroundColor = [DJDKMIMOMColor colorWithHexString:@"#F4F4FA"]; - [_collectionView registerClass:[PIRoomPhotoAlbumItemCell class] forCellWithReuseIdentifier:NSStringFromClass([PIRoomPhotoAlbumItemCell class])]; - [_collectionView registerClass:[XPGuildEmptyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class])]; - } - return _collectionView; -} -- (UILabel *)sendImageBtn{ - if(!_sendImageBtn){ - _sendImageBtn = [UILabel labelInitWithText:YMLocalizedString(@"PIRoomPhotoAlbumItemVC0") font:kFontMedium(16) textColor:[UIColor whiteColor] ]; - } - return _sendImageBtn; -} -- (UIButton *)sendImageView{ - if(!_sendImageView){ - _sendImageView = [UIButton new]; - [_sendImageView setBackgroundImage:kImage(@"pi_room_photo_album_send_icon") forState:UIControlStateNormal]; - _sendImageView.yn_acceptEventInterval = 1; - [_sendImageView addTarget:self action:@selector(sendImageAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _sendImageView; -} -- (UIImageView *)sendBgImageView{ - if(!_sendBgImageView){ - _sendBgImageView = [UIImageView new]; - _sendBgImageView.image = kImage(@"pi_room_photo_album_send_bg"); - _sendBgImageView.userInteractionEnabled = YES; - } - return _sendBgImageView; -} -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -- (NSMutableArray *)originAssets { - if (!_originAssets) { - _originAssets = [NSMutableArray array]; - } - return _originAssets; -} -- (NSMutableArray *)photoList{ - if(!_photoList){ - _photoList = [NSMutableArray array]; - } - return _photoList; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.h deleted file mode 100644 index f212e8c..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PIRoomPhotoAlbumVC.h -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumVC : MvpViewController -@property(nonatomic,strong) NSString *roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.m deleted file mode 100644 index 69bfe2d..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.m +++ /dev/null @@ -1,107 +0,0 @@ -// -// PIRoomPhotoAlbumVC.m -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import "PIRoomPhotoAlbumVC.h" -#import -#import -#import -#import "PIRoomPhotoAlbumItemVC.h" -@interface PIRoomPhotoAlbumVC () -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *contentView; -@end - -@implementation PIRoomPhotoAlbumVC - -- (void)viewDidLoad { - [super viewDidLoad]; - [self installUI]; - [self installConstraints]; -} --(void)installUI{ - self.title = YMLocalizedString(@"PIRoomPhotoAlbumVC0"); - [self.view addSubview:self.titleView]; - [self.view addSubview:self.contentView]; -} --(void)installConstraints{ - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.view); - make.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(44)); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleView.mas_bottom); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; -} -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - UIViewController * list = (UIViewController *)[self.contentView.validListDict objectForKey:[NSNumber numberWithInteger:index]]; - if (list) { - return list; - } else { - PIRoomPhotoAlbumItemVC *vc = [[PIRoomPhotoAlbumItemVC alloc]initWithType:index roomUid:self.roomUid]; - vc.delegate = self; - return vc; - } -} -#pragma mark - PIRoomPhotoAlbumItemVCDelegate -- (void)backWitNoPermissionAction{ - [self.navigationController popViewControllerAnimated:YES]; -} -#pragma mark - 懒加载 -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = UIColorFromRGB(0x767585); - _titleView.titleSelectedColor = UIColorFromRGB(0x1F1B4F); - _titleView.titleFont =kFontSemibold(16); - _titleView.titleSelectedFont = kFontSemibold(16); - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.averageCellSpacingEnabled = NO; - _titleView.contentEdgeInsetLeft = kGetScaleWidth(32); - _titleView.contentEdgeInsetRight = kGetScaleWidth(32); - _titleView.cellWidth = kGetScaleWidth(66); - _titleView.cellSpacing = kGetScaleWidth(56); - - _titleView.defaultSelectedIndex = 0; - _titleView.listContainer = self.contentView; - - - JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(16), kGetScaleWidth(4)); - lineView.verticalMargin = 7; - lineView.indicatorImageView.image = [UIImage imageNamed:@"pi_room_photo_album_line"]; - _titleView.indicators = @[lineView]; - } - return _titleView; -} -- (NSArray *)titles{ - return @[YMLocalizedString(@"PIRoomPhotoAlbumVC1"),YMLocalizedString(@"PIRoomPhotoAlbumVC2"),YMLocalizedString(@"PIRoomPhotoAlbumVC3")]; -} -- (JXCategoryListContainerView *)contentView { - if (!_contentView) { - _contentView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _contentView.defaultSelectedIndex = 0; - } - return _contentView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChooseGiftView.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChooseGiftView.h deleted file mode 100644 index 371ae9e..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChooseGiftView.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// PIRoomPhotoAlbumChooseGiftView.h -// YuMi -// -// Created by duoban on 2023/10/12. -// - -#import -#import "GiftInfoModel.h" - - -@protocol PIRoomPhotoAlbumChooseGiftViewDelegate - --(void)chooseGiftWithModel:(GiftInfoModel *_Nonnull)giftModel; - -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumChooseGiftView : UIView -@property(nonatomic,copy) NSString *roomId; -@property(nonatomic,weak) iddelegate; -@property(nonatomic,strong) GiftInfoModel *giftInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChooseGiftView.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChooseGiftView.m deleted file mode 100644 index 3d318c3..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChooseGiftView.m +++ /dev/null @@ -1,184 +0,0 @@ -// -// PIRoomPhotoAlbumChooseGiftView.m -// YuMi -// -// Created by duoban on 2023/10/12. -// - -#import "PIRoomPhotoAlbumChooseGiftView.h" -#import "PIRoomPhotoAlbumChooseGiftCell.h" -#import "Api+Gift.h" - -#import "XPGuildEmptyCollectionViewCell.h" -@interface PIRoomPhotoAlbumChooseGiftView() -@property(nonatomic,strong) UIButton *pi_dissView; -@property(nonatomic,strong) UILabel *titleView; -@property(nonatomic,strong) UIButton *pi_backBtn; -@property(nonatomic,strong) UICollectionView *collectionView; -@property(nonatomic,strong) NSMutableArray *giftList; -@property(nonatomic,strong) UIView *bgView; -@property(nonatomic,assign) NSInteger chooseRow; -@end -@implementation PIRoomPhotoAlbumChooseGiftView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.backgroundColor = [UIColor clearColor]; - self.chooseRow = 0; - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.pi_dissView]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.titleView]; - [self.bgView addSubview:self.pi_backBtn]; - [self.bgView addSubview:self.collectionView]; -} - --(void)installConstraints{ - [self.pi_dissView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(420)); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(16)); - make.height.mas_equalTo(kGetScaleWidth(25)); - make.centerX.equalTo(self.bgView); - }]; - - [self.pi_backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(16)); - make.trailing.mas_equalTo(-kGetScaleWidth(16)); - make.centerY.equalTo(self.titleView); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.titleView.mas_bottom).mas_offset(kGetScaleWidth(0)); - make.leading.trailing.bottom.equalTo(self.bgView); - }]; -} - --(void)setRoomId:(NSString *)roomId{ - _roomId = roomId; - [self getGiftListData]; -} - --(void)getGiftListData{ - [Api requestNormalGiftList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if(code == 200){ - NSArray *normalGift = [GiftInfoModel modelsWithArray:data.data[@"normalGift"]]; // 普通面板礼物 - self.giftList = [NSMutableArray arrayWithArray:normalGift]; - if(self.giftInfo != nil){ - for (int i = 0; i < self.giftList.count; i++) { - GiftInfoModel *model = self.giftList[i]; - if(self.giftInfo.giftId == model.giftId){ - self.chooseRow = i; - break; - } - } - } - [self.collectionView reloadData]; - } - } roomUid:self.roomId]; -} - -#pragma mark -UICollectionViewDelegate,UICollectionViewDataSource -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{ - if(self.giftList.count == 0)return self.collectionView.frame.size; - CGFloat width = (KScreenWidth - kGetScaleWidth(20))/4 - 2; - return CGSizeMake(width, kGetScaleWidth(108)); -} - --(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ - return self.giftList.count == 0 ? 1 : self.giftList.count; -} --(__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - if(self.giftList.count == 0){ - XPGuildEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class]) forIndexPath:indexPath]; - [cell setConstraints]; - [cell setTitle:YMLocalizedString(@"XPGuildEmptyCollectionViewCell0")]; - return cell; - } - PIRoomPhotoAlbumChooseGiftCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([PIRoomPhotoAlbumChooseGiftCell class]) forIndexPath:indexPath]; - cell.pi_isChoose = self.chooseRow == indexPath.row; - cell.giftModel = [self.giftList xpSafeObjectAtIndex:indexPath.row]; - return cell; -} -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - self.chooseRow = indexPath.row; - [self.collectionView reloadData]; - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseGiftWithModel:)]){ - [self.delegate chooseGiftWithModel: [self.giftList xpSafeObjectAtIndex:indexPath.row]]; - } - [self dissViewAction]; -} --(void)dissViewAction{ - - [UIView animateWithDuration:0.2 animations:^{ - self.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight); - } completion:^(BOOL finished) { - [self removeFromSuperview]; - }]; -} -#pragma mark - 懒加载 -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"PIRoomPhotoAlbumChooseGiftView0") font:kFontMedium(18) textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _titleView; -} -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - layout.scrollDirection = UICollectionViewScrollDirectionVertical; - layout.minimumLineSpacing = kGetScaleWidth(20); - layout.minimumInteritemSpacing = kGetScaleWidth(0); - layout.sectionInset = UIEdgeInsetsMake(kGetScaleWidth(20),kGetScaleWidth(10), kGetScaleWidth(20), kGetScaleWidth(10)); - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.showsHorizontalScrollIndicator = NO; - if (@available(iOS 11.0, *)) { - _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - _collectionView.showsVerticalScrollIndicator = NO; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[PIRoomPhotoAlbumChooseGiftCell class] forCellWithReuseIdentifier:NSStringFromClass([PIRoomPhotoAlbumChooseGiftCell class])]; - [_collectionView registerClass:[XPGuildEmptyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGuildEmptyCollectionViewCell class])]; - } - return _collectionView; -} -- (UIButton *)pi_backBtn{ - if(!_pi_backBtn){ - _pi_backBtn = [UIButton new]; - [_pi_backBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_pi_backBtn setImage:kImage(@"pi_room_photo_album_choose_photo_back") forState:UIControlStateNormal]; - [_pi_backBtn addTarget:self action:@selector(dissViewAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _pi_backBtn; -} -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(16) rightTopCorner:kGetScaleWidth(16) bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth, kGetScaleWidth(420))]; - } - return _bgView; -} -- (UIButton *)pi_dissView{ - if(!_pi_dissView){ - _pi_dissView = [UIButton new]; - [_pi_dissView addTarget:self action:@selector(dissViewAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _pi_dissView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoGiftView.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoGiftView.h deleted file mode 100644 index 3594c18..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoGiftView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// PIRoomPhotoAlbumChoosePhotoGiftView.h -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import -#import "GiftInfoModel.h" -typedef enum : NSUInteger { - Photo_Type_Normal,///普通照片 - Photo_Type_Unlock,///解锁照片 - Photo_Type_Choose_Gift,///解锁照片-已选礼物 - Photo_Type_No_Choose_Gift,///解锁照片-没选礼物 -} PIRoomPhotoAlbumChoosePhotoGiftViewType; - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumChoosePhotoGiftView : UIView -@property(nonatomic,assign) PIRoomPhotoAlbumChoosePhotoGiftViewType photoType; -@property(nonatomic,assign) PIRoomPhotoAlbumChoosePhotoGiftViewType chooseGiftType; -@property(nonatomic,strong) GiftInfoModel *giftModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoGiftView.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoGiftView.m deleted file mode 100644 index 83c074c..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoGiftView.m +++ /dev/null @@ -1,160 +0,0 @@ -// -// PIRoomPhotoAlbumChoosePhotoGiftView.m -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import "PIRoomPhotoAlbumChoosePhotoGiftView.h" -@interface PIRoomPhotoAlbumChoosePhotoGiftView() -//箭头 -@property(nonatomic,strong) UIImageView *arrowView; -///标题 -@property(nonatomic,strong) UILabel *titleView; -///提示 -@property(nonatomic,strong) UILabel *tipsView; -///礼物 -@property(nonatomic,strong) NetImageView *giftView; -///礼物名称 -@property(nonatomic,strong) UILabel *giftNameView; -///钻石icon -@property(nonatomic,strong) UIImageView *diamondView; -///钻石数量 -@property(nonatomic,strong) UILabel *pi_priceView; -@end -@implementation PIRoomPhotoAlbumChoosePhotoGiftView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.layer.cornerRadius = kGetScaleWidth(6); - self.backgroundColor = UIColorFromRGB(0xF5F6FA); - self.layer.masksToBounds = YES; - [self addSubview:self.titleView]; - [self addSubview:self.tipsView]; - [self addSubview:self.arrowView]; - [self addSubview:self.giftView]; - [self addSubview:self.giftNameView]; - [self addSubview:self.diamondView]; - [self addSubview:self.pi_priceView]; - - - -} --(void)installConstraints{ - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(20)); - make.width.mas_equalTo(kGetScaleWidth(100)); - make.centerY.equalTo(self); - }]; - [self.arrowView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(14)); - make.centerY.equalTo(self); - make.trailing.mas_equalTo(-kGetScaleWidth(16)); - }]; - [self.tipsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.arrowView.mas_leading).mas_offset(-kGetScaleWidth(6)); - make.leading.equalTo(self.titleView.mas_trailing).mas_offset(kGetScaleWidth(5)); - make.centerY.equalTo(self); - }]; - [self.pi_priceView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.arrowView.mas_leading).mas_offset(-kGetScaleWidth(6)); - make.centerY.equalTo(self); - }]; - [self.diamondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(16)); - make.trailing.equalTo(self.pi_priceView.mas_leading).mas_offset(-kGetScaleWidth(1)); - make.centerY.equalTo(self); - }]; - [self.giftNameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.diamondView.mas_leading).mas_offset(-kGetScaleWidth(12)); - make.centerY.equalTo(self); - }]; - [self.giftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(24)); - make.trailing.equalTo(self.giftNameView.mas_leading).mas_offset(-kGetScaleWidth(4)); - make.centerY.equalTo(self); - }]; -} -- (void)setPhotoType:(PIRoomPhotoAlbumChoosePhotoGiftViewType)photoType{ - _photoType = photoType; - _tipsView.text = _photoType == Photo_Type_Normal ? YMLocalizedString(@"PIRoomPhotoAlbumChoosePhotoGiftView1"):YMLocalizedString(@"PIRoomPhotoAlbumChoosePhotoGiftView2"); - _titleView.textColor =_photoType == Photo_Type_Normal ? UIColorFromRGB(0xB3B3C3) : UIColorFromRGB(0x1F1B4F); - _titleView.font =_photoType == Photo_Type_Normal ? kFontRegular(14) : kFontMedium(14); -} -- (void)setChooseGiftType:(PIRoomPhotoAlbumChoosePhotoGiftViewType)chooseGiftType{ - _chooseGiftType = chooseGiftType; - _tipsView.hidden = _chooseGiftType == Photo_Type_Choose_Gift; - _giftView.hidden = _chooseGiftType != Photo_Type_Choose_Gift; - _giftNameView.hidden = _chooseGiftType != Photo_Type_Choose_Gift; - _diamondView.hidden = _chooseGiftType != Photo_Type_Choose_Gift; - _pi_priceView.hidden = _chooseGiftType != Photo_Type_Choose_Gift; -} --(void)setGiftModel:(GiftInfoModel *)giftModel{ - _giftModel = giftModel; - _giftView.imageUrl = _giftModel.giftUrl; - _giftNameView.text = _giftModel.giftName; - _pi_priceView.text = @(_giftModel.goldPrice).stringValue; - -} -#pragma mark - 懒加载 -- (UILabel *)titleView{ - if(!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"PIRoomPhotoAlbumChoosePhotoGiftView0") font:kFontRegular(14) textColor:UIColorFromRGB(0xB3B3C3)]; - } - return _titleView; -} -- (UIImageView *)arrowView{ - if(!_arrowView){ - _arrowView = [UIImageView new]; - _arrowView.image = [kImage(@"mine_info_tag_arrow")ms_SetImageForRTL]; - } - return _arrowView; -} -- (UILabel *)tipsView{ - if(!_tipsView){ - _tipsView = [UILabel labelInitWithText:@"" font:kFontRegular(14) textColor:UIColorFromRGB(0xB3B3C3)]; - _tipsView.numberOfLines = 2; - _tipsView.textAlignment = NSTextAlignmentRight; - } - return _tipsView; -} -- (NetImageView *)giftView{ - if(!_giftView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _giftView = [[NetImageView alloc]initWithConfig:config]; - _giftView.backgroundColor = UIColorFromRGB(0x001338); - _giftView.layer.cornerRadius = kGetScaleWidth(4); - _giftView.layer.masksToBounds = YES; - _giftView.layer.borderWidth = 1; - _giftView.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _giftView; -} -- (UIImageView *)diamondView{ - if(!_diamondView){ - _diamondView = [UIImageView new]; - _diamondView.image = kImage(@"moli_money_icon"); - } - return _diamondView; -} -- (UILabel *)giftNameView{ - if(!_giftNameView){ - _giftNameView = [UILabel labelInitWithText:@"" font:kFontRegular(14) textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _giftNameView; -} -- (UILabel *)pi_priceView{ - if(!_pi_priceView){ - _pi_priceView = [UILabel labelInitWithText:@"0" font:kFontRegular(14) textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _pi_priceView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoTypeView.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoTypeView.h deleted file mode 100644 index 962d420..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoTypeView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// PIRoomPhotoAlbumChoosePhotoTypeView.h -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import -#import "PIRoomPhotoAlbumChoosePhotoGiftView.h" - - - -@protocol PIRoomPhotoAlbumChoosePhotoTypeViewDelegate - --(void)clickPhotoType:(PIRoomPhotoAlbumChoosePhotoGiftViewType)type; - -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumChoosePhotoTypeView : UIView -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoTypeView.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoTypeView.m deleted file mode 100644 index 3c2f4b3..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoTypeView.m +++ /dev/null @@ -1,106 +0,0 @@ -// -// PIRoomPhotoAlbumChoosePhotoTypeView.m -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import "PIRoomPhotoAlbumChoosePhotoTypeView.h" -@interface PIRoomPhotoAlbumChoosePhotoTypeView() -@property(nonatomic,strong) UILabel *typeView; -@property(nonatomic,strong) UIButton *normalView; -@property(nonatomic,strong) UIButton *unlockView; -@end -@implementation PIRoomPhotoAlbumChoosePhotoTypeView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.layer.cornerRadius = kGetScaleWidth(6); - self.backgroundColor = UIColorFromRGB(0xF5F6FA); - self.layer.masksToBounds = YES; - [self addSubview:self.typeView]; - [self addSubview:self.normalView]; - [self addSubview:self.unlockView]; -} --(void)installConstraints{ - [self.typeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self); - make.leading.mas_equalTo(kGetScaleWidth(20)); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.unlockView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(16)); - make.width.mas_equalTo(kGetScaleWidth(80)); - make.height.mas_equalTo(kGetScaleWidth(32)); - make.centerY.equalTo(self); - }]; - [self.normalView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(80)); - make.height.mas_equalTo(kGetScaleWidth(32)); - make.centerY.equalTo(self); - make.trailing.equalTo(self.unlockView.mas_leading).mas_offset(-kGetScaleWidth(12)); - }]; -} --(void)clickPhotoTypeAction:(UIButton *)sender{ - self.normalView.selected = self.normalView == sender; - self.unlockView.selected = self.unlockView == sender; - if(self.delegate && [self.delegate respondsToSelector:@selector(clickPhotoType:)]){ - [self.delegate clickPhotoType:self.normalView == sender ? Photo_Type_Normal : Photo_Type_Unlock]; - } - -} -#pragma mark - 懒加载 -- (UILabel *)typeView{ - if(!_typeView){ - _typeView = [UILabel labelInitWithText:YMLocalizedString(@"PIRoomPhotoAlbumChoosePhotoTypeView0") font:kFontMedium(14) textColor:UIColorFromRGB(0x1F1B4F)]; - } - return _typeView; -} --(UIButton *)normalView{ - if(!_normalView){ - _normalView = [UIButton new]; - [_normalView setTitle:YMLocalizedString(@"PIRoomPhotoAlbumChoosePhotoTypeView1") forState:UIControlStateNormal]; - _normalView.selected = YES; - [_normalView setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - [_normalView setTitleColor:UIColorFromRGB(0x9168FA) forState:UIControlStateNormal]; - _normalView.titleLabel.font = kFontMedium(12); - UIImage *selectedImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x9168FA),UIColorFromRGB(0x9168FA),UIColorFromRGB(0x9168FA)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(80), kGetScaleWidth(21))]; - [_normalView setBackgroundImage:selectedImage forState:UIControlStateSelected]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xF5F6FA),UIColorFromRGB(0xF5F6FA),UIColorFromRGB(0xF5F6FA)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(80), kGetScaleWidth(21))]; - [_normalView setBackgroundImage:image forState:UIControlStateNormal]; - _normalView.layer.cornerRadius = kGetScaleWidth(6); - _normalView.layer.masksToBounds = YES; - _normalView.layer.borderWidth = 1; - _normalView.layer.borderColor = UIColorFromRGB(0x9168FA).CGColor; - [_normalView addTarget:self action:@selector(clickPhotoTypeAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _normalView; -} --(UIButton *)unlockView{ - if(!_unlockView){ - _unlockView = [UIButton new]; - [_unlockView setTitle:YMLocalizedString(@"PIRoomPhotoAlbumChoosePhotoTypeView2") forState:UIControlStateNormal]; - - [_unlockView setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - UIImage *selectedImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x9168FA),UIColorFromRGB(0x9168FA),UIColorFromRGB(0x9168FA)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(80), kGetScaleWidth(21))]; - [_unlockView setBackgroundImage:selectedImage forState:UIControlStateSelected]; - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xF5F6FA),UIColorFromRGB(0xF5F6FA),UIColorFromRGB(0xF5F6FA)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(80), kGetScaleWidth(21))]; - [_unlockView setBackgroundImage:image forState:UIControlStateNormal]; - _unlockView.layer.cornerRadius = kGetScaleWidth(6); - _unlockView.layer.masksToBounds = YES; - _unlockView.layer.borderWidth = 1; - _unlockView.layer.borderColor = UIColorFromRGB(0x9168FA).CGColor; - [_unlockView setTitleColor:UIColorFromRGB(0x9168FA) forState:UIControlStateNormal]; - _unlockView.titleLabel.font = kFontMedium(12); - [_unlockView addTarget:self action:@selector(clickPhotoTypeAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _unlockView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoView.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoView.h deleted file mode 100644 index cca437b..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoView.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// PIRoomPhotoAlbumChoosePhotoView.h -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import -#import "GiftInfoModel.h" -@protocol PIRoomPhotoAlbumChoosePhotoViewDelegate -///上传图片 --(void)clickUploadPictures:(NSArray *_Nullable)picList giftModel:(GiftInfoModel *_Nullable)giftModel; -///添加图片 --(void)clickChoosePictures; -///删除图片 --(void)delPhotoWidthIndex:(NSInteger)index; -///返回，需要清空图片 --(void)cleanPhotoList; -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumChoosePhotoView : UIView -@property(nonatomic,strong) NSString *roomUid; -@property(nonatomic,weak) iddelegate; -@property(nonatomic,copy) NSArray *picList; --(void)dissViewAction; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoView.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoView.m deleted file mode 100644 index 220df9a..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoView.m +++ /dev/null @@ -1,318 +0,0 @@ -// -// PIRoomPhotoAlbumChoosePhotoView.m -// YuMi -// -// Created by duoban on 2023/10/11. -// - -#import "PIRoomPhotoAlbumChoosePhotoView.h" -#import "PIRoomPhotoAlbumChoosePhotoCell.h" -#import "PIRoomPhotoAlbumItemChoosePhotoModel.h" -#import "PIRoomPhotoAlbumChoosePhotoTypeView.h" -#import "PIRoomPhotoAlbumChoosePhotoGiftView.h" -#import "PIRoomPhotoAlbumChooseGiftView.h" -#import "GiftInfoModel.h" -#import "SDPhotoBrowser.h" -#import "PIRoomPhotoAlbumChoosePhotoGiftView.h" -@interface PIRoomPhotoAlbumChoosePhotoView () -@property(nonatomic,strong) UIButton *pi_dissView; -@property(nonatomic,strong) UIView *bgView; -@property(nonatomic,strong) UICollectionView *collectionView; -@property(nonatomic,strong) NSMutableArray *choosePhotoList; -@property(nonatomic,strong) UIButton *pi_backBtn; -@property(nonatomic,strong) PIRoomPhotoAlbumChoosePhotoTypeView *photoTypeView; -@property(nonatomic,strong) PIRoomPhotoAlbumChoosePhotoGiftView *photoGiftView; -@property(nonatomic,strong) UIButton *sendPhotoView; -@property(nonatomic,strong) PIRoomPhotoAlbumItemChoosePhotoModel *defaultModel; -@property(nonatomic,assign) PIRoomPhotoAlbumChoosePhotoGiftViewType chooseType; -@end -@implementation PIRoomPhotoAlbumChoosePhotoView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.chooseType = Photo_Type_Normal; - [self.choosePhotoList addObject:self.defaultModel]; - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.pi_dissView]; - [self addSubview:self.bgView]; - [self.bgView addSubview:self.pi_backBtn]; - [self.bgView addSubview:self.collectionView]; - [self.bgView addSubview:self.photoTypeView]; - [self.bgView addSubview:self.photoGiftView]; - [self.bgView addSubview:self.sendPhotoView]; - -} --(void)installConstraints{ - [self.pi_dissView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(420)); - }]; - [self.pi_backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(16)); - make.trailing.mas_equalTo(-kGetScaleWidth(16)); - make.top.mas_equalTo(kGetScaleWidth(14)); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.bgView); - make.top.mas_equalTo(kGetScaleWidth(40)); - make.height.mas_equalTo(kGetScaleWidth(102)); - }]; - [self.photoTypeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(12)); - make.height.mas_equalTo(kGetScaleWidth(48)); - make.top.equalTo(self.collectionView.mas_bottom).mas_offset(kGetScaleWidth(32)); - }]; - [self.photoGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(12)); - make.height.mas_equalTo(kGetScaleWidth(48)); - make.top.equalTo(self.photoTypeView.mas_bottom).mas_offset(kGetScaleWidth(12)); - }]; - [self.sendPhotoView mas_makeConstraints:^(MASConstraintMaker *make) { - - make.width.mas_equalTo(kGetScaleWidth(303)); - make.height.mas_equalTo(kGetScaleWidth(48)); - make.top.equalTo(self.photoGiftView.mas_bottom).mas_offset(kGetScaleWidth(48)); - make.centerX.equalTo(self.bgView); - - }]; -} -#pragma mark -UICollectionViewDelegate,UICollectionViewDataSource --(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ - return self.choosePhotoList.count; -} --(__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - PIRoomPhotoAlbumChoosePhotoCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([PIRoomPhotoAlbumChoosePhotoCell class]) forIndexPath:indexPath]; - cell.chooseModel = [self.choosePhotoList xpSafeObjectAtIndex:indexPath.row]; - cell.delegate = self; - return cell; -} -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - PIRoomPhotoAlbumItemChoosePhotoModel *photoModel = [self.choosePhotoList xpSafeObjectAtIndex:indexPath.row]; - if(photoModel.isDefault == YES && self.delegate && [self.delegate respondsToSelector:@selector(clickChoosePictures)]){ - [self.delegate clickChoosePictures]; - return; - } - NSInteger count = self.picList.count; - SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init]; - browser.sourceImagesContainerView = self.collectionView; - browser.delegate = self; - browser.imageCount = count; - browser.currentImageIndex = indexPath.row; - browser.isMe = NO; - [browser show]; -} -#pragma mark - SDPhotoBrowserDelegate - - -- (UIImage *)photoBrowser:(SDPhotoBrowser *)browser placeholderImageForIndex:(NSInteger)index { - UIImage *image = [self.picList xpSafeObjectAtIndex:index]; - return image != nil ? image : [UIImageConstant defaultBannerPlaceholder]; -} --(void)clickUploadPicturesAction{ - if(self.chooseType == Photo_Type_Unlock){ - if(self.photoGiftView.giftModel == nil){ - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"PIRoomPhotoAlbumChoosePhotoView1")]; - return; - } - if(self.delegate && [self.delegate respondsToSelector:@selector(clickUploadPictures:giftModel:)]){ - [self.delegate clickUploadPictures:self.picList giftModel:self.photoGiftView.giftModel]; - return; - } - return; - } - if(self.delegate && [self.delegate respondsToSelector:@selector(clickUploadPictures:giftModel:)]){ - [self.delegate clickUploadPictures:self.picList giftModel:nil]; - return; - } -} -#pragma mark- PIRoomPhotoAlbumChoosePhotoCellDelegate --(void)delPhotoHandleWtihModel:(PIRoomPhotoAlbumItemChoosePhotoModel *)chooseModel{ - if(chooseModel.isDefault == YES)return; - NSInteger index = [self.picList indexOfObject:chooseModel.chooseImage]; - if([self.delegate respondsToSelector:@selector(delPhotoWidthIndex:)]){ - [self.delegate delPhotoWidthIndex:index]; - } - [self.choosePhotoList removeObject:chooseModel]; - if(self.choosePhotoList.count < 6 && ![self.choosePhotoList containsObject:self.defaultModel]){ - [self.choosePhotoList addObject:self.defaultModel]; - } - [self.collectionView reloadData]; - [self.collectionView.superview layoutIfNeeded]; - if(self.choosePhotoList.count > 3){ - // 获取位置 - UICollectionViewLayoutAttributes *layoutAttributes = [self.collectionView.collectionViewLayout layoutAttributesForItemAtIndexPath:[NSIndexPath indexPathForRow:self.choosePhotoList.count-3 inSection:0]]; - // 滑动 - CGPoint poiot = CGPointMake(layoutAttributes.frame.origin.x - kGetScaleWidth(10), layoutAttributes.frame.origin.y); - [self.collectionView setContentOffset:poiot animated:YES]; - } -} --(void)setPicList:(NSArray *)picList{ - _picList = picList; - [self.choosePhotoList removeAllObjects]; - for (int i = 0; i < _picList.count; i++) { - PIRoomPhotoAlbumItemChoosePhotoModel *photoModel = [PIRoomPhotoAlbumItemChoosePhotoModel new]; - photoModel.chooseImage = _picList[i]; - [self.choosePhotoList addObject:photoModel]; - } - if(self.choosePhotoList.count < 6){ - [self.choosePhotoList addObject:self.defaultModel]; - } - [self.collectionView reloadData]; - [self.collectionView.superview layoutIfNeeded]; - if(self.choosePhotoList.count > 3){ - // 获取位置 - UICollectionViewLayoutAttributes *layoutAttributes = [self.collectionView.collectionViewLayout layoutAttributesForItemAtIndexPath:[NSIndexPath indexPathForRow:self.choosePhotoList.count-3 inSection:0]]; - // 滑动 - CGPoint poiot = CGPointMake(layoutAttributes.frame.origin.x - kGetScaleWidth(10), layoutAttributes.frame.origin.y); - [self.collectionView setContentOffset:poiot animated:YES]; - } -} - -- (void)layoutSubviews{ - [super layoutSubviews]; - -} -#pragma mark - PIRoomPhotoAlbumChoosePhotoTypeViewDelegate -- (void)clickPhotoType:(PIRoomPhotoAlbumChoosePhotoGiftViewType)type{ - self.photoGiftView.photoType = type; - self.chooseType = type; - if(type == Photo_Type_Normal){ - self.photoGiftView.chooseGiftType = Photo_Type_No_Choose_Gift; - }else{ - if(self.photoGiftView.giftModel != nil){ - self.photoGiftView.chooseGiftType = Photo_Type_Choose_Gift; - } - } -} -#pragma mark- PIRoomPhotoAlbumChooseGiftViewDelegate -- (void)chooseGiftWithModel:(GiftInfoModel *)giftModel{ - self.photoGiftView.chooseGiftType = Photo_Type_Choose_Gift; - self.photoGiftView.giftModel = giftModel; -} --(void)dissViewAction{ - self.backgroundColor = [UIColor clearColor]; - [UIView animateWithDuration:0.2 animations:^{ - self.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight); - } completion:^(BOOL finished) { - [self removeFromSuperview]; - }]; - if(self.delegate && [self.delegate respondsToSelector:@selector(cleanPhotoList)]){ - [self.delegate cleanPhotoList]; - } -} --(void)clickChooseGiftViewAction{ - if(self.photoGiftView.photoType == Photo_Type_Normal)return; - PIRoomPhotoAlbumChooseGiftView *giftView = [[PIRoomPhotoAlbumChooseGiftView alloc]initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)]; - giftView.giftInfo = self.photoGiftView.giftModel; - giftView.roomId = self.roomUid; - giftView.delegate = self; - [kWindow addSubview:giftView]; - [UIView animateWithDuration:0.2 animations:^{ - giftView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - }]; -} -#pragma mark - 懒加载 -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - layout.itemSize = CGSizeMake(kGetScaleWidth(100), kGetScaleWidth(102)); - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.minimumLineSpacing = kGetScaleWidth(20); - layout.minimumInteritemSpacing = kGetScaleWidth(20); - layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(20), kGetScaleWidth(0), kGetScaleWidth(20)); - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.showsHorizontalScrollIndicator = NO; - if (@available(iOS 11.0, *)) { - _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - - _collectionView.showsVerticalScrollIndicator = NO; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[PIRoomPhotoAlbumChoosePhotoCell class] forCellWithReuseIdentifier:NSStringFromClass([PIRoomPhotoAlbumChoosePhotoCell class])]; - } - return _collectionView; -} -- (UIButton *)pi_dissView{ - if(!_pi_dissView){ - _pi_dissView = [UIButton new]; - [_pi_dissView addTarget:self action:@selector(dissViewAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _pi_dissView; -} -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - [_bgView setCornerWithLeftTopCorner:kGetScaleWidth(16) rightTopCorner:kGetScaleWidth(16) bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth, kGetScaleWidth(420))]; - } - return _bgView; -} -- (UIButton *)pi_backBtn{ - if(!_pi_backBtn){ - _pi_backBtn = [UIButton new]; - [_pi_backBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_pi_backBtn setImage:kImage(@"pi_room_photo_album_choose_photo_back") forState:UIControlStateNormal]; - [_pi_backBtn addTarget:self action:@selector(dissViewAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _pi_backBtn; -} --(NSMutableArray *)choosePhotoList{ - if(!_choosePhotoList){ - _choosePhotoList = [NSMutableArray array]; - - } - return _choosePhotoList; -} -- (PIRoomPhotoAlbumItemChoosePhotoModel *)defaultModel{ - if(!_defaultModel){ - PIRoomPhotoAlbumItemChoosePhotoModel *model = [PIRoomPhotoAlbumItemChoosePhotoModel new]; - model.isDefault = YES; - _defaultModel = model; - } - return _defaultModel; -} -- (PIRoomPhotoAlbumChoosePhotoTypeView *)photoTypeView{ - if(!_photoTypeView){ - _photoTypeView = [[PIRoomPhotoAlbumChoosePhotoTypeView alloc]initWithFrame:CGRectZero]; - _photoTypeView.delegate = self; - } - return _photoTypeView; -} -- (PIRoomPhotoAlbumChoosePhotoGiftView *)photoGiftView{ - if(!_photoGiftView){ - _photoGiftView = [[PIRoomPhotoAlbumChoosePhotoGiftView alloc]initWithFrame:CGRectZero]; - _photoGiftView.photoType = Photo_Type_Normal; - _photoGiftView.chooseGiftType = Photo_Type_No_Choose_Gift; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickChooseGiftViewAction)]; - [_photoGiftView addGestureRecognizer:tap]; - } - return _photoGiftView; -} -- (UIButton *)sendPhotoView{ - if(!_sendPhotoView){ - _sendPhotoView = [UIButton new]; - [_sendPhotoView setTitle:YMLocalizedString(@"PIRoomPhotoAlbumChoosePhotoView0") forState:UIControlStateNormal]; - _sendPhotoView.titleLabel.font = kFontMedium(16); - [_sendPhotoView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(303), kGetScaleWidth(48))]; - [_sendPhotoView setBackgroundImage:image forState:UIControlStateNormal]; - _sendPhotoView.layer.cornerRadius = kGetScaleWidth(48)/2; - _sendPhotoView.layer.masksToBounds = YES; - [_sendPhotoView addTarget:self action:@selector(clickUploadPicturesAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _sendPhotoView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumOperateView.h b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumOperateView.h deleted file mode 100644 index db83020..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumOperateView.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// PIRoomPhotoAlbumOperateView.h -// YuMi -// -// Created by duoban on 2023/10/13. -// - -#import -#import "PIRoomPhotoAlbumItemModel.h" -typedef enum : NSUInteger { - Photo_Album_Operate_Type_Send= 0,///发送到公屏 - Photo_Album_Operate_Type_Delete= 1,///删除 - Photo_Album_Operate_Type_Look_Up= 2,///查看大图 -} PIRoomPhotoAlbumOperateType; - -@protocol PIRoomPhotoAlbumOperateViewDelegate - --(void)clickOperateIncidentWithType:(PIRoomPhotoAlbumOperateType)type albumModel:(PIRoomPhotoAlbumItemModel *_Nonnull)albumModel; - -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomPhotoAlbumOperateView : UIView -@property(nonatomic,weak) iddelegate; -@property(nonatomic,strong) PIRoomPhotoAlbumItemModel *albumModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumOperateView.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumOperateView.m deleted file mode 100644 index 3427641..0000000 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumOperateView.m +++ /dev/null @@ -1,88 +0,0 @@ -// -// PIRoomPhotoAlbumOperateView.m -// YuMi -// -// Created by duoban on 2023/10/13. -// - -#import "PIRoomPhotoAlbumOperateView.h" -#import "PIRoomPhotoAlbumOperateCell.h" -@interface PIRoomPhotoAlbumOperateView() -@property(nonatomic,strong) UIButton *pi_backView; -@property(nonatomic,strong) UITableView *tableView; -@property(nonatomic,copy) NSArray *titleList; -@end -@implementation PIRoomPhotoAlbumOperateView --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.pi_backView]; - [self addSubview:self.tableView]; -} --(void)installConstraints{ - [self.pi_backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(191)); - }]; -} -#pragma mrak - UITableViewDelegate,UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ - return self.titleList.count; -} -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - PIRoomPhotoAlbumOperateCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([PIRoomPhotoAlbumOperateCell class]) forIndexPath:indexPath]; - cell.title = [self.titleList xpSafeObjectAtIndex:indexPath.row]; - return cell; -} -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ - [self dissViewAction]; - if(self.delegate && [self.delegate respondsToSelector:@selector(clickOperateIncidentWithType:albumModel:)]){ - [self.delegate clickOperateIncidentWithType:indexPath.row albumModel:self.albumModel]; - } -} --(void)dissViewAction{ - self.backgroundColor = [UIColor clearColor]; - [UIView animateWithDuration:0.2 animations:^{ - self.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight); - }completion:^(BOOL finished) { - [self removeFromSuperview]; - }]; -} -#pragma mark - 懒加载 -- (UIButton *)pi_backView{ - if(!_pi_backView){ - _pi_backView = [UIButton new]; - [_pi_backView addTarget:self action:@selector(dissViewAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _pi_backView; -} -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.rowHeight = kGetScaleWidth(51); - _tableView.backgroundColor = [UIColor whiteColor]; - _tableView.pagingEnabled = NO; - [_tableView registerClass:[PIRoomPhotoAlbumOperateCell class] forCellReuseIdentifier:NSStringFromClass([PIRoomPhotoAlbumOperateCell class])]; - [_tableView setCornerWithLeftTopCorner:kGetScaleWidth(16) rightTopCorner:kGetScaleWidth(16) bottomLeftCorner:0 bottomRightCorner:0 size:CGSizeMake(KScreenWidth, kGetScaleWidth(191))]; - } - return _tableView; -} -- (NSArray *)titleList{ - if(!_titleList){ - _titleList = @[YMLocalizedString(@"PIRoomPhotoAlbumOperateView0"),YMLocalizedString(@"PIRoomPhotoAlbumOperateView1"),YMLocalizedString(@"PIRoomPhotoAlbumOperateView2")]; - } - return _titleList; -} -@end diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/Model/XPRoomRecommendModel.h b/YuMi/Modules/YMRoom/View/RoomRecommend/Model/XPRoomRecommendModel.h deleted file mode 100644 index 2613da1..0000000 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/Model/XPRoomRecommendModel.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// YMRoomRecommendModel.h -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import -#import "YUMINNNN.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomRecommendModel : PIBaseModel - -@property (nonatomic, assign) NSInteger roomId; -@property (nonatomic, assign) NSInteger uid; -@property (nonatomic, assign) NSInteger isPermitRoom; -//@property (nonatomic, strong) NSArray *micUsers;//群成员列表 -@property (nonatomic, copy) NSString *title; -@property (nonatomic, assign) NSInteger onlineNum; -@property (nonatomic, assign) NSInteger micUserCount; -@property (nonatomic, copy) NSString *tagPict; -@property (nonatomic, copy) NSString *roomTag; -@property (nonatomic, copy) NSString *avatar; -@property (nonatomic , assign) GenderType gender; -@property (nonatomic, copy) NSString *infoUid; -@property (nonatomic, copy) NSString *nick; -@property (nonatomic, copy) NSString *roomPwd; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/Model/XPRoomRecommendModel.m b/YuMi/Modules/YMRoom/View/RoomRecommend/Model/XPRoomRecommendModel.m deleted file mode 100644 index 25abfe1..0000000 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/Model/XPRoomRecommendModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMRoomRecommendModel.m -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import "XPRoomRecommendModel.h" - -@implementation XPRoomRecommendModel - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideOperationCell.h b/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideOperationCell.h deleted file mode 100644 index d36f164..0000000 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideOperationCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMRoomInsideOperationCell.h -// YUMI -// -// Created by YUMI on 2022/9/30. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomInsideOperationCell : UICollectionViewCell - -@property (nonatomic, copy) NSString *title; -@property (nonatomic, copy) NSString *imageName; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideOperationCell.m b/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideOperationCell.m deleted file mode 100644 index 3075b78..0000000 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideOperationCell.m +++ /dev/null @@ -1,70 +0,0 @@ -// -// YMRoomInsideOperationCell.m -// YUMI -// -// Created by YUMI on 2022/9/30. -// - -#import "XPRoomInsideOperationCell.h" -///Third -#import - -@interface XPRoomInsideOperationCell() - -@property (nonatomic, strong) UIImageView *imageView; -@property (nonatomic, strong) UILabel *titleLabel; - -@end - -@implementation XPRoomInsideOperationCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initView]; - [self initContraints]; - } - return self; -} - -- (void)initView { - [self addSubview:self.imageView]; - [self addSubview:self.titleLabel]; -} - -- (void)initContraints { - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerX.mas_equalTo(self); - make.width.height.mas_equalTo(52); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.imageView.mas_bottom).mas_offset(4); - make.centerX.mas_equalTo(self); - make.height.mas_equalTo(12); - }]; -} - -- (void)setTitle:(NSString *)title { - self.titleLabel.text = title; -} -- (void)setImageName:(NSString *)imageName { - self.imageView.image = [UIImage imageNamed:imageName]; -} - -- (UIImageView *)imageView { - if (!_imageView) { - _imageView = [[UIImageView alloc] init]; - } - return _imageView; -} - -- (UILabel *)titleLabel{ - if (!_titleLabel) { - UILabel *label = [[UILabel alloc] init]; - label.font = [UIFont systemFontOfSize:10]; - label.textColor = [UIColor whiteColor]; - _titleLabel = label; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendCell.h b/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendCell.h deleted file mode 100644 index 7a2208b..0000000 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMRoomInsideRecommendCell.h -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import -#import "XPRoomRecommendModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomInsideRecommendCell : UITableViewCell - -@property (nonatomic, strong) XPRoomRecommendModel *model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendCell.m b/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendCell.m deleted file mode 100644 index d342469..0000000 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendCell.m +++ /dev/null @@ -1,116 +0,0 @@ -// -// YMRoomInsideRecommendCell.m -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import "XPRoomInsideRecommendCell.h" -#import "NetImageView.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" - -@interface XPRoomInsideRecommendCell () - -///头像 -@property (nonatomic, strong) NetImageView *avatarImageView; -///显示名字 -@property (nonatomic,strong) UILabel *nickLabel; -///标签 -@property (nonatomic,strong) NetImageView *tagImageView; - -@end - -@implementation XPRoomInsideRecommendCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self addSubview:self.avatarImageView]; - [self addSubview:self.nickLabel]; - [self addSubview:self.tagImageView]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(12); - make.leading.mas_equalTo(15); - make.width.height.mas_equalTo(72); - }]; - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView).mas_offset(12); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(7); - make.height.mas_equalTo(14); - make.trailing.mas_equalTo(0); - }]; - [self.tagImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.top.mas_equalTo(self.nickLabel.mas_bottom).mas_offset(12); - make.width.mas_equalTo(43); - make.height.mas_equalTo(18); - }]; -} -#pragma mark - Getters And Setters -- (void)setModel:(XPRoomRecommendModel *)model { - _model = model; - self.avatarImageView.imageUrl = model.avatar; - self.nickLabel.text = model.title; - self.tagImageView.hidden = [NSString isEmpty:model.tagPict]; - if (! [NSString isEmpty:model.tagPict]) { - @kWeakify(self); - [self.tagImageView loadImageWithUrl:model.tagPict completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - if (image) { - self.tagImageView.image = image; - [self.tagImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(image.size.width/image.size.height * 18); - }]; - [self layoutIfNeeded]; - } - }]; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 8; - } - return _avatarImageView; -} - -- (NetImageView *)tagImageView { - if (!_tagImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _tagImageView = [[NetImageView alloc] initWithConfig:config]; - } - return _tagImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont boldSystemFontOfSize:14]; - _nickLabel.textColor = [UIColor whiteColor]; - } - return _nickLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.h b/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.h deleted file mode 100644 index 0e84eef..0000000 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMRoomInsideRecommendEmptyCell.h -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomInsideRecommendEmptyCell : UITableViewCell - -@end - -NS_ASSUME_NONNULL_END - diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.m b/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.m deleted file mode 100644 index 5f99d6f..0000000 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.m +++ /dev/null @@ -1,57 +0,0 @@ -// -// YMRoomInsideRecommendEmptyCell.m -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import "XPRoomInsideRecommendEmptyCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPRoomInsideRecommendEmptyCell () -///空文本 -@property (nonatomic,strong) UILabel *emptyLabel; -@end - -@implementation XPRoomInsideRecommendEmptyCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(10); - make.centerY.mas_equalTo(self.contentView); - }]; -} - -#pragma mark - Getters And Setters -- (UILabel *)emptyLabel { - if (!_emptyLabel) { - _emptyLabel = [[UILabel alloc] init]; - _emptyLabel.text = YMLocalizedString(@"XPRoomInsidekfjdskfjks"); - _emptyLabel.font = [UIFont systemFontOfSize:14]; - _emptyLabel.textAlignment = NSTextAlignmentCenter; - _emptyLabel.textColor = [UIColor whiteColor]; - _emptyLabel.numberOfLines = 2; - } - return _emptyLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.h b/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.h deleted file mode 100644 index b12a298..0000000 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// YMRoomRecommendView.h -// YUMI -// -// Created by YUMI on 2022/4/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPRoomRecommendViewDelegate -@optional -///举报房间 -- (void)xPRoomRecommendViewReport; -///最小化房间 -- (void)xPRoomRecommendViewMiniRoom; -///退出房间 -- (void)xPRoomRecommendViewExitRoom; -///分享 -- (void)xPRoomRecommendViewShare; -///跳转到房间 -- (void)xPRoomRecommendViewJumpToRoom:(NSString *)roomUid; - -@end - -@interface XPRoomRecommendView : UIView - -@property (nonatomic, strong) NSMutableArray *roomList; - -@property (nonatomic, weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m b/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m deleted file mode 100644 index f8a9ab8..0000000 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m +++ /dev/null @@ -1,270 +0,0 @@ -// -// XPRoomRecommendView.m -// xplan-ios -// -// Created by GreenLand on 2022/4/28. -// - -#import "XPRoomRecommendView.h" -///Third -#import -///Tool - -///View -#import "XPRoomInsideRecommendCell.h" -#import "XPRoomInsideRecommendEmptyCell.h" - -@interface XPRoomRecommendView () - -///模糊背景 -@property (nonatomic, strong) UIToolbar *toolBar; -@property (nonatomic, strong) UITableView *tableView; - -@property (nonatomic, strong) UIStackView *controlStackView; -@property (nonatomic, strong) UIStackView *miniStackView; -@property (nonatomic, strong) UIStackView *exitStackView; - -///最小化 -@property (nonatomic,strong) UIButton *miniButton; -///退出房间 -@property (nonatomic,strong) UIButton *exitButton; - -///最小化 -@property (nonatomic,strong) UILabel *miniLabel; -///退出房间 -@property (nonatomic,strong) UILabel *exitLabel; -///为你推荐 -@property (nonatomic, strong) UILabel *recommentLabel; - -@end - -@implementation XPRoomRecommendView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self setUpUI]; - [self setUpConstraints]; - } - return self; -} - -#pragma mark - lifeCycle -- (void)setUpUI { - [self addSubview:self.toolBar]; - - [self addSubview:self.controlStackView]; - [self.miniStackView addArrangedSubview:self.miniButton]; - [self.miniStackView addArrangedSubview:self.miniLabel]; - [self.exitStackView addArrangedSubview:self.exitButton]; - [self.exitStackView addArrangedSubview:self.exitLabel]; - - [self.controlStackView addArrangedSubview:self.miniStackView]; - [self.controlStackView addArrangedSubview:self.exitStackView]; - - [self addSubview:self.recommentLabel]; - [self addSubview:self.tableView]; -} - -- (void)setRoomList:(NSMutableArray *)roomList { - _roomList = roomList; - [self.tableView reloadData]; -} - -#pragma mark - Constraints -- (void)setUpConstraints { - [self.toolBar mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.bottom.mas_equalTo(self); - }]; - - [self.controlStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kStatusBarHeight + 8); - make.leading.trailing.mas_equalTo(self); - }]; - - - [self.miniButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(54); - }]; - [self.exitButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(54); - }]; - [self.recommentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.controlStackView.mas_bottom).mas_offset(16); - make.leading.mas_equalTo(11); - }]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(0); - make.top.mas_equalTo(self.recommentLabel.mas_bottom); - }]; -} - -#pragma mark - UITableViewDelegate -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.roomList.count ? self.roomList.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.roomList.count > 0) { - XPRoomInsideRecommendCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomInsideRecommendCell class])]; - XPRoomRecommendModel *model = self.roomList[indexPath.row]; - cell.model = model; - return cell; - } - XPRoomInsideRecommendEmptyCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomInsideRecommendEmptyCell class])]; - if (cell == nil) { - cell = [[XPRoomInsideRecommendEmptyCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomInsideRecommendEmptyCell class])]; - } - return cell; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.roomList.count > 0) { - XPRoomRecommendModel *model = self.roomList[indexPath.row]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomRecommendViewJumpToRoom:)]) { - [self.delegate xPRoomRecommendViewJumpToRoom:[NSString stringWithFormat:@"%ld", model.uid]]; - } - } -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.roomList.count > 0 ? 84 : KScreenHeight - kStatusBarHeight -8 - 120; -} - -#pragma mark - atcion -- (void)reportButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomRecommendViewReport)]) { - [self.delegate xPRoomRecommendViewReport]; - } -} - -- (void)miniButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomRecommendViewMiniRoom)]) { - [self.delegate xPRoomRecommendViewMiniRoom]; - } -} - -- (void)exitButtonAction:(UIButton *)sender{ - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomRecommendViewExitRoom)]) { - [self.delegate xPRoomRecommendViewExitRoom]; - } -} - -#pragma mark - getter -- (UIToolbar *)toolBar { - if (!_toolBar) { - _toolBar = [[UIToolbar alloc] init]; - _toolBar.barStyle = UIBarStyleBlack; - _toolBar.translucent = YES; - } - return _toolBar; -} - -- (UIButton *)miniButton { - if(!_miniButton){ - _miniButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_miniButton setImage:[UIImage imageNamed:@"room_info_mini"] forState:UIControlStateNormal]; - [_miniButton addTarget:self action:@selector(miniButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_miniButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _miniButton.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - } - return _miniButton; -} - -- (UIButton *)exitButton { - if (!_exitButton) { - _exitButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_exitButton setImage:[UIImage imageNamed:@"room_info_exit"] forState:UIControlStateNormal]; - [_exitButton addTarget:self action:@selector(exitButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _exitButton; -} - -- (UIStackView *)controlStackView { - if (!_controlStackView) { - _controlStackView = [[UIStackView alloc] init]; - _controlStackView.axis = UILayoutConstraintAxisHorizontal; - _controlStackView.distribution = UIStackViewDistributionEqualSpacing; - _controlStackView.alignment = UIStackViewAlignmentCenter; - _controlStackView.spacing = 65; - _controlStackView.layoutMargins = UIEdgeInsetsMake(0, 36, 0, 36); - _controlStackView.layoutMarginsRelativeArrangement = YES; - } - return _controlStackView; -} - -- (UIStackView *)miniStackView { - if (!_miniStackView) { - _miniStackView = [[UIStackView alloc] init]; - _miniStackView.axis = UILayoutConstraintAxisVertical; - _miniStackView.distribution = UIStackViewDistributionFill; - _miniStackView.alignment = UIStackViewAlignmentCenter; - _miniStackView.spacing = 17; - [_miniStackView setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_miniStackView setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _miniStackView; -} - -- (UIStackView *)exitStackView { - if (!_exitStackView) { - _exitStackView = [[UIStackView alloc] init]; - _exitStackView.axis = UILayoutConstraintAxisVertical; - _exitStackView.distribution = UIStackViewDistributionFill; - _exitStackView.alignment = UIStackViewAlignmentCenter; - _exitStackView.spacing = 17; - [_exitStackView setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_exitStackView setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _exitStackView; -} - -- (UILabel *)miniLabel { - if (!_miniLabel) { - _miniLabel = [[UILabel alloc] init]; - _miniLabel.text = YMLocalizedString(@"XPRoomRecommendView1"); - _miniLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _miniLabel.textAlignment = NSTextAlignmentCenter; - _miniLabel.textColor = [UIColor whiteColor]; - _miniLabel.numberOfLines = 0; - } - return _miniLabel; -} - -- (UILabel *)exitLabel { - if (!_exitLabel) { - _exitLabel = [[UILabel alloc] init]; - _exitLabel.text = YMLocalizedString(@"XPRoomRecommendView2"); - _exitLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _exitLabel.textAlignment = NSTextAlignmentCenter; - _exitLabel.textColor = [UIColor whiteColor]; - _exitLabel.numberOfLines = 0; - } - return _exitLabel; -} - -- (UILabel *)recommentLabel { - if (!_recommentLabel) { - _recommentLabel = [[UILabel alloc] init]; - _recommentLabel.text = YMLocalizedString(@"XPRoomRecommendView3"); - _recommentLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _recommentLabel.textColor = [UIColor whiteColor]; - } - return _recommentLabel; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.showsVerticalScrollIndicator = NO; - [_tableView registerClass:[XPRoomInsideRecommendCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomInsideRecommendCell class])]; - [_tableView registerClass:[XPRoomInsideRecommendEmptyCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomInsideRecommendEmptyCell class])]; - _tableView.backgroundColor = [UIColor clearColor]; - } - return _tableView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.h b/YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.h deleted file mode 100644 index 8f2794e..0000000 --- a/YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// RoomSideMenu.h -// YuMi -// -// Created by P on 2024/12/20. -// - -#import - -#import "RoomInfoModel.h" -#import "BoomInfoModel.h" -#import "RoomHostDelegate.h" -#import "XPRedPacketModel.h" -#import "RoomGuestDelegate.h" -#import "ActivityInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomSideMenu : UIView - -@property (nonatomic, copy) void(^openRedPacketHandle)(XPRedPacketModel * _Nullable redModel, RoomType type, BOOL checkList); -@property (nonatomic, copy) void(^showSendGiftView)(void); -@property (nonatomic, strong) NSMutableArray *redPacketList; -@property (nonatomic, strong) NSMutableArray *playList; -@property (nonatomic, strong) NSMutableArray *littleGameList; - -- (instancetype)initWithDelegate:(id)delegate; -- (void)updateView; -- (void)displayForMiniGame; -- (void)displayExpandButton:(BOOL)displayButton; -- (void)updateForBoomDetailArray:(NSArray *)models; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.m b/YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.m deleted file mode 100644 index ddb5791..0000000 --- a/YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.m +++ /dev/null @@ -1,1023 +0,0 @@ -// -// RoomSideMenu.m -// YuMi -// -// Created by P on 2024/12/20. -// - -#import "RoomSideMenu.h" - -#import -#import -#import - -#import "Api+Room.h" -#import "Api+LittleGame.h" - -#import "AttachmentModel.h" -#import "RoomBoomManager.h" -#import "RoomBoomEntryView.h" -#import "FirstRechargeModel.h" -#import "LittleGameInfoModel.h" -#import "PIRoomEnterRedPacketView.h" - -#import "MSRoomGameWebVC.h" -#import "MSRoomMenuGameVC.h" -#import "RoomAnimationView.h" -#import "XPWebViewController.h" -#import "XPRoomViewController.h" -#import "PIRoomActivityWebView.h" -#import "BoomInfoViewController.h" -#import "XPSailingViewController.h" -#import "XCCurrentVCStackManager.h" -#import "XPCandyTreeViewController.h" -#import "XPArrangeMicViewController.h" - -#import "RoomLuckyPackageInfoModel.h" -#import "LuckyPackageLogicManager.h" -#import "OpenLuckyPackageEntranceView.h" - - -static CGFloat const kMenuItemSpacing = 4.0f; -static CGFloat const kMenuItemInset = 15.0f; -static CGFloat const kExpandedHeight = 260.0f; -static CGFloat const kNormalHeight = 160.0f; - -@interface RoomSideMenu () - -@property(nonatomic, strong) NSMutableArray *menuItemViews; -@property (nonatomic, strong) RACSubject *menuItemViewsSubject; // 数据源信号 - -///游戏菜单按钮 -@property(nonatomic, strong) UIButton *gambleMenuButton; -/// 配置的入口，逻辑由 API 返回数据决定 -@property(nonatomic, strong) UIButton *configEntranceMenuButton; -@property(nonatomic, strong) UIButton *pkMenuButton; -@property (nonatomic,strong) UIImageView *joinView; -@property(nonatomic,strong) PIRoomEnterRedPacketView *redPacketView; - -@property(nonatomic, strong) OpenLuckyPackageEntranceView *giftEntranceButton; - -@property(nonatomic, strong) UIScrollView *scrollView; -@property(nonatomic, strong) UIStackView *scrollContainStack; -@property (nonatomic,strong) SDCycleScrollView *cycleScrollView; -@property (nonatomic, weak) id hostDelegate; -@property (nonatomic, strong) NSMutableArray *activityList; -@property (nonatomic, assign) BOOL isLoadActivity; - -@property (nonatomic, strong) RoomBoomEntryView *boomView; -@property (nonatomic, copy) NSArray *boomModels; - -@property (nonatomic, strong) NetImageView *loader_url_1; -@property (nonatomic, strong) NetImageView *loader_url_2; - -@property(nonatomic, strong) UIButton *expandButton; - -@property(nonatomic, assign) BOOL isExpand; - -@property(nonatomic, strong) RoomLuckyPackageInfoModel *luckyPackageModel; - -@property(nonatomic, assign) BOOL isRequestingActivityList; -@property(nonatomic, assign) RoomType currentRoomType; - -@end - -@implementation RoomSideMenu - -- (void)dealloc { - self.scrollView.delegate = nil; - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [[RoomBoomManager sharedManager] removeEventListenerForTarget:self]; -} - -- (instancetype)initWithDelegate:(id)delegate { - self = [super init]; - if (self) { - self.hostDelegate = delegate; - self.menuItemViews = @[].mutableCopy; - - [self setupViews]; - [self setupBoomManager]; - [self setupMenuItemUpdateRAC]; - } - return self; -} - -#pragma mark - Setup -- (void)setupViews { - [self addSubview:self.cycleScrollView]; - [self addSubview:self.scrollView]; - [self addSubview:self.expandButton]; - - [self.cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.equalTo(self); - make.height.mas_equalTo(self.cycleScrollView.mas_width); - }]; - - [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self).offset(88); - make.leading.trailing.bottom.mas_equalTo(self); - }]; - - [self.scrollView addSubview:self.scrollContainStack]; - [self.scrollContainStack mas_makeConstraints:^(MASConstraintMaker *make) { -// make.edges.mas_equalTo(self.scrollView); - make.top.left.bottom.equalTo(self.scrollView); - make.width.equalTo(self.scrollView); // 保证宽度与 scrollView 一致 - }]; - - [self.expandButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.scrollView.mas_top); - make.trailing.mas_equalTo(self.scrollView).offset(-4); - make.size.mas_equalTo(CGSizeMake(32, 32)); - }]; -} - -- (void)setupMenuItemUpdateRAC { - self.menuItemViewsSubject = [RACSubject subject]; - @kWeakify(self); - [self.menuItemViewsSubject subscribeNext:^(NSArray * _Nullable x) { - @kStrongify(self); - [self updateScrollView: x]; - }]; -} - -- (void)setupBoomManager { - @kWeakify(self); - [[RoomBoomManager sharedManager] registerBoomProgressUpdate:^(id _Nonnull sth) { - @kStrongify(self); - if ([sth isKindOfClass:[BoomDetailModel class]]) { - self.boomView.boomModel = (BoomDetailModel *)sth; - } - } target:self]; -} - -- (void)updateMenuItem:(UIView *)itemView - isRemove:(BOOL)isRemove { - if (itemView.tag == 0) { - return; - } - if (isRemove) { - if (itemView.superview == nil) { - return; - } - if ([self.menuItemViews containsObject:itemView]) { - [self.menuItemViews removeObject:itemView]; - } - } else { - if ([self.menuItemViews containsObject:itemView]) { - return; - } - [self.menuItemViews addObject:itemView]; - } - - [self.menuItemViews sortUsingComparator:^NSComparisonResult(UIView * _Nonnull obj1, UIView * _Nonnull obj2) { - if (obj1.tag < obj2.tag) { - return NSOrderedAscending; - } else if (obj1.tag > obj2.tag) { - return NSOrderedDescending; - } else { - return NSOrderedSame; - } - }]; - - [self.menuItemViewsSubject sendNext:self.menuItemViews]; -} - -#pragma mark - Methods -- (void)updateView { - if (self.isLoadActivity) { - [self configLittleGameActivity]; - } else { - if (!self.isRequestingActivityList) { - [self requestActivityList]; - } - } -} - -- (void)displayForMiniGame { - self.cycleScrollView.hidden = NO; - self.expandButton.hidden = YES; - self.scrollView.hidden = YES; -} - -- (void)displayExpandButton:(BOOL)displayButton { - self.expandButton.hidden = !displayButton; -} - -- (void)updateForBoomDetailArray:(NSArray *)models { - _boomModels = models; - if (!models || ![models isKindOfClass:[NSArray class]] || models.count == 0) { - return; - } - - BOOL hasBoom = NO; - for (BoomDetailModel *boom in models) { - if (boom.currLevel == 1) { - hasBoom = YES; - self.boomView.boomModel = boom; - break; - } - } - - if (!hasBoom) { - // 处理到顶级后可能找不到数据的异常 - self.boomView.boomModel = [models lastObject]; - } - if ((self.isExpand && self.expandButton.hidden == NO) || self.expandButton.hidden) { - [self updateMenuItem:self.boomView isRemove:NO]; - self.boomView.hidden = NO; - } -} - -- (void)updateScrollView:(NSArray *)data { - // 清除 stackView 现有的所有子视图 - for (UIView *view in self.scrollContainStack.arrangedSubviews) { - [self.scrollContainStack removeArrangedSubview:view]; - [view removeFromSuperview]; - } - - // 如果数据为空，直接返回 - if (data.count == 0) { - return; - } - - NSArray *reverseData = [data reverseObjectEnumerator].allObjects; - NSInteger count = data.count; - - NSMutableArray *dataItems = @[].mutableCopy; - switch (self.currentRoomType) { - case RoomType_Room: - case RoomType_10Mic: - case RoomType_15Mic: - if (iPhoneXSeries) { - for (NSInteger i=count; i<5; i++) { - UIView *emptyView = [[UIView alloc] init]; - [dataItems addObject:emptyView]; - } - } - break; - case RoomType_MiniGame: - break; - default: - if (self.isExpand && iPhoneXSeries) { - UIView *emptyView = [[UIView alloc] init]; - [dataItems addObject:emptyView]; - } - break; - } - - [dataItems addObjectsFromArray:reverseData]; - data = dataItems.copy; - - // 添加新的菜单项视图到 stackView 中 - CGFloat offsetY = -(self.scrollView.bounds.size.width - 30); - for (UIView *view in data) { - [self.scrollContainStack addArrangedSubview:view]; - // 如果需要固定每个菜单项的高度，可以为每个 view 添加高度约束 - [view mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(self.scrollView.bounds.size.width - 30); - }]; - if (data.count > 1) { - offsetY += self.scrollView.bounds.size.width - 30; - } - } - - // 注意：使用 UIStackView 后，无需手动计算 contentSize， - // 系统会根据 stackView 的内容自动更新 scrollView 的滚动范围。 - [self setNeedsLayout]; - [self layoutIfNeeded]; - dispatch_async(dispatch_get_main_queue(), ^{ - if (self.scrollView.contentSize.height > self.scrollView.bounds.size.height) { - [self.scrollView setContentOffset:CGPointMake(0, self.scrollView.contentSize.height - self.scrollView.bounds.size.height) animated:NO]; - } - }); -} - -- (void)configLittleGameActivity { - [self updateCycleView]; -} - -- (void)requestActivityList { - self.isRequestingActivityList = YES; - - RACSubject* playRAC = [RACSubject subject]; - RACSubject* activityRAC = [RACSubject subject]; - RACSubject* littleGameRAC = [RACSubject subject]; - - @kWeakify(self); - [[RACSignal combineLatest:@[playRAC, - activityRAC, - littleGameRAC] - reduce:^id(NSArray *playModels, - NSArray *activityModels, - NSArray *littleGameModels){ - @kStrongify(self); - self.playList = [NSMutableArray arrayWithArray:playModels]; - self.activityList = [NSMutableArray arrayWithArray:activityModels]; - self.littleGameList = [NSMutableArray arrayWithArray:littleGameModels]; - self.isRequestingActivityList = NO; - [self onRoomUpdate]; - return nil; - }] subscribeError:^(NSError * _Nullable error) { - [XNDJTDDLoadingTool showErrorWithMessage:error.domain]; - }]; - - [self loadGames:playRAC]; - [self loadActivities:activityRAC]; - [self loadLittleGames:littleGameRAC]; - - [self requestLuckyPackage]; -} - -- (void)loadGames:(RACSubject *)racSubject { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - [Api getPlayList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [ActivityInfoModel modelsWithArray:data.data]; - [racSubject sendNext:array]; - [racSubject sendCompleted]; - } else { - [racSubject sendError:[NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]]; - } - } roomId:roomId]; -} - -- (void)loadActivities:(RACSubject *)racSubject { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - [Api roomActivityList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [ActivityInfoModel modelsWithArray:data.data]; - [racSubject sendNext:array]; - [racSubject sendCompleted]; - } else { - [racSubject sendError:[NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]]; - } - } roomId:roomId]; -} - -- (void)loadLittleGames:(RACSubject *)racSubject { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - NSString * roomUid = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - [Api getLittleGameList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [LittleGameInfoModel modelsWithArray:data.data]; - [racSubject sendNext:array]; - [racSubject sendCompleted]; - } else { - [racSubject sendError:[NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]]; - } - } - roomUid:roomUid]; -} - -- (void)requestLuckyPackage { - @kWeakify(self); - [[LuckyPackageLogicManager sharedInstance] requestRoomLuckyPackageAPI:self.hostDelegate.getRoomInfo.uid success:^(RoomLuckyPackageInfoModel * _Nonnull model) { - @kStrongify(self); - self.luckyPackageModel = model; - [self.giftEntranceButton updateEntrance:model]; - [self loadLuckyPackage]; - }]; - - [[LuckyPackageLogicManager sharedInstance] registerLuckyPackageUpdate:^(RoomLuckyPackageInfoModel * _Nullable model) { - @kStrongify(self); - self.luckyPackageModel = model; - [self.giftEntranceButton updateEntrance:model]; - [self loadLuckyPackage]; - }]; -} - --(void)dealWithData{ - self.isLoadActivity = YES; - self.cycleScrollView.hidden = NO; - - if (self.playList.count > 0 || self.littleGameList.count >0) { - [self updateMenuItem:self.gambleMenuButton isRemove:NO]; - } - - if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) { - [self configLittleGameActivity]; - } else { - [self updateCycleView]; - } -} - -- (void)updateConfigEntranceButtons:(RoomInfoModel *)roomInfo { - RoomBottomEntranceModel *model = roomInfo.rightBottomIconConfig; - if (!model) { - return; - } - - @kWeakify(self); - if (![NSString isEmpty:model.icon2Url]) { - [self.loader_url_2 loadImageWithUrl:model.icon2Url - completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - [self.gambleMenuButton setImage:image - forState:UIControlStateNormal]; - }]; - } - - if (![NSString isEmpty:model.icon1Url]) { - [self.loader_url_1 loadImageWithUrl:model.icon1Url - completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - [self.configEntranceMenuButton setImage:image - forState:UIControlStateNormal]; - [self updateMenuItem:self.configEntranceMenuButton isRemove:NO]; - }]; - } else { - if (_configEntranceMenuButton) { - [self updateMenuItem:self.configEntranceMenuButton isRemove:NO]; - } - } -} - -- (void)updateCycleView { - NSMutableArray *picArray = [NSMutableArray array]; - for (ActivityInfoModel *model in self.activityList) { - [picArray addObject:model.icon ?: @""]; - } - - self.cycleScrollView.imageURLStringsGroup = picArray; - if (picArray.count > 1) { - [self.cycleScrollView setAutoScroll:YES]; - self.cycleScrollView.autoScrollTimeInterval = 3; - } else { - [self.cycleScrollView setAutoScroll:NO]; - } -} - -- (void)openURL:(NSString *)urlString { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - XPWebViewController *vc = [[XPWebViewController alloc] initWithRoomUID:@(roomInfo.uid).stringValue]; - vc.url = urlString; - [self.hostDelegate.getCurrentNav pushViewController:vc animated:YES]; -} - -- (void)openBaiShunGame:(RoomBottomEntranceModel *)model { - if ([self.hostDelegate isKindOfClass:[XPRoomViewController class]]){ - ActivityInfoModel *activityModel = [[ActivityInfoModel alloc] init]; - activityModel.skipContent = model.skipUrl; - activityModel.skipType = ActivitySkipType_Web; - activityModel.showType = 1; - activityModel.code = @"BAISHUN"; - activityModel.ruleValue = model.reserve; - if (activityModel.gameModel) { - MSRoomGameWebVC *vc = [[MSRoomGameWebVC alloc] initWithDelegate:self.hostDelegate - gameModel:activityModel]; - vc.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - XPRoomViewController *roomVC = (XPRoomViewController *)self.hostDelegate; - [roomVC addChildViewController:vc]; - RoomAnimationView *animationView; - for (id obj in self.hostDelegate.getSuperView.subviews) { - if ([obj isKindOfClass:[RoomAnimationView class]]){ - animationView = obj; - break; - } - } - [self.hostDelegate.getSuperView addSubview:vc.view]; - vc.view.tag = 913; - } - } -} - -- (void)setRedPacketList:(NSMutableArray *)redPacketList{ - _redPacketList = redPacketList; - self.redPacketView.redPacketList = redPacketList; - if(self.openRedPacketHandle){ - self.openRedPacketHandle(nil,self.hostDelegate.getRoomInfo.type,YES); - } - if (self.redPacketList.count > 0) { - [self updateMenuItem:self.redPacketView isRemove:NO]; - } -} - -#pragma mark - User Response -- (void)displayBoomInfoProgress { - BoomInfoViewController *vc = [[BoomInfoViewController alloc] init]; - vc.roomUid = self.hostDelegate.getRoomInfo.uid; - vc.partitionId = self.hostDelegate.getUserInfo.partitionId; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:vc animated:YES completion:nil]; - - @kWeakify(self); - [vc setShowGiftPanel:^{ - @kStrongify(self); - if (self.showSendGiftView) { - self.showSendGiftView(); - } - }]; -} - -- (void)didTapGameMenuButton { - MSRoomMenuGameVC *vc = [[MSRoomMenuGameVC alloc] initWithDelegate:self.hostDelegate roomMenuType:MSRoomMenuTypeGame]; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:vc animated:YES completion:nil]; - @kWeakify(self); - [vc setUpdatePlayListAndGameList:^(NSArray * _Nonnull playList, NSArray * _Nonnull gameList) { - @kStrongify(self); - self.playList = playList.mutableCopy; - self.littleGameList = gameList.mutableCopy; - }]; -} - -- (void)didTapConfigEntranceButton { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - RoomBottomEntranceModel *model = roomInfo.rightBottomIconConfig; - - if (!model || model.skipUrl.length == 0) { - return; - } - - switch (model.skipType) { - case 1: - [self openURL:model.skipUrl]; - break; - case 2: - [self openBaiShunGame:model]; - break; - default: - break; - } -} - -- (void)didTapPKMenuButton { - [self.hostDelegate showPKPanel]; -} - -- (void)didTapJoinDatingRecognizer { - if (self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode && self.hostDelegate.isRoomPKPlaying) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomActivityContainerView2")]; - return; - } - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - @kStrongify(self); - NIMChatroomMember * member; - if (error == nil) { - member = members.firstObject; - } - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - XPArrangeMicInfoModel * info = [[XPArrangeMicInfoModel alloc] init]; - info.roomUid = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - info.roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - info.nick = roomInfo.nick; - info.roomAvatar = roomInfo.avatar; - info.roomTitle = roomInfo.title; - info.micQueue = [self.hostDelegate getMicroQueue]; - info.isManager = (member.type == NIMChatroomMemberTypeCreator || member.type == NIMChatroomMemberTypeManager); - info.type = roomInfo.roomModeType == RoomModeType_Open_Blind ? ArrangeMicType_Dating : roomInfo.roomModeType == RoomModeType_Open_PK_Mode ? ArrangeMicType_Room_PK : ArrangeMicType_Normal; - XPArrangeMicViewController * arrangeMicVC = [[XPArrangeMicViewController alloc] initWithInfo:info]; - [self.hostDelegate.getCurrentNav presentViewController:arrangeMicVC animated:YES completion:nil]; - }]; -} - -- (void)didTapGiftEntrance { - -} - -- (void)didTapExpand { - self.isExpand = !self.isExpand; - - if (self.isExpand) { - [self.expandButton setImage:kImage(@"side_menu_close") forState:UIControlStateNormal]; - [self mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(kExpandedHeight)); - }]; - } else { - [self.expandButton setImage:kImage(@"side_menu_open") forState:UIControlStateNormal]; - [self mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(kNormalHeight)); - }]; - } - - [self layoutIfNeeded]; - [self setNeedsLayout]; - [self onRoomUpdate]; -} - -#pragma mark - Room Delegate -- (void)onRoomEntered { - -} - -- (void)onRoomMiniEntered { - [self onRoomUpdate]; -} - -- (void)onRoomUpdate { - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - - [self.menuItemViews removeAllObjects]; - - self.currentRoomType = roomInfo.type; - - switch (roomInfo.type) { - case RoomType_MiniGame: - [self displayForMiniGame]; - [self updateCycleView]; - break; - case RoomType_19Mic: - case RoomType_20Mic: { - [self displayExpandButton:YES]; - [self dealWithData]; - [self handleBoomItem]; - if (self.isExpand) { - [self loadPKView:roomInfo]; - [self loadJoinView:roomInfo]; - [self updateConfigEntranceButtons:roomInfo]; - [self loadLuckyPackage]; - } - self.scrollView.hidden = NO; - self.cycleScrollView.hidden = YES; - } - break; - default: { - [self displayExpandButton:NO]; - - [self dealWithData]; - [self loadLuckyPackage]; - [self loadPKView:roomInfo]; - [self loadJoinView:roomInfo]; - [self loadRedPacket:roomInfo]; - [self updateConfigEntranceButtons:roomInfo]; - [self handleBoomItem]; - - self.scrollView.hidden = NO; - self.cycleScrollView.hidden = NO; - } - break; - } - - if(self.openRedPacketHandle){ - self.openRedPacketHandle(nil,self.hostDelegate.getRoomInfo.type,YES); - } - if (self.menuItemViews.count == 0) { - [self displayExpandButton:NO]; - } - self.scrollView.hidden = (self.menuItemViews.count == 0); -} - -- (void)handleBoomItem { - if (self.boomModels.count > 0) { - [self updateMenuItem:self.boomView isRemove:NO]; - self.boomView.hidden = NO; - } else { - self.boomView.hidden = YES; - [self updateMenuItem:self.boomView isRemove:YES]; - } -} - -- (void)loadRedPacket:(RoomInfoModel *)roomInfo { - if (self.redPacketList.count > 0) { - self.redPacketView.type = roomInfo.type; - self.redPacketView.redPacketList = self.redPacketList; - [self updateMenuItem:self.redPacketView isRemove:NO]; - } -} - -- (void)loadLuckyPackage { - if (self.luckyPackageModel) { - [self updateMenuItem:self.giftEntranceButton isRemove:self.luckyPackageModel.redEnvelopeListVoList.count == 0]; - } -} - -- (void)loadPKView:(RoomInfoModel *)roomInfo { - if (roomInfo.type == RoomType_Anchor || roomInfo.roomModeType == RoomModeType_Open_Blind) { - [self updateMenuItem:self.pkMenuButton isRemove:YES]; - } else { - if (roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - [self updateMenuItem:self.pkMenuButton isRemove:NO]; - } else { - [self updateMenuItem:self.pkMenuButton isRemove:YES]; - } - } -} - -- (void)loadJoinView:(RoomInfoModel *)roomInfo { - if (roomInfo.roomModeType == RoomModeType_Open_Blind || - roomInfo.roomModeType == RoomModeType_Open_PK_Mode || - roomInfo.roomModeType == RoomModeType_Open_Micro_Mode) { - if (roomInfo.roomModeType == RoomModeType_Open_PK_Mode ) { - self.joinView.image = [UIImage getLanguageImage:@"room_pk_normal_member_enter"]; - } else { - self.joinView.image = [UIImage getLanguageImage:@"room_mode_dating_enter"]; - } - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - @kStrongify(self); - if (error == nil) { - NIMChatroomMember * member = members.firstObject; - if (member.type == NIMTeamMemberTypeOwner || member.type == NIMTeamMemberTypeManager) { - [self updateMenuItem:self.joinView isRemove:YES]; - return; - } - } - [self updateMenuItem:self.joinView isRemove:NO]; - }]; - } else { - [self updateMenuItem:self.joinView isRemove:YES]; - } -} - -- (void)handleNIMCustomMessage:(NIMMessage *)message { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - switch (attachment.first) { - case CustomMessageType_First_Recharge_Reward: { - if (attachment.second == Custom_Message_Sub_Room_First_Recharge_Reward) { - } - } - break; - case CustomMessageType_RedPacket: { - if (attachment.second == Custom_Message_Sub_LuckyPackage) { - [[LuckyPackageLogicManager sharedInstance] receiveNewPostLuckyPackage:attachment]; - } - } - break; - default: - break; - } - } -} - -- (void)handleNIMTextMessage:(NIMMessage *)message { - -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - switch (content.eventType) { - case NIMChatroomEventTypeAddManager: - { - if (self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind || self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - for (NIMChatroomNotificationMember * member in content.targets) { - if (member.userId.intValue == [AccountInfoStorage instance].getUid.integerValue) { - [self updateMenuItem:self.joinView isRemove:YES]; - break; - } - } - } - } - break; - case NIMChatroomEventTypeRemoveManager: - { - if (self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind || self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - for (NIMChatroomNotificationMember * member in content.targets) { - if (member.userId.intValue == [AccountInfoStorage instance].getUid.integerValue) { - [self updateMenuItem:self.joinView isRemove:NO]; - break; - } - } - } - } - break; - default: - break; - } -} - -#pragma mark- PIRoomEnterRedPacketViewDelegate --(void)openRedPacketWithModel:(XPRedPacketModel *)redModel{ - if(self.openRedPacketHandle){ - self.openRedPacketHandle(redModel,self.hostDelegate.getRoomInfo.type,NO); - } -} - -#pragma mark - SDCycleScrollViewDelegate -- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index { - NSArray *imageUrlList = cycleScrollView.imageURLStringsGroup; - - if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) { - [self jumpPlayActionWithIndex:index imageUrlList:imageUrlList]; - return; - } - - NSString *picUrl = [imageUrlList xpSafeObjectAtIndex:index]; - if ([NSString isEmpty:picUrl]) { - return; - } - - NSMutableArray *infoList = @[].mutableCopy; - ActivityInfoModel * info; - for (ActivityInfoModel * getInfo in self.activityList) { - if([getInfo.icon isEqualToString:picUrl]){ - info = getInfo; - } - if(getInfo.skipType == ActivitySkipType_Web){ - [infoList addObject:getInfo]; - } - } - if (info == nil) { - return; - } - - if ([info.code isEqualToString:@"FIRST_CHARGE"]) { - [self firstRechargeTapRecognizer]; - } else if ([info.code isEqualToString:@"FIND_LOVE"]) { - [self lookLoveTapRecognizer]; - } else if ([info.code isEqualToString:@"NAUTICAL_ADVENTURE"]) { - [self sailTapRecognizer]; - } else { - if (info.skipType == ActivitySkipType_Room) { - [self.hostDelegate exitRoom]; - [XPRoomViewController openRoom:info.skipContent viewController:kWindow.rootViewController]; - } else if(info.skipType == ActivitySkipType_Web) { - PIRoomActivityWebView * webView = [[PIRoomActivityWebView alloc]initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)]; - webView.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - webView.url = info.skipContent; - webView.infoList = infoList; - [kWindow addSubview:webView]; - [UIView animateWithDuration:0.2 animations:^{ - webView.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - }]; - } - } -} - --(void)jumpPlayActionWithIndex:(NSInteger)index imageUrlList:(NSArray *)imageUrlList { - -} - -- (void)firstRechargeTapRecognizer { - -} - -- (void)lookLoveTapRecognizer { - XPCandyTreeViewController * candyTreeVC = [[XPCandyTreeViewController alloc] initWithDelegate:self.hostDelegate]; - candyTreeVC.view.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight); - [[XCCurrentVCStackManager shareManager].getCurrentVC.view addSubview:candyTreeVC.view]; - [[XCCurrentVCStackManager shareManager].getCurrentVC addChildViewController:candyTreeVC]; - [candyTreeVC.navigationController setNavigationBarHidden:YES animated:NO]; - [UIView animateWithDuration:0.1 animations:^{ - candyTreeVC.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - }completion:^(BOOL finished) { - - }]; -} - -- (void)sailTapRecognizer { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - XPSailingViewController * sailingVC = [[XPSailingViewController alloc] initWithRoomUid:roomUid]; - [self.hostDelegate.getCurrentNav presentViewController:sailingVC animated:YES completion:nil]; -} - - -#pragma mark - Getters -- (UIScrollView *)scrollView { - if (!_scrollView) { - _scrollView = [[UIScrollView alloc] init]; - } - return _scrollView; -} - -- (UIStackView *)scrollContainStack { - if (!_scrollContainStack) { - _scrollContainStack = [[UIStackView alloc] init]; - _scrollContainStack.axis = UILayoutConstraintAxisVertical; - _scrollContainStack.alignment = UIStackViewAlignmentFill; - _scrollContainStack.distribution = UIStackViewDistributionEqualSpacing; - _scrollContainStack.spacing = kMenuItemSpacing; - } - return _scrollContainStack; -} - -- (UIButton *)gambleMenuButton { - if (!_gambleMenuButton) { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:[UIImage imageNamed:@"ms_room_game_button"] forState:UIControlStateNormal]; - [b addTarget:self action:@selector(didTapGameMenuButton) forControlEvents:UIControlEventTouchUpInside]; - b.imageView.contentMode = UIViewContentModeScaleAspectFit; - b.contentHorizontalAlignment = UIControlContentHorizontalAlignmentFill; - b.contentVerticalAlignment = UIControlContentVerticalAlignmentFill; - b.tag = 101; - _gambleMenuButton = b; - } - return _gambleMenuButton; -} - -- (UIButton *)configEntranceMenuButton { - if (!_configEntranceMenuButton) { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:[UIImage imageNamed:@"ms_room_game_add_coin"] forState:UIControlStateNormal]; - [b addTarget:self action:@selector(didTapConfigEntranceButton) forControlEvents:UIControlEventTouchUpInside]; - b.imageView.contentMode = UIViewContentModeScaleAspectFit; - b.contentHorizontalAlignment = UIControlContentHorizontalAlignmentFill; - b.contentVerticalAlignment = UIControlContentVerticalAlignmentFill; - b.tag = 102; - _configEntranceMenuButton = b; - } - return _configEntranceMenuButton; -} - -- (UIButton *)pkMenuButton { - if (!_pkMenuButton) { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setBackgroundImage:[UIImage imageNamed:@"room_pk_panel_mini_icon"] forState:UIControlStateNormal]; - [b addTarget:self action:@selector(didTapPKMenuButton) forControlEvents:UIControlEventTouchUpInside]; - b.imageEdgeInsets = UIEdgeInsetsMake(kMenuItemSpacing, kMenuItemSpacing, kMenuItemSpacing, kMenuItemSpacing); - b.tag = 105; - _pkMenuButton = b; - } - return _pkMenuButton; -} - -- (SDCycleScrollView *)cycleScrollView { - if (!_cycleScrollView) { - _cycleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:nil]; - _cycleScrollView.backgroundColor = [UIColor purpleColor]; - _cycleScrollView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter; - _cycleScrollView.currentPageDotColor = [UIColor whiteColor]; - _cycleScrollView.pageDotColor = [UIColor colorWithWhite:1 alpha:0.2]; - _cycleScrollView.pageControlDotSize = CGSizeMake(5, 2); - _cycleScrollView.pageControlStyle = SDCycleScrollViewPageContolStyleClassic; - _cycleScrollView.currentPageDotImage = [UIImage imageNamed:@"room_activity_banner_select"]; - _cycleScrollView.pageDotImage = [UIImage imageNamed:@"room_activity_banner_normal"]; - _cycleScrollView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.00]; - _cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFit; - _cycleScrollView.pageControlBottomOffset = -10; - _cycleScrollView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - return _cycleScrollView; -} - -- (RoomBoomEntryView *)boomView { - if (!_boomView) { - _boomView = [[RoomBoomEntryView alloc] init]; - _boomView.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(displayBoomInfoProgress)]; - [_boomView addGestureRecognizer:tap]; - _boomView.tag = 103; - _boomView.hidden = YES; - } - return _boomView; -} - -- (UIImageView *)joinView { - if (!_joinView) { - _joinView = [[UIImageView alloc] init]; - _joinView.image = [UIImage getLanguageImage:@"room_mode_dating_enter"]; - _joinView.userInteractionEnabled = YES; - _joinView.contentMode = UIViewContentModeScaleAspectFit; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapJoinDatingRecognizer)]; - [_joinView addGestureRecognizer:tap]; - _joinView.tag = 104; - } - return _joinView; -} - -- (NetImageView *)loader_url_1 { - if (!_loader_url_1) { - _loader_url_1 = [[NetImageView alloc] init]; - } - return _loader_url_1; -} - -- (NetImageView *)loader_url_2 { - if (!_loader_url_2) { - _loader_url_2 = [[NetImageView alloc] init]; - } - return _loader_url_2; -} - -- (UIButton *)expandButton { - if (!_expandButton) { - _expandButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_expandButton setImage:kImage(@"side_menu_open") forState:UIControlStateNormal]; - [_expandButton addTarget:self action:@selector(didTapExpand) forControlEvents:UIControlEventTouchUpInside]; - _expandButton.hidden = YES; - } - return _expandButton; -} - -- (PIRoomEnterRedPacketView *)redPacketView{ - if(!_redPacketView){ - _redPacketView = [[PIRoomEnterRedPacketView alloc]initWithFrame:CGRectZero]; - _redPacketView.hidden = YES; - _redPacketView.tag = 106; - _redPacketView.delegate = self; - } - return _redPacketView; -} - -- (OpenLuckyPackageEntranceView *)giftEntranceButton { - if (!_giftEntranceButton) { - _giftEntranceButton = [[OpenLuckyPackageEntranceView alloc] init]; - _giftEntranceButton.tag = 107; - } - return _giftEntranceButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/Api/Api+Sailing.h b/YuMi/Modules/YMRoom/View/Sailing/Api/Api+Sailing.h deleted file mode 100644 index 7859649..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Api/Api+Sailing.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// Api+Sailing.h -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (Sailing) -/// 获取航海排行榜列表 -/// @param compltion 完成 -/// @param page 当前的页数 -/// @param pageSize 一个多少个 -/// @param datetype 类型 今日榜1 昨日榜2 -+ (void)getSailingRankList:(HttpRequestHelperCompletion)compltion page:(NSString *)page pageSize:(NSString *)pageSize datetype:(NSString *)datetype; - -/// 获取航海的燃料 -/// @param completion 完成 -/// @param uid 用户的uid -+ (void)getSailingInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; - -/// 开始航海 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param keyNum 燃料数 -/// @param sendMessage 是否发消息 -/// @param roomUid 房间的uid -+ (void)openSailing:(HttpRequestHelperCompletion)completion uid:(NSString *)uid keyNum:(NSString *)keyNum sendMessage:(NSString *)sendMessage roomUid:(NSString *)roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/Api/Api+Sailing.m b/YuMi/Modules/YMRoom/View/Sailing/Api/Api+Sailing.m deleted file mode 100644 index 2d0890e..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Api/Api+Sailing.m +++ /dev/null @@ -1,44 +0,0 @@ -// -// Api+Sailing.m -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import "Api+Sailing.h" -#import -@implementation Api (Sailing) - - -/// 获取航海排行榜列表 -/// @param compltion 完成 -/// @param page 当前的页数 -/// @param pageSize 一个多少个 -/// @param datetype 类型 今日榜1 昨日榜2 -+ (void)getSailingRankList:(HttpRequestHelperCompletion)compltion page:(NSString *)page pageSize:(NSString *)pageSize datetype:(NSString *)datetype { - NSString * fang = [NSString stringFromBase64String:@"bGluZWFybHlQb29sL3Jhbmtpbmdz"];///linearlyPool/rankings - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:compltion, __FUNCTION__, page, pageSize, datetype, nil]; -} - - -/// 获取航海的燃料 -/// @param completion 完成 -/// @param uid 用户的uid -+ (void)getSailingInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"bGluZWFybHlQb29sL3VzZXJrZXk="];///linearlyPool/userkey - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, uid, nil]; -} - - -/// 开始航海 -/// @param completion 完成 -/// @param uid 用户的uid -/// @param keyNum 燃料数 -/// @param sendMessage 是否发消息 -/// @param roomUid 房间的uid -+ (void)openSailing:(HttpRequestHelperCompletion)completion uid:(NSString *)uid keyNum:(NSString *)keyNum sendMessage:(NSString *)sendMessage roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"bGluZWFybHlQb29sL2RyYXc="];///linearlyPool/draw - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion,__FUNCTION__, uid, keyNum, sendMessage, roomUid, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingInfoModel.h b/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingInfoModel.h deleted file mode 100644 index f4ad3a8..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingInfoModel.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// RoomSailingInfoModel.h -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomSailingInfoModel : PIBaseModel -///燃料的个数 -@property (nonatomic, assign) NSInteger keyNum; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingInfoModel.m b/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingInfoModel.m deleted file mode 100644 index f8c31f5..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RoomSailingInfoModel.m -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import "RoomSailingInfoModel.h" - -@implementation RoomSailingInfoModel - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeListModel.h b/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeListModel.h deleted file mode 100644 index 1a4a321..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeListModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// RoomSailingPrizeListModel.h -// YUMI -// -// Created by YUMI on 2022/8/15. -// - -#import -#import "RoomSailingPrizeModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface RoomSailingPrizeListModel : PIBaseModel -///奖品的数组 -@property (nonatomic,strong) NSArray *prizeItemList; -///剩余钥匙数 -@property (nonatomic,assign) NSInteger remainKeyNum; -///是否有元宝礼物 -@property (nonatomic,assign) BOOL specialStatus; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeListModel.m b/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeListModel.m deleted file mode 100644 index c37fcdd..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeListModel.m +++ /dev/null @@ -1,15 +0,0 @@ -// -// RoomSailingPrizeListModel.m -// YUMI -// -// Created by YUMI on 2022/8/15. -// - -#import "RoomSailingPrizeListModel.h" - -@implementation RoomSailingPrizeListModel -+ (NSDictionary *)objectClassInArray { - return @{@"prizeItemList": RoomSailingPrizeModel.class}; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeModel.h b/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeModel.h deleted file mode 100644 index 16e09c5..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeModel.h +++ /dev/null @@ -1,51 +0,0 @@ -// -// RoomSailingPrizeModel.h -// YUMI -// -// Created by YUMI on 2022/8/15. -// - -#import - - -typedef enum : NSUInteger { - SailingPrizeLevelOne=1, - SailingPrizeLevelTwo, - SailingPrizeLevelThree, - SailingPrizeLevelFour, - SailingPrizeLevelFive -} SailingPrizeLevel; - -//奖品类型。1-萌币，2-礼物，3-座驾，4-头饰，5-背景，6-实物，7-靓号，8-全麦礼物 -typedef NS_ENUM(NSUInteger, SailingPrizeType) { - SailingPrizeType_Gold = 1, - SailingPrizeType_Gift, - SailingPrizeType_Car, - SailingPrizeType_Headwear, - SailingPrizeType_Background, - SailingPrizeType_Matter, - SailingPrizeType_Beautif, - SailingPrizeType_WholeServer - -}; - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomSailingPrizeModel : PIBaseModel -@property (nonatomic, copy) NSString *prizeName;//奖品名称 -@property (nonatomic, copy) NSString *prizeImgUrl;//奖品icon -@property (nonatomic, assign) SailingPrizeType prizeType;//奖品类型 -@property (nonatomic, copy) NSString *prizeTypeDesc;//奖品类型描述 -@property (nonatomic, assign) int prizeNum;//奖品数量 -@property (nonatomic, assign) CGFloat platformValue;//价格 -@property (nonatomic, assign) SailingPrizeLevel prizeLevel;//奖品等级 -@property (nonatomic, assign) NSInteger referenceId;//相关实体id -@property (nonatomic, assign) NSInteger prizeId;//奖品id -@property (nonatomic,copy) NSString *nick; -///等级限制 大于这个等级才能加到公屏 -@property (nonatomic,assign) NSInteger userLevelLimit; -///用户的uid -@property (nonatomic,copy) NSString *uid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeModel.m b/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeModel.m deleted file mode 100644 index 9949616..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingPrizeModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RoomSailingPrizeModel.m -// YUMI -// -// Created by YUMI on 2022/8/15. -// - -#import "RoomSailingPrizeModel.h" - -@implementation RoomSailingPrizeModel - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingRankModel.h b/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingRankModel.h deleted file mode 100644 index c227da5..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingRankModel.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// RoomSailingRankModel.h -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface RoomSailingRankModel : PIBaseModel -@property (copy, nonatomic) NSString * uid; -@property (copy, nonatomic) NSString *nick; -@property (copy, nonatomic) NSString *avatar; //头像 -@property (nonatomic,strong) NSString *badge;//徽章 -@property (nonatomic,strong) NSString *micDecorate;//头饰 -@property (copy, nonatomic) NSString *goldAmount;//房间send/receive钻石总数 -@property (strong, nonatomic) NSNumber *amount;//房间许愿池排行榜钻石 -@property (copy, nonatomic) NSString *ranking;//排名 -@property (nonatomic,assign) BOOL hide;//是否榜单隐身 -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingRankModel.m b/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingRankModel.m deleted file mode 100644 index c33af91..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Model/RoomSailingRankModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RoomSailingRankModel.m -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import "RoomSailingRankModel.h" - -@implementation RoomSailingRankModel - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/Presenter/Protocol/XPSailingProtocol.h b/YuMi/Modules/YMRoom/View/Sailing/Presenter/Protocol/XPSailingProtocol.h deleted file mode 100644 index fae0532..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Presenter/Protocol/XPSailingProtocol.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMSailingProtocol.h -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomSailingInfoModel, RoomSailingPrizeListModel; -@protocol XPSailingProtocol -///获取航海的信息成功 -- (void)getSailingInfoSuccess:(RoomSailingInfoModel *)info; -///开启一个探索成功 -- (void)openSailingSuccess:(RoomSailingPrizeListModel *)model; -///探索一次失败 -- (void)openSailingFail:(NSString *)message; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/Presenter/XPSailingPresenter.h b/YuMi/Modules/YMRoom/View/Sailing/Presenter/XPSailingPresenter.h deleted file mode 100644 index 79914b6..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Presenter/XPSailingPresenter.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMSailingPresenter.h -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSailingPresenter : BaseMvpPresenter -/// 获取航海信息 -- (void)getSailingInfo; - -///开始探索 -- (void)openSailing:(NSString *)roomUid sendMessage:(BOOL)sendMessage keyNum:(NSInteger)keyNum; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/Presenter/XPSailingPresenter.m b/YuMi/Modules/YMRoom/View/Sailing/Presenter/XPSailingPresenter.m deleted file mode 100644 index 209b019..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/Presenter/XPSailingPresenter.m +++ /dev/null @@ -1,39 +0,0 @@ -// -// YMSailingPresenter.m -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import "XPSailingPresenter.h" -#import "Api+Sailing.h" -#import "AccountInfoStorage.h" -#import "RoomSailingInfoModel.h" -#import "RoomSailingPrizeListModel.h" -#import "XPSailingProtocol.h" - -@implementation XPSailingPresenter - -/// 获取航海信息 -- (void)getSailingInfo { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getSailingInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - RoomSailingInfoModel * info = [RoomSailingInfoModel modelWithDictionary:data.data]; - [[self getView] getSailingInfoSuccess:info]; - }] uid:uid]; -} - -///开始探索 -- (void)openSailing:(NSString *)roomUid sendMessage:(BOOL)sendMessage keyNum:(NSInteger)keyNum { - NSString * keyNumStr = [NSString stringWithFormat:@"%ld", keyNum]; - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * sendMessageStr = [NSString stringWithFormat:@"%d", sendMessage]; - [Api openSailing:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - RoomSailingPrizeListModel * listModel = [RoomSailingPrizeListModel modelWithDictionary:data.data]; - [[self getView] openSailingSuccess:listModel]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView] openSailingFail:msg]; - } ] uid:uid keyNum:keyNumStr sendMessage:sendMessageStr roomUid:roomUid]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingEmptyTableViewCell.h b/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingEmptyTableViewCell.h deleted file mode 100644 index 07ce1e4..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingEmptyTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMSailingEmptyTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSailingEmptyTableViewCell : UITableViewCell - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingEmptyTableViewCell.m deleted file mode 100644 index badc8fb..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingEmptyTableViewCell.m +++ /dev/null @@ -1,73 +0,0 @@ -// -// YMSailingEmptyTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import "XPSailingEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPSailingEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPSailingEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(50); - make.size.mas_equalTo(CGSizeMake(100, 100)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPSailingEmptyTableViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingPrizeCollectionViewCell.h b/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingPrizeCollectionViewCell.h deleted file mode 100644 index ba49df9..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingPrizeCollectionViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMSailingPrizeCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomSailingPrizeModel; -@interface XPSailingPrizeCollectionViewCell : UICollectionViewCell -@property (nonatomic,strong) RoomSailingPrizeModel *prizeModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingPrizeCollectionViewCell.m b/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingPrizeCollectionViewCell.m deleted file mode 100644 index 4a15237..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingPrizeCollectionViewCell.m +++ /dev/null @@ -1,85 +0,0 @@ -// -// YMSailingPrizeCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "XPSailingPrizeCollectionViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "RoomSailingPrizeModel.h" - -@interface XPSailingPrizeCollectionViewCell () -@property (nonatomic,strong) NetImageView *logoImageView; -@property (nonatomic,strong) UILabel *titleLabel; - -@end - -@implementation XPSailingPrizeCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.contentView.backgroundColor = [UIColor clearColor]; - [self.contentView addSubview:self.logoImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(42, 42)); - make.top.centerX.mas_equalTo(self.self.contentView); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.logoImageView); - make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(5); - }]; -} - -#pragma mark - Getters And Setters -- (void)setPrizeModel:(RoomSailingPrizeModel *)prizeModel { - _prizeModel = prizeModel; - if (_prizeModel) { - self.logoImageView.imageUrl = _prizeModel.prizeImgUrl; - self.titleLabel.text = [NSString stringWithFormat:@"%@*%d", _prizeModel.prizeName, _prizeModel.prizeNum]; - } -} - -- (NetImageView *)logoImageView { - if (!_logoImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _logoImageView = [[NetImageView alloc] initWithConfig:config]; - _logoImageView.layer.masksToBounds = YES; - _logoImageView.layer.cornerRadius = 8; - _logoImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _logoImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:10]; - _titleLabel.textColor = UIColorFromRGB(0xA08161); - _titleLabel.numberOfLines = 2; - } - return _titleLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingRankTableViewCell.h b/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingRankTableViewCell.h deleted file mode 100644 index 62b3aa3..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingRankTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMSailingRankTableViewCell.h -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomSailingRankModel; -@interface XPSailingRankTableViewCell : UITableViewCell -@property (nonatomic,strong) RoomSailingRankModel *rankInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingRankTableViewCell.m b/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingRankTableViewCell.m deleted file mode 100644 index 76afa40..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingRankTableViewCell.m +++ /dev/null @@ -1,178 +0,0 @@ -// -// YMSailingRankTableViewCell.m -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import "XPSailingRankTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -///Model -#import "RoomSailingRankModel.h" - -@interface XPSailingRankTableViewCell () -///背景 -@property (nonatomic,strong) UIView * backView; -///排名 -@property (nonatomic,strong) UIButton *rankButton; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///昵称 -@property (nonatomic,strong) UILabel *nickLabel; -///钻石 -@property (nonatomic,strong) UILabel *coinLabel; -///钻石 -@property (nonatomic,strong) UIImageView *diamondImageView; - -@end - -@implementation XPSailingRankTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.backView]; - [self.backView addSubview:self.rankButton]; - [self.backView addSubview:self.avatarImageView]; - [self.backView addSubview:self.nickLabel]; - [self.backView addSubview:self.diamondImageView]; - [self.backView addSubview:self.coinLabel]; -} - -- (void)initSubViewConstraints { - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.top.mas_equalTo(self.contentView); - make.height.mas_equalTo(60); - }]; - - [self.rankButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(29, 20)); - make.leading.mas_equalTo(self.backView).offset(15); - make.centerY.mas_equalTo(self.backView); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(50, 50)); - make.centerY.mas_equalTo(self.backView); - make.leading.mas_equalTo(self.rankButton.mas_trailing).offset(24); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(5); - make.centerY.mas_equalTo(self.avatarImageView); - make.trailing.mas_lessThanOrEqualTo(self.diamondImageView.mas_leading).offset(-5); - }]; - - - [self.diamondImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(14, 12)); - make.centerY.mas_equalTo(self.backView); - make.trailing.mas_equalTo(self.coinLabel.mas_leading).offset(-2); - }]; - - [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.backView).offset(-10); - make.centerY.mas_equalTo(self.backView); - make.width.mas_equalTo(80); - }]; - -} - -#pragma mark - Getters And Setters -- (void)setRankInfo:(RoomSailingRankModel *)rankInfo { - _rankInfo = rankInfo; - if (_rankInfo) { - self.avatarImageView.imageUrl = _rankInfo.avatar; - self.nickLabel.text = _rankInfo.nick; - self.coinLabel.text = _rankInfo.amount.stringValue; - if (_rankInfo.ranking.integerValue == 1) { - [self.rankButton setImage:[UIImage imageNamed:@"room_sailing_rank_first"] forState:UIControlStateNormal]; - [self.rankButton setTitle:@"" forState:UIControlStateNormal]; - } else if(_rankInfo.ranking.integerValue == 2) { - [self.rankButton setImage:[UIImage imageNamed:@"room_sailing_rank_second"] forState:UIControlStateNormal]; - [self.rankButton setTitle:@"" forState:UIControlStateNormal]; - } else if(_rankInfo.ranking.integerValue == 3) { - [self.rankButton setImage:[UIImage imageNamed:@"room_sailing_rank_third"] forState:UIControlStateNormal]; - [self.rankButton setTitle:@"" forState:UIControlStateNormal]; - } else { - [self.rankButton setTitle:_rankInfo.ranking forState:UIControlStateNormal]; - [self.rankButton setImage:nil forState:UIControlStateNormal]; - } - } -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [DJDKMIMOMColor colorWithHexString:@"#ffeec3"]; - _backView.layer.masksToBounds = YES; - _backView.layer.cornerRadius = 6; - } - return _backView; -} - -- (UIButton *)rankButton { - if (!_rankButton) { - _rankButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_rankButton setTitle:@"1" forState:UIControlStateNormal]; - [_rankButton setTitleColor:[DJDKMIMOMColor colorWithHexString:@"#CFAD79"] forState:UIControlStateNormal]; - _rankButton.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - } - return _rankButton; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 50/2; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:12]; - _nickLabel.textColor = [DJDKMIMOMColor colorWithHexString:@"#A08161"]; - } - return _nickLabel; -} - -- (UIImageView *)diamondImageView { - if (!_diamondImageView) { - _diamondImageView = [[UIImageView alloc] init]; - _diamondImageView.userInteractionEnabled = YES; - _diamondImageView.image = [UIImage imageNamed:@"moli_money_icon"]; - } - return _diamondImageView; -} - -- (UILabel *)coinLabel { - if (!_coinLabel) { - _coinLabel = [[UILabel alloc] init]; - _coinLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - _coinLabel.textColor = [DJDKMIMOMColor colorWithHexString:@"#64472E"]; - } - return _coinLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.h b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.h deleted file mode 100644 index 2939e02..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// YMSailingAnimationView.h -// YUMI -// -// Created by YUMI on 2022/8/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@interface XPSailingAnimationView : UIView -@property (nonatomic,strong) NSDictionary *prizeInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.m deleted file mode 100644 index 37c8591..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.m +++ /dev/null @@ -1,102 +0,0 @@ -// -// YMSailingAnimationView.m -// YUMI -// -// Created by YUMI on 2022/8/19. -// - -#import "XPSailingAnimationView.h" -///Third -#import -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "RoomSailingPrizeModel.h" -#import "NSObject+MJExtension.h" - - - -@interface XPSailingAnimationView () -///背景图 -@property (nonatomic,strong) UIImageView *backImageView; -///房间名字 -@property (nonatomic,strong) MarqueeLabel *titleLabel; -@end - -@implementation XPSailingAnimationView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self.backImageView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backImageView).offset(89 * kScreenScale); - make.top.mas_equalTo(self.backImageView).offset(29 * kScreenScale); - make.trailing.mas_lessThanOrEqualTo(self.backImageView); - }]; -} - -- (NSAttributedString *)createAttribute:(NSString * )text color:(UIColor *)color fontSize:(CGFloat)fonSize { - NSDictionary * attribute = @{NSFontAttributeName:[UIFont systemFontOfSize:fonSize], NSForegroundColorAttributeName:color}; - NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:text attributes:attribute]; - return attr; -} - - - -#pragma mark - Getters And Setters -- (void)setPrizeInfo:(NSDictionary *)prizeInfo { - _prizeInfo = prizeInfo; - if (_prizeInfo) { - RoomSailingPrizeModel * info = [RoomSailingPrizeModel modelWithDictionary:_prizeInfo]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - CGFloat fontSize = 12; - [attribute appendAttributedString:[self createAttribute:YMLocalizedString(@"XPRoomMessageParser12") color:[UIColor whiteColor] fontSize:fontSize]]; - NSString * nick = info.nick; - if (nick.length > 6) { - nick = [nick substringToIndex:6]; - } - [attribute appendAttributedString:[self createAttribute:nick color:UIColorFromRGB(0xFFFE95) fontSize:fontSize]]; - [attribute appendAttributedString:[self createAttribute:YMLocalizedString(@"XPRoomMessageParser13") color:[UIColor whiteColor] fontSize:fontSize]]; - [attribute appendAttributedString:[self createAttribute:info.prizeName color:UIColorFromRGB(0xFFFE95) fontSize:fontSize]]; - if (info.prizeNum > 1) { - [attribute appendAttributedString:[self createAttribute:[NSString stringWithFormat:@" X%d", info.prizeNum] color:[UIColor whiteColor] fontSize:fontSize]]; - } - self.titleLabel.attributedText = attribute; - } -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"room_sailing_animation_gift_bg"]; - } - return _backImageView; -} - -- (MarqueeLabel *)titleLabel{ - if (!_titleLabel) { - _titleLabel = [[MarqueeLabel alloc] init]; - _titleLabel.scrollDuration = 4.0; - _titleLabel.fadeLength = 15; - _titleLabel.userInteractionEnabled = YES; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.h b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.h deleted file mode 100644 index 4076e1f..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// YMSailingBuyFuelView.h -// YUMI -// -// Created by YUMI on 2022/8/23. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPSailingBuyFuelView; -@protocol XPSailingBuyFuelViewDelegate -///取消 -- (void)xPSailingBuyFuelView:(XPSailingBuyFuelView *)view didClickCancel:(UIButton *)sender; -///购买 -- (void)xPSailingBuyFuelView:(XPSailingBuyFuelView *)view didClickBuy:(UIButton *)sender; - -@end -@interface XPSailingBuyFuelView : UIView -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.m deleted file mode 100644 index 286f88a..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.m +++ /dev/null @@ -1,126 +0,0 @@ -// -// YMSailingBuyFuelView.m -// YUMI -// -// Created by YUMI on 2022/8/23. -// - -#import "XPSailingBuyFuelView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface XPSailingBuyFuelView () -///背景 -@property (nonatomic,strong) UIImageView *backImageView; -///内容 -@property (nonatomic,strong) UILabel *titleLabel; -///取消 -@property (nonatomic,strong) UIButton *cancelButton; -///购买 -@property (nonatomic,strong) UIButton *buyButton; - -@end - - -@implementation XPSailingBuyFuelView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self.backImageView addSubview:self.titleLabel]; - [self.backImageView addSubview:self.cancelButton]; - [self.backImageView addSubview:self.buyButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(280, 177)); - }]; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.backImageView).offset(54); - make.centerX.mas_equalTo(self.backImageView); - }]; - - [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(85, 24)); - make.trailing.mas_equalTo(self.backImageView.mas_centerX).offset(-10); - make.bottom.mas_equalTo(self.backImageView).offset(-24); - }]; - - [self.buyButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.centerY.mas_equalTo(self.cancelButton); - make.leading.mas_equalTo(self.backImageView.mas_centerX).offset(10); - }]; -} - -#pragma mark - Event Response -- (void)cancelButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPSailingBuyFuelView:didClickCancel:)]) { - [self.delegate xPSailingBuyFuelView:self didClickCancel:sender]; - } -} - -- (void)buyButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPSailingBuyFuelView:didClickBuy:)]) { - [self.delegate xPSailingBuyFuelView:self didClickBuy:sender]; - } -} - -#pragma mark - Getters And Setters -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"room_sailing_buy_fuel_bg"]; - } - return _backImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textColor = UIColorFromRGB(0x64472E); - _titleLabel.text = YMLocalizedString(@"XPSailingBuyFuelView0"); - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.numberOfLines = 2; - } - return _titleLabel; -} - -- (UIButton *)cancelButton { - if (!_cancelButton) { - _cancelButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_cancelButton setImage:[UIImage imageNamed:@"room_sailing_buy_fuel_cancel"] forState:UIControlStateNormal]; - [_cancelButton setImage:[UIImage imageNamed:@"room_sailing_buy_fuel_cancel"] forState:UIControlStateSelected]; - [_cancelButton addTarget:self action:@selector(cancelButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _cancelButton; -} - -- (UIButton *)buyButton { - if (!_buyButton) { - _buyButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_buyButton setImage:[UIImage imageNamed:@"room_sailing_buy_fuel_sure"] forState:UIControlStateNormal]; - [_buyButton setImage:[UIImage imageNamed:@"room_sailing_buy_fuel_sure"] forState:UIControlStateSelected]; - [_buyButton addTarget:self action:@selector(buyButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _buyButton; -} -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingGiftView.h b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingGiftView.h deleted file mode 100644 index 29ba108..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingGiftView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMSailingGiftView.h -// YUMI -// -// Created by YUMI on 2022/8/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomSailingPrizeModel; -@interface XPSailingGiftView : UIView -@property (nonatomic,strong) RoomSailingPrizeModel *prizeInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingGiftView.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingGiftView.m deleted file mode 100644 index 9e52a48..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingGiftView.m +++ /dev/null @@ -1,88 +0,0 @@ -// -// YMSailingGiftView.m -// YUMI -// -// Created by YUMI on 2022/8/19. -// - -#import "XPSailingGiftView.h" -///Third -#import -#import "RoomSailingPrizeModel.h" -#import "XPCandyTreeAnimationModel.h" - -@interface XPSailingGiftView () -///礼物背景 -@property (nonatomic,strong) UIImageView *backImageView; -///显示文字 -@property (nonatomic,strong) UILabel *titleLabel; -///动画完成 -@property (nonatomic,copy) void(^FinishBlock)(BOOL finish); -@end - -@implementation XPSailingGiftView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - make.height.mas_equalTo(19); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.backImageView.mas_leading).offset(3); - make.centerY.mas_equalTo(self.backImageView); - }]; -} -#pragma mark - Getters And Setters -- (void)setPrizeInfo:(RoomSailingPrizeModel *)prizeInfo { - _prizeInfo = prizeInfo; - if (_prizeInfo) { - NSString * backImage= @"candy_tree_levle_third"; - if(_prizeInfo.prizeLevel == SailingPrizeLevelFour) { - backImage = @"candy_tree_levle_fourth"; - } else if(_prizeInfo.prizeLevel == SailingPrizeLevelFive) { - backImage = @"candy_tree_levle_fifth"; - } - self.backImageView.image = [UIImage imageNamed:backImage]; - if (_prizeInfo.prizeName.length > 7) { - _prizeInfo.prizeName = [_prizeInfo.prizeName substringToIndex:7]; - } - NSString * giftTitle = [NSString stringWithFormat:@"%@ x %d", _prizeInfo.prizeName, _prizeInfo.prizeNum]; - self.titleLabel.text = giftTitle; - } - [self layoutIfNeeded]; -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - } - return _backImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:10]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingPrizeView.h b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingPrizeView.h deleted file mode 100644 index 1e66dcc..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingPrizeView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMSailingPrizeView.h -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomSailingPrizeListModel; -@interface XPSailingPrizeView : UIView -@property (nonatomic,strong) RoomSailingPrizeListModel * prizeInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingPrizeView.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingPrizeView.m deleted file mode 100644 index b6558db..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingPrizeView.m +++ /dev/null @@ -1,111 +0,0 @@ -// -// YMSailingPrizeView.m -// YUMI -// -// Created by YUMI on 2022/8/18. -// - -#import "XPSailingPrizeView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -///Model -#import "RoomSailingPrizeListModel.h" -///View -#import "XPSailingPrizeCollectionViewCell.h" - -@interface XPSailingPrizeView () - -///背景 -@property (nonatomic,strong) UIImageView *backImageView; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -@end - - -@implementation XPSailingPrizeView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self.backImageView addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.backImageView).offset(75); - make.leading.trailing.mas_equalTo(self.backImageView); - make.bottom.mas_equalTo(self).offset(-10); - }]; -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.prizeInfo.prizeItemList.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPSailingPrizeCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPSailingPrizeCollectionViewCell class]) forIndexPath:indexPath]; - cell.prizeModel = [self.prizeInfo.prizeItemList xpSafeObjectAtIndex:indexPath.row]; - return cell; -} -#pragma mark - Getters And Setters -- (void)setPrizeInfo:(RoomSailingPrizeListModel *)prizeInfo{ - _prizeInfo = prizeInfo; - [self.collectionView reloadData]; - if (_prizeInfo.specialStatus) { - if (_prizeInfo.prizeItemList.count > 5) { - self.backImageView.image = [UIImage imageNamed:@"room_sailing_prize_cowry_large"]; - }else { - self.backImageView.image = [UIImage imageNamed:@"room_sailing_prize_crowy"]; - } - } else { - if (prizeInfo.prizeItemList.count > 5) { - self.backImageView.image = [UIImage imageNamed:@"room_sailing_prize_normal_large"]; - }else { - self.backImageView.image = [UIImage imageNamed:@"room_sailing_prize_one"]; - } - } -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - } - return _backImageView; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.sectionInset = UIEdgeInsetsMake(0, 21, 0, 21); - layout.itemSize = CGSizeMake(42, 47 + 21); - layout.minimumLineSpacing = 7; - layout.minimumInteritemSpacing = 7; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPSailingPrizeCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPSailingPrizeCollectionViewCell class])]; - - } - return _collectionView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankSubView.h b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankSubView.h deleted file mode 100644 index 34e2f0f..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankSubView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMSailingRankSubView.h -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import -#import -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, SailingRankType) { - SailingRankType_Today = 1, - SailingRankType_YesterDay = 2 -}; - -@interface XPSailingRankSubView : UIView -@property (nonatomic,assign) SailingRankType type; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankSubView.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankSubView.m deleted file mode 100644 index b4d2750..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankSubView.m +++ /dev/null @@ -1,177 +0,0 @@ -// -// YMSailingRankSubView.m -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import "XPSailingRankSubView.h" -///Third -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "Api+Sailing.h" -#import "XNDJTDDLoadingTool.h" -#import "NSArray+Safe.h" -///Model -#import "RoomSailingRankModel.h" -///View -#import "XPSailingEmptyTableViewCell.h" -#import "XPSailingRankTableViewCell.h" - -@interface XPSailingRankSubView () -///列表 -@property (nonatomic,strong) UITableView *tableView; -/// 数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -@property (nonatomic,assign) int page; -@property (nonatomic,assign) BOOL hasNoMoreData; -@end - -@implementation XPSailingRankSubView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - -} - -#pragma mark - 刷新的fangfa -- (void)headerRefresh { - self.page = 1; - NSString * page = [NSString stringWithFormat:@"%d", self.page]; - NSString * type = [NSString stringWithFormat:@"%ld", self.type]; - [Api getSailingRankList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [self.tableView.mj_header endRefreshing]; - if (code == 200) { - [self.datasource removeAllObjects]; - NSArray * array = [RoomSailingRankModel modelsWithArray:data.data[@"rankVos"]]; - [self.datasource addObjectsFromArray:array]; - self.hasNoMoreData = NO; - [self.tableView reloadData]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } page:page pageSize:@"20" datetype:type]; - -} - -- (void)footerRefresh { - if (self.hasNoMoreData) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPSailingRankSubView0")]; - [self.tableView.mj_footer endRefreshing]; - return; - } - self.page++; - NSString * page = [NSString stringWithFormat:@"%d", self.page]; - NSString * type = [NSString stringWithFormat:@"%ld", self.type]; - [Api getSailingRankList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [self.tableView.mj_footer endRefreshing]; - if (code == 200) { - NSArray * array = [RoomSailingRankModel modelsWithArray:data.data[@"rankVos"]]; - if (array.count > 0) { - [self.datasource addObjectsFromArray:array]; - self.hasNoMoreData = NO; - } else { - self.hasNoMoreData= YES; - } - [self.tableView reloadData]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } page:page pageSize:@"20" datetype:type]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? 74 : 380; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0 ) { - XPSailingRankTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPSailingRankTableViewCell class])]; - if (cell == nil) { - cell = [[XPSailingRankTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPSailingRankTableViewCell class])]; - } - cell.rankInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - return cell; - } - XPSailingEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPSailingEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPSailingEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPSailingEmptyTableViewCell class])]; - } - return cell; -} - - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self; -} - -- (void)setType:(SailingRankType)type { - _type = type; - [self headerRefresh]; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPSailingEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPSailingEmptyTableViewCell class])]; - [_tableView registerClass:[XPSailingRankTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPSailingRankTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.h b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.h deleted file mode 100644 index 6d2084c..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMSailingRankView.h -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSailingRankView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.m deleted file mode 100644 index c7223e4..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.m +++ /dev/null @@ -1,154 +0,0 @@ -// -// YMSailingRankView.m -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import "XPSailingRankView.h" -///Third -#import -#import -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -///View -#import "XPSailingRankSubView.h" - -@interface XPSailingRankView () -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *contentView; -///背景 -@property (nonatomic,strong) UIImageView *backImageView; -///今日榜单 -@property (nonatomic,strong) XPSailingRankSubView *todayView; -///昨日榜单 -@property (nonatomic,strong) XPSailingRankSubView *yesterdayView; - -@end - -@implementation XPSailingRankView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self addSubview:self.titleView]; - [self addSubview:self.contentView]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KScreenWidth, 515)); - }]; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self); - make.top.mas_equalTo(self).offset(98); - make.height.mas_equalTo(30); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self); - make.top.mas_equalTo(self.titleView.mas_bottom); - }]; -} - -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.todayView; - } else { - return self.yesterdayView; - } -} - -#pragma mark - Getters And Setters -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = [DJDKMIMOMColor colorWithHexString:@"#825A3A"]; - _titleView.titleSelectedColor = [DJDKMIMOMColor colorWithHexString:@"#F4D398"]; - _titleView.titleFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:12]; - _titleView.titleSelectedFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:12]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.cellWidth = KScreenWidth/ 2; - _titleView.cellSpacing = 0; - _titleView.listContainer = self.contentView; - - JXCategoryIndicatorLineView * indocator = [[JXCategoryIndicatorLineView alloc] init]; - indocator.indicatorColor = [DJDKMIMOMColor colorWithHexString:@"#F4D398"]; - indocator.indicatorWidth = 12; - indocator.indicatorHeight = 4; - indocator.indicatorCornerRadius = 2; - indocator.lineScrollOffsetX = 4; - _titleView.indicators = @[indocator]; - } - return _titleView; -} - -- (JXCategoryListContainerView *)contentView { - if (!_contentView) { - _contentView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _contentView.defaultSelectedIndex = 0; - } - return _contentView; -} - -- (NSArray *)titles { - return @[YMLocalizedString(@"XPSailingRankView2"), YMLocalizedString(@"XPSailingRankView1")]; -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"room_sailing_rank_bg"]; - } - return _backImageView; -} - -- (XPSailingRankSubView *)todayView { - if (!_todayView) { - _todayView = [[XPSailingRankSubView alloc] init]; - _todayView.type = SailingRankType_Today; - } - return _todayView; -} - -- (XPSailingRankSubView *)yesterdayView { - if (!_yesterdayView) { - _yesterdayView = [[XPSailingRankSubView alloc] init]; - _yesterdayView.type = SailingRankType_YesterDay; - } - return _yesterdayView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.h b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.h deleted file mode 100644 index bde23f2..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// YMSailingViewController.h -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import "MvpViewController.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPSailingViewController : MvpViewController -- (instancetype)initWithRoomUid:(NSString *)roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.m deleted file mode 100644 index 79514ea..0000000 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.m +++ /dev/null @@ -1,729 +0,0 @@ -// -// YMSailingViewController.m -// YUMI -// -// Created by YUMI on 2022/8/12. -// - -#import "XPSailingViewController.h" -///Third -#import -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "TTPopup.h" -#import "YUMIHtmlUrl.h" -#import "UIButton+EnlargeTouchArea.h" -#import "NSArray+Safe.h" -///Model -#import "RoomSailingInfoModel.h" -#import "RoomSailingPrizeListModel.h" -#import "AttachmentModel.h" -#import "AccountInfoStorage.h" -///View -#import "XPSailingRankView.h" -#import "XPRoomHalfWebView.h" -#import "XPSailingPrizeView.h" -#import "XPSailingGiftView.h" -#import "XPSailingBuyFuelView.h" -///P -#import "XPSailingPresenter.h" -#import "XPSailingProtocol.h" - -NSString * const kSailingPrizeAlertKey = @"kSailingPrizeAlertKey"; - -#define KitemHeight (20 + 5) -@interface XPSailingViewController () -///顶部的View -@property (nonatomic,strong) UIView * topView; -///背景图 -@property (nonatomic,strong) UIImageView *backImageView; -/// -@property (nonatomic,strong) UIImageView *sailingImageView; -///动画管理类 -@property (strong, nonatomic) SVGAParser *parser; -///航海特效 -@property (nonatomic,strong) SVGAImageView *sailingView; -///动画管理类 -@property (strong, nonatomic) SVGAParser *parser1; -///航海开出元宝特效特效 -@property (nonatomic,strong) SVGAImageView *sailingCowryView; -///排行榜 -@property (nonatomic,strong) UIButton *rankButton; -///h获取燃油 -@property (nonatomic,strong) UIButton *getFuleButton; -///记录 -@property (nonatomic,strong) UIButton *recordButton; -///内容 -@property (nonatomic,strong) UIImageView *contentImageView; -///说明 -@property (nonatomic,strong) UIButton *descriptionButton; -///燃油 -@property (nonatomic,strong) UIButton *fuleButton; -///个数的容器 -@property (nonatomic,strong) UIStackView * numberView; -///加 -@property (nonatomic,strong) UIButton *addButton; -///减 -@property (nonatomic,strong) UIButton *reduButton; -///输入个数 -@property (nonatomic,strong) MSBaseTextField *textField; -///探索 -@property (nonatomic,strong) UIButton *exploreButton; -///消耗燃油 -@property (nonatomic,strong) UILabel *consumLabel; -///提示 -@property (nonatomic,strong) UIStackView *tipsStackView; -@property (nonatomic,strong) UIButton *boxButton; -@property (nonatomic,strong) UILabel *tipLabel; - -@property (nonatomic,strong) UIView * animationView; -@property (nonatomic,assign) NSInteger exploreCount; -///航海的信息 -@property (nonatomic,strong) RoomSailingInfoModel *sailingInfo; -///房主的uid -@property (nonatomic,strong) NSString *roomUid; -///等级 -@property (nonatomic,strong) NSArray *levelArray; -///奖励信息 -@property (nonatomic,strong) RoomSailingPrizeListModel *prizeInfo; -@end - -@implementation XPSailingViewController - -- (void)dealloc { - [[NIMSDK sharedSDK].systemNotificationManager removeDelegate:self]; -} - -- (instancetype)initWithRoomUid:(NSString *)roomUid { - if (self = [super init]) { - self.roomUid = roomUid; - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - [[NIMSDK sharedSDK].systemNotificationManager addDelegate:self]; - } - return self; -} - -- (__kindof id)createPresenter { - return [[XPSailingPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self.presenter getSailingInfo]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.levelArray = @[@"1", @"10", @"50", @"100"]; - self.exploreCount = 0; - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.topView]; - [self.view addSubview:self.backImageView]; - - [self.backImageView addSubview:self.sailingView]; - [self.backImageView addSubview:self.sailingCowryView]; - [self.backImageView addSubview:self.sailingImageView]; - [self.backImageView addSubview:self.rankButton]; - [self.backImageView addSubview:self.getFuleButton]; - [self.backImageView addSubview:self.recordButton]; - [self.backImageView addSubview:self.contentImageView]; - - [self.contentImageView addSubview:self.descriptionButton]; - [self.contentImageView addSubview:self.animationView]; - [self.contentImageView addSubview:self.fuleButton]; - [self.contentImageView addSubview:self.numberView]; - [self.contentImageView addSubview:self.exploreButton]; - [self.contentImageView addSubview:self.tipsStackView]; - - [self.exploreButton addSubview:self.consumLabel]; - - [self.tipsStackView addArrangedSubview:self.boxButton]; - [self.tipsStackView addArrangedSubview:self.tipLabel]; - - [self.numberView addArrangedSubview:self.reduButton]; - [self.numberView addArrangedSubview:self.textField]; - [self.numberView addArrangedSubview:self.addButton]; -} - -- (void)initSubViewConstraints { - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.backImageView.mas_top); - }]; - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.height.mas_equalTo(515); - }]; - - [self.sailingView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.backImageView); - }]; - - [self.sailingCowryView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.backImageView); - }]; - - [self.sailingImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.backImageView); - }]; - - [self.rankButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(41, 32)); - make.top.mas_equalTo(self.backImageView).offset(129); - make.trailing.mas_equalTo(self.backImageView).offset(-12); - }]; - - [self.getFuleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.trailing.mas_equalTo(self.rankButton); - make.top.mas_equalTo(self.rankButton.mas_bottom).offset(8); - }]; - - [self.recordButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.trailing.mas_equalTo(self.rankButton); - make.top.mas_equalTo(self.getFuleButton.mas_bottom).offset(8); - }]; - CGFloat kscale = 199.0f / 356.0f; - [self.contentImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backImageView).inset(9); - make.bottom.mas_equalTo(self.backImageView).offset(-34); - make.height.mas_equalTo((KScreenWidth - 18) * kscale); - }]; - - [self.descriptionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(65, 22)); - make.trailing.mas_equalTo(self.contentImageView); - make.top.mas_equalTo(self.contentImageView).offset(42); - }]; - - [self.fuleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.trailing.mas_equalTo(self.descriptionButton); - make.top.mas_equalTo(self.descriptionButton.mas_bottom).offset(4); - }]; - - [self.numberView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentImageView); - make.top.mas_equalTo(self.contentImageView).offset(77 * kScreenScale); - make.height.mas_equalTo(30 * kScreenScale); - }]; - - [self.reduButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(30 * kScreenScale);; - }]; - - [self.addButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(30 * kScreenScale); - }]; - - [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(75 * kScreenScale); - }]; - - [self.exploreButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(150 * kScreenScale, 47 * kScreenScale)); - make.centerX.mas_equalTo(self.contentImageView); - make.top.mas_equalTo(self.numberView.mas_bottom).offset(12 * kScreenScale); - }]; - - [self.consumLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.exploreButton); - make.bottom.mas_equalTo(self.exploreButton.mas_bottom).offset(-7 * kScreenScale); - }]; - - [self.animationView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentImageView).offset(10); - make.bottom.mas_equalTo(self.contentImageView).offset(-50); - make.width.mas_equalTo(150); - make.height.mas_equalTo(KitemHeight * 5); - }]; - - [self.tipsStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentImageView); - make.bottom.mas_equalTo(self.contentImageView).offset(-20); - make.height.mas_equalTo(10); - }]; - - [self.boxButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(10); - }]; -} - -- (void)startSailingSVGA { - [self.sailingCowryView stopAnimation]; - [self.sailingView stopAnimation]; - @kWeakify(self); - NSString * anatomiser1Name = [NSString stringWithFormat:@"%@/sailing_prize.svga", API_Image_URL]; - [self.parser parseWithURL:[NSURL URLWithString:anatomiser1Name] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.sailingView.layer.masksToBounds = YES; - self.sailingView.contentMode = UIViewContentModeScaleAspectFill; - self.sailingView.loops = 1; - self.sailingView.clearsAfterStop = YES; - self.sailingView.videoItem = videoItem; - [self.sailingView startAnimation]; - } failureBlock:^(NSError * _Nonnull error) { - - }]; -} - -- (void)startSailingPrizeCowrySVGA { - @kWeakify(self); - NSString * anatomiser1Name = [NSString stringWithFormat:@"%@/sailing_prize_cowry.svga", API_Image_URL]; - [self.parser1 parseWithURL:[NSURL URLWithString:anatomiser1Name] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.sailingCowryView.layer.masksToBounds = YES; - self.sailingCowryView.contentMode = UIViewContentModeScaleAspectFill; - self.sailingCowryView.loops = 1; - self.sailingCowryView.clearsAfterStop = YES; - self.sailingCowryView.videoItem = videoItem; - [self.sailingCowryView startAnimation]; - } failureBlock:^(NSError * _Nonnull error) { - - }]; -} - -#pragma mark - XPSailingProtocol -- (void)getSailingInfoSuccess:(RoomSailingInfoModel *)info { - self.sailingInfo = info; - NSString * fuleStr = [NSString stringWithFormat:@"%ld", info.keyNum]; - [self.fuleButton setTitle:fuleStr forState:UIControlStateNormal]; -} - -- (void)openSailingSuccess:(RoomSailingPrizeListModel *)model { - self.prizeInfo = model; - self.sailingInfo.keyNum = model.remainKeyNum; - NSString * fuleStr = [NSString stringWithFormat:@"%ld", self.sailingInfo.keyNum]; - [self.fuleButton setTitle:fuleStr forState:UIControlStateNormal]; - self.exploreButton.userInteractionEnabled = YES; - NSString * key = [NSString stringWithFormat:@"%@_%@", kSailingPrizeAlertKey, [AccountInfoStorage instance].getUid]; - if (![[NSUserDefaults standardUserDefaults] boolForKey:key] && model.prizeItemList.count > 0) { - CGFloat height = 180; - if (model.prizeItemList.count> 5) { - height = 255; - } - XPSailingPrizeView * prizeView = [[XPSailingPrizeView alloc] initWithFrame:CGRectMake(0, 0, 283, height)]; - prizeView.prizeInfo = model; - [TTPopup popupView:prizeView style:TTPopupStyleAlert]; - } - - if (model.specialStatus) { - [self startSailingPrizeCowrySVGA]; - } - - - [model.prizeItemList enumerateObjectsUsingBlock:^(RoomSailingPrizeModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.prizeLevel > 2) { - ///取消所有的延迟加载的方法 - [NSObject cancelPreviousPerformRequestsWithTarget:self]; - - XPSailingGiftView * newAnimaView = [[XPSailingGiftView alloc] init]; - newAnimaView.prizeInfo = obj; - NSString * giftTitle = [NSString stringWithFormat:@"%@ x %d", obj.prizeName, obj.prizeNum]; - CGFloat widht = [giftTitle boundingRectWithSize:CGSizeMake(200, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:10]} context:nil].size.width + 10; - newAnimaView.frame = CGRectMake(0, 4 * (KitemHeight), widht, KitemHeight); - [self.animationView addSubview:newAnimaView]; - - if (self.animationView.subviews.count > 5) { - [self.animationView.subviews.firstObject removeFromSuperview]; - } - for (int i=0; i < self.animationView.subviews.count; i++) { - XPSailingGiftView * view = [self.animationView.subviews xpSafeObjectAtIndex:i]; - NSInteger offsetY= (self.animationView.subviews.count - i) * KitemHeight; - [UIView animateWithDuration:0.1 animations:^{ - CGRect rect = view.frame; - rect.origin.y = KitemHeight * 5 - offsetY; - view.frame = rect; - } completion:^(BOOL finished) { - if (i == (self.animationView.subviews.count -1)) { - [self.animationView.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - [self performSelector:@selector(giftViewRemoveFromSuperView:) withObject:obj afterDelay:15]; - }]; - } - }]; - } - } - }]; -} - -- (void)giftViewRemoveFromSuperView:(UIView *)view { - [view removeFromSuperview]; -} - -- (void)openSailingFail:(NSString *)message { - [self.sailingView stopAnimation]; - self.sailingImageView.hidden = NO; - self.exploreButton.userInteractionEnabled = YES; -} - -#pragma mark - SVGAPlayerDelegate -- (void)svgaPlayerDidFinishedAnimation:(SVGAPlayer *)player { - if (self.prizeInfo.specialStatus) { - if (player == self.sailingView) { - self.sailingImageView.hidden = NO; - } - } else { - self.sailingImageView.hidden = NO; - } -} - -#pragma mark - Event Response -- (void)dismissView { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)rankButtonAction:(UIButton *)sender { - XPSailingRankView * rankView = [[XPSailingRankView alloc] init]; - [TTPopup popupView:rankView style:TTPopupStyleActionSheet]; -} - -- (void)getFuleButtonAction:(UIButton *)sender { - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = URLWithType(kSailingActivityURL); - webView.isSailing = YES; - TTPopupService * config = [[TTPopupService alloc] init]; - config.contentView = webView; - config.didFinishDismissHandler = ^(BOOL isDismissOnBackgroundTouch) { - [self.presenter getSailingInfo]; - }; - [TTPopup popupWithConfig:config]; -} - -- (void)recordButtonAction:(UIButton *)sender { - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = URLWithType(kSailingRecordURL); - webView.isSailing = YES; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; -} - -- (void)descriptionButtonAction:(UIButton *)sender { - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.isSailing = YES; - webView.url = URLWithType(kSailingPlayDescdURL); - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; -} - -- (void)addButtonAction:(UIButton *)sender { - self.exploreCount ++; - if (self.exploreCount >= self.levelArray.count) { - self.exploreCount = 3; - } -} - -- (void)reduButtonAction:(UIButton *)sender { - self.exploreCount --; - if (self.exploreCount <= 0) { - self.exploreCount = 0; - } -} - -- (void)exploreButtonAction:(UIButton *)sender { - self.prizeInfo = nil; - if (self.textField.text.integerValue > self.sailingInfo.keyNum) { - XPSailingBuyFuelView * buyView = [[XPSailingBuyFuelView alloc] init]; - buyView.delegate = self; - [TTPopup popupView:buyView style:TTPopupStyleAlert]; - } else { - self.sailingImageView.hidden = YES; - [self startSailingSVGA]; - NSString * roomUid = self.roomUid; - [self.presenter openSailing:roomUid sendMessage:YES keyNum:self.textField.text.integerValue]; - self.exploreButton.userInteractionEnabled = NO; - } -} - -- (void)boxButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - if (sender.selected) { - NSString * key = [NSString stringWithFormat:@"%@_%@", kSailingPrizeAlertKey, [AccountInfoStorage instance].getUid]; - [[NSUserDefaults standardUserDefaults] setBool:YES forKey:key]; - } else { - NSString * key = [NSString stringWithFormat:@"%@_%@", kSailingPrizeAlertKey, [AccountInfoStorage instance].getUid]; - [[NSUserDefaults standardUserDefaults] setBool:NO forKey:key]; - } -} -#pragma mark - NIMSystemNotificationManagerDelegate -- (void)onReceiveCustomSystemNotification:(NIMCustomSystemNotification *)notification { - if (notification.receiverType == NIMSessionTypeP2P) { - AttachmentModel *attachment = [AttachmentModel modelWithJSON:notification.content]; - if (attachment.first == CustomMessageType_Account && attachment.second == Custom_Message_Sub_Account_Changed){ - if (attachment.second == Custom_Message_Sub_Account_Changed) { - [self.presenter getSailingInfo]; - } - } - } -} - -- (void)xPSailingBuyFuelView:(XPSailingBuyFuelView *)view didClickBuy:(UIButton *)sender { - [TTPopup dismiss]; - [self getFuleButtonAction:self.getFuleButton]; -} - -- (void)xPSailingBuyFuelView:(XPSailingBuyFuelView *)view didClickCancel:(UIButton *)sender { - [TTPopup dismiss]; -} - -#pragma mark - Getters And Setters -- (void)setExploreCount:(NSInteger)exploreCount { - _exploreCount = exploreCount; - if (_exploreCount == 0) { - self.reduButton.enabled = NO; - } else { - self.reduButton.enabled = YES; - } - - if (_exploreCount == 3) { - self.addButton.enabled = NO; - } else { - self.addButton.enabled = YES; - } - NSString * count = [self.levelArray xpSafeObjectAtIndex:_exploreCount]; - self.textField.text = count; - self.consumLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPSailingViewController0"), count]; -} - -- (UIView *)topView { - if (!_topView) { - _topView = [[UIView alloc] init]; - _topView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissView)]; - [_topView addGestureRecognizer:tap]; - return _topView; - } - return _topView; -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.image = [UIImage imageNamed:@"room_sailing_bg"]; - _backImageView.contentMode = UIViewContentModeScaleAspectFill; - _backImageView.layer.masksToBounds = YES; - } - return _backImageView; -} - -- (UIButton *)rankButton { - if (!_rankButton) { - _rankButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_rankButton setImage:[UIImage imageNamed:@"room_sailing_rank"] forState:UIControlStateNormal]; - [_rankButton setImage:[UIImage imageNamed:@"room_sailing_rank"] forState:UIControlStateSelected]; - [_rankButton addTarget:self action:@selector(rankButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _rankButton; -} - -- (UIButton *)getFuleButton { - if (!_getFuleButton) { - _getFuleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_getFuleButton setImage:[UIImage imageNamed:@"room_sailing_getfule"] forState:UIControlStateNormal]; - [_getFuleButton setImage:[UIImage imageNamed:@"room_sailing_getfule"] forState:UIControlStateSelected]; - [_getFuleButton addTarget:self action:@selector(getFuleButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _getFuleButton; -} - -- (UIButton *)recordButton { - if (!_recordButton) { - _recordButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_recordButton setImage:[UIImage imageNamed:@"room_sailing_record"] forState:UIControlStateNormal]; - [_recordButton setImage:[UIImage imageNamed:@"room_sailing_record"] forState:UIControlStateSelected]; - [_recordButton addTarget:self action:@selector(recordButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _recordButton; -} - -- (UIImageView *)contentImageView { - if (!_contentImageView) { - _contentImageView = [[UIImageView alloc] init]; - _contentImageView.userInteractionEnabled = YES; - _contentImageView.image = [UIImage imageNamed:@"room_sailing_explore_bg"]; - } - return _contentImageView; -} - -- (UIButton *)descriptionButton { - if (!_descriptionButton) { - _descriptionButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_descriptionButton setImage:[UIImage imageNamed:@"room_sailing_description"] forState:UIControlStateNormal]; - [_descriptionButton setImage:[UIImage imageNamed:@"room_sailing_description"] forState:UIControlStateSelected]; - [_descriptionButton addTarget:self action:@selector(descriptionButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _descriptionButton; -} - -- (UIButton *)fuleButton { - if (!_fuleButton) { - _fuleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_fuleButton setTitle:@"0" forState:UIControlStateNormal]; - [_fuleButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _fuleButton.titleLabel.font = [UIFont systemFontOfSize:10]; - _fuleButton.titleEdgeInsets = UIEdgeInsetsMake(0, 15, 0, 0); - [_fuleButton setTitleColor:[DJDKMIMOMColor colorWithHexString:@"#643B29"] forState:UIControlStateNormal]; - [_fuleButton setBackgroundImage:[UIImage imageNamed:@"room_sailing_rule_bg"] forState:UIControlStateNormal]; - } - return _fuleButton; -} - -- (UIStackView *)numberView { - if (!_numberView) { - _numberView = [[UIStackView alloc] init]; - _numberView.axis = UILayoutConstraintAxisHorizontal; - _numberView.distribution = UIStackViewDistributionFill; - _numberView.alignment = UIStackViewAlignmentFill; - _numberView.spacing = 6; - } - return _numberView; -} - -- (MSBaseTextField *)textField { - if (!_textField) { - _textField = [[MSBaseTextField alloc] init]; - _textField.textColor = [DJDKMIMOMColor colorWithHexString:@"#64472E"]; - _textField.backgroundColor = [DJDKMIMOMColor colorWithHexString:@"#DACBB4"]; - _textField.font = [UIFont systemFontOfSize:15]; - _textField.layer.masksToBounds = YES; - _textField.layer.cornerRadius = 11; - _textField.text = @"1"; - _textField.enabled = NO; - _textField.textAlignment = NSTextAlignmentCenter; - } - return _textField; -} - - -- (UIButton *)addButton { - if (!_addButton) { - _addButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_addButton setImage:[UIImage imageNamed:@"room_sailing_add"] forState:UIControlStateNormal]; - [_addButton setImage:[UIImage imageNamed:@"room_sailing_add"] forState:UIControlStateSelected]; - [_addButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_addButton addTarget:self action:@selector(addButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _addButton; -} - -- (UIButton *)reduButton { - if (!_reduButton) { - _reduButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_reduButton setImage:[UIImage imageNamed:@"room_sailing_redu"] forState:UIControlStateNormal]; - [_reduButton setImage:[UIImage imageNamed:@"room_sailing_redu"] forState:UIControlStateSelected]; - [_reduButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_reduButton addTarget:self action:@selector(reduButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _reduButton; -} - -- (UIButton *)exploreButton { - if (!_exploreButton) { - _exploreButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_exploreButton setImage:[UIImage imageNamed:@"room_sailing_explore"] forState:UIControlStateNormal]; - [_exploreButton setImage:[UIImage imageNamed:@"room_sailing_explore"] forState:UIControlStateSelected]; - [_exploreButton addTarget:self action:@selector(exploreButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _exploreButton; -} - -- (UILabel *)consumLabel { - if (!_consumLabel) { - _consumLabel = [[UILabel alloc] init]; - _consumLabel.font = [UIFont systemFontOfSize:10]; - _consumLabel.textColor = [DJDKMIMOMColor colorWithHexString:@"#A08161"]; - _consumLabel.textAlignment = NSTextAlignmentCenter; - _consumLabel.text = YMLocalizedString(@"XPSailingViewController1"); - } - return _consumLabel; -} - -- (UIView *)animationView { - if (!_animationView) { - _animationView = [[UIView alloc] init]; - _animationView.backgroundColor = [UIColor clearColor]; - } - return _animationView; -} - -- (SVGAImageView *)sailingView { - if (!_sailingView) { - _sailingView = [[SVGAImageView alloc]init]; - _sailingView.backgroundColor = [UIColor clearColor]; - _sailingView.userInteractionEnabled = NO; - _sailingView.delegate = self; - } - return _sailingView; -} - -- (SVGAImageView *)sailingCowryView { - if (!_sailingCowryView) { - _sailingCowryView = [[SVGAImageView alloc]init]; - _sailingCowryView.backgroundColor = [UIColor clearColor]; - _sailingCowryView.userInteractionEnabled = NO; - _sailingCowryView.delegate = self; - } - return _sailingCowryView; -} - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} - -- (SVGAParser *)parser1 { - if (!_parser1) { - _parser1 = [[SVGAParser alloc]init]; - } - return _parser1; -} - -- (UIImageView *)sailingImageView { - if (!_sailingImageView) { - _sailingImageView = [[UIImageView alloc] init]; - _sailingImageView.userInteractionEnabled = YES; - _sailingImageView.image = [UIImage imageNamed:@"room_sailing_sailing"]; - } - return _sailingImageView; -} - -- (UIStackView *)tipsStackView { - if (!_tipsStackView) { - _tipsStackView = [[UIStackView alloc] init]; - _tipsStackView.axis = UILayoutConstraintAxisHorizontal; - _tipsStackView.distribution = UIStackViewDistributionFill; - _tipsStackView.alignment = UIStackViewAlignmentFill; - _tipsStackView.spacing = 5; - } - return _tipsStackView; -} - -- (UIButton *)boxButton { - if (!_boxButton) { - _boxButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_boxButton setImage:[UIImage imageNamed:@"room_sailing_tips_normal"] forState:UIControlStateNormal]; - [_boxButton setImage:[UIImage imageNamed:@"room_sailing_tips_select"] forState:UIControlStateSelected]; - [_boxButton addTarget:self action:@selector(boxButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_boxButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - NSString * key = [NSString stringWithFormat:@"%@_%@", kSailingPrizeAlertKey, [AccountInfoStorage instance].getUid]; - _boxButton.selected = [[NSUserDefaults standardUserDefaults] boolForKey:key]; - } - return _boxButton; -} - -- (UILabel *)tipLabel { - if (!_tipLabel) { - _tipLabel = [[UILabel alloc] init]; - _tipLabel.font = [UIFont systemFontOfSize:10]; - _tipLabel.textColor = UIColorFromRGB(0xA16A2F); - _tipLabel.text = YMLocalizedString(@"XPSailingViewController2"); - } - return _tipLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Api/Api+Gift.h b/YuMi/Modules/YMRoom/View/SendGiftView/Api/Api+Gift.h deleted file mode 100644 index 4e1fe75..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Api/Api+Gift.h +++ /dev/null @@ -1,99 +0,0 @@ -// -// Api+Gift.h -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (Gift) - -/// 请求背包礼物 -/// @param complection 完成 -/// @param uid 用户uid -/// @param ticket 用户ticket -+ (void)requestPackGiftList:(HttpRequestHelperCompletion)complection - uid:(NSString *)uid - ticket:(NSString *)ticket; - -/// 请求普通礼物列表 -/// @param complection 完成 -/// @param roomUid 房间的roomuid -+ (void)requestNormalGiftList:(HttpRequestHelperCompletion)complection - roomUid:(NSString *)roomUid; - -/// 请求礼物面板全部 Tags 和普通礼物列表 -/// @param complection 完成 -/// @param roomUid 房间的roomuid -+ (void)requestAllTagsAndNormalGifts:(HttpRequestHelperCompletion)complection - roomUid:(NSString *)roomUid; - -/// 送礼物的接口 -/// @param complection 完成 -/// @param targetUids 送给谁的 -/// @param giftNum 送的个数 -/// @param sendType 送的类型 -/// @param giftId 礼物的id -/// @param giftSource 礼物的来源 -/// @param giftType 礼物的类型 -/// @param roomUid 房间的ID -/// @param msg 喊话的 -/// @param uid 用户的id -+ (void)requestSendGift:(HttpRequestHelperCompletion)complection - targetUids:(NSString *)targetUids - giftNum:(NSString *)giftNum - sendType:(NSString *)sendType - giftId:(NSString *)giftId - giftSource:(NSString *)giftSource - giftType:(NSString *)giftType - roomUid:(NSString *)roomUid - msg:(NSString *)msg - uid:(NSString *)uid; - -/// 送粉丝团入团礼物的接口 -/// @param completion 完成 -/// @param targetUids 送给谁的 -/// @param giftNum 送的个数 -/// @param sendType 送的类型 -/// @param giftId 礼物的id -/// @param giftSource 礼物的来源 -/// @param giftType 礼物的类型 -/// @param roomUid 房间的ID -/// @param msg 喊话的 -/// @param uid 用户的id -+ (void)requestSendAnchorFansGift:(HttpRequestHelperCompletion)completion - targetUids:(NSString *)targetUids - giftNum:(NSString *)giftNum - sendType:(NSString *)sendType - giftId:(NSString *)giftId - giftSource:(NSString *)giftSource - giftType:(NSString *)giftType - roomUid:(NSString *)roomUid - msg:(NSString *)msg - uid:(NSString *)uid; - -/// 请求福袋全服礼物全服记录 -/// @param complection 完成 -+ (void)requestLuckGiftServerBagRecord:(HttpRequestHelperCompletion)complection; - -/// 请求星座礼物信息 -+ (void)requestTwelveStarFirst:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; -/// 请求缓存列表 -/// @param complection 完成 -+ (void)requestCacheGiftList:(HttpRequestHelperCompletion)complection; -/// 请求新礼物动效缓存列表 -/// @param complection 完成 -+(void)requestCacheGiftDynamicEffectList:(HttpRequestHelperCompletion)complection; - - -/// 拉取房间资源 -+ (void)requestRoomResource:(HttpRequestHelperCompletion)complection; - -/// Bravo礼物tab滚屏内容 -+ (void)bravoGetBannerList:(HttpRequestHelperCompletion)completion; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Api/Api+Gift.m b/YuMi/Modules/YMRoom/View/SendGiftView/Api/Api+Gift.m deleted file mode 100644 index a362bd7..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Api/Api+Gift.m +++ /dev/null @@ -1,121 +0,0 @@ -// -// Api+Gift.m -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import "Api+Gift.h" -#import "NSMutableDictionary+Saft.h" -#import -@implementation Api (Gift) - - -/// 请求背包礼物 -/// @param complection 完成 -/// @param uid 用户uid -/// @param ticket 用户ticket -+ (void)requestPackGiftList:(HttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket { - [self makeRequest:@"backpack/listUserBackpackV3" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, ticket, nil]; -} - -/// 请求普通礼物列表 -/// @param complection 完成 -/// @param roomUid 房间的roomuid -+ (void)requestNormalGiftList:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid { - [self makeRequest:@"gift/listV5" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, roomUid, nil]; -} - -+ (void)requestAllTagsAndNormalGifts:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid { - [self makeRequest:@"gift/getPanel" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, roomUid, nil]; -} - -/// 请求缓存列表 -/// @param complection 完成 -+ (void)requestCacheGiftList:(HttpRequestHelperCompletion)complection { - NSString * fang = @"gift/vgg"; - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, nil]; -} -/// 请求新礼物动效缓存列表 -/// @param complection 完成 -+(void)requestCacheGiftDynamicEffectList:(HttpRequestHelperCompletion)complection{ - NSString * fang = @"resource/effect"; - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, nil]; -} - -+ (void)requestRoomResource:(HttpRequestHelperCompletion)complection{ - [self makeRequest:@"client/resource" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, nil]; -} - -/// 请求福袋全服礼物全服记录 -/// @param complection 完成 -+ (void)requestLuckGiftServerBagRecord:(HttpRequestHelperCompletion)complection { - NSString * fang = @"luckybag/getBannerList";///gift/luckyBag/serviceMsg/record - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, nil]; -} - - -/// 送礼物的接口 -/// @param complection 完成 -/// @param targetUids 送给谁的 -/// @param giftNum 送的个数 -/// @param sendType 送的类型 -/// @param giftId 礼物的id -/// @param giftSource 礼物的来源 -/// @param giftType 礼物的类型 -/// @param roomUid 房间的ID -/// @param msg 喊话的 -/// @param uid 用户的id -+ (void)requestSendGift:(HttpRequestHelperCompletion)complection - targetUids:(NSString *)targetUids - giftNum:(NSString *)giftNum - sendType:(NSString *)sendType - giftId:(NSString *)giftId - giftSource:(NSString *)giftSource - giftType:(NSString *)giftType - roomUid:(NSString *)roomUid - msg:(NSString *)msg - uid:(NSString *)uid { - - NSString *method = @"gift/sendV5"; - [self makeRequest:method method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, targetUids, giftNum, sendType, giftId, giftSource, giftType, roomUid, msg, uid, nil]; -} - -/// 送粉丝团入团礼物的接口 -/// @param completion 完成 -/// @param targetUids 送给谁的 -/// @param giftNum 送的个数 -/// @param sendType 送的类型 -/// @param giftId 礼物的id -/// @param giftSource 礼物的来源 -/// @param giftType 礼物的类型 -/// @param roomUid 房间的ID -/// @param msg 喊话的 -/// @param uid 用户的id -+ (void)requestSendAnchorFansGift:(HttpRequestHelperCompletion)completion - targetUids:(NSString *)targetUids - giftNum:(NSString *)giftNum - sendType:(NSString *)sendType - giftId:(NSString *)giftId - giftSource:(NSString *)giftSource - giftType:(NSString *)giftType - roomUid:(NSString *)roomUid - msg:(NSString *)msg - uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"YW5jaG9yRmFuc1RlYW0vc2VuZEpvaW5UZWFtR2lmdA=="];///anchorFansTeam/sendJoinTeamGift - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, targetUids, giftNum, sendType, giftId, giftSource, giftType, roomUid, msg, uid, nil]; -} - -/// 请求星座礼物信息 -+ (void)requestTwelveStarFirst:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - NSMutableDictionary * params = [NSMutableDictionary dictionary]; - [params safeSetObject:roomUid forKey:@"roomUid"]; - NSString * fang = [NSString stringFromBase64String:@"dHdlbHZlU3Rhci9nZXRMYXN0UmFua0ZpcnN0"];///twelveStar/getLastRankFirst - [HttpRequestHelper request:fang method:HttpRequestHelperMethodGET params:params completion:completion]; -} - -+ (void)bravoGetBannerList:(HttpRequestHelperCompletion)completion{ - [self makeRequest:@"bravo/getBannerList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboConfig.h b/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboConfig.h deleted file mode 100644 index aeac201..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboConfig.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// GiftComboConfig.h -// YuMi -// -// Created by AI Assistant on 2024/8/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -#pragma mark - 连击配置常量 - -// 连击计数范围 -extern const NSInteger kComboMin; -extern const NSInteger kComboMax; - -// 连击时间窗口（秒） -extern const NSTimeInterval kComboWindow; - -// 发送节流时间（毫秒） -extern const NSTimeInterval kSendThrottle; - -// 日志前缀 -extern NSString * const kComboLogPrefix; - -// 错误域 -extern NSString * const kComboErrorDomain; - -// 错误码 -typedef NS_ENUM(NSInteger, ComboErrorCode) { - ComboErrorCodeInvalidState = 1001, - ComboErrorCodeInvalidCount = 1002, - ComboErrorCodeNetworkError = 1003, - ComboErrorCodeServerError = 1004, - ComboErrorCodeInsufficientBalance = 1005, - ComboErrorCodeVIPLevelInsufficient = 1006 -}; - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboConfig.m b/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboConfig.m deleted file mode 100644 index b5756ff..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboConfig.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// GiftComboConfig.m -// YuMi -// -// Created by AI Assistant on 2024/8/18. -// - -#import "GiftComboConfig.h" - -#pragma mark - 连击配置常量实现 - -// 连击计数范围 -const NSInteger kComboMin = 1; -const NSInteger kComboMax = 100; - -// 连击时间窗口（秒） -const NSTimeInterval kComboWindow = 5.0; - -// 发送节流时间（毫秒） -const NSTimeInterval kSendThrottle = 0.08; - -// 日志前缀 -NSString * const kComboLogPrefix = @"[Combo]"; - -// 错误域 -NSString * const kComboErrorDomain = @"com.yumi.combo"; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.h b/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.h deleted file mode 100644 index b64686b..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.h +++ /dev/null @@ -1,138 +0,0 @@ -// -// GiftComboManager.h -// YuMi -// -// Created by P on 2024/9/5. -// - -#import - -#import "GiftInfoModel.h" -#import "GiftComboView.h" - -@class GiftReceiveInfoModel, UserInfoModel, GiftReceiveInfoModel, XPGiftCountModel; - -typedef enum : NSUInteger { - ComboAction_ShowPanel, - ComboAction_RemovePanel, - ComboAction_Error, - ComboAction_Combo_Count_Update, - ComboAction_Update_After_Send_Success, - ComboAction_SendGift_Gold_Update -} ComboActionType; - -typedef enum : NSUInteger { - ComboFlagAction_, -// ComboAction_RemovePanel, -// ComboAction_Combo_Count_Update, -} ComboFlagActionType; - - -// 通知常量定义 -UIKIT_EXTERN NSString * _Nonnull const kBoomStateForceResetNotification; - -NS_ASSUME_NONNULL_BEGIN - -@interface GiftComboManager : NSObject - -@property (nonatomic, assign, readonly) BOOL enableCombo; -//@property(nonatomic, strong, nullable) GiftComboView *comboView; -@property (nonatomic, strong) GiftReceiveInfoModel *sendGiftReceiveInfo; -@property(nonatomic, copy) void(^handleComboSuccess)(GiftReceiveInfoModel *receiveModel, NSMutableDictionary *originDic); -@property(nonatomic, copy) void(^handleRoomUIChanged)(BOOL comboViewDisplay); - -// 单例方法 -+ (instancetype)sharedManager; - -- (void)registerActions:(void(^ _Nullable)(ComboActionType type))action; - -#pragma mark - 新的简化接口 - -// 状态管理 -- (void)activate; // 激活连击功能 -- (void)deactivate; // 停用连击功能 -- (BOOL)isActive; // 检查是否激活 - -// 计数管理 -- (NSInteger)currentCount; // 获取当前连击计数 -- (void)incrementCount; // 增加连击计数 -- (void)reset; // 重置连击状态 - -// 操作控制 -- (void)clear; // 清除连击状态 -- (void)send; // 发送连击礼物 - -// 状态查询 -- (NSDictionary * _Nonnull)stateInfo; // 获取完整状态信息 -- (BOOL)canStartCombo; // 检查是否可以开始连击 -- (void)validateState; // 验证并修复状态 - -// 错误处理 -- (void)handleError:(NSError * _Nonnull)error; -- (NSString * _Nonnull)lastErrorMessage; -- (void)clearError; - -- (void)sendGift; -- (void)forceBoomStateReset; -- (BOOL)loadEnable; - -- (NSInteger)loadTotalGiftNum; - -// 统一配置方法（替代多个save方法） -- (void)configureWithGiftInfo:(GiftInfoModel * _Nonnull)giftInfo - targetUIDs:(NSArray * _Nonnull)UIDs - roomUID:(NSString * _Nonnull)roomUID - sessionID:(NSString * _Nonnull)sessionID - userInfo:(UserInfoModel * _Nonnull)userInfo - countModel:(XPGiftCountModel * _Nonnull)countModel - sourceType:(GiftSourceType)sourceType - sendType:(RoomSendGiftType)sendType - giftNum:(NSString * _Nonnull)giftNum; - -// 新增：连击状态检查方法 -- (BOOL)isComboStateValid; -- (NSDictionary * _Nonnull)getComboStateInfo; - -// 🔧 新增：状态通知方法 -- (void)setUserComboState:(BOOL)isCombo forUser:(NSString *)uid; -- (void)clearUserComboState:(NSString *)uid; - -#pragma mark - 使用示例 - -/* - 新的简化接口使用示例： - - // 1. 激活连击功能 - [[GiftComboManager sharedManager] activate]; - - // 2. 重置连击状态 - [[GiftComboManager sharedManager] reset]; - - // 3. 增加连击计数 - [[GiftComboManager sharedManager] incrementCount]; - - // 4. 获取当前状态 - NSDictionary *state = [[GiftComboManager sharedManager] stateInfo]; - - // 5. 清除连击状态 - [[GiftComboManager sharedManager] clear]; - - 迁移建议： - - enableToCombo:YES -> activate - - enableToCombo:NO -> deactivate - - resetCombo -> reset - - forceRemove -> clear - - loadComboCount -> currentCount - - loadComboCountFromSendGiftView -> incrementCount - - isGiftCombing -> isActive - */ - -- (NSString * _Nonnull)loadErrorMessage; - -- (void)receiveGiftInfoForDisplayComboFlags:(GiftReceiveInfoModel * _Nonnull)receiveInfo - container:(UIView * _Nonnull)container; -- (void)removeComboFlag; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.m b/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.m deleted file mode 100644 index 9933d4f..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboManager.m +++ /dev/null @@ -1,882 +0,0 @@ -// -// GiftComboManager.m -// YuMi -// -// Created by P on 2024/9/5. -// -// 处理连击面板逻辑 - -#import "GiftComboManager.h" - -#import -#import -#import -#import "BuglyManager.h" - -#import "Api+Gift.h" - -#import "UserInfoModel.h" -#import "AttachmentModel.h" -#import "XPGiftCountModel.h" -#import "GiftReceiveInfoModel.h" -#import "XPMessageRemoteExtModel.h" - -#import "GiftComboFlagView.h" - -// 通知常量实现 -NSString * const kBoomStateForceResetNotification = @"BoomStateForceResetNotification"; - -@interface GiftComboManager () - -@property (nonatomic, assign) BOOL enableCombo; - -@property (nonatomic, strong) NSMutableArray *requestQueue; - -// 用来存储 GiftReceiveInfoModel 和 NSDictionary 的元数据队列 -@property (nonatomic, strong) NSMutableArray *networkQueue; // 网络通信队列（AttachmentModel） -@property (nonatomic, strong) NSMutableArray *uiQueue; // UI动画队列（GiftReceiveInfoModel） -@property (nonatomic, strong) dispatch_source_t comboFlagTimer; -@property (nonatomic, strong) UIView *containerView; - -// 定时器，处理请求的调度器 -@property (nonatomic, strong) dispatch_source_t timer; - -// 新增：后台处理队列 -@property (nonatomic, strong) dispatch_queue_t backgroundQueue; -@property (nonatomic, strong) dispatch_queue_t networkProcessingQueue; - -@property (nonatomic, copy) NSArray *sendGiftToUIDs; -@property (nonatomic, assign) GiftSourceType giftSourceType; -@property (nonatomic, strong) GiftInfoModel *giftInfo; -@property (nonatomic, assign) RoomSendGiftType roomSendGiftType; -@property (nonatomic, copy) NSString *roomUID; -@property (nonatomic, copy) NSString *giftNumPerTimes; -@property (nonatomic, strong) UserInfoModel *sendGiftUserInfo; -@property (nonatomic, copy) NSString *sessionID; -@property (nonatomic, strong) XPGiftCountModel *countModel; - -@property (nonatomic, assign) NSInteger combo; -@property (nonatomic, assign) bool isCombing; - -@property (nonatomic, copy) void (^actionCallback)(ComboActionType type); - -@property (nonatomic, copy) NSString *errorMessage; - -@property (nonatomic, strong) NSMutableArray *activeViews; // 用于存储最多2个活跃的动画视图 - -@end - -@implementation GiftComboManager - -#pragma mark - 单例方法 - -- (void)dealloc { - - // 🔥 修复：确保所有timer都被停止 - [self forceStopAllTimers]; - - // 停止UI队列处理 - [self stopProcessingUIQueue]; - - // 清空所有队列 - [self clearAllQueues]; - - // 重置状态 - self.isCombing = NO; - self.enableCombo = NO; - self.actionCallback = nil; - -} - -+ (instancetype)sharedManager { - static GiftComboManager *sharedInstance = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - sharedInstance = [[self alloc] init]; - // sharedInstance.giftComboQueue = [NSMutableArray array]; - sharedInstance.networkQueue = [NSMutableArray array]; - sharedInstance.uiQueue = [NSMutableArray array]; - sharedInstance.activeViews = [NSMutableArray array]; - sharedInstance.requestQueue = [NSMutableArray array]; - - // 初始化后台处理队列 - sharedInstance.backgroundQueue = dispatch_queue_create("com.yumi.giftcombo.background", DISPATCH_QUEUE_CONCURRENT); - sharedInstance.networkProcessingQueue = dispatch_queue_create("com.yumi.giftcombo.network", DISPATCH_QUEUE_SERIAL); - - [sharedInstance startProcessingUIQueue]; - }); - return sharedInstance; -} - -//// 添加 GiftReceiveInfoModel 和 metadata 到队列 -- (void)addGiftComboWithInfo:(GiftReceiveInfoModel *)info andMetadata:(NSDictionary *)metadata { - if (info && metadata) { - // 将元数据打包成字典并添加到队列 - @synchronized (self) { - NSDictionary *comboData = @{@"info": info, @"metadata": metadata}; - [self.networkQueue addObject:comboData]; - } - // 启动定时器 - [self startProcessingQueue]; - } -} - -- (void)addComboFromNIMAttachment:(AttachmentModel *)attachment { - if (attachment) { - // 将元数据打包成字典并添加到队列 - @synchronized (self) { - [self.networkQueue addObject:attachment]; - } - // 启动定时器 - [self startProcessingQueue]; - } -} - -// 开始连击，重置 -- (void)reset { - - // 🔥 修复：检查是否正在重置过程中 - if (self.isCombing && self.combo == 0) { - return; - } - - // 🔥 修复：如果actionCallback为空，延迟执行reset - if (!self.actionCallback) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self reset]; - }); - return; - } - - // 🔥 修复：确保enableCombo状态正确 - if (!self.enableCombo) { - self.enableCombo = YES; - } - - // 确保连击计数正确重置为 1 - _combo = 1; - _errorMessage = @""; - - // 验证重置后的状态 - - // 发送通知，让 GiftComboView 重置显示 - [[NSNotificationCenter defaultCenter] postNotificationName:@"ComboCountReset" object:nil]; - - // 🔥 修复：确保状态正确设置后再触发回调 - self.isCombing = YES; - - // 检查是否应该显示连击面板 - 确保在主线程执行UI回调 - if (self.actionCallback) { - @kWeakify(self); - [self safeExecuteUIBlock:^{ - @kStrongify(self); - if (self && self.actionCallback) { - self.actionCallback(ComboAction_ShowPanel); - } - }]; - } else { - } - - if (self.handleRoomUIChanged) { - @kWeakify(self); - [self safeExecuteUIBlock:^{ - @kStrongify(self); - if (self && self.handleRoomUIChanged) { - self.handleRoomUIChanged(YES); - } - }]; - } -} - -- (void)registerActions:(void (^)(ComboActionType))action { - _combo = 1; - _errorMessage = @""; - self.actionCallback = action; -} - -// 新增：实现其他简化接口方法 -- (void)activate { - self.enableCombo = YES; -} - -- (void)deactivate { - self.enableCombo = NO; -} - -- (BOOL)isActive { - return self.isCombing && self.enableCombo; -} - -- (NSInteger)currentCount { - // 确保连击计数最少为 1 - if (self.combo < 1) { - self.combo = 1; - } - return self.combo; -} - -- (void)incrementCount { - self.combo += 1; -} - -- (void)clear { - - [self forceBoomStateReset]; - - // 🔥 修复：确保在主线程执行UI回调，并检查回调是否有效 - if (self.actionCallback) { - @kWeakify(self); - [self safeExecuteUIBlock:^{ - @kStrongify(self); - if (self && self.actionCallback) { - self.actionCallback(ComboAction_RemovePanel); - } - }]; - } -} - -- (void)send { - [self sendGift]; -} - -- (NSDictionary *)stateInfo { - return [self getComboStateInfo]; -} - -- (BOOL)canStartCombo { - return self.enableCombo && self.giftInfo != nil && self.sendGiftToUIDs.count > 0; -} - -- (void)validateState { - [self validateAndFixComboCount]; -} - -- (void)handleError:(NSError *)error { - self.errorMessage = error.localizedDescription; -} - -- (NSString *)lastErrorMessage { - return self.errorMessage ?: @""; -} - -- (void)clearError { - self.errorMessage = @""; -} - - - -- (void)forceBoomStateReset { - - // 1. 立即停止所有定时器（无条件停止） - [self forceStopAllTimers]; - - // 2. 清空所有队列 - [self clearAllQueues]; - - // 3. 重置所有状态标志 - self.isCombing = NO; - - // 4. 重置combo计数为0 - _combo = 0; - - // 5. 发送通知（优先级最高，通知所有相关组件） - dispatch_async(dispatch_get_main_queue(), ^{ - [[NSNotificationCenter defaultCenter] postNotificationName:kBoomStateForceResetNotification - object:nil]; - }); - - // 6. 强制恢复UI（确保底部栏和侧栏显示） - if (self.handleRoomUIChanged) { - dispatch_async(dispatch_get_main_queue(), ^{ - self.handleRoomUIChanged(NO); - }); - } -} - -// 无条件停止定时器 -- (void)forceStopAllTimers { - - // 停止主定时器 - if (self.timer) { - dispatch_source_cancel(self.timer); - self.timer = nil; - } - - // 停止UI队列定时器 - if (self.comboFlagTimer) { - dispatch_source_cancel(self.comboFlagTimer); - self.comboFlagTimer = nil; - } -} - -// 清空所有队列 -- (void)clearAllQueues { - @synchronized (self) { - [self.requestQueue removeAllObjects]; - [self.networkQueue removeAllObjects]; - [self.uiQueue removeAllObjects]; - } -} - -- (NSInteger)loadTotalGiftNum { - return self.combo * self.countModel.giftNumber.integerValue * self.sendGiftToUIDs.count; -} - -// 新增：检查连击状态是否有效 -- (BOOL)isComboStateValid { - @synchronized (self) { - return self.isCombing && - self.enableCombo && - self.combo > 0 && - self.giftInfo != nil && - self.sendGiftToUIDs.count > 0; - } -} - -// 新增：获取连击状态信息 -- (NSDictionary *)getComboStateInfo { - @synchronized (self) { - return @{ - @"isCombing": @(self.isCombing), - @"enableCombo": @(self.enableCombo), - @"combo": @(self.combo), - @"hasGiftInfo": @(self.giftInfo != nil), - @"targetCount": @(self.sendGiftToUIDs.count), - @"errorMessage": self.errorMessage ?: @"" - }; - } -} - -// 新增：验证并修复连击计数 -- (void)validateAndFixComboCount { - @synchronized (self) { - if (self.combo < 1) { - self.combo = 1; - } - - if (self.combo > 1000) { - self.combo = 100; - } - } -} - -#pragma mark - 处理飘屏逻辑 -- (void)receiveGiftInfoForDisplayComboFlags:(GiftReceiveInfoModel *)receiveInfo - container:(UIView *)container { - self.containerView = container; - [self.uiQueue addObject:receiveInfo]; - [self startProcessingUIQueue]; -} - -- (void)removeComboFlag { - self.containerView = nil; - [self stopProcessingQueue]; - [self stopProcessingUIQueue]; -} - -- (void)startProcessingUIQueue { - if (self.comboFlagTimer) { - return; - } - - dispatch_source_t timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, - dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)); - - dispatch_source_set_timer(timer, - DISPATCH_TIME_NOW, - 0.2 * NSEC_PER_SEC, - 0.01 * NSEC_PER_SEC); - - @kWeakify(self); - dispatch_source_set_event_handler(timer, ^{ - @kStrongify(self); - [self processGiftFlagQueue]; - }); - - dispatch_resume(timer); - self.comboFlagTimer = timer; -} - -- (void)stopProcessingUIQueue { - if (self.comboFlagTimer) { - dispatch_source_cancel(self.comboFlagTimer); - - @kWeakify(self); - dispatch_source_set_cancel_handler(self.comboFlagTimer, ^{ - @kStrongify(self); - self.comboFlagTimer = nil; - }); - } -} - -- (void)processGiftFlagQueue { - @synchronized (self) { - if (self.uiQueue.count == 0) { - return; - } - - GiftReceiveInfoModel *receiveInfo = [self.uiQueue firstObject]; - [self.uiQueue xpSafeRemoveObjectAtIndex:0]; - dispatch_async(dispatch_get_main_queue(), ^{ - [self handleGiftInfo:receiveInfo]; - }); - } -} - -- (void)handleGiftInfo:(GiftReceiveInfoModel *)receiveInfo { - if (receiveInfo.comboCount < 1) { - // 不正常的数据，不处理 - return; - } - if ([self updateExistingViewWithModel:receiveInfo]) { - // 如果更新了现有视图，就不需要创建新视图 - return; - } - - if (self.activeViews.count >= 2) { - GiftComboFlagView *oldestView = [self.activeViews firstObject]; - [self animateRemoveView:oldestView]; - } - - CGFloat positionY = kGetScaleWidth(380); - CGFloat positionX = isMSRTL() ? -self.containerView.bounds.size.width : self.containerView.bounds.size.width; - GiftComboFlagView *flagView = [[GiftComboFlagView alloc] initWithFrame:CGRectMake(positionX, - positionY, - kGetScaleWidth(300), - 50)]; - @kWeakify(self); - @kWeakify(flagView); - [flagView setTimerEnd:^{ - @kStrongify(self); - @kStrongify(flagView); - [self animateRemoveView:flagView]; - }]; - [flagView updateReceiveInfoModel:receiveInfo animationType:0]; - - [self allCurrentFlagMoveDown]; - - [self.containerView addSubview:flagView]; - [self.activeViews insertObject:flagView atIndex:0]; - - [self animateView:flagView positionY:positionY]; -} - -- (void)allCurrentFlagMoveDown { - CGFloat positionY = kGetScaleWidth(380); - [self.activeViews enumerateObjectsWithOptions:NSEnumerationConcurrent usingBlock:^(GiftComboFlagView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - dispatch_async(dispatch_get_main_queue(), ^{ - CGRect rect = obj.frame; - rect.origin.y = positionY + idx * 50; - obj.frame = rect; - }); - }]; -} - -- (void)animateView:(GiftComboFlagView *)flagView positionY:(CGFloat)positionY { - [UIView animateWithDuration:0.1 - animations:^{ - if (isMSRTL()) { - // 获取屏幕宽度 - CGFloat screenWidth = [UIScreen mainScreen].bounds.size.width; - - // 计算新的 x 坐标：屏幕宽度 - 视图宽度 - 右边距 - CGFloat newX = screenWidth - 20 - kGetScaleWidth(300); - - // 更新 flagView 的 frame，使右边距离屏幕右边 20 像素 - flagView.frame = CGRectMake(newX, positionY, kGetScaleWidth(300), 50); - } else { - flagView.frame = CGRectMake(20, positionY, kGetScaleWidth(300), 50); - } - } completion:^(BOOL finished) { - [self allCurrentFlagMoveDown]; - }]; -} - -- (void)animateRemoveView:(GiftComboFlagView *)flagView { - [flagView removeFromSuperview]; - if ([self.activeViews containsObject:flagView]) { - [self.activeViews removeObject:flagView]; - flagView = nil; - } - - [self allCurrentFlagMoveDown]; -} - -// 更新现有 View 的数据，如果存在相同的 ID -- (BOOL)updateExistingViewWithModel:(GiftReceiveInfoModel *)model { - NSInteger index = 0; - for (GiftComboFlagView *existingFlag in self.activeViews) { - if (existingFlag.superview == nil) { - continue; - } - if ([existingFlag.receiveInfo isEqual:model]) { - [self updateComboFlag:existingFlag with:model]; - return YES; - } - index++; - } - - return NO; -} - -- (void)updateComboFlag:(GiftComboFlagView *)flagView with:(GiftReceiveInfoModel *)model { - [flagView updateReceiveInfoModel:model animationType:1]; -} - - -// MARK: Logic is 连击面板出现后，每点击一次，就触发一次面板最后的请求，请求成功后，构造云信消息体，消息体进入队列并按 0.25s 一次的频率发送消息 -#pragma mark - 管理队列 - -// 开始处理队列 -- (void)startProcessingQueue { - if (self.timer) { - return; // 如果定时器已经在运行，直接返回 - } - - // 创建 GCD 定时器 - 使用后台队列避免主线程阻塞 - self.timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, self.backgroundQueue); - - //#if DEBUG - // dispatch_source_set_timer(self.timer, DISPATCH_TIME_NOW, 0.01 * NSEC_PER_SEC, 0.01 * NSEC_PER_SEC); - //#else - // 优化：减少间隔提高响应速度，从0.25秒改为0.1秒 - dispatch_source_set_timer(self.timer, DISPATCH_TIME_NOW, 0.1 * NSEC_PER_SEC, 0.01 * NSEC_PER_SEC); - //#endif - - - // 定时器触发的事件处理 - 在后台队列执行 - @kWeakify(self); - dispatch_source_set_event_handler(self.timer, ^{ - @kStrongify(self); - if (!self) { - return; - } - [self processRequestQueue]; - [self processGiftComboQueue]; - }); - - // **立即执行一次处理方法** - [self processRequestQueue]; - [self processGiftComboQueue]; - - // 启动定时器 - dispatch_resume(self.timer); -} - -// 停止处理队列 -- (void)stopProcessingQueue { - if (self.timer) { - // 🔥 修复：无条件停止timer，不依赖队列状态 - dispatch_source_cancel(self.timer); - - // 设置取消回调，在资源完全释放后将 timer 置为 nil - @kWeakify(self); - dispatch_source_set_cancel_handler(self.timer, ^{ - @kStrongify(self); - if (self) { - self.timer = nil; - } - }); - } -} - -// 处理队列中的第一个请求 -- (void)processGiftComboQueue { - @synchronized (self) { - if (self.networkQueue.count > 0) { - // 获取并移除队列中的第一个网络数据 - id networkData = [self.networkQueue firstObject]; - [self.networkQueue xpSafeRemoveObjectAtIndex:0]; - - // 处理逻辑 - if ([networkData isKindOfClass:[AttachmentModel class]]) { - dispatch_async(self.networkProcessingQueue, ^{ - [self processGiftComboWith:(AttachmentModel *)networkData]; - }); - } else if ([networkData isKindOfClass:[NSDictionary class]]) { - // 处理包含info和metadata的字典 -// NSDictionary *comboData = (NSDictionary *)networkData; -// GiftReceiveInfoModel *info = comboData[@"info"]; -// NSDictionary *metadata = comboData[@"metadata"]; - // 这里可以添加相应的处理逻辑 - } - } else { - [self stopProcessingQueue]; - } - } -} - -// 处理元数据的实际逻辑 -- (void)processGiftComboWith:(AttachmentModel *)info { - [self sendCustomMessage:info]; -} - -- (NSString *)loadErrorMessage { - return self.errorMessage; -} - -- (void)processRequestQueue { - @synchronized (self) { - if (self.requestQueue.count > 0) { - // 获取并移除队列中的第一个元数据 - NSDictionary *dic = [self.requestQueue xpSafeObjectAtIndex:0]; - if (dic) { - // 优化：在后台队列处理API请求，避免阻塞主线程 - dispatch_async(self.networkProcessingQueue, ^{ - [self handleSendGift:dic]; - }); - [self.requestQueue removeObject:dic]; - } - } else { - [self stopProcessingQueue]; - } - } -} - -#pragma mark - Gift meta data - -// 统一配置方法，替代多个save方法 -- (void)configureWithGiftInfo:(GiftInfoModel *)giftInfo - targetUIDs:(NSArray *)UIDs - roomUID:(NSString *)roomUID - sessionID:(NSString *)sessionID - userInfo:(UserInfoModel *)userInfo - countModel:(XPGiftCountModel *)countModel - sourceType:(GiftSourceType)sourceType - sendType:(RoomSendGiftType)sendType - giftNum:(NSString *)giftNum { - - - self.giftInfo = giftInfo; - self.sendGiftToUIDs = UIDs; - self.roomUID = roomUID; - self.sessionID = sessionID; - self.sendGiftUserInfo = userInfo; - self.countModel = countModel; - self.giftSourceType = sourceType; - self.roomSendGiftType = sendType; - self.giftNumPerTimes = giftNum; -} - -- (BOOL)loadEnable { - return self.enableCombo; -} - -#pragma mark - XPGiftPresenter - -- (void)sendGift { - - NSString *allUIDs = @""; - for (NSString *item in self.sendGiftToUIDs) { - if (allUIDs.length > 0) { - allUIDs = [allUIDs stringByAppendingString:@","]; - } - allUIDs = [allUIDs stringByAppendingString:item]; - } - - NSDictionary *dic = @{ - @"targetUids":allUIDs, - @"giftNum":self.giftNumPerTimes, - @"sendType":[NSString stringWithFormat:@"%ld", GiftSendType_OnMic], - @"giftId":[NSString stringWithFormat:@"%ld", self.giftInfo.giftId], - @"giftSource":[NSString stringWithFormat:@"%ld", self.giftSourceType], - @"giftType":[NSString stringWithFormat:@"%ld", self.roomSendGiftType], - @"roomUid":self.roomUID - }; - - [self.requestQueue addObject:dic]; - [self startProcessingQueue]; -} - -- (void)handleSendGift:(NSDictionary *)dic { - NSString *allUIDs = [dic objectForKey:@"targetUids"]; -// NSString *giftId = [dic objectForKey:@"giftId"]; - - @kWeakify(self); - [Api requestSendGift:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (!self) { - return; - } - if (code == 200) { - GiftReceiveInfoModel *receive = [GiftReceiveInfoModel modelWithJSON:data.data]; - receive.sourceType = [[dic objectForKey:@"giftSource"] integerValue]; - receive.roomSendGiftType = [[dic objectForKey:@"giftType"] integerValue]; - NSArray *array = [allUIDs componentsSeparatedByString:@","]; - receive.receiveGiftNumberUser = array.count; - [self handleSendGiftSuccess:receive sourceData:data]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"receiveLuckGiftWinning" - object:@{@"CurrentGold": receive.userPurse.diamonds, - @"Price": @(receive.gift.goldPrice * receive.giftNum * array.count), - @"isFromWinning":@(NO)}]; - } else { - // 区分错误类型，优化恢复策略 - if (code > 500 && code < 600) { - // 服务器错误，可能是临时问题，保持连击状态 -#if DEBUG - self.errorMessage = [NSString stringWithFormat:@"服务器繁忙，请稍后重试 - %@", msg]; -#else - self.errorMessage = @"Over Heat & try later"; - // 使用 BuglyManager 统一上报礼物发送错误 - NSString *uid = [AccountInfoStorage instance].getUid ?: @"未知用户"; - NSMutableDictionary *userInfo = [@{@"targetUids": allUIDs, - @"giftNum": self.giftNumPerTimes} mutableCopy]; - [userInfo addEntriesFromDictionary:dic]; - [userInfo setObject:msg forKey:@"error message"]; - - [[BuglyManager sharedManager] reportNetworkError:uid - api:@"gift/sendV5" - code:code - userInfo:userInfo]; -#endif - // 临时错误，不重置连击状态，允许用户重试 - } else if (code == 31005) { - // 余额不足，需要重置连击状态 - self.errorMessage = YMLocalizedString(@"XPCandyTreeInsufficientBalanceView1"); - [self clear]; - } else if (code == 8535) { - // VIP等级不足，需要重置连击状态, 但不可能出现 - self.errorMessage = @""; - [self clear]; - } else { - // 其他错误，根据错误类型决定是否重置连击状态 - self.errorMessage = msg; - // 对于网络错误等临时问题，保持连击状态 - if (code >= 1000 && code < 2000) { - // 网络相关错误，保持连击状态 - } else { - // 其他错误，重置连击状态 - [self clear]; - } - } - - // 确保在主线程执行UI回调 - if (self.actionCallback) { - @kWeakify(self); - [self safeExecuteUIBlock:^{ - @kStrongify(self); - self.actionCallback(ComboAction_Error); - }]; - } - } - } - targetUids:allUIDs - giftNum:self.giftNumPerTimes - sendType:[dic objectForKey:@"sendType"] - giftId:[dic objectForKey:@"giftId"] - giftSource:[dic objectForKey:@"giftSource"] - giftType:[dic objectForKey:@"giftType"] - roomUid:[dic objectForKey:@"roomUid"] - msg:@"" - uid:[AccountInfoStorage instance].getUid]; -} - -- (void)handleSendGiftSuccess:(GiftReceiveInfoModel *)receive - sourceData:(BaseModel *)response { - - // 验证连击计数有效性 - [self validateAndFixComboCount]; - - // 在API成功时递增combo计数 - if (self.isCombing) { - self.combo += 1; - - // 更新UI显示 - 确保在主线程执行UI回调 - if (self.actionCallback) { - @kWeakify(self); - [self safeExecuteUIBlock:^{ - @kStrongify(self); - self.actionCallback(ComboAction_Combo_Count_Update); - }]; - } - } - - NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:response.data]; - - // 确保连击计数最少为 1 - NSInteger comboToSet = self.combo; - if (comboToSet < 1) { - comboToSet = 1; - } - - [dic setObject:@(comboToSet) forKey:@"comboCount"]; - - self.sendGiftReceiveInfo = receive; - - if (self.handleComboSuccess) { - self.handleComboSuccess(receive, dic); - } - - // 确保在主线程执行UI回调 - if (self.actionCallback) { - @kWeakify(self); - [self safeExecuteUIBlock:^{ - @kStrongify(self); - self.actionCallback(ComboAction_Update_After_Send_Success); - }]; - } - -} - -- (void)sendCustomMessage:(AttachmentModel *)attachment { - - NIMMessage *message = [[NIMMessage alloc]init]; - message.setting.quickDeliveryEnabled = YES; // 开启快速投递 - - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - - UserInfoModel *userInfo = self.sendGiftUserInfo; - XPMessageRemoteExtModel *extModel = [[XPMessageRemoteExtModel alloc] init]; - extModel.androidBubbleUrl = userInfo.androidBubbleUrl; - extModel.iosBubbleUrl = userInfo.iosBubbleUrl; - extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; - extModel.platformRole = userInfo.platformRole; - NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[NSString stringWithFormat:@"%ld", userInfo.uid]]; - message.remoteExt = remoteExt; - - //构造会话 - NIMSession *session = [NIMSession session:self.sessionID type:NIMSessionTypeChatroom]; - - // 优化：确保在主线程发送云信消息，因为云信SDK可能期望在主线程调用 - [self safeExecuteUIBlock:^{ - NSError *error = nil; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:&error]; - if (error) { - } else { - } - }]; -} - -// 新增：辅助方法，统一处理UI回调的线程安全 -- (void)safeExecuteUIBlock:(void (^)(void))uiBlock { - if (!uiBlock) return; - - if ([NSThread isMainThread]) { - uiBlock(); - } else { - dispatch_async(dispatch_get_main_queue(), uiBlock); - } -} -// 🔧 新增：状态通知方法实现 -- (void)setUserComboState:(BOOL)isCombo forUser:(NSString *)uid { - if (!uid || uid.length == 0) { - return; - } - - - // 通过通知中心通知动画管理器 - [[NSNotificationCenter defaultCenter] postNotificationName:@"GiftComboStateChanged" - object:nil - userInfo:@{ - @"uid": uid, - @"isCombo": @(isCombo) - }]; -} - -- (void)clearUserComboState:(NSString *)uid { - [self setUserComboState:NO forUser:uid]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboTransport.h b/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboTransport.h deleted file mode 100644 index d211c82..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboTransport.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// GiftComboTransport.h -// YuMi -// -// Created by AI Assistant on 2024/8/18. -// - -#import -#import "GiftComboConfig.h" - -@class GiftReceiveInfoModel, GiftInfoModel, UserInfoModel, XPGiftCountModel; - -NS_ASSUME_NONNULL_BEGIN - -typedef void(^GiftComboTransportCompletion)(BOOL success, GiftReceiveInfoModel * _Nullable receiveInfo, NSError * _Nullable error); - -@interface GiftComboTransport : NSObject - -// 单例方法 -+ (instancetype)sharedTransport; - -// 发送礼物 -- (void)sendGiftWithParams:(NSDictionary * _Nonnull)params - completion:(GiftComboTransportCompletion _Nullable)completion; - -// 发送NIM消息 -- (void)sendNIMMessage:(NSDictionary * _Nonnull)messageData - completion:(void(^ _Nullable)(BOOL success, NSError * _Nullable error))completion; - -// 错误处理 -- (NSError *)createErrorWithCode:(ComboErrorCode)code message:(NSString * _Nullable)message; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboTransport.m b/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboTransport.m deleted file mode 100644 index 4c3a7eb..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboTransport.m +++ /dev/null @@ -1,85 +0,0 @@ -// -// GiftComboTransport.m -// YuMi -// -// Created by AI Assistant on 2024/8/18. -// - -#import "GiftComboTransport.h" -#import "GiftReceiveInfoModel.h" -#import "UserInfoModel.h" -#import "XPGiftCountModel.h" -#import "XPMessageRemoteExtModel.h" -#import "AttachmentModel.h" -#import - -@interface GiftComboTransport () - -@property (nonatomic, strong) dispatch_queue_t serialQueue; - -@end - -@implementation GiftComboTransport - -+ (instancetype)sharedTransport { - static GiftComboTransport *instance = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - instance = [[GiftComboTransport alloc] init]; - }); - return instance; -} - -- (instancetype)init { - self = [super init]; - if (self) { - _serialQueue = dispatch_queue_create("com.yumi.combo.transport", DISPATCH_QUEUE_SERIAL); - } - return self; -} - -- (void)sendGiftWithParams:(NSDictionary *)params - completion:(GiftComboTransportCompletion)completion { - - dispatch_async(self.serialQueue, ^{ - NSLog(@"%@ 🎁 发送礼物 - params: %@", kComboLogPrefix, params); - - // 这里应该调用实际的送礼API - // 为了简化，我们模拟一个成功的响应 - dispatch_async(dispatch_get_main_queue(), ^{ - if (completion) { - // 模拟成功响应 - GiftReceiveInfoModel *receiveInfo = [[GiftReceiveInfoModel alloc] init]; - completion(YES, receiveInfo, nil); - } - }); - }); -} - -- (void)sendNIMMessage:(NSDictionary *)messageData - completion:(void(^)(BOOL success, NSError *error))completion { - - dispatch_async(self.serialQueue, ^{ - NSLog(@"%@ 📨 发送NIM消息 - data: %@", kComboLogPrefix, messageData); - - // 这里应该发送实际的NIM消息 - // 为了简化，我们模拟一个成功的发送 - dispatch_async(dispatch_get_main_queue(), ^{ - if (completion) { - completion(YES, nil); - } - }); - }); -} - -- (NSError *)createErrorWithCode:(ComboErrorCode)code message:(NSString *)message { - NSDictionary *userInfo = @{ - NSLocalizedDescriptionKey: message ?: @"Unknown error" - }; - - return [NSError errorWithDomain:kComboErrorDomain - code:code - userInfo:userInfo]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboUIAdapter.h b/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboUIAdapter.h deleted file mode 100644 index 4c99966..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboUIAdapter.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// GiftComboUIAdapter.h -// YuMi -// -// Created by AI Assistant on 2024/8/18. -// - -#import -#import "GiftComboManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface GiftComboUIAdapter : NSObject - -// 单例方法 -+ (instancetype)sharedAdapter; - -// 发送UI事件 -- (void)emitAction:(ComboActionType)action withState:(NSDictionary * _Nonnull)state; - -// 设置回调 -- (void)setActionCallback:(void(^ _Nullable)(ComboActionType type))callback; - -// 设置房间UI变化回调 -- (void)setRoomUIChangedCallback:(void(^ _Nullable)(BOOL comboViewDisplay))callback; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboUIAdapter.m b/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboUIAdapter.m deleted file mode 100644 index 18ce30a..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/GiftComboUIAdapter.m +++ /dev/null @@ -1,67 +0,0 @@ -// -// GiftComboUIAdapter.m -// YuMi -// -// Created by AI Assistant on 2024/8/18. -// - -#import "GiftComboUIAdapter.h" -#import "GiftComboConfig.h" - -@interface GiftComboUIAdapter () - -@property (nonatomic, copy) void(^actionCallback)(ComboActionType type); -@property (nonatomic, copy) void(^roomUIChangedCallback)(BOOL comboViewDisplay); - -@end - -@implementation GiftComboUIAdapter - -+ (instancetype)sharedAdapter { - static GiftComboUIAdapter *instance = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - instance = [[GiftComboUIAdapter alloc] init]; - }); - return instance; -} - -- (instancetype)init { - self = [super init]; - if (self) { - // 初始化 - } - return self; -} - -- (void)emitAction:(ComboActionType)action withState:(NSDictionary *)state { - NSLog(@"%@ 🎨 发送UI事件 - action: %ld, state: %@", kComboLogPrefix, (long)action, state); - - // 确保在主线程执行UI回调 - dispatch_async(dispatch_get_main_queue(), ^{ - if (self.actionCallback) { - self.actionCallback(action); - } - - // 根据动作类型决定是否改变房间UI - if (action == ComboAction_ShowPanel) { - if (self.roomUIChangedCallback) { - self.roomUIChangedCallback(YES); - } - } else if (action == ComboAction_RemovePanel) { - if (self.roomUIChangedCallback) { - self.roomUIChangedCallback(NO); - } - } - }); -} - -- (void)setActionCallback:(void(^)(ComboActionType type))callback { - self.actionCallback = callback; -} - -- (void)setRoomUIChangedCallback:(void(^)(BOOL comboViewDisplay))callback { - self.roomUIChangedCallback = callback; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h deleted file mode 100644 index 2769000..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h +++ /dev/null @@ -1,168 +0,0 @@ -// -// YMGiftInfoModel.h -// YUMI -// -// Created by YUMI on 2021/11/11. -// - -#import -#import "GiftNobleInfoModel.h" -#import "XPWeekStarRankUserModel.h" -#import "i18nGiftNameMap.h" - -NS_ASSUME_NONNULL_BEGIN -//礼物类型 -typedef NS_ENUM(NSUInteger, GiftType) { - GiftType_Game = 2, // 游戏轰趴礼物 - GiftType_Lucky = 3, // 福袋礼物 - GiftType_LuckyPool = 5, //福袋奖池礼物 - GiftType_Noble = 7, // VIP礼物 - GiftType_WeekStar = 8, //周星礼物 - GiftType_Graffiti = 10, //涂鸦礼物 - GiftType_Anchor = 11, //个播礼物 - GiftType_Punish = 12, //惩罚礼物 - GiftType_Twelve_Star = 13, //星座礼物 - GiftType_super = 16, //幸运礼物 - GiftType_Country = 17, //国家礼物 - GiftType_Lucky24 = 18, //幸运24 - GiftType_CP = 19, // CP - GiftType_Custom = 20, // 定制 - GiftType_Bravo = 21, // 超级礼物 - GiftType_Lucky25 = 25, // 超级礼物 -}; - -//礼物类型 -typedef NS_ENUM(NSUInteger, GiftSourceType) { - GiftSourceType_Normal = 1, //普通礼物 - GiftSourceType_Pack = 2, // 背包礼物 -}; - -///礼物播放类型（0 无， 1 MP4、VAP播放,2,pag动画播放) -typedef NS_ENUM(NSUInteger, GiftOtherViewType) { - GiftOtherViewTypeNormal = 0, - GiftOtherViewTypeMp4 = 1, - GiftOtherViewTypePag = 2, -}; - -/** - 赠送类型 1给主播直接刷礼物，2私聊送个人礼物,3房间内给坑位上的人送礼物,5.公聊大厅给人送礼物 - - - GameRoomSendType_Room: 给主播直接刷礼物 - - GameRoomSendType_Chat: 2私聊送个人礼物 - - GameRoomSendType_OnMic: 3房间内给坑位上的人送礼物 - - GameRoomSendType_PublicChat: 公聊大厅给人送礼物 - - GameRoomSendType_Team 群聊礼物 - */ -typedef NS_ENUM(NSUInteger, GiftSendType) { - GiftSendType_Room = 1, - GiftSendType_Chat = 2, - GiftSendType_OnMic = 3, -}; - -/** - 送礼物的类型，1全麦，2多人非全麦，3个人送礼w - - GameRoomSendGiftType_AllMic: 全麦 - - GameRoomSendGiftType_MutableOnMic: 多人w非全麦 - - GameRoomSendGiftType_ToOne: 对个人送礼 - */ -typedef NS_ENUM(NSUInteger, RoomSendGiftType) { - RoomSendGiftType_AllMic, - RoomSendGiftType_MutableOnMic, - RoomSendGiftType_ToOne, -}; - -@interface GiftInfoModel : PIBaseModel -///礼物id -@property (nonatomic, assign)NSInteger giftId; -///礼物名字 -@property (nonatomic, strong)NSString *giftName; -@property(nonatomic,copy) NSString *giftNum; -///价格 -@property (nonatomic, assign)double goldPrice; - -///礼物url -@property (nonatomic, copy)NSString *giftUrl; -///福袋svagUrl -@property (nonatomic, copy)NSString *luckyGiftSvgaUrl; -///玩法说明Url -@property (nonatomic, copy)NSString *giftExplainUrl; - -@property (nonatomic, assign) GiftType giftType;//礼物类型 -///是否有vgg特效 -@property (assign, nonatomic) BOOL hasVggPic; -///动效url -@property (copy, nonatomic) NSString *vggUrl; -///是否最新 -@property (assign, nonatomic) BOOL hasLatest; -///是否限时 -@property (assign, nonatomic) BOOL hasTimeLimit; -///是否特效 -@property (assign, nonatomic) BOOL hasEffect; -///是否是房间专属礼物 -@property (assign, nonatomic) BOOL roomExclude; -///是否支持发广播 -@property (nonatomic,assign) BOOL isSendMsg; -///礼物文件类型 0 其他， 1 mp4 -@property (nonatomic, assign) GiftOtherViewType otherViewType; -///mp4类型特效url -@property (nonatomic, copy) NSString *viewUrl; - -/**------------- 礼物背包 ----------------**/ -///个数 -@property (nonatomic, assign) NSInteger count; -@property (nonatomic, assign) NSInteger reciveCount; - -//isSelected 用于本地修改 -@property (nonatomic,assign) BOOL isSelected;//是否被选中 -///礼物来源 -@property (nonatomic,assign) GiftSourceType sourceType; -///VIP礼物专属信息 -@property (nonatomic, strong) GiftNobleInfoModel *giftVipInfo; - -/*----------周星礼物--------*/ -///上周周星礼物ID -@property (nonatomic, assign) NSInteger lastGiftId; -///上周对应礼物的魅力榜第一 -@property (nonatomic, strong) XPWeekStarRankUserModel *firstCharmRankUser; -///上周对应礼物豪气榜第一 -@property (nonatomic, strong) XPWeekStarRankUserModel *firstLevelRankUser; -@property (nonatomic,assign) BOOL isEmpty; -//超级幸运礼物新增字段 -@property(nonatomic,copy) NSString *bannerUrl; -@property(nonatomic,copy) NSString *skipUrl; - -@property (nonatomic, strong) i18nGiftNameMap *i18nGiftNameMap; - -@property(nonatomic, assign) NSInteger showAvatarType; // 是否需要塞头像，0-否，1-送礼者，2-收礼者，3-左送右收 -@property(nonatomic, assign) NSInteger notifyFull; // 该礼物动画是否全房间播放 - -@property(nonatomic, assign) NSInteger luckyPackageCount; // 用于记录发礼物红包时的数量 - -/// 排序 -@property (nonatomic, assign) NSInteger seqNo; - -@end - -@interface GiftPanelTabModel : PIBaseModel - -/// 标题, 同时也是礼物类型 -@property (nonatomic, copy) NSString *key; -/// 排序 -@property (nonatomic, assign) NSInteger seq; -///多语言标题 -@property (nonatomic, strong) i18nGiftNameMap *nameMap; - -@property (nonatomic, copy) NSArray *gifts; - - - -- (GiftType)tabGiftType; - -@end - - -//@interface GiftPanelModel : PIBaseModel -//@property (nonatomic, copy) NSArray *tabList; -//@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.m b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.m deleted file mode 100644 index 109346d..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.m +++ /dev/null @@ -1,66 +0,0 @@ -// -// YMGiftInfoModel.m -// YUMI -// -// Created by YUMI on 2021/11/11. -// - -#import "GiftInfoModel.h" -#import "MJExtension.h" - -@implementation GiftInfoModel -MJCodingImplementation - -- (BOOL)isEqual:(id)other -{ - if (other == self) { - return YES; - } - - if (![other isKindOfClass:[GiftInfoModel class]]) { - return NO; - } - - if ([(GiftInfoModel *)other giftId] == self.giftId) { - return YES; - } else { - return NO; - } -} - -- (NSUInteger)hash -{ - return [@(self.giftId) hash]; -} - -@end - -@implementation GiftPanelTabModel -MJCodingImplementation - -- (GiftType)tabGiftType { - if ([self.key isEqualToString:@"normalGift"]) { - return GiftType_Game; - } else if ([self.key isEqualToString:@"luckyBagGift"]) { - return GiftType_Lucky; - } else if ([self.key isEqualToString:@"superLuckyGift"]) { - return GiftType_super; - } else if ([self.key isEqualToString:@"vipGift"]) { - return GiftType_Noble; - } else if ([self.key isEqualToString:@"countryGift"]) { - return GiftType_Country; - } else if ([self.key isEqualToString:@"weekStarGift"]) { - return GiftType_WeekStar; - } else if ([self.key isEqualToString:@"singlePopularGift"]) { - return GiftType_Anchor; - } else if ([self.key isEqualToString:@"customGift"]) { - return GiftType_Custom; - } else if ([self.key isEqualToString:@"cpGift"]) { - return GiftType_CP; - } else if ([self.key isEqualToString:@"bravoGift"]) { - return GiftType_Bravo; - } - - return GiftType_Game; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftLuckyBroadcastModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftLuckyBroadcastModel.h deleted file mode 100644 index beefbe5..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftLuckyBroadcastModel.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// GiftLuckyBroadcastModel.h -// YUMI -// -// Created by YUMI on 2022/10/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface GiftLuckyBroadcastModel : PIBaseModel -///礼物名称 -@property (nonatomic,strong) NSString *giftName; -///价格 -@property (nonatomic, assign)double goldPrice; -///幸运礼物 -@property (nonatomic,strong) NSString *luckyBagName; -///昵称 -@property (nonatomic,strong) NSString *nick; -///房间标题 -@property (nonatomic,strong) NSString *roomTitle; -///房间的uid -@property (nonatomic,strong) NSString *roomUid; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftLuckyBroadcastModel.m b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftLuckyBroadcastModel.m deleted file mode 100644 index 2eb9846..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftLuckyBroadcastModel.m +++ /dev/null @@ -1,14 +0,0 @@ -// -// GiftLuckyBroadcastModel.m -// YUMI -// -// Created by YUMI on 2022/10/17. -// - -#import "GiftLuckyBroadcastModel.h" - -@implementation GiftLuckyBroadcastModel - - - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.h deleted file mode 100644 index faa1551..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// GiftNobleInfoModel.h -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface GiftNobleInfoModel : PIBaseModel - -///VIP图标 -@property (nonatomic, copy)NSString *vipIcon; -///可用VIP等级 -@property (nonatomic, assign) NSInteger vipLevel; -///VIP名称 -@property (nonatomic, copy) NSString *vipName; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.m b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.m deleted file mode 100644 index 2c24cef..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// GiftNobleInfoModel.m -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import "GiftNobleInfoModel.h" -#import "MJExtension.h" -@implementation GiftNobleInfoModel -MJCodingImplementation -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h deleted file mode 100644 index bef1741..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h +++ /dev/null @@ -1,153 +0,0 @@ -// -// GiftReceiveInfoModel.h -// YUMI -// -// Created by YUMI on 2021/11/16. -// -#import -#import "GiftInfoModel.h" -#import "WalletInfoModel.h" - -typedef NS_ENUM(NSInteger, BroadCastLevel) { - BroadCastLevel_Normal = 1, - BroadCastLevel_Middle = 2, - ///最高级 - BroadCastLevel_High = 3, -}; - -NS_ASSUME_NONNULL_BEGIN -@class GiftValueInfoModel; -@interface GiftReceiveUserInfoModel : PIBaseModel -///收礼物的人 -@property(nonatomic, strong)NSString *nick; -///收礼物的人的头像 -@property(nonatomic, strong)NSString *avatar; -///用户uid -@property(nonatomic, assign) NSInteger uid; -@end - -@interface GiftLuckyUserInfo : PIBaseModel -@property(nonatomic, copy) NSString *nick; -//基础信息 -@property(nonatomic, assign) NSInteger uid; -@end - - -@interface GiftListsInfo : PIBaseModel -@property (nonatomic, assign) NSInteger giftNum; -@property (nonatomic, assign) NSInteger prizeLevel; -@property (nonatomic, assign) NSInteger giftId; -@property (nonatomic, assign) NSInteger goldPrice; -@end - - -// 要多次发送消息 福袋相关的modle单独处理 - -@interface GiftLuckyBagGiftsInfo : PIBaseModel -@property (nonatomic, strong) NSArray *giftList; -@property (nonatomic, strong) GiftLuckyUserInfo *user; -@end - -@interface GiftReceiveInfoModel : PIBaseModel -@property(nonatomic,copy) NSString *roomTitle; -///目标的uid -@property(nonatomic,copy)NSString * targetUid; -///目标的头像 -@property (nonatomic,copy) NSString *targetAvatar; -///目标的昵称 -@property (nonatomic,copy) NSString *targetNick; -@property (nonatomic,strong) NSArray *targetUids; -///礼物信息 - 来自礼物 API -@property (nonatomic,strong) GiftInfoModel *gift; -///礼物信息 - 来自推送 35 -@property (nonatomic,strong) GiftInfoModel *giftVo; -///礼物信息 -@property (nonatomic,strong) GiftInfoModel *giftInfo; -///送礼物的人uid -@property(nonatomic, assign)NSString *uid; -///礼物的id -@property (nonatomic,copy) NSString *giftId; -///送礼物的人 -@property(nonatomic, strong)NSString *nick; -///送礼物的人的头像 -@property(nonatomic, strong)NSString *avatar; -///送礼物的个数 -@property (assign, nonatomic) NSInteger giftNum; -///礼物价格 -@property(nonatomic,assign) NSInteger giftGolds; -///礼物名字 -@property (nonatomic,strong)NSString *giftName; -///动效url -@property (copy,nonatomic) NSString *vggUrl; -///vap动效url -@property (nonatomic, copy) NSString *mp4Url; -///福袋svagUrl -@property (nonatomic, copy)NSString *luckyGiftSvgaUrl; -///非全麦 多人送礼时 -@property (nonatomic,strong) NSArray *targetUsers; -///福袋礼物需要展示的vg动画 -@property (nonatomic,strong) NSArray *displayGift; -///福袋随机获取的礼物 -@property (nonatomic,strong) NSArray *luckyBagGifts; -///多人接收到的具体福袋礼物 是对luckyBagGifts的分离 要多次发送消息使用 -@property (nonatomic,strong) GiftLuckyBagGiftsInfo* luckyGiftList; -///礼物来源 -@property (nonatomic,assign) GiftSourceType sourceType; -///房间送礼物的类型 -@property (nonatomic,assign) RoomSendGiftType roomSendGiftType; -///礼物值信息 -@property (nonatomic, strong) NSArray *giftValueVos; -///是否是背包礼物 -@property (nonatomic,assign) BOOL isLuckyBagGift; -///是不是全麦 -@property (nonatomic,assign) BOOL isBatch; -@property (nonatomic,assign) BOOL isComboBatch; -///播放哪个动画 -@property (nonatomic, assign) BOOL isShowAnimation; - -///礼物的地址 -@property (nonatomic,copy) NSString *giftUrl; -///是否可跳转房间 -@property (nonatomic,assign) BOOL isSkipRoom; -///全服礼物通知等级编号 -@property (nonatomic,assign) BroadCastLevel levelNum; -///停留的时间 -@property (nonatomic,assign) CGFloat notifyStaySecond; -///接收者的头像 -@property (nonatomic,copy) NSString *recvUserAvatar; -///接收者的昵称 -@property (nonatomic,copy) NSString *recvUserNick; -@property (nonatomic,copy) NSString *recvUserUid; -///发送者的头像 -@property (nonatomic, copy) NSString *sendUserAvatar; -///发送者的昵称 -@property (nonatomic, copy) NSString *sendUserNick; -@property (nonatomic,copy) NSString *sendUserUid; -///跳转的房间的uid -@property (nonatomic,assign) NSInteger roomUid; -///平台id -@property (nonatomic,copy) NSString *roomErbanNo; -///是否年度飘屏 -@property (nonatomic, assign) BOOL ceremonyGift; -///是否是房间外飘屏 -@property(nonatomic,assign) BOOL isHomeShow; - -@property(nonatomic,strong)WalletInfoModel * userPurse; - -@property (nonatomic, strong) i18nGiftNameMap *i18nGiftNameMap; - -@property (nonatomic, assign) NSInteger comboCount; - -@property (nonatomic, assign) NSInteger receiveGiftNumberUser; - -@property (nonatomic, assign) NSInteger bgLevel; // 1,2,3 对应非 VIP 背景，456 对应 VIP 背景 - - - -- (NSInteger)receiveUserCount; - -- (void)giftDataAlignment; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.m b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.m deleted file mode 100644 index 9112ce0..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.m +++ /dev/null @@ -1,107 +0,0 @@ -// -// GiftReceiveInfoModel.m -// YUMI -// -// Created by YUMI on 2021/11/16. -// - -#import "GiftReceiveInfoModel.h" -#import "NSObject+MJExtension.h" - -@implementation GiftReceiveUserInfoModel - -@end - -@implementation GiftLuckyUserInfo - - -@end - -@implementation GiftListsInfo - - -@end - -@implementation GiftLuckyBagGiftsInfo - -+ (NSDictionary *)objectClassInArray { - return @{@"giftList":GiftListsInfo.class - }; -} - - -@end - -@implementation GiftReceiveInfoModel - -+ (NSDictionary *)objectClassInArray { - return @{@"targetUsers":GiftReceiveUserInfoModel.class, - @"displayGift":GiftInfoModel.class, - @"luckyBagGifts":GiftLuckyBagGiftsInfo.class - }; -} - -- (BOOL)isEqual:(id)other -{ - if (other == self) { - return YES; - } - - GiftReceiveInfoModel *otherInfo = (GiftReceiveInfoModel *)other; - if ([self.uid isEqualToString:otherInfo.uid] -// && [self.giftId isEqualToString:otherInfo.giftId] -// && [self isEqualUIDs:otherInfo] - ) { - return YES; - } - - return NO; -} - -- (BOOL)isEqualUIDs:(GiftReceiveInfoModel *)other { - if ([self.targetUid isEqualToString:other.targetUid]) { - return YES; - } - if ([self.targetUids isEqualToArray:other.targetUids]) { - return YES; - } - return NO; -} - -- (NSUInteger)hash -{ - return self.uid.hash ^ self.giftId.hash;// ^ self.targetUid.hash ^ self.targetUids.hash; -} - -- (NSInteger)receiveUserCount { - if (self.targetUids.count > 0) { - return self.targetUids.count; - } - return 1; -} - -- (void)giftDataAlignment { - if (!_gift) { - if (_giftVo) { - _gift = _giftVo; - } else if (_giftInfo) { - _gift = _giftInfo; - } - } - if (!_giftVo) { - if (_gift) { - _giftVo = _gift; - } else if (_giftInfo) { - _giftVo = _giftInfo; - } - } - if (!_giftInfo) { - if (_giftVo) { - _giftInfo = _giftVo; - } else if (_gift) { - _giftInfo = _gift; - } - } -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftTwelveStarFirstModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftTwelveStarFirstModel.h deleted file mode 100644 index 1f93ef5..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftTwelveStarFirstModel.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// GiftTwelveStarFirstModel.h -// YUMI -// -// Created by YUMI on 2022/12/7. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface GiftTwelveStarFirstModel : PIBaseModel -@property (nonatomic, copy) NSString *avatar; -@property (nonatomic, copy) NSString *erbanNo; -@property (nonatomic, copy) NSString *markUrl; -@property (nonatomic, copy) NSString *nick; -@property (nonatomic, copy) NSString *twelveStarName; -@property (nonatomic, copy) NSString *uid; -@property (nonatomic, assign) NSInteger gender; -@property (nonatomic, copy) NSString *twelveId; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftTwelveStarFirstModel.m b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftTwelveStarFirstModel.m deleted file mode 100644 index a458342..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftTwelveStarFirstModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// GiftTwelveStarFirstModel.m -// YUMI -// -// Created by YUMI on 2022/12/7. -// - -#import "GiftTwelveStarFirstModel.h" - -@implementation GiftTwelveStarFirstModel - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftValueInfoModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftValueInfoModel.h deleted file mode 100644 index c4a4b3e..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftValueInfoModel.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// MicroGiftValueModel.h -// YUMI -// -// Created by YUMI on 2021/12/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GiftValueDetailModel; -@interface GiftValueInfoModel : PIBaseModel -@property (nonatomic, copy) NSString *currentTime;//系统时间戳 -@property (nonatomic, strong) NSArray *giftValueVos; -@end - -@interface GiftValueDetailModel : PIBaseModel -///用户的uid -@property (nonatomic, copy) NSString * uid; -///礼物值 -@property (nonatomic, assign) long long giftValue; -@end - - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftValueInfoModel.m b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftValueInfoModel.m deleted file mode 100644 index c857308..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftValueInfoModel.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// MicroGiftValueModel.m -// YUMI -// -// Created by YUMI on 2021/12/13. -// - -#import "GiftValueInfoModel.h" - -@implementation GiftValueInfoModel - -+ (NSDictionary *)objectClassInArray { - return @{@"giftValueVos":GiftValueDetailModel.class}; -} - -@end - - -@implementation GiftValueDetailModel - - - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPFreeGiftModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPFreeGiftModel.h deleted file mode 100644 index 01514ea..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPFreeGiftModel.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// XPFreeGiftModel.h -// xplan-ios -// -// Created by duoban on 2022/12/13. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPFreeGiftModel : PIBaseModel -@property (nonatomic,copy) NSString *uid; -@property (nonatomic,copy) NSString *giftId; -@property (nonatomic,copy) NSString *giftName; -@property (nonatomic,copy) NSString *goldPrice; -@property (nonatomic,copy) NSString *giftUrl; -@property (nonatomic,copy) NSString *curStage; -@property (nonatomic,copy) NSString *curStageSecond; -@property (nonatomic,copy) NSString *maxStage; -@property (nonatomic,copy) NSString *resetTime; -@property (nonatomic,copy) NSString *firstSecond; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPFreeGiftModel.m b/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPFreeGiftModel.m deleted file mode 100644 index 313972c..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPFreeGiftModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// XPFreeGiftModel.m -// xplan-ios -// -// Created by duoban on 2022/12/13. -// - -#import "XPFreeGiftModel.h" - -@implementation XPFreeGiftModel - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftCountModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftCountModel.h deleted file mode 100644 index eacbcca..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftCountModel.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMGiftCountModel.h -// YUMI -// -// Created by YUMI on 2021/11/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGiftCountModel : PIBaseModel -/// -@property (nonatomic,copy) NSString *title; -///礼物的个数 -@property (nonatomic,copy) NSString *giftNumber; -/// 背包礼物的时候显示是全部 -@property (nonatomic,assign) BOOL isTotal; -///是否是自定义数量 默认为NO -@property (nonatomic, assign) BOOL isCustomCount; - -@property(nonatomic,assign) BOOL isOnlyNum; - -+ (instancetype)initCountModel:(NSString *)title giftNumber:(NSString *)giftNumber; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftCountModel.m b/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftCountModel.m deleted file mode 100644 index af2bb32..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftCountModel.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMGiftCountModel.m -// YUMI -// -// Created by YUMI on 2021/11/11. -// - -#import "XPGiftCountModel.h" - -@implementation XPGiftCountModel - - -+ (instancetype)initCountModel:(NSString *)title giftNumber:(NSString *)giftNumber { - XPGiftCountModel * model = [[XPGiftCountModel alloc] init]; - model.title = title; - model.giftNumber = giftNumber; - model.isTotal = NO; - model.isCustomCount = NO; - return model; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftUserInfoModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftUserInfoModel.h deleted file mode 100644 index e61fbdb..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftUserInfoModel.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMGiftUserInfoModel.h -// YUMI -// -// Created by YUMI on 2021/11/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGiftUserInfoModel : PIBaseModel -///头像 -@property (nonatomic,copy) NSString * avatar; -///昵称 -@property (nonatomic,copy) NSString *nick; -///用户的uid -@property (nonatomic,assign) NSInteger uid; -///坑位 如果用户在坑位的话 就有值 如果没在坑位的话 就没有有值 -@property (nonatomic,copy) NSString * position; -///是否为相亲模式VIP坑位 -@property (nonatomic,assign) BOOL vipMic; -///是否选择 本地字段刷新页面使用 -@property (nonatomic,assign) BOOL isSelect; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftUserInfoModel.m b/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftUserInfoModel.m deleted file mode 100644 index 2563bf8..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPGiftUserInfoModel.m +++ /dev/null @@ -1,14 +0,0 @@ -// -// YMGiftUserInfoModel.m -// YUMI -// -// Created by YUMI on 2021/11/17. -// - -#import "XPGiftUserInfoModel.h" - -@implementation XPGiftUserInfoModel - - - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPWeekStarRankUserModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPWeekStarRankUserModel.h deleted file mode 100644 index f8a7422..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPWeekStarRankUserModel.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// YMCharmRankUserModel.h -// YUMI -// -// Created by YUMI on 2022/5/7. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPWeekStarRankUserModel : PIBaseModel -///0:冠名，1、神豪 -@property(nonatomic,assign) int type; -///头像 -@property (nonatomic, copy) NSString *avatar; -///榜单值 -@property (nonatomic, assign) NSInteger amount; -///uid -@property (nonatomic, assign) NSInteger uid; -///二般号 -@property (nonatomic, assign) NSInteger erbanNo; -///昵称 -@property (nonatomic, copy) NSString *nick; -///礼物id -@property (nonatomic, assign) NSInteger giftId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPWeekStarRankUserModel.m b/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPWeekStarRankUserModel.m deleted file mode 100644 index 74d024e..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/XPWeekStarRankUserModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMCharmRankUserModel.m -// YUMI -// -// Created by YUMI on 2022/5/7. -// - -#import "XPWeekStarRankUserModel.h" - -@implementation XPWeekStarRankUserModel - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/i18nGiftNameMap.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/i18nGiftNameMap.h deleted file mode 100644 index 276ea9e..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/i18nGiftNameMap.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// i18nGiftNameMap.h -// YuMi -// -// Created by P on 2024/7/11. -// - -#import "PIBaseModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface i18nGiftNameMap : PIBaseModel - -@property (nonatomic, copy) NSString *zh; -@property (nonatomic, copy) NSString *en; -@property (nonatomic, copy) NSString *ar; -@property (nonatomic, copy) NSString *tr; -@property (nonatomic, copy) NSString *uz; -@property (nonatomic, copy) NSString *es; -@property (nonatomic, copy) NSString *ru; -@property (nonatomic, copy) NSString *pt; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/i18nGiftNameMap.m b/YuMi/Modules/YMRoom/View/SendGiftView/Model/i18nGiftNameMap.m deleted file mode 100644 index ebd6def..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/i18nGiftNameMap.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// i18nGiftNameMap.m -// YuMi -// -// Created by P on 2024/7/11. -// - -#import "i18nGiftNameMap.h" - -@implementation i18nGiftNameMap - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.h b/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.h deleted file mode 100644 index d71120e..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.h +++ /dev/null @@ -1,58 +0,0 @@ -// -// XPGiftPresenter.h -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import "BaseMvpPresenter.h" -#import "GiftInfoModel.h" -#import "BravoGiftTabInfomationModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGiftPresenter : BaseMvpPresenter -/// 获取用户信息 -/// @param uid 查询的用户的uid -- (void)getUserInfo:(NSString *)uid; -/// 获取用户钱包信息 -- (void)getUserWalletInfo; - -/// 获取面板 Tags 和所有普通礼物，替代 getNormalGiftList: -/// @param roomUid 房主的uid 获取房间专属礼物 -- (void)getTagsAndGifts:(NSString *)roomUid; - -/// 获取背包礼物 -- (void)getPackGiftList; -/// 送礼物 -/// @param targetUids 送礼物的人 -/// @param giftNum 礼物的个数 -/// @param sendType 送的类型 -/// @param giftId 送礼物的id -/// @param giftSource 送礼物的来源 -/// @param giftType 礼物的类型 -/// @param roomSendType 赠送的类型 -/// @param roomUid 房主的uid -/// @param msg 喊话的内容 -- (void)sendGift:(NSString *)targetUids - giftNum:(NSString *)giftNum - sendType:(GiftSendType)sendType - giftId:(NSString *)giftId - giftSource:(GiftSourceType)giftSource - giftType:(GiftType)giftType - roomSendType:(RoomSendGiftType)roomSendType - roomUid:(NSString *)roomUid - msg:(NSString *)msg; - - -///全服福袋记录记录 -- (void)luckyGiftBroadcastRecord; - -///星座礼物 -- (void)getTwelveStarLastRankFirst:(NSString *)roomUid; - -- (void)bravoGetBannerList:(void(^)(NSArray *array))success failure:(void(^)(NSError *error))failure; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.m b/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.m deleted file mode 100644 index 4d74978..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.m +++ /dev/null @@ -1,167 +0,0 @@ -// -// YMGiftPresenter.m -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import "XPGiftPresenter.h" -///Tool -#import "AccountInfoStorage.h" -#import "XPGiftStorage.h" -#import "Api+Gift.h" -#import "XNDJTDDLoadingTool.h" -///Model -#import "WalletInfoModel.h" -#import "GiftReceiveInfoModel.h" -#import "UserInfoModel.h" -#import "GiftLuckyBroadcastModel.h" -#import "GiftTwelveStarFirstModel.h" -///P -#import "XPGiftProtocol.h" -#import -#import "BuglyManager.h" - -@interface XPGiftPresenter () -/// -@property (nonatomic,weak) id view; -@end - -@implementation XPGiftPresenter -/// 获取用户信息 -/// @param uid 查询的用户的uid -- (void)getUserInfo:(NSString *)uid { - if (uid == nil) { - return; - } - @kWeakify(self); - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetUserInfoSuccess:infoModel]; - }] uid:uid]; -} - -/// 获取用户钱包信息 -- (void)getUserWalletInfo { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - @kWeakify(self); - [Api getUserWalletInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data]; - [[self getView] getUserWalletInfo:model]; - }] uid:uid ticket:ticket]; -} - -///有緩存會直接使用，面板不額外觸發數據更新 -- (void)getTagsAndGifts:(NSString *)roomUid { - NSArray * array = [[XPGiftStorage shareStorage] getGiftPanelTagsDatasource:roomUid]; - if (array.count > 0) { - [[self getView] getTagsSuccess:array]; - } else { - @kWeakify(self); - [Api requestAllTagsAndNormalGifts:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] getTagsSuccess:[[XPGiftStorage shareStorage] cacheTagsWith:data.data inRoom:roomUid]]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] getNormalGiftListFail:msg]; - }] roomUid:roomUid]; - } -} - - -/// 获取背包礼物 -- (void)getPackGiftList { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - @kWeakify(self); - [Api requestPackGiftList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray * info = [GiftInfoModel modelsWithArray:data.data]; - [[self getView] getPacketGiftListSuccess:info]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] getPacketGiftListFail:msg]; - }] uid:uid ticket:ticket]; -} - - -/// 送礼物 -/// @param targetUids 送礼物的人 -/// @param giftNum 礼物的个数 -/// @param sendType 送的类型 -/// @param giftId 送礼物的id -/// @param giftSource 送礼物的来源 -/// @param giftType 礼物的类型 -/// @param roomSendType 赠送的类型 -/// @param roomUid 房主的uid -/// @param msg 喊话的内容 -- (void)sendGift:(NSString *)targetUids - giftNum:(NSString *)giftNum - sendType:(GiftSendType)sendType - giftId:(NSString *)giftId - giftSource:(GiftSourceType)giftSource - giftType:(GiftType)giftType - roomSendType:(RoomSendGiftType)roomSendType - roomUid:(NSString *)roomUid - msg:(NSString *)msg - { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * giftSourceStr = [NSString stringWithFormat:@"%ld", giftSource]; - NSString * giftTypeStr = [NSString stringWithFormat:@"%ld", giftType]; - NSString * giftSendTypeStr = [NSString stringWithFormat:@"%ld", sendType]; - if (roomUid.length <=0) { - roomUid = @""; - } - @kWeakify(self); - [Api requestSendGift:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - GiftReceiveInfoModel *receive = [GiftReceiveInfoModel modelWithJSON:data.data]; - receive.sourceType = giftSource; - receive.roomSendGiftType = roomSendType; - NSArray * array = [targetUids componentsSeparatedByString:@","]; - [self.getView sendGiftSuccess:receive originDic:data.data uidCount:array.count]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] sendGiftFailWithCode:code msg:msg]; - }] targetUids:targetUids giftNum:giftNum sendType:giftSendTypeStr giftId:giftId giftSource:giftSourceStr giftType:giftTypeStr roomUid:roomUid msg:msg uid:uid]; -} - -///全服福袋记录记录 -- (void)luckyGiftBroadcastRecord { - @kWeakify(self); - [Api requestLuckGiftServerBagRecord:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray * array = [GiftLuckyBroadcastModel modelsWithArray:data.data]; - [[self getView] luckyGiftBroadcastRecordSuccess:array]; - }fail:^(NSInteger code, NSString * _Nullable msg) { -// NSLog(@"%@",msg); - }]]; -} - -///获取十二星座礼物banner -- (void)getTwelveStarLastRankFirst:(NSString *)roomUid { - @kWeakify(self); - [Api requestTwelveStarFirst:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - GiftTwelveStarFirstModel * model = [GiftTwelveStarFirstModel modelWithDictionary:data.data]; - [[self getView] getTwelveStarLastRankFirstSuccess:model]; - }] roomUid:roomUid]; -} - -- (void)bravoGetBannerList:(void(^)(NSArray *array))success failure:(void(^)(NSError *error))failure { - [Api bravoGetBannerList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { -// NSArray - success([BravoGiftTabInfomationModel modelsWithArray:data.data]); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:msg code:code userInfo:nil]); - } - } showLoading:NO errorToast:NO] ]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftStorage.h b/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftStorage.h deleted file mode 100644 index 44b8e8e..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftStorage.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// YMGiftStorage.h -// YUMI -// -// Created by YUMI on 2021/11/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class GiftInfoModel, GiftPanelTabModel; -@interface XPGiftStorage : NSObject -+ (instancetype)shareStorage; -- (instancetype)init NS_UNAVAILABLE; -- (instancetype)copy NS_UNAVAILABLE; -- (instancetype)mutableCopy NS_UNAVAILABLE; - -- (NSString *)defaultKey; - -- (NSArray *)getGiftDatasource:(NSString *)roomUid; -- (NSArray *)getGiftPanelTagsDatasource:(NSString *)roomUid; - -- (void)saveGiftDatasource:(NSArray *)giftArray roomUid:(NSString *)roomUid; -- (void)saveGiftPanelTagsDatasource:(NSArray *)giftArray roomUid:(NSString *)roomUid; - -/** - 这个不是最好的获取方式 可能由于没有房间uid 导致获取失败 - 目前用在公屏获取礼物 因为公屏的架构 传入一个房间id 的话 改动太大 先这样用着吧 - */ -/// 获取当前房间的数据中的礼物 -/// @param giftId 礼物的id -- (GiftInfoModel *)findGiftInfo:(NSString *)giftId inRoom:(NSString *)roomUid; - -// 进房时需要主动更新 roomID，礼物 model 会优先从对应的 -- (void)updateRoomUID:(NSString *)roomUID; - -- (NSArray *)cacheTagsWith:(NSDictionary *)response inRoom:(NSString *)roomUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftStorage.m b/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftStorage.m deleted file mode 100644 index 5bf4c02..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftStorage.m +++ /dev/null @@ -1,191 +0,0 @@ -// -// YMGiftStorage.m -// YUMI -// -// Created by YUMI on 2021/11/17. -// - -#import "XPGiftStorage.h" -#import "GiftInfoModel.h" -#import "NSObject+MJExtension.h" -#import "NSArray+Safe.h" -@interface XPGiftStorage () -///key: 房间id value:房间对应的所有礼物列表，default 表示無房間 id 的默認禮物列表 -@property (nonatomic, strong) NSCache *> *roomGiftCache; -///包括面板 tab 和所有禮物的數據 -@property (nonatomic, strong) NSCache *> *roomGiftPanelTagsCache; - -///当前房间的uid -@property (atomic, copy) NSString *currentRoomUid; - -@end - -@implementation XPGiftStorage - -+ (instancetype)shareStorage { - static dispatch_once_t onceToken; - static XPGiftStorage * storage; - dispatch_once(&onceToken, ^{ - storage = [[XPGiftStorage alloc] init]; - }); - return storage; -} - -- (NSString *)defaultKey { - return @"default"; -} - -///只保存所有禮物數據， -- (void)saveGiftDatasource:(NSArray *)giftArray roomUid:(NSString *)roomUid { - if (giftArray.count > 0 && roomUid.length > 0) { - // 確保排序，後續使用二分法查找 - NSArray *sortedGiftLists = [giftArray sortedArrayUsingComparator:^NSComparisonResult(GiftInfoModel *obj1, GiftInfoModel *obj2) { - NSComparisonResult result = [@(obj1.seqNo) compare:@(obj2.seqNo)]; - if (result == NSOrderedSame) { - return [@(obj2.giftId) compare:@(obj1.giftId)]; - } - return result; - }]; - @synchronized (self.roomGiftCache) { - [self.roomGiftCache setObject:sortedGiftLists forKey:roomUid]; - } - } -} - -///保存 tabs 和所tab 下相關禮物數據 -- (void)saveGiftPanelTagsDatasource:(NSArray *)tagsArray roomUid:(NSString *)roomUid { - if (tagsArray.count > 0 && roomUid.length > 0) { - [self.roomGiftPanelTagsCache setObject:tagsArray forKey:roomUid]; - } -} - -///獲取全部禮物數據 -- (NSArray *)getGiftDatasource:(NSString *)roomUid { - if (roomUid.length > 0) { - self.currentRoomUid = roomUid; - NSArray *giftLists = [self.roomGiftCache objectForKey:roomUid]; - if (giftLists.count > 0) { - return giftLists; - } else { - giftLists = [self.roomGiftCache objectForKey:[self defaultKey]]; - return giftLists; - } - } - return nil; -} - -///獲取 tabs 和所tab 下相關禮物數據 -- (NSArray *)getGiftPanelTagsDatasource:(NSString *)roomUid { - if (roomUid.length > 0) { - self.currentRoomUid = roomUid; - NSArray *tagsList = [self.roomGiftPanelTagsCache objectForKey:roomUid]; - if (tagsList.count > 0) { - return tagsList; - } else { - return [self.roomGiftPanelTagsCache objectForKey:[self defaultKey]]; - } - } - return nil; -} - -/// 获取当前房间的数据中的礼物 -/// @param giftId 礼物的id -- (GiftInfoModel *)findGiftInfo:(NSString *)giftId inRoom:(NSString *)roomUid { - NSInteger giftIdInt = giftId.integerValue; - NSArray *giftLists = [self getGiftDatasource:roomUid]; - if (giftLists.count == 0) return nil; - - // 改用字典查询 - static NSCache *> *giftIdMapCache; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - giftIdMapCache = [[NSCache alloc] init]; - giftIdMapCache.countLimit = 100; // 设置合理的缓存限制 - }); - - __block NSDictionary *giftMap = [giftIdMapCache objectForKey:roomUid]; - if (!giftMap) { - // 构建映射表 - NSMutableDictionary *map = [NSMutableDictionary new]; - for (GiftInfoModel *gift in giftLists) { - map[@(gift.giftId)] = gift; - } - NSDictionary *newGiftMap = [map copy]; - [giftIdMapCache setObject:newGiftMap forKey:roomUid]; - giftMap = newGiftMap; - } - return giftMap[@(giftIdInt)]; -} - - -- (NSCache *> *)roomGiftCache { - if (!_roomGiftCache) { - _roomGiftCache = [[NSCache alloc] init]; -// 设置缓存数据的数目 -// _roomGiftCache.countLimit = 50; - } - return _roomGiftCache; -} - -- (NSCache *> *)roomGiftPanelTagsCache { - if (!_roomGiftPanelTagsCache) { - _roomGiftPanelTagsCache = [[NSCache alloc] init]; - // 设置缓存数据的数目 - _roomGiftPanelTagsCache.countLimit = 50; - } - return _roomGiftPanelTagsCache; -} - -- (void)updateRoomUID:(NSString *)roomUID -{ - self.currentRoomUid = roomUID; -} - -///處理 API 數據，分別緩存所有禮物和 tab/tab禮物 -- (NSArray *)cacheTagsWith:(NSDictionary *)response inRoom:(NSString *)roomUid { - NSArray *tabModels = [GiftPanelTabModel modelsWithArray:response[@"tabList"]]; - - NSDictionary *contents = response; - if ([[response allKeys] containsObject:@"giftTabMap"]) { - contents = [response objectForKey:@"giftTabMap"]; - } - - NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"seq" ascending:YES]; - NSMutableArray *mutableTabs = [tabModels sortedArrayUsingDescriptors:@[sortDescriptor]].mutableCopy; - - // 构建每个 Tab 下的礼物 - for (GiftPanelTabModel *model in mutableTabs) { - NSString *key = model.key; - NSArray *giftsArray = [contents objectForKey:key]; - if (giftsArray.count > 0) { - NSArray *giftModels = [GiftInfoModel modelsWithArray:giftsArray]; - model.gifts = giftModels; - } - } - - // 所有礼物，福袋爆出的礼物会从这里获取 - NSMutableArray *totalInfo = [NSMutableArray array]; - for (NSString *key in contents) { - NSArray *giftModels = [GiftInfoModel modelsWithArray:[contents objectForKey:key]]; - [totalInfo addObjectsFromArray:giftModels]; - } - - [self saveGiftDatasource:totalInfo roomUid:roomUid]; - [self saveGiftPanelTagsDatasource:mutableTabs roomUid:roomUid]; - - self.currentRoomUid = roomUid; - - return mutableTabs; -} - -- (NSArray *)getRoomGiftDatasource:(NSString *)roomUid { - return [self getCachedData:self.roomGiftCache forKey:roomUid] ?: @[]; -} - -- (NSArray *)getCachedData:(NSCache *)cache forKey:(NSString *)key { - NSArray *data = [cache objectForKey:key]; - return data ?: [cache objectForKey:[self defaultKey]]; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Protocol/XPGiftProtocol.h b/YuMi/Modules/YMRoom/View/SendGiftView/Protocol/XPGiftProtocol.h deleted file mode 100644 index 5ff25da..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Protocol/XPGiftProtocol.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// YMGiftProtocol.h -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class WalletInfoModel, GiftInfoModel, GiftReceiveInfoModel, UserInfoModel, GiftTwelveStarFirstModel; -@protocol XPGiftProtocol -///获取用户信息成功 -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo; -///获取用户钱包信息成功 -- (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo; -///获取普通礼物列表 -- (void)getNormalGiftListSuccess:(NSArray *)giftList; -///获取普通礼物列表失败 -- (void)getNormalGiftListFail:(NSString *)message; -///获取背包礼物列表 -- (void)getPacketGiftListSuccess:(NSArray *)giftList; -///获取背包礼物列表失败 -- (void)getPacketGiftListFail:(NSString *)message; -///送礼物成功 -- (void)sendGiftSuccess:(GiftReceiveInfoModel *)receiveInfo originDic:(NSDictionary *)originDic uidCount:(NSInteger)uidCount; -///送礼物失败 -- (void)sendGiftFailWithCode:(NSInteger)code msg:(NSString *)msg; - -///获取全服福袋礼物记录 -- (void)luckyGiftBroadcastRecordSuccess:(NSArray *)records; - -///获取周星礼物成功 -- (void)getTwelveStarLastRankFirstSuccess:(GiftTwelveStarFirstModel *)model; - -- (void)getTagsSuccess:(NSArray *)tags; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/ThemeColor+SendGift.h b/YuMi/Modules/YMRoom/View/SendGiftView/ThemeColor+SendGift.h deleted file mode 100644 index 727d2db..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/ThemeColor+SendGift.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// ThemeColorSendGift.h -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import "DJDKMIMOMColor.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface DJDKMIMOMColor (SendGift) -/// 没有选择送礼物的人的头像 UIColorRGBAlpha(0x000000, 0.3) -+ (UIColor *)avatarCoverColor; -/// 送礼物 充值 0xFFB606 -+ (UIColor *)giftRechargeColor; -/// 礼物主背景色 #0B0B0D -+ (UIColor *)giftBackGroundColor; -///钱包余额信息 0xffffff 0.5 -+ (UIColor *)giftBalanceColor; -/// 送礼物 分页指示器的颜色 -+ (UIColor *)giftPageIndicatorColor; -/// 分段控制器文字默认的颜色 #FFFFFF -+ (UIColor *)giftSegmentNormalTitleColor; -/// 分段控制器文字选中的颜色 #5FCCE4 -+ (UIColor *)giftSegmentSelectTitleColor; -/// 礼物选中的时候的颜色 0x5FCCE4 -+ (UIColor *)giftNameSelectColor; -/// 礼物选中的时候的颜色 0x5FCCE4 -+ (UIColor *)giftPriceSelectColor; -/// 礼物价格没有选中的时候的眼色ffffff -+ (UIColor *)giftPriceNormalColor; -/// 礼物选中的覆盖背景 (0x248CFE, 0.2) -+ (UIColor *)giftSelectBgColor; -///玩法规则的图片 7A797A -+ (UIColor *)giftPlayRuleColor; -///个数 FFFFFF -+ (UIColor *)giftCountTitleColor; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/ThemeColor+SendGift.m b/YuMi/Modules/YMRoom/View/SendGiftView/ThemeColor+SendGift.m deleted file mode 100644 index 1e78117..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/ThemeColor+SendGift.m +++ /dev/null @@ -1,70 +0,0 @@ -// -// ThemeColorSendGift.m -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import "ThemeColor+SendGift.h" - -@implementation DJDKMIMOMColor (SendGift) - -/// 没有选择送礼物的人的头像 UIColorRGBAlpha(0x000000, 0.3) -+ (UIColor *)avatarCoverColor { - return [UIColor colorWithWhite:0 alpha:0.3]; -} - -/// 送礼物 充值 0xFFB606 -+ (UIColor *)giftRechargeColor { - return UIColorFromRGB(0xFFB606); -} - -/// 礼物主背景色 #0C0B0C -+ (UIColor *)giftBackGroundColor { - return UIColorRGBAlpha(0x000000, 0.4); -} - -///钱包余额信息 0xffffff 0.5 -+ (UIColor *)giftBalanceColor { - return UIColorRGBAlpha(0xFFFFFF, 0.35); -} -/// 送礼物 分页指示器的颜色 -+ (UIColor *)giftPageIndicatorColor { - return [UIColor whiteColor]; -} -/// 分段控制器文字默认的颜色 #FFFFFF -+ (UIColor *)giftSegmentNormalTitleColor { - return UIColorRGBAlpha(0xFFFFFF, 1); -} -/// 分段控制器文字选中的颜色 #5FCCE4 -+ (UIColor *)giftSegmentSelectTitleColor { - return UIColorRGBAlpha(0x5FCCE4, 1); -} -/// 礼物选中的时候的颜色 0x#5FCCE4 -+ (UIColor *)giftNameSelectColor { - return UIColorFromRGB(0x5FCCE4); -} -/// 礼物选中的时候的颜色 0x5FCCE4 -+ (UIColor *)giftPriceSelectColor { - return UIColorFromRGB(0x5FCCE4); -} -/// 礼物价格没有选中的时候的眼色#ffffff -+ (UIColor *)giftPriceNormalColor { - return UIColorRGBAlpha(0xffffff, 1);; -} -/// 礼物选中的覆盖背景 (0x248CFE, 0.2) -+ (UIColor *)giftSelectBgColor { - return [UIColor clearColor]; -} - -///玩法规则的图片 7A797A -+ (UIColor *)giftPlayRuleColor { - return UIColorFromRGB(0x7A797A); -} - -///玩法规则的图片 FFFFFF -+ (UIColor *)giftCountTitleColor { - return UIColorFromRGB(0xFFFFFF); -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCollectionViewFlowLayout.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCollectionViewFlowLayout.h deleted file mode 100644 index fc95321..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCollectionViewFlowLayout.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMGiftCollectionViewFlowLayout.h -// YUMI -// -// Created by YUMI on 2021/11/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGiftCollectionViewFlowLayout : MSBaseRTLFlowLayout - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCollectionViewFlowLayout.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCollectionViewFlowLayout.m deleted file mode 100644 index 779de4c..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCollectionViewFlowLayout.m +++ /dev/null @@ -1,151 +0,0 @@ -// -// YMGiftCollectionViewFlowLayout.m -// YUMI -// -// Created by YUMI on 2021/11/12. -// - -#import "XPGiftCollectionViewFlowLayout.h" - -@interface XPGiftCollectionViewFlowLayout () -@property (nonatomic, copy) NSMutableDictionary *sectionDic; -@property (nonatomic, strong) NSMutableArray *allAttributes; -@end - -@implementation XPGiftCollectionViewFlowLayout -#pragma mark - life cycle -- (instancetype)init { - self = [super init]; - if (self) { - self.scrollDirection = UICollectionViewScrollDirectionHorizontal; - } - return self; -} - -#pragma mark - overload - -- (void)prepareLayout { - - [super prepareLayout]; - - _sectionDic = [NSMutableDictionary dictionary]; - self.allAttributes = [NSMutableArray array]; - //获取section的数量 - NSUInteger section = [self.collectionView numberOfSections]; - - for (int sec = 0; sec < section; sec++) { - //获取每个section的cell个数 - NSUInteger count = [self.collectionView numberOfItemsInSection:sec]; - - for (NSUInteger item = 0; item *)layoutAttributesForElementsInRect:(CGRect)rect { - - return self.allAttributes; -} - -#pragma mark - private method - -- (void)applyLayoutAttributes:(UICollectionViewLayoutAttributes *)attributes { - - if(attributes.representedElementKind != nil){ - return; - } - CGFloat minLine = self.minimumLineSpacing; - CGFloat minSpacing = self.minimumInteritemSpacing; - - //attributes 的宽度 - CGFloat itemW = attributes.frame.size.width; - //attributes 的高度 - CGFloat itemH = attributes.frame.size.height; - UIEdgeInsets sectionInsets = self.sectionInset; - //collectionView 的宽度 - CGFloat width = self.collectionView.frame.size.width; - //collectionView 的高度 - CGFloat height = self.collectionView.frame.size.height; - //每个attributes的下标值 从0开始 - NSInteger itemIndex = attributes.indexPath.item; - - CGFloat stride = (self.scrollDirection == UICollectionViewScrollDirectionHorizontal) ? width : height; - - - //获取现在的attributes是第几组 - NSInteger section = attributes.indexPath.section; - //获取每个section的item的个数 - NSInteger itemCount = [self.collectionView numberOfItemsInSection:section]; - - - CGFloat offset = section * stride; - - //计算x方向item个数 - NSInteger xCount = (width / itemW); - //计算y方向item个数 - NSInteger yCount = (height / itemH); - //计算一页总个数 - NSInteger allCount = (xCount * yCount); - //获取每个section的页数，从0开始 - NSInteger page = itemIndex / allCount; - - //余数，用来计算item的x的偏移量 - NSInteger remain = (itemIndex % xCount); - //取商，用来计算item的y的偏移量 - NSInteger merchant = (itemIndex-page*allCount)/xCount; - - - //x方向每个item的偏移量 - CGFloat xCellOffset = remain * (itemW + minLine)+ sectionInsets.left; - //y方向每个item的偏移量 - CGFloat yCellOffset = merchant * (itemH + minSpacing); - - //获取每个section中item占了几页 - NSInteger pageRe = (itemCount % allCount == 0)? (itemCount / allCount) : (itemCount / allCount) + 1; - //将每个section与pageRe对应，计算下面的位置 - [_sectionDic setValue:@(pageRe) forKey:[NSString stringWithFormat:@"%ld", section]]; - - if(self.scrollDirection == UICollectionViewScrollDirectionHorizontal) { - - NSInteger actualLo = 0; - //将每个section中的页数相加 - for (NSString *key in [_sectionDic allKeys]) { - actualLo += [_sectionDic[key] integerValue]; - } - //获取到的最后的数减去最后一组的页码数 - actualLo -= [_sectionDic[[NSString stringWithFormat:@"%ld", [_sectionDic allKeys].count-1]] integerValue]; - xCellOffset += page*width + actualLo*width; - - } else { - - yCellOffset += offset; - } - - attributes.frame = CGRectMake(xCellOffset, yCellOffset, itemW, itemH); -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.h deleted file mode 100644 index f91a91a..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMGiftCountCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2021/11/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPGiftCountModel; -@interface XPGiftCountCollectionViewCell : UICollectionViewCell -/// -@property (nonatomic,strong) XPGiftCountModel *countModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.m deleted file mode 100644 index 64ec10e..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.m +++ /dev/null @@ -1,118 +0,0 @@ -// -// YMGiftCountCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2021/11/11. -// - -#import "XPGiftCountCollectionViewCell.h" -///Third -#import -///Tool -#import "ThemeColor+SendGift.h" -///Model -#import "XPGiftCountModel.h" - -@interface XPGiftCountCollectionViewCell () -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///显示礼物个数 -@property (nonatomic,strong) UILabel *countLabel; -///显示其他数额的箭头 -@property (nonatomic,strong) UIImageView *arrowImageView; -@end - -@implementation XPGiftCountCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.titleLabel]; - [self.contentView addSubview:self.countLabel]; - [self.contentView addSubview:self.arrowImageView]; -} - -- (void)initSubViewConstraints { - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(20); - make.centerY.mas_equalTo(self.contentView); - }]; - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-20); - make.centerY.mas_equalTo(0); - }]; - - [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-20); - make.centerY.mas_equalTo(0); - make.width.height.mas_equalTo(10); - }]; -} - -#pragma mark - Getters And Setters -- (void)setCountModel:(XPGiftCountModel *)countModel { - _countModel = countModel; - if (_countModel) { - - if(_countModel.isOnlyNum){ - _countLabel.textAlignment = NSTextAlignmentCenter; - [self.countLabel mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.contentView); - make.centerY.mas_equalTo(0); - }]; - }else{ - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.arrowImageView.mas_leading).offset(-4); - make.centerY.mas_equalTo(0); - }]; - _countLabel.textAlignment = NSTextAlignmentRight; - } - - self.titleLabel.text = _countModel.title; - self.countLabel.text = _countModel.giftNumber; - if (_countModel.isCustomCount) { - self.arrowImageView.hidden = NO; - } else { - self.arrowImageView.hidden = YES; - } - } -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:13]; - _titleLabel.textColor = [DJDKMIMOMColor giftCountTitleColor]; - - } - return _titleLabel; -} - -- (UILabel *)countLabel { - if (!_countLabel) { - _countLabel = [[UILabel alloc] init]; - _countLabel.font = [UIFont systemFontOfSize:14]; - _countLabel.textColor = [DJDKMIMOMColor appMainColor]; - _countLabel.textAlignment = NSTextAlignmentRight; - } - return _countLabel; -} - -- (UIImageView *)arrowImageView { - if (!_arrowImageView) { - _arrowImageView = [[UIImageView alloc] init]; - _arrowImageView.image = [[UIImage imageNamed:@"gift_bar_recharge_arrow"]ms_SetImageForRTL]; - _arrowImageView.hidden = YES; - } - return _arrowImageView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftEmptyCollectionViewCell.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftEmptyCollectionViewCell.h deleted file mode 100644 index e8c3a68..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftEmptyCollectionViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMGiftEmptyCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2021/11/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPGiftEmptyCollectionViewCell : UICollectionViewCell -@property (nonatomic,copy) NSString *emptyTitle; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftEmptyCollectionViewCell.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftEmptyCollectionViewCell.m deleted file mode 100644 index dfe0888..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftEmptyCollectionViewCell.m +++ /dev/null @@ -1,77 +0,0 @@ -// -// YMGiftEmptyCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2021/11/15. -// - -#import "XPGiftEmptyCollectionViewCell.h" -///Third -#import -///Tool -#import "ThemeColor+SendGift.h" - -@interface XPGiftEmptyCollectionViewCell () -@property (nonatomic,strong) UIImageView *logoImageView; -@property (nonatomic,strong) UILabel *emptyPackTip; -@end - -@implementation XPGiftEmptyCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.logoImageView]; - [self.contentView addSubview:self.emptyPackTip]; -} - -- (void)initSubViewConstraints { - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(40, 40)); - make.bottom.mas_equalTo(self.mas_centerY).offset(-3); - make.centerX.mas_equalTo(self); - }]; - - [self.emptyPackTip mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.mas_centerY).offset(3); - make.centerX.mas_equalTo(self); - }]; -} - -#pragma mark - Getters And Setters -- (void)setEmptyTitle:(NSString *)emptyTitle { - _emptyTitle = emptyTitle; - if (_emptyTitle.length > 0) { - self.emptyPackTip.text = _emptyTitle; - } -} - -- (UILabel *)emptyPackTip { - if (!_emptyPackTip) { - _emptyPackTip = [[UILabel alloc] init]; - _emptyPackTip.text = YMLocalizedString(@"XPGiftEmptyCollectionViewCell0");; - _emptyPackTip.textColor = [DJDKMIMOMColor secondTextColor]; - _emptyPackTip.font = [UIFont systemFontOfSize:12]; - _emptyPackTip.textAlignment = NSTextAlignmentCenter; - } - return _emptyPackTip; -} - -- (UIImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [[UIImageView alloc] init]; - _logoImageView.userInteractionEnabled = YES; - _logoImageView.image = [UIImage imageNamed:@"gift_info_empty_bg"]; - } - return _logoImageView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftFreeItemCell.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftFreeItemCell.h deleted file mode 100644 index 83bdb63..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftFreeItemCell.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// XPGiftFreeItemCell.h -// xplan-ios -// -// Created by duoban on 2022/12/6. -// - -#import -#import "XPFreeGiftModel.h" -#import "GiftInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - - - - -@interface XPGiftFreeItemCell : UICollectionViewCell -@property (nonatomic,strong) GiftInfoModel * giftInfo; ; -@property (nonatomic,strong) XPFreeGiftModel *freeModel; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftFreeItemCell.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftFreeItemCell.m deleted file mode 100644 index 40d6a2d..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftFreeItemCell.m +++ /dev/null @@ -1,193 +0,0 @@ -// -// XPGiftFreeItemCell.m -// xplan-ios -// -// Created by duoban on 2022/12/6. -// - -#import "XPGiftFreeItemCell.h" -#import "ThemeColor+SendGift.h" -UIKIT_EXTERN NSString * const kFreeGiftCountdownNotification; - -@interface XPGiftFreeItemCell() -///背景 -@property (nonatomic,strong) UIView *bgView; -///数量 -@property (nonatomic,strong) UILabel *numView; -///倒计时 -@property (nonatomic,strong) UILabel *timeView; -///礼物图 -@property (nonatomic,strong) NetImageView *pi_iconView; -///礼物 -@property (nonatomic,strong) UILabel *nameView; -///礼物标题 -@property (nonatomic,strong) UILabel *titleView; - -@end -@implementation XPGiftFreeItemCell --(void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; -} --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(getFreeGiftCountdownNotification:) name:kFreeGiftCountdownNotification object:nil]; - } - return self; -} --(void)getFreeGiftCountdownNotification:(NSNotification *)not{ - NSDictionary *freeDic = not.userInfo; - BOOL isCountdownFinish = [freeDic[@"isCountdownFinish"] boolValue];///倒计时完成 - BOOL isReset = [freeDic[@"isReset"] boolValue];///礼物清零 - id updateGiftInfo = freeDic[@"updateGiftInfo"];///更新礼物消息 - BOOL isHiddenCountdown = [freeDic[@"isHiddenCountdown"]boolValue]; - if(isHiddenCountdown == YES){ - self.timeView.hidden = YES; - return; - } - if(updateGiftInfo != nil){ - if([updateGiftInfo isKindOfClass:[NSString class]]){return;} - NSDictionary *giftInfo = (NSDictionary *)updateGiftInfo; - NSString *giftId = giftInfo[@"giftId"]; - NSString *giftNamed = giftInfo[@"giftName"]; - NSString *giftUrl = giftInfo[@"giftUrl"]; - self.giftInfo.giftId = giftId.integerValue; - self.giftInfo.giftName = giftNamed; - self.giftInfo.giftUrl = giftUrl; - self.freeModel.giftId = giftId; - self.freeModel.giftName = giftNamed; - self.freeModel.giftUrl = giftUrl; - self.pi_iconView.imageUrl = self.freeModel.giftUrl; - self.nameView.text = self.freeModel.giftName; - return; - } - - if(isReset == YES){ - self.numView.text = [NSString stringWithFormat:@"x%d",0]; - return; - } - if(isCountdownFinish == YES){ - self.timeView.hidden = YES; - self.giftInfo.count = self.giftInfo.count + 1; - self.numView.text = [NSString stringWithFormat:@"x%ld",_giftInfo.count]; - return; - } - if(self.timeView.hidden == YES){ - self.timeView.hidden = NO; - } - NSString *text = freeDic[@"text"]; - self.timeView.text = text; -} -#pragma mark - Private Method -- (void)initSubViews { - - - [self.contentView addSubview:self.bgView]; - [self.bgView addSubview:self.numView]; - [self.bgView addSubview:self.timeView]; - [self.bgView addSubview:self.pi_iconView]; - [self.bgView addSubview:self.nameView]; - [self.bgView addSubview:self.titleView]; - -} -- (void)initSubViewConstraints { - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; - [self.timeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(4); - make.trailing.mas_equalTo(-6); - make.width.mas_equalTo(37); - make.height.mas_equalTo(11); - }]; - [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(6); - make.centerY.equalTo(self.timeView); - make.trailing.equalTo(self.timeView.mas_leading).mas_offset(-5); - }]; - [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(17); - make.width.mas_equalTo(48); - make.height.mas_equalTo(48); - make.centerX.equalTo(self.bgView); - }]; - [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.pi_iconView.mas_bottom).mas_offset(5); - make.height.mas_equalTo(14); - make.leading.trailing.equalTo(self.bgView); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.nameView.mas_bottom).mas_offset(1); - make.trailing.leading.equalTo(self.bgView); - }]; -} --(void)setGiftInfo:(GiftInfoModel *)giftInfo{ - _giftInfo = giftInfo; - _numView.text = [NSString stringWithFormat:@"x%ld",_giftInfo.count]; - if(_giftInfo.isSelected == YES){ - _bgView.backgroundColor = [DJDKMIMOMColor giftSelectBgColor]; - _bgView.layer.borderWidth = 1; - }else{ - _bgView.layer.borderWidth = 0; - _bgView.backgroundColor = [UIColor clearColor]; - } -} --(void)setFreeModel:(XPFreeGiftModel *)freeModel{ - _freeModel = freeModel; - _pi_iconView.imageUrl = _freeModel.giftUrl; - _nameView.text = _freeModel.giftName; - - -} - -#pragma mark -懒加载 -- (UIView *)bgView{ - if (!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [DJDKMIMOMColor giftSelectBgColor]; - _bgView.layer.cornerRadius = 5; - _bgView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} -- (UILabel *)numView{ - if (!_numView){ - _numView = [UILabel labelInitWithText:@"x0" font:[UIFont systemFontOfSize:8 weight:UIFontWeightRegular] textColor:UIColorFromRGB(0x9E9E9E)]; - } - return _numView; -} -- (UILabel *)timeView{ - if (!_timeView){ - _timeView = [UILabel labelInitWithText:@"00:00:00" font:[UIFont systemFontOfSize:8 weight:UIFontWeightRegular] textColor:[UIColor whiteColor]]; - _timeView.textAlignment = NSTextAlignmentRight; - _timeView.hidden = YES; - } - return _timeView; -} -- (NetImageView *)pi_iconView{ - if (!_pi_iconView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder]; - _pi_iconView = [[NetImageView alloc]initWithConfig:config]; - - } - return _pi_iconView; -} -- (UILabel *)nameView{ - if (!_nameView){ - _nameView = [UILabel labelInitWithText:YMLocalizedString(@"XPGiftFreeItemCell1") font:[UIFont systemFontOfSize:10 weight:UIFontWeightRegular] textColor:[UIColor whiteColor]]; - _nameView.textAlignment = NSTextAlignmentCenter; - } - return _nameView; -} --(UILabel *)titleView{ - if (!_titleView){ - _titleView = [UILabel labelInitWithText:YMLocalizedString(@"XPGiftFreeItemCell0") font:[UIFont systemFontOfSize:8 weight:UIFontWeightRegular] textColor:[UIColor colorWithWhite:1 alpha:0.8]]; - _titleView.textAlignment = NSTextAlignmentCenter; - } - return _titleView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.h deleted file mode 100644 index 290a2e5..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMGiftItemCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2021/11/12. -// - -#import -#import "XPSendGiftView.h" -NS_ASSUME_NONNULL_BEGIN -@class GiftInfoModel; -@interface XPGiftItemCollectionViewCell : UICollectionViewCell -/// -@property (nonatomic,strong) GiftInfoModel *giftInfo; -///当前用户VIP等级 -@property (nonatomic, assign) NSInteger curUserNobleLevel; -///使用的地方 -@property (nonatomic,assign) SendGiftType usingplaceType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m deleted file mode 100644 index 3889871..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m +++ /dev/null @@ -1,339 +0,0 @@ -// -// YMGiftItemCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2021/11/12. -// - -#import "XPGiftItemCollectionViewCell.h" -///Third -#import -///Tool -#import "ThemeColor+SendGift.h" -#import "NetImageView.h" -///Model -#import "GiftInfoModel.h" - -@interface XPGiftItemCollectionViewCell () -///礼物图片 -@property (nonatomic,strong) NetImageView *giftImageView; -///礼物名称 -@property (nonatomic,strong) UILabel *giftNameLabel; -/// -@property (nonatomic,strong) UIStackView *priceStackView; -///价格 -@property (nonatomic,strong) UILabel *priceLabel; -///💎 -@property (nonatomic,strong) UIImageView *logoImageView; -/// -@property (nonatomic,strong) UIStackView *tagStackView; -///新的 -@property (nonatomic,strong) UIImageView *giftNewImageView; -///特别的 -@property (nonatomic,strong) UIImageView *specialImageView; -///限定 -@property (nonatomic,strong) UIImageView *limitImageView; -///专属 -@property (nonatomic,strong) UIImageView *exclusiveImageView; -/// -@property (nonatomic,strong) UIView * coverView; -/// -@property (nonatomic,strong) UILabel *giftNumLabel; -///VIPicon -@property (nonatomic, strong) NetImageView *nobleIconImageView; -///VIP礼物锁 -@property (nonatomic, strong) UIImageView *lockImageView; -///超级礼物icon -@property(nonatomic,strong) UIImageView *superGiftView; -@end - -@implementation XPGiftItemCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - - [self.contentView addSubview:self.giftImageView]; - [self.contentView addSubview:self.giftNameLabel]; - [self.contentView addSubview:self.priceStackView]; - [self.contentView addSubview:self.coverView]; - [self.contentView addSubview:self.giftNumLabel]; - [self.contentView addSubview:self.lockImageView]; - [self.contentView addSubview:self.tagStackView]; - [self.contentView addSubview:self.superGiftView]; - - [self.tagStackView addArrangedSubview:self.nobleIconImageView]; - [self.tagStackView addArrangedSubview:self.exclusiveImageView]; - [self.tagStackView addArrangedSubview:self.giftNewImageView]; - [self.tagStackView addArrangedSubview:self.limitImageView]; - [self.tagStackView addArrangedSubview:self.specialImageView]; - - [self.priceStackView addArrangedSubview:self.priceLabel]; - [self.priceStackView addArrangedSubview:self.logoImageView]; - -} - -- (void)initSubViewConstraints { - [self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.top.mas_equalTo(self.contentView).inset(3); - make.height.mas_equalTo(14); - }]; - [self.giftNewImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(14); - make.height.mas_equalTo(14); - }]; - [self.limitImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(14); - make.height.mas_equalTo(14); - }]; - [self.specialImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(14); - make.height.mas_equalTo(14); - }]; - [self.exclusiveImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(14); - make.height.mas_equalTo(14); - }]; - [self.coverView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(4); - make.centerX.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(62, 62)); - }]; - - [self.giftNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.giftImageView.mas_bottom).offset(3); - make.leading.trailing.mas_equalTo(self.contentView).inset(2); - }]; - - [self.priceStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.giftNameLabel.mas_bottom).offset(5); - make.centerX.equalTo(self.contentView); - make.height.mas_equalTo(10); - }]; - [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(10); - }]; - [self.giftNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.contentView).offset(4.5); - make.leading.equalTo(self.contentView).offset(6); - }]; - - [self.nobleIconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(14); - - }]; - [self.lockImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.bottom.mas_equalTo(self.contentView).mas_offset(-4); - make.width.height.mas_equalTo(16); - }]; - [self.superGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(46); - make.height.mas_equalTo(12); - make.leading.mas_equalTo(10); - make.bottom.equalTo(self.giftImageView.mas_bottom); - }]; - -} - -- (UIImageView *)createImageView:(NSString *)imageName { - UIImageView * imageView = [[UIImageView alloc] init]; - imageView.userInteractionEnabled = YES; - imageView.image = [UIImage imageNamed:imageName]; - return imageView; -} - -#pragma mark - Getters And Setters -- (void)setGiftInfo:(GiftInfoModel *)giftInfo { - _giftInfo = giftInfo; - if (_giftInfo) { - self.giftImageView.image = nil; - @kWeakify(self); - [self.giftImageView loadImageWithUrl:_giftInfo.giftUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - @kStrongify(self); - self.giftImageView.image = image; - }]; - self.giftNameLabel.text = _giftInfo.giftName.length > 0 ? _giftInfo.giftName : @""; - self.coverView.hidden = !giftInfo.isSelected; - NSString *strr = [NSString stringWithFormat:@"%ld",(long)_giftInfo.goldPrice]; - self.priceLabel.text = strr; - self.giftNumLabel.hidden = giftInfo.count <=0 ; - self.giftNumLabel.text = [NSString stringWithFormat:@"x%ld",(long)giftInfo.count]; - - self.exclusiveImageView.hidden = !_giftInfo.roomExclude; - self.giftNewImageView.hidden = !_giftInfo.hasLatest; - self.limitImageView.hidden = !_giftInfo.hasTimeLimit; - self.specialImageView.hidden = !_giftInfo.hasEffect; - - if (_usingplaceType == SendGiftType_User) { - self.priceLabel.textColor = _giftInfo.isSelected ? [DJDKMIMOMColor giftPriceSelectColor] : [DJDKMIMOMColor secondTextColor]; - self.giftNameLabel.textColor = _giftInfo.isSelected ? [DJDKMIMOMColor giftNameSelectColor] : [DJDKMIMOMColor mainTextColor]; - self.giftNumLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } else { - self.priceLabel.textColor = _giftInfo.isSelected ? [DJDKMIMOMColor giftPriceSelectColor] : [DJDKMIMOMColor giftPriceNormalColor]; - self.giftNameLabel.textColor = _giftInfo.isSelected ? [DJDKMIMOMColor giftNameSelectColor] : [UIColor whiteColor]; - self.giftNumLabel.textColor = [DJDKMIMOMColor giftSegmentNormalTitleColor]; - } - - if (giftInfo.giftType == GiftType_Noble && giftInfo.giftVipInfo) { - self.nobleIconImageView.hidden = NO; - self.nobleIconImageView.imageUrl = giftInfo.giftVipInfo.vipIcon; - self.lockImageView.hidden = self.curUserNobleLevel >= giftInfo.giftVipInfo.vipLevel; - } else { - self.nobleIconImageView.hidden = YES; - self.lockImageView.hidden = YES; - } - _superGiftView.hidden = YES; - } -} - -- (void)setUsingplaceType:(SendGiftType)usingplaceType { - _usingplaceType = usingplaceType; -} - -- (UIStackView *)tagStackView { - if (!_tagStackView) { - _tagStackView = [[UIStackView alloc] init]; - _tagStackView.axis = UILayoutConstraintAxisHorizontal; - _tagStackView.distribution = UIStackViewDistributionFill; - _tagStackView.alignment = UIStackViewAlignmentCenter; - _tagStackView.spacing = 2; - } - return _tagStackView; -} - -- (UIImageView *)exclusiveImageView { - if (!_exclusiveImageView) { - _exclusiveImageView = [self createImageView:@"gift_tag_exclude"]; - } - return _exclusiveImageView; -} - -- (UIImageView *)limitImageView { - if (!_limitImageView) { - _limitImageView = [self createImageView:@"gift_tag_time_limit"]; - } - return _limitImageView; -} - -- (UIImageView *)specialImageView { - if (!_specialImageView) { - _specialImageView = [self createImageView:@"gift_tag_effect"]; - } - return _specialImageView; -} -- (UIImageView *)giftNewImageView { - if (!_giftNewImageView) { - _giftNewImageView = [self createImageView:@"gift_tag_latest"]; - } - return _giftNewImageView; -} - -- (UIStackView *)priceStackView { - if (!_priceStackView) { - _priceStackView = [[UIStackView alloc] init]; - _priceStackView.axis = UILayoutConstraintAxisHorizontal; - _priceStackView.distribution = UIStackViewDistributionEqualSpacing; - _priceStackView.alignment = UIStackViewAlignmentCenter; - _priceStackView.spacing = 2; - } - return _priceStackView; -} - -- (UIImageView *)logoImageView { - if (!_logoImageView) { - _logoImageView = [self createImageView:@"moli_money_icon"]; - } - return _logoImageView; -} - -- (UILabel *)priceLabel { - if (!_priceLabel) { - _priceLabel = [[UILabel alloc] init]; - _priceLabel.font = [UIFont systemFontOfSize:9]; - _priceLabel.textColor = [DJDKMIMOMColor giftPriceNormalColor]; - } - return _priceLabel; -} - - -- (UILabel *)giftNameLabel { - if (!_giftNameLabel) { - _giftNameLabel = [[UILabel alloc] init]; - _giftNameLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightSemibold]; - _giftNameLabel.textAlignment = NSTextAlignmentCenter; - _giftNameLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _giftNameLabel.numberOfLines = 0; - } - return _giftNameLabel; -} - -- (UILabel *)giftNumLabel { - if (!_giftNumLabel) { - _giftNumLabel = [[UILabel alloc] init]; - _giftNumLabel.font = [UIFont systemFontOfSize:10]; - } - return _giftNumLabel; -} - -- (UIView *)coverView { - if (!_coverView) { - _coverView = [[UIView alloc] init]; - _coverView.backgroundColor = [DJDKMIMOMColor giftSelectBgColor]; - _coverView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - _coverView.layer.masksToBounds =YES; - _coverView.layer.cornerRadius = 6; - _coverView.layer.borderWidth = 1; - _coverView.hidden = YES; - } - return _coverView; -} - -- (NetImageView *)giftImageView { - if (!_giftImageView) { - _giftImageView = [[NetImageView alloc] init]; - _giftImageView.backgroundColor = [UIColor clearColor]; - _giftImageView.layer.masksToBounds = YES; - _giftImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _giftImageView; -} - -- (NetImageView *)nobleIconImageView { - if (!_nobleIconImageView) { - _nobleIconImageView = [[NetImageView alloc] init]; - _nobleIconImageView.backgroundColor = [UIColor clearColor]; - _nobleIconImageView.hidden = YES; - _nobleIconImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _nobleIconImageView; -} - - -- (UIImageView *)lockImageView { - if (!_lockImageView) { - _lockImageView = [self createImageView:@"room_gift_noble_lock"]; - _lockImageView.hidden = YES; - } - return _lockImageView; -} -- (UIImageView *)superGiftView{ - if(!_superGiftView){ - _superGiftView = [UIImageView new]; - _superGiftView.image = [UIImage getLanguageImage:@"room_gift_super_gift_icon"]; - _superGiftView.hidden = YES; - } - return _superGiftView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftUserCollectionViewCell.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftUserCollectionViewCell.h deleted file mode 100644 index 88d6875..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftUserCollectionViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMGiftUserCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPGiftUserInfoModel; -@interface XPGiftUserCollectionViewCell : UICollectionViewCell -///数据模型 -@property (nonatomic,strong) XPGiftUserInfoModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftUserCollectionViewCell.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftUserCollectionViewCell.m deleted file mode 100644 index b854cd3..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftUserCollectionViewCell.m +++ /dev/null @@ -1,151 +0,0 @@ -// -// YMGiftUserCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import "XPGiftUserCollectionViewCell.h" -///Third -#import -///Tool -#import "ThemeColor+SendGift.h" -///Model -#import "UserInfoModel.h" -#import "MicroStateModel.h" -#import "XPGiftUserInfoModel.h" -///View -#import "NetImageView.h" -#import "XPSkillCardPlayerManager.h" - -@interface XPGiftUserCollectionViewCell () -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///背景图 -@property (nonatomic,strong) UIView * coverView; -///当前位置的 -@property (nonatomic,strong) UILabel *positionLabel; -@end - -@implementation XPGiftUserCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - self.clipsToBounds = NO; - self.contentView.clipsToBounds = NO; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.coverView]; - [self.contentView addSubview:self.positionLabel]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.top.mas_equalTo(self.contentView); - make.width.height.mas_equalTo(38); - }]; - - [self.coverView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.avatarImageView); - }]; - - [self.positionLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(10); - make.centerY.mas_equalTo(self.avatarImageView.mas_bottom); - make.width.mas_equalTo(10); - make.centerX.mas_equalTo(self.avatarImageView); - }]; -} - -#pragma mark - Getters And Setters -- (void)setUserInfo:(XPGiftUserInfoModel *)userInfo { - _userInfo = userInfo; - if (_userInfo.position.length > 0) { - - if (_userInfo.vipMic) { - self.positionLabel.text = @"VIP"; - [self.positionLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(28); - }]; - } else { - if ([XPSkillCardPlayerManager shareInstance].is9Mic) { - if (_userInfo.position.integerValue == -1) { - self.positionLabel.text = YMLocalizedString(@"XPGiftUserCollectionViewCell0"); - [self.positionLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(28); - }]; - } else { - NSInteger count = _userInfo.position.integerValue + 2; - self.positionLabel.text = [NSString stringWithFormat:@"%ld", count]; - [self.positionLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(count >= 10 ? 14 : 10); - }]; - } - } else { - NSInteger count = _userInfo.position.integerValue + 2; - self.positionLabel.text = [NSString stringWithFormat:@"%ld", count]; - [self.positionLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(count >= 10 ? 14 : 10); - }]; - } - } - - } - self.avatarImageView.imageUrl = _userInfo.avatar; - if (_userInfo.isSelect) { - self.avatarImageView.layer.borderWidth = 2; - self.coverView.hidden = YES; - self.positionLabel.backgroundColor = [DJDKMIMOMColor appMainColor]; - _positionLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } else { - self.avatarImageView.layer.borderWidth = 0; - self.coverView.hidden = NO; - self.positionLabel.backgroundColor = [DJDKMIMOMColor textThirdColor]; - _positionLabel.textColor = [UIColor whiteColor]; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 38/2; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UIView *)coverView { - if (!_coverView) { - _coverView = [[UIView alloc] init]; - _coverView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.3]; - _coverView.layer.cornerRadius = 38/2; - _coverView.layer.masksToBounds = YES; - } - return _coverView; -} - -- (UILabel *)positionLabel{ - if (!_positionLabel) { - _positionLabel = [[UILabel alloc] init]; - _positionLabel.font = [UIFont systemFontOfSize:8]; - _positionLabel.textColor = [UIColor whiteColor]; - _positionLabel.textAlignment = NSTextAlignmentCenter; - _positionLabel.backgroundColor = UIColorFromRGB(0x999999); - _positionLabel.layer.masksToBounds = YES; - _positionLabel.layer.cornerRadius = 5; - } - return _positionLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.h deleted file mode 100644 index 835ca91..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMGiftWeekStarCollectionViewCell.h -// YUMI -// -// Created by YUMI on 2022/6/14. -// - -#import -#import "XPSendGiftView.h" -NS_ASSUME_NONNULL_BEGIN -@class XPGiftWeekStarCollectionViewCell, GiftInfoModel; -@protocol XPGiftWeekStarCollectionViewCellDelegate - -- (void)xPGiftWeekStarCollectionViewCell:(XPGiftWeekStarCollectionViewCell *)view didSelectGift:(GiftInfoModel *)giftInfo; - -@end - -@interface XPGiftWeekStarCollectionViewCell : UICollectionViewCell -///使用的地方 -@property (nonatomic,assign) SendGiftType usingplaceType; -///周星礼物 -@property (nonatomic,strong) NSArray *weekStarGiftList; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.m deleted file mode 100644 index 39899f1..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.m +++ /dev/null @@ -1,150 +0,0 @@ -// -// YMGiftWeekStarCollectionViewCell.m -// YUMI -// -// Created by YUMI on 2022/6/14. -// - -#import "XPGiftWeekStarCollectionViewCell.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "ThemeColor+SendGift.h" -#import "XPGiftCollectionViewFlowLayout.h" -#import "NSArray+Safe.h" -///Model -#import "GiftInfoModel.h" -///View -#import "XPGiftItemCollectionViewCell.h" - -@interface XPGiftWeekStarCollectionViewCell () -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///分页 -@property (nonatomic,strong) UIPageControl *pageController; -///选中的礼物 -@property (nonatomic,strong) GiftInfoModel *selectGiftInfo; -@end - -@implementation XPGiftWeekStarCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.collectionView]; - [self.contentView addSubview:self.pageController]; -} - -- (void)initSubViewConstraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.contentView); - make.height.mas_equalTo(108 * 2); - }]; - - [self.pageController mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.collectionView.mas_bottom).offset(5); - make.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(10); - }]; -} - - -#pragma mark - UICollectionViewDelegate And UICollectionDatasource -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - CGFloat itemWidth = (CGFloat)(KScreenWidth - 15 * 2 - 5 * 3) / (CGFloat)4; - return CGSizeMake(itemWidth, 105); -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.weekStarGiftList.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPGiftItemCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGiftItemCollectionViewCell class]) forIndexPath:indexPath]; - GiftInfoModel * giftInfo; - giftInfo= [self.weekStarGiftList xpSafeObjectAtIndex:indexPath.item]; - if (giftInfo.giftId == self.selectGiftInfo.giftId) { - giftInfo.isSelected = YES; - } else { - giftInfo.isSelected = NO; - } - cell.usingplaceType = self.usingplaceType; - cell.giftInfo = giftInfo; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (self.weekStarGiftList.count > 0) { - GiftInfoModel * giftInfo= [self.weekStarGiftList xpSafeObjectAtIndex:indexPath.item]; - self.selectGiftInfo = giftInfo; - [self.collectionView reloadData]; - - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftWeekStarCollectionViewCell:didSelectGift:)]) { - [self.delegate xPGiftWeekStarCollectionViewCell:self didSelectGift:giftInfo]; - } - } -} -#pragma mark - scrollviewdelegate -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - CGFloat offX = scrollView.contentOffset.x; - CGFloat width = CGRectGetWidth(scrollView.frame); - self.pageController.currentPage = ceilf(offX/width); -} - -#pragma mark - Getters And Setters -- (void)setWeekStarGiftList:(NSArray *)weekStarGiftList { - _weekStarGiftList = weekStarGiftList; - if (_weekStarGiftList.count > 0 && self.selectGiftInfo == nil) { - self.selectGiftInfo = _weekStarGiftList.firstObject; - } - NSInteger page = 0; - if (_weekStarGiftList.count % 8 == 0) { //刚好满页 - page = _weekStarGiftList.count / 8; - } else { - page = _weekStarGiftList.count / 8 + 1; - } - self.pageController.hidden = page <= 1; - [self.pageController setNumberOfPages:page]; - self.pageController.currentPage = 0; - [self.collectionView reloadData]; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - XPGiftCollectionViewFlowLayout *layout = [[XPGiftCollectionViewFlowLayout alloc] init]; - layout.minimumLineSpacing = 5; - layout.minimumInteritemSpacing = 5; - layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.pagingEnabled = YES; - _collectionView.showsHorizontalScrollIndicator = NO; - [_collectionView registerClass:[XPGiftItemCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGiftItemCollectionViewCell class])]; - } - return _collectionView; -} - -- (UIPageControl *)pageController { - if (!_pageController) { - _pageController = [[UIPageControl alloc] init]; - _pageController.currentPageIndicatorTintColor = [DJDKMIMOMColor giftPageIndicatorColor]; - } - return _pageController; -} - - - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/CountdownRingView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/CountdownRingView.h deleted file mode 100644 index 4e6f49e..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/CountdownRingView.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// CountdownRingView.h -// YuMi -// -// Created by P on 2024/9/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface CountdownRingView : UIView - -- (instancetype)initWithFrame:(CGRect)frame duration:(NSInteger)duration; -- (void)startCountdown; -- (void)resetCountdown; // 重置功能 -- (void)stopCountdown; -- (void)setupCompletionHandler:(void (^__nullable)(void))completionHandler; // 计时结束的回调 - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/CountdownRingView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/CountdownRingView.m deleted file mode 100644 index 17c9383..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/CountdownRingView.m +++ /dev/null @@ -1,243 +0,0 @@ -// -// CountdownRingView.m -// YuMi -// -// Created by P on 2024/9/9. -// - -#import "CountdownRingView.h" - -@interface CountdownRingView () - -@property (nonatomic, strong) CAShapeLayer *backgroundLayer; -@property (nonatomic, strong) CAShapeLayer *foregroundLayer; -@property (nonatomic, strong) UILabel *countdownLabel; -@property (nonatomic, strong) NSTimer *timer; -@property (nonatomic, assign) CGFloat remainingTime; -@property (nonatomic, assign) NSInteger totalDuration; -@property (nonatomic, copy) void (^completionHandler)(void); -@property (nonatomic, assign) CGFloat timerInterval; -@property (nonatomic, assign) CGFloat animeInterval; - -// 🔥 新增：状态管理属性 -@property (nonatomic, assign) BOOL isRunning; -@property (nonatomic, assign) BOOL isStopping; - -@end - -@implementation CountdownRingView - -- (void)dealloc -{ - - // 🔥 修复：清理所有资源 - [self cleanup]; - -} - -- (instancetype)initWithFrame:(CGRect)frame duration:(NSInteger)duration { - self = [super initWithFrame:frame]; - if (self) { - self.timerInterval = 0.1; - self.animeInterval = 0.25; - self.userInteractionEnabled = NO; - self.remainingTime = duration; - self.totalDuration = duration; - [self setupLayers]; - [self setupLabel]; - } - return self; -} - -// 设置背景和前景的环形图层 -- (void)setupLayers { - // 环形路径 - CGPoint center = CGPointMake(self.bounds.size.width / 2, self.bounds.size.height / 2); - CGFloat radius = (self.bounds.size.width - 10) / 2; // 内边距 5 - UIBezierPath *circularPath = [UIBezierPath bezierPathWithArcCenter:center - radius:radius - startAngle:-M_PI_2 - endAngle:(M_PI * 2) - M_PI_2 - clockwise:YES]; - - // 前景倒计时圆环 - self.foregroundLayer = [CAShapeLayer layer]; - self.foregroundLayer.path = circularPath.CGPath; - self.foregroundLayer.strokeColor = UIColorFromRGB(0x04D5C6).CGColor; - self.foregroundLayer.lineWidth = 10; - self.foregroundLayer.fillColor = [UIColor clearColor].CGColor; - self.foregroundLayer.strokeEnd = 1.0; - [self.layer addSublayer:self.foregroundLayer]; -} - -// 设置倒计时标签 -- (void)setupLabel { - self.countdownLabel = [[UILabel alloc] initWithFrame:self.bounds]; - self.countdownLabel.textColor = UIColorFromRGB(0xFFCB3F); - self.countdownLabel.textAlignment = NSTextAlignmentCenter; - self.countdownLabel.font = kFontSemibold(13); - self.countdownLabel.text = @"Combo"; - [self addSubview:self.countdownLabel]; -} - -- (void)setupCompletionHandler:(void (^)(void))completionHandler { - _completionHandler = completionHandler; -} - -// 开始倒计时 -- (void)startCountdown { - // 🔥 修复：检查运行状态，避免重复启动 - if (self.isRunning) { - return; - } - - self.isRunning = YES; - - [self animateRing]; - [self triggerLabelAnimation]; - - self.timer = [NSTimer scheduledTimerWithTimeInterval:self.timerInterval - target:self - selector:@selector(updateCountdown) - userInfo:nil - repeats:YES]; - -} - -// 重置倒计时 -- (void)resetCountdown { - - // 🔥 修复：检查运行状态 - if (!self.isRunning) { - [self startCountdown]; - return; - } - - // 🔥 安全：原子性操作 - @synchronized(self) { - // 停止动画 - [self.foregroundLayer removeAllAnimations]; - - // 重置状态 - self.remainingTime = self.totalDuration; - self.foregroundLayer.strokeEnd = 1.0; - - // 重新开始动画 - [self animateRing]; - } - - // 🔥 安全：异步执行UI动画 - dispatch_async(dispatch_get_main_queue(), ^{ - [self triggerLabelAnimation]; - }); - -} - -// 新增：触发标签动画 -- (void)triggerLabelAnimation { - self.countdownLabel.transform = CGAffineTransformIdentity; - [UIView animateWithDuration:self.animeInterval - animations:^{ - self.countdownLabel.transform = CGAffineTransformMakeScale(2, 2); - } completion:^(BOOL finished) { - self.countdownLabel.transform = CGAffineTransformIdentity; - }]; -} - -// 更新倒计时标签 -- (void)updateCountdown { - // 🔥 修复：添加线程安全和状态检查 - @synchronized(self) { - // 🔥 修复：检查self是否存在 - if (!self) { - return; - } - - if (!self.isRunning) { - [self stopCountdown]; - return; - } - - self.remainingTime -= self.timerInterval; - - if (self.remainingTime <= 0) { - - // 🔥 优化：先保存回调，再停止Timer，最后调用回调 - void (^completion)(void) = self.completionHandler; - [self stopCountdown]; - - // 🔥 优化：安全调用回调，不涉及具体业务逻辑 - if (completion) { - completion(); // 纯回调，由上层处理业务逻辑 - } - } - } -} - -- (void)stopCountdown { - // 🔥 修复：防止重复停止 - if (self.isStopping) { - return; - } - - if (!self.isRunning) { - return; - } - - self.isStopping = YES; - - @synchronized(self) { - // 🔥 修复：确保Timer被正确停止 - if (self.timer) { - [self.timer invalidate]; - self.timer = nil; - } - - // 停止动画 - if (self.foregroundLayer) { - [self.foregroundLayer removeAllAnimations]; - } - - // 重置UI状态 - if (self.countdownLabel) { - self.countdownLabel.transform = CGAffineTransformIdentity; - } - - // 更新运行状态 - self.isRunning = NO; - - // 🔥 修复：清理回调，避免循环引用 - self.completionHandler = nil; - } - - self.isStopping = NO; -} - -// 环形倒计时动画 -- (void)animateRing { - // 🔥 修复：先移除之前的动画，避免冲突 - [self.foregroundLayer removeAnimationForKey:@"ringAnimation"]; - - CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"strokeEnd"]; - animation.duration = self.remainingTime; // 动画时长与倒计时一致 - animation.fromValue = @1.0; - animation.toValue = @0.0; - animation.fillMode = kCAFillModeForwards; - animation.removedOnCompletion = YES; // 🔥 修复：允许自动移除，避免内存泄漏 - [self.foregroundLayer addAnimation:animation forKey:@"ringAnimation"]; - -} - -// 🔥 新增：完全清理方法（用于dealloc等场景） -- (void)cleanup { - - @synchronized(self) { - [self stopCountdown]; - - // 🔥 清理回调，避免循环引用 - self.completionHandler = nil; - } - -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboFlagView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboFlagView.h deleted file mode 100644 index d629b5a..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboFlagView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// GiftComboFlagView.h -// YuMi -// -// Created by P on 2024/9/6. -// - -#import - -@class GiftReceiveInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface GiftComboFlagView : UIView - -@property (nonatomic, strong) GiftReceiveInfoModel *receiveInfo; -@property (nonatomic, copy) void(^timerEnd)(void); - -/// 更新飘屏 -/// - Parameters: -/// - model: 接收到的礼物数据 -/// - type: 飘屏动画类型：0-不做动画；1-数字抖动 -- (void)updateReceiveInfoModel:(GiftReceiveInfoModel *)model - animationType:(NSInteger)type; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboFlagView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboFlagView.m deleted file mode 100644 index 36d1dc9..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboFlagView.m +++ /dev/null @@ -1,277 +0,0 @@ -// -// GiftComboFlagView.m -// YuMi -// -// Created by P on 2024/9/6. -// - -#import "GiftComboFlagView.h" - -#import "GiftReceiveInfoModel.h" - -@interface GiftComboFlagView() - -@property (nonatomic, strong) UIImageView *backgroundImageView; -@property (nonatomic, strong) NetImageView *giftGiverAvatar; -@property (nonatomic, strong) NetImageView *giftIcon; -@property (nonatomic, strong) UILabel *giftGiverNameLabel; -@property (nonatomic, strong) UILabel *actionTitleLabel; -@property (nonatomic, strong) UILabel *giftReceiverNameLabel; -@property (nonatomic, strong) UILabel *giftCountLabel; - -@property (nonatomic, assign) NSInteger totalCount; - -@property (nonatomic, strong) NSTimer *timer; - -@property(nonatomic, copy) NSDictionary *stringAttributes; - -@property(nonatomic, copy) NSString *cacheAvatar; -@property(nonatomic, copy) NSString *cacheIcon; - -@end - -@implementation GiftComboFlagView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - NSShadow *shadow = [[NSShadow alloc] init]; - shadow.shadowBlurRadius = 3; - shadow.shadowColor = [UIColor colorWithRed:255/255.0 green:153./255.0 blue:0/255.0 alpha:1]; - shadow.shadowOffset = CGSizeMake(0,1); - self.stringAttributes = @{NSFontAttributeName: kFontSemibold(30), - NSForegroundColorAttributeName: UIColorFromRGB(0xFFE07B), - NSShadowAttributeName: shadow - }; - - [self setupUI]; - } - return self; -} - -- (void)dealloc -{ - [self endTimer]; -} - -#pragma mark - 更新 UI -- (void)updateUIWithModel:(GiftReceiveInfoModel *)model { - // 更新礼物图标 - @kWeakify(self); - [self updateCacheForProperty:self.cacheIcon newValue:model.gift.giftUrl updateBlock:^(NSString *value) { - @kStrongify(self); - self.giftIcon.imageUrl = value; - }]; - - // 更新头像 - [self updateCacheForProperty:self.cacheAvatar newValue:model.avatar updateBlock:^(NSString *value) { - @kStrongify(self); - self.giftGiverAvatar.imageUrl = value; - }]; - - // 更新名字 - self.giftGiverNameLabel.text = model.nick; - - // 更新接收者名称 - self.giftReceiverNameLabel.text = [self receiverNameForModel:model]; - - // 更新礼物计数 - NSInteger total = model.comboCount * model.giftNum * model.receiveUserCount; - NSString *countStr = [NSString stringWithFormat:@"x%ld", (long)total]; - self.giftCountLabel.attributedText = [self generateAttributedStringForCount:countStr]; -} - -- (void)updateCacheForProperty:(NSString *)cacheProperty newValue:(NSString *)newValue updateBlock:(void (^)(NSString *value))updateBlock { - if ([NSString isEmpty:cacheProperty]) { - cacheProperty = newValue; - updateBlock(newValue); - } else if (![newValue isEqualToString:cacheProperty]) { - cacheProperty = newValue; - updateBlock(newValue); - } -} - -- (NSMutableAttributedString *)generateAttributedStringForCount:(NSString *)countStr { - return [[NSMutableAttributedString alloc] initWithString:countStr - attributes:self.stringAttributes]; -} - -- (void)startTimer { - [self endTimer]; - - @kWeakify(self); - _timer = [NSTimer scheduledTimerWithTimeInterval:5.0 repeats:NO block:^(NSTimer * _Nonnull timer) { - @kStrongify(self); - if (self) { - [self handleTimerFired]; - } - }]; - - // 确保定时器在滚动时也能触发 - [[NSRunLoop mainRunLoop] addTimer:self.timer forMode:NSRunLoopCommonModes]; -} - -- (void)endTimer { - if (self.timer) { - [self.timer invalidate]; - self.timer = nil; - } -} - -#pragma mark - 定时器触发事件 -- (void)handleTimerFired { - [self removeFromSuperview]; - if (self.timerEnd) { - self.timerEnd(); - } -} - - -#pragma mark - 动画逻辑 -- (void)performCountLabelAnimationWithTotal:(NSInteger)total { - if (self.giftCountLabel.layer.animationKeys.count != 0) { - return; - } - CGFloat scale = 1.1 + (0.01 * total); - scale = MIN(3.0, scale); - - self.giftCountLabel.transform = CGAffineTransformIdentity; - [UIView animateWithDuration:0.25 animations:^{ - self.giftCountLabel.transform = CGAffineTransformMakeScale(scale, scale); - } completion:^(BOOL finished) { - self.giftCountLabel.transform = CGAffineTransformIdentity; - }]; -} - -- (void)updateReceiveInfoModel:(GiftReceiveInfoModel *)model - animationType:(NSInteger)type { - _receiveInfo = model; - - [self updateUIWithModel:model]; - - if (type == 1) { - [self performCountLabelAnimationWithTotal:model.comboCount * model.giftNum * model.receiveUserCount]; - } - - [self startTimer]; -} - -- (NSString *)receiverNameForModel:(GiftReceiveInfoModel *)model { - if (model.isComboBatch) { - return YMLocalizedString(@"Combo_1"); - } - if (model.targetUids.count > 1) { - return YMLocalizedString(@"Combo_2"); - } - return model.targetNick; -} - -- (void)setupUI { - [self addSubview:self.backgroundImageView]; - [self.backgroundImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(208), kGetScaleWidth(38))); - }]; - - [self addSubview:self.giftGiverAvatar]; - [self.giftGiverAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.backgroundImageView); - make.leading.mas_equalTo(self).offset(4); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(30), kGetScaleWidth(30))); - }]; - - [self addSubview:self.giftGiverNameLabel]; - [self.giftGiverNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.giftGiverAvatar.mas_trailing).offset(6); - make.top.mas_equalTo(self).offset(5); - }]; - - [self addSubview:self.actionTitleLabel]; - [self.actionTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.giftGiverAvatar.mas_trailing).offset(6); - make.bottom.mas_equalTo(self.backgroundImageView).offset(-5); - }]; - - [self addSubview:self.giftReceiverNameLabel]; - [self.giftReceiverNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.actionTitleLabel.mas_trailing).offset(6); - make.centerY.mas_equalTo(self.actionTitleLabel); - }]; - - [self addSubview:self.giftIcon]; - [self.giftIcon mas_makeConstraints:^(MASConstraintMaker *make) { -// make.leading.mas_equalTo(self.giftGiverNameLabel.mas_trailing).offset(8); - make.leading.greaterThanOrEqualTo(self.giftGiverNameLabel.mas_trailing).offset(8); - make.leading.greaterThanOrEqualTo(self.giftReceiverNameLabel.mas_trailing).offset(8); - make.bottom.mas_equalTo(self.backgroundImageView); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(48), kGetScaleWidth(48))); - }]; - - [self addSubview:self.giftCountLabel]; - [self.giftCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.backgroundImageView); - make.leading.mas_equalTo(self.giftIcon.mas_trailing).offset(kGetScaleWidth(22)); - }]; -} - -#pragma mark - -- (UIImageView *)backgroundImageView { - if (!_backgroundImageView) { - _backgroundImageView = [[UIImageView alloc] initWithImage:[kImage(@"gift_combo_flag_bg") ms_SetImageForRTL]]; - _backgroundImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _backgroundImageView; -} - -- (NetImageView *)giftGiverAvatar { - if (!_giftGiverAvatar) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; -// config.imageType = ImageTypeCornerAvatar; - _giftGiverAvatar = [[NetImageView alloc] initWithConfig:config]; - _giftGiverAvatar.backgroundColor = [UIColor clearColor]; - _giftGiverAvatar.contentMode = UIViewContentModeScaleAspectFill; - _giftGiverAvatar.layer.cornerRadius = kGetScaleWidth(15); - _giftGiverAvatar.layer.masksToBounds = YES; - _giftGiverAvatar.clipsToBounds = YES; - } - return _giftGiverAvatar; -} - -- (NetImageView *)giftIcon { - if (!_giftIcon) { - _giftIcon = [[NetImageView alloc] init]; - _giftIcon.contentMode = UIViewContentModeScaleAspectFit; - [_giftIcon setCornerRadius:kGetScaleWidth(24)]; - } - return _giftIcon; -} - -- (UILabel *)giftGiverNameLabel { - if (!_giftGiverNameLabel) { - _giftGiverNameLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(10) textColor:UIColorFromRGB(0xFFE995)]; - } - return _giftGiverNameLabel; -} - -- (UILabel *)actionTitleLabel { - if (!_actionTitleLabel) { - _actionTitleLabel = [UILabel labelInitWithText:YMLocalizedString(@"Combo_0") font:kFontSemibold(10) textColor:UIColorFromRGB(0xFFffff)]; - } - return _actionTitleLabel; -} - -- (UILabel *)giftReceiverNameLabel { - if (!_giftReceiverNameLabel) { - _giftReceiverNameLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(10) textColor:UIColorFromRGB(0xFFE995)]; - } - return _giftReceiverNameLabel; -} - -- (UILabel *)giftCountLabel { - if (!_giftCountLabel) { - _giftCountLabel = [UILabel labelInitWithText:@"X 1" font:kFontSemibold(36) textColor:UIColorFromRGB(0xFFE07B)]; - } - return _giftCountLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboView.h deleted file mode 100644 index 57c09a7..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboView.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// GiftComboView.h -// YuMi -// -// Created by P on 2024/9/5. -// - -#import - - - -NS_ASSUME_NONNULL_BEGIN - -@interface GiftComboView : UIView -- (void)setupCurrentGold:(double)gold; -- (void)updateCurrentGold:(double)gold giftPrice:(double)price isFromWinning:(BOOL)isFromWinning isUpdateTotal:(BOOL)isBrove; -- (void)updateCount; -- (void)stopTimer; -- (void)endCombo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboView.m deleted file mode 100644 index 1b14eb3..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboView.m +++ /dev/null @@ -1,551 +0,0 @@ -// -// GiftComboView.m -// YuMi -// -// Created by P on 2024/9/5. -// - -#import "GiftComboView.h" -#import "GiftComboManager.h" -#import "CountdownRingView.h" - -#import -#import - -@interface GiftComboView () - -@property (nonatomic, strong) UIView *container; -@property (nonatomic, strong) UILabel *comboCountLabel; -@property (nonatomic, assign) double comboGoldNum; -@property(nonatomic, strong) UILabel *comboGoldLabel; -@property (nonatomic, strong) UILabel *lastWinningLabel; -@property (nonatomic, strong) SVGAImageView *playImageView; -@property (nonatomic, strong) SVGAVideoEntity *svgaVideoEntity; -@property (nonatomic, strong) CountdownRingView *countdownRingView; - -@property(nonatomic, strong) NSMutableArray *updateGoldQueue; -@property(nonatomic, assign) BOOL isAnimatingUpdateGold; - -@property(nonatomic, strong) UIImpactFeedbackGenerator *feedbackGenerator; - -@property (nonatomic, strong) id observer_receiveLuckGiftWinning; -@property (nonatomic, strong) id observer_ComboCountReset; - -// 🔥 新增：销毁状态标记 -@property (nonatomic, assign) BOOL isDeallocating; - -@end - -@implementation GiftComboView - -- (void)dealloc -{ - - // 🔥 修复：设置销毁标记，防止懒加载属性重新创建 - self.isDeallocating = YES; - - // 🔥 修复：先停止所有Timer和动画 - [self.countdownRingView stopCountdown]; - [self.countdownRingView removeFromSuperview]; - self.countdownRingView = nil; - - [self.playImageView stopAnimation]; - [self.playImageView clear]; - self.playImageView.delegate = nil; - - // 🔥 修复：确保移除所有观察者 - if (self.observer_ComboCountReset) { - [[NSNotificationCenter defaultCenter] removeObserver:self.observer_ComboCountReset]; - self.observer_ComboCountReset = nil; - } - if (self.observer_receiveLuckGiftWinning) { - [[NSNotificationCenter defaultCenter] removeObserver:self.observer_receiveLuckGiftWinning]; - self.observer_receiveLuckGiftWinning = nil; - } - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - // 🔥 修复：清理其他资源 - [self.updateGoldQueue removeAllObjects]; - self.feedbackGenerator = nil; - -} - -- (instancetype)init { - if (self = [super init]) { - // 🔥 修复：正确初始化震动反馈 - if (@available(iOS 10.0, *)) { - self.feedbackGenerator = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleHeavy]; - [self.feedbackGenerator prepare]; // 🔥 关键：调用prepare方法 - } - self.updateGoldQueue = @[].mutableCopy; - - - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b addTarget:self action:@selector(handleTapSpace) forControlEvents:UIControlEventTouchUpInside]; - [self addSubview:b]; - [b mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self); - make.height.mas_equalTo(self.mas_height).multipliedBy(0.75); - }]; - - [self setupUI]; - [self setupTimer]; - [self updateCount]; - [self setupSVGAParser]; - [self setupNotification]; - } - return self; -} - -- (void)setupSVGAParser { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ - SVGAParser *parser = [SVGAParser new]; - @kWeakify(self); - [parser parseWithNamed:@"Combo_Boom" - inBundle:nil - completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - if (!self) return; // 🔥 修复：检查self是否还存在 - - dispatch_async(dispatch_get_main_queue(), ^{ - @kStrongify(self); - if (!self) return; // 🔥 修复：再次检查self是否还存在 - - self.svgaVideoEntity = videoItem; - self.playImageView.loops = 1; - self.playImageView.clearsAfterStop = NO; - self.playImageView.videoItem = videoItem; - }); - } failureBlock:^(NSError * _Nullable error) { - // 错误处理 - }]; - }); -} - -- (void)setupNotification { - // 🔥 修复：使用弱引用，避免循环引用 - @kWeakify(self); - - // 添加观察者时使用弱引用 - _observer_receiveLuckGiftWinning = [[NSNotificationCenter defaultCenter] addObserverForName:@"receiveLuckGiftWinning" - object:nil - queue:[NSOperationQueue mainQueue] - usingBlock:^(NSNotification * _Nonnull notification) { - @kStrongify(self); - if (!self) return; // 🔥 修复：检查self是否还存在 - - if ([notification.object isKindOfClass:[NSString class]]) { - [self handleStringNotification:notification.object]; - } else if ([notification.object isKindOfClass:[NSDictionary class]]) { - [self handleDictionaryNotification:notification.object]; - } - }]; - - // 监听连击计数重置通知 - _observer_ComboCountReset = [[NSNotificationCenter defaultCenter] addObserverForName:@"ComboCountReset" - object:nil - queue:[NSOperationQueue mainQueue] - usingBlock:^(NSNotification * _Nonnull notification) { - @kStrongify(self); - if (!self) return; // 🔥 修复：检查self是否还存在 - - [self resetComboCount]; - }]; -} - -- (void)handleStringNotification:(NSString *)coin { - if (![NSString isEmpty:coin]) { - [self updateCurrentGold:coin.doubleValue giftPrice:0 isFromWinning:YES isUpdateTotal:NO]; - } -} - -- (void)handleDictionaryNotification:(NSDictionary *)dic { - double coin = [[dic objectForKey:@"CurrentGold"] doubleValue]; - double price = [[dic objectForKey:@"Price"] doubleValue]; - BOOL isFromWinning = [[dic objectForKey:@"isFromWinning"] boolValue]; - [self updateCurrentGold:coin giftPrice:price isFromWinning:isFromWinning isUpdateTotal:YES]; -} - -- (void)updateCount { - // 在连击面板点击时，需要先更新连击计数 - NSInteger comboCount = [[GiftComboManager sharedManager] currentCount]; - NSString *countStr = [NSString stringWithFormat:@"x%ld", comboCount]; - NSShadow *shadow = [[NSShadow alloc] init]; - shadow.shadowBlurRadius = 3; - shadow.shadowColor = [UIColor colorWithRed:255/255.0 green:153./255.0 blue:0/255.0 alpha:1]; - shadow.shadowOffset =CGSizeMake(0,1); - NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:countStr - attributes: @{NSFontAttributeName: kFontSemibold(30), - NSForegroundColorAttributeName: UIColorFromRGB(0xFFE07B), - NSShadowAttributeName: shadow}]; - self.comboCountLabel.attributedText = string; -} - -// 新增方法：重置连击计数显示 -- (void)resetComboCount { - NSString *countStr = @"x1"; // 重置为 x1 - NSShadow *shadow = [[NSShadow alloc] init]; - shadow.shadowBlurRadius = 3; - shadow.shadowColor = [UIColor colorWithRed:255/255.0 green:153./255.0 blue:0/255.0 alpha:1]; - shadow.shadowOffset =CGSizeMake(0,1); - NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:countStr - attributes: @{NSFontAttributeName: kFontSemibold(30), - NSForegroundColorAttributeName: UIColorFromRGB(0xFFE07B), - NSShadowAttributeName: shadow}]; - self.comboCountLabel.attributedText = string; -} - -// 新增方法：使用指定的 combo 计数更新显示 -- (void)updateCountWithCombo:(NSInteger)comboCount { - NSString *countStr = [NSString stringWithFormat:@"x%ld", comboCount]; - NSShadow *shadow = [[NSShadow alloc] init]; - shadow.shadowBlurRadius = 3; - shadow.shadowColor = [UIColor colorWithRed:255/255.0 green:153./255.0 blue:0/255.0 alpha:1]; - shadow.shadowOffset =CGSizeMake(0,1); - NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:countStr - attributes: @{NSFontAttributeName: kFontSemibold(30), - NSForegroundColorAttributeName: UIColorFromRGB(0xFFE07B), - NSShadowAttributeName: shadow}]; - self.comboCountLabel.attributedText = string; -} - -- (void)stopTimer { - [self.countdownRingView stopCountdown]; -} - -- (void)endCombo { - [self.countdownRingView removeFromSuperview]; -} - -- (void)setupUI { - [self addSubview:self.container]; - [self.container mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self).offset(-16); - make.bottom.mas_equalTo(self).offset(-26); - make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(170), kGetScaleWidth(310))); - }]; - - [self.container addSubview:self.playImageView]; - [self.playImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.trailing.mas_equalTo(self.container); - make.width.mas_equalTo(kGetScaleWidth(150)); - make.height.mas_equalTo(kGetScaleWidth(300)); - }]; - - [self.container addSubview:self.comboCountLabel]; - [self.comboCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.playImageView.mas_leading); - make.bottom.mas_equalTo(self.playImageView).offset(-100); - }]; - - [self.container addSubview:self.countdownRingView]; - [self.countdownRingView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.playImageView.mas_centerX); - make.bottom.mas_equalTo(self.playImageView.mas_bottom).offset(4); - make.width.height.mas_equalTo(kGetScaleWidth(90)); - }]; - - [self setupGoldArea]; -} - -- (void)setupGoldArea { - [self addSubview:self.comboGoldLabel]; - [self.comboGoldLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(44); - make.bottom.mas_equalTo(-44); - }]; - - UIImageView *coin = [[UIImageView alloc] initWithImage:kImage(@"moli_money_icon")]; - [self addSubview:coin]; - [coin mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.comboGoldLabel); - make.trailing.mas_equalTo(self.comboGoldLabel.mas_leading).offset(-4); - make.size.mas_equalTo(CGSizeMake(22, 22)); - }]; - - UIView *bg = [[UIView alloc] init]; - bg.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4]; - [bg setCornerRadius:18]; - [self insertSubview:bg belowSubview:self.comboGoldLabel]; - [bg mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(coin.mas_leading).offset(-8); - make.trailing.mas_equalTo(self.comboGoldLabel.mas_trailing).offset(8); - make.centerY.mas_equalTo(self.comboGoldLabel); - make.height.mas_equalTo(36); - }]; -} - -- (void)setupTimer { - @kWeakify(self); - [self.countdownRingView setupCompletionHandler:^{ - @kStrongify(self); - self.userInteractionEnabled = NO; - [[GiftComboManager sharedManager] clear]; - }]; - [self.countdownRingView startCountdown]; -} - -- (void)handleTap { - static BOOL isHandlingTap = NO; - if (isHandlingTap) { - return; - } - - // 🔥 修复：将震动反馈移到方法开始处，确保及时响应 - if (@available(iOS 10.0, *)) { - if (self.feedbackGenerator) { - @try { - [self.feedbackGenerator impactOccurred]; - } @catch (NSException *exception) { - } - } else { - } - } else { - } - -#if RELEASE - isHandlingTap = YES; -#endif - - - // 移除用户点击时的combo递增逻辑，改为在API成功时递增 - // NSInteger comboCount = [[GiftComboManager sharedManager] loadComboCountFromSendGiftView]; - // [self updateCountWithCombo:comboCount]; - - // 直接发送礼物，combo计数在API成功回调时递增 - [[GiftComboManager sharedManager] sendGift]; - [self.playImageView startAnimation]; - [self.countdownRingView resetCountdown]; - - // 处理点击事件 - // 延迟重置标志位 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - // 1521 连续震动 3 次 -// AudioServicesPlaySystemSound(kSystemSoundID_Vibrate); -// AudioServicesPlaySystemSound(SystemSoundID(kSystemSoundID_Vibrate)); - isHandlingTap = NO; - }); -} - -- (void)handleTapSpace { - [[GiftComboManager sharedManager] clear]; -} - -// 🔥 新增：重新准备震动反馈的方法 -- (void)prepareFeedbackGenerator { - if (@available(iOS 10.0, *)) { - if (self.feedbackGenerator) { - [self.feedbackGenerator prepare]; - } - } -} - -// SVGAPlayerDelegate: 当动画播放完毕时调用 -- (void)svgaPlayerDidFinishedAnimation:(SVGAPlayer *)player { - [self.playImageView stepToPercentage:0 andPlay:NO]; -} - -#pragma mark - -- (void)setupCurrentGold:(double)gold { - self.comboGoldNum = gold; - NSString *formattedGold = [NSString stringWithFormat:@"%.2f", gold]; - if ([formattedGold hasSuffix:@".00"]) { - formattedGold = [formattedGold substringToIndex:formattedGold.length - 3]; - } - self.comboGoldLabel.text = formattedGold; -} - -- (void)addToGoldQueue:(NSString *)goldString { - @synchronized (self.updateGoldQueue) { - [self.updateGoldQueue addObject:goldString]; - } -} - -- (void)insertToGoldQueue:(NSString *)goldString { - @synchronized (self.updateGoldQueue) { - [self.updateGoldQueue insertObject:goldString atIndex:0]; - } -} - -- (NSString *)removeFromGoldQueue { - @synchronized (self.updateGoldQueue) { - if (self.updateGoldQueue.count > 0) { - NSString *goldString = [self.updateGoldQueue firstObject]; - [self.updateGoldQueue xpSafeRemoveObjectAtIndex:0]; - return goldString; - } - return @""; - } -} - -- (void)updateCurrentGold:(double)gold giftPrice:(double)price isFromWinning:(BOOL)isFromWinning isUpdateTotal:(BOOL)isUpdateTotal { - NSString *goldString = isFromWinning ? [NSString stringWithFormat:@"+ %@", @(gold)] : @(-price).stringValue; - if (isFromWinning) { - double updateGold = isUpdateTotal ? self.comboGoldNum + gold : self.comboGoldNum; - [self setupCurrentGold:updateGold]; - } else { -// double updateGold = self.comboGoldNum + gold; - [self setupCurrentGold:gold]; -// self.comboGoldLabel.text = @(gold).stringValue; - } - [self insertToGoldQueue:goldString]; - if (!self.isAnimatingUpdateGold) { - [self processNextUpdateGold]; - } -} - -- (void)processNextUpdateGold { - if (self.updateGoldQueue.count == 0) { - self.isAnimatingUpdateGold = NO; - return; - } - - NSString *goldString = [self removeFromGoldQueue]; - - self.isAnimatingUpdateGold = YES; - - BOOL isWinning = [goldString containsString:@"+"]; // 区分正负值 - UILabel *targetLabel = isWinning ? [self winPriceGoldLabel] : [self updateGoldLabel]; - targetLabel.textAlignment = NSTextAlignmentNatural; - if (isWinning) { - [self updateWinPriceGoldLabelWithText:goldString label:targetLabel]; - } else { - [self updateGoldLabelWithText:goldString label:targetLabel]; - } - [self addSubview:targetLabel]; - if (isMSRTL()) { - targetLabel.frame = CGRectMake(KScreenWidth - 60 - 120, KScreenHeight - 60, 120, 30); - } else { - targetLabel.frame = CGRectMake(60, KScreenHeight - 60, 120, 30); - } - CGFloat offset = isWinning ? -80 : -50; - - [self showGoldAnimationOnLabel:targetLabel offset:offset isForWinPrice:isWinning]; -} - -- (void)showGoldAnimationOnLabel:(UILabel *)label offset:(CGFloat)offset isForWinPrice:(BOOL)isForWin{ - label.alpha = 0; - - [UIView animateWithDuration:0.2 animations:^{ - label.transform = CGAffineTransformTranslate(CGAffineTransformIdentity, 0, offset); - label.alpha = 1; - } completion:^(BOOL finished) { - if (isForWin) { - [UIView animateWithDuration:0.2 delay:0.2 options:UIViewAnimationOptionCurveEaseInOut animations:^{ - label.transform = CGAffineTransformTranslate(CGAffineTransformIdentity, 0, offset*2); - label.alpha = 0; - } completion:^(BOOL finished) { - [label removeFromSuperview]; - }]; - } else { - [UIView animateWithDuration:0.2 delay:0.3 options:UIViewAnimationOptionCurveLinear animations:^{ -// label.transform = CGAffineTransformIdentity; - label.alpha = 0; - } completion:^(BOOL finished) { - - }]; - } - self.isAnimatingUpdateGold = NO; - [self processNextUpdateGold]; - }]; -} - -#pragma mark - -- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch { - // 如果触摸点在 UITextView 或 UICollectionView 内，则不触发手势 - if (touch.view == self.container || touch.view == self.playImageView) { - return NO; - } - return YES; // 触发手势 -} - -#pragma mark - - -- (UIView *)container { - if (!_container) { - _container = [[UIView alloc] init]; - _container.backgroundColor = [UIColor clearColor]; - } - return _container; -} - -- (UILabel *)comboCountLabel { - if (!_comboCountLabel) { - _comboCountLabel = [UILabel labelInitWithText:@"" - font:kFontSemibold(30) - textColor:UIColorFromRGB(0xFFE07B)]; - _comboCountLabel.transform = isMSRTL() ? CGAffineTransformMakeRotation(M_PI_4) : CGAffineTransformMakeRotation(-M_PI_4); - _comboCountLabel.userInteractionEnabled = YES; - } - return _comboCountLabel; -} - -- (UILabel *)comboGoldLabel { - if (!_comboGoldLabel) { - _comboGoldLabel = [UILabel labelInitWithText:@"" font:kFontSemibold(20) textColor:UIColorFromRGB(0xffd54c)]; - } - return _comboGoldLabel; -} - -- (UILabel *)updateGoldLabel { - return [UILabel labelInitWithText:@"" font:kFontSemibold(24) textColor:UIColorFromRGB(0xffd54c)]; -} - -- (UILabel *)winPriceGoldLabel { - return [UILabel labelInitWithText:@"" font:kFontSemibold(24) textColor:UIColorFromRGB(0xBC36FF)]; -} - -- (void)updateGoldLabelWithText:(NSString *)text label:(UILabel *)label { - label.attributedText = [self attributedStringWithText:text - font:[UIFont boldSystemFontOfSize:24] - textColor:UIColorFromRGB(0xffd54c) - shadowColor:[UIColor colorWithWhite:1 alpha:0.4]]; -} - -- (void)updateWinPriceGoldLabelWithText:(NSString *)text label:(UILabel *)label { - label.attributedText = [self attributedStringWithText:text - font:[UIFont boldSystemFontOfSize:26] - textColor:UIColorFromRGB(0xBC36FF) - shadowColor:[UIColor colorWithWhite:1 alpha:0.8]]; -} - -- (NSAttributedString *)attributedStringWithText:(NSString *)text font:(UIFont *)font textColor:(UIColor *)color shadowColor:(UIColor *)shadowColor { - NSShadow *shadow = [[NSShadow alloc] init]; - shadow.shadowBlurRadius = 4.0; // 亮边模糊程度 - shadow.shadowColor = shadowColor; // 亮边颜色 - shadow.shadowOffset = CGSizeZero; // 亮边偏移 - - NSDictionary *attributes = @{ - NSFontAttributeName: font, - NSForegroundColorAttributeName: color, - NSShadowAttributeName: shadow - }; - - return [[NSAttributedString alloc] initWithString:text attributes:attributes]; -} - -- (SVGAImageView *)playImageView { - // 🔥 修复：添加安全检查，避免在对象销毁过程中创建新实例 - if (_playImageView == nil && !self.isDeallocating) { - _playImageView = [[SVGAImageView alloc]init]; - _playImageView.contentMode = UIViewContentModeScaleAspectFill; - _playImageView.hidden = NO; - _playImageView.delegate = self; - } - return _playImageView; -} - -- (CountdownRingView *)countdownRingView { - // 🔥 修复：添加安全检查，避免在对象销毁过程中创建新实例 - if (!_countdownRingView && !self.isDeallocating) { - _countdownRingView = [[CountdownRingView alloc] initWithFrame:CGRectMake(0, 0, kGetScaleWidth(90), kGetScaleWidth(90)) - duration:5]; - _countdownRingView.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap)]; - [_countdownRingView addGestureRecognizer:tap]; - } - return _countdownRingView; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftBravoGiftBroadcastView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftBravoGiftBroadcastView.h deleted file mode 100644 index 3fe7b91..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftBravoGiftBroadcastView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// PIGiftBravoGiftBroadcastView.h -// YuMi -// -// Created by P on 2025/4/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIGiftBravoGiftBroadcastView : UIView - -// 开始动画循环 -- (void)startAnimation; - -// 停止动画循环 -- (void)stopAnimation; - -// 兼容旧方法 -- (void)endloop; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftBravoGiftBroadcastView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftBravoGiftBroadcastView.m deleted file mode 100644 index c8849cb..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftBravoGiftBroadcastView.m +++ /dev/null @@ -1,390 +0,0 @@ -// -// PIGiftBravoGiftBroadcastView.m -// YuMi -// -// Created by P on 2025/4/14. -// - -#import "PIGiftBravoGiftBroadcastView.h" -#import "XPSkillCardPlayerManager.h" -#import "BravoGiftTabInfomationModel.h" - - -@interface PIGiftBravoGiftBroadcastItemView : UIView - -@property (nonatomic, strong) BravoGiftTabInfomationModel *model; -- (void)cancelLoading; - -@end - -@implementation PIGiftBravoGiftBroadcastItemView -{ - NetImageView *avatar; - UILabel *content; -} - -- (instancetype)init -{ - self = [super init]; - if (self) { - NetImageConfig *config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - avatar = [[NetImageView alloc] initWithConfig:config]; - - content = [[UILabel alloc] init]; - - [self addSubview:avatar]; - [self addSubview:content]; - - [avatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(8); - make.size.mas_equalTo(CGSizeMake(24, 24)); - }]; - - [content mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(avatar.mas_trailing).offset(4); - make.trailing.mas_equalTo(self).offset(-4); - }]; - } - return self; -} - -- (void)setModel:(BravoGiftTabInfomationModel *)model { - _model = model; - - avatar.imageUrl = model.avatar; - - NSTextAttachment *coinAttachment = [[NSTextAttachment alloc] init]; - coinAttachment.image = kImage(@"moli_money_icon"); - coinAttachment.bounds = CGRectMake(0, -3, 18, 18); - NSAttributedString *coinString = [NSAttributedString attributedStringWithAttachment:coinAttachment]; - NSString *giftName = model.giftName; - NSString *coin = @(model.coin).stringValue; - NSString *oringinalString = [NSString stringWithFormat:@" %@ %@ %@ %@ %@ ", - [NSString trimString:model.nick lengthLimit:4], - YMLocalizedString(@"Combo_7"), - giftName, YMLocalizedString(@"Combo_4"), coin]; - - NSMutableAttributedString *string = [[NSMutableAttributedString alloc] init]; - [string appendAttributedString:[[NSAttributedString alloc] initWithString:oringinalString attributes:@{ - NSFontAttributeName: kFontRegular(13), - NSForegroundColorAttributeName: [UIColor whiteColor] - }]]; - - // 找到 giftName 和 coin 在字符串中的位置 - NSRange giftNameRange = [oringinalString rangeOfString:giftName]; - NSRange coinRange = [oringinalString rangeOfString:coin]; - - // 创建黄色文本的属性 - NSDictionary *yellowAttributes_name = @{ - NSFontAttributeName: kFontRegular(13), - NSForegroundColorAttributeName: UIColorFromRGB(0xffec6f) - }; - NSDictionary *yellowAttributes_coin = @{ - NSFontAttributeName: kFontSemibold(16), - NSForegroundColorAttributeName: UIColorFromRGB(0xffec6f) - }; - // 创建包含黄色文本的可变字符串 - NSMutableAttributedString *yellowGiftName = [[NSMutableAttributedString alloc] initWithString:giftName attributes:yellowAttributes_name]; - NSMutableAttributedString *yellowCoin = [[NSMutableAttributedString alloc] initWithString:coin attributes:yellowAttributes_coin]; - - // 替换原始字符串中的 giftName 和 coin 为黄色文本 - [string replaceCharactersInRange:giftNameRange withAttributedString:yellowGiftName]; - [string replaceCharactersInRange:coinRange withAttributedString:yellowCoin]; - - [string appendAttributedString:coinString]; - - [content setAttributedText:string.copy]; -} - -- (void)cancelLoading { - [avatar cancelLoadImage]; -} - -@end - -@interface PIGiftBravoGiftBroadcastView() - -@property (nonatomic, strong) UIImageView *speaker; -@property (nonatomic, strong) MarqueeLabel *label; -@property (nonatomic, strong) UIView *container; -@property (nonatomic, copy) NSArray * source; -@property (nonatomic, strong) NSMutableArray *labels; -@property (nonatomic, assign) NSInteger index; -@property (nonatomic, assign) BOOL isAnimating; // 动画状态控制 -@property (nonatomic, assign) BOOL shouldStopAnimation; // 停止动画标志 -@property (nonatomic, strong) UIButton *tipsButton; -@property (nonatomic, strong) NSTimer *animationTimer; // 动画定时器 - -@end - -@implementation PIGiftBravoGiftBroadcastView - -- (void)dealloc { - [self endloop]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - self.source = [[XPSkillCardPlayerManager shareInstance] loadBravoGiftTabInfomation]; - [self setupUI]; - } - return self; -} - -- (void)setupUI { - [self addSubview:self.container]; - [self.container mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(10); - make.bottom.mas_equalTo(self).offset(-4); - make.height.mas_equalTo(34); - }]; - - [self addSubview:self.tipsButton]; - [self.tipsButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-10); - make.bottom.mas_equalTo(self.container.mas_top).offset(-9); - make.height.mas_equalTo(24); - make.width.mas_greaterThanOrEqualTo(60); - }]; - - [self addSubview:self.speaker]; - [self.speaker mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.bottom.mas_equalTo(self); - make.size.mas_equalTo(CGSizeMake(29, 29)); - }]; - - self.labels = [[NSMutableArray alloc] init]; - self.isAnimating = NO; - self.shouldStopAnimation = NO; - - // 检查数据源 - if (self.source.count < 2) { - NSLog(@"⚠️ PIGiftBravoGiftBroadcastView: 数据源不足 (%lu个)，动画可能过快", (unsigned long)self.source.count); - } else { - NSLog(@"✅ PIGiftBravoGiftBroadcastView: 数据源正常 (%lu个)", (unsigned long)self.source.count); - } - - @kWeakify(self); - [self.source enumerateObjectsUsingBlock:^(BravoGiftTabInfomationModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - @kStrongify(self); - PIGiftBravoGiftBroadcastItemView *item = [[PIGiftBravoGiftBroadcastItemView alloc] init]; - item.frame = CGRectMake(0, 0, KScreenWidth - 25 - 42, 26); - item.model = obj; - [self.labels addObject:item]; - }]; - - // 开始动画 - [self startLoop]; -} - -- (void)startLoop { - if (self.isAnimating || self.labels.count == 0 || self.shouldStopAnimation) { - NSLog(@"🚫 PIGiftBravoGiftBroadcastView: 动画启动被阻止 - isAnimating:%d, labelsCount:%lu, shouldStop:%d", - self.isAnimating, (unsigned long)self.labels.count, self.shouldStopAnimation); - return; - } - - self.isAnimating = YES; - NSLog(@"🎬 PIGiftBravoGiftBroadcastView: 开始动画循环"); - [self playCurrentAnimation]; -} - -// 公共方法：开始动画循环 -- (void)startAnimation { - if (self.shouldStopAnimation) { - self.shouldStopAnimation = NO; - NSLog(@"🔄 PIGiftBravoGiftBroadcastView: 重置停止标志，重新开始动画"); - } - - if (self.labels.count > 0) { - [self startLoop]; - } else { - NSLog(@"⚠️ PIGiftBravoGiftBroadcastView: 无法开始动画，labels为空"); - } -} - -// 公共方法：停止动画循环 -- (void)stopAnimation { - NSLog(@"⏹️ PIGiftBravoGiftBroadcastView: 停止动画"); - [self endloop]; -} - -- (void)playCurrentAnimation { - // 更严格的状态检查 - if (self.shouldStopAnimation) { - self.isAnimating = NO; - NSLog(@"🚫 PIGiftBravoGiftBroadcastView: 动画被停止标志阻止"); - return; - } - - // 确保只有一个动画在运行 - if (self.container.subviews.count > 0) { - NSLog(@"⚠️ PIGiftBravoGiftBroadcastView: 容器中已有视图，跳过当前动画"); - return; - } - - // 获取当前索引的视图 - PIGiftBravoGiftBroadcastItemView *item = [self.labels xpSafeObjectAtIndex:self.index]; - if (!item) { - self.isAnimating = NO; - NSLog(@"❌ PIGiftBravoGiftBroadcastView: 无法获取当前索引(%ld)的视图", (long)self.index); - return; - } - - NSLog(@"🎭 PIGiftBravoGiftBroadcastView: 播放第%ld个动画项", (long)self.index); - - // 设置初始位置（屏幕右侧） - item.frame = CGRectMake(KScreenWidth, 2, KScreenWidth - 25 - 42, 26); - // 添加到容器视图 - [self.container addSubview:item]; - - @kWeakify(self); - // 入场动画：0.5秒 - [UIView animateWithDuration:0.5 animations:^{ - item.frame = CGRectMake(25, 2, KScreenWidth - 25 - 42, 26); - } completion:^(BOOL finished) { - @kStrongify(self); - if (!finished || self.shouldStopAnimation) { - [item removeFromSuperview]; - self.isAnimating = NO; - NSLog(@"❌ PIGiftBravoGiftBroadcastView: 入场动画被中断"); - return; - } - - // 停留时间：从2秒增加到3秒 - [UIView animateWithDuration:0.5 delay:3.0 options:UIViewAnimationOptionCurveEaseIn animations:^{ - item.frame = CGRectMake(-KScreenWidth, 2, KScreenWidth - 25 - 42, 26); - } completion:^(BOOL finished) { - @kStrongify(self); - // 移除视图 - [item removeFromSuperview]; - - if (self.shouldStopAnimation) { - self.isAnimating = NO; - NSLog(@"⏹️ PIGiftBravoGiftBroadcastView: 出场动画被停止"); - return; - } - - // 索引递增 - self.index += 1; - if (self.index >= self.labels.count) { - self.index = 0; - NSLog(@"🔄 PIGiftBravoGiftBroadcastView: 动画循环重置到开始"); - } - - // 使用定时器延迟下一个动画，从0.1秒增加到0.5秒 - self.animationTimer = [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(scheduleNextAnimation) userInfo:nil repeats:NO]; - NSLog(@"⏰ PIGiftBravoGiftBroadcastView: 安排下一个动画，延迟0.5秒"); - }]; - }]; -} - -- (void)scheduleNextAnimation { - [self.animationTimer invalidate]; - self.animationTimer = nil; - - if (self.shouldStopAnimation) { - self.isAnimating = NO; - NSLog(@"🚫 PIGiftBravoGiftBroadcastView: 定时器回调被停止标志阻止"); - return; - } - - NSLog(@"▶️ PIGiftBravoGiftBroadcastView: 定时器触发下一个动画"); - [self playCurrentAnimation]; -} - -- (void)endloop { - // 设置停止标志 - self.shouldStopAnimation = YES; - self.isAnimating = NO; - - NSLog(@"🛑 PIGiftBravoGiftBroadcastView: 结束动画循环"); - - // 停止并清理定时器 - if (self.animationTimer) { - [self.animationTimer invalidate]; - self.animationTimer = nil; - } - - // 取消所有动画 - [self.container.layer removeAllAnimations]; - - // 取消每个条目的图片加载 - for (PIGiftBravoGiftBroadcastItemView *item in self.labels) { - [item cancelLoading]; - } - - // 清理视图 - for (PIGiftBravoGiftBroadcastItemView *item in self.labels) { - [item.layer removeAllAnimations]; - [item removeFromSuperview]; - } - [self.labels removeAllObjects]; - - // 重置状态 - self.index = 0; -} - -- (void)didTapTips { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"20.20.56_text_15"); - config.message = YMLocalizedString(@"20.20.56_text_16"); - config.actionStyle = 0; - [TTPopup alertWithConfig:config - confirmHandler:^{} - cancelHandler:^{}]; -} - -#pragma mark - -- (UIImageView *)speaker { - if (!_speaker) { - _speaker = [[UIImageView alloc] initWithImage:isMSRTL() ? kImage(@"bravo_speaker_ar") : kImage(@"bravo_speaker")]; - } - return _speaker; -} - -- (UIView *)container { - if (!_container) { - - NSArray *colors; - if (isMSRTL()) { - colors = @[ - [UIColor colorWithWhite:0 alpha:0], - [UIColor colorWithWhite:0 alpha:0.9]]; - } else { - colors = @[ - [UIColor colorWithWhite:0 alpha:0.9], - [UIColor colorWithWhite:0 alpha:0]]; - } - _container = [[UIView alloc] init]; - [_container addGradientBackgroundWithColors:colors startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(0.95, 0.5) cornerRadius:17]; - - } - return _container; -} - -- (UIButton *)tipsButton { - if (!_tipsButton) { - _tipsButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_tipsButton setBackgroundColor:[UIColor colorWithWhite:0 alpha:0.5]]; - [_tipsButton setCornerRadius:12]; - [_tipsButton addTarget:self action:@selector(didTapTips) forControlEvents:UIControlEventTouchUpInside]; - NSTextAttachment *attachment = [[NSTextAttachment alloc] init]; - attachment.image = kImage(@"question_mark"); - attachment.bounds = CGRectMake(0, -4, 18, 18); - NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]]; - [string appendAttributedString:[[NSAttributedString alloc] initWithString:YMLocalizedString(@"20.20.56_text_17") attributes:@{ - NSFontAttributeName: kFontRegular(12), - NSForegroundColorAttributeName: [UIColor whiteColor] - }]]; - [_tipsButton setAttributedTitle:string forState:UIControlStateNormal]; - - } - return _tipsButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.h deleted file mode 100644 index 8cba819..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.h +++ /dev/null @@ -1,56 +0,0 @@ -// -// PIGiftInfoSegmentedView.h -// YuMi -// -// Created by duoban on 2023/11/9. -// - -#import -#import "XPFreeGiftModel.h" -#import "GiftInfoModel.h" -#import "RoomInfoModel.h" -#import "XPSendGiftView.h" -#import "XPGiftInfoView.h" -NS_ASSUME_NONNULL_BEGIN -@class GiftInfoModel, GiftPanelTabModel, PIGiftInfoSegmentedView, GiftReceiveInfoModel; -@protocol PIGiftInfoSegmentedViewDelegate - -///点击了切换不同礼物的tabbar -- (void)pIGiftInfoSegmentedView:(PIGiftInfoSegmentedView *)view didClickSegment:(GiftSegmentType)type; - -///点击了某个item -- (void)pIGiftInfoSegmentedView:(PIGiftInfoSegmentedView *)view didClickItem:(GiftInfoModel *)info type:(GiftSegmentType)type; - -@end - - - -@interface PIGiftInfoSegmentedView : UIView -@property(nonatomic,weak) iddelegate; -@property (nonatomic,assign) SendGiftType usingPlaceType; - -@property (nonatomic, copy) NSArray *tagsArray; - -///普通礼物/幸运礼物/VIP礼物 -@property (nonatomic, copy) NSArray *normalOriginArray; -///背包礼物 -@property (nonatomic, copy) NSArray *packOriginArray; -///免费礼物 -@property (nonatomic,strong) XPFreeGiftModel *freeModel; -///免费礼物送完删除了，不能出现在背包，防止数据更新时重新加进来 -@property (nonatomic,assign) BOOL isDelFreeGift; -///当前用户VIP等级 -@property (nonatomic, assign) NSInteger curUserNobleLevel; -///最后一次选中的礼物 -@property (nonatomic,strong,readonly) GiftInfoModel *lastSelectGift; -///房间类型 -@property (nonatomic,assign) RoomType roomType; -///送背包礼物更新数据源 -- (void)updatePackSource:(GiftReceiveInfoModel *)giftReceiveInfo numberUser:(NSInteger)numberUser; - -- (void)showLoading; - -- (void)hideLoading; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m deleted file mode 100644 index b0aa269..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m +++ /dev/null @@ -1,605 +0,0 @@ -// -// PIGiftInfoSegmentedView.m -// YuMi -// -// Created by duoban on 2023/11/9. -// - -#import "PIGiftInfoSegmentedView.h" -#import -#import -#import -#import "ThemeColor+SendGift.h" -#import "XPGiftInfoView.h" -@interface PIGiftInfoSegmentedView() -///分页标题 -@property (nonatomic, strong) NSArray *pi_titles; -///导航条背景 -@property (nonatomic,strong) UIImageView *segmentBgView; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *pi_containerView; -/////背包总价值 -//@property (nonatomic,strong) UILabel *totalValueLabel; -///背包礼物 -@property (nonatomic,strong) UIButton *packGiftButton; -///背包礼物面板 -@property(nonatomic,strong) XPGiftInfoView *packGiftView; -///礼物数据 -@property(nonatomic,strong) NSMutableArray *giftList; -///最后一次选中的礼物 -@property (nonatomic,strong) GiftInfoModel *lastSelectGift; -///当前展示的数据的类型 -@property (nonatomic,assign) GiftSegmentType segmentType; - -///普通 -@property (nonatomic,strong)XPGiftInfoView *normalVC; -///幸运 -@property (nonatomic,strong)XPGiftInfoView *luckyVC; -///周星 -@property (nonatomic,strong)XPGiftInfoView *weekStarVC; -///VIP -@property (nonatomic,strong)XPGiftInfoView *nobleVC; -///人气/个播 -@property (nonatomic,strong)XPGiftInfoView *anchorVC; -///超级幸运 -@property (nonatomic,strong)XPGiftInfoView *superLuckyVC; -///国家 -@property (nonatomic,strong)XPGiftInfoView *countryVC; -/// 幸运 24 -@property (nonatomic,strong)XPGiftInfoView *lucky24VC; -/// 幸运 25 -@property (nonatomic,strong)XPGiftInfoView *lucky25VC; -/// cp -@property (nonatomic,strong)XPGiftInfoView *cpVC; -/// 定制 -@property (nonatomic,strong)XPGiftInfoView *customVC; - -@property (nonatomic,strong)XPGiftInfoView *bravoVC; - -@property (nonatomic, strong) UIActivityIndicatorView *loadingView; - -@end -@implementation PIGiftInfoSegmentedView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - self.segmentType = GiftSegmentType_Normal; - [self installUI]; - [self installConstraints]; - [self showLoading]; - } - return self; -} - -- (void)showLoading { - if (!_loadingView) { - _loadingView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite]; - _loadingView.translatesAutoresizingMaskIntoConstraints = NO; - [self addSubview:_loadingView]; - [NSLayoutConstraint activateConstraints:@[ - [_loadingView.centerXAnchor constraintEqualToAnchor:self.centerXAnchor], - [_loadingView.centerYAnchor constraintEqualToAnchor:self.centerYAnchor] - ]]; - } - - [self.loadingView startAnimating]; - self.loadingView.hidden = NO; -} - -- (void)hideLoading { - if (_loadingView) { - [self.loadingView stopAnimating]; - self.loadingView.hidden = YES; - } -} - --(void)installUI{ - [self addSubview:self.segmentBgView]; - [self addSubview:self.titleView]; - [self addSubview:self.pi_containerView]; - [self addSubview:self.packGiftButton]; - [self addSubview:self.packGiftView]; -} --(void)installConstraints{ - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(44+108 * 2 + 10 + 10 + 15); - }]; - [self.segmentBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.equalTo(self); - make.height.mas_equalTo(44); - }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.equalTo(self); - make.trailing.equalTo(self.packGiftButton.mas_leading).offset(-16); - make.height.mas_equalTo(34); - }]; - [self.packGiftButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-15); - make.centerY.mas_equalTo(self.titleView); - make.size.mas_equalTo(CGSizeMake(14, 14)); - }]; - [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self); - make.top.equalTo(self.titleView.mas_bottom).mas_offset(kGetScaleWidth(0)); - }]; - [self.packGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.pi_containerView); - }]; -} -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.pi_titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - - XPGiftInfoView *vc = [self getListVC:index]; - if(vc.segmentType == GiftSegmentType_Noble){ - vc.curUserNobleLevel = self.curUserNobleLevel; - } - vc.usingPlaceType = self.usingPlaceType; - vc.normalOriginArray = [self.giftList xpSafeObjectAtIndex:index]; - return vc; -} -- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index{ - - if (self.usingPlaceType == SendGiftType_User) { - self.titleView.titleColor = [DJDKMIMOMColor secondTextColor]; - self.titleView.titleSelectedColor = [DJDKMIMOMColor mainTextColor]; - [self.packGiftButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - }else { - [self.packGiftButton setTitleColor:[DJDKMIMOMColor giftSegmentNormalTitleColor] forState:UIControlStateNormal]; - self.titleView.titleColor = [DJDKMIMOMColor giftSegmentNormalTitleColor]; - self.titleView.titleSelectedColor = [DJDKMIMOMColor giftSegmentSelectTitleColor]; - } - [self.titleView reloadData]; - self.pi_containerView.hidden = NO; - self.packGiftView.hidden = YES; -// self.totalValueLabel.hidden = YES; - XPGiftInfoView *vc = [self getListVC:index]; - self.segmentType = vc.segmentType; - if(self.delegate && [self.delegate respondsToSelector:@selector(pIGiftInfoSegmentedView:didClickSegment:)]){ - [self.delegate pIGiftInfoSegmentedView:self didClickSegment:self.segmentType]; - } - if(self.segmentType == GiftSegmentType_WeekStar){ - if(self.delegate && [self.delegate respondsToSelector:@selector(pIGiftInfoSegmentedView:didClickItem:type:)]){ - [self.delegate pIGiftInfoSegmentedView:self didClickItem:vc.lastSelectGift type:self.segmentType]; - } - } - -} --(XPGiftInfoView *)getListVC:(NSInteger)index{ - GiftPanelTabModel *targetTab = [self.tagsArray xpSafeObjectAtIndex:index]; - switch ([targetTab tabGiftType]) { - case GiftType_Game:{ - return self.normalVC; - } - break; - case GiftType_Lucky:{ - return self.luckyVC; - } - break; - case GiftType_Noble:{ - return self.nobleVC; - } - break; - case GiftType_WeekStar:{ - return self.weekStarVC; - } - break; - case GiftType_Anchor:{ - if (self.roomType == RoomType_Anchor) { - return self.anchorVC; - } else { - return nil; - } - } - break; - case GiftType_super: - case GiftType_Lucky24:{ - return self.superLuckyVC; - } - break; - case GiftType_Lucky25: { - return self.lucky25VC; - } - break; - case GiftType_Country:{ - return self.countryVC; - } - break; - case GiftType_CP:{ - return self.cpVC; - } - break; - case GiftType_Custom:{ - return self.customVC; - } - break; - case GiftType_Bravo: { - return self.bravoVC; - } - break; - default: - return self.normalVC; - break; - } -} - --(NSInteger)getIndex{ - for (int i = 0; i< self.tagsArray.count; i++) { - GiftPanelTabModel *tab = [self.tagsArray xpSafeObjectAtIndex:i]; - GiftType tabGiftType = [tab tabGiftType]; - if (tabGiftType == GiftType_Game && self.segmentType == GiftSegmentType_Normal) { - return i; - } else if (tabGiftType == GiftType_Lucky && self.segmentType == GiftSegmentType_Lucky) { - return i; - } else if ((tabGiftType == GiftType_super || tabGiftType == GiftType_Lucky24 || tabGiftType == GiftType_Lucky25) && self.segmentType == GiftSegmentType_SuperLucky) { - return i; - } else if (tabGiftType == GiftType_WeekStar && self.segmentType == GiftSegmentType_WeekStar) { - return i; - } else if (tabGiftType == GiftType_Noble && self.segmentType == GiftSegmentType_Noble) { - return i; - } else if (tabGiftType == GiftType_Country && self.segmentType == GiftSegmentType_Country) { - return i; - } else if (tabGiftType == GiftType_Anchor && self.segmentType == GiftSegmentType_Anchor) { - return i; - } else if (tabGiftType == GiftType_CP && self.segmentType == GiftSegmentType_CP) { - return i; - } else if (tabGiftType == GiftType_Custom && self.segmentType == GiftSegmentType_Custom) { - return i; - } else if (tabGiftType == GiftType_Bravo && self.segmentType == GiftSegmentType_Bravo) { - return i; - } -// else if (tabGiftType == GiftType_Bravo && self.segmentType == GiftSegmentType_Bravo) { -// return i; -// } - } - - return 0; -} - --(void)didClickGiftSegmentAction:(UIButton *)sender{ - if (self.usingPlaceType == SendGiftType_User) { - [self.packGiftButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - self.titleView.titleColor = [DJDKMIMOMColor secondTextColor]; - self.titleView.titleSelectedColor = [DJDKMIMOMColor secondTextColor]; - - }else { - [self.packGiftButton setTitleColor:[DJDKMIMOMColor giftSegmentSelectTitleColor] forState:UIControlStateNormal]; - self.titleView.titleColor = [DJDKMIMOMColor giftSegmentNormalTitleColor]; - self.titleView.titleSelectedColor = [DJDKMIMOMColor giftSegmentNormalTitleColor]; - } - [self.titleView reloadData]; - self.packGiftView.hidden = NO; - self.pi_containerView.hidden = YES; - self.segmentType = GiftSegmentType_Pack; - if(self.delegate && [self.delegate respondsToSelector:@selector(pIGiftInfoSegmentedView:didClickSegment:)]){ - [self.delegate pIGiftInfoSegmentedView:self didClickSegment:self.segmentType]; - } -} - -/** - 将数量格式化为字符串 万之后用xx.xxW显示并保留小数点2位，最多显示9999W+； - @param number 数值 - @return 格式化后的字符串 - */ -- (NSString *)countFormatCoinStr:(NSInteger)number { - NSString *numStr = [NSString stringWithFormat:@"%li", number]; - NSInteger num = number; - if (num > 99990000) { - numStr = @"99990k+"; - } else if (num >= 10000) { - CGFloat numF = num / 1000.0; - numStr = [NSString stringWithFormat:@"%.0fk+", numF]; - } - return numStr; -} - -- (void)setTagsArray:(NSArray *)tagsArray { - [self hideLoading]; - - NSMutableArray *tempTitles = @[].mutableCopy; - NSMutableArray *tempGifts = @[].mutableCopy; - NSMutableArray *tempTags = @[].mutableCopy; - for (GiftPanelTabModel *tab in tagsArray) { - // 聊天界面不显示 幸运/个播 礼物 - if (self.usingPlaceType == SendGiftType_User && - ([tab.key isEqualToString:@"luckyBagGift"] || - [tab.key isEqualToString:@"superLuckyGift"] || - [tab.key isEqualToString:@"singlePopularGift"])) { - continue; - } else if (self.roomType != RoomType_Anchor && [tab.key isEqualToString:@"singlePopularGift"]) { - continue; - } - - bool canAddGift = false; - if (isMSRTL()) { - if ([tab.nameMap.ar length] > 0) { - canAddGift = true; - [tempTitles addObject:tab.nameMap.ar]; - } - } else if (isMSTR()) { - if ([tab.nameMap.tr length] > 0) { - canAddGift = true; - [tempTitles addObject:tab.nameMap.tr]; - } - } else if (isMSPT()) { - if ([tab.nameMap.pt length] > 0) { - canAddGift = true; - [tempTitles addObject:tab.nameMap.pt]; - } - }else if (isMSES()) { - if ([tab.nameMap.es length] > 0) { - canAddGift = true; - [tempTitles addObject:tab.nameMap.es]; - } - } else if (isMSRU()) { - if ([tab.nameMap.ru length] > 0) { - canAddGift = true; - [tempTitles addObject:tab.nameMap.ru]; - } - } else if (isMSZH()) { - if ([tab.nameMap.zh length] > 0) { - canAddGift = true; - [tempTitles addObject:tab.nameMap.zh]; - } - } else if (isMSUZ()) { - if ([tab.nameMap.uz length] > 0) { - canAddGift = true; - [tempTitles addObject:tab.nameMap.uz]; - } - } else { - if ([tab.nameMap.en length] > 0) { - canAddGift = true; - [tempTitles addObject:tab.nameMap.en]; - } - } - - [tempTags addObject:tab]; - if (canAddGift) { - [tempGifts addObject:tab.gifts ? tab.gifts : @[]]; - } else { - [tempGifts addObject:@[]]; - } - } - - [self.titleView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.leading.equalTo(self); - make.height.mas_equalTo(34); - if (tempTitles.count<5 && isMSZH()) { - make.width.mas_equalTo(kGetScaleWidth(200)); - } else { - make.trailing.equalTo(self.packGiftButton.mas_leading).offset(-16); - } - }]; - - _tagsArray = tempTags.copy; - self.pi_titles = tempTitles.copy; - self.titleView.titles = self.pi_titles; - - self.giftList = tempGifts; - - [self.titleView reloadData]; - - @kWeakify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self.pi_containerView reloadData]; - }); -} - -- (void)setNormalOriginArray:(NSArray *)normalOriginArray { - [self hideLoading]; - _normalOriginArray = normalOriginArray; -} - --(void)setPackOriginArray:(NSArray *)packOriginArray{ - _packOriginArray = packOriginArray; - self.packGiftView.packOriginArray = packOriginArray; -} --(void)setFreeModel:(XPFreeGiftModel *)freeModel{ - _freeModel = freeModel; - self.packGiftView.freeModel = freeModel; -} -- (void)setIsDelFreeGift:(BOOL)isDelFreeGift{ - _isDelFreeGift = isDelFreeGift; - self.packGiftView.isDelFreeGift = _isDelFreeGift; -} --(void)setRoomType:(RoomType)roomType{ - _roomType = roomType; -} -- (void)setUsingPlaceType:(SendGiftType)usingPlaceType { - _usingPlaceType = usingPlaceType; - self.packGiftView.usingPlaceType = _usingPlaceType; - if (_usingPlaceType == SendGiftType_User) { - self.titleView.titleColor = [DJDKMIMOMColor secondTextColor]; - self.titleView.titleSelectedColor = [DJDKMIMOMColor mainTextColor]; - self.segmentBgView.hidden = NO; - [self.packGiftButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateSelected]; - [self.packGiftButton setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - } -} -///送背包礼物更新数据源 -- (void)updatePackSource:(GiftReceiveInfoModel *)giftReceiveInfo numberUser:(NSInteger)numberUser{ - [self.packGiftView updatePackSource:giftReceiveInfo numberUser:numberUser]; -} -#pragma mark- XPGiftInfoViewDelegate -///点击了某个item -- (void)xPGiftInfoView:(XPGiftInfoView *)view didClickItem:(GiftInfoModel *)info type:(GiftSegmentType)type{ - if(self.delegate && [self.delegate respondsToSelector:@selector(pIGiftInfoSegmentedView:didClickItem:type:)]){ - [self.delegate pIGiftInfoSegmentedView:self didClickItem:info type:type]; - } -} -#pragma mark - 懒加载 -- (GiftInfoModel *)lastSelectGift{ - if(_segmentType == GiftSegmentType_Pack){ - return _packGiftView.lastSelectGift; - } - - XPGiftInfoView *vc = [self getListVC:[self getIndex]]; - return vc.lastSelectGift; - -} -- (NSArray *)pi_titles{ - if(!_pi_titles){ -// _pi_titles = @[YMLocalizedString(@"XPGiftInfoView2"),YMLocalizedString(@"XPGiftInfoView3"),YMLocalizedString(@"XPGiftInfoView4"),YMLocalizedString(@"XPGiftInfoView9")]; - _pi_titles = @[]; - } - return _pi_titles; -} -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.pi_titles; - _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = [DJDKMIMOMColor giftSegmentNormalTitleColor]; - _titleView.titleSelectedColor = [DJDKMIMOMColor giftSegmentSelectTitleColor]; - _titleView.titleFont = [UIFont systemFontOfSize:13 weight:UIFontWeightSemibold]; - _titleView.titleSelectedFont = [UIFont systemFontOfSize:13 weight:UIFontWeightSemibold]; - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.cellSpacing = 10; - _titleView.cellWidthIncrement = 5; -// _titleView.cellWidth = 30; - _titleView.listContainer = self.pi_containerView; - - } - return _titleView; -} - -- (JXCategoryListContainerView *)pi_containerView { - if (!_pi_containerView) { - _pi_containerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _pi_containerView.defaultSelectedIndex = 0; - _pi_containerView.scrollView.tag = 1009; - _pi_containerView.scrollView.scrollEnabled = NO; - } - return _pi_containerView; -} - -- (UIButton *)packGiftButton { - if (!_packGiftButton) { - _packGiftButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_packGiftButton setBackgroundImage:[UIImage imageNamed:@"gift_bag_icon"] forState:UIControlStateNormal]; - _packGiftButton.tag = GiftSegmentType_Pack; - [_packGiftButton addTarget:self action:@selector(didClickGiftSegmentAction:) forControlEvents:UIControlEventTouchUpInside]; - [_packGiftButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _packGiftButton; -} -- (XPGiftInfoView *)packGiftView{ - if(!_packGiftView){ - _packGiftView = [[XPGiftInfoView alloc]initWithFrame:CGRectZero]; - _packGiftView.segmentType = GiftSegmentType_Pack; - _packGiftView.delegate = self; - _packGiftView.hidden = YES; - } - return _packGiftView; -} -- (UIImageView *)segmentBgView { - if (!_segmentBgView) { - _segmentBgView = [[UIImageView alloc] init]; - _segmentBgView.userInteractionEnabled = YES; - _segmentBgView.contentMode = UIViewContentModeScaleAspectFill; - _segmentBgView.image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor colorWithHexString:@"#E5FFFF"], [DJDKMIMOMColor colorWithHexString:@"#FFFFFF"]] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(KScreenWidth, 44)]; - _segmentBgView.hidden = YES; - - } - return _segmentBgView; -} -- (XPGiftInfoView *)normalVC{ - if(!_normalVC){ - _normalVC = [[XPGiftInfoView alloc]init]; - _normalVC.delegate = self; - _normalVC.segmentType = GiftSegmentType_Normal; - } - return _normalVC;; -} - -- (XPGiftInfoView *)luckyVC{ - if(!_luckyVC){ - _luckyVC = [[XPGiftInfoView alloc]init]; - _luckyVC.delegate = self; - _luckyVC.segmentType = GiftSegmentType_Lucky; - } - return _luckyVC; -} -- (XPGiftInfoView *)weekStarVC{ - if(!_weekStarVC){ - _weekStarVC = [[XPGiftInfoView alloc]init]; - _weekStarVC.delegate = self; - _weekStarVC.segmentType = GiftSegmentType_WeekStar; - } - return _weekStarVC; -} -- (XPGiftInfoView *)nobleVC{ - if(!_nobleVC){ - _nobleVC = [[XPGiftInfoView alloc]init]; - _nobleVC.delegate = self; - _nobleVC.segmentType = GiftSegmentType_Noble; - } - return _nobleVC; -} --(XPGiftInfoView *)anchorVC{ - if(!_anchorVC){ - _anchorVC = [[XPGiftInfoView alloc]init]; - _anchorVC.delegate = self; - _anchorVC.segmentType = GiftSegmentType_Anchor; - } - return _anchorVC; -} --(XPGiftInfoView *)superLuckyVC{ - if(!_superLuckyVC){ - _superLuckyVC = [[XPGiftInfoView alloc]init]; - _superLuckyVC.delegate = self; - _superLuckyVC.segmentType = GiftSegmentType_SuperLucky; - } - return _superLuckyVC; -} --(XPGiftInfoView *)lucky25VC{ - if(!_lucky25VC){ - _lucky25VC = [[XPGiftInfoView alloc]init]; - _lucky25VC.delegate = self; - _lucky25VC.segmentType = GiftSegmentType_SuperLucky; - } - return _lucky25VC; -} --(XPGiftInfoView *)countryVC{ - if(!_countryVC){ - _countryVC = [[XPGiftInfoView alloc]init]; - _countryVC.delegate = self; - _countryVC.segmentType = GiftSegmentType_Country; - } - return _countryVC; -} --(XPGiftInfoView *)cpVC{ - if(!_cpVC){ - _cpVC = [[XPGiftInfoView alloc]init]; - _cpVC.delegate = self; - _cpVC.segmentType = GiftSegmentType_CP; - } - return _cpVC; -} --(XPGiftInfoView *)bravoVC{ - if(!_bravoVC){ - _bravoVC = [[XPGiftInfoView alloc]init]; - _bravoVC.delegate = self; - _bravoVC.segmentType = GiftSegmentType_Bravo; - } - return _bravoVC; -} --(XPGiftInfoView *)customVC{ - if(!_customVC){ - _customVC = [[XPGiftInfoView alloc]init]; - _customVC.delegate = self; - _customVC.segmentType = GiftSegmentType_Custom; - } - return _customVC; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftSuperGiftBroadcastView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftSuperGiftBroadcastView.h deleted file mode 100644 index bbe0212..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftSuperGiftBroadcastView.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// PIGiftSuperGiftBroadcastView.h -// YuMi -// -// Created by duoban on 2024/3/21. -// - -#import -#import "GiftInfoModel.h" -NS_ASSUME_NONNULL_BEGIN -@protocol PIGiftSuperGiftBroadcastViewDelegate - -///点击了玩法说明 -- (void)pIGiftSuperGiftBroadcastViewClickWithModel:(GiftInfoModel *)giftModel; - -@end -@interface PIGiftSuperGiftBroadcastView : UIView -@property(nonatomic,strong) GiftInfoModel *giftModel; -@property(nonatomic,weak) iddelegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftSuperGiftBroadcastView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftSuperGiftBroadcastView.m deleted file mode 100644 index b5a55dd..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftSuperGiftBroadcastView.m +++ /dev/null @@ -1,64 +0,0 @@ -// -// PIGiftSuperGiftBroadcastView.m -// YuMi -// -// Created by duoban on 2024/3/21. -// - -#import "PIGiftSuperGiftBroadcastView.h" -@interface PIGiftSuperGiftBroadcastView() -@property(nonatomic,strong) NetImageView *bgImageView; -@property(nonatomic,strong) UIButton *clickBtn; -@end -@implementation PIGiftSuperGiftBroadcastView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.bgImageView]; - [self addSubview:self.clickBtn]; -} --(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; -} --(void)setGiftModel:(GiftInfoModel *)giftModel{ - _giftModel = giftModel; - _bgImageView.imageUrl = _giftModel.bannerUrl; - -} --(void)clickBtnAction{ - if ([NSString isEmpty:_giftModel.bannerUrl]) { - return; - } - if (self.delegate && [self.delegate respondsToSelector:@selector(pIGiftSuperGiftBroadcastViewClickWithModel:)]){ - [self.delegate pIGiftSuperGiftBroadcastViewClickWithModel:self.giftModel]; - } -} -#pragma mark - 懒加载 -- (NetImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [NetImageView new]; - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} -- (UIButton *)clickBtn{ - if(!_clickBtn){ - _clickBtn = [UIButton new]; - [_clickBtn addTarget:self action:@selector(clickBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _clickBtn; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.h deleted file mode 100644 index db2db31..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.h +++ /dev/null @@ -1,43 +0,0 @@ -// -// YMGiftBottomView.h -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import -#import "XPGiftInfoView.h" -NS_ASSUME_NONNULL_BEGIN -@class XPGiftBarView, XPGiftCountModel, WalletInfoModel, UserInfoModel; -@protocol XPGiftBarViewDelegate -///点击了充值的 -- (void)xPGiftBarViewDidClickRecharge:(XPGiftBarView *)view;; -///点击了送礼物的的 -- (void)xPGiftBarView:(XPGiftBarView *)view didClickSendGift:(XPGiftCountModel *)giftCount; -///点击了首充 -- (void)xPGiftBarViewDidClickFirstRecharge:(XPGiftBarView *)view;; -@end - -@interface XPGiftBarView : UIView -///使用的地方 -@property (nonatomic,assign) SendGiftType usingplaceType; -///涂鸦礼物的个数 -@property (nonatomic,assign) NSInteger drawGiftCount; -///代理 -@property (nonatomic,weak) id delegate; -///不同的tabbar -@property (nonatomic,assign) GiftSegmentType type; - -///更新礼物个数 -@property (nonatomic,strong) XPGiftCountModel *giftCountModel; -///钱包信息 -@property (nonatomic,strong) WalletInfoModel *walletInfoModel; - -///是否可用 -@property (nonatomic,assign) BOOL sendButtonIsEnable; - -@property(nonatomic, strong) UserInfoModel *userInfo; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m deleted file mode 100644 index 340abc1..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m +++ /dev/null @@ -1,586 +0,0 @@ -// -// YMGiftBottomView.m -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import "XPGiftBarView.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "ThemeColor+SendGift.h" -#import "UIImage+Utils.h" -///Model -#import "XPGiftCountModel.h" -#import "WalletInfoModel.h" -///View -#import "XPGiftCountCollectionViewCell.h" -#import "XPGiftCountView.h" - -#import "MoliMoneyLabel.h" -#import "FirstRechargeManager.h" - -@interface XPGiftBarView () - -///余额 -@property (nonatomic,strong) UILabel *balanceLabel; -/// -@property (nonatomic,strong) UIStackView *rechargeStackView; -///充值 -@property (nonatomic,strong) UILabel *rechargeLabel; -///去充值 -@property (nonatomic,strong) UIImageView *rechageImageView; -//赠送 -@property (nonatomic,strong) UIStackView *sendOperationView; -///个数 -@property (nonatomic,strong) UILabel *countLabel; -///箭头 -@property (nonatomic,strong) UIButton *arrowButton; -///赠送 -@property (nonatomic,strong) UIButton *sendGiftButton; - -///自定义个数 -@property (nonatomic,strong) UIView *customCountView; -//输入框 -@property (nonatomic, strong) MSBaseTextField *editTextFiled; -//发送按钮 -@property (nonatomic, strong) UIButton *sureButton; -///送礼物的个数 -@property (nonatomic,strong) XPGiftCountView *giftCountView; - -@property (nonatomic, strong) UIView *firstChargeView; -@property (nonatomic, strong) MoliMoneyLabel *moneyLabel; - -@end - -@implementation XPGiftBarView - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - [self addNotificationCenter]; - [self initEvents]; - self.type = GiftSegmentType_Normal; - } - return self; -} - -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - if (_giftCountView) { - - } -} -#pragma mark - Response -- (void)sendButtonAction:(UIButton *)sender { - if (self.type == GiftSegmentType_Graffiti && self.drawGiftCount < 10) { - return; - } - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftBarView:didClickSendGift:)]) { - [self.delegate xPGiftBarView:self didClickSendGift:self.giftCountModel]; - } -} - -- (void)didTagRecharge:(UITapGestureRecognizer *)tap { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftBarViewDidClickRecharge:)]) { - [self.delegate xPGiftBarViewDidClickRecharge:self]; - } -} - -- (void)arrowButtonAction:(UIButton *)sender { - if (![[self.superview.superview subviews] containsObject:self.giftCountView]) { - [self.superview.superview addSubview:self.giftCountView]; - - [self.giftCountView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-15); - make.bottom.mas_equalTo(self.superview.superview.mas_bottom).offset(-45 -kSafeAreaBottomHeight); - make.width.mas_equalTo(160); - }]; - } - [self updateCountStatus]; -} - -- (void)sureButtonAction:(UIButton *)sender { - NSString *countStr = [self.editTextFiled.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; - if (countStr.integerValue == 0) { - countStr = @"1"; - } - [self.editTextFiled resignFirstResponder]; - self.editTextFiled.text = @""; - self.giftCountModel.giftNumber = countStr; - self.countLabel.text = countStr; -} - - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor= [UIColor clearColor]; - [self addSubview:self.balanceLabel]; - [self addSubview:self.rechargeStackView]; - [self addSubview:self.firstChargeView]; - [self addSubview:self.sendOperationView]; - - [self.rechargeStackView addArrangedSubview:self.rechargeLabel]; - [self.rechargeStackView addArrangedSubview:self.rechageImageView]; - - [self.sendOperationView addArrangedSubview:self.countLabel]; - [self.sendOperationView addArrangedSubview:self.arrowButton]; - [self.sendOperationView addArrangedSubview:self.sendGiftButton]; - - [self.customCountView addSubview:self.editTextFiled]; - [self.customCountView addSubview:self.sureButton]; - - FirstRechargeModel *model = [[FirstRechargeManager sharedManager] loadCurrentModel]; - if (model && model.chargeStatus == NO) { - self.firstChargeView.hidden = NO; - [self.moneyLabel updateContent:YMLocalizedString(@"20.20.61_text_19")]; - } else { - self.firstChargeView.hidden = YES; - } -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(45); - }]; - - - [self.balanceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(15); - make.centerY.mas_equalTo(self.sendOperationView); - }]; - - [self.rechargeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.sendOperationView); - make.leading.mas_equalTo(self.balanceLabel.mas_trailing).offset(12); - }]; - - [self.firstChargeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(23); - make.leading.mas_equalTo(self.rechargeStackView.mas_leading); - make.centerY.mas_equalTo(self.rechargeStackView); - if (isMSZH()) { - make.width.mas_equalTo(80); - } else if (isMSRTL()) { - make.width.mas_equalTo(76); - } else if (isMSTR()) { - make.width.mas_equalTo(70); - } else { - make.width.mas_equalTo(70); - } - }]; - - [self.sendOperationView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self).offset(-15); - make.bottom.mas_equalTo(-11); - make.height.mas_equalTo(30); - }]; - - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(40); - make.height.mas_equalTo(30); - }]; - - [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(30, 30)); - }]; - - [self.sendGiftButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(67, 30)); - }]; - - [self.editTextFiled mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.customCountView).offset(15); - make.trailing.mas_equalTo(self.sureButton.mas_leading).offset(-10); - make.top.bottom.mas_equalTo(self.customCountView); - }]; - - [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - make.width.mas_equalTo(@50); - make.centerY.mas_equalTo(self.customCountView); - make.trailing.mas_equalTo(self.customCountView).offset(-15); - }]; -} - -- (void)initEvents { - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTagRecharge:)]; - [self.rechargeStackView addGestureRecognizer:tap]; -} - -- (void)keyboardWillShow:(NSNotification *)notification { - CGRect keyboardRect = [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]; - CGFloat height = CGRectGetMinY(keyboardRect) - KScreenHeight; - if (height < 0) { - [UIView animateWithDuration:0.25 animations:^{ - CGRect rect = self.customCountView.superview.superview.frame; - rect.origin.y = height; - self.customCountView.superview.superview.frame = rect; - }]; - } -} - -//键盘隐藏 -- (void)keyboardWillHidden:(NSNotification *)notification { - [UIView animateWithDuration:0.25 animations:^{ - CGRect rect = self.customCountView.superview.superview.frame; - rect.origin.y = 0; - self.customCountView.superview.superview.frame = rect; - }]; - self.customCountView.hidden = YES; - self.editTextFiled.text = @""; -} - -- (void)addNotificationCenter { - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil]; -} - -- (void)updateCountStatus { - self.arrowButton.selected = !self.arrowButton.selected; - self.giftCountView.hidden = !self.arrowButton.selected; - [self.giftCountView reloadData]; -} - -#pragma mark - XPGiftCountViewDelegate -- (void)xPGiftCountView:(XPGiftCountView *)view didClickItem:(XPGiftCountModel *)model { - self.arrowButton.selected = NO; - self.giftCountView.hidden= YES; - self.giftCountModel = model; - if (model.isCustomCount) { - if (![[self.superview.superview subviews] containsObject:self.customCountView]) { - [self.superview.superview addSubview:self.customCountView]; - - [self.customCountView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.superview.superview); - make.height.mas_equalTo(40); - }]; - } - self.customCountView.hidden = NO; - [self.editTextFiled becomeFirstResponder]; - } -} - -#pragma mark - UITextFieldDelegate -- (BOOL)textFieldShouldReturn:(UITextField *)textField { - NSString *countStr = [self.editTextFiled.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; - NSInteger count = [countStr integerValue]; - if (count > 9999) { - return NO; - } - [self.editTextFiled resignFirstResponder]; - self.editTextFiled.text = @""; - self.giftCountModel.giftNumber = textField.text; - return YES; -} - -- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { - NSString *regex =@"[0-9]*"; - NSPredicate *pred = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",regex]; - if ([pred evaluateWithObject:string]) { - return YES; - } - return NO; -} -#pragma mark - Getters And Setters -- (void)setUsingplaceType:(SendGiftType)usingplaceType { - _usingplaceType = usingplaceType; - if (_usingplaceType == SendGiftType_User) { - self.countLabel.textColor = [DJDKMIMOMColor mainTextColor]; - [self.arrowButton setImage:[UIImage imageNamed:@"gift_bar_white_count_arrow"] forState:UIControlStateNormal]; - [self.arrowButton setImage:[UIImage imageNamed:@"gift_bar_white_count_up_arrow"] forState:UIControlStateSelected]; - } else { - self.countLabel.textColor = [DJDKMIMOMColor giftCountTitleColor]; - [self.arrowButton setImage:[UIImage imageNamed:@"gift_bar_count_arrow"] forState:UIControlStateNormal]; - [self.arrowButton setImage:[UIImage imageNamed:@"gift_bar_count_up_arrow"] forState:UIControlStateSelected]; - } -} - -- (void)setDrawGiftCount:(NSInteger)drawGiftCount { - _drawGiftCount = drawGiftCount; - if (_drawGiftCount >= 10) { - self.sendGiftButton.selected = NO; - self.sendOperationView.layer.borderWidth = 1; - } else { - self.sendGiftButton.selected = YES; - self.sendOperationView.layer.borderWidth = 0; - } -} - -- (void)setSendButtonIsEnable:(BOOL)sendButtonIsEnable { - _sendButtonIsEnable = sendButtonIsEnable; - [UIView animateWithDuration:0.3 animations:^{ - self.sendGiftButton.enabled = self.sendButtonIsEnable; - }]; -} - -- (void)setType:(GiftSegmentType)type { - _type = type; - if (!self.giftCountView.hidden) { - self.giftCountView.hidden = YES; - self.arrowButton.selected = NO; - } else { - if (_type == GiftSegmentType_Graffiti) { - self.countLabel.hidden = YES; - self.arrowButton.hidden = YES; - } else { - self.countLabel.hidden = NO; - self.arrowButton.hidden = NO; - } - } - self.giftCountView.segmentType = type; -} - -- (void)setGiftCountModel:(XPGiftCountModel *)giftCountModel { - _giftCountModel = giftCountModel; - self.arrowButton.selected = NO; - if (_giftCountModel) { - self.countLabel.text = _giftCountModel.giftNumber; - } -} - -- (void)setWalletInfoModel:(WalletInfoModel *)walletInfoModel { - _walletInfoModel = walletInfoModel; - if (_walletInfoModel) { - NSString * diamonds = [NSString stringByRemovingRedundantZeros:_walletInfoModel.diamonds]; - UIColor * normaleColor = [DJDKMIMOMColor giftBalanceColor]; - UIColor * highlightColor =[DJDKMIMOMColor giftCountTitleColor]; - if (_usingplaceType == SendGiftType_User) { - normaleColor = [DJDKMIMOMColor textThirdColor]; - highlightColor = [DJDKMIMOMColor giftNameSelectColor]; - } - NSTextAttachment * diamondAtt = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"moli_money_icon"];; - diamondAtt.bounds = CGRectMake(0, roundf(self.balanceLabel.font.capHeight - 16)/2.f, 16, 16); - diamondAtt.image = iconImage; - NSAttributedString *diamondAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)diamondAtt]; - - if (_walletInfoModel.canGoldSendGift == NO){ - NSString * title = [NSString stringWithFormat:@" %@",diamonds]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:highlightColor}]; - [attribute insertAttributedString:diamondAttribute atIndex:0]; - self.balanceLabel.attributedText = attribute; - return; - } - NSTextAttachment * addAtt = [[NSTextAttachment alloc] init]; - UIImage *addIconImage = [UIImage imageNamed:@"pi_gift_diamond_add"];; - addAtt.bounds = CGRectMake(0, roundf(self.balanceLabel.font.capHeight - 14)/2.f, 14, 14); - addAtt.image = addIconImage; - NSAttributedString *addAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)addAtt]; - - NSTextAttachment * goldAtt = [[NSTextAttachment alloc] init]; - UIImage *goldIconImage = [UIImage imageNamed:@"common_diamond"];; - goldAtt.bounds = CGRectMake(0, roundf(self.balanceLabel.font.capHeight - 14)/2.f, 14, 14); - goldAtt.image = goldIconImage; - NSAttributedString *goldAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)goldAtt]; - int64_t getGolds = (int64_t)_walletInfoModel.golds; - double amount = getGolds + diamonds.doubleValue; - NSString * title = [NSString stringWithFormat:@" %.0f",amount]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:highlightColor}]; - [attribute insertAttributedString:diamondAttribute atIndex:0]; - [attribute insertAttributedString:addAttribute atIndex:1]; - [attribute insertAttributedString:goldAttribute atIndex:2]; - self.balanceLabel.attributedText = attribute; - } -} - -- (UILabel *)balanceLabel { - if (!_balanceLabel) { - _balanceLabel = [[UILabel alloc] init]; - _balanceLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _balanceLabel.font = [UIFont systemFontOfSize:16]; - } - return _balanceLabel; -} - -- (UIStackView *)rechargeStackView { - if (!_rechargeStackView) { - _rechargeStackView = [[UIStackView alloc] init]; - _rechargeStackView.axis = UILayoutConstraintAxisHorizontal; - _rechargeStackView.distribution = UIStackViewDistributionFill; - _rechargeStackView.alignment = UIStackViewAlignmentCenter; - _rechargeStackView.spacing = 1; - } - return _rechargeStackView; -} - -- (UILabel *)rechargeLabel { - if (!_rechargeLabel) { - _rechargeLabel = [[UILabel alloc] init]; - _rechargeLabel.text = YMLocalizedString(@"XPGiftBarView1"); - _rechargeLabel.font = [UIFont systemFontOfSize:12]; - _rechargeLabel.textColor = [DJDKMIMOMColor giftRechargeColor]; - } - return _rechargeLabel; -} - -- (UIImageView *)rechageImageView { - if (!_rechageImageView) { - _rechageImageView = [[UIImageView alloc] init]; - _rechageImageView.userInteractionEnabled = YES; - _rechageImageView.image = [[UIImage imageNamed:@"gift_bar_recharge_arrow"]ms_SetImageForRTL]; - } - return _rechageImageView; -} - - -- (UIStackView *)sendOperationView { - if (!_sendOperationView) { - _sendOperationView = [[UIStackView alloc] init]; - _sendOperationView.axis = UILayoutConstraintAxisHorizontal; - _sendOperationView.distribution = UIStackViewDistributionFill; - _sendOperationView.alignment = UIStackViewAlignmentCenter; - _sendOperationView.spacing = 0; - _sendOperationView.layer.masksToBounds = YES; - _sendOperationView.layer.cornerRadius = 15; - _sendOperationView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - _sendOperationView.layer.borderWidth = 1; - } - return _sendOperationView; -} - - -- (UILabel *)countLabel { - if (!_countLabel) { - _countLabel = [[UILabel alloc] init]; - _countLabel.textAlignment = NSTextAlignmentCenter; - _countLabel.textColor = [DJDKMIMOMColor giftCountTitleColor]; - _countLabel.text = @"1"; - _countLabel.font = [UIFont systemFontOfSize:13]; - _countLabel.textAlignment = NSTextAlignmentCenter; - _countLabel.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(arrowButtonAction:)]; - [_countLabel addGestureRecognizer:tap]; - } - return _countLabel; -} - -- (UIButton *)arrowButton { - if (!_arrowButton) { - _arrowButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_arrowButton setImage:[UIImage imageNamed:@"gift_bar_count_arrow"] forState:UIControlStateNormal]; - [_arrowButton setImage:[UIImage imageNamed:@"gift_bar_count_up_arrow"] forState:UIControlStateSelected]; - [_arrowButton addTarget:self action:@selector(arrowButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _arrowButton; -} - -- (UIButton *)sendGiftButton { - if (!_sendGiftButton) { - _sendGiftButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_sendGiftButton setTitle:YMLocalizedString(@"XPGiftBarView2") forState:UIControlStateNormal]; - [_sendGiftButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_sendGiftButton setTitle:YMLocalizedString(@"XPGiftBarView3" ) forState:UIControlStateDisabled]; - [_sendGiftButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateDisabled]; - [_sendGiftButton setTitle:YMLocalizedString(@"XPGiftBarView4") forState:UIControlStateSelected]; - [_sendGiftButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateSelected]; - [_sendGiftButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xE29030), UIColorFromRGB(0xFCC074)] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(10, 10)] - forState:UIControlStateNormal]; - [_sendGiftButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor disableButtonColor], [DJDKMIMOMColor disableButtonColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateDisabled]; - [_sendGiftButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor disableButtonColor], [DJDKMIMOMColor disableButtonColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateSelected]; - _sendGiftButton.titleLabel.font = [UIFont systemFontOfSize:14]; - _sendGiftButton.layer.masksToBounds = YES; - _sendGiftButton.layer.cornerRadius = 15; - [_sendGiftButton addTarget:self action:@selector(sendButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _sendGiftButton; -} - - -- (MSBaseTextField *)editTextFiled { - if (!_editTextFiled) { - _editTextFiled = [[MSBaseTextField alloc] init]; - NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPGiftBarView5") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:17], NSForegroundColorAttributeName:[DJDKMIMOMColor secondTextColor]}]; - _editTextFiled.attributedPlaceholder = attribute; - _editTextFiled.borderStyle = UITextBorderStyleNone; - _editTextFiled.returnKeyType = UIReturnKeyDone; - _editTextFiled.delegate = self; - _editTextFiled.textColor = [DJDKMIMOMColor secondTextColor]; - _editTextFiled.keyboardType = UIKeyboardTypeNumberPad; - } - return _editTextFiled; -} - -- (UIButton *)sureButton { - if (!_sureButton) { - _sureButton = [[UIButton alloc] init]; - [_sureButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - _sureButton.titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _sureButton.titleLabel.font = [UIFont systemFontOfSize:15]; - _sureButton.backgroundColor = [DJDKMIMOMColor appMainColor]; - _sureButton.layer.cornerRadius = 5.0; - _sureButton.layer.masksToBounds = YES; - [_sureButton addTarget:self action:@selector(sureButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _sureButton; -} - - -- (UIView *)customCountView { - if (!_customCountView) { - _customCountView = [[UIView alloc] init]; - _customCountView.backgroundColor = [UIColor whiteColor]; - } - return _customCountView; -} - -- (XPGiftCountView *)giftCountView { - if (!_giftCountView) { - _giftCountView = [[XPGiftCountView alloc] initWithFrame:CGRectZero userInfo:self.userInfo]; - _giftCountView.delegate = self; - _giftCountView.hidden = YES; - } - return _giftCountView; -} - -- (UIView *)firstChargeView { - if (!_firstChargeView) { - _firstChargeView = [[UIView alloc] init]; - _firstChargeView.userInteractionEnabled = YES; - [_firstChargeView addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xFFE347), - UIColorFromRGB(0xFF9a51), - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 0.5) cornerRadius:23/2]; - [_firstChargeView setCornerRadius:23/2]; - - [_firstChargeView addSubview:self.moneyLabel]; - [self.moneyLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(_firstChargeView).insets(UIEdgeInsetsMake(5, 5, 5, 10)); - }]; - - UIImageView *arrow = [[UIImageView alloc] initWithImage:[kImage(@"brown_arrow") ms_SetImageForRTL]]; - [_firstChargeView addSubview:arrow]; - [arrow mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(_firstChargeView); - if (isMSRTL()) { - make.leading.mas_equalTo(self.moneyLabel.mas_trailing).offset(-10); - }else { - make.leading.mas_equalTo(self.moneyLabel.mas_trailing).offset(-5); - } - make.size.mas_equalTo(CGSizeMake(12, 12)); - }]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTagRecharge:)]; - [_firstChargeView addGestureRecognizer:tap]; - } - return _firstChargeView; -} - -- (MoliMoneyLabel *)moneyLabel { - if (!_moneyLabel) { - _moneyLabel = [MoliMoneyLabel moneyLabelWithTextColot:UIColorFromRGB(0x582B00) font:kFontSemibold(12) moneyPostion:1 moneySize:CGSizeMake(15, 15)]; - } - return _moneyLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftCountView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftCountView.h deleted file mode 100644 index effa232..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftCountView.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMGiftCountView.h -// YUMI -// -// Created by YUMI on 2021/11/11. -// - -#import -#import "XPGiftInfoView.h" -NS_ASSUME_NONNULL_BEGIN -@class XPGiftCountView,XPGiftCountModel,UserInfoModel; -@protocol XPGiftCountViewDelegate - -///点击了多个个 -- (void)xPGiftCountView:(XPGiftCountView *)view didClickItem:(XPGiftCountModel *)model; - -@end - -@interface XPGiftCountView : UIView - -- (instancetype)initWithFrame:(CGRect)frame userInfo:(UserInfoModel *)userInfo; - -///代理 -@property (nonatomic,weak) id delegate; -/// -@property (nonatomic,assign) GiftSegmentType segmentType; - --(void)reloadData; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftCountView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftCountView.m deleted file mode 100644 index 6c2fcde..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftCountView.m +++ /dev/null @@ -1,188 +0,0 @@ -// -// YMGiftCountView.m -// YUMI -// -// Created by YUMI on 2021/11/11. -// - -#import "XPGiftCountView.h" -///Third -#import -#import "NSArray+Safe.h" -#import "RoomResourceManager.h" -///Model -#import "XPGiftCountModel.h" -#import "UserInfoModel.h" -///View -#import "XPGiftCountCollectionViewCell.h" -#import "XPSkillCardPlayerManager.h" -@interface XPGiftCountView () -//列表 -@property (nonatomic,strong) UICollectionView *countCollectionView; -///礼物数量数据源 -@property (nonatomic, strong) NSArray *giftCountArray; -/// -@property (nonatomic,strong) UIVisualEffectView *effectView; - -@property(nonatomic, strong) UserInfoModel *userInfo; -@end - -@implementation XPGiftCountView - -- (instancetype)initWithFrame:(CGRect)frame userInfo:(nonnull UserInfoModel *)userInfo { - self = [super initWithFrame:frame]; - if (self) { - if (userInfo == nil) { - userInfo = [[XPSkillCardPlayerManager shareInstance] userInfoModel]; - } - self.userInfo = userInfo; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - // 设置毛玻璃效果 - self.layer.cornerRadius = 12; - self.layer.masksToBounds = YES; - UIBlurEffect *blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; - UIVisualEffectView *effectView = [[UIVisualEffectView alloc] initWithEffect:blurEffect]; - self.effectView = effectView; - [self addSubview:effectView]; - self.giftCountArray = [self normalGiftCountDataArray]; - [self addSubview:self.countCollectionView]; - -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(0); - }]; - - [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - [self.countCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; -} - -///普通礼物的 个数的数据源 -- (NSArray *)normalGiftCountDataArray { - NSMutableArray * datasource = [NSMutableArray array]; - NSArray * array = [self commonGiftCountDataArray]; - [datasource addObjectsFromArray:array]; - return [datasource copy]; -} - -///背包礼物的数据源 -- (NSArray *)packGiftCountDataArray { - NSMutableArray * datasource = [NSMutableArray array]; - XPGiftCountModel *_allDic = [XPGiftCountModel initCountModel:@"" giftNumber:@"all"]; - _allDic.isOnlyNum = YES; - _allDic.isTotal = YES; - NSArray * array = [self commonGiftCountDataArray]; - [datasource addObjectsFromArray:array]; - [datasource addObject:_allDic]; - return [datasource copy]; -} - -///一些公用的数据 -- (NSArray *)commonGiftCountDataArray { - NSMutableArray *arr = @[].mutableCopy; - - if (self.userInfo) { - NSString *tempString = [[RoomResourceManager sharedManager] loadGiftPanelNum:self.userInfo.partitionId.integerValue]; - if (![NSString isEmpty:tempString]) { - NSArray *tempArr = [tempString componentsSeparatedByString:@","]; - for (NSString *num in tempArr) { - XPGiftCountModel *model = [XPGiftCountModel initCountModel:@"" giftNumber:num]; - model.isOnlyNum = YES; - [arr addObject:model]; - } - } - } - - if (arr.count == 0) { - [arr addObjectsFromArray:[self defaultCommonGiftCountDataArray]]; - } - - return arr.copy; -} - -- (NSArray *)defaultCommonGiftCountDataArray { - XPGiftCountModel *_1Dic = [XPGiftCountModel initCountModel:@"" giftNumber:@"1"]; - _1Dic.isOnlyNum = YES; - XPGiftCountModel *_7Dic = [XPGiftCountModel initCountModel:@"" giftNumber:@"7"]; - _7Dic.isOnlyNum = YES; - XPGiftCountModel *_17Dic = [XPGiftCountModel initCountModel:@"" giftNumber:@"17"]; - _17Dic.isOnlyNum = YES; - return @[_1Dic, _7Dic, _17Dic]; -} - -#pragma mark - UICollectionViewDelegate && UICollectionViewDataSource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.giftCountArray.count; -} - -- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPGiftCountCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGiftCountCollectionViewCell class]) forIndexPath:indexPath]; - XPGiftCountModel *countItem = [self.giftCountArray xpSafeObjectAtIndex:indexPath.item]; - cell.countModel = countItem; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftCountView:didClickItem:)]) { - XPGiftCountModel *countItem = [self.giftCountArray xpSafeObjectAtIndex:indexPath.item]; - [self.delegate xPGiftCountView:self didClickItem:countItem]; - } -} - -- (void)setSegmentType:(GiftSegmentType)segmentType { - _segmentType = segmentType; - if (_segmentType == GiftSegmentType_Pack) { - self.giftCountArray = [self packGiftCountDataArray]; - } else { - self.giftCountArray = [self normalGiftCountDataArray]; - } - - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftCountView:didClickItem:)]) { - XPGiftCountModel *countItem = [self.giftCountArray xpSafeObjectAtIndex:0]; - [self.delegate xPGiftCountView:self didClickItem:countItem]; - } - - [self mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(28 * self.giftCountArray.count + 10); - }]; - - - [self.countCollectionView reloadData]; -} - --(void)reloadData{ - [self.countCollectionView reloadData]; -} - -#pragma mark - Getters And Setters -- (UICollectionView *)countCollectionView{ - if (!_countCollectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(160, 28); - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 0; - layout.sectionInset = UIEdgeInsetsMake(3, 0, 3, 0); - _countCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _countCollectionView.dataSource = self; - _countCollectionView.delegate = self; - _countCollectionView.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.1]; - [_countCollectionView registerClass:[XPGiftCountCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGiftCountCollectionViewCell class])]; - } - return _countCollectionView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.h deleted file mode 100644 index e44b18d..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// YMGiftHeadTypeView.h -// YUMI -// -// Created by YUMI on 2022/9/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class XPGiftHeadTypeView; -@protocol XPGiftHeadTypeViewDelegate - -///点击了VIP -- (void)xPGiftHeadTypeViewDidClickNoble:(XPGiftHeadTypeView *)view; -///点击了首充 -- (void)xPGiftHeadTypeViewDidClickFirstRecharge:(XPGiftHeadTypeView *)view; -///点击了礼物 -- (void)xPGiftHeadTypeViewDidClickGift:(XPGiftHeadTypeView *)view; -///点击了互动 -- (void)xPGiftHeadTypeViewDidClickInteraction:(XPGiftHeadTypeView *)view; - -@end - -@interface XPGiftHeadTypeView : UIView - -///是否展示首充 -@property (nonatomic,assign) BOOL isShowFirstRecharge; - -@property (nonatomic, weak) id delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m deleted file mode 100644 index e2ef3ea..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m +++ /dev/null @@ -1,227 +0,0 @@ -// -// YMGiftHeadTypeView.m -// YUMI -// -// Created by YUMI on 2022/9/29. -// - -#import "XPGiftHeadTypeView.h" -///Third -#import -#import -/// -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" - -static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否隐藏互动红点 - -@interface XPGiftHeadTypeView() - -///礼物 -@property (nonatomic, strong) UIButton *giftButton; - -///分割线 -@property (nonatomic, strong) UIView *bottomDevideView; -///箭头 -//@property (nonatomic, strong) UIImageView *arrowImageView; - - -///轮播图 -@property (nonatomic,strong) SDCycleScrollView *pi_BannerView; - -@property (nonatomic, strong) NSMutableArray *titleArray; - -@end - -@implementation XPGiftHeadTypeView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.titleArray = [[NSMutableArray alloc]initWithArray:@[YMLocalizedString(@"XPGiftHeadTypeView4")]]; - - self.pi_BannerView.imageURLStringsGroup = @[[UIImage getLanguageText:@"room_gift_noble_entrance"]]; - [self addSubview:self.giftButton]; -// [self addSubview:self.devideView]; -// [self addSubview:self.interactButton]; - -// [self addSubview:self.arrowImageView]; - [self addSubview:self.pi_BannerView]; - [self addSubview:self.bottomDevideView]; - -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(44); - }]; - - [self.giftButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.centerY.mas_equalTo(self); - make.width.mas_greaterThanOrEqualTo(40); - }]; -// [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.bottom.mas_equalTo(self.bottomDevideView.mas_top); -// make.centerX.mas_equalTo(self.giftButton); -// make.size.mas_equalTo(CGSizeMake(9, 7)); -// }]; -// [self.interactButton mas_makeConstraints:^(MASConstraintMaker *make) { -// make.centerY.mas_equalTo(self); -// make.leading.mas_equalTo(self.devideView.mas_trailing).mas_offset(8); -// make.width.mas_equalTo(40); -// }]; - - - -// [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.centerY.mas_equalTo(self); -// make.leading.mas_equalTo(self.giftButton.mas_trailing).mas_offset(8); -// make.width.mas_equalTo(1); -// make.height.mas_equalTo(10); -// }]; - - [self.bottomDevideView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self); - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(1); - }]; - - [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-16); - make.centerY.mas_equalTo(self); - make.width.mas_equalTo(70); - make.height.mas_equalTo(30); - }]; -} - -#pragma mark - SDCycleScrollViewDelegate -- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index { - if (self.titleArray.count > index) { - NSString *str = [self.titleArray xpSafeObjectAtIndex:index]; - if([str isEqualToString:YMLocalizedString(@"XPGiftHeadTypeView0")]) { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftHeadTypeViewDidClickFirstRecharge:)]) { - [self.delegate xPGiftHeadTypeViewDidClickFirstRecharge:self]; - } - } else { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftHeadTypeViewDidClickNoble:)]) { - [self.delegate xPGiftHeadTypeViewDidClickNoble:self]; - } - } - } -} - -#pragma mark - Response -- (void)giftButtonAction:(UIButton *)sender { - if (!sender.isSelected) { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftHeadTypeViewDidClickGift:)]) { - [self.delegate xPGiftHeadTypeViewDidClickGift:self]; - } - } - sender.selected = YES; - - sender.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; -// [self.arrowImageView mas_remakeConstraints:^(MASConstraintMaker *make) { -// make.bottom.mas_equalTo(self.bottomDevideView.mas_top); -// make.centerX.mas_equalTo(self.giftButton); -// make.size.mas_equalTo(CGSizeMake(9, 7)); -// }]; -} - -- (void)interactButtonAction:(UIButton *)sender { - if (!sender.isSelected) { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftHeadTypeViewDidClickInteraction:)]) { - [self.delegate xPGiftHeadTypeViewDidClickInteraction:self]; - } - } - sender.selected = YES; - self.giftButton.selected = NO; - - - sender.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; - self.giftButton.titleLabel.font = [UIFont systemFontOfSize:14]; - -// [self.arrowImageView mas_remakeConstraints:^(MASConstraintMaker *make) { -// make.bottom.mas_equalTo(self.bottomDevideView.mas_top); -// make.centerX.mas_equalTo(self.giftButton); -// make.size.mas_equalTo(CGSizeMake(9, 7)); -// }]; -} - -#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; - } -} - -#pragma mark - getter -- (UIButton *)giftButton { - if (!_giftButton) { - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - button.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; - [button addTarget:self action:@selector(giftButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [button setTitle:YMLocalizedString(@"XPGiftHeadTypeView2") forState:UIControlStateNormal]; - [button setTitleColor:[DJDKMIMOMColor secondTextColor] forState:UIControlStateNormal]; - [button setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; - button.selected = YES; - _giftButton = button; - } - return _giftButton; -} - -- (UIView *)bottomDevideView { - if (!_bottomDevideView) { - _bottomDevideView = [[UIView alloc] init]; - _bottomDevideView.backgroundColor = UIColorRGBAlpha(0xffffff, 0.1); - } - return _bottomDevideView; -} - -- (SDCycleScrollView *)pi_BannerView { - if (!_pi_BannerView) { - _pi_BannerView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero delegate:self placeholderImage:nil]; - _pi_BannerView.pageControlAliment = SDCycleScrollViewPageContolAlimentCenter; - _pi_BannerView.showPageControl = NO; - _pi_BannerView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.00]; - _pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFit; - _pi_BannerView.pageControlBottomOffset = -10; - _pi_BannerView.autoScrollTimeInterval = 5; - // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 - _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - for (UIView *subView in _pi_BannerView.subviews) { - subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - } - return _pi_BannerView; -} - -- (NSMutableArray *)titleArray { - if (!_titleArray) { - _titleArray = [NSMutableArray array]; - } - return _titleArray; -} - -//- (UIImageView *)arrowImageView { -// if (!_arrowImageView) { -// UIImageView *imageView = [[UIImageView alloc] init]; -// imageView.image = [UIImage imageNamed:@"room_gift_panel_arrow"]; -// -// _arrowImageView = imageView; -// } -// return _arrowImageView; -//} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.h deleted file mode 100644 index c6645fd..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.h +++ /dev/null @@ -1,72 +0,0 @@ -// -// YMGiftMiddleView.h -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import -#import "XPSendGiftView.h" -#import -///Model -#import "RoomInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, GiftSegmentType) { - GiftSegmentType_Normal = 0, ///普通的礼物 - GiftSegmentType_Lucky,///幸运礼物 - GiftSegmentType_WeekStar, ///周星礼物 - GiftSegmentType_Noble,///VIP礼物 - GiftSegmentType_Anchor,///个播 - GiftSegmentType_Pack,///背包礼物 - GiftSegmentType_Graffiti,///涂鸦礼物 - GiftSegmentType_Punish,///惩罚礼物 - GiftSegmentType_SuperLucky,///超级幸运礼物 - GiftSegmentType_Country,///国家礼物 - GiftSegmentType_CP,///cp礼物 - GiftSegmentType_Custom,///cp礼物 - GiftSegmentType_Bravo,///超级礼物 -}; - - -@class GiftInfoModel,XPGiftInfoView, GiftReceiveInfoModel; - -@protocol XPGiftInfoViewDelegate - - - -///点击了某个item -- (void)xPGiftInfoView:(XPGiftInfoView *)view didClickItem:(GiftInfoModel *)info type:(GiftSegmentType)type; - -@end - -@interface XPGiftInfoView : UIView -///使用的地方 -@property (nonatomic,assign) SendGiftType usingPlaceType; -///普通礼物/幸运礼物/VIP礼物 -@property (nonatomic,strong) NSArray *normalOriginArray; -///背包礼物 -@property (nonatomic,strong) NSArray *packOriginArray; - -///送背包礼物更新数据源 -- (void)updatePackSource:(GiftReceiveInfoModel *)giftReceiveInfo numberUser:(NSInteger)numberUser; -///代理 -@property (nonatomic,weak) id delegate; -///最后一次选中的礼物 -@property (nonatomic,strong,readonly) GiftInfoModel *lastSelectGift; -///当前用户VIP等级 -@property (nonatomic, assign) NSInteger curUserNobleLevel; - - -///免费礼物送完删除了，不能出现在背包，防止数据更新时重新加进来 -@property (nonatomic,assign) BOOL isDelFreeGift; -///免费礼物 - -@property (nonatomic,strong) XPFreeGiftModel *freeModel; - -///当前展示的数据的类型 -@property (nonatomic,assign) GiftSegmentType segmentType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.m deleted file mode 100644 index efdd91e..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.m +++ /dev/null @@ -1,347 +0,0 @@ -// -// YMGiftMiddleView.m -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import "XPGiftInfoView.h" -///Third -#import -///Tool -///#import "CountDownHelper.h" -#import "YUMIMacroUitls.h" -#import "YUMIHtmlUrl.h" -#import "ThemeColor+SendGift.h" -#import "NSArray+Safe.h" -#import "UIImage+Utils.h" -#import "CountDownHelper.h" -///Model -#import "GiftInfoModel.h" -#import "GiftReceiveInfoModel.h" -#import "RoomInfoModel.h" -///View -#import "XPGiftItemCollectionViewCell.h" -#import "XPGiftEmptyCollectionViewCell.h" -#import "XPGiftWeekStarCollectionViewCell.h" -#import "XPGiftCollectionViewFlowLayout.h" -#import "XPGiftFreeItemCell.h" - - -@interface XPGiftInfoView () - -///l礼物列表 -@property (nonatomic,strong) UICollectionView *giftCollectionView; -@property (nonatomic, strong) UICollectionViewFlowLayout *giftLayout; -///分页控件 -@property (nonatomic, strong) UIPageControl *pageController; -///展示的数据源 -@property (nonatomic,strong) NSMutableArray *datasource; -///最后一次选中的礼物 -@property (nonatomic,strong) GiftInfoModel *lastSelectGift; - -@end - -@implementation XPGiftInfoView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.segmentType = GiftSegmentType_Normal; - - [self addSubview:self.giftCollectionView]; - [self addSubview:self.pageController]; -} - -- (void)initSubViewConstraints { - [self.giftCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.pageController mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(10); - make.centerX.equalTo(self); - make.bottom.mas_equalTo(-10); - }]; -} -#pragma mark - Public Method -- (void)updatePackSource:(GiftReceiveInfoModel *)giftReceiveInfo numberUser:(NSInteger)numberUser { - GiftInfoModel * giftInfo = [self findGiftInfoByGiftId:giftReceiveInfo.giftId.integerValue]; - giftInfo.count -= giftReceiveInfo.giftNum * numberUser; - if (giftInfo.count == 0) { - if(self.freeModel.giftId.integerValue == giftInfo.giftId){ - if([CountDownHelper shareHelper].isCountdownFinish == YES){ - self.isDelFreeGift = YES; - [self.datasource removeObject:giftInfo]; - } - }else{ - [self.datasource removeObject:giftInfo]; - } - if(self.segmentType == GiftSegmentType_Pack && self.datasource.count > 0){ - NSInteger index = self.pageController.currentPage * 8 + 1; - if(self.datasource.count >= index){ - GiftInfoModel * gift = [self.datasource xpSafeObjectAtIndex:index - 1]; - [self dealSelectGift:gift]; - }else{ - NSInteger page = 0; - if (self.datasource.count % 8 == 0) { //刚好满页 - page = self.datasource.count / 8; - } else { - page = self.datasource.count / 8 + 1; - } - [self.pageController setNumberOfPages:page]; - GiftInfoModel * gift = [self.datasource firstObject]; - self.pageController.hidden = page <= 1 || _segmentType == GiftSegmentType_WeekStar; - self.pageController.currentPage = page > 1 ? page - 1 : 0; - [self dealSelectGift:gift]; - } - } - } - [self.giftCollectionView reloadData]; -} - -- (void)dealSelectGift:(GiftInfoModel *)giftInfo { - self.lastSelectGift = giftInfo; - if (self.segmentType == GiftSegmentType_Pack) { - giftInfo.sourceType = GiftSourceType_Pack; - } else { - giftInfo.sourceType = GiftSourceType_Normal; - } - giftInfo.isSelected = YES; -} - -// 根据礼物id查找 -- (GiftInfoModel *)findGiftInfoByGiftId:(NSInteger)giftId { - for (int i=0; i 0) { - GiftInfoModel * giftInfo= [self.datasource xpSafeObjectAtIndex:indexPath.item]; - [self dealSelectGift:giftInfo]; - [self.giftCollectionView reloadData]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftInfoView:didClickItem:type:)]) { - [self.delegate xPGiftInfoView:self didClickItem:giftInfo type:self.segmentType]; - } - } -} - -#pragma mark - XPGiftWeekStarCollectionViewCellDelegate -- (void)xPGiftWeekStarCollectionViewCell:(XPGiftWeekStarCollectionViewCell *)view didSelectGift:(GiftInfoModel *)giftInfo { - [self dealSelectGift:giftInfo]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftInfoView:didClickItem:type:)]) { - [self.delegate xPGiftInfoView:self didClickItem:giftInfo type:self.segmentType]; - } -} - -#pragma mark - Getters And Setters -- (void)setNormalOriginArray:(NSArray *)normalOriginArray { - _normalOriginArray = normalOriginArray; - if(_normalOriginArray.count > 0 && (self.lastSelectGift == nil || ![normalOriginArray containsObject:self.lastSelectGift])){ - GiftInfoModel *giftModel = _normalOriginArray.firstObject; - [self dealSelectGift:giftModel]; -// if (giftModel.giftType == GiftType_super){ - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftInfoView:didClickItem:type:)]) { - [self.delegate xPGiftInfoView:self didClickItem:giftModel type:self.segmentType]; - } -// } else if (giftModel.giftType == GiftType_Brove) { -// } - } - self.datasource = _normalOriginArray.mutableCopy; - NSInteger currentPage = 0; - NSInteger page = 0; - if (self.datasource.count % 8 == 0) { //刚好满页 - page = self.datasource.count / 8; - } else { - page = self.datasource.count / 8 + 1; - } - self.pageController.hidden = page <= 1 || _segmentType == GiftSegmentType_WeekStar; - [self.pageController setNumberOfPages:page]; - self.pageController.currentPage = currentPage; - - [self updateCollectionViewInsetWith:normalOriginArray.count]; - [self.giftCollectionView reloadData]; - if (self.segmentType == GiftSegmentType_WeekStar && isMSRTL()) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.giftCollectionView reloadData]; - }); - } -} - -- (void)setPackOriginArray:(NSArray *)packOriginArray { - _packOriginArray = packOriginArray; - if(_packOriginArray.count > 0 && self.lastSelectGift == nil){ - [self dealSelectGift:_packOriginArray.firstObject]; - } - if(self.isDelFreeGift == YES){ - NSMutableArray *originArray = [NSMutableArray array]; - for (GiftInfoModel *giftModel in self.packOriginArray) { - if(giftModel.giftId != self.freeModel.giftId.integerValue){ - [originArray addObject:giftModel]; - } - } - [self.datasource addObjectsFromArray:originArray]; - }else{ - [self.datasource addObjectsFromArray:self.packOriginArray]; - } - NSInteger currentPage = 0; - NSInteger page = 0; - if (self.datasource.count % 8 == 0) { //刚好满页 - page = self.datasource.count / 8; - } else { - page = self.datasource.count / 8 + 1; - } - self.pageController.hidden = page <= 1; - [self.pageController setNumberOfPages:page]; - self.pageController.currentPage = currentPage; - - [self updateCollectionViewInsetWith:packOriginArray.count]; - - [self.giftCollectionView reloadData]; -} - -- (void)setCurUserNobleLevel:(NSInteger)curUserNobleLevel { - _curUserNobleLevel = curUserNobleLevel; - [self.giftCollectionView reloadData]; -} - -#pragma mark - JXCategoryListContentViewDelegate -- (UIView *)listView { - return self; -} - -- (UICollectionView *)giftCollectionView{ - if (!_giftCollectionView) { - _giftLayout = [[XPGiftCollectionViewFlowLayout alloc] init]; - _giftLayout.minimumLineSpacing = 5; - _giftLayout.minimumInteritemSpacing = 5; - _giftCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:_giftLayout]; - _giftCollectionView.dataSource = self; - _giftCollectionView.delegate = self; - _giftCollectionView.backgroundColor = [UIColor clearColor]; - _giftCollectionView.pagingEnabled = YES; - [_giftCollectionView registerClass:[XPGiftItemCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGiftItemCollectionViewCell class])]; - [_giftCollectionView registerClass:[XPGiftEmptyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGiftEmptyCollectionViewCell class])]; - [_giftCollectionView registerClass:[XPGiftWeekStarCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGiftWeekStarCollectionViewCell class])]; - [_giftCollectionView registerClass:[XPGiftFreeItemCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGiftFreeItemCell class])]; - _giftCollectionView.showsHorizontalScrollIndicator = NO; - } - return _giftCollectionView; -} - - -- (UIPageControl *)pageController { - if (!_pageController) { - _pageController = [[UIPageControl alloc] init]; - _pageController.currentPageIndicatorTintColor = [DJDKMIMOMColor giftPageIndicatorColor]; - } - return _pageController; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.h deleted file mode 100644 index 8b30385..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMGiftLuckyGiftBoradCastView.h -// YUMI -// -// Created by YUMI on 2022/10/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPGiftLuckyGiftBroadcastViewDelegate - -///点击了玩法说明 -- (void)xPGiftLuckyGiftBroadcastViewPlayDescClick; - -@end - -@interface XPGiftLuckyGiftBroadcastView : UIView - -@property (nonatomic, weak) id delegate; - - -@property (nonatomic,strong) NSArray *records; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m deleted file mode 100644 index 5bd3b23..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m +++ /dev/null @@ -1,210 +0,0 @@ -// -// YMGiftLuckyGiftBoradCastView.m -// YUMI -// -// Created by YUMI on 2022/10/8. -// - -#import "XPGiftLuckyGiftBroadcastView.h" -///Third -#import -#import -#import - -///Tool -#import "DJDKMIMOMColor.h" -#import "NSArray+Safe.h" -///Model -#import "GiftLuckyBroadcastModel.h" - - -@interface XPGiftLuckyGiftBroadcastCell : SDCollectionViewCell -@property (nonatomic,strong) UILabel *titleLabel; -@property (nonatomic,strong) GiftLuckyBroadcastModel *giftInfo; -@end - -@implementation XPGiftLuckyGiftBroadcastCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; -} - -- (NSMutableAttributedString *)createTextAttribute:(NSString *)text color:(UIColor *)color { - if (text == nil || text.length <= 0) { - text = @""; - } - NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithString:text attributes:@{NSFontAttributeName:kFontMedium(11),NSForegroundColorAttributeName:color}]; - return attribute; -} - -#pragma mark - Getters And Setters -- (void)setGiftInfo:(GiftLuckyBroadcastModel *)giftInfo { - _giftInfo = giftInfo; - if (_giftInfo) { - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; - [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPGiftLuckyGiftBroadcastCell0") color:[UIColor whiteColor]]]; - NSString * nick = _giftInfo.nick; - if (nick.length > 6) { - nick = [NSString stringWithFormat:@"%@...",[nick substringToIndex:5]]; - } - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%@ " , nick] color:[DJDKMIMOMColor colorWithHexString:@"#FFE785"]]]; - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:YMLocalizedString(@"XPGiftLuckyGiftBroadcastCell1"), giftInfo.luckyBagName] color:[UIColor whiteColor]]]; - [attribute addAttributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:@"#FFE785"]} range:[attribute.string rangeOfString:giftInfo.luckyBagName]]; - [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%@ " , _giftInfo.giftName] color:[DJDKMIMOMColor colorWithHexString:@"#FFE785"]]]; - self.titleLabel.attributedText = attribute; - } -} - - - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.adjustsFontSizeToFitWidth = YES; - } - return _titleLabel; -} - -@end - -@interface XPGiftLuckyGiftBroadcastView() - -///背景 -@property (nonatomic, strong) UIImageView *bgImageView; -///玩法说明 -@property (nonatomic, strong) UIButton *playBtn; - -///文字轮播 -@property (nonatomic, strong) SDCycleScrollView *pi_BannerView; - -@end - -@implementation XPGiftLuckyGiftBroadcastView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgImageView]; - [self addSubview:self.playBtn]; - [self addSubview:self.pi_BannerView]; -} - -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(0); - make.leading.trailing.mas_equalTo(self).inset(kGetScaleWidth(6)); - make.height.mas_equalTo(kGetScaleWidth(56)); - }]; - - [self.playBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(18)); - make.width.mas_equalTo(kGetScaleWidth(40)); - make.centerY.equalTo(self.bgImageView); - }]; - [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(60)); - make.trailing.mas_equalTo(-kGetScaleWidth(70)); - make.top.bottom.mas_equalTo(self.bgImageView); - }]; - - -} - -#pragma mark - action -- (void)playButtonAction { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftLuckyGiftBroadcastViewPlayDescClick)]) { - [self.delegate xPGiftLuckyGiftBroadcastViewPlayDescClick]; - } -} -#pragma mark - SDCycleScrollViewDelegate -- (Class)customCollectionViewCellClassForCycleScrollView:(SDCycleScrollView *)view { - return XPGiftLuckyGiftBroadcastCell.class; -} - -- (void)setupCustomCell:(UICollectionViewCell *)cell forIndex:(NSInteger)index cycleScrollView:(SDCycleScrollView *)view { - XPGiftLuckyGiftBroadcastCell *myCell = (XPGiftLuckyGiftBroadcastCell *)cell; - GiftLuckyBroadcastModel * info = [self.records xpSafeObjectAtIndex:index]; - myCell.giftInfo = info; - -} -#pragma mark - Getters And Setters -- (void)setRecords:(NSArray *)records { - _records = records; - if (_records.count > 0) { - NSMutableArray * array = [NSMutableArray array]; - for (GiftLuckyBroadcastModel * item in _records) { - if(item.nick.length > 0){ - [array addObject:item.nick]; - } - } - if (array.count > 0) { - self.pi_BannerView.imageURLStringsGroup = array; - [self.pi_BannerView autoScroll]; - } - } -} - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [[UIImage imageNamed:@"gift_lucky_broadcast_bg"] ms_SetImageForRTL]; - _bgImageView.contentMode = UIViewContentModeScaleToFill; - } - return _bgImageView; -} - -- (UIButton *)playBtn{ - if(!_playBtn){ - _playBtn = [UIButton new]; - [_playBtn setTitle:YMLocalizedString(@"XPGiftLuckyGiftBroadcastView0") forState:UIControlStateNormal]; - [_playBtn setTitleColor:UIColorFromRGB(0xEB547C) forState:UIControlStateNormal]; - _playBtn.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightSemibold]; - _playBtn.titleLabel.numberOfLines = 2; - [_playBtn addTarget:self action:@selector(playButtonAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _playBtn; -} - -- (SDCycleScrollView *)pi_BannerView { - if (!_pi_BannerView) { - _pi_BannerView = [[SDCycleScrollView alloc] init]; - _pi_BannerView.backgroundColor = [UIColor clearColor]; - _pi_BannerView.layer.masksToBounds = YES; - _pi_BannerView.delegate = self; - _pi_BannerView.showPageControl = NO; - _pi_BannerView.autoScrollTimeInterval = 3.0; - [_pi_BannerView disableScrollGesture]; - // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 - _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - for (UIView *subView in _pi_BannerView.subviews) { - subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - } - return _pi_BannerView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.h deleted file mode 100644 index 4d1c27e..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.h +++ /dev/null @@ -1,38 +0,0 @@ -// -// YMGiftTwelveStarBroadcastView.h -// YUMI -// -// Created by YUMI on 2022/12/7. -// - -#import -#import "GiftInfoModel.h" -#import -NS_ASSUME_NONNULL_BEGIN -@class XPGiftTwelveStarBroadcastView; - -@protocol XPGiftTwelveStarBroadcastViewDelegate - -- (void)xPGiftTwelveStarBroadcastView:(XPGiftTwelveStarBroadcastView *)view didClickDetail:(UIButton *)sender; -@end - -@interface XPGiftTwelveStarBroadcastView : UIView - -@property (nonatomic, strong) GiftInfoModel *giftInfo; -@property (nonatomic,strong) NSMutableArray *records; -///代理 -@property (nonatomic,weak) id delegate; - -@end - - - - - - - -@interface XPGiftTwelveStarBroadcastCell : SDCollectionViewCell -@property(nonatomic,strong) XPWeekStarRankUserModel *userModel; -@property(nonatomic,strong) UIButton *skipBtn; -@end -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m deleted file mode 100644 index deecfb5..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m +++ /dev/null @@ -1,251 +0,0 @@ -// -// YMGiftTwelveStarBroadcastView.m -// YUMI -// -// Created by YUMI on 2022/12/7. -// - -#import "XPGiftTwelveStarBroadcastView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" -#import "XCCurrentVCStackManager.h" -#import "XPWebViewController.h" -#import "YUMIHtmlUrl.h" -#import "NetImageView.h" -#import -///Model -#import "GiftTwelveStarFirstModel.h" - -@interface XPGiftTwelveStarBroadcastView() - -///轮播 -@property (nonatomic, strong) SDCycleScrollView *pi_BannerView; - -@end - -@implementation XPGiftTwelveStarBroadcastView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.pi_BannerView]; -} - -- (void)initSubViewConstraints { - [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(10)); - make.trailing.mas_equalTo(-kGetScaleWidth(10)); - make.top.bottom.mas_equalTo(self); - }]; -} --(void)setGiftInfo:(GiftInfoModel *)giftInfo{ - _giftInfo = giftInfo; - if (_giftInfo.firstCharmRankUser) { - _giftInfo.firstCharmRankUser.type = 0; - [self.records addObject:_giftInfo.firstCharmRankUser]; - } else { - XPWeekStarRankUserModel *rankModel = [XPWeekStarRankUserModel new]; - rankModel.type = 0; - rankModel.avatar = @"common_avatar"; - rankModel.nick = YMLocalizedString(@"XPGiftWeekStarBroadcastView0"); - [self.records addObject:rankModel]; - } - - if (_giftInfo.firstLevelRankUser) { - _giftInfo.firstLevelRankUser.type = 1; - [self.records addObject:_giftInfo.firstLevelRankUser]; - } else { - XPWeekStarRankUserModel *rankModel = [XPWeekStarRankUserModel new]; - rankModel.type = 1; - rankModel.avatar = @"common_avatar"; - rankModel.nick = YMLocalizedString(@"XPGiftWeekStarBroadcastView0"); - [self.records addObject:rankModel]; - } - if (_records.count > 0) { - NSMutableArray * array = [NSMutableArray array]; - for (XPWeekStarRankUserModel * item in _records) { - [array addObject:item.avatar]; - } - if (array.count > 0) { - self.pi_BannerView.imageURLStringsGroup = array; - [self.pi_BannerView autoScroll]; - } - } -} -#pragma mark - action --(void)skipBtnAction:(UIButton *)sender{ - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftTwelveStarBroadcastView:didClickDetail:)]) { - [self.delegate xPGiftTwelveStarBroadcastView:self didClickDetail:sender]; - } -} - -#pragma mark - SDCycleScrollViewDelegate -- (Class)customCollectionViewCellClassForCycleScrollView:(SDCycleScrollView *)view { - return XPGiftTwelveStarBroadcastCell.class; -} - -- (void)setupCustomCell:(UICollectionViewCell *)cell forIndex:(NSInteger)index cycleScrollView:(SDCycleScrollView *)view { - XPGiftTwelveStarBroadcastCell *myCell = (XPGiftTwelveStarBroadcastCell *)cell; - XPWeekStarRankUserModel * info = [self.records xpSafeObjectAtIndex:index]; - [myCell.skipBtn addTarget:self action:@selector(skipBtnAction:) forControlEvents:UIControlEventTouchUpInside]; - myCell.userModel = info; - -} -- (SDCycleScrollView *)pi_BannerView { - if (!_pi_BannerView) { - _pi_BannerView = [[SDCycleScrollView alloc] init]; - _pi_BannerView.backgroundColor = [UIColor clearColor]; - _pi_BannerView.layer.masksToBounds = YES; - _pi_BannerView.delegate = self; - _pi_BannerView.showPageControl = NO; - _pi_BannerView.autoScrollTimeInterval = 5; - [_pi_BannerView disableScrollGesture]; - // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 - _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - for (UIView *subView in _pi_BannerView.subviews) { - subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; - } - } - return _pi_BannerView; -} -- (NSMutableArray *)records{ - if(!_records){ - _records = [NSMutableArray array]; - } - return _records; -} -@end - - -@interface XPGiftTwelveStarBroadcastCell () -@property(nonatomic,strong) UIImageView *bgImageView; -@property(nonatomic,strong) NetImageView *headView; -@property(nonatomic,strong) UILabel *nameView; - -@property(nonatomic,strong) UIImageView *arrowView; -@end - -@implementation XPGiftTwelveStarBroadcastCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.bgImageView]; - [self.contentView addSubview:self.headView]; - [self.contentView addSubview:self.nameView]; - [self.contentView addSubview:self.skipBtn]; - [self.contentView addSubview:self.arrowView]; -} --(void)setUserModel:(XPWeekStarRankUserModel *)userModel{ - _userModel = userModel; - _bgImageView.image = _userModel.type == 0 ? [UIImage getLanguageImage:@"gift_twelve_star_Banner_naming_bg"] :[UIImage getLanguageImage:@"gift_twelve_star_Banner_rich_bg"]; - NSString *name = _userModel.nick; - _nameView.text = name; - if(_userModel.type == 1){ - [self.headView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(205)); - }]; - - }else{ - [self.headView mas_updateConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(194)); - }]; - } - _headView.imageUrl = _userModel.avatar; -} -- (void)initSubViewConstraints { - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; - [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(194)); - make.width.height.mas_equalTo(kGetScaleWidth(22)); - make.centerY.equalTo(self.contentView); - }]; - [self.arrowView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(8)); - make.trailing.mas_equalTo(-kGetScaleWidth(10)); - make.centerY.equalTo(self.contentView); - }]; - [self.skipBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.arrowView.mas_leading).mas_offset(-kGetScaleWidth(2)); - make.centerY.equalTo(self.contentView); - make.width.mas_equalTo(kGetScaleWidth(40)); - - }]; - [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.equalTo(self.headView.mas_trailing).mas_offset(kGetScaleWidth(4)); - make.centerY.equalTo(self.contentView); - make.trailing.equalTo(self.skipBtn.mas_leading).mas_offset(-kGetScaleWidth(2)); - }]; - if (isMSRTL()){ - self.nameView.textAlignment = NSTextAlignmentRight; - } - -} - - - -#pragma mark - Getters And Setters -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} - -- (NetImageView *)headView{ - if(!_headView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = kImage(@"common_avatar"); - _headView = [[NetImageView alloc]initWithConfig:config]; - _headView.layer.cornerRadius = kGetScaleWidth(22)/2; - _headView.layer.masksToBounds = YES; - } - return _headView; -} -- (UILabel *)nameView{ - if(!_nameView){ - _nameView = [UILabel labelInitWithText:@"" font:kFontMedium(12) textColor:[UIColor whiteColor]]; - } - return _nameView; -} -- (UIButton *)skipBtn{ - if(!_skipBtn){ - _skipBtn = [UIButton new]; - [_skipBtn setTitle:YMLocalizedString(@"XPGiftLuckyGiftBroadcastCell6") forState:UIControlStateNormal]; - _skipBtn.titleLabel.font = kFontRegular(10); - [_skipBtn setTitleColor:UIColorFromRGB(0xFFE694) forState:UIControlStateNormal]; - _skipBtn.titleLabel.numberOfLines = 2; - _skipBtn.titleLabel.adjustsFontSizeToFitWidth = YES; - } - return _skipBtn; -} -- (UIImageView *)arrowView{ - if(!_arrowView){ - _arrowView = [UIImageView new]; - _arrowView.image = kImage(@"gift_twelve_star_Banner_arrow"); - } - return _arrowView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.h deleted file mode 100644 index 4f645b4..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMGiftUsersView.h -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import -#import "XPSendGiftView.h" -NS_ASSUME_NONNULL_BEGIN -@class XPGiftUserInfoModel, XPGiftUsersView; -@protocol XPGiftUsersViewDelegate -///选中的用户 -- (void)xPGiftUsersView:(XPGiftUsersView *)view didSelectUsers:(NSArray *)selectUids; - -@end -@interface XPGiftUsersView : UIView -///选中的人 送给谁礼物 -@property (nonatomic,strong, readonly) NSMutableArray *selectUserArray; -///是不是选择了全部麦上的人 -@property (nonatomic,assign, readonly) BOOL isSelectAll; -///麦序变化 赋值使用 -- (void)configGiftUsers:(NSArray *)users; -///代理 -@property (nonatomic,weak) id delegate; - --(NSMutableArray*)getSelectUserList; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m deleted file mode 100644 index 9c6d446..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m +++ /dev/null @@ -1,305 +0,0 @@ -// -// YMGiftUsersView.m -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import "XPGiftUsersView.h" -///Third -#import -///Tool -#import "AccountInfoStorage.h" -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "NSArray+Safe.h" -///Model -#import "UserInfoModel.h" -#import "XPGiftUserInfoModel.h" -///view -#import "XPGiftUserCollectionViewCell.h" -@interface XPGiftUsersView () -///麦上的送礼物 -@property (nonatomic,strong) UIStackView *stackView; -///全麦 -@property (nonatomic,strong) UIButton *allMicroButton; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///单独送一个人礼物 -@property (nonatomic,strong) UIStackView *oneStackView; -///昵称 -@property (nonatomic,strong) NetImageView *avatarImageView; -///头像 -@property (nonatomic,strong) UILabel *nickLabel; -///原始的数据 -@property (nonatomic,strong) NSArray *userArray; -///选中的人 -@property (nonatomic,strong) NSMutableArray *selectUserArray; -///是不是选择了全部麦上的人 -@property (nonatomic,assign) BOOL isSelectAll; -@end - -@implementation XPGiftUsersView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Response -- (void)allMicroButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - [self.userArray enumerateObjectsUsingBlock:^(XPGiftUserInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - obj.isSelect = sender.selected; - NSString * selectUid = [NSString stringWithFormat:@"%ld", obj.uid]; - if (obj.isSelect) { - if (![self.selectUserArray containsObject:selectUid]) { - [self.selectUserArray addObject:selectUid]; - } - } else { - if ([self.selectUserArray containsObject:selectUid]) { - [self.selectUserArray removeObject:selectUid]; - } - } - }]; - self.isSelectAll = sender.selected; - [self.collectionView reloadData]; - - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftUsersView:didSelectUsers:)]) { - [self.delegate xPGiftUsersView:self didSelectUsers:self.selectUserArray]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor];; - [self addSubview:self.stackView]; - [self addSubview:self.oneStackView]; - [self.stackView addArrangedSubview:self.allMicroButton]; - [self.stackView addArrangedSubview:self.collectionView]; - - [self.oneStackView addArrangedSubview:self.avatarImageView]; - [self.oneStackView addArrangedSubview:self.nickLabel]; - -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(43 + 15 * 2); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(15); - make.top.bottom.mas_equalTo(self); - }]; - - [self.oneStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(15); - make.top.bottom.mas_equalTo(self); - }]; - - [self.allMicroButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(28); - make.width.mas_greaterThanOrEqualTo(60); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(43); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(38, 38)); - }]; -} - -/// 查找麦序 坑位上有人的麦序 -/// @param users 麦序列表 -- (NSArray *)findSendGiftAllUsers:(NSArray *)users { - NSMutableArray * tempArray = [NSMutableArray array]; -// NSString * uid = [AccountInfoStorage instance].getUid; - NSArray * newArray = [users sortedArrayUsingComparator:^NSComparisonResult(id _Nonnull obj1, id _Nonnull obj2) { - XPGiftUserInfoModel * model1 = obj1; - XPGiftUserInfoModel * model2 = obj2; - NSComparisonResult resuest = [model1.position compare:model2.position]; - return resuest; - }]; - - for (int i = 0; i < newArray.count; i++) { - XPGiftUserInfoModel * userInfo = [newArray xpSafeObjectAtIndex:i]; - if (userInfo && userInfo.uid > 0 -// && userInfo.uid != uid.integerValue - ) { ///自己在麦上不显示在送礼物列表中 - NSString * uid = [NSString stringWithFormat:@"%ld", userInfo.uid]; - if (userInfo.isSelect) { - [self.selectUserArray addObject:uid]; - } - [tempArray addObject:userInfo]; - } - } - return [tempArray copy]; -} - -#pragma mark - Public Method -- (void)configGiftUsers:(NSArray *)users { - self.userArray = [self findSendGiftAllUsers:users]; - if (users.count == 1 && users.firstObject.position == nil) {///只有一个 并且用户不再麦序中的话 - XPGiftUserInfoModel *userInfo = users.firstObject; - self.avatarImageView.imageUrl = userInfo.avatar; - self.nickLabel.text = userInfo.nick; - self.stackView.hidden = YES; - self.oneStackView.hidden = NO; - } else { - - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.collectionView reloadData]; - }); - - - - self.oneStackView.hidden = YES; - self.stackView.hidden = NO; - } -} - -#pragma mark - UICollectionViewDataSource And UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.userArray.count; -} - --(__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPGiftUserCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGiftUserCollectionViewCell class]) forIndexPath:indexPath]; - XPGiftUserInfoModel * queue = [self.userArray xpSafeObjectAtIndex:indexPath.row]; - cell.userInfo = queue; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - XPGiftUserInfoModel * queue = [self.userArray xpSafeObjectAtIndex:indexPath.row]; - queue.isSelect = !queue.isSelect; - [self.collectionView reloadData]; - NSString * selectUid = [NSString stringWithFormat:@"%ld", queue.uid]; - if (queue.isSelect) { - if (![self.selectUserArray containsObject:selectUid]) { - [self.selectUserArray addObject:selectUid]; - } - } else { - if ([self.selectUserArray containsObject:selectUid]) { - [self.selectUserArray removeObject:selectUid]; - } - } - if (self.selectUserArray.count == self.userArray.count) { - self.allMicroButton.selected = YES; - self.isSelectAll = YES; - } else { - self.allMicroButton.selected = NO; - self.isSelectAll = NO; - } - - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftUsersView:didSelectUsers:)]) { - [self.delegate xPGiftUsersView:self didSelectUsers:self.selectUserArray]; - } -} --(NSMutableArray*)getSelectUserList{ - NSMutableArray *userList = [NSMutableArray array]; - for (XPGiftUserInfoModel * queue in self.userArray) { - if(queue.isSelect == YES){ - NSString * selectUid = [NSString stringWithFormat:@"%ld", queue.uid]; - if(![userList containsObject:selectUid]){ - [userList addObject:selectUid]; - } - } - } - return userList; -} -#pragma mark - Getters And Setters -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 10; - } - return _stackView; -} - -- (UIStackView *)oneStackView { - if (!_oneStackView) { - _oneStackView = [[UIStackView alloc] init]; - _oneStackView.axis = UILayoutConstraintAxisHorizontal; - _oneStackView.distribution = UIStackViewDistributionFill; - _oneStackView.alignment = UIStackViewAlignmentCenter; - _oneStackView.spacing = 10; - } - return _oneStackView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 38/2; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:15]; - _nickLabel.textColor = [UIColor whiteColor]; - } - return _nickLabel; -} - -- (UIButton *)allMicroButton { - if (!_allMicroButton) { - _allMicroButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_allMicroButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_allMicroButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal]; - [_allMicroButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateSelected]; - [_allMicroButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateSelected]; - [_allMicroButton setTitle:YMLocalizedString(@"XPGiftUsersView0") forState:UIControlStateSelected]; - [_allMicroButton setTitle:YMLocalizedString(@"XPGiftUsersView1") forState:UIControlStateNormal]; - _allMicroButton.titleLabel.font = [UIFont systemFontOfSize:13]; - _allMicroButton.layer.masksToBounds = YES; - _allMicroButton.layer.cornerRadius = 28 /2; - [_allMicroButton addTarget:self action:@selector(allMicroButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _allMicroButton; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.itemSize = CGSizeMake(38, 43); - layout.minimumInteritemSpacing = 4; - layout.sectionInset = UIEdgeInsetsMake(0, 0, 0,0); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.showsHorizontalScrollIndicator = NO; - [_collectionView registerClass:[XPGiftUserCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPGiftUserCollectionViewCell class])]; - } - return _collectionView; -} - -- (NSMutableArray *)selectUserArray { - if (!_selectUserArray) { - _selectUserArray = [NSMutableArray array]; - } - return _selectUserArray; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGraffitiGiftView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGraffitiGiftView.h deleted file mode 100644 index 873b2ef..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGraffitiGiftView.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// YMGraffitiGiftView.h -// YUMI -// -// Created by YUMI on 2022/8/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPGraffitiGiftView; -@protocol XPGraffitiGiftViewDelegate -///点击切换 -- (void)xPGraffitiGiftView:(XPGraffitiGiftView *)view didClickChange:(UILabel *)sender; -///点击了关闭 -- (void)xPGraffitiGiftView:(XPGraffitiGiftView *)view didClickClose:(UIButton *)sender; -///绘画完成了 -- (void)xPGraffitiGiftView:(XPGraffitiGiftView *)view didDrawCompletion:(NSArray *)pointArray; -@end - -@interface XPGraffitiGiftView : UIView -@property (nonatomic,strong) UIImage *image; -///代理 -@property (nonatomic,weak) id delegate; -///价格 -@property (nonatomic,assign) double price; -///动画的数据 -@property (nonatomic,strong) NSArray *animationArray; -///选择的用户个数 -@property (nonatomic,assign) NSInteger selectUidNumber; - -- (void)clearData; -- (void)cratePriceAttribute; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGraffitiGiftView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGraffitiGiftView.m deleted file mode 100644 index 6cbffdf..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGraffitiGiftView.m +++ /dev/null @@ -1,412 +0,0 @@ -// -// YMGraffitiGiftView.m -// YUMI -// -// Created by YUMI on 2022/8/22. -// - -#import "XPGraffitiGiftView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "XNDJTDDLoadingTool.h" - -@interface XPGraffitiGiftView () -///回话的内容 -@property (nonatomic,strong) UIView * contentView; -///绘画的view -@property (nonatomic,strong) UIView * drawView; -///类型 -@property (nonatomic,strong) UIStackView *tipsStackView; -///✋🏻 -@property (nonatomic,strong) UIImageView *handImageView; -///提醒 -@property (nonatomic,strong) UILabel *tipsLabel; -///toolView -@property (nonatomic,strong) UIView * toolView; -///至少花多少个 -@property (nonatomic,strong) UILabel *titleLabel; -///类型 -@property (nonatomic,strong) UIStackView *toolStackView; -///撤销 -@property (nonatomic,strong) UIButton *repealButton; -///删除 -@property (nonatomic,strong) UIButton *deleteButton; -///关闭 -@property (nonatomic,strong) UIButton *closeButton; -///手指滑动的point -@property (nonatomic,assign) CGPoint panPoint; -///开始的point -@property (nonatomic,assign) CGPoint beginPoint; -///两个涂鸦的间距 -@property (nonatomic,assign) CGFloat step; -/// -@property (nonatomic,assign) int index; -///是否展示超过最大值的 -@property (nonatomic,assign) BOOL isShowMaxToast; -@property (nonatomic,strong) NSMutableArray *viewsArray; -@property (nonatomic,strong) NSMutableArray *indexArray; -@property (nonatomic,strong) NSMutableArray *> *pointArray; - -@end - -@implementation XPGraffitiGiftView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.isShowMaxToast = YES; - self.step = 10; - UIPanGestureRecognizer * panGes = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(panAction:)]; - [self addGestureRecognizer:panGes]; - self.backgroundColor = [UIColor clearColor]; - [self addSubview:self.contentView]; - - [self.contentView addSubview:self.tipsStackView]; - [self.contentView addSubview:self.drawView]; - [self.contentView addSubview:self.toolView]; - - [self.tipsStackView addArrangedSubview:self.handImageView]; - [self.tipsStackView addArrangedSubview:self.tipsLabel]; - - [self.toolView addSubview:self.titleLabel]; - [self.toolView addSubview:self.toolStackView]; - - [self.toolStackView addArrangedSubview:self.repealButton]; - [self.toolStackView addArrangedSubview:self.deleteButton]; - [self.toolStackView addArrangedSubview:self.closeButton]; -} - -- (void)initSubViewConstraints { - CGFloat avatarHeight = (43 + 15 * 2); - CGFloat bottomHeight = (45); - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(KScreenHeight - avatarHeight - bottomHeight); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - - [self.tipsStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.width.mas_equalTo(KScreenWidth); - }]; - - [self.drawView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(kSafeAreaTopHeight); - make.leading.trailing.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.toolView.mas_top); - }]; - - [self.handImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(78, 93)); - }]; - - - [self.toolView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(56); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.toolView).offset(15); - make.centerY.mas_equalTo(self.toolView); - }]; - - [self.toolStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.toolView).offset(-15); - make.height.mas_equalTo(22); - make.centerY.mas_equalTo(self.toolView); - }]; - - [self.repealButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(22); - }]; - - [self.deleteButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(22); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(22); - }]; -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - self.tipsStackView.hidden = YES; - UITouch *touch = touches.anyObject; - CGPoint point = [touch locationInView:self.contentView]; - self.beginPoint = point; -} - -- (void)panAction:(UIPanGestureRecognizer *)tap { - if (self.pointArray.count >= 300) { - if (self.isShowMaxToast) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPGraffitiGiftView0")]; - self.isShowMaxToast = YES; - } - return; - } - - if (tap.state == UIGestureRecognizerStateBegan) { - [self.indexArray addObject:[NSNumber numberWithInteger:self.viewsArray.count]]; - } else if(tap.state == UIGestureRecognizerStateEnded) { - self.isShowMaxToast = YES; - } - CGPoint point = [tap translationInView:self.contentView]; - CGFloat dx = [self myAbs:point.x - self.panPoint.x]; - CGFloat dy = [self myAbs:point.y - self.panPoint.y]; - CGPoint drawPoint = CGPointMake(self.beginPoint.x + point.x , self.beginPoint.y + point.y); - if ((dx * dx + dy * dy) > 2 * self.step * self.step) { - [self addSubView:drawPoint]; - self.panPoint = point; - } -} - -- (int)myAbs:(int)num { - if (num >= 0) { - return num; - } - return -num; -} - - -- (void)addSubView:(CGPoint)point { - UIImageView * imageView = [[UIImageView alloc] init]; - imageView.contentMode = UIViewContentModeScaleAspectFill; - imageView.layer.masksToBounds = YES; - imageView.image = self.image; - imageView.frame = CGRectMake(point.x, point.y, 20, 20); - [self.drawView addSubview:imageView]; - [self.viewsArray addObject:imageView]; - [self.pointArray addObject:@[@([self changeWidthDraw:point.x]), @([self changeHeightDraw:point.y])]]; - [self cratePriceAttribute]; - if (self.pointArray.count >= 10 && self.delegate && [self.delegate respondsToSelector:@selector(xPGraffitiGiftView:didDrawCompletion:)]) { - [self.delegate xPGraffitiGiftView:self didDrawCompletion:self.pointArray]; - } -} - -- (NSInteger)changeWidthDraw:(CGFloat)number { - return number / KScreenWidth * 1000; -} - -- (NSInteger)changeHeightDraw:(CGFloat)number { - return number / KScreenHeight * 1000; -} - -- (void)clearData { - [self.viewsArray makeObjectsPerformSelector:@selector(removeFromSuperview)]; - [self.viewsArray removeAllObjects]; - [self.pointArray removeAllObjects]; - [self.indexArray removeAllObjects]; -} -#pragma mark - Event Response - -- (void)repealButtonAction:(UIButton *)sender { - NSInteger index = [self.indexArray lastObject].integerValue; - if (index < self.viewsArray.count) { - NSArray * array = [self.viewsArray subarrayWithRange:NSMakeRange(index, self.viewsArray.count - index)]; - NSArray * array2 = [self.pointArray subarrayWithRange:NSMakeRange(index, self.pointArray.count - index)]; - [self.pointArray removeObjectsInArray:array2]; - [self.viewsArray removeObjectsInArray:array]; - if (array.count) { - [array makeObjectsPerformSelector:@selector(removeFromSuperview)]; - } - if (self.indexArray.count > 0) { - [self.indexArray removeLastObject]; - } - [self cratePriceAttribute]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGraffitiGiftView:didDrawCompletion:)]) { - [self.delegate xPGraffitiGiftView:self didDrawCompletion:self.pointArray]; - } - } -} - -- (void)deleteButtonAction:(UIButton *)sender { - [self clearData]; - [self cratePriceAttribute]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGraffitiGiftView:didDrawCompletion:)]) { - [self.delegate xPGraffitiGiftView:self didDrawCompletion:self.pointArray]; - } -} - -- (void)closeButtonAction:(UIButton *)sender { - [self clearData]; - [self cratePriceAttribute]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGraffitiGiftView:didDrawCompletion:)]) { - [self.delegate xPGraffitiGiftView:self didDrawCompletion:self.pointArray]; - } - - if (self.delegate && [self.delegate respondsToSelector:@selector(xPGraffitiGiftView:didClickClose:)]) { - [self.delegate xPGraffitiGiftView:self didClickClose:sender]; - } -} - -- (void)cratePriceAttribute { - if (self.viewsArray.count < 10) { - NSString * title = YMLocalizedString(@"XPGraffitiGiftView1"); - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:[UIColor whiteColor]}]; - self.titleLabel.attributedText = attribute; - } else { - NSInteger number = self.selectUidNumber > 0 ? self.selectUidNumber : 0; - NSString * count = [NSString stringWithFormat:@"%ld", self.viewsArray.count]; - NSString * price = [NSString stringWithFormat:@"%.0f", self.viewsArray.count * self.price * number]; - NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPGraffitiGiftView2"), count, price]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:[UIColor whiteColor]}]; - [attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor appMainColor] range:[title rangeOfString:count]]; - [attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor appMainColor] range:[title rangeOfString:price]]; - self.titleLabel.attributedText = attribute; - } - -} - -#pragma mark - Getters And Setters -- (void)setSelectUidNumber:(NSInteger)selectUidNumber { - _selectUidNumber = selectUidNumber; - [self cratePriceAttribute]; -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = UIColorRGBAlpha(0x000000, 0.7); - } - return _contentView; -} - -- (UIView *)drawView { - if (!_drawView) { - _drawView = [[UIView alloc] init]; - _drawView.backgroundColor = [UIColor clearColor]; - _drawView.layer.masksToBounds = YES; - } - return _drawView; -} - -- (UIStackView *)tipsStackView { - if (!_tipsStackView) { - _tipsStackView = [[UIStackView alloc] init]; - _tipsStackView.axis = UILayoutConstraintAxisVertical; - _tipsStackView.distribution = UIStackViewDistributionFill; - _tipsStackView.alignment = UIStackViewAlignmentCenter; - _tipsStackView.spacing = 17; - } - return _tipsStackView; -} - -- (UIImageView *)handImageView { - if (!_handImageView) { - _handImageView = [[UIImageView alloc] init]; - _handImageView.userInteractionEnabled = YES; - _handImageView.image = [UIImage imageNamed:@"room_gift_graffiti_hand"]; - } - return _handImageView; -} - -- (UILabel *)tipsLabel { - if (!_tipsLabel) { - _tipsLabel = [[UILabel alloc] init]; - _tipsLabel.font = [UIFont systemFontOfSize:14]; - _tipsLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _tipsLabel.text = YMLocalizedString(@"XPGraffitiGiftView3"); - } - return _tipsLabel; -} - -- (UIView *)toolView { - if (!_toolView) { - _toolView = [[UIView alloc] init]; - _toolView.backgroundColor = UIColorRGBAlpha(0xFFFFFF, 0.2); - CAShapeLayer * layer = [CAShapeLayer layer]; - layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, 56) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(8, 8)].CGPath; - _toolView.layer.mask = layer; - } - return _toolView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:14]; - _titleLabel.textColor = [UIColor whiteColor]; - _titleLabel.text = YMLocalizedString(@"XPGraffitiGiftView4"); - } - return _titleLabel; -} - -- (UIStackView *)toolStackView { - if (!_toolStackView) { - _toolStackView = [[UIStackView alloc] init]; - _toolStackView.axis = UILayoutConstraintAxisHorizontal; - _toolStackView.distribution = UIStackViewDistributionFill; - _toolStackView.alignment = UIStackViewAlignmentCenter; - _toolStackView.spacing = 12; - } - return _toolStackView; -} - -- (UIButton *)repealButton { - if (!_repealButton) { - _repealButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_repealButton setImage:[UIImage imageNamed:@"room_gift_graffiti_repeal"] forState:UIControlStateNormal]; - [_repealButton setImage:[UIImage imageNamed:@"room_gift_graffiti_repeal"] forState:UIControlStateSelected]; - [_repealButton addTarget:self action:@selector(repealButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _repealButton; -} - -- (UIButton *)deleteButton { - if (!_deleteButton) { - _deleteButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_deleteButton setImage:[UIImage imageNamed:@"room_gift_graffiti_delete"] forState:UIControlStateNormal]; - [_deleteButton setImage:[UIImage imageNamed:@"room_gift_graffiti_delete"] forState:UIControlStateSelected]; - [_deleteButton addTarget:self action:@selector(deleteButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _deleteButton; -} - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeButton setImage:[UIImage imageNamed:@"room_gift_graffiti_close"] forState:UIControlStateNormal]; - [_closeButton setImage:[UIImage imageNamed:@"room_gift_graffiti_close"] forState:UIControlStateSelected]; - [_closeButton addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -- (NSMutableArray *)indexArray { - if (!_indexArray) { - _indexArray = [NSMutableArray array]; - } - return _indexArray; -} - -- (NSMutableArray *)pointArray { - if (!_pointArray) { - _pointArray = [NSMutableArray array]; - } - return _pointArray; -} - -- (NSMutableArray *)viewsArray { - if (!_viewsArray) { - _viewsArray = [NSMutableArray array]; - } - return _viewsArray; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.h deleted file mode 100644 index 8379a3d..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// YMSendGiftView.h -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import "MvpViewController.h" -#import "RoomHostDelegate.h" -#import "XPGiftUserInfoModel.h" -#import "XPFreeGiftModel.h" -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, SendGiftType) { - SendGiftType_Room = 1, ///房间内送礼物 - SendGiftType_User, ///送给某一个人 -}; - -@interface XPSendGiftView : MvpViewController -@property (nonatomic,strong) XPFreeGiftModel *freeModel; -///房间内才需要 -@property (nonatomic,weak) id delegate; -/// 送礼物的 -/// @param type 送礼物的类型 -/// @param uid 送礼物的人 -- (instancetype)initWithType:(SendGiftType)type uid:(NSString * __nullable)uid; - -- (instancetype)init NS_UNAVAILABLE; -+ (instancetype)new NS_UNAVAILABLE; -- (instancetype)copy NS_UNAVAILABLE; -- (instancetype)mutableCopy NS_UNAVAILABLE; - -///对外只需要一个 获取麦序的接口 -///完全封闭的一个组件 -- (void)configGiftUsers:(NSArray *)users; - -///选中的礼物id -@property (nonatomic, copy) NSString *selectGiftId; - -// 移除连击相关视图 -- (void)removeAllComboRelatedViews; - -// 强制重置连击状态 -- (void)forceBoomStateReset; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m deleted file mode 100644 index 8ae5432..0000000 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m +++ /dev/null @@ -1,1384 +0,0 @@ -// -// YMSendGiftView.m -// YUMI -// -// Created by YUMI on 2021/11/9. -// - -#import "XPSendGiftView.h" -///Third -#import -#import -#import -///Tool -#import "YUMIMacroUitls.h" -#import "XPGiftPresenter.h" -#import "TTPopup.h" -#import "ThemeColor+SendGift.h" -#import "YUMIHtmlUrl.h" -#import "AccountInfoStorage.h" -#import "NSArray+Safe.h" -#import "ClientConfig.h" -#import "XCCurrentVCStackManager.h" -///Model -#import "GiftInfoModel.h" -#import "XPGiftCountModel.h" -#import "GiftReceiveInfoModel.h" -#import "AttachmentModel.h" -#import "RoomInfoModel.h" -#import "UserInfoModel.h" -#import "WalletInfoModel.h" -#import "XPMessageRemoteExtModel.h" -///View -#import "XPGiftUsersView.h" -#import "PIGiftInfoSegmentedView.h" -#import "XPGiftBarView.h" -#import "XPRoomHalfWebView.h" -#import "XPGraffitiGiftView.h" -#import "XPGiftHeadTypeView.h" -#import "XPGiftLuckyGiftBroadcastView.h" -#import "XPGiftTwelveStarBroadcastView.h" -#import "VIPCenterViewController.h" -#import "PIGiftBravoGiftBroadcastView.h" -///P -#import "XPGiftProtocol.h" -///VC - -#import "XPIAPRechargeViewController.h" -#import "XPWebViewController.h" -#import "PIGiftSuperGiftBroadcastView.h" - -#import "GiftComboManager.h" - -static NSString * const kTargetUidKey = @"targetUid"; - -UIKIT_EXTERN NSString * const kFreeGiftCountdownNotification; - - -@interface XPSendGiftView ()< XPGiftBarViewDelegate, XPGiftProtocol, XPGraffitiGiftViewDelegate, XPGiftUsersViewDelegate, XPGiftHeadTypeViewDelegate, XPGiftLuckyGiftBroadcastViewDelegate, XPGiftTwelveStarBroadcastViewDelegate,PIGiftInfoSegmentedViewDelegate,PIGiftSuperGiftBroadcastViewDelegate> -///顶部的区域 -@property (nonatomic,strong) UIView * topView; -///内容区域 -@property (nonatomic,strong) UIView *contentView; -///模糊背景 -@property (nonatomic, strong) UIVisualEffectView *effectView; -/// -@property (nonatomic,strong) UIStackView *stackView; -///幸运礼物广播 -@property (nonatomic, strong) XPGiftLuckyGiftBroadcastView *luckyBroadcastView; -///星座礼物广播 -@property (nonatomic, strong) XPGiftTwelveStarBroadcastView *constellationBanner; - -@property (nonatomic, strong) PIGiftBravoGiftBroadcastView *bravoGiftView; -///超级礼物 -//@property(nonatomic,strong) PIGiftSuperGiftBroadcastView *superGiftView; -///礼物类型（普通/互动） -@property (nonatomic, strong) XPGiftHeadTypeView *headTypeView; -///送礼物的人 -@property (nonatomic,strong) XPGiftUsersView *userView; -///送的什么礼物 -@property (nonatomic,strong) PIGiftInfoSegmentedView *giftInfoView; -///送多少礼物 -@property (nonatomic,strong) XPGiftBarView *giftBarView; -///底部的View -@property (nonatomic,strong) UIView * bottomView; -///涂鸦礼物 -@property (nonatomic,strong) XPGraffitiGiftView *graffitiView; -///房主的uid/私聊的话 就是用户的uid -@property (nonatomic,copy) NSString *roomUid; -///使用的地方 -@property (nonatomic,assign) SendGiftType usingplaceType; -///普通礼物的重试次数 -@property (nonatomic,assign) int normalGiftRetryCount; -///背包礼物的重试次数 -@property (nonatomic,assign) int packGiftRetryCount; -@property (nonatomic,strong) NSArray *userArray; -///涂鸦礼物的坐标 -@property (nonatomic,strong) NSArray *graffitiPoint; -///选择了滑块的类型 -@property (nonatomic,assign) GiftSegmentType segmentType; -///福袋礼物全服记录 -@property (nonatomic,strong) NSArray *records; -///背包礼物数据 -@property (nonatomic,copy) NSArray * packGiftList; - -@property (nonatomic, assign) bool didLoadPackGiftList; - -@property (nonatomic, strong) NSMutableArray *sendGiftMessageArray; - -@property (nonatomic, strong) GiftComboView *comboView; - -@property (strong, nonatomic) NSOperationQueue *messageQueue; - -@end - -@implementation XPSendGiftView - -- (XPGiftPresenter *)createPresenter { - return [[XPGiftPresenter alloc] init]; -} - --(void)dealloc{ - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [[GiftComboManager sharedManager] registerActions:nil]; - - if (_bravoGiftView) { - [_bravoGiftView endloop]; - } -} - -#pragma mark - 连击状态管理 - -// 移除连击相关视图 -- (void)removeAllComboRelatedViews { - - // 移除连击面板 - if (self.comboView && self.comboView.superview) { - [self.comboView stopTimer]; - [self.comboView endCombo]; - [self.comboView removeFromSuperview]; - self.comboView = nil; - } else if (self.comboView) { - // 🔥 修复：即使没有superview也要清理 - [self.comboView stopTimer]; - [self.comboView endCombo]; - self.comboView = nil; - } - - // 恢复其他视图的显示状态 - self.contentView.hidden = NO; - if (self->_constellationBanner) { - self.constellationBanner.hidden = NO; - } - if (self->_luckyBroadcastView) { - self.luckyBroadcastView.hidden = NO; - } - if (self->_bravoGiftView) { - self.bravoGiftView.hidden = NO; - } - -} - -// 强制重置连击状态 -- (void)forceBoomStateReset { - NSLog(@"🔧 XPSendGiftView 强制重置连击状态"); - - // 1. 移除连击相关视图 - [self removeAllComboRelatedViews]; - - // 2. 重置连击管理器状态 - [[GiftComboManager sharedManager] forceBoomStateReset]; -} - -// 处理连击状态强制重置通知 -- (void)handleBoomStateForceReset:(NSNotification *)notification { - NSLog(@"📢 XPSendGiftView 收到连击状态强制重置通知"); - - // 只处理视图相关的重置，不再调用 GiftComboManager 的重置 - // 因为通知是由 GiftComboManager 发出的，避免循环调用 - [self removeAllComboRelatedViews]; -} - -// 视图控制器生命周期保护 -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; - - // 如果连击正在进行，强制重置 - if ([[GiftComboManager sharedManager] isActive]) { - NSLog(@"📱 礼物面板即将消失，检查连击状态"); - [self forceBoomStateReset]; - } -} - -- (instancetype)initWithType:(SendGiftType)type uid:(NSString * __nullable)uid{ - if (self = [super init]) { - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - self.roomUid = uid; - self.usingplaceType = type; - } - return self; -} - -- (void)viewDidLoad { - - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(getFreeGiftCountdownNotification:) name:kFreeGiftCountdownNotification object:nil]; - - // 注册连击状态强制重置通知 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleBoomStateForceReset:) - name:kBoomStateForceResetNotification - object:nil]; - - [self initSubViews]; - [self initSubViewConstraints]; - [self initHttpRequest]; - - if (self.usingplaceType == SendGiftType_User) { - return; - } - @kWeakify(self); - [[GiftComboManager sharedManager] registerActions:^(ComboActionType type) { - @kStrongify(self); - if (!self) { - return; - } - switch (type) { - case ComboAction_ShowPanel: { - // 🔥 修复：检查连击状态，避免在重置过程中显示面板 - if (![[GiftComboManager sharedManager] isActive]) { - return; - } - - // 🔥 修复：检查usingplaceType，确保在正确的场景下显示面板 - if (self.usingplaceType == SendGiftType_User) { - return; - } - - self.contentView.hidden = YES; -// if (self->_superGiftView) { -// self.superGiftView.hidden = YES; -// } - if (self->_constellationBanner) { - self.constellationBanner.hidden = YES; - } - if (self->_luckyBroadcastView) { - self.luckyBroadcastView.hidden = YES; - } - if (self->_bravoGiftView) { - self.bravoGiftView.hidden = YES; - } - - // 🔥 修复：检查comboView是否已存在，避免重复创建 - if (!self.comboView) { - self->_comboView = [[GiftComboView alloc] init]; - } - - [self.view addSubview:self.comboView]; - [self.comboView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - - // 🔥 修复：在面板显示时设置金币信息 - if (self.giftBarView.walletInfoModel) { - [self.comboView setupCurrentGold:self.giftBarView.walletInfoModel.diamonds.doubleValue]; - } - } - break; - case ComboAction_RemovePanel:{ - self.contentView.hidden = NO; -// if (self->_superGiftView) { -// self.superGiftView.hidden = NO; -// } - if (self->_constellationBanner) { - self.constellationBanner.hidden = NO; - } - if (self->_luckyBroadcastView) { - self.luckyBroadcastView.hidden = NO; - } - if (self->_bravoGiftView) { - self.bravoGiftView.hidden = NO; - } - [self.presenter getUserWalletInfo]; - - // 🔥 修复：正确的清理顺序 - if (self.comboView) { -// [self.comboView stopTimer]; // 先停止Timer -// [self.comboView endCombo]; // 再结束combo - [self.comboView removeFromSuperview]; // 最后移除视图 - self.comboView = nil; // 清空引用 - } - } - break; - case ComboAction_Combo_Count_Update: { - [self.comboView updateCount]; - } - break; - case ComboAction_Error: { - NSString *message = [[GiftComboManager sharedManager] loadErrorMessage]; - if (![NSString isEmpty:message]) { - [self showErrorToast:message]; - } - } - break; - case ComboAction_Update_After_Send_Success: { - GiftReceiveInfoModel *receiveInfo = [GiftComboManager sharedManager].sendGiftReceiveInfo; - if (receiveInfo.sourceType == GiftSourceType_Pack) { - ///更新个数 - [self.giftInfoView updatePackSource:receiveInfo numberUser:receiveInfo.receiveGiftNumberUser]; - } else { - self.giftBarView.walletInfoModel = receiveInfo.userPurse; - } - } - break; - case ComboAction_SendGift_Gold_Update: { - - } - break; - default: - break; - } - }]; -} - -- (void)setupMessageQueue { - if (!_messageQueue) { - _messageQueue = [[NSOperationQueue alloc] init]; - _messageQueue.maxConcurrentOperationCount = 1; // 串行队列 - } -} - -- (GiftComboView *)comboView { - if (!_comboView) { - _comboView = [[GiftComboView alloc] init]; - } - return _comboView; -} - - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.topView]; - [self.view addSubview:self.contentView]; - [self.contentView addSubview:self.effectView]; - [self.contentView addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.graffitiView]; - [self.stackView addArrangedSubview:self.headTypeView]; - [self.stackView addArrangedSubview:self.userView]; - [self.stackView addArrangedSubview:self.giftInfoView]; - [self.stackView addArrangedSubview:self.giftBarView]; - [self.stackView addArrangedSubview:self.bottomView]; -} --(void)getFreeGiftCountdownNotification:(NSNotification *)not{ - NSDictionary *freeDic = not.userInfo; - BOOL isReset = [freeDic[@"isReset"] boolValue];///礼物清零 - - if(isReset == YES){ - [self.presenter getPackGiftList]; - self.giftInfoView.isDelFreeGift = NO; - } -} -- (void)initSubViewConstraints { - [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.contentView.mas_top); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.stackView.mas_top); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; - - [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView); - }]; - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.contentView); - }]; - - [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kSafeAreaBottomHeight); - }]; -} - -- (void)initHttpRequest { -// [self.presenter getNormalGiftList:self.roomUid]; - [self.presenter getTagsAndGifts:self.roomUid]; - [self.presenter getUserInfo:[AccountInfoStorage instance].getUid]; - [self.presenter getUserWalletInfo]; - - [self.presenter luckyGiftBroadcastRecord]; - if (self.didLoadPackGiftList) { - return; - } - self.didLoadPackGiftList = YES; - [self.presenter getPackGiftList]; -} - -#pragma mark - Send Custom Message -- (void)sendGraffitiGiftMessage { - if (self.segmentType == GiftSegmentType_Graffiti && self.graffitiPoint.count > 0) { - AttachmentModel * attachment = [[AttachmentModel alloc] init]; - attachment.first = CustomMessageType_Graffiti_Gift; - attachment.second = Custom_Message_Sub_Graffiti_Gift; - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - [dic setValue:@(self.giftInfoView.lastSelectGift.giftId) forKey:@"giftId"]; - [dic setValue:self.graffitiPoint forKey:@"drawFixedArray"]; - attachment.data = dic; - [self sendCustomMessage:attachment]; - } - - if (self.segmentType == GiftSegmentType_Graffiti) { - NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPSendGiftView3"),self.giftInfoView.lastSelectGift.giftName]; - [self showSuccessToast:title]; - [self dismissViewControllerAnimated:YES completion:nil]; - } -} - -- (void)sendCustomMessage:(GiftReceiveInfoModel *)receiveModel - oringinDic:(NSDictionary *)originDic { - NSDictionary * dict = originDic; - NSMutableDictionary *data = [NSMutableDictionary dictionary]; - [data addEntriesFromDictionary:dict]; - - // 检查连击计数在云信消息中的传递 - NSNumber *comboCount = data[@"comboCount"]; - - // 如果连击计数为 0 或 nil，尝试修复 - if (!comboCount || [comboCount integerValue] < 1) { - NSInteger currentCombo = [[GiftComboManager sharedManager] currentCount]; - [data setObject:@(currentCombo) forKey:@"comboCount"]; - } - - if (receiveModel.roomSendGiftType == RoomSendGiftType_AllMic) { // 全麦 - if (receiveModel.gift.giftType == GiftType_Lucky) { // 如果是福袋 需要分开发送消息 - [self sendLuckyBagGifts:receiveModel - data:data - firstType:CustomMessageType_AllMicroSend - secondType:Custom_Message_Sub_AllMicroLuckySend - isToOne:NO]; - }else { // 全麦赠送普通礼物 包含背包礼物 - if (receiveModel.gift.showAvatarType > 0) { - [self handleEmbeddedValueGiftsMessage:receiveModel - oringinDic:data - isToOne:NO]; - } else { - [self sendGiftToMultipleMessage:data isAll:YES]; - } - } - } else if (receiveModel.roomSendGiftType == RoomSendGiftType_MutableOnMic) { // 多人非全麦 - if (receiveModel.gift.giftType == GiftType_Lucky) { // 多人非全麦 福袋礼物 - [self sendLuckyBagGifts:receiveModel - data:data - firstType:CustomMessageType_AllMicroSend - secondType:Custom_Message_Sub_AllBatchMicroLuckySend - isToOne:NO]; - } else { // 多人非全麦 普通礼物 - if (receiveModel.gift.showAvatarType > 0) { - [self handleEmbeddedValueGiftsMessage:receiveModel - oringinDic:data - isToOne:NO]; - } else { - [self sendGiftToMultipleMessage:data isAll:NO]; - } - } - } else if (receiveModel.roomSendGiftType == RoomSendGiftType_ToOne) { // 单人 - if (receiveModel.gift.giftType == GiftType_Lucky) { // 一对一 福袋礼物 - [self sendLuckyBagGifts:receiveModel - data:data - firstType:CustomMessageType_Gift - secondType:Custom_Message_Sub_Gift_LuckySend - isToOne:NO]; - }else { // 一对一 普通礼物 - if (receiveModel.gift.showAvatarType > 0) { - [self handleEmbeddedValueGiftsMessage:receiveModel - oringinDic:data - isToOne:YES]; - } else { - [self sendGiftToOneMessage:data]; - } - } - } -} - -- (void)handleEmbeddedValueGiftsMessage:(GiftReceiveInfoModel *)receiveModel - oringinDic:(NSMutableDictionary *)data - isToOne:(BOOL)isToOne { - // 需要显示嵌入内容的动画，都发 second = 31，如果是送多人，则遍历发送 - [self setupMessageQueue]; - @kWeakify(self); - NSArray *targetUsers = [data objectForKey:@"targetUsers"]; - for (NSDictionary *obj in targetUsers) { - AttachmentModel *attachment = [[AttachmentModel alloc] init]; - attachment.first = CustomMessageType_Gift; - attachment.second = Custom_Message_Sub_Gift_Send; - [data setObject:[[obj objectForKey:@"uid"] stringValue] forKey:kTargetUidKey]; - [data setObject:[obj objectForKey:@"nick"] forKey:@"targetNick"]; - [data setObject:[obj objectForKey:@"avatar"] forKey:@"targetAvatar"]; - attachment.data = data; - NSBlockOperation *operation = [NSBlockOperation blockOperationWithBlock:^{ - @kStrongify(self); - [self sendCustomMessage:attachment]; - }]; - [self.messageQueue addOperation:operation]; - } -} - -- (void)sendGiftToOneMessage:(NSMutableDictionary *)data { - AttachmentModel *attachment = [[AttachmentModel alloc] init]; - attachment.first = CustomMessageType_Gift; - attachment.second = Custom_Message_Sub_Gift_Send; - NSDictionary *targetUsers = ((NSArray *)[data objectForKey:@"targetUsers"]).firstObject; - if (targetUsers.count == 0) { - return; - } - [data setObject:[targetUsers valueForKeyPath:@"uid"] forKey:kTargetUidKey]; - [data setObject:[targetUsers valueForKeyPath:@"nick"] forKey:@"targetNick"]; - [data setObject:[targetUsers valueForKeyPath:@"avatar"] forKey:@"targetAvatar"]; - attachment.data = data; - [self sendCustomMessage:attachment]; -} - -- (void)sendGiftToMultipleMessage:(NSMutableDictionary *)data isAll:(BOOL)isALl{ - AttachmentModel *attachment = [[AttachmentModel alloc] init]; - attachment.first = CustomMessageType_AllMicroSend; - attachment.second = isALl ? Custom_Message_Sub_AllMicroSend : Custom_Message_Sub_AllBatchSend; - [data setObject:[data valueForKeyPath:@"targetUsers.uid"] forKey:@"targetUids"]; - attachment.data = data; - [self sendCustomMessage:attachment]; -} - -- (void)sendLuckyBagGifts:(GiftReceiveInfoModel *)receiveModel - data:(NSMutableDictionary *)data - firstType:(NSUInteger)first - secondType:(NSUInteger)second - isToOne:(BOOL)isToOne { - @kWeakify(self); - NSArray *luckyBagGifts = (NSArray *)[data objectForKey:@"luckyBagGifts"]; - [luckyBagGifts enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - @kStrongify(self); - NSMutableDictionary *tempData = [NSMutableDictionary dictionaryWithDictionary:data.copy]; - - AttachmentModel * attachment = [[AttachmentModel alloc] init]; - attachment.first = (int)first; - attachment.second = (int)second; - - [tempData setObject:idx == 0 ? @(YES):@(NO) forKey:@"isShowAnimation"]; - [tempData setObject:obj forKey:@"luckyGiftList"]; - [tempData setObject:receiveModel.gift.giftName forKey:@"giftName"]; - [tempData setObject:[obj valueForKeyPath:@"user.uid"] forKey:kTargetUidKey]; - if (isToOne) { - [tempData setObject:[obj valueForKeyPath:@"user.nick"] forKey:@"targetNick"]; - } - [tempData setObject:[data valueForKeyPath:@"targetUsers.uid"] forKey:@"targetUids"]; - if ([tempData valueForKeyPath:@"gift.luckyGiftSvgaUrl"]) { - [tempData setObject:[data valueForKeyPath:@"gift.luckyGiftSvgaUrl"] forKey:@"luckyGiftSvgaUrl"]; - } - - attachment.data = tempData; - [self sendCustomMessage:attachment]; - }]; -} - -- (void)sendCustomMessage:(AttachmentModel *)attachment { - NSString *sessionID = self.usingplaceType == SendGiftType_User ? [NSString stringWithFormat:@"%ld", self.userArray.firstObject.uid] : [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].roomId]; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - - attachment.data = [self removeNSNullValuesAndEmptyStringsRecursively:attachment.data]; - - object.attachment = attachment; - message.messageObject = object; - - UserInfoModel *userInfo = [self.delegate getUserInfo]; - XPMessageRemoteExtModel *extModel = [[XPMessageRemoteExtModel alloc] init]; - extModel.androidBubbleUrl = userInfo.androidBubbleUrl; - extModel.iosBubbleUrl = userInfo.iosBubbleUrl; - extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; - extModel.platformRole = userInfo.platformRole; - NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[NSString stringWithFormat:@"%ld", userInfo.uid]]; - message.remoteExt = remoteExt; - NIMSessionType sessionType = self.usingplaceType == SendGiftType_Room ? NIMSessionTypeChatroom : NIMSessionTypeP2P; - //构造会话 - NIMSession *session = [NIMSession session:sessionID type:sessionType]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - BOOL onMain = [NSThread isMainThread]; - if (error) { - NSLog(@"[Combo effect][Send] ❌ 发送失败 | sessionId=%@ | code=%ld | desc=%@ | main=%@ | ts=%.3f", - sessionID, (long)error.code, error.localizedDescription, onMain ? @"YES" : @"NO", [[NSDate date] timeIntervalSince1970]); - } else { - NSLog(@"[Combo effect][Send] ✅ 发送成功 | sessionId=%@ | main=%@ | ts=%.3f", - sessionID, onMain ? @"YES" : @"NO", [[NSDate date] timeIntervalSince1970]); - } - }]; -} - -- (id)removeNSNullValuesAndEmptyStringsRecursively:(id)object { - // 处理字典 - if ([object isKindOfClass:[NSDictionary class]]) { - NSMutableDictionary *cleanedDictionary = [NSMutableDictionary dictionary]; - [(NSDictionary *)object enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) { - // 检查是否需要跳过特定键 - if ([key isKindOfClass:[NSString class]] && - ([key isEqualToString:@"userPurse"] || [key isEqualToString:@"hasSvga"])) { - return; // 跳过这些键 - } - - // 递归清理子对象 - id cleanedValue = [self removeNSNullValuesAndEmptyStringsRecursively:obj]; - if (cleanedValue) { - cleanedDictionary[key] = cleanedValue; - } - }]; - return [cleanedDictionary copy]; - } - - // 处理数组 - else if ([object isKindOfClass:[NSArray class]]) { - NSMutableArray *cleanedArray = [NSMutableArray array]; - for (id obj in (NSArray *)object) { - id cleanedValue = [self removeNSNullValuesAndEmptyStringsRecursively:obj]; - if (cleanedValue) { - [cleanedArray addObject:cleanedValue]; - } - } - return [cleanedArray copy]; - } - - // 检查是否是 NSNull 或空字符串 - else if ([object isKindOfClass:[NSNull class]] || - ([object isKindOfClass:[NSString class]] && [(NSString *)object length] == 0)) { - return nil; - } - - // 保留其他类型 - return object; -} - -#pragma mark - Deal Send Gift Data -- (NSString *)dealSendGiftCount:(XPGiftCountModel *)model gift:(GiftInfoModel *)gift { - NSString * count = @"1"; - if (model.isTotal) { - count = [NSString stringWithFormat:@"%ld", gift.count]; - } else { - count = model.giftNumber; - } - - if (self.segmentType == GiftSegmentType_Graffiti) { - count = [NSString stringWithFormat:@"%ld", self.graffitiPoint.count]; - } - return count; -} - -- (NSString *)dealSendGiftUids:(NSArray *)uids { - NSString *uidString = [[NSString alloc] init]; - for (NSString *item in uids) { - if (uidString.length > 0) { - uidString = [uidString stringByAppendingString:@","]; - } - uidString = [uidString stringByAppendingString:item]; - } - return uidString; -} - -- (RoomSendGiftType)dealRoomSendGiftType:(GiftInfoModel *)giftInfo giftCount:(XPGiftCountModel *)giftCount { - NSArray * uids = [self.userView getSelectUserList]; - RoomSendGiftType roomSendGiftType; - if (self.userView.isSelectAll) { - if (giftInfo.sourceType == GiftSourceType_Pack && giftCount.isTotal && giftInfo && uids.count > 1) { - [self showErrorToast:YMLocalizedString(@"XPSendGiftView0")]; - roomSendGiftType = -1; - } else { -// if (uids.count == 1) { -// roomSendGiftType = RoomSendGiftType_ToOne; -// } else { - roomSendGiftType = RoomSendGiftType_AllMic; -// } - } - } else if(uids.count > 1) { - if (giftInfo.sourceType == GiftSourceType_Pack && giftCount.isTotal) { - [self showErrorToast:YMLocalizedString(@"XPSendGiftView1")]; - roomSendGiftType = -1; - } else { - roomSendGiftType = RoomSendGiftType_MutableOnMic; - } - } else if(uids.count == 1) { - roomSendGiftType = RoomSendGiftType_ToOne; - } else { - roomSendGiftType = -1; - } - return roomSendGiftType; -} - -#pragma mark - Public Method -- (void)configGiftUsers:(NSArray *)users { - self.userArray = users; - [self.userView configGiftUsers:users]; - if (users.count <= 0 || self.usingplaceType == SendGiftType_User) { - self.userView.hidden = YES; - } else { - self.userView.hidden = NO; - } -} - -/// 初始化/重置 连击礼物功能状态 -- (void)readyForCombo:(XPGiftCountModel *)giftCount - gift:(GiftInfoModel *)giftInfo { - - // 🔥 修复：检查usingplaceType，私聊模式不支持连击 - if (self.usingplaceType == SendGiftType_User) { - [[GiftComboManager sharedManager] deactivate]; - return; - } - - if (self.segmentType == GiftSegmentType_Pack) { - [[GiftComboManager sharedManager] deactivate]; - return; - } - - if (giftInfo.giftType != GiftType_Game && - giftInfo.giftType != GiftType_super && - giftInfo.giftType != GiftType_Lucky24 && - giftInfo.giftType != GiftType_Lucky25 && - giftInfo.giftType != GiftType_Bravo) { - [[GiftComboManager sharedManager] deactivate]; - return; - } - - [[GiftComboManager sharedManager] activate]; - - NSString *sessionID = self.usingplaceType == SendGiftType_User ? [NSString stringWithFormat:@"%ld", self.userArray.firstObject.uid] : [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].roomId]; - - // 使用新的统一配置方法替代多个save方法 - [[GiftComboManager sharedManager] configureWithGiftInfo:giftInfo - targetUIDs:[self.userView getSelectUserList] - roomUID:self.roomUid - sessionID:sessionID - userInfo:self.delegate.getUserInfo - countModel:giftCount - sourceType:giftInfo.sourceType - sendType:[self dealRoomSendGiftType:giftInfo giftCount:giftCount] - giftNum:[self dealSendGiftCount:giftCount gift:giftInfo]]; - -} - -#pragma mark - XPGiftBarViewDelegate -- (void)xPGiftBarView:(XPGiftBarView *)view didClickSendGift:(XPGiftCountModel *)giftCount { -///总礼物 三要素 送礼物的人 送的什么礼物 送多少个礼物 - NSArray * uids = [self.userView getSelectUserList]; - GiftInfoModel *giftInfo = self.giftInfoView.lastSelectGift; - if (self.usingplaceType == SendGiftType_Room) { - if (uids.count > 0) { - [self readyForCombo:giftCount - gift:giftInfo]; - ///送礼物的人 - NSString * uidString = [self dealSendGiftUids:uids]; - ///送礼物的个数 - NSString * giftNumber = [self dealSendGiftCount:giftCount gift:giftInfo]; - ///送的什么礼物 - NSString * giftId = [NSString stringWithFormat:@"%ld", giftInfo.giftId]; - ///给麦上的人送礼物 - GiftSendType sendType = GiftSendType_OnMic; - ///礼物来源 - GiftSourceType sourceType = giftInfo.sourceType; - if(sourceType != GiftSourceType_Normal && sourceType != GiftSourceType_Pack){ - sourceType = _segmentType == GiftSegmentType_Pack ? GiftSourceType_Pack : GiftSourceType_Normal; - } - ///送一个人 还是全麦 还是多人非全麦 - RoomSendGiftType roomSendType = [self dealRoomSendGiftType:giftInfo giftCount:giftCount]; - if (roomSendType == -1) { - return; - } - self.giftBarView.sendButtonIsEnable = NO; - ///发送消息 - [self.presenter sendGift:uidString giftNum:giftNumber sendType:sendType giftId:giftId giftSource:sourceType giftType:giftInfo.giftType roomSendType:roomSendType roomUid:self.roomUid msg:@""]; - } else { - [self showErrorToast:YMLocalizedString(@"XPSendGiftView2")]; - } - } else if(self.usingplaceType == SendGiftType_User) { - ///送礼物的人 - NSString * uidString = [self dealSendGiftUids:uids]; - ///送礼物的个数 - NSString * giftNumber = [self dealSendGiftCount:giftCount gift:giftInfo]; - ///送的什么礼物 - NSString * giftId = [NSString stringWithFormat:@"%ld", giftInfo.giftId]; - ///给麦上的人送礼物 - GiftSendType sendType = GiftSendType_Chat; - ///礼物来源 - GiftSourceType sourceType = giftInfo.sourceType; - if(sourceType != GiftSourceType_Normal && sourceType != GiftSourceType_Pack){ - sourceType = _segmentType == GiftSegmentType_Pack ? GiftSourceType_Pack :GiftSourceType_Normal; - } - ///送一个人 还是全麦 还是多人非全麦 - RoomSendGiftType roomSendType = RoomSendGiftType_ToOne; - self.giftBarView.sendButtonIsEnable = NO; - [self.presenter sendGift:uidString giftNum:giftNumber sendType:sendType giftId:giftId giftSource:sourceType giftType:giftInfo.giftType roomSendType:roomSendType roomUid:self.roomUid msg:@""]; - } -} - -///充值 -- (void)xPGiftBarViewDidClickRecharge:(XPGiftBarView *)view { -// @kWeakify(self); - [self dismissViewControllerAnimated:NO completion:^{ -// @kStrongify(self); - XPIAPRechargeViewController * rechargeVC = [[XPIAPRechargeViewController alloc] init]; - rechargeVC.type = @"4"; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:rechargeVC animated:YES]; - }]; -} - -- (void)xPGiftBarViewDidClickFirstRecharge:(XPGiftBarView *)view { -// @kWeakify(self); - [self dismissViewControllerAnimated:NO completion:^{ -// @kStrongify(self); -// [[NSNotificationCenter defaultCenter]postNotificationName:kShowFirstRechargeView object:@{@"type":@"1",@"diamonds": self.giftBarView.walletInfoModel.diamonds ?: @"0"}]; - }]; -} - -#pragma mark - XPGiftLuckyGiftBroadcastViewDelegate -///点击了玩法说明 -- (void)xPGiftLuckyGiftBroadcastViewPlayDescClick { - NSString * giftExplainUrl; - if (self.segmentType == GiftSegmentType_Lucky) { - giftExplainUrl = [NSString stringWithFormat:URLWithType(kLuckyGiftPlayRuleURL), [NSString stringWithFormat:@"%ld", self.giftInfoView.lastSelectGift.giftId]]; - } else { - giftExplainUrl = self.giftInfoView.lastSelectGift.giftExplainUrl; - } - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = giftExplainUrl; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; -} -#pragma mark - PIGiftSuperGiftBroadcastViewDelegate -- (void)pIGiftSuperGiftBroadcastViewClickWithModel:(GiftInfoModel *)giftModel{ - if ([NSString isEmpty:giftModel.skipUrl]) { - return; - } - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = giftModel.skipUrl; - [TTPopup popupView:webView style:TTPopupStyleActionSheet]; -} -#pragma mark - XPGiftWeekStarBroadcastViewDelegate -///点击了周星榜入口 -- (void)xPGiftWeekStarBroadcastViewWeekStarClick { - @kWeakify(self); - [self dismissViewControllerAnimated:NO completion:^{ - @kStrongify(self); - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:self.roomUid]; - webVC.url = URLWithType(kNewWeekStarURL); - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; - }]; -} - -#pragma mark - XPGiftHeadTypeViewDelegate -///点击了VIP -- (void)xPGiftHeadTypeViewDidClickNoble:(XPGiftHeadTypeView *)view { - @kWeakify(self); - [self dismissViewControllerAnimated:NO completion:^{ - @kStrongify(self); -// VIPCenterViewController * nobleVC = [[VIPCenterViewController alloc] initWithRoomUid:self.delegate.getRoomInfo.uid]; -// [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:nobleVC animated:YES]; - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:@(self.delegate.getRoomInfo.uid).stringValue]; - webVC.url = URLWithType(kVIP); - [self.navigationController pushViewController:webVC animated:YES]; - }]; -} -///点击了首充 -- (void)xPGiftHeadTypeViewDidClickFirstRecharge:(XPGiftHeadTypeView *)view { -// @kWeakify(self); - [self dismissViewControllerAnimated:NO completion:^{ -// @kStrongify(self); -// [[NSNotificationCenter defaultCenter]postNotificationName:kShowFirstRechargeView object:@{@"type":@"1",@"diamonds": self.giftBarView.walletInfoModel.diamonds ?: @"0"}]; - }]; - -} -///点击了礼物 -- (void)xPGiftHeadTypeViewDidClickGift:(XPGiftHeadTypeView *)view { - [self.luckyBroadcastView removeFromSuperview]; -// [self.superGiftView removeFromSuperview]; - [self.bravoGiftView removeFromSuperview]; -// [self.giftInfoView giftHeadTypeHadChange:1]; - if (!self.graffitiView.hidden) {//清空涂鸦礼物 - [self.graffitiView clearData]; - [self.graffitiView cratePriceAttribute]; - [UIView animateWithDuration:0.2 animations:^{ - self.graffitiView.hidden = YES; - self.giftInfoView.hidden = NO; - }]; - } -} -///点击了互动 -- (void)xPGiftHeadTypeViewDidClickInteraction:(XPGiftHeadTypeView *)view { - [self.luckyBroadcastView removeFromSuperview]; -// [self.superGiftView removeFromSuperview]; - [self.bravoGiftView removeFromSuperview]; -// [self.giftInfoView giftHeadTypeHadChange:2]; -} - -#pragma mark - PIGiftInfoSegmentedViewDelegate -///点击了切换不同礼物的tabbar -- (void)pIGiftInfoSegmentedView:(PIGiftInfoSegmentedView *)view didClickSegment:(GiftSegmentType)type{ - self.segmentType = type; - self.giftBarView.userInfo = [self.delegate getUserInfo]; - self.giftBarView.type = type; - self.giftBarView.drawGiftCount = 10; -// [self.superGiftView removeFromSuperview]; - [self.luckyBroadcastView removeFromSuperview]; - [self.bravoGiftView removeFromSuperview]; - [self.constellationBanner removeFromSuperview]; - - switch (type) { - case GiftSegmentType_Bravo: { - if (!self.bravoGiftView.superview) { - [self.view addSubview:self.bravoGiftView]; - [self.bravoGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.contentView.mas_top); - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(kGetScaleWidth(80)); - }]; - } - } - break; - case GiftSegmentType_Lucky: { - if (!self.luckyBroadcastView.superview) { - [self.view addSubview:self.luckyBroadcastView]; - [self.luckyBroadcastView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.contentView.mas_top); - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(kGetScaleWidth(56)); - }]; - } - } - break; - case GiftSegmentType_SuperLucky: { -// if (!self.superGiftView.superview) { -// self.superGiftView.giftModel = self.giftInfoView.lastSelectGift; -// [self.view addSubview:self.superGiftView]; -// [self.superGiftView mas_remakeConstraints:^(MASConstraintMaker *make) { -// make.bottom.mas_equalTo(self.contentView.mas_top); -// make.leading.trailing.mas_equalTo(0); -// make.height.mas_equalTo(kGetScaleWidth(90)); -// }]; -// } - } - break; - case GiftSegmentType_WeekStar: { - if (!self.constellationBanner.superview) { - [self.view addSubview:self.constellationBanner]; - [self.constellationBanner mas_remakeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.contentView.mas_top); - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(kGetScaleWidth(56)); - }]; - } - } - break; - case GiftSegmentType_Pack: { - if (!self.didLoadPackGiftList) { - self.didLoadPackGiftList = YES; - [self.giftInfoView showLoading]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_global_queue(0, 0), ^{ - [self.presenter getPackGiftList]; - }); - } - } - break; - default: - break; - } -} - -///点击了某个item -- (void)pIGiftInfoSegmentedView:(PIGiftInfoSegmentedView *)view didClickItem:(GiftInfoModel *)info type:(GiftSegmentType)type{ - switch (type) { - case GiftSegmentType_Bravo: - [self.constellationBanner removeFromSuperview]; -// [self.superGiftView removeFromSuperview]; - [self.luckyBroadcastView removeFromSuperview]; - if (!self.bravoGiftView.superview) { - [self.view addSubview:self.bravoGiftView]; - [self.bravoGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.contentView.mas_top); - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(kGetScaleWidth(80)); - }]; - } - break; - case GiftSegmentType_Lucky:{ - [self.bravoGiftView removeFromSuperview]; - [self.constellationBanner removeFromSuperview]; -// [self.superGiftView removeFromSuperview]; - if (!self.luckyBroadcastView.superview) { - [self.view addSubview:self.luckyBroadcastView]; - [self.luckyBroadcastView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.contentView.mas_top); - make.leading.trailing.mas_equalTo(0); - make.height.mas_equalTo(kGetScaleWidth(56)); - }]; - } - } - break; - case GiftSegmentType_SuperLucky: { - [self.bravoGiftView removeFromSuperview]; - [self.constellationBanner removeFromSuperview]; - [self.luckyBroadcastView removeFromSuperview]; -// self.superGiftView.giftModel = info; -// if (!self.superGiftView.superview) { -// [self.view addSubview:self.superGiftView]; -// [self.superGiftView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.bottom.mas_equalTo(self.contentView.mas_top); -// make.leading.trailing.mas_equalTo(0); -// make.height.mas_equalTo(kGetScaleWidth(90)); -// }]; -// } - } - break; - case GiftSegmentType_Graffiti: { - self.giftInfoView.hidden = YES; - self.graffitiView.hidden = NO; - self.graffitiView.price = info.goldPrice; - self.giftBarView.drawGiftCount = 0; - self.graffitiView.selectUidNumber = [self.userView getSelectUserList].count; - @kWeakify(self); - [[SDWebImageManager sharedManager] loadImageWithURL:[NSURL URLWithString:info.giftUrl] - options:SDWebImageProgressiveLoad - progress:nil - completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL) { - @kStrongify(self); - if (error == nil && image) { - self.graffitiView.image = image; - } else { - self.giftInfoView.hidden = NO; - } - }]; - } - case GiftSegmentType_WeekStar: - self.constellationBanner.giftInfo = info; - break; - default: - self.giftBarView.drawGiftCount = 10; - break; - } -} - - -#pragma mark - XPGiftUsersViewDelegate -- (void)xPGiftUsersView:(XPGiftUsersView *)view didSelectUsers:(NSArray *)selectUids { - self.graffitiView.selectUidNumber = selectUids.count; -} - -#pragma mark - XPGraffitiGiftViewDelegate -- (void)xPGraffitiGiftView:(XPGraffitiGiftView *)view didClickClose:(UIButton *)sender { - [UIView animateWithDuration:0.2 animations:^{ - self.graffitiView.hidden = YES; - self.giftInfoView.hidden = NO; - }]; -} - -- (void)xPGraffitiGiftView:(XPGraffitiGiftView *)view didClickChange:(UIButton *)sender { - [UIView animateWithDuration:0.2 animations:^{ - self.graffitiView.hidden = YES; - self.giftInfoView.hidden = NO; - }]; -} - -- (void)xPGraffitiGiftView:(XPGraffitiGiftView *)view didDrawCompletion:(NSArray *)pointArray { - self.graffitiPoint = pointArray; - self.giftBarView.drawGiftCount = self.graffitiPoint.count; -} - -#pragma mark - XPGiftTwelveStarBroadcastViewDelegate -- (void)xPGiftTwelveStarBroadcastView:(XPGiftTwelveStarBroadcastView *)view didClickDetail:(UIButton *)sender { - [self dismissViewControllerAnimated:NO completion:^{ - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:self.roomUid]; - webVC.url = URLWithType(kNewWeekStarURL); - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; - }]; -} - -#pragma mark - XPGiftProtocol -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { - self.headTypeView.isShowFirstRecharge = userInfo.isFirstCharge; - self.giftInfoView.curUserNobleLevel = userInfo.userVipInfoVO.vipLevel; -} - -- (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo { - self.giftBarView.walletInfoModel = balanceInfo; -} -///背包礼物 -- (void)getPacketGiftListSuccess:(NSArray *)giftList { - - [self.giftInfoView hideLoading]; - self.packGiftList = giftList; - NSMutableArray *giftArray = [NSMutableArray arrayWithArray:self.packGiftList]; - BOOL isHaveFreeGift = NO; - for (int i = 0 ; i < self.packGiftList.count; i++) { - GiftInfoModel *infoModel = self.packGiftList[i]; - if(infoModel.giftId == self.freeModel.giftId.integerValue){ - if (i < giftArray.count) { - [giftArray xpSafeRemoveObjectAtIndex:i]; - [giftArray xpSafeInsertObject:infoModel atIndex:0]; - isHaveFreeGift = YES; - break; - } - } - } - if(isHaveFreeGift == NO && self.freeModel.curStage != nil && self.freeModel.curStage.integerValue == 0 ){ - GiftInfoModel *infoModel = [GiftInfoModel new]; - infoModel.giftId = self.freeModel.giftId.integerValue; - infoModel.count = 0; - infoModel.giftUrl = self.freeModel.giftUrl; - infoModel.giftName = self.freeModel.giftName; - [giftArray insertObject:infoModel atIndex:0]; - } - self.giftInfoView.freeModel = self.freeModel; - self.giftInfoView.packOriginArray = giftArray; -} - -- (void)getPacketGiftListFail:(NSString *)message { - [self.giftInfoView hideLoading]; - self.packGiftRetryCount ++; - if (self.packGiftRetryCount <= 10) { - @kWeakify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - if (self) { - [self.presenter getPackGiftList]; - } - }); - } -} - -///普通礼物 /幸运礼物 -- (void)getNormalGiftListSuccess:(NSArray *)giftList { - self.giftInfoView.normalOriginArray = giftList; -} - -- (void)getTagsSuccess:(NSArray *)tags { - self.giftInfoView.tagsArray = tags; -} - -- (void)getNormalGiftListFail:(NSString *)message { - self.normalGiftRetryCount ++; - if (self.normalGiftRetryCount <= 10) { - @kWeakify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - if (self) { - [self.presenter getTagsAndGifts:self.roomUid]; - } - }); - } -} - -- (void)sendGiftSuccess:(GiftReceiveInfoModel *)receiveInfo - originDic:(NSDictionary *)originDic - uidCount:(NSInteger)uidCount{ - self.giftBarView.sendButtonIsEnable = YES; - if (receiveInfo.sourceType == GiftSourceType_Pack) { - ///更新个数 - [self.giftInfoView updatePackSource:receiveInfo numberUser:uidCount]; - } else { - self.giftBarView.walletInfoModel = receiveInfo.userPurse; - } - - - - if ([GiftComboManager sharedManager].enableCombo && self.usingplaceType == SendGiftType_Room) { - - // 检查 originDic 中的连击计数 - NSNumber *originComboCount = originDic[@"comboCount"]; - if (!originComboCount) { - NSMutableDictionary *editDic = originDic.mutableCopy; - editDic[@"comboCount"] = @(1); - originDic = editDic.copy; - } - - [[GiftComboManager sharedManager] reset]; - - // 🔥 修复：移除直接访问comboView，避免提前创建 - // [self.comboView setupCurrentGold:receiveInfo.userPurse.diamonds.doubleValue]; - - @kWeakify(self); - [[GiftComboManager sharedManager] setHandleComboSuccess:^(GiftReceiveInfoModel * _Nonnull receiveModel, NSMutableDictionary * _Nonnull originDic) { - @kStrongify(self); - [self sendCustomMessage:receiveInfo oringinDic:originDic.copy]; - }]; - } else { - } - - [self sendCustomMessage:receiveInfo oringinDic:originDic]; -} - -///送礼物失败 -- (void)sendGiftFailWithCode:(NSInteger)code msg:(NSString *)msg { - self.giftBarView.sendButtonIsEnable = YES; - if (code == 31005) {// 余额不足 - [self showNotSufficientFundsWithToast:msg]; - } else if (code == 8535) {//VIP等级未达到礼物等级 - - GiftInfoModel * giftInfo = self.giftInfoView.lastSelectGift; - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.actionStyle = TTAlertActionConfirmStyle; - config.message = [NSString stringWithFormat:YMLocalizedString(@"XPSendGiftView4"), giftInfo.giftName, giftInfo.giftVipInfo.vipName]; - [TTPopup alertWithConfig:config confirmHandler:^{ - - } cancelHandler:^{ - - }]; - } else { - [self showErrorToast:msg]; - } -} - -/// 余额不足，是否弹首充弹窗 -- (void)showNotSufficientFundsWithToast:(NSString *)msg { - if (self.delegate.getUserInfo.isFirstCharge) { - [self dismissViewControllerAnimated:NO completion:^{ -// [[NSNotificationCenter defaultCenter]postNotificationName:kShowFirstRechargeView object:@{@"type":self.delegate != nil ? @"2" : @"9",@"diamonds": self.giftBarView.walletInfoModel.diamonds ?: @"0"}]; - }]; - } else { - [self showErrorToast:msg]; - } -} - -- (void)luckyGiftBroadcastRecordSuccess:(NSArray *)records { - self.records = records; - self.luckyBroadcastView.records = records; -} - -- (void)getTwelveStarLastRankFirstSuccess:(GiftTwelveStarFirstModel *)model { - -} - -#pragma mark - Event Response -- (void)disMissViewRecognizer:(UITapGestureRecognizer *)tap { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - Getters And Setters -- (void)setUsingplaceType:(SendGiftType)usingplaceType { - _usingplaceType = usingplaceType; - self.giftBarView.userInfo = [self.delegate getUserInfo]; - self.giftBarView.usingplaceType = usingplaceType; - self.giftInfoView.usingPlaceType = _usingplaceType; - self.headTypeView.hidden = _usingplaceType == SendGiftType_User; - self.userView.hidden = _usingplaceType == SendGiftType_User; - self.effectView.hidden = _usingplaceType == SendGiftType_User; - if (_usingplaceType == SendGiftType_User) { - self.contentView.backgroundColor = [UIColor whiteColor]; - } -} - -- (void)setSelectGiftId:(NSString *)selectGiftId { - _selectGiftId = selectGiftId; -// self.giftInfoView.defaultSelectGiftId = selectGiftId; -} - -- (void)setDelegate:(id)delegate { - _delegate = delegate; - if (_delegate) { - self.giftInfoView.roomType = _delegate.getRoomInfo.type; - } -} - -- (UIView *)topView { - if (!_topView) { - _topView = [[UIView alloc] init]; - _topView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(disMissViewRecognizer:)]; - [_topView addGestureRecognizer:tap]; - } - return _topView; -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, KScreenHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(8, 8)]; - CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init]; - maskLayer.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); - maskLayer.path = maskPath.CGPath; - _contentView.layer.mask = maskLayer; - } - return _contentView; -} - -- (XPGiftUsersView *)userView { - if (!_userView) { - _userView = [[XPGiftUsersView alloc] init]; - _userView.delegate = self; - } - return _userView; -} - -- (PIGiftInfoSegmentedView *)giftInfoView { - if (!_giftInfoView) { - _giftInfoView = [[PIGiftInfoSegmentedView alloc] initWithFrame:CGRectZero]; - _giftInfoView.delegate = self; - } - return _giftInfoView; -} - -- (XPGiftBarView *)giftBarView { - if (!_giftBarView) { - _giftBarView = [[XPGiftBarView alloc] init]; - _giftBarView.delegate = self; - } - return _giftBarView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 0; - _stackView.backgroundColor = [UIColor clearColor]; - } - return _stackView; -} - -- (UIView *)bottomView { - if (!_bottomView) { - _bottomView = [[UIView alloc] init]; - _bottomView.backgroundColor = [UIColor clearColor]; - } - return _bottomView; -} - -- (XPGraffitiGiftView *)graffitiView { - if (!_graffitiView) { - _graffitiView = [[XPGraffitiGiftView alloc] init]; - _graffitiView.hidden = YES; - _graffitiView.delegate = self; - } - return _graffitiView; -} - -- (XPGiftHeadTypeView *)headTypeView { - if (!_headTypeView) { - _headTypeView = [[XPGiftHeadTypeView alloc] init]; - _headTypeView.delegate = self; - } - return _headTypeView; -} - -- (XPGiftLuckyGiftBroadcastView *)luckyBroadcastView { - if (!_luckyBroadcastView) { - _luckyBroadcastView = [[XPGiftLuckyGiftBroadcastView alloc] init]; - _luckyBroadcastView.delegate = self; - } - return _luckyBroadcastView; -} - -- (XPGiftTwelveStarBroadcastView *)constellationBanner { - if (!_constellationBanner) { - _constellationBanner = [[XPGiftTwelveStarBroadcastView alloc] initWithFrame:CGRectZero]; - _constellationBanner.delegate = self; - } - return _constellationBanner; -} - -- (UIVisualEffectView *)effectView { - if (!_effectView) { - UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; - _effectView = [[UIVisualEffectView alloc] initWithEffect:beffect]; - } - return _effectView; -} -//- (PIGiftSuperGiftBroadcastView *)superGiftView{ -// if(!_superGiftView){ -// _superGiftView = [[PIGiftSuperGiftBroadcastView alloc]initWithFrame:CGRectZero]; -// _superGiftView.delegate = self; -// } -// return _superGiftView; -//} - -- (PIGiftBravoGiftBroadcastView *)bravoGiftView { - if (!_bravoGiftView) { - _bravoGiftView = [[PIGiftBravoGiftBroadcastView alloc] initWithFrame:CGRectZero]; - } - return _bravoGiftView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Api/Api+RedPacket.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Api/Api+RedPacket.h deleted file mode 100644 index c103b9d..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Api/Api+RedPacket.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// Api+RedPacket.h -// YUMI -// -// Created by YUMI on 2022/8/31. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (RedPacket) - -/// 发送红包 -/// @param completion 完成 -/// @param num 红包数量 -/// @param goldNum 钻石数量 -/// @param roomUId 房间uid,不知道谁写接口参数的，i要大写，不然房间红包不生效（无语） -/// @param type 类型 1：房间， 2：全服 -/// @param password 密码 -/// @param message 消息 -/// @param kind 红包种类 0 旧版本 1 无门槛红包 2 关注红包 3 分享红包 4 弹幕红包 -+ (void)sendRedPacket:(HttpRequestHelperCompletion)completion num:(NSString *)num goldNum:(NSString *)goldNum roomUId:(NSString *)roomUId type:(NSString *)type password:(NSString *)password message:(NSString *)message kind:(NSString *)kind validityType:(NSString *)validityType; - - -/// 抢红包 -/// @param completion 完成 -/// @param redEnvelopeId 红包id -+ (void)openRedPacket:(HttpRequestHelperCompletion)completion redEnvelopeId:(NSString *)redEnvelopeId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Api/Api+RedPacket.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Api/Api+RedPacket.m deleted file mode 100644 index 5bd4dcd..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Api/Api+RedPacket.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// Api+RedPacket.m -// YUMI -// -// Created by YUMI on 2022/8/31. -// - -#import "Api+RedPacket.h" -#import -@implementation Api (RedPacket) - -+ (void)sendRedPacket:(HttpRequestHelperCompletion)completion num:(NSString *)num goldNum:(NSString *)goldNum roomUId:(NSString *)roomUId type:(NSString *)type password:(NSString *)password message:(NSString *)message kind:(NSString *)kind validityType:(NSString *)validityType{ - NSString * fang = [NSString stringFromBase64String:@"cmVkLWVudmVsb3Bl"];///red-envelope - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, num, goldNum, roomUId, type, password, message, kind,validityType,nil]; -} - -+ (void)openRedPacket:(HttpRequestHelperCompletion)completion redEnvelopeId:(NSString *)redEnvelopeId { - NSString * fang = [NSString stringFromBase64String:@"cmVkLWVudmVsb3BlL29wZW4="];///red-envelope/open - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, redEnvelopeId, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputEntireServerScrollingView.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputEntireServerScrollingView.h deleted file mode 100644 index ea14101..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputEntireServerScrollingView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PIInputEntireServerScrollingView.h -// YuMi -// -// Created by duoban on 2023/10/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIInputEntireServerScrollingView : UIView -@property(nonatomic,copy) NSString *getContent; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputEntireServerScrollingView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputEntireServerScrollingView.m deleted file mode 100644 index f10e8f5..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputEntireServerScrollingView.m +++ /dev/null @@ -1,78 +0,0 @@ -// -// PIInputEntireServerScrollingView.m -// YuMi -// -// Created by duoban on 2023/10/19. -// - -#import "PIInputEntireServerScrollingView.h" -@interface PIInputEntireServerScrollingView() -@property(nonatomic,strong) MSBaseTextField *pi_textField; -@property(nonatomic,strong) UILabel *pi_numView; -@end -@implementation PIInputEntireServerScrollingView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.backgroundColor = UIColorFromRGB(0xF8F8FA); - [self setCornerWithLeftTopCorner:kGetScaleWidth(8) rightTopCorner:kGetScaleWidth(8) bottomLeftCorner:kGetScaleWidth(8) bottomRightCorner:kGetScaleWidth(8) size:CGSizeMake(kGetScaleWidth(327), kGetScaleWidth(76))]; - [self addSubview:self.pi_textField]; - [self addSubview:self.pi_numView]; -} --(void)installConstraints{ - - [self.pi_numView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(10)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.bottom.mas_equalTo(-kGetScaleWidth(8)); - }]; - [self.pi_textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(22)); - make.leading.trailing.equalTo(self).inset(kGetScaleWidth(10)); - make.top.mas_equalTo(kGetScaleWidth(24)); - - }]; -} -#pragma mark -UITextFieldDelegate -- (void)textFieldDidChange:(UITextField *)textField { - if(textField.text.length <= 0){ - textField.text = @""; - self.pi_numView.text = [NSString stringWithFormat:@"0/10"]; - return; - } - if(textField.text.length > 10){ - textField.text = [textField.text substringToIndex:10]; - } - textField.text = [textField.text stringByReplacingOccurrencesOfString:@" " withString:@""]; - self.pi_numView.text = [NSString stringWithFormat:@"%ld/10",textField.text.length]; -} - -#pragma mark - 懒加载 -- (NSString *)getContent{ - return self.pi_textField.text; -} -- (MSBaseTextField *)pi_textField{ - if(!_pi_textField){ - _pi_textField = [[MSBaseTextField alloc]init]; - _pi_textField.text = YMLocalizedString(@"PIInputEntireServerScrollingView0"); - _pi_textField.textColor = UIColorFromRGB(0x322F4D); - _pi_textField.font = kFontRegular(16); - _pi_textField.textAlignment = NSTextAlignmentCenter; - [_pi_textField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; - } - return _pi_textField; -} -- (UILabel *)pi_numView{ - if(!_pi_numView){ - _pi_numView = [UILabel labelInitWithText:@"0/10" font:kFontRegular(12) textColor:UIColorFromRGB(0x94959C)]; - } - return _pi_numView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.h deleted file mode 100644 index f746036..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// PIInputRedPacketView.h -// YuMi -// -// Created by duoban on 2023/10/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIInputRedPacketView : UIView -@property(nonatomic,copy) NSString *pi_title; -@property(nonatomic,assign) BOOL isHiddenIcon; -@property(nonatomic,copy) NSString *unitTitle; -///红包数量 -@property(nonatomic,copy) NSString *redPacketNum; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.m deleted file mode 100644 index f5beb96..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputRedPacketView.m +++ /dev/null @@ -1,162 +0,0 @@ -// -// PIInputRedPacketView.m -// YuMi -// -// Created by duoban on 2023/10/18. -// - -#import "PIInputRedPacketView.h" -@interface PIInputRedPacketView() -///容器 -@property(nonatomic,strong) UIStackView *pi_stackView; -///红包图标 -@property(nonatomic,strong) UIImageView *pi_iconView; -///标题 -@property(nonatomic,strong) UILabel *pi_titleView; -///数量 -@property(nonatomic,strong) MSBaseTextField *pi_textField; -///分割线 -@property(nonatomic,strong) UIView *pi_lineView; -///单位 -@property(nonatomic,strong) UILabel *pi_unitView; -@end -@implementation PIInputRedPacketView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self setCornerWithLeftTopCorner:kGetScaleWidth(8) rightTopCorner:kGetScaleWidth(8) bottomLeftCorner:kGetScaleWidth(8) bottomRightCorner:kGetScaleWidth(8) size:CGSizeMake(kGetScaleWidth(327), kGetScaleWidth(48))]; - self.backgroundColor = UIColorFromRGB(0xF8F8FA); - [self addSubview:self.pi_stackView]; - [self addSubview:self.pi_textField]; - [self addSubview:self.pi_lineView]; - [self addSubview:self.pi_unitView]; - - [self.pi_stackView addArrangedSubview:self.pi_iconView]; - [self.pi_stackView addArrangedSubview:self.pi_titleView]; - -} --(void)installConstraints{ - [self.pi_stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(12)); - make.height.mas_equalTo(kGetScaleWidth(32)); - make.centerY.equalTo(self); - - }]; - [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(30)); - make.height.mas_equalTo(kGetScaleWidth(32)); - }]; - [self.pi_titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(22)); - }]; - [self.pi_unitView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(16)); - make.centerY.equalTo(self); - }]; - [self.pi_lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(46)); - make.height.mas_equalTo(kGetScaleWidth(26)); - make.width.mas_equalTo(kGetScaleWidth(1)); - make.centerY.equalTo(self); - - }]; - [self.pi_textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(59)); - make.height.mas_equalTo(kGetScaleWidth(22)); - make.leading.equalTo(self.pi_stackView.mas_trailing).mas_offset(kGetScaleWidth(10)); - make.centerY.equalTo(self); - }]; -} -- (void)setPi_title:(NSString *)pi_title{ - _pi_title = pi_title; - _pi_titleView.text = _pi_title; -} -- (void)setIsHiddenIcon:(BOOL)isHiddenIcon{ - _isHiddenIcon = isHiddenIcon; - _pi_iconView.hidden = _isHiddenIcon; -} --(void)setUnitTitle:(NSString *)unitTitle{ - _unitTitle = unitTitle; - _pi_unitView.text = _unitTitle; -} -#pragma mark -UITextFieldDelegate - -- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { - return [self validateNumber:string]; -} - -- (BOOL)validateNumber:(NSString*)number { - BOOL res = YES; - NSCharacterSet* tmpSet = [NSCharacterSet characterSetWithCharactersInString:@"0123456789"]; - int i = 0; - while (i < number.length) { - NSString * string = [number substringWithRange:NSMakeRange(i, 1)]; - NSRange range = [string rangeOfCharacterFromSet:tmpSet]; - if (range.length == 0) { - res = NO; - break; - } - i++; - } - return res; -} -#pragma mark - 懒加载 -- (NSString *)redPacketNum{ - return self.pi_textField.text; -} -- (UIStackView *)pi_stackView { - if (!_pi_stackView) { - _pi_stackView = [[UIStackView alloc] init]; - _pi_stackView.distribution = UIStackViewDistributionFill; - _pi_stackView.alignment = UIStackViewAlignmentCenter; - _pi_stackView.spacing = kGetScaleWidth(4); - } - return _pi_stackView; -} -- (UIImageView *)pi_iconView{ - if(!_pi_iconView){ - _pi_iconView = [UIImageView new]; - _pi_iconView.image = kImage(@"pi_red_packet_icon_logo"); - } - return _pi_iconView; -} -- (UILabel *)pi_titleView{ - if(!_pi_titleView){ - _pi_titleView = [UILabel labelInitWithText:@"" font:kFontRegular(16) textColor:UIColorFromRGB(0x322F4D)]; - } - return _pi_titleView; -} -- (MSBaseTextField *)pi_textField{ - if(!_pi_textField){ - _pi_textField = [[MSBaseTextField alloc]init]; - NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc]initWithString:@"0" attributes:@{NSFontAttributeName:kFontRegular(16),NSForegroundColorAttributeName:UIColorFromRGB(0xB3B3C3)}]; - _pi_textField.attributedPlaceholder = placeholder; - _pi_textField.textColor = UIColorFromRGB(0x322F4D); - _pi_textField.font = kFontMedium(16); - _pi_textField.keyboardType = UIKeyboardTypeNumberPad; - _pi_textField.textAlignment = NSTextAlignmentRight; - _pi_textField.delegate = self; - } - return _pi_textField; -} -- (UIView *)pi_lineView{ - if(!_pi_lineView){ - _pi_lineView = [UIView new]; - _pi_lineView.backgroundColor = UIColorFromRGB(0xEBEEF5); - } - return _pi_lineView; -} -- (UILabel *)pi_unitView{ - if(!_pi_unitView){ - _pi_unitView = [UILabel labelInitWithText:@"" font:kFontRegular(16) textColor:UIColorFromRGB(0x767585)]; - } - return _pi_unitView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputScrollingView.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputScrollingView.h deleted file mode 100644 index 18c852f..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputScrollingView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// PIInputScrollingView.h -// YuMi -// -// Created by duoban on 2023/10/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIInputScrollingView : UIView -@property(nonatomic,copy) NSString *pi_scrolling; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputScrollingView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputScrollingView.m deleted file mode 100644 index 063053e..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIInputScrollingView.m +++ /dev/null @@ -1,48 +0,0 @@ -// -// PIInputScrollingView.m -// YuMi -// -// Created by duoban on 2023/10/19. -// - -#import "PIInputScrollingView.h" -@interface PIInputScrollingView() -@property(nonatomic,strong) MSBaseTextField *pi_textField; -@end -@implementation PIInputScrollingView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.backgroundColor = UIColorFromRGB(0xF8F8FA); - [self setCornerWithLeftTopCorner:kGetScaleWidth(8) rightTopCorner:kGetScaleWidth(8) bottomLeftCorner:kGetScaleWidth(8) bottomRightCorner:kGetScaleWidth(8) size:CGSizeMake(kGetScaleWidth(327), kGetScaleWidth(52))]; - [self addSubview:self.pi_textField]; -} --(void)installConstraints{ - [self.pi_textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self).inset(kGetScaleWidth(10)); - make.bottom.top.equalTo(self); - }]; -} -- (NSString *)pi_scrolling{ - return self.pi_textField.text; -} -#pragma mark - 懒加载 -- (MSBaseTextField *)pi_textField{ - if(!_pi_textField){ - _pi_textField = [[MSBaseTextField alloc]init]; - NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"PIInputScrollingView0") attributes:@{NSFontAttributeName:kFontRegular(16),NSForegroundColorAttributeName:UIColorFromRGB(0xB3B3C3)}]; - _pi_textField.attributedPlaceholder = placeholder; - _pi_textField.textColor = UIColorFromRGB(0x322F4D); - _pi_textField.font = kFontRegular(16); - _pi_textField.textAlignment = NSTextAlignmentCenter; - } - return _pi_textField; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.h deleted file mode 100644 index 25804c8..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// PIRedPacketChooseTypeCell.h -// YuMi -// -// Created by duoban on 2023/10/18. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRedPacketChooseTypeCell : UICollectionViewCell -@property(nonatomic,assign)BOOL isChoose; -@property(nonatomic,copy) NSString *pi_title; -@property(nonatomic,copy) NSString *pi_subTitle; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.m deleted file mode 100644 index 882cf71..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeCell.m +++ /dev/null @@ -1,72 +0,0 @@ -// -// PIRedPacketChooseTypeCell.m -// YuMi -// -// Created by duoban on 2023/10/18. -// - -#import "PIRedPacketChooseTypeCell.h" -@interface PIRedPacketChooseTypeCell() -@property(nonatomic,strong) UILabel *pi_titleView; -@property(nonatomic,strong) UILabel *pi_subView; -@end -@implementation PIRedPacketChooseTypeCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.contentView.layer.cornerRadius = kGetScaleWidth(8); - self.contentView.layer.masksToBounds = YES; - self.contentView.layer.borderWidth = 0; - self.contentView.layer.borderColor = UIColorFromRGB(0xFF285C).CGColor; - self.contentView.backgroundColor = UIColorFromRGB(0xF8F8FA); - [self.contentView addSubview:self.pi_titleView]; - [self.contentView addSubview:self.pi_subView]; -} --(void)installConstraints{ - [self.pi_titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(15)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.centerX.equalTo(self.contentView); - }]; - [self.pi_subView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(31)); - make.height.mas_equalTo(kGetScaleWidth(14)); - make.centerX.equalTo(self.contentView); - }]; -} -- (void)setIsChoose:(BOOL)isChoose{ - _isChoose = isChoose; - self.contentView.layer.borderWidth = _isChoose == YES ? 1 : 0; - self.contentView.backgroundColor = _isChoose == YES ? UIColorRGBAlpha(0xFF285C, 0.06) : UIColorFromRGB(0xF8F8FA); - self.pi_titleView.textColor = _isChoose == YES ? UIColorFromRGB(0xFF285C) : UIColorFromRGB(0x767585); - self.pi_titleView.font = _isChoose == YES ? kFontMedium(12) : kFontRegular(12); - self.pi_subView.textColor = _isChoose == YES ? UIColorRGBAlpha(0xFF285C, 0.6) : UIColorFromRGB(0x94959C); -} --(void)setPi_title:(NSString *)pi_title{ - _pi_title = pi_title; - _pi_titleView.text = _pi_title; -} -- (void)setPi_subTitle:(NSString *)pi_subTitle{ - _pi_subTitle = pi_subTitle; - _pi_subView.text = _pi_subTitle; -} -#pragma mark - 懒加载 -- (UILabel *)pi_titleView{ - if(!_pi_titleView){ - _pi_titleView = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:UIColorFromRGB(0x767585)]; - } - return _pi_titleView; -} -- (UILabel *)pi_subView{ - if(!_pi_subView){ - _pi_subView = [UILabel labelInitWithText:@"" font:kFontRegular(10) textColor:UIColorFromRGB(0x94959C)]; - } - return _pi_subView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeView.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeView.h deleted file mode 100644 index 256670e..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeView.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// PIRedPacketChooseTypeView.h -// YuMi -// -// Created by duoban on 2023/10/18. -// - -#import - -typedef enum : NSUInteger { - Red_Packet_Choose_type_Normal = 0, - Red_Packet_Choose_type_Follow, - Red_Packet_Choose_type_Share, - Red_Packet_Choose_type_Scrolling, -} PIRedPacketChooseTypeViewType; - -@protocol PIRedPacketChooseTypeViewDelegate - --(void)chooseRedPacketType:(PIRedPacketChooseTypeViewType)type; - -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRedPacketChooseTypeView : UIView -@property(nonatomic,weak) iddelegate; -@property(nonatomic,strong) UICollectionView *collectionView; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeView.m deleted file mode 100644 index 3c8ab2c..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/PIRedPacketChooseTypeView.m +++ /dev/null @@ -1,104 +0,0 @@ -// -// PIRedPacketChooseTypeView.m -// YuMi -// -// Created by duoban on 2023/10/18. -// - -#import "PIRedPacketChooseTypeView.h" -#import "PIRedPacketChooseTypeCell.h" -@interface PIRedPacketChooseTypeView() -@property(nonatomic,strong) UILabel *pi_titleView; - -@property(nonatomic,copy) NSArray *titleList; -@property(nonatomic,copy) NSArray *subTitleList; -@property(nonatomic,assign) NSInteger chooseRow; -@end -@implementation PIRedPacketChooseTypeView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - self.chooseRow = 0; - [self addSubview:self.pi_titleView]; - [self addSubview:self.collectionView]; -} --(void)installConstraints{ - [self.pi_titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(24)); - make.top.mas_equalTo(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(22)); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(62)); - make.top.equalTo(self.pi_titleView.mas_bottom).mas_offset(kGetScaleWidth(8)); - }]; -} -#pragma mark -UICollectionViewDelegate,UICollectionViewDataSource --(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ - return self.titleList.count; -} --(__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - PIRedPacketChooseTypeCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([PIRedPacketChooseTypeCell class]) forIndexPath:indexPath]; - cell.isChoose = self.chooseRow == indexPath.row; - cell.pi_title = [self.titleList xpSafeObjectAtIndex:indexPath.row]; - cell.pi_subTitle = [self.subTitleList xpSafeObjectAtIndex:indexPath.row]; - return cell; -} -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ - self.chooseRow = indexPath.row; - if(self.delegate && [self.delegate respondsToSelector:@selector(chooseRedPacketType:)]){ - [self.delegate chooseRedPacketType:self.chooseRow]; - } - [self.collectionView reloadData]; -} -#pragma mark - 懒加载 --(UILabel *)pi_titleView{ - if(!_pi_titleView){ - _pi_titleView = [UILabel labelInitWithText:YMLocalizedString(@"PIRedPacketChooseTypeView8") font:kFontMedium(16) textColor:UIColorFromRGB(0x322F4D)]; - } - return _pi_titleView; -} -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - layout.itemSize = CGSizeMake(kGetScaleWidth(94), kGetScaleWidth(62)); - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.minimumLineSpacing = kGetScaleWidth(6); - layout.minimumInteritemSpacing = kGetScaleWidth(6); - layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(24), kGetScaleWidth(0), kGetScaleWidth(24)); - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.showsHorizontalScrollIndicator = NO; - if (@available(iOS 11.0, *)) { - _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - _collectionView.tag = 3000000001; - _collectionView.showsVerticalScrollIndicator = NO; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[PIRedPacketChooseTypeCell class] forCellWithReuseIdentifier:NSStringFromClass([PIRedPacketChooseTypeCell class])]; - } - return _collectionView; -} -- (NSArray *)titleList{ - if(!_titleList){ - _titleList = @[YMLocalizedString(@"PIRedPacketChooseTypeView0"),YMLocalizedString(@"PIRedPacketChooseTypeView1"),YMLocalizedString(@"PIRedPacketChooseTypeView2"),YMLocalizedString(@"PIRedPacketChooseTypeView3")]; - } - return _titleList; -} -- (NSArray *)subTitleList{ - if(!_subTitleList){ - _subTitleList = @[YMLocalizedString(@"PIRedPacketChooseTypeView4"),YMLocalizedString(@"PIRedPacketChooseTypeView5"),YMLocalizedString(@"PIRedPacketChooseTypeView6"),YMLocalizedString(@"PIRedPacketChooseTypeView7")]; - } - return _subTitleList; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/XPOpenRedPacketCell.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/XPOpenRedPacketCell.h deleted file mode 100644 index 25d5bcf..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/XPOpenRedPacketCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMOpenRedPacketCell.h -// YUMI -// -// Created by YUMI on 2022/9/2. -// - -#import -#import "XPRedPacketResultModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPOpenRedPacketCell : UITableViewCell - -@property (nonatomic, strong) XPRedPacketPersonReceiveModel *model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/XPOpenRedPacketCell.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/XPOpenRedPacketCell.m deleted file mode 100644 index 27b242f..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/XPOpenRedPacketCell.m +++ /dev/null @@ -1,184 +0,0 @@ -// -// YMOpenRedPacketCell.m -// YUMI -// -// Created by YUMI on 2022/9/2. -// - -#import "XPOpenRedPacketCell.h" -#import "DJDKMIMOMColor.h" -#import -#import "AccountInfoStorage.h" -#import "NetImageView.h" - -@interface XPOpenRedPacketCell() - -///头像 -@property (nonatomic, strong) NetImageView *avatarView; -///用户名 -@property (nonatomic, strong) UILabel *userNameLabel; -///时间 -@property(nonatomic, strong) UILabel *timeLabel; -///获得红包数 -@property (nonatomic, strong) UILabel *amountLabel; -///礼物图 -//@property (nonatomic, strong) XYRedPacketResultGiftView *giftView; -///钻号 -@property (nonatomic, strong) UIImageView *coinImageView; - -///底线 -@property (nonatomic, strong) UIView *lineView; - -@end - -@implementation XPOpenRedPacketCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; - if (self) { - [self initViews]; - } - return self; -} - -- (void)setModel:(XPRedPacketPersonReceiveModel *)model { - _model = model; - NSString *uid = [AccountInfoStorage instance].getUid; - BOOL isMe = model.userVO.uid == uid.integerValue; - if (isMe) { - self.userNameLabel.text = YMLocalizedString(@"XPOpenRedPacketCell0"); - self.userNameLabel.textColor = UIColorFromRGB(0xFDCD00); - } else { - NSString *name = model.userVO.nick; - if (model.userVO.nick.length > 6) { - name = [name substringToIndex:6]; - name = [name stringByAppendingString:@"..."]; - } - self.userNameLabel.text = name; - self.userNameLabel.textColor = UIColorFromRGB(0xFFFFFF); - } - self.avatarView.imageUrl = model.userVO.avatar; - NSDate *date = [NSDate dateWithTimeIntervalSince1970:model.createTime/1000]; - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - [dateFormatter setDateFormat:@"MM/dd HH:mm"]; - self.timeLabel.text = [dateFormatter stringFromDate:date]; - self.amountLabel.hidden = NO; - if (model.amount.doubleValue> 0) { - NSString *doubleString = [NSString stringWithFormat:@"%lf", model.amount.doubleValue]; - NSDecimalNumber *decNumber = [NSDecimalNumber decimalNumberWithString:doubleString]; - self.amountLabel.text = [NSString stringWithFormat:@"%@",decNumber.stringValue]; - }else { - self.amountLabel.text = @"0"; - } -} - -#pragma mark - UI -- (void)initViews { - self.contentView.backgroundColor = [UIColor clearColor]; - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarView]; - [self.contentView addSubview:self.userNameLabel]; - [self.contentView addSubview:self.timeLabel]; - [self.contentView addSubview:self.amountLabel]; - [self.contentView addSubview:self.coinImageView]; - [self.contentView addSubview:self.lineView]; - - [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make){ - make.height.width.mas_equalTo(kGetScaleWidth(28)); - make.centerY.mas_equalTo(self.mas_centerY); - make.leading.mas_equalTo(self.contentView.mas_leading).offset(kGetScaleWidth(16)); - }]; - - [self.userNameLabel mas_makeConstraints:^(MASConstraintMaker *make){ - make.top.mas_equalTo(kGetScaleWidth(11)); - make.height.mas_equalTo(kGetScaleWidth(17)); - make.leading.mas_equalTo(kGetScaleWidth(50)); - }]; - - [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make){ - make.leading.mas_equalTo(kGetScaleWidth(50)); - make.top.mas_equalTo(kGetScaleWidth(28)); - make.height.mas_equalTo(kGetScaleWidth(13)); - }]; - [self.amountLabel mas_makeConstraints:^(MASConstraintMaker *make){ - make.centerY.mas_equalTo(self.mas_centerY); - make.trailing.mas_equalTo(-kGetScaleWidth(16)); - }]; - [self.coinImageView mas_makeConstraints:^(MASConstraintMaker *make){ - make.width.mas_equalTo(kGetScaleWidth(19)); - make.height.mas_equalTo(kGetScaleWidth(19)); - make.centerY.mas_equalTo(self.mas_centerY); - make.trailing.equalTo(self.amountLabel.mas_leading).mas_offset(-kGetScaleWidth(1)); - }]; - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make){ - make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(14)); - make.height.mas_equalTo(0.5); - make.bottom.mas_equalTo(-kGetScaleWidth(0)); - }]; -} - -#pragma mark - Lazy Load -- (NetImageView *)avatarView { - if (!_avatarView) { - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarView = [[NetImageView alloc] initWithConfig:config]; - _avatarView.layer.masksToBounds = YES; - _avatarView.layer.cornerRadius = kGetScaleWidth(28)/2; - _avatarView.layer.borderWidth = 1; - _avatarView.layer.borderColor = UIColorFromRGB(0xFFFFFF).CGColor; - } - return _avatarView; -} - -- (UILabel *)userNameLabel { - if (!_userNameLabel) { - _userNameLabel = [[UILabel alloc] init]; - _userNameLabel.text = YMLocalizedString(@"XPOpenRedPacketCell1"); - _userNameLabel.numberOfLines = 1; - _userNameLabel.font = kFontMedium(12); - _userNameLabel.textColor = [UIColor whiteColor]; - } - return _userNameLabel; -} - -- (UILabel *)timeLabel { - if (!_timeLabel) { - _timeLabel = [[UILabel alloc] init]; - _timeLabel.text = @"00/00/00 00:00"; - _timeLabel.font = kFontRegular(9); - _timeLabel.textColor = UIColorRGBAlpha(0xffffff, 0.8); - - } - return _timeLabel; -} - -- (UILabel *)amountLabel { - if (!_amountLabel) { - _amountLabel = [[UILabel alloc] init]; - _amountLabel.text = @"0"; - _amountLabel.textAlignment = NSTextAlignmentRight; - _amountLabel.font = kFontMedium(16); - _amountLabel.textColor = [UIColor whiteColor]; - } - return _amountLabel; -} - -- (UIImageView *)coinImageView { - if (!_coinImageView) { - _coinImageView = [[UIImageView alloc] init]; - [_coinImageView setImage:[UIImage imageNamed:@"moli_money_icon"]]; - } - return _coinImageView; -} - -- (UIView *)lineView{ - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.3]; - } - return _lineView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPOpenRedPacketModel.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPOpenRedPacketModel.h deleted file mode 100644 index e2ce3aa..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPOpenRedPacketModel.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMOpenRedPacketModel.h -// YUMI -// -// Created by YUMI on 2022/9/16. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPOpenRedPacketModel : PIBaseModel - -//打开红包的用户ID -@property (nonatomic, copy) NSString *openRedEnvelopeId; -///打开红包的用户昵称 -@property (nonatomic, copy) NSString *openRedEnvelopeUserNick; -///获取的钻石数量 -@property (nonatomic, copy) NSString *amount; -///发送红包的用户ID -@property (nonatomic, copy) NSString *redEnvelopeMasterId; -///发送红包的用户昵称 -@property (nonatomic, copy) NSString *redEnvelopeMasterNick; -///红包类型 -@property (nonatomic, assign) NSInteger redEnvelopeType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPOpenRedPacketModel.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPOpenRedPacketModel.m deleted file mode 100644 index 8e90571..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPOpenRedPacketModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMOpenRedPacketModel.m -// YUMI -// -// Created by YUMI on 2022/9/16. -// - -#import "XPOpenRedPacketModel.h" - -@implementation XPOpenRedPacketModel - -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPReceiveRedPacketModel.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPReceiveRedPacketModel.h deleted file mode 100644 index 595f0aa..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPReceiveRedPacketModel.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// YMReceiveRedPacketModel.h -// YUMI -// -// Created by YUMI on 2022/9/2. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPReceiveRedPacketModel : PIBaseModel - -///发送者头像 -@property (nonatomic, copy) NSString *sendUserAvatar; -///发送者昵称 -@property (nonatomic, copy) NSString *sendUserNick; -///房间UID -@property (nonatomic, copy) NSString *roomUid; -///红包类型 -@property (nonatomic, assign) NSInteger redEnvelopeType; -///房间标题 -@property (nonatomic, copy) NSString *roomTitle; -///红包ID -@property (nonatomic, copy) NSString *redEnvelopeId; -///红包祝福语 -@property (nonatomic, copy) NSString *redEnvelopeMessage; -///生效类型 0 立即生效 1 限时生效 -@property(nonatomic,assign) int validityType; -///当前时间 -@property(nonatomic,assign) long timestamp; -///红包开始时间 -@property(nonatomic,assign) long beginTime; -////红包数量 -@property(nonatomic,copy) NSString *redEnvelopeNum; -// 1 无门槛红包 2 关注红包 3 分享红包 4 弹幕红包 -@property(nonatomic, assign) int kind; -///红包有效时间 -@property(nonatomic,assign) NSInteger endTime; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPReceiveRedPacketModel.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPReceiveRedPacketModel.m deleted file mode 100644 index 5dad1b3..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPReceiveRedPacketModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMReceiveRedPacketModel.m -// YUMI -// -// Created by YUMI on 2022/9/2. -// - -#import "XPReceiveRedPacketModel.h" - -@implementation XPReceiveRedPacketModel - -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketModel.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketModel.h deleted file mode 100644 index 4f8aa09..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketModel.h +++ /dev/null @@ -1,81 +0,0 @@ -// -// YMRedPacketModel.h -// YUMI -// -// Created by YUMI on 2022/9/2. -// - -#import -#import "UserInfoModel.h" - - -NS_ASSUME_NONNULL_BEGIN - -// 红包类型 1:房间钻石红包 2:全服钻石红包 3：房间礼物红包 4:全服礼物红包 -typedef enum : NSUInteger { - RedPacketType_RoomDiamond = 1, - RedPacketType_AllDiamond = 2, - RedPacketType_RoomGift = 3, - RedPacketType_AllGift = 4 -} RedPacketType; -// 红包类型 1:房间钻石红包 2:全服钻石红包 3：房间礼物红包 4:全服礼物红包 -typedef enum : NSUInteger { - RedPacketConditionsType_NO = 1, - RedPacketConditionsType_Followd = 2, - RedPacketConditionsType_Share = 3, - RedPacketConditionsType_Scrolling = 4 -} RedPacketConditionsType; -@interface XPRedPacketModel : PIBaseModel - -@property(nonatomic,assign) NSInteger state; - -@property (nonatomic, assign) RedPacketType type; - -@property (nonatomic, copy) NSString *redEnvelopeId; - -@property (nonatomic, copy) NSString *message; -///红包厅主id -@property (nonatomic, copy) NSString *roomUId; -///发红包用户id -@property (nonatomic, copy) NSString *userId; -///发送者信息 -@property (nonatomic, strong) UserInfoModel *userVO; -/// 红包总数 -@property (nonatomic, copy) NSString *totalNum; -/// 红包总额 -@property (nonatomic, copy) NSString *redEnvelopeAmount; -/// 已领取数量 -@property (nonatomic, copy) NSString *pickNum; -// 1 无门槛红包 2 关注红包 3 分享红包 4 弹幕红包 -@property(nonatomic, assign) RedPacketConditionsType kind; -///生效类型 0 立即生效 1 限时生效 -@property(nonatomic,assign) int validityType; -///当前时间 -@property(nonatomic,assign) long timestamp; -///红包开始时间 -@property(nonatomic,assign) long beginTime; -///0，未完成，1，完成 -@property(nonatomic,assign) int finish; - -///发送者头像 -@property (nonatomic, copy) NSString *sendUserAvatar; -///发送者昵称 -@property (nonatomic, copy) NSString *sendUserNick; -///房间UID -@property (nonatomic, copy) NSString *roomUid; -///红包类型 -@property (nonatomic, assign) NSInteger redEnvelopeType; -///房间标题 -@property (nonatomic, copy) NSString *roomTitle; -///红包祝福语 -@property (nonatomic, copy) NSString *redEnvelopeMessage; -////红包数量 -@property(nonatomic,copy) NSString *redEnvelopeNum; -///IN_ROOM：厅内红包 SERVER：全服红包 -@property(nonatomic,copy) NSString *redEnvelopePosition; -///抢红包结果 -@property(nonatomic,copy) NSDictionary *result; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketModel.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketModel.m deleted file mode 100644 index daacffc..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRedPacketModel.m -// YUMI -// -// Created by YUMI on 2022/9/2. -// - -#import "XPRedPacketModel.h" - -@implementation XPRedPacketModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"redEnvelopeId":@"id"}; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketResultModel.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketResultModel.h deleted file mode 100644 index d00d3b3..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketResultModel.h +++ /dev/null @@ -1,54 +0,0 @@ -// -// YMRedPacketResultModel.h -// YUMI -// -// Created by YUMI on 2022/9/2. -// - -#import -#import "XPRedPacketModel.h" - -NS_ASSUME_NONNULL_BEGIN - -/* -当前用户的红包状态 -ING(1, “开抢中”), -TIME_OUT(2, “过时”), -REMAIN_ZERO(3, “抢光了”), -SUCCESS(4, “抢到了”), -WILL(5, “将要开始”), -TIME_OUT_BACK(6, “超时已退还”), - */ -typedef enum : NSUInteger { - RedPacketState_Ing = 1, - RedPacketState_Time_Out = 2, - RedPacketState_Remain_Zero = 3, - RedPacketState_Success = 4, - RedPacketState_will = 5, - RedPacketState_Time_Out_Back = 6, -} RedPacketState; - -@class UserInfoModel, XPRedPacketPersonReceiveModel,XPRedPacketModel; -@interface XPRedPacketResultModel : PIBaseModel - -@property (nonatomic, copy) NSString *currentUserAmount; - -@property (nonatomic, assign) RedPacketState redEnvelopeState; - -@property (nonatomic, strong) XPRedPacketModel *redEnvelopeVO; -///钻石红包领取详情 -@property (nonatomic, strong) NSArray *redEnvelopeItemVOs; - -@end - -@interface XPRedPacketPersonReceiveModel : PIBaseModel - -@property (nonatomic, strong) NSNumber *amount; - -@property (nonatomic, strong) UserInfoModel *userVO; - -@property (nonatomic, assign) NSTimeInterval createTime; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketResultModel.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketResultModel.m deleted file mode 100644 index 005250d..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Model/XPRedPacketResultModel.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// YMRedPacketResultModel.m -// YUMI -// -// Created by YUMI on 2022/9/2. -// - -#import "XPRedPacketResultModel.h" - -@implementation XPRedPacketResultModel - -+ (NSDictionary *)objectClassInArray { - return @{ - @"redEnvelopeItemVOs": XPRedPacketPersonReceiveModel.class - }; -} - -@end - -@implementation XPRedPacketPersonReceiveModel - -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIReceiveRedPacketSuccessView.h b/YuMi/Modules/YMRoom/View/SendRedPacket/PIReceiveRedPacketSuccessView.h deleted file mode 100644 index 9e9467f..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIReceiveRedPacketSuccessView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// PIReceiveRedPacketSuccessView.h -// YuMi -// -// Created by duoban on 2023/10/20. -// - -#import -#import "XPRedPacketResultModel.h" - -@protocol PIReceiveRedPacketSuccessViewDelegate - --(void)closeedPacketSuccessView; - -@end - -NS_ASSUME_NONNULL_BEGIN - -@interface PIReceiveRedPacketSuccessView : UIView -@property(nonatomic,weak) iddelegate; -@property(nonatomic,strong) XPRedPacketResultModel *resultModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIReceiveRedPacketSuccessView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIReceiveRedPacketSuccessView.m deleted file mode 100644 index 21957a8..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIReceiveRedPacketSuccessView.m +++ /dev/null @@ -1,259 +0,0 @@ -// -// PIReceiveRedPacketSuccessView.m -// YuMi -// -// Created by duoban on 2023/10/20. -// - -#import "PIReceiveRedPacketSuccessView.h" -#import "XPOpenRedPacketCell.h" -@interface PIReceiveRedPacketSuccessView() - -///关闭 -@property (nonatomic, strong) UIButton *closeBtn; -///背景 -@property (nonatomic, strong) UIImageView *bgImageView; -///钻石数 -@property(nonatomic,strong) UILabel *getDiamondView; -///提示 -@property(nonatomic,strong) UILabel *pi_tipsView; -///发送者头像 -@property (nonatomic, strong) NetImageView *sendAvatar; -///发送者昵称 -@property (nonatomic, strong) UILabel *sendNickLabel; -///收到的祝福语 -@property (nonatomic, strong) UILabel *sendWishLabel; -///领取个数 -@property(nonatomic,strong) UILabel *openSituationLabel; -@property (nonatomic, strong) UITableView *tableView; - -@end -@implementation PIReceiveRedPacketSuccessView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - [self addSubview:self.bgImageView]; - [self addSubview:self.closeBtn]; - [self.bgImageView addSubview:self.getDiamondView]; - [self.bgImageView addSubview:self.pi_tipsView]; - [self.bgImageView addSubview:self.sendAvatar]; - [self.bgImageView addSubview:self.sendNickLabel]; - [self.bgImageView addSubview:self.sendWishLabel]; - [self.bgImageView addSubview:self.tableView]; - [self.bgImageView addSubview:self.openSituationLabel]; - - - NSMutableAttributedString *numText = [[NSMutableAttributedString alloc]initWithString:@"0" attributes:@{NSFontAttributeName:kFontMedium(32),NSForegroundColorAttributeName:UIColorFromRGB(0xFF285C)}]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"moli_money_icon"];; - attachment.bounds = CGRectMake(0, roundf(kFontMedium(32).capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height); - - attachment.image =iconImage; - NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; - [numText insertAttributedString:starAttribute atIndex:0]; - self.getDiamondView.attributedText = numText; - -} --(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(327)); - make.height.mas_equalTo(kGetScaleWidth(466)); - make.center.equalTo(self); - }]; - [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(28)); - make.trailing.equalTo(self.bgImageView.mas_trailing).mas_offset(-kGetScaleWidth(8)); - make.top.equalTo(self.bgImageView.mas_top).mas_offset(kGetScaleWidth(39)); - }]; - [self.getDiamondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(34)); - make.centerX.equalTo(self.bgImageView); - make.top.mas_equalTo(kGetScaleWidth(89)); - }]; - - - [self.sendNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.bgImageView.mas_centerX).mas_offset(kGetScaleWidth(14)); - make.centerY.equalTo(self.sendAvatar); - make.height.mas_equalTo(kGetScaleWidth(20)); - }]; - [self.sendAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(24)); - make.top.mas_equalTo(kGetScaleWidth(177)); - make.trailing.equalTo(self.sendNickLabel.mas_leading).mas_offset(-kGetScaleWidth(4)); - }]; - [self.sendWishLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.sendAvatar.mas_bottom).mas_offset(kGetScaleWidth(4)); - make.height.mas_equalTo(kGetScaleWidth(20)); - make.centerX.equalTo(self.bgImageView); - make.width.mas_equalTo(kGetScaleWidth(223)); - }]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.sendWishLabel.mas_bottom).mas_offset(kGetScaleWidth(8)); - make.width.mas_equalTo(kGetScaleWidth(223)); - make.height.mas_equalTo(kGetScaleWidth(160)); - make.centerX.equalTo(self.bgImageView); - }]; - [self.openSituationLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(60)); - make.bottom.mas_equalTo(-kGetScaleWidth(54)); - make.height.mas_equalTo(kGetScaleWidth(14)); - }]; -} -#pragma mark - tableviewDatasource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.resultModel.redEnvelopeItemVOs.count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{ - XPOpenRedPacketCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPOpenRedPacketCell class]) forIndexPath:indexPath]; - XPRedPacketPersonReceiveModel *model = [self.resultModel.redEnvelopeItemVOs xpSafeObjectAtIndex:indexPath.row]; - cell.model = model; - return cell; -} -#pragma mark - action -- (void)onCloseButtonClick:(UIButton *)sender { - - if(self.delegate && [self.delegate respondsToSelector:@selector(closeedPacketSuccessView)]){ - [self.delegate closeedPacketSuccessView]; - } - -} --(void)setResultModel:(XPRedPacketResultModel *)resultModel{ - _resultModel = resultModel; - - if (_resultModel.redEnvelopeState == RedPacketState_Success) {//抢到红包 - NSMutableAttributedString *numText = [[NSMutableAttributedString alloc]initWithString:_resultModel.currentUserAmount attributes:@{NSFontAttributeName:kFontMedium(32),NSForegroundColorAttributeName:UIColorFromRGB(0xFF285C)}]; - NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"moli_money_icon"];; - attachment.bounds = CGRectMake(0, roundf(kFontMedium(32).capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height); - - attachment.image =iconImage; - NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; - [numText insertAttributedString:starAttribute atIndex:0]; - self.getDiamondView.attributedText = numText; - self.pi_tipsView.text = YMLocalizedString(@"XPReceiveRedPacketView1"); - [self.pi_tipsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(129)); - make.centerX.equalTo(self.bgImageView); - make.height.mas_equalTo(kGetScaleWidth(17)); - }]; - self.bgImageView.image = kImage(@"pi_red_packet_receive_success_bg"); - } else if (_resultModel.redEnvelopeState == RedPacketState_Remain_Zero) {//抢光了 - self.getDiamondView.hidden = YES; - self.pi_tipsView.text = YMLocalizedString(@"XPReceiveRedPacketView2"); - [self.pi_tipsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(110)); - make.centerX.equalTo(self.bgImageView); - make.height.mas_equalTo(kGetScaleWidth(17)); - }]; - self.bgImageView.image = kImage(@"pi_red_packet_receive_success_no_bg"); - } - - self.sendAvatar.imageUrl = _resultModel.redEnvelopeVO.userVO.avatar; - NSString *nick = resultModel.redEnvelopeVO.userVO.nick; - if (resultModel.redEnvelopeVO.userVO.nick.length > 6) { - nick = [NSString stringWithFormat:@"%@...", [resultModel.redEnvelopeVO.userVO.nick substringToIndex:6]]; - } - nick = [NSString stringWithFormat:@"%@%@",nick,YMLocalizedString(@"XPReceiveRedPacketView8")]; - self.sendWishLabel.text = _resultModel.redEnvelopeVO.message; - self.openSituationLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPReceiveRedPacketView4"), resultModel.redEnvelopeVO.pickNum, resultModel.redEnvelopeVO.totalNum]; - // NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] init]; - // NSMutableAttributedString *nickAttr = [[NSMutableAttributedString alloc] initWithString:nick attributes:@{NSForegroundColorAttributeName : UIColorFromRGB(0xFDCD00)}]; - // NSMutableAttributedString *redPacketStr = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPReceiveRedPacketView3") attributes:@{NSForegroundColorAttributeName : [UIColor whiteColor]}]; - // [attribute appendAttributedString:nickAttr]; - // [attribute appendAttributedString:redPacketStr]; - // self.sendNickLabel.attributedText = attribute; - // self.sendWishLabel.text = resultModel.redEnvelopeVO.message; - // self.openSituationLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPReceiveRedPacketView4"), resultModel.redEnvelopeVO.pickNum, resultModel.redEnvelopeVO.totalNum]; - [self.tableView reloadData]; -} -#pragma mark - 懒加载 -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pi_red_packet_receive_success_bg"]]; - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} -- (UIButton *)closeBtn { - if (!_closeBtn) { - _closeBtn = [[UIButton alloc] init]; - [_closeBtn setImage:[UIImage imageNamed:@"pi_red_packet_receive_colse"] forState:UIControlStateNormal]; - [_closeBtn addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeBtn; -} -- (NetImageView *)sendAvatar { - if (!_sendAvatar) { - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _sendAvatar = [[NetImageView alloc] initWithConfig:config]; - _sendAvatar.layer.masksToBounds = YES; - _sendAvatar.layer.cornerRadius = kGetScaleWidth(24)/2; - _sendAvatar.layer.borderWidth = 1; - _sendAvatar.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _sendAvatar; -} - -- (UIView *)sendNickLabel { - if (!_sendNickLabel) { - UILabel *label = [[UILabel alloc] init]; - label.font = kFontMedium(14); - label.textColor = [UIColor whiteColor]; - _sendNickLabel = label; - } - return _sendNickLabel; -} -- (UILabel *)sendWishLabel { - if (!_sendWishLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textAlignment = NSTextAlignmentCenter; - _sendWishLabel = label; - _sendWishLabel.font = kFontRegular(11); - _sendWishLabel.textColor = [UIColor colorWithWhite:1 alpha:0.9]; - - } - return _sendWishLabel; -} -- (UILabel *)pi_tipsView{ - if(!_pi_tipsView){ - _pi_tipsView = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:UIColorFromRGB(0x767585)]; - } - return _pi_tipsView; -} -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] init]; - [_tableView registerClass:[XPOpenRedPacketCell class] forCellReuseIdentifier:NSStringFromClass([XPOpenRedPacketCell class])]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.rowHeight = kGetScaleWidth(48); - _tableView.layer.cornerRadius = kGetScaleWidth(20); - _tableView.layer.masksToBounds = YES; - _tableView.backgroundColor = UIColorFromRGB(0xE03654); - } - return _tableView; -} -- (UILabel *)getDiamondView{ - if(!_getDiamondView){ - _getDiamondView = [UILabel new]; - } - return _getDiamondView; -} -- (UILabel *)openSituationLabel{ - if(!_openSituationLabel){ - _openSituationLabel = [UILabel labelInitWithText:@"" font:kFontMedium(10) textColor:[UIColor colorWithWhite:1 alpha:0.8]]; - } - return _openSituationLabel; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomEnterRedPacketView.h b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomEnterRedPacketView.h deleted file mode 100644 index 9cdcca5..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomEnterRedPacketView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// PIRoomEnterRedPacketView.h -// YuMi -// -// Created by duoban on 2023/10/20. -// - -#import -#import "XPRedPacketModel.h" -#import "RoomInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol PIRoomEnterRedPacketViewDelegate - --(void)openRedPacketWithModel:(XPRedPacketModel *_Nullable)redModel; - -@end - -@interface PIRoomEnterRedPacketView : UIView -@property(nonatomic,assign) BOOL isInRoom; -@property(nonatomic,weak) iddelegate; -@property(nonatomic,strong) NSMutableArray *redPacketList; -@property(nonatomic,copy) NSString *pi_redNum; -@property(nonatomic,strong) XPRedPacketModel *redPacketModel; -@property(nonatomic , assign) RoomType type; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomEnterRedPacketView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomEnterRedPacketView.m deleted file mode 100644 index 979bfad..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomEnterRedPacketView.m +++ /dev/null @@ -1,297 +0,0 @@ -// -// PIRoomEnterRedPacketView.m -// YuMi -// -// Created by duoban on 2023/10/20. -// - -#import "PIRoomEnterRedPacketView.h" -#import "CountDownHelper.h" -#import "XPRedPacketResultModel.h" -#import "Api+Room.h" -@interface PIRoomEnterRedPacketView () -@property(nonatomic,strong) UIImageView *bgImageView; -@property(nonatomic,strong) UIButton *robBtn; -///倒计时 -@property(nonatomic,strong) UILabel *countDownView; -///倒计时 -@property (nonatomic,strong) CountDownHelper *countDownHelper; -///红点 -@property(nonatomic,strong) UILabel *redPoionNumView; -@property(nonatomic,strong) UIView *redPoionView; -///打开 -@property(nonatomic,strong) UIButton *openBtn; -@end -@implementation PIRoomEnterRedPacketView - --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(openRedPacketResult:) name:@"kOpenRedPacketResult" object:nil]; - } - return self; -} --(void)openRedPacketResult:(NSNotification *)not{ - XPRedPacketResultModel *resultModel = not.object; - self.redPacketModel.result = [resultModel mj_JSONObject]; - if(resultModel.redEnvelopeVO.pickNum.integerValue == resultModel.redEnvelopeVO.totalNum.integerValue){ - [self.redPacketList removeObject:self.redPacketModel]; - if(self.redPacketList.count == 0){ - self.hidden = YES; - return; - } - self.redPacketModel = self.redPacketList.firstObject; - if(self.type == RoomType_MiniGame){ - - self.hidden = self.isInRoom == NO; - }else{ - - self.hidden = self.isInRoom == YES; - } - self.pi_redNum = @(self.redPacketList.count).stringValue; - } - - -} --(void)installUI{ - - [self addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.robBtn]; - [self.bgImageView addSubview:self.countDownView]; - [self.bgImageView addSubview:self.redPoionView]; - [self.redPoionView addSubview:self.redPoionNumView]; - [self addSubview:self.openBtn]; -} --(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [self.robBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(36)); - make.height.mas_equalTo(kGetScaleWidth(15)); - make.bottom.mas_equalTo(-kGetScaleWidth(10)); - make.centerX.equalTo(self.bgImageView); - }]; - [self.countDownView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.robBtn); - }]; - [self.redPoionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(12)); - make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(12)); - make.bottom.equalTo(self.robBtn.mas_top).mas_offset(-kGetScaleWidth(17)); - make.trailing.equalTo(self.robBtn.mas_trailing).mas_equalTo(kGetScaleWidth(6)); - }]; - [self.redPoionNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.redPoionView); - make.leading.trailing.equalTo(self.redPoionView).inset(kGetScaleWidth(3)); - }]; - [self.openBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; -} --(void)setPi_redNum:(NSString *)pi_redNum{ - _pi_redNum = pi_redNum; - _redPoionNumView.text = _pi_redNum.integerValue > 99 ? @"99+" : _pi_redNum; -} --(void)setRedPacketModel:(XPRedPacketModel *)redPacketModel{ - _redPacketModel = redPacketModel; - self.countDownView.hidden = YES; - self.robBtn.hidden = YES; - if(_redPacketModel.kind == RedPacketConditionsType_NO){ - if(_redPacketModel.validityType == 1){ - NSInteger time = [self getTimeDifferenceWithTimestamp:_redPacketModel.timestamp / 1000 beginTime:_redPacketModel.beginTime / 1000]; - if(time > 0){ - self.countDownView.hidden = NO; - [self.countDownHelper openCountdownWithTime:(int)time]; - }else{ - self.robBtn.hidden = NO; - } - }else{ - - self.robBtn.hidden = NO; - } - }else if(_redPacketModel.kind == RedPacketConditionsType_Followd){ - - NSInteger time = [self getTimeDifferenceWithTimestamp:_redPacketModel.timestamp / 1000 beginTime:_redPacketModel.beginTime / 1000]; - if(time > 0){ - self.countDownView.hidden = NO; - [self.countDownHelper openCountdownWithTime:(int)time]; - }else{ - self.robBtn.hidden = NO; - } - - }else if(_redPacketModel.kind == RedPacketConditionsType_Share){ - NSInteger time = [self getTimeDifferenceWithTimestamp:_redPacketModel.timestamp / 1000 beginTime:_redPacketModel.beginTime / 1000]; - if(time > 0){ - self.countDownView.hidden = NO; - [self.countDownHelper openCountdownWithTime:(int)time]; - }else{ - self.robBtn.hidden = NO; - } - }else if(_redPacketModel.kind == RedPacketConditionsType_Scrolling){ - - NSInteger time = [self getTimeDifferenceWithTimestamp:_redPacketModel.timestamp / 1000 beginTime:_redPacketModel.beginTime / 1000]; - if(time > 0){ - self.countDownView.hidden = NO; - [self.countDownHelper openCountdownWithTime:(int)time]; - }else{ - self.robBtn.hidden = NO; - } - } -} --(NSInteger)getTimeDifferenceWithTimestamp:(long)timestamp beginTime:(long)beginTime { - NSString *time1 = [NSDate timestampSwitchTime:(NSInteger)timestamp formatter:@"YYYY-MM-dd hh:mm:ss"]; - NSString *time2 = [NSDate timestampSwitchTime:(NSInteger)beginTime formatter:@"YYYY-MM-dd hh:mm:ss"]; - NSInteger second = [NSDate pleaseInsertStarTimeo:time1 andInsertEndTime:time2]; - return second; -} -#pragma mark- CountDownHelperDelegate -///倒计时结束 -- (void)onCountdownFinish{ - self.countDownView.hidden = YES; - self.robBtn.hidden = NO; - -} -///倒计时进行 -- (void)onCountdownOpen:(int)time{ - NSInteger seconds = time; - int minutes = (seconds)%3600/60; - int second = (seconds)%60; - self.countDownView.text = [NSString stringWithFormat:@"%02d:%02d",minutes,second]; - -} - --(void)setRedPacketList:(NSMutableArray *)redPacketList{ - _redPacketList = redPacketList; - if(_redPacketList.count > 0){ - self.redPacketModel = _redPacketList.firstObject; - if(self.type == RoomType_MiniGame){ - - self.hidden = self.isInRoom == NO; - }else{ - - self.hidden = self.isInRoom == YES; - } - self.pi_redNum = @(_redPacketList.count).stringValue; - } -} --(void)openBtnAction{ - self.openBtn.enabled = NO; - [XNDJTDDLoadingTool showLoading]; - [Api getRedPacket:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - self.openBtn.enabled = YES; - [XNDJTDDLoadingTool hideHUD]; - if(code == 200){ - XPRedPacketModel *redModel = [XPRedPacketModel modelWithJSON:data.data]; - if(redModel.kind == 0){ - redModel.kind = 1; - } - redModel.timestamp = data.timestamp; - redModel.sendUserNick = data.data[@"nick"]; - redModel.sendUserAvatar = data.data[@"avatar"]; - redModel.redEnvelopePosition = data.data[@"position"]; - - if(redModel.state == 2 || redModel.state == 6){ - [self.redPacketList removeObject:self.self.redPacketModel]; - if(self.redPacketList.count == 0){ - self.hidden = YES; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomActivityContainerView3")]; - return; - } - self.redPacketModel = self.redPacketList.firstObject; - self.hidden = NO; - self.pi_redNum = @(self.redPacketList.count).stringValue; - if(self.delegate && [self.delegate respondsToSelector:@selector(openRedPacketWithModel:)]){ - [self.delegate openRedPacketWithModel:self.redPacketModel]; - } - return; - } - XPRedPacketResultModel *resultModel = [XPRedPacketResultModel modelWithDictionary:redModel.result]; - if(redModel.state == 3 || redModel.state == 4){ - if(resultModel.redEnvelopeVO.pickNum.integerValue == resultModel.redEnvelopeVO.totalNum.integerValue){ - [self.redPacketList removeObject:self.self.redPacketModel]; - if(self.redPacketList.count == 0){ - self.hidden = YES; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomActivityContainerView3")]; - return; - } - self.redPacketModel = self.redPacketList.firstObject; - self.hidden = NO; - self.pi_redNum = @(self.redPacketList.count).stringValue; - return; - } - - } - [self.redPacketList replaceObjectAtIndex:[self.redPacketList indexOfObject:self.redPacketModel] withObject:redModel]; - self.redPacketModel = redModel; - if(self.delegate && [self.delegate respondsToSelector:@selector(openRedPacketWithModel:)]){ - [self.delegate openRedPacketWithModel:self.redPacketModel]; - } - } - } redEnvelopeId:self.redPacketModel.redEnvelopeId]; - - - -} -#pragma mark - 懒加载 -- (UIImageView *)bgImageView{ - if(!_bgImageView){ - _bgImageView = [UIImageView new]; - _bgImageView.image = kImage(@"pi_red_packet_enter_bg"); - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} --(UIButton *)robBtn{ - if(!_robBtn){ - _robBtn = [UIButton new]; - [_robBtn setBackgroundImage:kImage(@"pi_red_packet_enter_rob_icon") forState:UIControlStateNormal]; - [_robBtn setTitle:YMLocalizedString(@"PIRoomEnterRedPacketView0") forState:UIControlStateNormal]; - [_robBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _robBtn.titleLabel.font = kFontMedium(9); - } - return _robBtn; -} -- (UILabel *)countDownView{ - if(!_countDownView){ - _countDownView = [UILabel labelInitWithText:@"00:00" font:kFontSemibold(10) textColor:[UIColor whiteColor]]; - _countDownView.textAlignment = NSTextAlignmentCenter; - _countDownView.layer.cornerRadius = kGetScaleWidth(15)/2; - _countDownView.layer.masksToBounds = YES; - _countDownView.backgroundColor = UIColorRGBAlpha(0x292929, 0.6); - } - return _countDownView; -} -- (CountDownHelper *)countDownHelper{ - if (!_countDownHelper){ - _countDownHelper = [[CountDownHelper alloc]init]; - _countDownHelper.delegate = self; - } - return _countDownHelper; -} -- (UIView *)redPoionView{ - if(!_redPoionView){ - _redPoionView = [UIView new]; - _redPoionView.backgroundColor = UIColorFromRGB(0xF44646); - _redPoionView.layer.cornerRadius = kGetScaleWidth(12)/2; - _redPoionView.layer.masksToBounds = YES; - } - return _redPoionView; -} -- (UILabel *)redPoionNumView{ - if(!_redPoionNumView){ - _redPoionNumView = [UILabel labelInitWithText:@"0" font:kFontMedium(9) textColor:[UIColor whiteColor]]; - _redPoionNumView.textAlignment = NSTextAlignmentCenter; - } - return _redPoionNumView; -} -- (UIButton *)openBtn{ - if(!_openBtn){ - _openBtn = [UIButton new]; - [_openBtn addTarget:self action:@selector(openBtnAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _openBtn; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.h b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.h deleted file mode 100644 index 22ddafd..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// PIRoomSendRedPacketItemVC.h -// YuMi -// -// Created by duoban on 2023/10/18. -// - -#import "MvpViewController.h" -#import -#import "RoomHostDelegate.h" -#import "WalletInfoModel.h" -typedef enum : NSUInteger { - Room_Send_Red_Packet_Type_Lobby = 0,///大厅红包 - Room_Send_Red_Packet_Type_Entire_Server,///全服红包 -} PIRoomSendRedPacketItemVCType; - - - - -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomSendRedPacketItemVC : MvpViewController -@property (nonatomic, copy) void(^scrollCallback)(UIScrollView *scrollView); -@property (nonatomic, copy) NSString *roomUid; -@property(nonatomic,strong) WalletInfoModel *walletModel; -- (instancetype)initWithDelegate:(id)delegate type:(PIRoomSendRedPacketItemVCType)type; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.m deleted file mode 100644 index 4c3120b..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketItemVC.m +++ /dev/null @@ -1,408 +0,0 @@ -// -// PIRoomSendRedPacketItemVC.m -// YuMi -// -// Created by duoban on 2023/10/18. -// - -#import "PIRoomSendRedPacketItemVC.h" -#import "PIInputRedPacketView.h" -#import "PIRedPacketChooseTypeView.h" -#import "PIInputScrollingView.h" -#import "PIInputEntireServerScrollingView.h" -#import "XPRoomRedPacketPresenter.h" -#import "UserInfoModel.h" -#import "XPRoomRedPacketPwdView.h" -#import "XPMinePayPwdViewController.h" -#import "RoomInfoModel.h" -#import "XPIAPRechargeViewController.h" -#import "XCCurrentVCStackManager.h" -#import "ClientConfig.h" - -@interface PIRoomSendRedPacketItemVC () -///host代理 -@property (nonatomic,weak) idhostDelegate; -///紅包金額 -@property(nonatomic,strong) PIInputRedPacketView *pi_priceView; -///紅包數量 -@property(nonatomic,strong) PIInputRedPacketView *pi_numView; -///搶紅包條件 -@property(nonatomic,strong) PIRedPacketChooseTypeView *chooseTypeView; -///立即生效 -@property(nonatomic,strong) UIButton *promptlyBtn; -////限時生效 -@property(nonatomic,strong) UIButton *limitBtn; -///發紅包 -@property(nonatomic,strong) UIButton *sendBtn; -///提示 -@property(nonatomic,strong) UILabel *tipsView; -///输入弹幕 -@property(nonatomic,strong) PIInputScrollingView *scrollingView; -///全服输入 -@property(nonatomic,strong) PIInputEntireServerScrollingView *serverInputView; -///红包类型 -@property(nonatomic,assign) PIRoomSendRedPacketItemVCType type; -///发送红包的类型 -@property(nonatomic,assign) PIRedPacketChooseTypeViewType sendRedType; -@property(nonatomic,strong) UserInfoModel *userInfo; -@property(nonatomic,assign) BOOL pi_isHaveUser; - -@end - -@implementation PIRoomSendRedPacketItemVC -- (XPRoomRedPacketPresenter *)createPresenter { - return [[XPRoomRedPacketPresenter alloc] init]; -} -- (BOOL)isHiddenNavBar { - return YES; -} - - -- (instancetype)initWithDelegate:(id)delegate type:(PIRoomSendRedPacketItemVCType)type{ - self = [super init]; - if(self){ - self.hostDelegate = delegate; - self.type = type; - } - return self; -} -- (void)viewDidLoad { - [super viewDidLoad]; - [self installUI]; - [self installConstraints]; - [self.presenter getUserModel]; - -} --(void)installUI{ - self.sendRedType = Red_Packet_Choose_type_Normal; - self.view.backgroundColor = [UIColor whiteColor]; - [self.view addSubview:self.pi_priceView]; - [self.view addSubview:self.pi_numView]; - - if(self.type == Room_Send_Red_Packet_Type_Lobby){ - [self.view addSubview:self.chooseTypeView]; - [self.view addSubview:self.promptlyBtn]; - [self.view addSubview:self.limitBtn]; - [self.view addSubview:self.scrollingView]; - }else{ - [self.view addSubview:self.serverInputView]; - } - [self.view addSubview:self.sendBtn]; - [self.view addSubview:self.tipsView]; -} --(void)installConstraints{ - [self.pi_priceView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(10)); - make.width.mas_equalTo(kGetScaleWidth(327)); - make.height.mas_equalTo(kGetScaleWidth(48)); - make.centerX.equalTo(self.view); - }]; - [self.pi_numView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(327)); - make.height.mas_equalTo(kGetScaleWidth(48)); - make.centerX.equalTo(self.view); - make.top.equalTo(self.pi_priceView.mas_bottom).mas_offset(kGetScaleWidth(12)); - }]; - if(self.type == Room_Send_Red_Packet_Type_Lobby){ - [self.chooseTypeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.pi_numView.mas_bottom).mas_offset(kGetScaleWidth(16)); - make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(0)); - make.height.mas_equalTo(kGetScaleWidth(92)); - }]; - [self.promptlyBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.chooseTypeView.mas_bottom).mas_offset(kGetScaleWidth(12)); - make.leading.mas_equalTo(kGetScaleWidth(24)); - make.width.mas_equalTo(kGetScaleWidth(154)); - make.height.mas_equalTo(kGetScaleWidth(52)); - }]; - [self.limitBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.chooseTypeView.mas_bottom).mas_offset(kGetScaleWidth(12)); - make.trailing.mas_equalTo(-kGetScaleWidth(24)); - make.width.mas_equalTo(kGetScaleWidth(154)); - make.height.mas_equalTo(kGetScaleWidth(52)); - }]; - [self.scrollingView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.chooseTypeView.mas_bottom).mas_offset(kGetScaleWidth(12)); - make.width.mas_equalTo(kGetScaleWidth(327)); - make.height.mas_equalTo(kGetScaleWidth(52)); - make.centerX.equalTo(self.view); - }]; - [self.sendBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.pi_numView.mas_bottom).mas_offset(kGetScaleWidth(200)); - make.width.mas_equalTo(kGetScaleWidth(295)); - make.height.mas_equalTo(kGetScaleWidth(52)); - make.centerX.equalTo(self.view); - }]; - }else{ - [self.serverInputView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.pi_numView.mas_bottom).mas_offset(kGetScaleWidth(24)); - make.width.mas_equalTo(kGetScaleWidth(327)); - make.height.mas_equalTo(kGetScaleWidth(76)); - make.centerX.equalTo(self.view); - }]; - [self.sendBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.pi_numView.mas_bottom).mas_offset(kGetScaleWidth(128)); - make.width.mas_equalTo(kGetScaleWidth(295)); - make.height.mas_equalTo(kGetScaleWidth(52)); - make.centerX.equalTo(self.view); - }]; - } - - - [self.tipsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.sendBtn.mas_bottom).mas_offset(kGetScaleWidth(10)); - make.centerX.equalTo(self.view); - }]; -} -///获取用户信息成功 -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { - if(self.pi_isHaveUser == NO){ - self.userInfo = userInfo; - return; - } - -} -#pragma mark - JXPagingViewListViewDelegate -- (UIScrollView *)listScrollView { - return self.chooseTypeView.collectionView; -} - -- (void)listViewDidScrollCallback:(void (^)(UIScrollView *))callback { - self.scrollCallback = callback; -} - -- (UIView *)listView { - return self.view; -} -#pragma mark- PIRedPacketChooseTypeViewDelegate -- (void)chooseRedPacketType:(PIRedPacketChooseTypeViewType)type{ - self.sendRedType = type; - switch (type) { - case Red_Packet_Choose_type_Follow: - { - self.scrollingView.hidden = YES; - self.promptlyBtn.hidden = YES; - self.limitBtn.hidden = YES; - } - break; - case Red_Packet_Choose_type_Share: - { - self.scrollingView.hidden = YES; - self.promptlyBtn.hidden = YES; - self.limitBtn.hidden = YES; - } - break; - case Red_Packet_Choose_type_Scrolling: - { - self.scrollingView.hidden = NO; - self.promptlyBtn.hidden = YES; - self.limitBtn.hidden = YES; - } - break; - default: - { - self.scrollingView.hidden = YES; - self.promptlyBtn.hidden = NO; - self.limitBtn.hidden = NO; - } - break; - } -} --(void)choooseEffectiveConditionAction:(UIButton *)sender{ - if(sender == self.promptlyBtn){ - self.promptlyBtn.selected = YES; - self.promptlyBtn.layer.borderWidth = 1; - self.promptlyBtn.backgroundColor = UIColorRGBAlpha(0xFF285C, 0.06); - self.promptlyBtn.titleLabel.font = kFontMedium(16); - - self.limitBtn.selected = NO; - self.limitBtn.layer.borderWidth = 0; - self.limitBtn.backgroundColor = UIColorFromRGB(0xF8F8FA); - self.limitBtn.titleLabel.font = kFontRegular(16); - return; - } - self.limitBtn.selected = YES; - self.limitBtn.layer.borderWidth = 1; - self.limitBtn.backgroundColor = UIColorRGBAlpha(0xFF285C, 0.06); - self.limitBtn.titleLabel.font = kFontMedium(16); - - self.promptlyBtn.selected = NO; - self.promptlyBtn.layer.borderWidth = 0; - self.promptlyBtn.backgroundColor = UIColorFromRGB(0xF8F8FA); - self.promptlyBtn.titleLabel.font = kFontRegular(16); -} --(void)onReleaseButtonClick{ - - //判断钻石数量 - NSInteger packetCount = [self.pi_priceView.redPacketNum integerValue]; - if (packetCount <= 0) { - [self showErrorToast:YMLocalizedString(@"XPRoomSendRedPacketViewController17")]; - return; - } - //判断红包数量 - NSInteger diamonCount = [self.pi_numView.redPacketNum integerValue]; - if (diamonCount <= 0) { - [self showErrorToast:YMLocalizedString(@"XPRoomSendRedPacketViewController18")]; - return; - } -// if (diamonCount % 10 != 0) { -// [self showErrorToast:YMLocalizedString(@"XPRoomSendRedPacketViewController19")]; -// return; -// } - if(self.walletModel.diamonds.integerValue < packetCount){ - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.message = YMLocalizedString(@"XPTreasureFairyViewController5"); - config.confirmButtonConfig.title = YMLocalizedString(@"XPTreasureFairyViewController6"); - [TTPopup alertWithConfig:config confirmHandler:^{ - XPIAPRechargeViewController * rechargeVC = [[XPIAPRechargeViewController alloc] init]; - rechargeVC.type = @"4"; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:rechargeVC animated:YES]; - } cancelHandler:^{ - - }]; - return; - } - self.pi_isHaveUser = YES; - if(self.userInfo == nil){ - [self.presenter getUserModel]; - return; - } - if (self.userInfo.isBindPaymentPwd) { - XPRoomRedPacketPwdView *pwdView = [[XPRoomRedPacketPwdView alloc] init]; - pwdView.diamonCount = @(packetCount).stringValue; - pwdView.delegate = self; - [TTPopup popupView:pwdView style:TTPopupStyleAlert]; - } else { - XPMinePayPwdViewController *vc = [[XPMinePayPwdViewController alloc] init]; - vc.userInfo = self.userInfo; - [self.navigationController pushViewController:vc animated:YES]; - } -} -#pragma mark - XPRoomRedPacketPwdViewDelegate -- (void)xPRoomRedPacketPwdViewPwdComplete:(NSString *)pwd { - [TTPopup dismiss]; - NSString *roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - NSString *type = self.type == Room_Send_Red_Packet_Type_Lobby ? @"1" : @"2"; - NSArray *kindList = @[@"1",@"2",@"3",@"4"]; - NSString *kind = self.type == Room_Send_Red_Packet_Type_Lobby ? [kindList xpSafeObjectAtIndex:self.sendRedType] : @"0"; - NSString *message ; - if(self.type == Room_Send_Red_Packet_Type_Lobby){ - message = self.scrollingView.pi_scrolling.length > 0 ? self.scrollingView.pi_scrolling : YMLocalizedString(@"XPRoomSendRedPacketViewController4"); - }else{ - message = self.serverInputView.getContent.length > 0 ? self.serverInputView.getContent : YMLocalizedString(@"XPRoomSendRedPacketViewController4"); - } - - NSString *validityType = self.promptlyBtn.selected == YES ? @"0" : @"1"; - if(self.sendRedType != Red_Packet_Choose_type_Normal){ - validityType = @"1"; - } - if(self.sendRedType == Red_Packet_Choose_type_Scrolling && self.serverInputView.getContent.length == 0){ - [self showErrorToast:YMLocalizedString(@"PIRoomSendRedPacketItemVC7")]; - return; - } - - [self.presenter sendRedPacketWithNum:self.pi_numView.redPacketNum goldNum:self.pi_priceView.redPacketNum roomUid:roomUid type:type password:pwd message:message kind:kind validityType:validityType]; -} - -- (void)xPRoomRedPacketPwdViewPwdForgetBtnClick { - XPMinePayPwdViewController *vc = [[XPMinePayPwdViewController alloc] init]; - vc.userInfo = self.hostDelegate.getUserInfo; - [self.navigationController pushViewController:vc animated:YES]; - -} -///发送红包成功 -- (void)sendRedPacketSuccess { - [self showSuccessToast:YMLocalizedString(@"XPRoomSendRedPacketViewController3")]; - [self dismissViewControllerAnimated:YES completion:nil]; -} -#pragma mark - 懒加载 -- (PIInputRedPacketView *)pi_priceView{ - if(!_pi_priceView){ - _pi_priceView = [[PIInputRedPacketView alloc]initWithFrame:CGRectZero]; - _pi_priceView.isHiddenIcon = NO; - _pi_priceView.pi_title = YMLocalizedString(@"PIRoomSendRedPacketItemVC0"); - _pi_priceView.unitTitle = YMLocalizedString(@"PIRoomSendRedPacketItemVC2"); - } - return _pi_priceView; -} -- (PIInputRedPacketView *)pi_numView{ - if(!_pi_numView){ - _pi_numView = [[PIInputRedPacketView alloc]initWithFrame:CGRectZero]; - _pi_numView.isHiddenIcon = YES; - _pi_numView.pi_title = YMLocalizedString(@"PIRoomSendRedPacketItemVC1"); - _pi_numView.unitTitle = YMLocalizedString(@"PIRoomSendRedPacketItemVC3"); - } - return _pi_numView; -} -- (PIRedPacketChooseTypeView *)chooseTypeView{ - if(!_chooseTypeView){ - _chooseTypeView = [[PIRedPacketChooseTypeView alloc]initWithFrame:CGRectZero]; - _chooseTypeView.delegate = self; - } - return _chooseTypeView; -} -- (UIButton *)promptlyBtn{ - if(!_promptlyBtn){ - _promptlyBtn = [UIButton new]; - [_promptlyBtn setTitleColor:UIColorFromRGB(0xFF285C) forState:UIControlStateSelected]; - [_promptlyBtn setTitleColor:UIColorFromRGB(0x767585) forState:UIControlStateNormal]; - _promptlyBtn.titleLabel.font = kFontMedium(16); - _promptlyBtn.backgroundColor = UIColorRGBAlpha(0xFF285C, 0.06); - _promptlyBtn.layer.cornerRadius = kGetScaleWidth(8); - _promptlyBtn.selected = YES; - [_promptlyBtn setTitle:YMLocalizedString(@"PIRoomSendRedPacketItemVC4") forState:UIControlStateNormal]; - _promptlyBtn.layer.masksToBounds = YES; - _promptlyBtn.layer.borderColor = UIColorFromRGB(0xFF285C).CGColor; - _promptlyBtn.layer.borderWidth = 1; - [_promptlyBtn addTarget:self action:@selector(choooseEffectiveConditionAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _promptlyBtn; -} -- (UIButton *)limitBtn{ - if(!_limitBtn){ - _limitBtn = [UIButton new]; - [_limitBtn setTitleColor:UIColorFromRGB(0xFF285C) forState:UIControlStateSelected]; - [_limitBtn setTitleColor:UIColorFromRGB(0x767585) forState:UIControlStateNormal]; - _limitBtn.titleLabel.font = kFontRegular(16); - _limitBtn.backgroundColor = UIColorFromRGB(0xF8F8FA); - _limitBtn.layer.cornerRadius = kGetScaleWidth(8); - [_limitBtn setTitle:YMLocalizedString(@"PIRoomSendRedPacketItemVC5") forState:UIControlStateNormal]; - _limitBtn.layer.masksToBounds = YES; - _limitBtn.layer.borderColor = UIColorFromRGB(0xFF285C).CGColor; - _limitBtn.layer.borderWidth = 0; - [_limitBtn addTarget:self action:@selector(choooseEffectiveConditionAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _limitBtn; -} -- (UIButton *)sendBtn{ - if(!_sendBtn){ - _sendBtn = [UIButton new]; - [_sendBtn setBackgroundImage:kImage(@"pi_red_packet_send") forState:UIControlStateNormal]; - [_sendBtn addTarget:self action:@selector(onReleaseButtonClick) forControlEvents:UIControlEventTouchUpInside]; - } - return _sendBtn; -} -- (UILabel *)tipsView{ - if(!_tipsView){ - - CGFloat time = [ClientConfig shareConfig].configInfo.redEnvelopeConfig.endSecond / 3600.0; - NSString *timeStr = [NSString stringWithFormat:@"%.1f",time]; - timeStr = [timeStr stringByReplacingOccurrencesOfString:@".0" withString:@""]; - _tipsView = [UILabel labelInitWithText:[NSString stringWithFormat:YMLocalizedString(@"PIRoomSendRedPacketItemVC6"),timeStr] font:kFontRegular(12) textColor:UIColorFromRGB(0x94959C)]; - } - return _tipsView; -} -- (PIInputScrollingView *)scrollingView{ - if(!_scrollingView){ - _scrollingView = [[PIInputScrollingView alloc]initWithFrame:CGRectZero]; - _scrollingView.hidden = YES; - } - return _scrollingView; -} -- (PIInputEntireServerScrollingView *)serverInputView{ - if(!_serverInputView){ - _serverInputView = [[PIInputEntireServerScrollingView alloc]initWithFrame:CGRectZero]; - } - return _serverInputView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.h b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.h deleted file mode 100644 index f1a7d0a..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// PIRoomSendRedPacketVC.h -// YuMi -// -// Created by duoban on 2023/10/18. -// - -#import "MvpViewController.h" -#import "RoomHostDelegate.h" -NS_ASSUME_NONNULL_BEGIN - -@interface PIRoomSendRedPacketVC : MvpViewController -@property (nonatomic, copy) NSString *roomUid; -- (instancetype)initWithDelegate:(id)delegate; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m deleted file mode 100644 index 67edfbe..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m +++ /dev/null @@ -1,373 +0,0 @@ - -// -// PIRoomSendRedPacketVC.m -// YuMi -// -// Created by duoban on 2023/10/18. -// - -#import "PIRoomSendRedPacketVC.h" -#import -#import -#import -#import "PIRoomSendRedPacketItemVC.h" -#import "XPRoomRedPacketPresenter.h" -#import "WalletInfoModel.h" -#import "RoomInfoModel.h" -#import "XPIAPRechargeViewController.h" -#import "XCCurrentVCStackManager.h" -#import "XPRoomHalfWebView.h" -@interface PIRoomSendRedPacketVC () -///host代理 -@property (nonatomic,weak) idhostDelegate; -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXPagerView *contentView; -///返回 -@property(nonatomic,strong) UIButton *pi_backBtn; -///背景 -@property(nonatomic,strong) UIView *bgView; -///隐藏键盘 -@property(nonatomic,strong) UIButton *hiddenViewBnt; -///背景图片 -@property(nonatomic,strong) UIImageView *topImageView; -///红包提示 -@property(nonatomic,strong) UIButton *tipsBtn; -///钻石背景 -@property(nonatomic,strong) UIImageView *pi_diamondNumView; -///钻石数量 -@property(nonatomic,strong) UILabel *diamondNumTextView; -///钻石icom -@property(nonatomic,strong) UIImageView *diamondIconView; -//加号 -@property(nonatomic,strong) UIImageView *addIconView; -///大厅红包 -@property(nonatomic,strong) PIRoomSendRedPacketItemVC *roomRedVC; -///全服红包 -@property(nonatomic,strong) PIRoomSendRedPacketItemVC *entireServerVC; -@end - -@implementation PIRoomSendRedPacketVC -- (XPRoomRedPacketPresenter *)createPresenter { - return [[XPRoomRedPacketPresenter alloc] init]; -} -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super init]) { - self.hostDelegate = delegate; - } - return self; -} -- (BOOL)isHiddenNavBar { - return YES; -} -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [self.presenter getUserWalletInfo]; -} -///获取用户钱包信息成功 -- (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo { - self.diamondNumTextView.text = balanceInfo.diamonds; - self.roomRedVC.walletModel = balanceInfo; - self.entireServerVC.walletModel = balanceInfo; - - - -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor clearColor]; - self.navigationController.view.backgroundColor = [UIColor clearColor]; - [self.navigationController setNavigationBarHidden:YES]; - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - if(roomInfo.redEnvelopeType == 1){ - self.titles = @[YMLocalizedString(@"PIRoomSendRedPacketVC0")]; - }else if(roomInfo.redEnvelopeType == 2){ - self.titles = @[YMLocalizedString(@"PIRoomSendRedPacketVC1")]; - }else{ - self.titles = @[YMLocalizedString(@"PIRoomSendRedPacketVC0"),YMLocalizedString(@"PIRoomSendRedPacketVC1")]; - - } - [self installUI]; - [self installConstraints]; -} --(void)installUI{ - [self.view addSubview:self.pi_backBtn]; - [self.view addSubview:self.bgView]; - [self.view addSubview:self.topImageView]; - [self.view addSubview:self.hiddenViewBnt]; - [self.view addSubview:self.tipsBtn]; - [self.view addSubview:self.pi_diamondNumView]; - [self.pi_diamondNumView addSubview:self.diamondIconView]; - [self.pi_diamondNumView addSubview:self.diamondNumTextView]; - [self.pi_diamondNumView addSubview:self.addIconView]; - [self.view addSubview:self.contentView]; -} --(void)installConstraints{ - [self.pi_backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.view); - }]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(543)); - }]; - [self.topImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.bgView.mas_top).mas_offset(-kGetScaleWidth(120)); - make.leading.trailing.equalTo(self.view); - make.height.mas_equalTo(kGetScaleWidth(243)); - }]; - [self.hiddenViewBnt mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.equalTo(self.view); - make.top.equalTo(self.topImageView.mas_top).mas_offset(kGetScaleWidth(50)); - - }]; - - [self.tipsBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(24)); - make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.top.equalTo(self.topImageView.mas_top).mas_offset(kGetScaleWidth(71)); - }]; - [self.pi_diamondNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.bgView.mas_top).mas_offset(kGetScaleWidth(13)); - make.trailing.mas_equalTo(-kGetScaleWidth(0)); - make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(10)); - make.height.mas_equalTo(kGetScaleWidth(30)); - }]; - [self.diamondIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(20)); - make.centerY.equalTo(self.pi_diamondNumView); - make.leading.mas_equalTo(kGetScaleWidth(6)); - }]; - [self.addIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.pi_diamondNumView); - make.width.height.mas_equalTo(kGetScaleWidth(16)); - make.trailing.mas_equalTo(-kGetScaleWidth(6)); - }]; - [self.diamondNumTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.equalTo(self.pi_diamondNumView); - make.leading.mas_equalTo(kGetScaleWidth(25)); - make.trailing.mas_equalTo(-kGetScaleWidth(23)); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.bgView.mas_top).mas_offset(kGetScaleWidth(52)); - make.leading.trailing.bottom.mas_equalTo(self.view); - }]; -} --(void)hiddenViewBntAction{ - [self.view endEditing:YES]; -} -#pragma mark - JXCategoryViewDelegate -- (NSUInteger)tableHeaderViewHeightInPagerView:(JXPagerView *)pagerView { - return 0; -} - -- (UIView *)tableHeaderViewInPagerView:(JXPagerView *)pagerView { - return [UIView new]; -} -- (NSUInteger)heightForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return kGetScaleWidth(44); -} -- (UIView *)viewForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return self.titleView; -} - -- (NSInteger)numberOfListsInPagerView:(JXPagerView *)pagerView { - return self.titles.count; -} - -- (id)pagerView:(JXPagerView *)pagerView initListAtIndex:(NSInteger)index { - - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - if(roomInfo.redEnvelopeType == 1){ - return self.roomRedVC; - }else if(roomInfo.redEnvelopeType == 2){ - return self.entireServerVC; - }else{ - return index == 0 ? self.roomRedVC : self.entireServerVC; - - } - -} - -#pragma mark - JXPagerMainTableViewGestureDelegate -- (BOOL)mainTableViewGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { - //禁止categoryView左右滑动的时候，上下和左右都可以滚动 - if (otherGestureRecognizer.view == self.contentView.listContainerView) { - return NO; - } - if(otherGestureRecognizer.view.tag == 3000000001){ - return YES; - } - - - return [gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] && [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]]; -} --(void)tipsAction{ - - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = URLWithType(kRedPacketRuleURL); - TTPopupService * config = [[TTPopupService alloc] init]; - config.contentView = webView; - [TTPopup popupWithConfig:config]; - -} --(void)hiddenViewAction{ - [self dismissViewControllerAnimated:YES completion:nil]; -} --(void)getDiamondAction{ - XPIAPRechargeViewController * rechargeVC = [[XPIAPRechargeViewController alloc] init]; - rechargeVC.type = @"4"; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:rechargeVC animated:YES]; -} - --(NSTextAttachment *)getDiamondNumAtt:(NSString *)image{ - NSTextAttachment * diamondAttachment = [[NSTextAttachment alloc] init]; - UIImage *diamondIconImage = [UIImage imageNamed:image];; - diamondAttachment.bounds = CGRectMake(0, roundf(kFontMedium(13).capHeight - diamondIconImage.size.height)/2.f, diamondIconImage.size.width, diamondIconImage.size.height); - diamondAttachment.image = diamondIconImage; - return diamondAttachment; -} -- (UIImage*)resizableImage:(UIImage *)image { - //图片拉伸区域 - CGFloat top = (image.size.height - 1) / 2; - CGFloat left = (image.size.width - 1) / 2; - CGFloat right = (image.size.width - 1) / 2; - CGFloat bottom = (image.size.height - 1) / 2; - return [image resizableImageWithCapInsets:UIEdgeInsetsMake(top, left, bottom, right) resizingMode:UIImageResizingModeStretch]; -} -#pragma mark - 懒加载 -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = [UIColor whiteColor]; - } - return _bgView; -} -- (UIButton *)pi_backBtn{ - if(!_pi_backBtn){ - _pi_backBtn = [UIButton new]; - [_pi_backBtn addTarget:self action:@selector(hiddenViewAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _pi_backBtn; -} -- (UIImageView *)topImageView{ - if(!_topImageView){ - _topImageView = [UIImageView new]; - _topImageView.image = kImage(@"pi_red_packet_top_icon_logo"); - } - return _topImageView; -} -- (UIButton *)tipsBtn{ - if(!_tipsBtn){ - _tipsBtn = [UIButton new]; - [_tipsBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_tipsBtn addTarget:self action:@selector(tipsAction) forControlEvents:UIControlEventTouchUpInside]; - [_tipsBtn setBackgroundImage:kImage(@"pi_red_packet_top_tip_logo") forState:UIControlStateNormal]; - } - return _tipsBtn; -} -- (UIImageView *)pi_diamondNumView{ - if(!_pi_diamondNumView){ - _pi_diamondNumView = [UIImageView new]; - _pi_diamondNumView.image = [self resizableImage:kImage(@"pi_red_packet_top_diamond_bg")]; - _pi_diamondNumView.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(getDiamondAction)]; - [_pi_diamondNumView addGestureRecognizer:tap]; - } - return _pi_diamondNumView; -} -- (UILabel *)diamondNumTextView{ - if(!_diamondNumTextView){ - _diamondNumTextView = [UILabel labelInitWithText:@"0" font:kFontMedium(13) textColor:[UIColor whiteColor]]; - _diamondNumTextView.textAlignment = NSTextAlignmentCenter; - } - return _diamondNumTextView; -} -- (UIImageView *)diamondIconView{ - if(!_diamondIconView){ - _diamondIconView = [UIImageView new]; - _diamondIconView.image = kImage(@"moli_money_icon"); - } - return _diamondIconView; -} --(UIImageView *)addIconView{ - if(!_addIconView){ - _addIconView = [UIImageView new]; - _addIconView.image = kImage(@"pi_red_packet_top_diamond_add"); - } - return _addIconView; -} -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = UIColorFromRGB(0x767585); - _titleView.titleSelectedColor = UIColorFromRGB(0xFF285C); - _titleView.titleFont =kFontMedium(18); - _titleView.titleSelectedFont = kFontSemibold(18); - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.averageCellSpacingEnabled = NO; - if(self.titles.count == 2){ - _titleView.contentEdgeInsetLeft = kGetScaleWidth(78); - _titleView.contentEdgeInsetRight = kGetScaleWidth(78); - _titleView.cellWidth = kGetScaleWidth(72); - _titleView.cellSpacing = kGetScaleWidth(75); - }else{ - _titleView.cellWidth = KScreenWidth; - } - - - _titleView.defaultSelectedIndex = 0; - _titleView.listContainer = (id)self.contentView.listContainerView; - - - JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(12), kGetScaleWidth(4)); - lineView.verticalMargin = kGetScaleWidth(5); - lineView.backgroundColor = UIColorFromRGB(0xFF285C); - lineView.layer.cornerRadius = kGetScaleWidth(4)/2; - lineView.layer.masksToBounds = YES; - _titleView.indicators = @[lineView]; - } - return _titleView; -} - - -- (JXPagerView *)contentView { - if (!_contentView) { - _contentView = [[JXPagerView alloc] initWithDelegate:self listContainerType:0]; - _contentView.mainTableView.gestureDelegate = self; - _contentView.backgroundColor = [UIColor clearColor]; - _contentView.listContainerView.backgroundColor = [UIColor clearColor]; - _contentView.listContainerView.listCellBackgroundColor = [UIColor clearColor]; - _contentView.mainTableView.backgroundColor = [UIColor clearColor]; - } - return _contentView; -} -- (UIButton *)hiddenViewBnt{ - if(!_hiddenViewBnt){ - _hiddenViewBnt = [UIButton new]; - [_hiddenViewBnt addTarget:self action:@selector(hiddenViewBntAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _hiddenViewBnt; -} -- (PIRoomSendRedPacketItemVC *)roomRedVC{ - if(!_roomRedVC){ - _roomRedVC = [[PIRoomSendRedPacketItemVC alloc]initWithDelegate:self.hostDelegate type:0]; - } - return _roomRedVC; -} -- (PIRoomSendRedPacketItemVC *)entireServerVC{ - if(!_entireServerVC){ - _entireServerVC = [[PIRoomSendRedPacketItemVC alloc]initWithDelegate:self.hostDelegate type:1]; - } - return _entireServerVC; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Presenter/XPRoomRedPacketPresenter.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Presenter/XPRoomRedPacketPresenter.h deleted file mode 100644 index 061712d..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Presenter/XPRoomRedPacketPresenter.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// YMRoomRedPacketPresenter.h -// YUMI -// -// Created by YUMI on 2022/8/31. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomRedPacketPresenter : BaseMvpPresenter - -/// 获取钱包信息 -- (void)getUserWalletInfo; - -///获取当前用户信息 -- (void)getUserModel; - -/// 发送红包 -/// @param num 红包数量 -/// @param goldNum 钻石数量 -/// @param roomUid 房间uid -/// @param type 类型 1：房间， 2：全服 -/// @param pwd 密码 -/// @param message 消息 -/// @param kind 红包种类 0 旧版本 1 无门槛红包 2 关注红包 3 分享红包 4 弹幕红包 -- (void)sendRedPacketWithNum:(NSString *)num goldNum:(NSString *)goldNum roomUid:(NSString *)roomUid type:(NSString *)type password:(NSString *)pwd message:(NSString *)message kind:(NSString *)kind validityType:(NSString *)validityType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Presenter/XPRoomRedPacketPresenter.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Presenter/XPRoomRedPacketPresenter.m deleted file mode 100644 index 60e9f91..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Presenter/XPRoomRedPacketPresenter.m +++ /dev/null @@ -1,48 +0,0 @@ -// -// YMRoomRedPacketPresenter.m -// YUMI -// -// Created by YUMI on 2022/8/31. -// - -#import "XPRoomRedPacketPresenter.h" -#import "XPRoomRedPacketProtocol.h" -#import "Api+RedPacket.h" -#import "AccountInfoStorage.h" -#import "WalletInfoModel.h" -#import "UserInfoModel.h" -#import "DESEncrypt.h" -#import "YUMIConstant.h" - -@implementation XPRoomRedPacketPresenter - -/// 获取钱包信息 -- (void)getUserWalletInfo { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - if (!uid.length) { - return; - } - [Api getUserWalletInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data]; - [[self getView] getUserWalletInfo:model]; - }] uid:uid ticket:ticket]; -} - -///获取当前用户信息 -- (void)getUserModel { - NSString * uid = [[AccountInfoStorage instance] getUid]; - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - UserInfoModel *userInfo = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetUserInfoSuccess:userInfo]; - } showLoading:NO] uid:uid]; -} - -- (void)sendRedPacketWithNum:(NSString *)num goldNum:(NSString *)goldNum roomUid:(NSString *)roomUid type:(NSString *)type password:(NSString *)pwd message:(NSString *)message kind:(NSString *)kind validityType:(NSString *)validityType{ - NSString *password = [DESEncrypt encryptUseDES:pwd key:KeyWithType(KeyType_PasswordEncode)]; - [Api sendRedPacket:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] sendRedPacketSuccess]; - }showLoading:YES errorToast:YES] num:num goldNum:goldNum roomUId:roomUid type:type password:password message:message kind:kind validityType:validityType]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Protocol/XPRoomRedPacketProtocol.h b/YuMi/Modules/YMRoom/View/SendRedPacket/Protocol/XPRoomRedPacketProtocol.h deleted file mode 100644 index 47b3499..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Protocol/XPRoomRedPacketProtocol.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// YMRoomRedPacketProtocol.h -// YUMI -// -// Created by YUMI on 2022/8/31. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class WalletInfoModel, UserInfoModel; - -@protocol XPRoomRedPacketProtocol - -///获取用户钱包信息成功 -- (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo; -///获取用户信息成功 -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo; - -- (void)sendRedPacketSuccess; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.h b/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.h deleted file mode 100644 index 09005c7..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// YMReceiveRedPacketView.h -// YUMI -// -// Created by YUMI on 2022/9/2. -// - -#import -#import "XPRedPacketModel.h" - -@protocol XPReceiveRedPacketViewDelegate - --(void)closeViewAction; - -@end - -NS_ASSUME_NONNULL_BEGIN - -@class XPReceiveRedPacketModel, XPRedPacketModel; -@interface XPReceiveRedPacketView : UIView - -///是否在全服红包的房间内 -@property (nonatomic, assign) BOOL inAllPacketRoom; -@property(nonatomic,weak) iddelegate; - -@property (nonatomic, strong) XPRedPacketModel *receiveModel; - -@property (nonatomic, strong) UIView *alphaView; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m deleted file mode 100644 index 1b57621..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m +++ /dev/null @@ -1,603 +0,0 @@ -// -// YMReceiveRedPacketView.m -// YUMI -// -// Created by YUMI on 2022/9/2. -// - -#import "XPReceiveRedPacketView.h" -#import "XPReceiveRedPacketModel.h" -#import "NSObject+MJExtension.h" -#import "DJDKMIMOMColor.h" -#import -#import "NetImageView.h" -#import "TTPopUp.h" -#import "Api+RedPacket.h" -#import "XNDJTDDLoadingTool.h" -#import "XPRedPacketResultModel.h" -#import "XPOpenRedPacketCell.h" -#import "XCCurrentVCStackManager.h" -#import "XPRoomViewController.h" -#import "RoomHostDelegate.h" -#import "XPRoomMiniManager.h" -#import "RoomInfoModel.h" -#import "XPRedPacketModel.h" -#import "YUMIConstant.h" -#import "NSArray+Safe.h" -#import "CountDownHelper.h" -#import "PIReceiveRedPacketSuccessView.h" - -@interface XPReceiveRedPacketView() - -@property (nonatomic, strong) XPRedPacketResultModel *resultData; - -///背景 -@property (nonatomic, strong) UIImageView *bgImageView; -///发送者头像 -@property (nonatomic, strong) NetImageView *sendAvatar; -///发送者昵称 -@property (nonatomic, strong) UILabel *sendNickLabel; -///收到的祝福语 -@property (nonatomic, strong) UILabel *sendWishLabel; -///收到的祝福语背景 -@property(nonatomic,strong) UIView *sendWishView; -///抢红包按钮 -@property (nonatomic, strong) UIButton *openButton; -///抢红包icon -@property(nonatomic,strong) UIImageView *robIcon; -///抢红包类型 -@property(nonatomic,strong) UILabel *robView; -///倒计时 -@property(nonatomic,strong) UILabel *countDownView; -///倒计时 -@property(nonatomic,strong) UILabel *countDownTitleView; -///关闭 -@property (nonatomic, strong) UIButton *closeBtn; -///倒计时 -@property (nonatomic,strong) CountDownHelper *countDownHelper; -@property(nonatomic,assign) BOOL isCountDownEnd; -@end - -@implementation XPReceiveRedPacketView --(void)dealloc{ - -} -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.isCountDownEnd = YES; - [self addSubview:self.alphaView]; - [self addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.closeBtn]; - [self.bgImageView addSubview:self.sendAvatar]; - [self.bgImageView addSubview:self.sendNickLabel]; - [self.bgImageView addSubview:self.sendWishView]; - [self.sendWishView addSubview:self.sendWishLabel]; - [self.bgImageView addSubview:self.openButton]; - [self.openButton addSubview:self.robIcon]; - [self.bgImageView addSubview:self.robView]; - [self.bgImageView addSubview:self.countDownView]; - [self.bgImageView addSubview:self.countDownTitleView]; - [self.bgImageView addSubview:self.robView]; - -} - -- (void)initSubViewConstraints { - [self.alphaView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(0); - }]; - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(327)); - make.height.mas_equalTo(kGetScaleWidth(466)); - make.centerX.centerY.mas_equalTo(self); - }]; - [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(39)); - make.height.width.mas_equalTo(kGetScaleWidth(28)); - make.trailing.mas_equalTo(-kGetScaleWidth(8)); - }]; - - [self.sendAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.bgImageView); - make.top.mas_equalTo(self.bgImageView).mas_offset(kGetScaleWidth(94)); - make.width.height.mas_equalTo(kGetScaleWidth(65)); - }]; - [self.sendNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.bgImageView); - make.top.mas_equalTo(self.sendAvatar.mas_bottom).mas_offset(kGetScaleWidth(4)); - make.height.mas_equalTo(kGetScaleWidth(22)); - make.width.mas_equalTo(kGetScaleWidth(200)); - }]; - [self.sendWishView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_lessThanOrEqualTo(kGetScaleWidth(235)); - make.top.equalTo(self.sendNickLabel.mas_bottom).mas_offset(kGetScaleWidth(10)); - make.height.mas_equalTo(kGetScaleWidth(35)); - make.centerX.mas_equalTo(self.bgImageView); - }]; - - [self.sendWishLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.sendWishView); - make.leading.trailing.equalTo(self.sendWishView).inset(kGetScaleWidth(10)); - }]; - [self.openButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.bgImageView); - make.top.equalTo(self.sendWishView.mas_bottom).mas_offset(kGetScaleWidth(14)); - make.width.mas_equalTo(kGetScaleWidth(143)); - make.height.mas_equalTo(kGetScaleWidth(124)); - }]; - [self.robIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(kGetScaleWidth(34)); - make.width.mas_equalTo(kGetScaleWidth(38)); - make.center.mas_equalTo(self.openButton); - - }]; - [self.robView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.sendWishView.mas_bottom).mas_offset(kGetScaleWidth(56)); - make.centerX.mas_equalTo(self.bgImageView); - make.height.mas_equalTo(kGetScaleWidth(40)); - }]; - - [self.countDownView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.sendWishView.mas_bottom).mas_offset(kGetScaleWidth(51)); - make.centerX.mas_equalTo(self.bgImageView); - make.height.mas_equalTo(kGetScaleWidth(28)); - - }]; - [self.countDownTitleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.sendWishView.mas_bottom).mas_offset(kGetScaleWidth(79)); - make.centerX.mas_equalTo(self.bgImageView); - make.height.mas_equalTo(kGetScaleWidth(17)); - - }]; -} - - - - -- (void)setReceiveModel:(XPRedPacketModel *)receiveModel { - _receiveModel = receiveModel; - - if(_receiveModel.result != nil){ - self.resultData = [XPRedPacketResultModel modelWithDictionary:_receiveModel.result] ; - if(self.resultData.redEnvelopeState == RedPacketState_Remain_Zero || self.resultData.redEnvelopeState == RedPacketState_Success){ - [self showRedPacketResultViewWithResultData:self.resultData]; - return; - } - } - - - self.sendAvatar.imageUrl = _receiveModel.sendUserAvatar.length > 0 ? receiveModel.sendUserAvatar : receiveModel.userVO.avatar; - NSString *nick = _receiveModel.sendUserNick.length > 0 ? _receiveModel.sendUserNick : receiveModel.userVO.nick; - if (nick.length > 6) { - nick = [NSString stringWithFormat:@"%@...", [nick substringToIndex:6]]; - } - self.sendNickLabel.text = [NSString stringWithFormat:@"%@%@",nick,YMLocalizedString(@"XPReceiveRedPacketView8")] ; - self.robView.hidden = YES; - self.robIcon.hidden = YES; - self.countDownView.hidden = YES; - self.countDownTitleView.hidden = YES; - - if(_receiveModel.kind == RedPacketConditionsType_NO){ - self.sendWishLabel.text = _receiveModel.redEnvelopeMessage.length > 0 ? _receiveModel.redEnvelopeMessage :YMLocalizedString(@"XPReceiveRedPacketView9"); - if(_receiveModel.validityType == 1){ - NSInteger time = [self getTimeDifferenceWithTimestamp:_receiveModel.timestamp / 1000 beginTime:_receiveModel.beginTime / 1000]; - if(time > 0){ - self.countDownView.hidden = NO; - self.countDownTitleView.hidden = NO; - self.isCountDownEnd = NO; - [self.countDownHelper openCountdownWithTime:(int)time]; - - }else{ - self.robIcon.hidden = NO; - } - }else{ - self.robIcon.hidden = NO; - } - }else if(_receiveModel.kind == RedPacketConditionsType_Followd){ - - if(_receiveModel.finish == 1){ - self.sendWishLabel.text = YMLocalizedString(@"XPReceiveRedPacketView17"); - }else{ - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPReceiveRedPacketView10") attributes:@{NSFontAttributeName:kFontRegular(11),NSForegroundColorAttributeName:[UIColor whiteColor]}]; - [textAtt addAttributes:@{NSFontAttributeName:kFontRegular(11),NSForegroundColorAttributeName:UIColorFromRGB(0xFFF87A)} range:NSMakeRange(0, 4)]; - self.sendWishLabel.attributedText = textAtt; - } - NSInteger time = [self getTimeDifferenceWithTimestamp:_receiveModel.timestamp / 1000 beginTime:_receiveModel.beginTime / 1000]; - if(time > 0){ - self.isCountDownEnd = NO; - [self.countDownHelper openCountdownWithTime:(int)time]; - if(_receiveModel.finish == 1){ - self.countDownView.hidden = NO; - self.countDownTitleView.hidden = NO; - }else{ - - self.robView.hidden = NO; - self.robView.text = YMLocalizedString(@"XPReceiveRedPacketView13"); - } - }else{ - - if(_receiveModel.finish == 1){ - self.robIcon.hidden = NO; - }else{ - self.robView.hidden = NO; - self.robView.text = YMLocalizedString(@"XPReceiveRedPacketView16"); - } - - } - - }else if(_receiveModel.kind == RedPacketConditionsType_Share){ - if(_receiveModel.finish == 1){ - self.sendWishLabel.text = YMLocalizedString(@"XPReceiveRedPacketView17"); - - }else{ - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:YMLocalizedString(@"XPReceiveRedPacketView11") attributes:@{NSFontAttributeName:kFontRegular(11),NSForegroundColorAttributeName:[UIColor whiteColor]}]; - [textAtt addAttributes:@{NSFontAttributeName:kFontRegular(11),NSForegroundColorAttributeName:UIColorFromRGB(0xFFF87A)} range:NSMakeRange(0, 6)]; - self.sendWishLabel.attributedText = textAtt; - } - - NSInteger time = [self getTimeDifferenceWithTimestamp:_receiveModel.timestamp / 1000 beginTime:_receiveModel.beginTime / 1000]; - if(time > 0){ - self.isCountDownEnd = NO; - [self.countDownHelper openCountdownWithTime:(int)time]; - if(_receiveModel.finish == 1){ - self.countDownView.hidden = NO; - self.countDownTitleView.hidden = NO; - - - }else{ - - self.robView.hidden = NO; - self.robView.text = YMLocalizedString(@"XPReceiveRedPacketView14"); - } - }else{ - - if(_receiveModel.finish == 1){ - self.robIcon.hidden = NO; - }else{ - self.robView.hidden = NO; - self.robView.text = YMLocalizedString(@"XPReceiveRedPacketView16"); - } - - } - }else if(_receiveModel.kind == RedPacketConditionsType_Scrolling){ - if(_receiveModel.finish == 1){ - self.sendWishLabel.text = YMLocalizedString(@"XPReceiveRedPacketView17"); - - }else{ - NSString *text = [NSString stringWithFormat:YMLocalizedString(@"XPReceiveRedPacketView12"),_receiveModel.message ?: @""]; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:text attributes:@{NSFontAttributeName:kFontRegular(11),NSForegroundColorAttributeName:[UIColor whiteColor]}]; - [textAtt addAttributes:@{NSFontAttributeName:kFontRegular(11),NSForegroundColorAttributeName:UIColorFromRGB(0xFFF87A)} range:[text rangeOfString:_receiveModel.message ?:@""]]; - self.sendWishLabel.attributedText = textAtt; - } - - NSInteger time = [self getTimeDifferenceWithTimestamp:_receiveModel.timestamp / 1000 beginTime:_receiveModel.beginTime / 1000]; - if(time > 0){ - [self.countDownHelper openCountdownWithTime:(int)time]; - self.isCountDownEnd = NO; - if(_receiveModel.finish == 1){ - self.countDownView.hidden = NO; - self.countDownTitleView.hidden = NO; - }else{ - - self.robView.hidden = NO; - self.robView.text = YMLocalizedString(@"XPReceiveRedPacketView15"); - } - }else{ - - if(_receiveModel.finish == 1){ - self.robIcon.hidden = NO; - }else{ - self.robView.hidden = NO; - self.robView.text = YMLocalizedString(@"XPReceiveRedPacketView16"); - } - - } - } - -} --(NSInteger)getTimeDifferenceWithTimestamp:(long)timestamp beginTime:(long)beginTime { - NSString *time1 = [NSDate timestampSwitchTime:(NSInteger)timestamp formatter:@"YYYY-MM-dd hh:mm:ss"]; - NSString *time2 = [NSDate timestampSwitchTime:(NSInteger)beginTime formatter:@"YYYY-MM-dd hh:mm:ss"]; - NSInteger second = [NSDate pleaseInsertStarTimeo:time1 andInsertEndTime:time2]; - return second; -} -#pragma mark - action -- (void)onOpenButtonClick:(UIButton *)sender { - - if(self.receiveModel.kind == RedPacketConditionsType_NO){ - if(self.receiveModel.validityType == 1 && self.isCountDownEnd == NO){ - return; - } - }else if(self.receiveModel.kind == RedPacketConditionsType_Followd){ - if(self.isCountDownEnd == NO && self.receiveModel.finish == 0){ - [self onCloseButtonClick]; - [[NSNotificationCenter defaultCenter]postNotificationName:@"kOpenRedPacketNotification" object:nil userInfo:@{@"type":@(RedPacketConditionsType_Followd),@"uid":self.receiveModel.userId ?: @"",@"roomUid":self.receiveModel.roomUId ?: @""}]; - - return; - }else if(self.isCountDownEnd == YES && self.receiveModel.finish == 0){ - [self onCloseButtonClick]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPReceiveRedPacketView18")]; - - return; - }else if(self.isCountDownEnd == NO && self.receiveModel.finish == 1){ - return; - } - - }else if(self.receiveModel.kind == RedPacketConditionsType_Share){ - if(self.isCountDownEnd == NO && self.receiveModel.finish == 0){ - [self onCloseButtonClick]; - - [[NSNotificationCenter defaultCenter]postNotificationName:@"kOpenRedPacketNotification" object:nil userInfo:@{@"type":@(RedPacketConditionsType_Share),@"uid":self.receiveModel.userId ?: @"",@"roomUid":self.receiveModel.roomUId ?: @""}]; - return; - }else if(self.isCountDownEnd == YES && self.receiveModel.finish == 0){ - [self onCloseButtonClick]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPReceiveRedPacketView18")]; - - - return; - }else if(self.isCountDownEnd == NO && self.receiveModel.finish == 1){ - return; - } - }else if(self.receiveModel.kind == RedPacketConditionsType_Scrolling){ - if(self.isCountDownEnd == NO && self.receiveModel.finish == 0){ - [self onCloseButtonClick]; - [[NSNotificationCenter defaultCenter]postNotificationName:@"kOpenRedPacketNotification" object:nil userInfo:@{@"type":@(RedPacketConditionsType_Scrolling),@"uid":self.receiveModel.userId ?: @"",@"roomUid":self.receiveModel.roomUId ?: @"",@"scrolling":self.receiveModel.message ?: @""}]; - return; - }else if(self.isCountDownEnd == YES && self.receiveModel.finish == 0){ - - [self onCloseButtonClick]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPReceiveRedPacketView18")]; - - return; - }else if(self.isCountDownEnd == NO && self.receiveModel.finish == 1){ - return; - } - } - - if (self.receiveModel.userVO != nil) { - [self openRoomRedPacket:sender redEnvelopeId:self.receiveModel.redEnvelopeId]; - } else { - //判断是否为房内红包 - if ([self.receiveModel.redEnvelopePosition isEqualToString:@"IN_ROOM"]) { - //1、房内红包 - [self openRoomRedPacket:sender redEnvelopeId:self.receiveModel.redEnvelopeId]; - } else { - //2、全服红包 - - if (self.inAllPacketRoom) {//在全服红包的房间内，直接打开 - [self openRoomRedPacket:sender redEnvelopeId:self.receiveModel.redEnvelopeId]; - } else {//不在房内，进入发红包的房间 - if ([XPRoomMiniManager shareManager].getRoomInfo) { - RoomInfoModel *roomInfo = [XPRoomMiniManager shareManager].getRoomInfo; - if (roomInfo.uid == self.receiveModel.roomUid.integerValue) { - [XPRoomViewController openMiniRoom:[NSString stringWithFormat:@"%ld", roomInfo.uid] viewController:[[XCCurrentVCStackManager shareManager] getCurrentVC] redEnvelopeId:self.receiveModel.redEnvelopeId]; - } else { - [XPRoomViewController openRoom:self.receiveModel.roomUid viewController:[[XCCurrentVCStackManager shareManager] getCurrentVC]redEnvelopeId:self.receiveModel.redEnvelopeId]; - } - } else { - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController popToRootViewControllerAnimated:NO]; - XPRoomViewController * rooomVC = obj; - [rooomVC exitRoom]; - *stop = YES; - } - }]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:self.receiveModel.roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC redEnvelopeId:self.receiveModel.redEnvelopeId]; - }); - } - [self onCloseButtonClick]; - } - } - } -} - -- (void)openRoomRedPacket:(UIButton *)sender redEnvelopeId:(NSString *)redEnvelopeId { - //1.1 开红包动画 - CABasicAnimation *transformAnima = [CABasicAnimation animationWithKeyPath:@"transform.rotation.y"]; - transformAnima.toValue = [NSNumber numberWithFloat:M_PI]; - transformAnima.duration = 0.3; - transformAnima.cumulative = NO; - transformAnima.autoreverses = YES; - transformAnima.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear]; - sender.layer.zPosition = 5; - sender.layer.zPosition = sender.layer.frame.size.width / 2.f; - transformAnima.repeatCount = 1000; - [sender.layer addAnimation:transformAnima forKey:@"rotationAnimationY"]; - sender.enabled = NO; - //1.2 网络请求 - [Api openRedPacket:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - sender.enabled = YES; - if (code != 200) { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - [sender.layer removeAllAnimations]; - return;; - } - XPRedPacketResultModel *model = [XPRedPacketResultModel modelWithJSON:data.data]; - self.resultData = model; - [self showRedPacketResultViewWithResultData:model]; - // 如果打开红包成功 则记录当前红包状态 - NSArray *history = [[NSUserDefaults standardUserDefaults] objectForKey:kRedPacketHistory]; - NSMutableArray *tempArray = [NSMutableArray arrayWithArray:history]; - if (![tempArray containsObject:self.resultData.redEnvelopeVO.redEnvelopeId]) { - [tempArray addObject:self.resultData.redEnvelopeVO.redEnvelopeId]; - [[NSUserDefaults standardUserDefaults] setObject:tempArray forKey:kRedPacketHistory]; - [[NSUserDefaults standardUserDefaults] synchronize]; - } - - } redEnvelopeId:redEnvelopeId]; -} - -///显示红包结果 -- (void)showRedPacketResultViewWithResultData:(XPRedPacketResultModel *)resultData { - self.bgImageView.hidden = YES; - [[NSNotificationCenter defaultCenter]postNotificationName:@"kOpenRedPacketResult" object:resultData]; - PIReceiveRedPacketSuccessView *successView = [[PIReceiveRedPacketSuccessView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - successView.resultModel = resultData; - successView.delegate = self; - [self addSubview:successView]; - -} -#pragma mark - PIReceiveRedPacketSuccessViewDelegate -- (void)closeedPacketSuccessView{ - [self onCloseButtonClick]; -} - -#pragma mark- CountDownHelperDelegate -///倒计时结束 -- (void)onCountdownFinish{ - self.isCountDownEnd = YES; - self.countDownView.hidden = YES; - self.countDownTitleView.hidden = YES; - if(self.receiveModel.kind == RedPacketConditionsType_NO){ - self.robIcon.hidden = NO; - }else { - if(_receiveModel.finish == 1){ - self.robIcon.hidden = NO; - }else{ - self.robView.hidden = NO; - self.robView.text = YMLocalizedString(@"XPReceiveRedPacketView16"); - } - } -} -///倒计时进行 -- (void)onCountdownOpen:(int)time{ - NSInteger seconds = time; - int minutes = (seconds)%3600/60; - int second = (seconds)%60; - self.countDownView.text = [NSString stringWithFormat:@"%02d:%02d",minutes,second]; -} - -#pragma mark - action -- (void)onCloseButtonClick{ - [self removeFromSuperview]; - if(self.delegate && [self.delegate respondsToSelector:@selector(closeViewAction)]){ - [self.delegate closeViewAction]; - } -} - -#pragma mark - getter -- (UIView *)alphaView { - if (!_alphaView) { - _alphaView = [[UIView alloc] init]; - _alphaView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4]; - } - return _alphaView; -} - -- (UIImageView *)bgImageView { - if (!_bgImageView) { - _bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pi_red_packet_receive_bg"]]; - _bgImageView.userInteractionEnabled = YES; - } - return _bgImageView; -} - -- (NetImageView *)sendAvatar { - if (!_sendAvatar) { - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _sendAvatar = [[NetImageView alloc] initWithConfig:config]; - _sendAvatar.layer.masksToBounds = YES; - _sendAvatar.layer.cornerRadius = kGetScaleWidth(65)/2; - } - return _sendAvatar; -} - -- (UIView *)sendNickLabel { - if (!_sendNickLabel) { - UILabel *label = [[UILabel alloc] init]; - label.font = kFontMedium(16); - label.textColor = [UIColor whiteColor]; - label.textAlignment = NSTextAlignmentCenter; - _sendNickLabel = label; - } - return _sendNickLabel; -} --(UIView *)sendWishView{ - if(!_sendWishView){ - _sendWishView = [UIView new]; - _sendWishView.backgroundColor = UIColorRGBAlpha(0xF52727, 0.4); - _sendWishView.layer.cornerRadius = kGetScaleWidth(8); - _sendWishView.layer.masksToBounds = YES; - _sendWishView.layer.borderWidth = 1; - _sendWishView.layer.borderColor = [UIColor colorWithWhite:1 alpha:0.7].CGColor; - } - return _sendWishView; -} -- (UILabel *)sendWishLabel { - if (!_sendWishLabel) { - UILabel *label = [[UILabel alloc] init]; - label.textAlignment = NSTextAlignmentCenter; - _sendWishLabel = label; - _sendWishLabel.textColor = [UIColor whiteColor]; - _sendWishLabel.font = kFontRegular(11); - _sendWishLabel.adjustsFontSizeToFitWidth = YES; - } - return _sendWishLabel; -} - -- (UIButton *)openButton { - if (!_openButton) { - _openButton = [[UIButton alloc] init]; - [_openButton setImage:[UIImage imageNamed:@"pi_red_packet_receive_open"] forState:UIControlStateNormal]; - [_openButton addTarget:self action:@selector(onOpenButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _openButton; -} - -- (UIButton *)closeBtn { - if (!_closeBtn) { - _closeBtn = [[UIButton alloc] init]; - [_closeBtn setImage:[UIImage imageNamed:@"pi_red_packet_receive_colse"] forState:UIControlStateNormal]; - [_closeBtn addTarget:self action:@selector(onCloseButtonClick) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeBtn; -} -- (UIImageView *)robIcon{ - if(!_robIcon){ - _robIcon = [UIImageView new]; - _robIcon.image = kImage(@"pi_red_packet_receive_rob"); - } - return _robIcon; -} --(UILabel *)robView{ - if(!_robView){ - _robView = [UILabel labelInitWithText:YMLocalizedString(@"XPReceiveRedPacketView7") font:kFontMedium(14) textColor:UIColorFromRGB(0xBF461F)]; - _robView.textAlignment = NSTextAlignmentCenter; - _robView.numberOfLines = 2; - - } - return _robView; -} - -- (CountDownHelper *)countDownHelper{ - if (!_countDownHelper){ - _countDownHelper = [[CountDownHelper alloc]init]; - _countDownHelper.delegate = self; - } - return _countDownHelper; -} -- (UILabel *)countDownTitleView{ - if(!_countDownTitleView){ - _countDownTitleView = [UILabel labelInitWithText:YMLocalizedString(@"XPReceiveRedPacketView6") font:kFontMedium(12) textColor:UIColorFromRGB(0xBF461F)]; - _countDownTitleView.textAlignment = NSTextAlignmentCenter; - } - return _countDownTitleView; -} -- (UILabel *)countDownView{ - if(!_countDownView){ - _countDownView = [UILabel labelInitWithText:@"00:00" font:kFontRegular(20) textColor:UIColorFromRGB(0xBF461F)]; - _countDownView.textAlignment = NSTextAlignmentCenter; - } - return _countDownView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.h b/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.h deleted file mode 100644 index eb04cc6..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMRoomRedPacketPwdView.h -// YUMI -// -// Created by YUMI on 2022/8/31. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPRoomRedPacketPwdViewDelegate - -///完成输入密码 -- (void)xPRoomRedPacketPwdViewPwdComplete:(NSString *)pwd; - -//忘记密码 -- (void)xPRoomRedPacketPwdViewPwdForgetBtnClick; - -@end - -@interface XPRoomRedPacketPwdView : UIView - -@property (nonatomic, copy) NSString *diamonCount; - -@property (nonatomic, weak) id delegate; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.m deleted file mode 100644 index 373d297..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.m +++ /dev/null @@ -1,186 +0,0 @@ -// -// YMRoomRedPacketPwdView.m -// YUMI -// -// Created by YUMI on 2022/8/31. -// - -#import "XPRoomRedPacketPwdView.h" -#import "LoginVerifCodeView.h" -#import "DJDKMIMOMColor.h" -#import -#import -#import "TTPopUp.h" - -@interface XPRoomRedPacketPwdView() - -@property (nonatomic, strong) UIView *diamondContentView; -@property (nonatomic, strong) UIButton *closeBtn; -@property (nonatomic, strong) UILabel *titleLabel; -@property (nonatomic, strong) UIImageView *diamondImage; -@property (nonatomic, strong) UILabel *diamondLabel; -@property (nonatomic, strong) LoginVerifCodeView *codeView; -@property (nonatomic, strong) UIButton *forgetBtn; - -@end - -@implementation XPRoomRedPacketPwdView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - [self initEvents]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; - self.layer.cornerRadius = 8; - self.layer.masksToBounds = YES; - [self addSubview:self.closeBtn]; - [self addSubview:self.titleLabel]; - [self addSubview:self.diamondContentView]; - [self.diamondContentView addSubview:self.diamondImage]; - [self.diamondContentView addSubview:self.diamondLabel]; - [self addSubview:self.codeView]; - [self addSubview:self.forgetBtn]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(360); - make.height.mas_equalTo(200); - }]; - [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(16); - make.top.mas_equalTo(16); - make.height.width.mas_equalTo(30); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(20); - make.height.mas_equalTo(16); - }]; - [self.diamondContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(16); - make.height.mas_equalTo(30); - }]; - [self.diamondImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(0); - make.centerY.mas_equalTo(self.diamondContentView); - make.width.height.mas_equalTo(24); - }]; - [self.diamondLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.diamondImage.mas_trailing).mas_offset(7.5); - make.centerY.mas_equalTo(self.diamondContentView); - make.trailing.mas_equalTo(0); - }]; - [self.codeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.diamondContentView.mas_bottom).mas_offset(16); - }]; - [self.forgetBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-12); - make.top.mas_equalTo(self.codeView.mas_bottom).mas_offset(8); - }]; - -} - -- (void)initEvents { - @weakify(self); - self.codeView.textFieldChangeBlock = ^(NSString * _Nonnull code) { - @strongify(self); - if (code.length == 6) { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomRedPacketPwdViewPwdComplete:)]) { - [self.delegate xPRoomRedPacketPwdViewPwdComplete:code]; - } - } - }; -} - -- (void)onCloseButtonClick:(UIButton *)sender { - [TTPopup dismiss]; -} - -- (void)onFogetButtonClick:(UIButton *)sender { - [TTPopup dismiss]; - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomRedPacketPwdViewPwdForgetBtnClick)]) { - [self.delegate xPRoomRedPacketPwdViewPwdForgetBtnClick]; - } -} - -- (void)setDiamonCount:(NSString *)diamonCount { - self.diamondLabel.text = diamonCount; -} - -- (UIView *)diamondContentView { - if (!_diamondContentView) { - _diamondContentView = [[UIView alloc] init]; - } - return _diamondContentView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomRedPacketPwdView0"); - label.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel = label; - } - return _titleLabel; -} - -- (UIImageView *)diamondImage { - if (!_diamondImage) { - _diamondImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"moli_money_icon"]]; - } - return _diamondImage; -} - -- (UILabel *)diamondLabel { - if (!_diamondLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = @""; - label.font = [UIFont systemFontOfSize:28 weight:UIFontWeightMedium]; - label.textColor = [DJDKMIMOMColor mainTextColor]; - _diamondLabel = label; - } - return _diamondLabel; -} - -- (UIButton *)closeBtn { - if (!_closeBtn) { - _closeBtn = [[UIButton alloc] init]; - [_closeBtn setImage:[UIImage imageNamed:@"send_redPacket_cancel"] forState:UIControlStateNormal]; - [_closeBtn addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeBtn; -} - -- (LoginVerifCodeView *)codeView { - if (!_codeView) { - _codeView= [[LoginVerifCodeView alloc] init]; - _codeView.number = 6; - _codeView.shouldBeSecurity = YES; - } - return _codeView; -} - -- (UIButton *)forgetBtn { - if (!_forgetBtn) { - _forgetBtn = [[UIButton alloc] init]; - [_forgetBtn addTarget:self action:@selector(onFogetButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - [_forgetBtn setTitle:YMLocalizedString(@"XPRoomRedPacketPwdView1") forState:UIControlStateNormal]; - [_forgetBtn setTitleColor:UIColorFromRGB(0xEA3B36) forState:UIControlStateNormal]; - _forgetBtn.titleLabel.font = [UIFont systemFontOfSize:13]; - } - return _forgetBtn; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.h b/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.h deleted file mode 100644 index 644f876..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMRoomSendRedPacketViewController.h -// YUMI -// -// Created by YUMI on 2022/8/31. -// - -#import "MvpViewController.h" -#import "RoomHostDelegate.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomSendRedPacketViewController : MvpViewController - -- (instancetype)initWithDelegate:(id)delegate; - -@property (nonatomic, copy) NSString *roomUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.m b/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.m deleted file mode 100644 index 6f11d68..0000000 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.m +++ /dev/null @@ -1,741 +0,0 @@ -// -// YMRoomSendRedPacketViewController.m -// YUMI -// -// Created by YUMI on 2022/8/31. -// - -#import "XPRoomSendRedPacketViewController.h" -///tool - -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "XNDJTDDLoadingTool.h" -#import "TTPopUp.h" -#import "YUMIHtmlUrl.h" -///Third -#import -#import "UIImage+Utils.h" -///view -#import "XPRoomRedPacketPwdView.h" -#import "XPMinePayPwdViewController.h" -#import "BaseNavigationController.h" - -#import "XPIAPRechargeViewController.h" -#import "XPRoomHalfWebView.h" -///P -#import "XPRoomRedPacketPresenter.h" -#import "XPRoomRedPacketProtocol.h" -///model -#import "WalletInfoModel.h" -#import "RoomInfoModel.h" -#import "UserInfoModel.h" - -@interface XPRoomSendRedPacketViewController () - -///host代理 -@property (nonatomic,weak) idhostDelegate; - -///上面点击的view -@property (nonatomic,strong) UIView *topTapView; -///下面点击的view -@property (nonatomic,strong) UIView *bottomTapView; -///中间内容的容器 -@property (nonatomic,strong) UIImageView *backView; -///厅内红包 -@property (nonatomic, strong) UIButton *roomButton; -///全服红包 -@property (nonatomic, strong) UIButton *allServerButton; -///选中类型指示器 -@property (nonatomic, strong) UIView *typeView; -///红包个数容器 -@property (nonatomic, strong) UIView *packetContentView; -///红包数量标题 -@property (nonatomic, strong) UILabel *packetTitle; -///红包数量输入框 -@property (nonatomic, strong) MSBaseTextField *packetTextField; -///红包数量单位 -@property (nonatomic, strong) UILabel *packetUnit; -///总钻石数容器 -@property (nonatomic, strong) UIView *diamondContentView; -///钻石数量标题 -@property (nonatomic, strong) UILabel *diamondTitle; -///钻石数量输入框 -@property (nonatomic, strong) MSBaseTextField *diamondTextField; -///钻石数量单位 -@property (nonatomic, strong) UILabel *diamondUnit; -///红包数量描述 -@property (nonatomic,strong) UILabel *countDesc; -///输入框背景 -@property (nonatomic, strong) UIView *descContentView; -///广播输入框 -@property (nonatomic,strong) SZTextView *wishTextView; -///祝福语palceHolder -@property (nonatomic, strong) UILabel *wishPlaceHolderLabel; -///红包数量描述 -@property (nonatomic,strong) UILabel *wishCountLabel; -///祝福语描述 -@property (nonatomic, strong) UILabel *wishDesc; -///发布按钮 -@property (nonatomic, strong) UIButton *releaseButton; -///钻石图标 -@property (nonatomic, strong) UIImageView *diamondImage; -///钱包中钻石数量 -@property (nonatomic,strong) UILabel *walletDiamondLabel; -///充值按钮 -@property (nonatomic, strong) UIButton *rechargeButton; -///规则按钮 -@property (nonatomic, strong) UIButton *ruleButton; -///关闭按钮 -@property (nonatomic, strong) UIButton *closeButton; - -@end - -@implementation XPRoomSendRedPacketViewController - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super init]) { - self.hostDelegate = delegate; - } - return self; -} - -- (XPRoomRedPacketPresenter *)createPresenter { - return [[XPRoomRedPacketPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor clearColor]; - self.navigationController.view.backgroundColor = [UIColor clearColor]; - [self.navigationController setNavigationBarHidden:YES]; - [self initSubViews]; - [self initSubViewConstraints]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onTextViewChange:) name:UITextViewTextDidChangeNotification object:nil]; - for (id view in self.wishTextView.subviews) { - if ([view isKindOfClass:[UITextView class]]){ - UITextView *textView = view; - textView.textAlignment = NSTextAlignmentLeft; - break; - } - } -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [self.presenter getUserWalletInfo]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor clearColor]; - [self.view addSubview:self.topTapView]; - [self.view addSubview:self.backView]; - [self.view addSubview:self.bottomTapView]; - - [self.backView addSubview:self.roomButton]; - [self.backView addSubview:self.allServerButton]; - [self.backView addSubview:self.typeView]; - - [self.backView addSubview:self.packetContentView]; - [self.packetContentView addSubview:self.packetTitle]; - [self.packetContentView addSubview:self.packetTextField]; - [self.packetContentView addSubview:self.packetUnit]; - - [self.backView addSubview:self.diamondContentView]; - [self.diamondContentView addSubview:self.diamondTitle]; - [self.diamondContentView addSubview:self.diamondTextField]; - [self.diamondContentView addSubview:self.diamondUnit]; - - [self.backView addSubview:self.countDesc]; - [self.backView addSubview:self.descContentView]; - [self.backView addSubview:self.wishTextView]; - [self.backView addSubview:self.wishPlaceHolderLabel]; - [self.backView addSubview:self.wishCountLabel]; - [self.backView addSubview:self.wishDesc]; - [self.backView addSubview:self.releaseButton]; - [self.backView addSubview:self.diamondImage]; - [self.backView addSubview:self.walletDiamondLabel]; - [self.backView addSubview:self.rechargeButton]; - [self.backView addSubview:self.ruleButton]; - [self.view addSubview:self.closeButton]; -} - -- (void)initSubViewConstraints { - [self.topTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.backView.mas_top); - }]; - - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(310); - make.height.mas_equalTo(450); - make.centerY.centerX.mas_equalTo(self.view); - }]; - - [self.bottomTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.backView.mas_bottom); - make.bottom.mas_equalTo(self.view); - }]; - - [self.roomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.backView.mas_centerX).mas_offset(-17); - make.top.mas_equalTo(self.backView).offset(65); - make.height.mas_equalTo(18); - make.width.mas_equalTo(80); - }]; - - [self.allServerButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.roomButton); - make.height.mas_equalTo(18); - make.width.mas_equalTo(80); - make.leading.mas_equalTo(self.backView.mas_centerX).mas_offset(17); - }]; - [self.typeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.roomButton); - make.top.mas_equalTo(self.roomButton.mas_bottom).mas_offset(5); - make.width.mas_equalTo(8); - make.height.mas_equalTo(2); - }]; - - [self.packetContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.roomButton.mas_bottom).mas_offset(32); - make.centerX.mas_equalTo(self.backView); - make.leading.mas_equalTo(self.backView).mas_offset(30); - make.height.mas_equalTo(30); - }]; - [self.packetTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerY.mas_equalTo(self.packetContentView); - make.leading.mas_equalTo(15); - }]; - [self.packetTitle setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; - [self.packetTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerY.mas_equalTo(self.packetContentView); - make.leading.mas_equalTo(self.packetTitle.mas_trailing).mas_offset(4); - make.trailing.mas_equalTo(self.packetUnit.mas_leading).mas_offset(-5); - }]; - [self.packetUnit mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerY.mas_equalTo(self.packetContentView); - make.trailing.mas_equalTo(self.packetContentView).mas_offset(-15); - make.width.mas_equalTo(12); - }]; - - [self.diamondContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.packetContentView.mas_bottom).mas_offset(20); - make.centerX.mas_equalTo(self.backView); - make.leading.mas_equalTo(self.packetContentView); - make.height.mas_equalTo(30); - }]; - [self.diamondTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerY.mas_equalTo(self.diamondContentView); - make.leading.mas_equalTo(15); - }]; - [self.diamondTitle setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; - [self.diamondTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerY.mas_equalTo(self.diamondContentView); - make.leading.mas_equalTo(self.diamondTitle.mas_trailing).mas_offset(4); - make.trailing.mas_equalTo(self.diamondUnit.mas_leading).mas_offset(-5); - }]; - [self.diamondUnit mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerY.mas_equalTo(self.diamondContentView); - make.trailing.mas_equalTo(self.diamondContentView).mas_offset(-12); - make.width.mas_equalTo(26); - }]; - - [self.countDesc mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backView); - make.top.mas_equalTo(self.diamondContentView.mas_bottom).mas_offset(5); - make.height.mas_equalTo(11); - }]; - [self.descContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView).inset(40); - make.top.mas_equalTo(self.countDesc.mas_bottom).mas_offset(27); - make.height.mas_equalTo(70); - }]; - [self.wishTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView).inset(60); - make.centerY.mas_equalTo(self.descContentView); - make.height.mas_equalTo(17); - }]; - [self.wishPlaceHolderLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self.descContentView); - }]; - [self.wishCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.bottom.mas_equalTo(self.descContentView).inset(5); - make.height.mas_equalTo(10); - }]; - [self.wishDesc mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.backView); - make.top.mas_equalTo(self.descContentView.mas_bottom).mas_offset(7); - make.height.mas_equalTo(10); - }]; - [self.releaseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.wishDesc.mas_bottom).mas_offset(28); - make.centerX.mas_equalTo(self.backView); - make.width.mas_equalTo(150); - make.height.mas_equalTo(34); - }]; - - [self.diamondImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.releaseButton.mas_bottom).mas_offset(16); - make.leading.mas_equalTo(self.backView).mas_offset(42);; - make.width.height.mas_equalTo(20); - }]; - - [self.walletDiamondLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.diamondImage.mas_trailing).mas_offset(5); - make.centerY.mas_equalTo(self.diamondImage); - }]; - [self.rechargeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.backView).mas_offset(-42); - make.centerY.mas_equalTo(self.diamondImage); - }]; - [self.ruleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.backView).mas_offset(-23); - make.top.mas_equalTo(13); - make.width.height.mas_equalTo(30); - }]; - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view); - make.top.mas_equalTo(self.backView.mas_bottom).mas_offset(20); - make.width.height.mas_equalTo(35); - }]; -} - - -- (void)onReleaseButtonClick:(UIButton *)button { - //判断红包数量 - NSInteger packetCount = [self.packetTextField.text integerValue]; - if (packetCount > 100 || packetCount < 1) { - [self showErrorToast:YMLocalizedString(@"XPRoomSendRedPacketViewController17")]; - return; - } - //判断钻石数量 - NSInteger diamonCount = [self.diamondTextField.text integerValue]; - if (diamonCount > 999999 || diamonCount < 100) { - [self showErrorToast:YMLocalizedString(@"XPRoomSendRedPacketViewController18")]; - return; - } - if (diamonCount % 10 != 0) { - [self showErrorToast:YMLocalizedString(@"XPRoomSendRedPacketViewController19")]; - return; - } - [self.presenter getUserModel]; -} - -#pragma mark - XPRoomRedPacketProtocol -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -///获取用户钱包信息成功 -- (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo { - self.walletDiamondLabel.text = balanceInfo.diamonds; -} - -///获取用户信息成功 -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { - if (userInfo.isBindPaymentPwd) { - XPRoomRedPacketPwdView *pwdView = [[XPRoomRedPacketPwdView alloc] init]; - pwdView.diamonCount = self.diamondTextField.text; - pwdView.delegate = self; - [TTPopup popupView:pwdView style:TTPopupStyleAlert]; - } else { - XPMinePayPwdViewController *vc = [[XPMinePayPwdViewController alloc] init]; - vc.userInfo = userInfo; - [self.navigationController pushViewController:vc animated:YES]; - } -} - -///发送红包成功 -- (void)sendRedPacketSuccess { - [self showSuccessToast:YMLocalizedString(@"XPRoomSendRedPacketViewController3")]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - XPRoomRedPacketPwdViewDelegate -- (void)xPRoomRedPacketPwdViewPwdComplete:(NSString *)pwd { - [TTPopup dismiss]; - NSString *roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - NSNumber *type = self.roomButton.isSelected ? @(1) : @(2); - NSString *message = self.wishTextView.text.length ? self.wishTextView.text :YMLocalizedString(@"XPRoomSendRedPacketViewController4"); - [self.presenter sendRedPacketWithNum:self.packetTextField.text goldNum:self.diamondTextField.text roomUid:roomUid type:type password:pwd message:message kind:@"" validityType:@""]; -} - -- (void)xPRoomRedPacketPwdViewPwdForgetBtnClick { - XPMinePayPwdViewController *vc = [[XPMinePayPwdViewController alloc] init]; - vc.userInfo = self.hostDelegate.getUserInfo; - [self.navigationController pushViewController:vc animated:YES]; - -} - -#pragma mark - Event Response -- (void)dismissTapRecognizer:(UITapGestureRecognizer *)tap { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - private -- (void)onRoomButtonClick:(UIButton *)sender { - self.roomButton.selected = YES; - self.allServerButton.selected = NO; - [self.typeView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.roomButton); - make.top.mas_equalTo(self.roomButton.mas_bottom).mas_offset(4); - make.width.mas_equalTo(8); - make.height.mas_equalTo(2); - }]; - - NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc]initWithString:@"1-100" attributes:@{NSForegroundColorAttributeName: UIColorRGBAlpha(0xffffff, 0.3)}]; - self.packetTextField.attributedPlaceholder = attrString; - self.countDesc.text = YMLocalizedString(@"XPRoomSendRedPacketViewController5"); -} - -- (void)onAllServerButtonClick:(UIButton *)sender { - self.allServerButton.selected = YES; - self.roomButton.selected = NO; - [self.typeView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.allServerButton); - make.top.mas_equalTo(self.roomButton.mas_bottom).mas_offset(4); - make.width.mas_equalTo(8); - make.height.mas_equalTo(2); - }]; - NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc]initWithString:@"2-500" attributes:@{NSForegroundColorAttributeName: UIColorRGBAlpha(0xffffff, 0.3)}]; - self.packetTextField.attributedPlaceholder = attrString; - self.countDesc.text = YMLocalizedString(@"XPRoomSendRedPacketViewController6"); -} - -- (void)onRechargeButtonClick:(UIButton *)sender { - XPIAPRechargeViewController * rechargeVC = [[XPIAPRechargeViewController alloc] init]; - rechargeVC.type = @"4"; - [self.navigationController pushViewController:rechargeVC animated:YES]; -} - -- (void)onRuleButtonClick:(UIButton *)sender { - XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; - webView.url = URLWithType(kRedPacketRuleURL); - TTPopupService * config = [[TTPopupService alloc] init]; - config.contentView = webView; - [TTPopup popupWithConfig:config]; -} - -- (void)onCloseButtonClick:(UIButton *)sender { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - YYTextViewDelegate -- (void)textViewDidChange:(YYTextView *)textView { - NSInteger maxLength = 20; - if (textView.text.length > maxLength) { - textView.text = [textView.text substringToIndex:maxLength]; - } - self.wishCountLabel.text = [NSString stringWithFormat:@"%zd/%ld", textView.text.length, maxLength]; -} - -- (void)onTextViewChange:(NSNotification *)noti { - NSInteger maxLength = 20; - if (self.wishTextView.text.length > maxLength) { - self.wishTextView.text = [self.wishTextView.text substringToIndex:maxLength]; - } - if (self.wishTextView.text.length > 0) { - self.wishPlaceHolderLabel.hidden = YES; - [self.wishTextView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView).inset(60); - make.centerY.mas_equalTo(self.descContentView); - make.height.mas_equalTo(42); - }]; - } else { - self.wishPlaceHolderLabel.hidden = NO; - [self.wishTextView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.backView).inset(60); - make.centerY.mas_equalTo(self.descContentView); - make.height.mas_equalTo(17); - }]; - } - self.wishCountLabel.text = [NSString stringWithFormat:@"%zd/%ld", self.wishTextView.text.length, maxLength]; -} - -#pragma mark - Getters And Setters -- (UIView *)topTapView { - if (!_topTapView) { - _topTapView = [[UIView alloc] init]; - _topTapView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissTapRecognizer:)]; - [_topTapView addGestureRecognizer:tap]; - } - return _topTapView; -} -- (UIView *)bottomTapView { - if (!_bottomTapView) { - _bottomTapView = [[UIView alloc] init]; - _bottomTapView.backgroundColor = [UIColor clearColor]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissTapRecognizer:)]; - [_bottomTapView addGestureRecognizer:tap]; - } - return _bottomTapView; -} -- (UIImageView *)backView { - if (!_backView) { - _backView = [[UIImageView alloc] init]; - _backView.userInteractionEnabled = YES; - _backView.image = [UIImage imageNamed:@"send_redpacket_bg"]; - } - return _backView; -} - -- (UIButton *)roomButton { - if (!_roomButton) { - _roomButton = [[UIButton alloc] init]; - [_roomButton setTitle:YMLocalizedString(@"XPRoomSendRedPacketViewController7") forState:UIControlStateNormal]; - [_roomButton setTitleColor:UIColorRGBAlpha(0xffffff, 0.5) forState:UIControlStateNormal]; - [_roomButton setTitleColor:UIColorRGBAlpha(0xffffff, 1) forState:UIControlStateSelected]; - [_roomButton addTarget:self action:@selector(onRoomButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - _roomButton.selected = YES; - _roomButton.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - } - return _roomButton; -} - -- (UIButton *)allServerButton { - if (!_allServerButton) { - _allServerButton = [[UIButton alloc] init]; - [_allServerButton setTitle:YMLocalizedString(@"XPRoomSendRedPacketViewController8") forState:UIControlStateNormal]; - [_allServerButton setTitleColor:UIColorRGBAlpha(0xffffff, 0.5) forState:UIControlStateNormal]; - [_allServerButton setTitleColor:UIColorRGBAlpha(0xffffff, 1) forState:UIControlStateSelected]; - [_allServerButton addTarget:self action:@selector(onAllServerButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - _allServerButton.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; - } - return _allServerButton; -} - -- (UIView *)typeView { - if (!_typeView) { - _typeView = [[UIView alloc] init]; - _typeView.backgroundColor = [UIColor whiteColor]; - _typeView.layer.cornerRadius = 1; - _typeView.layer.masksToBounds = YES; - } - return _typeView; -} - -- (UIView *)packetContentView { - if (!_packetContentView) { - _packetContentView = [[UIView alloc] init]; - _packetContentView.backgroundColor = UIColorFromRGB(0xCC2247); - _packetContentView.layer.cornerRadius = 15; - _packetContentView.layer.masksToBounds = YES; - } - return _packetContentView; -} - -- (UILabel *)packetTitle { - if (!_packetTitle) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomSendRedPacketViewController9"); - label.font = [UIFont systemFontOfSize:12]; - label.textColor = UIColorRGBAlpha(0xffffff, 0.5); - _packetTitle = label; - } - return _packetTitle; -} - -- (MSBaseTextField *)packetTextField { - if (!_packetTextField) { - UITextField *label = [[MSBaseTextField alloc] init]; - label.keyboardType = UIKeyboardTypeNumberPad; - label.textAlignment = NSTextAlignmentRight; - NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc]initWithString:@"1-100" attributes:@{NSForegroundColorAttributeName: UIColorRGBAlpha(0xffffff, 0.5)}]; - label.attributedPlaceholder = attrString; - label.textColor = [UIColor whiteColor]; - label.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _packetTextField = label; - } - return _packetTextField; -} - -- (UILabel *)packetUnit { - if (!_packetUnit) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomSendRedPacketViewController10"); - label.font = [UIFont systemFontOfSize:12]; - label.textColor = UIColorRGBAlpha(0xffffff, 0.5); - _packetUnit = label; - } - return _packetUnit; -} - -- (UIView *)diamondContentView { - if (!_diamondContentView) { - _diamondContentView = [[UIView alloc] init]; - _diamondContentView.backgroundColor = UIColorFromRGB(0xCC2247); - _diamondContentView.layer.cornerRadius = 15; - _diamondContentView.layer.masksToBounds = YES; - } - return _diamondContentView; -} -- (UILabel *)diamondTitle { - if (!_diamondTitle) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomSendRedPacketViewController11"); - label.font = [UIFont systemFontOfSize:12]; - label.textColor = UIColorRGBAlpha(0xffffff, 0.5); - _diamondTitle = label; - } - return _diamondTitle; -} - -- (MSBaseTextField *)diamondTextField { - if (!_diamondTextField) { - UITextField *label = [[MSBaseTextField alloc] init]; - label.keyboardType = UIKeyboardTypeNumberPad; - label.textAlignment = NSTextAlignmentRight; - NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc]initWithString:@"0" attributes:@{NSForegroundColorAttributeName: UIColorRGBAlpha(0xffffff, 0.5)}]; - label.attributedPlaceholder = attrString; - label.textColor = [UIColor whiteColor]; - label.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - _diamondTextField = label; - } - return _diamondTextField; -} - -- (UILabel *)diamondUnit { - if (!_diamondUnit) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomSendRedPacketViewController12"); - label.font = [UIFont systemFontOfSize:12]; - label.textColor = UIColorRGBAlpha(0xffffff, 0.5); - _diamondUnit = label; - } - return _diamondUnit; -} - -- (UILabel *)countDesc { - if (!_countDesc) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomSendRedPacketViewController13"); - label.font = [UIFont systemFontOfSize:11]; - label.textColor = [UIColor whiteColor]; - _countDesc = label; - } - return _countDesc; -} - -- (UIView *)descContentView { - if (!_descContentView) { - _descContentView = [[UIView alloc] init]; - _descContentView.backgroundColor = UIColorRGBAlpha(0xCC2247, 0.6); - _descContentView.layer.cornerRadius = 8; - _descContentView.layer.masksToBounds = YES; - } - return _descContentView; -} - -- (SZTextView *)wishTextView { - if (!_wishTextView) { - _wishTextView = [[SZTextView alloc] init]; - _wishTextView.layer.cornerRadius = 8; - _wishTextView.layer.masksToBounds = YES; - _wishTextView.backgroundColor = [UIColor clearColor]; - _wishTextView.showsVerticalScrollIndicator = NO; - _wishTextView.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _wishTextView.textColor = [UIColor whiteColor]; - _wishTextView.textAlignment = NSTextAlignmentCenter; - } - return _wishTextView; -} - -- (UIButton *)releaseButton { - if (!_releaseButton) { - _releaseButton = [[UIButton alloc] init]; - [_releaseButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - [_releaseButton setBackgroundImage:[UIImage imageNamed:@"send_redPacket_button"] forState:UIControlStateNormal]; - [_releaseButton addTarget:self action:@selector(onReleaseButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _releaseButton; -} -- (UILabel *)wishDesc { - if (!_wishDesc) { - _wishDesc = [[UILabel alloc] init]; - _wishDesc.text = YMLocalizedString(@"XPRoomSendRedPacketViewController14"); - _wishDesc.font = [UIFont systemFontOfSize:10]; - _wishDesc.textColor = UIColorRGBAlpha(0xffffff, 0.5); - } - return _wishDesc; -} - - -- (UILabel *)wishCountLabel { - if (!_wishCountLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = @"0/20"; - label.font = [UIFont systemFontOfSize:10]; - label.textColor = UIColorFromRGB(0xFF8C9D); - _wishCountLabel = label; - } - return _wishCountLabel; -} - -- (UIImageView *)diamondImage { - if (!_diamondImage) { - _diamondImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"moli_money_icon"]]; - } - return _diamondImage; -} - -- (UILabel *)walletDiamondLabel { - if (!_walletDiamondLabel) { - _walletDiamondLabel = [[UILabel alloc] init]; - _walletDiamondLabel.textColor = [UIColor whiteColor]; - _walletDiamondLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; - } - return _walletDiamondLabel; -} - -- (UILabel *)wishPlaceHolderLabel { - if (!_wishPlaceHolderLabel) { - UILabel *label = [[UILabel alloc] init]; - label.text = YMLocalizedString(@"XPRoomSendRedPacketViewController4"); - label.font = [UIFont systemFontOfSize:16]; - label.textColor = UIColorRGBAlpha(0xffffff, 0.5); - _wishPlaceHolderLabel = label; - } - return _wishPlaceHolderLabel; -} - -- (UIButton *)rechargeButton { - if (!_rechargeButton) { - _rechargeButton = [[UIButton alloc] init]; - [_rechargeButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - [_rechargeButton addTarget:self action:@selector(onRechargeButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - NSMutableAttributedString *title = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPRoomSendRedPacketViewController16")]; - NSRange titleRange = {0,[title length]}; - [title addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:titleRange]; - [_rechargeButton setAttributedTitle:title forState:UIControlStateNormal]; - _rechargeButton.titleLabel.font = [UIFont systemFontOfSize:13]; - } - return _rechargeButton; -} - -- (UIButton *)ruleButton { - if (!_ruleButton) { - _ruleButton = [[UIButton alloc] init]; - [_ruleButton addTarget:self action:@selector(onRuleButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - [_ruleButton setImage:[UIImage imageNamed:@"send_redPacket_help"] forState:UIControlStateNormal]; - } - return _ruleButton; -} - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [[UIButton alloc] init]; - [_closeButton addTarget:self action:@selector(onCloseButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - [_closeButton setImage:[UIImage imageNamed:@"common_close_white"] forState:UIControlStateNormal]; - } - return _closeButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/Api/Api+RoomSetting.h b/YuMi/Modules/YMRoom/View/Setting/Api/Api+RoomSetting.h deleted file mode 100644 index 513b96d..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Api/Api+RoomSetting.h +++ /dev/null @@ -1,94 +0,0 @@ -// -// Api+RoomSetting.h -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (RoomSetting) - -/// 获取房间信息 -/// @param complection 完成 -/// @param uid 用户的uid -/// @param intoUid 自己的Uid 判断当前进房用户是否是平台超管 判断进房用户是否开启青少年 -+ (void)getRoomInfo:(HttpRequestHelperCompletion)complection uid:(NSString *)uid intoUid:(NSString *)intoUid; - -/// 开启房间排麦 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param operUid 操作者的uid -+ (void)openRoomArrangeMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid; - -/// 关闭房间排麦 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param operUid 操作者的uid -+ (void)closeRoomArrangeMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid; - -/// 开启房间离开模式 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param uid 操作者的uid -+ (void)openRoomLeaveMode:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid; - -/// 关闭房间离开模式 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param uid 操作者的uid -+ (void)closeRoomLeaveMode:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid; - -/// 获取房间所有的tag -/// @param completion 完成 -/// @param uid uid -+ (void)getRoomTagList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; - -/// 管理员更新房间信息 -/// @param completion 完成 -/// @param params 需要的参数 -+ (void)managerUpdateRoomInfo:(HttpRequestHelperCompletion)completion params:(NSDictionary *)params; - -/// 房主更新房间信息 -/// @param completion 完成 -/// @param params 需要的参数 -+ (void)ownerUpdateRoomInfo:(HttpRequestHelperCompletion)completion params:(NSDictionary *)params; - -/// 更新房间信息 公屏开关 -/// @param complection 完成 -/// @param roomId 房间的id -/// @param isCloseScreen 是否关闭公屏 -/// @param ticket ticket -/// @param uid uid -+ (void)updateRoomInfoMessageState:(HttpRequestHelperCompletion)complection roomId:(NSString *)roomId isCloseScreen:(NSString *)isCloseScreen ticket:(NSString *)ticket uid:(NSString *)uid; - -/// 获取房间所有的分类tag -/// @param completion 完成 -/// @param uid uid -+ (void)getRoomClassifyList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; -/// 获取房间在线用户 -/// @param completion 完成 -/// @param roomUid roomUid -+(void)requestRoomOnlineUserList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; -/// 关闭房间礼物值 -/// @param completion 完成 -/// @param uid 操作人的uid -/// @param roomUid 房主的uid -+ (void)closeRoomGiftValue:(HttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid; -/// 开启房间礼物值 -/// @param completion 完成 -/// @param uid 操作人的uid -/// @param roomUid 房主的uid -+ (void)openRoomGiftValue:(HttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid; - - -/// 房间等级基本信息 -/// @param completion 完成 -/// @param roomUid 房主 UID -+ (void)roomLevelInfo:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/Api/Api+RoomSetting.m b/YuMi/Modules/YMRoom/View/Setting/Api/Api+RoomSetting.m deleted file mode 100644 index dec53a8..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Api/Api+RoomSetting.m +++ /dev/null @@ -1,127 +0,0 @@ -// -// Api+RoomSetting.m -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import "Api+RoomSetting.h" -#import -@implementation Api (RoomSetting) - -/// 获取房间信息 -/// @param complection 完成 -/// @param uid 用户的uid -/// @param intoUid 自己的Uid 判断当前进房用户是否是平台超管 判断进房用户是否开启青少年 -+ (void)getRoomInfo:(HttpRequestHelperCompletion)complection uid:(NSString *)uid intoUid:(NSString *)intoUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9nZXQ="];///room/get - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, intoUid, nil]; -} - -/// 开启房间排麦 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param operUid 操作者的uid -+ (void)openRoomArrangeMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9xdWV1ZS9lbmFibGU="];///room/queue/enable - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, operUid, nil]; -} - -/// 关闭房间排麦 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param operUid 操作者的uid -+ (void)closeRoomArrangeMic:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid operUid:(NSString *)operUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9xdWV1ZS9lbmFibGU="];///room/queue/enable - [self makeRequest:fang method:HttpRequestHelperMethodDELETE completion:completion, __FUNCTION__, roomUid, operUid, nil]; -} - -/// 开启房间离开模式 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param uid 操作者的uid -+ (void)openRoomLeaveMode:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9sZWF2ZS9tb2RlL29wZW4="];///room/leave/mode/open - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, uid, nil]; -} - -/// 关闭房间离开模式 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param uid 操作者的uid -+ (void)closeRoomLeaveMode:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9sZWF2ZS9tb2RlL2Nsb3Nl"];///"room/leave/mode/close - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, uid, nil]; -} - - -/// 获取房间所有的tag -/// @param completion 完成 -/// @param uid uid -+ (void)getRoomTagList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS90YWcvdjQvYWxs"];///room/tag/v4/all - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, nil]; -} - -/// 管理员更新房间信息 -/// @param completion 完成 -/// @param params 需要的参数 -+ (void)managerUpdateRoomInfo:(HttpRequestHelperCompletion)completion params:(NSDictionary *)params { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS91cGRhdGVCeUFkbWlu"];///room/updateByAdmin - [HttpRequestHelper request:fang method:HttpRequestHelperMethodPOST params:params completion:completion]; -} - -/// 房主更新房间信息 -/// @param completion 完成 -/// @param params 需要的参数 -+ (void)ownerUpdateRoomInfo:(HttpRequestHelperCompletion)completion params:(NSDictionary *)params { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS91cGRhdGU="];///room/update - [HttpRequestHelper request:fang method:HttpRequestHelperMethodPOST params:params completion:completion]; -} - -/// 更新房间信息 公屏开关 -/// @param complection 完成 -/// @param roomId 房间的id -/// @param isCloseScreen 是否关闭公屏 -/// @param ticket ticket -/// @param uid uid -+ (void)updateRoomInfoMessageState:(HttpRequestHelperCompletion)complection roomId:(NSString *)roomId isCloseScreen:(NSString *)isCloseScreen ticket:(NSString *)ticket uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9zZXRDbG9zZVNjcmVlbg=="];///room/setCloseScreen - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, roomId, isCloseScreen, ticket, uid, nil]; -} - -/// 获取房间所有的分类tag -/// @param completion 完成 -/// @param uid uid -+ (void)getRoomClassifyList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"c2luZ2xlL2Jyb2FkY2FzdC9zb3J0"];///single/broadcast/sort - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; -} -/// 获取房间在线用户 -/// @param completion 完成 -/// @param roomUid roomUid -+(void)requestRoomOnlineUserList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid{ - [self makeRequest:@"room/v2/online" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, nil]; -} -/// 关闭房间礼物值 -/// @param completion 完成 -/// @param uid 操作人的uid -/// @param roomUid 房主的uid -+ (void)closeRoomGiftValue:(HttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9naWZ0L3ZhbHVlL2Nsb3Nl"];///room/gift/value/close - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, roomUid, nil]; -} -/// 开启房间礼物值 -/// @param completion 完成 -/// @param uid 操作人的uid -/// @param roomUid 房主的uid -+ (void)openRoomGiftValue:(HttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9naWZ0L3ZhbHVlL29wZW4="];///room/gift/value/open - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, roomUid, nil]; -} - -+ (void)roomLevelInfo:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - [self makeRequest:@"/room/level/info" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/Model/RoomClassifyModel.h b/YuMi/Modules/YMRoom/View/Setting/Model/RoomClassifyModel.h deleted file mode 100644 index ad2d9ac..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Model/RoomClassifyModel.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// RoomClassifyModel.h -// YUMI -// -// Created by YUMI on 2022/7/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomClassifyModel : PIBaseModel - -///tag的id -@property (nonatomic,copy) NSString *cid; -///名字 -@property (nonatomic, copy) NSString *sortName; -///描述 -@property (nonatomic, copy) NSString *sortDesc; - -@property (nonatomic, assign) NSInteger seq; -///是否选择 -@property (nonatomic,assign) BOOL isSelect; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/Model/RoomClassifyModel.m b/YuMi/Modules/YMRoom/View/Setting/Model/RoomClassifyModel.m deleted file mode 100644 index d2518d0..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Model/RoomClassifyModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// RoomClassifyModel.m -// YUMI -// -// Created by YUMI on 2022/7/15. -// - -#import "RoomClassifyModel.h" - -@implementation RoomClassifyModel - -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"cid":@"id"}; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/Model/RoomTagModel.h b/YuMi/Modules/YMRoom/View/Setting/Model/RoomTagModel.h deleted file mode 100644 index b022ae3..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Model/RoomTagModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// RoomTagModel.h -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface RoomTagModel : PIBaseModel -///tag的id -@property (nonatomic,copy) NSString *tid; -///名字 -@property (nonatomic, copy) NSString *name; -///是否选择 -@property (nonatomic,assign) BOOL isSelect; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/Model/RoomTagModel.m b/YuMi/Modules/YMRoom/View/Setting/Model/RoomTagModel.m deleted file mode 100644 index 24b079b..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Model/RoomTagModel.m +++ /dev/null @@ -1,14 +0,0 @@ -// -// RoomTagModel.m -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import "RoomTagModel.h" - -@implementation RoomTagModel -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"tid":@"id"}; -} -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/Model/XPRoomSettingItemModel.h b/YuMi/Modules/YMRoom/View/Setting/Model/XPRoomSettingItemModel.h deleted file mode 100644 index bfd7a98..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Model/XPRoomSettingItemModel.h +++ /dev/null @@ -1,55 +0,0 @@ -// -// YMRoomSettingItemModel.h -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, RoomSettingItemType) { - ///房间标题 - RoomSettingItemType_Title = 1, - ///房间上锁 - RoomSettingItemType_Lock, - ///房间密码 - RoomSettingItemType_Pwd, - ///房间分类 - RoomSettingItemType_Class, - ///房间标签 - RoomSettingItemType_Tag, - ///房间头像 - RoomSettingItemType_Avatar, - ///管理员 - RoomSettingItemType_Manager_List, - ///黑名单 - RoomSettingItemType_Black_List, - ///礼物特效 - RoomSettingItemType_Gift_Effect, - ///公屏显示 - RoomSettingItemType_Message_Screen, - ///排麦 - RoomSettingItemType_Arrange_Mic, - ///离开模式 - RoomSettingItemType_Leave_Model, - ///关闭礼物值 - RoomSettingItemType_Gift_Value_Model, -}; - -@interface XPRoomSettingItemModel : PIBaseModel -///标题 -@property (nonatomic,copy)NSString *title; -///副标题 -@property (nonatomic,copy) NSString *subTitle; -///开启的状态 -@property (nonatomic,assign) BOOL switchState; -///类型 -@property (nonatomic,assign) RoomSettingItemType type; - -@property (nonatomic, copy) NSString *avatar; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/Model/XPRoomSettingItemModel.m b/YuMi/Modules/YMRoom/View/Setting/Model/XPRoomSettingItemModel.m deleted file mode 100644 index 814625e..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Model/XPRoomSettingItemModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMRoomSettingItemModel.m -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import "XPRoomSettingItemModel.h" - -@implementation XPRoomSettingItemModel - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.h b/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.h deleted file mode 100644 index 6c6727b..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.h +++ /dev/null @@ -1,76 +0,0 @@ -// -// YMRoomSettingPresenter.h -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import "BaseMvpPresenter.h" -#import "RoomInfoModel.h" -#import "XPRoomSettingItemModel.h" -NS_ASSUME_NONNULL_BEGIN -@class RoomInfoModel; -@interface XPRoomSettingPresenter : BaseMvpPresenter - -- (void)getRoomSettingList:(RoomInfoModel *)roomInfo isSuperAdmin:(BOOL)isSuperAdmin; - -///获取房间信息 -- (void)getRoomInfo:(NSString *)roomUid; - -/// 开启排麦 -/// @param roomUid 房主的uid -- (void)openRoomArrangeMic:(NSString *)roomUid; - -/// 关闭排麦 -/// @param roomUid 房主的uid -- (void)closeRoomArrangeMic:(NSString *)roomUid; - -/// 关闭离开模式 -/// @param roomUid 房主的uid -- (void)closeRoomLeaveMode:(NSString *)roomUid; - -/// 开启离开模式 -/// @param roomUid 房主的uid -- (void)openRoomLeaveMode:(NSString *)roomUid; - -/// 更新公屏状态 -/// @param isCloseScreen 是否关闭公屏 -/// @param roomId 房间的id -- (void)updateRoomMessageScreenState:(BOOL)isCloseScreen roomId:(NSString *)roomId; - -/// 更新房间信息 -/// @param title 房间标题 -/// @param roomPwd 房间密码 -/// @param tagId 房间tag -/// @param classifyId 房间分类 -/// @param hasAnimationEffect 是否开启房间特效 -/// @param roomUid 房间uid -/// @param roomId 群聊的id -/// @param type 房间类型 -/// @param itemType 更新的类型 -- (void)updateRoomInfo:(NSString *)title - roomPwd:(NSString *)roomPwd - tagId:(NSString *)tagId - classifyId:(NSString *)classifyId - hasAnimationEffect:(BOOL)hasAnimationEffect - roomUid:(NSString *)roomUid - roomId:(NSString *)roomId - type:(RoomType)type - itemType:(RoomSettingItemType)itemType - mgId:(NSString *)mgId - backPic:(NSString *)backPic - avatar:(NSString *)avatar; -/// 获取房间在线用户 -/// @param roomUid roomUid --(void)getRoomOnlineUserListWithRoomUid:(NSString *)roomUid; -/// 关闭房间礼物值 -/// @param roomUid 房间的uid -- (void)closeRoomGiftValue:(NSString *)roomUid itemModel:(XPRoomSettingItemModel *)itemModel; -/// 开启房间礼物值 -/// @param roomUid 房间的uid -- (void)openRoomGiftValue:(NSString *)roomUid itemModel:(XPRoomSettingItemModel *)itemModel; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m b/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m deleted file mode 100644 index be5ee0e..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m +++ /dev/null @@ -1,363 +0,0 @@ -// -// YMRoomSettingPresenter.m -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import "XPRoomSettingPresenter.h" -#import -///Tool -#import "AccountInfoStorage.h" -#import "Api+RoomSetting.h" -#import "DESEncrypt.h" -#import "YUMIConstant.h" -#import "ClientConfig.h" -///Model -#import "RoomInfoModel.h" -///P -#import "XPRoomSettingProtocol.h" -#import "XPMessageRemoteExtModel.h" -@implementation XPRoomSettingPresenter - -- (void)getRoomSettingList:(RoomInfoModel *)roomInfo isSuperAdmin:(BOOL)isSuperAdmin { - XPRoomSettingItemModel * titleItem = [[XPRoomSettingItemModel alloc] init]; - titleItem.title = YMLocalizedString(@"XPRoomSettingPresenter0"); - titleItem.subTitle = roomInfo.title; - titleItem.type = RoomSettingItemType_Title; - - XPRoomSettingItemModel * lockItem = [[XPRoomSettingItemModel alloc] init]; - lockItem.title = YMLocalizedString(@"XPRoomSettingPresenter1"); - lockItem.switchState = roomInfo.roomPwd.length > 0; - lockItem.type = RoomSettingItemType_Lock; - - XPRoomSettingItemModel * pwdItem; - if (roomInfo.roomPwd.length > 0) { - pwdItem = [[XPRoomSettingItemModel alloc] init]; - NSString * roomPwd = [DESEncrypt decryptUseDES:roomInfo.roomPwd key:KeyWithType(KeyType_PasswordEncode)]; - pwdItem.title = roomPwd; - pwdItem.type = RoomSettingItemType_Pwd; - } - - XPRoomSettingItemModel *classItem = [[XPRoomSettingItemModel alloc] init]; - classItem.title = YMLocalizedString(@"XPRoomSettingPresenter2"); - classItem.subTitle = roomInfo.sortName; - classItem.type = RoomSettingItemType_Class; - - XPRoomSettingItemModel *avatarItem = [[XPRoomSettingItemModel alloc] init]; - avatarItem.title = YMLocalizedString(@"RoomSetting_1.0.17_0"); - avatarItem.avatar = roomInfo.avatar; - avatarItem.type = RoomSettingItemType_Avatar; - - XPRoomSettingItemModel *tagItem = [[XPRoomSettingItemModel alloc] init]; - tagItem.title = YMLocalizedString(@"XPRoomSettingPresenter3"); - tagItem.subTitle = roomInfo.roomTag; - tagItem.type = RoomSettingItemType_Tag; - - XPRoomSettingItemModel * managerItem = [[XPRoomSettingItemModel alloc] init]; - managerItem.title = YMLocalizedString(@"XPRoomSettingPresenter4"); - managerItem.type = RoomSettingItemType_Manager_List; - - XPRoomSettingItemModel * blackItem = [[XPRoomSettingItemModel alloc] init]; - blackItem.title = YMLocalizedString(@"XPRoomSettingPresenter5"); - blackItem.type = RoomSettingItemType_Black_List; - - XPRoomSettingItemModel * giftEffectItem = [[XPRoomSettingItemModel alloc] init]; - giftEffectItem.title = YMLocalizedString(@"XPRoomSettingPresenter6"); - giftEffectItem.switchState = roomInfo.hasAnimationEffect; - giftEffectItem.type = RoomSettingItemType_Gift_Effect; - - XPRoomSettingItemModel * messageScreedItem = [[XPRoomSettingItemModel alloc] init]; - messageScreedItem.title = YMLocalizedString(@"XPRoomSettingPresenter7"); - messageScreedItem.switchState = !roomInfo.isCloseScreen; - messageScreedItem.type = RoomSettingItemType_Message_Screen; - - XPRoomSettingItemModel * arrangeMicItem = [[XPRoomSettingItemModel alloc] init]; - arrangeMicItem.title = YMLocalizedString(@"XPRoomSettingPresenter8"); - arrangeMicItem.switchState = roomInfo.roomModeType == RoomModeType_Open_Micro_Mode; - arrangeMicItem.type = RoomSettingItemType_Arrange_Mic; - - XPRoomSettingItemModel * leaveItem = [[XPRoomSettingItemModel alloc] init]; - leaveItem.title = YMLocalizedString(@"XPRoomSettingPresenter9"); - leaveItem.switchState = roomInfo.leaveMode; - leaveItem.type = RoomSettingItemType_Leave_Model; - - XPRoomSettingItemModel * giftValueItem = [[XPRoomSettingItemModel alloc] init]; - giftValueItem.title = roomInfo.showGiftValue ? YMLocalizedString(@"XPMoreMenuPresenter27") : YMLocalizedString(@"XPMoreMenuPresenter3"); - giftValueItem.switchState = roomInfo.showGiftValue; - giftValueItem.type = RoomSettingItemType_Gift_Value_Model; - - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - NSString * uid = [AccountInfoStorage instance].getUid; - ///获取房间角色 - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = roomId; - request.userIds = @[uid]; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - @kStrongify(self); - NSArray * array; - if (error == nil) { - NIMChatroomMember *member = members.firstObject; - - // 是否是创建者或超级管理员 - BOOL isCreatorOrSuperAdmin = (member.type == NIMChatroomMemberTypeCreator || isSuperAdmin); - BOOL isManagerOrAbove = (member.type == NIMChatroomMemberTypeManager || isCreatorOrSuperAdmin); - - // 是否设置了房间密码 - BOOL hasRoomPwd = (roomInfo.roomPwd.length > 0); - - // 构建基础数组 - NSMutableArray *firstSection = [@[titleItem, lockItem] mutableCopy]; - if (hasRoomPwd) { - [firstSection addObject:pwdItem]; - } - - NSMutableArray *secondSection = [@[tagItem] mutableCopy]; - NSMutableArray *thirdSection = [@[blackItem, giftEffectItem, messageScreedItem] mutableCopy]; - - // 添加创建者和超级管理员特有的选项 - if (isCreatorOrSuperAdmin) { - [secondSection insertObject:avatarItem atIndex:0]; - [thirdSection insertObject:managerItem atIndex:0]; - } - - // 添加根据房间类型和身份的特定选项 - if (roomInfo.type == RoomType_Anchor) { - // 主播房间（直播间） - array = @[firstSection, secondSection, thirdSection]; - } else { - // 其他类型房间 - if (member.type == NIMChatroomMemberTypeCreator) { - [thirdSection addObjectsFromArray:@[arrangeMicItem, leaveItem]]; - } else if (isManagerOrAbove) { - [thirdSection addObject:arrangeMicItem]; - } - array = @[firstSection, secondSection, thirdSection]; - } - - // 若为迷你游戏房间则直接使用前述设置的 `array` - if (roomInfo.type == RoomType_MiniGame) { - array = @[firstSection, secondSection, thirdSection]; - } - - // 将构建后的数组存入 list，并加入礼物特效项 - NSMutableArray *list = [array mutableCopy]; - if (isManagerOrAbove) { - NSMutableArray *thirdSubList = [list[2] mutableCopy]; - [thirdSubList addObject:giftValueItem]; - list[2] = thirdSubList; - } - - // 返回数据 - [[self getView] getRoomSettingListSuccess:list]; - } - }]; -} - -/// 获取房间信息 -/// @param roomUid 房主的uid -- (void)getRoomInfo:(NSString *)roomUid { - NSString * uid = [AccountInfoStorage instance].getUid; - @kWeakify(self); - [Api getRoomInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:data.data]; - [[self getView] getRoomInfoSuccess:roomInfo]; - } showLoading:YES] uid:roomUid intoUid:uid]; -} -/// 开启排麦 -/// @param roomUid 房主的uid -- (void)openRoomArrangeMic:(NSString *)roomUid { - NSString * uid = [AccountInfoStorage instance].getUid; - @kWeakify(self); - [Api openRoomArrangeMic:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] openRoomArrangeMicSuccess]; - } showLoading:YES] roomUid:roomUid operUid:uid]; -} - -/// 关闭排麦 -/// @param roomUid 房主的uid -- (void)closeRoomArrangeMic:(NSString *)roomUid { - NSString * uid = [AccountInfoStorage instance].getUid; - @kWeakify(self); - [Api closeRoomArrangeMic:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] closeRoomArrangeMicSuccess]; - } showLoading:YES] roomUid:roomUid operUid:uid]; -} - -/// 开启离开模式 -/// @param roomUid 房主的uid -- (void)openRoomLeaveMode:(NSString *)roomUid { - NSString * uid = [AccountInfoStorage instance].getUid; - @kWeakify(self); - [Api openRoomLeaveMode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] openRoomArrangeMicSuccess]; - } showLoading:YES] roomUid:roomUid uid:uid]; -} - -/// 关闭离开模式 -/// @param roomUid 房主的uid -- (void)closeRoomLeaveMode:(NSString *)roomUid { - NSString * uid = [AccountInfoStorage instance].getUid; - @kWeakify(self); - [Api closeRoomLeaveMode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] closeRoomArrangeMicSuccess]; - } showLoading:YES] roomUid:roomUid uid:uid]; -} - -/// 更新公屏状态 -/// @param isCloseScreen 是否关闭公屏 -/// @param roomId 房间的id -- (void)updateRoomMessageScreenState:(BOOL)isCloseScreen roomId:(NSString *)roomId { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - NSString * isCleScreenStr = isCloseScreen ? @"1" : @"0"; - @kWeakify(self); - [Api updateRoomInfoMessageState:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:data.data]; - [[self getView] updateRoomMessageScreenStateSuccess:roomInfo]; - } showLoading:YES] roomId:roomId isCloseScreen:isCleScreenStr ticket:ticket uid:uid]; -} - - -/// 更新房间信息 -/// @param title 房间标题 -/// @param roomPwd 房间密码 -/// @param tagId 房间tag -/// @param hasAnimationEffect 是否开启房间特效 -/// @param roomUid 房间uid -/// @param roomId 群聊的id -/// @param mgId 小游戏的id -- (void)updateRoomInfo:(NSString *)title - roomPwd:(NSString *)roomPwd - tagId:(NSString *)tagId - classifyId:(NSString *)classifyId - hasAnimationEffect:(BOOL)hasAnimationEffect - roomUid:(NSString *)roomUid - roomId:(NSString *)roomId - type:(RoomType)type - itemType:(RoomSettingItemType)itemType - mgId:(NSString *)mgId - backPic:(NSString *)backPic - avatar:(nonnull NSString *)avatar { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - NSMutableDictionary * params = [NSMutableDictionary dictionary]; - [params setObject:ticket forKey:@"ticket"]; - [params setObject:uid forKey:@"uid"]; - [params setObject:roomUid forKey:@"roomUid"]; - if (title.length > 0) { - [params setObject:title forKey:@"title"]; - } - if(backPic.length > 0){ - [params setObject:backPic forKey:@"backPic"]; - } - if (roomPwd.length > 0) { - [params setObject:roomPwd forKey:@"roomPwd"]; - } else{ - [params setObject:@"" forKey:@"roomPwd"]; - } - - if (tagId.length > 0) { - [params setObject:tagId forKey:@"tagId"]; - } - if (classifyId.length > 0) { - [params setObject:classifyId forKey:@"singleRoomSortId"]; - } - [params setObject:@(type) forKey:@"type"]; - - [params setObject:@(hasAnimationEffect) forKey:@"hasAnimationEffect"]; - - if (mgId.length > 0) { - [params setObject:mgId forKey:@"mgId"]; - } - - if (avatar.length > 0) { - [params setObject:avatar forKey:@"avatar"]; - } - - ///获取房间角色 - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = roomId; - request.userIds = @[uid]; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - @kStrongify(self); - if (error == nil) { - NIMChatroomMember * member = members.firstObject; - if (member.type == NIMTeamMemberTypeOwner) { - @kWeakify(self); - [Api ownerUpdateRoomInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - RoomInfoModel * roomInfo = [RoomInfoModel modelWithJSON:data.data]; - [[self getView] updateRoomInfoSuccess:roomInfo itemType:itemType]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] updateRoomInfoFail:msg]; - } showLoading:YES errorToast:YES] params:params]; - } else if(member.type == NIMTeamMemberTypeManager) { - @kWeakify(self); - [Api managerUpdateRoomInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - RoomInfoModel * roomInfo = [RoomInfoModel modelWithJSON:data.data]; - [[self getView] updateRoomInfoSuccess:roomInfo itemType:itemType]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] updateRoomInfoFail:msg]; - } showLoading:YES] params:params]; - } - } else { - [[self getView] updateRoomInfoFail:YMLocalizedString(@"XPRoomSettingPresenter10")]; - } - }]; - -} -/// 获取房间在线用户 -/// @param roomUid roomUid --(void)getRoomOnlineUserListWithRoomUid:(NSString *)roomUid{ - @kWeakify(self); - [Api requestRoomOnlineUserList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray *list = [XPMessageRemoteExtModel modelsWithArray:data.data]; - [[self getView]getRoomOnlineUserListSuccess:list]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if ([[self getView] instancesRespondToSelector:@selector(getRoomOnlineUserFailure:)]) { - [[self getView] getRoomOnlineUserFailure:msg]; - } - }] roomUid:roomUid]; -} -/// 关闭房间礼物值 -/// @param roomUid 房间的uid -- (void)closeRoomGiftValue:(NSString *)roomUid itemModel:(XPRoomSettingItemModel *)itemModel{ - @kWeakify(self); - NSString * uid = [AccountInfoStorage instance].getUid; - [Api closeRoomGiftValue:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] closeRoomGiftValueSuccessWithItemModel:itemModel]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] closeRoomGiftValueFailWithItemModel:itemModel]; - }] uid:uid roomUid:roomUid]; -} -/// 开启房间礼物值 -/// @param roomUid 房间的uid -- (void)openRoomGiftValue:(NSString *)roomUid itemModel:(XPRoomSettingItemModel *)itemModel{ - @kWeakify(self); - NSString * uid = [AccountInfoStorage instance].getUid; - [Api openRoomGiftValue:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] openRoomGiftValueSuccessWithItemModel:itemModel]; - }fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] openRoomGiftValueFailWithItemModel:itemModel]; - }] uid:uid roomUid:roomUid]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTagPresenter.h b/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTagPresenter.h deleted file mode 100644 index 9447441..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTagPresenter.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMRoomTagPresenter.h -// YUMI -// -// Created by YUMI on 2021/12/28. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomTagPresenter : BaseMvpPresenter - -///获取房间标签列表 -- (void)getRoomTagList; -///获取房间分类列表 -- (void)getRoomClassifyList; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTagPresenter.m b/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTagPresenter.m deleted file mode 100644 index 1905fd7..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTagPresenter.m +++ /dev/null @@ -1,34 +0,0 @@ -// -// YMRoomTagPresenter.m -// YUMI -// -// Created by YUMI on 2021/12/28. -// - -#import "XPRoomTagPresenter.h" -#import "Api+RoomSetting.h" -#import "AccountInfoStorage.h" -#import "XPRoomTagProtocol.h" -#import "RoomTagModel.h" -#import "RoomClassifyModel.h" - - -@implementation XPRoomTagPresenter - -- (void)getRoomTagList { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getRoomTagList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [RoomTagModel modelsWithArray:data.data]; - [[self getView] getRoomTagListSuccess:array]; - }] uid:uid]; -} - -- (void)getRoomClassifyList { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getRoomClassifyList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [RoomClassifyModel modelsWithArray:data.data]; - [[self getView] getRoomClassifyListSuccess:array]; - }] uid:uid]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTopicPresenter.h b/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTopicPresenter.h deleted file mode 100644 index ee76d0c..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTopicPresenter.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMRoomTopicPresenter.h -// YUMI -// -// Created by YUMI on 2022/3/14. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN -@class RoomInfoModel; -@interface XPRoomTopicPresenter : BaseMvpPresenter -///更新房间信息 -- (void)roomTopicUpdate:(NSString *)roomDesc introduction:(NSString *)introduction roomInfo:(RoomInfoModel *)roomInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTopicPresenter.m b/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTopicPresenter.m deleted file mode 100644 index 04f8050..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomTopicPresenter.m +++ /dev/null @@ -1,72 +0,0 @@ -// -// YMRoomTopicPresenter.m -// YUMI -// -// Created by YUMI on 2022/3/14. -// - -#import "XPRoomTopicPresenter.h" -#import -#import "YUMIConstant.h" -#import "DESEncrypt.h" -#import "AccountInfoStorage.h" -#import "Api+RoomSetting.h" -#import "XPRoomTopicProtocol.h" -#import "RoomInfoModel.h" -#import "NSMutableDictionary+Saft.h" - -@implementation XPRoomTopicPresenter - -///更新房间信息 -- (void)roomTopicUpdate:(NSString *)roomDesc introduction:(NSString *)introduction roomInfo:(RoomInfoModel *)roomInfo { - NSString * uid = [AccountInfoStorage instance].getUid; - NSString * ticket = [AccountInfoStorage instance].getTicket; - NSMutableDictionary * params = [NSMutableDictionary dictionary]; - [params safeSetObject:ticket forKey:@"ticket"]; - [params safeSetObject:uid forKey:@"uid"]; - [params safeSetObject:[NSString stringWithFormat:@"%ld", roomInfo.uid] forKey:@"roomUid"]; - if (roomInfo.title.length > 0) { - [params safeSetObject:roomInfo.title forKey:@"title"]; - } - - if (roomInfo.roomPwd.length > 0) { - [params safeSetObject:roomInfo.roomPwd forKey:@"roomPwd"]; - } - - if (roomInfo.tagId > 0) { - [params safeSetObject:[NSString stringWithFormat:@"%ld", roomInfo.tagId] forKey:@"tagId"]; - } - - [params safeSetObject:roomDesc forKey:@"roomDesc"]; - if (introduction.length > 0) { - [params safeSetObject:introduction forKey:@"introduction"]; - } - [params safeSetObject:@(roomInfo.hasAnimationEffect) forKey:@"hasAnimationEffect"]; - ///获取房间角色 - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - request.userIds = @[uid]; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - @kStrongify(self); - if (error == nil) { - NIMChatroomMember * member = members.firstObject; - @kWeakify(self); - if (member.type == NIMTeamMemberTypeOwner) { - [Api ownerUpdateRoomInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] updateRoomTopicSuccess]; - } showLoading:YES] params:params]; - } else if(member.type == NIMTeamMemberTypeManager) { - [Api managerUpdateRoomInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] updateRoomTopicSuccess]; - } showLoading:YES] params:params]; - } - } else { - [[self getView] updateRoomTopicFail:YMLocalizedString(@"XPRoomTopicPresenter0")]; - } - }]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/Protocol/XPRoomSettingProtocol.h b/YuMi/Modules/YMRoom/View/Setting/Protocol/XPRoomSettingProtocol.h deleted file mode 100644 index 9a0b602..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Protocol/XPRoomSettingProtocol.h +++ /dev/null @@ -1,43 +0,0 @@ -// -// YMRoomSettingProtocol.h -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import -#import "XPRoomSettingItemModel.h" - -NS_ASSUME_NONNULL_BEGIN -@class RoomInfoModel; -@protocol XPRoomSettingProtocol -@optional -///房间设置的列表数据 -- (void)getRoomSettingListSuccess:(NSArray *)list; -///获取房间信息成功 -- (void)getRoomInfoSuccess:(RoomInfoModel *)roomInfo; -///开启排麦成功 -- (void)openRoomArrangeMicSuccess; -///关闭排麦成功 -- (void)closeRoomArrangeMicSuccess; -///更新房间公屏的开启状态 -- (void)updateRoomMessageScreenStateSuccess:(RoomInfoModel *)roomInfo; -///开启离线成功 -- (void)openRoomLeaveModeSuccess; -///关闭离线成功 -- (void)closeRoomLeaveModeSuccess; -///更新房间信息成功 -- (void)updateRoomInfoSuccess:(RoomInfoModel *)roomInfo itemType:(RoomSettingItemType)itemType; -///更新房间信息失败 -- (void)updateRoomInfoFail:(NSString *)message; -//获取房间在线用户成功 --(void)getRoomOnlineUserListSuccess:(NSArray *)list; --(void)getRoomOnlineUserFailure:(NSString *)msg; --(void)closeRoomGiftValueSuccessWithItemModel:(XPRoomSettingItemModel *)itemModel; --(void)closeRoomGiftValueFailWithItemModel:(XPRoomSettingItemModel *)itemModel; --(void)openRoomGiftValueSuccessWithItemModel:(XPRoomSettingItemModel *)itemModel; --(void)openRoomGiftValueFailWithItemModel:(XPRoomSettingItemModel *)itemModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/Protocol/XPRoomTagProtocol.h b/YuMi/Modules/YMRoom/View/Setting/Protocol/XPRoomTagProtocol.h deleted file mode 100644 index 29f12ea..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Protocol/XPRoomTagProtocol.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMRoomTagProtocol.h -// YUMI -// -// Created by YUMI on 2021/12/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPRoomTagProtocol - -- (void)getRoomTagListSuccess:(NSArray *)array; - -- (void)getRoomClassifyListSuccess:(NSArray *)array; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/Protocol/XPRoomTopicProtocol.h b/YuMi/Modules/YMRoom/View/Setting/Protocol/XPRoomTopicProtocol.h deleted file mode 100644 index 9cc21de..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/Protocol/XPRoomTopicProtocol.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMRoomTopicProtocol.h -// YUMI -// -// Created by YUMI on 2022/3/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol XPRoomTopicProtocol - -///更新房间话题成功 -- (void)updateRoomTopicSuccess; -///更新房间话题失败 -- (void)updateRoomTopicFail:(NSString *)message; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.h b/YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.h deleted file mode 100644 index d0568d9..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MSRoomSetingBackdropCell.h -// YuMi -// -// Created by duoban on 2024/5/22. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface MSRoomSetingBackdropCell : UICollectionViewCell -@property(nonatomic,assign) BOOL isUse; -@property(nonatomic,copy) NSString *imageUrl; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.m deleted file mode 100644 index d091736..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.m +++ /dev/null @@ -1,82 +0,0 @@ -// -// MSRoomSetingBackdropCell.m -// YuMi -// -// Created by duoban on 2024/5/22. -// - -#import "MSRoomSetingBackdropCell.h" -@interface MSRoomSetingBackdropCell() -@property(nonatomic,strong) NetImageView *backdropView; -@property(nonatomic,strong) UILabel *useView; -@property(nonatomic,strong) UIView *bgView; -@end -@implementation MSRoomSetingBackdropCell --(instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self installUI]; - [self installConstraints]; - } - return self; -} --(void)installUI{ - - [self.contentView addSubview:self.backdropView]; - [self.contentView addSubview:self.bgView]; - [self.bgView addSubview:self.useView]; - self.bgView.hidden = YES; -} -- (void)setIsUse:(BOOL)isUse{ - _isUse = isUse; - _bgView.hidden = !_isUse; -} --(void)setImageUrl:(NSString *)imageUrl{ - _imageUrl = imageUrl; - _backdropView.image = nil; - [_backdropView loadImageWithUrl:_imageUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - self.backdropView.image = image; - }]; -} --(void)installConstraints{ - [self.backdropView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.contentView); - }]; - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(20)); - make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(50)); - }]; - [self.useView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(6)); - make.centerY.equalTo(self.bgView); - }]; -} -#pragma mark - 懒加载 -- (NetImageView *)backdropView{ - if(!_backdropView){ - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder]; - _backdropView = [[NetImageView alloc]initWithConfig:config]; - _backdropView.contentMode = UIViewContentModeScaleAspectFill; - _backdropView.layer.cornerRadius = kGetScaleWidth(5); - _backdropView.layer.masksToBounds = YES; - } - return _backdropView; -} -- (UIView *)bgView{ - if(!_bgView){ - _bgView = [UIView new]; - _bgView.backgroundColor = UIColorFromRGB(0xB2AFFF); - _bgView.layer.cornerRadius = kGetScaleWidth(5); - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} -- (UILabel *)useView{ - if(!_useView){ - _useView = [UILabel labelInitWithText:YMLocalizedString(@"MSRoomSetingBackdropCell0") font:kFontMedium(13) textColor:[UIColor whiteColor]]; - } - return _useView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.h b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.h deleted file mode 100644 index 44cc25d..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMRoomOnlineTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/30. -// - -#import -#import "XPMessageRemoteExtModel.h" -NS_ASSUME_NONNULL_BEGIN -@class NIMChatroomMember; -typedef NS_ENUM(NSInteger, RoomOnLineType) { - ///所有的用户 - RoomOnLineType_All_User = 0, - ///抱人上麦的用户 - RoomOnLineType_Invite_User -}; - -@interface XPRoomOnlineTableViewCell : UITableViewCell -///在线列表的类型 -@property (nonatomic,assign) RoomOnLineType onlineType; -///云信用户实体 -@property (strong, nonatomic) NIMChatroomMember *member; -@property(nonatomic,strong) XPMessageRemoteExtModel *userInfo; -///是否在麦序上 -@property (nonatomic,assign) BOOL isOnMicro; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m deleted file mode 100644 index 3cedd52..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m +++ /dev/null @@ -1,462 +0,0 @@ -// -// YMRoomOnlineTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/30. -// - -#import "XPRoomOnlineTableViewCell.h" -///Third -#import -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "XPMessageRemoteExtModel.h" - -@interface XPRoomOnlineTableViewCell () -///显示头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///性别 -@property (nonatomic,strong) UIButton *sexImageView; -///姓名 和 等级 总的容器 -@property (nonatomic,strong) UIStackView *stackView; -///姓名的容器 -@property (nonatomic,strong) UIStackView *nickStackView; -///显示姓名 -@property (nonatomic,strong) UILabel *nickLabel; -///魅力等级 等级 铭牌 -@property (nonatomic,strong) UIStackView *tagStackView; -///角色的 -@property (nonatomic,strong) UIButton *roleButton; -///美丽等级 -@property (nonatomic,strong) NetImageView *charmImageView; -///等级 -@property (nonatomic,strong) NetImageView *experImageView; -///铭牌的容器 -@property (nonatomic,strong) UIView * namePlateView; -///铭牌图片 -@property (nonatomic,strong) NetImageView *nameplateImageView; -///铭牌文字 -@property (nonatomic,strong) UILabel *nameplateLabel; -///分割线 -@property (nonatomic,strong) UIView * lineView; -///在麦上显示标签 -@property (strong, nonatomic) UILabel *onMicroStatusLabel; -@end - -@implementation XPRoomOnlineTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor clearColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.stackView]; - [self.contentView addSubview:self.lineView]; - [self.contentView addSubview:self.onMicroStatusLabel]; - - [self.stackView addArrangedSubview:self.nickStackView]; - [self.stackView addArrangedSubview:self.tagStackView]; - - [self.nickStackView addArrangedSubview:self.nickLabel]; - [self.nickStackView addArrangedSubview:self.sexImageView]; - - [self.tagStackView addArrangedSubview:self.roleButton]; - [self.tagStackView addArrangedSubview:self.experImageView]; - [self.tagStackView addArrangedSubview:self.charmImageView]; - [self.tagStackView addArrangedSubview:self.namePlateView]; - - ///铭牌 - [self.namePlateView addSubview:self.nameplateImageView]; - [self.namePlateView addSubview:self.nameplateLabel]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(15); - make.width.height.mas_equalTo(40); - make.centerY.mas_equalTo(self.contentView.mas_centerY); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); - }]; - - [self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(25); - }]; - - [self.roleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo( 15); - }]; - CGFloat width = 28 * 20 / 14; - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; - - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(25); - make.width.mas_equalTo(width); - }]; - - [self.namePlateView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(25); - make.width.mas_equalTo(self.nameplateImageView.mas_width); - }]; - - - [self.nameplateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(25); - make.width.mas_equalTo(60); - make.leading.top.mas_equalTo(self.namePlateView); - }]; - - [self.nameplateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(self.nameplateImageView); - make.trailing.mas_equalTo(self.namePlateView).offset(-2); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.bottom.mas_equalTo(self.contentView); - make.height.mas_equalTo(0.5); - }]; - - [self.onMicroStatusLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView); - make.trailing.mas_equalTo(-15); - make.width.mas_equalTo(40); - make.height.mas_equalTo(14); - }]; - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(28); - make.height.mas_equalTo(14); - }]; -} - - -#pragma mark - Getters And Setters -- (void)setUserInfo:(XPMessageRemoteExtModel *)userInfo{ - _userInfo = userInfo; - - 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; - - - - if (userInfo.userLevelVo.experUrl) { - self.experImageView.imageUrl = userInfo.userLevelVo.experUrl; - } - self.experImageView.hidden = userInfo.userLevelVo.experUrl.length <= 0; - - if (userInfo.userLevelVo.charmUrl) { - self.charmImageView.imageUrl = userInfo.userLevelVo.charmUrl; - } - self.charmImageView.hidden = userInfo.userLevelVo.charmUrl.length <= 0; - if(userInfo.isCustomWord == YES){ - if (userInfo.nameplatePic.length > 0){ - self.nameplateImageView.imageUrl = userInfo.nameplatePic; - } - }else{ - if (userInfo.nameplatePic.length>0 && userInfo.nameplateWord.length>0) { - self.nameplateImageView.imageUrl = userInfo.nameplatePic; - self.nameplateLabel.text = userInfo.nameplateWord; - self.namePlateView.hidden = NO; - } else { - self.namePlateView.hidden = YES; - } - } - self.roleButton.hidden = YES; - if ([userInfo.memberType isEqualToString:@"CREATOR"] || [userInfo.memberType isEqualToString:@"MANAGER"]) { - - if ([userInfo.memberType isEqualToString:@"CREATOR"]) { - self.roleButton.hidden = NO; - [self.roleButton setBackgroundColor:[DJDKMIMOMColor appEmphasizeColor2]]; - [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:[NSString stringWithFormat:@" %@ ",YMLocalizedString(@"XPRoomOnlineTableViewCell1")] forState:UIControlStateNormal]; - } - } - if(self.roleButton.hidden == NO){ - - } - self.isOnMicro = userInfo.inMic; - if (userInfo.userVipInfoVO.enterHide == YES) { - self.nickLabel.text = YMLocalizedString(@"XPRoomOnlineTableViewCell2"); - self.avatarImageView.image = [UIImage imageNamed:@"room_secretMan"]; - self.sexImageView.hidden = YES; - self.tagStackView.hidden = YES; - self.isOnMicro = NO; - } else { - self.avatarImageView.imageUrl = userInfo.avatar; - self.nickLabel.text = userInfo.nick; - self.sexImageView.hidden = NO; - } - -} -- (void)setMember:(NIMChatroomMember *)member { - _member = member; - if (_member) { - NSDictionary * extDic = [member.roomExt toJSONObject]; - XPMessageRemoteExtModel * userInfo = [XPMessageRemoteExtModel modelWithDictionary:[extDic objectForKey:member.userId]]; - if (userInfo.gender) { - -// [self.sexImageView setTitle:[NSString getAgeWithBirth:userInfo.birth.longLongValue] 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; - } else { - NIMUser *user = [[NIMSDK sharedSDK].userManager userInfo:_member.userId]; - [self.sexImageView setTitle:[NSString getAgeWithBirth:user.userInfo.birth.longLongValue] forState:UIControlStateNormal]; - self.sexImageView.backgroundColor = user.userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.titleEdgeInsets = user.userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.sexImageView.selected = user.userInfo.gender != GenderType_Male; - } - if (userInfo.experUrl) { - self.experImageView.imageUrl = userInfo.experUrl; - } - self.experImageView.hidden = userInfo.experUrl.length <= 0; - - if (userInfo.charmUrl) { - self.charmImageView.imageUrl = userInfo.charmUrl; - } - self.charmImageView.hidden = userInfo.charmUrl.length <= 0; - if(userInfo.isCustomWord == YES){ - if (userInfo.inRoomNameplatePic.length>0) { - self.nameplateImageView.imageUrl = userInfo.inRoomNameplatePic; - self.namePlateView.hidden = NO; - } else { - self.namePlateView.hidden = YES; - } - }else{ - if (userInfo.inRoomNameplatePic.length>0 && userInfo.inRoomNameplateWord.length>0) { - self.nameplateImageView.imageUrl = userInfo.inRoomNameplatePic; - self.nameplateLabel.text = userInfo.inRoomNameplateWord; - self.namePlateView.hidden = NO; - } else { - self.namePlateView.hidden = YES; - } - } - self.roleButton.hidden = YES; - if (extDic.allKeys.count > 0 || (member.type == NIMTeamMemberTypeOwner || member.type == NIMChatroomMemberTypeManager)) { - if (_member.type == NIMTeamMemberTypeOwner) { - self.roleButton.hidden = NO; - [self.roleButton setBackgroundColor:[DJDKMIMOMColor appEmphasizeColor2]]; - [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:[NSString stringWithFormat:@" %@ ",YMLocalizedString(@"XPRoomOnlineTableViewCell1")] forState:UIControlStateNormal]; - } - } - - if (userInfo.enterHide) { - self.nickLabel.text = YMLocalizedString(@"XPRoomOnlineTableViewCell2"); - self.avatarImageView.image = [UIImage imageNamed:@"room_secretMan"]; - self.sexImageView.hidden = YES; - self.tagStackView.hidden = YES; - self.isOnMicro = NO; - } else { - self.avatarImageView.imageUrl = _member.roomAvatar; - self.nickLabel.text = _member.roomNickname; - self.sexImageView.hidden = NO; - } - } -} - -- (void)setIsOnMicro:(BOOL)isOnMicro { - self.onMicroStatusLabel.hidden = !isOnMicro; -} - -- (void)setOnlineType:(RoomOnLineType)onlineType { - _onlineType = onlineType; - switch (_onlineType) { - case RoomOnLineType_All_User: - self.nickLabel.textColor = [UIColor whiteColor]; - self.backgroundColor = [UIColor clearColor]; - break; - case RoomOnLineType_Invite_User: - self.nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - self.backgroundColor = [UIColor clearColor]; - self.isOnMicro = NO; - break; - default: - break; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 40/2; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UIButton *)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; - } - return _sexImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:15]; - _nickLabel.textColor = [UIColor whiteColor]; - } - return _nickLabel; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFillProportionally; - _stackView.alignment = UIStackViewAlignmentLeading; - _stackView.spacing = 5; - } - return _stackView; -} - -- (UIStackView *)nickStackView { - if (!_nickStackView) { - _nickStackView = [[UIStackView alloc] init]; - _nickStackView.axis = UILayoutConstraintAxisHorizontal; - _nickStackView.distribution = UIStackViewDistributionFill; - _nickStackView.alignment = UIStackViewAlignmentCenter; - _nickStackView.spacing = 3; - } - return _nickStackView; -} - -- (UIStackView *)tagStackView { - if (!_tagStackView) { - _tagStackView = [[UIStackView alloc] init]; - _tagStackView.axis = UILayoutConstraintAxisHorizontal; - _tagStackView.distribution = UIStackViewDistributionFill; - _tagStackView.alignment = UIStackViewAlignmentCenter; - _tagStackView.spacing = 2; - } - return _tagStackView; -} -- (NetImageView *)experImageView { - if (!_experImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _experImageView = [[NetImageView alloc] initWithConfig:config]; - _experImageView.userInteractionEnabled = YES; - _experImageView.hidden = YES; - _experImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _experImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - _charmImageView.userInteractionEnabled = YES; - _charmImageView.hidden = YES; - _charmImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _charmImageView; -} - -- (UIView *)namePlateView { - if (!_namePlateView) { - _namePlateView = [[UIView alloc] init]; - _namePlateView.backgroundColor = [UIColor clearColor]; - _namePlateView.hidden = YES; - } - return _namePlateView; -} - -- (NetImageView *)nameplateImageView { - if (!_nameplateImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _nameplateImageView = [[NetImageView alloc] initWithConfig:config]; - _nameplateImageView.userInteractionEnabled = YES; - _nameplateImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _nameplateImageView; -} - -- (UILabel *)nameplateLabel { - if (!_nameplateLabel) { - _nameplateLabel = [[UILabel alloc] init]; - _nameplateLabel.font = [UIFont systemFontOfSize:10]; - _nameplateLabel.textAlignment = NSTextAlignmentCenter; - _nameplateLabel.textColor = [UIColor whiteColor]; - } - return _nameplateLabel; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.1]; - } - return _lineView; -} - -- (UIButton *)roleButton { - if (!_roleButton) { - _roleButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_roleButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _roleButton.titleLabel.font = [UIFont systemFontOfSize:10]; - _roleButton.layer.masksToBounds = YES; - _roleButton.layer.cornerRadius = 15 / 2; - } - return _roleButton; -} - -- (UILabel *)onMicroStatusLabel { - if (!_onMicroStatusLabel) { - _onMicroStatusLabel = [[UILabel alloc] init]; - _onMicroStatusLabel.text = YMLocalizedString(@"XPRoomOnlineTableViewCell3"); - _onMicroStatusLabel.textColor = UIColor.whiteColor; - _onMicroStatusLabel.font = [UIFont systemFontOfSize:10]; - _onMicroStatusLabel.textAlignment = NSTextAlignmentCenter; - _onMicroStatusLabel.layer.cornerRadius = 7; - _onMicroStatusLabel.layer.masksToBounds = YES; - _onMicroStatusLabel.backgroundColor = [DJDKMIMOMColor appEmphasizeColor]; - } - return _onMicroStatusLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleEmptyTableViewCell.h b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleEmptyTableViewCell.h deleted file mode 100644 index 9c29288..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleEmptyTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomRoleEmptyTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomRoleEmptyTableViewCell : UITableViewCell -@property (nonatomic,strong, readonly) UILabel *titleLabel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleEmptyTableViewCell.m deleted file mode 100644 index 83339a0..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleEmptyTableViewCell.m +++ /dev/null @@ -1,70 +0,0 @@ -// -// YMRoomRoleEmptyTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import "XPRoomRoleEmptyTableViewCell.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImageConstant.h" - -@interface XPRoomRoleEmptyTableViewCell () -@property (nonatomic,strong) UIImageView *emptyImageView; -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPRoomRoleEmptyTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.emptyImageView]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(150); - make.centerX.mas_equalTo(self.contentView); - make.size.mas_equalTo(CGSizeMake(200, 200)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.leading.trailing.mas_equalTo(self.contentView); - }]; -} -#pragma mark - Getters And Setters -- (UIImageView *)emptyImageView { - if (!_emptyImageView) { - _emptyImageView = [[UIImageView alloc] init]; - _emptyImageView.userInteractionEnabled = YES; - _emptyImageView.image = [UIImageConstant defaultEmptyPlaceholder]; - _emptyImageView.layer.masksToBounds = YES; - _emptyImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _emptyImageView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.text = YMLocalizedString(@"XPRoomRoleEmptyTableViewCell0"); - _titleLabel.font = [UIFont systemFontOfSize:16]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _titleLabel; -} -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleTableViewCell.h b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleTableViewCell.h deleted file mode 100644 index 836c2d1..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleTableViewCell.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// YMRoomRoleTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class NIMChatroomMember, XPRoomRoleTableViewCell; -@protocol XPRoomRoleTableViewCellDelegate - -///点击了member -- (void)xPRoomRoleTableViewCell:(XPRoomRoleTableViewCell *)view didClickMember:(NIMChatroomMember *)member; - -@end - -@interface XPRoomRoleTableViewCell : UITableViewCell -///分割线 -@property (nonatomic,strong, readonly) UIView * lineView; -///云信用户实体 -@property (strong, nonatomic) NIMChatroomMember *member; -///代理 -@property (nonatomic,weak) id delegate; - -- (void)hideRemoveButton; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleTableViewCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleTableViewCell.m deleted file mode 100644 index 3d0b01a..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleTableViewCell.m +++ /dev/null @@ -1,157 +0,0 @@ -// -// YMRoomRoleTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import "XPRoomRoleTableViewCell.h" -///Third -#import -#import -///Tool -#import "NetImageView.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "XPMessageRemoteExtModel.h" - -@interface XPRoomRoleTableViewCell () -///显示头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///性别 -@property (nonatomic,strong) UIImageView *sexImageView; -///显示姓名 -@property (nonatomic,strong) UILabel *nickLabel; -///移除 -@property (nonatomic,strong) UIButton *removeButton; -///分割线 -@property (nonatomic,strong) UIView * lineView; -@end - -@implementation XPRoomRoleTableViewCell - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - self.selectionStyle = UITableViewCellSelectionStyleNone; - [self.contentView addSubview:self.avatarImageView]; - [self.contentView addSubview:self.nickLabel]; - [self.contentView addSubview:self.sexImageView]; - [self.contentView addSubview:self.removeButton]; - [self.contentView addSubview:self.lineView]; -} - -- (void)initSubViewConstraints { - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(15); - make.width.height.mas_equalTo(40); - make.centerY.mas_equalTo(self.contentView.mas_centerY); - }]; - -[self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); -}]; - - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self.nickLabel.mas_trailing).offset(10); - }]; - - [self.removeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.contentView.mas_centerY); - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.width.mas_equalTo(65); - make.height.mas_equalTo(30); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel); - make.trailing.mas_equalTo(self.removeButton); - make.bottom.mas_equalTo(self.contentView); - make.height.mas_equalTo(1); - }]; -} - -- (void)hideRemoveButton { - self.removeButton.hidden = YES; -} - -#pragma mark - Event Response -- (void)removeButtonAction:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomRoleTableViewCell:didClickMember:)]) { - [self.delegate xPRoomRoleTableViewCell:self didClickMember:self.member]; - } -} - -#pragma mark - Getters And Setters -- (void)setMember:(NIMChatroomMember *)member { - _member = member; - if (_member) { - self.avatarImageView.imageUrl = _member.roomAvatar; - self.nickLabel.text = _member.roomNickname; - } -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 40/2; - _avatarImageView.layer.borderColor = [DJDKMIMOMColor appMainColor].CGColor; - } - return _avatarImageView; -} - -- (UIImageView *)sexImageView { - if (!_sexImageView) { - _sexImageView = [[UIImageView alloc] init]; - _sexImageView.userInteractionEnabled = YES; - } - return _sexImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:15]; - _nickLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _nickLabel; -} - -- (UIButton *)removeButton { - if (!_removeButton) { - _removeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_removeButton setTitle:YMLocalizedString(@"XPRoomRoleTableViewCell0") forState:UIControlStateNormal]; - [_removeButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal]; - _removeButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_removeButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientStartColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _removeButton.layer.masksToBounds = YES; - _removeButton.layer.cornerRadius = 15; - [_removeButton addTarget:self action:@selector(removeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _removeButton; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.h b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.h deleted file mode 100644 index 6421ccb..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// YMRoomSettingTableViewCell.h -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class XPRoomSettingItemModel; -@protocol XPRoomSettingTableViewCellDelegate - -///改变了switch的状态 -- (void)didChangeSwitch:(UISwitch *)switchView itemModel:(XPRoomSettingItemModel *)itemModel; - -@end -@interface XPRoomSettingTableViewCell : UITableViewCell - -///显示 -@property (nonatomic,strong) XPRoomSettingItemModel *itemModel; -///代理 -@property (nonatomic,weak) id delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.m deleted file mode 100644 index aacf9cb..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.m +++ /dev/null @@ -1,220 +0,0 @@ -// -// YMRoomSettingTableViewCell.m -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import "XPRoomSettingTableViewCell.h" -///Third -#import -///Tool -#import "ThemeColor+Room.h" -///Model -#import "XPRoomSettingItemModel.h" - -@interface XPRoomSettingTableViewCell () -///标题的容器 -@property (nonatomic,strong) UIStackView *titleStackView; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///离开模式 -@property (nonatomic,strong) UILabel *leaveLabel; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -///副标题 -@property (nonatomic,strong) UILabel *subTitleLabel; -///开关 -@property (nonatomic,strong) UISwitch *switchView; -///箭头 -@property (nonatomic,strong) UIImageView *arrowImageView; -///分割线 -@property (nonatomic,strong) UIView * lineView; -///右侧头像 -@property (nonatomic,strong) NetImageView * avatarImageView; -@end - -@implementation XPRoomSettingTableViewCell -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Private Method -- (void)initSubViews { - self.selectionStyle = UITableViewCellSelectionStyleNone; - self.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - [self.contentView addSubview:self.titleStackView]; - [self.contentView addSubview:self.stackView]; - [self.contentView addSubview:self.lineView]; - - [self.titleStackView addArrangedSubview:self.titleLabel]; - [self.titleStackView addArrangedSubview:self.leaveLabel]; - - [self.stackView addArrangedSubview:self.subTitleLabel]; - [self.stackView addArrangedSubview:self.switchView]; - [self.stackView addArrangedSubview:self.avatarImageView]; - [self.stackView addArrangedSubview:self.arrowImageView]; -} - -- (void)initSubViewConstraints { - [self.titleStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.contentView).offset(15); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView).offset(-15); - make.centerY.mas_equalTo(self.contentView); - }]; - - [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView).inset(15); - make.bottom.mas_equalTo(0); - make.height.mas_equalTo(0.5); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(40); - }]; -} -#pragma mark - Event Response -- (void)switchDidChange:(UISwitch *)swtich { - if (self.delegate && [self.delegate respondsToSelector:@selector(didChangeSwitch:itemModel:)]) { - [self.delegate didChangeSwitch:swtich itemModel:self.itemModel]; - } -} - -#pragma mark - Getters And Setters -- (void)setItemModel:(XPRoomSettingItemModel *)itemModel { - _itemModel = itemModel; - self.titleLabel.text = _itemModel.title; - self.avatarImageView.hidden = (itemModel.type != RoomSettingItemType_Avatar); - - if (itemModel.type == RoomSettingItemType_Avatar) { - self.avatarImageView.hidden = NO; - self.avatarImageView.imageUrl = itemModel.avatar; - } - - if (_itemModel.type == RoomSettingItemType_Title || - _itemModel.type == RoomSettingItemType_Class || - _itemModel.type == RoomSettingItemType_Tag || - _itemModel.type == RoomSettingItemType_Black_List || - _itemModel.type == RoomSettingItemType_Manager_List || - _itemModel.type == RoomSettingItemType_Pwd || - _itemModel.type == RoomSettingItemType_Avatar) { - self.switchView.hidden = YES; - self.arrowImageView.hidden = NO; - self.subTitleLabel.hidden = NO; - self.subTitleLabel.text = _itemModel.subTitle.length > 0 ? _itemModel.subTitle : @""; - } else { - self.switchView.hidden = NO; - self.arrowImageView.hidden = YES; - self.subTitleLabel.hidden = YES; - self.switchView.on = _itemModel.switchState; - } - - if (_itemModel.type == RoomSettingItemType_Leave_Model && _itemModel.switchState) { - self.leaveLabel.hidden = NO; - } else { - self.leaveLabel.hidden = YES; - } -} - -- (UIStackView *)titleStackView { - if (!_titleStackView) { - _titleStackView = [[UIStackView alloc] init]; - _titleStackView.axis = UILayoutConstraintAxisVertical; - _titleStackView.distribution = UIStackViewDistributionFill; - _titleStackView.alignment = UIStackViewAlignmentLeading; - _stackView.spacing = 3; - } - return _titleStackView; -} - -- (UILabel *)titleLabel { - if (_titleLabel == nil) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - [_titleLabel setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - } - return _titleLabel; -} - -- (UILabel *)leaveLabel { - if (!_leaveLabel) { - _leaveLabel = [[UILabel alloc] init]; - _leaveLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _leaveLabel.font = [UIFont systemFontOfSize:13]; - _leaveLabel.text = YMLocalizedString(@"XPRoomSettingTableViewCell0"); - } - return _leaveLabel; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 8; - } - return _stackView; -} - -- (UIImageView *)arrowImageView { - if (_arrowImageView == nil) { - _arrowImageView = [[UIImageView alloc] init]; - _arrowImageView.image = [[UIImage imageNamed:@"room_setting_arrow"]ms_SetImageForRTL]; - [_arrowImageView setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; - [_arrowImageView setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; - } - return _arrowImageView; -} - -- (NetImageView *)avatarImageView { - if (_avatarImageView == nil) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.cornerRadius = 6; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.hidden = YES; - } - return _avatarImageView; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [DJDKMIMOMColor dividerColor]; - } - return _lineView; -} - -- (UISwitch *)switchView { - if (!_switchView) { - _switchView = [[UISwitch alloc] init]; - _switchView.onTintColor = [DJDKMIMOMColor appEmphasizeColor]; - _switchView.tintColor = [DJDKMIMOMColor appMainColor]; - _switchView.backgroundColor = [UIColor clearColor]; - [_switchView addTarget:self action:@selector(switchDidChange:) forControlEvents:UIControlEventValueChanged]; - } - return _switchView; -} - -- (UILabel *)subTitleLabel { - if (!_subTitleLabel) { - _subTitleLabel = [[UILabel alloc] init]; - _subTitleLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _subTitleLabel.font = [UIFont systemFontOfSize:12]; - } - return _subTitleLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTagCell.h b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTagCell.h deleted file mode 100644 index 3971cf6..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTagCell.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMRoomSettingTagCell.h -// YUMI -// -// Created by YUMI on 2021/12/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomTagModel, RoomClassifyModel; - -@interface XPRoomSettingTagCell : UICollectionViewCell -///房间tag -@property (nonatomic,strong) RoomTagModel *roomTag; -@property (nonatomic, strong) RoomClassifyModel *roomClassify; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTagCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTagCell.m deleted file mode 100644 index 4610065..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTagCell.m +++ /dev/null @@ -1,80 +0,0 @@ -// -// YMRoomSettingTagCell.m -// YUMI -// -// Created by YUMI on 2021/12/28. -// - -#import "XPRoomSettingTagCell.h" -///Third -#import -///Model -#import "RoomTagModel.h" -#import "DJDKMIMOMColor.h" -#import "RoomClassifyModel.h" - -@interface XPRoomSettingTagCell () -@property (nonatomic, strong) UILabel *tagLabel; -@end - -@implementation XPRoomSettingTagCell - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - self.backgroundColor = [UIColor colorWithWhite:1 alpha:0.08]; - self.layer.cornerRadius = 13; - self.layer.masksToBounds = YES; - self.layer.borderWidth = 0.5; - [self addSubview:self.tagLabel]; - [self.tagLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self); - }]; - } - return self; -} - -- (void)setRoomTag:(RoomTagModel *)roomTag { - _roomTag = roomTag; - if (_roomTag) { - self.tagLabel.text = _roomTag.name; - if (_roomTag.isSelect) { - self.backgroundColor = UIColorFromRGB(0xFFF0C9); - self.tagLabel.textColor = UIColorFromRGB(0xFFA936); - self.layer.borderColor = UIColorFromRGB(0xFFBC51).CGColor; - } else { - self.backgroundColor = UIColorFromRGB(0xF1F1FA); - self.tagLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.layer.borderColor = UIColorFromRGB(0xF1F1FA).CGColor; - } - } -} - -- (void)setRoomClassify:(RoomClassifyModel *)roomClassify { - _roomClassify = roomClassify; - if (_roomClassify) { - self.tagLabel.text = _roomClassify.sortName; - if (_roomClassify.isSelect) { - self.backgroundColor = UIColorFromRGB(0xFFF0C9); - self.tagLabel.textColor = UIColorFromRGB(0xFFA936); - self.layer.borderColor = UIColorFromRGB(0xFFBC51).CGColor; - } else { - self.backgroundColor = UIColorFromRGB(0xF1F1FA); - self.tagLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.layer.borderColor = UIColorFromRGB(0xF1F1FA).CGColor; - } - } -} - -#pragma mark - Getter & Setter -- (UILabel *)tagLabel { - if (!_tagLabel) { - _tagLabel = [[UILabel alloc] init]; - _tagLabel.textColor = UIColor.whiteColor; - _tagLabel.font = [UIFont systemFontOfSize:12]; - } - return _tagLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomInviteUserViewController.h b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomInviteUserViewController.h deleted file mode 100644 index b882cca..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomInviteUserViewController.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// YMRoomInviteUserViewController.h -// YUMI -// -// Created by YUMI on 2022/1/18. -// 抱用户上麦控制器 - -#import "BaseViewController.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomInviteUserViewController : BaseViewController -///是否只展示管理员和房主 -@property (nonatomic,assign) BOOL isManagerOrOwner; -///相亲的时候VIp的uid 如果不是相亲 可以不传 -@property (nonatomic,assign) NSInteger blindDateVipUid; -///当前房间的id -@property (nonatomic,copy) NSString *roomId; -///坑位信息 -@property (nonatomic,copy) NSString *position; -///当前房主的 UID -@property(nonatomic, copy) NSString *roomUid; -///房間類型 -@property(nonatomic, assign) NSInteger roomType; -///房間模式 -@property (nonatomic, assign) NSInteger roomModeType; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomInviteUserViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomInviteUserViewController.m deleted file mode 100644 index 2b5645c..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomInviteUserViewController.m +++ /dev/null @@ -1,462 +0,0 @@ -// -// YMRoomInviteUserViewController.m -// YUMI -// -// Created by YUMI on 2022/1/18. -// - -#import "XPRoomInviteUserViewController.h" -///Third -#import -#import -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "AccountInfoStorage.h" -#import "Api.h" -#import "NSArray+Safe.h" -///Model -#import "RoomInfoModel.h" -#import "UserInfoModel.h" -#import "MicroQueueModel.h" -#import "AttachmentModel.h" -#import "MicroExtModel.h" -///View -#import "XPRoomOnlineTableViewCell.h" -#import "XPRoomRoleEmptyTableViewCell.h" - -@interface XPRoomInviteUserViewController () -///总的数据 -@property (nonatomic,strong) NSMutableArray *originArray; -///需要显示的数据 -@property (nonatomic,strong) NSMutableArray *datasource; -///麦上用户的数据 -@property (nonatomic,strong) NSArray *micQueueArray; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///最后一个 -@property (nonatomic,strong) NIMChatroomMember *lastMember; -///临时成员最后一个 -@property (nonatomic,strong) NIMChatroomMember *tmpLastMember; -@end - -@implementation XPRoomInviteUserViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initHeaderAndFooterRrfresh]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = self.isManagerOrOwner ? YMLocalizedString(@"XPRoomInviteUserViewController3") : YMLocalizedString(@"XPRoomInviteUserViewController1"); - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -- (void)initHeaderAndFooterRrfresh { - MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; - header.stateLabel.font = [UIFont systemFontOfSize:10.0]; - header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - header.lastUpdatedTimeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - self.tableView.mj_header = header; - - MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(footerRefresh)]; - footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; - footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; - self.tableView.mj_footer = footer; - - [self headerRefresh]; -} - -- (void)headerRefresh { - self.lastMember= nil; - self.tmpLastMember = nil; - [self.datasource removeAllObjects]; - @kWeakify(self); - [[self fetchChatRoomQueue] subscribeNext:^(id _Nullable x) { - @kStrongify(self); - @kWeakify(self); - NSArray * queueArray = x; - [[self loadChatRoomRegularMemberList] subscribeNext:^(id _Nullable x) { - @kStrongify(self); - @kWeakify(self); - NSArray * regularList = x; - [regularList enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - @kStrongify(self); - NIMChatroomMember * member = obj; - if (member.type == NIMChatroomMemberTypeCreator) { - [self.datasource insertObject:member atIndex:0]; - }else { - [self.datasource addObject:member]; - } - }]; - - [[self loadChatRoomTmpMemberList] subscribeNext:^(id _Nullable x) { - @kStrongify(self); - NSArray * tmpList = x; - [self.datasource addObjectsFromArray:tmpList]; - for (NSInteger i = (self.datasource.count - 1); i >= 0; i--) { - NIMChatroomMember * member = [self.datasource xpSafeObjectAtIndex:i]; - for (UserInfoModel * userInfo in queueArray) { - if (member.userId.integerValue == userInfo.uid) { - [self.datasource removeObject:member]; - continue; - } - } - } - [self.tableView reloadData]; - }]; - - }]; - }]; - - -} - -- (void)footerRefresh { - [[self loadChatRoomRegularMemberList] subscribeNext:^(id _Nullable x) { - NSArray * regularList = x; - [regularList enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - NIMChatroomMember * member = obj; - if (member.type == NIMChatroomMemberTypeCreator) { - [self.datasource insertObject:member atIndex:0]; - }else { - [self.datasource addObject:member]; - } - }]; - - [[self loadChatRoomTmpMemberList] subscribeNext:^(id _Nullable x) { - NSArray * tmpList = x; - [tmpList enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - [self.datasource addObject:obj]; - }]; - - for (NSInteger i = (self.datasource.count - 1); i >= 0; i--) { - NIMChatroomMember * member = [self.datasource xpSafeObjectAtIndex:i]; - for (UserInfoModel * userInfo in self.micQueueArray) { - if (member.userId.integerValue == userInfo.uid) { - [self.datasource removeObject:member]; - break;; - } - } - } - [self.tableView reloadData]; - }]; - - }]; -} - -- (RACSignal *)fetchChatRoomQueue { - return [RACSignal createSignal:^RACDisposable * _Nullable(id _Nonnull subscriber) { - [[NIMSDK sharedSDK].chatroomManager fetchChatroomQueue:self.roomId completion:^(NSError * _Nullable error, NSArray *> * _Nullable info) { - if (error == nil) { - NSMutableArray * array= [NSMutableArray array]; - for (NSDictionary *item in info) { - UserInfoModel *userInfo = [UserInfoModel modelWithJSON:item.allValues.firstObject]; - [array addObject:userInfo]; - } - self.micQueueArray = [array copy]; - [subscriber sendNext:self.micQueueArray]; - [subscriber sendCompleted]; - } else { - [subscriber sendNext:nil]; - [subscriber sendCompleted]; - } - - }]; - return nil; - }]; -} - -- (RACSignal *)loadChatRoomRegularMemberList { - return [RACSignal createSignal:^RACDisposable * _Nullable(id _Nonnull subscriber) { - NIMChatroomMemberRequest *request = [[NIMChatroomMemberRequest alloc] init]; - request.roomId = self.roomId; - request.type = NIMChatroomFetchMemberTypeRegular; - request.lastMember = self.lastMember; - request.limit = 200; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembers:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - if (members.count > 0) { - self.lastMember = members.lastObject; - } - NSMutableArray * array = [NSMutableArray array]; - [members enumerateObjectsUsingBlock:^(NIMChatroomMember * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.isOnline && !obj.isInBlackList) { - if (self.isManagerOrOwner) { - if (obj.type == NIMChatroomMemberTypeCreator || obj.type == NIMChatroomMemberTypeManager) { - [array addObject:obj]; - } - } else { - [array addObject:obj]; - } - } - }]; - [subscriber sendNext:array]; - [subscriber sendCompleted]; - } else { - [subscriber sendNext:nil]; - [subscriber sendCompleted]; - } - }]; - return nil; - }]; - -} - - -- (RACSignal *)loadChatRoomTmpMemberList { - return [RACSignal createSignal:^RACDisposable * _Nullable(id _Nonnull subscriber) { - NIMChatroomMemberRequest *request = [[NIMChatroomMemberRequest alloc] init]; - request.roomId = self.roomId; - request.type = NIMChatroomFetchMemberTypeTemp; - request.lastMember = self.tmpLastMember; - request.limit = 20; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembers:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - [self.tableView.mj_header endRefreshing]; - [self.tableView.mj_footer endRefreshing]; - if (error == nil) { - if (members.count > 0) { - self.tmpLastMember = members.lastObject; - } - NSMutableArray * array = [NSMutableArray array]; - [members enumerateObjectsUsingBlock:^(NIMChatroomMember * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.isOnline && !obj.isInBlackList) { - if (self.isManagerOrOwner) { - if (obj.type == NIMChatroomMemberTypeCreator || obj.type == NIMChatroomMemberTypeManager) { - [array addObject:obj]; - } - } else { - [array addObject:obj]; - } - } - }]; - [subscriber sendNext:array]; - [subscriber sendCompleted]; - } else { - [subscriber sendNext:nil]; - [subscriber sendCompleted]; - } - }]; - return nil; - }]; -} - -/** - * 麦位更新扩展字段。 - */ -- (NSDictionary *)userInfoToQueueExt:(UserInfoModel *)userInfo { - MicroExtModel * extModel = [[MicroExtModel alloc] init]; - extModel.gender = userInfo.gender; - extModel.avatar = userInfo.avatar; - extModel.uid = userInfo.uid; - extModel.nick = userInfo.nick; - extModel.vipMic = userInfo.uid == self.blindDateVipUid; - extModel.headWearUrl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - extModel.micCircle = userInfo.micCircle; - extModel.micNickColor = userInfo.micNickColor; - extModel.preventKick = userInfo.userVipInfoVO.preventKick; - extModel.enterHide = userInfo.userVipInfoVO.enterHide; - return [extModel model2dictionary]; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPRoomOnlineTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomOnlineTableViewCell class])]; - if (cell == nil) { - cell = [[XPRoomOnlineTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomOnlineTableViewCell class])]; - } - NIMChatroomMember * member = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.member = member; - cell.onlineType = RoomOnLineType_Invite_User; - return cell; - } - - XPRoomRoleEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomRoleEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPRoomRoleEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomRoleEmptyTableViewCell class])]; - } - cell.titleLabel.text = YMLocalizedString(@"XPRoomInviteUserViewController2"); - cell.backgroundColor = [UIColor clearColor]; - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - return 60; - } - return KScreenHeight - kNavigationHeight; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - - if (self.datasource.count > 0) { - NIMChatroomMember * member = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (self.roomType == RoomType_19Mic && self.position.integerValue == 6 ) { - @kWeakify(self); - [Api requestBossMicUp:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - [self handleUpMicAction:member]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:self.roomUid uid:member.userId]; - } else { - [self handleUpMicAction:member]; - } - } -} - -- (void)handleUpMicAction:(NIMChatroomMember *)member { - - NSError *error = nil; - NSData *data = [member.roomExt dataUsingEncoding:NSUTF8StringEncoding]; - NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data - options:kNilOptions - error:&error]; - NSDictionary *value = nil; - if (!error) { - NSLog(@"解析成功：%@", dict); - NSString *firstKey = dict.allKeys.firstObject; - if (![NSString isEmpty:firstKey]) { - value = dict[firstKey]; - } - } - - if (value && - [value objectForKey:@"versionType"] && - ![member.userId isEqualToString:[AccountInfoStorage instance].getUid] && - self.roomModeType == 0) { - AttachmentModel *attachment = [[AttachmentModel alloc] init]; - attachment.first = ClientMessage_Type; - attachment.second = ClientMessage_UpMic_Ask; - NSMutableDictionary *data = [[NSMutableDictionary alloc] init]; - [data setObject:@([[AccountInfoStorage instance].getUid integerValue]) - forKey:@"uid"]; - [data setObject:@(member.userId.integerValue) - forKey:@"targetUid"]; - [data setObject:@(self.position.integerValue) - forKey:@"position"]; - [data setObject:@(self.roomType) - forKey:@"roomType"]; - [data setObject:member.roomNickname - forKey:@"targetNick"]; - [data setObject:@(self.roomUid.integerValue) - forKey:@"roomUid"]; - int64_t millis = (int64_t)([[NSDate date] timeIntervalSince1970] * 1000); - [data setObject:@(millis) - forKey:@"sendTime"]; - attachment.data = data; - - NSString *sessionID = self.roomId; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - - NIMSessionType sessionType = NIMSessionTypeChatroom; - //构造会话 - NIMSession *session = [NIMSession session:sessionID type:sessionType]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - BOOL onMain = [NSThread isMainThread]; - if (error) { - NSLog(@"[Send] ❌ 发送失败 | sessionId=%@ | code=%ld | desc=%@ | main=%@ | ts=%.3f", - sessionID, (long)error.code, error.localizedDescription, onMain ? @"YES" : @"NO", [[NSDate date] timeIntervalSince1970]); - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"20.20.62_text_8")]; - } else { - NSLog(@"[Send] ✅ 发送成功 | sessionId=%@ | main=%@ | ts=%.3f", - sessionID, onMain ? @"YES" : @"NO", [[NSDate date] timeIntervalSince1970]); - [self.navigationController popViewControllerAnimated:YES]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"20.20.62_text_3")]; - } - }]; - } else { - if ([AccountInfoStorage instance].getUid.integerValue == member.userId.integerValue) { - [Api getUserInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - UserInfoModel * userInfo = [UserInfoModel modelWithJSON:data.data]; - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = self.position; - request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; - request.roomId = self.roomId; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - if (error == nil) { - [self.navigationController popViewControllerAnimated:YES]; - } else { - [self showErrorToast:error.description]; - } - }]; - } - - } uid:member.userId]; - } else { - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - [dic setValue:@(self.position.integerValue) forKey:@"micPosition"]; - [dic setValue:@(member.userId.integerValue) forKey:@"uid"]; - AttachmentModel *attachement = [[AttachmentModel alloc]init]; - attachement.first = CustomMessageType_Queue; - attachement.second = Custom_Message_Sub_Queue_Invite; - attachement.data = dic; - - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachement; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:self.roomId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - [self.navigationController popViewControllerAnimated:YES]; - } - } -} - -#pragma mark - Event Response -- (void)backButtonAction:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.rowHeight = 60; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPRoomOnlineTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomOnlineTableViewCell class])]; - [_tableView registerClass:[XPRoomRoleEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomRoleEmptyTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.h b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.h deleted file mode 100644 index 96e04d9..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMRoomOnLineViewController.h -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import "MvpViewController.h" -#import "RoomHostDelegate.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomOnLineViewController : MvpViewController - -- (instancetype)initWithDelegate:(id)delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m deleted file mode 100644 index eaa3ef5..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m +++ /dev/null @@ -1,337 +0,0 @@ -// -// YMRoomOnLineViewController.m -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import "XPRoomOnLineViewController.h" -///Third -#import -#import -#import -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "UIButton+EnlargeTouchArea.h" -#import "NSArray+Safe.h" -///Model -#import "UserInfoModel.h" -#import "MicroQueueModel.h" -#import "RoomInfoModel.h" -#import "XPUserCardInfoModel.h" -#import "XPMessageRemoteExtModel.h" -///View -#import "XPRoomOnlineTableViewCell.h" -#import "XPRoomRoleEmptyTableViewCell.h" -///VC -#import "UserRoomCardViewController.h" -#import "XPRoomSettingPresenter.h" -#import "XPRoomSettingProtocol.h" -@interface XPRoomOnLineViewController () -///导航栏 -@property (nonatomic,strong) UIView * navView; -///返回按钮 -@property (nonatomic,strong) UIButton *backButton; -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///背景图 -@property (nonatomic,strong) UIImageView *backImageView; -///需要显示的数据 -@property (nonatomic,strong) NSMutableArray *datasource; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///host -@property (nonatomic,weak) idhostDelegate; -///房间的id -@property (nonatomic,copy) NSString *roomId; - -@end - -@implementation XPRoomOnLineViewController -- (void)dealloc { - [[NIMSDK sharedSDK].chatManager removeDelegate:self]; -} -- (XPRoomSettingPresenter *)createPresenter { - return [[XPRoomSettingPresenter alloc] init]; -} -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super init]) { - self.hostDelegate = delegate; - self.roomId= [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - } - return self; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - //监听云信消息 - [[NIMSDK sharedSDK].chatManager addDelegate:self]; - [self initSubViews]; - [self initSubViewConstraints]; - [self refreshData]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.backImageView]; - [self.view addSubview:self.tableView]; - [self.view addSubview:self.navView]; - - [self.navView addSubview:self.backButton]; - [self.navView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - - [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.view); - make.top.mas_equalTo(self.navView.mas_bottom); - }]; - - [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(22, 22)); - make.leading.mas_equalTo(self.navView).offset(8); - make.centerY.mas_equalTo(self.titleLabel); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.navView); - make.centerY.equalTo(self.navView.mas_bottom).mas_offset(-22); - }]; -} - -- (void)refreshData { - [XNDJTDDLoadingTool showLoading]; - [self.presenter getRoomOnlineUserListWithRoomUid:self.roomId]; -} - -//获取房间在线用户成功 --(void)getRoomOnlineUserListSuccess:(NSArray *)list{ - [XNDJTDDLoadingTool hideHUD]; - NSMutableArray *temp = @[].mutableCopy; - for (XPMessageRemoteExtModel *model in list) { - if (model.platformRole == 0) { - [temp addObject:model]; - } - } - self.datasource = temp; - - [self.tableView reloadData]; - self.tableView.hidden = NO; -} - --(void)getRoomOnlineUserFailure:(NSString *)msg { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - self.tableView.hidden = NO; -} - -#pragma mark - NIMChatManagerDelegate -- (void)onRecvMessages:(NSArray *)messages { - for (NIMMessage * message in messages) { - // 非房间内消息不处理 - if (message.session.sessionType != NIMSessionTypeChatroom) { - continue; - } - - // 非本房间不处理 - if (![message.session.sessionId isEqualToString:self.roomId]) { - continue; - } - if (message.messageType == NIMMessageTypeNotification) { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - - if (![notiMsg.content isKindOfClass:[NIMChatroomNotificationContent class]]) { - return; - } - - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - - switch (content.eventType) { - case NIMChatroomEventTypeEnter: - case NIMChatroomEventTypeExit: - case NIMChatroomEventTypeAddManager: - case NIMChatroomEventTypeRemoveManager: - case NIMChatroomEventTypeAddBlack: - case NIMChatroomEventTypeRemoveBlack: - case NIMChatroomEventTypeQueueChange: - case NIMChatroomEventTypeKicked: - [self refreshData]; - break; - default: - break; - - - } - } - } -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPRoomOnlineTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomOnlineTableViewCell class])]; - if (cell == nil) { - cell = [[XPRoomOnlineTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomOnlineTableViewCell class])]; - } - XPMessageRemoteExtModel * member = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - cell.userInfo = member; - return cell; - } - - XPRoomRoleEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomRoleEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPRoomRoleEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomRoleEmptyTableViewCell class])]; - } - cell.titleLabel.text = YMLocalizedString(@"XPRoomOnLineViewController0"); - cell.backgroundColor = [UIColor clearColor]; - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - return 60; - } - return KScreenHeight - kNavigationHeight; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if (self.datasource.count > 0) { - XPMessageRemoteExtModel * userInfo = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (userInfo.userVipInfoVO.enterHide) { - return; - } - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - NSString * targetUid = userInfo.uid; - XPUserCardInfoModel * model = [[XPUserCardInfoModel alloc] init]; - __block MicroQueueModel *micModel = nil; - [[self.hostDelegate.getMicroQueue allValues] enumerateObjectsUsingBlock:^(MicroQueueModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (targetUid.integerValue == obj.userInfo.uid) { - model.position = [NSString stringWithFormat:@"%d", obj.microState.position]; - model.posState = obj.microState.posState; - model.micState = obj.microState.micState; - micModel = obj; - *stop = YES; - } - }]; - model.nick = self.hostDelegate.getUserInfo.nick; - model.uid = targetUid; - model.delegate = self.hostDelegate; - model.roomInfo = roomInfo; - model.superMangerList = self.hostDelegate.getRoomSuperAdminList; - model.micQueue = self.hostDelegate.getMicroQueue; - model.hideSendGiftItem = YES; - model.platformRole = micModel.userInfo.platformRole; - UserRoomCardViewController *vc = [[UserRoomCardViewController alloc] initWithUser:model controlUser:self.hostDelegate.getUserInfo]; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:vc animated:NO completion:nil]; - - [[NSNotificationCenter defaultCenter] removeObserver:self]; - @kWeakify(self); - [[NSNotificationCenter defaultCenter] addObserverForName:@"PopAfterUserCardAction" object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification * _Nonnull notification) { - @kStrongify(self); - [self clickChatAction]; - }]; - } -} -#pragma mark- XPUserCardViewControllerDelegate --(void)clickChatAction{ - [self.navigationController popViewControllerAnimated:YES]; -} -#pragma mark - Event Response -- (void)backButtonAction:(UIButton *)sender { - [self.navigationController popViewControllerAnimated:YES]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.rowHeight = 60; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPRoomOnlineTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomOnlineTableViewCell class])]; - [_tableView registerClass:[XPRoomRoleEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomRoleEmptyTableViewCell class])]; - _tableView.hidden = YES; - } - return _tableView; -} - -- (UIButton *)backButton { - if (!_backButton) { - _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"home_search_white_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; - [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_backButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - } - return _backButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.text = YMLocalizedString(@"XPRoomOnLineViewController1"); - _titleLabel.textColor = [UIColor whiteColor]; - } - return _titleLabel; -} - -- (UIView *)navView { - if (!_navView) { - _navView = [[UIView alloc] init]; - _navView.backgroundColor = [UIColor clearColor]; - } - return _navView; -} - - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - _backImageView.layer.masksToBounds = YES; - _backImageView.contentMode = UIViewContentModeScaleAspectFill; - _backImageView.image = [[UIImage imageNamed:@"room_background"]ms_SetImageForRTL]; - } - return _backImageView; -} - - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomRoleViewController.h b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomRoleViewController.h deleted file mode 100644 index 94d158f..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomRoleViewController.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// YMRoomRoleViewController.h -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, RoomRoleListType) { - ///管理员 - RoomRoleListType_Manager = 1, - RoomRoleListType_Black, -}; - -@interface XPRoomRoleViewController : BaseViewController -///房间的id -@property (nonatomic,copy) NSString *roomId; -///类型 -@property (nonatomic,assign) RoomRoleListType type; -///超管列表 -@property (nonatomic,strong) NSArray *superAdmminList; - -@property(nonatomic, assign) BOOL isAppAdmin; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomRoleViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomRoleViewController.m deleted file mode 100644 index eb6e2cf..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomRoleViewController.m +++ /dev/null @@ -1,203 +0,0 @@ -// -// YMRoomRoleViewController.m -// YUMI -// -// Created by YUMI on 2021/12/29. -// 管理员 黑名单 - -#import "XPRoomRoleViewController.h" -///Third -#import -#import -#import "YUMIMacroUitls.h" -#import "XPRoomRoleTableViewCell.h" -#import "XPRoomRoleEmptyTableViewCell.h" -#import "GuildSuperAdminInfoModel.h" -#import "NSArray+Safe.h" - -@interface XPRoomRoleViewController () -///总的数据 -@property (nonatomic,strong) NSMutableArray *originArray; -///需要显示的数据 -@property (nonatomic,strong) NSMutableArray *datasource; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///最后一个 -@property (nonatomic,strong) NIMChatroomMember *lastMember; -@end - -@implementation XPRoomRoleViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -- (void)loadChatRoomRegularMemberList { - NIMChatroomMemberRequest *request = [[NIMChatroomMemberRequest alloc] init]; - request.roomId = self.roomId; - request.type = NIMChatroomFetchMemberTypeRegular; - request.lastMember = self.lastMember; - request.limit = 200; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembers:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - @kStrongify(self); - if (error == nil) { - self.lastMember = members.lastObject; - [members enumerateObjectsUsingBlock:^(NIMChatroomMember * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (self.type == RoomRoleListType_Black) { - if (obj.isInBlackList) { - [self.datasource addObject:obj]; - } - } else if(self.type == RoomRoleListType_Manager) { - if (obj.type == NIMChatroomMemberTypeManager && ![self isRoomSuperAdmin:obj.userId]) { - [self.datasource addObject:obj]; - } - } - }]; - - [self.tableView reloadData]; - - if (members.count > 0) { - [self loadChatRoomRegularMemberList]; - } - } - }]; -} - -- (BOOL)isRoomSuperAdmin:(NSString *)uid { - BOOL isSuperAdmin = NO; - for (int i = 0; i< self.superAdmminList.count; i++) { - GuildSuperAdminInfoModel * superAdminInfo = [self.superAdmminList xpSafeObjectAtIndex:i]; - if ([superAdminInfo.uid isEqualToString:uid]) { - isSuperAdmin = YES; - break; - } - } - return isSuperAdmin; -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource.count > 0 ? self.datasource.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - XPRoomRoleTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomRoleTableViewCell class])]; - if (cell == nil) { - cell = [[XPRoomRoleTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomRoleTableViewCell class])]; - } - cell.delegate = self; - cell.member = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (indexPath.row == (self.datasource.count -1)) { - cell.lineView.hidden = YES; - } else { - cell.lineView.hidden = NO; - } - - if (self.isAppAdmin) { - [cell hideRemoveButton]; - } - - return cell; - } - - XPRoomRoleEmptyTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomRoleEmptyTableViewCell class])]; - if (cell == nil) { - cell = [[XPRoomRoleEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomRoleEmptyTableViewCell class])]; - } - - if (self.type == RoomRoleListType_Black) { - cell.titleLabel.text = YMLocalizedString(@"XPRoomRoleViewController0"); - } else { - cell.titleLabel.text = YMLocalizedString(@"XPRoomRoleViewController1"); - } - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (self.datasource.count > 0) { - return 55; - } - - return KScreenHeight - kNavigationHeight; -} - -#pragma mark - XPRoomRoleTableViewCellDelegate -- (void)xPRoomRoleTableViewCell:(NSString *)view didClickMember:(NIMChatroomMember *)member { - if (self.type == RoomRoleListType_Black) { - NIMChatroomMemberUpdateRequest *request = [[NIMChatroomMemberUpdateRequest alloc]init]; - request.roomId = self.roomId; - request.userId = member.userId; - request.enable = NO; - [[NIMSDK sharedSDK].chatroomManager updateMemberBlack:request completion:^(NSError * _Nullable error) { - if (error == nil) { - [self.datasource removeObject:member]; - [self.tableView reloadData]; - } - }]; - } else if(self.type == RoomRoleListType_Manager) { - NIMChatroomMemberUpdateRequest *request = [[NIMChatroomMemberUpdateRequest alloc]init]; - request.roomId = self.roomId; - request.userId = member.userId; - request.enable = NO; - [[NIMSDK sharedSDK].chatroomManager markMemberManager:request completion:^(NSError * _Nullable error) { - if (error == nil) { - [self.datasource removeObject:member]; - [self.tableView reloadData]; - } - }]; - } -} - - -#pragma mark - Getters And Setters -- (void)setType:(RoomRoleListType)type { - _type = type; - if (_type == RoomRoleListType_Black) { - self.title = YMLocalizedString(@"XPRoomRoleViewController2"); - } else { - self.title = YMLocalizedString(@"XPRoomRoleViewController3"); - } - [self loadChatRoomRegularMemberList]; -} - -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - _tableView.rowHeight = 60; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPRoomRoleTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomRoleTableViewCell class])]; - [_tableView registerClass:[XPRoomRoleEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomRoleEmptyTableViewCell class])]; - } - return _tableView; -} - -- (NSMutableArray *)datasource { - if (!_datasource) { - _datasource = [NSMutableArray array]; - } - return _datasource; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.h b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.h deleted file mode 100644 index 7c6bfa6..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// YMRoomSettingInputView.h -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, RoomSettingInputType) { - ///给房间设置标题 - RoomSettingInputType_Title = 1, - ///给房间设置密码 - RoomSettingInputType_Pwd, - ///进房输入密码 - RoomSettingInputType_Input_Pwd, -}; - -@class XPRoomSettingInputView; -@protocol XPRoomSettingInputViewDelegate -@optional -///点击了完成 -- (void)xPRoomSettingInputView:(XPRoomSettingInputView *)view didClickConfirm:(NSString *)text type:(RoomSettingInputType)type; -///点击了取消 -- (void)didClickCancel:(RoomSettingInputType)type; - -@end - -@interface XPRoomSettingInputView : UIView -///代理 -@property (nonatomic,weak) id delegate; -///最大文字个数，默认 0，无限制 -@property (nonatomic, assign) NSUInteger maxCount; -///类型 -@property (nonatomic,assign) RoomSettingInputType type; -///占位符 -@property (nonatomic,copy) NSString *placeHolder; -///密码是否错误 -@property (nonatomic,assign) BOOL isPwdError; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m deleted file mode 100644 index 7dd82d7..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m +++ /dev/null @@ -1,299 +0,0 @@ -// -// YMRoomSettingInputView.m -// YUMI -// -// Created by YUMI on 2021/12/29. -// - -#import "XPRoomSettingInputView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "TTPopup.h" - -@interface XPRoomSettingInputView () -/// 标题 -@property (nonatomic, strong) UILabel *titleLabel; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -/// 取消按钮 -@property (nonatomic, strong) UIButton *cancelButton; -/// 确认按钮 -@property (nonatomic, strong) UIButton *confirmButton; -///显示个数 -@property (nonatomic, strong) UILabel *countLabel; -///输入框 -@property (nonatomic, strong) MSBaseTextField *contentTextField; -///输入错误的label -@property (nonatomic,strong) UILabel *failLabel; -@end - -@implementation XPRoomSettingInputView - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Getters And Setters -- (void)addNotification { - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil]; -} - -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - self.layer.masksToBounds= YES; - self.layer.cornerRadius = 15; - [self addSubview:self.titleLabel]; - [self addSubview:self.contentTextField]; - [self addSubview:self.countLabel]; - [self addSubview:self.failLabel]; - [self addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.cancelButton]; - [self.stackView addArrangedSubview:self.confirmButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KScreenWidth - 45 *2, 200)); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(20); - }]; - - [self.contentTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(15); - make.leading.trailing.mas_equalTo(self).inset(15); - make.height.mas_equalTo(40); - }]; - - [self.failLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentTextField); - make.top.mas_equalTo(self.contentTextField.mas_bottom).offset(10); - }]; - - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentTextField.mas_bottom).offset(4); - make.trailing.mas_equalTo(self.contentTextField).offset(-10); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(20); - make.height.mas_equalTo(43); - make.bottom.mas_equalTo(self.mas_bottom).offset(-20); - }]; - -} - -#pragma mark - Event Response -- (void)cancelButtonAction:(UIButton *)sender { - [TTPopup dismiss]; - if (self.delegate && [self.delegate respondsToSelector:@selector(didClickCancel:)]) { - [self.delegate didClickCancel:self.type]; - } -} - -- (void)confirmButtonAction:(UIButton *)sender { - if (self.type != RoomSettingInputType_Input_Pwd) { - [TTPopup dismiss]; - } - if (self.contentTextField.text.length > 0 && self.delegate && [self.delegate respondsToSelector:@selector(xPRoomSettingInputView:didClickConfirm:type:)]) { - [self.delegate xPRoomSettingInputView:self didClickConfirm:self.contentTextField.text type:self.type]; - } -} - - -- (void)keyboardWillShow:(NSNotification*)notification { - CGRect keyboardRect = [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]; - CGRect rect = [self.superview convertRect:self.frame toView:[UIApplication sharedApplication].keyWindow]; - CGFloat top = KScreenHeight / 2 + rect.size.height / 2; - CGFloat height = CGRectGetMinY(keyboardRect) - top; - if (height < 0) { - [UIView animateWithDuration:0.25 animations:^{ - self.superview.frame = CGRectMake(rect.origin.x, KScreenHeight / 2 - rect.size.height / 2 + (height - 10), rect.size.width, rect.size.height); - } completion:^(BOOL finished) { - - }]; - } -} - -- (void)keyboardWillHide:(NSNotification*)notification { - CGRect rect = [self.superview convertRect:self.frame toView:[UIApplication sharedApplication].keyWindow]; - [UIView animateWithDuration:0.25 animations:^{ - self.superview.frame = CGRectMake(rect.origin.x, KScreenHeight / 2 - rect.size.height / 2, rect.size.width, rect.size.height); - }]; -} -#pragma mark - mark -- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { - self.failLabel.hidden = YES; - //删除 - if (string.length == 0) { - [self updateCount:range.location]; - return YES; - } - - //字数不设限 - if (self.maxCount == 0) { - return YES; - } - - NSMutableString *mText = [NSMutableString stringWithString:textField.text]; - [mText insertString:string atIndex:range.location]; - - //字数在范围内 - if (mText.length > self.maxCount) { - //字数在范围外 - textField.text = [mText substringToIndex:self.maxCount]; - [self updateCount:textField.text.length]; - return NO; - } - - [self updateCount:mText.length]; - - return YES; -} - -/// 更新计数 -- (void)updateCount:(unsigned long)count { - self.countLabel.text = [NSString stringWithFormat:@"%lu/%lu", count, (unsigned long)self.maxCount]; -} - -#pragma mark - Getters And Setters -- (void)setType:(RoomSettingInputType)type { - _type = type; - if (_type == RoomSettingInputType_Pwd) { - self.contentTextField.keyboardType = UIKeyboardTypeNumberPad; - self.titleLabel.text = YMLocalizedString(@"XPRoomSettingInputView0"); - self.countLabel.hidden = NO; - self.contentTextField.keyboardType = UIKeyboardTypeNumberPad; - } else if(_type == RoomSettingInputType_Title) { - self.titleLabel.text = YMLocalizedString(@"XPRoomSettingInputView1"); - self.countLabel.hidden = NO; - } else if(_type == RoomSettingInputType_Input_Pwd) { - self.titleLabel.text = YMLocalizedString(@"XPRoomSettingInputView2"); - self.countLabel.hidden = YES; - self.contentTextField.keyboardType = UIKeyboardTypeNumberPad; - } -} - -- (void)setPlaceHolder:(NSString *)placeHolder { - _placeHolder = placeHolder; - if (_placeHolder.length > 0) { - NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:_placeHolder attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:17],NSForegroundColorAttributeName: [DJDKMIMOMColor secondTextColor]}]; - self.contentTextField.attributedText = attribute; - } -} - -- (void)setIsPwdError:(BOOL)isPwdError { - _isPwdError = isPwdError; - if (_isPwdError) { - self.failLabel.hidden = NO; - } else { - self.failLabel.hidden = YES; - } -} - -- (UILabel *)titleLabel { - if (_titleLabel == nil) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [DJDKMIMOMColor alertTitleColor]; - _titleLabel.font = [UIFont systemFontOfSize:15]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - } - return _titleLabel; -} - -- (UILabel *)countLabel { - if (_countLabel == nil) { - _countLabel = [[UILabel alloc] init]; - _countLabel.textColor = [DJDKMIMOMColor secondTextColor]; - _countLabel.font = [UIFont systemFontOfSize:10]; - _countLabel.textAlignment = NSTextAlignmentRight; - } - return _countLabel; -} - -- (MSBaseTextField *)contentTextField { - if (_contentTextField == nil) { - _contentTextField = [[MSBaseTextField alloc] init]; - _contentTextField.delegate = self; - _contentTextField.layer.cornerRadius = 20; - _contentTextField.layer.masksToBounds = YES; - _contentTextField.backgroundColor = UIColorFromRGB(0xF0F0F0); - _contentTextField.textColor = [DJDKMIMOMColor mainTextColor]; - _contentTextField.placeholder = YMLocalizedString(@"XPRoomSettingInputView3"); - _contentTextField.font = [UIFont systemFontOfSize:17]; - _contentTextField.leftView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, 15, 10)]; - _contentTextField.leftViewMode = UITextFieldViewModeAlways; - _contentTextField.rightView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, 15, 10)]; - _contentTextField.rightViewMode = UITextFieldViewModeAlways; - } - return _contentTextField; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFillEqually; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 16; - } - return _stackView; -} - -- (UIButton *)cancelButton { - if (!_cancelButton) { - _cancelButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_cancelButton setTitle:YMLocalizedString(@"XPRoomSettingInputView4") forState:UIControlStateNormal]; - [_cancelButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _cancelButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_cancelButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _cancelButton.layer.masksToBounds = YES; - _cancelButton.layer.cornerRadius = 10; - [_cancelButton addTarget:self action:@selector(cancelButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _cancelButton; -} - -- (UIButton *)confirmButton { - if (!_confirmButton) { - _confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_confirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - [_confirmButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _confirmButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_confirmButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _confirmButton.layer.masksToBounds = YES; - _confirmButton.layer.cornerRadius = 10; - [_confirmButton addTarget:self action:@selector(confirmButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _confirmButton; -} - -- (UILabel *)failLabel { - if (!_failLabel) { - _failLabel = [[UILabel alloc] init]; - _failLabel.text = YMLocalizedString(@"XPRoomSettingInputView6"); - _failLabel.font = [UIFont systemFontOfSize:15]; - _failLabel.textAlignment = NSTextAlignmentCenter; - _failLabel.textColor = [DJDKMIMOMColor appMainColor]; - _failLabel.hidden = YES; - } - return _failLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.h b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.h deleted file mode 100644 index ef40ddb..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// YMRoomSettingViewController.h -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import "MvpViewController.h" -#import "RoomHostDelegate.h" -NS_ASSUME_NONNULL_BEGIN -@class RoomInfoModel; -@interface XPRoomSettingViewController : MvpViewController -- (instancetype)initWithDelegate:(id)delegate; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.m deleted file mode 100644 index f3076bb..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.m +++ /dev/null @@ -1,653 +0,0 @@ -// -// YMRoomSettingViewController.m -// YUMI -// -// Created by YUMI on 2021/12/27. -// - -#import "XPRoomSettingViewController.h" -///Third -#import -///Tool -#import "ThemeColor+Room.h" -#import "YUMIMacroUitls.h" -#import "TTPopup.h" -#import "DESEncrypt.h" -#import "YUMIConstant.h" -#import "AccountInfoStorage.h" -#import "NSArray+Safe.h" -///Model -#import "RoomInfoModel.h" -#import "XPRoomSettingItemModel.h" -#import "AttachMentModel.h" -#import "MicroQueueModel.h" -#import "UserInfoModel.h" -#import "XPKickUserModel.h" -#import "GuildSuperAdminInfoModel.h" -///View -#import "XPRoomSettingTableViewCell.h" -#import "XPRoomSettingInputView.h" -#import "XPRoomTagListView.h" -///P -#import "XPRoomSettingPresenter.h" -#import "XPRoomSettingProtocol.h" -///VC -#import "XPRoomTagListViewController.h" -#import "XPRoomRoleViewController.h" -///Manager -#import "TurboModeStateManager.h" - -#import "UploadFile.h" - -@interface XPRoomSettingViewController () -///房间信息 -@property (nonatomic,strong) RoomInfoModel *roomInfo; -///列表 -@property (nonatomic,strong) UITableView *tableView; -///数据源 -@property (nonatomic,strong) NSArray *datasource; -///代理 -@property (nonatomic,weak) id hostDelegate; -///是否是公会超管 -@property (nonatomic,assign) BOOL meIsSuperAdmin; - -@property (nonatomic, assign) BOOL isUpdateAvatar; -@end - -@implementation XPRoomSettingViewController - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super init]) { - self.hostDelegate = delegate; - self.roomInfo = self.hostDelegate.getRoomInfo; - } - return self; -} - -- (XPRoomSettingPresenter *)createPresenter { - return [[XPRoomSettingPresenter alloc] init]; -} - -- (void)dealloc -{ - [self hideHUD]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - [self.presenter getRoomInfo:roomUid]; - ///自己是公会超管 - BOOL meIsSuperAdmin = NO; - for (GuildSuperAdminInfoModel *managerInfo in self.hostDelegate.getRoomSuperAdminList) { - if ([managerInfo.uid isEqualToString:[AccountInfoStorage instance].getUid]) { - meIsSuperAdmin = YES; - break; - } - } - self.meIsSuperAdmin = meIsSuperAdmin; - [self.presenter getRoomSettingList:self.roomInfo isSuperAdmin:meIsSuperAdmin]; - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPRoomSettingViewController0"); - [self.view addSubview:self.tableView]; -} - -- (void)initSubViewConstraints { - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -- (void)handleRoomLeaveMode { - [self showLoading]; - NSString * ownerUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - NSArray *chatRoomMicSequences = [self.hostDelegate.getMicroQueue allValues]; - ///房主是否在坑位上 - BOOL ownerIsOnMic = NO; - NSString * ownerPosition; - if (chatRoomMicSequences != nil && chatRoomMicSequences.count > 0) { - for (int i = 0; i < chatRoomMicSequences.count; i ++) { - MicroQueueModel *micqueueModel = chatRoomMicSequences[i]; - if (micqueueModel.userInfo && micqueueModel.userInfo.uid > 0) { - if (micqueueModel.userInfo.uid == ownerUid.integerValue) { - ownerIsOnMic = YES; - ownerPosition = [NSString stringWithFormat:@"%d", micqueueModel.microState.position]; - break; - } - } - } - } - NSString * roomId = [NSString stringWithFormat:@"%ld", self.roomInfo.roomId]; - ///能设置离线模式的只有房主 - if (ownerIsOnMic) { - NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; - request.key = ownerPosition; - request.roomId = roomId; - [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { - - }]; - } - - NSString *position = @"-1"; // 房主位 - UserInfoModel *onMicInfo = [self.hostDelegate.getMicroQueue objectForKey:position].userInfo; - if (onMicInfo) { - NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; - request.key = @"-1"; - request.roomId =roomId; - [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { - if (error == nil) { - XPKickUserModel *notifyModel = [[XPKickUserModel alloc] init]; - notifyModel.handleNick = onMicInfo.nick; - notifyModel.handleUid = [AccountInfoStorage instance].getUid.integerValue; - notifyModel.targetUid = onMicInfo.uid; - notifyModel.targetNick = onMicInfo.nick; - notifyModel.uid = onMicInfo.uid; - AttachmentModel *attachment = [[AttachmentModel alloc] init]; - attachment.first = CustomMessageType_Queue; - attachment.second = Custom_Message_Sub_Queue_Kick; - attachment.data = [notifyModel model2dictionary]; - - NSString * sessionId = [NSString stringWithFormat:@"%ld", self.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]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - } - }]; - } - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.6 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - [self hideHUD]; - [self.presenter openRoomLeaveMode:roomUid]; - }); - -} - -#pragma mark - UITableViewDelegate And UITableViewDataSource -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return self.datasource.count; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.datasource[section].count; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - XPRoomSettingTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomSettingTableViewCell class])]; - if (cell == nil) { - cell = [[XPRoomSettingTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPRoomSettingTableViewCell class])]; - } - cell.delegate = self; - cell.itemModel = [[self.datasource xpSafeObjectAtIndex:indexPath.section] xpSafeObjectAtIndex:indexPath.row]; - return cell; -} - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { -XPRoomSettingItemModel * itemModel = [[self.datasource xpSafeObjectAtIndex:indexPath.section] xpSafeObjectAtIndex:indexPath.row]; - if (itemModel.type == RoomSettingItemType_Leave_Model && itemModel.switchState) { - return 60; - } - return 50; -} - --(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section { - UIView * view = [[UIView alloc] init]; - view.frame = CGRectMake(0, 0, KScreenWidth, 10); - view.backgroundColor = [UIColor clearColor]; - return view; -} -- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { - return 10; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - [tableView deselectRowAtIndexPath:indexPath animated:YES]; - XPRoomSettingItemModel * itemModel = [[self.datasource xpSafeObjectAtIndex:indexPath.section] xpSafeObjectAtIndex:indexPath.row]; - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - NSString * roomId = [NSString stringWithFormat:@"%ld", self.roomInfo.roomId]; - NSString * roomTag = [NSString stringWithFormat:@"%ld", self.roomInfo.tagId]; - NSString *roomClassifyId = self.roomInfo.singleRoomSortId; - switch (itemModel.type) { - case RoomSettingItemType_Class: - { - XPRoomTagListView *view = [[XPRoomTagListView alloc] init]; - view.tagType = RoomSettingSelectTagTypeClassify; - view.tagId = self.roomInfo.singleRoomSortId; - view.completion = ^(NSString * _Nonnull tag) { - NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:tag hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId backPic:self.roomInfo.backPic avatar:self.roomInfo.avatar]; - }; - [TTPopup popupView:view style:TTPopupStyleAlert]; - } - break; - case RoomSettingItemType_Tag: - { - XPRoomTagListView *view = [[XPRoomTagListView alloc] init]; - view.tagType = RoomSettingSelectTagTypeTag; - view.tagId = [NSString stringWithFormat:@"%ld", self.roomInfo.tagId]; - view.completion = ^(NSString * _Nonnull tag) { - NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:tag classifyId:roomClassifyId hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId backPic:self.roomInfo.backPic avatar:self.roomInfo.avatar]; - }; - [TTPopup popupView:view style:TTPopupStyleAlert]; - } - break; - case RoomSettingItemType_Avatar: { - @kWeakify(self); - [YYUtility checkAssetsLibrayAvailable:^{ - @kStrongify(self); - UIImagePickerController *imagePicker = [[UIImagePickerController alloc] init]; - imagePicker.modalPresentationCapturesStatusBarAppearance = YES; - imagePicker.delegate = self; - imagePicker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; - imagePicker.allowsEditing = YES; - [self presentViewController:imagePicker - animated:YES - completion:nil]; - } denied:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"XPMineUserInfoEditViewController7") content:YMLocalizedString(@"XPMineUserInfoEditViewController8")]; - } restriction:^{ - @kStrongify(self); - [self showNotPhoto:YMLocalizedString(@"XPMineUserInfoEditViewController9") content:YMLocalizedString(@"XPMineUserInfoEditViewController10")]; - }]; - } - break; - case RoomSettingItemType_Title: - { - XPRoomSettingInputView * titleView = [[XPRoomSettingInputView alloc] init]; - titleView.maxCount = 15; - titleView.delegate = self; - titleView.type = RoomSettingInputType_Title; - titleView.placeHolder = self.roomInfo.title; - [TTPopup popupView:titleView style:TTPopupStyleAlert]; - } - break; - - case RoomSettingItemType_Pwd: - { - XPRoomSettingInputView * titleView = [[XPRoomSettingInputView alloc] init]; - titleView.maxCount = 8; - titleView.delegate = self; - titleView.type = RoomSettingInputType_Pwd; - NSString * roomPwd = [DESEncrypt decryptUseDES:self.roomInfo.roomPwd key:KeyWithType(KeyType_PasswordEncode)]; - titleView.placeHolder = roomPwd; - [TTPopup popupView:titleView style:TTPopupStyleAlert]; - } - break; - case RoomSettingItemType_Manager_List: - { - XPRoomRoleViewController * managerVC = [[XPRoomRoleViewController alloc] init]; - managerVC.superAdmminList = self.hostDelegate.getRoomSuperAdminList; - managerVC.roomId = roomId; - managerVC.type = RoomRoleListType_Manager; - [self.navigationController pushViewController:managerVC animated:YES]; - } - break; - case RoomSettingItemType_Black_List: - { - XPRoomRoleViewController * managerVC = [[XPRoomRoleViewController alloc] init]; - managerVC.roomId = roomId; - managerVC.type = RoomRoleListType_Black; - [self.navigationController pushViewController:managerVC animated:YES]; - } - break; - - default: - break; - } -} - -- (void)showNotPhoto:(NSString *)title content:(NSString *)content { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = title; - config.message = content; - - [TTPopup alertWithConfig:config confirmHandler:^{ - NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - if ([[UIApplication sharedApplication] canOpenURL:url]) { - [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) { - - }]; - } - } cancelHandler:^{ - }]; -} - -#pragma mark - XPRoomSettingInputViewDelegate -- (void)xPRoomSettingInputView:(XPRoomSettingInputView *)view didClickConfirm:(NSString *)text type:(RoomSettingInputType)type { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - NSString * roomId = [NSString stringWithFormat:@"%ld", self.roomInfo.roomId]; - NSString * roomTag = [NSString stringWithFormat:@"%ld", self.roomInfo.tagId]; - NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - NSString * roomClassifyId = self.roomInfo.singleRoomSortId; - if (type == RoomSettingInputType_Pwd) { - // TODO: 處理輸入內容為空的情況 - NSString *pwdDes = [DESEncrypt encryptUseDES:text key:KeyWithType(KeyType_PasswordEncode)]; - [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:pwdDes tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:RoomSettingItemType_Pwd mgId:mgId backPic:self.roomInfo.backPic avatar:self.roomInfo.avatar]; - } else if(type == RoomSettingInputType_Title) { - [self.presenter updateRoomInfo:text roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:RoomSettingItemType_Title mgId:mgId backPic:self.roomInfo.backPic avatar:self.roomInfo.avatar]; - } -} - -- (void)didClickCancel:(RoomSettingInputType)type { -// if (type == RoomSettingItemType_Pwd) { -// } -} - -#pragma mark - XPRoomSettingTableViewCellDelegate -- (void)didChangeSwitch:(UISwitch *)switchView itemModel:(XPRoomSettingItemModel *)itemModel { - BOOL isOn = switchView.on; - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - NSString * roomId = [NSString stringWithFormat:@"%ld", self.roomInfo.roomId]; - NSString * roomTag = [NSString stringWithFormat:@"%ld", self.roomInfo.tagId]; - NSString * roomClassifyId = self.roomInfo.singleRoomSortId; - switch (itemModel.type) { - case RoomSettingItemType_Arrange_Mic: - { - if (self.roomInfo.roomModeType == RoomModeType_Open_Blind) return; - NSString *msg; - if (isOn) { - msg = YMLocalizedString(@"XPRoomSettingViewController1"); - } else { - msg = YMLocalizedString(@"XPRoomSettingViewController2"); - } - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPRoomSettingViewController3"); - config.message = msg; - config.shouldDismissOnBackgroundTouch = NO; - [TTPopup alertWithConfig:config confirmHandler:^{ - if (isOn) { - [self.presenter openRoomArrangeMic:roomUid]; - }else { - [self.presenter closeRoomArrangeMic:roomUid]; - } - } cancelHandler:^{ - [switchView setOn:!switchView.isOn]; - }]; - - } - break; - case RoomSettingItemType_Leave_Model: - { - if (!isOn) { - [self.presenter closeRoomLeaveMode:roomUid]; - return; - } - - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.message = YMLocalizedString(@"XPRoomSettingViewController4" ); - config.shouldDismissOnBackgroundTouch = NO; - - [TTPopup alertWithConfig:config confirmHandler:^{ - [self handleRoomLeaveMode]; - } cancelHandler:^{ - [switchView setOn:!switchView.isOn]; - }]; - } - break; - case RoomSettingItemType_Lock: - { - if (isOn) { - XPRoomSettingInputView * titleView = [[XPRoomSettingInputView alloc] init]; - titleView.maxCount = 8; - titleView.delegate = self; - titleView.type = RoomSettingInputType_Pwd; - [TTPopup popupView:titleView style:TTPopupStyleAlert]; - } else { - NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - [self.presenter updateRoomInfo:self.roomInfo.title - roomPwd:@"" - tagId:roomTag - classifyId:roomClassifyId - hasAnimationEffect:self.roomInfo.hasAnimationEffect - roomUid:roomUid - roomId:roomId - type:self.roomInfo.type - itemType:itemModel.type - mgId:mgId - backPic:self.roomInfo.backPic - avatar:self.roomInfo.avatar]; - } - } - break; - case RoomSettingItemType_Gift_Effect: - { - if (isOn) { - NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:YES roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId backPic:self.roomInfo.backPic avatar:self.roomInfo.avatar]; - return; - } - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPRoomSettingViewController5"); - config.message = YMLocalizedString(@"XPRoomSettingViewController6"); - config.shouldDismissOnBackgroundTouch = NO; - - [TTPopup alertWithConfig:config confirmHandler:^{ - NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:NO roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId backPic:self.roomInfo.backPic avatar:self.roomInfo.avatar]; - } cancelHandler:^{ - [switchView setOn:!switchView.isOn]; - }]; - } - break; - case RoomSettingItemType_Message_Screen: - { - if (isOn) { - [self.presenter updateRoomMessageScreenState:NO roomId:roomId]; - return; - } - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPRoomSettingViewController7"); - config.message = YMLocalizedString(@"XPRoomSettingViewController8"); - config.shouldDismissOnBackgroundTouch = NO; - [TTPopup alertWithConfig:config confirmHandler:^{ - [self.presenter updateRoomMessageScreenState:YES roomId:roomId]; - } cancelHandler:^{ - [switchView setOn:!switchView.isOn]; - }]; - } - break; - case RoomSettingItemType_Gift_Value_Model: - { - if (self.roomInfo.roomModeType == RoomModeType_Open_Blind) { - [self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController2")]; - return; - } - - if(isOn){ - [self.presenter openRoomGiftValue:roomUid itemModel:itemModel]; - return; - } - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.title = @""; - config.message = YMLocalizedString(@"XPRoomMoreMenuViewController3"); - [TTPopup alertWithConfig:config confirmHandler:^{ - [self.presenter closeRoomGiftValue:roomUid itemModel:itemModel]; - } cancelHandler:^{ - [switchView setOn:!switchView.isOn]; - }]; - break; - } - default: - break; - } -} - - -#pragma mark - UIImagePickerControllerDelegate -- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info -{ - self.isUpdateAvatar = YES; - UIImage *selectedPhoto = [info objectForKey:UIImagePickerControllerEditedImage]; - if (selectedPhoto) { -// [self showLoading]; - NSData *data = UIImageJPEGRepresentation(selectedPhoto, 0.5); - NSString *format = [UIImage getImageTypeWithImageData:data]; - NSString *name = [NSString stringWithFormat:@"image/%@.%@",[NSString createUUID],format]; - @kWeakify(self); - [[UploadFile share] QCloudUploadImage:data named:name success:^(NSString * _Nonnull key, NSDictionary * _Nonnull resp) { - @kStrongify(self); - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - NSString * roomId = [NSString stringWithFormat:@"%ld", self.roomInfo.roomId]; - NSString * roomTag = [NSString stringWithFormat:@"%ld", self.roomInfo.tagId]; - NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - NSString * roomClassifyId = self.roomInfo.singleRoomSortId; - [self.presenter updateRoomInfo:self.roomInfo.title - roomPwd:self.roomInfo.roomPwd - tagId:roomTag - classifyId:roomClassifyId - hasAnimationEffect:self.roomInfo.hasAnimationEffect - roomUid:roomUid roomId:roomId - type:self.roomInfo.type - itemType:RoomSettingItemType_Avatar - mgId:mgId - backPic:self.roomInfo.backPic - avatar:key]; - } failure:^(NSNumber * _Nonnull resCode, NSString * _Nonnull message) { - - }]; - } - [picker dismissViewControllerAnimated:YES completion:^{}]; -} - -- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker{ - [picker dismissViewControllerAnimated:YES completion:^{ - }]; -} - -#pragma mark - XPRoomSettingProtocol - --(void)closeRoomGiftValueSuccessWithItemModel:(XPRoomSettingItemModel *)itemModel{ - itemModel.switchState = !itemModel.switchState; - [self.tableView reloadData]; - [self showSuccessToast:YMLocalizedString(@"XPRoomMoreMenuViewController1")]; -} --(void)closeRoomGiftValueFailWithItemModel:(XPRoomSettingItemModel *)itemModel{ - - [self.tableView reloadData]; -} --(void)openRoomGiftValueSuccessWithItemModel:(XPRoomSettingItemModel *)itemModel{ - itemModel.switchState = !itemModel.switchState; - [self.tableView reloadData]; - [self showSuccessToast:YMLocalizedString(@"XPRoomMoreMenuViewController0")]; -} --(void)openRoomGiftValueFailWithItemModel:(XPRoomSettingItemModel *)itemModel{ - [self.tableView reloadData]; -} - -- (void)getRoomSettingListSuccess:(NSArray *)list { - self.datasource = list; - [self.tableView reloadData]; -} - -- (void)getRoomInfoSuccess:(RoomInfoModel *)roomInfo { - self.roomInfo = roomInfo; - [self.presenter getRoomSettingList:roomInfo isSuperAdmin:self.meIsSuperAdmin]; -} - -- (void)openRoomArrangeMicSuccess { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - [self.presenter getRoomInfo:roomUid]; -} - -- (void)closeRoomArrangeMicSuccess { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - [self.presenter getRoomInfo:roomUid]; -} - -- (void)updateRoomMessageScreenStateSuccess:(RoomInfoModel *)roomInfo { - - if (self.hostDelegate) { - [self.hostDelegate updateScreenMessageState:roomInfo.isCloseScreen]; - } - - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - [self.presenter getRoomInfo:roomUid]; - ///发送公屏关闭开启的消息 - NSString *sessionID = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - AttachmentModel *attachement = [[AttachmentModel alloc]init]; - attachement.first = CustomMessageType_Update_RoomInfo; - attachement.second = Custom_Message_Sub_Update_RoomInfo_MessageState; - attachement.data = [roomInfo model2dictionary]; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachement; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:sessionID type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; -} - -- (void)updateRoomInfoSuccess:(RoomInfoModel *)roomInfo itemType:(RoomSettingItemType)itemType { - if (self.isUpdateAvatar) { - self.isUpdateAvatar = NO; - [self showSuccessToast:YMLocalizedString(@"XPMineUserInfoEditViewController13")]; - } - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - [self.presenter getRoomInfo:roomUid]; - if (itemType == RoomSettingItemType_Gift_Effect) { - // 🔧 新增：同步房间礼物特效状态到TurboModeStateManager - NSString *roomId = @(roomInfo.roomId).stringValue; - [[TurboModeStateManager sharedManager] updateGiftEffectsForRoom:roomId enabled:roomInfo.hasAnimationEffect]; - NSLog(@"🎮 XPRoomSettingViewController: 房间礼物特效状态已同步到TurboModeStateManager - 房间ID: %@, hasAnimationEffect: %@", - roomId, roomInfo.hasAnimationEffect ? @"开启" : @"关闭"); - - NSString *sessionID = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - AttachmentModel *attachement = [[AttachmentModel alloc]init]; - attachement.first = CustomMessageType_Update_RoomInfo; - attachement.second = Custom_Message_Sub_Update_RoomInfo_AnimateEffect; - attachement.data = [roomInfo model2dictionary]; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachement; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:sessionID type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - } -} - -- (void)updateRoomInfoFail:(NSString *)message { - self.isUpdateAvatar = NO; - [self showErrorToast:message]; -} - -- (void)openRoomLeaveModeSuccess { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - [self.presenter getRoomInfo:roomUid]; -} - -- (void)closeRoomLeaveModeSuccess { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - [self.presenter getRoomInfo:roomUid]; -} - -#pragma mark - Getters And Setters -- (UITableView *)tableView { - if (!_tableView) { - _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; - _tableView.delegate = self; - _tableView.dataSource = self; - _tableView.tableFooterView = [UIView new]; - _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - _tableView.backgroundColor = [UIColor clearColor]; - if (@available(iOS 11.0, *)) { - _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - [_tableView registerClass:[XPRoomSettingTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomSettingTableViewCell class])]; - } - return _tableView; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListView.h b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListView.h deleted file mode 100644 index c89d1e6..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListView.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// YMRoomTagListView.h -// YUMI -// -// Created by YUMI on 2022/7/20. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSUInteger, RoomSettingSelectTagType) { - RoomSettingSelectTagTypeTag,///房间标签 - RoomSettingSelectTagTypeClassify,///房间分类 -}; - -typedef void(^DidClickRoomTagCompletion)(NSString *tag); - -@interface XPRoomTagListView : UIView - -///选中的tagid -@property (nonatomic,copy) NSString *tagId; -///选择完成了 -@property (nonatomic,copy) DidClickRoomTagCompletion completion; -///标签类型 -@property (nonatomic, assign) RoomSettingSelectTagType tagType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListView.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListView.m deleted file mode 100644 index 6d118f4..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListView.m +++ /dev/null @@ -1,244 +0,0 @@ -// -// YMRoomTagListView.m -// YUMI -// -// Created by YUMI on 2022/7/20. -// - -#import "XPRoomTagListView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "TTPopup.h" -#import "UIImage+Utils.h" -#import "NSArray+Safe.h" -///Model -#import "RoomTagModel.h" -#import "RoomClassifyModel.h" -///View -#import "XPRoomSettingTagCell.h" -///P -#import "XPRoomTagPresenter.h" -#import "XPRoomTagProtocol.h" - -#import "Api+RoomSetting.h" -#import "AccountInfoStorage.h" -#import "XNDJTDDLoadingTool.h" - -@interface XPRoomTagListView() - -///完成 -@property (nonatomic, strong) UIButton *confirmButton; -///显示标题 -@property (nonatomic, strong) UILabel *titleLabel; -///列表 -@property (nonatomic, strong) UICollectionView *collectionView; -///数据 -@property (nonatomic,strong) NSArray *datasource; -///选中的tag -@property (nonatomic,strong) RoomTagModel *selectTagInfo; -///选中的分类 -@property (nonatomic, strong) RoomClassifyModel *selectClassifyInfo; - -@end - -@implementation XPRoomTagListView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)setTagType:(RoomSettingSelectTagType)tagType { - _tagType = tagType; - NSString * uid = [AccountInfoStorage instance].getUid; - if (tagType == RoomSettingSelectTagTypeTag) { - [Api getRoomTagList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [RoomTagModel modelsWithArray:data.data]; - self.datasource = array; - [self.collectionView reloadData]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - [TTPopup dismiss]; - } - } uid:uid]; - } else { - self.titleLabel.text = YMLocalizedString(@"XPRoomTagListView0"); - [Api getRoomClassifyList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSArray * array = [RoomClassifyModel modelsWithArray:data.data]; - self.datasource = array; - [self.collectionView reloadData]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - [TTPopup dismiss]; - } - } uid:uid]; - } -} - -#pragma mark - Private Method -- (void)initSubViews { - self.backgroundColor = [UIColor whiteColor]; - self.layer.cornerRadius = 12; - self.layer.masksToBounds = YES; - [self addSubview:self.confirmButton]; - [self addSubview:self.titleLabel]; - [self addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(320); - make.height.mas_equalTo(227); - }]; - [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(38); - make.leading.trailing.mas_equalTo(self).inset(30); - make.bottom.mas_equalTo(-15); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(15); - make.centerX.mas_equalTo(self); - make.height.mas_equalTo(21); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(26); - make.leading.trailing.mas_equalTo(self).inset(32); - make.bottom.mas_equalTo(self.confirmButton.mas_top).offset(-30); - }]; -} - -#pragma mark - UICollectionViewDataSource -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPRoomSettingTagCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPRoomSettingTagCell class]) forIndexPath:indexPath]; - if (self.tagType == RoomSettingSelectTagTypeTag) { - RoomTagModel *homeTag = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (self.selectTagInfo) { - if (homeTag.tid.intValue == self.selectTagInfo.tid.intValue) { - homeTag.isSelect = YES; - }else { - homeTag.isSelect = NO; - } - } else { - if (homeTag.tid.intValue == self.tagId.intValue) { - homeTag.isSelect = YES; - }else { - homeTag.isSelect = NO; - } - } - cell.roomTag = homeTag; - } else { - RoomClassifyModel *homeTag = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (self.selectClassifyInfo) { - if (homeTag.cid.intValue == self.selectClassifyInfo.cid.intValue) { - homeTag.isSelect = YES; - }else { - homeTag.isSelect = NO; - } - } else { - if (homeTag.cid.intValue == self.tagId.intValue) { - homeTag.isSelect = YES; - }else { - homeTag.isSelect = NO; - } - } - cell.roomClassify = homeTag; - } - return cell; -} - -- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ - return UIEdgeInsetsMake(10, 0, 10, 0);; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.tagType == RoomSettingSelectTagTypeTag) { - RoomTagModel *homeTag = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - CGFloat width = [homeTag.name boundingRectWithSize:CGSizeMake(200, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.width; - return CGSizeMake(width + 26, 26); - } else { - RoomClassifyModel *homeTag = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - CGFloat width = [homeTag.sortName boundingRectWithSize:CGSizeMake(200, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.width; - return CGSizeMake(width + 26, 26); - } -} - -#pragma mark - UICollectionViewDelegate -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (self.tagType == RoomSettingSelectTagTypeTag) { - RoomTagModel * roomTag = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - self.selectTagInfo = roomTag; - } else { - RoomClassifyModel *roomClassify = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - self.selectClassifyInfo = roomClassify; - } - [collectionView reloadData]; -} - -#pragma mark - Event Response -- (void)confirmButtonAction:(UIButton *)sender { - [TTPopup dismiss]; - if (self.completion) { - if (self.tagType == RoomSettingSelectTagTypeTag) { - self.completion(self.selectTagInfo.tid); - } else { - self.completion(self.selectClassifyInfo.cid); - } - } -} - -#pragma mark - Getter & Setter -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightSemibold]; - _titleLabel.text = YMLocalizedString(@"XPRoomTagListView1"); - } - return _titleLabel; -} - -- (UICollectionView *)collectionView { - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionVertical; - layout.minimumLineSpacing = 16; - layout.minimumInteritemSpacing = 10; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.showsVerticalScrollIndicator = NO; - _collectionView.showsHorizontalScrollIndicator = NO; - [_collectionView registerClass:[XPRoomSettingTagCell class] forCellWithReuseIdentifier:NSStringFromClass([XPRoomSettingTagCell class])]; - } - return _collectionView; -} - -- (UIButton *)confirmButton { - if (_confirmButton == nil) { - _confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_confirmButton setTitle:YMLocalizedString(@"XPRoomTagListView2") forState:UIControlStateNormal]; - _confirmButton.titleLabel.font = [UIFont systemFontOfSize:14]; - [_confirmButton addTarget:self action:@selector(confirmButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _confirmButton.layer.masksToBounds = YES; - _confirmButton.layer.cornerRadius = 19; - [_confirmButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - return _confirmButton; -} -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.h b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.h deleted file mode 100644 index 9a44284..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMRoomTagListViewController.h -// YUMI -// -// Created by YUMI on 2021/12/28. -// - -#import "MvpViewController.h" - -typedef NS_ENUM(NSUInteger, RoomSettingTagType) { - RoomSettingTagTypeTag,///房间标签 - RoomSettingTagTypeClassify,///房间分类 -}; - -NS_ASSUME_NONNULL_BEGIN - -typedef void(^DidClickCompletion)(NSString *tag); - -@interface XPRoomTagListViewController : MvpViewController -///选中的tagid -@property (nonatomic,copy) NSString *tagId; -///选择完成了 -@property (nonatomic,copy) DidClickCompletion completion; -///标签类型 -@property (nonatomic, assign) RoomSettingTagType tagType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.m deleted file mode 100644 index 11453f8..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.m +++ /dev/null @@ -1,246 +0,0 @@ -// -// YMRoomTagListViewController.m -// YUMI -// -// Created by YUMI on 2021/12/28. -// - -#import "XPRoomTagListViewController.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "NSArray+Safe.h" -///Model -#import "RoomTagModel.h" -#import "RoomClassifyModel.h" -///View -#import "XPRoomSettingTagCell.h" -///P -#import "XPRoomTagPresenter.h" -#import "XPRoomTagProtocol.h" - -@interface XPRoomTagListViewController () -///关闭按钮 -@property (nonatomic, strong) UIButton *closeButton; -///完成 -@property (nonatomic, strong) UIButton *confirmButton; -///显示标题 -@property (nonatomic, strong) UILabel *titleLabel; -///列表 -@property (nonatomic, strong) UICollectionView *collectionView; -///数据 -@property (nonatomic,strong) NSArray *datasource; -///选中的tag -@property (nonatomic,strong) RoomTagModel *selectTagInfo; -///选中的分类 -@property (nonatomic, strong) RoomClassifyModel *selectClassifyInfo; - -@end - -@implementation XPRoomTagListViewController - -- (XPRoomTagPresenter *)createPresenter { - return [[XPRoomTagPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - if (self.tagType == RoomSettingTagTypeTag) { - [self.presenter getRoomTagList]; - } else { - [self.presenter getRoomClassifyList]; - self.titleLabel.text = YMLocalizedString(@"XPRoomTagListViewController0"); - } - [self initSubViews]; - [self initSubViewConstraints]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.view.backgroundColor = [UIColor colorWithWhite:0 alpha:0.95]; - [self.view addSubview:self.confirmButton]; - [self.view addSubview:self.closeButton]; - [self.view addSubview:self.titleLabel]; - [self.view addSubview:self.collectionView]; -} - -- (void)initSubViewConstraints { - [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(44); - make.leading.trailing.mas_equalTo(self.view).inset(90); - make.bottom.mas_equalTo(-100); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(32); - make.top.mas_equalTo(kStatusBarHeight + 6); - make.trailing.mas_equalTo(-23+5); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(135); - make.leading.mas_equalTo(44); - make.height.mas_equalTo(24); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(30); - make.leading.trailing.mas_equalTo(self.view).inset(44); - make.bottom.mas_equalTo(self.confirmButton.mas_top).offset(-30); - }]; -} - -#pragma mark - XPRoomTagProtocol -- (void)getRoomTagListSuccess:(NSArray *)array { - self.datasource = array; - [self.collectionView reloadData]; -} - - -- (void)getRoomClassifyListSuccess:(NSArray *)array { - self.datasource = array; - [self.collectionView reloadData]; -} - -#pragma mark - UICollectionViewDataSource -- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView { - return 1; -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPRoomSettingTagCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPRoomSettingTagCell class]) forIndexPath:indexPath]; - if (self.tagType == RoomSettingTagTypeTag) { - RoomTagModel *homeTag = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (self.selectTagInfo) { - if (homeTag.tid.intValue == self.selectTagInfo.tid.intValue) { - homeTag.isSelect = YES; - }else { - homeTag.isSelect = NO; - } - } else { - if (homeTag.tid.intValue == self.tagId.intValue) { - homeTag.isSelect = YES; - }else { - homeTag.isSelect = NO; - } - } - cell.roomTag = homeTag; - } else { - RoomClassifyModel *homeTag = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - if (self.selectClassifyInfo) { - if (homeTag.cid.intValue == self.selectClassifyInfo.cid.intValue) { - homeTag.isSelect = YES; - }else { - homeTag.isSelect = NO; - } - } else { - if (homeTag.cid.intValue == self.tagId.intValue) { - homeTag.isSelect = YES; - }else { - homeTag.isSelect = NO; - } - } - cell.roomClassify = homeTag; - } - return cell; -} - -- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ - return UIEdgeInsetsMake(10, 0, 10, 0);; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - if (self.tagType == RoomSettingTagTypeTag) { - RoomTagModel *homeTag = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - CGFloat width = [homeTag.name boundingRectWithSize:CGSizeMake(200, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.width; - return CGSizeMake(width + 26, 26); - } else { - RoomClassifyModel *homeTag = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - CGFloat width = [homeTag.sortName boundingRectWithSize:CGSizeMake(200, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.width; - return CGSizeMake(width + 26, 26); - } -} - -#pragma mark - UICollectionViewDelegate -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - if (self.tagType == RoomSettingTagTypeTag) { - RoomTagModel * roomTag = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - self.selectTagInfo = roomTag; - } else { - RoomClassifyModel *roomClassify = [self.datasource xpSafeObjectAtIndex:indexPath.row]; - self.selectClassifyInfo = roomClassify; - } - [collectionView reloadData]; -} - -#pragma mark - Event Response -- (void)confirmButtonAction:(UIButton *)sender { - [self dismissViewControllerAnimated:YES completion:nil]; - if (self.completion) { - if (self.tagType == RoomSettingTagTypeTag) { - self.completion(self.selectTagInfo.tid); - } else { - self.completion(self.selectClassifyInfo.cid); - } - } -} - -- (void)closeButtonAction:(UIButton *)sender { - [self dismissViewControllerAnimated:YES completion:nil]; -} -#pragma mark - Getter & Setter -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textColor = UIColor.whiteColor; - _titleLabel.font = [UIFont systemFontOfSize:22]; - _titleLabel.text = YMLocalizedString(@"XPRoomTagListViewController1"); - } - return _titleLabel; -} - -- (UICollectionView *)collectionView { - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.minimumLineSpacing = 10; - layout.minimumInteritemSpacing = 10; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.showsVerticalScrollIndicator = NO; - _collectionView.showsHorizontalScrollIndicator = NO; - [_collectionView registerClass:[XPRoomSettingTagCell class] forCellWithReuseIdentifier:NSStringFromClass([XPRoomSettingTagCell class])]; - } - return _collectionView; -} - -- (UIButton *)closeButton { - if (_closeButton == nil) { - _closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeButton setImage:[UIImage imageNamed:@"room_setting_tag_close"] forState:UIControlStateNormal]; - [_closeButton addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -- (UIButton *)confirmButton { - if (_confirmButton == nil) { - _confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_confirmButton setTitle:YMLocalizedString(@"XPRoomTagListViewController2") forState:UIControlStateNormal]; - _confirmButton.titleLabel.font = [UIFont systemFontOfSize:16]; - _confirmButton.backgroundColor = [DJDKMIMOMColor mainTextColor]; - [_confirmButton addTarget:self action:@selector(confirmButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - _confirmButton.layer.masksToBounds = YES; - _confirmButton.layer.cornerRadius = 22; - } - return _confirmButton; -} -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.h b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.h deleted file mode 100644 index 8007010..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMRoomTopicAlertView.h -// YUMI -// -// Created by YUMI on 2022/3/15. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomTopicAlertView : UIView -///显示标题 -@property (nonatomic,copy) NSString *title; -///显示内容 -@property (nonatomic,copy) NSString *message; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.m deleted file mode 100644 index 7b1131d..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.m +++ /dev/null @@ -1,131 +0,0 @@ -// -// YMRoomTopicAlertView.m -// YUMI -// -// Created by YUMI on 2022/3/15. -// - -#import "XPRoomTopicAlertView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "TTPopup.h" -#import "YUMIMacroUitls.h" - -@interface XPRoomTopicAlertView () - -///显示标题 -@property (nonatomic,strong) UILabel *titleLabel; -///显示文本 -@property (nonatomic,strong) SZTextView *textView; -///关闭按钮 -@property (nonatomic,strong) UIButton *closeButton; - -@end - -@implementation XPRoomTopicAlertView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - for (id view in self.textView.subviews) { - if ([view isKindOfClass:[UITextView class]]){ - UITextView *textView = view; - textView.textAlignment = NSTextAlignmentLeft; - break; - } - } - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.layer.masksToBounds = YES; - self.layer.cornerRadius = 15; - self.backgroundColor = [UIColor whiteColor]; - [self addSubview:self.titleLabel]; - [self addSubview:self.textView]; - [self addSubview:self.closeButton]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth - 40 * 2); - make.bottom.mas_equalTo(self.closeButton.mas_bottom).offset(20); - }]; - - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self).inset(20); - }]; - - [self.textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self).inset(20); - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(15); - make.height.mas_equalTo(200); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(124, 44)); - make.top.mas_equalTo(self.textView.mas_bottom).offset(20); - make.centerX.mas_equalTo(self); - }]; -} - -#pragma mark - Event Response -- (void)closeButtonAction:(UIButton *)sender { - [TTPopup dismiss]; -} - -#pragma mark - Getters And Setters -- (void)setTitle:(NSString *)title { - _title = title; - self.titleLabel.text = _title.length > 0 ? _title : YMLocalizedString(@"XPRoomTopicAlertView0"); -} - -- (void)setMessage:(NSString *)message { - _message = message; - self.textView.text = _message.length > 0 ? _message : YMLocalizedString(@"XPRoomTopicAlertView1"); -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.font = [UIFont fontWithName:@"PingFangSC-Medium" size:16]; - _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; - } - return _titleLabel; -} - -- (SZTextView *)textView { - if (!_textView) { - _textView = [[SZTextView alloc] init]; - _textView.textColor = [DJDKMIMOMColor mainTextColor]; - _textView.backgroundColor = [UIColor clearColor]; - _textView.font = [UIFont systemFontOfSize:15]; - _textView.editable = NO; - } - return _textView; -} - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeButton setTitle:YMLocalizedString(@"XPRoomTopicAlertView2") forState:UIControlStateNormal]; - [_closeButton setTitleColor:[DJDKMIMOMColor cancelButtonTextColor] forState:UIControlStateNormal]; - _closeButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_closeButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _closeButton.layer.masksToBounds = YES; - _closeButton.layer.cornerRadius = 22; - [_closeButton addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.h b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.h deleted file mode 100644 index 3d5a8f2..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMRoomTopicViewController.h -// YUMI -// -// Created by YUMI on 2022/3/14. -// - -#import "MvpViewController.h" - -NS_ASSUME_NONNULL_BEGIN -@class RoomInfoModel; -@interface XPRoomTopicViewController : MvpViewController -///房间信息 -@property (nonatomic,strong) RoomInfoModel *roomInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m deleted file mode 100644 index ab5e3a8..0000000 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m +++ /dev/null @@ -1,253 +0,0 @@ -// -// YMRoomTopicViewController.m -// YUMI -// -// Created by YUMI on 2022/3/14. -// - -#import "XPRoomTopicViewController.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "YUMIMacroUitls.h" -///Model -#import "RoomInfoModel.h" -///P -#import "XPRoomTopicPresenter.h" -#import "XPRoomTopicProtocol.h" - -@interface XPRoomTopicViewController () -///显示标题 -@property (nonatomic,strong) MSBaseTextField *textField; -///标题显示多少个 -@property (nonatomic,strong) UILabel *titleNumberLabel; -///显示内容 -@property (nonatomic,strong) SZTextView *contentTextView; -///内容显示多少个 -@property (nonatomic,strong) UILabel *contentLabel; -///确认 -@property (nonatomic,strong) UIButton *confirmButton; -///容器 -@property (nonatomic,strong) UIView * contentView; -///占位的 -@property (nonatomic,strong) UILabel *placeLabel; -@end - -@implementation XPRoomTopicViewController - -- (XPRoomTopicPresenter *)createPresenter { - return [[XPRoomTopicPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - [self initSubViews]; - [self initSubViewConstraints]; - for (id view in self.contentTextView.subviews) { - if ([view isKindOfClass:[UITextView class]]){ - UITextView *textView = view; - textView.textAlignment = NSTextAlignmentLeft; - break; - } - } -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.view endEditing:YES]; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.title = YMLocalizedString(@"XPRoomTopicViewController0"); - [self.view addSubview:self.textField]; - [self.view addSubview:self.titleNumberLabel]; - [self.view addSubview:self.contentView]; - [self.view addSubview:self.contentLabel]; - [self.view addSubview:self.confirmButton]; - - [self.contentView addSubview:self.contentTextView]; - [self.contentView addSubview:self.placeLabel]; -} - -- (void)initSubViewConstraints { - [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(15); - make.height.mas_equalTo(44); - make.top.mas_equalTo(self.view).offset(15); - }]; - - [self.titleNumberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.view).offset(-15); - make.top.mas_equalTo(self.textField.mas_bottom).offset(5); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(15); - make.top.mas_equalTo(self.titleNumberLabel.mas_bottom).offset(15); - make.height.mas_equalTo(210); - }]; - - [self.contentTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.contentView).inset(5); - }]; - - [self.placeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.mas_equalTo(self.contentTextView); - }]; - - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.contentView);; - make.top.mas_equalTo(self.contentView.mas_bottom).offset(15); - }]; - - [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(47); - make.height.mas_equalTo(44); - make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 20); - }]; -} - -#pragma mark - UITextViewDelegate -- (void)textViewDidChange:(UITextView *)textView { - if (textView.text.length > 0) { - self.placeLabel.hidden = YES; - } else { - self.placeLabel.hidden = NO; - } - if (textView.text.length > 300) { - textView.text = [textView.text substringToIndex:300]; - } - self.contentLabel.text = [NSString stringWithFormat:@"%ld/300", textView.text.length]; -} - -- (void)textViewDidBeginEditing:(UITextView *)textView { - self.placeLabel.hidden = YES; -} - -#pragma mark - XPRoomTopicProtocol -- (void)updateRoomTopicSuccess { - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)updateRoomTopicFail:(NSString *)message { - [self showErrorToast:message]; -} - -#pragma mark - Event Response -- (void)confirmButtonAction:(UIButton *)sender { - if (self.textField.text.length <= 0) { - [self showErrorToast:YMLocalizedString(@"XPRoomTopicViewController1")]; - return; - } - [self.presenter roomTopicUpdate:self.textField.text introduction:self.contentTextView.text roomInfo:self.roomInfo]; -} - -- (void)textFiledDidChange:(UITextField *)textField { - if (textField.text.length > 15) { - textField.text = [textField.text substringToIndex:15]; - } - self.titleNumberLabel.text = [NSString stringWithFormat:@"%ld/15", textField.text.length]; -} - - -#pragma mark - Getters And Setters -- (void)setRoomInfo:(RoomInfoModel *)roomInfo { - _roomInfo = roomInfo; - if (_roomInfo) { - self.textField.text = _roomInfo.roomDesc; - self.contentTextView.text = _roomInfo.introduction; - self.titleNumberLabel.text = [NSString stringWithFormat:@"%ld/15", _roomInfo.roomDesc.length]; - self.contentLabel.text = [NSString stringWithFormat:@"%ld/300", _roomInfo.introduction.length]; - self.placeLabel.hidden = _roomInfo.introduction.length > 0; - } -} - -- (MSBaseTextField *)textField { - if (!_textField) { - _textField = [[MSBaseTextField alloc] init]; - _textField.layer.cornerRadius = 8; - _textField.layer.masksToBounds = YES; - _textField.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _textField.font = [UIFont systemFontOfSize:13]; - _textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPRoomTopicViewController2") attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [DJDKMIMOMColor textThirdColor]}]; - _textField.tintColor = [DJDKMIMOMColor appMainColor]; - _textField.textColor = [DJDKMIMOMColor mainTextColor]; - UIView *searchIconView = [[UIView alloc] init]; - searchIconView.frame = CGRectMake(0, 0, 7, 10); - _textField.leftView = searchIconView; - _textField.leftViewMode = UITextFieldViewModeAlways; - [_textField addTarget:self action:@selector(textFiledDidChange:) forControlEvents:UIControlEventEditingChanged]; - } - return _textField; -} - -- (UILabel *)titleNumberLabel { - if (!_titleNumberLabel) { - _titleNumberLabel = [[UILabel alloc] init]; - _titleNumberLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _titleNumberLabel.font = [UIFont systemFontOfSize:10]; - _titleNumberLabel.text = @"0/15"; - } - return _titleNumberLabel; -} - -- (SZTextView *)contentTextView { - if (!_contentTextView) { - _contentTextView = [[SZTextView alloc] init]; - _contentTextView.backgroundColor = [UIColor clearColor]; - _contentTextView.font = [UIFont systemFontOfSize:13]; - _contentTextView.tintColor = [UIColor clearColor]; - _contentTextView.textColor = [DJDKMIMOMColor mainTextColor]; - _contentTextView.tintColor = [DJDKMIMOMColor appMainColor]; - _contentTextView.delegate = self; - } - return _contentTextView; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [[UILabel alloc] init]; - _contentLabel.font = [UIFont systemFontOfSize:10]; - _contentLabel.textColor = [DJDKMIMOMColor mainTextColor]; - _contentLabel.text = @"0/300"; - } - return _contentLabel; -} - -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor]; - _contentView.layer.masksToBounds = YES; - _contentView.layer.cornerRadius = 8; - } - return _contentView; -} - -- (UILabel *)placeLabel { - if (!_placeLabel) { - _placeLabel = [[UILabel alloc] init]; - _placeLabel.text = YMLocalizedString(@"XPRoomTopicViewController3"); - _placeLabel.font = [UIFont systemFontOfSize:13]; - _placeLabel.textColor = [DJDKMIMOMColor secondTextColor]; - } - return _placeLabel; -} - -- (UIButton *)confirmButton { - if (!_confirmButton) { - _confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_confirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - [_confirmButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _confirmButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_confirmButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _confirmButton.layer.masksToBounds = YES; - _confirmButton.layer.cornerRadius = 22; - [_confirmButton addTarget:self action:@selector(confirmButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _confirmButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/AnchorPKStageView.h b/YuMi/Modules/YMRoom/View/StageView/AnchorPKStageView.h deleted file mode 100644 index 299f779..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/AnchorPKStageView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// AnchorPKStageView.h -// YUMI -// -// Created by YUMI on 2022/4/11. -// - -#import "StageView.h" -#import "MicMidpointRectManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface AnchorPKStageView : StageView - -@property (nonatomic, strong, readonly) MicMidpointRectManager *midpointRectManager; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/AnchorPKStageView.m b/YuMi/Modules/YMRoom/View/StageView/AnchorPKStageView.m deleted file mode 100644 index 608c288..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/AnchorPKStageView.m +++ /dev/null @@ -1,352 +0,0 @@ -// -// AnchorPKStageView.m -// YUMI -// -// Created by YUMI on 2022/4/11. -// - -#import "AnchorPKStageView.h" -#import "MicMidpointRectManager.h" -///Third -#import -#import -#import -///Tool -#import "AccountInfoStorage.h" -#import "YUMIMacroUitls.h" -#import "TTPopup.h" -#import "XNDJTDDLoadingTool.h" -#import "Api.h" -#import "NetImageView.h" -#import "Api+Room.h" -#import "RtcManager.h" -///Model -#import "RoomInfoModel.h" -#import "MicroExtModel.h" -#import "XPUserCardInfoModel.h" -///View -#import "AnchorPKMicroView.h" -#import "XPAnchorRandomPKRuleView.h" -#import "UserRoomCardViewController.h" - -// 房主头像宽 58 + 光圈 5 -#define ownerWidth (85 + 5) -// 昵称高 12，距离头像间距 6 -#define ownerHeight (ownerWidth + 6 + 12) -// 下面 8 个坑位宽50 + 光圈 5 -#define mcWidth (50 + 5) * kScreenScale -#define mcHeight (mcWidth + 6 + 12) -// 左右 padding 12 -#define paddingH 12 * kScreenScale -// 房主与下面的坑位间隔 33 -#define marginV1 33 -// 下面 8 个坑位两两之间的间距 -#define marginH (KScreenWidth - paddingH * 2 - mcWidth * 4 - datingWidth) / 2 -// 第一行坑位与第二行坑位的间距 -#define marginV2 27 * kScreenScale -// 第一行坑位的顶部 -#define secondRowTop (firstRowTop + mcHeight + marginV2) -// 第二行坑位底部 padding -#define marginV3 15 - -///房主头像距上边距离 -#define topMargin 87 - -@interface AnchorPKStageView() - -///规则按钮 -@property (nonatomic, strong) UIButton *ruleButton; - -///动画管理类 -@property (strong, nonatomic) SVGAParser *parser; -///中间进度的动画 -@property (nonatomic, strong) SVGAImageView *svgDisplayView; -@property (nonatomic, strong) MicMidpointRectManager *midpointRectManager; - -@end - -@implementation AnchorPKStageView - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super initWithDelegate:delegate]) { - // 初始化中点矩形管理器 - _midpointRectManager = [[MicMidpointRectManager alloc] initWithContainerView:self]; - - [self addSubview:self.svgDisplayView]; - [self addSubview:self.ruleButton]; - [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(64); - make.height.mas_equalTo(74); - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(82); - }]; - [self.ruleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(46); - make.height.mas_equalTo(18); - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.svgDisplayView.mas_bottom).mas_offset(7); - }]; - - NSString * anatomiser1Name = [[NSString stringWithFormat:@"%@/anchorPK_vs.svga", API_Image_URL] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]; - [self.parser parseWithURL:[NSURL URLWithString:anatomiser1Name] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - self.svgDisplayView.loops = INT_MAX; - self.svgDisplayView.clearsAfterStop = NO; - self.svgDisplayView.videoItem = videoItem; - [self.svgDisplayView startAnimation]; - } failureBlock:^(NSError * _Nonnull error) { - }]; - } - return self; -} - -- (NSInteger)countOfMicroView { - return 2; -} - -- (UIView *)findMicroViewByIndex:(NSInteger)index { - UIView * microView = [super findMicroViewByIndex:index]; - return microView; -} - -- (UIView *)microViewForIndex:(NSInteger)index { - UIView * microView = [super microViewForIndex:index]; - if (microView) { - return microView; - } - return [[AnchorPKMicroView alloc]init]; -} - -/** - * | ◯ | * 房主头像宽 150 + 光圈 5 - * | 20 ◯ ◯ ◯ ◯ 20 | * 左右 padding 20 - * | 15 | * 上下两排间距 15 - * | ◯ ◯ ◯ ◯ | * 右边 3 个坑位宽40 + 光圈 5 - * * 昵称高12，距离头像间距 6 - */ -- (CGRect)rectForViewAtIndex:(NSInteger)index { - if (index == 0) { - return CGRectMake((KScreenWidth - 64) * 0.5 - 26 - ownerWidth+2.5, topMargin, ownerWidth, ownerHeight); - } else { - return CGRectMake((KScreenWidth + 64) * 0.5 + 26 - 2.5, topMargin, ownerWidth, ownerHeight); - } - return [super rectForViewAtIndex:index]; -} - -- (CGFloat)hightForStageView { - return 330; -} - -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { - NSInteger index = [self getIndexByUid:uid]; - CGPoint point = CGPointZero; - if (index == 0) { - point = CGPointMake(KScreenWidth / 2 - 32 - 26 - ownerWidth * 0.5, topMargin + ownerWidth / 2 - 10); - } - - point = [self convertPoint:point toView:nil]; - return point; -} - -// 主播PK：自定义相邻性判断（仅支持0-1的相邻对） -- (BOOL)isAdjacentMicAtIndex:(NSInteger)firstIndex andIndex:(NSInteger)secondIndex { - if (firstIndex == secondIndex) return NO; - - NSInteger left = MIN(firstIndex, secondIndex); - NSInteger right = MAX(firstIndex, secondIndex); - - // 仅支持0-1的相邻对 - return (left == 0 && right == 1); -} - -- (void)onRoomEntered { - [super onRoomEntered]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self autoUpMicAtIndex:-1]; - }); -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - [super handleNIMNotificationMessage:message]; - - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - switch (content.eventType) { - case NIMChatroomEventTypeQueueChange: // 麦序上下麦 - { - NSDictionary* data = (NSDictionary *)content.ext; - UserInfoModel* userInfo = [UserInfoModel modelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]]; - NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue]; - - if (changeType == 1) { // 上麦 - if (userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) {///房主上麦 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{//延迟1s，等待rtc角色变为主播才可发起跨房通话 - if (self.hostDelegate.getRoomInfo.pkRoomId && self.hostDelegate.getRoomInfo.pkUid) { - [[RtcManager instance] connectOtherRoom:self.hostDelegate.getRoomInfo.pkRoomId userId:self.hostDelegate.getRoomInfo.pkUid]; - } else { - [Api getAcrossRoomPKDetail:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:data.data]; - if (data.data[@"amicStatus"] != nil){ - acrossPKPanelInfo.aMicStatus = [data.data[@"amicStatus"] intValue]; - } - if (acrossPKPanelInfo.pkType == AcrossRoomPkTypeAnchor) { - self.hostDelegate.getRoomInfo.roundId = acrossPKPanelInfo.roundId; - self.hostDelegate.getRoomInfo.pkUid = acrossPKPanelInfo.aUid; - self.hostDelegate.getRoomInfo.pkRoomId = acrossPKPanelInfo.aRoomId; - self.hostDelegate.getRoomInfo.pkState = acrossPKPanelInfo.pkState; - self.hostDelegate.getRoomInfo.winUid = acrossPKPanelInfo.winUid; - if (acrossPKPanelInfo.aRoomId && acrossPKPanelInfo.aUid) { - [[RtcManager instance] connectOtherRoom:acrossPKPanelInfo.aRoomId userId:acrossPKPanelInfo.aUid]; - } - } else { - } - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:[AccountInfoStorage instance].getUid]; - } - }); - } - } - } - break; - default: - break; - } -} - -- (void)autoUpMicAtIndex:(NSInteger)index { - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = [NSString stringWithFormat:@"%zd", index]; - UserInfoModel* userInfo = self.hostDelegate.getUserInfo; - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - if (roomInfo.uid != [[AccountInfoStorage instance].getUid integerValue]) { - return; - } - NSString* roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - NSMutableDictionary *curUserInfo = [[NSMutableDictionary alloc]initWithDictionary:[self userInfoToQueueExt:userInfo]]; - [curUserInfo setValue:@(YES) forKey:@"isNoProhibitMic"]; - request.value = [curUserInfo toJSONString]; - request.roomId = roomId; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - }]; -} -/** - * 麦位更新扩展字段。 - */ -- (NSDictionary *)userInfoToQueueExt:(UserInfoModel *)userInfo { - MicroExtModel * extModel = [[MicroExtModel alloc] init]; - extModel.gender = userInfo.gender; - extModel.avatar = userInfo.avatar; - extModel.uid = userInfo.uid; - extModel.nick = userInfo.nick; - extModel.vipMic = userInfo.uid == self.hostDelegate.getRoomInfo.blindDateVipUid; - extModel.headWearUrl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - extModel.micCircle = userInfo.micCircle; - extModel.micNickColor = userInfo.micNickColor; - extModel.enterHide = userInfo.userVipInfoVO.enterHide; - return [extModel model2dictionary]; -} - -/** - * index 处的坑位点击事件 - */ -- (void)didSelectAtIndex:(NSInteger)index { - MicroQueueModel* micModel = [self.getMicroQueue objectForKey:[self indexToPosition:index]]; - UserInfoModel* userInfo = self.hostDelegate.getUserInfo; - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - NSString* position = [self indexToPosition:index]; - NSString* uid = [NSString stringWithFormat:@"%ld", userInfo.uid]; - NSString* roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - - // 1. 麦位上有人，弹窗用户资料卡 - NSString * targetUid; - if (roomInfo.leaveMode && [position isEqualToString:@"-1"]) { - targetUid = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - } - if (micModel.userInfo && micModel.userInfo.uid > 0) { - targetUid = [NSString stringWithFormat:@"%ld", micModel.userInfo.uid]; - } - - if (targetUid && targetUid.length > 0) { - XPUserCardInfoModel * model = [[XPUserCardInfoModel alloc] init]; - model.uid = targetUid; - model.position = position; - model.posState = micModel.microState.posState; - model.micState = micModel.microState.micState; - model.nick = userInfo.nick; - model.roomInfo = roomInfo; - model.micQueue = self.getMicroQueue; - model.delegate = self.hostDelegate; - model.superMangerList = self.hostDelegate.getRoomSuperAdminList; - model.platformRole = micModel.userInfo.platformRole; - UserRoomCardViewController *vc = [[UserRoomCardViewController alloc] initWithUser:model controlUser:self.hostDelegate.getUserInfo]; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:vc animated:NO completion:nil]; - - return; - } -} - -- (NSString *)indexToPosition:(NSInteger)index { - if (index == 9) { - return @"999"; - } - return [super indexToPosition:index]; -} - -- (NSInteger)positionToIndex:(NSString *)position { - if (position.intValue == 999) { - return 9; - } - return [super positionToIndex:position]; -} - -#pragma mark - event -- (void)onRuleButtonClick:(UIButton *)button { - [Api requestAnchorPkRule:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - XPAnchorRandomPKRuleView *view = [[XPAnchorRandomPKRuleView alloc] init]; - view.ruleString = data.data; - [TTPopup popupView:view style:TTPopupStyleAlert]; - } - }]; -} - -#pragma mark - RtcDelegate - 讲话的波纹回调 -- (void)usersSpeaking:(NSMutableArray *)uids { - return; -} - -#pragma mark - getter -- (UIButton *)ruleButton { - if (!_ruleButton) { - _ruleButton = [[UIButton alloc] init]; - [_ruleButton setTitle:YMLocalizedString(@"AnchorPKStageView0") forState:UIControlStateNormal]; - [_ruleButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _ruleButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_ruleButton setBackgroundImage:[UIImage imageNamed:@"anchorPk_panel_ruleBg"] forState:UIControlStateNormal]; - [_ruleButton addTarget:self action:@selector(onRuleButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - } - return _ruleButton; -} - -- (SVGAImageView *)svgDisplayView { - if (_svgDisplayView == nil) { - _svgDisplayView = [[SVGAImageView alloc]init]; - _svgDisplayView.contentMode = UIViewContentModeScaleToFill; - _svgDisplayView.userInteractionEnabled = NO; - _svgDisplayView.backgroundColor = [UIColor clearColor]; - } - return _svgDisplayView; -} - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/AnchorStageView.h b/YuMi/Modules/YMRoom/View/StageView/AnchorStageView.h deleted file mode 100644 index 8733dc6..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/AnchorStageView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// AnchorStageView.h -// YUMI -// -// Created by YUMI on 2022/2/14. -// - -#import "StageView.h" -#import "MicMidpointRectManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface AnchorStageView : StageView - -@property (nonatomic, strong, readonly) MicMidpointRectManager *midpointRectManager; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/AnchorStageView.m b/YuMi/Modules/YMRoom/View/StageView/AnchorStageView.m deleted file mode 100644 index 27171f8..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/AnchorStageView.m +++ /dev/null @@ -1,284 +0,0 @@ -// -// AnchorStageView.m -// YUMI -// -// Created by YUMI on 2022/2/14. -// - -#import "AnchorStageView.h" -///Third -#import -#import -///Tool -#import "AccountInfoStorage.h" -#import "XNDJTDDLoadingTool.h" -#import "YUMIMacroUitls.h" -#import "MicMidpointRectManager.h" -#import "TTPopup.h" -#import "Api+Room.h" -///Model -#import "RoomInfoModel.h" -#import "MicroExtModel.h" -#import "XPUserCardInfoModel.h" -#import "AttachmentModel.h" -///View -#import "AnchorMicroView.h" -#import "UserRoomCardViewController.h" -#import "XPRoomInviteUserViewController.h" - -// 房主头像宽 150 + 光圈 5 -#define ownerWidth (120 + 5) -// 昵称高21，距离头像间距 6 -#define ownerHeight (ownerWidth + 6 + 20) -///房主头像距上边距离 -#define topMargin 60 -// 底部 3 个坑位宽40 + 光圈 5 -#define mcWidth (40 + 5) -#define mcHeight (mcWidth + 6 + 12) -// 底部3 个坑位顶部距房主坑位距离 padding 30 -#define paddingH 35 -// 下边坑位的左右间距 -#define marginW 50 - -@interface AnchorStageView () - -@property (nonatomic, strong) MicMidpointRectManager *midpointRectManager; - -@end - -@implementation AnchorStageView - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super initWithDelegate:delegate]) { - // 初始化中点矩形管理器 - _midpointRectManager = [[MicMidpointRectManager alloc] initWithContainerView:self]; - } - return self; -} - -- (NSInteger)countOfMicroView { - return 4; -} - -- (UIView *)microViewForIndex:(NSInteger)index { - UIView * microView = [super microViewForIndex:index]; - if (microView) { - return microView; - } - return [[AnchorMicroView alloc]init]; -} - -/** - * | ◯ | * 房主头像宽 150 + 光圈 5 - * | 20 ◯ ◯ ◯ ◯ 20 | * 左右 padding 20 - * | 15 | * 上下两排间距 15 - * | ◯ ◯ ◯ ◯ | * 右边 3 个坑位宽40 + 光圈 5 - * * 昵称高12，距离头像间距 6 - */ -- (CGRect)rectForViewAtIndex:(NSInteger)index { - if (index == 0) { - return CGRectMake((KScreenWidth - ownerWidth) * 0.5, topMargin, ownerWidth, ownerHeight); - } - if (index >= 1 && index <= 3) { - return CGRectMake((KScreenWidth - mcWidth) * 0.5 - marginW - mcWidth + (marginW+mcWidth) * (index-1), topMargin+ownerHeight + paddingH, mcWidth, mcHeight); - } - - return [super rectForViewAtIndex:index]; -} - -- (CGFloat)hightForStageView { - return topMargin + ownerHeight + paddingH + mcHeight + 10; -} - -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { - NSInteger index = [self getIndexByUid:uid]; - CGPoint point = CGPointZero; - if (index == 0) { - point = CGPointMake(KScreenWidth / 2, topMargin + ownerWidth / 2 - 10); - } - - if (index >= 1 && index <= 3) { - point = CGPointMake((KScreenWidth - mcWidth) * 0.5 - (marginW+mcWidth*1.5) + (marginW+mcWidth*1.5) * (index-1) + mcWidth * 0.5, topMargin+ownerHeight + paddingH + mcWidth * 0.5 - 10); - } - - point = [self convertPoint:point toView:nil]; - return point; -} - -// 主播房布局：自定义相邻性判断（仅支持1-2, 2-3的相邻对） -- (BOOL)isAdjacentMicAtIndex:(NSInteger)firstIndex andIndex:(NSInteger)secondIndex { - if (firstIndex == secondIndex) return NO; - - NSInteger left = MIN(firstIndex, secondIndex); - NSInteger right = MAX(firstIndex, secondIndex); - - // 仅支持1-2, 2-3的相邻对 - return ((left == 1 && right == 2) || (left == 2 && right == 3)); -} - -- (void)onRoomEntered { - [super onRoomEntered]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self autoUpMicAtIndex:-1]; - }); -} - -- (void)autoUpMicAtIndex:(NSInteger)index { - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = [NSString stringWithFormat:@"%zd", index]; - UserInfoModel* userInfo = self.hostDelegate.getUserInfo; - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - if (roomInfo.uid != [[AccountInfoStorage instance].getUid integerValue]) { - return; - } - NSString* roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; - request.roomId = roomId; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - }]; -} - -/** - * index 处的坑位点击事件 - */ -- (void)didSelectAtIndex:(NSInteger)index { - MicroQueueModel* micModel = [self.getMicroQueue objectForKey:[self indexToPosition:index]]; - UserInfoModel* userInfo = self.hostDelegate.getUserInfo; - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - NSString* position = [self indexToPosition:index]; - NSString* uid = [NSString stringWithFormat:@"%ld", userInfo.uid]; - NSString* roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - - // 1. 麦位上有人，弹窗用户资料卡 - NSString * targetUid; - if (roomInfo.leaveMode && [position isEqualToString:@"-1"]) { - targetUid = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - } - if (micModel.userInfo && micModel.userInfo.uid > 0) { - targetUid = [NSString stringWithFormat:@"%ld", micModel.userInfo.uid]; - } - - if (targetUid && targetUid.length > 0) { - XPUserCardInfoModel * model = [[XPUserCardInfoModel alloc] init]; - model.uid = targetUid; - model.position = position; - model.posState = micModel.microState.posState; - model.micState = micModel.microState.micState; - model.nick = userInfo.nick; - model.roomInfo = roomInfo; - model.micQueue = self.getMicroQueue; - model.delegate = self.hostDelegate; - model.superMangerList = self.hostDelegate.getRoomSuperAdminList; - model.platformRole = micModel.userInfo.platformRole; - UserRoomCardViewController *vc = [[UserRoomCardViewController alloc] initWithUser:model controlUser:self.hostDelegate.getUserInfo]; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:vc animated:NO completion:nil]; - - return; - } - - // 2. 空麦位，上麦逻辑 - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = roomId; - request.userIds = @[uid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - NIMChatroomMember * member = members.firstObject; - if (!member) return; - // 2.0.0 锁麦/解锁 - NSString * lockTitle = micModel.microState.posState == MicroPosStateType_Free ? YMLocalizedString(@"StageView23") : YMLocalizedString(@"AnchorStageView1"); - TTActionSheetConfig *lockMic = [TTActionSheetConfig normalTitle:lockTitle clickAction:^{ - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - NSString * state = micModel.microState.posState == MicroPosStateType_Free ? @"1" : @"0"; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * uid = [[AccountInfoStorage instance] getUid]; - [Api microLockCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - } roomUid:roomUid state:state position:position ticket:ticket uid:uid]; - }]; - // 2.0.1 闭麦/开麦 - NSString * muteTitle = micModel.microState.micState == MicroMicStateType_Open ? YMLocalizedString(@"StageView25") : YMLocalizedString(@"AnchorStageView3"); - TTActionSheetConfig *muteMic = [TTActionSheetConfig normalTitle:muteTitle clickAction:^{ - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - NSString * state = micModel.microState.micState == MicroMicStateType_Open ? @"1" : @"0"; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * uid = [[AccountInfoStorage instance] getUid]; - [Api microMuteCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - } roomUid:roomUid state:state position:position ticket:ticket uid:uid]; - }]; - // 2.1 房主点击了空麦位 - if (member.type == NIMTeamMemberTypeOwner) { - // 抱Ta上麦 - TTActionSheetConfig *inviteMic = [TTActionSheetConfig normalTitle:YMLocalizedString(@"AnchorStageView4") clickAction:^{ - XPRoomInviteUserViewController * inviteUserMicVC = [[XPRoomInviteUserViewController alloc] init]; - inviteUserMicVC.roomId = roomId; - inviteUserMicVC.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - inviteUserMicVC.position = position; - inviteUserMicVC.roomType = self.hostDelegate.getRoomInfo.type; - inviteUserMicVC.roomModeType = self.hostDelegate.getRoomInfo.roomModeType; - inviteUserMicVC.blindDateVipUid = roomInfo.blindDateVipUid; - [self.hostDelegate.getCurrentNav pushViewController:inviteUserMicVC animated:YES]; - }]; - - [TTPopup actionSheetWithItems:@[inviteMic, lockMic, muteMic]]; - } else if (member.type == NIMTeamMemberTypeManager) {//管理员点击了空麦位 - // 抱Ta上麦 - TTActionSheetConfig *inviteMic = [TTActionSheetConfig normalTitle:YMLocalizedString(@"AnchorStageView4") clickAction:^{ - XPRoomInviteUserViewController * inviteUserMicVC = [[XPRoomInviteUserViewController alloc] init]; - inviteUserMicVC.roomId = roomId; - inviteUserMicVC.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - inviteUserMicVC.roomType = self.hostDelegate.getRoomInfo.type; - inviteUserMicVC.position = position; - inviteUserMicVC.blindDateVipUid = roomInfo.blindDateVipUid; - [self.hostDelegate.getCurrentNav pushViewController:inviteUserMicVC animated:YES]; - }]; - - [TTPopup actionSheetWithItems:@[inviteMic,lockMic, muteMic]]; - } else { - // 2.2 非房主点击了空麦位 - NSString* selfUid = [NSString stringWithFormat:@"%ld", (long)self.hostDelegate.getUserInfo.uid]; - UIView* microView = [self findMicroViewByUid:selfUid]; - if (microView) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"AnchorStageView5")]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"AnchorStageView6")]; - [self sendMessageToRoomOwnerWithUserModel:self.hostDelegate.getUserInfo]; - } - } - }]; -} - -- (void)sendMessageToRoomOwnerWithUserModel:(UserInfoModel *)userInfo { - NIMMessage * message = [[NIMMessage alloc] init]; - AttachmentModel * attachMent = [[AttachmentModel alloc] init]; - attachMent.first = CustomMessageType_AnchorRoom_AudienceUpMic; - attachMent.data = [userInfo model2dictionary]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachMent; - message.messageObject = object; - //构造会话 - NSString * sessionId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; -} - -#pragma mark - private utils function -/** - * 麦位更新扩展字段。 - */ -- (NSDictionary *)userInfoToQueueExt:(UserInfoModel *)userInfo { - MicroExtModel * extModel = [[MicroExtModel alloc] init]; - extModel.gender = userInfo.gender; - extModel.avatar = userInfo.avatar; - extModel.uid = userInfo.uid; - extModel.nick = userInfo.nick; - extModel.headWearUrl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - extModel.micCircle = userInfo.micCircle; - extModel.micNickColor = userInfo.micNickColor; - extModel.preventKick = userInfo.userVipInfoVO.preventKick; - extModel.enterHide = userInfo.userVipInfoVO.enterHide; - return [extModel model2dictionary]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/DatingStageView.h b/YuMi/Modules/YMRoom/View/StageView/DatingStageView.h deleted file mode 100644 index c45e836..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/DatingStageView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// DatingStageView.h -// YUMI -// -// Created by YUMI on 2022/1/4. -// - -#import "StageView.h" -#import "MicMidpointRectManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface DatingStageView : StageView - -@property (nonatomic, strong, readonly) MicMidpointRectManager *midpointRectManager; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/DatingStageView.m b/YuMi/Modules/YMRoom/View/StageView/DatingStageView.m deleted file mode 100644 index 0fc03c0..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/DatingStageView.m +++ /dev/null @@ -1,309 +0,0 @@ -// -// DatingStageView.m -// YUMI -// -// Created by YUMI on 2022/1/4. -// - -#import "DatingStageView.h" -#import "MicMidpointRectManager.h" -///Third -#import -#import -///Tool -#import "AccountInfoStorage.h" -#import "YUMIMacroUitls.h" -#import "TTPopup.h" -#import "XNDJTDDLoadingTool.h" -#import "Api.h" -///Model -#import "RoomInfoModel.h" -#import "MicroExtModel.h" -///View -#import "DatingMicroView.h" -#import "MicroDatingProgressView.h" -#import "XPRoomDatingVipUpMicView.h" - -//房主距离顶部间距 -#define ownerTopMargin 35 -// 房主头像宽 58 + 光圈 5 -#define ownerWidth (45 + 5) * kScreenScale -// 昵称高 12，距离头像间距 10 -#define ownerHeight (ownerWidth + 10 + 12) -// 下面 8 个坑位宽50 + 光圈 5 -#define mcWidth (45 + 5) * kScreenScale -#define mcHeight (mcWidth + 10 + 12 + 5+16) -// 左右 padding 12 -#define paddingH 12 * kScreenScale -// 房主与下面的坑位间隔 33 -#define marginV1 38 -// 相亲的宽度 -#define datingWidth 100 * kScreenScale -// 下面 8 个坑位两两之间的间距 -#define marginH (KScreenWidth - paddingH * 2 - mcWidth * 4 - datingWidth) / 2 -// 第一行坑位的顶部 -#define firstRowTop (ownerHeight + marginV1 + ownerTopMargin) -// 第一行坑位与第二行坑位的间距 -#define marginV2 17 * kScreenScale -// 第一行坑位的顶部 -#define secondRowTop (firstRowTop + mcHeight + marginV2) -// 第二行坑位底部 padding -#define marginV3 15 - -@interface DatingStageView() -///相亲进行的阶段 -@property (nonatomic,strong) MicroDatingProgressView *datingProgressView; -@property (nonatomic, strong) MicMidpointRectManager *midpointRectManager; - -@end - -@implementation DatingStageView - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super initWithDelegate:delegate]) { - // 初始化中点矩形管理器 - _midpointRectManager = [[MicMidpointRectManager alloc] initWithContainerView:self]; - - [self addSubview:self.datingProgressView]; - [self.datingProgressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(datingWidth); - make.bottom.mas_equalTo(self); - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(firstRowTop); - }]; - } - return self; -} - -- (NSInteger)countOfMicroView { - return 10; -} - -- (UIView *)findMicroViewByIndex:(NSInteger)index { - UIView * microView = [super findMicroViewByIndex:index]; - if (microView) { - if ([self micVipIsOnNormalPosition] && index == 9) { - microView.hidden = YES; - } else { - microView.hidden = NO; - } - return microView; - } - return microView; -} - -- (UIView *)microViewForIndex:(NSInteger)index { - UIView * microView = [super microViewForIndex:index]; - if (microView) { - return microView; - } - return [[DatingMicroView alloc]init]; -} - -/** - * | ◯ | * 房主头像宽 58 + 光圈 5 - * | 33 ◯ | * 房主与下面的坑位间隔 33 - * | 12 ◯ ◯ 100 ◯ ◯ 12 | * 左右 padding 12 - * | 15 | * 上下两排间距 15 - * | ◯ ◯ 100 ◯ ◯ | * 下面 8 个坑位宽50 + 光圈 5 - * * 昵称高12，距离头像间距 6 - */ -- (CGRect)rectForViewAtIndex:(NSInteger)index { - ///相亲模式坑位 - if (index == 0) { - return CGRectMake(KScreenWidth / 2 - ownerWidth / 2, ownerTopMargin, ownerWidth, ownerHeight); - } - - - if (index >= 1 && index <= 4) { - CGRect rect = CGRectMake(paddingH + mcWidth * (index - 1) + datingWidth * (index / 3) + marginH * (index / 2), firstRowTop, mcWidth, mcHeight); - return rect; - } - - if (index >= 5 && index <= 8) { - return CGRectMake(paddingH + mcWidth * (index - 4 - 1) + marginH *((index -4)/ 2) + datingWidth * (index / 7), secondRowTop, mcWidth, mcHeight); - } - - if (index == 9) { - return CGRectMake(KScreenWidth- mcWidth - 20, 45, mcWidth, mcHeight); - } - return [super rectForViewAtIndex:index]; -} - -- (CGFloat)hightForStageView { - return ownerTopMargin + ownerHeight + marginV1 + mcHeight + marginV2 + mcHeight + marginV3; -} - -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { - NSInteger index = [self getIndexByUid:uid]; - CGPoint point = CGPointZero; - if (index == 0) { - point = CGPointMake(KScreenWidth / 2, ownerWidth / 2 - 10 + ownerTopMargin); - } - - if (index >= 1 && index <= 4) { - point = CGPointMake(paddingH + mcWidth * (index - 1) + datingWidth * (index / 3) + marginH * (index / 2) + mcWidth / 2, firstRowTop + mcWidth / 2- 10); - } - - if (index >= 5 && index <= 8) { - point = CGPointMake(paddingH + mcWidth * (index - 4 - 1) + marginH *((index -4)/ 2) + datingWidth * (index / 7) + mcWidth / 2, secondRowTop + mcWidth / 2 - 10); - } - - if (index == 9) { - point = CGPointMake(KScreenWidth- mcWidth - 20 + mcWidth / 2, 45 + mcWidth / 2); - } - - point = [self convertPoint:point toView:nil]; - return point; -} - -// 相亲布局：自定义相邻性判断（仅支持1-2、3-4、5-6、7-8的相邻对） -- (BOOL)isAdjacentMicAtIndex:(NSInteger)firstIndex andIndex:(NSInteger)secondIndex { - if (firstIndex == secondIndex) return NO; - - NSInteger left = MIN(firstIndex, secondIndex); - NSInteger right = MAX(firstIndex, secondIndex); - - // 仅支持1-2、3-4、5-6、7-8的相邻对 - return ((left == 1 && right == 2) || (left == 3 && right == 4) || - (left == 5 && right == 6) || (left == 7 && right == 8)); -} - -/** - * 麦位更新扩展字段。 - */ -- (NSDictionary *)userInfoToQueueExt:(UserInfoModel *)userInfo { - MicroExtModel * extModel = [[MicroExtModel alloc] init]; - extModel.gender = userInfo.gender; - extModel.avatar = userInfo.avatar; - extModel.uid = userInfo.uid; - extModel.nick = userInfo.nick; - extModel.vipMic = userInfo.uid == self.hostDelegate.getRoomInfo.blindDateVipUid; - extModel.headWearUrl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - extModel.micCircle = userInfo.micCircle; - extModel.micNickColor = userInfo.micNickColor; - extModel.preventKick = userInfo.userVipInfoVO.preventKick;; - extModel.enterHide = userInfo.userVipInfoVO.enterHide; - return [extModel model2dictionary]; -} - -- (BOOL)micVipIsOnNormalPosition { - __block BOOL isHidden = NO; - [self.hostDelegate.getMicroQueue.allValues enumerateObjectsUsingBlock:^(MicroQueueModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.microState.position != -1 && obj.microState.position != 999 && obj.userInfo && obj.userInfo.vipMic) { - isHidden = YES; - } - }]; - return isHidden; -} - -/** - * index 处的坑位点击事件 - */ -- (void)didSelectAtIndex:(NSInteger)index { - MicroQueueModel* micModel = [self.hostDelegate.getMicroQueue objectForKey:[self indexToPosition:index]]; - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - UserInfoModel * userInfo = self.hostDelegate.getUserInfo; - // 2. 空麦位，上麦逻辑 - if (index != 9 && (!micModel.userInfo || micModel.userInfo.uid <= 0)) { - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - NIMChatroomMember * member = members.firstObject; - if (member.type == NIMChatroomMemberTypeManager || member.type == NIMChatroomMemberTypeCreator) { - [super didSelectAtIndex:index]; - } else { - if (micModel.microState.posState == MicroPosStateType_Lock) { - if ([super getIndexByUid:[AccountInfoStorage instance].getUid] != -1) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"DatingStageView0")]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"StageView20")]; - } - } else { - [super didSelectAtIndex:index]; - } - } - }]; - return; - } - - if (index == 9) { - if (micModel.userInfo && micModel.userInfo.uid > 0) { - [super didSelectAtIndex:index]; - } else { - if (roomInfo.blindDateVipUid == [AccountInfoStorage instance].getUid.integerValue) { - NSString * position = [self indexToPosition:index]; - // 2.1.3 闭麦/开麦 - NSString * muteTitle = micModel.microState.micState == MicroMicStateType_Open ? YMLocalizedString(@"StageView25") : YMLocalizedString(@"DatingStageView3"); - TTActionSheetConfig *muteMic = [TTActionSheetConfig normalTitle:muteTitle clickAction:^{ - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - NSString * state = micModel.microState.micState == MicroMicStateType_Open ? @"1" : @"0"; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * uid = [[AccountInfoStorage instance] getUid]; - [Api microMuteCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - } roomUid:roomUid state:state position:position ticket:ticket uid:uid]; - }]; - - //上麦 - TTActionSheetConfig *upMic = [TTActionSheetConfig normalTitle:YMLocalizedString(@"DatingStageView4") clickAction:^{ - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = @"999"; - request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; - request.roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - - }]; - }]; - - [TTPopup actionSheetWithItems:@[upMic, muteMic]]; - - } else { - XPRoomDatingVipUpMicView *view = [[XPRoomDatingVipUpMicView alloc] initWithFrame:CGRectMake(0, 0, 260, 325 + 35 + 20)]; - [TTPopup popupView:view style:TTPopupStyleAlert]; - } - } - } else { - [super didSelectAtIndex:index]; - } -} - -- (NSString *)indexToPosition:(NSInteger)index { - if (index == 9) { - return @"999"; - } - return [super indexToPosition:index]; -} - -- (NSInteger)positionToIndex:(NSString *)position { - if (position.intValue == 999) { - return 9; - } - return [super positionToIndex:position]; -} - -- (void)onRoomUpdate { - [super onRoomUpdate]; - if (self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) { - self.datingProgressView.blindDateState = self.hostDelegate.getRoomInfo.blindDateState; - } -} - - -- (void)onRoomEntered { - [super onRoomEntered]; - if (self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) { - self.datingProgressView.blindDateState = self.hostDelegate.getRoomInfo.blindDateState; - } -} - -- (MicroDatingProgressView *)datingProgressView { - if (!_datingProgressView) { - _datingProgressView = [[MicroDatingProgressView alloc] init]; - } - return _datingProgressView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/FifteenMicStageView.h b/YuMi/Modules/YMRoom/View/StageView/FifteenMicStageView.h deleted file mode 100644 index 4018388..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/FifteenMicStageView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// FiftenMicStageView.h -// YuMi -// -// Created by P on 2024/6/25. -// - -#import "StageView.h" -#import "MicMidpointRectManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface FifteenMicStageView : StageView - -@property (nonatomic, strong, readonly) MicMidpointRectManager *midpointRectManager; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/FifteenMicStageView.m b/YuMi/Modules/YMRoom/View/StageView/FifteenMicStageView.m deleted file mode 100644 index ec2b7e5..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/FifteenMicStageView.m +++ /dev/null @@ -1,134 +0,0 @@ -// -// FifteenMicStageView.m -// YuMi -// -// Created by P on 2024/6/25. -// - -#import "FifteenMicStageView.h" -#import "SocialMicroView.h" -#import "MicMidpointRectManager.h" -//第一行距离顶部 -#define firstRowTopMargin 60 -// 房主头像宽 58 + 光圈 5 -#define ownerWidth (45 + 5) * kScreenScale -// 昵称高12，距离头像间距 10 -#define ownerHeight (ownerWidth + 10 + 12) -// 下面 8 个坑位宽55 + 光圈 5 -#define mcWidth (45 + 5) * kScreenScale -#define mcHeight (mcWidth + 10 + 12 + 5+16) -// 左右 padding 20 -#define paddingH 22 * kScreenScale -// 每行间距 -#define lineMargin 8 -// 下面 8 个坑位两两之间的间距 -#define marginH (KScreenWidth - paddingH * 2 - mcWidth * 5) / 4 -// 第二行坑位的顶部 -#define sRowTop firstRowTopMargin + mcHeight + lineMargin -// 第一行坑位与第二行坑位的间距 -//#define marginV2 15 -// 第三行坑位的顶部 -#define tRowTop (sRowTop + mcHeight + lineMargin) -@interface FifteenMicStageView () - -@property (nonatomic, strong) MicMidpointRectManager *midpointRectManager; - -@end - -@implementation FifteenMicStageView - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super initWithDelegate:delegate]) { - // 初始化中点矩形管理器 - _midpointRectManager = [[MicMidpointRectManager alloc] initWithContainerView:self]; - } - return self; -} - -- (NSInteger)countOfMicroView { - return 15; -} - -- (UIView *)microViewForIndex:(NSInteger)index { - UIView * microView = [super microViewForIndex:index]; - if (microView) { - return microView; - } - return [[SocialMicroView alloc] init]; -} - -- (CGRect)rectForViewAtIndex:(NSInteger)index { - if (index >= 0 && index <= 4) { - return CGRectMake(paddingH + (mcWidth + marginH) * (index), firstRowTopMargin, mcWidth, mcHeight); - } - - if (index >= 5 && index < 10) { - return CGRectMake(paddingH + (mcWidth + marginH) * (index - 5), sRowTop, mcWidth, mcHeight); - } - - if (index >= 10 && index < 15) { - return CGRectMake(paddingH + (mcWidth + marginH) * (index - 10), tRowTop, mcWidth, mcHeight); - } - - return [super rectForViewAtIndex:index]; -} - -- (CGFloat)hightForStageView{ - return tRowTop + mcHeight + lineMargin; -// return firstRowTopMargin + mcHeight + sRowTop + mcHeight + tRowTop + mcHeight + lineMargin; -// return 3 * (lineMargin + mcHeight) + lineMargin; -} - -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { - NSInteger index = [self getIndexByUid:uid]; - CGPoint point = CGPointZero; - - if (index >= 0 && index <= 4) { - point = CGPointMake(paddingH + (mcWidth + marginH) * (index) + mcWidth / 2, firstRowTopMargin + mcHeight / 2); - } - - if (index >= 5 && index < 10) { - point = CGPointMake(paddingH + (mcWidth + marginH) * (index - 5) + mcWidth / 2, sRowTop + mcHeight / 2); - } - - if (index >= 10 && index < 15) { - point = CGPointMake(paddingH + (mcWidth + marginH) * (index - 10) + mcWidth / 2, tRowTop + mcHeight / 2); - } - - if (CGPointEqualToPoint(point, CGPointZero)) { - point = CGPointMake(KScreenWidth/2, 70); - } else { - point = [self convertPoint:point toView:nil]; - } - return point; -} - -- (CGPoint)animationPointAtStageViewByIndex:(NSInteger)index { - CGPoint point = CGPointZero; - - if (index >= 0 && index <= 4) { - point = CGPointMake(paddingH + (mcWidth + marginH) * (index) + mcWidth / 2, firstRowTopMargin + mcHeight / 2); - } - - if (index >= 5 && index < 10) { - point = CGPointMake(paddingH + (mcWidth + marginH) * (index - 5) + mcWidth / 2, sRowTop + mcHeight / 2); - } - - if (index >= 10 && index < 15) { - point = CGPointMake(paddingH + (mcWidth + marginH) * (index - 10) + mcWidth / 2, tRowTop + mcHeight / 2); - } - - if (CGPointEqualToPoint(point, CGPointZero)) { - point = CGPointMake(KScreenWidth/2, 70); - } else { - point = [self convertPoint:point toView:nil]; - } - return point; -} - -// 15麦位布局：5x3网格配置 -- (NSArray *> *)micRowRanges { - return @[@[@0, @4], @[@5, @9], @[@10, @14]]; // 三行，每行5个麦位 -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.h b/YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.h deleted file mode 100644 index cf4f482..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// LittleGameScrollStageView.h -// xplan-ios -// -// Created by GreenLand on 2022/5/5. -// - -#import "StageView.h" -#import "MicMidpointRectManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface LittleGameScrollStageView : StageView - -@property (nonatomic, strong, readonly) MicMidpointRectManager *midpointRectManager; - -/// 添加中点矩形到滚动视图 -- (void)addMidpointRect:(UIView *)rectView; - -/// 移除所有中点矩形 -- (void)removeAllMidpointRects; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.m b/YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.m deleted file mode 100644 index f9ddaa9..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/LittleGameScrollStageView.m +++ /dev/null @@ -1,233 +0,0 @@ -// -// LittleGameScrollStageView.m -// xplan-ios -// -// Created by GreenLand on 2022/5/5. -// - -#import "LittleGameScrollStageView.h" -///Third -#import -///Tool - -#import "AccountInfoStorage.h" - -///View -#import "LittleGameMicroView.h" -#import "MicMidpointRectManager.h" - -UIKIT_EXTERN NSString * const kRoomRoomLittleGameMiniStageNotificationKey; - -// 下面 9 个坑位宽40 + 光圈 5 -#define mcWidth (40 + 5) * kScreenScale -#define mcHeight (mcWidth + 6 + 12 + 5+16) -// 左右 padding 16 -#define paddingH 16 * kScreenScale -#define marginV1 4 - -@interface LittleGameScrollStageView () - -@property (nonatomic, strong) UIScrollView *scrollView; -@property (nonatomic, strong) MicMidpointRectManager *midpointRectManager; - -@end - - -@implementation LittleGameScrollStageView - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (void)setupObserver { - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeViewState:) name:kRoomRoomLittleGameMiniStageNotificationKey object:nil]; -} - -- (CGFloat)widthOfMic { - return 70; -} - -- (CGFloat)spaceOfMic { - return 16; - // 下面的方法是用来适配屏幕的计算，不滚动，全部在屏幕内显示 -// return (KScreenWidth - mcWidth * [self countOfMicroView] - paddingH * 2) / ([self countOfMicroView] - 1); -} - -- (void)setupMicroScrollView { - NSInteger microCount = self.countOfMicroView; - for (UIView *microView in self.subviews) { - [microView removeFromSuperview]; - } - [self addSubview:self.scrollView]; - [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; - - CGFloat spaceWidth = [self spaceOfMic]; - self.scrollView.contentSize = CGSizeMake((microCount - 1) * spaceWidth + paddingH * 2 + mcWidth * microCount, mcHeight); - for (int i = 0; i < microCount; i++) { - UIView* microView = [self microViewForIndex:i]; - if (microView) { - microView.tag = i; - microView.frame = [self rectForViewAtIndex:i]; - [self.scrollView addSubview:microView]; - } - } - if (isMSRTL()) { - self.scrollView.transform = CGAffineTransformMakeRotation(M_PI); - NSArray *subViews = self.scrollView.subviews; - for (UIView *subView in subViews) { - if ([subView isKindOfClass:[LittleGameMicroView class]]) { - subView.transform = CGAffineTransformMakeRotation(M_PI); - } - } - }else{ - self.scrollView.transform = CGAffineTransformIdentity; - NSArray *subViews = self.scrollView.subviews; - for (UIView *subView in subViews) { - if ([subView isKindOfClass:[LittleGameMicroView class]]) { - subView.transform = CGAffineTransformIdentity; - } - } - } -} - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super initWithDelegate:delegate]) { - // 初始化中点矩形管理器 - _midpointRectManager = [[MicMidpointRectManager alloc] initWithContainerView:self.scrollView]; - - [self setupObserver]; - [self setupMicroScrollView]; - } - return self; -} - -- (NSInteger)countOfMicroView { - return self.hostDelegate.getRoomInfo.mgMicNum ? self.hostDelegate.getRoomInfo.mgMicNum : 9; -} - -- (UIView *)microViewForIndex:(NSInteger)index { - UIView * microView = [super microViewForIndex:index]; - if (microView) { - return microView; - } - return [[LittleGameMicroView alloc] init]; -} - -- (CGRect)rectForViewAtIndex:(NSInteger)index { - CGFloat spaceWidth = [self spaceOfMic]; - - return CGRectMake(paddingH + index * (mcWidth + spaceWidth), 0, mcWidth, mcHeight); -} - -- (CGFloat)hightForStageView { - return mcHeight; -} - -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { - NSInteger index = [self getIndexByUid:uid]; - CGPoint point = CGPointZero; - CGFloat spaceWidth = [self spaceOfMic]; - point= CGPointMake(paddingH + index * (mcWidth + spaceWidth) + mcWidth / 2, mcHeight / 2 - 10); - point = [self.scrollView convertPoint:point toView:nil]; - if (point.x > KScreenWidth) { - point = CGPointZero; - } - return point; -} - -// 线性可滚动布局：单行线性排布配置 -- (NSArray *> *)micRowRanges { - NSInteger count = [self countOfMicroView]; - if (count > 0) { - return @[@[@0, @(count - 1)]]; // 所有麦位在一行 - } - return @[]; -} - -- (void)didSelectAtIndex:(NSInteger)index { - MicroQueueModel* micModel = [self findMicroInfoByUid:[AccountInfoStorage instance].getUid]; - if (micModel && micModel.userInfo.uid > 0 && micModel.userInfo.gameStatus == LittleGamePlayStatus_Plying) { - MicroQueueModel* indexMicModel = [self.hostDelegate.getMicroQueue objectForKey:[self indexToPosition:index]]; - if (indexMicModel.userInfo.uid <= 0) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"LittleGameScrollStageView0")]; - return; - } - } - [super didSelectAtIndex:index]; -} - -#pragma mark - 通知 -- (void)changeViewState:(NSNotification *)notification { - NSDictionary * dic = notification.object; - self.hidden = [[dic objectForKey:@"isMini"] boolValue]; -} - -- (UIScrollView *)scrollView { - if (!_scrollView) { - _scrollView = [[UIScrollView alloc] init]; - _scrollView.scrollEnabled = YES; - _scrollView.showsHorizontalScrollIndicator = NO; - _scrollView.clipsToBounds = NO; - _scrollView.delegate = self; - } - return _scrollView; -} - -#pragma mark - UIScrollViewDelegate - -- (void)scrollViewDidScroll:(UIScrollView *)scrollView { - // 中点矩形已经基于 scrollView 坐标系，无需额外调整 - // 因为 rectForMidpointBetweenMicAtIndex:andIndex: 返回的坐标已经是相对于 scrollView 的 -} - -#pragma mark - 中点矩形管理 - -- (void)addMidpointRect:(UIView *)rectView { - // 使用新的管理器添加中点矩形 - NSString *micPairText = @""; - for (UIView *subview in rectView.subviews) { - if ([subview isKindOfClass:[UILabel class]]) { - UILabel *label = (UILabel *)subview; - micPairText = label.text ?: @""; - break; - } - } - - [self.midpointRectManager addMidpointRectAtFrame:rectView.frame - micPairText:micPairText - autoPlaySVGA:YES]; -} - -- (void)removeAllMidpointRects { - [self.midpointRectManager removeAllMidpointRects]; -} - -#pragma mark - 触摸事件日志 - -// 触摸开始 -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - NSLog(@"🎯 LittleGameScrollStageView: touchesBegan 被调用"); - [super touchesBegan:touches withEvent:event]; -} - -// 触摸移动 -- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event { - NSLog(@"🎯 LittleGameScrollStageView: touchesMoved 被调用"); - [super touchesMoved:touches withEvent:event]; -} - -// 触摸结束 -- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event { - NSLog(@"🎯 LittleGameScrollStageView: touchesEnded 被调用"); - [super touchesEnded:touches withEvent:event]; -} - -// 触摸取消 -- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event { - NSLog(@"🎯 LittleGameScrollStageView: touchesCancelled 被调用"); - [super touchesCancelled:touches withEvent:event]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/LittleGameStageView.h b/YuMi/Modules/YMRoom/View/StageView/LittleGameStageView.h deleted file mode 100644 index 144b692..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/LittleGameStageView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// LittleGameStageView.h -// xplan-ios -// -// Created by 冯硕 on 2022/2/11. -// - -#import "StageView.h" -#import "MicMidpointRectManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface LittleGameStageView : StageView - -@property (nonatomic, strong, readonly) MicMidpointRectManager *midpointRectManager; - -/// 添加中点矩形到视图 -- (void)addMidpointRect:(UIView *)rectView; - -/// 移除所有中点矩形 -- (void)removeAllMidpointRects; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/LittleGameStageView.m b/YuMi/Modules/YMRoom/View/StageView/LittleGameStageView.m deleted file mode 100644 index 413f031..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/LittleGameStageView.m +++ /dev/null @@ -1,134 +0,0 @@ -// -// LittleGameStageView.m -// xplan-ios -// -// Created by 冯硕 on 2022/2/11. -// - -#import "LittleGameStageView.h" -///Third -#import -///Tool - -#import "AccountInfoStorage.h" - -///View -#import "LittleGameMicroView.h" -#import "MicMidpointRectManager.h" - -UIKIT_EXTERN NSString * const kRoomRoomLittleGameMiniStageNotificationKey; - -// 下面 8 个坑位宽55 + 光圈 5 -#define mcWidth (40 + 5) * kScreenScale -#define mcHeight (mcWidth + 6 + 12 + 5+16) -// 左右 padding 12 -#define paddingH 16 * kScreenScale -#define marginV1 4 - -@interface LittleGameStageView () - -@property (nonatomic, strong) MicMidpointRectManager *midpointRectManager; - -@end - -@implementation LittleGameStageView - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super initWithDelegate:delegate]) { - // 初始化中点矩形管理器 - _midpointRectManager = [[MicMidpointRectManager alloc] initWithContainerView:self]; - - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeViewState:) name:kRoomRoomLittleGameMiniStageNotificationKey object:nil]; - } - return self; -} - -- (NSInteger)countOfMicroView { - return 6; -} - -- (UIView *)microViewForIndex:(NSInteger)index { - UIView * microView = [super microViewForIndex:index]; - if (microView) { - return microView; - } - return [[LittleGameMicroView alloc]init]; -} - -/** - ◯ ◯ ◯ ◯ ◯ ◯ - */ -- (CGRect)rectForViewAtIndex:(NSInteger)index { - CGFloat spaceWidth = (KScreenWidth - mcWidth * 6 - paddingH * 2) / 5; - - return CGRectMake(paddingH + index * (mcWidth + spaceWidth), 0, mcWidth, mcHeight); -} - -- (CGFloat)hightForStageView { - return mcHeight; -} - -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { - NSInteger index = [self getIndexByUid:uid]; - CGPoint point = CGPointZero; - CGFloat spaceWidth = (KScreenWidth - mcWidth * 6 - paddingH * 2) / 5; - point= CGPointMake(paddingH + index * (mcWidth + spaceWidth) + mcWidth / 2, mcHeight / 2 - 10); - point = [self convertPoint:point toView:nil]; - return point; -} - -// 小游戏布局：单行线性排布配置 -- (NSArray *> *)micRowRanges { - NSInteger count = [self countOfMicroView]; - if (count > 0) { - return @[@[@0, @(count - 1)]]; // 所有麦位在一行 - } - return @[]; -} - -- (void)didSelectAtIndex:(NSInteger)index { - MicroQueueModel* micModel = [self findMicroInfoByUid:[AccountInfoStorage instance].getUid]; - if (micModel && micModel.userInfo.uid > 0 && micModel.userInfo.gameStatus == LittleGamePlayStatus_Plying) { - MicroQueueModel* indexMicModel = [self.hostDelegate.getMicroQueue objectForKey:[self indexToPosition:index]]; - if (indexMicModel.userInfo.uid <= 0) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"LittleGameStageView0")]; - return; - } - } - [super didSelectAtIndex:index]; -} - - -#pragma mark - 通知 -- (void)changeViewState:(NSNotification *)notification { - NSDictionary * dic = notification.object; - self.hidden = [[dic objectForKey:@"isMini"] boolValue]; -} - -#pragma mark - 中点矩形管理 - -- (void)addMidpointRect:(UIView *)rectView { - // 使用新的管理器添加中点矩形 - NSString *micPairText = @""; - for (UIView *subview in rectView.subviews) { - if ([subview isKindOfClass:[UILabel class]]) { - UILabel *label = (UILabel *)subview; - micPairText = label.text ?: @""; - break; - } - } - - [self.midpointRectManager addMidpointRectAtFrame:rectView.frame - micPairText:micPairText - autoPlaySVGA:YES]; -} - -- (void)removeAllMidpointRects { - [self.midpointRectManager removeAllMidpointRects]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/MicMidpointRectManager.h b/YuMi/Modules/YMRoom/View/StageView/MicMidpointRectManager.h deleted file mode 100644 index 33d0990..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicMidpointRectManager.h +++ /dev/null @@ -1,163 +0,0 @@ -// -// MicMidpointRectManager.h -// YuMi -// -// Created by AI Assistant on 2024/12/19. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class MicMidpointRectManager; -@class UIView; -@class MicroQueueModel; -@class MicCpInfoModel; -@class UserInfoModel; - -@protocol MicMidpointRectManagerDelegate - -@optional -/// 中点矩形动画播放完成 -- (void)midpointRectManager:(MicMidpointRectManager *)manager didFinishAnimationAtRect:(CGRect)rect; - -@end - -@interface MicMidpointRectManager : NSObject - -@property (nonatomic, weak) id delegate; -@property (nonatomic, weak) UIView *containerView; -/// 缓存：当前房间的CP关系列表 -@property (nonatomic, strong, readonly) NSArray *cachedCpList; -/// 缓存：麦位position -> uid（无用户为-1） -@property (nonatomic, strong, readonly) NSDictionary *micPositionToUid; -/// CP麦位开关状态 -@property (nonatomic, assign) BOOL cpMicEnabled; -/// 房间类型（用于判断是否显示CP动画，小游戏房不显示） -@property (nonatomic, assign) NSInteger roomType; - -/// 初始化方法 -- (instancetype)initWithContainerView:(UIView *)containerView; - -/// 添加中点矩形，支持SVGA动画 -- (void)addMidpointRectAtFrame:(CGRect)frame - micPairText:(NSString *)micPairText - autoPlaySVGA:(BOOL)autoPlaySVGA; - -/// 移除所有中点矩形 -- (void)removeAllMidpointRects; - -/// 移除指定位置的中点矩形 -- (void)removeMidpointRectAtFrame:(CGRect)frame; - -/// 播放指定位置的随机SVGA动画 -- (void)playSVGAAnimationAtFrame:(CGRect)frame; - -/// 播放指定位置的指定资源名SVGA动画（资源名不带后缀） -- (void)playSVGAAnimationAtFrame:(CGRect)frame withNamed:(NSString *)resourceName; - -/// 抽象：在指定中点位置绘制关系位（透明容器），并根据CP列表与两端uid匹配后播放对应等级SVGA -/// - Parameters: -/// - frame: 中点关系位frame -/// - micPairText: 调试展示用的麦位对文本（仅DEBUG下显示，50%透明） -/// - leftUid: 左侧麦位用户uid（0表示无） -/// - rightUid: 右侧麦位用户uid（0表示无） -/// - cpList: CP关系列表（MicCpInfoModel 数组） -- (void)addRelationshipAtFrame:(CGRect)frame - micPairText:(NSString *)micPairText - leftUid:(NSInteger)leftUid - rightUid:(NSInteger)rightUid - cpList:(NSArray *)cpList; - -/// 基于用户UID清理相关的中点矩形和SVGA动画 -/// - Parameter uids: 需要清理的用户UID数组 -- (void)removeMidpointRectsForUids:(NSArray *)uids; - -/// 设置并缓存CP列表 -- (void)setCpListCache:(NSArray *)cpList; - -/// 使用当前stageView重建麦位快照（position->uid），无用户记为-1 -- (void)rebuildMicSnapshotWithStageView:(id)stageView micCount:(NSInteger)micCount; - -/// 基于上一次快照与当前stageView的实际用户，生成“变动用户+左右邻居”的uid列表（字符串数组）并更新快照 -- (NSArray *)uidListForChangedMicWithStageView:(id)stageView micCount:(NSInteger)micCount; - -/// 计算本次与快照的差异，返回 @{ @"added": NSArray, @"removed": NSArray } 并更新快照 -- (NSDictionary *> *)diffMicChangeWithStageView:(id)stageView micCount:(NSInteger)micCount; - -/// 从缓存中移除包含这些uid的所有CP关系 -- (void)removeCpEntriesForUids:(NSArray *)uids; - -/// 用新列表替换指定uid相关的CP关系（先移除涉及这些uid的旧数据，再合并新数据） -- (void)mergeCpListCache:(NSArray *)cpList replaceForUids:(NSArray *)uids; - -/// 停止所有SVGA动画 -- (void)stopAllSVGAAnimations; - -/// 恢复所有CP关系的SVGA动画（用于开关重新开启时） -- (void)restoreAllCPAnimations; - -/// 处理下麦事件：移除相关用户的CP关系和SVGA显示 -/// - Parameters: -/// - downMicUids: 下麦用户的UID数组 -/// - stageView: 当前舞台视图 -/// - micCount: 麦位总数 -- (void)handleDownMicEvent:(NSArray *)downMicUids - stageView:(id)stageView - micCount:(NSInteger)micCount; - -#pragma mark - CP Business Logic Methods - -/// 处理麦位变化相关的CP逻辑 -- (void)handleMicChangeForCPWithStageView:(id)stageView - micCount:(NSInteger)micCount - queue:(NSMutableDictionary *)queue - currentUserUid:(NSInteger)currentUserUid - roomType:(NSInteger)roomType; - -/// 处理CP绑定或升级消息 -- (void)handleCPBindingOrUpgradeMessageWithStageView:(id)stageView - micCount:(NSInteger)micCount - queue:(NSMutableDictionary *)queue; - -/// 处理麦位关系CP消息 -- (void)handleMicRelationshipCPMessage:(NSArray *)cpList; - -/// 处理其他用户mic变化 -- (void)handleOtherUserMicChange:(UserInfoModel *)userInfo - changeType:(NSInteger)changeType - stageView:(id)stageView - micCount:(NSInteger)micCount - queue:(NSMutableDictionary *)queue - roomType:(NSInteger)roomType; - -/// 处理用户切换mic场景，确保所有CP SVGA状态正确更新 -- (void)handleMicSwitchScenarioIfNeededWithStageView:(id)stageView - micCount:(NSInteger)micCount - queue:(NSMutableDictionary *)queue - currentUserUid:(NSInteger)currentUserUid - roomType:(NSInteger)roomType; - -/// 处理下麦事件 -- (void)handleDownMicEventIfNeededWithStageView:(id)stageView - micCount:(NSInteger)micCount - queue:(NSMutableDictionary *)queue - roomType:(NSInteger)roomType; - -/// 更新CP列表缓存并重绘 -- (void)updateCpListCacheAndRedraw:(NSArray *)cpList - stageView:(id)stageView - micCount:(NSInteger)micCount - roomType:(NSInteger)roomType; - -/// 绘制社交舞台中点矩形 -- (void)drawSocialStageMidpointRectsWithStageView:(id)stageView - micCount:(NSInteger)micCount - roomType:(NSInteger)roomType; - -/// 移除指定用户的CP数据 -- (void)removeCpDataForUids:(NSArray *)uids; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicMidpointRectManager.m b/YuMi/Modules/YMRoom/View/StageView/MicMidpointRectManager.m deleted file mode 100644 index 0a5070e..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicMidpointRectManager.m +++ /dev/null @@ -1,729 +0,0 @@ -// -// MicMidpointRectManager.m -// YuMi -// -// Created by AI Assistant on 2024/12/19. -// - -#import "MicMidpointRectManager.h" -#import "MicCpInfoModel.h" -#import -#import "StageView.h" -#import -#import "XPTurboModeConstants.h" -#import -#import "RoomInfoModel.h" - -@class SVGAImageView; -@class SVGAParser; - -@interface MicMidpointRectManager () - -@property (nonatomic, strong) NSMutableArray *midpointRects; -@property (nonatomic, strong) NSMutableDictionary *svgaViews; -@property (nonatomic, strong) SVGAParser *svgaParser; -@property (nonatomic, strong) NSArray *cachedCpListInternal; -@property (nonatomic, strong) NSMutableDictionary *micPositionToUidInternal; // position->uid (-1 if empty) -@property (nonatomic, strong) NSMutableDictionary *midpointRectInfo; // frameKey -> @{@"leftUid": @(uid), @"rightUid": @(uid)} - -@end - -@implementation MicMidpointRectManager - -- (instancetype)initWithContainerView:(UIView *)containerView { - if (self = [super init]) { - _containerView = containerView; - _midpointRects = [NSMutableArray array]; - _svgaViews = [NSMutableDictionary dictionary]; - _svgaParser = [[SVGAParser alloc] init]; - _micPositionToUidInternal = [NSMutableDictionary dictionary]; - _midpointRectInfo = [NSMutableDictionary dictionary]; - _cpMicEnabled = YES; // 默认开启 - _roomType = 0; // 默认房间类型 - - // 设置通知监听 - [self setupNotifications]; - } - return self; -} - -- (NSArray *)cachedCpList { - return self.cachedCpListInternal ?: @[]; -} - -- (NSDictionary *)micPositionToUid { - return self.micPositionToUidInternal ?: @{}; -} - -- (void)addMidpointRectAtFrame:(CGRect)frame - micPairText:(NSString *)micPairText - autoPlaySVGA:(BOOL)autoPlaySVGA { - // 创建透明容器 - UIView *rectView = [[UIView alloc] initWithFrame:frame]; - rectView.backgroundColor = [UIColor clearColor]; - rectView.userInteractionEnabled = NO; - rectView.tag = 56002; - - - // 添加到容器视图 - [self.containerView addSubview:rectView]; - [self.midpointRects addObject:rectView]; - - // 如果需要自动播放SVGA动画且CP麦位开关开启且不是小游戏房 - if (autoPlaySVGA && self.cpMicEnabled && self.roomType != 7) { // 7 = RoomType_MiniGame - [self playSVGAAnimationAtFrame:frame]; - } - - NSLog(@"🔧 添加中点矩形: %@, frame: %@", micPairText, NSStringFromCGRect(frame)); -} - -- (void)addRelationshipAtFrame:(CGRect)frame - micPairText:(NSString *)micPairText - leftUid:(NSInteger)leftUid - rightUid:(NSInteger)rightUid - cpList:(NSArray *)cpList { - // 基础容器 - [self addMidpointRectAtFrame:frame micPairText:micPairText autoPlaySVGA:NO]; - - // 存储中点矩形的用户信息 - NSString *frameKey = NSStringFromCGRect(frame); - self.midpointRectInfo[frameKey] = @{ - @"leftUid": @(leftUid), - @"rightUid": @(rightUid) - }; - - if (cpList.count == 0) { - return; - } - - if (leftUid <= 0 && rightUid <= 0) { - return; - } - // 遍历匹配并播放对应等级的SVGA（仅在CP麦位开关开启且不是小游戏房时） - if (self.cpMicEnabled && self.roomType != 7) { // 7 = RoomType_MiniGame - for (MicCpInfoModel *obj in cpList) { - if (obj.cpLevel < 1) { - continue; - } - BOOL match = (obj.uid == leftUid && obj.loverUid == rightUid) || (obj.uid == rightUid && obj.loverUid == leftUid); - if (match) { - NSInteger safeLevel = MAX(1, MIN(5, obj.cpLevel)); - NSString *svgaName = [NSString stringWithFormat:@"mic_cp_lv%ld", (long)safeLevel]; - [self playSVGAAnimationAtFrame:frame withNamed:svgaName]; - break; - } - } - } -} - -#pragma mark - Cache & Snapshot - -- (void)setCpListCache:(NSArray *)cpList { - self.cachedCpListInternal = cpList ?: @[]; -} - -- (void)rebuildMicSnapshotWithStageView:(id)stageView micCount:(NSInteger)micCount { - [self.micPositionToUidInternal removeAllObjects]; - for (NSInteger i = 0; i < micCount; i++) { - NSInteger uid = -1; - if ([stageView respondsToSelector:@selector(findMicroViewByIndex:)]) { - UIView *microView = [(StageView *)stageView findMicroViewByIndex:i]; - if ([microView respondsToSelector:@selector(getUser)]) { - id userInfo = [microView performSelector:@selector(getUser)]; - if (userInfo && [userInfo respondsToSelector:@selector(uid)]) { - uid = (NSInteger)[userInfo valueForKey:@"uid"]; - if (uid <= 0) { uid = -1; } - } - } - } - self.micPositionToUidInternal[@(i)] = @(uid); - } -} - -- (NSArray *)uidListForChangedMicWithStageView:(id)stageView micCount:(NSInteger)micCount { - NSMutableSet *result = [NSMutableSet set]; - // 计算新状态 - NSMutableArray *newUids = [NSMutableArray arrayWithCapacity:micCount]; - for (NSInteger i = 0; i < micCount; i++) { - NSInteger uid = -1; - if ([stageView respondsToSelector:@selector(findMicroViewByIndex:)]) { - UIView *microView = [(StageView *)stageView findMicroViewByIndex:i]; - if ([microView respondsToSelector:@selector(getUser)]) { - id userInfo = [microView performSelector:@selector(getUser)]; - if (userInfo && [userInfo respondsToSelector:@selector(uid)]) { - uid = (NSInteger)[userInfo valueForKey:@"uid"]; - if (uid <= 0) { uid = -1; } - } - } - } - [newUids addObject:@(uid)]; - NSNumber *oldVal = self.micPositionToUidInternal[@(i)] ?: @(-1); - if (oldVal.integerValue != uid) { - // 该坑位发生变化，将该位及其左右邻居加入 - if (uid > 0) { [result addObject:@(uid)]; } - NSInteger leftIdx = i - 1; - NSInteger rightIdx = i + 1; - if (leftIdx >= 0) { - NSInteger leftUid = (leftIdx < newUids.count) ? newUids[leftIdx].integerValue : -1; - if (leftUid > 0) { [result addObject:@(leftUid)]; } - } - if (rightIdx < micCount) { - NSInteger rightUid = (rightIdx < newUids.count) ? newUids[rightIdx].integerValue : -1; - if (rightUid > 0) { [result addObject:@(rightUid)]; } - } - } - } - // 更新快照 - for (NSInteger i = 0; i < micCount; i++) { - self.micPositionToUidInternal[@(i)] = newUids[i]; - } - // 转字符串数组 - NSMutableArray *uids = [NSMutableArray arrayWithCapacity:result.count]; - for (NSNumber *num in result) { [uids addObject:num.stringValue]; } - return uids; -} - -- (NSDictionary *> *)diffMicChangeWithStageView:(id)stageView micCount:(NSInteger)micCount { - NSMutableArray *added = [NSMutableArray array]; - NSMutableArray *removed = [NSMutableArray array]; - for (NSInteger i = 0; i < micCount; i++) { - NSInteger uid = -1; - if ([stageView respondsToSelector:@selector(findMicroViewByIndex:)]) { - UIView *microView = [(StageView *)stageView findMicroViewByIndex:i]; - if ([microView respondsToSelector:@selector(getUser)]) { - id userInfo = [microView performSelector:@selector(getUser)]; - if (userInfo && [userInfo respondsToSelector:@selector(uid)]) { - uid = (NSInteger)[userInfo valueForKey:@"uid"]; - if (uid <= 0) { uid = -1; } - } - } - } - NSInteger oldUid = (self.micPositionToUidInternal[@(i)] ?: @(-1)).integerValue; - if (uid != oldUid) { - if (oldUid > 0 && uid == -1) { // 下麦 - [removed addObject:@(oldUid)]; - } else if (uid > 0) { // 上麦或换位到此 - [added addObject:@(uid)]; - } - } - self.micPositionToUidInternal[@(i)] = @(uid); - } - return @{ @"added": added.copy, @"removed": removed.copy }; -} - -- (void)removeCpEntriesForUids:(NSArray *)uids { - if (uids.count == 0 || self.cachedCpListInternal.count == 0) { return; } - NSMutableArray *filtered = [NSMutableArray array]; - NSSet *uidSet = [NSSet setWithArray:uids]; - for (id obj in self.cachedCpListInternal) { - NSInteger a = 0, b = 0; - if ([obj respondsToSelector:@selector(uid)]) { a = (NSInteger)[obj valueForKey:@"uid"]; } - if ([obj respondsToSelector:@selector(loverUid)]) { b = (NSInteger)[obj valueForKey:@"loverUid"]; } - if (![uidSet containsObject:@(a)] && ![uidSet containsObject:@(b)]) { - [filtered addObject:obj]; - } - } - self.cachedCpListInternal = filtered.copy; -} - -- (void)mergeCpListCache:(NSArray *)cpList replaceForUids:(NSArray *)uids { - // 先移除相关uid的旧数据 - [self removeCpEntriesForUids:uids]; - if (cpList.count == 0) { return; } - // 合并新数据 - NSMutableArray *merged = [self.cachedCpListInternal mutableCopy] ?: [NSMutableArray array]; - [merged addObjectsFromArray:cpList]; - self.cachedCpListInternal = merged.copy; -} - -- (void)removeAllMidpointRects { - // 停止所有SVGA动画 - [self stopAllSVGAAnimations]; - - // 移除所有中点矩形 - for (UIView *rectView in self.midpointRects) { - [rectView removeFromSuperview]; - } - [self.midpointRects removeAllObjects]; - [self.midpointRectInfo removeAllObjects]; - - NSLog(@"🔧 移除所有中点矩形"); -} - -- (void)removeMidpointRectAtFrame:(CGRect)frame { - // 停止对应位置的SVGA动画 - NSString *frameKey = NSStringFromCGRect(frame); - SVGAImageView *svgaView = self.svgaViews[frameKey]; - if (svgaView) { - [svgaView stopAnimation]; - [svgaView removeFromSuperview]; - [self.svgaViews removeObjectForKey:frameKey]; - } - - // 移除对应位置的中点矩形 - for (UIView *rectView in [self.midpointRects copy]) { - if (CGRectEqualToRect(rectView.frame, frame)) { - [rectView removeFromSuperview]; - [self.midpointRects removeObject:rectView]; - break; - } - } - - // 移除对应的用户信息 - [self.midpointRectInfo removeObjectForKey:frameKey]; - - NSLog(@"🔧 移除指定位置的中点矩形: %@", NSStringFromCGRect(frame)); -} - -- (void)playSVGAAnimationAtFrame:(CGRect)frame { - // 随机选择一个SVGA资源 - NSArray *svgaFiles = @[@"mic_cp_lv1", @"mic_cp_lv2", @"mic_cp_lv3", @"mic_cp_lv4", @"mic_cp_lv5"]; - NSString *randomSVGA = svgaFiles[arc4random_uniform((uint32_t)svgaFiles.count)]; - [self playSVGAAnimationAtFrame:frame withNamed:randomSVGA]; -} - -// 播放指定资源名SVGA -- (void)playSVGAAnimationAtFrame:(CGRect)frame withNamed:(NSString *)resourceName { - if (resourceName.length == 0) { return; } - NSString *svgaPath = [[NSBundle mainBundle] pathForResource:resourceName ofType:@"svga"]; - if (!svgaPath) { - NSLog(@"⚠️ 找不到SVGA文件: %@", resourceName); - return; - } - SVGAImageView *svgaView = [[SVGAImageView alloc] initWithFrame:frame]; - svgaView.contentMode = UIViewContentModeScaleAspectFit; - svgaView.userInteractionEnabled = NO; - svgaView.backgroundColor = [UIColor clearColor]; - [self.containerView addSubview:svgaView]; - NSString *frameKey = NSStringFromCGRect(frame); - self.svgaViews[frameKey] = svgaView; - [self.svgaParser parseWithURL:[NSURL fileURLWithPath:svgaPath] - completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - dispatch_async(dispatch_get_main_queue(), ^{ - svgaView.videoItem = videoItem; - svgaView.loops = 0; - svgaView.clearsAfterStop = YES; - [svgaView startAnimation]; - NSLog(@"🎬 开始播放SVGA动画: %@, frame: %@", resourceName, NSStringFromCGRect(frame)); - }); - } failureBlock:^(NSError * _Nonnull error) { - NSLog(@"❌ SVGA动画解析失败: %@, error: %@", resourceName, error.localizedDescription); - [svgaView removeFromSuperview]; - [self.svgaViews removeObjectForKey:frameKey]; - }]; -} - -- (void)stopAllSVGAAnimations { - for (SVGAImageView *svgaView in self.svgaViews.allValues) { - [svgaView stopAnimation]; - [svgaView removeFromSuperview]; - } - [self.svgaViews removeAllObjects]; - - NSLog(@"🔧 停止所有SVGA动画"); -} - -- (void)restoreAllCPAnimations { - if (!self.cpMicEnabled) { - NSLog(@"🔧 恢复CP动画：CP麦位开关未开启，跳过恢复"); - return; - } - - if (self.roomType == 7) { // 7 = RoomType_MiniGame - NSLog(@"🔧 恢复CP动画：当前为小游戏房，跳过恢复"); - return; - } - - if (self.midpointRectInfo.count == 0) { - NSLog(@"🔧 恢复CP动画：没有中点矩形信息，跳过恢复"); - return; - } - - if (self.cachedCpListInternal.count == 0) { - NSLog(@"🔧 恢复CP动画：没有CP关系缓存，跳过恢复"); - return; - } - - NSLog(@"🔧 恢复CP动画：开始恢复 %lu 个中点矩形的SVGA动画", (unsigned long)self.midpointRectInfo.count); - - // 遍历所有中点矩形信息，重新播放对应的SVGA动画 - for (NSString *frameKey in self.midpointRectInfo.allKeys) { - NSDictionary *rectInfo = self.midpointRectInfo[frameKey]; - NSNumber *leftUid = rectInfo[@"leftUid"]; - NSNumber *rightUid = rectInfo[@"rightUid"]; - - NSInteger leftUidValue = leftUid.integerValue; - NSInteger rightUidValue = rightUid.integerValue; - - if (leftUidValue <= 0 && rightUidValue <= 0) { - continue; - } - - // 从frameKey恢复CGRect - CGRect frame = CGRectFromString(frameKey); - - // 遍历CP列表，匹配并播放对应等级的SVGA - for (MicCpInfoModel *obj in self.cachedCpListInternal) { - BOOL match = (obj.uid == leftUidValue && obj.loverUid == rightUidValue) || - (obj.uid == rightUidValue && obj.loverUid == leftUidValue); - if (match) { - NSInteger safeLevel = MAX(1, MIN(5, obj.cpLevel+1)); - NSString *svgaName = [NSString stringWithFormat:@"mic_cp_lv%ld", (long)safeLevel]; - [self playSVGAAnimationAtFrame:frame withNamed:svgaName]; - NSLog(@"🔧 恢复CP动画：为位置 %@ 恢复SVGA动画 %@", frameKey, svgaName); - break; - } - } - } - - NSLog(@"🔧 恢复CP动画：完成恢复"); -} - -- (void)removeMidpointRectsForUids:(NSArray *)uids { - if (uids.count == 0) { - NSLog(@"🔧 基于UID清理：没有需要清理的用户，跳过处理"); - return; - } - - NSLog(@"🔧 基于UID清理：开始清理用户 %@ 相关的中点矩形和SVGA", uids); - - NSSet *uidSet = [NSSet setWithArray:uids]; - NSMutableArray *frameKeysToRemove = [NSMutableArray array]; - - // 遍历所有中点矩形信息，找出涉及下麦用户的矩形 - for (NSString *frameKey in self.midpointRectInfo.allKeys) { - NSDictionary *rectInfo = self.midpointRectInfo[frameKey]; - NSNumber *leftUid = rectInfo[@"leftUid"]; - NSNumber *rightUid = rectInfo[@"rightUid"]; - - // 检查是否涉及下麦用户 - if ([uidSet containsObject:leftUid] || [uidSet containsObject:rightUid]) { - [frameKeysToRemove addObject:frameKey]; - } - } - - // 移除相关的中点矩形和SVGA动画 - for (NSString *frameKey in frameKeysToRemove) { - CGRect frame = CGRectFromString(frameKey); - [self removeMidpointRectAtFrame:frame]; - } - - NSLog(@"🔧 基于UID清理完成：移除了 %lu 个中点矩形和SVGA动画", (unsigned long)frameKeysToRemove.count); -} - -- (void)handleDownMicEvent:(NSArray *)downMicUids - stageView:(id)stageView - micCount:(NSInteger)micCount { - if (downMicUids.count == 0) { - NSLog(@"🔧 处理下麦事件：没有下麦用户，跳过处理"); - return; - } - - NSLog(@"🔧 处理下麦事件：下麦用户 %@", downMicUids); - - // 1. 从缓存中移除相关用户的CP关系 - [self removeCpEntriesForUids:downMicUids]; - - // 2. 基于UID精确清理相关的中点矩形和SVGA动画 - [self removeMidpointRectsForUids:downMicUids]; - - // 3. 更新麦位快照 - [self rebuildMicSnapshotWithStageView:stageView micCount:micCount]; - - NSLog(@"🔧 下麦事件处理完成"); -} - -#pragma mark - CP Business Logic Methods - -/// 处理麦位变化相关的CP逻辑 -- (void)handleMicChangeForCPWithStageView:(id)stageView - micCount:(NSInteger)micCount - queue:(NSMutableDictionary *)queue - currentUserUid:(NSInteger)currentUserUid - roomType:(NSInteger)roomType { - NSLog(@"🔧 [Manager] 处理麦位变化相关的CP逻辑"); - - // 设置房间类型 - self.roomType = roomType; - - // 更新麦位快照 - [self rebuildMicSnapshotWithStageView:stageView micCount:micCount]; - - // 检测下麦用户并处理CP关系缓存 - [self handleDownMicEventIfNeededWithStageView:stageView micCount:micCount queue:queue roomType:roomType]; - - // 处理用户切换mic场景，确保所有CP SVGA状态正确更新 - [self handleMicSwitchScenarioIfNeededWithStageView:stageView micCount:micCount queue:queue currentUserUid:currentUserUid roomType:roomType]; - - NSLog(@"🔧 [Manager] 麦位变化CP逻辑处理完成"); -} - -/// 处理CP绑定或升级消息 -- (void)handleCPBindingOrUpgradeMessageWithStageView:(id)stageView - micCount:(NSInteger)micCount - queue:(NSMutableDictionary *)queue { - NSLog(@"🔧 [Manager] 处理CP绑定或升级消息"); - - if (!queue) { - NSLog(@"⚠️ [Manager] 无法获取当前麦位队列，跳过CP绑定/升级处理"); - return; - } - - NSLog(@"🔧 [Manager] CP绑定/升级消息处理完成"); -} - -/// 处理麦位关系CP消息 -- (void)handleMicRelationshipCPMessage:(NSArray *)cpList { - NSLog(@"🔧 [Manager] 处理麦位关系CP消息：接收到 %lu 条CP数据", (unsigned long)cpList.count); - - if (!cpList || cpList.count == 0) { - NSLog(@"⚠️ [Manager] CP数据为空，跳过处理"); - return; - } - - // 更新CP列表缓存 - [self setCpListCache:cpList]; - - NSLog(@"🔧 [Manager] 麦位关系CP消息处理完成"); -} - -/// 处理其他用户mic变化 -- (void)handleOtherUserMicChange:(UserInfoModel *)userInfo - changeType:(NSInteger)changeType - stageView:(id)stageView - micCount:(NSInteger)micCount - queue:(NSMutableDictionary *)queue - roomType:(NSInteger)roomType { - NSLog(@"🔧 [Manager] 处理其他用户mic变化：用户 %ld, 变化类型 %ld", (long)userInfo.uid, (long)changeType); - - // 设置房间类型 - self.roomType = roomType; - - NSInteger userUid = userInfo.uid; - - if (changeType == 2) { // 其他用户下麦 - // 更新快照 - [self rebuildMicSnapshotWithStageView:stageView micCount:micCount]; - - // 直接移除下麦用户的CP数据 - NSArray *removedUids = @[@(userUid)]; - [self removeCpEntriesForUids:removedUids]; - [self removeMidpointRectsForUids:removedUids]; - - NSLog(@"🔧 [Manager] 其他用户下麦处理完成"); - - } else if (changeType == 1) { // 其他用户上麦 - // 更新快照 - [self rebuildMicSnapshotWithStageView:stageView micCount:micCount]; - - NSLog(@"🔧 [Manager] 其他用户上麦处理完成"); - } -} - -/// 处理用户切换mic场景，确保所有CP SVGA状态正确更新 -- (void)handleMicSwitchScenarioIfNeededWithStageView:(id)stageView - micCount:(NSInteger)micCount - queue:(NSMutableDictionary *)queue - currentUserUid:(NSInteger)currentUserUid - roomType:(NSInteger)roomType { - NSLog(@"🔧 [Manager] 处理用户切换mic场景"); - - // 设置房间类型 - self.roomType = roomType; - - // 检查是否有用户切换mic - NSDictionary *> *micChanges = [self diffMicChangeWithStageView:stageView micCount:micCount]; - NSArray *addedUids = micChanges[@"added"]; - NSArray *removedUids = micChanges[@"removed"]; - - if (addedUids.count > 0 || removedUids.count > 0) { - NSLog(@"🔧 [Manager] 检测到麦位变化：上麦 %lu 人，下麦 %lu 人", (unsigned long)addedUids.count, (unsigned long)removedUids.count); - - // 只清除当前用户相关的CP数据，保护其他用户的CP SVGA - NSArray *currentUserUids = @[@(currentUserUid)]; - - // 1. 只清除当前用户相关的CP数据 - [self removeCpEntriesForUids:currentUserUids]; - [self removeMidpointRectsForUids:currentUserUids]; - - // 2. 重新构建麦位快照 - [self rebuildMicSnapshotWithStageView:stageView micCount:micCount]; - - NSLog(@"🔧 [Manager] 用户切换mic场景处理完成"); - } else { - NSLog(@"🔧 [Manager] 没有检测到麦位变化，跳过处理"); - } -} - -/// 处理下麦事件 -- (void)handleDownMicEventIfNeededWithStageView:(id)stageView - micCount:(NSInteger)micCount - queue:(NSMutableDictionary *)queue - roomType:(NSInteger)roomType { - NSLog(@"🔧 [Manager] 处理下麦事件"); - - // 设置房间类型 - self.roomType = roomType; - - // 使用 MicMidpointRectManager 检测麦位变化 - NSDictionary *> *micChanges = [self diffMicChangeWithStageView:stageView micCount:micCount]; - NSArray *removedUids = micChanges[@"removed"]; - - if (removedUids && removedUids.count > 0) { - NSLog(@"🔧 [Manager] 检测到下麦用户：%@", removedUids); - - // 直接移除下麦用户的CP数据 - [self removeCpEntriesForUids:removedUids]; - [self removeMidpointRectsForUids:removedUids]; - - NSLog(@"🔧 [Manager] 下麦事件处理完成"); - } else { - NSLog(@"🔧 [Manager] 没有检测到下麦用户，跳过处理"); - } -} - -/// 更新CP列表缓存并重绘 -- (void)updateCpListCacheAndRedraw:(NSArray *)cpList - stageView:(id)stageView - micCount:(NSInteger)micCount - roomType:(NSInteger)roomType { - NSLog(@"🔧 [Manager] 更新CP列表缓存并重绘：接收到 %lu 条CP数据", (unsigned long)cpList.count); - - // 设置房间类型 - self.roomType = roomType; - - // 更新CP列表缓存 - [self setCpListCache:cpList]; - - // 重绘社交舞台中点矩形 - [self drawSocialStageMidpointRectsWithStageView:stageView micCount:micCount roomType:roomType]; - - NSLog(@"🔧 [Manager] CP列表缓存更新和重绘完成"); -} - -/// 绘制社交舞台中点矩形 -- (void)drawSocialStageMidpointRectsWithStageView:(id)stageView - micCount:(NSInteger)micCount - roomType:(NSInteger)roomType { - NSLog(@"🔧 [Manager] 绘制社交舞台中点矩形：麦位总数 %ld", (long)micCount); - - // 设置房间类型 - self.roomType = roomType; - - // 移除旧的调试矩形 - [self removeAllMidpointRects]; - - if (micCount < 2) { - NSLog(@"🔧 [Manager] 麦位数量不足，跳过绘制"); - return; - } - - // 依据 stageView 类型获取有效的配对集合 - NSArray *> *validPairs = nil; - if ([stageView isKindOfClass:NSClassFromString(@"SocialStageView")]) { - validPairs = @[@[@1,@2], @[@2,@3], @[@3,@4], @[@5,@6], @[@6,@7], @[@7,@8]]; - } else if ([stageView isKindOfClass:NSClassFromString(@"TenMicStageView")]) { - validPairs = @[@[@0,@1], @[@1,@2], @[@2,@3], @[@3,@4], @[@5,@6], @[@6,@7], @[@7,@8], @[@8,@9]]; - } else if ([stageView isKindOfClass:NSClassFromString(@"FifteenMicStageView")]) { - validPairs = @[@[@0,@1], @[@1,@2], @[@2,@3], @[@3,@4], @[@5,@6], @[@6,@7], @[@7,@8], @[@8,@9], @[@10,@11], @[@11,@12], @[@12,@13], @[@13,@14]]; - } else if ([stageView isKindOfClass:NSClassFromString(@"NineteenMicStageView")]) { - validPairs = @[@[@0,@1], @[@1,@2], @[@2,@3], @[@3,@4], @[@5,@6], @[@8,@9], @[@10,@11], @[@12,@13], @[@14,@15], @[@15,@16], @[@16,@17], @[@17,@18]]; - } else if ([stageView isKindOfClass:NSClassFromString(@"TwentyMicStageView")]) { - validPairs = @[@[@0,@1], @[@1,@2], @[@2,@3], @[@3,@4], @[@5,@6], @[@6,@7], @[@7,@8], @[@8,@9], @[@10,@11], @[@11,@12], @[@12,@13], @[@13,@14], @[@15,@16], @[@16,@17], @[@17,@18], @[@18,@19]]; - } else if ([stageView isKindOfClass:NSClassFromString(@"AnchorStageView")]) { - validPairs = @[@[@1,@2], @[@2,@3]]; - } else if ([stageView isKindOfClass:NSClassFromString(@"DatingStageView")]) { - validPairs = @[@[@1,@2], @[@3,@4], @[@5,@6], @[@7,@8]]; - } else if ([stageView isKindOfClass:NSClassFromString(@"LittleGameStageView")] - || [stageView isKindOfClass:NSClassFromString(@"LittleGameScrollStageView")]) { - NSMutableArray *pairs = [NSMutableArray array]; - for (NSInteger i = 0; i < micCount - 1; i++) { [pairs addObject:@[@(i), @(i+1)]]; } - validPairs = pairs; - } else if ([stageView isKindOfClass:NSClassFromString(@"AnchorPKStageView")]) { - validPairs = @[@[@0,@1]]; - } else { - NSMutableArray *pairs = [NSMutableArray array]; - for (NSInteger i = 0; i < micCount - 1; i++) { [pairs addObject:@[@(i), @(i+1)]]; } - validPairs = pairs; - } - - // 遍历所有有效配对 - for (NSArray *pair in validPairs) { - NSInteger firstIndex = pair[0].integerValue; - NSInteger secondIndex = pair[1].integerValue; - - // 权威几何：从 stageView 获取中点矩形 - CGRect rect = CGRectZero; - if ([stageView respondsToSelector:@selector(rectForMidpointBetweenMicAtIndex:andIndex:)]) { - rect = (CGRect)[stageView rectForMidpointBetweenMicAtIndex:firstIndex andIndex:secondIndex]; - } - if (CGRectIsEmpty(rect)) { continue; } - - UIView *firstView = [stageView findMicroViewByIndex:firstIndex]; - UIView *secondView = [stageView findMicroViewByIndex:secondIndex]; - if (!firstView || !secondView) { continue; } - - UserInfoModel *firstUser = [firstView getUser]; - UserInfoModel *secondUser = [secondView getUser]; - if (!firstUser || !secondUser || firstUser.uid <= 0 || secondUser.uid <= 0) { continue; } - - NSString *micPairText = [NSString stringWithFormat:@"%ld-%ld", (long)firstIndex, (long)secondIndex]; - [self addRelationshipAtFrame:rect - micPairText:micPairText - leftUid:firstUser.uid - rightUid:secondUser.uid - cpList:self.cachedCpListInternal ?: @[]]; - } - - NSLog(@"🔧 [Manager] 社交舞台中点矩形绘制完成"); -} - -/// 移除指定用户的CP数据 -- (void)removeCpDataForUids:(NSArray *)uids { - NSLog(@"🔧 [Manager] 移除CP数据：UIDs %@", uids); - - if (uids.count == 0) { - NSLog(@"🔧 [Manager] 没有需要移除的用户，跳过处理"); - return; - } - - // 从缓存移除 - [self removeCpEntriesForUids:uids]; - // 从UI移除 - [self removeMidpointRectsForUids:uids]; - - NSLog(@"🔧 [Manager] CP数据移除完成"); -} - -#pragma mark - Dealloc - -- (void)setupNotifications { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleCpMicSwitchChanged:) - name:kTurboCpMicEnabledChanged - object:nil]; -} - -- (void)handleCpMicSwitchChanged:(NSNotification *)notification { - BOOL enabled = [notification.userInfo[@"on"] boolValue]; - self.cpMicEnabled = enabled; - - if (!enabled) { - // 开关关闭时，停止所有SVGA动画 - [self stopAllSVGAAnimations]; - NSLog(@"🔧 CP麦位开关已关闭，停止所有SVGA动画"); - } else { - // 开关开启时，重新绘制所有CP关系 - NSLog(@"🔧 CP麦位开关已开启，重新绘制CP关系"); - - // 🔧 修复：开关开启时，重新播放所有现有的CP关系SVGA动画 - [self restoreAllCPAnimations]; - } -} - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [self removeAllMidpointRects]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.h b/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.h deleted file mode 100644 index e0491b2..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// AnchorMicroView.h -// YUMI -// -// Created by YUMI on 2022/2/14. -// - -#import "MicroView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface AnchorMicroView : MicroView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.m deleted file mode 100644 index a8b4cb7..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.m +++ /dev/null @@ -1,150 +0,0 @@ -// -// AnchorMicroView.m -// YUMI -// -// Created by YUMI on 2022/2/14. -// - -#import "AnchorMicroView.h" -///Third -#import -#import -//SVGA动画播放 -#import "SVGA.h" -#import "SVGAParserManager.h" -#import "YUMIMacroUitls.h" -///View -#import "MicroWaveView.h" - -@interface AnchorMicroView () - -///个播主播的动画 -@property (nonatomic, strong) SVGAImageView *svgDisplayView; -@property (nonatomic, strong) SVGAParserManager *parserManager; -///当前坑位 -@property (nonatomic, assign) NSInteger position; - -@end - -@implementation AnchorMicroView - -- (void)initSubViews { - [super initSubViews]; - [self insertSubview:self.svgDisplayView belowSubview:self.avatarImageView]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(180); - make.center.equalTo(self.avatarImageView); - }]; -} - -#pragma mark - MicroViewProtocol -- (void)showGiftValueMode:(BOOL)isGiftValue { - if (self.position != -1) { - self.giftValueView.hidden = YES; - } else { - self.giftValueView.hidden = !isGiftValue; - } -} - -///重写父类方法，个播房默认一直为离开模式，不在此处处理离开模式蒙层 -- (void)showLeaveMode:(BOOL)isLeaveMode { -} - -- (void)configMicroView:(MicroQueueModel *)model { - [super configMicroView:model]; - UserInfoModel * userInfo = model.userInfo; - int position = model.microState.position; - self.position = position; - if (position != -1 && userInfo == nil) { - self.nickLabel.text = @""; - } - if (position == 0 || position == 1 || position == 2) { - self.headWearImageView.hidden = NO; - } else { - self.headWearImageView.hidden = YES; - } - ///更新离开模式蒙层 - if (position == -1) { - if (userInfo) { - if ([self.subviews containsObject:self.leaveLabel]) { - [self.leaveLabel removeFromSuperview]; - } - self.avatarImageView.imageUrl = userInfo.avatar; - } else { - if (![self.subviews containsObject:self.leaveLabel]) { - [self insertSubview:self.leaveLabel belowSubview:self.giftValueView]; - [self.leaveLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.avatarImageView); - }]; - self.leaveLabel.layer.cornerRadius = self.frame.size.width * 0.5; - self.leaveLabel.layer.masksToBounds = YES; - } - } - self.micStateImageView.image = [UIImage imageNamed:@"room_position_mute_Anchor"]; - [self.micStateImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.avatarImageView).mas_offset(-2); - make.trailing.mas_equalTo(self.avatarImageView).mas_offset(-(120 / 4) +11); - make.width.height.mas_equalTo(22); - }]; - ///主播添加光圈动画 - self.svgDisplayView.hidden = NO; - @weakify(self); - NSString * anatomiser1Name = [NSString stringWithFormat:@"%@/anchor_room_speak.svga", API_Image_URL]; - NSURL *bgUrl = [NSURL URLWithString:anatomiser1Name]; - [self.parserManager loadSvgaWithURL:bgUrl completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @strongify(self); - self.svgDisplayView.loops = INT_MAX; - self.svgDisplayView.clearsAfterStop = NO; - self.svgDisplayView.videoItem = videoItem; - [self.svgDisplayView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { - }]; - } else { - self.svgDisplayView.hidden = YES; - } -} - -- (void)configUser:(UserInfoModel *)userInfo { - [super configUser:userInfo]; - self.postionLabel.hidden = YES; - if (self.position == -1) {///房主不需要截取昵称的5个字符 - self.nickLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - NSString *nickStr = userInfo.nick; - if (userInfo.nick.length > 10) { - nickStr = [NSString stringWithFormat:@"%@…", [userInfo.nick substringToIndex:10]]; - } - self.nickLabel.text = nickStr.length > 0 ? nickStr : @""; - } -} - -- (void)userSpeaking { - if (self.position != -1) { - [self.animationView startWaveAnimation]; - } -} - -#pragma mark - setter and getter -- (SVGAParserManager *)parserManager { - if (!_parserManager) { - _parserManager = [[SVGAParserManager alloc]init]; - } - return _parserManager; -} - -- (SVGAImageView *)svgDisplayView { - if (_svgDisplayView == nil) { - _svgDisplayView = [[SVGAImageView alloc]init]; - _svgDisplayView.contentMode = UIViewContentModeScaleToFill; - _svgDisplayView.userInteractionEnabled = NO; - _svgDisplayView.frame = CGRectMake(0, 0, 384, 384); - _svgDisplayView.hidden = YES; - _svgDisplayView.backgroundColor = [UIColor clearColor]; - } - return _svgDisplayView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.h b/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.h deleted file mode 100644 index d0fb2f6..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// AnchorPKMicroView.h -// YUMI -// -// Created by YUMI on 2022/4/11. -// - -#import "MicroView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface AnchorPKMicroView : MicroView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.m deleted file mode 100644 index 2fc1de9..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.m +++ /dev/null @@ -1,152 +0,0 @@ -// -// AnchorPKMicroView.m -// YUMI -// -// Created by YUMI on 2022/4/11. -// - -#import "AnchorPKMicroView.h" -///Third -#import -#import -#import "SVGAParserManager.h" -#import -#import "YUMIMacroUitls.h" -@interface AnchorPKMicroView () - -///个播主播的动画 -@property (nonatomic, strong) SVGAImageView *svgDisplayView; -@property (nonatomic, strong) SVGAParserManager *parserManager; - -///当前坑位 -@property (nonatomic, assign) NSInteger position; - -@end - -@implementation AnchorPKMicroView - -- (void)initSubViews { - [super initSubViews]; - [self insertSubview:self.svgDisplayView belowSubview:self.avatarImageView]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(85 * 1.5); - make.center.equalTo(self.avatarImageView); - }]; -} - -#pragma mark - MicroViewProtocol -- (void)showGiftValueMode:(BOOL)isGiftValue { - self.giftValueView.hidden = YES; - if (self.position != -1) { - self.giftValueView.hidden = YES; - } else { - self.giftValueView.hidden = !isGiftValue; - } -} - -///重写父类方法，个播房默认一直为离开模式，不在此处处理离开模式蒙层 -- (void)showLeaveMode:(BOOL)isLeaveMode { -} - -- (void)configMicroView:(MicroQueueModel *)model { - [super configMicroView:model]; - RoomInfoModel * roomInfo = self.getRoomInfo; - UserInfoModel * userInfo = model.userInfo; - int position = model.microState.position; - self.position = position; - if (position != -1 && userInfo == nil) { - self.nickLabel.text = @""; - } - if (roomInfo.type == RoomType_Anchor && roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { - self.stackView.hidden = YES; - } - self.nickLabel.hidden = YES; - self.postionLabel.hidden = YES; - self.headWearImageView.hidden = YES; - - NSString *nickStr = userInfo.nick; - if (userInfo.nick.length > 5) { - nickStr = [NSString stringWithFormat:@"%@…", [userInfo.nick substringToIndex:5]]; - } - - ///更新离开模式蒙层 - if (position == -1) { - if (userInfo) { - if ([self.subviews containsObject:self.leaveLabel]) { - [self.leaveLabel removeFromSuperview]; - } - } else { - if (![self.subviews containsObject:self.leaveLabel]) { - [self insertSubview:self.leaveLabel belowSubview:self.giftValueView]; - [self.leaveLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.avatarImageView); - }]; - self.leaveLabel.layer.cornerRadius = self.frame.size.width * 0.5; - self.leaveLabel.layer.masksToBounds = YES; - } - } - self.micStateImageView.image = [UIImage imageNamed:@"room_position_mute_Anchor"]; - [self.micStateImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.avatarImageView).mas_offset(-2); - make.trailing.mas_equalTo(self.avatarImageView).mas_offset(-(120 / 4) +11); - make.width.height.mas_equalTo(22); - }]; - } - [self.stackView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).mas_offset(17); - }]; - - ///主播添加光圈动画 - self.svgDisplayView.hidden = NO; - @weakify(self); - NSString * anatomiser1Name = [NSString stringWithFormat:@"%@/anchor_room_speak.svga", API_Image_URL]; - NSURL *bgUrl = [NSURL URLWithString:anatomiser1Name]; - [self.parserManager loadSvgaWithURL:bgUrl completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @strongify(self); - self.svgDisplayView.loops = INT_MAX; - self.svgDisplayView.clearsAfterStop = NO; - self.svgDisplayView.videoItem = videoItem; - [self.svgDisplayView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { - }]; - -} - -- (void)configUser:(UserInfoModel *)userInfo { - [super configUser:userInfo]; - self.sexImageView.hidden = YES; - if (self.position == -1) { - [self.giftValueView removeFromSuperview]; - } - [self addSubview:self.giftValueView]; - [self.giftValueView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(16); - make.top.mas_equalTo(self.stackView.mas_bottom).mas_offset(10); - make.centerX.mas_equalTo(self.avatarImageView); - }]; -} - -#pragma mark - getter -- (SVGAParserManager *)parserManager { - if (!_parserManager) { - _parserManager = [[SVGAParserManager alloc]init]; - } - return _parserManager; -} - -- (SVGAImageView *)svgDisplayView { - if (_svgDisplayView == nil) { - _svgDisplayView = [[SVGAImageView alloc]init]; - _svgDisplayView.contentMode = UIViewContentModeScaleToFill; - _svgDisplayView.userInteractionEnabled = NO; - _svgDisplayView.frame = CGRectMake(0, 0, 384, 384); - _svgDisplayView.hidden = YES; - _svgDisplayView.backgroundColor = [UIColor clearColor]; - } - return _svgDisplayView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/ArabMicroView.h b/YuMi/Modules/YMRoom/View/StageView/MicroView/ArabMicroView.h deleted file mode 100644 index 976a321..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/ArabMicroView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// ArabMicroView.h -// YuMi -// -// Created by P on 2024/6/26. -// - -#import "MicroView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface ArabMicroView : MicroView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/ArabMicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/ArabMicroView.m deleted file mode 100644 index a07e4bd..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/ArabMicroView.m +++ /dev/null @@ -1,48 +0,0 @@ -// -// ArabMicroView.m -// YuMi -// -// Created by P on 2024/6/26. -// - -#import "ArabMicroView.h" -#import "ThemeColor+Room.h" -#import "ClientConfig.h" - -@interface ArabMicroView () -///当前坑位 -@property (nonatomic, assign) NSInteger position; - -@end - -@implementation ArabMicroView - -- (void)configMicroView:(MicroQueueModel *)model { - model.microState.indexOffset = 1; - self.position = model.microState.position; - [super configMicroView:model]; - MicroStateModel * micState = model.microState; - - UIImage *image; - if (micState.posState == MicroPosStateType_Free) { - image = [UIImage imageNamed:@"room_position_normal"]; - } else { - image = [UIImage imageNamed:@"room_position_lock"]; - } - - CGSize scaledToSize = CGSizeMake(self.frame.size.width, self.frame.size.width); - UIGraphicsBeginImageContextWithOptions(scaledToSize, false, 0.0); - // 缩小 “1” 点儿，防止默认背景的边缘被裁减。 - [image drawInRect:CGRectMake(1, 1, scaledToSize.width - 2, scaledToSize.height - 2)]; - UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - self.avatarImageView.backgroundColor = [UIColor colorWithPatternImage:newImage]; -} - -- (void)configUser:(UserInfoModel *)userInfo { - [super configUser:userInfo]; - self.stackView.axis = UILayoutConstraintAxisVertical; - self.nickLabel.hidden = NO; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/DatingMicroView.h b/YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/DatingMicroView.h deleted file mode 100644 index 56e28b6..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/DatingMicroView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// DatingMicroView.h -// YUMI -// -// Created by YUMI on 2022/1/5. -// - -#import "MicroView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface DatingMicroView : MicroView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/DatingMicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/DatingMicroView.m deleted file mode 100644 index 657bbe2..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/DatingMicroView.m +++ /dev/null @@ -1,317 +0,0 @@ -// -// DatingMicroView.m -// YUMI -// -// Created by YUMI on 2022/1/5. -// - -#import "DatingMicroView.h" -///Third -#import -///Tool -#import "NetImageView.h" -#import "AccountInfoStorage.h" - -@interface DatingMicroView () -///相亲模式的 帽子的图片 -@property (nonatomic,strong) NetImageView *capImageView; -///是不是选择了人 -@property (nonatomic,strong) UIButton *pickButton; -///相亲是男方 还是女方 -@property (nonatomic,strong) UIImageView *datingTypeView; -///相亲的vip头像框 -@property (nonatomic,strong) UIImageView *vipHeadWearImageView; -@end - -@implementation DatingMicroView - -- (void)initSubViews { - [super initSubViews]; - [self insertSubview:self.capImageView aboveSubview:self.headWearImageView]; - [self insertSubview:self.datingTypeView belowSubview:self.headWearImageView]; - [self insertSubview:self.vipHeadWearImageView aboveSubview:self.datingTypeView]; - [self addSubview:self.pickButton]; - -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.capImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.headWearImageView); - }]; - - [self.pickButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(37, 14)); - make.centerX.mas_equalTo(self.avatarImageView); - make.centerY.mas_equalTo(self.avatarImageView.mas_bottom).mas_offset(-2); - }]; - - [self.datingTypeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.avatarImageView); - }]; - - [self.vipHeadWearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.capImageView); - }]; -} - - -- (void)configMicroView:(MicroQueueModel *)model { - [super configMicroView:model]; - RoomInfoModel * roomInfo = self.getRoomInfo; - UserInfoModel * userInfo = model.userInfo; - NSMutableDictionary * micQueue = [self getMicroQueue]; - NSString * typeImageName = @""; - int position = model.microState.position; - - if (userInfo == nil || userInfo.uid <= 0) { - if (position == -1) { - self.postionLabel.hidden = YES; - self.nickLabel.text = YMLocalizedString(@"DatingMicroView0"); - self.sexImageView.hidden = YES; - self.nickLabel.hidden = NO; - } else if(position == 999) { - self.postionLabel.hidden = YES; - self.nickLabel.hidden = YES; - self.sexImageView.hidden = YES; - } - } else { - if (position == 999) { - self.postionLabel.hidden = YES; - self.nickLabel.hidden = NO; - self.sexImageView.hidden = YES; - } else { - if (position == -1) { - self.postionLabel.hidden = YES; - self.sexImageView.hidden = YES; - } else { - self.postionLabel.hidden = NO; - self.sexImageView.hidden = YES; - } - self.nickLabel.hidden = NO; - } - } - NSString *nickStr = userInfo.nick; - if (userInfo.nick.length > 5) { - nickStr = [NSString stringWithFormat:@"%@…", [userInfo.nick substringToIndex:5]]; - } - ///相亲的对象 男神队 女神队 - if (position == 2 || position == 3 || position == 6 || position == 7) { - self.nickLabel.text = nickStr.length > 0 ? nickStr : YMLocalizedString(@"DatingMicroView1"); - self.datingTypeView.hidden = NO; - typeImageName = @"room_position_dating_male_bg"; - self.datingTypeView.image = [UIImage imageNamed:typeImageName]; - model.microState.datingMicType = DatingMicType_Female; - } else if(position == 0 || position == 1 || position == 4 || position == 5){ - self.nickLabel.text = nickStr.length > 0 ? nickStr : YMLocalizedString(@"DatingMicroView2"); - self.datingTypeView.hidden = NO; - typeImageName = @"room_position_dating_female_bg"; - self.datingTypeView.image = [UIImage imageNamed:typeImageName]; - model.microState.datingMicType = DatingMicType_Male; - } else { - self.datingTypeView.hidden = YES; - model.microState.datingMicType = DatingMicType_Other; - } - ///相亲的帽子 - if (userInfo && userInfo.capUrl.length > 0) { - self.capImageView.imageUrl = userInfo.capUrl; - self.capImageView.hidden = NO; - } else { - self.capImageView.hidden = YES; - } - - if (model && position == 999) {///相亲模式VIP坑位不显示头饰（显示默认头饰） - self.vipHeadWearImageView.hidden = NO; - if (roomInfo.blindDateState == RoomPlayDateingType_Talk || roomInfo.blindDateState == RoomPlayDateingType_Finish) { - self.vipHeadWearImageView.image = [UIImage getLanguageImage:@"room_mode_dating_vip_title"]; - } else { - if (userInfo) { - self.vipHeadWearImageView.image = [UIImage imageNamed:@"room_mode_dating_vip"]; - } else { - self.vipHeadWearImageView.image = [UIImage getLanguageImage:@"room_mode_dating_vip_title"]; - } - } - } else { - if (position != -1 && userInfo && userInfo.vipMic) { - self.vipHeadWearImageView.hidden = NO; - if (roomInfo.blindDateState == RoomPlayDateingType_Talk || roomInfo.blindDateState == RoomPlayDateingType_Finish) { - self.vipHeadWearImageView.image = [UIImage getLanguageImage:@"room_mode_dating_vip_title"]; - } else { - self.vipHeadWearImageView.image = [UIImage imageNamed:@"room_mode_dating_vip"]; - } - } else { - self.vipHeadWearImageView.hidden = YES; - } - } - - self.pickButton.hidden = YES; - if (position == -1) {return;} - - ///相亲进行的阶段 - if (roomInfo.blindDateState == RoomPlayDateingType_Pick) { - if (userInfo) { - self.pickButton.hidden = NO; - [self configPickTitle:@"未选择" backmImageName:@"room_mode_dating_not_select"]; - } - ///如果我是主持的话 主持人视角 可以看到麦上用户的选择情况，精准到选择对象 - MicroQueueModel * presideModel = [self.getMicroQueue objectForKey:@"-1"]; - if (presideModel.userInfo && presideModel.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - if (userInfo) { - self.pickButton.hidden = NO; - if (userInfo.vipMic || position == 999) { - ///是不是选择了人 - if (userInfo.hasSelectUser) { - [self.pickButton setTitle:[NSString stringWithFormat:YMLocalizedString(@"DatingMicroView3"), (userInfo.selectMicPosition + 1)] forState:UIControlStateNormal]; - [self.pickButton setBackgroundImage:nil forState:UIControlStateNormal]; - } else { - [self.pickButton setTitle:YMLocalizedString(@"DatingMicroView4") forState:UIControlStateNormal]; - [self.pickButton setBackgroundImage:nil forState:UIControlStateNormal]; - } - } else { - ///是不是选择了人 - if (userInfo.hasSelectUser) { - MicroQueueModel *sequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", userInfo.selectMicPosition]]; - NSString *selectNum; - if (sequence.userInfo.vipMic) { - selectNum = YMLocalizedString(@"DatingMicroView5"); - } else { - selectNum = [NSString stringWithFormat:YMLocalizedString(@"DatingMicroView6"), (userInfo.selectMicPosition + 1)]; - } - if (model.microState.datingMicType == DatingMicType_Male) { - [self configPickTitle:selectNum backmImageName:@"room_mode_dating_male_select"]; - } else { - [self configPickTitle:selectNum backmImageName:@"room_mode_dating_female_select"]; - } - } else { - [self configPickTitle:YMLocalizedString(@"DatingMicroView7") backmImageName:@"room_mode_dating_not_select"]; - } - } - } - } else { - ///观众视角视角 嘉po 动对象 - if (userInfo) { - self.pickButton.hidden = NO; - if (userInfo.vipMic || position ==999) { - ///是不是选择了人 - if (userInfo.hasSelectUser) { - ///如果是自己的话 - if (userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - [self.pickButton setTitle:[NSString stringWithFormat:YMLocalizedString(@"DatingMicroView8"), (userInfo.selectMicPosition + 1)] forState:UIControlStateNormal]; - [self.pickButton setBackgroundImage:nil forState:UIControlStateNormal]; - } else { - [self.pickButton setTitle:YMLocalizedString(@"DatingMicroView9") forState:UIControlStateNormal]; - [self.pickButton setBackgroundImage:nil forState:UIControlStateNormal]; - } - } else { - [self.pickButton setTitle:YMLocalizedString(@"DatingMicroView10") forState:UIControlStateNormal]; - [self.pickButton setBackgroundImage:nil forState:UIControlStateNormal]; - } - } else { - ///是不是选择了人 - if (userInfo.hasSelectUser) { - ///如果是自己的话 - if (userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - MicroQueueModel *sequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", userInfo.selectMicPosition]]; - NSString *selectNum; - if (sequence.userInfo.vipMic) { - selectNum = YMLocalizedString(@"DatingMicroView5"); - } else { - selectNum = [NSString stringWithFormat:YMLocalizedString(@"DatingMicroView12"), (userInfo.selectMicPosition + 1)]; - } - if (model.microState.datingMicType == DatingMicType_Male) { - [self configPickTitle:selectNum backmImageName:@"room_mode_dating_male_select"]; - } else { - [self configPickTitle:selectNum backmImageName:@"room_mode_dating_female_select"]; - } - } else { - if (model.microState.datingMicType == DatingMicType_Male) { - [self configPickTitle:YMLocalizedString(@"DatingMicroView13") backmImageName:@"room_mode_dating_male_select"]; - } else { - [self configPickTitle:YMLocalizedString(@"DatingMicroView14") backmImageName:@"room_mode_dating_female_select"]; - } - } - } else { - [self configPickTitle:YMLocalizedString(@"DatingMicroView15") backmImageName:@"room_mode_dating_not_select"]; - } - } - } - } - } else if(roomInfo.blindDateState == RoomPlayDateingType_Result || roomInfo.blindDateState == RoomPlayDateingType_Finish) { - ///公布结果的时候 都可以看到 - if (userInfo) { - self.pickButton.hidden = NO; - if (userInfo.vipMic || position == 999) { - ///是不是选择了人 - if (userInfo.hasSelectUser) { - [self.pickButton setTitle:[NSString stringWithFormat:YMLocalizedString(@"DatingMicroView16"), (userInfo.selectMicPosition + 1)] forState:UIControlStateNormal]; - [self.pickButton setBackgroundImage:nil forState:UIControlStateNormal]; - } else { - [self.pickButton setTitle:YMLocalizedString(@"DatingMicroView17") forState:UIControlStateNormal]; - [self.pickButton setBackgroundImage:nil forState:UIControlStateNormal]; - } - } else { - ///是不是选择了人 - if (userInfo.hasSelectUser) { - MicroQueueModel *sequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", userInfo.selectMicPosition]]; - NSString *selectNum; - if (sequence.userInfo.vipMic) { - selectNum = YMLocalizedString(@"DatingMicroView5"); - } else { - selectNum = [NSString stringWithFormat:YMLocalizedString(@"DatingMicroView19"), (userInfo.selectMicPosition + 1)]; - } - if (model.microState.datingMicType == DatingMicType_Male) { - [self configPickTitle:selectNum backmImageName:@"room_mode_dating_male_select"]; - } else { - [self configPickTitle:selectNum backmImageName:@"room_mode_dating_female_select"]; - } - } else { - [self configPickTitle:YMLocalizedString(@"DatingMicroView20") backmImageName:@"room_mode_dating_not_select"]; - } - } - } - - } -} - -- (void)configPickTitle:(NSString *)title backmImageName:(NSString *)backImageName { - [self.pickButton setTitle:title forState:UIControlStateNormal]; - [self.pickButton setBackgroundImage:[UIImage imageNamed:backImageName] forState:UIControlStateNormal]; -} - - -- (UIImageView *)datingTypeView { - if (!_datingTypeView) { - _datingTypeView = [[UIImageView alloc] init]; - _datingTypeView.userInteractionEnabled = YES; - } - return _datingTypeView; -} - -- (NetImageView *)capImageView { - if (!_capImageView) { - _capImageView = [[NetImageView alloc] init]; - } - return _capImageView; -} - -- (UIButton *)pickButton { - if (!_pickButton) { - _pickButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_pickButton setTitle:YMLocalizedString(@"DatingMicroView21") forState:UIControlStateNormal]; - _pickButton.titleLabel.font = [UIFont systemFontOfSize:9]; - _pickButton.userInteractionEnabled = NO; - _pickButton.hidden = YES; - } - return _pickButton; -} - -- (UIImageView *)vipHeadWearImageView { - if (!_vipHeadWearImageView) { - _vipHeadWearImageView = [[UIImageView alloc] init]; - _vipHeadWearImageView.userInteractionEnabled = YES; - _vipHeadWearImageView.hidden = YES; - } - return _vipHeadWearImageView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/MicroDatingProgressView.h b/YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/MicroDatingProgressView.h deleted file mode 100644 index 0111e7c..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/MicroDatingProgressView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MicroDatingProgressView.h -// YUMI -// -// Created by YUMI on 2022/1/4. -// - -#import -#import "RoomInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MicroDatingProgressView : UIView -///相亲的阶段 -@property (nonatomic,assign) RoomPlayDateingType blindDateState; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/MicroDatingProgressView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/MicroDatingProgressView.m deleted file mode 100644 index 7aa6abb..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/MicroDatingProgressView.m +++ /dev/null @@ -1,108 +0,0 @@ -// -// MicroDatingProgressView.m -// YUMI -// -// Created by YUMI on 2022/1/4. -// - -#import "MicroDatingProgressView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "TTPopup.h" -#import "YUMIHtmlUrl.h" -#import "YUMIMacroUitls.h" -///View -#import "XPRoomDatingWebAlertView.h" - -@interface MicroDatingProgressView () -///心动现场 -@property (nonatomic,strong) UIImageView *heartSceneImageView; -///嘉宾交流 -@property (nonatomic,strong) UIButton *talkButton; - -@end - -@implementation MicroDatingProgressView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.heartSceneImageView]; - [self addSubview:self.talkButton]; -} - -- (void)initSubViewConstraints { - [self.heartSceneImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(95 * kScreenScale, 84 * kScreenScale)); - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self).offset(12 * kScreenScale); - }]; - - [self.talkButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.heartSceneImageView.mas_bottom).offset(8 * kScreenScale); - make.size.mas_equalTo(CGSizeMake(65 *kScreenScale, 21 * kScreenScale)); - make.centerX.mas_equalTo(self.heartSceneImageView); - }]; -} - -#pragma mark - Event Response -- (void)tapDatingRuleRecognizer { - [TTPopup dismiss]; - XPRoomDatingWebAlertView * webView = [[XPRoomDatingWebAlertView alloc] init]; - webView.url = URLWithType(kRoomDatingRule); - [TTPopup popupView:webView style:TTPopupStyleAlert]; -} - -#pragma mark - Getters And Setters -- (void)setBlindDateState:(RoomPlayDateingType)blindDateState { - _blindDateState = blindDateState; - NSString *talkTitle = YMLocalizedString(@"MicroDatingProgressView0"); - switch (_blindDateState) { - case RoomPlayDateingType_Talk: - talkTitle = YMLocalizedString(@"MicroDatingProgressView1"); - break; - case RoomPlayDateingType_Pick: - talkTitle = YMLocalizedString(@"MicroDatingProgressView2"); - break; - case RoomPlayDateingType_Result: - talkTitle = YMLocalizedString(@"MicroDatingProgressView3"); - break; - default: - break; - } - [self.talkButton setTitle:talkTitle forState:UIControlStateNormal]; -} - -- (UIImageView *)heartSceneImageView { - if (!_heartSceneImageView) { - _heartSceneImageView = [[UIImageView alloc] init]; - _heartSceneImageView.userInteractionEnabled = YES; - _heartSceneImageView.image = [UIImage getLanguageImage:@"room_mode_dating_heart_icon"]; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapDatingRuleRecognizer)]; - [_heartSceneImageView addGestureRecognizer:tap]; - } - return _heartSceneImageView; -} - -- (UIButton *)talkButton { - if (_talkButton == nil) { - _talkButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_talkButton setTitle:YMLocalizedString(@"MicroDatingProgressView4") forState:UIControlStateNormal]; - [_talkButton setTitleColor:UIColorFromRGB(0xFFE1E8) forState:UIControlStateNormal]; - _talkButton.titleLabel.font = [UIFont boldSystemFontOfSize:13]; - _talkButton.titleLabel.textAlignment = NSTextAlignmentCenter; - [_talkButton setBackgroundImage:[UIImage imageNamed:@"room_mode_dating_progress_bg"] forState:UIControlStateNormal]; - } - return _talkButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/LittleGame/LittleGameMicroView.h b/YuMi/Modules/YMRoom/View/StageView/MicroView/LittleGame/LittleGameMicroView.h deleted file mode 100644 index 4506bd4..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/LittleGame/LittleGameMicroView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// LittleGameMicroView.h -// YUMI -// -// Created by YUMI on 2022/2/11. -// - -#import "MicroView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface LittleGameMicroView : MicroView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/LittleGame/LittleGameMicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/LittleGame/LittleGameMicroView.m deleted file mode 100644 index c2fb25b..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/LittleGame/LittleGameMicroView.m +++ /dev/null @@ -1,107 +0,0 @@ -// -// LittleGameMicroView.m -// YUMI -// -// Created by YUMI on 2022/2/11. -// - -#import "LittleGameMicroView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" - -@interface LittleGameMicroView () -///状态的按钮 -@property (nonatomic,strong) UIButton *stateButton; -@end - -@implementation LittleGameMicroView - - -- (void)initSubViews { - [super initSubViews]; - [self insertSubview:self.stateButton belowSubview:self.micStateImageView]; -} - -- (void)initSubViewConstraints { - [super initSubViewConstraints]; - [self.stateButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(40); - make.height.mas_equalTo(16); - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self.avatarImageView.mas_bottom); - }]; -} - -- (void)configMicroView:(MicroQueueModel *)model { - model.microState.indexOffset = 1; - [super configMicroView:model]; - UserInfoModel * info = model.userInfo; - self.stateButton.hidden = NO; - self.sexImageView.hidden = YES; - if (info.uid == self.getRoomInfo.uid) {//房主 - [self.stateButton setTitle:YMLocalizedString(@"LittleGameMicroView0") forState:UIControlStateNormal]; - [self.stateButton setBackgroundColor:UIColorFromRGB(0x20AAF5)]; - } else { - if (info.gameStatus == LittleGamePlayStatus_NoIn) { //未加入游戏 - self.stateButton.hidden = YES; - } else if (info.gameStatus == LittleGamePlayStatus_IsIn) { - [self.stateButton setTitle:YMLocalizedString(@"LittleGameMicroView1") forState:UIControlStateNormal]; - [self.stateButton setBackgroundColor:UIColorFromRGB(0xFC4F6D)]; - } else if (info.gameStatus == LittleGamePlayStatus_Ready) { - [self.stateButton setTitle:YMLocalizedString(@"LittleGameMicroView2") forState:UIControlStateNormal]; - [self.stateButton setBackgroundColor:UIColorFromRGB(0x56D41A)]; - } else if (info.gameStatus == LittleGamePlayStatus_Plying) { - [self.stateButton setTitle:YMLocalizedString(@"LittleGameMicroView3") forState:UIControlStateNormal]; - [self.stateButton setBackgroundColor:UIColorFromRGB(0xFFA936)]; - } else { - self.stateButton.hidden = YES; - } - } - if (info.nick.length > 0) { - NSString *nickStr = info.nick; - if (nickStr.length > 3) { - nickStr = [NSString stringWithFormat:@"%@…", [nickStr substringToIndex:3]]; - } - self.nickLabel.text = nickStr; - } - - if (model.microState.position == -1) { - self.nickLabel.hidden = NO; - self.postionLabel.hidden = NO; - } - - [self.stackView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(6); - }]; -} - -- (void)configUser:(UserInfoModel *)userInfo { - [super configUser:userInfo]; - - [self.giftValueView removeFromSuperview]; - [self addSubview:self.giftValueView]; - [self.giftValueView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(16); - make.top.mas_equalTo(self.stackView.mas_bottom).mas_offset(5); - make.centerX.mas_equalTo(self.avatarImageView); - }]; -} - -#pragma mark - Getters And Setters -- (UIButton *)stateButton { - if (!_stateButton) { - _stateButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_stateButton setTitle:YMLocalizedString(@"LittleGameMicroView4") forState:UIControlStateNormal]; - [_stateButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _stateButton.titleLabel.font = [UIFont systemFontOfSize:10]; - [_stateButton setBackgroundColor:UIColorFromRGB(0xFFA936)]; - _stateButton.layer.masksToBounds = YES; - _stateButton.layer.cornerRadius = 8; - _stateButton.layer.borderColor = UIColor.whiteColor.CGColor; - _stateButton.layer.borderWidth = 1; - } - return _stateButton; -} -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.h b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.h deleted file mode 100644 index ca7b599..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// MicroGiftValueView.h -// YUMI -// -// Created by YUMI on 2021/12/13. -// - -#import "MicroView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MicroGiftValueView : UIView -///当前的礼物值 -@property (nonatomic,assign) long long giftValue; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m deleted file mode 100644 index e36de2d..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m +++ /dev/null @@ -1,105 +0,0 @@ -// -// MicroGiftValueView.m -// YUMI -// -// Created by YUMI on 2021/12/13. -// - -#import "MicroGiftValueView.h" -///Third -#import - -@interface MicroGiftValueView () -///背景图 -//@property (nonatomic, strong) UIImageView *bgImageView; -///背景 -@property (nonatomic, strong) UIView *bgView; -///心形图标 -@property (nonatomic, strong) UIImageView *iconImageView; -///礼物值 -@property (nonatomic, strong) UILabel *valueLabel; -@end - -@implementation MicroGiftValueView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.bgView]; - [self.bgView addSubview:self.iconImageView]; - [self.bgView addSubview:self.valueLabel]; -} - -- (void)initSubViewConstraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { -// make.trailing.mas_equalTo(self.valueLabel.mas_trailing).offset(3); - make.edges.mas_equalTo(self.bgView); - }]; - - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.edges.mas_equalTo(self); - make.trailing.mas_equalTo(self.valueLabel).mas_offset(4); - }]; - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.bgView).offset(4); - make.centerY.mas_equalTo(self.bgView); - make.width.height.mas_equalTo(11); - }]; - [self.valueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.iconImageView.mas_trailing).offset(3); - make.centerY.mas_equalTo(self.bgView); - }]; - -} -#pragma mark - Getters And Setters -- (void)setGiftValue:(long long)giftValue { - _giftValue = giftValue; - NSString *value; - if (giftValue < 1000000) { - value = @(giftValue).stringValue; - } else if (giftValue >= 100000000) { - value = YMLocalizedString(@"MicroGiftValueView0"); - } else { - value = [NSString stringWithFormat:YMLocalizedString(@"MicroGiftValueView1"), giftValue/10000]; - } - self.valueLabel.text = value; -} - -- (UIView *)bgView { - if (!_bgView) { - _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = UIColorRGBAlpha(0x131119, 0.2); - _bgView.layer.cornerRadius = 8; - _bgView.layer.masksToBounds = YES; - } - return _bgView; -} - -- (UIImageView *)iconImageView { - if (_iconImageView == nil) { - _iconImageView = [[UIImageView alloc] init]; - _iconImageView.userInteractionEnabled = YES; - _iconImageView.image = [UIImage imageNamed:@"room_position_giftValue_heart"]; - } - return _iconImageView; -} - -- (UILabel *)valueLabel { - if (_valueLabel == nil) { - _valueLabel = [[UILabel alloc] init]; - _valueLabel.textColor = UIColor.whiteColor; - _valueLabel.font = [UIFont systemFontOfSize:10]; - _valueLabel.text = @"0"; - } - return _valueLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroNobleWaveView.h b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroNobleWaveView.h deleted file mode 100644 index 69c2aa8..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroNobleWaveView.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// MicroNobleWaveView.h -// YUMI -// -// Created by YUMI on 2022/1/18. -// - -#import -@class SVGAVideoEntity; -NS_ASSUME_NONNULL_BEGIN - -@interface MicroNobleWaveView : UIView - -///开始展示声波动画 -- (void)startWaveAnimationWithUrl:(NSString *)url; -- (void)startWaveAnimationWithVideoItem:(SVGAVideoEntity *)videoItem; -///结束声波动画 -- (void)stopWaveAnimation; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroNobleWaveView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroNobleWaveView.m deleted file mode 100644 index d19badf..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroNobleWaveView.m +++ /dev/null @@ -1,105 +0,0 @@ -// -// MicroNobleWaveView.m -// YUMI -// -// Created by YUMI on 2022/1/18. -// - -#import "MicroNobleWaveView.h" -//SVGA动画播放 -#import "SVGA.h" -///Third -#import -#import "YUMIMacroUitls.h" - -@interface MicroNobleWaveView() - -@property (nonatomic, strong) SVGAImageView *svgDisplayView; - -@property (strong, nonatomic) SVGAParser *parser; - -//是否正在动画中 -@property (nonatomic,assign) BOOL isAnimationing; - -@end - -@implementation MicroNobleWaveView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Public Method -///开始展示声波动画 -- (void)startWaveAnimationWithUrl:(NSString *)url { - if (self.isAnimationing) { - return; - } - @kWeakify(self); - [self.parser parseWithURL:[NSURL URLWithString:[url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - self.svgDisplayView.loops = 1; - self.svgDisplayView.clearsAfterStop = YES; - self.svgDisplayView.videoItem = videoItem; - self.isAnimationing = YES; - [self.svgDisplayView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { - }]; -} - -- (void)startWaveAnimationWithVideoItem:(SVGAVideoEntity *)videoItem { - if (self.isAnimationing) { - [self stopWaveAnimation]; - } - self.svgDisplayView.loops = 1; - self.svgDisplayView.clearsAfterStop = YES; - self.svgDisplayView.videoItem = videoItem; - self.isAnimationing = YES; - [self.svgDisplayView startAnimation]; -} - -///结束声波动画 -- (void)stopWaveAnimation { - self.isAnimationing = NO; - [self.svgDisplayView stopAnimation]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.svgDisplayView]; - self.svgDisplayView.delegate = self; -} - -- (void)initSubViewConstraints { - [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; -} - -#pragma mark - SVGAPlayerDelegate -- (void)svgaPlayerDidFinishedAnimation:(SVGAPlayer *)player { - [self stopWaveAnimation]; -} - -- (SVGAImageView *)svgDisplayView { - if (!_svgDisplayView) { - _svgDisplayView = [[SVGAImageView alloc] init]; - _svgDisplayView.contentMode = UIViewContentModeScaleAspectFit; - } - return _svgDisplayView; -} - -- (SVGAParser *)parser { - if (!_parser) { - _parser = [[SVGAParser alloc]init]; - } - return _parser; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.h b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.h deleted file mode 100644 index 7c85515..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// MicroView.h -// YUMI -// -// Created by YUMI on 2021/10/15. -// - -#import -#import -#import -#import "MicroViewProtocol.h" -#import "NetImageView.h" -#import "MicroGiftValueView.h" - -@class MicroGiftValueView, MicroWaveView; -NS_ASSUME_NONNULL_BEGIN -@interface MicroView : UIView -///头像 -@property (nonatomic,strong, readonly) NetImageView *avatarImageView; -///几号坑位 -@property (nonatomic,strong, readonly) UILabel *postionLabel; -///用户名/号麦位 -@property (nonatomic,strong, readonly) UILabel *nickLabel; -///头饰 -@property (nonatomic,strong, readonly) YYAnimatedImageView *headWearImageView; -@property (nonatomic,strong, readonly) SVGAImageView *headWearSVGAImageView; -///礼物值 -@property (nonatomic,strong, readonly) MicroGiftValueView *giftValueView; -///离开模式 -@property (nonatomic,strong, readonly) UILabel *leaveLabel; -///坑位是否闭麦的 -@property (nonatomic,strong, readonly) UIImageView *micStateImageView; -///声波动画 -@property (nonatomic,strong, readonly) MicroWaveView *animationView; -///0 号麦位显示性别 -@property (nonatomic,strong, readonly) UIButton *sexImageView; -///昵称容器 -@property (nonatomic, strong, readonly) UIStackView *stackView; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m deleted file mode 100644 index a59b342..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m +++ /dev/null @@ -1,1192 +0,0 @@ -// -// MicroView.m -// YUMI -// -// Created by YUMI on 2021/10/15. -// - -#import "MicroView.h" -///Third -#import -#import -#import -///View -#import "MicroWaveView.h" -#import "NetImageView.h" -#import "MicroNobleWaveView.h" -///Tool -#import "XPRoomFaceTool.h" -#import "YUMIHtmlUrl.h" -#import "ThemeColor+Room.h" -#import "XCCurrentVCStackManager.h" -#import "XPWebViewController.h" -#import "SpriteSheetImageManager.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "ClientConfig.h" -///Model -#import "RoomFaceInfoModel.h" -#import "RoomResourceManager.h" -///Turbo Mode -#import "TurboModeStateManager.h" - -#define kScpaces 13 - -@interface MicroView () - -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///坑位是否闭麦的 -@property (nonatomic,strong) UIImageView *micStateImageView; -///昵称容器 -@property (nonatomic,strong) UIStackView *stackView; - -///用户名/号麦位 -@property (nonatomic,strong) UILabel *nickLabel; -///0 号麦位显示性别 -@property (nonatomic,strong) UIButton *sexImageView; -///声波动画 -@property (nonatomic,strong) MicroWaveView *animationView; -///VIP声波动画 -@property (nonatomic, strong) MicroNobleWaveView *nobleWaveView; -///离开模式 -@property (nonatomic,strong) UILabel *leaveLabel; -///礼物值 -@property (nonatomic,strong) MicroGiftValueView *giftValueView; -///防被踢 -@property (nonatomic, strong) UIImageView *forbidKickView; -///麦序的信息 -@property (nonatomic,strong) MicroQueueModel *microModel; -///麦位的用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -///当前房间的信息 -@property (nonatomic,strong) RoomInfoModel *roomInfo; -///礼物值高低 -@property (nonatomic,strong) UIImageView *positionCharmImgView; -///头饰 -@property (nonatomic,strong) YYAnimatedImageView *headWearImageView; -@property (nonatomic,strong) SVGAImageView *headWearSVGAImageView; -///表情 -@property (nonatomic, strong) UIImageView *faceImageView; -@property (nonatomic, strong) SVGAImageView *faceSvgaImageView; -///pk类型的按钮 -@property (nonatomic,strong) UIButton *groupTypeButton; -///头饰播放 -@property (nonatomic, strong) SpriteSheetImageManager *manager; -///当前的麦序 -@property (nonatomic,strong) NSMutableDictionary *micQueue; - -@property(nonatomic, strong) UILabel *goldLabel; - -///Turbo Mode 状态 -@property (nonatomic, assign) BOOL isTurboModeEnabled; - -@property (nonatomic, strong) UIImage *tempSprites; - -@end - - -@implementation MicroView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - [self setupTurboModeListener]; - } - return self; -} - -// 在view中重写以下方法，其中 self.longPreGetrueMaskView 就是那个希望被触发点击事件的按钮 -- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event { - UIView *view = [super hitTest:point withEvent:event]; - if (!view) { - // 转换坐标系 - CGPoint newPoint = [self.giftValueView convertPoint:point fromView:self]; - // 判断触摸点 - if (CGRectContainsPoint(self.giftValueView.bounds, newPoint)) { - view = self.giftValueView; - } - } - return view; -} - -- (void)layoutSubviews { - self.avatarImageView.layer.masksToBounds = YES; - self.avatarImageView.layer.cornerRadius = self.frame.size.width / 2; -} - -- (void)initSubViews { - [self addSubview:self.nobleWaveView]; - [self addSubview:self.animationView]; - [self addSubview:self.avatarImageView]; - [self addSubview:self.headWearImageView]; - [self addSubview:self.headWearSVGAImageView]; - [self addSubview:self.positionCharmImgView]; - [self addSubview:self.micStateImageView]; - [self addSubview:self.forbidKickView]; - [self addSubview:self.giftValueView]; - [self addSubview:self.faceImageView]; - [self addSubview:self.faceSvgaImageView]; - [self addSubview:self.groupTypeButton]; - - [self addSubview:self.goldLabel]; - - [self addSubview:self.stackView]; - - [self.stackView addArrangedSubview:self.nickLabel]; - [self.stackView addArrangedSubview:self.sexImageView]; -} - -- (void)initSubViewConstraints { - [self.nobleWaveView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarImageView); - make.width.height.mas_equalTo(self.avatarImageView.mas_width).multipliedBy(2.0); - }]; - - [self.animationView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.avatarImageView); - }]; - - [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(self.avatarImageView.mas_width).multipliedBy(1.3); - make.height.mas_equalTo(self.headWearImageView.mas_width); - }]; - - [self.headWearSVGAImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(self.avatarImageView.mas_width).multipliedBy(1.4); - make.height.mas_equalTo(self.headWearImageView.mas_width); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - make.height.mas_equalTo(self.mas_width); - }]; - - [self.micStateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.avatarImageView); - }]; - - [self.forbidKickView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.bottom.mas_equalTo(self.avatarImageView); - make.width.height.mas_equalTo(18); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(10); - make.width.mas_lessThanOrEqualTo(kGetScaleWidth(88)); - }]; - - [self.giftValueView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(16); - make.top.mas_equalTo(self.stackView.mas_bottom).mas_offset(5); - make.centerX.mas_equalTo(self.avatarImageView); - }]; - - [self.faceImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(kGetScaleWidth(80)); - make.height.mas_equalTo(80); - }]; - - [self.faceSvgaImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(kGetScaleWidth(100)); - make.height.mas_equalTo(100); - }]; - - [self.groupTypeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(38, 16)); - make.centerX.mas_equalTo(self.avatarImageView); - make.bottom.mas_equalTo(self.avatarImageView); - }]; - - [self.positionCharmImgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.equalTo(self.avatarImageView).multipliedBy(1.4); - make.center.equalTo(self.avatarImageView); - }]; - - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(28); - make.height.mas_equalTo(14); - }]; - - [self.goldLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self.avatarImageView); - make.height.mas_equalTo(18); - }]; -} - -- (UIView *)getAvatarView { - return self.avatarImageView; -} - -- (UIImage *)combineImageInOne:(RoomFaceSendInfoModel *)faceInfo { -#if DEBUG - NSAssert([NSThread isMainThread], @"UIKit操作必须在主线程执行!"); -#endif - // CGSize size = CGSizeMake(80, 80); - CGSize size = CGSizeMake(CGRectGetWidth(self.bounds), CGRectGetHeight(self.bounds)); - UIImage *result; - NSInteger faceCount = faceInfo.resultIndexes.count > 9 ? 9 : faceInfo.resultIndexes.count; - CGFloat x = 0; - CGFloat y = 0; - CGFloat width = CGRectGetWidth(self.bounds); - CGFloat height = CGRectGetHeight(self.bounds); - CGFloat spaceX3 = 0; //三张图时的X间距 - CGFloat spaceX2 = (size.width - width * 2) / 2; //两张图时的X边距 - CGFloat spaceX1 = (size.width - width) / 2; //一张图时的X边距 - CGFloat spaceY3 = 0; //三张图时的Y间距 - CGFloat spaceY2 = (size.height - height * 2) / 2; //两张图时的Y间距 - CGFloat spaceY1 = (size.height - height) / 2; //一张图时的Y间距 - y = faceCount > 6 ? spaceY3 : (faceCount >= 3 ? spaceY2 : spaceY1); - x = faceCount % 3 == 0 && faceCount > 3 ? spaceX3 : (faceCount % 3 == 2 ? spaceX2 : spaceX1); - UIGraphicsBeginImageContextWithOptions(size, NO, [UIScreen mainScreen].scale); - - // 根据显示类型处理不同布局 - RoomFaceInfoModel *faceModel = [[XPRoomFaceTool shareFaceTool] findFaceInfoById:faceInfo.faceId]; - - if (faceModel.displayType == FaceDisplayType_OnlyOne && faceCount > 0) { - UIGraphicsBeginImageContextWithOptions(size, NO, [UIScreen mainScreen].scale); - // 只处理第一个元素并居中填满 - NSInteger index = [faceInfo.resultIndexes[0] integerValue]; - UIImage *singleImage = [[XPRoomFaceTool shareFaceTool] findFaceImageById:faceInfo.faceId index:index]; - if (!singleImage) singleImage = [UIImage imageNamed:@"default_face_placeholder"]; - - CGRect drawRect = [self aspectFitRectForImage:singleImage.size - inRect:CGRectMake(0, 0, size.width, size.height)]; - [singleImage drawInRect:drawRect]; - } else if (faceModel.displayType == FaceDisplayType_OverLay) { - size = CGSizeMake(size.width * 4, size.height*3); - UIGraphicsBeginImageContextWithOptions(size, NO, [UIScreen mainScreen].scale); - // 横向叠加布局 - CGFloat currentX = 0; - for (int i = 0; i < faceCount; i++) { - if (i >= faceInfo.resultIndexes.count) break; - - @autoreleasepool { - NSInteger index = [faceInfo.resultIndexes[i] integerValue]; - UIImage *singleImage = [[XPRoomFaceTool shareFaceTool] findFaceImageById:faceInfo.faceId index:index]; - if (!singleImage) continue; - - CGRect drawRect = [self aspectFitRectForImage:singleImage.size - inRect:CGRectMake(currentX, - size.height/2 - singleImage.size.height/2, - singleImage.size.width, - singleImage.size.height)]; - [singleImage drawInRect:drawRect]; - currentX = CGRectGetMidX(drawRect); // 下一个图片从当前图片中心开始 - } - } - } else if (faceModel.displayType == FaceDisplayType_Flow) { - size = CGSizeMake(size.width * 3, size.height * 2); - UIGraphicsBeginImageContextWithOptions(size, NO, [UIScreen mainScreen].scale); - // 动态行数计算和底部优先填充 - NSInteger maxPerRow = 3; - NSInteger totalRows = ceil((float)faceCount / (float)maxPerRow); - NSMutableArray *rowsDistribution = [NSMutableArray array]; - NSInteger remaining = faceCount; - - // 从底部行开始填充 - for (NSInteger row = totalRows-1; row >= 0; row--) { - NSInteger itemsInRow = (row == 0 && faceCount % maxPerRow != 0) ? faceCount % maxPerRow : maxPerRow; - itemsInRow = MIN(remaining, itemsInRow); - [rowsDistribution insertObject:@(itemsInRow) atIndex:0]; - remaining -= itemsInRow; - } - - // 计算布局起始位置 - CGFloat startY = size.height - totalRows * height; - __block NSInteger currentIndex = 0; - - // 按分配行数绘制 - [rowsDistribution enumerateObjectsUsingBlock:^(NSNumber *rowCount, NSUInteger rowIdx, BOOL * _Nonnull stop) { - NSInteger itemsInRow = [rowCount integerValue]; - CGFloat rowWidth = itemsInRow * width + (itemsInRow - 1) * spaceX3; - CGFloat startX = (size.width - rowWidth) / 2; - - for (NSInteger col = 0; col < itemsInRow; col++) { - if (currentIndex >= faceCount) return; - - NSInteger index = [faceInfo.resultIndexes[currentIndex] integerValue]; - UIImage *image = [[XPRoomFaceTool shareFaceTool] findFaceImageById:faceInfo.faceId index:index] ?: [UIImage imageNamed:@"default_face_placeholder"]; - - CGRect rect = CGRectMake(startX + col*(width+spaceX3), - startY + rowIdx*height, - width, - height); - [image drawInRect:[self aspectFitRectForImage:image.size inRect:rect]]; - currentIndex++; - } - }]; - } else if (faceModel.displayType == FaceDisplayType_OnlyOneLine) { - // 实现单行最多三张图片的布局 - size = CGSizeMake(size.width * 3, size.height); - UIGraphicsBeginImageContextWithOptions(size, NO, [UIScreen mainScreen].scale); - - // 最多取三张图片 - NSInteger maxImages = MIN(faceCount, 3); - // 固定图片间隔为4px - CGFloat imageSpacing = -4.0; - CGFloat itemWidth = width; - // 计算整组图片总宽度（所有图片宽度 + 间隔） - CGFloat totalWidth = itemWidth * maxImages + imageSpacing * (maxImages - 1); - // 计算起始X坐标使整组图片居中 - CGFloat startX = (size.width - totalWidth) / 2; - - for (NSInteger i = 0; i < maxImages; i++) { - NSInteger index = [faceInfo.resultIndexes[i] integerValue]; - UIImage *image = [[XPRoomFaceTool shareFaceTool] findFaceImageById:faceInfo.faceId index:index]; - if (!image) continue; - - // 计算每个图片位置，使用固定间隔 - CGFloat xPosition = startX + i * (itemWidth + imageSpacing); - CGRect rect = CGRectMake(xPosition, - (size.height - height) / 2, - itemWidth, - height); - [image drawInRect:[self aspectFitRectForImage:image.size inRect:rect]]; - } - } - result = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - return result; -} - -// 新增尺寸计算方法 -- (CGRect)aspectFitRectForImage:(CGSize)imageSize inRect:(CGRect)container { - CGFloat scale = MIN(container.size.width/imageSize.width, container.size.height/imageSize.height); - return CGRectMake(container.origin.x + (container.size.width - imageSize.width*scale)/2, - container.origin.y + (container.size.height - imageSize.height*scale)/2, - imageSize.width*scale, - imageSize.height*scale); -} - -- (UIImage *)_combineImageInOne:(RoomFaceSendInfoModel *)faceInfo { - CGSize size = CGSizeMake(80, 80); - UIImage *result; - NSInteger faceCount = faceInfo.resultIndexes.count > 9 ? 9 : faceInfo.resultIndexes.count; - CGFloat x = 0; - CGFloat y = 0; - CGFloat width = 60; - CGFloat height = 60; - CGFloat spaceX3 = 0; //三张图时的X间距 - CGFloat spaceX2 = (size.width - width * 2) / 2; //两张图时的X边距 - CGFloat spaceX1 = (size.width - width) / 2; //一张图时的X边距 - CGFloat spaceY3 = 0; //三张图时的Y间距 - CGFloat spaceY2 = (size.height - height * 2) / 2; //两张图时的Y间距 - CGFloat spaceY1 = (size.height - height) / 2; //一张图时的Y间距 - y = faceCount > 6 ? spaceY3 : (faceCount >= 3 ? spaceY2 : spaceY1); - x = faceCount % 3 == 0 && faceCount > 3 ? spaceX3 : (faceCount % 3 == 2 ? spaceX2 : spaceX1); - UIGraphicsBeginImageContextWithOptions(size, NO, [UIScreen mainScreen].scale); - for (int i = 0; i < faceCount; i++) { - NSInteger index = [faceInfo.resultIndexes[i] integerValue]; - RoomFaceInfoModel *faceModel = [[XPRoomFaceTool shareFaceTool] findFaceInfoById:faceInfo.faceId]; - UIImage *singleImage = [[XPRoomFaceTool shareFaceTool] findFaceImageById:faceInfo.faceId index:index]; - - if (faceCount == 1) { //只有一张图片的时候直接返回不做处理 - return singleImage; - break; - } - - if (faceModel.displayType == FaceDisplayType_Flow) { - [singleImage drawInRect:CGRectMake(x, y, width, height)]; - if (i % 3 == 0) { // 换行 - y += (height + spaceY3); - x = spaceX3; - } - else if (i == 2 && faceCount == 3) { // 换行，只有三个时 - y += (height + spaceY3); - x = spaceX2; - } - else { - x += (width + spaceX3); - } - }else if (faceModel.displayType == FaceDisplayType_OverLay) { - CGFloat whBit = singleImage.size.width / singleImage.size.height; - width = size.width - (faceInfo.resultIndexes.count - 1) * kScpaces; - height = width / whBit; - x = 0 + i * kScpaces; - y = size.height / 2 - height / 2; - [singleImage drawInRect:CGRectMake(x, y, width, height)]; - } - } - result = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - return result; -} - -#pragma mark - MicroViewProtocol -- (void)showLeaveMode:(BOOL)isLeaveMode { - if (isLeaveMode) { - [self insertSubview:self.leaveLabel belowSubview:self.giftValueView]; - [self.leaveLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.avatarImageView); - }]; - } else { - if ([self.subviews containsObject:self.leaveLabel]) { - [self.leaveLabel removeFromSuperview]; - } - } -} - -- (void)userSpeaking { - UserInfoModel * userInfo = self.microModel.userInfo; - if (userInfo.micCircle.length) { - [self.nobleWaveView startWaveAnimationWithUrl:userInfo.micCircle]; - } else if ([[RoomResourceManager sharedManager] loadMicEffect]) { - [self.nobleWaveView startWaveAnimationWithVideoItem:[[RoomResourceManager sharedManager] loadMicEffect]]; - } else { - [self.animationView startWaveAnimation]; - } -} - -- (void)showingFace:(RoomFaceSendInfoModel *)receiveInfo{ - if (![NSString isEmpty:receiveInfo.svgaURL]) { - @kWeakify(self); - [[XPRoomFaceTool shareFaceTool] loadFace:^(NSString * _Nonnull path) { - @kStrongify(self); - if (![NSString isEmpty:path]) { - SVGAParser *p = [[SVGAParser alloc] init]; - [p parseWithURL:[NSURL fileURLWithPath:path] completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - self.faceSvgaImageView.videoItem = videoItem; - [self.faceSvgaImageView startAnimation]; - } failureBlock:^(NSError * _Nullable error) { - [self.faceSvgaImageView stopAnimation]; - }]; - } else { - // MARK: 可能存在下载 svga 不成功情况，需要区别新旧的表情 -// [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"MoliForceReloadFace"]; - } - } withUrl:receiveInfo.svgaURL]; - } else { - [self.faceImageView.layer removeAnimationForKey:@"face"]; - UIImage * result; - if (receiveInfo.resultIndexes.count > 0) { - result = [self combineImageInOne:receiveInfo]; - receiveInfo.resultImage = result; - } - RoomFaceInfoModel *configInfo = [[XPRoomFaceTool shareFaceTool] findFaceInfoById:receiveInfo.faceId]; - if (receiveInfo.resultIndexes.count > 0) { - /*==================== 动画数组 ================= */ - CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"contents"]; - animation.duration = configInfo.animDuration / 1000.0; - animation.delegate = self; - animation.repeatCount = configInfo.animRepeatCount; - animation.removedOnCompletion = YES; - animation.calculationMode = kCAAnimationDiscrete; - - //存放图片的数组 - NSMutableArray *faceArray = [NSMutableArray array]; - - for (int i = (short)configInfo.animStartPos; i <= (short)configInfo.animEndPos; i ++) { - UIImage *image = [[XPRoomFaceTool shareFaceTool] findFaceImageById:receiveInfo.faceId index:i]; - if (image) { - CGImageRef cgimg = image.CGImage; - [faceArray addObject:(__bridge UIImage *)cgimg]; - }else { - break; - } - - } - if (faceArray.count > 0) { - animation.values = faceArray; - }else { - return; - } - /*==================== 结果数组 ================= */ - CAKeyframeAnimation *resultAnimation = [CAKeyframeAnimation animationWithKeyPath:@"contents"]; - resultAnimation.duration = 3; - resultAnimation.delegate = self; - resultAnimation.beginTime = configInfo.animRepeatCount * configInfo.animDuration / 1000.0; - //存放图片的数组 - NSMutableArray *resultArray = [NSMutableArray array]; - - if (receiveInfo.resultImage) { - [resultArray addObject:(__bridge UIImage *)receiveInfo.resultImage.CGImage]; - }else { - return; - } - if (resultArray.count > 0) { - resultAnimation.values = resultArray; - }else { - return; - } - - resultAnimation.removedOnCompletion = YES; - - CAAnimationGroup *group = [CAAnimationGroup animation]; - group.animations = @[animation,resultAnimation]; - group.duration = 3 + (configInfo.animDuration / 1000.0) * configInfo.animRepeatCount; - group.delegate = self; - [self.faceImageView.layer addAnimation:group forKey:@"face"]; - } else { - /*==================== 动画数组 ================= */ - //创建CAKeyframeAnimation - CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"contents"]; - animation.duration = configInfo.animDuration / 1000.0; - animation.delegate = self; - animation.repeatCount = configInfo.animRepeatCount; - animation.removedOnCompletion = YES; - animation.calculationMode = kCAAnimationDiscrete; - //存放图片的数组 - NSMutableArray *faceArray = [NSMutableArray array]; - - for (int i = (short)configInfo.animStartPos; i <= (short)configInfo.animEndPos; i ++) { - UIImage *image = [[XPRoomFaceTool shareFaceTool] findFaceImageById:receiveInfo.faceId index:i];; - if (image) { - CGImageRef cgimg = image.CGImage; - [faceArray addObject:(__bridge UIImage *)cgimg]; - }else { - break; - } - } - if (faceArray.count > 0) { - animation.values = [faceArray copy]; - [self.faceImageView.layer addAnimation:animation forKey:@"face"]; - } - } - } -} - -/** - 更新坑位等级头饰 - */ -- (void)updatePositionIsHighLevel:(BOOL)isHighLevel - isShow:(BOOL)isShow { - self.positionCharmImgView.hidden = !isShow; - if (isHighLevel) { - self.positionCharmImgView.image = [UIImage imageNamed:@"room_game_position_mine"]; - }else { - self.positionCharmImgView.image = nil;//[UIImage imageNamed:@"room_game_position_crown"]; - } -} -/** - 更新坑位等级头饰 - */ --(void)hiddenPositionisHighLevel{ - self.positionCharmImgView.hidden = YES; -} -/** - 重置头饰 - */ -- (void)resetPositonLevelHeadwear{ - self.positionCharmImgView.hidden = YES; -} - - -- (void)configMicroView:(MicroQueueModel *)model { - self.microModel = model; - MicroStateModel * micStats = model.microState; - UserInfoModel * userInfo = model.userInfo; - // 重置声波/贵族光圈动画状态，避免复用视图在多次切换麦位后处于不可见/不可重启状态 - [self.animationView stopWaveAnimation]; - [self.nobleWaveView stopWaveAnimation]; - [self configMicroState:micStats]; - [self configUser:userInfo]; -} - -- (void)configMicroState:(MicroStateModel *)micState { - self.micStateImageView.hidden = micState.micState == MicroMicStateType_Open; - UIImage *image; - if (micState.posState == MicroPosStateType_Free) { - if (micState.position + 1 + micState.indexOffset == 8 && self.roomInfo.type == RoomType_19Mic) { - image = [[RoomResourceManager sharedManager] loadMicBossSkinForLock:NO]; - } else { - image = [[RoomResourceManager sharedManager] loadMicNormalSKinForLock:NO]; - } - - if (!image) { - image = [UIImage imageNamed:@"room_position_normal"]; - } - } else { - if (micState.position + 1 + micState.indexOffset == 8 && self.roomInfo.type == RoomType_19Mic) { - image = [[RoomResourceManager sharedManager] loadMicBossSkinForLock:YES]; - } else { - image = [[RoomResourceManager sharedManager] loadMicNormalSKinForLock:YES]; - } - - if (!image) { - image = [UIImage imageNamed:@"room_position_lock"]; - } - } - [self.avatarImageView updateConfigPlaceHolder:image]; - CGSize scaledToSize = CGSizeMake(self.frame.size.width, self.frame.size.width); - if (scaledToSize.width > 0 && scaledToSize.height > 0 ) { - UIGraphicsBeginImageContextWithOptions(scaledToSize, false, 0.0); - // 缩小 "1" 点儿，防止默认背景的边缘被裁减。 - [image drawInRect:CGRectMake(1, 1, scaledToSize.width - 2, scaledToSize.height - 2)]; - UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - self.avatarImageView.backgroundColor = [UIColor colorWithPatternImage:newImage]; - } else { - self.avatarImageView.backgroundColor = [UIColor colorWithPatternImage:image]; - } - - 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:@"%@%ld",YMLocalizedString(@"MicroView0"), (long)(micState.position + 1 + micState.indexOffset)]; -} --(UserInfoModel *)getUser{ - return self.userInfo; -} -- (void)configUser:(UserInfoModel *)userInfo { - - self.userInfo = userInfo; - // 绑定新用户时重置一次动画，确保后续 userSpeaking 立即可启动 - [self.animationView stopWaveAnimation]; - [self.nobleWaveView stopWaveAnimation]; - - self.nickLabel.hidden = NO; - self.sexImageView.hidden = YES; - self.forbidKickView.hidden = YES; - if (userInfo) { - @kWeakify(self); - [self.avatarImageView loadImageWithUrl:userInfo.avatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - self.avatarImageView.image = image; - } fail:^(NSError * _Nonnull error) { - @kStrongify(self); - self.avatarImageView.image = [UIImageConstant defaultAvatarPlaceholder]; - }]; - NSString *nickStr = userInfo.nick; - self.nickLabel.text = nickStr.length > 0 ? nickStr : @""; - if (userInfo.micNickColor.length) { - self.nickLabel.textColor = [self colorWithHexString:userInfo.micNickColor]; - } else { - self.nickLabel.textColor = [DJDKMIMOMColor positionNickColor]; - } - if (self.roomInfo.type == RoomType_Anchor && self.microModel.microState.position == -1) { - [self.stackView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(10); - make.width.mas_lessThanOrEqualTo(kGetScaleWidth(150)); - }]; - self.sexImageView.hidden = YES; - } - self.forbidKickView.hidden = !userInfo.preventKick; - } else { - self.nickLabel.textColor = [DJDKMIMOMColor positionNickColor]; - self.avatarImageView.image = nil; - if (self.roomInfo.type == RoomType_Anchor && self.microModel.microState.position == -1) { - self.nickLabel.hidden = YES; - } - } - NSString * headWearUrl = userInfo.headwearEffect.length ? userInfo.headwearEffect : userInfo.headWearUrl.length ? userInfo.headWearUrl : userInfo.headwearPic; - if (headWearUrl.length > 0 && !userInfo.vipMic) { - if ([userInfo isHeadWearSVGA]) { - self.headWearSVGAImageView.hidden = NO; - SVGAParser *parse = [[SVGAParser alloc] init]; - @kWeakify(self); - [parse parseWithURL:[NSURL URLWithString:headWearUrl] - completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - if (videoItem) { - self.headWearSVGAImageView.videoItem = videoItem; - [self applyTurboModeToHeadWear]; - } - } failureBlock:^(NSError * _Nullable error) { }]; - } else { - self.headWearImageView.hidden = NO; - NSURL *url = [NSURL URLWithString:headWearUrl]; - @kWeakify(self); - [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { - @kStrongify(self); - self.headWearImageView.image = sprit; - // 加载完成后应用 turbo mode 状态 - [self applyTurboModeToHeadWear]; - } failureBlock:^(NSError * _Nullable error) { - }]; - } - } else { - self.headWearSVGAImageView.hidden = YES; - self.headWearImageView.hidden = YES; - } - - if (self.roomInfo.type == RoomType_Anchor && self.microModel.microState.position == -1) { - [self.giftValueView removeFromSuperview]; - [self.stackView addArrangedSubview:self.giftValueView]; - } - - self.groupTypeButton.hidden = YES; - if (self.roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - if (userInfo.groupType == GroupType_Red) { - self.groupTypeButton.hidden = NO; - [self.groupTypeButton setTitle:YMLocalizedString(@"MicroView2") forState:UIControlStateNormal]; - [self.groupTypeButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFC4A95), UIColorFromRGB(0xFE6075)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } else if(userInfo.groupType == GroupType_Blue) { - self.groupTypeButton.hidden = NO; - [self.groupTypeButton setTitle:YMLocalizedString(@"MicroView3") forState:UIControlStateNormal]; - [self.groupTypeButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x3571FE), UIColorFromRGB(0x7994FC)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - } -} -- (void)configPkBtn:(UserInfoModel *)userInfo{ - self.groupTypeButton.hidden = YES; - if (self.roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - if (userInfo.groupType == GroupType_Red) { - self.groupTypeButton.hidden = NO; - [self.groupTypeButton setTitle:YMLocalizedString(@"MicroView2") forState:UIControlStateNormal]; - [self.groupTypeButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFC4A95), UIColorFromRGB(0xFE6075)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } else if(userInfo.groupType == GroupType_Blue) { - self.groupTypeButton.hidden = NO; - [self.groupTypeButton setTitle:YMLocalizedString(@"MicroView3") forState:UIControlStateNormal]; - [self.groupTypeButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x3571FE), UIColorFromRGB(0x7994FC)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - } - } -} - -- (void)receiveGold:(NSString *)gold { - [self showGoldAnimation:gold]; -} - -- (void)configGiftValue:(long long)giftValue { - self.giftValueView.giftValue = giftValue; -} -- (long long)getGiftValue{ - return self.giftValueView.giftValue; -} -- (void)showGiftValueMode:(BOOL)isGiftValue { - self.giftValueView.hidden = !isGiftValue; -} - -- (void)resetGiftValue { - self.giftValueView.giftValue = 0; -} - -- (void)configRoomInfo:(RoomInfoModel *)roomInfo { - self.roomInfo = roomInfo; -} - -- (RoomInfoModel *)getRoomInfo { - return self.roomInfo; -} - -- (void)configMicQueue:(NSMutableDictionary *)micQueue { - self.micQueue = micQueue; -} - - -- (NSMutableDictionary*)getMicroQueue { - return self.micQueue; -} - - -#pragma mark - Event Response -- (void)tapGiftValueRecognizer { - if (self.giftValueView.hidden) return; - if (self.userInfo && self.userInfo.uid > 0) { - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:@(self.roomInfo.uid).stringValue]; - if (self.roomInfo.leaveMode && self.userInfo.uid == self.roomInfo.uid) { ///离开模式 - webVC.url = [NSString stringWithFormat:@"%@?uid=%ld&roomUid=%ld", URLWithType(kRoomCharmRankURL), (self.microModel.userInfo.uid ? self.microModel.userInfo.uid : self.roomInfo.uid),(long)self.roomInfo.uid]; - } else { - webVC.url = [NSString stringWithFormat:@"%@?uid=%ld&roomUid=%ld", URLWithType(kRoomCharmRankURL), self.microModel.userInfo.uid,self.roomInfo.uid]; - } - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; - } -} - -- (UIColor *)colorWithHexString: (NSString *) hexString { - NSString *colorString = [[hexString stringByReplacingOccurrencesOfString: @"#" withString: @""] uppercaseString]; - CGFloat alpha, red, blue, green; - alpha = 1.0f; - red = [self colorComponentFrom: colorString start: 0 length: 2]; - green = [self colorComponentFrom: colorString start: 2 length: 2]; - blue = [self colorComponentFrom: colorString start: 4 length: 2]; - return [UIColor colorWithRed: red green: green blue: blue alpha: alpha]; -} - -- (CGFloat) colorComponentFrom: (NSString *) string start: (NSUInteger) start length: (NSUInteger) length { - NSString *substring = [string substringWithRange: NSMakeRange(start, length)]; - NSString *fullHex = length == 2 ? substring : [NSString stringWithFormat: @"%@%@", substring, substring]; - unsigned hexComponent; - [[NSScanner scannerWithString: fullHex] scanHexInt: &hexComponent]; - return hexComponent / 255.0; -} - -#pragma mark - Turbo Mode Management - -- (void)setupTurboModeListener { - // 初始化 turbo mode 状态 - self.isTurboModeEnabled = [[TurboModeStateManager sharedManager] isTurboModeEnabled]; - - // 监听 turbo mode 状态变化 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handleTurboModeStateChanged:) - name:@"TurboModeStateChanged" - object:nil]; -} - -- (void)handleTurboModeStateChanged:(NSNotification *)notification { - NSDictionary *userInfo = notification.userInfo; - BOOL enabled = [userInfo[@"enabled"] boolValue]; - - self.isTurboModeEnabled = enabled; - - // 如果当前有头饰，需要重新配置以应用新的 turbo mode 状态 - if (self.userInfo && (self.userInfo.headwearEffect.length || self.userInfo.headWearUrl.length || self.userInfo.headwearPic.length)) { - [self updateHeadWearForTurboMode]; - } -} - -- (void)updateHeadWearForTurboMode { - if (self.isTurboModeEnabled) { - // Turbo mode 开启：只显示第一帧，不播放动画 - [self setHeadWearToFirstFrameOnly]; - } else { - // Turbo mode 关闭：正常播放动画 - [self setHeadWearToNormalPlayback]; - } -} - -- (void)setHeadWearToFirstFrameOnly { - // 对于 YYAnimatedImageView，停止动画并显示第一帧 - if (!self.headWearImageView.hidden) { - [self.headWearImageView stopAnimating]; - UIImage *sprites = (YYSpriteSheetImage *)self.headWearImageView.image; - self.tempSprites = sprites; - UIImage *firstFrame = [sprites animatedImageFrameAtIndex:0]; - if (firstFrame) { - self.headWearImageView.image = firstFrame; - } - } else if (!self.headWearSVGAImageView.hidden) { - // 对于 SVGAImageView，停止动画 - [self.headWearSVGAImageView pauseAnimation]; -// [self.headWearSVGAImageView stepToFrame:1 andPlay:NO]; - } -} - -- (void)setHeadWearToNormalPlayback { - - // 对于 YYAnimatedImageView，恢复动画播放 - if (!self.headWearImageView.hidden && self.headWearImageView.image) { - [self.headWearImageView startAnimating]; - } - - // 对于 SVGAImageView，恢复动画播放 - if (!self.headWearSVGAImageView.hidden && self.headWearSVGAImageView.videoItem) { - self.headWearImageView.image = self.tempSprites; - [self.headWearSVGAImageView startAnimation]; - } -} - -- (void)applyTurboModeToHeadWear { - if (self.isTurboModeEnabled) { - // Turbo mode 开启：只显示第一帧，不播放动画 - [self setHeadWearToFirstFrameOnly]; - } else { - // Turbo mode 关闭：正常播放动画 - [self setHeadWearToNormalPlayback]; - } -} - -#pragma mark - Getters And Setters -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig *config = [[NetImageConfig alloc]init]; -// config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.userInteractionEnabled = YES; - _avatarImageView.layer.opaque = NO; - _avatarImageView.opaque = NO; - } - return _avatarImageView; -} - -- (UIImageView *)micStateImageView { - if (!_micStateImageView) { - _micStateImageView = [[UIImageView alloc] init]; - _micStateImageView.userInteractionEnabled = YES; - _micStateImageView.image = [[UIImage imageNamed:@"room_position_mute"] ms_SetImageForRTL]; - _micStateImageView.hidden = YES; - } - return _micStateImageView; -} - -- (UIImageView *)forbidKickView { - if (!_forbidKickView) { - _forbidKickView = [[UIImageView alloc] init]; - _forbidKickView.image = [UIImage imageNamed:@"room_position_forbid_kicked"]; - _forbidKickView.hidden = YES; - } - return _forbidKickView; -} - -- (MicroWaveView *)animationView { - if (!_animationView) { - _animationView = [[MicroWaveView alloc] init]; - } - return _animationView; -} - -- (MicroNobleWaveView *)nobleWaveView { - if (!_nobleWaveView) { - _nobleWaveView = [[MicroNobleWaveView alloc] init]; - } - return _nobleWaveView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:11]; - _nickLabel.textColor = [DJDKMIMOMColor positionNickColor]; - _nickLabel.textAlignment = NSTextAlignmentCenter; - } - return _nickLabel; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 2; - } - return _stackView; -} - -- (UIButton *)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.hidden = YES; - } - return _sexImageView; -} - -- (UILabel *)leaveLabel { - if (!_leaveLabel) { - _leaveLabel = [[UILabel alloc] init]; - _leaveLabel .text = YMLocalizedString(@"MicroView4"); - _leaveLabel .font = [UIFont systemFontOfSize:16]; - _leaveLabel .textColor = UIColor.whiteColor; - _leaveLabel.textAlignment = NSTextAlignmentCenter; - _leaveLabel.backgroundColor = [UIColor colorWithWhite:0 alpha:0.45]; - _leaveLabel.layer.cornerRadius = 50 * kScreenScale / 2; - _leaveLabel.layer.masksToBounds = YES; - _leaveLabel.userInteractionEnabled = YES; - } - return _leaveLabel ; -} - -- (MicroGiftValueView *)giftValueView { - if (!_giftValueView) { - _giftValueView = [[MicroGiftValueView alloc] init]; - _giftValueView.hidden = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapGiftValueRecognizer)]; - [_giftValueView addGestureRecognizer:tap]; - } - return _giftValueView; -} - -- (SpriteSheetImageManager *)manager { - if (!_manager) { - _manager = [[SpriteSheetImageManager alloc] init]; - } - return _manager; -} - -- (YYAnimatedImageView *)headWearImageView { - if (!_headWearImageView) { - _headWearImageView = [[YYAnimatedImageView alloc] init]; - _headWearImageView.backgroundColor = [UIColor clearColor]; - _headWearImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _headWearImageView; -} - -- (SVGAImageView *)headWearSVGAImageView { - if (!_headWearSVGAImageView) { - _headWearSVGAImageView = [[SVGAImageView alloc]init]; - _headWearSVGAImageView.backgroundColor = [UIColor clearColor]; - _headWearSVGAImageView.frame = CGRectZero; - _headWearSVGAImageView.userInteractionEnabled = YES; - _headWearSVGAImageView.autoPlay = YES; - } - return _headWearSVGAImageView; -} - -- (UIImageView *)faceImageView { - if (!_faceImageView) { - _faceImageView = [[UIImageView alloc] init]; - _faceImageView.backgroundColor = [UIColor clearColor]; - _faceImageView.userInteractionEnabled = YES; - _faceImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _faceImageView; -} - -- (SVGAImageView *)faceSvgaImageView { - if (!_faceSvgaImageView) { - _faceSvgaImageView = [[SVGAImageView alloc]init]; - _faceSvgaImageView.backgroundColor = [UIColor clearColor]; - _faceSvgaImageView.frame = CGRectZero; - _faceSvgaImageView.userInteractionEnabled = YES; - _faceSvgaImageView.autoPlay = YES; - _faceSvgaImageView.clearsAfterStop = YES; - _faceSvgaImageView.loops = 1; - } - return _faceSvgaImageView; -} - -- (UIButton *)groupTypeButton { - if (!_groupTypeButton) { - _groupTypeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_groupTypeButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _groupTypeButton.titleLabel.font = [UIFont systemFontOfSize:9.0]; - _groupTypeButton.layer.masksToBounds = YES; - _groupTypeButton.layer.cornerRadius = 8; - } - return _groupTypeButton; -} - -- (UIImageView *)positionCharmImgView { - if (!_positionCharmImgView) { - _positionCharmImgView = [[UIImageView alloc] init]; - _positionCharmImgView.userInteractionEnabled = NO; - _positionCharmImgView.hidden = YES; - } - return _positionCharmImgView; -} - -- (UILabel *)goldLabel { - if (!_goldLabel) { - _goldLabel = [UILabel labelInitWithText:@"" font:kFontMedium(11) textColor:[UIColor blackColor]]; - _goldLabel.textAlignment = NSTextAlignmentCenter; - _goldLabel.backgroundColor = UIColorFromRGB(0xffc506); - [_goldLabel setCornerRadius:9 - corners:kCALayerMaxXMaxYCorner|kCALayerMaxXMinYCorner|kCALayerMinXMaxYCorner|kCALayerMinXMinYCorner - borderWidth:1 - borderColor:[UIColor whiteColor]]; - } - return _goldLabel; -} - -- (void)showGoldAnimation:(NSString *)goldValue { - // 创建新的 UILabel - if ([NSString isEmpty:goldValue]) { - return; - } - NSString *displayValue = [NSString stringByRemovingRedundantZeros:goldValue]; - UILabel *newGoldLabel = [UILabel labelInitWithText:[NSString stringWithFormat:@"+%@ ", displayValue] font:kFontMedium(11) textColor:[UIColor blackColor]]; - newGoldLabel.textAlignment = NSTextAlignmentCenter; - newGoldLabel.backgroundColor = UIColorFromRGB(0xffc506); - [newGoldLabel setCornerRadius:9 - corners:kCALayerMaxXMaxYCorner|kCALayerMaxXMinYCorner|kCALayerMinXMaxYCorner|kCALayerMinXMinYCorner - borderWidth:1 - borderColor:[UIColor whiteColor]]; - [self addSubview:newGoldLabel]; - [newGoldLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.bottom.mas_equalTo(self.avatarImageView); - make.height.mas_equalTo(18); - }]; - - // 设置初始状态 - newGoldLabel.alpha = 0; - newGoldLabel.transform = CGAffineTransformMakeScale(0.8, 0.8); - newGoldLabel.hidden = NO; - - // 使用 POP 框架实现动画 - POPBasicAnimation *scaleInAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewScaleXY]; - scaleInAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(1.4, 1.4)]; - scaleInAnimation.duration = 0.3; - scaleInAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finished) { - POPBasicAnimation *scaleOutAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewScaleXY]; - scaleOutAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(1.0, 1.0)]; - scaleOutAnimation.duration = 0.2; - scaleOutAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finished) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - POPBasicAnimation *moveUpAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewCenter]; - CGPoint newCenter = CGPointMake(newGoldLabel.center.x, newGoldLabel.center.y - 40); - moveUpAnimation.toValue = [NSValue valueWithCGPoint:newCenter]; - moveUpAnimation.duration = 0.2; - moveUpAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finished) { - POPBasicAnimation *fadeOutAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewAlpha]; - fadeOutAnimation.toValue = @(0); - fadeOutAnimation.duration = 0.2; - fadeOutAnimation.completionBlock = ^(POPAnimation *anim, BOOL finished) { - if (finished) { - newGoldLabel.hidden = YES; - [newGoldLabel removeFromSuperview]; - } - }; - [newGoldLabel pop_addAnimation:fadeOutAnimation forKey:@"fadeOut"]; - } - }; - [newGoldLabel pop_addAnimation:moveUpAnimation forKey:@"moveUp"]; - }); - } - }; - [newGoldLabel pop_addAnimation:scaleOutAnimation forKey:@"scaleOut"]; - } - }; - POPBasicAnimation *fadeInAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewAlpha]; - fadeInAnimation.toValue = @(1); - fadeInAnimation.duration = 0.3; - [newGoldLabel pop_addAnimation:fadeInAnimation forKey:@"fadeIn"]; - [newGoldLabel pop_addAnimation:scaleInAnimation forKey:@"scaleIn"]; -} - - -- (void)__showGoldAnimation:(NSInteger)goldValue { - // 设置文本内容 - self.goldLabel.text = [NSString stringWithFormat:@"+%ld", (long)goldValue]; - - // 设置初始状态 - self.goldLabel.alpha = 0; - self.goldLabel.transform = CGAffineTransformMakeScale(0.8, 0.8); - self.goldLabel.hidden = NO; - - // 执行动画 - [UIView animateWithDuration:0.3 animations:^{ - self.goldLabel.alpha = 1; - self.goldLabel.transform = CGAffineTransformMakeScale(1.2, 1.2); - } completion:^(BOOL finished) { - if (finished) { - // 恢复原始大小 - [UIView animateWithDuration:0.2 animations:^{ - self.goldLabel.transform = CGAffineTransformIdentity; - } completion:^(BOOL finished) { - if (finished) { - // 延迟1秒后隐藏 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [UIView animateWithDuration:0.2 animations:^{ - self.goldLabel.alpha = 0; - } completion:^(BOOL finished) { - if (finished) { - self.goldLabel.hidden = YES; - } - }]; - }); - } - }]; - } - }]; -} - -- (void)dealloc { - // 移除 turbo mode 状态变化监听 - [[NSNotificationCenter defaultCenter] removeObserver:self name:@"TurboModeStateChanged" object:nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroViewProtocol.h b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroViewProtocol.h deleted file mode 100644 index e52f8f0..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroViewProtocol.h +++ /dev/null @@ -1,99 +0,0 @@ -// -// YMRoomPositionDataSourceProtocol.h -// YUMI -// -// Created by zu on 2021/10/27. -// - -#import -#import "MicroQueueModel.h" -#import "MicroStateModel.h" -#import "UserInfoModel.h" -#import "RoomInfoModel.h" -#import "RoomFaceSendInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@protocol MicroViewProtocol -/** - 初始化子view - */ -- (void)initSubViews; - -/** - 给子view 添加约束 - */ -- (void)initSubViewConstraints; - -/** - * 离开模式。 - */ -- (void)showLeaveMode:(BOOL)isLeaveMode; - -/** - * 设置麦位信息和用户信息。 - */ -- (void)configMicroView:(MicroQueueModel *)model; -///设置pk按钮的状态 -- (void)configPkBtn:(UserInfoModel *)userInfo; -/** - * 设置用户信息。 - */ -- (void)configUser:(UserInfoModel *)userInfo; --(UserInfoModel *)getUser; -/** - * 用户正在讲话（播放光圈）。 - */ -- (void)userSpeaking; - -/** - * 展示用户表情 - */ -- (void)showingFace:(RoomFaceSendInfoModel *)receiveInfo; - -/** - * 礼物值。 - */ -- (void)configGiftValue:(long long)giftValue; -- (long long)getGiftValue; -/** - * 礼物值模式 - */ -- (void)showGiftValueMode:(BOOL)isGiftValue; - -/** - * 礼物值清零 - */ -- (void)resetGiftValue; - -/** - * 设置房间信息房间的信息 - */ -- (void)configRoomInfo:(RoomInfoModel *)roomInfo; - -/** - * 获取当前房间的信息 - */ -- (RoomInfoModel *)getRoomInfo; - -/** - * 设置当前房间的麦序 - */ -- (void)configMicQueue:(NSMutableDictionary *)micQueue; -/** - 更新坑位等级头饰 - */ -- (void)updatePositionIsHighLevel:(BOOL)isHighLevel isShow:(BOOL)isShow; --(void)hiddenPositionisHighLevel; -/** - 重置头饰 - */ -- (void)resetPositonLevelHeadwear; -/** - * 获取当前的麦序 - */ -- (NSMutableDictionary*)getMicroQueue; - -- (void)receiveGold:(NSString *)gold; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroWaveView.h b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroWaveView.h deleted file mode 100644 index d2c7c5b..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroWaveView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// MicroWaveView.h -// YUMI -// -// Created by YUMI on 2021/10/20. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface MicroWaveView : UIView -///开始展示声波动画 -- (void)startWaveAnimation; - -///结束声波动画 -- (void)stopWaveAnimation; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroWaveView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroWaveView.m deleted file mode 100644 index c74d7e2..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroWaveView.m +++ /dev/null @@ -1,114 +0,0 @@ -// -// MicroWaveView.m -// YUMI -// -// Created by YUMI on 2021/10/20. -// - -#import "MicroWaveView.h" -///Third -#import -#import - -@interface MicroWaveView () -//声波动画图层 -@property (nonatomic,strong) UIView * firstView; -//是否正在动画中 -@property (nonatomic,assign) BOOL isAnimationing; - -@end - -@implementation MicroWaveView - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -- (void)layoutSubviews { - [super layoutSubviews]; - self.firstView.layer.cornerRadius = self.frame.size.width / 2; -} - -#pragma mark - Public Method -///开始展示声波动画 -- (void)startWaveAnimation { - if (self.isAnimationing) { - return; - } - - [self.firstView.layer removeAllAnimations]; - - self.isAnimationing = YES; - self.firstView.hidden = NO; - [self animationWithLayer:self.firstView]; -} -///结束声波动画 -- (void)stopWaveAnimation { - self.isAnimationing = NO; - self.firstView.hidden = YES; - [self.firstView.layer removeAllAnimations]; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.firstView]; - self.firstView.hidden = YES; -} - -- (void)initSubViewConstraints { - [self.firstView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self); - }]; -} - -- (void)animationWithLayer:(UIView *)view { - int animtionDura = 1; - POPBasicAnimation *animation2 = [POPBasicAnimation animationWithPropertyNamed:kPOPLayerScaleXY]; - animation2.beginTime = CACurrentMediaTime(); - animation2.duration = animtionDura; - animation2.fromValue = [NSValue valueWithCGSize:CGSizeMake(1.f, 1.f)]; - animation2.toValue = [NSValue valueWithCGSize:CGSizeMake(1.4f, 1.4f)]; - - POPBasicAnimation *animation3 = [POPBasicAnimation animationWithPropertyNamed:kPOPLayerOpacity]; - animation3.duration = 0.6 * animtionDura; - animation3.beginTime = CACurrentMediaTime(); - animation3.fromValue = @1.0; - animation3.toValue = @0.8; - animation3.repeatCount = 1; - animation3.removedOnCompletion = YES; - - POPBasicAnimation *animation4 = [POPBasicAnimation animationWithPropertyNamed:kPOPLayerOpacity]; - animation4.duration = 0.4* animtionDura; - animation4.beginTime = CACurrentMediaTime() + 0.6 * animtionDura; - animation4.fromValue = @0.8; - animation4.toValue = @0.0; - animation4.repeatCount = 1; - animation4.removedOnCompletion = YES; - - if (view == self.firstView) { - [animation4 setCompletionBlock:^(POPAnimation *anim, BOOL finished) { - self.isAnimationing = NO; - }]; - } - - [view.layer pop_addAnimation:animation2 forKey:@"animation2"]; - [view.layer pop_addAnimation:animation3 forKey:@"animation3"]; - [view.layer pop_addAnimation:animation4 forKey:@"animation4"]; -} -#pragma mark - Getters And Setters -- (UIView *)firstView { - if (!_firstView) { - _firstView = [[UIView alloc] init]; - _firstView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.3]; - _firstView.layer.borderWidth = 1; - _firstView.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _firstView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.h b/YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.h deleted file mode 100644 index bcebd3e..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// SocialMicroView.h -// YUMI -// -// Created by YUMI on 2022/4/27. -// - -#import "MicroView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface SocialMicroView : MicroView - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.m deleted file mode 100644 index 9b81401..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.m +++ /dev/null @@ -1,48 +0,0 @@ -// -// SocialMicroView.m -// YUMI -// -// Created by YUMI on 2022/4/27. -// - -#import "SocialMicroView.h" -#import "ThemeColor+Room.h" -#import "ClientConfig.h" -@interface SocialMicroView () - -///当前坑位 -@property (nonatomic, assign) NSInteger position; - -@end - -@implementation SocialMicroView - -- (void)configMicroView:(MicroQueueModel *)model { - model.microState.indexOffset = 1; - self.position = model.microState.position; - [super configMicroView:model]; -// MicroStateModel * micState = model.microState; -// -// UIImage *image; -// if (micState.posState == MicroPosStateType_Free) { -// image = [UIImage imageNamed:@"room_position_normal"]; -// } else { -// image = [UIImage imageNamed:@"room_position_lock"]; -// } -// -// CGSize scaledToSize = CGSizeMake(self.frame.size.width, self.frame.size.width); -// UIGraphicsBeginImageContextWithOptions(scaledToSize, false, 0.0); -// // 缩小 “1” 点儿，防止默认背景的边缘被裁减。 -// [image drawInRect:CGRectMake(1, 1, scaledToSize.width - 2, scaledToSize.height - 2)]; -// UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext(); -// UIGraphicsEndImageContext(); -// self.avatarImageView.backgroundColor = [UIColor colorWithPatternImage:newImage]; -// -// [self.avatarImageView updateConfigPlaceHolder:image]; -} - -- (void)configUser:(UserInfoModel *)userInfo { - [super configUser:userInfo]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/Model/MicroExtModel.h b/YuMi/Modules/YMRoom/View/StageView/Model/MicroExtModel.h deleted file mode 100644 index 6c51240..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/Model/MicroExtModel.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// MicroExtModel.h -// YUMI -// -// Created by YUMI on 2022/1/18. -// - -#import -#import "YUMINNNN.h" -#import "UserVipInfoVo.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MicroExtModel : PIBaseModel -/// -@property (nonatomic,assign) GenderType gender; -/// -@property (nonatomic,copy) NSString *avatar; -/// -@property (nonatomic,assign) NSInteger uid; -/// -@property (nonatomic,copy) NSString *nick; -/// -@property (nonatomic,copy) NSString *headWearUrl; -@property (nonatomic, assign) NSInteger headWearType; -/// -@property (nonatomic,assign) BOOL vipMic; -///麦位光圈链接 -@property (nonatomic, copy) NSString *micCircle; -///麦位昵称颜色 -@property (nonatomic, copy) NSString *micNickColor; -/// 小游戏状态 0 未加入游戏；1 加入游戏未准备；2 加入游戏已准备 3 游戏中 -@property (nonatomic, assign) LittleGamePlayStatus gameStatus; -///是否防被踢 -@property (nonatomic, assign) BOOL preventKick; -///是否隐身进房 -@property (nonatomic, assign) BOOL enterHide; -///pk的类型 -@property (nonatomic,assign) GroupType groupType; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/Model/MicroExtModel.m b/YuMi/Modules/YMRoom/View/StageView/Model/MicroExtModel.m deleted file mode 100644 index 3a7f6d9..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/Model/MicroExtModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MicroExtModel.m -// YUMI -// -// Created by YUMI on 2022/1/18. -// - -#import "MicroExtModel.h" - -@implementation MicroExtModel - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/Model/MicroInviteExtModel.h b/YuMi/Modules/YMRoom/View/StageView/Model/MicroInviteExtModel.h deleted file mode 100644 index f3fc7bd..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/Model/MicroInviteExtModel.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// MicroInviteExtModel.h -// YUMI -// -// Created by YUMI on 2022/5/12. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface MicroInviteExtModel : PIBaseModel - -@property (nonatomic, copy) NSString *uid; - -@property (nonatomic, copy) NSString *micPosition; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/Model/MicroInviteExtModel.m b/YuMi/Modules/YMRoom/View/StageView/Model/MicroInviteExtModel.m deleted file mode 100644 index 09ba0b3..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/Model/MicroInviteExtModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MicroInviteExtModel.m -// YUMI -// -// Created by YUMI on 2022/5/12. -// - -#import "MicroInviteExtModel.h" - -@implementation MicroInviteExtModel - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/Model/MicroQueueModel.h b/YuMi/Modules/YMRoom/View/StageView/Model/MicroQueueModel.h deleted file mode 100644 index 19ed636..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/Model/MicroQueueModel.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MicroQueueModel.h -// YUMI -// -// Created by YUMI on 2021/10/21. -// - -#import "NSObject+MJExtension.h" -#import "MicroStateModel.h" -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel; -@interface MicroQueueModel : PIBaseModel -///麦序的状态 -@property (nonatomic, strong) MicroStateModel *microState; -///麦序上是否有人 -@property (nonatomic, strong, nullable) UserInfoModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/Model/MicroQueueModel.m b/YuMi/Modules/YMRoom/View/StageView/Model/MicroQueueModel.m deleted file mode 100644 index b0c7b24..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/Model/MicroQueueModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MicroQueueModel.m -// YUMI -// -// Created by YUMI on 2021/10/21. -// - -#import "MicroQueueModel.h" - -@implementation MicroQueueModel - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/Model/MicroStateModel.h b/YuMi/Modules/YMRoom/View/StageView/Model/MicroStateModel.h deleted file mode 100644 index 8a48dbc..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/Model/MicroStateModel.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// MicroStateModel.h -// YUMI -// -// Created by YUMI on 2021/10/21. -// - -#import "NSObject+MJExtension.h" - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, MicroPosStateType) { - MicroPosStateType_Free = 0,///空闲 - MicroPosStateType_Lock = 1,///上锁 -}; - -typedef NS_ENUM(NSInteger, MicroMicStateType) { - MicroMicStateType_Open = 0,///开麦 - MicroMicStateType_Close = 1,///锁麦 -}; - -typedef NS_ENUM(NSUInteger, DatingMicType) { - ///默认的 - DatingMicType_Other = 0, - //男神 - DatingMicType_Male = 1, - //女神 - DatingMicType_Female = 2, -}; - -@interface MicroStateModel : PIBaseModel -///坑位的序号 -@property (nonatomic, assign) int position; -///坑位状态 锁坑/开坑 -@property (nonatomic, assign) MicroPosStateType posState; -///麦序的状态 闭麦/开麦 -@property (nonatomic, assign) MicroMicStateType micState; -///相亲房的 男神女神位置的 1 男 2 女 本地字段 -@property (nonatomic,assign) DatingMicType datingMicType; - -///坑位的序号的偏移量 -@property (nonatomic, assign) NSInteger indexOffset; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/Model/MicroStateModel.m b/YuMi/Modules/YMRoom/View/StageView/Model/MicroStateModel.m deleted file mode 100644 index b230ea2..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/Model/MicroStateModel.m +++ /dev/null @@ -1,21 +0,0 @@ -// -// MicroStateModel.m -// YUMI -// -// Created by YUMI on 2021/10/21. -// - -#import "MicroStateModel.h" - -@implementation MicroStateModel - -- (instancetype)init { - self = [super init]; - if (self) { - _posState = MicroPosStateType_Free; - _micState = MicroMicStateType_Open; - } - return self; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/NineteenMicStageView.h b/YuMi/Modules/YMRoom/View/StageView/NineteenMicStageView.h deleted file mode 100644 index 121d96f..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/NineteenMicStageView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// NineteenMicStageView.h -// YuMi -// -// Created by P on 2024/12/12. -// - -#import "StageView.h" -#import "MicMidpointRectManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface NineteenMicStageView : StageView - -@property (nonatomic, strong, readonly) MicMidpointRectManager *midpointRectManager; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/NineteenMicStageView.m b/YuMi/Modules/YMRoom/View/StageView/NineteenMicStageView.m deleted file mode 100644 index d636604..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/NineteenMicStageView.m +++ /dev/null @@ -1,193 +0,0 @@ -// -// NineteenMicStageView.m -// YuMi -// -// Created by P on 2024/12/12. -// - -#import "NineteenMicStageView.h" -#import "SocialMicroView.h" -#import "MicMidpointRectManager.h" - -//第一行距离顶部 -#define firstRowTopMargin 60 -// 房主头像宽 58 + 光圈 5 -#define ownerWidth (45 + 5) * kScreenScale -// 昵称高12，距离头像间距 10 -#define ownerHeight (ownerWidth + 10 + 12) -// 下面 8 个坑位宽55 + 光圈 5 -#define mcWidth (45 + 5) * kScreenScale -#define mcHeight (mcWidth + 10 + 12 + 5+16) -// 左右 padding 20 -#define paddingH 22 * kScreenScale -// 每行间距 -#define lineMargin 8 -// 下面 8 个坑位两两之间的间距 -#define marginH (KScreenWidth - paddingH * 2 - mcWidth * 5) / 4 -// 第二行坑位的顶部 -#define sRowTop firstRowTopMargin + mcHeight + lineMargin -// 第一行坑位与第二行坑位的间距 -//#define marginV2 15 -// 第三行坑位的顶部 -#define tRowTop (sRowTop + mcHeight + lineMargin) - -static const NSInteger kMicCountPerRow = 5; - -@interface NineteenMicStageView () - -@property (nonatomic, strong) MicMidpointRectManager *midpointRectManager; - -@end - -@implementation NineteenMicStageView - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super initWithDelegate:delegate]) { - // 初始化中点矩形管理器 - _midpointRectManager = [[MicMidpointRectManager alloc] initWithContainerView:self]; - } - return self; -} - -- (NSInteger)countOfMicroView { - return 19; // 麦位总数 -} - -- (UIView *)microViewForIndex:(NSInteger)index { - UIView *microView = [super microViewForIndex:index]; - return microView ?: [[SocialMicroView alloc] init]; -} - -- (CGRect)rectForViewAtIndex:(NSInteger)index { - if (index < 0 || index >= [self countOfMicroView]) { - return CGRectZero; - } - - // 第一行（5列） - if (index >= 0 && index < 5) { - return [self calculateRectForRow:0 column:index columnsInRow:5]; - } - - // 第二行（4列，左侧） - if (index >= 5 && index < 7) { - return [self calculateRectForRow:1 column:index - 5 columnsInRow:4]; - } - - // Boos（第 8 个麦位，居中，尺寸为2倍） - if (index == 7) { - CGFloat x = (KScreenWidth - mcWidth * 1.24) / 2; // 水平方向居中 - CGFloat y = firstRowTopMargin + 1 * (mcHeight + lineMargin) + mcHeight/2; - return CGRectMake(x, y, mcWidth * 1.24, mcHeight * 1.24); - } - - // 第二行（4列，右侧） - if (index > 7 && index < 10) { - return [self calculateRectForRow:1 column:index - 6 columnsInRow:4]; - } - - // 第三行（4列，居中） - if (index >= 10 && index < 14) { - return [self calculateRectForRow:2 column:index - 10 columnsInRow:4]; - } - - // 第四行（5列） - if (index >= 14 && index < 19) { - return [self calculateRectForRow:3 column:index - 14 columnsInRow:5]; - } - - - - return CGRectZero; -} - -- (CGRect)calculateRectForRow:(NSInteger)row column:(NSInteger)column columnsInRow:(NSInteger)columnsInRow { - CGFloat totalWidth = columnsInRow * mcWidth + (columnsInRow - 1) * marginH; // 当前行的总宽度 - CGFloat startX = (KScreenWidth - totalWidth) / 2; // 居中计算起点 - CGFloat x = 0; - - if (row == 1 || row == 2) { // 特殊处理第 2、3 行 - if (column < 2) { - // 第一、二列，从左侧开始布局 - x = paddingH + column * (mcWidth + marginH); - } else { - // 第三、四列，从右侧开始布局 - NSInteger reversedColumn = columnsInRow - 1 - column; - x = KScreenWidth - paddingH - mcWidth - reversedColumn * (mcWidth + marginH); - } - } else { - // 默认居中布局 - x = startX + column * (mcWidth + marginH); - } - - CGFloat y = firstRowTopMargin + row * (mcHeight + lineMargin); - return CGRectMake(x, y, mcWidth, mcHeight); -} - -- (CGFloat)hightForStageView { - CGFloat lastRowBottom = firstRowTopMargin + 3 * (mcHeight + lineMargin) + mcHeight; - return lastRowBottom + lineMargin; // 加上最后的间距 -} - -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { - NSInteger index = [self getIndexByUid:uid]; - return [self animationPointAtStageViewByIndex:index]; -} - -- (CGPoint)animationPointAtStageViewByIndex:(NSInteger)index { - if (index < 0 || index >= [self countOfMicroView]) { - return CGPointMake(KScreenWidth/2, 70); - } - - CGRect rect = [self rectForViewAtIndex:index]; - CGPoint center = CGPointMake(CGRectGetMidX(rect), CGRectGetMidY(rect)); - return [self convertPoint:center toView:nil]; -} - -// 19麦位布局：复杂布局的自定义相邻性判断 -- (BOOL)isAdjacentMicAtIndex:(NSInteger)firstIndex andIndex:(NSInteger)secondIndex { - if (firstIndex == secondIndex) return NO; - - NSInteger left = MIN(firstIndex, secondIndex); - NSInteger right = MAX(firstIndex, secondIndex); - - // 检查是否在同一行且相邻 - BOOL sameRow = NO; - NSInteger leftCol = -1, rightCol = -1; - - // 第一行：0-4 (5列) - if (left >= 0 && left <= 4 && right >= 0 && right <= 4) { - sameRow = YES; - leftCol = left; - rightCol = right; - } - // 第二行：5-6, 8-9 (4列，中间有Boss位7) - else if (((left >= 5 && left <= 6) && (right >= 5 && right <= 6)) || - ((left >= 8 && left <= 9) && (right >= 8 && right <= 9))) { - sameRow = YES; - leftCol = (left <= 6) ? left - 5 : left - 6; - rightCol = (right <= 6) ? right - 5 : right - 6; - } - // 第三行：10-13 (4列)，但排除11-12 - else if (left >= 10 && left <= 13 && right >= 10 && right <= 13) { - // 排除11-12的相邻对 - if (left == 11 && right == 12) { - return NO; - } - sameRow = YES; - leftCol = left - 10; - rightCol = right - 10; - } - // 第四行：14-18 (5列) - else if (left >= 14 && left <= 18 && right >= 14 && right <= 18) { - sameRow = YES; - leftCol = left - 14; - rightCol = right - 14; - } - - if (!sameRow) return NO; - - // 检查是否相邻（列差为1） - return (rightCol - leftCol) == 1; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/SocialStageView.h b/YuMi/Modules/YMRoom/View/StageView/SocialStageView.h deleted file mode 100644 index 3b3fec0..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/SocialStageView.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// SocialStageView.h -// YUMI -// -// Created by zu on 2021/10/26. -// - -#import "StageView.h" -#import "MicMidpointRectManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface SocialStageView : StageView - -@property (nonatomic, strong, readonly) MicMidpointRectManager *midpointRectManager; - -/// 返回两个横向相邻麦位中点位置的矩形区域（75x75）。 -/// 仅当两个索引同一行且相邻，并且位于 [1-4] 或 [5-8] 范围内时有效；否则返回 CGRectZero。 -- (CGRect)rectForMidpointBetweenMicAtIndex:(NSInteger)firstIndex andIndex:(NSInteger)secondIndex; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/SocialStageView.m b/YuMi/Modules/YMRoom/View/StageView/SocialStageView.m deleted file mode 100644 index 0cd964a..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/SocialStageView.m +++ /dev/null @@ -1,169 +0,0 @@ -// -// SocialStageView.m -// YUMI -// -// Created by zu on 2021/10/26. -// - -#import "SocialStageView.h" -#import "SocialMicroView.h" -#import "MicroGiftValueView.h" -#import "YUMIMacroUitls.h" -#import "RoomInfoModel.h" -#import "ClientConfig.h" -#import "MicMidpointRectManager.h" -//房主距离顶部间距 -#define ownerTopMargin 100 -#define ownerTopMargin_little_screen 35 -// 房主头像宽 58 + 光圈 5 -#define ownerWidth (45 + 5) * kScreenScale -// 昵称高12，距离头像间距 10 -#define ownerHeight (ownerWidth + 10 + 12) -// 下面 8 个坑位宽55 + 光圈 5 -#define mcWidth (45 + 5) * kScreenScale -#define mcHeight (mcWidth + 10 + 12 + 5+16) -// 左右 padding 20 -#define paddingH 22 * kScreenScale -// 房主与下面的坑位间隔 33 -#define marginV1 38 -// 下面 8 个坑位两两之间的间距 -#define marginH (KScreenWidth - paddingH * 2 - mcWidth * 4) / 3 -// 第一行坑位的顶部 -#define firstRowTop ownerHeight + marginV1 + ownerTopMargin -// 第一行坑位与第二行坑位的间距 -#define marginV2 15 -// 第一行坑位的顶部 -#define secondRowTop (firstRowTop + mcHeight + marginV2) - -@interface SocialStageView () - -@property (nonatomic, strong) MicMidpointRectManager *midpointRectManager; - -@end - -@implementation SocialStageView - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super initWithDelegate:delegate]) { - // 初始化中点矩形管理器 - _midpointRectManager = [[MicMidpointRectManager alloc] initWithContainerView:self]; - } - return self; -} - -- (NSInteger)countOfMicroView { - return 9; -} - -- (UIView *)microViewForIndex:(NSInteger)index { - UIView * microView = [super microViewForIndex:index]; - if (microView) { - return microView; - } - return [[SocialMicroView alloc]init]; -} - -/** - * | ◯ | * 房主头像宽 58 + 光圈 5 - * | 33 | * 房主与下面的坑位间隔 33 - * | 20 ◯ ◯ ◯ ◯ 20 | * 左右 padding 20 - * | 15 | * 上下两排间距 15 - * | ◯ ◯ ◯ ◯ | * 下面 8 个坑位宽55 + 光圈 5 - * * 昵称高12，距离头像间距 6 - */ -- (CGRect)rectForViewAtIndex:(NSInteger)index { - CGFloat top = iPhoneXSeries ? ownerTopMargin : ownerTopMargin_little_screen; - CGFloat f_top = iPhoneXSeries ? firstRowTop : ownerHeight + marginV1 + ownerTopMargin_little_screen; - CGFloat s_top = iPhoneXSeries ? secondRowTop : mcHeight + marginV2 + f_top; - if (index == 0) { - return CGRectMake(KScreenWidth / 2 - ownerWidth / 2, top, ownerWidth, ownerHeight); - } - - if (index >= 1 && index <= 4) { - return CGRectMake(paddingH + (mcWidth + marginH) * (index - 1), f_top, mcWidth, mcHeight); - } - - if (index >= 5 && index < 9) { - return CGRectMake(paddingH + (mcWidth + marginH) * (index - 4 - 1), s_top, mcWidth, mcHeight); - } - - return [super rectForViewAtIndex:index]; -} - -- (CGFloat)hightForStageView { - CGFloat top = iPhoneXSeries ? ownerTopMargin : ownerTopMargin_little_screen; - return top + ownerHeight + marginV1 + mcHeight + marginV2 + mcHeight + marginV2; -} - -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { - CGFloat top = iPhoneXSeries ? ownerTopMargin : ownerTopMargin_little_screen; - CGFloat f_top = iPhoneXSeries ? firstRowTop : ownerHeight + marginV1 + ownerTopMargin_little_screen; - CGFloat s_top = iPhoneXSeries ? secondRowTop : mcHeight + marginV2 + f_top; - - NSInteger index = [self getIndexByUid:uid]; - - CGPoint point = CGPointZero; - if (index == -1 && self.hostDelegate.getRoomInfo.leaveMode && self.hostDelegate.getRoomInfo.uid == uid.integerValue) { - point = CGPointMake(KScreenWidth / 2, ownerWidth / 2 - 10 + top); - } - - if (index == 0) { - point = CGPointMake(KScreenWidth / 2, ownerWidth / 2 - 10 + top); - } - - if (index >= 1 && index <= 4) { - point = CGPointMake(paddingH + (mcWidth + marginH) * (index - 1) + mcWidth / 2, f_top + mcWidth / 2- 10); - } - - if (index >= 5 && index <= 9) { - point = CGPointMake(paddingH + (mcWidth + marginH) * (index - 4 - 1) + mcWidth / 2, s_top + mcWidth / 2 - 10); - } - - if (CGPointEqualToPoint(point, CGPointZero)) { - point = CGPointMake(KScreenWidth/2, 70); - } else { - point = [self convertPoint:point toView:nil]; - } - - return point; -} - -// 社交布局：自定义相邻性判断（仅支持[1-4]和[5-8]区间内相邻） -- (BOOL)isAdjacentMicAtIndex:(NSInteger)firstIndex andIndex:(NSInteger)secondIndex { - if (firstIndex == secondIndex) return NO; - - NSInteger left = MIN(firstIndex, secondIndex); - NSInteger right = MAX(firstIndex, secondIndex); - - // 仅支持下排与上排的麦位区间 [1-4], [5-8] 且相邻 - BOOL sameRowFirst = (left >= 1 && left <= 4 && right >= 1 && right <= 4); - BOOL sameRowSecond = (left >= 5 && left <= 8 && right >= 5 && right <= 8); - - if (!(sameRowFirst || sameRowSecond)) { - return NO; - } - - return (right - left) == 1; -} - -// 社交布局：自定义中点计算（使用头像区域中心点） -- (CGRect)calculateMidpointRectBetweenLeft:(CGRect)leftRect andRight:(CGRect)rightRect { - // 取头像区域（上方圆形区域）的中心点作为基准 - CGFloat f_top = iPhoneXSeries ? firstRowTop : ownerHeight + marginV1 + ownerTopMargin_little_screen; - CGFloat s_top = iPhoneXSeries ? secondRowTop : mcHeight + marginV2 + f_top; - - // 判断是否在第一行（根据Y坐标判断） - BOOL inFirstRow = (CGRectGetMinY(leftRect) < s_top); - CGFloat circleCenterY = (inFirstRow ? (f_top + mcWidth / 2 - 10) : (s_top + mcWidth / 2 - 10)) - 10.0; - - // 两个头像中心的 X 坐标 - CGFloat leftCenterX = CGRectGetMinX(leftRect) + mcWidth / 2; - CGFloat rightCenterX = CGRectGetMinX(rightRect) + mcWidth / 2; - CGFloat midX = (leftCenterX + rightCenterX) / 2.0; - - // 以中点为中心，返回适配屏幕的矩形 - CGFloat size = kGetScaleWidth(kMidpointRectSize); - return CGRectMake(midX - size / 2.0, circleCenterY - size / 4.0, size, size); -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/StageView.h b/YuMi/Modules/YMRoom/View/StageView/StageView.h deleted file mode 100644 index b3a7d1f..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/StageView.h +++ /dev/null @@ -1,102 +0,0 @@ -// -// StageView.h -// YUMI -// -// Created by zu on 2021/10/25. -// - -#import -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" -#import "MicroViewProtocol.h" -#import "YUMIMacroUitls.h" - -NS_ASSUME_NONNULL_BEGIN - -// 中点矩形尺寸常量 -static const CGFloat kMidpointRectSize = 75.0; - -@class MicroQueueModel; - -@protocol StageViewDelegate -/** - * 坑位数目 - */ -- (NSInteger)countOfMicroView; -/** - * 坑位区域的高度（宽度默认屏幕宽度） - */ -- (CGFloat)hightForStageView; -/** - * index 处的坑位 - */ -- (UIView *)microViewForIndex:(NSInteger)index; -/** - * index 处的坑位的区域 - */ -- (CGRect)rectForViewAtIndex:(NSInteger)index; -/** - * index 处的坑位点击事件 - */ -- (void)didSelectAtIndex:(NSInteger)index; -@end - -@protocol StageViewProtocol -/** - * 网易云信的麦序转成坑位的 index。 - */ -- (NSInteger)positionToIndex:(NSString*)position; -/** - * 坑位的 index 转成网易云信的麦序。 - */ -- (NSString *)indexToPosition:(NSInteger)index; -/** - * 根据 uid 获取该用户的坑位 index，如果 uid 没在坑位上返回 -1。 - */ -- (NSInteger)getIndexByUid:(NSString *)uid; -/** - * 根据 uid 查找该用户的坑位信息，用户不在麦位上将返回 nil。 - */ -- (MicroQueueModel *)findMicroInfoByUid:(NSString *)uid; -/** - * 根据 uid 查找该用户的上麦的坑位 View，用户不在麦位上将返回 nil。 - */ -- (UIView *)findMicroViewByUid:(NSString *)uid; -/** - * 根据 index 查找坑位 View。 - */ -- (UIView *)findMicroViewByIndex:(NSInteger)index; -/** - * 根据 position 查找坑位 View。 - */ -- (UIView *)findMicroViewByPosition:(NSString *)position; -@end - -@interface StageView : UIView - -@property (nonatomic, weak, readonly) id hostDelegate; - -- (instancetype)initWithDelegate:(id)delegate; --(void)exitNIMRoom; - -/// 计算两个横向相邻麦位中点的矩形（默认返回基于两个坑位中心点的 75x75，非同一行或非相邻返回 CGRectZero）。 -- (CGRect)rectForMidpointBetweenMicAtIndex:(NSInteger)firstIndex andIndex:(NSInteger)secondIndex; - -#pragma mark - 子类可重写的布局配置方法 - -/// 子类重写：返回麦位行配置，每行包含该行的索引范围数组 -/// 例如：@[@[@0, @4], @[@5, @9]] 表示两行，第一行0-4，第二行5-9 -- (NSArray *> *)micRowRanges; - -/// 子类重写：是否允许同行相邻麦位显示中点矩形 -- (BOOL)allowsAdjacentInSameRow; - -/// 子类重写：自定义相邻性判断逻辑（默认使用行配置） -- (BOOL)isAdjacentMicAtIndex:(NSInteger)firstIndex andIndex:(NSInteger)secondIndex; - -/// 子类重写：自定义中点矩形计算（默认使用顶部对齐的75x75） -- (CGRect)calculateMidpointRectBetweenLeft:(CGRect)leftRect andRight:(CGRect)rightRect; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/StageView.m b/YuMi/Modules/YMRoom/View/StageView/StageView.m deleted file mode 100644 index 3005ffe..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/StageView.m +++ /dev/null @@ -1,1550 +0,0 @@ -// -// StageView.m -// YUMI -// -// Created by zu on 2021/10/25. -// - -#import "StageView.h" -#import -#import -#import -// Tools -#import "RtcManager.h" -#import "RtcDelegate.h" -#import "TTPopup.h" -#import "YUMIMacroUitls.h" -#import "XPGiftStorage.h" -#import "XNDJTDDLoadingTool.h" -#import "Api+Room.h" -#import "AccountInfoStorage.h" -#import "XPRoomMiniManager.h" -#import "NSArray+Safe.h" -#import "ClientConfig.h" -#import "SocialMicroView.h" -// Models -#import "RoomInfoModel.h" -#import "UserInfoModel.h" -#import "MicroStateModel.h" -#import "MicroQueueModel.h" -#import "AttachmentModel.h" -#import "GiftReceiveInfoModel.h" -#import "GiftValueInfoModel.h" -#import "MicroExtModel.h" -#import "RoomFaceSendInfoModel.h" -#import "MicroInviteExtModel.h" -#import "RoomPKChooseUserModel.h" -// Views -#import "NetImageView.h" -#import "XPRoomInviteUserViewController.h" - -#import "UserRoomCardViewController.h" - -@interface StageView() - -/** 云信麦序的 position 和本类 index 的关系。 - * - * **Note:** - * - * 网易云信返回的麦序（position）从 -1 开始。 - * - 使用者：MicroStateModel、self.micQueue 。 - * - * 麦位 View 的 index 从 0 开始。 - * - 使用者：StageViewDelegate、self.microViews 。 - */ -@property (nonatomic, strong) NSMutableArray *microViews; -@property (nonatomic, strong) NSMutableDictionary *micQueue; - -@property (nonatomic, weak) id hostDelegate; - -///是否是最小化进房 -@property (nonatomic,assign) BOOL isMiniEnter; -/** - * 是否正在上麦。 - * 防止快速点击连续上麦。 - */ -@property (nonatomic, assign) BOOL isUpingMic; -///是否已获取麦上用户信息,防止没获取到信息时点击上麦，把麦上的人挤下来 -@property (nonatomic, assign) BOOL hadGetQueueInfoSuccess; - -@end - -@implementation StageView - -- (instancetype)initWithDelegate:(id)delegate { - self = [super init]; - if (self) { - _hostDelegate = delegate; - _isMiniEnter = NO; - [RtcManager instance].isMiniEnter = self.hostDelegate.getIsMiniEnter; - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - if (roomInfo.roomModeType != RoomModeType_Open_AcrossRoomPK_mode ){ - if ([RtcManager instance].isAnckorPk == NO){ - if ([RtcManager instance].isMiniEnter == NO){ - [RtcManager instance].localMuted = YES; - } - - } - - } - NSInteger microCount = self.countOfMicroView; - for (int i = 0; i < microCount; i++) { - UIView* microView = [self microViewForIndex:i]; - if (microView) { - microView.tag = i; - microView.frame = [self rectForViewAtIndex:i]; - [self addSubview:microView]; - UITapGestureRecognizer* tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(microViewTapped:)]; - [microView addGestureRecognizer:tap]; - [self.microViews insertObject:microView atIndex:i]; - } - } - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(self.hightForStageView); - }]; - - if (_hostDelegate.getRoomInfo) { - [self initRtc]; - [self initNIMMicroQueues]; - } else { - [self microQueueUpdated:NO]; - } - } - return self; -} - -#pragma mark - init functions -/** - * 既然是 initXXX，就不要随意调用或者添加逻辑。 - * 目前 init 要么在 [self initWithDelegate] ，要么在 [self onRoomEntered] 里面延迟初始化。因为初始化依赖房间信息。 - */ -- (void)initRtc { - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - // 加入语音房间。 - RtcEngineType type = RtcEngineType_TRTC; - [RtcManager initEngineWithType:type delegate:self]; - NSInteger roomId = roomInfo.roomId > INT_MAX ? roomInfo.uid : roomInfo.roomId; - [[RtcManager instance] enterRoom:[NSString stringWithFormat:@"%ld", roomId] trtcSign:roomInfo.trtcSig]; -} - -- (void)initNIMMicroQueues { - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - // 获取麦位的状态，并初始化 self.micQueue 。 - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomInfo:[NSString stringWithFormat:@"%ld", (long)roomInfo.roomId] completion:^(NSError * _Nullable error, NIMChatroom * _Nullable chatroom) { - if (error) { - return; - } - @kStrongify(self); - NSDictionary *info = (NSDictionary *)[chatroom.ext toJSONObject]; - NSDictionary *micState = [info[@"micQueue"] toJSONObject]; - for (NSString *position in micState.allKeys) { - MicroStateModel *state = [MicroStateModel modelWithJSON:micState[position]]; - MicroQueueModel *sequence = [self.micQueue objectForKey:position]; - sequence.microState = state; - } - [self microQueueUpdated: NO]; - }]; - self.hadGetQueueInfoSuccess = NO; - // 获取麦位的用户，并初始化 self.micQueue 。 - [[NIMSDK sharedSDK].chatroomManager fetchChatroomQueue:[NSString stringWithFormat:@"%ld", (long)roomInfo.roomId] completion:^(NSError * _Nullable error, NSArray *> * _Nullable info) { - if (error) return; - @kStrongify(self); - BOOL ownerRTCChange = NO; - MicroQueueModel *meQuence = nil; - for (NSDictionary *item in info) { - UserInfoModel *userInfo = [UserInfoModel modelWithJSON:item.allValues.firstObject]; - NSString *position = item.allKeys.firstObject; - MicroQueueModel *sequence = [self.micQueue objectForKey:position]; - sequence.userInfo = userInfo; - if (userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - ownerRTCChange = YES; - meQuence = sequence; - } - } - [self microQueueUpdated:ownerRTCChange]; - [self.hostDelegate onMicroQueueUpdate:self.micQueue]; - self.hadGetQueueInfoSuccess = YES; - if(meQuence != nil){ - [self enterRoomUpMicWith:meQuence]; - } - // 拿到麦序后初始化礼物值 - [self initGiftValue]; - }]; - - -} -///进入房间，如果自己在麦上，需要调下上麦，不然，网络不好，会导致人不在麦上，但有声音 --(void)enterRoomUpMicWith:(MicroQueueModel *)sequence{ - RoomInfoModel * roomInfo =self.hostDelegate.getRoomInfo; - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = @(sequence.microState.position).stringValue; - request.value = [sequence.userInfo toJSONString]; - request.roomId = roomId; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - }]; -} --(void)updateNIMMicroQueues{ - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - // 获取麦位的状态，并初始化 self.micQueue 。 - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomInfo:[NSString stringWithFormat:@"%ld", (long)roomInfo.roomId] completion:^(NSError * _Nullable error, NIMChatroom * _Nullable chatroom) { - if (error) { - return; - } - @kStrongify(self); - NSDictionary *info = (NSDictionary *)[chatroom.ext toJSONObject]; - NSDictionary *micState = [info[@"micQueue"] toJSONObject]; - for (NSString *position in micState.allKeys) { - MicroStateModel *state = [MicroStateModel modelWithJSON:micState[position]]; - MicroQueueModel *sequence = [self.micQueue objectForKey:position]; - sequence.microState = state; - } - [self microQueueUpdated: NO]; - }]; - self.hadGetQueueInfoSuccess = NO; - // 获取麦位的用户，并初始化 self.micQueue 。 - [[NIMSDK sharedSDK].chatroomManager fetchChatroomQueue:[NSString stringWithFormat:@"%ld", (long)roomInfo.roomId] completion:^(NSError * _Nullable error, NSArray *> * _Nullable info) { - if (error) return; - @kStrongify(self); - BOOL ownerRTCChange = NO; - - for (NSDictionary *item in info) { - UserInfoModel *userInfo = [UserInfoModel modelWithJSON:item.allValues.firstObject]; - NSString *position = item.allKeys.firstObject; - MicroQueueModel *sequence = [self.micQueue objectForKey:position]; - sequence.userInfo = userInfo; - if (userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - ownerRTCChange = YES; - } - } - [self microQueueUpdated:ownerRTCChange]; - [self.hostDelegate onMicroQueueUpdate:self.micQueue]; - self.hadGetQueueInfoSuccess = YES; - - }]; - -} -- (void)initGiftValue{ - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - // 获取礼物值 - @kWeakify(self); - [Api roomMicroGiftValue:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - @kStrongify(self); - [self giftValueUpdate:data.data]; - } - } roomUid:[NSString stringWithFormat:@"%ld", roomInfo.uid] uid:[AccountInfoStorage instance].getUid]; -} - -#pragma mark - update views as data changed -/** 麦位状态或者卖上用户发生变化后，通过该方法刷新麦位的界面状态。 - * 且会根据当前用户和麦位状态等，决定音频推拉流。 - * - * **Note:** 也即意味着其他的方法（回调），仅更新 self.micQueue 数据。 - */ -- (void)microQueueUpdated:(BOOL)isHandleRTC { - BOOL selfNeedBroadcast = NO; - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - BOOL leaveMode = roomInfo.leaveMode; - NSMutableArray *statisMicArray = [NSMutableArray array]; - - MicroQueueModel *anchorModel = nil; - - for (int i = 0; i < self.countOfMicroView; i++) { - MicroQueueModel * model = [self.micQueue objectForKey:[self indexToPosition:i]]; - - if (model.microState.position == -1) { - anchorModel = model; - } - - UIView * view = [self findMicroViewByIndex:i]; - [view configRoomInfo:roomInfo]; - [view configMicQueue:self.micQueue]; - [view configMicroView:model]; - [view showLeaveMode:i == 0 && leaveMode]; - if (leaveMode && i == 0) { - if (!roomInfo.showGiftValue) {//离开模式，大头位在隐藏礼物值时才重设礼物值 - [view resetGiftValue]; - } - } else { - if (model.userInfo == nil || !roomInfo.showGiftValue) [view resetGiftValue]; - } - [view showGiftValueMode:roomInfo.showGiftValue]; - if (self.hostDelegate.getUserInfo.uid && - model.userInfo.uid == self.hostDelegate.getUserInfo.uid) { - selfNeedBroadcast = model.microState.micState == MicroMicStateType_Open; - if (model.microState.micState == MicroMicStateType_Close) { - if (roomInfo.roomModeType != RoomModeType_Open_AcrossRoomPK_mode){ - [RtcManager instance].localMuted = YES; - } - } - - if (roomInfo.type == RoomType_Anchor && [[AccountInfoStorage instance].getUid isEqualToString:[NSString stringWithFormat:@"%ld", roomInfo.uid]]) { - selfNeedBroadcast = YES;///个播房房主默认角色为主播 - } - } - if (model.userInfo) { - NSString *str = [NSString stringWithFormat:@"micIndex:%d,uid:%ld", i, model.userInfo.uid]; - [statisMicArray addObject:str]; - } - } - - if (leaveMode) { - UserInfoModel *owner = [[UserInfoModel alloc] init]; - owner.avatar = anchorModel.userInfo.avatar? anchorModel.userInfo.avatar : roomInfo.avatar; - owner.nick = roomInfo.nick; - owner.uid = roomInfo.uid; - owner.gender = roomInfo.gender; - UIView *ownerView = [self findMicroViewByIndex:0]; - [ownerView configUser:owner]; - } - - if (self.isMiniEnter || !isHandleRTC) { - return; - } - [[RtcManager instance] broadcast:selfNeedBroadcast]; -} - -- (void)giftValueUpdate:(NSDictionary *)dic { - GiftValueInfoModel * model = [GiftValueInfoModel modelWithDictionary:dic]; - for (int i = 0; i < model.giftValueVos.count; i++) { - GiftValueDetailModel * giftValueModel = [model.giftValueVos xpSafeObjectAtIndex:i]; - UIView * view = [self findMicroViewByUid:giftValueModel.uid]; - if (self.hostDelegate.getRoomInfo.leaveMode && giftValueModel.uid.integerValue == self.hostDelegate.getRoomInfo.uid) { - view = [self findMicroViewByIndex:0]; - } - if (view == nil) continue; - [view configGiftValue:giftValueModel.giftValue]; - - } - [self updatePositionItemWithRoomOnMicGiftValue:model]; -} - -/** - 更新坑位的等级头饰 - */ -- (void)updatePositionItemWithRoomOnMicGiftValue:(GiftValueInfoModel *)roomOnMicGiftValue{ - if (self.hostDelegate.getRoomInfo.type == RoomType_Anchor || - self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) { - return; - } - - // Step 1: 过滤有效礼物 - NSArray *validGifts = [self filterValidGifts]; - if (validGifts.count == 0) return; - - // Step 3: 排序 - NSArray *sortedGifts = [self sortGiftsByValue:validGifts]; - - NSString *highest = nil; - NSString *lowest = nil; - - // 处理最高礼物值 - if (sortedGifts.count >= 1 && ![self hasDuplicateHighestValue:sortedGifts]) { - highest = sortedGifts.firstObject.uid; - } - // 处理最低礼物值 - if (sortedGifts.count > 1 && ![self hasDuplicateLowestValue:sortedGifts]) { - lowest = sortedGifts.lastObject.uid; - } - - // Step 4: 更新 UI - [self updateMicroViewsWithHighest:highest lowest:lowest]; -} - -// 筛选有效礼物值 -- (NSArray *)filterValidGifts { - NSMutableArray *validGifts = [NSMutableArray array]; - - for (int i = 0; i < self.microViews.count; i++) { - UIView *view = [self findMicroViewByIndex:i]; - [view hiddenPositionisHighLevel]; - long long value = [view getGiftValue]; - UserInfoModel *user = [view getUser]; - if (value > 0 && user.uid > 0) { - GiftValueDetailModel *model = [GiftValueDetailModel new]; - model.giftValue = value; - model.uid = @(user.uid).stringValue; - [validGifts addObject:model]; - } - } - - return validGifts; -} - -// 根据礼物值排序 -- (NSArray *)sortGiftsByValue:(NSArray *)gifts { - NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"giftValue" ascending:NO]; - return [gifts sortedArrayUsingDescriptors:@[sortDescriptor]]; -} - -// 检查是否存在相同最高值 -- (BOOL)hasDuplicateHighestValue:(NSArray *)sortedGifts { - if (sortedGifts.count < 2) return NO; - return sortedGifts[0].giftValue == sortedGifts[1].giftValue; -} - -// 检查是否存在相同最低值 -- (BOOL)hasDuplicateLowestValue:(NSArray *)sortedGifts { - if (sortedGifts.count < 2) return NO; - return sortedGifts[sortedGifts.count - 1].giftValue == sortedGifts[sortedGifts.count - 2].giftValue; -} - -// 更新视图 -- (void)updateMicroViewsWithHighest:(NSString *)highest lowest:(NSString *)lowest { - for (MicroQueueModel *item in self.micQueue.allValues) { - UIView *view = nil; - - if (highest && item.userInfo.uid == highest.integerValue) { - view = [self findMicroViewByUid:highest]; - [view updatePositionIsHighLevel:YES isShow:YES]; - } else if (lowest && item.userInfo.uid == lowest.integerValue) { - view = [self findMicroViewByUid:lowest]; - [view updatePositionIsHighLevel:NO isShow:YES]; - } - } -} - -#pragma mark - RoomGuestDelegate -- (void)onRoomMiniEntered { - self.isMiniEnter = YES; - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - // 加入语音房间。 - RtcEngineType type = RtcEngineType_TRTC; - [RtcManager initEngineWithType:type delegate:self]; - [self microQueueUpdated:NO]; - [self initNIMMicroQueues]; -} - -- (void)onRoomEntered { - self.isMiniEnter = NO; - ///这行代码是为了 拿到房间信息的时候已经确定了是否显示礼物值 如果等到进房成功之后在显示的话可能会有一点卡顿的感觉@fengshuo - [self microQueueUpdated:NO]; - [self initRtc]; - [self initNIMMicroQueues]; -} - -- (NSMutableDictionary *)getMicroQueue { - // 创建 micQueue 的深度副本，确保所有内部对象都是副本 - NSMutableDictionary *deepCopy = [NSMutableDictionary dictionary]; - - for (NSString *position in self.micQueue.allKeys) { - MicroQueueModel *originalModel = [self.micQueue objectForKey:position]; - MicroQueueModel *copiedModel = [[MicroQueueModel alloc] init]; - - // 复制 microState - if (originalModel.microState) { - MicroStateModel *copiedMicroState = [[MicroStateModel alloc] init]; - copiedMicroState.position = originalModel.microState.position; - copiedMicroState.posState = originalModel.microState.posState; - copiedMicroState.micState = originalModel.microState.micState; - copiedMicroState.datingMicType = originalModel.microState.datingMicType; - copiedMicroState.indexOffset = originalModel.microState.indexOffset; - copiedModel.microState = copiedMicroState; - } - - // 复制 userInfo（深度复制） - if (originalModel.userInfo) { - UserInfoModel *copiedUserInfo = [[UserInfoModel alloc] init]; - // 复制所有基本属性 - copiedUserInfo.bindType = originalModel.userInfo.bindType; - copiedUserInfo.createTime = originalModel.userInfo.createTime; - copiedUserInfo.parentMode = originalModel.userInfo.parentMode; - copiedUserInfo.isBindPhone = originalModel.userInfo.isBindPhone; - copiedUserInfo.erbanNo = originalModel.userInfo.erbanNo; - copiedUserInfo.registerDay = originalModel.userInfo.registerDay; - copiedUserInfo.isFirstCharge = originalModel.userInfo.isFirstCharge; - copiedUserInfo.hasPrettyErbanNo = originalModel.userInfo.hasPrettyErbanNo; - copiedUserInfo.isBindApple = originalModel.userInfo.isBindApple; - copiedUserInfo.fansNum = originalModel.userInfo.fansNum; - copiedUserInfo.isBindBankCard = originalModel.userInfo.isBindBankCard; - copiedUserInfo.hasRegPacket = originalModel.userInfo.hasRegPacket; - copiedUserInfo.gender = originalModel.userInfo.gender; - copiedUserInfo.platformRole = originalModel.userInfo.platformRole; - copiedUserInfo.uid = originalModel.userInfo.uid; - copiedUserInfo.defUser = originalModel.userInfo.defUser; - copiedUserInfo.remainDay = originalModel.userInfo.remainDay; - copiedUserInfo.isReview = originalModel.userInfo.isReview; - copiedUserInfo.newUser = originalModel.userInfo.newUser; - copiedUserInfo.followNum = originalModel.userInfo.followNum; - copiedUserInfo.isBindPaymentPwd = originalModel.userInfo.isBindPaymentPwd; - copiedUserInfo.isBindXCZAccount = originalModel.userInfo.isBindXCZAccount; - copiedUserInfo.isBindAlipay = originalModel.userInfo.isBindAlipay; - copiedUserInfo.isBindPasswd = originalModel.userInfo.isBindPasswd; - copiedUserInfo.visitNum = originalModel.userInfo.visitNum; - copiedUserInfo.inRoomNum = originalModel.userInfo.inRoomNum; - copiedUserInfo.showLimitCharge = originalModel.userInfo.showLimitCharge; - copiedUserInfo.limitChargeEndTime = originalModel.userInfo.limitChargeEndTime; - copiedUserInfo.isCertified = originalModel.userInfo.isCertified; - copiedUserInfo.isCustomWord = originalModel.userInfo.isCustomWord; - copiedUserInfo.otherViewType = originalModel.userInfo.otherViewType; - copiedUserInfo.headwearType = originalModel.userInfo.headwearType; - copiedUserInfo.headWearType = originalModel.userInfo.headWearType; - copiedUserInfo.vipMic = originalModel.userInfo.vipMic; - copiedUserInfo.hasSelectUser = originalModel.userInfo.hasSelectUser; - copiedUserInfo.selectMicPosition = originalModel.userInfo.selectMicPosition; - copiedUserInfo.gameStatus = originalModel.userInfo.gameStatus; - copiedUserInfo.groupType = originalModel.userInfo.groupType; - copiedUserInfo.preventKick = originalModel.userInfo.preventKick; - copiedUserInfo.fromSayHelloChannel = originalModel.userInfo.fromSayHelloChannel; - copiedUserInfo.banAccount = originalModel.userInfo.banAccount; - copiedUserInfo.isRechargeUser = originalModel.userInfo.isRechargeUser; - copiedUserInfo.isNoProhibitMic = originalModel.userInfo.isNoProhibitMic; - copiedUserInfo.hasSuperRole = originalModel.userInfo.hasSuperRole; - copiedUserInfo.uploadGifAvatarPrice = originalModel.userInfo.uploadGifAvatarPrice; - copiedUserInfo.birth = originalModel.userInfo.birth; - - // 复制字符串属性 - copiedUserInfo.phone = [originalModel.userInfo.phone copy]; - copiedUserInfo.email = [originalModel.userInfo.email copy]; - copiedUserInfo.nick = [originalModel.userInfo.nick copy]; - copiedUserInfo.avatar = [originalModel.userInfo.avatar copy]; - copiedUserInfo.reviewingAvatar = [originalModel.userInfo.reviewingAvatar copy]; - copiedUserInfo.region = [originalModel.userInfo.region copy]; - copiedUserInfo.userDesc = [originalModel.userInfo.userDesc copy]; - copiedUserInfo.nameplatePic = [originalModel.userInfo.nameplatePic copy]; - copiedUserInfo.nameplateWord = [originalModel.userInfo.nameplateWord copy]; - copiedUserInfo.roomUid = [originalModel.userInfo.roomUid copy]; - copiedUserInfo.roomTitle = [originalModel.userInfo.roomTitle copy]; - copiedUserInfo.carEffect = [originalModel.userInfo.carEffect copy]; - copiedUserInfo.viewUrl = [originalModel.userInfo.viewUrl copy]; - copiedUserInfo.carName = [originalModel.userInfo.carName copy]; - copiedUserInfo.headwearEffect = [originalModel.userInfo.headwearEffect copy]; - copiedUserInfo.headwearPic = [originalModel.userInfo.headwearPic copy]; - copiedUserInfo.headWearUrl = [originalModel.userInfo.headWearUrl copy]; - copiedUserInfo.capUrl = [originalModel.userInfo.capUrl copy]; - copiedUserInfo.userInfoCardPic = [originalModel.userInfo.userInfoCardPic copy]; - copiedUserInfo.micCircle = [originalModel.userInfo.micCircle copy]; - copiedUserInfo.micNickColor = [originalModel.userInfo.micNickColor copy]; - copiedUserInfo.fromNick = [originalModel.userInfo.fromNick copy]; - copiedUserInfo.fromUid = [originalModel.userInfo.fromUid copy]; - copiedUserInfo.androidBubbleUrl = [originalModel.userInfo.androidBubbleUrl copy]; - copiedUserInfo.iosBubbleUrl = [originalModel.userInfo.iosBubbleUrl copy]; - copiedUserInfo.phoneAreaCode = [originalModel.userInfo.phoneAreaCode copy]; - copiedUserInfo.partitionId = [originalModel.userInfo.partitionId copy]; - copiedUserInfo.guildNameplateIcon = [originalModel.userInfo.guildNameplateIcon copy]; - copiedUserInfo.regionIcon = [originalModel.userInfo.regionIcon copy]; - copiedUserInfo.visitTimeDesc = [originalModel.userInfo.visitTimeDesc copy]; - - // 复制数组属性（浅复制，因为数组元素通常是不可变的） - copiedUserInfo.labels = [originalModel.userInfo.labels copy]; - copiedUserInfo.privatePhoto = [originalModel.userInfo.privatePhoto copy]; - copiedUserInfo.absCardPics = [originalModel.userInfo.absCardPics copy]; - copiedUserInfo.userGiftWall = [originalModel.userInfo.userGiftWall copy]; - copiedUserInfo.userLuckyBagGiftWall = [originalModel.userInfo.userLuckyBagGiftWall copy]; - copiedUserInfo.dynamicInfo = [originalModel.userInfo.dynamicInfo copy]; - copiedUserInfo.userNameplateList = [originalModel.userInfo.userNameplateList copy]; - copiedUserInfo.medalsPic = [originalModel.userInfo.medalsPic copy]; - - // 复制复杂对象属性（浅复制，因为这些对象通常不需要深度修改） - copiedUserInfo.userExpand = originalModel.userInfo.userExpand; - copiedUserInfo.userLevelVo = originalModel.userInfo.userLevelVo; - copiedUserInfo.userInfoSkillVo = originalModel.userInfo.userInfoSkillVo; - copiedUserInfo.userVipInfoVO = originalModel.userInfo.userVipInfoVO; - copiedUserInfo.audioCard = originalModel.userInfo.audioCard; - copiedUserInfo.medals = originalModel.userInfo.medals; - copiedUserInfo.relationUserVO = originalModel.userInfo.relationUserVO; - copiedUserInfo.guildInfo = originalModel.userInfo.guildInfo; - copiedUserInfo.usingPersonalBackground = originalModel.userInfo.usingPersonalBackground; - copiedUserInfo.infoCardVo = originalModel.userInfo.infoCardVo; - - // 复制属性字符串（这些是计算属性，直接复制） - copiedUserInfo.levelAtt = [originalModel.userInfo.levelAtt copy]; - copiedUserInfo.idAtt = [originalModel.userInfo.idAtt copy]; - - copiedModel.userInfo = copiedUserInfo; - } else { - copiedModel.userInfo = nil; - } - - [deepCopy setObject:copiedModel forKey:position]; - } - - return deepCopy; -} - -- (void)onRoomUpdate { - self.isMiniEnter = NO; - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - for (int i = 0; i < self.countOfMicroView; i++) { - UIView * view = [self findMicroViewByIndex:i]; - [view showGiftValueMode:roomInfo.showGiftValue]; - if(roomInfo.showGiftValue == NO){ - [view resetGiftValue]; - } - } - if (self.hostDelegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind && self.hostDelegate.getRoomInfo.blindDateState == RoomPlayDateingType_Pick) { - for (int i = 0; i < self.countOfMicroView; i++) { - MicroQueueModel * model = [self.micQueue objectForKey:[self indexToPosition:i]]; - UIView * view = [self findMicroViewByIndex:i]; - [view configRoomInfo:roomInfo]; - [view configMicroView:model]; - } - } -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - BOOL microQueueChanged = NO; - BOOL ownerRTCChanged = NO; - switch (content.eventType) { - case NIMChatroomEventTypeInfoUpdated: // 麦序状态更新 - { - NSDictionary *data = [content.notifyExt toJSONObject]; - int type = [data[@"type"] intValue]; - NSArray* microStates; - switch (type) { - case 2: - microStates = @[[MicroStateModel modelWithJSON:data[@"micInfo"]]]; - break; - case 3: - microStates = [MicroStateModel modelsWithArray:data[@"micInfo"]]; - break; - } - if (microStates && microStates.count > 0) { - for (MicroStateModel *microState in microStates) { - MicroQueueModel *micSequence = [self.micQueue objectForKey:[NSString stringWithFormat:@"%d", microState.position]]; - micSequence.microState = microState; - } - microQueueChanged = YES; - } - } - break; - - case NIMChatroomEventTypeQueueChange: // 麦序上下麦 - { - NSDictionary* data = (NSDictionary *)content.ext; - NSString* position = [data objectForKey:NIMChatroomEventInfoQueueChangeItemKey]; - UserInfoModel* userInfo = [UserInfoModel modelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]]; - NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue]; - - // 先清除该用户旧的麦位 - for (MicroQueueModel *sequence in self.micQueue.allValues) { - if (userInfo.uid == sequence.userInfo.uid) { - sequence.userInfo = nil; - } - } - RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; - if (changeType == 2){ // 下麦 - // 移除对应 position 的 MicroQueueModel 的 userInfo - MicroQueueModel *sequence = [self.micQueue objectForKey:position]; - if (sequence) { - sequence.userInfo = nil; - - // 确保 micQueue 更新后立即同步到视图 - UIView *microView = [self findMicroViewByIndex:[self positionToIndex:position]]; - if (microView) { - [microView configMicroView:sequence]; - } - } - - if (userInfo.uid == [AccountInfoStorage instance].getUid.integerValue && roomInfo.roomModeType == RoomModeType_Open_Blind){ - if (roomInfo.roomModeType != RoomModeType_Open_AcrossRoomPK_mode){ - if ([RtcManager instance].isAnckorPk == NO){ - [RtcManager instance].localMuted = YES; - - } - - [RtcManager instance].isAnckorPk = NO; - } - } - }else if (changeType == 1) { // 上麦 - MicroQueueModel *sequence = [self.micQueue objectForKey:position]; - sequence.userInfo = userInfo; - - // 确保 micQueue 更新后立即同步到视图 - UIView *microView = [self findMicroViewByIndex:[self positionToIndex:position]]; - if (microView) { - [microView configMicroView:sequence]; - } - if (self.hostDelegate.getRoomInfo.showGiftValue && userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - RoomInfoModel * roomInfo =self.hostDelegate.getRoomInfo; - NSString * roomUid = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - NSString * uid = [NSString stringWithFormat:@"%ld", userInfo.uid]; - [Api roomGiftValueUpMic:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NIMMessage * message = [[NIMMessage alloc] init]; - AttachmentModel * attachMent = [[AttachmentModel alloc] init]; - attachMent.first = CustomMessageType_Room_GiftValue; - attachMent.second = Custom_Message_Sub_Room_GiftValue_Sync; - attachMent.data = data.data; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachMent; - message.messageObject = object; - - //构造会话 - NSString * sessionId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - - }]; - } - } roomUid:roomUid micUid:uid position:position uid:uid]; - } - //如果是当前用户上麦，关闭自己的麦克风 - if (sequence && sequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - if (roomInfo.roomModeType != RoomModeType_Open_Blind){ - if (userInfo.isNoProhibitMic == NO){ - if (roomInfo.roomModeType != RoomModeType_Open_AcrossRoomPK_mode){ - if ([RtcManager instance].isMiniEnter == NO){ - [RtcManager instance].localMuted = YES; - } - - } - } - } - [RtcManager instance].isMiniEnter = NO; - } - } - if(userInfo.isNoProhibitMic == YES){ - for (int i = 0; i < self.countOfMicroView; i++) { - UIView * view = [self findMicroViewByIndex:i]; - [view configPkBtn:userInfo]; - } - } - microQueueChanged = YES; - } - break; - case NIMChatroomEventTypeEnter: - { - - ///进入房间，如果自己在麦上，需要调下上麦，不然，网络不好，会导致人不在麦上，但有声音 - RoomInfoModel * roomInfo =self.hostDelegate.getRoomInfo; - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - for (MicroQueueModel *sequence in self.micQueue.allValues) { - if ([AccountInfoStorage instance].getUid.integerValue == sequence.userInfo.uid) { - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - NSMutableDictionary *userInfo = [[NSMutableDictionary alloc]initWithDictionary:[sequence.userInfo toJSONObject]]; - [userInfo setValue:@(YES) forKey:@"isNoProhibitMic"]; - request.key = @(sequence.microState.position).stringValue; - request.value = [userInfo toJSONString]; - request.roomId = roomId; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - }]; - - break; - } - } - if (content.source.userId.integerValue == [AccountInfoStorage instance].getUid.integerValue){ - [self updateNIMMicroQueues]; - } - - } - break; - case NIMChatroomEventTypeExit: - case NIMChatroomEventTypeKicked: - { - if (message.session.sessionId == self.hostDelegate.getRoomInfo.roomId) { - - } - - for (NIMChatroomNotificationMember *member in content.targets) { - for (MicroQueueModel *sequence in self.micQueue.allValues) { - if (member.userId.integerValue == sequence.userInfo.uid) { - sequence.userInfo = nil; - microQueueChanged = YES; - } - } - } - } - break; - default: - break; - } - - if (microQueueChanged) { - [self updatePositionItemWithRoomOnMicGiftValue:nil]; - self.isMiniEnter = NO; - [self microQueueUpdated:ownerRTCChanged]; - [self.hostDelegate onMicroQueueUpdate:self.micQueue]; - } -} -///自己退出房间，如果在麦上要自己下麦 --(void)exitNIMRoom{ - RoomInfoModel * roomInfo =self.hostDelegate.getRoomInfo; - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - for (MicroQueueModel *sequence in self.micQueue.allValues) { - if ([AccountInfoStorage instance].getUid.integerValue == sequence.userInfo.uid) { - NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; - request.key = @(sequence.microState.position).stringValue; - request.roomId = roomId; - [[NIMSDK sharedSDK].chatroomManager - removeChatroomQueueObject:request - completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { - - }]; - } - } -} - -- (void)handleNIMCustomMessage:(NIMMessage *)message { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - NSDictionary *dic = attachment.data; - NSString *uid = [AccountInfoStorage instance].getUid; - - switch (attachment.first) { - case CustomMessageType_Super_Gift: - if (attachment.second == Custom_Message_Sub_Super_Gift_UI_Rffect) { - NSDictionary *data = attachment.data; - NSArray *receiverUidList = [data objectForKey:@"receiverUidList"]; - NSString *receiverProfit = [data objectForKey:@"receiverProfit"]; - for (NSNumber *uid in receiverUidList) { - UIView * view = [self findMicroViewByUid:[NSString stringWithFormat:@"%ld", uid.integerValue]]; - if (view == nil && ![NSString isEmpty:receiverProfit]) continue; - [view receiveGold:receiverProfit]; - } - } - break; - case CustomMessageType_Queue: - if (attachment.second == Custom_Message_Sub_Queue_Invite) { - MicroInviteExtModel *inviteModel = [MicroInviteExtModel modelWithDictionary:dic]; - if (inviteModel.uid.integerValue == self.hostDelegate.getUserInfo.uid) { - NSString *position = inviteModel.micPosition; - - MicroQueueModel *micro = [self.micQueue objectForKey:position]; - if (!micro || micro.userInfo) return; // 当前麦位有人，什么都不做。 - - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - NSString* roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - UserInfoModel* userInfo = self.hostDelegate.getUserInfo; - - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = position; - request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; - request.roomId = roomId; - request.transient = YES; - - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - if (error) return; - [RtcManager instance].localMuted = YES; - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.actionStyle = TTAlertActionConfirmStyle; - config.title = YMLocalizedString(@"StageView0"); - config.message = YMLocalizedString(@"XPMiniRoomView3"); - [TTPopup alertWithConfig:config confirmHandler:^{ - - } cancelHandler:^{ - - }]; - }]; - } - } - break; - case CustomMessageType_Room_GiftValue: - if (attachment.second == Custom_Message_Sub_Room_GiftValue_Sync) { - [self giftValueUpdate:attachment.data]; - } - break; - case CustomMessageType_Gift: - if (attachment.second == Custom_Message_Sub_Gift_Send || attachment.second == Custom_Message_Sub_Gift_LuckySend || attachment.second == Custom_Message_Sub_Gift_ChannelNotify) { - [self giftValueUpdate:attachment.data]; - } - break; - case CustomMessageType_AllMicroSend: - if (attachment.second == Custom_Message_Sub_AllMicroSend || attachment.second == Custom_Message_Sub_AllBatchSend || attachment.second == Custom_Message_Sub_AllMicroLuckySend || attachment.second == Custom_Message_Sub_AllBatchMicroLuckySend) { - [self giftValueUpdate:attachment.data]; - } - break; - case CustomMessageType_Face: - if (attachment.second == Custom_Message_Sub_Face_Send) { - [self showUserFace:attachment.data]; - } - break; - case CustomMessageType_Room_PK: - if (attachment.second == Custom_Message_Sub_Room_PK_Manager_Up_Mic) { - if (dic.allKeys.count > 0 && [dic.allKeys containsObject:uid] && [dic objectForKey:uid]) { - RoomPKChooseUserModel *pkUserInfo = [RoomPKChooseUserModel modelWithDictionary:[dic objectForKey:uid]]; - NSString *position = [NSString stringWithFormat:@"%d", pkUserInfo.position]; - NSString* roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - MicroQueueModel *micro = [self.micQueue objectForKey:position]; - if (micro && micro.userInfo && micro.userInfo.uid != pkUserInfo.uid.integerValue) { return; } - UserInfoModel *userInfo = self.hostDelegate.getUserInfo; - userInfo.groupType = pkUserInfo.groupType; - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = position; - NSMutableDictionary *curUserInfo = [[NSMutableDictionary alloc]initWithDictionary:[self userInfoToQueueExt:userInfo]]; - [curUserInfo setValue:@(YES) forKey:@"isNoProhibitMic"]; - request.value = [curUserInfo toJSONString]; - request.roomId = roomId; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - if (error) return; - }]; - } - } else if (attachment.second == Custom_Message_Sub_Room_PK_Mode_Close) { - if (dic.allKeys.count > 0 && [[[dic objectForKey:@"operatorUid"] stringValue] isEqualToString:uid]) { - NSInteger micIndex = -1; - MicroQueueModel *micro; - for (MicroQueueModel *model in self.micQueue.allValues) { - if (model.userInfo) { - if (model.userInfo.uid == uid.integerValue) { - micro = model; - micIndex = [[[self __keysForValue:model inDictionary:self.micQueue] xpSafeObjectAtIndex:0] integerValue]; - break; - } - } - } - if (micro == nil) { - return; - } - NSString *position = [NSString stringWithFormat:@"%ld", (long)micIndex]; - NSString *roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - UserInfoModel *userInfo = self.hostDelegate.getUserInfo; - userInfo.groupType = GroupType_default; - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = position; - NSMutableDictionary *curUserInfo = [[NSMutableDictionary alloc]initWithDictionary:[self userInfoToQueueExt:userInfo]]; - [curUserInfo setValue:@(YES) forKey:@"isNoProhibitMic"]; - request.value = [curUserInfo toJSONString]; - request.roomId = roomId; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - if (error) return; - }]; - } - } - break; - default: - break; - } - } -} - -- (NSArray *)__keysForValue:(id)value inDictionary:(NSDictionary *)dictionary { - NSMutableArray *keys = [NSMutableArray array]; - - for (id key in dictionary) { - if ([dictionary[key] isEqual:value]) { - [keys addObject:key]; - } - } - - return [keys copy]; -} - -#pragma mark - RtcDelegate - 讲话的波纹回调 -- (void)usersSpeaking:(NSMutableArray *)uids { - if ([RtcManager instance].isRemoteMuted) { - return; - } - for (NSString* uid in uids) { - if ([RtcManager instance].isLocalMuted && uid.integerValue == self.hostDelegate.getUserInfo.uid) { - continue; - } - UIView* microView = [self findMicroViewByUid:uid]; - if (microView) { - [microView userSpeaking]; - } - } -} - -#pragma mark - 表情 -- (void)showUserFace:(NSDictionary *)faceDic { - if ([faceDic[@"data"] isKindOfClass:[NSArray class]]) { - NSArray *arr = faceDic[@"data"]; - for (int i = 0; i < arr.count; i++) { - NSDictionary *dict = [arr xpSafeObjectAtIndex:i]; - RoomFaceSendInfoModel * receiveInfo = [RoomFaceSendInfoModel modelWithDictionary:dict]; - UIView * view = [self findMicroViewByUid:[NSString stringWithFormat:@"%ld",receiveInfo.uid]]; - if (view == nil) continue; - [view showingFace:receiveInfo]; - } - } -} - -#pragma mark - StageViewDelegate - 留给子 View 重写的模板方法 -- (void)displayUserCard:(NSString *)targetUid position:(NSString *)position model:(MicroQueueModel*)micModel { - UserInfoModel* userInfo = self.hostDelegate.getUserInfo; - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - - XPUserCardInfoModel * model = [[XPUserCardInfoModel alloc] init]; - model.uid = targetUid; - model.position = position; - model.posState = micModel.microState.posState; - model.micState = micModel.microState.micState; - model.nick = userInfo.nick; - model.roomInfo = roomInfo; - model.micQueue = self.micQueue; - model.delegate = self.hostDelegate; - model.superMangerList = self.hostDelegate.getRoomSuperAdminList; - model.platformRole = micModel.userInfo.platformRole; - UserRoomCardViewController *vc = [[UserRoomCardViewController alloc] initWithUser:model controlUser:self.hostDelegate.getUserInfo]; - vc.modalPresentationStyle = UIModalPresentationOverFullScreen; - [self.hostDelegate.getCurrentNav presentViewController:vc animated:NO completion:nil]; -} - -- (void)nimUpMic:(NSString *)key roomId:(NSString *)roomId isFromDownMic:(BOOL)isFromDownMic { - UserInfoModel* userInfo = self.hostDelegate.getUserInfo; - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = key; - request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; - request.roomId = roomId; - request.transient = YES; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - @kStrongify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - self.isUpingMic = NO; - }); - }]; -} - -- (void)didSelectAtIndex:(NSInteger)index { - NSString* position = [self indexToPosition:index]; - if ([NSString isEmpty:position]) { - return; - } - - MicroQueueModel* micModel = [self.micQueue objectForKey:position]; - if (!micModel) { - return; - } - - UserInfoModel* userInfo = self.hostDelegate.getUserInfo; - if (!userInfo) { - return; - } - - RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo; - if (!roomInfo) { - return; - } - - NSString* uid = [NSString stringWithFormat:@"%ld", userInfo.uid]; - NSString* roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - - // 1. 麦位上有人，弹窗用户资料卡 - NSString *targetUid; - if (roomInfo.leaveMode && [position isEqualToString:@"-1"]) { - targetUid = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - } - if (micModel.userInfo && micModel.userInfo.uid > 0) { - targetUid = [NSString stringWithFormat:@"%ld", micModel.userInfo.uid]; - } - - if (![NSString isEmpty:targetUid]) { - [self displayUserCard:targetUid - position:position - model:micModel]; - return; - } - - if (roomInfo.leaveMode && roomInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"StageView3")]; - return; - } - - if (self.isUpingMic) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"StageView21")]; - return; - } - - self.isUpingMic = YES; - - // 2. 空麦位，上麦逻辑 - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = roomId; - request.userIds = @[uid]; - - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - @kStrongify(self); - - if (error || members.count == 0) { -#if DEBUG - [XNDJTDDLoadingTool showErrorWithMessage:error.localizedDescription]; -#else - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"HttpRequestHelper4")]; -#endif - self.isUpingMic = NO; - return; - } - - NIMChatroomMember * member = members.firstObject; - if (!member) { - self.isUpingMic = NO; - return; - } - - void(^nimUpQueue)(NSString*, BOOL) = ^ (NSString* up, BOOL isFromDownMic){ - if (!self.hadGetQueueInfoSuccess) { - self.isUpingMic = NO; - return; - } - MicroQueueModel* micModel = [self.micQueue objectForKey:up]; - if (!micModel || micModel.userInfo) {///麦上已经有人,不上麦 - self.isUpingMic = NO; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"StageView4")]; - return; - } - - if (roomInfo.type == RoomType_19Mic && micModel.microState.position == 6 ) { - [Api requestBossMicUp:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - [self nimUpMic:up roomId:roomId isFromDownMic:isFromDownMic]; - } else { - self.isUpingMic = NO; - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:@(roomInfo.uid).stringValue uid:uid]; - } else { - [self nimUpMic:up roomId:roomId isFromDownMic:isFromDownMic]; - } - }; - - /** - * firstDown 先下麦 - * nextUp 下麦成功后再上的麦位，为nil的时候代表不需要上麦 - */ - void(^nimDownQueue)(NSString*, NSString*) = ^ (NSString* firstDown, NSString* nextUp){ - NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; - request.key = firstDown; - request.roomId = roomId; - [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { - if (!error && nextUp) { - nimUpQueue(nextUp, YES); - } else { - self.isUpingMic = NO; - } - }]; - }; - - // 2.0 - if (userInfo.platformRole == 1) { - // 超级管理不上mic - // 2.0.1 锁麦/解锁 - TTActionSheetConfig *lockMic = [self lockMicAction:position - room:roomInfo - mic:micModel - isAppAdmin:YES]; - // 2.0.2 闭麦/开麦 - TTActionSheetConfig *muteMic = [self muteMicAction:position room:roomInfo mic:micModel isAppAdmin:YES]; - @kWeakify(self); - [TTPopup actionSheetWithItems:@[lockMic, muteMic] cancelHandler:^{ - @kStrongify(self); - self.isUpingMic = NO; - }]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - self.isUpingMic = NO; - }); - return; - } - - // 2.1 管理员点击了空麦位 - if (member.type == NIMTeamMemberTypeOwner || member.type == NIMTeamMemberTypeManager) { - // 2.1.1 上麦 - TTActionSheetConfig *upMic = [self upMicAction:position room:roomInfo mic:micModel blockUp:^(NSString *up, BOOL isFromDownMic) { - nimUpQueue(position, NO); - } blockDown:^(NSString *firstDown, NSString *nextUp) { - nimDownQueue(firstDown, nextUp); - }]; - - // 2.1.2 锁麦/解锁 - TTActionSheetConfig *lockMic = [self lockMicAction:position - room:roomInfo - mic:micModel - isAppAdmin:NO]; - // 2.1.3 闭麦/开麦 - TTActionSheetConfig *muteMic = [self muteMicAction:position room:roomInfo mic:micModel isAppAdmin:NO]; - - // 抱Ta上麦 - TTActionSheetConfig *inviteMic = [self inviteMicAction:position room:roomInfo mic:micModel]; - NSMutableArray *items = [[NSMutableArray alloc] init]; - if (upMic) { - [items addObject:upMic]; - } - if (lockMic) { - [items addObject:lockMic]; - } - if (muteMic) { - [items addObject:muteMic]; - } - if (inviteMic) { - [items addObject:inviteMic]; - } - @kWeakify(self); - [TTPopup actionSheetWithItems:items.copy cancelHandler:^{ - @kStrongify(self); - self.isUpingMic = NO; - }]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - self.isUpingMic = NO; - }); - } else { - // 2.2 非管理员点击了空麦位 - if (micModel.microState.posState == MicroPosStateType_Lock) { - if (roomInfo.roomModeType == RoomModeType_Open_Micro_Mode) { - if ([self getIndexByUid:[AccountInfoStorage instance].getUid] != -1) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"StageView19")]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"StageView20")]; - } - } - self.isUpingMic = NO; - return; - }; - - NSString* selfUid = [NSString stringWithFormat:@"%ld", (long)self.hostDelegate.getUserInfo.uid]; - UIView* microView = [self findMicroViewByUid:selfUid]; - if (microView) { - nimDownQueue([self indexToPosition:microView.tag], position); - } else { - nimUpQueue(position, NO); - } - } - }]; -} - -- (TTActionSheetConfig *)upMicAction:(NSString *)position - room:(RoomInfoModel *)roomInfo - mic:(MicroQueueModel *)micInfo - blockUp:(void(^)(NSString* up, BOOL isFromDownMic))blockUp - blockDown:(void(^)(NSString* firstDown, NSString* nextUp))blockDown { - NSString * upTitle = YMLocalizedString(@"StageView5"); - TTActionSheetConfig *upMic = [TTActionSheetConfig normalTitle:upTitle clickAction:^{ - NSString* selfUid = [NSString stringWithFormat:@"%ld", (long)self.hostDelegate.getUserInfo.uid]; - UIView* microView = [self findMicroViewByUid:selfUid]; - - if (roomInfo.type == RoomType_19Mic && micInfo.microState.position == 6 ) { - @kWeakify(self); - [Api requestBossMicUp:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - if (microView) { - if (blockDown) { - blockDown([self indexToPosition:microView.tag], position); - } - } else { - if (blockUp) { - blockUp(position, NO); - } - } - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:@(roomInfo.uid).stringValue - uid:[NSString stringWithFormat:@"%ld", self.hostDelegate.getUserInfo.uid]]; - } else { - if (microView) { - if (blockDown) { - blockDown([self indexToPosition:microView.tag], position); - } - } else { - if (blockUp) { - blockUp(position, NO); - } - } - } - }]; - return upMic; -} - -- (TTActionSheetConfig *)lockMicAction:(NSString *)position - room:(RoomInfoModel *)roomInfo - mic:(MicroQueueModel *)micInfo - isAppAdmin:(BOOL)isAppAdmin { - NSString * lockTitle; - if (roomInfo.roomModeType == RoomModeType_Open_Micro_Mode) { - lockTitle = micInfo.microState.posState == MicroPosStateType_Free ? YMLocalizedString(@"StageView22") : YMLocalizedString(@"StageView8"); - }else { - lockTitle = micInfo.microState.posState == MicroPosStateType_Free ? YMLocalizedString(@"StageView23") : YMLocalizedString(@"StageView10"); - } - @kWeakify(self); - TTActionSheetConfig *lockMic = [TTActionSheetConfig normalTitle:lockTitle clickAction:^{ - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - NSString * state = micInfo.microState.posState == MicroPosStateType_Free ? @"1" : @"0"; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * uid = [[AccountInfoStorage instance] getUid]; - [Api microLockCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200 && isAppAdmin && state.integerValue == 1) { - NIMMessage * message = [[NIMMessage alloc] init]; - AttachmentModel * attachMent = [[AttachmentModel alloc] init]; - attachMent.first = CustomMessageType_Hall_Super_Admin; - attachMent.second = Custom_Message_Sub_Hall_Super_Admin_Lock_Mic; - attachMent.data = @{@"micNumber":@(micInfo.microState.position).stringValue}; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachMent; - message.messageObject = object; - - //构造会话 - NSString * sessionId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - self.isUpingMic = NO; - }]; - } else { - self.isUpingMic = NO; - } - } roomUid:roomUid state:state position:position ticket:ticket uid:uid]; - }]; - - return lockMic; -} - -- (TTActionSheetConfig *)muteMicAction:(NSString *)position - room:(RoomInfoModel *)roomInfo - mic:(MicroQueueModel *)micInfo - isAppAdmin:(BOOL)isAppAdmin { - - @kWeakify(self); - NSString * muteTitle = micInfo.microState.micState == MicroMicStateType_Open ? YMLocalizedString(@"StageView25") : YMLocalizedString(@"StageView14"); - TTActionSheetConfig *muteMic = [TTActionSheetConfig normalTitle:muteTitle clickAction:^{ - NSString * roomUid = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - NSString * state = micInfo.microState.micState == MicroMicStateType_Open ? @"1" : @"0"; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * uid = [[AccountInfoStorage instance] getUid]; - [Api microMuteCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200 && isAppAdmin && state.integerValue == 1) { - NIMMessage * message = [[NIMMessage alloc] init]; - AttachmentModel * attachMent = [[AttachmentModel alloc] init]; - attachMent.first = CustomMessageType_Hall_Super_Admin; - attachMent.second = Custom_Message_Sub_Hall_Super_Admin_Mute_Mic; - attachMent.data = @{@"micNumber":@(micInfo.microState.position).stringValue}; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachMent; - message.messageObject = object; - - //构造会话 - NSString * sessionId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - self.isUpingMic = NO; - }]; - } else { - self.isUpingMic = NO; - } - } roomUid:roomUid state:state position:position ticket:ticket uid:uid]; - }]; - return muteMic; -} - -- (TTActionSheetConfig *)inviteMicAction:(NSString *)position - room:(RoomInfoModel *)roomInfo - mic:(MicroQueueModel *)micInfo { - NSString * inviteTitle = ([position isEqualToString:@"-1"] && roomInfo.roomModeType == RoomModeType_Open_Blind) ? YMLocalizedString(@"StageView27") : YMLocalizedString(@"StageView18"); - NSString * roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - @kWeakify(self); - TTActionSheetConfig *inviteMic = [TTActionSheetConfig normalTitle:inviteTitle clickAction:^{ - @kStrongify(self); - XPRoomInviteUserViewController * inviteUserMicVC = [[XPRoomInviteUserViewController alloc] init]; - inviteUserMicVC.isManagerOrOwner = ([position isEqualToString:@"-1"] && roomInfo.roomModeType == RoomModeType_Open_Blind); - inviteUserMicVC.roomId = roomId; - inviteUserMicVC.roomType = self.hostDelegate.getRoomInfo.type; - inviteUserMicVC.roomModeType = self.hostDelegate.getRoomInfo.roomModeType; - inviteUserMicVC.position = position; - inviteUserMicVC.roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - inviteUserMicVC.blindDateVipUid = roomInfo.blindDateVipUid; - [self.hostDelegate.getCurrentNav pushViewController:inviteUserMicVC animated:YES]; - self.isUpingMic = NO; - }]; - return inviteMic; -} - - -- (NSInteger)countOfMicroView { - return 0; -} - -- (CGFloat)hightForStageView { - return 0; -} - -- (nonnull UIView *)microViewForIndex:(NSInteger)index { - return [self findMicroViewByIndex:index]; -} - -- (CGRect)rectForViewAtIndex:(NSInteger)index { - return CGRectZero; -} - -/// 统一实现：使用子类提供的策略判断相邻性并计算中点矩形 -- (CGRect)rectForMidpointBetweenMicAtIndex:(NSInteger)firstIndex andIndex:(NSInteger)secondIndex { - // 1. 基础验证 - if (firstIndex == secondIndex) { - return CGRectZero; - } - - // 2. 使用子类提供的策略判断相邻性 - if (![self isAdjacentMicAtIndex:firstIndex andIndex:secondIndex]) { - return CGRectZero; - } - - // 3. 获取矩形并验证 - NSInteger left = MIN(firstIndex, secondIndex); - NSInteger right = MAX(firstIndex, secondIndex); - CGRect leftRect = [self rectForViewAtIndex:left]; - CGRect rightRect = [self rectForViewAtIndex:right]; - - if (CGRectIsEmpty(leftRect) || CGRectIsEmpty(rightRect)) { - return CGRectZero; - } - - // 4. 使用子类提供的中点计算逻辑 - return [self calculateMidpointRectBetweenLeft:leftRect andRight:rightRect]; -} - -#pragma mark - 子类可重写的布局配置方法 - -- (NSArray *> *)micRowRanges { - // 默认实现：所有麦位在一行 - NSInteger count = [self countOfMicroView]; - if (count > 0) { - return @[@[@0, @(count - 1)]]; - } - return @[]; -} - -- (BOOL)allowsAdjacentInSameRow { - return YES; -} - -- (BOOL)isAdjacentMicAtIndex:(NSInteger)firstIndex andIndex:(NSInteger)secondIndex { - if (firstIndex == secondIndex) return NO; - - NSInteger left = MIN(firstIndex, secondIndex); - NSInteger right = MAX(firstIndex, secondIndex); - - // 使用行配置判断 - NSArray *> *rowRanges = [self micRowRanges]; - - for (NSArray *rowRange in rowRanges) { - if (rowRange.count >= 2) { - NSInteger rowStart = rowRange[0].integerValue; - NSInteger rowEnd = rowRange[1].integerValue; - - // 检查两个索引是否都在同一行 - if (left >= rowStart && left <= rowEnd && right >= rowStart && right <= rowEnd) { - // 检查是否相邻（索引差为1） - return (right - left) == 1; - } - } - } - - return NO; -} - -- (CGRect)calculateMidpointRectBetweenLeft:(CGRect)leftRect andRight:(CGRect)rightRect { - // 计算中点X坐标 - CGFloat leftCenterX = CGRectGetMidX(leftRect); - CGFloat rightCenterX = CGRectGetMidX(rightRect); - CGFloat midX = (leftCenterX + rightCenterX) / 2.0; - - // 使用两个麦位矩形的顶部对齐，并向上移动10px - CGFloat leftTopY = CGRectGetMinY(leftRect); - CGFloat rightTopY = CGRectGetMinY(rightRect); - CGFloat midTopY = (leftTopY + rightTopY) / 2.0 - 10.0; - - // 返回适配屏幕的矩形 - CGFloat size = kGetScaleWidth(kMidpointRectSize); - return CGRectMake(midX - size / 2.0, midTopY, size, size); -} - -#pragma mark - StageViewProtocol - 基本上都是工具方法 -- (NSInteger)positionToIndex:(NSString*)position { - return position.intValue + 1; -} - -- (NSString *)indexToPosition:(NSInteger)index { - return [NSString stringWithFormat:@"%ld", (long)(index - 1)]; -} - -- (NSInteger)getIndexByUid:(NSString *)uid { - UIView * view = [self findMicroViewByUid:uid]; - if (view) { - return [self.microViews indexOfObject:view]; - } - return -1; -} - -- (MicroQueueModel *)findMicroInfoByUid:(NSString *)uid { - for (MicroQueueModel *model in self.micQueue.allValues) { - if (model.userInfo && model.userInfo.uid == uid.intValue) { - return model; - } - } - return nil; -} - -- (UIView *)findMicroViewByUid:(NSString *)uid { - for (int i = 0; i < self.countOfMicroView; i++) { - MicroQueueModel* model = [self.micQueue objectForKey:[self indexToPosition:i]]; - if (model.userInfo && model.userInfo.uid == uid.intValue) { - return [self findMicroViewByIndex:i]; - } - } - return nil; -} - -- (UIView *)findMicroViewByIndex:(NSInteger)index { - if (self.microViews && self.microViews.count > index) { - return [self.microViews xpSafeObjectAtIndex:index]; - } - return nil; -} - -- (UIView *)findMicroViewByPosition:(NSString *)position { - return [self findMicroViewByIndex:[self positionToIndex:position]]; -} - -#pragma mark - private utils function -/** - * 麦位更新扩展字段。 - */ -- (NSDictionary *)userInfoToQueueExt:(UserInfoModel *)userInfo { - MicroExtModel * extModel = [[MicroExtModel alloc] init]; - extModel.gender = userInfo.gender; - extModel.avatar = userInfo.avatar; - extModel.uid = userInfo.uid; - extModel.nick = userInfo.nick; - extModel.headWearUrl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - extModel.headWearType = [userInfo isHeadWearSVGA] ? 1 : 0;; - extModel.micCircle = userInfo.micCircle; - extModel.micNickColor = userInfo.micNickColor; - extModel.preventKick = userInfo.userVipInfoVO.preventKick; - extModel.enterHide = userInfo.userVipInfoVO.enterHide; - extModel.groupType = userInfo.groupType; - return [extModel model2dictionary]; -} - -/** - * 麦位的点击响应入口。 - */ -- (void)microViewTapped:(UITapGestureRecognizer *)sender { - [self didSelectAtIndex:sender.view.tag]; -} - -- (NSMutableArray *)microViews { - if (!_microViews) { - _microViews = [NSMutableArray arrayWithCapacity:self.countOfMicroView]; - } - return _microViews; -} - -- (NSMutableDictionary *)micQueue { - // 可能是使用的對象不一致- stageview 和 當前選擇（比如 nineteenmicstageview）的保存 queue 內容不一致。 - if (!_micQueue) { - _micQueue= [NSMutableDictionary dictionary]; - for (int i = 0; i < self.countOfMicroView; i++) { - NSString* position = [self indexToPosition:i]; - MicroQueueModel *micSequence = [[MicroQueueModel alloc]init]; - micSequence.userInfo = nil; - micSequence.microState = [[MicroStateModel alloc]init]; - micSequence.microState.position = [position intValue]; - [self.micQueue setObject:micSequence forKey:position]; - } - } - return _micQueue; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/TenMicStageView.h b/YuMi/Modules/YMRoom/View/StageView/TenMicStageView.h deleted file mode 100644 index ac865be..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/TenMicStageView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// TenMicStageView.h -// YuMi -// -// Created by P on 2024/6/25. -// - -#import "StageView.h" -#import "MicMidpointRectManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface TenMicStageView : StageView - -@property (nonatomic, strong, readonly) MicMidpointRectManager *midpointRectManager; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/TenMicStageView.m b/YuMi/Modules/YMRoom/View/StageView/TenMicStageView.m deleted file mode 100644 index 91fa1a9..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/TenMicStageView.m +++ /dev/null @@ -1,102 +0,0 @@ -// -// TenMicStageView.m -// YuMi -// -// Created by P on 2024/6/25. -// - -#import "TenMicStageView.h" -#import "SocialMicroView.h" -#import "MicMidpointRectManager.h" -//第一行距离顶部 -#define firstRowTopMargin 60 -// 房主头像宽 58 + 光圈 5 -//#define ownerWidth (45 + 5) * kScreenScale -// 昵称高12，距离头像间距 10 -#define ownerHeight (ownerWidth + 10 + 12) -// 下面 8 个坑位宽55 + 光圈 5 -#define mcWidth (45 + 5) * kScreenScale -#define mcHeight (mcWidth + 10 + 12 + 5+16) -// 左右 padding 20 -#define paddingH 22 * kScreenScale -// 每行间距 -#define lineMargin 8 -// 下面 8 个坑位两两之间的间距 -#define marginH (KScreenWidth - paddingH * 2 - mcWidth * 5) / 4 -// 第二行坑位的顶部 -#define sRowTop firstRowTopMargin + mcHeight + lineMargin -// 第一行坑位与第二行坑位的间距 -//#define marginV2 15 - -@interface TenMicStageView () - -@property (nonatomic, strong) MicMidpointRectManager *midpointRectManager; - -@end - -@implementation TenMicStageView - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super initWithDelegate:delegate]) { - // 初始化中点矩形管理器 - _midpointRectManager = [[MicMidpointRectManager alloc] initWithContainerView:self]; - } - return self; -} - -- (NSInteger)countOfMicroView { - return 10; -} - -- (UIView *)microViewForIndex:(NSInteger)index { - UIView * microView = [super microViewForIndex:index]; - if (microView) { - return microView; - } - SocialMicroView *v = [[SocialMicroView alloc] init]; - return v; -} - -- (CGRect)rectForViewAtIndex:(NSInteger)index { - if (index >= 0 && index <= 4) { - return CGRectMake(paddingH + (mcWidth + marginH) * (index), firstRowTopMargin, mcWidth, mcHeight); - } - - if (index >= 5 && index < 10) { - return CGRectMake(paddingH + (mcWidth + marginH) * (index - 5), sRowTop, mcWidth, mcHeight); - } - - return [super rectForViewAtIndex:index]; -} - -- (CGFloat)hightForStageView{ - return sRowTop + mcHeight + lineMargin; - // return firstRowTopMargin + mcHeight + sRowTop + mcHeight + tRowTop + mcHeight + lineMargin; - // return 3 * (lineMargin + mcHeight) + lineMargin; -} - -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { - NSInteger index = [self getIndexByUid:uid]; - CGPoint point = CGPointZero; - - if (index >= 0 && index <= 4) { - point = CGPointMake(paddingH + (mcWidth + marginH) * (index) + mcWidth / 2, firstRowTopMargin + mcWidth / 2); - } - - if (index >= 5 && index < 10) { - point = CGPointMake(paddingH + (mcWidth + marginH) * (index - 5) + mcWidth / 2, sRowTop + mcWidth / 2); - } - if (CGPointEqualToPoint(point, CGPointZero)) { - point = CGPointMake(KScreenWidth/2, 70); - } else { - point = [self convertPoint:point toView:nil]; - } - return point; -} - -// 10麦位布局：5x2网格配置 -- (NSArray *> *)micRowRanges { - return @[@[@0, @4], @[@5, @9]]; // 第一行0-4，第二行5-9 -} - -@end diff --git a/YuMi/Modules/YMRoom/View/StageView/TwentyMicStageView.h b/YuMi/Modules/YMRoom/View/StageView/TwentyMicStageView.h deleted file mode 100644 index 91c6ca0..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/TwentyMicStageView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// TwentyMicStageView.h -// YuMi -// -// Created by P on 2024/12/12. -// - -#import "StageView.h" -#import "MicMidpointRectManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface TwentyMicStageView : StageView - -@property (nonatomic, strong, readonly) MicMidpointRectManager *midpointRectManager; - -//- (instancetype)initWithRows:(NSInteger)rows columns:(NSInteger)columns; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageView/TwentyMicStageView.m b/YuMi/Modules/YMRoom/View/StageView/TwentyMicStageView.m deleted file mode 100644 index ddc5acd..0000000 --- a/YuMi/Modules/YMRoom/View/StageView/TwentyMicStageView.m +++ /dev/null @@ -1,113 +0,0 @@ -// -// TwentyMicStageView.m -// YuMi -// -// Created by P on 2024/12/12. -// - -#import "TwentyMicStageView.h" -#import "SocialMicroView.h" -#import "MicMidpointRectManager.h" - -//第一行距离顶部 -#define firstRowTopMargin 60 -// 房主头像宽 58 + 光圈 5 -#define ownerWidth (45 + 5) * kScreenScale -// 昵称高12，距离头像间距 10 -#define ownerHeight (ownerWidth + 10 + 12) -// 下面 8 个坑位宽55 + 光圈 5 -#define mcWidth (45 + 5) * kScreenScale -#define mcHeight (mcWidth + 10 + 12 + 5+16) -// 左右 padding 20 -#define paddingH 22 * kScreenScale -// 每行间距 -#define lineMargin 8 -// 下面 8 个坑位两两之间的间距 -#define marginH (KScreenWidth - paddingH * 2 - mcWidth * 5) / 4 -// 第二行坑位的顶部 -#define sRowTop firstRowTopMargin + mcHeight + lineMargin -// 第一行坑位与第二行坑位的间距 -//#define marginV2 15 -// 第三行坑位的顶部 -#define tRowTop (sRowTop + mcHeight + lineMargin) - -@interface TwentyMicStageView () - -@property (nonatomic, strong) MicMidpointRectManager *midpointRectManager; - -@end - -@implementation TwentyMicStageView - -- (instancetype)initWithDelegate:(id)delegate { - if (self = [super initWithDelegate:delegate]) { - // 初始化中点矩形管理器 - _midpointRectManager = [[MicMidpointRectManager alloc] initWithContainerView:self]; - } - return self; -} - -static const NSInteger kMicCountPerRow = 5; - -- (NSInteger)countOfMicroView { - return 20; -} - -- (UIView *)microViewForIndex:(NSInteger)index { - UIView *microView = [super microViewForIndex:index]; - return microView ?: [[SocialMicroView alloc] init]; -} - -- (CGRect)rectForViewAtIndex:(NSInteger)index { - if (index < 0 || index >= [self countOfMicroView]) { - return CGRectZero; - } - CGPoint position = [self positionForIndex:index rowHeight:mcHeight]; - return CGRectMake(position.x - mcWidth / 2, position.y - mcHeight / 2, mcWidth, mcHeight); -} - -- (CGFloat)hightForStageView { - NSInteger rows = ceil((CGFloat)[self countOfMicroView] / kMicCountPerRow); - return firstRowTopMargin + rows * (mcHeight + lineMargin) - lineMargin; -} - -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { - NSInteger index = [self getIndexByUid:uid]; - return [self animationPointAtStageViewByIndex:index]; -} - -- (CGPoint)animationPointAtStageViewByIndex:(NSInteger)index { - if (index < 0 || index >= [self countOfMicroView]) { - return CGPointMake(KScreenWidth/2, 50); - } - CGPoint position = [self positionForIndex:index rowHeight:mcHeight]; - return [self convertPoint:position toView:nil]; -} - -#pragma mark - Helper Methods - -- (CGPoint)positionForIndex:(NSInteger)index rowHeight:(CGFloat)rowHeight { - NSInteger row = index / kMicCountPerRow; - NSInteger col = index % kMicCountPerRow; - CGFloat x = paddingH + col * (mcWidth + marginH) + mcWidth / 2; - CGFloat y = firstRowTopMargin + row * (rowHeight + lineMargin) + rowHeight / 2; - return CGPointMake(x, y); -} - -// 20麦位布局：5x4网格配置 -- (NSArray *> *)micRowRanges { - NSMutableArray *ranges = [NSMutableArray array]; - NSInteger totalMics = [self countOfMicroView]; - NSInteger rows = ceil((CGFloat)totalMics / kMicCountPerRow); - - for (NSInteger i = 0; i < rows; i++) { - NSInteger start = i * kMicCountPerRow; - NSInteger end = MIN(start + kMicCountPerRow - 1, totalMics - 1); - [ranges addObject:@[@(start), @(end)]]; - } - - return ranges; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/StageViewManager.h b/YuMi/Modules/YMRoom/View/StageViewManager.h deleted file mode 100644 index 4f044c9..0000000 --- a/YuMi/Modules/YMRoom/View/StageViewManager.h +++ /dev/null @@ -1,60 +0,0 @@ -// -// StageViewManager.h -// YUMI -// -// Created by YUMI on 2024/12/19. -// - -#import -#import "RoomInfoModel.h" -#import "RoomHostDelegate.h" - -@class StageView; - - -// 使用 RoomInfoModel 中已有的 RoomType 定义 -// 避免重复定义，保持代码一致性 - -NS_ASSUME_NONNULL_BEGIN - -@interface StageViewManager : NSObject - -@property (nonatomic, strong, readonly) StageView *currentStageView; -@property (nonatomic, - assign, - readonly) RoomType currentRoomType; - -/** - 更新 stageView 到指定房间类型 - @param roomType 房间类型 - @param roomInfo 房间信息 - @param container 容器视图 - @param delegate stageView 的代理对象 - @return 是否更新成功 - */ -- (BOOL)updateStageViewForRoomType:(RoomType)roomType - roomInfo:(RoomInfoModel *)roomInfo - container:(UIView *)container - delegate:(id)delegate; - -/** - 通知 stageView 更新 - @param roomInfo 房间信息 - */ -- (void)notifyStageViewUpdate:(RoomInfoModel *)roomInfo; - -/** - 清理资源 - */ -- (void)cleanup; - -/** - 检查是否需要切换 stageView 类型 - @param newType 新的房间类型 - @return 是否需要切换 - */ -- (BOOL)shouldChangeStageViewType:(RoomType)newType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/StageViewManager.m b/YuMi/Modules/YMRoom/View/StageViewManager.m deleted file mode 100644 index bf650a1..0000000 --- a/YuMi/Modules/YMRoom/View/StageViewManager.m +++ /dev/null @@ -1,169 +0,0 @@ -// -// StageViewManager.m -// YUMI -// -// Created by YUMI on 2024/12/19. -// - -#import "StageViewManager.h" -#import "RoomInfoModel.h" -#import "SocialStageView.h" -#import "TenMicStageView.h" -#import "FifteenMicStageView.h" -#import "NineteenMicStageView.h" -#import "TwentyMicStageView.h" -#import "DatingStageView.h" -#import "AnchorStageView.h" -#import "AnchorPkStageView.h" -#import "LittleGameStageView.h" -#import "LittleGameScrollStageView.h" - - -@interface StageViewManager () - -@property (nonatomic, strong) StageView *currentStageView; -@property (nonatomic, assign) RoomType currentRoomType; -@property (nonatomic, weak) UIView *container; - -@end - -@implementation StageViewManager - -- (instancetype)init { - self = [super init]; - if (self) { - _currentRoomType = RoomType_Room; // RoomType_Game 默认值 - } - return self; -} - -- (BOOL)updateStageViewForRoomType:(RoomType)roomType - roomInfo:(id)roomInfo - container:(UIView *)container - delegate:(id)delegate { - - // 检查是否需要切换 stageView 类型 - if ([self shouldChangeStageViewType:roomType]) { - NSLog(@"🔄 StageViewManager: 切换 stageView 类型 | 从 %ld 到 %ld", - (long)self.currentRoomType, (long)roomType); - - // 清理旧的 stageView - [self cleanup]; - - // 创建新的 stageView - [self createStageViewForType:roomType withDelegate:delegate]; - self.currentRoomType = roomType; - self.container = container; - } - - // 确保 stageView 已添加到容器 -// if (self.currentStageView && !self.currentStageView.superview && container) { -// [container insertSubview:self.currentStageView atIndex:0]; -// NSLog(@"✅ StageViewManager: stageView 已添加到容器"); -// } - - // 返回是否成功创建了 stageView - return self.currentStageView != nil; -} - -- (void)notifyStageViewUpdate:(id)roomInfo { - if (self.currentStageView && [self.currentStageView respondsToSelector:@selector(onRoomUpdate)]) { - NSLog(@"🔄 StageViewManager: 通知 stageView 更新 | type=%ld", (long)self.currentRoomType); - [self.currentStageView onRoomUpdate]; - } -} - -- (void)cleanup { - if (self.currentStageView) { - NSLog(@"🧹 StageViewManager: 开始清理 stageView | Type: %ld | Class: %@", - (long)self.currentRoomType, NSStringFromClass([self.currentStageView class])); - - // 1. 通知 stageView 进行清理操作 - if ([self.currentStageView respondsToSelector:@selector(exitNIMRoom)]) { - [self.currentStageView exitNIMRoom]; - NSLog(@"🧹 StageViewManager: 已调用 stageView.exitNIMRoom"); - } - - // 2. 移除所有子视图引用 - if (self.currentStageView.superview) { - [self.currentStageView removeFromSuperview]; - NSLog(@"🧹 StageViewManager: stageView 已从 superview 移除"); - } - - // 3. 清空所有子视图 - [self.currentStageView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)]; - - // 4. 释放 stageView 实例 - self.currentStageView = nil; - NSLog(@"🧹 StageViewManager: stageView 清理完成"); - } - - // 5. 清空容器引用 - self.container = nil; -} - -- (BOOL)shouldChangeStageViewType:(RoomType)newType { - return self.currentRoomType != newType || !self.currentStageView; -} - -#pragma mark - Private Methods - -- (void)createStageViewForType:(NSInteger)roomType withDelegate:(id)delegate { - // 根据房间类型创建对应的 stageView - // 注意：所有 stageView 都需要 delegate 来正确初始化 - - switch (roomType) { - case RoomType_Anchor: { // RoomType_Anchor - // 检查是否为 PK 模式 - // 这里需要根据 roomInfo 来判断，暂时使用默认的 AnchorStageView - if ([delegate respondsToSelector:@selector(getRoomInfo)]) { - RoomInfoModel *roomInfo = [delegate getRoomInfo]; - if (roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { - self.currentStageView = [[AnchorPKStageView alloc] initWithDelegate:delegate]; - } else { - self.currentStageView = [[AnchorStageView alloc] initWithDelegate:delegate]; - } - } else { - self.currentStageView = [[AnchorStageView alloc] initWithDelegate:delegate]; - } - break; - } - case RoomType_MiniGame: { // RoomType_MiniGame - self.currentStageView = [[LittleGameScrollStageView alloc] initWithDelegate:delegate]; - break; - } - case RoomType_20Mic: { // RoomType_20Mic - self.currentStageView = [[TwentyMicStageView alloc] initWithDelegate:delegate]; - break; - } - case RoomType_19Mic: { // RoomType_19Mic - self.currentStageView = [[NineteenMicStageView alloc] initWithDelegate:delegate]; - break; - } - case RoomType_15Mic: { // RoomType_15Mic - self.currentStageView = [[FifteenMicStageView alloc] initWithDelegate:delegate]; - break; - } - case RoomType_10Mic: { // RoomType_10Mic - self.currentStageView = [[TenMicStageView alloc] initWithDelegate:delegate]; - break; - } - case RoomType_Room: { // RoomType_Game - self.currentStageView = [[SocialStageView alloc] initWithDelegate:delegate]; - break; - } - default: { - self.currentStageView = [[SocialStageView alloc] initWithDelegate:delegate]; - break; - } - } - - if (self.currentStageView) { - NSLog(@"✅ StageViewManager: 创建 stageView 成功 | type=%ld | class=%@", - (long)roomType, NSStringFromClass([self.currentStageView class])); - } else { - NSLog(@"❌ StageViewManager: 创建 stageView 失败 | type=%ld", (long)roomType); - } -} - -@end diff --git a/YuMi/Modules/YMRoom/View/TaskTip/XPTaskCompleteTipView.h b/YuMi/Modules/YMRoom/View/TaskTip/XPTaskCompleteTipView.h deleted file mode 100644 index 6f00dab..0000000 --- a/YuMi/Modules/YMRoom/View/TaskTip/XPTaskCompleteTipView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// YMTaskCompleteTipView.h -// YUMI -// -// Created by YUMI on 2022/8/2. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPTaskCompleteTipView : UIView - -@property (nonatomic, copy) NSString *desc; - -@property (nonatomic, copy) NSString *url; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/TaskTip/XPTaskCompleteTipView.m b/YuMi/Modules/YMRoom/View/TaskTip/XPTaskCompleteTipView.m deleted file mode 100644 index 79a2e91..0000000 --- a/YuMi/Modules/YMRoom/View/TaskTip/XPTaskCompleteTipView.m +++ /dev/null @@ -1,107 +0,0 @@ -// -// YMTaskCompleteTipView.m -// YUMI -// -// Created by YUMI on 2022/8/2. -// - -#import "XPTaskCompleteTipView.h" -///tool -#import "DJDKMIMOMColor.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -///Third -#import - -@interface XPTaskCompleteTipView() - -///背景 -@property (nonatomic, strong) UIImageView *mainView; -///昵称 -@property (nonatomic, strong) UILabel *nickLabel; -///昵称 -@property (nonatomic, strong) UILabel *gotoLabel; - -@end - - -@implementation XPTaskCompleteTipView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initContraints]; - } - return self; -} - -- (void)initSubViews { - [self addSubview:self.mainView]; - [self addSubview:self.nickLabel]; - [self addSubview:self.gotoLabel]; -} - -- (void)initContraints { - [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.centerY.mas_equalTo(self); - make.height.mas_equalTo(20); - make.width.mas_equalTo(150); - }]; - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self); - make.leading.mas_equalTo(self.mainView).mas_offset(15); - }]; - [self.gotoLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickLabel.mas_trailing).mas_offset(4); - make.centerY.mas_equalTo(self.mainView); - }]; -} - -- (void)setDesc:(NSString *)desc { - _desc = desc; - if (desc.length) { - self.nickLabel.text = desc; - } -} - -- (void)setUrl:(NSString *)url { - _url = url; -} - -#pragma mark - getter -- (UIImageView *)mainView { - if (!_mainView) { - _mainView = [[UIImageView alloc] init]; - _mainView.layer.cornerRadius = 10; - _mainView.layer.masksToBounds = YES; - _mainView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x5FCCE4), UIColorFromRGB(0xE15AFF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(150, 20)]; - } - return _mainView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - UILabel *label = [[UILabel alloc] init]; - label.font = [UIFont systemFontOfSize:12]; - label.textColor = UIColorRGBAlpha(0x000000, 0.5); - [label sizeToFit]; - label.text = YMLocalizedString(@"XPTaskCompleteTipView0"); - _nickLabel = label; - } - return _nickLabel; -} - -- (UILabel *)gotoLabel { - if (!_gotoLabel) { - UILabel *label = [[UILabel alloc] init]; - label.font = [UIFont systemFontOfSize:12]; - label.textColor = [UIColor whiteColor]; - [label sizeToFit]; - label.text = YMLocalizedString(@"XPTaskCompleteTipView1"); - _gotoLabel = label; - } - return _gotoLabel; -} - - -@end diff --git a/YuMi/Modules/YMRoom/View/ThemeColor+Room.h b/YuMi/Modules/YMRoom/View/ThemeColor+Room.h deleted file mode 100644 index 21e6cff..0000000 --- a/YuMi/Modules/YMRoom/View/ThemeColor+Room.h +++ /dev/null @@ -1,63 +0,0 @@ -// -// ThemeColorRoom.h -// YUMI -// -// Created by zu on 2021/10/27. -// - -#import "DJDKMIMOMColor.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface DJDKMIMOMColor (Room) -///房主昵称的颜色 0xFFFFFF -+ (UIColor *)roomOwnerNickColor; - -+ (UIColor *)roomOnLineIdenColor; - -///男用户的坑位的背景色 -+ (UIColor *)positionMaleNickBackColor; -///女用户的坑位的背景色 -+ (UIColor *)positionFemaleNickBackColor; -/// 没有用户的 坑位的背景色 -+ (UIColor *)positionNormalNickBackColor; -///老板位 坑位开始背景色 -+ (UIColor *)positionBossBackStartColor; -///老板位 坑位结束背景色 -+ (UIColor *)positionBossBackEndColor; -///坑位的昵称的颜色 0xFFFFFF -+ (UIColor *)positionNickColor; -// ------公屏相关颜色 Start------ / -///公屏默认背景的颜色 -+ (UIColor *)messageBubbleColor; -///公屏文字的颜色 -+ (UIColor *)messageTextColor; -///公屏名字的颜色 -+ (UIColor *)messageNickColor; -///默认的文字的颜色 -+ (UIColor *)messageDefaultTextColor; -///获取公屏提示 颜色 #FFFFFE 0.5 -+ (UIColor *)messageViewTipColor; -// ------公屏相关颜色 END------ / - -// ------房间内礼物 Start------ / -///礼物广播显示 个数的颜色 #FEF563 -+ (UIColor *)giftBroadcastNumberColor; -///礼物广播 显示的名字的颜色 #2F0060 -+ (UIColor *)giftBroadcastNickColor; -// ------房间内礼物 End------ / - -/// 糖果树记录钻石的颜色 -+ (UIColor *)candyTreeDiamondColor; -/// 糖果树名字的颜色 -+ (UIColor *)candyTreeNickColor; -/// 糖果树的分割线颜色 -+ (UIColor *)candyTreeDividerColor; - -///动画礼物个数的颜色 0xFFF226 -+ (UIColor *)animationGiftNumberColor; -///更多menu文字颜色 0xFFFFFF -+ (UIColor *)roomMoreMenuTextColor; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/ThemeColor+Room.m b/YuMi/Modules/YMRoom/View/ThemeColor+Room.m deleted file mode 100644 index fc570f5..0000000 --- a/YuMi/Modules/YMRoom/View/ThemeColor+Room.m +++ /dev/null @@ -1,114 +0,0 @@ -// -// ThemeColorRoom.m -// YUMI -// -// Created by zu on 2021/10/27. -// - -#import "ThemeColor+Room.h" - -@implementation DJDKMIMOMColor (Room) - -#pragma mark -房间内相关的颜色 -///房主昵称的颜色 0xFFFFFF -+ (UIColor *)roomOwnerNickColor { - return UIColorFromRGB(0xFFFFFF); -} - -+ (UIColor *)roomOnLineIdenColor { - return UIColorFromRGB(0x3EFED7); -} - -///男用户的坑位的背景色 -+ (UIColor *)positionMaleNickBackColor { - return UIColorFromRGB(0x3EBBFE); -} - -///女用户的坑位的背景色 -+ (UIColor *)positionFemaleNickBackColor { - return UIColorFromRGB(0xFF5E83); -} - -///坑位的昵称的颜色 0xFFFFFF -+ (UIColor *)positionNickColor { - return UIColorFromRGB(0xFFFFFF); -} - - -/// 没有用户的 坑位的背景色 -+ (UIColor *)positionNormalNickBackColor { - return [UIColor colorWithWhite:1 alpha:0.2]; -} - -///老板位 坑位开始背景色 -+ (UIColor *)positionBossBackStartColor { - return UIColorFromRGB(0xEFCC95); -} - -///老板位 坑位结束背景色 -+ (UIColor *)positionBossBackEndColor { - return UIColorFromRGB(0xF1B54D); -} -// ------公屏相关颜色 Start------ / - -///公屏默认背景的颜色 -+ (UIColor *)messageBubbleColor { - return UIColorRGBAlpha(0xFFFFFF, 0.15); -// return UIColorRGBAlpha(0x000000, 0.35); -} -///公屏文字的颜色 -+ (UIColor *)messageTextColor { - return [UIColor whiteColor]; -} -///公屏名字的颜色 -+ (UIColor *)messageNickColor { - return UIColorFromRGB(0xFFD98C); -} -///默认的文字的颜色 -+ (UIColor *)messageDefaultTextColor { - return [UIColor colorWithWhite:1 alpha:1]; -} - -///获取公屏提示 颜色 #FFFFFE 0.5 -+ (UIColor *)messageViewTipColor{ - return UIColorRGBAlpha(0xfffffe, 1); -} - -// ------公屏相关颜色 END------ / - -///礼物广播 显示的名字的颜色 #2F0060 -+ (UIColor *)giftBroadcastNickColor { - return UIColorFromRGB(0xFFFFFF); -} - -///礼物广播显示 个数的颜色 #FEF563 -+ (UIColor *)giftBroadcastNumberColor { - return UIColorFromRGB(0xFEF563); -} - - -/// 糖果树记录钻石的颜色 -+ (UIColor *)candyTreeDiamondColor { - return UIColorFromRGB(0xFFD67E); -} - -/// 糖果树的分割线颜色 -+ (UIColor *)candyTreeDividerColor { - return UIColorFromRGB(0xEDEDED); -} - -/// 糖果树名字的颜色 -+ (UIColor *)candyTreeNickColor { - return UIColorFromRGB(0xF8CBFF); -} - -///动画礼物个数的颜色 0xFFF226 -+ (UIColor *)animationGiftNumberColor { - return UIColorFromRGB(0xFFF226); -} - -///更多menu文字颜色 0xFFFFFF -+ (UIColor *)roomMoreMenuTextColor { - return UIColorFromRGB(0xFFFFFF); -} -@end diff --git a/YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.h b/YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.h deleted file mode 100644 index 3dcba9f..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.h +++ /dev/null @@ -1,71 +0,0 @@ -// -// Api+UserCard.h -// xplan-ios -// -// Created by 冯硕 on 2021/11/24. -// - -#import "Api.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface Api (UserCard) -/// 查询两个人的关注状态 -/// @param completion 完成 -/// @param uid 自己的uid -/// @param isLikeUid 要查询的那个人的uid -+ (void)attentionStatusCompletion:(HttpRequestHelperCompletion)completion - uid:(NSString *)uid - isLikeUid:(NSString *)isLikeUid; - -/// 关注某人 -/// @param completion 完成 -/// @param uid 发起关注的人 -/// @param likedUid 被关注的人 -/// @param ticket ticket -/// @param type l类型默认1 -+ (void)attentionCompletion:(HttpRequestHelperCompletion)completion - uid:(NSString *)uid - likedUid:(NSString *)likedUid - ticket:(NSString *)ticket - type:(NSString *)type; - -/// 清除礼物值 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param micUid 需要清除的uid -/// @param uid 操作者的uid -+ (void)cleanMicroGiftValue:(HttpRequestHelperCompletion)completion - roomUid:(NSString *)roomUid - micUid:(NSString *)micUid - uid:(NSString *)uid; - -/// 心动选人阶段 选择 -/// @param completion 完成 -/// @param roomUserId 房主的uid -/// @param chosenUserId 心动的uid -/// @param electorUserId 自己的uid -+ (void)roomDatingPickUser:(HttpRequestHelperCompletion)completion roomUserId:(NSString *)roomUserId chosenUserId:(NSString *)chosenUserId electorUserId:(NSString *)electorUserId; - -/// 超管处理房间的人 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param targetUid 目标用户的uid -/// @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 房主的uid -+ (void)checkManageNum:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid; - -/// 添加移除管理员(后段管理的用户关系) -/// Long roomUid, -/// Long uid, -/// Integer opt, //1添加，2移除 -+ (void)updateRoleToServer:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid opt:(NSString *)opt ; -@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 deleted file mode 100644 index e7d410a..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.m +++ /dev/null @@ -1,71 +0,0 @@ -// -// Api+UserCard.m -// xplan-ios -// -// Created by 冯硕 on 2021/11/24. -// - -#import "Api+UserCard.h" - - - -@implementation Api (UserCard) - - -/// 查询两个人的关注状态 -/// @param completion 完成 -/// @param uid 自己的uid -/// @param isLikeUid 要查询的那个人的uid -+ (void)attentionStatusCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid isLikeUid:(NSString *)isLikeUid { - [self makeRequest:@"fans/islike" method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, uid, isLikeUid, nil]; -} - -/// 关注某人 -/// @param completion 完成 -/// @param uid 发起关注的人 -/// @param likedUid 被关注的人 -/// @param ticket ticket -/// @param type 1 关注 2取消关注 -+ (void)attentionCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid likedUid:(NSString *)likedUid ticket:(NSString *)ticket type:(NSString *)type { - [self makeRequest:@"fans/like" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, likedUid, ticket, type, nil]; -} - - -/// 清除礼物值 -/// @param completion 完成 -/// @param roomUid 房间的uid -/// @param micUid 需要清除的uid -/// @param uid 操作者的uid -+ (void)cleanMicroGiftValue:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid micUid:(NSString *)micUid uid:(NSString *)uid { - [self makeRequest:@"room/gift/value/clean" method:HttpRequestHelperMethodDELETE completion:completion, __FUNCTION__, roomUid, micUid, uid, nil]; -} - -/// 心动选人阶段 选择 -/// @param completion 完成 -/// @param roomUserId 房主的uid -/// @param chosenUserId 心动的uid -/// @param electorUserId 自己的uid -+ (void)roomDatingPickUser:(HttpRequestHelperCompletion)completion roomUserId:(NSString *)roomUserId chosenUserId:(NSString *)chosenUserId electorUserId:(NSString *)electorUserId { - [self makeRequest:@"blind-date/connection" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUserId, chosenUserId, electorUserId, nil]; -} - -/// 超管处理房间的人 -/// @param completion 完成 -/// @param roomUid 房主的uid -/// @param targetUid 目标用户的uid -/// @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 { - [self makeRequest:@"super/set/chatroom/role" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, targetUid, opt,isSet, nil]; -} - -+ (void)checkManageNum:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid { - [self makeRequest:@"room/checkManageNum" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, nil]; -} - -+ (void)updateRoleToServer:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid opt:(NSString *)opt { - [self makeRequest:@"roomrole/manageOpt" method:HttpRequestHelperMethodPOST completion:completion, - __FUNCTION__, roomUid, uid, opt, nil]; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.h b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.h deleted file mode 100644 index 33b8745..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.h +++ /dev/null @@ -1,41 +0,0 @@ -// -// XPUserCardInfoModel.h -// xplan-ios -// -// Created by 冯硕 on 2021/11/26. -// - -#import -#import "RoomHostDelegate.h" -#import "RoomInfoModel.h" -#import "MicroQueueModel.h" -#import "GuildSuperAdminInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPUserCardInfoModel : NSObject -///用户的UID -@property (nonatomic,copy) NSString *uid; -///如果在坑位上的话 就传入 如果在坑位上的话 就传 如果不再的话 就传nil -@property (nonatomic,copy) NSString *position; -///操作人的昵称 -@property (nonatomic,copy) NSString *nick; -///坑位状态 锁坑/开坑 -@property (nonatomic, assign) MicroPosStateType posState; -///麦序的状态 闭麦/开麦 -@property (nonatomic, assign) MicroMicStateType micState; -///房间信息 -@property (nonatomic,strong) RoomInfoModel *roomInfo; -///超管列表 -@property (nonatomic,strong) NSArray *superMangerList; -///麦序 -@property (nonatomic,strong) NSMutableDictionary *micQueue; -///是否隐藏送礼按钮 -@property (nonatomic, assign) BOOL hideSendGiftItem; -///协议 -@property (nonatomic,weak) id delegate; - -@property(nonatomic, assign) NSInteger platformRole; // 目标用户是否超管： 0 - 1 - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.m b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.m deleted file mode 100644 index b449b91..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// XPUserCardInfoModel.m -// xplan-ios -// -// Created by 冯硕 on 2021/11/26. -// - -#import "XPUserCardInfoModel.h" - -@implementation XPUserCardInfoModel - -@end diff --git a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.h b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.h deleted file mode 100644 index 49cfff0..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.h +++ /dev/null @@ -1,74 +0,0 @@ -// -// XPUserCardItemModel.h -// xplan-ios -// -// Created by 冯硕 on 2021/11/24. -// - -#import - -@class NIMChatroomMember; - -NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSUInteger, UserCardItemType){ - UserCardItemType_Gift = 1, - ///私聊 - UserCardItemType_Chat = 2, - ///关注 - UserCardItemType_Attention = 3, - ///设置管理 - UserCardItemType_Manager = 4, - ///拉黑 - UserCardItemType_Black = 5, - ///踢出房间 - UserCardItemType_KickOut = 6, - ///邀请上麦 - UserCardItemType_Invite_Micro = 7, - ///@TA - UserCardItemType_AtUser = 8, - ///开麦 闭麦 - UserCardMicroType_Mute , - ///上麦 下麦 - UserCardMicroType_UpDown, - ///锁麦 解锁 - UserCardMicroType_Lock, - ///清除礼物值 - UserCardMicroType_Clean_Gift_Value, - ///送礼物 - UserCardMicroType_Send_Gift, -}; - - -@interface XPUserCardItemModel : NSObject - -///普通状态的图片名字 -@property (nonatomic,copy) NSString *imageName; -///选择状态的图片的名字 -@property (nonatomic,copy) NSString *selectImageName; -///普通状态下的标题 -@property (nonatomic,copy) NSString *title; -///选择状态下的标题 -@property (nonatomic,copy) NSString *selectTitle; -///类型 -@property (nonatomic,assign) UserCardItemType type; -///是否是选中状态 -@property (nonatomic,assign) BOOL isSelect; -///坑位 -@property (nonatomic,copy) NSString *position; -///是否可以点击 -@property (nonatomic,assign) BOOL isEnable; - -///状态 -@property (nonatomic,assign) BOOL status; - -/// 是否 boss 位 -@property(nonatomic, assign) bool isBoss; - -@property (nonatomic,copy) NSString *uid; - -/// NIM 聊天室成员信息 -@property (nonatomic,strong) NIMChatroomMember *nimMember; - -@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 deleted file mode 100644 index 18fc97b..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// XPUserCardItemModel.m -// xplan-ios -// -// Created by 冯硕 on 2021/11/24. -// - -#import "XPUserCardItemModel.h" -#import - -@implementation XPUserCardItemModel - -- (instancetype)init { - if (self = [super init]) { - self.isEnable = YES; - } - return self; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.h b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.h deleted file mode 100644 index fdd08a7..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.h +++ /dev/null @@ -1,38 +0,0 @@ -// -// XPUserCardMicroItemModel.h -// xplan-ios -// -// 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, -// ///送礼物 -// UserCardMicroType_Send_Gift, -// -//}; - -@interface XPUserCardMicroItemModel : NSObject -///显示标题 -@property (nonatomic,copy) NSString *title; -///类型 -@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 deleted file mode 100644 index 1f7853b..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// XPUserCardMicroItemModel.m -// xplan-ios -// -// Created by 冯硕 on 2021/11/26. -// - -#import "XPUserCardMicroItemModel.h" - -@implementation XPUserCardMicroItemModel - -@end diff --git a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.h b/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.h deleted file mode 100644 index a949769..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.h +++ /dev/null @@ -1,104 +0,0 @@ -// -// XPUserCardPresenter.h -// xplan-ios -// -// Created by 冯硕 on 2021/11/24. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN -@class XPUserCardInfoModel, UserInfoModel; -@interface XPUserCardPresenter : BaseMvpPresenter -/// 获取用户信息 -/// @param uid 查询的用户的uid -- (void)getUserInfo:(NSString *)uid; - -/// 获取用户卡片中中间操作按钮的数据源 -/// @param userInfo 目标用户 -- (void)getFunctionItemsByUserInfo:(XPUserCardInfoModel *)userInfo me:(UserInfoModel *)myInfo; - -/// 用户卡片底部的操作按钮 -/// @param userInfo 目标用户的信息 -- (void)getMicroFunctionItemsByUserInfo:(XPUserCardInfoModel *)userInfo me:(UserInfoModel *)myInfo; - -///抱她上麦的 数据 -/// @param micCount 当前麦序的个数 -- (void)getRoomMicroItems:(NSInteger)micCount cardInfo:(XPUserCardInfoModel *)cardInfo; - -/// 关注用户 /取消该关注 -/// @param targetUid 目标用户的uid -/// @param status 是否关注 yes 关注 NO 取消关注 -- (void)attentionUser:(NSString *)targetUid status:(BOOL)status; - -/// 加入黑名单 -/// @param targetUid 目标用户的uid -/// @param roomId 房间的uid -- (void)makeUserBlack:(NSString *)targetUid roomId:(NSString *)roomId; - -/// 设置/取消 管理员 -/// @param targetUid 目标用户的id -/// @param roomId 房间的id -/// @param enable YES设置 NO取消 -- (void)makeUserManager:(NSString *)targetUid roomId:(NSString *)roomId roomUid:(NSString *)roomUid enable:(BOOL)enable; - -/// 踢出房间 -/// @param targetUid 用户的uid -/// @param roomId 房间的uid -- (void)makeKickUser:(NSString *)targetUid roomId:(NSString *)roomId; - -/// 超管踢管理员 -/// @param targetNick 目标用户的昵称 -/// @param cardInfo 用户信息 -- (void)superAdminKickUser:(NSString *)targetNick cardInfo:(XPUserCardInfoModel *)cardInfo appAdmin:( UserInfoModel * _Nullable )appAdmin; -// 锁麦 开锁 -/// @param roomUid 房间的uid -/// @param state YES 锁坑位，NO取消锁 -/// @param position 操作的坑位 -- (void)microLock:(NSString *)roomUid state:(BOOL)state position:(NSString *)position; - -/// 闭麦 开麦 -/// @param roomUid 房间的uid -/// @param state NO 开麦 YES 锁麦 -/// @param position 操作的坑位 -- (void)microMute:(NSString *)roomUid state:(BOOL)state position:(NSString *)position; - -/// 抱下麦 -/// @param position 坑位信息 -/// @param roomId 房间id -- (void)kickDownMicro:(NSString *)position roomId:(NSString *)roomId; - -/// 抱她上麦 -/// @param roomId 房间的id -/// @param position 抱到几号坑 -/// @param userInfo 用户信息 -- (void)upMicro:(NSString *)roomId position:(NSString *)position userInfo:(UserInfoModel *)userInfo; - -/// 清除用户的礼物值 -/// @param roomUid 房间的uid -/// @param micUid 被清除的uid -- (void)cleanUserGiftValue:(NSString *)roomUid micUid:(NSString *)micUid; - -/// 心动选人 -/// @param roomUid 房主的uid -/// @param chosenUserId 被选择的uid -- (void)pickHeartUser:(NSString *)roomUid chosenUserId:(NSString *)chosenUserId; - -/// 超管处理用户 -/// @param targetUid 目标用户的uid -/// @param opt 1: 设置为管理员;2:设置普通等级用户;-1:设为黑名单用户;-2:设为禁言用户 -/// @param roomUid 房主的uid -- (void)superAdminHandleUser:(NSString *)targetUid opt:(NSString *)opt roomUid:(NSString *)roomUid isSet:(BOOL)isSet; - - -/// 校验是否可以继续设置管理员数量 -/// @param roomUID 房间 UID -/// @param success 请求成功 -/// @param failure 请求失败 -- (void)checkManagerLimit:(NSString *)roomUID success:(void(^)(void))success failure:(void(^)(NSError *error))failure; - -- (void)bossMicUp:(NSString *)roomUID targetUid:(NSString *)targetUid success:(void(^)(void))success failure:(void(^)(NSError *error))failure; - -@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 deleted file mode 100644 index a4fa154..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m +++ /dev/null @@ -1,866 +0,0 @@ -// -// XPUserCardPresenter.m -// xplan-ios -// -// Created by 冯硕 on 2021/11/24. -// - -#import "XPUserCardPresenter.h" -///Third -#import -#import -///Tool -#import "Api.h" -#import "Api+UserCard.h" -#import "AccountInfoStorage.h" -///Model -#import "UserInfoModel.h" -#import "XPUserCardItemModel.h" -#import "XPUserCardInfoModel.h" -#import "XPUserCardMicroItemModel.h" -#import "XPKickUserModel.h" -#import "AttachmentModel.h" -///P -#import "XPUserCardProtocol.h" - -@interface XPUserCardPresenter () -///礼物的 -@property (nonatomic,strong) XPUserCardItemModel *giftItem; -///私聊 -@property (nonatomic,strong) XPUserCardItemModel *chatItem; -///关注 -@property (nonatomic,strong) XPUserCardItemModel *attentionItem; -///设置管理员 -@property (nonatomic,strong) XPUserCardItemModel *managerItem; -///踢出房间 -@property (nonatomic,strong) XPUserCardItemModel *kikoutItem; -///加入黑名单 -@property (nonatomic,strong) XPUserCardItemModel *blackItem; -///@TA -@property (nonatomic, strong) XPUserCardItemModel *atItem; -///操作的数组 -@property (nonatomic,strong) NSMutableArray * functionArray; -@end - -@implementation XPUserCardPresenter - -/// 获取用户信息 -/// @param uid 查询的用户的uid -- (void)getUserInfo:(NSString *)uid { - if (uid == nil) { - return; - } - @kWeakify(self); - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetUserInfoSuccess:infoModel]; - }] uid:uid]; -} - - -/// 两个人的关注状态 -/// @param uid 自己的uid -/// @param targetUid 对方的uid -- (void)userAttentionStatus:(NSString *)uid targetUid:(NSString *)targetUid { - @kWeakify(self); - [Api attentionStatusCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - BOOL isLike = ((NSNumber *)data.data).boolValue; - self.attentionItem.isSelect = isLike; - [[self getView] onGetFollowDataSccess]; - } errorToast:NO ] uid:uid isLikeUid:targetUid]; -} - - -/// 获取用户卡片中中间操作按钮的数据源 -/// @param userInfo 目标用户 -- (void)getFunctionItemsByUserInfo:(XPUserCardInfoModel *)userInfo me:(nonnull UserInfoModel *)myInfo{ - 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; - } - - ///自己是公会超管 - 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; - } - } - - BOOL meIsAppSuperAdmin = myInfo.platformRole == 1; - - [self.functionArray removeAllObjects]; - if (!userInfo.hideSendGiftItem && !meIsAppSuperAdmin) { - [self.functionArray addObject:self.giftItem]; - } - if (!meIsAppSuperAdmin) { - [self.functionArray addObject:self.atItem]; - } - [self.functionArray addObject:self.chatItem]; - [self.functionArray addObject:self.attentionItem]; - ///获取一下关注的状态 - [self userAttentionStatus:uid targetUid:targetUid]; - - @kWeakify(self); - if (meIsSuperAdmin || meIsAppSuperAdmin) { - if (heIsSuperAdmin) { - [[self getView] onGetFunctionArraySccess:self.functionArray]; - } else { - ///查看 目标用户是否是管理员 - [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { - @kStrongify(self); - 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; - } - if (!meIsAppSuperAdmin) { - [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) { - @kStrongify(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) {///操作者是 管理员 踢出房间 拉黑 - ///查看 目标用户是否是管理员 - @kWeakify(self); - [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { - @kStrongify(self); - 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:(NSInteger)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) { - if (roomInfo.roomModeType == RoomModeType_Open_Blind) { - item.title = YMLocalizedString(@"XPUserCardPresenter0"); - } else { - switch (roomInfo.type) { - case RoomType_Anchor: - item.title = YMLocalizedString(@"XPMoreMenuPresenter12"); - break; - default: - item.title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardPresenter4"), i+1]; - break; - } - } - item.imageName = roomInfo.leaveMode ? @"usercard_invite_micro_owner_disable" : @"room_user_position_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+1]; - } - } - MicroQueueModel * micModel = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i - 1]]; - if ((micModel && micModel.userInfo && micModel.userInfo.uid > 0) || (micModel.microState.position == -1 && roomInfo.type == RoomType_Room)) { - item.isEnable = NO; - item.imageName = @"room_user_position_used"; - } else { - item.isEnable = YES; - if (roomInfo.type == RoomType_19Mic && micModel.microState.position == 6) { - item.isBoss = YES; - item.imageName = @"room_user_position_owner"; - } else { - item.imageName = @"room_user_position_empty"; - } - } - item.position = [NSString stringWithFormat:@"%d", (i - 1)]; - [self.functionArray addObject:item]; - } - [[self getView] onGetFunctionArraySccess:self.functionArray]; -} - -/// 用户卡片底部的操作按钮 -/// @param userInfo 目标用户的信息 -- (void)getMicroFunctionItemsByUserInfo:(XPUserCardInfoModel *)userInfo me:(UserInfoModel *)myInfo{ - 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]; - - ///自己是公会超管 - 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; - } - } - - BOOL meIsAppSuperAdmin = myInfo.platformRole == 1; - BOOL heIsAppSuperAdmin = userInfo.platformRole == 1; - - BOOL isOnMic = userInfo.position.length > 0; - - XPUserCardMicroItemModel * muteItem = [[XPUserCardMicroItemModel alloc] init]; - muteItem.title = userInfo.micState == MicroMicStateType_Open ? YMLocalizedString(@"XPUserCardPresenter5") : YMLocalizedString(@"XPUserCardPresenter6"); - muteItem.iconImage = userInfo.micState == MicroMicStateType_Open ? @"room_user_card_close_mic" : @"room_user_card_open_mic"; - muteItem.status = userInfo.micState == MicroMicStateType_Open; - muteItem.type = UserCardMicroType_Mute; - - XPUserCardMicroItemModel * upDownItem = [[XPUserCardMicroItemModel alloc] init]; - - upDownItem.title = isOnMic ? ([uid isEqualToString:targetUid] ? YMLocalizedString(@"XPUserCardPresenter8") : YMLocalizedString(@"XPUserCardPresenter9")) : YMLocalizedString(@"XPUserCardPresenter7"); - upDownItem.status = isOnMic ? YES : NO; - upDownItem.type = UserCardMicroType_UpDown; - upDownItem.uid = userInfo.uid; - upDownItem.iconImage = isOnMic ? @"room_user_card_out_mic" : @"room_user_card_up_mic"; - - XPUserCardMicroItemModel * lockItem = [[XPUserCardMicroItemModel alloc] init]; - lockItem.title = userInfo.posState == MicroPosStateType_Free ? YMLocalizedString(@"XPUserCardPresenter10") : YMLocalizedString(@"XPUserCardPresenter11"); - lockItem.iconImage = userInfo.posState == MicroPosStateType_Free ? @"room_user_card_lock" : @"room_user_card_unlock"; - lockItem.status = userInfo.posState == MicroPosStateType_Free; - lockItem.type = UserCardMicroType_Lock; - - XPUserCardMicroItemModel *giftValueItem = [[XPUserCardMicroItemModel alloc] init]; - giftValueItem.title = YMLocalizedString(@"XPUserCardPresenter12"); - giftValueItem.iconImage = @"room_user_card_clean_gift_value"; - giftValueItem.type = UserCardMicroType_Clean_Gift_Value; - - 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]; - if (roomInfo.showGiftValue) { - [array addObject:giftValueItem]; - } - } else if(member.type == NIMTeamMemberTypeManager || meIsSuperAdmin) { - [array addObject:muteItem]; - if (isOnMic) { - [array addObject:upDownItem]; - } - [array addObject:lockItem]; - if (userInfo.roomInfo.type == RoomType_Anchor && userInfo.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) {//个播PK中不显示上麦 - [array removeAllObjects]; - } - } else { - if (isOnMic) { - [array addObject:upDownItem]; - } - if (userInfo.roomInfo.type == RoomType_Anchor && userInfo.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) {//个播PK中不显示上麦 - [array removeAllObjects]; - } - } - } else { - if (member.type == NIMChatroomMemberTypeCreator || member.type == NIMChatroomMemberTypeManager || meIsSuperAdmin) { - if (userInfo.roomInfo.leaveMode && userInfo.uid.integerValue == userInfo.roomInfo.uid && [userInfo.position isEqualToString:@"-1"]) { - [array addObject:muteItem]; - if (!heIsAppSuperAdmin) { - [array addObject:upDownItem]; - } - [array addObject:lockItem]; - if (roomInfo.showGiftValue) { - [array addObject:giftValueItem]; - } - } else { - if (isOnMic) { - [array addObject:muteItem]; - [array addObject:upDownItem]; - if (![userInfo.position isEqualToString:@"999"]) { - [array addObject:lockItem]; - } - if (roomInfo.showGiftValue) { - [array addObject:giftValueItem]; - } - } else { -// [array addObject:upDownItem]; - } - } - } else { - if (isOnMic) { - [array addObject:upDownItem]; - } - } - } - [[self getView] onGetMicroFunctionArraySuccess:array]; - }]; - } else {///不是自己看自己 - if (meIsAppSuperAdmin) { /// APP 超管 - [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { - NIMChatroomMember * targetMember = x; - if (targetMember == nil) {return;} - if (userInfo.roomInfo.type == RoomType_Anchor) { - if (isOnMic) { - 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 (isOnMic){ - [array addObject:upDownItem]; - [array addObject:muteItem]; - [array addObject:lockItem]; - } else { - [array addObject:upDownItem]; - } - } else if (heIsAppSuperAdmin) { - [array addObject:self.kikoutItem]; - [array addObject:self.blackItem]; - } else {///目标者是普通用户 - if (isOnMic) { - if (targetMember.type != NIMChatroomMemberTypeManager) { - [array addObject:muteItem]; - } - if (!micQueue.userInfo.vipMic) { - [array addObject:upDownItem]; - [array addObject:lockItem]; - } - } - } - } - [[self getView] onGetMicroFunctionArraySuccess:array]; - }]; - return; - } - @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 (isOnMic) { - 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 (isOnMic) { - 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 (isOnMic) { - if (!micQueue.userInfo.vipMic) { - [array addObject:lockItem]; - } - } else { - [array addObject:upDownItem]; - } - - if (roomInfo.showGiftValue) { - [array addObject:giftValueItem]; - } - } else {///目标者是普通用户 - if (isOnMic) { - 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]; - }]; - } else { - [[self getView] onGetMicroFunctionArraySuccess:@[]]; - } - }]; - } -} - -/// 关注用户 /取消该关注 -/// @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]; -} - - -/// 加入黑名单 -/// @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]; - }]; -} - - -/// 设置/取消 管理员 -/// @param targetUid 目标用户的id -/// @param roomId 房间的id -/// @param enable YES设置 NO取消 -- (void)makeUserManager:(NSString *)targetUid roomId:(NSString *)roomId roomUid:(NSString *)roomUid enable:(BOOL)enable{ - NIMChatroomMemberUpdateRequest *request = [[NIMChatroomMemberUpdateRequest alloc]init]; - request.roomId = roomId; - request.userId = targetUid; - request.enable = enable; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager markMemberManager:request completion:^(NSError * _Nullable error) { - @kStrongify(self); - if (error == nil) { - self.managerItem.isSelect = enable; - [Api updateRoleToServer:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - // 不用处理返回 - NSLog(@"%@", data); - }] roomUid:roomUid uid:targetUid opt:enable ? @"1" : @"2"]; - } - [[self getView] markUserManagerFinish:self.managerItem error:error]; - }]; -} - - -/// 踢出房间 -/// @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; - request.notifyExt = [@{@"reason":@"kick",@"account":targetUid,@"handleUid":uid} toJSONString]; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager kickMember:request completion:^(NSError * _Nullable error) { - @kStrongify(self); - [[self getView] makeKickUserFinish:error]; - }]; -} - -/// 超管踢管理员 -/// @param targetNick 目标用户的昵称 -/// @param cardInfo 用户信息 -- (void)superAdminKickUser:(NSString *)targetNick cardInfo:(XPUserCardInfoModel *)cardInfo appAdmin:(UserInfoModel *)appAdmin { - NSString * targetUid = cardInfo.uid; - NSString * roomId = [NSString stringWithFormat:@"%ld", cardInfo.roomInfo.roomId]; - if (appAdmin) { - for (GuildSuperAdminInfoModel *manager in cardInfo.superMangerList) { - if ([manager.uid isEqualToString:@(appAdmin.uid).stringValue]) { - [self superAdminKickUser:targetNick cardInfo:cardInfo appAdmin:nil]; - return; - } - } - - @kWeakify(self); - [Api superAdminHandleUser:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [self superAdminKickUser:targetNick cardInfo:cardInfo appAdmin:nil]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [[self getView] makeKickUserFinish:[NSError errorWithDomain:msg code:code userInfo:nil]]; - }] roomUid:@(cardInfo.roomInfo.uid).stringValue targetUid:@(appAdmin.uid).stringValue opt:@"1" isSet:@(YES)]; - -// [self superAdminHandleUser:@"" opt:@"1" roomUid:@(cardInfo.roomInfo.uid).stringValue isSet:YES]; - - -// NSString * uid = [[AccountInfoStorage instance] getUid]; -// NIMChatroomMemberUpdateRequest *request = [[NIMChatroomMemberUpdateRequest alloc]init]; -// request.roomId = roomId; -// request.userId = @(appAdmin.uid).stringValue; -// request.enable = YES; -// @kWeakify(self); -// [[NIMSDK sharedSDK].chatroomManager markMemberManager:request completion:^(NSError * _Nullable error) { -// @kStrongify(self); -// if (error == nil) { -//// self.managerItem.isSelect = enable; -// [self superAdminKickUser:targetNick cardInfo:cardInfo appAdmin:nil]; -// } else { -// [[self getView] makeKickUserFinish:error]; -// } -// }]; - return; - } - - @kWeakify(self); - [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { - @kStrongify(self); - 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]; - } - }]; -} - -/// 闭麦 开麦 -/// @param roomUid 房间的uid -/// @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]; -} - -// 锁麦 开锁 -/// @param roomUid 房间的uid -/// @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]; -} - -/// 抱下麦 -/// @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]; - } - }]; -} - - -/// 抱她上麦 -/// @param roomId 房间的id -/// @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]; - } - }]; -} - - -/// 清除用户的礼物值 -/// @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]; -} - - -/// 心动选人 -/// @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]; -} - - -/// 超管处理用户 -/// @param targetUid 目标用户的uid -/// @param opt 1: 设置为管理员;2:设置普通等级用户;-1:设为黑名单用户;-2:设为禁言用户 -/// @param roomUid 房主的uid -- (void)superAdminHandleUser:(NSString *)targetUid opt:(NSString *)opt roomUid:(NSString *)roomUid isSet:(BOOL)isSet{ - @kWeakify(self); - [Api superAdminHandleUser:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] superAdminHandleUserSuccess:opt isSet:isSet]; - }] roomUid:roomUid targetUid:targetUid opt:opt isSet:@(isSet)]; -} - -- (void)checkManagerLimit:(NSString *)roomUID success:(void(^)(void))success failure:(void(^)(NSError *error))failure { - [Api checkManageNum:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - success(); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] roomUid:roomUID]; -} - -- (void)bossMicUp:(NSString *)roomUID targetUid:(NSString *)targetUid success:(void(^)(void))success failure:(void(^)(NSError *error))failure { - [Api requestBossMicUp:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - if (success) { - success(); - } - } fail:^(NSInteger code, NSString * _Nullable msg) { - if (failure) { - failure([NSError errorWithDomain:[NSString isEmpty:msg] ? @"" : msg code:code userInfo:nil]); - } - } showLoading:YES errorToast:YES] roomUid:roomUID uid:targetUid]; -} - -#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; - 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; - }]; -} - -#pragma mark - Getters And Setters -- (NSMutableArray *)functionArray { - if (!_functionArray) { - _functionArray = [NSMutableArray array]; - } - return _functionArray; -} - -- (XPUserCardItemModel *)giftItem { - if (!_giftItem) { - _giftItem = [[XPUserCardItemModel alloc] init]; - _giftItem.title = YMLocalizedString(@"XPUserCardPresenter13"); - _giftItem.imageName = @"room_user_card_send_gift"; - _giftItem.selectImageName = @"room_user_card_send_gift"; - _giftItem.type = UserCardItemType_Gift; - } - return _giftItem; -} - -- (XPUserCardItemModel *)chatItem { - if (!_chatItem) { - _chatItem = [[XPUserCardItemModel alloc] init]; - _chatItem.title = YMLocalizedString(@"XPUserCardPresenter14"); - _chatItem.imageName = @"room_user_card_chat"; - _chatItem.selectImageName = @"room_user_card_chat"; - _chatItem.type = UserCardItemType_Chat; - } - return _chatItem; -} - -- (XPUserCardItemModel *)atItem { - if (!_atItem) { - _atItem = [[XPUserCardItemModel alloc] init]; - _atItem.title = YMLocalizedString(@"XPUserCardPresenter22"); - _atItem.imageName = @"room_user_card_at"; - _atItem.selectImageName = @"room_user_card_at"; - _atItem.type = UserCardItemType_AtUser; - } - return _atItem; -} - -- (XPUserCardItemModel *)attentionItem { - if (!_attentionItem) { - _attentionItem = [[XPUserCardItemModel alloc] init]; - _attentionItem.title = YMLocalizedString(@"XPUserCardPresenter15"); - _attentionItem.imageName = @"room_user_card_follow"; - _attentionItem.selectTitle = YMLocalizedString(@"XPUserCardPresenter16"); - _attentionItem.selectImageName = @"room_user_card_unfollow"; - _attentionItem.type = UserCardItemType_Attention; - } - return _attentionItem; -} - -- ( XPUserCardItemModel *)kikoutItem { - if (!_kikoutItem) { - _kikoutItem = [[XPUserCardItemModel alloc] init]; - _kikoutItem.title = YMLocalizedString(@"XPUserCardPresenter17"); - _kikoutItem.imageName = @"room_user_card_kick"; - _kikoutItem.selectImageName = @"room_user_card_kick"; - _kikoutItem.type = UserCardItemType_KickOut; - } - return _kikoutItem; -} - -- (XPUserCardItemModel *)managerItem { - if (!_managerItem) { - _managerItem = [[XPUserCardItemModel alloc] init]; - _managerItem.title = YMLocalizedString(@"XPUserCardPresenter18"); - _managerItem.imageName = @"room_user_card_be_manager"; - _managerItem.selectTitle = YMLocalizedString(@"XPUserCardPresenter19"); - _managerItem.selectImageName = @"room_user_card_not_manager"; - _managerItem.type = UserCardItemType_Manager; - } - return _managerItem; -} - -- (XPUserCardItemModel *)blackItem { - if (!_blackItem) { - _blackItem = [[XPUserCardItemModel alloc] init]; - _blackItem.title = YMLocalizedString(@"XPUserCardPresenter20"); - _blackItem.imageName = @"room_user_card_blacklist"; - _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 deleted file mode 100644 index 4669a26..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/Protocol/XPUserCardProtocol.h +++ /dev/null @@ -1,48 +0,0 @@ -// -// XPUserCardProtocol.h -// xplan-ios -// -// Created by 冯硕 on 2021/11/24. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class UserInfoModel, XPUserCardItemModel, XPUserCardMicroItemModel; -@protocol XPUserCardProtocol - -///获取用户信息成功 -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo; - -///获取用户卡片中 functioin的数据源 -- (void)onGetFunctionArraySccess:(NSArray *)array; -- (void)onGetFollowDataSccess; -///获取用户卡片中 操作麦的 functioin的数据源 -- (void)onGetMicroFunctionArraySuccess:(NSArray *)array; -///关注成功 -- (void)attentionUserSuccess:(XPUserCardItemModel *)item; -///加入黑名单 -- (void)makeUserBlackFinish:(NSError *)error; -///设置管理 取消管理员 成功 -- (void)markUserManagerFinish:(XPUserCardItemModel *)item error:(NSError *)error; -/// 踢出房间 -- (void)makeKickUserFinish:(NSError *)error; -///超管踢管理出房间 -- (void)superAdminKickUserFinish:(NSError *)error; -///抱下麦成功 -- (void)kickDownMicroSuccess; -///抱上麦成功 -- (void)upMicroSuccess; -///操作静音成功 -- (void)muteMicroSusccess; -///操作锁坑成功 -- (void)lockMicroSusccess; -///清除用户礼物值成功 -- (void)cleanUserGiftValueSuccess:(NSDictionary *)dic; -///选择心动成功 -- (void)roomDatingPickHeartUserSuccess; -///超管处理用户操作成功 -- (void)superAdminHandleUserSuccess:(NSString *)opt isSet:(BOOL)isset; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.h b/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.h deleted file mode 100644 index c8c0cce..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// ThemeColor+UserCard.h -// xplan-ios -// -// Created by 冯硕 on 2021/11/24. -// - -#import "DJDKMIMOMColor.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface DJDKMIMOMColor (UserCard) -///名字的颜色 FFFFF -+ (UIColor *)userNickColor; -/// 0x66666 -+ (UIColor *)userSubTitleColor; -/// 操作坑位的字体颜色 333333 -+ (UIColor *)userMicroTitleColor; -/// 用户卡片 分割线的颜色 #F1F1F1 -+ (UIColor *)userDividerColor; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.m b/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.m deleted file mode 100644 index 7414e4f..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.m +++ /dev/null @@ -1,31 +0,0 @@ -// -// ThemeColor+UserCard.m -// xplan-ios -// -// Created by 冯硕 on 2021/11/24. -// - -#import "ThemeColor+UserCard.h" - -@implementation DJDKMIMOMColor (UserCard) - -///名字的颜色 FFFFF -+ (UIColor *)userNickColor { - return UIColorFromRGB(0xFFFFFF); -} -/// 0x66666 -+ (UIColor *)userSubTitleColor { - return UIColorFromRGB(0x666666); -} - -/// 操作坑位的字体颜色 333333 -+ (UIColor *)userMicroTitleColor { - return UIColorFromRGB(0x333333); -} - -/// 用户卡片 分割线的颜色 #F1F1F1 -+ (UIColor *)userDividerColor { - return UIColorFromRGB(0xF1F1F1); -} - -@end diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.h b/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.h deleted file mode 100644 index cb9aa34..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// XPUserCardItemCollectionViewCell.h -// xplan-ios -// -// Created by 冯硕 on 2021/11/24. -// - -#import -#import "XPUserCardItemModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface XPUserCardItemCollectionViewCell : UICollectionViewCell -/// -@property (nonatomic,strong) XPUserCardItemModel *itemModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.m b/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.m deleted file mode 100644 index 489ef9d..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.m +++ /dev/null @@ -1,89 +0,0 @@ -// -// XPUserCardItemCollectionViewCell.m -// xplan-ios -// -// Created by 冯硕 on 2021/11/24. -// - -#import "XPUserCardItemCollectionViewCell.h" -///Third -#import -///Tool -#import "ThemeColor+UserCard.h" - -@interface XPUserCardItemCollectionViewCell () -///显示图片 -@property (nonatomic,strong) UIButton *logoButton; -///标题 -@property (nonatomic,strong) UILabel *titleLabel; -@end - -@implementation XPUserCardItemCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.logoButton]; - [self.contentView addSubview:self.titleLabel]; -} - -- (void)initSubViewConstraints { - [self.logoButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(35, 35)); - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView); - }]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.logoButton.mas_bottom).offset(8); - }]; -} -#pragma mark - Getters And Setters -- (void)setItemModel:(XPUserCardItemModel *)itemModel { - _itemModel = itemModel; - if (_itemModel.title.length > 0) { - self.titleLabel.text = _itemModel.title; - } - - if (_itemModel.isSelect && _itemModel.selectTitle.length > 0) { - self.titleLabel.text = _itemModel.selectTitle; - } - - if (_itemModel.imageName) { - [self.logoButton setImage:[UIImage imageNamed:_itemModel.imageName] forState:UIControlStateNormal]; - } - if (_itemModel.selectImageName) { - [self.logoButton setImage:[UIImage imageNamed:_itemModel.selectImageName] forState:UIControlStateSelected]; - } - self.logoButton.selected = _itemModel.isSelect; - self.logoButton.enabled = _itemModel.isEnable; -} - - -- (UIButton *)logoButton { - if (!_logoButton) { - _logoButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _logoButton.userInteractionEnabled = NO; - } - return _logoButton; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [[UILabel alloc] init]; - _titleLabel.font = [UIFont systemFontOfSize:10]; - _titleLabel.textColor = [DJDKMIMOMColor userSubTitleColor]; - _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.numberOfLines = 2; - } - return _titleLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/Custom19MicLayout.h b/YuMi/Modules/YMRoom/View/UserCard/View/Custom19MicLayout.h deleted file mode 100644 index 8822a17..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/Custom19MicLayout.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// Custom19MicLayout.h -// YuMi -// -// Created by P on 2024/12/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -/// 19麦位自定义布局 -@interface Custom19MicLayout : UICollectionViewLayout - -@property (nonatomic, strong) NSMutableArray *attributesArray; - -@end - -NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/Custom19MicLayout.m b/YuMi/Modules/YMRoom/View/UserCard/View/Custom19MicLayout.m deleted file mode 100644 index d8490b1..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/Custom19MicLayout.m +++ /dev/null @@ -1,77 +0,0 @@ -// -// Custom19MicLayout.m -// YuMi -// -// Created by P on 2024/12/11. -// - -#import "Custom19MicLayout.h" - -@implementation Custom19MicLayout - -- (void)prepareLayout { - [super prepareLayout]; - - self.attributesArray = [NSMutableArray array]; - - CGFloat collectionWidth = self.collectionView.bounds.size.width; - CGFloat itemWidth = 50.0; // 每个 item 的宽度 - CGFloat itemHeight = 50.0 + 4 + 17; // 每个 item 的高度 - CGFloat spacing = 20.0; // 每个 item 之间的水平间距 - CGFloat rowSpacing = 20.0; // 每行之间的垂直间距 - CGFloat yOffset = 0; - - // 预定义每行的元素布局规则 - NSArray *> *layoutRows = @[ - @[@1, @1, @1, @1, @1], // 第 1 行: 居中排列 5 个元素 - @[@1, @1, @1, @1, @1], // 第 2 行: 两边元素对称排列 -// @[@0, @0, @1], // 第 3 行: 居中 1 个元素 - @[@1, @1, @0, @1, @1], // 第 4 行: 两边对称排列 - @[@1, @1, @1, @1, @1] // 第 5 行: 居中排列 5 个元素 - ]; - - NSInteger itemIndex = 0; // 当前 item 索引 - - for (NSArray *row in layoutRows) { - // 计算当前行的总宽度 - NSInteger itemCount = row.count; - CGFloat totalItemWidth = itemCount * itemWidth + (itemCount - 1) * spacing; - - // 计算行的 xOffset 让内容整体居中 - CGFloat xOffset = (collectionWidth - totalItemWidth) / 2.0; - - for (NSNumber *isItem in row) { - if ([isItem boolValue]) { // 如果该位置有 item - NSIndexPath *indexPath = [NSIndexPath indexPathForItem:itemIndex inSection:0]; - UICollectionViewLayoutAttributes *attributes = [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath]; - if (itemIndex == 7) { - // 中央特殊处理 - attributes.frame = CGRectMake(xOffset-(itemWidth * 0.1), yOffset+itemWidth*2/3, itemWidth*1.2, itemHeight*1.2); - [self.attributesArray addObject:attributes]; - } else { - // 设置每个 item 的位置 - attributes.frame = CGRectMake(xOffset, yOffset, itemWidth, itemHeight); - [self.attributesArray addObject:attributes]; - } - // 更新 item 索引 - itemIndex++; - } - - // 更新 xOffset，无论是否有 item 都需要移动 - xOffset += itemWidth + spacing; - } - - // 每一行的 yOffset 往下移动 - yOffset += itemHeight + rowSpacing; - } -} - -- (NSArray *)layoutAttributesForElementsInRect:(CGRect)rect { - return self.attributesArray; -} - -- (CGSize)collectionViewContentSize { - return CGSizeMake(self.collectionView.bounds.size.width, 400); // 设置总内容高度 -} - -@end \ No newline at end of file diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/Custom9MicLayout.h b/YuMi/Modules/YMRoom/View/UserCard/View/Custom9MicLayout.h deleted file mode 100644 index 514159a..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/Custom9MicLayout.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// Custom9MicLayout.h -// YuMi -// -// Created by P on 2024/12/11. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -/// 9麦位自定义布局 -@interface Custom9MicLayout : UICollectionViewLayout - -@property (nonatomic, strong) NSMutableArray *attributesArray; - -@end - -NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/Custom9MicLayout.m b/YuMi/Modules/YMRoom/View/UserCard/View/Custom9MicLayout.m deleted file mode 100644 index 37d857f..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/Custom9MicLayout.m +++ /dev/null @@ -1,59 +0,0 @@ -// -// Custom9MicLayout.m -// YuMi -// -// Created by P on 2024/12/11. -// - -#import "Custom9MicLayout.h" - -@implementation Custom9MicLayout - -- (void)prepareLayout { - [super prepareLayout]; - - self.attributesArray = [NSMutableArray array]; - - NSInteger sectionCount = [self.collectionView numberOfSections]; - CGFloat collectionWidth = self.collectionView.bounds.size.width; - CGFloat itemWidth = 50.0; // 每个 item 的宽度 - CGFloat itemHeight = 50.0 + 4 + 17; // 每个 item 的高度 - CGFloat spacing = 48.0; // 每个 item 之间的间距 - - CGFloat yOffset = 0; - - for (NSInteger section = 0; section < sectionCount; section++) { - NSInteger itemCount = [self.collectionView numberOfItemsInSection:section]; - - // 计算当前行的总宽度 = 所有 items 宽度 + 间距 - CGFloat totalItemWidth = itemCount * itemWidth + (itemCount - 1) * spacing; - - // 计算这一行的起始 xOffset，让内容整体居中 - CGFloat xOffset = (collectionWidth - totalItemWidth) / 2.0; - - for (NSInteger item = 0; item < itemCount; item++) { - NSIndexPath *indexPath = [NSIndexPath indexPathForItem:item inSection:section]; - UICollectionViewLayoutAttributes *attributes = [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath]; - - // 设置每个 item 的位置 - attributes.frame = CGRectMake(xOffset, yOffset, itemWidth, itemHeight); - [self.attributesArray addObject:attributes]; - - // 更新 xOffset，给下一个 item 使用 - xOffset += itemWidth + spacing; - } - - // 每一行的 yOffset 往下移动 - yOffset += itemHeight + 20; // 每行之间的间距为 20 - } -} - -- (NSArray *)layoutAttributesForElementsInRect:(CGRect)rect { - return self.attributesArray; -} - -- (CGSize)collectionViewContentSize { - return CGSizeMake(self.collectionView.bounds.size.width, 400); // 设置总内容高度 -} - -@end \ No newline at end of file diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.h b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.h deleted file mode 100644 index e91e4d5..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// XPUserCardSkillCardView.h -// xplan-ios -// -// Created by GreenLand on 2022/1/25. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPUserCardSkillCardView : UIView - -@property (nonatomic, strong) NSArray *dataArray; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.m b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.m deleted file mode 100644 index cc02a8f..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.m +++ /dev/null @@ -1,97 +0,0 @@ -// -// XPUserCardSkillCardView.m -// xplan-ios -// -// Created by GreenLand on 2022/1/25. -// - -#import "XPUserCardSkillCardView.h" -#import "XPUserCardSkillCollectionViewCell.h" -///Third -#import -///Tool -#import "YUMIMacroUitls.h" -#import "ThemeColor+UserCard.h" - -@interface XPUserCardSkillCardView() - -@property (nonatomic, strong) UICollectionView *collectionView; - -@end - -@implementation XPUserCardSkillCardView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubView]; - [self initContraints]; - } - return self; -} - -- (void)initSubView { - [self addSubview:self.collectionView]; -} - -- (void)initContraints { - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.trailing.bottom.mas_equalTo(0); - }]; -} - -#pragma mark - UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.dataArray.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPUserCardSkillCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPUserCardSkillCollectionViewCell class]) forIndexPath:indexPath]; - cell.imageView.imageUrl = [self.dataArray xpSafeObjectAtIndex:indexPath.item]; - return cell; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - CGFloat height = 30; - CGFloat width = 60; - XPUserCardSkillCollectionViewCell * cell = (XPUserCardSkillCollectionViewCell *)[collectionView cellForItemAtIndexPath:indexPath]; - - UIImage* image = cell.imageView.image; - if (image) { - CGFloat scale = image.size.width / (image.size.height > 0 ?image.size.height : 1) ; - return CGSizeMake(20 * scale, height); - } else { - NSURL *imgUrl = [NSURL URLWithString:[self.dataArray xpSafeObjectAtIndex:indexPath.item]]; - UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]]; - CGFloat scale = myImage.size.width / (myImage.size.height > 0 ? myImage.size.height : 1); - if (scale == 0) { - return CGSizeMake(60, height); - }else { - return CGSizeMake(20 * scale, height); - } - } - return CGSizeMake(width, height); -} - -- (void)setDataArray:(NSArray *)dataArray { - _dataArray = [NSArray arrayWithArray:dataArray]; - [self.collectionView reloadData]; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(60, 30); - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 8; - layout.sectionInset = UIEdgeInsetsMake(0, 12, 0, 12); - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPUserCardSkillCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPUserCardSkillCollectionViewCell class])]; - } - return _collectionView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.h b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.h deleted file mode 100644 index f42a099..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPUserCardSkillCollectionViewCell.h -// xplan-ios -// -// Created by GreenLand on 2022/1/25. -// - -#import -#import "NetImageView.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPUserCardSkillCollectionViewCell : UICollectionViewCell - -@property (nonatomic, strong) NetImageView *imageView; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.m b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.m deleted file mode 100644 index bf37f55..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.m +++ /dev/null @@ -1,43 +0,0 @@ -// -// XPUserCardSkillCollectionViewCell.m -// xplan-ios -// -// Created by GreenLand on 2022/1/25. -// - -#import "XPUserCardSkillCollectionViewCell.h" -///Third -#import - -@implementation XPUserCardSkillCollectionViewCell - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self.contentView addSubview:self.imageView]; -} - -- (void)initSubViewConstraints { - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(0); - make.top.bottom.mas_equalTo(self.contentView).inset(5); - }]; -} - -#pragma mark - Getters And Setters -- (NetImageView *)imageView { - if (!_imageView) { - _imageView = [[NetImageView alloc] init]; - _imageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _imageView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.h b/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.h deleted file mode 100644 index 86a7b91..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// UserRoomCardViewController.h -// YuMi -// -// Created by P on 2024/12/11. -// - -#import "MvpViewController.h" -#import "XPUserCardInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface UserRoomCardViewController : MvpViewController - -@property(nonatomic, copy) NSArray *roomSuperAdminList; - -- (instancetype)initWithUser:(XPUserCardInfoModel *)cardInfo controlUser:(UserInfoModel *)meInfo; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m b/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m deleted file mode 100644 index 52242fb..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m +++ /dev/null @@ -1,2283 +0,0 @@ -// -// UserRoomCardViewController.m -// YuMi -// -// Created by P on 2024/12/11. -// - -#import "UserRoomCardViewController.h" -#import - -#import "XPUserCardPresenter.h" -#import "XPRoomGiftAnimationParser.h" -#import - -#import "XPSendGiftView.h" -#import "XPRoomSendTextView.h" -#import "XPRoomHalfMessageView.h" - -#import "UIView+VAP.h" -#import "MoliAvatar.h" -#import "UserInfoModel.h" -#import "XPKickUserModel.h" -#import "AttachmentModel.h" -#import "XPUserCardInfoModel.h" -#import "XPUserCardItemModel.h" -#import "XPUserCardMicroItemModel.h" -#import "XPMineUserInfoViewController.h" - -#import "XPWebViewController.h" -#import "XCCurrentVCStackManager.h" -#import "SuperBlockViewController.h" -#import "XPSkillCardPlayerManager.h" - -// 导入自定义布局和视图 -#import "Custom19MicLayout.h" -#import "Custom9MicLayout.h" -#import "UserRoomMicPositionView.h" - -@interface UserRoomCardInfoCell : UICollectionViewCell -@property(nonatomic, copy) void(^tapReport)(void); -@property(nonatomic, strong) UserInfoModel *userInfo; -@property(nonatomic, strong) UIButton *reportButton; -@property(nonatomic, strong) UILabel *nameLabel; -@property(nonatomic, strong) UIButton *sexAgeButton; -@property(nonatomic, strong) UIImageView *latestMark; -@property(nonatomic, strong) UIImageView *sidMark; -@property(nonatomic, strong) UILabel *idLabel; -@property(nonatomic, strong) UIImageView *copyMark; - -+ (void)registerTo:(UICollectionView *)collectionView; -+ (UserRoomCardInfoCell *)cellFor:(UICollectionView *)collectionView - indexPath:(NSIndexPath *)indexPath - userInfo:(UserInfoModel *)userInfo - handleTapReport:(void(^)(void))tapReport; - -@end - -@implementation UserRoomCardInfoCell - -+ (void)registerTo:(UICollectionView *)collectionView { - [collectionView registerClass:[self class] - forCellWithReuseIdentifier:NSStringFromClass([self class])]; -} - -+ (UserRoomCardInfoCell *)cellFor:(UICollectionView *)collectionView - indexPath:(NSIndexPath *)indexPath - userInfo:(UserInfoModel *)userInfo - handleTapReport:(void(^)(void))tapReport { - UserRoomCardInfoCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([self class]) - forIndexPath:indexPath]; - [cell.contentView setBackgroundColor:[UIColor clearColor]]; - cell.userInfo = userInfo; - cell.tapReport = tapReport; - - return cell; -} - -- (void)didTapCopy { - UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; - pasteboard.string = [NSString stringWithFormat:@"%ld",self.userInfo.erbanNo]; - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPUserCardViewController24")]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - self.clipsToBounds = NO; - self.contentView.clipsToBounds = NO; - - [self.contentView addSubview:self.reportButton]; - [self.reportButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.contentView).offset(14); - make.trailing.mas_equalTo(self.contentView).offset(-8); - make.width.height.mas_equalTo(24); - }]; - - UIStackView *nameStack = [[UIStackView alloc] initWithArrangedSubviews:@[ - self.nameLabel, - self.sexAgeButton - ]]; - nameStack.distribution = UIStackViewDistributionEqualCentering; - nameStack.alignment = UIStackViewAlignmentCenter; - nameStack.spacing = 6; - [self.contentView addSubview:nameStack]; - [nameStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView).offset(69); - make.height.mas_equalTo(22); - }]; - - [self.sexAgeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(35, 16)); - }]; - - UIStackView *idStack = [[UIStackView alloc] initWithArrangedSubviews:@[ - self.latestMark, - self.sidMark, - self.idLabel, - self.copyMark - ]]; - idStack.distribution = UIStackViewDistributionEqualCentering; - idStack.alignment = UIStackViewAlignmentCenter; - idStack.spacing = 2; - [self.contentView addSubview:idStack]; - [idStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(nameStack.mas_bottom).offset(5); - make.height.mas_equalTo(14); - }]; - - UIButton *copyAction = [UIButton buttonWithType:UIButtonTypeCustom]; - [copyAction addTarget:self action:@selector(didTapCopy) forControlEvents:UIControlEventTouchUpInside]; - [idStack addSubview:copyAction]; - [copyAction mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(idStack); - }]; - - } - return self; -} - -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - - if (userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - self.reportButton.hidden = YES; - } - - [self updateNameAndGenderInfo]; - [self updateIDInfo]; - - self.sidMark.hidden = !userInfo.hasPrettyErbanNo; - self.latestMark.hidden = !userInfo.newUser; -} - -- (void)updateNameAndGenderInfo { - self.nameLabel.text = self.userInfo.nick; - UIImage *sexBackgroundImage = nil; - if (self.userInfo.gender == GenderType_Male) { - [self.sexAgeButton setImage:kImage(@"home_age_boy_icon") forState:UIControlStateNormal]; - sexBackgroundImage = [UIImage gradientColorImageFromColors:@[UIColorRGBAlpha(0x6BB3FF, 0.5),UIColorFromRGB(0x6BB3FF)] - gradientType:GradientTypeTopToBottom - imgSize:CGSizeMake(35, 16)]; - } else { - [self.sexAgeButton setImage:kImage(@"home_age_girl_icon") forState:UIControlStateNormal]; - sexBackgroundImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xF2A0C3),UIColorFromRGB(0xEB74A6)] - gradientType:GradientTypeTopToBottom - imgSize:CGSizeMake(35, 16)]; - } - [self.sexAgeButton setTitle:[NSString getAgeWithBirth:self.userInfo.birth] - forState:UIControlStateNormal]; - [self.sexAgeButton setBackgroundImage:sexBackgroundImage - forState:UIControlStateNormal]; -} - -- (void)updateIDInfo { - NSString *text = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController0"), self.userInfo.erbanNo]; - self.idLabel.text = text; -} - -- (void)didTapReport { - if (self.tapReport) { - self.tapReport(); - } -} - -- (UIButton *)reportButton { - if (!_reportButton) { - UIButton *report = [UIButton buttonWithType:UIButtonTypeCustom]; - [report setImage:kImage(@"room_user_card_report") - forState:UIControlStateNormal]; - [report addTarget:self action:@selector(didTapReport) forControlEvents:UIControlEventTouchUpInside]; - _reportButton = report; - } - return _reportButton; -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [[UILabel alloc] init]; - _nameLabel.font = kFontMedium(15); - _nameLabel.lineBreakMode = NSLineBreakByTruncatingTail; - _nameLabel.textColor = UIColorFromRGB(0x313131); - } - return _nameLabel; -} - -- (UIButton *)sexAgeButton { - if (!_sexAgeButton) { - _sexAgeButton = [[UIButton alloc] init]; - _sexAgeButton.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - [_sexAgeButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _sexAgeButton.imageEdgeInsets = UIEdgeInsetsMake(0, 2, 0, 0); - _sexAgeButton.layer.cornerRadius = 14/2; - _sexAgeButton.layer.masksToBounds = YES; - [_sexAgeButton setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; - [_sexAgeButton setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; - } - return _sexAgeButton; -} - -- (UIImageView *)latestMark { - if (!_latestMark) { - _latestMark = [[UIImageView alloc] initWithImage:kImage(@"common_new_user")]; - } - return _latestMark; -} - -- (UIImageView *)sidMark { - if (!_sidMark) { - _sidMark = [[UIImageView alloc] initWithImage:kImage(@"common_icon_beautiful")]; // user_info_id_mark - } - return _sidMark; -} - -- (UIImageView *)copyMark { - if (!_copyMark) { - _copyMark = [[UIImageView alloc] initWithImage:kImage(@"user_card_copy")]; - } - return _copyMark; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = kFontRegular(12); - _idLabel.lineBreakMode = NSLineBreakByTruncatingTail; - _idLabel.textColor = UIColorFromRGB(0x313131); - } - return _idLabel; -} -@end - -@interface UserRoomCardNameplateCell : UICollectionViewCell - -@property(nonatomic, strong) UserInfoModel *userInfo; -///魅力等级 -@property (nonatomic,strong) NetImageView *charmImageView; -///VIPicon -@property (nonatomic, strong) NetImageView *vipIconImageView; -///等级 -@property (nonatomic,strong) NetImageView *experImageView; -///铭牌图片 1 -@property (nonatomic,strong) NetImageView *nameplateImageView_1; -///铭牌图片 2 -@property (nonatomic,strong) NetImageView *nameplateImageView_2; - -+ (void)registerTo:(UICollectionView *)collectionView; -+ (UserRoomCardNameplateCell *)cellFor:(UICollectionView *)collectionView - indexPath:(NSIndexPath *)indexPath - userInfo:(UserInfoModel *)userInfo; -@end - -@implementation UserRoomCardNameplateCell - -+ (void)registerTo:(UICollectionView *)collectionView { - [collectionView registerClass:[self class] - forCellWithReuseIdentifier:NSStringFromClass([self class])]; -} -+ (UserRoomCardNameplateCell *)cellFor:(UICollectionView *)collectionView - indexPath:(NSIndexPath *)indexPath - userInfo:(UserInfoModel *)userInfo { - UserRoomCardNameplateCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([self class]) - forIndexPath:indexPath]; - [cell.contentView setBackgroundColor:[UIColor clearColor]]; - cell.userInfo = userInfo; - return cell; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - UIStackView *line_1_Stack = [[UIStackView alloc] initWithArrangedSubviews:@[ - self.charmImageView, - self.experImageView, - self.vipIconImageView, - self.nameplateImageView_1, - self.nameplateImageView_2 - ]]; - line_1_Stack.distribution = UIStackViewDistributionEqualSpacing; - line_1_Stack.alignment = UIStackViewAlignmentCenter; - line_1_Stack.spacing = 4; - [self.contentView addSubview:line_1_Stack]; - [line_1_Stack mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(0); - make.height.mas_equalTo(20); - }]; - - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(34); - }]; - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(34); - }]; - [self.vipIconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(30); - }]; - - [self.nameplateImageView_1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(72); - }]; - - [self.nameplateImageView_2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(72); - }]; - } - return self; -} - -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - [self loadNameplate:userInfo.userLevelVo.experUrl tagetView:self.experImageView]; - [self loadNameplate:userInfo.userLevelVo.charmUrl tagetView:self.charmImageView]; - [self loadNameplate:userInfo.userVipInfoVO.nameplateUrl tagetView:self.vipIconImageView]; - [self loadNameplate:userInfo.nameplatePic tagetView:self.nameplateImageView_1]; - [self loadNameplate:userInfo.guildNameplateIcon tagetView:self.nameplateImageView_2]; -} - -- (void)loadNameplate:(NSString *)urlPath tagetView:(NetImageView *)view { - if ([NSString isEmpty:urlPath]) { - view.hidden = YES; - } else { - view.hidden = NO; - @kWeakify(self); - [view loadImageWithUrl:urlPath - completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - @kStrongify(self); - if (image) { - CGFloat height = 20; - CGSize imageSize = image.size; - view.image = image; - [view mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(imageSize.width / imageSize.height * height); - }]; - [self.contentView layoutIfNeeded]; - } - }]; - } -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - _charmImageView.userInteractionEnabled = YES; - _charmImageView.hidden = YES; - _charmImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _charmImageView; -} - -- (NetImageView *)vipIconImageView { - if (!_vipIconImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _vipIconImageView = [[NetImageView alloc] initWithConfig:config]; - _vipIconImageView.contentMode = UIViewContentModeScaleAspectFit; - _vipIconImageView.hidden = YES; - } - return _vipIconImageView; -} - -- (NetImageView *)experImageView { - if (!_experImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _experImageView = [[NetImageView alloc] initWithConfig:config]; - _experImageView.userInteractionEnabled = YES; - _experImageView.hidden = YES; - _experImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _experImageView; -} - -- (NetImageView *)nameplateImageView_1 { - if (!_nameplateImageView_1) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _nameplateImageView_1 = [[NetImageView alloc] initWithConfig:config]; - _nameplateImageView_1.userInteractionEnabled = YES; - _nameplateImageView_1.contentMode = UIViewContentModeScaleAspectFit; - } - return _nameplateImageView_1; -} - -- (NetImageView *)nameplateImageView_2 { - if (!_nameplateImageView_2) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _nameplateImageView_2 = [[NetImageView alloc] initWithConfig:config]; - _nameplateImageView_2.userInteractionEnabled = YES; - _nameplateImageView_2.contentMode = UIViewContentModeScaleAspectFit; - } - return _nameplateImageView_2; -} - -@end - -@interface UserRoomCardMedalCell : UICollectionViewCell - -@property(nonatomic, strong) UserInfoModel *userInfo; -@property(nonatomic, strong) UIScrollView *medalsScrollView; -@property(nonatomic, strong) UIStackView *medalsStackView; -@property(nonatomic, strong) NSArray *medalMP4Views; -@property(nonatomic, strong) MASConstraint *scrollViewWidthConstraint; - -+ (void)registerTo:(UICollectionView *)collectionView; -+ (UserRoomCardMedalCell *)cellFor:(UICollectionView *)collectionView - indexPath:(NSIndexPath *)indexPath - userInfo:(UserInfoModel *)userInfo; - -@end - -@implementation UserRoomCardMedalCell - -+ (void)registerTo:(UICollectionView *)collectionView { - [collectionView registerClass:[self class] - forCellWithReuseIdentifier:NSStringFromClass([self class])]; -} - -+ (UserRoomCardMedalCell *)cellFor:(UICollectionView *)collectionView - indexPath:(NSIndexPath *)indexPath - userInfo:(UserInfoModel *)userInfo { - UserRoomCardMedalCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([self class]) - forIndexPath:indexPath]; - [cell.contentView setBackgroundColor:[UIColor clearColor]]; - cell.userInfo = userInfo; - return cell; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self.contentView addSubview:self.medalsScrollView]; - - // 计算 ScrollView 的宽度：最多显示5个勋章的宽度，但不超过父视图宽度减去边距 - CGFloat maxMedalsWidth = kGetScaleWidth(30) * 5 + 4 * 5; // 5个勋章，4个间距 - - [self.medalsScrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.contentView); - make.height.mas_equalTo(kGetScaleWidth(30)); - // 初始设置一个默认宽度，后续会动态更新 - self.scrollViewWidthConstraint = make.width.mas_equalTo(maxMedalsWidth); - // 确保不超出父视图边界 - make.leading.mas_greaterThanOrEqualTo(self.contentView).offset(15); - make.trailing.mas_lessThanOrEqualTo(self.contentView).offset(-15); - }]; - - [self.medalsScrollView addSubview:self.medalsStackView]; - [self.medalsStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.leading.mas_equalTo(self.medalsScrollView); - make.height.mas_equalTo(self.medalsScrollView); - // 当内容宽度小于 ScrollView 时，居中显示 - make.centerX.mas_equalTo(self.medalsScrollView).priority(UILayoutPriorityDefaultLow); - }]; - } - return self; -} - -- (void)setUserInfo:(UserInfoModel *)userInfo { - _userInfo = userInfo; - [self updateMedalsDisplay]; -} - -- (void)updateMedalsDisplay { - // 清除旧的勋章视图 - for (UIView *subview in self.medalsStackView.arrangedSubviews) { - [self.medalsStackView removeArrangedSubview:subview]; - [subview removeFromSuperview]; - } - - // 停止之前的MP4播放 - if (self.medalMP4Views) { - for (VAPView *mp4View in self.medalMP4Views) { - [mp4View stopHWDMP4]; - } - } - - NSArray *medals = self.userInfo.medalsPic; - - if (medals.count == 0) { - self.medalsScrollView.hidden = YES; - return; - } - - self.medalsScrollView.hidden = NO; - - NSMutableArray *mp4Views = [NSMutableArray array]; - NSInteger count = medals.count; // 显示所有勋章，但界面只显示5个 - - for (NSInteger i = 0; i < count; i++) { - BaseModelVo *medal = medals[i]; - - UIView *medalContainer = [[UIView alloc] init]; - medalContainer.backgroundColor = [UIColor clearColor]; - - [self.medalsStackView addArrangedSubview:medalContainer]; - [medalContainer mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(30)).priority(UILayoutPriorityRequired); - }]; - - // 根据 picUrl 后缀判断是 MP4 还是图片 - if (![NSString isEmpty:medal.picUrl]) { - BOOL isMP4 = [[medal.picUrl.lowercaseString pathExtension] isEqualToString:@"mp4"]; - - if (isMP4) { - // 显示 MP4 动画 - VAPView *mp4View = [[VAPView alloc] init]; - mp4View.contentMode = UIViewContentModeScaleAspectFit; - mp4View.userInteractionEnabled = NO; - [medalContainer addSubview:mp4View]; - [mp4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(medalContainer); - }]; - - [mp4Views addObject:mp4View]; - - XPRoomGiftAnimationParser *parser = [[XPRoomGiftAnimationParser alloc] init]; - [parser parseWithURL:medal.picUrl - completionBlock:^(NSString * _Nullable videoUrl) { - if (videoUrl.length > 0) { - dispatch_async(dispatch_get_main_queue(), ^{ - [mp4View setMute:YES]; - [mp4View playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - }); - } - } failureBlock:nil]; - } else { - // 显示图片 - NetImageView *imageView = [[NetImageView alloc] init]; - imageView.contentMode = UIViewContentModeScaleAspectFit; - imageView.userInteractionEnabled = NO; - [medalContainer addSubview:imageView]; - [imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(medalContainer); - }]; - [imageView loadImageWithUrl:medal.picUrl completion:nil fail:nil]; - } - } - } - - // 延迟更新 ScrollView 的宽度和 contentSize，确保布局完成 - dispatch_async(dispatch_get_main_queue(), ^{ - [self.medalsStackView layoutIfNeeded]; - CGFloat stackViewWidth = self.medalsStackView.frame.size.width; - if (stackViewWidth == 0) { - // 如果 StackView 还没有布局，计算预期宽度 - CGFloat expectedWidth = count * kGetScaleWidth(30) + (count - 1) * 5; - stackViewWidth = expectedWidth; - } - - // 计算实际需要的 ScrollView 宽度：如果内容少于最大宽度，使用内容宽度；否则使用最大宽度 - CGFloat maxDisplayWidth = kGetScaleWidth(30) * 5 + 4 * 5; // 5个勋章的最大显示宽度 - CGFloat scrollViewWidth = MIN(stackViewWidth, maxDisplayWidth); - - // 更新 ScrollView 的宽度约束 - [self.scrollViewWidthConstraint uninstall]; - [self.medalsScrollView mas_updateConstraints:^(MASConstraintMaker *make) { - self.scrollViewWidthConstraint = make.width.mas_equalTo(scrollViewWidth); - }]; - - self.medalsScrollView.contentSize = CGSizeMake(stackViewWidth, kGetScaleWidth(30)); - [self.contentView layoutIfNeeded]; - }); - - self.medalMP4Views = [mp4Views copy]; -} - -- (UIScrollView *)medalsScrollView { - if (!_medalsScrollView) { - _medalsScrollView = [[UIScrollView alloc] init]; - _medalsScrollView.backgroundColor = [UIColor clearColor]; - _medalsScrollView.showsHorizontalScrollIndicator = NO; - _medalsScrollView.showsVerticalScrollIndicator = NO; - _medalsScrollView.scrollEnabled = YES; - _medalsScrollView.bounces = YES; - _medalsScrollView.alwaysBounceHorizontal = NO; - } - return _medalsScrollView; -} - -- (UIStackView *)medalsStackView { - if (!_medalsStackView) { - _medalsStackView = [[UIStackView alloc] init]; - _medalsStackView.backgroundColor = [UIColor clearColor]; - _medalsStackView.axis = UILayoutConstraintAxisHorizontal; - _medalsStackView.distribution = UIStackViewDistributionFill; - _medalsStackView.alignment = UIStackViewAlignmentCenter; - _medalsStackView.spacing = 5; - } - return _medalsStackView; -} - -@end - -@interface UserRoomCardUserActionCell : UICollectionViewCell - -@property(nonatomic, strong) UserInfoModel *userInfo; -@property(nonatomic, copy) NSArray * models; -@property(nonatomic, strong) UIStackView *iconStack; -@property(nonatomic, copy) void(^handleTapIcon)(XPUserCardItemModel *model); - -+ (void)registerTo:(UICollectionView *)collectionView; -+ (UserRoomCardUserActionCell *)cellFor:(UICollectionView *)collectionView - indexPath:(NSIndexPath *)indexPath - userInfo:(UserInfoModel *)userInfo - models:(NSArray *)models - handleTapIcon:(void(^)(XPUserCardItemModel *model))tapIcon; - -@end - -@implementation UserRoomCardUserActionCell - -+ (void)registerTo:(UICollectionView *)collectionView { - [collectionView registerClass:[self class] - forCellWithReuseIdentifier:NSStringFromClass([self class])]; -} -+ (UserRoomCardUserActionCell *)cellFor:(UICollectionView *)collectionView - indexPath:(NSIndexPath *)indexPath - userInfo:(UserInfoModel *)userInfo - models:(NSArray *)models - handleTapIcon:(void(^)(XPUserCardItemModel *model))tapIcon { - UserRoomCardUserActionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([self class]) - forIndexPath:indexPath]; - [cell.contentView setBackgroundColor:[UIColor clearColor]]; - cell.userInfo = userInfo; - cell.models = models; - cell.handleTapIcon = tapIcon; - return cell; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self.contentView addSubview:self.iconStack]; - [self.iconStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(0); - make.centerX.mas_equalTo(self.contentView); - make.width.lessThanOrEqualTo(self.contentView).offset(-30); - make.height.mas_equalTo(50); - }]; - } - return self; -} - -- (void)didTapIcon:(UIButton *)sender { - if (_handleTapIcon) { - self.handleTapIcon([self.models xpSafeObjectAtIndex:sender.tag]); - } -} - -- (void)setModels:(NSArray *)models { - _models = models; - for (UIView *subview in self.iconStack.arrangedSubviews) { - [self.iconStack removeArrangedSubview:subview]; - [subview removeFromSuperview]; - } - [models enumerateObjectsUsingBlock:^(XPUserCardItemModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - dispatch_async(dispatch_get_main_queue(), ^{ - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - button.imageEdgeInsets = UIEdgeInsetsZero; - button.imageView.contentMode = UIViewContentModeScaleAspectFill; - button.tag = idx; - if (obj.isSelect) { - [button setBackgroundImage:kImage(obj.selectImageName) forState:UIControlStateNormal]; - } else { - [button setBackgroundImage:kImage(obj.imageName) forState:UIControlStateNormal]; - } - [button addTarget:self action:@selector(didTapIcon:) forControlEvents:UIControlEventTouchUpInside]; - [self.iconStack addArrangedSubview:button]; - [button mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(50,50)); - }]; - }); - }]; -} - -- (UIStackView *)iconStack { - if (!_iconStack) { - _iconStack = [[UIStackView alloc] init]; - _iconStack.alignment = UIStackViewAlignmentCenter; // 子视图在垂直方向居中 - _iconStack.distribution = UIStackViewDistributionEqualCentering; // 水平 - _iconStack.spacing = 12; - } - return _iconStack; -} - -@end - -@interface UserRoomCardMicActionCell : UICollectionViewCell - -@property(nonatomic, strong) UserInfoModel *userInfo; -@property(nonatomic, copy) NSArray *models; -@property(nonatomic, strong) UIStackView *iconStack; -@property(nonatomic, strong) UIButton *pickButton; -@property(nonatomic, strong) UIView *lineView; -@property(nonatomic, copy) void(^handleTapIcon)(XPUserCardItemModel *model); -@property(nonatomic, copy) void(^handleTapPick)(void); - -+ (void)registerTo:(UICollectionView *)collectionView; -+ (UserRoomCardMicActionCell *)cellFor:(UICollectionView *)collectionView - indexPath:(NSIndexPath *)indexPath - userInfo:(UserInfoModel *)userInfo - models:(NSArray *)models - handleTapIcon:(void(^)(XPUserCardItemModel *model))tapIcon; - -- (void)dispplayPick; -@end - -@implementation UserRoomCardMicActionCell - - -+ (void)registerTo:(UICollectionView *)collectionView { - [collectionView registerClass:[self class] - forCellWithReuseIdentifier:NSStringFromClass([self class])]; -} -+ (UserRoomCardMicActionCell *)cellFor:(UICollectionView *)collectionView - indexPath:(NSIndexPath *)indexPath - userInfo:(UserInfoModel *)userInfo - models:(NSArray *)models - handleTapIcon:(void(^)(XPUserCardItemModel *model))tapIcon { - UserRoomCardMicActionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([self class]) - forIndexPath:indexPath]; - [cell.contentView setBackgroundColor:[UIColor clearColor]]; - cell.userInfo = userInfo; - cell.models = models; - cell.handleTapIcon = tapIcon; - - return cell; -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self.contentView addSubview:self.iconStack]; - [self.iconStack mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.contentView); - make.width.lessThanOrEqualTo(self.contentView).offset(-30); - }]; - - [self.contentView addSubview:self.lineView]; - } - return self; -} - -- (void)dispplayPick { - [self.contentView addSubview:self.pickButton]; - [self.pickButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.iconStack.mas_bottom).offset(16); - make.leading.trailing.mas_equalTo(self.contentView).inset(kGetScaleWidth(80)); - make.height.mas_equalTo(36); - }]; -} - -- (void)setModels:(NSArray *)models { - _models = models; - if (models.count == 0) { -// self.lineView.hidden = YES; - return; - } - for (UIView *subview in self.iconStack.arrangedSubviews) { - [self.iconStack removeArrangedSubview:subview]; - [subview removeFromSuperview]; - } - [models enumerateObjectsUsingBlock:^(XPUserCardItemModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - dispatch_async(dispatch_get_main_queue(), ^{ - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - button.imageEdgeInsets = UIEdgeInsetsZero; - button.tag = idx; - if (obj.type == UserCardMicroType_UpDown) { - if (obj.status) { - [button setBackgroundImage:kImage(@"room_user_card_out_mic") forState:UIControlStateNormal]; - } else { - [button setBackgroundImage:kImage([obj imageName]) forState:UIControlStateNormal]; - } - } else { - if (obj.isSelect) { - [button setBackgroundImage:kImage([obj selectImageName]) forState:UIControlStateNormal]; - } else { - [button setBackgroundImage:kImage([obj imageName]) forState:UIControlStateNormal]; - } - } - - [button addTarget:self action:@selector(didTapIcon:) forControlEvents:UIControlEventTouchUpInside]; - [self.iconStack addArrangedSubview:button]; - [button mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(38, 38)); - }]; - }); - }]; -} - -- (void)didTapIcon:(UIButton *)sender { - if (_handleTapIcon) { - self.handleTapIcon([self.models xpSafeObjectAtIndex:sender.tag]); - } -} - -- (void)didTapPick { - if (_handleTapPick) { - self.handleTapPick(); - } -} - -- (UIStackView *)iconStack { - if (!_iconStack) { - _iconStack = [[UIStackView alloc] init]; - _iconStack.alignment = UIStackViewAlignmentCenter; // 子视图在垂直方向居中 - _iconStack.distribution = UIStackViewDistributionEqualSpacing;//UIStackViewDistributionEqualCentering; // 水平 - _iconStack.spacing = 12; - } - return _iconStack; -} - -- (UIButton *)pickButton { - if (!_pickButton) { - _pickButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_pickButton setCornerRadius:18 - cornerMask:kCALayerMaxXMaxYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMinXMinYCorner]; - [_pickButton addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xFF5778), - UIColorFromRGB(0xDB58FF), - ] - startPoint:CGPointMake(0, 0.5) - endPoint:CGPointMake(1, 0.5) - cornerRadius:18]; - [_pickButton setTitle:YMLocalizedString(@"XPUserCardViewController23") forState:UIControlStateNormal]; - [_pickButton.titleLabel setFont:kFontMedium(14)]; - [_pickButton addTarget:self action:@selector(didTapPick) forControlEvents:UIControlEventTouchUpInside]; - } - return _pickButton; -} - -- (UIView *)lineView { - if (!_lineView) { - _lineView = [[UIView alloc] initWithFrame:CGRectMake(15, 0, KScreenWidth-30, 1)]; - _lineView.backgroundColor = UIColorFromRGB(0xe4e4e4); - } - return _lineView; -} - -@end - -@interface UserRoomCardViewController () - -@property(nonatomic, assign) CGFloat collectionViewWidth; - -@property(nonatomic, strong) UserInfoModel *userInfoModel; -@property (nonatomic,strong) XPUserCardInfoModel *cardInfo; -@property(nonatomic, strong) MoliAvatar *avatar; -@property(nonatomic, strong) NetImageView *vipBGImageView; - -@property(nonatomic, strong) VAPView *topMP4View; -@property (nonatomic, strong) XPRoomGiftAnimationParser *vapParser; -@property(nonatomic, strong) UICollectionView *collectionView; - -@property (nonatomic,copy) NSArray *datasource; -@property(nonatomic, copy) NSArray *micActions; - -@property(nonatomic, assign) BOOL upMicFlag; -@property(nonatomic, assign) CGFloat collectionHeight; - -@property(nonatomic, strong) UIView *toastView; - -@property(nonatomic, strong) UIActivityIndicatorView *loading; - -@property(nonatomic, strong) UserInfoModel *controlUserInfo; -/// NIM 聊天室成员信息 -@property(nonatomic, strong) NIMChatroomMember *nimMember; - -@end - -@implementation UserRoomCardViewController - -- (XPUserCardPresenter *)createPresenter { - return [[XPUserCardPresenter alloc] init]; -} - -- (void)dealloc { - [XNDJTDDLoadingTool hideHUD]; - - // 停止并清理 topMP4View 资源 - if (_topMP4View) { - [_topMP4View stopHWDMP4]; - _topMP4View = nil; - } -} - -- (instancetype)initWithUser:(XPUserCardInfoModel *)cardInfo controlUser:(nonnull UserInfoModel *)meInfo { - if (self = [super init]) { - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - self.cardInfo = cardInfo; - self.controlUserInfo = meInfo; - } - return self; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.datasource = @[]; - self.micActions = @[]; - - [self setupUI]; - [self loadUserInfo]; - [self loadFunctionsItem]; -} - -#pragma mark - -- (void)setupUI { - self.view.backgroundColor = [UIColor colorWithWhite:0.0 alpha:0.0]; - - self.view.alpha = 0; - [XNDJTDDLoadingTool showLoading]; - - UIButton *dismissButton = [UIButton buttonWithType:UIButtonTypeCustom]; - dismissButton.frame = self.view.bounds; - [dismissButton addTarget:self - action:@selector(didTapEmptySpace) - forControlEvents:UIControlEventTouchUpInside]; - [self.view addSubview:dismissButton]; - - [self.view addSubview:self.collectionView]; - [self.view addSubview:self.avatar]; - [self.avatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.collectionView); - make.centerY.mas_equalTo(self.collectionView.mas_top); - make.width.height.mas_equalTo(91); - }]; - - [self.view insertSubview:self.vipBGImageView atIndex:0]; - [self.vipBGImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.collectionView).offset(0); - make.leading.trailing.mas_equalTo(self.collectionView).offset(0); - make.height.mas_equalTo(self.collectionView.mas_height); - }]; - - if (@available(iOS 13.0, *)) { - _loading = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleMedium]; - } else { - _loading = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; - } - _loading.hidesWhenStopped = YES; - [_loading startAnimating]; - [self.view addSubview:self.loading]; - self.loading.center = self.avatar.center; - [self.loading mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.collectionView); - make.size.mas_equalTo(CGSizeMake(40, 40)); - }]; - self.avatar.userInteractionEnabled = NO; - self.collectionView.userInteractionEnabled = NO; -} - -- (void)loadUserInfo { - [self.presenter getUserInfo:self.cardInfo.uid]; -} - -- (void)loadFunctionsItem { - [self.presenter getFunctionItemsByUserInfo:self.cardInfo me:self.controlUserInfo]; -} - -- (BOOL)configRoomDatingPickHeart { - BOOL result = NO; - if (self.cardInfo.roomInfo.roomModeType == RoomModeType_Open_Blind && - self.cardInfo.roomInfo.blindDateState == RoomPlayDateingType_Pick && - [AccountInfoStorage instance].getUid.integerValue != self.cardInfo.uid.integerValue) { - __block MicroQueueModel * selfMicqueue; - __block MicroQueueModel * targetMicqueue; - [self.cardInfo.micQueue.allValues enumerateObjectsUsingBlock:^(MicroQueueModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.userInfo && obj.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - selfMicqueue = obj; - } else if(obj.userInfo && obj.userInfo.uid == self.cardInfo.uid.integerValue) { - targetMicqueue = obj; - } - }]; - if (selfMicqueue.userInfo && selfMicqueue.userInfo.uid > 0 && !selfMicqueue.userInfo.hasSelectUser && selfMicqueue.microState.position != -1 && targetMicqueue.microState.position != -1) { - result = YES; - } - } - - return result; -} - -#pragma mark - -- (void)didTapEmptySpace { - if (self.upMicFlag) { - return; - } - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)handleTapItem:(XPUserCardItemModel *)item { - NSString * roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.uid]; - - // 将 NIM 成员信息存入 XPUserCardItemModel - if (self.nimMember) { - item.nimMember = self.nimMember; - NSLog(@"✅ UserRoomCard: 已将 NIM 成员信息存入 item - userId: %@, type: %ld", self.nimMember.userId, (long)self.nimMember.type); - } else { - NSLog(@"⚠️ UserRoomCard: NIM 成员信息未获取到，item.nimMember 为 nil"); - } - - switch (item.type) { - case UserCardMicroType_UpDown: - [self handleUpDown:item]; - break; - case UserCardMicroType_Lock: { - [self.presenter microLock:roomUid - state:item.status - position:self.cardInfo.position]; - } - break; - case UserCardMicroType_Mute: { - [self.presenter microMute:roomUid - state:item.status - position:self.cardInfo.position]; - } - break; - case UserCardMicroType_Clean_Gift_Value: { - [self.presenter cleanUserGiftValue:roomUid - micUid:self.cardInfo.uid]; - } - break; - case UserCardMicroType_Send_Gift: - case UserCardItemType_Gift: { - [self handleSendGift:item]; - break; - } - case UserCardItemType_Chat:{ - [self handleChat:item]; - } - break; - case UserCardItemType_Attention: { - [self.presenter attentionUser:self.cardInfo.uid - status:!item.isSelect]; - } - break; - case UserCardItemType_KickOut: { - [self handleKickOut:item]; - } - break; - case UserCardItemType_Black: { - [self handleBlackList:item]; - } - break; - case UserCardItemType_Manager: { - if (item.isSelect) { - if ([self isSuperUser]) { - [self.presenter superAdminHandleUser:self.cardInfo.uid opt:@"1" roomUid:roomUid isSet:!item.isSelect]; - } else { - [self.presenter makeUserManager:self.cardInfo.uid roomId:roomId roomUid:roomUid enable:!item.isSelect]; - } - } else { - @kWeakify(self); - [self.presenter checkManagerLimit:roomUid success:^{ - @kStrongify(self); - if ([self isSuperUser]) { - [self.presenter superAdminHandleUser:self.cardInfo.uid opt:@"1" roomUid:roomUid isSet:!item.isSelect]; - } else { - [self.presenter makeUserManager:self.cardInfo.uid roomId:roomId roomUid:roomUid enable:!item.isSelect]; - } - } failure:^(NSError * _Nonnull error) { - if (error.code == 20504) { // 管理员数量已达上限 - [TTPopup popupView:[self managerLimitToast] style:TTPopupStyleAlert]; - } - }]; - } - } - break; - case UserCardItemType_Invite_Micro: { - [self handleInviteMicro:item]; - } - break; - case UserCardItemType_AtUser: { - [self handleAtUser:item]; - } - default: - break; - } -} - -- (void)removeManagerLimitToast { - [TTPopup dismiss]; -} - -- (UIView *)managerLimitToast { - UIView *view = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth-80, kGetScaleWidth(420))]; - view.userInteractionEnabled = YES; - [view setBackgroundColor:[UIColor whiteColor]]; - [view setCornerRadius:16]; - - UILabel *tipTitleLabel = [UILabel labelInitWithText:YMLocalizedString(@"UserDetail_CP_Toast_0") font:kFontMedium(15) textColor:UIColorFromRGB(0x313131)]; - tipTitleLabel.textAlignment = NSTextAlignmentCenter; - UILabel *tipContentLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.33_text_19") font:kFontMedium(15) textColor:UIColorFromRGB(0x313131)]; - tipContentLabel.numberOfLines = 0; - UIImageView *ruleImageView = [[UIImageView alloc] initWithImage:[UIImage getLanguageImage:@"room_manager_limit"]]; - UIButton *confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [confirmButton addTarget:self action:@selector(removeManagerLimitToast) forControlEvents:UIControlEventTouchUpInside]; - [confirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - [confirmButton setCornerRadius:18]; - [confirmButton addGradientBackgroundWithColors:@[ - UIColorFromRGB(0xE29030), UIColorFromRGB(0xFCC074) - ] startPoint:CGPointMake(0, 0.5) endPoint:CGPointMake(1, 0.5) cornerRadius:18]; - - [view addSubview:tipTitleLabel]; - [view addSubview:tipContentLabel]; - [view addSubview:ruleImageView]; - [view addSubview:confirmButton]; - - [tipTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.top.trailing.mas_equalTo(view).inset(14); - make.height.mas_equalTo(22); - }]; - - [tipContentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(tipTitleLabel.mas_bottom).offset(12); - make.leading.trailing.mas_equalTo(view).inset(23); - }]; - - [confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(view).offset(-14); - make.leading.trailing.mas_equalTo(tipContentLabel); - make.height.mas_equalTo(36); - }]; - - [ruleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(tipContentLabel); - make.top.mas_equalTo(tipTitleLabel.mas_bottom).offset(80); - make.bottom.mas_equalTo(confirmButton.mas_top).offset(-10); - }]; - - return view; -} - - -- (void)handleUpDown:(XPUserCardItemModel *)item { - // VIP 防 T 权限 - if (self.userInfoModel.userVipInfoVO.preventKick && - self.userInfoModel.uid != [AccountInfoStorage instance].getUid.integerValue) { - NSString *message = [NSString stringWithFormat:YMLocalizedString(@"UserCard_1.0.17_0"), @(self.userInfoModel.userVipInfoVO.vipLevel)]; - [XNDJTDDLoadingTool showErrorWithMessage:message]; - return; - } - - NSString * roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - - if (item.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.upMicFlag = YES; - NSInteger micCount = 9; - switch (self.cardInfo.roomInfo.type) { - case RoomType_Anchor: - micCount = 4; - break; - case RoomType_MiniGame: - micCount = self.cardInfo.roomInfo.mgMicNum; - break; - case RoomType_Room: - micCount = 9; - break; - case RoomType_10Mic: - micCount = 10; - break; - case RoomType_15Mic: - micCount = 15; - break; - case RoomType_19Mic: - micCount = 19; - break; - case RoomType_20Mic: - micCount = 20; - break; - default: - micCount = 9; - break; - } - [self.presenter getRoomMicroItems:micCount cardInfo:self.cardInfo]; - } -} - -- (void)handleSendGift:(XPUserCardItemModel *)item { - [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]; -} - -- (void)handleChat:(XPUserCardItemModel *)item { - [[NSNotificationCenter defaultCenter] postNotificationName:@"PopAfterUserCardAction" object:nil]; - - [self.presentingViewController.navigationController popViewControllerAnimated:YES]; - [self dismissViewControllerAnimated:YES completion:^{ - UIViewController * controller = (UIViewController *)self.cardInfo.delegate; - XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight) controller:controller]; - halfMessageView.chatUserId = self.cardInfo.uid; - [controller.view addSubview:halfMessageView]; - [UIView animateWithDuration:.35 animations:^{ - CGRect rect = halfMessageView.frame; - rect.origin.y = 0; - halfMessageView.frame = rect; - }]; - }]; -} - -- (void)handleKickOut:(XPUserCardItemModel *)item { - if (self.userInfoModel.userVipInfoVO.preventKick && - self.userInfoModel.uid != [AccountInfoStorage instance].getUid.integerValue) { - NSString *message = [NSString stringWithFormat:YMLocalizedString(@"UserCard_1.0.17_0"), @(self.userInfoModel.userVipInfoVO.vipLevel)]; - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.message = message; - config.actionStyle = TTAlertActionConfirmStyle; - [TTPopup alertWithConfig:config confirmHandler:^{} cancelHandler:^{}]; - } else { - NSString * roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - if ([self isInSudGame:self.cardInfo.uid]) { - NSString *message = YMLocalizedString(@"XPUserCardViewController8"); - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = @""; - config.message = message; - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ - @kStrongify(self); - if ([self isSuperUser]) { - [self.presenter superAdminKickUser:self.userInfoModel.nick cardInfo:self.cardInfo appAdmin:self.controlUserInfo]; - } else { - [self.presenter makeKickUser:self.cardInfo.uid roomId:roomId]; - } - } cancelHandler:^{ - }]; - } else { - NSString *message = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController9"),self.userInfoModel.nick]; - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPUserCardViewController10"); - config.message = message; - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ - @kStrongify(self); - if ([self isSuperUser]) { - [self.presenter superAdminKickUser:self.userInfoModel.nick cardInfo:self.cardInfo appAdmin:self.controlUserInfo]; - } else { - [self.presenter makeKickUser:self.cardInfo.uid roomId:roomId]; - } - } cancelHandler:^{ - }]; - } - } -} - -- (void)handleBlackList:(XPUserCardItemModel *)item { - if (self.userInfoModel.userVipInfoVO.preventKick && - self.userInfoModel.uid != [AccountInfoStorage instance].getUid.integerValue) { - NSString *message = [NSString stringWithFormat:YMLocalizedString(@"UserCard_1.0.17_0"), @(self.userInfoModel.userVipInfoVO.vipLevel)]; - [TTPopup alertWithMessage:message confirmHandler:^{ - } cancelHandler:^{ - }]; - } else { - NSString * roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.uid]; - if ([self isInSudGame:self.cardInfo.uid]) { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = @""; - config.message = [NSString stringWithFormat: YMLocalizedString(@"XPUserCardViewController14"), self.userInfoModel.nick]; - [TTPopup alertWithConfig:config confirmHandler:^{ - if ([self isSuperUser]) { - [self.presenter superAdminHandleUser:self.cardInfo.uid opt:@"-1" roomUid:roomUid isSet:YES]; - } else { - [self.presenter makeUserBlack:self.cardInfo.uid roomId:roomId]; - } - } cancelHandler:^{ - }]; - } else { - NSString *title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController15"),self.userInfoModel.nick]; - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = title; - config.message = YMLocalizedString(@"XPUserCardViewController16"); - [TTPopup alertWithConfig:config confirmHandler:^{ - if ([self isSuperUser]) { - [self.presenter superAdminHandleUser:self.cardInfo.uid opt:@"-1" roomUid:roomUid isSet:YES]; - }else { - [self.presenter makeUserBlack:self.cardInfo.uid roomId:roomId]; - } - } cancelHandler:^{ - }]; - } - } -} - -- (void)handleInviteMicro:(XPUserCardItemModel *)item { - self.upMicFlag = NO; - - if ([AccountInfoStorage instance].getUid.integerValue == self.userInfoModel.uid) { - NSString * roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - [self.presenter upMicro:roomId position:item.position userInfo:self.userInfoModel]; - } else { - if (self.cardInfo.roomInfo.leaveMode && - item.isEnable == NO) { - return; - } - - if (item.isBoss) { - @kWeakify(self); - [self.presenter bossMicUp:@(self.cardInfo.roomInfo.uid).stringValue - targetUid:self.cardInfo.uid - success:^{ - @kStrongify(self); - [self buildUpMicMessage:item]; - } failure:^(NSError * _Nonnull error) { - }]; - } else { - [self buildUpMicMessage:item]; - } - } -} - -- (void)buildUpMicMessage:(XPUserCardItemModel *)item { - BOOL hasVerionType = NO; - NSDictionary *value = nil; - if (self.nimMember) { - NSError *error = nil; - NSData *data = [self.nimMember.roomExt dataUsingEncoding:NSUTF8StringEncoding]; - NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data - options:kNilOptions - error:&error]; - - if (!error) { - NSLog(@"解析成功：%@", dict); - NSString *firstKey = dict.allKeys.firstObject; - if (![NSString isEmpty:firstKey]) { - value = dict[firstKey]; - } - } - } - - if (value && [value objectForKey:@"versionType"]) { - hasVerionType = YES; - } - - if (self.cardInfo.roomInfo.roomModeType != RoomModeType_Normal_Mode || !hasVerionType) { - NSString * roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - [dic setValue:@(item.position.integerValue) forKey:@"micPosition"]; - [dic setValue:@(self.userInfoModel.uid) forKey:@"uid"]; - AttachmentModel *attachement = [[AttachmentModel alloc]init]; - attachement.first = CustomMessageType_Queue; - attachement.second = Custom_Message_Sub_Queue_Invite; - attachement.data = dic; - - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachement; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:roomId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - } else { - AttachmentModel *attachment = [[AttachmentModel alloc] init]; - attachment.first = ClientMessage_Type; - attachment.second = ClientMessage_UpMic_Ask; - NSMutableDictionary *data = [[NSMutableDictionary alloc] init]; - [data setObject:@([[AccountInfoStorage instance].getUid integerValue]) - forKey:@"uid"]; - [data setObject:@(self.userInfoModel.uid) - forKey:@"targetUid"]; - [data setObject:@(item.position.integerValue) - forKey:@"position"]; - [data setObject:@(self.cardInfo.roomInfo.type) - forKey:@"roomType"]; - [data setObject:self.userInfoModel.nick - forKey:@"targetNick"]; - [data setObject:@(self.cardInfo.roomInfo.uid) - forKey:@"roomUid"]; - int64_t millis = (int64_t)([[NSDate date] timeIntervalSince1970] * 1000); - [data setObject:@(millis) - forKey:@"sendTime"]; - attachment.data = data; - - NSString *sessionID = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - - NIMSessionType sessionType = NIMSessionTypeChatroom; - //构造会话 - NIMSession *session = [NIMSession session:sessionID type:sessionType]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - BOOL onMain = [NSThread isMainThread]; - if (error) { - NSLog(@"[Send] ❌ 发送失败 | sessionId=%@ | code=%ld | desc=%@ | main=%@ | ts=%.3f", - sessionID, (long)error.code, error.localizedDescription, onMain ? @"YES" : @"NO", [[NSDate date] timeIntervalSince1970]); - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"20.20.62_text_8")]; - } else { - NSLog(@"[Send] ✅ 发送成功 | sessionId=%@ | main=%@ | ts=%.3f", - sessionID, onMain ? @"YES" : @"NO", [[NSDate date] timeIntervalSince1970]); - [self.navigationController popViewControllerAnimated:YES]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"20.20.62_text_3")]; - } - }]; - } - - [self dismissViewControllerAnimated:YES completion:^{ - [[NSNotificationCenter defaultCenter] postNotificationName:@"PopAfterUserCardAction" object:nil]; - }]; -} - -- (void)handleAtUser:(XPUserCardItemModel *)item { - [[NSNotificationCenter defaultCenter] postNotificationName:@"PopAfterUserCardAction" object:nil]; - - if (self.cardInfo.roomInfo.isCloseScreen) { - [self showErrorToast:YMLocalizedString(@"XPUserCardViewController17")]; - return; - } - [self dismissViewControllerAnimated:NO completion:^{ - UIViewController *vc = self.cardInfo.delegate.getCurrentNav.viewControllers[0]; - [XPRoomSendTextView showTextView:vc.view - delegate:self.cardInfo.delegate - atUid:self.cardInfo.uid - atNick:self.userInfoModel.nick]; - }]; -} - -- (BOOL)isInSudGame:(NSString *)uid { - BOOL isGamePlaying = NO; - if (self.cardInfo.roomInfo.type == RoomType_MiniGame) { - for (int i = -1; i<5; i++) { - NSMutableDictionary * micQueue = self.cardInfo.micQueue; - MicroQueueModel *micSequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i]]; - if (micSequence == nil || micSequence.userInfo == nil) { - continue; - } - if (micSequence.userInfo.uid == uid.integerValue && micSequence.userInfo.gameStatus == LittleGamePlayStatus_Plying) { - isGamePlaying = YES; - break; - } - } - } - return isGamePlaying; -} - -- (BOOL)isSuperUser { - BOOL meIsSuperAdmin = NO; - for (GuildSuperAdminInfoModel *managerInfo in self.cardInfo.superMangerList) { - if ([managerInfo.uid isEqualToString:[AccountInfoStorage instance].getUid]) { - meIsSuperAdmin = YES; - } - } - if (!meIsSuperAdmin) { - meIsSuperAdmin = self.controlUserInfo.platformRole == 1; - } - return meIsSuperAdmin; -} - -- (NSArray *)configGiftUsers:(NSMutableDictionary *)queue { - NSMutableArray * array = [NSMutableArray array]; - BOOL receiveIsOnMic = NO; - for (MicroQueueModel * microModel in queue.allValues) { - if (microModel.userInfo && microModel.userInfo.uid >0) { - UserInfoModel * userInfo = microModel.userInfo; - if (userInfo.uid == self.cardInfo.uid.integerValue) { - receiveIsOnMic = YES; - } - } - } - if (receiveIsOnMic) { - for (MicroQueueModel * microModel in queue.allValues) { - if (microModel.userInfo && microModel.userInfo.uid >0) { - UserInfoModel * userInfo = microModel.userInfo; - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = userInfo.avatar; - userModel.vipMic = userInfo.vipMic; - userModel.position = [NSString stringWithFormat:@"%d", microModel.microState.position]; - userModel.uid = userInfo.uid; - if (userInfo.uid == self.cardInfo.uid.integerValue) { - userModel.isSelect = YES; - } - if (self.cardInfo.roomInfo.type == RoomType_Anchor && microModel.microState.position == -1) {///个播房一直为离开模式，不需要添加房主位 - continue; - } - [array addObject:userModel]; - } - } - - RoomInfoModel * roomInfo = self.cardInfo.roomInfo; - if (roomInfo.leaveMode) { - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = roomInfo.avatar; - userModel.position = @"-1"; - userModel.uid = self.cardInfo.uid.integerValue; - if (roomInfo.uid == self.cardInfo.uid.integerValue) { - userModel.isSelect = YES; - } - [array addObject:userModel]; - } else if (roomInfo.type == RoomType_Anchor) { - BOOL hadContainerOwner = NO; - for (UserInfoModel *userModel in array) { - if (userModel.uid == roomInfo.uid) { - hadContainerOwner = YES; - break; - } - } - if (!hadContainerOwner) { - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = roomInfo.avatar; - userModel.position = @"-1"; - userModel.uid = self.cardInfo.uid.integerValue; - if (roomInfo.uid == self.cardInfo.uid.integerValue) { - userModel.isSelect = YES; - } - [array addObject:userModel]; - } - } - } else { - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = self.userInfoModel.avatar; - userModel.nick = self.userInfoModel.nick; - userModel.uid = self.cardInfo.uid.integerValue; - userModel.isSelect = YES; - [array addObject:userModel]; - } - return array; -} - -- (void)gotoUserInfoVC { - [self dismissViewControllerAnimated:YES completion:nil]; - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = self.cardInfo.uid.integerValue; - [((UINavigationController *)self.presentingViewController) pushViewController:userInfoVC animated:YES]; -} - -- (void)reloadAllUI { - [self.collectionView reloadData]; -} - -#pragma mark - -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { - - self.userInfoModel = userInfo; - self.avatar.userInfo = userInfo; - @kWeakify(self); - [self.avatar setHandleTapAvatar:^{ - @kStrongify(self); - [self gotoUserInfoVC]; - }]; - - // 获取 NIM 聊天室成员信息 - [self fetchNIMChatroomMember:userInfo]; - - // 立即更新卡片高度 - [self updateCollectionViewFrame]; - - [self.collectionView reloadData]; - - BOOL needLoadVIPbg = true; - NSString *mp4Path = @""; - if (userInfo.infoCardVo) { - needLoadVIPbg = false; - mp4Path = [userInfo.infoCardVo.effect pureURLString]; - } - if (![NSString isEmpty:userInfo.userInfoCardPic] && [NSString isEmpty:mp4Path]) { - needLoadVIPbg = false; - mp4Path = [userInfo.userInfoCardPic pureURLString]; - } - if (![NSString isEmpty:mp4Path]) { - if (self.topMP4View.superview == nil) { - [self.view insertSubview:self.topMP4View aboveSubview:self.vipBGImageView]; - [self.topMP4View mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view).inset(-34); - make.centerY.mas_equalTo(self.avatar).offset(70); - make.height.mas_equalTo(300); - }]; - } - - @kWeakify(self); - [self.vapParser parseWithURL:mp4Path - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [self.topMP4View setMute:YES]; - [self.topMP4View playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - [self.vipBGImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.collectionView).offset(20); - }]; - } - } failureBlock:^(NSError * _Nullable error) { - }]; - } - - if (userInfo.userVipInfoVO.vipLevel>0 && - userInfo.userVipInfoVO.userCardBG.length > 0 && - needLoadVIPbg) { - self.vipBGImageView.imageUrl = [userInfo.userVipInfoVO.userCardBG stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; - } - - self.avatar.userInteractionEnabled = YES; - self.collectionView.userInteractionEnabled = YES; - [self.loading stopAnimating]; -} - -#pragma mark - NIM Chatroom Member Management -/// 获取 NIM 聊天室成员信息 -- (void)fetchNIMChatroomMember:(UserInfoModel *)userInfo { - NSString *roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - NSString *userId = [NSString stringWithFormat:@"%ld", userInfo.uid]; - - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = roomId; - request.userIds = @[userId]; - @kWeakify(self); - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - @kStrongify(self); - if (!error && members) { - self.nimMember = [members firstObject]; - NSLog(@"✅ UserRoomCard: 成功获取 NIM 成员信息 - userId: %@, type: %ld", self.nimMember.userId, (long)self.nimMember.type); - } else { - NSLog(@"❌ UserRoomCard: 获取 NIM 成员信息失败 - userId: %@, error: %@", userId, error.localizedDescription); - } - }]; -} - -- (void)onGetFunctionArraySccess:(NSArray *)array { - NSMutableArray *temp_1 = @[].mutableCopy; - - if (self.upMicFlag) { - CGRect r_1 = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight - kGetScaleWidth(376)); - CGRect r_2 = CGRectMake(0, kGetScaleWidth(376), KScreenWidth, KScreenHeight - kGetScaleWidth(376)); - UserRoomMicPositionView *view = [[UserRoomMicPositionView alloc] initWithFrame:r_1]; - [self.view addSubview:view]; - [UIView animateWithDuration:0.25 animations:^{ - view.frame = r_2; - }]; - view.dataSource = array; - @kWeakify(self); - [view setHandleTapPosition:^(XPUserCardItemModel *model) { - @kStrongify(self); - [self handleTapItem:model]; - }]; - [view setHandleDismiss:^{ - @kStrongify(self); - self.upMicFlag = NO; - }]; - return; - } - - if (array.count <= 0) { - if([ [AccountInfoStorage instance].getUid isEqualToString:self.cardInfo.uid] ){ - XPUserCardItemModel *cardModel = [XPUserCardItemModel new]; - cardModel.type = UserCardMicroType_Send_Gift; - cardModel.title = YMLocalizedString(@"XPUserCardPresenter13"); - cardModel.imageName = @"room_user_card_send_gift"; - cardModel.selectImageName = @"room_user_card_send_gift"; - [temp_1 insertObject:cardModel atIndex:0]; - } - self.datasource = temp_1.copy; - [self.presenter getMicroFunctionItemsByUserInfo:self.cardInfo me:self.controlUserInfo]; - } else { - NSMutableArray *temp_2 = @[].mutableCopy; - for (XPUserCardItemModel *model in array) { - if (model.type == UserCardItemType_Gift || - model.type == UserCardItemType_Chat || - model.type == UserCardItemType_AtUser || - model.type == UserCardItemType_Attention) { - [temp_1 addObject:model]; - } else { - [temp_2 addObject:model]; - } - } - self.datasource = temp_1.copy; - self.micActions = temp_2.copy; - [self.presenter getMicroFunctionItemsByUserInfo:self.cardInfo me:self.controlUserInfo]; - } -} - -- (void)onGetMicroFunctionArraySuccess:(NSArray *)array { - NSMutableArray *temp = [self.micActions mutableCopy]; - for (XPUserCardMicroItemModel *model in array) { - [temp addObject:[self transModelFrom:model]]; - } - self.micActions = temp; - [self reloadAllUI]; - - // 重新计算高度，因为micActions数量可能影响高度 - [self updateCollectionViewFrame]; -} - --(void)onGetFollowDataSccess{ - [self reloadAllUI]; -} - -- (XPUserCardItemModel *)transModelFrom:(XPUserCardMicroItemModel *)model { - XPUserCardItemModel *cardModel = [XPUserCardItemModel new]; - cardModel.uid = model.uid; - cardModel.type = model.type; - cardModel.title = model.title; - cardModel.status = model.status; - cardModel.imageName = model.iconImage; - return cardModel; -} - -- (void)attentionUserSuccess:(XPUserCardItemModel *)item { - [self.micActions enumerateObjectsUsingBlock:^(XPUserCardItemModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (item.type == obj.type) { - obj.isSelect = item.isSelect; - *stop = YES; - } - }]; - [self reloadAllUI]; -} - -- (void)markUserManagerFinish:(XPUserCardItemModel *)item error:(NSError *)error { - if (error == nil) { - if (item.isSelect) { - [XNDJTDDLoadingTool showSuccessWithMessage:[NSString stringWithFormat:YMLocalizedString(@"1.0.34_text_6"), self.userInfoModel.nick]]; - } else { - [XNDJTDDLoadingTool showSuccessWithMessage:[NSString stringWithFormat:YMLocalizedString(@"1.0.34_text_7"), self.userInfoModel.nick]]; - } - - [self.micActions enumerateObjectsUsingBlock:^(XPUserCardItemModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (item.type == obj.type) { - obj.isSelect = item.isSelect; - *stop = YES; - } - }]; - [self reloadAllUI]; - } -} - -- (void)makeKickUserFinish:(NSError *)error { - if (error == nil && self.userInfoModel) { - [self dismissViewControllerAnimated:YES completion:nil]; - if (self.controlUserInfo.platformRole == 1) { - // 超管操作 - NIMMessage * message = [[NIMMessage alloc] init]; - AttachmentModel * attachMent = [[AttachmentModel alloc] init]; - attachMent.first = CustomMessageType_Hall_Super_Admin; - attachMent.second = Custom_Message_Sub_Hall_Super_Admin_Kick_Out_Room; - attachMent.data = @{ - @"micNumber": self.cardInfo.position, - @"handleUid": @(self.controlUserInfo.uid).stringValue, - @"handleNick": self.controlUserInfo.nick, - @"targetUid": @(self.userInfoModel.uid).stringValue, - @"targetNick": self.userInfoModel.nick, - }; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachMent; - message.messageObject = object; - - //构造会话 - NSString * sessionId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - - }]; - } else { - [self sendCustomMessageKickOrBlackUser:CustomMessageType_Kick_User second:Custom_Message_Sub_Kick_BeKicked]; - } - } else if (error.code == 404) { - [self showErrorToast:YMLocalizedString(@"XPUserCardViewController1")]; - } else { - [self showErrorToast:error.domain]; - } -} - -- (void)superAdminKickUserFinish:(NSError *)error { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)lockMicroSusccess { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)muteMicroSusccess { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)kickDownMicroSuccess { - if (self.controlUserInfo.platformRole == 1) { - // 超管操作 - NIMMessage * message = [[NIMMessage alloc] init]; - AttachmentModel * attachMent = [[AttachmentModel alloc] init]; - attachMent.first = CustomMessageType_Hall_Super_Admin; - attachMent.second = Custom_Message_Sub_Hall_Super_Admin_Kick_Down_Mic; - attachMent.data = @{ - @"micNumber": self.cardInfo.position, - @"handleUid": @(self.controlUserInfo.uid).stringValue, - @"handleNick": self.controlUserInfo.nick, - @"targetUid": @(self.userInfoModel.uid).stringValue, - @"targetNick": self.userInfoModel.nick, - }; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachMent; - message.messageObject = object; - - //构造会话 - NSString * sessionId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - - }]; - } - else if (self.cardInfo.uid.integerValue != [AccountInfoStorage instance].getUid.integerValue) { - [self sendCustomMessageKickOrBlackUser:CustomMessageType_Queue second:Custom_Message_Sub_Queue_Kick]; - } - - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)upMicroSuccess { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)cleanUserGiftValueSuccess:(NSDictionary *)dic { - [self showSuccessToast:YMLocalizedString(@"XPUserCardViewController3")]; - NIMMessage * message = [[NIMMessage alloc] init]; - AttachmentModel * attachMent = [[AttachmentModel alloc] init]; - attachMent.first = CustomMessageType_Room_GiftValue; - attachMent.second = Custom_Message_Sub_Room_GiftValue_Sync; - attachMent.data = dic; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachMent; - message.messageObject = object; - //构造会话 - NSString * sessionId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)roomDatingPickHeartUserSuccess { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)makeUserBlackFinish:(NSError *)error { - if (error == nil && self.userInfoModel) { - [self dismissViewControllerAnimated:YES completion:nil]; - if (self.cardInfo.position.length > 0) { - NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; - request.key = self.cardInfo.position; - request.roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { - if (error == nil ) { - } - }]; - } - if (self.controlUserInfo.platformRole == 1) { - [self sendCustomMessageKickOrBlackUser:CustomMessageType_Hall_Super_Admin second:Custom_Message_Sub_Hall_Super_Admin_Mark_Black]; - } else { - [self sendCustomMessageKickOrBlackUser:CustomMessageType_Kick_User second:Custom_Message_Sub_Kick_BlackList]; - } - } else if (error.code == 417) { - [self showErrorToast:YMLocalizedString(@"XPUserCardViewController2")]; - } -} - -- (void)superAdminHandleUserSuccess:(NSString *)opt isSet:(BOOL)isset{ - [self dismissViewControllerAnimated:YES completion:nil]; - - if ([opt isEqualToString:@"1"]) { - if (isset) { - [XNDJTDDLoadingTool showSuccessWithMessage:[NSString stringWithFormat:YMLocalizedString(@"1.0.34_text_6"), self.userInfoModel.nick]]; - } else { - [XNDJTDDLoadingTool showSuccessWithMessage:[NSString stringWithFormat:YMLocalizedString(@"1.0.34_text_7"), self.userInfoModel.nick]]; - } - }else if ([opt isEqualToString:@"-1"]) {///拉黑 - if (self.cardInfo.position.length > 0) { - NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; - request.key = self.cardInfo.position; - request.roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { - if (error == nil ) { - } - }]; - } - - if (self.controlUserInfo.platformRole == 1) { - [self sendCustomMessageKickOrBlackUser:CustomMessageType_Hall_Super_Admin second:Custom_Message_Sub_Hall_Super_Admin_Mark_Black]; - } else { - [self sendCustomMessageKickOrBlackUser:CustomMessageType_Kick_User second:Custom_Message_Sub_Kick_BlackList]; - } - [XNDJTDDLoadingTool showSuccessWithMessage:[NSString stringWithFormat:YMLocalizedString(@"1.0.34_text_7"), self.userInfoModel.nick]]; - } -} - -///拉黑/踢出房间 发送自定义消息 -- (void)sendCustomMessageKickOrBlackUser:(int)first second:(int)second { - if (self.controlUserInfo.platformRole == 1 && first == CustomMessageType_Hall_Super_Admin) { - // 超管操作 - NIMMessage * message = [[NIMMessage alloc] init]; - AttachmentModel * attachMent = [[AttachmentModel alloc] init]; - attachMent.first = CustomMessageType_Hall_Super_Admin; - attachMent.second = second; - attachMent.data = @{ - @"micNumber": self.cardInfo.position, - @"handleUid": @(self.controlUserInfo.uid).stringValue, - @"handleNick": self.controlUserInfo.nick, - @"targetUid": @(self.userInfoModel.uid).stringValue, - @"targetNick": self.userInfoModel.nick, - }; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachMent; - message.messageObject = object; - - //构造会话 - NSString * sessionId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - - }]; - } else { - RoomInfoModel * roomInfo = self.cardInfo.roomInfo; - XPKickUserModel *notifyModel = [[XPKickUserModel alloc] init]; - notifyModel.handleNick = self.cardInfo.nick; - notifyModel.handleUid = [AccountInfoStorage instance].getUid.integerValue; - notifyModel.targetUid = self.cardInfo.uid.integerValue; - notifyModel.targetNick = self.userInfoModel.nick; - notifyModel.uid = self.cardInfo.uid.integerValue; - AttachmentModel *attachment = [[AttachmentModel alloc] init]; - attachment.first = first; - attachment.second = second; - attachment.data = [notifyModel model2dictionary]; - NSString * sessionId = [NSString stringWithFormat:@"%ld", 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]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - } -} - -//加入黑名单 -- (void)addOrRemoveBlack:(BOOL)isRemove uid:(NSString *)uid { - NSString *title; - NSString *message; - if (isRemove) { - title = YMLocalizedString(@"XPMineUserInfoViewController2"); - message = YMLocalizedString(@"XPMineUserInfoViewController3"); - }else{ - title = YMLocalizedString(@"XPMineUserInfoViewController4"); - message = YMLocalizedString(@"XPMineUserInfoViewController5"); - } - - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = title; - config.message = message; - - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ - @kStrongify(self); - if (isRemove) { - [[NIMSDK sharedSDK].userManager removeFromBlackBlackList:uid completion:^(NSError * _Nullable error) { - if (error == nil) { - [self showSuccessToast:YMLocalizedString(@"XPMineUserInfoViewController6")]; - } - }]; - } else { - [[NIMSDK sharedSDK].userManager addToBlackList:uid completion:^(NSError * _Nullable error) { - if (error == nil) { - [self showSuccessToast:YMLocalizedString(@"XPMineUserInfoViewController7")]; - } - }]; - } - } cancelHandler:^{ - }]; -} - -#pragma mark - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return 5; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView - layout:(UICollectionViewLayout *)collectionViewLayout - sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - switch (indexPath.row) { - case 0: - return CGSizeMake(self.collectionViewWidth, 120); - break; - case 1: - return CGSizeMake(self.collectionViewWidth, 30); - break; - case 2: - return CGSizeMake(self.collectionViewWidth, - self.userInfoModel.medalsPic.count == 0 ? 0 : 40); - break; - case 3: - return CGSizeMake(self.collectionViewWidth, 60); - break; - case 4: - if (self.micActions.count > 0) { - return CGSizeMake(self.collectionViewWidth, 38 + 16 + 12 + ([self configRoomDatingPickHeart] ? 36 + 32 : 0)); - } else { - return CGSizeMake(self.collectionViewWidth, ([self configRoomDatingPickHeart] ? 36 + 32 : 0)); - } - break; - default: - return CGSizeZero; - break; - } -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - switch (indexPath.row) { - case 0: { - @kWeakify(self); - UserRoomCardInfoCell *cell = [UserRoomCardInfoCell cellFor:collectionView - indexPath:indexPath - userInfo:self.userInfoModel - handleTapReport:^{ - @kStrongify(self); - NSMutableArray *array = [NSMutableArray array]; - NSString *uid = [NSString stringWithFormat:@"%ld",self.userInfoModel.uid]; - @kWeakify(self); - TTActionSheetConfig *report = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineUserInfoViewController0") clickAction:^{ - @kStrongify(self); - [self dismissViewControllerAnimated:YES completion:^{ - XPWebViewController *vc = [[XPWebViewController alloc] initWithRoomUID:nil]; - NSString *urlStr = [NSString stringWithFormat:@"%@?reportUid=%@&source=PERSONAL",URLWithType(kReportRoomURL),uid]; - vc.url = urlStr; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:vc animated:YES]; - }]; - }]; - [array addObject:report]; - BOOL isSystemAccount = [KeyWithType(KeyType_SecretaryUidKey) isEqualToString:uid] || [KeyWithType(KeyType_SystemNotifiUidKey) isEqualToString:uid] || [KeyWithType(KeyType_GuildUidKey) isEqualToString:uid]; - - BOOL isInBlackList = [[NIMSDK sharedSDK].userManager isUserInBlackList:uid] || isSystemAccount; - if (!isInBlackList) { - TTActionSheetConfig *black = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineUserInfoViewController1") clickAction:^{ - @kStrongify(self); - [self addOrRemoveBlack:NO uid:uid]; - }]; - [array addObject:black]; - } - - if ([XPSkillCardPlayerManager shareInstance].userInfoModel.hasSuperRole) { - TTActionSheetConfig *superBlock = [TTActionSheetConfig normalTitle:YMLocalizedString(@"1.0.30_text_26") clickAction:^{ - @kStrongify(self); - SuperBlockViewController *vc = [[SuperBlockViewController alloc] init]; - vc.targetUser = self.userInfoModel; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:vc animated:YES]; - }]; - [array addObject:superBlock]; - } - - [TTPopup actionSheetWithItems:array]; - }]; - return cell; - } - break; - case 1: { - UserRoomCardNameplateCell *cell = [UserRoomCardNameplateCell cellFor:collectionView - indexPath:indexPath - userInfo:self.userInfoModel]; - return cell; - } - break; - case 2: { - // 勋章显示 Cell - UserRoomCardMedalCell *cell = [UserRoomCardMedalCell cellFor:collectionView - indexPath:indexPath - userInfo:self.userInfoModel]; - return cell; - } - break; - case 3: { - @kWeakify(self); - UserRoomCardUserActionCell *cell = [UserRoomCardUserActionCell cellFor:collectionView - indexPath:indexPath - userInfo:self.userInfoModel - models:self.datasource - handleTapIcon:^(XPUserCardItemModel *model) { - @kStrongify(self); - [self handleTapItem:model]; - }]; - return cell; - } - break; - case 4: { - @kWeakify(self); - UserRoomCardMicActionCell *cell = [UserRoomCardMicActionCell cellFor:collectionView - indexPath:indexPath - userInfo:self.userInfoModel - models:self.micActions - handleTapIcon:^(XPUserCardItemModel *model) { - @kStrongify(self); - [self handleTapItem:model]; - }]; - if ([self configRoomDatingPickHeart]) { - [cell dispplayPick]; - [cell setHandleTapPick:^{ - @kStrongify(self); - if (self.cardInfo.position.length > 0) { - TTAlertConfig * config = [[TTAlertConfig alloc] init]; - 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:^{ - [self.presenter pickHeartUser:[NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.uid] chosenUserId:self.cardInfo.uid]; - } cancelHandler:^{ - - }]; - } - }]; - } - return cell; - } - break; - default: { - UICollectionViewCell *cell = [UICollectionViewCell new]; - return cell; - } - break; - } -} - - -#pragma mark - -- (UICollectionView *)collectionView { - if (!_collectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 0; - - // 初始化时使用基础高度，后续会根据实际数据更新 - self.collectionHeight = [self calculateCollectionViewHeight]; - CGFloat space_top = KScreenHeight - self.collectionHeight; - self.collectionViewWidth = KScreenWidth; - - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, - space_top, - KScreenWidth, - self.collectionHeight) - collectionViewLayout:layout]; - [_collectionView setCornerRadius:16]; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView updateGradientBackgroundWithColors:@[ - [UIColor clearColor], - [UIColor whiteColor] - ] - startPoint:CGPointMake(0.5, 0) - endPoint:CGPointMake(0.5, 1)]; - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.clipsToBounds = NO; - [UserRoomCardInfoCell registerTo:_collectionView]; - [UserRoomCardNameplateCell registerTo:_collectionView]; - [UserRoomCardMedalCell registerTo:_collectionView]; - [UserRoomCardUserActionCell registerTo:_collectionView]; - [UserRoomCardMicActionCell registerTo:_collectionView]; - } - return _collectionView; -} - -- (VAPView *)topMP4View { - if (!_topMP4View) { - _topMP4View = [[VAPView alloc] init]; - _topMP4View.contentMode = UIViewContentModeScaleAspectFit; - _topMP4View.userInteractionEnabled = NO; - } - return _topMP4View; -} - -- (XPRoomGiftAnimationParser *)vapParser { - if (!_vapParser) { - _vapParser = [[XPRoomGiftAnimationParser alloc] init]; - } - return _vapParser; -} - -- (NetImageView *)vipBGImageView { - if (!_vipBGImageView) { - _vipBGImageView = [[NetImageView alloc] init]; - _vipBGImageView.backgroundColor = [UIColor whiteColor]; - _vipBGImageView.contentMode = UIViewContentModeScaleAspectFill; - _vipBGImageView.clipsToBounds = YES; - [_vipBGImageView setCornerRadius:16 cornerMask:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner]; - } - return _vipBGImageView; -} - -- (MoliAvatar *)avatar { - if (!_avatar) { - _avatar = [[MoliAvatar alloc] init]; - _avatar.clipsToBounds = NO; - } - return _avatar; -} - -#pragma mark - Height Calculation -- (CGFloat)calculateCollectionViewHeight { - // 基础高度组成： - // Cell 0 (用户信息): 120 - // Cell 1 (铭牌): 30 - // Cell 2 (勋章): 根据勋章数量决定，0或40 - // Cell 3 (用户操作): 60 - // Cell 4 (麦克风操作): 根据数量决定，0或66 - // 相亲模式额外高度: 68或0 - // 底部安全区域: kSafeAreaBottomHeight - - CGFloat baseHeight = 120 + 30 + 60; // 固定部分 - - // 勋章区域高度 - CGFloat medalHeight = 0; - if (self.userInfoModel && self.userInfoModel.medalsPic.count > 0) { - medalHeight = 40; - } - - // 麦克风操作区域高度 - CGFloat micActionHeight = 0; - if (self.micActions.count > 0) { - micActionHeight = 66; - } - - // 相亲模式额外高度 - CGFloat datingHeight = [self configRoomDatingPickHeart] ? 68 : 0; - - return baseHeight + medalHeight + micActionHeight + datingHeight + kSafeAreaBottomHeight; -} - -- (void)updateCollectionViewFrame { - CGFloat newHeight = [self calculateCollectionViewHeight]; -// if (ABS(self.collectionHeight - newHeight) > 0.1) { // 只有高度确实变化时才更新 - self.collectionHeight = newHeight; - CGFloat space_top = KScreenHeight - self.collectionHeight; - - [UIView animateWithDuration:0.25 animations:^{ - self.collectionView.frame = CGRectMake(0, space_top, KScreenWidth, self.collectionHeight); - } completion:^(BOOL finished) { - if (self.userInfoModel) { // 只有用户信息加载完成后才显示 - self.view.alpha = 1; - [XNDJTDDLoadingTool hideHUD]; - } - }]; -// } -} - -@end diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionCell.h b/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionCell.h deleted file mode 100644 index eb0a14a..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionCell.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// UserRoomMicPositionCell.h -// YuMi -// -// Created by P on 2024/12/11. -// - -#import -#import "XPUserCardItemModel.h" - -NS_ASSUME_NONNULL_BEGIN - -/// 房间麦位选择 Cell -@interface UserRoomMicPositionCell : UICollectionViewCell - -@property(nonatomic, strong) UIImageView *iconImageView; -@property(nonatomic, strong) UILabel *contentLabel; -@property(nonatomic, assign) BOOL isUsed; -@property(nonatomic, strong) XPUserCardItemModel *cellModel; - -@end - -NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionCell.m b/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionCell.m deleted file mode 100644 index 2e43156..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionCell.m +++ /dev/null @@ -1,51 +0,0 @@ -// -// UserRoomMicPositionCell.m -// YuMi -// -// Created by P on 2024/12/11. -// - -#import "UserRoomMicPositionCell.h" - -@implementation UserRoomMicPositionCell - -- (instancetype)initWithFrame:(CGRect)frame{ - if (self = [super initWithFrame:frame]) { - [self.contentView addSubview:self.iconImageView]; - [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.contentView); - make.height.mas_equalTo(self.iconImageView.mas_width); - }]; - - [self.contentView addSubview:self.contentLabel]; - [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.iconImageView.mas_bottom).offset(4); - make.bottom.mas_equalTo(self.contentView); - make.centerX.mas_equalTo(self.contentView); - }]; - } - return self; -} - -- (void)setCellModel:(XPUserCardItemModel *)cellModel { - _cellModel = cellModel; - self.iconImageView.image = kImage(cellModel.imageName); - self.contentLabel.text = cellModel.title; -} - -#pragma mark - -- (UIImageView *)iconImageView { - if (!_iconImageView) { - _iconImageView = [[UIImageView alloc] initWithImage:kImage(@"room_user_position_empty")]; - } - return _iconImageView; -} - -- (UILabel *)contentLabel { - if (!_contentLabel) { - _contentLabel = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:[UIColor whiteColor]]; - } - return _contentLabel; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionView.h b/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionView.h deleted file mode 100644 index 25d52d1..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// UserRoomMicPositionView.h -// YuMi -// -// Created by P on 2024/12/11. -// - -#import -#import "XPUserCardItemModel.h" - -NS_ASSUME_NONNULL_BEGIN - -/// 房间麦位选择视图 -@interface UserRoomMicPositionView : UIView - -@property(nonatomic, strong) UILabel *titleLabel; -@property(nonatomic, strong) UIButton *comfirmButton; -@property(nonatomic, copy) NSArray *dataSource; -@property(nonatomic, strong) UICollectionView *collectionView; -@property(nonatomic, copy) void(^handleTapPosition)(XPUserCardItemModel *model); -@property(nonatomic, copy) void(^handleDismiss)(void); - -@end - -NS_ASSUME_NONNULL_END \ No newline at end of file diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionView.m b/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionView.m deleted file mode 100644 index a5dd859..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomMicPositionView.m +++ /dev/null @@ -1,189 +0,0 @@ -// -// UserRoomMicPositionView.m -// YuMi -// -// Created by P on 2024/12/11. -// - -#import "UserRoomMicPositionView.h" -#import "UserRoomMicPositionCell.h" -#import "Custom9MicLayout.h" -#import "Custom19MicLayout.h" - -@implementation UserRoomMicPositionView - -- (void)dealloc -{ - if (self.handleDismiss) { - self.handleDismiss(); - } -} - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - self.backgroundColor = [UIColor blackColor]; - [self setCornerRadius:16 cornerMask:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner]; - - [self addSubview:self.titleLabel]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); - make.top.mas_equalTo(15); - make.height.mas_equalTo(22); - }]; - - [self addSubview:self.comfirmButton]; - [self.comfirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.titleLabel); - make.trailing.mas_equalTo(-15); - make.size.mas_equalTo(CGSizeMake(48, 44)); - }]; - - [self addSubview:self.collectionView]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(20); - make.leading.bottom.trailing.mas_equalTo(self); - }]; - } - return self; -} - -- (void)setDataSource:(NSArray *)dataSource { - _dataSource = dataSource; - if (dataSource.count == 9) { - Custom9MicLayout *customLayout = [[Custom9MicLayout alloc] init]; - self.collectionView.collectionViewLayout = customLayout; - } else if (dataSource.count == 19) { - Custom19MicLayout *customLayout = [[Custom19MicLayout alloc] init]; - self.collectionView.collectionViewLayout = customLayout; - } - [self.collectionView reloadData]; -} - -#pragma mark - -- (void)didTapComfirm { - CGRect r = CGRectMake(0, KScreenHeight, self.frame.size.width, self.frame.size.height); - [UIView animateWithDuration:0.25 animations:^{ - self.frame = r; - } completion:^(BOOL finished) { - [self removeFromSuperview]; - if (self.handleDismiss) { - self.handleDismiss(); - } - }]; -} - -#pragma mark - UICollectionViewDataSource -- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView { - if (self.dataSource.count == 9) { - return 3; - } - return 1; -} - -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - if (self.dataSource.count == 9) { - switch (section) { - case 0: - return 1; - break; - case 1: - return 4; - break; - case 2: - return 4; - break; - default: - break; - } - } - return self.dataSource.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - UserRoomMicPositionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"UserRoomMicPositionCell" - forIndexPath:indexPath]; - if (self.dataSource.count == 9) { - switch (indexPath.section) { - case 0: - cell.cellModel = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; - break; - case 1: - cell.cellModel = [self.dataSource xpSafeObjectAtIndex:indexPath.row+1]; - break; - case 2: - cell.cellModel = [self.dataSource xpSafeObjectAtIndex:indexPath.row+5]; - break; - default: - break; - } - } else { - cell.cellModel = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; - } - - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - if (_handleTapPosition) { - if (self.dataSource.count == 9) { - switch (indexPath.section) { - case 0: - self.handleTapPosition([self.dataSource xpSafeObjectAtIndex:indexPath.row]); - break; - case 1: - self.handleTapPosition([self.dataSource xpSafeObjectAtIndex:indexPath.row+1]); - break; - case 2: - self.handleTapPosition([self.dataSource xpSafeObjectAtIndex:indexPath.row+5]); - break; - default: - break; - } - } else if (self.dataSource.count == 19) { - self.handleTapPosition([self.dataSource xpSafeObjectAtIndex:indexPath.row]); - } else { - self.handleTapPosition([self.dataSource xpSafeObjectAtIndex:indexPath.row]); - } - } - [self removeFromSuperview]; -} - -#pragma mark - Getters -- (UICollectionView *)collectionView { - if (!_collectionView) { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(50, 50 + 4 + 17); - layout.minimumLineSpacing = 14; - layout.minimumInteritemSpacing = 23; - layout.sectionInset = UIEdgeInsetsMake(0, 15, kSafeAreaBottomHeight, 15); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[UserRoomMicPositionCell class] forCellWithReuseIdentifier:@"UserRoomMicPositionCell"]; - } - return _collectionView; -} - -- (UILabel *)titleLabel { - if (!_titleLabel) { - _titleLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.31_text_4") - font:kFontSemibold(16) - textColor:[UIColor whiteColor]]; - } - return _titleLabel; -} - -- (UIButton *)comfirmButton { - if (!_comfirmButton) { - _comfirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_comfirmButton setTitleColor:UIColorFromRGB(0xFF8C03) forState:UIControlStateNormal]; - [_comfirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; - [_comfirmButton addTarget:self - action:@selector(didTapComfirm) - forControlEvents:UIControlEventTouchUpInside]; - } - return _comfirmButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h deleted file mode 100644 index 276a7f4..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// XPUserCardViewController.h -// xplan-ios -// -// 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 -- (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 deleted file mode 100644 index d25c637..0000000 --- a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m +++ /dev/null @@ -1,1658 +0,0 @@ -// -// XPUserCardViewController.m -// xplan-ios -// -// Created by 冯硕 on 2021/11/24. -// - -#import "XPUserCardViewController.h" -///Third -#import -#import -#import -///Tool -#import "YUMIMacroUitls.h" -#import "ThemeColor+UserCard.h" -#import "TTPopup.h" -#import "YUMIHtmlUrl.h" -#import "AccountInfoStorage.h" -#import "SpriteSheetImageManager.h" -#import "UIImage+Utils.h" -#import "XCCurrentVCStackManager.h" -///Model -#import "UserInfoModel.h" -#import "XPUserCardItemModel.h" -#import "RoomInfoModel.h" -#import "AttachmentModel.h" -#import "XPKickUserModel.h" -#import "XPUserCardMicroItemModel.h" -#import "MicroQueueModel.h" -#import "MicroStateModel.h" -///View -#import "XPSendGiftView.h" -#import "NetImageView.h" -#import "XPUserCardItemCollectionViewCell.h" -#import "XPUserCardSkillCardView.h" -#import "XPRoomSendTextView.h" -#import "XPRoomHalfMessageView.h" -///P -#import "XPUserCardPresenter.h" -#import "XPUserCardProtocol.h" -///VC -#import "XPWebViewController.h" -#import "XPMineUserInfoViewController.h" -#import "SessionViewController.h" - -#import -#import "XPRoomGiftAnimationParser.h" - -@interface XPUserCardViewController () -///上面点击的view -@property (nonatomic,strong) UIView *topTapView; -///下面点击的view -@property (nonatomic,strong) UIView *bottomTapView; -///背景 -@property (nonatomic,strong) UIView *backView; -///最外层的容器 -@property (nonatomic,strong) UIStackView *stackView; -///展示用户的信息 -@property (nonatomic,strong) UIView * userInfoView; -///VIP资料卡头饰 -@property (nonatomic, strong) NetImageView *nobleImageView; -@property (nonatomic, strong) VAPView *vapView; -@property (nonatomic, strong) XPRoomGiftAnimationParser *vapParser; -///模糊效果 -@property (strong, nonatomic) UIVisualEffectView *effectView; -///头像背景 -@property (nonatomic,strong) NetImageView *backImageView; -///头饰 -@property (nonatomic,strong) YYAnimatedImageView *headWearImageView; -@property (nonatomic,strong) SVGAImageView *headWearSVGAImageView; -///头饰播放 -@property (nonatomic, strong) SpriteSheetImageManager *manager; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///名字 -@property (nonatomic,strong) UILabel *nickLabel; -///性别 -@property (nonatomic,strong) UIImageView *sexImageView; -///新用户 -@property (nonatomic,strong) UIImageView *newUserImageView; -///官方的 -@property (nonatomic,strong) UIImageView *officialImageView; -///魅力等级 等级 铭牌 -@property (nonatomic,strong) UIStackView *tagStackView; -///魅力等级 -@property (nonatomic,strong) NetImageView *charmImageView; -///VIPicon -@property (nonatomic, strong) NetImageView *nobleIconImageView; -///等级 -@property (nonatomic,strong) NetImageView *experImageView; -///铭牌的容器 -@property (nonatomic,strong) UIView * namePlateView; -///铭牌图片 -@property (nonatomic,strong) NetImageView *nameplateImageView; -///铭牌文字 -@property (nonatomic,strong) UILabel *nameplateLabel; - -///VIP铭牌图片 -@property (nonatomic,strong) NetImageView *vipPlateImageView; - -///ID -@property (nonatomic,strong) UILabel *idLabel; -@property (nonatomic, strong) UIButton *copyIDButton; - -///举报 -@property (nonatomic,strong) UIButton *reportButton; -///关闭 -@property (nonatomic,strong) UIButton *closeButton; -///列表 -@property (nonatomic,strong) UICollectionView *collectionView; -///技能卡列表 -@property (nonatomic, strong) XPUserCardSkillCardView *skillCardView; -///分割线 -@property (nonatomic,strong) UIView * sepLineView; -///操作的容器 -@property (nonatomic,strong) UIStackView *operaStackView; -///选择心动 -@property (nonatomic,strong) UIButton *pickHeartButton; -///选择心动的容器 -@property (nonatomic,strong) UIView * pickHeartView; -///展示用户的uid -@property (nonatomic,strong) XPUserCardInfoModel *cardInfo; -///数据源 -@property (nonatomic,copy) NSArray *datasource; - -///目标用户的信息 -@property (nonatomic,strong) UserInfoModel *targetUserInfo; - -@end - -@implementation XPUserCardViewController - -- (instancetype)initWithUser:(XPUserCardInfoModel *)cardInfo { - if (self = [super init]) { - self.modalPresentationStyle = UIModalPresentationOverFullScreen; - self.cardInfo = cardInfo; - } - return self; -} - -#pragma mark - Life Style -- (XPUserCardPresenter *)createPresenter { - return [[XPUserCardPresenter alloc] init]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - self.view.backgroundColor = [UIColor clearColor]; - self.view.hidden = YES; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - self.view.hidden = NO; - }); - [self initHttp]; -} - -#pragma mark - Private Method -- (void)initSubViews { - - [self.view addSubview:self.topTapView]; - [self.view addSubview:self.backView]; - [self.view addSubview:self.bottomTapView]; - - [self.view addSubview:self.vapView]; - if (self.targetUserInfo.infoCardVo) { - [self.view addSubview:self.stackView]; - } else { - [self.backView addSubview:self.stackView]; - } - - [self.view addSubview:self.nobleImageView]; - - [self.stackView addArrangedSubview:self.userInfoView]; - [self.stackView addArrangedSubview:self.skillCardView]; - [self.stackView addArrangedSubview:self.collectionView]; - [self.stackView addArrangedSubview:self.sepLineView]; - [self.stackView addArrangedSubview:self.operaStackView]; - [self.stackView addArrangedSubview:self.pickHeartView]; - ///用户信息 - [self.userInfoView addSubview:self.backImageView]; - [self.userInfoView addSubview:self.effectView]; - [self.userInfoView addSubview:self.avatarImageView]; - [self.userInfoView addSubview:self.headWearImageView]; - [self.userInfoView addSubview:self.headWearSVGAImageView]; - [self.userInfoView addSubview:self.nobleIconImageView]; - [self.userInfoView addSubview:self.nickLabel]; - [self.userInfoView addSubview:self.sexImageView]; - [self.userInfoView addSubview:self.tagStackView]; - [self.userInfoView addSubview:self.idLabel]; - [self.userInfoView addSubview:self.copyIDButton]; - [self.userInfoView addSubview:self.reportButton]; - [self.userInfoView addSubview:self.closeButton]; - ///用户信息中的标签 - [self.tagStackView addArrangedSubview:self.newUserImageView]; - [self.tagStackView addArrangedSubview:self.officialImageView]; - [self.tagStackView addArrangedSubview:self.experImageView]; - [self.tagStackView addArrangedSubview:self.charmImageView]; - [self.tagStackView addArrangedSubview:self.vipPlateImageView]; - [self.tagStackView addArrangedSubview:self.namePlateView]; - ///铭牌 - [self.namePlateView addSubview:self.nameplateImageView]; - [self.namePlateView addSubview:self.nameplateLabel]; - - [self.pickHeartView addSubview:self.pickHeartButton]; - [self configRoomDatingPickHeart]; -} - -- (void)initSubViewConstraints { - [self.topTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.backView.mas_top); - }]; - - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - 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.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.backView.mas_bottom); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth - 90); - make.top.centerX.mas_equalTo(self.backView); - }]; - - [self.userInfoView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.stackView); - make.height.mas_equalTo(110); - }]; - CGFloat nobleMargin = (KScreenWidth - 45) * 45.0 / (KScreenWidth - 90); - [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(180+70); - make.top.mas_equalTo(self.backView).mas_offset(-70); - make.trailing.mas_equalTo(self.backView).offset(nobleMargin*0.5); - make.leading.mas_equalTo(self.backView).mas_offset(-nobleMargin*0.5); - }]; - [self.vapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(180+70); - make.top.mas_equalTo(self.backView).mas_offset(-70); - 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); - make.height.mas_equalTo(0); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.userInfoView); - make.height.mas_equalTo(0); - }]; - - [self.sepLineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(KScreenWidth - 45 * 2 - 10 * 2, 1)); - }]; - - [self.operaStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.userInfoView); - make.height.mas_equalTo(40); - }]; - ///用户信息的子view - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(self.userInfoView); - make.height.mas_equalTo(110); - }]; - - [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.userInfoView); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(50, 50)); - make.leading.mas_equalTo(self.userInfoView).offset(15); - make.top.mas_equalTo(self.userInfoView).offset(30); - }]; - - [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(self.avatarImageView.mas_width).multipliedBy(1.31); - make.height.mas_equalTo(self.headWearImageView.mas_width); - }]; - - [self.headWearSVGAImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarImageView); - make.width.mas_equalTo(self.avatarImageView.mas_width).multipliedBy(1.31); - make.height.mas_equalTo(self.headWearImageView.mas_width); - }]; - - [self.nobleIconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.headWearImageView.mas_trailing).offset(5); - make.centerY.mas_equalTo(self.nickLabel); - make.height.mas_equalTo(20); - make.width.mas_equalTo(0); - }]; - - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.lessThanOrEqualTo(self.userInfoView.mas_trailing).offset(-16); - make.size.mas_equalTo(CGSizeMake(14, 14)); - make.centerY.mas_equalTo(self.nickLabel); - }]; - - [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView); - make.leading.mas_equalTo(self.nobleIconImageView.mas_trailing); - make.trailing.equalTo(self.sexImageView.mas_leading).offset(-8); - }]; - - [self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) { - 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.leading.mas_equalTo(self.nobleIconImageView); - make.top.mas_equalTo(self.tagStackView.mas_bottom).offset(3); - }]; - - [self.copyIDButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.idLabel.mas_trailing).offset(2); - make.centerY.mas_equalTo(self.idLabel); - make.size.mas_equalTo(CGSizeMake(14, 14)); - }]; - - [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(22, 22)); - make.top.mas_equalTo(self.userInfoView).offset(5); - make.trailing.mas_equalTo(self.userInfoView).offset(-6); - }]; - - [self.reportButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.closeButton); - make.trailing.mas_equalTo(self.closeButton.mas_leading).offset(-5); - }]; - - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(34); - }]; - - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(34); - }]; - - [self.newUserImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(15); - }]; - - [self.officialImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(20); - }]; - - [self.namePlateView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(self.nameplateImageView.mas_width); - }]; - - [self.vipPlateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(60); - }]; - - [self.nameplateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(60); - make.leading.top.mas_equalTo(self.namePlateView); - }]; - - [self.nameplateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(self.nameplateImageView); - make.trailing.mas_equalTo(self.namePlateView).offset(-2); - }]; - - [self.pickHeartView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(200); - make.height.mas_equalTo(40); - }]; - - [self.pickHeartButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.centerY.mas_equalTo(self.pickHeartView); - make.height.mas_equalTo(30); - }]; -} - -- (void)initEvent { - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(disMisssVc:)]; - [self.topTapView addGestureRecognizer:tap]; - UITapGestureRecognizer * bottomTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(disMisssVc:)]; - [self.bottomTapView addGestureRecognizer:bottomTap]; - - UITapGestureRecognizer * userInfoTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(gotoUserInfoVC:)]; - [self.avatarImageView addGestureRecognizer:userInfoTap]; -} - -- (void)initHttp { - [self.presenter getUserInfo:self.cardInfo.uid]; -// [self.presenter getFunctionItemsByUserInfo:self.cardInfo]; -} - -- (void)configRoomDatingPickHeart { - self.pickHeartView.hidden = YES; - if (self.cardInfo.roomInfo.roomModeType == RoomModeType_Open_Blind && self.cardInfo.roomInfo.blindDateState == RoomPlayDateingType_Pick && [AccountInfoStorage instance].getUid.integerValue != self.cardInfo.uid.integerValue) { - __block MicroQueueModel * selfMicqueue; - __block MicroQueueModel * targetMicqueue; - [self.cardInfo.micQueue.allValues enumerateObjectsUsingBlock:^(MicroQueueModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.userInfo && obj.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - selfMicqueue = obj; - } else if(obj.userInfo && obj.userInfo.uid == self.cardInfo.uid.integerValue) { - targetMicqueue = obj; - } - }]; - if (selfMicqueue.userInfo && selfMicqueue.userInfo.uid > 0 && !selfMicqueue.userInfo.hasSelectUser && selfMicqueue.microState.position != -1 && targetMicqueue.microState.position != -1) { - self.pickHeartView.hidden = NO; - } - } -} - -- (void)updateCollectionHeight:(NSArray *)array { - if (array.count > 0) { - CGFloat collectionHeight = 16 + 10; - NSInteger page = array.count / 4; - if (page > 0) { - if (array.count % 4 ==0) { - collectionHeight += (page * 60 + (page-1) * 16); - } else { - collectionHeight += ((page + 1) * 60 + page * 16); - } - } else { - collectionHeight += 60; - } - [self.collectionView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(collectionHeight); - }]; - } -} - -///拉黑/踢出房间 发送自定义消息 -- (void)sendCustomMessageKickOrBlackUser:(int)first second:(int)second { - RoomInfoModel * roomInfo = self.cardInfo.roomInfo; - XPKickUserModel *notifyModel = [[XPKickUserModel alloc] init]; - notifyModel.handleNick = self.cardInfo.nick; - notifyModel.handleUid = [AccountInfoStorage instance].getUid.integerValue; - notifyModel.targetUid = self.cardInfo.uid.integerValue; - notifyModel.targetNick = self.targetUserInfo.nick; - notifyModel.uid = self.cardInfo.uid.integerValue; - AttachmentModel *attachment = [[AttachmentModel alloc] init]; - attachment.first = first; - attachment.second = second; - attachment.data = [notifyModel model2dictionary]; - NSString * sessionId = [NSString stringWithFormat:@"%ld", 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]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; -} - -- (NSArray *)configGiftUsers:(NSMutableDictionary *)queue { - NSMutableArray * array = [NSMutableArray array]; - BOOL receiveIsOnMic = NO; - for (MicroQueueModel * microModel in queue.allValues) { - if (microModel.userInfo && microModel.userInfo.uid >0) { - UserInfoModel * userInfo = microModel.userInfo; - if (userInfo.uid == self.cardInfo.uid.integerValue) { - receiveIsOnMic = YES; - } - } - } - if (receiveIsOnMic) { - for (MicroQueueModel * microModel in queue.allValues) { - if (microModel.userInfo && microModel.userInfo.uid >0) { - UserInfoModel * userInfo = microModel.userInfo; - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = userInfo.avatar; - userModel.vipMic = userInfo.vipMic; - userModel.position = [NSString stringWithFormat:@"%d", microModel.microState.position]; - userModel.uid = userInfo.uid; - if (userInfo.uid == self.cardInfo.uid.integerValue) { - userModel.isSelect = YES; - } - if (self.cardInfo.roomInfo.type == RoomType_Anchor && microModel.microState.position == -1) {///个播房一直为离开模式，不需要添加房主位 - continue; - } - [array addObject:userModel]; - } - } - - RoomInfoModel * roomInfo = self.cardInfo.roomInfo; - if (roomInfo.leaveMode) { - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = roomInfo.avatar; - userModel.position = @"-1"; - userModel.uid = self.cardInfo.uid.integerValue; - if (roomInfo.uid == self.cardInfo.uid.integerValue) { - userModel.isSelect = YES; - } - [array addObject:userModel]; - } else if (roomInfo.type == RoomType_Anchor) { - BOOL hadContainerOwner = NO; - for (UserInfoModel *userModel in array) { - if (userModel.uid == roomInfo.uid) { - hadContainerOwner = YES; - break; - } - } - if (!hadContainerOwner) { - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = roomInfo.avatar; - userModel.position = @"-1"; - userModel.uid = self.cardInfo.uid.integerValue; - if (roomInfo.uid == self.cardInfo.uid.integerValue) { - userModel.isSelect = YES; - } - [array addObject:userModel]; - } - } - } else { - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = self.targetUserInfo.avatar; - userModel.nick = self.targetUserInfo.nick; - userModel.uid = self.cardInfo.uid.integerValue; - userModel.isSelect = YES; - [array addObject:userModel]; - } - return array; -} - -//自己是否在游戏中 -- (BOOL)isInSudGame:(NSString *)uid { - BOOL isGamePlaying = NO; - if (self.cardInfo.roomInfo.type == RoomType_MiniGame) { - for (int i = -1; i<5; i++) { - NSMutableDictionary * micQueue = self.cardInfo.micQueue; - MicroQueueModel *micSequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i]]; - if (micSequence == nil || micSequence.userInfo == nil) { - continue; - } - if (micSequence.userInfo.uid == uid.integerValue && micSequence.userInfo.gameStatus == LittleGamePlayStatus_Plying) { - isGamePlaying = YES; - break; - } - } - } - return isGamePlaying; -} - - -#pragma mark - XPUserCardProtocol -- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo { - self.targetUserInfo = userInfo; - - [self initSubViews]; - [self initSubViewConstraints]; - [self initEvent]; - -// [self.presenter getFunctionItemsByUserInfo:self.cardInfo]; - - self.avatarImageView.imageUrl = userInfo.avatar; -// self.nobleImageView.imageUrl = userInfo.userInfoCardPic; - - if (userInfo.infoCardVo) { - self.effectView.hidden = YES; - self.backImageView.hidden = YES; - self.idLabel.textColor = UIColorFromRGB(0x313131); - CGFloat nobleMargin = (KScreenWidth - 45) * 45.0 / (KScreenWidth - 90); - [self.vapView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(180+110); - make.top.mas_equalTo(self.backView).mas_offset(-110); - make.trailing.mas_equalTo(self.backView).offset(nobleMargin*0.5); - make.leading.mas_equalTo(self.backView).mas_offset(-nobleMargin*0.5); - }]; - - switch (userInfo.infoCardVo.effectType) { - case 0: - // 图片 - self.nobleImageView.imageUrl = userInfo.infoCardVo.effect; - break; - case 1: { - NSString *resourcePath = [userInfo.infoCardVo.effect pureURLString]; - if (resourcePath.length > 0) { - @kWeakify(self); - [self.vapParser parseWithURL:resourcePath - completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [self.vapView setMute:YES]; - [self.vapView playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } - } failureBlock:^(NSError * _Nullable error) { - }]; - } - } - break; - default: - break; - } - } else { - self.effectView.hidden = NO; - self.backImageView.hidden = NO; - self.backImageView.layer.masksToBounds = YES; - self.backImageView.layer.cornerRadius = 25; - self.backImageView.imageUrl = userInfo.avatar; - self.idLabel.textColor = [DJDKMIMOMColor textThirdColor]; - - if (userInfo.userVipInfoVO.vipLevel>0 && userInfo.userVipInfoVO.userCardBG.length > 0) { - self.idLabel.textColor = UIColorFromRGB(0x313131); - self.backImageView.imageUrl = [userInfo.userVipInfoVO.userCardBG stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; - self.effectView.hidden = YES; - self.backImageView.clipsToBounds = NO; - [self.backImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(180); - }]; - } - NSString *resourcePath = [userInfo.userInfoCardPic stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; - if (resourcePath.length > 0) { - - CGFloat nobleMargin = (KScreenWidth - 45) * 45.0 / (KScreenWidth - 90); - [self.vapView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(180); - make.top.mas_equalTo(self.backView).mas_offset(-70); - make.trailing.mas_equalTo(self.backView).offset(nobleMargin*0.5); - make.leading.mas_equalTo(self.backView).mas_offset(-nobleMargin*0.5); - }]; - - NSString *encodingUrl = [resourcePath stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet characterSetWithCharactersInString:@"`#%^{}\"[]|\\<> "].invertedSet]; - @kWeakify(self); - [self.vapParser parseWithURL:encodingUrl completionBlock:^(NSString * _Nullable videoUrl) { - @kStrongify(self); - if (videoUrl.length) { - [self.vapView setMute:YES]; - [self.vapView playHWDMP4:videoUrl repeatCount:-1 delegate:nil]; - } - } failureBlock:^(NSError * _Nullable error) { - }]; - } - } - - self.nobleIconImageView.imageUrl = userInfo.userVipInfoVO.vipIcon; - if (userInfo.userVipInfoVO && userInfo.userVipInfoVO.vipIcon) {//VIPicon - [self.nobleIconImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(30); - }]; - } - NSString * nick = userInfo.nick; -// if (nick.length > 20) { -// nick = [NSString stringWithFormat:@"%@…", [nick substringToIndex:20]]; -// } - self.nickLabel.text = nick.length > 0 ? nick : @""; - self.sexImageView.image = userInfo.gender == GenderType_Female ? [UIImage imageNamed:@"common_female"] : [UIImage imageNamed:@"common_male"]; - self.officialImageView.hidden = userInfo.defUser != UserLevelType_Offical; - self.newUserImageView.hidden = !userInfo.newUser; - if (userInfo.newUser) { - if (userInfo.fromSayHelloChannel) { - self.newUserImageView.image = [UIImage imageNamed:@"room_new_user_greet_new"]; - } else { - self.newUserImageView.image = [UIImage getLanguageImage:@"common_new_user"]; - } - } - if (userInfo.userLevelVo.experUrl) { - self.experImageView.imageUrl = userInfo.userLevelVo.experUrl; - } - self.experImageView.hidden = userInfo.userLevelVo.experUrl.length <= 0; - - if (userInfo.userLevelVo.charmUrl) { - self.charmImageView.imageUrl = userInfo.userLevelVo.charmUrl; - } - self.charmImageView.hidden = userInfo.userLevelVo.charmUrl.length <= 0; - - if (userInfo.userVipInfoVO.nameplateUrl.length > 0) { - self.vipPlateImageView.hidden = NO; - self.vipPlateImageView.imageUrl = userInfo.userVipInfoVO.nameplateUrl; - } else { - self.vipPlateImageView.hidden = YES; - } - - 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]; - self.idLabel.text = text; - - NSString * headwearUrl= userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - self.headWearImageView.hidden = headwearUrl.length <= 0; - self.headWearSVGAImageView.hidden = headwearUrl.length <= 0; - if (headwearUrl.length > 0) { - if ([userInfo isHeadWearSVGA]) { - [self.headWearSVGAImageView setImageName:headwearUrl]; - } else { - NSURL *url = [NSURL URLWithString:headwearUrl]; - @kWeakify(self); - [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { - @kStrongify(self); - self.headWearImageView.image = sprit; - } failureBlock:^(NSError * _Nullable error) { - }]; - } - } - if (userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - self.reportButton.hidden = YES; - } else { - self.reportButton.hidden = NO; - } - if (userInfo.absCardPics.count) { - [self.skillCardView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - }]; - } - - self.skillCardView.dataArray = userInfo.absCardPics; -} - -- (void)onGetFunctionArraySccess:(NSArray *)array { -// if (array.count <= 0) { -// [self.presenter getMicroFunctionItemsByUserInfo:self.cardInfo me:self.control]; -// return; -// } -// self.datasource = array; -// [self.presenter getMicroFunctionItemsByUserInfo:self.cardInfo]; - -} --(void)onGetFollowDataSccess{ - [self.collectionView reloadData]; -} -- (void)onGetMicroFunctionArraySuccess:(NSArray *)array { - if (array.count <= 0) { - if (self.datasource.count > 0){ - self.collectionView.hidden = NO; - [self.collectionView reloadData]; - [self updateCollectionHeight:self.datasource]; - } - - return; - } - -// self.operaStackView.hidden = NO; -// self.sepLineView.hidden = NO; - 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) { - 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 { - ///其实这个遍历 有没有都行 只是为了预防 在vc中修改了数据源中的item 还是判断一下吧 - [self.datasource enumerateObjectsUsingBlock:^(XPUserCardItemModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (item.type == obj.type) { - obj.isSelect = item.isSelect; - *stop = YES; - } - }]; - [self.collectionView reloadData]; -} - -- (void)makeKickUserFinish:(NSError *)error { - if (error == nil && self.targetUserInfo) { - [self dismissViewControllerAnimated:YES completion:nil]; - [self sendCustomMessageKickOrBlackUser:CustomMessageType_Kick_User second:Custom_Message_Sub_Kick_BeKicked]; - } else if (error.code == 404) { - [self showErrorToast:YMLocalizedString(@"XPUserCardViewController1")]; - } -} - -- (void)superAdminKickUserFinish:(NSError *)error { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)markUserManagerFinish:(XPUserCardItemModel *)item error:(NSError *)error { - if (error == nil) { - [self.datasource enumerateObjectsUsingBlock:^(XPUserCardItemModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (item.type == obj.type) { - obj.isSelect = item.isSelect; - *stop = YES; - } - }]; - [self.collectionView reloadData]; - } -} - -- (void)makeUserBlackFinish:(NSError *)error { - if (error == nil && self.targetUserInfo) { - [self dismissViewControllerAnimated:YES completion:nil]; - if (self.cardInfo.position.length > 0) { - NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; - request.key = self.cardInfo.position; - request.roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { - if (error == nil ) { - } - }]; - } - [self sendCustomMessageKickOrBlackUser:CustomMessageType_Kick_User second:Custom_Message_Sub_Kick_BlackList]; - } else if (error.code == 417) { - [self showErrorToast:YMLocalizedString(@"XPUserCardViewController2")]; - } -} - -- (void)lockMicroSusccess { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)muteMicroSusccess { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)kickDownMicroSuccess { - if (self.cardInfo.uid.integerValue != [AccountInfoStorage instance].getUid.integerValue) { - [self sendCustomMessageKickOrBlackUser:CustomMessageType_Queue second:Custom_Message_Sub_Queue_Kick]; - } - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)upMicroSuccess { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)cleanUserGiftValueSuccess:(NSDictionary *)dic { - [self showSuccessToast:YMLocalizedString(@"XPUserCardViewController3")]; - NIMMessage * message = [[NIMMessage alloc] init]; - AttachmentModel * attachMent = [[AttachmentModel alloc] init]; - attachMent.first = CustomMessageType_Room_GiftValue; - attachMent.second = Custom_Message_Sub_Room_GiftValue_Sync; - attachMent.data = dic; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachMent; - message.messageObject = object; - //构造会话 - NSString * sessionId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)roomDatingPickHeartUserSuccess { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)superAdminHandleUserSuccess:(NSString *)opt { - [self showSuccessToast:YMLocalizedString(@"XPUserCardViewController4")]; - [self dismissViewControllerAnimated:YES completion:nil]; - if ([opt isEqualToString:@"-1"]) {///拉黑 - if (self.cardInfo.position.length > 0) { - NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; - request.key = self.cardInfo.position; - request.roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId]; - [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { - if (error == nil ) { - } - }]; - } - [self sendCustomMessageKickOrBlackUser:CustomMessageType_Kick_User second:Custom_Message_Sub_Kick_BlackList]; - } -} - -- (BOOL)shouldHideSendGiftItem { - return self.shouldHideSendGiftItem; -} - -#pragma mark - UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.datasource.count; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - [collectionView deselectItemAtIndexPath:indexPath animated:YES]; - ///自己是公会超管 - BOOL meIsSuperAdmin = NO; - for (GuildSuperAdminInfoModel *managerInfo in self.cardInfo.superMangerList) { - if ([managerInfo.uid isEqualToString:[AccountInfoStorage instance].getUid]) { - meIsSuperAdmin = YES; - } - } - - if (self.datasource.count > 0) { - XPUserCardItemModel * model = [self.datasource xpSafeObjectAtIndex: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: { - // VIP 防 T 权限 - if (self.targetUserInfo.userVipInfoVO.preventKick && - self.targetUserInfo.uid != [AccountInfoStorage instance].getUid.integerValue) { - NSString *message = [NSString stringWithFormat:YMLocalizedString(@"UserCard_1.0.17_0"), @(self.targetUserInfo.userVipInfoVO.vipLevel)]; - [XNDJTDDLoadingTool showErrorWithMessage:message]; - return; - } - 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: - { - if(self.delegate && [self.delegate respondsToSelector:@selector(clickChatAction)]){ - [self.delegate clickChatAction]; - } - [self dismissViewControllerAnimated:YES completion:^{ - UIViewController * controller = (UIViewController *)self.cardInfo.delegate; - XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight) controller:controller]; - halfMessageView.chatUserId = self.cardInfo.uid; - [controller.view addSubview:halfMessageView]; - [UIView animateWithDuration:.35 animations:^{ - CGRect rect = halfMessageView.frame; - rect.origin.y = 0; - halfMessageView.frame = rect; - }]; - }]; - - } - break; - case UserCardItemType_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_Attention: - [self.presenter attentionUser:self.cardInfo.uid status:!model.isSelect]; - break; - case UserCardItemType_KickOut: - { - // 1、判断是否为防被踢用户 - if (self.targetUserInfo.userVipInfoVO.preventKick && - self.targetUserInfo.uid != [AccountInfoStorage instance].getUid.integerValue) { - //2、判断是否为管理员操作 - NSString *message = [NSString stringWithFormat:YMLocalizedString(@"UserCard_1.0.17_0"), @(self.targetUserInfo.userVipInfoVO.vipLevel)]; - [TTPopup alertWithMessage:message confirmHandler:^{ - - } cancelHandler:^{ - }]; - return; - } - if ([self isInSudGame:self.cardInfo.uid]) { - NSString *message = YMLocalizedString(@"XPUserCardViewController8"); - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = @""; - config.message = message; - [TTPopup alertWithConfig:config confirmHandler:^{ - if (meIsSuperAdmin) { -// [self.presenter superAdminKickUser:self.targetUserInfo.nick cardInfo:self.cardInfo isAppAdmin:NO]; - } else { - [self.presenter makeKickUser:self.cardInfo.uid roomId:roomId]; - } - } cancelHandler:^{ - }]; - } else { - NSString *message = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController9"),self.targetUserInfo.nick]; - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPUserCardViewController10"); - config.message = message; - [TTPopup alertWithConfig:config confirmHandler:^{ - if (meIsSuperAdmin) { -// [self.presenter superAdminKickUser:self.targetUserInfo.nick cardInfo:self.cardInfo isAppAdmin:NO]; - } else { - [self.presenter makeKickUser:self.cardInfo.uid roomId:roomId]; - } - } cancelHandler:^{ - }]; - } - } - break; - case UserCardItemType_Black: - { - // 1、判断是否为防被踢用户 - if (self.targetUserInfo.userVipInfoVO.preventKick && - self.targetUserInfo.uid != [AccountInfoStorage instance].getUid.integerValue) { - NSString *message = [NSString stringWithFormat:YMLocalizedString(@"UserCard_1.0.17_0"), @(self.targetUserInfo.userVipInfoVO.vipLevel)]; - [TTPopup alertWithMessage:message confirmHandler:^{ - - } cancelHandler:^{ - }]; -// //2、判断是否为管理员操作 -// if (self.cardInfo.roomInfo.uid != [AccountInfoStorage instance].getUid.integerValue) { -// [self showErrorToast:[NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController11"), self.targetUserInfo.userVipInfoVO.vipName]]; -// } else {//房主操作 -// 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(@"XPUserCardViewController13"); -// TTAlertConfig *config = [[TTAlertConfig alloc] init]; -// config.title = @""; -// config.message = message; -// [TTPopup alertWithConfig:config confirmHandler:^{ -// [self.presenter makeUserBlack:self.cardInfo.uid roomId:roomId]; -// } cancelHandler:^{ -// }]; -// } else { -// [self.presenter makeUserBlack:self.cardInfo.uid roomId:roomId]; -// } -// } cancelHandler:^{ -// }]; -// } - return; - } - if ([self isInSudGame:self.cardInfo.uid]) { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = @""; - 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]; - } else { - [self.presenter makeUserBlack:self.cardInfo.uid roomId:roomId]; - } - } cancelHandler:^{ - }]; - } else { - NSString *title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController15"),self.targetUserInfo.nick]; - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = title; - config.message = YMLocalizedString(@"XPUserCardViewController16"); - [TTPopup alertWithConfig:config confirmHandler:^{ - if (meIsSuperAdmin) { - [self.presenter superAdminHandleUser:self.cardInfo.uid opt:@"-1" roomUid:roomUid isSet:YES]; - }else { - [self.presenter makeUserBlack:self.cardInfo.uid roomId:roomId]; - } - } cancelHandler:^{ - }]; - } - } - break; - case UserCardItemType_Manager: - { - if (meIsSuperAdmin) { - [self.presenter superAdminHandleUser:self.cardInfo.uid opt:@"1" roomUid:roomUid isSet:!model.isSelect]; - } else { - [self.presenter makeUserManager:self.cardInfo.uid roomId:roomId roomUid:roomUid enable:!model.isSelect]; - } - } - break; - case UserCardItemType_Invite_Micro: - { - if ([AccountInfoStorage instance].getUid.integerValue == self.targetUserInfo.uid) { - [self.presenter upMicro:roomId position:model.position userInfo:self.targetUserInfo]; - } else { - if (self.cardInfo.roomInfo.leaveMode && [model.position isEqualToString:@"-1"]) { - return; - } - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - [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; - attachement.data = dic; - - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachement; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:roomId type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; - [self dismissViewControllerAnimated:YES completion:nil]; - } - } - break; - case UserCardItemType_AtUser: - { - if(self.delegate && [self.delegate respondsToSelector:@selector(clickChatAction)]){ - [self.delegate clickChatAction]; - } - if (self.cardInfo.roomInfo.isCloseScreen) { - [self showErrorToast:YMLocalizedString(@"XPUserCardViewController17")]; - return; - } - [self dismissViewControllerAnimated:NO completion:^{ - UIViewController *vc = self.cardInfo.delegate.getCurrentNav.viewControllers[0]; - [XPRoomSendTextView showTextView:vc.view delegate:self.cardInfo.delegate atUid:self.cardInfo.uid atNick:self.targetUserInfo.nick]; - }]; - } - default: - break; - } - } -} - -#pragma mark - UICollectionViewDataSource -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPUserCardItemCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPUserCardItemCollectionViewCell class]) forIndexPath:indexPath]; - cell.itemModel = [self.datasource xpSafeObjectAtIndex:indexPath.item]; - return cell; -} - -#pragma mark - Event Response -- (void)microButtonAction:(UIButton *)sender { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.uid];; - NSString * roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId];; - switch (sender.tag) { - case UserCardMicroType_UpDown: - { - if (sender.selected) { - 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:sender.selected position:self.cardInfo.position]; - break; - case UserCardMicroType_Mute: - [self.presenter microMute:roomUid state:sender.selected 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; - } - default: - break; - } -} -///复制id --(void)copyNameAction{ - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPUserCardViewController24")]; - UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; - pasteboard.string = [NSString stringWithFormat:@"%ld",self.targetUserInfo.erbanNo]; -} - -- (void)reportButtonAction:(UIButton *)sender { - [self dismissViewControllerAnimated:YES completion:nil]; - XPWebViewController *vc = [[XPWebViewController alloc] initWithRoomUID:@(self.cardInfo.roomInfo.uid).stringValue]; - NSString *urlstr = [NSString stringWithFormat:@"%@?reportUid=%@&source=USERCARD",URLWithType(kReportRoomURL),self.cardInfo.uid]; - vc.url = urlstr; - [(UINavigationController *)self.presentingViewController pushViewController:vc animated:YES]; -} - -- (void)closeButtonAction:(UIButton *)sender { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)disMisssVc:(UITapGestureRecognizer *)tap { - [self dismissViewControllerAnimated:YES completion:nil]; -} - -- (void)gotoUserInfoVC:(UITapGestureRecognizer *)tap { - [self dismissViewControllerAnimated:YES completion:nil]; - 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(@"XPUserCardViewController20"), (self.cardInfo.position.intValue + 1)]; - config.message = YMLocalizedString(@"XPUserCardViewController21"); - config.messageColor = UIColorFromRGB(0xFE5D7F); - config.messageFont = [UIFont systemFontOfSize:14]; - [TTPopup alertWithConfig:config confirmHandler:^{ - [self.presenter pickHeartUser:[NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.uid] chosenUserId:self.cardInfo.uid]; - } cancelHandler:^{ - - }]; - } -} - -#pragma mark - Getters And Setters - -- (UIView *)topTapView { - if (!_topTapView) { - _topTapView = [[UIView alloc] init]; - _topTapView.backgroundColor = [UIColor clearColor]; - } - return _topTapView; -} -- (UIView *)bottomTapView { - if (!_bottomTapView) { - _bottomTapView = [[UIView alloc] init]; - _bottomTapView.backgroundColor = [UIColor clearColor]; - } - return _bottomTapView; -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [UIColor whiteColor]; - _backView.layer.masksToBounds = YES; - _backView.layer.cornerRadius = 12; - } - return _backView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisVertical; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentCenter; - _stackView.spacing = 0; - } - return _stackView; -} - -- (UIView *)userInfoView { - if (!_userInfoView) { - _userInfoView = [[UIView alloc] init]; - _userInfoView.backgroundColor = [UIColor clearColor]; - } - return _userInfoView; -} - -- (UIVisualEffectView *)effectView { - if (!_effectView) { - UIBlurEffect *effect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; - _effectView = [[UIVisualEffectView alloc]initWithEffect:effect]; - _effectView.backgroundColor = [UIColor clearColor]; - } - return _effectView; -} - -- (NetImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[NetImageView alloc] init]; - _backImageView.backgroundColor = [UIColor clearColor]; - _backImageView.userInteractionEnabled = YES; - _backImageView.contentMode = UIViewContentModeScaleAspectFill; - _backImageView.image = [UIImageConstant defaultAvatarPlaceholder]; - } - return _backImageView; -} - -- (NetImageView *)nobleImageView { - if (!_nobleImageView) { - _nobleImageView = [[NetImageView alloc] init]; - _nobleImageView.backgroundColor = [UIColor clearColor]; - _nobleImageView.contentMode = UIViewContentModeScaleToFill; - _nobleImageView.layer.masksToBounds = YES; - } - return _nobleImageView; -} - -- (UIButton *)reportButton { - if (!_reportButton) { - _reportButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_reportButton setTitle:YMLocalizedString(@"XPUserCardViewController22") forState:UIControlStateNormal]; - [_reportButton setTitleColor:[DJDKMIMOMColor userNickColor] forState:UIControlStateNormal]; - _reportButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_reportButton addTarget:self action:@selector(reportButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _reportButton; -} - -- (UIButton *)closeButton { - if (!_closeButton) { - _closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_closeButton setImage:[UIImage imageNamed:@"usercard_close"] forState:UIControlStateNormal]; - [_closeButton setImage:[UIImage imageNamed:@"usercard_close"] forState:UIControlStateSelected]; - [_closeButton addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _closeButton; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserIcon; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.userInteractionEnabled = YES; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 25; - _avatarImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _avatarImageView; -} - -- (UILabel *)nickLabel { - if (!_nickLabel) { - _nickLabel = [[UILabel alloc] init]; - _nickLabel.font = [UIFont systemFontOfSize:15]; -// _nickLabel.minimumScaleFactor = 0.7; - _nickLabel.lineBreakMode = NSLineBreakByTruncatingTail; - _nickLabel.textColor = [DJDKMIMOMColor userNickColor]; - } - return _nickLabel; -} - -- (UIImageView *)sexImageView { - if (!_sexImageView) { - _sexImageView = [[UIImageView alloc] init]; - _sexImageView.userInteractionEnabled = YES; - } - return _sexImageView; -} - -- (UIStackView *)tagStackView { - if (!_tagStackView) { - _tagStackView = [[UIStackView alloc] init]; - _tagStackView.axis = UILayoutConstraintAxisHorizontal; - _tagStackView.distribution = UIStackViewDistributionFill; - _tagStackView.alignment = UIStackViewAlignmentCenter; - _tagStackView.spacing = 2; - } - return _tagStackView; -} -- (NetImageView *)experImageView { - if (!_experImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _experImageView = [[NetImageView alloc] initWithConfig:config]; - _experImageView.userInteractionEnabled = YES; - _experImageView.hidden = YES; - _experImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _experImageView; -} - -- (NetImageView *)charmImageView { - if (!_charmImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _charmImageView = [[NetImageView alloc] initWithConfig:config]; - _charmImageView.userInteractionEnabled = YES; - _charmImageView.hidden = YES; - _charmImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _charmImageView; -} - -- (NetImageView *)nobleIconImageView { - if (!_nobleIconImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _nobleIconImageView = [[NetImageView alloc] initWithConfig:config]; - _nobleIconImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _nobleIconImageView; -} - -- (UIView *)namePlateView { - if (!_namePlateView) { - _namePlateView = [[UIView alloc] init]; - _namePlateView.backgroundColor = [UIColor clearColor]; - _namePlateView.hidden = YES; - } - return _namePlateView; -} - -- (NetImageView *)nameplateImageView { - if (!_nameplateImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _nameplateImageView = [[NetImageView alloc] initWithConfig:config]; - _nameplateImageView.userInteractionEnabled = YES; - _nameplateImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _nameplateImageView; -} - -- (NetImageView *)vipPlateImageView { - if (!_vipPlateImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - config.imageType = ImageTypeUserCardLevel; - _vipPlateImageView = [[NetImageView alloc] initWithConfig:config]; - _vipPlateImageView.userInteractionEnabled = YES; - _vipPlateImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _vipPlateImageView; -} - -- (UILabel *)nameplateLabel { - if (!_nameplateLabel) { - _nameplateLabel = [[UILabel alloc] init]; - _nameplateLabel.font = [UIFont systemFontOfSize:10]; - _nameplateLabel.textAlignment = NSTextAlignmentCenter; - _nameplateLabel.textColor = [DJDKMIMOMColor userNickColor]; - } - return _nameplateLabel; -} - -- (UIImageView *)newUserImageView { - if (!_newUserImageView) { - _newUserImageView = [[UIImageView alloc] init]; - _newUserImageView.userInteractionEnabled = YES; - _newUserImageView.image = [UIImage getLanguageImage:@"common_new_user"]; - _newUserImageView.hidden = YES; - } - return _newUserImageView; -} - -- (UIImageView *)officialImageView { - if (!_officialImageView) { - _officialImageView = [[UIImageView alloc] init]; - _officialImageView.userInteractionEnabled = YES; - _officialImageView.image = [UIImage imageNamed:@"app_admin_icon"]; - _officialImageView.hidden = YES; - } - return _officialImageView; -} - -- (UILabel *)idLabel { - if (!_idLabel) { - _idLabel = [[UILabel alloc] init]; - _idLabel.font = [UIFont systemFontOfSize:10]; - _idLabel.textColor = UIColorFromRGB(0x313131); - _idLabel.userInteractionEnabled = YES; - UITapGestureRecognizer *longPress = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(copyNameAction)]; - - [_idLabel addGestureRecognizer:longPress]; - - } - return _idLabel; -} - -- (XPUserCardSkillCardView *)skillCardView { - if (!_skillCardView) { - _skillCardView = [[XPUserCardSkillCardView alloc] init]; - _skillCardView.backgroundColor = [UIColor clearColor]; - } - return _skillCardView; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.itemSize = CGSizeMake((KScreenWidth - 45 * 2)/ 4, 55); - layout.minimumLineSpacing = 16; - layout.minimumInteritemSpacing = 0; - layout.sectionInset = UIEdgeInsetsMake(16, 0, 10, 0); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.hidden = YES; - _collectionView.backgroundColor = [UIColor whiteColor]; - [_collectionView setCornerRadius:16 cornerMask:kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner]; - [_collectionView registerClass:[XPUserCardItemCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPUserCardItemCollectionViewCell class])]; - } - return _collectionView; -} - -- (UIView *)sepLineView { - if (!_sepLineView) { - _sepLineView = [[UIView alloc] init]; - _sepLineView.backgroundColor = [DJDKMIMOMColor userDividerColor]; - _sepLineView.hidden = YES; - } - return _sepLineView; -} - -- (UIStackView *)operaStackView { - if (!_operaStackView) { - _operaStackView = [[UIStackView alloc] init]; - _operaStackView.axis = UILayoutConstraintAxisHorizontal; - _operaStackView.distribution = UIStackViewDistributionFillProportionally; - _operaStackView.alignment = UIStackViewAlignmentFill; - _operaStackView.spacing = 0; - _operaStackView.hidden = YES; - _operaStackView.backgroundColor = [UIColor orangeColor]; - } - return _operaStackView; -} - -- (SpriteSheetImageManager *)manager { - if (!_manager) { - _manager = [[SpriteSheetImageManager alloc] init]; - } - return _manager; -} - -- (YYAnimatedImageView *)headWearImageView { - if (!_headWearImageView) { - _headWearImageView = [[YYAnimatedImageView alloc] init]; - _headWearImageView.backgroundColor = [UIColor clearColor]; - _headWearImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _headWearImageView; -} - -- (SVGAImageView *)headWearSVGAImageView { - if (!_headWearSVGAImageView) { - _headWearSVGAImageView = [[SVGAImageView alloc]init]; - _headWearSVGAImageView.backgroundColor = [UIColor clearColor]; - _headWearSVGAImageView.frame = CGRectZero; - _headWearSVGAImageView.userInteractionEnabled = NO; - _headWearSVGAImageView.autoPlay = YES; - } - return _headWearSVGAImageView; -} - -- (UIView *)pickHeartView { - if (!_pickHeartView) { - _pickHeartView = [[UIView alloc] init]; - _pickHeartView.backgroundColor = [UIColor clearColor]; - _pickHeartView.hidden = YES; - } - return _pickHeartView; -} - -- (UIButton *)pickHeartButton { - if (!_pickHeartButton) { - _pickHeartButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_pickHeartButton setTitle:YMLocalizedString(@"XPUserCardViewController23") forState:UIControlStateNormal]; - [_pickHeartButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _pickHeartButton.titleLabel.font = [UIFont systemFontOfSize:13]; - [_pickHeartButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFA7186), UIColorFromRGB(0xFA4972)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - _pickHeartButton.layer.masksToBounds = YES; - _pickHeartButton.layer.cornerRadius = 15; - [_pickHeartButton addTarget:self action:@selector(pickHeartButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _pickHeartButton; -} - -- (VAPView *)vapView { - if (!_vapView) { - _vapView = [[VAPView alloc] init]; - _vapView.contentMode = UIViewContentModeScaleAspectFill; - _vapView.userInteractionEnabled = NO; - } - return _vapView; -} - -- (XPRoomGiftAnimationParser *)vapParser { - if (!_vapParser) { - _vapParser = [[XPRoomGiftAnimationParser alloc] init]; - _vapView.userInteractionEnabled = NO; - } - return _vapParser; -} - -- (UIButton *)copyIDButton { - if (!_copyIDButton) { - UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom]; - [b setImage:kImage(@"user_card_copy") forState:UIControlStateNormal]; - [b addTarget:self - action:@selector(copyNameAction) - forControlEvents:UIControlEventTouchUpInside]; - _copyIDButton = b; - } - - return _copyIDButton; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/XPMiniRoomView.h b/YuMi/Modules/YMRoom/View/XPMiniRoomView.h deleted file mode 100644 index 4d7f98d..0000000 --- a/YuMi/Modules/YMRoom/View/XPMiniRoomView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// XPMiniRoomView.h -// YuMi -// -// Created by YuMi on 2021/12/3. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomInfoModel, UserInfoModel; -@interface XPMiniRoomView : UIView -///进房需要的控制器 -@property (nonatomic,weak) UIViewController * controller; -///房间最小化 初始化 -- (void)configRoomMiniView:(RoomInfoModel *)roomInfo userInfo:(UserInfoModel *)userInfo micQueue:(NSMutableDictionary *)micQueue; -///隐藏最小化的view -- (void)hiddenRoomMiniView; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/XPMiniRoomView.m b/YuMi/Modules/YMRoom/View/XPMiniRoomView.m deleted file mode 100644 index 31bef3e..0000000 --- a/YuMi/Modules/YMRoom/View/XPMiniRoomView.m +++ /dev/null @@ -1,891 +0,0 @@ -// -// XPMiniRoomView.m -// YuMi -// -// Created by YuMi on 2021/12/3. -// - -#import "XPMiniRoomView.h" -///Third -#import -#import -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "RtcManager.h" -#import "UIButton+EnlargeTouchArea.h" -#import "TTPopup.h" -#import "XNDJTDDLoadingTool.h" -#import "XPRoomMiniManager.h" -#import "AccountInfoStorage.h" -#import "Api+ArrangeMic.h" -#import "Api+Room.h" -#import "XPCoreDataManager.h" -#import "NSArray+Safe.h" -#import "NSDate+DateUtils.h" -///Model -#import "RoomInfoModel.h" -#import "MicroQueueModel.h" -#import "MicroStateModel.h" -#import "UserInfoModel.h" -#import "AttachmentModel.h" -#import "ArrangeMicModel.h" -#import "RoomFaceSendInfoModel.h" -#import "MicroInviteExtModel.h" -#import "Music+CoreDataClass.h" -#import "RoomPKChooseUserModel.h" -#import "RoomSailingPrizeModel.h" -///View -#import "XPRoomViewController.h" -#import "XPNoteView.h" -#import "XPSkillCardPlayerManager.h" - -UIKIT_EXTERN NSString * kRoomBackMusicPlayMusicFinishKey; -UIKIT_EXTERN NSString * kRoomBackMusicAudioMixingVolumeKey; -UIKIT_EXTERN NSString * kRoomBackMusicCaptureVolumeKey; -UIKIT_EXTERN NSString * kRoomBackMusicPlayMusicOrderKey; -UIKIT_EXTERN NSString *kRoomKickoutTime; - -@interface XPMiniRoomView () -///底部的底图 -@property (nonatomic,strong) UIImageView *backImageView; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///返回 -@property (nonatomic,strong) UIButton *backBtn; - -/// -@property (nonatomic,strong) UIImageView *playView; -///房间最小化 -@property (nonatomic,strong) RoomInfoModel *roomInfo; -///房间最小化的时候 传入的用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -///当前最小化的房间的uid 如果没有的话 为nil -@property (nonatomic,strong) NSString *currentRoomUid; -///房间的id -@property (nonatomic,strong) NSString *currentRoomId; -///麦序 -@property (nonatomic, strong) NSMutableDictionary *micQueue; -///正在播放的音乐 -@property (nonatomic,strong) Music *currentMusic; -///当前的下表 -@property (nonatomic,assign) NSInteger currentIndex; -///数据库请求 -@property (nonatomic,strong) NSFetchRequest *request; -///音符 -@property (nonatomic,strong) XPNoteView *noteView; - -@end - - -@implementation XPMiniRoomView - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [[NIMSDK sharedSDK].chatroomManager addDelegate:self]; - [[NIMSDK sharedSDK].chatManager addDelegate:self]; - [[NIMSDK sharedSDK].loginManager addDelegate:self]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(roomBackMusicPlayFinish:) name:kRoomBackMusicPlayMusicFinishKey object:nil]; - [self initEvents]; - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} -#pragma mark - Public Method -- (void)configRoomMiniView:(RoomInfoModel *)roomInfo userInfo:(UserInfoModel *)userInfo micQueue:(NSMutableDictionary *)micQueue { - self.hidden = NO; - self.currentRoomUid = [NSString stringWithFormat:@"%ld", roomInfo.uid]; - self.currentRoomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - self.roomInfo = roomInfo; - self.userInfo = userInfo; - self.micQueue = micQueue; - [self startAvatarAnimation]; - } - -- (void)hiddenRoomMiniView { - [self.avatarImageView.layer removeAllAnimations]; - - self.currentRoomUid = nil; - self.currentRoomId = nil; - self.roomInfo = nil; - self.userInfo = nil; - self.micQueue = nil; - self.hidden = YES; -} - -#pragma mark - Private Method -- (void)initSubViews { - self.frame = CGRectMake(KScreenWidth - 74, KScreenHeight - kNavigationHeight - kTabBarHeight - 140, 67, 75); - - [self addSubview:self.backImageView]; - - [self.backImageView addSubview:self.avatarImageView]; - [self.backImageView addSubview:self.playView]; - [self.backImageView addSubview:self.noteView]; - [self addSubview:self.backBtn]; - self.backImageView.layer.cornerRadius = 57/2; - self.backImageView.layer.masksToBounds = YES; - self.backImageView.layer.borderWidth = 2; - self.backImageView.layer.borderColor = [UIColor whiteColor].CGColor; -} - -- (void)initSubViewConstraints { - - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.bottom.equalTo(self); - make.width.height.mas_equalTo(57); - }]; - - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.backImageView); - }]; - [self.noteView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.avatarImageView); - make.height.mas_equalTo(14); - make.width.mas_equalTo(20); - }]; - - [self.playView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.equalTo(self.backImageView); - make.width.mas_equalTo(15); - make.height.mas_equalTo(12); - }]; - [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(20); - make.leading.equalTo(self.backImageView.mas_leading).mas_offset(47); - make.bottom.equalTo(self.backImageView.mas_bottom).mas_offset(-50); - }]; -} - - -- (void)initEvents { - UIPanGestureRecognizer *pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(roomMiniTag:)]; - pan.delaysTouchesBegan = YES; - [self addGestureRecognizer:pan]; - - UITapGestureRecognizer *enterRoomTag = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(enterRomRecognizer:)]; - [self addGestureRecognizer:enterRoomTag]; -} - -- (void)startAvatarAnimation { - CABasicAnimation *rotationAnimation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"]; - rotationAnimation.toValue = [NSNumber numberWithFloat: M_PI * 2.0 ]; - rotationAnimation.duration = 3; - rotationAnimation.cumulative = YES; - rotationAnimation.repeatCount = MAXFLOAT; - rotationAnimation.removedOnCompletion = NO; - [self.avatarImageView.layer addAnimation:rotationAnimation forKey:@"rotationAnimation"]; -} - -- (void)cancelRoomArrangeMic { - ///退出排麦 - if (self.roomInfo.roomModeType == RoomModeType_Open_Micro_Mode || self.roomInfo.roomModeType == RoomModeType_Open_Blind) { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getRoomArrangeMicList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - ArrangeMicModel * arrangeMicModel= [ArrangeMicModel modelWithJSON:data.data]; - if (arrangeMicModel.myPos.intValue > 0) { - __block NSString * grouptype = @"0"; - if (self.roomInfo.roomModeType == RoomModeType_Open_Blind) { - [arrangeMicModel.queue enumerateObjectsUsingBlock:^(ArrangeMicUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - grouptype = [NSString stringWithFormat:@"%ld", obj.groupType]; - *stop = YES; - } - }]; - } - [Api cancelArrangeMic:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {} roomUid:roomUid operUid:uid groupType:grouptype]; - } - } - } roomUid:roomUid operUid:uid page:@"1" pageSize:@"50"]; - }else if(self.roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getRoomPKUserList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - ArrangeMicModel * arrangeMicModel= [ArrangeMicModel modelWithJSON:data.data]; - if (arrangeMicModel.myPos.intValue > 0) { - __block NSString * grouptype = @"0"; - [arrangeMicModel.queue enumerateObjectsUsingBlock:^(ArrangeMicUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - grouptype = [NSString stringWithFormat:@"%ld", obj.groupType]; - *stop = YES; - } - }]; - [Api cancelRoomPKArrangeMic:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - } roomUid:roomUid operUid:uid groupType:grouptype]; - } - } - } roomUid:roomUid operUid:uid page:@"1" pageSize:@"50"]; - } -} - -///自定义消息 是否可以加到 公屏 需要自己维护 -- (BOOL)isCanDisplayMessage:(NIMMessage *)message { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_Face && attachment.second == Custom_Message_Sub_Face_Send) { - if ([attachment.data[@"data"] isKindOfClass:[NSArray class]]) { - NSArray * array = [RoomFaceSendInfoModel modelsWithArray:attachment.data[@"data"]]; - for (int i = 0; i< array.count; i++) { - RoomFaceSendInfoModel * sendInfo = [array xpSafeObjectAtIndex:i]; - if (sendInfo.resultIndexes.count <=0) { - return NO; - } - } - } - }else if (attachment.first == CustomMessageType_Room_PK && attachment.second == Custom_Message_Sub_Room_PK_Manager_Up_Mic) { - if (attachment.data && [attachment.data allKeys].count > 0) { - for (NSDictionary * dic in [attachment.data allValues]) { - RoomPKChooseUserModel * userModel = [RoomPKChooseUserModel modelWithDictionary:dic]; - if (userModel.groupType == GroupType_Red || userModel.groupType == GroupType_Blue) { - return YES; - } - } - } - return NO; - } else if(attachment.first == CustomMessageType_Room_Sailing && (attachment.second == Custom_Message_Sub_Sailing_AllRoom_Notify || attachment.second == Custom_Message_Sub_Sailing_InRoom_NeedAllMicSend)) { - RoomSailingPrizeModel * prizeModel = [RoomSailingPrizeModel modelWithDictionary:attachment.data]; - if (self.userInfo.userLevelVo.experLevelSeq > prizeModel.userLevelLimit) { - return YES; - } - } - return [[[self supportMessageDic] objectForKey:@(attachment.first)] containsObject:@(attachment.second)]; - } - return NO; -} - -- (NSDictionary *)supportMessageDic { - return @{ - @(CustomMessageType_AllMicroSend): - [NSSet setWithObjects: - @(Custom_Message_Sub_AllMicroSend), - @(Custom_Message_Sub_AllMicroLuckySend), - @(Custom_Message_Sub_AllBatchSend), - @(Custom_Message_Sub_AllBatchMicroLuckySend), - nil], - @(CustomMessageType_Gift): - [NSSet setWithObjects: - @(Custom_Message_Sub_Gift_Send), - @(Custom_Message_Sub_Gift_LuckySend), - nil], - @(CustomMessageType_Room_Tip): - [NSSet setWithObjects: - @(Custom_Message_Sub_Room_Tip_ShareRoom), - @(Custom_Message_Sub_Room_Tip_Attention_Owner), - nil], - @(CustomMessageType_Kick_User): - [NSSet setWithObjects: - @(Custom_Message_Sub_Kick_BeKicked), - @(Custom_Message_Sub_Kick_BlackList), - nil], - @(CustomMessageType_Queue): - [NSSet setWithObjects: - @(Custom_Message_Sub_Queue_Kick), - nil], - @(CustomMessageType_Look_Love): - [NSSet setWithObjects: - @(Custom_Message_Sub_Look_Love_Me), - @(Custom_Message_Sub_Look_Love_InRoom), - @(Custom_Message_Sub_Look_Love_AllRoom), - @(Custom_Message_Sub_Look_Love_AllRoom_Notify), - @(Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend), - nil], - @(CustomMessageType_Arrange_Mic): - [NSSet setWithObjects: - @(Custom_Message_Sub_Arrange_Mic_Mode_Open), - @(Custom_Message_Sub_Arrange_Mic_Mode_Close), - @(Custom_Message_Sub_Arrange_Mic_Free_Mic_Open), - @(Custom_Message_Sub_Arrange_Mic_Free_Mic_Close), - nil], - @(CustomMessageType_Update_RoomInfo): - [NSSet setWithObjects: - @(Custom_Message_Sub_Update_RoomInfo_MessageState), - @(Custom_Message_Sub_Update_RoomInfo_AnimateEffect), - nil], - @(CustomMessageType_Collection_Room): - [NSSet setWithObjects: - @(Custom_Message_Sub_Collect_Room_Tips), - nil], - @(CustomMessageType_RoomPlay_Dating): - [NSSet setWithObjects: - @(Custom_Message_Sub_Room_Play_Dating_Pick_Heart), - @(Custom_Message_Sub_Room_Play_Dating_Result_Mutual), - @(Custom_Message_Sub_Room_Play_Dating_Result_Not_Mutual), - nil], - @(CustomMessageType_Noble_VIP): - [NSSet setWithObjects: - @(Custom_Message_Sub_Room_Open_Noble_VIP), - @(Custom_Message_Sub_Room_Noble_LevelUp), - @(Custom_Message_Sub_AllRoom_Noble_LevelUp_Suspend), - nil], - @(CustomMessageType_Face): - [NSSet setWithObjects: - @(Custom_Message_Sub_Face_Send), - nil], - @(CustomMessageType_Anchor_FansTeam): - [NSSet setWithObjects: - @(Custom_Message_Sub_FansTeam_Open_Success), - @(Custom_Message_Sub_FansTeam_Open_Fail), - @(Custom_Message_Sub_FansTeam_Join_Success), - @(Custom_Message_Sub_FansTeam_Out_Success), - nil], - @(CustomMessageType_Hall_Super_Admin): - [NSSet setWithObjects: - @(Custom_Message_Sub_Hall_Super_Admin_Kick_Manager_Out_Room), - nil], - @(CustomMessageType_Room_PK): - [NSSet setWithObjects: - @(Custom_Message_Sub_Room_PK_Manager_Up_Mic), - @(Custom_Message_Sub_Room_PK_Mode_Close), - @(Custom_Message_Sub_Room_PK_Result), - @(Custom_Message_Sub_Room_PK_Mode_Open), - @(Custom_Message_Sub_Room_PK_Start), - @(Custom_Message_Sub_Room_PK_Re_Start), - nil], - @(CustomMessageType_LuckyBag): - [NSSet setWithObjects: - @(Custom_Message_Sub_Room_Gift_LuckBag_Server), - nil], - @(CustomMessageType_Gift_Compound): - [NSSet setWithObjects:@(Custom_Message_Sub_Gift_Compound), - nil], - @(CustomMessageType_Room_Sailing): - [NSSet setWithObjects: - @(Custom_Message_Sub_Sailing_Me), - @(Custom_Message_Sub_Sailing_InRoom), - @(Custom_Message_Sub_Sailing_AllRoom), - @(Custom_Message_Sub_Sailing_AllRoom_Notify), - @(Custom_Message_Sub_Sailing_InRoom_NeedAllMicSend), - nil], - }; -} - -#pragma mark - NIMChatroomManagerDelegate -- (void)chatroomBeKicked:(NIMChatroomBeKickedResult *)result { - ///如果不是最小化的是 没必要监听 - if ([XPRoomMiniManager shareManager].getRoomInfo == nil) return; - if (result.reason == 2) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMiniRoomView0")]; - } else if (result.reason == 5) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMiniRoomView1")]; - } - [[XPRoomMiniManager shareManager] configRoomInfo:nil]; - [[XPRoomMiniManager shareManager] configUserInfo:nil]; - [[XPRoomMiniManager shareManager] configCurrentMusic:nil isPlaying:NO]; - [[XPRoomMiniManager shareManager] resetLocalMessage]; - [[RtcManager instance] exitRoom]; - [self cancelRoomArrangeMic]; - [self hiddenRoomMiniView]; - NSMutableDictionary *kickoutDic = [[NSUserDefaults standardUserDefaults]valueForKey:kRoomKickoutTime]; - if(kickoutDic == nil){ - kickoutDic = [NSMutableDictionary new]; - } - NSString *time = [NSDate getNowTimeTimestamp]; - [kickoutDic setValue:time forKey:@(self.roomInfo.roomId).stringValue]; - [[NSUserDefaults standardUserDefaults]synchronize]; -} - -#pragma mark - NIMLoginManagerDelegate -- (void)onKickout:(NIMLoginKickoutResult *)result { - ///如果不是最小化的是 没必要监听 - if ([XPRoomMiniManager shareManager].getRoomInfo == nil) return; - [[XPRoomMiniManager shareManager] configRoomInfo:nil]; - [[XPRoomMiniManager shareManager] configUserInfo:nil]; - [[XPRoomMiniManager shareManager] configCurrentMusic:nil isPlaying:NO]; - [[XPRoomMiniManager shareManager] resetLocalMessage]; - [[RtcManager instance] exitRoom]; - [self hiddenRoomMiniView]; -} -#pragma mark - NIMChatManagerDelegate -- (void)onRecvMessages:(NSArray *)messages { - ///如果不是最小化的是 没必要监听 - if ([XPRoomMiniManager shareManager].getRoomInfo == nil) return; - - for (NIMMessage * message in messages) { - // 非房间内消息不处理 - if (message.session.sessionType != NIMSessionTypeChatroom) { - continue; - } - - // 非本房间不处理 - if (![message.session.sessionId isEqualToString:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId]]) { - continue; - } - - if (message.messageType == NIMMessageTypeNotification) { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - if (![notiMsg.content isKindOfClass:[NIMChatroomNotificationContent class]]) { - return; - } - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - [self handleNIMNotificationMessage:content]; - [self handleNIMNotificationSaveMessage:message]; - } else if (message.messageType == NIMMessageTypeCustom) { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - [self handleNIMCustomMessage:obj.attachment]; - if ([self isCanDisplayMessage:message]) { - [[XPRoomMiniManager shareManager] saveRoomMessage:message]; - } - } - }else if(message.messageType == NIMMessageTypeText) { - [self handleNIMTextMessage:message]; - } else if(message.messageType == NIMMessageTypeTip) { - [self handleNIMTextMessage:message]; - } - } -} - -- (void)handleNIMNotificationMessage:(NIMChatroomNotificationContent *)content { - BOOL microQueueChanged = NO; - switch (content.eventType) { - case NIMChatroomEventTypeInfoUpdated: // 麦序状态更新 - { - NSDictionary *data = [content.notifyExt toJSONObject]; - int type = [data[@"type"] intValue]; - NSArray* microStates; - switch (type) { - case 2: - microStates = @[[MicroStateModel modelWithJSON:data[@"micInfo"]]]; - break; - case 3: - microStates = [MicroStateModel modelsWithArray:data[@"micInfo"]]; - break; - } - if (microStates && microStates.count > 0) { - for (MicroStateModel *microState in microStates) { - MicroQueueModel *micSequence = [self.micQueue objectForKey:[NSString stringWithFormat:@"%d", microState.position]]; - micSequence.microState = microState; - } - microQueueChanged = YES; - } - - NSMutableDictionary *lastRoomInfoDic = [NSMutableDictionary dictionaryWithDictionary:[self.roomInfo model2dictionary]]; - [lastRoomInfoDic addEntriesFromDictionary: ((NSString *)data[@"roomInfo"]).toJSONObject]; - RoomInfoModel *newRoomInfo = [RoomInfoModel modelWithJSON:lastRoomInfoDic]; - - if (newRoomInfo.type != RoomType_MiniGame) { - newRoomInfo.mgId = 0; - } - if (newRoomInfo.roomModeType == RoomModeType_Open_Blind && self.roomInfo.roomModeType != RoomModeType_Open_Blind) { - ///普通房 切换为相亲房 - newRoomInfo.datingState = RoomDatingStateChangeType_Open; - } else if(newRoomInfo.roomModeType != RoomModeType_Open_Blind && self.roomInfo.roomModeType == RoomModeType_Open_Blind) { - ///关闭了相亲房 - newRoomInfo.datingState = RoomDatingStateChangeType_Close; - } else { - newRoomInfo.datingState = RoomDatingStateChangeType_Normal; - } - self.roomInfo = newRoomInfo; - } - break; - - case NIMChatroomEventTypeQueueChange: // 麦序上下麦 - { - NSDictionary* data = (NSDictionary *)content.ext; - NSString* position = [data objectForKey:NIMChatroomEventInfoQueueChangeItemKey]; - UserInfoModel* userInfo = [UserInfoModel modelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]]; - NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue]; - - // 先清除该用户旧的麦位 - for (MicroQueueModel *sequence in self.micQueue.allValues) { - if (userInfo.uid == sequence.userInfo.uid) { - sequence.userInfo = nil; - } - } - - if (changeType == 1) { // 上麦 - MicroQueueModel *sequence = [self.micQueue objectForKey:position]; - sequence.userInfo = userInfo; - } - - microQueueChanged = YES; - } - break; - case NIMChatroomEventTypeExit: - case NIMChatroomEventTypeKicked: - { - for (NIMChatroomNotificationMember *member in content.targets) { - for (MicroQueueModel *sequence in self.micQueue.allValues) { - if (member.userId.integerValue == sequence.userInfo.uid) { - sequence.userInfo = nil; - microQueueChanged = YES; - } - } - } - } - break; - default: - break; - } - - if (microQueueChanged) { - [self microQueueUpdated]; - } -} - -- (void)microQueueUpdated { - BOOL selfNeedBroadcast = NO; - for (int i = 0; i < self.micQueue.allKeys.count; i++) { - MicroQueueModel * model = [self.micQueue objectForKey:[NSString stringWithFormat:@"%d", i]]; - if (model.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - selfNeedBroadcast = model.microState.micState == MicroMicStateType_Open; - } - } - if (self.roomInfo.type == RoomType_Anchor && [[AccountInfoStorage instance].getUid isEqualToString:[NSString stringWithFormat:@"%ld", self.roomInfo.uid]]) { - selfNeedBroadcast = YES;///个播房房主默认角色为主播 - } - [[RtcManager instance] broadcast:selfNeedBroadcast]; -} - -- (void)handleNIMCustomMessage:(AttachmentModel *)attachment { - if(attachment.first == CustomMessageType_Queue && attachment.second == Custom_Message_Sub_Queue_Invite) { - NSDictionary *dic = attachment.data; - MicroInviteExtModel *inviteModel = [MicroInviteExtModel modelWithDictionary:dic]; - if (inviteModel.uid.integerValue == self.userInfo.uid) { - NSString *position = inviteModel.micPosition; - - MicroQueueModel *micro = [self.micQueue objectForKey:position]; - if (!micro || micro.userInfo) return; // 当前麦位有人，什么都不做。 - - RoomInfoModel* roomInfo = self.roomInfo; - NSString* roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; - UserInfoModel* userInfo = self.userInfo; - - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = position; - request.value = [[self configUpdateChatRoomQueueExt:userInfo] toJSONString]; - request.roomId = roomId; - request.transient = YES; - - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - if (error) return; - [self cancelRoomArrangeMic]; - [RtcManager instance].localMuted = YES; - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPMiniRoomView2"); - config.message =YMLocalizedString(@"XPMiniRoomView3"); - [TTPopup alertWithConfig:config confirmHandler:^{ - - } cancelHandler:^{ - - }]; - }]; - } - } else if (attachment.first == CustomMessageType_Update_RoomInfo && attachment.second == Custom_Message_Sub_Update_RoomInfo_MessageState) { - [[XPRoomMiniManager shareManager] resetLocalMessage]; - } -} - -#pragma mark - 最小化 公屏的显示问题 -///添加信息 -- (void)addRoomMessage:(NIMMessage *)message { - if (self.roomInfo.isCloseScreen) { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_Update_RoomInfo && attachment.second == Custom_Message_Sub_Update_RoomInfo_MessageState){ - [[XPRoomMiniManager shareManager] saveRoomMessage:message]; - } - } - } else { - [[XPRoomMiniManager shareManager] saveRoomMessage:message]; - } -} - -- (void)handleNIMNotificationSaveMessage:(NIMMessage *)message { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - RoomInfoModel * roomInfo = self.roomInfo; - if (content.eventType == NIMChatroomEventTypeEnter) { - if (roomInfo.isCloseScreen) { - AttachmentModel *attachement = [[AttachmentModel alloc]init]; - attachement.first = CustomMessageType_Update_RoomInfo; - attachement.second = Custom_Message_Sub_Update_RoomInfo_MessageState; - attachement.data = @{@"roomInfo":self.roomInfo.model2dictionary}; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachement; - message.messageObject = object; - [self addRoomMessage:message]; - return; - } else { - [self addRoomMessage:message]; - NIMChatroomNotificationMember *member = content.targets[0]; - if (member.userId.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - if (!roomInfo.hasAnimationEffect) { - [self roomInfoNoGiftAnimationMessage:message]; - } - } - } - } else if(content.eventType == NIMChatroomEventTypeInfoUpdated) { - if (roomInfo.isCloseScreen) {return;} - if (roomInfo.datingState == RoomDatingStateChangeType_Open) { - [self addRoomMessage:message]; - } - } -} - -- (void)handleNIMTextMessage:(NIMMessage *)message { - [self addRoomMessage:message]; -} - -- (void)roomInfoNoGiftAnimationMessage:(NIMMessage *)message { - AttachmentModel *attachement = [[AttachmentModel alloc]init]; - attachement.first = CustomMessageType_Update_RoomInfo; - attachement.second = Custom_Message_Sub_Update_RoomInfo_AnimateEffect; - NIMMessage *tempMessage = [[NIMMessage alloc]init]; - NIMCustomObject *customObject = [[NIMCustomObject alloc]init]; - customObject.attachment = attachement; - tempMessage.messageObject = customObject; - [self addRoomMessage:tempMessage]; -} - -- (NSDictionary *)configUpdateChatRoomQueueExt:(UserInfoModel *)userInfo { - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - [dic setValue:@(userInfo.gender) forKey:@"gender"]; - [dic setValue:userInfo.avatar forKey:@"avatar"]; - [dic setValue:@(userInfo.uid) forKey:@"uid"]; - [dic setValue:userInfo.nick forKey:@"nick"]; - NSString * headWearUrl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - if (headWearUrl.length > 0) { - [dic setValue:headWearUrl forKey:@"headWearUrl"]; - } - if (userInfo.micCircle.length) { - [dic setValue:userInfo.micCircle forKey:@"micCircle"]; - } - if (userInfo.micNickColor.length) { - [dic setValue:userInfo.micNickColor forKey:@"micNickColor"]; - } - [dic setValue:@(userInfo.userVipInfoVO.enterHide) forKey:@"enterHide"]; - [dic setValue:@(userInfo.userVipInfoVO.preventKick) forKey:@"preventKick"]; - return dic; -} - -#pragma mark - Event Response -- (void)closeButtonAction:(UIButton *)sender { - if([XPRoomMiniManager shareManager].curState){ - [XPRoomMiniManager shareManager].curState = nil; - } - [XPRoomMiniManager shareManager].curState = nil; - [[NIMSDK sharedSDK].chatroomManager exitChatroom:self.currentRoomId completion:nil]; - [self reportOutRoom]; - [[RtcManager instance] exitRoom]; - [[XPRoomMiniManager shareManager] configRoomInfo:nil]; - [[XPRoomMiniManager shareManager] configUserInfo:nil]; - [[XPRoomMiniManager shareManager] configCurrentMusic:nil isPlaying:NO]; - [[XPRoomMiniManager shareManager] resetLocalMessage]; - [self hiddenRoomMiniView]; - [XPSkillCardPlayerManager shareInstance].isMineInMic = NO; -} - -- (void)reportOutRoom { - if ([[AccountInfoStorage instance] getTicket].length < 1) { - return; - } - [Api requestReportUserOutRoom:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - } uid:[[AccountInfoStorage instance] getUid] roomUid:self.currentRoomUid ticket:[[AccountInfoStorage instance] getTicket]]; -} - -- (void)enterRomRecognizer:(UITapGestureRecognizer *)tap { - if (self.currentRoomUid > 0 && self.controller) { - [XPRoomViewController openMiniRoom:self.currentRoomUid viewController:self.controller]; - } -} - -- (void)roomMiniTag:(UIPanGestureRecognizer*)p { - UIWindow *appWindow = [UIApplication sharedApplication].delegate.window; - CGPoint panPoint = [p locationInView:appWindow]; - if (p.state == UIGestureRecognizerStateBegan) { - self.alpha = 1; - } else if(p.state == UIGestureRecognizerStateChanged) { - self.center = CGPointMake(panPoint.x, panPoint.y); - } else if(p.state == UIGestureRecognizerStateEnded - || p.state == UIGestureRecognizerStateCancelled) { - self.alpha = 1; - CGFloat touchWidth = self.frame.size.width; - CGFloat touchHeight = self.frame.size.height; - CGFloat screenWidth = [[UIScreen mainScreen] bounds].size.width; - CGFloat screenHeight = [[UIScreen mainScreen] bounds].size.height; - // fabs 是取绝对值的意思 - CGFloat left = fabs(panPoint.x); - CGFloat right = fabs(screenWidth - left); - CGFloat top = fabs(panPoint.y); - CGFloat bottom = fabs(screenHeight - top); - CGFloat minSpace = 0; - minSpace = MIN(MIN(MIN(top, left), bottom), right); - CGPoint newCenter; - CGFloat targetY = 0; - //校正Y - if (panPoint.y < 15 + touchHeight / 2.0) { - targetY = 15 + touchHeight / 2.0; - }else if (panPoint.y > (screenHeight - touchHeight / 2.0 - 15)) { - targetY = screenHeight - touchHeight / 2.0 - 15; - }else{ - targetY = panPoint.y; - } - - if (minSpace == left) { - newCenter = CGPointMake(15+touchWidth/2.0, targetY); - }else if (minSpace == right) { - newCenter = CGPointMake(screenWidth - touchWidth/2.0 - 15, targetY); - }else if (minSpace == top) { - newCenter = CGPointMake(panPoint.x, touchWidth / 3); - }else { - newCenter = CGPointMake(panPoint.x, screenHeight - touchWidth / 3); - } - [UIView animateWithDuration:0.25 animations:^{ - if (newCenter.y + self.frame.size.height / 2 > KScreenHeight - kSafeAreaBottomHeight - 44) { - self.center = CGPointMake(newCenter.x, KScreenHeight - self.frame.size.height / 2 - kSafeAreaBottomHeight - 44); - }else { - self.center = newCenter; - } - }]; - } -} -#pragma mark - 背景音乐的播放 -- (void)roomBackMusicPlayFinish:(NSNotification *)notification { - NSString * filePath = [notification object]; - Music * currentMusic = [XPRoomMiniManager shareManager].getCurrentMusic; - if (filePath && currentMusic) { - self.currentMusic = currentMusic; - NSArray * array = [[XPCoreDataManager shareInstance].managedObjectContext executeFetchRequest:self.request error:nil]; - __block NSInteger currentIndex = 0; - [array enumerateObjectsUsingBlock:^(Music * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.musicName isEqualToString:currentMusic.musicId]) { - currentIndex = idx; - *stop = YES; - } - }]; - self.currentIndex = currentIndex; - NSInteger order = [[NSUserDefaults standardUserDefaults] integerForKey:kRoomBackMusicPlayMusicOrderKey]; - if (order == 0) { - NSInteger index = self.currentIndex +1; - [self playNextMusic:index]; - } else { - [self playNextMusic:currentIndex]; - } - } -} - -- (void)playNextMusic:(NSInteger)index { - NSArray * array = [[XPCoreDataManager shareInstance].managedObjectContext executeFetchRequest:self.request error:nil]; - if (index >= array.count) { - index = 0; - if (self.currentMusic) { - [[RtcManager instance] changePlayState:BackMusicPlayState_Resume]; - } else { - Music * music = [array xpSafeObjectAtIndex:index]; - [self playCurrentMusic:music index:index]; - } - } else { - Music * music = [array xpSafeObjectAtIndex:index]; - [self playCurrentMusic:music index:index]; - } -} - -- (void)playCurrentMusic:(Music *)music index:(NSInteger)index { - NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults]; - int musicVolum = (int)[defaults integerForKey:kRoomBackMusicAudioMixingVolumeKey]; - musicVolum = musicVolum > 0 ? musicVolum : 50; - - int captureVolum = (int)[defaults integerForKey:kRoomBackMusicCaptureVolumeKey]; - captureVolum = captureVolum > 0 ? captureVolum : 50; - - self.currentMusic = music; - self.currentIndex = index; - NSString * documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject]; - documentsPath = [NSString stringWithFormat:@"%@/music/",documentsPath]; - NSString * musicPath; - if (music.musicName) { - musicPath = [documentsPath stringByAppendingString:music.musicName]; - } else { - return; - } - [[RtcManager instance] playBackMusic:musicPath musicId:0 completion:^(NSString * filePath) { - NSInteger order = [[NSUserDefaults standardUserDefaults] integerForKey:kRoomBackMusicPlayMusicOrderKey]; - if (order == 0) { - NSInteger index = self.currentIndex + 1; - [self playNextMusic:index]; - } else { - [self playNextMusic:self.currentIndex]; - } - }]; -// [[RtcManager instance] updateUserSound:captureVolum]; - [[RtcManager instance] updateMusicSound:musicVolum]; -} - -#pragma mark - Getters And Setters -- (void)setRoomInfo:(RoomInfoModel *)roomInfo { - _roomInfo = roomInfo; - if (_roomInfo) { - self.avatarImageView.imageUrl = _roomInfo.avatar; - if (_roomInfo.title.length > 8) { - _roomInfo.title = [NSString stringWithFormat:@"%@…", [_roomInfo.title substringToIndex:8]]; - } - } -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.userInteractionEnabled = YES; - } - return _backImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc] init]; - config.imageType = ImageTypeUserIcon; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - - _avatarImageView.userInteractionEnabled = YES; - } - return _avatarImageView; -} - -- (UIImageView *)playView{ - if (!_playView){ - _playView = [UIImageView new]; -// _playView.image = [UIImage imageNamed:@"home_mine_room_play"]; - } - return _playView; -} - --(UIButton *)backBtn{ - if (!_backBtn){ - _backBtn = [UIButton new]; - [_backBtn setBackgroundImage:[UIImage imageNamed:@"min_room_back"] forState:UIControlStateNormal]; - [_backBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_backBtn addTarget:self action:@selector(closeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _backBtn; -} - -- (NSFetchRequest *)request { - if (!_request) { - _request = [NSFetchRequest fetchRequestWithEntityName:[Music getMusicName]]; - } - return _request; -} -- (XPNoteView *)noteView { - if (!_noteView) { - _noteView = [[XPNoteView alloc] init]; - _noteView.userInteractionEnabled = YES; - _noteView.pillarColor = [UIColor colorWithWhite:1 alpha:1]; - _noteView.pillarWidth = 3; - [_noteView startAnimation]; - } - return _noteView; -} -@end diff --git a/YuMi/Modules/YMRoom/View/XPRoomMiniManager.h b/YuMi/Modules/YMRoom/View/XPRoomMiniManager.h deleted file mode 100644 index f2408cc..0000000 --- a/YuMi/Modules/YMRoom/View/XPRoomMiniManager.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// YMRoomMiniManager.h -// YUMI -// -// Created by YUMI on 2021/12/8. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class RoomInfoModel, NIMMessage, Music, UserInfoModel; -@interface XPRoomMiniManager : NSObject - -///最小化时，免费礼物的倒计时还在，用来判断是否弹出获得免费礼物弹窗 -@property (nonatomic,copy) NSString *_Nullable curState; - -+ (instancetype)shareManager; - -- (RoomInfoModel *)getRoomInfo; - -- (void)configRoomInfo:(RoomInfoModel * _Nullable)roomInfo; - -- (UserInfoModel *)getUserInfo; - -- (void)configUserInfo:(UserInfoModel * _Nullable)userInfo; -///保存一下 房间的公屏防止最小化出去之后 被清空了 -///MARK: 原类型是 NIMMessage, 改为 id 兼容 NIMBroadcastMessage -- (void)saveRoomMessage:(id)message; -- (NSArray *)getLocalCurrentRoomMessage; -- (void)resetLocalMessage; - -///获取当前播放的歌曲 -- (Music *)getCurrentMusic; -///是否正在播放 -- (BOOL)musicPlaying; -///最小化的时候也要保存一下当前播放的歌曲 -- (void)configCurrentMusic:(Music * _Nullable)roomInfo isPlaying:(BOOL)isPlaying; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/XPRoomMiniManager.m b/YuMi/Modules/YMRoom/View/XPRoomMiniManager.m deleted file mode 100644 index 9c3d2ee..0000000 --- a/YuMi/Modules/YMRoom/View/XPRoomMiniManager.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// YMRoomMiniManager.m -// YUMI -// -// Created by YUMI on 2021/12/8. -// - -#import "XPRoomMiniManager.h" -#import "XPRoomMessageConstant.h" - -@interface XPRoomMiniManager () -///公屏消息 -@property (nonatomic,strong) NSMutableArray *messageArray; -///房间信息 -@property (nonatomic,strong) RoomInfoModel *roomInfo; -///当前播放的歌曲 -@property (nonatomic,strong) Music *musicInfo; -///是否正在播放 -@property (nonatomic,assign) BOOL isPlaying; -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; - -@end - -@implementation XPRoomMiniManager - -+ (instancetype)shareManager { - static dispatch_once_t onceToken = 0; - static XPRoomMiniManager *instance; - dispatch_once(&onceToken, ^{ - instance = [[XPRoomMiniManager alloc] init]; - }); - return instance; -} - -- (RoomInfoModel *)getRoomInfo { - return self.roomInfo; -} - -- (void)configRoomInfo:(RoomInfoModel *_Nullable)roomInfo { - self.roomInfo = roomInfo; -} - -- (UserInfoModel *)getUserInfo { - return self.userInfo; -} - -- (void)configUserInfo:(UserInfoModel * _Nullable)userInfo { - self.userInfo = userInfo; -} - -///获取当前播放的歌曲 -- (Music *)getCurrentMusic { - return self.musicInfo; -} - -- (BOOL)musicPlaying { - return self.isPlaying; -} - -///最小化的时候也要保存一下当前播放的歌曲 -- (void)configCurrentMusic:(Music *)music isPlaying:(BOOL)isPlaying { - self.musicInfo = music; - self.isPlaying = isPlaying; -} - -///保存一下 房间的公屏防止最小化出去之后 被清空了 -- (void)saveRoomMessage:(id)message { - [self.messageArray addObject:message]; - if (self.messageArray.count > kRoomMessageMaxLength) { - NSIndexSet *set = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, kRoomMessageMaxLength/2)]; - NSArray *needRemoveMsgArray = [self.messageArray objectsAtIndexes:set]; - [self.messageArray removeObjectsInArray:needRemoveMsgArray]; - } -} -- (NSArray *)getLocalCurrentRoomMessage { - return [self.messageArray copy]; -} - -- (void)resetLocalMessage { - [self.messageArray removeAllObjects]; -} - -- (NSMutableArray *)messageArray { - if (!_messageArray) { - _messageArray = [NSMutableArray array]; - } - return _messageArray; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/XPRoomTypeSelectionViewController.h b/YuMi/Modules/YMRoom/View/XPRoomTypeSelectionViewController.h deleted file mode 100644 index 01d2689..0000000 --- a/YuMi/Modules/YMRoom/View/XPRoomTypeSelectionViewController.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// XPRoomTypeSelectionViewController.h -// YuMi -// -// Created by P on 2024/6/25. -// - -#import "MvpViewController.h" -@class RoomInfoModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomTypeSelectionViewController : MvpViewController - -@property (nonatomic, strong) RoomInfoModel *model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/XPRoomTypeSelectionViewController.m b/YuMi/Modules/YMRoom/View/XPRoomTypeSelectionViewController.m deleted file mode 100644 index 5800cb1..0000000 --- a/YuMi/Modules/YMRoom/View/XPRoomTypeSelectionViewController.m +++ /dev/null @@ -1,295 +0,0 @@ -// -// XPRoomTypeSelectionViewController.m -// YuMi -// -// Created by P on 2024/6/25. -// - -#import "XPRoomTypeSelectionViewController.h" -#import "RoomInfoModel.h" -#import "Api+RoomSetting.h" - -@interface XPRoomTypeSelectionViewController () - -@property (nonatomic, assign) RoomType type; -@property (nonatomic, assign) RoomType selectType; -@property (nonatomic, strong) UIView *classMode; -@property (nonatomic, strong) UIView *partyMode; -@property (nonatomic, strong) UIView *feverMode; -@property (nonatomic, assign) UIView *bottomArea; -@property (nonatomic, strong) UIButton *confirmButton; -@property (nonatomic, strong) UIImageView *selectedExampleImageView; -@property (nonatomic, strong) UIImageView *selectionImageView; - - -@end - -@implementation XPRoomTypeSelectionViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - self.title = YMLocalizedString(@"XPRoomTypeSelectionViewController4"); - [self setupUI]; -} - -- (void)setModel:(RoomInfoModel *)model { - _model = model; - _type = model.type; - _selectType = model.type; -} - -- (void)viewDidAppear:(BOOL)animated { - if (self.type == RoomType_10Mic) { - [self handleSelectMode:2]; - } else if (self.type == RoomType_15Mic) { - [self handleSelectMode:3]; - } else { - [self handleSelectMode:1]; - } -} - -- (void)setupUI { - self.view.backgroundColor = UIColorFromRGB(0xf8f8f8); - - UIView *bottomArea = [[UIView alloc] init]; - bottomArea.backgroundColor = [UIColor whiteColor]; - [self.view addSubview: bottomArea]; - [bottomArea mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.leading.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(202 + 48 + kSafeAreaBottomHeight + 44); - }]; - _bottomArea = bottomArea; - - UIView *classMode = [self viewMode:1]; - [bottomArea addSubview:classMode]; - [classMode mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(bottomArea).offset(16); - make.leading.mas_equalTo(bottomArea).offset(40); - make.size.mas_equalTo(CGSizeMake(80, 142 + 6 + 28)); - }]; - _classMode = classMode; - - UIView *partyMode = [self viewMode:2]; - [bottomArea addSubview:partyMode]; - [partyMode mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(bottomArea).offset(16); - make.centerX.mas_equalTo(bottomArea); - make.size.mas_equalTo(CGSizeMake(80, 142 + 6 + 28)); - }]; - _partyMode = partyMode; - - UIView *feverMode = [self viewMode:3]; - [bottomArea addSubview:feverMode]; - [feverMode mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(bottomArea).offset(16); - make.trailing.mas_equalTo(bottomArea).offset(-40); - make.size.mas_equalTo(CGSizeMake(80, 142 + 6 + 28)); - }]; - _feverMode = feverMode; - - [bottomArea addSubview:self.confirmButton]; - [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(partyMode.mas_bottom).offset(27); - make.centerX.mas_equalTo(bottomArea); - make.width.mas_equalTo(KScreenWidth - 36); - make.height.mas_equalTo(48); - }]; - - [bottomArea addSubview:self.selectionImageView]; - [self.selectionImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(bottomArea).offset(16); - make.leading.mas_equalTo(bottomArea).offset(40); - make.size.mas_equalTo(CGSizeMake(80, 142)); - }]; - - [self.view addSubview:self.selectedExampleImageView]; - [self.selectedExampleImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.top.mas_equalTo(0); - make.bottom.mas_equalTo(bottomArea.mas_top); - make.top.leading.trailing.mas_equalTo(self.view); - }]; -} - -- (void)confirmButtonAction:(UIButton *)sender { - BOOL isSameType = self.selectType == self.type; - if (isSameType) { - return; - } - - if (self.selectType < self.type) { - @kWeakify(self); - [TTPopup alertWithMessage:YMLocalizedString(@"XPRoomTypeSelectionViewController3") - confirmHandler:^{ - @kStrongify(self); - [self changeMicSetting]; - } cancelHandler:^{}]; - } else { - [self changeMicSetting]; - } -} - -- (void)changeMicSetting { - NSMutableDictionary * params = [NSMutableDictionary dictionary]; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [params setObject:ticket forKey:@"ticket"]; - [params setObject:@(self.model.uid).stringValue forKey:@"uid"]; - [params setObject:[NSString stringWithFormat:@"%ld", self.model.uid] forKey:@"roomUid"]; - if (self.model.title.length > 0) { - [params setObject:self.model.title forKey:@"title"]; - } - - if (self.model.roomPwd.length > 0) { - [params setObject:self.model.roomPwd forKey:@"roomPwd"]; - } else{ - [params setObject:@"" forKey:@"roomPwd"]; - } - - if (self.model.tagId > 0) { - [params setObject:[NSString stringWithFormat:@"%ld", self.model.tagId] forKey:@"tagId"]; - } - - [params setObject:@(self.selectType) forKey:@"type"]; - [params setObject:@"0" forKey:@"mgId"]; - [params setObject:@(self.model.hasAnimationEffect) forKey:@"hasAnimationEffect"]; - - [XNDJTDDLoadingTool showLoading]; - @kWeakify(self); - [Api ownerUpdateRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if (code == 200) { - [self.navigationController popViewControllerAnimated:YES]; - [XNDJTDDLoadingTool hideHUD]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } params:params]; -} - -- (void)selectModeAction:(UIPanGestureRecognizer *)recognizer { - UIView *targetView = recognizer.view; - [self handleSelectMode:targetView.tag]; -} - -- (void)handleSelectMode:(NSInteger)type { - switch (type) { - case 1: { - self.selectType = RoomType_Room; - self.selectedExampleImageView.image = [UIImage imageNamed:@"room_type_example_9"]; - [self.selectionImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bottomArea).offset(16); - make.leading.mas_equalTo(self.bottomArea).offset(40); - make.size.mas_equalTo(CGSizeMake(80, 142)); - }]; - } - break; - case 2: { - self.selectType = RoomType_10Mic; - self.selectedExampleImageView.image = [UIImage imageNamed:@"room_type_example_10"]; - [self.selectionImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bottomArea).offset(16); - make.centerX.mas_equalTo(self.bottomArea); - make.size.mas_equalTo(CGSizeMake(80, 142)); - }]; - } - break; - case 3: { - self.selectType = RoomType_15Mic; - self.selectedExampleImageView.image = [UIImage imageNamed:@"room_type_example_15"]; - [self.selectionImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.bottomArea).offset(16); - make.trailing.mas_equalTo(self.bottomArea).offset(-40); - make.size.mas_equalTo(CGSizeMake(80, 142)); - }]; - } - break; - default: - break; - } - - BOOL isSameType = self.selectType == self.type; - [self.confirmButton setTitle:isSameType ? YMLocalizedString(@"XPRoomTypeSelectionViewController5") : YMLocalizedString(@"XPMineDressBubbleCollectionViewCell4") - forState:UIControlStateNormal]; -} - -#pragma mark - - -- (UIImageView *)selectedExampleImageView { - if (!_selectedExampleImageView) { - _selectedExampleImageView = [[UIImageView alloc] init]; - _selectedExampleImageView.contentMode = UIViewContentModeScaleAspectFit; - } - return _selectedExampleImageView; -} - -- (UIImageView *)selectionImageView { - if (!_selectionImageView) { - _selectionImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"room_type_selection_frame"]]; - _selectionImageView.contentMode = UIViewContentModeScaleAspectFill; - } - return _selectionImageView; -} - -- (UIButton *)confirmButton { - if (!_confirmButton) { - _confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _confirmButton.adjustsImageWhenHighlighted = NO; - [_confirmButton setTitle:YMLocalizedString(@"MSRoomSetingBackdropCell0") forState:UIControlStateNormal]; - [_confirmButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _confirmButton.titleLabel.font = [UIFont systemFontOfSize:17 weight:UIFontWeightHeavy]; - [_confirmButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x57e193), UIColorFromRGB(0x14d2a6)] - gradientType:GradientTypeLeftToRight - imgSize:CGSizeMake(10, 10)] - forState:UIControlStateNormal]; - _confirmButton.layer.masksToBounds = YES; - _confirmButton.layer.cornerRadius = 24; - [_confirmButton addTarget:self action:@selector(confirmButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _confirmButton; -} - -- (UIView *)viewMode:(NSInteger)type { - UIView *targetView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 80, 142 + 6 + 28)]; - targetView.tag = type; - - NSString *imageName = @""; - NSString *title = @""; - switch (type) { - case 1: - title = YMLocalizedString(@"XPRoomTypeSelectionViewController0"); - imageName = @"room_type_example_mini_9"; - break; - case 2: - title = YMLocalizedString(@"XPRoomTypeSelectionViewController1"); - imageName = @"room_type_example_mini_10"; - break; - case 3: - title = YMLocalizedString(@"XPRoomTypeSelectionViewController2"); - imageName = @"room_type_example_mini_15"; - break; - default: - break; - } - - UIImageView *exampleImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:imageName]]; - [targetView addSubview:exampleImageView]; - [exampleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.trailing.mas_equalTo(targetView); - make.height.mas_equalTo(142); - }]; - - UILabel *titleLabel = [UILabel labelInitWithText:title - font:[UIFont systemFontOfSize:12 weight:UIFontWeightBold] - textColor:UIColorFromRGB(0x1a1a1a)]; - [targetView addSubview:titleLabel]; - [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(exampleImageView.mas_bottom).offset(6); - make.centerX.mas_equalTo(targetView); - }]; - - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(selectModeAction:)]; - [targetView addGestureRecognizer:tap]; - - return targetView; -} - -@end diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.h b/YuMi/Modules/YMRoom/View/XPRoomViewController.h deleted file mode 100644 index dbc7a23..0000000 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.h +++ /dev/null @@ -1,72 +0,0 @@ -// -// YMRoomViewController.h -// YUMI -// -// Created by YUMI on 2021/10/11. -// - -#import "MvpViewController.h" -#import "XPMessageRemoteExtModel.h" - -// 公共房间消息转发通知名称 -UIKIT_EXTERN NSString * _Nullable const kMessageFromPublicRoomWithAttachmentNotification; - -NS_ASSUME_NONNULL_BEGIN - -@interface XPRoomViewController : MvpViewController - -/** XPRoomViewController 不允许外部 init ，请通过该方法启动房间。 - * @params roomUid 房主uid - * @params viewController 启动方 - */ -+ (BOOL)openRoom:(NSString*)roomUid viewController:(UIViewController*)viewController; -/** XPRoomViewController 不允许外部 init ，请通过该方法启动房间。 - * @params roomUid 房主uid - * @params viewController 启动方 - * @params redEnvelopeId 全服红包id - */ -+ (BOOL)openRoom:(NSString *)roomUid viewController:(UIViewController *)viewController redEnvelopeId:(NSString *)redEnvelopeId; -/**最小化进房 - * @params roomUid 房主uid - * @params viewController 启动方 - */ -+ (BOOL)openMiniRoom:(NSString*)roomUid viewController:(UIViewController*)viewController; -/**最小化进房 - * @params roomUid 房主uid - * @params viewController 启动方 - * @params redEnvelopeId 全服红包id - */ -+ (BOOL)openMiniRoom:(NSString*)roomUid viewController:(UIViewController*)viewController redEnvelopeId:(NSString *)redEnvelopeId; -/** 跟随进房 - * @params roomUid 房主uid - * @params fromNick 跟随的人用户昵称 - * @params fromType 跟随的类型 - * @params fromUid 跟随人的uid - * @params viewController 启动方 - */ -+ (BOOL)openRoom:(NSString*)roomUid fromNick:(NSString * __nullable)fromNick fromType:(UserEnterRoomFromType)fromType fromUid:(NSString * __nullable)fromUid viewController:(UIViewController*)viewController; - -/** XPRoomViewController 不允许外部 init ，请通过该方法启动房间。 - * @params roomUid 房主uid - * @params viewController 启动方 - * @params mgId 小游戏的id - */ -+ (BOOL)openRoom:(NSString*)roomUid mgId:(NSString *)mgId viewController:(UIViewController*)viewController; - -/// h5进房并弹出礼物面板 -/// @param roomUid 房主Uid -/// @param giftId 礼物id -/// @param viewController 启动方 -+ (BOOL)openRoom:(NSString *)roomUid giftId:(NSString *)giftId viewController:(UIViewController *)viewController; - -- (instancetype)init NS_UNAVAILABLE; -+ (instancetype)new NS_UNAVAILABLE; -- (id)copy NS_UNAVAILABLE; -- (id)mutableCopy NS_UNAVAILABLE; - -- (void)exitRoom; -- (BOOL)isSameRoom:(NSString *)targetUid; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m deleted file mode 100644 index 5bab2be..0000000 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ /dev/null @@ -1,4604 +0,0 @@ -// -// YMRoomViewController.m -// YUMI -// -// Created by YUMI on 2021/10/11. -// - -#import "XPRoomViewController.h" -#include -///Third -#import -#import -///Tool -#import "YUMIMacroUitls.h" -#import "YUMIConstant.h" -#import "AccountInfoStorage.h" -#import "RtcManager.h" -#import "XPRoomMiniManager.h" -#import "TTPopup.h" -#import "TurboModeStateManager.h" -#import "Api+ArrangeMic.h" -#import "Api+Room.h" -#import "DESEncrypt.h" -#import "NSArray+Safe.h" -#import "NSMutableDictionary+Saft.h" -#import "XPSkillCardPlayerManager.h" -#import "XCCurrentVCStackManager.h" -#import "CountDownHelper.h" -///Model -#import "RoomInfoModel.h" -#import "UserInfoModel.h" -#import "AttachmentModel.h" -#import "ArrangeMicModel.h" -#import "XPReleaseRadioModel.h" -#import "GuildSuperAdminInfoModel.h" -#import "XPKickUserModel.h" -#import "ContentLevelUpgradeModel.h" -#import "XPReceiveRedPacketModel.h" -#import "XPRedPacketModel.h" -#import "XPFreeGiftModel.h" -#import "XPUserCardInfoModel.h" -///View -#import "BaseNavigationController.h" -#import "XPRoomBackContainerView.h" -#import "XPRoomMenuContainerView.h" -#import "XPRoomQuickMessageContainView.h" -#import "MsRoomMessageMainView.h" -#import "RoomHeaderView.h" -#import "SocialStageView.h" -#import "TenMicStageView.h" -#import "FifteenMicStageView.h" -#import "NineteenMicStageView.h" -#import "TwentyMicStageView.h" -#import "DatingStageView.h" -#import "AnchorStageView.h" -#import "AnchorPkStageView.h" -//#import "XPRoomAnimationView.h" -#import "RoomAnimationView.h" -#import "XPRoomFunctionContainerView.h" -#import "XPArrangeMicViewController.h" -#import "XPRoomSettingInputView.h" -#import "AnchorRoomScrollView.h" -#import "AnchorRoomSrollTipView.h" -#import "XPReceiveRedPacketView.h" -#import "XPWebViewController.h" -#import "SessionViewController.h" -#import "XPFreeGiftsObtainView.h" - -///P -#import "XPRoomPresenter.h" -#import "XPRoomProtocol.h" -#import "XPWeakTimer.h" -#import "RoomHostDelegate.h" -#import "RoomGuestDelegate.h" -#import "Api+RoomSetting.h" -#import "XNDJTDDLoadingTool.h" -#import "ClientConfig.h" -#import "LittleGameStageView.h" -#import "LittleGameScrollStageView.h" -#import "XPRoomLittleGameContainerView.h" -#import "StageViewManager.h" -#import "PIRoomEnterRedPacketView.h" -#import "XPIAPRechargeViewController.h" -#import "XPCandyTreeInsufficientBalanceView.h" - -#import "GiftComboManager.h" -#import "LuckyGiftWinningFlagView.h" - -#import "RoomBoomResultView.h" -#import "RoomBoomManager.h" -#import "RoomBoomExplosionView.h" -#import "RoomBoomResultView.h" - -#import "XPSendGiftView.h" -#import "RoomSideMenu.h" -#import "RoomResourceManager.h" -#import "LuckyPackageLogicManager.h" - -#import "MicCpInfoModel.h" -#import "XPMessageRemoteExtModel.h" -#import "MicMidpointRectManager.h" - -// 🔧 新增：Turbo Mode Tips 相关 -#import "XPTurboModeTipsManager.h" -#import "BuglyManager.h" - -//#import "XPMineHallAnchorIncomeStatisViewController.h" - -UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey; -UIKIT_EXTERN NSString * const kRoomMiniNotificationKey; -UIKIT_EXTERN NSString * kNewUserRechargeKey; -UIKIT_EXTERN NSString * const kMessageFromPublicRoomWithAttachmentNotification; -UIKIT_EXTERN NSString * const kFreeGiftCountdownNotification; -NSString * const kHadShowAnchorRoomTipKey = @"kHadShowAnchorRoomTipKey";//是否展示过个播房上划用户引导 -NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出过非自己房间 - -@interface XPRoomViewController ()< -XPRoomProtocol, -RoomHostDelegate, -NIMChatroomManagerDelegate, -NIMChatManagerDelegate, -NIMConversationManagerDelegate, -NIMLoginManagerDelegate, -XPRoomSettingInputViewDelegate, -AnchorRoomScrollViewDelegate, -NIMBroadcastManagerDelegate, -XPRoomLittleGameContainerViewDelegate, -CountDownHelperDelegate, -PIRoomEnterRedPacketViewDelegate, -XPReceiveRedPacketViewDelegate, -XPCandyTreeInsufficientBalanceViewDelegate> - -///背景 -@property (nonatomic,strong) XPRoomBackContainerView *backContainerView; -///个播上下切换view -@property (nonatomic, strong) AnchorRoomScrollView *anchorScrollView; -///房间信息 -@property (nonatomic,strong) RoomHeaderView *roomHeaderView; -///坑位信息 -@property (nonatomic,strong) StageView *stageView; -@property (nonatomic,strong) StageViewManager *stageViewManager; -//@property (nonatomic,strong) TenMicStageView *tenMicStageView; -//@property (nonatomic,strong) FifteenMicStageView *fifteenMicStageView; -//@property (nonatomic,strong) TwentyMicStageView *twentyMicStageView; -//@property(nonatomic, strong) NineteenMicStageView *nineteenMicStageView; -///公屏 -@property (nonatomic,strong) MsRoomMessageMainView *messageContainerView; -///快捷发言 -@property (nonatomic, strong) XPRoomQuickMessageContainView *quickMessageContainerView; -///底部操作栏 -@property (nonatomic,strong) XPRoomMenuContainerView *menuContainerView; -///活动 -@property(nonatomic, strong) RoomSideMenu *sideMenu; - -///动画的view -@property (nonatomic,strong) RoomAnimationView *animationView; -///功能view的的容器 -@property (nonatomic,strong) XPRoomFunctionContainerView *functionView; -///小游戏的容器 -@property (nonatomic,strong) XPRoomLittleGameContainerView *littleGameView; - -///房间的Uid -@property (nonatomic,copy) NSString * roomUid; -///小游戏的id -@property (nonatomic,copy) NSString *mgId; -///礼物id -@property (nonatomic, copy) NSString *giftId; -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -///房间信息 -@property (nonatomic,strong) RoomInfoModel *roomInfo; -///本地是否修改过礼物特效显示 当前房间如果设置过礼物特效是否显示的话 就不再跟随房间礼物特效的更新而更新 -@property (nonatomic,assign) BOOL hasAnimationEffect; -///跟随的 -@property (nonatomic,copy) NSString *fromNick; -@property (nonatomic,assign) UserEnterRoomFromType fromType; -@property (nonatomic,copy) NSString *fromUid; -///超管列表 -@property (nonatomic,strong) NSArray *superMangerList; -///是否请求过了超管 -@property (nonatomic,assign) BOOL isRequestSuperAdmin; -///是否是最小化进房 -@property (nonatomic,assign) BOOL isMiniEnter; -///个播上划引导 -@property (nonatomic, strong) AnchorRoomSrollTipView *anchorScrollTipView; - -///滚动过的个播列表 -@property (nonatomic,strong) NSMutableArray *anchorRoomList; -///序号 -@property (nonatomic,assign) NSInteger anchorIndex; - -///免费礼物数量 -@property (nonatomic,strong) XPFreeGiftModel *freeModel; -///免费礼物弹窗 -@property (nonatomic,strong) XPFreeGiftsObtainView *freeView; -///全服红包id -@property(nonatomic,copy) NSString *redEnvelopeId; -///红包 -@property(nonatomic,strong) PIRoomEnterRedPacketView *redPacketView; -///是否正在显示红包弹窗，防止显示多个弹窗 -@property(nonatomic,assign) BOOL isShowRedPacket; -@property(nonatomic,copy) NSString *releaseCoins; - -// 🔧 防护机制：房间状态标志位 -@property (atomic, assign) BOOL isExitingRoom; // 是否正在退出房间 -@property (atomic, assign) BOOL isViewActive; // VC 是否可见/活跃 -@property (atomic, assign) BOOL isMinimizingRoom; // 是否正在最小化到悬浮窗 -@property(nonatomic,copy) NSString *myCoins; - -@property(nonatomic,strong) UIButton *exitGameButton; - -/// 上麦请求弹窗定时器，用于10秒后自动移除弹窗 -@property(nonatomic,strong) NSTimer *upMicAskTimer; - -/// 🔧 修复：保存 block 形式的通知观察者，防止内存泄漏 -@property(nonatomic,strong) id exchangeRoomAnimationViewObserver; - -/// 当前房间的CP关系列表（用于在中点关系位播放对应cp等级的SVGA） -@property (nonatomic, strong) NSArray *currentCpList; -@property (nonatomic, assign) BOOL currentUserMicStatusChanged; // 当前用户麦位状态是否发生变化（上麦、下麦、换位） -@property (nonatomic, assign) BOOL currentUserWasOnMic; // 当前用户之前是否在麦上 -@property (nonatomic, assign) NSInteger currentUserMicPosition; // 当前用户的麦位位置（-1表示不在麦上） -@property (nonatomic, assign) BOOL hasCompletedRoomInitialization; // 是否已完成进房初始化 -/// 是否已请求按房间UID获取CP列表（首进房） -@property (nonatomic, assign) BOOL hasRequestedInitialCpByRoomUid; - -@end - -@implementation XPRoomViewController - -+ (BOOL)openRoom:(NSString *)roomUid viewController:(UIViewController *)viewController { - return [self openRoom:roomUid fromNick:nil fromType:0 fromUid:nil viewController:viewController]; -} -+ (BOOL)openRoom:(NSString *)roomUid viewController:(UIViewController *)viewController redEnvelopeId:(NSString *)redEnvelopeId{ - XPRoomViewController * roomVC = [[self alloc] init]; - roomVC.roomUid = roomUid; - roomVC.fromUid = nil; - roomVC.fromType = 0; - roomVC.fromNick = nil; - roomVC.redEnvelopeId = redEnvelopeId; - BaseNavigationController * baseNav = [[BaseNavigationController alloc] initWithRootViewController:roomVC]; - baseNav.modalPresentationStyle = UIModalPresentationFullScreen; - [viewController presentViewController:baseNav animated:YES completion:nil]; - return YES; -} -+ (BOOL)openRoom:(NSString*)roomUid fromNick:(NSString * __nullable)fromNick fromType:(UserEnterRoomFromType)fromType fromUid:(NSString * __nullable)fromUid viewController:(UIViewController*)viewController { - XPRoomViewController * roomVC = [[self alloc] init]; - roomVC.roomUid = roomUid; - roomVC.fromUid = fromUid; - roomVC.fromType = fromType; - roomVC.fromNick = fromNick; - BaseNavigationController * baseNav = [[BaseNavigationController alloc] initWithRootViewController:roomVC]; - baseNav.modalPresentationStyle = UIModalPresentationFullScreen; - [viewController presentViewController:baseNav animated:YES completion:nil]; - return YES; -} - -/**最小化进房 - * @params roomUid 房主uid - * @params viewController 启动方 - */ -+ (BOOL)openMiniRoom:(NSString*)roomUid viewController:(UIViewController*)viewController { - XPRoomViewController * roomVC = [[self alloc] init]; - roomVC.roomUid = roomUid; - roomVC.isMiniEnter = YES; - BaseNavigationController * baseNav = [[BaseNavigationController alloc] initWithRootViewController:roomVC]; - baseNav.modalPresentationStyle = UIModalPresentationFullScreen; - [viewController presentViewController:baseNav animated:YES completion:nil]; - return roomVC; -} -/**最小化进房 - * @params roomUid 房主uid - * @params viewController 启动方 - * @params redEnvelopeId 全服红包id - */ -+ (BOOL)openMiniRoom:(NSString*)roomUid viewController:(UIViewController*)viewController redEnvelopeId:(NSString *)redEnvelopeId{ - XPRoomViewController * roomVC = [[self alloc] init]; - roomVC.roomUid = roomUid; - roomVC.isMiniEnter = YES; - roomVC.redEnvelopeId = redEnvelopeId; - BaseNavigationController * baseNav = [[BaseNavigationController alloc] initWithRootViewController:roomVC]; - baseNav.modalPresentationStyle = UIModalPresentationFullScreen; - [viewController presentViewController:baseNav animated:YES completion:nil]; - return roomVC; -} -/** XPRoomViewController 不允许外部 init ，请通过该方法启动房间。 - * @params roomUid 房主uid - * @params viewController 启动方 - * @params mgId 小游戏的id - */ -+ (BOOL)openRoom:(NSString*)roomUid mgId:(NSString *)mgId viewController:(UIViewController*)viewController { - XPRoomViewController * roomVC = [[self alloc] init]; - roomVC.roomUid = roomUid; - roomVC.mgId = mgId; - BaseNavigationController * baseNav = [[BaseNavigationController alloc] initWithRootViewController:roomVC]; - baseNav.modalPresentationStyle = UIModalPresentationFullScreen; - [viewController presentViewController:baseNav animated:YES completion:nil]; - return YES; -} - -/// h5进房并弹出礼物面板 -/// @param roomUid 房主Uid -/// @param giftId 礼物id -/// @param viewController 启动方 -+ (BOOL)openRoom:(NSString *)roomUid giftId:(NSString *)giftId viewController:(UIViewController *)viewController { - XPRoomViewController * roomVC = [[self alloc] init]; - roomVC.roomUid = roomUid; - roomVC.giftId = giftId; - BaseNavigationController * baseNav = [[BaseNavigationController alloc] initWithRootViewController:roomVC]; - baseNav.modalPresentationStyle = UIModalPresentationFullScreen; - [viewController presentViewController:baseNav animated:YES completion:nil]; - return YES; -} - -- (void)dealloc { - - NSLog(@"🔄 XPRoomViewController: 开始销毁"); - - // 🔧 防护：标记房间正在退出，防止后续异步回调 - self.isExitingRoom = YES; - self.isViewActive = NO; - - [[RoomBoomManager sharedManager] leaveRoom]; - - [XPSkillCardPlayerManager shareInstance].photoIdList = nil; - [XPSkillCardPlayerManager shareInstance].isInRoomVC = NO; - [XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge = NO; - [XPSkillCardPlayerManager shareInstance].isInRoom = NO; - [XPSkillCardPlayerManager shareInstance].roomUid = @""; - - if([[XPRoomMiniManager shareManager] getRoomInfo]==nil){ - [XPSkillCardPlayerManager shareInstance].isMineInMic = NO; - } - - [[CountDownHelper shareHelper] stopCountDown]; - [CountDownHelper shareHelper].delegate = nil; - - [[NIMSDK sharedSDK].chatroomManager removeDelegate:self]; - [[NIMSDK sharedSDK].chatManager removeDelegate:self]; - [[NIMSDK sharedSDK].loginManager removeDelegate:self]; - [[NIMSDK sharedSDK].conversationManager removeDelegate:self]; - [[NIMSDK sharedSDK].broadcastManager removeDelegate:self]; - - [[RoomBoomManager sharedManager] removeEventListenerForTarget:self]; - - // 🔧 修复：移除 block 形式的通知观察者 - if (self.exchangeRoomAnimationViewObserver) { - [[NSNotificationCenter defaultCenter] removeObserver:self.exchangeRoomAnimationViewObserver]; - self.exchangeRoomAnimationViewObserver = nil; - } - - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - // 🔧 修复：清理 RoomAnimationView - if (_animationView) { - NSLog(@"🔄 XPRoomViewController: 清理 RoomAnimationView"); - [_animationView removeItSelf]; - [_animationView removeFromSuperview]; - _animationView = nil; - } - - // 清理上麦请求弹窗定时器 - if (self.upMicAskTimer) { - [self.upMicAskTimer invalidate]; - self.upMicAskTimer = nil; - } - - // 🔧 释放保障：解散可能残留的弹窗/蒙层 - [TTPopup dismiss]; - - // 🔧 释放保障：停止 Turbo Mode Tips 监听（若支持） - if ([[XPTurboModeTipsManager sharedManager] respondsToSelector:@selector(stopTipsMonitoringInRoom)]) { - [[XPTurboModeTipsManager sharedManager] performSelector:@selector(stopTipsMonitoringInRoom)]; - } - - // 🔧 释放保障：清空 GiftComboManager 的 UI 回调，避免对 VC 的强引用 - if ([GiftComboManager sharedManager]) { - [[GiftComboManager sharedManager] setHandleRoomUIChanged:nil]; - } - - // 🔧 释放保障：清空 sideMenu 的 block 回调 - if (self.sideMenu) { - if ([self.sideMenu respondsToSelector:@selector(setOpenRedPacketHandle:)]) { - [self.sideMenu performSelector:@selector(setOpenRedPacketHandle:) withObject:nil]; - } - if ([self.sideMenu respondsToSelector:@selector(setShowSendGiftView:)]) { - [self.sideMenu performSelector:@selector(setShowSendGiftView:) withObject:nil]; - } - } - - // 🔧 释放保障：置空各子视图/滚动视图的 delegate，规避潜在强引用 - NSArray *possibleDelegates = @[ - self.backContainerView, - self.stageView, - self.messageContainerView, - self.quickMessageContainerView, - self.menuContainerView, - self.functionView, - self.littleGameView, - self.anchorScrollView - ]; - for (id obj in possibleDelegates) { - if (!obj) { continue; } - if ([obj respondsToSelector:@selector(setDelegate:)]) { - [obj performSelector:@selector(setDelegate:) withObject:nil]; - } - if ([obj respondsToSelector:@selector(setHostDelegate:)]) { - [obj performSelector:@selector(setHostDelegate:) withObject:nil]; - } - if ([obj respondsToSelector:@selector(setAnchorScrollDelegate:)]) { - [obj performSelector:@selector(setAnchorScrollDelegate:) withObject:nil]; - } - } - - // 🔧 释放保障：移除视图层级，断开 UI 链接 - [self __removeAllViews]; - self.anchorScrollView = nil; - self.backContainerView = nil; - self.stageView = nil; - self.messageContainerView = nil; - self.quickMessageContainerView = nil; - self.menuContainerView = nil; - self.sideMenu = nil; - self.functionView = nil; - self.littleGameView = nil; - - NSLog(@"🔄 XPRoomViewController: 销毁完成"); -} - -- (XPRoomPresenter *)createPresenter { - return [[XPRoomPresenter alloc] init]; -} - -- (BOOL)isHiddenNavBar { - return YES; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - [self exitOldRoom]; - - [self preLoadGifts]; - - [self initSubViews]; - [self initSubViewConstraints]; - - [self setupNimSDK]; - - [self loadRoomDataAndUsers]; - - [self setupNotifications]; - - [self handleActivityContainerViewEvents]; - - ///获取房间超管列表 - [self.presenter getRoomSuperAdmin:self.roomUid]; - - [XPSkillCardPlayerManager shareInstance].isInRoom = YES; - - [CountDownHelper shareHelper].delegate = self; - - [self setupForBoom]; - - [self handleGiftComboCallBack]; - - [self setupStageViewManager]; - - // 🔧 新增：启动 Turbo Mode Tips 监听 - [[XPTurboModeTipsManager sharedManager] startTipsMonitoringInRoom]; -} - -//- (void)test { -// XPMineHallAnchorIncomeStatisViewController *vc = [[XPMineHallAnchorIncomeStatisViewController alloc] init]; -// [self.navigationController pushViewController:vc animated:YES]; -//} - -- (void)handleGiftComboCallBack { - @kWeakify(self); - [[GiftComboManager sharedManager] setHandleRoomUIChanged:^(BOOL comboViewDisplay) { - @kStrongify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - self.sideMenu.hidden = comboViewDisplay; - self.menuContainerView.hidden = comboViewDisplay; - - // 添加状态验证：如果要隐藏UI，确保连击确实在进行 - if (comboViewDisplay && ![[GiftComboManager sharedManager] isActive]) { - NSLog(@"⚠️ 检测到UI隐藏请求但连击未进行，执行强制重置"); - [self forceBoomStateReset]; - } - }); - }]; -} - -- (void)setupForBoom { - @kWeakify(self); - [[RoomBoomManager sharedManager] registerBoomExplosion:^(id _Nonnull sth) { - @kStrongify(self); - [self.presenter getBoomDetail:self.roomUid]; - - if (![sth isKindOfClass:[NSArray class]]) { - return; - } - dispatch_async(dispatch_get_main_queue(), ^{ - [RoomBoomExplosionView display:self.view with:sth complete:^{ }]; - }); - } target:self]; - - [[RoomBoomManager sharedManager] registerBoomGiftDisplay:^(id _Nonnull sth) { - @kStrongify(self); - dispatch_async(dispatch_get_main_queue(), ^{ - [RoomBoomResultView display:self.view attachment:sth]; - }); - } target:self]; - - [[RoomBoomManager sharedManager] registerBoomEnterRoomExplosion:^(id _Nonnull sth) { - @kStrongify(self); - if (![sth isKindOfClass:[NSArray class]]) { - return; - } - dispatch_async(dispatch_get_main_queue(), ^{ - [RoomBoomExplosionView display:self.view with:sth complete:^{ - - }]; - }); - } target:self]; -} - -- (void)requestBoomData { - [self.presenter getBoomRocketAnimationInfo:self.roomUid]; - [self.presenter getBoomDetail:self.roomUid]; -} - -- (void)loadRoomDataAndUsers { - [XNDJTDDLoadingTool showAnchorLoading:self.navigationController.view]; - [self.presenter initEnterRoom:self.roomUid user:[AccountInfoStorage instance].getUid]; -} - -- (void)setupNotifications { - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(myGiftEffectUpdate:) name:kRoomGiftEffectUpdateNotificationKey object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(openRedPacketNotification:) name:@"kOpenRedPacketNotification" object:nil]; - - // 添加公共房间消息转发通知监听 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(handlePublicRoomMessageForward:) - name:kMessageFromPublicRoomWithAttachmentNotification - object:nil]; - - // 添加应用生命周期保护 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(applicationDidEnterBackground:) - name:UIApplicationDidEnterBackgroundNotification - object:nil]; - - @kWeakify(self); - // 🔧 修复：保存 block 观察者的返回值，防止内存泄漏 - self.exchangeRoomAnimationViewObserver = [[NSNotificationCenter defaultCenter] addObserverForName:@"kExchangeRoomAnimationViewAndGameViewIndex" - object:nil - queue:NSOperationQueue.mainQueue - usingBlock:^(NSNotification * _Nonnull notification) { - @kStrongify(self); - if (self.view.subviews.count > 0) { - UIView *topView = self.view.subviews.lastObject; - UIView *secondView = [self.view.subviews xpSafeObjectAtIndex:self.view.subviews.count-2]; - if (secondView && secondView.tag == 913) { - NSInteger index1 = [self.view.subviews indexOfObject:topView]; - NSInteger index2 = [self.view.subviews indexOfObject:secondView]; - [self.view exchangeSubviewAtIndex:index1 withSubviewAtIndex:index2]; - } - } - }]; -} - -- (void)setupNimSDK { - //监听云信消息 - [[NIMSDK sharedSDK].chatroomManager addDelegate:self]; - [[NIMSDK sharedSDK].chatManager addDelegate:self]; - [[NIMSDK sharedSDK].loginManager addDelegate:self]; - [[NIMSDK sharedSDK].conversationManager addDelegate:self]; - [[NIMSDK sharedSDK].broadcastManager addDelegate:self]; -} - -/// 禮物面板緩存-2: 進房後，用當前的 roomUid 加載最新數據，並緩存 -- (void)preLoadGifts { - [self.presenter getNormalGiftList:self.roomUid]; - - ///获取免费礼物 - [self.presenter getFreeGiftData]; - - if(![NSString isEmpty:self.redEnvelopeId]){ - [self.presenter getRedPacketInft:self.redEnvelopeId]; - } -} - -#pragma mark - MSSessionReleaseHeadlinesViewDelegate --(void)releaseHeadlinesWithText:(NSString *)text{ - XPCandyTreeInsufficientBalanceView *balanceView = [[XPCandyTreeInsufficientBalanceView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - balanceView.delegate = self; - [self.view addSubview:balanceView]; - -} -#pragma mark - XPCandyTreeInsufficientBalanceViewDelegate -- (void)payBalanceAction{ - XPIAPRechargeViewController * webVC =[[XPIAPRechargeViewController alloc] init]; - webVC.type = @"4"; - [self.navigationController pushViewController:webVC animated:YES]; -} -///打开红包通知 --(void)openRedPacketNotification:(NSNotification *)not{ - NSDictionary *redPacketDic = not.userInfo; - NSInteger type = [redPacketDic[@"type"] integerValue]; - NSInteger userId = [redPacketDic[@"uid"] integerValue]; - // NSString *roomUid = redPacketDic[@"roomUId"]; - if(type == 2){ - [self.messageContainerView showUserCard:userId]; - }else if (type == 3){ -// [self.roomHeaderView showSharePanel]; - }else if (type == 4){ - NSString *scrolling = redPacketDic[@"scrolling"]; - [self.menuContainerView showInputView:scrolling]; - } -} - -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { - [self.menuContainerView menuResignFirstResponder]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent; - - [self.menuContainerView recheckMicState]; -} --(void)viewWillDisappear:(BOOL)animated{ - [super viewWillDisappear:animated]; - self.freeView.hidden = YES; - - // 🔧 防护：标记 VC 即将不可见 - self.isViewActive = NO; - - // 🔧 防护：如果 VC 被移除或 dismiss，强制清理 TRTC（最小化时跳过断开） - if (self.isMovingFromParentViewController || self.isBeingDismissed) { - if (!self.isMinimizingRoom) { - [[RtcManager instance] exitRoom]; - self.isExitingRoom = YES; - } - } - - // 如果连击正在进行，强制重置 - if ([[GiftComboManager sharedManager] isActive]) { - NSLog(@"📱 房间即将退出，检查连击状态"); - [self forceBoomStateReset]; - } -} - -- (void)viewDidDisappear:(BOOL)animated{ - [super viewDidDisappear:animated]; - self.navigationController.interactivePopGestureRecognizer.enabled = YES; - [XPSkillCardPlayerManager shareInstance].isInRoomVC = NO; - - // 🔧 防护：确保标记为不可见 - self.isViewActive = NO; - - // 🔧 修复：发送房间退出通知，让 BuglyManager 知道用户已退出房间（最小化时不发送） - if (!self.isMinimizingRoom) { - [[NSNotificationCenter defaultCenter] postNotificationName:@"RoomDidExit" - object:nil - userInfo:@{@"roomId": self.roomUid ?: @"unknown"}]; - NSLog(@"🎮 房间退出通知已发送 - RoomID: %@", self.roomUid); - } -} -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - self.freeView.hidden = NO; - self.navigationController.interactivePopGestureRecognizer.enabled = NO; - [XPSkillCardPlayerManager shareInstance].isInRoomVC = YES; - - // 🔧 防护：标记 VC 可见 - self.isViewActive = YES; - // 🔧 最小化恢复后复位标志 - self.isMinimizingRoom = NO; - - // 🔧 修复：发送房间进入通知，让 BuglyManager 知道用户已进入房间 - [[NSNotificationCenter defaultCenter] postNotificationName:@"RoomDidEnter" - object:nil - userInfo:@{@"roomId": self.roomUid ?: @"unknown"}]; - NSLog(@"🎮 房间进入通知已发送 - RoomID: %@", self.roomUid); -} - -#pragma mark - 连击状态管理 - -// 强制重置连击状态和恢复UI -- (void)forceBoomStateReset { - NSLog(@"🔧 XPRoomViewController 强制重置连击状态"); - - // 1. 直接重置连击管理器（会自动发送通知给所有相关组件） - [[GiftComboManager sharedManager] forceBoomStateReset]; - - // 2. 确保UI恢复（双重保障） - dispatch_async(dispatch_get_main_queue(), ^{ - self.sideMenu.hidden = NO; - self.menuContainerView.hidden = NO; - NSLog(@"🔄 强制恢复底部操作栏和侧栏显示"); - }); -} - -// 应用生命周期保护 -- (void)applicationDidEnterBackground:(NSNotification *)notification { - if ([[GiftComboManager sharedManager] isActive]) { - NSLog(@"📱 应用进入后台，检查连击状态"); - [self forceBoomStateReset]; - } -} - -// 内存警告保护 -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - - if ([[GiftComboManager sharedManager] isActive]) { - NSLog(@"⚠️ 收到内存警告，检查连击状态"); - [self forceBoomStateReset]; - } -} - -#pragma mark - Private Method - -/// DiffableDataSource 开关控制（默认关闭） -- (BOOL)useDiffableDataSource { - // 可以通过配置或用户设置来控制 - return NO; // 暂时关闭，等测试完成后再开启 -} - -/// 统一的消息分发方法 - 支持 DiffableDataSource 和原有系统 -- (void)distributeMessage:(NIMMessage *)message toContainer:(MsRoomMessageMainView *)container { - if (!message || !container) return; - - if ([self useDiffableDataSource]) { - // 使用 DiffableDataSource 版本 - 直接调用 messageListView 的方法 - if ([container.messageListView respondsToSelector:@selector(addMessageWithDiffableDataSource:)]) { - [container.messageListView addMessageWithDiffableDataSource:message]; - return; - } - // 如果不支持则回退到原有方法 - } - - // 使用原有系统（带安全包装） - dispatch_async(dispatch_get_main_queue(), ^{ - @try { - switch (message.messageType) { - case NIMMessageTypeText: - [container handleNIMTextMessage:message]; - break; - case NIMMessageTypeTip: - [container handleNIMTextMessage:message]; - break; - case NIMMessageTypeImage: - [container handleNIMImageMessage:message]; - break; - case NIMMessageTypeCustom: - [container handleNIMCustomMessage:message]; - break; - case NIMMessageTypeNotification: - [container handleNIMNotificationMessage:message]; - break; - default: - break; - } - } @catch (NSException *exception) { - NSLog(@"[DistributeMessage] Caught %@: %@", exception.name, exception.reason); - } - }); -} - -- (void)safeMessageContainerCall:(NSString *)origin block:(void (^)(MsRoomMessageMainView *view))block { - MsRoomMessageMainView *view = self.messageContainerView; - if (!view || !block) { return; } - dispatch_async(dispatch_get_main_queue(), ^{ - @try { - block(view); - } @catch (NSException *exception) { - NSLog(@"[SafeMessage][%@] Caught %@: %@", origin, exception.name, exception.reason); - } - }); -} -- (void)initSubViews { - self.view.backgroundColor = [UIColor darkGrayColor]; - [self.view addSubview:self.backContainerView]; - [self.view addSubview:self.littleGameView]; - [self.view addSubview:self.messageContainerView]; - - [self.view addSubview:self.quickMessageContainerView]; - [self.view addSubview:self.menuContainerView]; - [self.view addSubview:self.sideMenu]; - [self.view addSubview:self.redPacketView]; - [self.view addSubview:self.roomHeaderView]; - [self.view addSubview:self.functionView]; - [self.view addSubview:self.animationView]; - -} - -- (void)__layoutTwentyMicStage { - [self.stageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.roomHeaderView.mas_bottom); - make.height.mas_equalTo(self.stageView.hightForStageView); - }]; -} - -- (void)__layoutNineteenMicStage { - [self.stageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.roomHeaderView.mas_bottom); - make.height.mas_equalTo(self.stageView.hightForStageView); - }]; -} - -- (void)__layoutFifteenMicStage { - [self.stageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.roomHeaderView.mas_bottom); - make.height.mas_equalTo(self.stageView.hightForStageView); - }]; -} - -- (void)__layoutTenMicStage { - [self.stageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.roomHeaderView.mas_bottom); - make.height.mas_equalTo(self.stageView.hightForStageView); - }]; -} - -- (void)initSubViewConstraints { - [self.backContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - [self.littleGameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - [self.roomHeaderView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.view); - make.height.mas_equalTo(kNavigationHeight); - }]; - - [self.messageContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.roomHeaderView.mas_bottom); - make.bottom.equalTo(self.quickMessageContainerView.mas_top).offset(-5); - make.leading.equalTo(self.view); - make.trailing.equalTo(self.sideMenu.mas_leading).offset(-10); - }]; - CGFloat quickMsgHeight = 30; - //记录最后关闭时间 - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSNumber *closeCount = [defaults objectForKey:kRoomQuickMessageCloseCount]; - if (closeCount.intValue > 3) { - quickMsgHeight = 0; - } else { - quickMsgHeight = 30; - } - [self.quickMessageContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.view).offset(- 52 - kSafeAreaBottomHeight); - make.height.mas_equalTo(0); - make.leading.trailing.mas_equalTo(self.view); - }]; - [self.menuContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - if (iPhoneXSeries) { - make.bottom.mas_equalTo(self.view); - } else { - make.bottom.mas_equalTo(-10); - } - make.height.mas_equalTo(52 + kSafeAreaBottomHeight); - }]; - - [self.sideMenu mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.messageContainerView); - make.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5); - make.width.mas_equalTo(87); - }]; - [self.redPacketView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(kGetScaleWidth(58)); - make.trailing.mas_equalTo(-kGetScaleWidth(6)); - make.bottom.mas_equalTo(-160); - }]; - [self.animationView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - - [self.functionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; -} - -- (void)updateViewConstraintsOnAnchorRoom { - [self.anchorScrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); - }]; - [self.backContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.anchorScrollView.middleImageView); - }]; - [self.roomHeaderView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self.anchorScrollView.middleImageView); - make.height.mas_equalTo(kNavigationHeight); - }]; - [self.stageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.anchorScrollView.middleImageView); - make.top.mas_equalTo(self.roomHeaderView.mas_bottom); - make.height.mas_equalTo(self.stageView.hightForStageView); - }]; - [self.messageContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.stageView.mas_bottom); - make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).mas_offset(-5); - make.leading.equalTo(self.anchorScrollView.middleImageView); - make.trailing.equalTo(self.sideMenu.mas_leading).offset(-10); - }]; - [self.quickMessageContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(0); - make.bottom.mas_equalTo(self.backContainerView).mas_offset(-5-40-8-kSafeAreaBottomHeight); - make.leading.equalTo(self.anchorScrollView.middleImageView); - make.trailing.equalTo(self.sideMenu.mas_leading).offset(-10); - }]; - [self.menuContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.anchorScrollView.middleImageView); - if (iPhoneXSeries) { - make.bottom.mas_equalTo(self.view); - } else { - make.bottom.mas_equalTo(self.view).offset(-10); - } - make.height.mas_equalTo(52 + kSafeAreaBottomHeight); - }]; - [self.sideMenu mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.messageContainerView); - make.trailing.mas_equalTo(self.anchorScrollView.middleImageView); - make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).mas_offset(-5); - make.width.mas_equalTo(87); - }]; - - [self.functionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.anchorScrollView.middleImageView); - }]; -} - -- (void)handleActivityContainerViewEvents { - @kWeakify(self); - self.sideMenu.openRedPacketHandle = ^(XPRedPacketModel * _Nullable redModel,RoomType type,BOOL isChangeRoom) { - @kStrongify(self); - if(isChangeRoom == YES){ - self.redPacketView.type = type; - self.redPacketView.redPacketList = self.sideMenu.redPacketList; - return; - } - - XPReceiveRedPacketView *view = [[XPReceiveRedPacketView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - view.delegate = self; - self.isShowRedPacket = YES; - view.receiveModel = redModel; - for (UIView *subView in self.view.subviews) { - if([subView isKindOfClass:[XPReceiveRedPacketView class]]) { - view.alphaView.backgroundColor = [UIColor clearColor]; - break; - } - } - [self.view addSubview:view]; - [self.view bringSubviewToFront:view]; - }; - - self.sideMenu.showSendGiftView = ^{ - @kStrongify(self); - NSString * roomUid = [NSString stringWithFormat:@"%ld", [self getRoomInfo].uid]; - XPSendGiftView * giftView = [[XPSendGiftView alloc] initWithType:SendGiftType_Room uid:roomUid]; - giftView.delegate = self; - NSArray * giftUses = [self configGiftUsers:[self getMicroQueue]]; - [giftView configGiftUsers:giftUses]; - [self.getCurrentNav presentViewController:giftView animated:YES completion:nil]; - }; -} - -- (NSArray *)configGiftUsers:(NSMutableDictionary *)queue { - NSMutableArray * array = [NSMutableArray array]; - for (MicroQueueModel * microModel in queue.allValues) { - if (microModel.userInfo && microModel.userInfo.uid >0) { - UserInfoModel * userInfo = microModel.userInfo; - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = userInfo.avatar; - userModel.vipMic = userInfo.vipMic; - userModel.position = [NSString stringWithFormat:@"%d", microModel.microState.position]; - userModel.uid = userInfo.uid; - if (self.getRoomInfo.type == RoomType_Anchor && microModel.microState.position == -1) {///个播房一直为离开模式，不需要添加房主位 - continue; - } - [array addObject:userModel]; - } - } - - if (self.getRoomInfo.leaveMode) { - RoomInfoModel * roomInfo= self.getRoomInfo; - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = roomInfo.avatar; - userModel.position = @"-1"; - userModel.uid = roomInfo.uid; - [array addObject:userModel]; - } else if (self.getRoomInfo.type == RoomType_Anchor) { - RoomInfoModel * roomInfo= self.getRoomInfo; - BOOL hadContainerOwner = NO; - for (UserInfoModel *userModel in array) { - if (userModel.uid == roomInfo.uid) { - hadContainerOwner = YES; - break; - } - } - if (!hadContainerOwner) { - XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init]; - userModel.avatar = roomInfo.avatar; - userModel.position = @"-1"; - userModel.uid = roomInfo.uid; - [array addObject:userModel]; - } - } - return array; -} - -- (void)exitOldRoom { - NSString * roomUid = [NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.uid]; - if (roomUid.integerValue > 0) { - if ([roomUid isEqualToString:self.roomUid]) { - self.isMiniEnter = YES; - } else { - //有最小化房间 并且要进入的房间和最小化的房间不一样的话 就先退掉 最小化的房间 - NSString * roomId = [NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.roomId]; - [self.presenter exitNIMRoom:roomId]; - [[RtcManager instance] exitRoom]; - [[XPRoomMiniManager shareManager] resetLocalMessage]; - [self.presenter reportUserOutRoom:roomUid]; - [XPSkillCardPlayerManager shareInstance].micState = MICState_None; - } - } -} --(BOOL)getIsMiniEnter{ - return self.isMiniEnter; -} -- (void)userEnterRoomSuccess { - AttachmentModel *attachment = [[AttachmentModel alloc]init]; - attachment.first = CustomMessageType_Car_Notify; - attachment.second = Custom_Message_Sub_Car_EnterRoom; - NSMutableDictionary *att = [NSMutableDictionary dictionary]; - if (self.userInfo.userVipInfoVO.enterHide) {///VIP隐身进房,不发座驾消息 - return; - } - if (self.userInfo.platformRole == 1) { - return; - } - if (self.userInfo.viewUrl.length > 0) { - [att safeSetObject:self.userInfo.nick forKey:@"nick"]; - [att safeSetObject:self.userInfo.viewUrl forKey:@"viewUrl"]; - [att safeSetObject:@(self.userInfo.otherViewType) forKey:@"otherViewType"]; - } else if (self.userInfo.carEffect.length > 0) { - [att safeSetObject:self.userInfo.carEffect forKey:@"effect"]; - [att safeSetObject:self.userInfo.nick forKey:@"nick"]; - } else { - return; - } - attachment.data = att; - NSString *sessionID = [NSString stringWithFormat:@"%ld",self.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]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; -} - -- (BOOL)updateStageView { - NSLog(@"🔄 updateStageView: 开始更新 stageView，当前 alpha = %.2f", self.stageView.alpha); - - // 优先使用 StageViewManager 来管理 stageView - if (self.stageViewManager) { - NSLog(@"🔧 updateStageView: 使用 StageViewManager"); - BOOL success = [self.stageViewManager updateStageViewForRoomType:self.roomInfo.type - roomInfo:self.roomInfo - container:self.view - delegate:self]; - if (success) { - self.stageView = self.stageViewManager.currentStageView; - [[RtcManager instance] updateDelegate:self.stageView]; - if (self.stageView) { - NSLog(@"🔧 updateStageView: StageViewManager 设置 alpha = 0 (之前 = %.2f)", self.stageView.alpha); - self.stageView.alpha = 0; - NSLog(@"✅ StageViewManager 成功更新 stageView: %@", NSStringFromClass([self.stageView class])); - return YES; - } - } - NSLog(@"⚠️ StageViewManager 更新失败，降级到原有逻辑"); - } - - // 降级处理：原有逻辑 -// NSLog(@"🔧 updateStageView: 使用降级逻辑"); -// Class stageViewClass = [self stageViewClassForRoomInfo:self.roomInfo]; -// if (stageViewClass) { //&& ![self.stageView isKindOfClass:stageViewClass]) { -// NSLog(@"🔧 updateStageView: 创建新的 stageView: %@", NSStringFromClass(stageViewClass)); -// [self.stageView removeFromSuperview]; -// self.stageView = nil; -// self.stageView = [[stageViewClass alloc] initWithDelegate:self]; -// NSLog(@"🔧 updateStageView: 降级逻辑设置 alpha = 0 (之前 = %.2f)", self.stageView.alpha); -// self.stageView.alpha = 0; -// NSLog(@"✅ 降级逻辑成功更新 stageView: %@", NSStringFromClass([self.stageView class])); -// return YES; -// } - - NSLog(@"❌ 所有 stageView 更新方法都失败了"); - return NO; -} - -- (Class)stageViewClassForRoomInfo:(RoomInfoModel *)roomInfo { - if (roomInfo.roomModeType == RoomModeType_Open_Blind) { - return [DatingStageView class]; - } - if (roomInfo.datingState == RoomDatingStateChangeType_Close && - ![self.stageView isKindOfClass:[SocialStageView class]]) { - return [SocialStageView class]; - } - if (roomInfo.type == RoomType_Anchor) { - if (roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode && - ![self.stageView isKindOfClass:[AnchorPKStageView class]]) { - return [AnchorPKStageView class]; - } else if (roomInfo.roomModeType == RoomModeType_Normal_Mode && - ![self.stageView isKindOfClass:[AnchorStageView class]]) { - return [AnchorStageView class]; - } - } else if (roomInfo.type == RoomType_MiniGame) { - return [LittleGameScrollStageView class]; - } else if (roomInfo.type == RoomType_19Mic) { - return [NineteenMicStageView class]; - } else if (roomInfo.type == RoomType_20Mic) { - return [TwentyMicStageView class]; - } else if (roomInfo.type == RoomType_15Mic) { - return [FifteenMicStageView class]; - } else if (roomInfo.type == RoomType_10Mic) { - return [TenMicStageView class]; - } else if (roomInfo.hadChangeRoomType && ![self.stageView isKindOfClass:[SocialStageView class]]) { - return [SocialStageView class]; - } - return [SocialStageView class]; -} - -- (void)changeStageViewOnRoomUpdate { - NSLog(@"🔄 changeStageViewOnRoomUpdate: 开始更新 stageView"); - - if (![self updateStageView]) { - NSLog(@"❌ changeStageViewOnRoomUpdate: updateStageView 失败"); - return; - } - - NSLog(@"✅ changeStageViewOnRoomUpdate: updateStageView 成功，当前 alpha = %.2f", self.stageView.alpha); - - // 🔧 新增：检查是否有重复的 StageView 实例 - [self checkForDuplicateStageViews]; - - // 🔧 新增：发送房间类型变化通知 - [[NSNotificationCenter defaultCenter] postNotificationName:@"RoomTypeChanged" - object:nil - userInfo:@{@"roomType": @(self.roomInfo.type)}]; - - if (!self.stageView.superview) { - NSLog(@"🔧 changeStageViewOnRoomUpdate: 添加 stageView 到视图层级"); - [self.view insertSubview:self.stageView - belowSubview:self.roomHeaderView]; - - // 防止小屏机麦位挡住按钮 - NSInteger index_sideMenu = -1; - NSInteger index_stageView = -1; - for (UIView *view in self.view.subviews) { - if (index_sideMenu == -1 || index_stageView == -1) { - if (view == self.sideMenu) { - index_sideMenu = [self.view.subviews indexOfObject:view]; - } - if (view == self.stageView) { - index_stageView = [self.view.subviews indexOfObject:view]; - } - } else { - [self.view exchangeSubviewAtIndex:index_sideMenu withSubviewAtIndex:index_stageView]; - break; - } - } - } - - NSLog(@"🔧 changeStageViewOnRoomUpdate: 设置 stageView.alpha = 1 (之前 = %.2f)", self.stageView.alpha); - self.stageView.alpha = 1; - [[RtcManager instance] updateDelegate:(id)self.stageView]; - NSLog(@"✅ changeStageViewOnRoomUpdate: stageView.alpha 已设置为 1"); - - // 调试：检查最终状态 - [self debugStageViewStatus]; - - // 🔧 新增：如果是 SocialStageView，绘制中点矩形 - [self drawSocialStageMidpointRects]; - - // 🔧 新增：进房成功后调用CP相关API - [self callMicCpListByRoomUidAfterRoomEntered]; - - // 🔧 新增：stage view类型变化时调用CP相关API - NSMutableDictionary *currentQueue = [self.stageView getMicroQueue]; - [self callMicCpListByUidListWithQueue:currentQueue]; - - // 🔧 新增：检查19 mic房间中央位置（position 6）用户资格 - [self checkCentralPositionUserQualification:currentQueue]; - - [self addExitGameButton]; - - self.quickMessageContainerView.hidden = YES; - [self.quickMessageContainerView mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(0); - }]; - - switch (self.roomInfo.type) { - case RoomType_MiniGame: { - [self.stageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.roomHeaderView.mas_bottom).offset(26 + 4); - make.height.mas_equalTo(self.stageView.hightForStageView); - }]; - CGFloat height = 80; - if (iPhoneXSeries) { - height = 100; - } - [self.messageContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(height); - make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5); - make.leading.mas_equalTo(self.view); - make.trailing.mas_equalTo(self.sideMenu.mas_leading).offset(-10); - }]; - - [self.sideMenu displayForMiniGame]; - [self.sideMenu mas_remakeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5); - make.width.mas_equalTo(87); - }]; - } - break; - default: { - [self.stageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - make.top.mas_equalTo(self.roomHeaderView.mas_bottom); - make.height.mas_equalTo(self.stageView.hightForStageView); - }]; - - [self.messageContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.stageView.mas_bottom); - make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5); - make.leading.mas_equalTo(self.view); - make.trailing.mas_equalTo(self.sideMenu.mas_leading).offset(-10); - }]; - - if (self.roomInfo.type == RoomType_19Mic || self.roomInfo.type == RoomType_20Mic) { - [self.sideMenu mas_remakeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(self.view); - make.height.mas_equalTo(160); - make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5); - make.width.mas_equalTo(87); - }]; - } else { - [self.sideMenu mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.messageContainerView); - make.trailing.mas_equalTo(self.view); - make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5); - make.width.mas_equalTo(87); - }]; - } - } - break; - } -} - -- (void)changeStageViewOnAnchorRoom { - // 🔧 内存管理：清理旧的 stageView 实例 - if (self.stageView && self.stageView.superview && self.stageViewManager.currentStageView != self.stageView) { - NSLog(@"🧹 changeStageViewOnAnchorRoom: 清理旧的 stageView 实例"); - [self.stageView removeFromSuperview]; - self.stageView = nil; - } - - // 使用 StageViewManager 来管理个播房间的 stageView 切换 - if (self.stageViewManager) { - NSLog(@"🔧 changeStageViewOnAnchorRoom: 使用 StageViewManager 进行个播房间切换"); - BOOL success = [self.stageViewManager updateStageViewForRoomType:RoomType_Anchor - roomInfo:self.roomInfo - container:self.anchorScrollView - delegate:self]; - if (success) { - self.stageView = self.stageViewManager.currentStageView; - if (self.stageView) { - NSLog(@"✅ changeStageViewOnAnchorRoom: StageViewManager 成功切换 stageView: %@", NSStringFromClass([self.stageView class])); - - // 确保 stageView 添加到正确的位置 - if (!self.stageView.superview) { - [self.anchorScrollView insertSubview:self.stageView belowSubview:self.roomHeaderView]; - } - - // 重新设置约束 - [self.stageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.anchorScrollView.middleImageView); - make.top.mas_equalTo(self.roomHeaderView.mas_bottom); - make.height.mas_equalTo(self.stageView.hightForStageView); - }]; - - // 重新设置其他相关视图的约束 - [self updateAnchorRoomLayout]; - [[RtcManager instance] updateDelegate:(id)self.stageView]; - return; - } - } - NSLog(@"⚠️ changeStageViewOnAnchorRoom: StageViewManager 切换失败，尝试降级逻辑"); - } - - // 🔧 新增：检查是否有重复的 StageView 实例 - [self checkForDuplicateStageViews]; - - // 降级逻辑：直接创建 stageView（保持原有逻辑作为兜底） - NSLog(@"🔧 changeStageViewOnAnchorRoom: 使用降级逻辑创建 stageView"); - if (self.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode && ![self.stageView isKindOfClass:[AnchorPKStageView class]]) { - [self.stageView removeFromSuperview]; - self.stageView = nil; - self.stageView = [[AnchorPKStageView alloc] initWithDelegate:self]; - } else if(self.roomInfo.roomModeType == RoomModeType_Normal_Mode && ![self.stageView isKindOfClass:[AnchorStageView class]]) { - [self.stageView removeFromSuperview]; - self.stageView = nil; - self.stageView = [[AnchorStageView alloc] initWithDelegate:self]; - } - if (!self.stageView.superview) { - [self.anchorScrollView insertSubview:self.stageView belowSubview:self.roomHeaderView]; - } - - [self.stageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.anchorScrollView.middleImageView); - make.top.mas_equalTo(self.roomHeaderView.mas_bottom); - make.height.mas_equalTo(self.stageView.hightForStageView); - }]; - - [self updateAnchorRoomLayout]; -} - -// 提取个播房间的布局更新逻辑，便于复用 -- (void)updateAnchorRoomLayout { - [self.messageContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.stageView.mas_bottom); - make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).mas_offset(-5); - make.leading.mas_equalTo(self.anchorScrollView.middleImageView); - make.trailing.mas_equalTo(self.sideMenu.mas_leading).offset(-10); - }]; - - CGFloat quickMsgHeight = 30; - //记录最后关闭时间 - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSNumber *closeCount = [defaults objectForKey:kRoomQuickMessageCloseCount]; - if (closeCount.intValue > 3 || self.roomInfo.speakTemplate.count <=0) { - quickMsgHeight = 0; - } else { - quickMsgHeight = 30; - } - self.quickMessageContainerView.titleArray = self.roomInfo.speakTemplate; - [self.quickMessageContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(0); - make.bottom.mas_equalTo(self.backContainerView).mas_offset(-5-40-8-kSafeAreaBottomHeight); - make.leading.trailing.mas_equalTo(self.anchorScrollView.middleImageView); - }]; - [self.sideMenu mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.messageContainerView); - make.trailing.mas_equalTo(self.anchorScrollView.middleImageView); - make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).mas_offset(-5); - make.width.mas_equalTo(87); - }]; -} - -- (void)setRoomInfo:(RoomInfoModel *)roomInfo { - if (_roomInfo == roomInfo) { - return; - } - _roomInfo = roomInfo; - - NSString *roomId = @(self.roomInfo.roomId).stringValue; - NSLog(@"🎮 设置房间ID: %@", roomId); - [[TurboModeStateManager sharedManager] setCurrentRoomId:roomId]; - [[LuckyPackageLogicManager sharedInstance] setRoomUid:@(roomInfo.uid).stringValue]; - [[RoomResourceManager sharedManager] updateCurrentSkinID:roomInfo.usedMicSkinId - effectID:roomInfo.usedMicEffectId]; - - [self.sideMenu updateView]; -} - -#pragma mark - Game Switch -- (void)addExitGameButton { - [self removeExitGameButton]; - - if (self.roomInfo.type != RoomType_MiniGame) { - return; - } - - if (_exitGameButton == nil) { - _exitGameButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_exitGameButton setTitle:@"切换" forState:UIControlStateNormal]; - [_exitGameButton setImage:[UIImage imageNamed:@"ms_room_game_switch_button"] forState:UIControlStateNormal]; - [_exitGameButton addTarget:self action:@selector(didTapExitGameButton) forControlEvents:UIControlEventTouchUpInside]; - } - [self.view addSubview:self.exitGameButton]; - [self.exitGameButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.stageView.mas_bottom).offset(10); - make.leading.mas_equalTo(self.view).offset(12); - make.width.height.equalTo(@21); - }]; -} - -- (void)removeExitGameButton { - [self.exitGameButton removeFromSuperview]; -} - -- (void)didTapExitGameButton { - if ([self.littleGameView isInSudGame]) { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomFunctionContainerView19")]; - } else { - @kWeakify(self); - [TTPopup alertWithMessage:YMLocalizedString(@"XPRoomFunctionContainerView20") confirmHandler:^{ - @kStrongify(self); - [XNDJTDDLoadingTool showLoading]; - [self exitLittleGame]; - } cancelHandler:^{ }]; - } -} - -- (void)exitLittleGame { - RoomInfoModel * roomInfo = self.getRoomInfo; - NSMutableDictionary * params = [NSMutableDictionary dictionary]; - NSString * ticket = [AccountInfoStorage instance].getTicket; - [params setObject:ticket forKey:@"ticket"]; - [params setObject:@(roomInfo.uid).stringValue forKey:@"uid"]; - [params setObject:[NSString stringWithFormat:@"%ld", roomInfo.uid] forKey:@"roomUid"]; - if (roomInfo.title.length > 0) { - [params setObject:roomInfo.title forKey:@"title"]; - } - - if (roomInfo.roomPwd.length > 0) { - [params setObject:roomInfo.roomPwd forKey:@"roomPwd"]; - } else{ - [params setObject:@"" forKey:@"roomPwd"]; - } - - if (roomInfo.tagId > 0) { - [params setObject:[NSString stringWithFormat:@"%ld", roomInfo.tagId] forKey:@"tagId"]; - } - - if (self.roomInfo.oldType == 0) { - self.roomInfo.oldType = RoomType_Room; - } - [params setObject:@(self.roomInfo.oldType) forKey:@"type"]; - [params setObject:@"0" forKey:@"mgId"]; - [params setObject:@(roomInfo.hasAnimationEffect) forKey:@"hasAnimationEffect"]; - - [Api ownerUpdateRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - [XNDJTDDLoadingTool hideHUD]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } params:params]; - - [self.littleGameView handleSelfInExitEvent]; - [self.littleGameView destroyMG]; -} - -#pragma mark- XPReceiveRedPacketViewDelegate -- (void)closeViewAction{ - self.isShowRedPacket = NO; - -} -#pragma mark- PIRoomEnterRedPacketViewDelegate -- (void)openRedPacketWithModel:(XPRedPacketModel *)redModel{ - XPReceiveRedPacketView *view = [[XPReceiveRedPacketView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - view.receiveModel = redModel; - view.delegate = self; - self.isShowRedPacket = YES; - for (UIView *subView in self.view.subviews) { - if([subView isKindOfClass:[XPReceiveRedPacketView class]]) { - view.alphaView.backgroundColor = [UIColor clearColor]; - break; - } - } - [self.view addSubview:view]; - [self.view bringSubviewToFront:view]; -} -#pragma mark - CountDownHelperDelegate -- (void)onCountdownFinish { - [[NSNotificationCenter defaultCenter]postNotificationName:kFreeGiftCountdownNotification object:nil userInfo:@{@"isCountdownFinish":@(YES)}]; - if(self.freeModel.curStage.integerValue < self.freeModel.maxStage.integerValue){ - [self.presenter getFreeGiftData]; - } - if(self.freeModel.curStage.intValue == 0){ - self.freeView.freeModel = self.freeModel; - if(!self.freeView.superview){ - [kWindow addSubview:self.freeView]; - } - } -} - -- (void)onCountdownOpen:(int)time { - NSInteger seconds = time; - int hours = (seconds)%(24*3600)/3600; - int minutes = (seconds)%3600/60; - int second = (seconds)%60; - [[NSNotificationCenter defaultCenter] postNotificationName:kFreeGiftCountdownNotification - object:nil - userInfo:@{@"text": [NSString stringWithFormat:@"%02d:%02d:%02d", hours, minutes, second], - @"isCountdownFinish": @(NO)}]; -} - - -- (void)cancelRoomArrangeMic { - ///退出排麦 - if (self.roomInfo.roomModeType == RoomModeType_Open_Micro_Mode || self.roomInfo.roomModeType == RoomModeType_Open_Blind) { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getRoomArrangeMicList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - ArrangeMicModel * arrangeMicModel= [ArrangeMicModel modelWithJSON:data.data]; - if (arrangeMicModel.myPos.intValue > 0) { - __block NSString * grouptype = @"0"; - if (self.roomInfo.roomModeType == RoomModeType_Open_Blind) { - [arrangeMicModel.queue enumerateObjectsUsingBlock:^(ArrangeMicUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - grouptype = [NSString stringWithFormat:@"%ld", obj.groupType]; - *stop = YES; - } - }]; - - } - [Api cancelArrangeMic:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {} roomUid:roomUid operUid:uid groupType:grouptype]; - } - } - } roomUid:roomUid operUid:uid page:@"1" pageSize:@"50"]; - }else if(self.roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getRoomPKUserList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - ArrangeMicModel * arrangeMicModel= [ArrangeMicModel modelWithJSON:data.data]; - if (arrangeMicModel.myPos.intValue > 0) { - __block NSString * grouptype = @"0"; - [arrangeMicModel.queue enumerateObjectsUsingBlock:^(ArrangeMicUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - grouptype = [NSString stringWithFormat:@"%ld", obj.groupType]; - *stop = YES; - } - }]; - [Api cancelRoomPKArrangeMic:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - } roomUid:roomUid operUid:uid groupType:grouptype]; - } - } - } roomUid:roomUid operUid:uid page:@"1" pageSize:@"50"]; - } -} - -///超管进入密码房间 -- (void)superAdminEnterPwdRoom:(RoomInfoModel *)roomInfo { - __block BOOL isSuperAdmin = NO; - [self.superMangerList enumerateObjectsUsingBlock:^(GuildSuperAdminInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.uid isEqualToString:[AccountInfoStorage instance].getUid]) { - isSuperAdmin = YES; - *stop = YES; - } - }]; - - if (!isSuperAdmin) { - isSuperAdmin = self.userInfo.platformRole == 1; - } - - if (!isSuperAdmin) { - XPRoomSettingInputView * titleView = [[XPRoomSettingInputView alloc] init]; - titleView.maxCount = 15; - titleView.delegate = self; - titleView.type = RoomSettingInputType_Input_Pwd; - TTPopupConfig * config = [[TTPopupConfig alloc] init]; - config.contentView = titleView; - config.maskBackgroundAlpha = 1; - config.shouldDismissOnBackgroundTouch = NO; - [TTPopup popupWithConfig:config]; - } else { - self.roomInfo.datingState = roomInfo.roomModeType == RoomModeType_Open_Blind ? RoomDatingStateChangeType_Open : RoomDatingStateChangeType_Normal; - [self changeStageViewOnRoomUpdate]; - [self.roomHeaderView onRoomEntered]; - [self.sideMenu onRoomEntered]; - - [self.backContainerView onRoomEntered]; - [self.littleGameView onRoomEntered]; - if ([XPRoomMiniManager shareManager].getRoomInfo.uid != self.roomUid.integerValue) {// 最小化进房 还是原来的房间的话 不需要重新进入云信 因为压根没退 - // 🔧 防护：检查是否允许进房 - if (!self.isExitingRoom && self.isViewActive) { - [self.presenter enterNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId] user:self.userInfo]; - } - [self.functionView onRoomEntered]; - [self.messageContainerView onRoomEntered]; - [self.menuContainerView onRoomEntered]; - } else { - //虽然没退出房间 但是队列还是要拿的 - [self.stageView onRoomMiniEntered]; - [self.messageContainerView onRoomMiniEntered]; - [self.functionView onRoomMiniEntered]; - [self.functionView onRoomEntered]; - [self.menuContainerView onRoomMiniEntered]; - - // 🔧 最小化进房：初始化当前用户麦位状态 - [self initializeCurrentUserMicStatusForMiniEnter]; - } - [[XPRoomMiniManager shareManager] configRoomInfo:nil]; - [[XPRoomMiniManager shareManager] configUserInfo:nil]; - [[XPRoomMiniManager shareManager] configCurrentMusic:nil isPlaying:NO]; - } -} - -///超管进个播有密码房间 -- (void)handleSuperManagerEnterAnchorRoom:(RoomInfoModel *)roomInfo { - __block BOOL isSuperAdmin = NO; - [self.superMangerList enumerateObjectsUsingBlock:^(GuildSuperAdminInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj.uid isEqualToString:[AccountInfoStorage instance].getUid]) { - isSuperAdmin = YES; - *stop = YES; - } - }]; - if (!isSuperAdmin) { - isSuperAdmin = self.userInfo.platformRole == 1; - } - if (!isSuperAdmin) { - XPRoomSettingInputView * titleView = [[XPRoomSettingInputView alloc] init]; - titleView.maxCount = 15; - titleView.delegate = self; - titleView.type = RoomSettingInputType_Input_Pwd; - TTPopupConfig * config = [[TTPopupConfig alloc] init]; - config.contentView = titleView; - config.maskBackgroundAlpha = 1; - config.shouldDismissOnBackgroundTouch = NO; - [TTPopup popupWithConfig:config]; - } else { - self.roomInfo.datingState = roomInfo.roomModeType == RoomModeType_Open_Blind ? RoomDatingStateChangeType_Open : RoomDatingStateChangeType_Normal; - if (!self.anchorScrollView.superview) { - [self.view insertSubview:self.anchorScrollView belowSubview:self.menuContainerView]; - } - [self.backContainerView removeFromSuperview]; - [self.stageView removeFromSuperview]; - [self.messageContainerView removeFromSuperview]; - [self.quickMessageContainerView removeFromSuperview]; - [self.sideMenu removeFromSuperview]; - [self.roomHeaderView removeFromSuperview]; - [self.functionView removeFromSuperview]; - - [self.anchorScrollView addSubview:self.backContainerView]; - [self.anchorScrollView addSubview:self.stageView]; - [self.anchorScrollView addSubview:self.messageContainerView]; - [self.anchorScrollView addSubview:self.quickMessageContainerView]; - [self.anchorScrollView addSubview:self.sideMenu]; - [self.anchorScrollView addSubview:self.roomHeaderView]; - if (!self.menuContainerView.superview) { - [self.view addSubview:self.menuContainerView]; - } - [self.anchorScrollView addSubview:self.functionView]; - [self.view bringSubviewToFront:self.animationView]; - - [self updateViewConstraintsOnAnchorRoom]; - [self changeStageViewOnAnchorRoom]; - - [self.roomHeaderView onRoomEntered]; - [self.sideMenu onRoomEntered]; - - - [self.backContainerView onRoomEntered]; - [self.littleGameView onRoomEntered]; - if ([XPRoomMiniManager shareManager].getRoomInfo.uid != self.roomUid.integerValue) {// 最小化进房 还是原来的房间的话 不需要重新进入云信 因为压根没退 - // 🔧 防护：检查是否允许进房 - if (!self.isExitingRoom && self.isViewActive) { - [self.presenter enterNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId] user:self.userInfo]; - } - [self.functionView onRoomEntered]; - [self.messageContainerView onRoomEntered]; - [self.menuContainerView onRoomEntered]; - } else { - //虽然没退出房间 但是队列还是要拿的 - [self.stageView onRoomMiniEntered]; - [self.messageContainerView onRoomMiniEntered]; - [self.functionView onRoomMiniEntered]; - [self.functionView onRoomEntered]; - [self.menuContainerView onRoomMiniEntered]; - - // 🔧 最小化进房：初始化当前用户麦位状态 - [self initializeCurrentUserMicStatusForMiniEnter]; - } - [[XPRoomMiniManager shareManager] configRoomInfo:nil]; - [[XPRoomMiniManager shareManager] configUserInfo:nil]; - [[XPRoomMiniManager shareManager] configCurrentMusic:nil isPlaying:NO]; - } -} -///展示个播上划引导 -- (void)showAnchorScrollTipView { - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSString *anchoScrollTip = [defaults objectForKey:kHadShowAnchorRoomTipKey]; - if (!anchoScrollTip) { - UIWindow *window = [UIApplication sharedApplication].delegate.window; - [window addSubview:self.anchorScrollTipView]; - [window bringSubviewToFront:self.anchorScrollTipView]; - } -} --(void)requesstShieldingAction{ - [self.presenter requestShieldingWithType:@"1" objId:[NSString stringWithFormat:@"%ld",self.roomInfo.uid]]; -} --(void)requestShieldingSuccess{ - [self showErrorToast:YMLocalizedString(@"RoomHeaderView11")]; - [self exitRoom]; -} -#pragma mark - 本地礼物特效更新 -- (void)myGiftEffectUpdate:(NSNotification *)notification { - NSDictionary * dic = notification.object; - self.roomInfo.hasAnimationEffect = ((NSNumber *)dic[@"hasAnimationEffect"]).boolValue; - self.hasAnimationEffect = self.roomInfo.hasAnimationEffect; - [self.roomHeaderView onRoomUpdate]; -} -#pragma mark - XPRoomProtocol -///获取已解锁照片id列表 --(void)getUnlockRoomAlbumPhotoListSuccessWithList:(NSArray *)list{} -///获取踢人房间列表 --(void)getKickUserListSuccessWithList:(NSArray *)list{ - NSString *uid = [[AccountInfoStorage instance]getUid]; - for (id obj in list) { - if([obj integerValue] == [uid integerValue]){ - [self exitRoom]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomViewController0")]; - break; - } - } -} - -- (void)handleRoomWithPasswordAfterInitRoom { - if (!self.isRequestSuperAdmin) { - @kWeakify(self); - [Api getRoomSuperAdminList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - NSArray * array = [GuildSuperAdminInfoModel modelsWithArray:data.data]; - self.superMangerList = array; - [self superAdminEnterPwdRoom:self.roomInfo]; - } roomUid:self.roomUid]; - } else { - [self superAdminEnterPwdRoom:self.roomInfo]; - } -} - -- (void)handleRoomWithoutPasswordAfterInitRoom { - NSLog(@"🔄 handleRoomWithoutPasswordAfterInitRoom: 开始处理无密码房间"); - - self.roomInfo.datingState = (self.roomInfo.roomModeType == RoomModeType_Open_Blind) ? - RoomDatingStateChangeType_Open : - RoomDatingStateChangeType_Normal; - - NSLog(@"🔧 handleRoomWithoutPasswordAfterInitRoom: 调用 changeStageViewOnRoomUpdate"); - [self changeStageViewOnRoomUpdate]; - NSLog(@"✅ handleRoomWithoutPasswordAfterInitRoom: changeStageViewOnRoomUpdate 完成"); - [self.roomHeaderView onRoomEntered]; - [self.sideMenu onRoomEntered]; - - [self.backContainerView onRoomEntered]; - [self.littleGameView onRoomEntered]; - - self.quickMessageContainerView.titleArray = self.roomInfo.speakTemplate; - - if ([XPRoomMiniManager shareManager].getRoomInfo.uid != self.roomUid.integerValue) { - [self.functionView onRoomEntered]; - [self.messageContainerView onRoomEntered]; - [self.menuContainerView onRoomEntered]; - - // 通知云信重新进房 - [self.presenter enterNIMRoom:@(self.roomInfo.roomId).stringValue - user:self.userInfo]; - } else { - //虽然没退出房间 但是队列还是要拿的 - [self.stageView onRoomMiniEntered]; - - [self.functionView onRoomMiniEntered]; - [self.sideMenu onRoomMiniEntered]; - [self.functionView onRoomEntered]; - [self.menuContainerView onRoomMiniEntered]; - // PK 状态下，从最小化进房需要模仿初始化房间，丢 2 次 roominfo 进去 functionView - if (self.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode || - self.roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { - [self.functionView onRoomEntered]; - } - - [self.messageContainerView onRoomMiniEntered]; - - // 🔧 最小化进房：初始化当前用户麦位状态 - [self initializeCurrentUserMicStatusForMiniEnter]; - } - [self cleanMiniRoomStatues]; -} - -- (void)enterMyRoom { - if (self.roomInfo.roomId > 0) { // 存在房间信息，直接使用房间信息开房 - if (self.roomInfo.type == RoomType_MiniGame && - self.roomInfo.mgId > 0) { - self.mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - } - [self.presenter openRoom:self.roomInfo.title - type:self.roomInfo.type - roomPwd:self.roomInfo.roomPwd - roomDesc:self.roomInfo.roomDesc - backPic:@"" - mgId:self.mgId]; - } else { // 不存在房间信息，全新开房 - NSString* title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomViewController1"), self.userInfo.nick]; - RoomType type = RoomType_Room; - if (self.mgId.length > 0) { - type = RoomType_MiniGame; - } - [self.presenter openRoom:title - type:type - roomPwd:@"" - roomDesc:@"" - backPic:@"" - mgId:self.mgId]; - } -} - -- (void)cleanMiniRoomStatues { - [[XPRoomMiniManager shareManager] configRoomInfo:nil]; - [[XPRoomMiniManager shareManager] configUserInfo:nil]; - [[XPRoomMiniManager shareManager] configCurrentMusic:nil isPlaying:NO]; -} - -- (void)initEnterRoomSuccess:(RoomInfoModel *)roomInfo user:(UserInfoModel *)userInfo { - [XNDJTDDLoadingTool hideHUDInView:self.navigationController.view]; - - [XPSkillCardPlayerManager shareInstance].roomUid = @(roomInfo.uid).stringValue; - - userInfo.fromUid = self.fromUid; - userInfo.fromType = self.fromType; - userInfo.fromNick = self.fromNick; - - self.hasAnimationEffect = roomInfo.hasAnimationEffect; - self.roomInfo = roomInfo; - self.userInfo = userInfo; - - // 修复：首次获取roominfo成功后，同步礼物特效状态到开关 - NSString *roomId = @(roomInfo.roomId).stringValue; - [[TurboModeStateManager sharedManager] updateGiftEffectsForRoom:roomId - enabled:roomInfo.hasAnimationEffect - fromUser:NO]; - // 进入房间后重置用户覆盖标记 - [[TurboModeStateManager sharedManager] setGiftEffectsOverrideForRoom:roomId enabled:NO]; - - [self requestBoomData]; - - @kWeakify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_global_queue(0, 0), ^{ - @kStrongify(self); - //获取一下红包信息 - [self.presenter getRedPacket:[NSString stringWithFormat:@"%ld", self.roomInfo.uid]]; - [self getOnlineCount]; - }); - - switch (roomInfo.type) { - case RoomType_Anchor: - [self handleInitAnchorRoom]; - [self showAnchorScrollTipView]; - break; - - default: { - if (roomInfo.valid) { // 房间有效，直接进入房间 - if (roomInfo.roomPwd.length > 0 && - roomInfo.uid != [AccountInfoStorage instance].getUid.integerValue && - [XPRoomMiniManager shareManager].getRoomInfo.uid != self.roomUid.integerValue) {//进房密码的情况 - [self handleRoomWithPasswordAfterInitRoom]; - } else { - [self handleRoomWithoutPasswordAfterInitRoom]; - } - } else { // 房间无效，分是否为自己房间进行处理 - if ([self.roomUid isEqualToString:[NSString stringWithFormat:@"%ld", userInfo.uid]]) { - // 当前用户进入自己房间 - [self enterMyRoom]; - } else { // 当前用户进入别人房间 - [self showSuccessToast:YMLocalizedString(@"XPRoomViewController2")]; - [self enterRoomFail:0]; - } - } } - break; - } - - [self.menuContainerView recheckMicState]; -} - -- (void)openRoomSuccess:(RoomInfoModel *)roomInfo { - [XNDJTDDLoadingTool hideHUDInView:self.navigationController.view]; - - self.roomInfo = roomInfo; - [XPSkillCardPlayerManager shareInstance].is9Mic = roomInfo.type == RoomType_Room; - - if (roomInfo.type == RoomType_Anchor) { - [self handleInitAnchorRoom]; - [self showAnchorScrollTipView]; - return; - } - - [self changeStageViewOnRoomUpdate]; - [self.roomHeaderView onRoomEntered]; - [self.sideMenu onRoomEntered]; - - [self.backContainerView onRoomEntered]; - [self.littleGameView onRoomEntered]; - [self.functionView onRoomEntered]; - [self.messageContainerView onRoomEntered]; - - self.quickMessageContainerView.titleArray = self.roomInfo.speakTemplate; - - // 🔧 防护：检查是否允许进房 - if (!self.isExitingRoom && self.isViewActive) { - [self.presenter enterNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId] user:self.userInfo]; - } -} - -- (void)enterRoomSuccess:(NIMChatroom *)chatRoom { - [XNDJTDDLoadingTool hideHUDInView:self.navigationController.view]; - - // 🔧 防护：检查 VC 是否仍然有效 - if (self.isExitingRoom || !self.isViewActive) { - NSLog(@"🔧 enterRoomSuccess: VC 已退出或不可见，忽略回调"); - return; - } - - [self.stageView onRoomEntered]; - [self.functionView onRoomEntered]; - - // 🔧 新增：初始化当前用户的麦位状态 - [self initializeCurrentUserMicStatus]; - - // 🔧 首次进房：尝试在初始化就绪后触发按房间UID的CP拉取（幂等） - [self tryRequestInitialCpByRoomUidIfNeeded]; - - //上报进房 - if (self.roomInfo != nil) { - [self.presenter reportUserInterRoom:[NSString stringWithFormat:@"%zd", self.roomInfo.uid]]; - } - if (self.giftId.length) { - ///有的时候 拉取麦序的话 可能会有点延迟 导致送礼物的人 没有拉取到 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [[NSNotificationCenter defaultCenter] postNotificationName:@"kShowGiftView" object:@{@"giftId": self.giftId}]; - }); - } -} - -/// 幂等触发：按房间UID拉取全量CP，仅在初始化完成后触发一次 -- (void)tryRequestInitialCpByRoomUidIfNeeded { - @synchronized (self) { - if (self.hasRequestedInitialCpByRoomUid) { return; } - if (!self.hasCompletedRoomInitialization) { return; } - if (self.isExitingRoom || !self.isViewActive) { return; } - self.hasRequestedInitialCpByRoomUid = YES; - } - NSString *roomUid = [NSString stringWithFormat:@"%ld", (long)self.roomInfo.uid]; - [self.presenter micCpListByRoomUid:roomUid]; -} - -- (void)enterRoomFail:(NSInteger)code { - [XNDJTDDLoadingTool hideHUDInView:self.navigationController.view]; - [self hideHUD]; - - // 🔧 防护：检查 VC 是否仍然有效 - if (self.isExitingRoom || !self.isViewActive) { - NSLog(@"🔧 enterRoomFail: VC 已退出或不可见，忽略回调 (code: %ld)", (long)code); - return; - } - - if (code == 13003) { - [self showErrorToast:YMLocalizedString(@"XPRoomViewController3")]; - } - [self dismissViewControllerAnimated:YES completion:nil]; -} - --(void)getOnlineCount{ - @kWeakify(self); - [Api requestRoomOnlineUserList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - if(code == 200){ - NSMutableArray *temp = @[].mutableCopy; - NSArray *list = [XPMessageRemoteExtModel modelsWithArray:data.data]; - for (XPMessageRemoteExtModel *model in list) { - if (model.platformRole != 1) { - [temp addObject:model]; - } - } - self.roomInfo.onlineNum = temp.count; - [self.functionView updateOnlineCount:[NSString stringWithFormat:@"%ld",temp.count] countList:temp.copy isUpdateCount:NO]; - } - // 更安全的輪詢 - @kWeakify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(60 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - if (self) { - [self getOnlineCount]; - } - }); - } roomUid:self.roomUid]; -} -///请求房间超管成功 -///这个接口本来是想和roominfo 和userinfo 一起请求的 但是 进房的同步操作 只有超管进入密码房间才会有同步的问题 -- (void)getRoomSuperAdminSuccess:(NSArray *)list { - self.isRequestSuperAdmin = YES; - self.superMangerList = list; -} - -///获取推荐滚动的个播房列表（只有第一次进房获取) -- (void)getNextAnchorRoomSuccess:(RoomInfoModel *)roomInfo { - [self hideHUD]; - if (roomInfo) { //获取下一个房间成功 - if (![self.anchorRoomList containsObject:self.roomUid]) { - [self.anchorRoomList addObject:self.roomUid]; - } - self.anchorIndex = self.anchorRoomList.count -1; - //1、退出房间操作 - self.anchorScrollView.isCanScrollTop = YES; - self.anchorScrollView.contentOffset = CGPointMake(0, KScreenHeight); - self.isRequestSuperAdmin = NO; - [self exitOldRoom]; - [self.presenter exitNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId]]; - [[XPRoomMiniManager shareManager] resetLocalMessage]; - [[RtcManager instance] exitRoom]; - [self.presenter reportUserOutRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.uid]]; - [self.functionView onRoomChange]; - //2、移除房间子控件 - [self.stageView removeFromSuperview]; - [self.messageContainerView removeFromSuperview]; - [self.quickMessageContainerView removeFromSuperview]; - [self.sideMenu removeFromSuperview]; - [self.roomHeaderView removeFromSuperview]; - [self.functionView removeFromSuperview]; - self.functionView = nil; - self.messageContainerView = nil; - self.stageView = nil; - [self.menuContainerView removeFromSuperview]; - self.menuContainerView = nil; - //3、重新进入房间 - self.roomUid = [NSString stringWithFormat:@"%zd", roomInfo.uid]; - [self.presenter initEnterRoom:self.roomUid user:[AccountInfoStorage instance].getUid]; - /// 公屏 福袋礼物爆出的礼物 需要依赖 当前房间中的礼物列表 需要提前获取礼物列表 可以拿到礼物 没有想到别的方法去解决这个问题 有需要改的在修改吧 - [self.presenter getNormalGiftList:self.roomUid]; - ///获取房间超管列表 - [self.presenter getRoomSuperAdmin:self.roomUid]; - } else { - if (self.anchorScrollView.isCanScrollTop) { - self.anchorScrollView.contentOffset = CGPointMake(0, KScreenHeight); - } else { - self.anchorScrollView.contentOffset = CGPointMake(0, 0); - } - [self showErrorToast:YMLocalizedString(@"XPRoomViewController4")]; - } -} - -- (void)getCurrentRoomInfoSuccess:(RoomInfoModel *)roomInfo { - [self hideHUD]; - self.anchorScrollView.contentOffset = CGPointMake(0, KScreenHeight); - if (roomInfo && roomInfo.valid) { - //1、退出房间操作 - self.isRequestSuperAdmin = NO; - [self exitOldRoom]; - [self.presenter exitNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId]]; - [[XPRoomMiniManager shareManager] resetLocalMessage]; - [[RtcManager instance] exitRoom]; - [self.presenter reportUserOutRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.uid]]; - //2、移除房间子控件 - // [self.backContainerView removeFromSuperview]; - [self.stageView removeFromSuperview]; - [self.messageContainerView removeFromSuperview]; - [self.quickMessageContainerView removeFromSuperview]; - [self.sideMenu removeFromSuperview]; - [self.roomHeaderView removeFromSuperview]; - [self.functionView removeFromSuperview]; - self.functionView = nil; - self.messageContainerView = nil; - self.stageView = nil; - [self.menuContainerView removeFromSuperview]; - self.menuContainerView = nil; - //3、重新进入房间 - self.roomUid = [NSString stringWithFormat:@"%zd", roomInfo.uid]; - [self.presenter initEnterRoom:self.roomUid user:[AccountInfoStorage instance].getUid]; - /// 公屏 福袋礼物爆出的礼物 需要依赖 当前房间中的礼物列表 需要提前获取礼物列表 可以拿到礼物 没有想到别的方法去解决这个问题 有需要改的在修改吧 - [self.presenter getNormalGiftList:self.roomUid]; - ///获取房间超管列表 - [self.presenter getRoomSuperAdmin:self.roomUid]; - } else { - [self showErrorToast:YMLocalizedString(@"XPRoomViewController5")]; - } -} - -///个播房初始化一些操作 -- (void)handleInitAnchorRoom { - if (self.roomInfo.valid) { // 房间有效，直接进入房间 - if (self.roomInfo.roomPwd.length > 0 && - self.roomInfo.uid != [AccountInfoStorage instance].getUid.integerValue && - [XPRoomMiniManager shareManager].getRoomInfo.uid != self.roomUid.integerValue) {//进房密码的情况 - if (!self.isRequestSuperAdmin) { - @kWeakify(self); - [Api getRoomSuperAdminList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - NSArray * array = [GuildSuperAdminInfoModel modelsWithArray:data.data]; - self.superMangerList = array; - [self handleSuperManagerEnterAnchorRoom:self.roomInfo]; - } roomUid:self.roomUid]; - } else { - [self handleSuperManagerEnterAnchorRoom:self.roomInfo]; - } - } else { - self.roomInfo.datingState = self.roomInfo.roomModeType == RoomModeType_Open_Blind ? RoomDatingStateChangeType_Open : RoomDatingStateChangeType_Normal; - - [self __removeAllViews]; - - if (!self.anchorScrollView.superview) { - [self.view addSubview:self.anchorScrollView]; - } - - [self.anchorScrollView addSubview:self.backContainerView]; - [self.anchorScrollView addSubview:self.stageView]; - [self.anchorScrollView addSubview:self.messageContainerView]; - [self.anchorScrollView addSubview:self.quickMessageContainerView]; - [self.anchorScrollView addSubview:self.sideMenu]; - [self.anchorScrollView addSubview:self.roomHeaderView]; - [self.anchorScrollView addSubview:self.menuContainerView]; - [self.anchorScrollView addSubview:self.functionView]; - [self.view bringSubviewToFront:self.animationView]; - - [self updateViewConstraintsOnAnchorRoom]; - [self changeStageViewOnAnchorRoom]; - - [self.roomHeaderView onRoomEntered]; - [self.sideMenu onRoomEntered]; - - - [self.backContainerView onRoomEntered]; - [self.littleGameView onRoomEntered]; - if ([XPRoomMiniManager shareManager].getRoomInfo.uid != self.roomUid.integerValue) {// 最小化进房 还是原来的房间的话 不需要重新进入云信 因为压根没退 - // 🔧 防护：检查是否允许进房 - if (!self.isExitingRoom && self.isViewActive) { - [self.presenter enterNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId] user:self.userInfo]; - } - [self.functionView onRoomEntered]; - [self.messageContainerView onRoomEntered]; - [self.menuContainerView onRoomEntered]; - } else { - //虽然没退出房间 但是队列还是要拿的 - [self.stageView onRoomMiniEntered]; - [self.messageContainerView onRoomMiniEntered]; - [self.functionView onRoomMiniEntered]; - [self.functionView onRoomEntered]; - [self.menuContainerView onRoomMiniEntered]; - - // 🔧 最小化进房：初始化当前用户麦位状态 - [self initializeCurrentUserMicStatusForMiniEnter]; - } - - [self cleanMiniRoomStatues]; - } - } else { // 房间无效，分是否为自己房间进行处理 - if ([self.roomUid isEqualToString:[NSString stringWithFormat:@"%ld", self.userInfo.uid]]) { // 当前用户进入自己房间 - if (self.roomInfo.roomId > 0) { // 存在房间信息，直接使用房间信息开房 - if (self.roomInfo.type == RoomType_MiniGame && self.roomInfo.mgId > 0) { - self.mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - } - [self.presenter openRoom:self.roomInfo.title type:self.roomInfo.type roomPwd:self.roomInfo.roomPwd roomDesc:self.roomInfo.roomDesc backPic:@"" mgId:self.mgId]; - } else { // 不存在房间信息，全新开房 - NSString* title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomViewController6"), self.userInfo.nick]; - RoomType type = RoomType_Room; - if (self.mgId.length > 0) { - type = RoomType_MiniGame; - } - [self.presenter openRoom:title type:type roomPwd:@"" roomDesc:@"" backPic:@"" mgId:self.mgId]; - } - } else { // 当前用户进入别人房间 - [self showSuccessToast:YMLocalizedString(@"XPRoomViewController7")]; - [self enterRoomFail:0]; - } - } -} -- (void)getRedPacketInfoSuccess:(XPRedPacketModel *)redInfo{ - XPReceiveRedPacketView *view = [[XPReceiveRedPacketView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - view.delegate = self; - self.isShowRedPacket = YES; - redInfo.validityType = 0; - redInfo.kind = 1; - view.receiveModel = redInfo; - view.inAllPacketRoom = YES; - for (UIView *subView in self.view.subviews) { - if([subView isKindOfClass:[XPReceiveRedPacketView class]]) { - view.alphaView.backgroundColor = [UIColor clearColor]; - break; - } - } - [self.view addSubview:view]; - [self.view bringSubviewToFront:view]; -} - -- (void)getRedPacketSuccess:(NSArray *)list { - if(list.count > 0){ - self.sideMenu.redPacketList = [NSMutableArray arrayWithArray:list]; - } -} - --(void)getFreeGiftDataSuccess:(XPFreeGiftModel *)freeModel{ - self.freeModel = freeModel; - self.menuContainerView.freeModel = freeModel; - if(self.freeModel.curStage.integerValue < self.freeModel.maxStage.integerValue){ - [CountDownHelper shareHelper].isCountdownFinish = NO; - [[CountDownHelper shareHelper] openCountdownWithTime:freeModel.curStageSecond.intValue]; - }else{ - if([CountDownHelper shareHelper].isCountdownFinish == NO){ - [CountDownHelper shareHelper].isCountdownFinish = YES; - } - [[NSNotificationCenter defaultCenter]postNotificationName:kFreeGiftCountdownNotification object:nil userInfo:@{@"isHiddenCountdown":@(YES)}]; - [[CountDownHelper shareHelper] stopCountDown]; - } - - if(self.freeModel.curStage.intValue > 0 && [[XPRoomMiniManager shareManager].curState isEqualToString:@"0"]){ - self.freeView.freeModel = self.freeModel; - if(!self.freeView.superview){ - [kWindow addSubview:self.freeView]; - } - [XPRoomMiniManager shareManager].curState = nil; - } -} - - -#pragma mark - NIMChatroomManagerDelegate -- (void)chatroomBeKicked:(NIMChatroomBeKickedResult *)result { - - if (result.reason == 5) { - [self showErrorToast:YMLocalizedString(@"XPRoomViewController9")]; - } - [self.presenter exitNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId]]; - [[XPRoomMiniManager shareManager] resetLocalMessage]; - [self cancelRoomArrangeMic]; - [[RtcManager instance] exitRoom]; - [self.presenter reportUserOutRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.uid]]; - [self.littleGameView handleSelfInExitEvent]; - [self.littleGameView destroyMG]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - -#pragma mark - NIMChatManagerDelegate -- (void)__removeAllViews { - [self.anchorScrollView removeFromSuperview]; - [self.backContainerView removeFromSuperview]; - [self.stageView removeFromSuperview]; - [self.messageContainerView removeFromSuperview]; - [self.quickMessageContainerView removeFromSuperview]; - [self.sideMenu removeFromSuperview]; - [self.roomHeaderView removeFromSuperview]; - [self.functionView removeFromSuperview]; - [self.menuContainerView removeFromSuperview]; -} - -- (void)onRecvMessages:(NSArray *)messages { - // 入口排查日志：批次大小、线程和时间戳 - for (NIMMessage * message in messages) { - ///房间内收到p2p的消息 比如升级消息 - if (message.session.sessionType == NIMSessionTypeP2P) { - if(message.messageType == NIMMessageTypeCustom) { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel * attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_User_UpGrade) { - ContentLevelUpgradeModel * levelInfo = [ContentLevelUpgradeModel modelWithDictionary:attachment.data]; - if (attachment.second == Custom_Message_Sub_User_UpGrade_Exper) { - self.userInfo.userLevelVo.experLevelSeq = levelInfo.levelSeq; - } else if(attachment.second == Custom_Message_Sub_User_UpGrade_Charm) { - self.userInfo.userLevelVo.charmLevelSeq = levelInfo.levelSeq; - } - } - } - } - } - - // 非房间内消息不处理（记录过滤原因） - if (message.session.sessionType != NIMSessionTypeChatroom) { - continue; - } - - if (![message.session.sessionId isEqualToString:@(self.roomInfo.roomId).stringValue]) { - continue; - } - - NSLog(@"[Recv] --- Message Raw Attach Content: %@, %@, %ld", @(message.senderClientType), message.rawAttachContent, (long)message.messageType); - - if (message.messageType == NIMMessageTypeNotification) { - [self handleNIMNotificationTypeMessage:message]; - } else if (message.messageType == NIMMessageTypeCustom) { - [self handleNimCustomTypeMessage:message]; - } else if(message.messageType == NIMMessageTypeText) { - [self distributeMessage:message toContainer:self.messageContainerView]; - [self.littleGameView handleNIMTextMessage:message]; - } else if(message.messageType == NIMMessageTypeTip) { - [self distributeMessage:message toContainer:self.messageContainerView]; - }else if(message.messageType == NIMMessageTypeImage){ - [self distributeMessage:message toContainer:self.messageContainerView]; - } - } -} - -- (void)handleNIMNotificationTypeMessage:(NIMMessage *)message { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - - if (![notiMsg.content isKindOfClass:[NIMChatroomNotificationContent class]]) { - // content 可能为其他类型，不处理 - return; - } - - NSInteger onLineNumber = self.roomInfo.onlineNum; - switch (content.eventType) { - case NIMChatroomEventTypeInfoUpdated: // 麦序状态更新 - { - NSDictionary *data = [content.notifyExt toJSONObject]; - [self handleSwitchRoomType:data]; - } - break; - case NIMChatroomEventTypeEnter: - { - if (content.source.userId.integerValue == [AccountInfoStorage instance].getUid.integerValue){ - [self.presenter getKickUserListWithRoomUid:@(self.roomInfo.uid).stringValue]; - } - if (content.source.userId.integerValue != [AccountInfoStorage instance].getUid.integerValue && self.userInfo.platformRole != 1) { - onLineNumber += 1; - }else { - ///如果是自己的话 如果有坐骑的话 - [self userEnterRoomSuccess]; - ///在活动页面 判断是否显示 相亲加入的按钮 所以需要等用户进房成功之后才能获取 房间角色 - [self.sideMenu onRoomUpdate]; - - [self.menuContainerView onRoomUpdate]; - } - - break; - } - case NIMChatroomEventTypeAddBlack: - case NIMChatroomEventTypeKicked: - case NIMChatroomEventTypeExit: - onLineNumber = MAX(onLineNumber - 1, 0); - // 🔧 新增：若退出用户与CP相关，移除其CP SVGA并重绘 - if (content.source && content.source.userId.length > 0) { - NSInteger exitUid = content.source.userId.integerValue; - if (exitUid > 0) { - [self removeCpDataForUids:@[@(exitUid)]]; - // 构造剩余在麦用户列表，触发一次 CP 刷新，等价于补充一次"下麦"的逻辑 - NSMutableDictionary *currentQueue = [self.stageView getMicroQueue]; - if (currentQueue) { - NSMutableArray *remainingUids = [NSMutableArray array]; - for (NSString *positionKey in currentQueue.allKeys) { - MicroQueueModel *micModel = currentQueue[positionKey]; - NSInteger uid = micModel.userInfo.uid; - if (uid > 0 && uid != exitUid) { - [remainingUids addObject:[NSString stringWithFormat:@"%ld", (long)uid]]; - } - } - if (remainingUids.count > 0) { - [self.presenter micCpListByUidList:remainingUids]; - } - } - [self drawSocialStageMidpointRects]; - } - } - break; - case NIMChatroomEventTypeQueueChange: // 麦序上下麦 - { - NSDictionary* data = (NSDictionary *)content.ext; - UserInfoModel* userInfo = [UserInfoModel modelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]]; - NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue]; - - NSLog(@"🔧 接收到麦序变化通知：用户 %ld，变化类型 %ld", (long)userInfo.uid, (long)changeType); - - // 处理排麦场景 - if (changeType == 1 && userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - [self cancelRoomArrangeMic]; - } - - // 他人上麦：通过自定义消息同步CP，直接返回 - if (changeType == 1 && userInfo.uid != [AccountInfoStorage instance].getUid.integerValue) { - // 🔧 改进：处理其他用户上麦场景 - [self handleOtherUserMicChange:userInfo changeType:changeType]; - } else { - // 他人下麦：仅更新缓存与显示，跳过 API - if (changeType == 2 && userInfo.uid != [AccountInfoStorage instance].getUid.integerValue) { - // 🔧 改进：处理其他用户切换mic场景 - [self handleOtherUserMicChange:userInfo changeType:changeType]; - } else { - NSNumber *key = nil; - if ([notiMsg respondsToSelector:@selector(attachContent)]) { - NSString *jsonString = (NSString *)[notiMsg performSelector:@selector(attachContent)]; - NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding]; - NSError *error = nil; - NSDictionary *attachData = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error]; - if (!error) { - NSDictionary *dataDic = [attachData objectForKey:@"data"]; - NSString *queueChange = [dataDic objectForKey:@"queueChange"]; - if (![NSString isEmpty:queueChange]) { - jsonData = [queueChange dataUsingEncoding:NSUTF8StringEncoding]; - NSError *e = nil; - NSDictionary *queueChangeData = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error]; - if (!e) { - key = [queueChangeData objectForKey:@"key"]; - } - } - } - } - if (key) { - // 通过 key 更新麦位队列 - NSInteger position = key.integerValue; - NSMutableDictionary *currentQueue = [self.stageView getMicroQueue]; - if (currentQueue) { - for (NSString *key in [currentQueue allKeys]) { - if (key.integerValue == position) { - MicroQueueModel *model = [currentQueue objectForKey:key]; - if (changeType == 2) { - // 用户下 mic - model.userInfo = nil; - } else { - // 用户上 mic - model.userInfo = userInfo; - } - break; - } - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self handleMicChangeForCP:currentQueue]; - }); - } - } else { - // 获取最新的麦位队列 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - NSMutableDictionary *currentQueue = [self.stageView getMicroQueue]; - if (currentQueue) { - [self handleMicChangeForCP:currentQueue]; - } - }); - } - } - } - } - break; - case NIMChatroomEventTypeAddManager: { - NIMChatroomNotificationMember *targets = [content.targets firstObject]; - if (targets.userId.integerValue == self.userInfo.uid) { - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"1.0.34_text_15")]; - } - - } - break; - case NIMChatroomEventTypeRemoveManager: { - NIMChatroomNotificationMember *targets = [content.targets firstObject]; - if (targets.userId.integerValue == self.userInfo.uid) { - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"1.0.34_text_16")]; - } - } - break; - default: - break; - } - self.roomInfo.onlineNum = onLineNumber; - [self.functionView updateOnlineCount:[NSString stringWithFormat:@"%ld",onLineNumber] countList:@[] isUpdateCount:YES]; - [self.roomHeaderView onRoomUpdate]; - [self.stageView handleNIMNotificationMessage:message]; - [self.animationView handleNIMNotificationMessage:message]; - [self distributeMessage:message toContainer:self.messageContainerView]; - [self.sideMenu handleNIMNotificationMessage:message]; - [self.menuContainerView handleNIMNotificationMessage:message]; - [self.functionView handleNIMNotificationMessage:message]; - [self.littleGameView handleNIMNotificationMessage:message]; - if([self.stageView findMicroViewByUid:@(self.userInfo.uid).stringValue] != nil){ - [XPSkillCardPlayerManager shareInstance].isMineInMic = YES; - }else{ - [XPSkillCardPlayerManager shareInstance].isMineInMic = NO; - }; -} - -- (void)handleSwitchRoomType:(NSDictionary *)data { - int type = [data[@"type"] intValue]; - switch (type) { - case 1: // 房间信息变化 - case 3: // 房间信息 & 麦位信息变化 - { - NSMutableDictionary *lastRoomInfoDic = [NSMutableDictionary dictionaryWithDictionary:[self.roomInfo model2dictionary]]; - [lastRoomInfoDic addEntriesFromDictionary: ((NSString *)data[@"roomInfo"]).toJSONObject]; - RoomInfoModel *newRoomInfo = [RoomInfoModel modelWithJSON:lastRoomInfoDic]; - - if (newRoomInfo.type != RoomType_MiniGame) { - newRoomInfo.mgId = 0; - } - newRoomInfo.hasAnimationEffect = self.hasAnimationEffect; - if (newRoomInfo.roomModeType == RoomModeType_Open_Blind && self.roomInfo.roomModeType != RoomModeType_Open_Blind) { - ///普通房 切换为相亲房 - newRoomInfo.datingState = RoomDatingStateChangeType_Open; - } else if(newRoomInfo.roomModeType != RoomModeType_Open_Blind && self.roomInfo.roomModeType == RoomModeType_Open_Blind) { - ///关闭了相亲房 - newRoomInfo.datingState = RoomDatingStateChangeType_Close; - } else { - newRoomInfo.datingState = RoomDatingStateChangeType_Normal; - } - //房间类型是否变更了（从个播->普通，个播->小游戏等) - newRoomInfo.hadChangeRoomType = self.roomInfo.type != newRoomInfo.type; - BOOL anchorToOther = newRoomInfo.type != RoomType_Anchor && self.roomInfo.type == RoomType_Anchor;//个播变其他房 - self.roomInfo = newRoomInfo; - - [self.backContainerView onRoomUpdate]; - - self.quickMessageContainerView.titleArray = self.roomInfo.speakTemplate; - if (self.roomInfo.type == RoomType_Anchor && self.roomInfo.hadChangeRoomType) {///从其他房变为个播房 - [self handleInitAnchorRoom]; - [self showAnchorScrollTipView]; - } else if (anchorToOther) { - [self __removeAllViews]; - - [self.view addSubview:self.backContainerView]; - [self.view addSubview:self.stageView]; - [self.view addSubview:self.messageContainerView]; - [self.view addSubview:self.quickMessageContainerView]; - [self.view addSubview:self.menuContainerView]; - [self.view addSubview:self.sideMenu]; - [self.view addSubview:self.roomHeaderView]; - [self.view bringSubviewToFront:self.menuContainerView]; - [self.view addSubview:self.functionView]; - [self.view bringSubviewToFront:self.animationView]; - - [self initSubViewConstraints]; - [self changeStageViewOnRoomUpdate]; - [self.stageView onRoomUpdate]; - [self.menuContainerView onRoomUpdate]; - [self.functionView onRoomUpdate]; - [self.sideMenu onRoomUpdate]; - [self.messageContainerView onRoomUpdate]; - [self.littleGameView onRoomUpdate]; - } else { - if (self.roomInfo.type == RoomType_Anchor) { - [self changeStageViewOnAnchorRoom]; - } else if (self.roomInfo.type == RoomType_20Mic) { - [self __layoutTwentyMicStage]; - [self changeStageViewOnRoomUpdate]; -// [self.twentyMicStageView onRoomUpdate]; - } else if (self.roomInfo.type == RoomType_19Mic) { - [self __layoutNineteenMicStage]; - [self changeStageViewOnRoomUpdate]; -// [self.nineteenMicStageView onRoomUpdate]; - } else if (self.roomInfo.type == RoomType_15Mic) { - [self __layoutFifteenMicStage]; - [self changeStageViewOnRoomUpdate]; -// [self.fifteenMicStageView onRoomUpdate]; - } else if (self.roomInfo.type == RoomType_10Mic) { - [self __layoutTenMicStage]; - [self changeStageViewOnRoomUpdate]; -// [self.tenMicStageView onRoomUpdate]; - } else { - [self changeStageViewOnRoomUpdate]; - } - [self.stageView onRoomUpdate]; - [self.menuContainerView onRoomUpdate]; - [self.functionView onRoomUpdate]; - [self.sideMenu onRoomUpdate]; - - [self.messageContainerView onRoomUpdate]; - [self.littleGameView onRoomUpdate]; - } - } - break; - } -} - -- (void)handleNimCustomTypeMessage:(NIMMessage *)message { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel * attachment = (AttachmentModel *)obj.attachment; - [self.stageView handleNIMCustomMessage:message]; - [self.animationView handleNIMCustomMessage:message]; - [self.menuContainerView handleNIMCustomMessage:message]; - [self.sideMenu handleNIMCustomMessage:message]; - [self.functionView handleNIMCustomMessage:message]; - [self.littleGameView handleNIMCustomMessage:message]; - [self distributeMessage:message toContainer:self.messageContainerView]; - - switch (attachment.first) { - case ClientMessage_Type: - switch (attachment.second) { - case ClientMessage_UpMic_Ask: - [self handleUpMicAsk:attachment]; - break; - case ClientMessage_UpMic_Agree: - [self handleUpMicAgree:attachment]; - break; - case ClientMessage_UpMic_Reject: - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"20.20.62_text_4")]; - break; - } - break; - - case CustomMessageType_First_Recharge_Reward: - switch (attachment.second) { - case Custom_Message_Sub_Room_First_Recharge_Reward: - self.userInfo.isFirstCharge = NO; - [self.menuContainerView onRoomUpdate]; - [self.sideMenu onRoomUpdate]; - break; - } - break; - - case CustomMessageType_Update_RoomInfo: - switch (attachment.second) { - case Custom_Message_Sub_Update_RoomInfo_MessageState: { - ///兼容安卓和iOS 协议不同的问题 - NSDictionary * dic= attachment.data[@"roomInfo"]; - if (dic.allKeys.count <=0) { - dic = attachment.data; - } - RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:dic]; - self.roomInfo.isCloseScreen = roomInfo.isCloseScreen; - - [self.menuContainerView onRoomUpdate]; - } - break; - - case Custom_Message_Sub_Update_RoomInfo_AnimateEffect: { - NSDictionary * dic= attachment.data[@"roomInfo"]; - if (dic.allKeys.count <=0) { - dic = attachment.data; - } - RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:dic]; - self.roomInfo.hasAnimationEffect = roomInfo.hasAnimationEffect; - [self.roomHeaderView onRoomUpdate]; - // 同步到 TurboModeStateManager，除非用户已手动覆盖 - { - NSString *roomId = @(self.roomInfo.roomId).stringValue; - BOOL userOverridden = [[TurboModeStateManager sharedManager] isGiftEffectsUserOverriddenForRoom:roomId]; - if (!userOverridden) { - [[TurboModeStateManager sharedManager] updateGiftEffectsForRoom:roomId - enabled:self.roomInfo.hasAnimationEffect - fromUser:NO]; - } - } - } - break; - } - break; - - case CustomMessageType_Queue: - switch (attachment.second) { - case Custom_Message_Sub_Queue_Invite: { - NSDictionary *dic = attachment.data; - NSString *uid = dic[@"uid"]; - if (uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - [self cancelRoomArrangeMic]; - } - } - break; - } - break; - - case CustomMessageType_Hall_Super_Admin: - switch (attachment.second) { - case Custom_Message_Sub_Hall_Super_Admin_Kick_Manager_Out_Room: { - XPKickUserModel * userInfo = [XPKickUserModel modelWithJSON:attachment.data]; - if (userInfo.targetUid == [AccountInfoStorage instance].getUid.integerValue) { - [self.presenter exitNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId]]; - [[XPRoomMiniManager shareManager] resetLocalMessage]; - [self cancelRoomArrangeMic]; - [[RtcManager instance] exitRoom]; - [self.presenter reportUserOutRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.uid]]; - [self.littleGameView handleSelfInExitEvent]; - [self.littleGameView destroyMG]; - [self dismissViewControllerAnimated:YES completion:nil]; - } - } - break; - } - break; - - case CustomMessageType_RedPacket: - switch (attachment.second) { - case Custom_Message_Sub_RoomDiamandRedPacket: { - XPReceiveRedPacketView *view = [[XPReceiveRedPacketView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - XPRedPacketModel *data = [XPRedPacketModel modelWithJSON:attachment.data]; - view.delegate = self; - self.isShowRedPacket = YES; - data.validityType = 0; - data.kind = 1; - data.redEnvelopeId = attachment.data[@"redEnvelopeId"]; - view.receiveModel = data; - for (UIView *subView in self.view.subviews) { - if([subView isKindOfClass:[XPReceiveRedPacketView class]]) { - view.alphaView.backgroundColor = [UIColor clearColor]; - break; - } - } - [self.view addSubview:view]; - [self.view bringSubviewToFront:view]; - if(self.sideMenu.redPacketList == nil){ - self.sideMenu.redPacketList = [NSMutableArray array]; - } - NSMutableArray *redPacketList = [NSMutableArray arrayWithArray:self.sideMenu.redPacketList]; - [redPacketList insertObject:data atIndex:0]; - self.sideMenu.redPacketList = redPacketList; - } - break; - - case Custom_Message_Sub_NewRoomDiamandRedPacket: { - XPRedPacketModel *curData = [XPRedPacketModel modelWithJSON:attachment.data]; - if(self.sideMenu.redPacketList == nil){ - self.sideMenu.redPacketList = [NSMutableArray array]; - } - NSMutableArray *redPacketList = [NSMutableArray arrayWithArray:self.sideMenu.redPacketList]; - [redPacketList insertObject:curData atIndex:0]; - if(self.roomInfo.uid > 0 && curData.redEnvelopeNum.integerValue != redPacketList.count){ - [self.presenter getRedPacket:[NSString stringWithFormat:@"%ld", self.roomInfo.uid]]; - return; - } - curData.redEnvelopeId = attachment.data[@"redEnvelopeId"]; - if(curData.validityType == 0){ - XPReceiveRedPacketView *view = [[XPReceiveRedPacketView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - view.delegate = self; - self.isShowRedPacket = YES; - view.receiveModel = curData; - for (UIView *subView in self.view.subviews) { - if([subView isKindOfClass:[XPReceiveRedPacketView class]]) { - view.alphaView.backgroundColor = [UIColor clearColor]; - break; - } - } - [self.view addSubview:view]; - [self.view bringSubviewToFront:view]; - } - self.sideMenu.redPacketList = redPacketList; - } - break; - } - break; - - case CustomMessageType_Free_Gift_Star_Reset_Time: - switch (attachment.second) { - case Custom_Message_Sub_Free_Gift_Star_Reset_Time: - [self.presenter getFreeGiftData]; - [[NSNotificationCenter defaultCenter]postNotificationName:kFreeGiftCountdownNotification object:nil userInfo:@{@"isReset":@(YES)}]; - break; - - case Custom_Message_Sub_Update_Gift_Information: - [self.presenter getFreeGiftData]; - [[NSNotificationCenter defaultCenter]postNotificationName:kFreeGiftCountdownNotification object:nil userInfo:@{@"updateGiftInfo":attachment.data ?: @""}]; - break; - } - break; - - case CustomMessageType_Custom_Room_Background: - switch (attachment.second) { - case Custom_Message_Sub_Custom_Room_Background: - if ([attachment.data isKindOfClass:[NSDictionary class]]) { - NSString *url = attachment.data[@"url"]; - if (![NSString isEmpty:url]) { - self.roomInfo.backPic = url;//@"https://tva1.moyu.im/mw600/9f0b0dd5ly1hvacrep5fhj20jg0t60w4.jpg"; - [self.backContainerView onRoomUpdate]; - } - } - break; - } - break; - - case CustomMessageType_RoomLevel_Update: - switch (attachment.second) { - case Custom_Message_Sub_RoomLevel_Update: - if ([attachment.data isKindOfClass:[NSDictionary class]]) { - NSString *url = attachment.data[@"roomLevelIcon"]; - NSNumber *roomLevel = attachment.data[@"roomLevel"]; - if (![NSString isEmpty:url] && roomLevel.integerValue > self.roomHeaderView.tag) { - self.roomHeaderView.tag = roomLevel.integerValue; - [self.roomHeaderView updateLevel:url]; - self.roomInfo.roomLevelIcon = url; - } - } - break; - } - break; - - case MicRelationship_Type: - switch (attachment.second) { - case MicRelationship_CP: - [self handleMicRelationshipCPMessage:attachment]; - break; - } - break; - - case CustomMessageType_CP: - switch (attachment.second) { - case Custom_Message_Sub_CP_Binding: - case Custom_Message_Sub_CP_Upgrade: - [self handleCPBindingOrUpgradeMessage:attachment]; - break; - } - break; - } - } -} - -/// 处理CP绑定或升级消息 -- (void)handleCPBindingOrUpgradeMessage:(AttachmentModel *)attachment { - NSLog(@"🔧 处理CP绑定或升级消息：first=%ld, second=%ld", (long)attachment.first, (long)attachment.second); - - // 只有在完成进房初始化后才处理CP相关逻辑 - if (!self.hasCompletedRoomInitialization) { - NSLog(@"🔧 进房初始化中，跳过CP绑定/升级处理"); - return; - } - - // 获取当前麦位队列 - NSMutableDictionary *currentQueue = [self.stageView getMicroQueue]; - if (!currentQueue) { - NSLog(@"⚠️ 无法获取当前麦位队列，跳过CP绑定/升级处理"); - return; - } - - // 使用 MicMidpointRectManager 处理CP绑定/升级消息 - MicMidpointRectManager *manager = (MicMidpointRectManager *)[self.stageView performSelector:@selector(midpointRectManager)]; - if (manager) { - // 计算麦位总数 - NSInteger micCount = [self getMicCountForRoomType:self.roomInfo.type]; - [manager handleCPBindingOrUpgradeMessageWithStageView:self.stageView - micCount:micCount - queue:currentQueue]; - } - - // 调用CP API更新状态 - [self callMicCpListByUidListWithQueue:currentQueue]; - - NSLog(@"✅ CP绑定/升级消息处理完成"); -} - -/// 处理麦位变化相关的CP逻辑 -- (void)handleMicChangeForCP:(NSMutableDictionary *)queue { - NSLog(@"🔧 处理麦位变化相关的CP逻辑"); - - // 更新当前用户的麦位状态 - [self updateCurrentUserMicStatus:queue]; - - // 只有在完成进房初始化后才处理CP相关逻辑 - if (self.hasCompletedRoomInitialization) { - // 使用 MicMidpointRectManager 处理CP逻辑 - MicMidpointRectManager *manager = (MicMidpointRectManager *)[self.stageView performSelector:@selector(midpointRectManager)]; - if (manager) { - // 计算麦位总数 - NSInteger micCount = [self getMicCountForRoomType:self.roomInfo.type]; - [manager handleMicChangeForCPWithStageView:self.stageView - micCount:micCount - queue:queue - currentUserUid:[AccountInfoStorage instance].getUid.integerValue - roomType:self.roomInfo.type]; - } - - // 调用CP API - [self callMicCpListByUidListWithQueue:queue]; - - // 🔧 新增：检查19 mic房间中央位置用户资格 - [self checkCentralPositionUserQualification:queue]; - } else { - NSLog(@"🔧 进房初始化中，跳过CP相关处理"); - } -} - -/// 处理麦位关系CP消息 -- (void)handleMicRelationshipCPMessage:(AttachmentModel *)attachment { - NSLog(@"🔧 接收到麦位关系CP消息"); - - if (!attachment.data) { - NSLog(@"⚠️ 麦位关系CP消息：data格式错误，跳过处理"); - return; - } - - // 兼容多种数据结构： - // 1) attachment.data 为 NSDictionary，包含 key "data"，其值可能为 NSString(JSON) 或 NSArray - // 2) attachment.data 直接为 NSArray - // 3) attachment.data 直接为 NSString(JSON) - NSArray *dataArray = nil; - id raw = attachment.data; - if ([raw isKindOfClass:[NSDictionary class]]) { - id inner = [(NSDictionary *)raw objectForKey:@"data"]; - if ([inner isKindOfClass:[NSArray class]]) { - dataArray = (NSArray *)inner; - } else if ([inner isKindOfClass:[NSString class]]) { - NSData *jsonData = [(NSString *)inner dataUsingEncoding:NSUTF8StringEncoding]; - if (jsonData) { - NSError *err = nil; - id parsed = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&err]; - if (!err && [parsed isKindOfClass:[NSArray class]]) { - dataArray = (NSArray *)parsed; - } - } - } - } else if ([raw isKindOfClass:[NSArray class]]) { - dataArray = (NSArray *)raw; - } else if ([raw isKindOfClass:[NSString class]]) { - NSData *jsonData = [(NSString *)raw dataUsingEncoding:NSUTF8StringEncoding]; - if (jsonData) { - NSError *err = nil; - id parsed = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&err]; - if (!err && [parsed isKindOfClass:[NSArray class]]) { - dataArray = (NSArray *)parsed; - } - } - } - - if (![dataArray isKindOfClass:[NSArray class]]) { - NSLog(@"⚠️ 麦位关系CP消息：未能解析为数组，跳过处理"); - return; - } - - // 解析CP数据 - NSMutableArray *cpList = [NSMutableArray array]; - for (id item in dataArray) { - if ([item isKindOfClass:[NSDictionary class]]) { - NSDictionary *cpDict = (NSDictionary *)item; - MicCpInfoModel *cpInfo = [[MicCpInfoModel alloc] init]; - cpInfo.uid = [cpDict[@"uid"] integerValue]; - cpInfo.loverUid = [cpDict[@"loverUid"] integerValue]; - cpInfo.cpLevel = [cpDict[@"cpLevel"] integerValue]; - [cpList addObject:cpInfo]; - } - } - - NSLog(@"🔧 麦位关系CP消息：解析到 %lu 条CP数据", (unsigned long)cpList.count); - - // 更新当前CP列表 - self.currentCpList = cpList.copy; - - // 使用 MicMidpointRectManager 更新缓存并重绘 - MicMidpointRectManager *manager = (MicMidpointRectManager *)[self.stageView performSelector:@selector(midpointRectManager)]; - if (manager) { - NSInteger micCount = [self getMicCountForRoomType:self.roomInfo.type]; - [manager updateCpListCacheAndRedraw:cpList - stageView:self.stageView - micCount:micCount - roomType:self.roomInfo.type]; - } else { - // 退化：仅更新本地并重绘 - [self drawSocialStageMidpointRects]; - } - - // 🔧 补强：为了确保不遗漏其他CP（例如 a-b 与 b-c 同时存在），在接收10011后再拉一次当前麦上的完整CP - NSMutableDictionary *currentQueue = [self.stageView getMicroQueue]; - if (currentQueue) { - [self callMicCpListByUidListWithQueue:currentQueue]; - } - - NSLog(@"🔧 麦位关系CP消息处理完成"); -} - -- (void)handleUpMicAsk:(AttachmentModel *)attachment { - NSNumber *targetUid = [attachment.data objectForKey:@"targetUid"]; - if (!targetUid || ![targetUid.stringValue isEqualToString:[AccountInfoStorage instance].getUid]) { - return; - } - - // 先清理之前的定时器（如果存在） - if (self.upMicAskTimer) { - [self.upMicAskTimer invalidate]; - self.upMicAskTimer = nil; - } - - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"20.20.62_text_1"); - config.message = YMLocalizedString(@"20.20.62_text_2"); - config.actionStyle = TTAlertActionBothStyle; - - // 自定义按钮 - config.confirmButtonConfig.title = YMLocalizedString(@"MessageContentGuildView5"); - config.cancelButtonConfig.title = YMLocalizedString(@"MessageContentGuildView4"); - - // 再觸發的話，clean 舊內容 - [TTPopup dismiss]; - [self removeUpMicAskTimer]; - - @kWeakify(self); - [TTPopup alertWithConfig:config - confirmHandler:^{ - @kStrongify(self); - // 用户点击确认，清理定时器 - [self removeUpMicAskTimer]; - [self sendResponseUpMicMessage:attachment.data isAgree:YES]; - } cancelHandler:^{ - @kStrongify(self); - // 用户点击取消，清理定时器 - [self removeUpMicAskTimer]; - [self sendResponseUpMicMessage:attachment.data isAgree:NO]; - }]; - - // 设置10秒后自动移除弹窗的定时器 - self.upMicAskTimer = [NSTimer scheduledTimerWithTimeInterval:10.0 - target:self - selector:@selector(autoDismissUpMicAskPopup) - userInfo:nil - repeats:NO]; -} - -- (void)removeUpMicAskTimer { - if (self.upMicAskTimer) { - [self.upMicAskTimer invalidate]; - self.upMicAskTimer = nil; - } -} - -/** - 自动移除上麦请求弹窗 - 10秒后自动调用，移除弹窗并清理定时器 - */ -- (void)autoDismissUpMicAskPopup { - // 移除弹窗 - [TTPopup dismiss]; - - // 清理定时器 - if (self.upMicAskTimer) { - [self.upMicAskTimer invalidate]; - self.upMicAskTimer = nil; - } - - NSLog(@"⏰ 上麦请求弹窗已自动移除（10秒超时）"); -} - -- (void)handleUpMicAgree:(AttachmentModel *)attachment { - NSDictionary *originalData = attachment.data; - NSNumber *position = [originalData objectForKey:@"position"]; - NSNumber *targetUid = [originalData objectForKey:@"targetUid"]; - - if (!position || !targetUid) { - return; - } - NSNumber *sendTime = [originalData objectForKey:@"sendTime"]; - if (!sendTime) { - return; - } else { - int64_t nowMillis = (int64_t)([[NSDate date] timeIntervalSince1970] * 1000); - if (nowMillis - sendTime.doubleValue > 10 * 1000) { - // 已经超过 10 秒 - return; - } - } - - NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - [dic setValue:position forKey:@"micPosition"]; - [dic setValue:targetUid forKey:@"uid"]; - AttachmentModel *attachement = [[AttachmentModel alloc]init]; - attachement.first = CustomMessageType_Queue; - attachement.second = Custom_Message_Sub_Queue_Invite; - attachement.data = dic; - - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachement; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session: @(self.roomInfo.roomId).stringValue - type:NIMSessionTypeChatroom]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:nil]; -} - -- (void)sendResponseUpMicMessage:(NSDictionary *)originalData isAgree:(BOOL)isAgree { - AttachmentModel *attachment = [[AttachmentModel alloc] init]; - attachment.first = ClientMessage_Type; - attachment.second = isAgree ? ClientMessage_UpMic_Agree : ClientMessage_UpMic_Reject; - attachment.data = originalData; - - NSString *sessionID = @(self.roomInfo.roomId).stringValue; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - - NIMSessionType sessionType = NIMSessionTypeChatroom; - //构造会话 - NIMSession *session = [NIMSession session:sessionID type:sessionType]; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - BOOL onMain = [NSThread isMainThread]; - if (error) { - NSLog(@"[[Send] ❌ 发送失败 | sessionId=%@ | code=%ld | desc=%@ | main=%@ | ts=%.3f", - sessionID, (long)error.code, error.localizedDescription, onMain ? @"YES" : @"NO", [[NSDate date] timeIntervalSince1970]); - } else { - NSLog(@"[Send] ✅ 发送成功 | sessionId=%@ | main=%@ | ts=%.3f", - sessionID, onMain ? @"YES" : @"NO", [[NSDate date] timeIntervalSince1970]); - } - }]; -} - -#pragma mark - NIMBroadcastDelegate -// 广播消息 -- (void)onReceiveBroadcastMessage:(NIMBroadcastMessage *)broadcastMessage{ - if (broadcastMessage.content) { - NSDictionary *msgDictionary = [broadcastMessage.content toJSONObject]; - AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]]; - NSString *partitionId = [NSString stringWithFormat:@"%@",attachment.data[@"partitionId"]]; - if(![partitionId isEqualToString:self.getUserInfo.partitionId]){ - return; - } - BOOL isHave = NO; - if(attachment.first == CustomMessageType_Look_Love && attachment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend){ - isHave = YES; - - }else if(attachment.first == CustomMessageType_Super_Gift && - (attachment.second == Custom_Message_Sub_Super_Gift || attachment.second == Custom_Message_Sub_Super_Gift_Room_Message)){ - isHave = YES; - }else if(attachment.first == CustomMessageType_General_Public_Screen && attachment.second == Custom_Message_Sub_General_Public_Screen_All_Room){ - isHave = YES; - }else if (attachment.first == CustomMessageType_Tarot && (attachment.second == Custom_Message_Sub_Tarot_Advanced || attachment.second == Custom_Message_Sub_Tarot_Intermediate)){ - isHave = YES; - }else if(attachment.first == CustomMessageType_LuckyBag && attachment.second == Custom_Message_Sub_Room_Gift_LuckBag_FullScree){ - isHave = YES; - } - // 对全服飘屏按 TurboModeStateManager 的房间开关做二次过滤 - if (isHave && (attachment.first == CustomMessageType_General_Public_Screen && attachment.second == Custom_Message_Sub_General_Public_Screen_All_Room)) { - NSString *currentRoomIdForTurbo = @(self.roomInfo.roomId).stringValue; - BOOL allowGiftScreen = [[TurboModeStateManager sharedManager] isGlobalGiftScreenEnabledForRoom:currentRoomIdForTurbo]; - if (!allowGiftScreen) { - NSLog(@"[Broadcast] ⛔️ 按 TurboMode 屏蔽全服礼物飘屏 | roomId=%@", currentRoomIdForTurbo); - return; - } - } - if (attachment.first == CustomMessageType_RedPacket && attachment.second == Custom_Message_Sub_AllDiamandRedPacket) { - if(self.isShowRedPacket == YES)return; - XPRedPacketModel *data = [XPRedPacketModel modelWithDictionary:attachment.data]; - data.validityType = 0; - data.kind = 1; - data.redEnvelopeId = attachment.data[@"redEnvelopeId"]; - RoomInfoModel *roomInfo = self.roomInfo; - XPReceiveRedPacketView *view = [[XPReceiveRedPacketView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - view.delegate = self; - self.isShowRedPacket = YES; - if (roomInfo.uid == data.roomUid.integerValue) { - view.inAllPacketRoom = YES; - } else { - view.inAllPacketRoom = NO; - } - view.receiveModel = data; - [self.view addSubview:view]; - [self.view bringSubviewToFront:view]; - } - - if(isHave == NO)return; - attachment.isBroadcast = YES; - NIMMessage *message = [NIMMessage new]; - NIMCustomObject *object = [NIMCustomObject new]; - object.attachment = attachment; - message.messageObject = object; - - [self distributeMessage:message toContainer:self.messageContainerView]; - } -} -//发送消息成功回调 -- (void)sendMessage:(NIMMessage *)message didCompleteWithError:(NSError *)error { - if (message.yidunAntiSpamRes) { - NSDictionary * spamRes = message.yidunAntiSpamRes.toJSONObject; - id spamResExt = ((NSString *)spamRes[@"ext"]).toJSONObject; - NSDictionary *antispamDic = nil; - if ([spamResExt isKindOfClass:[NSArray class]]) { - antispamDic = [spamResExt xpSafeObjectAtIndex:0]; - } else if ([spamResExt isKindOfClass:[NSDictionary class]]) { - antispamDic = spamResExt[@"antispam"]; - } - NSDictionary *realAntiDic = nil; - if ([[antispamDic allKeys] containsObject:@"antispam"]) { - realAntiDic = antispamDic[@"antispam"];; - } else { - realAntiDic = antispamDic; - } - if (realAntiDic) { - NSInteger suggestion = [realAntiDic[@"suggestion"] integerValue]; - if (suggestion == 2) { - [self showErrorToast:YMLocalizedString(@"XPRoomViewController10")]; - } - } - } - - if (![message.session.sessionId isEqualToString:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId]]) { - return; - } - - if (error) { - NSLog(@"%@", error); - return; - }; - if (message.messageType == NIMMessageTypeCustom) { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel * attachment = (AttachmentModel *)obj.attachment; - [self.stageView handleNIMCustomMessage:message]; - [self.animationView handleNIMCustomMessage:message]; - [self.functionView handleNIMCustomMessage:message]; - if (attachment.first == CustomMessageType_Update_RoomInfo && attachment.second == Custom_Message_Sub_Update_RoomInfo_MessageState) { - NSDictionary * dic= attachment.data[@"roomInfo"]; - if (dic.allKeys.count <=0) { - dic = attachment.data; - } - RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:dic]; - self.roomInfo.isCloseScreen = roomInfo.isCloseScreen; - [self.menuContainerView onRoomUpdate]; - }else if(attachment.first == CustomMessageType_Update_RoomInfo && attachment.second == Custom_Message_Sub_Update_RoomInfo_AnimateEffect){ - NSDictionary * dic= attachment.data[@"roomInfo"]; - if (dic.allKeys.count <= 0) { - dic = attachment.data; - } - RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:dic]; - self.roomInfo.hasAnimationEffect = roomInfo.hasAnimationEffect; - } - [self.roomHeaderView onRoomUpdate]; - [self distributeMessage:message toContainer:self.messageContainerView]; - } - }else if(message.messageType == NIMMessageTypeText) { - [self distributeMessage:message toContainer:self.messageContainerView]; - } -} - -#pragma mark - NIMLoginManagerDelegate -- (void)onKickout:(NIMLoginKickoutResult *)result { -// [self exitRoom]; - [self dismissViewControllerAnimated:YES completion:nil]; -} - - -#pragma mark - NIMConversationManagerDelegate -- (void)didAddRecentSession:(NIMRecentSession *)recentSession - totalUnreadCount:(NSInteger)totalUnreadCount { - [self.menuContainerView addNIMRecentSession:recentSession]; -} - -- (void)didUpdateRecentSession:(NIMRecentSession *)recentSession - totalUnreadCount:(NSInteger)totalUnreadCount { - [self.menuContainerView addNIMRecentSession:recentSession]; -} - -- (void)didRemoveRecentSession:(NIMRecentSession *)recentSession - totalUnreadCount:(NSInteger)totalUnreadCount { - [self.menuContainerView removeNIMRecentSession:recentSession]; -} - -#pragma mark - RoomDelegate -- (RoomInfoModel *)getRoomInfo { - return self.roomInfo; -} - -- (UserInfoModel *)getUserInfo { - return self.userInfo; -} - -- (BOOL)isManagerOrOwner { - return self.roomUid.integerValue == self.userInfo.uid || - [self.superMangerList filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"uid == %d", self.userInfo.uid]] > 0; -} - --(NSMutableArray *)getPlayList{ - return self.sideMenu.playList; -} - --(NSMutableArray *)getLittleGameList { - return self.sideMenu.littleGameList; -} - -- (void)exitRoom { - [XNDJTDDLoadingTool showLoading]; - - // 🔧 防护：标记正在退出房间 - self.isExitingRoom = YES; - - [XPSkillCardPlayerManager shareInstance].micState = MICState_None; - - [self.stageView exitNIMRoom]; - [self.menuContainerView menuResignFirstResponder]; - - [self.animationView resumeTimer]; - - switch (self.roomInfo.roomModeType) { - case RoomModeType_Open_Micro_Mode: - case RoomModeType_Open_Blind: - [self exitRoomAndCancelArrangeMic]; - break; - case RoomModeType_Open_PK_Mode: - [self exitRoomWhenPKing]; - break; - case RoomType_MiniGame: - [self exitRoomWhenPlayMiniGame]; - break; - default: - [self exitRoomPage]; - break; - } -} - -- (BOOL)isSameRoom:(NSString *)targetUid { - return [self.roomUid isEqualToString:targetUid]; -} - -- (void)exitRoomAndCancelArrangeMic { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getRoomArrangeMicList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - ArrangeMicModel * arrangeMicModel= [ArrangeMicModel modelWithJSON:data.data]; - if (arrangeMicModel.myPos.intValue > 0) { - [TTPopup alertWithMessage:YMLocalizedString(@"XPRoomViewController11") confirmHandler:^{ - __block NSString * grouptype = @"0"; - if (self.roomInfo.roomModeType == RoomModeType_Open_Blind) { - [arrangeMicModel.queue enumerateObjectsUsingBlock:^(ArrangeMicUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - grouptype = [NSString stringWithFormat:@"%ld", obj.groupType]; - *stop = YES; - } - }]; - } - [Api cancelArrangeMic:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - } roomUid:roomUid operUid:uid groupType:grouptype]; - - [self exitRoomPage]; - } cancelHandler:^{ - - }]; - return; - } - } - - [self exitRoomPage]; - } roomUid:roomUid operUid:uid page:@"1" pageSize:@"50"]; -} - -- (void)exitRoomWhenPKing { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; - NSString * uid = [AccountInfoStorage instance].getUid; - [Api getRoomPKUserList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - ArrangeMicModel * arrangeMicModel= [ArrangeMicModel modelWithJSON:data.data]; - if (arrangeMicModel.myPos.intValue > 0) { - [TTPopup alertWithMessage:YMLocalizedString(@"XPRoomViewController11") confirmHandler:^{ - __block NSString * grouptype = @"0"; - [arrangeMicModel.queue enumerateObjectsUsingBlock:^(ArrangeMicUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if (obj.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - grouptype = [NSString stringWithFormat:@"%ld", obj.groupType]; - *stop = YES; - } - }]; - [Api cancelRoomPKArrangeMic:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - } roomUid:roomUid operUid:uid groupType:grouptype]; - - [self exitRoomPage]; - } cancelHandler:^{ - - }]; - return; - } - } - - [self exitRoomPage]; - - } roomUid:roomUid operUid:uid page:@"1" pageSize:@"50"]; -} - -- (void)exitRoomWhenPlayMiniGame { - if ([self.littleGameView isInSudGame]) { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.cancelButtonConfig.title = YMLocalizedString(@"XPRoomSettingInputView4"); - config.confirmButtonConfig.title = YMLocalizedString(@"TTAlertConfig0"); - config.message = YMLocalizedString(@"XPRoomViewController14"); - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ // 知道了 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - [self exitRoomPage]; - }); - } cancelHandler:^{ - }]; - } else { - [self exitRoomPage]; - } -} - -- (void)exitRoomPage { - if (self.roomInfo.type == RoomType_MiniGame) { - [self.littleGameView handleSelfInExitEvent]; - [self.littleGameView destroyMG]; - } - [[XPRoomMiniManager shareManager] resetLocalMessage]; - - // 🔧 防护：确保 TRTC 退出 - [[RtcManager instance] exitRoom]; - - // 🔧 防护：标记房间已退出 - self.isExitingRoom = YES; - self.isViewActive = NO; - - [self.presenter exitNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId]]; - [self.presenter reportUserOutRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.uid]]; - [self handleFirstOutRoom]; - [self dismissViewControllerAnimated:YES completion:^{ - [XNDJTDDLoadingTool hideHUD]; - }]; -} - -- (void)miniRoom { - self.isMinimizingRoom = YES; - if(self.freeModel != nil){ - [XPRoomMiniManager shareManager].curState = self.freeModel.curStage; - } - - [self.menuContainerView menuResignFirstResponder]; - - NSDictionary *roomInfoDic = self.roomInfo.model2dictionary != nil ? self.roomInfo.model2dictionary : @{}; - NSDictionary *userInfoDic = self.userInfo.model2dictionary != nil ? self.userInfo.model2dictionary : @{}; - NSMutableDictionary *queueDic = self.getMicroQueue != nil ? self.getMicroQueue : [@{} mutableCopy]; - if(self.roomInfo.type == RoomType_MiniGame) { - if ([self.littleGameView isInSudGame]) { - TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.cancelButtonConfig.title = YMLocalizedString(@"XPRoomViewController15"); - config.confirmButtonConfig.title = YMLocalizedString(@"XPRoomViewController16"); - config.message = YMLocalizedString(@"XPRoomViewController17"); - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ // 知道了 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - [[XPRoomMiniManager shareManager] configRoomInfo:self.roomInfo]; - [[XPRoomMiniManager shareManager] configUserInfo:self.userInfo]; - [[XPRoomMiniManager shareManager] configCurrentMusic:self.functionView.getCurrentMusic isPlaying:self.functionView.isPlaying]; - NSDictionary * dic = @{@"roomInfo":roomInfoDic, @"userInfo":userInfoDic, @"microQueue":queueDic}; - [[NSNotificationCenter defaultCenter] postNotificationName:kRoomMiniNotificationKey object:nil userInfo:dic]; - [self.view endEditing:YES]; - [self.littleGameView handleSelfInExitEvent]; - [self.littleGameView destroyMG]; - [self handleFirstOutRoom]; - [self dismissViewControllerAnimated:YES completion:nil]; - }); - } cancelHandler:^{ - }]; - } else { - [[XPRoomMiniManager shareManager] configRoomInfo:self.roomInfo]; - [[XPRoomMiniManager shareManager] configUserInfo:self.userInfo]; - [[XPRoomMiniManager shareManager] configCurrentMusic:self.functionView.getCurrentMusic isPlaying:self.functionView.isPlaying]; - NSDictionary * dic = @{@"roomInfo":roomInfoDic, @"userInfo":userInfoDic, @"microQueue":queueDic}; - [[NSNotificationCenter defaultCenter] postNotificationName:kRoomMiniNotificationKey object:nil userInfo:dic]; - [self.view endEditing:YES]; - [self.littleGameView handleSelfInExitEvent]; - [self.littleGameView destroyMG]; - [self handleFirstOutRoom]; - [self dismissViewControllerAnimated:YES completion:nil]; - } - }else { - [[XPRoomMiniManager shareManager] configRoomInfo:self.roomInfo]; - [[XPRoomMiniManager shareManager] configUserInfo:self.userInfo]; - [[XPRoomMiniManager shareManager] configCurrentMusic:self.functionView.getCurrentMusic isPlaying:self.functionView.isPlaying]; - NSDictionary * dic = @{@"roomInfo":roomInfoDic, @"userInfo":userInfoDic, @"microQueue":queueDic}; - [[NSNotificationCenter defaultCenter] postNotificationName:kRoomMiniNotificationKey object:nil userInfo:dic]; - [self.view endEditing:YES]; - [self handleFirstOutRoom]; - [self dismissViewControllerAnimated:YES completion:nil]; - } -} - -- (void)showPKPanel { - [self.functionView showPKPanelView]; -} - -- (UINavigationController *)getCurrentNav { - return self.navigationController; -} --(UIView *)getSuperView{ - return self.view; -} -- (NSMutableDictionary *)getMicroQueue { - return [self.stageView getMicroQueue]; -} - -- (NSArray *)getRoomSuperAdminList { - return self.superMangerList; -} - -- (NSArray *)getRoomPKGroupTeamList { - return [self.functionView getRoomPKGroupTeamList]; -} - -- (BOOL)isRoomPKPlaying { - return [self.functionView isRoomPKPlaying]; -} - -- (void)onMicroQueueUpdate:(NSMutableDictionary *)queue { - [self.menuContainerView onMicroQueueUpdate:queue]; - [self.functionView onRoomUpdate]; - [self.functionView onMicroQueueUpdate:queue]; - - // 获取当前用户麦位状态 - NSDictionary *currentStatus = [self getCurrentUserMicStatus:queue]; - BOOL isOnMic = [currentStatus[@"isOnMic"] boolValue]; - - if (isOnMic) { - self.anchorScrollView.scrollEnabled = NO; - } else { - self.anchorScrollView.scrollEnabled = YES; - } - - // 🔧 注意：CP相关的处理逻辑已迁移到 NIMChatroomEventTypeQueueChange 中 - // 这里只处理UI相关的更新，不再处理CP逻辑 -} - -- (CGPoint)animationPointAtStageViewByUid:(NSString *)uid { - return [self.stageView animationPointAtStageViewByUid:uid]; -} - -- (CGPoint)animationPointAtStageViewByIndex:(NSInteger)index { - return [self.stageView animationPointAtStageViewByIndex:index]; -} - -- (void)getRoomBoomInfoSuccess:(NSArray *)models { - [[RoomBoomManager sharedManager] updateBoomDetailArray:models]; - [self.sideMenu updateForBoomDetailArray:models]; -} - -- (void)getRoomBoomExplosionSuccess:(BoomInfoModel *)model { - [[RoomBoomManager sharedManager] receiveEnterRoomBoom:model]; -} - -/// 统一的CP API成功回调方法 -- (void)handleMicCpListSuccess:(NSArray *)cpList { - NSLog(@"🔧 CP API成功回调：接收到 %lu 条CP数据", (unsigned long)cpList.count); - - self.currentCpList = cpList; - - // 使用 MicMidpointRectManager 更新CP列表缓存并重绘 - MicMidpointRectManager *manager = (MicMidpointRectManager *)[self.stageView performSelector:@selector(midpointRectManager)]; - if (manager) { - // 计算麦位总数 - NSInteger micCount = [self getMicCountForRoomType:self.roomInfo.type]; - [manager updateCpListCacheAndRedraw:cpList - stageView:self.stageView - micCount:micCount - roomType:self.roomInfo.type]; - } - - // 如果当前用户麦位状态发生变化（上麦、下麦、换位），发送 NIM message - if (self.currentUserMicStatusChanged) { - [self sendMicRelationshipNIMessage:cpList]; - self.currentUserMicStatusChanged = NO; // 重置标志 - } - - NSLog(@"🔧 CP API成功回调：处理完成"); -} - -/// 按房间UID获取CP列表成功回调 -- (void)getMicCpListByRoomUidSuccess:(NSArray *)cpList { - NSLog(@"🔧 按房间UID获取CP列表成功：接收到 %lu 条CP数据", (unsigned long)cpList.count); - [self handleMicCpListSuccess:cpList]; -} - -/// 按用户UID列表获取CP列表成功回调 -- (void)getMicCpListByUidListSuccess:(NSArray *)cpList { - NSLog(@"🔧 按用户UID列表获取CP列表成功：接收到 %lu 条CP数据", (unsigned long)cpList.count); - [self handleMicCpListSuccess:cpList]; -} - -#pragma mark - 首次退出非自己的房间，处理是否需要弹新用户充值优惠 -- (void)handleFirstOutRoom { - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - if (![defaults boolForKey:kHadQuitOtherRoomKey] && self.userInfo.uid != self.roomInfo.uid && self.userInfo.showLimitCharge) { - [defaults setBool:YES forKey:kHadQuitOtherRoomKey]; - [defaults synchronize]; - [[NSNotificationCenter defaultCenter] postNotificationName:kNewUserRechargeKey object:nil]; - } -} -#pragma mark - XPRoomLittleGameContainerViewDelegate -- (void)hiddenSudGamePostionView { - [self.functionView hiddenSudGamePostionView]; -} - -#pragma mark - AnchorRoomScrollViewDelegate -- (void)anchorScrollViewScrollToNext:(AnchorRoomScrollView *)anchorScrollView { - if (!self) { - return; - } - [self.view endEditing:YES]; - [self showAnchorLoading]; - [self.presenter getCycleAnchorRoomList:[NSString stringWithFormat:@"%ld", self.roomInfo.uid]]; -} - - -- (void)anchorScrollViewScrollToPrevious:(AnchorRoomScrollView *)anchorScrollView { - if (!self || self.anchorRoomList.count <= 0) { - return; - } - [self.view endEditing:YES]; - [self showAnchorLoading]; - if (self.anchorIndex < self.anchorRoomList.count) { - NSString * roomUid = [self.anchorRoomList xpSafeObjectAtIndex:self.anchorIndex]; - [self.presenter getCurrentRoomInfo:roomUid]; - self.anchorIndex --; - }else { - [self showErrorToast:YMLocalizedString(@"XPRoomViewController13")]; - self.anchorScrollView.contentOffset = CGPointMake(0, KScreenHeight); - } -} - -#pragma mark - XPRoomSettingInputViewDelegate -///点击了完成 -- (void)xPRoomSettingInputView:(XPRoomSettingInputView *)view didClickConfirm:(NSString *)text type:(RoomSettingInputType)type { - NSString *pwdDes = [DESEncrypt encryptUseDES:text key:KeyWithType(KeyType_PasswordEncode)]; - if ([pwdDes isEqualToString:self.roomInfo.roomPwd]) { - [TTPopup dismiss]; - view.isPwdError = NO; - if (self.roomInfo.type == RoomType_Anchor) { - [self __removeAllViews]; - if (!self.anchorScrollView.superview) { - [self.view insertSubview:self.anchorScrollView belowSubview:self.menuContainerView]; - } - - [self.anchorScrollView addSubview:self.backContainerView]; - [self.anchorScrollView addSubview:self.stageView]; - [self.anchorScrollView addSubview:self.messageContainerView]; - [self.anchorScrollView addSubview:self.quickMessageContainerView]; - [self.anchorScrollView addSubview:self.sideMenu]; - [self.anchorScrollView addSubview:self.roomHeaderView]; - if (!self.menuContainerView.superview) { - [self.view addSubview:self.menuContainerView]; - } - [self.anchorScrollView addSubview:self.functionView]; - - [self.view bringSubviewToFront:self.animationView]; - - [self updateViewConstraintsOnAnchorRoom]; - [self changeStageViewOnAnchorRoom]; - - [self.roomHeaderView onRoomEntered]; - [self.sideMenu onRoomEntered]; - - - [self.backContainerView onRoomEntered]; - [self.littleGameView onRoomEntered]; - [self.littleGameView onRoomEntered]; - if ([XPRoomMiniManager shareManager].getRoomInfo.uid != self.roomUid.integerValue) {// 最小化进房 还是原来的房间的话 不需要重新进入云信 因为压根没退 - // 🔧 防护：检查是否允许进房 - if (!self.isExitingRoom && self.isViewActive) { - [self.presenter enterNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId] user:self.userInfo]; - } - [self.functionView onRoomEntered]; - [self.messageContainerView onRoomEntered]; - [self.menuContainerView onRoomEntered]; - } else { - //虽然没退出房间 但是队列还是要拿的 - [self.stageView onRoomMiniEntered]; - [self.messageContainerView onRoomMiniEntered]; - [self.functionView onRoomMiniEntered]; - [self.functionView onRoomEntered]; - [self.menuContainerView onRoomMiniEntered]; - - // 🔧 最小化进房：初始化当前用户麦位状态 - [self initializeCurrentUserMicStatusForMiniEnter]; - } - [[XPRoomMiniManager shareManager] configRoomInfo:nil]; - [[XPRoomMiniManager shareManager] configUserInfo:nil]; - [[XPRoomMiniManager shareManager] configCurrentMusic:nil isPlaying:NO]; - } else { - [self.roomHeaderView onRoomEntered]; - [self.sideMenu onRoomEntered]; - - [self.menuContainerView onRoomEntered]; - [self changeStageViewOnRoomUpdate]; - [self.backContainerView onRoomEntered]; - [self.littleGameView onRoomEntered]; - [self.functionView onRoomEntered]; - // 🔧 防护：检查是否允许进房 - if (!self.isExitingRoom && self.isViewActive) { - [self.presenter enterNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId] user:self.userInfo]; - } - [self.messageContainerView onRoomEntered]; - [self.littleGameView onRoomEntered]; - [[XPRoomMiniManager shareManager] configRoomInfo:nil]; - [[XPRoomMiniManager shareManager] configUserInfo:nil]; - [[XPRoomMiniManager shareManager] configCurrentMusic:nil isPlaying:NO]; - } - } else { - view.isPwdError = YES; - } -} - -- (void)didClickCancel:(RoomSettingInputType)type { - if (type == RoomSettingInputType_Input_Pwd) { - [self enterRoomFail:0]; - } -} --(NSInteger)getPublicScreenType{ - return self.messageContainerView.type; -} - -- (void)displayMusicPanel { - [self.functionView showMusicPanel]; -} - -- (void)updateScreenMessageState:(BOOL)isClose { - self.roomInfo.isCloseScreen = isClose; -} - -#pragma mark - XPFirstRechargeViewDelegate --(void)rechargeHandle{} --(void)contactCustomerService{ - TTAlertConfig *config = [[TTAlertConfig alloc]init]; - config.title = YMLocalizedString(@"XPIAPRechargeViewController7"); - config.message = YMLocalizedString(@"XPIAPRechargeViewController8"); - TTAlertButtonConfig *confirmButtonConfig = [[TTAlertButtonConfig alloc]init]; - confirmButtonConfig.title = YMLocalizedString(@"XPIAPRechargeViewController9"); - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x13E2F5),UIColorFromRGB(0x9DB4FF),UIColorFromRGB(0xCC67FF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(200, 200)]; - confirmButtonConfig.backgroundColor = [UIColor colorWithPatternImage:image]; - confirmButtonConfig.cornerRadius = 38/2; - config.confirmButtonConfig = confirmButtonConfig; - @kWeakify(self); - [TTPopup alertWithConfig:config confirmHandler:^{ - @kStrongify(self); - [self requestContactCustomerService]; - } cancelHandler:^{ - }]; - -} --(void)requestContactCustomerService{ - [XNDJTDDLoadingTool showLoading]; - [Api requestContactCustomerServiceCompletion:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - [XNDJTDDLoadingTool hideHUD]; - if(code == 200){ - NSString *uid = [NSString stringWithFormat:@"%@",data.data]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - NIMSession * session = [NIMSession session:uid type:NIMSessionTypeP2P]; - SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:session]; - [self.getCurrentNav pushViewController:sessionVC animated:YES]; - }); - } - }]; -} -- (XPRoomBackContainerView *)backContainerView { - if (!_backContainerView) { - _backContainerView = [[XPRoomBackContainerView alloc] initWithdelegate:self]; - } - return _backContainerView; -} - -- (RoomHeaderView *)roomHeaderView { - if (!_roomHeaderView) { - _roomHeaderView = [[RoomHeaderView alloc] initWithDelegate:self]; - } - return _roomHeaderView; -} - -- (MsRoomMessageMainView *)messageContainerView { - if (!_messageContainerView) { - _messageContainerView = [[MsRoomMessageMainView alloc] initWithDelegate:self]; - } - return _messageContainerView; -} - -- (XPRoomQuickMessageContainView *)quickMessageContainerView { - if(!_quickMessageContainerView) { - _quickMessageContainerView = [[XPRoomQuickMessageContainView alloc] initWithDelegate:self]; - } - return _quickMessageContainerView; -} - -- (XPRoomMenuContainerView *)menuContainerView { - if (!_menuContainerView) { - _menuContainerView = [[XPRoomMenuContainerView alloc] initWithDelegate:self]; - @kWeakify(self); - [_menuContainerView setUpdateHeight:^(CGFloat height) { - @kStrongify(self); - [self.menuContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(self.view); - if (iPhoneXSeries) { - make.bottom.mas_equalTo(self.view); - } else { - make.bottom.mas_equalTo(self.view).offset(-10); - } - make.height.mas_equalTo(height + kSafeAreaBottomHeight); - }]; - }]; - } - return _menuContainerView; -} - -- (RoomSideMenu *)sideMenu { - if (!_sideMenu) { - _sideMenu = [[RoomSideMenu alloc] initWithDelegate:self]; - } - return _sideMenu; -} - -- (RoomAnimationView *)animationView { - if (!_animationView) { - _animationView = [[RoomAnimationView alloc] initWithHostDelegate:self]; - } - return _animationView; -} - -- (XPRoomFunctionContainerView *)functionView { - if (!_functionView) { - _functionView = [[XPRoomFunctionContainerView alloc] initWithDelegate:self]; - } - return _functionView; -} - -//- (StageView *)stageView { -// // 🔧 修改：如果 StageViewManager 已初始化，返回其管理的 stageView -// if (self.stageViewManager && self.stageViewManager.currentStageView) { -// NSLog(@"🔍 stageView getter: 返回 StageViewManager 的 currentStageView | Class: %@", -// NSStringFromClass([self.stageViewManager.currentStageView class])); -// return self.stageViewManager.currentStageView; -// } -// -// // 🔧 降级：只有在 StageViewManager 不可用时才创建默认的 SocialStageView -// if (!_stageView) { -// NSLog(@"🔍 stageView getter: 创建降级 SocialStageView"); -// _stageView = [[SocialStageView alloc] initWithDelegate:self]; -// _stageView.alpha = 0; -// NSLog(@"⚠️ stageView getter: 降级 SocialStageView 创建完成 | Class: %@", -// NSStringFromClass([_stageView class])); -// } -// return _stageView; -//} - -//- (TenMicStageView *)tenMicStageView { -// if (!_tenMicStageView) { -// _tenMicStageView = [[TenMicStageView alloc] initWithDelegate:self]; -// } -// return _tenMicStageView; -//} -// -//- (NineteenMicStageView *)nineteenMicStageView { -// if (!_nineteenMicStageView) { -// _nineteenMicStageView = [[NineteenMicStageView alloc] initWithDelegate:self]; -// } -// return _nineteenMicStageView; -//} -// -//- (TwentyMicStageView *)twentyMicStageView { -// if (!_twentyMicStageView) { -// _twentyMicStageView = [[TwentyMicStageView alloc] initWithDelegate:self]; -// } -// return _twentyMicStageView; -//} -// -//- (FifteenMicStageView *)fifteenMicStageView { -// if (!_fifteenMicStageView) { -// _fifteenMicStageView = [[FifteenMicStageView alloc] initWithDelegate:self]; -// } -// return _fifteenMicStageView; -//} - -- (XPRoomLittleGameContainerView *)littleGameView { - if (!_littleGameView) { - _littleGameView = [[XPRoomLittleGameContainerView alloc] initWithDelegate:self]; - _littleGameView.delegate = self; - } - return _littleGameView; -} -- (AnchorRoomScrollView *)anchorScrollView { - if (!_anchorScrollView) { - _anchorScrollView = [[AnchorRoomScrollView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - _anchorScrollView.anchorScrollDelegate = self; - _anchorScrollView.hostDelegate = self; - if (@available(iOS 11.0, *)) { - _anchorScrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } - } - return _anchorScrollView; -} - -- (AnchorRoomSrollTipView *)anchorScrollTipView { - if (!_anchorScrollTipView) { - _anchorScrollTipView = [[AnchorRoomSrollTipView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - } - return _anchorScrollTipView; -} - -- (NSMutableArray *)anchorRoomList { - if (!_anchorRoomList) { - _anchorRoomList = [NSMutableArray array]; - } - return _anchorRoomList; -} - --(XPFreeGiftsObtainView *)freeView{ - if (!_freeView){ - _freeView = [[XPFreeGiftsObtainView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - } - return _freeView; -} -- (PIRoomEnterRedPacketView *)redPacketView{ - if(!_redPacketView){ - _redPacketView = [[PIRoomEnterRedPacketView alloc]initWithFrame:CGRectZero]; - _redPacketView.hidden = YES; - _redPacketView.isInRoom = YES; - _redPacketView.delegate = self; - - } - return _redPacketView; -} - -#pragma mark - 公共房间消息转发处理 - -- (void)handlePublicRoomMessageForward:(NSNotification *)notification { - NIMMessage *message = notification.object; - if (![message isKindOfClass:[NIMMessage class]]) { - NSLog(@"XPRoomViewController: 收到无效的公共房间转发消息"); - return; - } - - // 检查房间是否处于活跃状态 - if (!self.roomInfo || !self.messageContainerView) { - NSLog(@"XPRoomViewController: 房间未就绪，忽略公共房间转发消息"); - return; - } - - if ([message.messageObject isKindOfClass:[NIMNotificationObject class]]) { - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - if ([notiMsg respondsToSelector:@selector(content)]) { - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - // 忽略离房事件 - if (content.eventType == NIMChatroomEventTypeExit || content.eventType == NIMChatroomEventTypeKicked) { - return; - } - } - } - - if ([message.rawAttachContent.lowercaseString containsString:@"allroommsg"]) { - // 忽略与公聊房的重复事件 - NSLog(@"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); - return; - } - - switch (message.messageType) { - case NIMMessageTypeNotification: - break; - case NIMMessageTypeCustom: - [self handleNimCustomTypeMessage:message]; - break; - case NIMMessageTypeText: { - [self distributeMessage:message toContainer:self.messageContainerView]; - [self.littleGameView handleNIMTextMessage:message]; - } - break; - case NIMMessageTypeTip: { - [self distributeMessage:message toContainer:self.messageContainerView]; - } - break; - case NIMMessageTypeImage:{ - [self distributeMessage:message toContainer:self.messageContainerView]; - } - break; - default: - break; - } -} - -// 新增：StageViewManager 懒加载 -- (StageViewManager *)stageViewManager { - if (!_stageViewManager) { - _stageViewManager = [[StageViewManager alloc] init]; - NSLog(@"✅ StageViewManager 懒加载初始化成功"); - } - return _stageViewManager; -} - -// 新增：设置 StageViewManager -- (void)setupStageViewManager { - // 触发懒加载 - [self stageViewManager]; - NSLog(@"✅ StageViewManager 设置完成"); -} - -// 调试方法：检查 stageView 状态 -- (void)debugStageViewStatus { - NSLog(@"🔍 DEBUG: stageView 状态检查"); - NSLog(@" - stageView: %@", self.stageView); - NSLog(@" - stageView.alpha: %.2f", self.stageView.alpha); - NSLog(@" - stageView.hidden: %@", self.stageView.hidden ? @"YES" : @"NO"); - NSLog(@" - stageView.superview: %@", self.stageView.superview); - NSLog(@" - stageView.frame: %@", NSStringFromCGRect(self.stageView.frame)); - NSLog(@" - stageView.class: %@", NSStringFromClass([self.stageView class])); -} - -// 检查是否有多余的 StageView 实例 -- (void)checkForDuplicateStageViews { - NSMutableArray *stageViews = [NSMutableArray array]; - NSMutableArray *duplicateViews = [NSMutableArray array]; - - // 收集所有 StageView 实例 - NSArray *allViews = [self.view subviews]; - for (UIView *view in allViews) { - if ([view isKindOfClass:[StageView class]]) { - [stageViews addObject:(StageView *)view]; - } - - // 递归检查子视图 - NSArray *subViews = [view subviews]; - for (UIView *subView in subViews) { - if ([subView isKindOfClass:[StageView class]]) { - [stageViews addObject:(StageView *)subView]; - } - } - } - - // 检查重复实例 - if (stageViews.count > 1) { - NSLog(@"⚠️ 检测到多个 StageView 实例 (总计: %lu 个)", (unsigned long)stageViews.count); - for (StageView *stageView in stageViews) { - NSLog(@" - StageView: %@ | Frame: %@ | Superview: %@", - NSStringFromClass([stageView class]), - NSStringFromCGRect(stageView.frame), - NSStringFromClass([stageView.superview class])); - } - - // 找出当前主实例之外的重复实例 - for (StageView *stageView in stageViews) { - if (stageView != self.stageView && stageView.superview) { - [duplicateViews addObject:stageView]; - } - } - - if (duplicateViews.count > 0) { - NSLog(@"⚠️ 发现重复的 StageView 实例，正在清理..."); - for (StageView *duplicateView in duplicateViews) { - NSLog(@"🧹 清理重复的 StageView: %@ | Superview: %@", - NSStringFromClass([duplicateView class]), - NSStringFromClass([duplicateView.superview class])); - [duplicateView removeFromSuperview]; - } - NSLog(@"✅ 重复 StageView 实例清理完成"); - } - } else { - NSLog(@"✅ StageView 实例检查通过：只有 1 个实例"); - } -} - - -/// 在 StageView 上绘制符合条件的相邻麦位中点矩形 -- (void)drawSocialStageMidpointRects { - if (!self.stageView) { - NSLog(@"🔧 当前没有 stageView，跳过中点矩形绘制"); - return; - } - - // 使用 MicMidpointRectManager 绘制社交舞台中点矩形 - MicMidpointRectManager *manager = (MicMidpointRectManager *)[self.stageView performSelector:@selector(midpointRectManager)]; - if (manager) { - // 计算麦位总数 - NSInteger micCount = [self getMicCountForRoomType:self.roomInfo.type]; - [manager drawSocialStageMidpointRectsWithStageView:self.stageView - micCount:micCount - roomType:self.roomInfo.type]; - } else { - NSLog(@"🔧 无法获取 midpointRectManager，跳过中点矩形绘制"); - } -} - -/// 进房成功后调用CP相关API -- (void)callMicCpListByRoomUidAfterRoomEntered { - NSLog(@"🔧 进房成功：开始调用 micCpListByRoomUid API"); - - if (!self.roomInfo) { - NSLog(@"⚠️ 进房成功：roomInfo为空，跳过CP API调用"); - return; - } - - NSString *roomUid = [NSString stringWithFormat:@"%ld", (long)self.roomInfo.uid]; - NSLog(@"🔧 进房成功：房间UID: %@, 房间类型: %ld", roomUid, (long)self.roomInfo.type); - - // 调用 micCpListByRoomUid 方法 - if ([self.presenter respondsToSelector:@selector(micCpListByRoomUid:)]) { - NSLog(@"🔧 进房成功：调用 micCpListByRoomUid: %@", roomUid); - [self.presenter micCpListByRoomUid:roomUid]; - } else { - NSLog(@"⚠️ 进房成功：presenter不支持micCpListByRoomUid方法"); - } - - NSLog(@"🔧 进房成功：micCpListByRoomUid API调用完成"); -} - -/// 获取当前用户及其左右相邻用户的uid列表（最多3个） -- (NSArray *)getAllMicUserUidsWithQueue:(NSMutableDictionary *)queue { - NSMutableArray *micUserUids = [NSMutableArray array]; - - if (!self.roomInfo) { - NSLog(@"⚠️ 获取mic用户列表：roomInfo为空"); - return micUserUids; - } - - // 获取当前用户的麦位位置 - NSInteger currentUserMicPosition = self.currentUserMicPosition; - if (currentUserMicPosition == -1) { - NSLog(@"🔧 获取mic用户列表：当前用户不在麦上，返回空数据"); - // 通知 manager 移除该用户 UID 的相关数据 - NSInteger currentUid = [AccountInfoStorage instance].getUid.integerValue; - [self removeCpDataForUids:@[@(currentUid)]]; - return micUserUids; - } - - // 获取最大麦位数 - NSInteger maxMicCount = 0; - switch (self.roomInfo.type) { - case RoomType_Room: - maxMicCount = 9; - break; - case RoomType_10Mic: - maxMicCount = 10; - break; - case RoomType_15Mic: - maxMicCount = 15; - break; - case RoomType_19Mic: - maxMicCount = 19; - break; - case RoomType_20Mic: - maxMicCount = 20; - break; - default: - maxMicCount = 9; // 默认9麦 - break; - } - - // 获取当前用户及其左右相邻用户的UID - NSInteger leftPosition = currentUserMicPosition - 1; - NSInteger rightPosition = currentUserMicPosition + 1; - - // 获取左边用户 - if (leftPosition >= 0) { - NSString *leftPositionKey = [NSString stringWithFormat:@"%ld", (long)leftPosition]; - MicroQueueModel *leftMicModel = queue[leftPositionKey]; - if (leftMicModel && leftMicModel.userInfo && leftMicModel.userInfo.uid > 0) { - [micUserUids addObject:[NSString stringWithFormat:@"%ld", (long)leftMicModel.userInfo.uid]]; - } - } - - // 获取当前用户 - NSString *currentPositionKey = [NSString stringWithFormat:@"%ld", (long)currentUserMicPosition]; - MicroQueueModel *currentMicModel = queue[currentPositionKey]; - if (currentMicModel && currentMicModel.userInfo && currentMicModel.userInfo.uid > 0) { - [micUserUids addObject:[NSString stringWithFormat:@"%ld", (long)currentMicModel.userInfo.uid]]; - } - - // 获取右边用户 - if (rightPosition < maxMicCount) { - NSString *rightPositionKey = [NSString stringWithFormat:@"%ld", (long)rightPosition]; - MicroQueueModel *rightMicModel = queue[rightPositionKey]; - if (rightMicModel && rightMicModel.userInfo && rightMicModel.userInfo.uid > 0) { - [micUserUids addObject:[NSString stringWithFormat:@"%ld", (long)rightMicModel.userInfo.uid]]; - } - } - - // 🔧 修复：即使只有当前用户一个人，也返回当前用户的UID，确保能触发NIM message - if (micUserUids.count == 1) { - NSLog(@"🔧 获取mic用户列表：只有当前用户一个人，但仍需发送NIM message"); - // 不返回空数组，保持当前用户UID，确保能触发CP API和NIM message - } - - NSLog(@"🔧 获取mic用户列表：当前用户麦位 %ld，找到 %lu 个相关用户: %@", - (long)currentUserMicPosition, (unsigned long)micUserUids.count, micUserUids); - return micUserUids; -} - - -/// 处理其他用户mic变化（包括切换场景） -- (void)handleOtherUserMicChange:(UserInfoModel *)userInfo changeType:(NSInteger)changeType { - if (!self.stageView || ![self.stageView respondsToSelector:@selector(midpointRectManager)]) { - NSLog(@"🔧 处理其他用户mic变化：stageView 不支持 midpointRectManager，跳过处理"); - return; - } - - // 获取当前麦位队列 - NSMutableDictionary *currentQueue = [self.stageView getMicroQueue]; - if (!currentQueue) { - NSLog(@"🔧 处理其他用户mic变化：无法获取当前麦位队列，跳过处理"); - return; - } - - // 使用 MicMidpointRectManager 处理其他用户mic变化 - MicMidpointRectManager *manager = (MicMidpointRectManager *)[self.stageView performSelector:@selector(midpointRectManager)]; - if (manager) { - // 计算麦位总数 - NSInteger micCount = [self getMicCountForRoomType:self.roomInfo.type]; - [manager handleOtherUserMicChange:userInfo - changeType:changeType - stageView:self.stageView - micCount:micCount - queue:currentQueue - roomType:self.roomInfo.type]; - } - - // 处理API调用 - if (changeType == 2) { // 其他用户下麦 - // 获取剩余用户列表 - NSMutableArray *remainingUids = [NSMutableArray array]; - for (NSString *positionKey in currentQueue.allKeys) { - MicroQueueModel *micModel = currentQueue[positionKey]; - if (micModel && micModel.userInfo && micModel.userInfo.uid > 0) { - [remainingUids addObject:[NSString stringWithFormat:@"%ld", (long)micModel.userInfo.uid]]; - } - } - - // 调用API更新剩余用户的CP状态 - if (remainingUids.count > 0) { - [self.presenter micCpListByUidList:remainingUids]; - } - - // 重绘 - [self drawSocialStageMidpointRects]; - - } else if (changeType == 1) { // 其他用户上麦 - // 调用CP API更新状态 - [self callMicCpListByUidListWithQueue:currentQueue]; - - // 重新绘制所有CP关系 - [self drawSocialStageMidpointRects]; - } -} - - -/// 通用的CP数据移除方法 -- (void)removeCpDataForUids:(NSArray *)uids { - if (!self.stageView || ![self.stageView respondsToSelector:@selector(midpointRectManager)]) { - NSLog(@"🔧 移除CP数据：stageView 不支持 midpointRectManager，跳过处理"); - return; - } - - if (uids.count == 0) { - NSLog(@"🔧 移除CP数据：没有需要移除的用户，跳过处理"); - return; - } - - // 使用 MicMidpointRectManager 移除CP数据 - MicMidpointRectManager *manager = (MicMidpointRectManager *)[self.stageView performSelector:@selector(midpointRectManager)]; - if (manager) { - [manager removeCpDataForUids:uids]; - NSLog(@"🔧 移除CP数据完成：UIDs %@", uids); - } -} - - -/// 统一的CP API调用方法 -- (void)callMicCpListByUidListWithQueue:(NSMutableDictionary *)queue { - NSLog(@"🔧 调用CP API：开始获取mic用户列表"); - - // 直接从queue获取当前所有在mic上的用户uid列表，确保数据是最新的 - NSMutableArray *micUserUids = [NSMutableArray array]; - - if (queue) { - for (NSString *positionKey in queue.allKeys) { - MicroQueueModel *micModel = queue[positionKey]; - if (micModel && micModel.userInfo && micModel.userInfo.uid > 0) { - [micUserUids addObject:[NSString stringWithFormat:@"%ld", (long)micModel.userInfo.uid]]; - } - } - } - - if (micUserUids.count == 0) { - NSLog(@"🔧 调用CP API：没有用户在mic上，跳过API调用"); - return; - } - - // 调用 micCpListByUidList 方法 - NSLog(@"🔧 调用CP API：micCpListByUidList: %@", micUserUids); - [self.presenter micCpListByUidList:micUserUids]; - - NSLog(@"🔧 调用CP API：完成"); -} - -/// 初始化当前用户的麦位状态 -- (void)initializeCurrentUserMicStatus { - NSLog(@"🔧 初始化当前用户麦位状态"); - - // 重置状态 - self.currentUserMicStatusChanged = NO; - self.currentUserWasOnMic = NO; - self.currentUserMicPosition = -1; - self.hasCompletedRoomInitialization = NO; // 标记为未完成初始化 - - // 获取当前麦位状态 - NSMutableDictionary *currentQueue = [self.stageView getMicroQueue]; - if (currentQueue && currentQueue.count > 0) { - NSDictionary *currentStatus = [self getCurrentUserMicStatus:currentQueue]; - BOOL isOnMic = [currentStatus[@"isOnMic"] boolValue]; - NSInteger micPosition = [currentStatus[@"micPosition"] integerValue]; - - self.currentUserWasOnMic = isOnMic; - self.currentUserMicPosition = micPosition; - - NSLog(@"🔧 初始化完成 - 当前用户是否在麦上: %@, 麦位: %ld", - isOnMic ? @"是" : @"否", (long)micPosition); - } else { - NSLog(@"🔧 初始化完成 - 当前没有麦位数据"); - } - - // 延迟设置初始化完成标志，确保进房时的麦位更新不会触发API调用 - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - self.hasCompletedRoomInitialization = YES; - NSLog(@"🔧 进房初始化完成，后续麦位变动将触发 micCpListByUidList 调用"); - // 初始化完成后，幂等尝试按房间UID拉取一次全量CP - [self tryRequestInitialCpByRoomUidIfNeeded]; - }); -} - -/// 最小化进房时初始化当前用户麦位状态 -- (void)initializeCurrentUserMicStatusForMiniEnter { - NSLog(@"🔧 最小化进房：初始化当前用户麦位状态"); - - // 重置状态 - self.currentUserMicStatusChanged = NO; - self.currentUserWasOnMic = NO; - self.currentUserMicPosition = -1; - self.hasCompletedRoomInitialization = NO; // 标记为未完成初始化 - - // 获取当前麦位状态 - NSMutableDictionary *currentQueue = [self.stageView getMicroQueue]; - if (currentQueue && currentQueue.count > 0) { - NSDictionary *currentStatus = [self getCurrentUserMicStatus:currentQueue]; - BOOL isOnMic = [currentStatus[@"isOnMic"] boolValue]; - NSInteger micPosition = [currentStatus[@"micPosition"] integerValue]; - - self.currentUserWasOnMic = isOnMic; - self.currentUserMicPosition = micPosition; - - NSLog(@"🔧 最小化进房初始化完成 - 当前用户是否在麦上: %@, 麦位: %ld", - isOnMic ? @"是" : @"否", (long)micPosition); - } else { - NSLog(@"🔧 最小化进房初始化完成 - 当前没有麦位数据"); - } - - // 最小化进房时立即设置初始化完成标志，因为云信已经连接 - self.hasCompletedRoomInitialization = YES; - NSLog(@"🔧 最小化进房初始化完成，后续麦位变动将触发 micCpListByUidList 调用"); -} - -/// 获取当前用户的麦位状态 -- (NSDictionary *)getCurrentUserMicStatus:(NSMutableDictionary *)queue { - NSInteger currentUid = [AccountInfoStorage instance].getUid.integerValue; - BOOL isOnMic = NO; - NSInteger micPosition = -1; - - for (NSString *position in queue.allKeys) { - MicroQueueModel *micModel = queue[position]; - if (micModel.userInfo.uid > 0 && micModel.userInfo.uid == currentUid) { - isOnMic = YES; - micPosition = position.integerValue; - break; - } - } - - return @{ - @"isOnMic": @(isOnMic), - @"micPosition": @(micPosition) - }; -} - -/// 检查当前用户麦位状态是否发生变化（上麦、下麦、换位） -- (BOOL)checkCurrentUserMicStatusChanged:(NSMutableDictionary *)queue { - NSDictionary *currentStatus = [self getCurrentUserMicStatus:queue]; - BOOL currentUserOnMic = [currentStatus[@"isOnMic"] boolValue]; - NSInteger currentMicPosition = [currentStatus[@"micPosition"] integerValue]; - - // 情况1：之前不在麦上，现在在麦上（上麦） - if (currentUserOnMic && !self.currentUserWasOnMic) { - NSLog(@"🔧 检测到当前用户刚刚上麦，麦位: %ld", (long)currentMicPosition); - return YES; - } - - // 情况2：之前在麦上，现在不在麦上（下麦） - if (!currentUserOnMic && self.currentUserWasOnMic) { - NSLog(@"🔧 检测到当前用户刚刚下麦，之前麦位: %ld", (long)self.currentUserMicPosition); - return YES; - } - - // 情况3：之前在麦上，现在也在麦上，但位置不同（换位） - if (currentUserOnMic && self.currentUserWasOnMic && - currentMicPosition != self.currentUserMicPosition) { - NSLog(@"🔧 检测到当前用户换麦位，从 %ld 换到 %ld", - (long)self.currentUserMicPosition, (long)currentMicPosition); - return YES; - } - - return NO; -} - -/// 更新当前用户的麦位状态 -- (void)updateCurrentUserMicStatus:(NSMutableDictionary *)queue { - NSDictionary *currentStatus = [self getCurrentUserMicStatus:queue]; - BOOL currentUserOnMic = [currentStatus[@"isOnMic"] boolValue]; - NSInteger micPosition = [currentStatus[@"micPosition"] integerValue]; - - // 检查麦位状态是否发生变化（上麦、下麦、换位） - if ([self checkCurrentUserMicStatusChanged:queue]) { - self.currentUserMicStatusChanged = YES; - } - - // 更新状态 - self.currentUserWasOnMic = currentUserOnMic; - self.currentUserMicPosition = micPosition; -} - -/// 发送麦位关系 NIM message -- (void)sendMicRelationshipNIMessage:(NSArray *)cpList { - NSLog(@"🔧 发送麦位关系 NIM message，CP数据条数: %ld，当前用户麦位: %ld", - (long)cpList.count, (long)self.currentUserMicPosition); - - if (!self.roomInfo) { - NSLog(@"⚠️ 发送麦位关系 NIM message：roomInfo为空，跳过发送"); - return; - } - - // 将 CP 数据转换为 JSON string - NSMutableArray *cpDataArray = [NSMutableArray array]; - for (MicCpInfoModel *cpInfo in cpList) { - NSDictionary *cpDict = @{ - @"uid": @(cpInfo.uid), - @"loverUid": @(cpInfo.loverUid), - @"cpLevel": @(cpInfo.cpLevel) - }; - [cpDataArray addObject:cpDict]; - } - - NSError *error = nil; - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:cpDataArray.copy - options:0 - error:&error]; - if (error) { - NSLog(@"❌ 发送麦位关系 NIM message：JSON序列化失败 - %@", error.localizedDescription); - return; - } - - NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; - NSLog(@"🔧 发送麦位关系 NIM message：JSON数据 - %@", jsonString); - - NSDictionary *finalData = @{@"first": @(MicRelationship_Type), - @"second":@(MicRelationship_CP), - @"data":jsonString}; - - // 创建 AttachmentModel - AttachmentModel *attachment = [[AttachmentModel alloc] init]; - attachment.first = MicRelationship_Type; // 1001 - attachment.second = MicRelationship_CP; // 10011 - attachment.data = finalData; - - // 创建 NIM message - NIMMessage *message = [[NIMMessage alloc] init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - - // 设置用户信息到 remoteExt - UserInfoModel *userInfo = [self getUserInfo]; - XPMessageRemoteExtModel *extModel = [[XPMessageRemoteExtModel alloc] init]; - extModel.androidBubbleUrl = userInfo.androidBubbleUrl; - extModel.iosBubbleUrl = userInfo.iosBubbleUrl; - extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; - extModel.platformRole = userInfo.platformRole; - NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[NSString stringWithFormat:@"%ld", userInfo.uid]]; - message.remoteExt = remoteExt; - - // 构造会话 - NSString *sessionID = [NSString stringWithFormat:@"%ld", self.roomInfo.roomId]; - NIMSession *session = [NIMSession session:sessionID type:NIMSessionTypeChatroom]; - - // 发送消息 - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session completion:^(NSError * _Nullable error) { - if (error) { - NSLog(@"❌ 发送麦位关系 NIM message 失败 - %@", error.localizedDescription); - } else { - NSLog(@"✅ 发送麦位关系 NIM message 成功"); - } - }]; -} - -/// 更新 MicMidpointRectManager 的缓存 -- (void)updateMicMidpointRectManagerCache:(NSArray *)cpList { - if (!self.stageView) { - NSLog(@"�� 更新缓存：stageView 为空，跳过缓存更新"); - return; - } - - MicMidpointRectManager *midpointRectManager = (MicMidpointRectManager *)[self.stageView performSelector:@selector(midpointRectManager)]; - if (midpointRectManager) { - // 设置房间类型 - midpointRectManager.roomType = self.roomInfo.type; - // 获取当前用户及其相邻用户的UID列表 - NSMutableDictionary *currentQueue = [self.stageView getMicroQueue]; - NSArray *micUserUids = [self getAllMicUserUidsWithQueue:currentQueue]; - - // 转换为 NSNumber 数组 - NSMutableArray *uidNumbers = [NSMutableArray array]; - for (NSString *uidString in micUserUids) { - [uidNumbers addObject:@(uidString.integerValue)]; - } - - // 更新缓存：先移除相关用户的旧数据，再合并新数据 - [midpointRectManager mergeCpListCache:cpList replaceForUids:uidNumbers]; - - NSLog(@"�� 更新缓存完成：CP数据条数 %lu，相关用户 %@", - (unsigned long)cpList.count, uidNumbers); - } -} - -/// 更新 MicMidpointRectManager 的麦位快照 -- (void)updateMicMidpointRectManagerSnapshot { - if (!self.stageView) { - NSLog(@"�� 更新快照：stageView 为空，跳过快照更新"); - return; - } - - // 获取当前舞台类型的麦位总数 - NSInteger micCount = 0; - if (self.roomInfo) { - switch (self.roomInfo.type) { - case RoomType_Room: micCount = 9; break; - case RoomType_10Mic: micCount = 10; break; - case RoomType_15Mic: micCount = 15; break; - case RoomType_19Mic: micCount = 19; break; - case RoomType_20Mic: micCount = 20; break; - default: micCount = 9; break; - } - } - - MicMidpointRectManager *midpointRectManager = (MicMidpointRectManager *)[self.stageView performSelector:@selector(midpointRectManager)]; - if (midpointRectManager) { - // 设置房间类型 - midpointRectManager.roomType = self.roomInfo.type; - [midpointRectManager rebuildMicSnapshotWithStageView:self.stageView micCount:micCount]; - NSLog(@"🔧 更新麦位快照完成：麦位总数 %ld", (long)micCount); - } -} - -/// 根据房间类型获取麦位总数 -- (NSInteger)getMicCountForRoomType:(NSInteger)roomType { - switch (roomType) { - case RoomType_Room: return 9; - case RoomType_10Mic: return 10; - case RoomType_15Mic: return 15; - case RoomType_19Mic: return 19; - case RoomType_20Mic: return 20; - default: return 9; - } -} - -/// 检查19 mic房间中央位置（position 6）用户资格 -- (void)checkCentralPositionUserQualification:(NSMutableDictionary *)queue { - // 只检查19 mic房间 - if (self.roomInfo.type != RoomType_19Mic) { - return; - } - - NSLog(@"🔧 检查19 mic房间中央位置用户资格"); - - // 查找中央位置（position 6）的用户 - MicroQueueModel *centralMicModel = nil; - for (NSString *positionKey in queue.allKeys) { - MicroQueueModel *micModel = queue[positionKey]; - if (micModel.microState.position == 6) { - centralMicModel = micModel; - break; - } - } - - // 如果中央位置有用户，检查其资格 - if (centralMicModel && centralMicModel.userInfo) { - NSString *userId = [NSString stringWithFormat:@"%ld", (long)centralMicModel.userInfo.uid]; - NSLog(@"🔧 中央位置用户：%@，检查资格", userId); - - // 调用Boss位置资格检查API - [Api requestBossMicUp:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSLog(@"✅ 中央位置用户资格检查通过：%@", userId); - } else { - NSLog(@"❌ 中央位置用户资格检查失败：%@，错误：%@", userId, msg); - // 不满足条件的用户需要下mic - [self forceDownMicForUser:userId atPosition:6]; - } - } roomUid:@(self.roomInfo.uid).stringValue uid:userId]; - } else { - NSLog(@"🔧 中央位置无用户，无需检查"); - } -} - -/// 强制用户下mic -- (void)forceDownMicForUser:(NSString *)userId atPosition:(NSInteger)position { - NSLog(@"🔧 强制用户下mic：%@，位置：%ld", userId, (long)position); - - // 使用 NIM 的 API 强制下mic - NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc] init]; - request.key = [NSString stringWithFormat:@"%ld", (long)position]; - request.roomId = @(self.roomInfo.roomId).stringValue; - - [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { - if (error) { - NSLog(@"❌ 强制下mic失败：%@，错误：%@", userId, error.localizedDescription); - [XNDJTDDLoadingTool showErrorWithMessage:@"强制下mic失败"]; - } else { - NSLog(@"✅ 强制下mic成功：%@", userId); - [XNDJTDDLoadingTool showSuccessWithMessage:@"中央位置需要满足贡献值要求，已自动下mic"]; - } - }]; -} - -@end diff --git a/YuMi/Modules/YMTabbar/Model/InviteUserInfoModel.h b/YuMi/Modules/YMTabbar/Model/InviteUserInfoModel.h deleted file mode 100644 index 2837c6a..0000000 --- a/YuMi/Modules/YMTabbar/Model/InviteUserInfoModel.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// InviteUserInfoModel.h -// YUMI -// -// Created by YUMI on 2022/6/2. -// - -#import -#import "YUMINNNN.h" -NS_ASSUME_NONNULL_BEGIN - -@interface InviteUserInfoModel : PIBaseModel -///邀请人的名字 -@property (nonatomic,copy) NSString *inviteNick; -///邀请人的uid -@property (nonatomic,copy) NSString * inviteUid; -///是否在房间中 -@property (nonatomic,assign) BOOL isInRoom; -///房间uid -@property (nonatomic,copy) NSString *roomUid; -///来源 -@property (nonatomic,assign) UserEnterRoomFromType fromType; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMTabbar/Model/InviteUserInfoModel.m b/YuMi/Modules/YMTabbar/Model/InviteUserInfoModel.m deleted file mode 100644 index 0091d1d..0000000 --- a/YuMi/Modules/YMTabbar/Model/InviteUserInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// InviteUserInfoModel.m -// YUMI -// -// Created by YUMI on 2022/6/2. -// - -#import "InviteUserInfoModel.h" - -@implementation InviteUserInfoModel - -@end diff --git a/YuMi/Modules/YMTabbar/Model/MineSkillCardListInfoModel.h b/YuMi/Modules/YMTabbar/Model/MineSkillCardListInfoModel.h deleted file mode 100644 index 98a9ad0..0000000 --- a/YuMi/Modules/YMTabbar/Model/MineSkillCardListInfoModel.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// MineSkillCardListInfoModel.h -// YuMi -// -// Created by YuMi on 2022/4/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface MineSkillCardListInfoModel : PIBaseModel -@property (nonatomic,copy) NSString *sId; -///id -@property (nonatomic,copy) NSString *cardId; -///图片 -@property (nonatomic,copy) NSString *icon; -///技能 -@property (nonatomic,copy) NSArray *propVals; -///名字 -@property (nonatomic,copy) NSString *name; -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMTabbar/Model/MineSkillCardListInfoModel.m b/YuMi/Modules/YMTabbar/Model/MineSkillCardListInfoModel.m deleted file mode 100644 index 8072a64..0000000 --- a/YuMi/Modules/YMTabbar/Model/MineSkillCardListInfoModel.m +++ /dev/null @@ -1,15 +0,0 @@ -// -// MineSkillCardListInfoModel.m -// YuMi -// -// Created by YuMi on 2022/4/14. -// - -#import "MineSkillCardListInfoModel.h" - -@implementation MineSkillCardListInfoModel -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"sId":@"id"}; -} - -@end diff --git a/YuMi/Modules/YMTabbar/Model/NewUserGreetModel.h b/YuMi/Modules/YMTabbar/Model/NewUserGreetModel.h deleted file mode 100644 index 39a8cee..0000000 --- a/YuMi/Modules/YMTabbar/Model/NewUserGreetModel.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// NewUserGreetModel.h -// YUMI -// -// Created by YUMI on 2022/6/2. -// - -#import -#import "MineSkillCardListInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface NewUserGreetModel : PIBaseModel -///房主的uid -@property (nonatomic,copy) NSString *roomUid; -///打招呼的内容 -@property (nonatomic,copy) NSString *sayHelloMsg; -///打招呼用户的头像 -@property (nonatomic,copy) NSString *sayHelloUserAvatar; -///打招呼用户平台id -@property (nonatomic,copy) NSString *sayHelloUserErbanNo; -///打招呼都想的昵称 -@property (nonatomic,copy) NSString *sayHelloUserNickname; -///是否可以打招呼 -@property (nonatomic,assign) BOOL sayHello; -///性别 -@property (nonatomic, assign) NSInteger gender; - -@property (nonatomic, strong) MineSkillCardListInfoModel *voiceCard; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMTabbar/Model/NewUserGreetModel.m b/YuMi/Modules/YMTabbar/Model/NewUserGreetModel.m deleted file mode 100644 index 0d26265..0000000 --- a/YuMi/Modules/YMTabbar/Model/NewUserGreetModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// NewUserGreetModel.m -// YUMI -// -// Created by YUMI on 2022/6/2. -// - -#import "NewUserGreetModel.h" - -@implementation NewUserGreetModel - -@end diff --git a/YuMi/Modules/YMTabbar/Model/NewUserRechargeModel.h b/YuMi/Modules/YMTabbar/Model/NewUserRechargeModel.h deleted file mode 100644 index 59e9232..0000000 --- a/YuMi/Modules/YMTabbar/Model/NewUserRechargeModel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// NewUserRechargeModel.h -// YUMI -// -// Created by YUMI on 2022/7/29. -// - -#import -#import "FirstRechargeModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface NewUserRechargeModel : PIBaseModel - -@property (nonatomic, assign) long limitEndTime; - -@property (nonatomic, strong) NSArray *limitFirstChargeTaskList; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMTabbar/Model/NewUserRechargeModel.m b/YuMi/Modules/YMTabbar/Model/NewUserRechargeModel.m deleted file mode 100644 index b018c63..0000000 --- a/YuMi/Modules/YMTabbar/Model/NewUserRechargeModel.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// NewUserRechargeModel.m -// YUMI -// -// Created by YUMI on 2022/7/29. -// - -#import "NewUserRechargeModel.h" - -@implementation NewUserRechargeModel - -+ (NSDictionary *)objectClassInArray { - return @{@"limitFirstChargeTaskList": FirstRechargeModel.class}; -} - -@end diff --git a/YuMi/Modules/YMTabbar/Model/XPTabAnchorCardModel.h b/YuMi/Modules/YMTabbar/Model/XPTabAnchorCardModel.h deleted file mode 100644 index dcca71e..0000000 --- a/YuMi/Modules/YMTabbar/Model/XPTabAnchorCardModel.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// YMTabAnchorCardModel.h -// YUMI -// -// Created by YUMI on 2022/8/1. -// - -#import -#import "YUMINNNN.h" - -NS_ASSUME_NONNULL_BEGIN - -@class MineSkillCardListInfoModel; -@interface XPTabAnchorCardModel : PIBaseModel -///生日 -@property(nonatomic,assign) long birth; -@property (nonatomic , assign) GenderType gender; -@property (nonatomic, strong) NSArray *absCardPics; -@property (nonatomic , assign) NSInteger uid; -@property (nonatomic , assign) NSInteger erbanNo; -@property (nonatomic, copy) NSString *nick; -@property (nonatomic, copy) NSString *avatar; -@property (nonatomic, copy) NSString *userDesc; -@property (nonatomic, assign) NSInteger roomUid; - -@property (nonatomic, strong) MineSkillCardListInfoModel *voiceCard; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMTabbar/Model/XPTabAnchorCardModel.m b/YuMi/Modules/YMTabbar/Model/XPTabAnchorCardModel.m deleted file mode 100644 index c32e093..0000000 --- a/YuMi/Modules/YMTabbar/Model/XPTabAnchorCardModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMTabAnchorCardModel.m -// YUMI -// -// Created by YUMI on 2022/8/1. -// - -#import "XPTabAnchorCardModel.h" - -@implementation XPTabAnchorCardModel - -@end diff --git a/YuMi/Modules/YMTabbar/Model/XPVersionUpdateModel.h b/YuMi/Modules/YMTabbar/Model/XPVersionUpdateModel.h deleted file mode 100644 index 9df4f44..0000000 --- a/YuMi/Modules/YMTabbar/Model/XPVersionUpdateModel.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// YMVersionUpdateModel.h -// YUMI -// -// Created by YUMI on 2022/12/5. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPVersionUpdateModel : PIBaseModel -@property (nonatomic,copy) NSString *os; -@property (nonatomic,copy) NSString *version; -@property (nonatomic,assign) int status; -@property (nonatomic,copy) NSString *updateVersionDesc; -@property (nonatomic,copy) NSString *updateVersion; -@property (nonatomic,copy) NSString *updateDownloadLink; -@property (nonatomic,copy) NSString *updateFileMd5; -///1线上版本,2审核中版本,3强制更新版本,4建议更新版本,5已删除版本 -@property (nonatomic,assign)int updateStatus; -@property (nonatomic,copy) NSString *updateOs; - -@end -@interface XPVersionUpdateItemModel : PIBaseModel -@property (nonatomic,copy) NSString *version; -@property (nonatomic,copy) NSString *time; -@property (nonatomic,copy) NSString *num; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMTabbar/Model/XPVersionUpdateModel.m b/YuMi/Modules/YMTabbar/Model/XPVersionUpdateModel.m deleted file mode 100644 index b8c35cc..0000000 --- a/YuMi/Modules/YMTabbar/Model/XPVersionUpdateModel.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMVersionUpdateModel.m -// YUMI -// -// Created by YUMI on 2022/12/5. -// - -#import "XPVersionUpdateModel.h" - -@implementation XPVersionUpdateModel - -@end - -@implementation XPVersionUpdateItemModel - -@end - diff --git a/YuMi/Modules/YMTabbar/Presenter/MainPresenter.h b/YuMi/Modules/YMTabbar/Presenter/MainPresenter.h deleted file mode 100644 index a5af102..0000000 --- a/YuMi/Modules/YMTabbar/Presenter/MainPresenter.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// MainPresenter.h -// YUMI -// -// Created by zu on 2021/9/8. -// - -#import "BaseMvpPresenter.h" - -NS_ASSUME_NONNULL_BEGIN -@class XPVersionUpdateModel; -@interface MainPresenter : BaseMvpPresenter - -- (void)autoLogin; -- (void)loginNIM; -- (void)getUserInfo; - -///获取邀请人信息 -- (void)checkInviteUserInfo:(NSString *)inviteCode; - -///获取新用户打招呼信息 -- (void)getNewUserGreetInfo; - -/// 获取快捷推荐进房 -- (void)getShortCutRecommendRoom; - -///获取新用户充值优惠 -- (void)getNewUserRechargeList; - -///获取主播卡片信息 -- (void)getAnchorCardInfo; - -///获取版本更新 -- (void)getVersionUpdate; - -///心跳接口，每 30 秒调用一次，用来更新用户在线状态 -- (void)clientHeartBeat; - -///app 启动调用此接口 主要功能：给主播分流 -- (void)clientStartApp; -///判断是否绑定授权码 --(void)getAuthorizationCodeInfo; - -@end - - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMTabbar/Presenter/MainPresenter.m b/YuMi/Modules/YMTabbar/Presenter/MainPresenter.m deleted file mode 100644 index 26b3495..0000000 --- a/YuMi/Modules/YMTabbar/Presenter/MainPresenter.m +++ /dev/null @@ -1,217 +0,0 @@ -// -// MainPresenter.m -// YUMI -// -// Created by zu on 2021/9/8. -// - -#import "MainPresenter.h" -#import "AccountInfoStorage.h" -#import "RechargeStorage.h" -#import "AccountModel.h" -#import "Api+Main.h" -#import "Api+Mine.h" -#import "MainProtocol.h" -#import "NSObject+MJExtension.h" -#import -#import "InviteUserInfoModel.h" -#import "NewUserGreetModel.h" -#import "NewUserRechargeModel.h" -#import "XPTabAnchorCardModel.h" -#import "YYUtility.h" -#import "XPVersionUpdateModel.h" - -static NSString * kUpdateVersionNum = @"kUpdateVersionNum"; - -@implementation MainPresenter - -- (void)autoLogin { - AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo]; - if (accountModel == nil || accountModel.uid == nil || accountModel.access_token == nil) { - [self tokenInvalid]; - return; - } - if ([[AccountInfoStorage instance] getTicket].length > 0) { - [[self getView] autoLoginSuccess]; - return; - } - @kWeakify(self); - [Api requestTicket:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - NSArray *tickets = [data.data valueForKey:@"tickets"]; - NSString *ticket = [tickets[0] valueForKey:@"ticket"]; - [[AccountInfoStorage instance] saveTicket:ticket]; - [[self getView] autoLoginSuccess]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - @kStrongify(self); - [self logout]; - } errorToast:NO] - access_token:accountModel.access_token - issue_type:@"multi"]; -} - -- (void)loginNIM { - AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo]; - if (accountModel == nil) { - [self tokenInvalid]; - return; - } - if (![NIMSDK sharedSDK].loginManager.isLogined) { - NIMAutoLoginData *data = [[NIMAutoLoginData alloc]init]; - data.account = accountModel.uid; - data.token = accountModel.netEaseToken; - data.forcedMode = NO; - [[NIMSDK sharedSDK].loginManager autoLogin:data]; - } -} - -- (void)getUserInfo { - @kWeakify(self); - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - @kStrongify(self); - [[self getView] getUserInfoSuccess:[UserInfoModel modelWithDictionary:data.data]]; - }] uid:[[AccountInfoStorage instance] getUid]]; -} - -///获取邀请人信息 -- (void)checkInviteUserInfo:(NSString *)inviteCode { - [Api checkInviteUserInRoom:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - InviteUserInfoModel * info= [InviteUserInfoModel modelWithDictionary:data.data]; - [[self getView] checkInviteUserInfoSuccess:info]; - }] inviteCode:inviteCode]; -} - -///获取新用户打招呼信息 -- (void)getNewUserGreetInfo { - [Api newUserGreetInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - NewUserGreetModel * greetInfo = [NewUserGreetModel modelWithDictionary:data.data]; - [[self getView] getNewUserGreetInfoSucces:greetInfo]; - }]; -} - -/// 获取快捷推荐进房 -- (void)getShortCutRecommendRoom { - NSString * uid = [AccountInfoStorage instance].getUid; - [Api shortCutRecommendRoom:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSString * roomUid = [data.data stringValue]; - [[self getView] getShortCutRecommendRoomSuccces:roomUid]; - }] uid:uid]; -} - -///获取新用户充值优惠 -- (void)getNewUserRechargeList { - [Api requestNewUserRechargeList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NewUserRechargeModel *model = [NewUserRechargeModel modelWithDictionary:data.data]; - [[self getView] getNewUserRechargeInfoSuccess:model]; - }]]; -} - -///获取主播卡片信息 -- (void)getAnchorCardInfo { - [Api requestAnchorCardInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - XPTabAnchorCardModel *model = [XPTabAnchorCardModel modelWithDictionary:data.data]; - [[self getView] getAnchorCardInfoSuccess:model]; - } fail:^(NSInteger code, NSString * _Nullable msg) { -// NSLog(@"%@", msg); - } errorToast:NO]]; -} - -///心跳接口，每 30 秒调用一次，用来更新用户在线状态 -- (void)clientHeartBeat { - [Api requestClientHeartBrat:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - }]; -} -///app 启动调用此接口 主要功能：给主播分流 -- (void)clientStartApp { - [Api requestClientStartApp:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - }]; -} -#pragma mark - 版本更新 --(void)getVersionUpdate{ - NSString *appVersion = [YYUtility appVersion]; - NSString *os = @"ios"; - NSString *channel = [YYUtility getAppSource]; - [Api requestVersionUpdate:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - XPVersionUpdateModel *model = [XPVersionUpdateModel modelWithDictionary:data.data]; - if([MainPresenter isUpdateVersion:model] == NO) return; - [[self getView] getVersionUpdate:model]; - } fail:^(NSInteger code, NSString * _Nullable msg) { -// NSLog(@"%@", msg); - } errorToast:NO] appVersion:appVersion os:os channel:channel]; -} - -+(BOOL)isUpdateVersion:(XPVersionUpdateModel *)versionModel{ - if(versionModel.updateStatus == 1 || versionModel.updateStatus == 2)return NO; - if(versionModel.updateStatus == 3)return YES; - NSString *appVersion = [YYUtility appVersion]; - NSString *updateVersion = versionModel.updateVersion; - NSComparisonResult result = [appVersion compare:updateVersion options:NSNumericSearch]; - if(result == NSOrderedSame || result == NSOrderedDescending){ - return NO; - } - NSDictionary *appVersionDic = [[NSUserDefaults standardUserDefaults]valueForKey:kUpdateVersionNum]; - if(appVersionDic == nil){ - [self saveDataWithVersion:versionModel.updateVersion updateVersionList:@[]]; - - return YES; - }; - NSMutableDictionary *getAppVersionDic = [[NSMutableDictionary alloc]initWithDictionary:appVersionDic]; - NSArray *updateVersionDic = getAppVersionDic[versionModel.updateVersion]; - if(updateVersionDic == nil){ - [self saveDataWithVersion:versionModel.updateVersion updateVersionList:@[]]; - return YES; - }; - NSArray *itemModelList = [XPVersionUpdateItemModel modelsWithArray:updateVersionDic]; - if(itemModelList.count >= 3)return NO; - BOOL isDayUpdate = NO; - for (XPVersionUpdateItemModel *itemModel in itemModelList){ - if([itemModel.time isEqualToString:[MainPresenter GetCurrentTime]]){ - isDayUpdate = YES; - break; - } - } - if(isDayUpdate == YES)return NO; - [self saveDataWithVersion:versionModel.updateVersion updateVersionList:updateVersionDic]; - return YES; - -} - -+(void)saveDataWithVersion:(NSString *)version updateVersionList:(NSArray *)list{ - if(version == nil)return; - XPVersionUpdateItemModel *itemModel = [XPVersionUpdateItemModel new]; - itemModel.time = [MainPresenter GetCurrentTime]; - itemModel.version = version; - itemModel.num = @"1"; - NSMutableArray *getUpdateVersionList = [NSMutableArray arrayWithArray:list]; - [getUpdateVersionList addObject:[itemModel model2dictionary]]; - - NSDictionary *appVersionDic = [[NSUserDefaults standardUserDefaults]valueForKey:kUpdateVersionNum]; - NSMutableDictionary *saveDic; - if(appVersionDic == nil){ - saveDic = [NSMutableDictionary dictionary]; - }else{ - saveDic = [NSMutableDictionary dictionaryWithDictionary:appVersionDic]; - } - [saveDic setObject:getUpdateVersionList forKey:version]; - [[NSUserDefaults standardUserDefaults]setObject:saveDic forKey:kUpdateVersionNum]; - [[NSUserDefaults standardUserDefaults] synchronize]; -} - -+ (NSString *)GetCurrentTime{ - NSDate *now = [NSDate date]; - NSDateFormatter *formatter = [[NSDateFormatter alloc]init]; - formatter.dateFormat = @"yyyy-MM-dd"; - NSString *dateStr = [formatter stringFromDate:now]; - return dateStr; -} --(void)getAuthorizationCodeInfo{ - [Api requestAuthorizationCodeInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView]getAuthorizationCodeInfoWithPhoneSuccess:[data.data boolValue]]; - } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self getView]getAuthorizationCodeInfoWithPhonefail]; - } errorToast:NO]]; -} - -@end diff --git a/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.h b/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.h deleted file mode 100644 index 5caba7a..0000000 --- a/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// YMAnchorCardView.h -// YUMI -// -// Created by YUMI on 2022/8/1. -// - -#import -#import "XPTabAnchorCardModel.h" - -@protocol XPAnchorCardViewDelegate - -///进入房间 -- (void)xPAnchorCardViewEnterRoom:(NSString *)roomUid; - -///点击头像 -- (void)xPAnchorCardViewClickAvatar:(NSString *)uid; - -@end - -@interface XPAnchorCardView : UIView - -@property (nonatomic, strong) XPTabAnchorCardModel *cardInfo; - -@property (nonatomic, weak) id delegate; - -@end diff --git a/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m b/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m deleted file mode 100644 index b9a90bd..0000000 --- a/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m +++ /dev/null @@ -1,526 +0,0 @@ -// -// YMAnchorCardView.m -// YUMI -// -// Created by YUMI on 2022/8/1. -// - -#import "XPAnchorCardView.h" -///Third -#import -///Tool -#import "DJDKMIMOMColor.h" -#import "NetImageView.h" -#import "YUMIMacroUitls.h" -#import "UIImage+Utils.h" -#import "UIButton+EnlargeTouchArea.h" -#import -#import "XPSkillCardPlayerManager.h" -///P -#import "NSArray+Safe.h" -///View -#import "XPAnchorCardSkillCollectionViewCell.h" -///Model -#import "MineSkillCardListInfoModel.h" - -@interface XPAnchorCardView () - -@property (nonatomic, strong) UICollectionView *collectionView; -///背景图 -@property (nonatomic,strong) UIImageView *backImageView; -///头像 -@property (nonatomic,strong) NetImageView *avatarImageView; -///性别 -@property (nonatomic, strong) UIButton *genderImageView; -///昵称 -@property (nonatomic,strong) UIButton *nickButton; -///签名 -@property (nonatomic,strong) UILabel *descLabel; -///进入房间 -@property (nonatomic, strong) UIButton *enterRoomButton; -///倒计时背景 -@property (nonatomic, strong) UIView *countBgView; -///倒计时 -@property (nonatomic, strong) UILabel *countLabel; -///倒计时 -@property (strong, nonatomic) dispatch_source_t timer; -///播放 -@property (nonatomic,strong) UIButton *playButton; -///音符 -@property (nonatomic,strong) UIImageView *noteImaegView; -///播放完成 -@property (nonatomic,assign) BOOL isPlaying; -///定时器是否为挂起状态 -@property (nonatomic, assign) BOOL isSuspend; -///半透明遮罩 -@property (nonatomic, strong) UIImageView *alphaImageView; - -@end - -@implementation XPAnchorCardView - -- (void)dealloc { - if (_isSuspend) { - [self resumeTimer]; - } - [self stopTimer]; - self.isPlaying = NO; - [self.noteImaegView stopAnimating]; -} - -- (void)removeFromSuperview { - if (_isSuspend) { - [self resumeTimer]; - } - [self stopTimer]; - [super removeFromSuperview]; -} - -- (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.backImageView]; - [self addSubview:self.avatarImageView]; - [self addSubview:self.genderImageView]; - [self addSubview:self.nickButton]; - [self addSubview:self.descLabel];; - [self addSubview:self.enterRoomButton]; - [self addSubview:self.collectionView]; - [self addSubview:self.alphaImageView]; - [self addSubview:self.countBgView]; - [self addSubview:self.countLabel]; -} - -- (void)initSubViewConstraints { - [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.mas_equalTo(0); - make.leading.trailing.mas_equalTo(self).inset(10); - }]; - [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(66, 66)); - make.top.mas_equalTo(12); - make.leading.mas_equalTo(20); - }]; - [self.nickButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView).mas_offset(13); - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(8); - make.height.mas_equalTo(20); - }]; - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.nickButton); - make.leading.mas_equalTo(self.nickButton.mas_trailing).mas_offset(4); - make.trailing.mas_equalTo(-51); - make.height.mas_equalTo(15); - }]; - [self.genderImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(28, 14)); - make.trailing.bottom.mas_equalTo(self.avatarImageView).mas_offset(-4); - }]; - [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.nickButton); - make.top.mas_equalTo(self.nickButton.mas_bottom).mas_offset(4); - make.height.mas_equalTo(17); - make.trailing.mas_equalTo(self.enterRoomButton.mas_leading).mas_offset(-15); - }]; - [self.enterRoomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(79, 24)); - make.top.mas_equalTo(51); - make.trailing.mas_equalTo(-20); - }]; - [self.countBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.mas_equalTo(self.backImageView); - make.size.mas_equalTo(CGSizeMake(48, 20)); - }]; - [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.countBgView); - }]; - [self.alphaImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.nickButton); - make.size.mas_equalTo(CGSizeMake(44, 15)); - make.trailing.mas_equalTo(-51); - }]; -} - - #pragma mark - Event Response -- (void)enterRoomButtonClick:(UIButton *)sender { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPAnchorCardViewEnterRoom:)]) { - NSString *uid; - if (self.cardInfo.roomUid) { - uid = [NSString stringWithFormat:@"%zd", self.cardInfo.roomUid]; - } else { - uid = [NSString stringWithFormat:@"%zd", self.cardInfo.uid]; - } - [self.delegate xPAnchorCardViewEnterRoom:uid]; - } -} - -- (void)onTapAvatar:(UITapGestureRecognizer *)ges { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPAnchorCardViewClickAvatar:)]) { - [self.delegate xPAnchorCardViewClickAvatar:[NSString stringWithFormat:@"%zd", self.cardInfo.uid]]; - } -} - -#pragma mark - 倒计时 -- (void)openCountdownWithTime:(long)time { - __block long tempTime = time; //倒计时时间 - if (self.timer == nil) { - @kWeakify(self); - dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - self.timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue); - dispatch_source_set_timer(self.timer,dispatch_walltime(NULL, 0),1.0*NSEC_PER_SEC, 0); //每秒执行 - dispatch_source_set_event_handler(self.timer, ^{ - @kStrongify(self); - if(tempTime <= 0){ //倒计时结束，关闭 - dispatch_source_cancel(self.timer); - self.timer = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - if (self.delegate && [self.delegate respondsToSelector:@selector(xPAnchorCardViewEnterRoom:)]) { - [self.delegate xPAnchorCardViewEnterRoom:nil]; - } - }); - } else { - dispatch_async(dispatch_get_main_queue(), ^{ - //设置按钮显示读秒效果 - self.countLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPRoomSearchRecordViewController9"), tempTime]; - }); - tempTime--; - } - }); - dispatch_resume(self.timer); - } -} - -#pragma mark - UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.cardInfo.absCardPics.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPAnchorCardSkillCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPAnchorCardSkillCollectionViewCell class]) forIndexPath:indexPath]; - cell.imageView.imageUrl = [self.cardInfo.absCardPics xpSafeObjectAtIndex:indexPath.item]; - return cell; -} - -- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - CGFloat height = 15; - CGFloat width = 30; - XPAnchorCardSkillCollectionViewCell * cell = (XPAnchorCardSkillCollectionViewCell *)[collectionView cellForItemAtIndexPath:indexPath]; - - UIImage* image = cell.imageView.image; - if (image) { - CGFloat scale = image.size.width / image.size.height; - return CGSizeMake(15 * scale, height); - } else { - NSURL *imgUrl = [NSURL URLWithString:[self.cardInfo.absCardPics xpSafeObjectAtIndex:indexPath.item]]; - UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]]; - CGFloat scale = myImage.size.width / myImage.size.height; - if (scale == 0) { - return CGSizeMake(30, height); - }else { - return CGSizeMake(15 * scale, height); - } - } - return CGSizeMake(width, height); -} - -#pragma mark - private -- (void)playButtonAction:(UIButton *)sender { - sender.selected = !sender.selected; - if (!self.isPlaying) { - if(self.cardInfo.voiceCard.propVals.count) { - NSString *fileName = [[self.cardInfo.voiceCard.name componentsSeparatedByString:@"/"] lastObject]; - fileName = [NSString stringWithFormat:@"%zd_%@", self.cardInfo.uid, fileName]; - NSString * url = [self.cardInfo.voiceCard.propVals xpSafeObjectAtIndex:0]; - NSString *filePath = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"mineSkillCardVoice"]; - NSString *fullPath = [filePath stringByAppendingPathComponent:fileName]; - if ([[NSFileManager defaultManager] fileExistsAtPath:fullPath]) { - self.isPlaying = YES; - sender.selected = YES; - [self pauseTimer]; - [self.noteImaegView startAnimating]; - [[XPSkillCardPlayerManager shareInstance] playerVoiceWithPath:fullPath completionBlock:^{ - self.isPlaying = NO; - [self.noteImaegView stopAnimating]; - sender.selected = NO; - [self resumeTimer]; - self.noteImaegView.image = [UIImage imageNamed:@"mine_voice_shengyin_32"]; - [[XPSkillCardPlayerManager shareInstance] stopMusic]; - }]; - } else { - if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]) { - NSFileManager *fileMgr = [[NSFileManager alloc] init]; - [fileMgr createDirectoryAtPath:filePath withIntermediateDirectories:YES attributes:nil error:nil]; - } - [self downloadAudioWithFileName:fileName musicUrl:url completion:^(BOOL isSuccess, NSString *editAudioPath) { - self.isPlaying = YES; - sender.selected = YES; - [self.noteImaegView startAnimating]; - [self pauseTimer]; - [[XPSkillCardPlayerManager shareInstance] playerVoiceWithPath:fullPath completionBlock:^{ - self.isPlaying = NO; - sender.selected = NO; - [self.noteImaegView stopAnimating]; - [self resumeTimer]; - self.noteImaegView.image = [UIImage imageNamed:@"mine_voice_shengyin_32"]; - [[XPSkillCardPlayerManager shareInstance] stopMusic]; - }]; - }]; - } - } - } else { - self.isPlaying = NO; - sender.selected = NO; - [self.noteImaegView stopAnimating]; - self.noteImaegView.image = [UIImage imageNamed:@"mine_voice_shengyin_32"]; - [[XPSkillCardPlayerManager shareInstance] stopMusic]; - [self resumeTimer]; - } -} - -- (void)downloadAudioWithFileName:(NSString *)fileName musicUrl:(NSString *)musicUrl completion:(void (^) (BOOL isSuccess, NSString *editAudioPath))completion { - AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; - NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:musicUrl]]; - NSURLSessionDownloadTask *download = [manager downloadTaskWithRequest:request progress:^(NSProgress * _Nonnull downloadProgress) { - } destination:^NSURL * _Nonnull(NSURL * _Nonnull targetPath, NSURLResponse * _Nonnull response) { - NSString *filePath = [[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"mineSkillCardVoice"] stringByAppendingPathComponent:fileName]; - return [NSURL fileURLWithPath:filePath]; - } completionHandler:^(NSURLResponse * _Nonnull response, NSURL * _Nullable filePath, NSError * _Nullable error) { - if (!error) { - completion(YES, filePath.path); - } else { - completion(NO, nil); - } - }]; - [download resume]; -} - -- (void)pauseTimer{ - if(self.timer){ - dispatch_suspend(self.timer); - self.isSuspend = YES; - } -} - -- (void)resumeTimer{ - if(self.timer){ - dispatch_resume(self.timer); - self.isSuspend = NO; - } -} - -- (void)stopTimer{ - if(self.timer){ - dispatch_source_cancel(_timer); - _timer = nil; - } -} - -#pragma mark - Getters And Setters -- (void)setCardInfo:(XPTabAnchorCardModel *)cardInfo { - _cardInfo = cardInfo; - if (_cardInfo) { - self.avatarImageView.imageUrl = cardInfo.avatar; - NSString * nick = cardInfo.nick; - if (nick.length > 6) { - nick = [nick substringToIndex:6]; - } - [self.nickButton setTitle:nick forState:UIControlStateNormal]; - self.descLabel.text = cardInfo.userDesc; - [_genderImageView setTitle:[NSString getAgeWithBirth:cardInfo.birth] forState:UIControlStateNormal]; - self.genderImageView.backgroundColor = cardInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.genderImageView.titleEdgeInsets = cardInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.genderImageView.selected = cardInfo.gender != GenderType_Male; - [self openCountdownWithTime:11]; - [self.collectionView reloadData]; - if (cardInfo.voiceCard.propVals.count) { - [self addSubview:self.playButton]; - [self addSubview:self.noteImaegView]; - [self.nickButton mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(self.avatarImageView).mas_offset(1); - }]; - [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(18); - make.leading.mas_equalTo(self.nickButton); - make.top.mas_equalTo(self.descLabel.mas_bottom).mas_offset(4); - }]; - - [self.noteImaegView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(79, 12)); - make.centerY.mas_equalTo(self.playButton); - make.leading.mas_equalTo(self.playButton.mas_trailing).offset(5); - }]; - } - } -} - -- (UIImageView *)backImageView { - if (!_backImageView) { - _backImageView = [[UIImageView alloc] init]; - _backImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xDAF8FC), UIColorFromRGB(0xF2F6DF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 20, 90)]; - _backImageView.layer.cornerRadius = 8; - _backImageView.layer.masksToBounds = YES; - } - return _backImageView; -} - -- (NetImageView *)avatarImageView { - if (!_avatarImageView) { - NetImageConfig * config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - _avatarImageView = [[NetImageView alloc] initWithConfig:config]; - _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = 66/2; - _avatarImageView.userInteractionEnabled = YES; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTapAvatar:)]; - [_avatarImageView addGestureRecognizer:tap]; - } - return _avatarImageView; -} - -- (UIButton *)genderImageView { - if (!_genderImageView) { - _genderImageView = [[UIButton alloc] init]; - [_genderImageView setImage:kImage(@"home_age_boy_icon") forState:UIControlStateNormal]; - [_genderImageView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected]; - _genderImageView.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - [_genderImageView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _genderImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0); - _genderImageView.layer.cornerRadius = 14/2; - _genderImageView.layer.masksToBounds = YES; - - } - return _genderImageView; -} - -- (UIButton *)nickButton { - if (!_nickButton) { - _nickButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_nickButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal]; - _nickButton.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightBold]; - } - return _nickButton; -} - -- (UILabel *)descLabel { - if (!_descLabel) { - _descLabel = [[UILabel alloc] init]; - _descLabel.font = [UIFont systemFontOfSize:12]; - _descLabel.textColor = [DJDKMIMOMColor textThirdColor]; - } - return _descLabel; -} - -- (UIButton *)enterRoomButton { - if (!_enterRoomButton) { - _enterRoomButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_enterRoomButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _enterRoomButton.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightBold]; - [_enterRoomButton setTitle:YMLocalizedString(@"XPAnchorCardView1") forState:UIControlStateNormal]; - [_enterRoomButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFD436), UIColorFromRGB(0xFFB733)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; - [_enterRoomButton addTarget:self action:@selector(enterRoomButtonClick:) forControlEvents:UIControlEventTouchUpInside]; - _enterRoomButton.layer.cornerRadius = 12; - _enterRoomButton.layer.masksToBounds = YES; - } - return _enterRoomButton; -} - -- (UIView *)countBgView { - if (!_countBgView) { - _countBgView = [[UIView alloc] init]; - _countBgView.backgroundColor = [UIColor whiteColor]; - UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, 48, 20) byRoundingCorners:UIRectCornerBottomLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(8, 8)]; - CAShapeLayer * layer = [CAShapeLayer layer]; - layer.path = path.CGPath; - _countBgView.layer.masksToBounds = YES; - _countBgView.layer.mask = layer;; - } - return _countBgView; -} - -- (UILabel *)countLabel { - if (!_countLabel) { - _countLabel = [[UILabel alloc] init]; - _countLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - _countLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _countLabel.textAlignment = NSTextAlignmentCenter; - } - return _countLabel; -} - -- (UICollectionView *)collectionView{ - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(30, 15); - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 4; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - _collectionView.showsHorizontalScrollIndicator = NO; - _collectionView.dataSource = self; - _collectionView.delegate = self; - _collectionView.backgroundColor = [UIColor clearColor]; - [_collectionView registerClass:[XPAnchorCardSkillCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPAnchorCardSkillCollectionViewCell class])]; - } - return _collectionView; -} - -- (UIButton *)playButton { - if (!_playButton) { - _playButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_playButton setImage:[UIImage imageNamed:@"mine_user_info_skill_card_voice_play"] forState:UIControlStateNormal]; - [_playButton setImage:[UIImage imageNamed:@"mine_user_info_skill_card_voice_pause"] forState:UIControlStateSelected]; - [_playButton addTarget:self action:@selector(playButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [_playButton setEnlargeEdgeWithTop:8 right:10 bottom:8 left:10]; - } - return _playButton; -} - -- (UIImageView *)noteImaegView { - if (!_noteImaegView) { - _noteImaegView = [[UIImageView alloc] init]; - _noteImaegView.userInteractionEnabled = YES; - _noteImaegView.image = [UIImage imageNamed:@"mine_voice_shengyin_32"]; - NSMutableArray * array = [NSMutableArray array]; - for (int i = 0 ; i< 40; i++) { - UIImage * image; - if ( i < 10) { - image = [UIImage imageNamed:[NSString stringWithFormat:@"mine_voice_shengyin_0%d", i]]; - } else { - image = [UIImage imageNamed:[NSString stringWithFormat:@"mine_voice_shengyin_%d", i]]; - } - if (image) { - [array addObject:image]; - } - - } - _noteImaegView.animationImages = array; - _noteImaegView.animationDuration = 1.2; - _noteImaegView.animationRepeatCount = HUGE; - _noteImaegView.contentMode = UIViewContentModeScaleAspectFill; - } - return _noteImaegView; -} - -- (UIImageView *)alphaImageView { - if (!_alphaImageView) { - _alphaImageView = [[UIImageView alloc] init]; - CAGradientLayer *gradientLayer = [CAGradientLayer layer]; - gradientLayer.colors = @[(__bridge id)UIColorRGBAlpha(0xffffff, 0).CGColor, (__bridge id)UIColorRGBAlpha(0xEFF6E3, 1).CGColor]; - gradientLayer.locations = @[@0, @1.0]; - gradientLayer.startPoint = CGPointMake(0, 0); - gradientLayer.endPoint = CGPointMake(1.0, 0); - gradientLayer.frame = CGRectMake(0, 0, 44, 15); - [_alphaImageView.layer addSublayer:gradientLayer]; - } - return _alphaImageView; -} - -@end diff --git a/YuMi/Modules/YMTabbar/View/TabbarViewController.h b/YuMi/Modules/YMTabbar/View/TabbarViewController.h deleted file mode 100644 index b72e9e8..0000000 --- a/YuMi/Modules/YMTabbar/View/TabbarViewController.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// ViewController.h -// YUMI -// -// Created by admin on 2023/3/9. -// - -@interface TabbarViewController : UITabBarController -@property (nonatomic,assign) BOOL isFormLogin; -///邀请码 -@property (nonatomic,copy) NSString *inviteCode; - -- (void)registerSocialCallBack; -- (void)unsignSocialCallback; - -@end - diff --git a/YuMi/Modules/YMTabbar/View/TabbarViewController.m b/YuMi/Modules/YMTabbar/View/TabbarViewController.m deleted file mode 100644 index 04b12b7..0000000 --- a/YuMi/Modules/YMTabbar/View/TabbarViewController.m +++ /dev/null @@ -1,1118 +0,0 @@ -// -// ViewController.m -// YUMI -// -// Created by admin on 2023/3/9. -// -#import -///Third -#import -#import -#import -#import -#import -#import -#import -#import "SDWebImageManager.h" -///Tool -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "UIImage+Utils.h" -#import "NSObject+MJExtension.h" -#import "XNDJTDDLoadingTool.h" -#import "AccountInfoStorage.h" -#import "TTPopup.h" -#import "YUMIConstant.h" -#import "XPRoomMiniManager.h" -#import "ClientConfig.h" -#import "RtcManager.h" -#import "XCCurrentVCStackManager.h" -#import "Api+Home.h" -#import "YUMIConstant.h" -#import "Api+Moments.h" -#import "XPAdImageTool.h" -#import "YYUtility.h" -#import "PLTimeUtil.h" -#import "Api+MSRoomGameApi.h" - -///Model -#import "MSRoomGameModel.h" -#import "AccountModel.h" -#import "RoomInfoModel.h" -#import "AttachmentModel.h" -#import "XPMineVisitorUnReadModel.h" -#import "InviteUserInfoModel.h" -#import "NewUserGreetModel.h" -#import "FindNewGreetMessageModel.h" -#import "XPTabAnchorCardModel.h" -#import "FirstRechargeModel.h" -#import "MonentsUnReadModel.h" -#import "XPRedPacketModel.h" -#import "GiftReceiveInfoModel.h" -#import "XPVersionUpdateModel.h" -#import "MSRoomGameQuitGameView.h" -///VC -#import "TabbarViewController.h" -#import "XPBlankViewController.h" -#import "LoginViewController.h" -#import "BaseNavigationController.h" -#import "LoginBindPhoneViewController.h" -#import "LoginFullInfoViewController.h" -#import "XPMineViewController.h" -#import "XPSessionMainViewController.h" -#import "XPMiniRoomView.h" -#import "XPRoomViewController.h" -#import "XPSessionFindNewAlertView.h" -#import "XPAnchorCardView.h" -#import "XPTaskCompleteTipView.h" -#import "XPWebViewController.h" -#import "XPMineUserInfoViewController.h" -#import "LudoGameViewController.h" -#import "MSRoomGameVC.h" - -#import "XPMomentsRecommendViewController.h" -#import "XPMomentsViewController.h" -#import "XPReceiveRedPacketView.h" -#import "XPRoomYearActivityView.h" -#import "XPUpgradeView.h" -#import "XPLoginAuthCodeVC.h" -///Present -#import "MainPresenter.h" -#import "MainProtocol.h" -#import "RoomHostDelegate.h" -#import "XPSkillCardPlayerManager.h" - -#import -#import "Api+Gift.h" -#import "UploadFile.h" -#import "XPTabBar.h" - -#import "XPHomePagingViewController.h" - -#import "IAPManager.h" -#import "RoomBoomManager.h" -#import "RoomBoomBannerAnimation.h" - -#import "RoomResourceManager.h" -#import "SocialShareManager.h" -#import "PublicRoomManager.h" - -NSString * const kUserFirstLoginKey = @"kUserFirstLoginKey"; -NSString * const kHadLaunchApp = @"kHadLaunchApp"; -NSString * const kLastShowAnchorCardTime = @"kLastShowAnchorCardTime"; -NSString * const kNetworkReachabilityKey = @"kNetworkReachabilityKey"; -UIKIT_EXTERN NSString * kNewUserRechargeKey; -UIKIT_EXTERN NSString *kTabShowAnchorCardKey; - -@interface TabbarViewController () -///用户信息 -@property (nonatomic,strong) UserInfoModel *userInfo; -@property (nonatomic, strong) MainPresenter *presenter; -///房间最小化 -@property (nonatomic,strong) XPMiniRoomView *roomMineView; -///需要显示新用户充值优惠弹窗 -@property (nonatomic, assign) BOOL needShowNewUserRecharge; -///需要展示主播卡片(首次） -@property (nonatomic, assign) BOOL needShowAnchorCard; -///延迟弹出主播卡片 -@property (nonatomic, assign) BOOL delayShowAnchorCard; -///主播卡片 -@property (nonatomic, strong) XPAnchorCardView *anchorCardView; -///任务完成提示 -@property (nonatomic, strong) XPTaskCompleteTipView *taskTipView; -///是否是的第一次链接网络 -@property (nonatomic,assign) BOOL isFirstReachability; -///是否刷新了 -@property (nonatomic,assign) BOOL isReload; -///是否刷新了 -@property (nonatomic,assign) BOOL isInitReload; -@property(nonatomic,assign) BOOL isReloadTicket; - -@property(nonatomic, assign) NSInteger retryCount; - -@end - -@implementation TabbarViewController - -- (void)dealloc{ - [[NSNotificationCenter defaultCenter]removeObserver:self]; - [[NIMSDK sharedSDK].loginManager removeDelegate:self]; - [[NIMSDK sharedSDK].chatManager removeDelegate:self]; - [[NIMSDK sharedSDK].systemNotificationManager removeDelegate:self]; - [[NIMSDK sharedSDK].broadcastManager removeDelegate:self]; - - // 🔧 新增：清理 RoomBoomManager 监听器，防止内存泄漏 - [[RoomBoomManager sharedManager] removeEventListenerForTarget:self]; -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.tabBarController.tabBar.translucent = NO; - - [self.presenter autoLogin]; - [self initTabs:NO defaultSelectedIndex:0]; - - [[NIMSDK sharedSDK].loginManager addDelegate:self]; - [[NIMSDK sharedSDK].chatManager addDelegate:self]; - [[NIMSDK sharedSDK].systemNotificationManager addDelegate:self]; - [[NIMSDK sharedSDK].broadcastManager addDelegate:self]; - - [self.view addSubview:self.roomMineView]; - - @kWeakify(self); - [[NSNotificationCenter defaultCenter] addObserverForName:kRoomMiniNotificationKey object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) { - @kStrongify(self); - [self configRoomMiniNView:note.userInfo]; - }]; - - [[NSNotificationCenter defaultCenter] addObserverForName:@"reloadAfterLoadConfig" - object:nil - queue:nil - usingBlock:^(NSNotification * _Nonnull note) { - @kStrongify(self); - if (self.isInitReload == NO) { - [self initTabs:YES defaultSelectedIndex:0]; - self.isReload = YES; - } - }]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showNewUserRecharge) name:kNewUserRechargeKey object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showAnchorCardKey:) name:kTabShowAnchorCardKey object:nil]; - [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(switchLanguage:) name:@"kSwitchLanguage" object:nil]; - - [[ClientConfig shareConfig] setUpdateTabbarBG:^(UIImage * _Nonnull image) { - @kStrongify(self); - [self configTheme:image]; - }]; - - [self configTheme:[[ClientConfig shareConfig] tabbarBGImage]]; - - [[RoomBoomManager sharedManager] registerBoomBanner:^(id _Nonnull sth) { - dispatch_async(dispatch_get_main_queue(), ^{ - // 🔧 新增：检查用户是否在房间中，只有在房间中才显示全局火箭升级通知 - if ([XPSkillCardPlayerManager shareInstance].isInRoom == YES) { - [RoomBoomBannerAnimation display:kWindow - with:sth - tapToRoom:YES - complete:^{}]; - } - }); - } target:self]; - - [self registerSocialCallBack]; -} - -- (void)registerSocialCallBack { - // 注册分享回调事件 - - [[SocialShareManager sharedManager] setHandleJumpToRoom:^(ShareItmeInfo * _Nonnull shareItem) { - // 添加类型安全检查，防止NSTaggedPointerString错误 - if (![shareItem isKindOfClass:[ShareItmeInfo class]]) { - NSLog(@"警告：shareItem不是ShareItmeInfo类型，而是%@类型", NSStringFromClass([shareItem class])); - return; - } - - switch (shareItem.shareType) { - case 1: { // 跳转到房间 - NSString *roomID = shareItem.targetUid; - if (![NSString isEmpty:roomID]) { - //判断是否在房间 - __block BOOL isInRoom = NO; - __block XPRoomViewController *currentRoom; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - currentRoom = obj; - *stop = YES; - isInRoom = YES; - } - }]; - - // 如果有 mini 房间 - if (isInRoom == NO && [XPRoomMiniManager shareManager].getRoomInfo) { - @kWeakify(self); - [TTPopup alertWithMessage:YMLocalizedString(@"Combo_10") confirmHandler:^{ - @kStrongify(self); - [[RtcManager instance] exitRoom]; - [[NIMSDK sharedSDK].chatroomManager exitChatroom:[NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.roomId] completion:nil]; - [self.roomMineView hiddenRoomMiniView]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:roomID - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } cancelHandler:^{}]; - } else if (isInRoom && ![currentRoom isSameRoom:roomID]) { - [TTPopup alertWithMessage:YMLocalizedString(@"Combo_10") confirmHandler:^{ - [currentRoom exitRoom]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [XPRoomViewController openRoom:roomID - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - }); - } cancelHandler:^{}]; - } else { - [XPRoomViewController openRoom:roomID - viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - } - } - } - - break; - case 2: // 跳转到活动 - { - XPWebViewController * webVC = [[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = [NSString stringWithFormat:@"%@%@", - URLWithType(kEventDetailPath), - shareItem.targetId]; - [self.navigationController pushViewController:webVC animated:YES]; - } - break; - - default: - break; - } - }]; -} - -- (void)unsignSocialCallback { - [[SocialShareManager sharedManager] reset]; -} - --(void)switchLanguage:(NSNotification *)not{ - [self initTabs:YES defaultSelectedIndex:4]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [self.navigationController setNavigationBarHidden:YES animated:YES]; - self.isReloadTicket = YES; - if ([XPRoomMiniManager shareManager].getRoomInfo == nil) { - [self.roomMineView hiddenRoomMiniView]; - } -} - -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; - self.delayShowAnchorCard = NO; - [self.anchorCardView removeFromSuperview]; - self.anchorCardView = nil; -} - -- (MainPresenter *)presenter { - if (_presenter == nil) { - _presenter = [[MainPresenter alloc] init]; - [_presenter attatchView:self]; - } - return _presenter; -} - -/** 登录成功（通过token且换取ticket后）。 - - 1. 登录云信。 - 2. 获取用户信息。 - 3. 其实目前多余回调V层，可以在P层里自行做这个逻辑。 - */ -- (void)autoLoginSuccess { - [self.presenter loginNIM]; - [self.presenter getUserInfo]; - - [[UploadFile share] initQCloud]; - - ///检查更新 - [self.presenter getVersionUpdate]; - - if (self.inviteCode && self.inviteCode.length > 0) { - ///邀请码进房 - [self.presenter checkInviteUserInfo:self.inviteCode]; - } - [self requestGiftList]; - [self cacheRoomResource]; - - XPAdImageTool.shareImageTool.isImLogin = YES; - - if ([self hadLaunchApp] && [self canShowAnchorCard]) { - @kWeakify(self); - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - @kStrongify(self); - if (self.view.window && self.isViewLoaded) { - [self.presenter getAnchorCardInfo]; - } - }); - } - if (self.needShowAnchorCard && !self.delayShowAnchorCard) { - [self.presenter getAnchorCardInfo]; - [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kHadLaunchApp];///第一次弹主播卡片 - [[NSUserDefaults standardUserDefaults] synchronize]; - } - - [[IAPManager sharedManager] handleLogin]; - [[IAPManager sharedManager] retryCheckAllReceipt]; - - NSLog(@"TabbarViewController: 统一入口 - 开始进入公共房间"); - [[PublicRoomManager sharedManager] enterPublicRoomWithCompletion:^(NSError * _Nullable error) { - if (error) { - NSLog(@"TabbarViewController: 进入公共房间失败: %@", error); - } else { - NSLog(@"TabbarViewController: 进入公共房间成功"); - } - }]; -} - --(void)getRoomGameInfo{ - [Api getRoomGameDetailsForHoem:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if(code == 200){ - MSRoomGameModel *model = [MSRoomGameModel modelWithJSON:data.data]; - if(model.data.matchStatus == 1 && model.data.roundStatus == 0){ - MSTabbarRoomGameItemModel *chooseGameModel = [MSTabbarRoomGameItemModel new]; - chooseGameModel.scores = model.data.scores; - chooseGameModel.roomId = model.roomId; - MSRoomGameQuitGameView *quitGameView = [[MSRoomGameQuitGameView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - quitGameView.chooseGameModel = chooseGameModel; - quitGameView.delegate = self; - [TTPopup popupView:quitGameView style:TTPopupStyleAlert]; - } - } - }]; -} -#pragma mark -MSRoomGameQuitGameViewDelegate -///退出游戏 -- (void)closeGameActionWithModel:(MSTabbarRoomGameItemModel *)model{ - [Api closeRoomGame:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - - } roomId:model.roomId]; -} - -///强杀app打开后,是否重新玩游戏 --(void)replayTheGameWithModel:(MSTabbarRoomGameItemModel *)model{ - MSRoomGameVC *gameVC = [MSRoomGameVC new]; - - gameVC.chooseGameModel = model; - gameVC.userinfo = self.userInfo; - BaseNavigationController *nav = [[BaseNavigationController alloc]initWithRootViewController:gameVC]; - nav.modalPresentationStyle = UIModalPresentationFullScreen; - [self presentViewController:nav animated:YES completion:nil]; -} -/// 获取用户信息后检查：1、是否绑定手机号；2、是否需要完善用户信息。 -/// 该逻辑仅在刷新ticket后执行一次。 -/// 当前服务端接口是有未完善信息的全局拦截的，在BaseMvpPresenter里会触发1415去完善用户信息。 -- (void)getUserInfoSuccess:(UserInfoModel *)userInfo { - if (!userInfo.isBindPhone && [ClientConfig shareConfig].iOSPhoneBind) { - LoginBindPhoneViewController * bindPhoneVC = [[LoginBindPhoneViewController alloc] init]; - BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:bindPhoneVC]; - nav.modalPresentationStyle = UIModalPresentationFullScreen; - [self.navigationController presentViewController:nav animated:YES completion:nil]; - return; - } - self.userInfo = userInfo; - [[XPSkillCardPlayerManager shareInstance] setUserInfoModel:userInfo]; - [[XPSkillCardPlayerManager shareInstance] requestBravoGiftTabInfomation]; - [[RoomBoomManager sharedManager] saveUserInfo:userInfo]; - - // 初始化PublicRoomManager并更新用户信息 - [[PublicRoomManager sharedManager] initialize]; - [[PublicRoomManager sharedManager] updateUserInfo:userInfo]; - - [self getRoomGameInfo]; - [AccountInfoStorage instance].name = self.userInfo.nick; - - if ((userInfo.nick == nil || userInfo.avatar == nil) && self.isFormLogin == NO) { - [self completeUserInfo]; - return; - } - - if(self.isReload == NO){ - [self initTabs:YES defaultSelectedIndex:0]; - self.isInitReload = YES; - } - - if (self.inviteCode.length <= 0) { - [self initQuickEnterRoom]; - } - - if (self.inviteCode) { - self.inviteCode = nil; - } - - [self monentsUnReadCount]; -} - --(void)loginIng{ - if ((self.userInfo.nick == nil || self.userInfo.avatar == nil) && self.isFormLogin == NO) { - [self completeUserInfo]; - return; - } - - if(self.isReload == NO){ - [self initTabs:YES defaultSelectedIndex:0]; - self.isInitReload = YES; - } - - if (self.inviteCode.length <= 0) { - [self initQuickEnterRoom]; - } - - if (self.inviteCode) { - self.inviteCode = nil; - } - - [self monentsUnReadCount]; -} - -- (void)getAuthorizationCodeInfoWithPhonefail{ - [self completeUserInfo]; -} - --(void)getAuthorizationCodeInfoWithPhoneSuccess:(BOOL)flag { - if(flag == NO){ - XPLoginAuthCodeVC *vc = [[XPLoginAuthCodeVC alloc]init]; - vc.delegate = self; - vc.modalPresentationStyle = UIModalPresentationFullScreen; - [self presentViewController:vc animated:YES completion:nil]; - return; - } - [self completeUserInfo]; -} - -#pragma mark - XPLoginAuthCodeVCDelegate -- (void)bindCodeSuccess{ - [self completeUserInfo]; -} -///缓存礼物特效 --(void)requestGiftList{ - @kWeakify(self); - AFNetworkReachabilityManager *networkManager = [AFNetworkReachabilityManager sharedManager]; - [networkManager setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) { - @kStrongify(self); - if (status == AFNetworkReachabilityStatusReachableViaWiFi) { - if(self.isFirstReachability == NO){ - [Api requestCacheGiftDynamicEffectList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if(code == 200){ - self.isFirstReachability = YES; - NSArray *allResourceList = data.data; - NSSet *allResourceSet = [[NSSet alloc] initWithArray:allResourceList]; - NSMutableArray *allResourceURLs = @[].mutableCopy; - for (NSString *url in allResourceSet) { - if (![NSString isEmpty:url]) { - [allResourceURLs addObject:url]; - } - } - [[UploadFile share] startBatchDownloadWithURLs:allResourceURLs]; - } - }]; - } else { - [[UploadFile share] resumeBatchDownload]; - } - } else { - [[UploadFile share] pauseBatchDownload]; - } - }]; - [networkManager startMonitoring]; -} - -- (void)requestFaceList { - -} - -- (void)cacheRoomResource { - [Api requestRoomResource:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - [[RoomResourceManager sharedManager] cacheAPIData:data.data]; - } else { - if (self.retryCount <= 5) { - self.retryCount += 1; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * self.retryCount * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self cacheRoomResource]; - }); - } - } - }]; -} - -- (void)checkInviteUserInfoSuccess:(InviteUserInfoModel *)inviteInfo { - if (inviteInfo && inviteInfo.isInRoom) { - [XPRoomViewController openRoom:inviteInfo.roomUid fromNick:inviteInfo.inviteNick fromType:inviteInfo.fromType fromUid:inviteInfo.inviteUid viewController:self]; - } else { //不在房间 - [self.presenter getShortCutRecommendRoom]; - } -} - -- (void)getShortCutRecommendRoomSuccces:(NSString *)roomUid { - if (roomUid.length > 0) { - [XPRoomViewController openRoom:roomUid viewController:self]; - } -} - -#pragma mark - app 启动调用此接口 主要功能： 给主播分流 -- (void)clientStartApp { -// [self.presenter clientStartApp]; -} - -#pragma mark - BaseMvpProtocol -- (void)tokenInvalid { - LoginViewController *lvc = [[LoginViewController alloc] init]; - BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:lvc]; - nav.modalPresentationStyle = UIModalPresentationFullScreen; - kWindow.rootViewController = nav; - XPAdImageTool.shareImageTool.isImLogin = NO; -} - -- (void)completeUserInfo { - LoginFullInfoViewController * bindPhoneVC = [[LoginFullInfoViewController alloc] init]; - BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:bindPhoneVC]; - nav.modalPresentationStyle = UIModalPresentationFullScreen; - kWindow.rootViewController = nav; -} - -///获取主播卡片信息成功 -- (void)getAnchorCardInfoSuccess:(XPTabAnchorCardModel *)cardInfo { - if (!self.anchorCardView.superview && cardInfo && self.isViewLoaded && self.view.window) { - self.anchorCardView.frame = CGRectMake(0, -90-kStatusBarHeight, KScreenWidth, 90); - [UIView animateWithDuration:0.5 animations:^{ - self.anchorCardView.frame = CGRectMake(0, kStatusBarHeight, KScreenWidth, 90); - } completion:nil]; - AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);//默认震动效果 - long time = (long)([[NSDate date] timeIntervalSince1970]*1000); - [[NSUserDefaults standardUserDefaults] setObject:@(time) forKey:kLastShowAnchorCardTime]; - [[NSUserDefaults standardUserDefaults] synchronize]; - self.anchorCardView.cardInfo = cardInfo; - [self.view addSubview:self.anchorCardView]; - UISwipeGestureRecognizer *recognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(handleAnchorCardSwipeFrom:)]; - [recognizer setDirection:(UISwipeGestureRecognizerDirectionUp)]; - [self.anchorCardView addGestureRecognizer:recognizer]; - } -} - -///获取更新版本信息成功 -- (void)getVersionUpdate:(XPVersionUpdateModel *)versionModel { - XPUpgradeView *view = [[XPUpgradeView alloc] init]; - view.versionModel = versionModel; - TTPopupService * service = [[TTPopupService alloc] init]; - service.contentView = view; - service.shouldDismissOnBackgroundTouch = NO; - [TTPopup popupWithConfig:service]; -} - -#pragma mark - NIMLoginManagerDelegate -- (void)onAutoLoginFailed:(NSError *)error { - // 如果非上次登录设备 autoLogin 会返回 417 - if (error.code == 417) { - @weakify(self); - AccountModel* accountModel = [AccountInfoStorage instance].getCurrentAccountInfo; - [[NIMSDK sharedSDK].loginManager login:accountModel.uid token:accountModel.netEaseToken completion:^(NSError * _Nullable error) { - if (error) { - @strongify(self); - [self.presenter logout]; - } - }]; - return; - } - [self.presenter logout]; -} - -- (void)onKickout:(NIMLoginKickoutResult *)result { - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"TabbarViewController0")]; - UIViewController *rootViewController = [UIApplication sharedApplication].keyWindow.rootViewController; - if ([rootViewController presentedViewController]) { //有一个被present出来的控制器 要先dismiss - [[rootViewController presentedViewController] dismissViewControllerAnimated:YES completion:^{ - if ([[XCCurrentVCStackManager shareManager] getCurrentVC].navigationController.viewControllers.count > 1) { - [[[XCCurrentVCStackManager shareManager] getCurrentVC].navigationController popToRootViewControllerAnimated:YES]; - } - if ([[UIApplication sharedApplication].delegate.window.rootViewController isKindOfClass:[UITabBarController class]]) { - UITabBarController *tabVC = (UITabBarController *)[UIApplication sharedApplication].delegate.window.rootViewController; - if (tabVC.selectedViewController.navigationController) { - [tabVC.selectedViewController.navigationController popToRootViewControllerAnimated:YES]; - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [tabVC setSelectedIndex:0]; - }); - } - }]; - }else { //不是被present出来的 就有可能是rootvc或者是被push出来的 所以要判断nav是不是只有一个vc 如果有多个就pop - if ([[XCCurrentVCStackManager shareManager] getCurrentVC].navigationController.viewControllers.count > 1) { - [[[XCCurrentVCStackManager shareManager] getCurrentVC].navigationController popToRootViewControllerAnimated:YES]; - } - if ([[UIApplication sharedApplication].delegate.window.rootViewController isKindOfClass:[UITabBarController class]]) { - UITabBarController *tabVC = (UITabBarController *)[UIApplication sharedApplication].delegate.window.rootViewController; - if (tabVC.selectedViewController) { - if ([tabVC.selectedViewController isKindOfClass:[UINavigationController class]]) { - [tabVC.selectedViewController popToRootViewControllerAnimated:YES]; - } else { - [tabVC.selectedViewController.navigationController popToRootViewControllerAnimated:YES]; - } - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [tabVC setSelectedIndex:0]; - }); - } - } - } - - if ([XPRoomMiniManager shareManager].getRoomInfo) { - [[RtcManager instance] exitRoom]; - [[NIMSDK sharedSDK].chatroomManager exitChatroom:[NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.roomId] completion:nil]; - [self.roomMineView hiddenRoomMiniView]; - } - [self.presenter logout]; -} - -#pragma mark - NIMChatManagerDelegate - -- (void)onRecvMessages:(NSArray *)messages { - if ([AccountInfoStorage instance].getTicket.length == 0) { - return; - } - for (NIMMessage * message in messages) { - if (message.session.sessionType == NIMSessionTypeP2P) { - if(message.messageType == NIMMessageTypeCustom) { - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel * attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_FindNew && attachment.second == Custom_Message_Find_New_Greet_New_User) { - FindNewGreetMessageModel * greetInfo = [FindNewGreetMessageModel modelWithDictionary:attachment.data]; - if (greetInfo.uid.integerValue != [AccountInfoStorage instance].getUid.integerValue) { - [TTPopup dismiss]; - XPSessionFindNewAlertView * alertView = [[XPSessionFindNewAlertView alloc] init]; - alertView.userInfo = greetInfo; - TTPopupService *service = [[TTPopupService alloc] init]; - service.contentView = alertView; - service.shouldDismissOnBackgroundTouch = NO; - service.style = TTPopupStyleAlert; - [TTPopup popupWithConfig:service]; - } - } - } - } - } - } -} - - -- (void)onReceiveBroadcastMessage:(NIMBroadcastMessage *)broadcastMessage { - if ([AccountInfoStorage instance].getUid.length == 0) { - return; - } - if (broadcastMessage.content) { - NSDictionary *msgDictionary = [broadcastMessage.content toJSONObject]; - AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]]; - NSString *partitionId = [NSString stringWithFormat:@"%@",attachment.data[@"partitionId"]]; - if(![partitionId isEqualToString:self.userInfo.partitionId]){ - return; - } - -// NSLog(@" --- Broadcast Message Raw Attach Content: %@", msgDictionary); - - // MARK: 要复查这里的 if else 嵌套 - if (attachment.first == CustomMessageType_RedPacket) { - [self receiveRedPacketDealWithData:attachment]; - } else if(attachment.first == CustomMessageType_Version_Update && attachment.second == Custom_Message_Version_Update_Value){ - NSString *osValue = attachment.data[@"updateOs"]; - if([osValue isEqualToString:@"ios"] && [AccountInfoStorage instance].getUid.length > 0){ - XPVersionUpdateModel *updateModel = [XPVersionUpdateModel modelWithDictionary:attachment.data]; - [self getVersionUpdate:updateModel]; - } - } - } -} -///收到红包，处理数据 --(void)receiveRedPacketDealWithData:(AttachmentModel *)attachment{ - if(attachment.second != Custom_Message_Sub_AllDiamandRedPacket)return; - XPRedPacketModel *data = [XPRedPacketModel modelWithDictionary:attachment.data]; - data.validityType = 0; - data.kind = 1; - data.redEnvelopeId = attachment.data[@"redEnvelopeId"]; - //判断是否在房间 - __block BOOL isInRoom; - - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - *stop = YES; - isInRoom = YES; - } - }]; - if (!isInRoom) { - UIViewController *currentVc = [[XCCurrentVCStackManager shareManager] getCurrentVC]; - XPReceiveRedPacketView *view = [[XPReceiveRedPacketView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - view.inAllPacketRoom = NO; - view.receiveModel = data; - [currentVc.view addSubview:view]; - [currentVc.view bringSubviewToFront:view]; - } -} -///判断是否在房间 --(BOOL)isInRoomWithData{ - //判断是否在房间 - __block BOOL isInRoom; - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - if ([obj isKindOfClass:[XPRoomViewController class]]) { - *stop = YES; - isInRoom = YES; - } - }]; - return isInRoom; -} -/** - * 收到消息被撤回的通知 - * - * @param notification 被撤回的消息信息 - * @discusssion 云信在收到消息撤回后，会先从本地数据库中找到对应消息并进行删除，之后通知上层消息已删除 - */ -- (void)onRecvRevokeMessageNotification:(NIMRevokeMessageNotification *)notification { - NIMMessage * message = notification.message; - if (message) { - NIMMessage * revokeMessage = [[NIMMessage alloc] init]; - [revokeMessage setValue:message.session forKey:@"session"]; - [revokeMessage setValue:@(NIMMessageTypeTip) forKey:@"messageType"]; - revokeMessage.timestamp = [PLTimeUtil getNowTimeTimestampMillisecond].longLongValue; - revokeMessage.text = YMLocalizedString(@"TabbarViewController1"); - [[NIMSDK sharedSDK].conversationManager saveMessage:revokeMessage forSession:message.session completion:nil]; - } -} - -- (void)configTheme:(UIImage *)image { - if (image == nil) { - image = kImage(@"tab_bar_bg"); - } - [self.tabBar setBackgroundImage:image]; - [self.tabBar setShadowImage:[[UIImage alloc]init]]; - if (@available(iOS 10.0, *)) { - [self.tabBar setUnselectedItemTintColor:[DJDKMIMOMColor tabbarNormalColor]]; - } - - if (@available(iOS 13, *)) { - UITabBarAppearance *tabBarAppearance = [UITabBarAppearance new]; - tabBarAppearance.backgroundImage = image; - [self.tabBar setStandardAppearance:tabBarAppearance]; - if (@available(iOS 15, *)) { - [self.tabBar setScrollEdgeAppearance:tabBarAppearance]; - } - } -} - -- (void)initTabs:(BOOL)isLogin defaultSelectedIndex:(NSInteger)index { - self.viewControllers = @[[XPBlankViewController new]]; - // 创建视图控制器数组 - NSMutableArray *viewControllers = [[NSMutableArray alloc] initWithCapacity:5]; - for (NSInteger i = 0; i < 5; i++) { - UIViewController *viewController; - if (isLogin) { - switch (i) { - case 0: - viewController = [[XPHomePagingViewController alloc] init]; - break; - case 1: { - @kWeakify(self); - LudoGameViewController *vc = [[LudoGameViewController alloc] init]; - vc.needForceExitRoom = ^{ - @kStrongify(self); - if ([XPRoomMiniManager shareManager].getRoomInfo) { - [[RtcManager instance] exitRoom]; - [[NIMSDK sharedSDK].chatroomManager exitChatroom:[NSString stringWithFormat:@"%ld", [XPRoomMiniManager shareManager].getRoomInfo.roomId] - completion:nil]; - [self.roomMineView hiddenRoomMiniView]; - } - }; - viewController = vc; - } - break; - case 2: - viewController = [[XPMomentsViewController alloc] init]; - break; - case 3: - viewController = [[XPSessionMainViewController alloc] init]; - break; - case 4: - viewController = [[XPMineViewController alloc] init]; - break; - default: - viewController = [[XPBlankViewController alloc] init]; // 兜底 - break; - } - } else { - viewController = [[XPBlankViewController alloc] init]; - } - // 创建并设置标签栏项 - [viewControllers addObject:[self createTabBarItem:viewController - title:[[ClientConfig shareConfig] tabName:i] - image:[[ClientConfig shareConfig] loadDefaultNormalTabImageName:i] - selectedImage:[[ClientConfig shareConfig] loadDefaultSelectedTabImageName:i] - index:i]]; - } - // 设置视图控制器数组和默认选择项 - self.viewControllers = [viewControllers copy]; - self.selectedIndex = index; - - if (isLogin) { - [self.viewControllers enumerateObjectsWithOptions:NSEnumerationConcurrent - usingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - NSString *urlString_1 = [[ClientConfig shareConfig] loadConfigNormalTabImagePath:idx]; - if ([urlString_1 hasPrefix:@"http"]) { - [self loadCustomTabImage:urlString_1 targetVC:obj isForSelected:NO]; - } - - NSString *urlString_2 = [[ClientConfig shareConfig] loadConfigSelectedTabImagePath:idx]; - if ([urlString_2 hasPrefix:@"http"]) { - [self loadCustomTabImage:urlString_2 targetVC:obj isForSelected:YES]; - } - }]; - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [[SocialShareManager sharedManager] checkSocialShareItem]; - }); - } -} - -- (void)loadCustomTabImage:(NSString *)imageURL - targetVC:(UIViewController *)targetVC - isForSelected:(BOOL)isSelected { - // 使用 SDWebImage 加载网络图片 - [[SDWebImageManager sharedManager] loadImageWithURL:[NSURL URLWithString:imageURL] - options:SDWebImageRetryFailed | SDWebImageHighPriority | SDWebImageHighPriority - progress:nil - completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL) { - if (image) { - CGSize iconSize = CGSizeMake(40, 40); - UIGraphicsBeginImageContextWithOptions(iconSize, NO, 0.0); - [image drawInRect:CGRectMake(0, 0, iconSize.width, iconSize.height)]; - UIImage *resizedImage = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - - // 更新 tabBarItem 的 image 和 selectedImage - if (isSelected) { - targetVC.tabBarItem.selectedImage = [resizedImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; - } else { - targetVC.tabBarItem.image = [resizedImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; - } - } - }]; -} - -- (BaseNavigationController *)createTabBarItem:(UIViewController *)itemVc - title:(NSString *)title - image:(NSString *)imageURL - selectedImage:(NSString *)selectedImageURL - index:(NSInteger)index { - itemVc.title = @""; - [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)} - forState:UIControlStateSelected]; - [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0xB8B7C7)} - forState:UIControlStateNormal]; - - itemVc.tabBarItem.image = [[UIImage imageNamed:imageURL] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; - itemVc.tabBarItem.selectedImage = [[UIImage imageNamed:selectedImageURL] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; - - BaseNavigationController *nav = [[BaseNavigationController alloc] initWithRootViewController:itemVc]; - return nav; -} - -#pragma mark - 动态 -- (void)monentsUnReadCount { - [Api momentsUnReadCount:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - MonentsUnReadModel * model = [MonentsUnReadModel modelWithDictionary:data.data]; - NSString *badge = model.total > 0 ? @(model.total).stringValue : nil; - if (model.total > 99) { - badge = @"99+"; - } - NSUInteger index = 2; - UITabBarItem *item = self.tabBar.items.count > index ? self.tabBar.items[index] : nil; - [item setBadgeValue:badge]; - } - } uid:[AccountInfoStorage instance].getUid]; - NSArray *recentList = [[NIMSDK sharedSDK].conversationManager.allRecentSessions mutableCopy]; - __block NSInteger unreadCount = 0; - NSMutableArray * uids = [[NSMutableArray alloc] init]; - [recentList enumerateObjectsUsingBlock:^(NIMRecentSession * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - [uids addObject:obj.session.sessionId]; - unreadCount += obj.unreadCount; - }]; - if(unreadCount > 0){ - NSUInteger index = 3; - UITabBarItem *item = self.tabBar.items.count > index ? self.tabBar.items[index] : nil; - [item setBadgeValue:[NSString stringWithFormat:@"%ld",unreadCount]]; - } -} - -#pragma mark - 房间最小化 -- (void)configRoomMiniNView:(NSDictionary *)dic { - UserInfoModel * userInfo = [UserInfoModel modelWithDictionary:dic[@"userInfo"]]; - RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:dic[@"roomInfo"]]; - NSMutableDictionary * microQueue = dic[@"microQueue"]; - [self.roomMineView configRoomMiniView:roomInfo userInfo:userInfo micQueue:microQueue]; -} - -#pragma mark - 快捷进房 -- (void)initQuickEnterRoom { -// MARK: API 成功后，没有后续动作，先屏蔽 -// NSString * key = [NSString stringWithFormat:@"%@_%@", kUserFirstLoginKey, [AccountInfoStorage instance].getUid]; -// BOOL isNotFirstLogin = [[NSUserDefaults standardUserDefaults] boolForKey:key]; -// if (!isNotFirstLogin) { - ///新用户 -// [self.presenter getNewUserGreetInfo]; -// } -} - -///跳转优先级 闪屏→linkedMe→邀请码→新用户打招呼引导→渠道指定房间 -- (void)completeUserInfoFinish:(NSString *)inviteCode { - self.inviteCode = inviteCode; -} -#pragma mark -NIMSystemNotificationManagerDelegate -- (void)onReceiveCustomSystemNotification:(NIMCustomSystemNotification *)notification { - - if (notification.receiverType == NIMSessionTypeP2P) { - if (notification.content != nil) { - NSData *jsonData = [notification.content dataUsingEncoding:NSUTF8StringEncoding]; - NSError *err; - NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers error:&err]; - if(err) { -// NSLog(@"json解析失败：%@",err); - return; - } - if ([dic[@"first"] integerValue] == CustomMessageType_First_VisitorRecord){//访客记录数量更新提示 - AttachmentModel *attachment = [AttachmentModel modelWithJSON:notification.content]; - XPMineVisitorUnReadModel *model = [XPMineVisitorUnReadModel modelWithJSON:attachment.data]; - if ([model isKindOfClass:XPMineVisitorUnReadModel.class]) { - [[NSNotificationCenter defaultCenter] postNotificationName:kVisitorUnReadCountNotificationKey object:model]; - } - } else if ([dic[@"first"] intValue] == CustomMessageType_Task_Complete && [dic[@"second"] intValue] == Custom_Message_Sub_TaskComplete) {///任务完成提醒 - if ([dic isKindOfClass:[NSDictionary class]]) { - NSDictionary *dict = dic[@"data"]; - [self handleActivityTaskTip:dict[@"taskCompleteMsg"] url:dict[@"taskUrl"]]; - } - } - } - } -} - -#pragma mark - 主播卡片弹窗 -//新用户专享充值弹窗 -- (void)showNewUserRecharge { - self.needShowNewUserRecharge = YES; -} - -///展示主播卡片 -- (void)showAnchorCardKey:(NSNotification *)noti { - NSDictionary * dic = noti.object; - self.delayShowAnchorCard = [[dic objectForKey:@"delayShow"] boolValue]; - self.needShowAnchorCard = YES; -} - -///判断第二次启动时弹出主播卡片 -- (BOOL)hadLaunchApp { - return [[NSUserDefaults standardUserDefaults] valueForKey:kHadLaunchApp]; -} - - - -- (BOOL)canShowAnchorCard { - if ([[XPRoomMiniManager shareManager] getRoomInfo]) {//在房间时不弹 - return NO; - } - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSNumber *lastTime = [defaults objectForKey:kLastShowAnchorCardTime]; - if ([lastTime longValue] < 1) { - return NO; - } - NSDate *datenow = [NSDate date];//现在时间 - long time2 = (long)([datenow timeIntervalSince1970]*1000); - long aTime = (time2 - [lastTime longValue]) / 1000; - if (aTime > 15*60) { - return YES; - } else { - return NO; - } -} - -#pragma mark - 活动任务完成提示 -- (void)handleActivityTaskTip:(NSString *)msg url:(NSString *)url { - if (!self.taskTipView.superview && url.length) { - [self.view addSubview:self.taskTipView]; - self.taskTipView.desc = msg; - self.taskTipView.url = url; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(jumpToTask:)]; - [self.taskTipView addGestureRecognizer:tap]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - if (self.taskTipView.superview) { - [self.taskTipView removeFromSuperview]; - } - self.taskTipView = nil; - }); - } -} - -- (void)jumpToTask:(UITapGestureRecognizer *)ges { - XPWebViewController * webVC =[[XPWebViewController alloc] initWithRoomUID:nil]; - webVC.url = self.taskTipView.url; - [self.selectedViewController.navigationController pushViewController:webVC animated:YES]; - if (self.taskTipView.superview) { - [self.taskTipView removeFromSuperview]; - } - self.taskTipView = nil; -} - -#pragma mark - XPAnchorCardViewDelegate -- (void)xPAnchorCardViewEnterRoom:(NSString *)roomUid { - if (roomUid.length) { - [self.anchorCardView removeFromSuperview]; - self.anchorCardView = nil; - self.needShowAnchorCard = NO; - [XPRoomViewController openRoom:roomUid viewController:self]; - } else { - [UIView animateWithDuration:0.5 animations:^{ - self.anchorCardView.frame = CGRectMake(0, -90-kStatusBarHeight, KScreenWidth, 90); - } completion:^(BOOL finished) { - [self.anchorCardView removeFromSuperview]; - self.anchorCardView = nil; - self.needShowAnchorCard = NO; - }]; - } -} - -- (void)xPAnchorCardViewClickAvatar:(NSString *)uid { - if (uid.length) { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = uid.integerValue; - [self.selectedViewController.navigationController pushViewController:userInfoVC animated:YES]; - } - - [self.anchorCardView removeFromSuperview]; - self.anchorCardView = nil; - self.needShowAnchorCard = NO; -} - -- (void)handleAnchorCardSwipeFrom:(UISwipeGestureRecognizer *)recognizer{ - if(recognizer.direction == UISwipeGestureRecognizerDirectionUp) { - [UIView animateWithDuration:0.5 animations:^{ - self.anchorCardView.frame = CGRectMake(0, -90-kStatusBarHeight, KScreenWidth, 90); - } completion:^(BOOL finished) { - [self.anchorCardView removeFromSuperview]; - self.anchorCardView = nil; - self.needShowAnchorCard = NO; - }]; - } -} - - -#pragma mark - Getters And Setters -- (XPMiniRoomView *)roomMineView { - if (!_roomMineView) { - _roomMineView = [[XPMiniRoomView alloc] init]; - _roomMineView.controller = self; - _roomMineView.hidden = YES; - } - return _roomMineView; -} - -- (XPAnchorCardView *)anchorCardView { - if (!_anchorCardView) { - _anchorCardView = [[XPAnchorCardView alloc] init]; - _anchorCardView.delegate = self; - - } - return _anchorCardView; -} - -- (XPTaskCompleteTipView *)taskTipView { - if (!_taskTipView) { - _taskTipView = [[XPTaskCompleteTipView alloc] initWithFrame:CGRectMake(0, KScreenHeight - kSafeAreaBottomHeight-60-20, KScreenWidth, 20)]; - } - return _taskTipView; -} - -@end diff --git a/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.h b/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.h deleted file mode 100644 index 0866ec4..0000000 --- a/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// YMUpgradeView.h -// YUMI -// -// Created by YUMI on 2022/12/5. -// - -#import -#import "XPVersionUpdateModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface XPUpgradeView : UIView - -@property (nonatomic,strong) XPVersionUpdateModel *versionModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m b/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m deleted file mode 100644 index 20567d9..0000000 --- a/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m +++ /dev/null @@ -1,221 +0,0 @@ -// -// YMUpgradeView.m -// YUMI -// -// Created by YUMI on 2022/12/5. -// - -#import "XPUpgradeView.h" -#import -#import "UIImage+Utils.h" -#import "YUMIMacroUitls.h" -#import "DJDKMIMOMColor.h" -#import "UIView+Corner.h" -#import "TTPopup.h" - -@interface XPUpgradeView() -///容器 -@property (nonatomic,strong) UIView *contentView; -///顶部 -@property (nonatomic,strong) UIImageView *topImageView; -///背景 -@property (nonatomic,strong) UIView *backView; -@property (nonatomic,strong) SZTextView *textView; -///容器 -@property (nonatomic,strong) UIStackView *stackView; -@property (nonatomic,strong) UIButton *updateBtn; -@property (nonatomic,strong) UIButton *cancelBtn; -///版本号 -@property (nonatomic,strong) UILabel *versionLabel; -@end - -@implementation XPUpgradeView - -- (instancetype)initWithFrame:(CGRect)frame{ - self = [super initWithFrame:frame]; - if(self){ - [self initSubViews]; - [self initSubViewConstraints]; - } - return self; -} - -#pragma mark - Private Method -- (void)initSubViews { - [self addSubview:self.contentView]; - - [self.contentView addSubview:self.topImageView]; - [self.contentView addSubview:self.backView]; - [self.topImageView addSubview:self.versionLabel]; - [self.backView addSubview:self.textView]; - [self.backView addSubview:self.stackView]; - [self.stackView addArrangedSubview:self.cancelBtn]; - [self.stackView addArrangedSubview:self.updateBtn]; -} -- (void)initSubViewConstraints { - CGFloat kwidth = (KScreenWidth - 100); - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kwidth, 340)); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - - CGFloat kscale = 140.0 / 275.0; - [self.topImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(kwidth, kwidth * kscale)); - make.top.mas_equalTo(self.contentView); - make.centerX.mas_equalTo(self.contentView); - }]; - - [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self.contentView); - make.top.mas_equalTo(self.topImageView.mas_bottom); - }]; - - [self.versionLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.topImageView).offset(25); - make.top.mas_equalTo(self.topImageView).offset(90 * kScreenScale); - }]; - - [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(36); - make.centerX.mas_equalTo(self.contentView); - make.bottom.mas_equalTo(self.contentView).offset(-20); - }]; - - [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo((kwidth - 11 - 16 * 2) / 2.0); - }]; - [self.updateBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(self.cancelBtn); - }]; - - [self.textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.topImageView.mas_bottom).mas_offset(3); - make.leading.mas_equalTo(17); - make.trailing.mas_equalTo(-17); - make.bottom.equalTo(self.stackView.mas_top).offset(-5); - }]; - -} - --(void)setVersionModel:(XPVersionUpdateModel *)versionModel{ - _versionModel = versionModel; - if (_versionModel.updateVersionDesc) { - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:_versionModel.updateVersionDesc attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}]; - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - paragraphStyle.lineSpacing = 5; - [attribute addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, _versionModel.updateVersionDesc.length)]; - _textView.attributedText = attribute; - } - - _versionLabel.text = [NSString stringWithFormat:@"V%@", _versionModel.updateVersion]; - _cancelBtn.hidden = _versionModel.updateStatus == 3; -} - --(void)updateAction{ - NSURL *url = [[NSURL alloc]initWithString:self.versionModel.updateDownloadLink]; - if ([[UIApplication sharedApplication] canOpenURL:url]) { - [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) { - if(self.versionModel.updateStatus != 3){ - [TTPopup dismiss]; - } - }]; - } -} --(void)cancelAction{ - [TTPopup dismiss]; -} -#pragma mark - 懒加载 -- (UIView *)contentView { - if (!_contentView) { - _contentView = [[UIView alloc] init]; - _contentView.backgroundColor = [UIColor clearColor]; - _contentView.layer.cornerRadius = 12; - _contentView.layer.masksToBounds = YES; - } - return _contentView; -} - -- (UIView *)backView { - if (!_backView) { - _backView = [[UIView alloc] init]; - _backView.backgroundColor = [UIColor whiteColor]; - } - return _backView; -} - -- (UIStackView *)stackView { - if (!_stackView) { - _stackView = [[UIStackView alloc] init]; - _stackView.axis = UILayoutConstraintAxisHorizontal; - _stackView.distribution = UIStackViewDistributionFill; - _stackView.alignment = UIStackViewAlignmentFill; - _stackView.spacing = 10; - } - return _stackView; -} - -- (UIImageView *)topImageView{ - if (!_topImageView){ - _topImageView = [UIImageView new]; - _topImageView.backgroundColor = [UIColor clearColor]; - _topImageView.userInteractionEnabled = YES; - _topImageView.image = [UIImage getLanguageImage:@"version_update_top_bg"]; - } - return _topImageView; -} - -- (SZTextView *)textView { - if (!_textView) { - _textView = [[SZTextView alloc] init]; - _textView.textColor = [DJDKMIMOMColor mainTextColor]; - _textView.font = [UIFont systemFontOfSize:12]; - _textView.backgroundColor = [UIColor clearColor]; - _textView.editable = NO; - } - return _textView; -} - -- (UILabel *)versionLabel { - if (!_versionLabel) { - _versionLabel = [[UILabel alloc] init]; - _versionLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; - _versionLabel.textColor = [UIColor whiteColor]; - } - return _versionLabel; -} - --(UIButton *)updateBtn{ - if (!_updateBtn){ - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; - _updateBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - [_updateBtn setTitle:YMLocalizedString(@"XPUpgradeView0") forState:UIControlStateNormal]; - _updateBtn.titleLabel.font = [UIFont systemFontOfSize:14]; - _updateBtn.titleLabel.textColor = [DJDKMIMOMColor confirmButtonTextColor]; - [_updateBtn setBackgroundImage:image forState:UIControlStateNormal]; - _updateBtn.layer.cornerRadius = 36 / 2; - _updateBtn.layer.masksToBounds = YES; - [_updateBtn addTarget:self action:@selector(updateAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _updateBtn; -} --(UIButton *)cancelBtn{ - if (!_cancelBtn){ - _cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom]; - UIImage *image = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor],[DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; - [_cancelBtn setTitle:YMLocalizedString(@"XPUpgradeView1") forState:UIControlStateNormal]; - _cancelBtn.titleLabel.font = [UIFont systemFontOfSize:14]; - [_cancelBtn setTitleColor:[DJDKMIMOMColor cancelButtonTextColor] forState:UIControlStateNormal]; - [_cancelBtn setBackgroundImage:image forState:UIControlStateNormal]; - _cancelBtn.layer.cornerRadius = 36 / 2; - _cancelBtn.layer.masksToBounds = YES; - [_cancelBtn addTarget:self action:@selector(cancelAction) forControlEvents:UIControlEventTouchUpInside]; - } - return _cancelBtn; - -} - -@end diff --git a/YuMi/Modules/YMWeb/XPWebViewController.m b/YuMi/Modules/YMWeb/XPWebViewController.m index c8c69fb..a708a43 100644 --- a/YuMi/Modules/YMWeb/XPWebViewController.m +++ b/YuMi/Modules/YMWeb/XPWebViewController.m @@ -934,8 +934,8 @@ NSString * const kJSShowShareCallBack = @"showShareAction"; [_webview evaluateJavaScript:@"navigator.userAgent" completionHandler:^(id result, NSError *error) { NSString *userAgent = result; - if (![userAgent containsString:@"epartiAppIos erbanAppIos"]){ - NSString *newUserAgent = [userAgent stringByAppendingString:@" epartiAppIos erbanAppIos"]; + if (![userAgent containsString:@"molistarAppIos erbanAppIos"]){ + NSString *newUserAgent = [userAgent stringByAppendingString:@" molistarAppIos erbanAppIos"]; NSDictionary *dictionary = [NSDictionary dictionaryWithObjectsAndKeys:newUserAgent, @"UserAgent", nil]; [[NSUserDefaults standardUserDefaults] registerDefaults:dictionary]; [[NSUserDefaults standardUserDefaults] synchronize]; diff --git a/YuMi/Network/HttpRequestHelper.m b/YuMi/Network/HttpRequestHelper.m index 5e1ea6e..f1ec657 100644 --- a/YuMi/Network/HttpRequestHelper.m +++ b/YuMi/Network/HttpRequestHelper.m @@ -13,8 +13,6 @@ #import "YUMIMacroUitls.h" #import "MSParamsDecode.h" #import "NSData+GZIP.h" -#import -#import "BuglyManager.h" @implementation HttpRequestHelper @@ -319,11 +317,6 @@ constructingBodyWithBlock:^(id _Nonnull formData) { NSMutableDictionary *userInfo = [params mutableCopy]; [userInfo setObject:message forKey:@"error message"]; [userInfo setObject:@(method) forKey:@"http method"]; - - [[BuglyManager sharedManager] reportNetworkError:uid - api:path - code:resCode - userInfo:userInfo]; } }]; } diff --git a/YuMi/PrivacyInfo.xcprivacy b/YuMi/PrivacyInfo.xcprivacy index a39e9e6..7dbf058 100644 --- a/YuMi/PrivacyInfo.xcprivacy +++ b/YuMi/PrivacyInfo.xcprivacy @@ -2,46 +2,38 @@ - NSPrivacyTracking - - NSPrivacyCollectedDataTypes - - NSPrivacyTrackingDomains - - NSPrivacyAccessedAPITypes - - - NSPrivacyAccessedAPIType - NSPrivacyAccessedAPICategorySystemBootTime - NSPrivacyAccessedAPITypeReasons - - 35F9.1 - - - - NSPrivacyAccessedAPIType - NSPrivacyAccessedAPICategoryDiskSpace - NSPrivacyAccessedAPITypeReasons - - E174.1 - - - - NSPrivacyAccessedAPIType - NSPrivacyAccessedAPICategoryFileTimestamp - NSPrivacyAccessedAPITypeReasons - - C617.1 - - - - NSPrivacyAccessedAPIType - NSPrivacyAccessedAPICategoryUserDefaults - NSPrivacyAccessedAPITypeReasons - - CA92.1 - - - + NSPrivacyTracking + + NSPrivacyCollectedDataTypes + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryDiskSpace + NSPrivacyAccessedAPITypeReasons + + E174.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryFileTimestamp + NSPrivacyAccessedAPITypeReasons + + C617.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + CA92.1 + + + diff --git a/YuMi/Structure/MVP/Model/AccountInfoStorage.m b/YuMi/Structure/MVP/Model/AccountInfoStorage.m index bda503b..ce2a983 100644 --- a/YuMi/Structure/MVP/Model/AccountInfoStorage.m +++ b/YuMi/Structure/MVP/Model/AccountInfoStorage.m @@ -12,7 +12,7 @@ #import "AccountInfoStorage.h" #import "AccountModel.h" -#import "HomeTagModel.h" + #define kTagListDataKey @"homeaaNewTagModel" #define kTagListDataName @"HomeTagNewModel.data" diff --git a/YuMi/Structure/MVP/Model/UserInfoModel.h b/YuMi/Structure/MVP/Model/UserInfoModel.h index 746ca2e..b4ee2ea 100644 --- a/YuMi/Structure/MVP/Model/UserInfoModel.h +++ b/YuMi/Structure/MVP/Model/UserInfoModel.h @@ -17,7 +17,6 @@ #import "MedalModel.h" #import "RelationUserVO.h" #import "GuildInfo.h" -#import "NameplateModel.h" #import "BaseModelVo.h" @@ -189,7 +188,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, strong) GuildInfo *guildInfo; -@property (nonatomic, copy) NSArray *userNameplateList; +@property (nonatomic, copy) NSArray *userNameplateList; @property(nonatomic, strong) UsingPersonalBackground *usingPersonalBackground; diff --git a/YuMi/Structure/MVP/Model/UserInfoModel.m b/YuMi/Structure/MVP/Model/UserInfoModel.m index d1caf36..0d6b21e 100644 --- a/YuMi/Structure/MVP/Model/UserInfoModel.m +++ b/YuMi/Structure/MVP/Model/UserInfoModel.m @@ -24,7 +24,6 @@ @"userLuckyBagGiftWall":UserGiftWallInfoModel.class, @"dynamicInfo":MomentsInfoModel.class, @"audioCard":XPSoundCardModel.class, - @"userNameplateList":NameplateModel.class, @"usingPersonalBackground":UsingPersonalBackground.class, @"infoCardVo" : InfoCardVO.class, @"medalsPic": BaseModelVo.class diff --git a/YuMi/Structure/MVP/Presenter/BaseMvpPresenter.m b/YuMi/Structure/MVP/Presenter/BaseMvpPresenter.m index c24939e..683dbf9 100644 --- a/YuMi/Structure/MVP/Presenter/BaseMvpPresenter.m +++ b/YuMi/Structure/MVP/Presenter/BaseMvpPresenter.m @@ -7,13 +7,8 @@ #import "BaseMvpPresenter.h" #import "AccountInfoStorage.h" -#import #import "ClientConfig.h" -#import "LoginViewController.h" #import "BaseNavigationController.h" -#import "FirstRechargeManager.h" -#import "PublicRoomManager.h" -#import "RoomBoomManager.h" @interface BaseMvpPresenter() @@ -32,25 +27,7 @@ } - (void)logout { - // 1. 停止首充监控 - [[FirstRechargeManager sharedManager] stopMonitoring]; - - // 2. 重置公共房间管理器 - [[PublicRoomManager sharedManager] reset]; - - // 3. 清理房间火箭管理器状态 - [[RoomBoomManager sharedManager] leaveRoom]; - - // 4. 数据logout - [[AccountInfoStorage instance] saveAccountInfo:nil]; - [[AccountInfoStorage instance] saveTicket:nil]; - if ([NIMSDK sharedSDK].loginManager.isLogined) { - [[NIMSDK sharedSDK].loginManager logout:nil]; - } - // 5. 跳登录页面 - [self tokenInvalid]; - // ///关闭心跳 - // [[ClientConfig shareConfig] resetHeartBratTimer]; + } - (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess)success { @@ -155,10 +132,7 @@ } - (void)tokenInvalid { - LoginViewController *loginVC = [[LoginViewController alloc] init]; - BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:loginVC]; - nav.modalPresentationStyle = UIModalPresentationFullScreen; - kWindow.rootViewController = nav; + } @end diff --git a/YuMi/Structure/MVP/View/MvpViewController.m b/YuMi/Structure/MVP/View/MvpViewController.m index b9ff4ed..e318667 100644 --- a/YuMi/Structure/MVP/View/MvpViewController.m +++ b/YuMi/Structure/MVP/View/MvpViewController.m @@ -9,8 +9,6 @@ #import "BaseMvpProtocol.h" #import "BaseMvpPresenter.h" #import "BaseNavigationController.h" -#import "LoginFullInfoViewController.h" -#import "XPWebViewController.h" //Tool #import "TTPopup.h" #import "PLTimeUtil.h" @@ -149,10 +147,7 @@ } - (void)completeUserInfo { - LoginFullInfoViewController * bindPhoneVC = [[LoginFullInfoViewController alloc] init]; - BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:bindPhoneVC]; - nav.modalPresentationStyle = UIModalPresentationFullScreen; - [self.navigationController presentViewController:nav animated:YES completion:nil]; + } ///实名认证弹窗 diff --git a/YuMi/Structure/PrefixHeader.pch b/YuMi/Structure/PrefixHeader.pch index fe3dd30..3247c30 100644 --- a/YuMi/Structure/PrefixHeader.pch +++ b/YuMi/Structure/PrefixHeader.pch @@ -26,7 +26,6 @@ isEnterprise = [bundleID isEqualToString:@"com.hflighting.yumi"];\ #define NSLog(...) #endif #import -#import "Music+CoreDataProperties.h" #import "YUMIMacroUitls.h" #import #import "NSArray+Safe.h" @@ -48,7 +47,6 @@ isEnterprise = [bundleID isEqualToString:@"com.hflighting.yumi"];\ #import "AccountInfoStorage.h" #import "YYUtility.h" #import -#import "StatisticsServiceHelper.h" #import "YUMIConstant.h" #import "YUMINNNN.h" #import "NSObject+MJExtension.h" diff --git a/YuMi/Tools/Bundle/NSBundle+Localizable.m b/YuMi/Tools/Bundle/NSBundle+Localizable.m index ad5c0e2..a2f4662 100644 --- a/YuMi/Tools/Bundle/NSBundle+Localizable.m +++ b/YuMi/Tools/Bundle/NSBundle+Localizable.m @@ -40,23 +40,19 @@ static NSString * const kResourceType = @"lproj"; } +(NSString *)getLanguageText{ + // EP 白包版本强制使用英文 NSString *saveLanguage = [[NSUserDefaults standardUserDefaults] valueForKey:kSaveCurLanguageKey]; - if (saveLanguage){ - return saveLanguage; + if (saveLanguage && [saveLanguage isEqualToString:@"en"]){ + return saveLanguage; } - - NSString *preferredLanguage = [NSLocale preferredLanguages].firstObject; - return [self mapLanguageForLocalization:preferredLanguage]; + + // 强制返回英文，忽略系统语言设置 + return @"en"; } +(NSString *)uploadLanguageText{ - NSString *saveLanguage = [[NSUserDefaults standardUserDefaults]valueForKey:kSaveCurLanguageKey]; - if (saveLanguage){ - return [self mapLanguageForLocalization:saveLanguage]; - } - - NSString *preferredLanguage = [NSLocale preferredLanguages].firstObject; - return [self mapLanguageForLocalization:preferredLanguage]; + // EP 白包版本强制使用英文 + return @"en"; } +(void)setLanguageText:(NSString *)language{ diff --git a/YuMi/Tools/Bundle/YMLanguageConfig.m b/YuMi/Tools/Bundle/YMLanguageConfig.m index 974ef90..e19ccef 100644 --- a/YuMi/Tools/Bundle/YMLanguageConfig.m +++ b/YuMi/Tools/Bundle/YMLanguageConfig.m @@ -13,15 +13,9 @@ static NSArray *languages = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ + // EP 白包版本只支持英文 languages = @[ - @{@"code": @"en", @"localizationCode": @"en", @"displayName": @"English", @"isRTL": @NO}, - @{@"code": @"zh-Hant", @"localizationCode": @"zh-Hant", @"displayName": @"繁體中文", @"isRTL": @NO}, - @{@"code": @"ar", @"localizationCode": @"ar", @"displayName": @"العربية", @"isRTL": @YES}, - @{@"code": @"tr", @"localizationCode": @"tr", @"displayName": @"Türkçe", @"isRTL": @NO}, - @{@"code": @"pt-BR", @"localizationCode": @"pt-BR", @"displayName": @"Português (Brasil)", @"isRTL": @NO}, - @{@"code": @"es", @"localizationCode": @"es", @"displayName": @"Español", @"isRTL": @NO}, - @{@"code": @"ru", @"localizationCode": @"ru", @"displayName": @"Русский", @"isRTL": @NO}, - @{@"code": @"uz-UZ", @"localizationCode": @"uz-UZ", @"displayName": @"O'zbek", @"isRTL": @NO} + @{@"code": @"en", @"localizationCode": @"en", @"displayName": @"English", @"isRTL": @NO} ]; }); return languages; diff --git a/YuMi/Tools/CardManager/XPSkillCardPlayerManager.h b/YuMi/Tools/CardManager/XPSkillCardPlayerManager.h deleted file mode 100644 index 97aed32..0000000 --- a/YuMi/Tools/CardManager/XPSkillCardPlayerManager.h +++ /dev/null @@ -1,82 +0,0 @@ -// -// XPSkillCardPlayerManager.h -// YuMi -// -// Created by GreenLand on 2022/3/9. -// - -#import -#import -#import "UserInfoModel.h" -@class BravoGiftTabInfomationModel; - -typedef enum : NSUInteger { - MICState_None = 0, - MICState_Open = 1, - MICState_Close = 2, - MICState_Music = 3, -} MICState; - -@interface XPSkillCardPlayerManager : NSObject -////获取已解锁照片id列表 -@property(nonatomic,strong) NSMutableArray *photoIdList; -///播放器 -@property (nonatomic, strong) AVAudioPlayer *player; -///是否正在播放 -@property (nonatomic,assign) BOOL isPlay; -///播放音量大小 -@property (nonatomic, assign) CGFloat volume; -@property (nonatomic,assign) BOOL isInRoomFirstRecharge; -///是否在房间 -@property (nonatomic,assign) BOOL isInRoom; -///是否在房间控制器里，用于播放动画的判断 -@property (nonatomic,assign) BOOL isInRoomVC; -///是否在首充不弹出界面 -///所在房间的id -@property (nonatomic,copy) NSString *roomUid; -///我是否在上麦，在麦上时不能录音 -@property (nonatomic,assign) BOOL isMineInMic; - -// 用户在 mic 的状态 -@property (nonatomic, assign) MICState micState; - -// 作为全局获取当前用户数据的 model，需要在相关 user/get 调用处更新，目前只在 mine tab 更新 -@property(nonatomic, strong) UserInfoModel *userInfoModel; - -@property(nonatomic, assign) BOOL is9Mic; // 当前房间是否 9 mic - -+ (instancetype)shareInstance; - -- (void)requestBravoGiftTabInfomation; -- (NSArray *)loadBravoGiftTabInfomation; - -/** - 播放一次音频 - - @param filePath 本地路径 - @param completionBlock 播放完成回调 - */ -- (void)playerVoiceWithPath:(NSString *)filePath completionBlock:(void (^)(void))completionBlock; - -/** - 新的播放一次音频 - - @param filePath 本地路径 - @param completionBlock 播放完成回调 - */ -- (void)playerNewVoiceWithPath:(NSString *)filePath completionBlock:(void (^)(void))completionBlock; -/** - 停止音乐 - */ -- (void)stopMusic; - -/** - 停止音乐 是否需要执行完成回调（更新UI） - */ -- (void)stopMusicIsNeedCompletion:(BOOL)isNeedCompletion; -///关闭麦克风、听筒 -- (void)closeMicroAndVoiceWithBroadcast:(BOOL)isBroadcast; -///恢复之前的 麦克风、听筒听筒状态 -- (void)recoverMicroAndVoiceWithBroadcast:(BOOL)isBroadcast; -@end - diff --git a/YuMi/Tools/CardManager/XPSkillCardPlayerManager.m b/YuMi/Tools/CardManager/XPSkillCardPlayerManager.m deleted file mode 100644 index 424d331..0000000 --- a/YuMi/Tools/CardManager/XPSkillCardPlayerManager.m +++ /dev/null @@ -1,204 +0,0 @@ -// -// XPSkillCardPlayerManager.m -// YuMi -// -// Created by GreenLand on 2022/3/9. -// - -#import "XPSkillCardPlayerManager.h" -#import "XPRoomMiniManager.h" -#import "RtcManager.h" -#import "XPGiftPresenter.h" - -@interface XPSkillCardPlayerManager() - -///是否关闭了声音、麦克风 -@property (nonatomic, assign) BOOL isCloseMuteAndMicro; -///记录当前房间的听筒是否开启 -@property (nonatomic, assign) BOOL isMute; -///记录当前房间是否关闭麦克风 -@property (nonatomic, assign) BOOL isCloseMicro; -/// -@property (nonatomic,assign) BOOL isBroadcast; - -///播放完成回调 -@property (nonatomic, copy) void (^playerCompletionBlock)(void); - -@property (nonatomic, - copy) NSArray *bravoGiftInfomations; - -@end - -@implementation XPSkillCardPlayerManager - -+ (instancetype)shareInstance { - static dispatch_once_t once; - static XPSkillCardPlayerManager *sharedInstance; - dispatch_once(&once, ^{ - if (sharedInstance == NULL) { - sharedInstance = [[self alloc] init]; - [[AVAudioSession sharedInstance]setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionAllowBluetooth error:nil]; - [[AVAudioSession sharedInstance]setActive:YES error:nil]; - } - }); - return sharedInstance; -} - -- (void)requestBravoGiftTabInfomation { - @kWeakify(self); - XPGiftPresenter *presenter = [[XPGiftPresenter alloc] init]; - [presenter bravoGetBannerList:^(NSArray * _Nonnull array) { - @kStrongify(self); - self.bravoGiftInfomations = array; - } failure:^(NSError * _Nonnull error) { - - }]; -} - -- (NSArray *)loadBravoGiftTabInfomation { - return self.bravoGiftInfomations; -} - -- (void)setMicState:(MICState)micState { - _micState = micState; -} - -- (void)playerVoiceWithPath:(NSString *)filePath completionBlock:(void (^)(void))completionBlock{ - [self playerMusicWithPath:filePath volume:1 loop:NO completionBlock:completionBlock]; -} -- (void)playerNewVoiceWithPath:(NSString *)filePath completionBlock:(void (^)(void))completionBlock{ - [self playerNewMusicWithPath:filePath volume:1 loop:NO completionBlock:completionBlock]; -} -/** - 播放音频 - - @param filePath 本地路径 - @param volume 声音大小 - @param loop 是否循环播放 - @param completionBlock 播放完成回调 - */ -- (void)playerMusicWithPath:(NSString *)filePath volume:(CGFloat)volume loop:(BOOL)loop completionBlock:(void (^)(void))completionBlock { - [[AVAudioSession sharedInstance]setCategory:AVAudioSessionCategoryPlayback withOptions:AVAudioSessionCategoryOptionAllowBluetooth error:nil]; - [self closeMicroAndVoiceWithBroadcast:YES]; - if (self.player) { - [self.player stop]; - self.player = nil; - } - NSLog(@"播放动画的路径：%@", filePath); - if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]) return; - NSURL *url = [NSURL fileURLWithPath:filePath]; - NSError *AVerror = NULL; - self.player = [[AVAudioPlayer alloc] initWithContentsOfURL:url error:&AVerror]; - self.player.numberOfLoops = loop ? -1 : 0; - self.player.volume = volume; - if (AVerror) {//无效链接 - if (completionBlock) { - completionBlock(); - } - return; - } - self.isPlay = YES; - self.player.delegate = self; - [self.player prepareToPlay]; - [self.player play]; - self.playerCompletionBlock = completionBlock; -} - -/** - 新的播放音频 - - @param filePath 本地路径 - @param volume 声音大小 - @param loop 是否循环播放 - @param completionBlock 播放完成回调 - */ -- (void)playerNewMusicWithPath:(NSString *)filePath volume:(CGFloat)volume loop:(BOOL)loop completionBlock:(void (^)(void))completionBlock { - [[AVAudioSession sharedInstance]setCategory:AVAudioSessionCategoryPlayback withOptions:AVAudioSessionCategoryOptionAllowBluetooth error:nil]; - [self closeMicroAndVoiceWithBroadcast:YES]; - - - dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)); - dispatch_after(popTime, dispatch_get_main_queue(), ^(void){ - if (self.player) { - [self.player stop]; - self.player = nil; - } - NSLog(@"播放动画的路径：%@", filePath); - if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]) return; - NSURL *url = [NSURL fileURLWithPath:filePath]; - NSError *AVerror = NULL; - self.player = [[AVAudioPlayer alloc] initWithContentsOfURL:url error:&AVerror]; - self.player.numberOfLoops = loop ? -1 : 0; - self.player.volume = volume; - if (AVerror) {//无效链接 - if (completionBlock) { - completionBlock(); - } - return; - } - self.isPlay = YES; - self.player.delegate = self; - [self.player prepareToPlay]; - [self.player play]; - self.playerCompletionBlock = completionBlock; - }); -} - -- (void)stopMusic { - [self stopMusicIsNeedCompletion:NO]; -} - -- (void)stopMusicIsNeedCompletion:(BOOL)isNeedCompletion { - if (self.player) { - [self.player stop]; - self.player = nil; - if (isNeedCompletion && self.playerCompletionBlock) { - self.playerCompletionBlock(); - } - self.playerCompletionBlock = nil; - } - self.isPlay = NO; - self.volume = 1; - [self recoverMicroAndVoiceWithBroadcast:YES]; -} - -///关闭麦克风、听筒 -- (void)closeMicroAndVoiceWithBroadcast:(BOOL)isBroadcast{ - if (([XPSkillCardPlayerManager shareInstance].isInRoom == YES || [XPRoomMiniManager shareManager].getRoomInfo) && !self.isCloseMuteAndMicro) { - self.isMute = [RtcManager instance].isLocalMuted; - self.isCloseMicro = [RtcManager instance].isRemoteMuted; - - [[RtcManager instance] setLocalMuted:YES]; - [[RtcManager instance] setRemoteMuted:YES]; - if(isBroadcast == YES){ - self.isBroadcast = [RtcManager instance].broadcast; - [[RtcManager instance]broadcast:NO]; - } - - self.isCloseMuteAndMicro = YES; - } -} - -///恢复之前的 麦克风、听筒听筒状态 -- (void)recoverMicroAndVoiceWithBroadcast:(BOOL)isBroadcast { - if (([XPSkillCardPlayerManager shareInstance].isInRoom == YES || [XPRoomMiniManager shareManager].getRoomInfo) && self.isCloseMuteAndMicro) { - [[RtcManager instance] setLocalMuted:self.isMute]; - [[RtcManager instance] setRemoteMuted:self.isCloseMicro]; - if(isBroadcast == YES){ - [[RtcManager instance] broadcast:self.isBroadcast]; - } - self.isCloseMuteAndMicro = NO; - } -} - -#pragma mark - AVAudioPlayerDelegate -///播放完成回调 -- (void)audioPlayerDidFinishPlaying:(AVAudioPlayer *)player successfully:(BOOL)flag { - if (self.playerCompletionBlock) { - self.playerCompletionBlock(); - self.playerCompletionBlock = nil; - self.isPlay = NO; - } -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Categories/DDData.h b/YuMi/Tools/CocoaHttpServer/Core/Categories/DDData.h deleted file mode 100755 index e47b6c1..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Categories/DDData.h +++ /dev/null @@ -1,14 +0,0 @@ -#import - -@interface NSData (DDData) - -- (NSData *)md5Digest; - -- (NSData *)sha1Digest; - -- (NSString *)hexStringValue; - -- (NSString *)base64Encoded; -- (NSData *)base64Decoded; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Categories/DDData.m b/YuMi/Tools/CocoaHttpServer/Core/Categories/DDData.m deleted file mode 100755 index 82c60df..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Categories/DDData.m +++ /dev/null @@ -1,158 +0,0 @@ -#import "DDData.h" -#import - - -@implementation NSData (DDData) - -static char encodingTable[64] = { -'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P', -'Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e','f', -'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v', -'w','x','y','z','0','1','2','3','4','5','6','7','8','9','+','/' }; - -- (NSData *)md5Digest -{ - unsigned char result[CC_MD5_DIGEST_LENGTH]; - - CC_MD5([self bytes], (CC_LONG)[self length], result); - return [NSData dataWithBytes:result length:CC_MD5_DIGEST_LENGTH]; -} - -- (NSData *)sha1Digest -{ - unsigned char result[CC_SHA1_DIGEST_LENGTH]; - - CC_SHA1([self bytes], (CC_LONG)[self length], result); - return [NSData dataWithBytes:result length:CC_SHA1_DIGEST_LENGTH]; -} - -- (NSString *)hexStringValue -{ - NSMutableString *stringBuffer = [NSMutableString stringWithCapacity:([self length] * 2)]; - - const unsigned char *dataBuffer = [self bytes]; - int i; - - for (i = 0; i < [self length]; ++i) - { - [stringBuffer appendFormat:@"%02x", (unsigned int)dataBuffer[i]]; - } - - return [stringBuffer copy]; -} - -- (NSString *)base64Encoded -{ - const unsigned char *bytes = [self bytes]; - NSMutableString *result = [NSMutableString stringWithCapacity:[self length]]; - unsigned long ixtext = 0; - unsigned long lentext = [self length]; - long ctremaining = 0; - unsigned char inbuf[3], outbuf[4]; - unsigned short i = 0; - unsigned short charsonline = 0, ctcopy = 0; - unsigned long ix = 0; - - while( YES ) - { - ctremaining = lentext - ixtext; - if( ctremaining <= 0 ) break; - - for( i = 0; i < 3; i++ ) { - ix = ixtext + i; - if( ix < lentext ) inbuf[i] = bytes[ix]; - else inbuf [i] = 0; - } - - outbuf [0] = (inbuf [0] & 0xFC) >> 2; - outbuf [1] = ((inbuf [0] & 0x03) << 4) | ((inbuf [1] & 0xF0) >> 4); - outbuf [2] = ((inbuf [1] & 0x0F) << 2) | ((inbuf [2] & 0xC0) >> 6); - outbuf [3] = inbuf [2] & 0x3F; - ctcopy = 4; - - switch( ctremaining ) - { - case 1: - ctcopy = 2; - break; - case 2: - ctcopy = 3; - break; - } - - for( i = 0; i < ctcopy; i++ ) - [result appendFormat:@"%c", encodingTable[outbuf[i]]]; - - for( i = ctcopy; i < 4; i++ ) - [result appendString:@"="]; - - ixtext += 3; - charsonline += 4; - } - - return [NSString stringWithString:result]; -} - -- (NSData *)base64Decoded -{ - const unsigned char *bytes = [self bytes]; - NSMutableData *result = [NSMutableData dataWithCapacity:[self length]]; - - unsigned long ixtext = 0; - unsigned long lentext = [self length]; - unsigned char ch = 0; - unsigned char inbuf[4] = {0, 0, 0, 0}; - unsigned char outbuf[3] = {0, 0, 0}; - short i = 0, ixinbuf = 0; - BOOL flignore = NO; - BOOL flendtext = NO; - - while( YES ) - { - if( ixtext >= lentext ) break; - ch = bytes[ixtext++]; - flignore = NO; - - if( ( ch >= 'A' ) && ( ch <= 'Z' ) ) ch = ch - 'A'; - else if( ( ch >= 'a' ) && ( ch <= 'z' ) ) ch = ch - 'a' + 26; - else if( ( ch >= '0' ) && ( ch <= '9' ) ) ch = ch - '0' + 52; - else if( ch == '+' ) ch = 62; - else if( ch == '=' ) flendtext = YES; - else if( ch == '/' ) ch = 63; - else flignore = YES; - - if( ! flignore ) - { - short ctcharsinbuf = 3; - BOOL flbreak = NO; - - if( flendtext ) - { - if( ! ixinbuf ) break; - if( ( ixinbuf == 1 ) || ( ixinbuf == 2 ) ) ctcharsinbuf = 1; - else ctcharsinbuf = 2; - ixinbuf = 3; - flbreak = YES; - } - - inbuf [ixinbuf++] = ch; - - if( ixinbuf == 4 ) - { - ixinbuf = 0; - outbuf [0] = ( inbuf[0] << 2 ) | ( ( inbuf[1] & 0x30) >> 4 ); - outbuf [1] = ( ( inbuf[1] & 0x0F ) << 4 ) | ( ( inbuf[2] & 0x3C ) >> 2 ); - outbuf [2] = ( ( inbuf[2] & 0x03 ) << 6 ) | ( inbuf[3] & 0x3F ); - - for( i = 0; i < ctcharsinbuf; i++ ) - [result appendBytes:&outbuf[i] length:1]; - } - - if( flbreak ) break; - } - } - - return [NSData dataWithData:result]; -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Categories/DDNumber.h b/YuMi/Tools/CocoaHttpServer/Core/Categories/DDNumber.h deleted file mode 100755 index cded5b9..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Categories/DDNumber.h +++ /dev/null @@ -1,12 +0,0 @@ -#import - - -@interface NSNumber (DDNumber) - -+ (BOOL)parseString:(NSString *)str intoSInt64:(SInt64 *)pNum; -+ (BOOL)parseString:(NSString *)str intoUInt64:(UInt64 *)pNum; - -+ (BOOL)parseString:(NSString *)str intoNSInteger:(NSInteger *)pNum; -+ (BOOL)parseString:(NSString *)str intoNSUInteger:(NSUInteger *)pNum; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Categories/DDNumber.m b/YuMi/Tools/CocoaHttpServer/Core/Categories/DDNumber.m deleted file mode 100755 index d384d39..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Categories/DDNumber.m +++ /dev/null @@ -1,88 +0,0 @@ -#import "DDNumber.h" - - -@implementation NSNumber (DDNumber) - -+ (BOOL)parseString:(NSString *)str intoSInt64:(SInt64 *)pNum -{ - if(str == nil) - { - *pNum = 0; - return NO; - } - - errno = 0; - - // On both 32-bit and 64-bit machines, long long = 64 bit - - *pNum = strtoll([str UTF8String], NULL, 10); - - if(errno != 0) - return NO; - else - return YES; -} - -+ (BOOL)parseString:(NSString *)str intoUInt64:(UInt64 *)pNum -{ - if(str == nil) - { - *pNum = 0; - return NO; - } - - errno = 0; - - // On both 32-bit and 64-bit machines, unsigned long long = 64 bit - - *pNum = strtoull([str UTF8String], NULL, 10); - - if(errno != 0) - return NO; - else - return YES; -} - -+ (BOOL)parseString:(NSString *)str intoNSInteger:(NSInteger *)pNum -{ - if(str == nil) - { - *pNum = 0; - return NO; - } - - errno = 0; - - // On LP64, NSInteger = long = 64 bit - // Otherwise, NSInteger = int = long = 32 bit - - *pNum = strtol([str UTF8String], NULL, 10); - - if(errno != 0) - return NO; - else - return YES; -} - -+ (BOOL)parseString:(NSString *)str intoNSUInteger:(NSUInteger *)pNum -{ - if(str == nil) - { - *pNum = 0; - return NO; - } - - errno = 0; - - // On LP64, NSUInteger = unsigned long = 64 bit - // Otherwise, NSUInteger = unsigned int = unsigned long = 32 bit - - *pNum = strtoul([str UTF8String], NULL, 10); - - if(errno != 0) - return NO; - else - return YES; -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Categories/DDRange.h b/YuMi/Tools/CocoaHttpServer/Core/Categories/DDRange.h deleted file mode 100755 index 2fb4862..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Categories/DDRange.h +++ /dev/null @@ -1,56 +0,0 @@ -/** - * DDRange is the functional equivalent of a 64 bit NSRange. - * The HTTP Server is designed to support very large files. - * On 32 bit architectures (ppc, i386) NSRange uses unsigned 32 bit integers. - * This only supports a range of up to 4 gigabytes. - * By defining our own variant, we can support a range up to 16 exabytes. - * - * All effort is given such that DDRange functions EXACTLY the same as NSRange. -**/ - -#import -#import - -@class NSString; - -typedef struct _DDRange { - UInt64 location; - UInt64 length; -} DDRange; - -typedef DDRange *DDRangePointer; - -NS_INLINE DDRange DDMakeRange(UInt64 loc, UInt64 len) { - DDRange r; - r.location = loc; - r.length = len; - return r; -} - -NS_INLINE UInt64 DDMaxRange(DDRange range) { - return (range.location + range.length); -} - -NS_INLINE BOOL DDLocationInRange(UInt64 loc, DDRange range) { - return (loc - range.location < range.length); -} - -NS_INLINE BOOL DDEqualRanges(DDRange range1, DDRange range2) { - return ((range1.location == range2.location) && (range1.length == range2.length)); -} - -FOUNDATION_EXPORT DDRange DDUnionRange(DDRange range1, DDRange range2); -FOUNDATION_EXPORT DDRange DDIntersectionRange(DDRange range1, DDRange range2); -FOUNDATION_EXPORT NSString *DDStringFromRange(DDRange range); -FOUNDATION_EXPORT DDRange DDRangeFromString(NSString *aString); - -NSInteger DDRangeCompare(DDRangePointer pDDRange1, DDRangePointer pDDRange2); - -@interface NSValue (NSValueDDRangeExtensions) - -+ (NSValue *)valueWithDDRange:(DDRange)range; -- (DDRange)ddrangeValue; - -- (NSInteger)ddrangeCompare:(NSValue *)ddrangeValue; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Categories/DDRange.m b/YuMi/Tools/CocoaHttpServer/Core/Categories/DDRange.m deleted file mode 100755 index 379e7cf..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Categories/DDRange.m +++ /dev/null @@ -1,104 +0,0 @@ -#import "DDRange.h" -#import "DDNumber.h" - -DDRange DDUnionRange(DDRange range1, DDRange range2) -{ - DDRange result; - - result.location = MIN(range1.location, range2.location); - result.length = MAX(DDMaxRange(range1), DDMaxRange(range2)) - result.location; - - return result; -} - -DDRange DDIntersectionRange(DDRange range1, DDRange range2) -{ - DDRange result; - - if((DDMaxRange(range1) < range2.location) || (DDMaxRange(range2) < range1.location)) - { - return DDMakeRange(0, 0); - } - - result.location = MAX(range1.location, range2.location); - result.length = MIN(DDMaxRange(range1), DDMaxRange(range2)) - result.location; - - return result; -} - -NSString *DDStringFromRange(DDRange range) -{ - return [NSString stringWithFormat:@"{%qu, %qu}", range.location, range.length]; -} - -DDRange DDRangeFromString(NSString *aString) -{ - DDRange result = DDMakeRange(0, 0); - - // NSRange will ignore '-' characters, but not '+' characters - NSCharacterSet *cset = [NSCharacterSet characterSetWithCharactersInString:@"+0123456789"]; - - NSScanner *scanner = [NSScanner scannerWithString:aString]; - [scanner setCharactersToBeSkipped:[cset invertedSet]]; - - NSString *str1 = nil; - NSString *str2 = nil; - - BOOL found1 = [scanner scanCharactersFromSet:cset intoString:&str1]; - BOOL found2 = [scanner scanCharactersFromSet:cset intoString:&str2]; - - if(found1) [NSNumber parseString:str1 intoUInt64:&result.location]; - if(found2) [NSNumber parseString:str2 intoUInt64:&result.length]; - - return result; -} - -NSInteger DDRangeCompare(DDRangePointer pDDRange1, DDRangePointer pDDRange2) -{ - // Comparison basis: - // Which range would you encouter first if you started at zero, and began walking towards infinity. - // If you encouter both ranges at the same time, which range would end first. - - if(pDDRange1->location < pDDRange2->location) - { - return NSOrderedAscending; - } - if(pDDRange1->location > pDDRange2->location) - { - return NSOrderedDescending; - } - if(pDDRange1->length < pDDRange2->length) - { - return NSOrderedAscending; - } - if(pDDRange1->length > pDDRange2->length) - { - return NSOrderedDescending; - } - - return NSOrderedSame; -} - -@implementation NSValue (NSValueDDRangeExtensions) - -+ (NSValue *)valueWithDDRange:(DDRange)range -{ - return [NSValue valueWithBytes:&range objCType:@encode(DDRange)]; -} - -- (DDRange)ddrangeValue -{ - DDRange result; - [self getValue:&result]; - return result; -} - -- (NSInteger)ddrangeCompare:(NSValue *)other -{ - DDRange r1 = [self ddrangeValue]; - DDRange r2 = [other ddrangeValue]; - - return DDRangeCompare(&r1, &r2); -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/HTTPAuthenticationRequest.h b/YuMi/Tools/CocoaHttpServer/Core/HTTPAuthenticationRequest.h deleted file mode 100755 index 983e162..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/HTTPAuthenticationRequest.h +++ /dev/null @@ -1,45 +0,0 @@ -#import - -#if TARGET_OS_IPHONE - // Note: You may need to add the CFNetwork Framework to your project - #import -#endif - -@class HTTPMessage; - - -@interface HTTPAuthenticationRequest : NSObject -{ - BOOL isBasic; - BOOL isDigest; - - NSString *base64Credentials; - - NSString *username; - NSString *realm; - NSString *nonce; - NSString *uri; - NSString *qop; - NSString *nc; - NSString *cnonce; - NSString *response; -} -- (id)initWithRequest:(HTTPMessage *)request; - -- (BOOL)isBasic; -- (BOOL)isDigest; - -// Basic -- (NSString *)base64Credentials; - -// Digest -- (NSString *)username; -- (NSString *)realm; -- (NSString *)nonce; -- (NSString *)uri; -- (NSString *)qop; -- (NSString *)nc; -- (NSString *)cnonce; -- (NSString *)response; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/HTTPAuthenticationRequest.m b/YuMi/Tools/CocoaHttpServer/Core/HTTPAuthenticationRequest.m deleted file mode 100755 index 80f275f..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/HTTPAuthenticationRequest.m +++ /dev/null @@ -1,194 +0,0 @@ -#import "HTTPAuthenticationRequest.h" -#import "HTTPMessage.h" - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -@interface HTTPAuthenticationRequest (PrivateAPI) -- (NSString *)quotedSubHeaderFieldValue:(NSString *)param fromHeaderFieldValue:(NSString *)header; -- (NSString *)nonquotedSubHeaderFieldValue:(NSString *)param fromHeaderFieldValue:(NSString *)header; -@end - - -@implementation HTTPAuthenticationRequest - -- (id)initWithRequest:(HTTPMessage *)request -{ - if ((self = [super init])) - { - NSString *authInfo = [request headerField:@"Authorization"]; - - isBasic = NO; - if ([authInfo length] >= 6) - { - isBasic = [[authInfo substringToIndex:6] caseInsensitiveCompare:@"Basic "] == NSOrderedSame; - } - - isDigest = NO; - if ([authInfo length] >= 7) - { - isDigest = [[authInfo substringToIndex:7] caseInsensitiveCompare:@"Digest "] == NSOrderedSame; - } - - if (isBasic) - { - NSMutableString *temp = [[authInfo substringFromIndex:6] mutableCopy]; - CFStringTrimWhitespace((__bridge CFMutableStringRef)temp); - - base64Credentials = [temp copy]; - } - - if (isDigest) - { - username = [self quotedSubHeaderFieldValue:@"username" fromHeaderFieldValue:authInfo]; - realm = [self quotedSubHeaderFieldValue:@"realm" fromHeaderFieldValue:authInfo]; - nonce = [self quotedSubHeaderFieldValue:@"nonce" fromHeaderFieldValue:authInfo]; - uri = [self quotedSubHeaderFieldValue:@"uri" fromHeaderFieldValue:authInfo]; - - // It appears from RFC 2617 that the qop is to be given unquoted - // Tests show that Firefox performs this way, but Safari does not - // Thus we'll attempt to retrieve the value as nonquoted, but we'll verify it doesn't start with a quote - qop = [self nonquotedSubHeaderFieldValue:@"qop" fromHeaderFieldValue:authInfo]; - if(qop && ([qop characterAtIndex:0] == '"')) - { - qop = [self quotedSubHeaderFieldValue:@"qop" fromHeaderFieldValue:authInfo]; - } - - nc = [self nonquotedSubHeaderFieldValue:@"nc" fromHeaderFieldValue:authInfo]; - cnonce = [self quotedSubHeaderFieldValue:@"cnonce" fromHeaderFieldValue:authInfo]; - response = [self quotedSubHeaderFieldValue:@"response" fromHeaderFieldValue:authInfo]; - } - } - return self; -} - - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Accessors: -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (BOOL)isBasic { - return isBasic; -} - -- (BOOL)isDigest { - return isDigest; -} - -- (NSString *)base64Credentials { - return base64Credentials; -} - -- (NSString *)username { - return username; -} - -- (NSString *)realm { - return realm; -} - -- (NSString *)nonce { - return nonce; -} - -- (NSString *)uri { - return uri; -} - -- (NSString *)qop { - return qop; -} - -- (NSString *)nc { - return nc; -} - -- (NSString *)cnonce { - return cnonce; -} - -- (NSString *)response { - return response; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Private API: -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Retrieves a "Sub Header Field Value" from a given header field value. - * The sub header field is expected to be quoted. - * - * In the following header field: - * Authorization: Digest username="Mufasa", qop=auth, response="6629fae4939" - * The sub header field titled 'username' is quoted, and this method would return the value @"Mufasa". -**/ -- (NSString *)quotedSubHeaderFieldValue:(NSString *)param fromHeaderFieldValue:(NSString *)header -{ - if (header==nil || header.length == 0) return @""; - NSRange startRange = [header rangeOfString:[NSString stringWithFormat:@"%@=\"", param]]; - if(startRange.location == NSNotFound){ - // The param was not found anywhere in the header - return nil; - } - NSUInteger postStartRangeLocation = startRange.location + startRange.length; - NSUInteger postStartRangeLength = [header length] - postStartRangeLocation; - NSRange postStartRange = NSMakeRange(postStartRangeLocation, postStartRangeLength); - - NSRange endRange = [header rangeOfString:@"\"" options:0 range:postStartRange]; - if(endRange.location == NSNotFound) - { - // The ending double-quote was not found anywhere in the header - return nil; - } - - NSRange subHeaderRange = NSMakeRange(postStartRangeLocation, endRange.location - postStartRangeLocation); - return [header substringWithRange:subHeaderRange]; -} - -/** - * Retrieves a "Sub Header Field Value" from a given header field value. - * The sub header field is expected to not be quoted. - * - * In the following header field: - * Authorization: Digest username="Mufasa", qop=auth, response="6629fae4939" - * The sub header field titled 'qop' is nonquoted, and this method would return the value @"auth". -**/ -- (NSString *)nonquotedSubHeaderFieldValue:(NSString *)param fromHeaderFieldValue:(NSString *)header -{ - NSRange startRange = [header rangeOfString:[NSString stringWithFormat:@"%@=", param]]; - if(startRange.location == NSNotFound) - { - // The param was not found anywhere in the header - return nil; - } - - NSUInteger postStartRangeLocation = startRange.location + startRange.length; - NSUInteger postStartRangeLength = [header length] - postStartRangeLocation; - NSRange postStartRange = NSMakeRange(postStartRangeLocation, postStartRangeLength); - - NSRange endRange = [header rangeOfString:@"," options:0 range:postStartRange]; - if(endRange.location == NSNotFound) - { - // The ending comma was not found anywhere in the header - // However, if the nonquoted param is at the end of the string, there would be no comma - // This is only possible if there are no spaces anywhere - NSRange endRange2 = [header rangeOfString:@" " options:0 range:postStartRange]; - if(endRange2.location != NSNotFound) - { - return nil; - } - else - { - return [header substringWithRange:postStartRange]; - } - } - else - { - NSRange subHeaderRange = NSMakeRange(postStartRangeLocation, endRange.location - postStartRangeLocation); - return [header substringWithRange:subHeaderRange]; - } -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/HTTPConnection.h b/YuMi/Tools/CocoaHttpServer/Core/HTTPConnection.h deleted file mode 100755 index 80b9576..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/HTTPConnection.h +++ /dev/null @@ -1,119 +0,0 @@ -#import - -@class GCDAsyncSocket; -@class HTTPMessage; -@class HTTPServer; -@class WebSocket; -@protocol HTTPResponse; - - -#define HTTPConnectionDidDieNotification @"HTTPConnectionDidDie" - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@interface HTTPConfig : NSObject -{ - HTTPServer __unsafe_unretained *server; - NSString __strong *documentRoot; - dispatch_queue_t queue; -} - -- (id)initWithServer:(HTTPServer *)server documentRoot:(NSString *)documentRoot; -- (id)initWithServer:(HTTPServer *)server documentRoot:(NSString *)documentRoot queue:(dispatch_queue_t)q; - -@property (nonatomic, unsafe_unretained, readonly) HTTPServer *server; -@property (nonatomic, strong, readonly) NSString *documentRoot; -@property (nonatomic, readonly) dispatch_queue_t queue; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@interface HTTPConnection : NSObject -{ - dispatch_queue_t connectionQueue; - GCDAsyncSocket *asyncSocket; - HTTPConfig *config; - - BOOL started; - - HTTPMessage *request; - unsigned int numHeaderLines; - - BOOL sentResponseHeaders; - - NSString *nonce; - long lastNC; - - NSObject *httpResponse; - - NSMutableArray *ranges; - NSMutableArray *ranges_headers; - NSString *ranges_boundry; - int rangeIndex; - - UInt64 requestContentLength; - UInt64 requestContentLengthReceived; - UInt64 requestChunkSize; - UInt64 requestChunkSizeReceived; - - NSMutableArray *responseDataSizes; -} - -- (id)initWithAsyncSocket:(GCDAsyncSocket *)newSocket configuration:(HTTPConfig *)aConfig; - -- (void)start; -- (void)stop; - -- (void)startConnection; - -- (BOOL)supportsMethod:(NSString *)method atPath:(NSString *)path; -- (BOOL)expectsRequestBodyFromMethod:(NSString *)method atPath:(NSString *)path; - -- (BOOL)isSecureServer; -- (NSArray *)sslIdentityAndCertificates; - -- (BOOL)isPasswordProtected:(NSString *)path; -- (BOOL)useDigestAccessAuthentication; -- (NSString *)realm; -- (NSString *)passwordForUser:(NSString *)username; - -- (NSDictionary *)parseParams:(NSString *)query; -- (NSDictionary *)parseGetParams; - -- (NSString *)requestURI; - -- (NSArray *)directoryIndexFileNames; -- (NSString *)filePathForURI:(NSString *)path; -- (NSString *)filePathForURI:(NSString *)path allowDirectory:(BOOL)allowDirectory; -- (NSObject *)httpResponseForMethod:(NSString *)method URI:(NSString *)path; -- (WebSocket *)webSocketForURI:(NSString *)path; - -- (void)prepareForBodyWithSize:(UInt64)contentLength; -- (void)processBodyData:(NSData *)postDataChunk; -- (void)finishBody; - -- (void)handleVersionNotSupported:(NSString *)version; -- (void)handleAuthenticationFailed; -- (void)handleResourceNotFound; -- (void)handleInvalidRequest:(NSData *)data; -- (void)handleUnknownMethod:(NSString *)method; - -- (NSData *)preprocessResponse:(HTTPMessage *)response; -- (NSData *)preprocessErrorResponse:(HTTPMessage *)response; - -- (void)finishResponse; - -- (BOOL)shouldDie; -- (void)die; - -@end - -@interface HTTPConnection (AsynchronousHTTPResponse) -- (void)responseHasAvailableData:(NSObject *)sender; -- (void)responseDidAbort:(NSObject *)sender; -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/HTTPConnection.m b/YuMi/Tools/CocoaHttpServer/Core/HTTPConnection.m deleted file mode 100755 index d4ac82f..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/HTTPConnection.m +++ /dev/null @@ -1,2708 +0,0 @@ -#import "GCDAsyncSocket.h" -#import "HTTPServer.h" -#import "HTTPConnection.h" -#import "HTTPMessage.h" -#import "HTTPResponse.h" -#import "HTTPAuthenticationRequest.h" -#import "DDNumber.h" -#import "DDRange.h" -#import "DDData.h" -#import "HTTPFileResponse.h" -#import "HTTPAsyncFileResponse.h" -#import "WebSocket.h" -#import "HTTPLogging.h" - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -// Log levels: off, error, warn, info, verbose -// Other flags: trace -static const int httpLogLevel = HTTP_LOG_LEVEL_WARN; // | HTTP_LOG_FLAG_TRACE; - -// Define chunk size used to read in data for responses -// This is how much data will be read from disk into RAM at a time -#if TARGET_OS_IPHONE - #define READ_CHUNKSIZE (1024 * 256) -#else - #define READ_CHUNKSIZE (1024 * 512) -#endif - -// Define chunk size used to read in POST upload data -#if TARGET_OS_IPHONE - #define POST_CHUNKSIZE (1024 * 256) -#else - #define POST_CHUNKSIZE (1024 * 512) -#endif - -// Define the various timeouts (in seconds) for various parts of the HTTP process -#define TIMEOUT_READ_FIRST_HEADER_LINE 30 -#define TIMEOUT_READ_SUBSEQUENT_HEADER_LINE 30 -#define TIMEOUT_READ_BODY -1 -#define TIMEOUT_WRITE_HEAD 30 -#define TIMEOUT_WRITE_BODY -1 -#define TIMEOUT_WRITE_ERROR 30 -#define TIMEOUT_NONCE 300 - -// Define the various limits -// MAX_HEADER_LINE_LENGTH: Max length (in bytes) of any single line in a header (including \r\n) -// MAX_HEADER_LINES : Max number of lines in a single header (including first GET line) -#define MAX_HEADER_LINE_LENGTH 8190 -#define MAX_HEADER_LINES 100 -// MAX_CHUNK_LINE_LENGTH : For accepting chunked transfer uploads, max length of chunk size line (including \r\n) -#define MAX_CHUNK_LINE_LENGTH 200 - -// Define the various tags we'll use to differentiate what it is we're currently doing -#define HTTP_REQUEST_HEADER 10 -#define HTTP_REQUEST_BODY 11 -#define HTTP_REQUEST_CHUNK_SIZE 12 -#define HTTP_REQUEST_CHUNK_DATA 13 -#define HTTP_REQUEST_CHUNK_TRAILER 14 -#define HTTP_REQUEST_CHUNK_FOOTER 15 -#define HTTP_PARTIAL_RESPONSE 20 -#define HTTP_PARTIAL_RESPONSE_HEADER 21 -#define HTTP_PARTIAL_RESPONSE_BODY 22 -#define HTTP_CHUNKED_RESPONSE_HEADER 30 -#define HTTP_CHUNKED_RESPONSE_BODY 31 -#define HTTP_CHUNKED_RESPONSE_FOOTER 32 -#define HTTP_PARTIAL_RANGE_RESPONSE_BODY 40 -#define HTTP_PARTIAL_RANGES_RESPONSE_BODY 50 -#define HTTP_RESPONSE 90 -#define HTTP_FINAL_RESPONSE 91 - -// A quick note about the tags: -// -// The HTTP_RESPONSE and HTTP_FINAL_RESPONSE are designated tags signalling that the response is completely sent. -// That is, in the onSocket:didWriteDataWithTag: method, if the tag is HTTP_RESPONSE or HTTP_FINAL_RESPONSE, -// it is assumed that the response is now completely sent. -// Use HTTP_RESPONSE if it's the end of a response, and you want to start reading more requests afterwards. -// Use HTTP_FINAL_RESPONSE if you wish to terminate the connection after sending the response. -// -// If you are sending multiple data segments in a custom response, make sure that only the last segment has -// the HTTP_RESPONSE tag. For all other segments prior to the last segment use HTTP_PARTIAL_RESPONSE, or some other -// tag of your own invention. - -@interface HTTPConnection (PrivateAPI) -- (void)startReadingRequest; -- (void)sendResponseHeadersAndBody; -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation HTTPConnection - -static dispatch_queue_t recentNonceQueue; -static NSMutableArray *recentNonces; - -/** - * This method is automatically called (courtesy of Cocoa) before the first instantiation of this class. - * We use it to initialize any static variables. -**/ -+ (void)initialize -{ - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - - // Initialize class variables - recentNonceQueue = dispatch_queue_create("HTTPConnection-Nonce", NULL); - recentNonces = [[NSMutableArray alloc] initWithCapacity:5]; - }); -} - -/** - * Generates and returns an authentication nonce. - * A nonce is a server-specified string uniquely generated for each 401 response. - * The default implementation uses a single nonce for each session. -**/ -+ (NSString *)generateNonce -{ - // We use the Core Foundation UUID class to generate a nonce value for us - // UUIDs (Universally Unique Identifiers) are 128-bit values guaranteed to be unique. - CFUUIDRef theUUID = CFUUIDCreate(NULL); - NSString *newNonce = (__bridge_transfer NSString *)CFUUIDCreateString(NULL, theUUID); - CFRelease(theUUID); - - // We have to remember that the HTTP protocol is stateless. - // Even though with version 1.1 persistent connections are the norm, they are not guaranteed. - // Thus if we generate a nonce for this connection, - // it should be honored for other connections in the near future. - // - // In fact, this is absolutely necessary in order to support QuickTime. - // When QuickTime makes it's initial connection, it will be unauthorized, and will receive a nonce. - // It then disconnects, and creates a new connection with the nonce, and proper authentication. - // If we don't honor the nonce for the second connection, QuickTime will repeat the process and never connect. - - dispatch_async(recentNonceQueue, ^{ @autoreleasepool { - - [recentNonces addObject:newNonce]; - }}); - - double delayInSeconds = TIMEOUT_NONCE; - dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, delayInSeconds * NSEC_PER_SEC); - dispatch_after(popTime, recentNonceQueue, ^{ @autoreleasepool { - - [recentNonces removeObject:newNonce]; - }}); - - return newNonce; -} - -/** - * Returns whether or not the given nonce is in the list of recently generated nonce's. -**/ -+ (BOOL)hasRecentNonce:(NSString *)recentNonce -{ - __block BOOL result = NO; - - dispatch_sync(recentNonceQueue, ^{ @autoreleasepool { - - result = [recentNonces containsObject:recentNonce]; - }}); - - return result; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Init, Dealloc: -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Sole Constructor. - * Associates this new HTTP connection with the given AsyncSocket. - * This HTTP connection object will become the socket's delegate and take over responsibility for the socket. -**/ -- (id)initWithAsyncSocket:(GCDAsyncSocket *)newSocket configuration:(HTTPConfig *)aConfig -{ - if ((self = [super init])) - { - HTTPLogTrace(); - - if (aConfig.queue) - { - connectionQueue = aConfig.queue; - #if !OS_OBJECT_USE_OBJC - dispatch_retain(connectionQueue); - #endif - } - else - { - connectionQueue = dispatch_queue_create("HTTPConnection", NULL); - } - - // Take over ownership of the socket - asyncSocket = newSocket; - [asyncSocket setDelegate:self delegateQueue:connectionQueue]; - - // Store configuration - config = aConfig; - - // Initialize lastNC (last nonce count). - // Used with digest access authentication. - // These must increment for each request from the client. - lastNC = 0; - - // Create a new HTTP message - request = [[HTTPMessage alloc] initEmptyRequest]; - - numHeaderLines = 0; - - responseDataSizes = [[NSMutableArray alloc] initWithCapacity:5]; - } - return self; -} - -/** - * Standard Deconstructor. -**/ -- (void)dealloc -{ - HTTPLogTrace(); - - #if !OS_OBJECT_USE_OBJC - dispatch_release(connectionQueue); - #endif - - [asyncSocket setDelegate:nil delegateQueue:NULL]; - [asyncSocket disconnect]; - - if ([httpResponse respondsToSelector:@selector(connectionDidClose)]) - { - [httpResponse connectionDidClose]; - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Method Support -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Returns whether or not the server will accept messages of a given method - * at a particular URI. -**/ -- (BOOL)supportsMethod:(NSString *)method atPath:(NSString *)path -{ - HTTPLogTrace(); - - // Override me to support methods such as POST. - // - // Things you may want to consider: - // - Does the given path represent a resource that is designed to accept this method? - // - If accepting an upload, is the size of the data being uploaded too big? - // To do this you can check the requestContentLength variable. - // - // For more information, you can always access the HTTPMessage request variable. - // - // You should fall through with a call to [super supportsMethod:method atPath:path] - // - // See also: expectsRequestBodyFromMethod:atPath: - - if ([method isEqualToString:@"GET"]) - return YES; - - if ([method isEqualToString:@"HEAD"]) - return YES; - - return NO; -} - -/** - * Returns whether or not the server expects a body from the given method. - * - * In other words, should the server expect a content-length header and associated body from this method. - * This would be true in the case of a POST, where the client is sending data, - * or for something like PUT where the client is supposed to be uploading a file. -**/ -- (BOOL)expectsRequestBodyFromMethod:(NSString *)method atPath:(NSString *)path -{ - HTTPLogTrace(); - - // Override me to add support for other methods that expect the client - // to send a body along with the request header. - // - // You should fall through with a call to [super expectsRequestBodyFromMethod:method atPath:path] - // - // See also: supportsMethod:atPath: - - if ([method isEqualToString:@"POST"]) - return YES; - - if ([method isEqualToString:@"PUT"]) - return YES; - - return NO; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark HTTPS -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Returns whether or not the server is configured to be a secure server. - * In other words, all connections to this server are immediately secured, thus only secure connections are allowed. - * This is the equivalent of having an https server, where it is assumed that all connections must be secure. - * If this is the case, then unsecure connections will not be allowed on this server, and a separate unsecure server - * would need to be run on a separate port in order to support unsecure connections. - * - * Note: In order to support secure connections, the sslIdentityAndCertificates method must be implemented. -**/ -- (BOOL)isSecureServer -{ - HTTPLogTrace(); - - // Override me to create an https server... - - return NO; -} - -/** - * This method is expected to returns an array appropriate for use in kCFStreamSSLCertificates SSL Settings. - * It should be an array of SecCertificateRefs except for the first element in the array, which is a SecIdentityRef. -**/ -- (NSArray *)sslIdentityAndCertificates -{ - HTTPLogTrace(); - - // Override me to provide the proper required SSL identity. - - return nil; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Password Protection -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Returns whether or not the requested resource is password protected. - * In this generic implementation, nothing is password protected. -**/ -- (BOOL)isPasswordProtected:(NSString *)path -{ - HTTPLogTrace(); - - // Override me to provide password protection... - // You can configure it for the entire server, or based on the current request - - return NO; -} - -/** - * Returns whether or not the authentication challenge should use digest access authentication. - * The alternative is basic authentication. - * - * If at all possible, digest access authentication should be used because it's more secure. - * Basic authentication sends passwords in the clear and should be avoided unless using SSL/TLS. -**/ -- (BOOL)useDigestAccessAuthentication -{ - HTTPLogTrace(); - - // Override me to customize the authentication scheme - // Make sure you understand the security risks of using the weaker basic authentication - - return YES; -} - -/** - * Returns the authentication realm. - * In this generic implmentation, a default realm is used for the entire server. -**/ -- (NSString *)realm -{ - HTTPLogTrace(); - - // Override me to provide a custom realm... - // You can configure it for the entire server, or based on the current request - - return @"defaultRealm@host.com"; -} - -/** - * Returns the password for the given username. -**/ -- (NSString *)passwordForUser:(NSString *)username -{ - HTTPLogTrace(); - - // Override me to provide proper password authentication - // You can configure a password for the entire server, or custom passwords for users and/or resources - - // Security Note: - // A nil password means no access at all. (Such as for user doesn't exist) - // An empty string password is allowed, and will be treated as any other password. (To support anonymous access) - - return nil; -} - -/** - * Returns whether or not the user is properly authenticated. -**/ -- (BOOL)isAuthenticated -{ - HTTPLogTrace(); - - // Extract the authentication information from the Authorization header - HTTPAuthenticationRequest *auth = [[HTTPAuthenticationRequest alloc] initWithRequest:request]; - - if ([self useDigestAccessAuthentication]) - { - // Digest Access Authentication (RFC 2617) - - if(![auth isDigest]) - { - // User didn't send proper digest access authentication credentials - return NO; - } - - if ([auth username] == nil) - { - // The client didn't provide a username - // Most likely they didn't provide any authentication at all - return NO; - } - - NSString *password = [self passwordForUser:[auth username]]; - if (password == nil) - { - // No access allowed (username doesn't exist in system) - return NO; - } - - NSString *url = [[request url] relativeString]; - - if (![url isEqualToString:[auth uri]]) - { - // Requested URL and Authorization URI do not match - // This could be a replay attack - // IE - attacker provides same authentication information, but requests a different resource - return NO; - } - - // The nonce the client provided will most commonly be stored in our local (cached) nonce variable - if (![nonce isEqualToString:[auth nonce]]) - { - // The given nonce may be from another connection - // We need to search our list of recent nonce strings that have been recently distributed - if ([[self class] hasRecentNonce:[auth nonce]]) - { - // Store nonce in local (cached) nonce variable to prevent array searches in the future - nonce = [[auth nonce] copy]; - - // The client has switched to using a different nonce value - // This may happen if the client tries to get a file in a directory with different credentials. - // The previous credentials wouldn't work, and the client would receive a 401 error - // along with a new nonce value. The client then uses this new nonce value and requests the file again. - // Whatever the case may be, we need to reset lastNC, since that variable is on a per nonce basis. - lastNC = 0; - } - else - { - // We have no knowledge of ever distributing such a nonce. - // This could be a replay attack from a previous connection in the past. - return NO; - } - } - - long authNC = strtol([[auth nc] UTF8String], NULL, 16); - - if (authNC <= lastNC) - { - // The nc value (nonce count) hasn't been incremented since the last request. - // This could be a replay attack. - return NO; - } - lastNC = authNC; - - NSString *HA1str = [NSString stringWithFormat:@"%@:%@:%@", [auth username], [auth realm], password]; - NSString *HA2str = [NSString stringWithFormat:@"%@:%@", [request method], [auth uri]]; - - NSString *HA1 = [[[HA1str dataUsingEncoding:NSUTF8StringEncoding] md5Digest] hexStringValue]; - - NSString *HA2 = [[[HA2str dataUsingEncoding:NSUTF8StringEncoding] md5Digest] hexStringValue]; - - NSString *responseStr = [NSString stringWithFormat:@"%@:%@:%@:%@:%@:%@", - HA1, [auth nonce], [auth nc], [auth cnonce], [auth qop], HA2]; - - NSString *response = [[[responseStr dataUsingEncoding:NSUTF8StringEncoding] md5Digest] hexStringValue]; - - return [response isEqualToString:[auth response]]; - } - else - { - // Basic Authentication - - if (![auth isBasic]) - { - // User didn't send proper base authentication credentials - return NO; - } - - // Decode the base 64 encoded credentials - NSString *base64Credentials = [auth base64Credentials]; - - NSData *temp = [[base64Credentials dataUsingEncoding:NSUTF8StringEncoding] base64Decoded]; - - NSString *credentials = [[NSString alloc] initWithData:temp encoding:NSUTF8StringEncoding]; - - // The credentials should be of the form "username:password" - // The username is not allowed to contain a colon - - NSRange colonRange = [credentials rangeOfString:@":"]; - - if (colonRange.length == 0) - { - // Malformed credentials - return NO; - } - - NSString *credUsername = [credentials substringToIndex:colonRange.location]; - NSString *credPassword = [credentials substringFromIndex:(colonRange.location + colonRange.length)]; - - NSString *password = [self passwordForUser:credUsername]; - if (password == nil) - { - // No access allowed (username doesn't exist in system) - return NO; - } - - return [password isEqualToString:credPassword]; - } -} - -/** - * Adds a digest access authentication challenge to the given response. -**/ -- (void)addDigestAuthChallenge:(HTTPMessage *)response -{ - HTTPLogTrace(); - - NSString *authFormat = @"Digest realm=\"%@\", qop=\"auth\", nonce=\"%@\""; - NSString *authInfo = [NSString stringWithFormat:authFormat, [self realm], [[self class] generateNonce]]; - - [response setHeaderField:@"WWW-Authenticate" value:authInfo]; -} - -/** - * Adds a basic authentication challenge to the given response. -**/ -- (void)addBasicAuthChallenge:(HTTPMessage *)response -{ - HTTPLogTrace(); - - NSString *authFormat = @"Basic realm=\"%@\""; - NSString *authInfo = [NSString stringWithFormat:authFormat, [self realm]]; - - [response setHeaderField:@"WWW-Authenticate" value:authInfo]; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Core -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Starting point for the HTTP connection after it has been fully initialized (including subclasses). - * This method is called by the HTTP server. -**/ -- (void)start -{ - dispatch_async(connectionQueue, ^{ @autoreleasepool { - - if (!started) - { - started = YES; - [self startConnection]; - } - }}); -} - -/** - * This method is called by the HTTPServer if it is asked to stop. - * The server, in turn, invokes stop on each HTTPConnection instance. -**/ -- (void)stop -{ - dispatch_async(connectionQueue, ^{ @autoreleasepool { - - // Disconnect the socket. - // The socketDidDisconnect delegate method will handle everything else. - [asyncSocket disconnect]; - }}); -} - -/** - * Starting point for the HTTP connection. -**/ -- (void)startConnection -{ - // Override me to do any custom work before the connection starts. - // - // Be sure to invoke [super startConnection] when you're done. - - HTTPLogTrace(); - - if ([self isSecureServer]) - { - // We are configured to be an HTTPS server. - // That is, we secure via SSL/TLS the connection prior to any communication. - - NSArray *certificates = [self sslIdentityAndCertificates]; - - if ([certificates count] > 0) - { - // All connections are assumed to be secure. Only secure connections are allowed on this server. - NSMutableDictionary *settings = [NSMutableDictionary dictionaryWithCapacity:3]; - - // Configure this connection as the server - [settings setObject:[NSNumber numberWithBool:YES] - forKey:(NSString *)kCFStreamSSLIsServer]; - - [settings setObject:certificates - forKey:(NSString *)kCFStreamSSLCertificates]; - - // Configure this connection to use the highest possible SSL level - [settings setObject:(NSString *)kCFStreamSocketSecurityLevelNegotiatedSSL - forKey:(NSString *)kCFStreamSSLLevel]; - - [asyncSocket startTLS:settings]; - } - } - - [self startReadingRequest]; -} - -/** - * Starts reading an HTTP request. -**/ -- (void)startReadingRequest -{ - HTTPLogTrace(); - - [asyncSocket readDataToData:[GCDAsyncSocket CRLFData] - withTimeout:TIMEOUT_READ_FIRST_HEADER_LINE - maxLength:MAX_HEADER_LINE_LENGTH - tag:HTTP_REQUEST_HEADER]; -} - -/** - * Parses the given query string. - * - * For example, if the query is "q=John%20Mayer%20Trio&num=50" - * then this method would return the following dictionary: - * { - * q = "John Mayer Trio" - * num = "50" - * } -**/ -- (NSDictionary *)parseParams:(NSString *)query -{ - NSArray *components = [query componentsSeparatedByString:@"&"]; - NSMutableDictionary *result = [NSMutableDictionary dictionaryWithCapacity:[components count]]; - - NSUInteger i; - for (i = 0; i < [components count]; i++) - { - NSString *component = [components objectAtIndex:i]; - if ([component length] > 0) - { - NSRange range = [component rangeOfString:@"="]; - if (range.location != NSNotFound) - { - NSString *escapedKey = [component substringToIndex:(range.location + 0)]; - NSString *escapedValue = [component substringFromIndex:(range.location + 1)]; - - if ([escapedKey length] > 0) - { - CFStringRef k, v; - - k = CFURLCreateStringByReplacingPercentEscapes(NULL, (__bridge CFStringRef)escapedKey, CFSTR("")); - v = CFURLCreateStringByReplacingPercentEscapes(NULL, (__bridge CFStringRef)escapedValue, CFSTR("")); - - NSString *key, *value; - - key = (__bridge_transfer NSString *)k; - value = (__bridge_transfer NSString *)v; - - if (key) - { - if (value) - [result setObject:value forKey:key]; - else - [result setObject:[NSNull null] forKey:key]; - } - } - } - } - } - - return result; -} - -/** - * Parses the query variables in the request URI. - * - * For example, if the request URI was "/search.html?q=John%20Mayer%20Trio&num=50" - * then this method would return the following dictionary: - * { - * q = "John Mayer Trio" - * num = "50" - * } -**/ -- (NSDictionary *)parseGetParams -{ - if(![request isHeaderComplete]) return nil; - - NSDictionary *result = nil; - - NSURL *url = [request url]; - if(url) - { - NSString *query = [url query]; - if (query) - { - result = [self parseParams:query]; - } - } - - return result; -} - -/** - * Attempts to parse the given range header into a series of sequential non-overlapping ranges. - * If successfull, the variables 'ranges' and 'rangeIndex' will be updated, and YES will be returned. - * Otherwise, NO is returned, and the range request should be ignored. - **/ -- (BOOL)parseRangeRequest:(NSString *)rangeHeader withContentLength:(UInt64)contentLength -{ - HTTPLogTrace(); - - // Examples of byte-ranges-specifier values (assuming an entity-body of length 10000): - // - // - The first 500 bytes (byte offsets 0-499, inclusive): bytes=0-499 - // - // - The second 500 bytes (byte offsets 500-999, inclusive): bytes=500-999 - // - // - The final 500 bytes (byte offsets 9500-9999, inclusive): bytes=-500 - // - // - Or bytes=9500- - // - // - The first and last bytes only (bytes 0 and 9999): bytes=0-0,-1 - // - // - Several legal but not canonical specifications of the second 500 bytes (byte offsets 500-999, inclusive): - // bytes=500-600,601-999 - // bytes=500-700,601-999 - // - - NSRange eqsignRange = [rangeHeader rangeOfString:@"="]; - - if(eqsignRange.location == NSNotFound) return NO; - - NSUInteger tIndex = eqsignRange.location; - NSUInteger fIndex = eqsignRange.location + eqsignRange.length; - - NSMutableString *rangeType = [[rangeHeader substringToIndex:tIndex] mutableCopy]; - NSMutableString *rangeValue = [[rangeHeader substringFromIndex:fIndex] mutableCopy]; - - CFStringTrimWhitespace((__bridge CFMutableStringRef)rangeType); - CFStringTrimWhitespace((__bridge CFMutableStringRef)rangeValue); - - if([rangeType caseInsensitiveCompare:@"bytes"] != NSOrderedSame) return NO; - - NSArray *rangeComponents = [rangeValue componentsSeparatedByString:@","]; - - if([rangeComponents count] == 0) return NO; - - ranges = [[NSMutableArray alloc] initWithCapacity:[rangeComponents count]]; - - rangeIndex = 0; - - // Note: We store all range values in the form of DDRange structs, wrapped in NSValue objects. - // Since DDRange consists of UInt64 values, the range extends up to 16 exabytes. - - NSUInteger i; - for (i = 0; i < [rangeComponents count]; i++) - { - NSString *rangeComponent = [rangeComponents objectAtIndex:i]; - - NSRange dashRange = [rangeComponent rangeOfString:@"-"]; - - if (dashRange.location == NSNotFound) - { - // We're dealing with an individual byte number - - UInt64 byteIndex; - if(![NSNumber parseString:rangeComponent intoUInt64:&byteIndex]) return NO; - - if(byteIndex >= contentLength) return NO; - - [ranges addObject:[NSValue valueWithDDRange:DDMakeRange(byteIndex, 1)]]; - } - else - { - // We're dealing with a range of bytes - - tIndex = dashRange.location; - fIndex = dashRange.location + dashRange.length; - - NSString *r1str = [rangeComponent substringToIndex:tIndex]; - NSString *r2str = [rangeComponent substringFromIndex:fIndex]; - - UInt64 r1, r2; - - BOOL hasR1 = [NSNumber parseString:r1str intoUInt64:&r1]; - BOOL hasR2 = [NSNumber parseString:r2str intoUInt64:&r2]; - - if (!hasR1) - { - // We're dealing with a "-[#]" range - // - // r2 is the number of ending bytes to include in the range - - if(!hasR2) return NO; - if(r2 > contentLength) return NO; - - UInt64 startIndex = contentLength - r2; - - [ranges addObject:[NSValue valueWithDDRange:DDMakeRange(startIndex, r2)]]; - } - else if (!hasR2) - { - // We're dealing with a "[#]-" range - // - // r1 is the starting index of the range, which goes all the way to the end - - if(r1 >= contentLength) return NO; - - [ranges addObject:[NSValue valueWithDDRange:DDMakeRange(r1, contentLength - r1)]]; - } - else - { - // We're dealing with a normal "[#]-[#]" range - // - // Note: The range is inclusive. So 0-1 has a length of 2 bytes. - - if(r1 > r2) return NO; - if(r2 >= contentLength) return NO; - - [ranges addObject:[NSValue valueWithDDRange:DDMakeRange(r1, r2 - r1 + 1)]]; - } - } - } - - if([ranges count] == 0) return NO; - - // Now make sure none of the ranges overlap - - for (i = 0; i < [ranges count] - 1; i++) - { - DDRange range1 = [[ranges objectAtIndex:i] ddrangeValue]; - - NSUInteger j; - for (j = i+1; j < [ranges count]; j++) - { - DDRange range2 = [[ranges objectAtIndex:j] ddrangeValue]; - - DDRange iRange = DDIntersectionRange(range1, range2); - - if(iRange.length != 0) - { - return NO; - } - } - } - - // Sort the ranges - - [ranges sortUsingSelector:@selector(ddrangeCompare:)]; - - return YES; -} - -- (NSString *)requestURI -{ - if(request == nil) return nil; - - return [[request url] relativeString]; -} - -/** - * This method is called after a full HTTP request has been received. - * The current request is in the HTTPMessage request variable. -**/ -- (void)replyToHTTPRequest -{ - HTTPLogTrace(); - - if (HTTP_LOG_VERBOSE) - { - NSData *tempData = [request messageData]; - - NSString *tempStr = [[NSString alloc] initWithData:tempData encoding:NSUTF8StringEncoding]; - HTTPLogVerbose(@"%@[%p]: Received HTTP request:\n%@", THIS_FILE, self, tempStr); - } - - // Check the HTTP version - // We only support version 1.0 and 1.1 - - NSString *version = [request version]; - if (![version isEqualToString:HTTPVersion1_1] && ![version isEqualToString:HTTPVersion1_0]) - { - [self handleVersionNotSupported:version]; - return; - } - - // Extract requested URI - NSString *uri = [self requestURI]; - - // Check for WebSocket request - if ([WebSocket isWebSocketRequest:request]) - { - HTTPLogVerbose(@"isWebSocket"); - - WebSocket *ws = [self webSocketForURI:uri]; - - if (ws == nil) - { - [self handleResourceNotFound]; - } - else - { - [ws start]; - - [[config server] addWebSocket:ws]; - - // The WebSocket should now be the delegate of the underlying socket. - // But gracefully handle the situation if it forgot. - if ([asyncSocket delegate] == self) - { - HTTPLogWarn(@"%@[%p]: WebSocket forgot to set itself as socket delegate", THIS_FILE, self); - - // Disconnect the socket. - // The socketDidDisconnect delegate method will handle everything else. - [asyncSocket disconnect]; - } - else - { - // The WebSocket is using the socket, - // so make sure we don't disconnect it in the dealloc method. - asyncSocket = nil; - - [self die]; - - // Note: There is a timing issue here that should be pointed out. - // - // A bug that existed in previous versions happend like so: - // - We invoked [self die] - // - This caused us to get released, and our dealloc method to start executing - // - Meanwhile, AsyncSocket noticed a disconnect, and began to dispatch a socketDidDisconnect at us - // - The dealloc method finishes execution, and our instance gets freed - // - The socketDidDisconnect gets run, and a crash occurs - // - // So the issue we want to avoid is releasing ourself when there is a possibility - // that AsyncSocket might be gearing up to queue a socketDidDisconnect for us. - // - // In this particular situation notice that we invoke [asyncSocket delegate]. - // This method is synchronous concerning AsyncSocket's internal socketQueue. - // Which means we can be sure, when it returns, that AsyncSocket has already - // queued any delegate methods for us if it was going to. - // And if the delegate methods are queued, then we've been properly retained. - // Meaning we won't get released / dealloc'd until the delegate method has finished executing. - // - // In this rare situation, the die method will get invoked twice. - } - } - - return; - } - - // Check Authentication (if needed) - // If not properly authenticated for resource, issue Unauthorized response - if ([self isPasswordProtected:uri] && ![self isAuthenticated]) - { - [self handleAuthenticationFailed]; - return; - } - - // Extract the method - NSString *method = [request method]; - - // Note: We already checked to ensure the method was supported in onSocket:didReadData:withTag: - - // Respond properly to HTTP 'GET' and 'HEAD' commands - httpResponse = [self httpResponseForMethod:method URI:uri]; - - if (httpResponse == nil) - { - [self handleResourceNotFound]; - return; - } - - [self sendResponseHeadersAndBody]; -} - -/** - * Prepares a single-range response. - * - * Note: The returned HTTPMessage is owned by the sender, who is responsible for releasing it. -**/ -- (HTTPMessage *)newUniRangeResponse:(UInt64)contentLength -{ - HTTPLogTrace(); - - // Status Code 206 - Partial Content - HTTPMessage *response = [[HTTPMessage alloc] initResponseWithStatusCode:206 description:nil version:HTTPVersion1_1]; - - DDRange range = [[ranges objectAtIndex:0] ddrangeValue]; - - NSString *contentLengthStr = [NSString stringWithFormat:@"%qu", range.length]; - [response setHeaderField:@"Content-Length" value:contentLengthStr]; - - NSString *rangeStr = [NSString stringWithFormat:@"%qu-%qu", range.location, DDMaxRange(range) - 1]; - NSString *contentRangeStr = [NSString stringWithFormat:@"bytes %@/%qu", rangeStr, contentLength]; - [response setHeaderField:@"Content-Range" value:contentRangeStr]; - - return response; -} - -/** - * Prepares a multi-range response. - * - * Note: The returned HTTPMessage is owned by the sender, who is responsible for releasing it. -**/ -- (HTTPMessage *)newMultiRangeResponse:(UInt64)contentLength -{ - HTTPLogTrace(); - - // Status Code 206 - Partial Content - HTTPMessage *response = [[HTTPMessage alloc] initResponseWithStatusCode:206 description:nil version:HTTPVersion1_1]; - - // We have to send each range using multipart/byteranges - // So each byterange has to be prefix'd and suffix'd with the boundry - // Example: - // - // HTTP/1.1 206 Partial Content - // Content-Length: 220 - // Content-Type: multipart/byteranges; boundary=4554d24e986f76dd6 - // - // - // --4554d24e986f76dd6 - // Content-Range: bytes 0-25/4025 - // - // [...] - // --4554d24e986f76dd6 - // Content-Range: bytes 3975-4024/4025 - // - // [...] - // --4554d24e986f76dd6-- - - ranges_headers = [[NSMutableArray alloc] initWithCapacity:[ranges count]]; - - CFUUIDRef theUUID = CFUUIDCreate(NULL); - ranges_boundry = (__bridge_transfer NSString *)CFUUIDCreateString(NULL, theUUID); - CFRelease(theUUID); - - NSString *startingBoundryStr = [NSString stringWithFormat:@"\r\n--%@\r\n", ranges_boundry]; - NSString *endingBoundryStr = [NSString stringWithFormat:@"\r\n--%@--\r\n", ranges_boundry]; - - UInt64 actualContentLength = 0; - - NSUInteger i; - for (i = 0; i < [ranges count]; i++) - { - DDRange range = [[ranges objectAtIndex:i] ddrangeValue]; - - NSString *rangeStr = [NSString stringWithFormat:@"%qu-%qu", range.location, DDMaxRange(range) - 1]; - NSString *contentRangeVal = [NSString stringWithFormat:@"bytes %@/%qu", rangeStr, contentLength]; - NSString *contentRangeStr = [NSString stringWithFormat:@"Content-Range: %@\r\n\r\n", contentRangeVal]; - - NSString *fullHeader = [startingBoundryStr stringByAppendingString:contentRangeStr]; - NSData *fullHeaderData = [fullHeader dataUsingEncoding:NSUTF8StringEncoding]; - - [ranges_headers addObject:fullHeaderData]; - - actualContentLength += [fullHeaderData length]; - actualContentLength += range.length; - } - - NSData *endingBoundryData = [endingBoundryStr dataUsingEncoding:NSUTF8StringEncoding]; - - actualContentLength += [endingBoundryData length]; - - NSString *contentLengthStr = [NSString stringWithFormat:@"%qu", actualContentLength]; - [response setHeaderField:@"Content-Length" value:contentLengthStr]; - - NSString *contentTypeStr = [NSString stringWithFormat:@"multipart/byteranges; boundary=%@", ranges_boundry]; - [response setHeaderField:@"Content-Type" value:contentTypeStr]; - - return response; -} - -/** - * Returns the chunk size line that must precede each chunk of data when using chunked transfer encoding. - * This consists of the size of the data, in hexadecimal, followed by a CRLF. -**/ -- (NSData *)chunkedTransferSizeLineForLength:(NSUInteger)length -{ - return [[NSString stringWithFormat:@"%lx\r\n", (unsigned long)length] dataUsingEncoding:NSUTF8StringEncoding]; -} - -/** - * Returns the data that signals the end of a chunked transfer. -**/ -- (NSData *)chunkedTransferFooter -{ - // Each data chunk is preceded by a size line (in hex and including a CRLF), - // followed by the data itself, followed by another CRLF. - // After every data chunk has been sent, a zero size line is sent, - // followed by optional footer (which are just more headers), - // and followed by a CRLF on a line by itself. - - return [@"\r\n0\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]; -} - -- (void)sendResponseHeadersAndBody -{ - if ([httpResponse respondsToSelector:@selector(delayResponseHeaders)]) - { - if ([httpResponse delayResponseHeaders]) - { - return; - } - } - - BOOL isChunked = NO; - - if ([httpResponse respondsToSelector:@selector(isChunked)]) - { - isChunked = [httpResponse isChunked]; - } - - // If a response is "chunked", this simply means the HTTPResponse object - // doesn't know the content-length in advance. - - UInt64 contentLength = 0; - - if (!isChunked) - { - contentLength = [httpResponse contentLength]; - } - - // Check for specific range request - NSString *rangeHeader = [request headerField:@"Range"]; - - BOOL isRangeRequest = NO; - - // If the response is "chunked" then we don't know the exact content-length. - // This means we'll be unable to process any range requests. - // This is because range requests might include a range like "give me the last 100 bytes" - - if (!isChunked && rangeHeader) - { - if ([self parseRangeRequest:rangeHeader withContentLength:contentLength]) - { - isRangeRequest = YES; - } - } - - HTTPMessage *response; - - if (!isRangeRequest) - { - // Create response - // Default status code: 200 - OK - NSInteger status = 200; - - if ([httpResponse respondsToSelector:@selector(status)]) - { - status = [httpResponse status]; - } - response = [[HTTPMessage alloc] initResponseWithStatusCode:status description:nil version:HTTPVersion1_1]; - - if (isChunked) - { - [response setHeaderField:@"Transfer-Encoding" value:@"chunked"]; - } - else - { - NSString *contentLengthStr = [NSString stringWithFormat:@"%qu", contentLength]; - [response setHeaderField:@"Content-Length" value:contentLengthStr]; - } - } - else - { - if ([ranges count] == 1) - { - response = [self newUniRangeResponse:contentLength]; - } - else - { - response = [self newMultiRangeResponse:contentLength]; - } - } - - BOOL isZeroLengthResponse = !isChunked && (contentLength == 0); - - // If they issue a 'HEAD' command, we don't have to include the file - // If they issue a 'GET' command, we need to include the file - - if ([[request method] isEqualToString:@"HEAD"] || isZeroLengthResponse) - { - NSData *responseData = [self preprocessResponse:response]; - [asyncSocket writeData:responseData withTimeout:TIMEOUT_WRITE_HEAD tag:HTTP_RESPONSE]; - - sentResponseHeaders = YES; - } - else - { - // Write the header response - NSData *responseData = [self preprocessResponse:response]; - [asyncSocket writeData:responseData withTimeout:TIMEOUT_WRITE_HEAD tag:HTTP_PARTIAL_RESPONSE_HEADER]; - - sentResponseHeaders = YES; - - // Now we need to send the body of the response - if (!isRangeRequest) - { - // Regular request - NSData *data = [httpResponse readDataOfLength:READ_CHUNKSIZE]; - - if ([data length] > 0) - { - [responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]]; - - if (isChunked) - { - NSData *chunkSize = [self chunkedTransferSizeLineForLength:[data length]]; - [asyncSocket writeData:chunkSize withTimeout:TIMEOUT_WRITE_HEAD tag:HTTP_CHUNKED_RESPONSE_HEADER]; - - [asyncSocket writeData:data withTimeout:TIMEOUT_WRITE_BODY tag:HTTP_CHUNKED_RESPONSE_BODY]; - - if ([httpResponse isDone]) - { - NSData *footer = [self chunkedTransferFooter]; - [asyncSocket writeData:footer withTimeout:TIMEOUT_WRITE_HEAD tag:HTTP_RESPONSE]; - } - else - { - NSData *footer = [GCDAsyncSocket CRLFData]; - [asyncSocket writeData:footer withTimeout:TIMEOUT_WRITE_HEAD tag:HTTP_CHUNKED_RESPONSE_FOOTER]; - } - } - else - { - long tag = [httpResponse isDone] ? HTTP_RESPONSE : HTTP_PARTIAL_RESPONSE_BODY; - [asyncSocket writeData:data withTimeout:TIMEOUT_WRITE_BODY tag:tag]; - } - } - } - else - { - // Client specified a byte range in request - - if ([ranges count] == 1) - { - // Client is requesting a single range - DDRange range = [[ranges objectAtIndex:0] ddrangeValue]; - - [httpResponse setOffset:range.location]; - - NSUInteger bytesToRead = range.length < READ_CHUNKSIZE ? (NSUInteger)range.length : READ_CHUNKSIZE; - - NSData *data = [httpResponse readDataOfLength:bytesToRead]; - - if ([data length] > 0) - { - [responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]]; - - long tag = [data length] == range.length ? HTTP_RESPONSE : HTTP_PARTIAL_RANGE_RESPONSE_BODY; - [asyncSocket writeData:data withTimeout:TIMEOUT_WRITE_BODY tag:tag]; - } - } - else - { - // Client is requesting multiple ranges - // We have to send each range using multipart/byteranges - - // Write range header - NSData *rangeHeaderData = [ranges_headers objectAtIndex:0]; - [asyncSocket writeData:rangeHeaderData withTimeout:TIMEOUT_WRITE_HEAD tag:HTTP_PARTIAL_RESPONSE_HEADER]; - - // Start writing range body - DDRange range = [[ranges objectAtIndex:0] ddrangeValue]; - - [httpResponse setOffset:range.location]; - - NSUInteger bytesToRead = range.length < READ_CHUNKSIZE ? (NSUInteger)range.length : READ_CHUNKSIZE; - - NSData *data = [httpResponse readDataOfLength:bytesToRead]; - - if ([data length] > 0) - { - [responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]]; - - [asyncSocket writeData:data withTimeout:TIMEOUT_WRITE_BODY tag:HTTP_PARTIAL_RANGES_RESPONSE_BODY]; - } - } - } - } - -} - -/** - * Returns the number of bytes of the http response body that are sitting in asyncSocket's write queue. - * - * We keep track of this information in order to keep our memory footprint low while - * working with asynchronous HTTPResponse objects. -**/ -- (NSUInteger)writeQueueSize -{ - NSUInteger result = 0; - - NSUInteger i; - for(i = 0; i < [responseDataSizes count]; i++) - { - result += [[responseDataSizes objectAtIndex:i] unsignedIntegerValue]; - } - - return result; -} - -/** - * Sends more data, if needed, without growing the write queue over its approximate size limit. - * The last chunk of the response body will be sent with a tag of HTTP_RESPONSE. - * - * This method should only be called for standard (non-range) responses. -**/ -- (void)continueSendingStandardResponseBody -{ - HTTPLogTrace(); - - // This method is called when either asyncSocket has finished writing one of the response data chunks, - // or when an asynchronous HTTPResponse object informs us that it has more available data for us to send. - // In the case of the asynchronous HTTPResponse, we don't want to blindly grab the new data, - // and shove it onto asyncSocket's write queue. - // Doing so could negatively affect the memory footprint of the application. - // Instead, we always ensure that we place no more than READ_CHUNKSIZE bytes onto the write queue. - // - // Note that this does not affect the rate at which the HTTPResponse object may generate data. - // The HTTPResponse is free to do as it pleases, and this is up to the application's developer. - // If the memory footprint is a concern, the developer creating the custom HTTPResponse object may freely - // use the calls to readDataOfLength as an indication to start generating more data. - // This provides an easy way for the HTTPResponse object to throttle its data allocation in step with the rate - // at which the socket is able to send it. - - NSUInteger writeQueueSize = [self writeQueueSize]; - - if(writeQueueSize >= READ_CHUNKSIZE) return; - - NSUInteger available = READ_CHUNKSIZE - writeQueueSize; - NSData *data = [httpResponse readDataOfLength:available]; - - if ([data length] > 0) - { - [responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]]; - - BOOL isChunked = NO; - - if ([httpResponse respondsToSelector:@selector(isChunked)]) - { - isChunked = [httpResponse isChunked]; - } - - if (isChunked) - { - NSData *chunkSize = [self chunkedTransferSizeLineForLength:[data length]]; - [asyncSocket writeData:chunkSize withTimeout:TIMEOUT_WRITE_HEAD tag:HTTP_CHUNKED_RESPONSE_HEADER]; - - [asyncSocket writeData:data withTimeout:TIMEOUT_WRITE_BODY tag:HTTP_CHUNKED_RESPONSE_BODY]; - - if([httpResponse isDone]) - { - NSData *footer = [self chunkedTransferFooter]; - [asyncSocket writeData:footer withTimeout:TIMEOUT_WRITE_HEAD tag:HTTP_RESPONSE]; - } - else - { - NSData *footer = [GCDAsyncSocket CRLFData]; - [asyncSocket writeData:footer withTimeout:TIMEOUT_WRITE_HEAD tag:HTTP_CHUNKED_RESPONSE_FOOTER]; - } - } - else - { - long tag = [httpResponse isDone] ? HTTP_RESPONSE : HTTP_PARTIAL_RESPONSE_BODY; - [asyncSocket writeData:data withTimeout:TIMEOUT_WRITE_BODY tag:tag]; - } - } -} - -/** - * Sends more data, if needed, without growing the write queue over its approximate size limit. - * The last chunk of the response body will be sent with a tag of HTTP_RESPONSE. - * - * This method should only be called for single-range responses. -**/ -- (void)continueSendingSingleRangeResponseBody -{ - HTTPLogTrace(); - - // This method is called when either asyncSocket has finished writing one of the response data chunks, - // or when an asynchronous response informs us that is has more available data for us to send. - // In the case of the asynchronous response, we don't want to blindly grab the new data, - // and shove it onto asyncSocket's write queue. - // Doing so could negatively affect the memory footprint of the application. - // Instead, we always ensure that we place no more than READ_CHUNKSIZE bytes onto the write queue. - // - // Note that this does not affect the rate at which the HTTPResponse object may generate data. - // The HTTPResponse is free to do as it pleases, and this is up to the application's developer. - // If the memory footprint is a concern, the developer creating the custom HTTPResponse object may freely - // use the calls to readDataOfLength as an indication to start generating more data. - // This provides an easy way for the HTTPResponse object to throttle its data allocation in step with the rate - // at which the socket is able to send it. - - NSUInteger writeQueueSize = [self writeQueueSize]; - - if(writeQueueSize >= READ_CHUNKSIZE) return; - - DDRange range = [[ranges objectAtIndex:0] ddrangeValue]; - - UInt64 offset = [httpResponse offset]; - UInt64 bytesRead = offset - range.location; - UInt64 bytesLeft = range.length - bytesRead; - - if (bytesLeft > 0) - { - NSUInteger available = READ_CHUNKSIZE - writeQueueSize; - NSUInteger bytesToRead = bytesLeft < available ? (NSUInteger)bytesLeft : available; - - NSData *data = [httpResponse readDataOfLength:bytesToRead]; - - if ([data length] > 0) - { - [responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]]; - - long tag = [data length] == bytesLeft ? HTTP_RESPONSE : HTTP_PARTIAL_RANGE_RESPONSE_BODY; - [asyncSocket writeData:data withTimeout:TIMEOUT_WRITE_BODY tag:tag]; - } - } -} - -/** - * Sends more data, if needed, without growing the write queue over its approximate size limit. - * The last chunk of the response body will be sent with a tag of HTTP_RESPONSE. - * - * This method should only be called for multi-range responses. -**/ -- (void)continueSendingMultiRangeResponseBody -{ - HTTPLogTrace(); - - // This method is called when either asyncSocket has finished writing one of the response data chunks, - // or when an asynchronous HTTPResponse object informs us that is has more available data for us to send. - // In the case of the asynchronous HTTPResponse, we don't want to blindly grab the new data, - // and shove it onto asyncSocket's write queue. - // Doing so could negatively affect the memory footprint of the application. - // Instead, we always ensure that we place no more than READ_CHUNKSIZE bytes onto the write queue. - // - // Note that this does not affect the rate at which the HTTPResponse object may generate data. - // The HTTPResponse is free to do as it pleases, and this is up to the application's developer. - // If the memory footprint is a concern, the developer creating the custom HTTPResponse object may freely - // use the calls to readDataOfLength as an indication to start generating more data. - // This provides an easy way for the HTTPResponse object to throttle its data allocation in step with the rate - // at which the socket is able to send it. - - NSUInteger writeQueueSize = [self writeQueueSize]; - - if(writeQueueSize >= READ_CHUNKSIZE) return; - - DDRange range = [[ranges objectAtIndex:rangeIndex] ddrangeValue]; - - UInt64 offset = [httpResponse offset]; - UInt64 bytesRead = offset - range.location; - UInt64 bytesLeft = range.length - bytesRead; - - if (bytesLeft > 0) - { - NSUInteger available = READ_CHUNKSIZE - writeQueueSize; - NSUInteger bytesToRead = bytesLeft < available ? (NSUInteger)bytesLeft : available; - - NSData *data = [httpResponse readDataOfLength:bytesToRead]; - - if ([data length] > 0) - { - [responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]]; - - [asyncSocket writeData:data withTimeout:TIMEOUT_WRITE_BODY tag:HTTP_PARTIAL_RANGES_RESPONSE_BODY]; - } - } - else - { - if (++rangeIndex < [ranges count]) - { - // Write range header - NSData *rangeHeader = [ranges_headers objectAtIndex:rangeIndex]; - [asyncSocket writeData:rangeHeader withTimeout:TIMEOUT_WRITE_HEAD tag:HTTP_PARTIAL_RESPONSE_HEADER]; - - // Start writing range body - range = [[ranges objectAtIndex:rangeIndex] ddrangeValue]; - - [httpResponse setOffset:range.location]; - - NSUInteger available = READ_CHUNKSIZE - writeQueueSize; - NSUInteger bytesToRead = range.length < available ? (NSUInteger)range.length : available; - - NSData *data = [httpResponse readDataOfLength:bytesToRead]; - - if ([data length] > 0) - { - [responseDataSizes addObject:[NSNumber numberWithUnsignedInteger:[data length]]]; - - [asyncSocket writeData:data withTimeout:TIMEOUT_WRITE_BODY tag:HTTP_PARTIAL_RANGES_RESPONSE_BODY]; - } - } - else - { - // We're not done yet - we still have to send the closing boundry tag - NSString *endingBoundryStr = [NSString stringWithFormat:@"\r\n--%@--\r\n", ranges_boundry]; - NSData *endingBoundryData = [endingBoundryStr dataUsingEncoding:NSUTF8StringEncoding]; - - [asyncSocket writeData:endingBoundryData withTimeout:TIMEOUT_WRITE_HEAD tag:HTTP_RESPONSE]; - } - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Responses -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Returns an array of possible index pages. - * For example: {"index.html", "index.htm"} -**/ -- (NSArray *)directoryIndexFileNames -{ - HTTPLogTrace(); - - // Override me to support other index pages. - - return [NSArray arrayWithObjects:@"index.html", @"index.htm", nil]; -} - -- (NSString *)filePathForURI:(NSString *)path -{ - return [self filePathForURI:path allowDirectory:NO]; -} - -/** - * Converts relative URI path into full file-system path. -**/ -- (NSString *)filePathForURI:(NSString *)path allowDirectory:(BOOL)allowDirectory -{ - HTTPLogTrace(); - - // Override me to perform custom path mapping. - // For example you may want to use a default file other than index.html, or perhaps support multiple types. - - NSString *documentRoot = [config documentRoot]; - - // Part 0: Validate document root setting. - // - // If there is no configured documentRoot, - // then it makes no sense to try to return anything. - - if (documentRoot == nil) - { - HTTPLogWarn(@"%@[%p]: No configured document root", THIS_FILE, self); - return nil; - } - - // Part 1: Strip parameters from the url - // - // E.g.: /page.html?q=22&var=abc -> /page.html - - NSURL *docRoot = [NSURL fileURLWithPath:documentRoot isDirectory:YES]; - if (docRoot == nil) - { - HTTPLogWarn(@"%@[%p]: Document root is invalid file path", THIS_FILE, self); - return nil; - } - - NSString *relativePath = [[NSURL URLWithString:path relativeToURL:docRoot] relativePath]; - - // Part 2: Append relative path to document root (base path) - // - // E.g.: relativePath="/images/icon.png" - // documentRoot="/Users/robbie/Sites" - // fullPath="/Users/robbie/Sites/images/icon.png" - // - // We also standardize the path. - // - // E.g.: "Users/robbie/Sites/images/../index.html" -> "/Users/robbie/Sites/index.html" - - NSString *fullPath = [[documentRoot stringByAppendingPathComponent:relativePath] stringByStandardizingPath]; - - if ([relativePath isEqualToString:@"/"]) - { - fullPath = [fullPath stringByAppendingString:@"/"]; - } - - // Part 3: Prevent serving files outside the document root. - // - // Sneaky requests may include ".." in the path. - // - // E.g.: relativePath="../Documents/TopSecret.doc" - // documentRoot="/Users/robbie/Sites" - // fullPath="/Users/robbie/Documents/TopSecret.doc" - // - // E.g.: relativePath="../Sites_Secret/TopSecret.doc" - // documentRoot="/Users/robbie/Sites" - // fullPath="/Users/robbie/Sites_Secret/TopSecret" - - if (![documentRoot hasSuffix:@"/"]) - { - documentRoot = [documentRoot stringByAppendingString:@"/"]; - } - - if (![fullPath hasPrefix:documentRoot]) - { - HTTPLogWarn(@"%@[%p]: Request for file outside document root", THIS_FILE, self); - return nil; - } - - // Part 4: Search for index page if path is pointing to a directory - if (!allowDirectory) - { - BOOL isDir = NO; - if ([[NSFileManager defaultManager] fileExistsAtPath:fullPath isDirectory:&isDir] && isDir) - { - NSArray *indexFileNames = [self directoryIndexFileNames]; - - for (NSString *indexFileName in indexFileNames) - { - NSString *indexFilePath = [fullPath stringByAppendingPathComponent:indexFileName]; - - if ([[NSFileManager defaultManager] fileExistsAtPath:indexFilePath isDirectory:&isDir] && !isDir) - { - return indexFilePath; - } - } - - // No matching index files found in directory - return nil; - } - } - - return fullPath; -} - -/** - * This method is called to get a response for a request. - * You may return any object that adopts the HTTPResponse protocol. - * The HTTPServer comes with two such classes: HTTPFileResponse and HTTPDataResponse. - * HTTPFileResponse is a wrapper for an NSFileHandle object, and is the preferred way to send a file response. - * HTTPDataResponse is a wrapper for an NSData object, and may be used to send a custom response. -**/ -- (NSObject *)httpResponseForMethod:(NSString *)method URI:(NSString *)path -{ - HTTPLogTrace(); - - // Override me to provide custom responses. - - NSString *filePath = [self filePathForURI:path allowDirectory:NO]; - - BOOL isDir = NO; - - if (filePath && [[NSFileManager defaultManager] fileExistsAtPath:filePath isDirectory:&isDir] && !isDir) - { - return [[HTTPFileResponse alloc] initWithFilePath:filePath forConnection:self]; - - // Use me instead for asynchronous file IO. - // Generally better for larger files. - - // return [[[HTTPAsyncFileResponse alloc] initWithFilePath:filePath forConnection:self] autorelease]; - } - - return nil; -} - -- (WebSocket *)webSocketForURI:(NSString *)path -{ - HTTPLogTrace(); - - // Override me to provide custom WebSocket responses. - // To do so, simply override the base WebSocket implementation, and add your custom functionality. - // Then return an instance of your custom WebSocket here. - // - // For example: - // - // if ([path isEqualToString:@"/myAwesomeWebSocketStream"]) - // { - // return [[[MyWebSocket alloc] initWithRequest:request socket:asyncSocket] autorelease]; - // } - // - // return [super webSocketForURI:path]; - - return nil; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Uploads -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * This method is called after receiving all HTTP headers, but before reading any of the request body. -**/ -- (void)prepareForBodyWithSize:(UInt64)contentLength -{ - // Override me to allocate buffers, file handles, etc. -} - -/** - * This method is called to handle data read from a POST / PUT. - * The given data is part of the request body. -**/ -- (void)processBodyData:(NSData *)postDataChunk -{ - // Override me to do something useful with a POST / PUT. - // If the post is small, such as a simple form, you may want to simply append the data to the request. - // If the post is big, such as a file upload, you may want to store the file to disk. - // - // Remember: In order to support LARGE POST uploads, the data is read in chunks. - // This prevents a 50 MB upload from being stored in RAM. - // The size of the chunks are limited by the POST_CHUNKSIZE definition. - // Therefore, this method may be called multiple times for the same POST request. -} - -/** - * This method is called after the request body has been fully read but before the HTTP request is processed. -**/ -- (void)finishBody -{ - // Override me to perform any final operations on an upload. - // For example, if you were saving the upload to disk this would be - // the hook to flush any pending data to disk and maybe close the file. -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Errors -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Called if the HTML version is other than what is supported -**/ -- (void)handleVersionNotSupported:(NSString *)version -{ - // Override me for custom error handling of unsupported http version responses - // If you simply want to add a few extra header fields, see the preprocessErrorResponse: method. - // You can also use preprocessErrorResponse: to add an optional HTML body. - - HTTPLogWarn(@"HTTP Server: Error 505 - Version Not Supported: %@ (%@)", version, [self requestURI]); - - HTTPMessage *response = [[HTTPMessage alloc] initResponseWithStatusCode:505 description:nil version:HTTPVersion1_1]; - [response setHeaderField:@"Content-Length" value:@"0"]; - - NSData *responseData = [self preprocessErrorResponse:response]; - [asyncSocket writeData:responseData withTimeout:TIMEOUT_WRITE_ERROR tag:HTTP_RESPONSE]; - -} - -/** - * Called if the authentication information was required and absent, or if authentication failed. -**/ -- (void)handleAuthenticationFailed -{ - // Override me for custom handling of authentication challenges - // If you simply want to add a few extra header fields, see the preprocessErrorResponse: method. - // You can also use preprocessErrorResponse: to add an optional HTML body. - - HTTPLogInfo(@"HTTP Server: Error 401 - Unauthorized (%@)", [self requestURI]); - - // Status Code 401 - Unauthorized - HTTPMessage *response = [[HTTPMessage alloc] initResponseWithStatusCode:401 description:nil version:HTTPVersion1_1]; - [response setHeaderField:@"Content-Length" value:@"0"]; - - if ([self useDigestAccessAuthentication]) - { - [self addDigestAuthChallenge:response]; - } - else - { - [self addBasicAuthChallenge:response]; - } - - NSData *responseData = [self preprocessErrorResponse:response]; - [asyncSocket writeData:responseData withTimeout:TIMEOUT_WRITE_ERROR tag:HTTP_RESPONSE]; - -} - -/** - * Called if we receive some sort of malformed HTTP request. - * The data parameter is the invalid HTTP header line, including CRLF, as read from GCDAsyncSocket. - * The data parameter may also be nil if the request as a whole was invalid, such as a POST with no Content-Length. -**/ -- (void)handleInvalidRequest:(NSData *)data -{ - // Override me for custom error handling of invalid HTTP requests - // If you simply want to add a few extra header fields, see the preprocessErrorResponse: method. - // You can also use preprocessErrorResponse: to add an optional HTML body. - - HTTPLogWarn(@"HTTP Server: Error 400 - Bad Request (%@)", [self requestURI]); - - // Status Code 400 - Bad Request - HTTPMessage *response = [[HTTPMessage alloc] initResponseWithStatusCode:400 description:nil version:HTTPVersion1_1]; - [response setHeaderField:@"Content-Length" value:@"0"]; - [response setHeaderField:@"Connection" value:@"close"]; - - NSData *responseData = [self preprocessErrorResponse:response]; - [asyncSocket writeData:responseData withTimeout:TIMEOUT_WRITE_ERROR tag:HTTP_FINAL_RESPONSE]; - - - // Note: We used the HTTP_FINAL_RESPONSE tag to disconnect after the response is sent. - // We do this because we couldn't parse the request, - // so we won't be able to recover and move on to another request afterwards. - // In other words, we wouldn't know where the first request ends and the second request begins. -} - -/** - * Called if we receive a HTTP request with a method other than GET or HEAD. -**/ -- (void)handleUnknownMethod:(NSString *)method -{ - // Override me for custom error handling of 405 method not allowed responses. - // If you simply want to add a few extra header fields, see the preprocessErrorResponse: method. - // You can also use preprocessErrorResponse: to add an optional HTML body. - // - // See also: supportsMethod:atPath: - - HTTPLogWarn(@"HTTP Server: Error 405 - Method Not Allowed: %@ (%@)", method, [self requestURI]); - - // Status code 405 - Method Not Allowed - HTTPMessage *response = [[HTTPMessage alloc] initResponseWithStatusCode:405 description:nil version:HTTPVersion1_1]; - [response setHeaderField:@"Content-Length" value:@"0"]; - [response setHeaderField:@"Connection" value:@"close"]; - - NSData *responseData = [self preprocessErrorResponse:response]; - [asyncSocket writeData:responseData withTimeout:TIMEOUT_WRITE_ERROR tag:HTTP_FINAL_RESPONSE]; - - - // Note: We used the HTTP_FINAL_RESPONSE tag to disconnect after the response is sent. - // We do this because the method may include an http body. - // Since we can't be sure, we should close the connection. -} - -/** - * Called if we're unable to find the requested resource. -**/ -- (void)handleResourceNotFound -{ - // Override me for custom error handling of 404 not found responses - // If you simply want to add a few extra header fields, see the preprocessErrorResponse: method. - // You can also use preprocessErrorResponse: to add an optional HTML body. - - HTTPLogInfo(@"HTTP Server: Error 404 - Not Found (%@)", [self requestURI]); - - // Status Code 404 - Not Found - HTTPMessage *response = [[HTTPMessage alloc] initResponseWithStatusCode:404 description:nil version:HTTPVersion1_1]; - [response setHeaderField:@"Content-Length" value:@"0"]; - - NSData *responseData = [self preprocessErrorResponse:response]; - [asyncSocket writeData:responseData withTimeout:TIMEOUT_WRITE_ERROR tag:HTTP_RESPONSE]; - -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Headers -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Gets the current date and time, formatted properly (according to RFC) for insertion into an HTTP header. -**/ -- (NSString *)dateAsString:(NSDate *)date -{ - // From Apple's Documentation (Data Formatting Guide -> Date Formatters -> Cache Formatters for Efficiency): - // - // "Creating a date formatter is not a cheap operation. If you are likely to use a formatter frequently, - // it is typically more efficient to cache a single instance than to create and dispose of multiple instances. - // One approach is to use a static variable." - // - // This was discovered to be true in massive form via issue #46: - // - // "Was doing some performance benchmarking using instruments and httperf. Using this single optimization - // I got a 26% speed improvement - from 1000req/sec to 3800req/sec. Not insignificant. - // The culprit? Why, NSDateFormatter, of course!" - // - // Thus, we are using a static NSDateFormatter here. - - static NSDateFormatter *df; - - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - - // Example: Sun, 06 Nov 1994 08:49:37 GMT - - df = [[NSDateFormatter alloc] init]; - [df setFormatterBehavior:NSDateFormatterBehavior10_4]; - [df setTimeZone:[NSTimeZone timeZoneWithAbbreviation:@"GMT"]]; - [df setDateFormat:@"EEE, dd MMM y HH:mm:ss 'GMT'"]; - [df setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US"]]; - - // For some reason, using zzz in the format string produces GMT+00:00 - }); - - return [df stringFromDate:date]; -} - -/** - * This method is called immediately prior to sending the response headers. - * This method adds standard header fields, and then converts the response to an NSData object. -**/ -- (NSData *)preprocessResponse:(HTTPMessage *)response -{ - HTTPLogTrace(); - - // Override me to customize the response headers - // You'll likely want to add your own custom headers, and then return [super preprocessResponse:response] - - // Add standard headers - NSString *now = [self dateAsString:[NSDate date]]; - [response setHeaderField:@"Date" value:now]; - - // Add server capability headers - [response setHeaderField:@"Accept-Ranges" value:@"bytes"]; - - // Add optional response headers - if ([httpResponse respondsToSelector:@selector(httpHeaders)]) - { - NSDictionary *responseHeaders = [httpResponse httpHeaders]; - - NSEnumerator *keyEnumerator = [responseHeaders keyEnumerator]; - NSString *key; - - while ((key = [keyEnumerator nextObject])) - { - NSString *value = [responseHeaders objectForKey:key]; - - [response setHeaderField:key value:value]; - } - } - - return [response messageData]; -} - -/** - * This method is called immediately prior to sending the response headers (for an error). - * This method adds standard header fields, and then converts the response to an NSData object. -**/ -- (NSData *)preprocessErrorResponse:(HTTPMessage *)response -{ - HTTPLogTrace(); - - // Override me to customize the error response headers - // You'll likely want to add your own custom headers, and then return [super preprocessErrorResponse:response] - // - // Notes: - // You can use [response statusCode] to get the type of error. - // You can use [response setBody:data] to add an optional HTML body. - // If you add a body, don't forget to update the Content-Length. - // - // if ([response statusCode] == 404) - // { - // NSString *msg = @"Error 404 - Not Found"; - // NSData *msgData = [msg dataUsingEncoding:NSUTF8StringEncoding]; - // - // [response setBody:msgData]; - // - // NSString *contentLengthStr = [NSString stringWithFormat:@"%lu", (unsigned long)[msgData length]]; - // [response setHeaderField:@"Content-Length" value:contentLengthStr]; - // } - - // Add standard headers - NSString *now = [self dateAsString:[NSDate date]]; - [response setHeaderField:@"Date" value:now]; - - // Add server capability headers - [response setHeaderField:@"Accept-Ranges" value:@"bytes"]; - - // Add optional response headers - if ([httpResponse respondsToSelector:@selector(httpHeaders)]) - { - NSDictionary *responseHeaders = [httpResponse httpHeaders]; - - NSEnumerator *keyEnumerator = [responseHeaders keyEnumerator]; - NSString *key; - - while((key = [keyEnumerator nextObject])) - { - NSString *value = [responseHeaders objectForKey:key]; - - [response setHeaderField:key value:value]; - } - } - - return [response messageData]; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark GCDAsyncSocket Delegate -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * This method is called after the socket has successfully read data from the stream. - * Remember that this method will only be called after the socket reaches a CRLF, or after it's read the proper length. -**/ -- (void)socket:(GCDAsyncSocket *)sock didReadData:(NSData*)data withTag:(long)tag -{ - if (tag == HTTP_REQUEST_HEADER) - { - // Append the header line to the http message - BOOL result = [request appendData:data]; - if (!result) - { - HTTPLogWarn(@"%@[%p]: Malformed request", THIS_FILE, self); - - [self handleInvalidRequest:data]; - } - else if (![request isHeaderComplete]) - { - // We don't have a complete header yet - // That is, we haven't yet received a CRLF on a line by itself, indicating the end of the header - if (++numHeaderLines > MAX_HEADER_LINES) - { - // Reached the maximum amount of header lines in a single HTTP request - // This could be an attempted DOS attack - [asyncSocket disconnect]; - - // Explictly return to ensure we don't do anything after the socket disconnect - return; - } - else - { - [asyncSocket readDataToData:[GCDAsyncSocket CRLFData] - withTimeout:TIMEOUT_READ_SUBSEQUENT_HEADER_LINE - maxLength:MAX_HEADER_LINE_LENGTH - tag:HTTP_REQUEST_HEADER]; - } - } - else - { - // We have an entire HTTP request header from the client - - // Extract the method (such as GET, HEAD, POST, etc) - NSString *method = [request method]; - - // Extract the uri (such as "/index.html") - NSString *uri = [self requestURI]; - - // Check for a Transfer-Encoding field - NSString *transferEncoding = [request headerField:@"Transfer-Encoding"]; - - // Check for a Content-Length field - NSString *contentLength = [request headerField:@"Content-Length"]; - - // Content-Length MUST be present for upload methods (such as POST or PUT) - // and MUST NOT be present for other methods. - BOOL expectsUpload = [self expectsRequestBodyFromMethod:method atPath:uri]; - - if (expectsUpload) - { - if (transferEncoding && ![transferEncoding caseInsensitiveCompare:@"Chunked"]) - { - requestContentLength = -1; - } - else - { - if (contentLength == nil) - { - HTTPLogWarn(@"%@[%p]: Method expects request body, but had no specified Content-Length", - THIS_FILE, self); - - [self handleInvalidRequest:nil]; - return; - } - - if (![NSNumber parseString:(NSString *)contentLength intoUInt64:&requestContentLength]) - { - HTTPLogWarn(@"%@[%p]: Unable to parse Content-Length header into a valid number", - THIS_FILE, self); - - [self handleInvalidRequest:nil]; - return; - } - } - } - else - { - if (contentLength != nil) - { - // Received Content-Length header for method not expecting an upload. - // This better be zero... - - if (![NSNumber parseString:(NSString *)contentLength intoUInt64:&requestContentLength]) - { - HTTPLogWarn(@"%@[%p]: Unable to parse Content-Length header into a valid number", - THIS_FILE, self); - - [self handleInvalidRequest:nil]; - return; - } - - if (requestContentLength > 0) - { - HTTPLogWarn(@"%@[%p]: Method not expecting request body had non-zero Content-Length", - THIS_FILE, self); - - [self handleInvalidRequest:nil]; - return; - } - } - - requestContentLength = 0; - requestContentLengthReceived = 0; - } - - // Check to make sure the given method is supported - if (![self supportsMethod:method atPath:uri]) - { - // The method is unsupported - either in general, or for this specific request - // Send a 405 - Method not allowed response - [self handleUnknownMethod:method]; - return; - } - - if (expectsUpload) - { - // Reset the total amount of data received for the upload - requestContentLengthReceived = 0; - - // Prepare for the upload - [self prepareForBodyWithSize:requestContentLength]; - - if (requestContentLength > 0) - { - // Start reading the request body - if (requestContentLength == -1) - { - // Chunked transfer - - [asyncSocket readDataToData:[GCDAsyncSocket CRLFData] - withTimeout:TIMEOUT_READ_BODY - maxLength:MAX_CHUNK_LINE_LENGTH - tag:HTTP_REQUEST_CHUNK_SIZE]; - } - else - { - NSUInteger bytesToRead; - if (requestContentLength < POST_CHUNKSIZE) - bytesToRead = (NSUInteger)requestContentLength; - else - bytesToRead = POST_CHUNKSIZE; - - [asyncSocket readDataToLength:bytesToRead - withTimeout:TIMEOUT_READ_BODY - tag:HTTP_REQUEST_BODY]; - } - } - else - { - // Empty upload - [self finishBody]; - [self replyToHTTPRequest]; - } - } - else - { - // Now we need to reply to the request - [self replyToHTTPRequest]; - } - } - } - else - { - BOOL doneReadingRequest = NO; - - // A chunked message body contains a series of chunks, - // followed by a line with "0" (zero), - // followed by optional footers (just like headers), - // and a blank line. - // - // Each chunk consists of two parts: - // - // 1. A line with the size of the chunk data, in hex, - // possibly followed by a semicolon and extra parameters you can ignore (none are currently standard), - // and ending with CRLF. - // 2. The data itself, followed by CRLF. - // - // Part 1 is represented by HTTP_REQUEST_CHUNK_SIZE - // Part 2 is represented by HTTP_REQUEST_CHUNK_DATA and HTTP_REQUEST_CHUNK_TRAILER - // where the trailer is the CRLF that follows the data. - // - // The optional footers and blank line are represented by HTTP_REQUEST_CHUNK_FOOTER. - - if (tag == HTTP_REQUEST_CHUNK_SIZE) - { - // We have just read in a line with the size of the chunk data, in hex, - // possibly followed by a semicolon and extra parameters that can be ignored, - // and ending with CRLF. - - NSString *sizeLine = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; - - errno = 0; // Reset errno before calling strtoull() to ensure it is always zero on success - requestChunkSize = (UInt64)strtoull([sizeLine UTF8String], NULL, 16); - requestChunkSizeReceived = 0; - - if (errno != 0) - { - HTTPLogWarn(@"%@[%p]: Method expects chunk size, but received something else", THIS_FILE, self); - - [self handleInvalidRequest:nil]; - return; - } - - if (requestChunkSize > 0) - { - NSUInteger bytesToRead; - bytesToRead = (requestChunkSize < POST_CHUNKSIZE) ? (NSUInteger)requestChunkSize : POST_CHUNKSIZE; - - [asyncSocket readDataToLength:bytesToRead - withTimeout:TIMEOUT_READ_BODY - tag:HTTP_REQUEST_CHUNK_DATA]; - } - else - { - // This is the "0" (zero) line, - // which is to be followed by optional footers (just like headers) and finally a blank line. - - [asyncSocket readDataToData:[GCDAsyncSocket CRLFData] - withTimeout:TIMEOUT_READ_BODY - maxLength:MAX_HEADER_LINE_LENGTH - tag:HTTP_REQUEST_CHUNK_FOOTER]; - } - - return; - } - else if (tag == HTTP_REQUEST_CHUNK_DATA) - { - // We just read part of the actual data. - - requestContentLengthReceived += [data length]; - requestChunkSizeReceived += [data length]; - - [self processBodyData:data]; - - UInt64 bytesLeft = requestChunkSize - requestChunkSizeReceived; - if (bytesLeft > 0) - { - NSUInteger bytesToRead = (bytesLeft < POST_CHUNKSIZE) ? (NSUInteger)bytesLeft : POST_CHUNKSIZE; - - [asyncSocket readDataToLength:bytesToRead - withTimeout:TIMEOUT_READ_BODY - tag:HTTP_REQUEST_CHUNK_DATA]; - } - else - { - // We've read in all the data for this chunk. - // The data is followed by a CRLF, which we need to read (and basically ignore) - - [asyncSocket readDataToLength:2 - withTimeout:TIMEOUT_READ_BODY - tag:HTTP_REQUEST_CHUNK_TRAILER]; - } - - return; - } - else if (tag == HTTP_REQUEST_CHUNK_TRAILER) - { - // This should be the CRLF following the data. - // Just ensure it's a CRLF. - - if (![data isEqualToData:[GCDAsyncSocket CRLFData]]) - { - HTTPLogWarn(@"%@[%p]: Method expects chunk trailer, but is missing", THIS_FILE, self); - - [self handleInvalidRequest:nil]; - return; - } - - // Now continue with the next chunk - - [asyncSocket readDataToData:[GCDAsyncSocket CRLFData] - withTimeout:TIMEOUT_READ_BODY - maxLength:MAX_CHUNK_LINE_LENGTH - tag:HTTP_REQUEST_CHUNK_SIZE]; - - } - else if (tag == HTTP_REQUEST_CHUNK_FOOTER) - { - if (++numHeaderLines > MAX_HEADER_LINES) - { - // Reached the maximum amount of header lines in a single HTTP request - // This could be an attempted DOS attack - [asyncSocket disconnect]; - - // Explictly return to ensure we don't do anything after the socket disconnect - return; - } - - if ([data length] > 2) - { - // We read in a footer. - // In the future we may want to append these to the request. - // For now we ignore, and continue reading the footers, waiting for the final blank line. - - [asyncSocket readDataToData:[GCDAsyncSocket CRLFData] - withTimeout:TIMEOUT_READ_BODY - maxLength:MAX_HEADER_LINE_LENGTH - tag:HTTP_REQUEST_CHUNK_FOOTER]; - } - else - { - doneReadingRequest = YES; - } - } - else // HTTP_REQUEST_BODY - { - // Handle a chunk of data from the POST body - - requestContentLengthReceived += [data length]; - [self processBodyData:data]; - - if (requestContentLengthReceived < requestContentLength) - { - // We're not done reading the post body yet... - - UInt64 bytesLeft = requestContentLength - requestContentLengthReceived; - - NSUInteger bytesToRead = bytesLeft < POST_CHUNKSIZE ? (NSUInteger)bytesLeft : POST_CHUNKSIZE; - - [asyncSocket readDataToLength:bytesToRead - withTimeout:TIMEOUT_READ_BODY - tag:HTTP_REQUEST_BODY]; - } - else - { - doneReadingRequest = YES; - } - } - - // Now that the entire body has been received, we need to reply to the request - - if (doneReadingRequest) - { - [self finishBody]; - [self replyToHTTPRequest]; - } - } -} - -/** - * This method is called after the socket has successfully written data to the stream. -**/ -- (void)socket:(GCDAsyncSocket *)sock didWriteDataWithTag:(long)tag -{ - BOOL doneSendingResponse = NO; - - if (tag == HTTP_PARTIAL_RESPONSE_BODY) - { - // Update the amount of data we have in asyncSocket's write queue - if ([responseDataSizes count] > 0) { - [responseDataSizes removeObjectAtIndex:0]; - } - - // We only wrote a part of the response - there may be more - [self continueSendingStandardResponseBody]; - } - else if (tag == HTTP_CHUNKED_RESPONSE_BODY) - { - // Update the amount of data we have in asyncSocket's write queue. - // This will allow asynchronous responses to continue sending more data. - if ([responseDataSizes count] > 0) { - [responseDataSizes removeObjectAtIndex:0]; - } - // Don't continue sending the response yet. - // The chunked footer that was sent after the body will tell us if we have more data to send. - } - else if (tag == HTTP_CHUNKED_RESPONSE_FOOTER) - { - // Normal chunked footer indicating we have more data to send (non final footer). - [self continueSendingStandardResponseBody]; - } - else if (tag == HTTP_PARTIAL_RANGE_RESPONSE_BODY) - { - // Update the amount of data we have in asyncSocket's write queue - if ([responseDataSizes count] > 0) { - [responseDataSizes removeObjectAtIndex:0]; - } - // We only wrote a part of the range - there may be more - [self continueSendingSingleRangeResponseBody]; - } - else if (tag == HTTP_PARTIAL_RANGES_RESPONSE_BODY) - { - // Update the amount of data we have in asyncSocket's write queue - if ([responseDataSizes count] > 0) { - [responseDataSizes removeObjectAtIndex:0]; - } - // We only wrote part of the range - there may be more, or there may be more ranges - [self continueSendingMultiRangeResponseBody]; - } - else if (tag == HTTP_RESPONSE || tag == HTTP_FINAL_RESPONSE) - { - // Update the amount of data we have in asyncSocket's write queue - if ([responseDataSizes count] > 0) - { - [responseDataSizes removeObjectAtIndex:0]; - } - - doneSendingResponse = YES; - } - - if (doneSendingResponse) - { - // Inform the http response that we're done - if ([httpResponse respondsToSelector:@selector(connectionDidClose)]) - { - [httpResponse connectionDidClose]; - } - - - if (tag == HTTP_FINAL_RESPONSE) - { - // Cleanup after the last request - [self finishResponse]; - - // Terminate the connection - [asyncSocket disconnect]; - - // Explictly return to ensure we don't do anything after the socket disconnects - return; - } - else - { - if ([self shouldDie]) - { - // Cleanup after the last request - // Note: Don't do this before calling shouldDie, as it needs the request object still. - [self finishResponse]; - - // The only time we should invoke [self die] is from socketDidDisconnect, - // or if the socket gets taken over by someone else like a WebSocket. - - [asyncSocket disconnect]; - } - else - { - // Cleanup after the last request - [self finishResponse]; - - // Prepare for the next request - - // If this assertion fails, it likely means you overrode the - // finishBody method and forgot to call [super finishBody]. - NSAssert(request == nil, @"Request not properly released in finishBody"); - - request = [[HTTPMessage alloc] initEmptyRequest]; - - numHeaderLines = 0; - sentResponseHeaders = NO; - - // And start listening for more requests - [self startReadingRequest]; - } - } - } -} - -/** - * Sent after the socket has been disconnected. -**/ -- (void)socketDidDisconnect:(GCDAsyncSocket *)sock withError:(NSError *)err -{ - HTTPLogTrace(); - - asyncSocket = nil; - - [self die]; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark HTTPResponse Notifications -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * This method may be called by asynchronous HTTPResponse objects. - * That is, HTTPResponse objects that return YES in their "- (BOOL)isAsynchronous" method. - * - * This informs us that the response object has generated more data that we may be able to send. -**/ -- (void)responseHasAvailableData:(NSObject *)sender -{ - HTTPLogTrace(); - - // We always dispatch this asynchronously onto our connectionQueue, - // even if the connectionQueue is the current queue. - // - // We do this to give the HTTPResponse classes the flexibility to call - // this method whenever they want, even from within a readDataOfLength method. - - dispatch_async(connectionQueue, ^{ @autoreleasepool { - - if (sender != httpResponse) - { - HTTPLogWarn(@"%@[%p]: %@ - Sender is not current httpResponse", THIS_FILE, self, THIS_METHOD); - return; - } - - if (!sentResponseHeaders) - { - [self sendResponseHeadersAndBody]; - } - else - { - if (ranges == nil) - { - [self continueSendingStandardResponseBody]; - } - else - { - if ([ranges count] == 1) - [self continueSendingSingleRangeResponseBody]; - else - [self continueSendingMultiRangeResponseBody]; - } - } - }}); -} - -/** - * This method is called if the response encounters some critical error, - * and it will be unable to fullfill the request. -**/ -- (void)responseDidAbort:(NSObject *)sender -{ - HTTPLogTrace(); - - // We always dispatch this asynchronously onto our connectionQueue, - // even if the connectionQueue is the current queue. - // - // We do this to give the HTTPResponse classes the flexibility to call - // this method whenever they want, even from within a readDataOfLength method. - - dispatch_async(connectionQueue, ^{ @autoreleasepool { - - if (sender != httpResponse) - { - HTTPLogWarn(@"%@[%p]: %@ - Sender is not current httpResponse", THIS_FILE, self, THIS_METHOD); - return; - } - - [asyncSocket disconnectAfterWriting]; - }}); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Post Request -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * This method is called after each response has been fully sent. - * Since a single connection may handle multiple request/responses, this method may be called multiple times. - * That is, it will be called after completion of each response. -**/ -- (void)finishResponse -{ - HTTPLogTrace(); - - // Override me if you want to perform any custom actions after a response has been fully sent. - // This is the place to release memory or resources associated with the last request. - // - // If you override this method, you should take care to invoke [super finishResponse] at some point. - - request = nil; - - httpResponse = nil; - - ranges = nil; - ranges_headers = nil; - ranges_boundry = nil; -} - -/** - * This method is called after each successful response has been fully sent. - * It determines whether the connection should stay open and handle another request. -**/ -- (BOOL)shouldDie -{ - HTTPLogTrace(); - - // Override me if you have any need to force close the connection. - // You may do so by simply returning YES. - // - // If you override this method, you should take care to fall through with [super shouldDie] - // instead of returning NO. - - - BOOL shouldDie = NO; - - NSString *version = [request version]; - if ([version isEqualToString:HTTPVersion1_1]) - { - // HTTP version 1.1 - // Connection should only be closed if request included "Connection: close" header - - NSString *connection = [request headerField:@"Connection"]; - - shouldDie = (connection && ([connection caseInsensitiveCompare:@"close"] == NSOrderedSame)); - } - else if ([version isEqualToString:HTTPVersion1_0]) - { - // HTTP version 1.0 - // Connection should be closed unless request included "Connection: Keep-Alive" header - - NSString *connection = [request headerField:@"Connection"]; - - if (connection == nil) - shouldDie = YES; - else - shouldDie = [connection caseInsensitiveCompare:@"Keep-Alive"] != NSOrderedSame; - } - - return shouldDie; -} - -- (void)die -{ - HTTPLogTrace(); - - // Override me if you want to perform any custom actions when a connection is closed. - // Then call [super die] when you're done. - // - // See also the finishResponse method. - // - // Important: There is a rare timing condition where this method might get invoked twice. - // If you override this method, you should be prepared for this situation. - - // Inform the http response that we're done - if ([httpResponse respondsToSelector:@selector(connectionDidClose)]) - { - [httpResponse connectionDidClose]; - } - - // Release the http response so we don't call it's connectionDidClose method again in our dealloc method - httpResponse = nil; - - // Post notification of dead connection - // This will allow our server to release us from its array of connections - [[NSNotificationCenter defaultCenter] postNotificationName:HTTPConnectionDidDieNotification object:self]; -} - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation HTTPConfig - -@synthesize server; -@synthesize documentRoot; -@synthesize queue; - -- (id)initWithServer:(HTTPServer *)aServer documentRoot:(NSString *)aDocumentRoot -{ - if ((self = [super init])) - { - server = aServer; - documentRoot = aDocumentRoot; - } - return self; -} - -- (id)initWithServer:(HTTPServer *)aServer documentRoot:(NSString *)aDocumentRoot queue:(dispatch_queue_t)q -{ - if ((self = [super init])) - { - server = aServer; - - documentRoot = [aDocumentRoot stringByStandardizingPath]; - if ([documentRoot hasSuffix:@"/"]) - { - documentRoot = [documentRoot stringByAppendingString:@"/"]; - } - - if (q) - { - queue = q; - #if !OS_OBJECT_USE_OBJC - dispatch_retain(queue); - #endif - } - } - return self; -} - -- (void)dealloc -{ - #if !OS_OBJECT_USE_OBJC - if (queue) dispatch_release(queue); - #endif -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/HTTPLogging.h b/YuMi/Tools/CocoaHttpServer/Core/HTTPLogging.h deleted file mode 100755 index 55b7c6b..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/HTTPLogging.h +++ /dev/null @@ -1,136 +0,0 @@ -/** - * In order to provide fast and flexible logging, this project uses Cocoa Lumberjack. - * - * The Google Code page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * Here's what you need to know concerning how logging is setup for CocoaHTTPServer: - * - * There are 4 log levels: - * - Error - * - Warning - * - Info - * - Verbose - * - * In addition to this, there is a Trace flag that can be enabled. - * When tracing is enabled, it spits out the methods that are being called. - * - * Please note that tracing is separate from the log levels. - * For example, one could set the log level to warning, and enable tracing. - * - * All logging is asynchronous, except errors. - * To use logging within your own custom files, follow the steps below. - * - * Step 1: - * Import this header in your implementation file: - * - * #import "HTTPLogging.h" - * - * Step 2: - * Define your logging level in your implementation file: - * - * // Log levels: off, error, warn, info, verbose - * static const int httpLogLevel = HTTP_LOG_LEVEL_VERBOSE; - * - * If you wish to enable tracing, you could do something like this: - * - * // Debug levels: off, error, warn, info, verbose - * static const int httpLogLevel = HTTP_LOG_LEVEL_INFO | HTTP_LOG_FLAG_TRACE; - * - * Step 3: - * Replace your NSLog statements with HTTPLog statements according to the severity of the message. - * - * NSLog(@"Fatal error, no dohickey found!"); -> HTTPLogError(@"Fatal error, no dohickey found!"); - * - * HTTPLog works exactly the same as NSLog. - * This means you can pass it multiple variables just like NSLog. -**/ - -#import "DDLog.h" - -// Define logging context for every log message coming from the HTTP server. -// The logging context can be extracted from the DDLogMessage from within the logging framework, -// which gives loggers, formatters, and filters the ability to optionally process them differently. - -#define HTTP_LOG_CONTEXT 80 - -// Configure log levels. - -#define HTTP_LOG_FLAG_ERROR (1 << 0) // 0...00001 -#define HTTP_LOG_FLAG_WARN (1 << 1) // 0...00010 -#define HTTP_LOG_FLAG_INFO (1 << 2) // 0...00100 -#define HTTP_LOG_FLAG_VERBOSE (1 << 3) // 0...01000 - -#define HTTP_LOG_LEVEL_OFF 0 // 0...00000 -#define HTTP_LOG_LEVEL_ERROR (HTTP_LOG_LEVEL_OFF | HTTP_LOG_FLAG_ERROR) // 0...00001 -#define HTTP_LOG_LEVEL_WARN (HTTP_LOG_LEVEL_ERROR | HTTP_LOG_FLAG_WARN) // 0...00011 -#define HTTP_LOG_LEVEL_INFO (HTTP_LOG_LEVEL_WARN | HTTP_LOG_FLAG_INFO) // 0...00111 -#define HTTP_LOG_LEVEL_VERBOSE (HTTP_LOG_LEVEL_INFO | HTTP_LOG_FLAG_VERBOSE) // 0...01111 - -// Setup fine grained logging. -// The first 4 bits are being used by the standard log levels (0 - 3) -// -// We're going to add tracing, but NOT as a log level. -// Tracing can be turned on and off independently of log level. - -#define HTTP_LOG_FLAG_TRACE (1 << 4) // 0...10000 - -// Setup the usual boolean macros. - -#define HTTP_LOG_ERROR (httpLogLevel & HTTP_LOG_FLAG_ERROR) -#define HTTP_LOG_WARN (httpLogLevel & HTTP_LOG_FLAG_WARN) -#define HTTP_LOG_INFO (httpLogLevel & HTTP_LOG_FLAG_INFO) -#define HTTP_LOG_VERBOSE (httpLogLevel & HTTP_LOG_FLAG_VERBOSE) -#define HTTP_LOG_TRACE (httpLogLevel & HTTP_LOG_FLAG_TRACE) - -// Configure asynchronous logging. -// We follow the default configuration, -// but we reserve a special macro to easily disable asynchronous logging for debugging purposes. - -#define HTTP_LOG_ASYNC_ENABLED YES - -#define HTTP_LOG_ASYNC_ERROR ( NO && HTTP_LOG_ASYNC_ENABLED) -#define HTTP_LOG_ASYNC_WARN (YES && HTTP_LOG_ASYNC_ENABLED) -#define HTTP_LOG_ASYNC_INFO (YES && HTTP_LOG_ASYNC_ENABLED) -#define HTTP_LOG_ASYNC_VERBOSE (YES && HTTP_LOG_ASYNC_ENABLED) -#define HTTP_LOG_ASYNC_TRACE (YES && HTTP_LOG_ASYNC_ENABLED) - -// Define logging primitives. - -#define HTTPLogError(frmt, ...) LOG_OBJC_MAYBE(HTTP_LOG_ASYNC_ERROR, httpLogLevel, HTTP_LOG_FLAG_ERROR, \ - HTTP_LOG_CONTEXT, frmt, ##__VA_ARGS__) - -#define HTTPLogWarn(frmt, ...) LOG_OBJC_MAYBE(HTTP_LOG_ASYNC_WARN, httpLogLevel, HTTP_LOG_FLAG_WARN, \ - HTTP_LOG_CONTEXT, frmt, ##__VA_ARGS__) - -#define HTTPLogInfo(frmt, ...) LOG_OBJC_MAYBE(HTTP_LOG_ASYNC_INFO, httpLogLevel, HTTP_LOG_FLAG_INFO, \ - HTTP_LOG_CONTEXT, frmt, ##__VA_ARGS__) - -#define HTTPLogVerbose(frmt, ...) LOG_OBJC_MAYBE(HTTP_LOG_ASYNC_VERBOSE, httpLogLevel, HTTP_LOG_FLAG_VERBOSE, \ - HTTP_LOG_CONTEXT, frmt, ##__VA_ARGS__) - -#define HTTPLogTrace() LOG_OBJC_MAYBE(HTTP_LOG_ASYNC_TRACE, httpLogLevel, HTTP_LOG_FLAG_TRACE, \ - HTTP_LOG_CONTEXT, @"%@[%p]: %@", THIS_FILE, self, THIS_METHOD) - -#define HTTPLogTrace2(frmt, ...) LOG_OBJC_MAYBE(HTTP_LOG_ASYNC_TRACE, httpLogLevel, HTTP_LOG_FLAG_TRACE, \ - HTTP_LOG_CONTEXT, frmt, ##__VA_ARGS__) - - -#define HTTPLogCError(frmt, ...) LOG_C_MAYBE(HTTP_LOG_ASYNC_ERROR, httpLogLevel, HTTP_LOG_FLAG_ERROR, \ - HTTP_LOG_CONTEXT, frmt, ##__VA_ARGS__) - -#define HTTPLogCWarn(frmt, ...) LOG_C_MAYBE(HTTP_LOG_ASYNC_WARN, httpLogLevel, HTTP_LOG_FLAG_WARN, \ - HTTP_LOG_CONTEXT, frmt, ##__VA_ARGS__) - -#define HTTPLogCInfo(frmt, ...) LOG_C_MAYBE(HTTP_LOG_ASYNC_INFO, httpLogLevel, HTTP_LOG_FLAG_INFO, \ - HTTP_LOG_CONTEXT, frmt, ##__VA_ARGS__) - -#define HTTPLogCVerbose(frmt, ...) LOG_C_MAYBE(HTTP_LOG_ASYNC_VERBOSE, httpLogLevel, HTTP_LOG_FLAG_VERBOSE, \ - HTTP_LOG_CONTEXT, frmt, ##__VA_ARGS__) - -#define HTTPLogCTrace() LOG_C_MAYBE(HTTP_LOG_ASYNC_TRACE, httpLogLevel, HTTP_LOG_FLAG_TRACE, \ - HTTP_LOG_CONTEXT, @"%@[%p]: %@", THIS_FILE, self, __FUNCTION__) - -#define HTTPLogCTrace2(frmt, ...) LOG_C_MAYBE(HTTP_LOG_ASYNC_TRACE, httpLogLevel, HTTP_LOG_FLAG_TRACE, \ - HTTP_LOG_CONTEXT, frmt, ##__VA_ARGS__) - diff --git a/YuMi/Tools/CocoaHttpServer/Core/HTTPMessage.h b/YuMi/Tools/CocoaHttpServer/Core/HTTPMessage.h deleted file mode 100755 index 68f9762..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/HTTPMessage.h +++ /dev/null @@ -1,48 +0,0 @@ -/** - * The HTTPMessage class is a simple Objective-C wrapper around Apple's CFHTTPMessage class. -**/ - -#import - -#if TARGET_OS_IPHONE - // Note: You may need to add the CFNetwork Framework to your project - #import -#endif - -#define HTTPVersion1_0 ((NSString *)kCFHTTPVersion1_0) -#define HTTPVersion1_1 ((NSString *)kCFHTTPVersion1_1) - - -@interface HTTPMessage : NSObject -{ - CFHTTPMessageRef message; -} - -- (id)initEmptyRequest; - -- (id)initRequestWithMethod:(NSString *)method URL:(NSURL *)url version:(NSString *)version; - -- (id)initResponseWithStatusCode:(NSInteger)code description:(NSString *)description version:(NSString *)version; - -- (BOOL)appendData:(NSData *)data; - -- (BOOL)isHeaderComplete; - -- (NSString *)version; - -- (NSString *)method; -- (NSURL *)url; - -- (NSInteger)statusCode; - -- (NSDictionary *)allHeaderFields; -- (NSString *)headerField:(NSString *)headerField; - -- (void)setHeaderField:(NSString *)headerField value:(NSString *)headerFieldValue; - -- (NSData *)messageData; - -- (NSData *)body; -- (void)setBody:(NSData *)body; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/HTTPMessage.m b/YuMi/Tools/CocoaHttpServer/Core/HTTPMessage.m deleted file mode 100755 index e2c7e00..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/HTTPMessage.m +++ /dev/null @@ -1,113 +0,0 @@ -#import "HTTPMessage.h" - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - - -@implementation HTTPMessage - -- (id)initEmptyRequest -{ - if ((self = [super init])) - { - message = CFHTTPMessageCreateEmpty(NULL, YES); - } - return self; -} - -- (id)initRequestWithMethod:(NSString *)method URL:(NSURL *)url version:(NSString *)version -{ - if ((self = [super init])) - { - message = CFHTTPMessageCreateRequest(NULL, - (__bridge CFStringRef)method, - (__bridge CFURLRef)url, - (__bridge CFStringRef)version); - } - return self; -} - -- (id)initResponseWithStatusCode:(NSInteger)code description:(NSString *)description version:(NSString *)version -{ - if ((self = [super init])) - { - message = CFHTTPMessageCreateResponse(NULL, - (CFIndex)code, - (__bridge CFStringRef)description, - (__bridge CFStringRef)version); - } - return self; -} - -- (void)dealloc -{ - if (message) - { - CFRelease(message); - } -} - -- (BOOL)appendData:(NSData *)data -{ - return CFHTTPMessageAppendBytes(message, [data bytes], [data length]); -} - -- (BOOL)isHeaderComplete -{ - return CFHTTPMessageIsHeaderComplete(message); -} - -- (NSString *)version -{ - return (__bridge_transfer NSString *)CFHTTPMessageCopyVersion(message); -} - -- (NSString *)method -{ - return (__bridge_transfer NSString *)CFHTTPMessageCopyRequestMethod(message); -} - -- (NSURL *)url -{ - return (__bridge_transfer NSURL *)CFHTTPMessageCopyRequestURL(message); -} - -- (NSInteger)statusCode -{ - return (NSInteger)CFHTTPMessageGetResponseStatusCode(message); -} - -- (NSDictionary *)allHeaderFields -{ - return (__bridge_transfer NSDictionary *)CFHTTPMessageCopyAllHeaderFields(message); -} - -- (NSString *)headerField:(NSString *)headerField -{ - return (__bridge_transfer NSString *)CFHTTPMessageCopyHeaderFieldValue(message, (__bridge CFStringRef)headerField); -} - -- (void)setHeaderField:(NSString *)headerField value:(NSString *)headerFieldValue -{ - CFHTTPMessageSetHeaderFieldValue(message, - (__bridge CFStringRef)headerField, - (__bridge CFStringRef)headerFieldValue); -} - -- (NSData *)messageData -{ - return (__bridge_transfer NSData *)CFHTTPMessageCopySerializedMessage(message); -} - -- (NSData *)body -{ - return (__bridge_transfer NSData *)CFHTTPMessageCopyBody(message); -} - -- (void)setBody:(NSData *)body -{ - CFHTTPMessageSetBody(message, (__bridge CFDataRef)body); -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/HTTPResponse.h b/YuMi/Tools/CocoaHttpServer/Core/HTTPResponse.h deleted file mode 100755 index d72cd05..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/HTTPResponse.h +++ /dev/null @@ -1,149 +0,0 @@ -#import - - -@protocol HTTPResponse - -/** - * Returns the length of the data in bytes. - * If you don't know the length in advance, implement the isChunked method and have it return YES. -**/ -- (UInt64)contentLength; - -/** - * The HTTP server supports range requests in order to allow things like - * file download resumption and optimized streaming on mobile devices. -**/ -- (UInt64)offset; -- (void)setOffset:(UInt64)offset; - -/** - * Returns the data for the response. - * You do not have to return data of the exact length that is given. - * You may optionally return data of a lesser length. - * However, you must never return data of a greater length than requested. - * Doing so could disrupt proper support for range requests. - * - * To support asynchronous responses, read the discussion at the bottom of this header. -**/ -- (NSData *)readDataOfLength:(NSUInteger)length; - -/** - * Should only return YES after the HTTPConnection has read all available data. - * That is, all data for the response has been returned to the HTTPConnection via the readDataOfLength method. -**/ -- (BOOL)isDone; - -@optional - -/** - * If you need time to calculate any part of the HTTP response headers (status code or header fields), - * this method allows you to delay sending the headers so that you may asynchronously execute the calculations. - * Simply implement this method and return YES until you have everything you need concerning the headers. - * - * This method ties into the asynchronous response architecture of the HTTPConnection. - * You should read the full discussion at the bottom of this header. - * - * If you return YES from this method, - * the HTTPConnection will wait for you to invoke the responseHasAvailableData method. - * After you do, the HTTPConnection will again invoke this method to see if the response is ready to send the headers. - * - * You should only delay sending the headers until you have everything you need concerning just the headers. - * Asynchronously generating the body of the response is not an excuse to delay sending the headers. - * Instead you should tie into the asynchronous response architecture, and use techniques such as the isChunked method. - * - * Important: You should read the discussion at the bottom of this header. -**/ -- (BOOL)delayResponseHeaders; - -/** - * Status code for response. - * Allows for responses such as redirect (301), etc. -**/ -- (NSInteger)status; - -/** - * If you want to add any extra HTTP headers to the response, - * simply return them in a dictionary in this method. -**/ -- (NSDictionary *)httpHeaders; - -/** - * If you don't know the content-length in advance, - * implement this method in your custom response class and return YES. - * - * Important: You should read the discussion at the bottom of this header. -**/ -- (BOOL)isChunked; - -/** - * This method is called from the HTTPConnection class when the connection is closed, - * or when the connection is finished with the response. - * If your response is asynchronous, you should implement this method so you know not to - * invoke any methods on the HTTPConnection after this method is called (as the connection may be deallocated). -**/ -- (void)connectionDidClose; - -@end - - -/** - * Important notice to those implementing custom asynchronous and/or chunked responses: - * - * HTTPConnection supports asynchronous responses. All you have to do in your custom response class is - * asynchronously generate the response, and invoke HTTPConnection's responseHasAvailableData method. - * You don't have to wait until you have all of the response ready to invoke this method. For example, if you - * generate the response in incremental chunks, you could call responseHasAvailableData after generating - * each chunk. Please see the HTTPAsyncFileResponse class for an example of how to do this. - * - * The normal flow of events for an HTTPConnection while responding to a request is like this: - * - Send http resopnse headers - * - Get data from response via readDataOfLength method. - * - Add data to asyncSocket's write queue. - * - Wait for asyncSocket to notify it that the data has been sent. - * - Get more data from response via readDataOfLength method. - * - ... continue this cycle until the entire response has been sent. - * - * With an asynchronous response, the flow is a little different. - * - * First the HTTPResponse is given the opportunity to postpone sending the HTTP response headers. - * This allows the response to asynchronously execute any code needed to calculate a part of the header. - * An example might be the response needs to generate some custom header fields, - * or perhaps the response needs to look for a resource on network-attached storage. - * Since the network-attached storage may be slow, the response doesn't know whether to send a 200 or 404 yet. - * In situations such as this, the HTTPResponse simply implements the delayResponseHeaders method and returns YES. - * After returning YES from this method, the HTTPConnection will wait until the response invokes its - * responseHasAvailableData method. After this occurs, the HTTPConnection will again query the delayResponseHeaders - * method to see if the response is ready to send the headers. - * This cycle will continue until the delayResponseHeaders method returns NO. - * - * You should only delay sending the response headers until you have everything you need concerning just the headers. - * Asynchronously generating the body of the response is not an excuse to delay sending the headers. - * - * After the response headers have been sent, the HTTPConnection calls your readDataOfLength method. - * You may or may not have any available data at this point. If you don't, then simply return nil. - * You should later invoke HTTPConnection's responseHasAvailableData when you have data to send. - * - * You don't have to keep track of when you return nil in the readDataOfLength method, or how many times you've invoked - * responseHasAvailableData. Just simply call responseHasAvailableData whenever you've generated new data, and - * return nil in your readDataOfLength whenever you don't have any available data in the requested range. - * HTTPConnection will automatically detect when it should be requesting new data and will act appropriately. - * - * It's important that you also keep in mind that the HTTP server supports range requests. - * The setOffset method is mandatory, and should not be ignored. - * Make sure you take into account the offset within the readDataOfLength method. - * You should also be aware that the HTTPConnection automatically sorts any range requests. - * So if your setOffset method is called with a value of 100, then you can safely release bytes 0-99. - * - * HTTPConnection can also help you keep your memory footprint small. - * Imagine you're dynamically generating a 10 MB response. You probably don't want to load all this data into - * RAM, and sit around waiting for HTTPConnection to slowly send it out over the network. All you need to do - * is pay attention to when HTTPConnection requests more data via readDataOfLength. This is because HTTPConnection - * will never allow asyncSocket's write queue to get much bigger than READ_CHUNKSIZE bytes. You should - * consider how you might be able to take advantage of this fact to generate your asynchronous response on demand, - * while at the same time keeping your memory footprint small, and your application lightning fast. - * - * If you don't know the content-length in advanced, you should also implement the isChunked method. - * This means the response will not include a Content-Length header, and will instead use "Transfer-Encoding: chunked". - * There's a good chance that if your response is asynchronous and dynamic, it's also chunked. - * If your response is chunked, you don't need to worry about range requests. -**/ diff --git a/YuMi/Tools/CocoaHttpServer/Core/HTTPServer.h b/YuMi/Tools/CocoaHttpServer/Core/HTTPServer.h deleted file mode 100755 index e907389..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/HTTPServer.h +++ /dev/null @@ -1,215 +0,0 @@ -#import -#import "MyHTTPConnection.h" -@class GCDAsyncSocket; -@class WebSocket; - -#if TARGET_OS_IPHONE - #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 40000 // iPhone 4.0 - #define IMPLEMENTED_PROTOCOLS - #else - #define IMPLEMENTED_PROTOCOLS - #endif -#else - #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 // Mac OS X 10.6 - #define IMPLEMENTED_PROTOCOLS - #else - #define IMPLEMENTED_PROTOCOLS - #endif -#endif - - -@interface HTTPServer : NSObject IMPLEMENTED_PROTOCOLS -{ - // Underlying asynchronous TCP/IP socket - GCDAsyncSocket *asyncSocket; - - // Dispatch queues - dispatch_queue_t serverQueue; - dispatch_queue_t connectionQueue; - void *IsOnServerQueueKey; - void *IsOnConnectionQueueKey; - - // HTTP server configuration - NSString *documentRoot; - Class connectionClass; - NSString *interface; - UInt32 port; - - // NSNetService and related variables - NSNetService *netService; - NSString *domain; - NSString *type; - NSString *name; - NSString *publishedName; - NSDictionary *txtRecordDictionary; - - // Connection management - NSMutableArray *connections; - NSMutableArray *webSockets; - NSLock *connectionsLock; - NSLock *webSocketsLock; - - BOOL isRunning; -} - -/** - * Specifies the document root to serve files from. - * For example, if you set this to "/Users//Sites", - * then it will serve files out of the local Sites directory (including subdirectories). - * - * The default value is nil. - * The default server configuration will not serve any files until this is set. - * - * If you change the documentRoot while the server is running, - * the change will affect future incoming http connections. -**/ -- (NSString *)documentRoot; -- (void)setDocumentRoot:(NSString *)value; - -/** - * The connection class is the class used to handle incoming HTTP connections. - * - * The default value is [HTTPConnection class]. - * You can override HTTPConnection, and then set this to [MyHTTPConnection class]. - * - * If you change the connectionClass while the server is running, - * the change will affect future incoming http connections. -**/ -- (Class)connectionClass; -- (void)setConnectionClass:(Class)value; - -/** - * Set what interface you'd like the server to listen on. - * By default this is nil, which causes the server to listen on all available interfaces like en1, wifi etc. - * - * The interface may be specified by name (e.g. "en1" or "lo0") or by IP address (e.g. "192.168.4.34"). - * You may also use the special strings "localhost" or "loopback" to specify that - * the socket only accept connections from the local machine. -**/ -- (NSString *)interface; -- (void)setInterface:(NSString *)value; - -/** - * The port number to run the HTTP server on. - * - * The default port number is zero, meaning the server will automatically use any available port. - * This is the recommended port value, as it avoids possible port conflicts with other applications. - * Technologies such as Bonjour can be used to allow other applications to automatically discover the port number. - * - * Note: As is common on most OS's, you need root privledges to bind to port numbers below 1024. - * - * You can change the port property while the server is running, but it won't affect the running server. - * To actually change the port the server is listening for connections on you'll need to restart the server. - * - * The listeningPort method will always return the port number the running server is listening for connections on. - * If the server is not running this method returns 0. -**/ -- (UInt32)port; -- (UInt32)listeningPort; -- (void)setPort:(UInt32)value; - -/** - * Bonjour domain for publishing the service. - * The default value is "local.". - * - * Note: Bonjour publishing requires you set a type. - * - * If you change the domain property after the bonjour service has already been published (server already started), - * you'll need to invoke the republishBonjour method to update the broadcasted bonjour service. -**/ -- (NSString *)domain; -- (void)setDomain:(NSString *)value; - -/** - * Bonjour name for publishing the service. - * The default value is "". - * - * If using an empty string ("") for the service name when registering, - * the system will automatically use the "Computer Name". - * Using an empty string will also handle name conflicts - * by automatically appending a digit to the end of the name. - * - * Note: Bonjour publishing requires you set a type. - * - * If you change the name after the bonjour service has already been published (server already started), - * you'll need to invoke the republishBonjour method to update the broadcasted bonjour service. - * - * The publishedName method will always return the actual name that was published via the bonjour service. - * If the service is not running this method returns nil. -**/ -- (NSString *)name; -- (NSString *)publishedName; -- (void)setName:(NSString *)value; - -/** - * Bonjour type for publishing the service. - * The default value is nil. - * The service will not be published via bonjour unless the type is set. - * - * If you wish to publish the service as a traditional HTTP server, you should set the type to be "_http._tcp.". - * - * If you change the type after the bonjour service has already been published (server already started), - * you'll need to invoke the republishBonjour method to update the broadcasted bonjour service. -**/ -- (NSString *)type; -- (void)setType:(NSString *)value; - -/** - * Republishes the service via bonjour if the server is running. - * If the service was not previously published, this method will publish it (if the server is running). -**/ -- (void)republishBonjour; - -/** - * -**/ -- (NSDictionary *)TXTRecordDictionary; -- (void)setTXTRecordDictionary:(NSDictionary *)dict; - -/** - * Attempts to starts the server on the configured port, interface, etc. - * - * If an error occurs, this method returns NO and sets the errPtr (if given). - * Otherwise returns YES on success. - * - * Some examples of errors that might occur: - * - You specified the server listen on a port which is already in use by another application. - * - You specified the server listen on a port number below 1024, which requires root priviledges. - * - * Code Example: - * - * NSError *err = nil; - * if (![httpServer start:&err]) - * { - * NSLog(@"Error starting http server: %@", err); - * } -**/ -- (BOOL)start:(NSError **)errPtr; - -/** - * Stops the server, preventing it from accepting any new connections. - * You may specify whether or not you want to close the existing client connections. - * - * The default stop method (with no arguments) will close any existing connections. (It invokes [self stop:NO]) -**/ -- (void)stop; -- (void)stop:(BOOL)keepExistingConnections; - -- (BOOL)isRunning; - -- (void)addWebSocket:(WebSocket *)ws; - -- (NSUInteger)numberOfHTTPConnections; -- (NSUInteger)numberOfWebSocketConnections; - -/** - Get the connections in the httpserver - - @return the connections with array - */ -- (NSMutableArray *)getConnectionsInServer; - -///添加代理使用 -@property (nonatomic,weak) UIViewController * viewcontroller; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/HTTPServer.m b/YuMi/Tools/CocoaHttpServer/Core/HTTPServer.m deleted file mode 100755 index 533b481..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/HTTPServer.m +++ /dev/null @@ -1,781 +0,0 @@ -#import "HTTPServer.h" -#import "GCDAsyncSocket.h" -#import "HTTPConnection.h" -#import "WebSocket.h" -#import "HTTPLogging.h" -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -// Log levels: off, error, warn, info, verbose -// Other flags: trace -static const int httpLogLevel = HTTP_LOG_LEVEL_INFO; // | HTTP_LOG_FLAG_TRACE; - -@interface HTTPServer (PrivateAPI) - -- (void)unpublishBonjour; -- (void)publishBonjour; - -+ (void)startBonjourThreadIfNeeded; -+ (void)performBonjourBlock:(dispatch_block_t)block; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation HTTPServer - -/** - * Standard Constructor. - * Instantiates an HTTP server, but does not start it. -**/ -- (id)init -{ - if ((self = [super init])) - { - HTTPLogTrace(); - - // Setup underlying dispatch queues - serverQueue = dispatch_queue_create("HTTPServer", NULL); - connectionQueue = dispatch_queue_create("HTTPConnection", NULL); - - IsOnServerQueueKey = &IsOnServerQueueKey; - IsOnConnectionQueueKey = &IsOnConnectionQueueKey; - - void *nonNullUnusedPointer = (__bridge void *)self; // Whatever, just not null - - dispatch_queue_set_specific(serverQueue, IsOnServerQueueKey, nonNullUnusedPointer, NULL); - dispatch_queue_set_specific(connectionQueue, IsOnConnectionQueueKey, nonNullUnusedPointer, NULL); - - // Initialize underlying GCD based tcp socket - asyncSocket = [[GCDAsyncSocket alloc] initWithDelegate:self delegateQueue:serverQueue]; - - // Use default connection class of HTTPConnection - connectionClass = [HTTPConnection self]; - - // By default bind on all available interfaces, en1, wifi etc - interface = nil; - - // Use a default port of 0 - // This will allow the kernel to automatically pick an open port for us - port = 0; - // port = 12306; - // Configure default values for bonjour service - - // Bonjour domain. Use the local domain by default - domain = @"local."; - - // If using an empty string ("") for the service name when registering, - // the system will automatically use the "Computer Name". - // Passing in an empty string will also handle name conflicts - // by automatically appending a digit to the end of the name. - name = @""; - - // Initialize arrays to hold all the HTTP and webSocket connections - connections = [[NSMutableArray alloc] init]; - webSockets = [[NSMutableArray alloc] init]; - - connectionsLock = [[NSLock alloc] init]; - webSocketsLock = [[NSLock alloc] init]; - - // Register for notifications of closed connections - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(connectionDidDie:) - name:HTTPConnectionDidDieNotification - object:nil]; - - // Register for notifications of closed websocket connections - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(webSocketDidDie:) - name:WebSocketDidDieNotification - object:nil]; - - isRunning = NO; - } - return self; -} - -/** - * Standard Deconstructor. - * Stops the server, and clients, and releases any resources connected with this instance. -**/ -- (void)dealloc -{ - HTTPLogTrace(); - - // Remove notification observer - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - // Stop the server if it's running - [self stop]; - - // Release all instance variables - - #if !OS_OBJECT_USE_OBJC - dispatch_release(serverQueue); - dispatch_release(connectionQueue); - #endif - - [asyncSocket setDelegate:nil delegateQueue:NULL]; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Server Configuration -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * The document root is filesystem root for the webserver. - * Thus requests for /index.html will be referencing the index.html file within the document root directory. - * All file requests are relative to this document root. -**/ -- (NSString *)documentRoot -{ - __block NSString *result; - - dispatch_sync(serverQueue, ^{ - result = documentRoot; - }); - - return result; -} - -- (void)setDocumentRoot:(NSString *)value -{ - HTTPLogTrace(); - - // Document root used to be of type NSURL. - // Add type checking for early warning to developers upgrading from older versions. - - if (value && ![value isKindOfClass:[NSString class]]) - { - HTTPLogWarn(@"%@: %@ - Expecting NSString parameter, received %@ parameter", - THIS_FILE, THIS_METHOD, NSStringFromClass([value class])); - return; - } - - NSString *valueCopy = [value copy]; - - dispatch_async(serverQueue, ^{ - documentRoot = valueCopy; - }); - -} - -/** - * The connection class is the class that will be used to handle connections. - * That is, when a new connection is created, an instance of this class will be intialized. - * The default connection class is HTTPConnection. - * If you use a different connection class, it is assumed that the class extends HTTPConnection -**/ -- (Class)connectionClass -{ - __block Class result; - - dispatch_sync(serverQueue, ^{ - result = connectionClass; - }); - - return result; -} - -- (void)setConnectionClass:(Class)value -{ - HTTPLogTrace(); - - dispatch_async(serverQueue, ^{ - connectionClass = value; - }); -} - -/** - * What interface to bind the listening socket to. -**/ -- (NSString *)interface -{ - __block NSString *result; - - dispatch_sync(serverQueue, ^{ - result = interface; - }); - - return result; -} - -- (void)setInterface:(NSString *)value -{ - NSString *valueCopy = [value copy]; - - dispatch_async(serverQueue, ^{ - interface = valueCopy; - }); - -} - -/** - * The port to listen for connections on. - * By default this port is initially set to zero, which allows the kernel to pick an available port for us. - * After the HTTP server has started, the port being used may be obtained by this method. -**/ -- (UInt32)port -{ - __block UInt32 result; - - dispatch_sync(serverQueue, ^{ - result = port; - // result = 12306; - }); - - return result; -} - -- (UInt32)listeningPort -{ - __block UInt32 result; - - dispatch_sync(serverQueue, ^{ - if (isRunning) - result = [asyncSocket localPort]; - else - result = 0; - // result = 12306; - }); - - return result; -} - -- (void)setPort:(UInt32)value -{ - HTTPLogTrace(); - - dispatch_async(serverQueue, ^{ - port = value; - // port = 12306; - }); -} - -/** - * Domain on which to broadcast this service via Bonjour. - * The default domain is @"local". -**/ -- (NSString *)domain -{ - __block NSString *result; - - dispatch_sync(serverQueue, ^{ - result = domain; - }); - - return result; -} - -- (void)setDomain:(NSString *)value -{ - HTTPLogTrace(); - - NSString *valueCopy = [value copy]; - - dispatch_async(serverQueue, ^{ - domain = valueCopy; - }); - -} - -/** - * The name to use for this service via Bonjour. - * The default name is an empty string, - * which should result in the published name being the host name of the computer. -**/ -- (NSString *)name -{ - __block NSString *result; - - dispatch_sync(serverQueue, ^{ - result = name; - }); - - return result; -} - -- (NSString *)publishedName -{ - __block NSString *result; - - dispatch_sync(serverQueue, ^{ - - if (netService == nil) - { - result = nil; - } - else - { - - dispatch_block_t bonjourBlock = ^{ - result = [[netService name] copy]; - }; - - [[self class] performBonjourBlock:bonjourBlock]; - } - }); - - return result; -} - -- (void)setName:(NSString *)value -{ - NSString *valueCopy = [value copy]; - - dispatch_async(serverQueue, ^{ - name = valueCopy; - }); - -} - -/** - * The type of service to publish via Bonjour. - * No type is set by default, and one must be set in order for the service to be published. -**/ -- (NSString *)type -{ - __block NSString *result; - - dispatch_sync(serverQueue, ^{ - result = type; - }); - - return result; -} - -- (void)setType:(NSString *)value -{ - NSString *valueCopy = [value copy]; - - dispatch_async(serverQueue, ^{ - type = valueCopy; - }); - -} - -/** - * The extra data to use for this service via Bonjour. -**/ -- (NSDictionary *)TXTRecordDictionary -{ - __block NSDictionary *result; - - dispatch_sync(serverQueue, ^{ - result = txtRecordDictionary; - }); - - return result; -} - -- (void)setTXTRecordDictionary:(NSDictionary *)value -{ - HTTPLogTrace(); - - NSDictionary *valueCopy = [value copy]; - - dispatch_async(serverQueue, ^{ - - txtRecordDictionary = valueCopy; - - // Update the txtRecord of the netService if it has already been published - if (netService) - { - NSNetService *theNetService = netService; - NSData *txtRecordData = nil; - if (txtRecordDictionary) - txtRecordData = [NSNetService dataFromTXTRecordDictionary:txtRecordDictionary]; - - dispatch_block_t bonjourBlock = ^{ - [theNetService setTXTRecordData:txtRecordData]; - }; - - [[self class] performBonjourBlock:bonjourBlock]; - } - }); - -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Server Control -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (BOOL)start:(NSError **)errPtr -{ - HTTPLogTrace(); - - __block BOOL success = YES; - __block NSError *err = nil; - - dispatch_sync(serverQueue, ^{ @autoreleasepool { - // port = 12306; - success = [asyncSocket acceptOnInterface:interface port:port error:&err]; - if (success) - { - HTTPLogInfo(@"%@: Started HTTP server on port %hu", THIS_FILE, [asyncSocket localPort]); - //HTTPLogInfo(@"%@: Started HTTP server on port %d", THIS_FILE, 12306); - - isRunning = YES; - [self publishBonjour]; - } - else - { - HTTPLogError(@"%@: Failed to start HTTP Server: %@", THIS_FILE, err); - } - }}); - - if (errPtr) - *errPtr = err; - - return success; -} - -- (void)stop -{ - [self stop:NO]; -} - -- (void)stop:(BOOL)keepExistingConnections -{ - HTTPLogTrace(); - - dispatch_sync(serverQueue, ^{ @autoreleasepool { - - // First stop publishing the service via bonjour - [self unpublishBonjour]; - - // Stop listening / accepting incoming connections - [asyncSocket disconnect]; - isRunning = NO; - - if (!keepExistingConnections) - { - // Stop all HTTP connections the server owns - [connectionsLock lock]; - for (HTTPConnection *connection in connections) - { - [connection stop]; - } - [connections removeAllObjects]; - [connectionsLock unlock]; - - // Stop all WebSocket connections the server owns - [webSocketsLock lock]; - for (WebSocket *webSocket in webSockets) - { - [webSocket stop]; - } - [webSockets removeAllObjects]; - [webSocketsLock unlock]; - } - }}); -} - -- (BOOL)isRunning -{ - __block BOOL result; - - dispatch_sync(serverQueue, ^{ - result = isRunning; - }); - - return result; -} - -- (void)addWebSocket:(WebSocket *)ws -{ - [webSocketsLock lock]; - - HTTPLogTrace(); - [webSockets addObject:ws]; - - [webSocketsLock unlock]; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Server Status -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Returns the number of http client connections that are currently connected to the server. -**/ -- (NSUInteger)numberOfHTTPConnections -{ - NSUInteger result = 0; - - [connectionsLock lock]; - result = [connections count]; - [connectionsLock unlock]; - - return result; -} - -/** - * Returns the number of websocket client connections that are currently connected to the server. -**/ -- (NSUInteger)numberOfWebSocketConnections -{ - NSUInteger result = 0; - - [webSocketsLock lock]; - result = [webSockets count]; - [webSocketsLock unlock]; - - return result; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Incoming Connections -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (HTTPConfig *)config -{ - // Override me if you want to provide a custom config to the new connection. - // - // Generally this involves overriding the HTTPConfig class to include any custom settings, - // and then having this method return an instance of 'MyHTTPConfig'. - - // Note: Think you can make the server faster by putting each connection on its own queue? - // Then benchmark it before and after and discover for yourself the shocking truth! - // - // Try the apache benchmark tool (already installed on your Mac): - // $ ab -n 1000 -c 1 http://localhost:/some_path.html - - return [[HTTPConfig alloc] initWithServer:self documentRoot:documentRoot queue:connectionQueue]; -} - -- (void)socket:(GCDAsyncSocket *)sock didAcceptNewSocket:(GCDAsyncSocket *)newSocket -{ - HTTPConnection *newConnection = (HTTPConnection *)[[connectionClass alloc] initWithAsyncSocket:newSocket - configuration:[self config]]; - ((MyHTTPConnection *)newConnection).delegate = self.viewcontroller; - [connectionsLock lock]; - [connections addObject:newConnection]; - [connectionsLock unlock]; - - [newConnection start]; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Bonjour -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (void)publishBonjour -{ - HTTPLogTrace(); - - NSAssert(dispatch_get_specific(IsOnServerQueueKey) != NULL, @"Must be on serverQueue"); - - if (type) - { - netService = [[NSNetService alloc] initWithDomain:domain type:type name:name port:[asyncSocket localPort]]; - // netService = [[NSNetService alloc] initWithDomain:domain type:type name:name port:12306]; - [netService setDelegate:self]; - - NSNetService *theNetService = netService; - NSData *txtRecordData = nil; - if (txtRecordDictionary) - txtRecordData = [NSNetService dataFromTXTRecordDictionary:txtRecordDictionary]; - - dispatch_block_t bonjourBlock = ^{ - - [theNetService removeFromRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; - [theNetService scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes]; - [theNetService publish]; - - // Do not set the txtRecordDictionary prior to publishing!!! - // This will cause the OS to crash!!! - if (txtRecordData) - { - [theNetService setTXTRecordData:txtRecordData]; - } - }; - - [[self class] startBonjourThreadIfNeeded]; - [[self class] performBonjourBlock:bonjourBlock]; - } -} - -- (void)unpublishBonjour -{ - HTTPLogTrace(); - - NSAssert(dispatch_get_specific(IsOnServerQueueKey) != NULL, @"Must be on serverQueue"); - - if (netService) - { - NSNetService *theNetService = netService; - - dispatch_block_t bonjourBlock = ^{ - - [theNetService stop]; - }; - - [[self class] performBonjourBlock:bonjourBlock]; - - netService = nil; - } -} - -/** - * Republishes the service via bonjour if the server is running. - * If the service was not previously published, this method will publish it (if the server is running). -**/ -- (void)republishBonjour -{ - HTTPLogTrace(); - - dispatch_async(serverQueue, ^{ - - [self unpublishBonjour]; - [self publishBonjour]; - }); -} - -/** - * Called when our bonjour service has been successfully published. - * This method does nothing but output a log message telling us about the published service. -**/ -- (void)netServiceDidPublish:(NSNetService *)ns -{ - // Override me to do something here... - // - // Note: This method is invoked on our bonjour thread. - - HTTPLogInfo(@"Bonjour Service Published: domain(%@) type(%@) name(%@)", [ns domain], [ns type], [ns name]); -} - -/** - * Called if our bonjour service failed to publish itself. - * This method does nothing but output a log message telling us about the published service. -**/ -- (void)netService:(NSNetService *)ns didNotPublish:(NSDictionary *)errorDict -{ - // Override me to do something here... - // - // Note: This method in invoked on our bonjour thread. - - HTTPLogWarn(@"Failed to Publish Service: domain(%@) type(%@) name(%@) - %@", - [ns domain], [ns type], [ns name], errorDict); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Notifications -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * This method is automatically called when a notification of type HTTPConnectionDidDieNotification is posted. - * It allows us to remove the connection from our array. -**/ -- (void)connectionDidDie:(NSNotification *)notification -{ - // Note: This method is called on the connection queue that posted the notification - - [connectionsLock lock]; - - HTTPLogTrace(); - [connections removeObject:[notification object]]; - - [connectionsLock unlock]; -} - -/** - * This method is automatically called when a notification of type WebSocketDidDieNotification is posted. - * It allows us to remove the websocket from our array. -**/ -- (void)webSocketDidDie:(NSNotification *)notification -{ - // Note: This method is called on the connection queue that posted the notification - - [webSocketsLock lock]; - - HTTPLogTrace(); - [webSockets removeObject:[notification object]]; - - [webSocketsLock unlock]; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Bonjour Thread -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * NSNetService is runloop based, so it requires a thread with a runloop. - * This gives us two options: - * - * - Use the main thread - * - Setup our own dedicated thread - * - * Since we have various blocks of code that need to synchronously access the netservice objects, - * using the main thread becomes troublesome and a potential for deadlock. -**/ - -static NSThread *bonjourThread; - -+ (void)startBonjourThreadIfNeeded -{ - HTTPLogTrace(); - - static dispatch_once_t predicate; - dispatch_once(&predicate, ^{ - - HTTPLogVerbose(@"%@: Starting bonjour thread...", THIS_FILE); - - bonjourThread = [[NSThread alloc] initWithTarget:self - selector:@selector(bonjourThread) - object:nil]; - [bonjourThread start]; - }); -} - -+ (void)bonjourThread -{ - @autoreleasepool { - - HTTPLogVerbose(@"%@: BonjourThread: Started", THIS_FILE); - - // We can't run the run loop unless it has an associated input source or a timer. - // So we'll just create a timer that will never fire - unless the server runs for 10,000 years. -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wundeclared-selector" - [NSTimer scheduledTimerWithTimeInterval:[[NSDate distantFuture] timeIntervalSinceNow] - target:self - selector:@selector(donothingatall:) - userInfo:nil - repeats:YES]; -#pragma clang diagnostic pop - - [[NSRunLoop currentRunLoop] run]; - - HTTPLogVerbose(@"%@: BonjourThread: Aborted", THIS_FILE); - - } -} - -+ (void)executeBonjourBlock:(dispatch_block_t)block -{ - HTTPLogTrace(); - - NSAssert([NSThread currentThread] == bonjourThread, @"Executed on incorrect thread"); - - block(); -} - -+ (void)performBonjourBlock:(dispatch_block_t)block -{ - HTTPLogTrace(); - - [self performSelector:@selector(executeBonjourBlock:) - onThread:bonjourThread - withObject:block - waitUntilDone:YES]; -} - -- (NSMutableArray *)getConnectionsInServer { - return connections.count > 0 ? connections : [NSMutableArray array]; -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartFormDataParser.h b/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartFormDataParser.h deleted file mode 100755 index 9f12750..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartFormDataParser.h +++ /dev/null @@ -1,65 +0,0 @@ - -#import "MultipartMessageHeader.h" - -/* -Part one: http://tools.ietf.org/html/rfc2045 (Format of Internet Message Bodies) -Part two: http://tools.ietf.org/html/rfc2046 (Media Types) -Part three: http://tools.ietf.org/html/rfc2047 (Message Header Extensions for Non-ASCII Text) -Part four: http://tools.ietf.org/html/rfc4289 (Registration Procedures) -Part five: http://tools.ietf.org/html/rfc2049 (Conformance Criteria and Examples) - -Internet message format: http://tools.ietf.org/html/rfc2822 - -Multipart/form-data http://tools.ietf.org/html/rfc2388 -*/ - -@class MultipartFormDataParser; - -//----------------------------------------------------------------- -// protocol MultipartFormDataParser -//----------------------------------------------------------------- - -@protocol MultipartFormDataParserDelegate -@optional -- (void) processContent:(NSData*) data WithHeader:(MultipartMessageHeader*) header; -- (void) processEndOfPartWithHeader:(MultipartMessageHeader*) header; -- (void) processPreambleData:(NSData*) data; -- (void) processEpilogueData:(NSData*) data; -- (void) processStartOfPartWithHeader:(MultipartMessageHeader*) header; -@end - -//----------------------------------------------------------------- -// interface MultipartFormDataParser -//----------------------------------------------------------------- - -@interface MultipartFormDataParser : NSObject { -NSMutableData* pendingData; - NSData* boundaryData; - MultipartMessageHeader* currentHeader; - - BOOL waitingForCRLF; - BOOL reachedEpilogue; - BOOL processedPreamble; - BOOL checkForContentEnd; - -#if __has_feature(objc_arc_weak) - __weak id delegate; -#else - __unsafe_unretained id delegate; -#endif - int currentEncoding; - NSStringEncoding formEncoding; -} - -- (BOOL) appendData:(NSData*) data; - -- (id) initWithBoundary:(NSString*) boundary formEncoding:(NSStringEncoding) formEncoding; - -#if __has_feature(objc_arc_weak) - @property(weak, readwrite) id delegate; -#else - @property(unsafe_unretained, readwrite) id delegate; -#endif -@property(readwrite) NSStringEncoding formEncoding; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartFormDataParser.m b/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartFormDataParser.m deleted file mode 100755 index 4a19aee..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartFormDataParser.m +++ /dev/null @@ -1,529 +0,0 @@ - -#import "MultipartFormDataParser.h" -#import "DDData.h" -#import "HTTPLogging.h" - -#pragma mark log level - -#ifdef DEBUG -static const int httpLogLevel = HTTP_LOG_LEVEL_WARN; -#else -static const int httpLogLevel = HTTP_LOG_LEVEL_WARN; -#endif - -#ifdef __x86_64__ -#define FMTNSINT "li" -#else -#define FMTNSINT "i" -#endif - - -//----------------------------------------------------------------- -// interface MultipartFormDataParser (private) -//----------------------------------------------------------------- - - -@interface MultipartFormDataParser (private) -+ (NSData*) decodedDataFromData:(NSData*) data encoding:(int) encoding; - -- (int) findHeaderEnd:(NSData*) workingData fromOffset:(int) offset; -- (int) findContentEnd:(NSData*) data fromOffset:(int) offset; - -- (int) numberOfBytesToLeavePendingWithData:(NSData*) data length:(NSUInteger) length encoding:(int) encoding; -- (int) offsetTillNewlineSinceOffset:(int) offset inData:(NSData*) data; - -- (int) processPreamble:(NSData*) workingData; - -@end - - -//----------------------------------------------------------------- -// implementation MultipartFormDataParser -//----------------------------------------------------------------- - - -@implementation MultipartFormDataParser -@synthesize delegate,formEncoding; - -- (id) initWithBoundary:(NSString*) boundary formEncoding:(NSStringEncoding) _formEncoding { - if( nil == (self = [super init]) ){ - return self; - } - if( nil == boundary ) { - HTTPLogWarn(@"MultipartFormDataParser: init with zero boundary"); - return nil; - } - boundaryData = [[@"\r\n--" stringByAppendingString:boundary] dataUsingEncoding:NSASCIIStringEncoding]; - - pendingData = [[NSMutableData alloc] init]; - currentEncoding = contentTransferEncoding_binary; - currentHeader = nil; - - formEncoding = _formEncoding; - reachedEpilogue = NO; - processedPreamble = NO; - - return self; -} - - -- (BOOL) appendData:(NSData *)data { - // Can't parse without boundary; - if( nil == boundaryData ) { - HTTPLogError(@"MultipartFormDataParser: Trying to parse multipart without specifying a valid boundary"); - assert(false); - return NO; - } - NSData* workingData = data; - - if( pendingData.length ) { - [pendingData appendData:data]; - workingData = pendingData; - } - - // the parser saves parse stat in the offset variable, which indicates offset of unhandled part in - // currently received chunk. Before returning, we always drop all data up to offset, leaving - // only unhandled for the next call - - int offset = 0; - - // don't parse data unless its size is greater then boundary length, so we couldn't - // misfind the boundary, if it got split into different data chunks - NSUInteger sizeToLeavePending = boundaryData.length; - - if( !reachedEpilogue && workingData.length <= sizeToLeavePending ) { - // not enough data even to start parsing. - // save to pending data. - if( !pendingData.length ) { - [pendingData appendData:data]; - } - if( checkForContentEnd ) { - if( pendingData.length >= 2 ) { - if( *(uint16_t*)(pendingData.bytes + offset) == 0x2D2D ) { - // we found the multipart end. all coming next is an epilogue. - HTTPLogVerbose(@"MultipartFormDataParser: End of multipart message"); - waitingForCRLF = YES; - reachedEpilogue = YES; - offset+= 2; - } - else { - checkForContentEnd = NO; - waitingForCRLF = YES; - return YES; - } - } else { - return YES; - } - - } - else { - return YES; - } - } - while( true ) { - if( checkForContentEnd ) { - // the flag will be raised to check if the last part was the last one. - if( offset < workingData.length -1 ) { - char* bytes = (char*) workingData.bytes; - if( *(uint16_t*)(bytes + offset) == 0x2D2D ) { - // we found the multipart end. all coming next is an epilogue. - HTTPLogVerbose(@"MultipartFormDataParser: End of multipart message"); - checkForContentEnd = NO; - reachedEpilogue = YES; - // still wait for CRLF, that comes after boundary, but before epilogue. - waitingForCRLF = YES; - offset += 2; - } - else { - // it's not content end, we have to wait till separator line end before next part comes - waitingForCRLF = YES; - checkForContentEnd = NO; - } - } - else { - // we haven't got enough data to check for content end. - // save current unhandled data (it may be 1 byte) to pending and recheck on next chunk received - if( offset < workingData.length ) { - [pendingData setData:[NSData dataWithBytes:workingData.bytes + workingData.length-1 length:1]]; - } - else { - // there is no unhandled data now, wait for more chunks - [pendingData setData:[NSData data]]; - } - return YES; - } - } - if( waitingForCRLF ) { - - // the flag will be raised in the code below, meaning, we've read the boundary, but - // didnt find the end of boundary line yet. - - offset = [self offsetTillNewlineSinceOffset:offset inData:workingData]; - if( -1 == offset ) { - // didnt find the endl again. - if( offset ) { - // we still have to save the unhandled data (maybe it's 1 byte CR) - if( *((char*)workingData.bytes + workingData.length -1) == '\r' ) { - [pendingData setData:[NSData dataWithBytes:workingData.bytes + workingData.length-1 length:1]]; - } - else { - // or save nothing if it wasnt - [pendingData setData:[NSData data]]; - } - } - return YES; - } - waitingForCRLF = NO; - } - if( !processedPreamble ) { - // got to find the first boundary before the actual content begins. - offset = [self processPreamble:workingData]; - // wait for more data for preamble - if( -1 == offset ) - return YES; - // invoke continue to skip newline after boundary. - continue; - } - - if( reachedEpilogue ) { - // parse all epilogue data to delegate. - if( [delegate respondsToSelector:@selector(processEpilogueData:)] ) { - NSData* epilogueData = [NSData dataWithBytesNoCopy: (char*) workingData.bytes + offset length: workingData.length - offset freeWhenDone:NO]; - [delegate processEpilogueData: epilogueData]; - } - return YES; - } - - if( nil == currentHeader ) { - // nil == currentHeader is a state flag, indicating we are waiting for header now. - // whenever part is over, currentHeader is set to nil. - - // try to find CRLFCRLF bytes in the data, which indicates header end. - // we won't parse header parts, as they won't be too large. - int headerEnd = [self findHeaderEnd:workingData fromOffset:offset]; - if( -1 == headerEnd ) { - // didn't recieve the full header yet. - if( !pendingData.length) { - // store the unprocessed data till next chunks come - [pendingData appendBytes:data.bytes + offset length:data.length - offset]; - } - else { - if( offset ) { - // save the current parse state; drop all handled data and save unhandled only. - pendingData = [[NSMutableData alloc] initWithBytes: (char*) workingData.bytes + offset length:workingData.length - offset]; - } - } - return YES; - } - else { - - // let the header parser do it's job from now on. - NSData * headerData = [NSData dataWithBytesNoCopy: (char*) workingData.bytes + offset length:headerEnd + 2 - offset freeWhenDone:NO]; - currentHeader = [[MultipartMessageHeader alloc] initWithData:headerData formEncoding:formEncoding]; - - if( nil == currentHeader ) { - // we've found the data is in wrong format. - HTTPLogError(@"MultipartFormDataParser: MultipartFormDataParser: wrong input format, coulnd't get a valid header"); - return NO; - } - if( [delegate respondsToSelector:@selector(processStartOfPartWithHeader:)] ) { - [delegate processStartOfPartWithHeader:currentHeader]; - } - - HTTPLogVerbose(@"MultipartFormDataParser: MultipartFormDataParser: Retrieved part header."); - } - // skip the two trailing \r\n, in addition to the whole header. - offset = headerEnd + 4; - } - // after we've got the header, we try to - // find the boundary in the data. - int contentEnd = [self findContentEnd:workingData fromOffset:offset]; - - if( contentEnd == -1 ) { - - // this case, we didn't find the boundary, so the data is related to the current part. - // we leave the sizeToLeavePending amount of bytes to make sure we don't include - // boundary part in processed data. - NSUInteger sizeToPass = workingData.length - offset - sizeToLeavePending; - - // if we parse BASE64 encoded data, or Quoted-Printable data, we will make sure we don't break the format - int leaveTrailing = [self numberOfBytesToLeavePendingWithData:data length:sizeToPass encoding:currentEncoding]; - sizeToPass -= leaveTrailing; - - if( sizeToPass <= 0 ) { - // wait for more data! - if( offset ) { - [pendingData setData:[NSData dataWithBytes:(char*) workingData.bytes + offset length:workingData.length - offset]]; - } - return YES; - } - // decode the chunk and let the delegate use it (store in a file, for example) - NSData* decodedData = [MultipartFormDataParser decodedDataFromData:[NSData dataWithBytesNoCopy:(char*)workingData.bytes + offset length:workingData.length - offset - sizeToLeavePending freeWhenDone:NO] encoding:currentEncoding]; - - if( [delegate respondsToSelector:@selector(processContent:WithHeader:)] ) { - HTTPLogVerbose(@"MultipartFormDataParser: Processed %"FMTNSINT" bytes of body",sizeToPass); - - [delegate processContent: decodedData WithHeader:currentHeader]; - } - - // store the unprocessed data till the next chunks come. - [pendingData setData:[NSData dataWithBytes:(char*)workingData.bytes + workingData.length - sizeToLeavePending length:sizeToLeavePending]]; - return YES; - } - else { - - // Here we found the boundary. - // let the delegate process it, and continue going to the next parts. - if( [delegate respondsToSelector:@selector(processContent:WithHeader:)] ) { - [delegate processContent:[NSData dataWithBytesNoCopy:(char*) workingData.bytes + offset length:contentEnd - offset freeWhenDone:NO] WithHeader:currentHeader]; - } - - if( [delegate respondsToSelector:@selector(processEndOfPartWithHeader:)] ){ - [delegate processEndOfPartWithHeader:currentHeader]; - HTTPLogVerbose(@"MultipartFormDataParser: End of body part"); - } - currentHeader = nil; - - // set up offset to continue with the remaining data (if any) - // cast to int because above comment suggests a small number - offset = contentEnd + (int)boundaryData.length; - checkForContentEnd = YES; - // setting the flag tells the parser to skip all the data till CRLF - } - } - return YES; -} - - -//----------------------------------------------------------------- -#pragma mark private methods - -- (int) offsetTillNewlineSinceOffset:(int) offset inData:(NSData*) data { - char* bytes = (char*) data.bytes; - NSUInteger length = data.length; - if( offset >= length - 1 ) - return -1; - - while ( *(uint16_t*)(bytes + offset) != 0x0A0D ) { - // find the trailing \r\n after the boundary. The boundary line might have any number of whitespaces before CRLF, according to rfc2046 - - // in debug, we might also want to know, if the file is somehow misformatted. -#ifdef DEBUG - if( !isspace(*(bytes+offset)) ) { - HTTPLogWarn(@"MultipartFormDataParser: Warning, non-whitespace character '%c' between boundary bytes and CRLF in boundary line",*(bytes+offset) ); - } - if( !isspace(*(bytes+offset+1)) ) { - HTTPLogWarn(@"MultipartFormDataParser: Warning, non-whitespace character '%c' between boundary bytes and CRLF in boundary line",*(bytes+offset+1) ); - } -#endif - offset++; - if( offset >= length ) { - // no endl found within current data - return -1; - } - } - - offset += 2; - return offset; -} - - -- (int) processPreamble:(NSData*) data { - int offset = 0; - - char* boundaryBytes = (char*) boundaryData.bytes + 2; // the first boundary won't have CRLF preceding. - char* dataBytes = (char*) data.bytes; - NSUInteger boundaryLength = boundaryData.length - 2; - NSUInteger dataLength = data.length; - - // find the boundary without leading CRLF. - while( offset < dataLength - boundaryLength +1 ) { - int i; - for( i = 0;i < boundaryLength; i++ ) { - if( boundaryBytes[i] != dataBytes[offset + i] ) - break; - } - if( i == boundaryLength ) { - break; - } - offset++; - } - - if( offset == dataLength ) { - // the end of preamble wasn't found in this chunk - NSUInteger sizeToProcess = dataLength - boundaryLength; - if( sizeToProcess > 0) { - if( [delegate respondsToSelector:@selector(processPreambleData:)] ) { - NSData* preambleData = [NSData dataWithBytesNoCopy: (char*) data.bytes length: data.length - offset - boundaryLength freeWhenDone:NO]; - [delegate processPreambleData:preambleData]; - HTTPLogVerbose(@"MultipartFormDataParser: processed preamble"); - } - pendingData = [NSMutableData dataWithBytes: data.bytes + data.length - boundaryLength length:boundaryLength]; - } - return -1; - } - else { - if ( offset && [delegate respondsToSelector:@selector(processPreambleData:)] ) { - NSData* preambleData = [NSData dataWithBytesNoCopy: (char*) data.bytes length: offset freeWhenDone:NO]; - [delegate processPreambleData:preambleData]; - } - offset +=boundaryLength; - // tells to skip CRLF after the boundary. - processedPreamble = YES; - waitingForCRLF = YES; - } - return offset; -} - - - -- (int) findHeaderEnd:(NSData*) workingData fromOffset:(int)offset { - char* bytes = (char*) workingData.bytes; - NSUInteger inputLength = workingData.length; - uint16_t separatorBytes = 0x0A0D; - - while( true ) { - if(inputLength < offset + 3 ) { - // wait for more data - return -1; - } - if( (*((uint16_t*) (bytes+offset)) == separatorBytes) && (*((uint16_t*) (bytes+offset)+1) == separatorBytes) ) { - return offset; - } - offset++; - } - return -1; -} - - -- (int) findContentEnd:(NSData*) data fromOffset:(int) offset { - char* boundaryBytes = (char*) boundaryData.bytes; - char* dataBytes = (char*) data.bytes; - NSUInteger boundaryLength = boundaryData.length; - NSUInteger dataLength = data.length; - - while( offset < dataLength - boundaryLength +1 ) { - int i; - for( i = 0;i < boundaryLength; i++ ) { - if( boundaryBytes[i] != dataBytes[offset + i] ) - break; - } - if( i == boundaryLength ) { - return offset; - } - offset++; - } - return -1; -} - - -- (int) numberOfBytesToLeavePendingWithData:(NSData*) data length:(int) length encoding:(int) encoding { - // If we have BASE64 or Quoted-Printable encoded data, we have to be sure - // we don't break the format. - int sizeToLeavePending = 0; - - if( encoding == contentTransferEncoding_base64 ) { - char* bytes = (char*) data.bytes; - int i; - for( i = length - 1; i > 0; i++ ) { - if( * (uint16_t*) (bytes + i) == 0x0A0D ) { - break; - } - } - // now we've got to be sure that the length of passed data since last line - // is multiplier of 4. - sizeToLeavePending = (length - i) & ~0x11; // size to leave pending = length-i - (length-i) %4; - return sizeToLeavePending; - } - - if( encoding == contentTransferEncoding_quotedPrintable ) { - // we don't pass more less then 3 bytes anyway. - if( length <= 2 ) - return length; - // check the last bytes to be start of encoded symbol. - const char* bytes = data.bytes + length - 2; - if( bytes[0] == '=' ) - return 2; - if( bytes[1] == '=' ) - return 1; - return 0; - } - return 0; -} - - -//----------------------------------------------------------------- -#pragma mark decoding - - -+ (NSData*) decodedDataFromData:(NSData*) data encoding:(int) encoding { - switch (encoding) { - case contentTransferEncoding_base64: { - return [data base64Decoded]; - } break; - - case contentTransferEncoding_quotedPrintable: { - return [self decodedDataFromQuotedPrintableData:data]; - } break; - - default: { - return data; - } break; - } -} - - -+ (NSData*) decodedDataFromQuotedPrintableData:(NSData *)data { -// http://tools.ietf.org/html/rfc2045#section-6.7 - - const char hex [] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', }; - - NSMutableData* result = [[NSMutableData alloc] initWithLength:data.length]; - const char* bytes = (const char*) data.bytes; - int count = 0; - NSUInteger length = data.length; - while( count < length ) { - if( bytes[count] == '=' ) { - [result appendBytes:bytes length:count]; - bytes = bytes + count + 1; - length -= count + 1; - count = 0; - - if( length < 3 ) { - HTTPLogWarn(@"MultipartFormDataParser: warning, trailing '=' in quoted printable data"); - } - // soft newline - if( bytes[0] == '\r' ) { - bytes += 1; - if(bytes[1] == '\n' ) { - bytes += 2; - } - continue; - } - char encodedByte = 0; - - for( int i = 0; i < sizeof(hex); i++ ) { - if( hex[i] == bytes[0] ) { - encodedByte += i << 4; - } - if( hex[i] == bytes[1] ) { - encodedByte += i; - } - } - [result appendBytes:&encodedByte length:1]; - bytes += 2; - } - -#ifdef DEBUG - if( (unsigned char) bytes[count] > 126 ) { - HTTPLogWarn(@"MultipartFormDataParser: Warning, character with code above 126 appears in quoted printable encoded data"); - } -#endif - - count++; - } - return result; -} - - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeader.h b/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeader.h deleted file mode 100755 index cd43623..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeader.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// MultipartMessagePart.h -// HttpServer -// -// Created by Валерий Гаврилов on 29.03.12. -// Copyright (c) 2012 LLC "Online Publishing Partners" (onlinepp.ru). All rights reserved. -// - -#import - - -//----------------------------------------------------------------- -// interface MultipartMessageHeader -//----------------------------------------------------------------- -enum { - contentTransferEncoding_unknown, - contentTransferEncoding_7bit, - contentTransferEncoding_8bit, - contentTransferEncoding_binary, - contentTransferEncoding_base64, - contentTransferEncoding_quotedPrintable, -}; - -@interface MultipartMessageHeader : NSObject { - NSMutableDictionary* fields; - int encoding; - NSString* contentDispositionName; -} -@property (strong,readonly) NSDictionary* fields; -@property (readonly) int encoding; - -- (id) initWithData:(NSData*) data formEncoding:(NSStringEncoding) encoding; -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeader.m b/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeader.m deleted file mode 100755 index 9d91d46..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeader.m +++ /dev/null @@ -1,86 +0,0 @@ -// -// MultipartMessagePart.m -// HttpServer -// -// Created by Валерий Гаврилов on 29.03.12. -// Copyright (c) 2012 LLC "Online Publishing Partners" (onlinepp.ru). All rights reserved. - -#import "MultipartMessageHeader.h" -#import "MultipartMessageHeaderField.h" - -#import "HTTPLogging.h" - -//----------------------------------------------------------------- -#pragma mark log level - -#ifdef DEBUG -static const int httpLogLevel = HTTP_LOG_LEVEL_WARN; -#else -static const int httpLogLevel = HTTP_LOG_LEVEL_WARN; -#endif - -//----------------------------------------------------------------- -// implementation MultipartMessageHeader -//----------------------------------------------------------------- - - -@implementation MultipartMessageHeader -@synthesize fields,encoding; - - -- (id) initWithData:(NSData *)data formEncoding:(NSStringEncoding) formEncoding { - if( nil == (self = [super init]) ) { - return self; - } - - fields = [[NSMutableDictionary alloc] initWithCapacity:1]; - - // In case encoding is not mentioned, - encoding = contentTransferEncoding_unknown; - - char* bytes = (char*)data.bytes; - NSUInteger length = data.length; - int offset = 0; - - // split header into header fields, separated by \r\n - uint16_t fields_separator = 0x0A0D; // \r\n - while( offset < length - 2 ) { - - // the !isspace condition is to support header unfolding - if( (*(uint16_t*) (bytes+offset) == fields_separator) && ((offset == length - 2) || !(isspace(bytes[offset+2])) )) { - NSData* fieldData = [NSData dataWithBytesNoCopy:bytes length:offset freeWhenDone:NO]; - MultipartMessageHeaderField* field = [[MultipartMessageHeaderField alloc] initWithData: fieldData contentEncoding:formEncoding]; - if( field ) { - [fields setObject:field forKey:field.name]; - HTTPLogVerbose(@"MultipartFormDataParser: Processed Header field '%@'",field.name); - } - else { - NSString* fieldStr = [[NSString alloc] initWithData:fieldData encoding:NSASCIIStringEncoding]; - HTTPLogWarn(@"MultipartFormDataParser: Failed to parse MIME header field. Input ASCII string:%@",fieldStr); - } - - // move to the next header field - bytes += offset + 2; - length -= offset + 2; - offset = 0; - continue; - } - ++ offset; - } - - if( !fields.count ) { - // it was an empty header. - // we have to set default values. - // default header. - [fields setObject:@"text/plain" forKey:@"Content-Type"]; - } - - return self; -} - -- (NSString *)description { - return [NSString stringWithFormat:@"%@",fields]; -} - - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeaderField.h b/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeaderField.h deleted file mode 100755 index 77201ae..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeaderField.h +++ /dev/null @@ -1,23 +0,0 @@ - -#import - -//----------------------------------------------------------------- -// interface MultipartMessageHeaderField -//----------------------------------------------------------------- - -@interface MultipartMessageHeaderField : NSObject { - NSString* name; - NSString* value; - NSMutableDictionary* params; -} - -@property (strong, readonly) NSString* value; -@property (strong, readonly) NSDictionary* params; -@property (strong, readonly) NSString* name; - -//- (id) initWithLine:(NSString*) line; -//- (id) initWithName:(NSString*) paramName value:(NSString*) paramValue; - -- (id) initWithData:(NSData*) data contentEncoding:(NSStringEncoding) encoding; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeaderField.m b/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeaderField.m deleted file mode 100755 index e7c4c01..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Mime/MultipartMessageHeaderField.m +++ /dev/null @@ -1,211 +0,0 @@ - -#import "MultipartMessageHeaderField.h" -#import "HTTPLogging.h" - -//----------------------------------------------------------------- -#pragma mark log level - -#ifdef DEBUG -static const int httpLogLevel = HTTP_LOG_LEVEL_WARN; -#else -static const int httpLogLevel = HTTP_LOG_LEVEL_WARN; -#endif - - -// helpers -int findChar(const char* str,NSUInteger length, char c); -NSString* extractParamValue(const char* bytes, NSUInteger length, NSStringEncoding encoding); - -//----------------------------------------------------------------- -// interface MultipartMessageHeaderField (private) -//----------------------------------------------------------------- - - -@interface MultipartMessageHeaderField (private) --(BOOL) parseHeaderValueBytes:(char*) bytes length:(NSUInteger) length encoding:(NSStringEncoding) encoding; -@end - - -//----------------------------------------------------------------- -// implementation MultipartMessageHeaderField -//----------------------------------------------------------------- - -@implementation MultipartMessageHeaderField -@synthesize name,value,params; - -- (id) initWithData:(NSData *)data contentEncoding:(NSStringEncoding)encoding { - params = [[NSMutableDictionary alloc] initWithCapacity:1]; - - char* bytes = (char*)data.bytes; - NSUInteger length = data.length; - - int separatorOffset = findChar(bytes, length, ':'); - if( (-1 == separatorOffset) || (separatorOffset >= length-2) ) { - HTTPLogError(@"MultipartFormDataParser: Bad format.No colon in field header."); - // tear down - return nil; - } - - // header name is always ascii encoded; - name = [[NSString alloc] initWithBytes: bytes length: separatorOffset encoding: NSASCIIStringEncoding]; - if( nil == name ) { - HTTPLogError(@"MultipartFormDataParser: Bad MIME header name."); - // tear down - return nil; - } - - // skip the separator and the next ' ' symbol - bytes += separatorOffset + 2; - length -= separatorOffset + 2; - - separatorOffset = findChar(bytes, length, ';'); - if( separatorOffset == -1 ) { - // couldn't find ';', means we don't have extra params here. - value = [[NSString alloc] initWithBytes:bytes length: length encoding:encoding]; - - if( nil == value ) { - HTTPLogError(@"MultipartFormDataParser: Bad MIME header value for header name: '%@'",name); - // tear down - return nil; - } - return self; - } - - value = [[NSString alloc] initWithBytes:bytes length: separatorOffset encoding:encoding]; - HTTPLogVerbose(@"MultipartFormDataParser: Processing header field '%@' : '%@'",name,value); - // skipe the separator and the next ' ' symbol - bytes += separatorOffset + 2; - length -= separatorOffset + 2; - - // parse the "params" part of the header - if( ![self parseHeaderValueBytes:bytes length:length encoding:encoding] ) { - NSString* paramsStr = [[NSString alloc] initWithBytes:bytes length:length encoding:NSASCIIStringEncoding]; - HTTPLogError(@"MultipartFormDataParser: Bad params for header with name '%@' and value '%@'",name,value); - HTTPLogError(@"MultipartFormDataParser: Params str: %@",paramsStr); - - return nil; - } - return self; -} - --(BOOL) parseHeaderValueBytes:(char*) bytes length:(NSUInteger) length encoding:(NSStringEncoding) encoding { - int offset = 0; - NSString* currentParam = nil; - BOOL insideQuote = NO; - while( offset < length ) { - if( bytes[offset] == '\"' ) { - if( !offset || bytes[offset-1] != '\\' ) { - insideQuote = !insideQuote; - } - } - - // skip quoted symbols - if( insideQuote ) { - ++ offset; - continue; - } - if( bytes[offset] == '=' ) { - if( currentParam ) { - // found '=' before terminating previous param. - return NO; - } - currentParam = [[NSString alloc] initWithBytes:bytes length:offset encoding:NSASCIIStringEncoding]; - - bytes+=offset + 1; - length -= offset + 1; - offset = 0; - continue; - } - if( bytes[offset] == ';' ) { - if( !currentParam ) { - // found ; before stating '='. - HTTPLogError(@"MultipartFormDataParser: Unexpected ';' when parsing header"); - return NO; - } - NSString* paramValue = extractParamValue(bytes, offset,encoding); - if( nil == paramValue ) { - HTTPLogWarn(@"MultipartFormDataParser: Failed to exctract paramValue for key %@ in header %@",currentParam,name); - } - else { -#ifdef DEBUG - if( [params objectForKey:currentParam] ) { - HTTPLogWarn(@"MultipartFormDataParser: param %@ mentioned more then once in header %@",currentParam,name); - } -#endif - [params setObject:paramValue forKey:currentParam]; - HTTPLogVerbose(@"MultipartFormDataParser: header param: %@ = %@",currentParam,paramValue); - } - - currentParam = nil; - - // ';' separator has ' ' following, skip them. - bytes+=offset + 2; - length -= offset + 2; - offset = 0; - } - ++ offset; - } - - // add last param - if( insideQuote ) { - HTTPLogWarn(@"MultipartFormDataParser: unterminated quote in header %@",name); -// return YES; - } - if( currentParam ) { - NSString* paramValue = extractParamValue(bytes, length, encoding); - - if( nil == paramValue ) { - HTTPLogError(@"MultipartFormDataParser: Failed to exctract paramValue for key %@ in header %@",currentParam,name); - } - -#ifdef DEBUG - if( [params objectForKey:currentParam] ) { - HTTPLogWarn(@"MultipartFormDataParser: param %@ mentioned more then once in one header",currentParam); - } -#endif - [params setObject:paramValue?paramValue:@"" forKey:currentParam]; - HTTPLogVerbose(@"MultipartFormDataParser: header param: %@ = %@",currentParam,paramValue); - currentParam = nil; - } - - return YES; -} - -- (NSString *)description { - return [NSString stringWithFormat:@"%@:%@\n params: %@",name,value,params]; -} - -@end - -int findChar(const char* str, NSUInteger length, char c) { - int offset = 0; - while( offset < length ) { - if( str[offset] == c ) - return offset; - ++ offset; - } - return -1; -} - -NSString* extractParamValue(const char* bytes, NSUInteger length, NSStringEncoding encoding) { - if( !length ) - return nil; - NSMutableString* value = nil; - - if( bytes[0] == '"' ) { - // values may be quoted. Strip the quotes to get what we need. - value = [[NSMutableString alloc] initWithBytes:bytes + 1 length: length - 2 encoding:encoding]; - } - else { - value = [[NSMutableString alloc] initWithBytes:bytes length: length encoding:encoding]; - } - // restore escaped symbols - NSRange range= [value rangeOfString:@"\\"]; - while ( range.length ) { - [value deleteCharactersInRange:range]; - range.location ++; - range = [value rangeOfString:@"\\" options:NSLiteralSearch range: range]; - } - return value; -} - diff --git a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPAsyncFileResponse.h b/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPAsyncFileResponse.h deleted file mode 100755 index ffdaa97..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPAsyncFileResponse.h +++ /dev/null @@ -1,75 +0,0 @@ -#import -#import "HTTPResponse.h" - -@class HTTPConnection; - -/** - * This is an asynchronous version of HTTPFileResponse. - * It reads data from the given file asynchronously via GCD. - * - * It may be overriden to allow custom post-processing of the data that has been read from the file. - * An example of this is the HTTPDynamicFileResponse class. -**/ - -@interface HTTPAsyncFileResponse : NSObject -{ - HTTPConnection *connection; - - NSString *filePath; - UInt64 fileLength; - UInt64 fileOffset; // File offset as pertains to data given to connection - UInt64 readOffset; // File offset as pertains to data read from file (but maybe not returned to connection) - - BOOL aborted; - - NSData *data; - - int fileFD; - void *readBuffer; - NSUInteger readBufferSize; // Malloced size of readBuffer - NSUInteger readBufferOffset; // Offset within readBuffer where the end of existing data is - NSUInteger readRequestLength; - dispatch_queue_t readQueue; - dispatch_source_t readSource; - BOOL readSourceSuspended; -} - -- (id)initWithFilePath:(NSString *)filePath forConnection:(HTTPConnection *)connection; -- (NSString *)filePath; - -@end - -/** - * Explanation of Variables (excluding those that are obvious) - * - * fileOffset - * This is the number of bytes that have been returned to the connection via the readDataOfLength method. - * If 1KB of data has been read from the file, but none of that data has yet been returned to the connection, - * then the fileOffset variable remains at zero. - * This variable is used in the calculation of the isDone method. - * Only after all data has been returned to the connection are we actually done. - * - * readOffset - * Represents the offset of the file descriptor. - * In other words, the file position indidcator for our read stream. - * It might be easy to think of it as the total number of bytes that have been read from the file. - * However, this isn't entirely accurate, as the setOffset: method may have caused us to - * jump ahead in the file (lseek). - * - * readBuffer - * Malloc'd buffer to hold data read from the file. - * - * readBufferSize - * Total allocation size of malloc'd buffer. - * - * readBufferOffset - * Represents the position in the readBuffer where we should store new bytes. - * - * readRequestLength - * The total number of bytes that were requested from the connection. - * It's OK if we return a lesser number of bytes to the connection. - * It's NOT OK if we return a greater number of bytes to the connection. - * Doing so would disrupt proper support for range requests. - * If, however, the response is chunked then we don't need to worry about this. - * Chunked responses inheritly don't support range requests. -**/ diff --git a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPAsyncFileResponse.m b/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPAsyncFileResponse.m deleted file mode 100755 index edcbd48..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPAsyncFileResponse.m +++ /dev/null @@ -1,405 +0,0 @@ -#import "HTTPAsyncFileResponse.h" -#import "HTTPConnection.h" -#import "HTTPLogging.h" - -#import -#import - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -// Log levels : off, error, warn, info, verbose -// Other flags: trace -static const int httpLogLevel = HTTP_LOG_LEVEL_WARN; // | HTTP_LOG_FLAG_TRACE; - -#define NULL_FD -1 - -/** - * Architecure overview: - * - * HTTPConnection will invoke our readDataOfLength: method to fetch data. - * We will return nil, and then proceed to read the data via our readSource on our readQueue. - * Once the requested amount of data has been read, we then pause our readSource, - * and inform the connection of the available data. - * - * While our read is in progress, we don't have to worry about the connection calling any other methods, - * except the connectionDidClose method, which would be invoked if the remote end closed the socket connection. - * To safely handle this, we do a synchronous dispatch on the readQueue, - * and nilify the connection as well as cancel our readSource. - * - * In order to minimize resource consumption during a HEAD request, - * we don't open the file until we have to (until the connection starts requesting data). -**/ - -@implementation HTTPAsyncFileResponse - -- (id)initWithFilePath:(NSString *)fpath forConnection:(HTTPConnection *)parent -{ - if ((self = [super init])) - { - HTTPLogTrace(); - - connection = parent; // Parents retain children, children do NOT retain parents - - fileFD = NULL_FD; - filePath = [fpath copy]; - if (filePath == nil) - { - HTTPLogWarn(@"%@: Init failed - Nil filePath", THIS_FILE); - - return nil; - } - - NSDictionary *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:NULL]; - if (fileAttributes == nil) - { - HTTPLogWarn(@"%@: Init failed - Unable to get file attributes. filePath: %@", THIS_FILE, filePath); - - return nil; - } - - fileLength = (UInt64)[[fileAttributes objectForKey:NSFileSize] unsignedLongLongValue]; - fileOffset = 0; - - aborted = NO; - - // We don't bother opening the file here. - // If this is a HEAD request we only need to know the fileLength. - } - return self; -} - -- (void)abort -{ - HTTPLogTrace(); - - [connection responseDidAbort:self]; - aborted = YES; -} - -- (void)processReadBuffer -{ - // This method is here to allow superclasses to perform post-processing of the data. - // For an example, see the HTTPDynamicFileResponse class. - // - // At this point, the readBuffer has readBufferOffset bytes available. - // This method is in charge of updating the readBufferOffset. - // Failure to do so will cause the readBuffer to grow to fileLength. (Imagine a 1 GB file...) - - // Copy the data out of the temporary readBuffer. - data = [[NSData alloc] initWithBytes:readBuffer length:readBufferOffset]; - - // Reset the read buffer. - readBufferOffset = 0; - - // Notify the connection that we have data available for it. - [connection responseHasAvailableData:self]; -} - -- (void)pauseReadSource -{ - if (!readSourceSuspended) - { - HTTPLogVerbose(@"%@[%p]: Suspending readSource", THIS_FILE, self); - - readSourceSuspended = YES; - dispatch_suspend(readSource); - } -} - -- (void)resumeReadSource -{ - if (readSourceSuspended) - { - HTTPLogVerbose(@"%@[%p]: Resuming readSource", THIS_FILE, self); - - readSourceSuspended = NO; - dispatch_resume(readSource); - } -} - -- (void)cancelReadSource -{ - HTTPLogVerbose(@"%@[%p]: Canceling readSource", THIS_FILE, self); - - dispatch_source_cancel(readSource); - - // Cancelling a dispatch source doesn't - // invoke the cancel handler if the dispatch source is paused. - - if (readSourceSuspended) - { - readSourceSuspended = NO; - dispatch_resume(readSource); - } -} - -- (BOOL)openFileAndSetupReadSource -{ - HTTPLogTrace(); - - fileFD = open([filePath UTF8String], (O_RDONLY | O_NONBLOCK)); - if (fileFD == NULL_FD) - { - HTTPLogError(@"%@: Unable to open file. filePath: %@", THIS_FILE, filePath); - - return NO; - } - - HTTPLogVerbose(@"%@[%p]: Open fd[%i] -> %@", THIS_FILE, self, fileFD, filePath); - - readQueue = dispatch_queue_create("HTTPAsyncFileResponse", NULL); - readSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ, fileFD, 0, readQueue); - - - dispatch_source_set_event_handler(readSource, ^{ - - HTTPLogTrace2(@"%@: eventBlock - fd[%i]", THIS_FILE, fileFD); - - // Determine how much data we should read. - // - // It is OK if we ask to read more bytes than exist in the file. - // It is NOT OK to over-allocate the buffer. - - unsigned long long _bytesAvailableOnFD = dispatch_source_get_data(readSource); - - UInt64 _bytesLeftInFile = fileLength - readOffset; - - NSUInteger bytesAvailableOnFD; - NSUInteger bytesLeftInFile; - - bytesAvailableOnFD = (_bytesAvailableOnFD > NSUIntegerMax) ? NSUIntegerMax : (NSUInteger)_bytesAvailableOnFD; - bytesLeftInFile = (_bytesLeftInFile > NSUIntegerMax) ? NSUIntegerMax : (NSUInteger)_bytesLeftInFile; - - NSUInteger bytesLeftInRequest = readRequestLength - readBufferOffset; - - NSUInteger bytesLeft = MIN(bytesLeftInRequest, bytesLeftInFile); - - NSUInteger bytesToRead = MIN(bytesAvailableOnFD, bytesLeft); - - // Make sure buffer is big enough for read request. - // Do not over-allocate. - - if (readBuffer == NULL || bytesToRead > (readBufferSize - readBufferOffset)) - { - readBufferSize = bytesToRead; - readBuffer = reallocf(readBuffer, (size_t)bytesToRead); - - if (readBuffer == NULL) - { - HTTPLogError(@"%@[%p]: Unable to allocate buffer", THIS_FILE, self); - - [self pauseReadSource]; - [self abort]; - - return; - } - } - - // Perform the read - - HTTPLogVerbose(@"%@[%p]: Attempting to read %lu bytes from file", THIS_FILE, self, (unsigned long)bytesToRead); - - ssize_t result = read(fileFD, readBuffer + readBufferOffset, (size_t)bytesToRead); - - // Check the results - if (result < 0) - { - HTTPLogError(@"%@: Error(%i) reading file(%@)", THIS_FILE, errno, filePath); - - [self pauseReadSource]; - [self abort]; - } - else if (result == 0) - { - HTTPLogError(@"%@: Read EOF on file(%@)", THIS_FILE, filePath); - - [self pauseReadSource]; - [self abort]; - } - else // (result > 0) - { - HTTPLogVerbose(@"%@[%p]: Read %lu bytes from file", THIS_FILE, self, (unsigned long)result); - - readOffset += result; - readBufferOffset += result; - - [self pauseReadSource]; - [self processReadBuffer]; - } - - }); - - int theFileFD = fileFD; - #if !OS_OBJECT_USE_OBJC - dispatch_source_t theReadSource = readSource; - #endif - - dispatch_source_set_cancel_handler(readSource, ^{ - - // Do not access self from within this block in any way, shape or form. - // - // Note: You access self if you reference an iVar. - - HTTPLogTrace2(@"%@: cancelBlock - Close fd[%i]", THIS_FILE, theFileFD); - - #if !OS_OBJECT_USE_OBJC - dispatch_release(theReadSource); - #endif - close(theFileFD); - }); - - readSourceSuspended = YES; - - return YES; -} - -- (BOOL)openFileIfNeeded -{ - if (aborted) - { - // The file operation has been aborted. - // This could be because we failed to open the file, - // or the reading process failed. - return NO; - } - - if (fileFD != NULL_FD) - { - // File has already been opened. - return YES; - } - - return [self openFileAndSetupReadSource]; -} - -- (UInt64)contentLength -{ - HTTPLogTrace2(@"%@[%p]: contentLength - %llu", THIS_FILE, self, fileLength); - - return fileLength; -} - -- (UInt64)offset -{ - HTTPLogTrace(); - - return fileOffset; -} - -- (void)setOffset:(UInt64)offset -{ - HTTPLogTrace2(@"%@[%p]: setOffset:%llu", THIS_FILE, self, offset); - - if (![self openFileIfNeeded]) - { - // File opening failed, - // or response has been aborted due to another error. - return; - } - - fileOffset = offset; - readOffset = offset; - - off_t result = lseek(fileFD, (off_t)offset, SEEK_SET); - if (result == -1) - { - HTTPLogError(@"%@[%p]: lseek failed - errno(%i) filePath(%@)", THIS_FILE, self, errno, filePath); - - [self abort]; - } -} - -- (NSData *)readDataOfLength:(NSUInteger)length -{ - HTTPLogTrace2(@"%@[%p]: readDataOfLength:%lu", THIS_FILE, self, (unsigned long)length); - - if (data) - { - NSUInteger dataLength = [data length]; - - HTTPLogVerbose(@"%@[%p]: Returning data of length %lu", THIS_FILE, self, (unsigned long)dataLength); - - fileOffset += dataLength; - - NSData *result = data; - data = nil; - - return result; - } - else - { - if (![self openFileIfNeeded]) - { - // File opening failed, - // or response has been aborted due to another error. - return nil; - } - - dispatch_sync(readQueue, ^{ - - NSAssert(readSourceSuspended, @"Invalid logic - perhaps HTTPConnection has changed."); - - readRequestLength = length; - [self resumeReadSource]; - }); - - return nil; - } -} - -- (BOOL)isDone -{ - BOOL result = (fileOffset == fileLength); - - HTTPLogTrace2(@"%@[%p]: isDone - %@", THIS_FILE, self, (result ? @"YES" : @"NO")); - - return result; -} - -- (NSString *)filePath -{ - return filePath; -} - -- (BOOL)isAsynchronous -{ - HTTPLogTrace(); - - return YES; -} - -- (void)connectionDidClose -{ - HTTPLogTrace(); - - if (fileFD != NULL_FD) - { - dispatch_sync(readQueue, ^{ - - // Prevent any further calls to the connection - connection = nil; - - // Cancel the readSource. - // We do this here because the readSource's eventBlock has retained self. - // In other words, if we don't cancel the readSource, we will never get deallocated. - - [self cancelReadSource]; - }); - } -} - -- (void)dealloc -{ - HTTPLogTrace(); - - #if !OS_OBJECT_USE_OBJC - if (readQueue) dispatch_release(readQueue); - #endif - - if (readBuffer) - free(readBuffer); -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDataResponse.h b/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDataResponse.h deleted file mode 100755 index 50469bc..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDataResponse.h +++ /dev/null @@ -1,13 +0,0 @@ -#import -#import "HTTPResponse.h" - - -@interface HTTPDataResponse : NSObject -{ - NSUInteger offset; - NSData *data; -} - -- (id)initWithData:(NSData *)data; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDataResponse.m b/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDataResponse.m deleted file mode 100755 index 6525e37..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDataResponse.m +++ /dev/null @@ -1,79 +0,0 @@ -#import "HTTPDataResponse.h" -#import "HTTPLogging.h" - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -// Log levels : off, error, warn, info, verbose -// Other flags: trace -static const int httpLogLevel = HTTP_LOG_LEVEL_OFF; // | HTTP_LOG_FLAG_TRACE; - - -@implementation HTTPDataResponse - -- (id)initWithData:(NSData *)dataParam -{ - if((self = [super init])) - { - HTTPLogTrace(); - - offset = 0; - data = dataParam; - } - return self; -} - -- (void)dealloc -{ - HTTPLogTrace(); - -} - -- (UInt64)contentLength -{ - UInt64 result = (UInt64)[data length]; - - HTTPLogTrace2(@"%@[%p]: contentLength - %llu", THIS_FILE, self, result); - - return result; -} - -- (UInt64)offset -{ - HTTPLogTrace(); - - return offset; -} - -- (void)setOffset:(UInt64)offsetParam -{ - HTTPLogTrace2(@"%@[%p]: setOffset:%lu", THIS_FILE, self, (unsigned long)offset); - - offset = (NSUInteger)offsetParam; -} - -- (NSData *)readDataOfLength:(NSUInteger)lengthParameter -{ - HTTPLogTrace2(@"%@[%p]: readDataOfLength:%lu", THIS_FILE, self, (unsigned long)lengthParameter); - - NSUInteger remaining = [data length] - offset; - NSUInteger length = lengthParameter < remaining ? lengthParameter : remaining; - - void *bytes = (void *)([data bytes] + offset); - - offset += length; - - return [NSData dataWithBytesNoCopy:bytes length:length freeWhenDone:NO]; -} - -- (BOOL)isDone -{ - BOOL result = (offset == [data length]); - - HTTPLogTrace2(@"%@[%p]: isDone - %@", THIS_FILE, self, (result ? @"YES" : @"NO")); - - return result; -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDynamicFileResponse.h b/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDynamicFileResponse.h deleted file mode 100755 index 5dd1a84..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDynamicFileResponse.h +++ /dev/null @@ -1,52 +0,0 @@ -#import -#import "HTTPResponse.h" -#import "HTTPAsyncFileResponse.h" - -/** - * This class is designed to assist with dynamic content. - * Imagine you have a file that you want to make dynamic: - * - * - * - *

ComputerName Control Panel

- * ... - *
  • System Time: SysTime
    • - * - * - * - * Now you could generate the entire file in Objective-C, - * but this would be a horribly tedious process. - * Beside, you want to design the file with professional tools to make it look pretty. - * - * So all you have to do is escape your dynamic content like this: - * - * ... - *

    %%ComputerName%% Control Panel

    - * ... - *
  • System Time: %%SysTime%%
    • - * - * And then you create an instance of this class with: - * - * - separator = @"%%" - * - replacementDictionary = { "ComputerName"="Black MacBook", "SysTime"="2010-04-30 03:18:24" } - * - * This class will then perform the replacements for you, on the fly, as it reads the file data. - * This class is also asynchronous, so it will perform the file IO using its own GCD queue. - * - * All keys for the replacementDictionary must be NSString's. - * Values for the replacementDictionary may be NSString's, or any object that - * returns what you want when its description method is invoked. -**/ - -@interface HTTPDynamicFileResponse : HTTPAsyncFileResponse -{ - NSData *separator; - NSDictionary *replacementDict; -} - -- (id)initWithFilePath:(NSString *)filePath - forConnection:(HTTPConnection *)connection - separator:(NSString *)separatorStr - replacementDictionary:(NSDictionary *)dictionary; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDynamicFileResponse.m b/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDynamicFileResponse.m deleted file mode 100755 index e55426a..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPDynamicFileResponse.m +++ /dev/null @@ -1,292 +0,0 @@ -#import "HTTPDynamicFileResponse.h" -#import "HTTPConnection.h" -#import "HTTPLogging.h" - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -// Log levels : off, error, warn, info, verbose -// Other flags: trace -static const int httpLogLevel = HTTP_LOG_LEVEL_WARN; // | HTTP_LOG_FLAG_TRACE; - -#define NULL_FD -1 - - -@implementation HTTPDynamicFileResponse - -- (id)initWithFilePath:(NSString *)fpath - forConnection:(HTTPConnection *)parent - separator:(NSString *)separatorStr - replacementDictionary:(NSDictionary *)dict -{ - if ((self = [super initWithFilePath:fpath forConnection:parent])) - { - HTTPLogTrace(); - - separator = [separatorStr dataUsingEncoding:NSUTF8StringEncoding]; - replacementDict = dict; - } - return self; -} - -- (BOOL)isChunked -{ - HTTPLogTrace(); - - return YES; -} - -- (UInt64)contentLength -{ - // This method shouldn't be called since we're using a chunked response. - // We override it just to be safe. - - HTTPLogTrace(); - - return 0; -} - -- (void)setOffset:(UInt64)offset -{ - // This method shouldn't be called since we're using a chunked response. - // We override it just to be safe. - - HTTPLogTrace(); -} - -- (BOOL)isDone -{ - BOOL result = (readOffset == fileLength) && (readBufferOffset == 0); - - HTTPLogTrace2(@"%@[%p]: isDone - %@", THIS_FILE, self, (result ? @"YES" : @"NO")); - - return result; -} - -- (void)processReadBuffer -{ - HTTPLogTrace(); - - // At this point, the readBuffer has readBufferOffset bytes available. - // This method is in charge of updating the readBufferOffset. - - NSUInteger bufLen = readBufferOffset; - NSUInteger sepLen = [separator length]; - - // We're going to start looking for the separator at the beginning of the buffer, - // and stop when we get to the point where the separator would no longer fit in the buffer. - - NSUInteger offset = 0; - NSUInteger stopOffset = (bufLen > sepLen) ? bufLen - sepLen + 1 : 0; - - // In order to do the replacement, we need to find the starting and ending separator. - // For example: - // - // %%USER_NAME%% - // - // Where "%%" is the separator. - - BOOL found1 = NO; - BOOL found2 = NO; - - NSUInteger s1 = 0; - NSUInteger s2 = 0; - - const void *sep = [separator bytes]; - - while (offset < stopOffset) - { - const void *subBuffer = readBuffer + offset; - - if (memcmp(subBuffer, sep, sepLen) == 0) - { - if (!found1) - { - // Found the first separator - - found1 = YES; - s1 = offset; - offset += sepLen; - - HTTPLogVerbose(@"%@[%p]: Found s1 at %lu", THIS_FILE, self, (unsigned long)s1); - } - else - { - // Found the second separator - - found2 = YES; - s2 = offset; - offset += sepLen; - - HTTPLogVerbose(@"%@[%p]: Found s2 at %lu", THIS_FILE, self, (unsigned long)s2); - } - - if (found1 && found2) - { - // We found our separators. - // Now extract the string between the two separators. - - NSRange fullRange = NSMakeRange(s1, (s2 - s1 + sepLen)); - NSRange strRange = NSMakeRange(s1 + sepLen, (s2 - s1 - sepLen)); - - // Wish we could use the simple subdataWithRange method. - // But that method copies the bytes... - // So for performance reasons, we need to use the methods that don't copy the bytes. - - void *strBuf = readBuffer + strRange.location; - NSUInteger strLen = strRange.length; - - NSString *key = [[NSString alloc] initWithBytes:strBuf length:strLen encoding:NSUTF8StringEncoding]; - if (key) - { - // Is there a given replacement for this key? - - id value = [replacementDict objectForKey:key]; - if (value) - { - // Found the replacement value. - // Now perform the replacement in the buffer. - - HTTPLogVerbose(@"%@[%p]: key(%@) -> value(%@)", THIS_FILE, self, key, value); - - NSData *v = [[value description] dataUsingEncoding:NSUTF8StringEncoding]; - NSUInteger vLength = [v length]; - - if (fullRange.length == vLength) - { - // Replacement is exactly the same size as what it is replacing - - // memcpy(void *restrict dst, const void *restrict src, size_t n); - - memcpy(readBuffer + fullRange.location, [v bytes], vLength); - } - else // (fullRange.length != vLength) - { - NSInteger diff = (NSInteger)vLength - (NSInteger)fullRange.length; - - if (diff > 0) - { - // Replacement is bigger than what it is replacing. - // Make sure there is room in the buffer for the replacement. - - if (diff > (readBufferSize - bufLen)) - { - NSUInteger inc = MAX(diff, 256); - - readBufferSize += inc; - readBuffer = reallocf(readBuffer, readBufferSize); - } - } - - // Move the data that comes after the replacement. - // - // If replacement is smaller than what it is replacing, - // then we are shifting the data toward the beginning of the buffer. - // - // If replacement is bigger than what it is replacing, - // then we are shifting the data toward the end of the buffer. - // - // memmove(void *dst, const void *src, size_t n); - // - // The memmove() function copies n bytes from src to dst. - // The two areas may overlap; the copy is always done in a non-destructive manner. - - void *src = readBuffer + fullRange.location + fullRange.length; - void *dst = readBuffer + fullRange.location + vLength; - - NSUInteger remaining = bufLen - (fullRange.location + fullRange.length); - - memmove(dst, src, remaining); - - // Now copy the replacement into its location. - // - // memcpy(void *restrict dst, const void *restrict src, size_t n) - // - // The memcpy() function copies n bytes from src to dst. - // If the two areas overlap, behavior is undefined. - - memcpy(readBuffer + fullRange.location, [v bytes], vLength); - - // And don't forget to update our indices. - - bufLen += diff; - offset += diff; - stopOffset += diff; - } - } - - } - - found1 = found2 = NO; - } - } - else - { - offset++; - } - } - - // We've gone through our buffer now, and performed all the replacements that we could. - // It's now time to update the amount of available data we have. - - if (readOffset == fileLength) - { - // We've read in the entire file. - // So there can be no more replacements. - - data = [[NSData alloc] initWithBytes:readBuffer length:bufLen]; - readBufferOffset = 0; - } - else - { - // There are a couple different situations that we need to take into account here. - // - // Imagine the following file: - // My name is %%USER_NAME%% - // - // Situation 1: - // The first chunk of data we read was "My name is %%". - // So we found the first separator, but not the second. - // In this case we can only return the data that precedes the first separator. - // - // Situation 2: - // The first chunk of data we read was "My name is %". - // So we didn't find any separators, but part of a separator may be included in our buffer. - - NSUInteger available; - if (found1) - { - // Situation 1 - available = s1; - } - else - { - // Situation 2 - available = stopOffset; - } - - // Copy available data - - data = [[NSData alloc] initWithBytes:readBuffer length:available]; - - // Remove the copied data from the buffer. - // We do this by shifting the remaining data toward the beginning of the buffer. - - NSUInteger remaining = bufLen - available; - - memmove(readBuffer, readBuffer + available, remaining); - readBufferOffset = remaining; - } - - [connection responseHasAvailableData:self]; -} - -- (void)dealloc -{ - HTTPLogTrace(); - - -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPErrorResponse.h b/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPErrorResponse.h deleted file mode 100755 index ca03426..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPErrorResponse.h +++ /dev/null @@ -1,9 +0,0 @@ -#import "HTTPResponse.h" - -@interface HTTPErrorResponse : NSObject { - NSInteger _status; -} - -- (id)initWithErrorCode:(int)httpErrorCode; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPErrorResponse.m b/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPErrorResponse.m deleted file mode 100755 index 02871ae..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPErrorResponse.m +++ /dev/null @@ -1,38 +0,0 @@ -#import "HTTPErrorResponse.h" - -@implementation HTTPErrorResponse - --(id)initWithErrorCode:(int)httpErrorCode -{ - if ((self = [super init])) - { - _status = httpErrorCode; - } - - return self; -} - -- (UInt64) contentLength { - return 0; -} - -- (UInt64) offset { - return 0; -} - -- (void)setOffset:(UInt64)offset { - ; -} - -- (NSData*) readDataOfLength:(NSUInteger)length { - return nil; -} - -- (BOOL) isDone { - return YES; -} - -- (NSInteger) status { - return _status; -} -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPFileResponse.h b/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPFileResponse.h deleted file mode 100755 index 57deaf3..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPFileResponse.h +++ /dev/null @@ -1,25 +0,0 @@ -#import -#import "HTTPResponse.h" - -@class HTTPConnection; - - -@interface HTTPFileResponse : NSObject -{ - HTTPConnection *connection; - - NSString *filePath; - UInt64 fileLength; - UInt64 fileOffset; - - BOOL aborted; - - int fileFD; - void *buffer; - NSUInteger bufferSize; -} - -- (id)initWithFilePath:(NSString *)filePath forConnection:(HTTPConnection *)connection; -- (NSString *)filePath; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPFileResponse.m b/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPFileResponse.m deleted file mode 100755 index cf73cd2..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPFileResponse.m +++ /dev/null @@ -1,237 +0,0 @@ -#import "HTTPFileResponse.h" -#import "HTTPConnection.h" -#import "HTTPLogging.h" - -#import -#import - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -// Log levels : off, error, warn, info, verbose -// Other flags: trace -static const int httpLogLevel = HTTP_LOG_LEVEL_WARN; // | HTTP_LOG_FLAG_TRACE; - -#define NULL_FD -1 - - -@implementation HTTPFileResponse - -- (id)initWithFilePath:(NSString *)fpath forConnection:(HTTPConnection *)parent -{ - if((self = [super init])) - { - HTTPLogTrace(); - - connection = parent; // Parents retain children, children do NOT retain parents - - fileFD = NULL_FD; - filePath = [[fpath copy] stringByResolvingSymlinksInPath]; - if (filePath == nil) - { - HTTPLogWarn(@"%@: Init failed - Nil filePath", THIS_FILE); - - return nil; - } - - NSDictionary *fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil]; - if (fileAttributes == nil) - { - HTTPLogWarn(@"%@: Init failed - Unable to get file attributes. filePath: %@", THIS_FILE, filePath); - - return nil; - } - - fileLength = (UInt64)[[fileAttributes objectForKey:NSFileSize] unsignedLongLongValue]; - fileOffset = 0; - - aborted = NO; - - // We don't bother opening the file here. - // If this is a HEAD request we only need to know the fileLength. - } - return self; -} - -- (void)abort -{ - HTTPLogTrace(); - - [connection responseDidAbort:self]; - aborted = YES; -} - -- (BOOL)openFile -{ - HTTPLogTrace(); - - fileFD = open([filePath UTF8String], O_RDONLY); - if (fileFD == NULL_FD) - { - HTTPLogError(@"%@[%p]: Unable to open file. filePath: %@", THIS_FILE, self, filePath); - - [self abort]; - return NO; - } - - HTTPLogVerbose(@"%@[%p]: Open fd[%i] -> %@", THIS_FILE, self, fileFD, filePath); - - return YES; -} - -- (BOOL)openFileIfNeeded -{ - if (aborted) - { - // The file operation has been aborted. - // This could be because we failed to open the file, - // or the reading process failed. - return NO; - } - - if (fileFD != NULL_FD) - { - // File has already been opened. - return YES; - } - - return [self openFile]; -} - -- (UInt64)contentLength -{ - HTTPLogTrace(); - - return fileLength; -} - -- (UInt64)offset -{ - HTTPLogTrace(); - - return fileOffset; -} - -- (void)setOffset:(UInt64)offset -{ - HTTPLogTrace2(@"%@[%p]: setOffset:%llu", THIS_FILE, self, offset); - - if (![self openFileIfNeeded]) - { - // File opening failed, - // or response has been aborted due to another error. - return; - } - - fileOffset = offset; - - off_t result = lseek(fileFD, (off_t)offset, SEEK_SET); - if (result == -1) - { - HTTPLogError(@"%@[%p]: lseek failed - errno(%i) filePath(%@)", THIS_FILE, self, errno, filePath); - - [self abort]; - } -} - -- (NSData *)readDataOfLength:(NSUInteger)length -{ - HTTPLogTrace2(@"%@[%p]: readDataOfLength:%lu", THIS_FILE, self, (unsigned long)length); - - if (![self openFileIfNeeded]) - { - // File opening failed, - // or response has been aborted due to another error. - return nil; - } - - // Determine how much data we should read. - // - // It is OK if we ask to read more bytes than exist in the file. - // It is NOT OK to over-allocate the buffer. - - UInt64 bytesLeftInFile = fileLength - fileOffset; - - NSUInteger bytesToRead = (NSUInteger)MIN(length, bytesLeftInFile); - - // Make sure buffer is big enough for read request. - // Do not over-allocate. - - if (buffer == NULL || bufferSize < bytesToRead) - { - bufferSize = bytesToRead; - buffer = reallocf(buffer, (size_t)bufferSize); - - if (buffer == NULL) - { - HTTPLogError(@"%@[%p]: Unable to allocate buffer", THIS_FILE, self); - - [self abort]; - return nil; - } - } - - // Perform the read - - HTTPLogVerbose(@"%@[%p]: Attempting to read %lu bytes from file", THIS_FILE, self, (unsigned long)bytesToRead); - - ssize_t result = read(fileFD, buffer, bytesToRead); - - // Check the results - - if (result < 0) - { - HTTPLogError(@"%@: Error(%i) reading file(%@)", THIS_FILE, errno, filePath); - - [self abort]; - return nil; - } - else if (result == 0) - { - HTTPLogError(@"%@: Read EOF on file(%@)", THIS_FILE, filePath); - - [self abort]; - return nil; - } - else // (result > 0) - { - HTTPLogVerbose(@"%@[%p]: Read %ld bytes from file", THIS_FILE, self, (long)result); - - fileOffset += result; - - return [NSData dataWithBytes:buffer length:result]; - } -} - -- (BOOL)isDone -{ - BOOL result = (fileOffset == fileLength); - - HTTPLogTrace2(@"%@[%p]: isDone - %@", THIS_FILE, self, (result ? @"YES" : @"NO")); - - return result; -} - -- (NSString *)filePath -{ - return filePath; -} - -- (void)dealloc -{ - HTTPLogTrace(); - - if (fileFD != NULL_FD) - { - HTTPLogVerbose(@"%@[%p]: Close fd[%i]", THIS_FILE, self, fileFD); - - close(fileFD); - } - - if (buffer) - free(buffer); - -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPRedirectResponse.h b/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPRedirectResponse.h deleted file mode 100755 index 19e4b0e..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPRedirectResponse.h +++ /dev/null @@ -1,12 +0,0 @@ -#import -#import "HTTPResponse.h" - - -@interface HTTPRedirectResponse : NSObject -{ - NSString *redirectPath; -} - -- (id)initWithPath:(NSString *)redirectPath; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPRedirectResponse.m b/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPRedirectResponse.m deleted file mode 100755 index 1fc7020..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/Responses/HTTPRedirectResponse.m +++ /dev/null @@ -1,73 +0,0 @@ -#import "HTTPRedirectResponse.h" -#import "HTTPLogging.h" - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -// Log levels : off, error, warn, info, verbose -// Other flags: trace -static const int httpLogLevel = HTTP_LOG_LEVEL_OFF; // | HTTP_LOG_FLAG_TRACE; - - -@implementation HTTPRedirectResponse - -- (id)initWithPath:(NSString *)path -{ - if ((self = [super init])) - { - HTTPLogTrace(); - - redirectPath = [path copy]; - } - return self; -} - -- (UInt64)contentLength -{ - return 0; -} - -- (UInt64)offset -{ - return 0; -} - -- (void)setOffset:(UInt64)offset -{ - // Nothing to do -} - -- (NSData *)readDataOfLength:(NSUInteger)length -{ - HTTPLogTrace(); - - return nil; -} - -- (BOOL)isDone -{ - return YES; -} - -- (NSDictionary *)httpHeaders -{ - HTTPLogTrace(); - - return [NSDictionary dictionaryWithObject:redirectPath forKey:@"Location"]; -} - -- (NSInteger)status -{ - HTTPLogTrace(); - - return 302; -} - -- (void)dealloc -{ - HTTPLogTrace(); - -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/WebSocket.h b/YuMi/Tools/CocoaHttpServer/Core/WebSocket.h deleted file mode 100755 index e6c61cc..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/WebSocket.h +++ /dev/null @@ -1,105 +0,0 @@ -#import - -@class HTTPMessage; -@class GCDAsyncSocket; - - -#define WebSocketDidDieNotification @"WebSocketDidDie" - -@interface WebSocket : NSObject -{ - dispatch_queue_t websocketQueue; - - HTTPMessage *request; - GCDAsyncSocket *asyncSocket; - - NSData *term; - - BOOL isStarted; - BOOL isOpen; - BOOL isVersion76; - - id __unsafe_unretained delegate; -} - -+ (BOOL)isWebSocketRequest:(HTTPMessage *)request; - -- (id)initWithRequest:(HTTPMessage *)request socket:(GCDAsyncSocket *)socket; - -/** - * Delegate option. - * - * In most cases it will be easier to subclass WebSocket, - * but some circumstances may lead one to prefer standard delegate callbacks instead. -**/ -@property (/* atomic */ unsafe_unretained) id delegate; - -/** - * The WebSocket class is thread-safe, generally via it's GCD queue. - * All public API methods are thread-safe, - * and the subclass API methods are thread-safe as they are all invoked on the same GCD queue. -**/ -@property (nonatomic, readonly) dispatch_queue_t websocketQueue; - -/** - * Public API - * - * These methods are automatically called by the HTTPServer. - * You may invoke the stop method yourself to close the WebSocket manually. -**/ -- (void)start; -- (void)stop; - -/** - * Public API - * - * Sends a message over the WebSocket. - * This method is thread-safe. - **/ -- (void)sendMessage:(NSString *)msg; - -/** - * Public API - * - * Sends a message over the WebSocket. - * This method is thread-safe. - **/ -- (void)sendData:(NSData *)msg; - -/** - * Subclass API - * - * These methods are designed to be overriden by subclasses. -**/ -- (void)didOpen; -- (void)didReceiveMessage:(NSString *)msg; -- (void)didClose; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * There are two ways to create your own custom WebSocket: - * - * - Subclass it and override the methods you're interested in. - * - Use traditional delegate paradigm along with your own custom class. - * - * They both exist to allow for maximum flexibility. - * In most cases it will be easier to subclass WebSocket. - * However some circumstances may lead one to prefer standard delegate callbacks instead. - * One such example, you're already subclassing another class, so subclassing WebSocket isn't an option. -**/ - -@protocol WebSocketDelegate -@optional - -- (void)webSocketDidOpen:(WebSocket *)ws; - -- (void)webSocket:(WebSocket *)ws didReceiveMessage:(NSString *)msg; - -- (void)webSocketDidClose:(WebSocket *)ws; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Core/WebSocket.m b/YuMi/Tools/CocoaHttpServer/Core/WebSocket.m deleted file mode 100755 index 98ed9f7..0000000 --- a/YuMi/Tools/CocoaHttpServer/Core/WebSocket.m +++ /dev/null @@ -1,792 +0,0 @@ -#import "WebSocket.h" -#import "HTTPMessage.h" -#import "GCDAsyncSocket.h" -#import "DDNumber.h" -#import "DDData.h" -#import "HTTPLogging.h" - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -// Log levels: off, error, warn, info, verbose -// Other flags : trace -static const int httpLogLevel = HTTP_LOG_LEVEL_WARN; // | HTTP_LOG_FLAG_TRACE; - -#define TIMEOUT_NONE -1 -#define TIMEOUT_REQUEST_BODY 10 - -#define TAG_HTTP_REQUEST_BODY 100 -#define TAG_HTTP_RESPONSE_HEADERS 200 -#define TAG_HTTP_RESPONSE_BODY 201 - -#define TAG_PREFIX 300 -#define TAG_MSG_PLUS_SUFFIX 301 -#define TAG_MSG_WITH_LENGTH 302 -#define TAG_MSG_MASKING_KEY 303 -#define TAG_PAYLOAD_PREFIX 304 -#define TAG_PAYLOAD_LENGTH 305 -#define TAG_PAYLOAD_LENGTH16 306 -#define TAG_PAYLOAD_LENGTH64 307 - -#define WS_OP_CONTINUATION_FRAME 0 -#define WS_OP_TEXT_FRAME 1 -#define WS_OP_BINARY_FRAME 2 -#define WS_OP_CONNECTION_CLOSE 8 -#define WS_OP_PING 9 -#define WS_OP_PONG 10 - -static inline BOOL WS_OP_IS_FINAL_FRAGMENT(UInt8 frame) -{ - return (frame & 0x80) ? YES : NO; -} - -static inline BOOL WS_PAYLOAD_IS_MASKED(UInt8 frame) -{ - return (frame & 0x80) ? YES : NO; -} - -static inline NSUInteger WS_PAYLOAD_LENGTH(UInt8 frame) -{ - return frame & 0x7F; -} - -@interface WebSocket (PrivateAPI) - -- (void)readRequestBody; -- (void)sendResponseBody; -- (void)sendResponseHeaders; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation WebSocket -{ - BOOL isRFC6455; - BOOL nextFrameMasked; - NSUInteger nextOpCode; - NSData *maskingKey; -} - -+ (BOOL)isWebSocketRequest:(HTTPMessage *)request -{ - // Request (Draft 75): - // - // GET /demo HTTP/1.1 - // Upgrade: WebSocket - // Connection: Upgrade - // Host: example.com - // Origin: http://example.com - // WebSocket-Protocol: sample - // - // - // Request (Draft 76): - // - // GET /demo HTTP/1.1 - // Upgrade: WebSocket - // Connection: Upgrade - // Host: example.com - // Origin: http://example.com - // Sec-WebSocket-Protocol: sample - // Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5 - // Sec-WebSocket-Key2: 12998 5 Y3 1 .P00 - // - // ^n:ds[4U - - // Look for Upgrade: and Connection: headers. - // If we find them, and they have the proper value, - // we can safely assume this is a websocket request. - - NSString *upgradeHeaderValue = [request headerField:@"Upgrade"]; - NSString *connectionHeaderValue = [request headerField:@"Connection"]; - - BOOL isWebSocket = YES; - - if (!upgradeHeaderValue || !connectionHeaderValue) { - isWebSocket = NO; - } - else if (![upgradeHeaderValue caseInsensitiveCompare:@"WebSocket"] == NSOrderedSame) { - isWebSocket = NO; - } - else if ([connectionHeaderValue rangeOfString:@"Upgrade" options:NSCaseInsensitiveSearch].location == NSNotFound) { - isWebSocket = NO; - } - - HTTPLogTrace2(@"%@: %@ - %@", THIS_FILE, THIS_METHOD, (isWebSocket ? @"YES" : @"NO")); - - return isWebSocket; -} - -+ (BOOL)isVersion76Request:(HTTPMessage *)request -{ - NSString *key1 = [request headerField:@"Sec-WebSocket-Key1"]; - NSString *key2 = [request headerField:@"Sec-WebSocket-Key2"]; - - BOOL isVersion76; - - if (!key1 || !key2) { - isVersion76 = NO; - } - else { - isVersion76 = YES; - } - - HTTPLogTrace2(@"%@: %@ - %@", THIS_FILE, THIS_METHOD, (isVersion76 ? @"YES" : @"NO")); - - return isVersion76; -} - -+ (BOOL)isRFC6455Request:(HTTPMessage *)request -{ - NSString *key = [request headerField:@"Sec-WebSocket-Key"]; - BOOL isRFC6455 = (key != nil); - - HTTPLogTrace2(@"%@: %@ - %@", THIS_FILE, THIS_METHOD, (isRFC6455 ? @"YES" : @"NO")); - - return isRFC6455; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Setup and Teardown -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@synthesize websocketQueue; - -- (id)initWithRequest:(HTTPMessage *)aRequest socket:(GCDAsyncSocket *)socket -{ - HTTPLogTrace(); - - if (aRequest == nil) - { - return nil; - } - - if ((self = [super init])) - { - if (HTTP_LOG_VERBOSE) - { - NSData *requestHeaders = [aRequest messageData]; - - NSString *temp = [[NSString alloc] initWithData:requestHeaders encoding:NSUTF8StringEncoding]; - HTTPLogVerbose(@"%@[%p] Request Headers:\n%@", THIS_FILE, self, temp); - } - - websocketQueue = dispatch_queue_create("WebSocket", NULL); - request = aRequest; - - asyncSocket = socket; - [asyncSocket setDelegate:self delegateQueue:websocketQueue]; - - isOpen = NO; - isVersion76 = [[self class] isVersion76Request:request]; - isRFC6455 = [[self class] isRFC6455Request:request]; - - term = [[NSData alloc] initWithBytes:"\xFF" length:1]; - } - return self; -} - -- (void)dealloc -{ - HTTPLogTrace(); - - #if !OS_OBJECT_USE_OBJC - dispatch_release(websocketQueue); - #endif - - [asyncSocket setDelegate:nil delegateQueue:NULL]; - [asyncSocket disconnect]; -} - -- (id)delegate -{ - __block id result = nil; - - dispatch_sync(websocketQueue, ^{ - result = delegate; - }); - - return result; -} - -- (void)setDelegate:(id)newDelegate -{ - dispatch_async(websocketQueue, ^{ - delegate = newDelegate; - }); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Start and Stop -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Starting point for the WebSocket after it has been fully initialized (including subclasses). - * This method is called by the HTTPConnection it is spawned from. -**/ -- (void)start -{ - // This method is not exactly designed to be overriden. - // Subclasses are encouraged to override the didOpen method instead. - - dispatch_async(websocketQueue, ^{ @autoreleasepool { - - if (isStarted) return; - isStarted = YES; - - if (isVersion76) - { - [self readRequestBody]; - } - else - { - [self sendResponseHeaders]; - [self didOpen]; - } - }}); -} - -/** - * This method is called by the HTTPServer if it is asked to stop. - * The server, in turn, invokes stop on each WebSocket instance. -**/ -- (void)stop -{ - // This method is not exactly designed to be overriden. - // Subclasses are encouraged to override the didClose method instead. - - dispatch_async(websocketQueue, ^{ @autoreleasepool { - - [asyncSocket disconnect]; - }}); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark HTTP Response -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (void)readRequestBody -{ - HTTPLogTrace(); - - NSAssert(isVersion76, @"WebSocket version 75 doesn't contain a request body"); - - [asyncSocket readDataToLength:8 withTimeout:TIMEOUT_NONE tag:TAG_HTTP_REQUEST_BODY]; -} - -- (NSString *)originResponseHeaderValue -{ - HTTPLogTrace(); - - NSString *origin = [request headerField:@"Origin"]; - - if (origin == nil) - { - NSString *port = [NSString stringWithFormat:@"%hu", [asyncSocket localPort]]; - //NSString * port = @"12306"; - - return [NSString stringWithFormat:@"http://localhost:%@", port]; - } - else - { - return origin; - } -} - -- (NSString *)locationResponseHeaderValue -{ - HTTPLogTrace(); - - NSString *location; - - NSString *scheme = [asyncSocket isSecure] ? @"wss" : @"ws"; - NSString *host = [request headerField:@"Host"]; - - NSString *requestUri = [[request url] relativeString]; - - if (host == nil) - { - NSString *port = [NSString stringWithFormat:@"%hu", [asyncSocket localPort]]; - //NSString * port = @"12306"; - location = [NSString stringWithFormat:@"%@://localhost:%@%@", scheme, port, requestUri]; - } - else - { - location = [NSString stringWithFormat:@"%@://%@%@", scheme, host, requestUri]; - } - - return location; -} - -- (NSString *)secWebSocketKeyResponseHeaderValue { - NSString *key = [request headerField: @"Sec-WebSocket-Key"]; - NSString *guid = @"258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; - return [[key stringByAppendingString: guid] dataUsingEncoding: NSUTF8StringEncoding].sha1Digest.base64Encoded; -} - -- (void)sendResponseHeaders -{ - HTTPLogTrace(); - - // Request (Draft 75): - // - // GET /demo HTTP/1.1 - // Upgrade: WebSocket - // Connection: Upgrade - // Host: example.com - // Origin: http://example.com - // WebSocket-Protocol: sample - // - // - // Request (Draft 76): - // - // GET /demo HTTP/1.1 - // Upgrade: WebSocket - // Connection: Upgrade - // Host: example.com - // Origin: http://example.com - // Sec-WebSocket-Protocol: sample - // Sec-WebSocket-Key2: 12998 5 Y3 1 .P00 - // Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5 - // - // ^n:ds[4U - - - // Response (Draft 75): - // - // HTTP/1.1 101 Web Socket Protocol Handshake - // Upgrade: WebSocket - // Connection: Upgrade - // WebSocket-Origin: http://example.com - // WebSocket-Location: ws://example.com/demo - // WebSocket-Protocol: sample - // - // - // Response (Draft 76): - // - // HTTP/1.1 101 WebSocket Protocol Handshake - // Upgrade: WebSocket - // Connection: Upgrade - // Sec-WebSocket-Origin: http://example.com - // Sec-WebSocket-Location: ws://example.com/demo - // Sec-WebSocket-Protocol: sample - // - // 8jKS'y:G*Co,Wxa- - - - HTTPMessage *wsResponse = [[HTTPMessage alloc] initResponseWithStatusCode:101 - description:@"Web Socket Protocol Handshake" - version:HTTPVersion1_1]; - - [wsResponse setHeaderField:@"Upgrade" value:@"WebSocket"]; - [wsResponse setHeaderField:@"Connection" value:@"Upgrade"]; - - // Note: It appears that WebSocket-Origin and WebSocket-Location - // are required for Google's Chrome implementation to work properly. - // - // If we don't send either header, Chrome will never report the WebSocket as open. - // If we only send one of the two, Chrome will immediately close the WebSocket. - // - // In addition to this it appears that Chrome's implementation is very picky of the values of the headers. - // They have to match exactly with what Chrome sent us or it will close the WebSocket. - - NSString *originValue = [self originResponseHeaderValue]; - NSString *locationValue = [self locationResponseHeaderValue]; - - NSString *originField = isVersion76 ? @"Sec-WebSocket-Origin" : @"WebSocket-Origin"; - NSString *locationField = isVersion76 ? @"Sec-WebSocket-Location" : @"WebSocket-Location"; - - [wsResponse setHeaderField:originField value:originValue]; - [wsResponse setHeaderField:locationField value:locationValue]; - - NSString *acceptValue = [self secWebSocketKeyResponseHeaderValue]; - if (acceptValue) { - [wsResponse setHeaderField: @"Sec-WebSocket-Accept" value: acceptValue]; - } - - NSData *responseHeaders = [wsResponse messageData]; - - - if (HTTP_LOG_VERBOSE) - { - NSString *temp = [[NSString alloc] initWithData:responseHeaders encoding:NSUTF8StringEncoding]; - HTTPLogVerbose(@"%@[%p] Response Headers:\n%@", THIS_FILE, self, temp); - } - - [asyncSocket writeData:responseHeaders withTimeout:TIMEOUT_NONE tag:TAG_HTTP_RESPONSE_HEADERS]; -} - -- (NSData *)processKey:(NSString *)key -{ - HTTPLogTrace(); - - unichar c; - NSUInteger i; - NSUInteger length = [key length]; - - // Concatenate the digits into a string, - // and count the number of spaces. - - NSMutableString *numStr = [NSMutableString stringWithCapacity:10]; - long long numSpaces = 0; - - for (i = 0; i < length; i++) - { - c = [key characterAtIndex:i]; - - if (c >= '0' && c <= '9') - { - [numStr appendFormat:@"%C", c]; - } - else if (c == ' ') - { - numSpaces++; - } - } - - long long num = strtoll([numStr UTF8String], NULL, 10); - - long long resultHostNum; - - if (numSpaces == 0) - resultHostNum = 0; - else - resultHostNum = num / numSpaces; - - HTTPLogVerbose(@"key(%@) -> %qi / %qi = %qi", key, num, numSpaces, resultHostNum); - - // Convert result to 4 byte big-endian (network byte order) - // and then convert to raw data. - - UInt32 result = OSSwapHostToBigInt32((uint32_t)resultHostNum); - - return [NSData dataWithBytes:&result length:4]; -} - -- (void)sendResponseBody:(NSData *)d3 -{ - HTTPLogTrace(); - - NSAssert(isVersion76, @"WebSocket version 75 doesn't contain a response body"); - NSAssert([d3 length] == 8, @"Invalid requestBody length"); - - NSString *key1 = [request headerField:@"Sec-WebSocket-Key1"]; - NSString *key2 = [request headerField:@"Sec-WebSocket-Key2"]; - - NSData *d1 = [self processKey:key1]; - NSData *d2 = [self processKey:key2]; - - // Concatenated d1, d2 & d3 - - NSMutableData *d0 = [NSMutableData dataWithCapacity:(4+4+8)]; - [d0 appendData:d1]; - [d0 appendData:d2]; - [d0 appendData:d3]; - - // Hash the data using MD5 - - NSData *responseBody = [d0 md5Digest]; - - [asyncSocket writeData:responseBody withTimeout:TIMEOUT_NONE tag:TAG_HTTP_RESPONSE_BODY]; - - if (HTTP_LOG_VERBOSE) - { - NSString *s1 = [[NSString alloc] initWithData:d1 encoding:NSASCIIStringEncoding]; - NSString *s2 = [[NSString alloc] initWithData:d2 encoding:NSASCIIStringEncoding]; - NSString *s3 = [[NSString alloc] initWithData:d3 encoding:NSASCIIStringEncoding]; - - NSString *s0 = [[NSString alloc] initWithData:d0 encoding:NSASCIIStringEncoding]; - - NSString *sH = [[NSString alloc] initWithData:responseBody encoding:NSASCIIStringEncoding]; - - HTTPLogVerbose(@"key1 result : raw(%@) str(%@)", d1, s1); - HTTPLogVerbose(@"key2 result : raw(%@) str(%@)", d2, s2); - HTTPLogVerbose(@"key3 passed : raw(%@) str(%@)", d3, s3); - HTTPLogVerbose(@"key0 concat : raw(%@) str(%@)", d0, s0); - HTTPLogVerbose(@"responseBody: raw(%@) str(%@)", responseBody, sH); - - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Core Functionality -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (void)didOpen -{ - HTTPLogTrace(); - - // Override me to perform any custom actions once the WebSocket has been opened. - // This method is invoked on the websocketQueue. - // - // Don't forget to invoke [super didOpen] in your method. - - // Start reading for messages - [asyncSocket readDataToLength:1 withTimeout:TIMEOUT_NONE tag:(isRFC6455 ? TAG_PAYLOAD_PREFIX : TAG_PREFIX)]; - - // Notify delegate - if ([delegate respondsToSelector:@selector(webSocketDidOpen:)]) - { - [delegate webSocketDidOpen:self]; - } -} - -- (void)sendMessage:(NSString *)msg -{ - NSData *msgData = [msg dataUsingEncoding:NSUTF8StringEncoding]; - [self sendData:msgData]; -} - -- (void)sendData:(NSData *)msgData -{ - HTTPLogTrace(); - - NSMutableData *data = nil; - - if (isRFC6455) - { - NSUInteger length = msgData.length; - if (length <= 125) - { - data = [NSMutableData dataWithCapacity:(length + 2)]; - [data appendBytes: "\x81" length:1]; - UInt8 len = (UInt8)length; - [data appendBytes: &len length:1]; - [data appendData:msgData]; - } - else if (length <= 0xFFFF) - { - data = [NSMutableData dataWithCapacity:(length + 4)]; - [data appendBytes: "\x81\x7E" length:2]; - UInt16 len = (UInt16)length; - [data appendBytes: (UInt8[]){len >> 8, len & 0xFF} length:2]; - [data appendData:msgData]; - } - else - { - data = [NSMutableData dataWithCapacity:(length + 10)]; - [data appendBytes: "\x81\x7F" length:2]; - [data appendBytes: (UInt8[]){0, 0, 0, 0, (UInt8)(length >> 24), (UInt8)(length >> 16), (UInt8)(length >> 8), length & 0xFF} length:8]; - [data appendData:msgData]; - } - } - else - { - data = [NSMutableData dataWithCapacity:([msgData length] + 2)]; - - [data appendBytes:"\x00" length:1]; - [data appendData:msgData]; - [data appendBytes:"\xFF" length:1]; - } - - // Remember: GCDAsyncSocket is thread-safe - - [asyncSocket writeData:data withTimeout:TIMEOUT_NONE tag:0]; -} - -- (void)didReceiveMessage:(NSString *)msg -{ - HTTPLogTrace(); - - // Override me to process incoming messages. - // This method is invoked on the websocketQueue. - // - // For completeness, you should invoke [super didReceiveMessage:msg] in your method. - - // Notify delegate - if ([delegate respondsToSelector:@selector(webSocket:didReceiveMessage:)]) - { - [delegate webSocket:self didReceiveMessage:msg]; - } -} - -- (void)didClose -{ - HTTPLogTrace(); - - // Override me to perform any cleanup when the socket is closed - // This method is invoked on the websocketQueue. - // - // Don't forget to invoke [super didClose] at the end of your method. - - // Notify delegate - if ([delegate respondsToSelector:@selector(webSocketDidClose:)]) - { - [delegate webSocketDidClose:self]; - } - - // Notify HTTPServer - [[NSNotificationCenter defaultCenter] postNotificationName:WebSocketDidDieNotification object:self]; -} - -#pragma mark WebSocket Frame - -- (BOOL)isValidWebSocketFrame:(UInt8)frame -{ - NSUInteger rsv = frame & 0x70; - NSUInteger opcode = frame & 0x0F; - if (rsv || (3 <= opcode && opcode <= 7) || (0xB <= opcode && opcode <= 0xF)) - { - return NO; - } - return YES; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark AsyncSocket Delegate -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -// 0 1 2 3 -// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 -// +-+-+-+-+-------+-+-------------+-------------------------------+ -// |F|R|R|R| opcode|M| Payload len | Extended payload length | -// |I|S|S|S| (4) |A| (7) | (16/64) | -// |N|V|V|V| |S| | (if payload len==126/127) | -// | |1|2|3| |K| | | -// +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - + -// | Extended payload length continued, if payload len == 127 | -// + - - - - - - - - - - - - - - - +-------------------------------+ -// | |Masking-key, if MASK set to 1 | -// +-------------------------------+-------------------------------+ -// | Masking-key (continued) | Payload Data | -// +-------------------------------- - - - - - - - - - - - - - - - + -// : Payload Data continued ... : -// + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + -// | Payload Data continued ... | -// +---------------------------------------------------------------+ - -- (void)socket:(GCDAsyncSocket *)sock didReadData:(NSData *)data withTag:(long)tag -{ - HTTPLogTrace(); - - if (tag == TAG_HTTP_REQUEST_BODY) - { - [self sendResponseHeaders]; - [self sendResponseBody:data]; - [self didOpen]; - } - else if (tag == TAG_PREFIX) - { - UInt8 *pFrame = (UInt8 *)[data bytes]; - UInt8 frame = *pFrame; - - if (frame <= 0x7F) - { - [asyncSocket readDataToData:term withTimeout:TIMEOUT_NONE tag:TAG_MSG_PLUS_SUFFIX]; - } - else - { - // Unsupported frame type - [self didClose]; - } - } - else if (tag == TAG_PAYLOAD_PREFIX) - { - UInt8 *pFrame = (UInt8 *)[data bytes]; - UInt8 frame = *pFrame; - - if ([self isValidWebSocketFrame: frame]) - { - nextOpCode = (frame & 0x0F); - [asyncSocket readDataToLength:1 withTimeout:TIMEOUT_NONE tag:TAG_PAYLOAD_LENGTH]; - } - else - { - // Unsupported frame type - [self didClose]; - } - } - else if (tag == TAG_PAYLOAD_LENGTH) - { - UInt8 frame = *(UInt8 *)[data bytes]; - BOOL masked = WS_PAYLOAD_IS_MASKED(frame); - NSUInteger length = WS_PAYLOAD_LENGTH(frame); - nextFrameMasked = masked; - maskingKey = nil; - if (length <= 125) - { - if (nextFrameMasked) - { - [asyncSocket readDataToLength:4 withTimeout:TIMEOUT_NONE tag:TAG_MSG_MASKING_KEY]; - } - [asyncSocket readDataToLength:length withTimeout:TIMEOUT_NONE tag:TAG_MSG_WITH_LENGTH]; - } - else if (length == 126) - { - [asyncSocket readDataToLength:2 withTimeout:TIMEOUT_NONE tag:TAG_PAYLOAD_LENGTH16]; - } - else - { - [asyncSocket readDataToLength:8 withTimeout:TIMEOUT_NONE tag:TAG_PAYLOAD_LENGTH64]; - } - } - else if (tag == TAG_PAYLOAD_LENGTH16) - { - UInt8 *pFrame = (UInt8 *)[data bytes]; - NSUInteger length = ((NSUInteger)pFrame[0] << 8) | (NSUInteger)pFrame[1]; - if (nextFrameMasked) { - [asyncSocket readDataToLength:4 withTimeout:TIMEOUT_NONE tag:TAG_MSG_MASKING_KEY]; - } - [asyncSocket readDataToLength:length withTimeout:TIMEOUT_NONE tag:TAG_MSG_WITH_LENGTH]; - } - else if (tag == TAG_PAYLOAD_LENGTH64) - { - // FIXME: 64bit data size in memory? - [self didClose]; - } - else if (tag == TAG_MSG_WITH_LENGTH) - { - NSUInteger msgLength = [data length]; - if (nextFrameMasked && maskingKey) { - NSMutableData *masked = data.mutableCopy; - UInt8 *pData = (UInt8 *)masked.mutableBytes; - UInt8 *pMask = (UInt8 *)maskingKey.bytes; - for (NSUInteger i = 0; i < msgLength; i++) - { - pData[i] = pData[i] ^ pMask[i % 4]; - } - data = masked; - } - if (nextOpCode == WS_OP_TEXT_FRAME) - { - NSString *msg = [[NSString alloc] initWithBytes:[data bytes] length:msgLength encoding:NSUTF8StringEncoding]; - [self didReceiveMessage:msg]; - } - else - { - [self didClose]; - return; - } - - // Read next frame - [asyncSocket readDataToLength:1 withTimeout:TIMEOUT_NONE tag:TAG_PAYLOAD_PREFIX]; - } - else if (tag == TAG_MSG_MASKING_KEY) - { - maskingKey = data.copy; - } - else - { - NSUInteger msgLength = [data length] - 1; // Excluding ending 0xFF frame - - NSString *msg = [[NSString alloc] initWithBytes:[data bytes] length:msgLength encoding:NSUTF8StringEncoding]; - - [self didReceiveMessage:msg]; - - - // Read next message - [asyncSocket readDataToLength:1 withTimeout:TIMEOUT_NONE tag:TAG_PREFIX]; - } -} - -- (void)socketDidDisconnect:(GCDAsyncSocket *)sock withError:(NSError *)error -{ - HTTPLogTrace2(@"%@[%p]: socketDidDisconnect:withError: %@", THIS_FILE, self, error); - - [self didClose]; -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/MyHTTPConnection.h b/YuMi/Tools/CocoaHttpServer/MyHTTPConnection.h deleted file mode 100755 index 273bc19..0000000 --- a/YuMi/Tools/CocoaHttpServer/MyHTTPConnection.h +++ /dev/null @@ -1,58 +0,0 @@ - -#import "HTTPConnection.h" - -@class MultipartFormDataParser; -@class MyHTTPConnection; - -@protocol MyHTTPConnectionDelegate -@required - -/** - 设置目标地址 - - @param server 服务器 ftp self - @return 目标地址str - */ -- (NSString *)onSetDestinationPathHttpFileTranSportDestination:(MyHTTPConnection *)server; -@optional - -/** - 文件传输并存储成功 - - @param server 服务器 ftp self - @param filePath 文件路径（含文件名） - */ -- (void)onHttpFileTranSportServer:(MyHTTPConnection *)server successWithPath:(NSString *)filePath; - -/** - 文件判断 - - @param server 服务器 ftp self - @param filePath 文件路径（含文件名） - @return 如果是重复文件，就返回NO - */ -- (BOOL)onHttpFileDataEstimateDuplicateCanPassTranSportServer:(MyHTTPConnection *)server withPath:(NSString *)filePath andFileName:(NSString *)fileName; - -@end - -@interface MyHTTPConnection : HTTPConnection { - MultipartFormDataParser* parser; - NSFileHandle* storeFile; - NSMutableArray* uploadedFiles; -} - -/** - 文件路径（含文件名） - */ -@property (nonatomic, strong) NSString *filePath; - -/** - 文件夹路径（不含文件名） - */ -@property (strong, nonatomic) NSString *destinationPath; - -/** - delegate:MyHTTPConnectionDelegate - */ -@property (nonatomic, weak) id delegate; -@end diff --git a/YuMi/Tools/CocoaHttpServer/MyHTTPConnection.m b/YuMi/Tools/CocoaHttpServer/MyHTTPConnection.m deleted file mode 100755 index 2e56fd7..0000000 --- a/YuMi/Tools/CocoaHttpServer/MyHTTPConnection.m +++ /dev/null @@ -1,208 +0,0 @@ - -#import "MyHTTPConnection.h" -#import "HTTPMessage.h" -#import "HTTPDataResponse.h" -#import "DDNumber.h" -#import "HTTPLogging.h" - -#import "MultipartFormDataParser.h" -#import "MultipartMessageHeaderField.h" -#import "HTTPDynamicFileResponse.h" -#import "HTTPFileResponse.h" - - -// Log levels : off, error, warn, info, verbose -// Other flags: trace -static const int httpLogLevel = HTTP_LOG_LEVEL_VERBOSE; // | HTTP_LOG_FLAG_TRACE; - - -/** - * All we have to do is override appropriate methods in HTTPConnection. - **/ - -@implementation MyHTTPConnection - -- (BOOL)supportsMethod:(NSString *)method atPath:(NSString *)path { - - HTTPLogTrace(); - - // Add support for POST - - if ([method isEqualToString:@"POST"]) - { - if ([path isEqualToString:@"/upload.html"]) - { - return YES; - } - } - - return [super supportsMethod:method atPath:path]; -} - -- (BOOL)expectsRequestBodyFromMethod:(NSString *)method atPath:(NSString *)path { - - HTTPLogTrace(); - - // Inform HTTP server that we expect a body to accompany a POST request - - if([method isEqualToString:@"POST"] && [path isEqualToString:@"/upload.html"]) { - // here we need to make sure, boundary is set in header - NSString* contentType = [request headerField:@"Content-Type"]; - NSUInteger paramsSeparator = [contentType rangeOfString:@";"].location; - if( NSNotFound == paramsSeparator ) { - return NO; - } - if( paramsSeparator >= contentType.length - 1 ) { - return NO; - } - NSString* type = [contentType substringToIndex:paramsSeparator]; - if( ![type isEqualToString:@"multipart/form-data"] ) { - // we expect multipart/form-data content type - return NO; - } - - // enumerate all params in content-type, and find boundary there - NSArray* params = [[contentType substringFromIndex:paramsSeparator + 1] componentsSeparatedByString:@";"]; - for( NSString* param in params ) { - paramsSeparator = [param rangeOfString:@"="].location; - if( (NSNotFound == paramsSeparator) || paramsSeparator >= param.length - 1 ) { - continue; - } - NSString* paramName = [param substringWithRange:NSMakeRange(1, paramsSeparator-1)]; - NSString* paramValue = [param substringFromIndex:paramsSeparator+1]; - - if( [paramName isEqualToString: @"boundary"] ) { - // let's separate the boundary from content-type, to make it more handy to handle - [request setHeaderField:@"boundary" value:paramValue]; - } - } - // check if boundary specified - if( nil == [request headerField:@"boundary"] ) { - return NO; - } - return YES; - } - return [super expectsRequestBodyFromMethod:method atPath:path]; -} - -- (NSObject *)httpResponseForMethod:(NSString *)method URI:(NSString *)path { - - HTTPLogTrace(); - - if ([method isEqualToString:@"POST"] && [path isEqualToString:@"/upload.html"]) { - - // this method will generate response with links to uploaded file - NSMutableString* filesStr = [[NSMutableString alloc] init]; - - for( NSString* filePath in uploadedFiles ) { - //generate links - [filesStr appendFormat:@"     %@
    ",filePath, [filePath lastPathComponent]]; - } - NSString* templatePath = [[config documentRoot] stringByAppendingPathComponent:@"upload.html"]; - NSDictionary* replacementDict = [NSDictionary dictionaryWithObject:filesStr forKey:@"MyFiles"]; - // use dynamic file response to apply our links to response template - return [[HTTPDynamicFileResponse alloc] initWithFilePath:templatePath forConnection:self separator:@"%" replacementDictionary:replacementDict]; - } - if( [method isEqualToString:@"GET"] && [path hasPrefix:@"/upload/"] ) { - // let download the uploaded files - return [[HTTPFileResponse alloc] initWithFilePath: [[config documentRoot] stringByAppendingString:path] forConnection:self]; - } - - return [super httpResponseForMethod:method URI:path]; -} - -- (void)prepareForBodyWithSize:(UInt64)contentLength { - HTTPLogTrace(); - - // set up mime parser - NSString* boundary = [request headerField:@"boundary"]; - parser = [[MultipartFormDataParser alloc] initWithBoundary:boundary formEncoding:NSUTF8StringEncoding]; - parser.delegate = self; - - uploadedFiles = [[NSMutableArray alloc] init]; -} - -- (void)processBodyData:(NSData *)postDataChunk { - HTTPLogTrace(); - // append data to the parser. It will invoke callbacks to let us handle - // parsed data. - [parser appendData:postDataChunk]; -} - - -//----------------------------------------------------------------- -#pragma mark multipart form data parser delegate - - -- (void) processStartOfPartWithHeader:(MultipartMessageHeader*) header { - // in this sample, we are not interested in parts, other then file parts. - // check content disposition to find out filename - - MultipartMessageHeaderField* disposition = [header.fields objectForKey:@"Content-Disposition"]; - NSString* filename = [[disposition.params objectForKey:@"filename"] lastPathComponent]; - - if ( (nil == filename) || [filename isEqualToString: @""] ) { - // it's either not a file part, or - // an empty form sent. we won't handle it. - return; - } - - // 在这里修改文件存储的位置 - - NSAssert([self.delegate respondsToSelector:@selector(onSetDestinationPathHttpFileTranSportDestination:)], @"Need to add delegate name onSetDestinationPathHttpFileTranSportDestination to add a destinationPath"); - - if ([self.delegate respondsToSelector:@selector(onSetDestinationPathHttpFileTranSportDestination:)]) { - self.destinationPath = [self.delegate onSetDestinationPathHttpFileTranSportDestination:self]; - NSAssert(self.destinationPath.length > 0 || self.destinationPath, @"destinationPath can not be nil"); - } - - //拼接文件名或者预计文件路径 - NSString* filePath = [self.destinationPath stringByAppendingPathComponent: filename]; - self.filePath = filePath; - //需要判断是否存在重复文件 - if ([self.delegate respondsToSelector:@selector(onHttpFileDataEstimateDuplicateCanPassTranSportServer:withPath:andFileName:)]) { - if (![self.delegate onHttpFileDataEstimateDuplicateCanPassTranSportServer:self withPath:self.filePath andFileName:filename]) { - return; - }; - } - - HTTPLogVerbose(@"Saving file to %@", filePath); - if(![[NSFileManager defaultManager] createDirectoryAtPath:self.destinationPath withIntermediateDirectories:true attributes:nil error:nil]) { - HTTPLogError(@"Could not create directory at path: %@", filePath); - } - if(![[NSFileManager defaultManager] createFileAtPath:filePath contents:nil attributes:nil]) { - HTTPLogError(@"Could not create file at path: %@", filePath); - } - storeFile = [NSFileHandle fileHandleForWritingAtPath:filePath]; - [uploadedFiles addObject: [NSString stringWithFormat:@"/upload/%@", filename]]; -} - - -- (void) processContent:(NSData*) data WithHeader:(MultipartMessageHeader*) header { - // here we just write the output from parser to the file. - if( storeFile ) { - [storeFile writeData:data]; - } -} - -- (void) processEndOfPartWithHeader:(MultipartMessageHeader*) header { - // as the file part is over, we close the file. - [storeFile closeFile]; - storeFile = nil; -} - -- (void) processPreambleData:(NSData*) data { - // if we are interested in preamble data, we could process it here. - -} - -- (void) processEpilogueData:(NSData*) data { - // if we are interested in epilogue data, we could process it here. - //用户更新歌曲数量 - [[NSNotificationCenter defaultCenter] postNotificationName:@"processEpilogueData" object:nil]; - if ([self.delegate respondsToSelector:@selector(onHttpFileTranSportServer:successWithPath:)]) { - [self.delegate onHttpFileTranSportServer:self successWithPath:self.filePath]; - } -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/SJXCSMIPHelper.h b/YuMi/Tools/CocoaHttpServer/SJXCSMIPHelper.h deleted file mode 100755 index 7dd52c8..0000000 --- a/YuMi/Tools/CocoaHttpServer/SJXCSMIPHelper.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// SJXCSMIPHelper.h -// LocalReader -// -// Created by shapp on 2017/7/24. -// Copyright © 2017年 sjx. All rights reserved. -// - -#import - -@interface SJXCSMIPHelper : NSObject - -/** 获取ip地址 */ -+ (NSString *)deviceIPAddress; - -#pragma mark - 获取设备当前网络IP地址 -+ (NSString *)getIPAddress:(BOOL)preferIPv4; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/SJXCSMIPHelper.m b/YuMi/Tools/CocoaHttpServer/SJXCSMIPHelper.m deleted file mode 100755 index a345600..0000000 --- a/YuMi/Tools/CocoaHttpServer/SJXCSMIPHelper.m +++ /dev/null @@ -1,155 +0,0 @@ -// -// SJXCSMIPHelper.m -// LocalReader -// -// Created by shapp on 2017/7/24. -// Copyright © 2017年 sjx. All rights reserved. -// - -#import "SJXCSMIPHelper.h" -#import -#import -#import - -@implementation SJXCSMIPHelper - -+ (NSString *)deviceIPAddress { - - NSString *address = @"an error occurred when obtaining ip address"; - - struct ifaddrs *interfaces = NULL; - - struct ifaddrs *temp_addr = NULL; - - int success = 0; - - success = getifaddrs(&interfaces); - - if (success == 0) { // 0 表示获取成功 - - temp_addr = interfaces; - - while (temp_addr != NULL) { - - if( temp_addr->ifa_addr->sa_family == AF_INET) { - - // Check if interface is en0 which is the wifi connection on the iPhone - - if ([[NSString stringWithUTF8String:temp_addr->ifa_name] isEqualToString:@"en0"]) { - - // Get NSString from C String - - address = [NSString stringWithUTF8String:inet_ntoa(((struct sockaddr_in *)temp_addr->ifa_addr)->sin_addr)]; - - } - - } - - temp_addr = temp_addr->ifa_next; - - } - - } - - freeifaddrs(interfaces); - - return address; - -} - - -#define IOS_CELLULAR @"pdp_ip0" -#define IOS_WIFI @"en0" -#define IOS_VPN @"utun0" -#define IP_ADDR_IPv4 @"ipv4" -#define IP_ADDR_IPv6 @"ipv6" - -#pragma mark - 获取设备当前网络IP地址 -+ (NSString *)getIPAddress:(BOOL)preferIPv4 -{ - NSArray *searchArray = preferIPv4 ? - @[ IOS_VPN @"/" IP_ADDR_IPv4, IOS_VPN @"/" IP_ADDR_IPv6, IOS_WIFI @"/" IP_ADDR_IPv4, IOS_WIFI @"/" IP_ADDR_IPv6, IOS_CELLULAR @"/" IP_ADDR_IPv4, IOS_CELLULAR @"/" IP_ADDR_IPv6 ] : - @[ IOS_VPN @"/" IP_ADDR_IPv6, IOS_VPN @"/" IP_ADDR_IPv4, IOS_WIFI @"/" IP_ADDR_IPv6, IOS_WIFI @"/" IP_ADDR_IPv4, IOS_CELLULAR @"/" IP_ADDR_IPv6, IOS_CELLULAR @"/" IP_ADDR_IPv4 ] ; - - NSDictionary *addresses = [self getIPAddresses]; - NSLog(@"addresses: %@", addresses); - - __block NSString *address; - [searchArray enumerateObjectsUsingBlock:^(NSString *key, NSUInteger idx, BOOL *stop) - { - address = addresses[key]; - //筛选出IP地址格式 - if([self isValidatIP:address]) *stop = YES; - } ]; - return address ? address : @"0.0.0.0"; -} - -+ (BOOL)isValidatIP:(NSString *)ipAddress { - if (ipAddress.length == 0) { - return NO; - } - NSString *urlRegEx = @"^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." - "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." - "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." - "([01]?\\d\\d?|2[0-4]\\d|25[0-5])$"; - - NSError *error; - NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:urlRegEx options:0 error:&error]; - - if (regex != nil) { - NSTextCheckingResult *firstMatch=[regex firstMatchInString:ipAddress options:0 range:NSMakeRange(0, [ipAddress length])]; - - if (firstMatch) { - NSRange resultRange = [firstMatch rangeAtIndex:0]; - NSString *result=[ipAddress substringWithRange:resultRange]; - //输出结果 - NSLog(@"%@",result); - return YES; - } - } - return NO; -} - -+ (NSDictionary *)getIPAddresses -{ - NSMutableDictionary *addresses = [NSMutableDictionary dictionaryWithCapacity:8]; - - // retrieve the current interfaces - returns 0 on success - struct ifaddrs *interfaces; - if(!getifaddrs(&interfaces)) { - // Loop through linked list of interfaces - struct ifaddrs *interface; - for(interface=interfaces; interface; interface=interface->ifa_next) { - if(!(interface->ifa_flags & IFF_UP) /* || (interface->ifa_flags & IFF_LOOPBACK) */ ) { - continue; // deeply nested code harder to read - } - const struct sockaddr_in *addr = (const struct sockaddr_in*)interface->ifa_addr; - char addrBuf[ MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN) ]; - if(addr && (addr->sin_family==AF_INET || addr->sin_family==AF_INET6)) { - NSString *name = [NSString stringWithUTF8String:interface->ifa_name]; - NSString *type; - if(addr->sin_family == AF_INET) { - if(inet_ntop(AF_INET, &addr->sin_addr, addrBuf, INET_ADDRSTRLEN)) { - type = IP_ADDR_IPv4; - } - } else { - const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6*)interface->ifa_addr; - if(inet_ntop(AF_INET6, &addr6->sin6_addr, addrBuf, INET6_ADDRSTRLEN)) { - type = IP_ADDR_IPv6; - } - } - if(type) { - NSString *key = [NSString stringWithFormat:@"%@/%@", name, type]; - addresses[key] = [NSString stringWithUTF8String:addrBuf]; - } - } - } - // Free memory - freeifaddrs(interfaces); - } - return [addresses count] ? addresses : nil; -} - - - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDASLLogger.h b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDASLLogger.h deleted file mode 100755 index e9f6202..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDASLLogger.h +++ /dev/null @@ -1,41 +0,0 @@ -#import -#import - -#import "DDLog.h" - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" wiki. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted - * - * - * This class provides a logger for the Apple System Log facility. - * - * As described in the "Getting Started" page, - * the traditional NSLog() function directs it's output to two places: - * - * - Apple System Log - * - StdErr (if stderr is a TTY) so log statements show up in Xcode console - * - * To duplicate NSLog() functionality you can simply add this logger and a tty logger. - * However, if you instead choose to use file logging (for faster performance), - * you may choose to use a file logger and a tty logger. -**/ - -@interface DDASLLogger : DDAbstractLogger -{ - aslclient client; -} - -+ (DDASLLogger *)sharedInstance; - -// Inherited from DDAbstractLogger - -// - (id )logFormatter; -// - (void)setLogFormatter:(id )formatter; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDASLLogger.m b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDASLLogger.m deleted file mode 100755 index 0c35f2f..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDASLLogger.m +++ /dev/null @@ -1,99 +0,0 @@ -#import "DDASLLogger.h" - -#import - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" wiki. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted -**/ - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - - -@implementation DDASLLogger - -static DDASLLogger *sharedInstance; - -/** - * The runtime sends initialize to each class in a program exactly one time just before the class, - * or any class that inherits from it, is sent its first message from within the program. (Thus the - * method may never be invoked if the class is not used.) The runtime sends the initialize message to - * classes in a thread-safe manner. Superclasses receive this message before their subclasses. - * - * This method may also be called directly (assumably by accident), hence the safety mechanism. -**/ -+ (void)initialize -{ - static BOOL initialized = NO; - if (!initialized) - { - initialized = YES; - - sharedInstance = [[DDASLLogger alloc] init]; - } -} - -+ (DDASLLogger *)sharedInstance -{ - return sharedInstance; -} - -- (id)init -{ - if (sharedInstance != nil) - { - return nil; - } - - if ((self = [super init])) - { - // A default asl client is provided for the main thread, - // but background threads need to create their own client. - - client = asl_open(NULL, "com.apple.console", 0); - } - return self; -} - -- (void)logMessage:(DDLogMessage *)logMessage -{ - NSString *logMsg = logMessage->logMsg; - - if (formatter) - { - logMsg = [formatter formatLogMessage:logMessage]; - } - - if (logMsg) - { - const char *msg = [logMsg UTF8String]; - - int aslLogLevel; - switch (logMessage->logFlag) - { - // Note: By default ASL will filter anything above level 5 (Notice). - // So our mappings shouldn't go above that level. - - case LOG_FLAG_ERROR : aslLogLevel = ASL_LEVEL_CRIT; break; - case LOG_FLAG_WARN : aslLogLevel = ASL_LEVEL_ERR; break; - case LOG_FLAG_INFO : aslLogLevel = ASL_LEVEL_WARNING; break; - default : aslLogLevel = ASL_LEVEL_NOTICE; break; - } - - asl_log(client, NULL, aslLogLevel, "%s", msg); - } -} - -- (NSString *)loggerName -{ - return @"cocoa.lumberjack.aslLogger"; -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.h b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.h deleted file mode 100755 index 73769bb..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.h +++ /dev/null @@ -1,102 +0,0 @@ -#import - -#import "DDLog.h" - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" wiki. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted - * - * - * This class provides an abstract implementation of a database logger. - * - * That is, it provides the base implementation for a database logger to build atop of. - * All that is needed for a concrete database logger is to extend this class - * and override the methods in the implementation file that are prefixed with "db_". -**/ - -@interface DDAbstractDatabaseLogger : DDAbstractLogger { -@protected - NSUInteger saveThreshold; - NSTimeInterval saveInterval; - NSTimeInterval maxAge; - NSTimeInterval deleteInterval; - BOOL deleteOnEverySave; - - BOOL saveTimerSuspended; - NSUInteger unsavedCount; - dispatch_time_t unsavedTime; - dispatch_source_t saveTimer; - dispatch_time_t lastDeleteTime; - dispatch_source_t deleteTimer; -} - -/** - * Specifies how often to save the data to disk. - * Since saving is an expensive operation (disk io) it is not done after every log statement. - * These properties allow you to configure how/when the logger saves to disk. - * - * A save is done when either (whichever happens first): - * - * - The number of unsaved log entries reaches saveThreshold - * - The amount of time since the oldest unsaved log entry was created reaches saveInterval - * - * You can optionally disable the saveThreshold by setting it to zero. - * If you disable the saveThreshold you are entirely dependent on the saveInterval. - * - * You can optionally disable the saveInterval by setting it to zero (or a negative value). - * If you disable the saveInterval you are entirely dependent on the saveThreshold. - * - * It's not wise to disable both saveThreshold and saveInterval. - * - * The default saveThreshold is 500. - * The default saveInterval is 60 seconds. -**/ -@property (assign, readwrite) NSUInteger saveThreshold; -@property (assign, readwrite) NSTimeInterval saveInterval; - -/** - * It is likely you don't want the log entries to persist forever. - * Doing so would allow the database to grow infinitely large over time. - * - * The maxAge property provides a way to specify how old a log statement can get - * before it should get deleted from the database. - * - * The deleteInterval specifies how often to sweep for old log entries. - * Since deleting is an expensive operation (disk io) is is done on a fixed interval. - * - * An alternative to the deleteInterval is the deleteOnEverySave option. - * This specifies that old log entries should be deleted during every save operation. - * - * You can optionally disable the maxAge by setting it to zero (or a negative value). - * If you disable the maxAge then old log statements are not deleted. - * - * You can optionally disable the deleteInterval by setting it to zero (or a negative value). - * - * If you disable both deleteInterval and deleteOnEverySave then old log statements are not deleted. - * - * It's not wise to enable both deleteInterval and deleteOnEverySave. - * - * The default maxAge is 7 days. - * The default deleteInterval is 5 minutes. - * The default deleteOnEverySave is NO. -**/ -@property (assign, readwrite) NSTimeInterval maxAge; -@property (assign, readwrite) NSTimeInterval deleteInterval; -@property (assign, readwrite) BOOL deleteOnEverySave; - -/** - * Forces a save of any pending log entries (flushes log entries to disk). -**/ -- (void)savePendingLogEntries; - -/** - * Removes any log entries that are older than maxAge. -**/ -- (void)deleteOldLogEntries; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.m b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.m deleted file mode 100755 index c7366a6..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.m +++ /dev/null @@ -1,727 +0,0 @@ -#import "DDAbstractDatabaseLogger.h" -#import - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" wiki. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted -**/ - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -@interface DDAbstractDatabaseLogger () -- (void)destroySaveTimer; -- (void)destroyDeleteTimer; -@end - -#pragma mark - - -@implementation DDAbstractDatabaseLogger - -- (id)init -{ - if ((self = [super init])) - { - saveThreshold = 500; - saveInterval = 60; // 60 seconds - maxAge = (60 * 60 * 24 * 7); // 7 days - deleteInterval = (60 * 5); // 5 minutes - } - return self; -} - -- (void)dealloc -{ - [self destroySaveTimer]; - [self destroyDeleteTimer]; - -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Override Me -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (BOOL)db_log:(DDLogMessage *)logMessage -{ - // Override me and add your implementation. - // - // Return YES if an item was added to the buffer. - // Return NO if the logMessage was ignored. - - return NO; -} - -- (void)db_save -{ - // Override me and add your implementation. -} - -- (void)db_delete -{ - // Override me and add your implementation. -} - -- (void)db_saveAndDelete -{ - // Override me and add your implementation. -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Private API -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (void)performSaveAndSuspendSaveTimer -{ - if (unsavedCount > 0) - { - if (deleteOnEverySave) - [self db_saveAndDelete]; - else - [self db_save]; - } - - unsavedCount = 0; - unsavedTime = 0; - - if (saveTimer && !saveTimerSuspended) - { - dispatch_suspend(saveTimer); - saveTimerSuspended = YES; - } -} - -- (void)performDelete -{ - if (maxAge > 0.0) - { - [self db_delete]; - - lastDeleteTime = dispatch_time(DISPATCH_TIME_NOW, 0); - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Timers -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (void)destroySaveTimer -{ - if (saveTimer) - { - dispatch_source_cancel(saveTimer); - if (saveTimerSuspended) - { - // Must resume a timer before releasing it (or it will crash) - dispatch_resume(saveTimer); - saveTimerSuspended = NO; - } - #if !OS_OBJECT_USE_OBJC - dispatch_release(saveTimer); - #endif - saveTimer = NULL; - } -} - -- (void)updateAndResumeSaveTimer -{ - if ((saveTimer != NULL) && (saveInterval > 0.0) && (unsavedTime > 0.0)) - { - uint64_t interval = (uint64_t)(saveInterval * NSEC_PER_SEC); - dispatch_time_t startTime = dispatch_time(unsavedTime, interval); - - dispatch_source_set_timer(saveTimer, startTime, interval, 1.0); - - if (saveTimerSuspended) - { - dispatch_resume(saveTimer); - saveTimerSuspended = NO; - } - } -} - -- (void)createSuspendedSaveTimer -{ - if ((saveTimer == NULL) && (saveInterval > 0.0)) - { - saveTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, loggerQueue); - - dispatch_source_set_event_handler(saveTimer, ^{ @autoreleasepool { - - [self performSaveAndSuspendSaveTimer]; - - }}); - - saveTimerSuspended = YES; - } -} - -- (void)destroyDeleteTimer -{ - if (deleteTimer) - { - dispatch_source_cancel(deleteTimer); - #if !OS_OBJECT_USE_OBJC - dispatch_release(deleteTimer); - #endif - deleteTimer = NULL; - } -} - -- (void)updateDeleteTimer -{ - if ((deleteTimer != NULL) && (deleteInterval > 0.0) && (maxAge > 0.0)) - { - uint64_t interval = (uint64_t)(deleteInterval * NSEC_PER_SEC); - dispatch_time_t startTime; - - if (lastDeleteTime > 0) - startTime = dispatch_time(lastDeleteTime, interval); - else - startTime = dispatch_time(DISPATCH_TIME_NOW, interval); - - dispatch_source_set_timer(deleteTimer, startTime, interval, 1.0); - } -} - -- (void)createAndStartDeleteTimer -{ - if ((deleteTimer == NULL) && (deleteInterval > 0.0) && (maxAge > 0.0)) - { - deleteTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, loggerQueue); - - if (deleteTimer != NULL) { - dispatch_source_set_event_handler(deleteTimer, ^{ @autoreleasepool { - - [self performDelete]; - - }}); - - [self updateDeleteTimer]; - - dispatch_resume(deleteTimer); - } - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Configuration -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (NSUInteger)saveThreshold -{ - // The design of this method is taken from the DDAbstractLogger implementation. - // For extensive documentation please refer to the DDAbstractLogger implementation. - - // Note: The internal implementation MUST access the colorsEnabled variable directly, - // This method is designed explicitly for external access. - // - // Using "self." syntax to go through this method will cause immediate deadlock. - // This is the intended result. Fix it by accessing the ivar directly. - // Great strides have been take to ensure this is safe to do. Plus it's MUCH faster. - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - __block NSUInteger result; - - dispatch_sync(globalLoggingQueue, ^{ - dispatch_sync(loggerQueue, ^{ - result = saveThreshold; - }); - }); - - return result; -} - -- (void)setSaveThreshold:(NSUInteger)threshold -{ - dispatch_block_t block = ^{ @autoreleasepool { - - if (saveThreshold != threshold) - { - saveThreshold = threshold; - - // Since the saveThreshold has changed, - // we check to see if the current unsavedCount has surpassed the new threshold. - // - // If it has, we immediately save the log. - - if ((unsavedCount >= saveThreshold) && (saveThreshold > 0)) - { - [self performSaveAndSuspendSaveTimer]; - } - } - }}; - - // The design of the setter logic below is taken from the DDAbstractLogger implementation. - // For documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -- (NSTimeInterval)saveInterval -{ - // The design of this method is taken from the DDAbstractLogger implementation. - // For extensive documentation please refer to the DDAbstractLogger implementation. - - // Note: The internal implementation MUST access the colorsEnabled variable directly, - // This method is designed explicitly for external access. - // - // Using "self." syntax to go through this method will cause immediate deadlock. - // This is the intended result. Fix it by accessing the ivar directly. - // Great strides have been take to ensure this is safe to do. Plus it's MUCH faster. - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - __block NSTimeInterval result; - - dispatch_sync(globalLoggingQueue, ^{ - dispatch_sync(loggerQueue, ^{ - result = saveInterval; - }); - }); - - return result; -} - -- (void)setSaveInterval:(NSTimeInterval)interval -{ - dispatch_block_t block = ^{ @autoreleasepool { - - // C99 recommended floating point comparison macro - // Read: isLessThanOrGreaterThan(floatA, floatB) - - if (/* saveInterval != interval */ islessgreater(saveInterval, interval)) - { - saveInterval = interval; - - // There are several cases we need to handle here. - // - // 1. If the saveInterval was previously enabled and it just got disabled, - // then we need to stop the saveTimer. (And we might as well release it.) - // - // 2. If the saveInterval was previously disabled and it just got enabled, - // then we need to setup the saveTimer. (Plus we might need to do an immediate save.) - // - // 3. If the saveInterval increased, then we need to reset the timer so that it fires at the later date. - // - // 4. If the saveInterval decreased, then we need to reset the timer so that it fires at an earlier date. - // (Plus we might need to do an immediate save.) - - if (saveInterval > 0.0) - { - if (saveTimer == NULL) - { - // Handles #2 - // - // Since the saveTimer uses the unsavedTime to calculate it's first fireDate, - // if a save is needed the timer will fire immediately. - - [self createSuspendedSaveTimer]; - [self updateAndResumeSaveTimer]; - } - else - { - // Handles #3 - // Handles #4 - // - // Since the saveTimer uses the unsavedTime to calculate it's first fireDate, - // if a save is needed the timer will fire immediately. - - [self updateAndResumeSaveTimer]; - } - } - else if (saveTimer) - { - // Handles #1 - - [self destroySaveTimer]; - } - } - }}; - - // The design of the setter logic below is taken from the DDAbstractLogger implementation. - // For documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -- (NSTimeInterval)maxAge -{ - // The design of this method is taken from the DDAbstractLogger implementation. - // For extensive documentation please refer to the DDAbstractLogger implementation. - - // Note: The internal implementation MUST access the colorsEnabled variable directly, - // This method is designed explicitly for external access. - // - // Using "self." syntax to go through this method will cause immediate deadlock. - // This is the intended result. Fix it by accessing the ivar directly. - // Great strides have been take to ensure this is safe to do. Plus it's MUCH faster. - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - __block NSTimeInterval result; - - dispatch_sync(globalLoggingQueue, ^{ - dispatch_sync(loggerQueue, ^{ - result = maxAge; - }); - }); - - return result; -} - -- (void)setMaxAge:(NSTimeInterval)interval -{ - dispatch_block_t block = ^{ @autoreleasepool { - - // C99 recommended floating point comparison macro - // Read: isLessThanOrGreaterThan(floatA, floatB) - - if (/* maxAge != interval */ islessgreater(maxAge, interval)) - { - NSTimeInterval oldMaxAge = maxAge; - NSTimeInterval newMaxAge = interval; - - maxAge = interval; - - // There are several cases we need to handle here. - // - // 1. If the maxAge was previously enabled and it just got disabled, - // then we need to stop the deleteTimer. (And we might as well release it.) - // - // 2. If the maxAge was previously disabled and it just got enabled, - // then we need to setup the deleteTimer. (Plus we might need to do an immediate delete.) - // - // 3. If the maxAge was increased, - // then we don't need to do anything. - // - // 4. If the maxAge was decreased, - // then we should do an immediate delete. - - BOOL shouldDeleteNow = NO; - - if (oldMaxAge > 0.0) - { - if (newMaxAge <= 0.0) - { - // Handles #1 - - [self destroyDeleteTimer]; - } - else if (oldMaxAge > newMaxAge) - { - // Handles #4 - shouldDeleteNow = YES; - } - } - else if (newMaxAge > 0.0) - { - // Handles #2 - shouldDeleteNow = YES; - } - - if (shouldDeleteNow) - { - [self performDelete]; - - if (deleteTimer) - [self updateDeleteTimer]; - else - [self createAndStartDeleteTimer]; - } - } - }}; - - // The design of the setter logic below is taken from the DDAbstractLogger implementation. - // For documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -- (NSTimeInterval)deleteInterval -{ - // The design of this method is taken from the DDAbstractLogger implementation. - // For extensive documentation please refer to the DDAbstractLogger implementation. - - // Note: The internal implementation MUST access the colorsEnabled variable directly, - // This method is designed explicitly for external access. - // - // Using "self." syntax to go through this method will cause immediate deadlock. - // This is the intended result. Fix it by accessing the ivar directly. - // Great strides have been take to ensure this is safe to do. Plus it's MUCH faster. - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - __block NSTimeInterval result; - - dispatch_sync(globalLoggingQueue, ^{ - dispatch_sync(loggerQueue, ^{ - result = deleteInterval; - }); - }); - - return result; -} - -- (void)setDeleteInterval:(NSTimeInterval)interval -{ - dispatch_block_t block = ^{ @autoreleasepool { - - // C99 recommended floating point comparison macro - // Read: isLessThanOrGreaterThan(floatA, floatB) - - if (/* deleteInterval != interval */ islessgreater(deleteInterval, interval)) - { - deleteInterval = interval; - - // There are several cases we need to handle here. - // - // 1. If the deleteInterval was previously enabled and it just got disabled, - // then we need to stop the deleteTimer. (And we might as well release it.) - // - // 2. If the deleteInterval was previously disabled and it just got enabled, - // then we need to setup the deleteTimer. (Plus we might need to do an immediate delete.) - // - // 3. If the deleteInterval increased, then we need to reset the timer so that it fires at the later date. - // - // 4. If the deleteInterval decreased, then we need to reset the timer so that it fires at an earlier date. - // (Plus we might need to do an immediate delete.) - - if (deleteInterval > 0.0) - { - if (deleteTimer == NULL) - { - // Handles #2 - // - // Since the deleteTimer uses the lastDeleteTime to calculate it's first fireDate, - // if a delete is needed the timer will fire immediately. - - [self createAndStartDeleteTimer]; - } - else - { - // Handles #3 - // Handles #4 - // - // Since the deleteTimer uses the lastDeleteTime to calculate it's first fireDate, - // if a save is needed the timer will fire immediately. - - [self updateDeleteTimer]; - } - } - else if (deleteTimer) - { - // Handles #1 - - [self destroyDeleteTimer]; - } - } - }}; - - // The design of the setter logic below is taken from the DDAbstractLogger implementation. - // For documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -- (BOOL)deleteOnEverySave -{ - // The design of this method is taken from the DDAbstractLogger implementation. - // For extensive documentation please refer to the DDAbstractLogger implementation. - - // Note: The internal implementation MUST access the colorsEnabled variable directly, - // This method is designed explicitly for external access. - // - // Using "self." syntax to go through this method will cause immediate deadlock. - // This is the intended result. Fix it by accessing the ivar directly. - // Great strides have been take to ensure this is safe to do. Plus it's MUCH faster. - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - __block BOOL result; - - dispatch_sync(globalLoggingQueue, ^{ - dispatch_sync(loggerQueue, ^{ - result = deleteOnEverySave; - }); - }); - - return result; -} - -- (void)setDeleteOnEverySave:(BOOL)flag -{ - dispatch_block_t block = ^{ - - deleteOnEverySave = flag; - }; - - // The design of the setter logic below is taken from the DDAbstractLogger implementation. - // For documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Public API -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (void)savePendingLogEntries -{ - dispatch_block_t block = ^{ @autoreleasepool { - - [self performSaveAndSuspendSaveTimer]; - }}; - - if ([self isOnInternalLoggerQueue]) - block(); - else - dispatch_async(loggerQueue, block); -} - -- (void)deleteOldLogEntries -{ - dispatch_block_t block = ^{ @autoreleasepool { - - [self performDelete]; - }}; - - if ([self isOnInternalLoggerQueue]) - block(); - else - dispatch_async(loggerQueue, block); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark DDLogger -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (void)didAddLogger -{ - // If you override me be sure to invoke [super didAddLogger]; - - [self createSuspendedSaveTimer]; - - [self createAndStartDeleteTimer]; -} - -- (void)willRemoveLogger -{ - // If you override me be sure to invoke [super willRemoveLogger]; - - [self performSaveAndSuspendSaveTimer]; - - [self destroySaveTimer]; - [self destroyDeleteTimer]; -} - -- (void)logMessage:(DDLogMessage *)logMessage -{ - if ([self db_log:logMessage]) - { - BOOL firstUnsavedEntry = (++unsavedCount == 1); - - if ((unsavedCount >= saveThreshold) && (saveThreshold > 0)) - { - [self performSaveAndSuspendSaveTimer]; - } - else if (firstUnsavedEntry) - { - unsavedTime = dispatch_time(DISPATCH_TIME_NOW, 0); - [self updateAndResumeSaveTimer]; - } - } -} - -- (void)flush -{ - // This method is invoked by DDLog's flushLog method. - // - // It is called automatically when the application quits, - // or if the developer invokes DDLog's flushLog method prior to crashing or something. - - [self performSaveAndSuspendSaveTimer]; -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDFileLogger.h b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDFileLogger.h deleted file mode 100755 index 9d3ecee..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDFileLogger.h +++ /dev/null @@ -1,334 +0,0 @@ -#import -#import "DDLog.h" - -@class DDLogFileInfo; - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" wiki. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted - * - * - * This class provides a logger to write log statements to a file. -**/ - - -// Default configuration and safety/sanity values. -// -// maximumFileSize -> DEFAULT_LOG_MAX_FILE_SIZE -// rollingFrequency -> DEFAULT_LOG_ROLLING_FREQUENCY -// maximumNumberOfLogFiles -> DEFAULT_LOG_MAX_NUM_LOG_FILES -// -// You should carefully consider the proper configuration values for your application. - -#define DEFAULT_LOG_MAX_FILE_SIZE (1024 * 1024) // 1 MB -#define DEFAULT_LOG_ROLLING_FREQUENCY (60 * 60 * 24) // 24 Hours -#define DEFAULT_LOG_MAX_NUM_LOG_FILES (5) // 5 Files - - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -// The LogFileManager protocol is designed to allow you to control all aspects of your log files. -// -// The primary purpose of this is to allow you to do something with the log files after they have been rolled. -// Perhaps you want to compress them to save disk space. -// Perhaps you want to upload them to an FTP server. -// Perhaps you want to run some analytics on the file. -// -// A default LogFileManager is, of course, provided. -// The default LogFileManager simply deletes old log files according to the maximumNumberOfLogFiles property. -// -// This protocol provides various methods to fetch the list of log files. -// -// There are two variants: sorted and unsorted. -// If sorting is not necessary, the unsorted variant is obviously faster. -// The sorted variant will return an array sorted by when the log files were created, -// with the most recently created log file at index 0, and the oldest log file at the end of the array. -// -// You can fetch only the log file paths (full path including name), log file names (name only), -// or an array of DDLogFileInfo objects. -// The DDLogFileInfo class is documented below, and provides a handy wrapper that -// gives you easy access to various file attributes such as the creation date or the file size. - -@protocol DDLogFileManager -@required - -// Public properties - -/** - * The maximum number of archived log files to keep on disk. - * For example, if this property is set to 3, - * then the LogFileManager will only keep 3 archived log files (plus the current active log file) on disk. - * Once the active log file is rolled/archived, then the oldest of the existing 3 rolled/archived log files is deleted. - * - * You may optionally disable deleting old/rolled/archived log files by setting this property to zero. -**/ -@property (readwrite, assign) NSUInteger maximumNumberOfLogFiles; - -// Public methods - -- (NSString *)logsDirectory; - -- (NSArray *)unsortedLogFilePaths; -- (NSArray *)unsortedLogFileNames; -- (NSArray *)unsortedLogFileInfos; - -- (NSArray *)sortedLogFilePaths; -- (NSArray *)sortedLogFileNames; -- (NSArray *)sortedLogFileInfos; - -// Private methods (only to be used by DDFileLogger) - -- (NSString *)createNewLogFile; - -@optional - -// Notifications from DDFileLogger - -- (void)didArchiveLogFile:(NSString *)logFilePath; -- (void)didRollAndArchiveLogFile:(NSString *)logFilePath; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Default log file manager. - * - * All log files are placed inside the logsDirectory. - * If a specific logsDirectory isn't specified, the default directory is used. - * On Mac, this is in ~/Library/Logs/. - * On iPhone, this is in ~/Library/Caches/Logs. - * - * Log files are named "log-.txt", - * where uuid is a 6 character hexadecimal consisting of the set [0123456789ABCDEF]. - * - * Archived log files are automatically deleted according to the maximumNumberOfLogFiles property. -**/ -@interface DDLogFileManagerDefault : NSObject -{ - NSUInteger maximumNumberOfLogFiles; - NSString *_logsDirectory; -} - -- (id)init; -- (id)initWithLogsDirectory:(NSString *)logsDirectory; - -/* Inherited from DDLogFileManager protocol: - -@property (readwrite, assign) NSUInteger maximumNumberOfLogFiles; - -- (NSString *)logsDirectory; - -- (NSArray *)unsortedLogFilePaths; -- (NSArray *)unsortedLogFileNames; -- (NSArray *)unsortedLogFileInfos; - -- (NSArray *)sortedLogFilePaths; -- (NSArray *)sortedLogFileNames; -- (NSArray *)sortedLogFileInfos; - -*/ - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Most users will want file log messages to be prepended with the date and time. - * Rather than forcing the majority of users to write their own formatter, - * we will supply a logical default formatter. - * Users can easily replace this formatter with their own by invoking the setLogFormatter method. - * It can also be removed by calling setLogFormatter, and passing a nil parameter. - * - * In addition to the convenience of having a logical default formatter, - * it will also provide a template that makes it easy for developers to copy and change. -**/ -@interface DDLogFileFormatterDefault : NSObject -{ - NSDateFormatter *dateFormatter; -} - -- (id)init; -- (id)initWithDateFormatter:(NSDateFormatter *)dateFormatter; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@interface DDFileLogger : DDAbstractLogger -{ - __strong id logFileManager; - - DDLogFileInfo *currentLogFileInfo; - NSFileHandle *currentLogFileHandle; - - dispatch_source_t rollingTimer; - - unsigned long long maximumFileSize; - NSTimeInterval rollingFrequency; -} - -- (id)init; -- (id)initWithLogFileManager:(id )logFileManager; - -/** - * Log File Rolling: - * - * maximumFileSize: - * The approximate maximum size to allow log files to grow. - * If a log file is larger than this value after a log statement is appended, - * then the log file is rolled. - * - * rollingFrequency - * How often to roll the log file. - * The frequency is given as an NSTimeInterval, which is a double that specifies the interval in seconds. - * Once the log file gets to be this old, it is rolled. - * - * Both the maximumFileSize and the rollingFrequency are used to manage rolling. - * Whichever occurs first will cause the log file to be rolled. - * - * For example: - * The rollingFrequency is 24 hours, - * but the log file surpasses the maximumFileSize after only 20 hours. - * The log file will be rolled at that 20 hour mark. - * A new log file will be created, and the 24 hour timer will be restarted. - * - * You may optionally disable rolling due to filesize by setting maximumFileSize to zero. - * If you do so, rolling is based solely on rollingFrequency. - * - * You may optionally disable rolling due to time by setting rollingFrequency to zero (or any non-positive number). - * If you do so, rolling is based solely on maximumFileSize. - * - * If you disable both maximumFileSize and rollingFrequency, then the log file won't ever be rolled. - * This is strongly discouraged. -**/ -@property (readwrite, assign) unsigned long long maximumFileSize; -@property (readwrite, assign) NSTimeInterval rollingFrequency; - -/** - * The DDLogFileManager instance can be used to retrieve the list of log files, - * and configure the maximum number of archived log files to keep. - * - * @see DDLogFileManager.maximumNumberOfLogFiles -**/ -@property (strong, nonatomic, readonly) id logFileManager; - - -// You can optionally force the current log file to be rolled with this method. - -- (void)rollLogFile; - -// Inherited from DDAbstractLogger - -// - (id )logFormatter; -// - (void)setLogFormatter:(id )formatter; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * DDLogFileInfo is a simple class that provides access to various file attributes. - * It provides good performance as it only fetches the information if requested, - * and it caches the information to prevent duplicate fetches. - * - * It was designed to provide quick snapshots of the current state of log files, - * and to help sort log files in an array. - * - * This class does not monitor the files, or update it's cached attribute values if the file changes on disk. - * This is not what the class was designed for. - * - * If you absolutely must get updated values, - * you can invoke the reset method which will clear the cache. -**/ -@interface DDLogFileInfo : NSObject -{ - __strong NSString *filePath; - __strong NSString *fileName; - - __strong NSDictionary *fileAttributes; - - __strong NSDate *creationDate; - __strong NSDate *modificationDate; - - unsigned long long fileSize; -} - -@property (strong, nonatomic, readonly) NSString *filePath; -@property (strong, nonatomic, readonly) NSString *fileName; - -@property (strong, nonatomic, readonly) NSDictionary *fileAttributes; - -@property (strong, nonatomic, readonly) NSDate *creationDate; -@property (strong, nonatomic, readonly) NSDate *modificationDate; - -@property (nonatomic, readonly) unsigned long long fileSize; - -@property (nonatomic, readonly) NSTimeInterval age; - -@property (nonatomic, readwrite) BOOL isArchived; - -+ (id)logFileWithPath:(NSString *)filePath; - -- (id)initWithFilePath:(NSString *)filePath; - -- (void)reset; -- (void)renameFile:(NSString *)newFileName; - -#if TARGET_IPHONE_SIMULATOR - -// So here's the situation. -// Extended attributes are perfect for what we're trying to do here (marking files as archived). -// This is exactly what extended attributes were designed for. -// -// But Apple screws us over on the simulator. -// Everytime you build-and-go, they copy the application into a new folder on the hard drive, -// and as part of the process they strip extended attributes from our log files. -// Normally, a copy of a file preserves extended attributes. -// So obviously Apple has gone to great lengths to piss us off. -// -// Thus we use a slightly different tactic for marking log files as archived in the simulator. -// That way it "just works" and there's no confusion when testing. -// -// The difference in method names is indicative of the difference in functionality. -// On the simulator we add an attribute by appending a filename extension. -// -// For example: -// log-ABC123.txt -> log-ABC123.archived.txt - -- (BOOL)hasExtensionAttributeWithName:(NSString *)attrName; - -- (void)addExtensionAttributeWithName:(NSString *)attrName; -- (void)removeExtensionAttributeWithName:(NSString *)attrName; - -#else - -// Normal use of extended attributes used everywhere else, -// such as on Macs and on iPhone devices. - -- (BOOL)hasExtendedAttributeWithName:(NSString *)attrName; - -- (void)addExtendedAttributeWithName:(NSString *)attrName; -- (void)removeExtendedAttributeWithName:(NSString *)attrName; - -#endif - -- (NSComparisonResult)reverseCompareByCreationDate:(DDLogFileInfo *)another; -- (NSComparisonResult)reverseCompareByModificationDate:(DDLogFileInfo *)another; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDFileLogger.m b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDFileLogger.m deleted file mode 100755 index 645bc69..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDFileLogger.m +++ /dev/null @@ -1,1356 +0,0 @@ -#import "DDFileLogger.h" - -#import -#import -#import -#import - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" wiki. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted -**/ - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -// We probably shouldn't be using DDLog() statements within the DDLog implementation. -// But we still want to leave our log statements for any future debugging, -// and to allow other developers to trace the implementation (which is a great learning tool). -// -// So we use primitive logging macros around NSLog. -// We maintain the NS prefix on the macros to be explicit about the fact that we're using NSLog. - -#define LOG_LEVEL 2 - -#define NSLogError(frmt, ...) do{ if(LOG_LEVEL >= 1) NSLog((frmt), ##__VA_ARGS__); } while(0) -#define NSLogWarn(frmt, ...) do{ if(LOG_LEVEL >= 2) NSLog((frmt), ##__VA_ARGS__); } while(0) -#define NSLogInfo(frmt, ...) do{ if(LOG_LEVEL >= 3) NSLog((frmt), ##__VA_ARGS__); } while(0) -#define NSLogVerbose(frmt, ...) do{ if(LOG_LEVEL >= 4) NSLog((frmt), ##__VA_ARGS__); } while(0) - -@interface DDLogFileManagerDefault (PrivateAPI) - -- (void)deleteOldLogFiles; -- (NSString *)defaultLogsDirectory; - -@end - -@interface DDFileLogger (PrivateAPI) - -- (void)rollLogFileNow; -- (void)maybeRollLogFileDueToAge; -- (void)maybeRollLogFileDueToSize; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation DDLogFileManagerDefault - -@synthesize maximumNumberOfLogFiles; - -- (id)init -{ - return [self initWithLogsDirectory:nil]; -} - -- (id)initWithLogsDirectory:(NSString *)aLogsDirectory -{ - if ((self = [super init])) - { - maximumNumberOfLogFiles = DEFAULT_LOG_MAX_NUM_LOG_FILES; - - if (aLogsDirectory) - _logsDirectory = [aLogsDirectory copy]; - else - _logsDirectory = [[self defaultLogsDirectory] copy]; - - NSKeyValueObservingOptions kvoOptions = NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew; - - [self addObserver:self forKeyPath:@"maximumNumberOfLogFiles" options:kvoOptions context:nil]; - -// NSLogVerbose(@"DDFileLogManagerDefault: logsDirectory:\n%@", [self logsDirectory]); -// NSLogVerbose(@"DDFileLogManagerDefault: sortedLogFileNames:\n%@", [self sortedLogFileNames]); - } - return self; -} - -- (void)dealloc -{ - [self removeObserver:self forKeyPath:@"maximumNumberOfLogFiles"]; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Configuration -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (void)observeValueForKeyPath:(NSString *)keyPath - ofObject:(id)object - change:(NSDictionary *)change - context:(void *)context -{ - NSNumber *old = [change objectForKey:NSKeyValueChangeOldKey]; - NSNumber *new = [change objectForKey:NSKeyValueChangeNewKey]; - - if ([old isEqual:new]) - { - // No change in value - don't bother with any processing. - return; - } - - if ([keyPath isEqualToString:@"maximumNumberOfLogFiles"]) - { - //NSLogInfo(@"DDFileLogManagerDefault: Responding to configuration change: maximumNumberOfLogFiles"); - - dispatch_async([DDLog loggingQueue], ^{ @autoreleasepool { - - [self deleteOldLogFiles]; - }}); - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark File Deleting -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Deletes archived log files that exceed the maximumNumberOfLogFiles configuration value. -**/ -- (void)deleteOldLogFiles -{ - //NSLogVerbose(@"DDLogFileManagerDefault: deleteOldLogFiles"); - - NSUInteger maxNumLogFiles = self.maximumNumberOfLogFiles; - if (maxNumLogFiles == 0) - { - // Unlimited - don't delete any log files - return; - } - - NSArray *sortedLogFileInfos = [self sortedLogFileInfos]; - - // Do we consider the first file? - // We are only supposed to be deleting archived files. - // In most cases, the first file is likely the log file that is currently being written to. - // So in most cases, we do not want to consider this file for deletion. - - NSUInteger count = [sortedLogFileInfos count]; - BOOL excludeFirstFile = NO; - - if (count > 0) - { - DDLogFileInfo *logFileInfo = [sortedLogFileInfos objectAtIndex:0]; - - if (!logFileInfo.isArchived) - { - excludeFirstFile = YES; - } - } - - NSArray *sortedArchivedLogFileInfos; - if (excludeFirstFile) - { - count--; - sortedArchivedLogFileInfos = [sortedLogFileInfos subarrayWithRange:NSMakeRange(1, count)]; - } - else - { - sortedArchivedLogFileInfos = sortedLogFileInfos; - } - - NSUInteger i; - for (i = maxNumLogFiles; i < count; i++) - { - DDLogFileInfo *logFileInfo = [sortedArchivedLogFileInfos objectAtIndex:i]; - - //NSLogInfo(@"DDLogFileManagerDefault: Deleting file: %@", logFileInfo.fileName); - - [[NSFileManager defaultManager] removeItemAtPath:logFileInfo.filePath error:nil]; - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Log Files -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Returns the path to the default logs directory. - * If the logs directory doesn't exist, this method automatically creates it. -**/ -- (NSString *)defaultLogsDirectory -{ -#if TARGET_OS_IPHONE - NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES); - NSString *baseDir = ([paths count] > 0) ? [paths objectAtIndex:0] : nil; - NSString *logsDirectory = [baseDir stringByAppendingPathComponent:@"Logs"]; - -#else - NSString *appName = [[NSProcessInfo processInfo] processName]; - NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES); - NSString *basePath = ([paths count] > 0) ? [paths objectAtIndex:0] : NSTemporaryDirectory(); - NSString *logsDirectory = [[basePath stringByAppendingPathComponent:@"Logs"] stringByAppendingPathComponent:appName]; - -#endif - - return logsDirectory; -} - -- (NSString *)logsDirectory -{ - // We could do this check once, during initalization, and not bother again. - // But this way the code continues to work if the directory gets deleted while the code is running. - - if (![[NSFileManager defaultManager] fileExistsAtPath:_logsDirectory]) - { - NSError *err = nil; - if (![[NSFileManager defaultManager] createDirectoryAtPath:_logsDirectory - withIntermediateDirectories:YES attributes:nil error:&err]) - { - //NSLogError(@"DDFileLogManagerDefault: Error creating logsDirectory: %@", err); - } - } - - return _logsDirectory; -} - -- (BOOL)isLogFile:(NSString *)fileName -{ - // A log file has a name like "log-.txt", where is a HEX-string of 6 characters. - // - // For example: log-DFFE99.txt - - BOOL hasProperPrefix = [fileName hasPrefix:@"log-"]; - - BOOL hasProperLength = [fileName length] >= 10; - - - if (hasProperPrefix && hasProperLength) - { - NSCharacterSet *hexSet = [NSCharacterSet characterSetWithCharactersInString:@"0123456789ABCDEF"]; - - NSString *hex = [fileName substringWithRange:NSMakeRange(4, 6)]; - NSString *nohex = [hex stringByTrimmingCharactersInSet:hexSet]; - - if ([nohex length] == 0) - { - return YES; - } - } - - return NO; -} - -/** - * Returns an array of NSString objects, - * each of which is the filePath to an existing log file on disk. -**/ -- (NSArray *)unsortedLogFilePaths -{ - NSString *logsDirectory = [self logsDirectory]; - NSArray *fileNames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:logsDirectory error:nil]; - - NSMutableArray *unsortedLogFilePaths = [NSMutableArray arrayWithCapacity:[fileNames count]]; - - for (NSString *fileName in fileNames) - { - // Filter out any files that aren't log files. (Just for extra safety) - - if ([self isLogFile:fileName]) - { - NSString *filePath = [logsDirectory stringByAppendingPathComponent:fileName]; - - [unsortedLogFilePaths addObject:filePath]; - } - } - - return unsortedLogFilePaths; -} - -/** - * Returns an array of NSString objects, - * each of which is the fileName of an existing log file on disk. -**/ -- (NSArray *)unsortedLogFileNames -{ - NSArray *unsortedLogFilePaths = [self unsortedLogFilePaths]; - - NSMutableArray *unsortedLogFileNames = [NSMutableArray arrayWithCapacity:[unsortedLogFilePaths count]]; - - for (NSString *filePath in unsortedLogFilePaths) - { - [unsortedLogFileNames addObject:[filePath lastPathComponent]]; - } - - return unsortedLogFileNames; -} - -/** - * Returns an array of DDLogFileInfo objects, - * each representing an existing log file on disk, - * and containing important information about the log file such as it's modification date and size. -**/ -- (NSArray *)unsortedLogFileInfos -{ - NSArray *unsortedLogFilePaths = [self unsortedLogFilePaths]; - - NSMutableArray *unsortedLogFileInfos = [NSMutableArray arrayWithCapacity:[unsortedLogFilePaths count]]; - - for (NSString *filePath in unsortedLogFilePaths) - { - DDLogFileInfo *logFileInfo = [[DDLogFileInfo alloc] initWithFilePath:filePath]; - - [unsortedLogFileInfos addObject:logFileInfo]; - } - - return unsortedLogFileInfos; -} - -/** - * Just like the unsortedLogFilePaths method, but sorts the array. - * The items in the array are sorted by modification date. - * The first item in the array will be the most recently modified log file. -**/ -- (NSArray *)sortedLogFilePaths -{ - NSArray *sortedLogFileInfos = [self sortedLogFileInfos]; - - NSMutableArray *sortedLogFilePaths = [NSMutableArray arrayWithCapacity:[sortedLogFileInfos count]]; - - for (DDLogFileInfo *logFileInfo in sortedLogFileInfos) - { - [sortedLogFilePaths addObject:[logFileInfo filePath]]; - } - - return sortedLogFilePaths; -} - -/** - * Just like the unsortedLogFileNames method, but sorts the array. - * The items in the array are sorted by modification date. - * The first item in the array will be the most recently modified log file. -**/ -- (NSArray *)sortedLogFileNames -{ - NSArray *sortedLogFileInfos = [self sortedLogFileInfos]; - - NSMutableArray *sortedLogFileNames = [NSMutableArray arrayWithCapacity:[sortedLogFileInfos count]]; - - for (DDLogFileInfo *logFileInfo in sortedLogFileInfos) - { - [sortedLogFileNames addObject:[logFileInfo fileName]]; - } - - return sortedLogFileNames; -} - -/** - * Just like the unsortedLogFileInfos method, but sorts the array. - * The items in the array are sorted by modification date. - * The first item in the array will be the most recently modified log file. -**/ -- (NSArray *)sortedLogFileInfos -{ - return [[self unsortedLogFileInfos] sortedArrayUsingSelector:@selector(reverseCompareByCreationDate:)]; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Creation -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Generates a short UUID suitable for use in the log file's name. - * The result will have six characters, all in the hexadecimal set [0123456789ABCDEF]. -**/ -- (NSString *)generateShortUUID -{ - CFUUIDRef uuid = CFUUIDCreate(NULL); - - CFStringRef fullStr = CFUUIDCreateString(NULL, uuid); - NSString *result = (__bridge_transfer NSString *)CFStringCreateWithSubstring(NULL, fullStr, CFRangeMake(0, 6)); - - CFRelease(fullStr); - CFRelease(uuid); - - return result; -} - -/** - * Generates a new unique log file path, and creates the corresponding log file. -**/ -- (NSString *)createNewLogFile -{ - // Generate a random log file name, and create the file (if there isn't a collision) - - NSString *logsDirectory = [self logsDirectory]; - do - { - NSString *fileName = [NSString stringWithFormat:@"log-%@.txt", [self generateShortUUID]]; - - NSString *filePath = [logsDirectory stringByAppendingPathComponent:fileName]; - - if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]) - { - //NSLogVerbose(@"DDLogFileManagerDefault: Creating new log file: %@", fileName); - - [[NSFileManager defaultManager] createFileAtPath:filePath contents:nil attributes:nil]; - - // Since we just created a new log file, we may need to delete some old log files - [self deleteOldLogFiles]; - - return filePath; - } - - } while(YES); -} - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation DDLogFileFormatterDefault - -- (id)init -{ - return [self initWithDateFormatter:nil]; -} - -- (id)initWithDateFormatter:(NSDateFormatter *)aDateFormatter -{ - if ((self = [super init])) - { - if (aDateFormatter) - { - dateFormatter = aDateFormatter; - } - else - { - dateFormatter = [[NSDateFormatter alloc] init]; - [dateFormatter setFormatterBehavior:NSDateFormatterBehavior10_4]; // 10.4+ style - [dateFormatter setDateFormat:@"yyyy/MM/dd HH:mm:ss:SSS"]; - } - } - return self; -} - -- (NSString *)formatLogMessage:(DDLogMessage *)logMessage -{ - NSString *dateAndTime = [dateFormatter stringFromDate:(logMessage->timestamp)]; - - return [NSString stringWithFormat:@"%@ %@", dateAndTime, logMessage->logMsg]; -} - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation DDFileLogger - -- (id)init -{ - DDLogFileManagerDefault *defaultLogFileManager = [[DDLogFileManagerDefault alloc] init]; - - return [self initWithLogFileManager:defaultLogFileManager]; -} - -- (id)initWithLogFileManager:(id )aLogFileManager -{ - if ((self = [super init])) - { - maximumFileSize = DEFAULT_LOG_MAX_FILE_SIZE; - rollingFrequency = DEFAULT_LOG_ROLLING_FREQUENCY; - - logFileManager = aLogFileManager; - - formatter = [[DDLogFileFormatterDefault alloc] init]; - } - return self; -} - -- (void)dealloc -{ - [currentLogFileHandle synchronizeFile]; - [currentLogFileHandle closeFile]; - - if (rollingTimer) - { - dispatch_source_cancel(rollingTimer); - rollingTimer = NULL; - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Properties -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@synthesize logFileManager; - -- (unsigned long long)maximumFileSize -{ - __block unsigned long long result; - - dispatch_block_t block = ^{ - result = maximumFileSize; - }; - - // The design of this method is taken from the DDAbstractLogger implementation. - // For extensive documentation please refer to the DDAbstractLogger implementation. - - // Note: The internal implementation MUST access the maximumFileSize variable directly, - // This method is designed explicitly for external access. - // - // Using "self." syntax to go through this method will cause immediate deadlock. - // This is the intended result. Fix it by accessing the ivar directly. - // Great strides have been take to ensure this is safe to do. Plus it's MUCH faster. - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - dispatch_sync(globalLoggingQueue, ^{ - dispatch_sync(loggerQueue, block); - }); - - return result; -} - -- (void)setMaximumFileSize:(unsigned long long)newMaximumFileSize -{ - dispatch_block_t block = ^{ @autoreleasepool { - - maximumFileSize = newMaximumFileSize; - [self maybeRollLogFileDueToSize]; - - }}; - - // The design of this method is taken from the DDAbstractLogger implementation. - // For extensive documentation please refer to the DDAbstractLogger implementation. - - // Note: The internal implementation MUST access the maximumFileSize variable directly, - // This method is designed explicitly for external access. - // - // Using "self." syntax to go through this method will cause immediate deadlock. - // This is the intended result. Fix it by accessing the ivar directly. - // Great strides have been take to ensure this is safe to do. Plus it's MUCH faster. - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); -} - -- (NSTimeInterval)rollingFrequency -{ - __block NSTimeInterval result; - - dispatch_block_t block = ^{ - result = rollingFrequency; - }; - - // The design of this method is taken from the DDAbstractLogger implementation. - // For extensive documentation please refer to the DDAbstractLogger implementation. - - // Note: The internal implementation should access the rollingFrequency variable directly, - // This method is designed explicitly for external access. - // - // Using "self." syntax to go through this method will cause immediate deadlock. - // This is the intended result. Fix it by accessing the ivar directly. - // Great strides have been take to ensure this is safe to do. Plus it's MUCH faster. - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - dispatch_sync(globalLoggingQueue, ^{ - dispatch_sync(loggerQueue, block); - }); - - return result; -} - -- (void)setRollingFrequency:(NSTimeInterval)newRollingFrequency -{ - dispatch_block_t block = ^{ @autoreleasepool { - - rollingFrequency = newRollingFrequency; - [self maybeRollLogFileDueToAge]; - }}; - - // The design of this method is taken from the DDAbstractLogger implementation. - // For extensive documentation please refer to the DDAbstractLogger implementation. - - // Note: The internal implementation should access the rollingFrequency variable directly, - // This method is designed explicitly for external access. - // - // Using "self." syntax to go through this method will cause immediate deadlock. - // This is the intended result. Fix it by accessing the ivar directly. - // Great strides have been take to ensure this is safe to do. Plus it's MUCH faster. - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark File Rolling -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (void)scheduleTimerToRollLogFileDueToAge -{ - if (rollingTimer) - { - dispatch_source_cancel(rollingTimer); - rollingTimer = NULL; - } - - if (currentLogFileInfo == nil || rollingFrequency <= 0.0) - { - return; - } - - NSDate *logFileCreationDate = [currentLogFileInfo creationDate]; - - NSTimeInterval ti = [logFileCreationDate timeIntervalSinceReferenceDate]; - ti += rollingFrequency; - - NSDate *logFileRollingDate = [NSDate dateWithTimeIntervalSinceReferenceDate:ti]; - -// NSLogVerbose(@"DDFileLogger: scheduleTimerToRollLogFileDueToAge"); -// -// NSLogVerbose(@"DDFileLogger: logFileCreationDate: %@", logFileCreationDate); -// NSLogVerbose(@"DDFileLogger: logFileRollingDate : %@", logFileRollingDate); - - rollingTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, loggerQueue); - - dispatch_source_set_event_handler(rollingTimer, ^{ @autoreleasepool { - - [self maybeRollLogFileDueToAge]; - - }}); - - #if !OS_OBJECT_USE_OBJC - dispatch_source_t theRollingTimer = rollingTimer; - dispatch_source_set_cancel_handler(rollingTimer, ^{ - dispatch_release(theRollingTimer); - }); - #endif - - uint64_t delay = (uint64_t)([logFileRollingDate timeIntervalSinceNow] * NSEC_PER_SEC); - dispatch_time_t fireTime = dispatch_time(DISPATCH_TIME_NOW, delay); - - dispatch_source_set_timer(rollingTimer, fireTime, DISPATCH_TIME_FOREVER, 1.0); - dispatch_resume(rollingTimer); -} - -- (void)rollLogFile -{ - // This method is public. - // We need to execute the rolling on our logging thread/queue. - - dispatch_block_t block = ^{ @autoreleasepool { - - [self rollLogFileNow]; - }}; - - // The design of this method is taken from the DDAbstractLogger implementation. - // For extensive documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -- (void)rollLogFileNow -{ -// NSLogVerbose(@"DDFileLogger: rollLogFileNow"); - - - if (currentLogFileHandle == nil) return; - - [currentLogFileHandle synchronizeFile]; - [currentLogFileHandle closeFile]; - currentLogFileHandle = nil; - - currentLogFileInfo.isArchived = YES; - - if ([logFileManager respondsToSelector:@selector(didRollAndArchiveLogFile:)]) - { - [logFileManager didRollAndArchiveLogFile:(currentLogFileInfo.filePath)]; - } - - currentLogFileInfo = nil; - - if (rollingTimer) - { - dispatch_source_cancel(rollingTimer); - rollingTimer = NULL; - } -} - -- (void)maybeRollLogFileDueToAge -{ - if (rollingFrequency > 0.0 && currentLogFileInfo.age >= rollingFrequency) - { -// NSLogVerbose(@"DDFileLogger: Rolling log file due to age..."); - - [self rollLogFileNow]; - } - else - { - [self scheduleTimerToRollLogFileDueToAge]; - } -} - -- (void)maybeRollLogFileDueToSize -{ - // This method is called from logMessage. - // Keep it FAST. - - // Note: Use direct access to maximumFileSize variable. - // We specifically wrote our own getter/setter method to allow us to do this (for performance reasons). - - if (maximumFileSize > 0) - { - unsigned long long fileSize = [currentLogFileHandle offsetInFile]; - - if (fileSize >= maximumFileSize) - { -// NSLogVerbose(@"DDFileLogger: Rolling log file due to size (%qu)...", fileSize); - - [self rollLogFileNow]; - } - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark File Logging -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * Returns the log file that should be used. - * If there is an existing log file that is suitable, - * within the constraints of maximumFileSize and rollingFrequency, then it is returned. - * - * Otherwise a new file is created and returned. -**/ -- (DDLogFileInfo *)currentLogFileInfo -{ - if (currentLogFileInfo == nil) - { - NSArray *sortedLogFileInfos = [logFileManager sortedLogFileInfos]; - - if ([sortedLogFileInfos count] > 0) - { - DDLogFileInfo *mostRecentLogFileInfo = [sortedLogFileInfos objectAtIndex:0]; - - BOOL useExistingLogFile = YES; - BOOL shouldArchiveMostRecent = NO; - - if (mostRecentLogFileInfo.isArchived) - { - useExistingLogFile = NO; - shouldArchiveMostRecent = NO; - } - else if (maximumFileSize > 0 && mostRecentLogFileInfo.fileSize >= maximumFileSize) - { - useExistingLogFile = NO; - shouldArchiveMostRecent = YES; - } - else if (rollingFrequency > 0.0 && mostRecentLogFileInfo.age >= rollingFrequency) - { - useExistingLogFile = NO; - shouldArchiveMostRecent = YES; - } - - if (useExistingLogFile) - { - //NSLogVerbose(@"DDFileLogger: Resuming logging with file %@", mostRecentLogFileInfo.fileName); - - currentLogFileInfo = mostRecentLogFileInfo; - } - else - { - if (shouldArchiveMostRecent) - { - mostRecentLogFileInfo.isArchived = YES; - - if ([logFileManager respondsToSelector:@selector(didArchiveLogFile:)]) - { - [logFileManager didArchiveLogFile:(mostRecentLogFileInfo.filePath)]; - } - } - } - } - - if (currentLogFileInfo == nil) - { - NSString *currentLogFilePath = [logFileManager createNewLogFile]; - - currentLogFileInfo = [[DDLogFileInfo alloc] initWithFilePath:currentLogFilePath]; - } - } - - return currentLogFileInfo; -} - -- (NSFileHandle *)currentLogFileHandle -{ - if (currentLogFileHandle == nil) - { - NSString *logFilePath = [[self currentLogFileInfo] filePath]; - - currentLogFileHandle = [NSFileHandle fileHandleForWritingAtPath:logFilePath]; - [currentLogFileHandle seekToEndOfFile]; - - if (currentLogFileHandle) - { - [self scheduleTimerToRollLogFileDueToAge]; - } - } - - return currentLogFileHandle; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark DDLogger Protocol -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (void)logMessage:(DDLogMessage *)logMessage -{ - NSString *logMsg = logMessage->logMsg; - - if (formatter) - { - logMsg = [formatter formatLogMessage:logMessage]; - } - - if (logMsg) - { - if (![logMsg hasSuffix:@"\n"]) - { - logMsg = [logMsg stringByAppendingString:@"\n"]; - } - - NSData *logData = [logMsg dataUsingEncoding:NSUTF8StringEncoding]; - - [[self currentLogFileHandle] writeData:logData]; - - [self maybeRollLogFileDueToSize]; - } -} - -- (void)willRemoveLogger -{ - // If you override me be sure to invoke [super willRemoveLogger]; - - [self rollLogFileNow]; -} - -- (NSString *)loggerName -{ - return @"cocoa.lumberjack.fileLogger"; -} - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -#if TARGET_IPHONE_SIMULATOR - #define XATTR_ARCHIVED_NAME @"archived" -#else - #define XATTR_ARCHIVED_NAME @"lumberjack.log.archived" -#endif - -@implementation DDLogFileInfo - -@synthesize filePath; - -@dynamic fileName; -@dynamic fileAttributes; -@dynamic creationDate; -@dynamic modificationDate; -@dynamic fileSize; -@dynamic age; - -@dynamic isArchived; - - -#pragma mark Lifecycle - -+ (id)logFileWithPath:(NSString *)aFilePath -{ - return [[DDLogFileInfo alloc] initWithFilePath:aFilePath]; -} - -- (id)initWithFilePath:(NSString *)aFilePath -{ - if ((self = [super init])) - { - filePath = [aFilePath copy]; - } - return self; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Standard Info -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (NSDictionary *)fileAttributes -{ - if (fileAttributes == nil) - { - fileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil]; - } - return fileAttributes; -} - -- (NSString *)fileName -{ - if (fileName == nil) - { - fileName = [filePath lastPathComponent]; - } - return fileName; -} - -- (NSDate *)modificationDate -{ - if (modificationDate == nil) - { - modificationDate = [[self fileAttributes] objectForKey:NSFileModificationDate]; - } - - return modificationDate; -} - -- (NSDate *)creationDate -{ - if (creationDate == nil) - { - - #if TARGET_OS_IPHONE - - const char *path = [filePath UTF8String]; - - struct attrlist attrList; - memset(&attrList, 0, sizeof(attrList)); - attrList.bitmapcount = ATTR_BIT_MAP_COUNT; - attrList.commonattr = ATTR_CMN_CRTIME; - - struct { - u_int32_t attrBufferSizeInBytes; - struct timespec crtime; - } attrBuffer; - - int result = getattrlist(path, &attrList, &attrBuffer, sizeof(attrBuffer), 0); - if (result == 0) - { - double seconds = (double)(attrBuffer.crtime.tv_sec); - double nanos = (double)(attrBuffer.crtime.tv_nsec); - - NSTimeInterval ti = seconds + (nanos / 1000000000.0); - - creationDate = [NSDate dateWithTimeIntervalSince1970:ti]; - } - else - { -// NSLogError(@"DDLogFileInfo: creationDate(%@): getattrlist result = %i", self.fileName, result); - } - - #else - - creationDate = [[self fileAttributes] objectForKey:NSFileCreationDate]; - - #endif - - } - return creationDate; -} - -- (unsigned long long)fileSize -{ - if (fileSize == 0) - { - fileSize = [[[self fileAttributes] objectForKey:NSFileSize] unsignedLongLongValue]; - } - - return fileSize; -} - -- (NSTimeInterval)age -{ - return [[self creationDate] timeIntervalSinceNow] * -1.0; -} - -- (NSString *)description -{ - return [@{@"filePath": self.filePath, - @"fileName": self.fileName, - @"fileAttributes": self.fileAttributes, - @"creationDate": self.creationDate, - @"modificationDate": self.modificationDate, - @"fileSize": @(self.fileSize), - @"age": @(self.age), - @"isArchived": @(self.isArchived)} description]; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Archiving -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (BOOL)isArchived -{ - -#if TARGET_IPHONE_SIMULATOR - - // Extended attributes don't work properly on the simulator. - // So we have to use a less attractive alternative. - // See full explanation in the header file. - - return [self hasExtensionAttributeWithName:XATTR_ARCHIVED_NAME]; - -#else - - return [self hasExtendedAttributeWithName:XATTR_ARCHIVED_NAME]; - -#endif -} - -- (void)setIsArchived:(BOOL)flag -{ - -#if TARGET_IPHONE_SIMULATOR - - // Extended attributes don't work properly on the simulator. - // So we have to use a less attractive alternative. - // See full explanation in the header file. - - if (flag) - [self addExtensionAttributeWithName:XATTR_ARCHIVED_NAME]; - else - [self removeExtensionAttributeWithName:XATTR_ARCHIVED_NAME]; - -#else - - if (flag) - [self addExtendedAttributeWithName:XATTR_ARCHIVED_NAME]; - else - [self removeExtendedAttributeWithName:XATTR_ARCHIVED_NAME]; - -#endif -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Changes -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (void)reset -{ - fileName = nil; - fileAttributes = nil; - creationDate = nil; - modificationDate = nil; -} - -- (void)renameFile:(NSString *)newFileName -{ - // This method is only used on the iPhone simulator, where normal extended attributes are broken. - // See full explanation in the header file. - - if (![newFileName isEqualToString:[self fileName]]) - { - NSString *fileDir = [filePath stringByDeletingLastPathComponent]; - - NSString *newFilePath = [fileDir stringByAppendingPathComponent:newFileName]; - -// NSLogVerbose(@"DDLogFileInfo: Renaming file: '%@' -> '%@'", self.fileName, newFileName); - - NSError *error = nil; - if (![[NSFileManager defaultManager] moveItemAtPath:filePath toPath:newFilePath error:&error]) - { - ; -// NSLogError(@"DDLogFileInfo: Error renaming file (%@): %@", self.fileName, error); - } - - filePath = newFilePath; - [self reset]; - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Attribute Management -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -#if TARGET_IPHONE_SIMULATOR - -// Extended attributes don't work properly on the simulator. -// So we have to use a less attractive alternative. -// See full explanation in the header file. - -- (BOOL)hasExtensionAttributeWithName:(NSString *)attrName -{ - // This method is only used on the iPhone simulator, where normal extended attributes are broken. - // See full explanation in the header file. - - // Split the file name into components. - // - // log-ABC123.archived.uploaded.txt - // - // 0. log-ABC123 - // 1. archived - // 2. uploaded - // 3. txt - // - // So we want to search for the attrName in the components (ignoring the first and last array indexes). - - NSArray *components = [[self fileName] componentsSeparatedByString:@"."]; - - // Watch out for file names without an extension - - NSUInteger count = [components count]; - NSUInteger max = (count >= 2) ? count-1 : count; - - NSUInteger i; - for (i = 1; i < max; i++) - { - NSString *attr = [components objectAtIndex:i]; - - if ([attrName isEqualToString:attr]) - { - return YES; - } - } - - return NO; -} - -- (void)addExtensionAttributeWithName:(NSString *)attrName -{ - // This method is only used on the iPhone simulator, where normal extended attributes are broken. - // See full explanation in the header file. - - if ([attrName length] == 0) return; - - // Example: - // attrName = "archived" - // - // "log-ABC123.txt" -> "log-ABC123.archived.txt" - - NSArray *components = [[self fileName] componentsSeparatedByString:@"."]; - - NSUInteger count = [components count]; - - NSUInteger estimatedNewLength = [[self fileName] length] + [attrName length] + 1; - NSMutableString *newFileName = [NSMutableString stringWithCapacity:estimatedNewLength]; - - if (count > 0) - { - [newFileName appendString:[components objectAtIndex:0]]; - } - - NSString *lastExt = @""; - - NSUInteger i; - for (i = 1; i < count; i++) - { - NSString *attr = [components objectAtIndex:i]; - if ([attr length] == 0) - { - continue; - } - - if ([attrName isEqualToString:attr]) - { - // Extension attribute already exists in file name - return; - } - - if ([lastExt length] > 0) - { - [newFileName appendFormat:@".%@", lastExt]; - } - - lastExt = attr; - } - - [newFileName appendFormat:@".%@", attrName]; - - if ([lastExt length] > 0) - { - [newFileName appendFormat:@".%@", lastExt]; - } - - [self renameFile:newFileName]; -} - -- (void)removeExtensionAttributeWithName:(NSString *)attrName -{ - // This method is only used on the iPhone simulator, where normal extended attributes are broken. - // See full explanation in the header file. - - if ([attrName length] == 0) return; - - // Example: - // attrName = "archived" - // - // "log-ABC123.txt" -> "log-ABC123.archived.txt" - - NSArray *components = [[self fileName] componentsSeparatedByString:@"."]; - - NSUInteger count = [components count]; - - NSUInteger estimatedNewLength = [[self fileName] length]; - NSMutableString *newFileName = [NSMutableString stringWithCapacity:estimatedNewLength]; - - if (count > 0) - { - [newFileName appendString:[components objectAtIndex:0]]; - } - - BOOL found = NO; - - NSUInteger i; - for (i = 1; i < count; i++) - { - NSString *attr = [components objectAtIndex:i]; - - if ([attrName isEqualToString:attr]) - { - found = YES; - } - else - { - [newFileName appendFormat:@".%@", attr]; - } - } - - if (found) - { - [self renameFile:newFileName]; - } -} - -#else - -- (BOOL)hasExtendedAttributeWithName:(NSString *)attrName -{ - const char *path = [filePath UTF8String]; - const char *name = [attrName UTF8String]; - - ssize_t result = getxattr(path, name, NULL, 0, 0, 0); - - return (result >= 0); -} - -- (void)addExtendedAttributeWithName:(NSString *)attrName -{ - const char *path = [filePath UTF8String]; - const char *name = [attrName UTF8String]; - - int result = setxattr(path, name, NULL, 0, 0, 0); - - if (result < 0) - { - ; - //NSLogError(@"DDLogFileInfo: setxattr(%@, %@): error = %i", attrName, self.fileName, result); - } -} - -- (void)removeExtendedAttributeWithName:(NSString *)attrName -{ - const char *path = [filePath UTF8String]; - const char *name = [attrName UTF8String]; - - int result = removexattr(path, name, 0); - - if (result < 0 && errno != ENOATTR) - { - ; - //NSLogError(@"DDLogFileInfo: removexattr(%@, %@): error = %i", attrName, self.fileName, result); - } -} - -#endif - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Comparisons -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (BOOL)isEqual:(id)object -{ - if ([object isKindOfClass:[self class]]) - { - DDLogFileInfo *another = (DDLogFileInfo *)object; - - return [filePath isEqualToString:[another filePath]]; - } - - return NO; -} - -- (NSComparisonResult)reverseCompareByCreationDate:(DDLogFileInfo *)another -{ - NSDate *us = [self creationDate]; - NSDate *them = [another creationDate]; - - NSComparisonResult result = [us compare:them]; - - if (result == NSOrderedAscending) - return NSOrderedDescending; - - if (result == NSOrderedDescending) - return NSOrderedAscending; - - return NSOrderedSame; -} - -- (NSComparisonResult)reverseCompareByModificationDate:(DDLogFileInfo *)another -{ - NSDate *us = [self modificationDate]; - NSDate *them = [another modificationDate]; - - NSComparisonResult result = [us compare:them]; - - if (result == NSOrderedAscending) - return NSOrderedDescending; - - if (result == NSOrderedDescending) - return NSOrderedAscending; - - return NSOrderedSame; -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDLog.h b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDLog.h deleted file mode 100755 index 487b717..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDLog.h +++ /dev/null @@ -1,601 +0,0 @@ -#import - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" wiki. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted - * - * Otherwise, here is a quick refresher. - * There are three steps to using the macros: - * - * Step 1: - * Import the header in your implementation file: - * - * #import "DDLog.h" - * - * Step 2: - * Define your logging level in your implementation file: - * - * // Log levels: off, error, warn, info, verbose - * static const int ddLogLevel = LOG_LEVEL_VERBOSE; - * - * Step 3: - * Replace your NSLog statements with DDLog statements according to the severity of the message. - * - * NSLog(@"Fatal error, no dohickey found!"); -> DDLogError(@"Fatal error, no dohickey found!"); - * - * DDLog works exactly the same as NSLog. - * This means you can pass it multiple variables just like NSLog. -**/ - - -@class DDLogMessage; - -@protocol DDLogger; -@protocol DDLogFormatter; - -/** - * This is the single macro that all other macros below compile into. - * This big multiline macro makes all the other macros easier to read. -**/ - -#define LOG_MACRO(isAsynchronous, lvl, flg, ctx, atag, fnct, frmt, ...) \ - [DDLog log:isAsynchronous \ - level:lvl \ - flag:flg \ - context:ctx \ - file:__FILE__ \ - function:fnct \ - line:__LINE__ \ - tag:atag \ - format:(frmt), ##__VA_ARGS__] - -/** - * Define the Objective-C and C versions of the macro. - * These automatically inject the proper function name for either an objective-c method or c function. - * - * We also define shorthand versions for asynchronous and synchronous logging. -**/ - -#define LOG_OBJC_MACRO(async, lvl, flg, ctx, frmt, ...) \ - LOG_MACRO(async, lvl, flg, ctx, nil, sel_getName(_cmd), frmt, ##__VA_ARGS__) - -#define LOG_C_MACRO(async, lvl, flg, ctx, frmt, ...) \ - LOG_MACRO(async, lvl, flg, ctx, nil, __FUNCTION__, frmt, ##__VA_ARGS__) - -#define SYNC_LOG_OBJC_MACRO(lvl, flg, ctx, frmt, ...) \ - LOG_OBJC_MACRO( NO, lvl, flg, ctx, frmt, ##__VA_ARGS__) - -#define ASYNC_LOG_OBJC_MACRO(lvl, flg, ctx, frmt, ...) \ - LOG_OBJC_MACRO(YES, lvl, flg, ctx, frmt, ##__VA_ARGS__) - -#define SYNC_LOG_C_MACRO(lvl, flg, ctx, frmt, ...) \ - LOG_C_MACRO( NO, lvl, flg, ctx, frmt, ##__VA_ARGS__) - -#define ASYNC_LOG_C_MACRO(lvl, flg, ctx, frmt, ...) \ - LOG_C_MACRO(YES, lvl, flg, ctx, frmt, ##__VA_ARGS__) - -/** - * Define version of the macro that only execute if the logLevel is above the threshold. - * The compiled versions essentially look like this: - * - * if (logFlagForThisLogMsg & ddLogLevel) { execute log message } - * - * As shown further below, Lumberjack actually uses a bitmask as opposed to primitive log levels. - * This allows for a great amount of flexibility and some pretty advanced fine grained logging techniques. - * - * Note that when compiler optimizations are enabled (as they are for your release builds), - * the log messages above your logging threshold will automatically be compiled out. - * - * (If the compiler sees ddLogLevel declared as a constant, the compiler simply checks to see if the 'if' statement - * would execute, and if not it strips it from the binary.) - * - * We also define shorthand versions for asynchronous and synchronous logging. -**/ - -#define LOG_MAYBE(async, lvl, flg, ctx, fnct, frmt, ...) \ - do { if(lvl & flg) LOG_MACRO(async, lvl, flg, ctx, nil, fnct, frmt, ##__VA_ARGS__); } while(0) - -#define LOG_OBJC_MAYBE(async, lvl, flg, ctx, frmt, ...) \ - LOG_MAYBE(async, lvl, flg, ctx, sel_getName(_cmd), frmt, ##__VA_ARGS__) - -#define LOG_C_MAYBE(async, lvl, flg, ctx, frmt, ...) \ - LOG_MAYBE(async, lvl, flg, ctx, __FUNCTION__, frmt, ##__VA_ARGS__) - -#define SYNC_LOG_OBJC_MAYBE(lvl, flg, ctx, frmt, ...) \ - LOG_OBJC_MAYBE( NO, lvl, flg, ctx, frmt, ##__VA_ARGS__) - -#define ASYNC_LOG_OBJC_MAYBE(lvl, flg, ctx, frmt, ...) \ - LOG_OBJC_MAYBE(YES, lvl, flg, ctx, frmt, ##__VA_ARGS__) - -#define SYNC_LOG_C_MAYBE(lvl, flg, ctx, frmt, ...) \ - LOG_C_MAYBE( NO, lvl, flg, ctx, frmt, ##__VA_ARGS__) - -#define ASYNC_LOG_C_MAYBE(lvl, flg, ctx, frmt, ...) \ - LOG_C_MAYBE(YES, lvl, flg, ctx, frmt, ##__VA_ARGS__) - -/** - * Define versions of the macros that also accept tags. - * - * The DDLogMessage object includes a 'tag' ivar that may be used for a variety of purposes. - * It may be used to pass custom information to loggers or formatters. - * Or it may be used by 3rd party extensions to the framework. - * - * Thes macros just make it a little easier to extend logging functionality. -**/ - -#define LOG_OBJC_TAG_MACRO(async, lvl, flg, ctx, tag, frmt, ...) \ - LOG_MACRO(async, lvl, flg, ctx, tag, sel_getName(_cmd), frmt, ##__VA_ARGS__) - -#define LOG_C_TAG_MACRO(async, lvl, flg, ctx, tag, frmt, ...) \ - LOG_MACRO(async, lvl, flg, ctx, tag, __FUNCTION__, frmt, ##__VA_ARGS__) - -#define LOG_TAG_MAYBE(async, lvl, flg, ctx, tag, fnct, frmt, ...) \ - do { if(lvl & flg) LOG_MACRO(async, lvl, flg, ctx, tag, fnct, frmt, ##__VA_ARGS__); } while(0) - -#define LOG_OBJC_TAG_MAYBE(async, lvl, flg, ctx, tag, frmt, ...) \ - LOG_TAG_MAYBE(async, lvl, flg, ctx, tag, sel_getName(_cmd), frmt, ##__VA_ARGS__) - -#define LOG_C_TAG_MAYBE(async, lvl, flg, ctx, tag, frmt, ...) \ - LOG_TAG_MAYBE(async, lvl, flg, ctx, tag, __FUNCTION__, frmt, ##__VA_ARGS__) - -/** - * Define the standard options. - * - * We default to only 4 levels because it makes it easier for beginners - * to make the transition to a logging framework. - * - * More advanced users may choose to completely customize the levels (and level names) to suite their needs. - * For more information on this see the "Custom Log Levels" page: - * https://github.com/robbiehanson/CocoaLumberjack/wiki/CustomLogLevels - * - * Advanced users may also notice that we're using a bitmask. - * This is to allow for custom fine grained logging: - * https://github.com/robbiehanson/CocoaLumberjack/wiki/FineGrainedLogging - * - * -- Flags -- - * - * Typically you will use the LOG_LEVELS (see below), but the flags may be used directly in certain situations. - * For example, say you have a lot of warning log messages, and you wanted to disable them. - * However, you still needed to see your error and info log messages. - * You could accomplish that with the following: - * - * static const int ddLogLevel = LOG_FLAG_ERROR | LOG_FLAG_INFO; - * - * Flags may also be consulted when writing custom log formatters, - * as the DDLogMessage class captures the individual flag that caused the log message to fire. - * - * -- Levels -- - * - * Log levels are simply the proper bitmask of the flags. - * - * -- Booleans -- - * - * The booleans may be used when your logging code involves more than one line. - * For example: - * - * if (LOG_VERBOSE) { - * for (id sprocket in sprockets) - * DDLogVerbose(@"sprocket: %@", [sprocket description]) - * } - * - * -- Async -- - * - * Defines the default asynchronous options. - * The default philosophy for asynchronous logging is very simple: - * - * Log messages with errors should be executed synchronously. - * After all, an error just occurred. The application could be unstable. - * - * All other log messages, such as debug output, are executed asynchronously. - * After all, if it wasn't an error, then it was just informational output, - * or something the application was easily able to recover from. - * - * -- Changes -- - * - * You are strongly discouraged from modifying this file. - * If you do, you make it more difficult on yourself to merge future bug fixes and improvements from the project. - * Instead, create your own MyLogging.h or ApplicationNameLogging.h or CompanyLogging.h - * - * For an example of customizing your logging experience, see the "Custom Log Levels" page: - * https://github.com/robbiehanson/CocoaLumberjack/wiki/CustomLogLevels -**/ - -#define LOG_FLAG_ERROR (1 << 0) // 0...0001 -#define LOG_FLAG_WARN (1 << 1) // 0...0010 -#define LOG_FLAG_INFO (1 << 2) // 0...0100 -#define LOG_FLAG_VERBOSE (1 << 3) // 0...1000 - -#define LOG_LEVEL_OFF 0 -#define LOG_LEVEL_ERROR (LOG_FLAG_ERROR) // 0...0001 -#define LOG_LEVEL_WARN (LOG_FLAG_ERROR | LOG_FLAG_WARN) // 0...0011 -#define LOG_LEVEL_INFO (LOG_FLAG_ERROR | LOG_FLAG_WARN | LOG_FLAG_INFO) // 0...0111 -#define LOG_LEVEL_VERBOSE (LOG_FLAG_ERROR | LOG_FLAG_WARN | LOG_FLAG_INFO | LOG_FLAG_VERBOSE) // 0...1111 - -#define LOG_ERROR (ddLogLevel & LOG_FLAG_ERROR) -#define LOG_WARN (ddLogLevel & LOG_FLAG_WARN) -#define LOG_INFO (ddLogLevel & LOG_FLAG_INFO) -#define LOG_VERBOSE (ddLogLevel & LOG_FLAG_VERBOSE) - -#define LOG_ASYNC_ENABLED YES - -#define LOG_ASYNC_ERROR ( NO && LOG_ASYNC_ENABLED) -#define LOG_ASYNC_WARN (YES && LOG_ASYNC_ENABLED) -#define LOG_ASYNC_INFO (YES && LOG_ASYNC_ENABLED) -#define LOG_ASYNC_VERBOSE (YES && LOG_ASYNC_ENABLED) - -#define DDLogError(frmt, ...) LOG_OBJC_MAYBE(LOG_ASYNC_ERROR, ddLogLevel, LOG_FLAG_ERROR, 0, frmt, ##__VA_ARGS__) -#define DDLogWarn(frmt, ...) LOG_OBJC_MAYBE(LOG_ASYNC_WARN, ddLogLevel, LOG_FLAG_WARN, 0, frmt, ##__VA_ARGS__) -#define DDLogInfo(frmt, ...) LOG_OBJC_MAYBE(LOG_ASYNC_INFO, ddLogLevel, LOG_FLAG_INFO, 0, frmt, ##__VA_ARGS__) -#define DDLogVerbose(frmt, ...) LOG_OBJC_MAYBE(LOG_ASYNC_VERBOSE, ddLogLevel, LOG_FLAG_VERBOSE, 0, frmt, ##__VA_ARGS__) - -#define DDLogCError(frmt, ...) LOG_C_MAYBE(LOG_ASYNC_ERROR, ddLogLevel, LOG_FLAG_ERROR, 0, frmt, ##__VA_ARGS__) -#define DDLogCWarn(frmt, ...) LOG_C_MAYBE(LOG_ASYNC_WARN, ddLogLevel, LOG_FLAG_WARN, 0, frmt, ##__VA_ARGS__) -#define DDLogCInfo(frmt, ...) LOG_C_MAYBE(LOG_ASYNC_INFO, ddLogLevel, LOG_FLAG_INFO, 0, frmt, ##__VA_ARGS__) -#define DDLogCVerbose(frmt, ...) LOG_C_MAYBE(LOG_ASYNC_VERBOSE, ddLogLevel, LOG_FLAG_VERBOSE, 0, frmt, ##__VA_ARGS__) - -/** - * The THIS_FILE macro gives you an NSString of the file name. - * For simplicity and clarity, the file name does not include the full path or file extension. - * - * For example: DDLogWarn(@"%@: Unable to find thingy", THIS_FILE) -> @"MyViewController: Unable to find thingy" -**/ - -NSString *DDExtractFileNameWithoutExtension(const char *filePath, BOOL copy); - -#define THIS_FILE (DDExtractFileNameWithoutExtension(__FILE__, NO)) - -/** - * The THIS_METHOD macro gives you the name of the current objective-c method. - * - * For example: DDLogWarn(@"%@ - Requires non-nil strings", THIS_METHOD) -> @"setMake:model: requires non-nil strings" - * - * Note: This does NOT work in straight C functions (non objective-c). - * Instead you should use the predefined __FUNCTION__ macro. -**/ - -#define THIS_METHOD NSStringFromSelector(_cmd) - - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@interface DDLog : NSObject - -/** - * Provides access to the underlying logging queue. - * This may be helpful to Logger classes for things like thread synchronization. -**/ - -+ (dispatch_queue_t)loggingQueue; - -/** - * Logging Primitive. - * - * This method is used by the macros above. - * It is suggested you stick with the macros as they're easier to use. -**/ - -+ (void)log:(BOOL)synchronous - level:(int)level - flag:(int)flag - context:(int)context - file:(const char *)file - function:(const char *)function - line:(int)line - tag:(id)tag - format:(NSString *)format, ... __attribute__ ((format (__NSString__, 9, 10))); - -/** - * Logging Primitive. - * - * This method can be used if you have a prepared va_list. -**/ - -+ (void)log:(BOOL)asynchronous - level:(int)level - flag:(int)flag - context:(int)context - file:(const char *)file - function:(const char *)function - line:(int)line - tag:(id)tag - format:(NSString *)format - args:(va_list)argList; - - -/** - * Since logging can be asynchronous, there may be times when you want to flush the logs. - * The framework invokes this automatically when the application quits. -**/ - -+ (void)flushLog; - -/** - * Loggers - * - * If you want your log statements to go somewhere, - * you should create and add a logger. -**/ - -+ (void)addLogger:(id )logger; -+ (void)removeLogger:(id )logger; - -+ (void)removeAllLoggers; - -/** - * Registered Dynamic Logging - * - * These methods allow you to obtain a list of classes that are using registered dynamic logging, - * and also provides methods to get and set their log level during run time. -**/ - -+ (NSArray *)registeredClasses; -+ (NSArray *)registeredClassNames; - -+ (int)logLevelForClass:(Class)aClass; -+ (int)logLevelForClassWithName:(NSString *)aClassName; - -+ (void)setLogLevel:(int)logLevel forClass:(Class)aClass; -+ (void)setLogLevel:(int)logLevel forClassWithName:(NSString *)aClassName; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@protocol DDLogger -@required - -- (void)logMessage:(DDLogMessage *)logMessage; - -/** - * Formatters may optionally be added to any logger. - * - * If no formatter is set, the logger simply logs the message as it is given in logMessage, - * or it may use its own built in formatting style. -**/ -- (id )logFormatter; -- (void)setLogFormatter:(id )formatter; - -@optional - -/** - * Since logging is asynchronous, adding and removing loggers is also asynchronous. - * In other words, the loggers are added and removed at appropriate times with regards to log messages. - * - * - Loggers will not receive log messages that were executed prior to when they were added. - * - Loggers will not receive log messages that were executed after they were removed. - * - * These methods are executed in the logging thread/queue. - * This is the same thread/queue that will execute every logMessage: invocation. - * Loggers may use these methods for thread synchronization or other setup/teardown tasks. -**/ -- (void)didAddLogger; -- (void)willRemoveLogger; - -/** - * Some loggers may buffer IO for optimization purposes. - * For example, a database logger may only save occasionaly as the disk IO is slow. - * In such loggers, this method should be implemented to flush any pending IO. - * - * This allows invocations of DDLog's flushLog method to be propogated to loggers that need it. - * - * Note that DDLog's flushLog method is invoked automatically when the application quits, - * and it may be also invoked manually by the developer prior to application crashes, or other such reasons. -**/ -- (void)flush; - -/** - * Each logger is executed concurrently with respect to the other loggers. - * Thus, a dedicated dispatch queue is used for each logger. - * Logger implementations may optionally choose to provide their own dispatch queue. -**/ -- (dispatch_queue_t)loggerQueue; - -/** - * If the logger implementation does not choose to provide its own queue, - * one will automatically be created for it. - * The created queue will receive its name from this method. - * This may be helpful for debugging or profiling reasons. -**/ -- (NSString *)loggerName; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@protocol DDLogFormatter -@required - -/** - * Formatters may optionally be added to any logger. - * This allows for increased flexibility in the logging environment. - * For example, log messages for log files may be formatted differently than log messages for the console. - * - * For more information about formatters, see the "Custom Formatters" page: - * https://github.com/robbiehanson/CocoaLumberjack/wiki/CustomFormatters - * - * The formatter may also optionally filter the log message by returning nil, - * in which case the logger will not log the message. -**/ -- (NSString *)formatLogMessage:(DDLogMessage *)logMessage; - -@optional - -/** - * A single formatter instance can be added to multiple loggers. - * These methods provides hooks to notify the formatter of when it's added/removed. - * - * This is primarily for thread-safety. - * If a formatter is explicitly not thread-safe, it may wish to throw an exception if added to multiple loggers. - * Or if a formatter has potentially thread-unsafe code (e.g. NSDateFormatter), - * it could possibly use these hooks to switch to thread-safe versions of the code. -**/ -- (void)didAddToLogger:(id )logger; -- (void)willRemoveFromLogger:(id )logger; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@protocol DDRegisteredDynamicLogging - -/** - * Implement these methods to allow a file's log level to be managed from a central location. - * - * This is useful if you'd like to be able to change log levels for various parts - * of your code from within the running application. - * - * Imagine pulling up the settings for your application, - * and being able to configure the logging level on a per file basis. - * - * The implementation can be very straight-forward: - * - * + (int)ddLogLevel - * { - * return ddLogLevel; - * } - * - * + (void)ddSetLogLevel:(int)logLevel - * { - * ddLogLevel = logLevel; - * } -**/ - -+ (int)ddLogLevel; -+ (void)ddSetLogLevel:(int)logLevel; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * The DDLogMessage class encapsulates information about the log message. - * If you write custom loggers or formatters, you will be dealing with objects of this class. -**/ - -enum { - DDLogMessageCopyFile = 1 << 0, - DDLogMessageCopyFunction = 1 << 1 -}; -typedef int DDLogMessageOptions; - -@interface DDLogMessage : NSObject -{ - -// The public variables below can be accessed directly (for speed). -// For example: logMessage->logLevel - -@public - int logLevel; - int logFlag; - int logContext; - NSString *logMsg; - NSDate *timestamp; - char *file; - char *function; - int lineNumber; - mach_port_t machThreadID; - char *queueLabel; - NSString *threadName; - - // For 3rd party extensions to the framework, where flags and contexts aren't enough. - id tag; - - // For 3rd party extensions that manually create DDLogMessage instances. - DDLogMessageOptions options; -} - -/** - * Standard init method for a log message object. - * Used by the logging primitives. (And the macros use the logging primitives.) - * - * If you find need to manually create logMessage objects, there is one thing you should be aware of: - * - * If no flags are passed, the method expects the file and function parameters to be string literals. - * That is, it expects the given strings to exist for the duration of the object's lifetime, - * and it expects the given strings to be immutable. - * In other words, it does not copy these strings, it simply points to them. - * This is due to the fact that __FILE__ and __FUNCTION__ are usually used to specify these parameters, - * so it makes sense to optimize and skip the unnecessary allocations. - * However, if you need them to be copied you may use the options parameter to specify this. - * Options is a bitmask which supports DDLogMessageCopyFile and DDLogMessageCopyFunction. -**/ -- (id)initWithLogMsg:(NSString *)logMsg - level:(int)logLevel - flag:(int)logFlag - context:(int)logContext - file:(const char *)file - function:(const char *)function - line:(int)line - tag:(id)tag - options:(DDLogMessageOptions)optionsMask; - -/** - * Returns the threadID as it appears in NSLog. - * That is, it is a hexadecimal value which is calculated from the machThreadID. -**/ -- (NSString *)threadID; - -/** - * Convenience property to get just the file name, as the file variable is generally the full file path. - * This method does not include the file extension, which is generally unwanted for logging purposes. -**/ -- (NSString *)fileName; - -/** - * Returns the function variable in NSString form. -**/ -- (NSString *)methodName; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * The DDLogger protocol specifies that an optional formatter can be added to a logger. - * Most (but not all) loggers will want to support formatters. - * - * However, writting getters and setters in a thread safe manner, - * while still maintaining maximum speed for the logging process, is a difficult task. - * - * To do it right, the implementation of the getter/setter has strict requiremenets: - * - Must NOT require the logMessage method to acquire a lock. - * - Must NOT require the logMessage method to access an atomic property (also a lock of sorts). - * - * To simplify things, an abstract logger is provided that implements the getter and setter. - * - * Logger implementations may simply extend this class, - * and they can ACCESS THE FORMATTER VARIABLE DIRECTLY from within their logMessage method! -**/ - -@interface DDAbstractLogger : NSObject -{ - id formatter; - - dispatch_queue_t loggerQueue; -} - -- (id )logFormatter; -- (void)setLogFormatter:(id )formatter; - -// For thread-safety assertions -- (BOOL)isOnGlobalLoggingQueue; -- (BOOL)isOnInternalLoggerQueue; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDLog.m b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDLog.m deleted file mode 100755 index 492922e..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDLog.m +++ /dev/null @@ -1,1083 +0,0 @@ -#import "DDLog.h" - -#import -#import -#import -#import -#import - - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" wiki. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted - * -**/ - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -// We probably shouldn't be using DDLog() statements within the DDLog implementation. -// But we still want to leave our log statements for any future debugging, -// and to allow other developers to trace the implementation (which is a great learning tool). -// -// So we use a primitive logging macro around NSLog. -// We maintain the NS prefix on the macros to be explicit about the fact that we're using NSLog. - -#define DD_DEBUG NO - -#define NSLogDebug(frmt, ...) do{ if(DD_DEBUG) NSLog((frmt), ##__VA_ARGS__); } while(0) - -// Specifies the maximum queue size of the logging thread. -// -// Since most logging is asynchronous, its possible for rogue threads to flood the logging queue. -// That is, to issue an abundance of log statements faster than the logging thread can keepup. -// Typically such a scenario occurs when log statements are added haphazardly within large loops, -// but may also be possible if relatively slow loggers are being used. -// -// This property caps the queue size at a given number of outstanding log statements. -// If a thread attempts to issue a log statement when the queue is already maxed out, -// the issuing thread will block until the queue size drops below the max again. - -#define LOG_MAX_QUEUE_SIZE 1000 // Should not exceed INT32_MAX - -// The "global logging queue" refers to [DDLog loggingQueue]. -// It is the queue that all log statements go through. -// -// The logging queue sets a flag via dispatch_queue_set_specific using this key. -// We can check for this key via dispatch_get_specific() to see if we're on the "global logging queue". - -static void *const GlobalLoggingQueueIdentityKey = (void *)&GlobalLoggingQueueIdentityKey; - - -@interface DDLoggerNode : NSObject { -@public - id logger; - dispatch_queue_t loggerQueue; -} - -+ (DDLoggerNode *)nodeWithLogger:(id )logger loggerQueue:(dispatch_queue_t)loggerQueue; - -@end - - -@interface DDLog (PrivateAPI) - -+ (void)lt_addLogger:(id )logger; -+ (void)lt_removeLogger:(id )logger; -+ (void)lt_removeAllLoggers; -+ (void)lt_log:(DDLogMessage *)logMessage; -+ (void)lt_flush; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation DDLog - -// An array used to manage all the individual loggers. -// The array is only modified on the loggingQueue/loggingThread. -static NSMutableArray *loggers; - -// All logging statements are added to the same queue to ensure FIFO operation. -static dispatch_queue_t loggingQueue; - -// Individual loggers are executed concurrently per log statement. -// Each logger has it's own associated queue, and a dispatch group is used for synchrnoization. -static dispatch_group_t loggingGroup; - -// In order to prevent to queue from growing infinitely large, -// a maximum size is enforced (LOG_MAX_QUEUE_SIZE). -static dispatch_semaphore_t queueSemaphore; - -// Minor optimization for uniprocessor machines -static unsigned int numProcessors; - -/** - * The runtime sends initialize to each class in a program exactly one time just before the class, - * or any class that inherits from it, is sent its first message from within the program. (Thus the - * method may never be invoked if the class is not used.) The runtime sends the initialize message to - * classes in a thread-safe manner. Superclasses receive this message before their subclasses. - * - * This method may also be called directly (assumably by accident), hence the safety mechanism. -**/ -+ (void)initialize -{ - static BOOL initialized = NO; - if (!initialized) - { - initialized = YES; - - loggers = [[NSMutableArray alloc] initWithCapacity:4]; - - //NSLogDebug(@"DDLog: Using grand central dispatch"); - - loggingQueue = dispatch_queue_create("cocoa.lumberjack", NULL); - loggingGroup = dispatch_group_create(); - - void *nonNullValue = GlobalLoggingQueueIdentityKey; // Whatever, just not null - dispatch_queue_set_specific(loggingQueue, GlobalLoggingQueueIdentityKey, nonNullValue, NULL); - - queueSemaphore = dispatch_semaphore_create(LOG_MAX_QUEUE_SIZE); - - // Figure out how many processors are available. - // This may be used later for an optimization on uniprocessor machines. - - host_basic_info_data_t hostInfo; - mach_msg_type_number_t infoCount; - - infoCount = HOST_BASIC_INFO_COUNT; - host_info(mach_host_self(), HOST_BASIC_INFO, (host_info_t)&hostInfo, &infoCount); - - unsigned int result = (unsigned int)(hostInfo.max_cpus); - unsigned int one = (unsigned int)(1); - - numProcessors = MAX(result, one); - - //NSLogDebug(@"DDLog: numProcessors = %u", numProcessors); - - - #if TARGET_OS_IPHONE - NSString *notificationName = @"UIApplicationWillTerminateNotification"; - #else - NSString *notificationName = @"NSApplicationWillTerminateNotification"; - #endif - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(applicationWillTerminate:) - name:notificationName - object:nil]; - } -} - -/** - * Provides access to the logging queue. -**/ -+ (dispatch_queue_t)loggingQueue -{ - return loggingQueue; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Notifications -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -+ (void)applicationWillTerminate:(NSNotification *)notification -{ - [self flushLog]; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Logger Management -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -+ (void)addLogger:(id )logger -{ - if (logger == nil) return; - - dispatch_async(loggingQueue, ^{ @autoreleasepool { - - [self lt_addLogger:logger]; - }}); -} - -+ (void)removeLogger:(id )logger -{ - if (logger == nil) return; - - dispatch_async(loggingQueue, ^{ @autoreleasepool { - - [self lt_removeLogger:logger]; - }}); -} - -+ (void)removeAllLoggers -{ - dispatch_async(loggingQueue, ^{ @autoreleasepool { - - [self lt_removeAllLoggers]; - }}); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Master Logging -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -+ (void)queueLogMessage:(DDLogMessage *)logMessage asynchronously:(BOOL)asyncFlag -{ - // We have a tricky situation here... - // - // In the common case, when the queueSize is below the maximumQueueSize, - // we want to simply enqueue the logMessage. And we want to do this as fast as possible, - // which means we don't want to block and we don't want to use any locks. - // - // However, if the queueSize gets too big, we want to block. - // But we have very strict requirements as to when we block, and how long we block. - // - // The following example should help illustrate our requirements: - // - // Imagine that the maximum queue size is configured to be 5, - // and that there are already 5 log messages queued. - // Let us call these 5 queued log messages A, B, C, D, and E. (A is next to be executed) - // - // Now if our thread issues a log statement (let us call the log message F), - // it should block before the message is added to the queue. - // Furthermore, it should be unblocked immediately after A has been unqueued. - // - // The requirements are strict in this manner so that we block only as long as necessary, - // and so that blocked threads are unblocked in the order in which they were blocked. - // - // Returning to our previous example, let us assume that log messages A through E are still queued. - // Our aforementioned thread is blocked attempting to queue log message F. - // Now assume we have another separate thread that attempts to issue log message G. - // It should block until log messages A and B have been unqueued. - - - // We are using a counting semaphore provided by GCD. - // The semaphore is initialized with our LOG_MAX_QUEUE_SIZE value. - // Everytime we want to queue a log message we decrement this value. - // If the resulting value is less than zero, - // the semaphore function waits in FIFO order for a signal to occur before returning. - // - // A dispatch semaphore is an efficient implementation of a traditional counting semaphore. - // Dispatch semaphores call down to the kernel only when the calling thread needs to be blocked. - // If the calling semaphore does not need to block, no kernel call is made. - - dispatch_semaphore_wait(queueSemaphore, DISPATCH_TIME_FOREVER); - - // We've now sure we won't overflow the queue. - // It is time to queue our log message. - - dispatch_block_t logBlock = ^{ @autoreleasepool { - - [self lt_log:logMessage]; - }}; - - if (asyncFlag) - dispatch_async(loggingQueue, logBlock); - else - dispatch_sync(loggingQueue, logBlock); -} - -+ (void)log:(BOOL)asynchronous - level:(int)level - flag:(int)flag - context:(int)context - file:(const char *)file - function:(const char *)function - line:(int)line - tag:(id)tag - format:(NSString *)format, ... -{ - va_list args; - if (format) - { - va_start(args, format); - - NSString *logMsg = [[NSString alloc] initWithFormat:format arguments:args]; - DDLogMessage *logMessage = [[DDLogMessage alloc] initWithLogMsg:logMsg - level:level - flag:flag - context:context - file:file - function:function - line:line - tag:tag - options:0]; - - [self queueLogMessage:logMessage asynchronously:asynchronous]; - - va_end(args); - } -} - -+ (void)log:(BOOL)asynchronous - level:(int)level - flag:(int)flag - context:(int)context - file:(const char *)file - function:(const char *)function - line:(int)line - tag:(id)tag - format:(NSString *)format - args:(va_list)args -{ - if (format) - { - NSString *logMsg = [[NSString alloc] initWithFormat:format arguments:args]; - DDLogMessage *logMessage = [[DDLogMessage alloc] initWithLogMsg:logMsg - level:level - flag:flag - context:context - file:file - function:function - line:line - tag:tag - options:0]; - - [self queueLogMessage:logMessage asynchronously:asynchronous]; - } -} - -+ (void)flushLog -{ - dispatch_sync(loggingQueue, ^{ @autoreleasepool { - - [self lt_flush]; - }}); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Registered Dynamic Logging -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -+ (BOOL)isRegisteredClass:(Class)class -{ - SEL getterSel = @selector(ddLogLevel); - SEL setterSel = @selector(ddSetLogLevel:); - -#if TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR - - // Issue #6 (GoogleCode) - Crashes on iOS 4.2.1 and iPhone 4 - // - // Crash caused by class_getClassMethod(2). - // - // "It's a bug with UIAccessibilitySafeCategory__NSObject so it didn't pop up until - // users had VoiceOver enabled [...]. I was able to work around it by searching the - // result of class_copyMethodList() instead of calling class_getClassMethod()" - - BOOL result = NO; - - unsigned int methodCount, i; - Method *methodList = class_copyMethodList(object_getClass(class), &methodCount); - - if (methodList != NULL) - { - BOOL getterFound = NO; - BOOL setterFound = NO; - - for (i = 0; i < methodCount; ++i) - { - SEL currentSel = method_getName(methodList[i]); - - if (currentSel == getterSel) - { - getterFound = YES; - } - else if (currentSel == setterSel) - { - setterFound = YES; - } - - if (getterFound && setterFound) - { - result = YES; - break; - } - } - - free(methodList); - } - - return result; - -#else - - // Issue #24 (GitHub) - Crashing in in ARC+Simulator - // - // The method +[DDLog isRegisteredClass] will crash a project when using it with ARC + Simulator. - // For running in the Simulator, it needs to execute the non-iOS code. - - Method getter = class_getClassMethod(class, getterSel); - Method setter = class_getClassMethod(class, setterSel); - - if ((getter != NULL) && (setter != NULL)) - { - return YES; - } - - return NO; - -#endif -} - -+ (NSArray *)registeredClasses -{ - int numClasses, i; - - // We're going to get the list of all registered classes. - // The Objective-C runtime library automatically registers all the classes defined in your source code. - // - // To do this we use the following method (documented in the Objective-C Runtime Reference): - // - // int objc_getClassList(Class *buffer, int bufferLen) - // - // We can pass (NULL, 0) to obtain the total number of - // registered class definitions without actually retrieving any class definitions. - // This allows us to allocate the minimum amount of memory needed for the application. - - numClasses = objc_getClassList(NULL, 0); - - // The numClasses method now tells us how many classes we have. - // So we can allocate our buffer, and get pointers to all the class definitions. - - Class *classes = (Class *)malloc(sizeof(Class) * numClasses); - - numClasses = objc_getClassList(classes, numClasses); - - // We can now loop through the classes, and test each one to see if it is a DDLogging class. - - NSMutableArray *result = [NSMutableArray arrayWithCapacity:numClasses]; - - for (i = 0; i < numClasses; i++) - { - Class class = classes[i]; - - if ([self isRegisteredClass:class]) - { - [result addObject:class]; - } - } - - free(classes); - - return result; -} - -+ (NSArray *)registeredClassNames -{ - NSArray *registeredClasses = [self registeredClasses]; - NSMutableArray *result = [NSMutableArray arrayWithCapacity:[registeredClasses count]]; - - for (Class class in registeredClasses) - { - [result addObject:NSStringFromClass(class)]; - } - - return result; -} - -+ (int)logLevelForClass:(Class)aClass -{ - if ([self isRegisteredClass:aClass]) - { - return [aClass ddLogLevel]; - } - - return -1; -} - -+ (int)logLevelForClassWithName:(NSString *)aClassName -{ - Class aClass = NSClassFromString(aClassName); - - return [self logLevelForClass:aClass]; -} - -+ (void)setLogLevel:(int)logLevel forClass:(Class)aClass -{ - if ([self isRegisteredClass:aClass]) - { - [aClass ddSetLogLevel:logLevel]; - } -} - -+ (void)setLogLevel:(int)logLevel forClassWithName:(NSString *)aClassName -{ - Class aClass = NSClassFromString(aClassName); - - [self setLogLevel:logLevel forClass:aClass]; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Logging Thread -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * This method should only be run on the logging thread/queue. -**/ -+ (void)lt_addLogger:(id )logger -{ - // Add to loggers array. - // Need to create loggerQueue if loggerNode doesn't provide one. - - dispatch_queue_t loggerQueue = NULL; - - if ([logger respondsToSelector:@selector(loggerQueue)]) - { - // Logger may be providing its own queue - - loggerQueue = [logger loggerQueue]; - } - - if (loggerQueue == nil) - { - // Automatically create queue for the logger. - // Use the logger name as the queue name if possible. - - const char *loggerQueueName = NULL; - if ([logger respondsToSelector:@selector(loggerName)]) - { - loggerQueueName = [[logger loggerName] UTF8String]; - } - - loggerQueue = dispatch_queue_create(loggerQueueName, NULL); - } - - DDLoggerNode *loggerNode = [DDLoggerNode nodeWithLogger:logger loggerQueue:loggerQueue]; - [loggers addObject:loggerNode]; - - if ([logger respondsToSelector:@selector(didAddLogger)]) - { - dispatch_async(loggerNode->loggerQueue, ^{ @autoreleasepool { - - [logger didAddLogger]; - }}); - } -} - -/** - * This method should only be run on the logging thread/queue. -**/ -+ (void)lt_removeLogger:(id )logger -{ - // Find associated loggerNode in list of added loggers - - DDLoggerNode *loggerNode = nil; - - for (DDLoggerNode *node in loggers) - { - if (node->logger == logger) - { - loggerNode = node; - break; - } - } - - if (loggerNode == nil) - { - //NSLogDebug(@"DDLog: Request to remove logger which wasn't added"); - return; - } - - // Notify logger - - if ([logger respondsToSelector:@selector(willRemoveLogger)]) - { - dispatch_async(loggerNode->loggerQueue, ^{ @autoreleasepool { - - [logger willRemoveLogger]; - }}); - } - - // Remove from loggers array - - [loggers removeObject:loggerNode]; -} - -/** - * This method should only be run on the logging thread/queue. -**/ -+ (void)lt_removeAllLoggers -{ - // Notify all loggers - - for (DDLoggerNode *loggerNode in loggers) - { - if ([loggerNode->logger respondsToSelector:@selector(willRemoveLogger)]) - { - dispatch_async(loggerNode->loggerQueue, ^{ @autoreleasepool { - - [loggerNode->logger willRemoveLogger]; - }}); - } - } - - // Remove all loggers from array - - [loggers removeAllObjects]; -} - -/** - * This method should only be run on the logging thread/queue. -**/ -+ (void)lt_log:(DDLogMessage *)logMessage -{ - // Execute the given log message on each of our loggers. - - if (numProcessors > 1) - { - // Execute each logger concurrently, each within its own queue. - // All blocks are added to same group. - // After each block has been queued, wait on group. - // - // The waiting ensures that a slow logger doesn't end up with a large queue of pending log messages. - // This would defeat the purpose of the efforts we made earlier to restrict the max queue size. - - for (DDLoggerNode *loggerNode in loggers) - { - dispatch_group_async(loggingGroup, loggerNode->loggerQueue, ^{ @autoreleasepool { - - [loggerNode->logger logMessage:logMessage]; - - }}); - } - - dispatch_group_wait(loggingGroup, DISPATCH_TIME_FOREVER); - } - else - { - // Execute each logger serialy, each within its own queue. - - for (DDLoggerNode *loggerNode in loggers) - { - dispatch_sync(loggerNode->loggerQueue, ^{ @autoreleasepool { - - [loggerNode->logger logMessage:logMessage]; - - }}); - } - } - - // If our queue got too big, there may be blocked threads waiting to add log messages to the queue. - // Since we've now dequeued an item from the log, we may need to unblock the next thread. - - // We are using a counting semaphore provided by GCD. - // The semaphore is initialized with our LOG_MAX_QUEUE_SIZE value. - // When a log message is queued this value is decremented. - // When a log message is dequeued this value is incremented. - // If the value ever drops below zero, - // the queueing thread blocks and waits in FIFO order for us to signal it. - // - // A dispatch semaphore is an efficient implementation of a traditional counting semaphore. - // Dispatch semaphores call down to the kernel only when the calling thread needs to be blocked. - // If the calling semaphore does not need to block, no kernel call is made. - - dispatch_semaphore_signal(queueSemaphore); -} - -/** - * This method should only be run on the background logging thread. -**/ -+ (void)lt_flush -{ - // All log statements issued before the flush method was invoked have now been executed. - // - // Now we need to propogate the flush request to any loggers that implement the flush method. - // This is designed for loggers that buffer IO. - - for (DDLoggerNode *loggerNode in loggers) - { - if ([loggerNode->logger respondsToSelector:@selector(flush)]) - { - dispatch_group_async(loggingGroup, loggerNode->loggerQueue, ^{ @autoreleasepool { - - [loggerNode->logger flush]; - - }}); - } - } - - dispatch_group_wait(loggingGroup, DISPATCH_TIME_FOREVER); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Utilities -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -NSString *DDExtractFileNameWithoutExtension(const char *filePath, BOOL copy) -{ - if (filePath == NULL) return nil; - - char *lastSlash = NULL; - char *lastDot = NULL; - - char *p = (char *)filePath; - - while (*p != '\0') - { - if (*p == '/') - lastSlash = p; - else if (*p == '.') - lastDot = p; - - p++; - } - - char *subStr; - NSUInteger subLen; - - if (lastSlash) - { - if (lastDot) - { - // lastSlash -> lastDot - subStr = lastSlash + 1; - subLen = lastDot - subStr; - } - else - { - // lastSlash -> endOfString - subStr = lastSlash + 1; - subLen = p - subStr; - } - } - else - { - if (lastDot) - { - // startOfString -> lastDot - subStr = (char *)filePath; - subLen = lastDot - subStr; - } - else - { - // startOfString -> endOfString - subStr = (char *)filePath; - subLen = p - subStr; - } - } - - if (copy) - { - return [[NSString alloc] initWithBytes:subStr - length:subLen - encoding:NSUTF8StringEncoding]; - } - else - { - // We can take advantage of the fact that __FILE__ is a string literal. - // Specifically, we don't need to waste time copying the string. - // We can just tell NSString to point to a range within the string literal. - - return [[NSString alloc] initWithBytesNoCopy:subStr - length:subLen - encoding:NSUTF8StringEncoding - freeWhenDone:NO]; - } -} - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation DDLoggerNode - -- (id)initWithLogger:(id )aLogger loggerQueue:(dispatch_queue_t)aLoggerQueue -{ - if ((self = [super init])) - { - logger = aLogger; - - if (aLoggerQueue) { - loggerQueue = aLoggerQueue; - #if !OS_OBJECT_USE_OBJC - dispatch_retain(loggerQueue); - #endif - } - } - return self; -} - -+ (DDLoggerNode *)nodeWithLogger:(id )logger loggerQueue:(dispatch_queue_t)loggerQueue -{ - return [[DDLoggerNode alloc] initWithLogger:logger loggerQueue:loggerQueue]; -} - -- (void)dealloc -{ - #if !OS_OBJECT_USE_OBJC - if (loggerQueue) dispatch_release(loggerQueue); - #endif -} - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation DDLogMessage - -static char *dd_str_copy(const char *str) -{ - if (str == NULL) return NULL; - - size_t length = strlen(str); - char * result = malloc(length + 1); - strncpy(result, str, length); - result[length] = 0; - - return result; -} - -- (id)initWithLogMsg:(NSString *)msg - level:(int)level - flag:(int)flag - context:(int)context - file:(const char *)aFile - function:(const char *)aFunction - line:(int)line - tag:(id)aTag - options:(DDLogMessageOptions)optionsMask -{ - if ((self = [super init])) - { - logMsg = msg; - logLevel = level; - logFlag = flag; - logContext = context; - lineNumber = line; - tag = aTag; - options = optionsMask; - - if (options & DDLogMessageCopyFile) - file = dd_str_copy(aFile); - else - file = (char *)aFile; - - if (options & DDLogMessageCopyFunction) - function = dd_str_copy(aFunction); - else - function = (char *)aFunction; - - timestamp = [[NSDate alloc] init]; - - machThreadID = pthread_mach_thread_np(pthread_self()); - - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wdeprecated-declarations" - // The documentation for dispatch_get_current_queue() states: - // - // > [This method is] "recommended for debugging and logging purposes only"... - // - // Well that's exactly how we're using it here. Literally for logging purposes only. - // However, Apple has decided to deprecate this method anyway. - // However they have not given us an alternate version of dispatch_queue_get_label() that - // automatically uses the current queue, thus dispatch_get_current_queue() is still required. - // - // If dispatch_get_current_queue() disappears, without a dispatch_queue_get_label() alternative, - // Apple will have effectively taken away our ability to properly log the name of executing dispatch queue. - - dispatch_queue_t currentQueue = dispatch_get_current_queue(); - #pragma clang diagnostic pop - - queueLabel = dd_str_copy(dispatch_queue_get_label(currentQueue)); - - threadName = [[NSThread currentThread] name]; - } - return self; -} - -- (NSString *)threadID -{ - return [[NSString alloc] initWithFormat:@"%x", machThreadID]; -} - -- (NSString *)fileName -{ - return DDExtractFileNameWithoutExtension(file, NO); -} - -- (NSString *)methodName -{ - if (function == NULL) - return nil; - else - return [[NSString alloc] initWithUTF8String:function]; -} - -- (void)dealloc -{ - if (file && (options & DDLogMessageCopyFile)) - free(file); - - if (function && (options & DDLogMessageCopyFunction)) - free(function); - - if (queueLabel) - free(queueLabel); -} - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation DDAbstractLogger - -- (id)init -{ - if ((self = [super init])) - { - const char *loggerQueueName = NULL; - if ([self respondsToSelector:@selector(loggerName)]) - { - loggerQueueName = [[self loggerName] UTF8String]; - } - - loggerQueue = dispatch_queue_create(loggerQueueName, NULL); - - // We're going to use dispatch_queue_set_specific() to "mark" our loggerQueue. - // Later we can use dispatch_get_specific() to determine if we're executing on our loggerQueue. - // The documentation states: - // - // > Keys are only compared as pointers and are never dereferenced. - // > Thus, you can use a pointer to a static variable for a specific subsystem or - // > any other value that allows you to identify the value uniquely. - // > Specifying a pointer to a string constant is not recommended. - // - // So we're going to use the very convenient key of "self", - // which also works when multiple logger classes extend this class, as each will have a different "self" key. - // - // This is used primarily for thread-safety assertions (via the isOnInternalLoggerQueue method below). - - void *key = (__bridge void *)self; - void *nonNullValue = (__bridge void *)self; - - dispatch_queue_set_specific(loggerQueue, key, nonNullValue, NULL); - } - return self; -} - -- (void)dealloc -{ - #if !OS_OBJECT_USE_OBJC - if (loggerQueue) dispatch_release(loggerQueue); - #endif -} - -- (void)logMessage:(DDLogMessage *)logMessage -{ - // Override me -} - -- (id )logFormatter -{ - // This method must be thread safe and intuitive. - // Therefore if somebody executes the following code: - // - // [logger setLogFormatter:myFormatter]; - // formatter = [logger logFormatter]; - // - // They would expect formatter to equal myFormatter. - // This functionality must be ensured by the getter and setter method. - // - // The thread safety must not come at a cost to the performance of the logMessage method. - // This method is likely called sporadically, while the logMessage method is called repeatedly. - // This means, the implementation of this method: - // - Must NOT require the logMessage method to acquire a lock. - // - Must NOT require the logMessage method to access an atomic property (also a lock of sorts). - // - // Thread safety is ensured by executing access to the formatter variable on the loggerQueue. - // This is the same queue that the logMessage method operates on. - // - // Note: The last time I benchmarked the performance of direct access vs atomic property access, - // direct access was over twice as fast on the desktop and over 6 times as fast on the iPhone. - // - // Furthermore, consider the following code: - // - // DDLogVerbose(@"log msg 1"); - // DDLogVerbose(@"log msg 2"); - // [logger setFormatter:myFormatter]; - // DDLogVerbose(@"log msg 3"); - // - // Our intuitive requirement means that the new formatter will only apply to the 3rd log message. - // This must remain true even when using asynchronous logging. - // We must keep in mind the various queue's that are in play here: - // - // loggerQueue : Our own private internal queue that the logMessage method runs on. - // Operations are added to this queue from the global loggingQueue. - // - // globalLoggingQueue : The queue that all log messages go through before they arrive in our loggerQueue. - // - // All log statements go through the serial gloabalLoggingQueue before they arrive at our loggerQueue. - // Thus this method also goes through the serial globalLoggingQueue to ensure intuitive operation. - - // IMPORTANT NOTE: - // - // Methods within the DDLogger implementation MUST access the formatter ivar directly. - // This method is designed explicitly for external access. - // - // Using "self." syntax to go through this method will cause immediate deadlock. - // This is the intended result. Fix it by accessing the ivar directly. - // Great strides have been take to ensure this is safe to do. Plus it's MUCH faster. - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - __block id result; - - dispatch_sync(globalLoggingQueue, ^{ - dispatch_sync(loggerQueue, ^{ - result = formatter; - }); - }); - - return result; -} - -- (void)setLogFormatter:(id )logFormatter -{ - // The design of this method is documented extensively in the logFormatter message (above in code). - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_block_t block = ^{ @autoreleasepool { - - if (formatter != logFormatter) - { - if ([formatter respondsToSelector:@selector(willRemoveFromLogger:)]) { - [formatter willRemoveFromLogger:self]; - } - - formatter = logFormatter; - - if ([formatter respondsToSelector:@selector(didAddToLogger:)]) { - [formatter didAddToLogger:self]; - } - } - }}; - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); -} - -- (dispatch_queue_t)loggerQueue -{ - return loggerQueue; -} - -- (NSString *)loggerName -{ - return NSStringFromClass([self class]); -} - -- (BOOL)isOnGlobalLoggingQueue -{ - return (dispatch_get_specific(GlobalLoggingQueueIdentityKey) != NULL); -} - -- (BOOL)isOnInternalLoggerQueue -{ - void *key = (__bridge void *)self; - return (dispatch_get_specific(key) != NULL); -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDTTYLogger.h b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDTTYLogger.h deleted file mode 100755 index 0acb0fd..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDTTYLogger.h +++ /dev/null @@ -1,167 +0,0 @@ -#import -#if TARGET_OS_IPHONE -#import -#else -#import -#endif - -#import "DDLog.h" - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" wiki. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted - * - * - * This class provides a logger for Terminal output or Xcode console output, - * depending on where you are running your code. - * - * As described in the "Getting Started" page, - * the traditional NSLog() function directs it's output to two places: - * - * - Apple System Log (so it shows up in Console.app) - * - StdErr (if stderr is a TTY, so log statements show up in Xcode console) - * - * To duplicate NSLog() functionality you can simply add this logger and an asl logger. - * However, if you instead choose to use file logging (for faster performance), - * you may choose to use only a file logger and a tty logger. -**/ - -@interface DDTTYLogger : DDAbstractLogger -{ - NSCalendar *calendar; - NSUInteger calendarUnitFlags; - - NSString *appName; - char *app; - size_t appLen; - - NSString *processID; - char *pid; - size_t pidLen; - - BOOL colorsEnabled; - NSMutableArray *colorProfilesArray; - NSMutableDictionary *colorProfilesDict; -} - -+ (DDTTYLogger *)sharedInstance; - -/* Inherited from the DDLogger protocol: - * - * Formatters may optionally be added to any logger. - * - * If no formatter is set, the logger simply logs the message as it is given in logMessage, - * or it may use its own built in formatting style. - * - * More information about formatters can be found here: - * https://github.com/robbiehanson/CocoaLumberjack/wiki/CustomFormatters - * - * The actual implementation of these methods is inherited from DDAbstractLogger. - -- (id )logFormatter; -- (void)setLogFormatter:(id )formatter; - -*/ - -/** - * Want to use different colors for different log levels? - * Enable this property. - * - * If you run the application via the Terminal (not Xcode), - * the logger will map colors to xterm-256color or xterm-color (if available). - * - * Xcode does NOT natively support colors in the Xcode debugging console. - * You'll need to install the XcodeColors plugin to see colors in the Xcode console. - * https://github.com/robbiehanson/XcodeColors - * - * The default value if NO. -**/ -@property (readwrite, assign) BOOL colorsEnabled; - -/** - * The default color set (foregroundColor, backgroundColor) is: - * - * - LOG_FLAG_ERROR = (red, nil) - * - LOG_FLAG_WARN = (orange, nil) - * - * You can customize the colors however you see fit. - * Please note that you are passing a flag, NOT a level. - * - * GOOD : [ttyLogger setForegroundColor:pink backgroundColor:nil forFlag:LOG_FLAG_INFO]; // <- Good :) - * BAD : [ttyLogger setForegroundColor:pink backgroundColor:nil forFlag:LOG_LEVEL_INFO]; // <- BAD! :( - * - * LOG_FLAG_INFO = 0...00100 - * LOG_LEVEL_INFO = 0...00111 <- Would match LOG_FLAG_INFO and LOG_FLAG_WARN and LOG_FLAG_ERROR - * - * If you run the application within Xcode, then the XcodeColors plugin is required. - * - * If you run the application from a shell, then DDTTYLogger will automatically map the given color to - * the closest available color. (xterm-256color or xterm-color which have 256 and 16 supported colors respectively.) - * - * This method invokes setForegroundColor:backgroundColor:forFlag:context: and passes the default context (0). -**/ -#if TARGET_OS_IPHONE -- (void)setForegroundColor:(UIColor *)txtColor backgroundColor:(UIColor *)bgColor forFlag:(int)mask; -#else -- (void)setForegroundColor:(NSColor *)txtColor backgroundColor:(NSColor *)bgColor forFlag:(int)mask; -#endif - -/** - * Just like setForegroundColor:backgroundColor:flag, but allows you to specify a particular logging context. - * - * A logging context is often used to identify log messages coming from a 3rd party framework, - * although logging context's can be used for many different functions. - * - * Logging context's are explained in further detail here: - * https://github.com/robbiehanson/CocoaLumberjack/wiki/CustomContext -**/ -#if TARGET_OS_IPHONE -- (void)setForegroundColor:(UIColor *)txtColor backgroundColor:(UIColor *)bgColor forFlag:(int)mask context:(int)ctxt; -#else -- (void)setForegroundColor:(NSColor *)txtColor backgroundColor:(NSColor *)bgColor forFlag:(int)mask context:(int)ctxt; -#endif - -/** - * Similar to the methods above, but allows you to map DDLogMessage->tag to a particular color profile. - * For example, you could do something like this: - * - * static NSString *const PurpleTag = @"PurpleTag"; - * - * #define DDLogPurple(frmt, ...) LOG_OBJC_TAG_MACRO(NO, 0, 0, 0, PurpleTag, frmt, ##__VA_ARGS__) - * - * And then in your applicationDidFinishLaunching, or wherever you configure Lumberjack: - * - * #if TARGET_OS_IPHONE - * UIColor *purple = [UIColor colorWithRed:(64/255.0) green:(0/255.0) blue:(128/255.0) alpha:1.0]; - * #else - * NSColor *purple = [NSColor colorWithCalibratedRed:(64/255.0) green:(0/255.0) blue:(128/255.0) alpha:1.0]; - * - * [[DDTTYLogger sharedInstance] setForegroundColor:purple backgroundColor:nil forTag:PurpleTag]; - * [DDLog addLogger:[DDTTYLogger sharedInstance]]; - * - * This would essentially give you a straight NSLog replacement that prints in purple: - * - * DDLogPurple(@"I'm a purple log message!"); -**/ -#if TARGET_OS_IPHONE -- (void)setForegroundColor:(UIColor *)txtColor backgroundColor:(UIColor *)bgColor forTag:(id )tag; -#else -- (void)setForegroundColor:(NSColor *)txtColor backgroundColor:(NSColor *)bgColor forTag:(id )tag; -#endif - -/** - * Clearing color profiles. -**/ -- (void)clearColorsForFlag:(int)mask; -- (void)clearColorsForFlag:(int)mask context:(int)context; -- (void)clearColorsForTag:(id )tag; -- (void)clearColorsForAllFlags; -- (void)clearColorsForAllTags; -- (void)clearAllColors; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDTTYLogger.m b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDTTYLogger.m deleted file mode 100755 index d6c0ebf..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/DDTTYLogger.m +++ /dev/null @@ -1,1479 +0,0 @@ -#import "DDTTYLogger.h" - -#import -#import - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" wiki. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted -**/ - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -// We probably shouldn't be using DDLog() statements within the DDLog implementation. -// But we still want to leave our log statements for any future debugging, -// and to allow other developers to trace the implementation (which is a great learning tool). -// -// So we use primitive logging macros around NSLog. -// We maintain the NS prefix on the macros to be explicit about the fact that we're using NSLog. - -#define LOG_LEVEL 2 - -#define NSLogError(frmt, ...) do{ if(LOG_LEVEL >= 1) NSLog((frmt), ##__VA_ARGS__); } while(0) -#define NSLogWarn(frmt, ...) do{ if(LOG_LEVEL >= 2) NSLog((frmt), ##__VA_ARGS__); } while(0) -#define NSLogInfo(frmt, ...) do{ if(LOG_LEVEL >= 3) NSLog((frmt), ##__VA_ARGS__); } while(0) -#define NSLogVerbose(frmt, ...) do{ if(LOG_LEVEL >= 4) NSLog((frmt), ##__VA_ARGS__); } while(0) - -// Xcode does NOT natively support colors in the Xcode debugging console. -// You'll need to install the XcodeColors plugin to see colors in the Xcode console. -// https://github.com/robbiehanson/XcodeColors -// -// The following is documentation from the XcodeColors project: -// -// -// How to apply color formatting to your log statements: -// -// To set the foreground color: -// Insert the ESCAPE_SEQ into your string, followed by "fg124,12,255;" where r=124, g=12, b=255. -// -// To set the background color: -// Insert the ESCAPE_SEQ into your string, followed by "bg12,24,36;" where r=12, g=24, b=36. -// -// To reset the foreground color (to default value): -// Insert the ESCAPE_SEQ into your string, followed by "fg;" -// -// To reset the background color (to default value): -// Insert the ESCAPE_SEQ into your string, followed by "bg;" -// -// To reset the foreground and background color (to default values) in one operation: -// Insert the ESCAPE_SEQ into your string, followed by ";" - -#define XCODE_COLORS_ESCAPE_SEQ "\033[" - -#define XCODE_COLORS_RESET_FG XCODE_COLORS_ESCAPE_SEQ "fg;" // Clear any foreground color -#define XCODE_COLORS_RESET_BG XCODE_COLORS_ESCAPE_SEQ "bg;" // Clear any background color -#define XCODE_COLORS_RESET XCODE_COLORS_ESCAPE_SEQ ";" // Clear any foreground or background color - -// Some simple defines to make life easier on ourself - -#if TARGET_OS_IPHONE - #define MakeColor(r, g, b) [UIColor colorWithRed:(r/255.0f) green:(g/255.0f) blue:(b/255.0f) alpha:1.0f] -#else - #define MakeColor(r, g, b) [NSColor colorWithCalibratedRed:(r/255.0f) green:(g/255.0f) blue:(b/255.0f) alpha:1.0f] -#endif - -#if TARGET_OS_IPHONE - #define OSColor UIColor -#else - #define OSColor NSColor -#endif - -// If running in a shell, not all RGB colors will be supported. -// In this case we automatically map to the closest available color. -// In order to provide this mapping, we have a hard-coded set of the standard RGB values available in the shell. -// However, not every shell is the same, and Apple likes to think different even when it comes to shell colors. -// -// Map to standard Terminal.app colors (1), or -// map to standard xterm colors (0). - -#define MAP_TO_TERMINAL_APP_COLORS 1 - - -@interface DDTTYLoggerColorProfile : NSObject { -@public - int mask; - int context; - - uint8_t fg_r; - uint8_t fg_g; - uint8_t fg_b; - - uint8_t bg_r; - uint8_t bg_g; - uint8_t bg_b; - - NSUInteger fgCodeIndex; - NSString *fgCodeRaw; - - NSUInteger bgCodeIndex; - NSString *bgCodeRaw; - - char fgCode[24]; - size_t fgCodeLen; - - char bgCode[24]; - size_t bgCodeLen; - - char resetCode[8]; - size_t resetCodeLen; -} - -- (id)initWithForegroundColor:(OSColor *)fgColor backgroundColor:(OSColor *)bgColor flag:(int)mask context:(int)ctxt; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation DDTTYLogger - -static BOOL isaColorTTY; -static BOOL isaColor256TTY; -static BOOL isaXcodeColorTTY; - -static NSArray *codes_fg = nil; -static NSArray *codes_bg = nil; -static NSArray *colors = nil; - -static DDTTYLogger *sharedInstance; - -/** - * Initializes the colors array, as well as the codes_fg and codes_bg arrays, for 16 color mode. - * - * This method is used when the application is running from within a shell that only supports 16 color mode. - * This method is not invoked if the application is running within Xcode, or via normal UI app launch. -**/ -+ (void)initialize_colors_16 -{ - if (codes_fg || codes_bg || colors) return; - - NSMutableArray *m_codes_fg = [NSMutableArray arrayWithCapacity:16]; - NSMutableArray *m_codes_bg = [NSMutableArray arrayWithCapacity:16]; - NSMutableArray *m_colors = [NSMutableArray arrayWithCapacity:16]; - - // In a standard shell only 16 colors are supported. - // - // More information about ansi escape codes can be found online. - // http://en.wikipedia.org/wiki/ANSI_escape_code - - [m_codes_fg addObject:@"30m"]; // normal - black - [m_codes_fg addObject:@"31m"]; // normal - red - [m_codes_fg addObject:@"32m"]; // normal - green - [m_codes_fg addObject:@"33m"]; // normal - yellow - [m_codes_fg addObject:@"34m"]; // normal - blue - [m_codes_fg addObject:@"35m"]; // normal - magenta - [m_codes_fg addObject:@"36m"]; // normal - cyan - [m_codes_fg addObject:@"37m"]; // normal - gray - [m_codes_fg addObject:@"1;30m"]; // bright - darkgray - [m_codes_fg addObject:@"1;31m"]; // bright - red - [m_codes_fg addObject:@"1;32m"]; // bright - green - [m_codes_fg addObject:@"1;33m"]; // bright - yellow - [m_codes_fg addObject:@"1;34m"]; // bright - blue - [m_codes_fg addObject:@"1;35m"]; // bright - magenta - [m_codes_fg addObject:@"1;36m"]; // bright - cyan - [m_codes_fg addObject:@"1;37m"]; // bright - white - - [m_codes_bg addObject:@"40m"]; // normal - black - [m_codes_bg addObject:@"41m"]; // normal - red - [m_codes_bg addObject:@"42m"]; // normal - green - [m_codes_bg addObject:@"43m"]; // normal - yellow - [m_codes_bg addObject:@"44m"]; // normal - blue - [m_codes_bg addObject:@"45m"]; // normal - magenta - [m_codes_bg addObject:@"46m"]; // normal - cyan - [m_codes_bg addObject:@"47m"]; // normal - gray - [m_codes_bg addObject:@"1;40m"]; // bright - darkgray - [m_codes_bg addObject:@"1;41m"]; // bright - red - [m_codes_bg addObject:@"1;42m"]; // bright - green - [m_codes_bg addObject:@"1;43m"]; // bright - yellow - [m_codes_bg addObject:@"1;44m"]; // bright - blue - [m_codes_bg addObject:@"1;45m"]; // bright - magenta - [m_codes_bg addObject:@"1;46m"]; // bright - cyan - [m_codes_bg addObject:@"1;47m"]; // bright - white - -#if MAP_TO_TERMINAL_APP_COLORS - - // Standard Terminal.app colors: - // - // These are the default colors used by Apple's Terminal.app. - - [m_colors addObject:MakeColor( 0, 0, 0)]; // normal - black - [m_colors addObject:MakeColor(194, 54, 33)]; // normal - red - [m_colors addObject:MakeColor( 37, 188, 36)]; // normal - green - [m_colors addObject:MakeColor(173, 173, 39)]; // normal - yellow - [m_colors addObject:MakeColor( 73, 46, 225)]; // normal - blue - [m_colors addObject:MakeColor(211, 56, 211)]; // normal - magenta - [m_colors addObject:MakeColor( 51, 187, 200)]; // normal - cyan - [m_colors addObject:MakeColor(203, 204, 205)]; // normal - gray - [m_colors addObject:MakeColor(129, 131, 131)]; // bright - darkgray - [m_colors addObject:MakeColor(252, 57, 31)]; // bright - red - [m_colors addObject:MakeColor( 49, 231, 34)]; // bright - green - [m_colors addObject:MakeColor(234, 236, 35)]; // bright - yellow - [m_colors addObject:MakeColor( 88, 51, 255)]; // bright - blue - [m_colors addObject:MakeColor(249, 53, 248)]; // bright - magenta - [m_colors addObject:MakeColor( 20, 240, 240)]; // bright - cyan - [m_colors addObject:MakeColor(233, 235, 235)]; // bright - white - -#else - - // Standard xterm colors: - // - // These are the default colors used by most xterm shells. - - [m_colors addObject:MakeColor( 0, 0, 0)]; // normal - black - [m_colors addObject:MakeColor(205, 0, 0)]; // normal - red - [m_colors addObject:MakeColor( 0, 205, 0)]; // normal - green - [m_colors addObject:MakeColor(205, 205, 0)]; // normal - yellow - [m_colors addObject:MakeColor( 0, 0, 238)]; // normal - blue - [m_colors addObject:MakeColor(205, 0, 205)]; // normal - magenta - [m_colors addObject:MakeColor( 0, 205, 205)]; // normal - cyan - [m_colors addObject:MakeColor(229, 229, 229)]; // normal - gray - [m_colors addObject:MakeColor(127, 127, 127)]; // bright - darkgray - [m_colors addObject:MakeColor(255, 0, 0)]; // bright - red - [m_colors addObject:MakeColor( 0, 255, 0)]; // bright - green - [m_colors addObject:MakeColor(255, 255, 0)]; // bright - yellow - [m_colors addObject:MakeColor( 92, 92, 255)]; // bright - blue - [m_colors addObject:MakeColor(255, 0, 255)]; // bright - magenta - [m_colors addObject:MakeColor( 0, 255, 255)]; // bright - cyan - [m_colors addObject:MakeColor(255, 255, 255)]; // bright - white - -#endif - - codes_fg = [m_codes_fg copy]; - codes_bg = [m_codes_bg copy]; - colors = [m_colors copy]; - - NSAssert([codes_fg count] == [codes_bg count], @"Invalid colors/codes array(s)"); - NSAssert([codes_fg count] == [colors count], @"Invalid colors/codes array(s)"); -} - -/** - * Initializes the colors array, as well as the codes_fg and codes_bg arrays, for 256 color mode. - * - * This method is used when the application is running from within a shell that supports 256 color mode. - * This method is not invoked if the application is running within Xcode, or via normal UI app launch. -**/ -+ (void)initialize_colors_256 -{ - if (codes_fg || codes_bg || colors) return; - - NSMutableArray *m_codes_fg = [NSMutableArray arrayWithCapacity:(256-16)]; - NSMutableArray *m_codes_bg = [NSMutableArray arrayWithCapacity:(256-16)]; - NSMutableArray *m_colors = [NSMutableArray arrayWithCapacity:(256-16)]; - - #if MAP_TO_TERMINAL_APP_COLORS - - // Standard Terminal.app colors: - // - // These are the colors the Terminal.app uses in xterm-256color mode. - // In this mode, the terminal supports 256 different colors, specified by 256 color codes. - // - // The first 16 color codes map to the original 16 color codes supported by the earlier xterm-color mode. - // These are actually configurable, and thus we ignore them for the purposes of mapping, - // as we can't rely on them being constant. They are largely duplicated anyway. - // - // The next 216 color codes are designed to run the spectrum, with several shades of every color. - // While the color codes are standardized, the actual RGB values for each color code is not. - // Apple's Terminal.app uses different RGB values from that of a standard xterm. - // Apple's choices in colors are designed to be a little nicer on the eyes. - // - // The last 24 color codes represent a grayscale. - // - // Unfortunately, unlike the standard xterm color chart, - // Apple's RGB values cannot be calculated using a simple formula (at least not that I know of). - // Also, I don't know of any ways to programmatically query the shell for the RGB values. - // So this big giant color chart had to be made by hand. - // - // More information about ansi escape codes can be found online. - // http://en.wikipedia.org/wiki/ANSI_escape_code - - // Colors - - [m_colors addObject:MakeColor( 47, 49, 49)]; - [m_colors addObject:MakeColor( 60, 42, 144)]; - [m_colors addObject:MakeColor( 66, 44, 183)]; - [m_colors addObject:MakeColor( 73, 46, 222)]; - [m_colors addObject:MakeColor( 81, 50, 253)]; - [m_colors addObject:MakeColor( 88, 51, 255)]; - - [m_colors addObject:MakeColor( 42, 128, 37)]; - [m_colors addObject:MakeColor( 42, 127, 128)]; - [m_colors addObject:MakeColor( 44, 126, 169)]; - [m_colors addObject:MakeColor( 56, 125, 209)]; - [m_colors addObject:MakeColor( 59, 124, 245)]; - [m_colors addObject:MakeColor( 66, 123, 255)]; - - [m_colors addObject:MakeColor( 51, 163, 41)]; - [m_colors addObject:MakeColor( 39, 162, 121)]; - [m_colors addObject:MakeColor( 42, 161, 162)]; - [m_colors addObject:MakeColor( 53, 160, 202)]; - [m_colors addObject:MakeColor( 45, 159, 240)]; - [m_colors addObject:MakeColor( 58, 158, 255)]; - - [m_colors addObject:MakeColor( 31, 196, 37)]; - [m_colors addObject:MakeColor( 48, 196, 115)]; - [m_colors addObject:MakeColor( 39, 195, 155)]; - [m_colors addObject:MakeColor( 49, 195, 195)]; - [m_colors addObject:MakeColor( 32, 194, 235)]; - [m_colors addObject:MakeColor( 53, 193, 255)]; - - [m_colors addObject:MakeColor( 50, 229, 35)]; - [m_colors addObject:MakeColor( 40, 229, 109)]; - [m_colors addObject:MakeColor( 27, 229, 149)]; - [m_colors addObject:MakeColor( 49, 228, 189)]; - [m_colors addObject:MakeColor( 33, 228, 228)]; - [m_colors addObject:MakeColor( 53, 227, 255)]; - - [m_colors addObject:MakeColor( 27, 254, 30)]; - [m_colors addObject:MakeColor( 30, 254, 103)]; - [m_colors addObject:MakeColor( 45, 254, 143)]; - [m_colors addObject:MakeColor( 38, 253, 182)]; - [m_colors addObject:MakeColor( 38, 253, 222)]; - [m_colors addObject:MakeColor( 42, 253, 252)]; - - [m_colors addObject:MakeColor(140, 48, 40)]; - [m_colors addObject:MakeColor(136, 51, 136)]; - [m_colors addObject:MakeColor(135, 52, 177)]; - [m_colors addObject:MakeColor(134, 52, 217)]; - [m_colors addObject:MakeColor(135, 56, 248)]; - [m_colors addObject:MakeColor(134, 53, 255)]; - - [m_colors addObject:MakeColor(125, 125, 38)]; - [m_colors addObject:MakeColor(124, 125, 125)]; - [m_colors addObject:MakeColor(122, 124, 166)]; - [m_colors addObject:MakeColor(123, 124, 207)]; - [m_colors addObject:MakeColor(123, 122, 247)]; - [m_colors addObject:MakeColor(124, 121, 255)]; - - [m_colors addObject:MakeColor(119, 160, 35)]; - [m_colors addObject:MakeColor(117, 160, 120)]; - [m_colors addObject:MakeColor(117, 160, 160)]; - [m_colors addObject:MakeColor(115, 159, 201)]; - [m_colors addObject:MakeColor(116, 158, 240)]; - [m_colors addObject:MakeColor(117, 157, 255)]; - - [m_colors addObject:MakeColor(113, 195, 39)]; - [m_colors addObject:MakeColor(110, 194, 114)]; - [m_colors addObject:MakeColor(111, 194, 154)]; - [m_colors addObject:MakeColor(108, 194, 194)]; - [m_colors addObject:MakeColor(109, 193, 234)]; - [m_colors addObject:MakeColor(108, 192, 255)]; - - [m_colors addObject:MakeColor(105, 228, 30)]; - [m_colors addObject:MakeColor(103, 228, 109)]; - [m_colors addObject:MakeColor(105, 228, 148)]; - [m_colors addObject:MakeColor(100, 227, 188)]; - [m_colors addObject:MakeColor( 99, 227, 227)]; - [m_colors addObject:MakeColor( 99, 226, 253)]; - - [m_colors addObject:MakeColor( 92, 253, 34)]; - [m_colors addObject:MakeColor( 96, 253, 103)]; - [m_colors addObject:MakeColor( 97, 253, 142)]; - [m_colors addObject:MakeColor( 88, 253, 182)]; - [m_colors addObject:MakeColor( 93, 253, 221)]; - [m_colors addObject:MakeColor( 88, 254, 251)]; - - [m_colors addObject:MakeColor(177, 53, 34)]; - [m_colors addObject:MakeColor(174, 54, 131)]; - [m_colors addObject:MakeColor(172, 55, 172)]; - [m_colors addObject:MakeColor(171, 57, 213)]; - [m_colors addObject:MakeColor(170, 55, 249)]; - [m_colors addObject:MakeColor(170, 57, 255)]; - - [m_colors addObject:MakeColor(165, 123, 37)]; - [m_colors addObject:MakeColor(163, 123, 123)]; - [m_colors addObject:MakeColor(162, 123, 164)]; - [m_colors addObject:MakeColor(161, 122, 205)]; - [m_colors addObject:MakeColor(161, 121, 241)]; - [m_colors addObject:MakeColor(161, 121, 255)]; - - [m_colors addObject:MakeColor(158, 159, 33)]; - [m_colors addObject:MakeColor(157, 158, 118)]; - [m_colors addObject:MakeColor(157, 158, 159)]; - [m_colors addObject:MakeColor(155, 157, 199)]; - [m_colors addObject:MakeColor(155, 157, 239)]; - [m_colors addObject:MakeColor(154, 156, 255)]; - - [m_colors addObject:MakeColor(152, 193, 40)]; - [m_colors addObject:MakeColor(151, 193, 113)]; - [m_colors addObject:MakeColor(150, 193, 153)]; - [m_colors addObject:MakeColor(150, 192, 193)]; - [m_colors addObject:MakeColor(148, 192, 232)]; - [m_colors addObject:MakeColor(149, 191, 253)]; - - [m_colors addObject:MakeColor(146, 227, 28)]; - [m_colors addObject:MakeColor(144, 227, 108)]; - [m_colors addObject:MakeColor(144, 227, 147)]; - [m_colors addObject:MakeColor(144, 227, 187)]; - [m_colors addObject:MakeColor(142, 226, 227)]; - [m_colors addObject:MakeColor(142, 225, 252)]; - - [m_colors addObject:MakeColor(138, 253, 36)]; - [m_colors addObject:MakeColor(137, 253, 102)]; - [m_colors addObject:MakeColor(136, 253, 141)]; - [m_colors addObject:MakeColor(138, 254, 181)]; - [m_colors addObject:MakeColor(135, 255, 220)]; - [m_colors addObject:MakeColor(133, 255, 250)]; - - [m_colors addObject:MakeColor(214, 57, 30)]; - [m_colors addObject:MakeColor(211, 59, 126)]; - [m_colors addObject:MakeColor(209, 57, 168)]; - [m_colors addObject:MakeColor(208, 55, 208)]; - [m_colors addObject:MakeColor(207, 58, 247)]; - [m_colors addObject:MakeColor(206, 61, 255)]; - - [m_colors addObject:MakeColor(204, 121, 32)]; - [m_colors addObject:MakeColor(202, 121, 121)]; - [m_colors addObject:MakeColor(201, 121, 161)]; - [m_colors addObject:MakeColor(200, 120, 202)]; - [m_colors addObject:MakeColor(200, 120, 241)]; - [m_colors addObject:MakeColor(198, 119, 255)]; - - [m_colors addObject:MakeColor(198, 157, 37)]; - [m_colors addObject:MakeColor(196, 157, 116)]; - [m_colors addObject:MakeColor(195, 156, 157)]; - [m_colors addObject:MakeColor(195, 156, 197)]; - [m_colors addObject:MakeColor(194, 155, 236)]; - [m_colors addObject:MakeColor(193, 155, 255)]; - - [m_colors addObject:MakeColor(191, 192, 36)]; - [m_colors addObject:MakeColor(190, 191, 112)]; - [m_colors addObject:MakeColor(189, 191, 152)]; - [m_colors addObject:MakeColor(189, 191, 191)]; - [m_colors addObject:MakeColor(188, 190, 230)]; - [m_colors addObject:MakeColor(187, 190, 253)]; - - [m_colors addObject:MakeColor(185, 226, 28)]; - [m_colors addObject:MakeColor(184, 226, 106)]; - [m_colors addObject:MakeColor(183, 225, 146)]; - [m_colors addObject:MakeColor(183, 225, 186)]; - [m_colors addObject:MakeColor(182, 225, 225)]; - [m_colors addObject:MakeColor(181, 224, 252)]; - - [m_colors addObject:MakeColor(178, 255, 35)]; - [m_colors addObject:MakeColor(178, 255, 101)]; - [m_colors addObject:MakeColor(177, 254, 141)]; - [m_colors addObject:MakeColor(176, 254, 180)]; - [m_colors addObject:MakeColor(176, 254, 220)]; - [m_colors addObject:MakeColor(175, 253, 249)]; - - [m_colors addObject:MakeColor(247, 56, 30)]; - [m_colors addObject:MakeColor(245, 57, 122)]; - [m_colors addObject:MakeColor(243, 59, 163)]; - [m_colors addObject:MakeColor(244, 60, 204)]; - [m_colors addObject:MakeColor(242, 59, 241)]; - [m_colors addObject:MakeColor(240, 55, 255)]; - - [m_colors addObject:MakeColor(241, 119, 36)]; - [m_colors addObject:MakeColor(240, 120, 118)]; - [m_colors addObject:MakeColor(238, 119, 158)]; - [m_colors addObject:MakeColor(237, 119, 199)]; - [m_colors addObject:MakeColor(237, 118, 238)]; - [m_colors addObject:MakeColor(236, 118, 255)]; - - [m_colors addObject:MakeColor(235, 154, 36)]; - [m_colors addObject:MakeColor(235, 154, 114)]; - [m_colors addObject:MakeColor(234, 154, 154)]; - [m_colors addObject:MakeColor(232, 154, 194)]; - [m_colors addObject:MakeColor(232, 153, 234)]; - [m_colors addObject:MakeColor(232, 153, 255)]; - - [m_colors addObject:MakeColor(230, 190, 30)]; - [m_colors addObject:MakeColor(229, 189, 110)]; - [m_colors addObject:MakeColor(228, 189, 150)]; - [m_colors addObject:MakeColor(227, 189, 190)]; - [m_colors addObject:MakeColor(227, 189, 229)]; - [m_colors addObject:MakeColor(226, 188, 255)]; - - [m_colors addObject:MakeColor(224, 224, 35)]; - [m_colors addObject:MakeColor(223, 224, 105)]; - [m_colors addObject:MakeColor(222, 224, 144)]; - [m_colors addObject:MakeColor(222, 223, 184)]; - [m_colors addObject:MakeColor(222, 223, 224)]; - [m_colors addObject:MakeColor(220, 223, 253)]; - - [m_colors addObject:MakeColor(217, 253, 28)]; - [m_colors addObject:MakeColor(217, 253, 99)]; - [m_colors addObject:MakeColor(216, 252, 139)]; - [m_colors addObject:MakeColor(216, 252, 179)]; - [m_colors addObject:MakeColor(215, 252, 218)]; - [m_colors addObject:MakeColor(215, 251, 250)]; - - [m_colors addObject:MakeColor(255, 61, 30)]; - [m_colors addObject:MakeColor(255, 60, 118)]; - [m_colors addObject:MakeColor(255, 58, 159)]; - [m_colors addObject:MakeColor(255, 56, 199)]; - [m_colors addObject:MakeColor(255, 55, 238)]; - [m_colors addObject:MakeColor(255, 59, 255)]; - - [m_colors addObject:MakeColor(255, 117, 29)]; - [m_colors addObject:MakeColor(255, 117, 115)]; - [m_colors addObject:MakeColor(255, 117, 155)]; - [m_colors addObject:MakeColor(255, 117, 195)]; - [m_colors addObject:MakeColor(255, 116, 235)]; - [m_colors addObject:MakeColor(254, 116, 255)]; - - [m_colors addObject:MakeColor(255, 152, 27)]; - [m_colors addObject:MakeColor(255, 152, 111)]; - [m_colors addObject:MakeColor(254, 152, 152)]; - [m_colors addObject:MakeColor(255, 152, 192)]; - [m_colors addObject:MakeColor(254, 151, 231)]; - [m_colors addObject:MakeColor(253, 151, 253)]; - - [m_colors addObject:MakeColor(255, 187, 33)]; - [m_colors addObject:MakeColor(253, 187, 107)]; - [m_colors addObject:MakeColor(252, 187, 148)]; - [m_colors addObject:MakeColor(253, 187, 187)]; - [m_colors addObject:MakeColor(254, 187, 227)]; - [m_colors addObject:MakeColor(252, 186, 252)]; - - [m_colors addObject:MakeColor(252, 222, 34)]; - [m_colors addObject:MakeColor(251, 222, 103)]; - [m_colors addObject:MakeColor(251, 222, 143)]; - [m_colors addObject:MakeColor(250, 222, 182)]; - [m_colors addObject:MakeColor(251, 221, 222)]; - [m_colors addObject:MakeColor(252, 221, 252)]; - - [m_colors addObject:MakeColor(251, 252, 15)]; - [m_colors addObject:MakeColor(251, 252, 97)]; - [m_colors addObject:MakeColor(249, 252, 137)]; - [m_colors addObject:MakeColor(247, 252, 177)]; - [m_colors addObject:MakeColor(247, 253, 217)]; - [m_colors addObject:MakeColor(254, 255, 255)]; - - // Grayscale - - [m_colors addObject:MakeColor( 52, 53, 53)]; - [m_colors addObject:MakeColor( 57, 58, 59)]; - [m_colors addObject:MakeColor( 66, 67, 67)]; - [m_colors addObject:MakeColor( 75, 76, 76)]; - [m_colors addObject:MakeColor( 83, 85, 85)]; - [m_colors addObject:MakeColor( 92, 93, 94)]; - - [m_colors addObject:MakeColor(101, 102, 102)]; - [m_colors addObject:MakeColor(109, 111, 111)]; - [m_colors addObject:MakeColor(118, 119, 119)]; - [m_colors addObject:MakeColor(126, 127, 128)]; - [m_colors addObject:MakeColor(134, 136, 136)]; - [m_colors addObject:MakeColor(143, 144, 145)]; - - [m_colors addObject:MakeColor(151, 152, 153)]; - [m_colors addObject:MakeColor(159, 161, 161)]; - [m_colors addObject:MakeColor(167, 169, 169)]; - [m_colors addObject:MakeColor(176, 177, 177)]; - [m_colors addObject:MakeColor(184, 185, 186)]; - [m_colors addObject:MakeColor(192, 193, 194)]; - - [m_colors addObject:MakeColor(200, 201, 202)]; - [m_colors addObject:MakeColor(208, 209, 210)]; - [m_colors addObject:MakeColor(216, 218, 218)]; - [m_colors addObject:MakeColor(224, 226, 226)]; - [m_colors addObject:MakeColor(232, 234, 234)]; - [m_colors addObject:MakeColor(240, 242, 242)]; - - // Color codes - - int index = 16; - - while (index < 256) - { - [m_codes_fg addObject:[NSString stringWithFormat:@"38;5;%dm", index]]; - [m_codes_bg addObject:[NSString stringWithFormat:@"48;5;%dm", index]]; - - index++; - } - - #else - - // Standard xterm colors: - // - // These are the colors xterm shells use in xterm-256color mode. - // In this mode, the shell supports 256 different colors, specified by 256 color codes. - // - // The first 16 color codes map to the original 16 color codes supported by the earlier xterm-color mode. - // These are generally configurable, and thus we ignore them for the purposes of mapping, - // as we can't rely on them being constant. They are largely duplicated anyway. - // - // The next 216 color codes are designed to run the spectrum, with several shades of every color. - // The last 24 color codes represent a grayscale. - // - // While the color codes are standardized, the actual RGB values for each color code is not. - // However most standard xterms follow a well known color chart, - // which can easily be calculated using the simple formula below. - // - // More information about ansi escape codes can be found online. - // http://en.wikipedia.org/wiki/ANSI_escape_code - - int index = 16; - - int r; // red - int g; // green - int b; // blue - - int ri; // r increment - int gi; // g increment - int bi; // b increment - - // Calculate xterm colors (using standard algorithm) - - int r = 0; - int g = 0; - int b = 0; - - for (ri = 0; ri < 6; ri++) - { - r = (ri == 0) ? 0 : 95 + (40 * (ri - 1)); - - for (gi = 0; gi < 6; gi++) - { - g = (gi == 0) ? 0 : 95 + (40 * (gi - 1)); - - for (bi = 0; bi < 6; bi++) - { - b = (bi == 0) ? 0 : 95 + (40 * (bi - 1)); - - [m_codes_fg addObject:[NSString stringWithFormat:@"38;5;%dm", index]]; - [m_codes_bg addObject:[NSString stringWithFormat:@"48;5;%dm", index]]; - [m_colors addObject:MakeColor(r, g, b)]; - - index++; - } - } - } - - // Calculate xterm grayscale (using standard algorithm) - - r = 8; - g = 8; - b = 8; - - while (index < 256) - { - [m_codes_fg addObject:[NSString stringWithFormat:@"38;5;%dm", index]]; - [m_codes_bg addObject:[NSString stringWithFormat:@"48;5;%dm", index]]; - [m_colors addObject:MakeColor(r, g, b)]; - - r += 10; - g += 10; - b += 10; - - index++; - } - - #endif - - codes_fg = [m_codes_fg copy]; - codes_bg = [m_codes_bg copy]; - colors = [m_colors copy]; - - NSAssert([codes_fg count] == [codes_bg count], @"Invalid colors/codes array(s)"); - NSAssert([codes_fg count] == [colors count], @"Invalid colors/codes array(s)"); -} - -+ (void)getRed:(CGFloat *)rPtr green:(CGFloat *)gPtr blue:(CGFloat *)bPtr fromColor:(OSColor *)color -{ - #if TARGET_OS_IPHONE - - // iOS - - if ([color respondsToSelector:@selector(getRed:green:blue:alpha:)]) - { - [color getRed:rPtr green:gPtr blue:bPtr alpha:NULL]; - } - else - { - // The method getRed:green:blue:alpha: was only available starting iOS 5. - // So in iOS 4 and earlier, we have to jump through hoops. - - CGColorSpaceRef rgbColorSpace = CGColorSpaceCreateDeviceRGB(); - - unsigned char pixel[4]; - CGContextRef context = CGBitmapContextCreate(&pixel, 1, 1, 8, 4, rgbColorSpace, kCGImageAlphaNoneSkipLast); - - CGContextSetFillColorWithColor(context, [color CGColor]); - CGContextFillRect(context, CGRectMake(0, 0, 1, 1)); - - if (rPtr) { *rPtr = pixel[0] / 255.0f; } - if (gPtr) { *gPtr = pixel[1] / 255.0f; } - if (bPtr) { *bPtr = pixel[2] / 255.0f; } - - CGContextRelease(context); - CGColorSpaceRelease(rgbColorSpace); - } - - #else - - // Mac OS X - - [color getRed:rPtr green:gPtr blue:bPtr alpha:NULL]; - - #endif -} - -/** - * Maps the given color to the closest available color supported by the shell. - * The shell may support 256 colors, or only 16. - * - * This method loops through the known supported color set, and calculates the closest color. - * The array index of that color, within the colors array, is then returned. - * This array index may also be used as the index within the codes_fg and codes_bg arrays. -**/ -+ (NSUInteger)codeIndexForColor:(OSColor *)inColor -{ - CGFloat inR, inG, inB; - [self getRed:&inR green:&inG blue:&inB fromColor:inColor]; - - NSUInteger bestIndex = 0; - CGFloat lowestDistance = 100.0f; - - NSUInteger i = 0; - for (OSColor *color in colors) - { - // Calculate Euclidean distance (lower value means closer to given color) - - CGFloat r, g, b; - [self getRed:&r green:&g blue:&b fromColor:color]; - - #if CGFLOAT_IS_DOUBLE - CGFloat distance = sqrt(pow(r-inR, 2.0) + pow(g-inG, 2.0) + pow(b-inB, 2.0)); - #else - CGFloat distance = sqrtf(powf(r-inR, 2.0f) + powf(g-inG, 2.0f) + powf(b-inB, 2.0f)); - #endif - - //NSLogVerbose(@"DDTTYLogger: %3lu : %.3f,%.3f,%.3f & %.3f,%.3f,%.3f = %.6f", - ((unsigned long)i, inR, inG, inB, r, g, b, distance); - - if (distance < lowestDistance) - { - bestIndex = i; - lowestDistance = distance; - - //NSLogVerbose(@"DDTTYLogger: New best index = %lu", (unsigned long)bestIndex); - } - - i++; - } - - return bestIndex; -} - -/** - * The runtime sends initialize to each class in a program exactly one time just before the class, - * or any class that inherits from it, is sent its first message from within the program. (Thus the - * method may never be invoked if the class is not used.) The runtime sends the initialize message to - * classes in a thread-safe manner. Superclasses receive this message before their subclasses. - * - * This method may also be called directly (assumably by accident), hence the safety mechanism. -**/ -+ (void)initialize -{ - static BOOL initialized = NO; - if (!initialized) - { - initialized = YES; - - char *term = getenv("TERM"); - if (term) - { - if (strcasestr(term, "color") != NULL) - { - isaColorTTY = YES; - isaColor256TTY = (strcasestr(term, "256") != NULL); - - if (isaColor256TTY) - [self initialize_colors_256]; - else - [self initialize_colors_16]; - } - } - else - { - // Xcode does NOT natively support colors in the Xcode debugging console. - // You'll need to install the XcodeColors plugin to see colors in the Xcode console. - // - // PS - Please read the header file before diving into the source code. - - char *xcode_colors = getenv("XcodeColors"); - if (xcode_colors && (strcmp(xcode_colors, "YES") == 0)) - { - isaXcodeColorTTY = YES; - } - } - -// NSLogInfo(@"DDTTYLogger: isaColorTTY = %@", (isaColorTTY ? @"YES" : @"NO")); -// NSLogInfo(@"DDTTYLogger: isaColor256TTY: %@", (isaColor256TTY ? @"YES" : @"NO")); -// NSLogInfo(@"DDTTYLogger: isaXcodeColorTTY: %@", (isaXcodeColorTTY ? @"YES" : @"NO")); - - sharedInstance = [[DDTTYLogger alloc] init]; - } -} - -+ (DDTTYLogger *)sharedInstance -{ - return sharedInstance; -} - -- (id)init -{ - if (sharedInstance != nil) - { - return nil; - } - - if ((self = [super init])) - { - calendar = [NSCalendar autoupdatingCurrentCalendar]; - - calendarUnitFlags = 0; - calendarUnitFlags |= NSYearCalendarUnit; - calendarUnitFlags |= NSMonthCalendarUnit; - calendarUnitFlags |= NSDayCalendarUnit; - calendarUnitFlags |= NSHourCalendarUnit; - calendarUnitFlags |= NSMinuteCalendarUnit; - calendarUnitFlags |= NSSecondCalendarUnit; - - // Initialze 'app' variable (char *) - - appName = [[NSProcessInfo processInfo] processName]; - - appLen = [appName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; - app = (char *)malloc(appLen + 1); - - [appName getCString:app maxLength:(appLen+1) encoding:NSUTF8StringEncoding]; - - // Initialize 'pid' variable (char *) - - processID = [NSString stringWithFormat:@"%i", (int)getpid()]; - - pidLen = [processID lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; - pid = (char *)malloc(pidLen + 1); - - [processID getCString:pid maxLength:(pidLen+1) encoding:NSUTF8StringEncoding]; - - // Initialize color stuff - - colorsEnabled = NO; - colorProfilesArray = [[NSMutableArray alloc] initWithCapacity:8]; - colorProfilesDict = [[NSMutableDictionary alloc] initWithCapacity:8]; - } - return self; -} - -- (void)loadDefaultColorProfiles -{ - [self setForegroundColor:MakeColor(214, 57, 30) backgroundColor:nil forFlag:LOG_FLAG_ERROR]; - [self setForegroundColor:MakeColor(204, 121, 32) backgroundColor:nil forFlag:LOG_FLAG_WARN]; -} - -- (BOOL)colorsEnabled -{ - // The design of this method is taken from the DDAbstractLogger implementation. - // For extensive documentation please refer to the DDAbstractLogger implementation. - - // Note: The internal implementation MUST access the colorsEnabled variable directly, - // This method is designed explicitly for external access. - // - // Using "self." syntax to go through this method will cause immediate deadlock. - // This is the intended result. Fix it by accessing the ivar directly. - // Great strides have been take to ensure this is safe to do. Plus it's MUCH faster. - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - __block BOOL result; - - dispatch_sync(globalLoggingQueue, ^{ - dispatch_sync(loggerQueue, ^{ - result = colorsEnabled; - }); - }); - - return result; -} - -- (void)setColorsEnabled:(BOOL)newColorsEnabled -{ - dispatch_block_t block = ^{ @autoreleasepool { - - colorsEnabled = newColorsEnabled; - - if ([colorProfilesArray count] == 0) { - [self loadDefaultColorProfiles]; - } - }}; - - // The design of this method is taken from the DDAbstractLogger implementation. - // For extensive documentation please refer to the DDAbstractLogger implementation. - - // Note: The internal implementation MUST access the colorsEnabled variable directly, - // This method is designed explicitly for external access. - // - // Using "self." syntax to go through this method will cause immediate deadlock. - // This is the intended result. Fix it by accessing the ivar directly. - // Great strides have been take to ensure this is safe to do. Plus it's MUCH faster. - - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - NSAssert(![self isOnInternalLoggerQueue], @"MUST access ivar directly, NOT via self.* syntax."); - - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); -} - -- (void)setForegroundColor:(OSColor *)txtColor backgroundColor:(OSColor *)bgColor forFlag:(int)mask -{ - [self setForegroundColor:txtColor backgroundColor:bgColor forFlag:mask context:0]; -} - -- (void)setForegroundColor:(OSColor *)txtColor backgroundColor:(OSColor *)bgColor forFlag:(int)mask context:(int)ctxt -{ - dispatch_block_t block = ^{ @autoreleasepool { - - DDTTYLoggerColorProfile *newColorProfile = - [[DDTTYLoggerColorProfile alloc] initWithForegroundColor:txtColor - backgroundColor:bgColor - flag:mask - context:ctxt]; - - //NSLogInfo(@"DDTTYLogger: newColorProfile: %@", newColorProfile); - - NSUInteger i = 0; - for (DDTTYLoggerColorProfile *colorProfile in colorProfilesArray) - { - if ((colorProfile->mask == mask) && (colorProfile->context == ctxt)) - { - break; - } - - i++; - } - - if (i < [colorProfilesArray count]) - [colorProfilesArray replaceObjectAtIndex:i withObject:newColorProfile]; - else - [colorProfilesArray addObject:newColorProfile]; - }}; - - // The design of the setter logic below is taken from the DDAbstractLogger implementation. - // For documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -- (void)setForegroundColor:(OSColor *)txtColor backgroundColor:(OSColor *)bgColor forTag:(id )tag -{ - NSAssert([(id )tag conformsToProtocol:@protocol(NSCopying)], @"Invalid tag"); - - dispatch_block_t block = ^{ @autoreleasepool { - - DDTTYLoggerColorProfile *newColorProfile = - [[DDTTYLoggerColorProfile alloc] initWithForegroundColor:txtColor - backgroundColor:bgColor - flag:0 - context:0]; - - //NSLogInfo(@"DDTTYLogger: newColorProfile: %@", newColorProfile); - - [colorProfilesDict setObject:newColorProfile forKey:tag]; - }}; - - // The design of the setter logic below is taken from the DDAbstractLogger implementation. - // For documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -- (void)clearColorsForFlag:(int)mask -{ - [self clearColorsForFlag:mask context:0]; -} - -- (void)clearColorsForFlag:(int)mask context:(int)context -{ - dispatch_block_t block = ^{ @autoreleasepool { - - NSUInteger i = 0; - for (DDTTYLoggerColorProfile *colorProfile in colorProfilesArray) - { - if ((colorProfile->mask == mask) && (colorProfile->context == context)) - { - break; - } - - i++; - } - - if (i < [colorProfilesArray count]) - { - [colorProfilesArray removeObjectAtIndex:i]; - } - }}; - - // The design of the setter logic below is taken from the DDAbstractLogger implementation. - // For documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -- (void)clearColorsForTag:(id )tag -{ - NSAssert([(id )tag conformsToProtocol:@protocol(NSCopying)], @"Invalid tag"); - - dispatch_block_t block = ^{ @autoreleasepool { - - [colorProfilesDict removeObjectForKey:tag]; - }}; - - // The design of the setter logic below is taken from the DDAbstractLogger implementation. - // For documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -- (void)clearColorsForAllFlags -{ - dispatch_block_t block = ^{ @autoreleasepool { - - [colorProfilesArray removeAllObjects]; - }}; - - // The design of the setter logic below is taken from the DDAbstractLogger implementation. - // For documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -- (void)clearColorsForAllTags -{ - dispatch_block_t block = ^{ @autoreleasepool { - - [colorProfilesDict removeAllObjects]; - }}; - - // The design of the setter logic below is taken from the DDAbstractLogger implementation. - // For documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -- (void)clearAllColors -{ - dispatch_block_t block = ^{ @autoreleasepool { - - [colorProfilesArray removeAllObjects]; - [colorProfilesDict removeAllObjects]; - }}; - - // The design of the setter logic below is taken from the DDAbstractLogger implementation. - // For documentation please refer to the DDAbstractLogger implementation. - - if ([self isOnInternalLoggerQueue]) - { - block(); - } - else - { - dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue]; - NSAssert(![self isOnGlobalLoggingQueue], @"Core architecture requirement failure"); - - dispatch_async(globalLoggingQueue, ^{ - dispatch_async(loggerQueue, block); - }); - } -} - -- (void)logMessage:(DDLogMessage *)logMessage -{ - NSString *logMsg = logMessage->logMsg; - BOOL isFormatted = NO; - - if (formatter) - { - logMsg = [formatter formatLogMessage:logMessage]; - isFormatted = logMsg != logMessage->logMsg; - } - - if (logMsg) - { - // Search for a color profile associated with the log message - - DDTTYLoggerColorProfile *colorProfile = nil; - - if (colorsEnabled) - { - if (logMessage->tag) - { - colorProfile = [colorProfilesDict objectForKey:logMessage->tag]; - } - if (colorProfile == nil) - { - for (DDTTYLoggerColorProfile *cp in colorProfilesArray) - { - if ((logMessage->logFlag & cp->mask) && (logMessage->logContext == cp->context)) - { - colorProfile = cp; - break; - } - } - } - } - - // Convert log message to C string. - // - // We use the stack instead of the heap for speed if possible. - // But we're extra cautious to avoid a stack overflow. - - NSUInteger msgLen = [logMsg lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; - const BOOL useStack = msgLen < (1024 * 4); - - char msgStack[useStack ? (msgLen + 1) : 1]; // Analyzer doesn't like zero-size array, hence the 1 - char *msg = useStack ? msgStack : (char *)malloc(msgLen + 1); - - [logMsg getCString:msg maxLength:(msgLen + 1) encoding:NSUTF8StringEncoding]; - - // Write the log message to STDERR - - if (isFormatted) - { - // The log message has already been formatted. - - struct iovec v[5]; - - if (colorProfile) - { - v[0].iov_base = colorProfile->fgCode; - v[0].iov_len = colorProfile->fgCodeLen; - - v[1].iov_base = colorProfile->bgCode; - v[1].iov_len = colorProfile->bgCodeLen; - - v[4].iov_base = colorProfile->resetCode; - v[4].iov_len = colorProfile->resetCodeLen; - } - else - { - v[0].iov_base = ""; - v[0].iov_len = 0; - - v[1].iov_base = ""; - v[1].iov_len = 0; - - v[4].iov_base = ""; - v[4].iov_len = 0; - } - - v[2].iov_base = (char *)msg; - v[2].iov_len = msgLen; - - v[3].iov_base = "\n"; - v[3].iov_len = (msg[msgLen] == '\n') ? 0 : 1; - - writev(STDERR_FILENO, v, 5); - } - else - { - // The log message is unformatted, so apply standard NSLog style formatting. - - int len; - - // Calculate timestamp. - // The technique below is faster than using NSDateFormatter. - - NSDateComponents *components = [calendar components:calendarUnitFlags fromDate:logMessage->timestamp]; - - NSTimeInterval epoch = [logMessage->timestamp timeIntervalSinceReferenceDate]; - int milliseconds = (int)((epoch - floor(epoch)) * 1000); - - char ts[24]; - len = snprintf(ts, 24, "%04ld-%02ld-%02ld %02ld:%02ld:%02ld:%03d", // yyyy-MM-dd HH:mm:ss:SSS - (long)components.year, - (long)components.month, - (long)components.day, - (long)components.hour, - (long)components.minute, - (long)components.second, milliseconds); - - size_t tsLen = MIN(24-1, len); - - // Calculate thread ID - // - // How many characters do we need for the thread id? - // logMessage->machThreadID is of type mach_port_t, which is an unsigned int. - // - // 1 hex char = 4 bits - // 8 hex chars for 32 bit, plus ending '\0' = 9 - - char tid[9]; - len = snprintf(tid, 9, "%x", logMessage->machThreadID); - - size_t tidLen = MIN(9-1, len); - - // Here is our format: "%s %s[%i:%s] %s", timestamp, appName, processID, threadID, logMsg - - struct iovec v[13]; - - if (colorProfile) - { - v[0].iov_base = colorProfile->fgCode; - v[0].iov_len = colorProfile->fgCodeLen; - - v[1].iov_base = colorProfile->bgCode; - v[1].iov_len = colorProfile->bgCodeLen; - - v[12].iov_base = colorProfile->resetCode; - v[12].iov_len = colorProfile->resetCodeLen; - } - else - { - v[0].iov_base = ""; - v[0].iov_len = 0; - - v[1].iov_base = ""; - v[1].iov_len = 0; - - v[12].iov_base = ""; - v[12].iov_len = 0; - } - - v[2].iov_base = ts; - v[2].iov_len = tsLen; - - v[3].iov_base = " "; - v[3].iov_len = 1; - - v[4].iov_base = app; - v[4].iov_len = appLen; - - v[5].iov_base = "["; - v[5].iov_len = 1; - - v[6].iov_base = pid; - v[6].iov_len = pidLen; - - v[7].iov_base = ":"; - v[7].iov_len = 1; - - v[8].iov_base = tid; - v[8].iov_len = MIN((size_t)8, tidLen); // snprintf doesn't return what you might think - - v[9].iov_base = "] "; - v[9].iov_len = 2; - - v[10].iov_base = (char *)msg; - v[10].iov_len = msgLen; - - v[11].iov_base = "\n"; - v[11].iov_len = (msg[msgLen] == '\n') ? 0 : 1; - - writev(STDERR_FILENO, v, 13); - } - - if (!useStack) { - free(msg); - } - } -} - -- (NSString *)loggerName -{ - return @"cocoa.lumberjack.ttyLogger"; -} - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation DDTTYLoggerColorProfile - -- (id)initWithForegroundColor:(OSColor *)fgColor backgroundColor:(OSColor *)bgColor flag:(int)aMask context:(int)ctxt -{ - if ((self = [super init])) - { - mask = aMask; - context = ctxt; - - CGFloat r, g, b; - - if (fgColor) - { - [DDTTYLogger getRed:&r green:&g blue:&b fromColor:fgColor]; - - fg_r = (uint8_t)(r * 255.0f); - fg_g = (uint8_t)(g * 255.0f); - fg_b = (uint8_t)(b * 255.0f); - } - if (bgColor) - { - [DDTTYLogger getRed:&r green:&g blue:&b fromColor:bgColor]; - - bg_r = (uint8_t)(r * 255.0f); - bg_g = (uint8_t)(g * 255.0f); - bg_b = (uint8_t)(b * 255.0f); - } - - if (fgColor && isaColorTTY) - { - // Map foreground color to closest available shell color - - fgCodeIndex = [DDTTYLogger codeIndexForColor:fgColor]; - fgCodeRaw = [codes_fg objectAtIndex:fgCodeIndex]; - - NSString *escapeSeq = @"\033["; - - NSUInteger len1 = [escapeSeq lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; - NSUInteger len2 = [fgCodeRaw lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; - - [escapeSeq getCString:(fgCode) maxLength:(len1+1) encoding:NSUTF8StringEncoding]; - [fgCodeRaw getCString:(fgCode+len1) maxLength:(len2+1) encoding:NSUTF8StringEncoding]; - - fgCodeLen = len1+len2; - } - else if (fgColor && isaXcodeColorTTY) - { - // Convert foreground color to color code sequence - - const char *escapeSeq = XCODE_COLORS_ESCAPE_SEQ; - - int result = snprintf(fgCode, 24, "%sfg%u,%u,%u;", escapeSeq, fg_r, fg_g, fg_b); - fgCodeLen = MIN(result, (24-1)); - } - else - { - // No foreground color or no color support - - fgCode[0] = '\0'; - fgCodeLen = 0; - } - - if (bgColor && isaColorTTY) - { - // Map background color to closest available shell color - - bgCodeIndex = [DDTTYLogger codeIndexForColor:bgColor]; - bgCodeRaw = [codes_bg objectAtIndex:bgCodeIndex]; - - NSString *escapeSeq = @"\033["; - - NSUInteger len1 = [escapeSeq lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; - NSUInteger len2 = [bgCodeRaw lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; - - [escapeSeq getCString:(bgCode) maxLength:(len1+1) encoding:NSUTF8StringEncoding]; - [bgCodeRaw getCString:(bgCode+len1) maxLength:(len2+1) encoding:NSUTF8StringEncoding]; - - bgCodeLen = len1+len2; - } - else if (bgColor && isaXcodeColorTTY) - { - // Convert background color to color code sequence - - const char *escapeSeq = XCODE_COLORS_ESCAPE_SEQ; - - int result = snprintf(bgCode, 24, "%sbg%u,%u,%u;", escapeSeq, bg_r, bg_g, bg_b); - bgCodeLen = MIN(result, (24-1)); - } - else - { - // No background color or no color support - - bgCode[0] = '\0'; - bgCodeLen = 0; - } - - if (isaColorTTY) - { - resetCodeLen = snprintf(resetCode, 8, "\033[0m"); - } - else if (isaXcodeColorTTY) - { - resetCodeLen = snprintf(resetCode, 8, XCODE_COLORS_RESET); - } - else - { - resetCode[0] = '\0'; - resetCodeLen = 0; - } - } - return self; -} - -- (NSString *)description -{ - return [NSString stringWithFormat: - @"", - self, mask, context, fg_r, fg_g, fg_b, bg_r, bg_g, bg_b, fgCodeRaw, bgCodeRaw]; -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.h b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.h deleted file mode 100755 index 794ca0b..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.h +++ /dev/null @@ -1,65 +0,0 @@ -#import -#import "DDLog.h" - -@class ContextFilterLogFormatter; - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" page. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted - * - * - * This class provides a log formatter that filters log statements from a logging context not on the whitelist. - * - * A log formatter can be added to any logger to format and/or filter its output. - * You can learn more about log formatters here: - * https://github.com/robbiehanson/CocoaLumberjack/wiki/CustomFormatters - * - * You can learn more about logging context's here: - * https://github.com/robbiehanson/CocoaLumberjack/wiki/CustomContext - * - * But here's a quick overview / refresher: - * - * Every log statement has a logging context. - * These come from the underlying logging macros defined in DDLog.h. - * The default logging context is zero. - * You can define multiple logging context's for use in your application. - * For example, logically separate parts of your app each have a different logging context. - * Also 3rd party frameworks that make use of Lumberjack generally use their own dedicated logging context. -**/ -@interface ContextWhitelistFilterLogFormatter : NSObject - -- (id)init; - -- (void)addToWhitelist:(int)loggingContext; -- (void)removeFromWhitelist:(int)loggingContext; - -- (NSArray *)whitelist; - -- (BOOL)isOnWhitelist:(int)loggingContext; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -/** - * This class provides a log formatter that filters log statements from a logging context on the blacklist. -**/ -@interface ContextBlacklistFilterLogFormatter : NSObject - -- (id)init; - -- (void)addToBlacklist:(int)loggingContext; -- (void)removeFromBlacklist:(int)loggingContext; - -- (NSArray *)blacklist; - -- (BOOL)isOnBlacklist:(int)loggingContext; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.m b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.m deleted file mode 100755 index 9c024ac..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.m +++ /dev/null @@ -1,191 +0,0 @@ -#import "ContextFilterLogFormatter.h" -#import - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" wiki. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted -**/ - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - -@interface LoggingContextSet : NSObject - -- (void)addToSet:(int)loggingContext; -- (void)removeFromSet:(int)loggingContext; - -- (NSArray *)currentSet; - -- (BOOL)isInSet:(int)loggingContext; - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation ContextWhitelistFilterLogFormatter -{ - LoggingContextSet *contextSet; -} - -- (id)init -{ - if ((self = [super init])) - { - contextSet = [[LoggingContextSet alloc] init]; - } - return self; -} - - -- (void)addToWhitelist:(int)loggingContext -{ - [contextSet addToSet:loggingContext]; -} - -- (void)removeFromWhitelist:(int)loggingContext -{ - [contextSet removeFromSet:loggingContext]; -} - -- (NSArray *)whitelist -{ - return [contextSet currentSet]; -} - -- (BOOL)isOnWhitelist:(int)loggingContext -{ - return [contextSet isInSet:loggingContext]; -} - -- (NSString *)formatLogMessage:(DDLogMessage *)logMessage -{ - if ([self isOnWhitelist:logMessage->logContext]) - return logMessage->logMsg; - else - return nil; -} - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation ContextBlacklistFilterLogFormatter -{ - LoggingContextSet *contextSet; -} - -- (id)init -{ - if ((self = [super init])) - { - contextSet = [[LoggingContextSet alloc] init]; - } - return self; -} - - -- (void)addToBlacklist:(int)loggingContext -{ - [contextSet addToSet:loggingContext]; -} - -- (void)removeFromBlacklist:(int)loggingContext -{ - [contextSet removeFromSet:loggingContext]; -} - -- (NSArray *)blacklist -{ - return [contextSet currentSet]; -} - -- (BOOL)isOnBlacklist:(int)loggingContext -{ - return [contextSet isInSet:loggingContext]; -} - -- (NSString *)formatLogMessage:(DDLogMessage *)logMessage -{ - if ([self isOnBlacklist:logMessage->logContext]) - return nil; - else - return logMessage->logMsg; -} - -@end - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@implementation LoggingContextSet -{ - OSSpinLock lock; - NSMutableSet *set; -} - -- (id)init -{ - if ((self = [super init])) - { - set = [[NSMutableSet alloc] init]; - } - return self; -} - - -- (void)addToSet:(int)loggingContext -{ - OSSpinLockLock(&lock); - { - [set addObject:@(loggingContext)]; - } - OSSpinLockUnlock(&lock); -} - -- (void)removeFromSet:(int)loggingContext -{ - OSSpinLockLock(&lock); - { - [set removeObject:@(loggingContext)]; - } - OSSpinLockUnlock(&lock); -} - -- (NSArray *)currentSet -{ - NSArray *result = nil; - - OSSpinLockLock(&lock); - { - result = [set allObjects]; - } - OSSpinLockUnlock(&lock); - - return result; -} - -- (BOOL)isInSet:(int)loggingContext -{ - BOOL result = NO; - - OSSpinLockLock(&lock); - { - result = [set containsObject:@(loggingContext)]; - } - OSSpinLockUnlock(&lock); - - return result; -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.h b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.h deleted file mode 100755 index e4a6656..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.h +++ /dev/null @@ -1,116 +0,0 @@ -#import -#import -#import "DDLog.h" - - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" page. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted - * - * - * This class provides a log formatter that prints the dispatch_queue label instead of the mach_thread_id. - * - * A log formatter can be added to any logger to format and/or filter its output. - * You can learn more about log formatters here: - * https://github.com/robbiehanson/CocoaLumberjack/wiki/CustomFormatters - * - * A typical NSLog (or DDTTYLogger) prints detailed info as [:]. - * For example: - * - * 2011-10-17 20:21:45.435 AppName[19928:5207] Your log message here - * - * Where: - * - 19928 = process id - * - 5207 = thread id (mach_thread_id printed in hex) - * - * When using grand central dispatch (GCD), this information is less useful. - * This is because a single serial dispatch queue may be run on any thread from an internally managed thread pool. - * For example: - * - * 2011-10-17 20:32:31.111 AppName[19954:4d07] Message from my_serial_dispatch_queue - * 2011-10-17 20:32:31.112 AppName[19954:5207] Message from my_serial_dispatch_queue - * 2011-10-17 20:32:31.113 AppName[19954:2c55] Message from my_serial_dispatch_queue - * - * This formatter allows you to replace the standard [box:info] with the dispatch_queue name. - * For example: - * - * 2011-10-17 20:32:31.111 AppName[img-scaling] Message from my_serial_dispatch_queue - * 2011-10-17 20:32:31.112 AppName[img-scaling] Message from my_serial_dispatch_queue - * 2011-10-17 20:32:31.113 AppName[img-scaling] Message from my_serial_dispatch_queue - * - * If the dispatch_queue doesn't have a set name, then it falls back to the thread name. - * If the current thread doesn't have a set name, then it falls back to the mach_thread_id in hex (like normal). - * - * Note: If manually creating your own background threads (via NSThread/alloc/init or NSThread/detachNeThread), - * you can use [[NSThread currentThread] setName:(NSString *)]. -**/ -@interface DispatchQueueLogFormatter : NSObject { -@protected - - NSString *dateFormatString; -} - -/** - * Standard init method. - * Configure using properties as desired. -**/ -- (id)init; - -/** - * The minQueueLength restricts the minimum size of the [detail box]. - * If the minQueueLength is set to 0, there is no restriction. - * - * For example, say a dispatch_queue has a label of "diskIO": - * - * If the minQueueLength is 0: [diskIO] - * If the minQueueLength is 4: [diskIO] - * If the minQueueLength is 5: [diskIO] - * If the minQueueLength is 6: [diskIO] - * If the minQueueLength is 7: [diskIO ] - * If the minQueueLength is 8: [diskIO ] - * - * The default minQueueLength is 0 (no minimum, so [detail box] won't be padded). - * - * If you want every [detail box] to have the exact same width, - * set both minQueueLength and maxQueueLength to the same value. -**/ -@property (assign) NSUInteger minQueueLength; - -/** - * The maxQueueLength restricts the number of characters that will be inside the [detail box]. - * If the maxQueueLength is 0, there is no restriction. - * - * For example, say a dispatch_queue has a label of "diskIO": - * - * If the maxQueueLength is 0: [diskIO] - * If the maxQueueLength is 4: [disk] - * If the maxQueueLength is 5: [diskI] - * If the maxQueueLength is 6: [diskIO] - * If the maxQueueLength is 7: [diskIO] - * If the maxQueueLength is 8: [diskIO] - * - * The default maxQueueLength is 0 (no maximum, so [detail box] won't be truncated). - * - * If you want every [detail box] to have the exact same width, - * set both minQueueLength and maxQueueLength to the same value. -**/ -@property (assign) NSUInteger maxQueueLength; - -/** - * Sometimes queue labels have long names like "com.apple.main-queue", - * but you'd prefer something shorter like simply "main". - * - * This method allows you to set such preferred replacements. - * The above example is set by default. - * - * To remove/undo a previous replacement, invoke this method with nil for the 'shortLabel' parameter. -**/ -- (NSString *)replacementStringForQueueLabel:(NSString *)longLabel; -- (void)setReplacementString:(NSString *)shortLabel forQueueLabel:(NSString *)longLabel; - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.m b/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.m deleted file mode 100755 index d348f3d..0000000 --- a/YuMi/Tools/CocoaHttpServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.m +++ /dev/null @@ -1,251 +0,0 @@ -#import "DispatchQueueLogFormatter.h" -#import - -/** - * Welcome to Cocoa Lumberjack! - * - * The project page has a wealth of documentation if you have any questions. - * https://github.com/robbiehanson/CocoaLumberjack - * - * If you're new to the project you may wish to read the "Getting Started" wiki. - * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted -**/ - -#if ! __has_feature(objc_arc) -#warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC). -#endif - - -@implementation DispatchQueueLogFormatter -{ - int32_t atomicLoggerCount; - NSDateFormatter *threadUnsafeDateFormatter; // Use [self stringFromDate] - - OSSpinLock lock; - - NSUInteger _minQueueLength; // _prefix == Only access via atomic property - NSUInteger _maxQueueLength; // _prefix == Only access via atomic property - NSMutableDictionary *_replacements; // _prefix == Only access from within spinlock -} - -- (id)init -{ - if ((self = [super init])) - { - dateFormatString = @"yyyy-MM-dd HH:mm:ss:SSS"; - - atomicLoggerCount = 0; - threadUnsafeDateFormatter = nil; - - _minQueueLength = 0; - _maxQueueLength = 0; - _replacements = [[NSMutableDictionary alloc] init]; - - // Set default replacements: - - [_replacements setObject:@"main" forKey:@"com.apple.main-thread"]; - } - return self; -} - - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark Configuration -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@synthesize minQueueLength = _minQueueLength; -@synthesize maxQueueLength = _maxQueueLength; - -- (NSString *)replacementStringForQueueLabel:(NSString *)longLabel -{ - NSString *result = nil; - - OSSpinLockLock(&lock); - { - result = [_replacements objectForKey:longLabel]; - } - OSSpinLockUnlock(&lock); - - return result; -} - -- (void)setReplacementString:(NSString *)shortLabel forQueueLabel:(NSString *)longLabel -{ - OSSpinLockLock(&lock); - { - if (shortLabel) - [_replacements setObject:shortLabel forKey:longLabel]; - else - [_replacements removeObjectForKey:longLabel]; - } - OSSpinLockUnlock(&lock); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma mark DDLogFormatter -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -- (NSString *)stringFromDate:(NSDate *)date -{ - int32_t loggerCount = OSAtomicAdd32(0, &atomicLoggerCount); - - if (loggerCount <= 1) - { - // Single-threaded mode. - - if (threadUnsafeDateFormatter == nil) - { - threadUnsafeDateFormatter = [[NSDateFormatter alloc] init]; - [threadUnsafeDateFormatter setFormatterBehavior:NSDateFormatterBehavior10_4]; - [threadUnsafeDateFormatter setDateFormat:dateFormatString]; - } - - return [threadUnsafeDateFormatter stringFromDate:date]; - } - else - { - // Multi-threaded mode. - // NSDateFormatter is NOT thread-safe. - - NSString *key = @"DispatchQueueLogFormatter_NSDateFormatter"; - - NSMutableDictionary *threadDictionary = [[NSThread currentThread] threadDictionary]; - NSDateFormatter *dateFormatter = [threadDictionary objectForKey:key]; - - if (dateFormatter == nil) - { - dateFormatter = [[NSDateFormatter alloc] init]; - [dateFormatter setFormatterBehavior:NSDateFormatterBehavior10_4]; - [dateFormatter setDateFormat:dateFormatString]; - - [threadDictionary setObject:dateFormatter forKey:key]; - } - - return [dateFormatter stringFromDate:date]; - } -} - -- (NSString *)queueThreadLabelForLogMessage:(DDLogMessage *)logMessage -{ - // As per the DDLogFormatter contract, this method is always invoked on the same thread/dispatch_queue - - NSUInteger minQueueLength = self.minQueueLength; - NSUInteger maxQueueLength = self.maxQueueLength; - - // Get the name of the queue, thread, or machID (whichever we are to use). - - NSString *queueThreadLabel = nil; - - BOOL useQueueLabel = YES; - BOOL useThreadName = NO; - - if (logMessage->queueLabel) - { - // If you manually create a thread, it's dispatch_queue will have one of the thread names below. - // Since all such threads have the same name, we'd prefer to use the threadName or the machThreadID. - - char *names[] = { "com.apple.root.low-priority", - "com.apple.root.default-priority", - "com.apple.root.high-priority", - "com.apple.root.low-overcommit-priority", - "com.apple.root.default-overcommit-priority", - "com.apple.root.high-overcommit-priority" }; - - int length = sizeof(names) / sizeof(char *); - - int i; - for (i = 0; i < length; i++) - { - if (strcmp(logMessage->queueLabel, names[i]) == 0) - { - useQueueLabel = NO; - useThreadName = [logMessage->threadName length] > 0; - break; - } - } - } - else - { - useQueueLabel = NO; - useThreadName = [logMessage->threadName length] > 0; - } - - if (useQueueLabel || useThreadName) - { - NSString *fullLabel; - NSString *abrvLabel; - - if (useQueueLabel) - fullLabel = @(logMessage->queueLabel); - else - fullLabel = logMessage->threadName; - - OSSpinLockLock(&lock); - { - abrvLabel = [_replacements objectForKey:fullLabel]; - } - OSSpinLockUnlock(&lock); - - if (abrvLabel) - queueThreadLabel = abrvLabel; - else - queueThreadLabel = fullLabel; - } - else - { - queueThreadLabel = [NSString stringWithFormat:@"%x", logMessage->machThreadID]; - } - - // Now use the thread label in the output - - NSUInteger labelLength = [queueThreadLabel length]; - - // labelLength > maxQueueLength : truncate - // labelLength < minQueueLength : padding - // : exact - - if ((maxQueueLength > 0) && (labelLength > maxQueueLength)) - { - // Truncate - - return [queueThreadLabel substringToIndex:maxQueueLength]; - } - else if (labelLength < minQueueLength) - { - // Padding - - NSUInteger numSpaces = minQueueLength - labelLength; - - char spaces[numSpaces + 1]; - memset(spaces, ' ', numSpaces); - spaces[numSpaces] = '\0'; - - return [NSString stringWithFormat:@"%@%s", queueThreadLabel, spaces]; - } - else - { - // Exact - - return queueThreadLabel; - } -} - -- (NSString *)formatLogMessage:(DDLogMessage *)logMessage -{ - NSString *timestamp = [self stringFromDate:(logMessage->timestamp)]; - NSString *queueThreadLabel = [self queueThreadLabelForLogMessage:logMessage]; - - return [NSString stringWithFormat:@"%@ [%@] %@", timestamp, queueThreadLabel, logMessage->logMsg]; -} - -- (void)didAddToLogger:(id )logger -{ - OSAtomicIncrement32(&atomicLoggerCount); -} - -- (void)willRemoveFromLogger:(id )logger -{ - OSAtomicDecrement32(&atomicLoggerCount); -} - -@end diff --git a/YuMi/Tools/CocoaHttpServer/Web/css/index.css b/YuMi/Tools/CocoaHttpServer/Web/css/index.css deleted file mode 100644 index 60ce062..0000000 --- a/YuMi/Tools/CocoaHttpServer/Web/css/index.css +++ /dev/null @@ -1,101 +0,0 @@ -img { - width: 100%; - vertical-align: top; -} -html, -body { - width: 100%; - height: 100%; -} -.container { - margin: 0 auto; - height: 100%; - background: #f5f5f5; -} -.header { - height: 80px; - text-align: center; - background: #2f2f2f; -} -.header img { - margin: 0 auto; - height: 100%; - width: 900px; -} -.section { - padding: 20px 24px; - width: 800px; - margin: 0 auto; -} -.section .uploadBtn { - margin: 0 auto 20px; - width: 40%; - cursor: pointer; -} -.section #upload, -.section #submit { - display: none; -} -.section .songList { - height: 600px; - background: #fff; -} -.section .songList .title { - padding: 16px 15px; - background: #e7e5e5; -} -.section .songList .title span { - border-left: 5px solid #FF894F; - padding-left: 10px; - line-height: 16px; -} -.section .songList ul li { - height: 60px; - display: flex; - border-bottom: 1px solid #f5f5f5; - align-items: center; - padding: 0 10px; -} -.section .songList ul li .attention { - flex: 0 0 20px; - height: 20px; - width: 20px; - background: url('../images/attention.png') no-repeat; - background-size: 100% 100%; - margin-right: 8px; -} -.section .songList ul li .progress { - flex: 0 0 180px; - width: 180px; - height: 14px; - background: #e7e5e5; - border-radius: 7px; - overflow: hidden; -} -.section .songList ul li .progress .bar { - width: 0; - background: #ffb400; - height: 100%; - transition: all 0.2s; -} -.section .songList ul li .download { - flex: 0 0 20px; - height: 20px; - width: 20px; - background: url('../images/download.png') no-repeat; - background-size: 100% 100%; - margin-right: 8px; -} -.section .songList ul li .delete { - flex: 0 0 20px; - height: 20px; - width: 20px; - background: url('../images/delete.png') no-repeat; - background-size: 100% 100%; -} -.section .songList ul li .songName { - flex: 4; -} -.section .songList ul li .songSize { - flex: 1; -} diff --git a/YuMi/Tools/CocoaHttpServer/Web/css/reset.css b/YuMi/Tools/CocoaHttpServer/Web/css/reset.css deleted file mode 100644 index 98f9bed..0000000 --- a/YuMi/Tools/CocoaHttpServer/Web/css/reset.css +++ /dev/null @@ -1,90 +0,0 @@ -/** - * Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/) - * http://cssreset.com - */ -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, -menu, nav, output, ruby, section, summary, -time, mark, audio, video, input { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font-weight: normal; - vertical-align: baseline; -} - -/* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, -footer, header, menu, nav, section { - display: block; -} - -body { - line-height: 1; -} - -blockquote, q { - quotes: none; -} - -blockquote:before, blockquote:after, -q:before, q:after { - content: none; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -/* custom */ -a { - color: #7e8c8d; - text-decoration: none; - -webkit-backface-visibility: hidden; -} - -li { - list-style: none; -} - -::-webkit-scrollbar { - width: 5px; - height: 5px; -} - -::-webkit-scrollbar-track-piece { - background-color: rgba(0, 0, 0, 0.2); - -webkit-border-radius: 6px; -} - -::-webkit-scrollbar-thumb:vertical { - height: 5px; - background-color: rgba(125, 125, 125, 0.7); - -webkit-border-radius: 6px; -} - -::-webkit-scrollbar-thumb:horizontal { - width: 5px; - background-color: rgba(125, 125, 125, 0.7); - -webkit-border-radius: 6px; -} - -html, body { - width: 100%; -} - -body { - -webkit-text-size-adjust: none; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); -} \ No newline at end of file diff --git a/YuMi/Tools/CocoaHttpServer/Web/images/attention.png b/YuMi/Tools/CocoaHttpServer/Web/images/attention.png deleted file mode 100644 index f42864423d3b681a28d7c108e9169a86593091c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lu!@w32_C|-@UwkgoXXt zzWrBw`~Uy{e|2^Jh>H66`0>xWx}UYR-+g?3FI#rzh*K0$DPu{HUoeBivm0q3PLj8~ z3+s>km&bt|_7YEDSN2C-oQw(8U}fi7AzZCsRS;$>8bg=d#Wzp$Pz+m5T@f diff --git a/YuMi/Tools/CocoaHttpServer/Web/images/button-ar.png b/YuMi/Tools/CocoaHttpServer/Web/images/button-ar.png deleted file mode 100644 index 71b93c6b1811b432cd1787f3a41aed679c8731c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3186 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 YA7bGO+KP)j+_)Bl1)|Fe|;(ZBzlZvW!e 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 diff --git a/YuMi/Tools/CocoaHttpServer/Web/images/button.png b/YuMi/Tools/CocoaHttpServer/Web/images/button.png deleted file mode 100644 index 290766f2ae08c1c5e52c8b967370dd76729daba2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5961 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 Pd7i=3)z4*}Q$iB}akyss diff --git a/YuMi/Tools/CocoaHttpServer/Web/images/header-ar.png b/YuMi/Tools/CocoaHttpServer/Web/images/header-ar.png deleted file mode 100644 index 48bdea29618f105fadf3eba3f83745dd8abc8e8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4028 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 diff --git a/YuMi/Tools/CocoaHttpServer/Web/images/header-id.png b/YuMi/Tools/CocoaHttpServer/Web/images/header-id.png deleted file mode 100644 index 659e319ebbb2bcabc0b30e1fee08df101a13bf6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4411 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 TB5dH400000NkvXXu0mjfOr&~O diff --git a/YuMi/Tools/CocoaHttpServer/Web/images/header.png b/YuMi/Tools/CocoaHttpServer/Web/images/header.png deleted file mode 100644 index cef650c21fcc45541e97b83f19f4431212ad106e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29848 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 - - - - - - - - - - -
    -
    - -
    -
    -
    -
    - -
    - - -
    -
    -
    -
      - -
    -
      - -
    -
    -
    -
    - - - - - - - - - - - - - - - - diff --git a/YuMi/Tools/CocoaHttpServer/Web/js/getLanguage.js b/YuMi/Tools/CocoaHttpServer/Web/js/getLanguage.js deleted file mode 100644 index eea2304..0000000 --- a/YuMi/Tools/CocoaHttpServer/Web/js/getLanguage.js +++ /dev/null @@ -1,164 +0,0 @@ -const checkVersion = () => { - var u = navigator.userAgent, app = navigator.appVersion; - return { - trident: u.indexOf('Trident') > -1, //IE内核 - presto: u.indexOf('Presto') > -1, //opera内核 - webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核 - gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1,//火狐内核 - mobile: !!u.match(/AppleWebKit.*Mobile.*/), //是否为移动终端 - ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端 - android: u.indexOf('Android') > -1 || u.indexOf('Adr') > -1, //android终端 - iPhone: u.indexOf('iPhone') > -1, //是否为iPhone或者QQHD浏览器 - iPad: u.indexOf('iPad') > -1, //是否iPad - webApp: u.indexOf('Safari') == -1, //是否web应该程序，没有头部与底部 - weixin: u.indexOf('MicroMessenger') > -1, //是否微信 - qq: u.match(/\sQQ/i) == " qq", //是否QQ - app: u.match('pekoApp') == 'pekoApp' //是否在app内 - }; -} - -// 根据域名适配环境 -function EnvCheck() { - if (window.location.href) { - var _url = window.location.href; - var res = _url.match(/uat/); - var res1 = _url.match(/120.79.211.243/); - var res2 = _url.match(/192.168./) - var res3 = _url.match(/127.0/) - var res4 = _url.match(/beta/) - if (res || res1 || res2 || res3 || res4) { - return 'test'; - } else { - return 'live'; - } - } -} - -// 封装 获取公共参数的方法（客户端提供） -// written by zxfxiong -const methodsFromClient = { - // 注意：ios 提供的方法属异步操作 - "uid": { - android: () => window.androidJsObj.getUid(), - ios: function () { - window.webkit.messageHandlers.getUid.postMessage(null); - // let allcookies = document.cookie; - // let $uid = allcookies.match(/\d+/); - // console.log($uid[0]); - } - }, - "ticket": { - android: () => window.androidJsObj.getTicket(), - ios: function () { - window.webkit.messageHandlers.getTicket.postMessage(null); - } - }, - "roomUid": { - android: () => window.androidJsObj.getRoomUid(), - ios: function () { - window.webkit.messageHandlers.getRoomUid.postMessage(null); - } - }, - "deviceId": { - android: () => window.androidJsObj.getDeviceId(), - ios: function () { - window.webkit.messageHandlers.getDeviceId.postMessage(null); - } - }, - "deviceInfo": { - android: () => window.androidJsObj.getDeviceInfo(), - ios: function () { - window.webkit.messageHandlers.getDeviceInfo.postMessage(null); - } - }, - "encryptPwd": { - android: (data) => window.androidJsObj.encryptPwd(data), - ios: function (data) { - window.webkit.messageHandlers.encryptPwd.postMessage(data); - } - } - -} -// 封装 在ios环境中 配置公共参数的回调函数 -// 配合 methodsFromClient[infoName].ios 方法 -// written by zxfxiong -function getMessage(key, value) { - pubInfo[key] = value; -} -// 全局获取并配置公共参数 -const pubInfo = {}; -function getInfoFromClient() { - const browser = checkVersion(); - if (browser.app) { - console.log('从客户端获取了用户信息（设备信息），此信息来源：common2.js'); - if (browser.android) { - pubInfo.uid = methodsFromClient.uid.android(); - pubInfo.ticket = methodsFromClient.ticket.android(); - pubInfo.deviceId = methodsFromClient.deviceId.android(); - pubInfo.deviceInfo = methodsFromClient.deviceInfo.android(); - } else { - methodsFromClient.uid.ios(); - methodsFromClient.ticket.ios(); - methodsFromClient.deviceId.ios(); - methodsFromClient.deviceInfo.ios(); - } - - } else { - // 非app环境调试参数 - pubInfo.uid = 0; - pubInfo.ticket = ""; - pubInfo.deviceId = "0"; - pubInfo.deviceInfo = { - 'Accept-Language':'en', - app: 'peko', - appVersion: '0.0.0', - os: '0.0.0', - osVersion: '0.0.0', - channel: 'browser', - client: 'h5' - }; - } -}; - -// 设定语言 fuzzy模糊查询客户端返回的语言 -const languageMap = [ - { name: '简体中文', code: 'zh', fuzzy: ['zh', 'zh-Hans', 'zh-'] }, - { name: '繁体中文', code: 'zh', fuzzy: ['zh', 'zh-Hant', 'zh-'] }, - { name: '英语', code: 'en', fuzzy: ['en'] }, - { name: '阿拉伯语', code: 'ar', fuzzy: ['ar', 'ar-'] }, - { name: '印尼语', code: 'id', fuzzy: ['id', 'in', 'id-', 'in-'] }, - { name: '土耳其语', code: 'tr', fuzzy: ['tr', 'tr-'] }, -]; -// 判断当前语言环境 -function getLanguageCode(language) { - if (language) { - // language = language.toLowerCase(); - for (const item of languageMap) { - for (const list of item.fuzzy) { - if (language.indexOf(list) != -1) { - window.sessionStorage.setItem('language', item.code); - } - } - } - } else { - window.sessionStorage.setItem('language', 'zh'); - } -} -// 判断国际化参数路径 -function fuzzyMatchUpdateQueryStringParameterFun() { - const browser = checkVersion(); - if (browser.app) { - if (browser.android) { - console.log('and deviceInfo', JSON.parse(pubInfo.deviceInfo)); - getLanguageCode(JSON.parse(pubInfo.deviceInfo)["Accept-Language"]); - - } else { - setTimeout(function () { - console.log('ios deviceInfo', pubInfo.deviceInfo); - getLanguageCode(pubInfo.deviceInfo["Accept-Language"]); - }, 40) - } - } else { - getLanguageCode(); - } -} diff --git a/YuMi/Tools/CocoaHttpServer/Web/js/index.js b/YuMi/Tools/CocoaHttpServer/Web/js/index.js deleted file mode 100644 index 6bfbbd8..0000000 --- a/YuMi/Tools/CocoaHttpServer/Web/js/index.js +++ /dev/null @@ -1,67 +0,0 @@ -$(function () { - // getInfoFromClient() - // fuzzyMatchUpdateQueryStringParameterFun(); - - setTimeout(() => { - initLocalLang(); - translateFun(); - }, 50); - - - $('.uploadBtn').on('click', function () { - $('#upload').click(); - }) - - $('#upload').fileupload({ - dropZone: $(document), - pasteZone: null, - autoUpload: true, - sequentialUploads: true, - - dataType: 'json', - url: './upload.html', - type: 'POST', - add: function (e, data) { - console.log(data, '添加文件时执行的操作'); - var $li = '

  • ' + data.files[0].name + '

    • '; - data.context = $($li).appendTo('#uploadingList'); - console.log(data.context); - var jqXHR = data.submit(); - - }, - progress: function (e, data) {//上传进度 - var progress = parseInt(data.loaded / data.total * 100, 10); - console.log(progress, data); - // $(".progress .bar").css("width", progress + "%"); - data.context.find(".bar").css("width", progress + "%"); - }, - done: function (e, data) { - console.log('上传完毕'); - }, - always: function (e, data) { - // 每次传输后（包括成功，失败，被拒执行的回调） - data.context.remove(); - var $li = $('
  • '); - $li.html('

    ' + data.files[0].name + '

    ' + formatFileSize(data.files[0].size) + '

    '); - $('#uploadingDone').append($li); - } - }) -}) -function formatFileSize(bytes) { - if (bytes >= 1000000000) { - return (bytes / 1000000000).toFixed(2) + ' GB'; - } - if (bytes >= 1000000) { - return (bytes / 1000000).toFixed(2) + ' MB'; - } - return (bytes / 1000).toFixed(2) + ' KB'; -} -// 进行文本替换 -function translateFun() { - const langReplace = window.lang.replace; - const localLang = window.lang; - $('title').text(langReplace(localLang.demoModule.song_title)); - $('#song_list').text(langReplace(localLang.demoModule.song_list)); - $('#headerImg').attr('src',langReplace(localLang.demoModule.headerImg)); - $('#btnImg').attr('src',langReplace(localLang.demoModule.btnImg)); -} \ No newline at end of file diff --git a/YuMi/Tools/CocoaHttpServer/Web/js/jquery-3.2.1.min.js b/YuMi/Tools/CocoaHttpServer/Web/js/jquery-3.2.1.min.js deleted file mode 100644 index 764485c..0000000 --- a/YuMi/Tools/CocoaHttpServer/Web/js/jquery-3.2.1.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v3.2.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.2.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0&&("form"in a||"label"in a)},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"form"in b?b.parentNode&&b.disabled===!1?"label"in b?"label"in b.parentNode?b.parentNode.disabled===a:b.disabled===a:b.isDisabled===a||b.isDisabled!==!a&&ea(b)===a:b.disabled===a:"label"in b&&b.disabled===a}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}}):(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c,d,e,f=b.getElementById(a);if(f){if(c=f.getAttributeNode("id"),c&&c.value===a)return[f];e=b.getElementsByName(a),d=0;while(f=e[d++])if(c=f.getAttributeNode("id"),c&&c.value===a)return[f]}return[]}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,c,e){var f,i,j,k,l,m="function"==typeof a&&a,n=!e&&g(a=m.selector||a);if(c=c||[],1===n.length){if(i=n[0]=n[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&9===b.nodeType&&p&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(_,aa),b)||[])[0],!b)return c;m&&(b=b.parentNode),a=a.slice(i.shift().value.length)}f=V.needsContext.test(a)?0:i.length;while(f--){if(j=i[f],d.relative[k=j.type])break;if((l=d.find[k])&&(e=l(j.matches[0].replace(_,aa),$.test(i[0].type)&&qa(b.parentNode)||b))){if(i.splice(f,1),a=e.length&&sa(i),!a)return G.apply(c,e),c;break}}}return(m||h(a,n))(e,b,!p,c,!b||$.test(a)&&qa(b.parentNode)||b),c},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext;function B(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()}var C=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,D=/^.[^:#\[\.,]*$/;function E(a,b,c){return r.isFunction(b)?r.grep(a,function(a,d){return!!b.call(a,d,a)!==c}):b.nodeType?r.grep(a,function(a){return a===b!==c}):"string"!=typeof b?r.grep(a,function(a){return i.call(b,a)>-1!==c}):D.test(b)?r.filter(b,a,c):(b=r.filter(b,a),r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType}))}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(E(this,a||[],!1))},not:function(a){return this.pushStack(E(this,a||[],!0))},is:function(a){return!!E(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var F,G=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,H=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||F,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:G.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),C.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};H.prototype=r.fn,F=r(d);var I=/^(?:parents|prev(?:Until|All))/,J={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function K(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return K(a,"nextSibling")},prev:function(a){return K(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return B(a,"iframe")?a.contentDocument:(B(a,"template")&&(a=a.content||a),r.merge([],a.childNodes))}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(J[a]||r.uniqueSort(e),I.test(a)&&e.reverse()),this.pushStack(e)}});var L=/[^\x20\t\r\n\f]+/g;function M(a){var b={};return r.each(a.match(L)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?M(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=e||a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function N(a){return a}function O(a){throw a}function P(a,b,c,d){var e;try{a&&r.isFunction(e=a.promise)?e.call(a).done(b).fail(c):a&&r.isFunction(e=a.then)?e.call(a,b,c):b.apply(void 0,[a].slice(d))}catch(a){c.apply(void 0,[a])}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b=f&&(d!==O&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:N,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:N)),c[2][3].add(g(0,a,r.isFunction(d)?d:O))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(P(a,g.done(h(c)).resolve,g.reject,!b),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)P(e[c],h(c),g.reject);return g.promise()}});var Q=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&Q.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var R=r.Deferred();r.fn.ready=function(a){return R.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||R.resolveWith(d,[r]))}}),r.ready.then=R.then;function S(){d.removeEventListener("DOMContentLoaded",S), -a.removeEventListener("load",S),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",S),a.addEventListener("load",S));var T=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)T(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h1,null,!0)},removeData:function(a){return this.each(function(){X.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=W.get(a,b),c&&(!d||Array.isArray(c)?d=W.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return W.get(a,c)||W.access(a,c,{empty:r.Callbacks("once memory").add(function(){W.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length\x20\t\r\n\f]+)/i,la=/^$|\/(?:java|ecma)script/i,ma={option:[1,""],thead:[1,"","
    "],col:[2,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],_default:[0,"",""]};ma.optgroup=ma.option,ma.tbody=ma.tfoot=ma.colgroup=ma.caption=ma.thead,ma.th=ma.td;function na(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&B(a,b)?r.merge([a],c):c}function oa(a,b){for(var c=0,d=a.length;c-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=na(l.appendChild(f),"script"),j&&oa(g),c){k=0;while(f=g[k++])la.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var ra=d.documentElement,sa=/^key/,ta=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ua=/^([^.]*)(?:\.(.+)|)/;function va(){return!0}function wa(){return!1}function xa(){try{return d.activeElement}catch(a){}}function ya(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ya(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=wa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(ra,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(L)||[""],j=b.length;while(j--)h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.hasData(a)&&W.get(a);if(q&&(i=q.events)){b=(b||"").match(L)||[""],j=b.length;while(j--)if(h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&W.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(W.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c=1))for(;j!==this;j=j.parentNode||this)if(1===j.nodeType&&("click"!==a.type||j.disabled!==!0)){for(f=[],g={},c=0;c-1:r.find(e,this,null,[j]).length),g[e]&&f.push(d);f.length&&h.push({elem:j,handlers:f})}return j=this,i\x20\t\r\n\f]*)[^>]*)\/>/gi,Aa=/\s*$/g;function Ea(a,b){return B(a,"table")&&B(11!==b.nodeType?b:b.firstChild,"tr")?r(">tbody",a)[0]||a:a}function Fa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Ga(a){var b=Ca.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ha(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(W.hasData(a)&&(f=W.access(a),g=W.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c1&&"string"==typeof q&&!o.checkClone&&Ba.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ja(f,b,c,d)});if(m&&(e=qa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(na(e,"script"),Fa),i=h.length;l")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=na(h),f=na(a),d=0,e=f.length;d0&&oa(g,!i&&na(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(U(c)){if(b=c[W.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[W.expando]=void 0}c[X.expando]&&(c[X.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ka(this,a,!0)},remove:function(a){return Ka(this,a)},text:function(a){return T(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.appendChild(a)}})},prepend:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(na(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return T(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!Aa.test(a)&&!ma[(ka.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c1)}});function _a(a,b,c,d,e){return new _a.prototype.init(a,b,c,d,e)}r.Tween=_a,_a.prototype={constructor:_a,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=_a.propHooks[this.prop];return a&&a.get?a.get(this):_a.propHooks._default.get(this)},run:function(a){var b,c=_a.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):_a.propHooks._default.set(this),this}},_a.prototype.init.prototype=_a.prototype,_a.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},_a.propHooks.scrollTop=_a.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=_a.prototype.init,r.fx.step={};var ab,bb,cb=/^(?:toggle|show|hide)$/,db=/queueHooks$/;function eb(){bb&&(d.hidden===!1&&a.requestAnimationFrame?a.requestAnimationFrame(eb):a.setTimeout(eb,r.fx.interval),r.fx.tick())}function fb(){return a.setTimeout(function(){ab=void 0}),ab=r.now()}function gb(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=ca[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function hb(a,b,c){for(var d,e=(kb.tweeners[b]||[]).concat(kb.tweeners["*"]),f=0,g=e.length;f1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?lb:void 0)),void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b), -null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&B(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(L);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),lb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=mb[b]||r.find.attr;mb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=mb[g],mb[g]=e,e=null!=c(a,b,d)?g:null,mb[g]=f),e}});var nb=/^(?:input|select|textarea|button)$/i,ob=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return T(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):nb.test(a.nodeName)||ob.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function pb(a){var b=a.match(L)||[];return b.join(" ")}function qb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,qb(this)))});if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,qb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,qb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(L)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=qb(this),b&&W.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":W.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+pb(qb(c))+" ").indexOf(b)>-1)return!0;return!1}});var rb=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":Array.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:pb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(Array.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var sb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!sb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,sb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(W.get(h,"events")||{})[b.type]&&W.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&U(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!U(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=W.access(d,b);e||d.addEventListener(a,c,!0),W.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=W.access(d,b)-1;e?W.access(d,b,e):(d.removeEventListener(a,c,!0),W.remove(d,b))}}});var tb=a.location,ub=r.now(),vb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(Array.isArray(b))r.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)Ab(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(Array.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)Ab(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&zb.test(this.nodeName)&&!yb.test(a)&&(this.checked||!ja.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:Array.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}});var Bb=/%20/g,Cb=/#.*$/,Db=/([?&])_=[^&]*/,Eb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Fb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Gb=/^(?:GET|HEAD)$/,Hb=/^\/\//,Ib={},Jb={},Kb="*/".concat("*"),Lb=d.createElement("a");Lb.href=tb.href;function Mb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(L)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nb(a,b,c,d){var e={},f=a===Jb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Ob(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Pb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Qb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:tb.href,type:"GET",isLocal:Fb.test(tb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Ob(Ob(a,r.ajaxSettings),b):Ob(r.ajaxSettings,a)},ajaxPrefilter:Mb(Ib),ajaxTransport:Mb(Jb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Eb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||tb.href)+"").replace(Hb,tb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(L)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Lb.protocol+"//"+Lb.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Nb(Ib,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Gb.test(o.type),f=o.url.replace(Cb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(Bb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(vb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Db,"$1"),n=(vb.test(f)?"&":"?")+"_="+ub++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Kb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Nb(Jb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Pb(o,y,d)),v=Qb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Rb={0:200,1223:204},Sb=r.ajaxSettings.xhr();o.cors=!!Sb&&"withCredentials"in Sb,o.ajax=Sb=!!Sb,r.ajaxTransport(function(b){var c,d;if(o.cors||Sb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Rb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("

    • 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_41@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_41@2x.png deleted file mode 100755 index 5389ecd29812b9bc04a2006d080270e23c74bbe2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7037 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_42@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_42@2x.png deleted file mode 100755 index 5bb78b8c9e20b01e50e449b2981ca8bcd23635ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8402 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_43@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_43@2x.png deleted file mode 100755 index 136d7fd4b75340284d5b358bc8e0e12efb33c0c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7676 zcmVKLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z6DdhVK~#9!?3-(hW!ZJte{1c1UiVS=R#kU(_4M?_<4MN$IAh1g9)e5~n;1Jbatw|p z9>{U{se%RI{^N< z4t!Glom{UoY-psXztKT?iG_RkHu&v1rL1swa?fDcUyIm32cCH5!G!(sv4BYbf-h#k zkm@6I+-C#!YjWb4l{5aB0FYjw1th>>4~~!F`!zi_eW521Hr&7fMIZ3ErwzMw z(p7{+A`<`bNHAe9Xay1-?vZir5bRs#^ehQ12`uPIq!Yq}+*MP3!lAfl{P+UC{b5=_ z^8zW$!F1&12emd>$QaxS+B3q2d%;NbXGX|7j?6CUGqfK_1ma6Vn$N=l>9#KtF&g~) zhqc=?z|3YsM2ZOZ3|CR)!r4*%HzPK`db6(;ma+lB3%U0nU>+d1y$qp49_~DZ-U#sf z9>tYq7^wgefwA)+ADwe(Cmv+aPz(i>2n6gU3z`18k(%#OIAp)LeUHnJ;qk&etx*GFc7Mt;+(v35&2cwa3?z!NIHj9z`-|)#pp={j3qGK@}C%-RTv36P;>z8mcCh$2kiKP z1drelTHHs4*c!30M=a26u2}By5*9-ar7H2-<5m`M0=iA^h(L?`&~)FwMJ9sVQgkTL z3f;D&_WItODHw(j^F7`?Rrf{}+wX})Qi%?UL{HpUb_&uwbu}mmzBmcTCT!2LpviXi zk#TP8>aqn{|-Z>g^v{baXhuRhzb${OBkHKEKhux-i{(%FKh0P%3 zbSD%qUMD@BxQBP{@^99u;3kUSQru9`k)RV{yjQ)cL%zqyfLa#M39qdNLRZOK6`QW( zh#lt_e`NXrwn1QN!&^hq*3OygZ+CY&{6wj?3IJRAZ`~4x=aqJ*eL=O@E^B=1a3jTy6+aeqtoVtdQ(<_~ciq_ks3C|m=Gd>#4-6tW)m<%jtyT>njuOQ((4Sa5P^KiEkO+ z?cZ9Rm1E8OEyWcQ^rK=8W2HIo7+>%|nVNpm4|{IXfBLCg%MU(zDL#5LE&ril)KpAr z|DI8;KfffDxDfMGqAM%BSX2EyDGED9IhryHua zqh=^IF&IaO#;qAN6aVAGiykdncVoc~1=k5Wlng|11)T`vd;Q+9tA45xWzY#T>|f1D z-xuI_T&^yM&9-b!_uQL0+`B837KdQ;ELqSa#0RFrduw?8sR3wlKfbH}bqV{=mQ9`| zi6a7mv^(B$e`&a-lL!TQeZjd8^8?QN` zKCf)w-TZV-yFJ`$XsgWq9ncW)gzv7lbuhfgv9nYE{Uy=Q2*>Gj0*2~;cv5>5-gGJe zI^18LIRBBR5`b!z?j(r>jLyji$9K6wv+tmm@4QLkC?yt0ky}@K>P|i|zQ+$`xE9_G z1m6kT2|CE{`Jv!PnHzMZ4DWMin@RexkBKv9J+Y1)V%!3nsr!M!zQdhSruVtm4BPsn zA{FWs18U^YOgr}uX^n(#oeF>v{x5b;UnkD+FmV{Q3X{5KO2y88{bTjrj^?~F-t*sI zd8HXUhGS(ic1$l;A9822&~BhP^<4?yDz4LGAhJ8;bL)M__#Xc=q;!tPXoi9TPV|B8 zSJppT?I>XqQkT8tG_YaQ4)q?w@w8>k6jMYumFY~QmVO|i->vN zwsntxz3vKnMw#AQ|Apb31exp6HLg}0Ai>0jr@vKG9}OIk%6K^n?2&73d*9p?Xs z_tn$pO!cwlVPL#du`_X;zrX#*qx-z-j^ei!J>wX^(hVm2{$rswYUJ!_+rL|D;poV$ z$A0rv0NkSg*()(Ta(S74J;ARUhU)@#6WQ8#AMEb-xT(WUmBA}L-H!W7pN!qHv3t?K zzdq-Ym4*j`cA%}ItzaIg3Mj=Y+(1iuEYxR}@xAp=sc~XzWQ6!8!%WAG|vbff;c z#Z&Uj^<92nT0uHNT0z^aeQ6Z&3QkK#m2j*t9;D^M-{-cgO)V+-AMtpD(}9Whsod4fTQLL83d;zNa}?!q`ZW z2Jl9z64USK9_g>O@2hqNsRh?6t`VeGqynh~oI}Ke7-j*f3~dsw5vKuAl42s$)S z(6&U8q2Nb~_)LsGLWo9l(Q()P?ccfiKMo(gPNaGBp{nP0X~x%QL* z#IT{OWPrZP?^JKpu9#$#Er3RGjl+UqAwnNng;w$42Aah7_#xm0IR-&M$*gXv$fIDILmXCyVgf2Ff7=h4H!S+b;%pIu01@G;0fJje6od^(QON@5w=U1`p^T*Qw-4M{PPTBxra|Bv0bj$@>u3@>S zETy+>0qD!`96?L~&D*E5UV4t!EE-{Eh+G9_2$8foMD0$atlFSuwJJNok6w zGStk)!-g+yXt@ZAWMPZ>oR|qq$q*3-7D`A>D?iH?VdWE2qJu9WH~|N)7Hvk=xl;i! z+H%LeF$;D^D{(6;wH1eH20@-VpgtC=Sbg8v{o< z-g32y4pxjPW1ZboRfebBB(*W07wK4KRvQ!0lX)FEX0QDDSnwLrhU3^tRgSr5>;|x+ z=}^pmS-{CImH|u!q%x{E!9? zT5{P~gEku$A&BIWnpw(%TAvplSZ1Ybb}=we%i58&_6km7S#pip=>S+Y6Y{2?r6pSn zUl@OV^OXu*5xfEI5NUw{NC(=k0g++_#~Z1vM3NN%3oKP&bFfvmxCsJ~VkXH=3b8eR z#y(v>oeT7~4%@-5S)Y+l2AbAe8Dz!gIcYDe$->JZ1E2%M6(Cr-Lv;dx^)zu=K3`$U zu__&N-LP_pl*45z^)}Kn@wDR^^-BA`tOk)L z3o9MS5Ygcp3@Pp))dml+Hh&gi3lNu+ALLl`q7h3mOKJu&Kuoz-IW{08+_e8`CP$|N zpdGB8JShk1&^~VqdjrApkSrR6Rrr&_?nSd&XH83sxC}zJgyGs9s0$CU27o1`MK=AU zh2;&iSTx^*=;kG(S@?(oI7S`AqHfbeZ7eUzi{Ny*x}@(DpOadGm&}G;Enk z+CnaWrOB->q(WpR{K^UjdA2H}0zk0>nqwkdyTB53UR;A?n-&dNAxDuVmX;ZyXb=*F zj9cmryPB9^Sv=Z@bUFaqCT^T$#DnFdi%acaZO$lZmU0ubw_E}CxdsqlA^@2P*AZX< zt^*wa*$PBk1fL1i3?pK;fK=Q<4Pwk0pk`tuEx{^?E@#RiV#`RH8)=bnOSt-YcSR!4$z+yfV+$Q=J??Jl1UodWF{}xg?@5wS5ybf%>$Td52stWb z4j7`ka)YYyham*S9Lc0)f*}i@7QpXDMBVCU)JyHk6N5uDtF2VJfi{-tTlPXJ) zd|~wt)NSUkYu4J=;A;x*{6V&Mw5yiA%ui5*@i-U!6&g55IGR})u0ee_Rev*o`Y zHc-8QZ~HvwssH8DH-3M9wEV4C9NzjXe@X|xWUuz50Q80}6d46{a0P8|qRrD#jS)8j zw}t2gaZ{*v(0T{l6mdgLJYpdO5N=}O#(Jd#BwWY(Yoz`pH36lKf6w1PX)kdpJTXu6+`FoU%vLgFR%62;wQ%s){PH_Eevk0TGw;5 zo?-rJ)G6XTrWK+cQVo%MjMQ5>LlmFme41hXO{_m8g&7iNIV!{@sb9h}6Z{;!AsXmPdwTg^!6QzR^3q|MT!=cy7$jS$5C{nh_{bXRyf{?qQh>XGJx!|yt5 zl*utyy$NvcNO)PODpe6N2zp@LPTQBB)428zXCD0zlnk^jC4H`o{U_7tpD8A z$HIrlgY>&H6lBI7z3%9{ab}=i&{nSYH^K*&|1JG&^*R0F=B#_TI;XGJaozwWjbN^n z_e-HaNT#*mwnemy;7T!*4C{q-3*vPP>5%`2VKLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z8;?muK~#9!?3-z@Wmk3Ie|tE?J$HIz_v=Yhw@^z+NLV0{P%H);jBI1askj`woCH#Z zQ$-R7j7{vy2b>C&?Nkb?QX$yo#Hz#v0TKdsKn5GzI6*S9ky{9%mej2t-_)<)aHliw zAs^0pub*1oAQ44h$gSG-Zr{GcS!=Jg{{Qt~`v~tn-_H-p_xa=d-T~t8zV{r?d*U!a z<|X5-U~d0j*ji)gC02z9E~Sb09w8;IxP_1c?>(KV8BRU%B_4d>M|R#fyZ1VNUseJ&}+GS+_u|NCVXaDl#;}2W}=7Ify05*ZN zSs9Q61yBMNVE%6$pkEFzTWc|Cx_@eR|2yw}>-9g?n@WBliXxPj;K3P-^@2D3*c-n& zJ2QUvn}7AkXYzD#8i)Z0j4yM-WY_a;XOz2~QUSL4?Dk*ZtQYP8?>#~&q!2r=IcM{x9uWnD5NaP7^4N))7*Q<~u!QnQ{FMhhFuXyY6|_ z*;D_(eD%RkeEDmC{K?NXKd}dB?=o)N8F{lVcgl8@RNI%*EOEILuHpcX0F)3o9idgQ z^FL)VK~YV|ik|oWjPsUu2sT@O&NpP^0oK@Sx}ElaJFsuhYxge9)9G}HqJ%(eq?Cxp z0p5XgJ*ujrC{m8xbd$dJ@UP#0{Y`fq{ew?@^!>w)<^KhA8{@WjefQ3rW|!SdngX+P zhxqaz{vvBB6o@9Wy!SY#F(yO@Aw`klsxfbP%a7kMyYI#iefoDl zc<1Vw6Pa`AOP-!rb$|z?(gZ@Vx%yZG84>+X?`ROn`%`Z}=mm7U5vQJ6Wa-@Pz}*1c z@H!{ne*e)g?OT{VFu!M>PJ43P7*RdJ9o$7BQw9ff8iCh;+tNc2x#gzSvKOHxBV8S&>VWj9ltgn z7KfepUt2$YVc?wOVwhsak860wF;l zu+HIKQ+0$O^dLkHueQ~~+G&cSSln@9} zm*hYxtn(C=s~r$1B;c$fbe<}TXm>g+9Jn4W{fD!>dLPhfs{Z9g(Y#n*u;TzBz&nRA zw#E$W@Wv3dW{&3h;GKTMyjeYEAUko9wa&beofA&V|y(3$Da%>H<{ z-60HHgkeY&Nvcid|^2O`a^^wDlh6J;pe~AZR6RbvM=>k=@=xEXCm#(52=IX_#%Q7d7_pr742vxpB#S}VG_jKC5s1>&ef{;K<0wqzZ-g(&=FQq_S zwi98X=(GeI!wm0g#8yJ0l|U(t#B<=fS1`Bt(B75vC!Ymofw1|wY8;}r{nFt}lz4(EBi8_QgpjuW6e*xzgJ*-$Oys1P_1nS&lk3IU$!TJ*Tm;=`t z4jz3woH5rOxNymh&uBF7G1mTfN zAeBbzfTT0U%${r2%K4LzHik}`l{Y(_U&al-Ypbi1IK(@I3dP4~ro^En@|zAhbe4&A zBDdD(#v+VGmDbOf)#^Ufd0rM??y3kIXlP>oZRmxMapAGZ>;4$w-~MoWQIwXsq> z-}s&M^I)x~lLQQ7#pbY}6)OY+B_%2dux`Y{b+2AL{mkPJr=zu(1_r&5SRsXyawZNz z1)>r{AV3Q5aZdQMbp5Olhb`g@er&!Ftb4)>ZPeC~pyddoE@9LniV_uu5mE*9t}B5= zupRKb$+-8=UArS;Zn}lTvo)@;&LgBE3S+#3JWboz9eEwCWcsB+0bd$~^R7hw?@1Q? zL`TrJ7H5o?MdkZh?#T=Pj4g_f$S`;SC9tLq$pmH|Cy_0LZ)2;HAPgrm2nm7^tt3hd z#5UxK7uYyCh$BV68*=LW03l+8fG}#|5ex@gsj-sRzwIB<+cU%BQ^yz$)=5X3ES`EC zXR8+pgH?s_9)o|+#vqu^3-KCftH?M;rt;q|D*q+n&F6GEUM83a(?hgR5M6T;5qiqW z0@8b|1{H`$!!RL;q8js?oR^}G0&#`n_nh7w5E6{_%=TNHIe(E!=4rQTM9H$0{=zj6 zc6;+2yx|69;MsrZ7CZ`DSvD@7yG~I zZc%QmL|UEp&f$?L*~eLnm_CMzP9TE-S9NjH5L%0BcZgf9hm%f^FboKFUHHUKrF($_ z1z??{lLT~6haSj+w zo+1tx>K`dm#+zrJ2(+fEVw7qjO^)|ta(^0YP7!uetZU&-2so^%D65jrRQD(L?VJCV zey>LqNVKA6d}6x?^>w~~msHrU2|_@x)8f?GRjjd0@|3CmG}ANl?<(^0UE|3VTZ65~ zw>H;5T@=;tAgT*RHo}@0nF425exER!V~@WV6*yX*X}qt1C5mbbC$`W*%GfO;h=}bJ z#u=gpGnn!A<*bA2Z1 zXYgWzH7Qa>NY%l+80RHLRpPuq97W+z%}w=xc6NUDj=8ycdYy!JOOwQkP%D&DXeE&i z$KT%F7g`LRhd7D>7>)+)ncqvd+d+w%O3KsKMsMl&x^L-rJNHaYP3h^WDcbFX zI0}hF)zDsr)^*EUH#`l@HSF%Ysql3QNE{Go1>WEsL~%?Y1+7S-q`+8EGD1p;QZ?1? z_WEyq$Irk2;ZOaCU;VYRNKZ9R8116U#V&emfw873I@VfDUO7nYd1*_ce`EMoi<655JeGTsEGnapah|o1c5|pUGKcA6(vto2X=A)?->4~Zo-W7 zXsw6>!8n(MS`&q}o>2D+3at%FXrxGL`0$>)?|a*vQu@OW{M+}ur(uILjlpr#H>3@V ztbjsWQ+=S_?*8!9^sH^SJM*np>-soJrjjI~lO(i~HgOcyI}m6Bt#I}P4N+|>&g{r?#2)vJRohc^64Q{*Rb#w3d z`yc#=4}R*m?yrh;dKW#mm#2e{g6Jm?F6@2%z61M+k~yC!XQKkvX-di zb|)w5=MA}$N;W%H8@~OX+N|BAr5DFX?i^sZzPPa#zuJMZ3zUjCB<}W|^rgl5OUI-zR^$fnRqYR)e%ne&`xN7h}awH{|ZRiimXf!a}qr1Z}rOk*ws+gj*Gm&IZ0&#swgIDh0N`ly6vtXe%C$Z=|egQ5km6BHy&hbed&?| zoU5@(YmEv5lnxv5QV{3{%9KRz6tZojo1GSdrqneTC7v7IP)~;dtpvV_mf@&mYf#W` z2ed+6N0+YC$_tPR*49S|8PIA)1X?uO01dfn=#>KH1zt%4?Fa)!8H7Zwn3<%*p7{em zck1|GJ*1Q(j1p83Jzo(LQX!Q_semxhO;uMYEo%oz+3aF%xZG{%t`L7tn=76xG5cmL zAp}H`WCsZ6 zltU^-paVMHF5Z`aYxCj?Qc1jXHP^Y}H7uWgjJ2hw8wap`aodnpKdz1@dZ|eRFlFC#`^`l`-SYa$x^Ft+3vRou~ucP7l3J zuj@_N-W(wn&K69~?K^VE5B~JtFbY?ZYR#NU zOG{ZAs>))l#TbXN9&77@X8on9qieK9|00%io^k59?WTQnW6y~*iy#8dEe{!tEB5V~ zCXO2XZ+eR7{6;fW@oty6!tTwhr9UY|EOt9cN}Mxf;|;X26-AMer(=|?HALs3tirk; zXj!8{gZE0+#Yk*Jo{&u*?#iXBq{o#W##mahc=*_}EL|M1w!TTP+in^wStF4W zTrueU?&;^YGd#{(tg#qtFxHgPUipf&sS3(GBOQ-GNW6DgTT+HCbffMBf!<+zfs(b@ zsRe;?QG%9Zp z)c@9+FjTedtsA&(cBxi>YtnZ~3)syLuOx#xl0-AzPuLu7GCw;_yQLbwUz0Dt+W}4Z zJ8>!8t#MQa%Ft_R+6}!>6|bp|&aW)eD37AeCzBNt4&U zX{5Fd-yWxXPh}icRijm!Te37IpNz;RV+LCT&M%)^Jbm`B|A->HDr9S#a{yAirqwK$ zvwXO$g5=4eJJob$quv-*p;MzO5u#uvq zqTdN>thT;3*f^YZRMt{fmZG%eg=3OC(zIkU9x)kjl8&|*Y;CZ(c%Ie8<*zOu|LgaU z*Op*1x$08;58Xn4>Q-*L^A~B)+>UoWZhif`ncDk0<`!N{GIbOcBuqBHjj> za}CZr#_1`%D+$9cS}Q7Jo=%75?`M@cCRK2_-R>NSk``eU5$L9il%Ti!j3&Q#aKgt1(E(?s&arEdZY?T`q#X&tW4LKVx>sU>Ab9v zN-($g9_Ft7A6ortT}EsMa2QQ{B5s%(7W$aqR-FD8!f?(-@!UDMg->ren4?Hn_O5 z%4mJ`u^jVDNq;&YZmzR<=35Nbo_PVY!63jpj}FzppXu|1oy1S9)rB!WE-HUlmixQ% zLjH{P-QSbA2eSM;TKBkd-v>Ao{SI011g#{&WCao28*1@dXAPz@h`5F;=R89C9RbW) zzv~n!D6MwbymOwiu$0!(?Y237d<9U1QAC-i6nREA88h74U^GlG4Aw4ue!RK<@pQcP z=qOzwONVT(oqgeh5fN&fLxz#Kx83sSKui!60+C5Us-&1`<${Tf-)lV!!inE-Ysf6 z>8eaO@m`q9tmWzC@e7M5zM)(5f0hqc*VFMDSvvUM#^b^}l*d~qHu6%K&pg6; zA&}CEFq8x5-Ab18qqd_TFT?5!HW=ef8$XG$c7*i`P}kR3ZE@COoX0t^&LbQ0qORZt z4>(stopp}Nc#5*3EOV0f6puapM-LA!p8o{U2L{c`;OQHHn|7TJ$**u`c=st%yX%;O zuX};K#Cz{WCI7Jy@dITd58>@JN;OAhSoAQ`3L7f1CZ^hNedxijePyt|l;aa-<~)0^ zfpToI)`nGCV9Ffp48|CY)r1Ysd*N}rPKoT$;3i6}^OTjRFqWdsNyh`qs-V;DFAOf8 zzZTegnK9*M2c@gv}Pjr9)DO zB>pL({LmNdyZ!bbcvV^6@<sg$4qbyA+%N%3M2E!dj*X^@x6x?lL z%j0nk$Mw!(tfMlHvaBeJI@i{2E&NoNr$GZ+i?>;7%@7j5L*^Xa51ys|wYb|k; zJWD6}pLS<^f9ke|RAHMmE04xnzB5YNZ2kWQz&b>lM(If3{$lpA)#ro1BK~$iF z=*cucKw0EeMNU!Vgi%0XCDJ&A5GXuudswn9U^quvIm*hDmyRsUD6*6^ov^mH3Re9m z;4A+xj`Hj0G$OJVJp>?>L}*PlS~)&7fA|B*O#7F!t^CKF8=r9|-@o|nXNjU|7Qc0Y z#j}qR1RXm4g}=ydyoup(NW0yw^@K2N4oc`|f>Y~w+d_eB3SVhFX>Lff2}L?0OGgaH zLzd5+9GNtIxE=SH$ zZckrook#J0%opxsGX@v#$v0IGHwy*2&wfB z{#jd5H8NZ_8IewgY;LY|acz?)pLpaq#wX4`Q`fbNz{{8dHDfbW-ZQ=T_MICh2IJxJ zs&ZdcLhX0XJ?Tox&9~pl<6nROj#~5R!%zJTsK>my?H2C^-Lj-Aa>A%qlBCl0INy4# zHB?nWnWvVgEzmCYj1i7r;qCz##x-HRpBzrSzS79 zo;>y!pFeT@8=nN;*xV>}`7LwfT}0%PHlB$GnoEtqQZ zywB<nWb)$`B(?$-LsyW8E_`@6mABS9S2B8l^uGG{zoFIUc={Kna5AOCV$=8poc z#;A=e+zod5Epm3(@-Hz8yaXYp1GLspT)1%h7njaG`Kjv;-}P3hf}>K&Sm4K7>t~kE zoP7MuWHR^`u-F`dx6Mu$m+i27sjpA`|C^`3&mZ6S4){L<0Hvy6N3uR<*Z=?k07*qo IM6N<$g6N(%A^-pY diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_45@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_45@2x.png deleted file mode 100755 index 55aeaf2c789b5ffc99ac3d2331812b7c05f84a93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7155 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_46@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_46@2x.png deleted file mode 100755 index b25947cc26d397633642923639063bdc1b23b771..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8620 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%0A$1zvR=wP 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 Y0PEvb>-3_jpa1{>07*qoM6N<$f@NdN!< diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_50@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_50@2x.png deleted file mode 100755 index 131f58b4c995d1a8c88c1006682039548b627abc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8791 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 N002ovPDHLkV1kJ7*@gfB diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_51@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_51@2x.png deleted file mode 100755 index 3708efd75ca9a805106c6c7bc46fa4745e8cc94c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9015 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_52@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_52@2x.png deleted file mode 100755 index ea1c2843962f20e5513929911152c2f6219e1c4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9519 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 N002ovPDHLkV1gt$ndATf diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_53@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_53@2x.png deleted file mode 100755 index 67267431ec7eb4bc41d07454278da997b822fbbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7316 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 diff --git a/YuMi/CustomUI/InputView/Emoji/emoji_57@2x.png b/YuMi/CustomUI/InputView/Emoji/emoji_57@2x.png deleted file mode 100755 index 5a6555085022fe6e9df46f1724934bf51de19561..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11178 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